You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@giraph.apache.org by ed...@apache.org on 2016/07/14 04:10:41 UTC

[1/4] git commit: updated refs/heads/release-1.2.0 to 3c93379

Repository: giraph
Updated Branches:
  refs/heads/release-1.2.0 [created] 3c933792f


Preparing for release


Project: http://git-wip-us.apache.org/repos/asf/giraph/repo
Commit: http://git-wip-us.apache.org/repos/asf/giraph/commit/fd96226c
Tree: http://git-wip-us.apache.org/repos/asf/giraph/tree/fd96226c
Diff: http://git-wip-us.apache.org/repos/asf/giraph/diff/fd96226c

Branch: refs/heads/release-1.2.0
Commit: fd96226c20adf08f86e3cb6ba4b802cd88ec6dd6
Parents: b0262f8
Author: Sergey Edunov <ed...@fb.com>
Authored: Tue Jul 12 17:09:42 2016 -0700
Committer: Sergey Edunov <ed...@fb.com>
Committed: Tue Jul 12 17:09:42 2016 -0700

----------------------------------------------------------------------
 giraph-accumulo/pom.xml                  | 2 +-
 giraph-block-app-8/pom.xml               | 2 +-
 giraph-block-app/pom.xml                 | 2 +-
 giraph-core/pom.xml                      | 2 +-
 giraph-debugger/pom.xml                  | 2 +-
 giraph-dist/pom.xml                      | 2 +-
 giraph-examples/pom.xml                  | 4 ++--
 giraph-gora/pom.xml                      | 2 +-
 giraph-hbase/pom.xml                     | 2 +-
 giraph-hcatalog/pom.xml                  | 2 +-
 giraph-rexster/giraph-kibble/pom.xml     | 2 +-
 giraph-rexster/giraph-rexster-io/pom.xml | 2 +-
 giraph-rexster/pom.xml                   | 2 +-
 pom.xml                                  | 2 +-
 src/site/xdoc/rexster.xml                | 2 +-
 15 files changed, 16 insertions(+), 16 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/giraph/blob/fd96226c/giraph-accumulo/pom.xml
----------------------------------------------------------------------
diff --git a/giraph-accumulo/pom.xml b/giraph-accumulo/pom.xml
index 9f4bfb2..ed7df42 100644
--- a/giraph-accumulo/pom.xml
+++ b/giraph-accumulo/pom.xml
@@ -24,7 +24,7 @@ under the License.
   <parent>
     <groupId>org.apache.giraph</groupId>
     <artifactId>giraph-parent</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.2.0-RC0</version>
   </parent>
   <artifactId>giraph-accumulo</artifactId>
   <packaging>jar</packaging>

http://git-wip-us.apache.org/repos/asf/giraph/blob/fd96226c/giraph-block-app-8/pom.xml
----------------------------------------------------------------------
diff --git a/giraph-block-app-8/pom.xml b/giraph-block-app-8/pom.xml
index 6645eed..0896f5c 100644
--- a/giraph-block-app-8/pom.xml
+++ b/giraph-block-app-8/pom.xml
@@ -24,7 +24,7 @@ under the License.
   <parent>
     <groupId>org.apache.giraph</groupId>
     <artifactId>giraph-parent</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.2.0-RC0</version>
   </parent>
   <artifactId>giraph-block-app-8</artifactId>
   <packaging>jar</packaging>

http://git-wip-us.apache.org/repos/asf/giraph/blob/fd96226c/giraph-block-app/pom.xml
----------------------------------------------------------------------
diff --git a/giraph-block-app/pom.xml b/giraph-block-app/pom.xml
index 3524e19..77e7c84 100644
--- a/giraph-block-app/pom.xml
+++ b/giraph-block-app/pom.xml
@@ -24,7 +24,7 @@ under the License.
   <parent>
     <groupId>org.apache.giraph</groupId>
     <artifactId>giraph-parent</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.2.0-RC0</version>
   </parent>
   <artifactId>giraph-block-app</artifactId>
   <packaging>jar</packaging>

http://git-wip-us.apache.org/repos/asf/giraph/blob/fd96226c/giraph-core/pom.xml
----------------------------------------------------------------------
diff --git a/giraph-core/pom.xml b/giraph-core/pom.xml
index 27cb27a..8006839 100644
--- a/giraph-core/pom.xml
+++ b/giraph-core/pom.xml
@@ -24,7 +24,7 @@ under the License.
   <parent>
     <groupId>org.apache.giraph</groupId>
     <artifactId>giraph-parent</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.2.0-RC0</version>
   </parent>
   <artifactId>giraph-core</artifactId>
   <packaging>jar</packaging>

http://git-wip-us.apache.org/repos/asf/giraph/blob/fd96226c/giraph-debugger/pom.xml
----------------------------------------------------------------------
diff --git a/giraph-debugger/pom.xml b/giraph-debugger/pom.xml
index bc66635..c11de0f 100644
--- a/giraph-debugger/pom.xml
+++ b/giraph-debugger/pom.xml
@@ -26,7 +26,7 @@ under the License.
   <parent>
     <groupId>org.apache.giraph</groupId>
     <artifactId>giraph-parent</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.2.0-RC0</version>
   </parent>
   <artifactId>giraph-debugger</artifactId>
   <packaging>jar</packaging>

http://git-wip-us.apache.org/repos/asf/giraph/blob/fd96226c/giraph-dist/pom.xml
----------------------------------------------------------------------
diff --git a/giraph-dist/pom.xml b/giraph-dist/pom.xml
index 310f97f..3d09f8f 100644
--- a/giraph-dist/pom.xml
+++ b/giraph-dist/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.giraph</groupId>
     <artifactId>giraph-parent</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.2.0-RC0</version>
   </parent>
 
   <artifactId>giraph-dist</artifactId>

http://git-wip-us.apache.org/repos/asf/giraph/blob/fd96226c/giraph-examples/pom.xml
----------------------------------------------------------------------
diff --git a/giraph-examples/pom.xml b/giraph-examples/pom.xml
index 934f984..a53efe9 100644
--- a/giraph-examples/pom.xml
+++ b/giraph-examples/pom.xml
@@ -24,7 +24,7 @@ under the License.
   <parent>
     <groupId>org.apache.giraph</groupId>
     <artifactId>giraph-parent</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.2.0-RC0</version>
   </parent>
   <artifactId>giraph-examples</artifactId>
   <packaging>jar</packaging>
@@ -429,7 +429,7 @@ under the License.
     <dependency>
       <groupId>org.apache.giraph</groupId>
       <artifactId>giraph-core</artifactId>
-      <version>1.2.0-SNAPSHOT</version>
+      <version>1.2.0-RC0</version>
       <type>test-jar</type>
     </dependency>
     <dependency>

http://git-wip-us.apache.org/repos/asf/giraph/blob/fd96226c/giraph-gora/pom.xml
----------------------------------------------------------------------
diff --git a/giraph-gora/pom.xml b/giraph-gora/pom.xml
index b6c1047..16ac000 100644
--- a/giraph-gora/pom.xml
+++ b/giraph-gora/pom.xml
@@ -16,7 +16,7 @@
     <parent>
         <groupId>org.apache.giraph</groupId>
         <artifactId>giraph-parent</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.2.0-RC0</version>
     </parent>
     <artifactId>giraph-gora</artifactId>
     <packaging>jar</packaging>

http://git-wip-us.apache.org/repos/asf/giraph/blob/fd96226c/giraph-hbase/pom.xml
----------------------------------------------------------------------
diff --git a/giraph-hbase/pom.xml b/giraph-hbase/pom.xml
index 1334e82..98449df 100644
--- a/giraph-hbase/pom.xml
+++ b/giraph-hbase/pom.xml
@@ -24,7 +24,7 @@ under the License.
   <parent>
     <groupId>org.apache.giraph</groupId>
     <artifactId>giraph-parent</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.2.0-RC0</version>
   </parent>
   <artifactId>giraph-hbase</artifactId>
   <packaging>jar</packaging>

