Skip to content

Optimize seek #304

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
eatbreads wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Optimize seek #304

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions include/storage/mem_index_page.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,7 @@ class IndexPageIter
uint16_t curr_restart_idx_{0};

std::string key_;
std::string prev_key_;
PageId page_id_{MaxPageId};
};
} // namespace eloqstore
33 changes: 24 additions & 9 deletions src/storage/mem_index_page.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
#include <cstddef>
#include <cstdint>
#include <cstdlib>
#include <cstring>
#include <string>
#include <string_view>

Expand Down Expand Up @@ -117,6 +118,8 @@ IndexPageIter::IndexPageIter(const MemIndexPage *index_page,
(1 + restart_num_) * sizeof(uint16_t)),
curr_offset_(MemIndexPage::leftmost_ptr_offset)
{
key_.reserve(128);
prev_key_.reserve(128);
}

IndexPageIter::IndexPageIter(std::string_view page_view, const KvOptions *opts)
Expand All @@ -129,6 +132,8 @@ IndexPageIter::IndexPageIter(std::string_view page_view, const KvOptions *opts)
{
assert(DecodeFixed16(page_view.data() + MemIndexPage::page_size_offset) ==
page_view.size());
key_.reserve(128);
prev_key_.reserve(128);
}

bool IndexPageIter::ParseNextKey()
Expand Down Expand Up @@ -163,8 +168,13 @@ bool IndexPageIter::ParseNextKey()
}
else
{
key_.resize(shared);
key_.append(pt, non_shared);
const size_t new_size = static_cast<size_t>(shared + non_shared);
if (key_.capacity() < new_size)
{
key_.reserve(new_size);
}
key_.resize(new_size);
std::memcpy(&key_[shared], pt, non_shared);
pt += non_shared;

// Parses the page Id. The stored value is the real page Id if this is
Expand Down Expand Up @@ -252,9 +262,14 @@ void IndexPageIter::PeekNextKey(std::string &key) const
}
else
{
key.reserve(shared + non_shared);
key.append(key_.data(), shared);
key.append(pt, non_shared);
const size_t new_size = static_cast<size_t>(shared + non_shared);
if (key.capacity() < new_size)
{
key.reserve(new_size);
}
key.resize(new_size);
std::memcpy(&key[0], key_.data(), shared);
std::memcpy(&key[shared], pt, non_shared);
}
}

Expand Down Expand Up @@ -347,7 +362,7 @@ void IndexPageIter::Seek(std::string_view search_key)
: restart_offset_;

uint16_t prev_offset = curr_offset_;
std::string prev_key = key_;
prev_key_.assign(key_);
uint32_t prev_page_id = page_id_;

while (curr_offset_ < limit)
Expand All @@ -373,15 +388,15 @@ void IndexPageIter::Seek(std::string_view search_key)
else
{
prev_offset = curr_offset_;
prev_key = key_;
prev_key_.assign(key_);
prev_page_id = page_id_;
}
}

// Positions to the prior index entry.
curr_offset_ = prev_offset;
key_ = prev_key;
key_.assign(prev_key_);
page_id_ = prev_page_id;
}
}
} // namespace eloqstore
} // namespace eloqstore