mirror of
https://github.com/scylladb/scylladb.git
synced 2026-04-23 01:50:35 +00:00
522a48a244
"
This patchset fixes #3803. When a select statement with filtering
is executed and the column that is needed for the filtering is not
present in the select clause, rows that should have been filtered out
according to this column will still be present in the result set.
Tests:
1. The testcase from the issue.
2. Unit tests (release) including the
newly added test from this patchset.
"
* 'issues/3803/v10' of https://github.com/eliransin/scylla:
unit test: add test for filtering queries without the filtered column
cql3 unit test: add assertion for the number of serialized columns
cql3: ensure retrieval of columns for filtering
cql3: refactor find_idx to be part of statement restrictions object
cql3: add prefix size common functionality to all clustering restrictions
cql3: rename selection metadata manipulation functions
(cherry picked from commit 3fe92663d4)
76 lines
2.2 KiB
C++
76 lines
2.2 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 "transport/messages/result_message_base.hh"
|
|
#include "bytes.hh"
|
|
#include "core/shared_ptr.hh"
|
|
#include "core/future.hh"
|
|
|
|
class rows_assertions {
|
|
shared_ptr<cql_transport::messages::result_message::rows> _rows;
|
|
public:
|
|
rows_assertions(shared_ptr<cql_transport::messages::result_message::rows> rows);
|
|
rows_assertions with_size(size_t size);
|
|
rows_assertions is_empty();
|
|
rows_assertions is_not_empty();
|
|
rows_assertions with_row(std::initializer_list<bytes_opt> values);
|
|
|
|
// Verifies that the result has the following rows and only that rows, in that order.
|
|
rows_assertions with_rows(std::initializer_list<std::initializer_list<bytes_opt>> rows);
|
|
// Verifies that the result has the following rows and only those rows.
|
|
rows_assertions with_rows_ignore_order(std::vector<std::vector<bytes_opt>> rows);
|
|
rows_assertions with_serialized_columns_count(size_t columns_count);
|
|
};
|
|
|
|
class result_msg_assertions {
|
|
shared_ptr<cql_transport::messages::result_message> _msg;
|
|
public:
|
|
result_msg_assertions(shared_ptr<cql_transport::messages::result_message> msg);
|
|
rows_assertions is_rows();
|
|
};
|
|
|
|
result_msg_assertions assert_that(shared_ptr<cql_transport::messages::result_message> msg);
|
|
|
|
template<typename... T>
|
|
void assert_that_failed(future<T...>& f)
|
|
{
|
|
try {
|
|
f.get();
|
|
assert(f.failed());
|
|
}
|
|
catch (...) {
|
|
}
|
|
}
|
|
|
|
template<typename... T>
|
|
void assert_that_failed(future<T...>&& f)
|
|
{
|
|
try {
|
|
f.get();
|
|
assert(f.failed());
|
|
}
|
|
catch (...) {
|
|
}
|
|
}
|