mirrors/scylladb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
7942041b95ef2efd96fbcc37cfbabd152ccd7908
scylladb/test/boost
History
Nadav Har'El c8bb147f84 Merge 'cql3: don't ignore other restrictions when a multi column restriction is present during filtering' from Jan Ciołek 
When filtering with multi column restriction present all other restrictions were ignored.
So a query like:
`SELECT * FROM WHERE pk = 0 AND (ck1, ck2) < (0, 0) AND regular_col = 0 ALLOW FILTERING;`
would ignore the restriction `regular_col = 0`.

This was caused by a bug in the filtering code:
2779a171fc/cql3/selection/selection.cc (L433-L449)

When multi column restrictions were detected, the code checked if they are satisfied and returned immediately.
This is fixed by returning only when these restrictions are not satisfied. When they are satisfied the other restrictions are checked as well to ensure all of them are satisfied.

This code was introduced back in 2019, when fixing #3574.
Perhaps back then it was impossible to mix multi column and regular columns and this approach was correct.

Fixes: #6200
Fixes: #12014

Closes #12031

* github.com:scylladb/scylladb:
  cql-pytest: add a reproducer for #12014, verify that filtering multi column and regular restrictions works
  boost/restrictions-test: uncomment part of the test that passes now
  cql-pytest: enable test for filtering combined multi column and regular column restrictions
  cql3: don't ignore other restrictions when a multi column restriction is present during filtering

