Sanitize 8.10.tikv branch

Signed-off-by: Yang Zhang <[email protected]>
tikv · Sep 18, 2024 · d6bc9d9 · d6bc9d9
1 parent 29219c2
commit d6bc9d9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/.github/workflows/sanity_check.yml b/.github/workflows/sanity_check.yml
@@ -15,7 +15,7 @@ jobs:
 
     - name: Fetch from upstream
       run: |
-        git remote add upstream https://github.com/facebook/rocksdb.git && git fetch upstream
+        git remote add upstream https://github.com/tikv/rocksdb.git && git fetch upstream
 
     - name: Where am I
       run: |
@@ -37,6 +37,8 @@ jobs:
 
     - name: Check format
       run: VERBOSE_CHECK=1 make check-format
+      env:
+        FORMAT_UPSTREAM: upstream/8.10.tikv
 
     - name: Compare buckify output
       run: make check-buck-targets

diff --git a/db/db_test.cc b/db/db_test.cc
@@ -1161,7 +1161,6 @@ class DelayFilterFactory : public CompactionFilterFactory {
 };
 }  // anonymous namespace
 
-
 static std::string CompressibleString(Random* rnd, int len) {
   std::string r;
   test::CompressibleString(rnd, 0.8, len, &r);
@@ -2686,6 +2685,7 @@ TEST_F(DBTest, PurgeInfoLogs) {
   options.keep_log_file_num = 5;
   options.create_if_missing = true;
   options.env = env_;
+  env_->DeleteDir(dbname_);
   for (int mode = 0; mode <= 1; mode++) {
     if (mode == 1) {
       options.db_log_dir = dbname_ + "_logs";
@@ -4339,7 +4339,6 @@ TEST_F(DBTest, ConcurrentMemtableNotSupported) {
   ASSERT_NOK(db_->CreateColumnFamily(cf_options, "name", &handle));
 }
 
-
 TEST_F(DBTest, SanitizeNumThreads) {
   for (int attempt = 0; attempt < 2; attempt++) {
     const size_t kTotalTasks = 8;
@@ -5709,7 +5708,6 @@ TEST_F(DBTest, FileCreationRandomFailure) {
   }
 }
 
-
 TEST_F(DBTest, DynamicMiscOptions) {
   // Test max_sequential_skip_in_iterations
   Options options;
@@ -7166,7 +7164,6 @@ TEST_F(DBTest, ReusePinnableSlice) {
       1);
 }
 
-
 TEST_F(DBTest, DeletingOldWalAfterDrop) {
   ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->LoadDependency(
       {{"Test:AllowFlushes", "DBImpl::BGWorkFlush"},
@@ -7291,7 +7288,6 @@ TEST_F(DBTest, LargeBlockSizeTest) {
   ASSERT_NOK(TryReopenWithColumnFamilies({"default", "pikachu"}, options));
 }
 
-
 TEST_F(DBTest, CreationTimeOfOldestFile) {
   const int kNumKeysPerFile = 32;
   const int kNumLevelFiles = 2;