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

Refactor sort field clause to account for geopoint.

kishorenc0e7f290bbfcf
diff --git a/include/collection_manager.h b/include/collection_manager.h
index 147601d9..bae8906a 100644
--- a/include/collection_manager.h
+++ b/include/collection_manager.h
@@ -157,6 +157,8 @@ public:
static Option<bool> do_search(std::map<std::string, std::string>& req_params, std::string& results_json_str);
+ static bool parse_sort_by_str(std::string sort_by_str, std::vector<sort_by>& sort_fields);
+
// symlinks
Option<std::string> resolve_symlink(const std::string & symlink_name) const;
diff --git a/src/collection_manager.cpp b/src/collection_manager.cpp
index 85684246..9a952f00 100644
--- a/src/collection_manager.cpp
+++ b/src/collection_manager.cpp
@@ -510,6 +510,38 @@ AuthManager& CollectionManager::getAuthManager() {
return auth_manager;
}
+bool CollectionManager::parse_sort_by_str(std::string sort_by_str, std::vector<sort_by>& sort_fields) {
+ std::string sort_field_expr;
+ char prev_non_space_char = 'a';
+
+ for(size_t i=0; i < sort_by_str.size(); i++) {
+ if(i == sort_by_str.size()-1 || (sort_by_str[i] == ',' && !isdigit(prev_non_space_char))) {
+ if(i == sort_by_str.size()-1) {
+ sort_field_expr += sort_by_str[i];
+ }
+
+ std::vector<std::string> expression_parts;
+ StringUtils::split(sort_field_expr, expression_parts, ":");
+
+ if(expression_parts.size() != 2) {
+ return false;
+ }
+
+ StringUtils::toupper(expression_parts[1]);
+ sort_fields.emplace_back(expression_parts[0], expression_parts[1]);
+ sort_field_expr = "";
+ } else {
+ sort_field_expr += sort_by_str[i];
+ }
+
+ if(sort_by_str[i] != ' ') {
+ prev_non_space_char = sort_by_str[i];
+ }
+ }
+
+ return true;
+}
+
Option<bool> CollectionManager::do_search(std::map<std::string, std::string>& req_params, std::string& results_json_str) {
auto begin = std::chrono::high_resolution_clock::now();
@@ -714,25 +746,14 @@ Option<bool> CollectionManager::do_search(std::map<std::string, std::string>& re
StringUtils::split(req_params[GROUP_BY], group_by_fields, ",");
std::vector<sort_by> sort_fields;
- if(req_params.count(SORT_BY) != 0) {
- std::vector<std::string> sort_field_strs;
- StringUtils::split(req_params[SORT_BY], sort_field_strs, ",");
-
- if(sort_field_strs.size() > 3) {
- return Option<bool>(400,"Only upto 3 sort fields are allowed.");
- }
-
- for(const std::string & sort_field_str: sort_field_strs) {
- std::vector<std::string> expression_parts;
- StringUtils::split(sort_field_str, expression_parts, ":");
+ bool parsed_sort_by = parse_sort_by_str(req_params[SORT_BY], sort_fields);
- if(expression_parts.size() != 2) {
- return Option<bool>(400,std::string("Parameter `") + SORT_BY + "` is malformed.");
- }
+ if(!parsed_sort_by) {
+ return Option<bool>(400,std::string("Parameter `") + SORT_BY + "` is malformed.");
+ }
- StringUtils::toupper(expression_parts[1]);
- sort_fields.emplace_back(expression_parts[0], expression_parts[1]);
- }
+ if(sort_fields.size() > 3) {
+ return Option<bool>(400, "Only upto 3 sort fields are allowed.");
}
if(req_params.count(PINNED_HITS) == 0) {
diff --git a/test/collection_manager_test.cpp b/test/collection_manager_test.cpp
index b1faa27e..11beae8c 100644
--- a/test/collection_manager_test.cpp
+++ b/test/collection_manager_test.cpp
@@ -396,3 +396,51 @@ TEST_F(CollectionManagerTest, Symlinking) {
ASSERT_TRUE(collection_option.ok());
ASSERT_EQ("company_2020", collection_option.get());
}
+
+TEST_F(CollectionManagerTest, ParseSortByClause) {
+ std::vector<sort_by> sort_fields;
+ bool sort_by_parsed = CollectionManager::parse_sort_by_str("points:desc,loc(24.56,10.45):ASC", sort_fields);
+ ASSERT_TRUE(sort_by_parsed);
+
+ ASSERT_STREQ("points", sort_fields[0].name.c_str());
+ ASSERT_STREQ("DESC", sort_fields[0].order.c_str());
+
+ ASSERT_STREQ("loc(24.56,10.45)", sort_fields[1].name.c_str());
+ ASSERT_STREQ("ASC", sort_fields[1].order.c_str());
+
+ sort_fields.clear();
+
+ sort_by_parsed = CollectionManager::parse_sort_by_str(" points:desc , loc(24.56,10.45):ASC", sort_fields);
+ ASSERT_TRUE(sort_by_parsed);
+
+ ASSERT_STREQ("points", sort_fields[0].name.c_str());
+ ASSERT_STREQ("DESC", sort_fields[0].order.c_str());
+
+ ASSERT_STREQ("loc(24.56,10.45)", sort_fields[1].name.c_str());
+ ASSERT_STREQ("ASC", sort_fields[1].order.c_str());
+
+ sort_fields.clear();
+
+ sort_by_parsed = CollectionManager::parse_sort_by_str(" loc(24.56,10.45):ASC, points:desc ", sort_fields);
+ ASSERT_TRUE(sort_by_parsed);
+
+ ASSERT_STREQ("loc(24.56,10.45)", sort_fields[0].name.c_str());
+ ASSERT_STREQ("ASC", sort_fields[0].order.c_str());
+
+ ASSERT_STREQ("points", sort_fields[1].name.c_str());
+ ASSERT_STREQ("DESC", sort_fields[1].order.c_str());
+
+ sort_fields.clear();
+ sort_by_parsed = CollectionManager::parse_sort_by_str("", sort_fields);
+ ASSERT_TRUE(sort_by_parsed);
+ ASSERT_EQ(0, sort_fields.size());
+
+ sort_fields.clear();
+ sort_by_parsed = CollectionManager::parse_sort_by_str(",", sort_fields);
+ ASSERT_FALSE(sort_by_parsed);
+
+ sort_fields.clear();
+ sort_by_parsed = CollectionManager::parse_sort_by_str(",,", sort_fields);
+ ASSERT_FALSE(sort_by_parsed);
+
+}
\ No newline at end of file
diff --git a/test/collection_override_test.cpp b/test/collection_override_test.cpp
index ac49e6e9..42c7b9d4 100644
--- a/test/collection_override_test.cpp
+++ b/test/collection_override_test.cpp
@@ -569,6 +569,55 @@ TEST_F(CollectionOverrideTest, PinnedHitsWhenThereAreNotEnoughResults) {
ASSERT_STREQ("11", results["hits"][3]["document"]["id"].get<std::string>().c_str());
}
+TEST_F(CollectionOverrideTest, HiddenHitsHidingSingleResult) {
+ Collection *coll1;
+
+ std::vector<field> fields = {field("title", field_types::STRING, false),
+ field("points", field_types::INT32, false),};
+
+ coll1 = collectionManager.get_collection("coll1").get();
+ if (coll1 == nullptr) {
+ coll1 = collectionManager.create_collection("coll1", 1, fields, "points").get();
+ }
+
+ std::vector<std::vector<std::string>> records = {
+ {"Down There by the Train"}
+ };
+
+ for (size_t i = 0; i < records.size(); i++) {
+ nlohmann::json doc;
+
+ doc["id"] = std::to_string(i);
+ doc["title"] = records[i][0];
+ doc["points"] = i;
+
+ ASSERT_TRUE(coll1->add(doc.dump()).ok());
+ }
+
+ std::string hidden_hits="0";
+ auto results = coll1->search("the train", {"title"}, "", {}, {}, 0, 50, 1, FREQUENCY,
+ false, Index::DROP_TOKENS_THRESHOLD,
+ spp::sparse_hash_set<std::string>(),
+ spp::sparse_hash_set<std::string>(), 10, "", 30, 5,
+ "", 10,
+ "", hidden_hits).get();
+
+ ASSERT_EQ(0, results["found"].get<size_t>());
+ ASSERT_EQ(0, results["hits"].size());
+
+ results = coll1->search("the train", {"title"}, "points:0", {}, {}, 0, 50, 1, FREQUENCY,
+ false, Index::DROP_TOKENS_THRESHOLD,
+ spp::sparse_hash_set<std::string>(),
+ spp::sparse_hash_set<std::string>(), 10, "", 30, 5,
+ "", 10,
+ "", hidden_hits).get();
+
+ ASSERT_EQ(0, results["found"].get<size_t>());
+ ASSERT_EQ(0, results["hits"].size());
+
+ collectionManager.drop_collection("coll1");
+}
+
TEST_F(CollectionOverrideTest, PinnedHitsGrouping) {
auto pinned_hits = "6:1,8:1,1:2,13:3,4:3";