(cherry picked from commit 2d2034ea28)
2022-11-21 14:02:33 +02:00
..
aggregate_fcts_test.cc
treewide: clean up stray license blurbs
2022-02-13 14:16:16 +02:00
allocation_strategy_test.cc
treewide: use Software Package Data Exchange (SPDX) license identifiers
2022-01-18 12:15:18 +01:00
alternator_unit_test.cc
treewide: use Software Package Data Exchange (SPDX) license identifiers
2022-01-18 12:15:18 +01:00
anchorless_list_test.cc
treewide: use Software Package Data Exchange (SPDX) license identifiers
2022-01-18 12:15:18 +01:00
auth_passwords_test.cc
treewide: use Software Package Data Exchange (SPDX) license identifiers
2022-01-18 12:15:18 +01:00
auth_resource_test.cc
treewide: use Software Package Data Exchange (SPDX) license identifiers
2022-01-18 12:15:18 +01:00
auth_test.cc
treewide: use Software Package Data Exchange (SPDX) license identifiers
2022-01-18 12:15:18 +01:00
batchlog_manager_test.cc
query_processor: remove default internal query caching behavior
2022-05-01 08:33:55 +03:00
big_decimal_test.cc
treewide: clean up stray license blurbs
2022-02-13 14:16:16 +02:00
bptree_test.cc
treewide: use Software Package Data Exchange (SPDX) license identifiers
2022-01-18 12:15:18 +01:00
broken_sstable_test.cc
treewide: use Software Package Data Exchange (SPDX) license identifiers
2022-01-18 12:15:18 +01:00
btree_test.cc
treewide: use Software Package Data Exchange (SPDX) license identifiers
2022-01-18 12:15:18 +01:00
bytes_ostream_test.cc
bytes_ostream: base on managed_bytes
2022-07-12 00:23:29 +03:00
cache_flat_mutation_reader_test.cc
row_cache: return v2 readers from make_reader*()
2022-04-20 10:59:09 +03:00
cached_file_test.cc
tests: utils: cached_file: Validate occupancy after eviction
2022-02-25 01:42:15 +01:00
caching_options_test.cc
treewide: use Software Package Data Exchange (SPDX) license identifiers
2022-01-18 12:15:18 +01:00
canonical_mutation_test.cc
treewide: use Software Package Data Exchange (SPDX) license identifiers
2022-01-18 12:15:18 +01:00
cartesian_product_test.cc
treewide: use Software Package Data Exchange (SPDX) license identifiers
2022-01-18 12:15:18 +01:00
castas_fcts_test.cc
treewide: use Software Package Data Exchange (SPDX) license identifiers
2022-01-18 12:15:18 +01:00
cdc_generation_test.cc
treewide: use Software Package Data Exchange (SPDX) license identifiers
2022-01-18 12:15:18 +01:00
cdc_test.cc
test/boost: cdc_test: remove test_cdc_across_shards
2022-06-23 16:14:41 +02:00
cell_locker_test.cc
treewide: use Software Package Data Exchange (SPDX) license identifiers
2022-01-18 12:15:18 +01:00
checksum_utils_test.cc
checksum_utils_test: supply valid input to crc32_combine()
2022-06-21 11:58:13 +03:00
chunked_managed_vector_test.cc
utils/chunked_managed_vector: Fix sigsegv during reserve()
2022-04-12 16:37:11 +03:00
chunked_vector_test.cc
db: range_tombstone_list: Avoid quadratic behavior when applying
2022-09-30 00:01:26 +03:00
clustering_ranges_walker_test.cc
treewide: use Software Package Data Exchange (SPDX) license identifiers
2022-01-18 12:15:18 +01:00
column_mapping_test.cc
treewide: use Software Package Data Exchange (SPDX) license identifiers
2022-01-18 12:15:18 +01:00
commitlog_test.cc
commitlog_test: Change timeout handling to do abort()
2022-06-29 13:26:51 +03:00
compound_test.cc
treewide: use Software Package Data Exchange (SPDX) license identifiers
2022-01-18 12:15:18 +01:00
compress_test.cc
treewide: use Software Package Data Exchange (SPDX) license identifiers
2022-01-18 12:15:18 +01:00
config_test.cc
config: fix printing of experimental feature list
2022-07-11 09:17:30 +02:00
continuous_data_consumer_test.cc
treewide: use Software Package Data Exchange (SPDX) license identifiers
2022-01-18 12:15:18 +01:00
counter_test.cc
treewide: use Software Package Data Exchange (SPDX) license identifiers
2022-01-18 12:15:18 +01:00
cql_auth_query_test.cc
treewide: use Software Package Data Exchange (SPDX) license identifiers
2022-01-18 12:15:18 +01:00
cql_auth_syntax_test.cc
cql3: add a cql3::util::quote() function
2022-02-07 11:33:57 +02:00
cql_functions_test.cc
result_message: add result_message::exception
2022-02-08 11:08:42 +01:00
cql_query_group_test.cc
treewide: use Software Package Data Exchange (SPDX) license identifiers
2022-01-18 12:15:18 +01:00
cql_query_large_test.cc
compaction_manager: major: switch to table_state
2022-07-16 21:35:06 -03:00
cql_query_like_test.cc
treewide: use Software Package Data Exchange (SPDX) license identifiers
2022-01-18 12:15:18 +01:00
cql_query_test.cc
test/boost/cql_query_test: add test setting synchronous updates property
2022-07-25 09:53:33 +02:00
crc_test.cc
treewide: use Software Package Data Exchange (SPDX) license identifiers
2022-01-18 12:15:18 +01:00
data_listeners_test.cc
mutation_reader: move filtering reader into readers/
2022-03-30 15:42:51 +03:00
database_test.cc
compaction_manager: perform_cleanup, perform_sstable_upgrade: use a lw_shared_ptr for owned token ranges
2022-08-02 08:08:11 +03:00
dirty_memory_manager_test.cc
logalloc: region: properly track listeners when moved
2022-07-28 11:17:55 +03:00
double_decker_test.cc
treewide: use Software Package Data Exchange (SPDX) license identifiers
2022-01-18 12:15:18 +01:00
duration_test.cc
treewide: use Software Package Data Exchange (SPDX) license identifiers
2022-01-18 12:15:18 +01:00
dynamic_bitset_test.cc
treewide: use Software Package Data Exchange (SPDX) license identifiers
2022-01-18 12:15:18 +01:00
enum_option_test.cc
treewide: use Software Package Data Exchange (SPDX) license identifiers
2022-01-18 12:15:18 +01:00
enum_set_test.cc
treewide: use Software Package Data Exchange (SPDX) license identifiers
2022-01-18 12:15:18 +01:00
error_injection_test.cc
test: error_injection: test_inject_noop: do no rely on wall clock timing
2022-06-21 11:58:13 +03:00
estimated_histogram_test.cc
treewide: use Software Package Data Exchange (SPDX) license identifiers
2022-01-18 12:15:18 +01:00
exception_container_test.cc
exception_container: do not throw in accept
2022-02-16 10:06:10 +02:00
exceptions_fallback_test.cc
utils/exceptions: add try_catch
2022-07-05 16:41:09 +02:00
exceptions_optimized_test.cc
utils/exceptions: add try_catch
2022-07-05 16:41:09 +02:00
exceptions_test.inc.cc
utils: add make_nested_exception_ptr
2022-07-05 16:41:09 +02:00
expr_test.cc
cql3: util: change where clause utilities to accept a single expression rather than a vector of terms
2022-07-22 20:14:48 +03:00
extensions_test.cc
database: add flush_on_all variants
2022-05-10 09:56:44 +03:00
filtering_test.cc
treewide: use system-#include (angle brackets) for seastar
2022-04-26 14:46:42 +03:00
flat_mutation_reader_test.cc
test: mutation: Compare against compacted mutations
2022-06-15 11:30:01 +02:00
flush_queue_test.cc
treewide: use Software Package Data Exchange (SPDX) license identifiers
2022-01-18 12:15:18 +01:00
fragmented_temporary_buffer_test.cc
treewide: use Software Package Data Exchange (SPDX) license identifiers
2022-01-18 12:15:18 +01:00
frozen_mutation_test.cc
tests: downgrade_to_v1() -> mutation_fragment_v1_stream()
2022-05-31 23:42:34 +03:00
gossiping_property_file_snitch_test.cc
snitch: Keep gossiper reference
2022-05-03 10:57:40 +03:00
group0_test.cc
service: raft: move group0 write path into a separate file
2022-05-19 17:21:35 +03:00
hash_test.cc
treewide: use Software Package Data Exchange (SPDX) license identifiers
2022-01-18 12:15:18 +01:00
hashers_test.cc
treewide: use Software Package Data Exchange (SPDX) license identifiers
2022-01-18 12:15:18 +01:00
hint_test.cc
treewide: use Software Package Data Exchange (SPDX) license identifiers
2022-01-18 12:15:18 +01:00
idl_test.cc
ser: use vector_deserializer by default for all idl vectors
2022-05-18 19:24:18 +03:00
index_with_paging_test.cc
treewide: use Software Package Data Exchange (SPDX) license identifiers
2022-01-18 12:15:18 +01:00
input_stream_test.cc
treewide: use Software Package Data Exchange (SPDX) license identifiers
2022-01-18 12:15:18 +01:00
intrusive_array_test.cc
treewide: use Software Package Data Exchange (SPDX) license identifiers
2022-01-18 12:15:18 +01:00
json_cql_query_test.cc
type_json: support integers in scientific format
2022-02-22 12:55:38 +01:00
json_test.cc
treewide: use Software Package Data Exchange (SPDX) license identifiers
2022-01-18 12:15:18 +01:00
keys_test.cc
treewide: use Software Package Data Exchange (SPDX) license identifiers
2022-01-18 12:15:18 +01:00
large_paging_state_test.cc
treewide: use Software Package Data Exchange (SPDX) license identifiers
2022-01-18 12:15:18 +01:00
like_matcher_test.cc
treewide: use Software Package Data Exchange (SPDX) license identifiers
2022-01-18 12:15:18 +01:00
limiting_data_source_test.cc
treewide: use Software Package Data Exchange (SPDX) license identifiers
2022-01-18 12:15:18 +01:00
linearizing_input_stream_test.cc
treewide: use Software Package Data Exchange (SPDX) license identifiers
2022-01-18 12:15:18 +01:00
lister_test.cc
treewide: fix compilation issues with fmtlib 8.1.0+
2022-03-16 12:31:50 +03:00
loading_cache_test.cc
loading_cache_test: Test loading_cache::reset and loading_cache::update_config
2022-06-28 19:58:06 -03:00
log_heap_test.cc
treewide: use Software Package Data Exchange (SPDX) license identifiers
2022-01-18 12:15:18 +01:00
logalloc_test.cc
logalloc: region: get_impl might be called on disengaged _impl when moved
2022-07-28 10:48:58 +03:00
managed_bytes_test.cc
treewide: use Software Package Data Exchange (SPDX) license identifiers
2022-01-18 12:15:18 +01:00
managed_vector_test.cc
treewide: use Software Package Data Exchange (SPDX) license identifiers
2022-01-18 12:15:18 +01:00
map_difference_test.cc
treewide: use Software Package Data Exchange (SPDX) license identifiers
2022-01-18 12:15:18 +01:00
memtable_test.cc
table: Add test where compaction doesn't keep up with flush rate.
2022-07-28 14:43:33 +03:00
multishard_combining_reader_as_mutation_source_test.cc
tests: remove some to-become-pointless reader downgrade tests
2022-05-31 23:42:34 +03:00
multishard_mutation_query_test.cc
test/lib/test_utils: return OK from check() variants
2022-02-21 12:29:25 +02:00
murmur_hash_test.cc
treewide: use Software Package Data Exchange (SPDX) license identifiers
2022-01-18 12:15:18 +01:00
mutation_fragment_test.cc
Merge "Remove reader from mutations v1" from Botond
2022-03-31 13:29:11 +03:00
mutation_query_test.cc
querier: remove {data,mutation}_querier aliases
2022-07-12 08:41:51 +03:00
mutation_reader_test.cc
sstables: use generation_type more soundly
2022-06-20 19:37:31 +03:00
mutation_test.cc
Merge 'Fix mutation commutativity with shadowable tombstone'
2022-09-20 23:21:58 +02:00
mutation_writer_test.cc
flat_mutation_reader ist tot
2022-05-31 23:42:34 +03:00
mvcc_test.cc
Merge 'row_cache: Fix missing row if upper bound of population range is evicted and has adjacent dummy' from Tomasz Grabiec
2022-08-11 16:51:59 +02:00
network_topology_strategy_test.cc
snitch: Keep gossiper reference
2022-05-03 10:57:40 +03:00
nonwrapping_range_test.cc
treewide: use Software Package Data Exchange (SPDX) license identifiers
2022-01-18 12:15:18 +01:00
observable_test.cc
treewide: use Software Package Data Exchange (SPDX) license identifiers
2022-01-18 12:15:18 +01:00
partitioner_test.cc
treewide: use Software Package Data Exchange (SPDX) license identifiers
2022-01-18 12:15:18 +01:00
per_partition_rate_limit_test.cc
tests: add per_partition_rate_limit_test
2022-06-22 20:16:49 +02:00
querier_cache_test.cc
Merge 'database: evict all inactive reads for table when detaching table' from Botond Dénes
2022-09-02 10:41:22 +03:00
query_processor_test.cc
query_processor: remove default internal query caching behavior
2022-05-01 08:33:55 +03:00
radix_tree_test.cc
treewide: use Software Package Data Exchange (SPDX) license identifiers
2022-01-18 12:15:18 +01:00
range_assert.hh
treewide: use Software Package Data Exchange (SPDX) license identifiers
2022-01-18 12:15:18 +01:00
range_test.cc
treewide: use Software Package Data Exchange (SPDX) license identifiers
2022-01-18 12:15:18 +01:00
range_tombstone_list_assertions.hh
treewide: use Software Package Data Exchange (SPDX) license identifiers
2022-01-18 12:15:18 +01:00
range_tombstone_list_test.cc
treewide: use Software Package Data Exchange (SPDX) license identifiers
2022-01-18 12:15:18 +01:00
rate_limiter_test.cc
db: add rate_limiter
2022-06-22 20:16:48 +02:00
reader_concurrency_semaphore_test.cc
Merge 'database: evict all inactive reads for table when detaching table' from Botond Dénes
2022-09-02 10:41:22 +03:00
repair_test.cc
tests: downgrade_to_v1() -> mutation_fragment_v1_stream()
2022-05-31 23:42:34 +03:00
restrictions_test.cc
Merge 'cql3: don't ignore other restrictions when a multi column restriction is present during filtering' from Jan Ciołek
2022-11-21 14:02:33 +02:00
result_utils_test.cc
utils/result_try: prevent exceptions from being caught multiple times
2022-03-15 11:42:42 +02:00
reusable_buffer_test.cc
treewide: use Software Package Data Exchange (SPDX) license identifiers
2022-01-18 12:15:18 +01:00
role_manager_test.cc
treewide: use Software Package Data Exchange (SPDX) license identifiers
2022-01-18 12:15:18 +01:00
row_cache_test.cc
test: row_cache: Use more narrow key range to stress overlapping reads more
2022-09-20 23:21:54 +02:00
rust_test.cc
tests: add rust example
2022-05-11 16:49:31 +02:00
schema_change_test.cc
config: fix printing of experimental feature list
2022-07-11 09:17:30 +02:00
schema_changes_test.cc
tests: trivial flat_reader_assertions{,_v2} conversions
2022-05-10 22:10:40 +03:00
schema_loader_test.cc
tools/schema_loader: auto-create the keyspace for all statements
2022-02-17 15:24:24 +02:00
schema_registry_test.cc
user_types: Carry storage on database and schema_ctxt
2022-05-05 13:06:04 +03:00
secondary_index_test.cc
service/paging: use position_in_partition instead of clustering_key for last row
2022-06-23 13:36:20 +03:00
serialization_test.cc
serializer_impl: add vector_deserializer
2022-05-18 19:10:13 +03:00
serialized_action_test.cc
treewide: use Software Package Data Exchange (SPDX) license identifiers
2022-01-18 12:15:18 +01:00
service_level_controller_test.cc
treewide: use Software Package Data Exchange (SPDX) license identifiers
2022-01-18 12:15:18 +01:00
small_vector_test.cc
treewide: use Software Package Data Exchange (SPDX) license identifiers
2022-01-18 12:15:18 +01:00
snitch_reset_test.cc
snitch: Keep gossiper reference
2022-05-03 10:57:40 +03:00
sstable_3_x_test.cc
sstables: use generation_type more soundly
2022-06-20 19:37:31 +03:00
sstable_compaction_test.cc
compaction: cleanup, upgrade: use a lw_shared_ptr for owned token ranges
2022-08-02 07:57:41 +03:00
sstable_conforms_to_mutation_source_test.cc
tests: trivial flat_reader_assertions{,_v2} conversions
2022-05-10 22:10:40 +03:00
sstable_datafile_test.cc
sstables: crawling mx-reader: make on_out_of_clustering_range() no-op
2022-09-29 23:42:01 +03:00
sstable_directory_test.cc
sstables: Keep priority class on sstable_directory
2022-07-19 12:14:41 +03:00
sstable_move_test.cc
sstables: use generation_type more soundly
2022-06-20 19:37:31 +03:00
sstable_mutation_test.cc
Merge 'Remove flat_mutation_reader (v1)' from Michael Livshin
2022-06-03 07:26:29 +03:00
sstable_partition_index_cache_test.cc
sstable: partition_index_cache: Fix abort on bad_alloc during page loading
2022-05-25 09:27:04 +03:00
sstable_resharding_test.cc
sstables: use generation_type more soundly
2022-06-20 19:37:31 +03:00
sstable_set_test.cc
sstable_set: Fix partitioned_sstable_set constructor
2022-06-21 11:58:13 +03:00
sstable_test.cc
sstables: use generation_type more soundly
2022-06-20 19:37:31 +03:00
sstable_test.hh
table: try_flush_memtable_to_sstable: propagate errors to seal_active_memtable
2022-07-27 14:04:55 +03:00
stall_free_test.cc
treewide: use Software Package Data Exchange (SPDX) license identifiers
2022-01-18 12:15:18 +01:00
statement_restrictions_test.cc
cql3: util: change where clause utilities to accept a single expression rather than a vector of terms
2022-07-22 20:14:48 +03:00
storage_proxy_test.cc
storage_proxy: extract query_ranges_to_vnodes_generator to a separate file
2022-02-01 21:14:41 +01:00
suite.yaml
…
summary_test.cc
Add summary_test
2022-07-27 16:58:52 +03:00
test_table.cc
treewide: use Software Package Data Exchange (SPDX) license identifiers
2022-01-18 12:15:18 +01:00
top_k_test.cc
treewide: use Software Package Data Exchange (SPDX) license identifiers
2022-01-18 12:15:18 +01:00
total_order_check.hh
treewide: use Software Package Data Exchange (SPDX) license identifiers
2022-01-18 12:15:18 +01:00
tracing.cc
treewide: use Software Package Data Exchange (SPDX) license identifiers
2022-01-18 12:15:18 +01:00
transport_test.cc
treewide: use Software Package Data Exchange (SPDX) license identifiers
2022-01-18 12:15:18 +01:00
types_test.cc
types: time_point_to_string: use numeric formatting rather than chrono-format specifiers
2022-06-27 08:28:56 +03:00
user_function_test.cc
config: fix printing of experimental feature list
2022-07-11 09:17:30 +02:00
user_types_test.cc
cql3_type::raw_collection: handle unknown types first
2022-06-07 11:16:12 +02:00
utf8_test.cc
treewide: use Software Package Data Exchange (SPDX) license identifiers
2022-01-18 12:15:18 +01:00
UUID_test.cc
test: uuid: cement the assumption that default and null uuid are equal
2022-02-16 10:19:47 +02:00
view_build_test.cc
readers: move multishard reader & friends to reader/multishard.cc
2022-03-30 15:42:51 +03:00
view_complex_test.cc
compaction_manager: major: switch to table_state
2022-07-16 21:35:06 -03:00
view_schema_ckey_test.cc
treewide: use Software Package Data Exchange (SPDX) license identifiers
2022-01-18 12:15:18 +01:00
view_schema_pkey_test.cc
materialized views: allow empty strings in views and indexes
2022-03-08 15:34:26 +02:00
view_schema_test.cc
treewide: use Software Package Data Exchange (SPDX) license identifiers
2022-01-18 12:15:18 +01:00
vint_serialization_test.cc
treewide: use Software Package Data Exchange (SPDX) license identifiers
2022-01-18 12:15:18 +01:00
virtual_reader_test.cc
treewide: use Software Package Data Exchange (SPDX) license identifiers
2022-01-18 12:15:18 +01:00
virtual_table_mutation_source_test.cc
tests: ms.make_reader() -> ms.make_reader_v2()
2022-05-31 23:42:34 +03:00
virtual_table_test.cc
treewide: use Software Package Data Exchange (SPDX) license identifiers
2022-01-18 12:15:18 +01:00