This is an automated email from the ASF dual-hosted git repository. aljoscha pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/flink.git
commit db66ccae5e789ef634fc3d2855e13c3f1e8556b3 Author: Aljoscha Krettek <[email protected]> AuthorDate: Mon Oct 8 10:10:26 2018 +0200 [FLINK-7811] Disambiguate Scala Example code to work with Scala 2.12 --- .../flink/examples/scala/graph/TransitiveClosureNaive.scala | 13 ++++++++----- .../flink/examples/scala/relational/WebLogAnalysis.scala | 7 +++++-- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/flink-examples/flink-examples-batch/src/main/scala/org/apache/flink/examples/scala/graph/TransitiveClosureNaive.scala b/flink-examples/flink-examples-batch/src/main/scala/org/apache/flink/examples/scala/graph/TransitiveClosureNaive.scala index 1f3a32b..8f87b91 100644 --- a/flink-examples/flink-examples-batch/src/main/scala/org/apache/flink/examples/scala/graph/TransitiveClosureNaive.scala +++ b/flink-examples/flink-examples-batch/src/main/scala/org/apache/flink/examples/scala/graph/TransitiveClosureNaive.scala @@ -67,11 +67,14 @@ object TransitiveClosureNaive { val terminate = prevPaths .coGroup(nextPaths) .where(0).equalTo(0) { - (prev, next, out: Collector[(Long, Long)]) => { - val prevPaths = prev.toSet - for (n <- next) - if (!prevPaths.contains(n)) out.collect(n) - } + ( + prev: Iterator[(Long, Long)], + next: Iterator[(Long, Long)], + out: Collector[(Long, Long)]) => { + val prevPaths = prev.toSet + for (n <- next) + if (!prevPaths.contains(n)) out.collect(n) + } }.withForwardedFieldsSecond("*") (nextPaths, terminate) } diff --git a/flink-examples/flink-examples-batch/src/main/scala/org/apache/flink/examples/scala/relational/WebLogAnalysis.scala b/flink-examples/flink-examples-batch/src/main/scala/org/apache/flink/examples/scala/relational/WebLogAnalysis.scala index 7ed39c9..f068ed3 100644 --- a/flink-examples/flink-examples-batch/src/main/scala/org/apache/flink/examples/scala/relational/WebLogAnalysis.scala +++ b/flink-examples/flink-examples-batch/src/main/scala/org/apache/flink/examples/scala/relational/WebLogAnalysis.scala @@ -118,8 +118,11 @@ object WebLogAnalysis { }.withForwardedFieldsSecond("*") val result = joinDocsRanks.coGroup(filteredVisits).where(1).equalTo(0) { - (ranks, visits, out: Collector[(Int, String, Int)]) => - if (visits.isEmpty) for (rank <- ranks) out.collect(rank) + ( + ranks: Iterator[(Int, String, Int)], + visits: Iterator[(String, String)], + out: Collector[(Int, String, Int)]) => + if (visits.isEmpty) for (rank <- ranks) out.collect(rank) }.withForwardedFieldsFirst("*") // emit result