http://git-wip-us.apache.org/repos/asf/giraph/blob/fd96226c/giraph-hcatalog/pom.xml
----------------------------------------------------------------------
diff --git a/giraph-hcatalog/pom.xml b/giraph-hcatalog/pom.xml
index 68acdf9..3f87463 100644
--- a/giraph-hcatalog/pom.xml
+++ b/giraph-hcatalog/pom.xml
@@ -24,7 +24,7 @@ under the License.
   <parent>
     <groupId>org.apache.giraph</groupId>
     <artifactId>giraph-parent</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.2.0-RC0</version>
   </parent>
   <artifactId>giraph-hcatalog</artifactId>
   <packaging>jar</packaging>

http://git-wip-us.apache.org/repos/asf/giraph/blob/fd96226c/giraph-rexster/giraph-kibble/pom.xml
----------------------------------------------------------------------
diff --git a/giraph-rexster/giraph-kibble/pom.xml b/giraph-rexster/giraph-kibble/pom.xml
index dca47b0..1981a8c 100644
--- a/giraph-rexster/giraph-kibble/pom.xml
+++ b/giraph-rexster/giraph-kibble/pom.xml
@@ -24,7 +24,7 @@ under the License.
   <parent>
     <groupId>org.apache.giraph</groupId>
     <artifactId>giraph-rexster</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.2.0-RC0</version>
   </parent>
 
   <artifactId>giraph-kibble</artifactId>

http://git-wip-us.apache.org/repos/asf/giraph/blob/fd96226c/giraph-rexster/giraph-rexster-io/pom.xml
----------------------------------------------------------------------
diff --git a/giraph-rexster/giraph-rexster-io/pom.xml b/giraph-rexster/giraph-rexster-io/pom.xml
index beba69c..42e32e7 100644
--- a/giraph-rexster/giraph-rexster-io/pom.xml
+++ b/giraph-rexster/giraph-rexster-io/pom.xml
@@ -24,7 +24,7 @@ under the License.
   <parent>
     <groupId>org.apache.giraph</groupId>
     <artifactId>giraph-rexster</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.2.0-RC0</version>
   </parent>
   <artifactId>giraph-rexster-io</artifactId>
   <packaging>jar</packaging>

http://git-wip-us.apache.org/repos/asf/giraph/blob/fd96226c/giraph-rexster/pom.xml
----------------------------------------------------------------------
diff --git a/giraph-rexster/pom.xml b/giraph-rexster/pom.xml
index 5e90d6c..5cb86f1 100644
--- a/giraph-rexster/pom.xml
+++ b/giraph-rexster/pom.xml
@@ -25,7 +25,7 @@ under the License.
   <parent>
     <groupId>org.apache.giraph</groupId>
     <artifactId>giraph-parent</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.2.0-RC0</version>
   </parent>
 
   <artifactId>giraph-rexster</artifactId>

http://git-wip-us.apache.org/repos/asf/giraph/blob/fd96226c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 45cbca9..417be59 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,7 +31,7 @@ under the License.
   <groupId>org.apache.giraph</groupId>
   <artifactId>giraph-parent</artifactId>
   <packaging>pom</packaging>
-  <version>1.2.0-SNAPSHOT</version>
+  <version>1.2.0-RC0</version>
 
   <name>Apache Giraph Parent</name>
   <url>http://giraph.apache.org/</url>

http://git-wip-us.apache.org/repos/asf/giraph/blob/fd96226c/src/site/xdoc/rexster.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/rexster.xml b/src/site/xdoc/rexster.xml
index a8a95f8..adf531d 100644
--- a/src/site/xdoc/rexster.xml
+++ b/src/site/xdoc/rexster.xml
@@ -61,7 +61,7 @@
 # Configuration
 export REXSTER_VERSION=2.4.0
 export HADOOP_VERSION=1.0.2
-export GIRAPH_VERSION=1.2.0-SNAPSHOT
+export GIRAPH_VERSION=1.2.0-RC0
 export GIRAPH_DIR=/path/to/giraph
 export REXSTER_DIR=/path/to/rexster
 export HADOOP_DIR=/path/to/hadoop


[4/4] git commit: updated refs/heads/release-1.2.0 to 3c93379

