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 2014/06/09 08:20:14 UTC
git commit: Grammar: read -> reads
Repository: spark
Updated Branches:
refs/heads/master 15ddbef41 -> 32ee9f066
Grammar: read -> reads
Author: Andrew Ash <an...@andrewash.com>
Closes #1016 from ash211/patch-6 and squashes the following commits:
e3865c8 [Andrew Ash] Grammar: read -> reads
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/32ee9f06
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/32ee9f06
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/32ee9f06
Branch: refs/heads/master
Commit: 32ee9f0668e50083e415b0662b18f5d2581413f0
Parents: 15ddbef
Author: Andrew Ash <an...@andrewash.com>
Authored: Sun Jun 8 23:20:10 2014 -0700
Committer: Reynold Xin <rx...@apache.org>
Committed: Sun Jun 8 23:20:10 2014 -0700
----------------------------------------------------------------------
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/spark/blob/32ee9f06/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 a41286d..9cd79d2 100644
--- a/core/src/main/scala/org/apache/spark/storage/BlockManager.scala
+++ b/core/src/main/scala/org/apache/spark/storage/BlockManager.scala
@@ -1024,7 +1024,7 @@ private[spark] class BlockManager(
if (blockId.isShuffle) {
// Reducer may need to read many local shuffle blocks and will wrap them into Iterators
// at the beginning. The wrapping will cost some memory (compression instance
- // initialization, etc.). Reducer read shuffle blocks one by one so we could do the
+ // initialization, etc.). Reducer reads shuffle blocks one by one so we could do the
// wrapping lazily to save memory.
class LazyProxyIterator(f: => Iterator[Any]) extends Iterator[Any] {
lazy val proxy = f