You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@giraph.apache.org by di...@apache.org on 2020/05/13 00:46:22 UTC
[giraph] branch trunk updated: GIRAPH-1231
This is an automated email from the ASF dual-hosted git repository.
dionysios pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/giraph.git
The following commit(s) were added to refs/heads/trunk by this push:
new 8dfb290 GIRAPH-1231
8dfb290 is described below
commit 8dfb29047aec68859b439974594e38161359893a
Author: Dionysios Logothetis <dl...@gmail.com>
AuthorDate: Tue May 12 17:46:03 2020 -0700
GIRAPH-1231
closes #134
---
giraph-block-app/pom.xml | 4 ----
.../apache/giraph/block_app/framework/internal/BlockMasterLogic.java | 2 +-
.../org/apache/giraph/block_app/framework/BlockExecutionTest.java | 2 +-
.../src/main/java/org/apache/giraph/conf/DefaultMessageClasses.java | 2 +-
.../src/main/java/org/apache/giraph/master/SuperstepClasses.java | 2 +-
.../src/main/java/org/apache/giraph/reducers/impl/PairReduce.java | 2 +-
.../src/main/java/org/apache/giraph/worker/AllWorkersInfo.java | 2 +-
7 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/giraph-block-app/pom.xml b/giraph-block-app/pom.xml
index 21ce0a6..ae3d445 100644
--- a/giraph-block-app/pom.xml
+++ b/giraph-block-app/pom.xml
@@ -103,10 +103,6 @@ under the License.
<artifactId>guava</artifactId>
</dependency>
<dependency>
- <groupId>org.python</groupId>
- <artifactId>jython</artifactId>
- </dependency>
- <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</dependency>
diff --git a/giraph-block-app/src/main/java/org/apache/giraph/block_app/framework/internal/BlockMasterLogic.java b/giraph-block-app/src/main/java/org/apache/giraph/block_app/framework/internal/BlockMasterLogic.java
index b6167d9..423929e 100644
--- a/giraph-block-app/src/main/java/org/apache/giraph/block_app/framework/internal/BlockMasterLogic.java
+++ b/giraph-block-app/src/main/java/org/apache/giraph/block_app/framework/internal/BlockMasterLogic.java
@@ -36,7 +36,7 @@ import org.apache.giraph.conf.GiraphConfiguration;
import org.apache.giraph.function.Consumer;
import org.apache.giraph.writable.tuple.IntLongWritable;
import org.apache.log4j.Logger;
-import org.python.google.common.base.Preconditions;
+import com.google.common.base.Preconditions;
/**
* Block execution logic on master, iterating over Pieces of the
diff --git a/giraph-block-app/src/test/java/org/apache/giraph/block_app/framework/BlockExecutionTest.java b/giraph-block-app/src/test/java/org/apache/giraph/block_app/framework/BlockExecutionTest.java
index 00c5fb1..4913749 100644
--- a/giraph-block-app/src/test/java/org/apache/giraph/block_app/framework/BlockExecutionTest.java
+++ b/giraph-block-app/src/test/java/org/apache/giraph/block_app/framework/BlockExecutionTest.java
@@ -46,7 +46,7 @@ import org.apache.hadoop.io.Writable;
import org.apache.hadoop.io.WritableComparable;
import org.junit.Assert;
import org.junit.Test;
-import org.python.google.common.collect.Iterables;
+import com.google.common.collect.Iterables;
/**
* Test of barebones of Blocks Framework.
diff --git a/giraph-core/src/main/java/org/apache/giraph/conf/DefaultMessageClasses.java b/giraph-core/src/main/java/org/apache/giraph/conf/DefaultMessageClasses.java
index a2ddf0e..c402059 100644
--- a/giraph-core/src/main/java/org/apache/giraph/conf/DefaultMessageClasses.java
+++ b/giraph-core/src/main/java/org/apache/giraph/conf/DefaultMessageClasses.java
@@ -29,7 +29,7 @@ import org.apache.giraph.utils.ReflectionUtils;
import org.apache.giraph.utils.WritableUtils;
import org.apache.hadoop.io.Writable;
import org.apache.hadoop.io.WritableComparable;
-import org.python.google.common.base.Preconditions;
+import com.google.common.base.Preconditions;
/**
* Default implementation of MessageClasses
diff --git a/giraph-core/src/main/java/org/apache/giraph/master/SuperstepClasses.java b/giraph-core/src/main/java/org/apache/giraph/master/SuperstepClasses.java
index 8653c96..8b521c7 100644
--- a/giraph-core/src/main/java/org/apache/giraph/master/SuperstepClasses.java
+++ b/giraph-core/src/main/java/org/apache/giraph/master/SuperstepClasses.java
@@ -37,7 +37,7 @@ import org.apache.giraph.utils.WritableUtils;
import org.apache.hadoop.io.Writable;
import org.apache.hadoop.io.WritableComparable;
import org.apache.log4j.Logger;
-import org.python.google.common.base.Preconditions;
+import com.google.common.base.Preconditions;
/**
* Holds Computation and MessageCombiner class.
diff --git a/giraph-core/src/main/java/org/apache/giraph/reducers/impl/PairReduce.java b/giraph-core/src/main/java/org/apache/giraph/reducers/impl/PairReduce.java
index 1aea293..f9e57ca 100644
--- a/giraph-core/src/main/java/org/apache/giraph/reducers/impl/PairReduce.java
+++ b/giraph-core/src/main/java/org/apache/giraph/reducers/impl/PairReduce.java
@@ -26,7 +26,7 @@ import org.apache.giraph.reducers.ReduceOperation;
import org.apache.giraph.utils.WritableUtils;
import org.apache.giraph.writable.tuple.PairWritable;
import org.apache.hadoop.io.Writable;
-import org.python.google.common.base.Preconditions;
+import com.google.common.base.Preconditions;
/**
* Combines two individual reducers, to create a single reducer of pairs that
diff --git a/giraph-core/src/main/java/org/apache/giraph/worker/AllWorkersInfo.java b/giraph-core/src/main/java/org/apache/giraph/worker/AllWorkersInfo.java
index 0112134..32cc8c5 100644
--- a/giraph-core/src/main/java/org/apache/giraph/worker/AllWorkersInfo.java
+++ b/giraph-core/src/main/java/org/apache/giraph/worker/AllWorkersInfo.java
@@ -20,7 +20,7 @@ package org.apache.giraph.worker;
import java.util.ArrayList;
import java.util.List;
-import org.python.google.common.base.Preconditions;
+import com.google.common.base.Preconditions;
import it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap;