Skip to content

Commit 100be08

Browse files
committed
Intermediate changes
commit_hash:47d15bf707b7690ccf2e8cbcc47f096af078abba
1 parent 4004640 commit 100be08

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

yt/yql/providers/yt/fmr/fmr_tool_lib/yql_yt_fmr_initializer.cpp

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,8 @@ std::pair<IYtGateway::TPtr, IFmrWorker::TPtr> InitializeFmrGateway(IYtGateway::T
2222
tableDataService = MakeTableDataServiceClient(tableDataServiceDiscovery);
2323
}
2424

25-
IFmrGcService::TPtr gcService = MakeGcService(tableDataService);
25+
IFmrCoordinator::TPtr coordinator;
2626

27-
auto coordinator = MakeFmrCoordinator(coordinatorSettings, fmrServices->YtCoordinatorService, gcService);
2827
if (!coordinatorServerUrl.empty()) {
2928
TFmrCoordinatorClientSettings coordinatorClientSettings;
3029
THttpURL parsedUrl;
@@ -34,6 +33,10 @@ std::pair<IYtGateway::TPtr, IFmrWorker::TPtr> InitializeFmrGateway(IYtGateway::T
3433
coordinatorClientSettings.Port = parsedUrl.GetPort();
3534
coordinatorClientSettings.Host = parsedUrl.GetHost();
3635
coordinator = MakeFmrCoordinatorClient(coordinatorClientSettings);
36+
} else {
37+
// creating local coordinator since url was not passed via services
38+
IFmrGcService::TPtr gcService = MakeGcService(tableDataService);
39+
coordinator = MakeFmrCoordinator(coordinatorSettings, fmrServices->YtCoordinatorService, gcService);
3740
}
3841

3942
IFmrWorker::TPtr worker = nullptr;

yt/yt/core/yson/unittests/protobuf_yson_schema_ut.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ TEST(TProtobufYsonSchemaTest, WriteMessageSchema)
5656

5757
EXPECT_TRUE(AreNodesEqual(actualNode, expectedNode))
5858
<< "Expected: " << ConvertToYsonString(expectedNode, EYsonFormat::Pretty).AsStringBuf() << "\n\n"
59-
<< "Actual: " << ConvertToYsonString(actualNode, EYsonFormat::Text).AsStringBuf() << "\n\n";
59+
<< "Actual: " << ConvertToYsonString(actualNode, EYsonFormat::Pretty).AsStringBuf() << "\n\n";
6060
}
6161

6262
TEST(TProtobufYsonSchemaTest, CamelCaseNames)

0 commit comments

Comments
 (0)