@nxtedition/rocksdb 13.1.4 → 13.2.0

package/deps/rocksdb/rocksdb/utilities/write_batch_with_index/write_batch_with_index_internal.h

@@ -36,7 +36,8 @@ class BaseDeltaIterator : public Iterator {
  public:
   BaseDeltaIterator(ColumnFamilyHandle* column_family, Iterator* base_iterator,
                     WBWIIteratorImpl* delta_iterator,
-                    const Comparator* comparator);
+                    const Comparator* comparator,
+                    const ReadOptions* read_options);
 
   ~BaseDeltaIterator() override;
 
@@ -47,6 +48,23 @@ class BaseDeltaIterator : public Iterator {
   void SeekForPrev(const Slice& k) override;
   void Next() override;
   void Prev() override;
+
+  bool PrepareValue() override {
+    assert(Valid());
+
+    if (!allow_unprepared_value_) {
+      return true;
+    }
+
+    if (!current_at_base_) {
+      return true;
+    }
+
+    SetValueAndColumnsFromBase();
+
+    return Valid();
+  }
+
   Slice key() const override;
   Slice value() const override { return value_; }
   const WideColumns& columns() const override { return columns_; }
@@ -69,6 +87,7 @@ class BaseDeltaIterator : public Iterator {
   bool forward_;
   bool current_at_base_;
   bool equal_keys_;
+  bool allow_unprepared_value_;
   Status status_;
   ColumnFamilyHandle* column_family_;
   std::unique_ptr<Iterator> base_iterator_;
@@ -85,6 +104,8 @@ struct WriteBatchIndexEntry {
   WriteBatchIndexEntry(size_t o, uint32_t c, size_t ko, size_t ksz)
       : offset(o),
         column_family(c),
+        has_single_del(false),
+        has_overwritten_single_del(false),
         key_offset(ko),
         key_size(ksz),
         search_key(nullptr) {}
@@ -102,6 +123,8 @@ struct WriteBatchIndexEntry {
       // entry who has the same search key. Otherwise, we'll miss those entries.
       : offset(is_forward_direction ? 0 : std::numeric_limits<size_t>::max()),
         column_family(_column_family),
+        has_single_del(false),
+        has_overwritten_single_del(false),
         key_offset(0),
         key_size(is_seek_to_first ? kFlagMinInCf : 0),
         search_key(_search_key) {
@@ -128,6 +151,9 @@ struct WriteBatchIndexEntry {
   // SeekForPrev() will see all the keys with the same key.
   size_t offset;
   uint32_t column_family;  // column family of the entry.
+  bool has_single_del;     // whether single del was issued for this key
+  bool has_overwritten_single_del;  // whether a single del for this key was
+                                    // overwritten by another key
   size_t key_offset;       // offset of the key in write batch's string buffer.
   size_t key_size;         // size of the key. kFlagMinInCf indicates
                            // that this is a dummy look up entry for
@@ -190,7 +216,7 @@ class WriteBatchEntryComparator {
 using WriteBatchEntrySkipList =
     SkipList<WriteBatchIndexEntry*, const WriteBatchEntryComparator&>;
 
-class WBWIIteratorImpl : public WBWIIterator {
+class WBWIIteratorImpl final : public WBWIIterator {
  public:
   enum Result : uint8_t {
     kFound,
@@ -306,6 +332,11 @@ class WBWIIteratorImpl : public WBWIIterator {
 
   WriteEntry Entry() const override;
 
+  bool HasOverWrittenSingleDel() const override {
+    assert(Valid());
+    return skip_list_iter_.key()->has_overwritten_single_del;
+  }
+
   Status status() const override {
     // this is in-memory data structure, so the only way status can be non-ok is
     // through memory corruption