Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Simplify crt options usage #3032

Merged
merged 4 commits into from
Jul 12, 2024
Merged

Simplify crt options usage #3032

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
81c1532
minor refactor
DmitriyMusatkin Jul 10, 2024
ed03fa2
fix destructor too
DmitriyMusatkin Jul 10, 2024
160c9d5
minor cleanup
DmitriyMusatkin Jul 11, 2024
ece3fb1
build fix
DmitriyMusatkin Jul 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion generated/src/aws-cpp-sdk-s3-crt/include/aws/s3-crt/S3CrtClient.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6300,9 +6300,11 @@ namespace Aws
wrappedData->clientShutdownSem->Release();
}

void InitCrtEndpointFromUri(aws_uri *endpoint_uri, const Aws::Http::URI &uri) const;

void InitCommonCrtRequestOption(CrtRequestCallbackUserData *userData,
aws_s3_meta_request_options *options,
const Aws::AmazonWebServiceRequest *requset,
const Aws::AmazonWebServiceRequest *request,
const Aws::Http::URI &uri, Aws::Http::HttpMethod method) const;
S3Crt::ClientConfiguration m_clientConfiguration;
std::shared_ptr<Utils::Threading::Executor> m_executor;
Expand Down
21 changes: 12 additions & 9 deletions generated/src/aws-cpp-sdk-s3-crt/source/S3CrtClient.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -679,6 +679,12 @@ Aws::Client::StreamOutcome S3CrtClient::GenerateStreamOutcome(const std::shared_
return StreamOutcome(std::move(httpOutcome));
}

void S3CrtClient::InitCrtEndpointFromUri(aws_uri *endpoint_uri, const Aws::Http::URI &uri) const {
const auto endpointStr = uri.GetURIString();
const auto endpointCursor{ aws_byte_cursor_from_array(endpointStr.c_str(), endpointStr.size()) };
aws_uri_init_parse(endpoint_uri, Aws::get_aws_allocator(), &endpointCursor);
}

