From ff000799c3254f52e0beabbe9c62d10c3fc4178e Mon Sep 17 00:00:00 2001 From: Douglas Rumbaugh Date: Mon, 15 May 2023 16:48:56 -0400 Subject: Record format generalization Currently, tombstone counting is bugged. But the rest of it appears to be working. --- tests/dynamic_extension_tests.cpp | 79 ++++++++++++++++++++++----------------- 1 file changed, 45 insertions(+), 34 deletions(-) (limited to 'tests/dynamic_extension_tests.cpp') diff --git a/tests/dynamic_extension_tests.cpp b/tests/dynamic_extension_tests.cpp index ce2abdb..3638b76 100644 --- a/tests/dynamic_extension_tests.cpp +++ b/tests/dynamic_extension_tests.cpp @@ -19,11 +19,9 @@ #include using namespace de; -typedef DynamicExtension DE_WIRS; - START_TEST(t_create) { - auto ext_wirs = new DE_WIRS(100, 100, 2, 1, 1, g_rng); + auto ext_wirs = new DynamicExtension(100, 100, 2, 1, 1, g_rng); ck_assert_ptr_nonnull(ext_wirs); @@ -37,12 +35,13 @@ END_TEST START_TEST(t_append) { - auto ext_wirs = new DE_WIRS(100, 100, 2, 1, 1, g_rng); + auto ext_wirs = new DynamicExtension(100, 100, 2, 1, 1, g_rng); uint64_t key = 0; uint32_t val = 0; for (size_t i=0; i<100; i++) { - ck_assert_int_eq(ext_wirs->append(key, val, 1, false, g_rng), 1); + WRec r = {key, val, 1}; + ck_assert_int_eq(ext_wirs->append(r, g_rng), 1); key++; val++; } @@ -57,12 +56,13 @@ END_TEST START_TEST(t_append_with_mem_merges) { - auto ext_wirs = new DE_WIRS(100, 100, 2, 1, 1, g_rng); + auto ext_wirs = new DynamicExtension(100, 100, 2, 1, 1, g_rng); uint64_t key = 0; uint32_t val = 0; for (size_t i=0; i<300; i++) { - ck_assert_int_eq(ext_wirs->append(key, val, 1, false, g_rng), 1); + WRec r = {key, val, 1}; + ck_assert_int_eq(ext_wirs->append(r, g_rng), 1); key++; val++; } @@ -77,12 +77,13 @@ END_TEST START_TEST(t_range_sample_memtable) { - auto ext_wirs = new DE_WIRS(100, 100, 2, 1, 1, g_rng); + auto ext_wirs = new DynamicExtension(100, 100, 2, 1, 1, g_rng); uint64_t key = 0; uint32_t val = 0; for (size_t i=0; i<100; i++) { - ck_assert_int_eq(ext_wirs->append(key, val, 1, false, g_rng), 1); + WRec r = {key, val, 1}; + ck_assert_int_eq(ext_wirs->append(r, g_rng), 1); key++; val++; } @@ -92,7 +93,7 @@ START_TEST(t_range_sample_memtable) char *buf = (char *) std::aligned_alloc(SECTOR_SIZE, PAGE_SIZE); char *util_buf = (char *) std::aligned_alloc(SECTOR_SIZE, PAGE_SIZE); - WeightedRec sample_set[100]; + WRec sample_set[100]; ext_wirs->range_sample(sample_set, lower_bound, upper_bound, 100, g_rng); @@ -111,12 +112,13 @@ END_TEST START_TEST(t_range_sample_memlevels) { - auto ext_wirs = new DE_WIRS(100, 100, 2, 1, 1, g_rng); + auto ext_wirs = new DynamicExtension(100, 100, 2, 1, 1, g_rng); uint64_t key = 0; uint32_t val = 0; for (size_t i=0; i<300; i++) { - ck_assert_int_eq(ext_wirs->append(key, val, 1, false, g_rng), 1); + WRec r = {key, val, 1}; + ck_assert_int_eq(ext_wirs->append(r, g_rng), 1); key++; val++; } @@ -127,7 +129,7 @@ START_TEST(t_range_sample_memlevels) char *buf = (char *) std::aligned_alloc(SECTOR_SIZE, PAGE_SIZE); char *util_buf = (char *) std::aligned_alloc(SECTOR_SIZE, PAGE_SIZE); - WeightedRec sample_set[100]; + WRec sample_set[100]; ext_wirs->range_sample(sample_set, lower_bound, upper_bound, 100, g_rng); for(size_t i=0; i<100; i++) { @@ -144,7 +146,7 @@ END_TEST START_TEST(t_range_sample_weighted) { - auto ext_wirs = new DE_WIRS(100, 100, 2, 1, 1, g_rng); + auto ext_wirs = new DynamicExtension(100, 100, 2, 1, 1, g_rng); size_t n = 10000; std::vector keys; @@ -171,22 +173,23 @@ START_TEST(t_range_sample_weighted) std::shuffle(keys.begin(), keys.end(), gen); for (size_t i=0; iappend(keys[i], i, weight, false, g_rng); + WRec r = {keys[i], (uint32_t) i, weight, 0}; + ext_wirs->append(r, g_rng); } size_t k = 1000; uint64_t lower_key = 0; uint64_t upper_key = 5; - WeightedRec* buffer = new WeightedRec[k](); + WRec* buffer = new WRec[k](); char *buffer1 = (char *) std::aligned_alloc(SECTOR_SIZE, PAGE_SIZE); char *buffer2 = (char *) std::aligned_alloc(SECTOR_SIZE, PAGE_SIZE); @@ -214,7 +217,7 @@ END_TEST START_TEST(t_tombstone_merging_01) { size_t reccnt = 100000; - auto ext_wirs = new DE_WIRS(100, 100, 2, .01, 1, g_rng); + auto ext_wirs = new DynamicExtension(100, 100, 2, .01, 1, g_rng); std::set> records; std::set> to_delete; @@ -232,14 +235,17 @@ START_TEST(t_tombstone_merging_01) size_t deletes = 0; size_t cnt=0; for (auto rec : records) { - ck_assert_int_eq(ext_wirs->append(rec.first, rec.second, 1, false, g_rng), 1); + WRec r = {rec.first, rec.second, 1, 0}; + ck_assert_int_eq(ext_wirs->append(r, g_rng), 1); if (gsl_rng_uniform(g_rng) < 0.05 && !to_delete.empty()) { std::vector> del_vec; std::sample(to_delete.begin(), to_delete.end(), std::back_inserter(del_vec), 3, std::mt19937{std::random_device{}()}); for (size_t i=0; iappend(del_vec[i].first, del_vec[i].second, 1, true, g_rng); + WRec dr = {del_vec[i].first, del_vec[i].second, 1}; + dr.set_tombstone(); + ext_wirs->append(dr, g_rng); deletes++; to_delete.erase(del_vec[i]); deleted.insert(del_vec[i]); @@ -259,12 +265,12 @@ START_TEST(t_tombstone_merging_01) } END_TEST -DE_WIRS *create_test_tree(size_t reccnt, size_t memlevel_cnt) { - auto ext_wirs = new DE_WIRS(1000, 1000, 2, 1, 1, g_rng); +DynamicExtension *create_test_tree(size_t reccnt, size_t memlevel_cnt) { + auto ext_wirs = new DynamicExtension(1000, 1000, 2, 1, 1, g_rng); - std::set> records; - std::set> to_delete; - std::set> deleted; + std::set records; + std::set to_delete; + std::set deleted; while (records.size() < reccnt) { uint64_t key = rand(); @@ -277,14 +283,15 @@ DE_WIRS *create_test_tree(size_t reccnt, size_t memlevel_cnt) { size_t deletes = 0; for (auto rec : records) { - ck_assert_int_eq(ext_wirs->append(rec.first, rec.second, 1, 0, g_rng), 1); + ck_assert_int_eq(ext_wirs->append(rec, g_rng), 1); if (gsl_rng_uniform(g_rng) < 0.05 && !to_delete.empty()) { - std::vector> del_vec; + std::vector del_vec; std::sample(to_delete.begin(), to_delete.end(), std::back_inserter(del_vec), 3, std::mt19937{std::random_device{}()}); for (size_t i=0; iappend(del_vec[i].first, del_vec[i].second, 1, true, g_rng); + del_vec[i].set_tombstone(); + ext_wirs->append(del_vec[i], g_rng); deletes++; to_delete.erase(del_vec[i]); deleted.insert(del_vec[i]); @@ -302,7 +309,7 @@ DE_WIRS *create_test_tree(size_t reccnt, size_t memlevel_cnt) { START_TEST(t_sorted_array) { size_t reccnt = 100000; - auto ext_wirs = new DE_WIRS(100, 100, 2, 1, 1, g_rng); + auto ext_wirs = new DynamicExtension(100, 100, 2, 1, 1, g_rng); std::set> records; std::set> to_delete; @@ -319,14 +326,18 @@ START_TEST(t_sorted_array) size_t deletes = 0; for (auto rec : records) { - ck_assert_int_eq(ext_wirs->append(rec.first, rec.second, 1, 0, g_rng), 1); + WRec r = {rec.first, rec.second, 1}; + ck_assert_int_eq(ext_wirs->append(r, g_rng), 1); if (gsl_rng_uniform(g_rng) < 0.05 && !to_delete.empty()) { std::vector> del_vec; std::sample(to_delete.begin(), to_delete.end(), std::back_inserter(del_vec), 3, std::mt19937{std::random_device{}()}); for (size_t i=0; iappend(del_vec[i].first, del_vec[i].second, 1, true, g_rng); + WRec dr = {del_vec[i].first, del_vec[i].second, 1}; + dr.set_tombstone(); + + ext_wirs->append(dr , g_rng); deletes++; to_delete.erase(del_vec[i]); deleted.insert(del_vec[i]); -- cgit v1.2.3