Backport ClickHouse#91040 to 25.8: Fix reading dynamic subcolumns from materialized columns in mutations

Author: robot-clickhouse

src/Interpreters/TreeRewriter.cpp

@@ -1024,11 +1024,6 @@ 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);
@@ -1225,7 +1220,7 @@ bool TreeRewriterResult::collectUsedColumns(const ASTPtr & query, bool is_select
     /// Check for subcolumns in unknown required columns.
     if (!unknown_required_source_columns.empty() && (!storage || storage->supportsSubcolumns()))
     {
-        for (const NameAndTypePair & pair : source_columns_ordinary)
+        for (const NameAndTypePair & pair : required_source_columns)
         {
             for (auto it = unknown_required_source_columns.begin(); it != unknown_required_source_columns.end();)
             {

src/Interpreters/TreeRewriter.h

@@ -34,9 +34,6 @@ struct TreeRewriterResult
     /// Same as above but also record alias columns which are expanded. This is for RBAC access check.
     Names required_source_columns_before_expanding_alias_columns;
 
-    /// Set of columns that object columns are not extended. This is for distinguishing JSON and Tuple type.
-    NamesAndTypesList source_columns_ordinary;
-
     NameSet missed_subcolumns;
 
     /// Set of alias columns that are expanded to their alias expressions. We still need the original columns to check access permission.

tests/queries/0_stateless/03741_subcolumns_of_materialized_columns_in_mutation.reference

@@ -0,0 +1 @@
+{}

tests/queries/0_stateless/03741_subcolumns_of_materialized_columns_in_mutation.sql

@@ -0,0 +1,7 @@
+drop table if exists test;
+create table test (s String, json JSON materialized s) engine=MergeTree order by tuple();
+insert into test select '{"a" : 42}';
+alter table test update s = '{}' where json.a = 42 settings mutations_sync=1;
+select * from test;
+drop table test;
+