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

refactoring changes

krunal1313420f65114858
diff --git a/src/collection.cpp b/src/collection.cpp
index ead0c0bd..3831a53a 100644
--- a/src/collection.cpp
+++ b/src/collection.cpp
@@ -1384,7 +1384,7 @@ Option<nlohmann::json> Collection::search(std::string raw_query,
std::vector<std::vector<KV*>> raw_result_kvs;
std::vector<std::vector<KV*>> override_result_kvs;
- size_t total_found = 0, total_groups_found = 0;
+ size_t total = 0;
std::vector<uint32_t> excluded_ids;
std::vector<std::pair<uint32_t, uint32_t>> included_ids; // ID -> position
@@ -1557,12 +1557,13 @@ Option<nlohmann::json> Collection::search(std::string raw_query,
// for grouping we have to aggregate group set sizes to a count value
if(group_limit) {
- total_groups_found = search_params->groups_processed.size() + override_result_kvs.size();
- }
+ total = search_params->groups_processed.size() + override_result_kvs.size();
+ } else {
+ total = search_params->all_result_ids_len;
+ }
- total_found = search_params->all_result_ids_len;
- if(search_cutoff && total_found == 0) {
+ if(search_cutoff && total == 0) {
// this can happen if other requests stopped this request from being processed
// we should return an error so that request can be retried by client
return Option<nlohmann::json>(408, "Request Timeout");
@@ -1683,10 +1684,10 @@ Option<nlohmann::json> Collection::search(std::string raw_query,
}
nlohmann::json result = nlohmann::json::object();
+ result["found"] = total;
if(group_limit != 0) {
- result["found_groups"] = total_groups_found;
+ result["found_docs"] = search_params->all_result_ids_len;
}
- result["found"] = total_found;
if(exclude_fields.count("out_of") == 0) {
result["out_of"] = num_documents.load();
diff --git a/test/collection_grouping_test.cpp b/test/collection_grouping_test.cpp
index 8991bbbd..154e7555 100644
--- a/test/collection_grouping_test.cpp
+++ b/test/collection_grouping_test.cpp
@@ -69,8 +69,8 @@ TEST_F(CollectionGroupingTest, GroupingBasics) {
"", 10,
{}, {}, {"size"}, 2).get();
- ASSERT_EQ(12, res["found"].get<size_t>());
- ASSERT_EQ(3, res["found_groups"].get<size_t>());
+ ASSERT_EQ(12, res["found_docs"].get<size_t>());
+ ASSERT_EQ(3, res["found"].get<size_t>());
ASSERT_EQ(3, res["grouped_hits"].size());
ASSERT_EQ(11, res["grouped_hits"][0]["group_key"][0].get<size_t>());
@@ -117,8 +117,8 @@ TEST_F(CollectionGroupingTest, GroupingBasics) {
{}, {}, {"rating"}, 2).get();
// 7 unique ratings
- ASSERT_EQ(12, res["found"].get<size_t>());
- ASSERT_EQ(7, res["found_groups"].get<size_t>());
+ ASSERT_EQ(12, res["found_docs"].get<size_t>());
+ ASSERT_EQ(7, res["found"].get<size_t>());
ASSERT_EQ(7, res["grouped_hits"].size());
ASSERT_FLOAT_EQ(4.4, res["grouped_hits"][0]["group_key"][0].get<float>());
@@ -169,8 +169,8 @@ TEST_F(CollectionGroupingTest, GroupingCompoundKey) {
spp::sparse_hash_set<std::string>(), 10, "", 30, 5,
"", 10,
{}, {}, {"size", "brand"}, 2).get();
- ASSERT_EQ(12, res["found"].get<size_t>());
- ASSERT_EQ(10, res["found_groups"].get<size_t>());
+ ASSERT_EQ(12, res["found_docs"].get<size_t>());
+ ASSERT_EQ(10, res["found"].get<size_t>());
ASSERT_EQ(10, res["grouped_hits"].size());
ASSERT_EQ(1, res["grouped_hits"][0]["found"].get<int32_t>());
@@ -229,8 +229,8 @@ TEST_F(CollectionGroupingTest, GroupingCompoundKey) {
ASSERT_STREQ("0", res["grouped_hits"][0]["hits"][1]["document"]["id"].get<std::string>().c_str());
// total count and facet counts should be the same
- ASSERT_EQ(12, res["found"].get<size_t>());
- ASSERT_EQ(10, res["found_groups"].get<size_t>());
+ ASSERT_EQ(12, res["found_docs"].get<size_t>());
+ ASSERT_EQ(10, res["found"].get<size_t>());
ASSERT_EQ(2, res["grouped_hits"].size());
ASSERT_EQ(10, res["grouped_hits"][0]["group_key"][0].get<size_t>());
ASSERT_STREQ("Omega", res["grouped_hits"][0]["group_key"][1].get<std::string>().c_str());
@@ -316,8 +316,8 @@ TEST_F(CollectionGroupingTest, GroupingWithMultiFieldRelevance) {
"", 10,
{}, {}, {"genre"}, 2).get();
- ASSERT_EQ(7, results["found"].get<size_t>());
- ASSERT_EQ(3, results["found_groups"].get<size_t>());
+ ASSERT_EQ(7, results["found_docs"].get<size_t>());
+ ASSERT_EQ(3, results["found"].get<size_t>());
ASSERT_EQ(3, results["grouped_hits"].size());
ASSERT_EQ(3, results["grouped_hits"][0]["found"].get<int32_t>());
@@ -349,8 +349,8 @@ TEST_F(CollectionGroupingTest, GroupingWithGropLimitOfOne) {
"", 10,
{}, {}, {"brand"}, 1).get();
- ASSERT_EQ(12, res["found"].get<size_t>());
- ASSERT_EQ(5, res["found_groups"].get<size_t>());
+ ASSERT_EQ(12, res["found_docs"].get<size_t>());
+ ASSERT_EQ(5, res["found"].get<size_t>());
ASSERT_EQ(5, res["grouped_hits"].size());
// all hits array must be of size 1
@@ -435,8 +435,8 @@ TEST_F(CollectionGroupingTest, GroupingWithArrayFieldAndOverride) {
"", 10,
{}, {}, {"colors"}, 2).get();
- ASSERT_EQ(9, res["found"].get<size_t>());
- ASSERT_EQ(4, res["found_groups"].get<size_t>());
+ ASSERT_EQ(9, res["found_docs"].get<size_t>());
+ ASSERT_EQ(4, res["found"].get<size_t>());
ASSERT_EQ(4, res["grouped_hits"].size());
ASSERT_EQ(1, res["grouped_hits"][0]["group_key"][0].size());
@@ -617,8 +617,8 @@ TEST_F(CollectionGroupingTest, SortingOnGroupCount) {
"", 10,
{}, {}, {"size"}, 2).get();
- ASSERT_EQ(12, res["found"].get<size_t>());
- ASSERT_EQ(3, res["found_groups"].get<size_t>());
+ ASSERT_EQ(12, res["found_docs"].get<size_t>());
+ ASSERT_EQ(3, res["found"].get<size_t>());
ASSERT_EQ(3, res["grouped_hits"].size());
ASSERT_EQ(10, res["grouped_hits"][0]["group_key"][0].get<size_t>());
@@ -642,8 +642,8 @@ TEST_F(CollectionGroupingTest, SortingOnGroupCount) {
"", 10,
{}, {}, {"size"}, 2).get();
- ASSERT_EQ(12, res2["found"].get<size_t>());
- ASSERT_EQ(3, res2["found_groups"].get<size_t>());
+ ASSERT_EQ(12, res2["found_docs"].get<size_t>());
+ ASSERT_EQ(3, res2["found"].get<size_t>());
ASSERT_EQ(3, res2["grouped_hits"].size());
ASSERT_EQ(11, res2["grouped_hits"][0]["group_key"][0].get<size_t>());
@@ -723,8 +723,8 @@ TEST_F(CollectionGroupingTest, SortingMoreThanMaxTopsterSize) {
"", 10,
{}, {}, {"size"}, 2).get();
- ASSERT_EQ(1000, res["found"].get<size_t>());
- ASSERT_EQ(300, res["found_groups"].get<size_t>());
+ ASSERT_EQ(1000, res["found_docs"].get<size_t>());
+ ASSERT_EQ(300, res["found"].get<size_t>());
ASSERT_EQ(100, res["grouped_hits"].size());
ASSERT_EQ(4, res["grouped_hits"][4]["found"].get<int32_t>());
@@ -743,8 +743,8 @@ TEST_F(CollectionGroupingTest, SortingMoreThanMaxTopsterSize) {
"", 10,
{}, {}, {"size"}, 2).get();
- ASSERT_EQ(1000, res["found"].get<size_t>());
- ASSERT_EQ(300, res["found_groups"].get<size_t>());
+ ASSERT_EQ(1000, res["found_docs"].get<size_t>());
+ ASSERT_EQ(300, res["found"].get<size_t>());
ASSERT_EQ(100, res["grouped_hits"].size());
ASSERT_EQ(3, res["grouped_hits"][4]["found"].get<int32_t>());
@@ -767,8 +767,8 @@ TEST_F(CollectionGroupingTest, SortingMoreThanMaxTopsterSize) {
"", 10,
{}, {}, {"size"}, 2).get();
- ASSERT_EQ(1000, res2["found"].get<size_t>());
- ASSERT_EQ(300, res2["found_groups"].get<size_t>());
+ ASSERT_EQ(1000, res2["found_docs"].get<size_t>());
+ ASSERT_EQ(300, res2["found"].get<size_t>());
ASSERT_EQ(100, res2["grouped_hits"].size());
ASSERT_EQ(2, res2["grouped_hits"][0]["found"].get<int32_t>());
@@ -786,8 +786,8 @@ TEST_F(CollectionGroupingTest, SortingMoreThanMaxTopsterSize) {
"", 10,
{}, {}, {"size"}, 2).get();
- ASSERT_EQ(1000, res2["found"].get<size_t>());
- ASSERT_EQ(300, res2["found_groups"].get<size_t>());
+ ASSERT_EQ(1000, res2["found_docs"].get<size_t>());
+ ASSERT_EQ(300, res2["found"].get<size_t>());
ASSERT_EQ(100, res2["grouped_hits"].size());
ASSERT_EQ(3, res2["grouped_hits"][0]["found"].get<int32_t>());