spark-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject [1/2] git commit: Fix build break caused by BlockInfo refactor
Date Tue, 05 Nov 2013 00:30:34 GMT
Updated Branches:
  refs/heads/branch-0.8 a3544ee3b -> 1d11e4336


Fix build break caused by BlockInfo refactor


Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/c519de96
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/c519de96
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/c519de96

Branch: refs/heads/branch-0.8
Commit: c519de96d1a3d4a98d2b13c88286857af5cb36db
Parents: a3544ee
Author: Michael Armbrust <michael@databricks.com>
Authored: Mon Nov 4 15:52:04 2013 -0800
Committer: Michael Armbrust <michael@databricks.com>
Committed: Mon Nov 4 15:52:04 2013 -0800

----------------------------------------------------------------------
 core/src/main/scala/org/apache/spark/storage/BlockManager.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/c519de96/core/src/main/scala/org/apache/spark/storage/BlockManager.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/spark/storage/BlockManager.scala b/core/src/main/scala/org/apache/spark/storage/BlockManager.scala
index 6818ee8..8f4d69d 100644
--- a/core/src/main/scala/org/apache/spark/storage/BlockManager.scala
+++ b/core/src/main/scala/org/apache/spark/storage/BlockManager.scala
@@ -672,7 +672,7 @@ private[spark] class BlockManager(
     // to be dropped right after it got put into memory. Note, however, that other threads
will
     // not be able to get() this block until we call markReady on its BlockInfo.
     val myInfo = {
-      val tinfo = new BlockInfo(level, tellMaster)
+      val tinfo = new BlockInfoImpl(level, tellMaster)
       // Do atomically !
       val oldBlockOpt = blockInfo.putIfAbsent(blockId, tinfo)
 


Mime
View raw message