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: restore nested fields on collection restore.

Kishore Nallan088e90857620
diff --git a/src/collection_manager.cpp b/src/collection_manager.cpp
index 44e671c0..0492fb11 100644
--- a/src/collection_manager.cpp
+++ b/src/collection_manager.cpp
@@ -1213,6 +1213,10 @@ Option<bool> CollectionManager::load_collection(const nlohmann::json &collection
return Option<bool>(400, "Bad JSON.");
}
+ if(collection->get_enable_nested_fields()) {
+ field::flatten_stored_doc(document, collection->get_nested_fields());
+ }
+
auto dirty_values = DIRTY_VALUES::DROP;
num_valid_docs++;
diff --git a/test/collection_manager_test.cpp b/test/collection_manager_test.cpp
index e2115ef7..c20edb12 100644
--- a/test/collection_manager_test.cpp
+++ b/test/collection_manager_test.cpp
@@ -661,6 +661,77 @@ TEST_F(CollectionManagerTest, RestoreAutoSchemaDocsOnRestart) {
collectionManager2.drop_collection("coll1");
}
+TEST_F(CollectionManagerTest, RestoreNestedDocsOnRestart) {
+ nlohmann::json schema = R"({
+ "name": "coll1",
+ "enable_nested_fields": true,
+ "fields": [
+ {"name": "details", "type": "object[]" },
+ {"name": "company.name", "type": "string" },
+ {"name": "person", "type": "object"}
+ ]
+ })"_json;
+
+ auto op = collectionManager.create_collection(schema);
+ ASSERT_TRUE(op.ok());
+ Collection* coll1 = op.get();
+
+ auto doc1 = R"({
+ "details": [{"tags": ["foobar"]}],
+ "company": {"name": "Foobar Corp"},
+ "person": {"first_name": "Foobar"}
+ })"_json;
+
+ ASSERT_TRUE(coll1->add(doc1.dump(), CREATE).ok());
+
+ auto res_op = coll1->search("foobar", {"details"}, "", {}, {}, {0}, 10, 1,
+ token_ordering::FREQUENCY, {true});
+ ASSERT_TRUE(res_op.ok());
+ ASSERT_EQ(1, res_op.get()["found"].get<size_t>());
+
+ res_op = coll1->search("foobar", {"company.name"}, "", {}, {}, {0}, 10, 1,
+ token_ordering::FREQUENCY, {true});
+ ASSERT_TRUE(res_op.ok());
+ ASSERT_EQ(1, res_op.get()["found"].get<size_t>());
+
+ res_op = coll1->search("foobar", {"person"}, "", {}, {}, {0}, 10, 1,
+ token_ordering::FREQUENCY, {true});
+ ASSERT_TRUE(res_op.ok());
+ ASSERT_EQ(1, res_op.get()["found"].get<size_t>());
+
+ // create a new collection manager to ensure that it restores the records from the disk backed store
+ CollectionManager& collectionManager2 = CollectionManager::get_instance();
+ collectionManager2.init(store, 1.0, "auth_key", quit);
+ auto load_op = collectionManager2.load(8, 1000);
+
+ if(!load_op.ok()) {
+ LOG(ERROR) << load_op.error();
+ }
+
+ ASSERT_TRUE(load_op.ok());
+
+ auto restored_coll = collectionManager2.get_collection("coll1").get();
+ ASSERT_NE(nullptr, restored_coll);
+
+ res_op = restored_coll->search("foobar", {"details"}, "", {}, {}, {0}, 10, 1,
+ token_ordering::FREQUENCY, {true});
+ ASSERT_TRUE(res_op.ok());
+ ASSERT_EQ(1, res_op.get()["found"].get<size_t>());
+
+ res_op = restored_coll->search("foobar", {"company.name"}, "", {}, {}, {0}, 10, 1,
+ token_ordering::FREQUENCY, {true});
+ ASSERT_TRUE(res_op.ok());
+ ASSERT_EQ(1, res_op.get()["found"].get<size_t>());
+
+ res_op = restored_coll->search("foobar", {"person"}, "", {}, {}, {0}, 10, 1,
+ token_ordering::FREQUENCY, {true});
+ ASSERT_TRUE(res_op.ok());
+ ASSERT_EQ(1, res_op.get()["found"].get<size_t>());
+
+ collectionManager.drop_collection("coll1");
+ collectionManager2.drop_collection("coll1");
+}
+
TEST_F(CollectionManagerTest, DropCollectionCleanly) {
std::ifstream infile(std::string(ROOT_DIR)+"test/multi_field_documents.jsonl");
std::string json_line;