Started implementing shard interface (not finished yet)

3 files changed, 19 insertions, 17 deletions

diff --git a/tests/dynamic_extension_tests.cpp b/tests/dynamic_extension_tests.cpp
index 3638b76..422e904 100644
--- a/tests/dynamic_extension_tests.cpp
+++ b/tests/dynamic_extension_tests.cpp
@@ -15,13 +15,14 @@
 
 #include "testing.h"
 #include "framework/DynamicExtension.h"
+#include "shard/WIRS.h"
 
 #include <check.h>
 using namespace de;
 
 START_TEST(t_create)
 {
-    auto ext_wirs = new DynamicExtension<WRec>(100, 100, 2, 1, 1, g_rng);
+    auto ext_wirs = new DynamicExtension<WRec, WIRS<WRec>>(100, 100, 2, 1, 1, g_rng);
 
 
     ck_assert_ptr_nonnull(ext_wirs);
@@ -35,7 +36,7 @@ END_TEST
 
 START_TEST(t_append)
 {
-    auto ext_wirs = new DynamicExtension<WRec>(100, 100, 2, 1, 1, g_rng);
+    auto ext_wirs = new DynamicExtension<WRec, WIRS<WRec>>(100, 100, 2, 1, 1, g_rng);
 
     uint64_t key = 0;
     uint32_t val = 0;
@@ -56,7 +57,7 @@ END_TEST
 
 START_TEST(t_append_with_mem_merges)
 {
-    auto ext_wirs = new DynamicExtension<WRec>(100, 100, 2, 1, 1, g_rng);
+    auto ext_wirs = new DynamicExtension<WRec, WIRS<WRec>>(100, 100, 2, 1, 1, g_rng);
 
     uint64_t key = 0;
     uint32_t val = 0;
@@ -77,7 +78,7 @@ END_TEST
 
 START_TEST(t_range_sample_memtable)
 {
-    auto ext_wirs = new DynamicExtension<WRec>(100, 100, 2, 1, 1, g_rng);
+    auto ext_wirs = new DynamicExtension<WRec, WIRS<WRec>>(100, 100, 2, 1, 1, g_rng);
 
     uint64_t key = 0;
     uint32_t val = 0;
@@ -112,7 +113,7 @@ END_TEST
 
 START_TEST(t_range_sample_memlevels)
 {
-    auto ext_wirs = new DynamicExtension<WRec>(100, 100, 2, 1, 1, g_rng);
+    auto ext_wirs = new DynamicExtension<WRec, WIRS<WRec>>(100, 100, 2, 1, 1, g_rng);
 
     uint64_t key = 0;
     uint32_t val = 0;
@@ -146,7 +147,7 @@ END_TEST
 
 START_TEST(t_range_sample_weighted)
 {
-    auto ext_wirs = new DynamicExtension<WRec>(100, 100, 2, 1, 1, g_rng);
+    auto ext_wirs = new DynamicExtension<WRec, WIRS<WRec>>(100, 100, 2, 1, 1, g_rng);
     size_t n = 10000;
 
     std::vector<uint64_t> keys;
@@ -217,7 +218,7 @@ END_TEST
 START_TEST(t_tombstone_merging_01)
 {
     size_t reccnt = 100000;
-    auto ext_wirs = new DynamicExtension<WRec>(100, 100, 2, .01, 1, g_rng);
+    auto ext_wirs = new DynamicExtension<WRec, WIRS<WRec>>(100, 100, 2, .01, 1, g_rng);
 
     std::set<std::pair<uint64_t, uint32_t>> records; 
     std::set<std::pair<uint64_t, uint32_t>> to_delete;
@@ -265,8 +266,8 @@ START_TEST(t_tombstone_merging_01)
 }
 END_TEST
 
-DynamicExtension<WRec> *create_test_tree(size_t reccnt, size_t memlevel_cnt) {
-    auto ext_wirs = new DynamicExtension<WRec>(1000, 1000, 2, 1, 1, g_rng);
+DynamicExtension<WRec, WIRS<WRec>> *create_test_tree(size_t reccnt, size_t memlevel_cnt) {
+    auto ext_wirs = new DynamicExtension<WRec, WIRS<WRec>>(1000, 1000, 2, 1, 1, g_rng);
 
     std::set<WRec> records; 
     std::set<WRec> to_delete;
@@ -309,7 +310,7 @@ DynamicExtension<WRec> *create_test_tree(size_t reccnt, size_t memlevel_cnt) {
 START_TEST(t_sorted_array)
 {
     size_t reccnt = 100000;
-    auto ext_wirs = new DynamicExtension<WRec>(100, 100, 2, 1, 1, g_rng);
+    auto ext_wirs = new DynamicExtension<WRec, WIRS<WRec>>(100, 100, 2, 1, 1, g_rng);
 
     std::set<std::pair<uint64_t, uint32_t>> records; 
     std::set<std::pair<uint64_t, uint32_t>> to_delete;
diff --git a/tests/internal_level_tests.cpp b/tests/internal_level_tests.cpp
index 74d29f0..6803112 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);
+    auto base_level = new InternalLevel<WRec, WIRS<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);
+    auto merging_level = new InternalLevel<WRec, WIRS<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, g_rng);
+    base_level = InternalLevel<WRec, WIRS<WRec>>::merge_levels(old_level, merging_level, g_rng);
 
     delete old_level;
     delete merging_level;
@@ -44,11 +44,11 @@ START_TEST(t_memlevel_merge)
 }
 
 
-InternalLevel<WRec> *create_test_memlevel(size_t reccnt) {
+InternalLevel<WRec, WIRS<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);
+    auto base_level = new InternalLevel<WRec, WIRS<WRec>>(1, 2);
     base_level->append_mem_table(tbl1, g_rng);
     base_level->append_mem_table(tbl2, g_rng);
 
diff --git a/tests/wirs_tests.cpp b/tests/wirs_tests.cpp
index 828362d..c7edec9 100644
--- a/tests/wirs_tests.cpp
+++ b/tests/wirs_tests.cpp
@@ -185,7 +185,8 @@ START_TEST(t_weighted_sampling)
     results.reserve(k);
     size_t cnt[3] = {0};
     for (size_t i=0; i<1000; i++) {
-        auto state = shard->get_sample_shard_state(lower_key, upper_key);
+        WIRS<WRec>::wirs_query_parms parms = {lower_key, upper_key};
+        auto state = shard->get_query_state(&parms);
         
         shard->get_samples(state, results, lower_key, upper_key, k, g_rng);
 
@@ -193,7 +194,7 @@ START_TEST(t_weighted_sampling)
             cnt[results[j].key - 1]++;
         }
 
-        WIRS<WRec>::delete_state(state);
+        WIRS<WRec>::delete_query_state(state);
     }
 
     ck_assert(roughly_equal(cnt[0] / 1000, (double) k/4.0, k, .05));