Merge branch 'apache:trunk' into OAK-12097

Author: antonhosgood

oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/AzureSegmentArchiveWriter.java

@@ -34,6 +34,7 @@
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.IOException;
+import java.util.Arrays;
 import java.util.concurrent.TimeUnit;
 
 import static org.apache.jackrabbit.oak.segment.azure.AzureUtilities.readBufferFully;
@@ -82,8 +83,9 @@ protected void doWriteArchiveEntry(RemoteSegmentArchiveEntry indexEntry, byte[]
             // Upload the binary data and set its metadata using a single HTTP call,
             // overwriting an existing blob if necessary. Wrapping the byte array in a
             // ByteArrayInputStream avoids creating a copy of the data range.
-            BinaryData binaryData = BinaryData.fromStream(new ByteArrayInputStream(data, offset, size), (long) size);
-            BlockBlobSimpleUploadOptions options = new BlockBlobSimpleUploadOptions(binaryData)
+            // Note: OAK-12094 fixes an interesting regression in heap usage, which
+            // should be read for context when making changes in the lines below.
+            BlockBlobSimpleUploadOptions options = new BlockBlobSimpleUploadOptions(new ByteArrayInputStream(data, offset, size), size)
                     .setMetadata(AzureBlobMetadata.toSegmentMetadata(indexEntry));
             blob.uploadWithResponse(options, null, Context.NONE);
         } catch (BlobStorageException e) {