postgres/typesense
1
0
Fork 0
mirror of https://github.com/typesense/typesense.git synced 2025-05-21 22:33:27 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge branch 'v0.24.1' into v0.25

Browse Source
This commit is contained in:
Kishore Nallan 2023-02-12 17:50:27 +05:30
commit 8914133598
4 changed files with 113 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/collection.cpp
View File

@ -3627,10 +3627,7 @@ void Collection::prune_doc(nlohmann::json& doc,
if(arr_it.value().is_object()) {
bool orig_ele_empty = arr_it.value().empty();
prune_doc(arr_it.value(), include_names, exclude_names, nested_name, depth+1);
if(!orig_ele_empty && arr_it.value().empty()) {
arr_it = it.value().erase(arr_it);
continue;
}
// don't remove empty array objects to help frontend
}
arr_it++;

3
src/index.cpp
View File

@ -220,7 +220,8 @@ int64_t Index::get_points_from_doc(const nlohmann::json &document, const std::st
// not much value in supporting default sorting field as string, so we will just dummy it out
points = 0;
} else {
points = document[default_sorting_field];
points = document[default_sorting_field].is_boolean() ? int64_t(document[default_sorting_field].get<bool>()) :
document[default_sorting_field].get<int64_t>();
}
return points;

98
test/collection_nested_fields_test.cpp
View File

@ -615,7 +615,8 @@ TEST_F(CollectionNestedFieldsTest, IncludeExcludeFieldsPruning) {
auto doc = nlohmann::json::parse(doc_str);
Collection::prune_doc(doc, tsl::htrie_set<char>(), {"one_obj_arr.foo"});
ASSERT_EQ(0, doc.count("one_obj_arr"));
ASSERT_EQ(1, doc.count("one_obj_arr"));
ASSERT_EQ(1, doc["one_obj_arr"].size());
// handle non-existing exclude field
doc = nlohmann::json::parse(doc_str);
@ -637,7 +638,7 @@ TEST_F(CollectionNestedFieldsTest, IncludeExcludeFieldsPruning) {
// exclusion takes preference
doc = nlohmann::json::parse(doc_str);
Collection::prune_doc(doc, {"locations.address.city"}, {"locations.address.city"});
ASSERT_EQ(R"({})", doc.dump());
ASSERT_EQ(R"({"locations":[{},{}]})", doc.dump());
// include object, exclude sub-fields
doc = nlohmann::json::parse(doc_str);
@ -2327,12 +2328,105 @@ TEST_F(CollectionNestedFieldsTest, UpdateNestedDocument) {
results = coll1->search("shaw", {"contributors"}, "", {}, {}, {0}, 10, 1, FREQUENCY, {false}).get();
ASSERT_EQ(1, results["found"].get<size_t>());
results = coll1->search("john", {"contributors.first_name"}, "", {}, {}, {0}, 10, 1, FREQUENCY, {false}).get();
ASSERT_EQ(1, results["found"].get<size_t>());
// should not be able to find the old name
results = coll1->search("galt", {"contributors"}, "", {}, {}, {0}, 10, 1, FREQUENCY, {false}).get();
ASSERT_EQ(0, results["found"].get<size_t>());
}
TEST_F(CollectionNestedFieldsTest, UpdateNestedDocumentAutoSchema) {
nlohmann::json schema = R"({
"name": "coll1",
"enable_nested_fields": true,
"fields": [
{"name": ".*", "type": "auto"}
]
})"_json;
auto op = collectionManager.create_collection(schema);
ASSERT_TRUE(op.ok());
Collection* coll1 = op.get();
auto doc1 = R"({
"id": "0",
"price": {"now": 3000, "country": "US"}
})"_json;
auto add_op = coll1->add(doc1.dump(), CREATE);
ASSERT_TRUE(add_op.ok());
// update document partially
doc1 = R"({
"id": "0",
"price": {"now": 4000}
})"_json;
add_op = coll1->add(doc1.dump(), UPDATE);
ASSERT_TRUE(add_op.ok());
auto results = coll1->search("us", {"price.country"}, "", {}, {}, {0}, 10, 1, FREQUENCY, {false}).get();
ASSERT_EQ(1, results["found"].get<size_t>());
}
TEST_F(CollectionNestedFieldsTest, HighlightArrayOfObjects) {
nlohmann::json schema = R"({
"name": "coll1",
"enable_nested_fields": true,
"fields": [
{"name": ".*", "type": "auto"}
]
})"_json;
auto op = collectionManager.create_collection(schema);
ASSERT_TRUE(op.ok());
Collection* coll1 = op.get();
auto doc1 = R"({
"details": [
{"foo": "John Smith"},
{"name": "James Peterson"},
{"bar": "John Galt"}
]
})"_json;
auto add_op = coll1->add(doc1.dump(), CREATE);
ASSERT_TRUE(add_op.ok());
auto results = coll1->search("james", {"details.name"}, "", {}, {}, {0}, 10, 1, FREQUENCY,
{true}, 1, spp::sparse_hash_set<std::string>(),
spp::sparse_hash_set<std::string>(), 10, "", 30, 4).get();
ASSERT_EQ(1, results["found"].get<size_t>());
ASSERT_EQ(3, results["hits"][0]["highlight"]["details"].size());
ASSERT_EQ(0, results["hits"][0]["highlight"]["details"][0].size());
ASSERT_EQ(1, results["hits"][0]["highlight"]["details"][1].size());
ASSERT_EQ(0, results["hits"][0]["highlight"]["details"][2].size());
results = coll1->search("james", {"details.name"}, "", {}, {}, {0}, 10, 1, FREQUENCY,
{true}, 1, spp::sparse_hash_set<std::string>(),
spp::sparse_hash_set<std::string>(), 10, "", 30, 4, "", 1, {}, {}, {}, 0,
"<mark>", "</mark>", {1}, 10000, true, false, true, "details.name").get();
ASSERT_EQ(1, results["found"].get<size_t>());
ASSERT_EQ(0, results["hits"][0]["highlight"]["details"][0].size());
ASSERT_EQ(1, results["hits"][0]["highlight"]["details"][1].size());
ASSERT_EQ(0, results["hits"][0]["highlight"]["details"][2].size());
results = coll1->search("james", {"details.name"}, "", {}, {}, {0}, 10, 1, FREQUENCY,
{true}, 1, spp::sparse_hash_set<std::string>(),
spp::sparse_hash_set<std::string>(), 10, "", 30, 4, "", 1, {}, {}, {}, 0,
"<mark>", "</mark>", {1}, 10000, true, false, true, "details").get();
ASSERT_EQ(1, results["found"].get<size_t>());
ASSERT_EQ(3, results["hits"][0]["highlight"]["details"].size());
ASSERT_EQ(1, results["hits"][0]["highlight"]["details"][0].size());
ASSERT_EQ(1, results["hits"][0]["highlight"]["details"][1].size());
ASSERT_EQ(1, results["hits"][0]["highlight"]["details"][2].size());
}
TEST_F(CollectionNestedFieldsTest, HighlightOnFlatFieldWithSnippeting) {
std::vector<field> fields = {field("title", field_types::STRING, false),
field("body", field_types::STRING, false)};

14
test/collection_sorting_test.cpp
View File

@ -124,6 +124,7 @@ TEST_F(CollectionSortingTest, DefaultSortingFieldValidations) {
std::vector<field> fields = {field("name", field_types::STRING, false),
field("tags", field_types::STRING_ARRAY, true),
field("age", field_types::INT32, false),
field("in_stock", field_types::BOOL, false),
field("average", field_types::INT32, false) };
std::vector<sort_by> sort_fields = { sort_by("age", "DESC"), sort_by("average", "DESC") };
@ -140,6 +141,19 @@ TEST_F(CollectionSortingTest, DefaultSortingFieldValidations) {
ASSERT_FALSE(collection_op.ok());
ASSERT_EQ("Default sorting field is defined as `NOT-DEFINED` but is not found in the schema.", collection_op.error());
collectionManager.drop_collection("sample_collection");
// must be able to use boolean field as default sorting field
collection_op = collectionManager.create_collection("sample_collection", 4, fields, "in_stock");
ASSERT_TRUE(collection_op.ok());
auto coll = collection_op.get();
nlohmann::json doc;
doc["name"] = "Example";
doc["tags"] = {"example"};
doc["age"] = 100;
doc["in_stock"] = true;
doc["average"] = 45;
ASSERT_TRUE(coll->add(doc.dump()).ok());
}
TEST_F(CollectionSortingTest, NoDefaultSortingField) {