Repository: spark Updated Branches: refs/heads/branch-1.5 7fa419535 -> 6306019ff
[SPARK-9601] [DOCS] Fix JavaPairDStream signature for stream-stream and windowed join in streaming guide doc Author: Namit Katariya <[email protected]> Closes #7935 from namitk/SPARK-9601 and squashes the following commits: 03b5784 [Namit Katariya] [SPARK-9601] Fix signature of JavaPairDStream for stream-stream and windowed join in streaming guide doc (cherry picked from commit 1bf608b5ef1e6e2ae4325e13c2bd5e34db62450f) Signed-off-by: Tathagata Das <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/6306019f Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/6306019f Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/6306019f Branch: refs/heads/branch-1.5 Commit: 6306019ff126ba064919e70d244fa43dd6349cdf Parents: 7fa4195 Author: Namit Katariya <[email protected]> Authored: Wed Aug 5 01:07:33 2015 -0700 Committer: Tathagata Das <[email protected]> Committed: Wed Aug 5 01:07:51 2015 -0700 ---------------------------------------------------------------------- docs/streaming-programming-guide.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/6306019f/docs/streaming-programming-guide.md ---------------------------------------------------------------------- diff --git a/docs/streaming-programming-guide.md b/docs/streaming-programming-guide.md index 4663b3f..dbfdb61 100644 --- a/docs/streaming-programming-guide.md +++ b/docs/streaming-programming-guide.md @@ -1141,7 +1141,7 @@ val joinedStream = stream1.join(stream2) {% highlight java %} JavaPairDStream<String, String> stream1 = ... JavaPairDStream<String, String> stream2 = ... -JavaPairDStream<String, String> joinedStream = stream1.join(stream2); +JavaPairDStream<String, Tuple2<String, String>> joinedStream = stream1.join(stream2); {% endhighlight %} </div> <div data-lang="python" markdown="1"> @@ -1166,7 +1166,7 @@ val joinedStream = windowedStream1.join(windowedStream2) {% highlight java %} JavaPairDStream<String, String> windowedStream1 = stream1.window(Durations.seconds(20)); JavaPairDStream<String, String> windowedStream2 = stream2.window(Durations.minutes(1)); -JavaPairDStream<String, String> joinedStream = windowedStream1.join(windowedStream2); +JavaPairDStream<String, Tuple2<String, String>> joinedStream = windowedStream1.join(windowedStream2); {% endhighlight %} </div> <div data-lang="python" markdown="1"> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
