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

analytics db minor fixes (#1807)

Krunal Gandhib88f1fedbe47
diff --git a/src/analytics_manager.cpp b/src/analytics_manager.cpp
index c39d5609..738b9b7b 100644
--- a/src/analytics_manager.cpp
+++ b/src/analytics_manager.cpp
@@ -209,8 +209,14 @@ Option<bool> AnalyticsManager::create_index(nlohmann::json &payload, bool upsert
std::map<std::string, uint16_t> event_weight_map;
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_file = false;
@@ -357,11 +363,15 @@ Option<bool> AnalyticsManager::remove_index(const std::string &name) {
suggestion_configs.erase(name);
//remove corresponding events with rule
- for(auto it: event_collection_map) {
- if(it.second.analytic_rule == name) {
- event_collection_map.erase(it.first);
+ auto it = event_collection_map.begin();
+ for(it; it != event_collection_map.end(); ++it) {
+ if(it->second.analytic_rule == name) {
+ break;
}
}
+ if(it != event_collection_map.end()) {
+ event_collection_map.erase(it);
+ }
auto suggestion_key = std::string(ANALYTICS_RULE_PREFIX) + "_" + name;
bool erased = store->remove(suggestion_key);
@@ -632,7 +642,7 @@ void AnalyticsManager::persist_events(ReplicationState *raft_server, uint64_t pr
const std::string& base_url = leader_url + "analytics/";
std::string res;
- const std::string& update_url = base_url + "/write_to_db";
+ const std::string& update_url = base_url + "aggregate_events";
std::map<std::string, std::string> res_headers;
long status_code = HttpClient::post_response(update_url, import_payload,
res, res_headers, {}, 10*1000, true);
@@ -668,8 +678,10 @@ void AnalyticsManager::persist_events(ReplicationState *raft_server, uint64_t pr
payload.push_back(event_data);
}
}
- send_http_response(payload.dump());
- events_collection_it.second.clear();
+ if(!payload.empty()) {
+ send_http_response(payload.dump());
+ events_collection_it.second.clear();
+ }
}
}
diff --git a/test/analytics_manager_test.cpp b/test/analytics_manager_test.cpp
index 9324ab52..4e9ba593 100644
--- a/test/analytics_manager_test.cpp
+++ b/test/analytics_manager_test.cpp
@@ -1176,6 +1176,24 @@ TEST_F(AnalyticsManagerTest, PopularityScoreValidation) {
std::shared_ptr<http_req> req = std::make_shared<http_req>();
std::shared_ptr<http_res> res = std::make_shared<http_res>(nullptr);
+ analytics_rule = R"({
+ "name": "books_popularity",
+ "type": "counter",
+ "params": {
+ "source": {
+ "collections": ["books"],
+ "events": [{"type": "click", "name" : "CLK4"}, {"type": "conversion", "name": "CNV4", "log_to_file" : true} ]
+ },
+ "destination": {
+ "collection": "books",
+ "counter_field": "popularity"
+ }
+ }
+ })"_json;
+ create_op = analyticsManager.create_rule(analytics_rule, false, true);
+ ASSERT_FALSE(create_op.ok());
+ ASSERT_EQ("Counter events must contain a weight value.", create_op.error());
+
//correct params
analytics_rule = R"({
"name": "books_popularity2",
@@ -1594,4 +1612,56 @@ TEST_F(AnalyticsManagerTest, AnalyticsStoreGetLastN) {
values.clear();
analyticsManager.get_last_N_events("16", 8, values);
ASSERT_EQ(0, values.size());
+}
+
+TEST_F(AnalyticsManagerTest, AnalyticsWithAliases) {
+ nlohmann::json titles_schema = R"({
+ "name": "titles",
+ "fields": [
+ {"name": "title", "type": "string"},
+ {"name": "popularity", "type" : "int32"}
+ ]
+ })"_json;
+
+ Collection* titles_coll = collectionManager.create_collection(titles_schema).get();
+
+ //create alias
+ std::shared_ptr<http_req> req = std::make_shared<http_req>();
+ std::shared_ptr<http_res> res = std::make_shared<http_res>(nullptr);
+
+ nlohmann::json alias_json = R"({
+ "collection_name": "titles"
+ })"_json;
+
+ req->params["alias"] = "coll1";
+ req->body = alias_json.dump();
+ ASSERT_TRUE(put_upsert_alias(req, res));
+
+ auto analytics_rule = R"({
+ "name": "popular_titles",
+ "type": "counter",
+ "params": {
+ "source": {
+ "collections": ["coll1"],
+ "events": [{"type": "click", "weight": 1, "name": "CLK1"}, {"type": "conversion", "weight": 5, "name": "CNV1"} ]
+ },
+ "destination": {
+ "collection": "coll1",
+ "counter_field": "popularity"
+ }
+ }
+ })"_json;
+
+ auto create_op = analyticsManager.create_rule(analytics_rule, true, true);
+ ASSERT_TRUE(create_op.ok());
+
+ nlohmann::json event1;
+ event1["type"] = "click";
+ event1["name"] = "CLK1";
+ event1["data"]["q"] = "technology";
+ event1["data"]["user_id"] = "13";
+ event1["data"]["doc_id"] = "1";
+
+ req->body = event1.dump();
+ ASSERT_TRUE(post_create_event(req, res));
}
\ No newline at end of file