From f73a55cb2c8d8d800a379f9272a5c6b4730587a7 Mon Sep 17 00:00:00 2001 From: "Douglas B. Rumbaugh" Date: Fri, 9 Jun 2023 11:29:58 -0400 Subject: Fixed bug(s) in tagging-based deletes --- include/framework/DynamicExtension.h | 2 +- include/framework/InternalLevel.h | 1 + include/shard/MemISAM.h | 7 +++++-- include/shard/PGM.h | 6 +++++- include/shard/TrieSpline.h | 6 +++++- include/shard/WIRS.h | 6 +++++- include/shard/WSS.h | 6 +++++- 7 files changed, 27 insertions(+), 7 deletions(-) (limited to 'include') diff --git a/include/framework/DynamicExtension.h b/include/framework/DynamicExtension.h index 800bc85..544cd8f 100644 --- a/include/framework/DynamicExtension.h +++ b/include/framework/DynamicExtension.h @@ -85,7 +85,7 @@ public: int erase(const R &rec) { Buffer *buffer; - if constexpr (L == LayoutPolicy::LEVELING) { + if constexpr (D == DeletePolicy::TAGGING) { auto buffer = get_buffer(); // Check the levels first. This assumes there aren't diff --git a/include/framework/InternalLevel.h b/include/framework/InternalLevel.h index 8554392..ec8ffc4 100644 --- a/include/framework/InternalLevel.h +++ b/include/framework/InternalLevel.h @@ -125,6 +125,7 @@ public: auto res = m_shards[i]->point_lookup(rec); if (res) { res->set_delete(); + return true; } } } diff --git a/include/shard/MemISAM.h b/include/shard/MemISAM.h index 96c404e..5815fd7 100644 --- a/include/shard/MemISAM.h +++ b/include/shard/MemISAM.h @@ -107,8 +107,11 @@ public: continue; } - //Masking off the ts. - base->header &= 1; + // FIXME: this shouldn't be necessary, but the tagged record + // bypass doesn't seem to be working on this code-path, so this + // ensures that tagged records from the buffer are able to be + // dropped, eventually. It should only need to be &= 1 + base->header &= 3; m_data[m_reccnt++] = *base; if (m_bf && base->is_tombstone()) { ++m_tombstone_cnt; diff --git a/include/shard/PGM.h b/include/shard/PGM.h index 8b0bd69..3d680e7 100644 --- a/include/shard/PGM.h +++ b/include/shard/PGM.h @@ -95,7 +95,11 @@ public: continue; } - base->header &= 1; + // FIXME: this shouldn't be necessary, but the tagged record + // bypass doesn't seem to be working on this code-path, so this + // ensures that tagged records from the buffer are able to be + // dropped, eventually. It should only need to be &= 1 + base->header &= 3; m_data[m_reccnt++] = *base; keys.emplace_back(base->rec.key); diff --git a/include/shard/TrieSpline.h b/include/shard/TrieSpline.h index 2341751..349f41a 100644 --- a/include/shard/TrieSpline.h +++ b/include/shard/TrieSpline.h @@ -106,7 +106,11 @@ public: m_min_key = base->rec.key; } - base->header &= 1; + // FIXME: this shouldn't be necessary, but the tagged record + // bypass doesn't seem to be working on this code-path, so this + // ensures that tagged records from the buffer are able to be + // dropped, eventually. It should only need to be &= 1 + base->header &= 3; m_data[m_reccnt++] = *base; bldr.AddKey(base->rec.key); diff --git a/include/shard/WIRS.h b/include/shard/WIRS.h index 5c651af..163311e 100644 --- a/include/shard/WIRS.h +++ b/include/shard/WIRS.h @@ -123,7 +123,11 @@ public: continue; } - base->header &= 1; + // FIXME: this shouldn't be necessary, but the tagged record + // bypass doesn't seem to be working on this code-path, so this + // ensures that tagged records from the buffer are able to be + // dropped, eventually. It should only need to be &= 1 + base->header &= 3; m_data[m_reccnt++] = *base; m_total_weight+= base->rec.weight; diff --git a/include/shard/WSS.h b/include/shard/WSS.h index aa6ebf0..15c8b2e 100644 --- a/include/shard/WSS.h +++ b/include/shard/WSS.h @@ -106,7 +106,11 @@ public: continue; } - base->header &= 1; + // FIXME: this shouldn't be necessary, but the tagged record + // bypass doesn't seem to be working on this code-path, so this + // ensures that tagged records from the buffer are able to be + // dropped, eventually. It should only need to be &= 1 + base->header &= 3; m_data[m_reccnt++] = *base; m_total_weight+= base->rec.weight; weights.push_back(base->rec.weight); -- cgit v1.2.3