mirror of
https://github.com/scylladb/scylladb.git
synced 2026-04-24 10:30:38 +00:00
e778b072b1
The constructor of `read_command` is used both by IDL and clients in the code. However, this constructor has a parameter that is not used by IDL: `read_timestamp`. This requires that this parameter is the very last in the list and that new parameters that are used by IDL are added before it. One such new parameter was `bool is_first_page`. Adding this parameter right before the read timestamp one created a situation where the last parameter (read_timestamp) implicitly converts to the one before it (is_first_page). This means that some call sites passing `read_timestamp` were now silently converting this to `is_first_page`, effectively dropping the timestamp. This patch aims to rectify this, while also avoiding similar accidents in the future, by making `is_first_page` a `bool_class` which doesn't have any implicit convertions defined. This change does not break the ABI as `bool_class` is also sent as a `bool` on the wire. Signed-off-by: Botond Dénes <bdenes@scylladb.com> Tests: unit(dev) Message-Id: <20200422073657.87241-1-bdenes@scylladb.com>
56 lines
1.9 KiB
C++
56 lines
1.9 KiB
C++
/*
|
|
* Copyright 2016 ScyllaDB
|
|
*/
|
|
|
|
/*
|
|
* This file is part of Scylla.
|
|
*
|
|
* Scylla is free software: you can redistribute it and/or modify
|
|
* it under the terms of the GNU Affero General Public License as published by
|
|
* the Free Software Foundation, either version 3 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* Scylla is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with Scylla. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
class cql_serialization_format final {
|
|
uint8_t protocol_version();
|
|
};
|
|
|
|
namespace query {
|
|
|
|
class specific_ranges {
|
|
partition_key pk();
|
|
std::vector<nonwrapping_range<clustering_key_prefix>> ranges();
|
|
};
|
|
|
|
class partition_slice {
|
|
std::vector<nonwrapping_range<clustering_key_prefix>> default_row_ranges();
|
|
utils::small_vector<uint32_t, 8> static_columns;
|
|
utils::small_vector<uint32_t, 8> regular_columns;
|
|
query::partition_slice::option_set options;
|
|
std::unique_ptr<query::specific_ranges> get_specific_ranges();
|
|
cql_serialization_format cql_format();
|
|
uint32_t partition_row_limit() [[version 1.3]] = std::numeric_limits<uint32_t>::max();
|
|
};
|
|
|
|
class read_command {
|
|
utils::UUID cf_id;
|
|
utils::UUID schema_version;
|
|
query::partition_slice slice;
|
|
uint32_t row_limit;
|
|
std::chrono::time_point<gc_clock, gc_clock::duration> timestamp;
|
|
std::optional<tracing::trace_info> trace_info [[version 1.3]];
|
|
uint32_t partition_limit [[version 1.3]] = std::numeric_limits<uint32_t>::max();
|
|
utils::UUID query_uuid [[version 2.2]] = utils::UUID();
|
|
query::is_first_page is_first_page [[version 2.2]] = query::is_first_page::no;
|
|
};
|
|
|
|
}
|