add note for use synchronizedMap

apache · Aug 19, 2014 · 0cc05dd · 0cc05dd
1 parent 3c224d3
commit 0cc05dd
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/sql/core/src/main/scala/org/apache/spark/sql/SQLConf.scala b/sql/core/src/main/scala/org/apache/spark/sql/SQLConf.scala
@@ -50,8 +50,9 @@ private[spark] object SQLConf {
 trait SQLConf {
   import SQLConf._
 
-  @transient protected[spark] val settings =
-    new java.util.concurrent.ConcurrentHashMap[String, String]
+  /** Only low degree of contention is expected for conf, thus NOT using ConcurrentHashMap. */
+  @transient protected[spark] val settings = java.util.Collections.synchronizedMap(
+    new java.util.HashMap[String, String]())
 
   /** ************************ Spark SQL Params/Hints ******************* */
   // TODO: refactor so that these hints accessors don't pollute the name space of SQLContext?