Skip to content

Commit 9fce861

Browse files
GrigoriyPAgithub-actions[bot]
authored andcommitted
Fixed missing sdk change (#23711)
1 parent cd70d70 commit 9fce861

File tree

3 files changed

+2
-7
lines changed

3 files changed

+2
-7
lines changed

.github/last_commit.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
362cf04ca2b49a71004ea0558dbf5a041db0e0c6
1+
debe2d49e5446bccc55f1043b76cb79eb09e302c

src/client/federated_topic/impl/federation_observer.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -136,16 +136,13 @@ void TFederatedDbObserverImpl::OnFederationDiscovery(TStatus&& status, Ydb::Fede
136136
<< "OnFederationDiscovery fall back to single mode, database=" << DbDriverState_->Database);
137137
FederatedDbState->Status = TPlainStatus{}; // SUCCESS
138138
FederatedDbState->ControlPlaneEndpoint = DbDriverState_->DiscoveryEndpoint;
139-
auto dbState = Connections_->GetDriverState(std::nullopt, std::nullopt, std::nullopt, std::nullopt, std::nullopt);
140-
FederatedDbState->ControlPlaneEndpoint = dbState->DiscoveryEndpoint;
141139
// FederatedDbState->SelfLocation = ???;
142140
auto db = std::make_shared<Ydb::FederationDiscovery::DatabaseInfo>();
143141
db->set_path(TStringType{DbDriverState_->Database});
144142
db->set_endpoint(TStringType{DbDriverState_->DiscoveryEndpoint});
145143
db->set_status(Ydb::FederationDiscovery::DatabaseInfo_Status_AVAILABLE);
146144
db->set_weight(100);
147145
FederatedDbState->DbInfos.emplace_back(std::move(db));
148-
149146
} else {
150147
if (status.IsSuccess()) {
151148
ScheduleFederationDiscoveryImpl(REDISCOVERY_DELAY);

tests/integration/basic_example/main.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@ static void ValidateResultSet(const std::vector<NYdb::TColumn>& columns,
1212
const std::vector<std::vector<NYdb::TValue>>& values,
1313
const NYdb::TResultSet& rs) {
1414
Ydb::ResultSet protoResultSet;
15-
if (auto version = std::getenv("YDB_VERSION"); !version || std::string(version) == "trunk") {
16-
protoResultSet.set_format(Ydb::ResultSet::FORMAT_VALUE);
17-
}
15+
protoResultSet.set_format(Ydb::ResultSet::FORMAT_VALUE);
1816

1917
for (const auto& column : columns) {
2018
auto* protoColumn = protoResultSet.add_columns();

0 commit comments

Comments
 (0)