Update TreeRewriter.cpp

Avogar · web-flow · commit e1432be85f5d · 2025-12-10T12:34:14.000+01:00
diff --git a/src/Interpreters/TreeRewriter.cpp b/src/Interpreters/TreeRewriter.cpp
@@ -1024,6 +1024,11 @@ void TreeRewriterResult::collectSourceColumns(bool add_special)
             source_columns.insert(source_columns.end(), columns_from_storage.begin(), columns_from_storage.end());
 
         auto metadata_snapshot = storage->getInMemoryMetadataPtr();
+        source_columns_ordinary = metadata_snapshot->getColumns().getOrdinary();
+    }
+    else
+    {
+        source_columns_ordinary = source_columns;
     }
 
     source_columns_set = removeDuplicateColumns(source_columns);
@@ -1193,7 +1198,7 @@ bool TreeRewriterResult::collectUsedColumns(const ASTPtr & query, bool is_select
     /// Collect missed object subcolumns
     if (!unknown_required_source_columns.empty())
     {
-        for (const NameAndTypePair & pair : required_source_columns)
+        for (const NameAndTypePair & pair : source_columns_ordinary)
         {
             for (auto it = unknown_required_source_columns.begin(); it != unknown_required_source_columns.end();)
             {

Original file line number	Diff line number	Diff line change
`@@ -1024,6 +1024,11 @@ void TreeRewriterResult::collectSourceColumns(bool add_special)`
`1024`	`1024`	`source_columns.insert(source_columns.end(), columns_from_storage.begin(), columns_from_storage.end());`
`1025`	`1025`
`1026`	`1026`	`auto metadata_snapshot = storage->getInMemoryMetadataPtr();`
	`1027`	`+ source_columns_ordinary = metadata_snapshot->getColumns().getOrdinary();`
	`1028`	`+ }`
	`1029`	`+ else`
	`1030`	`+ {`
	`1031`	`+ source_columns_ordinary = source_columns;`
`1027`	`1032`	`}`
`1028`	`1033`
`1029`	`1034`	`source_columns_set = removeDuplicateColumns(source_columns);`
`@@ -1193,7 +1198,7 @@ bool TreeRewriterResult::collectUsedColumns(const ASTPtr & query, bool is_select`
`1193`	`1198`	`/// Collect missed object subcolumns`
`1194`	`1199`	`if (!unknown_required_source_columns.empty())`
`1195`	`1200`	`{`
`1196`		`- for (const NameAndTypePair & pair : required_source_columns)`
	`1201`	`+ for (const NameAndTypePair & pair : source_columns_ordinary)`
`1197`	`1202`	`{`
`1198`	`1203`	`for (auto it = unknown_required_source_columns.begin(); it != unknown_required_source_columns.end();)`
`1199`	`1204`	`{`