From 357cab549c2ed33970562b84ff6f83923742343d Mon Sep 17 00:00:00 2001 From: Douglas Rumbaugh Date: Tue, 7 Nov 2023 15:34:24 -0500 Subject: Comment and License updates --- LICENSE | 2 +- include/framework/DynamicExtension.h | 2 +- include/framework/QueryRequirements.h | 4 ++-- include/framework/ShardRequirements.h | 2 +- include/framework/interface/Query.h | 2 +- include/framework/interface/Record.h | 2 +- include/framework/interface/Scheduler.h | 2 +- include/framework/interface/Shard.h | 2 +- include/framework/scheduling/Epoch.h | 2 +- include/framework/scheduling/FIFOScheduler.h | 2 +- include/framework/scheduling/SerialScheduler.h | 2 +- include/framework/scheduling/Task.h | 2 +- include/framework/structure/BufferView.h | 2 +- include/framework/structure/ExtensionStructure.h | 2 +- include/framework/structure/InternalLevel.h | 2 +- include/framework/structure/MutableBuffer.h | 2 +- include/framework/util/Configuration.h | 2 +- include/query/irs.h | 6 +++++- include/query/rangequery.h | 6 ++++-- include/query/wirs.h | 6 +++++- include/query/wss.h | 9 ++++++--- include/shard/Alias.h | 6 +++++- include/shard/AugBTree.h | 6 +++++- include/shard/ISAMTree.h | 4 +++- include/shard/PGM.h | 6 +++++- include/shard/TrieSpline.h | 4 +++- include/shard/VPTree.h | 7 ++++++- include/util/Cursor.h | 2 +- include/util/bf_config.h | 4 ++-- include/util/types.h | 2 +- tests/alias_tests.cpp | 2 +- tests/augbtree_tests.cpp | 4 ++-- tests/de_cc_isam_level.cpp | 4 ++-- tests/de_level_tag.cpp | 4 ++-- tests/de_level_tomb.cpp | 4 ++-- tests/de_tier_tag.cpp | 4 ++-- tests/de_tier_tomb.cpp | 4 ++-- tests/dynamic_extension_tests.inc | 4 ++-- tests/internal_level_tests.cpp | 2 +- tests/memisam_tests.cpp | 2 +- tests/mutable_buffer_tests.cpp | 2 +- tests/pgm_tests.cpp | 2 +- tests/testing.h | 2 +- tests/triespline_tests.cpp | 2 +- tests/vptree_tests.cpp | 2 +- 45 files changed, 91 insertions(+), 57 deletions(-) diff --git a/LICENSE b/LICENSE index 70ba9fd..09bb33b 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ BSD 3-Clause License -Copyright (c) 2023, Douglas Rumbaugh and Dong Xie +Copyright (c) 2023, Douglas B. Rumbaugh and Dong Xie Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions diff --git a/include/framework/DynamicExtension.h b/include/framework/DynamicExtension.h index edbb6f5..7244856 100644 --- a/include/framework/DynamicExtension.h +++ b/include/framework/DynamicExtension.h @@ -4,7 +4,7 @@ * Copyright (C) 2023 Douglas B. Rumbaugh * Dong Xie * - * All rights reserved. Published under the Modified BSD License. + * Distributed under the Modified BSD License. * */ #pragma once diff --git a/include/framework/QueryRequirements.h b/include/framework/QueryRequirements.h index ff4eaff..4d3e97b 100644 --- a/include/framework/QueryRequirements.h +++ b/include/framework/QueryRequirements.h @@ -3,9 +3,9 @@ * * Copyright (C) 2023 Douglas B. Rumbaugh * - * All rights reserved. Published under the Modified BSD License. + * Distributed under the Modified BSD License. * - * A header file containing the necessary includes for Shard + * A header file containing the necessary includes for Query * development. * */ diff --git a/include/framework/ShardRequirements.h b/include/framework/ShardRequirements.h index 55e7199..d054030 100644 --- a/include/framework/ShardRequirements.h +++ b/include/framework/ShardRequirements.h @@ -3,7 +3,7 @@ * * Copyright (C) 2023 Douglas B. Rumbaugh * - * All rights reserved. Published under the Modified BSD License. + * Distributed under the Modified BSD License. * * A header file containing the necessary includes for Shard * development. diff --git a/include/framework/interface/Query.h b/include/framework/interface/Query.h index 21cadcb..8b92c45 100644 --- a/include/framework/interface/Query.h +++ b/include/framework/interface/Query.h @@ -3,7 +3,7 @@ * * Copyright (C) 2023 Douglas B. Rumbaugh * - * All rights reserved. Published under the Modified BSD License. + * Distributed under the Modified BSD License. * */ #pragma once diff --git a/include/framework/interface/Record.h b/include/framework/interface/Record.h index bf495df..457078d 100644 --- a/include/framework/interface/Record.h +++ b/include/framework/interface/Record.h @@ -3,7 +3,7 @@ * * Copyright (C) 2023 Douglas Rumbaugh * - * All rights reserved. Published under the Modified BSD License. + * Distributed under the Modified BSD License. * * FIXME: the record implementations could probably be broken out into * different files, leaving only the interface here diff --git a/include/framework/interface/Scheduler.h b/include/framework/interface/Scheduler.h index 63581d2..a8544a7 100644 --- a/include/framework/interface/Scheduler.h +++ b/include/framework/interface/Scheduler.h @@ -3,7 +3,7 @@ * * Copyright (C) 2023 Douglas B. Rumbaugh * - * All rights reserved. Published under the Modified BSD License. + * Distributed under the Modified BSD License. * */ #pragma once diff --git a/include/framework/interface/Shard.h b/include/framework/interface/Shard.h index 92cdca0..2357795 100644 --- a/include/framework/interface/Shard.h +++ b/include/framework/interface/Shard.h @@ -3,7 +3,7 @@ * * Copyright (C) 2023 Douglas B. Rumbaugh * - * All rights reserved. Published under the Modified BSD License. + * Distributed under the Modified BSD License. * */ #pragma once diff --git a/include/framework/scheduling/Epoch.h b/include/framework/scheduling/Epoch.h index 0ebbde9..9193b06 100644 --- a/include/framework/scheduling/Epoch.h +++ b/include/framework/scheduling/Epoch.h @@ -3,7 +3,7 @@ * * Copyright (C) 2023 Douglas B. Rumbaugh * - * All rights reserved. Published under the Modified BSD License. + * Distributed under the Modified BSD License. * */ #pragma once diff --git a/include/framework/scheduling/FIFOScheduler.h b/include/framework/scheduling/FIFOScheduler.h index 1521eb6..ba62f9e 100644 --- a/include/framework/scheduling/FIFOScheduler.h +++ b/include/framework/scheduling/FIFOScheduler.h @@ -3,7 +3,7 @@ * * Copyright (C) 2023 Douglas B. Rumbaugh * - * All rights reserved. Published under the Modified BSD License. + * Distributed under the Modified BSD License. * */ #pragma once diff --git a/include/framework/scheduling/SerialScheduler.h b/include/framework/scheduling/SerialScheduler.h index 93611d1..10c2af2 100644 --- a/include/framework/scheduling/SerialScheduler.h +++ b/include/framework/scheduling/SerialScheduler.h @@ -3,7 +3,7 @@ * * Copyright (C) 2023 Douglas B. Rumbaugh * - * All rights reserved. Published under the Modified BSD License. + * Distributed under the Modified BSD License. * * IMPORTANT: This "scheduler" is a shim implementation for allowing * strictly serial, single-threaded operation of the framework. It should diff --git a/include/framework/scheduling/Task.h b/include/framework/scheduling/Task.h index 6dfd7df..d211fb5 100644 --- a/include/framework/scheduling/Task.h +++ b/include/framework/scheduling/Task.h @@ -3,7 +3,7 @@ * * Copyright (C) 2023 Douglas B. Rumbaugh * - * All rights reserved. Published under the Modified BSD License. + * Distributed under the Modified BSD License. * */ #pragma once diff --git a/include/framework/structure/BufferView.h b/include/framework/structure/BufferView.h index ccd3dac..651e430 100644 --- a/include/framework/structure/BufferView.h +++ b/include/framework/structure/BufferView.h @@ -3,7 +3,7 @@ * * Copyright (C) 2023 Douglas B. Rumbaugh * - * All rights reserved. Published under the Modified BSD License. + * Distributed under the Modified BSD License. * */ #pragma once diff --git a/include/framework/structure/ExtensionStructure.h b/include/framework/structure/ExtensionStructure.h index 80ec7b9..74cede6 100644 --- a/include/framework/structure/ExtensionStructure.h +++ b/include/framework/structure/ExtensionStructure.h @@ -4,7 +4,7 @@ * Copyright (C) 2023 Douglas B. Rumbaugh * Dong Xie * - * All rights reserved. Published under the Modified BSD License. + * Distributed under the Modified BSD License. * */ #pragma once diff --git a/include/framework/structure/InternalLevel.h b/include/framework/structure/InternalLevel.h index 632fe17..00e0c58 100644 --- a/include/framework/structure/InternalLevel.h +++ b/include/framework/structure/InternalLevel.h @@ -4,7 +4,7 @@ * Copyright (C) 2023 Douglas B. Rumbaugh * Dong Xie * - * All rights reserved. Published under the Modified BSD License. + * Distributed under the Modified BSD License. * */ #pragma once diff --git a/include/framework/structure/MutableBuffer.h b/include/framework/structure/MutableBuffer.h index ba25cc3..671824f 100644 --- a/include/framework/structure/MutableBuffer.h +++ b/include/framework/structure/MutableBuffer.h @@ -4,7 +4,7 @@ * Copyright (C) 2023 Douglas B. Rumbaugh * Dong Xie * - * All rights reserved. Published under the Modified BSD License. + * Distributed under the Modified BSD License. * */ #pragma once diff --git a/include/framework/util/Configuration.h b/include/framework/util/Configuration.h index ec4ec3a..866128a 100644 --- a/include/framework/util/Configuration.h +++ b/include/framework/util/Configuration.h @@ -3,7 +3,7 @@ * * Copyright (C) 2023 Douglas B. Rumbaugh * - * All rights reserved. Published under the Modified BSD License. + * Distributed under the Modified BSD License. * */ #pragma once diff --git a/include/query/irs.h b/include/query/irs.h index 4cb69b0..fa69ea1 100644 --- a/include/query/irs.h +++ b/include/query/irs.h @@ -3,7 +3,11 @@ * * Copyright (C) 2023 Douglas B. Rumbaugh * - * All rights reserved. Published under the Modified BSD License. + * Distributed under the Modified BSD License. + * + * A query class for independent range sampling. This query requires + * that the shard support get_lower_bound(key), get_upper_bound(key), + * and get_record_at(index). * */ #pragma once diff --git a/include/query/rangequery.h b/include/query/rangequery.h index b9ac9db..16dcd86 100644 --- a/include/query/rangequery.h +++ b/include/query/rangequery.h @@ -1,10 +1,12 @@ /* * include/query/rangequery.h * - * Copyright (C) 2023 Douglas B. Rumbaugh + * Copyright (C) 2023 Douglas B. Rumbaugh * - * All rights reserved. Published under the Modified BSD License. + * Distributed under the Modified BSD License. * + * A query class for single dimensional range queries. This query requires + * that the shard support get_lower_bound(key) and get_record_at(index). */ #pragma once diff --git a/include/query/wirs.h b/include/query/wirs.h index 1113b1d..9b3d2ad 100644 --- a/include/query/wirs.h +++ b/include/query/wirs.h @@ -3,7 +3,11 @@ * * Copyright (C) 2023 Douglas B. Rumbaugh * - * All rights reserved. Published under the Modified BSD License. + * Distributed under the Modified BSD License. + * + * A query class for weighted independent range sampling. This + * class is tightly coupled with include/shard/AugBTree.h, and + * so is probably of limited general utility. * */ #pragma once diff --git a/include/query/wss.h b/include/query/wss.h index 794485c..4c8861e 100644 --- a/include/query/wss.h +++ b/include/query/wss.h @@ -1,10 +1,13 @@ /* - * include/query/rangequery.h + * include/query/wss.h * - * Copyright (C) 2023 Douglas B. Rumbaugh + * Copyright (C) 2023 Douglas B. Rumbaugh * - * All rights reserved. Published under the Modified BSD License. + * Distributed under the Modified BSD License. * + * A query class for weighted set sampling. This + * class is tightly coupled with include/shard/Alias.h, + * and so is probably of limited general utility. */ #pragma once diff --git a/include/shard/Alias.h b/include/shard/Alias.h index a4a7d02..a3e8ad8 100644 --- a/include/shard/Alias.h +++ b/include/shard/Alias.h @@ -4,7 +4,11 @@ * Copyright (C) 2023 Douglas B. Rumbaugh * Dong Xie * - * All rights reserved. Published under the Modified BSD License. + * Distributed under the Modified BSD License. + * + * A shard shim around the psudb::Alias Walker's Alias + * structure. Designed to be used along side the WSS + * query in include/query/wss.h * */ #pragma once diff --git a/include/shard/AugBTree.h b/include/shard/AugBTree.h index e32ec64..be664ac 100644 --- a/include/shard/AugBTree.h +++ b/include/shard/AugBTree.h @@ -4,8 +4,12 @@ * Copyright (C) 2023 Dong Xie * Douglas B. Rumbaugh * - * All rights reserved. Published under the Modified BSD License. + * Distributed under the Modified BSD License. * + * A shard shim around the alias augmented B-tree. Designed to be + * used along side the WIRS query in include/query/wirs.h, but + * also supports the necessary methods for other common query + * types. */ #pragma once diff --git a/include/shard/ISAMTree.h b/include/shard/ISAMTree.h index a610c09..e11c899 100644 --- a/include/shard/ISAMTree.h +++ b/include/shard/ISAMTree.h @@ -4,7 +4,9 @@ * Copyright (C) 2023 Douglas B. Rumbaugh * Dong Xie * - * All rights reserved. Published under the Modified BSD License. + * Distributed under the Modified BSD License. + * + * A shard shim around an in-memory ISAM tree. * */ #pragma once diff --git a/include/shard/PGM.h b/include/shard/PGM.h index 6b66b7d..13db26a 100644 --- a/include/shard/PGM.h +++ b/include/shard/PGM.h @@ -2,8 +2,12 @@ * include/shard/PGM.h * * Copyright (C) 2023 Douglas B. Rumbaugh + * Dong Xie * - * All rights reserved. Published under the Modified BSD License. + * Distributed under the Modified BSD License. + * + * A shard shim around the static version of the PGM learned + * index. * */ #pragma once diff --git a/include/shard/TrieSpline.h b/include/shard/TrieSpline.h index fdf8edb..56ec357 100644 --- a/include/shard/TrieSpline.h +++ b/include/shard/TrieSpline.h @@ -3,7 +3,9 @@ * * Copyright (C) 2023 Douglas B. Rumbaugh * - * All rights reserved. Published under the Modified BSD License. + * Distributed under the Modified BSD License. + * + * A shard shim around the TrieSpline learned index. * */ #pragma once diff --git a/include/shard/VPTree.h b/include/shard/VPTree.h index 978372b..2f5ebbb 100644 --- a/include/shard/VPTree.h +++ b/include/shard/VPTree.h @@ -3,7 +3,12 @@ * * Copyright (C) 2023 Douglas B. Rumbaugh * - * All rights reserved. Published under the Modified BSD License. + * Distributed under the Modified BSD License. + * + * A shard shim around the VPTree spatial index. + * + * FIXME: separate the KNN query class out into a standalone + * file in include/query . * */ #pragma once diff --git a/include/util/Cursor.h b/include/util/Cursor.h index 00afaab..be7ab32 100644 --- a/include/util/Cursor.h +++ b/include/util/Cursor.h @@ -4,7 +4,7 @@ * Copyright (C) 2023 Douglas B. Rumbaugh * Dong Xie * - * All rights reserved. Published under the Modified BSD License. + * Distributed under the Modified BSD License. * * A simple record cursor type with associated methods for help in * merging record sets when constructing shards. diff --git a/include/util/bf_config.h b/include/util/bf_config.h index 4de465d..fdf2195 100644 --- a/include/util/bf_config.h +++ b/include/util/bf_config.h @@ -4,10 +4,10 @@ * Copyright (C) 2023 Douglas B. Rumbaugh * Dong Xie * - * All rights reserved. Published under the Modified BSD License. + * Distributed under the Modified BSD License. * * Global parameters for configuring bloom filters used as auxiliary - * structures on shards within the framework. The bloom filters themselves + * structures on shards within the framework. The bloom filter class * can be found in * * $PROJECT_ROOT/external/psudb-common/cpp/include/psu-ds/BloomFilter.h diff --git a/include/util/types.h b/include/util/types.h index b7f9607..3908174 100644 --- a/include/util/types.h +++ b/include/util/types.h @@ -3,7 +3,7 @@ * * Copyright (C) 2023 Douglas B. Rumbaugh * - * All rights reserved. Published under the Modified BSD License. + * Distributed under the Modified BSD License. * * A centralized header file for various data types used throughout the * code base. There are a few very specific types, such as header formats, diff --git a/tests/alias_tests.cpp b/tests/alias_tests.cpp index c4a302d..e3c736b 100644 --- a/tests/alias_tests.cpp +++ b/tests/alias_tests.cpp @@ -6,7 +6,7 @@ * Copyright (C) 2023 Douglas Rumbaugh * Dong Xie * - * All rights reserved. Published under the Modified BSD License. + * Distributed under the Modified BSD License. * */ diff --git a/tests/augbtree_tests.cpp b/tests/augbtree_tests.cpp index 878af82..1b24344 100644 --- a/tests/augbtree_tests.cpp +++ b/tests/augbtree_tests.cpp @@ -1,12 +1,12 @@ /* - * tests/wirs_tests.cpp + * tests/augbtree_tests.cpp * * Unit tests for AugBTree (Augmented B+Tree) shard * * Copyright (C) 2023 Douglas Rumbaugh * Dong Xie * - * All rights reserved. Published under the Modified BSD License. + * Distributed under the Modified BSD License. * */ diff --git a/tests/de_cc_isam_level.cpp b/tests/de_cc_isam_level.cpp index e574578..4972fb5 100644 --- a/tests/de_cc_isam_level.cpp +++ b/tests/de_cc_isam_level.cpp @@ -1,11 +1,11 @@ /* - * tests/dynamic_extension_tests.cpp + * tests/de_cc_isam_level.cpp * * Unit tests for Dynamic Extension Framework * * Copyright (C) 2023 Douglas B. Rumbaugh * - * All rights reserved. Published under the Modified BSD License. + * Distributed under the Modified BSD License. * */ diff --git a/tests/de_level_tag.cpp b/tests/de_level_tag.cpp index f3f099d..3a2f271 100644 --- a/tests/de_level_tag.cpp +++ b/tests/de_level_tag.cpp @@ -1,12 +1,12 @@ /* - * tests/dynamic_extension_tests.cpp + * tests/de_level_tag.cpp * * Unit tests for Dynamic Extension Framework * * Copyright (C) 2023 Douglas Rumbaugh * Dong Xie * - * All rights reserved. Published under the Modified BSD License. + * Distributed under the Modified BSD License. * */ #include diff --git a/tests/de_level_tomb.cpp b/tests/de_level_tomb.cpp index 912743c..2412959 100644 --- a/tests/de_level_tomb.cpp +++ b/tests/de_level_tomb.cpp @@ -1,12 +1,12 @@ /* - * tests/dynamic_extension_tests.cpp + * tests/de_level_tomb.cpp * * Unit tests for Dynamic Extension Framework * * Copyright (C) 2023 Douglas Rumbaugh * Dong Xie * - * All rights reserved. Published under the Modified BSD License. + * Distributed under the Modified BSD License. * */ #include diff --git a/tests/de_tier_tag.cpp b/tests/de_tier_tag.cpp index 712c203..46f2ee7 100644 --- a/tests/de_tier_tag.cpp +++ b/tests/de_tier_tag.cpp @@ -1,12 +1,12 @@ /* - * tests/dynamic_extension_tests.cpp + * tests/de_tier_tag.cpp * * Unit tests for Dynamic Extension Framework * * Copyright (C) 2023 Douglas Rumbaugh * Dong Xie * - * All rights reserved. Published under the Modified BSD License. + * Distributed under the Modified BSD License. * */ #include diff --git a/tests/de_tier_tomb.cpp b/tests/de_tier_tomb.cpp index f25ec34..e2b65a0 100644 --- a/tests/de_tier_tomb.cpp +++ b/tests/de_tier_tomb.cpp @@ -1,12 +1,12 @@ /* - * tests/dynamic_extension_tests.cpp + * tests/de_tier_tomb.cpp * * Unit tests for Dynamic Extension Framework * * Copyright (C) 2023 Douglas Rumbaugh * Dong Xie * - * All rights reserved. Published under the Modified BSD License. + * Distributed under the Modified BSD License. * */ #include diff --git a/tests/dynamic_extension_tests.inc b/tests/dynamic_extension_tests.inc index bcb5ae6..dac7d51 100644 --- a/tests/dynamic_extension_tests.inc +++ b/tests/dynamic_extension_tests.inc @@ -1,12 +1,12 @@ /* - * tests/dynamic_extension_tests.cpp + * tests/dynamic_extension_tests.inc * * Unit tests for Dynamic Extension Framework * * Copyright (C) 2023 Douglas Rumbaugh * Dong Xie * - * All rights reserved. Published under the Modified BSD License. + * Distributed under the Modified BSD License. * */ diff --git a/tests/internal_level_tests.cpp b/tests/internal_level_tests.cpp index 1009ea8..cb74bca 100644 --- a/tests/internal_level_tests.cpp +++ b/tests/internal_level_tests.cpp @@ -6,7 +6,7 @@ * Copyright (C) 2023 Douglas Rumbaugh * Dong Xie * - * All rights reserved. Published under the Modified BSD License. + * Distributed under the Modified BSD License. * */ #include "shard/ISAMTree.h" diff --git a/tests/memisam_tests.cpp b/tests/memisam_tests.cpp index d3b8087..8c499e2 100644 --- a/tests/memisam_tests.cpp +++ b/tests/memisam_tests.cpp @@ -6,7 +6,7 @@ * Copyright (C) 2023 Douglas Rumbaugh * Dong Xie * - * All rights reserved. Published under the Modified BSD License. + * Distributed under the Modified BSD License. * */ diff --git a/tests/mutable_buffer_tests.cpp b/tests/mutable_buffer_tests.cpp index a2561c8..8480f55 100644 --- a/tests/mutable_buffer_tests.cpp +++ b/tests/mutable_buffer_tests.cpp @@ -6,7 +6,7 @@ * Copyright (C) 2023 Douglas Rumbaugh * Dong Xie * - * All rights reserved. Published under the Modified BSD License. + * Distributed under the Modified BSD License. * */ #include diff --git a/tests/pgm_tests.cpp b/tests/pgm_tests.cpp index 1565384..c7750ac 100644 --- a/tests/pgm_tests.cpp +++ b/tests/pgm_tests.cpp @@ -6,7 +6,7 @@ * Copyright (C) 2023 Douglas Rumbaugh * Dong Xie * - * All rights reserved. Published under the Modified BSD License. + * Distributed under the Modified BSD License. * */ diff --git a/tests/testing.h b/tests/testing.h index 023be7f..e1d3402 100644 --- a/tests/testing.h +++ b/tests/testing.h @@ -6,7 +6,7 @@ * Copyright (C) 2023 Douglas Rumbaugh * Dong Xie * - * All rights reserved. Published under the Modified BSD License. + * Distributed under the Modified BSD License. * */ #pragma once diff --git a/tests/triespline_tests.cpp b/tests/triespline_tests.cpp index 101f143..14506be 100644 --- a/tests/triespline_tests.cpp +++ b/tests/triespline_tests.cpp @@ -6,7 +6,7 @@ * Copyright (C) 2023 Douglas Rumbaugh * Dong Xie * - * All rights reserved. Published under the Modified BSD License. + * Distributed under the Modified BSD License. * */ diff --git a/tests/vptree_tests.cpp b/tests/vptree_tests.cpp index 06f147b..fb568dd 100644 --- a/tests/vptree_tests.cpp +++ b/tests/vptree_tests.cpp @@ -5,7 +5,7 @@ * * Copyright (C) 2023 Douglas Rumbaugh * - * All rights reserved. Published under the Modified BSD License. + * Distributed under the Modified BSD License. * */ -- cgit v1.2.3