From cd7f2c7bee1c44e9e11ab75d6674ba5d05c6ba84 Mon Sep 17 00:00:00 2001
From: "Douglas B. Rumbaugh" <doug@douglasrumbaugh.com>
Date: Fri, 9 Jun 2023 11:01:55 -0400
Subject: Build changes and interface cleanup

Renamed the get_record_cnt() functions to get_record_count() for
consistency, dropped references to SSIs, and added openmp build flags
for PGM related targets.

Also adjusted dynamic_extension_tests.inc to fail when an erase fails
during the static structure testing as part of debugging a delete
cancellation problem under leveling.
---
 include/framework/DynamicExtension.h | 10 +++++-----
 include/framework/InternalLevel.h    |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'include/framework')

diff --git a/include/framework/DynamicExtension.h b/include/framework/DynamicExtension.h
index 7565085..800bc85 100644
--- a/include/framework/DynamicExtension.h
+++ b/include/framework/DynamicExtension.h
@@ -145,11 +145,11 @@ public:
         return result;
     }
 
-    size_t get_record_cnt() {
+    size_t get_record_count() {
         size_t cnt = get_buffer()->get_record_count();
 
         for (size_t i=0; i<m_levels.size(); i++) {
-            if (m_levels[i]) cnt += m_levels[i]->get_record_cnt();
+            if (m_levels[i]) cnt += m_levels[i]->get_record_count();
         }
 
         return cnt;
@@ -209,7 +209,7 @@ public:
         return m_buffer->get_capacity();
     }
     
-    Shard *create_ssi() {
+    Shard *create_static_structure() {
         std::vector<Shard *> shards;
 
         if (m_levels.size() > 0) {
@@ -477,7 +477,7 @@ private:
             return (buffer) ? buffer->get_record_count() : get_buffer()->get_record_count();
         }
 
-        return (m_levels[idx]) ? m_levels[idx]->get_record_cnt() : 0;
+        return (m_levels[idx]) ? m_levels[idx]->get_record_count() : 0;
     }
 
     /*
@@ -493,7 +493,7 @@ private:
         }
 
         if (L == LayoutPolicy::LEVELING) {
-            return m_levels[idx]->get_record_cnt() + incoming_rec_cnt <= calc_level_record_capacity(idx);
+            return m_levels[idx]->get_record_count() + incoming_rec_cnt <= calc_level_record_capacity(idx);
         } else {
             return m_levels[idx]->get_shard_count() < m_scale_factor;
         }
diff --git a/include/framework/InternalLevel.h b/include/framework/InternalLevel.h
index ac013c0..8554392 100644
--- a/include/framework/InternalLevel.h
+++ b/include/framework/InternalLevel.h
@@ -140,7 +140,7 @@ public:
         return m_shard_cnt;
     }
 
-    size_t get_record_cnt() {
+    size_t get_record_count() {
         size_t cnt = 0;
         for (size_t i=0; i<m_shard_cnt; i++) {
             cnt += m_shards[i]->get_record_count();
-- 
cgit v1.2.3