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 2015/09/03 19:01:16 UTC
[1/2] incubator-tinkerpop git commit: GraphComputer will convert any
Vertex or Edge ids to their id Object prior to submission to GraphComputer
(OLAP). @dkuppitz -- this is the 'backmerge' thing.
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/master 016694dde -> aca507b10
GraphComputer will convert any Vertex or Edge ids to their id Object prior to submission to GraphComputer (OLAP). @dkuppitz -- this is the 'backmerge' thing.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/7642fcb5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/7642fcb5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/7642fcb5
Branch: refs/heads/master
Commit: 7642fcb537d995ece887d0d0376cc1a993b1477a
Parents: 5a38139
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Thu Sep 3 11:00:44 2015 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Thu Sep 3 11:00:44 2015 -0600
----------------------------------------------------------------------
CHANGELOG.asciidoc | 5 +++++
.../gremlin/process/traversal/step/sideEffect/GraphStep.java | 4 ++++
.../strategy/verification/ComputerVerificationStrategy.java | 5 -----
3 files changed, 9 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/7642fcb5/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 87360e3..3669d6c 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -22,6 +22,11 @@ TinkerPop 3.0.0 (A Gremlin Rāga in 7/16 Time)
image::https://raw.githubusercontent.com/apache/incubator-tinkerpop/master/docs/static/images/gremlin-hindu.png[width=225]
+TinkerPop 3.0.2 (NOT OFFICIALLY RELEASED YET)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+* `GraphStep` will convert any `Vertex` or `Edge` ids to their id `Object` prior to submission to `GraphComputer` (OLAP).
+
TinkerPop 3.0.1 (Release Date: September 2, 2015)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/7642fcb5/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GraphStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GraphStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GraphStep.java
index 1cfdbee..1006286 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GraphStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GraphStep.java
@@ -85,6 +85,10 @@ public class GraphStep<S extends Element> extends StartStep<S> implements Engine
public void onEngine(final TraversalEngine traversalEngine) {
if (traversalEngine.isComputer()) {
this.iteratorSupplier = Collections::emptyIterator;
+ for(int i=0; i<this.ids.length; i++) { // if this is going to OLAP, convert to ids so you don't serialize elements
+ if(this.ids[i] instanceof Element)
+ this.ids[i] = ((Element)this.ids[i]).id();
+ }
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/7642fcb5/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/verification/ComputerVerificationStrategy.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/verification/ComputerVerificationStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/verification/ComputerVerificationStrategy.java
index 8923372..259531a 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/verification/ComputerVerificationStrategy.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/verification/ComputerVerificationStrategy.java
@@ -81,11 +81,6 @@ public final class ComputerVerificationStrategy extends AbstractTraversalStrateg
if (traversal.getParent() instanceof EmptyStep) {
if (!(traversal.getStartStep() instanceof GraphStep))
throw new VerificationException("GraphComputer does not support traversals starting from a non-GraphStep: " + traversal.getStartStep(), traversal);
- for (final Object id : ((GraphStep) traversal.getStartStep()).getIds()) {
- if (id instanceof Vertex || id instanceof Edge) {
- throw new VerificationException("GraphComputer does not support traversals starting from a particular vertex or edge.", traversal);
- }
- }
///
if (endStep instanceof CollectingBarrierStep && endStep instanceof TraversalParent) {
if (((TraversalParent) endStep).getLocalChildren().stream().filter(t ->
[2/2] incubator-tinkerpop git commit: Merge branch 'tp30'
Posted by ok...@apache.org.
Merge branch 'tp30'
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/aca507b1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/aca507b1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/aca507b1
Branch: refs/heads/master
Commit: aca507b104e29458a4484c4c036498242f302eae
Parents: 016694d 7642fcb
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Thu Sep 3 11:00:58 2015 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Thu Sep 3 11:00:58 2015 -0600
----------------------------------------------------------------------
CHANGELOG.asciidoc | 5 +++++
.../strategy/verification/ComputerVerificationStrategy.java | 5 -----
2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/aca507b1/CHANGELOG.asciidoc
----------------------------------------------------------------------