Updated Branches: refs/heads/trunk efe6bf3d6 -> 039903ef2
GIRAPH-705: Type converters and giraph-hive cleanup (nitay) Project: http://git-wip-us.apache.org/repos/asf/giraph/repo Commit: http://git-wip-us.apache.org/repos/asf/giraph/commit/039903ef Tree: http://git-wip-us.apache.org/repos/asf/giraph/tree/039903ef Diff: http://git-wip-us.apache.org/repos/asf/giraph/diff/039903ef Branch: refs/heads/trunk Commit: 039903ef208658ced9a05af6944e1199f613adab Parents: efe6bf3 Author: Nitay Joffe <[email protected]> Authored: Wed Jul 10 14:28:05 2013 -0400 Committer: Nitay Joffe <[email protected]> Committed: Wed Jul 10 14:28:36 2013 -0400 ---------------------------------------------------------------------- .../giraph/types/ByteToIntWritableWrapper.java | 2 +- .../giraph/types/ByteToLongWritableWrapper.java | 2 +- .../types/FloatToDoubleWritableWrapper.java | 2 +- .../giraph/types/IntToLongWritableWrapper.java | 2 +- .../types/ShortToLongWritableWrapper.java | 2 +- pom.xml | 100 +++++++++++-------- 6 files changed, 63 insertions(+), 47 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/giraph/blob/039903ef/giraph-core/src/main/java/org/apache/giraph/types/ByteToIntWritableWrapper.java ---------------------------------------------------------------------- diff --git a/giraph-core/src/main/java/org/apache/giraph/types/ByteToIntWritableWrapper.java b/giraph-core/src/main/java/org/apache/giraph/types/ByteToIntWritableWrapper.java index a2671f3..adbbb98 100644 --- a/giraph-core/src/main/java/org/apache/giraph/types/ByteToIntWritableWrapper.java +++ b/giraph-core/src/main/java/org/apache/giraph/types/ByteToIntWritableWrapper.java @@ -26,6 +26,6 @@ public class ByteToIntWritableWrapper implements WritableWrapper<IntWritable, Byte> { @Override public IntWritable wrap(Byte javaValue) { - return new IntWritable(javaValue); + return new IntWritable(javaValue.intValue()); } } http://git-wip-us.apache.org/repos/asf/giraph/blob/039903ef/giraph-core/src/main/java/org/apache/giraph/types/ByteToLongWritableWrapper.java ---------------------------------------------------------------------- diff --git a/giraph-core/src/main/java/org/apache/giraph/types/ByteToLongWritableWrapper.java b/giraph-core/src/main/java/org/apache/giraph/types/ByteToLongWritableWrapper.java index 64b0b23..a4f22a5 100644 --- a/giraph-core/src/main/java/org/apache/giraph/types/ByteToLongWritableWrapper.java +++ b/giraph-core/src/main/java/org/apache/giraph/types/ByteToLongWritableWrapper.java @@ -26,6 +26,6 @@ public class ByteToLongWritableWrapper implements WritableWrapper<LongWritable, Byte> { @Override public LongWritable wrap(Byte javaValue) { - return new LongWritable(javaValue); + return new LongWritable(javaValue.longValue()); } } http://git-wip-us.apache.org/repos/asf/giraph/blob/039903ef/giraph-core/src/main/java/org/apache/giraph/types/FloatToDoubleWritableWrapper.java ---------------------------------------------------------------------- diff --git a/giraph-core/src/main/java/org/apache/giraph/types/FloatToDoubleWritableWrapper.java b/giraph-core/src/main/java/org/apache/giraph/types/FloatToDoubleWritableWrapper.java index daa53fa..d51edca 100644 --- a/giraph-core/src/main/java/org/apache/giraph/types/FloatToDoubleWritableWrapper.java +++ b/giraph-core/src/main/java/org/apache/giraph/types/FloatToDoubleWritableWrapper.java @@ -26,6 +26,6 @@ public class FloatToDoubleWritableWrapper implements WritableWrapper<DoubleWritable, Float> { @Override public DoubleWritable wrap(Float javaValue) { - return new DoubleWritable(javaValue); + return new DoubleWritable(javaValue.doubleValue()); } } http://git-wip-us.apache.org/repos/asf/giraph/blob/039903ef/giraph-core/src/main/java/org/apache/giraph/types/IntToLongWritableWrapper.java ---------------------------------------------------------------------- diff --git a/giraph-core/src/main/java/org/apache/giraph/types/IntToLongWritableWrapper.java b/giraph-core/src/main/java/org/apache/giraph/types/IntToLongWritableWrapper.java index 517107f..9340d52 100644 --- a/giraph-core/src/main/java/org/apache/giraph/types/IntToLongWritableWrapper.java +++ b/giraph-core/src/main/java/org/apache/giraph/types/IntToLongWritableWrapper.java @@ -26,6 +26,6 @@ public class IntToLongWritableWrapper implements WritableWrapper<LongWritable, Integer> { @Override public LongWritable wrap(Integer javaValue) { - return new LongWritable(javaValue); + return new LongWritable(javaValue.longValue()); } } http://git-wip-us.apache.org/repos/asf/giraph/blob/039903ef/giraph-core/src/main/java/org/apache/giraph/types/ShortToLongWritableWrapper.java ---------------------------------------------------------------------- diff --git a/giraph-core/src/main/java/org/apache/giraph/types/ShortToLongWritableWrapper.java b/giraph-core/src/main/java/org/apache/giraph/types/ShortToLongWritableWrapper.java index 4027035..f3d56b5 100644 --- a/giraph-core/src/main/java/org/apache/giraph/types/ShortToLongWritableWrapper.java +++ b/giraph-core/src/main/java/org/apache/giraph/types/ShortToLongWritableWrapper.java @@ -26,6 +26,6 @@ public class ShortToLongWritableWrapper implements WritableWrapper<LongWritable, Short> { @Override public LongWritable wrap(Short javaValue) { - return new LongWritable(javaValue.intValue()); + return new LongWritable(javaValue.longValue()); } } http://git-wip-us.apache.org/repos/asf/giraph/blob/039903ef/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 72fe6f2..7a79aed 100644 --- a/pom.xml +++ b/pom.xml @@ -248,25 +248,41 @@ under the License. <properties> <top.dir>${project.basedir}</top.dir> - <lib.dir>${top.dir}/lib</lib.dir> <buildtype>test</buildtype> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <dep.accumulo.version>1.4.0</dep.accumulo.version> + <dep.base64.version>2.3.8</dep.base64.version> + <dep.cli-parser.version>1.1</dep.cli-parser.version> + <dep.codehaus-jackson.version>1.8.0</dep.codehaus-jackson.version> + <dep.commons-cli.version>1.2</dep.commons-cli.version> + <dep.commons-collections.version>3.2.1</dep.commons-collections.version> + <dep.commons-configuration.version>1.6</dep.commons-configuration.version> + <dep.commons-httpclient.version>3.0.1</dep.commons-httpclient.version> + <dep.commons-io.version>2.1</dep.commons-io.version> + <dep.commons-logging.version>1.0.4</dep.commons-logging.version> + <dep.commons-net.version>3.1</dep.commons-net.version> + <dep.facebook-hadoop.version>0.20.0</dep.facebook-hadoop.version> + <dep.fasterxml-jackson.version>2.1.0</dep.fasterxml-jackson.version> + <dep.fastutil.version>6.5.3</dep.fastutil.version> + <dep.hbase.version>0.90.5</dep.hbase.version> + <dep.guava.version>12.0</dep.guava.version> + <dep.hcatalog.version>0.5.0-incubating</dep.hcatalog.version> + <dep.hive.version>0.11.0</dep.hive.version> <dep.hiveio.version>0.14</dep.hiveio.version> + <dep.json.version>20090211</dep.json.version> + <dep.junit.version>4.8</dep.junit.version> <dep.jython.version>2.5.3</dep.jython.version> + <dep.mockito.version>1.8.5</dep.mockito.version> + <dep.netty.version>3.5.3.Final</dep.netty.version> + <dep.slf4j.version>1.7.2</dep.slf4j.version> <dep.typetools.version>0.2.1</dep.typetools.version> + <dep.yammer-metrics.version>2.2.0</dep.yammer-metrics.version> + <dep.yourkit-api.version>9.5.6</dep.yourkit-api.version> + <dep.zookeeper.version>3.3.3</dep.zookeeper.version> - <zookeeper.version>3.3.3</zookeeper.version> - <hbase.version>0.90.5</hbase.version> - <codehaus-jackson.version>1.8.0</codehaus-jackson.version> - <fasterxml-jackson.version>2.1.0</fasterxml-jackson.version> - <slf4j.version>1.7.2</slf4j.version> - <hive.version>0.10.0</hive.version> - - <facebook-hadoop.version>0.20.0</facebook-hadoop.version> - <yourkit-api.version>9.5.6</yourkit-api.version> <forHadoop>for-hadoop-${hadoop.version}</forHadoop> </properties> @@ -987,12 +1003,12 @@ under the License. <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>12.0</version> + <version>${dep.guava.version}</version> </dependency> <dependency> <groupId>com.yammer.metrics</groupId> <artifactId>metrics-core</artifactId> - <version>2.2.0</version> + <version>${dep.yammer-metrics.version}</version> <exclusions> <exclusion> <groupId>org.slf4j</groupId> @@ -1003,47 +1019,47 @@ under the License. <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-core</artifactId> - <version>${fasterxml-jackson.version}</version> + <version>${dep.fasterxml-jackson.version}</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>${fasterxml-jackson.version}</version> + <version>${dep.fasterxml-jackson.version}</version> </dependency> <dependency> <groupId>com.github.spullara.cli-parser</groupId> <artifactId>cli-parser</artifactId> - <version>1.1</version> + <version>${dep.cli-parser.version}</version> </dependency> <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> - <version>2.1</version> + <version>${dep.commons-io.version}</version> </dependency> <dependency> <groupId>commons-cli</groupId> <artifactId>commons-cli</artifactId> - <version>1.2</version> + <version>${dep.commons-cli.version}</version> </dependency> <dependency> <groupId>com.facebook.thirdparty.yourkit-api</groupId> <artifactId>yjp-controller-api-redist</artifactId> - <version>${yourkit-api.version}</version> + <version>${dep.yourkit-api.version}</version> </dependency> <dependency> <groupId>io.netty</groupId> <artifactId>netty</artifactId> - <version>3.5.3.Final</version> + <version>${dep.netty.version}</version> </dependency> <dependency> <groupId>net.iharder</groupId> <artifactId>base64</artifactId> - <version>2.3.8</version> + <version>${dep.base64.version}</version> </dependency> <dependency> <groupId>it.unimi.dsi</groupId> <artifactId>fastutil</artifactId> - <version>6.5.3</version> + <version>${dep.fastutil.version}</version> </dependency> <dependency> <groupId>org.apache.giraph</groupId> @@ -1063,7 +1079,7 @@ under the License. <dependency> <groupId>org.apache.hcatalog</groupId> <artifactId>hcatalog-core</artifactId> - <version>0.5.0-incubating</version> + <version>${dep.hcatalog.version}</version> <exclusions> <exclusion> <groupId>org.apache.pig</groupId> @@ -1074,17 +1090,17 @@ under the License. <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-exec</artifactId> - <version>${hive.version}</version> + <version>${dep.hive.version}</version> </dependency> <dependency> <groupId>org.apache.hive</groupId> <artifactId>hive-metastore</artifactId> - <version>${hive.version}</version> + <version>${dep.hive.version}</version> </dependency> <dependency> <groupId>org.apache.zookeeper</groupId> <artifactId>zookeeper</artifactId> - <version>${zookeeper.version}</version> + <version>${dep.zookeeper.version}</version> <exclusions> <exclusion> <groupId>com.sun.jmx</groupId> @@ -1103,12 +1119,12 @@ under the License. <dependency> <groupId>org.codehaus.jackson</groupId> <artifactId>jackson-core-asl</artifactId> - <version>${codehaus-jackson.version}</version> + <version>${dep.codehaus-jackson.version}</version> </dependency> <dependency> <groupId>org.codehaus.jackson</groupId> <artifactId>jackson-mapper-asl</artifactId> - <version>${codehaus-jackson.version}</version> + <version>${dep.codehaus-jackson.version}</version> </dependency> <dependency> <groupId>org.jodah</groupId> @@ -1118,7 +1134,7 @@ under the License. <dependency> <groupId>org.json</groupId> <artifactId>json</artifactId> - <version>20090211</version> + <version>${dep.json.version}</version> </dependency> <dependency> <groupId>org.python</groupId> @@ -1128,37 +1144,37 @@ under the License. <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> - <version>${slf4j.version}</version> + <version>${dep.slf4j.version}</version> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> - <version>${slf4j.version}</version> + <version>${dep.slf4j.version}</version> </dependency> <!-- provided dependencies. sorted lexicographically. --> <dependency> <groupId>commons-collections</groupId> <artifactId>commons-collections</artifactId> - <version>3.2.1</version> + <version>${dep.commons-collections.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>commons-net</groupId> <artifactId>commons-net</artifactId> <scope>provided</scope> - <version>3.1</version> + <version>${dep.commons-net.version}</version> </dependency> <dependency> <groupId>com.facebook.hadoop</groupId> <artifactId>hadoop-core</artifactId> - <version>${facebook-hadoop.version}</version> + <version>${dep.facebook-hadoop.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.accumulo</groupId> <artifactId>accumulo-core</artifactId> - <version>1.4.0</version> + <version>${dep.accumulo.version}</version> <scope>provided</scope> </dependency> <dependency> @@ -1188,7 +1204,7 @@ under the License. <dependency> <groupId>org.apache.hbase</groupId> <artifactId>hbase</artifactId> - <version>${hbase.version}</version> + <version>${dep.hbase.version}</version> <scope>provided</scope> </dependency> @@ -1196,19 +1212,19 @@ under the License. <dependency> <groupId>commons-configuration</groupId> <artifactId>commons-configuration</artifactId> - <version>1.6</version> + <version>${dep.commons-configuration.version}</version> <scope>runtime</scope> </dependency> <dependency> <groupId>commons-httpclient</groupId> <artifactId>commons-httpclient</artifactId> - <version>3.0.1</version> + <version>${dep.commons-httpclient.version}</version> <scope>runtime</scope> </dependency> <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging-api</artifactId> - <version>1.0.4</version> + <version>${dep.commons-logging.version}</version> <scope>runtime</scope> </dependency> @@ -1216,13 +1232,13 @@ under the License. <dependency> <groupId>com.facebook.hadoop</groupId> <artifactId>hadoop-test</artifactId> - <version>${facebook-hadoop.version}</version> + <version>${dep.facebook-hadoop.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.8</version> + <version>${dep.junit.version}</version> <scope>test</scope> </dependency> <dependency> @@ -1235,13 +1251,13 @@ under the License. <groupId>org.apache.hbase</groupId> <artifactId>hbase</artifactId> <type>test-jar</type> - <version>${hbase.version}</version> + <version>${dep.hbase.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-all</artifactId> - <version>1.8.5</version> + <version>${dep.mockito.version}</version> <scope>test</scope> </dependency> </dependencies>
