Google cloud storage support

@githubzilla @cmhms

Author: githubzilla

.clang-format

@@ -1,5 +1,50 @@
-# Complete list of style options can be found at: 
-# http://clang.llvm.org/docs/ClangFormatStyleOptions.html
----
+# Use the Google style in this project.
 BasedOnStyle: Google
-...
+
+# Some folks prefer to write "int& foo" while others prefer "int &foo".  The
+# Google Style Guide only asks for consistency within a project, we chose
+# "int& foo" for this project:
+DerivePointerAlignment: false
+PointerAlignment: Left
+
+# The Google Style Guide only asks for consistency w.r.t. "east const" vs.
+# "const west" alignment of cv-qualifiers. In this project we use "east const".
+QualifierAlignment: Right
+
+IncludeBlocks: Merge
+IncludeCategories:
+# Matches common headers first, but sorts them after project includes
+- Regex: '^\"google/cloud/internal/disable_deprecation_warnings.inc\"$'
+  Priority: -1
+- Regex: '^\"google/cloud/(internal/|grpc_utils/|testing_util/|[^/]+\.h)'
+  Priority: 1000
+- Regex: '^\"google/cloud/'  # project includes should sort first
+  Priority: 500
+- Regex: '^\"generator/'     # project includes should sort first
+  Priority: 500
+- Regex: '^\"generator/internal/' # project internals second
+  Priority: 1000
+- Regex: '^\"generator/testing/'  # testing helpers third
+  Priority: 1100
+- Regex: '^\"'         # And then includes from other projects or the system
+  Priority: 1500
+- Regex: '^<grpc/'
+  Priority: 2000
+- Regex: '^<google/*'
+  Priority: 3000
+- Regex: '^<.*/.*'
+  Priority: 4000
+- Regex: '^<.*.hpp>'
+  Priority: 4000
+- Regex: '^<[^/]*>'
+  Priority: 5000
+
+# Format raw string literals with a `pb` or `proto` tag as proto.
+RawStringFormats:
+- Language: TextProto
+  Delimiters:
+  - 'pb'
+  - 'proto'
+  BasedOnStyle: Google
+
+CommentPragmas: '(@copydoc|@copybrief|@see|@overload|@snippet)'

.gitignore

@@ -102,3 +102,7 @@ cmake-build-*
 third-party/folly/
 .cache
 *.sublime-*
+
+.clang-format
+.editorconfig
+*.vim

CMakeLists.txt

@@ -1651,4 +1651,4 @@ endif()
 option(WITH_BENCHMARK "build benchmark tests" OFF)
 if(WITH_BENCHMARK)
   add_subdirectory(${PROJECT_SOURCE_DIR}/microbench/)
-endif()
+endif()

Makefile

@@ -1886,6 +1886,12 @@ replication_test: cloud/replication_test.o $(TEST_LIBRARY) $(LIBRARY)
 cloud_file_system_test: cloud/cloud_file_system_test.o $(TEST_LIBRARY) $(LIBRARY)
 	$(AM_LINK)
 
+gcp_file_system_test: cloud/gcp/gcp_file_system_test.o $(TEST_LIBRARY) $(LIBRARY)
+	$(AM_LINK)
+
+gcp_db_cloud_test: cloud/gcp/gcp_db_cloud_test.o $(TEST_LIBRARY) $(LIBRARY)
+	$(AM_LINK)
+
 cloud_manifest_test: cloud/cloud_manifest_test.o $(TEST_LIBRARY) $(LIBRARY)
 	$(AM_LINK)
 
@@ -2618,4 +2624,4 @@ list_all_tests:
 ROCKS_DEP_RULES=$(filter-out clean format check-format check-buck-targets check-headers check-sources jclean jtest package analyze tags rocksdbjavastatic% unity.% unity_test checkout_folly, $(MAKECMDGOALS))
 ifneq ("$(ROCKS_DEP_RULES)", "")
 -include $(DEPFILES)
-endif
+endif

TARGETS

@@ -375,7 +375,6 @@ cpp_library_wrapper(name="rocksdb_lib", srcs=[
         "//folly/synchronization:distributed_mutex",
     ], headers=None, link_whole=False, extra_test_libs=False)
 
-<<<<<<< HEAD
 cpp_library_wrapper(name="rocksdb_whole_archive_lib", srcs=[
         "cache/cache.cc",
         "cache/cache_entry_roles.cc",
@@ -4983,6 +4982,15 @@ cpp_unittest_wrapper(name="cloud_file_system_test",
             deps=[":rocksdb_test_lib"],
             extra_compiler_flags=[])
 
+cpp_unittest_wrapper(name="gcp_file_system_test",
+            srcs=["cloud/gcp/gcp_file_system_test.cc"],
+            deps=[":rocksdb_test_lib"],
+            extra_compiler_flags=[])
+
+cpp_unittest_wrapper(name="gcp_db_cloud_test",
+            srcs=["cloud/gcp/gcp_db_cloud_test.cc"],
+            deps=[":rocksdb_test_lib"],
+            extra_compiler_flags=[])
 
 cpp_unittest_wrapper(name="cloud_manifest_test",
             srcs=["cloud/cloud_manifest_test.cc"],

build_tools/build_detect_platform

@@ -641,6 +641,16 @@ if [ "${USE_AWS}XXX" = "1XXX" ]; then
   COMMON_FLAGS="$COMMON_FLAGS $S3_CCFLAGS"
   PLATFORM_LDFLAGS="$S3_LDFLAGS $PLATFORM_LDFLAGS"
 fi
+
+if [ "${USE_GCP}XXX" = "1XXX" ]; then
+  GCP_SDK=/usr/local
+  GCI=${GCP_SDK}/include/
+  GCS_CCFLAGS="$GCS_CCFLAGS -I$GCI -DUSE_GCP"
+  GCS_LDFLAGS="$GCS_LDFLAGS -lgoogle_cloud_cpp_common -lgoogle_cloud_cpp_storage"
+  COMMON_FLAGS="$COMMON_FLAGS $GCS_CCFLAGS"
+  PLATFORM_LDFLAGS="$GCS_LDFLAGS $PLATFORM_LDFLAGS"
+fi
+
 #
 # Support the Kafka WAL storing if the env variable named USE_KAFKA
 # is set to 1. Setting it to any other value or not setting it at all means
@@ -832,4 +842,4 @@ if test -n "$USE_FOLLY"; then
 fi
 if test -n "$PPC_LIBC_IS_GNU"; then
   echo "PPC_LIBC_IS_GNU=$PPC_LIBC_IS_GNU" >> "$OUTPUT"
-fi
+fi

cloud/aws/aws_s3.cc

@@ -688,7 +688,7 @@ IOStatus S3StorageProvider::ExistsCloudObject(const std::string& bucket_name,
 IOStatus S3StorageProvider::GetCloudObjectSize(const std::string& bucket_name,
                                                const std::string& object_path,
                                                uint64_t* filesize) {
-  HeadObjectResult result;                                             
+  HeadObjectResult result;
   result.size = filesize;
   return HeadObject(bucket_name, object_path, &result);
 }
@@ -1064,4 +1064,4 @@ Status CloudStorageProviderImpl::CreateS3Provider(
 #endif /* USE_AWS */
 }
 }  // namespace ROCKSDB_NAMESPACE
-#endif  // ROCKSDB_LITE
+#endif  // ROCKSDB_LITE