From b740aff7779af68af2daf42039e35ead52d5170b Mon Sep 17 00:00:00 2001 From: Avi Kivity Date: Mon, 19 Dec 2016 11:37:25 +0200 Subject: [PATCH] tests: adjust mutation_query_test for partition and row limits Won't build otherwise. --- tests/mutation_query_test.cc | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/tests/mutation_query_test.cc b/tests/mutation_query_test.cc index b6347395a3..c572df6972 100644 --- a/tests/mutation_query_test.cc +++ b/tests/mutation_query_test.cc @@ -76,8 +76,10 @@ static query::partition_slice make_full_slice(const schema& s) { return partition_slice_builder(s).build(); } +static auto inf32 = std::numeric_limits::max(); + query::result_set to_result_set(const reconcilable_result& r, schema_ptr s, const query::partition_slice& slice) { - return query::result_set::from_raw_result(s, slice, to_data_query_result(r, s, slice)); + return query::result_set::from_raw_result(s, slice, to_data_query_result(r, s, slice, inf32, inf32)); } SEASTAR_TEST_CASE(test_reading_from_single_partition) { @@ -460,25 +462,24 @@ SEASTAR_TEST_CASE(test_result_row_count) { auto src = make_source({m1}); - - auto r = to_data_query_result(mutation_query(s, make_source({m1}), query::full_partition_range, slice, 10000, query::max_partitions, now).get0(), s, slice); + auto r = to_data_query_result(mutation_query(s, make_source({m1}), query::full_partition_range, slice, 10000, query::max_partitions, now).get0(), s, slice, inf32, inf32); BOOST_REQUIRE_EQUAL(r.row_count().value(), 0); m1.set_static_cell("s1", data_value(bytes("S_v1")), 1); - r = to_data_query_result(mutation_query(s, make_source({m1}), query::full_partition_range, slice, 10000, query::max_partitions, now).get0(), s, slice); + r = to_data_query_result(mutation_query(s, make_source({m1}), query::full_partition_range, slice, 10000, query::max_partitions, now).get0(), s, slice, inf32, inf32); BOOST_REQUIRE_EQUAL(r.row_count().value(), 1); m1.set_clustered_cell(clustering_key::from_single_value(*s, bytes("A")), "v1", data_value(bytes("A_v1")), 1); - r = to_data_query_result(mutation_query(s, make_source({m1}), query::full_partition_range, slice, 10000, query::max_partitions, now).get0(), s, slice); + r = to_data_query_result(mutation_query(s, make_source({m1}), query::full_partition_range, slice, 10000, query::max_partitions, now).get0(), s, slice, inf32, inf32); BOOST_REQUIRE_EQUAL(r.row_count().value(), 1); m1.set_clustered_cell(clustering_key::from_single_value(*s, bytes("B")), "v1", data_value(bytes("B_v1")), 1); - r = to_data_query_result(mutation_query(s, make_source({m1}), query::full_partition_range, slice, 10000, query::max_partitions, now).get0(), s, slice); + r = to_data_query_result(mutation_query(s, make_source({m1}), query::full_partition_range, slice, 10000, query::max_partitions, now).get0(), s, slice, inf32, inf32); BOOST_REQUIRE_EQUAL(r.row_count().value(), 2); mutation m2(partition_key::from_single_value(*s, "key2"), s); m2.set_static_cell("s1", data_value(bytes("S_v1")), 1); - r = to_data_query_result(mutation_query(s, make_source({m1, m2}), query::full_partition_range, slice, 10000, query::max_partitions, now).get0(), s, slice); + r = to_data_query_result(mutation_query(s, make_source({m1, m2}), query::full_partition_range, slice, 10000, query::max_partitions, now).get0(), s, slice, inf32, inf32); BOOST_REQUIRE_EQUAL(r.row_count().value(), 3); }); }