summaryrefslogtreecommitdiffstats
path: root/tests/include
diff options
context:
space:
mode:
Diffstat (limited to 'tests/include')
-rw-r--r--tests/include/concurrent_extension.h78
-rw-r--r--tests/include/dynamic_extension.h81
-rw-r--r--tests/include/shard_standard.h4
-rw-r--r--tests/include/shard_string.h2
4 files changed, 44 insertions, 121 deletions
diff --git a/tests/include/concurrent_extension.h b/tests/include/concurrent_extension.h
index d99cd23..84f816d 100644
--- a/tests/include/concurrent_extension.h
+++ b/tests/include/concurrent_extension.h
@@ -22,24 +22,28 @@
* should be included in the source file that includes this one, above the
* include statement.
*/
-// #include "testing.h"
-// #include "framework/DynamicExtension.h"
-// //#include "framework/scheduling/FIFOScheduler.h"
-// #include "shard/ISAMTree.h"
-// #include "query/rangequery.h"
-// #include <check.h>
-// #include <set>
-// #include <random>
+#include "framework/reconstruction/ReconstructionPolicy.h"
+#include "framework/reconstruction/TieringPolicy.h"
+#include "testing.h"
+#include "framework/DynamicExtension.h"
+#include "framework/scheduling/FIFOScheduler.h"
+#include "shard/ISAMTree.h"
+#include "query/rangequery.h"
+#include <check.h>
+#include <set>
+#include <random>
// using namespace de;
// typedef Rec R;
// typedef ISAMTree<R> S;
// typedef rq::Query<S> Q;
-// typedef DynamicExtension<S, Q, LayoutPolicy::LEVELING, DeletePolicy::TOMBSTONE> DE; //, FIFOScheduler> DE;
+// typedef DynamicExtension<S, Q, DeletePolicy::TOMBSTONE, FIFOScheduler> DE;
+// ReconstructionPolicy<S,Q> *recon = new TieringPolicy<S, Q>(2, 1000);
+// ReconstructionPolicy<S,Q> *recon2 = new TieringPolicy<S, Q>(4, 10000);
START_TEST(t_create)
{
- auto test_de = new DE(100, 1000, 2);
+ auto test_de = new DE(recon, 100, 1000);
ck_assert_ptr_nonnull(test_de);
ck_assert_int_eq(test_de->get_record_count(), 0);
@@ -52,7 +56,7 @@ END_TEST
START_TEST(t_insert)
{
- auto test_de = new DE(100, 1000, 2);
+ auto test_de = new DE(recon, 100, 1000);
uint64_t key = 0;
uint32_t val = 0;
@@ -73,7 +77,7 @@ END_TEST
START_TEST(t_debug_insert)
{
- auto test_de = new DE(100, 1000, 2);
+ auto test_de = new DE(recon, 100, 1000);
uint64_t key = 0;
uint32_t val = 0;
@@ -92,7 +96,7 @@ END_TEST
START_TEST(t_insert_with_mem_merges)
{
- auto test_de = new DE(100, 1000, 2);
+ auto test_de = new DE(recon, 100, 1000);
uint64_t key = 0;
uint32_t val = 0;
@@ -135,7 +139,7 @@ END_TEST
START_TEST(t_range_query)
{
- auto test_de = new DE(1000, 10000, 4);
+ auto test_de = new DE(recon2, 1000, 10000);
size_t n = 10000000;
std::vector<uint64_t> keys;
@@ -189,7 +193,7 @@ END_TEST
START_TEST(t_tombstone_merging_01)
{
size_t reccnt = 100000;
- auto test_de = new DE(100, 1000, 2);
+ auto test_de = new DE(recon, 100, 1000);
auto rng = gsl_rng_alloc(gsl_rng_mt19937);
@@ -242,54 +246,12 @@ START_TEST(t_tombstone_merging_01)
}
END_TEST
-DE *create_test_tree(size_t reccnt, size_t memlevel_cnt) {
- auto rng = gsl_rng_alloc(gsl_rng_mt19937);
-
- auto test_de = new DE(1000, 10000, 2);
-
- std::set<R> records;
- std::set<R> to_delete;
- std::set<R> deleted;
-
- while (records.size() < reccnt) {
- uint64_t key = rand();
- uint32_t val = rand();
-
- if (records.find({key, val}) != records.end()) continue;
-
- records.insert({key, val});
- }
-
- for (auto rec : records) {
- ck_assert_int_eq(test_de->insert(rec), 1);
-
- if (gsl_rng_uniform(rng) < 0.05 && !to_delete.empty()) {
- std::vector<R> 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; i<del_vec.size(); i++) {
- test_de->erase(del_vec[i]);
- to_delete.erase(del_vec[i]);
- deleted.insert(del_vec[i]);
- }
- }
-
- if (gsl_rng_uniform(rng) < 0.25 && deleted.find(rec) == deleted.end()) {
- to_delete.insert(rec);
- }
- }
-
- gsl_rng_free(rng);
-
- return test_de;
-}
-
START_TEST(t_static_structure)
{
auto rng = gsl_rng_alloc(gsl_rng_mt19937);
size_t reccnt = 100000;
- auto test_de = new DE(100, 1000, 2);
+ auto test_de = new DE(recon, 100, 1000);
std::set<R> records;
std::set<R> to_delete;
diff --git a/tests/include/dynamic_extension.h b/tests/include/dynamic_extension.h
index 326bb72..a1ab20a 100644
--- a/tests/include/dynamic_extension.h
+++ b/tests/include/dynamic_extension.h
@@ -23,26 +23,28 @@
* include statement.
*/
-// #include "testing.h"
-// #include "framework/DynamicExtension.h"
-// #include "framework/scheduling/SerialScheduler.h"
-// #include "shard/ISAMTree.h"
-// #include "query/rangequery.h"
-// #include <check.h>
-// #include <random>
-// #include <set>
+#include "framework/reconstruction/BSMPolicy.h"
+#include "framework/reconstruction/TieringPolicy.h"
+#include "testing.h"
+#include "framework/DynamicExtension.h"
+#include "framework/scheduling/SerialScheduler.h"
+#include "framework/reconstruction/ReconstructionPolicy.h"
+#include "shard/ISAMTree.h"
+#include "query/rangequery.h"
+#include <check.h>
+#include <random>
+#include <set>
// using namespace de;
// typedef Rec R;
// typedef ISAMTree<R> S;
// typedef rq::Query<S> Q;
-// typedef DynamicExtension<S, Q, LayoutPolicy::TEIRING, DeletePolicy::TAGGING, SerialScheduler> DE;
+// typedef DynamicExtension<S, Q, DeletePolicy::TAGGING, SerialScheduler> DE;
+// ReconstructionPolicy<S, Q> *recon = new TieringPolicy<S, Q>(1000, 2);
-
-#include "framework/util/Configuration.h"
START_TEST(t_create)
{
- auto test_de = new DE(100, 1000, 2);
+ auto test_de = new DE(recon, 100);
ck_assert_ptr_nonnull(test_de);
ck_assert_int_eq(test_de->get_record_count(), 0);
@@ -55,7 +57,7 @@ END_TEST
START_TEST(t_insert)
{
- auto test_de = new DE(100, 1000, 2);
+ auto test_de = new DE(recon, 100);
uint64_t key = 0;
uint32_t val = 0;
@@ -76,7 +78,7 @@ END_TEST
START_TEST(t_debug_insert)
{
- auto test_de = new DE(100, 1000, 2);
+ auto test_de = new DE(recon, 100);
uint64_t key = 0;
uint32_t val = 0;
@@ -95,7 +97,7 @@ END_TEST
START_TEST(t_insert_with_mem_merges)
{
- auto test_de = new DE(100, 1000, 2);
+ auto test_de = new DE(recon, 100);
uint64_t key = 0;
uint32_t val = 0;
@@ -114,7 +116,7 @@ START_TEST(t_insert_with_mem_merges)
* BSM grows on every flush, so the height will be different than
* normal layout policies
*/
- if (test_de->Layout == de::LayoutPolicy::BSM) {
+ if (dynamic_cast<const BSMPolicy<S, Q>*>(recon)) {
ck_assert_int_eq(test_de->get_height(), 2);
} else {
ck_assert_int_eq(test_de->get_height(), 1);
@@ -127,7 +129,7 @@ END_TEST
START_TEST(t_range_query)
{
- auto test_de = new DE(100, 1000, 2);
+ auto test_de = new DE(recon, 100);
size_t n = 10000;
std::vector<uint64_t> keys;
@@ -175,7 +177,7 @@ END_TEST
START_TEST(t_tombstone_merging_01)
{
size_t reccnt = 100000;
- auto test_de = new DE(100, 1000, 2);
+ auto test_de = new DE(recon, 100);
auto rng = gsl_rng_alloc(gsl_rng_mt19937);
@@ -224,54 +226,13 @@ START_TEST(t_tombstone_merging_01)
}
END_TEST
-[[maybe_unused]] static DE *create_test_tree(size_t reccnt, size_t memlevel_cnt) {
- auto rng = gsl_rng_alloc(gsl_rng_mt19937);
-
- auto test_de = new DE(1000, 10000, 2);
-
- std::set<Rec> records;
- std::set<Rec> to_delete;
- std::set<Rec> deleted;
-
- while (records.size() < reccnt) {
- uint64_t key = rand();
- uint32_t val = rand();
-
- if (records.find({key, val}) != records.end()) continue;
-
- records.insert({key, val});
- }
-
- for (auto rec : records) {
- ck_assert_int_eq(test_de->insert(rec), 1);
-
- if (gsl_rng_uniform(rng) < 0.05 && !to_delete.empty()) {
- std::vector<Rec> 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; i<del_vec.size(); i++) {
- test_de->erase(del_vec[i]);
- to_delete.erase(del_vec[i]);
- deleted.insert(del_vec[i]);
- }
- }
-
- if (gsl_rng_uniform(rng) < 0.25 && deleted.find(rec) == deleted.end()) {
- to_delete.insert(rec);
- }
- }
-
- gsl_rng_free(rng);
-
- return test_de;
-}
START_TEST(t_static_structure)
{
auto rng = gsl_rng_alloc(gsl_rng_mt19937);
size_t reccnt = 100000;
- auto test_de = new DE(100, 1000, 2);
+ auto test_de = new DE(recon, 100);
std::set<Rec> records;
std::set<Rec> to_delete;
diff --git a/tests/include/shard_standard.h b/tests/include/shard_standard.h
index de43edc..0b5ab00 100644
--- a/tests/include/shard_standard.h
+++ b/tests/include/shard_standard.h
@@ -77,7 +77,7 @@ START_TEST(t_shard_init)
auto shard2 = new Shard(mbuffer2->get_buffer_view());
auto shard3 = new Shard(mbuffer3->get_buffer_view());
- std::vector<Shard*> shards = {shard1, shard2, shard3};
+ std::vector<const Shard*> shards = {shard1, shard2, shard3};
auto shard4 = new Shard(shards);
ck_assert_int_eq(shard4->get_record_count(), n * 3);
@@ -130,7 +130,7 @@ START_TEST(t_full_cancelation)
ck_assert_int_eq(shard_ts->get_record_count(), n);
ck_assert_int_eq(shard_ts->get_tombstone_count(), n);
- std::vector<Shard *> shards = {shard, shard_ts};
+ std::vector<const Shard *> shards = {shard, shard_ts};
Shard* merged = new Shard(shards);
diff --git a/tests/include/shard_string.h b/tests/include/shard_string.h
index 2ef4cec..7a3d761 100644
--- a/tests/include/shard_string.h
+++ b/tests/include/shard_string.h
@@ -67,7 +67,7 @@ START_TEST(t_shard_init)
auto shard2 = new Shard(mbuffer2->get_buffer_view());
auto shard3 = new Shard(mbuffer3->get_buffer_view());
- std::vector<Shard*> shards = {shard1, shard2, shard3};
+ std::vector<const Shard*> shards = {shard1, shard2, shard3};
auto shard4 = new Shard(shards);
ck_assert_int_eq(shard4->get_record_count(), n * 3);