Open Source alternative to Algolia + Pinecone and an Easier-to-Use alternative to ElasticSearch ⚡ 🔍 ✨ Fast, typo tolerant, in-memory fuzzy Search Engine for building delightful search experiences
C++ algoliadatastoreelasticsearchenterprise-searchfacetingfull-text-searchfuzzy-searchgeosearchin-memoryinstantsearchmerchandisingpineconesearchsearch-enginesemantic-searchsimilarity-searchsite-searchsynonymstypo-tolerancevector-search
Fix nested alter drop + add.
Kishore Nallan383ed093f303
diff --git a/src/collection.cpp b/src/collection.cppindex 241f8684..6ebc2067 100644--- a/src/collection.cpp+++ b/src/collection.cpp@@ -3514,6 +3514,7 @@ Option<bool> Collection::validate_alter_payload(nlohmann::json& schema_changes,// basic validation of fieldsstd::vector<field> diff_fields;tsl::htrie_map<char, field> updated_search_schema = search_schema;+ tsl::htrie_map<char, field> updated_nested_fields = nested_fields;size_t num_auto_detect_fields = 0;// since fields can be deleted and added in the same change set,@@ -3573,6 +3574,7 @@ Option<bool> Collection::validate_alter_payload(nlohmann::json& schema_changes,if(found_field) {del_fields.push_back(field_it.value());updated_search_schema.erase(field_it.key());+ updated_nested_fields.erase(field_it.key());// handle nested fieldsif(field_it.value().nested && enable_nested_fields) {@@ -3675,7 +3677,7 @@ Option<bool> Collection::validate_alter_payload(nlohmann::json& schema_changes,}if(enable_nested_fields) {- field::flatten_stored_doc(document, nested_fields);+ field::flatten_stored_doc(document, updated_nested_fields);}if(!fallback_field_type.empty() || !new_dynamic_fields.empty() || !new_nested_fields.empty()) {diff --git a/test/collection_schema_change_test.cpp b/test/collection_schema_change_test.cppindex 91b65b68..de46e3df 100644--- a/test/collection_schema_change_test.cpp+++ b/test/collection_schema_change_test.cpp@@ -1337,3 +1337,73 @@ TEST_F(CollectionSchemaChangeTest, NestedFieldSchemaAdditions) {ASSERT_TRUE(res_op.ok());ASSERT_EQ(1, res_op.get()["found"].get<size_t>());}++TEST_F(CollectionSchemaChangeTest, DropAndReAddNestedObject) {+ nlohmann::json schema = R"({+ "name": "coll1",+ "enable_nested_fields": true,+ "fields": [+ {"name": "title", "type": "string"},+ {"name": "person", "type": "object"},+ {"name": "school.city", "type": "string"}+ ]+ })"_json;++ Collection* coll1 = collectionManager.create_collection(schema).get();++ nlohmann::json doc;+ doc["title"] = "Test";+ doc["person"] = nlohmann::json::object();+ doc["person"]["name"] = "Jack";+ doc["school"] = nlohmann::json::object();+ doc["school"]["city"] = "NYC";++ auto add_op = coll1->add(doc.dump());+ ASSERT_TRUE(add_op.ok());++ auto fields = coll1->get_fields();+ auto schema_map = coll1->get_schema();++ ASSERT_EQ(4, fields.size());+ ASSERT_EQ(4, schema_map.size());++ // drop + re-add object field++ auto schema_changes = R"({+ "fields": [+ {"name": "person", "drop": true},+ {"name": "person", "type": "object"}+ ]+ })"_json;++ auto alter_op = coll1->alter(schema_changes);+ ASSERT_TRUE(alter_op.ok());++ fields = coll1->get_fields();+ schema_map = coll1->get_schema();++ auto res_op = coll1->search("jack", {"person.name"}, "", {}, {}, {0}, 3, 1, FREQUENCY, {true}, 5);+ ASSERT_TRUE(res_op.ok());+ ASSERT_EQ(1, res_op.get()["found"].get<size_t>());++ ASSERT_EQ(4, fields.size());+ ASSERT_EQ(4, schema_map.size());++ // drop + re-add school++ schema_changes = R"({+ "fields": [+ {"name": "school.city", "drop": true},+ {"name": "school.city", "type": "string"}+ ]+ })"_json;++ alter_op = coll1->alter(schema_changes);+ ASSERT_TRUE(alter_op.ok());++ fields = coll1->get_fields();+ schema_map = coll1->get_schema();++ ASSERT_EQ(4, fields.size());+ ASSERT_EQ(4, schema_map.size());+}\ No newline at end of file