andreacavalli/rocksdb
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

MergingIterator: rearrange fields to reduce paddings (#9024)

Browse Source 
Summary: Pull Request resolved: https://github.com/facebook/rocksdb/pull/9024

Reviewed By: pdillinger

Differential Revision: D31614752

Pulled By: ajkr

fbshipit-source-id: ef19ae243127f992e982a5a3b8ddefe7946246f8
This commit is contained in:
leipeng 2021-10-14 12:00:23 -07:00 committed by Facebook GitHub Bot
parent f5526af8ed
commit 4c277ab201
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
table/merging_iterator.cc
View File

@ -40,11 +40,11 @@ class MergingIterator : public InternalIterator {
InternalIterator** children, int n, bool is_arena_mode, InternalIterator** children, int n, bool is_arena_mode,
bool prefix_seek_mode) bool prefix_seek_mode)
: is_arena_mode_(is_arena_mode), : is_arena_mode_(is_arena_mode),
prefix_seek_mode_(prefix_seek_mode),
direction_(kForward),
comparator_(comparator), comparator_(comparator),
current_(nullptr), current_(nullptr),
direction_(kForward),
minHeap_(comparator_), minHeap_(comparator_),
prefix_seek_mode_(prefix_seek_mode),
pinned_iters_mgr_(nullptr) { pinned_iters_mgr_(nullptr) {
children_.resize(n); children_.resize(n);
for (int i = 0; i < n; i++) { for (int i = 0; i < n; i++) {
@ -287,6 +287,10 @@ class MergingIterator : public InternalIterator {
void InitMaxHeap(); void InitMaxHeap();
bool is_arena_mode_; bool is_arena_mode_;
bool prefix_seek_mode_;
// Which direction is the iterator moving?
enum Direction : uint8_t { kForward, kReverse };
Direction direction_;
const InternalKeyComparator* comparator_; const InternalKeyComparator* comparator_;
autovector<IteratorWrapper, kNumIterReserve> children_; autovector<IteratorWrapper, kNumIterReserve> children_;
@ -296,14 +300,7 @@ class MergingIterator : public InternalIterator {
IteratorWrapper* current_; IteratorWrapper* current_;
// If any of the children have non-ok status, this is one of them. // If any of the children have non-ok status, this is one of them.
Status status_; Status status_;
// Which direction is the iterator moving?
enum Direction {
kForward,
kReverse
};
Direction direction_;
MergerMinIterHeap minHeap_; MergerMinIterHeap minHeap_;
bool prefix_seek_mode_;
// Max heap is used for reverse iteration, which is way less common than // Max heap is used for reverse iteration, which is way less common than
// forward. Lazily initialize it to save memory. // forward. Lazily initialize it to save memory.