@nxtedition/rocksdb 8.1.6 → 8.1.8

package/deps/rocksdb/rocksdb/include/rocksdb/utilities/options_util.h

@@ -6,7 +6,6 @@
 // This file contains utility functions for RocksDB Options.
 #pragma once
 
-#ifndef ROCKSDB_LITE
 
 #include <string>
 #include <vector>
@@ -50,15 +49,12 @@ struct ConfigOptions;
 // casting the return value of TableFactory::GetOptions() to
 // BlockBasedTableOptions and making necessary changes.
 //
-// ignore_unknown_options can be set to true if you want to ignore options
-// that are from a newer version of the db, essentially for forward
-// compatibility.
-//
 // config_options contains a set of options that controls the processing
-// of the options.  The LoadLatestOptions(ConfigOptions...) should be preferred;
-// the alternative signature may be deprecated in a future release. The
-// equivalent functionality can be achieved by setting the corresponding options
-// in the ConfigOptions parameter.
+// of the options.
+//
+// config_options.ignore_unknown_options can be set to true if you want to
+// ignore options that are from a newer version of the db, essentially for
+// forward compatibility.
 //
 // examples/options_file_example.cc demonstrates how to use this function
 // to open a RocksDB instance.
@@ -70,11 +66,6 @@ struct ConfigOptions;
 //     to the options file itself.
 //
 // @see LoadOptionsFromFile
