miland-db commented on code in PR #45643:
URL: https://github.com/apache/spark/pull/45643#discussion_r1551132518
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/stringExpressions.scala:
##########
@@ -1002,15 +1002,34 @@ case class StringTranslate(srcExpr: Expression,
matchingExpr: Expression, replac
case class FindInSet(left: Expression, right: Expression) extends
BinaryExpression
with ImplicitCastInputTypes with NullIntolerant {
- override def inputTypes: Seq[AbstractDataType] = Seq(StringType, StringType)
+ final lazy val collationId: Int =
left.dataType.asInstanceOf[StringType].collationId
- override protected def nullSafeEval(word: Any, set: Any): Any =
- set.asInstanceOf[UTF8String].findInSet(word.asInstanceOf[UTF8String])
+ override def inputTypes: Seq[AbstractDataType] =
+ Seq(StringTypeAnyCollation, StringTypeAnyCollation)
+
+ override protected def nullSafeEval(word: Any, set: Any): Any = {
+ if (CollationFactory.fetchCollation(collationId).supportsBinaryEquality) {
+ set.asInstanceOf[UTF8String].findInSet(word.asInstanceOf[UTF8String])
+ } else {
+ set.asInstanceOf[UTF8String].findInSet(word.asInstanceOf[UTF8String],
collationId)
+ }
+ }
override def doGenCode(ctx: CodegenContext, ev: ExprCode): ExprCode = {
- nullSafeCodeGen(ctx, ev, (word, set) =>
- s"${ev.value} = $set.findInSet($word);"
- )
+ if (CollationFactory.fetchCollation(collationId).supportsBinaryEquality) {
+ nullSafeCodeGen(ctx, ev, (word, set) => s"${ev.value} =
$set.findInSet($word);")
+ } else {
+ nullSafeCodeGen(ctx, ev, (word, set) => s"${ev.value} =
$set.findInSet($word, $collationId);")
+ }
+ }
+
+ override def checkInputDataTypes(): TypeCheckResult = {
+ val defaultCheck = super.checkInputDataTypes()
+ if (defaultCheck.isFailure) {
+ return defaultCheck
+ }
+
+ CollationTypeConstraints.checkCollationCompatibility(collationId,
children.map(_.dataType))
Review Comment:
Sure, will do
--
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]
