From 8da88e6cb9b7791b828edd01cc3cf0ebe29c26aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Botond=20D=C3=A9nes?= Date: Thu, 27 Feb 2020 19:02:40 +0200 Subject: [PATCH] mutation_query: data_query(): remove default timeout --- mutation_partition.cc | 2 +- mutation_query.hh | 2 +- table.cc | 2 +- test/boost/mutation_query_test.cc | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mutation_partition.cc b/mutation_partition.cc index 45dd8e384c..edff7ec2c6 100644 --- a/mutation_partition.cc +++ b/mutation_partition.cc @@ -2168,8 +2168,8 @@ future<> data_query( uint32_t partition_limit, gc_clock::time_point query_time, query::result::builder& builder, - tracing::trace_state_ptr trace_ptr, db::timeout_clock::time_point timeout, + tracing::trace_state_ptr trace_ptr, query::querier_cache_context cache_ctx) { if (row_limit == 0 || slice.partition_row_limit() == 0 || partition_limit == 0) { diff --git a/mutation_query.hh b/mutation_query.hh index f4707dc030..da5f5e9a89 100644 --- a/mutation_query.hh +++ b/mutation_query.hh @@ -175,8 +175,8 @@ future<> data_query( uint32_t partition_limit, gc_clock::time_point query_time, query::result::builder& builder, + db::timeout_clock::time_point timeout, tracing::trace_state_ptr trace_ptr = nullptr, - db::timeout_clock::time_point timeout = db::no_timeout, query::querier_cache_context cache_ctx = { }); diff --git a/table.cc b/table.cc index b146eb5704..6f89e415cc 100644 --- a/table.cc +++ b/table.cc @@ -2397,7 +2397,7 @@ table::query(schema_ptr s, return do_until(std::bind(&query_state::done, &qs), [this, &qs, trace_state = std::move(trace_state), timeout, cache_ctx = std::move(cache_ctx)] { auto&& range = *qs.current_partition_range++; return data_query(qs.schema, as_mutation_source(), range, qs.cmd.slice, qs.remaining_rows(), - qs.remaining_partitions(), qs.cmd.timestamp, qs.builder, trace_state, timeout, cache_ctx); + qs.remaining_partitions(), qs.cmd.timestamp, qs.builder, timeout, trace_state, cache_ctx); }).then([qs_ptr = std::move(qs_ptr), &qs] { return make_ready_future>( make_lw_shared(qs.builder.build())); diff --git a/test/boost/mutation_query_test.cc b/test/boost/mutation_query_test.cc index ed234d87d6..1f02353d8a 100644 --- a/test/boost/mutation_query_test.cc +++ b/test/boost/mutation_query_test.cc @@ -547,10 +547,10 @@ SEASTAR_THREAD_TEST_CASE(test_result_size_calculation) { slice.options.set(); query::result::builder digest_only_builder(slice, query::result_options{query::result_request::only_digest, query::digest_algorithm::xxHash}, l.new_digest_read(query::result_memory_limiter::maximum_result_size).get0()); - data_query(s, source, query::full_partition_range, slice, std::numeric_limits::max(), std::numeric_limits::max(), gc_clock::now(), digest_only_builder).get0(); + data_query(s, source, query::full_partition_range, slice, std::numeric_limits::max(), std::numeric_limits::max(), gc_clock::now(), digest_only_builder, db::no_timeout).get0(); query::result::builder result_and_digest_builder(slice, query::result_options{query::result_request::result_and_digest, query::digest_algorithm::xxHash}, l.new_data_read(query::result_memory_limiter::maximum_result_size).get0()); - data_query(s, source, query::full_partition_range, slice, std::numeric_limits::max(), std::numeric_limits::max(), gc_clock::now(), result_and_digest_builder).get0(); + data_query(s, source, query::full_partition_range, slice, std::numeric_limits::max(), std::numeric_limits::max(), gc_clock::now(), result_and_digest_builder, db::no_timeout).get0(); BOOST_REQUIRE_EQUAL(digest_only_builder.memory_accounter().used_memory(), result_and_digest_builder.memory_accounter().used_memory()); }