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

Remove redundant struct (#6326)

Browse Source 
* remove reduntant struct

* clang
This commit is contained in:
gearama 2025-01-09 13:00:42 -08:00 committed by GitHub
parent 8839b4bbf3
commit ae8413fd5a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 4 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sdk/tables/azure-data-tables/inc/azure/data/tables/models.hpp
View File

@ -556,19 +556,6 @@ namespace Azure { namespace Data { namespace Tables {
Merge,
};
/**
* @brief Upsert Entity options.
*
*/
struct UpsertEntityOptions
{
/**
* @brief Upsert type.
*
*/
UpsertKind UpsertType = UpsertKind::Update;
};
/**
* @brief Add Entity result.
*

4
sdk/tables/azure-data-tables/inc/azure/data/tables/table_client.hpp
View File

@ -134,13 +134,13 @@ namespace Azure { namespace Data { namespace Tables {
* @brief Upsert specified entity in a table.
*
* @param tableEntity The TableEntity to upsert.
* @param options Optional parameters to execute this function.
* @param upsertKind Upsert kind(update/merge), default update.
* @param context for canceling long running operations.
* @return Upsert entity result.
*/
Response<Models::UpsertEntityResult> UpsertEntity(
Models::TableEntity const& tableEntity,
Models::UpsertEntityOptions const& options = {},
Models::UpsertKind upsertKind = Models::UpsertKind::Update,
Core::Context const& context = {});
/**

4
sdk/tables/azure-data-tables/src/table_clients.cpp
View File

@ -569,12 +569,12 @@ Azure::Response<Models::DeleteEntityResult> TableClient::DeleteEntity(
Azure::Response<Models::UpsertEntityResult> TableClient::UpsertEntity(
Models::TableEntity const& tableEntity,
Models::UpsertEntityOptions const& options,
Models::UpsertKind upsertKind,
Core::Context const& context)
{
try
{
switch (options.UpsertType)
switch (upsertKind)
{
case Models::UpsertKind::Merge: {
auto response = MergeEntity(tableEntity, context);

5
sdk/tables/azure-data-tables/test/ut/table_client_test.cpp
View File

@ -344,9 +344,6 @@ namespace Azure { namespace Data { namespace Test {
EXPECT_EQ(response.RawResponse->GetStatusCode(), Azure::Core::Http::HttpStatusCode::NoContent);
EXPECT_FALSE(response.Value.ETag.empty());
Azure::Data::Tables::Models::UpsertEntityOptions options;
options.UpsertType = Azure::Data::Tables::Models::UpsertKind::Update;
entity.Properties["Product"] = TableEntityProperty("Tables2");
auto updateResponse = m_tableClient->MergeEntity(entity);
@ -354,8 +351,6 @@ namespace Azure { namespace Data { namespace Test {
updateResponse.RawResponse->GetStatusCode(), Azure::Core::Http::HttpStatusCode::NoContent);
EXPECT_FALSE(updateResponse.Value.ETag.empty());
Azure::Data::Tables::Models::UpsertEntityOptions options2;
options2.UpsertType = Azure::Data::Tables::Models::UpsertKind::Merge;
entity.Properties["Product3"] = TableEntityProperty("Tables3");
entity.SetETag(updateResponse.Value.ETag);
auto updateResponse2 = m_tableClient->MergeEntity(entity);