Fix files that had unintentional differences

Author: mrambacher

db/db_compaction_test.cc

@@ -3308,7 +3308,6 @@ TEST_P(DBCompactionTestWithParam, IntraL0Compaction) {
       ASSERT_OK(Put(Key(i + 1), value));
     }
     ASSERT_OK(Flush());
-    ASSERT_EQ(i + 1, TestGetTickerCount(options, BLOCK_CACHE_INDEX_MISS));
   }
   dbfull()->TEST_WaitForCompact();
   ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->DisableProcessing();

options/db_options.h

@@ -35,7 +35,6 @@ struct ImmutableDBOptions {
   std::vector<DbPath> db_paths;
   std::string db_log_dir;
   std::string wal_dir;
-  uint32_t max_subcompactions;
   size_t max_log_file_size;
   size_t log_file_time_to_roll;
   size_t keep_log_file_num;

options/options_settable_test.cc

@@ -508,8 +508,6 @@ TEST_F(OptionsSettableTest, ColumnFamilyOptionsAllFieldsSettable) {
 
   ColumnFamilyOptions rnd_filled_options = *new_options;
 
-  ColumnFamilyOptions rnd_filled_options = *new_options;
-
   options->~ColumnFamilyOptions();
   new_options->~ColumnFamilyOptions();
 

table/block_fetcher.cc

@@ -205,13 +205,6 @@ inline void BlockFetcher::GetBlockContents() {
         CopyBufferToCompressedBuf();
         heap_buf_ = std::move(compressed_buf_);
       }
-    } else if (direct_io_buf_.get() != nullptr) {
-      if (compression_type_ == kNoCompression) {
-        CopyBufferToHeapBuf();
-      } else {
-        CopyBufferToCompressedBuf();
-        heap_buf_ = std::move(compressed_buf_);
-      }
     }
     *contents_ = BlockContents(std::move(heap_buf_), block_size_);
   }

test_util/testutil.cc

@@ -475,6 +475,7 @@ size_t GetLinesCount(const std::string& fname, const std::string& pattern) {
   return count;
 }
 
+
 void CorruptFile(const std::string& fname, int offset, int bytes_to_corrupt) {
   struct stat sbuf;
   if (stat(fname.c_str(), &sbuf) != 0) {

test_util/testutil.h

@@ -800,6 +800,7 @@ size_t GetLinesCount(const std::string& fname, const std::string& pattern);
 // Tries to set TEST_TMPDIR to a directory supporting direct IO.
 void ResetTmpDirForDirectIO();
 
+
 void CorruptFile(const std::string& fname, int offset, int bytes_to_corrupt);
 
 }  // namespace test