Merge pull request facebook#4 from pikiwidb/feature/support_delete_cloud_file

cloud_file_system_impl support delete cloudobject immediately

Author: baixin01

cloud/aws/aws_s3.cc

@@ -819,7 +819,7 @@ IOStatus S3StorageProvider::CopyCloudObject(
   Aws::String src_object = ToAwsString(object_path_src);
   Aws::String dest_object = ToAwsString(object_path_dest);
 
-  Aws::String src_url = src_bucket + src_object;
+  Aws::String src_url = src_bucket + "/" + src_object;
 
   // create copy request
   Aws::S3::Model::CopyObjectRequest request;

cloud/cloud_file_system_impl.cc

@@ -832,7 +832,7 @@ IOStatus CloudFileSystemImpl::DeleteCloudFileFromDest(
           return;
         }
         //TODO(wangshaoyi): temporary debug log
-        Log(InfoLogLevel::INFO_LEVEL, info_log, "[%s] DeleteCloudFileFromDest, is_master: %d",
+        Log(InfoLogLevel::INFO_LEVEL, info_log, "DeleteCloudFileFromDest, is_master: %d",
             is_master);
         if (!is_master) {
           return;
@@ -2290,6 +2290,14 @@ IOStatus CloudFileSystemImpl::DeleteDbid(const std::string& bucket,
   return st;
 }
 
+IOStatus CloudFileSystemImpl::DeleteCloudObject(const std::string& bucket,
+                                                const std::string& objectpath) {
+  Log(InfoLogLevel::INFO_LEVEL, info_log_, "[%s] deletecloudobject, bucket: %s, objectpath: %s",
+      Name(), bucket.c_str(), objectpath.c_str());
+  auto st = GetStorageProvider()->DeleteCloudObject(bucket, objectpath);
+  return st;
+}
+
 IOStatus CloudFileSystemImpl::LockFile(const std::string& /*fname*/,
                                        const IOOptions& /*opts*/,
                                        FileLock** lock,

cloud/cloud_file_system_impl.h

@@ -135,6 +135,9 @@ class CloudFileSystemImpl : public CloudFileSystem {
   IOStatus DeleteDbid(const std::string& bucket,
                       const std::string& dbid) override;
 
+  virtual IOStatus DeleteCloudObject(const std::string& bucket,
+                                     const std::string& objectpath) override;
+
   IOStatus SanitizeDirectory(const DBOptions& options,
                              const std::string& clone_name, bool read_only);
   IOStatus LoadCloudManifest(const std::string& local_dbname, bool read_only);

include/rocksdb/cloud/cloud_file_system.h

@@ -575,6 +575,9 @@ class CloudFileSystem : public FileSystem {
   virtual IOStatus DeleteDbid(const std::string& bucket_prefix,
                               const std::string& dbid) = 0;
 
+  virtual IOStatus DeleteCloudObject(const std::string& bucket,
+                                     const std::string& objectpath) = 0;
+
   Logger* GetLogger() const { return info_log_.get(); }
   const std::shared_ptr<CloudStorageProvider>&  GetStorageProvider() const {
     return cloud_fs_options.storage_provider;