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

Rename group count => group found

Kishore Nallan16112b34e3cf
diff --git a/include/field.h b/include/field.h
index 8db3ce1c..792aaec6 100644
--- a/include/field.h
+++ b/include/field.h
@@ -706,7 +706,7 @@ namespace sort_field_const {
static const std::string text_match = "_text_match";
static const std::string eval = "_eval";
static const std::string seq_id = "_seq_id";
- static const std::string group_count = "_group_count";
+ static const std::string group_found = "_group_found";
static const std::string exclude_radius = "exclude_radius";
static const std::string precision = "precision";
diff --git a/src/collection.cpp b/src/collection.cpp
index 40f4c477..f24e1af5 100644
--- a/src/collection.cpp
+++ b/src/collection.cpp
@@ -893,7 +893,7 @@ Option<bool> Collection::validate_and_standardize_sort_fields(const std::vector<
}
if (sort_field_std.name != sort_field_const::text_match && sort_field_std.name != sort_field_const::eval &&
- sort_field_std.name != sort_field_const::seq_id && sort_field_std.name != sort_field_const::group_count) {
+ sort_field_std.name != sort_field_const::seq_id && sort_field_std.name != sort_field_const::group_found) {
const auto field_it = search_schema.find(sort_field_std.name);
if(field_it == search_schema.end() || !field_it.value().sort || !field_it.value().index) {
@@ -903,8 +903,8 @@ Option<bool> Collection::validate_and_standardize_sort_fields(const std::vector<
}
}
- if(sort_field_std.name == sort_field_const::group_count && is_group_by_query == false) {
- std::string error = "group_by parameters should not be empty when using sort_by group_count";
+ if(sort_field_std.name == sort_field_const::group_found && is_group_by_query == false) {
+ std::string error = "group_by parameters should not be empty when using sort_by group_found";
return Option<bool>(404, error);
}
@@ -2483,7 +2483,7 @@ void Collection::populate_result_kvs(Topster *topster, std::vector<std::vector<K
int group_sort_order = 1;
for(int i = 0; i < sort_by_fields.size(); ++i) {
- if(sort_by_fields[i].name == sort_field_const::group_count) {
+ if(sort_by_fields[i].name == sort_field_const::group_found) {
group_count_index = i;
if(sort_by_fields[i].order == sort_field_const::asc) {
diff --git a/src/index.cpp b/src/index.cpp
index f330a7fe..7af22077 100644
--- a/src/index.cpp
+++ b/src/index.cpp
@@ -4909,7 +4909,7 @@ void Index::populate_sort_mapping(int* sort_order, std::vector<size_t>& geopoint
if (sort_fields_std[i].name == sort_field_const::text_match) {
field_values[i] = &text_match_sentinel_value;
} else if (sort_fields_std[i].name == sort_field_const::seq_id ||
- sort_fields_std[i].name == sort_field_const::group_count) {
+ sort_fields_std[i].name == sort_field_const::group_found) {
field_values[i] = &seq_id_sentinel_value;
} else if (sort_fields_std[i].name == sort_field_const::eval) {
field_values[i] = &eval_sentinel_value;
diff --git a/test/collection_grouping_test.cpp b/test/collection_grouping_test.cpp
index bc1a7b54..74b639bf 100644
--- a/test/collection_grouping_test.cpp
+++ b/test/collection_grouping_test.cpp
@@ -602,7 +602,7 @@ TEST_F(CollectionGroupingTest, RepeatedFieldNameGroupHitCount) {
TEST_F(CollectionGroupingTest, SortingOnGroupCount) {
- std::vector<sort_by> sort_fields = {sort_by("_group_count", "DESC")};
+ std::vector<sort_by> sort_fields = {sort_by("_group_found", "DESC")};
auto res = coll_group->search("*", {}, "", {"brand"}, sort_fields, {0}, 50, 1, FREQUENCY,
{false}, Index::DROP_TOKENS_THRESHOLD,
@@ -626,7 +626,7 @@ TEST_F(CollectionGroupingTest, SortingOnGroupCount) {
//search in asc order
- std::vector<sort_by> sort_fields2 = {sort_by("_group_count", "ASC")};
+ std::vector<sort_by> sort_fields2 = {sort_by("_group_found", "ASC")};
auto res2 = coll_group->search("*", {}, "", {"brand"}, sort_fields2, {0}, 50, 1, FREQUENCY,
{false}, Index::DROP_TOKENS_THRESHOLD,
@@ -706,7 +706,7 @@ TEST_F(CollectionGroupingTest, SortingMoreThanMaxTopsterSize) {
}
//first search in desc order
- std::vector<sort_by> sort_fields = {sort_by("_group_count", "DESC")};
+ std::vector<sort_by> sort_fields = {sort_by("_group_found", "DESC")};
auto res = coll3->search("*", {}, "", {"brand"}, sort_fields, {0}, 100, 2, FREQUENCY,
{false}, Index::DROP_TOKENS_THRESHOLD,
@@ -748,7 +748,7 @@ TEST_F(CollectionGroupingTest, SortingMoreThanMaxTopsterSize) {
//search in asc order
- std::vector<sort_by> sort_fields2 = {sort_by("_group_count", "ASC")};
+ std::vector<sort_by> sort_fields2 = {sort_by("_group_found", "ASC")};
auto res2 = coll3->search("*", {}, "", {"brand"}, sort_fields2, {0}, 100, 1, FREQUENCY,
{false}, Index::DROP_TOKENS_THRESHOLD,
@@ -789,7 +789,7 @@ TEST_F(CollectionGroupingTest, SortingMoreThanMaxTopsterSize) {
TEST_F(CollectionGroupingTest, GroupSortingWithoutGroupingFields) {
- std::vector<sort_by> sort_fields = {sort_by("_group_count", "DESC")};
+ std::vector<sort_by> sort_fields = {sort_by("_group_found", "DESC")};
auto res = coll_group->search("*", {}, "", {"brand"}, sort_fields, {0}, 50, 1, FREQUENCY,
{false}, Index::DROP_TOKENS_THRESHOLD,
@@ -799,5 +799,5 @@ TEST_F(CollectionGroupingTest, GroupSortingWithoutGroupingFields) {
{}, {}, {});
ASSERT_EQ(res.ok(), false);
- ASSERT_EQ(res.error(), "group_by parameters should not be empty when using sort_by group_count");
+ ASSERT_EQ(res.error(), "group_by parameters should not be empty when using sort_by group_found");
}
\ No newline at end of file