diff options
author | sabdenovch <sabdenovch@yandex-team.com> | 2025-01-30 21:56:41 +0300 |
---|---|---|
committer | sabdenovch <sabdenovch@yandex-team.com> | 2025-01-30 22:18:29 +0300 |
commit | b1baee0265758e960be4693baa75a1c6f60dce82 (patch) | |
tree | 1855d29ad4345d1fcd6568c4745ae75188c9b88c | |
parent | d960f5efa7a37bd73bdec0cda5748ee4f218f376 (diff) | |
download | ydb-b1baee0265758e960be4693baa75a1c6f60dce82.tar.gz |
Migrate select queries to std::string
[nodiff:caesar]
commit_hash:200f61f0382e746090ab0cac5629b4f4b83cb33c
-rw-r--r-- | yt/yt/client/api/delegating_client.h | 4 | ||||
-rw-r--r-- | yt/yt/client/api/delegating_transaction.cpp | 4 | ||||
-rw-r--r-- | yt/yt/client/api/delegating_transaction.h | 4 | ||||
-rw-r--r-- | yt/yt/client/api/dynamic_table_client.h | 4 | ||||
-rw-r--r-- | yt/yt/client/api/rpc_proxy/client_base.cpp | 4 | ||||
-rw-r--r-- | yt/yt/client/api/rpc_proxy/client_base.h | 4 | ||||
-rw-r--r-- | yt/yt/client/api/rpc_proxy/transaction_impl.cpp | 4 | ||||
-rw-r--r-- | yt/yt/client/api/rpc_proxy/transaction_impl.h | 4 | ||||
-rw-r--r-- | yt/yt/client/federated/client.cpp | 16 | ||||
-rw-r--r-- | yt/yt/client/hedging/hedging.cpp | 4 | ||||
-rw-r--r-- | yt/yt/client/unittests/mock/client.h | 4 | ||||
-rw-r--r-- | yt/yt/client/unittests/mock/transaction.h | 4 |
12 files changed, 30 insertions, 30 deletions
diff --git a/yt/yt/client/api/delegating_client.h b/yt/yt/client/api/delegating_client.h index a8b991e78e..ecb92de39e 100644 --- a/yt/yt/client/api/delegating_client.h +++ b/yt/yt/client/api/delegating_client.h @@ -63,12 +63,12 @@ public: (subrequests, options)) DELEGATE_METHOD(TFuture<TSelectRowsResult>, SelectRows, ( - const TString& query, + const std::string& query, const TSelectRowsOptions& options), (query, options)) DELEGATE_METHOD(TFuture<NYson::TYsonString>, ExplainQuery, ( - const TString& query, + const std::string& query, const TExplainQueryOptions& options), (query, options)) diff --git a/yt/yt/client/api/delegating_transaction.cpp b/yt/yt/client/api/delegating_transaction.cpp index 2e12a18cfb..437c991875 100644 --- a/yt/yt/client/api/delegating_transaction.cpp +++ b/yt/yt/client/api/delegating_transaction.cpp @@ -41,12 +41,12 @@ DELEGATE_METHOD(TFuture<std::vector<TUnversionedLookupRowsResult>>, MultiLookupR (subrequests, options)) DELEGATE_METHOD(TFuture<TSelectRowsResult>, SelectRows, ( - const TString& query, + const std::string& query, const TSelectRowsOptions& options), (query, options)) DELEGATE_METHOD(TFuture<NYson::TYsonString>, ExplainQuery, ( - const TString& query, + const std::string& query, const TExplainQueryOptions& options), (query, options)) diff --git a/yt/yt/client/api/delegating_transaction.h b/yt/yt/client/api/delegating_transaction.h index 5823e143fc..1bf742fe7b 100644 --- a/yt/yt/client/api/delegating_transaction.h +++ b/yt/yt/client/api/delegating_transaction.h @@ -41,11 +41,11 @@ public: const TMultiLookupOptions& options) override; TFuture<TSelectRowsResult> SelectRows( - const TString& query, + const std::string& query, const TSelectRowsOptions& options) override; TFuture<NYson::TYsonString> ExplainQuery( - const TString& query, + const std::string& query, const TExplainQueryOptions& options) override; TFuture<TPullRowsResult> PullRows( diff --git a/yt/yt/client/api/dynamic_table_client.h b/yt/yt/client/api/dynamic_table_client.h index 139b35276a..b4bffd86cc 100644 --- a/yt/yt/client/api/dynamic_table_client.h +++ b/yt/yt/client/api/dynamic_table_client.h @@ -108,11 +108,11 @@ struct IDynamicTableClientBase const TMultiLookupOptions& options = {}) = 0; virtual TFuture<TSelectRowsResult> SelectRows( - const TString& query, + const std::string& query, const TSelectRowsOptions& options = {}) = 0; virtual TFuture<NYson::TYsonString> ExplainQuery( - const TString& query, + const std::string& query, const TExplainQueryOptions& options = {}) = 0; }; diff --git a/yt/yt/client/api/rpc_proxy/client_base.cpp b/yt/yt/client/api/rpc_proxy/client_base.cpp index 5717a97e50..bfeda9ed87 100644 --- a/yt/yt/client/api/rpc_proxy/client_base.cpp +++ b/yt/yt/client/api/rpc_proxy/client_base.cpp @@ -1053,7 +1053,7 @@ void FillRequestBySelectRowsOptionsBase( } TFuture<TSelectRowsResult> TClientBase::SelectRows( - const TString& query, + const std::string& query, const TSelectRowsOptions& options) { auto proxy = CreateApiServiceProxy(); @@ -1125,7 +1125,7 @@ TFuture<TSelectRowsResult> TClientBase::SelectRows( } TFuture<TYsonString> TClientBase::ExplainQuery( - const TString& query, + const std::string& query, const TExplainQueryOptions& options) { auto proxy = CreateApiServiceProxy(); diff --git a/yt/yt/client/api/rpc_proxy/client_base.h b/yt/yt/client/api/rpc_proxy/client_base.h index 424752d95e..2eb9c64288 100644 --- a/yt/yt/client/api/rpc_proxy/client_base.h +++ b/yt/yt/client/api/rpc_proxy/client_base.h @@ -68,11 +68,11 @@ public: const TMultiLookupOptions& options = {}) override; TFuture<NApi::TSelectRowsResult> SelectRows( - const TString& query, + const std::string& query, const NApi::TSelectRowsOptions& options) override; TFuture<NYson::TYsonString> ExplainQuery( - const TString& query, + const std::string& query, const NApi::TExplainQueryOptions& options) override; virtual TFuture<TPullRowsResult> PullRows( diff --git a/yt/yt/client/api/rpc_proxy/transaction_impl.cpp b/yt/yt/client/api/rpc_proxy/transaction_impl.cpp index 9cc13718fa..d4426488f4 100644 --- a/yt/yt/client/api/rpc_proxy/transaction_impl.cpp +++ b/yt/yt/client/api/rpc_proxy/transaction_impl.cpp @@ -657,7 +657,7 @@ TFuture<std::vector<TUnversionedLookupRowsResult>> TTransaction::MultiLookupRows } TFuture<TSelectRowsResult> TTransaction::SelectRows( - const TString& query, + const std::string& query, const TSelectRowsOptions& options) { ValidateActive(); @@ -667,7 +667,7 @@ TFuture<TSelectRowsResult> TTransaction::SelectRows( } TFuture<NYson::TYsonString> TTransaction::ExplainQuery( - const TString& query, + const std::string& query, const TExplainQueryOptions& options) { ValidateActive(); diff --git a/yt/yt/client/api/rpc_proxy/transaction_impl.h b/yt/yt/client/api/rpc_proxy/transaction_impl.h index 20ac689bcb..e191a6fb79 100644 --- a/yt/yt/client/api/rpc_proxy/transaction_impl.h +++ b/yt/yt/client/api/rpc_proxy/transaction_impl.h @@ -127,11 +127,11 @@ public: const TMultiLookupOptions& options) override; TFuture<NApi::TSelectRowsResult> SelectRows( - const TString& query, + const std::string& query, const NApi::TSelectRowsOptions& options) override; TFuture<NYson::TYsonString> ExplainQuery( - const TString& query, + const std::string& query, const NApi::TExplainQueryOptions& options) override; TFuture<NApi::TPullRowsResult> PullRows( diff --git a/yt/yt/client/federated/client.cpp b/yt/yt/client/federated/client.cpp index 4c1cbb6c7c..c3efdb939e 100644 --- a/yt/yt/client/federated/client.cpp +++ b/yt/yt/client/federated/client.cpp @@ -78,7 +78,7 @@ public: const TLookupRowsOptions& options = {}) override; TFuture<TSelectRowsResult> SelectRows( - const TString& query, + const std::string& query, const TSelectRowsOptions& options = {}) override; void ModifyRows( @@ -131,7 +131,7 @@ public: const std::vector<TMultiLookupSubrequest>&, const TMultiLookupOptions&) override; - TFuture<NYson::TYsonString> ExplainQuery(const TString&, const TExplainQueryOptions&) override; + TFuture<NYson::TYsonString> ExplainQuery(const std::string&, const TExplainQueryOptions&) override; TFuture<NYson::TYsonString> GetNode(const NYPath::TYPath&, const TGetNodeOptions&) override; @@ -290,7 +290,7 @@ public: const TSharedRange<NTableClient::TLegacyKey>& keys, const TLookupRowsOptions& options = {}) override; TFuture<TSelectRowsResult> SelectRows( - const TString& query, + const std::string& query, const TSelectRowsOptions& options = {}) override; TFuture<std::vector<TUnversionedLookupRowsResult>> MultiLookupRows( const std::vector<TMultiLookupSubrequest>&, @@ -319,7 +319,7 @@ public: NTransactionClient::ETransactionType type, const NApi::TTransactionStartOptions& options) override; - TFuture<NYson::TYsonString> ExplainQuery(const TString&, const TExplainQueryOptions&) override; + TFuture<NYson::TYsonString> ExplainQuery(const std::string&, const TExplainQueryOptions&) override; TFuture<NYson::TYsonString> GetNode(const NYPath::TYPath&, const TGetNodeOptions&) override; TFuture<NYson::TYsonString> ListNode(const NYPath::TYPath&, const TListNodeOptions&) override; @@ -549,7 +549,7 @@ TFuture<ResultType> TTransaction::MethodName(Y_METHOD_USED_ARGS_DECLARATION(Args } Y_SEMICOLON_GUARD TRANSACTION_METHOD_IMPL(TUnversionedLookupRowsResult, LookupRows, (const NYPath::TYPath&, NTableClient::TNameTablePtr, const TSharedRange<NTableClient::TUnversionedRow>&, const TLookupRowsOptions&)); -TRANSACTION_METHOD_IMPL(TSelectRowsResult, SelectRows, (const TString&, const TSelectRowsOptions&)); +TRANSACTION_METHOD_IMPL(TSelectRowsResult, SelectRows, (const std::string&, const TSelectRowsOptions&)); TRANSACTION_METHOD_IMPL(void, Ping, (const NApi::TTransactionPingOptions&)); TRANSACTION_METHOD_IMPL(TTransactionCommitResult, Commit, (const TTransactionCommitOptions&)); TRANSACTION_METHOD_IMPL(void, Abort, (const TTransactionAbortOptions&)); @@ -559,7 +559,7 @@ TRANSACTION_METHOD_IMPL(TPullRowsResult, PullRows, (const NYPath::TYPath&, const TRANSACTION_METHOD_IMPL(void, AdvanceQueueConsumer, (const NYPath::TRichYPath&, const NYPath::TRichYPath&, int, std::optional<i64>, i64, const TAdvanceQueueConsumerOptions&)); TRANSACTION_METHOD_IMPL(TPushQueueProducerResult, PushQueueProducer, (const NYPath::TRichYPath&, const NYPath::TRichYPath&, const TQueueProducerSessionId&, TQueueProducerEpoch, NTableClient::TNameTablePtr, TSharedRange<NTableClient::TUnversionedRow>, const TPushQueueProducerOptions&)); TRANSACTION_METHOD_IMPL(TPushQueueProducerResult, PushQueueProducer, (const NYPath::TRichYPath&, const NYPath::TRichYPath&, const TQueueProducerSessionId&, TQueueProducerEpoch, NTableClient::TNameTablePtr, const std::vector<TSharedRef>&, const TPushQueueProducerOptions&)); -TRANSACTION_METHOD_IMPL(NYson::TYsonString, ExplainQuery, (const TString&, const TExplainQueryOptions&)); +TRANSACTION_METHOD_IMPL(NYson::TYsonString, ExplainQuery, (const std::string&, const TExplainQueryOptions&)); TRANSACTION_METHOD_IMPL(NYson::TYsonString, GetNode, (const NYPath::TYPath&, const TGetNodeOptions&)); TRANSACTION_METHOD_IMPL(NYson::TYsonString, ListNode, (const NYPath::TYPath&, const TListNodeOptions&)); TRANSACTION_METHOD_IMPL(bool, NodeExists, (const NYPath::TYPath&, const TNodeExistsOptions&)); @@ -719,13 +719,13 @@ TFuture<ResultType> TClient::MethodName(Y_METHOD_USED_ARGS_DECLARATION(Args)) } Y_SEMICOLON_GUARD CLIENT_METHOD_IMPL(TUnversionedLookupRowsResult, LookupRows, (const NYPath::TYPath&, NTableClient::TNameTablePtr, const TSharedRange<NTableClient::TLegacyKey>&, const TLookupRowsOptions&)); -CLIENT_METHOD_IMPL(TSelectRowsResult, SelectRows, (const TString&, const TSelectRowsOptions&)); +CLIENT_METHOD_IMPL(TSelectRowsResult, SelectRows, (const std::string&, const TSelectRowsOptions&)); CLIENT_METHOD_IMPL(std::vector<TUnversionedLookupRowsResult>, MultiLookupRows, (const std::vector<TMultiLookupSubrequest>&, const TMultiLookupOptions&)); CLIENT_METHOD_IMPL(TVersionedLookupRowsResult, VersionedLookupRows, (const NYPath::TYPath&, NTableClient::TNameTablePtr, const TSharedRange<NTableClient::TUnversionedRow>&, const TVersionedLookupRowsOptions&)); CLIENT_METHOD_IMPL(TPullRowsResult, PullRows, (const NYPath::TYPath&, const TPullRowsOptions&)); CLIENT_METHOD_IMPL(NQueueClient::IQueueRowsetPtr, PullQueue, (const NYPath::TRichYPath&, i64, int, const NQueueClient::TQueueRowBatchReadOptions&, const TPullQueueOptions&)); CLIENT_METHOD_IMPL(NQueueClient::IQueueRowsetPtr, PullQueueConsumer, (const NYPath::TRichYPath&, const NYPath::TRichYPath&, std::optional<i64>, int, const NQueueClient::TQueueRowBatchReadOptions&, const TPullQueueConsumerOptions&)); -CLIENT_METHOD_IMPL(NYson::TYsonString, ExplainQuery, (const TString&, const TExplainQueryOptions&)); +CLIENT_METHOD_IMPL(NYson::TYsonString, ExplainQuery, (const std::string&, const TExplainQueryOptions&)); CLIENT_METHOD_IMPL(NYson::TYsonString, GetNode, (const NYPath::TYPath&, const TGetNodeOptions&)); CLIENT_METHOD_IMPL(NYson::TYsonString, ListNode, (const NYPath::TYPath&, const TListNodeOptions&)); CLIENT_METHOD_IMPL(bool, NodeExists, (const NYPath::TYPath&, const TNodeExistsOptions&)); diff --git a/yt/yt/client/hedging/hedging.cpp b/yt/yt/client/hedging/hedging.cpp index e309817175..7fa807b6f1 100644 --- a/yt/yt/client/hedging/hedging.cpp +++ b/yt/yt/client/hedging/hedging.cpp @@ -74,7 +74,7 @@ public: RETRYABLE_METHOD(TFuture<TUnversionedLookupRowsResult>, LookupRows, (const TYPath&, NTableClient::TNameTablePtr, const TSharedRange<NTableClient::TUnversionedRow>&, const TLookupRowsOptions&)); RETRYABLE_METHOD(TFuture<TVersionedLookupRowsResult>, VersionedLookupRows, (const TYPath&, NTableClient::TNameTablePtr, const TSharedRange<NTableClient::TUnversionedRow>&, const TVersionedLookupRowsOptions&)); - RETRYABLE_METHOD(TFuture<TSelectRowsResult>, SelectRows, (const TString&, const TSelectRowsOptions&)); + RETRYABLE_METHOD(TFuture<TSelectRowsResult>, SelectRows, (const std::string&, const TSelectRowsOptions&)); RETRYABLE_METHOD(TFuture<NQueueClient::IQueueRowsetPtr>, PullQueue, (const TRichYPath&, i64, int, const NQueueClient::TQueueRowBatchReadOptions&, const TPullQueueOptions&)); RETRYABLE_METHOD(TFuture<NQueueClient::IQueueRowsetPtr>, PullQueueConsumer, (const TRichYPath&, const TRichYPath&, std::optional<i64>, int, const NQueueClient::TQueueRowBatchReadOptions&, const TPullQueueConsumerOptions&)); RETRYABLE_METHOD(TFuture<void>, RegisterQueueConsumer, (const TRichYPath&, const TRichYPath&, bool, const TRegisterQueueConsumerOptions&)); @@ -82,7 +82,7 @@ public: RETRYABLE_METHOD(TFuture<std::vector<TListQueueConsumerRegistrationsResult>>, ListQueueConsumerRegistrations, (const std::optional<TRichYPath>&, const std::optional<TRichYPath>&, const TListQueueConsumerRegistrationsOptions&)); RETRYABLE_METHOD(TFuture<TCreateQueueProducerSessionResult>, CreateQueueProducerSession, (const NYPath::TRichYPath&, const NYPath::TRichYPath&, const NQueueClient::TQueueProducerSessionId&, const TCreateQueueProducerSessionOptions&)); RETRYABLE_METHOD(TFuture<void>, RemoveQueueProducerSession, (const NYPath::TRichYPath&, const NYPath::TRichYPath&, const NQueueClient::TQueueProducerSessionId&, const TRemoveQueueProducerSessionOptions&)); - RETRYABLE_METHOD(TFuture<NYson::TYsonString>, ExplainQuery, (const TString&, const TExplainQueryOptions&)); + RETRYABLE_METHOD(TFuture<NYson::TYsonString>, ExplainQuery, (const std::string&, const TExplainQueryOptions&)); RETRYABLE_METHOD(TFuture<ITableReaderPtr>, CreateTableReader, (const TRichYPath&, const TTableReaderOptions&)); RETRYABLE_METHOD(TFuture<NYson::TYsonString>, GetNode, (const TYPath&, const TGetNodeOptions&)); RETRYABLE_METHOD(TFuture<NYson::TYsonString>, ListNode, (const TYPath&, const TListNodeOptions&)); diff --git a/yt/yt/client/unittests/mock/client.h b/yt/yt/client/unittests/mock/client.h index e082fb1da6..ea6fed2987 100644 --- a/yt/yt/client/unittests/mock/client.h +++ b/yt/yt/client/unittests/mock/client.h @@ -65,7 +65,7 @@ public: (override)); MOCK_METHOD(TFuture<TSelectRowsResult>, SelectRows, ( - const TString& query, + const std::string& query, const TSelectRowsOptions& options), (override)); @@ -120,7 +120,7 @@ public: (override)); MOCK_METHOD(TFuture<NYson::TYsonString>, ExplainQuery, ( - const TString& query, + const std::string& query, const TExplainQueryOptions& options), (override)); diff --git a/yt/yt/client/unittests/mock/transaction.h b/yt/yt/client/unittests/mock/transaction.h index 713bf0b443..25c6dd6cd9 100644 --- a/yt/yt/client/unittests/mock/transaction.h +++ b/yt/yt/client/unittests/mock/transaction.h @@ -43,11 +43,11 @@ public: const TMultiLookupOptions& options), (override)); MOCK_METHOD(TFuture<TSelectRowsResult>, SelectRows, ( - const TString& query, + const std::string& query, const TSelectRowsOptions& options), (override)); MOCK_METHOD(TFuture<NYson::TYsonString>, ExplainQuery, ( - const TString& query, + const std::string& query, const TExplainQueryOptions& options), (override)); MOCK_METHOD(TFuture<TPullRowsResult>, PullRows, ( |