From 7dce9e5403b77ea994bf1bb58637da9bb72a2a56 Mon Sep 17 00:00:00 2001 From: Andrey Zvonov <32552679+zvonand@users.noreply.github.com> Date: Sat, 25 Apr 2026 00:45:44 +0200 Subject: [PATCH 1/2] Cherry-pick of https://github.com/Altinity/ClickHouse/pull/1675 with unresolved conflict markers (resolution in next commit) --- Original cherry-pick message follows: Merge pull request #1675 from Altinity/feature/antalya-26.3/ClickHouse-ClickHouse-pr-100452 Antalya 26.3: DataLakeCatalog: avoid full catalog read for `UNKNOWN_TABLE` typo hints # Conflicts: # src/Interpreters/DatabaseCatalog.cpp --- src/Interpreters/DatabaseCatalog.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/Interpreters/DatabaseCatalog.cpp b/src/Interpreters/DatabaseCatalog.cpp index b44000ba4442..4d2852fac4df 100644 --- a/src/Interpreters/DatabaseCatalog.cpp +++ b/src/Interpreters/DatabaseCatalog.cpp @@ -91,7 +91,11 @@ namespace Setting { extern const SettingsBool fsync_metadata; extern const SettingsBool allow_experimental_analyzer; +<<<<<<< HEAD extern const SettingsBool show_remote_databases_in_system_tables; +======= + extern const SettingsBool show_data_lake_catalogs_in_system_tables; +>>>>>>> 9b3bb099f56 (Merge pull request #1675 from Altinity/feature/antalya-26.3/ClickHouse-ClickHouse-pr-100452) } namespace MergeTreeSetting @@ -2288,9 +2292,14 @@ Names TableNameHints::getAllRegisteredNames() const { if (!database) return {}; +<<<<<<< HEAD /// Remote databases (data lake catalogs, MySQL, PostgreSQL) typically list tables via a remote /// service, which is expensive. Skip when user opted out of seeing them in system tables. if (database->isRemoteDatabase() && context && !context->getSettingsRef()[Setting::show_remote_databases_in_system_tables]) +======= + /// DataLakeCatalog::getAllTableNames lists all tables from remote catalog - expensive. Skip when user opted out. + if (database->isDatalakeCatalog() && context && !context->getSettingsRef()[Setting::show_data_lake_catalogs_in_system_tables]) +>>>>>>> 9b3bb099f56 (Merge pull request #1675 from Altinity/feature/antalya-26.3/ClickHouse-ClickHouse-pr-100452) return {}; return database->getAllTableNames(context); } From 2b876294ef153faec2e533f38ab596a9b6e60fcc Mon Sep 17 00:00:00 2001 From: Andrey Zvonov <32552679+zvonand@users.noreply.github.com> Date: Wed, 24 Jun 2026 00:04:23 +0200 Subject: [PATCH 2/2] Resolve conflicts in cherry-pick of #1675 The source PR's change (gate getAllRegisteredNames on show_data_lake_catalogs_in_system_tables via isDatalakeCatalog) is already present on antalya-26.5 in generalized superset form: commit d5f46f603d9 (backport #104416) renamed isDatalakeCatalog -> isRemoteDatabase and show_data_lake_catalogs_in_system_tables -> show_remote_databases_in_system_tables, broadening the skip to all remote databases (data lake catalogs, MySQL, PostgreSQL). The bucket-2 token-swap of the source PR's lines lands exactly on the existing antalya-26.5 code, so the conflict resolves to "ours". Co-Authored-By: Claude Opus 4.8 (1M context) --- src/Interpreters/DatabaseCatalog.cpp | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/Interpreters/DatabaseCatalog.cpp b/src/Interpreters/DatabaseCatalog.cpp index 4d2852fac4df..b44000ba4442 100644 --- a/src/Interpreters/DatabaseCatalog.cpp +++ b/src/Interpreters/DatabaseCatalog.cpp @@ -91,11 +91,7 @@ namespace Setting { extern const SettingsBool fsync_metadata; extern const SettingsBool allow_experimental_analyzer; -<<<<<<< HEAD extern const SettingsBool show_remote_databases_in_system_tables; -======= - extern const SettingsBool show_data_lake_catalogs_in_system_tables; ->>>>>>> 9b3bb099f56 (Merge pull request #1675 from Altinity/feature/antalya-26.3/ClickHouse-ClickHouse-pr-100452) } namespace MergeTreeSetting @@ -2292,14 +2288,9 @@ Names TableNameHints::getAllRegisteredNames() const { if (!database) return {}; -<<<<<<< HEAD /// Remote databases (data lake catalogs, MySQL, PostgreSQL) typically list tables via a remote /// service, which is expensive. Skip when user opted out of seeing them in system tables. if (database->isRemoteDatabase() && context && !context->getSettingsRef()[Setting::show_remote_databases_in_system_tables]) -======= - /// DataLakeCatalog::getAllTableNames lists all tables from remote catalog - expensive. Skip when user opted out. - if (database->isDatalakeCatalog() && context && !context->getSettingsRef()[Setting::show_data_lake_catalogs_in_system_tables]) ->>>>>>> 9b3bb099f56 (Merge pull request #1675 from Altinity/feature/antalya-26.3/ClickHouse-ClickHouse-pr-100452) return {}; return database->getAllTableNames(context); }