fix failing tests for variantagg

apache · Jan 23, 2025 · 30b05b3 · 30b05b3
1 parent 9957e45
commit 30b05b3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/...yst/src/main/scala/org/apache/spark/sql/catalyst/analysis/ResolveDefaultStringTypes.scala b/...yst/src/main/scala/org/apache/spark/sql/catalyst/analysis/ResolveDefaultStringTypes.scala
@@ -156,10 +156,11 @@ object ResolveDefaultStringTypes extends Rule[LogicalPlan] {
     case expression if needsCast(expression) =>
       expression.setTagValue(CAST_ADDED_TAG, ())
       newType => {
-        if (expression.dataType.sameType(newType)) {
+        val replacedType = replaceDefaultStringType(expression.dataType, newType)
+        if (newType == StringType || replacedType.sameType(newType)) {
           expression
         } else {
-          Cast(expression, replaceDefaultStringType(expression.dataType, newType))
+          Cast(expression, replacedType)
         }
       }
   }

diff --git a/...src/main/scala/org/apache/spark/sql/catalyst/expressions/variant/variantExpressions.scala b/...src/main/scala/org/apache/spark/sql/catalyst/expressions/variant/variantExpressions.scala
@@ -858,12 +858,13 @@ case class SchemaOfVariantAgg(
     extends TypedImperativeAggregate[DataType]
     with ExpectsInputTypes
     with QueryErrorsBase
-    with DefaultStringProducingExpression
     with UnaryLike[Expression] {
   def this(child: Expression) = this(child, 0, 0)
 
   override def inputTypes: Seq[AbstractDataType] = Seq(VariantType)
 
+  override def dataType: DataType = SQLConf.get.defaultStringType
+
   override def nullable: Boolean = false
 
   override def createAggregationBuffer(): DataType = NullType