From 076e104b8672924c3d80cd1da2fdb5ebee1766ac Mon Sep 17 00:00:00 2001 From: Douglas Rumbaugh Date: Thu, 24 Aug 2023 17:00:31 -0400 Subject: Migrated over to using psudb-common utilities/headers --- include/shard/Alex.h | 10 ++++++++-- include/shard/MemISAM.h | 12 +++++++++--- include/shard/PGM.h | 10 ++++++++-- include/shard/TrieSpline.h | 10 ++++++++-- include/shard/VPTree.h | 10 ++++++++-- include/shard/WIRS.h | 12 +++++++++--- include/shard/WSS.h | 12 +++++++++--- 7 files changed, 59 insertions(+), 17 deletions(-) (limited to 'include/shard') diff --git a/include/shard/Alex.h b/include/shard/Alex.h index be5222c..9f794dc 100644 --- a/include/shard/Alex.h +++ b/include/shard/Alex.h @@ -16,15 +16,21 @@ #include #include "alex.h" -#include "ds/PriorityQueue.h" +#include "psu-ds/PriorityQueue.h" #include "util/Cursor.h" -#include "ds/BloomFilter.h" +#include "psu-ds/BloomFilter.h" #include "util/bf_config.h" #include "framework/MutableBuffer.h" #include "framework/RecordInterface.h" #include "framework/ShardInterface.h" #include "framework/QueryInterface.h" +using psudb::CACHELINE_SIZE; +using psudb::BloomFilter; +using psudb::PriorityQueue; +using psudb::queue_record; +using psudb::Alias; + namespace de { template diff --git a/include/shard/MemISAM.h b/include/shard/MemISAM.h index 3000a6a..a220792 100644 --- a/include/shard/MemISAM.h +++ b/include/shard/MemISAM.h @@ -16,9 +16,15 @@ #include "framework/MutableBuffer.h" #include "util/bf_config.h" -#include "ds/PriorityQueue.h" +#include "psu-ds/PriorityQueue.h" #include "util/Cursor.h" -#include "util/timer.h" +#include "psu-util/timer.h" + +using psudb::CACHELINE_SIZE; +using psudb::BloomFilter; +using psudb::PriorityQueue; +using psudb::queue_record; +using psudb::Alias; namespace de { @@ -364,7 +370,7 @@ private: // Members: sorted data, internal ISAM levels, reccnt; Wrapped* m_data; - BloomFilter *m_bf; + psudb::BloomFilter *m_bf; InMemISAMNode* m_isam_nodes; InMemISAMNode* m_root; size_t m_reccnt; diff --git a/include/shard/PGM.h b/include/shard/PGM.h index af20594..2cd153e 100644 --- a/include/shard/PGM.h +++ b/include/shard/PGM.h @@ -16,15 +16,21 @@ #include #include "pgm/pgm_index.hpp" -#include "ds/PriorityQueue.h" +#include "psu-ds/PriorityQueue.h" #include "util/Cursor.h" -#include "ds/BloomFilter.h" +#include "psu-ds/BloomFilter.h" #include "util/bf_config.h" #include "framework/MutableBuffer.h" #include "framework/RecordInterface.h" #include "framework/ShardInterface.h" #include "framework/QueryInterface.h" +using psudb::CACHELINE_SIZE; +using psudb::BloomFilter; +using psudb::PriorityQueue; +using psudb::queue_record; +using psudb::Alias; + namespace de { template diff --git a/include/shard/TrieSpline.h b/include/shard/TrieSpline.h index 973b684..69fcfbc 100644 --- a/include/shard/TrieSpline.h +++ b/include/shard/TrieSpline.h @@ -16,15 +16,21 @@ #include #include "ts/builder.h" -#include "ds/PriorityQueue.h" +#include "psu-ds/PriorityQueue.h" #include "util/Cursor.h" -#include "ds/BloomFilter.h" +#include "psu-ds/BloomFilter.h" #include "util/bf_config.h" #include "framework/MutableBuffer.h" #include "framework/RecordInterface.h" #include "framework/ShardInterface.h" #include "framework/QueryInterface.h" +using psudb::CACHELINE_SIZE; +using psudb::BloomFilter; +using psudb::PriorityQueue; +using psudb::queue_record; +using psudb::Alias; + namespace de { template diff --git a/include/shard/VPTree.h b/include/shard/VPTree.h index 86f4ab7..8feec84 100644 --- a/include/shard/VPTree.h +++ b/include/shard/VPTree.h @@ -15,15 +15,21 @@ #include #include -#include "ds/PriorityQueue.h" +#include "psu-ds/PriorityQueue.h" #include "util/Cursor.h" -#include "ds/BloomFilter.h" +#include "psu-ds/BloomFilter.h" #include "util/bf_config.h" #include "framework/MutableBuffer.h" #include "framework/RecordInterface.h" #include "framework/ShardInterface.h" #include "framework/QueryInterface.h" +using psudb::CACHELINE_SIZE; +using psudb::BloomFilter; +using psudb::PriorityQueue; +using psudb::queue_record; +using psudb::Alias; + namespace de { template diff --git a/include/shard/WIRS.h b/include/shard/WIRS.h index fafdef0..19d3eea 100644 --- a/include/shard/WIRS.h +++ b/include/shard/WIRS.h @@ -16,16 +16,22 @@ #include #include -#include "ds/PriorityQueue.h" +#include "psu-ds/PriorityQueue.h" #include "util/Cursor.h" -#include "ds/Alias.h" -#include "ds/BloomFilter.h" +#include "psu-ds/Alias.h" +#include "psu-ds/BloomFilter.h" #include "util/bf_config.h" #include "framework/MutableBuffer.h" #include "framework/RecordInterface.h" #include "framework/ShardInterface.h" #include "framework/QueryInterface.h" +using psudb::CACHELINE_SIZE; +using psudb::BloomFilter; +using psudb::PriorityQueue; +using psudb::queue_record; +using psudb::Alias; + namespace de { thread_local size_t wirs_cancelations = 0; diff --git a/include/shard/WSS.h b/include/shard/WSS.h index 435e799..c0af573 100644 --- a/include/shard/WSS.h +++ b/include/shard/WSS.h @@ -16,16 +16,22 @@ #include #include -#include "ds/PriorityQueue.h" +#include "psu-ds/PriorityQueue.h" #include "util/Cursor.h" -#include "ds/Alias.h" -#include "ds/BloomFilter.h" +#include "psu-ds/Alias.h" +#include "psu-ds/BloomFilter.h" #include "util/bf_config.h" #include "framework/MutableBuffer.h" #include "framework/RecordInterface.h" #include "framework/ShardInterface.h" #include "framework/QueryInterface.h" +using psudb::CACHELINE_SIZE; +using psudb::BloomFilter; +using psudb::PriorityQueue; +using psudb::queue_record; +using psudb::Alias; + namespace de { thread_local size_t wss_cancelations = 0; -- cgit v1.2.3