Updated Branches: refs/heads/trunk ae01f0399 -> b22d56cb9
GIRAPH-751 Project: http://git-wip-us.apache.org/repos/asf/giraph/repo Commit: http://git-wip-us.apache.org/repos/asf/giraph/commit/b22d56cb Tree: http://git-wip-us.apache.org/repos/asf/giraph/tree/b22d56cb Diff: http://git-wip-us.apache.org/repos/asf/giraph/diff/b22d56cb Branch: refs/heads/trunk Commit: b22d56cb946bf43d47ed399c3262f2dd2e088670 Parents: ae01f03 Author: Claudio Martella <[email protected]> Authored: Tue Aug 27 17:16:04 2013 +0200 Committer: Claudio Martella <[email protected]> Committed: Tue Aug 27 17:16:04 2013 +0200 ---------------------------------------------------------------------- CHANGELOG | 3 +++ .../io/formats/SrcIdDstIdEdgeValueTextOutputFormat.java | 5 +++-- .../org/apache/giraph/io/formats/TextEdgeOutputFormat.java | 9 ++++++--- 3 files changed, 12 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/giraph/blob/b22d56cb/CHANGELOG ---------------------------------------------------------------------- diff --git a/CHANGELOG b/CHANGELOG index deca52b..e43f50c 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,9 @@ Giraph Change Log Release 1.1.0 - unreleased + GIRAPH-751: Build error: convertEdgeToLine in two different classes have the + same erasure, yet neither overrides the other (aarmax0 via claudio) + GIRAPH-732: EdgeOutputFormat (aarmax00 via claudio) GIRAPH-512: JavaDoc warnings (tdn120 via nitay) http://git-wip-us.apache.org/repos/asf/giraph/blob/b22d56cb/giraph-core/src/main/java/org/apache/giraph/io/formats/SrcIdDstIdEdgeValueTextOutputFormat.java ---------------------------------------------------------------------- diff --git a/giraph-core/src/main/java/org/apache/giraph/io/formats/SrcIdDstIdEdgeValueTextOutputFormat.java b/giraph-core/src/main/java/org/apache/giraph/io/formats/SrcIdDstIdEdgeValueTextOutputFormat.java index 1d7478f..a0d0996 100644 --- a/giraph-core/src/main/java/org/apache/giraph/io/formats/SrcIdDstIdEdgeValueTextOutputFormat.java +++ b/giraph-core/src/main/java/org/apache/giraph/io/formats/SrcIdDstIdEdgeValueTextOutputFormat.java @@ -52,8 +52,9 @@ public class SrcIdDstIdEdgeValueTextOutputFormat<I extends WritableComparable, /** * Edge writer used with {@link SrcIdDstIdEdgeValueTextOutputFormat}. */ - protected class SrcIdDstIdEdgeValueEdgeWriter - extends TextEdgeWriterToEachLine { + protected class SrcIdDstIdEdgeValueEdgeWriter<I extends WritableComparable, + V extends Writable, E extends Writable> + extends TextEdgeWriterToEachLine<I, V, E> { /** Saved delimiter */ private String delimiter; http://git-wip-us.apache.org/repos/asf/giraph/blob/b22d56cb/giraph-core/src/main/java/org/apache/giraph/io/formats/TextEdgeOutputFormat.java ---------------------------------------------------------------------- diff --git a/giraph-core/src/main/java/org/apache/giraph/io/formats/TextEdgeOutputFormat.java b/giraph-core/src/main/java/org/apache/giraph/io/formats/TextEdgeOutputFormat.java index 1b20c57..8f1a4f3 100644 --- a/giraph-core/src/main/java/org/apache/giraph/io/formats/TextEdgeOutputFormat.java +++ b/giraph-core/src/main/java/org/apache/giraph/io/formats/TextEdgeOutputFormat.java @@ -82,7 +82,8 @@ public abstract class TextEdgeOutputFormat<I extends WritableComparable, * edge output. Easiest to ignore the key value separator and only use * key instead. */ - protected abstract class TextEdgeWriter + protected abstract class TextEdgeWriter<I extends WritableComparable, + V extends Writable, E extends Writable> extends EdgeWriter<I, V, E> { /** Internal line record writer */ private RecordWriter<Text, Text> lineRecordWriter; @@ -139,7 +140,9 @@ public abstract class TextEdgeOutputFormat<I extends WritableComparable, * Abstract class to be implemented by the user to write a line for each * edge. */ - protected abstract class TextEdgeWriterToEachLine extends TextEdgeWriter { + protected abstract class TextEdgeWriterToEachLine< + I extends WritableComparable, V extends Writable, E extends Writable> + extends TextEdgeWriter<I, V, E> { @Override public final void writeEdge(I sourceId, V sourceValue, Edge<I, E> edge) @@ -147,7 +150,7 @@ public abstract class TextEdgeOutputFormat<I extends WritableComparable, // Note we are writing line as key with null value getRecordWriter().write( - convertEdgeToLine(sourceId, sourceValue, edge), null); + convertEdgeToLine(sourceId, sourceValue, edge), null); } /**
