github/azure-sdk-for-cpp
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fixed a bug where GetBlockList throws exception if the blob is not committed (#2664)

Browse Source 
* Fix a bug where GetBlockList threw exception if the blob is not committed.

* CL

* f
This commit is contained in:
JinmingHu 2021-07-27 14:12:43 +08:00 committed by GitHub
parent 0d4f138cb3
commit 2f9ab65526
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 43 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sdk/storage/azure-storage-blobs/CHANGELOG.md
View File

@ -18,6 +18,7 @@
- Fixed a bug where lease ID didn't work for `BlobContainerClient::GetAccessPolicy()`.
- Fixed a bug where sequence number access conditions didn't work for page blob operations.
- Fixed a bug where `BlobItemDetails::EncryptionKeySha256` was always null because it wasn't correctly parsed from xml.
- Fixed a bug where `BlockBlobClient::GetBlockList` threw exception if the blob is not committed.
### Other Changes

28
sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/protocol/blob_rest_client.hpp
View File

@ -1885,17 +1885,18 @@ namespace Azure { namespace Storage { namespace Blobs {
struct GetBlockListResult final
{
/**
* The ETag contains a value that you can use to perform operations conditionally.
* The ETag contains a value that you can use to perform operations conditionally. Empty if
* the blob is not never committed.
*/
Azure::ETag ETag;
/**
* The date and time the container was last modified. Any operation that modifies the blob,
* including an update of the metadata or properties, changes the last-modified time of the
* blob.
* blob. Invalid if the blob is never committed.
*/
Azure::DateTime LastModified;
/**
* Size of the blob.
* Size of the blob. Invalid if the blob is never committed.
*/
int64_t BlobSize = 0;
/**
@ -9403,10 +9404,23 @@ namespace Azure { namespace Storage { namespace Blobs {
reinterpret_cast<const char*>(httpResponseBody.data()), httpResponseBody.size());
response = GetBlockListResultFromXml(reader);
}
response.ETag = Azure::ETag(httpResponse.GetHeaders().at("etag"));
response.LastModified = Azure::DateTime::Parse(
httpResponse.GetHeaders().at("last-modified"), Azure::DateTime::DateFormat::Rfc1123);
response.BlobSize = std::stoll(httpResponse.GetHeaders().at("x-ms-blob-content-length"));
auto etag__iterator = httpResponse.GetHeaders().find("etag");
if (etag__iterator != httpResponse.GetHeaders().end())
{
response.ETag = Azure::ETag(httpResponse.GetHeaders().at("etag"));
}
auto last_modified__iterator = httpResponse.GetHeaders().find("last-modified");
if (last_modified__iterator != httpResponse.GetHeaders().end())
{
response.LastModified = Azure::DateTime::Parse(
last_modified__iterator->second, Azure::DateTime::DateFormat::Rfc1123);
}
auto x_ms_blob_content_length__iterator
= httpResponse.GetHeaders().find("x-ms-blob-content-length");
if (x_ms_blob_content_length__iterator != httpResponse.GetHeaders().end())
{
response.BlobSize = std::stoll(x_ms_blob_content_length__iterator->second);
}
return Azure::Response<GetBlockListResult>(std::move(response), std::move(pHttpResponse));
}

21
sdk/storage/azure-storage-blobs/test/ut/block_blob_client_test.cpp
View File

@ -1149,4 +1149,25 @@ namespace Azure { namespace Storage { namespace Test {
EXPECT_NO_THROW(blobClient.SetAccessTier(Blobs::Models::AccessTier::Cool, options));
}
TEST_F(BlockBlobClientTest, UncommittedBlob)
{
const std::string blobName = RandomString();
auto blobClient = m_blobContainerClient->GetBlockBlobClient(blobName);
std::vector<uint8_t> buffer(100);
Azure::Core::IO::MemoryBodyStream stream(buffer.data(), buffer.size());
blobClient.StageBlock("YWJjZA==", stream);
Blobs::GetBlockListOptions getBlockListOptions;
getBlockListOptions.ListType = Blobs::Models::BlockListType::All;
auto res = blobClient.GetBlockList(getBlockListOptions).Value;
EXPECT_FALSE(res.ETag.HasValue());
EXPECT_EQ(res.BlobSize, 0);
EXPECT_TRUE(res.CommittedBlocks.empty());
EXPECT_FALSE(res.UncommittedBlocks.empty());
auto blobItem = GetBlobItem(blobName, Blobs::Models::ListBlobsIncludeFlags::UncomittedBlobs);
EXPECT_EQ(blobItem.BlobSize, 0);
}
}}} // namespace Azure::Storage::Test