mirror of
https://github.com/scylladb/scylladb.git
synced 2026-05-29 19:21:01 +00:00
45215746fe
Currently, we cannot select more than 2^32 rows from a table because we are limited by types of variables containing the numbers of rows. This patch changes these types and sets new limits. The new limits take effect while selecting all rows from a table - custom limits of rows in a result stay the same (2^32-1). In classes which are being serialized and used in messaging, in order to be able to process queries originating from older nodes, the top 32 bits of new integers are optional and stay at the end of the class - if they're absent we assume they equal 0. The backward compatibility was tested by querying an older node for a paged selection, using the received paging_state with the same select statement on an upgraded node, and comparing the returned rows with the result generated for the same query by the older node, additionally checking if the paging_state returned by the upgraded node contained new fields with correct values. Also verified if the older node simply ignores the top 32 bits of the remaining rows number when handling a query with a paging_state originating from an upgraded node by generating and sending such a query to an older node and checking the paging_state in the reply(using python driver). Fixes #5101.
59 lines
1.8 KiB
C++
59 lines
1.8 KiB
C++
/*
|
|
* Copyright (C) 2015 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/>.
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include <seastar/core/distributed.hh>
|
|
#include "query-result.hh"
|
|
|
|
namespace query {
|
|
|
|
// Merges non-overlapping results into one
|
|
// Implements @Reducer concept from distributed.hh
|
|
class result_merger {
|
|
std::vector<foreign_ptr<lw_shared_ptr<query::result>>> _partial;
|
|
const uint64_t _max_rows;
|
|
const uint32_t _max_partitions;
|
|
public:
|
|
explicit result_merger(uint64_t max_rows, uint32_t max_partitions)
|
|
: _max_rows(max_rows)
|
|
, _max_partitions(max_partitions)
|
|
{ }
|
|
|
|
void reserve(size_t size) {
|
|
_partial.reserve(size);
|
|
}
|
|
|
|
void operator()(foreign_ptr<lw_shared_ptr<query::result>> r) {
|
|
if (!_partial.empty() && _partial.back()->is_short_read()) {
|
|
return;
|
|
}
|
|
_partial.emplace_back(std::move(r));
|
|
}
|
|
|
|
// FIXME: Eventually we should return a composite_query_result here
|
|
// which holds the vector of query results and which can be quickly turned
|
|
// into packet fragments by the transport layer without copying the data.
|
|
foreign_ptr<lw_shared_ptr<query::result>> get();
|
|
};
|
|
|
|
}
|