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

Add convenience methods in `result_iter_state_t`.

Harpreet Sangar9baa51664d5b
diff --git a/include/or_iterator.h b/include/or_iterator.h
index 67fd5ddf..c4f27518 100644
--- a/include/or_iterator.h
+++ b/include/or_iterator.h
@@ -62,8 +62,8 @@ bool or_iterator_t::intersect(std::vector<or_iterator_t>& its, result_iter_state
case 0:
break;
case 1:
- if(istate.filter_ids_length != 0) {
- its[0].skip_to(istate.filter_ids[istate.filter_ids_index]);
+ if(istate.is_filter_provided() && istate.is_filter_valid()) {
+ its[0].skip_to(istate.get_filter_id());
}
while(its.size() == it_size && its[0].valid()) {
@@ -79,10 +79,10 @@ bool or_iterator_t::intersect(std::vector<or_iterator_t>& its, result_iter_state
func(id, its);
}
- if(istate.filter_ids_length != 0 && !is_excluded) {
- if(istate.filter_ids_index < istate.filter_ids_length) {
+ if(istate.is_filter_provided() && !is_excluded) {
+ if(istate.is_filter_valid()) {
// skip iterator till next id available in filter
- its[0].skip_to(istate.filter_ids[istate.filter_ids_index]);
+ its[0].skip_to(istate.get_filter_id());
} else {
break;
}
@@ -92,9 +92,9 @@ bool or_iterator_t::intersect(std::vector<or_iterator_t>& its, result_iter_state
}
break;
case 2:
- if(istate.filter_ids_length != 0) {
- its[0].skip_to(istate.filter_ids[istate.filter_ids_index]);
- its[1].skip_to(istate.filter_ids[istate.filter_ids_index]);
+ if(istate.is_filter_provided() && istate.is_filter_valid()) {
+ its[0].skip_to(istate.get_filter_id());
+ its[1].skip_to(istate.get_filter_id());
}
while(its.size() == it_size && !at_end2(its)) {
@@ -111,11 +111,11 @@ bool or_iterator_t::intersect(std::vector<or_iterator_t>& its, result_iter_state
func(id, its);
}
- if(istate.filter_ids_length != 0 && !is_excluded) {
- if(istate.filter_ids_index < istate.filter_ids_length) {
+ if(istate.is_filter_provided() != 0 && !is_excluded) {
+ if(istate.is_filter_valid()) {
// skip iterator till next id available in filter
- its[0].skip_to(istate.filter_ids[istate.filter_ids_index]);
- its[1].skip_to(istate.filter_ids[istate.filter_ids_index]);
+ its[0].skip_to(istate.get_filter_id());
+ its[1].skip_to(istate.get_filter_id());
} else {
break;
}
@@ -128,9 +128,9 @@ bool or_iterator_t::intersect(std::vector<or_iterator_t>& its, result_iter_state
}
break;
default:
- if(istate.filter_ids_length != 0) {
+ if(istate.is_filter_provided() && istate.is_filter_valid()) {
for(auto& it: its) {
- it.skip_to(istate.filter_ids[istate.filter_ids_index]);
+ it.skip_to(istate.get_filter_id());
}
}
@@ -148,11 +148,11 @@ bool or_iterator_t::intersect(std::vector<or_iterator_t>& its, result_iter_state
func(id, its);
}
- if(istate.filter_ids_length != 0 && !is_excluded) {
- if(istate.filter_ids_index < istate.filter_ids_length) {
+ if(istate.is_filter_provided() && !is_excluded) {
+ if(istate.is_filter_valid()) {
// skip iterator till next id available in filter
for(auto& it: its) {
- it.skip_to(istate.filter_ids[istate.filter_ids_index]);
+ it.skip_to(istate.get_filter_id());
}
} else {
break;
@@ -167,4 +167,4 @@ bool or_iterator_t::intersect(std::vector<or_iterator_t>& its, result_iter_state
}
return true;
-}
+}
\ No newline at end of file
diff --git a/include/posting_list.h b/include/posting_list.h
index 11ed9c91..a0df81fa 100644
--- a/include/posting_list.h
+++ b/include/posting_list.h
@@ -33,6 +33,12 @@ struct result_iter_state_t {
filter_result_iterator_t* fit) : excluded_result_ids(excluded_result_ids),
excluded_result_ids_size(excluded_result_ids_size),
fit(fit){}
+
+ [[nodiscard]] bool is_filter_provided() const;
+
+ [[nodiscard]] bool is_filter_valid() const;
+
+ [[nodiscard]] uint32_t get_filter_id() const;
};
/*
diff --git a/src/posting_list.cpp b/src/posting_list.cpp
index 1b5a3323..dc82fb69 100644
--- a/src/posting_list.cpp
+++ b/src/posting_list.cpp
@@ -2,6 +2,7 @@
#include <bitset>
#include "for.h"
#include "array_utils.h"
+#include "filter_result_iterator.h"
/* block_t operations */
@@ -1781,3 +1782,31 @@ posting_list_t::iterator_t posting_list_t::iterator_t::clone() const {
uint32_t posting_list_t::iterator_t::get_field_id() const {
return field_id;
}
+
+bool result_iter_state_t::is_filter_provided() const {
+ return filter_ids_length > 0 || (fit != nullptr && fit->approx_filter_ids_length > 0);
+}
+
+bool result_iter_state_t::is_filter_valid() const {
+ if (filter_ids_length > 0) {
+ return filter_ids_index < filter_ids_length;
+ }
+
+ if (fit != nullptr) {
+ return fit->is_valid;
+ }
+
+ return false;
+}
+
+uint32_t result_iter_state_t::get_filter_id() const {
+ if (filter_ids_length > 0 && filter_ids_index < filter_ids_length) {
+ return filter_ids[filter_ids_index];
+ }
+
+ if (fit != nullptr && fit->is_valid) {
+ return fit->seq_id;
+ }
+
+ return 0;
+}