You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@giraph.apache.org by ac...@apache.org on 2012/10/06 02:52:19 UTC
svn commit: r1394878 - in /giraph/trunk: ./
giraph-formats-contrib/src/main/java/org/apache/giraph/format/accumulo/
giraph-formats-contrib/src/main/java/org/apache/giraph/format/hbase/
giraph-formats-contrib/src/main/java/org/apache/giraph/format/hcata...
Author: aching
Date: Sat Oct 6 00:52:17 2012
New Revision: 1394878
URL: http://svn.apache.org/viewvc?rev=1394878&view=rev
Log:
GIRAPH-358: Rename package format->io in giraph-formats-contrib for
consistency with main package. (apresta via aching)
Added:
giraph/trunk/giraph-formats-contrib/src/main/java/org/apache/giraph/io/
giraph/trunk/giraph-formats-contrib/src/main/java/org/apache/giraph/io/accumulo/
giraph/trunk/giraph-formats-contrib/src/main/java/org/apache/giraph/io/accumulo/AccumuloVertexInputFormat.java
- copied, changed from r1394835, giraph/trunk/giraph-formats-contrib/src/main/java/org/apache/giraph/format/accumulo/AccumuloVertexInputFormat.java
giraph/trunk/giraph-formats-contrib/src/main/java/org/apache/giraph/io/accumulo/AccumuloVertexOutputFormat.java
- copied, changed from r1394835, giraph/trunk/giraph-formats-contrib/src/main/java/org/apache/giraph/format/accumulo/AccumuloVertexOutputFormat.java
giraph/trunk/giraph-formats-contrib/src/main/java/org/apache/giraph/io/accumulo/package-info.java
- copied, changed from r1394835, giraph/trunk/giraph-formats-contrib/src/main/java/org/apache/giraph/format/accumulo/package-info.java
giraph/trunk/giraph-formats-contrib/src/main/java/org/apache/giraph/io/hbase/
giraph/trunk/giraph-formats-contrib/src/main/java/org/apache/giraph/io/hbase/HBaseVertexInputFormat.java
- copied, changed from r1394835, giraph/trunk/giraph-formats-contrib/src/main/java/org/apache/giraph/format/hbase/HBaseVertexInputFormat.java
giraph/trunk/giraph-formats-contrib/src/main/java/org/apache/giraph/io/hbase/HBaseVertexOutputFormat.java
- copied, changed from r1394835, giraph/trunk/giraph-formats-contrib/src/main/java/org/apache/giraph/format/hbase/HBaseVertexOutputFormat.java
giraph/trunk/giraph-formats-contrib/src/main/java/org/apache/giraph/io/hbase/package-info.java
- copied, changed from r1394835, giraph/trunk/giraph-formats-contrib/src/main/java/org/apache/giraph/format/hbase/package-info.java
giraph/trunk/giraph-formats-contrib/src/main/java/org/apache/giraph/io/hcatalog/
giraph/trunk/giraph-formats-contrib/src/main/java/org/apache/giraph/io/hcatalog/HCatalogVertexInputFormat.java
- copied, changed from r1394835, 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/io/hcatalog/HCatalogVertexOutputFormat.java
- copied, changed from r1394835, 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/io/hcatalog/HiveGiraphRunner.java
- copied, changed from r1394835, 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/io/hcatalog/package-info.java
- copied, changed from r1394835, giraph/trunk/giraph-formats-contrib/src/main/java/org/apache/giraph/format/hcatalog/package-info.java
giraph/trunk/giraph-formats-contrib/src/test/java/org/apache/giraph/io/
giraph/trunk/giraph-formats-contrib/src/test/java/org/apache/giraph/io/accumulo/
giraph/trunk/giraph-formats-contrib/src/test/java/org/apache/giraph/io/accumulo/TestAccumuloVertexFormat.java
- copied, changed from r1394835, giraph/trunk/giraph-formats-contrib/src/test/java/org/apache/giraph/format/accumulo/TestAccumuloVertexFormat.java
giraph/trunk/giraph-formats-contrib/src/test/java/org/apache/giraph/io/accumulo/edgemarker/
giraph/trunk/giraph-formats-contrib/src/test/java/org/apache/giraph/io/accumulo/edgemarker/AccumuloEdgeInputFormat.java
- copied, changed from r1394835, giraph/trunk/giraph-formats-contrib/src/test/java/org/apache/giraph/format/accumulo/edgemarker/AccumuloEdgeInputFormat.java
giraph/trunk/giraph-formats-contrib/src/test/java/org/apache/giraph/io/accumulo/edgemarker/AccumuloEdgeOutputFormat.java
- copied, changed from r1394835, giraph/trunk/giraph-formats-contrib/src/test/java/org/apache/giraph/format/accumulo/edgemarker/AccumuloEdgeOutputFormat.java
giraph/trunk/giraph-formats-contrib/src/test/java/org/apache/giraph/io/hbase/
giraph/trunk/giraph-formats-contrib/src/test/java/org/apache/giraph/io/hbase/TestHBaseRootMarkerVertextFormat.java
- copied, changed from r1394835, giraph/trunk/giraph-formats-contrib/src/test/java/org/apache/giraph/format/hbase/TestHBaseRootMarkerVertextFormat.java
giraph/trunk/giraph-formats-contrib/src/test/java/org/apache/giraph/io/hbase/edgemarker/
giraph/trunk/giraph-formats-contrib/src/test/java/org/apache/giraph/io/hbase/edgemarker/TableEdgeInputFormat.java
- copied, changed from r1394835, giraph/trunk/giraph-formats-contrib/src/test/java/org/apache/giraph/format/hbase/edgemarker/TableEdgeInputFormat.java
giraph/trunk/giraph-formats-contrib/src/test/java/org/apache/giraph/io/hbase/edgemarker/TableEdgeOutputFormat.java
- copied, changed from r1394835, giraph/trunk/giraph-formats-contrib/src/test/java/org/apache/giraph/format/hbase/edgemarker/TableEdgeOutputFormat.java
Removed:
giraph/trunk/giraph-formats-contrib/src/main/java/org/apache/giraph/format/accumulo/AccumuloVertexInputFormat.java
giraph/trunk/giraph-formats-contrib/src/main/java/org/apache/giraph/format/accumulo/AccumuloVertexOutputFormat.java
giraph/trunk/giraph-formats-contrib/src/main/java/org/apache/giraph/format/accumulo/package-info.java
giraph/trunk/giraph-formats-contrib/src/main/java/org/apache/giraph/format/hbase/HBaseVertexInputFormat.java
giraph/trunk/giraph-formats-contrib/src/main/java/org/apache/giraph/format/hbase/HBaseVertexOutputFormat.java
giraph/trunk/giraph-formats-contrib/src/main/java/org/apache/giraph/format/hbase/package-info.java
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
giraph/trunk/giraph-formats-contrib/src/test/java/org/apache/giraph/format/accumulo/TestAccumuloVertexFormat.java
giraph/trunk/giraph-formats-contrib/src/test/java/org/apache/giraph/format/accumulo/edgemarker/AccumuloEdgeInputFormat.java
giraph/trunk/giraph-formats-contrib/src/test/java/org/apache/giraph/format/accumulo/edgemarker/AccumuloEdgeOutputFormat.java
giraph/trunk/giraph-formats-contrib/src/test/java/org/apache/giraph/format/hbase/TestHBaseRootMarkerVertextFormat.java
giraph/trunk/giraph-formats-contrib/src/test/java/org/apache/giraph/format/hbase/edgemarker/TableEdgeInputFormat.java
giraph/trunk/giraph-formats-contrib/src/test/java/org/apache/giraph/format/hbase/edgemarker/TableEdgeOutputFormat.java
Modified:
giraph/trunk/CHANGELOG
Modified: giraph/trunk/CHANGELOG
URL: http://svn.apache.org/viewvc/giraph/trunk/CHANGELOG?rev=1394878&r1=1394877&r2=1394878&view=diff
==============================================================================
--- giraph/trunk/CHANGELOG (original)
+++ giraph/trunk/CHANGELOG Sat Oct 6 00:52:17 2012
@@ -2,6 +2,9 @@ Giraph Change Log
Release 0.2.0 - unreleased
+ GIRAPH-358: Rename package format->io in giraph-formats-contrib for
+ consistency with main package. (apresta via aching)
+
GIRAPH-350: HBaseVertex i/o formats are not being injected with
Configuration via Configurable interface. (bfem via aching)
Copied: giraph/trunk/giraph-formats-contrib/src/main/java/org/apache/giraph/io/accumulo/AccumuloVertexInputFormat.java (from r1394835, giraph/trunk/giraph-formats-contrib/src/main/java/org/apache/giraph/format/accumulo/AccumuloVertexInputFormat.java)
URL: http://svn.apache.org/viewvc/giraph/trunk/giraph-formats-contrib/src/main/java/org/apache/giraph/io/accumulo/AccumuloVertexInputFormat.java?p2=giraph/trunk/giraph-formats-contrib/src/main/java/org/apache/giraph/io/accumulo/AccumuloVertexInputFormat.java&p1=giraph/trunk/giraph-formats-contrib/src/main/java/org/apache/giraph/format/accumulo/AccumuloVertexInputFormat.java&r1=1394835&r2=1394878&rev=1394878&view=diff
==============================================================================
--- giraph/trunk/giraph-formats-contrib/src/main/java/org/apache/giraph/format/accumulo/AccumuloVertexInputFormat.java (original)
+++ giraph/trunk/giraph-formats-contrib/src/main/java/org/apache/giraph/io/accumulo/AccumuloVertexInputFormat.java Sat Oct 6 00:52:17 2012
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.giraph.format.accumulo;
+package org.apache.giraph.io.accumulo;
import org.apache.accumulo.core.client.mapreduce.AccumuloInputFormat;
import org.apache.accumulo.core.data.Key;
@@ -38,7 +38,7 @@ import java.util.List;
* to read from AccumuloTables.
*
* Works with
- * {@link org.apache.giraph.format.accumulo.AccumuloVertexOutputFormat}
+ * {@link org.apache.giraph.io.accumulo.AccumuloVertexOutputFormat}
*
* @param <I> vertex id type
* @param <V> vertex value type
Copied: giraph/trunk/giraph-formats-contrib/src/main/java/org/apache/giraph/io/accumulo/AccumuloVertexOutputFormat.java (from r1394835, giraph/trunk/giraph-formats-contrib/src/main/java/org/apache/giraph/format/accumulo/AccumuloVertexOutputFormat.java)
URL: http://svn.apache.org/viewvc/giraph/trunk/giraph-formats-contrib/src/main/java/org/apache/giraph/io/accumulo/AccumuloVertexOutputFormat.java?p2=giraph/trunk/giraph-formats-contrib/src/main/java/org/apache/giraph/io/accumulo/AccumuloVertexOutputFormat.java&p1=giraph/trunk/giraph-formats-contrib/src/main/java/org/apache/giraph/format/accumulo/AccumuloVertexOutputFormat.java&r1=1394835&r2=1394878&rev=1394878&view=diff
==============================================================================
--- giraph/trunk/giraph-formats-contrib/src/main/java/org/apache/giraph/format/accumulo/AccumuloVertexOutputFormat.java (original)
+++ giraph/trunk/giraph-formats-contrib/src/main/java/org/apache/giraph/io/accumulo/AccumuloVertexOutputFormat.java Sat Oct 6 00:52:17 2012
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.giraph.format.accumulo;
+package org.apache.giraph.io.accumulo;
import org.apache.accumulo.core.client.mapreduce.AccumuloOutputFormat;
import org.apache.accumulo.core.data.Mutation;
@@ -37,7 +37,7 @@ import java.io.IOException;
* to write vertices back to an Accumulo table.
*
* Works with
- * {@link org.apache.giraph.format.accumulo.AccumuloVertexInputFormat}
+ * {@link org.apache.giraph.io.accumulo.AccumuloVertexInputFormat}
*
*
* @param <I> vertex id type
Copied: giraph/trunk/giraph-formats-contrib/src/main/java/org/apache/giraph/io/accumulo/package-info.java (from r1394835, giraph/trunk/giraph-formats-contrib/src/main/java/org/apache/giraph/format/accumulo/package-info.java)
URL: http://svn.apache.org/viewvc/giraph/trunk/giraph-formats-contrib/src/main/java/org/apache/giraph/io/accumulo/package-info.java?p2=giraph/trunk/giraph-formats-contrib/src/main/java/org/apache/giraph/io/accumulo/package-info.java&p1=giraph/trunk/giraph-formats-contrib/src/main/java/org/apache/giraph/format/accumulo/package-info.java&r1=1394835&r2=1394878&rev=1394878&view=diff
==============================================================================
--- giraph/trunk/giraph-formats-contrib/src/main/java/org/apache/giraph/format/accumulo/package-info.java (original)
+++ giraph/trunk/giraph-formats-contrib/src/main/java/org/apache/giraph/io/accumulo/package-info.java Sat Oct 6 00:52:17 2012
@@ -18,4 +18,4 @@
/**
* Package of all generic utility classes.
*/
-package org.apache.giraph.format.accumulo;
+package org.apache.giraph.io.accumulo;
Copied: giraph/trunk/giraph-formats-contrib/src/main/java/org/apache/giraph/io/hbase/HBaseVertexInputFormat.java (from r1394835, giraph/trunk/giraph-formats-contrib/src/main/java/org/apache/giraph/format/hbase/HBaseVertexInputFormat.java)
URL: http://svn.apache.org/viewvc/giraph/trunk/giraph-formats-contrib/src/main/java/org/apache/giraph/io/hbase/HBaseVertexInputFormat.java?p2=giraph/trunk/giraph-formats-contrib/src/main/java/org/apache/giraph/io/hbase/HBaseVertexInputFormat.java&p1=giraph/trunk/giraph-formats-contrib/src/main/java/org/apache/giraph/format/hbase/HBaseVertexInputFormat.java&r1=1394835&r2=1394878&rev=1394878&view=diff
==============================================================================
--- giraph/trunk/giraph-formats-contrib/src/main/java/org/apache/giraph/format/hbase/HBaseVertexInputFormat.java (original)
+++ giraph/trunk/giraph-formats-contrib/src/main/java/org/apache/giraph/io/hbase/HBaseVertexInputFormat.java Sat Oct 6 00:52:17 2012
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.giraph.format.hbase;
+package org.apache.giraph.io.hbase;
import org.apache.giraph.graph.VertexInputFormat;
import org.apache.giraph.graph.VertexReader;
Copied: giraph/trunk/giraph-formats-contrib/src/main/java/org/apache/giraph/io/hbase/HBaseVertexOutputFormat.java (from r1394835, giraph/trunk/giraph-formats-contrib/src/main/java/org/apache/giraph/format/hbase/HBaseVertexOutputFormat.java)
URL: http://svn.apache.org/viewvc/giraph/trunk/giraph-formats-contrib/src/main/java/org/apache/giraph/io/hbase/HBaseVertexOutputFormat.java?p2=giraph/trunk/giraph-formats-contrib/src/main/java/org/apache/giraph/io/hbase/HBaseVertexOutputFormat.java&p1=giraph/trunk/giraph-formats-contrib/src/main/java/org/apache/giraph/format/hbase/HBaseVertexOutputFormat.java&r1=1394835&r2=1394878&rev=1394878&view=diff
==============================================================================
--- giraph/trunk/giraph-formats-contrib/src/main/java/org/apache/giraph/format/hbase/HBaseVertexOutputFormat.java (original)
+++ giraph/trunk/giraph-formats-contrib/src/main/java/org/apache/giraph/io/hbase/HBaseVertexOutputFormat.java Sat Oct 6 00:52:17 2012
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.giraph.format.hbase;
+package org.apache.giraph.io.hbase;
import org.apache.giraph.graph.VertexOutputFormat;
import org.apache.giraph.graph.VertexWriter;
Copied: giraph/trunk/giraph-formats-contrib/src/main/java/org/apache/giraph/io/hbase/package-info.java (from r1394835, giraph/trunk/giraph-formats-contrib/src/main/java/org/apache/giraph/format/hbase/package-info.java)
URL: http://svn.apache.org/viewvc/giraph/trunk/giraph-formats-contrib/src/main/java/org/apache/giraph/io/hbase/package-info.java?p2=giraph/trunk/giraph-formats-contrib/src/main/java/org/apache/giraph/io/hbase/package-info.java&p1=giraph/trunk/giraph-formats-contrib/src/main/java/org/apache/giraph/format/hbase/package-info.java&r1=1394835&r2=1394878&rev=1394878&view=diff
==============================================================================
--- giraph/trunk/giraph-formats-contrib/src/main/java/org/apache/giraph/format/hbase/package-info.java (original)
+++ giraph/trunk/giraph-formats-contrib/src/main/java/org/apache/giraph/io/hbase/package-info.java Sat Oct 6 00:52:17 2012
@@ -18,4 +18,4 @@
/**
* Package of all generic utility classes.
*/
-package org.apache.giraph.format.hbase;
+package org.apache.giraph.io.hbase;
Copied: giraph/trunk/giraph-formats-contrib/src/main/java/org/apache/giraph/io/hcatalog/HCatalogVertexInputFormat.java (from r1394835, 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/main/java/org/apache/giraph/io/hcatalog/HCatalogVertexInputFormat.java?p2=giraph/trunk/giraph-formats-contrib/src/main/java/org/apache/giraph/io/hcatalog/HCatalogVertexInputFormat.java&p1=giraph/trunk/giraph-formats-contrib/src/main/java/org/apache/giraph/format/hcatalog/HCatalogVertexInputFormat.java&r1=1394835&r2=1394878&rev=1394878&view=diff
==============================================================================
--- giraph/trunk/giraph-formats-contrib/src/main/java/org/apache/giraph/format/hcatalog/HCatalogVertexInputFormat.java (original)
+++ giraph/trunk/giraph-formats-contrib/src/main/java/org/apache/giraph/io/hcatalog/HCatalogVertexInputFormat.java Sat Oct 6 00:52:17 2012
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.giraph.format.hcatalog;
+package org.apache.giraph.io.hcatalog;
import java.io.IOException;
import java.util.List;
Copied: giraph/trunk/giraph-formats-contrib/src/main/java/org/apache/giraph/io/hcatalog/HCatalogVertexOutputFormat.java (from r1394835, 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/main/java/org/apache/giraph/io/hcatalog/HCatalogVertexOutputFormat.java?p2=giraph/trunk/giraph-formats-contrib/src/main/java/org/apache/giraph/io/hcatalog/HCatalogVertexOutputFormat.java&p1=giraph/trunk/giraph-formats-contrib/src/main/java/org/apache/giraph/format/hcatalog/HCatalogVertexOutputFormat.java&r1=1394835&r2=1394878&rev=1394878&view=diff
==============================================================================
--- giraph/trunk/giraph-formats-contrib/src/main/java/org/apache/giraph/format/hcatalog/HCatalogVertexOutputFormat.java (original)
+++ giraph/trunk/giraph-formats-contrib/src/main/java/org/apache/giraph/io/hcatalog/HCatalogVertexOutputFormat.java Sat Oct 6 00:52:17 2012
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.giraph.format.hcatalog;
+package org.apache.giraph.io.hcatalog;
import java.io.IOException;
Copied: giraph/trunk/giraph-formats-contrib/src/main/java/org/apache/giraph/io/hcatalog/HiveGiraphRunner.java (from r1394835, 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/main/java/org/apache/giraph/io/hcatalog/HiveGiraphRunner.java?p2=giraph/trunk/giraph-formats-contrib/src/main/java/org/apache/giraph/io/hcatalog/HiveGiraphRunner.java&p1=giraph/trunk/giraph-formats-contrib/src/main/java/org/apache/giraph/format/hcatalog/HiveGiraphRunner.java&r1=1394835&r2=1394878&rev=1394878&view=diff
==============================================================================
--- giraph/trunk/giraph-formats-contrib/src/main/java/org/apache/giraph/format/hcatalog/HiveGiraphRunner.java (original)
+++ giraph/trunk/giraph-formats-contrib/src/main/java/org/apache/giraph/io/hcatalog/HiveGiraphRunner.java Sat Oct 6 00:52:17 2012
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.giraph.format.hcatalog;
+package org.apache.giraph.io.hcatalog;
import java.io.File;
import java.util.Arrays;
Copied: giraph/trunk/giraph-formats-contrib/src/main/java/org/apache/giraph/io/hcatalog/package-info.java (from r1394835, 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/main/java/org/apache/giraph/io/hcatalog/package-info.java?p2=giraph/trunk/giraph-formats-contrib/src/main/java/org/apache/giraph/io/hcatalog/package-info.java&p1=giraph/trunk/giraph-formats-contrib/src/main/java/org/apache/giraph/format/hcatalog/package-info.java&r1=1394835&r2=1394878&rev=1394878&view=diff
==============================================================================
--- giraph/trunk/giraph-formats-contrib/src/main/java/org/apache/giraph/format/hcatalog/package-info.java (original)
+++ giraph/trunk/giraph-formats-contrib/src/main/java/org/apache/giraph/io/hcatalog/package-info.java Sat Oct 6 00:52:17 2012
@@ -19,5 +19,5 @@
* Package of input and output format classes
* for loading and storing Hive/Pig data using HCatalog.
*/
-package org.apache.giraph.format.hcatalog;
+package org.apache.giraph.io.hcatalog;
Copied: giraph/trunk/giraph-formats-contrib/src/test/java/org/apache/giraph/io/accumulo/TestAccumuloVertexFormat.java (from r1394835, giraph/trunk/giraph-formats-contrib/src/test/java/org/apache/giraph/format/accumulo/TestAccumuloVertexFormat.java)
URL: http://svn.apache.org/viewvc/giraph/trunk/giraph-formats-contrib/src/test/java/org/apache/giraph/io/accumulo/TestAccumuloVertexFormat.java?p2=giraph/trunk/giraph-formats-contrib/src/test/java/org/apache/giraph/io/accumulo/TestAccumuloVertexFormat.java&p1=giraph/trunk/giraph-formats-contrib/src/test/java/org/apache/giraph/format/accumulo/TestAccumuloVertexFormat.java&r1=1394835&r2=1394878&rev=1394878&view=diff
==============================================================================
--- giraph/trunk/giraph-formats-contrib/src/test/java/org/apache/giraph/format/accumulo/TestAccumuloVertexFormat.java (original)
+++ giraph/trunk/giraph-formats-contrib/src/test/java/org/apache/giraph/io/accumulo/TestAccumuloVertexFormat.java Sat Oct 6 00:52:17 2012
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.giraph.format.accumulo;
+package org.apache.giraph.io.accumulo;
import junit.framework.Test;
import junit.framework.TestSuite;
@@ -35,8 +35,8 @@ import org.apache.accumulo.core.util.Byt
import org.apache.accumulo.core.util.Pair;
import org.apache.giraph.BspCase;
import org.apache.giraph.GiraphConfiguration;
-import org.apache.giraph.format.accumulo.edgemarker.AccumuloEdgeInputFormat;
-import org.apache.giraph.format.accumulo.edgemarker.AccumuloEdgeOutputFormat;
+import org.apache.giraph.io.accumulo.edgemarker.AccumuloEdgeInputFormat;
+import org.apache.giraph.io.accumulo.edgemarker.AccumuloEdgeOutputFormat;
import org.apache.giraph.graph.EdgeListVertex;
import org.apache.giraph.graph.GiraphJob;
import org.apache.hadoop.conf.Configuration;
@@ -47,7 +47,6 @@ import java.io.File;
import java.io.IOException;
import java.nio.ByteBuffer;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.Map;
/*
Copied: giraph/trunk/giraph-formats-contrib/src/test/java/org/apache/giraph/io/accumulo/edgemarker/AccumuloEdgeInputFormat.java (from r1394835, giraph/trunk/giraph-formats-contrib/src/test/java/org/apache/giraph/format/accumulo/edgemarker/AccumuloEdgeInputFormat.java)
URL: http://svn.apache.org/viewvc/giraph/trunk/giraph-formats-contrib/src/test/java/org/apache/giraph/io/accumulo/edgemarker/AccumuloEdgeInputFormat.java?p2=giraph/trunk/giraph-formats-contrib/src/test/java/org/apache/giraph/io/accumulo/edgemarker/AccumuloEdgeInputFormat.java&p1=giraph/trunk/giraph-formats-contrib/src/test/java/org/apache/giraph/format/accumulo/edgemarker/AccumuloEdgeInputFormat.java&r1=1394835&r2=1394878&rev=1394878&view=diff
==============================================================================
--- giraph/trunk/giraph-formats-contrib/src/test/java/org/apache/giraph/format/accumulo/edgemarker/AccumuloEdgeInputFormat.java (original)
+++ giraph/trunk/giraph-formats-contrib/src/test/java/org/apache/giraph/io/accumulo/edgemarker/AccumuloEdgeInputFormat.java Sat Oct 6 00:52:17 2012
@@ -15,12 +15,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.giraph.format.accumulo.edgemarker;
+package org.apache.giraph.io.accumulo.edgemarker;
import com.google.common.collect.Maps;
import org.apache.accumulo.core.data.Key;
import org.apache.accumulo.core.data.Value;
-import org.apache.giraph.format.accumulo.AccumuloVertexInputFormat;
+import org.apache.giraph.io.accumulo.AccumuloVertexInputFormat;
import org.apache.giraph.graph.Vertex;
import org.apache.giraph.graph.BspUtils;
import org.apache.giraph.graph.VertexReader;
Copied: giraph/trunk/giraph-formats-contrib/src/test/java/org/apache/giraph/io/accumulo/edgemarker/AccumuloEdgeOutputFormat.java (from r1394835, giraph/trunk/giraph-formats-contrib/src/test/java/org/apache/giraph/format/accumulo/edgemarker/AccumuloEdgeOutputFormat.java)
URL: http://svn.apache.org/viewvc/giraph/trunk/giraph-formats-contrib/src/test/java/org/apache/giraph/io/accumulo/edgemarker/AccumuloEdgeOutputFormat.java?p2=giraph/trunk/giraph-formats-contrib/src/test/java/org/apache/giraph/io/accumulo/edgemarker/AccumuloEdgeOutputFormat.java&p1=giraph/trunk/giraph-formats-contrib/src/test/java/org/apache/giraph/format/accumulo/edgemarker/AccumuloEdgeOutputFormat.java&r1=1394835&r2=1394878&rev=1394878&view=diff
==============================================================================
--- giraph/trunk/giraph-formats-contrib/src/test/java/org/apache/giraph/format/accumulo/edgemarker/AccumuloEdgeOutputFormat.java (original)
+++ giraph/trunk/giraph-formats-contrib/src/test/java/org/apache/giraph/io/accumulo/edgemarker/AccumuloEdgeOutputFormat.java Sat Oct 6 00:52:17 2012
@@ -15,11 +15,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.giraph.format.accumulo.edgemarker;
+package org.apache.giraph.io.accumulo.edgemarker;
import org.apache.accumulo.core.data.Mutation;
import org.apache.accumulo.core.data.Value;
-import org.apache.giraph.format.accumulo.AccumuloVertexOutputFormat;
+import org.apache.giraph.io.accumulo.AccumuloVertexOutputFormat;
import org.apache.giraph.graph.Vertex;
import org.apache.giraph.graph.VertexWriter;
import org.apache.hadoop.io.Text;
Copied: giraph/trunk/giraph-formats-contrib/src/test/java/org/apache/giraph/io/hbase/TestHBaseRootMarkerVertextFormat.java (from r1394835, giraph/trunk/giraph-formats-contrib/src/test/java/org/apache/giraph/format/hbase/TestHBaseRootMarkerVertextFormat.java)
URL: http://svn.apache.org/viewvc/giraph/trunk/giraph-formats-contrib/src/test/java/org/apache/giraph/io/hbase/TestHBaseRootMarkerVertextFormat.java?p2=giraph/trunk/giraph-formats-contrib/src/test/java/org/apache/giraph/io/hbase/TestHBaseRootMarkerVertextFormat.java&p1=giraph/trunk/giraph-formats-contrib/src/test/java/org/apache/giraph/format/hbase/TestHBaseRootMarkerVertextFormat.java&r1=1394835&r2=1394878&rev=1394878&view=diff
==============================================================================
--- giraph/trunk/giraph-formats-contrib/src/test/java/org/apache/giraph/format/hbase/TestHBaseRootMarkerVertextFormat.java (original)
+++ giraph/trunk/giraph-formats-contrib/src/test/java/org/apache/giraph/io/hbase/TestHBaseRootMarkerVertextFormat.java Sat Oct 6 00:52:17 2012
@@ -16,14 +16,14 @@
* limitations under the License.
*/
-package org.apache.giraph.format.hbase;
+package org.apache.giraph.io.hbase;
import junit.framework.Test;
import junit.framework.TestSuite;
import org.apache.giraph.BspCase;
import org.apache.giraph.GiraphConfiguration;
-import org.apache.giraph.format.hbase.edgemarker.TableEdgeInputFormat;
-import org.apache.giraph.format.hbase.edgemarker.TableEdgeOutputFormat;
+import org.apache.giraph.io.hbase.edgemarker.TableEdgeInputFormat;
+import org.apache.giraph.io.hbase.edgemarker.TableEdgeOutputFormat;
import org.apache.giraph.graph.EdgeListVertex;
import org.apache.giraph.graph.GiraphJob;
import org.apache.hadoop.conf.Configuration;
@@ -46,7 +46,6 @@ import org.apache.log4j.Logger;
import java.io.File;
import java.io.IOException;
-import java.util.Iterator;
/*
Test case for HBase reading/writing vertices from an HBase instance.
Copied: giraph/trunk/giraph-formats-contrib/src/test/java/org/apache/giraph/io/hbase/edgemarker/TableEdgeInputFormat.java (from r1394835, giraph/trunk/giraph-formats-contrib/src/test/java/org/apache/giraph/format/hbase/edgemarker/TableEdgeInputFormat.java)
URL: http://svn.apache.org/viewvc/giraph/trunk/giraph-formats-contrib/src/test/java/org/apache/giraph/io/hbase/edgemarker/TableEdgeInputFormat.java?p2=giraph/trunk/giraph-formats-contrib/src/test/java/org/apache/giraph/io/hbase/edgemarker/TableEdgeInputFormat.java&p1=giraph/trunk/giraph-formats-contrib/src/test/java/org/apache/giraph/format/hbase/edgemarker/TableEdgeInputFormat.java&r1=1394835&r2=1394878&rev=1394878&view=diff
==============================================================================
--- giraph/trunk/giraph-formats-contrib/src/test/java/org/apache/giraph/format/hbase/edgemarker/TableEdgeInputFormat.java (original)
+++ giraph/trunk/giraph-formats-contrib/src/test/java/org/apache/giraph/io/hbase/edgemarker/TableEdgeInputFormat.java Sat Oct 6 00:52:17 2012
@@ -15,10 +15,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.giraph.format.hbase.edgemarker;
+package org.apache.giraph.io.hbase.edgemarker;
import com.google.common.collect.Maps;
-import org.apache.giraph.format.hbase.HBaseVertexInputFormat;
+import org.apache.giraph.io.hbase.HBaseVertexInputFormat;
import org.apache.giraph.graph.Vertex;
import org.apache.giraph.graph.BspUtils;
import org.apache.giraph.graph.VertexReader;
Copied: giraph/trunk/giraph-formats-contrib/src/test/java/org/apache/giraph/io/hbase/edgemarker/TableEdgeOutputFormat.java (from r1394835, giraph/trunk/giraph-formats-contrib/src/test/java/org/apache/giraph/format/hbase/edgemarker/TableEdgeOutputFormat.java)
URL: http://svn.apache.org/viewvc/giraph/trunk/giraph-formats-contrib/src/test/java/org/apache/giraph/io/hbase/edgemarker/TableEdgeOutputFormat.java?p2=giraph/trunk/giraph-formats-contrib/src/test/java/org/apache/giraph/io/hbase/edgemarker/TableEdgeOutputFormat.java&p1=giraph/trunk/giraph-formats-contrib/src/test/java/org/apache/giraph/format/hbase/edgemarker/TableEdgeOutputFormat.java&r1=1394835&r2=1394878&rev=1394878&view=diff
==============================================================================
--- giraph/trunk/giraph-formats-contrib/src/test/java/org/apache/giraph/format/hbase/edgemarker/TableEdgeOutputFormat.java (original)
+++ giraph/trunk/giraph-formats-contrib/src/test/java/org/apache/giraph/io/hbase/edgemarker/TableEdgeOutputFormat.java Sat Oct 6 00:52:17 2012
@@ -15,9 +15,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.giraph.format.hbase.edgemarker;
+package org.apache.giraph.io.hbase.edgemarker;
-import org.apache.giraph.format.hbase.HBaseVertexOutputFormat;
+import org.apache.giraph.io.hbase.HBaseVertexOutputFormat;
import org.apache.giraph.graph.Vertex;
import org.apache.giraph.graph.VertexWriter;
import org.apache.hadoop.hbase.client.Put;