Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[SPARK-49695][SQL] Postgres fix xor push-down #48144

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
Open

[SPARK-49695][SQL] Postgres fix xor push-down #48144

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
70cdc0e
PostgresDialect: add PostgresSqlBuilder, add override for xor push-down
andrej-db Sep 18, 2024
7e81576
V2JDBCTest: add test
andrej-db Sep 22, 2024
02cf3d3
V2JDBCTest: remove test
andrej-db Sep 23, 2024
6df7f81
Update PostgresIntegrationSuite.scala
andrej-db Oct 23, 2024
f2982ae
Update PostgresIntegrationSuite.scala
andrej-db Oct 23, 2024
de4a5cb
Merge branch 'master' into SPARK-49695-PostgresXOR
andrej-db Oct 23, 2024
f7aadd7
Update PostgresIntegrationSuite.scala
andrej-db Oct 24, 2024
6d18ec6
Update PostgresIntegrationSuite.scala
andrej-db Oct 24, 2024
7b95659
PostgresIntegrationSuite: override
andrej-db Oct 24, 2024
485a48d
PostgresIntegrationSuite: import
andrej-db Oct 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 24 additions & 1 deletion sql/core/src/main/scala/org/apache/spark/sql/jdbc/PostgresDialect.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,15 @@ import java.util
import java.util.Locale

import scala.util.Using
import scala.util.control.NonFatal

import org.apache.spark.internal.LogKeys.COLUMN_NAME
import org.apache.spark.internal.MDC
import org.apache.spark.sql.AnalysisException
import org.apache.spark.sql.catalyst.SQLConfHelper
import org.apache.spark.sql.catalyst.analysis.{IndexAlreadyExistsException, NonEmptyNamespaceException, NoSuchIndexException}
import org.apache.spark.sql.connector.catalog.Identifier
import org.apache.spark.sql.connector.expressions.NamedReference
import org.apache.spark.sql.connector.expressions.{Expression, GeneralScalarExpression, NamedReference}
import org.apache.spark.sql.errors.QueryCompilationErrors
import org.apache.spark.sql.execution.datasources.jdbc.{JDBCOptions, JdbcUtils}
import org.apache.spark.sql.execution.datasources.v2.TableSampleInfo
Expand Down Expand Up @@ -379,4 +380,26 @@ private case class PostgresDialect()
case _ =>
}
}

override def compileExpression(expr: Expression): Option[String] = {
val builder = new PostgresSQLBuilder()
try {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

perhaps its better to only override visitBinaryArithmetics?

We have similar problem with some of the functions and we use dialectFunctionName to translate from Spark to local dialect

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1 here, let's override last possible method in chain of execution

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

Some(builder.build(expr))
} catch {
case NonFatal(e) =>
logWarning("Error occurs while compiling V2 expression", e)
None
}
}

private class PostgresSQLBuilder extends JDBCSQLBuilder {
override def build(expr: Expression): String = {
expr match {
// Postgres uses '#' for xor, rather then '^'.
case e: GeneralScalarExpression if e.name() == "^" =>
visitBinaryArithmetic("#", inputToSQL(e.children().head), inputToSQL(e.children()(1)))
case _ => super.build(expr)
}
}
}
}