(paimon) branch master updated: [spark] Fix update table with char type (#4972)

[lzljs3620320]

This is an automated email from the ASF dual-hosted git repository.

lzljs3620320 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/paimon.git


The following commit(s) were added to refs/heads/master by this push:
     new 7b63b5eee1 [spark] Fix update table with char type (#4972)
7b63b5eee1 is described below

commit 7b63b5eee14658b7571f10768803d5350a0caac6
Author: Zouxxyy <zouxinyu....@alibaba-inc.com>
AuthorDate: Wed Jan 22 10:59:11 2025 +0800

    [spark] Fix update table with char type (#4972)
---
 .../apache/paimon/spark/catalyst/analysis/PaimonRelation.scala    | 4 +++-
 .../scala/org/apache/paimon/spark/sql/UpdateTableTestBase.scala   | 8 ++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git 
a/paimon-spark/paimon-spark-common/src/main/scala/org/apache/paimon/spark/catalyst/analysis/PaimonRelation.scala
 
b/paimon-spark/paimon-spark-common/src/main/scala/org/apache/paimon/spark/catalyst/analysis/PaimonRelation.scala
index 668d2b1e94..c362ca67c7 100644
--- 
a/paimon-spark/paimon-spark-common/src/main/scala/org/apache/paimon/spark/catalyst/analysis/PaimonRelation.scala
+++ 
b/paimon-spark/paimon-spark-common/src/main/scala/org/apache/paimon/spark/catalyst/analysis/PaimonRelation.scala
@@ -22,7 +22,7 @@ import org.apache.paimon.spark.SparkTable
 
 import org.apache.spark.internal.Logging
 import org.apache.spark.sql.catalyst.analysis.{EliminateSubqueryAliases, 
ResolvedTable}
-import org.apache.spark.sql.catalyst.plans.logical.LogicalPlan
+import org.apache.spark.sql.catalyst.plans.logical.{LogicalPlan, Project}
 import org.apache.spark.sql.execution.datasources.v2.DataSourceV2Relation
 
 import scala.util.control.NonFatal
@@ -32,6 +32,7 @@ object PaimonRelation extends Logging {
 
   def unapply(plan: LogicalPlan): Option[SparkTable] =
     EliminateSubqueryAliases(plan) match {
+      case Project(_, DataSourceV2Relation(table: SparkTable, _, _, _, _)) => 
Some(table)
       case DataSourceV2Relation(table: SparkTable, _, _, _, _) => Some(table)
       case ResolvedTable(_, _, table: SparkTable, _) => Some(table)
       case _ => None
@@ -49,6 +50,7 @@ object PaimonRelation extends Logging {
 
   def getPaimonRelation(plan: LogicalPlan): DataSourceV2Relation = {
     EliminateSubqueryAliases(plan) match {
+      case Project(_, d @ DataSourceV2Relation(_: SparkTable, _, _, _, _)) => d
       case d @ DataSourceV2Relation(_: SparkTable, _, _, _, _) => d
       case _ => throw new RuntimeException(s"It's not a paimon table, $plan")
     }
diff --git 
a/paimon-spark/paimon-spark-ut/src/test/scala/org/apache/paimon/spark/sql/UpdateTableTestBase.scala
 
b/paimon-spark/paimon-spark-ut/src/test/scala/org/apache/paimon/spark/sql/UpdateTableTestBase.scala
index 5beaea5954..5cbefe9faa 100644
--- 
a/paimon-spark/paimon-spark-ut/src/test/scala/org/apache/paimon/spark/sql/UpdateTableTestBase.scala
+++ 
b/paimon-spark/paimon-spark-ut/src/test/scala/org/apache/paimon/spark/sql/UpdateTableTestBase.scala
@@ -22,6 +22,7 @@ import org.apache.paimon.CoreOptions
 import org.apache.paimon.spark.PaimonSparkTestBase
 import org.apache.paimon.spark.catalyst.analysis.Update
 
+import org.apache.spark.sql.Row
 import org.assertj.core.api.Assertions.{assertThat, assertThatThrownBy}
 
 abstract class UpdateTableTestBase extends PaimonSparkTestBase {
@@ -349,4 +350,11 @@ abstract class UpdateTableTestBase extends 
PaimonSparkTestBase {
       () => spark.sql("UPDATE T SET s.c2 = 'a_new', s = struct(11, 'a_new') 
WHERE s.c1 = 1"))
       .hasMessageContaining("Conflicting update/insert on attrs: s.c2, s")
   }
+
+  test("Paimon update: update table with char type") {
+    sql("CREATE TABLE T (id INT, s STRING, c CHAR(1))")
+    sql("INSERT INTO T VALUES (1, 's', 'a')")
+    sql("UPDATE T SET c = 'b' WHERE id = 1")
+    checkAnswer(sql("SELECT * FROM T"), Seq(Row(1, "s", "b")))
+  }
 }