YT-23616: Make THttpRawBatchRequest as an implementation of IRawBatchRequest interface

commit_hash:9e6c556686dda1562697762d38da532dc5c87b80

1 files changed, 55 insertions, 33 deletions

diff --git a/yt/cpp/mapreduce/raw_client/raw_batch_request.h b/yt/cpp/mapreduce/raw_client/raw_batch_request.h
index 670b97a843..2af0e31305 100644
--- a/yt/cpp/mapreduce/raw_client/raw_batch_request.h
+++ b/yt/cpp/mapreduce/raw_client/raw_batch_request.h
@@ -2,13 +2,14 @@
 
 #include <yt/cpp/mapreduce/common/fwd.h>
 
-#include <yt/cpp/mapreduce/interface/batch_request.h>
+#include <yt/cpp/mapreduce/http/context.h>
+#include <yt/cpp/mapreduce/http/requests.h>
+
 #include <yt/cpp/mapreduce/interface/fwd.h>
 #include <yt/cpp/mapreduce/interface/node.h>
+#include <yt/cpp/mapreduce/interface/raw_batch_request.h>
 #include <yt/cpp/mapreduce/interface/retry_policy.h>
 
-#include <yt/cpp/mapreduce/http/requests.h>
-
 #include <library/cpp/threading/future/future.h>
 
 #include <util/generic/ptr.h>
