This is an automated email from the ASF dual-hosted git repository.
tison pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/master by this push:
new 9449ae41c77 [improve][offload] Avoid implementation details leak on
getOffloadPolicies return value (#21336)
9449ae41c77 is described below
commit 9449ae41c77989f509d1b6dacfa2cc1b94d1cf15
Author: tison <[email protected]>
AuthorDate: Tue Oct 10 09:14:00 2023 +0800
[improve][offload] Avoid implementation details leak on getOffloadPolicies
return value (#21336)
Signed-off-by: tison <[email protected]>
---
.../src/main/java/org/apache/bookkeeper/mledger/LedgerOffloader.java | 4 ++--
.../java/org/apache/bookkeeper/mledger/impl/ManagedLedgerImpl.java | 3 +--
.../java/org/apache/bookkeeper/mledger/impl/NullLedgerOffloader.java | 4 ++--
.../offload/filesystem/impl/FileSystemManagedLedgerOffloader.java | 5 +++--
.../mledger/offload/jcloud/impl/BlobStoreManagedLedgerOffloader.java | 3 ++-
5 files changed, 10 insertions(+), 9 deletions(-)
diff --git
a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/LedgerOffloader.java
b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/LedgerOffloader.java
index b60ae41670d..868a8e42653 100644
---
a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/LedgerOffloader.java
+++
b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/LedgerOffloader.java
@@ -27,7 +27,7 @@ import org.apache.bookkeeper.client.api.ReadHandle;
import org.apache.bookkeeper.common.annotation.InterfaceAudience;
import org.apache.bookkeeper.common.annotation.InterfaceStability;
import org.apache.bookkeeper.mledger.proto.MLDataFormats;
-import org.apache.pulsar.common.policies.data.OffloadPoliciesImpl;
+import org.apache.pulsar.common.policies.data.OffloadPolicies;
/**
* Interface for offloading ledgers to long-term storage.
@@ -212,7 +212,7 @@ public interface LedgerOffloader {
*
* @return offload policies
*/
- OffloadPoliciesImpl getOffloadPolicies();
+ OffloadPolicies getOffloadPolicies();
/**
* Close the resources if necessary.
diff --git
a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerImpl.java
b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerImpl.java
index e011bf3e6d7..cc0020dcd9e 100644
---
a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerImpl.java
+++
b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerImpl.java
@@ -132,7 +132,6 @@ import
org.apache.pulsar.common.api.proto.CommandSubscribe.InitialPosition;
import org.apache.pulsar.common.policies.data.EnsemblePlacementPolicyConfig;
import org.apache.pulsar.common.policies.data.ManagedLedgerInternalStats;
import org.apache.pulsar.common.policies.data.OffloadPolicies;
-import org.apache.pulsar.common.policies.data.OffloadPoliciesImpl;
import org.apache.pulsar.common.policies.data.OffloadedReadPriority;
import org.apache.pulsar.common.policies.data.PersistentTopicInternalStats;
import org.apache.pulsar.common.protocol.Commands;
@@ -2482,7 +2481,7 @@ public class ManagedLedgerImpl implements ManagedLedger,
CreateCallback {
return;
}
- final OffloadPoliciesImpl policies =
config.getLedgerOffloader().getOffloadPolicies();
+ final OffloadPolicies policies =
config.getLedgerOffloader().getOffloadPolicies();
final long offloadThresholdInBytes =
Optional.ofNullable(policies.getManagedLedgerOffloadThresholdInBytes()).orElse(-1L);
final long offloadThresholdInSeconds =
diff --git
a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/NullLedgerOffloader.java
b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/NullLedgerOffloader.java
index 0e5e7cf4b5b..938ceb0c7df 100644
---
a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/NullLedgerOffloader.java
+++
b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/NullLedgerOffloader.java
@@ -23,7 +23,7 @@ import java.util.UUID;
import java.util.concurrent.CompletableFuture;
import org.apache.bookkeeper.client.api.ReadHandle;
import org.apache.bookkeeper.mledger.LedgerOffloader;
-import org.apache.pulsar.common.policies.data.OffloadPoliciesImpl;
+import org.apache.pulsar.common.policies.data.OffloadPolicies;
/**
* Null implementation that throws an error on any invokation.
@@ -62,7 +62,7 @@ public class NullLedgerOffloader implements LedgerOffloader {
}
@Override
- public OffloadPoliciesImpl getOffloadPolicies() {
+ public OffloadPolicies getOffloadPolicies() {
return null;
}
diff --git
a/tiered-storage/file-system/src/main/java/org/apache/bookkeeper/mledger/offload/filesystem/impl/FileSystemManagedLedgerOffloader.java
b/tiered-storage/file-system/src/main/java/org/apache/bookkeeper/mledger/offload/filesystem/impl/FileSystemManagedLedgerOffloader.java
index 25b63374946..67e5cfd3560 100644
---
a/tiered-storage/file-system/src/main/java/org/apache/bookkeeper/mledger/offload/filesystem/impl/FileSystemManagedLedgerOffloader.java
+++
b/tiered-storage/file-system/src/main/java/org/apache/bookkeeper/mledger/offload/filesystem/impl/FileSystemManagedLedgerOffloader.java
@@ -46,6 +46,7 @@ import org.apache.hadoop.io.IOUtils;
import org.apache.hadoop.io.LongWritable;
import org.apache.hadoop.io.MapFile;
import org.apache.pulsar.common.naming.TopicName;
+import org.apache.pulsar.common.policies.data.OffloadPolicies;
import org.apache.pulsar.common.policies.data.OffloadPoliciesImpl;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -64,7 +65,7 @@ public class FileSystemManagedLedgerOffloader implements
LedgerOffloader {
private OrderedScheduler scheduler;
private static final long ENTRIES_PER_READ = 100;
private OrderedScheduler assignmentScheduler;
- private OffloadPoliciesImpl offloadPolicies;
+ private OffloadPolicies offloadPolicies;
private final LedgerOffloaderStats offloaderStats;
public static boolean driverSupported(String driver) {
@@ -388,7 +389,7 @@ public class FileSystemManagedLedgerOffloader implements
LedgerOffloader {
}
@Override
- public OffloadPoliciesImpl getOffloadPolicies() {
+ public OffloadPolicies getOffloadPolicies() {
return offloadPolicies;
}
diff --git
a/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/BlobStoreManagedLedgerOffloader.java
b/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/BlobStoreManagedLedgerOffloader.java
index 03898b032b4..1b6062ffa03 100644
---
a/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/BlobStoreManagedLedgerOffloader.java
+++
b/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/BlobStoreManagedLedgerOffloader.java
@@ -64,6 +64,7 @@ import
org.apache.bookkeeper.mledger.offload.jcloud.provider.BlobStoreLocation;
import
org.apache.bookkeeper.mledger.offload.jcloud.provider.TieredStorageConfiguration;
import org.apache.bookkeeper.mledger.proto.MLDataFormats;
import org.apache.pulsar.common.naming.TopicName;
+import org.apache.pulsar.common.policies.data.OffloadPolicies;
import org.apache.pulsar.common.policies.data.OffloadPoliciesImpl;
import org.jclouds.blobstore.BlobStore;
import org.jclouds.blobstore.domain.Blob;
@@ -650,7 +651,7 @@ public class BlobStoreManagedLedgerOffloader implements
LedgerOffloader {
}
@Override
- public OffloadPoliciesImpl getOffloadPolicies() {
+ public OffloadPolicies getOffloadPolicies() {
Properties properties = new Properties();
properties.putAll(config.getConfigProperties());
return OffloadPoliciesImpl.create(properties);
