Repository: spark Updated Branches: refs/heads/branch-0.9 51a77e977 -> 87e4dd58c
Fix example bug: compile error Author: jianghan <[email protected]> Closes #132 from pooorman/master and squashes the following commits: 54afbe0 [jianghan] Fix example bug: compile error (cherry picked from commit 31a704004f9b4ad34f92ae5c95ae6e90d0ab62c7) 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/87e4dd58 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/87e4dd58 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/87e4dd58 Branch: refs/heads/branch-0.9 Commit: 87e4dd58ce75fcabf9582528f65510bc24ebc85e Parents: 51a77e9 Author: jianghan <[email protected]> Authored: Wed Mar 12 19:46:12 2014 -0700 Committer: Patrick Wendell <[email protected]> Committed: Wed Mar 12 19:46:48 2014 -0700 ---------------------------------------------------------------------- .../src/main/java/org/apache/spark/examples/JavaLogQuery.java | 2 +- .../src/main/java/org/apache/spark/examples/JavaPageRank.java | 6 +++--- .../src/main/java/org/apache/spark/examples/JavaWordCount.java | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/87e4dd58/examples/src/main/java/org/apache/spark/examples/JavaLogQuery.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/apache/spark/examples/JavaLogQuery.java b/examples/src/main/java/org/apache/spark/examples/JavaLogQuery.java index 9eb1cad..a933f48 100644 --- a/examples/src/main/java/org/apache/spark/examples/JavaLogQuery.java +++ b/examples/src/main/java/org/apache/spark/examples/JavaLogQuery.java @@ -124,7 +124,7 @@ public final class JavaLogQuery { List<Tuple2<Tuple3<String, String, String>, Stats>> output = counts.collect(); for (Tuple2<?,?> t : output) { - System.out.println(t._1 + "\t" + t._2); + System.out.println(t._1() + "\t" + t._2()); } System.exit(0); } http://git-wip-us.apache.org/repos/asf/spark/blob/87e4dd58/examples/src/main/java/org/apache/spark/examples/JavaPageRank.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/apache/spark/examples/JavaPageRank.java b/examples/src/main/java/org/apache/spark/examples/JavaPageRank.java index a84245b..cdcc2c9 100644 --- a/examples/src/main/java/org/apache/spark/examples/JavaPageRank.java +++ b/examples/src/main/java/org/apache/spark/examples/JavaPageRank.java @@ -90,8 +90,8 @@ public final class JavaPageRank { @Override public Iterable<Tuple2<String, Double>> call(Tuple2<List<String>, Double> s) { List<Tuple2<String, Double>> results = new ArrayList<Tuple2<String, Double>>(); - for (String n : s._1) { - results.add(new Tuple2<String, Double>(n, s._2 / s._1.size())); + for (String n : s._1()) { + results.add(new Tuple2<String, Double>(n, s._2() / s._1().size())); } return results; } @@ -109,7 +109,7 @@ public final class JavaPageRank { // Collects all URL ranks and dump them to console. List<Tuple2<String, Double>> output = ranks.collect(); for (Tuple2<?,?> tuple : output) { - System.out.println(tuple._1 + " has rank: " + tuple._2 + "."); + System.out.println(tuple._1() + " has rank: " + tuple._2() + "."); } System.exit(0); http://git-wip-us.apache.org/repos/asf/spark/blob/87e4dd58/examples/src/main/java/org/apache/spark/examples/JavaWordCount.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/apache/spark/examples/JavaWordCount.java b/examples/src/main/java/org/apache/spark/examples/JavaWordCount.java index 6651f98..95a2f3a 100644 --- a/examples/src/main/java/org/apache/spark/examples/JavaWordCount.java +++ b/examples/src/main/java/org/apache/spark/examples/JavaWordCount.java @@ -65,7 +65,7 @@ public final class JavaWordCount { List<Tuple2<String, Integer>> output = counts.collect(); for (Tuple2<?,?> tuple : output) { - System.out.println(tuple._1 + ": " + tuple._2); + System.out.println(tuple._1() + ": " + tuple._2()); } System.exit(0); }
