mirrors/scylladb
1
0
Fork 0
mirror of https://github.com/scylladb/scylladb.git synced 2026-06-04 05:53:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

sstables: Move promoted_index_block from types.hh to index_entry.hh.

Browse Source 
It is only being used by index_reader internally and never exposed so
should not be listed in commonly used types.

Signed-off-by: Vladimir Krivopalov <vladimir@scylladb.com>
This commit is contained in:
Vladimir Krivopalov
2018-06-27 08:12:07 -07:00
parent 81fba73e9d
commit a497edcbda
2 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
sstables/index_entry.hh
View File

@@ -27,6 +27,44 @@
namespace sstables {
class promoted_index_block {
public:
promoted_index_block(temporary_buffer<char>&& start, temporary_buffer<char>&& end,
uint64_t offset, uint64_t width)
: _start(std::move(start)), _end(std::move(end))
, _offset(offset), _width(width)
{}
promoted_index_block(const promoted_index_block& rhs)
: _start(rhs._start.get(), rhs._start.size()), _end(rhs._end.get(), rhs._end.size())
, _offset(rhs._offset), _width(rhs._width)
{}
promoted_index_block(promoted_index_block&&) noexcept = default;
promoted_index_block& operator=(const promoted_index_block& rhs) {
if (this != &rhs) {
_start = temporary_buffer<char>(rhs._start.get(), rhs._start.size());
_end = temporary_buffer<char>(rhs._end.get(), rhs._end.size());
_offset = rhs._offset;
_width = rhs._width;
}
return *this;
}
promoted_index_block& operator=(promoted_index_block&&) noexcept = default;
composite_view start(const schema& s) const { return composite_view(to_bytes_view(_start), s.is_compound());}
composite_view end(const schema& s) const { return composite_view(to_bytes_view(_end), s.is_compound());}
uint64_t offset() const { return _offset; }
uint64_t width() const { return _width; }
private:
temporary_buffer<char> _start;
temporary_buffer<char> _end;
uint64_t _offset;
uint64_t _width;
};
using promoted_index_blocks = seastar::circular_buffer<promoted_index_block>;
inline void erase_all_but_last(promoted_index_blocks& pi_blocks) {
while (pi_blocks.size() > 1) {
pi_blocks.pop_front();

38
sstables/types.hh
View File

@@ -111,44 +111,6 @@ enum class indexable_element {
cell
};
class promoted_index_block {
public:
promoted_index_block(temporary_buffer<char>&& start, temporary_buffer<char>&& end,
uint64_t offset, uint64_t width)
: _start(std::move(start)), _end(std::move(end))
, _offset(offset), _width(width)
{}
promoted_index_block(const promoted_index_block& rhs)
: _start(rhs._start.get(), rhs._start.size()), _end(rhs._end.get(), rhs._end.size())
, _offset(rhs._offset), _width(rhs._width)
{}
promoted_index_block(promoted_index_block&&) noexcept = default;
promoted_index_block& operator=(const promoted_index_block& rhs) {
if (this != &rhs) {
_start = temporary_buffer<char>(rhs._start.get(), rhs._start.size());
_end = temporary_buffer<char>(rhs._end.get(), rhs._end.size());
_offset = rhs._offset;
_width = rhs._width;
}
return *this;
}
promoted_index_block& operator=(promoted_index_block&&) noexcept = default;
composite_view start(const schema& s) const { return composite_view(to_bytes_view(_start), s.is_compound());}
composite_view end(const schema& s) const { return composite_view(to_bytes_view(_end), s.is_compound());}
uint64_t offset() const { return _offset; }
uint64_t width() const { return _width; }
private:
temporary_buffer<char> _start;
temporary_buffer<char> _end;
uint64_t _offset;
uint64_t _width;
};
using promoted_index_blocks = seastar::circular_buffer<promoted_index_block>;
class summary_entry {
public:
dht::token_view token;