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

rename noresults_queries to nohits_queries

krunal5b4df3211cfe
diff --git a/include/analytics_manager.h b/include/analytics_manager.h
index 47688780..02a94bdd 100644
--- a/include/analytics_manager.h
+++ b/include/analytics_manager.h
@@ -93,8 +93,8 @@ private:
// suggestion collection => popular queries
std::unordered_map<std::string, QueryAnalytics*> popular_queries;
- // suggestion collection => noresults queries
- std::unordered_map<std::string, QueryAnalytics*> noresults_queries;
+ // suggestion collection => nohits queries
+ std::unordered_map<std::string, QueryAnalytics*> nohits_queries;
//query collection => click events
std::unordered_map<std::string, std::vector<ClickEvent>> query_collection_click_events;
@@ -117,7 +117,7 @@ public:
static constexpr const char* ANALYTICS_RULE_PREFIX = "$AR";
static constexpr const char* CLICK_EVENT = "$CE";
static constexpr const char* POPULAR_QUERIES_TYPE = "popular_queries";
- static constexpr const char* NORESULTS_QUERIES_TYPE = "noresults_queries";
+ static constexpr const char* NOHITS_QUERIES_TYPE = "nohits_queries";
static AnalyticsManager& get_instance() {
static AnalyticsManager instance;
@@ -159,10 +159,10 @@ public:
Option<bool> write_click_event_to_store(nlohmann::json& click_event_json);
- void add_noresults_query(const std::string& query_collection,
- const std::string& query, bool live_query, const std::string& user_id);
+ void add_nohits_query(const std::string& query_collection,
+ const std::string& query, bool live_query, const std::string& user_id);
- std::unordered_map<std::string, QueryAnalytics*> get_noresults_queries();
+ std::unordered_map<std::string, QueryAnalytics*> get_nohits_queries();
void resetRateLimit();
};
diff --git a/src/analytics_manager.cpp b/src/analytics_manager.cpp
index c6e658ed..3b88e1be 100644
--- a/src/analytics_manager.cpp
+++ b/src/analytics_manager.cpp
@@ -41,7 +41,7 @@ Option<bool> AnalyticsManager::create_rule(nlohmann::json& payload, bool upsert,
return Option<bool>(400, "Bad or missing params.");
}
- if(payload["type"] == POPULAR_QUERIES_TYPE || payload["type"] == NORESULTS_QUERIES_TYPE) {
+ if(payload["type"] == POPULAR_QUERIES_TYPE || payload["type"] == NOHITS_QUERIES_TYPE) {
return create_queries_index(payload, upsert, write_to_disk);
}
@@ -92,8 +92,8 @@ Option<bool> AnalyticsManager::create_queries_index(nlohmann::json &payload, boo
if (!upsert && popular_queries.count(suggestion_collection) != 0) {
return Option<bool>(400, "There's already another configuration for this destination collection.");
}
- } else if(payload["type"] == NORESULTS_QUERIES_TYPE) {
- if (!upsert && noresults_queries.count(suggestion_collection) != 0) {
+ } else if(payload["type"] == NOHITS_QUERIES_TYPE) {
+ if (!upsert && nohits_queries.count(suggestion_collection) != 0) {
return Option<bool>(400, "There's already another configuration for this destination collection.");
}
}
@@ -126,9 +126,9 @@ Option<bool> AnalyticsManager::create_queries_index(nlohmann::json &payload, boo
if(payload["type"] == POPULAR_QUERIES_TYPE) {
QueryAnalytics *popularQueries = new QueryAnalytics(limit);
popular_queries.emplace(suggestion_collection, popularQueries);
- } else if(payload["type"] == NORESULTS_QUERIES_TYPE) {
+ } else if(payload["type"] == NOHITS_QUERIES_TYPE) {
QueryAnalytics *noresultsQueries = new QueryAnalytics(limit);
- noresults_queries.emplace(suggestion_collection, noresultsQueries);
+ nohits_queries.emplace(suggestion_collection, noresultsQueries);
}
if(write_to_disk) {
@@ -149,7 +149,7 @@ AnalyticsManager::~AnalyticsManager() {
delete kv.second;
}
- for(auto& kv: noresults_queries) {
+ for(auto& kv: nohits_queries) {
delete kv.second;
}
}
@@ -212,9 +212,9 @@ Option<bool> AnalyticsManager::remove_queries_index(const std::string &name) {
popular_queries.erase(suggestion_collection);
}
- if(noresults_queries.count(suggestion_collection) != 0) {
- delete noresults_queries[suggestion_collection];
- noresults_queries.erase(suggestion_collection);
+ if(nohits_queries.count(suggestion_collection) != 0) {
+ delete nohits_queries[suggestion_collection];
+ nohits_queries.erase(suggestion_collection);
}
suggestion_configs.erase(name);
@@ -283,15 +283,15 @@ Option<bool> AnalyticsManager::add_click_event(const std::string &query_collecti
return Option<bool>(true);
}
-void AnalyticsManager::add_noresults_query(const std::string &query_collection, const std::string &query,
- bool live_query, const std::string &user_id) {
+void AnalyticsManager::add_nohits_query(const std::string &query_collection, const std::string &query,
+ bool live_query, const std::string &user_id) {
// look up suggestion collections for the query collection
std::unique_lock lock(mutex);
const auto& suggestion_collections_it = query_collection_mapping.find(query_collection);
if(suggestion_collections_it != query_collection_mapping.end()) {
for(const auto& suggestion_collection: suggestion_collections_it->second) {
- const auto& noresults_queries_it = noresults_queries.find(suggestion_collection);
- if(noresults_queries_it != noresults_queries.end()) {
+ const auto& noresults_queries_it = nohits_queries.find(suggestion_collection);
+ if(noresults_queries_it != nohits_queries.end()) {
noresults_queries_it->second->add(query, live_query, user_id);
}
}
@@ -380,7 +380,7 @@ void AnalyticsManager::persist_query_events(ReplicationState *raft_server, uint6
const std::string& suggestion_coll = suggestion_config.second.suggestion_collection;
auto popular_queries_it = popular_queries.find(suggestion_coll);
- auto noresults_queries_it = noresults_queries.find(suggestion_coll);
+ auto nohits_queries_it = nohits_queries.find(suggestion_coll);
// need to prepare the counts as JSON docs for import into the suggestion collection
// {"id": "432432", "q": "foo", "$operations": {"increment": {"count": 100}}}
@@ -399,16 +399,16 @@ void AnalyticsManager::persist_query_events(ReplicationState *raft_server, uint6
send_http_response(popularQueries, import_payload, suggestion_coll, "popular queries");
}
- if(noresults_queries_it != noresults_queries.end()) {
+ if(nohits_queries_it != nohits_queries.end()) {
import_payload.clear();
- QueryAnalytics *noresultsQueries = noresults_queries_it->second;
+ QueryAnalytics *nohitsQueries = nohits_queries_it->second;
// aggregate prefix queries to their final form
auto now = std::chrono::system_clock::now().time_since_epoch();
auto now_ts_us = std::chrono::duration_cast<std::chrono::microseconds>(now).count();
- noresultsQueries->compact_user_queries(now_ts_us);
+ nohitsQueries->compact_user_queries(now_ts_us);
- noresultsQueries->serialize_as_docs(import_payload);
- send_http_response(noresultsQueries, import_payload, suggestion_coll, "noresults queries");
+ nohitsQueries->serialize_as_docs(import_payload);
+ send_http_response(nohitsQueries, import_payload, suggestion_coll, "nohits queries");
}
if(import_payload.empty()) {
@@ -472,11 +472,11 @@ void AnalyticsManager::dispose() {
popular_queries.clear();
- for(auto& kv: noresults_queries) {
+ for(auto& kv: nohits_queries) {
delete kv.second;
}
- noresults_queries.clear();
+ nohits_queries.clear();
}
void AnalyticsManager::init(Store* store, Store* analytics_store) {
@@ -489,9 +489,9 @@ std::unordered_map<std::string, QueryAnalytics*> AnalyticsManager::get_popular_q
return popular_queries;
}
-std::unordered_map<std::string, QueryAnalytics*> AnalyticsManager::get_noresults_queries() {
+std::unordered_map<std::string, QueryAnalytics*> AnalyticsManager::get_nohits_queries() {
std::unique_lock lk(mutex);
- return noresults_queries;
+ return nohits_queries;
}
nlohmann::json AnalyticsManager::get_click_events() {
diff --git a/src/collection_manager.cpp b/src/collection_manager.cpp
index 32001590..ca6fbeb0 100644
--- a/src/collection_manager.cpp
+++ b/src/collection_manager.cpp
@@ -1536,8 +1536,8 @@ Option<bool> CollectionManager::do_search(std::map<std::string, std::string>& re
true, req_params["x-typesense-user-id"]);
} else if(result.contains("found") == 0 && result["found"].get<size_t>() == 0) {
std::string analytics_query = Tokenizer::normalize_ascii_no_spaces(raw_query);
- AnalyticsManager::get_instance().add_noresults_query(orig_coll_name, analytics_query,
- true, req_params["x-typesense-user-id"]);
+ AnalyticsManager::get_instance().add_nohits_query(orig_coll_name, analytics_query,
+ true, req_params["x-typesense-user-id"]);
}
}
diff --git a/test/analytics_manager_test.cpp b/test/analytics_manager_test.cpp
index 26b4a20e..4eea0a4f 100644
--- a/test/analytics_manager_test.cpp
+++ b/test/analytics_manager_test.cpp
@@ -411,7 +411,7 @@ TEST_F(AnalyticsManagerTest, NoresultsQueries) {
nlohmann::json analytics_rule = R"({
"name": "search_queries",
- "type": "noresults_queries",
+ "type": "nohits_queries",
"params": {
"limit": 100,
"source": {
@@ -427,17 +427,17 @@ TEST_F(AnalyticsManagerTest, NoresultsQueries) {
ASSERT_TRUE(create_op.ok());
std::string q = "foobar";
- analyticsManager.add_noresults_query("titles", q, true, "1");
+ analyticsManager.add_nohits_query("titles", q, true, "1");
- auto noresults_queries = analyticsManager.get_noresults_queries();
+ auto noresults_queries = analyticsManager.get_nohits_queries();
auto userQueries = noresults_queries["top_queries"]->get_user_prefix_queries()["1"];
ASSERT_EQ(1, userQueries.size());
ASSERT_EQ("foobar", userQueries[0].query);
- //try deleting noresults_queries rule
+ //try deleting nohits_queries rule
ASSERT_TRUE(analyticsManager.remove_rule("search_queries").ok());
- noresults_queries = analyticsManager.get_noresults_queries();
+ noresults_queries = analyticsManager.get_nohits_queries();
ASSERT_EQ(0, noresults_queries.size());
}
\ No newline at end of file