Fix various build modes

Attempt to fix the cloud build to successfully build:
- make unity_test
- LITE=1
- COMPILE_WITH_TSAN

Author: mrambacher

cloud/aws/aws_env.cc

@@ -1,5 +1,6 @@
 //  Copyright (c) 2016-present, Rockset, Inc.  All rights reserved.
 //
+#ifndef ROCKSDB_LITE
 #include "cloud/aws/aws_env.h"
 
 #include <chrono>
@@ -18,7 +19,7 @@
 #include "rocksdb/cloud/cloud_storage_provider.h"
 #include "rocksdb/env.h"
 #include "rocksdb/status.h"
-#include "util/stderr_logger.h"
+#include "rocksdb/utilities/options_type.h"
 #include "util/string_util.h"
 
 #ifdef USE_AWS
@@ -41,16 +42,6 @@ static const std::unordered_map<std::string, AwsAccessType> AwsAccessTypeMap = {
     {"anonymous", AwsAccessType::kAnonymous},
 };
 
-template <typename T>
-bool ParseEnum(const std::unordered_map<std::string, T>& type_map,
-               const std::string& type, T* value) {
-  auto iter = type_map.find(type);
-  if (iter != type_map.end()) {
-    *value = iter->second;
-    return true;
-  }
-  return false;
-}
 
 AwsAccessType AwsCloudAccessCredentials::GetAccessType() const {
   if (type != AwsAccessType::kUndefined) {
@@ -177,8 +168,7 @@ Status AwsCloudAccessCredentials::GetCredentialsProvider(
 //
 AwsEnv::AwsEnv(Env* underlying_env, const CloudEnvOptions& _cloud_env_options,
                const std::shared_ptr<Logger>& info_log)
-    : CloudEnvImpl(_cloud_env_options, underlying_env, info_log),
-      rng_(time(nullptr)) {
+    : CloudEnvImpl(_cloud_env_options, underlying_env, info_log) {
   Aws::InitAPI(Aws::SDKOptions());
   if (cloud_env_options.src_bucket.GetRegion().empty() ||
       cloud_env_options.dest_bucket.GetRegion().empty()) {
@@ -370,3 +360,4 @@ std::string AwsEnv::GetWALCacheDir() {
 
 #endif  // USE_AWS
 }  // namespace ROCKSDB_NAMESPACE
+#endif // ROCKSDB_LITE

cloud/aws/aws_env.h

@@ -9,8 +9,6 @@
 #include <iostream>
 
 #include "cloud/cloud_env_impl.h"
-#include "port/sys_time.h"
-#include "util/random.h"
 
 #ifdef USE_AWS
 
@@ -93,8 +91,6 @@ class AwsEnv : public CloudEnvImpl {
 
   // The pathname that contains a list of all db's inside a bucket.
   static constexpr const char* dbid_registry_ = "/.rockset/dbid/";
-
-  Random64 rng_;
 };
 
 }  // namespace ROCKSDB_NAMESPACE

cloud/aws/aws_s3.cc

@@ -4,6 +4,7 @@
 // A directory maps to an an zero-size object in an S3 bucket
 // A sst file maps to an object in that S3 bucket.
 //
+#ifndef ROCKSDB_LITE
 #ifdef USE_AWS
 #include <aws/core/Aws.h>
 #include <aws/core/utils/Outcome.h>
@@ -903,7 +904,7 @@ Status S3StorageProvider::DoPutCloudObject(const std::string& local_file,
 }
 
 #endif /* USE_AWS */
-
+  
 Status CloudStorageProviderImpl::CreateS3Provider(
     std::shared_ptr<CloudStorageProvider>* provider) {
 #ifndef USE_AWS
@@ -916,3 +917,4 @@ Status CloudStorageProviderImpl::CreateS3Provider(
 #endif /* USE_AWS */
 }
 }  // namespace ROCKSDB_NAMESPACE
+#endif // ROCKSDB_LITE

cloud/cloud_scheduler.cc

@@ -72,7 +72,7 @@ class LocalCloudScheduler : public CloudScheduler {
                       long local_id)
       : scheduler_(scheduler), next_local_id_(local_id) {}
   ~LocalCloudScheduler() override {
-    for (const auto job : jobs_) {
+    for (const auto& job : jobs_) {
       scheduler_->CancelJob(job.second);
     }
     jobs_.clear();

cloud/cloud_scheduler_test.cc

@@ -1,5 +1,6 @@
 // Copyright (c) 2017 Rockset
 
+#ifndef ROCKSDB_LITE
 #include "cloud/cloud_scheduler.h"
 
 #include <gtest/gtest.h>
@@ -159,3 +160,12 @@ int main(int argc, char **argv) {
   ::testing::InitGoogleTest(&argc, argv);
   return RUN_ALL_TESTS();
 }
+#else
+#include <stdio.h>
+
+int main(int /*argc*/, char** /*argv*/) {
+  fprintf(stderr, "SKIPPED as CloudSchedulerTest is not supported in ROCKSDB_LITE\n");
+  return 0;
+}
+
+#endif  // ROCKSDB_LITE

cloud/cloud_storage_provider.cc

@@ -20,7 +20,7 @@
 #include "util/string_util.h"
 
 namespace ROCKSDB_NAMESPACE {
-
+#ifndef ROCKSDB_LITE
 /******************** Readablefile ******************/
 CloudStorageReadableFileImpl::CloudStorageReadableFileImpl(
     const std::shared_ptr<Logger>& info_log, const std::string& bucket,
@@ -361,4 +361,5 @@ Status CloudStorageProviderImpl::PutCloudObject(
   return DoPutCloudObject(local_file, bucket_name, object_path, fsize);
 }
 
+#endif //ROCKSDB_LITE
 }  // namespace ROCKSDB_NAMESPACE

cloud/db_cloud_test.cc

@@ -1559,7 +1559,7 @@ int main(int, char**) {
 
 #include <stdio.h>
 
-int main(int argc, char** argv) {
+int main(int, char** ) {
   fprintf(stderr, "SKIPPED as DBCloud is not supported in ROCKSDB_LITE\n");
   return 0;
 }

cloud/remote_compaction_test.cc

@@ -517,7 +517,7 @@ int main(int, char**) {
 
 #include <stdio.h>
 
-int main(int argc, char** argv) {
+int main(int, char**) {
   fprintf(stderr, "SKIPPED as DBCloud is not supported in ROCKSDB_LITE\n");
   return 0;
 }

db/db_impl/db_impl_remote_compaction.cc

@@ -151,13 +151,15 @@ Status DBImpl::doCompact(const CompactionOptions& compact_options,
   // remove this compaction job from the list of compactions
   c->ReleaseCompactionFiles(s);
 
+#ifndef ROCKSDB_LITE
   // Make sure SstFileManager does its bookkeeping
   auto sfm = static_cast<SstFileManagerImpl*>(
       immutable_db_options_.sst_file_manager.get());
   if (sfm) {
     sfm->OnCompactionCompletion(c.get());
   }
-
+#endif // ROCKSDB_LITE
+  
   // remove our iterator
   ReleaseFileNumberFromPendingOutputs(pending_outputs_inserted_elem);
 

db/db_test_util.cc

@@ -95,6 +95,7 @@ DBTestBase::DBTestBase(const std::string path, bool env_do_fsync)
 #endif  // !ROCKSDB_LITE
   env_ = new SpecialEnv(encrypted_env_ ? encrypted_env_
                                        : (mem_env_ ? mem_env_ : base_env));
+#ifndef ROCKSDB_LITE
 #ifdef USE_AWS
   // Randomize the test path so that multiple tests can run in parallel
   srand(static_cast<unsigned int>(time(nullptr)));
@@ -104,6 +105,7 @@ DBTestBase::DBTestBase(const std::string path, bool env_do_fsync)
   info_log_->SetInfoLogLevel(InfoLogLevel::DEBUG_LEVEL);
   s3_env_ = CreateNewAwsEnv(mypath, env_);
 #endif
+#endif  // !ROCKSDB_LITE
   env_->SetBackgroundThreads(1, Env::LOW);
   env_->SetBackgroundThreads(1, Env::HIGH);
   env_->skip_fsync_ = !env_do_fsync;
@@ -141,11 +143,13 @@ DBTestBase::~DBTestBase() {
   }
   delete env_;
 
+#ifndef ROCKSDB_LITE
 #ifdef USE_AWS
   auto aenv = dynamic_cast<CloudEnv*>(s3_env_);
   aenv->GetCloudEnvOptions().storage_provider->EmptyBucket(
       aenv->GetSrcBucketName(), aenv->GetSrcObjectPath());
 #endif
+#endif  // !ROCKSDB_LITE
   delete s3_env_;
 }
 
@@ -645,6 +649,7 @@ Options DBTestBase::GetOptions(
   return options;
 }
 
+#ifndef ROCKSDB_LITE
 #ifdef USE_AWS
 Env* DBTestBase::CreateNewAwsEnv(const std::string& prefix, Env* parent) {
   if (!prefix.empty()) {
@@ -666,7 +671,8 @@ Env* DBTestBase::CreateNewAwsEnv(const std::string& prefix, Env* parent) {
   assert(st.ok() && cenv);
   return cenv;
 }
-#endif
+#endif // USE_AWS
+#endif // ROCKSDB_LITE
 
 void DBTestBase::CreateColumnFamilies(const std::vector<std::string>& cfs,
                                       const Options& options) {