QPlayer

MrLolthe1st · MrLolthe1st · commit 688f2423b274 · 2025-04-15T23:08:21.000+03:00
commit_hash:0ffee3044bdfd32fd3c7a9cde9209384b7ee9d09
diff --git a/yql/essentials/core/facade/yql_facade.cpp b/yql/essentials/core/facade/yql_facade.cpp
@@ -389,7 +389,7 @@ TProgram::TProgram(
             if (item) {
                 YQL_ENSURE(LoadedGatewaysConfig_.ParseFromString(item->Value));
                 if (GatewaysForMerge_) {
-                    YQL_ENSURE(NProtoBuf::TextFormat::ParseFromString(*GatewaysForMerge_, &LoadedGatewaysConfig_));
+                    YQL_ENSURE(NProtoBuf::TextFormat::MergeFromString(*GatewaysForMerge_, &LoadedGatewaysConfig_));
                 }
                 THashMap<TString, TString> clusterMapping;
                 GetClusterMappingFromGateways(LoadedGatewaysConfig_, clusterMapping);

Original file line number	Diff line number	Diff line change
`@@ -389,7 +389,7 @@ TProgram::TProgram(`
`389`	`389`	`if (item) {`
`390`	`390`	`YQL_ENSURE(LoadedGatewaysConfig_.ParseFromString(item->Value));`
`391`	`391`	`if (GatewaysForMerge_) {`
`392`		`- YQL_ENSURE(NProtoBuf::TextFormat::ParseFromString(*GatewaysForMerge_, &LoadedGatewaysConfig_));`
	`392`	`+ YQL_ENSURE(NProtoBuf::TextFormat::MergeFromString(*GatewaysForMerge_, &LoadedGatewaysConfig_));`
`393`	`393`	`}`
`394`	`394`	`THashMap<TString, TString> clusterMapping;`
`395`	`395`	`GetClusterMappingFromGateways(LoadedGatewaysConfig_, clusterMapping);`