[Storage] [BUG] Fixed ContentRange is null in BlobDownloadDetails when calling DownloadStreamingAsync with HttpRange "0-" (Azure#48272)

* Initial commit

* initial commit

* initial commit

* Exported Api

* changed _isRangeSet to internal

* undo export api

* fixed SetupDownload

* re-recorded old tests

* re-record pt2

* re-recorded pt 3

* re-record pt4

* typo

Author: nickliu-msft

sdk/storage/Azure.Storage.Blobs/CHANGELOG.md

@@ -7,6 +7,7 @@
 ### Breaking Changes
 
 ### Bugs Fixed
+- Fixed ContentRange is null in BlobDownloadDetails when calling DownloadStreamingAsync with HttpRange "0-" #47882
 
 ### Other Changes
 

sdk/storage/Azure.Storage.Blobs/assets.json

@@ -2,5 +2,5 @@
   "AssetsRepo": "Azure/azure-sdk-assets",
   "AssetsRepoPrefixPath": "net",
   "TagPrefix": "net/storage/Azure.Storage.Blobs",
-  "Tag": "net/storage/Azure.Storage.Blobs_f174db6035"
+  "Tag": "net/storage/Azure.Storage.Blobs_11b2adbc87"
 }

sdk/storage/Azure.Storage.Blobs/src/BlobBaseClient.cs

