From 0bf07cde7bbf108708447d28abea00a6fe0e146f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Botond=20D=C3=A9nes?= Date: Thu, 1 Jul 2021 16:16:16 +0300 Subject: [PATCH] test/manual: migrate off the global test reader semaphore --- test/manual/enormous_table_scan_test.cc | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/test/manual/enormous_table_scan_test.cc b/test/manual/enormous_table_scan_test.cc index 6d51c9f31e..57383126d0 100644 --- a/test/manual/enormous_table_scan_test.cc +++ b/test/manual/enormous_table_scan_test.cc @@ -26,7 +26,6 @@ #include "test/lib/cql_test_env.hh" #include "test/lib/log.hh" #include "test/lib/cql_assertions.hh" -#include "test/lib/reader_permit.hh" #include "transport/messages/result_message.hh" #include @@ -49,9 +48,8 @@ class enormous_table_reader final : public flat_mutation_reader::impl { public: static constexpr uint64_t CLUSTERING_ROW_COUNT = 4500ULL * 1000ULL * 1000ULL; - enormous_table_reader(schema_ptr schema, const dht::partition_range& prange, const query::partition_slice& slice) - : impl(schema, tests::make_permit()) - , _schema(std::move(schema)) + enormous_table_reader(schema_ptr schema, reader_permit permit, const dht::partition_range& prange, const query::partition_slice& slice) + : impl(std::move(schema), std::move(permit)) , _slice(slice) { do_fast_forward_to(prange); @@ -183,14 +181,14 @@ private: struct enormous_virtual_reader { flat_mutation_reader operator()(schema_ptr schema, - reader_permit, + reader_permit permit, const dht::partition_range& range, const query::partition_slice& slice, const io_priority_class& pc, tracing::trace_state_ptr trace_state, streamed_mutation::forwarding fwd, mutation_reader::forwarding fwd_mr) { - auto reader = make_flat_mutation_reader(schema, range, slice); + auto reader = make_flat_mutation_reader(schema, permit, range, slice); if (fwd == streamed_mutation::forwarding::yes) { return make_forwardable(std::move(reader)); }