diff options
author | hiddenpath <hiddenpath@yandex-team.com> | 2025-01-14 19:55:50 +0300 |
---|---|---|
committer | hiddenpath <hiddenpath@yandex-team.com> | 2025-01-14 20:36:45 +0300 |
commit | afa0505d8aa93cf04c6baa573417fcc219d134ce (patch) | |
tree | f643aad2b17fe7e2938774adc8a93e2b1c8f3b10 /yt | |
parent | 75745a5e674587c5c9092665fd9e9654184cceaa (diff) | |
download | ydb-afa0505d8aa93cf04c6baa573417fcc219d134ce.tar.gz |
YT-23616: Rename TRawBatchRequest to THttpRawBatchRequest
commit_hash:86c2242b5c4d36886d33a0f52a452e493fb7555c
Diffstat (limited to 'yt')
-rw-r--r-- | yt/cpp/mapreduce/client/batch_request_impl.cpp | 4 | ||||
-rw-r--r-- | yt/cpp/mapreduce/client/batch_request_impl.h | 6 | ||||
-rw-r--r-- | yt/cpp/mapreduce/client/lock.cpp | 2 | ||||
-rw-r--r-- | yt/cpp/mapreduce/client/operation.cpp | 4 | ||||
-rw-r--r-- | yt/cpp/mapreduce/client/operation_preparer.cpp | 6 | ||||
-rw-r--r-- | yt/cpp/mapreduce/client/prepare_operation.cpp | 2 | ||||
-rw-r--r-- | yt/cpp/mapreduce/client/skiff.cpp | 2 | ||||
-rw-r--r-- | yt/cpp/mapreduce/client/yt_poller.cpp | 2 | ||||
-rw-r--r-- | yt/cpp/mapreduce/client/yt_poller.h | 4 | ||||
-rw-r--r-- | yt/cpp/mapreduce/raw_client/raw_batch_request.cpp | 78 | ||||
-rw-r--r-- | yt/cpp/mapreduce/raw_client/raw_batch_request.h | 6 | ||||
-rw-r--r-- | yt/cpp/mapreduce/raw_client/raw_requests.cpp | 2 | ||||
-rw-r--r-- | yt/cpp/mapreduce/raw_client/raw_requests.h | 2 | ||||
-rw-r--r-- | yt/cpp/mapreduce/raw_client/ut/raw_batch_request_ut.cpp | 2 |
14 files changed, 61 insertions, 61 deletions
diff --git a/yt/cpp/mapreduce/client/batch_request_impl.cpp b/yt/cpp/mapreduce/client/batch_request_impl.cpp index eeab541001..f45eee319b 100644 --- a/yt/cpp/mapreduce/client/batch_request_impl.cpp +++ b/yt/cpp/mapreduce/client/batch_request_impl.cpp @@ -36,11 +36,11 @@ using ::NThreading::NewPromise; TBatchRequest::TBatchRequest(const TTransactionId& defaultTransaction, ::TIntrusivePtr<TClient> client) : DefaultTransaction_(defaultTransaction) - , Impl_(MakeIntrusive<TRawBatchRequest>(client->GetContext().Config)) + , Impl_(MakeIntrusive<THttpRawBatchRequest>(client->GetContext().Config)) , Client_(client) { } -TBatchRequest::TBatchRequest(TRawBatchRequest* impl, ::TIntrusivePtr<TClient> client) +TBatchRequest::TBatchRequest(THttpRawBatchRequest* impl, ::TIntrusivePtr<TClient> client) : Impl_(impl) , Client_(std::move(client)) { } diff --git a/yt/cpp/mapreduce/client/batch_request_impl.h b/yt/cpp/mapreduce/client/batch_request_impl.h index a4d776668f..d53eb196dd 100644 --- a/yt/cpp/mapreduce/client/batch_request_impl.h +++ b/yt/cpp/mapreduce/client/batch_request_impl.h @@ -23,7 +23,7 @@ class TClient; using TClientPtr = ::TIntrusivePtr<TClient>; namespace NRawClient { - class TRawBatchRequest; + class THttpRawBatchRequest; } //////////////////////////////////////////////////////////////////////////////// @@ -119,11 +119,11 @@ public: virtual void ExecuteBatch(const TExecuteBatchOptions& executeBatch) override; private: - TBatchRequest(NDetail::NRawClient::TRawBatchRequest* impl, ::TIntrusivePtr<TClient> client); + TBatchRequest(NDetail::NRawClient::THttpRawBatchRequest* impl, ::TIntrusivePtr<TClient> client); private: TTransactionId DefaultTransaction_; - ::TIntrusivePtr<NDetail::NRawClient::TRawBatchRequest> Impl_; + ::TIntrusivePtr<NDetail::NRawClient::THttpRawBatchRequest> Impl_; std::unique_ptr<TBatchRequest> TmpWithTransaction_; ::TIntrusivePtr<TClient> Client_; diff --git a/yt/cpp/mapreduce/client/lock.cpp b/yt/cpp/mapreduce/client/lock.cpp index 88110f9266..46306fa737 100644 --- a/yt/cpp/mapreduce/client/lock.cpp +++ b/yt/cpp/mapreduce/client/lock.cpp @@ -26,7 +26,7 @@ public: , Acquired_(acquired) { } - void PrepareRequest(TRawBatchRequest* batchRequest) override + void PrepareRequest(THttpRawBatchRequest* batchRequest) override { LockState_ = batchRequest->Get(TTransactionId(), LockStateYPath_, TGetOptions()); } diff --git a/yt/cpp/mapreduce/client/operation.cpp b/yt/cpp/mapreduce/client/operation.cpp index f9eb4b7fc3..8ace8a44bb 100644 --- a/yt/cpp/mapreduce/client/operation.cpp +++ b/yt/cpp/mapreduce/client/operation.cpp @@ -228,7 +228,7 @@ TStructuredJobTableList ApplyProtobufColumnFilters( CreateDefaultRequestRetryPolicy(preparer.GetContext().Config), preparer.GetContext(), tableList, - [&] (NRawClient::TRawBatchRequest& batch, const auto& table) { + [&] (NRawClient::THttpRawBatchRequest& batch, const auto& table) { return batch.Get(preparer.GetTransactionId(), table.RichYPath->Path_ + "/@dynamic", TGetOptions()); }); @@ -2343,7 +2343,7 @@ public: : OperationImpl_(std::move(operationImpl)) { } - void PrepareRequest(NRawClient::TRawBatchRequest* batchRequest) override + void PrepareRequest(NRawClient::THttpRawBatchRequest* batchRequest) override { auto filter = TOperationAttributeFilter() .Add(EOperationAttribute::State) diff --git a/yt/cpp/mapreduce/client/operation_preparer.cpp b/yt/cpp/mapreduce/client/operation_preparer.cpp index 8065ca93b3..ac6ea0f923 100644 --- a/yt/cpp/mapreduce/client/operation_preparer.cpp +++ b/yt/cpp/mapreduce/client/operation_preparer.cpp @@ -42,7 +42,7 @@ public: , Transaction_(std::move(transaction)) { } - void PrepareRequest(NRawClient::TRawBatchRequest* batchRequest) override + void PrepareRequest(NRawClient::THttpRawBatchRequest* batchRequest) override { Future_ = batchRequest->GetOperation( OperationId_, @@ -213,7 +213,7 @@ void TOperationPreparer::LockFiles(TVector<TRichYPath>* paths) TVector<::NThreading::TFuture<TLockId>> lockIdFutures; lockIdFutures.reserve(paths->size()); - NRawClient::TRawBatchRequest lockRequest(GetContext().Config); + NRawClient::THttpRawBatchRequest lockRequest(GetContext().Config); for (const auto& path : *paths) { lockIdFutures.push_back(lockRequest.Lock( FileTransaction_->GetId(), @@ -225,7 +225,7 @@ void TOperationPreparer::LockFiles(TVector<TRichYPath>* paths) TVector<::NThreading::TFuture<TNode>> nodeIdFutures; nodeIdFutures.reserve(paths->size()); - NRawClient::TRawBatchRequest getNodeIdRequest(GetContext().Config); + NRawClient::THttpRawBatchRequest getNodeIdRequest(GetContext().Config); for (const auto& lockIdFuture : lockIdFutures) { nodeIdFutures.push_back(getNodeIdRequest.Get( FileTransaction_->GetId(), diff --git a/yt/cpp/mapreduce/client/prepare_operation.cpp b/yt/cpp/mapreduce/client/prepare_operation.cpp index 54ed095cc4..83695ef1e8 100644 --- a/yt/cpp/mapreduce/client/prepare_operation.cpp +++ b/yt/cpp/mapreduce/client/prepare_operation.cpp @@ -77,7 +77,7 @@ int TOperationPreparationContext::GetOutputCount() const const TVector<TTableSchema>& TOperationPreparationContext::GetInputSchemas() const { TVector<::NThreading::TFuture<TNode>> schemaFutures; - NRawClient::TRawBatchRequest batch(Context_.Config); + NRawClient::THttpRawBatchRequest batch(Context_.Config); for (int tableIndex = 0; tableIndex < static_cast<int>(InputSchemas_.size()); ++tableIndex) { if (InputSchemasLoaded_[tableIndex]) { schemaFutures.emplace_back(); diff --git a/yt/cpp/mapreduce/client/skiff.cpp b/yt/cpp/mapreduce/client/skiff.cpp index 480ee4ef66..499a1308fd 100644 --- a/yt/cpp/mapreduce/client/skiff.cpp +++ b/yt/cpp/mapreduce/client/skiff.cpp @@ -307,7 +307,7 @@ NSkiff::TSkiffSchemaPtr CreateSkiffSchemaIfNecessary( clientRetryPolicy->CreatePolicyForGenericRequest(), context, NRawClient::CanonizeYPaths(clientRetryPolicy->CreatePolicyForGenericRequest(), context, tablePaths), - [&] (TRawBatchRequest& batch, const TRichYPath& path) { + [&] (THttpRawBatchRequest& batch, const TRichYPath& path) { auto getOptions = TGetOptions() .AttributeFilter( TAttributeFilter() diff --git a/yt/cpp/mapreduce/client/yt_poller.cpp b/yt/cpp/mapreduce/client/yt_poller.cpp index b67d07beb8..13670fddb5 100644 --- a/yt/cpp/mapreduce/client/yt_poller.cpp +++ b/yt/cpp/mapreduce/client/yt_poller.cpp @@ -92,7 +92,7 @@ void TYtPoller::WatchLoop() Y_ABORT_UNLESS(!InProgress_.empty()); } - TRawBatchRequest rawBatchRequest(Context_.Config); + THttpRawBatchRequest rawBatchRequest(Context_.Config); for (auto& item : InProgress_) { item->PrepareRequest(&rawBatchRequest); diff --git a/yt/cpp/mapreduce/client/yt_poller.h b/yt/cpp/mapreduce/client/yt_poller.h index 4f4e9eb7ab..fe9979a6a9 100644 --- a/yt/cpp/mapreduce/client/yt_poller.h +++ b/yt/cpp/mapreduce/client/yt_poller.h @@ -16,7 +16,7 @@ namespace NYT { namespace NDetail { namespace NRawClient { - class TRawBatchRequest; + class THttpRawBatchRequest; } //////////////////////////////////////////////////////////////////////////////// @@ -33,7 +33,7 @@ public: public: virtual ~IYtPollerItem() = default; - virtual void PrepareRequest(NRawClient::TRawBatchRequest* batchRequest) = 0; + virtual void PrepareRequest(NRawClient::THttpRawBatchRequest* batchRequest) = 0; // Should return PollContinue if poller should continue polling this item. // Should return PollBreak if poller should stop polling this item. diff --git a/yt/cpp/mapreduce/raw_client/raw_batch_request.cpp b/yt/cpp/mapreduce/raw_client/raw_batch_request.cpp index 12623cf57e..1a340b8c17 100644 --- a/yt/cpp/mapreduce/raw_client/raw_batch_request.cpp +++ b/yt/cpp/mapreduce/raw_client/raw_batch_request.cpp @@ -64,7 +64,7 @@ static void EnsureType(const TMaybe<TNode>& node, TNode::EType type) template <typename TReturnType> class TResponseParserBase - : public TRawBatchRequest::IResponseItemParser + : public THttpRawBatchRequest::IResponseItemParser { public: using TFutureResult = TFuture<TReturnType>; @@ -271,13 +271,13 @@ public: //////////////////////////////////////////////////////////////////////////////// -TRawBatchRequest::TBatchItem::TBatchItem(TNode parameters, ::TIntrusivePtr<IResponseItemParser> responseParser) +THttpRawBatchRequest::TBatchItem::TBatchItem(TNode parameters, ::TIntrusivePtr<IResponseItemParser> responseParser) : Parameters(std::move(parameters)) , ResponseParser(std::move(responseParser)) , NextTry() { } -TRawBatchRequest::TBatchItem::TBatchItem(const TBatchItem& batchItem, TInstant nextTry) +THttpRawBatchRequest::TBatchItem::TBatchItem(const TBatchItem& batchItem, TInstant nextTry) : Parameters(batchItem.Parameters) , ResponseParser(batchItem.ResponseParser) , NextTry(nextTry) @@ -285,13 +285,13 @@ TRawBatchRequest::TBatchItem::TBatchItem(const TBatchItem& batchItem, TInstant n //////////////////////////////////////////////////////////////////////////////// -TRawBatchRequest::TRawBatchRequest(const TConfigPtr& config) +THttpRawBatchRequest::THttpRawBatchRequest(const TConfigPtr& config) : Config_(config) { } -TRawBatchRequest::~TRawBatchRequest() = default; +THttpRawBatchRequest::~THttpRawBatchRequest() = default; -void TRawBatchRequest::ExecuteBatch( +void THttpRawBatchRequest::ExecuteBatch( IRequestRetryPolicyPtr retryPolicy, const TClientContext& context, const TExecuteBatchOptions& options) @@ -341,18 +341,18 @@ void TRawBatchRequest::ExecuteBatch( } } -bool TRawBatchRequest::IsExecuted() const +bool THttpRawBatchRequest::IsExecuted() const { return Executed_; } -void TRawBatchRequest::MarkExecuted() +void THttpRawBatchRequest::MarkExecuted() { Executed_ = true; } template <typename TResponseParser> -typename TResponseParser::TFutureResult TRawBatchRequest::AddRequest( +typename TResponseParser::TFutureResult THttpRawBatchRequest::AddRequest( const TString& command, TNode parameters, TMaybe<TNode> input) @@ -361,7 +361,7 @@ typename TResponseParser::TFutureResult TRawBatchRequest::AddRequest( } template <typename TResponseParser> -typename TResponseParser::TFutureResult TRawBatchRequest::AddRequest( +typename TResponseParser::TFutureResult THttpRawBatchRequest::AddRequest( const TString& command, TNode parameters, TMaybe<TNode> input, @@ -378,13 +378,13 @@ typename TResponseParser::TFutureResult TRawBatchRequest::AddRequest( return parser->GetFuture(); } -void TRawBatchRequest::AddRequest(TBatchItem batchItem) +void THttpRawBatchRequest::AddRequest(TBatchItem batchItem) { Y_ENSURE(!Executed_, "Cannot add request: batch request is already executed"); BatchItemList_.push_back(batchItem); } -TFuture<TNodeId> TRawBatchRequest::Create( +TFuture<TNodeId> THttpRawBatchRequest::Create( const TTransactionId& transaction, const TYPath& path, ENodeType type, @@ -396,7 +396,7 @@ TFuture<TNodeId> TRawBatchRequest::Create( Nothing()); } -TFuture<void> TRawBatchRequest::Remove( +TFuture<void> THttpRawBatchRequest::Remove( const TTransactionId& transaction, const TYPath& path, const TRemoveOptions& options) @@ -407,7 +407,7 @@ TFuture<void> TRawBatchRequest::Remove( Nothing()); } -TFuture<bool> TRawBatchRequest::Exists( +TFuture<bool> THttpRawBatchRequest::Exists( const TTransactionId& transaction, const TYPath& path, const TExistsOptions& options) @@ -418,7 +418,7 @@ TFuture<bool> TRawBatchRequest::Exists( Nothing()); } -TFuture<TNode> TRawBatchRequest::Get( +TFuture<TNode> THttpRawBatchRequest::Get( const TTransactionId& transaction, const TYPath& path, const TGetOptions& options) @@ -429,7 +429,7 @@ TFuture<TNode> TRawBatchRequest::Get( Nothing()); } -TFuture<void> TRawBatchRequest::Set( +TFuture<void> THttpRawBatchRequest::Set( const TTransactionId& transaction, const TYPath& path, const TNode& node, @@ -441,7 +441,7 @@ TFuture<void> TRawBatchRequest::Set( node); } -TFuture<TNode::TListType> TRawBatchRequest::List( +TFuture<TNode::TListType> THttpRawBatchRequest::List( const TTransactionId& transaction, const TYPath& path, const TListOptions& options) @@ -452,7 +452,7 @@ TFuture<TNode::TListType> TRawBatchRequest::List( Nothing()); } -TFuture<TNodeId> TRawBatchRequest::Copy( +TFuture<TNodeId> THttpRawBatchRequest::Copy( const TTransactionId& transaction, const TYPath& sourcePath, const TYPath& destinationPath, @@ -464,7 +464,7 @@ TFuture<TNodeId> TRawBatchRequest::Copy( Nothing()); } -TFuture<TNodeId> TRawBatchRequest::Move( +TFuture<TNodeId> THttpRawBatchRequest::Move( const TTransactionId& transaction, const TYPath& sourcePath, const TYPath& destinationPath, @@ -476,7 +476,7 @@ TFuture<TNodeId> TRawBatchRequest::Move( Nothing()); } -TFuture<TNodeId> TRawBatchRequest::Link( +TFuture<TNodeId> THttpRawBatchRequest::Link( const TTransactionId& transaction, const TYPath& targetPath, const TYPath& linkPath, @@ -488,7 +488,7 @@ TFuture<TNodeId> TRawBatchRequest::Link( Nothing()); } -TFuture<TLockId> TRawBatchRequest::Lock( +TFuture<TLockId> THttpRawBatchRequest::Lock( const TTransactionId& transaction, const TYPath& path, ELockMode mode, @@ -500,7 +500,7 @@ TFuture<TLockId> TRawBatchRequest::Lock( Nothing()); } -TFuture<void> TRawBatchRequest::Unlock( +TFuture<void> THttpRawBatchRequest::Unlock( const TTransactionId& transaction, const TYPath& path, const TUnlockOptions& options) @@ -511,7 +511,7 @@ TFuture<void> TRawBatchRequest::Unlock( Nothing()); } -TFuture<TMaybe<TYPath>> TRawBatchRequest::GetFileFromCache( +TFuture<TMaybe<TYPath>> THttpRawBatchRequest::GetFileFromCache( const TTransactionId& transactionId, const TString& md5Signature, const TYPath& cachePath, @@ -523,7 +523,7 @@ TFuture<TMaybe<TYPath>> TRawBatchRequest::GetFileFromCache( Nothing()); } -TFuture<TYPath> TRawBatchRequest::PutFileToCache( +TFuture<TYPath> THttpRawBatchRequest::PutFileToCache( const TTransactionId& transactionId, const TYPath& filePath, const TString& md5Signature, @@ -536,7 +536,7 @@ TFuture<TYPath> TRawBatchRequest::PutFileToCache( Nothing()); } -TFuture<TCheckPermissionResponse> TRawBatchRequest::CheckPermission( +TFuture<TCheckPermissionResponse> THttpRawBatchRequest::CheckPermission( const TString& user, EPermission permission, const TYPath& path, @@ -548,7 +548,7 @@ TFuture<TCheckPermissionResponse> TRawBatchRequest::CheckPermission( Nothing()); } -TFuture<TOperationAttributes> TRawBatchRequest::GetOperation( +TFuture<TOperationAttributes> THttpRawBatchRequest::GetOperation( const TOperationId& operationId, const TGetOperationOptions& options) { @@ -558,7 +558,7 @@ TFuture<TOperationAttributes> TRawBatchRequest::GetOperation( Nothing()); } -TFuture<void> TRawBatchRequest::AbortOperation(const TOperationId& operationId) +TFuture<void> THttpRawBatchRequest::AbortOperation(const TOperationId& operationId) { return AddRequest<TVoidResponseParser>( "abort_op", @@ -566,14 +566,14 @@ TFuture<void> TRawBatchRequest::AbortOperation(const TOperationId& operationId) Nothing()); } -TFuture<void> TRawBatchRequest::CompleteOperation(const TOperationId& operationId) +TFuture<void> THttpRawBatchRequest::CompleteOperation(const TOperationId& operationId) { return AddRequest<TVoidResponseParser>( "complete_op", SerializeParamsForCompleteOperation(operationId), Nothing()); } -TFuture<void> TRawBatchRequest::SuspendOperation( +TFuture<void> THttpRawBatchRequest::SuspendOperation( const TOperationId& operationId, const TSuspendOperationOptions& options) { @@ -582,7 +582,7 @@ TFuture<void> TRawBatchRequest::SuspendOperation( SerializeParamsForSuspendOperation(operationId, options), Nothing()); } -TFuture<void> TRawBatchRequest::ResumeOperation( +TFuture<void> THttpRawBatchRequest::ResumeOperation( const TOperationId& operationId, const TResumeOperationOptions& options) { @@ -592,7 +592,7 @@ TFuture<void> TRawBatchRequest::ResumeOperation( Nothing()); } -TFuture<void> TRawBatchRequest::UpdateOperationParameters( +TFuture<void> THttpRawBatchRequest::UpdateOperationParameters( const TOperationId& operationId, const TUpdateOperationParametersOptions& options) { @@ -602,7 +602,7 @@ TFuture<void> TRawBatchRequest::UpdateOperationParameters( Nothing()); } -TFuture<TRichYPath> TRawBatchRequest::CanonizeYPath(const TRichYPath& path) +TFuture<TRichYPath> THttpRawBatchRequest::CanonizeYPath(const TRichYPath& path) { TRichYPath result = path; // Out of the symbols in the canonization branch below, only '<' can appear in the beggining of a valid rich YPath. @@ -620,7 +620,7 @@ TFuture<TRichYPath> TRawBatchRequest::CanonizeYPath(const TRichYPath& path) return NThreading::MakeFuture(result); } -TFuture<TVector<TTableColumnarStatistics>> TRawBatchRequest::GetTableColumnarStatistics( +TFuture<TVector<TTableColumnarStatistics>> THttpRawBatchRequest::GetTableColumnarStatistics( const TTransactionId& transaction, const TVector<TRichYPath>& paths, const TGetTableColumnarStatisticsOptions& options) @@ -631,7 +631,7 @@ TFuture<TVector<TTableColumnarStatistics>> TRawBatchRequest::GetTableColumnarSta Nothing()); } -TFuture<TMultiTablePartitions> TRawBatchRequest::GetTablePartitions( +TFuture<TMultiTablePartitions> THttpRawBatchRequest::GetTablePartitions( const TTransactionId& transaction, const TVector<TRichYPath>& paths, const TGetTablePartitionsOptions& options) @@ -642,7 +642,7 @@ TFuture<TMultiTablePartitions> TRawBatchRequest::GetTablePartitions( Nothing()); } -void TRawBatchRequest::FillParameterList(size_t maxSize, TNode* result, TInstant* nextTry) const +void THttpRawBatchRequest::FillParameterList(size_t maxSize, TNode* result, TInstant* nextTry) const { Y_ABORT_UNLESS(result); Y_ABORT_UNLESS(nextTry); @@ -661,7 +661,7 @@ void TRawBatchRequest::FillParameterList(size_t maxSize, TNode* result, TInstant } } -void TRawBatchRequest::ParseResponse( +void THttpRawBatchRequest::ParseResponse( const TResponseInfo& requestResult, const IRequestRetryPolicyPtr& retryPolicy, TInstant now) @@ -670,7 +670,7 @@ void TRawBatchRequest::ParseResponse( return ParseResponse(node, requestResult.RequestId, retryPolicy, now); } -void TRawBatchRequest::ParseResponse( +void THttpRawBatchRequest::ParseResponse( TNode node, const TString& requestId, const IRequestRetryPolicyPtr& retryPolicy, @@ -721,14 +721,14 @@ void TRawBatchRequest::ParseResponse( BatchItemList_.erase(BatchItemList_.begin(), BatchItemList_.begin() + size); } -void TRawBatchRequest::SetErrorResult(std::exception_ptr e) const +void THttpRawBatchRequest::SetErrorResult(std::exception_ptr e) const { for (const auto& batchItem : BatchItemList_) { batchItem.ResponseParser->SetException(e); } } -size_t TRawBatchRequest::BatchSize() const +size_t THttpRawBatchRequest::BatchSize() const { return BatchItemList_.size(); } diff --git a/yt/cpp/mapreduce/raw_client/raw_batch_request.h b/yt/cpp/mapreduce/raw_client/raw_batch_request.h index e5126c6438..670b97a843 100644 --- a/yt/cpp/mapreduce/raw_client/raw_batch_request.h +++ b/yt/cpp/mapreduce/raw_client/raw_batch_request.h @@ -24,7 +24,7 @@ namespace NYT::NDetail::NRawClient { //////////////////////////////////////////////////////////////////////////////// -class TRawBatchRequest +class THttpRawBatchRequest : public TThrRefBase { public: @@ -38,8 +38,8 @@ public: }; public: - TRawBatchRequest(const TConfigPtr& config); - ~TRawBatchRequest(); + THttpRawBatchRequest(const TConfigPtr& config); + ~THttpRawBatchRequest(); void ExecuteBatch( IRequestRetryPolicyPtr retryPolicy, diff --git a/yt/cpp/mapreduce/raw_client/raw_requests.cpp b/yt/cpp/mapreduce/raw_client/raw_requests.cpp index 462cf84b41..fd5c59ec20 100644 --- a/yt/cpp/mapreduce/raw_client/raw_requests.cpp +++ b/yt/cpp/mapreduce/raw_client/raw_requests.cpp @@ -265,7 +265,7 @@ TVector<TRichYPath> CanonizeYPaths( const TClientContext& context, const TVector<TRichYPath>& paths) { - TRawBatchRequest batch(context.Config); + THttpRawBatchRequest batch(context.Config); TVector<NThreading::TFuture<TRichYPath>> futures; futures.reserve(paths.size()); for (int i = 0; i < static_cast<int>(paths.size()); ++i) { diff --git a/yt/cpp/mapreduce/raw_client/raw_requests.h b/yt/cpp/mapreduce/raw_client/raw_requests.h index 360ea0aba1..860d4ae939 100644 --- a/yt/cpp/mapreduce/raw_client/raw_requests.h +++ b/yt/cpp/mapreduce/raw_client/raw_requests.h @@ -59,7 +59,7 @@ auto BatchTransform( TBatchAdder batchAdder, const TExecuteBatchOptions& executeBatchOptions = {}) { - TRawBatchRequest batch(context.Config); + THttpRawBatchRequest batch(context.Config); using TFuture = decltype(batchAdder(batch, *std::begin(src))); TVector<TFuture> futures; for (const auto& el : src) { diff --git a/yt/cpp/mapreduce/raw_client/ut/raw_batch_request_ut.cpp b/yt/cpp/mapreduce/raw_client/ut/raw_batch_request_ut.cpp index 7c9b1b9670..36a6935e82 100644 --- a/yt/cpp/mapreduce/raw_client/ut/raw_batch_request_ut.cpp +++ b/yt/cpp/mapreduce/raw_client/ut/raw_batch_request_ut.cpp @@ -73,7 +73,7 @@ TVector<TString> GetAllPathsFromRequestList(const TNode& requestList) TEST(TBatchRequestImplTest, ParseResponse) { TClientContext context; - TRawBatchRequest batchRequest(context.Config); + THttpRawBatchRequest batchRequest(context.Config); EXPECT_EQ(batchRequest.BatchSize(), 0u); |