diff --git a/mutation_query.hh b/mutation_query.hh index e4684a7d88..fd05cff9c4 100644 --- a/mutation_query.hh +++ b/mutation_query.hh @@ -153,7 +153,7 @@ private: stop_iteration consume(range_tombstone&& rt); public: - // Expects query schema (reversed) and reversed slice when building results for reverse query. + // Expects reversed schema and reversed slice when building results for reverse query. reconcilable_result_builder(const schema& query_schema, const query::partition_slice& slice, query::result_memory_accounter&& accounter) noexcept : _query_schema(query_schema.shared_from_this()), _slice(slice) diff --git a/query-request.hh b/query-request.hh index f83da918e9..f873dedc95 100644 --- a/query-request.hh +++ b/query-request.hh @@ -147,13 +147,6 @@ constexpr auto max_rows_if_set = std::numeric_limits::max(); // Specifies subset of rows, columns and cell attributes to be returned in a query. // Can be accessed across cores. // Schema-dependent. -// -// COMPATIBILITY NOTE: the partition-slice for reverse queries has two different -// format: -// * legacy format -// * native format -// The wire format uses the legacy format. See docs/dev/reverse-reads.md -// for more details on the formats. class partition_slice { friend class ::partition_slice_builder; public: diff --git a/readers/mutation_source.hh b/readers/mutation_source.hh index 634e22209e..4dc133afe4 100644 --- a/readers/mutation_source.hh +++ b/readers/mutation_source.hh @@ -36,7 +36,7 @@ partition_presence_checker make_default_partition_presence_checker() { // when invoking the source. // // When reading in reverse, a reverse schema has to be passed (compared to the -// table's schema), and a half-reverse (legacy) slice. +// table's schema), and a reverse (native) slice. // See docs/dev/reverse-reads.md for more details. // Partition-range forwarding is not yet supported in reverse mode. class mutation_source { diff --git a/readers/reversing_v2.hh b/readers/reversing_v2.hh index 5bbd642386..eeefb0ae0b 100644 --- a/readers/reversing_v2.hh +++ b/readers/reversing_v2.hh @@ -42,6 +42,6 @@ namespace query { /// \param slice serves as a convenience slice storage for reads that have to /// store an edited slice somewhere. This is common for reads that work /// with a native-reversed slice and so have to convert the one used in the -/// query -- which is in half-reversed format. +/// query -- which is in reversed format. mutation_reader make_reversing_reader(mutation_reader original, query::max_result_size max_size, std::unique_ptr slice = {}); diff --git a/sstables/mx/reader.hh b/sstables/mx/reader.hh index 9bed0bd21b..2ad141fc2b 100644 --- a/sstables/mx/reader.hh +++ b/sstables/mx/reader.hh @@ -17,8 +17,6 @@ namespace mx { // Precondition: if the slice is reversed, the schema must be reversed as well // and the range must be singular (`range.is_singular()`). -// Reversed slices must be provided in the 'half-reversed' format (the order of ranges -// being reversed, but the ranges themselves are not). // Fast-forwarding is not supported in reversed queries (FIXME). mutation_reader make_reader( shared_sstable sstable, diff --git a/sstables/sstables.hh b/sstables/sstables.hh index feac0bf16e..ed92bf1e13 100644 --- a/sstables/sstables.hh +++ b/sstables/sstables.hh @@ -271,8 +271,6 @@ public: // Returns a mutation_reader for given range of partitions. // // Precondition: if the slice is reversed, the schema must be reversed as well. - // Reversed slices must be provided in the 'half-reversed' format (the order of ranges - // being reversed, but the ranges themselves are not). mutation_reader make_reader( schema_ptr query_schema, reader_permit permit,