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

correcting group_by with range_facets

krunalc42970db132b
diff --git a/src/index.cpp b/src/index.cpp
index 374a7770..132c5f46 100644
--- a/src/index.cpp
+++ b/src/index.cpp
@@ -1257,6 +1257,10 @@ void Index::do_facets(std::vector<facet> & facets, facet_query_t & facet_query,
int64_t range_id = range_pair.first;
facet_count_t& facet_count = a_facet.result_map[range_id];
facet_count.count += 1;
+
+ if(group_limit) {
+ a_facet.hash_groups[range_id].emplace(distinct_id);
+ }
}
}
}
@@ -3357,15 +3361,16 @@ Option<bool> Index::search(std::vector<query_tokens_t>& field_query_tokens, cons
this_facet.hash_groups[facet_kv.first].begin(),
this_facet.hash_groups[facet_kv.first].end()
);
- }
- size_t count = 0;
- if (acc_facet.result_map.count(facet_kv.first) == 0) {
- // not found, so set it
- count = facet_kv.second.count;
} else {
- count = acc_facet.result_map[facet_kv.first].count + facet_kv.second.count;
+ size_t count = 0;
+ if (acc_facet.result_map.count(facet_kv.first) == 0) {
+ // not found, so set it
+ count = facet_kv.second.count;
+ } else {
+ count = acc_facet.result_map[facet_kv.first].count + facet_kv.second.count;
+ }
+ acc_facet.result_map[facet_kv.first].count = count;
}
- acc_facet.result_map[facet_kv.first].count = count;
acc_facet.result_map[facet_kv.first].doc_id = facet_kv.second.doc_id;
acc_facet.result_map[facet_kv.first].array_pos = facet_kv.second.array_pos;
@@ -3383,7 +3388,7 @@ Option<bool> Index::search(std::vector<query_tokens_t>& field_query_tokens, cons
for(auto & acc_facet: facets) {
for(auto& facet_kv: acc_facet.result_map) {
- if(group_limit && !acc_facet.is_range_query) {
+ if(group_limit) {
facet_kv.second.count = acc_facet.hash_groups[facet_kv.first].size();
}
diff --git a/test/collection_faceting_test.cpp b/test/collection_faceting_test.cpp
index 3cbdee79..5e9c1e9d 100644
--- a/test/collection_faceting_test.cpp
+++ b/test/collection_faceting_test.cpp
@@ -1704,15 +1704,15 @@ TEST_F(CollectionFacetingTest, RangeFacetTestWithGroupBy) {
doc1["place"] = "Mysore Palace";
doc1["state"] = "Karnataka";
doc1["visitors"] = 235486;
- doc1["rating"] = 4.7;
+ doc1["rating"] = 4.5;
doc1["trackingFrom"] = 1900;
nlohmann::json doc2;
doc2["id"] = "1";
doc2["place"] = "Hampi";
doc2["state"] = "Karnataka";
- doc2["visitors"] = 187654;
- doc2["rating"] = 2.9;
+ doc2["visitors"] = 201022;
+ doc2["rating"] = 4.5;
doc2["trackingFrom"] = 1900;
nlohmann::json doc3;
@@ -1736,7 +1736,7 @@ TEST_F(CollectionFacetingTest, RangeFacetTestWithGroupBy) {
doc5["place"] = "Staue of Unity";
doc5["state"] = "Gujarat";
doc5["visitors"] = 345878;
- doc5["rating"] = 3.5;
+ doc5["rating"] = 3.8;
doc5["trackingFrom"] = 2000;
ASSERT_TRUE(coll1->add(doc1.dump()).ok());
@@ -1759,11 +1759,9 @@ TEST_F(CollectionFacetingTest, RangeFacetTestWithGroupBy) {
auto results = result.get();
- ASSERT_EQ(2, results["facet_counts"][0]["counts"].size());
- ASSERT_EQ(1, (int) results["facet_counts"][0]["counts"][0]["count"]);
- ASSERT_EQ("Busy", results["facet_counts"][0]["counts"][0]["value"].get<std::string>());
- ASSERT_EQ(1, (int) results["facet_counts"][0]["counts"][1]["count"]);
- ASSERT_EQ("VeryBusy", results["facet_counts"][0]["counts"][1]["value"].get<std::string>());
+ ASSERT_EQ(1, results["facet_counts"][0]["counts"].size());
+ ASSERT_EQ(2, (int) results["facet_counts"][0]["counts"][0]["count"]);
+ ASSERT_EQ("VeryBusy", results["facet_counts"][0]["counts"][0]["value"].get<std::string>());
//apply group_by
result = coll1->search("*", {"state"},
@@ -1773,7 +1771,7 @@ TEST_F(CollectionFacetingTest, RangeFacetTestWithGroupBy) {
10, spp::sparse_hash_set<std::string>(),
spp::sparse_hash_set<std::string>(), 10, "",
30, 4, "", 10,
- {}, {}, {"state"}, 10,"<mark>",
+ {}, {}, {"rating"}, 10,"<mark>",
"</mark>", {}, 1000,true,
false, true, "", true);
@@ -1784,21 +1782,18 @@ TEST_F(CollectionFacetingTest, RangeFacetTestWithGroupBy) {
results = result.get();
ASSERT_EQ(2, results["facet_counts"][0]["counts"].size());
- ASSERT_EQ(3, (int) results["facet_counts"][0]["counts"][0]["count"]);
+ ASSERT_EQ(2, (int) results["facet_counts"][0]["counts"][0]["count"]);
ASSERT_EQ("VeryBusy", results["facet_counts"][0]["counts"][0]["value"].get<std::string>());
- ASSERT_EQ(2, (int) results["facet_counts"][0]["counts"][1]["count"]);
+ ASSERT_EQ(1, (int) results["facet_counts"][0]["counts"][1]["count"]);
ASSERT_EQ("Busy", results["facet_counts"][0]["counts"][1]["value"].get<std::string>());
- ASSERT_EQ(3, results["grouped_hits"].size());
-
- ASSERT_EQ(1, results["grouped_hits"][0]["hits"].size());
- ASSERT_EQ("Gujarat", results["grouped_hits"][0]["group_key"][0]);
+ ASSERT_EQ(2, results["grouped_hits"].size());
- ASSERT_EQ(2, results["grouped_hits"][1]["hits"].size());
- ASSERT_EQ("TamilNadu", results["grouped_hits"][1]["group_key"][0]);
+ ASSERT_EQ(2, results["grouped_hits"][0]["hits"].size());
+ ASSERT_EQ(3.8, results["grouped_hits"][0]["group_key"][0]);
- ASSERT_EQ(2, results["grouped_hits"][2]["hits"].size());
- ASSERT_EQ("Karnataka", results["grouped_hits"][2]["group_key"][0]);
+ ASSERT_EQ(3, results["grouped_hits"][1]["hits"].size());
+ ASSERT_EQ(4.5, results["grouped_hits"][1]["group_key"][0]);
collectionManager.drop_collection("coll1");
}
\ No newline at end of file