diff --git a/idl/mutation.idl.hh b/idl/mutation.idl.hh index b287aa5ebd..e593986015 100644 --- a/idl/mutation.idl.hh +++ b/idl/mutation.idl.hh @@ -83,7 +83,7 @@ class deletable_row stub [[writable]] { }; class range_tombstone stub [[writable]] { - clustering_key key; + clustering_key_prefix start; tombstone tomb; }; @@ -118,4 +118,4 @@ class canonical_mutation stub [[writable]] { partition_key key; column_mapping mapping; mutation_partition partition; -} \ No newline at end of file +} diff --git a/mutation_partition_serializer.cc b/mutation_partition_serializer.cc index a9328d8b09..047500c5f1 100644 --- a/mutation_partition_serializer.cc +++ b/mutation_partition_serializer.cc @@ -146,7 +146,7 @@ void mutation_partition_serializer::write_serialized(Writer&& writer, const sche auto srow_writer = std::move(writer).write_tomb(mp.partition_tombstone()).start_static_row(); auto row_tombstones = write_row_cells(std::move(srow_writer), mp.static_row(), s, column_kind::static_column).end_static_row().start_range_tombstones(); for (auto&& rt : mp.row_tombstones()) { - row_tombstones.add().write_key(rt.prefix()).write_tomb(rt.t()).end_range_tombstone(); + row_tombstones.add().write_start(rt.prefix()).write_tomb(rt.t()).end_range_tombstone(); } auto clustering_rows = std::move(row_tombstones).end_range_tombstones().start_rows(); for (auto&& cr : mp.clustered_rows()) { diff --git a/mutation_partition_view.cc b/mutation_partition_view.cc index a861a2b92b..da1c9f0180 100644 --- a/mutation_partition_view.cc +++ b/mutation_partition_view.cc @@ -173,9 +173,9 @@ mutation_partition_view::accept(const column_mapping& cm, mutation_partition_vis read_and_visit_row(mpv.static_row(), cm, column_kind::static_column, static_row_cell_visitor{visitor}); for (auto&& rt : mpv.range_tombstones()) { - visitor.accept_row_tombstone(rt.key(), rt.tomb()); + visitor.accept_row_tombstone(rt.start(), rt.tomb()); } - + for (auto&& cr : mpv.rows()) { visitor.accept_row(cr.key(), cr.deleted_at(), read_row_marker(cr.marker()));