Repository: spark Updated Branches: refs/heads/branch-1.0 2ee5f0447 -> 40d05a48c
SPARK-1663. (Addendum) Fix signature of one version of JavaPairRDDStream.reduceByKeyAndWindow() It appears that one of these methods doesn't use `org.apache.spark.api.java.function.Function2` like all the others, but uses Scala's `Function2`. Author: Sean Owen <[email protected]> Closes #633 from srowen/SPARK-1663.2 and squashes the following commits: 1e0232d [Sean Owen] Fix signature of one version of reduceByKeyAndWindow to use Java API Function2, as apparently intended (cherry picked from commit 0088cede592540f35f9aec0f24dc1d9bd690d878) Signed-off-by: Patrick Wendell <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/40d05a48 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/40d05a48 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/40d05a48 Branch: refs/heads/branch-1.0 Commit: 40d05a48ce31b8c28f4331cec7be93bb3810274a Parents: 2ee5f04 Author: Sean Owen <[email protected]> Authored: Sun May 4 11:55:29 2014 -0700 Committer: Patrick Wendell <[email protected]> Committed: Sun May 4 11:55:40 2014 -0700 ---------------------------------------------------------------------- .../org/apache/spark/streaming/api/java/JavaPairDStream.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/40d05a48/streaming/src/main/scala/org/apache/spark/streaming/api/java/JavaPairDStream.scala ---------------------------------------------------------------------- diff --git a/streaming/src/main/scala/org/apache/spark/streaming/api/java/JavaPairDStream.scala b/streaming/src/main/scala/org/apache/spark/streaming/api/java/JavaPairDStream.scala index cb8e8f0..c4bdf01 100644 --- a/streaming/src/main/scala/org/apache/spark/streaming/api/java/JavaPairDStream.scala +++ b/streaming/src/main/scala/org/apache/spark/streaming/api/java/JavaPairDStream.scala @@ -262,7 +262,7 @@ class JavaPairDStream[K, V](val dstream: DStream[(K, V)])( * @param windowDuration width of the window; must be a multiple of this DStream's * batching interval */ - def reduceByKeyAndWindow(reduceFunc: Function2[V, V, V], windowDuration: Duration) + def reduceByKeyAndWindow(reduceFunc: JFunction2[V, V, V], windowDuration: Duration) :JavaPairDStream[K, V] = { dstream.reduceByKeyAndWindow(reduceFunc, windowDuration) }
