From 39ae3e0441d8297a09197aba98bd494b5ada12c1 Mon Sep 17 00:00:00 2001
From: Douglas Rumbaugh <dbr4@psu.edu>
Date: Mon, 30 Oct 2023 14:17:59 -0400
Subject: Concurrency updates + fixes for compile errors

---
 include/framework/structure/BufferView.h    |  4 ++--
 include/framework/structure/InternalLevel.h | 21 +++++++++++----------
 2 files changed, 13 insertions(+), 12 deletions(-)

(limited to 'include/framework/structure')

diff --git a/include/framework/structure/BufferView.h b/include/framework/structure/BufferView.h
index 1efc1ac..14abedc 100644
--- a/include/framework/structure/BufferView.h
+++ b/include/framework/structure/BufferView.h
@@ -35,7 +35,7 @@ public:
 
     BufferView(std::vector<Buffer*> buffers) 
         : m_buffers(buffers)
-        , m_cutoff(buffers[buffers->size()-1]->get_record_count())
+        , m_cutoff(buffers[buffers.size()-1]->get_record_count())
     {}
 
     ~BufferView() = default;
@@ -102,7 +102,7 @@ public:
         return m_buffers[0]->get_tombstone_capacity();
     }
 
-    std::vector<void *> get_buffer_states(void *parms) {
+    std::vector<void *> get_query_states(void *parms) {
         std::vector<void *> states;
 
         for (auto buf : m_buffers) {
diff --git a/include/framework/structure/InternalLevel.h b/include/framework/structure/InternalLevel.h
index b9230f4..342a2c7 100644
--- a/include/framework/structure/InternalLevel.h
+++ b/include/framework/structure/InternalLevel.h
@@ -231,6 +231,17 @@ public:
         return (double) tscnt / (double) (tscnt + reccnt);
     }
 
+    std::shared_ptr<InternalLevel> clone() {
+        auto new_level = std::make_shared<InternalLevel>(m_level_no, m_shards.size());
+        for (size_t i=0; i<m_shard_cnt; i++) {
+            new_level->m_shards[i] = m_shards[i];
+            new_level->m_owns[i] = true;
+            m_owns[i] = false;
+        }
+
+        return new_level;
+    }
+
 private:
     ssize_t m_level_no;
     
@@ -243,16 +254,6 @@ private:
 
     std::vector<bool> m_owns;
 
-    std::shared_ptr<InternalLevel> clone() {
-        auto new_level = std::make_shared<InternalLevel>(m_level_no, m_shards.size());
-        for (size_t i=0; i<m_shard_cnt; i++) {
-            new_level->m_shards[i] = m_shards[i];
-            new_level->m_owns[i] = true;
-            m_owns[i] = false;
-        }
-
-        return new_level;
-    }
 };
 
 }
-- 
cgit v1.2.3