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/include/wss.h | 119 +++++++++++++++++----------------------------------- 1 file changed, 38 insertions(+), 81 deletions(-) (limited to 'tests/include/wss.h') 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