You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by rx...@apache.org on 2013/11/05 01:30:34 UTC
[1/2] git commit: Fix build break caused by BlockInfo refactor
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 <mi...@databricks.com>
Authored: Mon Nov 4 15:52:04 2013 -0800
Committer: Michael Armbrust <mi...@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)
[2/2] git commit: Merge pull request #138 from marmbrus/branch-0.8
Posted by rx...@apache.org.
Merge pull request #138 from marmbrus/branch-0.8
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/1d11e433
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/1d11e433
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/1d11e433
Branch: refs/heads/branch-0.8
Commit: 1d11e4336144e4159081b466399f6aab76a8e6e1
Parents: a3544ee c519de9
Author: Reynold Xin <rx...@apache.org>
Authored: Mon Nov 4 16:30:30 2013 -0800
Committer: Reynold Xin <rx...@apache.org>
Committed: Mon Nov 4 16:30:30 2013 -0800
----------------------------------------------------------------------
core/src/main/scala/org/apache/spark/storage/BlockManager.scala | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------