@@ -1007,6 +1007,7 @@ private async Task<Response<BlobDownloadInfo>> DownloadInternal(
         {
             Response<BlobDownloadStreamingResult> response = await DownloadStreamingDirect(
                 range,
+                range != default,
                 conditions,
                 rangeGetContentHash.ToValidationOptions(),
                 progressHandler: default,
@@ -1240,6 +1241,7 @@ public virtual Response<BlobDownloadStreamingResult> DownloadStreaming(
         {
             return DownloadStreamingDirect(
                 range,
+                true,
                 conditions,
                 rangeGetContentHash.ToValidationOptions(),
                 progressHandler,
@@ -1316,6 +1318,7 @@ public virtual async Task<Response<BlobDownloadStreamingResult>> DownloadStreami
         {
             return await DownloadStreamingDirect(
                 range,
+                true,
                 conditions,
                 rangeGetContentHash.ToValidationOptions(),
                 progressHandler,
@@ -1369,6 +1372,7 @@ public virtual Response<BlobDownloadStreamingResult> DownloadStreaming(
         {
             return DownloadStreamingDirect(
                 options?.Range ?? default,
+                options?._isRangeSet ?? false,
                 options?.Conditions,
                 options?.TransferValidation,
                 options?.ProgressHandler,
@@ -1416,6 +1420,7 @@ public virtual async Task<Response<BlobDownloadStreamingResult>> DownloadStreami
         {
             return await DownloadStreamingDirect(
                 options?.Range ?? default,
+                options?._isRangeSet ?? false,
                 options?.Conditions,
                 options?.TransferValidation,
                 options?.ProgressHandler,
@@ -1430,6 +1435,7 @@ public virtual async Task<Response<BlobDownloadStreamingResult>> DownloadStreami
         /// Implementation for public DownloadStreaming/DownloadContent methods to call into.
         /// </summary>
         /// <param name="range"></param>
+        /// <param name="isRangeSet"></param>
         /// <param name="conditions"></param>
         /// <param name="transferValidationOverride"></param>
         /// <param name="progressHandler"></param>
@@ -1439,6 +1445,7 @@ public virtual async Task<Response<BlobDownloadStreamingResult>> DownloadStreami
         /// <returns></returns>
         private async ValueTask<Response<BlobDownloadStreamingResult>> DownloadStreamingDirect(
             HttpRange range,
+            bool isRangeSet,
             BlobRequestConditions conditions,
             DownloadTransferValidationOptions transferValidationOverride,
             IProgress<long> progressHandler,
@@ -1455,7 +1462,7 @@ private async ValueTask<Response<BlobDownloadStreamingResult>> DownloadStreaming
                 }
             }
 
-            var response = await DownloadStreamingInternal(range, conditions, transferValidationOverride, progressHandler, operationName, async, cancellationToken).ConfigureAwait(false);
+            var response = await DownloadStreamingInternal(range, isRangeSet, conditions, transferValidationOverride, progressHandler, operationName, async, cancellationToken).ConfigureAwait(false);
 
             // if using clientside encryption, wrap the auto-retry stream in a decryptor
             // we already return a nonseekable stream; returning a crypto stream is fine
@@ -1481,6 +1488,9 @@ private async ValueTask<Response<BlobDownloadStreamingResult>> DownloadStreaming
         /// <param name="range">
         /// Optionally specified range.
         /// </param>
+        /// <param name="isRangeSet">
+        /// If range has been set
+        /// </param>
         /// <param name="conditions">
         /// Access conditions.
         /// </param>
@@ -1502,6 +1512,7 @@ private async ValueTask<Response<BlobDownloadStreamingResult>> DownloadStreaming
         /// <returns></returns>
         internal virtual async ValueTask<Response<BlobDownloadStreamingResult>> DownloadStreamingInternal(
             HttpRange range,
+            bool isRangeSet,
             BlobRequestConditions conditions,
             DownloadTransferValidationOptions transferValidationOverride,
             IProgress<long> progressHandler,
@@ -1529,6 +1540,7 @@ internal virtual async ValueTask<Response<BlobDownloadStreamingResult>> Download
                     // Start downloading the blob
                     Response<BlobDownloadStreamingResult> response = await StartDownloadAsync(
                         range,
+                        isRangeSet,
                         conditions,
                         validationOptions,
                         async: async,
@@ -1552,6 +1564,7 @@ internal virtual async ValueTask<Response<BlobDownloadStreamingResult>> Download
                         startOffset =>
                             StartDownloadAsync(
                                     range,
+                                    isRangeSet,
                                     conditionsWithEtag,
                                     validationOptions,
                                     startOffset,
@@ -1562,6 +1575,7 @@ internal virtual async ValueTask<Response<BlobDownloadStreamingResult>> Download
                         async startOffset =>
                             (await StartDownloadAsync(
                                 range,
+                                isRangeSet,
                                 conditionsWithEtag,
                                 validationOptions,
                                 startOffset,
@@ -1629,6 +1643,9 @@ await ContentHasher.AssertResponseHashMatchInternal(
         /// If provided, only download the bytes of the blob in the specified
         /// range.  If not provided, download the entire blob.
         /// </param>
+        /// <param name="isRangeSet">
+        /// Whether range has been set.
+        /// </param>
         /// <param name="conditions">
         /// Optional <see cref="BlobRequestConditions"/> to add conditions on
         /// downloading this blob.
@@ -1659,14 +1676,15 @@ await ContentHasher.AssertResponseHashMatchInternal(
         /// </remarks>
         private async ValueTask<Response<BlobDownloadStreamingResult>> StartDownloadAsync(
             HttpRange range,
+            bool isRangeSet,
             BlobRequestConditions conditions,
             DownloadTransferValidationOptions validationOptions,
             long startOffset = 0,
             bool async = true,
             CancellationToken cancellationToken = default)
         {
             HttpRange? pageRange = null;
-            if (range != default(HttpRange)) // we want to check between non-nullable ranges
+            if (isRangeSet) // we want to check if the range has been manually set
             {
                 pageRange = new HttpRange(
                     range.Offset + startOffset,
@@ -1943,6 +1961,7 @@ public virtual Response<BlobDownloadResult> DownloadContent(
                 conditions,
                 progressHandler: default,
                 range: default,
+                isRangeSet: false,
                 transferValidationOverride: default,
                 false, // async
                 cancellationToken)
@@ -1999,6 +2018,7 @@ await DownloadContentInternal(
                 conditions,
                 progressHandler: default,
                 range: default,
+                isRangeSet: false,
                 transferValidationOverride: default,
                 true, // async
                 cancellationToken)
@@ -2064,6 +2084,7 @@ public virtual Response<BlobDownloadResult> DownloadContent(
                 conditions,
                 progressHandler,
                 range,
+                true,
                 transferValidationOverride: default,
                 false, // async
                 cancellationToken)
@@ -2129,6 +2150,7 @@ await DownloadContentInternal(
                 conditions,
                 progressHandler,
                 range,
+                true,
                 transferValidationOverride: default,
                 true, // async
                 cancellationToken)
@@ -2181,6 +2203,7 @@ public virtual Response<BlobDownloadResult> DownloadContent(
                 options?.Conditions,
                 options?.ProgressHandler,
                 options?.Range ?? default,
+                options?._isRangeSet ?? false,
                 options?.TransferValidation,
                 async: false,
                 cancellationToken).EnsureCompleted();
@@ -2232,6 +2255,7 @@ await DownloadContentInternal(
                 options?.Conditions,
                 options?.ProgressHandler,
                 options?.Range ?? default,
+                options?._isRangeSet ?? false,
                 options?.TransferValidation,
                 async: true,
                 cancellationToken).ConfigureAwait(false);
@@ -2240,12 +2264,14 @@ private async Task<Response<BlobDownloadResult>> DownloadContentInternal(
             BlobRequestConditions conditions,
             IProgress<long> progressHandler,
             HttpRange range,
+            bool isRangeSet,
             DownloadTransferValidationOptions transferValidationOverride,
             bool async,
             CancellationToken cancellationToken)
         {
             Response<BlobDownloadStreamingResult> response = await DownloadStreamingDirect(
                 range,
+                isRangeSet,
                 conditions,
                 transferValidationOverride: transferValidationOverride,
                 progressHandler,
@@ -3186,6 +3212,7 @@ internal async Task<Stream> OpenReadInternal(
                             }
                             Response<BlobDownloadStreamingResult> response = await DownloadStreamingInternal(
                                 range,
+                                true,
                                 readConditions,
                                 transferValidationOverride: downloadValidationOptions,
                                 progressHandler: default,

sdk/storage/Azure.Storage.Blobs/src/Models/BlobDownloadOptions.cs

@@ -11,11 +11,22 @@ namespace Azure.Storage.Blobs.Models
     /// </summary>
     public class BlobDownloadOptions
     {
+        private HttpRange _range;
+        internal bool _isRangeSet;
+
         /// <summary>
         /// If provided, only download the bytes of the blob in the specified
         /// range.  If not provided, download the entire blob.
         /// </summary>
-        public HttpRange Range { get; set; }
+        public HttpRange Range
+        {
+            get => _range;
+            set
+            {
+                _range = value;
+                _isRangeSet = true;
+            }
+        }
 
         /// <summary>
         /// Optional <see cref="BlobRequestConditions"/> to add conditions on

sdk/storage/Azure.Storage.Blobs/src/PartitionedDownloader.cs

@@ -161,6 +161,7 @@ public async Task<Response> DownloadToInternal(
                 {
                     initialResponse = await _client.DownloadStreamingInternal(
                         initialRange,
+                        true,
                         conditions,
                         ValidationOptions,
                         _progress,
@@ -172,6 +173,7 @@ public async Task<Response> DownloadToInternal(
                 {
                     initialResponse = await _client.DownloadStreamingInternal(
                         range: default,
+                        false,
                         conditions,
                         ValidationOptions,
                         _progress,
@@ -230,8 +232,8 @@ await HandleOneShotDownload(initialResponse, destination, async, cancellationTok
                 BlobRequestConditions conditionsWithEtag = conditions?.WithIfMatch(etag) ?? new BlobRequestConditions { IfMatch = etag };
 
 #pragma warning disable AZC0110 // DO NOT use await keyword in possibly synchronous scope.
-                                // Rule checker cannot understand this section, but this
-                                // massively reduces code duplication.
+                // Rule checker cannot understand this section, but this
+                // massively reduces code duplication.
                 int effectiveWorkerCount = async ? _maxWorkerCount : 1;
                 if (effectiveWorkerCount > 1)
                 {
@@ -260,6 +262,7 @@ await HandleOneShotDownload(initialResponse, destination, async, cancellationTok
                     ValueTask<Response<BlobDownloadStreamingResult>> responseValueTask = _client
                         .DownloadStreamingInternal(
                             httpRange,
+                            true,
                             conditionsWithEtag,
                             ValidationOptions,
                             _progress,
@@ -338,13 +341,13 @@ await CopyToInternal(
                             async,
                             cancellationToken)
                             .ConfigureAwait(false);
-                            if (UseMasterCrc)
-                            {
-                                StorageCrc64Composer.Compose(
-                                    (composedCrc.ToArray(), 0L),
-                                    (partitionChecksum.ToArray(), response.Value.Details.ContentLength)
-                                ).CopyTo(composedCrc);
-                            }
+                        if (UseMasterCrc)
+                        {
+                            StorageCrc64Composer.Compose(
+                                (composedCrc.ToArray(), 0L),
+                                (partitionChecksum.ToArray(), response.Value.Details.ContentLength)
+                            ).CopyTo(composedCrc);
+                        }
                     }
                 }
             }