Fix files that merged poorly

Author: mrambacher

db/db_impl/db_impl.h

@@ -32,7 +32,6 @@
 #include "db/log_writer.h"
 #include "db/logs_with_prep_tracker.h"
 #include "db/memtable_list.h"
-#include "db/pre_release_callback.h"
 #include "db/range_del_aggregator.h"
 #include "db/read_callback.h"
 #include "db/snapshot_checker.h"

db/db_impl/db_impl_compaction_flush.cc

@@ -481,27 +481,6 @@ Status DBImpl::AtomicFlushMemTablesToOutputFiles(
   }
 
   if (s.ok()) {
-    autovector<ColumnFamilyData*> tmp_cfds;
-    autovector<const autovector<MemTable*>*> mems_list;
-    autovector<const MutableCFOptions*> mutable_cf_options_list;
-    autovector<FileMetaData*> tmp_file_meta;
-    for (int i = 0; i != num_cfs; ++i) {
-      const auto& mems = jobs[i].GetMemTables();
-      if (!cfds[i]->IsDropped() && !mems.empty()) {
-        tmp_cfds.emplace_back(cfds[i]);
-        mems_list.emplace_back(&mems);
-        mutable_cf_options_list.emplace_back(&all_mutable_cf_options[i]);
-        tmp_file_meta.emplace_back(&file_meta[i]);
-      }
-    }
-
-    s = InstallMemtableAtomicFlushResults(
-        nullptr /* imm_lists */, tmp_cfds, mutable_cf_options_list, mems_list,
-        versions_.get(), &mutex_, tmp_file_meta,
-        &job_context->memtables_to_free, directories_.GetDbDir(), log_buffer);
-  }
-
-  if (s.ok() || s.IsShutdownInProgress()) {
     assert(num_cfs ==
            static_cast<int>(job_context->superversion_contexts.size()));
     for (int i = 0; i != num_cfs; ++i) {

db/db_test_util.cc

@@ -54,8 +54,8 @@ ROT13BlockCipher rot13Cipher_(16);
 DBTestBase::DBTestBase(const std::string path)
     : mem_env_(nullptr),
       encrypted_env_(nullptr),
-      s3_env_(nullptr),
-      option_config_(kDefault) {
+      option_config_(kDefault),
+      s3_env_(nullptr) {
   Env* base_env = Env::Default();
 #ifndef ROCKSDB_LITE
   const char* test_env_uri = getenv("TEST_ENV_URI");
@@ -196,6 +196,12 @@ bool DBTestBase::ChangeOptions(int skip_mask) {
      break;
    }
    if (option_config_ >= kEnd) {
+#ifndef USE_AWS
+     // If not built for AWS, skip it
+     if (option_env_ + 1 == kAwsEnv) {
+       option_env_++;
+     }
+#endif
      if (option_env_ + 1 >= kEndEnv) {
        Destroy(last_options_);
        return false;
@@ -639,7 +645,7 @@ Env* DBTestBase::CreateNewAwsEnv(const std::string& prefix) {
   ((AwsEnv*)cenv)->TEST_SetFileDeletionDelay(std::chrono::seconds(0));
   ROCKS_LOG_INFO(info_log_, "Created new aws env with path %s", prefix.c_str());
   if (!st.ok()) {
-    Log(InfoLogLevel::DEBUG_LEVEL, info_log_, st.ToString().c_str());
+    Log(InfoLogLevel::DEBUG_LEVEL, info_log_, "%s", st.ToString().c_str());
   }
   assert(st.ok() && cenv);
   return cenv;

db/range_tombstone_fragmenter.cc

@@ -436,27 +436,4 @@ FragmentedRangeTombstoneIterator::SplitBySnapshot(
   return splits;
 }
 
-std::map<SequenceNumber, std::unique_ptr<FragmentedRangeTombstoneIterator>>
-FragmentedRangeTombstoneIterator::SplitBySnapshot(
-    const std::vector<SequenceNumber>& snapshots) {
-  std::map<SequenceNumber, std::unique_ptr<FragmentedRangeTombstoneIterator>>
-      splits;
-  SequenceNumber lower = 0;
-  SequenceNumber upper;
-  for (size_t i = 0; i <= snapshots.size(); i++) {
-    if (i >= snapshots.size()) {
-      upper = kMaxSequenceNumber;
-    } else {
-      upper = snapshots[i];
-    }
-    if (tombstones_->ContainsRange(lower, upper)) {
-      splits.emplace(upper, std::unique_ptr<FragmentedRangeTombstoneIterator>(
-                                new FragmentedRangeTombstoneIterator(
-                                    tombstones_, *icmp_, upper, lower)));
-    }
-    lower = upper + 1;
-  }
-  return splits;
-}
-
 }  // namespace rocksdb

db/snapshot_impl.h

@@ -132,22 +132,6 @@ class SnapshotList {
     return;
   }
 
-  // Whether there is an active snapshot in range [lower_bound, upper_bound).
-  bool HasSnapshotInRange(SequenceNumber lower_bound,
-                          SequenceNumber upper_bound) {
-    if (empty()) {
-      return false;
-    }
-    const SnapshotImpl* s = &list_;
-    while (s->next_ != &list_) {
-      if (s->next_->number_ >= lower_bound) {
-        return s->next_->number_ < upper_bound;
-      }
-      s = s->next_;
-    }
-    return false;
-  }
-
   // get the sequence number of the most recent snapshot
   SequenceNumber GetNewest() {
     if (empty()) {

file/file_util.h

@@ -29,9 +29,4 @@ extern Status DeleteDBFile(const ImmutableDBOptions* db_options,
 
 extern bool IsWalDirSameAsDBPath(const ImmutableDBOptions* db_options);
 
-extern Status DeleteDBFile(const ImmutableDBOptions* db_options,
-                            const std::string& fname,
-                            const std::string& path_to_sync,
-                            const bool force_bg);
-
 }  // namespace rocksdb

include/rocksdb/cloud/cloud_env_options.h

@@ -339,7 +339,7 @@ class CloudEnv : public Env {
   // Reads a file from the cloud
   virtual Status NewSequentialFileCloud(const std::string& bucket_prefix,
                                         const std::string& fname,
-                                        unique_ptr<SequentialFile>* result,
+                                        std::unique_ptr<SequentialFile>* result,
                                         const EnvOptions& options) = 0;
 
   // Saves and retrieves the dbid->dirname mapping in cloud storage

java/rocksjni/ingest_external_file_options.cc

@@ -193,4 +193,4 @@ void Java_org_rocksdb_IngestExternalFileOptions_disposeInternal(
   auto* options =
       reinterpret_cast<rocksdb::IngestExternalFileOptions*>(jhandle);
   delete options;
-}
+}

table/format.h

@@ -273,6 +273,10 @@ struct BlockContents {
   // The additional memory space taken by the block data.
   size_t usable_size() const {
     if (allocation.get() != nullptr) {
+      auto allocator = allocation.get_deleter().allocator;
+      if (allocator) {
+        return allocator->UsableSize(allocation.get(), data.size());
+      }
 #ifdef ROCKSDB_MALLOC_USABLE_SIZE
       return malloc_usable_size(allocation.get());
 #else

tools/block_cache_analyzer/block_cache_trace_analyzer.cc

@@ -650,7 +650,7 @@ void BlockCacheTraceAnalyzer::WriteCorrelationFeaturesToFile(
     const std::map<std::string, Features>& label_features,
     const std::map<std::string, Predictions>& label_predictions,
     uint32_t max_number_of_values) const {
-  std::default_random_engine rand_engine(env_->NowMicros());
+  std::default_random_engine rand_engine(static_cast<std::default_random_engine::result_type>(env_->NowMicros()));
   for (auto const& label_feature_vectors : label_features) {
     const Features& past = label_feature_vectors.second;
     auto it = label_predictions.find(label_feature_vectors.first);