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

Merge branch 'v0.25-join' into v0.26-facets

Browse Source 
# Conflicts:
#	include/index.h
#	src/index.cpp
#	test/collection_vector_search_test.cpp
This commit is contained in:
Kishore Nallan 2023-11-30 21:53:30 +05:30
commit e7a2461bcf
2 changed files with 78 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/field.cpp
View File

@ -553,9 +553,11 @@ Option<bool> field::flatten_field(nlohmann::json& doc, nlohmann::json& obj, cons
return flatten_field(doc, it.value(), the_field, path_parts, path_index + 1, has_array, has_obj_array,
is_update, dyn_fields, flattened_fields);
}
} {
} else if(!the_field.optional) {
return Option<bool>(404, "Field `" + the_field.name + "` not found.");
}
return Option<bool>(true);
}
Option<bool> field::flatten_doc(nlohmann::json& document,

75
test/collection_nested_fields_test.cpp
View File

@ -3105,6 +3105,81 @@ TEST_F(CollectionNestedFieldsTest, HighlightArrayOfObjects) {
ASSERT_EQ(1, results["hits"][0]["highlight"]["details"][2].size());
}
TEST_F(CollectionNestedFieldsTest, DeepNestedOptionalArrayValue) {
nlohmann::json schema = R"({
"name": "coll1",
"enable_nested_fields": true,
"fields": [
{
"facet": false,
"index": true,
"infix": false,
"locale": "",
"name": "items.name",
"optional": true,
"sort": false,
"type": "string[]"
},
{
"facet": false,
"index": true,
"infix": false,
"locale": "",
"name": "items.description",
"optional": true,
"sort": false,
"type": "string[]"
},
{
"facet": false,
"index": true,
"infix": false,
"locale": "",
"name": "items.nested_items.name",
"optional": true,
"sort": false,
"type": "string[]"
}
]
})"_json;
auto op = collectionManager.create_collection(schema);
ASSERT_TRUE(op.ok());
Collection* coll1 = op.get();
auto doc1 = R"({
"items": [
{
"description": "random description.",
"name": "foobar",
"nested_items": [
{
"isAvailable": true
},
{
"description": "nested description here",
"isAvailable": true,
"name": "naruto"
},
{
"description": "description again",
"isAvailable": true,
"name": "dragon ball"
}
]
}
]
})"_json;
auto add_op = coll1->add(doc1.dump(), CREATE);
ASSERT_TRUE(add_op.ok());
auto results = coll1->search("naruto", {"items.nested_items.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>());
}
TEST_F(CollectionNestedFieldsTest, FloatInsideNestedObject) {
nlohmann::json schema = R"({
"name": "coll1",