postgres/typesense
1
0
Fork 0
mirror of https://github.com/typesense/typesense.git synced 2025-05-23 23:30:42 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Add numeric field support in filter_result_t.

Browse Source
This commit is contained in:
Harpreet Sangar 2023-04-17 20:54:50 +05:30
parent 599a6d71f8
commit 0114eb9b17
3 changed files with 109 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/num_tree.h
View File

@ -30,6 +30,11 @@ public:
void range_inclusive_search(int64_t start, int64_t end, uint32_t** ids, size_t& ids_len);
void range_inclusive_search_iterators(int64_t start,
int64_t end,
std::vector<id_list_t::iterator_t>& id_list_iterators,
std::vector<id_list_t*>& expanded_id_lists);
void approx_range_inclusive_search_count(int64_t start, int64_t end, uint32_t& ids_len);
void range_inclusive_contains(const int64_t& start, const int64_t& end,
@ -42,6 +47,11 @@ public:
void search(NUM_COMPARATOR comparator, int64_t value, uint32_t** ids, size_t& ids_len);
void search_iterators(NUM_COMPARATOR comparator,
int64_t value,
std::vector<id_list_t::iterator_t>& id_list_iterators,
std::vector<id_list_t*>& expanded_id_lists);
void approx_search_count(NUM_COMPARATOR comparator, int64_t value, uint32_t& ids_len);
void remove(uint64_t value, uint32_t id);

23
src/filter_result_iterator.cpp
View File

@ -447,7 +447,16 @@ void filter_result_iterator_t::next() {
field f = index->search_schema.at(a_filter.field_name);
if (f.is_string()) {
if (f.is_integer() || f.is_float() || f.is_bool()) {
result_index++;
if (result_index >= filter_result.count) {
is_valid = false;
return;
}
seq_id = filter_result.docs[result_index];
return;
} else if (f.is_string()) {
if (filter_node->filter_exp.apply_not_equals) {
if (++seq_id < result_index) {
return;
@ -987,7 +996,17 @@ void filter_result_iterator_t::skip_to(uint32_t id) {
field f = index->search_schema.at(a_filter.field_name);
if (f.is_string()) {
if (f.is_integer() || f.is_float() || f.is_bool()) {
while(result_index < filter_result.count && filter_result.docs[result_index] < id) {
result_index++;
}
if (result_index >= filter_result.count) {
is_valid = false;
}
return;
} else if (f.is_string()) {
if (filter_node->filter_exp.apply_not_equals) {
if (id < seq_id) {
return;

78
src/num_tree.cpp
View File

@ -43,6 +43,30 @@ void num_tree_t::range_inclusive_search(int64_t start, int64_t end, uint32_t** i
*ids = out;
}
void num_tree_t::range_inclusive_search_iterators(int64_t start,
int64_t end,
std::vector<id_list_t::iterator_t>& id_list_iterators,
std::vector<id_list_t*>& expanded_id_lists) {
if (int64map.empty()) {
return;
}
auto it_start = int64map.lower_bound(start); // iter values will be >= start
std::vector<void*> raw_id_lists;
while (it_start != int64map.end() && it_start->first <= end) {
raw_id_lists.push_back(it_start->second);
it_start++;
}
std::vector<id_list_t*> id_lists;
ids_t::to_expanded_id_lists(raw_id_lists, id_lists, expanded_id_lists);
for (const auto &id_list: id_lists) {
id_list_iterators.emplace_back(id_list->new_iterator());
}
}
void num_tree_t::approx_range_inclusive_search_count(int64_t start, int64_t end, uint32_t& ids_len) {
if (int64map.empty()) {
return;
@ -187,6 +211,60 @@ void num_tree_t::search(NUM_COMPARATOR comparator, int64_t value, uint32_t** ids
}
}
void num_tree_t::search_iterators(NUM_COMPARATOR comparator,
int64_t value,
std::vector<id_list_t::iterator_t>& id_list_iterators,
std::vector<id_list_t*>& expanded_id_lists) {
if (int64map.empty()) {
return ;
}
std::vector<void*> raw_id_lists;
if (comparator == EQUALS) {
const auto& it = int64map.find(value);
if (it != int64map.end()) {
raw_id_lists.emplace_back(it->second);
}
} else if (comparator == GREATER_THAN || comparator == GREATER_THAN_EQUALS) {
// iter entries will be >= value, or end() if all entries are before value
auto iter_ge_value = int64map.lower_bound(value);
if(iter_ge_value == int64map.end()) {
return ;
}
if(comparator == GREATER_THAN && iter_ge_value->first == value) {
iter_ge_value++;
}
while(iter_ge_value != int64map.end()) {
raw_id_lists.emplace_back(iter_ge_value->second);
iter_ge_value++;
}
} else if(comparator == LESS_THAN || comparator == LESS_THAN_EQUALS) {
// iter entries will be >= value, or end() if all entries are before value
auto iter_ge_value = int64map.lower_bound(value);
auto it = int64map.begin();
while(it != iter_ge_value) {
raw_id_lists.emplace_back(it->second);
it++;
}
// for LESS_THAN_EQUALS, check if last iter entry is equal to value
if(it != int64map.end() && comparator == LESS_THAN_EQUALS && it->first == value) {
raw_id_lists.emplace_back(it->second);
}
}
std::vector<id_list_t*> id_lists;
ids_t::to_expanded_id_lists(raw_id_lists, id_lists, expanded_id_lists);
for (const auto &id_list: id_lists) {
id_list_iterators.emplace_back(id_list->new_iterator());
}
}
void num_tree_t::approx_search_count(NUM_COMPARATOR comparator, int64_t value, uint32_t& ids_len) {
if (int64map.empty()) {
return;