@nxtedition/rocksdb 8.1.2 → 8.1.4

package/deps/rocksdb/rocksdb/db/db_test2.cc

@@ -14,7 +14,6 @@
 
 #include "db/db_test_util.h"
 #include "db/read_callback.h"
-#include "db/version_edit.h"
 #include "options/options_helper.h"
 #include "port/port.h"
 #include "port/stack_trace.h"
@@ -34,18 +33,6 @@ namespace ROCKSDB_NAMESPACE {
 class DBTest2 : public DBTestBase {
  public:
   DBTest2() : DBTestBase("db_test2", /*env_do_fsync=*/true) {}
-  std::vector<FileMetaData*> GetLevelFileMetadatas(int level, int cf = 0) {
-    VersionSet* const versions = dbfull()->GetVersionSet();
-    assert(versions);
-    ColumnFamilyData* const cfd =
-        versions->GetColumnFamilySet()->GetColumnFamily(cf);
-    assert(cfd);
-    Version* const current = cfd->current();
-    assert(current);
-    VersionStorageInfo* const storage_info = current->storage_info();
-    assert(storage_info);
-    return storage_info->LevelFiles(level);
-  }
 };
 
 #ifndef ROCKSDB_LITE
@@ -4536,7 +4523,7 @@ TEST_F(DBTest2, TraceAndReplay) {
   ASSERT_OK(replayer->Prepare());
   // Replay using 1 thread, 1x speed.
   ASSERT_OK(replayer->Replay(ReplayOptions(1, 1.0), res_cb));
-  ASSERT_GE(res_handler.GetAvgLatency(), 0.0);
+  ASSERT_GT(res_handler.GetAvgLatency(), 0.0);
   ASSERT_EQ(res_handler.GetNumWrites(), 8);
   ASSERT_EQ(res_handler.GetNumGets(), 3);
   ASSERT_EQ(res_handler.GetNumIterSeeks(), 2);
@@ -4562,7 +4549,7 @@ TEST_F(DBTest2, TraceAndReplay) {
   // Re-replay using 2 threads, 2x speed.
   ASSERT_OK(replayer->Prepare());
   ASSERT_OK(replayer->Replay(ReplayOptions(2, 2.0), res_cb));
-  ASSERT_GE(res_handler.GetAvgLatency(), 0.0);
+  ASSERT_GT(res_handler.GetAvgLatency(), 0.0);
   ASSERT_EQ(res_handler.GetNumWrites(), 8);
   ASSERT_EQ(res_handler.GetNumGets(), 3);
   ASSERT_EQ(res_handler.GetNumIterSeeks(), 2);
@@ -4572,7 +4559,7 @@ TEST_F(DBTest2, TraceAndReplay) {
   // Re-replay using 2 threads, 1/2 speed.
   ASSERT_OK(replayer->Prepare());
   ASSERT_OK(replayer->Replay(ReplayOptions(2, 0.5), res_cb));
-  ASSERT_GE(res_handler.GetAvgLatency(), 0.0);
+  ASSERT_GT(res_handler.GetAvgLatency(), 0.0);
   ASSERT_EQ(res_handler.GetNumWrites(), 8);
   ASSERT_EQ(res_handler.GetNumGets(), 3);
   ASSERT_EQ(res_handler.GetNumIterSeeks(), 2);
@@ -4770,7 +4757,7 @@ TEST_F(DBTest2, TraceAndManualReplay) {
     // end, or Prepare() was not called.
     ASSERT_TRUE(s.IsIncomplete());
     ASSERT_TRUE(replayer->Next(nullptr).IsIncomplete());
-    ASSERT_GE(res_handler.GetAvgLatency(), 0.0);
+    ASSERT_GT(res_handler.GetAvgLatency(), 0.0);
     ASSERT_EQ(res_handler.GetNumWrites(), 9);
     ASSERT_EQ(res_handler.GetNumGets(), 3);
     ASSERT_EQ(res_handler.GetNumIterSeeks(), 8);
@@ -4804,7 +4791,7 @@ TEST_F(DBTest2, TraceAndManualReplay) {
   ASSERT_EQ("write1", value);
   ASSERT_OK(db2->Get(ro, handles[0], "trace-record-write2", &value));
   ASSERT_EQ("write2", value);
-  ASSERT_GE(res_handler.GetAvgLatency(), 0.0);
+  ASSERT_GT(res_handler.GetAvgLatency(), 0.0);
   ASSERT_EQ(res_handler.GetNumWrites(), 1);
   ASSERT_EQ(res_handler.GetNumGets(), 0);
   ASSERT_EQ(res_handler.GetNumIterSeeks(), 0);
@@ -4829,7 +4816,7 @@ TEST_F(DBTest2, TraceAndManualReplay) {
   record.reset(new GetQueryTraceRecord(invalid_cf_id, "whatever", fake_ts++));
   ASSERT_TRUE(replayer->Execute(record, &result).IsCorruption());
   ASSERT_TRUE(result == nullptr);
-  ASSERT_GE(res_handler.GetAvgLatency(), 0.0);
+  ASSERT_GT(res_handler.GetAvgLatency(), 0.0);
   ASSERT_EQ(res_handler.GetNumWrites(), 0);
   ASSERT_EQ(res_handler.GetNumGets(), 2);
   ASSERT_EQ(res_handler.GetNumIterSeeks(), 0);
@@ -4858,7 +4845,7 @@ TEST_F(DBTest2, TraceAndManualReplay) {
     ASSERT_TRUE(replayer->Execute(record, &result).IsCorruption());
     ASSERT_TRUE(result == nullptr);
   }
-  ASSERT_GE(res_handler.GetAvgLatency(), 0.0);
+  ASSERT_GT(res_handler.GetAvgLatency(), 0.0);
   ASSERT_EQ(res_handler.GetNumWrites(), 0);
   ASSERT_EQ(res_handler.GetNumGets(), 0);
   ASSERT_EQ(res_handler.GetNumIterSeeks(), 4);  // Seek x 2 in two iterations
@@ -4913,7 +4900,7 @@ TEST_F(DBTest2, TraceAndManualReplay) {
       std::vector<std::string>({"a"}), fake_ts++));
   ASSERT_TRUE(replayer->Execute(record, &result).IsInvalidArgument());
   ASSERT_TRUE(result == nullptr);
-  ASSERT_GE(res_handler.GetAvgLatency(), 0.0);
+  ASSERT_GT(res_handler.GetAvgLatency(), 0.0);
   ASSERT_EQ(res_handler.GetNumWrites(), 0);
   ASSERT_EQ(res_handler.GetNumGets(), 0);
   ASSERT_EQ(res_handler.GetNumIterSeeks(), 0);
@@ -7338,218 +7325,6 @@ TEST_F(DBTest2, PointInTimeRecoveryWithSyncFailureInCFCreation) {
   ReopenWithColumnFamilies({"default", "test1", "test2"}, options);
 }
 
-#ifndef ROCKSDB_LITE
-TEST_F(DBTest2, SortL0FilesByEpochNumber) {
-  Options options = CurrentOptions();
-  options.num_levels = 1;
-  options.compaction_style = kCompactionStyleUniversal;
-  DestroyAndReopen(options);
-
-  // Set up L0 files to be sorted by their epoch_number
-  ASSERT_OK(Put("key1", "seq1"));
-
-  SstFileWriter sst_file_writer{EnvOptions(), options};
-  std::string external_file1 = dbname_ + "/test_files1.sst";
-  std::string external_file2 = dbname_ + "/test_files2.sst";
-  ASSERT_OK(sst_file_writer.Open(external_file1));
-  ASSERT_OK(sst_file_writer.Put("key2", "seq0"));
-  ASSERT_OK(sst_file_writer.Finish());
-  ASSERT_OK(sst_file_writer.Open(external_file2));
-  ASSERT_OK(sst_file_writer.Put("key3", "seq0"));
-  ASSERT_OK(sst_file_writer.Finish());
-
-  ASSERT_OK(Put("key4", "seq2"));
-  ASSERT_OK(Flush());
-
-  auto* handle = db_->DefaultColumnFamily();
-  ASSERT_OK(db_->IngestExternalFile(handle, {external_file1, external_file2},
-                                    IngestExternalFileOptions()));
-
-  // To verify L0 files are sorted by epoch_number in descending order
-  // instead of largest_seqno
-  std::vector<FileMetaData*> level0_files = GetLevelFileMetadatas(0 /* level*/);
-  ASSERT_EQ(level0_files.size(), 3);
-
-  EXPECT_EQ(level0_files[0]->epoch_number, 3);
-  EXPECT_EQ(level0_files[0]->fd.largest_seqno, 0);
-  ASSERT_EQ(level0_files[0]->num_entries, 1);
-  ASSERT_TRUE(level0_files[0]->largest.user_key() == Slice("key3"));
-
-  EXPECT_EQ(level0_files[1]->epoch_number, 2);
-  EXPECT_EQ(level0_files[1]->fd.largest_seqno, 0);
-  ASSERT_EQ(level0_files[1]->num_entries, 1);
-  ASSERT_TRUE(level0_files[1]->largest.user_key() == Slice("key2"));
-
-  EXPECT_EQ(level0_files[2]->epoch_number, 1);
-  EXPECT_EQ(level0_files[2]->fd.largest_seqno, 2);
-  ASSERT_EQ(level0_files[2]->num_entries, 2);
-  ASSERT_TRUE(level0_files[2]->largest.user_key() == Slice("key4"));
-  ASSERT_TRUE(level0_files[2]->smallest.user_key() == Slice("key1"));
-
-  // To verify compacted file is assigned with the minimum epoch_number
-  // among input files'
-  ASSERT_OK(db_->CompactRange(CompactRangeOptions(), nullptr, nullptr));
-
-  level0_files = GetLevelFileMetadatas(0 /* level*/);
-  ASSERT_EQ(level0_files.size(), 1);
-  EXPECT_EQ(level0_files[0]->epoch_number, 1);
-  ASSERT_EQ(level0_files[0]->num_entries, 4);
-  ASSERT_TRUE(level0_files[0]->largest.user_key() == Slice("key4"));
-  ASSERT_TRUE(level0_files[0]->smallest.user_key() == Slice("key1"));
-}
-
-TEST_F(DBTest2, SameEpochNumberAfterCompactRangeChangeLevel) {
-  Options options = CurrentOptions();
-  options.num_levels = 7;
-  options.compaction_style = CompactionStyle::kCompactionStyleLevel;
-  options.disable_auto_compactions = true;
-  DestroyAndReopen(options);
-
-  // Set up the file in L1 to be moved to L0 in later step of CompactRange()
-  ASSERT_OK(Put("key1", "seq1"));
-  ASSERT_OK(Flush());
-  MoveFilesToLevel(1, 0);
-  std::vector<FileMetaData*> level0_files = GetLevelFileMetadatas(0 /* level*/);
-  ASSERT_EQ(level0_files.size(), 0);
-  std::vector<FileMetaData*> level1_files = GetLevelFileMetadatas(1 /* level*/);
-  ASSERT_EQ(level1_files.size(), 1);
-  std::vector<FileMetaData*> level2_files = GetLevelFileMetadatas(2 /* level*/);
-  ASSERT_EQ(level2_files.size(), 0);
-
-  ASSERT_EQ(level1_files[0]->epoch_number, 1);
-
-  // To verify CompactRange() moving file to L0 still keeps the file's
-  // epoch_number
-  CompactRangeOptions croptions;
-  croptions.change_level = true;
-  croptions.target_level = 0;
-  ASSERT_OK(db_->CompactRange(croptions, nullptr, nullptr));
-  level0_files = GetLevelFileMetadatas(0 /* level*/);
-  level1_files = GetLevelFileMetadatas(1 /* level*/);
-  ASSERT_EQ(level0_files.size(), 1);
-  ASSERT_EQ(level1_files.size(), 0);
-
-  EXPECT_EQ(level0_files[0]->epoch_number, 1);
-
-  ASSERT_EQ(level0_files[0]->num_entries, 1);
-  ASSERT_TRUE(level0_files[0]->largest.user_key() == Slice("key1"));
-}
-
-TEST_F(DBTest2, RecoverEpochNumber) {
-  for (bool allow_ingest_behind : {true, false}) {
-    Options options = CurrentOptions();
-    options.allow_ingest_behind = allow_ingest_behind;
-    options.num_levels = 7;
-    options.compaction_style = kCompactionStyleLevel;
-    options.disable_auto_compactions = true;
-    DestroyAndReopen(options);
-    CreateAndReopenWithCF({"cf1"}, options);
-    VersionSet* versions = dbfull()->GetVersionSet();
-    assert(versions);
-    const ColumnFamilyData* default_cf =
-        versions->GetColumnFamilySet()->GetDefault();
-    const ColumnFamilyData* cf1 =
-        versions->GetColumnFamilySet()->GetColumnFamily("cf1");
-
-    // Set up files in default CF to recover in later step
-    ASSERT_OK(Put("key1", "epoch1"));
-    ASSERT_OK(Flush());
-    MoveFilesToLevel(1 /* level*/, 0 /* cf*/);
-    ASSERT_OK(Put("key2", "epoch2"));
-    ASSERT_OK(Flush());
-
-    std::vector<FileMetaData*> level0_files =
-        GetLevelFileMetadatas(0 /* level*/);
-    ASSERT_EQ(level0_files.size(), 1);
-    ASSERT_EQ(level0_files[0]->epoch_number,
-              allow_ingest_behind
-                  ? 2 + kReservedEpochNumberForFileIngestedBehind
-                  : 2);
-    ASSERT_EQ(level0_files[0]->num_entries, 1);
-    ASSERT_TRUE(level0_files[0]->largest.user_key() == Slice("key2"));
-
-    std::vector<FileMetaData*> level1_files =
-        GetLevelFileMetadatas(1 /* level*/);
-    ASSERT_EQ(level1_files.size(), 1);
-    ASSERT_EQ(level1_files[0]->epoch_number,
-              allow_ingest_behind
-                  ? 1 + kReservedEpochNumberForFileIngestedBehind
-                  : 1);
-    ASSERT_EQ(level1_files[0]->num_entries, 1);
-    ASSERT_TRUE(level1_files[0]->largest.user_key() == Slice("key1"));
-
-    // Set up files in cf1 to recover in later step
-    ASSERT_OK(Put(1 /* cf */, "cf1_key1", "epoch1"));
-    ASSERT_OK(Flush(1 /* cf */));
-
-    std::vector<FileMetaData*> level0_files_cf1 =
-        GetLevelFileMetadatas(0 /* level*/, 1 /* cf*/);
-    ASSERT_EQ(level0_files_cf1.size(), 1);
-    ASSERT_EQ(level0_files_cf1[0]->epoch_number,
-              allow_ingest_behind
-                  ? 1 + kReservedEpochNumberForFileIngestedBehind
-                  : 1);
-    ASSERT_EQ(level0_files_cf1[0]->num_entries, 1);
-    ASSERT_TRUE(level0_files_cf1[0]->largest.user_key() == Slice("cf1_key1"));
-
-    ASSERT_EQ(default_cf->GetNextEpochNumber(),
-              allow_ingest_behind
-                  ? 3 + kReservedEpochNumberForFileIngestedBehind
-                  : 3);
-    ASSERT_EQ(cf1->GetNextEpochNumber(),
-              allow_ingest_behind
-                  ? 2 + kReservedEpochNumberForFileIngestedBehind
-                  : 2);
-
-    // To verify epoch_number of files of different levels/CFs are
-    // persisted and recovered correctly
-    ReopenWithColumnFamilies({"default", "cf1"}, options);
-    versions = dbfull()->GetVersionSet();
-    assert(versions);
-    default_cf = versions->GetColumnFamilySet()->GetDefault();
-    cf1 = versions->GetColumnFamilySet()->GetColumnFamily("cf1");
-
-    level0_files = GetLevelFileMetadatas(0 /* level*/);
-    ASSERT_EQ(level0_files.size(), 1);
-    EXPECT_EQ(level0_files[0]->epoch_number,
-              allow_ingest_behind
-                  ? 2 + kReservedEpochNumberForFileIngestedBehind
-                  : 2);
-    ASSERT_EQ(level0_files[0]->num_entries, 1);
-    ASSERT_TRUE(level0_files[0]->largest.user_key() == Slice("key2"));
-
-    level1_files = GetLevelFileMetadatas(1 /* level*/);
-    ASSERT_EQ(level1_files.size(), 1);
-    EXPECT_EQ(level1_files[0]->epoch_number,
-              allow_ingest_behind
-                  ? 1 + kReservedEpochNumberForFileIngestedBehind
-                  : 1);
-    ASSERT_EQ(level1_files[0]->num_entries, 1);
-    ASSERT_TRUE(level1_files[0]->largest.user_key() == Slice("key1"));
-
-    level0_files_cf1 = GetLevelFileMetadatas(0 /* level*/, 1 /* cf*/);
-    ASSERT_EQ(level0_files_cf1.size(), 1);
-    EXPECT_EQ(level0_files_cf1[0]->epoch_number,
-              allow_ingest_behind
-                  ? 1 + kReservedEpochNumberForFileIngestedBehind
-                  : 1);
-    ASSERT_EQ(level0_files_cf1[0]->num_entries, 1);
-    ASSERT_TRUE(level0_files_cf1[0]->largest.user_key() == Slice("cf1_key1"));
-
-    // To verify next epoch number is recovered correctly
-    EXPECT_EQ(default_cf->GetNextEpochNumber(),
-              allow_ingest_behind
-                  ? 3 + kReservedEpochNumberForFileIngestedBehind
-                  : 3);
-    EXPECT_EQ(cf1->GetNextEpochNumber(),
-              allow_ingest_behind
-                  ? 2 + kReservedEpochNumberForFileIngestedBehind
-                  : 2);
-  }
-}
-
-#endif  // ROCKSDB_LITE
-
 TEST_F(DBTest2, RenameDirectory) {
   Options options = CurrentOptions();
   DestroyAndReopen(options);

package/deps/rocksdb/rocksdb/db/db_test_util.h

@@ -49,9 +49,6 @@
 #include "util/string_util.h"
 #include "utilities/merge_operators.h"
 
-// In case defined by Windows headers
-#undef small
-
 namespace ROCKSDB_NAMESPACE {
 class MockEnv;
 

package/deps/rocksdb/rocksdb/db/db_wal_test.cc

@@ -610,52 +610,6 @@ TEST_F(DBWALTest, WALWithChecksumHandoff) {
 #endif  // ROCKSDB_ASSERT_STATUS_CHECKED
 }
 
-#ifndef ROCKSDB_LITE
-TEST_F(DBWALTest, LockWal) {
-  do {
-    Options options = CurrentOptions();
-    options.create_if_missing = true;
-    DestroyAndReopen(options);
-    SyncPoint::GetInstance()->DisableProcessing();
-    SyncPoint::GetInstance()->LoadDependency(
-        {{"DBWALTest::LockWal:AfterGetSortedWal",
-          "DBWALTest::LockWal:BeforeFlush:1"}});
-    SyncPoint::GetInstance()->EnableProcessing();
-
-    ASSERT_OK(Put("foo", "v"));
-    ASSERT_OK(Put("bar", "v"));
-    port::Thread worker([&]() {
-      TEST_SYNC_POINT("DBWALTest::LockWal:BeforeFlush:1");
-      Status tmp_s = db_->Flush(FlushOptions());
-      ASSERT_OK(tmp_s);
-    });
-
-    ASSERT_OK(db_->LockWAL());
-    // Verify writes are stopped
-    WriteOptions wopts;
-    wopts.no_slowdown = true;
-    Status s = db_->Put(wopts, "foo", "dontcare");
-    ASSERT_TRUE(s.IsIncomplete());
-    {
-      VectorLogPtr wals;
-      ASSERT_OK(db_->GetSortedWalFiles(wals));
-      ASSERT_FALSE(wals.empty());
-    }
-    TEST_SYNC_POINT("DBWALTest::LockWal:AfterGetSortedWal");
-    FlushOptions flush_opts;
-    flush_opts.wait = false;
-    s = db_->Flush(flush_opts);
-    ASSERT_TRUE(s.IsTryAgain());
-    ASSERT_OK(db_->UnlockWAL());
-    ASSERT_OK(db_->Put(WriteOptions(), "foo", "dontcare"));
-
-    worker.join();
-
-    SyncPoint::GetInstance()->DisableProcessing();
-  } while (ChangeWalOptions());
-}
-#endif  //! ROCKSDB_LITE
-
 class DBRecoveryTestBlobError
     : public DBWALTest,
       public testing::WithParamInterface<std::string> {
@@ -1645,89 +1599,6 @@ TEST_F(DBWALTest, RaceInstallFlushResultsWithWalObsoletion) {
   delete db1;
 }
 
-TEST_F(DBWALTest, FixSyncWalOnObseletedWalWithNewManifestCausingMissingWAL) {
-  Options options = CurrentOptions();
-  options.track_and_verify_wals_in_manifest = true;
-  DestroyAndReopen(options);
-
-  // Accumulate memtable m1 and create the 1st wal (i.e, 4.log)
-  ASSERT_OK(Put(Key(1), ""));
-  ASSERT_OK(Put(Key(2), ""));
-  ASSERT_OK(Put(Key(3), ""));
-
-  const std::string wal_file_path = db_->GetName() + "/000004.log";
-
-  // Coerce the following sequence of events:
-  // (1) Flush() marks 4.log to be obsoleted, 8.log to be the latest (i.e,
-  // active) log and release the lock
-  // (2) SyncWAL() proceeds with the lock. It
-  // creates a new manifest and syncs all the inactive wals before the latest
-  // (i.e, active log), which is 4.log. Note that SyncWAL() is not aware of the
-  // fact that 4.log has marked as to be obseleted. Prior to the fix, such wal
-  // sync will then add a WAL addition record of 4.log to the new manifest
-  // without any special treatment.
-  // (3) BackgroundFlush() will eventually purge 4.log.
-  bool wal_synced = false;
-  SyncPoint::GetInstance()->SetCallBack(
-      "FindObsoleteFiles::PostMutexUnlock", [&](void*) {
-        ASSERT_OK(env_->FileExists(wal_file_path));
-
-        SyncPoint::GetInstance()->SetCallBack(
-            "VersionSet::ProcessManifestWrites:"
-            "PostDecidingCreateNewManifestOrNot",
-            [&](void* arg) {
-              bool* new_descriptor_log = (bool*)arg;
-              *new_descriptor_log = true;
-            });
-
-        ASSERT_OK(db_->SyncWAL());
-        wal_synced = true;
-      });
-
-  SyncPoint::GetInstance()->SetCallBack(
-      "DBImpl::DeleteObsoleteFileImpl:AfterDeletion2", [&](void* arg) {
-        std::string* file_name = (std::string*)arg;
-        if (*file_name == wal_file_path) {
-          TEST_SYNC_POINT(
-              "DBWALTest::"
-              "FixSyncWalOnObseletedWalWithNewManifestCausingMissingWAL::"
-              "PostDeleteWAL");
-        }
-      });
-
-  SyncPoint::GetInstance()->LoadDependency(
-      {{"DBImpl::BackgroundCallFlush:FilesFound",
-        "PreConfrimObsoletedWALSynced"},
-       {"DBWALTest::FixSyncWalOnObseletedWalWithNewManifestCausingMissingWAL::"
-        "PostDeleteWAL",
-        "PreConfrimWALDeleted"}});
-
-  SyncPoint::GetInstance()->EnableProcessing();
-
-  ASSERT_OK(Flush());
-
-  TEST_SYNC_POINT("PreConfrimObsoletedWALSynced");
-  ASSERT_TRUE(wal_synced);
-
-  TEST_SYNC_POINT("PreConfrimWALDeleted");
-  // BackgroundFlush() purged 4.log
-  // because the memtable associated with the WAL was flushed and new WAL was
-  // created (i.e, 8.log)
-  ASSERT_TRUE(env_->FileExists(wal_file_path).IsNotFound());
-
-  SyncPoint::GetInstance()->ClearAllCallBacks();
-  SyncPoint::GetInstance()->DisableProcessing();
-
-  // To verify the corruption of "Missing WAL with log number: 4" under
-  // `options.track_and_verify_wals_in_manifest = true` is fixed.
-  //
-  // Before the fix, `db_->SyncWAL()` will sync and record WAL addtion of the
-  // obseleted WAL 4.log in a new manifest without any special treament.
-  // This will result in missing-wal corruption in DB::Reopen().
-  Status s = TryReopen(options);
-  EXPECT_OK(s);
-}
-
 // Test scope:
 // - We expect to open data store under all circumstances
 // - We expect only data upto the point where the first error was encountered

package/deps/rocksdb/rocksdb/db/db_with_timestamp_compaction_test.cc

@@ -323,27 +323,6 @@ TEST_F(TimestampCompatibleCompactionTest, CompactFilesRangeCheckL1) {
               static_cast<int>(compaction_job_info.input_files.size()));
   }
 }
-
-TEST_F(TimestampCompatibleCompactionTest, EmptyCompactionOutput) {
-  Options options = CurrentOptions();
-  options.env = env_;
-  options.comparator = test::BytewiseComparatorWithU64TsWrapper();
-  DestroyAndReopen(options);
-
-  std::string ts_str = Timestamp(1);
-  WriteOptions wopts;
-  ASSERT_OK(
-      db_->DeleteRange(wopts, db_->DefaultColumnFamily(), "k1", "k3", ts_str));
-  ASSERT_OK(Flush());
-
-  ts_str = Timestamp(3);
-  Slice ts = ts_str;
-  CompactRangeOptions cro;
-  // range tombstone will be dropped during compaction
-  cro.full_history_ts_low = &ts;
-  cro.bottommost_level_compaction = BottommostLevelCompaction::kForce;
-  ASSERT_OK(db_->CompactRange(cro, nullptr, nullptr));
-}
 #endif  // !ROCKSDB_LITE
 
 }  // namespace ROCKSDB_NAMESPACE

package/deps/rocksdb/rocksdb/db/dbformat.cc

@@ -150,31 +150,6 @@ int InternalKeyComparator::Compare(const ParsedInternalKey& a,
   return r;
 }
 
-int InternalKeyComparator::Compare(const Slice& a,
-                                   const ParsedInternalKey& b) const {
-  // Order by:
-  //    increasing user key (according to user-supplied comparator)
-  //    decreasing sequence number
-  //    decreasing type (though sequence# should be enough to disambiguate)
-  int r = user_comparator_.Compare(ExtractUserKey(a), b.user_key);
-  if (r == 0) {
-    const uint64_t anum =
-        DecodeFixed64(a.data() + a.size() - kNumInternalBytes);
-    const uint64_t bnum = (b.sequence << 8) | b.type;
-    if (anum > bnum) {
-      r = -1;
-    } else if (anum < bnum) {
-      r = +1;
-    }
-  }
-  return r;
-}
-
-int InternalKeyComparator::Compare(const ParsedInternalKey& a,
-                                   const Slice& b) const {
-  return -Compare(b, a);
-}
-
 LookupKey::LookupKey(const Slice& _user_key, SequenceNumber s,
                      const Slice* ts) {
   size_t usize = _user_key.size();

package/deps/rocksdb/rocksdb/db/dbformat.h

@@ -283,8 +283,6 @@ class InternalKeyComparator
 
   int Compare(const InternalKey& a, const InternalKey& b) const;
   int Compare(const ParsedInternalKey& a, const ParsedInternalKey& b) const;
-  int Compare(const Slice& a, const ParsedInternalKey& b) const;
-  int Compare(const ParsedInternalKey& a, const Slice& b) const;
   // In this `Compare()` overload, the sequence numbers provided in
   // `a_global_seqno` and `b_global_seqno` override the sequence numbers in `a`
   // and `b`, respectively. To disable sequence number override(s), provide the

package/deps/rocksdb/rocksdb/db/experimental.cc

@@ -112,9 +112,8 @@ Status UpdateManifestForFilesState(
                   lf->smallest, lf->largest, lf->fd.smallest_seqno,
                   lf->fd.largest_seqno, lf->marked_for_compaction, temp,
                   lf->oldest_blob_file_number, lf->oldest_ancester_time,
-                  lf->file_creation_time, lf->epoch_number, lf->file_checksum,
-                  lf->file_checksum_func_name, lf->unique_id,
-                  lf->compensated_range_deletion_size);
+                  lf->file_creation_time, lf->file_checksum,
+                  lf->file_checksum_func_name, lf->unique_id);
             }
           }
         } else {

package/deps/rocksdb/rocksdb/db/external_sst_file_basic_test.cc

@@ -694,7 +694,6 @@ TEST_P(ExternalSSTFileBasicTest, IngestFileWithGlobalSeqnoPickedSeqno) {
   bool verify_checksums_before_ingest = std::get<1>(GetParam());
   do {
     Options options = CurrentOptions();
-    options.disable_auto_compactions = true;
     DestroyAndReopen(options);
     std::map<std::string, std::string> true_data;
 
@@ -801,7 +800,6 @@ TEST_P(ExternalSSTFileBasicTest, IngestFileWithMultipleValueType) {
   bool verify_checksums_before_ingest = std::get<1>(GetParam());
   do {
     Options options = CurrentOptions();
-    options.disable_auto_compactions = true;
     options.merge_operator.reset(new TestPutOperator());
     DestroyAndReopen(options);
     std::map<std::string, std::string> true_data;
@@ -929,7 +927,6 @@ TEST_P(ExternalSSTFileBasicTest, IngestFileWithMixedValueType) {
   bool verify_checksums_before_ingest = std::get<1>(GetParam());
   do {
     Options options = CurrentOptions();
-    options.disable_auto_compactions = true;
     options.merge_operator.reset(new TestPutOperator());
     DestroyAndReopen(options);
     std::map<std::string, std::string> true_data;