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

collection_type_impl: Make for_each_cell static

Browse Source 
Signed-off-by: Duarte Nunes <duarte@scylladb.com>
Message-Id: <20180115013532.67200-1-duarte@scylladb.com>
This commit is contained in:
Duarte Nunes
2018-01-15 01:35:32 +00:00
committed by Avi Kivity
parent fe788e0a5d
commit b607662d2e
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
db/view/view.cc
View File

@@ -280,7 +280,7 @@ row_marker view_updates::compute_row_marker(const clustering_row& base_row) cons
if (def.is_atomic()) {
maybe_update_expiry_and_ttl(c.as_atomic_cell());
} else {
static_pointer_cast<const collection_type_impl>(def.type)->for_each_cell(c.as_collection_mutation(), maybe_update_expiry_and_ttl);
collection_type_impl::for_each_cell(c.as_collection_mutation(), maybe_update_expiry_and_ttl);
}
});
@@ -374,7 +374,7 @@ void view_updates::do_delete_old_entry(const partition_key& base_key, const clus
if (def->is_atomic()) {
set_max_ts(cell.as_atomic_cell());
} else {
static_pointer_cast<const collection_type_impl>(def->type)->for_each_cell(cell.as_collection_mutation(), set_max_ts);
collection_type_impl::for_each_cell(cell.as_collection_mutation(), set_max_ts);
}
});
get_view_row(base_key, existing).apply(shadowable_tombstone(ts, now));

2
types.hh
View File

@@ -824,7 +824,7 @@ public:
// Calls Func(atomic_cell_view) for each cell in this collection.
// noexcept if Func doesn't throw.
template<typename Func>
void for_each_cell(collection_mutation_view c, Func&& func) const {
static void for_each_cell(collection_mutation_view c, Func&& func) {
auto m_view = deserialize_mutation_form(std::move(c));
for (auto&& c : m_view.cells) {
func(std::move(c.second));