Revert "[spark] Fire PaimonMergeInto for data-evolution tables on Spark 4.1 useV2Write=true"

This reverts commit 54591a9.

Author: kerwin-zk

paimon-spark/paimon-spark-common/src/main/scala/org/apache/paimon/spark/catalyst/analysis/PaimonMergeIntoBase.scala

@@ -48,26 +48,15 @@ trait PaimonMergeIntoBase
     // `AnalysisHelper.allowInvokingTransformsInAnalyzer` so the in-analyzer assertion does not
     // trip.
     val skipV2RowLevelTables = org.apache.spark.SPARK_VERSION >= "4.1"
-
-    // Whether to let Spark's built-in RewriteMergeIntoTable take the plan. On Spark 4.1 we skip our
-    // rewrite when the table already exposes SupportsRowLevelOperations AND data-evolution is
-    // disabled. Data-evolution tables (e.g. Blob tables with 'blob-field' + 'data-evolution.enabled')
-    // cause Spark 4.1's RewriteMergeIntoTable to silently skip (its `rewritable` / `aligned` /
-    // `needSchemaEvolution` gate fails on such tables), leaving the plan as a MergeIntoTable that
-    // the physical planner rejects with UNSUPPORTED_FEATURE.TABLE_OPERATION. Paimon's rule knows
-    // how to route those tables through MergeIntoPaimonDataEvolutionTable, so it must still fire.
-    def spark41V2OwnsPlan(target: LogicalPlan): Boolean = {
-      if (!skipV2RowLevelTables) return false
-      val v2Table = PaimonRelation.getPaimonRelation(target).table
-      v2Table.isInstanceOf[SparkTableWithRowLevelOps] &&
-      !v2Table.asInstanceOf[SparkTable].coreOptions.dataEvolutionEnabled()
-    }
-
     AnalysisHelper.allowInvokingTransformsInAnalyzer {
       plan.transformDown {
         case merge: MergeIntoTable
             if merge.resolved && PaimonRelation.isPaimonTable(merge.targetTable) &&
-              !spark41V2OwnsPlan(merge.targetTable) =>
+              (!skipV2RowLevelTables ||
+                !PaimonRelation
+                  .getPaimonRelation(merge.targetTable)
+                  .table
+                  .isInstanceOf[SparkTableWithRowLevelOps]) =>
           val relation = PaimonRelation.getPaimonRelation(merge.targetTable)
           val v2Table = relation.table.asInstanceOf[SparkTable]
           val dataEvolutionEnabled = v2Table.coreOptions.dataEvolutionEnabled()