From 9fe305c7d28e993e55c55427f377ae7e3251ea4f Mon Sep 17 00:00:00 2001 From: "Douglas B. Rumbaugh" Date: Fri, 6 Dec 2024 13:13:51 -0500 Subject: Interface update (#5) * Query Interface Adjustments/Refactoring Began the process of adjusting the query interface (and also the shard interface, to a lesser degree) to better accommodate the user. In particular the following changes have been made, 1. The number of necessary template arguments for the query type has been drastically reduced, while also removing the void pointers and manual delete functions from the interface. This was accomplished by requiring many of the sub-types associated with a query (parameters, etc.) to be nested inside the main query class, and by forcing the SHARD type to expose its associated record type. 2. User-defined query return types are now supported. Queries no longer are required to return strictly sets of records. Instead, the query now has LocalResultType and ResultType template parameters (which can be defaulted using a typedef in the Query type itself), allowing much more flexibility. Note that, at least for the short term, the LocalResultType must still expose the same is_deleted/is_tombstone interface as a Wrapped used to, as this is currently needed for delete filtering. A better approach to this is, hopefully, forthcoming. 3. Updated the ISAMTree.h shard and rangequery.h query to use the new interfaces, and adjusted the associated unit tests as well. 4. Dropped the unnecessary "get_data()" function from the ShardInterface concept. 5. Dropped the need to specify a record type in the ShardInterface concept. This is now handled using a required Shard::RECORD member of the Shard class itself, which should expose the name of the record type. * Updates to framework to support new Query/Shard interfaces Pretty extensive adjustments to the framework, particularly to the templates themselves, along with some type-renaming work, to support the new query and shard interfaces. Adjusted the external query interface to take an rvalue reference, rather than a pointer, to the query parameters. * Removed framework-level delete filtering This was causing some issues with the new query interface, and should probably be reworked anyway, so I'm temporarily (TM) removing the feature. * Updated benchmarks + remaining code for new interface --- tests/alias_tests.cpp | 18 ++-- tests/de_bsm_tag.cpp | 61 ++++++++++++ tests/de_bsm_tomb.cpp | 5 +- tests/de_level_concurrent.cpp | 5 +- tests/de_level_tag.cpp | 5 +- tests/de_level_tomb.cpp | 5 +- tests/de_tier_concurrent.cpp | 6 +- tests/de_tier_tag.cpp | 5 +- tests/de_tier_tomb.cpp | 4 +- tests/include/concurrent_extension.h | 40 +++----- tests/include/dynamic_extension.h | 69 +++++++------ tests/include/irs.h | 165 +++++++++++++++++++++++++++++++ tests/include/pointlookup.h | 54 +++++------ tests/include/rangecount.h | 108 +++++++-------------- tests/include/rangequery.h | 59 ++++++------ tests/include/shard_standard.h | 1 - tests/include/shard_string.h | 1 - tests/include/testing.h | 10 +- tests/include/wirs.h | 182 ----------------------------------- tests/include/wss.h | 119 ++++++++--------------- tests/internal_level_tests.cpp | 2 +- tests/irs_tests.cpp | 55 +++++++++++ tests/mutable_buffer_tests.cpp | 3 - tests/vptree_tests.cpp | 19 ++-- tests/wss_tests.cpp | 56 +++++++++++ 25 files changed, 571 insertions(+), 486 deletions(-) create mode 100644 tests/de_bsm_tag.cpp create mode 100644 tests/include/irs.h delete mode 100644 tests/include/wirs.h create mode 100644 tests/irs_tests.cpp create mode 100644 tests/wss_tests.cpp (limited to 'tests') diff --git a/tests/alias_tests.cpp b/tests/alias_tests.cpp index 98d0c63..dcd3eec 100644 --- a/tests/alias_tests.cpp +++ b/tests/alias_tests.cpp @@ -1,7 +1,7 @@ /* - * tests/alias_tests.cpp + * tests/isam_tests.cpp * - * Unit tests for Alias shard + * Unit tests for ISAM Tree shard * * Copyright (C) 2023 Douglas Rumbaugh * Dong Xie @@ -11,27 +11,22 @@ */ #include "shard/Alias.h" -#include "query/wss.h" -#include "framework/structure/MutableBuffer.h" #include "include/testing.h" - - #include using namespace de; -typedef WRec R; +typedef WeightedRecord R; typedef Alias Shard; - #include "include/shard_standard.h" -#include "include/rangequery.h" +#include "include/wss.h" Suite *unit_testing() { - Suite *unit = suite_create("ISAMTree Shard Unit Testing"); + Suite *unit = suite_create("Walker's Alias Shard Unit Testing"); - inject_rangequery_tests(unit); + inject_wss_tests(unit); inject_shard_tests(unit); return unit; @@ -58,4 +53,3 @@ int main() return (unit_failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE; } - diff --git a/tests/de_bsm_tag.cpp b/tests/de_bsm_tag.cpp new file mode 100644 index 0000000..4063cfe --- /dev/null +++ b/tests/de_bsm_tag.cpp @@ -0,0 +1,61 @@ +/* + * tests/de_level_tomb.cpp + * + * Unit tests for Dynamic Extension Framework + * + * Copyright (C) 2023 Douglas Rumbaugh + * Dong Xie + * + * Distributed under the Modified BSD License. + * + */ +#include +#include +#include + +#include "include/testing.h" +#include "framework/DynamicExtension.h" +#include "shard/ISAMTree.h" +#include "query/rangequery.h" + +#include +using namespace de; + +typedef Rec R; +typedef ISAMTree S; +typedef rq::Query Q; + +typedef DynamicExtension DE; + +#include "include/dynamic_extension.h" + + +Suite *unit_testing() +{ + Suite *unit = suite_create("DynamicExtension: Tagging BSM Testing"); + inject_dynamic_extension_tests(unit); + + return unit; +} + + +int shard_unit_tests() +{ + int failed = 0; + Suite *unit = unit_testing(); + SRunner *unit_shardner = srunner_create(unit); + + srunner_run_all(unit_shardner, CK_NORMAL); + failed = srunner_ntests_failed(unit_shardner); + srunner_free(unit_shardner); + + return failed; +} + + +int main() +{ + int unit_failed = shard_unit_tests(); + + return (unit_failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE; +} diff --git a/tests/de_bsm_tomb.cpp b/tests/de_bsm_tomb.cpp index 493440e..3a24e87 100644 --- a/tests/de_bsm_tomb.cpp +++ b/tests/de_bsm_tomb.cpp @@ -22,7 +22,10 @@ using namespace de; typedef Rec R; -typedef DynamicExtension, rq::Query>, LayoutPolicy::BSM, DeletePolicy::TOMBSTONE, SerialScheduler> DE; +typedef ISAMTree S; +typedef rq::Query Q; + +typedef DynamicExtension DE; #include "include/dynamic_extension.h" diff --git a/tests/de_level_concurrent.cpp b/tests/de_level_concurrent.cpp index d1e0496..afd1af2 100644 --- a/tests/de_level_concurrent.cpp +++ b/tests/de_level_concurrent.cpp @@ -22,7 +22,10 @@ using namespace de; typedef Rec R; -typedef DynamicExtension, rq::Query>, LayoutPolicy::LEVELING, DeletePolicy::TOMBSTONE, FIFOScheduler> DE; +typedef ISAMTree S; +typedef rq::Query Q; + +typedef DynamicExtension DE; #include "include/concurrent_extension.h" diff --git a/tests/de_level_tag.cpp b/tests/de_level_tag.cpp index 75131c4..c175357 100644 --- a/tests/de_level_tag.cpp +++ b/tests/de_level_tag.cpp @@ -22,7 +22,10 @@ using namespace de; typedef Rec R; -typedef DynamicExtension, rq::Query>, LayoutPolicy::LEVELING, DeletePolicy::TAGGING, SerialScheduler> DE; +typedef ISAMTree S; +typedef rq::Query Q; + +typedef DynamicExtension DE; #include "include/dynamic_extension.h" diff --git a/tests/de_level_tomb.cpp b/tests/de_level_tomb.cpp index 6da211d..e587817 100644 --- a/tests/de_level_tomb.cpp +++ b/tests/de_level_tomb.cpp @@ -23,7 +23,10 @@ using namespace de; typedef Rec R; -typedef DynamicExtension, rq::Query>, LayoutPolicy::LEVELING, DeletePolicy::TOMBSTONE, SerialScheduler> DE; +typedef ISAMTree S; +typedef rq::Query Q; + +typedef DynamicExtension DE; #include "include/dynamic_extension.h" diff --git a/tests/de_tier_concurrent.cpp b/tests/de_tier_concurrent.cpp index bb2ec7f..ce41dbc 100644 --- a/tests/de_tier_concurrent.cpp +++ b/tests/de_tier_concurrent.cpp @@ -17,12 +17,16 @@ #include "framework/DynamicExtension.h" #include "shard/ISAMTree.h" #include "query/rangequery.h" +#include "framework/scheduling//FIFOScheduler.h" #include using namespace de; typedef Rec R; -typedef DynamicExtension, rq::Query>, LayoutPolicy::TEIRING, DeletePolicy::TOMBSTONE, FIFOScheduler> DE; +typedef ISAMTree S; +typedef rq::Query Q; + +typedef DynamicExtension DE; #include "include/concurrent_extension.h" diff --git a/tests/de_tier_tag.cpp b/tests/de_tier_tag.cpp index 79bb7bf..97a5299 100644 --- a/tests/de_tier_tag.cpp +++ b/tests/de_tier_tag.cpp @@ -23,7 +23,10 @@ using namespace de; typedef Rec R; -typedef DynamicExtension, rq::Query>, LayoutPolicy::TEIRING, DeletePolicy::TAGGING, SerialScheduler> DE; +typedef ISAMTree S; +typedef rq::Query Q; + +typedef DynamicExtension DE; #include "include/dynamic_extension.h" diff --git a/tests/de_tier_tomb.cpp b/tests/de_tier_tomb.cpp index b1387bb..930d0d5 100644 --- a/tests/de_tier_tomb.cpp +++ b/tests/de_tier_tomb.cpp @@ -23,7 +23,9 @@ using namespace de; typedef Rec R; -typedef DynamicExtension, rq::Query>, LayoutPolicy::TEIRING, DeletePolicy::TOMBSTONE, SerialScheduler> DE; +typedef ISAMTree S; +typedef rq::Query Q; +typedef DynamicExtension DE; #include "include/dynamic_extension.h" diff --git a/tests/include/concurrent_extension.h b/tests/include/concurrent_extension.h index 927a094..02bd694 100644 --- a/tests/include/concurrent_extension.h +++ b/tests/include/concurrent_extension.h @@ -22,17 +22,20 @@ * 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 - -//using namespace de; -//typedef DynamicExtension, rq::Query, R>, LayoutPolicy::LEVELING, DeletePolicy::TOMBSTONE, FIFOScheduler> DE; -*/ - +// #include "testing.h" +// #include "framework/DynamicExtension.h" +// //#include "framework/scheduling/FIFOScheduler.h" +// #include "shard/ISAMTree.h" +// #include "query/rangequery.h" +// #include +// #include +// #include + +// using namespace de; +// typedef Rec R; +// typedef ISAMTree S; +// typedef rq::Query Q; +// typedef DynamicExtension DE; //, FIFOScheduler> DE; START_TEST(t_create) { @@ -164,11 +167,11 @@ START_TEST(t_range_query) uint64_t lower_key = keys[idx]; uint64_t upper_key = keys[idx + 250]; - rq::Parms p; + Q::Parameters p; p.lower_bound = lower_key; p.upper_bound = upper_key; - auto result = test_de->query(&p); + auto result = test_de->query(std::move(p)); auto r = result.get(); std::sort(r.begin(), r.end()); @@ -203,8 +206,6 @@ START_TEST(t_tombstone_merging_01) records.insert({key, val}); } - size_t deletes = 0; - size_t cnt=0; for (auto rec : records) { R r = {rec.first, rec.second}; while (!test_de->insert(r)) { @@ -220,7 +221,6 @@ START_TEST(t_tombstone_merging_01) while (!test_de->erase(dr)) { _mm_pause(); } - deletes++; to_delete.erase(del_vec[i]); deleted.insert(del_vec[i]); } @@ -258,7 +258,6 @@ DE *create_test_tree(size_t reccnt, size_t memlevel_cnt) { records.insert({key, val}); } - size_t deletes = 0; for (auto rec : records) { ck_assert_int_eq(test_de->insert(rec), 1); @@ -268,7 +267,6 @@ DE *create_test_tree(size_t reccnt, size_t memlevel_cnt) { for (size_t i=0; ierase(del_vec[i]); - deletes++; to_delete.erase(del_vec[i]); deleted.insert(del_vec[i]); } @@ -304,15 +302,10 @@ START_TEST(t_static_structure) records.insert({key, val}); } - size_t deletes = 0; - size_t t_reccnt = 0; - size_t k=0; for (auto rec : records) { - k++; while (!test_de->insert(rec)) { _mm_pause(); } - t_reccnt++; if (gsl_rng_uniform(rng) < 0.05 && !to_delete.empty()) { std::vector del_vec; @@ -323,7 +316,6 @@ START_TEST(t_static_structure) _mm_pause(); } - deletes++; to_delete.erase(del_vec[i]); deleted.insert(del_vec[i]); } diff --git a/tests/include/dynamic_extension.h b/tests/include/dynamic_extension.h index 6e9b16c..90c6906 100644 --- a/tests/include/dynamic_extension.h +++ b/tests/include/dynamic_extension.h @@ -22,18 +22,24 @@ * 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/SerialScheduler.h" -#include "shard/ISAMTree.h" -#include "query/rangequery.h" -#include -using namespace de; -typedef DynamicExtension, rq::Query, R>, LayoutPolicy::TEIRING, DeletePolicy::TAGGING, SerialScheduler> DE; -*/ + +// #include "testing.h" +// #include "framework/DynamicExtension.h" +// #include "framework/scheduling/SerialScheduler.h" +// #include "shard/ISAMTree.h" +// #include "query/rangequery.h" +// #include +// #include +// #include + +// using namespace de; +// typedef Rec R; +// typedef ISAMTree S; +// typedef rq::Query Q; +// typedef DynamicExtension DE; +#include "framework/util/Configuration.h" START_TEST(t_create) { auto test_de = new DE(100, 1000, 2); @@ -103,7 +109,16 @@ START_TEST(t_insert_with_mem_merges) test_de->await_next_epoch(); ck_assert_int_eq(test_de->get_record_count(), 300); - ck_assert_int_eq(test_de->get_height(), 1); + + /* + * BSM grows on every flush, so the height will be different than + * normal layout policies + */ + if (test_de->Layout == de::LayoutPolicy::BSM) { + ck_assert_int_eq(test_de->get_height(), 2); + } else { + ck_assert_int_eq(test_de->get_height(), 1); + } delete test_de; } @@ -138,11 +153,12 @@ START_TEST(t_range_query) uint64_t lower_key = keys[idx]; uint64_t upper_key = keys[idx + 250]; - rq::Parms p; + Q::Parameters p; + p.lower_bound = lower_key; p.upper_bound = upper_key; - auto result = test_de->query(&p); + auto result = test_de->query(std::move(p)); auto r = result.get(); std::sort(r.begin(), r.end()); ck_assert_int_eq(r.size(), 251); @@ -176,8 +192,6 @@ START_TEST(t_tombstone_merging_01) records.insert({key, val}); } - size_t deletes = 0; - size_t cnt=0; for (auto rec : records) { R r = {rec.first, rec.second}; ck_assert_int_eq(test_de->insert(r), 1); @@ -189,7 +203,6 @@ START_TEST(t_tombstone_merging_01) for (size_t i=0; ierase(dr); - deletes++; to_delete.erase(del_vec[i]); deleted.insert(del_vec[i]); } @@ -209,14 +222,14 @@ START_TEST(t_tombstone_merging_01) } END_TEST -DE *create_test_tree(size_t reccnt, size_t memlevel_cnt) { +[[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 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(); @@ -227,17 +240,15 @@ DE *create_test_tree(size_t reccnt, size_t memlevel_cnt) { records.insert({key, val}); } - size_t deletes = 0; 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 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; ierase(del_vec[i]); - deletes++; to_delete.erase(del_vec[i]); deleted.insert(del_vec[i]); } @@ -260,9 +271,9 @@ START_TEST(t_static_structure) size_t reccnt = 100000; auto test_de = new DE(100, 1000, 2); - 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(); @@ -274,15 +285,11 @@ START_TEST(t_static_structure) } size_t deletes = 0; - size_t t_reccnt = 0; - size_t k=0; for (auto rec : records) { - k++; ck_assert_int_eq(test_de->insert(rec), 1); - t_reccnt++; if (gsl_rng_uniform(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; i + * + * Distributed under the Modified BSD License. + * + * WARNING: This file must be included in the main unit test set + * after the definition of an appropriate Shard and R + * type. In particular, R needs to implement the key-value + * pair interface and Shard needs to support lower_bound. + * For other types of record and shard, you'll need to + * use a different set of unit tests. + */ +#pragma once + +#include "query/irs.h" +#include + +/* + * Uncomment these lines temporarily to remove errors in this file + * temporarily for development purposes. They should be removed prior + * to building, to ensure no duplicate definitions. These includes/defines + * should be included in the source file that includes this one, above the + * include statement. + */ +#include "shard/ISAMTree.h" +#include "query/irs.h" +#include "testing.h" +#include +#include +using namespace de; + +typedef Rec R; +typedef ISAMTree Shard; +typedef irs::Query> Query; + +static gsl_rng *g_rng; + +START_TEST(t_irs) +{ + auto buffer = create_sequential_mbuffer(100, 1000); + auto shard = Shard(buffer->get_buffer_view()); + + size_t k = 5; + irs::Query::Parameters parms; + parms.lower_bound = 300; + parms.upper_bound = 500; + parms.sample_size = k; + parms.rng = g_rng; + + auto local_query = irs::Query::local_preproc(&shard, &parms); + irs::Query::distribute_query(&parms, {local_query}, nullptr); + + auto result = irs::Query::local_query(&shard, local_query); + delete local_query; + + ck_assert_int_eq(result.size(), k); + for (size_t i=0; i(100, 1000); + + size_t k = 5; + irs::Query::Parameters parms; + parms.lower_bound = 300; + parms.upper_bound = 500; + parms.sample_size = k; + parms.rng = g_rng; + + { + auto view = buffer->get_buffer_view(); + auto query = irs::Query::local_preproc_buffer(&view, &parms); + irs::Query::distribute_query(&parms, {}, query); + auto result = irs::Query::local_query_buffer(query); + delete query; + + ck_assert_int_le(result.size(), k); + for (size_t i=0; i(100, 200); + auto buffer2 = create_sequential_mbuffer(400, 1000); + + auto shard1 = Shard(buffer1->get_buffer_view()); + auto shard2 = Shard(buffer2->get_buffer_view()); + + size_t k = 10; + irs::Query::Parameters parms; + parms.lower_bound = 150; + parms.upper_bound = 500; + parms.sample_size = k; + parms.rng = g_rng; + + /* necessary to store the alias structure */ + auto dummy_buffer_query = irs::Query::LocalQueryBuffer(); + dummy_buffer_query.buffer = nullptr; + dummy_buffer_query.sample_size = 0; + dummy_buffer_query.cutoff = 0; + dummy_buffer_query.global_parms = parms; + dummy_buffer_query.records = {}; + dummy_buffer_query.alias = nullptr; + + auto query1 = irs::Query::local_preproc(&shard1, &parms); + auto query2 = irs::Query::local_preproc(&shard2, &parms); + + irs::Query::distribute_query(&parms, {query1, query2}, &dummy_buffer_query); + + std::vector::LocalResultType>> results(2); + results[0] = irs::Query::local_query(&shard1, query1); + results[1] = irs::Query::local_query(&shard2, query2); + delete query1; + delete query2; + + ck_assert_int_eq(results[0].size() + results[1].size(), k); + + std::vector>> proc_results; + + for (size_t j=0; j>()); + for (size_t i=0; i::ResultType> result; + irs::Query::combine(proc_results, nullptr, result); + ck_assert_int_eq(result.size(), k); + + delete buffer1; + delete buffer2; +} +END_TEST + +static void inject_irs_tests(Suite *suite) { + g_rng = gsl_rng_alloc(gsl_rng_mt19937); + + TCase *irs = tcase_create("Independent Range Sampling Query Testing"); + tcase_add_test(irs, t_irs); + tcase_add_test(irs, t_buffer_irs); + tcase_add_test(irs, t_irs_merge); + suite_add_tcase(suite, irs); +} diff --git a/tests/include/pointlookup.h b/tests/include/pointlookup.h index 71a1099..af58440 100644 --- a/tests/include/pointlookup.h +++ b/tests/include/pointlookup.h @@ -17,6 +17,8 @@ */ #pragma once +#include "query/pointlookup.h" + /* * Uncomment these lines temporarily to remove errors in this file * temporarily for development purposes. They should be removed prior @@ -25,15 +27,12 @@ * include statement. */ -//#include "shard/FSTrie.h" -#include "query/pointlookup.h" +#include "shard/FSTrie.h" #include "testing.h" - #include - using namespace de; -//typedef StringRec R; -//typedef FSTrie Shard; +typedef StringRec R; +typedef FSTrie Shard; START_TEST(t_point_lookup_query) { @@ -45,23 +44,21 @@ START_TEST(t_point_lookup_query) for (size_t i=0; irec.key; - pl::Parms parms = {key}; - auto state = pl::Query::get_query_state(&shard, &parms); - auto result = pl::Query::query(&shard, state, &parms); - pl::Query::delete_query_state(state); - + pl::Query::Parameters parms = {key}; + auto local_query = pl::Query::local_preproc(&shard, &parms); + auto result = pl::Query::local_query(&shard,local_query); + delete local_query; ck_assert_int_eq(result.size(), 1); - //ck_assert_str_eq(result[0].rec.key, key); - //ck_assert_int_eq(result[0].rec.value, bv.get(i)->rec.value); + ck_assert_str_eq(result[0].rec.key, key); + ck_assert_int_eq(result[0].rec.value, bv.get(i)->rec.value); } /* point lookup miss; result size should be 0 */ const char *c = "computer"; - pl::Parms parms = {c}; - - auto state = pl::Query::get_query_state(&shard, &parms); - auto result = pl::Query::query(&shard, state, &parms); - pl::Query::delete_query_state(state); + pl::Query::Parameters parms = {c}; + auto local_query = pl::Query::local_preproc(&shard, &parms); + auto result = pl::Query::local_query(&shard,local_query); + delete local_query; ck_assert_int_eq(result.size(), 0); } @@ -78,24 +75,21 @@ START_TEST(t_buffer_point_lookup) { auto view = buffer->get_buffer_view(); for (int i=view.get_record_count()-1; i>=0; i--) { - pl::Parms parms = {view.get(i)->rec.key}; - - auto state = pl::Query::get_buffer_query_state(&view, &parms); - auto result = pl::Query::buffer_query(state, &parms); - pl::Query::delete_buffer_query_state(state); + pl::Query::Parameters parms = {view.get(i)->rec.key}; + auto local_query = pl::Query::local_preproc_buffer(&view, &parms); + auto result = pl::Query::local_query_buffer(local_query); + delete local_query; ck_assert_int_eq(result.size(), 1); - //ck_assert_str_eq(result[0].rec.key, view.get(i)->rec.key); - //ck_assert_int_eq(result[0].rec.value, view.get(i)->rec.value); + ck_assert_str_eq(result[0].rec.key, view.get(i)->rec.key); + ck_assert_int_eq(result[0].rec.value, view.get(i)->rec.value); } /* point lookup miss; result size should be 0 */ const char *c = "computer"; - pl::Parms parms = {c}; - - auto state = pl::Query::get_buffer_query_state(&view, &parms); - auto result = pl::Query::buffer_query(state, &parms); - pl::Query::delete_buffer_query_state(state); + pl::Query::Parameters parms = {c}; + auto local_query = pl::Query::local_preproc_buffer(&view, &parms); + auto result = pl::Query::local_query_buffer(local_query); ck_assert_int_eq(result.size(), 0); } diff --git a/tests/include/rangecount.h b/tests/include/rangecount.h index 1951221..22189b9 100644 --- a/tests/include/rangecount.h +++ b/tests/include/rangecount.h @@ -1,5 +1,5 @@ /* - * tests/include/rangecount.h + * tests/include/rangequery.h * * Standardized unit tests for range queries against supporting * shard types @@ -17,6 +17,9 @@ */ #pragma once +#include "query/rangecount.h" +#include + /* * Uncomment these lines temporarily to remove errors in this file * temporarily for development purposes. They should be removed prior @@ -24,30 +27,29 @@ * should be included in the source file that includes this one, above the * include statement. */ -//#include "shard/ISAMTree.h" -//#include "query/rangecount.h" -//#include "testing.h" -//#include -//using namespace de; -//typedef ISAMTree Shard; - +// #include "shard/ISAMTree.h" +// #include "query/rangequery.h" +// #include "testing.h" +// #include +// using namespace de; -#include "query/rangecount.h" +// typedef Rec R; +// typedef ISAMTree Shard; +// typedef rc::Query> Query; START_TEST(t_range_count) { - auto buffer = create_sequential_mbuffer(100, 1000); auto shard = Shard(buffer->get_buffer_view()); - rc::Parms parms = {300, 500}; + rc::Query::Parameters parms = {300, 500}; - auto state = rc::Query::get_query_state(&shard, &parms); - auto result = rc::Query::query(&shard, state, &parms); - rc::Query::delete_query_state(state); + auto local_query = rc::Query::local_preproc(&shard, &parms); + + auto result = rc::Query::local_query(&shard, local_query); + delete local_query; - ck_assert_int_eq(result.size(), 1); - ck_assert_int_eq(result[0].rec.key, parms.upper_bound - parms.lower_bound + 1); + ck_assert_int_eq(result[0].record_count - result[0].tombstone_count, parms.upper_bound - parms.lower_bound + 1); delete buffer; } @@ -58,16 +60,15 @@ START_TEST(t_buffer_range_count) { auto buffer = create_sequential_mbuffer(100, 1000); - rc::Parms parms = {300, 500}; + rc::Query::Parameters parms = {300, 500}; { auto view = buffer->get_buffer_view(); - auto state = rc::Query::get_buffer_query_state(&view, &parms); - auto result = rc::Query::buffer_query(state, &parms); - rc::Query::delete_buffer_query_state(state); + auto query = rc::Query::local_preproc_buffer(&view, &parms); + auto result = rc::Query::local_query_buffer(query); + delete query; - ck_assert_int_eq(result.size(), 1); - ck_assert_int_eq(result[0].rec.key, parms.upper_bound - parms.lower_bound + 1); + ck_assert_int_eq(result[0].record_count - result[0].tombstone_count, parms.upper_bound - parms.lower_bound + 1); } delete buffer; @@ -83,66 +84,31 @@ START_TEST(t_range_count_merge) auto shard1 = Shard(buffer1->get_buffer_view()); auto shard2 = Shard(buffer2->get_buffer_view()); - rc::Parms parms = {150, 500}; + rc::Query::Parameters parms = {150, 500}; size_t result_size = parms.upper_bound - parms.lower_bound + 1 - 200; - auto state1 = rc::Query::get_query_state(&shard1, &parms); - auto state2 = rc::Query::get_query_state(&shard2, &parms); - - std::vector>> results(2); - results[0] = rc::Query::query(&shard1, state1, &parms); - results[1] = rc::Query::query(&shard2, state2, &parms); - - rc::Query::delete_query_state(state1); - rc::Query::delete_query_state(state2); + auto query1 = rc::Query::local_preproc(&shard1, &parms); + auto query2 = rc::Query::local_preproc(&shard2, &parms); - ck_assert_int_eq(results[0].size(), 1); - ck_assert_int_eq(results[1].size(), 1); + std::vector::LocalResultType>> results(2); + results[0] = rc::Query::local_query(&shard1, query1); + results[1] = rc::Query::local_query(&shard2, query2); + delete query1; + delete query2; - std::vector result; - rc::Query::merge(results, nullptr, result); + size_t reccnt = results[0][0].record_count + results[1][0].record_count; + size_t tscnt = results[0][0].tombstone_count + results[1][0].tombstone_count; - ck_assert_int_eq(result[0].key, result_size); - - delete buffer1; - delete buffer2; -} -END_TEST + ck_assert_int_eq(reccnt - tscnt, result_size); + std::vector::ResultType> result; + rc::Query::combine(results, nullptr, result); -START_TEST(t_lower_bound) -{ - auto buffer1 = create_sequential_mbuffer(100, 200); - auto buffer2 = create_sequential_mbuffer(400, 1000); - - auto shard1 = new Shard(buffer1->get_buffer_view()); - auto shard2 = new Shard(buffer2->get_buffer_view()); - - std::vector shards = {shard1, shard2}; - - auto merged = Shard(shards); - - for (uint32_t i=100; i<1000; i++) { - R r = R{i, i}; - - auto idx = merged.get_lower_bound(i); - - assert(idx < merged.get_record_count()); - - auto res = merged.get_record_at(idx); - - if (i >=200 && i <400) { - ck_assert_int_lt(res->rec.key, i); - } else { - ck_assert_int_eq(res->rec.key, i); - } - } + ck_assert_int_eq(result[0], result_size); delete buffer1; delete buffer2; - delete shard1; - delete shard2; } END_TEST diff --git a/tests/include/rangequery.h b/tests/include/rangequery.h index f90e107..5c3c1d6 100644 --- a/tests/include/rangequery.h +++ b/tests/include/rangequery.h @@ -17,6 +17,9 @@ */ #pragma once +#include "query/rangequery.h" +#include + /* * Uncomment these lines temporarily to remove errors in this file * temporarily for development purposes. They should be removed prior @@ -24,26 +27,27 @@ * should be included in the source file that includes this one, above the * include statement. */ -//#include "shard/ISAMTree.h" -//#include "query/rangequery.h" -//#include "testing.h" -//#include -//using namespace de; -//typedef ISAMTree Shard; - -#include "query/rangequery.h" +// #include "shard/ISAMTree.h" +// #include "query/rangequery.h" +// #include "testing.h" +// #include +// using namespace de; +// typedef Rec R; +// typedef ISAMTree Shard; +// typedef rq::Query> Query; START_TEST(t_range_query) { auto buffer = create_sequential_mbuffer(100, 1000); auto shard = Shard(buffer->get_buffer_view()); - rq::Parms parms = {300, 500}; + rq::Query::Parameters parms = {300, 500}; - auto state = rq::Query::get_query_state(&shard, &parms); - auto result = rq::Query::query(&shard, state, &parms); - rq::Query::delete_query_state(state); + auto local_query = rq::Query::local_preproc(&shard, &parms); + + auto result = rq::Query::local_query(&shard, local_query); + delete local_query; ck_assert_int_eq(result.size(), parms.upper_bound - parms.lower_bound + 1); for (size_t i=0; i(100, 1000); - rq::Parms parms = {300, 500}; + rq::Query::Parameters parms = {300, 500}; { auto view = buffer->get_buffer_view(); - auto state = rq::Query::get_buffer_query_state(&view, &parms); - auto result = rq::Query::buffer_query(state, &parms); - rq::Query::delete_buffer_query_state(state); + auto query = rq::Query::local_preproc_buffer(&view, &parms); + auto result = rq::Query::local_query_buffer(query); + delete query; ck_assert_int_eq(result.size(), parms.upper_bound - parms.lower_bound + 1); for (size_t i=0; iget_buffer_view()); auto shard2 = Shard(buffer2->get_buffer_view()); - rq::Parms parms = {150, 500}; + rq::Query::Parameters parms = {150, 500}; size_t result_size = parms.upper_bound - parms.lower_bound + 1 - 200; - auto state1 = rq::Query::get_query_state(&shard1, &parms); - auto state2 = rq::Query::get_query_state(&shard2, &parms); - - std::vector>> results(2); - results[0] = rq::Query::query(&shard1, state1, &parms); - results[1] = rq::Query::query(&shard2, state2, &parms); + auto query1 = rq::Query::local_preproc(&shard1, &parms); + auto query2 = rq::Query::local_preproc(&shard2, &parms); - rq::Query::delete_query_state(state1); - rq::Query::delete_query_state(state2); + std::vector::LocalResultType>> results(2); + results[0] = rq::Query::local_query(&shard1, query1); + results[1] = rq::Query::local_query(&shard2, query2); + delete query1; + delete query2; ck_assert_int_eq(results[0].size() + results[1].size(), result_size); @@ -113,8 +116,8 @@ START_TEST(t_range_query_merge) } } - std::vector result; - rq::Query::merge(proc_results, nullptr, result); + std::vector::ResultType> result; + rq::Query::combine(proc_results, nullptr, result); std::sort(result.begin(), result.end()); ck_assert_int_eq(result.size(), result_size); @@ -145,8 +148,6 @@ START_TEST(t_lower_bound) auto merged = Shard(shards); for (uint32_t i=100; i<1000; i++) { - R r = R{i, i}; - auto idx = merged.get_lower_bound(i); assert(idx < merged.get_record_count()); diff --git a/tests/include/shard_standard.h b/tests/include/shard_standard.h index 2809d74..ece2a57 100644 --- a/tests/include/shard_standard.h +++ b/tests/include/shard_standard.h @@ -75,7 +75,6 @@ START_TEST(t_shard_init) ck_assert_int_eq(shard4->get_record_count(), n * 3); ck_assert_int_eq(shard4->get_tombstone_count(), 0); - size_t total_cnt = 0; size_t shard1_idx = 0; size_t shard2_idx = 0; size_t shard3_idx = 0; diff --git a/tests/include/shard_string.h b/tests/include/shard_string.h index 881f41a..2ef4cec 100644 --- a/tests/include/shard_string.h +++ b/tests/include/shard_string.h @@ -73,7 +73,6 @@ START_TEST(t_shard_init) ck_assert_int_eq(shard4->get_record_count(), n * 3); ck_assert_int_eq(shard4->get_tombstone_count(), 0); - size_t total_cnt = 0; size_t shard1_idx = 0; size_t shard2_idx = 0; size_t shard3_idx = 0; diff --git a/tests/include/testing.h b/tests/include/testing.h index d0bff2d..33cbb3f 100644 --- a/tests/include/testing.h +++ b/tests/include/testing.h @@ -34,7 +34,7 @@ static std::string summa_wordlist = "tests/data/summa-wordlist.txt"; static std::vector> string_data; -static std::vector read_string_data(std::string fname, size_t n) { +[[maybe_unused]] static std::vector read_string_data(std::string fname, size_t n) { std::vector vec; vec.reserve(n); string_data.reserve(n); @@ -50,14 +50,14 @@ static std::vector read_string_data(std::string fname, size_t n) { std::string field; std::getline(ls, field, '\t'); - auto val = atol(field.c_str()); + uint64_t val = atol(field.c_str()); std::getline(ls, field, '\n'); char *c = strdup(field.c_str()); string_data.push_back(std::unique_ptr(c)); - StringRec r(string_data[string_data.size() -1].get(), val, field.size()); + StringRec r{string_data[string_data.size() -1].get(), val, field.size()}; vec.push_back(r); } @@ -76,7 +76,7 @@ std::vector strip_wrapping(std::vector> vec) { return out; } -static bool initialize_test_file(std::string fname, size_t page_cnt) +[[maybe_unused]] static bool initialize_test_file(std::string fname, size_t page_cnt) { auto flags = O_RDWR | O_CREAT | O_TRUNC; mode_t mode = 0640; @@ -113,7 +113,7 @@ error: return 0; } -static bool roughly_equal(int n1, int n2, size_t mag, double epsilon) { +[[maybe_unused]] static bool roughly_equal(int n1, int n2, size_t mag, double epsilon) { return ((double) std::abs(n1 - n2) / (double) mag) < epsilon; } diff --git a/tests/include/wirs.h b/tests/include/wirs.h deleted file mode 100644 index 4c0630f..0000000 --- a/tests/include/wirs.h +++ /dev/null @@ -1,182 +0,0 @@ -/* - * tests/include/rangequery.h - * - * Standardized unit tests for range queries against supporting - * shard types - * - * Copyright (C) 2023 Douglas Rumbaugh - * - * Distributed under the Modified BSD License. - * - * WARNING: This file must be included in the main unit test set - * after the definition of an appropriate Shard and R - * type. In particular, R needs to implement the key-value - * pair interface and Shard needs to support lower_bound. - * For other types of record and shard, you'll need to - * use a different set of unit tests. - */ -#pragma once - -/* - * Uncomment these lines temporarily to remove errors in this file - * temporarily for development purposes. They should be removed prior - * to building, to ensure no duplicate definitions. These includes/defines - * should be included in the source file that includes this one, above the - * include statement. - */ -//#include "shard/ISAMTree.h" -//#include "query/rangequery.h" -//#include "testing.h" -//#include -//using namespace de; -//typedef ISAMTree Shard; - - -START_TEST(t_range_query) -{ - auto buffer = create_sequential_mbuffer(100, 1000); - auto shard = Shard(buffer->get_buffer_view()); - - rq::Parms parms; - parms.lower_bound = 300; - parms.upper_bound = 500; - - auto state = rq::Query::get_query_state(&shard, &parms); - auto result = rq::Query::query(&shard, state, &parms); - rq::Query::delete_query_state(state); - - ck_assert_int_eq(result.size(), parms.upper_bound - parms.lower_bound + 1); - for (size_t i=0; i(100, 1000); - - rq::Parms parms; - parms.lower_bound = 300; - parms.upper_bound = 500; - - { - auto view = buffer->get_buffer_view(); - auto state = rq::Query::get_buffer_query_state(&view, &parms); - auto result = rq::Query::buffer_query(state, &parms); - rq::Query::delete_buffer_query_state(state); - - ck_assert_int_eq(result.size(), parms.upper_bound - parms.lower_bound + 1); - for (size_t i=0; i(100, 200); - auto buffer2 = create_sequential_mbuffer(400, 1000); - - auto shard1 = Shard(buffer1->get_buffer_view()); - auto shard2 = Shard(buffer2->get_buffer_view()); - - rq::Parms parms; - parms.lower_bound = 150; - parms.upper_bound = 500; - - size_t result_size = parms.upper_bound - parms.lower_bound + 1 - 200; - - auto state1 = rq::Query::get_query_state(&shard1, &parms); - auto state2 = rq::Query::get_query_state(&shard2, &parms); - - std::vector>> results(2); - results[0] = rq::Query::query(&shard1, state1, &parms); - results[1] = rq::Query::query(&shard2, state2, &parms); - - rq::Query::delete_query_state(state1); - rq::Query::delete_query_state(state2); - - ck_assert_int_eq(results[0].size() + results[1].size(), result_size); - - std::vector>> proc_results; - - for (size_t j=0; j>()); - for (size_t i=0; i result; - rq::Query::merge(proc_results, nullptr, result); - std::sort(result.begin(), result.end()); - - ck_assert_int_eq(result.size(), result_size); - auto key = parms.lower_bound; - for (size_t i=0; i(100, 200); - auto buffer2 = create_sequential_mbuffer(400, 1000); - - auto shard1 = new Shard(buffer1->get_buffer_view()); - auto shard2 = new Shard(buffer2->get_buffer_view()); - - std::vector shards = {shard1, shard2}; - - auto merged = Shard(shards); - - for (size_t i=100; i<1000; i++) { - R r; - r.key = i; - r.value = i; - - auto idx = merged.get_lower_bound(i); - - assert(idx < merged.get_record_count()); - - auto res = merged.get_record_at(idx); - - if (i >=200 && i <400) { - ck_assert_int_lt(res->rec.key, i); - } else { - ck_assert_int_eq(res->rec.key, i); - } - } - - delete buffer1; - delete buffer2; - delete shard1; - delete shard2; -} -END_TEST - -static void inject_rangequery_tests(Suite *suite) { - TCase *range_query = tcase_create("Range Query Testing"); - tcase_add_test(range_query, t_range_query); - tcase_add_test(range_query, t_buffer_range_query); - tcase_add_test(range_query, t_range_query_merge); - suite_add_tcase(suite, range_query); -} diff --git a/tests/include/wss.h b/tests/include/wss.h index f0ac74c..01327d2 100644 --- a/tests/include/wss.h +++ b/tests/include/wss.h @@ -1,10 +1,10 @@ /* - * tests/include/rangequery.h + * tests/include/wss.h * - * Standardized unit tests for range queries against supporting + * Standardized unit tests for weighted set sampling against supporting * shard types * - * Copyright (C) 2023 Douglas Rumbaugh + * Copyright (C) 2023-2024 Douglas Rumbaugh * * Distributed under the Modified BSD License. * @@ -17,6 +17,8 @@ */ #pragma once +#include "query/wss.h" + /* * Uncomment these lines temporarily to remove errors in this file * temporarily for development purposes. They should be removed prior @@ -24,28 +26,38 @@ * should be included in the source file that includes this one, above the * include statement. */ -#include "shard/Alias.h" -#include "testing.h" -#include -using namespace de; -typedef Alias Shard; +// #include "framework/interface/Record.h" +// #include "shard/Alias.h" +// #include "testing.h" +// #include -#include "query/wss.h" +// using namespace de; + +// typedef WeightedRecord R; +// typedef Alias Shard; + +typedef wss::Query Q; START_TEST(t_wss_query) { auto buffer = create_weighted_mbuffer(1000); auto shard = Shard(buffer->get_buffer_view()); - auto rng = gsl_rng_alloc(gsl_rng_mt19937); - wss::Parms parms; + size_t k = 20; + + Q::Parameters parms; parms.rng = rng; - parms.sample_size = 20; + parms.sample_size = k; + + auto query = Q::local_preproc(&shard, &parms); + Q::distribute_query(&parms, {query}, nullptr); + + auto result = Q::local_query(&shard, query); + delete query; + + ck_assert_int_eq(result.size(), k); - auto state = wss::Query::get_query_state(&shard, &parms); - auto result = wss::Query::query(&shard, state, &parms); - wss::Query::delete_query_state(state); delete buffer; gsl_rng_free(rng); @@ -56,83 +68,28 @@ END_TEST START_TEST(t_buffer_wss_query) { auto buffer = create_weighted_mbuffer(1000); - - auto rng = gsl_rng_alloc(gsl_rng_mt19937); - wss::Parms parms; + size_t k = 20; + + Q::Parameters parms; parms.rng = rng; + parms.sample_size = k; { auto view = buffer->get_buffer_view(); - auto state = wss::Query::get_buffer_query_state(&view, &parms); - auto result = wss::Query::buffer_query(state, &parms); - wss::Query::delete_buffer_query_state(state); - - ck_assert_int_eq(result.size(), parms.sample_size); - for (size_t i=0; i(100, 200); - auto buffer2 = create_sequential_mbuffer(400, 1000); - - auto shard1 = Shard(buffer1->get_buffer_view()); - auto shard2 = Shard(buffer2->get_buffer_view()); - - wss::Parms parms; - parms.lower_bound = 150; - parms.upper_bound = 500; - - size_t result_size = parms.upper_bound - parms.lower_bound + 1 - 200; - - auto state1 = wss::Query::get_query_state(&shard1, &parms); - auto state2 = wss::Query::get_query_state(&shard2, &parms); - - std::vector>> results(2); - results[0] = wss::Query::query(&shard1, state1, &parms); - results[1] = wss::Query::query(&shard2, state2, &parms); - - wss::Query::delete_query_state(state1); - wss::Query::delete_query_state(state2); - - ck_assert_int_eq(results[0].size() + results[1].size(), result_size); - - std::vector>> proc_results; - - for (size_t j=0; j>()); - for (size_t i=0; i::merge(proc_results, nullptr); - std::sort(result.begin(), result.end()); - - ck_assert_int_eq(result.size(), result_size); - auto key = parms.lower_bound; - for (size_t i=0; i, rq::Query>> ILevel; +typedef InternalLevel, rq::Query>> ILevel; START_TEST(t_memlevel_merge) { diff --git a/tests/irs_tests.cpp b/tests/irs_tests.cpp new file mode 100644 index 0000000..6ef03f4 --- /dev/null +++ b/tests/irs_tests.cpp @@ -0,0 +1,55 @@ +/* + * tests/rangequery_tests.cpp + * + * Unit tests for Range Queries across several different + * shards + * + * Copyright (C) 2023 Douglas Rumbaugh + * Dong Xie + * + * Distributed under the Modified BSD License. + * + */ + +#include "shard/ISAMTree.h" +#include "query/rangequery.h" +#include "include/testing.h" + +#include + +using namespace de; + +typedef Rec R; +typedef ISAMTree Shard; + +#include "include/irs.h" + +Suite *unit_testing() +{ + Suite *unit = suite_create("Independent Range Sampling Query Testing"); + inject_irs_tests(unit); + + return unit; +} + +int shard_unit_tests() +{ + int failed = 0; + Suite *unit = unit_testing(); + SRunner *unit_shardner = srunner_create(unit); + + srunner_run_all(unit_shardner, CK_NORMAL); + failed = srunner_ntests_failed(unit_shardner); + srunner_free(unit_shardner); + + return failed; +} + + +int main() +{ + int unit_failed = shard_unit_tests(); + gsl_rng_free(g_rng); + + return (unit_failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE; +} diff --git a/tests/mutable_buffer_tests.cpp b/tests/mutable_buffer_tests.cpp index 26057a2..c3e1b34 100644 --- a/tests/mutable_buffer_tests.cpp +++ b/tests/mutable_buffer_tests.cpp @@ -323,13 +323,11 @@ START_TEST(t_bview_delete) /* insert 75 records and get tail when LWM is exceeded */ size_t new_head = 0; Rec rec = {1, 1}; - size_t cnt = 0; for (size_t i=0; i<75; i++) { ck_assert_int_eq(buffer->append(rec), 1); rec.key++; rec.value++; - cnt++; if (buffer->is_at_low_watermark() && new_head == 0) { new_head = buffer->get_tail(); @@ -343,7 +341,6 @@ START_TEST(t_bview_delete) rec.key++; rec.value++; - cnt++; } Rec dr1 = {67, 67}; diff --git a/tests/vptree_tests.cpp b/tests/vptree_tests.cpp index ff99ba6..faa704f 100644 --- a/tests/vptree_tests.cpp +++ b/tests/vptree_tests.cpp @@ -20,6 +20,8 @@ using namespace de; typedef PRec R; typedef VPTree Shard; +typedef knn::Query Q; + START_TEST(t_mbuffer_init) { @@ -123,15 +125,15 @@ START_TEST(t_buffer_query) target.data[0] = 120; target.data[1] = 120; - knn::Parms p; + Q::Parameters p; p.k = 10; p.point = target; { auto bv = buffer->get_buffer_view(); - auto state = knn::Query::get_buffer_query_state(&bv, &p); - auto result = knn::Query::buffer_query(state, &p); - knn::Query::delete_buffer_query_state(state); + auto query = Q::local_preproc_buffer(&bv, &p); + auto result = Q::local_query_buffer(query); + delete query; std::sort(result.begin(), result.end()); size_t start = 120 - 5; @@ -150,15 +152,16 @@ START_TEST(t_knn_query) auto vptree = VPTree(buffer->get_buffer_view()); - knn::Parms p; + Q::Parameters p; + for (size_t i=0; i<100; i++) { p.k = rand() % 150; p.point.data[0] = rand() % (n-p.k); p.point.data[1] = p.point.data[0]; - auto state = knn::Query::get_query_state(&vptree, &p); - auto results = knn::Query::query(&vptree, state, &p); - knn::Query::delete_query_state(state); + auto query = Q::local_preproc(&vptree, &p); + auto results = Q::local_query(&vptree, query); + delete query; ck_assert_int_eq(results.size(), p.k); diff --git a/tests/wss_tests.cpp b/tests/wss_tests.cpp new file mode 100644 index 0000000..39e9d6e --- /dev/null +++ b/tests/wss_tests.cpp @@ -0,0 +1,56 @@ +/* + * tests/rangequery_tests.cpp + * + * Unit tests for Range Queries across several different + * shards + * + * Copyright (C) 2023 Douglas Rumbaugh + * Dong Xie + * + * Distributed under the Modified BSD License. + * + */ + +#include "shard/ISAMTree.h" +#include "query/rangecount.h" +#include "include/testing.h" + +#include + +using namespace de; + +typedef Rec R; +typedef ISAMTree Shard; + +#include "include/wss.h" + + +Suite *unit_testing() +{ + Suite *unit = suite_create("Range Count Query Testing"); + inject_rangecount_tests(unit); + + return unit; +} + + +int shard_unit_tests() +{ + int failed = 0; + Suite *unit = unit_testing(); + SRunner *unit_shardner = srunner_create(unit); + + srunner_run_all(unit_shardner, CK_NORMAL); + failed = srunner_ntests_failed(unit_shardner); + srunner_free(unit_shardner); + + return failed; +} + + +int main() +{ + int unit_failed = shard_unit_tests(); + + return (unit_failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE; +} -- cgit v1.2.3