You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by jo...@apache.org on 2014/12/11 05:45:11 UTC
spark git commit: [CORE]codeStyle: uniform ConcurrentHashMap define
in StorageLevel.scala with other places
Repository: spark
Updated Branches:
refs/heads/master 652b781a9 -> 57d37f9c7
[CORE]codeStyle: uniform ConcurrentHashMap define in StorageLevel.scala with other places
Author: Zhang, Liye <li...@intel.com>
Closes #2793 from liyezhang556520/uniformHashMap and squashes the following commits:
5884735 [Zhang, Liye] [CORE]codeStyle: uniform ConcurrentHashMap define in StorageLevel.scala
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/57d37f9c
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/57d37f9c
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/57d37f9c
Branch: refs/heads/master
Commit: 57d37f9c7193f1cb04a22d7f512178696b655b71
Parents: 652b781
Author: Zhang, Liye <li...@intel.com>
Authored: Wed Dec 10 20:44:59 2014 -0800
Committer: Josh Rosen <jo...@databricks.com>
Committed: Wed Dec 10 20:44:59 2014 -0800
----------------------------------------------------------------------
core/src/main/scala/org/apache/spark/storage/StorageLevel.scala | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/57d37f9c/core/src/main/scala/org/apache/spark/storage/StorageLevel.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/spark/storage/StorageLevel.scala b/core/src/main/scala/org/apache/spark/storage/StorageLevel.scala
index 56edc4f..e5e1cf5 100644
--- a/core/src/main/scala/org/apache/spark/storage/StorageLevel.scala
+++ b/core/src/main/scala/org/apache/spark/storage/StorageLevel.scala
@@ -18,6 +18,7 @@
package org.apache.spark.storage
import java.io.{Externalizable, IOException, ObjectInput, ObjectOutput}
+import java.util.concurrent.ConcurrentHashMap
import org.apache.spark.annotation.DeveloperApi
import org.apache.spark.util.Utils
@@ -220,8 +221,7 @@ object StorageLevel {
getCachedStorageLevel(obj)
}
- private[spark] val storageLevelCache =
- new java.util.concurrent.ConcurrentHashMap[StorageLevel, StorageLevel]()
+ private[spark] val storageLevelCache = new ConcurrentHashMap[StorageLevel, StorageLevel]()
private[spark] def getCachedStorageLevel(level: StorageLevel): StorageLevel = {
storageLevelCache.putIfAbsent(level, level)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org