-Status LoadLatestOptions(const std::string& dbpath, Env* env,
-                         DBOptions* db_options,
-                         std::vector<ColumnFamilyDescriptor>* cf_descs,
-                         bool ignore_unknown_options = false,
-                         std::shared_ptr<Cache>* cache = {});
 Status LoadLatestOptions(const ConfigOptions& config_options,
                          const std::string& dbpath, DBOptions* db_options,
                          std::vector<ColumnFamilyDescriptor>* cf_descs,
@@ -83,17 +74,7 @@ Status LoadLatestOptions(const ConfigOptions& config_options,
 // Similar to LoadLatestOptions, this function constructs the DBOptions
 // and ColumnFamilyDescriptors based on the specified RocksDB Options file.
 //
-// The LoadOptionsFile(ConfigOptions...) should be preferred;
-// the alternative signature may be deprecated in a future release. The
-// equivalent functionality can be achieved by setting the corresponding
-// options in the ConfigOptions parameter.
-//
 // @see LoadLatestOptions
-Status LoadOptionsFromFile(const std::string& options_file_name, Env* env,
-                           DBOptions* db_options,
-                           std::vector<ColumnFamilyDescriptor>* cf_descs,
-                           bool ignore_unknown_options = false,
-                           std::shared_ptr<Cache>* cache = {});
 Status LoadOptionsFromFile(const ConfigOptions& config_options,
                            const std::string& options_file_name,
                            DBOptions* db_options,
@@ -115,14 +96,9 @@ Status GetLatestOptionsFileName(const std::string& dbpath, Env* env,
 // * prefix_extractor
 // * table_factory
 // * merge_operator
-Status CheckOptionsCompatibility(
-    const std::string& dbpath, Env* env, const DBOptions& db_options,
-    const std::vector<ColumnFamilyDescriptor>& cf_descs,
-    bool ignore_unknown_options = false);
 Status CheckOptionsCompatibility(
     const ConfigOptions& config_options, const std::string& dbpath,
     const DBOptions& db_options,
     const std::vector<ColumnFamilyDescriptor>& cf_descs);
 
 }  // namespace ROCKSDB_NAMESPACE
-#endif  // !ROCKSDB_LITE

package/deps/rocksdb/rocksdb/include/rocksdb/utilities/replayer.h

@@ -4,7 +4,6 @@
 //  (found in the LICENSE.Apache file in the root directory).
 
 #pragma once
-#ifndef ROCKSDB_LITE
 
 #include <functional>
 #include <memory>
@@ -84,4 +83,3 @@ class Replayer {
 };
 
 }  // namespace ROCKSDB_NAMESPACE
-#endif  // ROCKSDB_LITE

package/deps/rocksdb/rocksdb/include/rocksdb/utilities/sim_cache.h

@@ -10,7 +10,7 @@
 #include <memory>
 #include <string>
 
-#include "rocksdb/cache.h"
+#include "rocksdb/advanced_cache.h"
 #include "rocksdb/env.h"
 #include "rocksdb/slice.h"
 #include "rocksdb/statistics.h"
@@ -42,13 +42,10 @@ extern std::shared_ptr<SimCache> NewSimCache(std::shared_ptr<Cache> sim_cache,
                                              std::shared_ptr<Cache> cache,
                                              int num_shard_bits);
 
-class SimCache : public Cache {
+// An abstract base class (public interface) to the SimCache implementation
+class SimCache : public CacheWrapper {
  public:
-  SimCache() {}
-
-  ~SimCache() override {}
-
-  const char* Name() const override { return "SimCache"; }
+  using CacheWrapper::CacheWrapper;
 
   // returns the maximum configured capacity of the simcache for simulation
   virtual size_t GetSimCapacity() const = 0;

package/deps/rocksdb/rocksdb/include/rocksdb/utilities/stackable_db.h

@@ -136,6 +136,24 @@ class StackableDB : public DB {
                          statuses, sorted_input);
   }
 
+  using DB::MultiGetEntity;
+
+  void MultiGetEntity(const ReadOptions& options,
+                      ColumnFamilyHandle* column_family, size_t num_keys,
+                      const Slice* keys, PinnableWideColumns* results,
+                      Status* statuses, bool sorted_input) override {
+    db_->MultiGetEntity(options, column_family, num_keys, keys, results,
+                        statuses, sorted_input);
+  }
+
+  void MultiGetEntity(const ReadOptions& options, size_t num_keys,
+                      ColumnFamilyHandle** column_families, const Slice* keys,
+                      PinnableWideColumns* results, Status* statuses,
+                      bool sorted_input) override {
+    db_->MultiGetEntity(options, num_keys, column_families, keys, results,
+                        statuses, sorted_input);
+  }
+
   using DB::IngestExternalFile;
   virtual Status IngestExternalFile(
       ColumnFamilyHandle* column_family,
@@ -376,7 +394,6 @@ class StackableDB : public DB {
 
   virtual Status UnlockWAL() override { return db_->UnlockWAL(); }
 
-#ifndef ROCKSDB_LITE
 
   virtual Status DisableFileDeletions() override {
     return db_->DisableFileDeletions();
@@ -448,7 +465,6 @@ class StackableDB : public DB {
     return db_->NewDefaultReplayer(handles, std::move(reader), replayer);
   }
 
-#endif  // ROCKSDB_LITE
 
   virtual Status GetLiveFiles(std::vector<std::string>& vec, uint64_t* mfs,
                               bool flush_memtable = true) override {
@@ -552,11 +568,9 @@ class StackableDB : public DB {
     return db_->DefaultColumnFamily();
   }
 
-#ifndef ROCKSDB_LITE
   Status TryCatchUpWithPrimary() override {
     return db_->TryCatchUpWithPrimary();
   }
-#endif  // ROCKSDB_LITE
 
  protected:
   DB* db_;

package/deps/rocksdb/rocksdb/include/rocksdb/utilities/table_properties_collectors.h

@@ -4,7 +4,6 @@
 //  (found in the LICENSE.Apache file in the root directory).
 
 #pragma once
-#ifndef ROCKSDB_LITE
 #include <atomic>
 #include <memory>
 
@@ -87,4 +86,3 @@ NewCompactOnDeletionCollectorFactory(size_t sliding_window_size,
                                      double deletion_ratio = 0);
 }  // namespace ROCKSDB_NAMESPACE
 
-#endif  // !ROCKSDB_LITE

package/deps/rocksdb/rocksdb/include/rocksdb/utilities/transaction.h

@@ -5,7 +5,6 @@
 
 #pragma once
 
-#ifndef ROCKSDB_LITE
 
 #include <limits>
 #include <string>
@@ -683,4 +682,3 @@ class Transaction {
 
 }  // namespace ROCKSDB_NAMESPACE
 
-#endif  // ROCKSDB_LITE

package/deps/rocksdb/rocksdb/include/rocksdb/utilities/transaction_db.h

@@ -4,7 +4,6 @@
 //  (found in the LICENSE.Apache file in the root directory).
 
 #pragma once
-#ifndef ROCKSDB_LITE
 
 #include <string>
 #include <utility>
@@ -505,4 +504,3 @@ class TransactionDB : public StackableDB {
 
 }  // namespace ROCKSDB_NAMESPACE
 
-#endif  // ROCKSDB_LITE

package/deps/rocksdb/rocksdb/include/rocksdb/utilities/transaction_db_mutex.h

@@ -4,7 +4,6 @@
 //  (found in the LICENSE.Apache file in the root directory).
 
 #pragma once
-#ifndef ROCKSDB_LITE
 
 #include <memory>
 
@@ -88,4 +87,3 @@ class TransactionDBMutexFactory {
 
 }  // namespace ROCKSDB_NAMESPACE
 
-#endif  // ROCKSDB_LITE

package/deps/rocksdb/rocksdb/include/rocksdb/utilities/write_batch_with_index.h

@@ -10,7 +10,6 @@
 // inserted.
 #pragma once
 
-#ifndef ROCKSDB_LITE
 
 #include <memory>
 #include <string>
@@ -306,4 +305,3 @@ class WriteBatchWithIndex : public WriteBatchBase {
 
 }  // namespace ROCKSDB_NAMESPACE
 
-#endif  // !ROCKSDB_LITE

package/deps/rocksdb/rocksdb/include/rocksdb/version.h

@@ -11,9 +11,9 @@
 
 // NOTE: in 'main' development branch, this should be the *next*
 // minor or major version number planned for release.
-#define ROCKSDB_MAJOR 7
-#define ROCKSDB_MINOR 10
-#define ROCKSDB_PATCH 2
+#define ROCKSDB_MAJOR 8
+#define ROCKSDB_MINOR 0
+#define ROCKSDB_PATCH 0
 
 // Do not use these. We made the mistake of declaring macros starting with
 // double underscore. Now we have to live with our choice. We'll deprecate these

package/deps/rocksdb/rocksdb/logging/auto_roll_logger.cc

@@ -16,7 +16,6 @@
 
 namespace ROCKSDB_NAMESPACE {
 
-#ifndef ROCKSDB_LITE
 // -- AutoRollLogger
 
 AutoRollLogger::AutoRollLogger(const std::shared_ptr<FileSystem>& fs,
@@ -269,7 +268,6 @@ bool AutoRollLogger::LogExpired() {
   ++cached_now_access_count;
   return cached_now >= ctime_ + kLogFileTimeToRoll;
 }
-#endif  // !ROCKSDB_LITE
 
 Status CreateLoggerFromOptions(const std::string& dbname,
                                const DBOptions& options,
@@ -312,7 +310,6 @@ Status CreateLoggerFromOptions(const std::string& dbname,
       return s;
     }
   }
-#ifndef ROCKSDB_LITE
   // Currently we only support roll by time-to-roll and log size
   if (options.log_file_time_to_roll > 0 || options.max_log_file_size > 0) {
     AutoRollLogger* result = new AutoRollLogger(
@@ -327,7 +324,6 @@ Status CreateLoggerFromOptions(const std::string& dbname,
     }
     return s;
   }
-#endif  // !ROCKSDB_LITE
   // Open a log file in the same directory as the db
   s = env->FileExists(fname);
   if (s.ok()) {

package/deps/rocksdb/rocksdb/logging/auto_roll_logger.h

@@ -21,7 +21,6 @@ namespace ROCKSDB_NAMESPACE {
 class FileSystem;
 class SystemClock;
 
-#ifndef ROCKSDB_LITE
 // Rolls the log file by size and/or time
 class AutoRollLogger : public Logger {
  public:
@@ -158,7 +157,6 @@ class AutoRollLogger : public Logger {
   IODebugContext io_context_;
   mutable port::Mutex mutex_;
 };
-#endif  // !ROCKSDB_LITE
 
 // Facade to craete logger automatically
 Status CreateLoggerFromOptions(const std::string& dbname,

package/deps/rocksdb/rocksdb/logging/auto_roll_logger_test.cc

@@ -4,7 +4,6 @@
 //  (found in the LICENSE.Apache file in the root directory).
 //
 
-#ifndef ROCKSDB_LITE
 
 #include "logging/auto_roll_logger.h"
 
@@ -730,13 +729,3 @@ int main(int argc, char** argv) {
   return RUN_ALL_TESTS();
 }
 
-#else
-#include <stdio.h>
-
-int main(int /*argc*/, char** /*argv*/) {
-  fprintf(stderr,
-          "SKIPPED as AutoRollLogger is not supported in ROCKSDB_LITE\n");
-  return 0;
-}
-
-#endif  // !ROCKSDB_LITE

package/deps/rocksdb/rocksdb/memory/jemalloc_nodump_allocator.cc

@@ -23,7 +23,6 @@ std::atomic<extent_alloc_t*> JemallocNodumpAllocator::original_alloc_{nullptr};
 #endif  // ROCKSDB_JEMALLOC_NODUMP_ALLOCATOR
 
 static std::unordered_map<std::string, OptionTypeInfo> jemalloc_type_info = {
-#ifndef ROCKSDB_LITE
     {"limit_tcache_size",
      {offsetof(struct JemallocAllocatorOptions, limit_tcache_size),
       OptionType::kBoolean, OptionVerificationType::kNormal,
@@ -36,7 +35,6 @@ static std::unordered_map<std::string, OptionTypeInfo> jemalloc_type_info = {
      {offsetof(struct JemallocAllocatorOptions, tcache_size_upper_bound),
       OptionType::kSizeT, OptionVerificationType::kNormal,
       OptionTypeFlags::kNone}},
-#endif  // ROCKSDB_LITE
 };
 bool JemallocNodumpAllocator::IsSupported(std::string* why) {
 #ifndef ROCKSDB_JEMALLOC

package/deps/rocksdb/rocksdb/memory/memory_allocator.cc

@@ -15,13 +15,10 @@
 namespace ROCKSDB_NAMESPACE {
 namespace {
 static std::unordered_map<std::string, OptionTypeInfo> ma_wrapper_type_info = {
-#ifndef ROCKSDB_LITE
     {"target", OptionTypeInfo::AsCustomSharedPtr<MemoryAllocator>(
                    0, OptionVerificationType::kByName, OptionTypeFlags::kNone)},
-#endif  // ROCKSDB_LITE
 };
 
-#ifndef ROCKSDB_LITE
 static int RegisterBuiltinAllocators(ObjectLibrary& library,
                                      const std::string& /*arg*/) {
   library.AddFactory<MemoryAllocator>(
@@ -61,7 +58,6 @@ static int RegisterBuiltinAllocators(ObjectLibrary& library,
   size_t num_types;
   return static_cast<int>(library.GetFactoryCount(&num_types));
 }
-#endif  // ROCKSDB_LITE
 }  // namespace
 
 MemoryAllocatorWrapper::MemoryAllocatorWrapper(
@@ -73,17 +69,10 @@ MemoryAllocatorWrapper::MemoryAllocatorWrapper(
 Status MemoryAllocator::CreateFromString(
     const ConfigOptions& options, const std::string& value,
     std::shared_ptr<MemoryAllocator>* result) {
-#ifndef ROCKSDB_LITE
   static std::once_flag once;
   std::call_once(once, [&]() {
     RegisterBuiltinAllocators(*(ObjectLibrary::Default().get()), "");
   });
-#else
-  if (value == DefaultMemoryAllocator::kClassName()) {
-    result->reset(new DefaultMemoryAllocator());
-    return Status::OK();
-  }
-#endif  // ROCKSDB_LITE
   ConfigOptions copy = options;
   copy.invoke_prepare_options = true;
   return LoadManagedObject<MemoryAllocator>(copy, value, result);

package/deps/rocksdb/rocksdb/memory/memory_allocator_test.cc

@@ -20,7 +20,6 @@ namespace ROCKSDB_NAMESPACE {
 
 // TODO: the tests do not work in LITE mode due to relying on
 // `CreateFromString()` to create non-default memory allocators.
-#ifndef ROCKSDB_LITE
 
 class MemoryAllocatorTest
     : public testing::Test,
@@ -63,11 +62,9 @@ TEST_P(MemoryAllocatorTest, CreateAllocator) {
   } else {
     ASSERT_OK(s);
     ASSERT_NE(orig, nullptr);
-#ifndef ROCKSDB_LITE
     std::string str = orig->ToString(config_options);
     ASSERT_OK(MemoryAllocator::CreateFromString(config_options, str, &copy));
     ASSERT_EQ(orig, copy);
-#endif  // ROCKSDB_LITE
   }
 }
 
@@ -229,7 +226,6 @@ INSTANTIATE_TEST_CASE_P(
                                       JemallocNodumpAllocator::IsSupported())));
 #endif  // ROCKSDB_JEMALLOC
 
-#endif  // ROCKSDB_LITE
 
 }  // namespace ROCKSDB_NAMESPACE
 

package/deps/rocksdb/rocksdb/memtable/hash_linklist_rep.cc

@@ -4,7 +4,6 @@
 //  (found in the LICENSE.Apache file in the root directory).
 //
 
-#ifndef ROCKSDB_LITE
 
 #include <algorithm>
 #include <atomic>
@@ -923,4 +922,3 @@ MemTableRepFactory* NewHashLinkListRepFactory(
 }
 
 }  // namespace ROCKSDB_NAMESPACE
-#endif  // ROCKSDB_LITE

package/deps/rocksdb/rocksdb/memtable/hash_skiplist_rep.cc

@@ -4,7 +4,6 @@
 //  (found in the LICENSE.Apache file in the root directory).
 //
 
-#ifndef ROCKSDB_LITE
 #include <atomic>
 
 #include "db/memtable.h"
@@ -390,4 +389,3 @@ MemTableRepFactory* NewHashSkipListRepFactory(
 }
 
 }  // namespace ROCKSDB_NAMESPACE
-#endif  // ROCKSDB_LITE

package/deps/rocksdb/rocksdb/memtable/memtablerep_bench.cc

@@ -579,7 +579,6 @@ int main(int argc, char** argv) {
   std::unique_ptr<ROCKSDB_NAMESPACE::MemTableRepFactory> factory;
   if (FLAGS_memtablerep == "skiplist") {
     factory.reset(new ROCKSDB_NAMESPACE::SkipListFactory);
-#ifndef ROCKSDB_LITE
   } else if (FLAGS_memtablerep == "vector") {
     factory.reset(new ROCKSDB_NAMESPACE::VectorRepFactory);
   } else if (FLAGS_memtablerep == "hashskiplist" ||
@@ -597,7 +596,6 @@ int main(int argc, char** argv) {
         FLAGS_if_log_bucket_dist_when_flash, FLAGS_threshold_use_skiplist));
     options.prefix_extractor.reset(
         ROCKSDB_NAMESPACE::NewFixedPrefixTransform(FLAGS_prefix_length));
-#endif  // ROCKSDB_LITE
   } else {
     ROCKSDB_NAMESPACE::ConfigOptions config_options;
     config_options.ignore_unsupported_options = false;

package/deps/rocksdb/rocksdb/memtable/skiplistrep.cc

@@ -341,11 +341,9 @@ class SkipListRep : public MemTableRep {
 }  // namespace
 
 static std::unordered_map<std::string, OptionTypeInfo> skiplist_factory_info = {
-#ifndef ROCKSDB_LITE
     {"lookahead",
      {0, OptionType::kSizeT, OptionVerificationType::kNormal,
       OptionTypeFlags::kDontSerialize /*Since it is part of the ID*/}},
-#endif
 };
 
 SkipListFactory::SkipListFactory(size_t lookahead) : lookahead_(lookahead) {

package/deps/rocksdb/rocksdb/memtable/vectorrep.cc

@@ -3,7 +3,6 @@
 //  COPYING file in the root directory) and Apache 2.0 License
 //  (found in the LICENSE.Apache file in the root directory).
 //
-#ifndef ROCKSDB_LITE
 #include <algorithm>
 #include <memory>
 #include <set>
@@ -306,4 +305,3 @@ MemTableRep* VectorRepFactory::CreateMemTableRep(
   return new VectorRep(compare, allocator, count_);
 }
 }  // namespace ROCKSDB_NAMESPACE
-#endif  // ROCKSDB_LITE

package/deps/rocksdb/rocksdb/memtable/write_buffer_manager.cc

@@ -28,7 +28,6 @@ WriteBufferManager::WriteBufferManager(size_t _buffer_size,
       cache_res_mgr_(nullptr),
       allow_stall_(allow_stall),
       stall_active_(false) {
-#ifndef ROCKSDB_LITE
   if (cache) {
     // Memtable's memory usage tends to fluctuate frequently
     // therefore we set delayed_decrease = true to save some dummy entry
@@ -37,9 +36,6 @@ WriteBufferManager::WriteBufferManager(size_t _buffer_size,
         CacheReservationManagerImpl<CacheEntryRole::kWriteBuffer>>(
         cache, true /* delayed_decrease */);
   }
-#else
-  (void)cache;
-#endif  // ROCKSDB_LITE
 }
 
 WriteBufferManager::~WriteBufferManager() {
@@ -70,7 +66,6 @@ void WriteBufferManager::ReserveMem(size_t mem) {
 
 // Should only be called from write thread
 void WriteBufferManager::ReserveMemWithCache(size_t mem) {
-#ifndef ROCKSDB_LITE
   assert(cache_res_mgr_ != nullptr);
   // Use a mutex to protect various data structures. Can be optimized to a
   // lock-free solution if it ends up with a performance bottleneck.
@@ -86,9 +81,6 @@ void WriteBufferManager::ReserveMemWithCache(size_t mem) {
   // [TODO] We'll need to improve it in the future and figure out what to do on
   // error
   s.PermitUncheckedError();
-#else
-  (void)mem;
-#endif  // ROCKSDB_LITE
 }
 
 void WriteBufferManager::ScheduleFreeMem(size_t mem) {
@@ -108,7 +100,6 @@ void WriteBufferManager::FreeMem(size_t mem) {
 }
 
 void WriteBufferManager::FreeMemWithCache(size_t mem) {
-#ifndef ROCKSDB_LITE
   assert(cache_res_mgr_ != nullptr);
   // Use a mutex to protect various data structures. Can be optimized to a
   // lock-free solution if it ends up with a performance bottleneck.
@@ -122,9 +113,6 @@ void WriteBufferManager::FreeMemWithCache(size_t mem) {
   // [TODO] We'll need to improve it in the future and figure out what to do on
   // error
   s.PermitUncheckedError();
-#else
-  (void)mem;
-#endif  // ROCKSDB_LITE
 }
 
 void WriteBufferManager::BeginWriteStall(StallInterface* wbm_stall) {

package/deps/rocksdb/rocksdb/memtable/write_buffer_manager_test.cc

@@ -9,12 +9,12 @@
 
 #include "rocksdb/write_buffer_manager.h"
 
+#include "rocksdb/advanced_cache.h"
 #include "test_util/testharness.h"
 
 namespace ROCKSDB_NAMESPACE {
 class WriteBufferManagerTest : public testing::Test {};
 
-#ifndef ROCKSDB_LITE
 const size_t kSizeDummyEntry = 256 * 1024;
 
 TEST_F(WriteBufferManagerTest, ShouldFlush) {
@@ -295,7 +295,6 @@ TEST_F(ChargeWriteBufferTest, BasicWithCacheFull) {
             46 * kSizeDummyEntry + kMetaDataChargeOverhead);
 }
 
-#endif  // ROCKSDB_LITE
 }  // namespace ROCKSDB_NAMESPACE
 
 int main(int argc, char** argv) {