Posted by ed...@apache.org.
GIRAPH-1092 TestCollections.testLargeBasicList fails with OOM

Summary: This test case requires too much memory to run in Jenkins. Talked to Sergey Pupyrev and we decided to disable it.

Test Plan: none

Reviewers: majakabiljo, maja.kabiljo, spupyrev

Reviewed By: spupyrev

Differential Revision: https://reviews.facebook.net/D60753


Project: http://git-wip-us.apache.org/repos/asf/giraph/repo
Commit: http://git-wip-us.apache.org/repos/asf/giraph/commit/3c933792
Tree: http://git-wip-us.apache.org/repos/asf/giraph/tree/3c933792
Diff: http://git-wip-us.apache.org/repos/asf/giraph/diff/3c933792

Branch: refs/heads/release-1.2.0
Commit: 3c933792fba709dd878f840fa9094f8884c1f0a9
Parents: 26509d6
Author: Sergey Edunov <ed...@fb.com>
Authored: Wed Jul 13 14:38:02 2016 -0700
Committer: Sergey Edunov <ed...@fb.com>
Committed: Wed Jul 13 14:41:41 2016 -0700

----------------------------------------------------------------------
 .../src/test/java/org/apache/giraph/types/TestCollections.java      | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/giraph/blob/3c933792/giraph-core/src/test/java/org/apache/giraph/types/TestCollections.java
----------------------------------------------------------------------
diff --git a/giraph-core/src/test/java/org/apache/giraph/types/TestCollections.java b/giraph-core/src/test/java/org/apache/giraph/types/TestCollections.java
index 97d6a41..12b5dfc 100644
--- a/giraph-core/src/test/java/org/apache/giraph/types/TestCollections.java
+++ b/giraph-core/src/test/java/org/apache/giraph/types/TestCollections.java
@@ -53,6 +53,7 @@ public class TestCollections {
   }
 
   @Test
