Updated Branches: refs/heads/trunk e1352c8e4 -> 2353e1adf
GIRAPH-611: Vertex/EdgeReaderWrapper should configure inner reader (majakabiljo) Project: http://git-wip-us.apache.org/repos/asf/giraph/repo Commit: http://git-wip-us.apache.org/repos/asf/giraph/commit/2353e1ad Tree: http://git-wip-us.apache.org/repos/asf/giraph/tree/2353e1ad Diff: http://git-wip-us.apache.org/repos/asf/giraph/diff/2353e1ad Branch: refs/heads/trunk Commit: 2353e1adf1bc9a54c4448cd521bf80c39fc55c62 Parents: e1352c8 Author: Maja Kabiljo <[email protected]> Authored: Tue Apr 9 09:50:33 2013 -0700 Committer: Maja Kabiljo <[email protected]> Committed: Tue Apr 9 09:50:33 2013 -0700 ---------------------------------------------------------------------- CHANGELOG | 2 ++ .../giraph/io/iterables/EdgeReaderWrapper.java | 9 +++++++++ .../giraph/io/iterables/VertexReaderWrapper.java | 9 +++++++++ .../giraph/hive/output/HiveVertexOutputFormat.java | 3 +-- 4 files changed, 21 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/giraph/blob/2353e1ad/CHANGELOG ---------------------------------------------------------------------- diff --git a/CHANGELOG b/CHANGELOG index f7e0af6..0843773 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,8 @@ Giraph Change Log Release 0.2.0 - unreleased + GIRAPH-611: Vertex/EdgeReaderWrapper should configure inner reader (majakabiljo) + GIRAPH-609: More information on runtime exceptions for Callables (aching) GIRAPH-607: Hive IO bump (nitay) http://git-wip-us.apache.org/repos/asf/giraph/blob/2353e1ad/giraph-core/src/main/java/org/apache/giraph/io/iterables/EdgeReaderWrapper.java ---------------------------------------------------------------------- diff --git a/giraph-core/src/main/java/org/apache/giraph/io/iterables/EdgeReaderWrapper.java b/giraph-core/src/main/java/org/apache/giraph/io/iterables/EdgeReaderWrapper.java index 6d09d15..efd8fe7 100644 --- a/giraph-core/src/main/java/org/apache/giraph/io/iterables/EdgeReaderWrapper.java +++ b/giraph-core/src/main/java/org/apache/giraph/io/iterables/EdgeReaderWrapper.java @@ -19,6 +19,8 @@ package org.apache.giraph.io.iterables; import java.io.IOException; + +import org.apache.giraph.conf.ImmutableClassesGiraphConfiguration; import org.apache.giraph.edge.Edge; import org.apache.giraph.io.EdgeReader; import org.apache.hadoop.io.Writable; @@ -50,6 +52,13 @@ public class EdgeReaderWrapper<I extends WritableComparable, } @Override + public void setConf( + ImmutableClassesGiraphConfiguration<I, Writable, E, Writable> conf) { + super.setConf(conf); + conf.configureIfPossible(edgeReader); + } + + @Override public boolean nextEdge() throws IOException, InterruptedException { return iterator.nextObject(); } http://git-wip-us.apache.org/repos/asf/giraph/blob/2353e1ad/giraph-core/src/main/java/org/apache/giraph/io/iterables/VertexReaderWrapper.java ---------------------------------------------------------------------- diff --git a/giraph-core/src/main/java/org/apache/giraph/io/iterables/VertexReaderWrapper.java b/giraph-core/src/main/java/org/apache/giraph/io/iterables/VertexReaderWrapper.java index dabc4c4..614f945 100644 --- a/giraph-core/src/main/java/org/apache/giraph/io/iterables/VertexReaderWrapper.java +++ b/giraph-core/src/main/java/org/apache/giraph/io/iterables/VertexReaderWrapper.java @@ -19,6 +19,8 @@ package org.apache.giraph.io.iterables; import java.io.IOException; + +import org.apache.giraph.conf.ImmutableClassesGiraphConfiguration; import org.apache.giraph.graph.Vertex; import org.apache.giraph.io.VertexReader; import org.apache.hadoop.io.Writable; @@ -51,6 +53,13 @@ public class VertexReaderWrapper<I extends WritableComparable, } @Override + public void setConf( + ImmutableClassesGiraphConfiguration<I, V, E, Writable> conf) { + super.setConf(conf); + conf.configureIfPossible(vertexReader); + } + + @Override public boolean nextVertex() throws IOException, InterruptedException { return iterator.nextObject(); } http://git-wip-us.apache.org/repos/asf/giraph/blob/2353e1ad/giraph-hive/src/main/java/org/apache/giraph/hive/output/HiveVertexOutputFormat.java ---------------------------------------------------------------------- diff --git a/giraph-hive/src/main/java/org/apache/giraph/hive/output/HiveVertexOutputFormat.java b/giraph-hive/src/main/java/org/apache/giraph/hive/output/HiveVertexOutputFormat.java index 70ef360..45c9ca3 100644 --- a/giraph-hive/src/main/java/org/apache/giraph/hive/output/HiveVertexOutputFormat.java +++ b/giraph-hive/src/main/java/org/apache/giraph/hive/output/HiveVertexOutputFormat.java @@ -57,10 +57,9 @@ public class HiveVertexOutputFormat<I extends WritableComparable, throws IOException, InterruptedException { RecordWriter<WritableComparable, HiveWritableRecord> baseWriter = hiveOutputFormat.getRecordWriter(context); - HiveVertexWriter writer = new HiveVertexWriter(); + HiveVertexWriter<I, V, E> writer = new HiveVertexWriter<I, V, E>(); writer.setBaseWriter(baseWriter); writer.setTableSchema(hiveOutputFormat.getTableSchema(getConf())); - writer.initialize(context); return writer; }
