From 1e83814c802feae7f98e7135215568485a5a9701 Mon Sep 17 00:00:00 2001 From: Raghuvansh Raj Date: Wed, 7 Jun 2023 12:51:08 +0530 Subject: [PATCH] Removed areInputStreamsDecorated from RemoteTransferContainer Signed-off-by: Raghuvansh Raj --- .../transfer/RemoteTransferContainer.java | 8 ++------ .../RemoteTransferContainerTests.java | 20 +++++++------------ 2 files changed, 9 insertions(+), 19 deletions(-) diff --git a/server/src/main/java/org/opensearch/common/blobstore/transfer/RemoteTransferContainer.java b/server/src/main/java/org/opensearch/common/blobstore/transfer/RemoteTransferContainer.java index 821d028c8a4c3..11e820147cf0e 100644 --- a/server/src/main/java/org/opensearch/common/blobstore/transfer/RemoteTransferContainer.java +++ b/server/src/main/java/org/opensearch/common/blobstore/transfer/RemoteTransferContainer.java @@ -46,7 +46,6 @@ public class RemoteTransferContainer implements Closeable { private final long expectedChecksum; private final OffsetRangeInputStreamSupplier offsetRangeInputStreamSupplier; private final boolean isRemoteDataIntegritySupported; - private final boolean areInputStreamsDecorated; private static final Logger log = LogManager.getLogger(RemoteTransferContainer.class); @@ -61,7 +60,6 @@ public class RemoteTransferContainer implements Closeable { * @param offsetRangeInputStreamSupplier A supplier to create OffsetRangeInputStreams * @param expectedChecksum The expected checksum value for the file being uploaded. This checksum will be used for local or remote data integrity checks * @param isRemoteDataIntegritySupported A boolean to signify whether the remote repository supports server side data integrity verification - * @param areInputStreamsDecorated A boolean to signify whether the streams created via {@link OffsetRangeInputStreamSupplier#get} are decorated or not */ public RemoteTransferContainer( String fileName, @@ -71,8 +69,7 @@ public RemoteTransferContainer( WritePriority writePriority, OffsetRangeInputStreamSupplier offsetRangeInputStreamSupplier, long expectedChecksum, - boolean isRemoteDataIntegritySupported, - boolean areInputStreamsDecorated + boolean isRemoteDataIntegritySupported ) { this.fileName = fileName; this.remoteFileName = remoteFileName; @@ -82,7 +79,6 @@ public RemoteTransferContainer( this.offsetRangeInputStreamSupplier = offsetRangeInputStreamSupplier; this.expectedChecksum = expectedChecksum; this.isRemoteDataIntegritySupported = isRemoteDataIntegritySupported; - this.areInputStreamsDecorated = areInputStreamsDecorated; } /** @@ -173,7 +169,7 @@ private LocalStreamSupplier getMultipartStreamSupplier( } private boolean isRemoteDataIntegrityCheckPossible() { - return isRemoteDataIntegritySupported && !areInputStreamsDecorated; + return isRemoteDataIntegritySupported; } private void finalizeUpload(boolean uploadSuccessful) { diff --git a/server/src/test/java/org/opensearch/common/blobstore/transfer/RemoteTransferContainerTests.java b/server/src/test/java/org/opensearch/common/blobstore/transfer/RemoteTransferContainerTests.java index 5069a9dbd0e46..1ebec46042247 100644 --- a/server/src/test/java/org/opensearch/common/blobstore/transfer/RemoteTransferContainerTests.java +++ b/server/src/test/java/org/opensearch/common/blobstore/transfer/RemoteTransferContainerTests.java @@ -51,7 +51,6 @@ public OffsetRangeInputStream get(long size, long position) throws IOException { } }, 0, - false, false ) ) { @@ -74,7 +73,6 @@ public OffsetRangeInputStream get(long size, long position) throws IOException { } }, 0, - false, false ) ) { @@ -129,7 +127,6 @@ public OffsetRangeInputStream get(long size, long position) throws IOException { } }, 0, - false, false ) ) { @@ -139,13 +136,11 @@ public OffsetRangeInputStream get(long size, long position) throws IOException { } public void testTypeOfProvidedStreamsAllCases() throws IOException { - testTypeOfProvidedStreams(true, true); - testTypeOfProvidedStreams(true, false); - testTypeOfProvidedStreams(false, true); - testTypeOfProvidedStreams(false, false); + testTypeOfProvidedStreams(true); + testTypeOfProvidedStreams(false); } - private void testTypeOfProvidedStreams(boolean isRemoteDataIntegritySupported, boolean areInputStreamsDecorated) throws IOException { + private void testTypeOfProvidedStreams(boolean isRemoteDataIntegritySupported) throws IOException { try ( RemoteTransferContainer remoteTransferContainer = new RemoteTransferContainer( testFile.getFileName().toString(), @@ -160,13 +155,12 @@ public OffsetRangeInputStream get(long size, long position) throws IOException { } }, 0, - isRemoteDataIntegritySupported, - areInputStreamsDecorated + isRemoteDataIntegritySupported ) ) { StreamContext streamContext = remoteTransferContainer.supplyStreamContext(16); InputStreamContainer inputStreamContainer = streamContext.provideStream(0); - if (shouldOffsetInputStreamsBeChecked(isRemoteDataIntegritySupported, areInputStreamsDecorated)) { + if (shouldOffsetInputStreamsBeChecked(isRemoteDataIntegritySupported)) { assertTrue(inputStreamContainer.getInputStream() instanceof ResettableCheckedInputStream); } else { assertTrue(inputStreamContainer.getInputStream() instanceof OffsetRangeInputStream); @@ -175,7 +169,7 @@ public OffsetRangeInputStream get(long size, long position) throws IOException { } } - private boolean shouldOffsetInputStreamsBeChecked(boolean isRemoteDataIntegritySupported, boolean areInputStreamsDecorated) { - return !isRemoteDataIntegritySupported || areInputStreamsDecorated; + private boolean shouldOffsetInputStreamsBeChecked(boolean isRemoteDataIntegritySupported) { + return !isRemoteDataIntegritySupported; } }