@nxtedition/rocksdb 8.1.3 → 8.1.4

package/deps/rocksdb/rocksdb/db/db_range_del_test.cc

@@ -479,10 +479,7 @@ TEST_F(DBRangeDelTest, ValidUniversalSubcompactionBoundaries) {
       std::vector<std::string> values;
       // Write 100KB (100 values, each 1K)
       for (int k = 0; k < kNumPerFile; k++) {
-        // For the highest level, use smaller value size such that it does not
-        // prematurely cause auto compaction due to range tombstone adding
-        // additional compensated file size
-        values.push_back(rnd.RandomString((i == kNumLevels - 2) ? 600 : 990));
+        values.push_back(rnd.RandomString(990));
         ASSERT_OK(Put(Key(j * kNumPerFile + k), values[k]));
       }
       // put extra key to trigger flush
@@ -495,13 +492,7 @@ TEST_F(DBRangeDelTest, ValidUniversalSubcompactionBoundaries) {
     }
     ASSERT_OK(dbfull()->TEST_WaitForCompact());
     ASSERT_EQ(NumTableFilesAtLevel(0), 0);
-    if (i == kNumLevels - 2) {
-      // For the highest level, value size is smaller (see Put() above),
-      // so output file number is smaller.
-      ASSERT_GT(NumTableFilesAtLevel(kNumLevels - 1 - i), kFilesPerLevel - 2);
-    } else {
-      ASSERT_GT(NumTableFilesAtLevel(kNumLevels - 1 - i), kFilesPerLevel - 1);
-    }
+    ASSERT_GT(NumTableFilesAtLevel(kNumLevels - 1 - i), kFilesPerLevel - 1);
   }
   // Now L1-L3 are full, when we compact L1->L2 we should see (1) subcompactions
   // happen since input level > 0; (2) range deletions are not dropped since
@@ -1670,213 +1661,6 @@ TEST_F(DBRangeDelTest, RangeTombstoneWrittenToMinimalSsts) {
   ASSERT_EQ(1, num_range_deletions);
 }
 
