mirrors/scylladb
1
0
Fork 0
mirror of https://github.com/scylladb/scylladb.git synced 2026-05-31 20:16:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

mutation_partition: work on linearized atomic_cell_or_mutation objects

Browse Source 
Ensure that when we examine atomic_cell_or_mutation objects for merging,
that they are contiguous in memory.  When we are done we scatter them again.
This commit is contained in:
Avi Kivity
2015-12-06 16:32:22 +02:00
parent ad975ad629
commit f9e2a9a086
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mutation_partition.cc
View File

@@ -607,6 +607,8 @@ void
merge_column(const column_definition& def,
atomic_cell_or_collection& old,
atomic_cell_or_collection&& neww) {
old.linearize();
neww.linearize();
if (def.is_atomic()) {
if (compare_atomic_cell_for_merge(old.as_atomic_cell(), neww.as_atomic_cell()) < 0) {
old = std::move(neww);
@@ -615,6 +617,7 @@ merge_column(const column_definition& def,
auto ct = static_pointer_cast<const collection_type_impl>(def.type);
old = ct->merge(old.as_collection_mutation(), neww.as_collection_mutation());
}
old.unlinearize();
}
void