Fix ROCKSDB_NAMESPACE for missing files

Author: mrambacher

cloud/aws/aws_kafka.cc

@@ -429,7 +429,7 @@ Status CloudLogControllerImpl::CreateKafkaController(
       "In order to use Kafka, make sure you're compiling with "
       "USE_KAFKA=1");
 #else
-  output->reset(new rocksdb::cloud::kafka::KafkaController());
+  output->reset(new ROCKSDB_NAMESPACE::cloud::kafka::KafkaController());
   return Status::OK();
 #endif  // USE_KAFKA
 }

cloud/aws/aws_kinesis.cc

@@ -493,7 +493,7 @@ Status CloudLogControllerImpl::CreateKinesisController(
       "In order to use Kinesis, make sure you're compiling with "
       "USE_AWS=1");
 #else
-  output->reset(new rocksdb::cloud::kinesis::KinesisController());
+  output->reset(new ROCKSDB_NAMESPACE::cloud::kinesis::KinesisController());
   return Status::OK();
 #endif /* USE_AWS */
 }

cloud/db_cloud_test.cc

@@ -1491,7 +1491,7 @@ TEST_F(CloudTest, SharedBlockCache) {
   cloud_env_options_.keep_local_sst_files = false;
 
   // Share the block cache.
-  rocksdb::BlockBasedTableOptions bbto;
+  BlockBasedTableOptions bbto;
   bbto.block_cache = NewLRUCache(10 * 1024 * 1024);
   bbto.format_version = 4;
   options_.table_factory.reset(NewBlockBasedTableFactory(bbto));

cloud/examples/cloud_dump.cc

@@ -82,7 +82,8 @@ int main() {
   }
 
   // print all values in the database
-  rocksdb::Iterator* it = db->NewIterator(rocksdb::ReadOptions());
+  ROCKSDB_NAMESPACE::Iterator* it =
+      db->NewIterator(ROCKSDB_NAMESPACE::ReadOptions());
   for (it->SeekToFirst(); it->Valid(); it->Next()) {
     std::cout << it->key().ToString() << ": " << it->value().ToString()
               << std::endl;
@@ -93,7 +94,7 @@ int main() {
 
   // verify that the data is somewhat sane by manaully scanning for cfs
   std::vector<std::string> cf_names;
-  s = rocksdb::DB::ListColumnFamilies(options, kDBPath, &cf_names);
+  s = ROCKSDB_NAMESPACE::DB::ListColumnFamilies(options, kDBPath, &cf_names);
   for (std::string cf: cf_names) {
     std::cout << " Found Column Family " << cf;
   }

cloud/examples/cloud_durable_example.cc

@@ -112,7 +112,8 @@ int main() {
   assert(value == "value");
 
   // print all values in the database
-  rocksdb::Iterator* it = db->NewIterator(rocksdb::ReadOptions());
+  ROCKSDB_NAMESPACE::Iterator* it =
+      db->NewIterator(ROCKSDB_NAMESPACE::ReadOptions());
   for (it->SeekToFirst(); it->Valid(); it->Next()) {
     std::cout << it->key().ToString() << ": " << it->value().ToString()
               << std::endl;

db/db_test_util.cc

@@ -650,7 +650,7 @@ Options DBTestBase::GetOptions(
   }
 
   // get AWS credentials
-  rocksdb::CloudEnvOptions coptions;
+  CloudEnvOptions coptions;
   CloudEnv* cenv = nullptr;
   std::string region;
   coptions.TEST_Initialize("dbtest.", prefix, region);

include/rocksdb/cloud/db_cloud.h

@@ -24,7 +24,7 @@ class DBCloud : public StackableDB {
   // This API is to open a DB when key-values are to be made durable by
   // backing up database state into a cloud-storage system like S3.
   // All kv updates are persisted in cloud-storage.
-  // options.env is an object of type rocksdb::CloudEnv and the cloud
+  // options.env is an object of type ROCKSDB_NAMESPACE::CloudEnv and the cloud
   // buckets are specified there.
   static Status Open(const Options& options, const std::string& name,
                      const std::string& persistent_cache_path,

include/rocksdb/pluggable_compaction.h

@@ -12,7 +12,7 @@
 
 #include "rocksdb/options.h"
 
-namespace rocksdb {
+namespace ROCKSDB_NAMESPACE {
 
 /**
  * Defines all the parameters of the pluggable compaction interface.
@@ -106,4 +106,4 @@ struct OutputFile {
   SequenceNumber largest_seqno;
 };
 
-}  // namespace rocksdb
+}  // namespace ROCKSDB_NAMESPACE

tools/db_bench_tool.cc

@@ -1262,13 +1262,14 @@ enum RepFactory {
 
 // create Factory for creating S3 Envs
 #ifdef USE_AWS
-rocksdb::Env* CreateAwsEnv(const std::string& dbpath ,
-                            std::unique_ptr<rocksdb::Env>* result) {
+ROCKSDB_NAMESPACE::Env* CreateAwsEnv(
+    const std::string& dbpath,
+    std::unique_ptr<ROCKSDB_NAMESPACE::Env>* result) {
   fprintf(stderr, "Creating AwsEnv for path %s\n", dbpath.c_str());
-  std::shared_ptr<rocksdb::Logger> info_log;
-  info_log.reset(new rocksdb::StderrLogger(
-                     rocksdb::InfoLogLevel::WARN_LEVEL));
-  rocksdb::CloudEnvOptions coptions;
+  std::shared_ptr<ROCKSDB_NAMESPACE::Logger> info_log;
+  info_log.reset(new ROCKSDB_NAMESPACE::StderrLogger(
+      ROCKSDB_NAMESPACE::InfoLogLevel::WARN_LEVEL));
+  ROCKSDB_NAMESPACE::CloudEnvOptions coptions;
   std::string region;
   if (FLAGS_aws_access_id.size() != 0) {
     coptions.credentials.InitializeSimple(FLAGS_aws_access_id,
@@ -1279,23 +1280,24 @@ rocksdb::Env* CreateAwsEnv(const std::string& dbpath ,
 
   coptions.keep_local_sst_files = FLAGS_keep_local_sst_files;
   coptions.TEST_Initialize("dbbench.", "", region);
-  rocksdb::CloudEnv* s;
-  rocksdb::Status st = rocksdb::AwsEnv::NewAwsEnv(rocksdb::Env::Default(),
-                                                  coptions,
-                                                  std::move(info_log),
-                                                  &s);
+  ROCKSDB_NAMESPACE::CloudEnv* s;
+  ROCKSDB_NAMESPACE::Status st = ROCKSDB_NAMESPACE::AwsEnv::NewAwsEnv(
+      ROCKSDB_NAMESPACE::Env::Default(), coptions, std::move(info_log), &s);
   assert(st.ok());
-  ((rocksdb::CloudEnvImpl*)s)->TEST_DisableCloudManifest();
+  ((ROCKSDB_NAMESPACE::CloudEnvImpl*)s)->TEST_DisableCloudManifest();
   result->reset(s);
   return s;
 }
 
-static const auto & s3_reg = rocksdb::ObjectLibrary::Default()->Register<rocksdb::Env>(
-  "s3://.*", [](const std::string& uri,
-                std::unique_ptr<rocksdb::Env>* env_guard, std::string*) {
-          CreateAwsEnv(uri, env_guard);
-          return env_guard->get();
-});
+static const auto& s3_reg =
+    ROCKSDB_NAMESPACE::ObjectLibrary::Default()
+        -> Register<ROCKSDB_NAMESPACE::Env>(
+            "s3://.*", [](const std::string& uri,
+                          std::unique_ptr<ROCKSDB_NAMESPACE::Env>* env_guard,
+                          std::string*) {
+              CreateAwsEnv(uri, env_guard);
+              return env_guard->get();
+            });
 #endif /* USE_AWS */
 
 static enum RepFactory StringToRepFactory(const char* ctype) {