@@ -25,7 +26,7 @@ namespace NYT::NDetail::NRawClient {
 ////////////////////////////////////////////////////////////////////////////////
 
 class THttpRawBatchRequest
-    : public TThrRefBase
+    : public IRawBatchRequest
 {
 public:
     struct IResponseItemParser
@@ -38,13 +39,10 @@ public:
     };
 
 public:
-    THttpRawBatchRequest(const TConfigPtr& config);
+    THttpRawBatchRequest(const TClientContext& context, IRequestRetryPolicyPtr retryPolicy);
     ~THttpRawBatchRequest();
 
-    void ExecuteBatch(
-        IRequestRetryPolicyPtr retryPolicy,
-        const TClientContext& context,
-        const TExecuteBatchOptions& options = {});
+    void ExecuteBatch(const TExecuteBatchOptions& options = {}) override;
 
     bool IsExecuted() const;
     void MarkExecuted();
@@ -68,91 +66,113 @@ public:
         const TTransactionId& transaction,
         const TYPath& path,
         ENodeType type,
-        const TCreateOptions& options);
+        const TCreateOptions& options = {}) override;
+
     ::NThreading::TFuture<void> Remove(
         const TTransactionId& transaction,
         const TYPath& path,
-        const TRemoveOptions& options);
+        const TRemoveOptions& options = {}) override;
+
     ::NThreading::TFuture<bool> Exists(
         const TTransactionId& transaction,
         const TYPath& path,
-        const TExistsOptions& options);
+        const TExistsOptions& options = {}) override;
+
     ::NThreading::TFuture<TNode> Get(
         const TTransactionId& transaction,
         const TYPath& path,
-        const TGetOptions& options);
+        const TGetOptions& options = {}) override;
+
     ::NThreading::TFuture<void> Set(
         const TTransactionId& transaction,
         const TYPath& path,
         const TNode& value,
-        const TSetOptions& options);
+        const TSetOptions& options = {}) override;
+
     ::NThreading::TFuture<TNode::TListType> List(
         const TTransactionId& transaction,
         const TYPath& path,
-        const TListOptions& options);
+        const TListOptions& options = {}) override;
+
     ::NThreading::TFuture<TNodeId> Copy(
         const TTransactionId& transaction,
         const TYPath& sourcePath,
         const TYPath& destinationPath,
-        const TCopyOptions& options);
+        const TCopyOptions& options = {}) override;
+
     ::NThreading::TFuture<TNodeId> Move(
         const TTransactionId& transaction,
         const TYPath& sourcePath,
         const TYPath& destinationPath,
-        const TMoveOptions& options);
+        const TMoveOptions& options = {}) override;
+
     ::NThreading::TFuture<TNodeId> Link(
         const TTransactionId& transaction,
         const TYPath& targetPath,
         const TYPath& linkPath,
-        const TLinkOptions& options);
+        const TLinkOptions& options = {}) override;
+
     ::NThreading::TFuture<TLockId> Lock(
         const TTransactionId& transaction,
         const TYPath& path,
         ELockMode mode,
-        const TLockOptions& options);
+        const TLockOptions& options = {}) override;
+
     ::NThreading::TFuture<void> Unlock(
         const TTransactionId& transaction,
         const TYPath& path,
-        const TUnlockOptions& options);
+        const TUnlockOptions& options = {}) override;
+
     ::NThreading::TFuture<TMaybe<TYPath>> GetFileFromCache(
         const TTransactionId& transactionId,
         const TString& md5Signature,
         const TYPath& cachePath,
-        const TGetFileFromCacheOptions& options);
+        const TGetFileFromCacheOptions& options = {}) override;
+
     ::NThreading::TFuture<TYPath> PutFileToCache(
         const TTransactionId& transactionId,
         const TYPath& filePath,
         const TString& md5Signature,
         const TYPath& cachePath,
-        const TPutFileToCacheOptions& options);
+        const TPutFileToCacheOptions& options = {}) override;
+
     ::NThreading::TFuture<TCheckPermissionResponse> CheckPermission(
         const TString& user,
         EPermission permission,
         const TYPath& path,
-        const TCheckPermissionOptions& options);
+        const TCheckPermissionOptions& options = {}) override;
+
     ::NThreading::TFuture<TOperationAttributes> GetOperation(
         const TOperationId& operationId,
-        const TGetOperationOptions& options);
-    ::NThreading::TFuture<void> AbortOperation(const TOperationId& operationId);
-    ::NThreading::TFuture<void> CompleteOperation(const TOperationId& operationId);
+        const TGetOperationOptions& options = {}) override;
+
+    ::NThreading::TFuture<void> AbortOperation(const TOperationId& operationId) override;
+
+    ::NThreading::TFuture<void> CompleteOperation(const TOperationId& operationId) override;
+
     ::NThreading::TFuture<void> SuspendOperation(
         const TOperationId& operationId,
-        const TSuspendOperationOptions& options);
+        const TSuspendOperationOptions& options = {}) override;
+
     ::NThreading::TFuture<void> ResumeOperation(
         const TOperationId& operationId,
-        const TResumeOperationOptions& options);
+        const TResumeOperationOptions& options = {}) override;
+
     ::NThreading::TFuture<void> UpdateOperationParameters(
         const TOperationId& operationId,
-        const TUpdateOperationParametersOptions& options);
-    ::NThreading::TFuture<TRichYPath> CanonizeYPath(const TRichYPath& path);
+        const TUpdateOperationParametersOptions& options = {}) override;
+
+    ::NThreading::TFuture<TRichYPath> CanonizeYPath(const TRichYPath& path) override;
+
     ::NThreading::TFuture<TVector<TTableColumnarStatistics>> GetTableColumnarStatistics(
         const TTransactionId& transaction,
         const TVector<TRichYPath>& paths,
-        const TGetTableColumnarStatisticsOptions& options);
+        const TGetTableColumnarStatisticsOptions& options = {}) override;
+
     ::NThreading::TFuture<TMultiTablePartitions> GetTablePartitions(
         const TTransactionId& transaction,
         const TVector<TRichYPath>& paths,
-        const TGetTablePartitionsOptions& options);
+        const TGetTablePartitionsOptions& options = {}) override;
 
 private:
     struct TBatchItem {
@@ -182,7 +202,9 @@ private:
     void AddRequest(TBatchItem batchItem);
 
 private:
-    TConfigPtr Config_;
+    const TClientContext Context_;
+
+    IRequestRetryPolicyPtr RequestRetryPolicy_;
 
     TDeque<TBatchItem> BatchItemList_;
     bool Executed_ = false;