aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorapollo1321 <apollo1321@yandex-team.com>2025-01-14 23:17:01 +0300
committerapollo1321 <apollo1321@yandex-team.com>2025-01-14 23:37:32 +0300
commitfc7eb64e6147971fb5da235644f47a1df89e0de5 (patch)
treef647ba4685b1d728246439394c9e29735a3b9781
parente985585a2094bcac0dd31d073e84b0811c90310b (diff)
downloadydb-fc7eb64e6147971fb5da235644f47a1df89e0de5.tar.gz
YT-21709: Fix issues
Fix issues commit_hash:08e1a709e9776a3ecfa0685db5676962c3b0eadf
-rw-r--r--yt/yt/client/api/rpc_proxy/client_impl.cpp4
-rw-r--r--yt/yt/client/api/shuffle_client.cpp4
-rw-r--r--yt/yt/client/api/shuffle_client.h4
-rw-r--r--yt/yt/client/driver/shuffle_commands.cpp4
-rw-r--r--yt/yt/client/driver/shuffle_commands.h2
-rw-r--r--yt/yt_proto/yt/client/api/rpc_proxy/proto/api_service.proto2
6 files changed, 10 insertions, 10 deletions
diff --git a/yt/yt/client/api/rpc_proxy/client_impl.cpp b/yt/yt/client/api/rpc_proxy/client_impl.cpp
index 8bd34870bd..824d11488e 100644
--- a/yt/yt/client/api/rpc_proxy/client_impl.cpp
+++ b/yt/yt/client/api/rpc_proxy/client_impl.cpp
@@ -2709,8 +2709,8 @@ TFuture<TShuffleHandlePtr> TClient::StartShuffle(
req->set_account(account);
req->set_partition_count(partitionCount);
ToProto(req->mutable_parent_transaction_id(), parentTransactionId);
- if (options.MediumName) {
- req->set_medium_name(*options.MediumName);
+ if (options.Medium) {
+ req->set_medium(*options.Medium);
}
if (options.ReplicationFactor) {
req->set_replication_factor(*options.ReplicationFactor);
diff --git a/yt/yt/client/api/shuffle_client.cpp b/yt/yt/client/api/shuffle_client.cpp
index 00128bc298..d3dde1f567 100644
--- a/yt/yt/client/api/shuffle_client.cpp
+++ b/yt/yt/client/api/shuffle_client.cpp
@@ -13,7 +13,7 @@ void FormatValue(TStringBuilderBase* builder, const TShuffleHandlePtr& shuffleHa
shuffleHandle->TransactionId,
shuffleHandle->CoordinatorAddress,
shuffleHandle->Account,
- shuffleHandle->MediumName,
+ shuffleHandle->Medium,
shuffleHandle->PartitionCount,
shuffleHandle->ReplicationFactor);
}
@@ -25,7 +25,7 @@ void TShuffleHandle::Register(TRegistrar registrar)
registrar.Parameter("transaction_id", &TThis::TransactionId);
registrar.Parameter("coordinator_address", &TThis::CoordinatorAddress);
registrar.Parameter("account", &TThis::Account);
- registrar.Parameter("medium_name", &TThis::MediumName);
+ registrar.Parameter("medium", &TThis::Medium);
registrar.Parameter("partition_count", &TThis::PartitionCount)
.GreaterThan(0);
registrar.Parameter("replication_factor", &TThis::ReplicationFactor)
diff --git a/yt/yt/client/api/shuffle_client.h b/yt/yt/client/api/shuffle_client.h
index a239878952..bfdaad71eb 100644
--- a/yt/yt/client/api/shuffle_client.h
+++ b/yt/yt/client/api/shuffle_client.h
@@ -12,7 +12,7 @@ struct TShuffleHandle
NObjectClient::TTransactionId TransactionId;
std::string CoordinatorAddress;
std::string Account;
- std::string MediumName;
+ std::string Medium;
int PartitionCount;
int ReplicationFactor;
@@ -30,7 +30,7 @@ void FormatValue(TStringBuilderBase* builder, const TShuffleHandlePtr& shuffleHa
struct TStartShuffleOptions
: public TTimeoutOptions
{
- std::optional<std::string> MediumName;
+ std::optional<std::string> Medium;
std::optional<int> ReplicationFactor;
};
diff --git a/yt/yt/client/driver/shuffle_commands.cpp b/yt/yt/client/driver/shuffle_commands.cpp
index d9eb0688b8..67c93746d7 100644
--- a/yt/yt/client/driver/shuffle_commands.cpp
+++ b/yt/yt/client/driver/shuffle_commands.cpp
@@ -26,9 +26,9 @@ void TStartShuffleCommand::Register(TRegistrar registrar)
registrar.Parameter("partition_count", &TThis::PartitionCount);
registrar.Parameter("parent_transaction_id", &TThis::ParentTransactionId);
registrar.ParameterWithUniversalAccessor<std::optional<std::string>>(
- "medium_name",
+ "medium",
[] (TThis* command) -> auto& {
- return command->Options.MediumName;
+ return command->Options.Medium;
})
.Default();
registrar.ParameterWithUniversalAccessor<std::optional<int>>(
diff --git a/yt/yt/client/driver/shuffle_commands.h b/yt/yt/client/driver/shuffle_commands.h
index 85e578df72..688e0d1a02 100644
--- a/yt/yt/client/driver/shuffle_commands.h
+++ b/yt/yt/client/driver/shuffle_commands.h
@@ -18,7 +18,7 @@ private:
std::string Account;
int PartitionCount;
NObjectClient::TTransactionId ParentTransactionId;
- std::optional<std::string> MediumName;
+ std::optional<std::string> Medium;
std::optional<int> ReplicationFactor;
void DoExecute(ICommandContextPtr context) override;
diff --git a/yt/yt_proto/yt/client/api/rpc_proxy/proto/api_service.proto b/yt/yt_proto/yt/client/api/rpc_proxy/proto/api_service.proto
index a8fa7b2352..92a71cafda 100644
--- a/yt/yt_proto/yt/client/api/rpc_proxy/proto/api_service.proto
+++ b/yt/yt_proto/yt/client/api/rpc_proxy/proto/api_service.proto
@@ -3476,7 +3476,7 @@ message TReqStartShuffle
required string account = 1;
required int32 partition_count = 2;
required NYT.NProto.TGuid parent_transaction_id = 3;
- optional string medium_name = 4;
+ optional string medium = 4;
optional int32 replication_factor = 5;
}