You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@giraph.apache.org by ik...@apache.org on 2015/05/29 20:26:53 UTC
git commit: updated refs/heads/trunk to 905acc9
Repository: giraph
Updated Branches:
refs/heads/trunk c8078a2f3 -> 905acc960
[GIRAPH-1006] Remove boxing when not necessary for partitioned jobs
Summary:
Test Plan: mvn clean install
Reviewers: maja.kabiljo, dionysis.logothetis
Reviewed By: dionysis.logothetis
Subscribers:
Differential Revision: https://reviews.facebook.net/D38127
Project: http://git-wip-us.apache.org/repos/asf/giraph/repo
Commit: http://git-wip-us.apache.org/repos/asf/giraph/commit/905acc96
Tree: http://git-wip-us.apache.org/repos/asf/giraph/tree/905acc96
Diff: http://git-wip-us.apache.org/repos/asf/giraph/diff/905acc96
Branch: refs/heads/trunk
Commit: 905acc96008fb912b4d03b0428dde9716171fb78
Parents: c8078a2
Author: Igor Kabiljo <ik...@fb.com>
Authored: Wed May 6 14:44:50 2015 -0700
Committer: Igor Kabiljo <ik...@fb.com>
Committed: Fri May 29 11:24:37 2015 -0700
----------------------------------------------------------------------
.../comm/messages/PointerListMessagesIterable.java | 9 +++++----
.../org/apache/giraph/conf/GiraphConstants.java | 4 ++--
...tDoubleDoubleAdjacencyListVertexInputFormat.java | 4 ++--
.../apache/giraph/mapping/LongByteMappingStore.java | 16 +++++++++-------
4 files changed, 18 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/giraph/blob/905acc96/giraph-core/src/main/java/org/apache/giraph/comm/messages/PointerListMessagesIterable.java
----------------------------------------------------------------------
diff --git a/giraph-core/src/main/java/org/apache/giraph/comm/messages/PointerListMessagesIterable.java b/giraph-core/src/main/java/org/apache/giraph/comm/messages/PointerListMessagesIterable.java
index e5a1691..01975fc 100644
--- a/giraph-core/src/main/java/org/apache/giraph/comm/messages/PointerListMessagesIterable.java
+++ b/giraph-core/src/main/java/org/apache/giraph/comm/messages/PointerListMessagesIterable.java
@@ -20,15 +20,16 @@ package org.apache.giraph.comm.messages;
import it.unimi.dsi.fastutil.longs.LongArrayList;
import it.unimi.dsi.fastutil.longs.LongListIterator;
+
+import java.io.IOException;
+import java.util.Iterator;
+
import org.apache.giraph.factories.MessageValueFactory;
import org.apache.giraph.utils.ExtendedByteArrayOutputBuffer;
import org.apache.giraph.utils.ExtendedDataOutput;
import org.apache.giraph.utils.UnsafeReusableByteArrayInput;
import org.apache.hadoop.io.Writable;
-import java.io.IOException;
-import java.util.Iterator;
-
/**
* Create an iterable for messages based on a pointer list
*
@@ -82,7 +83,7 @@ public class PointerListMessagesIterable<M extends Writable>
@Override
public M next() {
- long pointer = iterator.next();
+ long pointer = iterator.nextLong();
try {
int index = (int) (pointer >>> 32);
int offset = (int) pointer;
http://git-wip-us.apache.org/repos/asf/giraph/blob/905acc96/giraph-core/src/main/java/org/apache/giraph/conf/GiraphConstants.java
----------------------------------------------------------------------
diff --git a/giraph-core/src/main/java/org/apache/giraph/conf/GiraphConstants.java b/giraph-core/src/main/java/org/apache/giraph/conf/GiraphConstants.java
index 2c938a9..72d913d 100644
--- a/giraph-core/src/main/java/org/apache/giraph/conf/GiraphConstants.java
+++ b/giraph-core/src/main/java/org/apache/giraph/conf/GiraphConstants.java
@@ -91,12 +91,12 @@ public interface GiraphConstants {
int ONE_KB = 1024;
/** Mapping related information */
- ClassConfOption<? extends MappingStore> MAPPING_STORE_CLASS =
+ ClassConfOption<MappingStore> MAPPING_STORE_CLASS =
ClassConfOption.create("giraph.mappingStoreClass", null,
MappingStore.class, "MappingStore Class");
/** Class to use for performing read operations on mapping store */
- ClassConfOption<? extends MappingStoreOps> MAPPING_STORE_OPS_CLASS =
+ ClassConfOption<MappingStoreOps> MAPPING_STORE_OPS_CLASS =
ClassConfOption.create("giraph.mappingStoreOpsClass", null,
MappingStoreOps.class, "MappingStoreOps class");
http://git-wip-us.apache.org/repos/asf/giraph/blob/905acc96/giraph-core/src/main/java/org/apache/giraph/io/formats/TextDoubleDoubleAdjacencyListVertexInputFormat.java
----------------------------------------------------------------------
diff --git a/giraph-core/src/main/java/org/apache/giraph/io/formats/TextDoubleDoubleAdjacencyListVertexInputFormat.java b/giraph-core/src/main/java/org/apache/giraph/io/formats/TextDoubleDoubleAdjacencyListVertexInputFormat.java
index f8a7406..5434c2c 100644
--- a/giraph-core/src/main/java/org/apache/giraph/io/formats/TextDoubleDoubleAdjacencyListVertexInputFormat.java
+++ b/giraph-core/src/main/java/org/apache/giraph/io/formats/TextDoubleDoubleAdjacencyListVertexInputFormat.java
@@ -64,13 +64,13 @@ public class TextDoubleDoubleAdjacencyListVertexInputFormat
@Override
public DoubleWritable decodeValue(String s) {
- return new DoubleWritable(Double.valueOf(s));
+ return new DoubleWritable(Double.parseDouble(s));
}
@Override
public Edge<Text, DoubleWritable> decodeEdge(String s1, String s2) {
return EdgeFactory.create(new Text(s1),
- new DoubleWritable(Double.valueOf(s2)));
+ new DoubleWritable(Double.parseDouble(s2)));
}
}
http://git-wip-us.apache.org/repos/asf/giraph/blob/905acc96/giraph-core/src/main/java/org/apache/giraph/mapping/LongByteMappingStore.java
----------------------------------------------------------------------
diff --git a/giraph-core/src/main/java/org/apache/giraph/mapping/LongByteMappingStore.java b/giraph-core/src/main/java/org/apache/giraph/mapping/LongByteMappingStore.java
index 996fed0..afee7d2 100644
--- a/giraph-core/src/main/java/org/apache/giraph/mapping/LongByteMappingStore.java
+++ b/giraph-core/src/main/java/org/apache/giraph/mapping/LongByteMappingStore.java
@@ -18,8 +18,14 @@
package org.apache.giraph.mapping;
-import com.google.common.collect.MapMaker;
import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap;
+
+import java.util.Arrays;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.atomic.AtomicLong;
+
+import javax.annotation.concurrent.ThreadSafe;
+
import org.apache.giraph.conf.DefaultImmutableClassesGiraphConfigurable;
import org.apache.giraph.conf.GiraphConstants;
import org.apache.hadoop.io.ByteWritable;
@@ -27,11 +33,7 @@ import org.apache.hadoop.io.LongWritable;
import org.apache.hadoop.io.Writable;
import org.apache.log4j.Logger;
-import java.util.Arrays;
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.atomic.AtomicLong;
-
-import javax.annotation.concurrent.ThreadSafe;
+import com.google.common.collect.MapMaker;
/**
*
@@ -118,7 +120,7 @@ public class LongByteMappingStore
@Override
public ByteWritable getTarget(LongWritable vertexId,
ByteWritable target) {
- Byte bval = getByteTarget(vertexId);
+ byte bval = getByteTarget(vertexId);
if (bval == -1) { // worker not assigned by mapping
return null;
}