Updated Branches: refs/heads/trunk f630e3d41 -> bfc647368
GIRAPH-481: mvn compile error when building jar file - Error with Accumulo (tavoaqp via nitay) Project: http://git-wip-us.apache.org/repos/asf/giraph/repo Commit: http://git-wip-us.apache.org/repos/asf/giraph/commit/bfc64736 Tree: http://git-wip-us.apache.org/repos/asf/giraph/tree/bfc64736 Diff: http://git-wip-us.apache.org/repos/asf/giraph/diff/bfc64736 Branch: refs/heads/trunk Commit: bfc647368582b512945d86a48a8d5bc3b49ef930 Parents: f630e3d Author: Nitay Joffe <[email protected]> Authored: Fri Jan 18 16:17:41 2013 -0500 Committer: Nitay Joffe <[email protected]> Committed: Fri Jan 18 16:18:18 2013 -0500 ---------------------------------------------------------------------- CHANGELOG | 2 ++ giraph-accumulo/pom.xml | 2 +- giraph-hbase/pom.xml | 2 +- .../io/hbase/TestHBaseRootMarkerVertextFormat.java | 14 +++++++++++--- giraph-hcatalog/pom.xml | 2 +- pom.xml | 3 +-- 6 files changed, 17 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/giraph/blob/bfc64736/CHANGELOG ---------------------------------------------------------------------- diff --git a/CHANGELOG b/CHANGELOG index 8ac7c18..e58e197 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,8 @@ Giraph Change Log Release 0.2.0 - unreleased + GIRAPH-481: mvn compile error when building jar file - Error with Accumulo (tavoaqp via nitay) + GIRAPH-472: Refactor MapFunctions enum to be more general (ereisman) GIRAPH-254: Constant Variable name misspelled in HashMasterPartitioner.java (Gustavo Salazar Torres via ereisman) http://git-wip-us.apache.org/repos/asf/giraph/blob/bfc64736/giraph-accumulo/pom.xml ---------------------------------------------------------------------- diff --git a/giraph-accumulo/pom.xml b/giraph-accumulo/pom.xml index 4fbb20a..cb9fbc0 100644 --- a/giraph-accumulo/pom.xml +++ b/giraph-accumulo/pom.xml @@ -204,7 +204,7 @@ under the License. </dependency> <dependency> <groupId>org.apache.giraph</groupId> - <artifactId>giraph</artifactId> + <artifactId>giraph-core</artifactId> <version>0.2-SNAPSHOT</version> <type>test-jar</type> </dependency> http://git-wip-us.apache.org/repos/asf/giraph/blob/bfc64736/giraph-hbase/pom.xml ---------------------------------------------------------------------- diff --git a/giraph-hbase/pom.xml b/giraph-hbase/pom.xml index 565b505..7bbbd98 100644 --- a/giraph-hbase/pom.xml +++ b/giraph-hbase/pom.xml @@ -212,7 +212,7 @@ under the License. </dependency> <dependency> <groupId>org.apache.giraph</groupId> - <artifactId>giraph</artifactId> + <artifactId>giraph-core</artifactId> <version>0.2-SNAPSHOT</version> <type>test-jar</type> </dependency> http://git-wip-us.apache.org/repos/asf/giraph/blob/bfc64736/giraph-hbase/src/test/java/org/apache/giraph/io/hbase/TestHBaseRootMarkerVertextFormat.java ---------------------------------------------------------------------- diff --git a/giraph-hbase/src/test/java/org/apache/giraph/io/hbase/TestHBaseRootMarkerVertextFormat.java b/giraph-hbase/src/test/java/org/apache/giraph/io/hbase/TestHBaseRootMarkerVertextFormat.java index 77738b5..cc7d148 100644 --- a/giraph-hbase/src/test/java/org/apache/giraph/io/hbase/TestHBaseRootMarkerVertextFormat.java +++ b/giraph-hbase/src/test/java/org/apache/giraph/io/hbase/TestHBaseRootMarkerVertextFormat.java @@ -41,6 +41,7 @@ import org.apache.hadoop.hbase.mapreduce.ImportTsv; import org.apache.hadoop.hbase.mapreduce.TableInputFormat; import org.apache.hadoop.hbase.mapreduce.TableOutputFormat; import org.apache.hadoop.hbase.util.Bytes; +import org.apache.hadoop.hbase.zookeeper.MiniZooKeeperCluster; import org.apache.hadoop.io.Text; import org.apache.hadoop.mapreduce.Job; import org.apache.hadoop.util.GenericOptionsParser; @@ -102,8 +103,8 @@ public class TestHBaseRootMarkerVertextFormat extends BspCase { INPUT_FILE }; - - MiniHBaseCluster cluster = testUtil.startMiniCluster(); + MiniZooKeeperCluster zkCluster = testUtil.startMiniZKCluster(); + MiniHBaseCluster cluster = testUtil.startMiniHBaseCluster(2, 2); GenericOptionsParser opts = new GenericOptionsParser(cluster.getConfiguration(), args); @@ -131,7 +132,13 @@ public class TestHBaseRootMarkerVertextFormat extends BspCase { HTableDescriptor desc = new HTableDescriptor(TAB); desc.addFamily(new HColumnDescriptor(FAM)); - new HBaseAdmin(conf).createTable(desc); + HBaseAdmin hbaseAdmin=new HBaseAdmin(conf); + if (hbaseAdmin.isTableAvailable(TABLE_NAME)) + { + hbaseAdmin.disableTable(TABLE_NAME); + hbaseAdmin.deleteTable(TABLE_NAME); + } + hbaseAdmin.createTable(desc); Job job = ImportTsv.createSubmittableJob(conf, args); job.waitForCompletion(false); @@ -168,6 +175,7 @@ public class TestHBaseRootMarkerVertextFormat extends BspCase { } finally { cluster.shutdown(); + zkCluster.shutdown(); } } http://git-wip-us.apache.org/repos/asf/giraph/blob/bfc64736/giraph-hcatalog/pom.xml ---------------------------------------------------------------------- diff --git a/giraph-hcatalog/pom.xml b/giraph-hcatalog/pom.xml index 4295258..4a82272 100644 --- a/giraph-hcatalog/pom.xml +++ b/giraph-hcatalog/pom.xml @@ -220,7 +220,7 @@ under the License. </dependency> <dependency> <groupId>org.apache.giraph</groupId> - <artifactId>giraph</artifactId> + <artifactId>giraph-core</artifactId> <version>0.2-SNAPSHOT</version> <type>test-jar</type> </dependency> http://git-wip-us.apache.org/repos/asf/giraph/blob/bfc64736/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 57c1729..88868ba 100644 --- a/pom.xml +++ b/pom.xml @@ -793,8 +793,7 @@ under the License. <dependency> <groupId>org.apache.hcatalog</groupId> <artifactId>hcatalog-core</artifactId> - <!-- TODO: Use 0.5.0 stable release --> - <version>0.5.0-20121213.030336-32</version> + <version>0.6.0-SNAPSHOT</version> <exclusions> <exclusion> <groupId>org.apache.pig</groupId>
