Merge pull request #1 from dbrumbaugh/new-buffer

Initial Concurrency Implementation

1 files changed, 20 insertions, 21 deletions

diff --git a/tests/internal_level_tests.cpp b/tests/internal_level_tests.cpp
index 9deb485..06b0bab 100644
--- a/tests/internal_level_tests.cpp
+++ b/tests/internal_level_tests.cpp
@@ -6,42 +6,41 @@
  * Copyright (C) 2023 Douglas Rumbaugh <drumbaugh@psu.edu> 
  *                    Dong Xie <dongx@psu.edu>
  *
- * All rights reserved. Published under the Modified BSD License.
+ * Distributed under the Modified BSD License.
  *
  */
-#include "shard/WIRS.h"
-#include "framework/InternalLevel.h"
-#include "framework/RecordInterface.h"
-#include "framework/QueryInterface.h"
-#include "framework/ShardInterface.h"
+#include "shard/ISAMTree.h"
+#include "query/rangequery.h"
+#include "framework/structure/InternalLevel.h"
+#include "framework/interface/Record.h"
+#include "framework/interface/Query.h"
+#include "framework/interface/Shard.h"
 
-#include "testing.h"
+#include "include/testing.h"
 
 #include <check.h>
 
 using namespace de;
 
-typedef InternalLevel<WRec, WIRS<WRec>, WIRSQuery<WRec>> ILevel;
+typedef InternalLevel<Rec, ISAMTree<Rec>, rq::Query<Rec, ISAMTree<Rec>>> ILevel;
 
 START_TEST(t_memlevel_merge)
 {
-    auto tbl1 = create_test_mbuffer<WRec>(100);
-    auto tbl2 = create_test_mbuffer<WRec>(100);
+    auto tbl1 = create_test_mbuffer<Rec>(100);
+    auto tbl2 = create_test_mbuffer<Rec>(100);
 
     auto base_level = new ILevel(1, 1);
-    base_level->append_buffer(tbl1);
+    base_level->append_buffer(tbl1->get_buffer_view());
     ck_assert_int_eq(base_level->get_record_count(), 100);
 
     auto merging_level = new ILevel(0, 1);
-    merging_level->append_buffer(tbl2);
+    merging_level->append_buffer(tbl2->get_buffer_view());
     ck_assert_int_eq(merging_level->get_record_count(), 100);
 
-    auto old_level = base_level;
-    base_level = ILevel::merge_levels(old_level, merging_level);
+    auto new_level = ILevel::reconstruction(base_level, merging_level);
 
-    delete old_level;
     delete merging_level;
-    ck_assert_int_eq(base_level->get_record_count(), 200);
+    ck_assert_int_eq(new_level->get_record_count(), 200);
 
     delete base_level;
     delete tbl1;
@@ -50,12 +49,12 @@ START_TEST(t_memlevel_merge)
 
 
 ILevel *create_test_memlevel(size_t reccnt) {
-    auto tbl1 = create_test_mbuffer<WRec>(reccnt/2);
-    auto tbl2 = create_test_mbuffer<WRec>(reccnt/2);
+    auto tbl1 = create_test_mbuffer<Rec>(reccnt/2);
+    auto tbl2 = create_test_mbuffer<Rec>(reccnt/2);
 
     auto base_level = new ILevel(1, 2);
-    base_level->append_buffer(tbl1); 
-    base_level->append_buffer(tbl2);
+    base_level->append_buffer(tbl1->get_buffer_view()); 
+    base_level->append_buffer(tbl2->get_buffer_view());
 
     delete tbl1;
     delete tbl2;
@@ -67,7 +66,7 @@ Suite *unit_testing()
 {
     Suite *unit = suite_create("InternalLevel Unit Testing");
 
-    TCase *merge = tcase_create("de::InternalLevel::merge_level Testing");
+    TCase *merge = tcase_create("de::InternalLevel::reconstruction Testing");
     tcase_add_test(merge, t_memlevel_merge);
     suite_add_tcase(unit, merge);