diff options
| author | Douglas Rumbaugh <dbr4@psu.edu> | 2023-05-17 10:58:57 -0400 |
|---|---|---|
| committer | Douglas Rumbaugh <dbr4@psu.edu> | 2023-05-17 10:58:57 -0400 |
| commit | 75a8418b580234521b5fa23340bee959c357acf9 (patch) | |
| tree | 5c32d5fb20749a65a642a0d969f7c47adc4691b7 /tests | |
| parent | ff000799c3254f52e0beabbe9c62d10c3fc4178e (diff) | |
| download | dynamic-extension-75a8418b580234521b5fa23340bee959c357acf9.tar.gz | |
Removed unncessary tagging paramter from shards and levels
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/internal_level_tests.cpp | 8 | ||||
| -rw-r--r-- | tests/memisam_tests.cpp | 20 | ||||
| -rw-r--r-- | tests/wirs_tests.cpp | 22 |
3 files changed, 25 insertions, 25 deletions
diff --git a/tests/internal_level_tests.cpp b/tests/internal_level_tests.cpp index 7842b01..74d29f0 100644 --- a/tests/internal_level_tests.cpp +++ b/tests/internal_level_tests.cpp @@ -23,16 +23,16 @@ START_TEST(t_memlevel_merge) auto tbl1 = create_test_mbuffer<WRec>(100); auto tbl2 = create_test_mbuffer<WRec>(100); - auto base_level = new InternalLevel<WRec>(1, 1, false); + auto base_level = new InternalLevel<WRec>(1, 1); base_level->append_mem_table(tbl1, g_rng); ck_assert_int_eq(base_level->get_record_cnt(), 100); - auto merging_level = new InternalLevel<WRec>(0, 1, false); + auto merging_level = new InternalLevel<WRec>(0, 1); merging_level->append_mem_table(tbl2, g_rng); ck_assert_int_eq(merging_level->get_record_cnt(), 100); auto old_level = base_level; - base_level = InternalLevel<WRec>::merge_levels(old_level, merging_level, false, g_rng); + base_level = InternalLevel<WRec>::merge_levels(old_level, merging_level, g_rng); delete old_level; delete merging_level; @@ -48,7 +48,7 @@ InternalLevel<WRec> *create_test_memlevel(size_t reccnt) { auto tbl1 = create_test_mbuffer<WRec>(reccnt/2); auto tbl2 = create_test_mbuffer<WRec>(reccnt/2); - auto base_level = new InternalLevel<WRec>(1, 2, false); + auto base_level = new InternalLevel<WRec>(1, 2); base_level->append_mem_table(tbl1, g_rng); base_level->append_mem_table(tbl2, g_rng); diff --git a/tests/memisam_tests.cpp b/tests/memisam_tests.cpp index 1609edf..260b47c 100644 --- a/tests/memisam_tests.cpp +++ b/tests/memisam_tests.cpp @@ -30,7 +30,7 @@ START_TEST(t_memtable_init) } BloomFilter* bf = new BloomFilter(BF_FPR, buffer->get_tombstone_count(), BF_HASH_FUNCS, g_rng); - M_ISAM* run = new M_ISAM(buffer, bf, false); + M_ISAM* run = new M_ISAM(buffer, bf); ck_assert_uint_eq(run->get_record_count(), 512); delete bf; @@ -48,13 +48,13 @@ START_TEST(t_inmemrun_init) BloomFilter* bf1 = new BloomFilter(100, BF_HASH_FUNCS, g_rng); BloomFilter* bf2 = new BloomFilter(100, BF_HASH_FUNCS, g_rng); BloomFilter* bf3 = new BloomFilter(100, BF_HASH_FUNCS, g_rng); - auto run1 = new M_ISAM(memtable1, bf1, false); - auto run2 = new M_ISAM(memtable2, bf2, false); - auto run3 = new M_ISAM(memtable3, bf3, false); + auto run1 = new M_ISAM(memtable1, bf1); + auto run2 = new M_ISAM(memtable2, bf2); + auto run3 = new M_ISAM(memtable3, bf3); BloomFilter* bf4 = new BloomFilter(100, BF_HASH_FUNCS, g_rng); M_ISAM* runs[3] = {run1, run2, run3}; - auto run4 = new M_ISAM(runs, 3, bf4, false); + auto run4 = new M_ISAM(runs, 3, bf4); ck_assert_int_eq(run4->get_record_count(), n * 3); ck_assert_int_eq(run4->get_tombstone_count(), 0); @@ -103,7 +103,7 @@ START_TEST(t_get_lower_bound_index) ck_assert_ptr_nonnull(memtable); BloomFilter* bf = new BloomFilter(100, BF_HASH_FUNCS, g_rng); - M_ISAM* run = new M_ISAM(memtable, bf, false); + M_ISAM* run = new M_ISAM(memtable, bf); ck_assert_int_eq(run->get_record_count(), n); ck_assert_int_eq(run->get_tombstone_count(), 0); @@ -128,7 +128,7 @@ START_TEST(t_get_upper_bound_index) ck_assert_ptr_nonnull(memtable); BloomFilter* bf = new BloomFilter(100, BF_HASH_FUNCS, g_rng); - M_ISAM* run = new M_ISAM(memtable, bf, false); + M_ISAM* run = new M_ISAM(memtable, bf); ck_assert_int_eq(run->get_record_count(), n); ck_assert_int_eq(run->get_tombstone_count(), 0); @@ -157,8 +157,8 @@ START_TEST(t_full_cancelation) BloomFilter* bf2 = new BloomFilter(100, BF_HASH_FUNCS, g_rng); BloomFilter* bf3 = new BloomFilter(100, BF_HASH_FUNCS, g_rng); - M_ISAM* run = new M_ISAM(mtable, bf1, false); - M_ISAM* run_ts = new M_ISAM(mtable_ts, bf2, false); + M_ISAM* run = new M_ISAM(mtable, bf1); + M_ISAM* run_ts = new M_ISAM(mtable_ts, bf2); ck_assert_int_eq(run->get_record_count(), n); ck_assert_int_eq(run->get_tombstone_count(), 0); @@ -167,7 +167,7 @@ START_TEST(t_full_cancelation) M_ISAM* runs[] = {run, run_ts}; - M_ISAM* merged = new M_ISAM(runs, 2, bf3, false); + M_ISAM* merged = new M_ISAM(runs, 2, bf3); ck_assert_int_eq(merged->get_tombstone_count(), 0); ck_assert_int_eq(merged->get_record_count(), 0); diff --git a/tests/wirs_tests.cpp b/tests/wirs_tests.cpp index 673bdca..828362d 100644 --- a/tests/wirs_tests.cpp +++ b/tests/wirs_tests.cpp @@ -40,7 +40,7 @@ START_TEST(t_mbuffer_init) } BloomFilter* bf = new BloomFilter(BF_FPR, mem_table->get_tombstone_count(), BF_HASH_FUNCS, g_rng); - Shard* shard = new Shard(mem_table, bf, false); + Shard* shard = new Shard(mem_table, bf); ck_assert_uint_eq(shard->get_record_count(), 512); delete bf; @@ -58,13 +58,13 @@ START_TEST(t_wirs_init) BloomFilter* bf1 = new BloomFilter(100, BF_HASH_FUNCS, g_rng); BloomFilter* bf2 = new BloomFilter(100, BF_HASH_FUNCS, g_rng); BloomFilter* bf3 = new BloomFilter(100, BF_HASH_FUNCS, g_rng); - auto shard1 = new Shard(mbuffer1, bf1, false); - auto shard2 = new Shard(mbuffer2, bf2, false); - auto shard3 = new Shard(mbuffer3, bf3, false); + auto shard1 = new Shard(mbuffer1, bf1); + auto shard2 = new Shard(mbuffer2, bf2); + auto shard3 = new Shard(mbuffer3, bf3); BloomFilter* bf4 = new BloomFilter(100, BF_HASH_FUNCS, g_rng); Shard* shards[3] = {shard1, shard2, shard3}; - auto shard4 = new Shard(shards, 3, bf4, false); + auto shard4 = new Shard(shards, 3, bf4); ck_assert_int_eq(shard4->get_record_count(), n * 3); ck_assert_int_eq(shard4->get_tombstone_count(), 0); @@ -113,7 +113,7 @@ START_TEST(t_get_lower_bound_index) ck_assert_ptr_nonnull(mbuffer); BloomFilter* bf = new BloomFilter(100, BF_HASH_FUNCS, g_rng); - Shard* shard = new Shard(mbuffer, bf, false); + Shard* shard = new Shard(mbuffer, bf); ck_assert_int_eq(shard->get_record_count(), n); ck_assert_int_eq(shard->get_tombstone_count(), 0); @@ -141,8 +141,8 @@ START_TEST(t_full_cancelation) BloomFilter* bf2 = new BloomFilter(100, BF_HASH_FUNCS, g_rng); BloomFilter* bf3 = new BloomFilter(100, BF_HASH_FUNCS, g_rng); - Shard* shard = new Shard(buffer, bf1, false); - Shard* shard_ts = new Shard(buffer_ts, bf2, false); + Shard* shard = new Shard(buffer, bf1); + Shard* shard_ts = new Shard(buffer_ts, bf2); ck_assert_int_eq(shard->get_record_count(), n); ck_assert_int_eq(shard->get_tombstone_count(), 0); @@ -151,7 +151,7 @@ START_TEST(t_full_cancelation) Shard* shards[] = {shard, shard_ts}; - Shard* merged = new Shard(shards, 2, bf3, false); + Shard* merged = new Shard(shards, 2, bf3); ck_assert_int_eq(merged->get_tombstone_count(), 0); ck_assert_int_eq(merged->get_record_count(), 0); @@ -174,7 +174,7 @@ START_TEST(t_weighted_sampling) auto buffer = create_weighted_mbuffer<WRec>(n); BloomFilter* bf = new BloomFilter(100, BF_HASH_FUNCS, g_rng); - Shard* shard = new Shard(buffer, bf, false); + Shard* shard = new Shard(buffer, bf); uint64_t lower_key = 0; uint64_t upper_key = 5; @@ -234,7 +234,7 @@ START_TEST(t_tombstone_check) } BloomFilter* bf1 = new BloomFilter(100, BF_HASH_FUNCS, g_rng); - auto shard = new Shard(buffer, bf1, false); + auto shard = new Shard(buffer, bf1); for (size_t i=0; i<tombstones.size(); i++) { ck_assert(shard->check_tombstone({tombstones[i].first, tombstones[i].second})); |