aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorapollo1321 <apollo1321@yandex-team.com>2024-11-21 14:00:56 +0300
committerapollo1321 <apollo1321@yandex-team.com>2024-11-21 14:13:15 +0300
commit54f8923a730ee16ece2a1ada30b7f2e2c3d71338 (patch)
tree15d32fd8a22255d36df205f675130b940213a754
parent89c7f86658cb2ccf52da9eb6239cfbf65daee58a (diff)
downloadydb-54f8923a730ee16ece2a1ada30b7f2e2c3d71338.tar.gz
Fix issues in rXXXXXX
Fix issues commit_hash:da56a7560d342885bc31423bcc6dd53188cc4841
-rw-r--r--yt/yt/client/api/delegating_client.h2
-rw-r--r--yt/yt/client/api/rpc_proxy/client_impl.cpp2
-rw-r--r--yt/yt/client/api/rpc_proxy/client_impl.h2
-rw-r--r--yt/yt/client/api/shuffle_client.h6
-rw-r--r--yt/yt/client/driver/shuffle_commands.h4
-rw-r--r--yt/yt/client/federated/client.cpp2
-rw-r--r--yt/yt/client/hedging/hedging.cpp2
-rw-r--r--yt/yt/client/unittests/mock/client.h2
8 files changed, 11 insertions, 11 deletions
diff --git a/yt/yt/client/api/delegating_client.h b/yt/yt/client/api/delegating_client.h
index df4059188b..62048663c3 100644
--- a/yt/yt/client/api/delegating_client.h
+++ b/yt/yt/client/api/delegating_client.h
@@ -863,7 +863,7 @@ public:
// Shuffle Service
DELEGATE_METHOD(TFuture<TShuffleHandlePtr>, StartShuffle, (
- const TString& account,
+ const std::string& account,
int partitionCount,
NObjectClient::TTransactionId transactionId,
const TStartShuffleOptions& options),
diff --git a/yt/yt/client/api/rpc_proxy/client_impl.cpp b/yt/yt/client/api/rpc_proxy/client_impl.cpp
index cd93d3f214..a763772b7e 100644
--- a/yt/yt/client/api/rpc_proxy/client_impl.cpp
+++ b/yt/yt/client/api/rpc_proxy/client_impl.cpp
@@ -2667,7 +2667,7 @@ TFuture<TGetFlowViewResult> TClient::GetFlowView(
}
TFuture<TShuffleHandlePtr> TClient::StartShuffle(
- const TString& account,
+ const std::string& account,
int partitionCount,
TTransactionId parentTransactionId,
const TStartShuffleOptions& options)
diff --git a/yt/yt/client/api/rpc_proxy/client_impl.h b/yt/yt/client/api/rpc_proxy/client_impl.h
index cfd45388ab..4a5cc37d79 100644
--- a/yt/yt/client/api/rpc_proxy/client_impl.h
+++ b/yt/yt/client/api/rpc_proxy/client_impl.h
@@ -570,7 +570,7 @@ public:
// Shuffle service client
TFuture<TShuffleHandlePtr> StartShuffle(
- const TString& account,
+ const std::string& account,
int partitionCount,
NObjectClient::TTransactionId parentTransactionId,
const TStartShuffleOptions& options) override;
diff --git a/yt/yt/client/api/shuffle_client.h b/yt/yt/client/api/shuffle_client.h
index 27302b46be..7185399148 100644
--- a/yt/yt/client/api/shuffle_client.h
+++ b/yt/yt/client/api/shuffle_client.h
@@ -10,8 +10,8 @@ struct TShuffleHandle
: public NYTree::TYsonStruct
{
NObjectClient::TTransactionId TransactionId;
- TString CoordinatorAddress;
- TString Account;
+ std::string CoordinatorAddress;
+ std::string Account;
int PartitionCount;
REGISTER_YSON_STRUCT(TShuffleHandle);
@@ -34,7 +34,7 @@ struct IShuffleClient
virtual ~IShuffleClient() = default;
virtual TFuture<TShuffleHandlePtr> StartShuffle(
- const TString& account,
+ const std::string& account,
int partitionCount,
NObjectClient::TTransactionId parentTransactionId,
const TStartShuffleOptions& options) = 0;
diff --git a/yt/yt/client/driver/shuffle_commands.h b/yt/yt/client/driver/shuffle_commands.h
index 2d497cf411..d43f0d7ed4 100644
--- a/yt/yt/client/driver/shuffle_commands.h
+++ b/yt/yt/client/driver/shuffle_commands.h
@@ -15,7 +15,7 @@ public:
static void Register(TRegistrar registrar);
private:
- TString Account;
+ std::string Account;
int PartitionCount;
NObjectClient::TTransactionId ParentTransactionId;
@@ -51,7 +51,7 @@ public:
private:
NApi::TShuffleHandlePtr ShuffleHandle;
- TString PartitionColumn;
+ std::string PartitionColumn;
i64 MaxRowBufferSize;
void DoExecute(ICommandContextPtr context) override;
diff --git a/yt/yt/client/federated/client.cpp b/yt/yt/client/federated/client.cpp
index 2092672c4f..170dedf910 100644
--- a/yt/yt/client/federated/client.cpp
+++ b/yt/yt/client/federated/client.cpp
@@ -487,7 +487,7 @@ public:
UNIMPLEMENTED_METHOD(TFuture<TDistributedWriteSessionPtr>, StartDistributedWriteSession, (const NYPath::TRichYPath&, const TDistributedWriteSessionStartOptions&));
UNIMPLEMENTED_METHOD(TFuture<void>, FinishDistributedWriteSession, (TDistributedWriteSessionPtr, const TDistributedWriteSessionFinishOptions&));
UNIMPLEMENTED_METHOD(TFuture<ITableWriterPtr>, CreateFragmentTableWriter, (const TFragmentWriteCookiePtr&, const TFragmentTableWriterOptions&));
- UNIMPLEMENTED_METHOD(TFuture<TShuffleHandlePtr>, StartShuffle, (const TString& , int, NObjectClient::TTransactionId, const TStartShuffleOptions&));
+ UNIMPLEMENTED_METHOD(TFuture<TShuffleHandlePtr>, StartShuffle, (const std::string& , int, NObjectClient::TTransactionId, const TStartShuffleOptions&));
UNIMPLEMENTED_METHOD(TFuture<IRowBatchReaderPtr>, CreateShuffleReader, (const TShuffleHandlePtr&, int, const NTableClient::TTableReaderConfigPtr&));
UNIMPLEMENTED_METHOD(TFuture<IRowBatchWriterPtr>, CreateShuffleWriter, (const TShuffleHandlePtr&, const std::string&, const NTableClient::TTableWriterConfigPtr&));
diff --git a/yt/yt/client/hedging/hedging.cpp b/yt/yt/client/hedging/hedging.cpp
index 9d116f0cdc..ac96c64e39 100644
--- a/yt/yt/client/hedging/hedging.cpp
+++ b/yt/yt/client/hedging/hedging.cpp
@@ -228,7 +228,7 @@ public:
UNSUPPORTED_METHOD(TFuture<void>, PausePipeline, (const TYPath&, const TPausePipelineOptions&));
UNSUPPORTED_METHOD(TFuture<TPipelineState>, GetPipelineState, (const TYPath&, const TGetPipelineStateOptions&));
UNSUPPORTED_METHOD(TFuture<TGetFlowViewResult>, GetFlowView, (const NYPath::TYPath&, const NYPath::TYPath&, const TGetFlowViewOptions&));
- UNSUPPORTED_METHOD(TFuture<TShuffleHandlePtr>, StartShuffle, (const TString&, int, NObjectClient::TTransactionId, const TStartShuffleOptions&));
+ UNSUPPORTED_METHOD(TFuture<TShuffleHandlePtr>, StartShuffle, (const std::string&, int, NObjectClient::TTransactionId, const TStartShuffleOptions&));
UNSUPPORTED_METHOD(TFuture<IRowBatchReaderPtr>, CreateShuffleReader, (const TShuffleHandlePtr&, int, const NTableClient::TTableReaderConfigPtr&));
UNSUPPORTED_METHOD(TFuture<IRowBatchWriterPtr>, CreateShuffleWriter, (const TShuffleHandlePtr&, const std::string&, const NTableClient::TTableWriterConfigPtr&));
diff --git a/yt/yt/client/unittests/mock/client.h b/yt/yt/client/unittests/mock/client.h
index 5467dc7238..31c76a9071 100644
--- a/yt/yt/client/unittests/mock/client.h
+++ b/yt/yt/client/unittests/mock/client.h
@@ -847,7 +847,7 @@ public:
(override));
MOCK_METHOD(TFuture<TShuffleHandlePtr>, StartShuffle, (
- const TString& account,
+ const std::string& account,
int partitionCount,
NObjectClient::TTransactionId parentTransactionId,
const TStartShuffleOptions& options),