store DPT in tombstone as hexstring (#2)

BU-DiSC · Apr 24, 2024 · b0203bd · b0203bd
1 parent d8fb849
commit b0203bd
Show file tree

Hide file tree

Showing 8 changed files with 45 additions and 0 deletions.
diff --git a/db/write_batch.cc b/db/write_batch.cc
@@ -1262,6 +1262,15 @@ Status WriteBatch::Delete(ColumnFamilyHandle* column_family, const Slice& key,
                                     SliceParts(key_with_ts.data(), 2));
 }
 
+Status WriteBatch::Delete(ColumnFamilyHandle* column_family, const Slice& key,
+                          const uint64_t dpt) {
+  uint32_t cf_id = column_family->GetID();
+  std::string dpt_hex = (boost::format("%x") % dpt).str();
+  std::array<Slice, 2> key_with_dpt{{key, dpt_hex}};
+  return WriteBatchInternal::Delete(this, cf_id,
+                                    SliceParts(key_with_dpt.data(), 2));
+}
+
 Status WriteBatchInternal::Delete(WriteBatch* b, uint32_t column_family_id,
                                   const SliceParts& key) {
   LocalSavePoint save(b);

diff --git a/include/rocksdb/utilities/transaction.h b/include/rocksdb/utilities/transaction.h
@@ -496,6 +496,8 @@ class Transaction {
 
   virtual Status Delete(ColumnFamilyHandle* column_family, const Slice& key,
                         const bool assume_tracked = false) = 0;
+  virtual Status Delete(ColumnFamilyHandle* column_family, const Slice& key,
+                        const bool assume_tracked, uint64_t dpt) = 0;
   virtual Status Delete(const Slice& key) = 0;
   virtual Status Delete(ColumnFamilyHandle* column_family,
                         const SliceParts& key,

diff --git a/include/rocksdb/utilities/write_batch_with_index.h b/include/rocksdb/utilities/write_batch_with_index.h
@@ -149,6 +149,8 @@ class WriteBatchWithIndex : public WriteBatchBase {
   Status Delete(const Slice& key) override;
   Status Delete(ColumnFamilyHandle* column_family, const Slice& key,
                 const Slice& ts) override;
+  Status Delete(ColumnFamilyHandle* column_family, const Slice& key,
+                const uint64_t dpt) override;
 
   using WriteBatchBase::SingleDelete;
   Status SingleDelete(ColumnFamilyHandle* column_family,

diff --git a/include/rocksdb/write_batch.h b/include/rocksdb/write_batch.h
@@ -129,6 +129,8 @@ class WriteBatch : public WriteBatchBase {
   Status Delete(const Slice& key) override { return Delete(nullptr, key); }
   Status Delete(ColumnFamilyHandle* column_family, const Slice& key,
                 const Slice& ts) override;
+  Status Delete(ColumnFamilyHandle* column_family, const Slice& key,
+                const uint64_t dpt) override;
 
   // variant that takes SliceParts
   // These two variants of Delete(..., const SliceParts& key) can be used when

diff --git a/include/rocksdb/write_batch_base.h b/include/rocksdb/write_batch_base.h
@@ -87,6 +87,8 @@ class WriteBatchBase {
   virtual Status Delete(const Slice& key) = 0;
   virtual Status Delete(ColumnFamilyHandle* column_family, const Slice& key,
                         const Slice& ts) = 0;
+  virtual Status Delete(ColumnFamilyHandle* column_family, const Slice& key,
+                        const uint64_t dpt) = 0;
 
   // variant that takes SliceParts
   virtual Status Delete(ColumnFamilyHandle* column_family,

diff --git a/utilities/transactions/transaction_base.cc b/utilities/transactions/transaction_base.cc
@@ -519,6 +519,24 @@ Status TransactionBaseImpl::Delete(ColumnFamilyHandle* column_family,
   return s;
 }
 
+Status TransactionBaseImpl::Delete(ColumnFamilyHandle* column_family,
+                                   const Slice& key,
+                                   const bool assume_tracked,
+                                   uint64_t dpt) {
+  const bool do_validate = !assume_tracked;
+  Status s = TryLock(column_family, key, false /* read_only */,
+                     true /* exclusive */, do_validate, assume_tracked);
+
+  if (s.ok()) {
+    s = GetBatchForWrite()->Delete(column_family, key, dpt);
+    if (s.ok()) {
+      num_deletes_++;
+    }
+  }
+
+  return s;
+}
+
 Status TransactionBaseImpl::Delete(ColumnFamilyHandle* column_family,
                                    const SliceParts& key,
                                    const bool assume_tracked) {

diff --git a/utilities/transactions/transaction_base.h b/utilities/transactions/transaction_base.h
@@ -153,6 +153,8 @@ class TransactionBaseImpl : public Transaction {
 
   Status Delete(ColumnFamilyHandle* column_family, const Slice& key,
                 const bool assume_tracked = false) override;
+  Status Delete(ColumnFamilyHandle* column_family, const Slice& key,
+                const bool assume_tracked, uint64_t dpt) override;
   Status Delete(const Slice& key) override { return Delete(nullptr, key); }
   Status Delete(ColumnFamilyHandle* column_family, const SliceParts& key,
                 const bool assume_tracked = false) override;

diff --git a/utilities/write_batch_with_index/write_batch_with_index.cc b/utilities/write_batch_with_index/write_batch_with_index.cc
@@ -413,6 +413,14 @@ Status WriteBatchWithIndex::Delete(ColumnFamilyHandle* column_family,
   return Status::NotSupported();
 }
 
+Status WriteBatchWithIndex::Delete(ColumnFamilyHandle* column_family,
+                                   const Slice& /*key*/, uint64_t /*dpt*/) {
+  if (!column_family) {
+    return Status::InvalidArgument("column family handle cannot be nullptr");
+  }
+  return Status::NotSupported();
+}
+
 Status WriteBatchWithIndex::SingleDelete(ColumnFamilyHandle* column_family,
                                          const Slice& key) {
   rep->SetLastEntryOffset();