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

Merge branch 'v0.25' into bazel-build

Kishore Nallanc6ea968f015f
diff --cc .gitignore
index 07331e04,499331cd..d49bd333
--- a/.gitignore
+++ b/.gitignore
@@@ -8,4 -8,4 +8,5 @@@ cmake-build-debu
cmake-build-release
*.pem
.DS_Store
+/bazel-*
+ typesense-server-data/
diff --cc include/app_metrics.h
index 1ab2a6f9,a84fe3fc..5b9d388b
--- a/include/app_metrics.h
+++ b/include/app_metrics.h
@@@ -4,9 -4,9 +4,10 @@@
#include "json.hpp"
#include "logger.h"
#include "config.h"
+#include <mutex>
#include <string>
#include <shared_mutex>
+ #include <mutex>
#include <fstream>
class AppMetrics {
diff --cc test/collection_manager_test.cpp
index fdd3b4d4,c20edb12..c47e14e0
--- a/test/collection_manager_test.cpp
+++ b/test/collection_manager_test.cpp
@@@ -492,8 -661,79 +661,79 @@@ TEST_F(CollectionManagerTest, RestoreAu
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::ifstream infile("test/multi_field_documents.jsonl");
std::string json_line;
while (std::getline(infile, json_line)) {