Analyzer: fix 01019_alter_materialized_view_consistent

vdimir · vdimir · commit 5703e0995bf6 · 2023-11-02T10:27:22.000Z
diff --git a/src/Processors/Transforms/buildPushingToViewsChain.cpp b/src/Processors/Transforms/buildPushingToViewsChain.cpp
@@ -319,7 +319,20 @@ Chain buildPushingToViewsChain(
             StoragePtr inner_table = materialized_view->getTargetTable();
             auto inner_table_id = inner_table->getStorageID();
             auto inner_metadata_snapshot = inner_table->getInMemoryMetadataPtr();
-            query = view_metadata_snapshot->getSelectQuery().inner_query;
+
+            const auto & select_query = view_metadata_snapshot->getSelectQuery();
+            if (select_query.select_table_id != table_id)
+            {
+                /// It may happen if materialize view query was changed and it doesn't depend on this source table anymore.
+                /// See setting `allow_experimental_alter_materialized_view_structure`
+                LOG_DEBUG(
+                    &Poco::Logger::get("PushingToViews"), "Table '{}' is not a source for view '{}' anymore, current source is '{}'",
+                        select_query.select_table_id.getFullTableName(), view_id.getFullTableName(), table_id);
+                continue;
+            }
+
+            query = select_query.inner_query;
+
             target_name = inner_table_id.getFullTableName();
 
             Block header;
@@ -493,7 +506,8 @@ static QueryPipeline process(Block block, ViewRuntimeData & view, const ViewsDat
         pipeline = interpreter.buildQueryPipeline();
     }
     else
-    {   InterpreterSelectQuery interpreter(view.query, local_context, SelectQueryOptions());
+    {
+        InterpreterSelectQuery interpreter(view.query, local_context, SelectQueryOptions());
         pipeline = interpreter.buildQueryPipeline();
     }
 
diff --git a/src/Storages/StorageMaterializedView.cpp b/src/Storages/StorageMaterializedView.cpp
@@ -283,8 +283,6 @@ void StorageMaterializedView::alter(
         const auto & old_select = old_metadata.getSelectQuery();
 
         DatabaseCatalog::instance().updateViewDependency(old_select.select_table_id, table_id, new_select.select_table_id, table_id);
-
-        new_metadata.setSelectQuery(new_select);
     }
     /// end modify query
 
diff --git a/tests/analyzer_tech_debt.txt b/tests/analyzer_tech_debt.txt
@@ -86,4 +86,3 @@
 02815_range_dict_no_direct_join
 02845_threads_count_in_distributed_queries
 02861_join_on_nullsafe_compare
-01019_alter_materialized_view_consistent

Original file line number	Diff line number	Diff line change
`@@ -283,8 +283,6 @@ void StorageMaterializedView::alter(`
`283`	`283`	`const auto & old_select = old_metadata.getSelectQuery();`
`284`	`284`
`285`	`285`	`DatabaseCatalog::instance().updateViewDependency(old_select.select_table_id, table_id, new_select.select_table_id, table_id);`
`286`		`-`
`287`		`- new_metadata.setSelectQuery(new_select);`
`288`	`286`	`}`
`289`	`287`	`/// end modify query`
`290`	`288`