summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CMakeLists.txt5
-rw-r--r--include/framework/DynamicExtension.h10
-rw-r--r--include/framework/InternalLevel.h2
-rw-r--r--tests/dynamic_extension_tests.inc20
-rw-r--r--tests/internal_level_tests.cpp6
5 files changed, 22 insertions, 21 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9d73729..182e626 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,7 +6,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED True)
set(namespace "de")
project("Practical Dynamic Extension" VERSION 0.1.0)
-set(debug false)
+set(debug true)
set(tests True)
set(bench True)
@@ -78,8 +78,9 @@ if (tests)
target_include_directories(triespline_tests PRIVATE include external/PLEX/include)
add_executable(pgm_tests ${CMAKE_CURRENT_SOURCE_DIR}/tests/pgm_tests.cpp)
- target_link_libraries(pgm_tests PUBLIC gsl check subunit pthread)
+ target_link_libraries(pgm_tests PUBLIC gsl check subunit pthread gomp)
target_include_directories(pgm_tests PRIVATE include external/PGM-index/include)
+ target_compile_options(pgm_tests PUBLIC -fopenmp)
endif()
# Benchmark build instructions
diff --git a/include/framework/DynamicExtension.h b/include/framework/DynamicExtension.h
index 7565085..800bc85 100644
--- a/include/framework/DynamicExtension.h
+++ b/include/framework/DynamicExtension.h
@@ -145,11 +145,11 @@ public:
return result;
}
- size_t get_record_cnt() {
+ size_t get_record_count() {
size_t cnt = get_buffer()->get_record_count();
for (size_t i=0; i<m_levels.size(); i++) {
- if (m_levels[i]) cnt += m_levels[i]->get_record_cnt();
+ if (m_levels[i]) cnt += m_levels[i]->get_record_count();
}
return cnt;
@@ -209,7 +209,7 @@ public:
return m_buffer->get_capacity();
}
- Shard *create_ssi() {
+ Shard *create_static_structure() {
std::vector<Shard *> shards;
if (m_levels.size() > 0) {
@@ -477,7 +477,7 @@ private:
return (buffer) ? buffer->get_record_count() : get_buffer()->get_record_count();
}
- return (m_levels[idx]) ? m_levels[idx]->get_record_cnt() : 0;
+ return (m_levels[idx]) ? m_levels[idx]->get_record_count() : 0;
}
/*
@@ -493,7 +493,7 @@ private:
}
if (L == LayoutPolicy::LEVELING) {
- return m_levels[idx]->get_record_cnt() + incoming_rec_cnt <= calc_level_record_capacity(idx);
+ return m_levels[idx]->get_record_count() + incoming_rec_cnt <= calc_level_record_capacity(idx);
} else {
return m_levels[idx]->get_shard_count() < m_scale_factor;
}
diff --git a/include/framework/InternalLevel.h b/include/framework/InternalLevel.h
index ac013c0..8554392 100644
--- a/include/framework/InternalLevel.h
+++ b/include/framework/InternalLevel.h
@@ -140,7 +140,7 @@ public:
return m_shard_cnt;
}
- size_t get_record_cnt() {
+ size_t get_record_count() {
size_t cnt = 0;
for (size_t i=0; i<m_shard_cnt; i++) {
cnt += m_shards[i]->get_record_count();
diff --git a/tests/dynamic_extension_tests.inc b/tests/dynamic_extension_tests.inc
index f94a294..024f495 100644
--- a/tests/dynamic_extension_tests.inc
+++ b/tests/dynamic_extension_tests.inc
@@ -16,7 +16,7 @@ START_TEST(t_create)
ck_assert_ptr_nonnull(ext_wirs);
- ck_assert_int_eq(ext_wirs->get_record_cnt(), 0);
+ ck_assert_int_eq(ext_wirs->get_record_count(), 0);
ck_assert_int_eq(ext_wirs->get_height(), 0);
delete ext_wirs;
@@ -38,7 +38,7 @@ START_TEST(t_insert)
}
ck_assert_int_eq(ext_wirs->get_height(), 0);
- ck_assert_int_eq(ext_wirs->get_record_cnt(), 100);
+ ck_assert_int_eq(ext_wirs->get_record_count(), 100);
delete ext_wirs;
}
@@ -58,7 +58,7 @@ START_TEST(t_insert_with_mem_merges)
val++;
}
- ck_assert_int_eq(ext_wirs->get_record_cnt(), 300);
+ ck_assert_int_eq(ext_wirs->get_record_count(), 300);
ck_assert_int_eq(ext_wirs->get_height(), 1);
delete ext_wirs;
@@ -308,7 +308,7 @@ DE *create_test_tree(size_t reccnt, size_t memlevel_cnt) {
return ext_wirs;
}
-START_TEST(t_sorted_array)
+START_TEST(t_static_structure)
{
auto rng = gsl_rng_alloc(gsl_rng_mt19937);
@@ -339,7 +339,7 @@ START_TEST(t_sorted_array)
for (size_t i=0; i<del_vec.size(); i++) {
WRec dr = {del_vec[i].first, del_vec[i].second, 1};
- ext_wirs->erase(dr);
+ ck_assert_int_eq(ext_wirs->erase(dr), 1);
deletes++;
to_delete.erase(del_vec[i]);
deleted.insert(del_vec[i]);
@@ -351,7 +351,7 @@ START_TEST(t_sorted_array)
}
}
- auto flat = ext_wirs->create_ssi();
+ auto flat = ext_wirs->create_static_structure();
ck_assert_int_eq(flat->get_record_count(), reccnt - deletes);
uint64_t prev_key = 0;
@@ -376,12 +376,12 @@ Suite *unit_testing()
tcase_add_test(create, t_create);
suite_add_tcase(unit, create);
- TCase *insert = tcase_create("de::DynamicExtension::insert Testing");
+ TCase *insert = tcase_create("de::DynamicExtension<WIRS>::insert Testing");
tcase_add_test(insert, t_insert);
tcase_add_test(insert, t_insert_with_mem_merges);
suite_add_tcase(unit, insert);
- TCase *sampling = tcase_create("de::DynamicExtension::range_sample Testing");
+ TCase *sampling = tcase_create("de::DynamicExtension<WIRS>::range_sample Testing");
tcase_add_test(sampling, t_range_sample_weighted);
suite_add_tcase(unit, sampling);
@@ -396,8 +396,8 @@ Suite *unit_testing()
tcase_set_timeout(ts, 500);
suite_add_tcase(unit, ts);
- TCase *flat = tcase_create("de::DynamicExtension::get_flattened_wirs_run Testing");
- tcase_add_test(flat, t_sorted_array);
+ TCase *flat = tcase_create("de::DynamicExtension::create_static_structure Testing");
+ tcase_add_test(flat, t_static_structure);
tcase_set_timeout(flat, 500);
suite_add_tcase(unit, flat);
diff --git a/tests/internal_level_tests.cpp b/tests/internal_level_tests.cpp
index 1bbc458..9deb485 100644
--- a/tests/internal_level_tests.cpp
+++ b/tests/internal_level_tests.cpp
@@ -30,18 +30,18 @@ START_TEST(t_memlevel_merge)
auto base_level = new ILevel(1, 1);
base_level->append_buffer(tbl1);
- ck_assert_int_eq(base_level->get_record_cnt(), 100);
+ ck_assert_int_eq(base_level->get_record_count(), 100);
auto merging_level = new ILevel(0, 1);
merging_level->append_buffer(tbl2);
- ck_assert_int_eq(merging_level->get_record_cnt(), 100);
+ ck_assert_int_eq(merging_level->get_record_count(), 100);
auto old_level = base_level;
base_level = ILevel::merge_levels(old_level, merging_level);
delete old_level;
delete merging_level;
- ck_assert_int_eq(base_level->get_record_cnt(), 200);
+ ck_assert_int_eq(base_level->get_record_count(), 200);
delete base_level;
delete tbl1;