-
Notifications
You must be signed in to change notification settings - Fork 28.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
support accessing SQLConf inside tasks
- Loading branch information
Showing
12 changed files
with
184 additions
and
45 deletions.
There are no files selected for viewing
This file contains 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 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
58 changes: 58 additions & 0 deletions
58
sql/catalyst/src/main/scala/org/apache/spark/sql/internal/ReadOnlySQLConf.scala
This file contains 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,58 @@ | ||
| /* | ||
| * 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.") | ||
| } | ||
| } | ||
|
|
||
| class TaskContextConfigProvider(context: TaskContext) extends ConfigProvider { | ||
| override def get(key: String): Option[String] = Option(context.getLocalProperty(key)) | ||
| } |
This file contains 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 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 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 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 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 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 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 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 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")) | ||
| } | ||
| } | ||
| } | ||
| } |