You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by ok...@apache.org on 2016/02/19 17:06:40 UTC
incubator-tinkerpop git commit: added spaces to
BulkLoaderVertexProgram.toString() and fixed a thread/clone bug in
PageRankVertexProgram. Because of initialRankTraversal,
PagerankVerteXProgram is no longer a StaticVertexProgram and thus,
must be properly
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/TINKERPOP-1154 df4c28630 -> ca389902a
added spaces to BulkLoaderVertexProgram.toString() and fixed a thread/clone bug in PageRankVertexProgram. Because of initialRankTraversal, PagerankVerteXProgram is no longer a StaticVertexProgram and thus, must be properly cloned between threads.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/ca389902
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/ca389902
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/ca389902
Branch: refs/heads/TINKERPOP-1154
Commit: ca389902af283d179a1f7516b578cef27db5e797
Parents: df4c286
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Fri Feb 19 09:06:32 2016 -0700
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Fri Feb 19 09:06:32 2016 -0700
----------------------------------------------------------------------
.../bulkloading/BulkLoaderVertexProgram.java | 10 +++++-----
.../peerpressure/PeerPressureVertexProgram.java | 2 +-
.../ranking/pagerank/PageRankVertexProgram.java | 18 +++++++++++++++---
.../lambda/HaltedTraversersCountTraversal.java | 4 ++--
.../process/traversal/step/map/PageRankTest.java | 2 --
5 files changed, 23 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/ca389902/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/bulkloading/BulkLoaderVertexProgram.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/bulkloading/BulkLoaderVertexProgram.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/bulkloading/BulkLoaderVertexProgram.java
index 9f38df2..6853531 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/bulkloading/BulkLoaderVertexProgram.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/bulkloading/BulkLoaderVertexProgram.java
@@ -301,12 +301,12 @@ public class BulkLoaderVertexProgram implements VertexProgram<Tuple> {
public String toString() {
final StringBuilder sb = new StringBuilder();
if (bulkLoader != null) {
- sb.append("bulkLoader=").append(bulkLoader.getClass().getSimpleName()).append(",");
- sb.append("vertexIdProperty=").append(bulkLoader.getVertexIdProperty()).append(",");
- sb.append("userSuppliedIds=").append(bulkLoader.useUserSuppliedIds()).append(",");
- sb.append("keepOriginalIds=").append(bulkLoader.keepOriginalIds()).append(",");
+ sb.append("bulkLoader=").append(bulkLoader.getClass().getSimpleName()).append(", ");
+ sb.append("vertexIdProperty=").append(bulkLoader.getVertexIdProperty()).append(", ");
+ sb.append("userSuppliedIds=").append(bulkLoader.useUserSuppliedIds()).append(", ");
+ sb.append("keepOriginalIds=").append(bulkLoader.keepOriginalIds()).append(", ");
} else {
- sb.append("bulkLoader=").append(bulkLoader).append(",");
+ sb.append("bulkLoader=").append(bulkLoader).append(", ");
}
sb.append("batchSize=").append(intermediateBatchSize);
return StringFactory.vertexProgramString(this, sb.toString());
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/ca389902/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/clustering/peerpressure/PeerPressureVertexProgram.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/clustering/peerpressure/PeerPressureVertexProgram.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/clustering/peerpressure/PeerPressureVertexProgram.java
index 23096ed..6c0034d 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/clustering/peerpressure/PeerPressureVertexProgram.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/clustering/peerpressure/PeerPressureVertexProgram.java
@@ -189,7 +189,7 @@ public class PeerPressureVertexProgram extends StaticVertexProgram<Pair<Serializ
@Override
public String toString() {
- return StringFactory.vertexProgramString(this, "distributeVote=" + this.distributeVote + ",maxIterations=" + this.maxIterations);
+ return StringFactory.vertexProgramString(this, "distributeVote=" + this.distributeVote + ", maxIterations=" + this.maxIterations);
}
//////////////////////////////
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/ca389902/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/ranking/pagerank/PageRankVertexProgram.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/ranking/pagerank/PageRankVertexProgram.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/ranking/pagerank/PageRankVertexProgram.java
index 15f4996..2092e65 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/ranking/pagerank/PageRankVertexProgram.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/ranking/pagerank/PageRankVertexProgram.java
@@ -24,8 +24,8 @@ import org.apache.tinkerpop.gremlin.process.computer.Memory;
import org.apache.tinkerpop.gremlin.process.computer.MessageCombiner;
import org.apache.tinkerpop.gremlin.process.computer.MessageScope;
import org.apache.tinkerpop.gremlin.process.computer.Messenger;
+import org.apache.tinkerpop.gremlin.process.computer.VertexProgram;
import org.apache.tinkerpop.gremlin.process.computer.util.AbstractVertexProgramBuilder;
-import org.apache.tinkerpop.gremlin.process.computer.util.StaticVertexProgram;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
@@ -47,7 +47,7 @@ import java.util.Set;
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
*/
-public class PageRankVertexProgram extends StaticVertexProgram<Double> {
+public class PageRankVertexProgram implements VertexProgram<Double> {
public static final String PAGE_RANK = "gremlin.pageRankVertexProgram.pageRank";
@@ -92,7 +92,7 @@ public class PageRankVertexProgram extends StaticVertexProgram<Double> {
@Override
public void storeState(final Configuration configuration) {
- super.storeState(configuration);
+ VertexProgram.super.storeState(configuration);
configuration.setProperty(VERTEX_COUNT, this.vertexCountAsDouble);
configuration.setProperty(ALPHA, this.alpha);
configuration.setProperty(TOTAL_ITERATIONS, this.totalIterations);
@@ -131,6 +131,18 @@ public class PageRankVertexProgram extends StaticVertexProgram<Double> {
}
@Override
+ public PageRankVertexProgram clone() {
+ try {
+ final PageRankVertexProgram clone = (PageRankVertexProgram) super.clone();
+ if (null != this.initialRankTraversal)
+ clone.initialRankTraversal = this.initialRankTraversal.clone();
+ return clone;
+ } catch (final CloneNotSupportedException e) {
+ throw new IllegalStateException(e.getMessage(), e);
+ }
+ }
+
+ @Override
public void setup(final Memory memory) {
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/ca389902/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/lambda/HaltedTraversersCountTraversal.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/lambda/HaltedTraversersCountTraversal.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/lambda/HaltedTraversersCountTraversal.java
index b09cd7d..b7b9328 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/lambda/HaltedTraversersCountTraversal.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/lambda/HaltedTraversersCountTraversal.java
@@ -35,7 +35,7 @@ public final class HaltedTraversersCountTraversal extends AbstractLambdaTraversa
@Override
public Long next() {
- return count;
+ return this.count;
}
@Override
@@ -46,7 +46,7 @@ public final class HaltedTraversersCountTraversal extends AbstractLambdaTraversa
@Override
public String toString() {
- return "count(" + TraversalVertexProgram.HALTED_TRAVERSERS + ')';
+ return "count(" + TraversalVertexProgram.HALTED_TRAVERSERS + ")";
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/ca389902/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PageRankTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PageRankTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PageRankTest.java
index 0e66489..3ae98d9 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PageRankTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PageRankTest.java
@@ -27,7 +27,6 @@ import org.apache.tinkerpop.gremlin.process.traversal.Order;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
import org.apache.tinkerpop.gremlin.structure.Vertex;
-import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -165,7 +164,6 @@ public abstract class PageRankTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
- @Ignore
public void g_V_hasLabelXsoftwareX_hasXname_rippleX_pageRankX1X_byXinEXcreatedXX_timesX1X_byXpriorsX_inXcreatedX_unionXboth__identityX_valueMapXname_priorsX() {
final Traversal<Vertex, Map<String, List<Object>>> traversal = get_g_V_hasLabelXsoftwareX_hasXname_rippleX_pageRankX1X_byXinEXcreatedXX_timesX1X_byXpriorsX_inXcreatedX_unionXboth__identityX_valueMapXname_priorsX();
printTraversalForm(traversal);