-// Test SST partitioner cut after every single key
-class SingleKeySstPartitioner : public SstPartitioner {
- public:
-  const char* Name() const override { return "SingleKeySstPartitioner"; }
-
-  PartitionerResult ShouldPartition(
-      const PartitionerRequest& /*request*/) override {
-    return kRequired;
-  }
-
-  bool CanDoTrivialMove(const Slice& /*smallest_user_key*/,
-                        const Slice& /*largest_user_key*/) override {
-    return false;
-  }
-};
-
-class SingleKeySstPartitionerFactory : public SstPartitionerFactory {
- public:
-  static const char* kClassName() { return "SingleKeySstPartitionerFactory"; }
-  const char* Name() const override { return kClassName(); }
-
-  std::unique_ptr<SstPartitioner> CreatePartitioner(
-      const SstPartitioner::Context& /* context */) const override {
-    return std::unique_ptr<SstPartitioner>(new SingleKeySstPartitioner());
-  }
-};
-
-TEST_F(DBRangeDelTest, LevelCompactOutputCutAtRangeTombstoneForTtlFiles) {
-  Options options = CurrentOptions();
-  options.compression = kNoCompression;
-  options.compaction_pri = kMinOverlappingRatio;
-  options.disable_auto_compactions = true;
-  options.ttl = 24 * 60 * 60;  // 24 hours
-  options.target_file_size_base = 8 << 10;
-  env_->SetMockSleep();
-  options.env = env_;
-  DestroyAndReopen(options);
-
-  Random rnd(301);
-  // Fill some data so that future compactions are not bottommost level
-  // compaction, and hence they would try cut around files for ttl
-  for (int i = 5; i < 10; ++i) {
-    ASSERT_OK(Put(Key(i), rnd.RandomString(1 << 10)));
-  }
-  ASSERT_OK(Flush());
-  MoveFilesToLevel(3);
-  ASSERT_EQ("0,0,0,1", FilesPerLevel());
-
-  for (int i = 5; i < 10; ++i) {
-    ASSERT_OK(Put(Key(i), rnd.RandomString(1 << 10)));
-  }
-  ASSERT_OK(Flush());
-  MoveFilesToLevel(1);
-  ASSERT_EQ("0,1,0,1", FilesPerLevel());
-
-  env_->MockSleepForSeconds(20 * 60 * 60);
-  ASSERT_OK(db_->DeleteRange(WriteOptions(), db_->DefaultColumnFamily(),
-                             Key(11), Key(12)));
-  ASSERT_OK(Put(Key(0), rnd.RandomString(1 << 10)));
-  ASSERT_OK(Flush());
-  ASSERT_EQ("1,1,0,1", FilesPerLevel());
-  // L0 file is new, L1 and L3 file are old and qualified for TTL
-  env_->MockSleepForSeconds(10 * 60 * 60);
-  MoveFilesToLevel(1);
-  // L1 output should be cut into 3 files:
-  // File 0: Key(0)
-  // File 1: (qualified for TTL): Key(5) - Key(10)
-  // File 1: DeleteRange [11, 12)
-  ASSERT_EQ("0,3,0,1", FilesPerLevel());
-}
-
-TEST_F(DBRangeDelTest, CompactionEmitRangeTombstoneToSSTPartitioner) {
-  Options options = CurrentOptions();
-  auto factory = std::make_shared<SingleKeySstPartitionerFactory>();
-  options.sst_partitioner_factory = factory;
-  options.disable_auto_compactions = true;
-  DestroyAndReopen(options);
-
-  Random rnd(301);
-  // range deletion keys are not processed when compacting to bottommost level,
-  // so creating a file at older level to make the next compaction not
-  // bottommost level
-  ASSERT_OK(db_->Put(WriteOptions(), Key(4), rnd.RandomString(10)));
-  ASSERT_OK(Flush());
-  MoveFilesToLevel(5);
-
-  ASSERT_OK(db_->Put(WriteOptions(), Key(1), rnd.RandomString(10)));
-  ASSERT_OK(db_->DeleteRange(WriteOptions(), db_->DefaultColumnFamily(), Key(2),
-                             Key(5)));
-  ASSERT_OK(Flush());
-  ASSERT_EQ(1, NumTableFilesAtLevel(0));
-  MoveFilesToLevel(1);
-  // SSTPartitioner decides to cut when range tombstone start key is passed to
-  // it Note that the range tombstone [2, 5) itself span multiple keys but we
-  // are not able to partition in between yet.
-  ASSERT_EQ(2, NumTableFilesAtLevel(1));
-}
-
-TEST_F(DBRangeDelTest, OversizeCompactionGapBetweenPointKeyAndTombstone) {
-  // L2 has two files
-  // L2_0: 0, 1, 2, 3, 4. L2_1: 5, 6, 7
-  // L0 has 0, [5, 6), 8
-  // max_compaction_bytes is less than the size of L2_0 and L2_1.
-  // When compacting L0 into L1, it should split into 3 files.
-  const int kNumPerFile = 4, kNumFiles = 2;
-  Options options = CurrentOptions();
-  options.disable_auto_compactions = true;
-  options.target_file_size_base = 9 * 1024;
-  options.max_compaction_bytes = 9 * 1024;
-  DestroyAndReopen(options);
-  Random rnd(301);
-  for (int i = 0; i < kNumFiles; ++i) {
-    std::vector<std::string> values;
-    for (int j = 0; j < kNumPerFile; j++) {
-      values.push_back(rnd.RandomString(3 << 10));
-      ASSERT_OK(Put(Key(i * kNumPerFile + j), values[j]));
-    }
-  }
-  ASSERT_OK(db_->Flush(FlushOptions()));
-  ASSERT_EQ(1, NumTableFilesAtLevel(0));
-  MoveFilesToLevel(2);
-  ASSERT_EQ(2, NumTableFilesAtLevel(2));
-  ASSERT_OK(Put(Key(0), rnd.RandomString(1 << 10)));
-  ASSERT_OK(db_->DeleteRange(WriteOptions(), db_->DefaultColumnFamily(), Key(5),
-                             Key(6)));
-  ASSERT_OK(Put(Key(8), rnd.RandomString(1 << 10)));
-  ASSERT_OK(db_->Flush(FlushOptions()));
-  ASSERT_EQ(1, NumTableFilesAtLevel(0));
-
-  ASSERT_OK(dbfull()->TEST_CompactRange(0, nullptr, nullptr, nullptr,
-                                        true /* disallow_trivial_move */));
-  ASSERT_EQ(3, NumTableFilesAtLevel(1));
-}
-
-TEST_F(DBRangeDelTest, OversizeCompactionGapBetweenTombstone) {
-  // L2 has two files
-  // L2_0: 0, 1, 2, 3, 4. L2_1: 5, 6, 7
-  // L0 has two range tombstones [0, 1), [7, 8).
-  // max_compaction_bytes is less than the size of L2_0.
-  // When compacting L0 into L1, the two range tombstones should be
-  // split into two files.
-  const int kNumPerFile = 4, kNumFiles = 2;
-  Options options = CurrentOptions();
-  options.disable_auto_compactions = true;
-  options.target_file_size_base = 9 * 1024;
-  options.max_compaction_bytes = 9 * 1024;
-  DestroyAndReopen(options);
-  Random rnd(301);
-  for (int i = 0; i < kNumFiles; ++i) {
-    std::vector<std::string> values;
-    // Write 12K (4 values, each 3K)
-    for (int j = 0; j < kNumPerFile; j++) {
-      values.push_back(rnd.RandomString(3 << 10));
-      ASSERT_OK(Put(Key(i * kNumPerFile + j), values[j]));
-    }
-  }
-  ASSERT_OK(db_->Flush(FlushOptions()));
-  ASSERT_EQ(1, NumTableFilesAtLevel(0));
-  MoveFilesToLevel(2);
-  ASSERT_EQ(2, NumTableFilesAtLevel(2));
-  ASSERT_OK(db_->DeleteRange(WriteOptions(), db_->DefaultColumnFamily(), Key(0),
-                             Key(1)));
-  ASSERT_OK(db_->DeleteRange(WriteOptions(), db_->DefaultColumnFamily(), Key(7),
-                             Key(8)));
-  ASSERT_OK(db_->Flush(FlushOptions()));
-  ASSERT_EQ(1, NumTableFilesAtLevel(0));
-
-  ASSERT_OK(dbfull()->TEST_CompactRange(0, nullptr, nullptr, nullptr,
-                                        true /* disallow_trivial_move */));
-  // This is L0 -> L1 compaction
-  // The two range tombstones are broken up into two output files
-  // to limit compaction size.
-  ASSERT_EQ(2, NumTableFilesAtLevel(1));
-}
-
-TEST_F(DBRangeDelTest, OversizeCompactionPointKeyWithinRangetombstone) {
-  // L2 has two files
-  // L2_0: 0, 1, 2, 3, 4. L2_1: 6, 7, 8
-  // L0 has [0, 9) and point key 5
-  // max_compaction_bytes is less than the size of L2_0.
-  // When compacting L0 into L1, the compaction should cut at point key 5.
-  Options options = CurrentOptions();
-  options.disable_auto_compactions = true;
-  options.target_file_size_base = 9 * 1024;
-  options.max_compaction_bytes = 9 * 1024;
-  DestroyAndReopen(options);
-  Random rnd(301);
-  for (int i = 0; i < 9; ++i) {
-    if (i == 5) {
-      ++i;
-    }
-    ASSERT_OK(Put(Key(i), rnd.RandomString(3 << 10)));
-  }
-  ASSERT_OK(db_->Flush(FlushOptions()));
-  ASSERT_EQ(1, NumTableFilesAtLevel(0));
-  MoveFilesToLevel(2);
-  ASSERT_EQ(2, NumTableFilesAtLevel(2));
-  ASSERT_OK(db_->DeleteRange(WriteOptions(), db_->DefaultColumnFamily(), Key(0),
-                             Key(9)));
-  ASSERT_OK(Put(Key(5), rnd.RandomString(1 << 10)));
-  ASSERT_OK(db_->Flush(FlushOptions()));
-  ASSERT_EQ(1, NumTableFilesAtLevel(0));
-  ASSERT_OK(dbfull()->TEST_CompactRange(0, nullptr, nullptr, nullptr,
-                                        true /* disallow_trivial_move */));
-  ASSERT_EQ(2, NumTableFilesAtLevel(1));
-}
-
 TEST_F(DBRangeDelTest, OverlappedTombstones) {
   const int kNumPerFile = 4, kNumFiles = 2;
   Options options = CurrentOptions();
@@ -2309,7 +2093,6 @@ TEST_F(DBRangeDelTest, NonOverlappingTombstonAtBoundary) {
   options.compression = kNoCompression;
   options.disable_auto_compactions = true;
   options.target_file_size_base = 2 * 1024;
-  options.level_compaction_dynamic_file_size = false;
   DestroyAndReopen(options);
 
   Random rnd(301);
@@ -2725,7 +2508,7 @@ TEST_F(DBRangeDelTest, LeftSentinelKeyTest) {
   options.compression = kNoCompression;
   options.disable_auto_compactions = true;
   options.target_file_size_base = 3 * 1024;
-  options.max_compaction_bytes = 2048;
+  options.max_compaction_bytes = 1024;
 
   DestroyAndReopen(options);
   // L2
@@ -2771,7 +2554,7 @@ TEST_F(DBRangeDelTest, LeftSentinelKeyTestWithNewerKey) {
   options.compression = kNoCompression;
   options.disable_auto_compactions = true;
   options.target_file_size_base = 3 * 1024;
-  options.max_compaction_bytes = 3 * 1024;
+  options.max_compaction_bytes = 1024;
 
   DestroyAndReopen(options);
   // L2
@@ -3013,110 +2796,6 @@ TEST_F(DBRangeDelTest, RangeTombstoneRespectIterateUpperBound) {
   ASSERT_OK(iter->status());
 }
 
-TEST_F(DBRangeDelTest, RangetombesoneCompensateFilesize) {
-  Options opts = CurrentOptions();
-  opts.disable_auto_compactions = true;
-  DestroyAndReopen(opts);
-
-  std::vector<std::string> values;
-  Random rnd(301);
-  // file in L2
-  values.push_back(rnd.RandomString(1 << 10));
-  ASSERT_OK(Put("a", values.back()));
-  values.push_back(rnd.RandomString(1 << 10));
-  ASSERT_OK(Put("b", values.back()));
-  ASSERT_OK(Flush());
-  MoveFilesToLevel(2);
-  uint64_t l2_size = 0;
-  ASSERT_OK(Size("a", "c", 0 /* cf */, &l2_size));
-  ASSERT_GT(l2_size, 0);
-  // file in L1
-  values.push_back(rnd.RandomString(1 << 10));
-  ASSERT_OK(Put("d", values.back()));
-  values.push_back(rnd.RandomString(1 << 10));
-  ASSERT_OK(Put("e", values.back()));
-  ASSERT_OK(Flush());
-  MoveFilesToLevel(1);
-  uint64_t l1_size = 0;
-  ASSERT_OK(Size("d", "f", 0 /* cf */, &l1_size));
-  ASSERT_GT(l1_size, 0);
-
-  ASSERT_OK(
-      db_->DeleteRange(WriteOptions(), db_->DefaultColumnFamily(), "a", "f"));
-  ASSERT_OK(Flush());
-  // Range deletion compensated size computed during flush time
-  std::vector<std::vector<FileMetaData>> level_to_files;
-  dbfull()->TEST_GetFilesMetaData(dbfull()->DefaultColumnFamily(),
-                                  &level_to_files);
-  ASSERT_EQ(level_to_files[0].size(), 1);
-  ASSERT_EQ(level_to_files[0][0].compensated_range_deletion_size,
-            l1_size + l2_size);
-  ASSERT_EQ(level_to_files[1].size(), 1);
-  ASSERT_EQ(level_to_files[1][0].compensated_range_deletion_size, 0);
-  ASSERT_EQ(level_to_files[2].size(), 1);
-  ASSERT_EQ(level_to_files[2][0].compensated_range_deletion_size, 0);
-
-  // Range deletion compensated size computed during compaction time
-  ASSERT_OK(dbfull()->TEST_CompactRange(0, nullptr, nullptr, nullptr,
-                                        true /* disallow_trivial_move */));
-  ASSERT_EQ(NumTableFilesAtLevel(0), 0);
-  ASSERT_EQ(NumTableFilesAtLevel(1), 1);
-  ASSERT_EQ(NumTableFilesAtLevel(2), 1);
-  dbfull()->TEST_GetFilesMetaData(dbfull()->DefaultColumnFamily(),
-                                  &level_to_files);
-  ASSERT_EQ(level_to_files[1].size(), 1);
-  ASSERT_EQ(level_to_files[1][0].compensated_range_deletion_size, l2_size);
-  ASSERT_EQ(level_to_files[2].size(), 1);
-  ASSERT_EQ(level_to_files[2][0].compensated_range_deletion_size, 0);
-}
-
-TEST_F(DBRangeDelTest, RangetombesoneCompensateFilesizePersistDuringReopen) {
-  Options opts = CurrentOptions();
-  opts.disable_auto_compactions = true;
-  DestroyAndReopen(opts);
-
-  std::vector<std::string> values;
-  Random rnd(301);
-  values.push_back(rnd.RandomString(1 << 10));
-  ASSERT_OK(Put("a", values.back()));
-  values.push_back(rnd.RandomString(1 << 10));
-  ASSERT_OK(Put("b", values.back()));
-  ASSERT_OK(Flush());
-  MoveFilesToLevel(2);
-
-  ASSERT_OK(
-      db_->DeleteRange(WriteOptions(), db_->DefaultColumnFamily(), "a", "c"));
-  ASSERT_OK(Flush());
-  MoveFilesToLevel(1);
-
-  ASSERT_OK(
-      db_->DeleteRange(WriteOptions(), db_->DefaultColumnFamily(), "a", "z"));
-  ASSERT_OK(Flush());
-
-  std::vector<std::vector<FileMetaData>> level_to_files;
-  dbfull()->TEST_GetFilesMetaData(dbfull()->DefaultColumnFamily(),
-                                  &level_to_files);
-  ASSERT_EQ(level_to_files[0].size(), 1);
-  ASSERT_EQ(level_to_files[1].size(), 1);
-  ASSERT_EQ(level_to_files[2].size(), 1);
-  uint64_t l2_size = level_to_files[2][0].fd.GetFileSize();
-  uint64_t l1_size = level_to_files[1][0].fd.GetFileSize();
-  ASSERT_GT(l2_size, 0);
-  ASSERT_GT(l1_size, 0);
-  ASSERT_EQ(level_to_files[0][0].compensated_range_deletion_size,
-            l1_size + l2_size);
-  ASSERT_EQ(level_to_files[1][0].compensated_range_deletion_size, l2_size);
-
-  Reopen(opts);
-  dbfull()->TEST_GetFilesMetaData(dbfull()->DefaultColumnFamily(),
-                                  &level_to_files);
-  ASSERT_EQ(level_to_files[0].size(), 1);
-  ASSERT_EQ(level_to_files[0][0].compensated_range_deletion_size,
-            l1_size + l2_size);
-  ASSERT_EQ(level_to_files[1].size(), 1);
-  ASSERT_EQ(level_to_files[1][0].compensated_range_deletion_size, l2_size);
-}
-
 #endif  // ROCKSDB_LITE
 
 }  // namespace ROCKSDB_NAMESPACE

package/deps/rocksdb/rocksdb/db/db_test.cc

@@ -1203,8 +1203,6 @@ void CheckColumnFamilyMeta(
                 file_meta_from_files.file_creation_time);
       ASSERT_GE(file_meta_from_cf.file_creation_time, start_time);
       ASSERT_LE(file_meta_from_cf.file_creation_time, end_time);
-      ASSERT_EQ(file_meta_from_cf.epoch_number,
-                file_meta_from_files.epoch_number);
       ASSERT_GE(file_meta_from_cf.oldest_ancester_time, start_time);
       ASSERT_LE(file_meta_from_cf.oldest_ancester_time, end_time);
       // More from FileStorageInfo
@@ -1255,7 +1253,6 @@ void CheckLiveFilesMeta(
     ASSERT_EQ(meta.largestkey, expected_meta.largest.user_key().ToString());
     ASSERT_EQ(meta.oldest_blob_file_number,
               expected_meta.oldest_blob_file_number);
-    ASSERT_EQ(meta.epoch_number, expected_meta.epoch_number);
 
     // More from FileStorageInfo
     ASSERT_EQ(meta.file_type, kTableFile);