-
Notifications
You must be signed in to change notification settings - Fork 28.9k
[SPARK-24250][SQL] support accessing SQLConf inside tasks #21299
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.
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
Closed
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
e39b7d0
Revert "[SPARK-22938][SQL][FOLLOWUP] Assert that SQLConf.get is acces…
cloud-fan 7c7caf8
support accessing SQLConf inside tasks
cloud-fan dc63dbe
address comments
cloud-fan 2ecabe4
fix json
cloud-fan bf8b42d
fix
cloud-fan a100dea
address comments
cloud-fan 01e288a
fix
cloud-fan cf75856
Merge branch 'master' into config
cloud-fan cfb76f5
address comment
cloud-fan File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
66 changes: 66 additions & 0 deletions
66
sql/catalyst/src/main/scala/org/apache/spark/sql/internal/ReadOnlySQLConf.scala
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.apache.spark.sql.internal | ||
|
|
||
| import java.util.{Map => JMap} | ||
|
|
||
| import org.apache.spark.{TaskContext, TaskContextImpl} | ||
| import org.apache.spark.internal.config.{ConfigEntry, ConfigProvider, ConfigReader} | ||
|
|
||
| /** | ||
| * A readonly SQLConf that will be created by tasks running at the executor side. It reads the | ||
| * configs from the local properties which are propagated from driver to executors. | ||
| */ | ||
| class ReadOnlySQLConf(context: TaskContext) extends SQLConf { | ||
|
|
||
| @transient override val settings: JMap[String, String] = { | ||
| context.asInstanceOf[TaskContextImpl].getLocalProperties().asInstanceOf[JMap[String, String]] | ||
| } | ||
|
|
||
| @transient override protected val reader: ConfigReader = { | ||
| new ConfigReader(new TaskContextConfigProvider(context)) | ||
| } | ||
|
|
||
| override protected def setConfWithCheck(key: String, value: String): Unit = { | ||
| throw new UnsupportedOperationException("Cannot mutate ReadOnlySQLConf.") | ||
| } | ||
|
|
||
| override def unsetConf(key: String): Unit = { | ||
| throw new UnsupportedOperationException("Cannot mutate ReadOnlySQLConf.") | ||
| } | ||
|
|
||
| override def unsetConf(entry: ConfigEntry[_]): Unit = { | ||
| throw new UnsupportedOperationException("Cannot mutate ReadOnlySQLConf.") | ||
| } | ||
|
|
||
| override def clear(): Unit = { | ||
| throw new UnsupportedOperationException("Cannot mutate ReadOnlySQLConf.") | ||
| } | ||
|
|
||
| override def clone(): SQLConf = { | ||
| throw new UnsupportedOperationException("Cannot clone/copy ReadOnlySQLConf.") | ||
| } | ||
|
|
||
| override def copy(entries: (ConfigEntry[_], Any)*): SQLConf = { | ||
| throw new UnsupportedOperationException("Cannot clone/copy ReadOnlySQLConf.") | ||
| } | ||
| } | ||
|
|
||
| class TaskContextConfigProvider(context: TaskContext) extends ConfigProvider { | ||
| override def get(key: String): Option[String] = Option(context.getLocalProperty(key)) | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
66 changes: 66 additions & 0 deletions
66
sql/core/src/test/scala/org/apache/spark/sql/internal/ExecutorSideSQLConfSuite.scala
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.apache.spark.sql.internal | ||
|
|
||
| import org.apache.spark.SparkFunSuite | ||
| import org.apache.spark.sql.SparkSession | ||
| import org.apache.spark.sql.test.SQLTestUtils | ||
|
|
||
| class ExecutorSideSQLConfSuite extends SparkFunSuite with SQLTestUtils { | ||
| import testImplicits._ | ||
|
|
||
| protected var spark: SparkSession = null | ||
|
|
||
| // Create a new [[SparkSession]] running in local-cluster mode. | ||
| override def beforeAll(): Unit = { | ||
| super.beforeAll() | ||
| spark = SparkSession.builder() | ||
| .master("local-cluster[2,1,1024]") | ||
| .appName("testing") | ||
| .getOrCreate() | ||
| } | ||
|
|
||
| override def afterAll(): Unit = { | ||
| spark.stop() | ||
| spark = null | ||
| } | ||
|
|
||
| test("ReadonlySQLConf is correctly created at the executor side") { | ||
| SQLConf.get.setConfString("spark.sql.x", "a") | ||
| try { | ||
| val checks = spark.range(10).mapPartitions { it => | ||
| val conf = SQLConf.get | ||
| Iterator(conf.isInstanceOf[ReadOnlySQLConf] && conf.getConfString("spark.sql.x") == "a") | ||
| }.collect() | ||
| assert(checks.forall(_ == true)) | ||
| } finally { | ||
| SQLConf.get.unsetConf("spark.sql.x") | ||
| } | ||
| } | ||
|
|
||
| test("case-sensitive config should work for json schema inference") { | ||
| withSQLConf(SQLConf.CASE_SENSITIVE.key -> "true") { | ||
| withTempPath { path => | ||
| val pathString = path.getCanonicalPath | ||
| spark.range(10).select('id.as("ID")).write.json(pathString) | ||
| spark.range(10).write.mode("append").json(pathString) | ||
| assert(spark.read.json(pathString).columns.toSet == Set("id", "ID")) | ||
| } | ||
| } | ||
| } | ||
| } |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Maybe cleaner in following way: