diff --git a/sql/core/src/main/scala/org/apache/spark/sql/catalyst/util/V2ExpressionBuilder.scala b/sql/core/src/main/scala/org/apache/spark/sql/catalyst/util/V2ExpressionBuilder.scala index 70c85def45d99..d5b75b3f02230 100644 --- a/sql/core/src/main/scala/org/apache/spark/sql/catalyst/util/V2ExpressionBuilder.scala +++ b/sql/core/src/main/scala/org/apache/spark/sql/catalyst/util/V2ExpressionBuilder.scala @@ -154,8 +154,8 @@ class V2ExpressionBuilder(e: Expression, isPredicate: Boolean = false) { val r = generateExpression(b.right) if (l.isDefined && r.isDefined) { b match { - case _: Predicate if isBinaryComparisonOperator(b.sqlOperator) && - l.get.isInstanceOf[LiteralValue[_]] && r.get.isInstanceOf[FieldReference] => + case _: BinaryComparison if l.get.isInstanceOf[LiteralValue[_]] && + r.get.isInstanceOf[FieldReference] => Some(new V2Predicate(flipComparisonOperatorName(b.sqlOperator), Array[V2Expression](r.get, l.get))) case _: Predicate => @@ -269,13 +269,6 @@ class V2ExpressionBuilder(e: Expression, isPredicate: Boolean = false) { case _ => None } - private def isBinaryComparisonOperator(operatorName: String): Boolean = { - operatorName match { - case ">" | "<" | ">=" | "<=" | "=" | "<=>" => true - case _ => false - } - } - private def flipComparisonOperatorName(operatorName: String): String = { operatorName match { case ">" => "<"