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
Analytics manager refactor (#1860)
Krunal Gandhica2ec6a38300
diff --git a/include/analytics_manager.h b/include/analytics_manager.hindex 82e4e9ae..726486fe 100644--- a/include/analytics_manager.h+++ b/include/analytics_manager.h@@ -13,6 +13,7 @@ struct event_type_collection {std::string collection;bool log_to_store = false;std::string analytic_rule;+ QueryAnalytics* queries_ptr = nullptr;};struct event_t {@@ -166,6 +167,7 @@ public:static constexpr const char* CONVERSION_EVENT = "conversion";static constexpr const char* VISIT_EVENT = "visit";static constexpr const char* CUSTOM_EVENT = "custom";+ static constexpr const char* SEARCH_EVENT = "search";static AnalyticsManager& get_instance() {static AnalyticsManager instance;diff --git a/src/analytics_manager.cpp b/src/analytics_manager.cppindex 48823188..f7dd64e9 100644--- a/src/analytics_manager.cpp+++ b/src/analytics_manager.cpp@@ -10,23 +10,6 @@#define EVENTS_RATE_LIMIT_COUNT 5Option<bool> AnalyticsManager::create_rule(nlohmann::json& payload, bool upsert, bool write_to_disk) {- /*- Sample payload:-- {- "name": "top_search_queries",- "type": "popular_queries",- "params": {- "limit": 1000,- "source": {- "collections": ["brands", "products"]- },- "destination": {- "collection": "top_search_queries"- }- }- }- */if(!payload.contains("type") || !payload["type"].is_string()) {return Option<bool>(400, "Request payload contains invalid type.");@@ -84,47 +67,47 @@ Option<bool> AnalyticsManager::create_index(nlohmann::json &payload, bool upsertsuggestion_config.expand_query = expand_query;suggestion_config.rule_type = payload["type"];- if(payload["type"] == LOG_TYPE) {+ //for counter events source collections are not needed+ if(payload["type"] != COUNTER_TYPE) {if(!params["source"].contains("collections") || !params["source"]["collections"].is_array()) {return Option<bool>(400, "Must contain a valid list of source collections.");}- if(!params["source"].contains("events") || (params["source"].contains("events") &&- (params["source"]["events"].empty()- || !params["source"]["events"].is_array()- || !params["source"]["events"][0].is_object()))) {- return Option<bool>(400, "Bad or missing events.");- }+ for(const auto& coll: params["source"]["collections"]) {+ if(!coll.is_string()) {+ return Option<bool>(400, "Must contain a valid list of source collection names.");+ }- suggestion_config.events = params["source"]["events"];+ const std::string& src_collection = coll.get<std::string>();+ suggestion_config.query_collections.push_back(src_collection);- suggestion_collection = params["source"]["collections"][0].get<std::string>();- suggestion_config.suggestion_collection = suggestion_collection;- } else {- if(payload["type"] == COUNTER_TYPE) {- if(!params["source"].contains("events") || (params["source"].contains("events") &&- (params["source"]["events"].empty()- || !params["source"]["events"].is_array()- || !params["source"]["events"][0].is_object()))) {- return Option<bool>(400, "Bad or missing events.");+ //for log type rule+ if(payload["type"] == LOG_TYPE) {+ suggestion_collection = src_collection;}-- suggestion_config.events = params["source"]["events"];}+ }+ bool valid_events_found = params["source"].contains("events") && !params["source"]["events"].empty()+ && params["source"]["events"].is_array()+ && params["source"]["events"][0].is_object();++ if(valid_events_found) {+ suggestion_config.events = params["source"]["events"];+ } else if(payload["type"] == LOG_TYPE || payload["type"] == COUNTER_TYPE) {+ //events array is mandatory for LOG and COUNTER EVENTS+ return Option<bool>(400, "Bad or missing events.");+ }++ if(payload["type"] != LOG_TYPE) {if(!params.contains("destination") || !params["destination"].is_object()) {return Option<bool>(400, "Bad or missing destination.");}- if(!params["source"].contains("collections") || !params["source"]["collections"].is_array()) {- return Option<bool>(400, "Must contain a valid list of source collections.");- }-if(!params["destination"].contains("collection") || !params["destination"]["collection"].is_string()) {return Option<bool>(400, "Must contain a valid destination collection.");}-if(params["destination"].contains("counter_field")) {if(!params["destination"]["counter_field"].is_string()) {return Option<bool>(400, "Must contain a valid counter_field.");@@ -134,17 +117,8 @@ Option<bool> AnalyticsManager::create_index(nlohmann::json &payload, bool upsert}suggestion_collection = params["destination"]["collection"].get<std::string>();- suggestion_config.suggestion_collection = suggestion_collection;}- for(const auto& coll: params["source"]["collections"]) {- if(!coll.is_string()) {- return Option<bool>(400, "Must contain a valid list of source collection names.");- }-- const std::string& src_collection = coll.get<std::string>();- suggestion_config.query_collections.push_back(src_collection);- }if(payload["type"] == POPULAR_QUERIES_TYPE) {if(!upsert && popular_queries.count(suggestion_collection) != 0) {return Option<bool>(400, "There's already another configuration for this destination collection.");@@ -179,12 +153,14 @@ Option<bool> AnalyticsManager::create_index(nlohmann::json &payload, bool upsert}}- suggestion_configs.emplace(suggestion_config_name, suggestion_config);-- for(const auto& query_coll: suggestion_config.query_collections) {- query_collection_mapping[query_coll].push_back(suggestion_collection);+ if(query_collection_events.count(suggestion_collection) == 0) {+ std::vector<event_t> vec;+ query_collection_events.emplace(suggestion_collection, vec);}+ std::map<std::string, uint16_t> event_weight_map;+ bool log_to_store = payload["type"] == LOG_TYPE ? true : false;+if(payload["type"] == POPULAR_QUERIES_TYPE) {QueryAnalytics* popularQueries = new QueryAnalytics(limit);popularQueries->set_expand_query(suggestion_config.expand_query);@@ -192,54 +168,55 @@ Option<bool> AnalyticsManager::create_index(nlohmann::json &payload, bool upsert} else if(payload["type"] == NOHITS_QUERIES_TYPE) {QueryAnalytics* noresultsQueries = new QueryAnalytics(limit);nohits_queries.emplace(suggestion_collection, noresultsQueries);- } else if(payload["type"] == COUNTER_TYPE) {- if(query_collection_events.count(suggestion_collection) == 0) {- std::vector<event_t> vec;- query_collection_events.emplace(suggestion_collection, vec);- }+ }- std::map<std::string, uint16_t> event_weight_map;+ if(valid_events_found) {for(const auto& event: params["source"]["events"]) {if(!event.contains("name") || event_collection_map.count(event["name"]) != 0) {- remove_index(suggestion_config_name);return Option<bool>(400, "Events must contain a unique name.");}- if(!event.contains("weight") || !event["weight"].is_number()) {- remove_index(suggestion_config_name);- return Option<bool>(400, "Counter events must contain a weight value.");- }- //store event name to their weights- //which can be used to keep counter events separate from non counter events- bool log_to_store = false;- if(event.contains("log_to_store")) {- log_to_store = event["log_to_store"].get<bool>();+ if(payload["type"] == COUNTER_TYPE) {+ if(!event.contains("weight") || !event["weight"].is_number()) {+ return Option<bool>(400, "Counter events must contain a weight value.");+ }++ //store event name to their weights+ //which can be used to keep counter events separate from non counter events+ if(event.contains("log_to_store")) {+ log_to_store = event["log_to_store"].get<bool>();- if(log_to_store && !analytics_store) {- remove_index(suggestion_config_name);- return Option<bool>(400, "Event can't be logged when analytics-db is not defined.");+ if(log_to_store && !analytics_store) {+ return Option<bool>(400, "Event can't be logged when analytics-db is not defined.");+ }}+ event_weight_map[event["name"]] = event["weight"];}- event_weight_map[event["name"]] = event["weight"];+event_type_collection ec{event["type"], suggestion_collection, log_to_store, suggestion_config_name};- event_collection_map.emplace(event["name"], ec);- }- counter_events.emplace(suggestion_collection, counter_event_t{counter_field, {}, event_weight_map});- } else if(payload["type"] == LOG_TYPE) {- //multiple event types can be used with one collection- //hence if no events are created for collection then only initialize it- if(query_collection_events.count(suggestion_collection) == 0) {- std::vector<event_t> vec;- query_collection_events.emplace(suggestion_collection, vec);- }- for(const auto& event: params["source"]["events"]) {- if(!event.contains("name") || event_collection_map.count(event["name"]) != 0) {- return Option<bool>(400, "Events must contain a unique name.");+ //keep pointer for /events API+ if(payload["type"] == POPULAR_QUERIES_TYPE) {+ ec.queries_ptr = popular_queries.at(suggestion_collection);+ } else if(payload["type"] == NOHITS_QUERIES_TYPE) {+ ec.queries_ptr = nohits_queries.at(suggestion_collection);}- event_type_collection ec{event["type"], suggestion_collection, true, suggestion_config_name};+event_collection_map.emplace(event["name"], ec);}++ //store counter events data+ if(payload["type"] == COUNTER_TYPE) {+ counter_events.emplace(suggestion_collection, counter_event_t{counter_field, {}, event_weight_map});+ }+ }++ suggestion_config.suggestion_collection = suggestion_collection;++ suggestion_configs.emplace(suggestion_config_name, suggestion_config);++ for(const auto& query_coll: suggestion_config.query_collections) {+ query_collection_mapping[query_coll].push_back(suggestion_collection);}if(write_to_disk) {@@ -442,7 +419,17 @@ Option<bool> AnalyticsManager::add_event(const std::string& client_ip, const stdstd::string doc_id;std::vector<std::pair<std::string, std::string>> custom_data;- if (event_type == CUSTOM_EVENT) {+ if(event_type == SEARCH_EVENT) {+ query = event_json["q"].get<std::string>();+ user_id = event_json["user_id"].get<std::string>();++ //add to respective popular queries/nohits queries+ if(event_collection_map_it->second.queries_ptr) {+ event_collection_map_it->second.queries_ptr->add(query, query, false, user_id);+ } else {+ return Option<bool>(500, "Error in /events endpoint for event " + event_name);+ }+ } else if (event_type == CUSTOM_EVENT) {for(auto itr = event_json.begin(); itr != event_json.end(); ++itr) {if (itr.key() == "query") {query = itr.value().get<std::string>();@@ -457,7 +444,7 @@ Option<bool> AnalyticsManager::add_event(const std::string& client_ip, const std}} else {query = event_json.contains("q") ? event_json["q"].get<std::string>() : "";- user_id = event_json["user_id"].get<std::string>();+ user_id = event_json.contains("user_id") ? event_json["user_id"].get<std::string>() : "";doc_id = event_json["doc_id"].get<std::string>();}@@ -703,6 +690,7 @@ void AnalyticsManager::persist_popular_events(ReplicationState *raft_server, uinvoid AnalyticsManager::stop() {quit = true;+ dispose();cv.notify_all();}diff --git a/src/event_manager.cpp b/src/event_manager.cppindex c462428d..6760df68 100644--- a/src/event_manager.cpp+++ b/src/event_manager.cpp@@ -22,33 +22,10 @@ Option<bool> EventManager::add_event(const nlohmann::json& event, const std::strif(event_type_val.is_string()) {const std::string& event_type = event_type_val.get<std::string>();- if(event_type == "search") {- if(!event.contains("data")) {- return Option<bool>(404, "key `data` not found.");- }-- const auto& event_data_val = event[EVENT_DATA];-- if(!event_data_val.is_object()) {- return Option<bool>(500, "event_data_val is not object.");- }-- const auto& event_data_query_it = event_data_val["q"];+ if(event_type == AnalyticsManager::CLICK_EVENT || event_type == AnalyticsManager::CONVERSION_EVENT+ || event_type == AnalyticsManager::VISIT_EVENT || event_type == AnalyticsManager::CUSTOM_EVENT+ || event_type == AnalyticsManager::SEARCH_EVENT) {- if(!event_data_query_it.is_string()) {- return Option<bool>(500, "`q` value should be string.");- }-- if(!event_data_val["collections"].is_array() || !event_data_val["collections"][0].is_string()) {- return Option<bool>(500, "`collections` value should be string array.");- }-- for(const auto& coll: event_data_val["collections"]) {- const std::string& query = event_data_query_it.get<std::string>();- AnalyticsManager::get_instance().add_suggestion(coll.get<std::string>(), query, query, false, "");- }- } else if(event_type == AnalyticsManager::CLICK_EVENT || event_type == AnalyticsManager::CONVERSION_EVENT- || event_type == AnalyticsManager::VISIT_EVENT || event_type == AnalyticsManager::CUSTOM_EVENT) {if (!event.contains(EVENT_DATA)) {return Option<bool>(404, "key `data` not found.");}@@ -64,17 +41,13 @@ Option<bool> EventManager::add_event(const nlohmann::json& event, const std::str}if(event_type != AnalyticsManager::CUSTOM_EVENT) {- if (!event_data_val.contains("doc_id") || !event_data_val.contains("user_id")) {+ if ((event_type == AnalyticsManager::SEARCH_EVENT) && (!event_data_val.contains("user_id") || !event_data_val.contains("q"))) {return Option<bool>(500,- "event json data fields should contain `doc_id`, `user_id`.");- }-- if (!event_data_val["doc_id"].is_string()) {- return Option<bool>(500, "`doc_id` value should be string.");+ "search event json data fields should contain `user_id` and 'q'.");}- if (!event_data_val["user_id"].is_string()) {- return Option<bool>(500, "`user_id` value should be string.");+ if (!event_data_val.contains("doc_id") || !event_data_val["doc_id"].is_string()) {+ return Option<bool>(500, "event should have 'doc_id' as string value.");}}diff --git a/test/analytics_manager_test.cpp b/test/analytics_manager_test.cppindex 65d03184..30526542 100644--- a/test/analytics_manager_test.cpp+++ b/test/analytics_manager_test.cpp@@ -355,7 +355,7 @@ TEST_F(AnalyticsManagerTest, EventsValidation) {req->body = event3.dump();ASSERT_FALSE(post_create_event(req, res));- ASSERT_EQ("{\"message\": \"`doc_id` value should be string.\"}", res->body);+ ASSERT_EQ("{\"message\": \"event should have 'doc_id' as string value.\"}", res->body);//event name should be uniqueanalytics_rule = R"({@@ -474,6 +474,92 @@ TEST_F(AnalyticsManagerTest, EventsValidation) {create_op = analyticsManager.create_rule(analytics_rule, true, true);ASSERT_TRUE(create_op.ok());++ // log based event should be created with only doc_id+ event5 = R"({+ "type": "click",+ "name": "AP",+ "data": {+ "doc_id": "21"+ }+ })"_json;++ req->body = event5.dump();+ ASSERT_TRUE(post_create_event(req, res));++ //search events validation++ nlohmann::json suggestions_schema = R"({+ "name": "top_queries",+ "fields": [+ {"name": "q", "type": "string" },+ {"name": "count", "type": "int32" }+ ]+ })"_json;++ Collection* suggestions_coll = collectionManager.create_collection(suggestions_schema).get();++ analytics_rule = R"({+ "name": "popular_searches",+ "type": "popular_queries",+ "params": {+ "source": {+ "collections": ["titles"],+ "events": [{"type": "search", "name": "PS1"}]+ },+ "destination": {+ "collection": "top_queries"+ }+ }+ })"_json;++ create_op = analyticsManager.create_rule(analytics_rule, true, true);+ ASSERT_TRUE(create_op.ok());++ analytics_rule = R"({+ "name": "nohits_searches",+ "type": "nohits_queries",+ "params": {+ "source": {+ "collections": ["titles"],+ "events": [{"type": "search", "name": "NH1"}]+ },+ "destination": {+ "collection": "top_queries"+ }+ }+ })"_json;++ create_op = analyticsManager.create_rule(analytics_rule, true, true);+ ASSERT_TRUE(create_op.ok());++ //missing query param+ auto event9 = R"({+ "type": "search",+ "name": "NH1",+ "data": {+ "doc_id": "21",+ "user_id": "11",+ "expanded_query": "tech"+ }+ })"_json;+ req->body = event9.dump();+ ASSERT_FALSE(post_create_event(req, res));+ ASSERT_EQ("{\"message\": \"search event json data fields should contain `user_id` and 'q'.\"}", res->body);++ //correct params+ event9 = R"({+ "type": "search",+ "name": "NH1",+ "data": {+ "q": "tech",+ "doc_id": "21",+ "user_id": "11",+ "expanded_query": "technology"+ }+ })"_json;+ req->body = event9.dump();+ ASSERT_TRUE(post_create_event(req, res));}TEST_F(AnalyticsManagerTest, EventsPersist) {@@ -902,7 +988,6 @@ TEST_F(AnalyticsManagerTest, PopularityScore) {"type": "counter","params": {"source": {- "collections": ["products"],"events": [{"type": "click", "weight": 1, "name": "CLK1"}, {"type": "conversion", "weight": 5, "name": "CNV1"} ],"log_to_store": true},@@ -1032,6 +1117,22 @@ TEST_F(AnalyticsManagerTest, PopularityScore) {ASSERT_EQ(1, popular_clicks.size());ASSERT_EQ("popularity", popular_clicks["products"].counter_field);ASSERT_EQ(1, popular_clicks["products"].docid_counts.size());++ //add with only doc_id+ event5 = R"({+ "type": "conversion",+ "name": "CNV1",+ "data": {+ "doc_id": "5"+ }+ })"_json;+ req->body = event5.dump();+ ASSERT_TRUE(post_create_event(req, res));++ popular_clicks = analyticsManager.get_popular_clicks();+ ASSERT_EQ(1, popular_clicks.size());+ ASSERT_EQ("popularity", popular_clicks["products"].counter_field);+ ASSERT_EQ(2, popular_clicks["products"].docid_counts.size());}TEST_F(AnalyticsManagerTest, PopularityScoreValidation) {@@ -1066,7 +1167,6 @@ TEST_F(AnalyticsManagerTest, PopularityScoreValidation) {"type": "counter","params": {"source": {- "collections": ["books"],"events": [{"type": "click", "weight": 1, "name": "CLK2"}, {"type": "conversion", "weight": 5, "name": "CNV2"} ]},"destination": {@@ -1085,7 +1185,6 @@ TEST_F(AnalyticsManagerTest, PopularityScoreValidation) {"type": "counter","params": {"source": {- "collections": ["books"],"events": [{"type": "click", "weight": 1, "name": "CLK3"}, {"type": "conversion", "weight": 5, "name": "CNV3"} ]},"destination": {@@ -1123,7 +1222,6 @@ TEST_F(AnalyticsManagerTest, PopularityScoreValidation) {"type": "counter","params": {"source": {- "collections": ["books"]},"destination": {"collection": "books",@@ -1141,7 +1239,6 @@ TEST_F(AnalyticsManagerTest, PopularityScoreValidation) {"type": "counter","params": {"source": {- "collections": ["books"],"events": []},"destination": {@@ -1160,7 +1257,6 @@ TEST_F(AnalyticsManagerTest, PopularityScoreValidation) {"type": "counter","params": {"source": {- "collections": ["books"],"events": "query_click"},"destination": {@@ -1179,7 +1275,6 @@ TEST_F(AnalyticsManagerTest, PopularityScoreValidation) {"type": "counter","params": {"source": {- "collections": ["books"],"events": [{"type": "click", "weight": 1}, {"type": "conversion", "weight": 5} ]},"destination": {@@ -1202,7 +1297,6 @@ TEST_F(AnalyticsManagerTest, PopularityScoreValidation) {"type": "counter","params": {"source": {- "collections": ["books"],"events": [{"type": "click", "name" : "CLK4"}, {"type": "conversion", "name": "CNV4", "log_to_store" : true} ]},"destination": {@@ -1221,7 +1315,6 @@ TEST_F(AnalyticsManagerTest, PopularityScoreValidation) {"type": "counter","params": {"source": {- "collections": ["books"],"events": [{"type": "click", "weight": 1, "name" : "CLK4"}, {"type": "conversion", "weight": 5, "name": "CNV4", "log_to_store" : true} ]},"destination": {@@ -1415,7 +1508,6 @@ TEST_F(AnalyticsManagerTest, PopularityScoreValidation) {"type": "counter","params": {"source": {- "collections": ["books"],"events": [{"type": "conversion", "weight": 5, "name": "CNV4"} ]},"destination": {@@ -1781,7 +1873,6 @@ TEST_F(AnalyticsManagerTest, AnalyticsWithAliases) {"type": "counter","params": {"source": {- "collections": ["coll1"],"events": [{"type": "click", "weight": 1, "name": "CLK1"}, {"type": "conversion", "weight": 5, "name": "CNV1"} ]},"destination": {@@ -1803,4 +1894,146 @@ TEST_F(AnalyticsManagerTest, AnalyticsWithAliases) {req->body = event1.dump();ASSERT_TRUE(post_create_event(req, res));+}++TEST_F(AnalyticsManagerTest, AddSuggestionByEvent) {+ nlohmann::json titles_schema = R"({+ "name": "titles",+ "fields": [+ {"name": "title", "type": "string"}+ ]+ })"_json;++ Collection* titles_coll = collectionManager.create_collection(titles_schema).get();++ nlohmann::json doc;+ doc["title"] = "Cool trousers";+ ASSERT_TRUE(titles_coll->add(doc.dump()).ok());++ // create a collection to store suggestions+ nlohmann::json suggestions_schema = R"({+ "name": "top_queries",+ "fields": [+ {"name": "q", "type": "string" },+ {"name": "count", "type": "int32" }+ ]+ })"_json;++ Collection* suggestions_coll = collectionManager.create_collection(suggestions_schema).get();++ nlohmann::json analytics_rule = R"({+ "name": "top_search_queries",+ "type": "popular_queries",+ "params": {+ "limit": 100,+ "source": {+ "collections": ["titles"],+ "events": [{"type": "search", "name": "coll_search"}]+ },+ "destination": {+ "collection": "top_queries"+ }+ }+ })"_json;++ auto create_op = analyticsManager.create_rule(analytics_rule, false, true);+ ASSERT_TRUE(create_op.ok());++ nlohmann::json event_data;+ event_data["q"] = "coo";+ event_data["user_id"] = "1";+ event_data["expanded_query"] = "cool";+ event_data["live_query"] = true;++ analyticsManager.add_event("127.0.0.1", "search", "coll_search", event_data);++ auto popularQueries = analyticsManager.get_popular_queries();+ auto localCounts = popularQueries["top_queries"]->get_local_counts();+ ASSERT_EQ(1, localCounts.size());+ ASSERT_EQ(1, localCounts.count("coo"));+ ASSERT_EQ(1, localCounts["coo"]);++ // add another query which is more popular+ event_data["q"] = "buzzfoo";+ event_data["expanded_query"] = "buzzfoo";+ event_data["live_query"] = true;+ event_data["user_id"] = "1";+ analyticsManager.add_event("127.0.0.1", "search", "coll_search", event_data);++ event_data["user_id"] = "2";+ analyticsManager.add_event("127.0.0.1", "search", "coll_search", event_data);++ event_data["user_id"] = "3";+ analyticsManager.add_event("127.0.0.1", "search", "coll_search", event_data);+++ popularQueries = analyticsManager.get_popular_queries();+ localCounts = popularQueries["top_queries"]->get_local_counts();+ ASSERT_EQ(2, localCounts.size());+ ASSERT_EQ(1, localCounts.count("coo"));+ ASSERT_EQ(1, localCounts["coo"]);+ ASSERT_EQ(1, localCounts.count("buzzfoo"));+ ASSERT_EQ(3, localCounts["buzzfoo"]);++ //try with nohits analytic rule+ analytics_rule = R"({+ "name": "noresults_queries",+ "type": "nohits_queries",+ "params": {+ "limit": 100,+ "source": {+ "collections": ["titles"],+ "events": [{"type": "search", "name": "nohits_search"}]+ },+ "destination": {+ "collection": "top_queries"+ }+ }+ })"_json;++ create_op = analyticsManager.create_rule(analytics_rule, false, true);+ ASSERT_TRUE(create_op.ok());++ event_data["q"] = "foobar";+ event_data["expanded_query"] = "foobar";+ event_data["live_query"] = true;+ event_data["user_id"] = "1";+ analyticsManager.add_event("127.0.0.1", "search", "nohits_search", event_data);++ auto noresults_queries = analyticsManager.get_nohits_queries();+ localCounts = noresults_queries["top_queries"]->get_local_counts();++ ASSERT_EQ(1, localCounts.size());+ ASSERT_EQ(1, localCounts.count("foobar"));+ ASSERT_EQ(1, localCounts["foobar"]);++ //try creating event with same name+ suggestions_schema = R"({+ "name": "top_queries2",+ "fields": [+ {"name": "q", "type": "string" },+ {"name": "count", "type": "int32" }+ ]+ })"_json;++ suggestions_coll = collectionManager.create_collection(suggestions_schema).get();++ analytics_rule = R"({+ "name": "noresults_queries2",+ "type": "popular_queries",+ "params": {+ "limit": 100,+ "source": {+ "collections": ["titles"],+ "events": [{"type": "search", "name": "nohits_search"}]+ },+ "destination": {+ "collection": "top_queries2"+ }+ }+ })"_json;++ create_op = analyticsManager.create_rule(analytics_rule, false, true);+ ASSERT_FALSE(create_op.ok());+ ASSERT_EQ("Events must contain a unique name.", create_op.error());}\ No newline at end of filediff --git a/test/collection_manager_test.cpp b/test/collection_manager_test.cppindex 5691f1c6..7e2720bd 100644--- a/test/collection_manager_test.cpp+++ b/test/collection_manager_test.cpp@@ -661,7 +661,8 @@ TEST_F(CollectionManagerTest, QuerySuggestionsShouldBeTrimmed) {"params": {"limit": 100,"source": {- "collections": ["coll1"]+ "collections": ["coll1"],+ "events": [{"type": "search", "name": "coll_search"}]},"destination": {"collection": "top_queries"@@ -2196,7 +2197,8 @@ TEST_F(CollectionManagerTest, HideQueryFromAnalytics) {"params": {"limit": 100,"source": {- "collections": ["coll3"]+ "collections": ["coll3"],+ "events": [{"type": "search", "name": "coll_search3"}]},"destination": {"collection": "top_queries2"