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

Only insert analytics queries within valid key length.

Kishore Nallan6ef3b14fe7af
diff --git a/src/query_analytics.cpp b/src/query_analytics.cpp
index 409d1c41..d08703b9 100644
--- a/src/query_analytics.cpp
+++ b/src/query_analytics.cpp
@@ -27,7 +27,9 @@ void QueryAnalytics::add(const std::string& key, const std::string& expanded_key
if(queries.size() < 100) {
// only live queries could send expanded queries
const std::string& actual_key = expand_query ? expanded_key : key;
- queries.emplace_back(actual_key.substr(0, max_query_length), now_ts_us);
+ if(actual_key.size() < max_query_length) {
+ queries.emplace_back(actual_key, now_ts_us);
+ }
}
umutex.unlock();
@@ -42,9 +44,9 @@ void QueryAnalytics::add(const std::string& key, const std::string& expanded_key
if(it != local_counts.end()) {
it.value()++;
- } else if(local_counts.size() < max_size) {
+ } else if(local_counts.size() < max_size && key.size() < max_query_length) {
// skip count when map has become too large (to prevent abuse)
- local_counts.emplace(key.substr(0, max_query_length), 1);
+ local_counts.emplace(key, 1);
}
lmutex.unlock();
diff --git a/test/analytics_manager_test.cpp b/test/analytics_manager_test.cpp
index 86b8ca43..abad0b7a 100644
--- a/test/analytics_manager_test.cpp
+++ b/test/analytics_manager_test.cpp
@@ -1009,14 +1009,18 @@ TEST_F(AnalyticsManagerTest, QueryLengthTruncation) {
auto create_op = analyticsManager.create_rule(analytics_rule, false, true);
ASSERT_TRUE(create_op.ok());
- std::string q = StringUtils::randstring(1050);
- analyticsManager.add_nohits_query("titles", q, true, "1");
+ std::string q1 = StringUtils::randstring(1050);
+ std::string q2 = StringUtils::randstring(1000);
+ analyticsManager.add_nohits_query("titles", q1, true, "1");
+ analyticsManager.add_nohits_query("titles", q2, true, "2");
auto noresults_queries = analyticsManager.get_nohits_queries();
auto userQueries = noresults_queries["queries"]->get_user_prefix_queries()["1"];
+ ASSERT_EQ(0, userQueries.size());
+ userQueries = noresults_queries["queries"]->get_user_prefix_queries()["2"];
ASSERT_EQ(1, userQueries.size());
- ASSERT_EQ(q.substr(0, 1024), userQueries[0].query);
+ ASSERT_EQ(q2, userQueries[0].query);
// delete nohits_queries rule
ASSERT_TRUE(analyticsManager.remove_rule("search_queries").ok());
@@ -1042,13 +1046,16 @@ TEST_F(AnalyticsManagerTest, QueryLengthTruncation) {
create_op = analyticsManager.create_rule(analytics_rule, false, true);
ASSERT_TRUE(create_op.ok());
- analyticsManager.add_suggestion("titles", q, "cool", true, "1");
+ analyticsManager.add_suggestion("titles", q1, "cool", true, "1");
+ analyticsManager.add_suggestion("titles", q2, "cool", true, "2");
auto popular_queries = analyticsManager.get_popular_queries();
userQueries = popular_queries["queries"]->get_user_prefix_queries()["1"];
+ ASSERT_EQ(0, userQueries.size());
+ userQueries = popular_queries["queries"]->get_user_prefix_queries()["2"];
ASSERT_EQ(1, userQueries.size());
- ASSERT_EQ(q.substr(0, 1024), userQueries[0].query);
+ ASSERT_EQ(q2, userQueries[0].query);
}
TEST_F(AnalyticsManagerTest, SuggestionConfigRule) {