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
refactor
krunal78576941cdc0
diff --git a/include/core_api.h b/include/core_api.hindex 6d4fe6a9..2b813f5c 100644--- a/include/core_api.h+++ b/include/core_api.h@@ -69,7 +69,7 @@ bool get_stopwords(const std::shared_ptr<http_req>& req, const std::shared_ptr<hbool get_stopword(const std::shared_ptr<http_req>& req, const std::shared_ptr<http_res>& res);-bool put_upsert_stopword(const std::shared_ptr<http_req>& req, const std::shared_ptr<http_res>& res);+bool upsert_stopword(const std::shared_ptr<http_req>& req, const std::shared_ptr<http_res>& res);bool del_stopword(const std::shared_ptr<http_req>& req, const std::shared_ptr<http_res>& res);diff --git a/src/core_api.cpp b/src/core_api.cppindex fbd1579d..ac12d340 100644--- a/src/core_api.cpp+++ b/src/core_api.cpp@@ -1899,9 +1899,9 @@ bool get_stopwords(const std::shared_ptr<http_req>& req, const std::shared_ptr<hfor(const auto& stopwords_kv: stopwords) {nlohmann::json stopword;- stopword["name"] = stopwords_kv.first;+ stopword["id"] = stopwords_kv.first;for(const auto& val : stopwords_kv.second) {- stopword["value"].push_back(val);+ stopword["stopwords"].push_back(val);}res_json["stopwords"].push_back(stopword);}@@ -1911,7 +1911,7 @@ bool get_stopwords(const std::shared_ptr<http_req>& req, const std::shared_ptr<h}bool get_stopword(const std::shared_ptr<http_req>& req, const std::shared_ptr<http_res>& res) {- const std::string & stopword_name = req->params["stopword_name"];+ const std::string & stopword_name = req->params["name"];StopwordsManager& stopwordManager = StopwordsManager::get_instance();spp::sparse_hash_set<std::string> stopwords;@@ -1932,7 +1932,7 @@ bool get_stopword(const std::shared_ptr<http_req>& req, const std::shared_ptr<htreturn true;}-bool put_upsert_stopword(const std::shared_ptr<http_req>& req, const std::shared_ptr<http_res>& res) {+bool upsert_stopword(const std::shared_ptr<http_req>& req, const std::shared_ptr<http_res>& res) {nlohmann::json req_json;try {@@ -1977,9 +1977,9 @@ bool del_stopword(const std::shared_ptr<http_req>& req, const std::shared_ptr<ht}nlohmann::json res_json;- res_json["name"] = stopword_name;+ res_json["id"] = stopword_name;for(const auto& stopword : stopwords) {- res_json["value"].push_back(stopword);+ res_json["stopwords"].push_back(stopword);}res->set_200(res_json.dump());diff --git a/src/main/typesense_server.cpp b/src/main/typesense_server.cppindex 735b70e8..addaa02c 100644--- a/src/main/typesense_server.cpp+++ b/src/main/typesense_server.cpp@@ -70,7 +70,7 @@ void master_server_routes() {server->get("/stopwords", get_stopwords);server->get("/stopwords/:name", get_stopword);- server->put("/stopwords/:name", put_upsert_stopword);+ server->put("/stopwords/:name", upsert_stopword);server->del("/stopwords/:name", del_stopword);// analyticsdiff --git a/src/stopwords_manager.cpp b/src/stopwords_manager.cppindex f24cb8ab..3d608830 100644--- a/src/stopwords_manager.cpp+++ b/src/stopwords_manager.cpp@@ -28,6 +28,7 @@ Option<bool> StopwordsManager::upsert_stopword(const std::string& stopword_name,const char* STOPWORD_VALUES = "stopwords";const char* STOPWORD_LOCALE = "locale";+ bool locale_exist = false;if(stopwords_json.count(STOPWORD_VALUES) == 0){return Option<bool>(400, (std::string("Parameter `") + STOPWORD_VALUES + "` is required"));@@ -37,12 +38,11 @@ Option<bool> StopwordsManager::upsert_stopword(const std::string& stopword_name,return Option<bool>(400, (std::string("Parameter `") + STOPWORD_VALUES + "` is required as string array value"));}- if(stopwords_json.count(STOPWORD_LOCALE) == 0) {- return Option<bool>(400, (std::string("Parameter `") + STOPWORD_LOCALE + "` is required"));- }-- if(!stopwords_json[STOPWORD_LOCALE].is_string()) {- return Option<bool>(400, (std::string("Parameter `") + STOPWORD_LOCALE + "` is required as string value"));+ if(stopwords_json.count(STOPWORD_LOCALE) != 0) {+ locale_exist = true;+ if (!stopwords_json[STOPWORD_LOCALE].is_string()) {+ return Option<bool>(400, (std::string("Parameter `") + STOPWORD_LOCALE + "` is required as string value"));+ }}if(write_to_store) {@@ -55,7 +55,7 @@ Option<bool> StopwordsManager::upsert_stopword(const std::string& stopword_name,std::vector<std::string> tokens;spp::sparse_hash_set<std::string> stopwords_set;const auto& stopwords = stopwords_json[STOPWORD_VALUES];- const auto& locale = stopwords_json[STOPWORD_LOCALE];+ const auto& locale = locale_exist? stopwords_json[STOPWORD_LOCALE] : "";for (const auto &stopword: stopwords.items()) {const auto& val = stopword.value().get<std::string>();diff --git a/test/stopwords_manager_test.cpp b/test/stopwords_manager_test.cppindex 8653af19..ce02fbbe 100644--- a/test/stopwords_manager_test.cpp+++ b/test/stopwords_manager_test.cpp@@ -211,7 +211,7 @@ TEST_F(StopwordsManagerTest, StopwordsBasics) {req->params["name"] = "articles";req->body = stopword_value.dump();- auto result = put_upsert_stopword(req, res);+ auto result = upsert_stopword(req, res);if(!result) {LOG(ERROR) << res->body;FAIL();@@ -247,7 +247,7 @@ TEST_F(StopwordsManagerTest, StopwordsBasics) {req->params["name"] = "continents";req->body = stopword_value.dump();- result = put_upsert_stopword(req, res);+ result = upsert_stopword(req, res);if(!result) {LOG(ERROR) << res->body;FAIL();@@ -328,20 +328,8 @@ TEST_F(StopwordsManagerTest, StopwordsValidation) {std::shared_ptr<http_req> req = std::make_shared<http_req>();std::shared_ptr<http_res> res = std::make_shared<http_res>(nullptr);- auto stopword_value = R"(- {"stopwords": ["america", "europe"]}- )"_json;-- req->params["collection"] = "coll1";- req->params["name"] = "continents";- req->body = stopword_value.dump();-- auto result = put_upsert_stopword(req, res);- ASSERT_EQ(400, res->status_code);- ASSERT_EQ("{\"message\": \"Parameter `locale` is required\"}", res->body);-//with a typo- stopword_value = R"(+ auto stopword_value = R"({"stopword": ["america", "europe"], "locale": "en"})"_json;@@ -349,7 +337,7 @@ TEST_F(StopwordsManagerTest, StopwordsValidation) {req->params["name"] = "continents";req->body = stopword_value.dump();- result = put_upsert_stopword(req, res);+ auto result = upsert_stopword(req, res);ASSERT_EQ(400, res->status_code);ASSERT_STREQ("{\"message\": \"Parameter `stopwords` is required\"}", res->body.c_str());@@ -362,7 +350,7 @@ TEST_F(StopwordsManagerTest, StopwordsValidation) {req->params["name"] = "continents";req->body = stopword_value.dump();- result = put_upsert_stopword(req, res);+ result = upsert_stopword(req, res);ASSERT_EQ(400, res->status_code);ASSERT_STREQ("{\"message\": \"Parameter `locale` is required as string value\"}", res->body.c_str());@@ -374,7 +362,7 @@ TEST_F(StopwordsManagerTest, StopwordsValidation) {req->params["name"] = "continents";req->body = stopword_value.dump();- result = put_upsert_stopword(req, res);+ result = upsert_stopword(req, res);ASSERT_EQ(400, res->status_code);ASSERT_STREQ("{\"message\": \"Parameter `stopwords` is required as string array value\"}", res->body.c_str());@@ -404,7 +392,7 @@ TEST_F(StopwordsManagerTest, ReloadStopwordsOnRestart) {req->params["name"] = "genre";req->body = stopword_value.dump();- auto result = put_upsert_stopword(req, res);+ auto result = upsert_stopword(req, res);if(!result) {LOG(ERROR) << res->body;FAIL();