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

Optimize id list iteration.

Kishore Nallan7b7f0c79d7da
diff --git a/include/id_list.h b/include/id_list.h
index 176272d8..b07ab719 100644
--- a/include/id_list.h
+++ b/include/id_list.h
@@ -52,7 +52,9 @@ public:
[[nodiscard]] bool valid() const;
void next();
void previous();
+ [[nodiscard]] uint32_t last_block_id() const;
void skip_to(uint32_t id);
+ void reset_cache();
[[nodiscard]] uint32_t id() const;
[[nodiscard]] inline uint32_t index() const;
[[nodiscard]] inline block_t* block() const;
diff --git a/src/id_list.cpp b/src/id_list.cpp
index f86ed229..e826a5d2 100644
--- a/src/id_list.cpp
+++ b/src/id_list.cpp
@@ -97,28 +97,50 @@ id_list_t::block_t* id_list_t::iterator_t::block() const {
return curr_block;
}
-void id_list_t::iterator_t::skip_to(uint32_t id) {
- bool skipped_block = false;
- while(curr_block != end_block && curr_block->ids.last() < id) {
- curr_block = curr_block->next;
- delete [] ids;
+uint32_t id_list_t::iterator_t::last_block_id() const {
+ auto size = curr_block->size();
+ if(size == 0) {
+ return 0;
+ }
- ids = nullptr;
+ return ids[size - 1];
+}
- if(curr_block != end_block) {
- ids = curr_block->ids.uncompress();
+void id_list_t::iterator_t::reset_cache() {
+ delete [] ids;
+ ids = nullptr;
+ curr_index = 0;
+ curr_block = end_block = nullptr;
+}
+
+void id_list_t::iterator_t::skip_to(uint32_t id) {
+ // first look to skip within current block
+ if(id <= this->last_block_id()) {
+ while(curr_index < curr_block->size() && this->id() < id) {
+ curr_index++;
}
- skipped_block = true;
+ return ;
}
- if(skipped_block) {
- curr_index = 0;
+ reset_cache();
+
+ const auto it = id_block_map->lower_bound(id);
+ if(it == id_block_map->end()) {
+ return;
}
- while(curr_block != end_block && curr_index < curr_block->size() && this->id() < id) {
+ curr_block = it->second;
+ curr_index = 0;
+ ids = curr_block->ids.uncompress();
+
+ while(curr_index < curr_block->size() && this->id() < id) {
curr_index++;
}
+
+ if(curr_index == curr_block->size()) {
+ reset_cache();
+ }
}
id_list_t::iterator_t::~iterator_t() {
diff --git a/test/id_list_test.cpp b/test/id_list_test.cpp
new file mode 100644
index 00000000..65b7606b
--- /dev/null
+++ b/test/id_list_test.cpp
@@ -0,0 +1,31 @@
+#include <gtest/gtest.h>
+#include <id_list.h>
+#include "logger.h"
+
+TEST(IdListTest, IdListIteratorTest) {
+ id_list_t id_list(2);
+ for(size_t i = 0; i < 10; i++) {
+ id_list.upsert(i*2);
+ }
+
+ auto iter = id_list.new_iterator();
+
+ for(size_t i = 0; i < 10; i++) {
+ iter.skip_to(i*2);
+ ASSERT_EQ(i*2, iter.id());
+ ASSERT_TRUE(iter.valid());
+ }
+
+ iter.skip_to(19);
+ ASSERT_FALSE(iter.valid());
+
+ auto iter2 = id_list.new_iterator();
+ size_t count = 0;
+ while(iter2.valid()) {
+ iter2.next();
+ count++;
+ }
+
+ ASSERT_EQ(10, count);
+ ASSERT_FALSE(iter2.valid());
+}