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

Changed ContentRange from std::string to Azure::Core::Http::Range. (#1415)

Browse Source 
* Changed ContentRange from std::string to Azure::Core::Http::Range.

* Resolved further comments.

* Resolved test issues
This commit is contained in:
Kan Tang 2021-01-21 21:37:03 -08:00 committed by GitHub
parent d5a53423bd
commit a0a3c6d5c5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 94 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sdk/storage/azure-storage-files-datalake/CHANGELOG.md
View File

@ -5,6 +5,7 @@
### New Features
- Added `Owner`, `Permissions`, and `Group` to `GetDataLakePathAccessControlResult`.
- `ReadDataLakeFileResult` now has a new field `FileSize`.
- Added support for `GetAccessPolicy` and `SetAccessPolicy` in `DataLakeFileSystemClient`.
### Breaking Changes
@ -12,6 +13,9 @@
- Removed `GetDfsUri` in all clients since they are currently implementation details.
- Removed `Data` suffix for `FlushData` and `AppendData` and modified all related structs to align the change.
- `DataLakePathClient` can no longer set permissions with `SetAccessControl`, instead, a new API `SetPermissions` is created for such functionality. Renamed the original API to `SetAccessControlList` to be more precise.
- `ContentRange` in `ReadDataLakeFileResult` is now `Azure::Core::Http::Range`.
- Removed `ContentRange` in `PathGetPropertiesResult`.
- Renamed `ContentLength` in `GetDataLakePathPropertiesResult` and `CreateDataLakePathResult` to `FileSize` to be more accurate.
- Renamed `GetUri` to `GetUrl`.
## 12.0.0-beta.6 (2020-01-14)

7
sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_responses.hpp
View File

@ -110,7 +110,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { nam
std::string ETag;
Core::DateTime LastModified;
Core::DateTime CreatedOn;
int64_t ContentLength;
int64_t FileSize;
Storage::Metadata Metadata;
Azure::Core::Nullable<std::string> LeaseDuration;
Azure::Core::Nullable<LeaseStateType> LeaseState;
@ -156,7 +156,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { nam
bool Created = true;
std::string ETag;
Core::DateTime LastModified;
Azure::Core::Nullable<int64_t> ContentLength;
Azure::Core::Nullable<int64_t> FileSize;
};
using SetDataLakePathAccessControlListResult = PathSetAccessControlResult;
@ -173,7 +173,8 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { nam
{
std::unique_ptr<Azure::Core::Http::BodyStream> Body;
PathHttpHeaders HttpHeaders;
Azure::Core::Nullable<std::string> ContentRange;
int64_t FileSize = int64_t();
Azure::Core::Http::Range ContentRange;
Azure::Core::Nullable<Storage::ContentHash> TransactionalContentHash;
std::string ETag;
Core::DateTime LastModified;

14
sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/protocol/datalake_rest_client.hpp
View File

@ -92,7 +92,6 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
constexpr static const char* HeaderXMsLeaseBreakPeriod = "x-ms-lease-break-period";
constexpr static const char* HeaderLeaseTime = "x-ms-lease-time";
constexpr static const char* HeaderAcceptRanges = "accept-ranges";
constexpr static const char* HeaderContentRange = "content-range";
constexpr static const char* HeaderResourceType = "x-ms-resource-type";
constexpr static const char* HeaderLeaseState = "x-ms-lease-state";
constexpr static const char* HeaderLeaseStatus = "x-ms-lease-status";
@ -421,8 +420,6 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
{
Azure::Core::Nullable<std::string> AcceptRanges;
PathHttpHeaders HttpHeaders;
int64_t ContentLength = int64_t();
Azure::Core::Nullable<std::string> ContentRange;
std::string ETag;
Core::DateTime LastModified;
Azure::Core::Nullable<std::string> ResourceType;
@ -1931,17 +1928,6 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
{
result.HttpHeaders.ContentLanguage = response.GetHeaders().at("content-language");
}
if (response.GetHeaders().find(Details::HeaderContentLength)
!= response.GetHeaders().end())
{
result.ContentLength
= std::stoll(response.GetHeaders().at(Details::HeaderContentLength));
}
if (response.GetHeaders().find(Details::HeaderContentRange)
!= response.GetHeaders().end())
{
result.ContentRange = response.GetHeaders().at(Details::HeaderContentRange);
}
if (response.GetHeaders().find("content-type") != response.GetHeaders().end())
{
result.HttpHeaders.ContentType = response.GetHeaders().at("content-type");

8
sdk/storage/azure-storage-files-datalake/src/datalake_file_client.cpp
View File

@ -326,12 +326,8 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
Models::ReadDataLakeFileResult ret;
ret.Body = std::move(result->BodyStream);
ret.HttpHeaders = FromBlobHttpHeaders(std::move(result->HttpHeaders));
// FIXME
if (result.GetRawResponse().GetHeaders().find("content-range")
!= result.GetRawResponse().GetHeaders().end())
{
ret.ContentRange = result.GetRawResponse().GetHeaders().at("content-range");
}
ret.ContentRange = std::move(result->ContentRange);
ret.FileSize = result->BlobSize;
ret.TransactionalContentHash = std::move(result->TransactionalContentHash);
ret.ETag = std::move(result->ETag);
ret.LastModified = std::move(result->LastModified);

4
sdk/storage/azure-storage-files-datalake/src/datalake_path_client.cpp
View File

@ -274,7 +274,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
Models::CreateDataLakePathResult ret;
ret.ETag = std::move(result->ETag.GetValue());
ret.LastModified = std::move(result->LastModified.GetValue());
ret.ContentLength = std::move(result->ContentLength);
ret.FileSize = std::move(result->ContentLength);
return Azure::Core::Response<Models::CreateDataLakePathResult>(
std::move(ret), result.ExtractRawResponse());
}
@ -382,7 +382,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
ret.CopyCompletedOn = std::move(result->CopyCompletedOn);
ret.ExpiresOn = std::move(result->ExpiriesOn);
ret.LastAccessedOn = std::move(result->LastAccessedOn);
ret.ContentLength = result->ContentLength;
ret.FileSize = result->ContentLength;
return Azure::Core::Response<Models::GetDataLakePathPropertiesResult>(
std::move(ret), result.ExtractRawResponse());
}

13
sdk/storage/azure-storage-files-datalake/test/datalake_file_client_test.cpp
View File

@ -378,6 +378,9 @@ namespace Azure { namespace Storage { namespace Test {
auto result = newFileClient->Read();
auto downloaded = ReadBodyStream(result->Body);
EXPECT_EQ(buffer, downloaded);
EXPECT_EQ(bufferSize, result->FileSize);
EXPECT_EQ(bufferSize, result->ContentRange.Length.GetValue());
EXPECT_EQ(0, result->ContentRange.Offset);
// Read Range
{
@ -390,6 +393,9 @@ namespace Azure { namespace Storage { namespace Test {
downloaded = ReadBodyStream(result->Body);
EXPECT_EQ(firstHalf.size(), downloaded.size());
EXPECT_EQ(firstHalf, downloaded);
EXPECT_EQ(bufferSize, result->FileSize);
EXPECT_EQ(bufferSize / 2, result->ContentRange.Length.GetValue());
EXPECT_EQ(0, result->ContentRange.Offset);
}
{
auto secondHalf = std::vector<uint8_t>(buffer.begin() + bufferSize / 2, buffer.end());
@ -400,6 +406,9 @@ namespace Azure { namespace Storage { namespace Test {
result = newFileClient->Read(options);
downloaded = ReadBodyStream(result->Body);
EXPECT_EQ(secondHalf, downloaded);
EXPECT_EQ(bufferSize, result->FileSize);
EXPECT_EQ(bufferSize / 2, result->ContentRange.Length.GetValue());
EXPECT_EQ(bufferSize / 2, result->ContentRange.Offset);
}
{
// Read with last modified access condition.
@ -491,7 +500,7 @@ namespace Azure { namespace Storage { namespace Test {
EXPECT_TRUE(IsValidTime(res->LastModified));
EXPECT_EQ(res->LastModified, lastModified);
auto properties = *fileClient.GetProperties();
EXPECT_EQ(properties.ContentLength, fileSize);
EXPECT_EQ(properties.FileSize, fileSize);
EXPECT_EQ(properties.HttpHeaders, options.HttpHeaders);
EXPECT_EQ(properties.Metadata, options.Metadata);
EXPECT_EQ(properties.ETag, res->ETag);
@ -525,7 +534,7 @@ namespace Azure { namespace Storage { namespace Test {
EXPECT_TRUE(IsValidTime(res->LastModified));
EXPECT_EQ(res->LastModified, lastModified);
auto properties = *fileClient.GetProperties();
EXPECT_EQ(properties.ContentLength, fileSize);
EXPECT_EQ(properties.FileSize, fileSize);
EXPECT_EQ(properties.HttpHeaders, options.HttpHeaders);
EXPECT_EQ(properties.Metadata, options.Metadata);
EXPECT_EQ(properties.ETag, res->ETag);

2
sdk/storage/azure-storage-files-shares/CHANGELOG.md
View File

@ -5,6 +5,8 @@
### Breaking Changes
- Removed `GetDirectoryClient` and `GetFileClient` from `ShareClient`. `ShareDirectoryClient` and `ShareFileClient` now initializes with the name of the resource, not path, to indicate that no path parsing is done for the API
- `ContentRange` in `FileDownloadResult` is now `Azure::Core::Http::Range`.
- `ContentLength` in `FileDownloadResult` is renamed to `FileSize`.
- Renamed `GetUri` to `GetUrl`.
## 12.0.0-beta.6 (2020-01-14)

70
sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/protocol/share_rest_client.hpp
View File

@ -772,9 +772,9 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
std::unique_ptr<Azure::Core::Http::BodyStream> BodyStream;
Core::DateTime LastModified;
Storage::Metadata Metadata;
int64_t ContentLength = int64_t();
ShareFileHttpHeaders HttpHeaders;
Azure::Core::Nullable<std::string> ContentRange;
Azure::Core::Http::Range ContentRange;
int64_t FileSize;
std::string ETag;
Azure::Core::Nullable<Storage::ContentHash> TransactionalContentHash;
std::string AcceptRanges;
@ -6099,13 +6099,36 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
{
result.Metadata.emplace(i->first.substr(10), i->second);
}
result.ContentLength
= std::stoll(response.GetHeaders().at(Details::HeaderContentLength));
result.HttpHeaders.ContentType = response.GetHeaders().at(Details::HeaderContentType);
if (response.GetHeaders().find(Details::HeaderContentRange)
!= response.GetHeaders().end())
auto content_range_iterator = response.GetHeaders().find(Details::HeaderContentRange);
if (content_range_iterator != response.GetHeaders().end())
{
result.ContentRange = response.GetHeaders().at(Details::HeaderContentRange);
const std::string& content_range = content_range_iterator->second;
auto bytes_pos = content_range.find("bytes ");
auto dash_pos = content_range.find("-", bytes_pos + 6);
auto slash_pos = content_range.find("/", dash_pos + 1);
int64_t range_start_offset = std::stoll(std::string(
content_range.begin() + bytes_pos + 6, content_range.begin() + dash_pos));
int64_t range_end_offset = std::stoll(std::string(
content_range.begin() + dash_pos + 1, content_range.begin() + slash_pos));
result.ContentRange = Azure::Core::Http::Range{
range_start_offset, range_end_offset - range_start_offset + 1};
}
else
{
result.ContentRange = Azure::Core::Http::Range{
0, std::stoll(response.GetHeaders().at(Details::HeaderContentLength))};
}
if (content_range_iterator != response.GetHeaders().end())
{
const std::string& content_range = content_range_iterator->second;
auto slash_pos = content_range.find("/");
result.FileSize = std::stoll(content_range.substr(slash_pos + 1));
}
else
{
result.FileSize = std::stoll(response.GetHeaders().at(Details::HeaderContentLength));
}
result.ETag = response.GetHeaders().at(Details::HeaderETag);
if (response.GetHeaders().find(Details::HeaderTransactionalContentHashMd5)
@ -6235,13 +6258,36 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
{
result.Metadata.emplace(i->first.substr(10), i->second);
}
result.ContentLength
= std::stoll(response.GetHeaders().at(Details::HeaderContentLength));
result.HttpHeaders.ContentType = response.GetHeaders().at(Details::HeaderContentType);
if (response.GetHeaders().find(Details::HeaderContentRange)
!= response.GetHeaders().end())
auto content_range_iterator = response.GetHeaders().find(Details::HeaderContentRange);
if (content_range_iterator != response.GetHeaders().end())
{
result.ContentRange = response.GetHeaders().at(Details::HeaderContentRange);
const std::string& content_range = content_range_iterator->second;
auto bytes_pos = content_range.find("bytes ");
auto dash_pos = content_range.find("-", bytes_pos + 6);
auto slash_pos = content_range.find("/", dash_pos + 1);
int64_t range_start_offset = std::stoll(std::string(
content_range.begin() + bytes_pos + 6, content_range.begin() + dash_pos));
int64_t range_end_offset = std::stoll(std::string(
content_range.begin() + dash_pos + 1, content_range.begin() + slash_pos));
result.ContentRange = Azure::Core::Http::Range{
range_start_offset, range_end_offset - range_start_offset + 1};
}
else
{
result.ContentRange = Azure::Core::Http::Range{
0, std::stoll(response.GetHeaders().at(Details::HeaderContentLength))};
}
if (content_range_iterator != response.GetHeaders().end())
{
const std::string& content_range = content_range_iterator->second;
auto slash_pos = content_range.find("/");
result.FileSize = std::stoll(content_range.substr(slash_pos + 1));
}
else
{
result.FileSize = std::stoll(response.GetHeaders().at(Details::HeaderContentLength));
}
result.ETag = response.GetHeaders().at(Details::HeaderETag);
if (response.GetHeaders().find(Details::HeaderTransactionalContentHashMd5)

6
sdk/storage/azure-storage-files-shares/src/share_file_client.cpp
View File

@ -641,8 +641,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
int64_t fileRangeSize;
if (firstChunkOptions.Range.HasValue())
{
fileSize = std::stoll(firstChunk->ContentRange.GetValue().substr(
firstChunk->ContentRange.GetValue().find('/') + 1));
fileSize = firstChunk->FileSize;
fileRangeSize = fileSize - firstChunkOffset;
if (options.Range.GetValue().Length.HasValue())
{
@ -763,8 +762,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
int64_t fileRangeSize;
if (firstChunkOptions.Range.HasValue())
{
fileSize = std::stoll(firstChunk->ContentRange.GetValue().substr(
firstChunk->ContentRange.GetValue().find('/') + 1));
fileSize = firstChunk->FileSize;
fileRangeSize = fileSize - firstChunkOffset;
if (options.Range.GetValue().Length.HasValue())
{

13
sdk/storage/azure-storage-files-shares/test/share_file_client_test.cpp
View File

@ -592,15 +592,20 @@ namespace Azure { namespace Storage { namespace Test {
for (int32_t i = 0; i < numOfChunks; ++i)
{
std::vector<uint8_t> resultBuffer;
Files::Shares::DownloadShareFileOptions downloadOptions;
downloadOptions.Range = Core::Http::Range();
downloadOptions.Range.GetValue().Offset = static_cast<int64_t>(rangeSize) * i;
downloadOptions.Range.GetValue().Length = rangeSize;
EXPECT_NO_THROW(
resultBuffer = Core::Http::BodyStream::ReadToEnd(
Core::Context(), *fileClient.Download(downloadOptions)->BodyStream));
Files::Shares::Models::DownloadShareFileResult result;
EXPECT_NO_THROW(result = fileClient.Download(downloadOptions).ExtractValue());
auto resultBuffer
= Core::Http::BodyStream::ReadToEnd(Core::Context(), *(result.BodyStream));
EXPECT_EQ(rangeContent, resultBuffer);
EXPECT_EQ(
downloadOptions.Range.GetValue().Length.GetValue(),
result.ContentRange.Length.GetValue());
EXPECT_EQ(downloadOptions.Range.GetValue().Offset, result.ContentRange.Offset);
EXPECT_EQ(static_cast<int64_t>(numOfChunks) * rangeSize, result.FileSize);
}
}