Changes to get rocksdb-cloud to build on Mac

Author: mrambacher

cloud/aws/aws_env.cc

@@ -31,7 +31,7 @@ namespace detail {
 using ScheduledJob =
     std::pair<std::chrono::steady_clock::time_point, std::function<void(void)>>;
 struct Comp {
-  bool operator()(const ScheduledJob& a, const ScheduledJob& b) {
+  bool operator()(const ScheduledJob& a, const ScheduledJob& b) const {
     return a.first < b.first;
   }
 };

cloud/aws/aws_file.h

@@ -122,7 +122,7 @@ class S3WritableFile : public WritableFile {
 
   virtual ~S3WritableFile();
 
-  virtual Status Append(const Slice& data) {
+  virtual Status Append(const Slice& data) override {
     assert(status_.ok());
     // write to temporary file
     return local_file_->Append(data);
@@ -156,16 +156,16 @@ class S3WritableFile : public WritableFile {
     return local_file_->Allocate(offset, len);
   }
 
-  virtual Status Flush() {
+  virtual Status Flush() override {
     assert(status_.ok());
     return local_file_->Flush();
   }
 
-  virtual Status Sync();
+  virtual Status Sync() override ;
 
   virtual Status status() { return status_; }
 
-  virtual Status Close();
+  virtual Status Close() override;
 };
 
 }  // namepace rocksdb

cloud/cloud_env_impl.h

@@ -28,7 +28,7 @@ class CloudEnvImpl : public CloudEnv {
   const LogType& GetLogType() const { return log_type_; }
 
   // Returns the underlying env
-  Env* GetBaseEnv() { return base_env_; }
+  Env* GetBaseEnv() override { return base_env_; }
 
   // The separator used to separate dbids while creating the dbid of a clone
   static constexpr const char* DBID_SEPARATOR = "rockset";

cloud/db_cloud_test.cc

@@ -7,6 +7,7 @@
 #include "rocksdb/cloud/db_cloud.h"
 #include <algorithm>
 #include <chrono>
+#include <inttypes.h>
 #include "cloud/aws/aws_env.h"
 #include "cloud/aws/aws_file.h"
 #include "cloud/db_cloud_impl.h"
@@ -237,10 +238,10 @@ class CloudTest : public testing::Test {
       std::string lpath = dbname_ + "/" + path;
       ASSERT_OK(aenv_->GetBaseEnv()->GetFileSize(lpath, &localSize));
       ASSERT_TRUE(localSize == cloudSize);
-      Log(options_.info_log, "local file %s size %ld\n", lpath.c_str(), localSize);
-      Log(options_.info_log, "cloud file %s size %ld\n", cpath.c_str(), cloudSize);
-      printf("local file %s size %ld\n", lpath.c_str(), localSize);
-      printf("cloud file %s size %ld\n", cpath.c_str(), cloudSize);
+      Log(options_.info_log, "local file %s size %" PRIu64 "\n", lpath.c_str(), localSize);
+      Log(options_.info_log, "cloud file %s size %" PRIu64 "\n", cpath.c_str(), cloudSize);
+      printf("local file %s size %" PRIu64 "\n", lpath.c_str(), localSize);
+      printf("cloud file %s size %" PRIu64 "\n", cpath.c_str(), cloudSize);
     }
   }