@nxtedition/rocksdb 8.1.6 → 8.1.8

package/deps/rocksdb/rocksdb/env/composite_env.cc

@@ -391,7 +391,6 @@ Status CompositeEnv::NewDirectory(const std::string& name,
 
 namespace {
 static std::unordered_map<std::string, OptionTypeInfo> env_wrapper_type_info = {
-#ifndef ROCKSDB_LITE
     {"target",
      OptionTypeInfo(0, OptionType::kUnknown, OptionVerificationType::kByName,
                     OptionTypeFlags::kDontSerialize)
@@ -433,24 +432,19 @@ static std::unordered_map<std::string, OptionTypeInfo> env_wrapper_type_info = {
              return target->env->ValidateOptions(db_opts, cf_opts);
            }
          })},
-#endif  // ROCKSDB_LITE
 };
 static std::unordered_map<std::string, OptionTypeInfo>
     composite_fs_wrapper_type_info = {
-#ifndef ROCKSDB_LITE
         {"file_system",
          OptionTypeInfo::AsCustomSharedPtr<FileSystem>(
              0, OptionVerificationType::kByName, OptionTypeFlags::kNone)},
-#endif  // ROCKSDB_LITE
 };
 
 static std::unordered_map<std::string, OptionTypeInfo>
     composite_clock_wrapper_type_info = {
-#ifndef ROCKSDB_LITE
         {"clock",
          OptionTypeInfo::AsCustomSharedPtr<SystemClock>(
              0, OptionVerificationType::kByName, OptionTypeFlags::kNone)},
-#endif  // ROCKSDB_LITE
 };
 
 }  // namespace
@@ -488,7 +482,6 @@ Status CompositeEnvWrapper::PrepareOptions(const ConfigOptions& options) {
   return Env::PrepareOptions(options);
 }
 
-#ifndef ROCKSDB_LITE
 std::string CompositeEnvWrapper::SerializeOptions(
     const ConfigOptions& config_options, const std::string& header) const {
   auto options = CompositeEnv::SerializeOptions(config_options, header);
@@ -498,7 +491,6 @@ std::string CompositeEnvWrapper::SerializeOptions(
   }
   return options;
 }
-#endif  // ROCKSDB_LITE
 
 EnvWrapper::EnvWrapper(Env* t) : target_(t) {
   RegisterOptions("", &target_, &env_wrapper_type_info);
@@ -519,7 +511,6 @@ Status EnvWrapper::PrepareOptions(const ConfigOptions& options) {
   return Env::PrepareOptions(options);
 }
 
-#ifndef ROCKSDB_LITE
 std::string EnvWrapper::SerializeOptions(const ConfigOptions& config_options,
                                          const std::string& header) const {
   auto parent = Env::SerializeOptions(config_options, "");
@@ -539,6 +530,5 @@ std::string EnvWrapper::SerializeOptions(const ConfigOptions& config_options,
     return result;
   }
 }
-#endif  // ROCKSDB_LITE
 
 }  // namespace ROCKSDB_NAMESPACE

package/deps/rocksdb/rocksdb/env/composite_env_wrapper.h

