mirrors/scylladb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

db: Avoid unnecessary lookup of row key when applying range tombstones

Browse Source
This commit is contained in:
Tomasz Grabiec
2015-03-24 12:00:29 +01:00
parent 7bd076ed85
commit 9eafa69d43
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
database.cc
View File

@@ -537,6 +537,13 @@ mutation_partition::tombstone_for_row(const schema& schema, const clustering_key
return t;
}
tombstone
mutation_partition::tombstone_for_row(const schema& schema, const rows_entry& e) {
tombstone t = range_tombstone_for_row(schema, e.key());
t.apply(e.row().t);
return t;
}
void
mutation_partition::apply_row_tombstone(schema_ptr schema, clustering_key_prefix prefix, tombstone t) {
assert(!prefix.is_full(*schema));
@@ -649,7 +656,7 @@ column_family::get_partition_slice(mutation_partition& partition, const query::p
auto&& cells = &row.row().cells;
// FIXME: handle removed rows properly. In CQL rows are separate entities (can be live or dead).
auto row_tombstone = partition.tombstone_for_row(*_schema, row.key());
auto row_tombstone = partition.tombstone_for_row(*_schema, row);
query::result::row result_row;
result_row.cells.reserve(slice.regular_columns.size());

1
database.hh
View File

@@ -194,6 +194,7 @@ public:
rows_entry* find_entry(schema_ptr schema, const clustering_key_prefix& key);
tombstone range_tombstone_for_row(const schema& schema, const clustering_key& key);
tombstone tombstone_for_row(const schema& schema, const clustering_key& key);
tombstone tombstone_for_row(const schema& schema, const rows_entry& e);
friend std::ostream& operator<<(std::ostream& os, const mutation_partition& mp);
boost::iterator_range<rows_type::iterator> range(const schema& schema, const query::range<clustering_key_prefix>& r);
};