Skip to content

Commit 8b363a0

Browse files
committed
Intermediate changes
commit_hash:d8d82bf12a346219a4f7637796a6d71aab5fda3c
1 parent 749393b commit 8b363a0

26 files changed

+444
-44
lines changed

yt/yql/providers/yt/fmr/coordinator/impl/ut/yql_yt_coordinator_ut.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#include <yt/yql/providers/yt/fmr/job_factory/impl/yql_yt_job_factory_impl.h>
99
#include <yt/yql/providers/yt/fmr/worker/impl/yql_yt_worker_impl.h>
1010

11-
namespace NYql {
11+
namespace NYql::NFmr {
1212

1313
class TFmrWorkerProxy: public IFmrWorker {
1414
public:
@@ -311,4 +311,4 @@ Y_UNIT_TEST_SUITE(FmrCoordinatorTests) {
311311
}
312312
}
313313

314-
} // namspace NYql
314+
} // namespace NYql::NFmr

yt/yql/providers/yt/fmr/coordinator/impl/yql_yt_coordinator_impl.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#include <yql/essentials/utils/yql_panic.h>
44
#include "yql_yt_coordinator_impl.h"
55

6-
namespace NYql {
6+
namespace NYql::NFmr {
77

88
namespace {
99

@@ -243,4 +243,4 @@ IFmrCoordinator::TPtr MakeFmrCoordinator(const TFmrCoordinatorSettings& settings
243243
return MakeIntrusive<TFmrCoordinator>(settings);
244244
}
245245

246-
} // namespace NYql
246+
} // namespace NYql::NFmr

yt/yql/providers/yt/fmr/coordinator/impl/yql_yt_coordinator_impl.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#include <util/generic/queue.h>
55
#include <yt/yql/providers/yt/fmr/coordinator/interface/yql_yt_coordinator.h>
66

7-
namespace NYql {
7+
namespace NYql::NFmr {
88

99
struct TFmrCoordinatorSettings {
1010
ui32 WorkersNum; // Not supported yet
@@ -15,4 +15,4 @@ struct TFmrCoordinatorSettings {
1515

1616
IFmrCoordinator::TPtr MakeFmrCoordinator(const TFmrCoordinatorSettings& settings = {.WorkersNum = 1, .RandomProvider = CreateDeterministicRandomProvider(2)});
1717

18-
} // namspace NYql
18+
} // namespace NYql::NFmr

yt/yql/providers/yt/fmr/coordinator/interface/yql_yt_coordinator.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
#include <yt/yql/providers/yt/fmr/request_options/yql_yt_request_options.h>
77

8-
namespace NYql {
8+
namespace NYql::NFmr {
99

1010
struct THeartbeatRequest {
1111
ui32 WorkerId;
@@ -65,4 +65,4 @@ class IFmrCoordinator: public TThrRefBase {
6565
virtual NThreading::TFuture<THeartbeatResponse> SendHeartbeatResponse(const THeartbeatRequest& request) = 0;
6666
};
6767

68-
} // namspace NYql
68+
} // namespace NYql::NFmr

yt/yql/providers/yt/fmr/job_factory/impl/ut/ya.make

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ SRCS(
55
)
66

77
PEERDIR(
8-
library/cpp/yt/assert
98
yt/yql/providers/yt/fmr/job_factory/interface
109
yt/yql/providers/yt/fmr/job_factory/impl
1110
)

yt/yql/providers/yt/fmr/job_factory/impl/ut/yql_yt_job_factory_ut.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#include <yt/yql/providers/yt/fmr/job_factory/impl/yql_yt_job_factory_impl.h>
88
#include <yt/yql/providers/yt/fmr/coordinator/interface/yql_yt_coordinator.h>
99

10-
namespace NYql {
10+
namespace NYql::NFmr {
1111

1212
Y_UNIT_TEST_SUITE(FmrFactoryTests) {
1313
Y_UNIT_TEST(GetSuccessfulTaskResult) {
@@ -61,4 +61,4 @@ Y_UNIT_TEST_SUITE(FmrFactoryTests) {
6161
}
6262
}
6363

64-
} // namspace NYql
64+
} // namespace NYql::NFmr

yt/yql/providers/yt/fmr/job_factory/impl/yql_yt_job_factory_impl.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#include <yql/essentials/utils/log/log.h>
33
#include <yt/yql/providers/yt/fmr/job_factory/impl/yql_yt_job_factory_impl.h>
44

5-
namespace NYql {
5+
namespace NYql::NFmr {
66

77
class TFmrJobFactory: public IFmrJobFactory {
88
public:
@@ -59,4 +59,4 @@ TFmrJobFactory::TPtr MakeFmrJobFactory(const TFmrJobFactorySettings& settings) {
5959
return MakeIntrusive<TFmrJobFactory>(settings);
6060
}
6161

62-
} // namespace NYql
62+
} // namespace NYql::NFmr

yt/yql/providers/yt/fmr/job_factory/impl/yql_yt_job_factory_impl.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#include <util/thread/pool.h>
55
#include <yt/yql/providers/yt/fmr/job_factory/interface/yql_yt_job_factory.h>
66

7-
namespace NYql {
7+
namespace NYql::NFmr {
88

99
struct TFmrJobFactorySettings {
1010
ui32 NumThreads = 3;
@@ -13,4 +13,4 @@ struct TFmrJobFactorySettings {
1313

1414
IFmrJobFactory::TPtr MakeFmrJobFactory(const TFmrJobFactorySettings& settings);
1515

16-
} // namepspace NYql
16+
} // namespace NYql::NFmr

yt/yql/providers/yt/fmr/job_factory/interface/yql_yt_job_factory.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#include <library/cpp/threading/future/core/future.h>
44
#include <yt/yql/providers/yt/fmr/request_options/yql_yt_request_options.h>
55

6-
namespace NYql {
6+
namespace NYql::NFmr {
77

88
class IFmrJobFactory: public TThrRefBase {
99
public:
@@ -14,4 +14,4 @@ class IFmrJobFactory: public TThrRefBase {
1414
virtual NThreading::TFuture<TTaskResult::TPtr> StartJob(TTask::TPtr task, std::shared_ptr<std::atomic<bool>> cancelFlag) = 0;
1515
};
1616

17-
} // namspace NYql
17+
} // namespace NYql::NFmr
Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
syntax = "proto3";
2+
3+
package NYql.NFmr.NProto;
4+
5+
import "yt/yql/providers/yt/fmr/proto/request_options.proto";
6+
7+
message THeartbeatRequest {
8+
uint32 WorkerId = 1;
9+
string VolatileId = 2;
10+
repeated TTaskState TaskStates = 3;
11+
TStatistics Statistics = 4;
12+
}
13+
14+
message THeartbeatResponse {
15+
repeated TTask TasksToRun = 1;
16+
repeated string TaskToDeleteIds = 2;
17+
}
18+
19+
message TStartOperationRequest {
20+
ETaskType TaskType = 1;
21+
TTaskParams TaskParams = 2;
22+
string SessionId = 3;
23+
optional string IdempotencyKey = 4;
24+
uint32 NumRetries = 5;
25+
}
26+
27+
message TStartOperationResponse {
28+
EOperationStatus Status = 1;
29+
string OperationId = 2;
30+
}
31+
32+
message TGetOperationRequest {
33+
string OperationId = 1;
34+
}
35+
36+
message TGetOperationResponse {
37+
EOperationStatus Status = 1;
38+
repeated TFmrError ErrorMessages = 2;
39+
}
40+
41+
message TDeleteOperationRequest {
42+
string OperationId = 1;
43+
}
44+
45+
message TDeleteOperationResponse {
46+
EOperationStatus Status = 1;
47+
}

0 commit comments

Comments
 (0)