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
Alter schema + dynamic fields should add to fields.
Kishore Nallane926d775626b
diff --git a/src/collection.cpp b/src/collection.cppindex 4e0275b8..ebe6ce13 100644--- a/src/collection.cpp+++ b/src/collection.cpp@@ -2526,6 +2526,7 @@ Option<bool> Collection::batch_alter_data(const std::unordered_map<std::string,if(f.is_dynamic()) {// regexp fields and fields with auto type are treated as dynamic fieldsdynamic_fields.push_back(f);+ fields.push_back(f);continue;}diff --git a/test/collection_schema_change_test.cpp b/test/collection_schema_change_test.cppindex fff388b6..b0ae25f7 100644--- a/test/collection_schema_change_test.cpp+++ b/test/collection_schema_change_test.cpp@@ -114,13 +114,19 @@ TEST_F(CollectionSchemaChangeTest, AddNewFieldsToCollection) {// add a dynamic fieldschema_changes = R"({"fields": [- {"name": ".*_bool", "type": "bool"}+ {"name": ".*_bool", "type": "bool"},+ {"name": "age", "type": "auto", "optional": true}]})"_json;alter_op = coll1->alter(schema_changes);ASSERT_TRUE(alter_op.ok());+ auto coll_fields = coll1->get_fields();+ ASSERT_EQ(7, coll_fields.size());+ ASSERT_EQ("age", coll_fields[5].name);+ ASSERT_EQ(".*_bool", coll_fields[6].name);+doc["id"] = "1";doc["title"] = "The one";doc["tags"] = {"sports", "news"};@@ -128,6 +134,7 @@ TEST_F(CollectionSchemaChangeTest, AddNewFieldsToCollection) {doc["quantity"] = 200;doc["points"] = 100;doc["on_sale_bool"] = true;+ doc["age"] = 45;ASSERT_TRUE(coll1->add(doc.dump()).ok());@@ -142,6 +149,17 @@ TEST_F(CollectionSchemaChangeTest, AddNewFieldsToCollection) {ASSERT_EQ(1, results["found"].get<size_t>());ASSERT_STREQ("1", results["hits"][0]["document"]["id"].get<std::string>().c_str());+ results = coll1->search("*",+ {}, "age: 45", {}, {}, {0}, 3, 1, FREQUENCY,+ {true}, 5,+ spp::sparse_hash_set<std::string>(),+ spp::sparse_hash_set<std::string>(), 10, "", 30, 4, "title", 20, {}, {}, {}, 0,+ "<mark>", "</mark>", {}, 1000, true, false, true, "", false, 6000 * 1000, 4, 7, true,+ 4, {always}).get();++ ASSERT_EQ(1, results["found"].get<size_t>());+ ASSERT_STREQ("1", results["hits"][0]["document"]["id"].get<std::string>().c_str());+// add auto fieldschema_changes = R"({"fields": [@@ -201,10 +219,15 @@ TEST_F(CollectionSchemaChangeTest, AddNewFieldsToCollection) {alter_op = coll1->alter(schema_changes);ASSERT_TRUE(alter_op.ok());- ASSERT_EQ(8, coll1->get_schema().size());- ASSERT_EQ(9, coll1->get_fields().size());+ ASSERT_EQ(9, coll1->get_schema().size());+ ASSERT_EQ(12, coll1->get_fields().size());+ ASSERT_EQ(5, coll1->_get_index()->_get_numerical_index().size());- ASSERT_EQ(4, coll1->_get_index()->_get_numerical_index().size());+ // fields should also be persisted properly on disk+ std::string collection_meta_json;+ store->get(Collection::get_meta_key("coll1"), collection_meta_json);+ nlohmann::json collection_meta = nlohmann::json::parse(collection_meta_json);+ ASSERT_EQ(12, collection_meta["fields"].size());// try restoring collection from disk: all fields should be preservedcollectionManager.dispose();@@ -215,10 +238,9 @@ TEST_F(CollectionSchemaChangeTest, AddNewFieldsToCollection) {collectionManager.load(8, 1000);coll1 = collectionManager.get_collection("coll1").get();- ASSERT_EQ(8, coll1->get_schema().size());- ASSERT_EQ(9, coll1->get_fields().size());-- ASSERT_EQ(4, coll1->_get_index()->_get_numerical_index().size());+ ASSERT_EQ(9, coll1->get_schema().size());+ ASSERT_EQ(12, coll1->get_fields().size());+ ASSERT_EQ(5, coll1->_get_index()->_get_numerical_index().size());collectionManager.drop_collection("coll1");}@@ -512,3 +534,47 @@ TEST_F(CollectionSchemaChangeTest, AbilityToDropAndReAddIndexAtTheSameTime) {collectionManager.drop_collection("coll1");}++TEST_F(CollectionSchemaChangeTest, AddAndDropFieldImmediately) {+ std::vector<field> fields = {field("title", field_types::STRING, false, false, true, "", 1, 1),+ field("points", field_types::INT32, true),};++ Collection* coll1 = collectionManager.create_collection("coll1", 1, fields, "points", 0, "").get();++ nlohmann::json doc;+ doc["id"] = "0";+ doc["title"] = "The quick brown fox was too fast.";+ doc["points"] = 100;+ doc["quantity"] = 1000;++ ASSERT_TRUE(coll1->add(doc.dump()).ok());+ ASSERT_EQ(2, coll1->get_schema().size());++ auto results = coll1->search("*",+ {}, "", {}, {}, {0}, 3, 1, FREQUENCY, {true}, 5).get();++ ASSERT_EQ(1, results["found"].get<size_t>());+ ASSERT_EQ(1, results["hits"].size());+ ASSERT_STREQ("0", results["hits"][0]["document"]["id"].get<std::string>().c_str());++ // add a field via alter which we will try dropping immediately+ auto schema_changes = R"({+ "fields": [+ {"name": "quantity", "type": "int32", "optional": true}+ ]+ })"_json;++ auto alter_op = coll1->alter(schema_changes);+ ASSERT_TRUE(alter_op.ok());+ ASSERT_EQ(3, coll1->get_schema().size());++ schema_changes = R"({+ "fields": [+ {"name": "quantity", "drop": true}+ ]+ })"_json;++ alter_op = coll1->alter(schema_changes);+ ASSERT_TRUE(alter_op.ok());+ ASSERT_EQ(2, coll1->get_schema().size());+}