@nxtedition/rocksdb 15.4.0 → 15.5.0

package/deps/rocksdb/rocksdb/db/wide/wide_column_serialization_test.cc

@@ -5,13 +5,35 @@
 
 #include "db/wide/wide_column_serialization.h"
 
+#include <chrono>
+#include <limits>
+
+#include "db/blob/blob_index.h"
 #include "db/wide/wide_columns_helper.h"
 #include "test_util/testharness.h"
 #include "util/coding.h"
+#include "util/random.h"
 
 namespace ROCKSDB_NAMESPACE {
 
-TEST(WideColumnSerializationTest, Construct) {
+class WideColumnSerializationTest : public testing::Test {
+ protected:
+  // Wrappers for private methods accessible via friend declaration.
+  static Status GetVersion(const Slice& input, uint32_t& version) {
+    return WideColumnSerialization::GetVersion(input, version);
+  }
+
+  static Status SerializeResolvedEntity(
+      const std::vector<WideColumn>& columns,
+      const std::vector<std::pair<size_t, BlobIndex>>& blob_columns,
+      const std::vector<std::string>& resolved_blob_values,
+      std::string& output) {
+    return WideColumnSerialization::SerializeResolvedEntity(
+        columns, blob_columns, resolved_blob_values, output);
+  }
+};
+
+TEST_F(WideColumnSerializationTest, Construct) {
   constexpr char foo[] = "foo";
   constexpr char bar[] = "bar";
 
@@ -87,7 +109,7 @@ TEST(WideColumnSerializationTest, Construct) {
   }
 }
 
-TEST(WideColumnSerializationTest, SerializeDeserialize) {
+TEST_F(WideColumnSerializationTest, SerializeDeserialize) {
   WideColumns columns{{"foo", "bar"}, {"hello", "world"}};
   std::string output;
 
@@ -126,7 +148,7 @@ TEST(WideColumnSerializationTest, SerializeDeserialize) {
   }
 }
 
-TEST(WideColumnSerializationTest, SerializeDuplicateError) {
+TEST_F(WideColumnSerializationTest, SerializeDuplicateError) {
   WideColumns columns{{"foo", "bar"}, {"foo", "baz"}};
   std::string output;
 
@@ -134,7 +156,7 @@ TEST(WideColumnSerializationTest, SerializeDuplicateError) {
       WideColumnSerialization::Serialize(columns, output).IsCorruption());
 }
 
-TEST(WideColumnSerializationTest, SerializeOutOfOrderError) {
+TEST_F(WideColumnSerializationTest, SerializeOutOfOrderError) {
   WideColumns columns{{"hello", "world"}, {"foo", "bar"}};
   std::string output;
 
@@ -142,7 +164,7 @@ TEST(WideColumnSerializationTest, SerializeOutOfOrderError) {
       WideColumnSerialization::Serialize(columns, output).IsCorruption());
 }
 
-TEST(WideColumnSerializationTest, DeserializeVersionError) {
+TEST_F(WideColumnSerializationTest, DeserializeVersionError) {
   // Can't decode version
 
   std::string buf;
@@ -155,7 +177,7 @@ TEST(WideColumnSerializationTest, DeserializeVersionError) {
   ASSERT_TRUE(std::strstr(s.getState(), "version"));
 }
 
-TEST(WideColumnSerializationTest, DeserializeUnsupportedVersion) {
+TEST_F(WideColumnSerializationTest, DeserializeUnsupportedVersion) {
   // Unsupported version
   constexpr uint32_t future_version = 1000;
 
@@ -170,11 +192,11 @@ TEST(WideColumnSerializationTest, DeserializeUnsupportedVersion) {
   ASSERT_TRUE(std::strstr(s.getState(), "version"));
 }
 
-TEST(WideColumnSerializationTest, DeserializeNumberOfColumnsError) {
+TEST_F(WideColumnSerializationTest, DeserializeNumberOfColumnsError) {
   // Can't decode number of columns
 
   std::string buf;
-  PutVarint32(&buf, WideColumnSerialization::kCurrentVersion);
+  PutVarint32(&buf, WideColumnSerialization::kVersion1);
 
   Slice input(buf);
   WideColumns columns;
@@ -184,10 +206,10 @@ TEST(WideColumnSerializationTest, DeserializeNumberOfColumnsError) {
   ASSERT_TRUE(std::strstr(s.getState(), "number"));
 }
 
-TEST(WideColumnSerializationTest, DeserializeColumnsError) {
+TEST_F(WideColumnSerializationTest, DeserializeV2Error) {
   std::string buf;
 
-  PutVarint32(&buf, WideColumnSerialization::kCurrentVersion);
+  PutVarint32(&buf, WideColumnSerialization::kVersion1);
 
   constexpr uint32_t num_columns = 2;
   PutVarint32(&buf, num_columns);
@@ -277,10 +299,10 @@ TEST(WideColumnSerializationTest, DeserializeColumnsError) {
   }
 }
 
-TEST(WideColumnSerializationTest, DeserializeColumnsOutOfOrder) {
+TEST_F(WideColumnSerializationTest, DeserializeV2OutOfOrder) {
   std::string buf;
 
-  PutVarint32(&buf, WideColumnSerialization::kCurrentVersion);
+  PutVarint32(&buf, WideColumnSerialization::kVersion1);
 
   constexpr uint32_t num_columns = 2;
   PutVarint32(&buf, num_columns);
@@ -302,6 +324,521 @@ TEST(WideColumnSerializationTest, DeserializeColumnsOutOfOrder) {
   ASSERT_TRUE(std::strstr(s.getState(), "order"));
 }
 
+TEST_F(WideColumnSerializationTest, DeserializeV2RejectsRecursiveType) {
+  // Manually construct a V2 entity where one column has type
+  // kTypeWideColumnEntity, which would create recursive nesting.
+  // Deserialization must reject this.
+  std::string buf;
+
+  PutVarint32(&buf, WideColumnSerialization::kVersion2);
+
+  constexpr uint32_t num_columns = 2;
+  PutVarint32(&buf, num_columns);
+
+  // Section 2: COLUMN TYPES -- first column inline, second recursive
+  buf.push_back(static_cast<char>(kTypeValue));
+  buf.push_back(static_cast<char>(kTypeWideColumnEntity));
+
+  // Section 3: SKIP INFO
+  PutVarint32(&buf, 2);  // name_sizes_bytes (varint(1) + varint(1))
+  PutVarint32(&buf, 2);  // value_sizes_bytes (varint(3) + varint(5))
+  PutVarint32(&buf, 2);  // names_bytes ("a" + "b")
+
+  // Section 4: NAME SIZES
+  PutVarint32(&buf, 1);  // "a"
+  PutVarint32(&buf, 1);  // "b"
+
+  // Section 5: VALUE SIZES
+  PutVarint32(&buf, 3);
+  PutVarint32(&buf, 5);
+
+  // Section 6: NAMES
+  buf.append("ab");
+
+  // Section 7: VALUES (8 bytes of placeholder data)
+  buf.append(8, 'x');
+
+  // DeserializeV2 should reject with Corruption
+  {
+    Slice input(buf);
+    std::vector<WideColumn> columns;
+    std::vector<std::pair<size_t, BlobIndex>> blob_columns;
+    const Status s =
+        WideColumnSerialization::DeserializeV2(input, columns, blob_columns);
+    ASSERT_TRUE(s.IsCorruption());
+    ASSERT_TRUE(std::strstr(s.getState(), "Unsupported wide column ValueType"));
+  }
+
+  // Deserialize (V1-only API) should also reject
+  {
+    Slice input(buf);
+    WideColumns columns;
+    const Status s = WideColumnSerialization::Deserialize(input, columns);
+    ASSERT_TRUE(s.IsCorruption());
+  }
+}
+
+// Helper: create a BlobIndex from EncodeBlob parameters.
+static BlobIndex MakeBlobIndex(uint64_t file_number, uint64_t offset,
+                               uint64_t size,
+                               CompressionType compression = kNoCompression) {
+  std::string encoded;
+  BlobIndex::EncodeBlob(&encoded, file_number, offset, size, compression);
+  BlobIndex bi;
+  Slice s(encoded);
+  assert(bi.DecodeFrom(s).ok());
+  return bi;
+}
+
+// Helper: V2 serialize → DeserializeV2 round-trip, returning
+// deserialized columns and blob column info.
+static void V2SerializeAndDeserialize(
+    const std::vector<std::pair<std::string, std::string>>& columns,
+    const std::vector<std::pair<size_t, BlobIndex>>& blob_columns_in,
+    std::vector<WideColumn>* deserialized,
+    std::vector<std::pair<size_t, BlobIndex>>* blob_columns_out,
+    std::string* serialized_out) {
+  ASSERT_OK(WideColumnSerialization::SerializeV2(columns, blob_columns_in,
+                                                 *serialized_out));
+
+  Slice input(*serialized_out);
+  ASSERT_OK(WideColumnSerialization::DeserializeV2(input, *deserialized,
+                                                   *blob_columns_out));
+  ASSERT_EQ(deserialized->size(), columns.size());
+  for (size_t i = 0; i < columns.size(); ++i) {
+    ASSERT_EQ((*deserialized)[i].name(), columns[i].first);
+  }
+}
+
+// Helper: build WideColumns from string pairs.
+static WideColumns ToWideColumns(
+    const std::vector<std::pair<std::string, std::string>>& columns) {
+  WideColumns wc;
+  wc.reserve(columns.size());
+  for (const auto& col : columns) {
+    wc.emplace_back(Slice(col.first), Slice(col.second));
+  }
+  return wc;
+}
+
+// Helper: deserialize and verify column names match expected.first
+// and column values match expected_values[i].
+static void VerifyDeserialize(
+    const std::string& serialized,
+    const std::vector<std::pair<std::string, std::string>>& expected,
+    const std::vector<std::string>& expected_values) {
+  Slice input(serialized);
+  WideColumns deserialized;
+  ASSERT_OK(WideColumnSerialization::Deserialize(input, deserialized));
+  ASSERT_EQ(deserialized.size(), expected.size());
+  for (size_t i = 0; i < expected.size(); ++i) {
+    ASSERT_EQ(deserialized[i].name(), expected[i].first);
+    ASSERT_EQ(deserialized[i].value(), expected_values[i]);
+  }
+}
+
+// Convenience overload: values come from expected[i].second.
+static void VerifyDeserialize(
+    const std::string& serialized,
+    const std::vector<std::pair<std::string, std::string>>& expected) {
+  std::vector<std::string> values;
+  values.reserve(expected.size());
+  for (const auto& col : expected) {
+    values.push_back(col.second);
+  }
+  VerifyDeserialize(serialized, expected, values);
+}
+
+// Helper: create a random non-inlined BlobIndex using the given RNG.
+// Only creates Blob or BlobTTL types (not InlinedTTL), because InlinedTTL
+// stores a Slice pointing into the encoded string, which would become a
+// dangling reference after this function returns.
+static BlobIndex MakeRandomBlobIndex(Random& rng) {
+  std::string bi_str;
+  if (rng.Uniform(2) == 0) {
+    BlobIndex::EncodeBlob(&bi_str, rng.Uniform(1000), rng.Uniform(10000),
+                          rng.Uniform(5000), kNoCompression);
+  } else {
+    BlobIndex::EncodeBlobTTL(&bi_str, rng.Uniform(1000000), rng.Uniform(1000),
+                             rng.Uniform(10000), rng.Uniform(5000),
+                             kSnappyCompression);
+  }
+  BlobIndex bi;
+  Slice s(bi_str);
+  assert(bi.DecodeFrom(s).ok());
+  return bi;
+}
+
+// Helper: V2 serialize with no blobs then GetValueOfDefaultColumn.
+static void VerifyGetDefaultColumn(
+    const std::vector<std::pair<std::string, std::string>>& columns,
+    const Slice& expected_value) {
+  std::vector<std::pair<size_t, BlobIndex>> no_blobs;
+  std::string serialized;
+  ASSERT_OK(
+      WideColumnSerialization::SerializeV2(columns, no_blobs, serialized));
+
+  Slice input(serialized);
+  Slice value;
+  ASSERT_OK(WideColumnSerialization::GetValueOfDefaultColumn(input, value));
+  ASSERT_EQ(value, expected_value);
+}
+
+TEST_F(WideColumnSerializationTest, SerializeResolvedEntity) {
+  // Test resolve with mixed, all-blob, and no-blob configurations
+  struct TestCase {
+    std::vector<std::pair<std::string, std::string>> columns;
+    std::vector<std::pair<size_t, BlobIndex>> blob_cols;
+    std::vector<std::string> resolved_values;
+    std::vector<std::string> expected_values;
+  };
+
+  std::vector<TestCase> cases = {
+      // Mixed inline and blob
+      {.columns = {{"a", "inline_a"}, {"b", "ph"}, {"c", "inline_c"}},
+       .blob_cols = {{1, MakeBlobIndex(50, 500, 100)}},
+       .resolved_values = {"resolved_b"},
+       .expected_values = {"inline_a", "resolved_b", "inline_c"}},
+      // All blob columns
+      {.columns = {{"x", "ph1"}, {"y", "ph2"}, {"z", "ph3"}},
+       .blob_cols = {{0, MakeBlobIndex(10, 100, 50)},
+                     {1, MakeBlobIndex(20, 200, 60)},
+                     {2, MakeBlobIndex(30, 300, 70)}},
+       .resolved_values = {"val_x", "val_y", "val_z"},
+       .expected_values = {"val_x", "val_y", "val_z"}},
+      // No blob columns
+      {.columns = {{"alpha", "val_alpha"}, {"beta", "val_beta"}},
+       .blob_cols = {},
+       .resolved_values = {},
+       .expected_values = {"val_alpha", "val_beta"}},
+  };
+
+  for (const auto& tc : cases) {
+    std::string serialized;
+    std::vector<WideColumn> deserialized;
+    std::vector<std::pair<size_t, BlobIndex>> blob_out;
+    V2SerializeAndDeserialize(tc.columns, tc.blob_cols, &deserialized,
+                              &blob_out, &serialized);
+
+    std::string resolved_output;
+    ASSERT_OK(WideColumnSerializationTest::SerializeResolvedEntity(
+        deserialized, blob_out, tc.resolved_values, resolved_output));
+
+    uint32_t v = 0;
+    ASSERT_OK(GetVersion(Slice(resolved_output), v));
+    ASSERT_EQ(v, WideColumnSerialization::kVersion1);
+
+    VerifyDeserialize(resolved_output, tc.columns, tc.expected_values);
+  }
+}
+
+TEST_F(WideColumnSerializationTest, V2GetValueOfDefaultColumn) {
+  // V2 with default column present
+  VerifyGetDefaultColumn({{"", "default_value"}, {"col1", "value1"}},
+                         "default_value");
+  // V2 without default column
+  VerifyGetDefaultColumn({{"col1", "value1"}, {"col2", "value2"}}, Slice());
+  // V2 with zero columns
+  VerifyGetDefaultColumn({}, Slice());
+
+  // V1 fallback
+  {
+    WideColumns columns{{"", "v1_default"}, {"col1", "v1"}};
+    std::string serialized;
+    ASSERT_OK(WideColumnSerialization::Serialize(columns, serialized));
+
+    Slice input(serialized);
+    Slice value;
+    ASSERT_OK(WideColumnSerialization::GetValueOfDefaultColumn(input, value));
+    ASSERT_EQ(value, "v1_default");
+  }
+}
+
+TEST_F(WideColumnSerializationTest, V2BlobColumnRejectsDeserialize) {
+  std::vector<std::pair<std::string, std::string>> columns = {
+      {"a", "inline"}, {"b", "placeholder"}};
+  std::vector<std::pair<size_t, BlobIndex>> blob_columns = {
+      {1, MakeBlobIndex(1, 2, 3)}};
+
+  std::string serialized;
+  ASSERT_OK(
+      WideColumnSerialization::SerializeV2(columns, blob_columns, serialized));
+
+  Slice input(serialized);
+  WideColumns deserialized;
+  ASSERT_TRUE(WideColumnSerialization::Deserialize(input, deserialized)
+                  .IsNotSupported());
+}
+
+TEST_F(WideColumnSerializationTest, V2GetValueOfDefaultColumnBlobRef) {
+  // When default column (index 0) is a blob reference,
+  // GetValueOfDefaultColumn should return NotSupported.
+  std::vector<std::pair<std::string, std::string>> columns = {
+      {"", "placeholder"}, {"col1", "value1"}};
+  std::vector<std::pair<size_t, BlobIndex>> blob_columns = {
+      {0, MakeBlobIndex(10, 100, 500)}};
+
+  std::string serialized;
+  ASSERT_OK(
+      WideColumnSerialization::SerializeV2(columns, blob_columns, serialized));
+
+  Slice input(serialized);
+  Slice value;
+  ASSERT_TRUE(WideColumnSerialization::GetValueOfDefaultColumn(input, value)
+                  .IsNotSupported());
+}
+
+TEST_F(WideColumnSerializationTest, SerializeV2Errors) {
+  // Blob column index out of range
+  {
+    std::vector<std::pair<std::string, std::string>> columns = {{"a", "val"}};
+    std::vector<std::pair<size_t, BlobIndex>> blob_columns = {
+        {5, MakeBlobIndex(1, 2, 3)}};  // index 5 but only 1 column
+
+    std::string output;
+    ASSERT_TRUE(
+        WideColumnSerialization::SerializeV2(columns, blob_columns, output)
+            .IsInvalidArgument());
+  }
+
+  // Columns out of order (V2)
+  {
+    std::vector<std::pair<std::string, std::string>> columns = {{"b", "val_b"},
+                                                                {"a", "val_a"}};
+    std::vector<std::pair<size_t, BlobIndex>> no_blobs;
+
+    std::string output;
+    ASSERT_TRUE(WideColumnSerialization::SerializeV2(columns, no_blobs, output)
+                    .IsCorruption());
+  }
+
+  // Duplicate column names (V2)
+  {
+    std::vector<std::pair<std::string, std::string>> columns = {{"a", "val1"},
+                                                                {"a", "val2"}};
+    std::vector<std::pair<size_t, BlobIndex>> no_blobs;
+
+    std::string output;
+    ASSERT_TRUE(WideColumnSerialization::SerializeV2(columns, no_blobs, output)
+                    .IsCorruption());
+  }
+}
+
+TEST_F(WideColumnSerializationTest, BlobIndexEncodeToRoundTrip) {
+  // Test EncodeTo produces identical output to static Encode methods
+  // for all three blob index types.
+  auto verify_encode_to = [](const std::string& encoded_static) {
+    BlobIndex bi;
+    Slice s(encoded_static);
+    ASSERT_OK(bi.DecodeFrom(s));
+    std::string encoded_instance;
+    bi.EncodeTo(&encoded_instance);
+    ASSERT_EQ(encoded_static, encoded_instance);
+  };
+
+  std::string blob_str;
+  std::string blob_ttl_str;
+  std::string inlined_str;
+  BlobIndex::EncodeBlob(&blob_str, 42, 1024, 2048, kSnappyCompression);
+  BlobIndex::EncodeBlobTTL(&blob_ttl_str, 9999, 10, 200, 3000,
+                           kZlibCompression);
+  BlobIndex::EncodeInlinedTTL(&inlined_str, 12345, "inline_data");
+
+  verify_encode_to(blob_str);
+  verify_encode_to(blob_ttl_str);
+  verify_encode_to(inlined_str);
+}
+
+TEST_F(WideColumnSerializationTest, V2LayoutStructureVerification) {
+  // Verify the V2 binary layout structure by manually parsing sections
+  std::vector<std::pair<std::string, std::string>> columns = {
+      {"aa", "val_aa"}, {"bbb", "val_bbb"}};
+  std::vector<std::pair<size_t, BlobIndex>> empty_blob_columns;
+
+  std::string serialized;
+  ASSERT_OK(WideColumnSerialization::SerializeV2(columns, empty_blob_columns,
+                                                 serialized));
+
+  Slice data(serialized);
+
+  // Section 1: HEADER
+  uint32_t version = 0;
+  ASSERT_TRUE(GetVarint32(&data, &version));
+  ASSERT_EQ(version, WideColumnSerialization::kVersion2);
+
+  uint32_t num_columns = 0;
+  ASSERT_TRUE(GetVarint32(&data, &num_columns));
+  ASSERT_EQ(num_columns, 2u);
+
+  // Section 2: SKIP INFO (3 varints)
+  uint32_t name_sizes_bytes = 0;
+  uint32_t value_sizes_bytes = 0;
+  uint32_t names_bytes = 0;
+  ASSERT_TRUE(GetVarint32(&data, &name_sizes_bytes));
+  ASSERT_TRUE(GetVarint32(&data, &value_sizes_bytes));
+  ASSERT_TRUE(GetVarint32(&data, &names_bytes));
+  // name sizes: varint(2) + varint(3) = 1 + 1 = 2 bytes
+  ASSERT_EQ(name_sizes_bytes, 2u);
+  // value sizes: varint(6) + varint(7) = 1 + 1 = 2 bytes
+  ASSERT_EQ(value_sizes_bytes, 2u);
+  // names: "aa" + "bbb" = 2 + 3 = 5 bytes
+  ASSERT_EQ(names_bytes, 5u);
+
+  // Section 3: COLUMN TYPES (2 bytes, both inline)
+  ASSERT_GE(data.size(), 2u);
+  ASSERT_EQ(static_cast<uint8_t>(data[0]), static_cast<uint8_t>(kTypeValue));
+  ASSERT_EQ(static_cast<uint8_t>(data[1]), static_cast<uint8_t>(kTypeValue));
+  data.remove_prefix(2);
+
+  // Section 4: NAME SIZES
+  uint32_t ns0 = 0;
+  uint32_t ns1 = 0;
+  ASSERT_TRUE(GetVarint32(&data, &ns0));
+  ASSERT_TRUE(GetVarint32(&data, &ns1));
+  ASSERT_EQ(ns0, 2u);
+  ASSERT_EQ(ns1, 3u);
+
+  // Section 5: VALUE SIZES
+  uint32_t vs0 = 0;
+  uint32_t vs1 = 0;
+  ASSERT_TRUE(GetVarint32(&data, &vs0));
+  ASSERT_TRUE(GetVarint32(&data, &vs1));
+  ASSERT_EQ(vs0, 6u);  // "val_aa" = 6
+  ASSERT_EQ(vs1, 7u);  // "val_bbb" = 7
+
+  // Section 6: COLUMN NAMES
+  ASSERT_GE(data.size(), 5u);
+  ASSERT_EQ(Slice(data.data(), 2), "aa");
+  ASSERT_EQ(Slice(data.data() + 2, 3), "bbb");
+  data.remove_prefix(5);
+
+  // Section 7: COLUMN VALUES
+  ASSERT_GE(data.size(), 13u);
+  ASSERT_EQ(Slice(data.data(), 6), "val_aa");
+  ASSERT_EQ(Slice(data.data() + 6, 7), "val_bbb");
+}
+
+// Randomized correctness test: serialize and deserialize with random column
+// counts, name sizes, value sizes, and randomly chosen blob columns.
+// Validates the full round-trip for both V1 (Serialize) and V2
+// (SerializeV2) formats.
+TEST_F(WideColumnSerializationTest, RandomizedSerializeDeserializeRoundTrip) {
+  uint32_t seed = static_cast<uint32_t>(
+      std::chrono::system_clock::now().time_since_epoch().count());
+  Random rng(seed);
+  SCOPED_TRACE("seed=" + std::to_string(seed));
+
+  constexpr int kNumIterations = 100;
+
+  for (int iter = 0; iter < kNumIterations; ++iter) {
+    int num_cols = rng.Uniform(17);     // 0..16
+    int name_sz = 1 + rng.Uniform(64);  // 1..64
+    int val_sz = rng.Uniform(1025);     // 0..1024
+
+    // Generate sorted column names and random values
+    std::vector<std::pair<std::string, std::string>> columns;
+    columns.reserve(num_cols);
+    for (int c = 0; c < num_cols; ++c) {
+      // Build a sorted, unique name of exactly name_sz bytes.
+      // Use hex-encoded index as prefix to guarantee sort order,
+      // then pad with random characters.
+      char idx_str[16];
+      snprintf(idx_str, sizeof(idx_str), "%04x", c);
+      std::string name(idx_str);
+      if (static_cast<int>(name.size()) < name_sz) {
+        name.append(name_sz - name.size(),
+                    static_cast<char>('a' + rng.Uniform(26)));
+      }
+      // Ensure exactly name_sz bytes. For name_sz < 4, use just the
+      // low-order hex digits to maintain sort order.
+      if (static_cast<int>(name.size()) > name_sz) {
+        name = name.substr(name.size() - name_sz);
+      }
+
+      // Random value content
+      std::string value(val_sz, '\0');
+      for (int j = 0; j < val_sz; ++j) {
+        value[j] = static_cast<char>(rng.Uniform(256));
+      }
+      columns.emplace_back(std::move(name), std::move(value));
+    }
+
+    // Randomly select some columns as blob columns
+    std::vector<std::pair<size_t, BlobIndex>> blob_columns;
+    for (int c = 0; c < num_cols; ++c) {
+      if (rng.Uniform(3) == 0) {  // ~33% chance of being a blob column
+        blob_columns.emplace_back(c, MakeRandomBlobIndex(rng));
+      }
+    }
+
+    // V2 serialize → DeserializeV2 round-trip
+    std::string serialized;
+    std::vector<WideColumn> deserialized;
+    std::vector<std::pair<size_t, BlobIndex>> blob_out;
+    V2SerializeAndDeserialize(columns, blob_columns, &deserialized, &blob_out,
+                              &serialized);
+
+    // Verify version and HasBlobColumns
+    uint32_t v = 0;
+    ASSERT_OK(GetVersion(Slice(serialized), v));
+    ASSERT_EQ(v, WideColumnSerialization::kVersion2);
+
+    bool hb = false;
+    ASSERT_OK(WideColumnSerialization::HasBlobColumns(Slice(serialized), hb));
+    ASSERT_EQ(hb, !blob_columns.empty());
+
+    // Verify blob column round-trip
+    ASSERT_EQ(blob_out.size(), blob_columns.size());
+    for (size_t b = 0; b < blob_columns.size(); ++b) {
+      ASSERT_EQ(blob_out[b].first, blob_columns[b].first);
+      const BlobIndex& orig = blob_columns[b].second;
+      const BlobIndex& decoded = blob_out[b].second;
+      ASSERT_EQ(decoded.IsInlined(), orig.IsInlined());
+      ASSERT_EQ(decoded.HasTTL(), orig.HasTTL());
+      if (!decoded.IsInlined()) {
+        ASSERT_EQ(decoded.file_number(), orig.file_number());
+        ASSERT_EQ(decoded.offset(), orig.offset());
+        ASSERT_EQ(decoded.size(), orig.size());
+      }
+    }
+
+    // Verify inline column values
+    size_t blob_idx = 0;
+    for (int c = 0; c < num_cols; ++c) {
+      if (blob_idx < blob_columns.size() &&
+          blob_columns[blob_idx].first == static_cast<size_t>(c)) {
+        ++blob_idx;
+      } else {
+        ASSERT_EQ(deserialized[c].value(), columns[c].second);
+      }
+    }
+
+    // If no blob columns, also verify Deserialize() and both overloads
+    if (blob_columns.empty()) {
+      VerifyDeserialize(serialized, columns);
+
+      // WideColumns overload should produce identical output
+      std::string serialized2;
+      WideColumns wc = ToWideColumns(columns);
+      ASSERT_OK(
+          WideColumnSerialization::SerializeV2(wc, blob_columns, serialized2));
+      ASSERT_EQ(serialized, serialized2);
+    }
+
+    // V1 Serialize round-trip
+    {
+      WideColumns wc = ToWideColumns(columns);
+      std::string serialized_v1;
+      ASSERT_OK(WideColumnSerialization::Serialize(wc, serialized_v1));
+
+      ASSERT_OK(GetVersion(Slice(serialized_v1), v));
+      ASSERT_EQ(v, WideColumnSerialization::kVersion1);
+
+      VerifyDeserialize(serialized_v1, columns);
+    }
+  }
+}
+
 }  // namespace ROCKSDB_NAMESPACE
 
 int main(int argc, char** argv) {

package/deps/rocksdb/rocksdb/db/write_callback_test.cc

@@ -419,7 +419,7 @@ TEST_F(WriteCallbackTest, WriteCallBackTest) {
   WriteOptions write_options;
   ReadOptions read_options;
   string value;
-  DB* db;
+  std::unique_ptr<DB> db;
   DBImpl* db_impl;
 
   ASSERT_OK(DestroyDB(dbname, options));
@@ -428,7 +428,7 @@ TEST_F(WriteCallbackTest, WriteCallBackTest) {
   Status s = DB::Open(options, dbname, &db);
   ASSERT_OK(s);
 
-  db_impl = dynamic_cast<DBImpl*>(db);
+  db_impl = dynamic_cast<DBImpl*>(db.get());
   ASSERT_TRUE(db_impl);
 
   WriteBatch wb;
@@ -481,7 +481,7 @@ TEST_F(WriteCallbackTest, WriteCallBackTest) {
   ASSERT_TRUE(user_write_cb.write_enqueued_.load());
   ASSERT_TRUE(user_write_cb.wal_write_done_.load());
 
-  delete db;
+  db.reset();
   ASSERT_OK(DestroyDB(dbname, options));
 }
 

package/deps/rocksdb/rocksdb/db_stress_tool/cf_consistency_stress.cc

@@ -1047,7 +1047,7 @@ class CfConsistencyStressTest : public StressTest {
     assert(thread);
     Status status;
 
-    DB* db_ptr = secondary_db_ ? secondary_db_ : db_;
+    DB* db_ptr = secondary_db_ ? secondary_db_.get() : db_;
     const auto& cfhs = secondary_db_ ? secondary_cfhs_ : column_families_;
 
     // Take a snapshot to preserve the state of primary db.

package/deps/rocksdb/rocksdb/db_stress_tool/db_stress_common.cc

@@ -877,5 +877,24 @@ Status DestroyUnverifiedSubdir(const std::string& dirname) {
   return s;
 }
 
+Status DbStressDestroyDb(const std::string& db_path) {
+  Status s;
+  Options options;
+  // NOTE: using db_stress_listener_env in order to see obsolete MANIFEST files
+  options.env = db_stress_listener_env;
+  // Remove DB files in a principled way to avoid issues
+  if (FLAGS_use_blob_db) {
+    s = blob_db::DestroyBlobDB(db_path, options, blob_db::BlobDBOptions());
+  } else {
+    s = DestroyDB(db_path, options);
+  }
+  if (!s.ok()) {
+    return s;
+  }
+  // Remove everything else recursively, only reporting success if able to
+  // delete everything
+  return DestroyDir(db_stress_listener_env, db_path);
+}
+
 }  // namespace ROCKSDB_NAMESPACE
 #endif  // GFLAGS