From 8813a6ca2a40d19ab2c2d6e3926eec2d6a036888 Mon Sep 17 00:00:00 2001 From: Piotr Jastrzebski Date: Thu, 6 Feb 2020 14:10:58 +0100 Subject: [PATCH 1/2] index_reader: avoid copying schema to lambda Signed-off-by: Piotr Jastrzebski --- sstables/index_reader.hh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sstables/index_reader.hh b/sstables/index_reader.hh index 2b934fb83d..52f8746d2d 100644 --- a/sstables/index_reader.hh +++ b/sstables/index_reader.hh @@ -597,7 +597,7 @@ private: } const schema& s = *_sstable->_schema; - auto cmp_with_start = [pos_cmp = promoted_index_block_compare(s), s] + auto cmp_with_start = [pos_cmp = promoted_index_block_compare(s), &s] (position_in_partition_view pos, const promoted_index_block& info) -> bool { return pos_cmp(pos, info.start(s)); }; From d1fe75edbc9e2e2317d619e80f265b427c499eec Mon Sep 17 00:00:00 2001 From: Piotr Jastrzebski Date: Thu, 6 Feb 2020 14:18:50 +0100 Subject: [PATCH 2/2] multishard_mutation_query_test: stop capturing unused schema Signed-off-by: Piotr Jastrzebski --- test/boost/multishard_mutation_query_test.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/boost/multishard_mutation_query_test.cc b/test/boost/multishard_mutation_query_test.cc index af623a10d6..d32b1fa943 100644 --- a/test/boost/multishard_mutation_query_test.cc +++ b/test/boost/multishard_mutation_query_test.cc @@ -646,7 +646,7 @@ generate_clustering_ranges(RandomEngine& rnd_engine, const schema& schema, const start = end; } - clustering_key_ranges.emplace_back(clustering_index_range.transform([schema, &all_cks] (int i) { + clustering_key_ranges.emplace_back(clustering_index_range.transform([&all_cks] (int i) { return all_cks.at(i); })); } while (start < end);