bahman/scylla
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

partition_version: Return static_row fragment from static_row()

Browse Source 
Signed-off-by: Duarte Nunes <duarte@scylladb.com>
Message-Id: <20180109162815.5811-1-duarte@scylladb.com>
This commit is contained in:
Duarte Nunes
2018-01-09 16:28:14 +00:00
committed by Tomasz Grabiec
parent 7e898d2745
commit 16c975edcc
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cache_flat_mutation_reader.hh
View File

@@ -160,11 +160,11 @@ inline
future<> cache_flat_mutation_reader::process_static_row() {
if (_snp->static_row_continuous()) {
_read_context->cache().on_row_hit();
row sr = _lsa_manager.run_in_read_section([this] {
static_row sr = _lsa_manager.run_in_read_section([this] {
return _snp->static_row();
});
if (!sr.empty()) {
push_mutation_fragment(mutation_fragment(static_row(std::move(sr))));
push_mutation_fragment(mutation_fragment(std::move(sr)));
}
return make_ready_future<>();
} else {

6
partition_version.cc
View File

@@ -112,10 +112,10 @@ inline Result squashed(const partition_version_ref& v, Map&& map, Reduce&& reduc
}
row partition_snapshot::static_row() const {
return ::squashed<row>(version(),
::static_row partition_snapshot::static_row() const {
return ::static_row(::squashed<row>(version(),
[] (const mutation_partition& mp) -> const row& { return mp.static_row(); },
[this] (row& a, const row& b) { a.apply(*_schema, column_kind::static_column, b); });
[this] (row& a, const row& b) { a.apply(*_schema, column_kind::static_column, b); }));
}
bool partition_snapshot::static_row_continuous() const {

2
partition_version.hh
View File

@@ -272,7 +272,7 @@ public:
logalloc::region& region() const { return _region; }
tombstone partition_tombstone() const;
row static_row() const;
::static_row static_row() const;
bool static_row_continuous() const;
mutation_partition squashed() const;
// Returns range tombstones overlapping with [start, end)