Merge branch 'main' into bitmap_avoid_deser

Author: harry-hao

Cargo.lock

@@ -525,7 +525,7 @@ build_exceptions! {
     IllegalUser(2218),
 }
 
-// Database and Catalog Management Errors [2301-2317, 2321-2327]
+// Database and Catalog Management Errors [2301-2317, 2321-2329]
 build_exceptions! {
     /// Database already exists
     DatabaseAlreadyExists(2301),
@@ -569,6 +569,10 @@ build_exceptions! {
     GeneralDbGcFailure(2325),
     /// Table snapshot expired
     TableSnapshotExpired(2327),
+    /// Invalid materialized view metadata or state
+    InvalidMaterializedView(2328),
+    /// Materialized view already exists
+    MaterializedViewAlreadyExists(2329),
 }
 
 // Stage and Connection Errors [2501-2505, 2510-2512]

src/common/exception/src/exception_code.rs

@@ -129,6 +129,7 @@ impl AutoIncrementApiTestSuite {
                 },
                 table_meta: drop_table_meta(created_on),
                 as_dropped: true,
+                materialized_view: None,
                 table_properties: None,
                 table_partition: None,
             };

src/meta/api/src/api_impl/auto_increment_api_test_suite.rs

@@ -38,8 +38,12 @@ use databend_common_meta_app::schema::DroppedId;
 use databend_common_meta_app::schema::GcDroppedTableReq;
 use databend_common_meta_app::schema::IndexNameIdent;
 use databend_common_meta_app::schema::ListIndexesReq;
+use databend_common_meta_app::schema::MVDefinitionIdent;
+use databend_common_meta_app::schema::MVSourceBindingVersionIdent;
 use databend_common_meta_app::schema::ObjectTagIdRef;
 use databend_common_meta_app::schema::ObjectTagIdRefIdent;
+use databend_common_meta_app::schema::SourceTableMV;
+use databend_common_meta_app::schema::SourceTableMVIdent;
 use databend_common_meta_app::schema::TableCopiedFileNameIdent;
 use databend_common_meta_app::schema::TableId;
 use databend_common_meta_app::schema::TableIdHistoryIdent;
@@ -51,6 +55,7 @@ use databend_common_meta_app::schema::TaggableObject;
 use databend_common_meta_app::schema::VacuumWatermark;
 use databend_common_meta_app::schema::index_id_ident::IndexIdIdent;
 use databend_common_meta_app::schema::index_id_to_name_ident::IndexIdToNameIdent;
+use databend_common_meta_app::schema::is_materialized_view_engine;
 use databend_common_meta_app::schema::table_niv::TableNIV;
 use databend_common_meta_app::schema::vacuum_watermark_ident::VacuumWatermarkIdent;
 use databend_common_meta_app::tenant::Tenant;
@@ -772,6 +777,45 @@ async fn remove_data_for_dropped_table(
     //     warn!("{}", err);
     //     return Ok(Err(err));
     // }
+    // DROP TABLE normally deletes the MV definition. Database GC may collect
+    // tables without first running the per-table DROP path, so keep this
+    // deletion idempotent here as well.
+    if is_materialized_view_engine(&seq_meta.data.engine) {
+        txn.if_then
+            .push(txn_del(&MVDefinitionIdent::new(tenant, table_id.table_id)));
+        match seq_meta.data.materialized_view_source_table_id() {
+            Ok(source_table_id) => {
+                txn.if_then.push(txn_del(&SourceTableMVIdent::new_generic(
+                    tenant,
+                    SourceTableMV::new(source_table_id, table_id.table_id),
+                )));
+            }
+            Err(err) => {
+                warn!(
+                    table_id = table_id.table_id,
+                    error :% = err;
+                    "GC materialized view can not remove its source relationship"
+                );
+            }
+        }
+    }
+
+    let source_mv_prefix = DirName::new(SourceTableMVIdent::new_generic(
+        tenant,
+        SourceTableMV::new(table_id.table_id, 0),
+    ));
+    let source_mvs = kv_api
+        .list_pb_vec(ListOptions::unlimited(&source_mv_prefix))
+        .await?;
+    // The source table or its database is already dropped, so no new MV can
+    // reference it. Concurrent relationship deletions are idempotent.
+    txn.if_then
+        .extend(source_mvs.into_iter().map(|(ident, _)| txn_del(&ident)));
+    txn.if_then.push(txn_del(&MVSourceBindingVersionIdent::new(
+        tenant,
+        table_id.table_id,
+    )));
+
     txn_delete_exact(txn, table_id, seq_meta.seq);
 
     // Get id -> name mapping