From 9fce8617b6630c0a93b2c7fdab9c96f1c62daf8b Mon Sep 17 00:00:00 2001 From: Pisarenko Grigoriy Date: Thu, 28 Aug 2025 18:33:37 +0000 Subject: [PATCH 1/3] Fixed missing sdk change (#23711) --- .github/last_commit.txt | 2 +- src/client/federated_topic/impl/federation_observer.cpp | 3 --- tests/integration/basic_example/main.cpp | 4 +--- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/.github/last_commit.txt b/.github/last_commit.txt index 72b20a13cc8..76f88bfc953 100644 --- a/.github/last_commit.txt +++ b/.github/last_commit.txt @@ -1 +1 @@ -362cf04ca2b49a71004ea0558dbf5a041db0e0c6 +debe2d49e5446bccc55f1043b76cb79eb09e302c diff --git a/src/client/federated_topic/impl/federation_observer.cpp b/src/client/federated_topic/impl/federation_observer.cpp index 9d40845c628..2085d064ac3 100644 --- a/src/client/federated_topic/impl/federation_observer.cpp +++ b/src/client/federated_topic/impl/federation_observer.cpp @@ -136,8 +136,6 @@ void TFederatedDbObserverImpl::OnFederationDiscovery(TStatus&& status, Ydb::Fede << "OnFederationDiscovery fall back to single mode, database=" << DbDriverState_->Database); FederatedDbState->Status = TPlainStatus{}; // SUCCESS FederatedDbState->ControlPlaneEndpoint = DbDriverState_->DiscoveryEndpoint; - auto dbState = Connections_->GetDriverState(std::nullopt, std::nullopt, std::nullopt, std::nullopt, std::nullopt); - FederatedDbState->ControlPlaneEndpoint = dbState->DiscoveryEndpoint; // FederatedDbState->SelfLocation = ???; auto db = std::make_shared(); db->set_path(TStringType{DbDriverState_->Database}); @@ -145,7 +143,6 @@ void TFederatedDbObserverImpl::OnFederationDiscovery(TStatus&& status, Ydb::Fede db->set_status(Ydb::FederationDiscovery::DatabaseInfo_Status_AVAILABLE); db->set_weight(100); FederatedDbState->DbInfos.emplace_back(std::move(db)); - } else { if (status.IsSuccess()) { ScheduleFederationDiscoveryImpl(REDISCOVERY_DELAY); diff --git a/tests/integration/basic_example/main.cpp b/tests/integration/basic_example/main.cpp index 082aacf23eb..72c4e07dfcd 100644 --- a/tests/integration/basic_example/main.cpp +++ b/tests/integration/basic_example/main.cpp @@ -12,9 +12,7 @@ static void ValidateResultSet(const std::vector& columns, const std::vector>& values, const NYdb::TResultSet& rs) { Ydb::ResultSet protoResultSet; - if (auto version = std::getenv("YDB_VERSION"); !version || std::string(version) == "trunk") { - protoResultSet.set_format(Ydb::ResultSet::FORMAT_VALUE); - } + protoResultSet.set_format(Ydb::ResultSet::FORMAT_VALUE); for (const auto& column : columns) { auto* protoColumn = protoResultSet.add_columns(); From 283b350c78141d708be820ba1dfbaffc8bd8641b Mon Sep 17 00:00:00 2001 From: Bulat Date: Thu, 28 Aug 2025 18:33:43 +0000 Subject: [PATCH 2/3] [C++ SDK] Fixed basic example test old YDB versions (#23734) --- .github/last_commit.txt | 2 +- tests/integration/basic_example/main.cpp | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/last_commit.txt b/.github/last_commit.txt index 76f88bfc953..4a1cba507c2 100644 --- a/.github/last_commit.txt +++ b/.github/last_commit.txt @@ -1 +1 @@ -debe2d49e5446bccc55f1043b76cb79eb09e302c +a1abe1a8139be6a6188d79503a63aa2e5068c6c1 diff --git a/tests/integration/basic_example/main.cpp b/tests/integration/basic_example/main.cpp index 72c4e07dfcd..082aacf23eb 100644 --- a/tests/integration/basic_example/main.cpp +++ b/tests/integration/basic_example/main.cpp @@ -12,7 +12,9 @@ static void ValidateResultSet(const std::vector& columns, const std::vector>& values, const NYdb::TResultSet& rs) { Ydb::ResultSet protoResultSet; - protoResultSet.set_format(Ydb::ResultSet::FORMAT_VALUE); + if (auto version = std::getenv("YDB_VERSION"); !version || std::string(version) == "trunk") { + protoResultSet.set_format(Ydb::ResultSet::FORMAT_VALUE); + } for (const auto& column : columns) { auto* protoColumn = protoResultSet.add_columns(); From 35f99424f56c00cd9919e8aab4cca5a6a152bad1 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 28 Aug 2025 18:33:43 +0000 Subject: [PATCH 3/3] Update import generation: 21 --- .github/import_generation.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/import_generation.txt b/.github/import_generation.txt index aabe6ec3909..2bd5a0a98a3 100644 --- a/.github/import_generation.txt +++ b/.github/import_generation.txt @@ -1 +1 @@ -21 +22