stevomitric commented on code in PR #48546:
URL: https://github.com/apache/spark/pull/48546#discussion_r1857498334
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/collationExpressions.scala:
##########
@@ -73,24 +75,60 @@ object CollateExpressionBuilder extends ExpressionBuilder {
* This function is pass-through, it will not modify the input data.
* Only type metadata will be updated.
*/
-case class Collate(child: Expression, collationName: String)
- extends UnaryExpression with ExpectsInputTypes {
- private val collationId = CollationFactory.collationNameToId(collationName)
- override def dataType: DataType = StringType(collationId)
+case class Collate(child: Expression, collation: Expression)
+ extends BinaryExpression with ExpectsInputTypes with CodegenFallback {
+ override def left: Expression = child
+ override def right: Expression = collation
+ override def dataType: DataType = collation.dataType
override def inputTypes: Seq[AbstractDataType] =
- Seq(StringTypeWithCollation(supportsTrimCollation = true))
-
- override protected def withNewChildInternal(
- newChild: Expression): Expression = copy(newChild)
+ Seq(StringTypeWithCollation(supportsTrimCollation = true),
+ StringTypeWithCollation(supportsTrimCollation = true))
Review Comment:
Done.
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/collationExpressions.scala:
##########
@@ -73,24 +75,60 @@ object CollateExpressionBuilder extends ExpressionBuilder {
* This function is pass-through, it will not modify the input data.
* Only type metadata will be updated.
*/
-case class Collate(child: Expression, collationName: String)
- extends UnaryExpression with ExpectsInputTypes {
- private val collationId = CollationFactory.collationNameToId(collationName)
- override def dataType: DataType = StringType(collationId)
+case class Collate(child: Expression, collation: Expression)
+ extends BinaryExpression with ExpectsInputTypes with CodegenFallback {
+ override def left: Expression = child
+ override def right: Expression = collation
+ override def dataType: DataType = collation.dataType
override def inputTypes: Seq[AbstractDataType] =
- Seq(StringTypeWithCollation(supportsTrimCollation = true))
-
- override protected def withNewChildInternal(
- newChild: Expression): Expression = copy(newChild)
+ Seq(StringTypeWithCollation(supportsTrimCollation = true),
+ StringTypeWithCollation(supportsTrimCollation = true))
override def eval(row: InternalRow): Any = child.eval(row)
- override protected def doGenCode(ctx: CodegenContext, ev: ExprCode):
ExprCode =
- defineCodeGen(ctx, ev, (in) => in)
+ override def sql: String = s"$prettyName(${child.sql}, $collation)"
+
+ override def toString: String =
+ s"$prettyName($child, $collation)"
+
+ final override val nodePatterns: Seq[TreePattern] = Seq(UNRESOLVED_COLLATION)
+
+ override protected def withNewChildrenInternal(
+ newLeft: Expression, newRight: Expression): Expression =
+ copy(child = newLeft, collation = newRight)
+}
+
+/**
+ * An expression that marks an unresolved collation name.
+ *
+ * This class is used to represent a collation name that has not yet been
resolved from a fully
+ * qualified collation name. It is used during the analysis phase, where the
collation name is
+ * specified but not yet validated or resolved.
+ */
+case class UnresolvedCollation(collationName: Seq[String])
+ extends LeafExpression with Unevaluable {
+ override def dataType: DataType = throw new UnresolvedException("dataType")
+
+ override def nullable: Boolean = false
+
+ override lazy val resolved: Boolean = false
+}
+
+/**
+ * An expression that represents a resolved collation name.
+ */
+case class ResolvedCollation(collationName: String) extends LeafExpression
with CodegenFallback {
Review Comment:
Done.
Since `Unevaluable` implies `foldable=false`, i made the `Collate`
expression to take the `foldable` property only from its left (expression)
child.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
