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

Remove redundant code in mutation_partition.cc

Browse Source 
Use the defined `cdef` variable.

Closes scylladb/scylladb#22048
This commit is contained in:
Li Bo
2024-12-25 01:26:15 -05:00
committed by Avi Kivity
parent 26fa234f87
commit de8de50fb9
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mutation/mutation_partition.cc
View File

@@ -1761,12 +1761,12 @@ row row::difference(const schema& s, column_kind kind, const row& other) const
if (cell) {
r.append_cell(c.key(), std::move(*cell));
}
} else if (s.column_at(kind, c.key()).is_atomic()) {
} else if (cdef.is_atomic()) {
if (compare_atomic_cell_for_merge(c->cell.as_atomic_cell(cdef), it->cell.as_atomic_cell(cdef)) > 0) {
r.append_cell(c.key(), c->cell.copy(*cdef.type));
}
} else {
auto diff = ::difference(*s.column_at(kind, c.key()).type,
auto diff = ::difference(*cdef.type,
c->cell.as_collection_mutation(), it->cell.as_collection_mutation());
if (!static_cast<collection_mutation_view>(diff).is_empty()) {
r.append_cell(c.key(), std::move(diff));