+  @Ignore("this test requires 1G to run")
   public void testLargeBasicList() {
     int capacity = 123456789;
     WArrayList<LongWritable> longSet = LongTypeOps.INSTANCE.createArrayList(capacity);


[2/4] git commit: updated refs/heads/release-1.2.0 to 3c93379

Posted by ed...@apache.org.
Finbugs issues. Preparing for release


Project: http://git-wip-us.apache.org/repos/asf/giraph/repo
Commit: http://git-wip-us.apache.org/repos/asf/giraph/commit/da11fb33
Tree: http://git-wip-us.apache.org/repos/asf/giraph/tree/da11fb33
Diff: http://git-wip-us.apache.org/repos/asf/giraph/diff/da11fb33

Branch: refs/heads/release-1.2.0
Commit: da11fb33218be30bd19de8340651700f55db04d0
Parents: fd96226
Author: Sergey Edunov <ed...@fb.com>
Authored: Tue Jul 12 17:25:30 2016 -0700
Committer: Sergey Edunov <ed...@fb.com>
Committed: Tue Jul 12 17:25:30 2016 -0700

----------------------------------------------------------------------
 .../org/apache/giraph/ooc/persistence/InMemoryDataAccessor.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/giraph/blob/da11fb33/giraph-core/src/main/java/org/apache/giraph/ooc/persistence/InMemoryDataAccessor.java
----------------------------------------------------------------------
diff --git a/giraph-core/src/main/java/org/apache/giraph/ooc/persistence/InMemoryDataAccessor.java b/giraph-core/src/main/java/org/apache/giraph/ooc/persistence/InMemoryDataAccessor.java
index 4eca0f1..3376ce5 100644
--- a/giraph-core/src/main/java/org/apache/giraph/ooc/persistence/InMemoryDataAccessor.java
+++ b/giraph-core/src/main/java/org/apache/giraph/ooc/persistence/InMemoryDataAccessor.java
@@ -94,7 +94,7 @@ public class InMemoryDataAccessor implements OutOfCoreDataAccessor {
   /**
    * {@link DataOutputWrapper} implementation for {@link InMemoryDataAccessor}
    */
-  public class InMemoryDataOutputWrapper implements DataOutputWrapper {
+  public static class InMemoryDataOutputWrapper implements DataOutputWrapper {
     /** Output to write data to */
     private final BigDataOutput output;
     /** Size of output at the moment it was created */


[3/4] git commit: updated refs/heads/release-1.2.0 to 3c93379

Posted by ed...@apache.org.
[GIRAPH-1091] Fix SimpleRangePartitionFactoryTest

Summary: SimpleRangePartitionFactoryTest relied on old logic for calculating number of partitions and got broken with GIRAPH-1082.

Test Plan: Ran the test

Differential Revision: https://reviews.facebook.net/D60747


Project: http://git-wip-us.apache.org/repos/asf/giraph/repo
Commit: http://git-wip-us.apache.org/repos/asf/giraph/commit/26509d6a
Tree: http://git-wip-us.apache.org/repos/asf/giraph/tree/26509d6a
Diff: http://git-wip-us.apache.org/repos/asf/giraph/diff/26509d6a

Branch: refs/heads/release-1.2.0
Commit: 26509d6ab7aab0920f47e3ba817507bc92e1349b
Parents: da11fb3
Author: Maja Kabiljo <ma...@fb.com>
Authored: Wed Jul 13 11:05:48 2016 -0700
Committer: Sergey Edunov <ed...@fb.com>
Committed: Wed Jul 13 14:31:30 2016 -0700

----------------------------------------------------------------------
 .../partition/SimpleRangePartitionFactoryTest.java    | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/giraph/blob/26509d6a/giraph-core/src/test/java/org/apache/giraph/partition/SimpleRangePartitionFactoryTest.java
----------------------------------------------------------------------
diff --git a/giraph-core/src/test/java/org/apache/giraph/partition/SimpleRangePartitionFactoryTest.java b/giraph-core/src/test/java/org/apache/giraph/partition/SimpleRangePartitionFactoryTest.java
index 4bb132b..67863dc 100644
--- a/giraph-core/src/test/java/org/apache/giraph/partition/SimpleRangePartitionFactoryTest.java
+++ b/giraph-core/src/test/java/org/apache/giraph/partition/SimpleRangePartitionFactoryTest.java
@@ -38,9 +38,11 @@ import static org.junit.Assert.assertEquals;
 /** Test {@link org.apache.giraph.partition.SimpleLongRangePartitionerFactory}. */
 public class SimpleRangePartitionFactoryTest {
 
-  private void testRange(int numWorkers, int keySpaceSize, int allowedWorkerDiff, boolean emptyWorkers) {
+  private void testRange(int numWorkers, int numPartitions, int keySpaceSize,
+      int allowedWorkerDiff, boolean emptyWorkers) {
     Configuration conf = new Configuration();
     conf.setLong(GiraphConstants.PARTITION_VERTEX_KEY_SPACE_SIZE, keySpaceSize);
+    GiraphConstants.USER_PARTITION_COUNT.set(conf, numPartitions);
     SimpleLongRangePartitionerFactory<Writable, Writable> factory =
         new SimpleLongRangePartitionerFactory<Writable, Writable>();
     factory.setConf(new ImmutableClassesGiraphConfiguration(conf));
@@ -106,14 +108,14 @@ public class SimpleRangePartitionFactoryTest {
   @Test
   public void testLongRangePartitionerFactory() {
     // perfect distribution
-    testRange(10, 100000, 0, false);
-    testRange(1000, 100000, 0, false);
+    testRange(10, 1000, 100000, 0, false);
+    testRange(1000, 50000, 100000, 0, false);
 
     // perfect distribution even when max is hit, and max is not divisible by #workers
-    testRange(8949, 100023, 0, false);
-    testRange(1949, 211111, 0, false);
+    testRange(8949, (50000 / 8949) * 8949, 100023, 0, false);
+    testRange(1949, (50000 / 1949) * 1949, 211111, 0, false);
 
     // imperfect distribution - because there are more workers than max partitions.
-    testRange(194942, 211111, 1, true);
+    testRange(194942, 50000, 211111, 1, true);
   }
 }