Skip to content

Commit 7dd1343

Browse files
authored
Merge pull request ClickHouse#88359 from ClickHouse/backport/25.3/88330
Backport ClickHouse#88330 to 25.3: Add missing checks for canContainMergeTreeTables() into system tables
2 parents 419b830 + 08457bd commit 7dd1343

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

src/Storages/System/StorageSystemDataSkippingIndices.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -266,6 +266,8 @@ void ReadFromSystemDataSkippingIndices::initializePipeline(QueryPipelineBuilder
266266
{
267267
if (database_name == DatabaseCatalog::TEMPORARY_DATABASE)
268268
continue;
269+
if (!database->canContainMergeTreeTables())
270+
continue;
269271

270272
/// Lazy database can contain only very primitive tables,
271273
/// it cannot contain tables with data skipping indices.

src/Storages/System/StorageSystemProjections.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -253,6 +253,8 @@ void ReadFromSystemProjections::initializePipeline(QueryPipelineBuilder & pipeli
253253
{
254254
if (database_name == DatabaseCatalog::TEMPORARY_DATABASE)
255255
continue;
256+
if (!database->canContainMergeTreeTables())
257+
continue;
256258

257259
/// Lazy database can contain only very primitive tables, it cannot contain tables with projections.
258260
/// Skip it to avoid unnecessary tables loading in the Lazy database.

0 commit comments

Comments
 (0)