stevomitric commented on code in PR #48546:
URL: https://github.com/apache/spark/pull/48546#discussion_r1858872275
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/collationExpressions.scala:
##########
@@ -73,24 +75,57 @@ 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), AnyDataType)
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)
Review Comment:
Moved to UnresolvedCollation expression.
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/ResolveCollationName.scala:
##########
@@ -0,0 +1,56 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.spark.sql.catalyst.analysis
+
+import org.apache.spark.sql.catalyst.expressions._
+import org.apache.spark.sql.catalyst.plans.logical.LogicalPlan
+import org.apache.spark.sql.catalyst.rules.Rule
+import org.apache.spark.sql.catalyst.trees.TreePattern.UNRESOLVED_COLLATION
+import org.apache.spark.sql.catalyst.util.CollationFactory
+
+/**
+ * Resolves fully qualified collation name and replaces
[[UnresolvedCollation]] with
+ * [[ResolvedCollation]].
+ */
+object ResolveCollationName extends Rule[LogicalPlan] {
+ def apply(plan: LogicalPlan): LogicalPlan =
+
plan.resolveExpressionsWithPruning(_.containsPattern(UNRESOLVED_COLLATION),
ruleId) {
+ case c @ Collate(_, unresolvedCollation: UnresolvedCollation) =>
Review Comment:
Done.
--
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]
