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

Merge remote-tracking branch 'up/v0.26-facets' into v0.26-facets

Harpreet Sangar6a573b45412a
diff --cc src/collection_manager.cpp
index acbfc4d2,e0ede7dd..82c26a81
--- a/src/collection_manager.cpp
+++ b/src/collection_manager.cpp
@@@ -623,31 -623,43 +623,70 @@@ bool CollectionManager::parse_sort_by_s
char prev_non_space_char = 'a';
for(size_t i=0; i < sort_by_str.size(); i++) {
- if (sort_field_expr.empty() && sort_by_str[i] == '$') {
- // Sort by reference field
- if (sort_field_expr.empty() && sort_by_str.substr(i, 5) == sort_field_const::eval) {
- // Optional filtering
-- auto open_paren_pos = sort_by_str.find('(', i);
-- if (open_paren_pos == std::string::npos) {
-- return false;
-- }
- sort_field_expr = sort_by_str.substr(i, open_paren_pos - i + 1);
- sort_field_expr = sort_field_const::eval + "(";
--
-- i = open_paren_pos;
-- int paren_count = 1;
-- while (++i < sort_by_str.size() && paren_count > 0) {
-- if (sort_by_str[i] == '(') {
-- paren_count++;
-- } else if (sort_by_str[i] == ')') {
-- paren_count--;
++ if (sort_field_expr.empty()) {
++ if (sort_by_str[i] == '$') {
++ // Sort by reference field
++ auto open_paren_pos = sort_by_str.find('(', i);
++ if (open_paren_pos == std::string::npos) {
++ return false;
++ }
++ sort_field_expr = sort_by_str.substr(i, open_paren_pos - i + 1);
++
++ i = open_paren_pos;
++ int paren_count = 1;
++ while (++i < sort_by_str.size() && paren_count > 0) {
++ if (sort_by_str[i] == '(') {
++ paren_count++;
++ } else if (sort_by_str[i] == ')') {
++ paren_count--;
++ }
++ sort_field_expr += sort_by_str[i];
++ }
++ if (paren_count != 0) {
++ return false;
}
-- sort_field_expr += sort_by_str[i];
-- }
- if (paren_count != 0) {
- if (paren_count != 0 || i >= sort_by_str.size()) {
-- return false;
-- }
- sort_fields.emplace_back(sort_field_expr, "");
- sort_field_expr = "";
- continue;
- while (sort_by_str[i] != ':' && ++i < sort_by_str.size());
- if (i >= sort_by_str.size()) {
- return false;
- }
++ sort_fields.emplace_back(sort_field_expr, "");
++ sort_field_expr = "";
++ continue;
++ } else if (sort_by_str.substr(i, 5) == sort_field_const::eval) {
++ // Optional filtering
++ auto open_paren_pos = sort_by_str.find('(', i);
++ if (open_paren_pos == std::string::npos) {
++ return false;
++ }
++ sort_field_expr = sort_field_const::eval + "(";
++
++ i = open_paren_pos;
++ int paren_count = 1;
++ while (++i < sort_by_str.size() && paren_count > 0) {
++ if (sort_by_str[i] == '(') {
++ paren_count++;
++ } else if (sort_by_str[i] == ')') {
++ paren_count--;
++ }
++ sort_field_expr += sort_by_str[i];
++ }
++ if (paren_count != 0 || i >= sort_by_str.size()) {
++ return false;
++ }
+
- std::string order_str;
- while (++i < sort_by_str.size() && sort_by_str[i] != ',') {
- order_str += sort_by_str[i];
- }
- StringUtils::trim(order_str);
- StringUtils::toupper(order_str);
++ while (sort_by_str[i] != ':' && ++i < sort_by_str.size());
++ if (i >= sort_by_str.size()) {
++ return false;
++ }
+
- sort_fields.emplace_back(sort_field_expr, order_str);
- sort_field_expr = "";
- continue;
++ std::string order_str;
++ while (++i < sort_by_str.size() && sort_by_str[i] != ',') {
++ order_str += sort_by_str[i];
++ }
++ StringUtils::trim(order_str);
++ StringUtils::toupper(order_str);
++
++ sort_fields.emplace_back(sort_field_expr, order_str);
++ sort_field_expr = "";
++ continue;
++ }
}
if(i == sort_by_str.size()-1 || (sort_by_str[i] == ',' && !isdigit(prev_non_space_char))) {