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

Removed GetBlockListResult::ContentType, moved GetPageRangesResult to detail (#2234)

Browse Source
This commit is contained in:
JinmingHu 2021-05-08 11:16:30 +08:00 committed by GitHub
parent a103e51869
commit 2b169ca777
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 31 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,6 +7,8 @@
- Renamed `HasMorePages()` in paged response to `HasPage()`.
- Default chunk size for concurrent upload was changed to nullable.
- `BlobLeaseClient::Change()` updates internal lease id.
- Removed `ContentType` from `GetBlockListResult`.
- Moved `GetPageRangesResult` to detail namespace.
## 12.0.0-beta.10 (2021-04-16)

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

@ -1831,7 +1831,6 @@ namespace Azure { namespace Storage { namespace Blobs {
* blob.
*/
Azure::DateTime LastModified;
std::string ContentType;
/**
* Size of the blob.
*/
@ -1846,26 +1845,6 @@ namespace Azure { namespace Storage { namespace Blobs {
std::vector<BlobBlock> UncommittedBlocks;
}; // struct GetBlockListResult
struct GetPageRangesResult
{
/**
* The ETag contains a value that you can use to perform operations conditionally.
*/
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.
*/
Azure::DateTime LastModified;
/**
* Size of the blob.
*/
int64_t BlobSize = 0;
std::vector<Azure::Core::Http::HttpRange> PageRanges;
std::vector<Azure::Core::Http::HttpRange> ClearRanges;
}; // struct GetPageRangesResult
enum class ListBlobContainersIncludeFlags
{
/**
@ -2515,6 +2494,28 @@ namespace Azure { namespace Storage { namespace Blobs {
}; // struct GetBlobTagsResult
} // namespace _detail
namespace _detail {
struct GetPageRangesResult
{
/**
* The ETag contains a value that you can use to perform operations conditionally.
*/
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.
*/
Azure::DateTime LastModified;
/**
* Size of the blob.
*/
int64_t BlobSize = 0;
std::vector<Azure::Core::Http::HttpRange> PageRanges;
std::vector<Azure::Core::Http::HttpRange> ClearRanges;
}; // struct GetPageRangesResult
} // namespace _detail
namespace _detail {
struct ListBlobContainersResult
{
@ -8965,7 +8966,6 @@ namespace Azure { namespace Storage { namespace Blobs {
response.ETag = Azure::ETag(httpResponse.GetHeaders().at("etag"));
response.LastModified = Azure::DateTime::Parse(
httpResponse.GetHeaders().at("last-modified"), Azure::DateTime::DateFormat::Rfc1123);
response.ContentType = httpResponse.GetHeaders().at("content-type");
response.BlobSize = std::stoll(httpResponse.GetHeaders().at("x-ms-blob-content-length"));
return Azure::Response<GetBlockListResult>(std::move(response), std::move(pHttpResponse));
}
@ -9917,7 +9917,7 @@ namespace Azure { namespace Storage { namespace Blobs {
Azure::Nullable<std::string> IfTags;
}; // struct GetPageBlobPageRangesOptions
static Azure::Response<GetPageRangesResult> GetPageRanges(
static Azure::Response<Models::_detail::GetPageRangesResult> GetPageRanges(
Azure::Core::Http::_internal::HttpPipeline& pipeline,
const Azure::Core::Url& url,
const GetPageBlobPageRangesOptions& options,
@ -9982,7 +9982,7 @@ namespace Azure { namespace Storage { namespace Blobs {
}
auto pHttpResponse = pipeline.Send(request, context);
Azure::Core::Http::RawResponse& httpResponse = *pHttpResponse;
GetPageRangesResult response;
Models::_detail::GetPageRangesResult response;
auto http_status_code
= static_cast<std::underlying_type<Azure::Core::Http::HttpStatusCode>::type>(
httpResponse.GetStatusCode());
@ -9994,13 +9994,13 @@ namespace Azure { namespace Storage { namespace Blobs {
const auto& httpResponseBody = httpResponse.GetBody();
_internal::XmlReader reader(
reinterpret_cast<const char*>(httpResponseBody.data()), httpResponseBody.size());
response = GetPageRangesResultFromXml(reader);
response = GetPageRangesResultInternalFromXml(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"));
return Azure::Response<GetPageRangesResult>(
return Azure::Response<Models::_detail::GetPageRangesResult>(
std::move(response), std::move(pHttpResponse));
}
@ -10082,9 +10082,10 @@ namespace Azure { namespace Storage { namespace Blobs {
}
private:
static GetPageRangesResult GetPageRangesResultFromXml(_internal::XmlReader& reader)
static Models::_detail::GetPageRangesResult GetPageRangesResultInternalFromXml(
_internal::XmlReader& reader)
{
GetPageRangesResult ret;
Models::_detail::GetPageRangesResult ret;
enum class XmlTagName
{
k_PageList,