fix ut

apache · Aug 5, 2024 · 9f6afb6 · 9f6afb6
1 parent 6365088
commit 9f6afb6
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 9 deletions.
diff --git a/...ark-common/src/main/scala/org/apache/paimon/spark/commands/PaimonShowColumnsCommand.scala b/...ark-common/src/main/scala/org/apache/paimon/spark/commands/PaimonShowColumnsCommand.scala
@@ -19,18 +19,19 @@
 package org.apache.paimon.spark.commands
 
 import org.apache.paimon.spark.SparkTable
-import org.apache.paimon.spark.leafnode.PaimonLeafRunnableCommand
+import org.apache.paimon.spark.leafnode.{PaimonLeafCommand, PaimonLeafRunnableCommand}
 import org.apache.paimon.table.FileStoreTable
 
 import org.apache.spark.sql.{Row, SparkSession}
+import org.apache.spark.sql.catalyst.expressions.{Attribute, AttributeReference}
+import org.apache.spark.sql.types.{BinaryType, Metadata, StringType}
 
 case class PaimonShowColumnsCommand(v2Table: SparkTable)
-  extends PaimonLeafRunnableCommand
+  extends PaimonLeafCommand
   with WithFileStoreTable {
   override def table: FileStoreTable = v2Table.getTable.asInstanceOf[FileStoreTable]
 
-  override def run(sparkSession: SparkSession): Seq[Row] = {
-    Seq.empty[Row]
-  }
+  override lazy val output: Seq[Attribute] = Seq(
+    AttributeReference("column", StringType, true, Metadata.empty)())
 
 }
diff --git a/...spark-common/src/main/scala/org/apache/paimon/spark/execution/PaimonShowColumnsExec.scala b/...spark-common/src/main/scala/org/apache/paimon/spark/execution/PaimonShowColumnsExec.scala
@@ -23,12 +23,13 @@ import org.apache.paimon.spark.leafnode.PaimonLeafV2CommandExec
 
 import org.apache.spark.sql.catalyst.InternalRow
 import org.apache.spark.sql.catalyst.expressions.Attribute
+import org.apache.spark.unsafe.types.UTF8String
 
 case class PaimonShowColumnsExec(output: Seq[Attribute], v2Table: SparkTable)
   extends PaimonLeafV2CommandExec {
 
   override protected def run(): Seq[InternalRow] = {
-    v2Table.schema.map(sc => InternalRow.fromSeq(Seq(sc.name))).toSeq
+    v2Table.schema.map(sc => InternalRow.fromSeq(Seq(UTF8String.fromString(sc.name)))).toSeq
   }
 
 }
diff --git a/...paimon-spark-common/src/main/scala/org/apache/paimon/spark/execution/PaimonStrategy.scala b/...paimon-spark-common/src/main/scala/org/apache/paimon/spark/execution/PaimonStrategy.scala
@@ -39,8 +39,8 @@ case class PaimonStrategy(spark: SparkSession) extends Strategy with PredicateHe
       val input = buildInternalRow(args)
       PaimonCallExec(c.output, procedure, input) :: Nil
 
-    case c @ PaimonShowColumnsCommand(table) =>
-      PaimonShowColumnsExec(c.output, table) :: Nil
+    case s @ PaimonShowColumnsCommand(table) =>
+      PaimonShowColumnsExec(s.output, table) :: Nil
     case _ => Nil
   }
 

diff --git a/...n-spark-common/src/test/scala/org/apache/paimon/spark/sql/PaimonShowColumnsTestBase.scala b/...n-spark-common/src/test/scala/org/apache/paimon/spark/sql/PaimonShowColumnsTestBase.scala
@@ -20,9 +20,10 @@ package org.apache.paimon.spark.sql
 
 import org.apache.paimon.spark.PaimonSparkTestBase
 
+import org.apache.spark.sql.Row
 import org.junit.jupiter.api.Assertions.assertDoesNotThrow
 
-class PaimonShowColumnsTestBase extends PaimonSparkTestBase {
+abstract class PaimonShowColumnsTestBase extends PaimonSparkTestBase {
 
   test("Show columns from Paimon test") {
     spark.sql(s"""
@@ -42,6 +43,10 @@ class PaimonShowColumnsTestBase extends PaimonSparkTestBase {
         spark.sql("SHOW COLUMNS FROM T")
       })
 
+    checkAnswer(
+      spark.sql("SHOW COLUMNS FROM T"),
+      Row("id") :: Row("name") :: Row("i") :: Row("l") :: Nil)
+
   }
 
 }