aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVitaly Isaev <vitalyisaev@ydb.tech>2024-04-04 14:55:49 +0300
committerGitHub <noreply@github.com>2024-04-04 14:55:49 +0300
commit709c71d8ea739caa9ef486f7af4cdae19210aa6b (patch)
tree60a6db9d976f533f4c6112269af9696336c9b42a
parente71297188f3c00bf25f123b8463617b573e33e0e (diff)
downloadydb-709c71d8ea739caa9ef486f7af4cdae19210aa6b.tar.gz
Remove permanently failing tests `ydb/core/kqp/ut/federated_query/generic` (#3468)
-rw-r--r--.github/config/muted_ya.txt1
-rw-r--r--ydb/core/kqp/ut/federated_query/generic/ch_recipe_ut_helpers.cpp51
-rw-r--r--ydb/core/kqp/ut/federated_query/generic/ch_recipe_ut_helpers.h15
-rw-r--r--ydb/core/kqp/ut/federated_query/generic/connector_recipe_ut_helpers.cpp33
-rw-r--r--ydb/core/kqp/ut/federated_query/generic/connector_recipe_ut_helpers.h15
-rw-r--r--ydb/core/kqp/ut/federated_query/generic/docker-compose.yml25
-rw-r--r--ydb/core/kqp/ut/federated_query/generic/kqp_generic_plan_ut.cpp179
-rw-r--r--ydb/core/kqp/ut/federated_query/generic/kqp_generic_provider_join_ut.cpp133
-rw-r--r--ydb/core/kqp/ut/federated_query/generic/mdb_mock_config.json13
-rw-r--r--ydb/core/kqp/ut/federated_query/generic/pg_recipe_ut_helpers.cpp56
-rw-r--r--ydb/core/kqp/ut/federated_query/generic/pg_recipe_ut_helpers.h16
-rw-r--r--ydb/core/kqp/ut/federated_query/generic/ya.make55
-rw-r--r--ydb/core/kqp/ut/federated_query/ya.make1
13 files changed, 0 insertions, 593 deletions
diff --git a/.github/config/muted_ya.txt b/.github/config/muted_ya.txt
index 2451352ee9..b313df25c5 100644
--- a/.github/config/muted_ya.txt
+++ b/.github/config/muted_ya.txt
@@ -6,7 +6,6 @@ ydb/core/client/ut TFlatTest.AutoSplitMergeQueue
ydb/core/cms/ut_sentinel TSentinelTests.BSControllerCantChangeStatus
ydb/core/quoter/ut QuoterWithKesusTest.PrefetchCoefficient
ydb/core/kqp/provider/ut KikimrIcGateway.TestLoadBasicSecretValueFromExternalDataSourceMetadata
-ydb/core/kqp/ut/federated_query/generic *
ydb/core/kqp/ut/olap KqpOlap.IndexesActualization
ydb/core/kqp/ut/olap KqpOlap.BlobsSharing*
ydb/core/kqp/ut/olap KqpOlap.ScanQueryOltpAndOlap
diff --git a/ydb/core/kqp/ut/federated_query/generic/ch_recipe_ut_helpers.cpp b/ydb/core/kqp/ut/federated_query/generic/ch_recipe_ut_helpers.cpp
deleted file mode 100644
index 7b426cbdd4..0000000000
--- a/ydb/core/kqp/ut/federated_query/generic/ch_recipe_ut_helpers.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
-#include "ch_recipe_ut_helpers.h"
-
-#include <util/string/cast.h>
-#include <util/system/env.h>
-
-namespace NTestUtils {
-
- TString GetChHost() {
- return "localhost";
- }
-
- ui32 GetChPort() {
- return 19000;
- }
-
- TString GetChUser() {
- return "user";
- }
-
- TString GetChPassword() {
- return "password";
- }
-
- TString GetChDatabase() {
- return "default";
- }
-
- NClickHouse::TClient CreateClickhouseClient() {
- NClickHouse::TClientOptions opt;
- opt
- .SetHost(GetChHost())
- .SetPort(GetChPort())
- .SetUser(GetChUser())
- .SetPassword(GetChPassword());
-
- TInstant start = TInstant::Now();
- ui32 attempt = 0;
- while ((TInstant::Now() - start).Seconds() < 60) {
- attempt += 1;
- try {
- return NClickHouse::TClient(opt);
- } catch (const TSystemError& e) {
- Cerr << "Attempt " << attempt << ": " << e.what() << Endl;
- Sleep(TDuration::MilliSeconds(100));
- }
- }
-
- throw yexception() << "Failed to connect ClickHouse in " << attempt << " attempt(s)";
- }
-
-} // namespace NTestUtils
diff --git a/ydb/core/kqp/ut/federated_query/generic/ch_recipe_ut_helpers.h b/ydb/core/kqp/ut/federated_query/generic/ch_recipe_ut_helpers.h
deleted file mode 100644
index c8f573979b..0000000000
--- a/ydb/core/kqp/ut/federated_query/generic/ch_recipe_ut_helpers.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#pragma once
-
-#include <library/cpp/clickhouse/client/client.h>
-
-namespace NTestUtils {
-
- TString GetChHost();
- ui32 GetChPort();
- TString GetChUser();
- TString GetChPassword();
- TString GetChDatabase();
-
- NClickHouse::TClient CreateClickhouseClient();
-
-} // namespace NTestUtils
diff --git a/ydb/core/kqp/ut/federated_query/generic/connector_recipe_ut_helpers.cpp b/ydb/core/kqp/ut/federated_query/generic/connector_recipe_ut_helpers.cpp
deleted file mode 100644
index a9470f62e8..0000000000
--- a/ydb/core/kqp/ut/federated_query/generic/connector_recipe_ut_helpers.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
-#include "connector_recipe_ut_helpers.h"
-
-#include <util/string/cast.h>
-#include <util/system/env.h>
-
-namespace NTestUtils {
-
- TString GetConnectorHost() {
- return "localhost";
- }
-
- ui32 GetConnectorPort() {
- return 50051;
- }
-
- std::shared_ptr<NKikimr::NKqp::TKikimrRunner> MakeKikimrRunnerWithConnector() {
- NYql::TGenericConnectorConfig clientCfg;
- clientCfg.MutableEndpoint()->set_host(GetConnectorHost());
- clientCfg.MutableEndpoint()->set_port(GetConnectorPort());
-
- NKikimrConfig::TAppConfig appCfg;
- appCfg.MutableFeatureFlags()->SetEnableExternalDataSources(true);
-
- auto kikimr = NKikimr::NKqp::NFederatedQueryTest::MakeKikimrRunner(
- true,
- NYql::NConnector::MakeClientGRPC(clientCfg),
- nullptr,
- appCfg);
- kikimr->GetTestServer().GetRuntime()->GetAppData(0).FeatureFlags.SetEnableExternalDataSources(true);
- return kikimr;
- }
-
-} // namespace NTestUtils
diff --git a/ydb/core/kqp/ut/federated_query/generic/connector_recipe_ut_helpers.h b/ydb/core/kqp/ut/federated_query/generic/connector_recipe_ut_helpers.h
deleted file mode 100644
index e0ff53b228..0000000000
--- a/ydb/core/kqp/ut/federated_query/generic/connector_recipe_ut_helpers.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#pragma once
-#include <ydb/core/kqp/ut/common/kqp_ut_common.h>
-#include <ydb/core/kqp/ut/federated_query/common/common.h>
-#include <ydb/core/kqp/federated_query/kqp_federated_query_helpers.h>
-
-#include <library/cpp/testing/unittest/registar.h>
-
-namespace NTestUtils {
-
- TString GetConnectorHost();
- ui32 GetConnectorPort();
-
- std::shared_ptr<NKikimr::NKqp::TKikimrRunner> MakeKikimrRunnerWithConnector();
-
-} // namespace NTestUtils
diff --git a/ydb/core/kqp/ut/federated_query/generic/docker-compose.yml b/ydb/core/kqp/ut/federated_query/generic/docker-compose.yml
deleted file mode 100644
index 2991e0e883..0000000000
--- a/ydb/core/kqp/ut/federated_query/generic/docker-compose.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-version: '3.4'
-services:
- postgresql:
- image: postgres:15-bullseye@sha256:3411b9f2e5239cd7867f34fcf22fe964230f7d447a71d63c283e3593d3f84085
- environment:
- POSTGRES_DB: db
- POSTGRES_USER: user
- POSTGRES_PASSWORD: password
- ports:
- - 15432:5432
- clickhouse:
- image: clickhouse/clickhouse-server:23-alpine@sha256:b078c1cd294632afa2aeba3530e7ba2e568513da23304354f455a25fab575c06
- environment:
- CLICKHOUSE_DB: db
- CLICKHOUSE_USER: user
- CLICKHOUSE_DEFAULT_ACCESS_MANAGEMENT: 1
- CLICKHOUSE_PASSWORD: password
- ports:
- - 19000:9000
- - 18123:8123
- fq-connector-go:
- image: ghcr.io/ydb-platform/fq-connector-go:v0.0.6-rc.8@sha256:74ebae0530d916c1842a7fddfbddc6c018763a0401f2f627a44e8829692fe41f
- ports:
- - 50051:50051
- network_mode: host
diff --git a/ydb/core/kqp/ut/federated_query/generic/kqp_generic_plan_ut.cpp b/ydb/core/kqp/ut/federated_query/generic/kqp_generic_plan_ut.cpp
deleted file mode 100644
index e849c7251c..0000000000
--- a/ydb/core/kqp/ut/federated_query/generic/kqp_generic_plan_ut.cpp
+++ /dev/null
@@ -1,179 +0,0 @@
-#include "ch_recipe_ut_helpers.h"
-#include "connector_recipe_ut_helpers.h"
-#include "pg_recipe_ut_helpers.h"
-#include <ydb/core/kqp/ut/common/kqp_ut_common.h>
-#include <ydb/core/kqp/ut/federated_query/common/common.h>
-#include <ydb/core/kqp/federated_query/kqp_federated_query_helpers.h>
-
-#include <ydb/library/yql/providers/generic/connector/libcpp/client.h>
-
-#include <library/cpp/json/json_reader.h>
-#include <library/cpp/testing/unittest/registar.h>
-
-#include <fmt/format.h>
-
-using namespace NYdb;
-using namespace NYdb::NQuery;
-using namespace NTestUtils;
-using namespace fmt::literals;
-
-Y_UNIT_TEST_SUITE(KqpGenericPlanTest) {
- Y_UNIT_TEST(PgSource) {
- pqxx::connection pgConnection = CreatePostgresqlConnection();
-
- {
- pqxx::work work{pgConnection};
- const TString sql = R"sql(
- CREATE TABLE pg_table_plan_test (
- key INT4 PRIMARY KEY,
- name TEXT,
- value INT4
- )
- )sql";
- work.exec(sql);
- work.commit();
- }
-
- std::shared_ptr<NKikimr::NKqp::TKikimrRunner> kikimr = MakeKikimrRunnerWithConnector();
-
- auto tableCLient = kikimr->GetTableClient();
- auto session = tableCLient.CreateSession().GetValueSync().GetSession();
-
- // external tables to pg/ch
- {
- const TString sql = fmt::format(
- R"sql(
- CREATE OBJECT pg_password_obj (TYPE SECRET) WITH (value="{pg_password}");
- CREATE EXTERNAL DATA SOURCE pg_data_source WITH (
- SOURCE_TYPE="PostgreSQL",
- LOCATION="{pg_host}:{pg_port}",
- DATABASE_NAME="{pg_database}",
- USE_TLS="FALSE",
- AUTH_METHOD="BASIC",
- PROTOCOL="NATIVE",
- LOGIN="{pg_user}",
- PASSWORD_SECRET_NAME="pg_password_obj"
- );
- )sql",
- "pg_host"_a = GetPgHost(),
- "pg_port"_a = GetPgPort(),
- "pg_user"_a = GetPgUser(),
- "pg_password"_a = GetPgPassword(),
- "pg_database"_a = GetPgDatabase());
- auto result = session.ExecuteSchemeQuery(sql).GetValueSync();
- UNIT_ASSERT_C(result.IsSuccess(), result.GetIssues().ToString());
- }
-
- const TString sql = R"sql(
- PRAGMA generic.UsePredicatePushdown="true";
- SELECT * FROM pg_data_source.pg_table_plan_test
- WHERE key > 42 AND value <> 0
- )sql";
-
- auto queryClient = kikimr->GetQueryClient();
- TExecuteQueryResult queryResult = queryClient.ExecuteQuery(
- sql,
- TTxControl::BeginTx().CommitTx(),
- TExecuteQuerySettings().ExecMode(EExecMode::Explain))
- .GetValueSync();
-
- UNIT_ASSERT_C(queryResult.IsSuccess(), queryResult.GetIssues().ToString());
- UNIT_ASSERT(queryResult.GetStats());
- UNIT_ASSERT(queryResult.GetStats()->GetPlan());
- Cerr << "Plan: " << *queryResult.GetStats()->GetPlan() << Endl;
- NJson::TJsonValue plan;
- UNIT_ASSERT(NJson::ReadJsonTree(*queryResult.GetStats()->GetPlan(), &plan));
-
- const auto& stagePlan = plan["Plan"]["Plans"][0]["Plans"][0]["Plans"][0]["Plans"][0]["Plans"][0];
- UNIT_ASSERT_VALUES_EQUAL(stagePlan["Node Type"].GetStringSafe(), "Source");
- const auto& sourceOp = stagePlan["Operators"].GetArraySafe()[0];
- UNIT_ASSERT_VALUES_EQUAL(sourceOp["ExternalDataSource"].GetStringSafe(), "pg_data_source");
- UNIT_ASSERT_VALUES_EQUAL(sourceOp["Database"].GetStringSafe(), GetPgDatabase());
- UNIT_ASSERT_VALUES_EQUAL(sourceOp["Protocol"].GetStringSafe(), "Native");
- UNIT_ASSERT_VALUES_EQUAL(sourceOp["Table"].GetStringSafe(), "pg_table_plan_test");
- UNIT_ASSERT_VALUES_EQUAL(sourceOp["Name"].GetStringSafe(), "Read pg_data_source");
- UNIT_ASSERT_VALUES_EQUAL(sourceOp["SourceType"].GetStringSafe(), "PostgreSql");
- UNIT_ASSERT_VALUES_EQUAL(sourceOp["ReadColumns"].GetArraySafe()[0].GetStringSafe(), "key");
- UNIT_ASSERT_VALUES_EQUAL(sourceOp["ReadColumns"].GetArraySafe()[1].GetStringSafe(), "name");
- UNIT_ASSERT_VALUES_EQUAL(sourceOp["ReadColumns"].GetArraySafe()[2].GetStringSafe(), "value");
- UNIT_ASSERT_VALUES_EQUAL(sourceOp["Filter"].GetStringSafe(), "item.key > 42 And item.value != 0");
- }
-
- Y_UNIT_TEST(ChSource) {
- NClickHouse::TClient chClient = CreateClickhouseClient();
-
- // ch_table_plan_test
- {
- const TString sql = R"sql(
- CREATE TABLE ch_table_plan_test (
- key INT PRIMARY KEY,
- name TEXT NULL
- )
- ENGINE = MergeTree
- )sql";
- chClient.Execute(sql);
- }
-
- std::shared_ptr<NKikimr::NKqp::TKikimrRunner> kikimr = MakeKikimrRunnerWithConnector();
-
- auto tableCLient = kikimr->GetTableClient();
- auto session = tableCLient.CreateSession().GetValueSync().GetSession();
-
- // external tables to pg/ch
- {
- const TString sql = fmt::format(
- R"sql(
- CREATE OBJECT ch_password_obj (TYPE SECRET) WITH (value="{ch_password}");
- CREATE EXTERNAL DATA SOURCE ch_data_source WITH (
- SOURCE_TYPE="ClickHouse",
- LOCATION="{ch_host}:{ch_port}",
- DATABASE_NAME="{ch_database}",
- AUTH_METHOD="BASIC",
- PROTOCOL="NATIVE",
- LOGIN="{ch_user}",
- PASSWORD_SECRET_NAME="ch_password_obj"
- );
- )sql",
- "ch_host"_a = GetChHost(),
- "ch_port"_a = GetChPort(),
- "ch_database"_a = GetChDatabase(),
- "ch_user"_a = GetChUser(),
- "ch_password"_a = GetChPassword());
- auto result = session.ExecuteSchemeQuery(sql).GetValueSync();
- UNIT_ASSERT_C(result.IsSuccess(), result.GetIssues().ToString());
- }
-
- const TString sql = R"sql(
- PRAGMA generic.UsePredicatePushdown="true";
- SELECT * FROM ch_data_source.ch_table_plan_test
- WHERE name IS NOT NULL
- )sql";
-
- auto queryClient = kikimr->GetQueryClient();
- TExecuteQueryResult queryResult = queryClient.ExecuteQuery(
- sql,
- TTxControl::BeginTx().CommitTx(),
- TExecuteQuerySettings().ExecMode(EExecMode::Explain))
- .GetValueSync();
-
- UNIT_ASSERT_C(queryResult.IsSuccess(), queryResult.GetIssues().ToString());
- UNIT_ASSERT(queryResult.GetStats());
- UNIT_ASSERT(queryResult.GetStats()->GetPlan());
- Cerr << "Plan: " << *queryResult.GetStats()->GetPlan() << Endl;
- NJson::TJsonValue plan;
- UNIT_ASSERT(NJson::ReadJsonTree(*queryResult.GetStats()->GetPlan(), &plan));
-
- const auto& stagePlan = plan["Plan"]["Plans"][0]["Plans"][0]["Plans"][0]["Plans"][0]["Plans"][0];
- UNIT_ASSERT_VALUES_EQUAL(stagePlan["Node Type"].GetStringSafe(), "Source");
- const auto& sourceOp = stagePlan["Operators"].GetArraySafe()[0];
- UNIT_ASSERT_VALUES_EQUAL(sourceOp["ExternalDataSource"].GetStringSafe(), "ch_data_source");
- UNIT_ASSERT_VALUES_EQUAL(sourceOp["Database"].GetStringSafe(), GetChDatabase());
- UNIT_ASSERT_VALUES_EQUAL(sourceOp["Protocol"].GetStringSafe(), "Native");
- UNIT_ASSERT_VALUES_EQUAL(sourceOp["Table"].GetStringSafe(), "ch_table_plan_test");
- UNIT_ASSERT_VALUES_EQUAL(sourceOp["Name"].GetStringSafe(), "Read ch_data_source");
- UNIT_ASSERT_VALUES_EQUAL(sourceOp["SourceType"].GetStringSafe(), "ClickHouse");
- UNIT_ASSERT_VALUES_EQUAL(sourceOp["ReadColumns"].GetArraySafe()[0].GetStringSafe(), "key");
- UNIT_ASSERT_VALUES_EQUAL(sourceOp["ReadColumns"].GetArraySafe()[1].GetStringSafe(), "name");
- UNIT_ASSERT_VALUES_EQUAL(sourceOp["Filter"].GetStringSafe(), "Exist(item.name)");
- }
-}
diff --git a/ydb/core/kqp/ut/federated_query/generic/kqp_generic_provider_join_ut.cpp b/ydb/core/kqp/ut/federated_query/generic/kqp_generic_provider_join_ut.cpp
deleted file mode 100644
index 4c88715f2a..0000000000
--- a/ydb/core/kqp/ut/federated_query/generic/kqp_generic_provider_join_ut.cpp
+++ /dev/null
@@ -1,133 +0,0 @@
-#include "ch_recipe_ut_helpers.h"
-#include "connector_recipe_ut_helpers.h"
-#include "pg_recipe_ut_helpers.h"
-
-#include <ydb/library/yql/providers/generic/connector/libcpp/client.h>
-
-#include <library/cpp/testing/unittest/registar.h>
-
-#include <fmt/format.h>
-
-using namespace NTestUtils;
-using namespace fmt::literals;
-
-Y_UNIT_TEST_SUITE(FederatedQueryJoin) {
- Y_UNIT_TEST(InnerJoinChPg) {
- pqxx::connection pgConnection = CreatePostgresqlConnection();
- NClickHouse::TClient chClient = CreateClickhouseClient();
-
- // pg_table_inner_join_test
- {
- pqxx::work work{pgConnection};
- const TString sql = R"sql(
- CREATE TABLE pg_table_inner_join_test (
- key INT PRIMARY KEY,
- name TEXT
- )
- )sql";
- work.exec(sql);
-
- const TString insertData = R"sql(
- INSERT INTO pg_table_inner_join_test
- (key, name)
- VALUES
- (1, 'A'),
- (2, 'B'),
- (1000, 'C');
- )sql";
- work.exec(insertData);
-
- work.commit();
- }
-
- // ch_table_inner_join_test
- {
- const TString sql = R"sql(
- CREATE TABLE ch_table_inner_join_test (
- key INT PRIMARY KEY,
- name TEXT
- )
- ENGINE = MergeTree
- )sql";
- chClient.Execute(sql);
-
- const TString insertData = R"sql(
- INSERT INTO ch_table_inner_join_test
- (key, name)
- VALUES
- (1, 'X'),
- (3, 'Y'),
- (1000, 'Z');
- )sql";
- chClient.Execute(insertData);
- }
-
- std::shared_ptr<NKikimr::NKqp::TKikimrRunner> kikimr = MakeKikimrRunnerWithConnector();
- auto queryClient = kikimr->GetQueryClient();
-
- // external tables to pg/ch
- {
- const TString sql = fmt::format(
- R"sql(
- CREATE OBJECT pg_password_obj (TYPE SECRET) WITH (value="{pg_password}");
- CREATE EXTERNAL DATA SOURCE pg_data_source WITH (
- SOURCE_TYPE="PostgreSQL",
- LOCATION="{pg_host}:{pg_port}",
- DATABASE_NAME="{pg_database}",
- USE_TLS="FALSE",
- AUTH_METHOD="BASIC",
- PROTOCOL="NATIVE",
- LOGIN="{pg_user}",
- PASSWORD_SECRET_NAME="pg_password_obj"
- );
-
- CREATE OBJECT ch_password_obj (TYPE SECRET) WITH (value="{ch_password}");
- CREATE EXTERNAL DATA SOURCE ch_data_source WITH (
- SOURCE_TYPE="ClickHouse",
- LOCATION="{ch_host}:{ch_port}",
- DATABASE_NAME="{ch_database}",
- AUTH_METHOD="BASIC",
- PROTOCOL="NATIVE",
- LOGIN="{ch_user}",
- PASSWORD_SECRET_NAME="ch_password_obj"
- );
- )sql",
- "pg_host"_a = GetPgHost(),
- "pg_port"_a = GetPgPort(),
- "pg_user"_a = GetPgUser(),
- "pg_password"_a = GetPgPassword(),
- "pg_database"_a = GetPgDatabase(),
- "ch_host"_a = GetChHost(),
- "ch_port"_a = GetChPort(),
- "ch_database"_a = GetChDatabase(),
- "ch_user"_a = GetChUser(),
- "ch_password"_a = GetChPassword());
- auto result = queryClient.ExecuteQuery(sql, NYdb::NQuery::TTxControl::NoTx()).GetValueSync();
- UNIT_ASSERT_C(result.IsSuccess(), result.GetIssues().ToString());
- }
-
- // join
- const TString sql = R"sql(
- SELECT pg.* FROM ch_data_source.ch_table_inner_join_test AS ch
- INNER JOIN pg_data_source.pg_table_inner_join_test AS pg
- ON ch.key = pg.key
- WHERE ch.key > 998
- )sql";
-
- auto result = queryClient.ExecuteQuery(sql, NYdb::NQuery::TTxControl::BeginTx().CommitTx()).GetValueSync();
- UNIT_ASSERT_C(result.IsSuccess(), result.GetIssues().ToString());
-
- // results
- auto resultSet = result.GetResultSetParser(0);
- UNIT_ASSERT_VALUES_EQUAL(resultSet.RowsCount(), 1);
- UNIT_ASSERT(resultSet.TryNextRow());
-
- const TMaybe<i32> key = resultSet.ColumnParser("key").GetOptionalInt32();
- UNIT_ASSERT(key);
- UNIT_ASSERT_VALUES_EQUAL(*key, 1000);
-
- const TMaybe<TString> name = resultSet.ColumnParser("name").GetOptionalUtf8();
- UNIT_ASSERT(name);
- UNIT_ASSERT_VALUES_EQUAL(name, "C");
- }
-}
diff --git a/ydb/core/kqp/ut/federated_query/generic/mdb_mock_config.json b/ydb/core/kqp/ut/federated_query/generic/mdb_mock_config.json
deleted file mode 100644
index bdae23d536..0000000000
--- a/ydb/core/kqp/ut/federated_query/generic/mdb_mock_config.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
- "clickhouse_clusters": {
- "ch-managed": {
- "hosts": [
- {
- "name": "ch-managed-1",
- "cluster_id": "ch-managed",
- "health": 1
- }
- ]
- }
- }
-}
diff --git a/ydb/core/kqp/ut/federated_query/generic/pg_recipe_ut_helpers.cpp b/ydb/core/kqp/ut/federated_query/generic/pg_recipe_ut_helpers.cpp
deleted file mode 100644
index 12b7ee6103..0000000000
--- a/ydb/core/kqp/ut/federated_query/generic/pg_recipe_ut_helpers.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
-#include "pg_recipe_ut_helpers.h"
-
-#include <util/string/cast.h>
-#include <util/system/env.h>
-
-#include <fmt/format.h>
-
-using namespace fmt::literals;
-
-namespace NTestUtils {
-
- TString GetPgHost() {
- return "localhost";
- }
-
- ui32 GetPgPort() {
- return 15432;
- }
-
- TString GetPgUser() {
- return "user";
- }
-
- TString GetPgDatabase() {
- return "db";
- }
-
- TString GetPgPassword() {
- return "password";
- }
-
- pqxx::connection CreatePostgresqlConnection() {
- const TString connectionString = fmt::format(
- "host={host} port={port} dbname={database} user={user} password={password}",
- "host"_a = GetPgHost(),
- "port"_a = GetPgPort(),
- "database"_a = GetPgDatabase(),
- "user"_a = GetPgUser(),
- "password"_a = GetPgPassword());
-
- TInstant start = TInstant::Now();
- ui32 attempt = 0;
- while ((TInstant::Now() - start).Seconds() < 60) {
- attempt += 1;
- try {
- return pqxx::connection{connectionString};
- } catch (const pqxx::broken_connection& e) {
- Cerr << "Attempt " << attempt << ": " << e.what() << Endl;
- Sleep(TDuration::MilliSeconds(100));
- }
- }
-
- throw yexception() << "Failed to connect PostgreSQL in " << attempt << " attempt(s)";
- }
-
-} // namespace NTestUtils
diff --git a/ydb/core/kqp/ut/federated_query/generic/pg_recipe_ut_helpers.h b/ydb/core/kqp/ut/federated_query/generic/pg_recipe_ut_helpers.h
deleted file mode 100644
index 0e46e1ac3d..0000000000
--- a/ydb/core/kqp/ut/federated_query/generic/pg_recipe_ut_helpers.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#pragma once
-#include <library/cpp/testing/unittest/registar.h>
-
-#include <pqxx/pqxx>
-
-namespace NTestUtils {
-
- TString GetPgHost();
- ui32 GetPgPort();
- TString GetPgUser();
- TString GetPgDatabase();
- TString GetPgPassword();
-
- pqxx::connection CreatePostgresqlConnection();
-
-} // namespace NTestUtils
diff --git a/ydb/core/kqp/ut/federated_query/generic/ya.make b/ydb/core/kqp/ut/federated_query/generic/ya.make
deleted file mode 100644
index 407624f565..0000000000
--- a/ydb/core/kqp/ut/federated_query/generic/ya.make
+++ /dev/null
@@ -1,55 +0,0 @@
-UNITTEST_FOR(ydb/core/kqp)
-
-IF (AUTOCHECK)
- # Split tests to chunks only when they're running on different machines with distbuild,
- # otherwise this directive will slow down local test execution.
- # Look through https://st.yandex-team.ru/DEVTOOLSSUPPORT-39642 for more information.
- FORK_SUBTESTS()
-
- # TAG and REQUIREMENTS are copied from: https://docs.yandex-team.ru/devtools/test/environment#docker-compose
- TAG(
- ya:external
- ya:force_sandbox
- ya:fat
- )
-
- REQUIREMENTS(
- container:4467981730
- cpu:all
- dns:dns64
- )
-ENDIF()
-
-SRCS(
- ch_recipe_ut_helpers.cpp
- connector_recipe_ut_helpers.cpp
- kqp_generic_plan_ut.cpp
- kqp_generic_provider_join_ut.cpp
- pg_recipe_ut_helpers.cpp
-)
-
-PEERDIR(
- contrib/libs/fmt
- contrib/libs/libpqxx
- library/cpp/clickhouse/client
- ydb/core/kqp/ut/common
- ydb/core/kqp/ut/federated_query/common
- ydb/library/yql/providers/generic/connector/libcpp
- ydb/library/yql/sql/pg_dummy
-)
-
-INCLUDE(${ARCADIA_ROOT}/library/recipes/docker_compose/recipe.inc)
-
-# Including of docker_compose/recipe.inc automatically converts these tests into LARGE,
-# which makes it impossible to run them during precommit checks on Github CI.
-# Next several lines forces these tests to be MEDIUM. To see discussion, visit YDBOPS-8928.
-
-IF (OPENSOURCE)
- SIZE(MEDIUM)
- SET(TEST_TAGS_VALUE)
- SET(TEST_REQUIREMENTS_VALUE)
-ENDIF()
-
-YQL_LAST_ABI_VERSION()
-
-END()
diff --git a/ydb/core/kqp/ut/federated_query/ya.make b/ydb/core/kqp/ut/federated_query/ya.make
index d09e0e4493..a0defaea0f 100644
--- a/ydb/core/kqp/ut/federated_query/ya.make
+++ b/ydb/core/kqp/ut/federated_query/ya.make
@@ -1,6 +1,5 @@
RECURSE_FOR_TESTS(
common
- generic
generic_ut
s3
style