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
fix test and other improvements
krunalbbdf4d717e55
diff --git a/src/analytics_manager.cpp b/src/analytics_manager.cppindex e3d3e322..832cfaab 100644--- a/src/analytics_manager.cpp+++ b/src/analytics_manager.cpp@@ -226,36 +226,40 @@ void AnalyticsManager::add_suggestion(const std::string &query_collection, constOption<bool> AnalyticsManager::add_click_event(const std::string &query_collection, const std::string &query, const std::string &user_id,std::string doc_id, uint64_t position, const std::string& client_ip) {std::unique_lock lock(mutex);- auto &click_events_vec = query_collection_click_events[query_collection];+ if(analytics_store) {+ auto &click_events_vec = query_collection_click_events[query_collection];- auto now_ts_seconds = std::chrono::duration_cast<std::chrono::seconds>(- std::chrono::system_clock::now().time_since_epoch()).count();- auto events_cache_it = events_cache.find(client_ip);-- if(events_cache_it != events_cache.end()) {- //event found in events cache- if ((now_ts_seconds - events_cache_it->second.last_update_time) < CLICK_EVENTS_RATE_LIMIT_SEC) {- if (events_cache_it->second.count >= CLICK_EVENTS_RATE_LIMIT_COUNT) {- return Option<bool>(500, "click event rate limit reached.");+ auto now_ts_seconds = std::chrono::duration_cast<std::chrono::seconds>(+ std::chrono::system_clock::now().time_since_epoch()).count();+ auto events_cache_it = events_cache.find(client_ip);++ if (events_cache_it != events_cache.end()) {+ //event found in events cache+ if ((now_ts_seconds - events_cache_it->second.last_update_time) < CLICK_EVENTS_RATE_LIMIT_SEC) {+ if (events_cache_it->second.count >= CLICK_EVENTS_RATE_LIMIT_COUNT) {+ return Option<bool>(500, "click event rate limit reached.");+ } else {+ events_cache_it->second.count++;+ }} else {- events_cache_it->second.count++;+ events_cache_it->second.last_update_time = now_ts_seconds;+ events_cache_it->second.count = 1;}} else {- events_cache_it->second.last_update_time = now_ts_seconds;- events_cache_it->second.count = 1;+ event_cache_t eventCache{(uint64_t) now_ts_seconds, 1};+ events_cache.insert(client_ip, eventCache);}- } else {- event_cache_t eventCache{(uint64_t) now_ts_seconds, 1};- events_cache.insert(client_ip, eventCache);- }- auto now_ts_useconds = std::chrono::duration_cast<std::chrono::microseconds>(- std::chrono::system_clock::now().time_since_epoch()).count();+ auto now_ts_useconds = std::chrono::duration_cast<std::chrono::microseconds>(+ std::chrono::system_clock::now().time_since_epoch()).count();- ClickEvent click_event(query, now_ts_useconds, user_id, doc_id, position);- click_events_vec.emplace_back(click_event);+ ClickEvent click_event(query, now_ts_useconds, user_id, doc_id, position);+ click_events_vec.emplace_back(click_event);- return Option<bool>(true);+ return Option<bool>(true);+ }++ return Option<bool>(500, "Analytics Directory not provided.");}void AnalyticsManager::run(ReplicationState* raft_server) {diff --git a/src/typesense_server_utils.cpp b/src/typesense_server_utils.cppindex 24d20d42..f85bb98b 100644--- a/src/typesense_server_utils.cpp+++ b/src/typesense_server_utils.cpp@@ -65,7 +65,7 @@ void init_cmdline_options(cmdline::parser & options, int argc, char **argv) {options.add<std::string>("data-dir", 'd', "Directory where data will be stored.", true);options.add<std::string>("api-key", 'a', "API key that allows all operations.", true);options.add<std::string>("search-only-api-key", 's', "[DEPRECATED: use API key management end-point] API key that allows only searches.", false);- options.add<std::string>("analytics-dir", 'n', "Directory where Analytics will be stored.", false);+ options.add<std::string>("analytics-dir", '\0', "Directory where Analytics will be stored.", false);options.add<std::string>("api-address", '\0', "Address to which Typesense API service binds.", false, "0.0.0.0");options.add<uint32_t>("api-port", '\0', "Port on which Typesense API service listens.", false, 8108);diff --git a/test/analytics_manager_test.cpp b/test/analytics_manager_test.cppindex 973e098f..051ad579 100644--- a/test/analytics_manager_test.cpp+++ b/test/analytics_manager_test.cpp@@ -333,9 +333,7 @@ TEST_F(AnalyticsManagerTest, ClickEventsStoreRetrieveal) {req->body = click_events.dump();ASSERT_TRUE(post_replicate_click_event(req, res));- auto result_op = analyticsManager.get_click_events();- ASSERT_TRUE(result_op.ok());- auto result = result_op.get();+ auto result = analyticsManager.get_click_events();ASSERT_EQ("0", result[0]["collection_id"]);ASSERT_EQ("13", result[0]["data"]["user_id"]);