Refactor mixed-format operation rules for Iceberg 1.10.x compatibility

Author: xxubai

amoro-format-mixed/amoro-mixed-spark/amoro-mixed-spark-3-common/pom.xml

@@ -49,7 +49,7 @@
         <dependency>
             <groupId>org.apache.avro</groupId>
             <artifactId>avro</artifactId>
-            <version>1.12.1</version>
+            <version>1.12.0</version>
         </dependency>
 
         <dependency>

amoro-format-mixed/amoro-mixed-spark/v3.4/amoro-mixed-spark-3.4/src/main/scala/org/apache/amoro/spark/MixedFormatSparkExtensions.scala

@@ -43,11 +43,17 @@ class MixedFormatSparkExtensions extends (SparkSessionExtensions => Unit) {
 
     extensions.injectPostHocResolutionRule(spark => RewriteMixedFormatCommand(spark))
 
+    // mixed-format row-level operation rewrite rules
+    // These must be resolution rules (not optimizer rules) so they run BEFORE Iceberg 1.10.x's
+    // RewriteUpdateTableForRowLineage and RewriteMergeIntoTableForRowLineage rules. Those Iceberg
+    // rules do pattern matching on the table and throw scala.MatchError for non-SparkTable types
+    // (i.e., MixedSparkTable).
+    extensions.injectResolutionRule { spark => RewriteUpdateMixedFormatTable(spark) }
+    extensions.injectResolutionRule { spark => RewriteDeleteFromMixedFormatTable(spark) }
+
     // mixed-format optimizer rules
     extensions.injectPostHocResolutionRule { spark => QueryWithConstraintCheck(spark) }
     extensions.injectOptimizerRule { spark => RewriteAppendMixedFormatTable(spark) }
-    extensions.injectOptimizerRule { spark => RewriteDeleteFromMixedFormatTable(spark) }
-    extensions.injectOptimizerRule { spark => RewriteUpdateMixedFormatTable(spark) }
 
     // planner extensions
     extensions.injectPlannerStrategy { spark => MixedFormatExtendedDataSourceV2Strategy(spark) }

amoro-format-mixed/amoro-mixed-spark/v3.5/amoro-mixed-spark-3.5/src/main/scala/org/apache/amoro/spark/MixedFormatSparkExtensions.scala

@@ -43,11 +43,17 @@ class MixedFormatSparkExtensions extends (SparkSessionExtensions => Unit) {
 
     extensions.injectPostHocResolutionRule(spark => RewriteMixedFormatCommand(spark))
 
+    // mixed-format row-level operation rewrite rules
+    // These must be resolution rules (not optimizer rules) so they run BEFORE Iceberg 1.10.x's
+    // RewriteUpdateTableForRowLineage and RewriteMergeIntoTableForRowLineage rules. Those Iceberg
+    // rules do pattern matching on the table and throw scala.MatchError for non-SparkTable types
+    // (i.e., MixedSparkTable).
+    extensions.injectResolutionRule { spark => RewriteUpdateMixedFormatTable(spark) }
+    extensions.injectResolutionRule { spark => RewriteDeleteFromMixedFormatTable(spark) }
+
     // mixed-format optimizer rules
     extensions.injectPostHocResolutionRule { spark => QueryWithConstraintCheck(spark) }
     extensions.injectOptimizerRule { spark => RewriteAppendMixedFormatTable(spark) }
-    extensions.injectOptimizerRule { spark => RewriteDeleteFromMixedFormatTable(spark) }
-    extensions.injectOptimizerRule { spark => RewriteUpdateMixedFormatTable(spark) }
 
     // planner extensions
     extensions.injectPlannerStrategy { spark => MixedFormatExtendedDataSourceV2Strategy(spark) }