Hide impl types
Project: http://git-wip-us.apache.org/repos/asf/giraph/repo Commit: http://git-wip-us.apache.org/repos/asf/giraph/commit/370b42b2 Tree: http://git-wip-us.apache.org/repos/asf/giraph/tree/370b42b2 Diff: http://git-wip-us.apache.org/repos/asf/giraph/diff/370b42b2 Branch: refs/heads/perf Commit: 370b42b2551fb0dcfe4b8df141947ff5a8d1fa5b Parents: 882545d Author: Nitay Joffe <[email protected]> Authored: Sun Mar 24 15:20:07 2013 -0400 Committer: Nitay Joffe <[email protected]> Committed: Sun Mar 24 15:20:07 2013 -0400 ---------------------------------------------------------------------- .../org/apache/giraph/hive/HiveGiraphRunner.java | 4 ++-- .../hive/input/edge/HiveEdgeInputFormat.java | 4 ++-- .../giraph/hive/input/edge/HiveEdgeReader.java | 11 ++++++----- .../hive/input/vertex/HiveVertexInputFormat.java | 5 +++-- .../giraph/hive/input/vertex/HiveVertexReader.java | 14 ++++++++------ .../giraph/hive/output/HiveVertexWriter.java | 15 +++++++-------- .../apache/giraph/hive/output/VertexToHive.java | 2 +- 7 files changed, 29 insertions(+), 26 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/giraph/blob/370b42b2/giraph-hive/src/main/java/org/apache/giraph/hive/HiveGiraphRunner.java ---------------------------------------------------------------------- diff --git a/giraph-hive/src/main/java/org/apache/giraph/hive/HiveGiraphRunner.java b/giraph-hive/src/main/java/org/apache/giraph/hive/HiveGiraphRunner.java index 8788a9d..2be09a8 100644 --- a/giraph-hive/src/main/java/org/apache/giraph/hive/HiveGiraphRunner.java +++ b/giraph-hive/src/main/java/org/apache/giraph/hive/HiveGiraphRunner.java @@ -275,13 +275,13 @@ public class HiveGiraphRunner implements Tool { */ private void setupHiveInputs(GiraphConfiguration conf) throws TException { if (hiveToVertexClass != null) { - HiveApiInputFormat.initProfile(conf, hiveVertexInputDescription, + HiveApiInputFormat.setProfileInputDesc(conf, hiveVertexInputDescription, HiveProfiles.VERTEX_INPUT_PROFILE_ID); conf.setVertexInputFormatClass(HiveVertexInputFormat.class); } if (hiveToEdgeClass != null) { - HiveApiInputFormat.initProfile(conf, hiveEdgeInputDescription, + HiveApiInputFormat.setProfileInputDesc(conf, hiveEdgeInputDescription, HiveProfiles.EDGE_INPUT_PROFILE_ID); conf.setEdgeInputFormatClass(HiveEdgeInputFormat.class); } http://git-wip-us.apache.org/repos/asf/giraph/blob/370b42b2/giraph-hive/src/main/java/org/apache/giraph/hive/input/edge/HiveEdgeInputFormat.java ---------------------------------------------------------------------- diff --git a/giraph-hive/src/main/java/org/apache/giraph/hive/input/edge/HiveEdgeInputFormat.java b/giraph-hive/src/main/java/org/apache/giraph/hive/input/edge/HiveEdgeInputFormat.java index d8aa460..d5590c7 100644 --- a/giraph-hive/src/main/java/org/apache/giraph/hive/input/edge/HiveEdgeInputFormat.java +++ b/giraph-hive/src/main/java/org/apache/giraph/hive/input/edge/HiveEdgeInputFormat.java @@ -30,7 +30,7 @@ import org.apache.hadoop.mapreduce.RecordReader; import org.apache.hadoop.mapreduce.TaskAttemptContext; import com.facebook.giraph.hive.input.HiveApiInputFormat; -import com.facebook.giraph.hive.record.HiveRecord; +import com.facebook.giraph.hive.record.HiveReadableRecord; import java.io.IOException; import java.util.List; @@ -69,7 +69,7 @@ public class HiveEdgeInputFormat<I extends WritableComparable, HiveEdgeReader<I, E> reader = new HiveEdgeReader<I, E>(); reader.setTableSchema(hiveInputFormat.getTableSchema(conf)); - RecordReader<WritableComparable, HiveRecord> baseReader; + RecordReader<WritableComparable, HiveReadableRecord> baseReader; try { baseReader = hiveInputFormat.createRecordReader(split, context); } catch (InterruptedException e) { http://git-wip-us.apache.org/repos/asf/giraph/blob/370b42b2/giraph-hive/src/main/java/org/apache/giraph/hive/input/edge/HiveEdgeReader.java ---------------------------------------------------------------------- diff --git a/giraph-hive/src/main/java/org/apache/giraph/hive/input/edge/HiveEdgeReader.java b/giraph-hive/src/main/java/org/apache/giraph/hive/input/edge/HiveEdgeReader.java index 65b9bbf..14de914 100644 --- a/giraph-hive/src/main/java/org/apache/giraph/hive/input/edge/HiveEdgeReader.java +++ b/giraph-hive/src/main/java/org/apache/giraph/hive/input/edge/HiveEdgeReader.java @@ -29,7 +29,7 @@ import org.apache.hadoop.mapreduce.InputSplit; import org.apache.hadoop.mapreduce.RecordReader; import org.apache.hadoop.mapreduce.TaskAttemptContext; -import com.facebook.giraph.hive.record.HiveRecord; +import com.facebook.giraph.hive.record.HiveReadableRecord; import com.facebook.giraph.hive.schema.HiveTableSchema; import com.facebook.giraph.hive.schema.HiveTableSchemas; @@ -49,7 +49,7 @@ public class HiveEdgeReader<I extends WritableComparable, E extends Writable> public static final String REUSE_EDGE_KEY = "giraph.hive.reuse.edge"; /** Underlying Hive RecordReader used */ - private RecordReader<WritableComparable, HiveRecord> hiveRecordReader; + private RecordReader<WritableComparable, HiveReadableRecord> hiveRecordReader; /** Schema for table in Hive */ private HiveTableSchema tableSchema; @@ -69,7 +69,8 @@ public class HiveEdgeReader<I extends WritableComparable, E extends Writable> * * @return RecordReader from Hive */ - public RecordReader<WritableComparable, HiveRecord> getHiveRecordReader() { + public RecordReader<WritableComparable, HiveReadableRecord> + getHiveRecordReader() { return hiveRecordReader; } @@ -79,7 +80,7 @@ public class HiveEdgeReader<I extends WritableComparable, E extends Writable> * @param hiveRecordReader RecordReader to read from Hive. */ public void setHiveRecordReader( - RecordReader<WritableComparable, HiveRecord> hiveRecordReader) { + RecordReader<WritableComparable, HiveReadableRecord> hiveRecordReader) { this.hiveRecordReader = hiveRecordReader; } @@ -159,7 +160,7 @@ public class HiveEdgeReader<I extends WritableComparable, E extends Writable> @Override public Edge<I, E> getCurrentEdge() throws IOException, InterruptedException { - HiveRecord record = hiveRecordReader.getCurrentValue(); + HiveReadableRecord record = hiveRecordReader.getCurrentValue(); ReusableEdge<I, E> edge = edgeToReuse; if (edge == null) { edge = conf.createReusableEdge(); http://git-wip-us.apache.org/repos/asf/giraph/blob/370b42b2/giraph-hive/src/main/java/org/apache/giraph/hive/input/vertex/HiveVertexInputFormat.java ---------------------------------------------------------------------- diff --git a/giraph-hive/src/main/java/org/apache/giraph/hive/input/vertex/HiveVertexInputFormat.java b/giraph-hive/src/main/java/org/apache/giraph/hive/input/vertex/HiveVertexInputFormat.java index 25c7a26..35e8810 100644 --- a/giraph-hive/src/main/java/org/apache/giraph/hive/input/vertex/HiveVertexInputFormat.java +++ b/giraph-hive/src/main/java/org/apache/giraph/hive/input/vertex/HiveVertexInputFormat.java @@ -26,10 +26,11 @@ import org.apache.hadoop.io.Writable; import org.apache.hadoop.io.WritableComparable; import org.apache.hadoop.mapreduce.InputSplit; import org.apache.hadoop.mapreduce.JobContext; +import org.apache.hadoop.mapreduce.RecordReader; import org.apache.hadoop.mapreduce.TaskAttemptContext; -import com.facebook.giraph.hive.impl.input.HiveApiRecordReader; import com.facebook.giraph.hive.input.HiveApiInputFormat; +import com.facebook.giraph.hive.record.HiveReadableRecord; import java.io.IOException; import java.util.List; @@ -70,7 +71,7 @@ public class HiveVertexInputFormat<I extends WritableComparable, HiveVertexReader reader = new HiveVertexReader(); reader.setTableSchema(hiveInputFormat.getTableSchema(conf)); - HiveApiRecordReader baseReader; + RecordReader<WritableComparable, HiveReadableRecord> baseReader; try { baseReader = hiveInputFormat.createRecordReader(split, context); } catch (InterruptedException e) { http://git-wip-us.apache.org/repos/asf/giraph/blob/370b42b2/giraph-hive/src/main/java/org/apache/giraph/hive/input/vertex/HiveVertexReader.java ---------------------------------------------------------------------- diff --git a/giraph-hive/src/main/java/org/apache/giraph/hive/input/vertex/HiveVertexReader.java b/giraph-hive/src/main/java/org/apache/giraph/hive/input/vertex/HiveVertexReader.java index 11c57ad..c0425dd 100644 --- a/giraph-hive/src/main/java/org/apache/giraph/hive/input/vertex/HiveVertexReader.java +++ b/giraph-hive/src/main/java/org/apache/giraph/hive/input/vertex/HiveVertexReader.java @@ -26,10 +26,10 @@ import org.apache.giraph.utils.ReflectionUtils; import org.apache.hadoop.io.Writable; import org.apache.hadoop.io.WritableComparable; import org.apache.hadoop.mapreduce.InputSplit; +import org.apache.hadoop.mapreduce.RecordReader; import org.apache.hadoop.mapreduce.TaskAttemptContext; -import com.facebook.giraph.hive.impl.input.HiveApiRecordReader; -import com.facebook.giraph.hive.record.HiveRecord; +import com.facebook.giraph.hive.record.HiveReadableRecord; import com.facebook.giraph.hive.schema.HiveTableSchema; import com.facebook.giraph.hive.schema.HiveTableSchemaAware; import com.facebook.giraph.hive.schema.HiveTableSchemas; @@ -57,7 +57,7 @@ public class HiveVertexReader<I extends WritableComparable, public static final String REUSE_VERTEX_KEY = "giraph.hive.reuse.vertex"; /** Underlying Hive RecordReader used */ - private HiveApiRecordReader hiveRecordReader; + private RecordReader<WritableComparable, HiveReadableRecord> hiveRecordReader; /** Schema for table in Hive */ private HiveTableSchema tableSchema; @@ -80,7 +80,8 @@ public class HiveVertexReader<I extends WritableComparable, * * @return RecordReader from Hive. */ - public HiveApiRecordReader getHiveRecordReader() { + public RecordReader<WritableComparable, HiveReadableRecord> + getHiveRecordReader() { return hiveRecordReader; } @@ -89,7 +90,8 @@ public class HiveVertexReader<I extends WritableComparable, * * @param hiveRecordReader RecordReader to read from Hive. */ - public void setHiveRecordReader(HiveApiRecordReader hiveRecordReader) { + public void setHiveRecordReader( + RecordReader<WritableComparable, HiveReadableRecord> hiveRecordReader) { this.hiveRecordReader = hiveRecordReader; } @@ -172,7 +174,7 @@ public class HiveVertexReader<I extends WritableComparable, @Override public final Vertex<I, V, E, M> getCurrentVertex() throws IOException, InterruptedException { - HiveRecord hiveRecord = hiveRecordReader.getCurrentValue(); + HiveReadableRecord hiveRecord = hiveRecordReader.getCurrentValue(); Vertex<I, V, E, M> vertex = vertexToReuse; if (vertex == null) { vertex = conf.createVertex(); http://git-wip-us.apache.org/repos/asf/giraph/blob/370b42b2/giraph-hive/src/main/java/org/apache/giraph/hive/output/HiveVertexWriter.java ---------------------------------------------------------------------- diff --git a/giraph-hive/src/main/java/org/apache/giraph/hive/output/HiveVertexWriter.java b/giraph-hive/src/main/java/org/apache/giraph/hive/output/HiveVertexWriter.java index 5356424..ffdf775 100644 --- a/giraph-hive/src/main/java/org/apache/giraph/hive/output/HiveVertexWriter.java +++ b/giraph-hive/src/main/java/org/apache/giraph/hive/output/HiveVertexWriter.java @@ -29,13 +29,12 @@ import org.apache.hadoop.mapreduce.RecordWriter; import org.apache.hadoop.mapreduce.TaskAttemptContext; import org.apache.log4j.Logger; -import com.facebook.giraph.hive.impl.HiveApiRecord; -import com.facebook.giraph.hive.record.HiveRecord; +import com.facebook.giraph.hive.record.HiveRecordFactory; +import com.facebook.giraph.hive.record.HiveWritableRecord; import com.facebook.giraph.hive.schema.HiveTableSchema; import com.facebook.giraph.hive.schema.HiveTableSchemas; import java.io.IOException; -import java.util.Collections; /** * Vertex writer using Hive. @@ -53,7 +52,7 @@ public class HiveVertexWriter<I extends WritableComparable, V extends Writable, private static final Logger LOG = Logger.getLogger(HiveVertexWriter.class); /** Underlying Hive RecordWriter used */ - private RecordWriter<WritableComparable, HiveRecord> hiveRecordWriter; + private RecordWriter<WritableComparable, HiveWritableRecord> hiveRecordWriter; /** Schema for table in Hive */ private HiveTableSchema tableSchema; @@ -68,7 +67,7 @@ public class HiveVertexWriter<I extends WritableComparable, V extends Writable, * * @return RecordWriter for Hive. */ - public RecordWriter<WritableComparable, HiveRecord> getBaseWriter() { + public RecordWriter<WritableComparable, HiveWritableRecord> getBaseWriter() { return hiveRecordWriter; } @@ -78,7 +77,7 @@ public class HiveVertexWriter<I extends WritableComparable, V extends Writable, * @param hiveRecordWriter RecordWriter to write to Hive. */ public void setBaseWriter( - RecordWriter<WritableComparable, HiveRecord> hiveRecordWriter) { + RecordWriter<WritableComparable, HiveWritableRecord> hiveRecordWriter) { this.hiveRecordWriter = hiveRecordWriter; } @@ -125,8 +124,8 @@ public class HiveVertexWriter<I extends WritableComparable, V extends Writable, @Override public void writeVertex(Vertex<I, V, E, ?> vertex) throws IOException, InterruptedException { - HiveRecord record = new HiveApiRecord(tableSchema.numColumns(), - Collections.<String>emptyList()); + HiveWritableRecord record = + HiveRecordFactory.newWritableRecord(tableSchema.numColumns()); vertexToHive.fillRecord(vertex, record); hiveRecordWriter.write(NullWritable.get(), record); } http://git-wip-us.apache.org/repos/asf/giraph/blob/370b42b2/giraph-hive/src/main/java/org/apache/giraph/hive/output/VertexToHive.java ---------------------------------------------------------------------- diff --git a/giraph-hive/src/main/java/org/apache/giraph/hive/output/VertexToHive.java b/giraph-hive/src/main/java/org/apache/giraph/hive/output/VertexToHive.java index 6d323bd..51649a5 100644 --- a/giraph-hive/src/main/java/org/apache/giraph/hive/output/VertexToHive.java +++ b/giraph-hive/src/main/java/org/apache/giraph/hive/output/VertexToHive.java @@ -22,7 +22,7 @@ import org.apache.giraph.graph.Vertex; import org.apache.hadoop.io.Writable; import org.apache.hadoop.io.WritableComparable; -import com.facebook.giraph.hive.HiveWritableRecord; +import com.facebook.giraph.hive.record.HiveWritableRecord; /** * Interface for writing vertices to a Hive record.
