Author: aching
Date: Fri Sep 21 09:21:49 2012
New Revision: 1388386
URL: http://svn.apache.org/viewvc?rev=1388386&view=rev
Log:
Fixed GIRAPH-93 to be using the latest patch.
Added:
giraph/trunk/giraph-formats-contrib/src/hcatalog/
giraph/trunk/giraph-formats-contrib/src/hcatalog/java/
giraph/trunk/giraph-formats-contrib/src/hcatalog/java/org/
giraph/trunk/giraph-formats-contrib/src/hcatalog/java/org/apache/
giraph/trunk/giraph-formats-contrib/src/hcatalog/java/org/apache/giraph/
giraph/trunk/giraph-formats-contrib/src/hcatalog/java/org/apache/giraph/format/
giraph/trunk/giraph-formats-contrib/src/hcatalog/java/org/apache/giraph/format/hcatalog/
giraph/trunk/giraph-formats-contrib/src/hcatalog/java/org/apache/giraph/format/hcatalog/HCatalogVertexInputFormat.java
- copied, changed from r1388358,
giraph/trunk/giraph-formats-contrib/src/main/java/org/apache/giraph/format/hcatalog/HCatalogVertexInputFormat.java
giraph/trunk/giraph-formats-contrib/src/hcatalog/java/org/apache/giraph/format/hcatalog/HCatalogVertexOutputFormat.java
- copied, changed from r1388358,
giraph/trunk/giraph-formats-contrib/src/main/java/org/apache/giraph/format/hcatalog/HCatalogVertexOutputFormat.java
giraph/trunk/giraph-formats-contrib/src/hcatalog/java/org/apache/giraph/format/hcatalog/HiveGiraphRunner.java
- copied, changed from r1388358,
giraph/trunk/giraph-formats-contrib/src/main/java/org/apache/giraph/format/hcatalog/HiveGiraphRunner.java
giraph/trunk/giraph-formats-contrib/src/hcatalog/java/org/apache/giraph/format/hcatalog/package-info.java
- copied, changed from r1388358,
giraph/trunk/giraph-formats-contrib/src/main/java/org/apache/giraph/format/hcatalog/package-info.java
Removed:
giraph/trunk/giraph-formats-contrib/src/main/java/org/apache/giraph/format/hcatalog/HCatalogVertexInputFormat.java
giraph/trunk/giraph-formats-contrib/src/main/java/org/apache/giraph/format/hcatalog/HCatalogVertexOutputFormat.java
giraph/trunk/giraph-formats-contrib/src/main/java/org/apache/giraph/format/hcatalog/HiveGiraphRunner.java
giraph/trunk/giraph-formats-contrib/src/main/java/org/apache/giraph/format/hcatalog/package-info.java
Modified:
giraph/trunk/giraph-formats-contrib/pom.xml
Modified: giraph/trunk/giraph-formats-contrib/pom.xml
URL:
http://svn.apache.org/viewvc/giraph/trunk/giraph-formats-contrib/pom.xml?rev=1388386&r1=1388385&r2=1388386&view=diff
==============================================================================
--- giraph/trunk/giraph-formats-contrib/pom.xml (original)
+++ giraph/trunk/giraph-formats-contrib/pom.xml Fri Sep 21 09:21:49 2012
@@ -28,8 +28,8 @@ under the License.
<compileSource>1.6</compileSource>
<hadoop.version>0.20.203.0</hadoop.version>
<hbase.version>0.90.5</hbase.version>
- <hive.version>0.10.0-SNAPSHOT</hive.version>
<hcatalog.version>0.4.0-dev</hcatalog.version>
+ <hive.version>0.9.0</hive.version>
<accumulo.version>1.4.0</accumulo.version>
<maven-compiler-plugin.version>2.3.2</maven-compiler-plugin.version>
<maven-javadoc-plugin.version>2.6</maven-javadoc-plugin.version>
@@ -74,6 +74,41 @@ under the License.
</plugin>
</plugins>
</build>
+ <profiles>
+ <profile>
+ <id>hcatalog</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.hcatalog</groupId>
+ <artifactId>hcatalog</artifactId>
+ <version>${hcatalog.version}</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.7</version>
+ <executions>
+ <execution>
+ <id>add-sources</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>add-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+
<source>${basedir}/src/main/java/</source>
+ </sources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
<dependencies>
<dependency>
<artifactId>giraph</artifactId>
@@ -147,11 +182,6 @@ under the License.
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.hcatalog</groupId>
- <artifactId>hcatalog</artifactId>
- <version>${hcatalog.version}</version>
- </dependency>
- <dependency>
<groupId>org.apache.hive</groupId>
<artifactId>hive-common</artifactId>
<version>${hive.version}</version>
Copied:
giraph/trunk/giraph-formats-contrib/src/hcatalog/java/org/apache/giraph/format/hcatalog/HCatalogVertexInputFormat.java
(from r1388358,
giraph/trunk/giraph-formats-contrib/src/main/java/org/apache/giraph/format/hcatalog/HCatalogVertexInputFormat.java)
URL:
http://svn.apache.org/viewvc/giraph/trunk/giraph-formats-contrib/src/hcatalog/java/org/apache/giraph/format/hcatalog/HCatalogVertexInputFormat.java?p2=giraph/trunk/giraph-formats-contrib/src/hcatalog/java/org/apache/giraph/format/hcatalog/HCatalogVertexInputFormat.java&p1=giraph/trunk/giraph-formats-contrib/src/main/java/org/apache/giraph/format/hcatalog/HCatalogVertexInputFormat.java&r1=1388358&r2=1388386&rev=1388386&view=diff
==============================================================================
(empty)
Copied:
giraph/trunk/giraph-formats-contrib/src/hcatalog/java/org/apache/giraph/format/hcatalog/HCatalogVertexOutputFormat.java
(from r1388358,
giraph/trunk/giraph-formats-contrib/src/main/java/org/apache/giraph/format/hcatalog/HCatalogVertexOutputFormat.java)
URL:
http://svn.apache.org/viewvc/giraph/trunk/giraph-formats-contrib/src/hcatalog/java/org/apache/giraph/format/hcatalog/HCatalogVertexOutputFormat.java?p2=giraph/trunk/giraph-formats-contrib/src/hcatalog/java/org/apache/giraph/format/hcatalog/HCatalogVertexOutputFormat.java&p1=giraph/trunk/giraph-formats-contrib/src/main/java/org/apache/giraph/format/hcatalog/HCatalogVertexOutputFormat.java&r1=1388358&r2=1388386&rev=1388386&view=diff
==============================================================================
(empty)
Copied:
giraph/trunk/giraph-formats-contrib/src/hcatalog/java/org/apache/giraph/format/hcatalog/HiveGiraphRunner.java
(from r1388358,
giraph/trunk/giraph-formats-contrib/src/main/java/org/apache/giraph/format/hcatalog/HiveGiraphRunner.java)
URL:
http://svn.apache.org/viewvc/giraph/trunk/giraph-formats-contrib/src/hcatalog/java/org/apache/giraph/format/hcatalog/HiveGiraphRunner.java?p2=giraph/trunk/giraph-formats-contrib/src/hcatalog/java/org/apache/giraph/format/hcatalog/HiveGiraphRunner.java&p1=giraph/trunk/giraph-formats-contrib/src/main/java/org/apache/giraph/format/hcatalog/HiveGiraphRunner.java&r1=1388358&r2=1388386&rev=1388386&view=diff
==============================================================================
---
giraph/trunk/giraph-formats-contrib/src/main/java/org/apache/giraph/format/hcatalog/HiveGiraphRunner.java
(original)
+++
giraph/trunk/giraph-formats-contrib/src/hcatalog/java/org/apache/giraph/format/hcatalog/HiveGiraphRunner.java
Fri Sep 21 09:21:49 2012
@@ -161,8 +161,8 @@ public class HiveGiraphRunner implements
"Giraph HCatalogVertexOutputFormat
class to use");
options.addOption("db", "database", true, "Hive database name");
options.addOption("i", "inputTable", true, "Input table name");
- options.addOption("I", "inputPartition", true,
- "Input table partition expression (e.g., \"a<2
AND b='two'\"");
+ options.addOption("I", "inputFilter", true,
+ "Input table filter expression (e.g., \"a<2 AND
b='two'\"");
options.addOption("o", "outputTable", true, "Output table
name");
options.addOption("O", "outputPartition", true,
"Output table partition values (e.g.,
\"a=1,b=two\")");
@@ -346,7 +346,7 @@ public class HiveGiraphRunner implements
+ vertexOutputFormatClass.getCanonicalName());
System.out.println(prefix + "-inputTable=" + inputTableName);
if (inputTableFilterExpr != null)
- System.out.println(prefix + "-inputPartition=\""
+ System.out.println(prefix + "-inputFilter=\""
+ inputTableFilterExpr + "\"");
System.out.println(prefix + "-outputTable=" + outputTableName);
if (outputTablePartitionValues != null)
Copied:
giraph/trunk/giraph-formats-contrib/src/hcatalog/java/org/apache/giraph/format/hcatalog/package-info.java
(from r1388358,
giraph/trunk/giraph-formats-contrib/src/main/java/org/apache/giraph/format/hcatalog/package-info.java)
URL:
http://svn.apache.org/viewvc/giraph/trunk/giraph-formats-contrib/src/hcatalog/java/org/apache/giraph/format/hcatalog/package-info.java?p2=giraph/trunk/giraph-formats-contrib/src/hcatalog/java/org/apache/giraph/format/hcatalog/package-info.java&p1=giraph/trunk/giraph-formats-contrib/src/main/java/org/apache/giraph/format/hcatalog/package-info.java&r1=1388358&r2=1388386&rev=1388386&view=diff
==============================================================================
(empty)
