Merge pull request ClickHouse#86457 from ClickHouse/backport/25.8/86413

Backport ClickHouse#86413 to 25.8: Fix MV dependencies double removal

Author: tavplubix

src/Storages/LiveView/StorageLiveView.cpp

@@ -267,9 +267,6 @@ void StorageLiveView::checkTableCanBeDropped([[ maybe_unused ]] ContextPtr query
 
 void StorageLiveView::drop()
 {
-    auto table_id = getStorageID();
-    DatabaseCatalog::instance().removeViewDependency(select_query_description.select_table_id, table_id);
-
     std::lock_guard lock(mutex);
     condition.notify_all();
 }

src/Storages/StorageMaterializedView.cpp

@@ -444,9 +444,6 @@ SinkToStoragePtr StorageMaterializedView::write(const ASTPtr & query, const Stor
 void StorageMaterializedView::drop()
 {
     auto table_id = getStorageID();
-    const auto & select_query = getInMemoryMetadataPtr()->getSelectQuery();
-    if (!select_query.select_table_id.empty())
-        DatabaseCatalog::instance().removeViewDependency(select_query.select_table_id, table_id);
 
     if (getInMemoryMetadataPtr()->sql_security_type == SQLSecurityType::DEFINER)
         ViewDefinerDependencies::instance().removeViewDependencies(table_id);

tests/queries/0_stateless/02073_mv_dependency_recreate.reference

@@ -0,0 +1,2 @@
+1
+2

tests/queries/0_stateless/02073_mv_dependency_recreate.sh

@@ -0,0 +1,25 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+$CLICKHOUSE_CLIENT --query "create table src (n int) engine=MergeTree order by n"
+$CLICKHOUSE_CLIENT --query "create table dst (n int) engine=MergeTree order by n"
+$CLICKHOUSE_CLIENT --query "create materialized view mv to dst (n int) as select * from src"
+$CLICKHOUSE_CLIENT --query "insert into src select 1"
+$CLICKHOUSE_CLIENT --query "select sleep(2) from mv format Null" 2> /dev/null &
+sleep 0.$RANDOM
+
+$CLICKHOUSE_CLIENT --database_atomic_wait_for_drop_and_detach_synchronously=0 --query "drop table mv"
+$CLICKHOUSE_CLIENT --query "create materialized view mv to dst (n int) as select * from src"
+
+wait
+sleep 1 # increase chance of reproducing the issue
+$CLICKHOUSE_CLIENT --query "insert into src select 2"
+
+$CLICKHOUSE_CLIENT --query "select * from dst order by n"
+
+$CLICKHOUSE_CLIENT --query "drop table mv"
+$CLICKHOUSE_CLIENT --query "drop table src"
+$CLICKHOUSE_CLIENT --query "drop table dst"