diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/DataSourceScanExec.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/DataSourceScanExec.scala index 1b13550521a3b..474d65a251ba3 100644 --- a/sql/core/src/main/scala/org/apache/spark/sql/execution/DataSourceScanExec.scala +++ b/sql/core/src/main/scala/org/apache/spark/sql/execution/DataSourceScanExec.scala @@ -130,7 +130,7 @@ case class RowDataSourceScanExec( override def verboseStringWithOperatorId(): String = { super.verboseStringWithOperatorId() + (rdd match { case externalEngineDatasourceRdd: ExternalEngineDatasourceRDD => - "Executed query: " + + "External engine query: " + externalEngineDatasourceRdd.getExternalEngineQuery + System.lineSeparator() case _ => "" diff --git a/sql/core/src/main/scala/org/apache/spark/sql/jdbc/JdbcSQLQueryBuilder.scala b/sql/core/src/main/scala/org/apache/spark/sql/jdbc/JdbcSQLQueryBuilder.scala index 89e2bf625fdc9..1f3d2fe1549a6 100644 --- a/sql/core/src/main/scala/org/apache/spark/sql/jdbc/JdbcSQLQueryBuilder.scala +++ b/sql/core/src/main/scala/org/apache/spark/sql/jdbc/JdbcSQLQueryBuilder.scala @@ -81,8 +81,9 @@ class JdbcSQLQueryBuilder(dialect: JdbcDialect, options: JDBCOptions) { /** * Constructs the WHERE clause that following dialect's SQL syntax. */ - def withPredicates(predicates: Array[Predicate], - part: Option[JDBCPartition]): JdbcSQLQueryBuilder = { + def withPredicates( + predicates: Array[Predicate], + part: Option[JDBCPartition]): JdbcSQLQueryBuilder = { // `filters`, but as a WHERE clause suitable for injection into a SQL query. val filterWhereClause: String = { predicates.flatMap(dialect.compileExpression(_)).map(p => s"($p)").mkString(" AND ") diff --git a/sql/core/src/test/scala/org/apache/spark/sql/jdbc/JDBCV2Suite.scala b/sql/core/src/test/scala/org/apache/spark/sql/jdbc/JDBCV2Suite.scala index 9db1573605b3d..7bae2d77a161d 100644 --- a/sql/core/src/test/scala/org/apache/spark/sql/jdbc/JDBCV2Suite.scala +++ b/sql/core/src/test/scala/org/apache/spark/sql/jdbc/JDBCV2Suite.scala @@ -3026,6 +3026,6 @@ class JDBCV2Suite extends QueryTest with SharedSparkSession with ExplainSuiteHel test("Explain shows executed SQL query") { val df = sql("SELECT max(id) FROM h2.test.people WHERE id > 1") val explained = getNormalizedExplain(df, FormattedMode) - assert(explained.contains("Executed query:")) + assert(explained.contains("External engine query:")) } }