Skip to content

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

Fix dropping a nested child field.

Kishore Nallan6d1e9f07cff8
diff --git a/src/collection.cpp b/src/collection.cpp
index 717f99ac..4caac503 100644
--- a/src/collection.cpp
+++ b/src/collection.cpp
@@ -4376,6 +4376,23 @@ Option<bool> Collection::validate_alter_payload(nlohmann::json& schema_changes,
for(auto& new_field: new_fields) {
if(updated_search_schema.find(new_field.name) == updated_search_schema.end()) {
+ if(new_field.nested) {
+ auto del_field_it = std::find_if(del_fields.begin(), del_fields.end(), [&new_field](const field& f) {
+ return f.name == new_field.name;
+ });
+
+ auto re_field_it = std::find_if(reindex_fields.begin(),
+ reindex_fields.end(), [&new_field](const field& f) {
+ return f.name == new_field.name;
+ });
+
+ if(del_field_it != del_fields.end() && re_field_it == reindex_fields.end()) {
+ // If the discovered field is already being deleted and is not part of reindex fields,
+ // we should ignore. This can happen when we are trying to drop a nested object's child.
+ continue;
+ }
+ }
+
reindex_fields.push_back(new_field);
updated_search_schema[new_field.name] = new_field;
if(new_field.nested) {
diff --git a/test/collection_schema_change_test.cpp b/test/collection_schema_change_test.cpp
index 7e454860..5e741a0d 100644
--- a/test/collection_schema_change_test.cpp
+++ b/test/collection_schema_change_test.cpp
@@ -1540,6 +1540,75 @@ TEST_F(CollectionSchemaChangeTest, GeoFieldSchemaAddition) {
ASSERT_EQ(2, res_op.get()["found"].get<size_t>());
}
+TEST_F(CollectionSchemaChangeTest, NestedFieldDrop) {
+ nlohmann::json schema = R"({
+ "name": "docs",
+ "enable_nested_fields": true,
+ "fields": [
+ {"name": "shops", "type": "object[]", "index": true, "optional": true},
+ {"name": "shops.is_available", "type": "bool[]", "index": true, "optional": true}
+ ]
+ })"_json;
+
+ TextEmbedderManager::set_model_dir("/tmp/typesense_test/models");
+
+ auto op = collectionManager.create_collection(schema);
+ ASSERT_TRUE(op.ok());
+ Collection* coll = op.get();
+
+ nlohmann::json doc;
+ doc["shops"][0]["is_available"] = false;
+ coll->add(doc.dump());
+
+ nlohmann::json schema_change = R"({
+ "fields": [
+ {"name": "shops.is_available", "drop": true}
+ ]
+ })"_json;
+
+ auto schema_change_op = coll->alter(schema_change);
+ ASSERT_TRUE(schema_change_op.ok());
+
+ auto actual_schema = coll->get_schema();
+ ASSERT_EQ(1, actual_schema.size());
+ ASSERT_EQ(1, actual_schema.count("shops"));
+}
+
+TEST_F(CollectionSchemaChangeTest, NestedFieldReIndex) {
+ nlohmann::json schema = R"({
+ "name": "docs",
+ "enable_nested_fields": true,
+ "fields": [
+ {"name": "shops", "type": "object[]"},
+ {"name": "shops.is_available", "type": "bool[]"}
+ ]
+ })"_json;
+
+ TextEmbedderManager::set_model_dir("/tmp/typesense_test/models");
+
+ auto op = collectionManager.create_collection(schema);
+ ASSERT_TRUE(op.ok());
+ Collection* coll = op.get();
+
+ nlohmann::json doc;
+ doc["shops"][0]["is_available"] = false;
+ coll->add(doc.dump());
+
+ nlohmann::json schema_change = R"({
+ "fields": [
+ {"name": "shops.is_available", "drop": true},
+ {"name": "shops.is_available", "type": "bool[]", "facet": true}
+ ]
+ })"_json;
+
+ auto schema_change_op = coll->alter(schema_change);
+ ASSERT_TRUE(schema_change_op.ok());
+
+ auto actual_schema = coll->get_schema();
+ ASSERT_EQ(2, actual_schema.size());
+ ASSERT_TRUE(actual_schema["shops.is_available"].facet);
+}
+
TEST_F(CollectionSchemaChangeTest, UpdateSchemaWithNewEmbeddingField) {
nlohmann::json schema = R"({
"name": "objects",