Disable catalogs in system tables by alesapin · Pull Request #88341 · ClickHouse/ClickHouse

alesapin · 2025-10-10T11:56:06Z

Changelog category (leave one):

Bug Fix (user-visible misbehavior in an official stable release)

Changelog entry (a user-readable short description of the changes that goes into CHANGELOG.md):

Now datalakes catalogs will be shown in system introspection tables only if show_data_lake_catalogs_in_system_tables explicitly enabled.

Documentation entry for user-facing changes

Documentation is written (mandatory for new features)

clickhouse-gh · 2025-10-10T11:56:31Z

Workflow [PR], commit [37f3ea6]

Summary: ❌

job_name	test_name	status	info
Integration tests (arm_binary, distributed plan, 1/4)		failure
	test_keeper_three_nodes_two_alive/test.py::test_restart_third_node	FAIL	cidb
Integration tests (arm_binary, distributed plan, 4/4)		failure
	test_storage_rabbitmq/test.py::test_rabbitmq_headers_exchange	FAIL	cidb
Integration tests (amd_tsan, 1/6)		failure
	test_storage_s3_queue/test_4.py::test_alter_settings	FAIL	cidb

src/Interpreters/DatabaseCatalog.h

SmitaRKulkarni · 2025-10-10T12:28:16Z

src/Storages/System/StorageSystemIcebergHistory.cpp

    if (show_tables_granted)
    {
-        auto databases = DatabaseCatalog::instance().getDatabases();
+        auto databases = DatabaseCatalog::instance().getDatabases(true);


For this one system table we are going to list irrespective of the flag. Is this intentional ? Then maybe we should mention in docs that for this one system table we will always display data lake too

src/Interpreters/DatabaseCatalog.h

src/Databases/DataLake/DatabaseDataLake.h

src/Backups/BackupEntriesCollector.cpp

src/Interpreters/InterpreterCheckQuery.cpp

src/Interpreters/InterpreterSystemQuery.cpp

src/Interpreters/ServerAsynchronousMetrics.cpp

src/Interpreters/loadMetadata.cpp

src/Storages/RocksDB/StorageSystemRocksDB.cpp

src/Storages/System/StorageSystemClusters.cpp

src/Interpreters/DatabaseCatalog.cpp

src/Storages/System/StorageSystemDataSkippingIndices.cpp

src/Storages/System/StorageSystemDatabaseReplicas.cpp

src/Storages/System/StorageSystemDistributionQueue.cpp

src/Storages/System/StorageSystemPartMovesBetweenShards.cpp

src/Storages/System/StorageSystemPartsBase.cpp

src/Storages/System/StorageSystemProjections.cpp

src/Storages/System/StorageSystemReplicas.cpp

src/Storages/System/StorageSystemReplicationQueue.cpp

…_system_tables

…in_system_tables Disable catalogs in system tables

…isable_catalogs_in_system_tables Antalya 25.8 Backport of ClickHouse#88341: Disable catalogs in system tables

…in_system_tables Disable catalogs in system tables

25.8.13 Stable backport of ClickHouse#88341: Disable catalogs in system tables

25.8.15 Stable backport of ClickHouse#88341, ClickHouse#89914

alesapin added 2 commits October 10, 2025 13:54

Don't show database catalogs if not explictely requested

9556252

Remove accident change

f3a289a

clickhouse-gh bot added the pr-bugfix Pull request with bugfix, not backported by default label Oct 10, 2025

SmitaRKulkarni self-assigned this Oct 10, 2025

SmitaRKulkarni reviewed Oct 10, 2025

View reviewed changes

src/Interpreters/DatabaseCatalog.h Outdated Show resolved Hide resolved

SmitaRKulkarni reviewed Oct 10, 2025

View reviewed changes

SmitaRKulkarni added 5 commits October 10, 2025 15:23

Add test to check system tables

e1cae38

Fix style check

3b0519c

Updated SettingsChangesHistory

97d4aa7

Fix build

fe809dd

Fix tests where system tables are used

3444e1c