File tree Expand file tree Collapse file tree 2 files changed +3
-3
lines changed
catalyst/src/main/scala/org/apache/spark/sql/internal
core/src/main/scala/org/apache/spark/sql Expand file tree Collapse file tree 2 files changed +3
-3
lines changed Original file line number Diff line number Diff line change @@ -45,7 +45,7 @@ import org.apache.spark.util.Utils
45
45
46
46
object SQLConf {
47
47
48
- private val sqlConfEntries = java.util.Collections .synchronizedMap(
48
+ private [sql] val sqlConfEntries = java.util.Collections .synchronizedMap(
49
49
new java.util.HashMap [String , ConfigEntry [_]]())
50
50
51
51
val staticConfKeys : java.util.Set [String ] =
Original file line number Diff line number Diff line change 17
17
18
18
package org .apache .spark .sql
19
19
20
- import org .apache .spark .SparkConf
21
20
import org .apache .spark .annotation .InterfaceStability
22
21
import org .apache .spark .internal .config .{ConfigEntry , OptionalConfigEntry }
23
22
import org .apache .spark .sql .internal .SQLConf
@@ -155,7 +154,8 @@ class RuntimeConfig private[sql](sqlConf: SQLConf = new SQLConf) {
155
154
if (SQLConf .staticConfKeys.contains(key)) {
156
155
throw new AnalysisException (s " Cannot modify the value of a static config: $key" )
157
156
}
158
- if (sqlConf.setCommandRejectsSparkConfs && SparkConf .sparkConfEntries.containsKey(key)) {
157
+ if (sqlConf.setCommandRejectsSparkConfs &&
158
+ ConfigEntry .findEntry(key) != null && ! SQLConf .sqlConfEntries.containsKey(key)) {
159
159
throw new AnalysisException (s " Cannot modify the value of a spark config: $key" )
160
160
}
161
161
}
You can’t perform that action at this time.
0 commit comments