aboutsummaryrefslogtreecommitdiff
path: root/core/src/main/scala
diff options
context:
space:
mode:
authorSandy Ryza <sandy@cloudera.com>2014-07-18 00:47:43 -0700
committerReynold Xin <rxin@apache.org>2014-07-18 00:47:43 -0700
commit30b8d369d459be5da133f12ebb33a9c74579f468 (patch)
treeaf249a281d91ebd0f80ccd6e0dfb0236fdf7e2bc /core/src/main/scala
parente52b8719cf0603e79ded51cbe1c9f88eea8b56de (diff)
downloadspark-30b8d369d459be5da133f12ebb33a9c74579f468.tar.gz
spark-30b8d369d459be5da133f12ebb33a9c74579f468.tar.bz2
spark-30b8d369d459be5da133f12ebb33a9c74579f468.zip
SPARK-2553. Fix compile error
Author: Sandy Ryza <sandy@cloudera.com> Closes #1479 from sryza/sandy-spark-2553 and squashes the following commits: 2cb5ed8 [Sandy Ryza] SPARK-2553. Fix compile error
Diffstat (limited to 'core/src/main/scala')
-rw-r--r--core/src/main/scala/org/apache/spark/rdd/CoGroupedRDD.scala1
1 files changed, 1 insertions, 0 deletions
diff --git a/core/src/main/scala/org/apache/spark/rdd/CoGroupedRDD.scala b/core/src/main/scala/org/apache/spark/rdd/CoGroupedRDD.scala
index b284b636f2..5366c1a1cc 100644
--- a/core/src/main/scala/org/apache/spark/rdd/CoGroupedRDD.scala
+++ b/core/src/main/scala/org/apache/spark/rdd/CoGroupedRDD.scala
@@ -185,6 +185,7 @@ class CoGroupedRDD[K](@transient var rdds: Seq[RDD[_ <: Product2[K, _]]], part:
combiner1(depNum) ++= combiner2(depNum)
depNum += 1
}
+ combiner1
}
new ExternalAppendOnlyMap[K, CoGroupValue, CoGroupCombiner](
createCombiner, mergeValue, mergeCombiners)