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

remove all events when rule is deleted (#1912)

Krunal Gandhi85f50274289e
diff --git a/src/analytics_manager.cpp b/src/analytics_manager.cpp
index b7888ec9..b033d951 100644
--- a/src/analytics_manager.cpp
+++ b/src/analytics_manager.cpp
@@ -342,15 +342,13 @@ Option<bool> AnalyticsManager::remove_index(const std::string &name) {
suggestion_configs.erase(name);
//remove corresponding events with rule
- auto it = event_collection_map.begin();
- for(it; it != event_collection_map.end(); ++it) {
+ for(auto it = event_collection_map.begin(); it != event_collection_map.end();) {
if(it->second.analytic_rule == name) {
- break;
+ event_collection_map.erase(it++);
+ } else {
+ ++it;
}
}
- 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);
diff --git a/test/analytics_manager_test.cpp b/test/analytics_manager_test.cpp
index 78cbd0ef..6f50210b 100644
--- a/test/analytics_manager_test.cpp
+++ b/test/analytics_manager_test.cpp
@@ -612,6 +612,23 @@ TEST_F(AnalyticsManagerTest, EventsValidation) {
create_op = analyticsManager.create_rule(analytics_rule, true, true);
ASSERT_TRUE(create_op.ok());
+
+ //try adding removed events
+ ASSERT_TRUE(analyticsManager.remove_rule("product_events").ok());
+
+ analytics_rule = R"({
+ "name": "product_events",
+ "type": "log",
+ "params": {
+ "source": {
+ "collections": ["titles"],
+ "events": [{"type": "click", "name": "AP"}, {"type": "visit", "name": "VP"}]
+ }
+ }
+ })"_json;
+
+ create_op = analyticsManager.create_rule(analytics_rule, false, true);
+ ASSERT_TRUE(create_op.ok());
}
TEST_F(AnalyticsManagerTest, EventsPersist) {