From 730fc4e9bae5a157c83db8061c2c6831a297e959 Mon Sep 17 00:00:00 2001 From: Douglas Rumbaugh Date: Wed, 7 Jun 2023 12:23:38 -0400 Subject: Interface adjustments Layout and Delete Policies are now specified via template parameters, and rejection sampling has been removed as an argument to the mutable buffer constructor. --- tests/memisam_tests.cpp | 2 +- tests/mutable_buffer_tests.cpp | 10 +++++----- tests/pgm_tests.cpp | 2 +- tests/testing.h | 10 +++++----- tests/triespline_tests.cpp | 2 +- tests/wirs_tests.cpp | 2 +- tests/wss_tests.cpp | 2 +- 7 files changed, 15 insertions(+), 15 deletions(-) (limited to 'tests') diff --git a/tests/memisam_tests.cpp b/tests/memisam_tests.cpp index 713a732..8f4c842 100644 --- a/tests/memisam_tests.cpp +++ b/tests/memisam_tests.cpp @@ -21,7 +21,7 @@ typedef MemISAM Shard; START_TEST(t_mbuffer_init) { - auto buffer = new MutableBuffer(1024, true, 1024); + auto buffer = new MutableBuffer(1024, 1024); for (uint64_t i = 512; i > 0; i--) { uint32_t v = i; buffer->append({i,v, 1}); diff --git a/tests/mutable_buffer_tests.cpp b/tests/mutable_buffer_tests.cpp index bb8e2c2..201fddb 100644 --- a/tests/mutable_buffer_tests.cpp +++ b/tests/mutable_buffer_tests.cpp @@ -25,7 +25,7 @@ using namespace de; START_TEST(t_create) { - auto buffer = new MutableBuffer(100, true, 50); + auto buffer = new MutableBuffer(100, 50); ck_assert_ptr_nonnull(buffer); ck_assert_int_eq(buffer->get_capacity(), 100); @@ -42,7 +42,7 @@ END_TEST START_TEST(t_insert) { - auto buffer = new MutableBuffer(100, true, 50); + auto buffer = new MutableBuffer(100, 50); uint64_t key = 0; uint32_t val = 5; @@ -77,7 +77,7 @@ END_TEST START_TEST(t_insert_tombstones) { - auto buffer = new MutableBuffer(100, true, 50); + auto buffer = new MutableBuffer(100, 50); size_t ts_cnt = 0; @@ -120,7 +120,7 @@ END_TEST START_TEST(t_truncate) { - auto buffer = new MutableBuffer(100, true, 100); + auto buffer = new MutableBuffer(100, 100); size_t ts_cnt = 0; Rec rec = {0, 5}; @@ -162,7 +162,7 @@ START_TEST(t_get_data) { size_t cnt = 100; - auto buffer = new MutableBuffer(cnt, true, cnt/2); + auto buffer = new MutableBuffer(cnt, cnt/2); std::vector keys(cnt); diff --git a/tests/pgm_tests.cpp b/tests/pgm_tests.cpp index 254de03..80116d4 100644 --- a/tests/pgm_tests.cpp +++ b/tests/pgm_tests.cpp @@ -21,7 +21,7 @@ typedef PGM Shard; START_TEST(t_mbuffer_init) { - auto buffer = new MutableBuffer(1024, true, 1024); + auto buffer = new MutableBuffer(1024, 1024); for (uint64_t i = 512; i > 0; i--) { uint32_t v = i; buffer->append({i,v, 1}); diff --git a/tests/testing.h b/tests/testing.h index 4277015..fe6623e 100644 --- a/tests/testing.h +++ b/tests/testing.h @@ -78,7 +78,7 @@ static bool roughly_equal(int n1, int n2, size_t mag, double epsilon) { template static de::MutableBuffer *create_test_mbuffer(size_t cnt) { - auto buffer = new de::MutableBuffer(cnt, true, cnt); + auto buffer = new de::MutableBuffer(cnt, cnt); R rec; for (size_t i = 0; i < cnt; i++) { @@ -99,7 +99,7 @@ template static de::MutableBuffer *create_sequential_mbuffer(decltype(R::key) start, decltype(R::key) stop) { size_t cnt = stop - start; - auto buffer = new de::MutableBuffer(cnt, true, cnt); + auto buffer = new de::MutableBuffer(cnt, cnt); for (size_t i=start; i *create_sequential_mbuffer(decltype(R::key) start, d template static de::MutableBuffer *create_test_mbuffer_tombstones(size_t cnt, size_t ts_cnt) { - auto buffer = new de::MutableBuffer(cnt, true, ts_cnt); + auto buffer = new de::MutableBuffer(cnt, ts_cnt); std::vector> tombstones; @@ -150,7 +150,7 @@ static de::MutableBuffer *create_test_mbuffer_tombstones(size_t cnt, size_t t template static de::MutableBuffer *create_weighted_mbuffer(size_t cnt) { - auto buffer = new de::MutableBuffer(cnt, true, cnt); + auto buffer = new de::MutableBuffer(cnt, cnt); // Put in half of the count with weight one. for (uint32_t i=0; i< cnt / 2; i++) { @@ -173,7 +173,7 @@ static de::MutableBuffer *create_weighted_mbuffer(size_t cnt) template static de::MutableBuffer *create_double_seq_mbuffer(size_t cnt, bool ts=false) { - auto buffer = new de::MutableBuffer(cnt, true, cnt); + auto buffer = new de::MutableBuffer(cnt, cnt); for (size_t i = 0; i < cnt / 2; i++) { R rec; diff --git a/tests/triespline_tests.cpp b/tests/triespline_tests.cpp index d88d4b1..c3bd707 100644 --- a/tests/triespline_tests.cpp +++ b/tests/triespline_tests.cpp @@ -21,7 +21,7 @@ typedef TrieSpline Shard; START_TEST(t_mbuffer_init) { - auto buffer = new MutableBuffer(1024, true, 1024); + auto buffer = new MutableBuffer(1024, 1024); for (uint64_t i = 512; i > 0; i--) { uint32_t v = i; buffer->append({i,v, 1}); diff --git a/tests/wirs_tests.cpp b/tests/wirs_tests.cpp index 133950d..60537e5 100644 --- a/tests/wirs_tests.cpp +++ b/tests/wirs_tests.cpp @@ -21,7 +21,7 @@ typedef WIRS Shard; START_TEST(t_mbuffer_init) { - auto buffer = new MutableBuffer(1024, true, 1024); + auto buffer = new MutableBuffer(1024, 1024); for (uint64_t i = 512; i > 0; i--) { uint32_t v = i; buffer->append({i,v, 1}); diff --git a/tests/wss_tests.cpp b/tests/wss_tests.cpp index de62006..d138cfe 100644 --- a/tests/wss_tests.cpp +++ b/tests/wss_tests.cpp @@ -21,7 +21,7 @@ typedef WSS Shard; START_TEST(t_mbuffer_init) { - auto buffer = new MutableBuffer(1024, true, 1024); + auto buffer = new MutableBuffer(1024, 1024); for (uint64_t i = 512; i > 0; i--) { uint32_t v = i; buffer->append({i,v, 1}); -- cgit v1.2.3