You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by rc...@apache.org on 2020/07/28 03:20:41 UTC

[james-project] 13/25: JAMES-3318 Deduplication BlobStore::delete should be a noop operation

This is an automated email from the ASF dual-hosted git repository.

rcordier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git

commit f4ff55414bbcbf8878260d27848bd6440a6c521f
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Fri Jul 24 09:41:13 2020 +0700

    JAMES-3318 Deduplication BlobStore::delete should be a noop operation
    
    Later on we should implement reference tracking to be able to implement Garbage Collection.
---
 .../org/apache/james/blob/objectstorage/ObjectStorageBlobStore.java   | 4 +---
 .../james/server/blob/deduplication/DeDuplicationBlobStore.scala      | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/server/blob/blob-objectstorage/src/main/java/org/apache/james/blob/objectstorage/ObjectStorageBlobStore.java b/server/blob/blob-objectstorage/src/main/java/org/apache/james/blob/objectstorage/ObjectStorageBlobStore.java
index cd7c7b3..088405a 100644
--- a/server/blob/blob-objectstorage/src/main/java/org/apache/james/blob/objectstorage/ObjectStorageBlobStore.java
+++ b/server/blob/blob-objectstorage/src/main/java/org/apache/james/blob/objectstorage/ObjectStorageBlobStore.java
@@ -210,9 +210,7 @@ public class ObjectStorageBlobStore implements BlobStore {
 
     @Override
     public Mono<Void> delete(BucketName bucketName, BlobId blobId) {
-        ObjectStorageBucketName resolvedBucketName = bucketNameResolver.resolve(bucketName);
-        return Mono.<Void>fromRunnable(() -> blobStore.removeBlob(resolvedBucketName.asString(), blobId.asString()))
-            .subscribeOn(Schedulers.elastic());
+        return Mono.empty();
     }
 
     // Workaround while waiting for DumbBlobStore extraction
diff --git a/server/blob/blob-storage-strategy/src/main/scala/org/apache/james/server/blob/deduplication/DeDuplicationBlobStore.scala b/server/blob/blob-storage-strategy/src/main/scala/org/apache/james/server/blob/deduplication/DeDuplicationBlobStore.scala
index 5bd663f..c012e6e 100644
--- a/server/blob/blob-storage-strategy/src/main/scala/org/apache/james/server/blob/deduplication/DeDuplicationBlobStore.scala
+++ b/server/blob/blob-storage-strategy/src/main/scala/org/apache/james/server/blob/deduplication/DeDuplicationBlobStore.scala
@@ -95,6 +95,6 @@ class DeDuplicationBlobStore @Inject()(dumbBlobStore: DumbBlobStore,
     Preconditions.checkNotNull(bucketName)
     Preconditions.checkNotNull(blobId)
 
-    dumbBlobStore.delete(bucketName, blobId)
+    SMono.empty
   }
 }


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org