Fixed CMakeLists for import 14

Author: Gazizonoki

include/ydb-cpp-sdk/client/query/client.h

@@ -53,10 +53,6 @@ struct TClientSettings : public TCommonClientSettingsBase<TClientSettings> {
     FLUENT_SETTING(TSessionPoolSettings, SessionPoolSettings);
 };
 
-// ! WARNING: Experimental API
-// ! This API is currently in experimental state and is a subject for changes.
-// ! No backward and/or forward compatibility guarantees are provided.
-// ! DO NOT USE for production workloads.
 class TQueryClient {
     friend class TSession;
     friend class NRetry::Async::TRetryContext<TQueryClient, TAsyncExecuteQueryResult>;

tests/integration/topic/CMakeLists.txt

@@ -6,6 +6,7 @@ add_ydb_test(NAME topic_it GTEST
     basic_usage.cpp
     describe_topic.cpp
     local_partition.cpp
+    topic_to_table.cpp
     trace.cpp
   LINK_LIBRARIES
     topic_it_utils
@@ -24,6 +25,7 @@ add_ydb_test(NAME topic_direct_read_it GTEST
     describe_topic.cpp
     local_partition.cpp
     direct_read.cpp
+    topic_to_table.cpp
   LINK_LIBRARIES
     topic_it_utils
     topic_it_setup

tests/integration/topic/setup/CMakeLists.txt

@@ -7,7 +7,11 @@ target_sources(topic_it_setup
 
 target_link_libraries(topic_it_setup
   PUBLIC
+    topic_it_utils
     YDB-CPP-SDK::Discovery
+    YDB-CPP-SDK::Scheme
+    YDB-CPP-SDK::Table
     YDB-CPP-SDK::Topic
+    YDB-CPP-SDK::Iam
     GTest::gtest
 )

tests/integration/topic/setup/fixture.cpp

@@ -1,8 +1,14 @@
 #include "fixture.h"
 
 #include <ydb-cpp-sdk/client/discovery/discovery.h>
+#include <ydb-cpp-sdk/client/scheme/scheme.h>
+#include <ydb-cpp-sdk/client/table/table.h>
 
-#include <util/system/execpath.h>
+#include <ydb-cpp-sdk/client/iam/iam.h>
+
+
+using namespace NYdb::NScheme;
+using namespace NYdb::NTable;
 
 namespace NYdb::inline V3::NTopic::NTests {
 
@@ -18,20 +24,54 @@ void TTopicTestFixture::SetUp() {
     TTopicClient client(MakeDriver());
 
     const testing::TestInfo* const testInfo = testing::UnitTest::GetInstance()->current_test_info();
-    std::filesystem::path execPath(std::string{GetExecPath()});
 
     std::stringstream topicBuilder;
     topicBuilder << std::getenv("YDB_TEST_ROOT") << "/" << testInfo->test_suite_name() << "-" << testInfo->name() << "/";
     TopicPrefix_ = topicBuilder.str();
-    
+
     std::stringstream consumerBuilder;
     consumerBuilder << testInfo->test_suite_name() << "-" << testInfo->name() << "-";
     ConsumerPrefix_ = consumerBuilder.str();
 
-    client.DropTopic(GetTopicPath()).GetValueSync();
+    try {
+        RemoveDirectoryRecurive(GetDatabase() + "/" + TopicPrefix_);
+    } catch (const TYdbException& e) {
+        std::cerr << "Couldn't drop topic on SetUp: " << e.what() << std::endl;
+    }
+
     CreateTopic();
 }
 
+void TTopicTestFixture::RemoveDirectoryRecurive(const std::string& path) const {
+    TSchemeClient schemeClient(MakeDriver());
+
+    auto describeResult = schemeClient.DescribePath(path).GetValueSync();
+    NStatusHelpers::ThrowOnError(describeResult);
+    auto entry = describeResult.GetEntry();
+
+    if (entry.Type == ESchemeEntryType::Table || entry.Type == ESchemeEntryType::ColumnTable) {
+        TTableClient client(MakeDriver());
+        NStatusHelpers::ThrowOnError(client.RetryOperationSync([&path](TSession session) {
+            return session.DropTable(path).GetValueSync();
+        }));
+    } else if (entry.Type == ESchemeEntryType::Topic) {
+        TTopicClient client(MakeDriver());
+        NStatusHelpers::ThrowOnError(client.DropTopic(path).GetValueSync());
+    } else if (entry.Type == ESchemeEntryType::Directory) {
+        auto listResult = schemeClient.ListDirectory(path).GetValueSync();
+        NStatusHelpers::ThrowOnError(listResult);
+        for (const auto& entry : listResult.GetChildren()) {
+            RemoveDirectoryRecurive(path + "/" + entry.Name);
+        }
+    } else {
+        ythrow TYdbException() << "Entry type " << entry.Type << " is not supported" << Endl;
+    }
+}
+
+void TTopicTestFixture::TearDown() {
+    RemoveDirectoryRecurive(GetDatabase() + "/" + TopicPrefix_);
+}
+
 std::string TTopicTestFixture::GetEndpoint() const {
     auto endpoint = std::getenv("YDB_ENDPOINT");
     Y_ENSURE_BT(endpoint, "YDB_ENDPOINT is not set");
@@ -54,6 +94,7 @@ TDriverConfig TTopicTestFixture::MakeDriverConfig() const {
     return TDriverConfig()
         .SetEndpoint(GetEndpoint())
         .SetDatabase(GetDatabase())
+        .SetCredentialsProviderFactory(CreateIamJwtFileCredentialsProviderFactory({.JwtFilename = "/home/brgayazov/sa-key"}))
         .SetLog(std::unique_ptr<TLogBackend>(CreateLogBackend("cerr", ELogPriority::TLOG_DEBUG).Release()));
 }
 

tests/integration/topic/setup/fixture.h

@@ -14,6 +14,7 @@ extern const bool EnableDirectRead;
 class TTopicTestFixture : public ::testing::Test, public ITopicTestSetup {
 public:
     void SetUp() override;
+    void TearDown() override;
 
     std::string GetEndpoint() const override;
     std::string GetDatabase() const override;
@@ -24,6 +25,8 @@ class TTopicTestFixture : public ::testing::Test, public ITopicTestSetup {
 
     std::uint16_t GetPort() const override;
     std::vector<std::uint32_t> GetNodeIds() override;
+
+    void RemoveDirectoryRecurive(const std::string& path) const;
 };
 
 }