Read all bytes from input stream

Signed-off-by: Sooraj Sinha <[email protected]>
opensearch-project · Jun 8, 2024 · 41c57a3 · 41c57a3
1 parent 0cfe278
commit 41c57a3
Showing 1 changed file with 3 additions and 15 deletions.
diff --git a/server/src/main/java/org/opensearch/index/translog/transfer/BlobStoreTransferService.java b/server/src/main/java/org/opensearch/index/translog/transfer/BlobStoreTransferService.java
@@ -11,10 +11,7 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.message.ParameterizedMessage;
-import org.apache.lucene.store.ByteBuffersDataInput;
-import org.apache.lucene.store.ByteBuffersIndexInput;
 import org.apache.lucene.store.IndexInput;
-import org.apache.lucene.util.BytesRef;
 import org.opensearch.action.ActionRunnable;
 import org.opensearch.common.annotation.ExperimentalApi;
 import org.opensearch.common.blobstore.AsyncMultiStreamBlobContainer;
@@ -27,10 +24,8 @@
 import org.opensearch.common.blobstore.transfer.RemoteTransferContainer;
 import org.opensearch.common.blobstore.transfer.stream.OffsetRangeFileInputStream;
 import org.opensearch.common.blobstore.transfer.stream.OffsetRangeIndexInputStream;
-import org.opensearch.common.io.Streams;
 import org.opensearch.common.lucene.store.ByteArrayIndexInput;
 import org.opensearch.core.action.ActionListener;
-import org.opensearch.core.common.bytes.BytesReference;
 import org.opensearch.index.store.exception.ChecksumCombinationException;
 import org.opensearch.index.translog.ChannelFactory;
 import org.opensearch.index.translog.transfer.FileSnapshot.TransferFileSnapshot;
@@ -41,7 +36,6 @@
 import java.io.InputStream;
 import java.nio.channels.FileChannel;
 import java.nio.file.StandardOpenOption;
-import java.util.Arrays;
 import java.util.Base64;
 import java.util.HashMap;
 import java.util.List;
@@ -135,14 +129,8 @@ public void uploadBlob(
             return;
         }
         final String resourceDescription = "BlobStoreTransferService.uploadBlob(blob=\"" + fileName + "\")";
-        try (
-            IndexInput input = inputStream.available() > 0
-                ? new ByteBuffersIndexInput(
-                    new ByteBuffersDataInput(Arrays.asList(BytesReference.toByteBuffers(Streams.readFully(inputStream)))),
-                    resourceDescription
-                )
-                : new ByteArrayIndexInput(resourceDescription, BytesRef.EMPTY_BYTES)
-        ) {
+        byte[] bytes = inputStream.readAllBytes();
+        try (IndexInput input = new ByteArrayIndexInput(resourceDescription, bytes)) {
             long expectedChecksum;
             try {
                 expectedChecksum = checksumOfChecksum(input.clone(), 8);
@@ -158,7 +146,7 @@ public void uploadBlob(
             uploadBlobAsyncInternal(
                 fileName,
                 fileName,
-                inputStream.available(),
+                bytes.length,
                 blobPath,
                 writePriority,
                 (size, position) -> new OffsetRangeIndexInputStream(input, size, position),