Skip to content

[SPARK-34613][SQL] Fix view does not capture disable hint config #31732

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

Closed
ulysses-you wants to merge 9 commits into from
Closed

[SPARK-34613][SQL] Fix view does not capture disable hint config #31732

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
f47a791
init
ulysses-you Mar 4, 2021
8c9ff7f
name
ulysses-you Mar 4, 2021
66ef82f
move
ulysses-you Mar 4, 2021
c66ce9e
comment
ulysses-you Mar 4, 2021
06012f0
nit
ulysses-you Mar 4, 2021
fc7c31f
create view
ulysses-you Mar 4, 2021
271a2fb
value
ulysses-you Mar 4, 2021
3a7999d
nit
ulysses-you Mar 4, 2021
7d12709
nit
ulysses-you Mar 4, 2021
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
12 changes: 11 additions & 1 deletion sql/core/src/main/scala/org/apache/spark/sql/execution/command/views.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,8 +359,18 @@ object ViewHelper {
"spark.sql.shuffle.",
"spark.sql.adaptive.")

private val configAllowList = Seq(
SQLConf.DISABLE_HINTS.key
)

/**
* Capture view config either of:
* 1. exists in allowList
* 2. do not exists in denyList
*/
private def shouldCaptureConfig(key: String): Boolean = {
!configPrefixDenyList.exists(prefix => key.startsWith(prefix))
configAllowList.exists(prefix => key.equals(prefix)) ||
!configPrefixDenyList.exists(prefix => key.startsWith(prefix))
}

import CatalogTable._
Expand Down
15 changes: 15 additions & 0 deletions sql/core/src/test/scala/org/apache/spark/sql/execution/SQLViewTestSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
package org.apache.spark.sql.execution

import org.apache.spark.sql.{AnalysisException, QueryTest, Row}
import org.apache.spark.sql.catalyst.plans.logical.Repartition
import org.apache.spark.sql.internal.SQLConf._
import org.apache.spark.sql.test.{SharedSparkSession, SQLTestUtils}

Expand Down Expand Up @@ -278,6 +279,20 @@ abstract class SQLViewTestSuite extends QueryTest with SQLTestUtils {
}
}
}

test("SPARK-34613: Fix view does not capture disable hint config") {
withSQLConf(DISABLE_HINTS.key -> "true") {
val viewName = createView("v1", "SELECT /*+ repartition(1) */ 1")
withView(viewName) {
assert(
sql(s"SELECT * FROM $viewName").queryExecution.analyzed.collect {
case e: Repartition => e
}.isEmpty
)
checkViewOutput(viewName, Seq(Row(1)))
}
}
}
}

class LocalTempViewTestSuite extends SQLViewTestSuite with SharedSparkSession {
Expand Down