Skip to content

"rsync for cloud storage" - Google Drive, S3, Dropbox, Backblaze B2, One Drive, Swift, Hubic, Wasabi, Google Cloud Storage, Azure Blob, Azure Files, Yandex Files

oracleobjectstorage: add server-side object moves

tomaszni886bd96d0adb
diff --git a/backend/oracleobjectstorage/command.go b/backend/oracleobjectstorage/command.go
index d6553bf88..56387905a 100644
--- a/backend/oracleobjectstorage/command.go
+++ b/backend/oracleobjectstorage/command.go
@@ -11,7 +11,6 @@ import (
"sync"
"time"
- "github.com/oracle/oci-go-sdk/v65/common"
"github.com/oracle/oci-go-sdk/v65/objectstorage"
"github.com/rclone/rclone/fs"
"github.com/rclone/rclone/fs/operations"
@@ -197,22 +196,7 @@ func (f *Fs) rename(ctx context.Context, remote, newName string) (any, error) {
}
return nil, fs.ErrorNotAFile
}
- details := objectstorage.RenameObjectDetails{
- SourceName: new(objectPath),
- NewName: new(newName),
- }
- request := objectstorage.RenameObjectRequest{
- NamespaceName: new(f.opt.Namespace),
- BucketName: new(bucketName),
- RenameObjectDetails: details,
- OpcClientRequestId: nil,
- RequestMetadata: common.RequestMetadata{},
- }
- var response objectstorage.RenameObjectResponse
- err = f.pacer.Call(func() (bool, error) {
- response, err = f.srv.RenameObject(ctx, request)
- return shouldRetry(ctx, response.HTTPResponse(), err)
- })
+ err = f.renameObject(ctx, bucketName, objectPath, newName)
if err != nil {
return nil, err
}
diff --git a/backend/oracleobjectstorage/copy.go b/backend/oracleobjectstorage/copy.go
index 915f8514d..d1a6d0837 100644
--- a/backend/oracleobjectstorage/copy.go
+++ b/backend/oracleobjectstorage/copy.go
@@ -40,6 +40,55 @@ func (f *Fs) Copy(ctx context.Context, src fs.Object, remote string) (fs.Object,
return f.NewObject(ctx, remote)
}
+// ------------------------------------------------------------
+// Implement Mover is an optional interface for Fs
+//------------------------------------------------------------
+
+// Move src to this remote using server-side rename operations.
+//
+// This is stored with the remote path given.
+// It returns the destination Object and a possible error.
+// Will only be called if src.Fs().Name() == f.Name().
+// If it isn't possible then return fs.ErrorCantMove.
+func (f *Fs) Move(ctx context.Context, src fs.Object, remote string) (fs.Object, error) {
+ srcObj, ok := src.(*Object)
+ if !ok {
+ return nil, fs.ErrorCantMove
+ }
+ srcBucket, srcPath := srcObj.split()
+ dstBucket, dstPath := f.split(remote)
+ if srcBucket != dstBucket {
+ return nil, fs.ErrorCantMove
+ }
+ err := f.renameObject(ctx, srcBucket, srcPath, dstPath)
+ if err != nil {
+ return nil, err
+ }
+ return f.NewObject(ctx, remote)
+}
+
+// renameObject renames sourceName to newName in bucketName.
+func (f *Fs) renameObject(ctx context.Context, bucketName, sourceName, newName string) error {
+ req := objectstorage.RenameObjectRequest{
+ NamespaceName: new(f.opt.Namespace),
+ BucketName: new(bucketName),
+ RenameObjectDetails: objectstorage.RenameObjectDetails{
+ SourceName: new(sourceName),
+ NewName: new(newName),
+ },
+ }
+ var resp objectstorage.RenameObjectResponse
+ err := f.pacer.Call(func() (bool, error) {
+ var err error
+ resp, err = f.srv.RenameObject(ctx, req)
+ return shouldRetry(ctx, resp.HTTPResponse(), err)
+ })
+ if err != nil {
+ return err
+ }
+ return nil
+}
+
// copy does a server-side copy from dstObj <- srcObj
//
// If newInfo is nil then the metadata will be copied otherwise it
diff --git a/backend/oracleobjectstorage/oracleobjectstorage.go b/backend/oracleobjectstorage/oracleobjectstorage.go
index 23f8de25b..305397b17 100644
--- a/backend/oracleobjectstorage/oracleobjectstorage.go
+++ b/backend/oracleobjectstorage/oracleobjectstorage.go
@@ -801,6 +801,7 @@ func (o *Object) Metadata(ctx context.Context) (metadata fs.Metadata, err error)
var (
_ fs.Fs = &Fs{}
_ fs.Copier = &Fs{}
+ _ fs.Mover = &Fs{}
_ fs.PutStreamer = &Fs{}
_ fs.ListRer = &Fs{}
_ fs.ListPer = &Fs{}
diff --git a/docs/data/backends/oracleobjectstorage.yaml b/docs/data/backends/oracleobjectstorage.yaml
index f5027e765..b038bba18 100644
--- a/docs/data/backends/oracleobjectstorage.yaml
+++ b/docs/data/backends/oracleobjectstorage.yaml
@@ -20,6 +20,7 @@ features:
- GetTier
- ListP
- ListR
+- Move
- OpenChunkWriter
- PutStream
- ReadMetadata