cloud-fan commented on code in PR #37332:
URL: https://github.com/apache/spark/pull/37332#discussion_r934160479
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/internal/connector/PredicateUtils.scala:
##########
@@ -43,6 +54,83 @@ private[sql] object PredicateUtils {
Some(In(attribute, Array.empty[Any]))
}
+ case "=" | "<=>" | ">" | "<" | ">=" | "<=" if isValidBinaryPredicate =>
+ val attribute = predicate.children()(0).toString
+ val value = predicate.children()(1).asInstanceOf[LiteralValue[_]]
+ predicate.name() match {
+ case "=" =>
+ Some(EqualTo(attribute,
+ CatalystTypeConverters.convertToScala(value.value,
value.dataType)))
+ case "<=>" =>
+ Some(EqualNullSafe(attribute,
+ CatalystTypeConverters.convertToScala(value.value,
value.dataType)))
+ case ">" =>
+ Some(GreaterThan(attribute,
+ CatalystTypeConverters.convertToScala(value.value,
value.dataType)))
+ case ">=" =>
+ Some(GreaterThanOrEqual(attribute,
+ CatalystTypeConverters.convertToScala(value.value,
value.dataType)))
+ case "<" =>
+ Some(LessThan(attribute,
+ CatalystTypeConverters.convertToScala(value.value,
value.dataType)))
+ case "<=" =>
+ Some(LessThanOrEqual(attribute,
+ CatalystTypeConverters.convertToScala(value.value,
value.dataType)))
+ }
+
+ case "IS_NULL" | "IS_NOT_NULL" if predicate.children().length == 1 &&
+ predicate.children()(0).isInstanceOf[NamedReference] =>
+ val attribute = predicate.children()(0).toString
+ predicate.name() match {
+ case "IS_NULL" => Some(IsNull(attribute))
+ case "IS_NOT_NULL" => Some(IsNotNull(attribute))
+ }
+
+ case "STARTS_WITH" | "ENDS_WITH" | "CONTAINS" if isValidBinaryPredicate
=>
+ val attribute = predicate.children()(0).toString
+ val value = predicate.children()(1).asInstanceOf[LiteralValue[_]]
+ if (!value.dataType.sameType(StringType)) return None
+ predicate.name() match {
+ case "STARTS_WITH" =>
+ Some(StringStartsWith(attribute, value.value.toString))
+ case "ENDS_WITH" =>
+ Some(StringEndsWith(attribute, value.value.toString))
+ case "CONTAINS" =>
+ Some(StringContains(attribute, value.value.toString))
+ }
+
+ case "ALWAYS_TRUE" | "ALWAYS_FALSE" if predicate.children().isEmpty =>
+ predicate.name() match {
+ case "ALWAYS_TRUE" => Some(AlwaysTrue())
+ case "ALWAYS_FALSE" => Some(AlwaysFalse())
+ }
+
+ case "AND" =>
+ val and = predicate.asInstanceOf[V2And]
+ val left = toV1(and.left())
+ val right = toV1(and.right())
+ if (left.nonEmpty && right.nonEmpty) {
+ Some(And(left.get, right.get))
+ } else {
+ None
+ }
+
+ case "OR" =>
+ val or = predicate.asInstanceOf[V2Or]
+ val left = toV1(or.left())
+ val right = toV1(or.right())
+ if (left.nonEmpty && right.nonEmpty) {
+ Some(Or(left.get, right.get))
+ } else if (left.nonEmpty) {
+ left
+ } else {
+ right
+ }
+
+ case "NOT" =>
+ val not = predicate.asInstanceOf[V2Not]
+ Some(Not(toV1(not.child()).get))
Review Comment:
`toV1(not.child())` may not always return `Some`
--
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]
