This is an automated email from the ASF dual-hosted git repository.
wenchen pushed a commit to branch branch-4.0
in repository https://gitbox.apache.org/repos/asf/spark.git
The following commit(s) were added to refs/heads/branch-4.0 by this push:
new d5021ff4e4cf [SPARK-50880][SQL] Add a new visitBinaryComparison method
to V2ExpressionSQLBuilder
d5021ff4e4cf is described below
commit d5021ff4e4cfe2d7539ad95b1b798ef55681b55e
Author: beliefer <[email protected]>
AuthorDate: Tue Jan 21 17:40:37 2025 +0800
[SPARK-50880][SQL] Add a new visitBinaryComparison method to
V2ExpressionSQLBuilder
### What changes were proposed in this pull request?
This PR proposes to add a new `visitBinaryComparison` method to
`V2ExpressionSQLBuilder`.
### Why are the changes needed?
The origin `visitBinaryComparison` method is not good for users when the
compare predicate is related to the data type.
Such as: Oracle doesn't support predicate '=' for binary and need use
`DBMS_LOB.COMPARE` to replace.
So the old `visitBinaryComparison` method is not flexible and introduce
some hacker code.
### Does this PR introduce _any_ user-facing change?
'No'.
Just add a new API.
### How was this patch tested?
GA.
### Was this patch authored or co-authored using generative AI tooling?
'No'.
Closes #49556 from beliefer/SPARK-50880.
Authored-by: beliefer <[email protected]>
Signed-off-by: Wenchen Fan <[email protected]>
(cherry picked from commit e88d8bc905100acd86d4e8a6175a7dd8c7e504f8)
Signed-off-by: Wenchen Fan <[email protected]>
---
.../sql/connector/util/V2ExpressionSQLBuilder.java | 6 +++-
.../org/apache/spark/sql/jdbc/OracleDialect.scala | 34 +++++++++-------------
2 files changed, 19 insertions(+), 21 deletions(-)
diff --git
a/sql/catalyst/src/main/java/org/apache/spark/sql/connector/util/V2ExpressionSQLBuilder.java
b/sql/catalyst/src/main/java/org/apache/spark/sql/connector/util/V2ExpressionSQLBuilder.java
index 49afcd5ebcd5..cb132ab11326 100644
---
a/sql/catalyst/src/main/java/org/apache/spark/sql/connector/util/V2ExpressionSQLBuilder.java
+++
b/sql/catalyst/src/main/java/org/apache/spark/sql/connector/util/V2ExpressionSQLBuilder.java
@@ -98,7 +98,7 @@ public class V2ExpressionSQLBuilder {
case "ENDS_WITH" -> visitEndsWith(build(e.children()[0]),
build(e.children()[1]));
case "CONTAINS" -> visitContains(build(e.children()[0]),
build(e.children()[1]));
case "=", "<>", "<=>", "<", "<=", ">", ">=" ->
- visitBinaryComparison(name, inputToSQL(e.children()[0]),
inputToSQL(e.children()[1]));
+ visitBinaryComparison(name, e.children()[0], e.children()[1]);
case "+", "*", "/", "%", "&", "|", "^" ->
visitBinaryArithmetic(name, inputToSQL(e.children()[0]),
inputToSQL(e.children()[1]));
case "-" -> {
@@ -219,6 +219,10 @@ public class V2ExpressionSQLBuilder {
}
}
+ protected String visitBinaryComparison(String name, Expression le,
Expression re) {
+ return visitBinaryComparison(name, inputToSQL(le), inputToSQL(re));
+ }
+
protected String visitBinaryComparison(String name, String l, String r) {
if (name.equals("<=>")) {
return "((" + l + " IS NOT NULL AND " + r + " IS NOT NULL AND " + l + "
= " + r + ") " +
diff --git
a/sql/core/src/main/scala/org/apache/spark/sql/jdbc/OracleDialect.scala
b/sql/core/src/main/scala/org/apache/spark/sql/jdbc/OracleDialect.scala
index adb0da1a2126..114b524dcd96 100644
--- a/sql/core/src/main/scala/org/apache/spark/sql/jdbc/OracleDialect.scala
+++ b/sql/core/src/main/scala/org/apache/spark/sql/jdbc/OracleDialect.scala
@@ -24,7 +24,7 @@ import scala.util.control.NonFatal
import org.apache.spark.{SparkThrowable, SparkUnsupportedOperationException}
import org.apache.spark.sql.catalyst.SQLConfHelper
-import org.apache.spark.sql.connector.expressions.{Expression,
GeneralScalarExpression, Literal}
+import org.apache.spark.sql.connector.expressions.{Expression, Literal}
import org.apache.spark.sql.errors.QueryCompilationErrors
import org.apache.spark.sql.execution.datasources.jdbc.JDBCOptions
import org.apache.spark.sql.jdbc.OracleDialect._
@@ -62,33 +62,27 @@ private case class OracleDialect() extends JdbcDialect with
SQLConfHelper with N
super.visitAggregateFunction(funcName, isDistinct, inputs)
}
+ override def visitBinaryComparison(name: String, le: Expression, re:
Expression): String = {
+ (le, re) match {
+ case (lhs: Literal[_], rhs: Expression) if lhs.dataType == BinaryType
=>
+ compareBlob(lhs, name, rhs)
+ case (lhs: Expression, rhs: Literal[_]) if rhs.dataType == BinaryType
=>
+ compareBlob(lhs, name, rhs)
+ case _ =>
+ super.visitBinaryComparison(name, le, re);
+ }
+ }
+
private def compareBlob(lhs: Expression, operator: String, rhs:
Expression): String = {
val l = inputToSQL(lhs)
val r = inputToSQL(rhs)
- val op = if (operator == "<=>") "=" else operator
- val compare = s"DBMS_LOB.COMPARE($l, $r) $op 0"
if (operator == "<=>") {
+ val compare = s"DBMS_LOB.COMPARE($l, $r) = 0"
s"(($l IS NOT NULL AND $r IS NOT NULL AND $compare) OR ($l IS NULL AND
$r IS NULL))"
} else {
- compare
+ s"DBMS_LOB.COMPARE($l, $r) $operator 0"
}
}
-
- override def build(expr: Expression): String = expr match {
- case e: GeneralScalarExpression =>
- e.name() match {
- case "=" | "<>" | "<=>" | "<" | "<=" | ">" | ">=" =>
- (e.children()(0), e.children()(1)) match {
- case (lhs: Literal[_], rhs: Expression) if lhs.dataType ==
BinaryType =>
- compareBlob(lhs, e.name, rhs)
- case (lhs: Expression, rhs: Literal[_]) if rhs.dataType ==
BinaryType =>
- compareBlob(lhs, e.name, rhs)
- case _ => super.build(expr)
- }
- case _ => super.build(expr)
- }
- case _ => super.build(expr)
- }
}
override def compileExpression(expr: Expression): Option[String] = {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
