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

Propagate dynamic field properties for nested field.

Browse Source
This commit is contained in:
Kishore Nallan 2023-12-08 15:37:40 +05:30
parent 64ef0013d0
commit f87404de37
2 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/field.cpp
View File

@ -397,6 +397,7 @@ bool field::flatten_obj(nlohmann::json& doc, nlohmann::json& value, bool has_arr
std::string detected_type;
bool found_dynamic_field = false;
field dyn_field(the_field.name, field_types::STRING, false);
for(auto dyn_field_it = dyn_fields.begin(); dyn_field_it != dyn_fields.end(); dyn_field_it++) {
auto& dynamic_field = dyn_field_it->second;
@ -408,6 +409,7 @@ bool field::flatten_obj(nlohmann::json& doc, nlohmann::json& value, bool has_arr
if(std::regex_match(flat_name, std::regex(dynamic_field.name))) {
detected_type = dynamic_field.type;
found_dynamic_field = true;
dyn_field = dynamic_field;
break;
}
}
@ -429,7 +431,7 @@ bool field::flatten_obj(nlohmann::json& doc, nlohmann::json& value, bool has_arr
doc[flat_name] = value;
}
field flattened_field = the_field;
field flattened_field = found_dynamic_field ? dyn_field : the_field;
flattened_field.name = flat_name;
flattened_field.type = detected_type;
flattened_field.optional = true;

28
test/collection_nested_fields_test.cpp
View File

@ -2503,6 +2503,34 @@ TEST_F(CollectionNestedFieldsTest, NestedSchemaAutoAndFacet) {
ASSERT_TRUE(coll1->get_schema()["schools.name"].optional);
}
TEST_F(CollectionNestedFieldsTest, NestedObjectOfObjectEnableFacet) {
nlohmann::json schema = R"({
"name": "coll1",
"enable_nested_fields": true,
"fields": [
{"name": "variants", "type": "object"},
{"name": "variants\\..*\\.price", "type": "int64", "facet": true}
]
})"_json;
auto op = collectionManager.create_collection(schema);
ASSERT_TRUE(op.ok());
Collection* coll1 = op.get();
auto doc1 = R"({
"variants": {
"store_1": {"price": 100},
"store_2": {"price": 200}
}
})"_json;
auto add_op = coll1->add(doc1.dump(), CREATE);
ASSERT_TRUE(add_op.ok());
ASSERT_TRUE(coll1->get_schema()["variants.store_1.price"].facet);
ASSERT_TRUE(coll1->get_schema()["variants.store_2.price"].facet);
}
TEST_F(CollectionNestedFieldsTest, ArrayOfObjectsFaceting) {
nlohmann::json schema = R"({
"name": "coll1",