void S3CrtClient::InitCommonCrtRequestOption(CrtRequestCallbackUserData *userData,
aws_s3_meta_request_options *options,
const Aws::AmazonWebServiceRequest *request,
Expand Down Expand Up @@ -708,9 +714,6 @@ void S3CrtClient::InitCommonCrtRequestOption(CrtRequestCallbackUserData *userDat
options->body_callback = S3CrtRequestGetBodyCallback;
options->progress_callback = S3CrtRequestProgressCallback;
options->finish_callback = S3CrtRequestFinishCallback;
const auto endpointStr = uri.GetURIString();
const auto endpointCursor{ aws_byte_cursor_from_array(endpointStr.c_str(), endpointStr.size()) };
aws_uri_init_parse(options->endpoint, Aws::get_aws_allocator(), &endpointCursor);
}

static void CopyObjectRequestShutdownCallback(void *user_data)
Expand Down Expand Up @@ -769,9 +772,9 @@ void S3CrtClient::CopyObjectAsync(const CopyObjectRequest& request, const CopyOb
aws_s3_meta_request_options options;
AWS_ZERO_STRUCT(options);
aws_uri endpoint;
AWS_ZERO_STRUCT(endpoint);
InitCrtEndpointFromUri(&endpoint, endpointResolutionOutcome.GetResult().GetURI());
options.endpoint = &endpoint;
std::unique_ptr<aws_uri, void(*)(aws_uri*)> endpointCleanup { options.endpoint, &aws_uri_clean_up };
std::unique_ptr<aws_uri, void(*)(aws_uri*)> endpointCleanup { &endpoint, &aws_uri_clean_up };
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks okay but I simply don't like this (initial design)
usage of a unique pointer to wrap some object on stack by getting the pointer......... some small refactoring of this function re-arranging the order of variables on stack and boom!


userData->copyResponseHandler = handler;
userData->asyncCallerContext = handlerContext;
Expand Down Expand Up @@ -888,9 +891,9 @@ void S3CrtClient::GetObjectAsync(const GetObjectRequest& request, const GetObjec
aws_s3_meta_request_options options;
AWS_ZERO_STRUCT(options);
aws_uri endpoint;
AWS_ZERO_STRUCT(endpoint);
InitCrtEndpointFromUri(&endpoint, endpointResolutionOutcome.GetResult().GetURI());
options.endpoint = &endpoint;
std::unique_ptr<aws_uri, void(*)(aws_uri*)> endpointCleanup { options.endpoint, &aws_uri_clean_up };
std::unique_ptr<aws_uri, void(*)(aws_uri*)> endpointCleanup { &endpoint, &aws_uri_clean_up };

userData->getResponseHandler = handler;
userData->asyncCallerContext = handlerContext;
Expand Down Expand Up @@ -1011,9 +1014,9 @@ void S3CrtClient::PutObjectAsync(const PutObjectRequest& request, const PutObjec
aws_s3_meta_request_options options;
AWS_ZERO_STRUCT(options);
aws_uri endpoint;
AWS_ZERO_STRUCT(endpoint);
InitCrtEndpointFromUri(&endpoint, endpointResolutionOutcome.GetResult().GetURI());
options.endpoint = &endpoint;
std::unique_ptr<aws_uri, void(*)(aws_uri*)> endpointCleanup { options.endpoint, &aws_uri_clean_up };
std::unique_ptr<aws_uri, void(*)(aws_uri*)> endpointCleanup { &endpoint, &aws_uri_clean_up };

userData->putResponseHandler = handler;
userData->asyncCallerContext = handlerContext;
Expand Down
4 changes: 3 additions & 1 deletion ...rc/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/s3/S3ClientHeader.vm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,9 +232,11 @@ namespace ${rootNamespace}
wrappedData->clientShutdownSem->Release();
}

void InitCrtEndpointFromUri(aws_uri *endpoint_uri, const Aws::Http::URI &uri) const;

void InitCommonCrtRequestOption(CrtRequestCallbackUserData *userData,
aws_s3_meta_request_options *options,
const Aws::AmazonWebServiceRequest *requset,
const Aws::AmazonWebServiceRequest *request,
const Aws::Http::URI &uri, Aws::Http::HttpMethod method) const;
#else
#if(!$serviceModel.endpointRules)
Expand Down
13 changes: 8 additions & 5 deletions ...s/com/amazonaws/util/awsclientgenerator/velocity/cpp/s3/s3-crt/S3CrtSpecificOperations.vm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,12 @@ Aws::Client::StreamOutcome S3CrtClient::GenerateStreamOutcome(const std::shared_
return StreamOutcome(std::move(httpOutcome));
}

void S3CrtClient::InitCrtEndpointFromUri(aws_uri *endpoint_uri, const Aws::Http::URI &uri) const {
const auto endpointStr = uri.GetURIString();
const auto endpointCursor{ aws_byte_cursor_from_array(endpointStr.c_str(), endpointStr.size()) };
aws_uri_init_parse(endpoint_uri, Aws::get_aws_allocator(), &endpointCursor);
}

void S3CrtClient::InitCommonCrtRequestOption(CrtRequestCallbackUserData *userData,
aws_s3_meta_request_options *options,
const Aws::AmazonWebServiceRequest *request,
Expand Down Expand Up @@ -200,9 +206,6 @@ void S3CrtClient::InitCommonCrtRequestOption(CrtRequestCallbackUserData *userDat
options->body_callback = S3CrtRequestGetBodyCallback;
options->progress_callback = S3CrtRequestProgressCallback;
options->finish_callback = S3CrtRequestFinishCallback;
const auto endpointStr = uri.GetURIString();
const auto endpointCursor{ aws_byte_cursor_from_array(endpointStr.c_str(), endpointStr.size()) };
aws_uri_init_parse(options->endpoint, Aws::get_aws_allocator(), &endpointCursor);
}
#end

Expand Down Expand Up @@ -290,9 +293,9 @@ void ${className}::${operation.name}Async(${constText}${operation.request.shape.
aws_s3_meta_request_options options;
AWS_ZERO_STRUCT(options);
aws_uri endpoint;
AWS_ZERO_STRUCT(endpoint);
InitCrtEndpointFromUri(&endpoint, endpointResolutionOutcome.GetResult().GetURI());
options.endpoint = &endpoint;
std::unique_ptr<aws_uri, void(*)(aws_uri*)> endpointCleanup { options.endpoint, &aws_uri_clean_up };
std::unique_ptr<aws_uri, void(*)(aws_uri*)> endpointCleanup { &endpoint, &aws_uri_clean_up };

#if($operation.name == "PutObject")
userData->putResponseHandler = handler;
Expand Down
Loading