@@ -289,10 +289,8 @@ class CompositeEnvWrapper : public CompositeEnv {
   const Customizable* Inner() const override { return target_.env; }
 
   Status PrepareOptions(const ConfigOptions& options) override;
-#ifndef ROCKSDB_LITE
   std::string SerializeOptions(const ConfigOptions& config_options,
                                const std::string& header) const override;
-#endif  // ROCKSDB_LITE
 
   // Return the target to which this Env forwards all calls
   Env* env_target() const { return target_.env; }

package/deps/rocksdb/rocksdb/env/env.cc

@@ -29,7 +29,6 @@
 
 namespace ROCKSDB_NAMESPACE {
 namespace {
-#ifndef ROCKSDB_LITE
 static int RegisterBuiltinEnvs(ObjectLibrary& library,
                                const std::string& /*arg*/) {
   library.AddFactory<Env>(MockEnv::kClassName(), [](const std::string& /*uri*/,
@@ -48,15 +47,12 @@ static int RegisterBuiltinEnvs(ObjectLibrary& library,
   size_t num_types;
   return static_cast<int>(library.GetFactoryCount(&num_types));
 }
-#endif  // ROCKSDB_LITE
 
 static void RegisterSystemEnvs() {
-#ifndef ROCKSDB_LITE
   static std::once_flag loaded;
   std::call_once(loaded, [&]() {
     RegisterBuiltinEnvs(*(ObjectLibrary::Default().get()), "");
   });
-#endif  // ROCKSDB_LITE
 }
 
 class LegacySystemClock : public SystemClock {
@@ -97,7 +93,6 @@ class LegacySystemClock : public SystemClock {
     return env_->TimeToString(time);
   }
 
-#ifndef ROCKSDB_LITE
   std::string SerializeOptions(const ConfigOptions& /*config_options*/,
                                const std::string& /*prefix*/) const override {
     // We do not want the LegacySystemClock to appear in the serialized output.
@@ -105,7 +100,6 @@ class LegacySystemClock : public SystemClock {
     // would be part of the Env.  As such, do not serialize it here.
     return "";
   }
-#endif  // ROCKSDB_LITE
 };
 
 class LegacySequentialFileWrapper : public FSSequentialFile {
@@ -605,7 +599,6 @@ class LegacyFileSystemWrapper : public FileSystem {
     return status_to_io_status(target_->IsDirectory(path, is_dir));
   }
 
-#ifndef ROCKSDB_LITE
   std::string SerializeOptions(const ConfigOptions& /*config_options*/,
                                const std::string& /*prefix*/) const override {
     // We do not want the LegacyFileSystem to appear in the serialized output.
@@ -613,7 +606,6 @@ class LegacyFileSystemWrapper : public FileSystem {
     // would be part of the Env.  As such, do not serialize it here.
     return "";
   }
-#endif  // ROCKSDB_LITE
  private:
   Env* target_;
 };
@@ -640,10 +632,6 @@ Status Env::NewLogger(const std::string& fname,
   return NewEnvLogger(fname, this, result);
 }
 
-Status Env::LoadEnv(const std::string& value, Env** result) {
-  return CreateFromString(ConfigOptions(), value, result);
-}
-
 Status Env::CreateFromString(const ConfigOptions& config_options,
                              const std::string& value, Env** result) {
   Env* base = Env::Default();
@@ -653,7 +641,7 @@ Status Env::CreateFromString(const ConfigOptions& config_options,
   } else {
     RegisterSystemEnvs();
     Env* env = *result;
-    Status s = LoadStaticObject<Env>(config_options, value, nullptr, &env);
+    Status s = LoadStaticObject<Env>(config_options, value, &env);
     if (s.ok()) {
       *result = env;
     }
@@ -661,11 +649,6 @@ Status Env::CreateFromString(const ConfigOptions& config_options,
   }
 }
 
-Status Env::LoadEnv(const std::string& value, Env** result,
-                    std::shared_ptr<Env>* guard) {
-  return CreateFromString(ConfigOptions(), value, result, guard);
-}
-
 Status Env::CreateFromString(const ConfigOptions& config_options,
                              const std::string& value, Env** result,
                              std::shared_ptr<Env>* guard) {
@@ -688,13 +671,8 @@ Status Env::CreateFromString(const ConfigOptions& config_options,
     status = Status::OK();
   } else {
     RegisterSystemEnvs();
-#ifndef ROCKSDB_LITE
     // First, try to load the Env as a unique object.
     status = config_options.registry->NewObject<Env>(id, &env, &uniq);
-#else
-    status =
-        Status::NotSupported("Cannot load environment in LITE mode", value);
-#endif
   }
   if (config_options.ignore_unsupported_options && status.IsNotSupported()) {
     status = Status::OK();
@@ -1186,11 +1164,9 @@ const std::shared_ptr<SystemClock>& Env::GetSystemClock() const {
 }
 namespace {
 static std::unordered_map<std::string, OptionTypeInfo> sc_wrapper_type_info = {
-#ifndef ROCKSDB_LITE
     {"target",
      OptionTypeInfo::AsCustomSharedPtr<SystemClock>(
          0, OptionVerificationType::kByName, OptionTypeFlags::kDontSerialize)},
-#endif  // ROCKSDB_LITE
 };
 
 }  // namespace
@@ -1206,7 +1182,6 @@ Status SystemClockWrapper::PrepareOptions(const ConfigOptions& options) {
   return SystemClock::PrepareOptions(options);
 }
 
-#ifndef ROCKSDB_LITE
 std::string SystemClockWrapper::SerializeOptions(
     const ConfigOptions& config_options, const std::string& header) const {
   auto parent = SystemClock::SerializeOptions(config_options, "");
@@ -1226,9 +1201,7 @@ std::string SystemClockWrapper::SerializeOptions(
     return result;
   }
 }
-#endif  // ROCKSDB_LITE
 
-#ifndef ROCKSDB_LITE
 static int RegisterBuiltinSystemClocks(ObjectLibrary& library,
                                        const std::string& /*arg*/) {
   library.AddFactory<SystemClock>(
@@ -1241,7 +1214,6 @@ static int RegisterBuiltinSystemClocks(ObjectLibrary& library,
   size_t num_types;
   return static_cast<int>(library.GetFactoryCount(&num_types));
 }
-#endif  // ROCKSDB_LITE
 
 Status SystemClock::CreateFromString(const ConfigOptions& config_options,
                                      const std::string& value,
@@ -1251,14 +1223,11 @@ Status SystemClock::CreateFromString(const ConfigOptions& config_options,
     *result = clock;
     return Status::OK();
   } else {
-#ifndef ROCKSDB_LITE
     static std::once_flag once;
     std::call_once(once, [&]() {
       RegisterBuiltinSystemClocks(*(ObjectLibrary::Default().get()), "");
     });
-#endif  // ROCKSDB_LITE
-    return LoadSharedObject<SystemClock>(config_options, value, nullptr,
-                                         result);
+    return LoadSharedObject<SystemClock>(config_options, value, result);
   }
 }
 }  // namespace ROCKSDB_NAMESPACE

package/deps/rocksdb/rocksdb/env/env_basic_test.cc

@@ -32,7 +32,6 @@ static Env* GetMockEnv() {
   static std::unique_ptr<Env> mock_env(MockEnv::Create(Env::Default()));
   return mock_env.get();
 }
-#ifndef ROCKSDB_LITE
 static Env* NewTestEncryptedEnv(Env* base, const std::string& provider_id) {
   ConfigOptions config_opts;
   config_opts.invoke_prepare_options = false;
@@ -81,7 +80,6 @@ static Env* GetTestFS() {
   EXPECT_NE(fs_env, nullptr);
   return fs_env;
 }
-#endif  // ROCKSDB_LITE
 
 }  // namespace
 class EnvBasicTestWithParam
@@ -111,7 +109,6 @@ INSTANTIATE_TEST_CASE_P(EnvDefault, EnvMoreTestWithParam,
 INSTANTIATE_TEST_CASE_P(MockEnv, EnvBasicTestWithParam,
                         ::testing::Values(&GetMockEnv));
 
-#ifndef ROCKSDB_LITE
 // next statements run env test against default encryption code.
 INSTANTIATE_TEST_CASE_P(EncryptedEnv, EnvBasicTestWithParam,
                         ::testing::Values(&GetCtrEncryptedEnv));
@@ -148,7 +145,6 @@ INSTANTIATE_TEST_CASE_P(CustomEnv, EnvBasicTestWithParam,
 
 INSTANTIATE_TEST_CASE_P(CustomEnv, EnvMoreTestWithParam,
                         ::testing::ValuesIn(GetCustomEnvs()));
-#endif  // ROCKSDB_LITE
 
 TEST_P(EnvBasicTestWithParam, Basics) {
   uint64_t file_size;

package/deps/rocksdb/rocksdb/env/env_chroot.cc

@@ -3,7 +3,7 @@
 //  COPYING file in the root directory) and Apache 2.0 License
 //  (found in the LICENSE.Apache file in the root directory).
 
-#if !defined(ROCKSDB_LITE) && !defined(OS_WIN)
+#if !defined(OS_WIN)
 
 #include "env/env_chroot.h"
 
@@ -145,4 +145,4 @@ Env* NewChrootEnv(Env* base_env, const std::string& chroot_dir) {
 
 }  // namespace ROCKSDB_NAMESPACE
 
-#endif  // !defined(ROCKSDB_LITE) && !defined(OS_WIN)
+#endif  //  !defined(OS_WIN)

package/deps/rocksdb/rocksdb/env/env_chroot.h

@@ -5,7 +5,7 @@
 
 #pragma once
 
-#if !defined(ROCKSDB_LITE) && !defined(OS_WIN)
+#if !defined(OS_WIN)
 
 #include <string>
 
@@ -52,4 +52,4 @@ std::shared_ptr<FileSystem> NewChrootFileSystem(
 
 }  // namespace ROCKSDB_NAMESPACE
 
-#endif  // !defined(ROCKSDB_LITE) && !defined(OS_WIN)
+#endif  // !defined(OS_WIN)

package/deps/rocksdb/rocksdb/env/env_encryption.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 "rocksdb/env_encryption.h"
 
@@ -25,9 +24,7 @@
 #include "util/random.h"
 #include "util/string_util.h"
 
-#endif
 namespace ROCKSDB_NAMESPACE {
-#ifndef ROCKSDB_LITE
 std::shared_ptr<EncryptionProvider> EncryptionProvider::NewCTRProvider(
     const std::shared_ptr<BlockCipher>& cipher) {
   return std::make_shared<CTREncryptionProvider>(cipher);
@@ -1335,17 +1332,15 @@ Status BlockCipher::CreateFromString(const ConfigOptions& config_options,
                                      const std::string& value,
                                      std::shared_ptr<BlockCipher>* result) {
   RegisterEncryptionBuiltins();
-  return LoadSharedObject<BlockCipher>(config_options, value, nullptr, result);
+  return LoadSharedObject<BlockCipher>(config_options, value, result);
 }
 
 Status EncryptionProvider::CreateFromString(
     const ConfigOptions& config_options, const std::string& value,
     std::shared_ptr<EncryptionProvider>* result) {
   RegisterEncryptionBuiltins();
-  return LoadSharedObject<EncryptionProvider>(config_options, value, nullptr,
-                                              result);
+  return LoadSharedObject<EncryptionProvider>(config_options, value, result);
 }
 
-#endif  // ROCKSDB_LITE
 
 }  // namespace ROCKSDB_NAMESPACE

package/deps/rocksdb/rocksdb/env/env_encryption_ctr.h

@@ -5,7 +5,6 @@
 
 #pragma once
 
-#if !defined(ROCKSDB_LITE)
 
 #include "rocksdb/env_encryption.h"
 
@@ -113,4 +112,3 @@ Status NewEncryptedFileSystemImpl(
 
 }  // namespace ROCKSDB_NAMESPACE
 
-#endif  // !defined(ROCKSDB_LITE)

package/deps/rocksdb/rocksdb/env/env_test.cc

@@ -1107,7 +1107,6 @@ class IoctlFriendlyTmpdir {
   bool is_supported_ = true;
 };
 
-#ifndef ROCKSDB_LITE
 TEST_F(EnvPosixTest, PositionedAppend) {
   std::unique_ptr<WritableFile> writable_file;
   EnvOptions options;
@@ -1141,7 +1140,6 @@ TEST_F(EnvPosixTest, PositionedAppend) {
   ASSERT_EQ('a', result[kBlockSize - 1]);
   ASSERT_EQ('b', result[kBlockSize]);
 }
-#endif  // !ROCKSDB_LITE
 
 // `GetUniqueId()` temporarily returns zero on Windows. `BlockBasedTable` can
 // handle a return value of zero but this test case cannot.
@@ -1551,7 +1549,6 @@ TEST_F(EnvPosixTest, MultiReadNonAlignedLargeNum) {
   }
 }
 
-#ifndef ROCKSDB_LITE
 TEST_F(EnvPosixTest, NonAlignedDirectIOMultiReadBeyondFileSize) {
   EnvOptions soptions;
   soptions.use_direct_reads = true;
@@ -1622,7 +1619,6 @@ TEST_F(EnvPosixTest, NonAlignedDirectIOMultiReadBeyondFileSize) {
 
   ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->DisableProcessing();
 }
-#endif  // ROCKSDB_LITE
 
 #if defined(ROCKSDB_IOURING_PRESENT)
 void GenerateFilesAndRequest(Env* env, const std::string& fname,
@@ -2470,13 +2466,11 @@ TEST_F(EnvTest, LogvWithInfoLogLevel) {
 INSTANTIATE_TEST_CASE_P(DefaultEnvWithoutDirectIO, EnvPosixTestWithParam,
                         ::testing::Values(std::pair<Env*, bool>(Env::Default(),
                                                                 false)));
-#if !defined(ROCKSDB_LITE)
 INSTANTIATE_TEST_CASE_P(DefaultEnvWithDirectIO, EnvPosixTestWithParam,
                         ::testing::Values(std::pair<Env*, bool>(Env::Default(),
                                                                 true)));
-#endif  // !defined(ROCKSDB_LITE)
 
-#if !defined(ROCKSDB_LITE) && !defined(OS_WIN)
+#if !defined(OS_WIN)
 static Env* GetChrootEnv() {
   static std::unique_ptr<Env> chroot_env(
       NewChrootEnv(Env::Default(), test::TmpDir(Env::Default())));
@@ -2488,7 +2482,7 @@ INSTANTIATE_TEST_CASE_P(ChrootEnvWithoutDirectIO, EnvPosixTestWithParam,
 INSTANTIATE_TEST_CASE_P(ChrootEnvWithDirectIO, EnvPosixTestWithParam,
                         ::testing::Values(std::pair<Env*, bool>(GetChrootEnv(),
                                                                 true)));
-#endif  // !defined(ROCKSDB_LITE) && !defined(OS_WIN)
+#endif  //  !defined(OS_WIN)
 
 class EnvFSTestWithParam
     : public ::testing::Test,
@@ -2653,7 +2647,6 @@ class CreateEnvTest : public testing::Test {
   ConfigOptions config_options_;
 };
 
-#ifndef ROCKSDB_LITE
 TEST_F(CreateEnvTest, LoadCTRProvider) {
   config_options_.invoke_prepare_options = false;
   std::string CTR = CTREncryptionProvider::kClassName();
@@ -2712,7 +2705,6 @@ TEST_F(CreateEnvTest, LoadROT13Cipher) {
   ASSERT_NE(cipher, nullptr);
   ASSERT_STREQ(cipher->Name(), "ROT13");
 }
-#endif  // ROCKSDB_LITE
 
 TEST_F(CreateEnvTest, CreateDefaultSystemClock) {
   std::shared_ptr<SystemClock> clock, copy;
@@ -2720,15 +2712,12 @@ TEST_F(CreateEnvTest, CreateDefaultSystemClock) {
                                           SystemClock::kDefaultName(), &clock));
   ASSERT_NE(clock, nullptr);
   ASSERT_EQ(clock, SystemClock::Default());
-#ifndef ROCKSDB_LITE
   std::string opts_str = clock->ToString(config_options_);
   std::string mismatch;
   ASSERT_OK(SystemClock::CreateFromString(config_options_, opts_str, &copy));
   ASSERT_TRUE(clock->AreEquivalent(config_options_, copy.get(), &mismatch));
-#endif  // ROCKSDB_LITE
 }
 
-#ifndef ROCKSDB_LITE
 TEST_F(CreateEnvTest, CreateMockSystemClock) {
   std::shared_ptr<SystemClock> mock, copy;
 
@@ -2943,7 +2932,6 @@ TEST_F(CreateEnvTest, CreateEncryptedFileSystem) {
   ASSERT_TRUE(fs->AreEquivalent(config_options_, copy.get(), &mismatch));
 }
 
-#endif  // ROCKSDB_LITE
 
 namespace {
 
@@ -3191,17 +3179,14 @@ TEST_F(CreateEnvTest, CreateDefaultEnv) {
   ASSERT_EQ(env, Env::Default());
   ASSERT_EQ(guard, nullptr);
 
-#ifndef ROCKSDB_LITE
   std::string opt_str = env->ToString(options);
   ASSERT_OK(Env::CreateFromString(options, opt_str, &env));
   ASSERT_EQ(env, Env::Default());
   ASSERT_OK(Env::CreateFromString(options, opt_str, &env, &guard));
   ASSERT_EQ(env, Env::Default());
   ASSERT_EQ(guard, nullptr);
-#endif  // ROCKSDB_LITE
 }
 
-#ifndef ROCKSDB_LITE
 namespace {
 class WrappedEnv : public EnvWrapper {
  public:
@@ -3353,7 +3338,6 @@ TEST_F(CreateEnvTest, CreateCompositeEnv) {
   ASSERT_NE(comp->Inner(), nullptr);
   ASSERT_OK(ValidateOptions(db_opts, cf_opts));
 }
-#endif  // ROCKSDB_LITE
 
 // Forward declaration
 class ReadAsyncFS;

package/deps/rocksdb/rocksdb/env/file_system.cc

@@ -26,12 +26,6 @@ FileSystem::FileSystem() {}
 
 FileSystem::~FileSystem() {}
 
-Status FileSystem::Load(const std::string& value,
-                        std::shared_ptr<FileSystem>* result) {
-  return CreateFromString(ConfigOptions(), value, result);
-}
-
-#ifndef ROCKSDB_LITE
 static int RegisterBuiltinFileSystems(ObjectLibrary& library,
                                       const std::string& /*arg*/) {
   library.AddFactory<FileSystem>(
@@ -84,7 +78,6 @@ static int RegisterBuiltinFileSystems(ObjectLibrary& library,
   size_t num_types;
   return static_cast<int>(library.GetFactoryCount(&num_types));
 }
-#endif  // ROCKSDB_LITE
 
 Status FileSystem::CreateFromString(const ConfigOptions& config_options,
                                     const std::string& value,
@@ -94,13 +87,11 @@ Status FileSystem::CreateFromString(const ConfigOptions& config_options,
     *result = default_fs;
     return Status::OK();
   } else {
-#ifndef ROCKSDB_LITE
     static std::once_flag once;
     std::call_once(once, [&]() {
       RegisterBuiltinFileSystems(*(ObjectLibrary::Default().get()), "");
     });
-#endif  // ROCKSDB_LITE
-    return LoadSharedObject<FileSystem>(config_options, value, nullptr, result);
+    return LoadSharedObject<FileSystem>(config_options, value, result);
   }
 }
 
@@ -235,11 +226,9 @@ IOStatus ReadFileToString(FileSystem* fs, const std::string& fname,
 
 namespace {
 static std::unordered_map<std::string, OptionTypeInfo> fs_wrapper_type_info = {
-#ifndef ROCKSDB_LITE
     {"target",
      OptionTypeInfo::AsCustomSharedPtr<FileSystem>(
          0, OptionVerificationType::kByName, OptionTypeFlags::kDontSerialize)},
-#endif  // ROCKSDB_LITE
 };
 }  // namespace
 FileSystemWrapper::FileSystemWrapper(const std::shared_ptr<FileSystem>& t)
@@ -254,7 +243,6 @@ Status FileSystemWrapper::PrepareOptions(const ConfigOptions& options) {
   return FileSystem::PrepareOptions(options);
 }
 
-#ifndef ROCKSDB_LITE
 std::string FileSystemWrapper::SerializeOptions(
     const ConfigOptions& config_options, const std::string& header) const {
   auto parent = FileSystem::SerializeOptions(config_options, "");
@@ -274,7 +262,6 @@ std::string FileSystemWrapper::SerializeOptions(
     return result;
   }
 }
-#endif  // ROCKSDB_LITE
 
 DirFsyncOptions::DirFsyncOptions() { reason = kDefault; }
 

package/deps/rocksdb/rocksdb/env/fs_posix.cc

@@ -168,10 +168,6 @@ class PosixFileSystem : public FileSystem {
     FILE* file = nullptr;
 
     if (options.use_direct_reads && !options.use_mmap_reads) {
-#ifdef ROCKSDB_LITE
-      return IOStatus::IOError(fname,
-                               "Direct I/O not supported in RocksDB lite");
-#endif  // !ROCKSDB_LITE
 #if !defined(OS_MACOSX) && !defined(OS_OPENBSD) && !defined(OS_SOLARIS)
       flags |= O_DIRECT;
       TEST_SYNC_POINT_CALLBACK("NewSequentialFile:O_DIRECT", &flags);
@@ -223,10 +219,6 @@ class PosixFileSystem : public FileSystem {
     int flags = cloexec_flags(O_RDONLY, &options);
 
     if (options.use_direct_reads && !options.use_mmap_reads) {
-#ifdef ROCKSDB_LITE
-      return IOStatus::IOError(fname,
-                               "Direct I/O not supported in RocksDB lite");
-#endif  // !ROCKSDB_LITE
 #if !defined(OS_MACOSX) && !defined(OS_OPENBSD) && !defined(OS_SOLARIS)
       flags |= O_DIRECT;
       TEST_SYNC_POINT_CALLBACK("NewRandomAccessFile:O_DIRECT", &flags);
@@ -300,10 +292,6 @@ class PosixFileSystem : public FileSystem {
       // appends data to the end of the file, regardless of the value of
       // offset.
       // More info here: https://linux.die.net/man/2/pwrite
-#ifdef ROCKSDB_LITE
-      return IOStatus::IOError(fname,
-                               "Direct I/O not supported in RocksDB lite");
-#endif  // ROCKSDB_LITE
       flags |= O_WRONLY;
 #if !defined(OS_MACOSX) && !defined(OS_OPENBSD) && !defined(OS_SOLARIS)
       flags |= O_DIRECT;
@@ -392,10 +380,6 @@ class PosixFileSystem : public FileSystem {
     int flags = 0;
     // Direct IO mode with O_DIRECT flag or F_NOCAHCE (MAC OSX)
     if (options.use_direct_writes && !options.use_mmap_writes) {
-#ifdef ROCKSDB_LITE
-      return IOStatus::IOError(fname,
-                               "Direct I/O not supported in RocksDB lite");
-#endif  // !ROCKSDB_LITE
       flags |= O_WRONLY;
 #if !defined(OS_MACOSX) && !defined(OS_OPENBSD) && !defined(OS_SOLARIS)
       flags |= O_DIRECT;
@@ -1278,7 +1262,6 @@ std::shared_ptr<FileSystem> FileSystem::Default() {
   return instance;
 }
 
-#ifndef ROCKSDB_LITE
 static FactoryFunc<FileSystem> posix_filesystem_reg =
     ObjectLibrary::Default()->AddFactory<FileSystem>(
         ObjectLibrary::PatternEntry("posix").AddSeparator("://", false),
@@ -1287,7 +1270,6 @@ static FactoryFunc<FileSystem> posix_filesystem_reg =
           f->reset(new PosixFileSystem());
           return f->get();
         });
-#endif
 
 }  // namespace ROCKSDB_NAMESPACE
 

package/deps/rocksdb/rocksdb/env/fs_readonly.h

@@ -5,7 +5,6 @@
 
 #pragma once
 
-#ifndef ROCKSDB_LITE
 
 #include "rocksdb/file_system.h"
 
@@ -104,4 +103,3 @@ class ReadOnlyFileSystem : public FileSystemWrapper {
 
 }  // namespace ROCKSDB_NAMESPACE
 
-#endif  // ROCKSDB_LITE

package/deps/rocksdb/rocksdb/env/fs_remap.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 "env/fs_remap.h"
 
@@ -340,4 +339,3 @@ IOStatus RemapFileSystem::GetAbsolutePath(const std::string& db_path,
 
 }  // namespace ROCKSDB_NAMESPACE
 
-#endif  // ROCKSDB_LITE

package/deps/rocksdb/rocksdb/env/fs_remap.h

@@ -5,7 +5,6 @@
 
 #pragma once
 
-#ifndef ROCKSDB_LITE
 
 #include <utility>
 
@@ -136,4 +135,3 @@ class RemapFileSystem : public FileSystemWrapper {
 
 }  // namespace ROCKSDB_NAMESPACE
 
-#endif  // ROCKSDB_LITE

package/deps/rocksdb/rocksdb/env/mock_env.cc

@@ -33,7 +33,6 @@ int64_t MaybeCurrentTime(const std::shared_ptr<SystemClock>& clock) {
 }
 
 static std::unordered_map<std::string, OptionTypeInfo> time_elapse_type_info = {
-#ifndef ROCKSDB_LITE
     {"time_elapse_only_sleep",
      {0, OptionType::kBoolean, OptionVerificationType::kNormal,
       OptionTypeFlags::kCompareNever,
@@ -50,10 +49,8 @@ static std::unordered_map<std::string, OptionTypeInfo> time_elapse_type_info = {
         return Status::OK();
       },
       nullptr}},
-#endif  // ROCKSDB_LITE
 };
 static std::unordered_map<std::string, OptionTypeInfo> mock_sleep_type_info = {
-#ifndef ROCKSDB_LITE
     {"mock_sleep",
      {0, OptionType::kBoolean, OptionVerificationType::kNormal,
       OptionTypeFlags::kCompareNever,
@@ -70,7 +67,6 @@ static std::unordered_map<std::string, OptionTypeInfo> mock_sleep_type_info = {
         return Status::OK();
       },
       nullptr}},
-#endif  // ROCKSDB_LITE
 };
 }  // namespace
 
@@ -572,11 +568,9 @@ class TestMemLogger : public Logger {
 };
 
 static std::unordered_map<std::string, OptionTypeInfo> mock_fs_type_info = {
-#ifndef ROCKSDB_LITE
     {"supports_direct_io",
      {0, OptionType::kBoolean, OptionVerificationType::kNormal,
       OptionTypeFlags::kNone}},
-#endif  // ROCKSDB_LITE
 };
 }  // namespace
 
@@ -1057,14 +1051,8 @@ Status MockEnv::CorruptBuffer(const std::string& fname) {
   return mock->CorruptBuffer(fname);
 }
 
-#ifndef ROCKSDB_LITE
 // This is to maintain the behavior before swithcing from InMemoryEnv to MockEnv
 Env* NewMemEnv(Env* base_env) { return MockEnv::Create(base_env); }
 
-#else  // ROCKSDB_LITE
-
-Env* NewMemEnv(Env* /*base_env*/) { return nullptr; }
-
-#endif  // !ROCKSDB_LITE
 
 }  // namespace ROCKSDB_NAMESPACE