summaryrefslogtreecommitdiffstats
path: root/include/shard/MemISAM.h
diff options
context:
space:
mode:
authorDouglas Rumbaugh <dbr4@psu.edu>2023-08-24 17:00:31 -0400
committerDouglas Rumbaugh <dbr4@psu.edu>2023-08-24 17:00:31 -0400
commit076e104b8672924c3d80cd1da2fdb5ebee1766ac (patch)
treee33a8081c61899c5d1a471401605e55716ca3ff4 /include/shard/MemISAM.h
parent1cb522b36382381ef3f1494f24b0c6a98f8843a9 (diff)
downloaddynamic-extension-076e104b8672924c3d80cd1da2fdb5ebee1766ac.tar.gz
Migrated over to using psudb-common utilities/headers
Diffstat (limited to 'include/shard/MemISAM.h')
-rw-r--r--include/shard/MemISAM.h12
1 files changed, 9 insertions, 3 deletions
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<R>* m_data;
- BloomFilter<R> *m_bf;
+ psudb::BloomFilter<R> *m_bf;
InMemISAMNode* m_isam_nodes;
InMemISAMNode* m_root;
size_t m_reccnt;