Skip to content
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

Update builder.h #3

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

Update builder.h #3

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
9 changes: 5 additions & 4 deletions include/ts/ts_cht/builder.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,12 @@ class Builder {
log_num_bins_ = ComputeLog(static_cast<uint64_t>(num_bins_));

// Compute the logarithm in base 2 of the range.
auto lg = ComputeLog(max_key_ - min_key_, true);
const KeyType range = max_key_ - min_key_;
auto lg = ComputeLog(range, true);

// And also the initial shift for the first node of the tree.
assert(lg >= log_num_bins_);
shift_ = lg - log_num_bins_;
shift_ = lg - log_num_bins_ + ((range & (range - 1)) == 0 && (num_bins_ & (num_bins_ - 1)) == 0);

// And build.
// TODO: build faster (use trick with lcp)!
Expand Down Expand Up @@ -341,9 +342,9 @@ class Builder {
num_radix_bits_ = log_num_bins_;
num_shift_bits_ = GetNumShiftBits(max_key_ - min_key_, num_radix_bits_);
const uint32_t max_prefix = (max_key_ - min_key_) >> num_shift_bits_;
table_.resize(max_prefix + 2, 0);
for (size_t index = 0, limit = std::min(num_bins_, table_.size()); index != limit; ++index)
for (size_t index = 0, limit = max_prefix + 1; index != limit; ++index)
table_[index] = (tree_.front().second[index].first & Mask);
table_[max_prefix + 1] = tree_.front().second[max_prefix].second;
table_.back() = curr_num_keys_;
shift_ = num_shift_bits_;
}
Expand Down