make with USE_AWS=1 and without USE_GCP=1 work properly

Author: githubzilla

cloud/cloud_file_system.cc

@@ -488,7 +488,9 @@ int DoRegisterCloudObjects(ObjectLibrary& library, std::string const& arg) {
   count++;
 
   count += CloudFileSystemImpl::RegisterAwsObjects(library, arg);
+#ifdef USE_GCP // Only register GCP if we have it
   count += CloudFileSystemImpl::RegisterGcpObjects(library, arg);
+#endif
 
   // Register the Cloud Log Controllers
 

cloud/gcp/gcp_file_system.cc

@@ -1,5 +1,7 @@
 #ifndef ROCKSDB_LITE
 
+#ifdef USE_GCP
+
 #include <string>
 
 #include "rocksdb/convenience.h"
@@ -8,8 +10,6 @@
 #include "cloud/gcp/gcp_file_system.h"
 #include "cloud/cloud_storage_provider_impl.h"
 
-#ifdef USE_GCP
-
 namespace ROCKSDB_NAMESPACE {
 GcpFileSystem::GcpFileSystem(std::shared_ptr<FileSystem> const& underlying_fs,
                              CloudFileSystemOptions const& cloud_options,
@@ -75,7 +75,6 @@ Status GcpFileSystem::PrepareOptions(ConfigOptions const& options) {
 int CloudFileSystemImpl::RegisterGcpObjects(ObjectLibrary& library,
                                             std::string const& /*arg*/) {
   int count = 0;
-#ifdef USE_GCP
   library.AddFactory<FileSystem>(
       CloudFileSystemImpl::kGcp(),
       [](std::string const& /*uri*/, std::unique_ptr<FileSystem>* guard,
@@ -92,7 +91,7 @@ int CloudFileSystemImpl::RegisterGcpObjects(ObjectLibrary& library,
         }
       });
   count++;
-#endif
+
   library.AddFactory<CloudStorageProvider>(
       CloudStorageProviderImpl::kGcs(),
       [](std::string const& /*uri*/,

cloud/gcp/gcp_file_system_test.cc

@@ -1,5 +1,9 @@
 // Copyright (c) 2017 Rockset
 
+#ifndef ROCKSDB_LITE
+
+#ifdef USE_GCP
+
 #include "rocksdb/cloud/cloud_file_system.h"
 
 #include "cloud/cloud_log_controller_impl.h"
@@ -204,4 +208,23 @@ TEST(CloudFileSystemTest, ConfigureGcsProvider) {
 int main(int argc, char** argv) {
   ::testing::InitGoogleTest(&argc, argv);
   return RUN_ALL_TESTS();
-}
+}
+
+#else  // USE_GCP
+#include <stdio.h>
+
+int main(int, char**) {
+  fprintf(stderr,
+          "SKIPPED as DBCloud is supported only when USE_GCP is defined.\n");
+  return 0;
+}
+#endif  // USE_GCP
+
+#else   // ROCKSDB_LITE
+#include <stdio.h>
+
+int main(int, char**) {
+  fprintf(stderr, "SKIPPED as DBCloud is not supported in ROCKSDB_LITE.\n");
+  return 0;
+}
+#endif  // ROCKSDB_LITE

cloud/gcp/gcp_retry.cc

@@ -1,8 +1,10 @@
-#include "cloud/gcp/gcp_file_system.h"
-#include "rocksdb/cloud/cloud_file_system.h"
 #include <chrono>
 
+#include "rocksdb/cloud/cloud_file_system.h"
+
 #ifdef USE_GCP
+#include "cloud/gcp/gcp_file_system.h"
+
 #include <google/cloud/optional.h>
 #include <google/cloud/options.h>
 #include <google/cloud/retry_policy.h>
@@ -47,7 +49,7 @@ class GcpRetryPolicy : public gcs::RetryPolicy {
             "[gcs] Encountered failure: %s"
             "retry attempt %d exceeds max retries %d. Aborting...",
             s.message().c_str(), failure_count_, maximum_failures_);
-        // retry count exceed maxnum, but is not nonretryable
+        // retry count exceed maxium, but is not nonretryable
         return false;
       }
     } else {
@@ -112,12 +114,12 @@ Status GcpCloudOptions::GetClientConfiguration(CloudFileSystem* fs,
       GcpRetryPolicy(fs, std::chrono::milliseconds(timeout_ms)).clone());
   return Status::OK();
 }
-#else
-Status GcpCloudOptions::GetClientConfiguration(CloudFileSystem*,
-                                               std::string const&,
-                                               gcp::Options&) {
-  return Status::NotSupported("Not configured for GCP support");
-}
+//#else
+//Status GcpCloudOptions::GetClientConfiguration(CloudFileSystem*,
+                                               //std::string const&,
+                                               //gcp::Options&) {
+  //return Status::NotSupported("Not configured for GCP support");
+//}
 #endif /* USE_GCP */
 
 }  // namespace ROCKSDB_NAMESPACE

src.mk

@@ -445,8 +445,8 @@ TEST_MAIN_SOURCES =                                                     \
   cache/lru_cache_test.cc                                               \
   cloud/db_cloud_test.cc                                                \
   cloud/cloud_file_system_test.cc                                       \
-  cloud/gcp/gcp_file_system_test.cc                               \
-  cloud/gcp/gcp_db_cloud_test.cc                               \
+  cloud/gcp/gcp_file_system_test.cc                                     \
+  cloud/gcp/gcp_db_cloud_test.cc                                        \
   cloud/cloud_manifest_test.cc                                          \
   cloud/cloud_scheduler_test.cc                                         \
   cloud/replication_test.cc                                             \