You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2015/05/01 17:52:32 UTC
[01/50] [abbrv] incubator-tinkerpop git commit: Properly constructed
a typed array list for GraphSON.
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/variables 69ba36776 -> bd54cf691
Properly constructed a typed array list for GraphSON.
Only use an embedded list when doing type embedding.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/0b8b40eb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/0b8b40eb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/0b8b40eb
Branch: refs/heads/variables
Commit: 0b8b40eb6e2606829399ad0765cce1efec74d2cc
Parents: 9d76521
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Apr 28 13:13:32 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Apr 28 13:13:32 2015 -0400
----------------------------------------------------------------------
.../gremlin/structure/io/graphson/GraphSONSerializers.java | 9 ++++++---
.../driver/ser/AbstractJsonMessageSerializerV1d0.java | 1 -
2 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/0b8b40eb/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializers.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializers.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializers.java
index 1e0ac4e..d19b30b 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializers.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializers.java
@@ -184,13 +184,16 @@ class GraphSONSerializers {
final Iterator<VertexProperty<Object>> vertexProperties = vertex.properties();
if (vertexProperties.hasNext()) {
jsonGenerator.writeArrayFieldStart(GraphSONTokens.PROPERTIES);
- if (typeSerializer != null) jsonGenerator.writeString(ArrayList.class.getName());
- jsonGenerator.writeStartArray();
+ if (typeSerializer != null) {
+ jsonGenerator.writeString(ArrayList.class.getName());
+ jsonGenerator.writeStartArray();
+ }
+
while (vertexProperties.hasNext()) {
jsonGenerator.writeObject(vertexProperties.next());
}
jsonGenerator.writeEndArray();
- jsonGenerator.writeEndArray();
+ if (typeSerializer != null) jsonGenerator.writeEndArray();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/0b8b40eb/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/AbstractJsonMessageSerializerV1d0.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/AbstractJsonMessageSerializerV1d0.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/AbstractJsonMessageSerializerV1d0.java
index 0058451..71f7f4c 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/AbstractJsonMessageSerializerV1d0.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/AbstractJsonMessageSerializerV1d0.java
@@ -101,7 +101,6 @@ public abstract class AbstractJsonMessageSerializerV1d0 implements MessageSerial
ByteBuf encodedMessage = null;
try {
final byte[] payload = mapper.writeValueAsBytes(createResponseMessageMap(responseMessage));
- final String x = new String(payload, "UTF-8");
encodedMessage = allocator.buffer(payload.length);
encodedMessage.writeBytes(payload);
[31/50] [abbrv] incubator-tinkerpop git commit: Groovy-Gremlin test
suite now using ScriptEngine bindings so IDs are not string generated by
pulled from bindings.
Posted by sp...@apache.org.
Groovy-Gremlin test suite now using ScriptEngine bindings so IDs are not string generated by pulled from bindings.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/c14a5dee
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/c14a5dee
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/c14a5dee
Branch: refs/heads/variables
Commit: c14a5deed8902b5d62df1541acd0c054fb591ff3
Parents: 250b27d
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Thu Apr 30 11:26:04 2015 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Thu Apr 30 11:26:04 2015 -0600
----------------------------------------------------------------------
CHANGELOG.asciidoc | 2 +
.../traversal/TraversalScriptSupplier.java | 15 ++++--
.../traversal/TraversalVertexProgram.java | 4 +-
.../tinkerpop/gremlin/structure/Element.java | 2 +-
.../process/computer/ComputerTestHelper.groovy | 11 +++--
.../step/branch/GroovyLocalTest.groovy | 19 ++++----
.../step/branch/GroovyRepeatTest.groovy | 12 ++---
.../step/branch/GroovyUnionTest.groovy | 10 ++--
.../step/filter/GroovyCyclicPathTest.groovy | 8 +--
.../step/filter/GroovyExceptTest.groovy | 12 ++---
.../step/filter/GroovyFilterTest.groovy | 6 +--
.../step/filter/GroovyHasNotTest.groovy | 4 +-
.../traversal/step/filter/GroovyHasTest.groovy | 29 ++++++-----
.../traversal/step/filter/GroovyIsTest.groovy | 10 ++--
.../step/filter/GroovyRetainTest.groovy | 10 ++--
.../step/filter/GroovySimplePathTest.groovy | 6 +--
.../step/map/GroovyCoalesceTest.groovy | 8 +--
.../traversal/step/map/GroovyMapTest.groovy | 8 +--
.../traversal/step/map/GroovyPathTest.groovy | 6 +--
.../step/map/GroovyPropertiesTest.groovy | 8 +--
.../traversal/step/map/GroovySelectTest.groovy | 18 +++----
.../step/map/GroovyValueMapTest.groovy | 6 +--
.../traversal/step/map/GroovyVertexTest.groovy | 51 ++++++++++----------
.../traversal/step/branch/UnionTest.java | 3 +-
24 files changed, 140 insertions(+), 128 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c14a5dee/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 3fc133a..5290b61 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -25,6 +25,8 @@ image::http://www.tinkerpop.com/docs/current/images/gremlin-hindu.png[width=225]
TinkerPop 3.0.0.M9 (NOT OFFICIALLY RELEASED YET)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+* `TraversalScriptSupplier` now takes an `Object` var args for setting `ScriptEngine` bindings if needed.
+* `Compare` is now more lenient on `Number`-types.
* Removed `Compare.inside` and `Compare.outside` as they are not primitive comparators and should be composed from primitives.
* Introduced `P` (predicate) for cleaner looking `is()`, `has()`, and `where()` calls -- e.g. `has('age',eq(32))`.
* `GraphTraversalSource` is now the location for `withXXX()` operations. No longer do they exist at `GraphTraversal`.
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c14a5dee/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/TraversalScriptSupplier.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/TraversalScriptSupplier.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/TraversalScriptSupplier.java
index ca187b1..1df5828 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/TraversalScriptSupplier.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/TraversalScriptSupplier.java
@@ -39,20 +39,27 @@ public final class TraversalScriptSupplier<S, E> implements Supplier<Traversal.A
private final Class<? extends Graph> graphClass;
private final String scriptEngineName;
private final String traversalScript;
+ private final Object[] bindings;
- public TraversalScriptSupplier(final Class<? extends Graph> graphClass, final TraversalSource.Builder traversalContextBuilder, final String scriptEngineName, final String traversalScript) {
+ public TraversalScriptSupplier(final Class<? extends Graph> graphClass, final TraversalSource.Builder traversalContextBuilder, final String scriptEngineName, final String traversalScript, final Object... bindings) {
this.traversalContextBuilder = traversalContextBuilder;
this.graphClass = graphClass;
this.scriptEngineName = scriptEngineName;
this.traversalScript = traversalScript;
+ this.bindings = bindings;
}
public Traversal.Admin<S, E> get() {
try {
final ScriptEngine engine = ScriptEngineCache.get(this.scriptEngineName);
- final Bindings bindings = engine.createBindings();
- bindings.put("g", this.traversalContextBuilder.create(ShellGraph.of(this.graphClass)));
- return (Traversal.Admin<S, E>) engine.eval(this.traversalScript, bindings);
+ final Bindings engineBindings = engine.createBindings();
+ engineBindings.put("g", this.traversalContextBuilder.create(ShellGraph.of(this.graphClass)));
+ if (this.bindings.length % 2 != 0)
+ throw new IllegalArgumentException("The provided key/value bindings array length must be a multiple of two");
+ for (int i = 0; i < this.bindings.length; i = i + 2) {
+ engineBindings.put((String) this.bindings[i], this.bindings[i + 1]);
+ }
+ return (Traversal.Admin<S, E>) engine.eval(this.traversalScript, engineBindings);
} catch (final ScriptException e) {
throw new IllegalStateException(e.getMessage(), e);
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c14a5dee/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/TraversalVertexProgram.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/TraversalVertexProgram.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/TraversalVertexProgram.java
index 3fe61c9..4f630c6 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/TraversalVertexProgram.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/TraversalVertexProgram.java
@@ -279,8 +279,8 @@ public final class TraversalVertexProgram implements VertexProgram<TraverserSet<
super(TraversalVertexProgram.class);
}
- public Builder traversal(final Class<? extends Graph> graphClass, final TraversalSource.Builder builder, final String scriptEngine, final String traversalScript) {
- LambdaHolder.storeState(this.configuration, LambdaHolder.Type.SERIALIZED_OBJECT, TRAVERSAL_SUPPLIER, new TraversalScriptSupplier<>(graphClass, builder, scriptEngine, traversalScript));
+ public Builder traversal(final Class<? extends Graph> graphClass, final TraversalSource.Builder builder, final String scriptEngine, final String traversalScript, final Object... bindings) {
+ LambdaHolder.storeState(this.configuration, LambdaHolder.Type.SERIALIZED_OBJECT, TRAVERSAL_SUPPLIER, new TraversalScriptSupplier<>(graphClass, builder, scriptEngine, traversalScript, bindings));
return this;
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c14a5dee/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Element.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Element.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Element.java
index 8ba3c62..b6538b9 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Element.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Element.java
@@ -122,7 +122,7 @@ public abstract interface Element {
}
public static IllegalArgumentException providedKeyValuesMustBeAMultipleOfTwo() {
- return new IllegalArgumentException("The provided key/value array must be a multiple of two");
+ return new IllegalArgumentException("The provided key/value array length must be a multiple of two");
}
public static IllegalArgumentException providedKeyValuesMustHaveALegalKeyOnEvenIndices() {
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c14a5dee/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/computer/ComputerTestHelper.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/computer/ComputerTestHelper.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/computer/ComputerTestHelper.groovy
index f62ad8c..ff34c91 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/computer/ComputerTestHelper.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/computer/ComputerTestHelper.groovy
@@ -18,9 +18,9 @@
*/
package org.apache.tinkerpop.gremlin.process.computer
+import org.apache.tinkerpop.gremlin.process.computer.traversal.TraversalVertexProgram
import org.apache.tinkerpop.gremlin.process.traversal.Traversal
import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource
-import org.apache.tinkerpop.gremlin.process.computer.traversal.TraversalVertexProgram
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource
import org.apache.tinkerpop.gremlin.structure.Graph
@@ -33,14 +33,15 @@ public class ComputerTestHelper {
final Graph graph,
final TraversalSource.Builder builder,
final String scriptEngineName,
- final String traversalScript) {
+ final String traversalScript,
+ final Object... bindings) {
- final TraversalVertexProgram program = TraversalVertexProgram.build().traversal(graph.getClass(), builder, scriptEngineName, traversalScript).create();
+ final TraversalVertexProgram program = TraversalVertexProgram.build().traversal(graph.getClass(), builder, scriptEngineName, traversalScript, bindings).create();
final ComputerResult result = builder.create(graph).getGraphComputer().get().program(program).submit().get();
return program.computerResultTraversal(result);
}
- public static final Traversal compute(final String script, final GraphTraversalSource g) {
- return ComputerTestHelper.compute(g.getGraph().get(), g.asBuilder(), "gremlin-groovy", script);
+ public static final Traversal compute(final String script, final GraphTraversalSource g, final Object... bindings) {
+ return ComputerTestHelper.compute(g.getGraph().get(), g.asBuilder(), "gremlin-groovy", script, bindings);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c14a5dee/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/branch/GroovyLocalTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/branch/GroovyLocalTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/branch/GroovyLocalTest.groovy
index 45b8436..a929cd3 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/branch/GroovyLocalTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/branch/GroovyLocalTest.groovy
@@ -18,17 +18,16 @@
*/
package org.apache.tinkerpop.gremlin.process.traversal.step.branch
-import org.apache.tinkerpop.gremlin.structure.T
-import org.apache.tinkerpop.gremlin.process.traversal.Traversal
+import org.apache.tinkerpop.gremlin.process.UseEngine
import org.apache.tinkerpop.gremlin.process.computer.ComputerTestHelper
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal
import org.apache.tinkerpop.gremlin.process.traversal.TraversalEngine
-import org.apache.tinkerpop.gremlin.process.UseEngine
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__
import org.apache.tinkerpop.gremlin.structure.Edge
import org.apache.tinkerpop.gremlin.structure.Order
+import org.apache.tinkerpop.gremlin.structure.T
import org.apache.tinkerpop.gremlin.structure.Vertex
-import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__
-
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
*/
@@ -108,7 +107,7 @@ public abstract class GroovyLocalTest {
@Override
public Traversal<Vertex, String> get_g_VX1X_localXoutEXknowsX_limitX1XX_inV_name(final Object v1Id) {
- ComputerTestHelper.compute("g.V(${v1Id}).local(__.outE('knows').limit(1)).inV.name", g);
+ ComputerTestHelper.compute("g.V(v1Id).local(__.outE('knows').limit(1)).inV.name", g, "v1Id", v1Id);
}
@Override
@@ -118,22 +117,22 @@ public abstract class GroovyLocalTest {
@Override
public Traversal<Vertex, Edge> get_g_VX4X_localXbothEX1_createdX_limitX1XX(final Object v4Id) {
- ComputerTestHelper.compute("g.V(${v4Id}).local(__.bothE('created').limit(1))", g);
+ ComputerTestHelper.compute("g.V(v4Id).local(__.bothE('created').limit(1))", g, "v4Id", v4Id);
}
@Override
public Traversal<Vertex, Edge> get_g_VX4X_localXbothEXknows_createdX_limitX1XX(final Object v4Id) {
- ComputerTestHelper.compute("g.V(${v4Id}).local(__.bothE('knows', 'created').limit(1))", g);
+ ComputerTestHelper.compute("g.V(v4Id).local(__.bothE('knows', 'created').limit(1))", g, "v4Id", v4Id);
}
@Override
public Traversal<Vertex, String> get_g_VX4X_localXbothE_limitX1XX_otherV_name(final Object v4Id) {
- ComputerTestHelper.compute("g.V(${v4Id}).local(__.bothE.limit(1)).otherV.name", g);
+ ComputerTestHelper.compute("g.V(v4Id).local(__.bothE.limit(1)).otherV.name", g, "v4Id", v4Id);
}
@Override
public Traversal<Vertex, String> get_g_VX4X_localXbothE_limitX2XX_otherV_name(final Object v4Id) {
- ComputerTestHelper.compute("g.V(${v4Id}).local(__.bothE.limit(2)).otherV.name", g);
+ ComputerTestHelper.compute("g.V(v4Id).local(__.bothE.limit(2)).otherV.name", g, "v4Id", v4Id);
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c14a5dee/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/branch/GroovyRepeatTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/branch/GroovyRepeatTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/branch/GroovyRepeatTest.groovy
index 91690e7..67a989d 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/branch/GroovyRepeatTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/branch/GroovyRepeatTest.groovy
@@ -18,17 +18,17 @@
*/
package org.apache.tinkerpop.gremlin.process.traversal.step.branch
-import org.apache.tinkerpop.gremlin.process.*
+import org.apache.tinkerpop.gremlin.process.UseEngine
import org.apache.tinkerpop.gremlin.process.computer.ComputerTestHelper
import org.apache.tinkerpop.gremlin.process.traversal.Path
-import org.apache.tinkerpop.gremlin.structure.T
import org.apache.tinkerpop.gremlin.process.traversal.Traversal
import org.apache.tinkerpop.gremlin.process.traversal.TraversalEngine
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__
+import org.apache.tinkerpop.gremlin.structure.T
import org.apache.tinkerpop.gremlin.structure.Vertex
import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.groupCount
-import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.has;
+import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.has
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
@@ -59,7 +59,7 @@ public abstract class GroovyRepeatTest {
}
@Override
- public Traversal<Vertex, String> get_g_VX1X_timesX2X_repeatXoutX_name(Object v1Id) {
+ public Traversal<Vertex, String> get_g_VX1X_timesX2X_repeatXoutX_name(final Object v1Id) {
g.V(v1Id).times(2).repeat(__.out).name
}
@@ -108,7 +108,7 @@ public abstract class GroovyRepeatTest {
@Override
public Traversal<Vertex, String> get_g_VX1X_timesX2X_repeatXoutX_name(Object v1Id) {
- ComputerTestHelper.compute("g.V(${v1Id}).times(2).repeat(__.out).name", g)
+ ComputerTestHelper.compute("g.V(v1Id).times(2).repeat(__.out).name", g, "v1Id", v1Id)
}
@Override
@@ -123,7 +123,7 @@ public abstract class GroovyRepeatTest {
@Override
public Traversal<Vertex, String> get_g_V_emitXhasXlabel_personXX_repeatXoutX_name(final Object v1Id) {
- ComputerTestHelper.compute("g.V(${v1Id}).emit(has(T.label, 'person')).repeat(__.out).name", g)
+ ComputerTestHelper.compute("g.V(v1Id).emit(has(T.label, 'person')).repeat(__.out).name", g, "v1Id", v1Id)
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c14a5dee/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/branch/GroovyUnionTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/branch/GroovyUnionTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/branch/GroovyUnionTest.groovy
index 626a19e..6bbf309 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/branch/GroovyUnionTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/branch/GroovyUnionTest.groovy
@@ -18,12 +18,11 @@
*/
package org.apache.tinkerpop.gremlin.process.traversal.step.branch
-import org.apache.tinkerpop.gremlin.process.traversal.Traversal
-import org.apache.tinkerpop.gremlin.process.traversal.TraversalEngine
import org.apache.tinkerpop.gremlin.process.UseEngine
import org.apache.tinkerpop.gremlin.process.computer.ComputerTestHelper
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal
+import org.apache.tinkerpop.gremlin.process.traversal.TraversalEngine
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__
-import org.apache.tinkerpop.gremlin.process.traversal.engine.StandardTraversalEngine
import org.apache.tinkerpop.gremlin.structure.Vertex
import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.*
@@ -78,7 +77,7 @@ public abstract class GroovyUnionTest {
}
public Traversal<Vertex, String> get_g_VX1X_unionXrepeatXoutX_timesX2X__outX_name(final Object v1Id) {
- ComputerTestHelper.compute("g.V(${v1Id}).union(repeat(__.out).times(2), __.out).name", g)
+ ComputerTestHelper.compute("g.V(v1Id).union(repeat(__.out).times(2), __.out).name", g, "v1Id", v1Id)
}
public Traversal<Vertex, String> get_g_V_chooseXlabel_is_person__unionX__out_lang__out_nameX__in_labelX() {
@@ -104,8 +103,7 @@ public abstract class GroovyUnionTest {
@Override
public Traversal<Vertex, Number> get_g_VX1_2X_unionXoutE_count__inE_count__outE_weight_sumX(
final Object v1Id, final Object v2Id) {
- g.engine(StandardTraversalEngine.INSTANCE);
- g.V(v1Id, v2Id).union(outE().count, inE().count, outE().weight.sum);
+ ComputerTestHelper.compute("g.V(v1Id, v2Id).union(outE().count, inE().count, outE().weight.sum)", g, "v1Id", v1Id, "v2Id", v2Id);
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c14a5dee/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyCyclicPathTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyCyclicPathTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyCyclicPathTest.groovy
index 042d4e0..ebe8338 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyCyclicPathTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyCyclicPathTest.groovy
@@ -48,13 +48,13 @@ public abstract class GroovyCyclicPathTest {
public static class ComputerTraversals extends CyclicPathTest {
@Override
- Traversal<Vertex, Vertex> get_g_VX1X_outXcreatedX_inXcreatedX_cyclicPath(final Object v1) {
- ComputerTestHelper.compute("g.V(${v1}).out('created').in('created').cyclicPath", g);
+ Traversal<Vertex, Vertex> get_g_VX1X_outXcreatedX_inXcreatedX_cyclicPath(final Object v1Id) {
+ ComputerTestHelper.compute("g.V(v1Id).out('created').in('created').cyclicPath", g, "v1Id", v1Id);
}
@Override
- Traversal<Vertex, Path> get_g_VX1X_outXcreatedX_inXcreatedX_cyclicPath_path(final Object v1) {
- ComputerTestHelper.compute("g.V(${v1}).out('created').in('created').cyclicPath().path()", g);
+ Traversal<Vertex, Path> get_g_VX1X_outXcreatedX_inXcreatedX_cyclicPath_path(final Object v1Id) {
+ ComputerTestHelper.compute("g.V(v1Id).out('created').in('created').cyclicPath().path()", g, "v1Id",v1Id);
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c14a5dee/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyExceptTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyExceptTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyExceptTest.groovy
index 03537bc..68af198 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyExceptTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyExceptTest.groovy
@@ -83,17 +83,17 @@ public abstract class GroovyExceptTest {
@Override
public Traversal<Vertex, Vertex> get_g_VX1X_out_exceptXg_v2X(final Object v1Id, final Object v2Id) {
- ComputerTestHelper.compute("g.V(${v1Id}).out.except(g.V(${v2Id}).next())", g);
+ ComputerTestHelper.compute("g.V(v1Id).out.except(g.V(v2Id).next())", g, "v1Id", v1Id, "v2Id", v2Id);
}
@Override
public Traversal<Vertex, Vertex> get_g_VX1X_out_aggregateXxX_out_exceptXxX(final Object v1Id) {
- ComputerTestHelper.compute("g.V(${v1Id}).out.aggregate('x').out.except('x')", g);
+ ComputerTestHelper.compute("g.V(v1Id).out.aggregate('x').out.except('x')", g, "v1Id", v1Id);
}
@Override
public Traversal<Vertex, String> get_g_VX1X_outXcreatedX_inXcreatedX_exceptXg_v1X_name(final Object v1Id) {
- ComputerTestHelper.compute("g.V(${v1Id}).out('created').in('created').except(g.V(${v1Id}).next()).values('name')", g);
+ ComputerTestHelper.compute("g.V(v1Id).out('created').in('created').except(g.V(v1Id).next()).values('name')", g, "v1Id", v1Id);
}
@Override
@@ -109,18 +109,18 @@ public abstract class GroovyExceptTest {
@Override
public Traversal<Vertex, Path> get_g_VX1X_repeatXbothEXcreatedX_exceptXeX_aggregateXeX_otherVX_emit_path(
final Object v1Id) {
- ComputerTestHelper.compute("g.V(${v1Id}).repeat(__.bothE('created').except('e').aggregate('e').otherV).emit.path", g);
+ ComputerTestHelper.compute("g.V(v1Id).repeat(__.bothE('created').except('e').aggregate('e').otherV).emit.path", g, "v1Id", v1Id);
}
@Override
public Traversal<Vertex, Path> get_g_VX1X_repeatXbothEXcreatedX_dedup_otherVX_emit_path(
final Object v1Id) {
- ComputerTestHelper.compute("g.V(${v1Id}).repeat(__.bothE('created').dedup.otherV).emit.path", g);
+ ComputerTestHelper.compute("g.V(v1Id).repeat(__.bothE('created').dedup.otherV).emit.path", g, "v1Id", v1Id);
}
@Override
public Traversal<Vertex, String> get_g_VX1X_asXaX_outXcreatedX_inXcreatedX_exceptXaX_name(final Object v1Id) {
- ComputerTestHelper.compute("g.V(${v1Id}).as('a').out('created').in('created').except('a').name", g);
+ ComputerTestHelper.compute("g.V(v1Id).as('a').out('created').in('created').except('a').name", g, "v1Id", v1Id);
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c14a5dee/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyFilterTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyFilterTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyFilterTest.groovy
index 6b854eb..40cf643 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyFilterTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyFilterTest.groovy
@@ -19,10 +19,10 @@
package org.apache.tinkerpop.gremlin.process.traversal.step.filter
import org.apache.tinkerpop.gremlin.LoadGraphWith
+import org.apache.tinkerpop.gremlin.process.UseEngine
import org.apache.tinkerpop.gremlin.process.computer.ComputerTestHelper
import org.apache.tinkerpop.gremlin.process.traversal.Traversal
import org.apache.tinkerpop.gremlin.process.traversal.TraversalEngine
-import org.apache.tinkerpop.gremlin.process.UseEngine
import org.apache.tinkerpop.gremlin.structure.Edge
import org.apache.tinkerpop.gremlin.structure.Vertex
import org.junit.Test
@@ -153,12 +153,12 @@ public abstract class GroovyFilterTest {
@Override
public Traversal<Vertex, Vertex> get_g_VX1X_filterXage_gt_30X(final Object v1Id) {
- ComputerTestHelper.compute("g.V(${v1Id}).filter { it.age > 30 }", g);
+ ComputerTestHelper.compute("g.V(v1Id).filter { it.age > 30 }", g, "v1Id", v1Id);
}
@Override
public Traversal<Vertex, Vertex> get_g_VX1X_out_filterXage_gt_30X(final Object v1Id) {
- ComputerTestHelper.compute("g.V(${v1Id}).out.filter { it.property('age').orElse(0) > 30 }", g);
+ ComputerTestHelper.compute("g.V(v1Id).out.filter { it.property('age').orElse(0) > 30 }", g, "v1Id", v1Id);
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c14a5dee/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyHasNotTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyHasNotTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyHasNotTest.groovy
index 6e63e96..5593053 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyHasNotTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyHasNotTest.groovy
@@ -18,10 +18,10 @@
*/
package org.apache.tinkerpop.gremlin.process.traversal.step.filter
+import org.apache.tinkerpop.gremlin.process.UseEngine
import org.apache.tinkerpop.gremlin.process.computer.ComputerTestHelper
import org.apache.tinkerpop.gremlin.process.traversal.Traversal
import org.apache.tinkerpop.gremlin.process.traversal.TraversalEngine
-import org.apache.tinkerpop.gremlin.process.UseEngine
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__
import org.apache.tinkerpop.gremlin.structure.Vertex
@@ -52,7 +52,7 @@ public abstract class GroovyHasNotTest {
public static class ComputerTraversals extends HasNotTest {
@Override
public Traversal<Vertex, Vertex> get_g_VX1X_hasNotXprop(final Object v1Id, final String propertyKey) {
- ComputerTestHelper.compute("g.V(${v1Id}).hasNot('${propertyKey}')", g);
+ ComputerTestHelper.compute("g.V(v1Id).hasNot('${propertyKey}')", g, "v1Id", v1Id);
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c14a5dee/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyHasTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyHasTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyHasTest.groovy
index 630b103..e270c65 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyHasTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyHasTest.groovy
@@ -18,15 +18,18 @@
*/
package org.apache.tinkerpop.gremlin.process.traversal.step.filter
-import org.apache.tinkerpop.gremlin.structure.T
-import org.apache.tinkerpop.gremlin.process.traversal.Traversal
+import org.apache.tinkerpop.gremlin.process.UseEngine
import org.apache.tinkerpop.gremlin.process.computer.ComputerTestHelper
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal
import org.apache.tinkerpop.gremlin.process.traversal.TraversalEngine
-import org.apache.tinkerpop.gremlin.process.UseEngine
-import static org.apache.tinkerpop.gremlin.structure.P.*;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__
import org.apache.tinkerpop.gremlin.structure.Edge
+import org.apache.tinkerpop.gremlin.structure.T
import org.apache.tinkerpop.gremlin.structure.Vertex
-import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__
+
+import static org.apache.tinkerpop.gremlin.structure.P.gt
+import static org.apache.tinkerpop.gremlin.structure.P.inside
+
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
*/
@@ -112,7 +115,7 @@ public abstract class GroovyHasTest {
@Override
public Traversal<Vertex, Vertex> get_g_VX1X_outE_hasXweight_inside_0_06X_inV(final Object v1Id) {
- g.V(v1Id).outE.has('weight',inside(0.0d, 0.6d)).inV
+ g.V(v1Id).outE.has('weight', inside(0.0d, 0.6d)).inV
}
}
@@ -120,7 +123,7 @@ public abstract class GroovyHasTest {
public static class ComputerTraversals extends HasTest {
@Override
public Traversal<Edge, Edge> get_g_EX11X_outV_outE_hasXid_10X(final Object e11Id, final Object e8Id) {
- ComputerTestHelper.compute("g.E($e11Id).outV.outE.has(T.id, $e8Id)", g);
+ ComputerTestHelper.compute("g.E(e11Id).outV.outE.has(T.id, e8Id)", g, "e11Id", e11Id, "e8Id", e8Id);
}
@Override
@@ -130,12 +133,12 @@ public abstract class GroovyHasTest {
@Override
public Traversal<Vertex, Vertex> get_g_VX1X_hasXkeyX(final Object v1Id, final String key) {
- ComputerTestHelper.compute("g.V(${v1Id}).has('${key}')", g);
+ ComputerTestHelper.compute("g.V(v1Id).has('${key}')", g, "v1Id", v1Id);
}
@Override
public Traversal<Vertex, Vertex> get_g_VX1X_hasXname_markoX(final Object v1Id) {
- ComputerTestHelper.compute("g.V(${v1Id}).has('name', 'marko')", g);
+ ComputerTestHelper.compute("g.V(v1Id).has('name', 'marko')", g, "v1Id", v1Id);
}
@Override
@@ -155,12 +158,12 @@ public abstract class GroovyHasTest {
@Override
public Traversal<Vertex, Vertex> get_g_VX1X_hasXage_gt_30X(final Object v1Id) {
- ComputerTestHelper.compute("g.V(${v1Id}).has('age', gt(30))", g);
+ ComputerTestHelper.compute("g.V(v1Id).has('age', gt(30))", g, "v1Id", v1Id);
}
@Override
public Traversal<Vertex, Vertex> get_g_VX1X_out_hasIdX2X(final Object v1Id, final Object v2Id) {
- ComputerTestHelper.compute(" g.V(${v1Id}).out.hasId(${v2Id})", g);
+ ComputerTestHelper.compute(" g.V(v1Id).out.hasId(v2Id)", g, "v1Id", v1Id, "v2Id", v2Id);
}
@Override
@@ -170,7 +173,7 @@ public abstract class GroovyHasTest {
@Override
public Traversal<Edge, Edge> get_g_EX7X_hasLabelXknowsX(final Object e7Id) {
- ComputerTestHelper.compute(" g.E(${e7Id}).hasLabel('knows')", g);
+ ComputerTestHelper.compute("g.E(e7Id).hasLabel('knows')", g, "e7Id", e7Id);
}
@Override
@@ -195,7 +198,7 @@ public abstract class GroovyHasTest {
@Override
public Traversal<Vertex, Vertex> get_g_VX1X_outE_hasXweight_inside_0_06X_inV(final Object v1Id) {
- ComputerTestHelper.compute("g.V(${v1Id}).outE.has('weight', inside(0.0d, 0.6d)).inV", g);
+ ComputerTestHelper.compute("g.V(v1Id).outE.has('weight', inside(0.0d, 0.6d)).inV", g, "v1Id", v1Id);
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c14a5dee/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyIsTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyIsTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyIsTest.groovy
index f407664..e567735 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyIsTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyIsTest.groovy
@@ -66,27 +66,27 @@ public abstract class GroovyIsTest {
@Override
public Traversal<Vertex, Integer> get_g_V_valuesXageX_isX32X() {
- ComputerTestHelper.compute("g.V().values('age').is(32)", g)
+ ComputerTestHelper.compute("g.V.age.is(32)", g)
}
@Override
public Traversal<Vertex, Integer> get_g_V_valuesXageX_isXlte_30X() {
- ComputerTestHelper.compute("g.V().values('age').is(lte(30))", g)
+ ComputerTestHelper.compute("g.V.age.is(lte(30))", g)
}
@Override
public Traversal<Vertex, Integer> get_g_V_valuesXageX_isXgte_29X_isXlt_34X() {
- ComputerTestHelper.compute("g.V().values('age').is(gte(29)).is(lt(34))", g)
+ ComputerTestHelper.compute("g.V.age.is(gte(29)).is(lt(34))", g)
}
@Override
public Traversal<Vertex, String> get_g_V_hasXinXcreatedX_count_isX1XX_valuesXnameX() {
- ComputerTestHelper.compute("g.V().has(__.in('created').count().is(1)).values('name')", g)
+ ComputerTestHelper.compute("g.V.has(__.in('created').count.is(1)).name", g)
}
@Override
public Traversal<Vertex, String> get_g_V_hasXinXcreatedX_count_isXgte_2XX_valuesXnameX() {
- ComputerTestHelper.compute("g.V().has(__.in('created').count().is(gte(2l))).values('name')", g)
+ ComputerTestHelper.compute("g.V.has(__.in('created').count.is(gte(2l))).name", g)
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c14a5dee/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyRetainTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyRetainTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyRetainTest.groovy
index 0c271de..16308e3 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyRetainTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyRetainTest.groovy
@@ -18,10 +18,10 @@
*/
package org.apache.tinkerpop.gremlin.process.traversal.step.filter
-import org.apache.tinkerpop.gremlin.process.traversal.Traversal
+import org.apache.tinkerpop.gremlin.process.UseEngine
import org.apache.tinkerpop.gremlin.process.computer.ComputerTestHelper
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal
import org.apache.tinkerpop.gremlin.process.traversal.TraversalEngine
-import org.apache.tinkerpop.gremlin.process.UseEngine
import org.apache.tinkerpop.gremlin.structure.Vertex
/**
@@ -51,17 +51,17 @@ public abstract class GroovyRetainTest {
public static class ComputerTraversals extends RetainTest {
@Override
public Traversal<Vertex, Vertex> get_g_VX1X_out_retainXg_v2X(final Object v1Id, final Object v2Id) {
- ComputerTestHelper.compute("g.V(${v1Id}).out.retain(g.V($v2Id).next())", g);
+ ComputerTestHelper.compute("g.V(v1Id).out.retain(g.V(v2Id).next())", g, "v1Id", v1Id, "v2Id", v2Id);
}
@Override
public Traversal<Vertex, Vertex> get_g_VX1X_out_aggregateXxX_out_retainXxX(final Object v1Id) {
- ComputerTestHelper.compute("g.V(${v1Id}).out.aggregate('x').out.retain('x')", g);
+ ComputerTestHelper.compute("g.V(v1Id).out.aggregate('x').out.retain('x')", g, "v1Id", v1Id);
}
@Override
public Traversal<Vertex, String> get_g_VX1X_asXaX_outXcreatedX_inXcreatedX_retainXaX_name(final Object v1Id) {
- ComputerTestHelper.compute("g.V(${v1Id}).as('a').out('created').in('created').retain('a').name", g);
+ ComputerTestHelper.compute("g.V(v1Id).as('a').out('created').in('created').retain('a').name", g, "v1Id", v1Id);
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c14a5dee/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovySimplePathTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovySimplePathTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovySimplePathTest.groovy
index b9789fe..4ef3635 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovySimplePathTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovySimplePathTest.groovy
@@ -18,12 +18,12 @@
*/
package org.apache.tinkerpop.gremlin.process.traversal.step.filter
+import org.apache.tinkerpop.gremlin.process.UseEngine
+import org.apache.tinkerpop.gremlin.process.computer.ComputerTestHelper
import org.apache.tinkerpop.gremlin.process.traversal.Path
import org.apache.tinkerpop.gremlin.process.traversal.Traversal
import org.apache.tinkerpop.gremlin.process.traversal.TraversalEngine
-import org.apache.tinkerpop.gremlin.process.UseEngine
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__
-import org.apache.tinkerpop.gremlin.process.computer.ComputerTestHelper
import org.apache.tinkerpop.gremlin.structure.Vertex
/**
@@ -50,7 +50,7 @@ public abstract class GroovySimplePathTest {
@Override
public Traversal<Vertex, Vertex> get_g_VX1X_outXcreatedX_inXcreatedX_simplePath(final Object v1Id) {
- ComputerTestHelper.compute("g.V(${v1Id}).out('created').in('created').simplePath", g);
+ ComputerTestHelper.compute("g.V(v1Id).out('created').in('created').simplePath", g, "v1Id", v1Id);
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c14a5dee/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyCoalesceTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyCoalesceTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyCoalesceTest.groovy
index 96116c7..56a450d 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyCoalesceTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyCoalesceTest.groovy
@@ -18,12 +18,12 @@
*/
package org.apache.tinkerpop.gremlin.process.traversal.step.map
+import org.apache.tinkerpop.gremlin.process.UseEngine
import org.apache.tinkerpop.gremlin.process.computer.ComputerTestHelper
import org.apache.tinkerpop.gremlin.process.traversal.Path
-import org.apache.tinkerpop.gremlin.structure.T
import org.apache.tinkerpop.gremlin.process.traversal.Traversal
import org.apache.tinkerpop.gremlin.process.traversal.TraversalEngine
-import org.apache.tinkerpop.gremlin.process.UseEngine
+import org.apache.tinkerpop.gremlin.structure.T
import org.apache.tinkerpop.gremlin.structure.Vertex
import org.junit.Test
@@ -75,12 +75,12 @@ public abstract class GroovyCoalesceTest {
@Override
public Traversal<Vertex, String> get_g_VX1X_coalesceXoutXknowsX_outXcreatedXX_valuesXnameX(final Object v1Id) {
- ComputerTestHelper.compute("g.V(${v1Id}).coalesce(out('knows'), out('created')).values('name')", g)
+ ComputerTestHelper.compute("g.V(v1Id).coalesce(out('knows'), out('created')).values('name')", g, "v1Id", v1Id)
}
@Override
public Traversal<Vertex, String> get_g_VX1X_coalesceXoutXcreatedX_outXknowsXX_valuesXnameX(final Object v1Id) {
- ComputerTestHelper.compute("g.V(${v1Id}).coalesce(out('created'), out('knows')).values('name')", g)
+ ComputerTestHelper.compute("g.V(v1Id).coalesce(out('created'), out('knows')).values('name')", g, "v1Id", v1Id)
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c14a5dee/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyMapTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyMapTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyMapTest.groovy
index ff6a4c9..7be3fd7 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyMapTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyMapTest.groovy
@@ -19,10 +19,10 @@
package org.apache.tinkerpop.gremlin.process.traversal.step.map
import org.apache.tinkerpop.gremlin.LoadGraphWith
+import org.apache.tinkerpop.gremlin.process.UseEngine
import org.apache.tinkerpop.gremlin.process.computer.ComputerTestHelper
import org.apache.tinkerpop.gremlin.process.traversal.Traversal
import org.apache.tinkerpop.gremlin.process.traversal.TraversalEngine
-import org.apache.tinkerpop.gremlin.process.UseEngine
import org.apache.tinkerpop.gremlin.structure.Vertex
import org.junit.Test
@@ -87,17 +87,17 @@ public abstract class GroovyMapTest {
@Override
public Traversal<Vertex, String> get_g_VX1X_mapXnameX(final Object v1Id) {
- ComputerTestHelper.compute("g.V(${v1Id}).map { v -> v.name }", g);
+ ComputerTestHelper.compute("g.V(v1Id).map { v -> v.name }", g, "v1Id", v1Id);
}
@Override
public Traversal<Vertex, Integer> get_g_VX1X_outE_label_mapXlengthX(final Object v1Id) {
- ComputerTestHelper.compute("g.V(${v1Id}).outE.label.map { l -> l.length() }", g);
+ ComputerTestHelper.compute("g.V(v1Id).outE.label.map { l -> l.length() }", g, "v1Id", v1Id);
}
@Override
public Traversal<Vertex, Integer> get_g_VX1X_out_mapXnameX_mapXlengthX(final Object v1Id) {
- ComputerTestHelper.compute("g.V(${v1Id}).out.map { v -> v.name }.map { n -> n.length() }", g);
+ ComputerTestHelper.compute("g.V(v1Id).out.map { v -> v.name }.map { n -> n.length() }", g, "v1Id", v1Id);
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c14a5dee/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyPathTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyPathTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyPathTest.groovy
index 62fae7c..1929523 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyPathTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyPathTest.groovy
@@ -18,12 +18,12 @@
*/
package org.apache.tinkerpop.gremlin.process.traversal.step.map
+import org.apache.tinkerpop.gremlin.process.UseEngine
+import org.apache.tinkerpop.gremlin.process.computer.ComputerTestHelper
import org.apache.tinkerpop.gremlin.process.traversal.Path
import org.apache.tinkerpop.gremlin.process.traversal.Traversal
import org.apache.tinkerpop.gremlin.process.traversal.TraversalEngine
-import org.apache.tinkerpop.gremlin.process.UseEngine
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__
-import org.apache.tinkerpop.gremlin.process.computer.ComputerTestHelper
import org.apache.tinkerpop.gremlin.structure.Vertex
import org.junit.Test
@@ -66,7 +66,7 @@ public abstract class GroovyPathTest {
@Override
public Traversal<Vertex, Path> get_g_VX1X_name_path(final Object v1Id) {
- ComputerTestHelper.compute("g.V(${v1Id}).identity.name.path", g);
+ ComputerTestHelper.compute("g.V(v1Id).identity.name.path", g, "v1Id", v1Id);
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c14a5dee/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyPropertiesTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyPropertiesTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyPropertiesTest.groovy
index 17d6585..bdffe9d 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyPropertiesTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyPropertiesTest.groovy
@@ -18,11 +18,11 @@
*/
package org.apache.tinkerpop.gremlin.process.traversal.step.map
-import org.apache.tinkerpop.gremlin.structure.T
-import org.apache.tinkerpop.gremlin.process.traversal.Traversal
+import org.apache.tinkerpop.gremlin.process.UseEngine
import org.apache.tinkerpop.gremlin.process.computer.ComputerTestHelper
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal
import org.apache.tinkerpop.gremlin.process.traversal.TraversalEngine
-import org.apache.tinkerpop.gremlin.process.UseEngine
+import org.apache.tinkerpop.gremlin.structure.T
import org.apache.tinkerpop.gremlin.structure.Vertex
/**
@@ -64,7 +64,7 @@ public abstract class GroovyPropertiesTest {
@Override
public Traversal<Vertex, Object> get_g_V_hasXageX_properties_hasXid_nameIdX_value(final Object nameId) {
- ComputerTestHelper.compute("g.V.has('age').properties().has(T.id, $nameId).value()", g)
+ ComputerTestHelper.compute("g.V.has('age').properties().has(T.id, nameId).value()", g, "nameId", nameId)
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c14a5dee/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovySelectTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovySelectTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovySelectTest.groovy
index 02d4956..ee6cda1 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovySelectTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovySelectTest.groovy
@@ -160,7 +160,7 @@ public abstract class GroovySelectTest {
@Override
public Traversal<Vertex, Map<String, Vertex>> get_g_VX1X_asXaX_outXknowsX_asXbX_select(final Object v1Id) {
- ComputerTestHelper.compute("g.V(${v1Id}).as('a').out('knows').as('b').select()", g);
+ ComputerTestHelper.compute("g.V(v1Id).as('a').out('knows').as('b').select()", g, "v1Id", v1Id);
}
@Override
@@ -171,7 +171,7 @@ public abstract class GroovySelectTest {
@Override
public Traversal<Vertex, Vertex> get_g_VX1X_asXaX_outXknowsX_asXbX_selectXaX(final Object v1Id) {
- ComputerTestHelper.compute("g.V(${v1Id}).as('a').out('knows').as('b').select('a')", g);
+ ComputerTestHelper.compute("g.V(v1Id).as('a').out('knows').as('b').select('a')", g, "v1Id", v1Id);
}
@Override
@@ -272,41 +272,41 @@ public abstract class GroovySelectTest {
@Override
public Traversal<Vertex, Vertex> get_g_VX1X_asXhereX_out_selectXhereX(final Object v1Id) {
- ComputerTestHelper.compute("g.V(${v1Id}).as('here').out.select('here')", g);
+ ComputerTestHelper.compute("g.V(v1Id).as('here').out.select('here')", g, "v1Id", v1Id);
}
@Override
public Traversal<Vertex, Vertex> get_g_VX4X_out_asXhereX_hasXlang_javaX_selectXhereX(final Object v4Id) {
- ComputerTestHelper.compute("g.V(${v4Id}).out.as('here').has('lang', 'java').select('here')", g);
+ ComputerTestHelper.compute("g.V(v4Id).out.as('here').has('lang', 'java').select('here')", g, "v4Id", v4Id);
}
@Override
public Traversal<Vertex, String> get_g_VX4X_out_asXhereX_hasXlang_javaX_selectXhereX_name(
final Object v4Id) {
- ComputerTestHelper.compute("g.V(${v4Id}).out.as('here').has('lang', 'java').select('here').name", g);
+ ComputerTestHelper.compute("g.V(v4Id).out.as('here').has('lang', 'java').select('here').name", g, "v4Id", v4Id);
}
@Override
public Traversal<Vertex, Edge> get_g_VX1X_outE_asXhereX_inV_hasXname_vadasX_selectXhereX(final Object v1Id) {
- ComputerTestHelper.compute("g.V(${v1Id}).outE.as('here').inV.has('name', 'vadas').select('here')", g);
+ ComputerTestHelper.compute("g.V(v1Id).outE.as('here').inV.has('name', 'vadas').select('here')", g, "v1Id", v1Id);
}
@Override
public Traversal<Vertex, Edge> get_g_VX1X_outEXknowsX_hasXweight_1X_asXhereX_inV_hasXname_joshX_selectXhereX(
final Object v1Id) {
- ComputerTestHelper.compute("g.V(${v1Id}).outE('knows').has('weight', 1.0d).as('here').inV.has('name', 'josh').select('here')", g);
+ ComputerTestHelper.compute("g.V(v1Id).outE('knows').has('weight', 1.0d).as('here').inV.has('name', 'josh').select('here')", g, "v1Id", v1Id);
}
@Override
public Traversal<Vertex, Edge> get_g_VX1X_outEXknowsX_asXhereX_hasXweight_1X_inV_hasXname_joshX_selectXhereX(
final Object v1Id) {
- ComputerTestHelper.compute("g.V(${v1Id}).outE('knows').as('here').has('weight', 1.0d).inV.has('name','josh').select('here')", g);
+ ComputerTestHelper.compute("g.V(v1Id).outE('knows').as('here').has('weight', 1.0d).inV.has('name','josh').select('here')", g, "v1Id", v1Id);
}
@Override
public Traversal<Vertex, Edge> get_g_VX1X_outEXknowsX_asXhereX_hasXweight_1X_asXfakeX_inV_hasXname_joshX_selectXhereX(
final Object v1Id) {
- ComputerTestHelper.compute("g.V(${v1Id}).outE('knows').as('here').has('weight', 1.0d).as('fake').inV.has('name','josh').select('here')", g);
+ ComputerTestHelper.compute("g.V(v1Id).outE('knows').as('here').has('weight', 1.0d).as('fake').inV.has('name','josh').select('here')", g, "v1Id", v1Id);
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c14a5dee/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyValueMapTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyValueMapTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyValueMapTest.groovy
index 21c36cd..3b82a2e 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyValueMapTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyValueMapTest.groovy
@@ -18,10 +18,10 @@
*/
package org.apache.tinkerpop.gremlin.process.traversal.step.map
-import org.apache.tinkerpop.gremlin.process.traversal.Traversal
+import org.apache.tinkerpop.gremlin.process.UseEngine
import org.apache.tinkerpop.gremlin.process.computer.ComputerTestHelper
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal
import org.apache.tinkerpop.gremlin.process.traversal.TraversalEngine
-import org.apache.tinkerpop.gremlin.process.UseEngine
import org.apache.tinkerpop.gremlin.structure.Vertex
/**
@@ -61,7 +61,7 @@ public abstract class GroovyValueMapTest {
@Override
public Traversal<Vertex, Map<String, List<String>>> get_g_VX1X_outXcreatedX_valueMap(final Object v1Id) {
- ComputerTestHelper.compute("g.V(${v1Id}).out('created').valueMap", g);
+ ComputerTestHelper.compute("g.V(v1Id).out('created').valueMap", g, "v1Id", v1Id);
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c14a5dee/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyVertexTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyVertexTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyVertexTest.groovy
index c1a07bb..b5fd13e 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyVertexTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyVertexTest.groovy
@@ -18,15 +18,16 @@
*/
package org.apache.tinkerpop.gremlin.process.traversal.step.map
-import org.apache.tinkerpop.gremlin.process.traversal.Traversal
+import org.apache.tinkerpop.gremlin.process.UseEngine
import org.apache.tinkerpop.gremlin.process.computer.ComputerTestHelper
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal
import org.apache.tinkerpop.gremlin.process.traversal.TraversalEngine
-import org.apache.tinkerpop.gremlin.process.UseEngine
-import static org.apache.tinkerpop.gremlin.structure.P.*;
import org.apache.tinkerpop.gremlin.structure.Direction
import org.apache.tinkerpop.gremlin.structure.Edge
import org.apache.tinkerpop.gremlin.structure.Vertex
+import static org.apache.tinkerpop.gremlin.structure.P.lt
+
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
*/
@@ -177,17 +178,17 @@ public abstract class GroovyVertexTest {
@Override
public Traversal<Vertex, Vertex> get_g_VX1X_out(final Object v1Id) {
- ComputerTestHelper.compute("g.V(${v1Id}).out", g);
+ ComputerTestHelper.compute("g.V(v1Id).out", g, "v1Id", v1Id);
}
@Override
public Traversal<Vertex, Vertex> get_g_VX2X_in(final Object v2Id) {
- ComputerTestHelper.compute("g.V(${v2Id}).in", g);
+ ComputerTestHelper.compute("g.V(v2Id).in", g, "v2Id", v2Id);
}
@Override
public Traversal<Vertex, Vertex> get_g_VX4X_both(final Object v4Id) {
- ComputerTestHelper.compute("g.V(${v4Id}).both", g);
+ ComputerTestHelper.compute("g.V(v4Id).both", g, "v4Id", v4Id);
}
@Override
@@ -197,37 +198,37 @@ public abstract class GroovyVertexTest {
@Override
public Traversal<Edge, Edge> get_g_EX11X(final Object e11Id) {
- ComputerTestHelper.compute("g.E($e11Id)", g)
+ ComputerTestHelper.compute("g.E(e11Id)", g, "e11Id", e11Id)
}
@Override
public Traversal<Vertex, Edge> get_g_VX1X_outE(final Object v1Id) {
- ComputerTestHelper.compute("g.V(${v1Id}).outE", g);
+ ComputerTestHelper.compute("g.V(v1Id).outE", g, "v1Id", v1Id);
}
@Override
public Traversal<Vertex, Edge> get_g_VX2X_inE(final Object v2Id) {
- ComputerTestHelper.compute("g.V(${v2Id}).inE", g);
+ ComputerTestHelper.compute("g.V(v2Id).inE", g, "v2Id", v2Id);
}
@Override
public Traversal<Vertex, Edge> get_g_VX4X_bothE(final Object v4Id) {
- ComputerTestHelper.compute("g.V(${v4Id}).bothE", g);
+ ComputerTestHelper.compute("g.V(v4Id).bothE", g, "v4Id", v4Id);
}
@Override
public Traversal<Vertex, Edge> get_g_VX4X_bothEXcreatedX(final Object v4Id) {
- ComputerTestHelper.compute("g.V(${v4Id}).bothE('created')", g);
+ ComputerTestHelper.compute("g.V(v4Id).bothE('created')", g, "v4Id", v4Id);
}
@Override
public Traversal<Vertex, Vertex> get_g_VX1X_outE_inV(final Object v1Id) {
- ComputerTestHelper.compute("g.V(${v1Id}).outE.inV", g);
+ ComputerTestHelper.compute("g.V(v1Id).outE.inV", g, "v1Id", v1Id);
}
@Override
public Traversal<Vertex, Vertex> get_g_VX2X_inE_outV(final Object v2Id) {
- ComputerTestHelper.compute("g.V(${v2Id}).inE.outV", g);
+ ComputerTestHelper.compute("g.V(v2Id).inE.outV", g, "v2Id", v2Id);
}
@Override
@@ -242,62 +243,62 @@ public abstract class GroovyVertexTest {
@Override
public Traversal<Vertex, String> get_g_VX1X_outEXknowsX_bothV_name(final Object v1Id) {
- ComputerTestHelper.compute("g.V(${v1Id}).outE('knows').bothV.name", g);
+ ComputerTestHelper.compute("g.V(v1Id).outE('knows').bothV.name", g, "v1Id", v1Id);
}
@Override
public Traversal<Vertex, Vertex> get_g_VX1X_outXknowsX(final Object v1Id) {
- ComputerTestHelper.compute("g.V(${v1Id}).out('knows')", g);
+ ComputerTestHelper.compute("g.V(v1Id).out('knows')", g, "v1Id", v1Id);
}
@Override
public Traversal<Vertex, Vertex> get_g_VX1X_outXknows_createdX(final Object v1Id) {
- ComputerTestHelper.compute("g.V(${v1Id}).out('knows', 'created')", g);
+ ComputerTestHelper.compute("g.V(v1Id).out('knows', 'created')", g, "v1Id", v1Id);
}
@Override
public Traversal<Vertex, Vertex> get_g_VX1X_outEXknowsX_inV(final Object v1Id) {
- ComputerTestHelper.compute("g.V(${v1Id}).outE('knows').inV()", g);
+ ComputerTestHelper.compute("g.V(v1Id).outE('knows').inV()", g, "v1Id", v1Id);
}
@Override
public Traversal<Vertex, Vertex> get_g_VX1X_outEXknows_createdX_inV(final Object v1Id) {
- ComputerTestHelper.compute("g.V(${v1Id}).outE('knows', 'created').inV", g);
+ ComputerTestHelper.compute("g.V(v1Id).outE('knows', 'created').inV", g, "v1Id", v1Id);
}
@Override
public Traversal<Vertex, Vertex> get_g_V_out_out() {
- ComputerTestHelper.compute("g.V().out().out()", g);
+ ComputerTestHelper.compute("g.V.out().out()", g);
}
@Override
public Traversal<Vertex, Vertex> get_g_VX1X_out_out_out(final Object v1Id) {
- ComputerTestHelper.compute("g.V(${v1Id}).out.out.out", g);
+ ComputerTestHelper.compute("g.V(v1Id).out.out.out", g, "v1Id", v1Id);
}
@Override
public Traversal<Vertex, String> get_g_VX1X_out_name(final Object v1Id) {
- ComputerTestHelper.compute("g.V(${v1Id}).out.name", g);
+ ComputerTestHelper.compute("g.V(v1Id).out.name", g, "v1Id", v1Id);
}
@Override
public Traversal<Vertex, Vertex> get_g_VX1X_outE_otherV(final Object v1Id) {
- ComputerTestHelper.compute("g.V(${v1Id}).outE.otherV", g);
+ ComputerTestHelper.compute("g.V(v1Id).outE.otherV", g, "v1Id", v1Id);
}
@Override
public Traversal<Vertex, Vertex> get_g_VX4X_bothE_otherV(final Object v4Id) {
- ComputerTestHelper.compute("g.V(${v4Id}).bothE.otherV", g);
+ ComputerTestHelper.compute("g.V(v4Id).bothE.otherV", g, "v4Id", v4Id);
}
@Override
public Traversal<Vertex, Vertex> get_g_VX4X_bothE_hasXweight_lt_1X_otherV(final Object v4Id) {
- ComputerTestHelper.compute("g.V(${v4Id}).bothE.has('weight', lt(1.0d)).otherV", g);
+ ComputerTestHelper.compute("g.V(v4Id).bothE.has('weight', lt(1.0d)).otherV", g, "v4Id", v4Id);
}
@Override
public Traversal<Vertex, Vertex> get_g_VX1X_to_XOUT_knowsX(final Object v1Id) {
- ComputerTestHelper.compute("g.V(${v1Id}).to(Direction.OUT, 'knows')", g);
+ ComputerTestHelper.compute("g.V(v1Id).to(Direction.OUT, 'knows')", g, "v1Id", v1Id);
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c14a5dee/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/UnionTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/UnionTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/UnionTest.java
index 6c90288..8b5325d 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/UnionTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/UnionTest.java
@@ -21,9 +21,9 @@ package org.apache.tinkerpop.gremlin.process.traversal.step.branch;
import org.apache.tinkerpop.gremlin.LoadGraphWith;
import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest;
import org.apache.tinkerpop.gremlin.process.IgnoreEngine;
+import org.apache.tinkerpop.gremlin.process.UseEngine;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.TraversalEngine;
-import org.apache.tinkerpop.gremlin.process.UseEngine;
import org.apache.tinkerpop.gremlin.structure.Vertex;
import org.junit.Test;
@@ -127,6 +127,7 @@ public abstract class UnionTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
@IgnoreEngine(TraversalEngine.Type.COMPUTER)
+ // NEED TO DETERMINE IF TRAVERSAL IS LOCAL AND THEN ALLOW COUNT ON LOCALS
public void g_VX1_2X_unionXoutE_count__inE_count__outE_weight_sumX() {
final Traversal<Vertex, Number> traversal = get_g_VX1_2X_unionXoutE_count__inE_count__outE_weight_sumX(convertToVertexId("marko"), convertToVertexId("vadas"));
printTraversalForm(traversal);
[22/50] [abbrv] incubator-tinkerpop git commit: Remove unused import.
Posted by sp...@apache.org.
Remove unused import.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/c18b67d5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/c18b67d5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/c18b67d5
Branch: refs/heads/variables
Commit: c18b67d53521fcdb1c498d8690861eb70a96f05c
Parents: c14f3df
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Apr 30 11:39:57 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Apr 30 11:39:57 2015 -0400
----------------------------------------------------------------------
.../gremlin/tinkergraph/structure/IoDataGenerationTest.java | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c18b67d5/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/IoDataGenerationTest.java
----------------------------------------------------------------------
diff --git a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/IoDataGenerationTest.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/IoDataGenerationTest.java
index 51b3bc3..86fc733 100644
--- a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/IoDataGenerationTest.java
+++ b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/IoDataGenerationTest.java
@@ -23,7 +23,6 @@ import org.apache.tinkerpop.gremlin.AbstractGremlinTest;
import org.apache.tinkerpop.gremlin.TestHelper;
import org.apache.tinkerpop.gremlin.algorithm.generator.DistributionGenerator;
import org.apache.tinkerpop.gremlin.algorithm.generator.PowerLawDistribution;
-import org.apache.tinkerpop.gremlin.structure.Direction;
import org.apache.tinkerpop.gremlin.structure.Edge;
import org.apache.tinkerpop.gremlin.structure.Graph;
import org.apache.tinkerpop.gremlin.structure.T;
[44/50] [abbrv] incubator-tinkerpop git commit: fixed a bug in
SelectStep around multi-label traversals.
Posted by sp...@apache.org.
fixed a bug in SelectStep around multi-label traversals.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/be4bb3e4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/be4bb3e4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/be4bb3e4
Branch: refs/heads/variables
Commit: be4bb3e424a38e52b7816566356213766221b196
Parents: 8ee7056
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Thu Apr 30 16:16:42 2015 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Thu Apr 30 16:16:42 2015 -0600
----------------------------------------------------------------------
.../process/traversal/step/map/SelectStep.java | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/be4bb3e4/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SelectStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SelectStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SelectStep.java
index 1235129..d0bab93 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SelectStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SelectStep.java
@@ -53,19 +53,15 @@ public final class SelectStep<S, E> extends MapStep<S, Map<String, E>> implement
if (start instanceof Map) {
if (this.selectLabels.isEmpty())
- ((Map<String, Object>) start).forEach((k, v) -> bindings.put(k, (E) TraversalUtil.apply(v, this.traversalRing.next())));
+ ((Map<String, Object>) start).forEach((key, value) -> bindings.put(key, (E) TraversalUtil.apply(value, this.traversalRing.next())));
else
- this.selectLabels.forEach(label -> {
- if (((Map) start).containsKey(label))
- bindings.put(label, (E) TraversalUtil.apply(((Map) start).get(label), this.traversalRing.next()));
- });
+ this.selectLabels.forEach(label -> bindings.put(label, (E) TraversalUtil.apply(((Map) start).get(label), this.traversalRing.next())));
} else {
final Path path = traverser.path();
- if (this.selectLabels.isEmpty()) {
- path.labels().stream().flatMap(labels -> labels.stream()).distinct().forEach(label -> bindings.put(label, (E) TraversalUtil.apply(path.<Object>get(label), this.traversalRing.next())));
- } else {
+ if (this.selectLabels.isEmpty())
+ path.labels().stream().flatMap(Set::stream).distinct().forEach(label -> bindings.put(label, (E) TraversalUtil.apply(path.<Object>get(label), this.traversalRing.next())));
+ else
this.selectLabels.forEach(label -> bindings.put(label, (E) TraversalUtil.apply(path.<Object>get(label), this.traversalRing.next())));
- }
}
this.traversalRing.reset();
[25/50] [abbrv] incubator-tinkerpop git commit: Merge remote-tracking
branch 'origin/master'
Posted by sp...@apache.org.
Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/4203c81f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/4203c81f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/4203c81f
Branch: refs/heads/variables
Commit: 4203c81ff21230b2c04ecb3936255314f0bddb63
Parents: ff9d518 c41b199
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Apr 30 12:39:16 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Apr 30 12:39:16 2015 -0400
----------------------------------------------------------------------
.../traversal/dsl/graph/GraphTraversal.java | 127 +++++++++++++++++--
.../gremlin/process/traversal/dsl/graph/__.java | 1 -
.../traversal/step/map/SelectOneStep.java | 6 +-
.../process/traversal/step/map/SelectStep.java | 26 ++--
.../optimization/RangeByIsCountStrategy.java | 7 +-
.../tinkerpop/gremlin/structure/Element.java | 2 +-
.../tinkerpop/gremlin/structure/Property.java | 4 +-
.../traversal/step/map/GroovySelectTest.groovy | 12 +-
.../process/AbstractGremlinProcessTest.java | 2 +-
.../process/traversal/step/map/SelectTest.java | 47 ++++++-
.../gremlin/structure/PropertyTest.java | 4 +-
.../tinkergraph/structure/TinkerGraphTest.java | 7 +-
12 files changed, 207 insertions(+), 38 deletions(-)
----------------------------------------------------------------------
[06/50] [abbrv] incubator-tinkerpop git commit: users can not double
name a step with as().
Posted by sp...@apache.org.
users can not double name a step with as().
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/38cb8aac
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/38cb8aac
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/38cb8aac
Branch: refs/heads/variables
Commit: 38cb8aacec26644466e5f3af4ccbe6e1f4c8a8d8
Parents: 7a657fd
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Tue Apr 28 13:07:09 2015 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Tue Apr 28 13:07:09 2015 -0600
----------------------------------------------------------------------
.../gremlin/process/traversal/dsl/graph/GraphTraversal.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/38cb8aac/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
index 9d80328..6351f4a 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
@@ -707,9 +707,10 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
public default GraphTraversal<S, E> as(final String stepLabel) {
if (this.asAdmin().getSteps().size() == 0) this.asAdmin().addStep(new StartStep<>(this.asAdmin()));
- if (this.asAdmin().getEndStep().getLabel().isPresent())
- throw new IllegalStateException("The previous step has already been labeled: " + this.asAdmin().getEndStep());
- this.asAdmin().getEndStep().setLabel(stepLabel);
+ final Step<?, E> endStep = this.asAdmin().getEndStep();
+ if (endStep.getLabel().isPresent())
+ throw new IllegalStateException("The previous step has already been labeled: " + endStep);
+ endStep.setLabel(stepLabel);
return this;
}
[17/50] [abbrv] incubator-tinkerpop git commit: Add
GraphReader/Writer functions for Property and VertexProperty.
Posted by sp...@apache.org.
Add GraphReader/Writer functions for Property and VertexProperty.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/ef0b93fc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/ef0b93fc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/ef0b93fc
Branch: refs/heads/variables
Commit: ef0b93fcc35db9b8ccbadda11c2dc7d681db2fde
Parents: 2c00849
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Apr 29 15:40:55 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Apr 29 15:40:55 2015 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
.../gremlin/structure/io/GraphReader.java | 31 ++-
.../gremlin/structure/io/GraphWriter.java | 18 ++
.../structure/io/graphml/GraphMLReader.java | 74 ++++---
.../structure/io/graphml/GraphMLWriter.java | 12 ++
.../structure/io/graphson/GraphSONReader.java | 23 +++
.../io/graphson/GraphSONSerializers.java | 3 +-
.../structure/io/graphson/GraphSONTokens.java | 1 +
.../structure/io/graphson/GraphSONWriter.java | 24 +++
.../io/graphson/LegacyGraphSONReader.java | 13 ++
.../gremlin/structure/io/gryo/GryoReader.java | 74 ++++---
.../gremlin/structure/io/gryo/GryoWriter.java | 18 ++
.../util/detached/DetachedProperty.java | 6 +
.../util/detached/DetachedVertexProperty.java | 15 ++
.../tinkerpop/gremlin/structure/IoTest.java | 191 ++++++++++++++++---
.../gremlin/structure/SerializationTest.java | 1 +
16 files changed, 424 insertions(+), 81 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/ef0b93fc/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 49d1dfc..3fc133a 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -37,6 +37,7 @@ TinkerPop 3.0.0.M9 (NOT OFFICIALLY RELEASED YET)
* Altered `GraphWriter.writeVertices()` method to take an `Iterator` of vertices rather than a `Traversal`.
* GraphSON format for output from `GraphWriter.writeVertex`, `GraphWriter.writeVertices`, and `GraphWriter.writeGraph` have all changed now that they use `StarGraph` serialization.
* Gryo format for output from `GraphWriter.writeVertex`, `GraphWriter.writeVertices`, and `GraphWriter.writeGraph` have all changed now that they use `StarGraph` serialization.
+* Added read and write methods to `GraphReader` and `GraphWriter` for `Property` and `VertexProperty`.
* Reduced object creation in GraphSON during serialization.
* Moved `T` tokens to the `structure/` package as its more general than `process/`.
* `Attachable.attach()` now takes a `Method` to determine whether to attach via `GET`, `CREATE`, or `GET_OR_CREATE`.
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/ef0b93fc/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/GraphReader.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/GraphReader.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/GraphReader.java
index 3a57e58..ebcdf2f 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/GraphReader.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/GraphReader.java
@@ -21,8 +21,11 @@ package org.apache.tinkerpop.gremlin.structure.io;
import org.apache.tinkerpop.gremlin.structure.Direction;
import org.apache.tinkerpop.gremlin.structure.Edge;
import org.apache.tinkerpop.gremlin.structure.Graph;
+import org.apache.tinkerpop.gremlin.structure.Property;
import org.apache.tinkerpop.gremlin.structure.Vertex;
+import org.apache.tinkerpop.gremlin.structure.VertexProperty;
import org.apache.tinkerpop.gremlin.structure.util.Attachable;
+import org.apache.tinkerpop.gremlin.structure.util.Host;
import java.io.IOException;
import java.io.InputStream;
@@ -111,7 +114,7 @@ public interface GraphReader {
* transaction context with respect to this method (i.e. implementations should not commit the transaction for
* the user).
*
- * @param inputStream a stream containing a single vertex as defined by the accompanying {@link GraphWriter}
+ * @param inputStream a stream containing at least one vertex as defined by the accompanying {@link GraphWriter}
* @param edgeAttachMethod a function that creates an edge from the stream where the first argument is the edge
* identifier, the second argument is the out vertex id, the third is the in vertex id,
* the fourth is the label, and the fifth is the list of properties as key/value pairs.
@@ -119,6 +122,32 @@ public interface GraphReader {
public Edge readEdge(final InputStream inputStream, final Function<Attachable<Edge>, Edge> edgeAttachMethod) throws IOException;
/**
+ * Reads a single vertex property from an {@link InputStream}. It is expected that the user will manager their own
+ * transaction context with respect to this method (i.e. implementations should not commit the transaction for
+ * the user).
+ *
+ * @param inputStream a stream containing at least one vertex property as written by the accompanying
+ * {@link GraphWriter#writeVertexProperty(OutputStream, VertexProperty)} method
+ * @param vertexPropertyAttachMethod a function that creates re-attaches a vertex property to a {@link Host} object
+ * @return the value returned by the attach method
+ */
+ public VertexProperty readVertexProperty(final InputStream inputStream,
+ final Function<Attachable<VertexProperty>, VertexProperty> vertexPropertyAttachMethod) throws IOException;
+
+ /**
+ * Reads a single property from an {@link InputStream}. It is expected that the user will manager their own
+ * transaction context with respect to this method (i.e. implementations should not commit the transaction for
+ * the user).
+ *
+ * @param inputStream a stream containing at least one property as written by the accompanying
+ * {@link GraphWriter#writeProperty(OutputStream, Property)} method
+ * @param propertyAttachMethod a function that creates re-attaches a property to a {@link Host} object
+ * @return the value returned by the attach method
+ */
+ public Property readProperty(final InputStream inputStream,
+ final Function<Attachable<Property>, Property> propertyAttachMethod) throws IOException;
+
+ /**
* Reads an arbitrary object using the standard serializers.
*
* @param inputStream a stream containing an object.
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/ef0b93fc/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/GraphWriter.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/GraphWriter.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/GraphWriter.java
index cee6968..67e0c25 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/GraphWriter.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/GraphWriter.java
@@ -22,7 +22,9 @@ import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.structure.Direction;
import org.apache.tinkerpop.gremlin.structure.Edge;
import org.apache.tinkerpop.gremlin.structure.Graph;
+import org.apache.tinkerpop.gremlin.structure.Property;
import org.apache.tinkerpop.gremlin.structure.Vertex;
+import org.apache.tinkerpop.gremlin.structure.VertexProperty;
import java.io.FileOutputStream;
import java.io.IOException;
@@ -109,6 +111,22 @@ public interface GraphWriter {
public void writeEdge(final OutputStream outputStream, final Edge e) throws IOException;
/**
+ * Write a vertex property to a stream.
+ *
+ * @param outputStream The stream to write to.
+ * @param vp The vertex property to write.
+ */
+ public void writeVertexProperty(final OutputStream outputStream, final VertexProperty vp) throws IOException;
+
+ /**
+ * Write a property to a stream.
+ *
+ * @param outputStream The stream to write to.
+ * @param p The property to write.
+ */
+ public void writeProperty(final OutputStream outputStream, final Property p) throws IOException;
+
+ /**
* Writes an arbitrary object to the stream.
*
* @param outputStream The stream to write to
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/ef0b93fc/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphml/GraphMLReader.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphml/GraphMLReader.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphml/GraphMLReader.java
index 88ac149..47a26a8 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphml/GraphMLReader.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphml/GraphMLReader.java
@@ -19,10 +19,12 @@
package org.apache.tinkerpop.gremlin.structure.io.graphml;
import org.apache.tinkerpop.gremlin.structure.Direction;
+import org.apache.tinkerpop.gremlin.structure.Property;
import org.apache.tinkerpop.gremlin.structure.T;
import org.apache.tinkerpop.gremlin.structure.Edge;
import org.apache.tinkerpop.gremlin.structure.Graph;
import org.apache.tinkerpop.gremlin.structure.Vertex;
+import org.apache.tinkerpop.gremlin.structure.VertexProperty;
import org.apache.tinkerpop.gremlin.structure.io.GraphReader;
import org.apache.tinkerpop.gremlin.structure.io.Io;
import org.apache.tinkerpop.gremlin.structure.util.Attachable;
@@ -69,36 +71,6 @@ public class GraphMLReader implements GraphReader {
}
@Override
- public Iterator<Vertex> readVertices(final InputStream inputStream,
- final Function<Attachable<Vertex>, Vertex> vertexAttachMethod,
- final Function<Attachable<Edge>, Edge> edgeAttachMethod,
- final Direction attachEdgesOfThisDirection) throws IOException {
- throw Io.Exceptions.readerFormatIsForFullGraphSerializationOnly(this.getClass());
- }
-
- @Override
- public Edge readEdge(final InputStream inputStream, final Function<Attachable<Edge>, Edge> edgeAttachMethod) throws IOException {
- throw Io.Exceptions.readerFormatIsForFullGraphSerializationOnly(this.getClass());
- }
-
- @Override
- public Vertex readVertex(final InputStream inputStream, final Function<Attachable<Vertex>, Vertex> vertexAttachMethod) throws IOException {
- throw Io.Exceptions.readerFormatIsForFullGraphSerializationOnly(this.getClass());
- }
-
- @Override
- public Vertex readVertex(final InputStream inputStream, final Function<Attachable<Vertex>, Vertex> vertexAttachMethod,
- final Function<Attachable<Edge>, Edge> edgeAttachMethod,
- final Direction attachEdgesOfThisDirection) throws IOException {
- throw Io.Exceptions.readerFormatIsForFullGraphSerializationOnly(this.getClass());
- }
-
- @Override
- public <C> C readObject(final InputStream inputStream, final Class<? extends C> clazz) throws IOException {
- throw Io.Exceptions.readerFormatIsForFullGraphSerializationOnly(this.getClass());
- }
-
- @Override
public void readGraph(final InputStream graphInputStream, final Graph graphToWriteTo) throws IOException {
final Map<Object,Vertex> cache = new HashMap<>();
final AtomicLong counter = new AtomicLong(0);
@@ -229,6 +201,48 @@ public class GraphMLReader implements GraphReader {
}
}
+ @Override
+ public Iterator<Vertex> readVertices(final InputStream inputStream,
+ final Function<Attachable<Vertex>, Vertex> vertexAttachMethod,
+ final Function<Attachable<Edge>, Edge> edgeAttachMethod,
+ final Direction attachEdgesOfThisDirection) throws IOException {
+ throw Io.Exceptions.readerFormatIsForFullGraphSerializationOnly(this.getClass());
+ }
+
+ @Override
+ public Vertex readVertex(final InputStream inputStream, final Function<Attachable<Vertex>, Vertex> vertexAttachMethod) throws IOException {
+ throw Io.Exceptions.readerFormatIsForFullGraphSerializationOnly(this.getClass());
+ }
+
+ @Override
+ public Vertex readVertex(final InputStream inputStream, final Function<Attachable<Vertex>, Vertex> vertexAttachMethod,
+ final Function<Attachable<Edge>, Edge> edgeAttachMethod,
+ final Direction attachEdgesOfThisDirection) throws IOException {
+ throw Io.Exceptions.readerFormatIsForFullGraphSerializationOnly(this.getClass());
+ }
+
+ @Override
+ public Edge readEdge(final InputStream inputStream, final Function<Attachable<Edge>, Edge> edgeAttachMethod) throws IOException {
+ throw Io.Exceptions.readerFormatIsForFullGraphSerializationOnly(this.getClass());
+ }
+
+ @Override
+ public VertexProperty readVertexProperty(final InputStream inputStream,
+ final Function<Attachable<VertexProperty>, VertexProperty> vertexPropertyAttachMethod) throws IOException {
+ throw Io.Exceptions.readerFormatIsForFullGraphSerializationOnly(this.getClass());
+ }
+
+ @Override
+ public Property readProperty(final InputStream inputStream,
+ final Function<Attachable<Property>, Property> propertyAttachMethod) throws IOException {
+ throw Io.Exceptions.readerFormatIsForFullGraphSerializationOnly(this.getClass());
+ }
+
+ @Override
+ public <C> C readObject(final InputStream inputStream, final Class<? extends C> clazz) throws IOException {
+ throw Io.Exceptions.readerFormatIsForFullGraphSerializationOnly(this.getClass());
+ }
+
private static Vertex findOrCreate(final Object id, final Graph graphToWriteTo, final boolean supportsIds,
final Map<Object,Vertex> cache, final Object... args) {
if (cache.containsKey(id)) {
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/ef0b93fc/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphml/GraphMLWriter.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphml/GraphMLWriter.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphml/GraphMLWriter.java
index 7b28f64..b000d1e 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphml/GraphMLWriter.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphml/GraphMLWriter.java
@@ -22,7 +22,9 @@ import org.apache.tinkerpop.gremlin.structure.Direction;
import org.apache.tinkerpop.gremlin.structure.Edge;
import org.apache.tinkerpop.gremlin.structure.Element;
import org.apache.tinkerpop.gremlin.structure.Graph;
+import org.apache.tinkerpop.gremlin.structure.Property;
import org.apache.tinkerpop.gremlin.structure.Vertex;
+import org.apache.tinkerpop.gremlin.structure.VertexProperty;
import org.apache.tinkerpop.gremlin.structure.io.GraphWriter;
import org.apache.tinkerpop.gremlin.structure.io.Io;
import org.apache.tinkerpop.gremlin.structure.util.Comparators;
@@ -101,6 +103,16 @@ public class GraphMLWriter implements GraphWriter {
}
@Override
+ public void writeVertexProperty(final OutputStream outputStream, final VertexProperty vp) throws IOException {
+ throw Io.Exceptions.writerFormatIsForFullGraphSerializationOnly(this.getClass());
+ }
+
+ @Override
+ public void writeProperty(final OutputStream outputStream, final Property p) throws IOException {
+ throw Io.Exceptions.writerFormatIsForFullGraphSerializationOnly(this.getClass());
+ }
+
+ @Override
public void writeObject(final OutputStream outputStream, final Object object) throws IOException {
throw Io.Exceptions.writerFormatIsForFullGraphSerializationOnly(this.getClass());
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/ef0b93fc/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONReader.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONReader.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONReader.java
index 7c0ebf1..7e767d7 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONReader.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONReader.java
@@ -23,11 +23,15 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.tinkerpop.gremlin.structure.Direction;
import org.apache.tinkerpop.gremlin.structure.Edge;
import org.apache.tinkerpop.gremlin.structure.Graph;
+import org.apache.tinkerpop.gremlin.structure.Property;
import org.apache.tinkerpop.gremlin.structure.Vertex;
+import org.apache.tinkerpop.gremlin.structure.VertexProperty;
import org.apache.tinkerpop.gremlin.structure.io.GraphReader;
import org.apache.tinkerpop.gremlin.structure.util.Attachable;
import org.apache.tinkerpop.gremlin.structure.util.batch.BatchGraph;
import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedEdge;
+import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedProperty;
+import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertexProperty;
import org.apache.tinkerpop.gremlin.structure.util.star.StarGraph;
import org.apache.tinkerpop.gremlin.structure.util.star.StarGraphGraphSONSerializer;
import org.apache.tinkerpop.gremlin.util.function.FunctionUtils;
@@ -152,6 +156,25 @@ public class GraphSONReader implements GraphReader {
return edgeAttachMethod.apply(edge);
}
+ @Override
+ public VertexProperty readVertexProperty(final InputStream inputStream,
+ final Function<Attachable<VertexProperty>, VertexProperty> vertexPropertyAttachMethod) throws IOException {
+ final Map<String, Object> vpData = mapper.readValue(inputStream, mapTypeReference);
+ final Map<String, Object> metaProperties = (Map<String, Object>) vpData.get(GraphSONTokens.PROPERTIES);
+ final DetachedVertexProperty vp = new DetachedVertexProperty(vpData.get(GraphSONTokens.ID),
+ vpData.get(GraphSONTokens.LABEL).toString(),
+ vpData.get(GraphSONTokens.VALUE), metaProperties);
+ return vertexPropertyAttachMethod.apply(vp);
+ }
+
+ @Override
+ public Property readProperty(final InputStream inputStream,
+ final Function<Attachable<Property>, Property> propertyAttachMethod) throws IOException {
+ final Map<String, Object> propertyData = mapper.readValue(inputStream, mapTypeReference);
+ final DetachedProperty p = new DetachedProperty(propertyData.get(GraphSONTokens.KEY).toString(), propertyData.get(GraphSONTokens.VALUE));
+ return propertyAttachMethod.apply(p);
+ }
+
/**
* {@inheritDoc}
*/
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/ef0b93fc/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializers.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializers.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializers.java
index 126e17f..ed5a840 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializers.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializers.java
@@ -72,7 +72,6 @@ class GraphSONSerializers {
final SerializerProvider serializerProvider, final TypeSerializer typeSerializer) throws IOException {
serializerVertexProperty(property, jsonGenerator, serializerProvider, typeSerializer, normalize);
}
-
}
static class PropertyJacksonSerializer extends StdSerializer<Property> {
@@ -96,10 +95,10 @@ class GraphSONSerializers {
final SerializerProvider serializerProvider, final TypeSerializer typeSerializer) throws IOException {
jsonGenerator.writeStartObject();
if (typeSerializer != null) jsonGenerator.writeStringField(GraphSONTokens.CLASS, HashMap.class.getName());
+ serializerProvider.defaultSerializeField(GraphSONTokens.KEY, property.key(), jsonGenerator);
serializerProvider.defaultSerializeField(GraphSONTokens.VALUE, property.value(), jsonGenerator);
jsonGenerator.writeEndObject();
}
-
}
static class EdgeJacksonSerializer extends StdSerializer<Edge> {
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/ef0b93fc/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTokens.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTokens.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTokens.java
index 297db19..5fabb81 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTokens.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTokens.java
@@ -27,6 +27,7 @@ public final class GraphSONTokens {
public static final String TYPE = "type";
public static final String VALUE = "value";
public static final String PROPERTIES = "properties";
+ public static final String KEY = "key";
public static final String EDGE = "edge";
public static final String VERTEX = "vertex";
public static final String IN = "inV";
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/ef0b93fc/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONWriter.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONWriter.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONWriter.java
index 5f9b879..d1c2430 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONWriter.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONWriter.java
@@ -22,7 +22,9 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.tinkerpop.gremlin.structure.Direction;
import org.apache.tinkerpop.gremlin.structure.Edge;
import org.apache.tinkerpop.gremlin.structure.Graph;
+import org.apache.tinkerpop.gremlin.structure.Property;
import org.apache.tinkerpop.gremlin.structure.Vertex;
+import org.apache.tinkerpop.gremlin.structure.VertexProperty;
import org.apache.tinkerpop.gremlin.structure.io.GraphWriter;
import org.apache.tinkerpop.gremlin.structure.util.star.StarGraph;
import org.apache.tinkerpop.gremlin.structure.util.star.StarGraphGraphSONSerializer;
@@ -131,6 +133,28 @@ public class GraphSONWriter implements GraphWriter {
}
/**
+ * Write a {@link VertexProperty} object to the stream.
+ *
+ * @param outputStream The stream to write to.
+ * @param vp The vertex property to write.
+ */
+ @Override
+ public void writeVertexProperty(final OutputStream outputStream, final VertexProperty vp) throws IOException {
+ mapper.writeValue(outputStream, vp);
+ }
+
+ /**
+ * Write a {@link Property} object to the stream.
+ *
+ * @param outputStream The stream to write to.
+ * @param p The property to write.
+ */
+ @Override
+ public void writeProperty(final OutputStream outputStream, final Property p) throws IOException {
+ mapper.writeValue(outputStream, p);
+ }
+
+ /**
* Writes an arbitrary object to the stream. Note that Gremlin Server uses this method when serializing output,
* thus the format of the GraphSON for a {@link Vertex} will be somewhat different from the format supplied
* when using {@link #writeVertex(OutputStream, Vertex, Direction)}. For example, edges will never be included.
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/ef0b93fc/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/LegacyGraphSONReader.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/LegacyGraphSONReader.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/LegacyGraphSONReader.java
index 852455f..3b37bed 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/LegacyGraphSONReader.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/LegacyGraphSONReader.java
@@ -25,6 +25,7 @@ import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.module.SimpleModule;
import org.apache.tinkerpop.gremlin.structure.Direction;
+import org.apache.tinkerpop.gremlin.structure.Property;
import org.apache.tinkerpop.gremlin.structure.T;
import org.apache.tinkerpop.gremlin.structure.Edge;
import org.apache.tinkerpop.gremlin.structure.Graph;
@@ -146,6 +147,18 @@ public class LegacyGraphSONReader implements GraphReader {
}
@Override
+ public VertexProperty readVertexProperty(final InputStream inputStream,
+ final Function<Attachable<VertexProperty>, VertexProperty> vertexPropertyAttachMethod) throws IOException {
+ throw Io.Exceptions.readerFormatIsForFullGraphSerializationOnly(this.getClass());
+ }
+
+ @Override
+ public Property readProperty(final InputStream inputStream,
+ final Function<Attachable<Property>, Property> propertyAttachMethod) throws IOException {
+ throw Io.Exceptions.readerFormatIsForFullGraphSerializationOnly(this.getClass());
+ }
+
+ @Override
public <C> C readObject(final InputStream inputStream, final Class<? extends C> clazz) throws IOException {
throw Io.Exceptions.readerFormatIsForFullGraphSerializationOnly(this.getClass());
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/ef0b93fc/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoReader.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoReader.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoReader.java
index cf19c62..5ca61bf 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoReader.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoReader.java
@@ -18,7 +18,11 @@
*/
package org.apache.tinkerpop.gremlin.structure.io.gryo;
+import org.apache.tinkerpop.gremlin.structure.Property;
+import org.apache.tinkerpop.gremlin.structure.VertexProperty;
import org.apache.tinkerpop.gremlin.structure.util.Attachable;
+import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedProperty;
+import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertexProperty;
import org.apache.tinkerpop.gremlin.structure.util.star.StarGraph;
import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
import org.apache.tinkerpop.shaded.kryo.Kryo;
@@ -62,6 +66,28 @@ public class GryoReader implements GraphReader {
}
@Override
+ public void readGraph(final InputStream inputStream, final Graph graphToWriteTo) throws IOException {
+ // dual pass - create all vertices and store to cache the ids. then create edges. as long as we don't
+ // have vertex labels in the output we can't do this single pass
+ final Map<StarGraph.StarVertex,Vertex> cache = new HashMap<>();
+ final AtomicLong counter = new AtomicLong(0);
+ final boolean supportsTx = graphToWriteTo.features().graph().supportsTransactions();
+ IteratorUtils.iterate(new VertexInputIterator(new Input(inputStream), attachable -> {
+ final Vertex v = cache.put((StarGraph.StarVertex) attachable.get(), attachable.attach(Attachable.Method.create(graphToWriteTo)));
+ if (supportsTx && counter.incrementAndGet() % batchSize == 0)
+ graphToWriteTo.tx().commit();
+ return v;
+ }, null, null));
+ cache.entrySet().forEach(kv -> kv.getKey().edges(Direction.OUT).forEachRemaining(e -> {
+ ((StarGraph.StarEdge) e).attach(Attachable.Method.create(kv.getValue()));
+ if (supportsTx && counter.incrementAndGet() % batchSize == 0)
+ graphToWriteTo.tx().commit();
+ }));
+
+ if (supportsTx) graphToWriteTo.tx().commit();
+ }
+
+ @Override
public Iterator<Vertex> readVertices(final InputStream inputStream,
final Function<Attachable<Vertex>, Vertex> vertexAttachMethod,
final Function<Attachable<Edge>, Edge> edgeAttachMethod,
@@ -70,14 +96,6 @@ public class GryoReader implements GraphReader {
}
@Override
- public Edge readEdge(final InputStream inputStream, final Function<Attachable<Edge>, Edge> edgeAttachMethod) throws IOException {
- final Input input = new Input(inputStream);
- readHeader(input);
- final Attachable<Edge> attachable = kryo.readObject(input, DetachedEdge.class);
- return edgeAttachMethod.apply(attachable);
- }
-
- @Override
public Vertex readVertex(final InputStream inputStream, final Function<Attachable<Vertex>, Vertex> vertexAttachMethod) throws IOException {
return readVertex(inputStream, vertexAttachMethod, null, null);
}
@@ -92,25 +110,29 @@ public class GryoReader implements GraphReader {
}
@Override
- public void readGraph(final InputStream inputStream, final Graph graphToWriteTo) throws IOException {
- // dual pass - create all vertices and store to cache the ids. then create edges. as long as we don't
- // have vertex labels in the output we can't do this single pass
- final Map<StarGraph.StarVertex,Vertex> cache = new HashMap<>();
- final AtomicLong counter = new AtomicLong(0);
- final boolean supportsTx = graphToWriteTo.features().graph().supportsTransactions();
- IteratorUtils.iterate(new VertexInputIterator(new Input(inputStream), attachable -> {
- final Vertex v = cache.put((StarGraph.StarVertex) attachable.get(), attachable.attach(Attachable.Method.create(graphToWriteTo)));
- if (supportsTx && counter.incrementAndGet() % batchSize == 0)
- graphToWriteTo.tx().commit();
- return v;
- }, null, null));
- cache.entrySet().forEach(kv -> kv.getKey().edges(Direction.OUT).forEachRemaining(e -> {
- ((StarGraph.StarEdge) e).attach(Attachable.Method.create(kv.getValue()));
- if (supportsTx && counter.incrementAndGet() % batchSize == 0)
- graphToWriteTo.tx().commit();
- }));
+ public Edge readEdge(final InputStream inputStream, final Function<Attachable<Edge>, Edge> edgeAttachMethod) throws IOException {
+ final Input input = new Input(inputStream);
+ readHeader(input);
+ final Attachable<Edge> attachable = kryo.readObject(input, DetachedEdge.class);
+ return edgeAttachMethod.apply(attachable);
+ }
- if (supportsTx) graphToWriteTo.tx().commit();
+ @Override
+ public VertexProperty readVertexProperty (final InputStream inputStream,
+ final Function<Attachable<VertexProperty>, VertexProperty> vertexPropertyAttachMethod) throws IOException {
+ final Input input = new Input(inputStream);
+ readHeader(input);
+ final Attachable<VertexProperty> attachable = kryo.readObject(input, DetachedVertexProperty.class);
+ return vertexPropertyAttachMethod.apply(attachable);
+ }
+
+ @Override
+ public Property readProperty(final InputStream inputStream,
+ final Function<Attachable<Property>, Property> propertyAttachMethod) throws IOException {
+ final Input input = new Input(inputStream);
+ readHeader(input);
+ final Attachable<Property> attachable = kryo.readObject(input, DetachedProperty.class);
+ return propertyAttachMethod.apply(attachable);
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/ef0b93fc/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoWriter.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoWriter.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoWriter.java
index 3d6714a..af7848b 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoWriter.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoWriter.java
@@ -21,7 +21,9 @@ package org.apache.tinkerpop.gremlin.structure.io.gryo;
import org.apache.tinkerpop.gremlin.structure.Direction;
import org.apache.tinkerpop.gremlin.structure.Edge;
import org.apache.tinkerpop.gremlin.structure.Graph;
+import org.apache.tinkerpop.gremlin.structure.Property;
import org.apache.tinkerpop.gremlin.structure.Vertex;
+import org.apache.tinkerpop.gremlin.structure.VertexProperty;
import org.apache.tinkerpop.gremlin.structure.io.GraphWriter;
import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedFactory;
import org.apache.tinkerpop.gremlin.structure.util.star.StarGraph;
@@ -91,6 +93,22 @@ public class GryoWriter implements GraphWriter {
}
@Override
+ public void writeVertexProperty(final OutputStream outputStream, final VertexProperty vp) throws IOException {
+ final Output output = new Output(outputStream);
+ writeHeader(output);
+ kryo.writeObject(output, DetachedFactory.detach(vp, true));
+ output.flush();
+ }
+
+ @Override
+ public void writeProperty(final OutputStream outputStream, final Property p) throws IOException {
+ final Output output = new Output(outputStream);
+ writeHeader(output);
+ kryo.writeObject(output, DetachedFactory.detach(p, true));
+ output.flush();
+ }
+
+ @Override
public void writeObject(final OutputStream outputStream, final Object object) {
final Output output = new Output(outputStream);
this.kryo.writeClassAndObject(output, object);
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/ef0b93fc/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/detached/DetachedProperty.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/detached/DetachedProperty.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/detached/DetachedProperty.java
index 6da0e4a..d7f5e28 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/detached/DetachedProperty.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/detached/DetachedProperty.java
@@ -47,6 +47,12 @@ public class DetachedProperty<V> implements Property<V>, Serializable, Attachabl
this.element = DetachedFactory.detach(property.element(), false);
}
+ public DetachedProperty(final String key, final V value) {
+ this.key = key;
+ this.value = value;
+ this.element = null;
+ }
+
public DetachedProperty(final String key, final V value, final Element element) {
this.key = key;
this.value = value;
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/ef0b93fc/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/detached/DetachedVertexProperty.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/detached/DetachedVertexProperty.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/detached/DetachedVertexProperty.java
index f76cfd8..069c14c 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/detached/DetachedVertexProperty.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/detached/DetachedVertexProperty.java
@@ -23,6 +23,7 @@ import org.apache.tinkerpop.gremlin.structure.Property;
import org.apache.tinkerpop.gremlin.structure.Vertex;
import org.apache.tinkerpop.gremlin.structure.VertexProperty;
import org.apache.tinkerpop.gremlin.structure.util.ElementHelper;
+import org.apache.tinkerpop.gremlin.structure.util.Host;
import org.apache.tinkerpop.gremlin.structure.util.StringFactory;
import java.util.Collections;
@@ -72,6 +73,20 @@ public class DetachedVertexProperty<V> extends DetachedElement<VertexProperty<V>
}
}
+ /**
+ * This constructor is used by GraphSON when deserializing and the {@link Host} is not known.
+ */
+ public DetachedVertexProperty(final Object id, final String label, final V value,
+ final Map<String, Object> properties) {
+ super(id, label);
+ this.value = value;
+
+ if (properties != null && !properties.isEmpty()) {
+ this.properties = new HashMap<>();
+ properties.entrySet().iterator().forEachRemaining(entry -> this.properties.put(entry.getKey(), Collections.singletonList(new DetachedProperty<>(entry.getKey(), entry.getValue(), this))));
+ }
+ }
+
@Override
public boolean isPresent() {
return true;
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/ef0b93fc/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/IoTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/IoTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/IoTest.java
index 09ce719..b555551 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/IoTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/IoTest.java
@@ -80,6 +80,7 @@ import java.io.StringWriter;
import java.io.Writer;
import java.util.Iterator;
import java.util.List;
+import java.util.Map;
import java.util.UUID;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
@@ -1396,7 +1397,7 @@ public class IoTest extends AbstractGremlinTest {
try (final ByteArrayInputStream bais = new ByteArrayInputStream(os.toByteArray())) {
reader.readVertex(bais, attachable -> {
final Vertex detachedVertex = attachable.get();
- TestHelper.validateVertexEquality(v1, detachedVertex,true);
+ TestHelper.validateVertexEquality(v1, detachedVertex, true);
calledVertex.set(true);
return detachedVertex;
},
@@ -1434,26 +1435,26 @@ public class IoTest extends AbstractGremlinTest {
final GraphSONReader reader = graph.io(graphson).reader().create();
try (final ByteArrayInputStream bais = new ByteArrayInputStream(os.toByteArray())) {
reader.readVertex(bais, attachable -> {
- final Vertex detachedVertex = attachable.get();
- assertEquals(v1.id(), graph.vertices(detachedVertex.id().toString()).next().id());
- assertEquals(v1.label(), detachedVertex.label());
- assertEquals(1, IteratorUtils.count(detachedVertex.properties()));
- assertEquals("marko", detachedVertex.value("name"));
- calledVertex.set(true);
- return null;
- },attachable -> {
- final Edge detachedEdge = attachable.get();
- assertEquals(e.id(), graph.edges(detachedEdge.id().toString()).next().id());
- assertEquals(v1.id(), graph.vertices(detachedEdge.outVertex().id().toString()).next().id());
- assertEquals(v2.id(), graph.vertices(detachedEdge.inVertex().id().toString()).next().id());
- assertEquals(v1.label(), detachedEdge.outVertex().label());
- assertEquals(e.label(), detachedEdge.label());
- assertEquals(1, IteratorUtils.count(detachedEdge.properties()));
- assertEquals(0.5d, detachedEdge.value("weight"), 0.000001d); // lossy
+ final Vertex detachedVertex = attachable.get();
+ assertEquals(v1.id(), graph.vertices(detachedVertex.id().toString()).next().id());
+ assertEquals(v1.label(), detachedVertex.label());
+ assertEquals(1, IteratorUtils.count(detachedVertex.properties()));
+ assertEquals("marko", detachedVertex.value("name"));
+ calledVertex.set(true);
+ return null;
+ }, attachable -> {
+ final Edge detachedEdge = attachable.get();
+ assertEquals(e.id(), graph.edges(detachedEdge.id().toString()).next().id());
+ assertEquals(v1.id(), graph.vertices(detachedEdge.outVertex().id().toString()).next().id());
+ assertEquals(v2.id(), graph.vertices(detachedEdge.inVertex().id().toString()).next().id());
+ assertEquals(v1.label(), detachedEdge.outVertex().label());
+ assertEquals(e.label(), detachedEdge.label());
+ assertEquals(1, IteratorUtils.count(detachedEdge.properties()));
+ assertEquals(0.5d, detachedEdge.value("weight"), 0.000001d); // lossy
- calledEdge.set(true);
- return null;
- }, Direction.OUT);
+ calledEdge.set(true);
+ return null;
+ }, Direction.OUT);
}
assertTrue(calledVertex.get());
@@ -1483,7 +1484,7 @@ public class IoTest extends AbstractGremlinTest {
try (final ByteArrayInputStream bais = new ByteArrayInputStream(os.toByteArray())) {
reader.readVertex(bais, attachable -> {
final Vertex detachedVertex = attachable.get();
- TestHelper.validateVertexEquality(v1, detachedVertex,true);
+ TestHelper.validateVertexEquality(v1, detachedVertex, true);
calledVertex.set(true);
return detachedVertex;
}, attachable -> {
@@ -1572,7 +1573,7 @@ public class IoTest extends AbstractGremlinTest {
try (final ByteArrayInputStream bais = new ByteArrayInputStream(os.toByteArray())) {
reader.readVertex(bais, attachable -> {
final Vertex detachedVertex = attachable.get();
- TestHelper.validateVertexEquality(v1, detachedVertex,true);
+ TestHelper.validateVertexEquality(v1, detachedVertex, true);
calledVertex.set(true);
return detachedVertex;
},attachable -> {
@@ -1743,6 +1744,152 @@ public class IoTest extends AbstractGremlinTest {
assertClassicGraph(graph, false, true);
}
+ @Test
+ @LoadGraphWith(LoadGraphWith.GraphData.MODERN)
+ public void shouldReadWritePropertyGraphSON() throws Exception {
+ try (final ByteArrayOutputStream os = new ByteArrayOutputStream()) {
+ final GraphSONWriter writer = graph.io(graphson).writer().create();
+ final Property p = g.E(convertToEdgeId("marko", "knows", "vadas")).next().property("weight");
+ writer.writeProperty(os, p);
+
+ final AtomicBoolean called = new AtomicBoolean(false);
+ final GraphSONReader reader = graph.io(graphson).reader().create();
+ try (final ByteArrayInputStream bais = new ByteArrayInputStream(os.toByteArray())) {
+ reader.readProperty(bais, propertyAttachable -> {
+ assertEquals(p.value(), propertyAttachable.get().value());
+ assertEquals(p.key(), propertyAttachable.get().key());
+ called.set(true);
+ return propertyAttachable.get();
+ });
+ }
+
+ assertTrue(called.get());
+ }
+ }
+
+ @Test
+ @LoadGraphWith(LoadGraphWith.GraphData.MODERN)
+ public void shouldReadWriteVertexPropertyNoMetaPropertiesGraphSON() throws Exception {
+ try (final ByteArrayOutputStream os = new ByteArrayOutputStream()) {
+ final GraphSONWriter writer = graph.io(graphson).writer().create();
+ final VertexProperty p = g.V(convertToVertexId("marko")).next().property("name");
+ writer.writeVertexProperty(os, p);
+
+ final AtomicBoolean called = new AtomicBoolean(false);
+ final GraphSONReader reader = graph.io(graphson).reader().create();
+ try (final ByteArrayInputStream bais = new ByteArrayInputStream(os.toByteArray())) {
+ reader.readVertexProperty(bais, propertyAttachable -> {
+ assertEquals(p.value(), propertyAttachable.get().value());
+ assertEquals(p.key(), propertyAttachable.get().key());
+ assertEquals(0, IteratorUtils.count(propertyAttachable.get().properties()));
+ called.set(true);
+ return propertyAttachable.get();
+ });
+ }
+
+ assertTrue(called.get());
+ }
+ }
+
+ @Test
+ @LoadGraphWith(LoadGraphWith.GraphData.CREW)
+ public void shouldReadWriteVertexPropertyWithMetaPropertiesGraphSON() throws Exception {
+ try (final ByteArrayOutputStream os = new ByteArrayOutputStream()) {
+ final GraphSONWriter writer = graph.io(graphson).writer().create();
+ final VertexProperty p = g.V(convertToVertexId("marko")).next().properties("location").next();
+ writer.writeVertexProperty(os, p);
+
+ final AtomicBoolean called = new AtomicBoolean(false);
+ final GraphSONReader reader = graph.io(graphson).reader().create();
+ try (final ByteArrayInputStream bais = new ByteArrayInputStream(os.toByteArray())) {
+ reader.readVertexProperty(bais, propertyAttachable -> {
+ assertEquals(p.value(), propertyAttachable.get().value());
+ assertEquals(p.key(), propertyAttachable.get().key());
+ assertEquals(IteratorUtils.count(p.properties()), IteratorUtils.count(propertyAttachable.get().properties()));
+ assertEquals(p.property("startTime").value(), ((Property) propertyAttachable.get().properties("startTime").next()).value());
+ assertEquals(p.property("endTime").value(), ((Property) propertyAttachable.get().properties("endTime").next()).value());
+ called.set(true);
+ return propertyAttachable.get();
+ });
+ }
+
+ assertTrue(called.get());
+ }
+ }
+
+ @Test
+ @LoadGraphWith(LoadGraphWith.GraphData.MODERN)
+ public void shouldReadWritePropertyGryo() throws Exception {
+ try (final ByteArrayOutputStream os = new ByteArrayOutputStream()) {
+ final GryoWriter writer = graph.io(gryo).writer().create();
+ final Property p = g.E(convertToEdgeId("marko", "knows", "vadas")).next().property("weight");
+ writer.writeProperty(os, p);
+
+ final AtomicBoolean called = new AtomicBoolean(false);
+ final GryoReader reader = graph.io(gryo).reader().create();
+ try (final ByteArrayInputStream bais = new ByteArrayInputStream(os.toByteArray())) {
+ reader.readProperty(bais, propertyAttachable -> {
+ assertEquals(p.value(), propertyAttachable.get().value());
+ assertEquals(p.key(), propertyAttachable.get().key());
+ called.set(true);
+ return propertyAttachable.get();
+ });
+ }
+
+ assertTrue(called.get());
+ }
+ }
+
+ @Test
+ @LoadGraphWith(LoadGraphWith.GraphData.MODERN)
+ public void shouldReadWriteVertexPropertyNoMetaPropertiesGryo() throws Exception {
+ try (final ByteArrayOutputStream os = new ByteArrayOutputStream()) {
+ final GryoWriter writer = graph.io(gryo).writer().create();
+ final VertexProperty p = g.V(convertToVertexId("marko")).next().property("name");
+ writer.writeVertexProperty(os, p);
+
+ final AtomicBoolean called = new AtomicBoolean(false);
+ final GryoReader reader = graph.io(gryo).reader().create();
+ try (final ByteArrayInputStream bais = new ByteArrayInputStream(os.toByteArray())) {
+ reader.readVertexProperty(bais, propertyAttachable -> {
+ assertEquals(p.value(), propertyAttachable.get().value());
+ assertEquals(p.key(), propertyAttachable.get().key());
+ assertEquals(0, IteratorUtils.count(propertyAttachable.get().properties()));
+ called.set(true);
+ return propertyAttachable.get();
+ });
+ }
+
+ assertTrue(called.get());
+ }
+ }
+
+ @Test
+ @LoadGraphWith(LoadGraphWith.GraphData.CREW)
+ public void shouldReadWriteVertexPropertyWithMetaPropertiesGryo() throws Exception {
+ try (final ByteArrayOutputStream os = new ByteArrayOutputStream()) {
+ final GryoWriter writer = graph.io(gryo).writer().create();
+ final VertexProperty p = g.V(convertToVertexId("marko")).next().properties("location").next();
+ writer.writeVertexProperty(os, p);
+
+ final AtomicBoolean called = new AtomicBoolean(false);
+ final GryoReader reader = graph.io(gryo).reader().create();
+ try (final ByteArrayInputStream bais = new ByteArrayInputStream(os.toByteArray())) {
+ reader.readVertexProperty(bais, propertyAttachable -> {
+ assertEquals(p.value(), propertyAttachable.get().value());
+ assertEquals(p.key(), propertyAttachable.get().key());
+ assertEquals(IteratorUtils.count(p.properties()), IteratorUtils.count(propertyAttachable.get().properties()));
+ assertEquals(p.property("startTime").value(), ((Property) propertyAttachable.get().properties("startTime").next()).value());
+ assertEquals(p.property("endTime").value(), ((Property) propertyAttachable.get().properties("endTime").next()).value());
+ called.set(true);
+ return propertyAttachable.get();
+ });
+ }
+
+ assertTrue(called.get());
+ }
+ }
+
public static void assertCrewGraph(final Graph g1, final boolean lossyForId) {
assertEquals(new Long(6), g1.traversal().V().count().next());
assertEquals(new Long(14), g1.traversal().E().count().next());
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/ef0b93fc/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/SerializationTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/SerializationTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/SerializationTest.java
index bce7c9e..e335349 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/SerializationTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/SerializationTest.java
@@ -265,6 +265,7 @@ public class SerializationTest {
final Map<String, Object> m = mapper.readValue(json, mapTypeReference);
assertEquals(p.value(), m.get(GraphSONTokens.VALUE));
+ assertEquals(p.key(), m.get(GraphSONTokens.KEY));
}
@Test
[04/50] [abbrv] incubator-tinkerpop git commit: added a note about
import static
org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.*..thanks
@dkuppitz.
Posted by sp...@apache.org.
added a note about import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.*..thanks @dkuppitz.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/970f24d2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/970f24d2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/970f24d2
Branch: refs/heads/variables
Commit: 970f24d28867e9d121cdd51f6ffb698800db5433
Parents: fad0293
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Tue Apr 28 12:50:52 2015 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Tue Apr 28 12:50:52 2015 -0600
----------------------------------------------------------------------
docs/src/the-traversal.asciidoc | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/970f24d2/docs/src/the-traversal.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/the-traversal.asciidoc b/docs/src/the-traversal.asciidoc
index 47ef641..b64617d 100644
--- a/docs/src/the-traversal.asciidoc
+++ b/docs/src/the-traversal.asciidoc
@@ -39,6 +39,8 @@ image::step-types.png[width=650]
A `GraphTraversal<S,E>` can be spawned off of a Graph, Vertex, Edge, or VertexProperty. It can also be spawned anonymously (i.e. empty) via `__`. A graph traversal is composed of an ordered list of steps. All the steps provided by `GraphTraversal` inherit from the more general forms diagrammed above. A list of all the steps (and their descriptions) are provided in the TinkerPop3 link:http://www.tinkerpop.com/javadocs/x.y.z/core/org/apache/tinkerpop/gremlin/process/graph/GraphTraversal.html[GraphTraversal JavaDoc]. The following subsections will demonstrate the GraphTraversal steps using the <<gremlin-console,Gremlin Console>>.
+NOTE: To reduce the verbosity of the expression, it is good to `import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.*`. This way, instead of doing `__.inE()` for an anonymous traversal, it is possible to simply write `inE()`.
+
[[lambda-steps]]
Lambda Steps
~~~~~~~~~~~~
[39/50] [abbrv] incubator-tinkerpop git commit: Merge remote-tracking
branch 'origin/master'
Posted by sp...@apache.org.
Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/08617c5e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/08617c5e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/08617c5e
Branch: refs/heads/variables
Commit: 08617c5e0e1c6648889c74be81c23d654a1cfa65
Parents: c119dcb 4326a40
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Apr 30 15:18:05 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Apr 30 15:18:05 2015 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
.../traversal/VertexTraversalSideEffects.java | 13 +----
.../process/traversal/TraversalSideEffects.java | 51 +++-----------------
.../gremlin/process/traversal/Traverser.java | 2 +-
.../traversal/step/filter/ExceptStep.java | 2 +-
.../traversal/step/filter/RetainStep.java | 2 +-
.../step/sideEffect/AggregateStep.java | 16 +++---
.../sideEffect/GroupCountSideEffectStep.java | 12 ++---
.../step/sideEffect/GroupSideEffectStep.java | 17 +++----
.../traversal/step/sideEffect/ProfileStep.java | 16 +++---
.../step/sideEffect/SideEffectCapStep.java | 22 ++++-----
.../traversal/step/sideEffect/StoreStep.java | 12 ++---
.../step/sideEffect/TreeSideEffectStep.java | 2 +-
.../util/DefaultTraversalSideEffects.java | 27 +++--------
.../util/EmptyTraversalSideEffects.java | 4 +-
.../traversal/TraversalSideEffectsTest.java | 6 +--
.../traversal/step/sideEffect/ProfileTest.java | 10 ++--
.../step/sideEffect/SideEffectTest.java | 4 +-
.../traversal/step/sideEffect/SubgraphTest.java | 2 +-
19 files changed, 77 insertions(+), 144 deletions(-)
----------------------------------------------------------------------
[29/50] [abbrv] incubator-tinkerpop git commit: Add an example to the
javadoc in the GryoMapper.
Posted by sp...@apache.org.
Add an example to the javadoc in the GryoMapper.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/0fa302aa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/0fa302aa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/0fa302aa
Branch: refs/heads/variables
Commit: 0fa302aa0f00f5e25acd59c2df0cb8b364b31fec
Parents: 2e4e2ed
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Apr 30 13:21:25 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Apr 30 13:21:25 2015 -0400
----------------------------------------------------------------------
.../tinkerpop/gremlin/structure/io/gryo/GryoMapper.java | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/0fa302aa/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoMapper.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoMapper.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoMapper.java
index 844eea6..7587897 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoMapper.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoMapper.java
@@ -92,8 +92,9 @@ import java.util.stream.Collectors;
* A {@link Mapper} implementation for Kryo. This implementation requires that all classes to be serialized by
* Kryo are registered to it.
* <p/>
- * {@link Graph} implementations providing an {@link IoRegistry} should register their custom classs and/or
+ * {@link Graph} implementations providing an {@link IoRegistry} should register their custom classes and/or
* serializers in one of three ways:
+ * <p/>
* <ol>
* <li>Register just the custom class with a {@code null} {@link Serializer} implementation</li>
* <li>Register the custom class with a {@link Serializer} implementation</li>
@@ -102,6 +103,14 @@ import java.util.stream.Collectors;
* {@link Serializer} requires the {@link Kryo} instance to get constructed.
* </li>
* </ol>
+ * <p/>
+ * For example:
+ * <pre>
+ * {@code
+ * IoRegistry registry = new IoRegistry();
+ * registry.register(GryoIo.class, MyCustomClass.class, new MyCustomClassSerializer());
+ * }
+ * </pre>
*
* @author Stephen Mallette (http://stephen.genoprime.com)
*/
[11/50] [abbrv] incubator-tinkerpop git commit: Drop some todo
comments
Posted by sp...@apache.org.
Drop some todo comments
Won't include the vertex label when serializing edges on a vertex. Re-attach to get the label.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/8c6d95c9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/8c6d95c9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/8c6d95c9
Branch: refs/heads/variables
Commit: 8c6d95c97150ae6dcdb3669fd9cbc00040206168
Parents: a060678
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Apr 29 10:57:12 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Apr 29 10:57:12 2015 -0400
----------------------------------------------------------------------
.../java/org/apache/tinkerpop/gremlin/structure/IoTest.java | 6 ------
1 file changed, 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/8c6d95c9/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/IoTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/IoTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/IoTest.java
index ede8355..09ce719 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/IoTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/IoTest.java
@@ -1447,7 +1447,6 @@ public class IoTest extends AbstractGremlinTest {
assertEquals(v1.id(), graph.vertices(detachedEdge.outVertex().id().toString()).next().id());
assertEquals(v2.id(), graph.vertices(detachedEdge.inVertex().id().toString()).next().id());
assertEquals(v1.label(), detachedEdge.outVertex().label());
- // todo: assertEquals(v2.label(), detachedEdge.inVertex().label());
assertEquals(e.label(), detachedEdge.label());
assertEquals(1, IteratorUtils.count(detachedEdge.properties()));
assertEquals(0.5d, detachedEdge.value("weight"), 0.000001d); // lossy
@@ -1534,7 +1533,6 @@ public class IoTest extends AbstractGremlinTest {
assertEquals(e.id(), graph.edges(detachedEdge.id().toString()).next().id());
assertEquals(v1.id(), graph.vertices(detachedEdge.inVertex().id().toString()).next().id());
assertEquals(v2.id(), graph.vertices(detachedEdge.outVertex().id().toString()).next().id());
- // todo: assertEquals(v1.label(), detachedEdge.outVertex().label());
assertEquals(v2.label(), detachedEdge.inVertex().label());
assertEquals(e.label(), detachedEdge.label());
assertEquals(1, IteratorUtils.count(detachedEdge.properties()));
@@ -1635,7 +1633,6 @@ public class IoTest extends AbstractGremlinTest {
assertEquals(e1.id(), graph.edges(detachedEdge.id().toString()).next().id());
assertEquals(v1.id(), graph.vertices(detachedEdge.inVertex().id().toString()).next().id());
assertEquals(v2.id(), graph.vertices(detachedEdge.outVertex().id().toString()).next().id());
- // todo: assertEquals(v1.label(), detachedEdge.outVertex().label());
assertEquals(v2.label(), detachedEdge.inVertex().label());
assertEquals(e1.label(), detachedEdge.label());
assertEquals(1, IteratorUtils.count(detachedEdge.properties()));
@@ -1646,7 +1643,6 @@ public class IoTest extends AbstractGremlinTest {
assertEquals(v2.id(), graph.vertices(detachedEdge.inVertex().id().toString()).next().id());
assertEquals(v1.id(), graph.vertices(detachedEdge.outVertex().id().toString()).next().id());
assertEquals(v1.label(), detachedEdge.outVertex().label());
- // todo: assertEquals(v2.label(), detachedEdge.inVertex().label());
assertEquals(e2.label(), detachedEdge.label());
assertEquals(1, IteratorUtils.count(detachedEdge.properties()));
assertEquals(1.0d, detachedEdge.value("weight"), 0.000001d); // lossy
@@ -1704,7 +1700,6 @@ public class IoTest extends AbstractGremlinTest {
if (graph.edges(detachedEdge.id()).next().id().equals(e1.id())) {
assertEquals(v2.id(), graph.vertices(detachedEdge.outVertex().id()).next().id());
assertEquals(v1.id(), graph.vertices(detachedEdge.inVertex().id()).next().id());
- // todo: assertEquals(v1.label(), detachedEdge.outVertex().label());
assertEquals(v2.label(), detachedEdge.inVertex().label());
assertEquals(e1.label(), detachedEdge.label());
assertEquals(1, IteratorUtils.count(detachedEdge.properties()));
@@ -1714,7 +1709,6 @@ public class IoTest extends AbstractGremlinTest {
assertEquals(v1.id(), graph.vertices(detachedEdge.outVertex().id()).next().id());
assertEquals(v2.id(), graph.vertices(detachedEdge.inVertex().id()).next().id());
assertEquals(v1.label(), detachedEdge.outVertex().label());
- // todo: assertEquals(v2.label(), detachedEdge.inVertex().label());
assertEquals(e1.label(), detachedEdge.label());
assertEquals(1, IteratorUtils.count(detachedEdge.properties()));
assertEquals(1.0f, detachedEdge.value("weight"), 0.00001f);
[23/50] [abbrv] incubator-tinkerpop git commit: Fix up filters for
javadoc core.
Posted by sp...@apache.org.
Fix up filters for javadoc core.
They got messed up with some package renaming.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/215c0540
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/215c0540
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/215c0540
Branch: refs/heads/variables
Commit: 215c0540e6bbbc4616c6676f44b926b83dc20d55
Parents: c18b67d
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Apr 30 12:38:18 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Apr 30 12:38:18 2015 -0400
----------------------------------------------------------------------
pom.xml | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/215c0540/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 45244ae..a9f935d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -758,9 +758,7 @@ limitations under the License.
</sourceFileInclude>
<sourceFileInclude>org/apache/tinkerpop/gremlin/structure/io/graphson/*.java
</sourceFileInclude>
- <sourceFileInclude>org/apache/tinkerpop/gremlin/structure/io/kryo/*.java
- </sourceFileInclude>
- <sourceFileInclude>org/apache/tinkerpop/gremlin/structure/strategy/*.java
+ <sourceFileInclude>org/apache/tinkerpop/gremlin/structure/io/gryo/*.java
</sourceFileInclude>
<sourceFileInclude>org/apache/tinkerpop/gremlin/process/*.java</sourceFileInclude>
<sourceFileInclude>org/apache/tinkerpop/gremlin/process/computer/*.java
[16/50] [abbrv] incubator-tinkerpop git commit: Update changelog.
Posted by sp...@apache.org.
Update changelog.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/2c008490
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/2c008490
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/2c008490
Branch: refs/heads/variables
Commit: 2c008490209a15528612365a11cd2dd0d36a8a07
Parents: 3b361cc
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Apr 29 14:15:24 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Apr 29 14:15:24 2015 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/2c008490/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index c3f6f4f..49d1dfc 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -35,6 +35,9 @@ TinkerPop 3.0.0.M9 (NOT OFFICIALLY RELEASED YET)
* Gremlin Server better supports the settings for the high and low watermark that will slow writes to clients that are lagging.
* Added `GraphReader.readObject()` and `GraphWriter.writeObject` abstractions for those implementations that can support them.
* Altered `GraphWriter.writeVertices()` method to take an `Iterator` of vertices rather than a `Traversal`.
+* GraphSON format for output from `GraphWriter.writeVertex`, `GraphWriter.writeVertices`, and `GraphWriter.writeGraph` have all changed now that they use `StarGraph` serialization.
+* Gryo format for output from `GraphWriter.writeVertex`, `GraphWriter.writeVertices`, and `GraphWriter.writeGraph` have all changed now that they use `StarGraph` serialization.
+* Reduced object creation in GraphSON during serialization.
* Moved `T` tokens to the `structure/` package as its more general than `process/`.
* `Attachable.attach()` now takes a `Method` to determine whether to attach via `GET`, `CREATE`, or `GET_OR_CREATE`.
* Decreased size of Gremlin Server `RequestMessage` and `ResponseMessage` serialization payloads and reduced object creation.
[18/50] [abbrv] incubator-tinkerpop git commit: Update javadoc on
GraphReader/Writer a bit.
Posted by sp...@apache.org.
Update javadoc on GraphReader/Writer a bit.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/cd2cf0fc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/cd2cf0fc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/cd2cf0fc
Branch: refs/heads/variables
Commit: cd2cf0fc94ade9c5faabf49ebd776a990ae86b0a
Parents: ef0b93f
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Apr 29 15:53:22 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Apr 29 15:53:22 2015 -0400
----------------------------------------------------------------------
.../gremlin/structure/io/GraphReader.java | 59 ++++++++++----------
.../gremlin/structure/io/GraphWriter.java | 37 ++++++------
.../structure/io/graphson/GraphSONReader.java | 6 ++
3 files changed, 53 insertions(+), 49 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/cd2cf0fc/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/GraphReader.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/GraphReader.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/GraphReader.java
index ebcdf2f..dc4a1d7 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/GraphReader.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/GraphReader.java
@@ -55,7 +55,8 @@ public interface GraphReader {
* It is up to individual implementations to manage transactions, but it is not required or enforced. Consult
* the documentation of an implementation to understand the approach it takes.
*
- * @param inputStream a stream containing a single vertex as defined by the accompanying {@link GraphWriter}
+ * @param inputStream a stream containing an entire graph of vertices and edges as defined by the accompanying
+ * {@link GraphWriter#writeGraph(OutputStream, Graph)}.
* @param graphToWriteTo the graph to write to when reading from the stream.
*/
public void readGraph(final InputStream inputStream, final Graph graphToWriteTo) throws IOException;
@@ -65,9 +66,9 @@ public interface GraphReader {
* It is expected that the user will manager their own transaction context with respect to this method (i.e.
* implementations should not commit the transaction for the user).
*
- * @param inputStream a stream containing a single vertex as defined by the accompanying {@link GraphWriter}
- * @param vertexAttachMethod a function to create a vertex where the first argument is the vertex identifier, the
- * second argument is vertex label and the last is the list of properties for it
+ * @param inputStream a stream containing at least a single vertex as defined by the accompanying
+ * {@link GraphWriter#writeVertex(OutputStream, Vertex)}.
+ * @param vertexAttachMethod a function that creates re-attaches a {@link Vertex} to a {@link Host} object.
*/
public Vertex readVertex(final InputStream inputStream, final Function<Attachable<Vertex>, Vertex> vertexAttachMethod) throws IOException;
@@ -76,12 +77,10 @@ public interface GraphReader {
* given the direction supplied as an argument. It is expected that the user will manager their own transaction
* context with respect to this method (i.e. implementations should not commit the transaction for the user).
*
- * @param inputStream a stream containing a single vertex as defined by the accompanying {@link GraphWriter}
- * @param vertexAttachMethod a function to create a vertex where the first argument is the vertex identifier, the
- * second argument is vertex label and the last is the list of properties for it
- * @param edgeAttachMethod a function that creates an edge from the stream where the first argument is the edge
- * identifier, the second argument is the out vertex id, the third is the in vertex id,
- * the fourth is the label, and the fifth is the list of properties as key/value pairs.
+ * @param inputStream a stream containing at least one {@link Vertex} as defined by the accompanying
+ * {@link GraphWriter#writeVertices(OutputStream, Iterator, Direction)} method.
+ * @param vertexAttachMethod a function that creates re-attaches a {@link Vertex} to a {@link Host} object.
+ * @param edgeAttachMethod a function that creates re-attaches a {@link Edge} to a {@link Host} object.
* @param attachEdgesOfThisDirection only edges of this direction are passed to the {@code edgeMaker}.
*/
public Vertex readVertex(final InputStream inputStream,
@@ -90,18 +89,17 @@ public interface GraphReader {
final Direction attachEdgesOfThisDirection) throws IOException;
/**
- * Reads a set of vertices from an {@link InputStream} which were written by
+ * Reads a set of one or more vertices from an {@link InputStream} which were written by
* {@link GraphWriter#writeVertices(OutputStream, Iterator)}. This method will read vertex properties as well as
* edges given the direction supplied as an argument. It is expected that the user will manager their own
* transaction context with respect to this method (i.e. implementations should not commit the transaction for
* the user).
*
- * @param inputStream a stream containing a single vertex as defined by the accompanying {@link GraphWriter}
- * @param vertexAttachMethod a function to create a vertex where the first argument is the vertex identifier, the
- * second argument is vertex label and the last is the list of properties for it
- * @param edgeAttachMethod a function that creates an edge from the stream where the first argument is the edge
- * identifier, the second argument is the out vertex id, the third is the in vertex id,
- * the fourth is the label, and the fifth is the list of properties as key/value pairs.
+ * @param inputStream a stream containing at least one {@link Vertex} as defined by the accompanying
+ * {@link GraphWriter#writeVertices(OutputStream, Iterator, Direction)} or
+ * {@link GraphWriter#writeVertices(OutputStream, Iterator)} methods.
+ * @param vertexAttachMethod a function that creates re-attaches a {@link Vertex} to a {@link Host} object.
+ * @param edgeAttachMethod a function that creates re-attaches a {@link Edge} to a {@link Host} object.
* @param attachEdgesOfThisDirection only edges of this direction are passed to the {@code edgeMaker}.
*/
public Iterator<Vertex> readVertices(final InputStream inputStream,
@@ -114,10 +112,9 @@ public interface GraphReader {
* transaction context with respect to this method (i.e. implementations should not commit the transaction for
* the user).
*
- * @param inputStream a stream containing at least one vertex as defined by the accompanying {@link GraphWriter}
- * @param edgeAttachMethod a function that creates an edge from the stream where the first argument is the edge
- * identifier, the second argument is the out vertex id, the third is the in vertex id,
- * the fourth is the label, and the fifth is the list of properties as key/value pairs.
+ * @param inputStream a stream containing at least one {@link Edge} as defined by the accompanying
+ * {@link GraphWriter#writeEdge(OutputStream, Edge)} method.
+ * @param edgeAttachMethod a function that creates re-attaches a {@link Edge} to a {@link Host} object.
*/
public Edge readEdge(final InputStream inputStream, final Function<Attachable<Edge>, Edge> edgeAttachMethod) throws IOException;
@@ -126,10 +123,11 @@ public interface GraphReader {
* transaction context with respect to this method (i.e. implementations should not commit the transaction for
* the user).
*
- * @param inputStream a stream containing at least one vertex property as written by the accompanying
- * {@link GraphWriter#writeVertexProperty(OutputStream, VertexProperty)} method
- * @param vertexPropertyAttachMethod a function that creates re-attaches a vertex property to a {@link Host} object
- * @return the value returned by the attach method
+ * @param inputStream a stream containing at least one {@link VertexProperty} as written by the accompanying
+ * {@link GraphWriter#writeVertexProperty(OutputStream, VertexProperty)} method.
+ * @param vertexPropertyAttachMethod a function that creates re-attaches a {@link VertexProperty} to a
+ * {@link Host} object.
+ * @return the value returned by the attach method.
*/
public VertexProperty readVertexProperty(final InputStream inputStream,
final Function<Attachable<VertexProperty>, VertexProperty> vertexPropertyAttachMethod) throws IOException;
@@ -139,18 +137,19 @@ public interface GraphReader {
* transaction context with respect to this method (i.e. implementations should not commit the transaction for
* the user).
*
- * @param inputStream a stream containing at least one property as written by the accompanying
- * {@link GraphWriter#writeProperty(OutputStream, Property)} method
- * @param propertyAttachMethod a function that creates re-attaches a property to a {@link Host} object
- * @return the value returned by the attach method
+ * @param inputStream a stream containing at least one {@link Property} as written by the accompanying
+ * {@link GraphWriter#writeProperty(OutputStream, Property)} method.
+ * @param propertyAttachMethod a function that creates re-attaches a {@link Property} to a {@link Host} object .
+ * @return the value returned by the attach method.
*/
public Property readProperty(final InputStream inputStream,
final Function<Attachable<Property>, Property> propertyAttachMethod) throws IOException;
/**
- * Reads an arbitrary object using the standard serializers.
+ * Reads an arbitrary object using the registered serializers.
*
* @param inputStream a stream containing an object.
+ * @param clazz the class expected to be in the stream - may or may not be used by the underlying implementation.
*/
public <C> C readObject(final InputStream inputStream, final Class<? extends C> clazz) throws IOException;
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/cd2cf0fc/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/GraphWriter.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/GraphWriter.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/GraphWriter.java
index 67e0c25..8ae4b4e 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/GraphWriter.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/GraphWriter.java
@@ -26,7 +26,6 @@ import org.apache.tinkerpop.gremlin.structure.Property;
import org.apache.tinkerpop.gremlin.structure.Vertex;
import org.apache.tinkerpop.gremlin.structure.VertexProperty;
-import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
@@ -53,25 +52,25 @@ public interface GraphWriter {
/**
* Write the entire graph to a stream.
*
- * @param outputStream The stream to write to.
- * @param g The graph to write to stream.
+ * @param outputStream the stream to write to.
+ * @param g the graph to write to stream.
*/
public void writeGraph(final OutputStream outputStream, final Graph g) throws IOException;
/**
* Write a vertex to a stream with its associated edges. Only write edges as defined by the requested direction.
*
- * @param outputStream The stream to write to.
- * @param v The vertex to write.
- * @param direction The direction of edges to write or null if no edges are to be written.
+ * @param outputStream the stream to write to.
+ * @param v the vertex to write.
+ * @param direction the direction of edges to write or null if no edges are to be written.
*/
public void writeVertex(final OutputStream outputStream, final Vertex v, final Direction direction) throws IOException;
/**
* Write a vertex to a stream without writing its edges.
*
- * @param outputStream The stream to write to.
- * @param v The vertex to write.
+ * @param outputStream the stream to write to.
+ * @param v the vertex to write.
*/
public void writeVertex(final OutputStream outputStream, final Vertex v) throws IOException;
@@ -80,9 +79,9 @@ public interface GraphWriter {
* Write a list of vertices from a {@link Traversal} to a stream with its associated edges. Only write edges as
* defined by the requested direction.
*
- * @param outputStream The stream to write to.
+ * @param outputStream the stream to write to.
* @param vertexIterator A traversal that returns a list of vertices.
- * @param direction The direction of edges to write or null if no edges are to be written.
+ * @param direction the direction of edges to write or null if no edges are to be written.
*/
public default void writeVertices(final OutputStream outputStream, final Iterator<Vertex> vertexIterator, final Direction direction) throws IOException {
while (vertexIterator.hasNext()) {
@@ -93,7 +92,7 @@ public interface GraphWriter {
/**
* Write a vertex to a stream without writing its edges.
*
- * @param outputStream The stream to write to.
+ * @param outputStream the stream to write to.
* @param vertexIterator A iterator that returns a list of vertices.
*/
public default void writeVertices(final OutputStream outputStream, final Iterator<Vertex> vertexIterator) throws IOException {
@@ -105,32 +104,32 @@ public interface GraphWriter {
/**
* Write an edge to a stream.
*
- * @param outputStream The stream to write to.
- * @param e The edge to write.
+ * @param outputStream the stream to write to.
+ * @param e the edge to write.
*/
public void writeEdge(final OutputStream outputStream, final Edge e) throws IOException;
/**
* Write a vertex property to a stream.
*
- * @param outputStream The stream to write to.
- * @param vp The vertex property to write.
+ * @param outputStream the stream to write to.
+ * @param vp the vertex property to write.
*/
public void writeVertexProperty(final OutputStream outputStream, final VertexProperty vp) throws IOException;
/**
* Write a property to a stream.
*
- * @param outputStream The stream to write to.
- * @param p The property to write.
+ * @param outputStream the stream to write to.
+ * @param p the property to write.
*/
public void writeProperty(final OutputStream outputStream, final Property p) throws IOException;
/**
* Writes an arbitrary object to the stream.
*
- * @param outputStream The stream to write to
- * @param object The object to write which will use the standard serializer set
+ * @param outputStream the stream to write to.
+ * @param object the object to write which will use the standard serializer set.
*/
public void writeObject(final OutputStream outputStream, final Object object) throws IOException;
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/cd2cf0fc/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONReader.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONReader.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONReader.java
index 7e767d7..fd5b12b 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONReader.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONReader.java
@@ -156,6 +156,9 @@ public class GraphSONReader implements GraphReader {
return edgeAttachMethod.apply(edge);
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public VertexProperty readVertexProperty(final InputStream inputStream,
final Function<Attachable<VertexProperty>, VertexProperty> vertexPropertyAttachMethod) throws IOException {
@@ -167,6 +170,9 @@ public class GraphSONReader implements GraphReader {
return vertexPropertyAttachMethod.apply(vp);
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public Property readProperty(final InputStream inputStream,
final Function<Attachable<Property>, Property> propertyAttachMethod) throws IOException {
[32/50] [abbrv] incubator-tinkerpop git commit: Merge remote-tracking
branch 'origin/master'
Posted by sp...@apache.org.
Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/290a5e32
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/290a5e32
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/290a5e32
Branch: refs/heads/variables
Commit: 290a5e3216b5d49df50c7a25e72a09aa57e70e9f
Parents: e6e4e6f c14a5de
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Apr 30 13:31:08 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Apr 30 13:31:08 2015 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 2 +
.../traversal/TraversalScriptSupplier.java | 15 ++++--
.../traversal/TraversalVertexProgram.java | 4 +-
.../tinkerpop/gremlin/structure/Compare.java | 8 +--
.../tinkerpop/gremlin/structure/Element.java | 2 +-
.../process/computer/ComputerTestHelper.groovy | 11 +++--
.../step/branch/GroovyLocalTest.groovy | 19 ++++----
.../step/branch/GroovyRepeatTest.groovy | 12 ++---
.../step/branch/GroovyUnionTest.groovy | 10 ++--
.../step/filter/GroovyCyclicPathTest.groovy | 8 +--
.../step/filter/GroovyExceptTest.groovy | 12 ++---
.../step/filter/GroovyFilterTest.groovy | 6 +--
.../step/filter/GroovyHasNotTest.groovy | 4 +-
.../traversal/step/filter/GroovyHasTest.groovy | 29 ++++++-----
.../traversal/step/filter/GroovyIsTest.groovy | 22 +++++----
.../step/filter/GroovyRetainTest.groovy | 10 ++--
.../step/filter/GroovySimplePathTest.groovy | 6 +--
.../step/map/GroovyCoalesceTest.groovy | 8 +--
.../traversal/step/map/GroovyMapTest.groovy | 8 +--
.../traversal/step/map/GroovyPathTest.groovy | 6 +--
.../step/map/GroovyPropertiesTest.groovy | 8 +--
.../traversal/step/map/GroovySelectTest.groovy | 18 +++----
.../step/map/GroovyValueMapTest.groovy | 6 +--
.../traversal/step/map/GroovyVertexTest.groovy | 51 ++++++++++----------
.../traversal/step/branch/UnionTest.java | 3 +-
.../process/traversal/step/filter/IsTest.java | 7 ++-
26 files changed, 154 insertions(+), 141 deletions(-)
----------------------------------------------------------------------
[10/50] [abbrv] incubator-tinkerpop git commit: Add some javadoc to
GraphReader/Writer and GraphSON implementations.
Posted by sp...@apache.org.
Add some javadoc to GraphReader/Writer and GraphSON implementations.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/a0606789
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/a0606789
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/a0606789
Branch: refs/heads/variables
Commit: a060678991c8b1e185334c7ab3086c7258603d1b
Parents: a8b0a2a
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Apr 29 10:53:58 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Apr 29 10:53:58 2015 -0400
----------------------------------------------------------------------
.../gremlin/structure/io/GraphReader.java | 13 +++-
.../gremlin/structure/io/GraphWriter.java | 25 ++++++-
.../structure/io/graphson/GraphSONReader.java | 18 +++++
.../structure/io/graphson/GraphSONWriter.java | 74 +++++++++++++++-----
4 files changed, 110 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/a0606789/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/GraphReader.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/GraphReader.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/GraphReader.java
index 5682c19..3a57e58 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/GraphReader.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/GraphReader.java
@@ -31,7 +31,17 @@ import java.util.Iterator;
import java.util.function.Function;
/**
- * Functions for reading a graph and its graph elements from a different format.
+ * Functions for reading a graph and its graph elements from a different serialization format. Implementations of
+ * this class do not need to explicitly guarantee that an object read with one method must have its format
+ * equivalent to another. In other words the input to {@link #readVertex(InputStream, Function)}} need not also
+ * be readable by {@link #readObject(InputStream, Class)}. In other words, implementations are free
+ * to optimize as is possible for a specific serialization method.
+ * <br/>
+ * That said, it is however important that the complementary "write" operation in {@link GraphWriter} be capable of
+ * writing output compatible to its reader. In other words, the output of
+ * {@link GraphWriter#writeObject(OutputStream, Object)} should always be readable by
+ * {@link #readObject(InputStream, Class)} and the output of {@link GraphWriter#writeGraph(OutputStream, Graph)}
+ * should always be readable by {@link #readGraph(InputStream, Graph)}.
*
* @author Stephen Mallette (http://stephen.genoprime.com)
*/
@@ -43,6 +53,7 @@ public interface GraphReader {
* the documentation of an implementation to understand the approach it takes.
*
* @param inputStream a stream containing a single vertex as defined by the accompanying {@link GraphWriter}
+ * @param graphToWriteTo the graph to write to when reading from the stream.
*/
public void readGraph(final InputStream inputStream, final Graph graphToWriteTo) throws IOException;
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/a0606789/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/GraphWriter.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/GraphWriter.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/GraphWriter.java
index a7d7c85..cee6968 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/GraphWriter.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/GraphWriter.java
@@ -26,17 +26,33 @@ import org.apache.tinkerpop.gremlin.structure.Vertex;
import java.io.FileOutputStream;
import java.io.IOException;
+import java.io.InputStream;
import java.io.OutputStream;
import java.util.Iterator;
/**
- * Functions for writing a graph and its elements to a different format.
+ * Functions for writing a graph and its elements to a serialized format. Implementations of this class do not need
+ * to explicitly guarantee that an object written with one method must have its format equivalent to another. In other
+ * words calling {@link #writeVertex(OutputStream, Vertex)}} need not have equivalent output to
+ * {@link #writeObject(OutputStream, Object)}. Nor does the representation of an {@link Edge} within the output of
+ * {@link #writeVertex(OutputStream, Vertex, Direction)} need to match the representation of that same
+ * {@link Edge} when provided to {@link #writeEdge(OutputStream, Edge)}. In other words, implementations are free
+ * to optimize as is possible for a specific serialization method.
+ * <br/>
+ * That said, it is however important that the complementary "read" operation in {@link GraphReader} be capable of
+ * reading the output of the writer. In other words, the output of {@link #writeObject(OutputStream, Object)}
+ * should always be readable by {@link GraphReader#readObject(InputStream, Class)} and the output of
+ * {@link #writeGraph(OutputStream, Graph)} should always be readable by
+ * {@link GraphReader#readGraph(InputStream, Graph)}.
*
* @author Stephen Mallette (http://stephen.genoprime.com)
*/
public interface GraphWriter {
/**
* Write the entire graph to a stream.
+ *
+ * @param outputStream The stream to write to.
+ * @param g The graph to write to stream.
*/
public void writeGraph(final OutputStream outputStream, final Graph g) throws IOException;
@@ -45,7 +61,7 @@ public interface GraphWriter {
*
* @param outputStream The stream to write to.
* @param v The vertex to write.
- * @param direction If direction is null then no edges are written.
+ * @param direction The direction of edges to write or null if no edges are to be written.
*/
public void writeVertex(final OutputStream outputStream, final Vertex v, final Direction direction) throws IOException;
@@ -64,7 +80,7 @@ public interface GraphWriter {
*
* @param outputStream The stream to write to.
* @param vertexIterator A traversal that returns a list of vertices.
- * @param direction If direction is null then no edges are written.
+ * @param direction The direction of edges to write or null if no edges are to be written.
*/
public default void writeVertices(final OutputStream outputStream, final Iterator<Vertex> vertexIterator, final Direction direction) throws IOException {
while (vertexIterator.hasNext()) {
@@ -86,6 +102,9 @@ public interface GraphWriter {
/**
* Write an edge to a stream.
+ *
+ * @param outputStream The stream to write to.
+ * @param e The edge to write.
*/
public void writeEdge(final OutputStream outputStream, final Edge e) throws IOException;
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/a0606789/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONReader.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONReader.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONReader.java
index b25c32b..7c0ebf1 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONReader.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONReader.java
@@ -67,6 +67,9 @@ public class GraphSONReader implements GraphReader {
this.batchSize = batchSize;
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public void readGraph(final InputStream inputStream, final Graph graphToWriteTo) throws IOException {
// dual pass - create all vertices and store to cache the ids. then create edges. as long as we don't
@@ -90,6 +93,9 @@ public class GraphSONReader implements GraphReader {
if (supportsTx) graphToWriteTo.tx().commit();
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public Iterator<Vertex> readVertices(final InputStream inputStream,
final Function<Attachable<Vertex>, Vertex> vertexAttachMethod,
@@ -99,11 +105,17 @@ public class GraphSONReader implements GraphReader {
return br.lines().<Vertex>map(FunctionUtils.wrapFunction(line -> readVertex(new ByteArrayInputStream(line.getBytes()), vertexAttachMethod, edgeAttachMethod, attachEdgesOfThisDirection))).iterator();
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public Vertex readVertex(final InputStream inputStream, final Function<Attachable<Vertex>, Vertex> vertexAttachMethod) throws IOException {
return readVertex(inputStream, vertexAttachMethod, null, null);
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public Vertex readVertex(final InputStream inputStream,
final Function<Attachable<Vertex>, Vertex> vertexAttachMethod,
@@ -122,6 +134,9 @@ public class GraphSONReader implements GraphReader {
return starGraph.getStarVertex();
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public Edge readEdge(final InputStream inputStream, final Function<Attachable<Edge>, Edge> edgeAttachMethod) throws IOException {
final Map<String, Object> edgeData = mapper.readValue(inputStream, mapTypeReference);
@@ -137,6 +152,9 @@ public class GraphSONReader implements GraphReader {
return edgeAttachMethod.apply(edge);
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public <C> C readObject(final InputStream inputStream, final Class<? extends C> clazz) throws IOException {
return mapper.readValue(inputStream, clazz);
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/a0606789/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONWriter.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONWriter.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONWriter.java
index 07d28fc..5f9b879 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONWriter.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONWriter.java
@@ -47,26 +47,48 @@ public class GraphSONWriter implements GraphWriter {
this.mapper = mapper.createMapper();
}
+ /**
+ * Writes a {@link Graph} to stream in an adjacency list format where vertices are written with edges from both
+ * directions. Under this serialization model, edges are grouped by label.
+ *
+ * @param outputStream The stream to write to.
+ * @param g The graph to write to stream.
+ */
@Override
public void writeGraph(final OutputStream outputStream, final Graph g) throws IOException {
writeVertices(outputStream, g.vertices(), Direction.BOTH);
}
+ /**
+ * Writes a single {@link Vertex} to stream where edges only from the specified direction are written.
+ * Under this serialization model, edges are grouped by label.
+ *
+ * @param direction the direction of edges to write or null if no edges are to be written.
+ */
@Override
public void writeVertex(final OutputStream outputStream, final Vertex v, final Direction direction) throws IOException {
mapper.writeValue(outputStream, new StarGraphGraphSONSerializer.DirectionalStarGraph(StarGraph.of(v), direction));
}
+ /**
+ * Writes a single {@link Vertex} with no edges serialized.
+ *
+ * @param outputStream The stream to write to.
+ * @param v The vertex to write.
+ */
@Override
public void writeVertex(final OutputStream outputStream, final Vertex v) throws IOException {
- mapper.writeValue(outputStream, new StarGraphGraphSONSerializer.DirectionalStarGraph(StarGraph.of(v), null));
- }
-
- @Override
- public void writeEdge(final OutputStream outputStream, final Edge e) throws IOException {
- mapper.writeValue(outputStream, e);
+ writeVertex(outputStream, v, null);
}
+ /**
+ * Writes a list of vertices in adjacency list format where vertices are written with edges from both
+ * directions. Under this serialization model, edges are grouped by label.
+ *
+ * @param outputStream The stream to write to.
+ * @param vertexIterator A traversal that returns a list of vertices.
+ * @param direction If direction is null then no edges are written.
+ */
@Override
public void writeVertices(final OutputStream outputStream, final Iterator<Vertex> vertexIterator, final Direction direction) throws IOException {
final BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(outputStream));
@@ -82,21 +104,41 @@ public class GraphSONWriter implements GraphWriter {
writer.flush();
}
+ /**
+ * Writes a list of vertices without edges.
+ *
+ * @param outputStream The stream to write to.
+ * @param vertexIterator A iterator that returns a list of vertices.
+ */
@Override
public void writeVertices(final OutputStream outputStream, final Iterator<Vertex> vertexIterator) throws IOException {
- final BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(outputStream));
- try (final ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
- while (vertexIterator.hasNext()) {
- writeVertex(baos, vertexIterator.next());
- writer.write(new String(baos.toByteArray()));
- writer.newLine();
- baos.reset();
- }
- }
+ writeVertices(outputStream, vertexIterator, null);
+ }
- writer.flush();
+ /**
+ * Writes an {@link Edge} object to the stream. Note that this format is different from the format of an
+ * {@link Edge} when serialized with a {@link Vertex} as done with
+ * {@link #writeVertex(OutputStream, Vertex, Direction)} or
+ * {@link #writeVertices(OutputStream, Iterator, Direction)} in that the edge label is part of the object and
+ * vertex labels are included with their identifiers.
+ *
+ * @param outputStream The stream to write to.
+ * @param e The edge to write.
+ */
+ @Override
+ public void writeEdge(final OutputStream outputStream, final Edge e) throws IOException {
+ mapper.writeValue(outputStream, e);
}
+ /**
+ * Writes an arbitrary object to the stream. Note that Gremlin Server uses this method when serializing output,
+ * thus the format of the GraphSON for a {@link Vertex} will be somewhat different from the format supplied
+ * when using {@link #writeVertex(OutputStream, Vertex, Direction)}. For example, edges will never be included.
+ *
+ * @param outputStream The stream to write to
+ * @param object The object to write which will use the standard serializer set
+ * @throws IOException
+ */
@Override
public void writeObject(final OutputStream outputStream, final Object object) throws IOException {
this.mapper.writeValue(outputStream, object);
[38/50] [abbrv] incubator-tinkerpop git commit: Reduce logging level
- calm Gremlin Server console output a bit.
Posted by sp...@apache.org.
Reduce logging level - calm Gremlin Server console output a bit.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/c119dcb6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/c119dcb6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/c119dcb6
Branch: refs/heads/variables
Commit: c119dcb6ec0bf034f6b4636ebba564d915fcab58
Parents: 0ee87f8
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Apr 30 15:17:18 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Apr 30 15:17:18 2015 -0400
----------------------------------------------------------------------
.../tinkerpop/gremlin/server/op/AbstractEvalOpProcessor.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c119dcb6/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessor.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessor.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessor.java
index 97d5ddd..e9c5039 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessor.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessor.java
@@ -154,7 +154,7 @@ public abstract class AbstractEvalOpProcessor implements OpProcessor {
final CompletableFuture<Void> iterationFuture = evalFuture.thenAcceptAsync(o -> {
final Iterator itty = IteratorUtils.asIterator(o);
- logger.info("Preparing to iterate results from - {} - in thread [{}]", msg, Thread.currentThread().getName());
+ logger.debug("Preparing to iterate results from - {} - in thread [{}]", msg, Thread.currentThread().getName());
try {
handleIterator(context, itty);
[36/50] [abbrv] incubator-tinkerpop git commit: minor nothing
generics tweak.
Posted by sp...@apache.org.
minor nothing generics tweak.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/d36bc428
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/d36bc428
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/d36bc428
Branch: refs/heads/variables
Commit: d36bc4280e099793ec665d51da0862454479ae4c
Parents: 4cfa7f6
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Thu Apr 30 12:46:57 2015 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Thu Apr 30 12:46:57 2015 -0600
----------------------------------------------------------------------
.../process/traversal/step/sideEffect/SideEffectCapStep.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/d36bc428/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SideEffectCapStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SideEffectCapStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SideEffectCapStep.java
index c1759e1..830d01f 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SideEffectCapStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SideEffectCapStep.java
@@ -45,7 +45,7 @@ public final class SideEffectCapStep<S, E> extends SupplyingBarrierStep<S, E> {
public SideEffectCapStep(final Traversal.Admin traversal, final String sideEffectKey, final String... sideEffectKeys) {
super(traversal);
- this.sideEffectKeys = new ArrayList(1 + sideEffectKeys.length);
+ this.sideEffectKeys = new ArrayList<>(1 + sideEffectKeys.length);
this.sideEffectKeys.add(sideEffectKey);
this.sideEffectKeys.addAll(Arrays.asList(sideEffectKeys));
}
[19/50] [abbrv] incubator-tinkerpop git commit: Finalize a bunch of
variables for code consistency.
Posted by sp...@apache.org.
Finalize a bunch of variables for code consistency.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/cf1594ce
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/cf1594ce
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/cf1594ce
Branch: refs/heads/variables
Commit: cf1594ce0388baf2a418b6bbad9681ee4e72d632
Parents: cd2cf0f
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Apr 29 16:23:41 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Apr 29 16:23:41 2015 -0400
----------------------------------------------------------------------
.../process/traversal/step/branch/BranchTest.java | 4 ++--
.../process/traversal/step/branch/ChooseTest.java | 2 +-
.../process/traversal/step/branch/RepeatTest.java | 6 +++---
.../traversal/step/filter/CyclicPathTest.java | 2 +-
.../process/traversal/step/filter/ExceptTest.java | 18 +++++++++---------
.../process/traversal/step/filter/FilterTest.java | 8 ++++----
.../process/traversal/step/filter/HasNotTest.java | 4 ++--
.../process/traversal/step/filter/HasTest.java | 6 +++---
.../process/traversal/step/filter/IsTest.java | 10 +++++-----
.../process/traversal/step/filter/WhereTest.java | 8 ++++----
.../process/traversal/step/map/CoalesceTest.java | 18 +++++++++---------
.../process/traversal/step/map/FoldTest.java | 6 +++---
.../process/traversal/step/map/MapTest.java | 2 +-
.../process/traversal/step/map/SelectTest.java | 10 +++++-----
.../process/traversal/step/map/VertexTest.java | 4 ++--
.../traversal/step/sideEffect/AggregateTest.java | 10 +++++-----
.../traversal/step/sideEffect/GroupCountTest.java | 4 ++--
.../traversal/step/sideEffect/GroupTest.java | 2 +-
.../traversal/step/sideEffect/InjectTest.java | 2 +-
.../traversal/step/sideEffect/ProfileTest.java | 4 ++--
.../step/sideEffect/SideEffectCapTest.java | 2 +-
.../traversal/step/sideEffect/StoreTest.java | 4 ++--
.../traversal/step/sideEffect/SubgraphTest.java | 4 ++--
.../traversal/step/sideEffect/TreeTest.java | 6 +++---
24 files changed, 73 insertions(+), 73 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/cf1594ce/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/BranchTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/BranchTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/BranchTest.java
index 4149fb5..c4286e8 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/BranchTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/BranchTest.java
@@ -46,7 +46,7 @@ public abstract class BranchTest extends AbstractGremlinProcessTest {
@LoadGraphWith(MODERN)
@IgnoreEngine(TraversalEngine.Type.COMPUTER)
public void g_V_branchXlabel_eq_person__a_bX_optionXa__ageX_optionXb__langX_optionXb__nameX() {
- Traversal<Vertex, Object> traversal = get_g_V_branchXlabel_eq_person__a_bX_optionXa__ageX_optionXb__langX_optionXb__nameX();
+ final Traversal<Vertex, Object> traversal = get_g_V_branchXlabel_eq_person__a_bX_optionXa__ageX_optionXb__langX_optionXb__nameX();
printTraversalForm(traversal);
checkResults(Arrays.asList("java", "java", "lop", "ripple", 29, 27, 32, 35), traversal);
}
@@ -54,7 +54,7 @@ public abstract class BranchTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
public void g_V_branchXlabelX_optionXperson__ageX_optionXsoftware__langX_optionXsoftware__nameX() {
- Traversal<Vertex, Object> traversal = get_g_V_branchXlabelX_optionXperson__ageX_optionXsoftware__langX_optionXsoftware__nameX();
+ final Traversal<Vertex, Object> traversal = get_g_V_branchXlabelX_optionXperson__ageX_optionXsoftware__langX_optionXsoftware__nameX();
printTraversalForm(traversal);
checkResults(Arrays.asList("java", "java", "lop", "ripple", 29, 27, 32, 35), traversal);
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/cf1594ce/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/ChooseTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/ChooseTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/ChooseTest.java
index be5e192..2104d08 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/ChooseTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/ChooseTest.java
@@ -48,7 +48,7 @@ public abstract class ChooseTest extends AbstractGremlinProcessTest {
public void g_V_chooseXout_countX_optionX2L__nameX_optionX3L__valueMapX() {
final Traversal<Vertex, Object> traversal = get_g_V_chooseXout_countX_optionX2L__nameX_optionX3L__valueMapX();
printTraversalForm(traversal);
- Map<String, Long> counts = new HashMap<>();
+ final Map<String, Long> counts = new HashMap<>();
int counter = 0;
while (traversal.hasNext()) {
MapHelper.incr(counts, traversal.next().toString(), 1l);
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/cf1594ce/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/RepeatTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/RepeatTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/RepeatTest.java
index c48da8b..b90afcd 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/RepeatTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/RepeatTest.java
@@ -134,9 +134,9 @@ public abstract class RepeatTest extends AbstractGremlinProcessTest {
traversals.add(get_g_V_repeatXoutX_timesX2X_emit());
traversals.forEach(traversal -> {
printTraversalForm(traversal);
- Map<String, Long> map = new HashMap<>();
+ final Map<String, Long> map = new HashMap<>();
while (traversal.hasNext()) {
- Vertex vertex = traversal.next();
+ final Vertex vertex = traversal.next();
MapHelper.incr(map, vertex.value("name"), 1l);
}
assertEquals(4, map.size());
@@ -245,7 +245,7 @@ public abstract class RepeatTest extends AbstractGremlinProcessTest {
}
@Override
- public Traversal<Vertex, String> get_g_VX1X_timesX2X_repeatXoutX_name(Object v1Id) {
+ public Traversal<Vertex, String> get_g_VX1X_timesX2X_repeatXoutX_name(final Object v1Id) {
return g.V(v1Id).times(2).repeat(out()).values("name");
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/cf1594ce/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/CyclicPathTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/CyclicPathTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/CyclicPathTest.java
index 6dce036..4a8b49f 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/CyclicPathTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/CyclicPathTest.java
@@ -63,7 +63,7 @@ public abstract class CyclicPathTest extends AbstractGremlinProcessTest {
int counter = 0;
while (traversal.hasNext()) {
counter++;
- Path path = traversal.next();
+ final Path path = traversal.next();
assertFalse(path.isSimple());
}
assertEquals(1, counter);
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/cf1594ce/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/ExceptTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/ExceptTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/ExceptTest.java
index b863f42..7d466c5 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/ExceptTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/ExceptTest.java
@@ -64,10 +64,10 @@ public abstract class ExceptTest extends AbstractGremlinProcessTest {
final Traversal<Vertex, Vertex> traversal = get_g_VX1X_out_exceptXg_v2X(convertToVertexId("marko"), convertToVertexId("vadas"));
printTraversalForm(traversal);
int counter = 0;
- Set<Vertex> vertices = new HashSet<>();
+ final Set<Vertex> vertices = new HashSet<>();
while (traversal.hasNext()) {
counter++;
- Vertex vertex = traversal.next();
+ final Vertex vertex = traversal.next();
vertices.add(vertex);
assertTrue(vertex.value("name").equals("josh") || vertex.value("name").equals("lop"));
}
@@ -78,7 +78,7 @@ public abstract class ExceptTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
public void g_VX1X_out_aggregateXxX_out_exceptXxX() {
- Traversal<Vertex, Vertex> traversal = get_g_VX1X_out_aggregateXxX_out_exceptXxX(convertToVertexId("marko"));
+ final Traversal<Vertex, Vertex> traversal = get_g_VX1X_out_aggregateXxX_out_exceptXxX(convertToVertexId("marko"));
printTraversalForm(traversal);
assertEquals("ripple", traversal.next().<String>value("name"));
assertFalse(traversal.hasNext());
@@ -88,9 +88,9 @@ public abstract class ExceptTest extends AbstractGremlinProcessTest {
@LoadGraphWith(MODERN)
@IgnoreEngine(TraversalEngine.Type.COMPUTER)
public void g_VX1X_outXcreatedX_inXcreatedX_exceptXg_v1X_name() {
- Traversal<Vertex, String> traversal = get_g_VX1X_outXcreatedX_inXcreatedX_exceptXg_v1X_name(convertToVertexId("marko"));
+ final Traversal<Vertex, String> traversal = get_g_VX1X_outXcreatedX_inXcreatedX_exceptXg_v1X_name(convertToVertexId("marko"));
printTraversalForm(traversal);
- List<String> names = Arrays.asList(traversal.next(), traversal.next());
+ final List<String> names = Arrays.asList(traversal.next(), traversal.next());
assertFalse(traversal.hasNext());
assertEquals(2, names.size());
assertTrue(names.contains("peter"));
@@ -101,7 +101,7 @@ public abstract class ExceptTest extends AbstractGremlinProcessTest {
@LoadGraphWith(MODERN)
@IgnoreEngine(TraversalEngine.Type.COMPUTER)
public void g_V_exceptXg_V_toListX() {
- Traversal<Vertex, Vertex> traversal = get_g_V_exceptXg_V_toListX();
+ final Traversal<Vertex, Vertex> traversal = get_g_V_exceptXg_V_toListX();
printTraversalForm(traversal);
final List<Vertex> vertices = traversal.toList();
assertEquals(0, vertices.size());
@@ -112,7 +112,7 @@ public abstract class ExceptTest extends AbstractGremlinProcessTest {
@LoadGraphWith(MODERN)
@IgnoreEngine(TraversalEngine.Type.COMPUTER)
public void g_V_exceptXX() {
- Traversal<Vertex, Vertex> traversal = get_g_V_exceptXX();
+ final Traversal<Vertex, Vertex> traversal = get_g_V_exceptXX();
printTraversalForm(traversal);
final List<Vertex> vertices = traversal.toList();
assertEquals(6, vertices.size());
@@ -122,7 +122,7 @@ public abstract class ExceptTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
public void g_VX1X_repeatXbothEXcreatedX_exceptXeX_aggregateXeX_otherVX_emit_path() {
- Traversal<Vertex, Path> traversal = get_g_VX1X_repeatXbothEXcreatedX_exceptXeX_aggregateXeX_otherVX_emit_path(convertToVertexId("marko"));
+ final Traversal<Vertex, Path> traversal = get_g_VX1X_repeatXbothEXcreatedX_exceptXeX_aggregateXeX_otherVX_emit_path(convertToVertexId("marko"));
printTraversalForm(traversal);
final List<Path> paths = traversal.toList();
assertEquals(4, paths.size());
@@ -136,7 +136,7 @@ public abstract class ExceptTest extends AbstractGremlinProcessTest {
@LoadGraphWith(MODERN)
@IgnoreEngine(TraversalEngine.Type.COMPUTER)
public void g_VX1X_repeatXbothEXcreatedX_dedup_otherVX_emit_path() {
- Traversal<Vertex, Path> traversal = get_g_VX1X_repeatXbothEXcreatedX_dedup_otherVX_emit_path(convertToVertexId("marko"));
+ final Traversal<Vertex, Path> traversal = get_g_VX1X_repeatXbothEXcreatedX_dedup_otherVX_emit_path(convertToVertexId("marko"));
printTraversalForm(traversal);
final List<Path> paths = traversal.toList();
assertEquals(4, paths.size());
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/cf1594ce/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/FilterTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/FilterTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/FilterTest.java
index eff88b8..ce78f93 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/FilterTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/FilterTest.java
@@ -90,10 +90,10 @@ public abstract class FilterTest extends AbstractGremlinProcessTest {
final Traversal<Vertex, Vertex> traversal = get_g_V_filterXlang_eq_javaX();
printTraversalForm(traversal);
int counter = 0;
- Set<Vertex> vertices = new HashSet<>();
+ final Set<Vertex> vertices = new HashSet<>();
while (traversal.hasNext()) {
counter++;
- Vertex vertex = traversal.next();
+ final Vertex vertex = traversal.next();
vertices.add(vertex);
assertTrue(vertex.value("name").equals("ripple") ||
vertex.value("name").equals("lop"));
@@ -132,10 +132,10 @@ public abstract class FilterTest extends AbstractGremlinProcessTest {
final Traversal<Vertex, Vertex> traversal = get_g_V_filterXname_startsWith_m_OR_name_startsWith_pX();
printTraversalForm(traversal);
int counter = 0;
- Set<Vertex> vertices = new HashSet<>();
+ final Set<Vertex> vertices = new HashSet<>();
while (traversal.hasNext()) {
counter++;
- Vertex vertex = traversal.next();
+ final Vertex vertex = traversal.next();
vertices.add(vertex);
assertTrue(vertex.value("name").equals("marko") ||
vertex.value("name").equals("peter"));
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/cf1594ce/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/HasNotTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/HasNotTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/HasNotTest.java
index 370a1a6..5e9eea0 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/HasNotTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/HasNotTest.java
@@ -60,7 +60,7 @@ public abstract class HasNotTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
public void g_V_hasNotXprop() {
- Traversal<Vertex, Vertex> traversal = get_g_V_hasNotXprop("circumference");
+ final Traversal<Vertex, Vertex> traversal = get_g_V_hasNotXprop("circumference");
printTraversalForm(traversal);
final List<Vertex> list = traversal.toList();
assertEquals(6, list.size());
@@ -69,7 +69,7 @@ public abstract class HasNotTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
public void g_V_hasNotXoutXcreatedXX() {
- Traversal<Vertex, String> traversal = get_g_V_hasNotXoutXcreatedXX();
+ final Traversal<Vertex, String> traversal = get_g_V_hasNotXoutXcreatedXX();
checkResults(Arrays.asList("vadas", "lop", "ripple"), traversal);
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/cf1594ce/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/HasTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/HasTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/HasTest.java
index 3ec0001..34d1f80 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/HasTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/HasTest.java
@@ -81,7 +81,7 @@ public abstract class HasTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
public void g_V_outXknowsX_hasXoutXcreatedXX_valuesXnameX() {
- Traversal<Vertex, String> traversal = get_g_V_outXknowsX_hasXoutXcreatedXX_name();
+ final Traversal<Vertex, String> traversal = get_g_V_outXknowsX_hasXoutXcreatedXX_name();
printTraversalForm(traversal);
checkResults(Arrays.asList("josh"), traversal);
}
@@ -174,7 +174,7 @@ public abstract class HasTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
public void g_V_hasXblahX() {
- assumeTrue(graphMeetsTestRequirements());
+ //assumeTrue(graphMeetsTestRequirements());
final Traversal<Vertex, Vertex> traversal = get_g_V_hasXblahX();
printTraversalForm(traversal);
assertFalse(traversal.hasNext());
@@ -185,7 +185,7 @@ public abstract class HasTest extends AbstractGremlinProcessTest {
@LoadGraphWith(MODERN)
public void g_EX7X_hasXlabelXknowsX() {
//System.out.println(convertToEdgeId("marko", "knows", "vadas"));
- Traversal<Edge, Edge> traversal = get_g_EX7X_hasLabelXknowsX(convertToEdgeId("marko", "knows", "vadas"));
+ final Traversal<Edge, Edge> traversal = get_g_EX7X_hasLabelXknowsX(convertToEdgeId("marko", "knows", "vadas"));
printTraversalForm(traversal);
int counter = 0;
while (traversal.hasNext()) {
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/cf1594ce/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/IsTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/IsTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/IsTest.java
index eb5b9ea..74add2c 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/IsTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/IsTest.java
@@ -52,7 +52,7 @@ public abstract class IsTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
public void g_V_valuesXageX_isX32X() {
- Traversal<Vertex, Integer> traversal = get_g_V_valuesXageX_isX32X();
+ final Traversal<Vertex, Integer> traversal = get_g_V_valuesXageX_isX32X();
printTraversalForm(traversal);
assertTrue(traversal.hasNext());
assertEquals(Integer.valueOf(32), traversal.next());
@@ -62,7 +62,7 @@ public abstract class IsTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
public void g_V_valuesXageX_isXlte_30X() {
- Traversal<Vertex, Integer> traversal = get_g_V_valuesXageX_isXlte_30X();
+ final Traversal<Vertex, Integer> traversal = get_g_V_valuesXageX_isXlte_30X();
printTraversalForm(traversal);
checkResults(Arrays.asList(27, 29), traversal);
}
@@ -70,7 +70,7 @@ public abstract class IsTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
public void g_V_valuesXageX_isXgte_29X_isXlt_34X() {
- Traversal<Vertex, Integer> traversal = get_g_V_valuesXageX_isXgte_29X_isXlt_34X();
+ final Traversal<Vertex, Integer> traversal = get_g_V_valuesXageX_isXgte_29X_isXlt_34X();
printTraversalForm(traversal);
checkResults(Arrays.asList(29, 32), traversal);
}
@@ -78,7 +78,7 @@ public abstract class IsTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
public void g_V_hasXinXcreatedX_count_isX1XX_valuesXnameX() {
- Traversal<Vertex, String> traversal = get_g_V_hasXinXcreatedX_count_isX1XX_valuesXnameX();
+ final Traversal<Vertex, String> traversal = get_g_V_hasXinXcreatedX_count_isX1XX_valuesXnameX();
printTraversalForm(traversal);
assertTrue(traversal.hasNext());
assertEquals("ripple", traversal.next());
@@ -88,7 +88,7 @@ public abstract class IsTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
public void g_V_hasXinXcreatedX_count_isXgte_2XX_valuesXnameX() {
- Traversal<Vertex, String> traversal = get_g_V_hasXinXcreatedX_count_isXgte_2XX_valuesXnameX();
+ final Traversal<Vertex, String> traversal = get_g_V_hasXinXcreatedX_count_isXgte_2XX_valuesXnameX();
printTraversalForm(traversal);
assertTrue(traversal.hasNext());
assertEquals("lop", traversal.next());
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/cf1594ce/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/WhereTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/WhereTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/WhereTest.java
index 112626d..37f9839 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/WhereTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/WhereTest.java
@@ -55,7 +55,7 @@ public abstract class WhereTest extends AbstractGremlinProcessTest {
int counter = 0;
while (traversal.hasNext()) {
counter++;
- Map<String, Object> map = traversal.next();
+ final Map<String, Object> map = traversal.next();
assertEquals(2, map.size());
assertTrue(map.containsKey("a"));
assertTrue(map.containsKey("b"));
@@ -73,7 +73,7 @@ public abstract class WhereTest extends AbstractGremlinProcessTest {
int counter = 0;
while (traversal.hasNext()) {
counter++;
- Map<String, Object> map = traversal.next();
+ final Map<String, Object> map = traversal.next();
assertEquals(2, map.size());
assertTrue(map.containsKey("a"));
assertTrue(map.containsKey("b"));
@@ -99,7 +99,7 @@ public abstract class WhereTest extends AbstractGremlinProcessTest {
int markoCounter = 0;
while (traversal.hasNext()) {
counter++;
- Map<String, Object> map = traversal.next();
+ final Map<String, Object> map = traversal.next();
assertEquals(2, map.size());
assertTrue(map.containsKey("a"));
assertTrue(map.containsKey("b"));
@@ -123,7 +123,7 @@ public abstract class WhereTest extends AbstractGremlinProcessTest {
int counter = 0;
while (traversal.hasNext()) {
counter++;
- Map<String, Object> map = traversal.next();
+ final Map<String, Object> map = traversal.next();
assertEquals(2, map.size());
assertTrue(map.containsKey("a"));
assertTrue(map.containsKey("b"));
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/cf1594ce/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/CoalesceTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/CoalesceTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/CoalesceTest.java
index d1f3571..9b7c851 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/CoalesceTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/CoalesceTest.java
@@ -56,7 +56,7 @@ public abstract class CoalesceTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
public void g_V_coalesceXoutXfooX_outXbarXX() {
- Traversal<Vertex, Vertex> traversal = get_g_V_coalesceXoutXfooX_outXbarXX();
+ final Traversal<Vertex, Vertex> traversal = get_g_V_coalesceXoutXfooX_outXbarXX();
printTraversalForm(traversal);
assertFalse(traversal.hasNext());
}
@@ -64,7 +64,7 @@ public abstract class CoalesceTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
public void g_VX1X_coalesceXoutXknowsX_outXcreatedXX_valuesXnameX() {
- Traversal<Vertex, String> traversal = get_g_VX1X_coalesceXoutXknowsX_outXcreatedXX_valuesXnameX(convertToVertexId("marko"));
+ final Traversal<Vertex, String> traversal = get_g_VX1X_coalesceXoutXknowsX_outXcreatedXX_valuesXnameX(convertToVertexId("marko"));
printTraversalForm(traversal);
checkResults(Arrays.asList("josh", "vadas"), traversal);
}
@@ -72,7 +72,7 @@ public abstract class CoalesceTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
public void g_VX1X_coalesceXoutXcreatedX_outXknowsXX_valuesXnameX() {
- Traversal<Vertex, String> traversal = get_g_VX1X_coalesceXoutXcreatedX_outXknowsXX_valuesXnameX(convertToVertexId("marko"));
+ final Traversal<Vertex, String> traversal = get_g_VX1X_coalesceXoutXcreatedX_outXknowsXX_valuesXnameX(convertToVertexId("marko"));
printTraversalForm(traversal);
assertTrue(traversal.hasNext());
assertEquals("lop", traversal.next());
@@ -82,10 +82,10 @@ public abstract class CoalesceTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
public void g_V_coalesceXoutXlikesX_outXknowsX_inXcreatedXX_groupCount_byXnameX() {
- Traversal<Vertex, Map<String, Long>> traversal = get_g_V_coalesceXoutXlikesX_outXknowsX_inXcreatedXX_groupCount_byXnameX();
+ final Traversal<Vertex, Map<String, Long>> traversal = get_g_V_coalesceXoutXlikesX_outXknowsX_inXcreatedXX_groupCount_byXnameX();
printTraversalForm(traversal);
assertTrue(traversal.hasNext());
- Map<String, Long> result = traversal.next();
+ final Map<String, Long> result = traversal.next();
assertEquals(4, result.size());
assertTrue(result.containsKey("josh") && result.containsKey("lop") && result.containsKey("ripple") && result.containsKey("vadas"));
assertEquals(1L, (long) result.get("josh"));
@@ -99,14 +99,14 @@ public abstract class CoalesceTest extends AbstractGremlinProcessTest {
@IgnoreEngine(TraversalEngine.Type.COMPUTER)
@LoadGraphWith(MODERN)
public void g_V_coalesceXoutEXknowsX_outEXcreatedXX_otherV_path_byXnameX_byXlabelX() {
- Traversal<Vertex, Path> traversal = get_g_V_coalesceXoutEXknowsX_outEXcreatedXX_otherV_path_byXnameX_byXlabelX();
+ final Traversal<Vertex, Path> traversal = get_g_V_coalesceXoutEXknowsX_outEXcreatedXX_otherV_path_byXnameX_byXlabelX();
printTraversalForm(traversal);
- Map<String, Integer> first = new HashMap<>();
- Map<String, Integer> last = new HashMap<>();
+ final Map<String, Integer> first = new HashMap<>();
+ final Map<String, Integer> last = new HashMap<>();
int counter = 0;
while (traversal.hasNext()) {
counter++;
- Path path = traversal.next();
+ final Path path = traversal.next();
first.compute(path.<String>get(0), (k, v) -> v != null ? v + 1 : 1);
last.compute(path.<String>get(2), (k, v) -> v != null ? v + 1 : 1);
assertEquals(3, path.size());
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/cf1594ce/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/FoldTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/FoldTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/FoldTest.java
index 58d84a9..4932988 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/FoldTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/FoldTest.java
@@ -53,9 +53,9 @@ public abstract class FoldTest extends AbstractGremlinProcessTest {
public void g_V_fold() {
final Traversal<Vertex, List<Vertex>> traversal = get_g_V_fold();
printTraversalForm(traversal);
- List<Vertex> list = traversal.next();
+ final List<Vertex> list = traversal.next();
assertFalse(traversal.hasNext());
- Set<Vertex> vertices = new HashSet<>(list);
+ final Set<Vertex> vertices = new HashSet<>(list);
assertEquals(6, vertices.size());
}
@@ -66,7 +66,7 @@ public abstract class FoldTest extends AbstractGremlinProcessTest {
final Traversal<Vertex, Vertex> traversal = get_g_V_fold_unfold();
printTraversalForm(traversal);
int count = 0;
- Set<Vertex> vertices = new HashSet<>();
+ final Set<Vertex> vertices = new HashSet<>();
while (traversal.hasNext()) {
vertices.add(traversal.next());
count++;
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/cf1594ce/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MapTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MapTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MapTest.java
index 0b18f3d..7282a43 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MapTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MapTest.java
@@ -62,7 +62,7 @@ public abstract class MapTest extends AbstractGremlinProcessTest {
public void g_VX1X_outE_label_mapXlengthX() {
final Traversal<Vertex, Integer> traversal = get_g_VX1X_outE_label_mapXlengthX(convertToVertexId("marko"));
printTraversalForm(traversal);
- List<Integer> lengths = traversal.toList();
+ final List<Integer> lengths = traversal.toList();
assertTrue(lengths.contains("created".length()));
assertTrue(lengths.contains("knows".length()));
assertEquals(lengths.size(), 3);
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/cf1594ce/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SelectTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SelectTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SelectTest.java
index 7cb07f1..b9dba83 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SelectTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SelectTest.java
@@ -95,7 +95,7 @@ public abstract class SelectTest extends AbstractGremlinProcessTest {
int counter = 0;
while (traversal.hasNext()) {
counter++;
- Map<String, Vertex> bindings = traversal.next();
+ final Map<String, Vertex> bindings = traversal.next();
assertEquals(2, bindings.size());
assertEquals(convertToVertexId("marko"), (bindings.get("a")).id());
assertTrue((bindings.get("b")).id().equals(convertToVertexId("vadas")) || bindings.get("b").id().equals(convertToVertexId("josh")));
@@ -112,7 +112,7 @@ public abstract class SelectTest extends AbstractGremlinProcessTest {
int counter = 0;
while (traversal.hasNext()) {
counter++;
- Map<String, String> bindings = traversal.next();
+ final Map<String, String> bindings = traversal.next();
assertEquals(2, bindings.size());
assertEquals("marko", bindings.get("a"));
assertTrue(bindings.get("b").equals("josh") || bindings.get("b").equals("vadas"));
@@ -128,7 +128,7 @@ public abstract class SelectTest extends AbstractGremlinProcessTest {
int counter = 0;
while (traversal.hasNext()) {
counter++;
- Vertex vertex = traversal.next();
+ final Vertex vertex = traversal.next();
assertEquals(convertToVertexId("marko"), vertex.id());
}
assertEquals(2, counter);
@@ -354,7 +354,7 @@ public abstract class SelectTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
public void g_V_asXhereXout_name_selectXhereX() {
- Traversal<Vertex, Vertex> traversal = get_g_V_asXhereXout_name_selectXhereX();
+ final Traversal<Vertex, Vertex> traversal = get_g_V_asXhereXout_name_selectXhereX();
printTraversalForm(traversal);
super.checkResults(new HashMap<Vertex, Long>() {{
put(convertToVertex(graph, "marko"), 3l);
@@ -367,7 +367,7 @@ public abstract class SelectTest extends AbstractGremlinProcessTest {
@LoadGraphWith(MODERN)
@IgnoreEngine(TraversalEngine.Type.STANDARD) // TODO: dkuppitz this fails on OLTP, but passes on OLAP
public void g_V_outXcreatedX_unionXasXprojectX_inXcreatedX_hasXname_markoX_selectXprojectX__asXprojectX_inXcreatedX_inXknowsX_hasXname_markoX_selectXprojectXX_groupCount_byXnameX() {
- List<Traversal<Vertex, Map<String, Long>>> traversals = Arrays.asList(get_g_V_outXcreatedX_unionXasXprojectX_inXcreatedX_hasXname_markoX_selectXprojectX__asXprojectX_inXcreatedX_inXknowsX_hasXname_markoX_selectXprojectXX_groupCount_byXnameX());
+ final List<Traversal<Vertex, Map<String, Long>>> traversals = Arrays.asList(get_g_V_outXcreatedX_unionXasXprojectX_inXcreatedX_hasXname_markoX_selectXprojectX__asXprojectX_inXcreatedX_inXknowsX_hasXname_markoX_selectXprojectXX_groupCount_byXnameX());
traversals.forEach(traversal -> {
printTraversalForm(traversal);
assertTrue(traversal.hasNext());
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/cf1594ce/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/VertexTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/VertexTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/VertexTest.java
index 1aa2bab..311b6db 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/VertexTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/VertexTest.java
@@ -128,7 +128,7 @@ public abstract class VertexTest extends AbstractGremlinProcessTest {
final Set<Vertex> vertices = new HashSet<>();
while (traversal.hasNext()) {
counter++;
- Vertex vertex = traversal.next();
+ final Vertex vertex = traversal.next();
vertices.add(vertex);
assertTrue(vertex.value("name").equals("vadas") ||
vertex.value("name").equals("josh") ||
@@ -305,7 +305,7 @@ public abstract class VertexTest extends AbstractGremlinProcessTest {
final Map<Object, Integer> counts = new HashMap<>();
while (traversal.hasNext()) {
final Object id = traversal.next().id();
- int previousCount = counts.getOrDefault(id, 0);
+ final int previousCount = counts.getOrDefault(id, 0);
counts.put(id, previousCount + 1);
counter++;
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/cf1594ce/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/AggregateTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/AggregateTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/AggregateTest.java
index 19e632f..ed8c8a4 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/AggregateTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/AggregateTest.java
@@ -54,7 +54,7 @@ public abstract class AggregateTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
public void g_V_valueXnameX_aggregateXxX_capXxX() {
- Traversal<Vertex, List<String>> traversal = get_g_V_name_aggregateXxX_capXxX();
+ final Traversal<Vertex, List<String>> traversal = get_g_V_name_aggregateXxX_capXxX();
printTraversalForm(traversal);
final Collection<String> names = traversal.next();
assertFalse(traversal.hasNext());
@@ -64,7 +64,7 @@ public abstract class AggregateTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
public void g_V_aggregateXxX_byXnameX_capXxX() {
- Traversal<Vertex, List<String>> traversal = get_g_V_aggregateXxX_byXnameX_capXxX();
+ final Traversal<Vertex, List<String>> traversal = get_g_V_aggregateXxX_byXnameX_capXxX();
printTraversalForm(traversal);
final Collection<String> names = traversal.next();
assertFalse(traversal.hasNext());
@@ -91,9 +91,9 @@ public abstract class AggregateTest extends AbstractGremlinProcessTest {
final Map<String, Long> secondStepCounts = new HashMap<>();
while (traversal.hasNext()) {
count++;
- Path path = traversal.next();
- String first = path.get(0).toString();
- String second = path.get(1).toString();
+ final Path path = traversal.next();
+ final String first = path.get(0).toString();
+ final String second = path.get(1).toString();
assertThat(first, not(second));
MapHelper.incr(firstStepCounts, first, 1l);
MapHelper.incr(secondStepCounts, second, 1l);
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/cf1594ce/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroupCountTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroupCountTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroupCountTest.java
index eda73f7..1d6d95c 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroupCountTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroupCountTest.java
@@ -99,7 +99,7 @@ public abstract class GroupCountTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
public void g_V_repeatXout_groupCountXaX_byXnameXX_timesX2X_capXaX() {
- List<Traversal<Vertex, Map<String, Long>>> traversals = new ArrayList<>();
+ final List<Traversal<Vertex, Map<String, Long>>> traversals = new ArrayList<>();
traversals.add(get_g_V_repeatXout_groupCountXaX_byXnameXX_timesX2X_capXaX());
traversals.forEach(traversal -> {
printTraversalForm(traversal);
@@ -116,7 +116,7 @@ public abstract class GroupCountTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
public void g_V_unionXrepeatXoutX_timesX2X_groupCountXmX_byXlangXX__repeatXinX_timesX2X_groupCountXmX_byXnameXX_capXmX() {
- List<Traversal<Vertex, Map<String, Long>>> traversals = new ArrayList<>();
+ final List<Traversal<Vertex, Map<String, Long>>> traversals = new ArrayList<>();
traversals.add(get_g_V_unionXrepeatXoutX_timesX2X_groupCountXmX_byXlangXX__repeatXinX_timesX2X_groupCountXmX_byXnameXX_capXmX());
traversals.forEach(traversal -> {
printTraversalForm(traversal);
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/cf1594ce/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroupTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroupTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroupTest.java
index 3b59720..4fe3799 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroupTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroupTest.java
@@ -94,7 +94,7 @@ public abstract class GroupTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
public void g_V_repeatXout_groupXaX_byXnameX_byXitX_byXsizeXX_timesX2X_capXaX() {
- List<Traversal<Vertex, Map<String, Long>>> traversals = new ArrayList<>();
+ final List<Traversal<Vertex, Map<String, Long>>> traversals = new ArrayList<>();
traversals.add(get_g_V_repeatXout_groupXaX_byXnameX_by_byXcountXlocalXX_timesX2X_capXaX());
traversals.forEach(traversal -> {
printTraversalForm(traversal);
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/cf1594ce/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/InjectTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/InjectTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/InjectTest.java
index 6c67d72..e9bd6ef 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/InjectTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/InjectTest.java
@@ -51,7 +51,7 @@ public abstract class InjectTest extends AbstractGremlinProcessTest {
public void g_VX1X_out_injectXv2X_name() {
final Traversal<Vertex, String> traversal = get_g_VX1X_out_injectXv2X_name(convertToVertexId("marko"), convertToVertexId("vadas"));
printTraversalForm(traversal);
- Map<String, Long> counter = new HashMap<>();
+ final Map<String, Long> counter = new HashMap<>();
while (traversal.hasNext()) {
MapHelper.incr(counter, traversal.next(), 1l);
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/cf1594ce/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/ProfileTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/ProfileTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/ProfileTest.java
index d99490b..eeea89e 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/ProfileTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/ProfileTest.java
@@ -185,13 +185,13 @@ public abstract class ProfileTest extends AbstractGremlinProcessTest {
assertTrue("Times should be positive.", metrics.getDuration(TimeUnit.MICROSECONDS) > 0);
// Test the nested global metrics of the repeat step
- Metrics vertexStepNestedInRepeat = (Metrics) metrics.getNested().toArray()[0];
+ final Metrics vertexStepNestedInRepeat = (Metrics) metrics.getNested().toArray()[0];
assertEquals(114, vertexStepNestedInRepeat.getCount(TraversalMetrics.ELEMENT_COUNT_ID));
assertNotEquals(0, vertexStepNestedInRepeat.getCount(TraversalMetrics.TRAVERSER_COUNT_ID));
assertTrue("Count should be greater than traversers.", vertexStepNestedInRepeat.getCount(TraversalMetrics.ELEMENT_COUNT_ID) > vertexStepNestedInRepeat.getCount(TraversalMetrics.TRAVERSER_COUNT_ID));
assertTrue("Times should be positive.", vertexStepNestedInRepeat.getDuration(TimeUnit.MICROSECONDS) > 0);
- Metrics repeatEndStepNestedInRepeat = (Metrics) metrics.getNested().toArray()[1];
+ final Metrics repeatEndStepNestedInRepeat = (Metrics) metrics.getNested().toArray()[1];
assertEquals(72, repeatEndStepNestedInRepeat.getCount(TraversalMetrics.ELEMENT_COUNT_ID));
assertNotEquals(0, repeatEndStepNestedInRepeat.getCount(TraversalMetrics.TRAVERSER_COUNT_ID));
assertTrue("Count should be greater than traversers.", repeatEndStepNestedInRepeat.getCount(TraversalMetrics.ELEMENT_COUNT_ID) > repeatEndStepNestedInRepeat.getCount(TraversalMetrics.TRAVERSER_COUNT_ID));
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/cf1594ce/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SideEffectCapTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SideEffectCapTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SideEffectCapTest.java
index a65e068..6aecc83 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SideEffectCapTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SideEffectCapTest.java
@@ -61,7 +61,7 @@ public abstract class SideEffectCapTest extends AbstractGremlinProcessTest {
final Traversal<Vertex, Map<String, Map<Object, Long>>> traversal = get_g_V_chooseXlabel_person__age_groupCountXaX__name_groupCountXbXX_capXa_bX();
printTraversalForm(traversal);
assertTrue(traversal.hasNext());
- Map<String, Map<Object, Long>> map = traversal.next();
+ final Map<String, Map<Object, Long>> map = traversal.next();
assertFalse(traversal.hasNext());
assertEquals(2, map.size());
assertTrue(map.containsKey("a"));
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/cf1594ce/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/StoreTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/StoreTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/StoreTest.java
index 16c724e..7de826e 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/StoreTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/StoreTest.java
@@ -53,7 +53,7 @@ public abstract class StoreTest extends AbstractGremlinProcessTest {
public void g_V_storeXa_nameX_out_capXaX() {
final Traversal<Vertex, Collection> traversal = get_g_V_storeXaX_byXnameX_out_capXaX();
printTraversalForm(traversal);
- Collection names = traversal.next();
+ final Collection names = traversal.next();
assertEquals(6, names.size());
assertTrue(names.contains("marko"));
assertTrue(names.contains("josh"));
@@ -69,7 +69,7 @@ public abstract class StoreTest extends AbstractGremlinProcessTest {
public void g_VX1X_storeXaX_byXnameX_out_storeXaX_byXnameX_name_capXaX() {
final Traversal<Vertex, Collection> traversal = get_g_VX1X_storeXaX_byXnameX_out_storeXaX_byXnameX_name_capXaX(convertToVertexId("marko"));
printTraversalForm(traversal);
- Collection names = traversal.next();
+ final Collection names = traversal.next();
assertEquals(4, names.size());
assertTrue(names.contains("marko"));
assertTrue(names.contains("josh"));
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/cf1594ce/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SubgraphTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SubgraphTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SubgraphTest.java
index 3305538..bdcf436 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SubgraphTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SubgraphTest.java
@@ -59,7 +59,7 @@ public abstract class SubgraphTest extends AbstractGremlinProcessTest {
graphProvider.clear(config);
Graph subgraph = graphProvider.openTestGraph(config);
/////
- Traversal<Vertex, Graph> traversal = get_g_V_withSideEffectXsgX_outEXknowsX_subgraphXsgX_name_capXsgX(convertToVertexId("marko"), subgraph);
+ final Traversal<Vertex, Graph> traversal = get_g_V_withSideEffectXsgX_outEXknowsX_subgraphXsgX_name_capXsgX(convertToVertexId("marko"), subgraph);
printTraversalForm(traversal);
subgraph = traversal.next();
assertVertexEdgeCounts(3, 2).accept(subgraph);
@@ -91,7 +91,7 @@ public abstract class SubgraphTest extends AbstractGremlinProcessTest {
graphProvider.clear(config);
final Graph subgraph = graphProvider.openTestGraph(config);
/////
- Traversal<Vertex, String> traversal = get_g_V_withSideEffectXsgX_repeatXbothEXcreatedX_subgraphXsgX_outVX_timesX5X_name_dedup(subgraph);
+ final Traversal<Vertex, String> traversal = get_g_V_withSideEffectXsgX_repeatXbothEXcreatedX_subgraphXsgX_outVX_timesX5X_name_dedup(subgraph);
printTraversalForm(traversal);
checkResults(Arrays.asList("marko", "josh", "peter"), traversal);
final Graph subGraph = traversal.asAdmin().getSideEffects().get("sg");
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/cf1594ce/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/TreeTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/TreeTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/TreeTest.java
index 14e0e3a..efd0144 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/TreeTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/TreeTest.java
@@ -56,7 +56,7 @@ public abstract class TreeTest extends AbstractGremlinProcessTest {
@IgnoreEngine(TraversalEngine.Type.COMPUTER)
@LoadGraphWith(MODERN)
public void g_VX1X_out_out_tree_byXnameX() {
- List<Traversal<Vertex, Tree>> traversals = Arrays.asList(
+ final List<Traversal<Vertex, Tree>> traversals = Arrays.asList(
get_g_VX1X_out_out_tree_byXnameX(convertToVertexId("marko")),
get_g_VX1X_out_out_treeXaX_byXnameX_both_both_capXaX(convertToVertexId("marko")));
traversals.forEach(traversal -> {
@@ -75,7 +75,7 @@ public abstract class TreeTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
public void g_V_out_out_tree_byXidX() {
- List<Traversal<Vertex, Tree>> traversals = Arrays.asList(get_g_V_out_out_tree_byXidX(), get_g_V_out_out_treeXaX_byXidX_capXaX());
+ final List<Traversal<Vertex, Tree>> traversals = Arrays.asList(get_g_V_out_out_tree_byXidX(), get_g_V_out_out_treeXaX_byXidX_capXaX());
traversals.forEach(traversal -> {
printTraversalForm(traversal);
final Tree tree = traversal.next();
@@ -92,7 +92,7 @@ public abstract class TreeTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
public void g_V_out_out_treeXaX_capXaX() {
- List<Traversal<Vertex, Tree>> traversals = Arrays.asList(get_g_V_out_out_tree(), get_g_V_out_out_treeXaX_capXaX());
+ final List<Traversal<Vertex, Tree>> traversals = Arrays.asList(get_g_V_out_out_tree(), get_g_V_out_out_treeXaX_capXaX());
traversals.forEach(traversal -> {
printTraversalForm(traversal);
final Tree tree = traversal.next();
[21/50] [abbrv] incubator-tinkerpop git commit: Name of class that
generated test/sample data changed.
Posted by sp...@apache.org.
Name of class that generated test/sample data changed.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/c14f3df3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/c14f3df3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/c14f3df3
Branch: refs/heads/variables
Commit: c14f3df3ff82fcc5c6d25c50e784824a341df66d
Parents: cf1594c
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Apr 30 11:39:20 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Apr 30 11:39:20 2015 -0400
----------------------------------------------------------------------
README.asciidoc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c14f3df3/README.asciidoc
----------------------------------------------------------------------
diff --git a/README.asciidoc b/README.asciidoc
index beaab05..9ed85d7 100644
--- a/README.asciidoc
+++ b/README.asciidoc
@@ -41,7 +41,7 @@ mvn -Dmaven.javadoc.skip=true --projects tinkergraph-gremlin test
----
** Clean the `.groovy/grapes/org.apache.tinkerpop` directory on build: `mvn clean install -DcleanGrapes`
* Regenerate test data (only necessary given changes to IO classes): `mvn clean install -Dio` from `tinkergraph-gremlin` directory
-** If there are changes to the Gryo format, it may be necessary to generate the Grateful Dead dataset from GraphSON (see `TinkerGraphTest.shouldWriteGratefulDead`)
+** If there are changes to the Gryo format, it may be necessary to generate the Grateful Dead dataset from GraphSON (see `IoDataGenerationTest.shouldWriteGratefulDead`)
* Check license headers are present: `mvn apache-rat:check`
* Build AsciiDocs: `docs/preprocessor/preprocess.sh && mvn process-resources -Dasciidoc`
* Build JavaDocs: `mvn process-resources -Djavadoc`
[27/50] [abbrv] incubator-tinkerpop git commit: relaxed equality and
inequality checks for numbers
Posted by sp...@apache.org.
relaxed equality and inequality checks for numbers
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/1a8f0ac5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/1a8f0ac5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/1a8f0ac5
Branch: refs/heads/variables
Commit: 1a8f0ac56121e787e800c35bc47f217998aa2bd7
Parents: c41b199
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Thu Apr 30 19:00:56 2015 +0200
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Thu Apr 30 19:00:56 2015 +0200
----------------------------------------------------------------------
.../apache/tinkerpop/gremlin/structure/Compare.java | 8 ++++----
.../process/traversal/step/filter/GroovyIsTest.groovy | 14 ++++++++------
.../gremlin/process/traversal/step/filter/IsTest.java | 7 +++----
3 files changed, 15 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/1a8f0ac5/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Compare.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Compare.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Compare.java
index bddf109..8184381 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Compare.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Compare.java
@@ -33,7 +33,9 @@ public enum Compare implements BiPredicate<Object, Object> {
public boolean test(final Object first, final Object second) {
if (null == first)
return second == null;
- return first.equals(second);
+ return first instanceof Number && second instanceof Number && !first.getClass().equals(second.getClass())
+ ? ((Number) first).doubleValue() == ((Number) second).doubleValue()
+ : first.equals(second);
}
@Override
@@ -43,9 +45,7 @@ public enum Compare implements BiPredicate<Object, Object> {
}, neq {
@Override
public boolean test(final Object first, final Object second) {
- if (null == first)
- return second != null;
- return !first.equals(second);
+ return !eq.test(first, second);
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/1a8f0ac5/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyIsTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyIsTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyIsTest.groovy
index d1b2051..f407664 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyIsTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyIsTest.groovy
@@ -18,13 +18,15 @@
*/
package org.apache.tinkerpop.gremlin.process.traversal.step.filter
-import org.apache.tinkerpop.gremlin.process.traversal.Traversal
+import org.apache.tinkerpop.gremlin.process.UseEngine
import org.apache.tinkerpop.gremlin.process.computer.ComputerTestHelper
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal
import org.apache.tinkerpop.gremlin.process.traversal.TraversalEngine
-import org.apache.tinkerpop.gremlin.process.UseEngine
-import static org.apache.tinkerpop.gremlin.structure.P.*;
-import org.apache.tinkerpop.gremlin.structure.Vertex
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__
+import org.apache.tinkerpop.gremlin.structure.Vertex
+
+import static org.apache.tinkerpop.gremlin.structure.P.*
+
/**
* @author Daniel Kuppitz (http://gremlin.guru)
*/
@@ -50,7 +52,7 @@ public abstract class GroovyIsTest {
@Override
public Traversal<Vertex, String> get_g_V_hasXinXcreatedX_count_isX1XX_valuesXnameX() {
- return g.V().has(__.in('created').count().is(1l)).values('name');
+ return g.V().has(__.in('created').count().is(1)).values('name');
}
@Override
@@ -79,7 +81,7 @@ public abstract class GroovyIsTest {
@Override
public Traversal<Vertex, String> get_g_V_hasXinXcreatedX_count_isX1XX_valuesXnameX() {
- ComputerTestHelper.compute("g.V().has(__.in('created').count().is(1l)).values('name')", g)
+ ComputerTestHelper.compute("g.V().has(__.in('created').count().is(1)).values('name')", g)
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/1a8f0ac5/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/IsTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/IsTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/IsTest.java
index 74add2c..7a616d4 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/IsTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/IsTest.java
@@ -20,10 +20,9 @@ package org.apache.tinkerpop.gremlin.process.traversal.step.filter;
import org.apache.tinkerpop.gremlin.LoadGraphWith;
import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest;
+import org.apache.tinkerpop.gremlin.process.UseEngine;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.TraversalEngine;
-import org.apache.tinkerpop.gremlin.process.UseEngine;
-import org.apache.tinkerpop.gremlin.structure.Compare;
import org.apache.tinkerpop.gremlin.structure.P;
import org.apache.tinkerpop.gremlin.structure.Vertex;
import org.junit.Test;
@@ -31,7 +30,7 @@ import org.junit.Test;
import java.util.Arrays;
import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN;
-import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.*;
+import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.in;
import static org.junit.Assert.*;
/**
@@ -115,7 +114,7 @@ public abstract class IsTest extends AbstractGremlinProcessTest {
@Override
public Traversal<Vertex, String> get_g_V_hasXinXcreatedX_count_isX1XX_valuesXnameX() {
- return g.V().has(in("created").count().is(1l)).values("name");
+ return g.V().has(in("created").count().is(1)).values("name");
}
@Override
[24/50] [abbrv] incubator-tinkerpop git commit: Javadoc improvements
for IO.
Posted by sp...@apache.org.
Javadoc improvements for IO.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/ff9d518c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/ff9d518c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/ff9d518c
Branch: refs/heads/variables
Commit: ff9d518c97a533f6d7665a48fe886678a7fed0b6
Parents: 215c054
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Apr 30 12:39:01 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Apr 30 12:39:01 2015 -0400
----------------------------------------------------------------------
.../gremlin/structure/io/GraphMigrator.java | 28 ++++----
.../gremlin/structure/io/GraphReader.java | 2 +-
.../gremlin/structure/io/GraphWriter.java | 8 +--
.../tinkerpop/gremlin/structure/io/IoCore.java | 2 +-
.../structure/io/gryo/GryoClassResolver.java | 2 +-
.../gremlin/structure/io/gryo/GryoIo.java | 19 +++++-
.../gremlin/structure/io/gryo/GryoMapper.java | 28 +++++++-
.../gremlin/structure/io/gryo/GryoReader.java | 70 ++++++++++++++++++++
.../structure/io/gryo/GryoSerializers.java | 11 +--
.../gremlin/structure/io/gryo/GryoWriter.java | 31 ++++++++-
10 files changed, 164 insertions(+), 37 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/ff9d518c/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/GraphMigrator.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/GraphMigrator.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/GraphMigrator.java
index 618b519..641df3b 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/GraphMigrator.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/GraphMigrator.java
@@ -26,37 +26,33 @@ import java.io.IOException;
import java.io.PipedInputStream;
import java.io.PipedOutputStream;
+import static org.apache.tinkerpop.gremlin.structure.io.IoCore.gryo;
+
/**
- * {@link GraphMigrator} takes the data in one graph and pipes it to another graph. Uses the {@link org.apache.tinkerpop.gremlin.structure.io.gryo.GryoReader}
- * and {@link org.apache.tinkerpop.gremlin.structure.io.gryo.GryoWriter} by default.
+ * {@code GraphMigrator} takes the data in one graph and pipes it to another graph. Uses the {@link GryoReader}
+ * and {@link GryoWriter} by default. Note that this utility is meant as a convenience for "small" graph migrations.
*
* @author Alex Averbuch (alex.averbuch@gmail.com)
* @author Stephen Mallette (http://stephen.genoprime.com)
*/
public final class GraphMigrator {
-
- private static final GryoReader DEFAULT_GRYO_READER = GryoReader.build().create();
- private static final GryoWriter DEFAULT_GRYO_WRITER = GryoWriter.build().create();
-
/**
- * Use Gryo to pipe the data from one graph to another graph. Uses all default settings for reader/writers.
- * Refer to {@link org.apache.tinkerpop.gremlin.structure.io.gryo.GryoReader} and {@link org.apache.tinkerpop.gremlin.structure.io.gryo.GryoWriter} for those settings. To use features like incremental
- * loading, construct the reader/writers manually and utilize
- * {@link #migrateGraph(org.apache.tinkerpop.gremlin.structure.Graph, org.apache.tinkerpop.gremlin.structure.Graph, GraphReader, GraphWriter)}
+ * Use Gryo to pipe the data from one graph to another graph. Uses readers and writers generated from each
+ * {@link Graph} via the {@link Graph#io(Io.Builder)} method.
*/
public static void migrateGraph(final Graph fromGraph, final Graph toGraph) throws IOException {
- migrateGraph(fromGraph, toGraph, DEFAULT_GRYO_READER, DEFAULT_GRYO_WRITER);
+ migrateGraph(fromGraph, toGraph, fromGraph.io(gryo()).reader().create(), toGraph.io(gryo()).writer().create());
}
/**
* Pipe the data from one graph to another graph. It is important that the reader and writer utilize the
* same format.
*
- * @param fromGraph the graph to take data from
- * @param toGraph the graph to take data to
- * @param reader reads from the graph written by the writer
- * @param writer writes the graph to be read by the reader
- * @throws java.io.IOException thrown if there is an error in steam between the two graphs
+ * @param fromGraph the graph to take data from.
+ * @param toGraph the graph to take data to.
+ * @param reader reads from the graph written by the writer.
+ * @param writer writes the graph to be read by the reader.
+ * @throws java.io.IOException thrown if there is an error in steam between the two graphs.
*/
public static void migrateGraph(final Graph fromGraph, final Graph toGraph,
final GraphReader reader, final GraphWriter writer) throws IOException {
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/ff9d518c/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/GraphReader.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/GraphReader.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/GraphReader.java
index dc4a1d7..a4c7a80 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/GraphReader.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/GraphReader.java
@@ -139,7 +139,7 @@ public interface GraphReader {
*
* @param inputStream a stream containing at least one {@link Property} as written by the accompanying
* {@link GraphWriter#writeProperty(OutputStream, Property)} method.
- * @param propertyAttachMethod a function that creates re-attaches a {@link Property} to a {@link Host} object .
+ * @param propertyAttachMethod a function that creates re-attaches a {@link Property} to a {@link Host} object.
* @return the value returned by the attach method.
*/
public Property readProperty(final InputStream inputStream,
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/ff9d518c/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/GraphWriter.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/GraphWriter.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/GraphWriter.java
index 8ae4b4e..946cdb8 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/GraphWriter.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/GraphWriter.java
@@ -34,7 +34,7 @@ import java.util.Iterator;
/**
* Functions for writing a graph and its elements to a serialized format. Implementations of this class do not need
* to explicitly guarantee that an object written with one method must have its format equivalent to another. In other
- * words calling {@link #writeVertex(OutputStream, Vertex)}} need not have equivalent output to
+ * words, calling {@link #writeVertex(OutputStream, Vertex)}} need not have equivalent output to
* {@link #writeObject(OutputStream, Object)}. Nor does the representation of an {@link Edge} within the output of
* {@link #writeVertex(OutputStream, Vertex, Direction)} need to match the representation of that same
* {@link Edge} when provided to {@link #writeEdge(OutputStream, Edge)}. In other words, implementations are free
@@ -80,8 +80,8 @@ public interface GraphWriter {
* defined by the requested direction.
*
* @param outputStream the stream to write to.
- * @param vertexIterator A traversal that returns a list of vertices.
- * @param direction the direction of edges to write or null if no edges are to be written.
+ * @param vertexIterator a traversal that returns a list of vertices.
+ * @param direction the direction of edges to write or null if no edges are to be written.
*/
public default void writeVertices(final OutputStream outputStream, final Iterator<Vertex> vertexIterator, final Direction direction) throws IOException {
while (vertexIterator.hasNext()) {
@@ -93,7 +93,7 @@ public interface GraphWriter {
* Write a vertex to a stream without writing its edges.
*
* @param outputStream the stream to write to.
- * @param vertexIterator A iterator that returns a list of vertices.
+ * @param vertexIterator a iterator that returns a list of vertices.
*/
public default void writeVertices(final OutputStream outputStream, final Iterator<Vertex> vertexIterator) throws IOException {
while (vertexIterator.hasNext()) {
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/ff9d518c/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/IoCore.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/IoCore.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/IoCore.java
index e3a7680..993124e 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/IoCore.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/IoCore.java
@@ -28,7 +28,7 @@ import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoIo;
*
* @author Stephen Mallette (http://stephen.genoprime.com)
*/
-public class IoCore {
+public final class IoCore {
public static Io.Builder<GraphMLIo> graphml() {
return GraphMLIo.build();
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/ff9d518c/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoClassResolver.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoClassResolver.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoClassResolver.java
index 3676754..268da9c 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoClassResolver.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoClassResolver.java
@@ -48,7 +48,7 @@ import static org.apache.tinkerpop.shaded.kryo.util.Util.getWrapperClass;
/**
* This mapper implementation of the {@code ClassResolver} helps ensure that all Vertex and Edge concrete classes
* get properly serialized and deserialized by stripping them of their concrete class name so that they are treated
- * generically.
+ * generically. See the {@link #getRegistration(Class)} method for the core of this logic.
*
* @author Stephen Mallette (http://stephen.genoprime.com)
*/
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/ff9d518c/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoIo.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoIo.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoIo.java
index 42986ac..01ba531 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoIo.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoIo.java
@@ -29,6 +29,9 @@ import java.io.InputStream;
import java.io.OutputStream;
/**
+ * Constructs Gryo IO implementations given a {@link Graph} and {@link IoRegistry}. Implementers of the {@link Graph}
+ * interfaces should see the {@link GryoMapper} for information on the expectations for the {@link IoRegistry}.
+ *
* @author Stephen Mallette (http://stephen.genoprime.com)
*/
public class GryoIo implements Io<GryoReader.Builder, GryoWriter.Builder, GryoMapper.Builder> {
@@ -41,21 +44,32 @@ public class GryoIo implements Io<GryoReader.Builder, GryoWriter.Builder, GryoMa
this.graph = graph;
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public GryoReader.Builder reader() {
return GryoReader.build().mapper(mapper().create());
}
-
+ /**
+ * {@inheritDoc}
+ */
@Override
public GryoWriter.Builder writer() {
return GryoWriter.build().mapper(mapper().create());
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public GryoMapper.Builder mapper() {
return GryoMapper.build().addRegistry(this.registry);
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public void writeGraph(final String file) throws IOException {
try (final OutputStream out = new FileOutputStream(file)) {
@@ -63,6 +77,9 @@ public class GryoIo implements Io<GryoReader.Builder, GryoWriter.Builder, GryoMa
}
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public void readGraph(final String file) throws IOException {
try (final InputStream in = new FileInputStream(file)) {
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/ff9d518c/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoMapper.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoMapper.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoMapper.java
index 2f5453c..da8caff 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoMapper.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoMapper.java
@@ -34,6 +34,7 @@ import org.apache.tinkerpop.gremlin.process.traversal.util.StandardTraversalMetr
import org.apache.tinkerpop.gremlin.structure.Contains;
import org.apache.tinkerpop.gremlin.structure.Direction;
import org.apache.tinkerpop.gremlin.structure.Edge;
+import org.apache.tinkerpop.gremlin.structure.Graph;
import org.apache.tinkerpop.gremlin.structure.Property;
import org.apache.tinkerpop.gremlin.structure.T;
import org.apache.tinkerpop.gremlin.structure.Vertex;
@@ -88,7 +89,19 @@ import java.util.function.Function;
import java.util.stream.Collectors;
/**
- * A {@link Mapper} implementation for Kryo.
+ * A {@link Mapper} implementation for Kryo. This implementation requires that all classes to be serialized by
+ * Kryo are registered to it.
+ * <br/>
+ * {@link Graph} implementations providing an {@link IoRegistry} should register their custom classs and/or
+ * serializers in one of three ways:
+ * <ol>
+ * <li>Register just the custom class with a {@code null} {@link Serializer} implementation</li>
+ * <li>Register the custom class with a {@link Serializer} implementation</li>
+ * <li>
+ * Register the custom class with a {@code Function<Kryo, Serializer>} for those cases where the
+ * {@link Serializer} requires the {@link Kryo} instance to get constructed.
+ * </li>
+ * </ol>
*
* @author Stephen Mallette (http://stephen.genoprime.com)
*/
@@ -233,6 +246,9 @@ public final class GryoMapper implements Mapper<Kryo> {
private Builder() {
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public Builder addRegistry(final IoRegistry registry) {
this.registry = registry;
@@ -266,7 +282,11 @@ public final class GryoMapper implements Mapper<Kryo> {
return this;
}
+ /**
+ * Creates a {@code GryoMapper}.
+ */
public GryoMapper create() {
+ // consult the registry if provided and inject registry entries as custom classes.
if (registry != null) {
final List<Pair<Class, Object>> serializers = registry.find(GryoIo.class);
serializers.forEach(p -> {
@@ -277,7 +297,11 @@ public final class GryoMapper implements Mapper<Kryo> {
else if (p.getValue1() instanceof Function)
addCustom(p.getValue0(), (Function<Kryo, Serializer>) p.getValue1());
else
- throw new RuntimeException("Invalid serializer"); // todo: cleanup exception handling
+ throw new IllegalStateException(String.format(
+ "Unexpected value provided by the %s for %s - expects [null, %s implementation or Function<%s, %s>]",
+ IoRegistry.class.getSimpleName(), p.getValue0().getClass().getSimpleName(),
+ Serializer.class.getName(), Kryo.class.getSimpleName(),
+ Serializer.class.getSimpleName()));
});
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/ff9d518c/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoReader.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoReader.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoReader.java
index 5ca61bf..dd3c995 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoReader.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoReader.java
@@ -20,7 +20,9 @@ package org.apache.tinkerpop.gremlin.structure.io.gryo;
import org.apache.tinkerpop.gremlin.structure.Property;
import org.apache.tinkerpop.gremlin.structure.VertexProperty;
+import org.apache.tinkerpop.gremlin.structure.io.GraphWriter;
import org.apache.tinkerpop.gremlin.structure.util.Attachable;
+import org.apache.tinkerpop.gremlin.structure.util.Host;
import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedProperty;
import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertexProperty;
import org.apache.tinkerpop.gremlin.structure.util.star.StarGraph;
@@ -38,6 +40,7 @@ import org.apache.tinkerpop.shaded.kryo.io.Input;
import java.io.IOException;
import java.io.InputStream;
+import java.io.OutputStream;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Iterator;
@@ -65,6 +68,15 @@ public class GryoReader implements GraphReader {
this.batchSize = batchSize;
}
+ /**
+ * Read data into a {@link Graph} from output generated by any of the {@link GryoWriter} {@code writeVertex} or
+ * {@code writeVertices} methods or by {@link GryoWriter#writeGraph(OutputStream, Graph)}.
+ *
+ * @param inputStream a stream containing an entire graph of vertices and edges as defined by the accompanying
+ * {@link GraphWriter#writeGraph(OutputStream, Graph)}.
+ * @param graphToWriteTo the graph to write to when reading from the stream.
+ * @throws IOException
+ */
@Override
public void readGraph(final InputStream inputStream, final Graph graphToWriteTo) throws IOException {
// dual pass - create all vertices and store to cache the ids. then create edges. as long as we don't
@@ -87,6 +99,17 @@ public class GryoReader implements GraphReader {
if (supportsTx) graphToWriteTo.tx().commit();
}
+ /**
+ * Read {@link Vertex} objects from output generated by any of the {@link GryoWriter} {@code writeVertex} or
+ * {@code writeVertices} methods or by {@link GryoWriter#writeGraph(OutputStream, Graph)}.
+ *
+ * @param inputStream a stream containing at least one {@link Vertex} as defined by the accompanying
+ * {@link GraphWriter#writeVertices(OutputStream, Iterator, Direction)} or
+ * {@link GraphWriter#writeVertices(OutputStream, Iterator)} methods.
+ * @param vertexAttachMethod a function that creates re-attaches a {@link Vertex} to a {@link Host} object.
+ * @param edgeAttachMethod a function that creates re-attaches a {@link Edge} to a {@link Host} object.
+ * @param attachEdgesOfThisDirection only edges of this direction are passed to the {@code edgeMaker}.
+ */
@Override
public Iterator<Vertex> readVertices(final InputStream inputStream,
final Function<Attachable<Vertex>, Vertex> vertexAttachMethod,
@@ -95,11 +118,29 @@ public class GryoReader implements GraphReader {
return new VertexInputIterator(new Input(inputStream), vertexAttachMethod, attachEdgesOfThisDirection, edgeAttachMethod);
}
+ /**
+ * Read a {@link Vertex} from output generated by any of the {@link GryoWriter} {@code writeVertex} or
+ * {@code writeVertices} methods or by {@link GryoWriter#writeGraph(OutputStream, Graph)}.
+ *
+ * @param inputStream a stream containing at least a single vertex as defined by the accompanying
+ * {@link GraphWriter#writeVertex(OutputStream, Vertex)}.
+ * @param vertexAttachMethod a function that creates re-attaches a {@link Vertex} to a {@link Host} object.
+ */
@Override
public Vertex readVertex(final InputStream inputStream, final Function<Attachable<Vertex>, Vertex> vertexAttachMethod) throws IOException {
return readVertex(inputStream, vertexAttachMethod, null, null);
}
+ /**
+ * Read a {@link Vertex} from output generated by any of the {@link GryoWriter} {@code writeVertex} or
+ * {@code writeVertices} methods or by {@link GryoWriter#writeGraph(OutputStream, Graph)}.
+ *
+ * @param inputStream a stream containing at least one {@link Vertex} as defined by the accompanying
+ * {@link GraphWriter#writeVertices(OutputStream, Iterator, Direction)} method.
+ * @param vertexAttachMethod a function that creates re-attaches a {@link Vertex} to a {@link Host} object.
+ * @param edgeAttachMethod a function that creates re-attaches a {@link Edge} to a {@link Host} object.
+ * @param attachEdgesOfThisDirection only edges of this direction are passed to the {@code edgeMaker}.
+ */
@Override
public Vertex readVertex(final InputStream inputStream,
final Function<Attachable<Vertex>, Vertex> vertexAttachMethod,
@@ -109,6 +150,14 @@ public class GryoReader implements GraphReader {
return readVertexInternal(vertexAttachMethod, edgeAttachMethod, attachEdgesOfThisDirection, input);
}
+ /**
+ * Read an {@link Edge} from output generated by {@link GryoWriter#writeEdge(OutputStream, Edge)} or via
+ * an {@link Edge} passed to {@link GryoWriter#writeObject(OutputStream, Object)}.
+ *
+ * @param inputStream a stream containing at least one {@link Edge} as defined by the accompanying
+ * {@link GraphWriter#writeEdge(OutputStream, Edge)} method.
+ * @param edgeAttachMethod a function that creates re-attaches a {@link Edge} to a {@link Host} object.
+ */
@Override
public Edge readEdge(final InputStream inputStream, final Function<Attachable<Edge>, Edge> edgeAttachMethod) throws IOException {
final Input input = new Input(inputStream);
@@ -117,6 +166,16 @@ public class GryoReader implements GraphReader {
return edgeAttachMethod.apply(attachable);
}
+ /**
+ * Read a {@link VertexProperty} from output generated by
+ * {@link GryoWriter#writeVertexProperty(OutputStream, VertexProperty)} or via an {@link VertexProperty} passed
+ * to {@link GryoWriter#writeObject(OutputStream, Object)}.
+ *
+ * @param inputStream a stream containing at least one {@link VertexProperty} as written by the accompanying
+ * {@link GraphWriter#writeVertexProperty(OutputStream, VertexProperty)} method.
+ * @param vertexPropertyAttachMethod a function that creates re-attaches a {@link VertexProperty} to a
+ * {@link Host} object.
+ */
@Override
public VertexProperty readVertexProperty (final InputStream inputStream,
final Function<Attachable<VertexProperty>, VertexProperty> vertexPropertyAttachMethod) throws IOException {
@@ -126,6 +185,14 @@ public class GryoReader implements GraphReader {
return vertexPropertyAttachMethod.apply(attachable);
}
+ /**
+ * Read a {@link Property} from output generated by {@link GryoWriter#writeProperty(OutputStream, Property)} or
+ * via an {@link Property} passed to {@link GryoWriter#writeObject(OutputStream, Object)}.
+ *
+ * @param inputStream a stream containing at least one {@link Property} as written by the accompanying
+ * {@link GraphWriter#writeProperty(OutputStream, Property)} method.
+ * @param propertyAttachMethod a function that creates re-attaches a {@link Property} to a {@link Host} object.
+ */
@Override
public Property readProperty(final InputStream inputStream,
final Function<Attachable<Property>, Property> propertyAttachMethod) throws IOException {
@@ -135,6 +202,9 @@ public class GryoReader implements GraphReader {
return propertyAttachMethod.apply(attachable);
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public <C> C readObject(final InputStream inputStream, final Class<? extends C> clazz) throws IOException{
return clazz.cast(this.kryo.readClassAndObject(new Input(inputStream)));
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/ff9d518c/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoSerializers.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoSerializers.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoSerializers.java
index 59bc75e..fd63426 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoSerializers.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoSerializers.java
@@ -43,10 +43,9 @@ import org.apache.tinkerpop.shaded.kryo.io.Output;
* @author Marko A. Rodriguez (http://markorodriguez.com)
*/
class GryoSerializers {
+
/**
* Serializes any {@link Edge} implementation encountered to a {@link DetachedEdge}.
- *
- * @author Stephen Mallette (http://stephen.genoprime.com)
*/
static class EdgeSerializer extends Serializer<Edge> {
@Override
@@ -63,8 +62,6 @@ class GryoSerializers {
/**
* Serializes any {@link Vertex} implementation encountered to an {@link DetachedVertex}.
- *
- * @author Stephen Mallette (http://stephen.genoprime.com)
*/
static class VertexSerializer extends Serializer<Vertex> {
public VertexSerializer() {
@@ -83,8 +80,6 @@ class GryoSerializers {
/**
* Serializes any {@link Property} implementation encountered to an {@link DetachedProperty}.
- *
- * @author Stephen Mallette (http://stephen.genoprime.com)
*/
static class PropertySerializer extends Serializer<Property> {
public PropertySerializer() {
@@ -103,8 +98,6 @@ class GryoSerializers {
/**
* Serializes any {@link VertexProperty} implementation encountered to an {@link DetachedVertexProperty}.
- *
- * @author Stephen Mallette (http://stephen.genoprime.com)
*/
static class VertexPropertySerializer extends Serializer<VertexProperty> {
public VertexPropertySerializer() {
@@ -123,8 +116,6 @@ class GryoSerializers {
/**
* Serializes any {@link Path} implementation encountered to an {@link DetachedPath}.
- *
- * @author Marko A. Rodriguez (http://markorodriguez.com)
*/
static class PathSerializer extends Serializer<Path> {
public PathSerializer() {
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/ff9d518c/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoWriter.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoWriter.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoWriter.java
index af7848b..3435718 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoWriter.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoWriter.java
@@ -39,7 +39,7 @@ import java.util.Iterator;
* The {@link GraphWriter} for the Gremlin Structure serialization format based on Kryo. The format is meant to be
* non-lossy in terms of Gremlin Structure to Gremlin Structure migrations (assuming both structure implementations
* support the same graph features).
- * <br/>
+ * <p/>
* This implementation is not thread-safe. Have one {@code GraphWriter} instance per thread.
*
* @author Stephen Mallette (http://stephen.genoprime.com)
@@ -51,11 +51,18 @@ public class GryoWriter implements GraphWriter {
this.kryo = gryoMapper.createMapper();
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public void writeGraph(final OutputStream outputStream, final Graph g) throws IOException {
writeVertices(outputStream, g.vertices(), Direction.BOTH);
}
+ /**
+ * {@inheritDoc}
+ */
+ @Override
public void writeVertices(final OutputStream outputStream, final Iterator<Vertex> vertexIterator, final Direction direction) throws IOException {
kryo.getRegistration(StarGraph.class).setSerializer(StarGraphGryoSerializer.with(direction));
final Output output = new Output(outputStream);
@@ -66,10 +73,17 @@ public class GryoWriter implements GraphWriter {
kryo.getRegistration(StarGraph.class).setSerializer(StarGraphGryoSerializer.with(Direction.BOTH));
}
+ /**
+ * {@inheritDoc}
+ */
+ @Override
public void writeVertices(final OutputStream outputStream, final Iterator<Vertex> vertexIterator) throws IOException {
writeVertices(outputStream, vertexIterator, null);
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public void writeVertex(final OutputStream outputStream, final Vertex v, final Direction direction) throws IOException {
kryo.getRegistration(StarGraph.class).setSerializer(StarGraphGryoSerializer.with(direction));
@@ -79,11 +93,17 @@ public class GryoWriter implements GraphWriter {
kryo.getRegistration(StarGraph.class).setSerializer(StarGraphGryoSerializer.with(Direction.BOTH));
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public void writeVertex(final OutputStream outputStream, final Vertex v) throws IOException {
writeVertex(outputStream, v, null);
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public void writeEdge(final OutputStream outputStream, final Edge e) throws IOException {
final Output output = new Output(outputStream);
@@ -92,6 +112,9 @@ public class GryoWriter implements GraphWriter {
output.flush();
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public void writeVertexProperty(final OutputStream outputStream, final VertexProperty vp) throws IOException {
final Output output = new Output(outputStream);
@@ -100,6 +123,9 @@ public class GryoWriter implements GraphWriter {
output.flush();
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public void writeProperty(final OutputStream outputStream, final Property p) throws IOException {
final Output output = new Output(outputStream);
@@ -108,6 +134,9 @@ public class GryoWriter implements GraphWriter {
output.flush();
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public void writeObject(final OutputStream outputStream, final Object object) {
final Output output = new Output(outputStream);
[14/50] [abbrv] incubator-tinkerpop git commit: Get rid of some
object creation in serialization of a ResponseMessage.
Posted by sp...@apache.org.
Get rid of some object creation in serialization of a ResponseMessage.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/73221e62
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/73221e62
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/73221e62
Branch: refs/heads/variables
Commit: 73221e62b19f89034b4d6341bddc61b3a01ef9e2
Parents: 8646e9e
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Apr 29 12:27:25 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Apr 29 12:27:25 2015 -0400
----------------------------------------------------------------------
.../ser/AbstractJsonMessageSerializerV1d0.java | 74 ++++++++++++++------
.../ser/JsonMessageSerializerGremlinV1d0.java | 2 +-
.../driver/ser/JsonMessageSerializerV1d0.java | 2 +-
3 files changed, 54 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/73221e62/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/AbstractJsonMessageSerializerV1d0.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/AbstractJsonMessageSerializerV1d0.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/AbstractJsonMessageSerializerV1d0.java
index 71f7f4c..9f3fe23 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/AbstractJsonMessageSerializerV1d0.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/AbstractJsonMessageSerializerV1d0.java
@@ -20,9 +20,11 @@ package org.apache.tinkerpop.gremlin.driver.ser;
import com.fasterxml.jackson.core.JsonGenerationException;
import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
import com.fasterxml.jackson.databind.module.SimpleModule;
import com.fasterxml.jackson.databind.ser.std.StdSerializer;
import org.apache.tinkerpop.gremlin.driver.MessageSerializer;
@@ -36,6 +38,8 @@ import groovy.json.JsonBuilder;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.ByteBufAllocator;
import io.netty.util.ReferenceCountUtil;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONTokens;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -100,7 +104,7 @@ public abstract class AbstractJsonMessageSerializerV1d0 implements MessageSerial
public ByteBuf serializeResponseAsBinary(final ResponseMessage responseMessage, final ByteBufAllocator allocator) throws SerializationException {
ByteBuf encodedMessage = null;
try {
- final byte[] payload = mapper.writeValueAsBytes(createResponseMessageMap(responseMessage));
+ final byte[] payload = mapper.writeValueAsBytes(responseMessage);
encodedMessage = allocator.buffer(payload.length);
encodedMessage.writeBytes(payload);
@@ -166,31 +170,11 @@ public abstract class AbstractJsonMessageSerializerV1d0 implements MessageSerial
}
}
- /**
- * Construct a {@link Map} from the {@link ResponseMessage} for serialization purposes. By doing it this way,
- * type embedding does not become overly verbose in the core structure of the message.
- */
- protected static Map<String, Object> createResponseMessageMap(final ResponseMessage responseMessage) {
- final Map<String, Object> result = new HashMap<>();
- result.put(SerTokens.TOKEN_DATA, responseMessage.getResult().getData());
- result.put(SerTokens.TOKEN_META, responseMessage.getResult().getMeta());
-
- final Map<String, Object> status = new HashMap<>();
- status.put(SerTokens.TOKEN_MESSAGE, responseMessage.getStatus().getMessage());
- status.put(SerTokens.TOKEN_CODE, responseMessage.getStatus().getCode().getValue());
- status.put(SerTokens.TOKEN_ATTRIBUTES, responseMessage.getStatus().getAttributes());
-
- final Map<String, Object> message = new HashMap<>();
- message.put(SerTokens.TOKEN_STATUS, status);
- message.put(SerTokens.TOKEN_RESULT, result);
- message.put(SerTokens.TOKEN_REQUEST, responseMessage.getRequestId() != null ? responseMessage.getRequestId() : null);
- return message;
- }
-
public static class GremlinServerModule extends SimpleModule {
public GremlinServerModule() {
super("graphson-gremlin-server");
addSerializer(JsonBuilder.class, new JsonBuilderJacksonSerializer());
+ addSerializer(ResponseMessage.class, new ResponseMessageSerializer());
}
}
@@ -209,4 +193,50 @@ public abstract class AbstractJsonMessageSerializerV1d0 implements MessageSerial
jsonGenerator.writeRaw(",");
}
}
+
+ public static class ResponseMessageSerializer extends StdSerializer<ResponseMessage> {
+ public ResponseMessageSerializer() {
+ super(ResponseMessage.class);
+ }
+
+ @Override
+ public void serialize(final ResponseMessage responseMessage, final JsonGenerator jsonGenerator,
+ final SerializerProvider serializerProvider) throws IOException, JsonGenerationException {
+ ser(responseMessage, jsonGenerator, serializerProvider, null);
+ }
+
+ @Override
+ public void serializeWithType(final ResponseMessage responseMessage, final JsonGenerator jsonGenerator,
+ final SerializerProvider serializerProvider,
+ final TypeSerializer typeSerializer) throws IOException, JsonProcessingException {
+ ser(responseMessage, jsonGenerator, serializerProvider, typeSerializer);
+ }
+
+ public void ser(final ResponseMessage responseMessage, final JsonGenerator jsonGenerator,
+ final SerializerProvider serializerProvider,
+ final TypeSerializer typeSerializer) throws IOException, JsonProcessingException {
+ jsonGenerator.writeStartObject();
+ if (typeSerializer != null) jsonGenerator.writeStringField(GraphSONTokens.CLASS, HashMap.class.getName());
+
+ jsonGenerator.writeStringField(SerTokens.TOKEN_REQUEST, responseMessage.getRequestId() != null ? responseMessage.getRequestId().toString() : null);
+ jsonGenerator.writeObjectFieldStart(SerTokens.TOKEN_STATUS);
+
+ if (typeSerializer != null) jsonGenerator.writeStringField(GraphSONTokens.CLASS, HashMap.class.getName());
+ jsonGenerator.writeStringField(SerTokens.TOKEN_MESSAGE, responseMessage.getStatus().getMessage());
+ jsonGenerator.writeNumberField(SerTokens.TOKEN_CODE, responseMessage.getStatus().getCode().getValue());
+ jsonGenerator.writeObjectField(SerTokens.TOKEN_ATTRIBUTES, responseMessage.getStatus().getAttributes());
+ jsonGenerator.writeEndObject();
+
+ jsonGenerator.writeObjectFieldStart(SerTokens.TOKEN_RESULT);
+ if (typeSerializer != null) jsonGenerator.writeStringField(GraphSONTokens.CLASS, HashMap.class.getName());
+ if (null == responseMessage.getResult().getData())
+ jsonGenerator.writeNullField(SerTokens.TOKEN_DATA);
+ else
+ GraphSONUtil.writeWithType(SerTokens.TOKEN_DATA, responseMessage.getResult().getData(), jsonGenerator, serializerProvider, typeSerializer);
+ jsonGenerator.writeObjectField(SerTokens.TOKEN_META, responseMessage.getResult().getMeta());
+ jsonGenerator.writeEndObject();
+
+ jsonGenerator.writeEndObject();
+ }
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/73221e62/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/JsonMessageSerializerGremlinV1d0.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/JsonMessageSerializerGremlinV1d0.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/JsonMessageSerializerGremlinV1d0.java
index 7c928e7..e11a70b 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/JsonMessageSerializerGremlinV1d0.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/JsonMessageSerializerGremlinV1d0.java
@@ -59,7 +59,7 @@ public class JsonMessageSerializerGremlinV1d0 extends AbstractJsonMessageSeriali
}
@Override
- GraphSONMapper.Builder configureBuilder(GraphSONMapper.Builder builder) {
+ GraphSONMapper.Builder configureBuilder(final GraphSONMapper.Builder builder) {
return builder.addCustomModule(new JsonMessageSerializerV1d0.GremlinServerModule())
.embedTypes(true);
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/73221e62/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/JsonMessageSerializerV1d0.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/JsonMessageSerializerV1d0.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/JsonMessageSerializerV1d0.java
index 21ef3cd..135e863 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/JsonMessageSerializerV1d0.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/JsonMessageSerializerV1d0.java
@@ -94,7 +94,7 @@ public class JsonMessageSerializerV1d0 extends AbstractJsonMessageSerializerV1d0
@Override
public String serializeResponseAsString(final ResponseMessage responseMessage) throws SerializationException {
try {
- return mapper.writeValueAsString(createResponseMessageMap(responseMessage));
+ return mapper.writeValueAsString(responseMessage);
} catch (Exception ex) {
logger.warn("Response [{}] could not be serialized by {}.", responseMessage.toString(), AbstractJsonMessageSerializerV1d0.class.getName());
throw new RuntimeException("Error during serialization.", ex);
[15/50] [abbrv] incubator-tinkerpop git commit: Got normalization
back into GraphSON serialization.
Posted by sp...@apache.org.
Got normalization back into GraphSON serialization.
This capability was lost momentarily when the intermediary conversion to HashMaps prior to json serialization was in place. With that gone, there needed to be some checks for the normalization flag with sorting behavior as needed.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/3b361cc3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/3b361cc3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/3b361cc3
Branch: refs/heads/variables
Commit: 3b361cc3398be909c98cba783ea843584261ee5f
Parents: 73221e6
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Apr 29 13:47:38 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Apr 29 13:47:38 2015 -0400
----------------------------------------------------------------------
data/tinkerpop-classic-normalized.json | 6 ---
data/tinkerpop-modern-normalized.json | 6 ---
.../structure/io/graphson/GraphSONModule.java | 11 +++--
.../io/graphson/GraphSONSerializers.java | 51 +++++++++++++-------
.../util/star/StarGraphGraphSONSerializer.java | 49 ++++++++++++++-----
.../gremlin/util/iterator/IteratorUtils.java | 8 +++
.../graphson/tinkerpop-classic-normalized.json | 12 ++---
.../graphson/tinkerpop-modern-normalized.json | 12 ++---
8 files changed, 96 insertions(+), 59 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/3b361cc3/data/tinkerpop-classic-normalized.json
----------------------------------------------------------------------
diff --git a/data/tinkerpop-classic-normalized.json b/data/tinkerpop-classic-normalized.json
deleted file mode 100644
index 5ccfe05..0000000
--- a/data/tinkerpop-classic-normalized.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{"id":1,"label":"vertex","outE":{"created":[{"id":9,"inV":3,"properties":{"weight":0.4}}],"knows":[{"id":7,"inV":2,"properties":{"weight":0.5}},{"id":8,"inV":4,"properties":{"weight":1.0}}]},"properties":{"name":[{"id":0,"value":"marko"}],"age":[{"id":2,"value":29}]}}
-{"id":2,"label":"vertex","inE":{"knows":[{"id":7,"outV":1,"properties":{"weight":0.5}}]},"properties":{"name":[{"id":3,"value":"vadas"}],"age":[{"id":4,"value":27}]}}
-{"id":3,"label":"vertex","inE":{"created":[{"id":9,"outV":1,"properties":{"weight":0.4}},{"id":11,"outV":4,"properties":{"weight":0.4}},{"id":12,"outV":6,"properties":{"weight":0.2}}]},"properties":{"name":[{"id":5,"value":"lop"}],"lang":[{"id":6,"value":"java"}]}}
-{"id":4,"label":"vertex","inE":{"knows":[{"id":8,"outV":1,"properties":{"weight":1.0}}]},"outE":{"created":[{"id":10,"inV":5,"properties":{"weight":1.0}},{"id":11,"inV":3,"properties":{"weight":0.4}}]},"properties":{"name":[{"id":7,"value":"josh"}],"age":[{"id":8,"value":32}]}}
-{"id":5,"label":"vertex","inE":{"created":[{"id":10,"outV":4,"properties":{"weight":1.0}}]},"properties":{"name":[{"id":9,"value":"ripple"}],"lang":[{"id":10,"value":"java"}]}}
-{"id":6,"label":"vertex","outE":{"created":[{"id":12,"inV":3,"properties":{"weight":0.2}}]},"properties":{"name":[{"id":11,"value":"peter"}],"age":[{"id":12,"value":35}]}}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/3b361cc3/data/tinkerpop-modern-normalized.json
----------------------------------------------------------------------
diff --git a/data/tinkerpop-modern-normalized.json b/data/tinkerpop-modern-normalized.json
deleted file mode 100644
index 18c265d..0000000
--- a/data/tinkerpop-modern-normalized.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{"id":1,"label":"person","outE":{"created":[{"id":9,"inV":3,"properties":{"weight":0.4}}],"knows":[{"id":7,"inV":2,"properties":{"weight":0.5}},{"id":8,"inV":4,"properties":{"weight":1.0}}]},"properties":{"name":[{"id":0,"value":"marko"}],"age":[{"id":1,"value":29}]}}
-{"id":2,"label":"person","inE":{"knows":[{"id":7,"outV":1,"properties":{"weight":0.5}}]},"properties":{"name":[{"id":2,"value":"vadas"}],"age":[{"id":3,"value":27}]}}
-{"id":3,"label":"software","inE":{"created":[{"id":9,"outV":1,"properties":{"weight":0.4}},{"id":11,"outV":4,"properties":{"weight":0.4}},{"id":12,"outV":6,"properties":{"weight":0.2}}]},"properties":{"name":[{"id":4,"value":"lop"}],"lang":[{"id":5,"value":"java"}]}}
-{"id":4,"label":"person","inE":{"knows":[{"id":8,"outV":1,"properties":{"weight":1.0}}]},"outE":{"created":[{"id":10,"inV":5,"properties":{"weight":1.0}},{"id":11,"inV":3,"properties":{"weight":0.4}}]},"properties":{"name":[{"id":6,"value":"josh"}],"age":[{"id":7,"value":32}]}}
-{"id":5,"label":"software","inE":{"created":[{"id":10,"outV":4,"properties":{"weight":1.0}}]},"properties":{"name":[{"id":8,"value":"ripple"}],"lang":[{"id":9,"value":"java"}]}}
-{"id":6,"label":"person","outE":{"created":[{"id":12,"inV":3,"properties":{"weight":0.2}}]},"properties":{"name":[{"id":10,"value":"peter"}],"age":[{"id":11,"value":35}]}}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/3b361cc3/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONModule.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONModule.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONModule.java
index 0a7f0f8..39fe40e 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONModule.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONModule.java
@@ -27,20 +27,21 @@ import org.apache.tinkerpop.gremlin.structure.Vertex;
import org.apache.tinkerpop.gremlin.structure.VertexProperty;
import org.apache.tinkerpop.gremlin.structure.util.star.StarGraphGraphSONSerializer;
-
/**
+ * The set of serializers that handle the core graph interfaces.
+ *
* @author Stephen Mallette (http://stephen.genoprime.com)
*/
public class GraphSONModule extends SimpleModule {
public GraphSONModule(final boolean normalize) {
super("graphson");
- addSerializer(Edge.class, new GraphSONSerializers.EdgeJacksonSerializer());
- addSerializer(Vertex.class, new GraphSONSerializers.VertexJacksonSerializer());
- addSerializer(VertexProperty.class, new GraphSONSerializers.VertexPropertyJacksonSerializer());
+ addSerializer(Edge.class, new GraphSONSerializers.EdgeJacksonSerializer(normalize));
+ addSerializer(Vertex.class, new GraphSONSerializers.VertexJacksonSerializer(normalize));
+ addSerializer(VertexProperty.class, new GraphSONSerializers.VertexPropertyJacksonSerializer(normalize));
addSerializer(Property.class, new GraphSONSerializers.PropertyJacksonSerializer());
addSerializer(TraversalMetrics.class, new GraphSONSerializers.TraversalMetricsJacksonSerializer());
addSerializer(Path.class, new GraphSONSerializers.PathJacksonSerializer());
- addSerializer(StarGraphGraphSONSerializer.DirectionalStarGraph.class, new StarGraphGraphSONSerializer());
+ addSerializer(StarGraphGraphSONSerializer.DirectionalStarGraph.class, new StarGraphGraphSONSerializer(normalize));
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/3b361cc3/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializers.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializers.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializers.java
index d19b30b..126e17f 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializers.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializers.java
@@ -33,7 +33,9 @@ import org.apache.tinkerpop.gremlin.structure.Element;
import org.apache.tinkerpop.gremlin.structure.Property;
import org.apache.tinkerpop.gremlin.structure.Vertex;
import org.apache.tinkerpop.gremlin.structure.VertexProperty;
+import org.apache.tinkerpop.gremlin.structure.util.Comparators;
import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertexProperty;
+import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
import java.io.IOException;
import java.util.ArrayList;
@@ -52,20 +54,23 @@ import java.util.concurrent.TimeUnit;
class GraphSONSerializers {
static class VertexPropertyJacksonSerializer extends StdSerializer<VertexProperty> {
- public VertexPropertyJacksonSerializer() {
+ private final boolean normalize;
+
+ public VertexPropertyJacksonSerializer(final boolean normalize) {
super(VertexProperty.class);
+ this.normalize = normalize;
}
@Override
public void serialize(final VertexProperty property, final JsonGenerator jsonGenerator, final SerializerProvider serializerProvider)
throws IOException {
- serializerVertexProperty(property, jsonGenerator, serializerProvider, null);
+ serializerVertexProperty(property, jsonGenerator, serializerProvider, null, normalize);
}
@Override
public void serializeWithType(final VertexProperty property, final JsonGenerator jsonGenerator,
final SerializerProvider serializerProvider, final TypeSerializer typeSerializer) throws IOException {
- serializerVertexProperty(property, jsonGenerator, serializerProvider, typeSerializer);
+ serializerVertexProperty(property, jsonGenerator, serializerProvider, typeSerializer, normalize);
}
}
@@ -99,8 +104,11 @@ class GraphSONSerializers {
static class EdgeJacksonSerializer extends StdSerializer<Edge> {
- public EdgeJacksonSerializer() {
+ private final boolean normalize;
+
+ public EdgeJacksonSerializer(final boolean normalize) {
super(Edge.class);
+ this.normalize = normalize;
}
@@ -115,7 +123,7 @@ class GraphSONSerializers {
ser(edge, jsonGenerator, serializerProvider, typeSerializer);
}
- private static void ser(final Edge edge, final JsonGenerator jsonGenerator,
+ private void ser(final Edge edge, final JsonGenerator jsonGenerator,
final SerializerProvider serializerProvider, final TypeSerializer typeSerializer) throws IOException {
jsonGenerator.writeStartObject();
if (typeSerializer != null) jsonGenerator.writeStringField(GraphSONTokens.CLASS, HashMap.class.getName());
@@ -131,10 +139,11 @@ class GraphSONSerializers {
jsonGenerator.writeEndObject();
}
- private static void writeProperties(final Edge edge, final JsonGenerator jsonGenerator,
+ private void writeProperties(final Edge edge, final JsonGenerator jsonGenerator,
final SerializerProvider serializerProvider,
final TypeSerializer typeSerializer) throws IOException {
- final Iterator<Property<Object>> elementProperties = edge.properties();
+ final Iterator<Property<Object>> elementProperties = normalize ?
+ IteratorUtils.list(edge.properties(), Comparators.PROPERTY_COMPARATOR).iterator() : edge.properties();
if (elementProperties.hasNext()) {
jsonGenerator.writeObjectFieldStart(GraphSONTokens.PROPERTIES);
if (typeSerializer != null) jsonGenerator.writeStringField(GraphSONTokens.CLASS, HashMap.class.getName());
@@ -150,8 +159,11 @@ class GraphSONSerializers {
static class VertexJacksonSerializer extends StdSerializer<Vertex> {
- public VertexJacksonSerializer() {
+ private final boolean normalize;
+
+ public VertexJacksonSerializer(final boolean normalize) {
super(Vertex.class);
+ this.normalize = normalize;
}
@Override
@@ -167,7 +179,7 @@ class GraphSONSerializers {
}
- private static void ser(final Vertex vertex, final JsonGenerator jsonGenerator,
+ private void ser(final Vertex vertex, final JsonGenerator jsonGenerator,
final SerializerProvider serializerProvider, final TypeSerializer typeSerializer)
throws IOException {
jsonGenerator.writeStartObject();
@@ -179,9 +191,10 @@ class GraphSONSerializers {
jsonGenerator.writeEndObject();
}
- private static void writeProperties(final Vertex vertex, final JsonGenerator jsonGenerator,
+ private void writeProperties(final Vertex vertex, final JsonGenerator jsonGenerator,
final SerializerProvider serializerProvider, final TypeSerializer typeSerializer) throws IOException {
- final Iterator<VertexProperty<Object>> vertexProperties = vertex.properties();
+ final Iterator<VertexProperty<Object>> vertexProperties = normalize ?
+ IteratorUtils.list(vertex.properties(), Comparators.PROPERTY_COMPARATOR).iterator() : vertex.properties();
if (vertexProperties.hasNext()) {
jsonGenerator.writeArrayFieldStart(GraphSONTokens.PROPERTIES);
if (typeSerializer != null) {
@@ -301,41 +314,43 @@ class GraphSONSerializers {
}
private static void serializerVertexProperty(final VertexProperty property, final JsonGenerator jsonGenerator,
- final SerializerProvider serializerProvider, final TypeSerializer typeSerializer) throws IOException {
+ final SerializerProvider serializerProvider,
+ final TypeSerializer typeSerializer, final boolean normalize) throws IOException {
jsonGenerator.writeStartObject();
if (typeSerializer != null) jsonGenerator.writeStringField(GraphSONTokens.CLASS, HashMap.class.getName());
GraphSONUtil.writeWithType(GraphSONTokens.ID, property.id(), jsonGenerator, serializerProvider, typeSerializer);
GraphSONUtil.writeWithType(GraphSONTokens.VALUE, property.value(), jsonGenerator, serializerProvider, typeSerializer);
jsonGenerator.writeStringField(GraphSONTokens.LABEL, property.label());
- tryWriteMetaProperties(property, jsonGenerator, serializerProvider, typeSerializer);
+ tryWriteMetaProperties(property, jsonGenerator, serializerProvider, typeSerializer, normalize);
jsonGenerator.writeEndObject();
}
private static void tryWriteMetaProperties(final VertexProperty property, final JsonGenerator jsonGenerator,
final SerializerProvider serializerProvider,
- final TypeSerializer typeSerializer) throws IOException {
+ final TypeSerializer typeSerializer, final boolean normalize) throws IOException {
// when "detached" you can't check features of the graph it detached from so it has to be
// treated differently from a regular VertexProperty implementation.
if (property instanceof DetachedVertexProperty) {
// only write meta properties key if they exist
if (property.properties().hasNext()) {
- writeMetaProperties(property, jsonGenerator, serializerProvider, typeSerializer);
+ writeMetaProperties(property, jsonGenerator, serializerProvider, typeSerializer, normalize);
}
} else {
// still attached - so we can check the features to see if it's worth even trying to write the
// meta properties key
if (property.graph().features().vertex().supportsMetaProperties() && property.properties().hasNext()) {
- writeMetaProperties(property, jsonGenerator, serializerProvider, typeSerializer);
+ writeMetaProperties(property, jsonGenerator, serializerProvider, typeSerializer, normalize);
}
}
}
private static void writeMetaProperties(final VertexProperty property, final JsonGenerator jsonGenerator,
final SerializerProvider serializerProvider,
- final TypeSerializer typeSerializer) throws IOException {
+ final TypeSerializer typeSerializer, final boolean normalize) throws IOException {
jsonGenerator.writeObjectFieldStart(GraphSONTokens.PROPERTIES);
if (typeSerializer != null) jsonGenerator.writeStringField(GraphSONTokens.CLASS, HashMap.class.getName());
- final Iterator<Property<Object>> metaProperties = property.properties();
+ final Iterator<Property<Object>> metaProperties = normalize ?
+ IteratorUtils.list(( Iterator<Property<Object>>) property.properties(), Comparators.PROPERTY_COMPARATOR).iterator() : property.properties();
while (metaProperties.hasNext()) {
final Property<Object> metaProperty = metaProperties.next();
GraphSONUtil.writeWithType(metaProperty.key(), metaProperty.value(), jsonGenerator, serializerProvider, typeSerializer);
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/3b361cc3/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/star/StarGraphGraphSONSerializer.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/star/StarGraphGraphSONSerializer.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/star/StarGraphGraphSONSerializer.java
index e2235d6..a3916c8 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/star/StarGraphGraphSONSerializer.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/star/StarGraphGraphSONSerializer.java
@@ -33,21 +33,29 @@ import org.apache.tinkerpop.gremlin.structure.VertexProperty;
import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONTokens;
import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONUtil;
import org.apache.tinkerpop.gremlin.structure.util.Attachable;
+import org.apache.tinkerpop.gremlin.structure.util.Comparators;
+import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
import java.io.IOException;
import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import java.util.Set;
+import java.util.TreeSet;
import java.util.function.Function;
/**
* @author Stephen Mallette (http://stephen.genoprime.com)
*/
public class StarGraphGraphSONSerializer extends StdSerializer<StarGraphGraphSONSerializer.DirectionalStarGraph> {
- public StarGraphGraphSONSerializer() {
+ private final boolean normalize;
+ public StarGraphGraphSONSerializer(final boolean normalize) {
super(DirectionalStarGraph.class);
+ this.normalize = normalize;
}
@Override
@@ -76,18 +84,24 @@ public class StarGraphGraphSONSerializer extends StdSerializer<StarGraphGraphSON
if (starGraph.starVertex.vertexProperties != null && !starGraph.starVertex.vertexProperties.isEmpty()) {
jsonGenerator.writeObjectFieldStart(GraphSONTokens.PROPERTIES);
if (typeSerializer != null) jsonGenerator.writeStringField(GraphSONTokens.CLASS, HashMap.class.getName());
- for (final Map.Entry<String, List<VertexProperty>> vp : starGraph.starVertex.vertexProperties.entrySet()) {
- jsonGenerator.writeArrayFieldStart(vp.getKey());
+ final Set<String> keys = normalize ? new TreeSet<>(starGraph.starVertex.vertexProperties.keySet()) : starGraph.starVertex.vertexProperties.keySet();
+ for (final String k : keys) {
+ final List<VertexProperty> vp = starGraph.starVertex.vertexProperties.get(k);
+ jsonGenerator.writeArrayFieldStart(k);
if (typeSerializer != null) {
jsonGenerator.writeString(ArrayList.class.getName());
jsonGenerator.writeStartArray();
}
- for (final VertexProperty property : vp.getValue()) {
+
+ final List<VertexProperty> vertexProperties = normalize ?sort(vp, Comparators.PROPERTY_COMPARATOR) : vp;
+ for (final VertexProperty property : vertexProperties) {
jsonGenerator.writeStartObject();
if (typeSerializer != null) jsonGenerator.writeStringField(GraphSONTokens.CLASS, HashMap.class.getName());
GraphSONUtil.writeWithType(GraphSONTokens.ID, property.id(), jsonGenerator, serializerProvider, typeSerializer);
GraphSONUtil.writeWithType(GraphSONTokens.VALUE, property.value(), jsonGenerator, serializerProvider, typeSerializer);
- final Iterator<Property<Object>> metaProperties = property.properties();
+
+ final Iterator<Property> metaProperties = normalize ?
+ IteratorUtils.list(property.properties(), Comparators.PROPERTY_COMPARATOR).iterator() : property.properties();
if (metaProperties.hasNext()) {
jsonGenerator.writeObjectFieldStart(GraphSONTokens.PROPERTIES);
if (typeSerializer != null) jsonGenerator.writeStringField(GraphSONTokens.CLASS, HashMap.class.getName());
@@ -120,25 +134,31 @@ public class StarGraphGraphSONSerializer extends StdSerializer<StarGraphGraphSON
if (writeEdges) {
jsonGenerator.writeObjectFieldStart(direction == Direction.IN ? GraphSONTokens.IN_E : GraphSONTokens.OUT_E);
if (typeSerializer != null) jsonGenerator.writeStringField(GraphSONTokens.CLASS, HashMap.class.getName());
- for (final Map.Entry<String, List<Edge>> edges : starEdges.entrySet()) {
- jsonGenerator.writeArrayFieldStart(edges.getKey());
+ final Set<String> keys = normalize ? new TreeSet<>(starEdges.keySet()) : starEdges.keySet();
+ for (final String k : keys) {
+ final List<Edge> edges = starEdges.get(k);
+ jsonGenerator.writeArrayFieldStart(k);
if (typeSerializer != null) {
jsonGenerator.writeString(ArrayList.class.getName());
jsonGenerator.writeStartArray();
}
- for (final Edge edge : edges.getValue()) {
+
+ final List<Edge> edgesToWrite = normalize ? sort(edges, Comparators.EDGE_COMPARATOR) : edges;
+ for (final Edge edge : edgesToWrite) {
jsonGenerator.writeStartObject();
if (typeSerializer != null) jsonGenerator.writeStringField(GraphSONTokens.CLASS, HashMap.class.getName());
GraphSONUtil.writeWithType(GraphSONTokens.ID, edge.id(), jsonGenerator, serializerProvider, typeSerializer);
GraphSONUtil.writeWithType(direction.equals(Direction.OUT) ? GraphSONTokens.IN : GraphSONTokens.OUT,
direction.equals(Direction.OUT) ? edge.inVertex().id() : edge.outVertex().id(),
jsonGenerator, serializerProvider, typeSerializer);
- final Iterator<Property<Object>> metaProperties = edge.properties();
- if (metaProperties.hasNext()) {
+
+ final Iterator<Property<Object>> edgeProperties = normalize ?
+ IteratorUtils.list(edge.properties(), Comparators.PROPERTY_COMPARATOR).iterator() : edge.properties();
+ if (edgeProperties.hasNext()) {
jsonGenerator.writeObjectFieldStart(GraphSONTokens.PROPERTIES);
if (typeSerializer != null) jsonGenerator.writeStringField(GraphSONTokens.CLASS, HashMap.class.getName());
- while (metaProperties.hasNext()) {
- final Property<Object> meta = metaProperties.next();
+ while (edgeProperties.hasNext()) {
+ final Property<Object> meta = edgeProperties.next();
GraphSONUtil.writeWithType(meta.key(), meta.value(), jsonGenerator, serializerProvider, typeSerializer);
}
jsonGenerator.writeEndObject();
@@ -207,6 +227,11 @@ public class StarGraphGraphSONSerializer extends StdSerializer<StarGraphGraphSON
return starGraph;
}
+ private static <S> List<S> sort(final List<S> listToSort, final Comparator comparator) {
+ Collections.sort(listToSort, comparator);
+ return listToSort;
+ }
+
public static class DirectionalStarGraph {
private final Direction direction;
private final StarGraph starGraphToSerialize;
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/3b361cc3/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/iterator/IteratorUtils.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/iterator/IteratorUtils.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/iterator/IteratorUtils.java
index 801299e..befdd56 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/iterator/IteratorUtils.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/iterator/IteratorUtils.java
@@ -19,10 +19,12 @@
package org.apache.tinkerpop.gremlin.util.iterator;
import org.apache.tinkerpop.gremlin.process.traversal.FastNoSuchElementException;
+import org.apache.tinkerpop.gremlin.structure.util.Comparators;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
+import java.util.Comparator;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
@@ -77,6 +79,12 @@ public final class IteratorUtils {
return fill(iterator, new ArrayList<>());
}
+ public static <S> List<S> list(final Iterator<S> iterator, final Comparator comparator) {
+ final List<S> l = list(iterator);
+ Collections.sort(l, comparator);
+ return l;
+ }
+
public static <S> Set<S> set(final Iterator<S> iterator) {
return fill(iterator, new HashSet<>());
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/3b361cc3/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-normalized.json
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-normalized.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-normalized.json
index 5ccfe05..cb08148 100644
--- a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-normalized.json
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-classic-normalized.json
@@ -1,6 +1,6 @@
-{"id":1,"label":"vertex","outE":{"created":[{"id":9,"inV":3,"properties":{"weight":0.4}}],"knows":[{"id":7,"inV":2,"properties":{"weight":0.5}},{"id":8,"inV":4,"properties":{"weight":1.0}}]},"properties":{"name":[{"id":0,"value":"marko"}],"age":[{"id":2,"value":29}]}}
-{"id":2,"label":"vertex","inE":{"knows":[{"id":7,"outV":1,"properties":{"weight":0.5}}]},"properties":{"name":[{"id":3,"value":"vadas"}],"age":[{"id":4,"value":27}]}}
-{"id":3,"label":"vertex","inE":{"created":[{"id":9,"outV":1,"properties":{"weight":0.4}},{"id":11,"outV":4,"properties":{"weight":0.4}},{"id":12,"outV":6,"properties":{"weight":0.2}}]},"properties":{"name":[{"id":5,"value":"lop"}],"lang":[{"id":6,"value":"java"}]}}
-{"id":4,"label":"vertex","inE":{"knows":[{"id":8,"outV":1,"properties":{"weight":1.0}}]},"outE":{"created":[{"id":10,"inV":5,"properties":{"weight":1.0}},{"id":11,"inV":3,"properties":{"weight":0.4}}]},"properties":{"name":[{"id":7,"value":"josh"}],"age":[{"id":8,"value":32}]}}
-{"id":5,"label":"vertex","inE":{"created":[{"id":10,"outV":4,"properties":{"weight":1.0}}]},"properties":{"name":[{"id":9,"value":"ripple"}],"lang":[{"id":10,"value":"java"}]}}
-{"id":6,"label":"vertex","outE":{"created":[{"id":12,"inV":3,"properties":{"weight":0.2}}]},"properties":{"name":[{"id":11,"value":"peter"}],"age":[{"id":12,"value":35}]}}
+{"id":1,"label":"vertex","outE":{"created":[{"id":9,"inV":3,"properties":{"weight":0.4}}],"knows":[{"id":7,"inV":2,"properties":{"weight":0.5}},{"id":8,"inV":4,"properties":{"weight":1.0}}]},"properties":{"age":[{"id":2,"value":29}],"name":[{"id":0,"value":"marko"}]}}
+{"id":2,"label":"vertex","inE":{"knows":[{"id":7,"outV":1,"properties":{"weight":0.5}}]},"properties":{"age":[{"id":4,"value":27}],"name":[{"id":3,"value":"vadas"}]}}
+{"id":3,"label":"vertex","inE":{"created":[{"id":11,"outV":4,"properties":{"weight":0.4}},{"id":12,"outV":6,"properties":{"weight":0.2}},{"id":9,"outV":1,"properties":{"weight":0.4}}]},"properties":{"lang":[{"id":6,"value":"java"}],"name":[{"id":5,"value":"lop"}]}}
+{"id":4,"label":"vertex","inE":{"knows":[{"id":8,"outV":1,"properties":{"weight":1.0}}]},"outE":{"created":[{"id":10,"inV":5,"properties":{"weight":1.0}},{"id":11,"inV":3,"properties":{"weight":0.4}}]},"properties":{"age":[{"id":8,"value":32}],"name":[{"id":7,"value":"josh"}]}}
+{"id":5,"label":"vertex","inE":{"created":[{"id":10,"outV":4,"properties":{"weight":1.0}}]},"properties":{"lang":[{"id":10,"value":"java"}],"name":[{"id":9,"value":"ripple"}]}}
+{"id":6,"label":"vertex","outE":{"created":[{"id":12,"inV":3,"properties":{"weight":0.2}}]},"properties":{"age":[{"id":12,"value":35}],"name":[{"id":11,"value":"peter"}]}}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/3b361cc3/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-modern-normalized.json
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-modern-normalized.json b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-modern-normalized.json
index 18c265d..8c259ea 100644
--- a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-modern-normalized.json
+++ b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-modern-normalized.json
@@ -1,6 +1,6 @@
-{"id":1,"label":"person","outE":{"created":[{"id":9,"inV":3,"properties":{"weight":0.4}}],"knows":[{"id":7,"inV":2,"properties":{"weight":0.5}},{"id":8,"inV":4,"properties":{"weight":1.0}}]},"properties":{"name":[{"id":0,"value":"marko"}],"age":[{"id":1,"value":29}]}}
-{"id":2,"label":"person","inE":{"knows":[{"id":7,"outV":1,"properties":{"weight":0.5}}]},"properties":{"name":[{"id":2,"value":"vadas"}],"age":[{"id":3,"value":27}]}}
-{"id":3,"label":"software","inE":{"created":[{"id":9,"outV":1,"properties":{"weight":0.4}},{"id":11,"outV":4,"properties":{"weight":0.4}},{"id":12,"outV":6,"properties":{"weight":0.2}}]},"properties":{"name":[{"id":4,"value":"lop"}],"lang":[{"id":5,"value":"java"}]}}
-{"id":4,"label":"person","inE":{"knows":[{"id":8,"outV":1,"properties":{"weight":1.0}}]},"outE":{"created":[{"id":10,"inV":5,"properties":{"weight":1.0}},{"id":11,"inV":3,"properties":{"weight":0.4}}]},"properties":{"name":[{"id":6,"value":"josh"}],"age":[{"id":7,"value":32}]}}
-{"id":5,"label":"software","inE":{"created":[{"id":10,"outV":4,"properties":{"weight":1.0}}]},"properties":{"name":[{"id":8,"value":"ripple"}],"lang":[{"id":9,"value":"java"}]}}
-{"id":6,"label":"person","outE":{"created":[{"id":12,"inV":3,"properties":{"weight":0.2}}]},"properties":{"name":[{"id":10,"value":"peter"}],"age":[{"id":11,"value":35}]}}
+{"id":1,"label":"person","outE":{"created":[{"id":9,"inV":3,"properties":{"weight":0.4}}],"knows":[{"id":7,"inV":2,"properties":{"weight":0.5}},{"id":8,"inV":4,"properties":{"weight":1.0}}]},"properties":{"age":[{"id":1,"value":29}],"name":[{"id":0,"value":"marko"}]}}
+{"id":2,"label":"person","inE":{"knows":[{"id":7,"outV":1,"properties":{"weight":0.5}}]},"properties":{"age":[{"id":3,"value":27}],"name":[{"id":2,"value":"vadas"}]}}
+{"id":3,"label":"software","inE":{"created":[{"id":11,"outV":4,"properties":{"weight":0.4}},{"id":12,"outV":6,"properties":{"weight":0.2}},{"id":9,"outV":1,"properties":{"weight":0.4}}]},"properties":{"lang":[{"id":5,"value":"java"}],"name":[{"id":4,"value":"lop"}]}}
+{"id":4,"label":"person","inE":{"knows":[{"id":8,"outV":1,"properties":{"weight":1.0}}]},"outE":{"created":[{"id":10,"inV":5,"properties":{"weight":1.0}},{"id":11,"inV":3,"properties":{"weight":0.4}}]},"properties":{"age":[{"id":7,"value":32}],"name":[{"id":6,"value":"josh"}]}}
+{"id":5,"label":"software","inE":{"created":[{"id":10,"outV":4,"properties":{"weight":1.0}}]},"properties":{"lang":[{"id":9,"value":"java"}],"name":[{"id":8,"value":"ripple"}]}}
+{"id":6,"label":"person","outE":{"created":[{"id":12,"inV":3,"properties":{"weight":0.2}}]},"properties":{"age":[{"id":11,"value":35}],"name":[{"id":10,"value":"peter"}]}}
[12/50] [abbrv] incubator-tinkerpop git commit: Fix serialization
assertion in integration test after GraphSON refactoring.
Posted by sp...@apache.org.
Fix serialization assertion in integration test after GraphSON refactoring.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/84f736f4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/84f736f4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/84f736f4
Branch: refs/heads/variables
Commit: 84f736f448095bb3c3eed5cc3c69c8eb81273f62
Parents: 8c6d95c
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Apr 29 12:09:13 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Apr 29 12:09:13 2015 -0400
----------------------------------------------------------------------
.../tinkerpop/gremlin/server/GremlinServerHttpIntegrateTest.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/84f736f4/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerHttpIntegrateTest.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerHttpIntegrateTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerHttpIntegrateTest.java
index 788974e..a062557 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerHttpIntegrateTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerHttpIntegrateTest.java
@@ -29,6 +29,7 @@ import org.apache.http.entity.StringEntity;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClients;
import org.apache.http.util.EntityUtils;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONTokens;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TestName;
@@ -116,7 +117,7 @@ public class GremlinServerHttpIntegrateTest extends AbstractGremlinServerIntegra
assertEquals("application/json", response.getEntity().getContentType().getValue());
final String json = EntityUtils.toString(response.getEntity());
final JsonNode node = mapper.readTree(json);
- assertEquals("stephen", node.get("result").get("data").get(0).get("properties").get("name").get(0).get("value").asText());
+ assertEquals("stephen", node.get("result").get("data").get(0).get("properties").get(0).get(GraphSONTokens.VALUE).asText());
}
}
[41/50] [abbrv] incubator-tinkerpop git commit: Merge branch 'master'
of https://git-wip-us.apache.org/repos/asf/incubator-tinkerpop
Posted by sp...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-tinkerpop
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/96e1219e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/96e1219e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/96e1219e
Branch: refs/heads/variables
Commit: 96e1219e0db8c1a67ff42411f5d6a362952d86dc
Parents: c42e5bc 08617c5
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Thu Apr 30 22:02:49 2015 +0200
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Thu Apr 30 22:02:49 2015 +0200
----------------------------------------------------------------------
CHANGELOG.asciidoc | 3 +
NOTICE | 9 +-
.../traversal/TraversalScriptSupplier.java | 15 +-
.../traversal/TraversalVertexProgram.java | 4 +-
.../traversal/VertexTraversalSideEffects.java | 13 +-
.../process/traversal/TraversalSideEffects.java | 51 +----
.../gremlin/process/traversal/Traverser.java | 2 +-
.../traversal/step/filter/ExceptStep.java | 2 +-
.../traversal/step/filter/RetainStep.java | 2 +-
.../step/sideEffect/AggregateStep.java | 16 +-
.../sideEffect/GroupCountSideEffectStep.java | 12 +-
.../step/sideEffect/GroupSideEffectStep.java | 17 +-
.../traversal/step/sideEffect/ProfileStep.java | 16 +-
.../step/sideEffect/SideEffectCapStep.java | 22 +--
.../traversal/step/sideEffect/StoreStep.java | 12 +-
.../step/sideEffect/TreeSideEffectStep.java | 2 +-
.../util/DefaultTraversalSideEffects.java | 27 +--
.../util/EmptyTraversalSideEffects.java | 4 +-
.../tinkerpop/gremlin/structure/Element.java | 2 +-
.../gremlin/structure/io/graphml/GraphMLIo.java | 20 ++
.../structure/io/graphml/GraphMLMapper.java | 4 +
.../structure/io/graphml/GraphMLReader.java | 35 ++++
.../structure/io/graphml/GraphMLWriter.java | 40 ++++
.../io/graphml/GraphMLWriterHelper.java | 190 ++++++++-----------
.../structure/io/graphson/GraphSONIo.java | 18 ++
.../structure/io/graphson/GraphSONMapper.java | 12 +-
.../structure/io/graphson/GraphSONModule.java | 10 +-
.../structure/io/graphson/GraphSONReader.java | 63 +++++-
.../structure/io/graphson/GraphSONWriter.java | 35 ++--
.../io/graphson/LegacyGraphSONReader.java | 35 ++++
.../gremlin/structure/io/gryo/GryoMapper.java | 11 +-
.../gremlin/structure/io/gryo/GryoReader.java | 5 +-
.../process/computer/ComputerTestHelper.groovy | 11 +-
.../step/branch/GroovyLocalTest.groovy | 19 +-
.../step/branch/GroovyRepeatTest.groovy | 12 +-
.../step/branch/GroovyUnionTest.groovy | 10 +-
.../step/filter/GroovyCyclicPathTest.groovy | 8 +-
.../step/filter/GroovyExceptTest.groovy | 12 +-
.../step/filter/GroovyFilterTest.groovy | 6 +-
.../step/filter/GroovyHasNotTest.groovy | 4 +-
.../traversal/step/filter/GroovyHasTest.groovy | 29 +--
.../traversal/step/filter/GroovyIsTest.groovy | 10 +-
.../step/filter/GroovyRetainTest.groovy | 10 +-
.../step/filter/GroovySimplePathTest.groovy | 6 +-
.../step/map/GroovyCoalesceTest.groovy | 8 +-
.../traversal/step/map/GroovyMapTest.groovy | 8 +-
.../traversal/step/map/GroovyPathTest.groovy | 6 +-
.../step/map/GroovyPropertiesTest.groovy | 8 +-
.../traversal/step/map/GroovySelectTest.groovy | 18 +-
.../step/map/GroovyValueMapTest.groovy | 6 +-
.../traversal/step/map/GroovyVertexTest.groovy | 51 ++---
.../server/op/AbstractEvalOpProcessor.java | 2 +-
.../traversal/TraversalSideEffectsTest.java | 6 +-
.../traversal/step/branch/UnionTest.java | 3 +-
.../traversal/step/sideEffect/ProfileTest.java | 10 +-
.../step/sideEffect/SideEffectTest.java | 4 +-
.../traversal/step/sideEffect/SubgraphTest.java | 2 +-
57 files changed, 559 insertions(+), 419 deletions(-)
----------------------------------------------------------------------
[02/50] [abbrv] incubator-tinkerpop git commit: touchups to
TestFileReaderWriterHelper.
Posted by sp...@apache.org.
touchups to TestFileReaderWriterHelper.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/ab1aaf22
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/ab1aaf22
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/ab1aaf22
Branch: refs/heads/variables
Commit: ab1aaf22a7db1b04a3270851735eb124a03ca3ad
Parents: 0b8b40e
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Tue Apr 28 11:17:52 2015 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Tue Apr 28 11:18:01 2015 -0600
----------------------------------------------------------------------
.../computer/giraph/GiraphWorkerContext.java | 1 -
.../io/TestFileReaderWriterHelper.java | 22 ++++++++++----------
2 files changed, 11 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/ab1aaf22/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/giraph/GiraphWorkerContext.java
----------------------------------------------------------------------
diff --git a/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/giraph/GiraphWorkerContext.java b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/giraph/GiraphWorkerContext.java
index 363c945..84a1888 100644
--- a/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/giraph/GiraphWorkerContext.java
+++ b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/giraph/GiraphWorkerContext.java
@@ -26,7 +26,6 @@ import org.apache.tinkerpop.gremlin.hadoop.structure.util.ConfUtil;
import org.apache.tinkerpop.gremlin.process.computer.VertexProgram;
import org.apache.tinkerpop.gremlin.process.computer.util.ImmutableMemory;
import org.apache.tinkerpop.gremlin.process.computer.util.VertexProgramPool;
-import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoPool;
import java.util.Iterator;
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/ab1aaf22/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/TestFileReaderWriterHelper.java
----------------------------------------------------------------------
diff --git a/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/TestFileReaderWriterHelper.java b/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/TestFileReaderWriterHelper.java
index e68355a..40afcbe 100644
--- a/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/TestFileReaderWriterHelper.java
+++ b/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/TestFileReaderWriterHelper.java
@@ -21,6 +21,7 @@
package org.apache.tinkerpop.gremlin.hadoop.structure.io;
+import com.typesafe.config.ConfigException;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.LocalFileSystem;
import org.apache.hadoop.fs.Path;
@@ -63,7 +64,7 @@ public class TestFileReaderWriterHelper {
return splits;
}
- public static void validateFileSplits(final List<FileSplit> fileSplits, final Class<? extends InputFormat> inputFormatClass, final Optional<Class<? extends OutputFormat>> outFormatClass) throws Exception {
+ public static void validateFileSplits(final List<FileSplit> fileSplits, final Class<? extends InputFormat<NullWritable,VertexWritable>> inputFormatClass, final Optional<Class<? extends OutputFormat<NullWritable,VertexWritable>>> outFormatClass) throws Exception {
File outputDirectory = TestHelper.makeTestDataPath(inputFormatClass, "hadoop-record-reader-writer-test");
final Configuration configuration = new Configuration(false);
configuration.set("fs.file.impl", LocalFileSystem.class.getName());
@@ -76,8 +77,8 @@ public class TestFileReaderWriterHelper {
int outEdgeCount = 0;
int inEdgeCount = 0;
- final OutputFormat outputFormat = outFormatClass.isPresent() ? ReflectionUtils.newInstance(outFormatClass.get(), configuration) : null;
- final RecordWriter writer = null == outputFormat ? null : outputFormat.getRecordWriter(job);
+ final OutputFormat<NullWritable,VertexWritable> outputFormat = outFormatClass.isPresent() ? ReflectionUtils.newInstance(outFormatClass.get(), configuration) : null;
+ final RecordWriter<NullWritable,VertexWritable> writer = null == outputFormat ? null : outputFormat.getRecordWriter(job);
boolean foundKeyValue = false;
for (final FileSplit split : fileSplits) {
@@ -90,16 +91,15 @@ public class TestFileReaderWriterHelper {
final float progress = reader.getProgress();
assertTrue(progress >= lastProgress);
assertEquals(NullWritable.class, reader.getCurrentKey().getClass());
- final VertexWritable v = (VertexWritable) reader.getCurrentValue();
- if (null != writer) writer.write(NullWritable.get(), v);
+ final VertexWritable vertexWritable = (VertexWritable) reader.getCurrentValue();
+ if (null != writer) writer.write(NullWritable.get(), vertexWritable);
vertexCount++;
- outEdgeCount = outEdgeCount + (int) IteratorUtils.count(v.get().edges(Direction.OUT));
- inEdgeCount = inEdgeCount + (int) IteratorUtils.count(v.get().edges(Direction.IN));
-
- final Vertex vertex = v.get();
+ outEdgeCount = outEdgeCount + (int) IteratorUtils.count(vertexWritable.get().edges(Direction.OUT));
+ inEdgeCount = inEdgeCount + (int) IteratorUtils.count(vertexWritable.get().edges(Direction.IN));
+ //
+ final Vertex vertex = vertexWritable.get();
assertEquals(Integer.class, vertex.id().getClass());
- final Object value = vertex.property("name");
- if (((Property) value).value().equals("SUGAR MAGNOLIA")) {
+ if (vertex.value("name").equals("SUGAR MAGNOLIA")) {
foundKeyValue = true;
assertEquals(92, IteratorUtils.count(vertex.edges(Direction.OUT)));
assertEquals(77, IteratorUtils.count(vertex.edges(Direction.IN)));
[34/50] [abbrv] incubator-tinkerpop git commit: Update NOTICE.
Posted by sp...@apache.org.
Update NOTICE.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/0ee87f83
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/0ee87f83
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/0ee87f83
Branch: refs/heads/variables
Commit: 0ee87f83ac23a37c942a6160d4c3814f5ea22ee1
Parents: e2e76c7
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Apr 30 14:25:04 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Apr 30 14:25:04 2015 -0400
----------------------------------------------------------------------
NOTICE | 9 +-
.../io/graphml/GraphMLWriterHelper.java | 190 ++++++++-----------
2 files changed, 85 insertions(+), 114 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/0ee87f83/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index cea3516..b288d10 100644
--- a/NOTICE
+++ b/NOTICE
@@ -21,4 +21,11 @@ for bundled components and dependencies
------------------------------------------------------------------------
normalize.css
------------------------------------------------------------------------
-Copyright (c) Nicolas Gallagher and Jonathan Neal
\ No newline at end of file
+Copyright (c) Nicolas Gallagher and Jonathan Neal
+
+------------------------------------------------------------------------
+GraphMLWriterHelper.DelegatingXMLStreamWriter
+GraphMLWriterHelper.IndentingXMLStreamWriter
+------------------------------------------------------------------------
+Taken from Activiti - Apache 2 License - https://github.com/Activiti/Activiti
+Copyright 2010-2014 Alfresco Software, Ltd.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/0ee87f83/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphml/GraphMLWriterHelper.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphml/GraphMLWriterHelper.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphml/GraphMLWriterHelper.java
index 8f73268..cedb302 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphml/GraphMLWriterHelper.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphml/GraphMLWriterHelper.java
@@ -18,8 +18,6 @@
*/
package org.apache.tinkerpop.gremlin.structure.io.graphml;
-import org.apache.commons.lang.StringUtils;
-
import javax.xml.namespace.NamespaceContext;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamWriter;
@@ -30,227 +28,199 @@ import java.util.Stack;
*/
class GraphMLWriterHelper {
/**
- * Delegating {@link javax.xml.stream.XMLStreamWriter}.
- *
- * @author Kohsuke Kawaguchi
+ * @author Tijs Rademakers
*/
- private abstract static class DelegatingXMLStreamWriter implements XMLStreamWriter {
+ abstract static class DelegatingXMLStreamWriter implements XMLStreamWriter {
+
private final XMLStreamWriter writer;
- public DelegatingXMLStreamWriter(final XMLStreamWriter writer) {
+ public DelegatingXMLStreamWriter(XMLStreamWriter writer) {
this.writer = writer;
}
- @Override
- public void writeStartElement(final String localName) throws XMLStreamException {
+ public void writeStartElement(String localName) throws XMLStreamException {
writer.writeStartElement(localName);
}
- @Override
- public void writeStartElement(final String namespaceURI, final String localName) throws XMLStreamException {
+ public void writeStartElement(String namespaceURI, String localName) throws XMLStreamException {
writer.writeStartElement(namespaceURI, localName);
}
- @Override
- public void writeStartElement(final String prefix, final String localName, final String namespaceURI) throws XMLStreamException {
+ public void writeStartElement(String prefix, String localName, String namespaceURI) throws XMLStreamException {
writer.writeStartElement(prefix, localName, namespaceURI);
}
- @Override
- public void writeEmptyElement(final String namespaceURI, final String localName) throws XMLStreamException {
+ public void writeEmptyElement(String namespaceURI, String localName) throws XMLStreamException {
writer.writeEmptyElement(namespaceURI, localName);
}
- @Override
- public void writeEmptyElement(final String prefix, final String localName, final String namespaceURI) throws XMLStreamException {
+ public void writeEmptyElement(String prefix, String localName, String namespaceURI) throws XMLStreamException {
writer.writeEmptyElement(prefix, localName, namespaceURI);
}
- @Override
- public void writeEmptyElement(final String localName) throws XMLStreamException {
+ public void writeEmptyElement(String localName) throws XMLStreamException {
writer.writeEmptyElement(localName);
}
- @Override
public void writeEndElement() throws XMLStreamException {
writer.writeEndElement();
}
- @Override
public void writeEndDocument() throws XMLStreamException {
writer.writeEndDocument();
}
- @Override
public void close() throws XMLStreamException {
writer.close();
}
- @Override
public void flush() throws XMLStreamException {
writer.flush();
}
- @Override
- public void writeAttribute(final String localName, final String value) throws XMLStreamException {
+ public void writeAttribute(String localName, String value) throws XMLStreamException {
writer.writeAttribute(localName, value);
}
- @Override
- public void writeAttribute(final String prefix, final String namespaceURI, final String localName, final String value) throws XMLStreamException {
+ public void writeAttribute(String prefix, String namespaceURI, String localName, String value) throws XMLStreamException {
writer.writeAttribute(prefix, namespaceURI, localName, value);
}
- @Override
- public void writeAttribute(final String namespaceURI, final String localName, final String value) throws XMLStreamException {
+ public void writeAttribute(String namespaceURI, String localName, String value) throws XMLStreamException {
writer.writeAttribute(namespaceURI, localName, value);
}
- @Override
- public void writeNamespace(final String prefix, final String namespaceURI) throws XMLStreamException {
+ public void writeNamespace(String prefix, String namespaceURI) throws XMLStreamException {
writer.writeNamespace(prefix, namespaceURI);
}
- @Override
- public void writeDefaultNamespace(final String namespaceURI) throws XMLStreamException {
+ public void writeDefaultNamespace(String namespaceURI) throws XMLStreamException {
writer.writeDefaultNamespace(namespaceURI);
}
- @Override
- public void writeComment(final String data) throws XMLStreamException {
+ public void writeComment(String data) throws XMLStreamException {
writer.writeComment(data);
}
- @Override
- public void writeProcessingInstruction(final String target) throws XMLStreamException {
+ public void writeProcessingInstruction(String target) throws XMLStreamException {
writer.writeProcessingInstruction(target);
}
- @Override
- public void writeProcessingInstruction(final String target, final String data) throws XMLStreamException {
+ public void writeProcessingInstruction(String target, String data) throws XMLStreamException {
writer.writeProcessingInstruction(target, data);
}
- @Override
- public void writeCData(final String data) throws XMLStreamException {
+ public void writeCData(String data) throws XMLStreamException {
writer.writeCData(data);
}
- @Override
- public void writeDTD(final String dtd) throws XMLStreamException {
+ public void writeDTD(String dtd) throws XMLStreamException {
writer.writeDTD(dtd);
}
- @Override
- public void writeEntityRef(final String name) throws XMLStreamException {
+ public void writeEntityRef(String name) throws XMLStreamException {
writer.writeEntityRef(name);
}
- @Override
public void writeStartDocument() throws XMLStreamException {
writer.writeStartDocument();
}
- @Override
- public void writeStartDocument(final String version) throws XMLStreamException {
+ public void writeStartDocument(String version) throws XMLStreamException {
writer.writeStartDocument(version);
}
- @Override
- public void writeStartDocument(final String encoding, final String version) throws XMLStreamException {
+ public void writeStartDocument(String encoding, String version) throws XMLStreamException {
writer.writeStartDocument(encoding, version);
}
- @Override
- public void writeCharacters(final String text) throws XMLStreamException {
+ public void writeCharacters(String text) throws XMLStreamException {
writer.writeCharacters(text);
}
- @Override
- public void writeCharacters(final char[] text, final int start, final int len) throws XMLStreamException {
+ public void writeCharacters(char[] text, int start, int len) throws XMLStreamException {
writer.writeCharacters(text, start, len);
}
- @Override
- public String getPrefix(final String uri) throws XMLStreamException {
+ public String getPrefix(String uri) throws XMLStreamException {
return writer.getPrefix(uri);
}
- @Override
- public void setPrefix(final String prefix, final String uri) throws XMLStreamException {
+ public void setPrefix(String prefix, String uri) throws XMLStreamException {
writer.setPrefix(prefix, uri);
}
- @Override
- public void setDefaultNamespace(final String uri) throws XMLStreamException {
+ public void setDefaultNamespace(String uri) throws XMLStreamException {
writer.setDefaultNamespace(uri);
}
- @Override
- public void setNamespaceContext(final NamespaceContext context) throws XMLStreamException {
+ public void setNamespaceContext(NamespaceContext context) throws XMLStreamException {
writer.setNamespaceContext(context);
}
- @Override
public NamespaceContext getNamespaceContext() {
return writer.getNamespaceContext();
}
- @Override
- public Object getProperty(final String name) throws IllegalArgumentException {
+ public Object getProperty(String name) throws IllegalArgumentException {
return writer.getProperty(name);
}
}
/**
- * @author Kohsuke Kawaguchi
+ * @author Tijs Rademakers
*/
public static class IndentingXMLStreamWriter extends DelegatingXMLStreamWriter {
+
private final static Object SEEN_NOTHING = new Object();
private final static Object SEEN_ELEMENT = new Object();
private final static Object SEEN_DATA = new Object();
private Object state = SEEN_NOTHING;
- private Stack<Object> stateStack = new Stack<>();
+ private Stack<Object> stateStack = new Stack<Object>();
private String indentStep = " ";
- private static final String lineSeparator = System.getProperty("line.separator", "\n");
private int depth = 0;
- public IndentingXMLStreamWriter(final XMLStreamWriter writer) {
+ public IndentingXMLStreamWriter(XMLStreamWriter writer) {
super(writer);
}
/**
* Return the current indent step.
- * <p/>
- * <p>Return the current indent step: each start tag will be
- * indented by this number of spaces times the number of
- * ancestors that the element has.</p>
*
- * @return The number of spaces in each indentation step,
- * or 0 or less for no indentation.
+ * <p>
+ * Return the current indent step: each start tag will be indented by this
+ * number of spaces times the number of ancestors that the element has.
+ * </p>
+ *
+ * @return The number of spaces in each indentation step, or 0 or less for no
+ * indentation.
* @see #setIndentStep(int)
+ *
* @deprecated Only return the length of the indent string.
*/
public int getIndentStep() {
return indentStep.length();
}
-
/**
* Set the current indent step.
*
- * @param indentStep The new indent step (0 or less for no
- * indentation).
+ * @param indentStep
+ * The new indent step (0 or less for no indentation).
* @see #getIndentStep()
+ *
* @deprecated Should use the version that takes string.
*/
public void setIndentStep(int indentStep) {
- this.indentStep = StringUtils.repeat(" ", indentStep);
+ StringBuilder s = new StringBuilder();
+ for (; indentStep > 0; indentStep--)
+ s.append(' ');
+ setIndentStep(s.toString());
}
- public void setIndentStep(final String s) {
+ public void setIndentStep(String s) {
this.indentStep = s;
}
@@ -258,7 +228,7 @@ class GraphMLWriterHelper {
stateStack.push(SEEN_ELEMENT);
state = SEEN_NOTHING;
if (depth > 0) {
- super.writeCharacters(lineSeparator);
+ super.writeCharacters("\n");
}
doIndent();
depth++;
@@ -267,7 +237,7 @@ class GraphMLWriterHelper {
private void onEndElement() throws XMLStreamException {
depth--;
if (state == SEEN_ELEMENT) {
- super.writeCharacters(lineSeparator);
+ super.writeCharacters("\n");
doIndent();
}
state = stateStack.pop();
@@ -276,7 +246,7 @@ class GraphMLWriterHelper {
private void onEmptyElement() throws XMLStreamException {
state = SEEN_ELEMENT;
if (depth > 0) {
- super.writeCharacters(lineSeparator);
+ super.writeCharacters("\n");
}
doIndent();
}
@@ -284,8 +254,9 @@ class GraphMLWriterHelper {
/**
* Print indentation for the current level.
*
- * @throws javax.xml.stream.XMLStreamException If there is an error writing the indentation characters, or if a filter
- * further down the chain raises an exception.
+ * @exception org.xml.sax.SAXException
+ * If there is an error writing the indentation characters, or if
+ * a filter further down the chain raises an exception.
*/
private void doIndent() throws XMLStreamException {
if (depth > 0) {
@@ -294,84 +265,77 @@ class GraphMLWriterHelper {
}
}
-
- @Override
public void writeStartDocument() throws XMLStreamException {
super.writeStartDocument();
- super.writeCharacters(lineSeparator);
+ super.writeCharacters("\n");
}
- @Override
- public void writeStartDocument(final String version) throws XMLStreamException {
+ public void writeStartDocument(String version) throws XMLStreamException {
super.writeStartDocument(version);
- super.writeCharacters(lineSeparator);
+ super.writeCharacters("\n");
}
- @Override
- public void writeStartDocument(final String encoding, final String version) throws XMLStreamException {
+ public void writeStartDocument(String encoding, String version)
+ throws XMLStreamException {
super.writeStartDocument(encoding, version);
- super.writeCharacters(lineSeparator);
+ super.writeCharacters("\n");
}
- @Override
- public void writeStartElement(final String localName) throws XMLStreamException {
+ public void writeStartElement(String localName) throws XMLStreamException {
onStartElement();
super.writeStartElement(localName);
}
- @Override
- public void writeStartElement(final String namespaceURI, final String localName) throws XMLStreamException {
+ public void writeStartElement(String namespaceURI, String localName)
+ throws XMLStreamException {
onStartElement();
super.writeStartElement(namespaceURI, localName);
}
- @Override
- public void writeStartElement(final String prefix, final String localName, final String namespaceURI) throws XMLStreamException {
+ public void writeStartElement(String prefix, String localName,
+ String namespaceURI) throws XMLStreamException {
onStartElement();
super.writeStartElement(prefix, localName, namespaceURI);
}
- @Override
- public void writeEmptyElement(final String namespaceURI, final String localName) throws XMLStreamException {
+ public void writeEmptyElement(String namespaceURI, String localName)
+ throws XMLStreamException {
onEmptyElement();
super.writeEmptyElement(namespaceURI, localName);
}
- @Override
- public void writeEmptyElement(final String prefix, final String localName, final String namespaceURI) throws XMLStreamException {
+ public void writeEmptyElement(String prefix, String localName,
+ String namespaceURI) throws XMLStreamException {
onEmptyElement();
super.writeEmptyElement(prefix, localName, namespaceURI);
}
- @Override
- public void writeEmptyElement(final String localName) throws XMLStreamException {
+ public void writeEmptyElement(String localName) throws XMLStreamException {
onEmptyElement();
super.writeEmptyElement(localName);
}
- @Override
public void writeEndElement() throws XMLStreamException {
onEndElement();
super.writeEndElement();
}
- @Override
- public void writeCharacters(final String text) throws XMLStreamException {
+ public void writeCharacters(String text) throws XMLStreamException {
state = SEEN_DATA;
super.writeCharacters(text);
}
- @Override
- public void writeCharacters(final char[] text, final int start, final int len) throws XMLStreamException {
+ public void writeCharacters(char[] text, int start, int len)
+ throws XMLStreamException {
state = SEEN_DATA;
super.writeCharacters(text, start, len);
}
- @Override
- public void writeCData(final String data) throws XMLStreamException {
+ public void writeCData(String data) throws XMLStreamException {
state = SEEN_DATA;
super.writeCData(data);
}
+
}
}
[50/50] [abbrv] incubator-tinkerpop git commit: Merge remote-tracking
branch 'origin/master' into variables
Posted by sp...@apache.org.
Merge remote-tracking branch 'origin/master' into variables
Conflicts:
tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphTest.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/bd54cf69
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/bd54cf69
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/bd54cf69
Branch: refs/heads/variables
Commit: bd54cf691358ece7df12fe5b1478011d6442b039
Parents: 69ba367 433f584
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Fri May 1 11:51:31 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Fri May 1 11:51:31 2015 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 20 +
NOTICE | 9 +-
README.asciidoc | 10 +-
bin/publish-docs.sh | 4 +-
data/grateful-dead-typed.json | 808 +++++++++++++++++
data/grateful-dead-vertices.kryo | Bin 975214 -> 0 bytes
data/grateful-dead-vertices.ldjson | 808 -----------------
data/grateful-dead.json | 809 ++++++++++++++++-
data/grateful-dead.kryo | Bin 493339 -> 331418 bytes
data/tinkerpop-classic-normalized.json | 1 -
data/tinkerpop-classic-typed.json | 7 +-
data/tinkerpop-classic-vertices.kryo | Bin 1179 -> 0 bytes
data/tinkerpop-classic-vertices.ldjson | 6 -
data/tinkerpop-classic.json | 7 +-
data/tinkerpop-classic.kryo | Bin 765 -> 723 bytes
data/tinkerpop-crew-typed.json | 7 +-
data/tinkerpop-crew-vertices.kryo | Bin 2575 -> 0 bytes
data/tinkerpop-crew-vertices.ldjson | 6 -
data/tinkerpop-crew.json | 7 +-
data/tinkerpop-crew.kryo | Bin 1858 -> 1380 bytes
data/tinkerpop-modern-normalized.json | 1 -
data/tinkerpop-modern-typed.json | 7 +-
data/tinkerpop-modern-vertices.kryo | Bin 1295 -> 0 bytes
data/tinkerpop-modern-vertices.ldjson | 6 -
data/tinkerpop-modern.json | 7 +-
data/tinkerpop-modern.kryo | Bin 825 -> 775 bytes
docs/src/gremlin-applications.asciidoc | 14 +-
docs/src/implementations.asciidoc | 31 +-
docs/src/the-graph.asciidoc | 409 +++------
docs/src/the-traversal.asciidoc | 64 +-
gremlin-console/bin/gremlin.sh | 2 +-
.../traversal/TraversalScriptSupplier.java | 15 +-
.../traversal/TraversalVertexProgram.java | 4 +-
.../computer/traversal/TraverserExecutor.java | 3 +-
.../traversal/VertexTraversalSideEffects.java | 13 +-
.../traversal/step/map/ComputerResultStep.java | 3 +-
.../tinkerpop/gremlin/process/traversal/T.java | 114 ---
.../process/traversal/TraversalSideEffects.java | 51 +-
.../gremlin/process/traversal/Traverser.java | 25 +-
.../dsl/graph/EmptyGraphTraversal.java | 5 -
.../traversal/dsl/graph/GraphTraversal.java | 100 +--
.../dsl/graph/GraphTraversalSource.java | 115 ++-
.../gremlin/process/traversal/dsl/graph/__.java | 70 +-
.../traversal/lambda/TokenTraversal.java | 2 +-
.../traversal/step/filter/ExceptStep.java | 4 +-
.../process/traversal/step/filter/HasStep.java | 20 +-
.../process/traversal/step/filter/IsStep.java | 32 +-
.../traversal/step/filter/RetainStep.java | 4 +-
.../traversal/step/filter/WhereStep.java | 11 +-
.../traversal/step/map/CountGlobalStep.java | 12 +-
.../process/traversal/step/map/MapStep.java | 4 -
.../traversal/step/map/MaxGlobalStep.java | 9 +-
.../traversal/step/map/MinGlobalStep.java | 15 +-
.../traversal/step/map/PropertyMapStep.java | 2 +-
.../traversal/step/map/SelectOneStep.java | 30 +-
.../process/traversal/step/map/SelectStep.java | 48 +-
.../traversal/step/map/SumGlobalStep.java | 6 +-
.../traversal/step/map/match/MatchStep.java | 4 +-
.../step/sideEffect/AggregateStep.java | 16 +-
.../sideEffect/GroupCountSideEffectStep.java | 12 +-
.../step/sideEffect/GroupSideEffectStep.java | 17 +-
.../traversal/step/sideEffect/ProfileStep.java | 16 +-
.../step/sideEffect/SideEffectCapStep.java | 22 +-
.../traversal/step/sideEffect/StoreStep.java | 12 +-
.../traversal/step/sideEffect/SubgraphStep.java | 2 +-
.../step/sideEffect/TreeSideEffectStep.java | 2 +-
.../traversal/step/util/HasContainer.java | 2 +-
.../process/traversal/step/util/SparsePath.java | 95 --
.../strategy/decoration/ElementIdStrategy.java | 5 +-
.../strategy/decoration/EventStrategy.java | 2 +-
.../optimization/RangeByIsCountStrategy.java | 47 +-
.../traverser/B_O_PA_S_SE_SL_Traverser.java | 86 --
.../B_O_PA_S_SE_SL_TraverserGenerator.java | 62 --
.../traverser/B_O_P_PA_S_SE_SL_Traverser.java | 58 --
.../B_O_P_PA_S_SE_SL_TraverserGenerator.java | 61 --
.../traverser/B_O_P_S_SE_SL_Traverser.java | 106 +++
.../B_O_P_S_SE_SL_TraverserGenerator.java | 58 ++
.../traverser/B_O_S_SE_SL_Traverser.java | 119 +++
.../B_O_S_SE_SL_TraverserGenerator.java | 59 ++
.../traverser/TraverserRequirement.java | 1 -
.../traverser/util/AbstractPathTraverser.java | 213 -----
.../traverser/util/AbstractTraverser.java | 16 +-
.../util/DefaultTraverserGeneratorFactory.java | 12 +-
.../traverser/util/EmptyTraverser.java | 8 +-
.../util/DefaultTraversalSideEffects.java | 27 +-
.../util/EmptyTraversalSideEffects.java | 4 +-
.../tinkerpop/gremlin/structure/Compare.java | 58 +-
.../tinkerpop/gremlin/structure/Element.java | 4 +-
.../tinkerpop/gremlin/structure/Graph.java | 190 +---
.../apache/tinkerpop/gremlin/structure/P.java | 130 +++
.../tinkerpop/gremlin/structure/Property.java | 4 +-
.../apache/tinkerpop/gremlin/structure/T.java | 110 +++
.../gremlin/structure/Transaction.java | 2 +-
.../tinkerpop/gremlin/structure/Vertex.java | 4 +-
.../gremlin/structure/VertexProperty.java | 2 +-
.../gremlin/structure/io/DefaultIo.java | 82 --
.../gremlin/structure/io/GraphMigrator.java | 28 +-
.../gremlin/structure/io/GraphReader.java | 145 +++-
.../gremlin/structure/io/GraphWriter.java | 91 +-
.../tinkerpop/gremlin/structure/io/Io.java | 108 +++
.../tinkerpop/gremlin/structure/io/IoCore.java | 43 +
.../gremlin/structure/io/IoRegistry.java | 81 ++
.../tinkerpop/gremlin/structure/io/Mapper.java | 15 +
.../gremlin/structure/io/graphml/GraphMLIo.java | 116 +++
.../structure/io/graphml/GraphMLMapper.java | 51 ++
.../structure/io/graphml/GraphMLReader.java | 203 +++--
.../structure/io/graphml/GraphMLWriter.java | 75 +-
.../io/graphml/GraphMLWriterHelper.java | 190 ++--
.../structure/io/graphson/GraphSONGraph.java | 90 --
.../structure/io/graphson/GraphSONIo.java | 117 +++
.../structure/io/graphson/GraphSONMapper.java | 30 +-
.../structure/io/graphson/GraphSONModule.java | 287 +------
.../structure/io/graphson/GraphSONReader.java | 293 ++++---
.../io/graphson/GraphSONSerializers.java | 360 ++++++++
.../structure/io/graphson/GraphSONTokens.java | 5 +-
.../structure/io/graphson/GraphSONUtil.java | 45 +
.../structure/io/graphson/GraphSONVertex.java | 94 --
.../io/graphson/GraphSONVertexProperty.java | 93 --
.../structure/io/graphson/GraphSONWriter.java | 120 ++-
.../io/graphson/LegacyGraphSONReader.java | 136 ++-
.../structure/io/gryo/EdgeTerminator.java | 48 --
.../structure/io/gryo/GraphSerializer.java | 164 ----
.../structure/io/gryo/GryoClassResolver.java | 2 +-
.../gremlin/structure/io/gryo/GryoIo.java | 117 +++
.../gremlin/structure/io/gryo/GryoMapper.java | 95 +-
.../gremlin/structure/io/gryo/GryoReader.java | 464 ++++------
.../structure/io/gryo/GryoSerializers.java | 135 +++
.../gremlin/structure/io/gryo/GryoWriter.java | 145 ++--
.../io/gryo/VertexByteArrayInputStream.java | 5 +-
.../structure/io/gryo/VertexTerminator.java | 6 +-
.../structure/util/AbstractTransaction.java | 2 +-
.../gremlin/structure/util/Attachable.java | 369 +++++++-
.../gremlin/structure/util/ElementHelper.java | 26 +-
.../tinkerpop/gremlin/structure/util/Host.java | 27 +
.../structure/util/batch/BatchFeatures.java | 216 -----
.../structure/util/batch/BatchGraph.java | 643 --------------
.../gremlin/structure/util/batch/Exists.java | 62 --
.../structure/util/batch/VertexIdType.java | 65 --
.../util/batch/cache/AbstractIDVertexCache.java | 78 --
.../util/batch/cache/LongIDVertexCache.java | 94 --
.../util/batch/cache/ObjectIDVertexCache.java | 25 -
.../util/batch/cache/StringCompression.java | 29 -
.../util/batch/cache/StringIDVertexCache.java | 87 --
.../util/batch/cache/URLCompression.java | 67 --
.../structure/util/batch/cache/VertexCache.java | 36 -
.../structure/util/detached/DetachedEdge.java | 41 +-
.../util/detached/DetachedElement.java | 4 +
.../structure/util/detached/DetachedPath.java | 19 +-
.../util/detached/DetachedProperty.java | 32 +-
.../structure/util/detached/DetachedVertex.java | 47 +-
.../util/detached/DetachedVertexProperty.java | 38 +-
.../structure/util/reference/ReferenceEdge.java | 19 -
.../util/reference/ReferenceElement.java | 4 +
.../structure/util/reference/ReferencePath.java | 19 +-
.../util/reference/ReferenceProperty.java | 24 +-
.../util/reference/ReferenceVertex.java | 19 -
.../util/reference/ReferenceVertexProperty.java | 32 +-
.../gremlin/structure/util/star/StarGraph.java | 173 ++--
.../util/star/StarGraphGraphSONSerializer.java | 252 ++++++
.../util/star/StarGraphGryoSerializer.java | 148 ++++
.../gremlin/util/iterator/IteratorUtils.java | 14 +
.../step/filter/ConjunctionStepTest.java | 6 +-
.../RangeByIsCountStrategyTest.java | 54 +-
.../process/util/TraversalHelperTest.java | 12 +-
.../gremlin/structure/CompareTest.java | 30 +-
.../gremlin/structure/io/IoRegistryTest.java | 99 +++
.../structure/io/gryo/GryoReaderWriterTest.java | 7 +-
.../structure/util/ElementHelperTest.java | 2 +-
.../tinkerpop/gremlin/driver/Cluster.java | 6 +-
.../ser/AbstractJsonMessageSerializerV1d0.java | 77 +-
.../driver/ser/GryoMessageSerializerV1d0.java | 3 +-
.../ser/JsonMessageSerializerGremlinV1d0.java | 2 +-
.../driver/ser/JsonMessageSerializerV1d0.java | 2 +-
.../gremlin/driver/simple/NioClient.java | 3 +
.../gremlin/driver/simple/WebSocketClient.java | 3 +
.../driver/benchmark/ProfilingApplication.java | 27 +-
.../ser/GryoMessageSerializerV1D0Test.java | 2 +-
.../JsonMessageSerializerGremlinV1d0Test.java | 8 +-
.../ser/JsonMessageSerializerV1d0Test.java | 13 +-
.../process/computer/ComputerTestHelper.groovy | 11 +-
.../step/branch/GroovyLocalTest.groovy | 19 +-
.../step/branch/GroovyRepeatTest.groovy | 12 +-
.../step/branch/GroovyUnionTest.groovy | 10 +-
.../traversal/step/filter/GroovyAndTest.groovy | 13 +-
.../step/filter/GroovyCyclicPathTest.groovy | 8 +-
.../step/filter/GroovyDedupTest.groovy | 2 +-
.../step/filter/GroovyExceptTest.groovy | 12 +-
.../step/filter/GroovyFilterTest.groovy | 6 +-
.../step/filter/GroovyHasNotTest.groovy | 4 +-
.../traversal/step/filter/GroovyHasTest.groovy | 35 +-
.../traversal/step/filter/GroovyIsTest.groovy | 28 +-
.../traversal/step/filter/GroovyOrTest.groovy | 16 +-
.../step/filter/GroovyRetainTest.groovy | 10 +-
.../step/filter/GroovySampleTest.groovy | 2 +-
.../step/filter/GroovySimplePathTest.groovy | 6 +-
.../step/filter/GroovyWhereTest.groovy | 10 +-
.../step/map/GroovyAddVertexTest.groovy | 2 +-
.../step/map/GroovyCoalesceTest.groovy | 8 +-
.../traversal/step/map/GroovyMapTest.groovy | 20 +-
.../traversal/step/map/GroovyMatchTest.groovy | 6 +-
.../traversal/step/map/GroovyPathTest.groovy | 6 +-
.../step/map/GroovyPropertiesTest.groovy | 8 +-
.../traversal/step/map/GroovySelectTest.groovy | 47 +-
.../step/map/GroovyValueMapTest.groovy | 6 +-
.../traversal/step/map/GroovyVertexTest.groovy | 53 +-
.../step/sideEffect/GroovySackTest.groovy | 26 +-
.../sideEffect/GroovySideEffectCapTest.groovy | 2 +-
.../step/sideEffect/GroovySideEffectTest.groovy | 4 +-
.../step/sideEffect/GroovyStoreTest.groovy | 4 +-
.../step/sideEffect/GroovySubgraphTest.groovy | 4 +-
.../step/sideEffect/GroovyTreeTest.groovy | 2 +-
.../groovy/GroovyEnvironmentIntegrateSuite.java | 4 +-
.../GroovyEnvironmentPerformanceSuite.java | 4 +-
.../gremlin/groovy/GroovyEnvironmentSuite.java | 2 +-
.../engine/GremlinExecutorPerformanceTest.java | 4 +-
.../GremlinGroovyScriptEngineOverGraphTest.java | 6 +-
.../process/GroovyProcessComputerSuite.java | 2 +-
.../process/GroovyProcessStandardSuite.java | 2 +-
.../gremlin/groovy/loaders/StepLoader.groovy | 18 +-
.../gremlin/groovy/loaders/SugarLoader.groovy | 38 +-
.../AbstractImportCustomizerProvider.java | 27 +-
.../gremlin/groovy/engine/GremlinExecutor.java | 2 +-
.../groovy/jsr223/DependencyManager.java | 2 +-
.../jsr223/GremlinGroovyScriptEngine.java | 2 +-
gremlin-server/data/sample.kryo | Bin 4781767 -> 2406053 bytes
gremlin-server/scripts/load-sample.groovy | 2 +-
.../gremlin/server/AbstractChannelizer.java | 3 +-
.../handler/HttpGremlinEndpointHandler.java | 4 +-
.../gremlin/server/handler/IteratorHandler.java | 6 +-
.../handler/NioGremlinResponseEncoder.java | 8 +-
.../server/handler/OpExecutorHandler.java | 2 +-
.../server/handler/OpSelectorHandler.java | 2 +-
.../handler/WsGremlinResponseEncoder.java | 8 +-
.../server/op/AbstractEvalOpProcessor.java | 57 +-
.../gremlin/server/op/control/ControlOps.java | 13 +-
.../server/GremlinDriverIntegrateTest.java | 9 +-
.../server/GremlinServerHttpIntegrateTest.java | 3 +-
.../server/GremlinServerIntegrateTest.java | 66 +-
gremlin-shaded/pom.xml | 14 +-
.../gremlin/AbstractGraphProvider.java | 6 +-
.../apache/tinkerpop/gremlin/GraphProvider.java | 23 +-
.../apache/tinkerpop/gremlin/LoadGraphWith.java | 4 +-
.../apache/tinkerpop/gremlin/TestHelper.java | 98 +++
.../process/AbstractGremlinProcessTest.java | 2 +-
.../gremlin/process/ProcessComputerSuite.java | 2 +-
.../process/ProcessPerformanceSuite.java | 2 +-
.../gremlin/process/ProcessStandardSuite.java | 2 +-
.../process/traversal/CoreTraversalTest.java | 2 +-
.../traversal/TraversalSideEffectsTest.java | 6 +-
.../traversal/step/branch/BranchTest.java | 4 +-
.../traversal/step/branch/ChooseTest.java | 2 +-
.../traversal/step/branch/LocalTest.java | 2 +-
.../traversal/step/branch/RepeatTest.java | 8 +-
.../traversal/step/branch/UnionTest.java | 3 +-
.../process/traversal/step/filter/AndTest.java | 15 +-
.../traversal/step/filter/CyclicPathTest.java | 2 +-
.../traversal/step/filter/DedupTest.java | 4 +-
.../traversal/step/filter/ExceptTest.java | 18 +-
.../traversal/step/filter/FilterTest.java | 8 +-
.../traversal/step/filter/HasNotTest.java | 4 +-
.../process/traversal/step/filter/HasTest.java | 19 +-
.../process/traversal/step/filter/IsTest.java | 24 +-
.../process/traversal/step/filter/OrTest.java | 12 +-
.../traversal/step/filter/SampleTest.java | 2 +-
.../traversal/step/filter/WhereTest.java | 14 +-
.../traversal/step/map/AddVertexTest.java | 2 +-
.../traversal/step/map/CoalesceTest.java | 20 +-
.../process/traversal/step/map/FoldTest.java | 6 +-
.../process/traversal/step/map/MapTest.java | 18 +-
.../process/traversal/step/map/MatchTest.java | 16 +-
.../traversal/step/map/PropertiesTest.java | 2 +-
.../process/traversal/step/map/SelectTest.java | 88 +-
.../process/traversal/step/map/VertexTest.java | 7 +-
.../step/sideEffect/AggregateTest.java | 10 +-
.../step/sideEffect/GroupCountTest.java | 4 +-
.../traversal/step/sideEffect/GroupTest.java | 2 +-
.../traversal/step/sideEffect/InjectTest.java | 2 +-
.../traversal/step/sideEffect/ProfileTest.java | 14 +-
.../traversal/step/sideEffect/SackTest.java | 28 +-
.../step/sideEffect/SideEffectCapTest.java | 4 +-
.../step/sideEffect/SideEffectTest.java | 10 +-
.../traversal/step/sideEffect/StoreTest.java | 6 +-
.../traversal/step/sideEffect/SubgraphTest.java | 10 +-
.../traversal/step/sideEffect/TreeTest.java | 8 +-
.../ElementIdStrategyProcessTest.java | 2 +-
.../decoration/EventStrategyProcessTest.java | 13 +-
.../tinkerpop/gremlin/structure/BatchTest.java | 476 ----------
.../gremlin/structure/FeatureSupportTest.java | 1 -
.../tinkerpop/gremlin/structure/GraphTest.java | 1 -
.../structure/GraphWritePerformanceTest.java | 9 +-
.../tinkerpop/gremlin/structure/IoTest.java | 860 ++++++++-----------
.../gremlin/structure/PropertyTest.java | 4 +-
.../gremlin/structure/SerializationTest.java | 79 +-
.../structure/StructurePerformanceSuite.java | 2 +-
.../structure/StructureStandardSuite.java | 12 +-
.../gremlin/structure/VertexPropertyTest.java | 3 +-
.../tinkerpop/gremlin/structure/VertexTest.java | 4 -
.../util/detached/DetachedEdgeTest.java | 5 +-
.../util/detached/DetachedGraphTest.java | 96 +++
.../util/detached/DetachedPropertyTest.java | 9 +-
.../detached/DetachedVertexPropertyTest.java | 9 +-
.../util/detached/DetachedVertexTest.java | 23 +-
.../util/reference/ReferenceEdgeTest.java | 7 +-
.../util/reference/ReferenceGraphTest.java | 54 ++
.../reference/ReferenceVertexPropertyTest.java | 9 +-
.../util/reference/ReferenceVertexTest.java | 5 +-
.../structure/util/star/StarGraphTest.java | 231 ++---
.../gremlin/util/Log4jRecordingAppender.java | 66 ++
.../io/graphson/grateful-dead-typed.json | 808 +++++++++++++++++
.../io/graphson/grateful-dead-vertices.ldjson | 808 -----------------
.../structure/io/graphson/grateful-dead.json | 809 ++++++++++++++++-
.../graphson/tinkerpop-classic-normalized.json | 7 +-
.../io/graphson/tinkerpop-classic-typed.json | 7 +-
.../graphson/tinkerpop-classic-vertices.ldjson | 6 -
.../io/graphson/tinkerpop-classic.json | 7 +-
.../io/graphson/tinkerpop-crew-typed.json | 7 +-
.../io/graphson/tinkerpop-crew-vertices.ldjson | 6 -
.../structure/io/graphson/tinkerpop-crew.json | 7 +-
.../graphson/tinkerpop-modern-normalized.json | 7 +-
.../io/graphson/tinkerpop-modern-typed.json | 7 +-
.../graphson/tinkerpop-modern-vertices.ldjson | 6 -
.../structure/io/graphson/tinkerpop-modern.json | 7 +-
.../io/gryo/grateful-dead-vertices.kryo | Bin 975214 -> 0 bytes
.../structure/io/gryo/grateful-dead.kryo | Bin 493339 -> 331418 bytes
.../io/gryo/tinkerpop-classic-vertices.kryo | Bin 1179 -> 0 bytes
.../structure/io/gryo/tinkerpop-classic.kryo | Bin 765 -> 723 bytes
.../io/gryo/tinkerpop-crew-vertices.kryo | Bin 2575 -> 0 bytes
.../structure/io/gryo/tinkerpop-crew.kryo | Bin 1858 -> 1380 bytes
.../io/gryo/tinkerpop-modern-vertices.kryo | Bin 1295 -> 0 bytes
.../structure/io/gryo/tinkerpop-modern.kryo | Bin 825 -> 775 bytes
.../util/Log4jRecordingAppenderTest.java | 79 ++
.../hadoop/groovy/plugin/HadoopLoader.groovy | 16 +-
.../computer/giraph/GiraphWorkerContext.java | 1 -
.../process/computer/spark/SparkExecutor.java | 28 +-
.../computer/spark/SparkGraphComputer.java | 6 +-
.../hadoop/structure/io/ObjectWritable.java | 5 +-
.../hadoop/structure/io/VertexWritable.java | 10 +-
.../io/graphson/GraphSONRecordReader.java | 9 +-
.../structure/io/gryo/GryoOutputFormat.java | 4 -
.../structure/io/gryo/GryoRecordReader.java | 37 +-
.../structure/io/script/ScriptRecordReader.java | 2 +-
.../gremlin/hadoop/HadoopGraphProvider.java | 26 +-
.../io/TestFileReaderWriterHelper.java | 123 +++
.../hadoop/structure/io/VertexWritableTest.java | 96 +++
.../GraphSONRecordReaderWriterTest.java | 87 +-
.../io/gryo/GryoRecordReaderWriterTest.java | 83 +-
pom.xml | 4 +-
tinkergraph-gremlin/pom.xml | 5 +-
.../graph/DefaultVariableGraphTraversal.java | 8 +-
.../dsl/graph/VariableGraphTraversal.java | 21 +-
.../tinkergraph/structure/TinkerEdge.java | 2 +-
.../tinkergraph/structure/TinkerFactory.java | 2 +-
.../tinkergraph/structure/TinkerGraph.java | 6 +-
.../tinkergraph/TinkerGraphProvider.java | 8 +-
.../structure/IoDataGenerationTest.java | 278 ++++++
.../structure/TinkerGraphIdManagerTest.java | 2 +-
.../tinkergraph/structure/TinkerGraphTest.java | 397 +--------
357 files changed, 10511 insertions(+), 9131 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/bd54cf69/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/traversal/dsl/graph/DefaultVariableGraphTraversal.java
----------------------------------------------------------------------
diff --cc tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/traversal/dsl/graph/DefaultVariableGraphTraversal.java
index eb05e27,0000000..124726f
mode 100644,000000..100644
--- a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/traversal/dsl/graph/DefaultVariableGraphTraversal.java
+++ b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/traversal/dsl/graph/DefaultVariableGraphTraversal.java
@@@ -1,155 -1,0 +1,153 @@@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.tinkergraph.process.traversal.dsl.graph;
+
+import org.apache.tinkerpop.gremlin.process.traversal.Scope;
+import org.apache.tinkerpop.gremlin.process.traversal.Scopeable;
+import org.apache.tinkerpop.gremlin.process.traversal.Step;
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.step.filter.HasStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.filter.IsStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.filter.RangeGlobalStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.RangeLocalStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.util.HasContainer;
+import org.apache.tinkerpop.gremlin.process.traversal.util.DefaultTraversal;
+import org.apache.tinkerpop.gremlin.structure.Graph;
++import org.apache.tinkerpop.gremlin.structure.P;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.BiPredicate;
+
+/**
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+public class DefaultVariableGraphTraversal<S, E> extends DefaultTraversal<S, E> implements VariableGraphTraversal.Admin<S, E> {
+
+ private final Map<Step, List<TraversalVariablePosition>> stepVariables = new HashMap<>();
+
+ public DefaultVariableGraphTraversal(final Graph graph) {
+ super(graph);
+ }
+
+ @Override
+ public VariableGraphTraversal.Admin<S, E> asAdmin() {
+ return this;
+ }
+
+ @Override
+ public VariableGraphTraversal<S, E> iterate() {
+ return VariableGraphTraversal.Admin.super.iterate();
+ }
+
+ @Override
+ public DefaultVariableGraphTraversal<S, E> clone() {
+ return (DefaultVariableGraphTraversal<S, E>) super.clone();
+ }
+
+ @Override
+ public Map<Step, List<TraversalVariablePosition>> getStepVariables() {
+ return stepVariables;
+ }
+
+ @Override
+ public VariableGraphTraversal<S, E> has(final CharSequence key, final BiPredicate predicate, final Object value) {
+ final String k;
+ final List<TraversalVariablePosition> variablePositions = new ArrayList<>();
+ if ((key instanceof TraversalVariable)) {
+ final TraversalVariable var = (TraversalVariable) key;
+ k = var.getDefaultString();
+
+ final TraversalVariablePosition variablePosition = new TraversalVariablePosition(var, 0);
+ variablePositions.add(variablePosition);
+ } else {
+ k = key != null ? key.toString() : null;
+ }
+
+ if ((predicate instanceof TraversalVariable))
+ variablePositions.add(new TraversalVariablePosition((TraversalVariable) predicate, 1));
+ if ((value instanceof TraversalVariable))
+ variablePositions.add(new TraversalVariablePosition((TraversalVariable) value, 2));
+
+ final Step s = new HasStep(this.asAdmin(), new HasContainer(k, predicate, value));
+ stepVariables.put(s, variablePositions);
+ return this.asAdmin().addStep(s);
+ }
+
+ @Override
- public VariableGraphTraversal<S, E> is(final BiPredicate predicate, final Object value) {
++ public VariableGraphTraversal<S, E> is(final Object value) {
+ final List<TraversalVariablePosition> variablePositions = new ArrayList<>();
- if ((predicate instanceof TraversalVariable))
- variablePositions.add(new TraversalVariablePosition((TraversalVariable) predicate, 0));
-
+ if ((value instanceof TraversalVariable))
+ variablePositions.add(new TraversalVariablePosition((TraversalVariable) value, 1));
+
- final Step s = new IsStep(this.asAdmin(), predicate, value);
++ final Step s = new IsStep(this.asAdmin(), P.eq(value));
+ stepVariables.put(s, variablePositions);
+ return this.asAdmin().addStep(s);
+ }
+
+ @Override
+ public VariableGraphTraversal<S, E> range(final Scopeable scope, final Number low, final Number high) {
+ // this one is tricky because Scope is an enum - enums would have to implement an interface that
+ // TraversalVariable could implement. maybe we just add a Scopeable interface as a marker to
+ // arrange for that. that seems pretty non-intrusive.
+ final List<TraversalVariablePosition> variablePositions = new ArrayList<>();
+
+ final int l;
+ if ((low instanceof TraversalVariable)) {
+ final TraversalVariable var = (TraversalVariable) low;
+ l = var.intValue();
+
+ final TraversalVariablePosition variablePosition = new TraversalVariablePosition(var, 0);
+ variablePositions.add(variablePosition);
+ } else {
+ l = low != null ? low.intValue() : 0;
+ }
+
+ final int h;
+ if ((high instanceof TraversalVariable)) {
+ final TraversalVariable var = (TraversalVariable) high;
+ h = var.intValue();
+
+ final TraversalVariablePosition variablePosition = new TraversalVariablePosition(var, 1);
+ variablePositions.add(variablePosition);
+ } else {
+ h = high != null ? high.intValue() : 0;
+ }
+
+ // scope is a tricky one. scope determines the step that is added. if it is parameterized then there is
+ // no way to know which step will be used. added a "decision" step to mark that position and be a holder
+ // for the variables.
+ final Step s;
+ if ((scope instanceof TraversalVariable)) {
+ final TraversalVariable var = (TraversalVariable) scope;
+ s = new RangeDecisionStep(this.asAdmin(), l, h, var);
+ final TraversalVariablePosition variablePosition = new TraversalVariablePosition(var, -1);
+ variablePositions.add(variablePosition);
+ } else {
+ s = scope.equals(Scope.global)
+ ? new RangeGlobalStep<>(this.asAdmin(), l, h)
+ : new RangeLocalStep<>(this.asAdmin(), l, h);
+ }
+
+ stepVariables.put(s, variablePositions);
+ return this.asAdmin().addStep(s);
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/bd54cf69/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/traversal/dsl/graph/VariableGraphTraversal.java
----------------------------------------------------------------------
diff --cc tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/traversal/dsl/graph/VariableGraphTraversal.java
index 52f0876,0000000..eda9307
mode 100644,000000..100644
--- a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/traversal/dsl/graph/VariableGraphTraversal.java
+++ b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/traversal/dsl/graph/VariableGraphTraversal.java
@@@ -1,827 -1,0 +1,824 @@@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.tinkergraph.process.traversal.dsl.graph;
+
+import org.apache.tinkerpop.gremlin.process.traversal.Path;
+import org.apache.tinkerpop.gremlin.process.traversal.Scope;
+import org.apache.tinkerpop.gremlin.process.traversal.Scopeable;
+import org.apache.tinkerpop.gremlin.process.traversal.Step;
- import org.apache.tinkerpop.gremlin.process.traversal.T;
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
+import org.apache.tinkerpop.gremlin.process.traversal.lambda.ElementValueTraversal;
+import org.apache.tinkerpop.gremlin.process.traversal.lambda.FilterTraversal;
+import org.apache.tinkerpop.gremlin.process.traversal.lambda.FilterTraverserTraversal;
+import org.apache.tinkerpop.gremlin.process.traversal.lambda.IdentityTraversal;
+import org.apache.tinkerpop.gremlin.process.traversal.lambda.LoopTraversal;
+import org.apache.tinkerpop.gremlin.process.traversal.lambda.MapTraversal;
+import org.apache.tinkerpop.gremlin.process.traversal.lambda.MapTraverserTraversal;
+import org.apache.tinkerpop.gremlin.process.traversal.lambda.TokenTraversal;
+import org.apache.tinkerpop.gremlin.process.traversal.lambda.TrueTraversal;
+import org.apache.tinkerpop.gremlin.process.traversal.step.ComparatorHolder;
+import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalOptionParent;
+import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalParent;
+import org.apache.tinkerpop.gremlin.process.traversal.step.branch.BranchStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.branch.ChooseStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.branch.LocalStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.branch.RepeatStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.branch.UnionStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.filter.AndStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.filter.CoinStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.filter.CyclicPathStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.filter.DedupGlobalStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.filter.DropStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.filter.ExceptStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.filter.HasStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.filter.HasTraversalStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.filter.IsStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.filter.LambdaFilterStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.filter.OrStep;
- import org.apache.tinkerpop.gremlin.process.traversal.step.filter.RangeGlobalStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.filter.RetainStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.filter.SampleGlobalStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.filter.SimplePathStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.filter.TimeLimitStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.filter.WhereStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.AddEdgeByPathStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.AddEdgeStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.AddVertexStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.CoalesceStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.CountGlobalStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.CountLocalStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.DedupLocalStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.EdgeOtherVertexStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.EdgeVertexStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.FoldStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.GroupCountStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.GroupStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.IdStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.KeyStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.LabelStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.LambdaFlatMapStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.LambdaMapStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.MaxGlobalStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.MaxLocalStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.MeanGlobalStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.MeanLocalStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.MinGlobalStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.MinLocalStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.OrderGlobalStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.OrderLocalStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.PathStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.PropertiesStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.PropertyMapStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.PropertyValueStep;
- import org.apache.tinkerpop.gremlin.process.traversal.step.map.RangeLocalStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.SackStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.SampleLocalStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.SelectOneStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.SelectStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.SumGlobalStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.SumLocalStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.TreeStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.UnfoldStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.VertexStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.match.MatchStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.AddPropertyStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.AggregateStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.GroupCountSideEffectStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.GroupSideEffectStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.IdentityStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.InjectStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.LambdaSideEffectStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.ProfileStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.SackElementValueStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.SackObjectStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.SideEffectCapStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.StartStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.StoreStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.SubgraphStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.TreeSideEffectStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.util.CollectingBarrierStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.util.ElementFunctionComparator;
+import org.apache.tinkerpop.gremlin.process.traversal.step.util.ElementValueComparator;
+import org.apache.tinkerpop.gremlin.process.traversal.step.util.HasContainer;
+import org.apache.tinkerpop.gremlin.process.traversal.step.util.PathIdentityStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.util.TraversalComparator;
+import org.apache.tinkerpop.gremlin.process.traversal.step.util.Tree;
+import org.apache.tinkerpop.gremlin.process.traversal.traverser.util.TraverserSet;
+import org.apache.tinkerpop.gremlin.structure.Compare;
+import org.apache.tinkerpop.gremlin.structure.Contains;
+import org.apache.tinkerpop.gremlin.structure.Direction;
+import org.apache.tinkerpop.gremlin.structure.Edge;
+import org.apache.tinkerpop.gremlin.structure.Element;
+import org.apache.tinkerpop.gremlin.structure.Order;
++import org.apache.tinkerpop.gremlin.structure.P;
+import org.apache.tinkerpop.gremlin.structure.Property;
+import org.apache.tinkerpop.gremlin.structure.PropertyType;
++import org.apache.tinkerpop.gremlin.structure.T;
+import org.apache.tinkerpop.gremlin.structure.Vertex;
+import org.apache.tinkerpop.gremlin.structure.VertexProperty;
+import org.apache.tinkerpop.gremlin.util.function.ConstantSupplier;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.function.BiFunction;
+import java.util.function.BiPredicate;
+import java.util.function.BinaryOperator;
+import java.util.function.Consumer;
+import java.util.function.Function;
+import java.util.function.Predicate;
+import java.util.function.Supplier;
+import java.util.function.UnaryOperator;
+
+/**
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+public interface VariableGraphTraversal<S, E> extends Traversal<S, E> {
+
+ public interface Admin<S, E> extends Traversal.Admin<S, E>, VariableGraphTraversal<S, E> {
+
+ @Override
+ public default <E2> VariableGraphTraversal.Admin<S, E2> addStep(final Step<?, E2> step) {
+ return (VariableGraphTraversal.Admin<S, E2>) Traversal.Admin.super.addStep((Step) step);
+ }
+
+ @Override
+ public default VariableGraphTraversal<S, E> iterate() {
+ return VariableGraphTraversal.super.iterate();
+ }
+
+ @Override
+ public VariableGraphTraversal.Admin<S, E> clone();
+ }
+
+ @Override
+ public default VariableGraphTraversal.Admin<S, E> asAdmin() {
+ return (VariableGraphTraversal.Admin<S, E>) this;
+ }
+
+ public Map<Step, List<TraversalVariablePosition>> getStepVariables();
+
+ ///////////////////// MAP STEPS /////////////////////
+
+ public default <E2> VariableGraphTraversal<S, E2> map(final Function<Traverser<E>, E2> function) {
+ return this.asAdmin().addStep(new LambdaMapStep<>(this.asAdmin(), function));
+ }
+
+ public default <E2> VariableGraphTraversal<S, E2> flatMap(final Function<Traverser<E>, Iterator<E2>> function) {
+ return this.asAdmin().addStep(new LambdaFlatMapStep<>(this.asAdmin(), function));
+ }
+
+ public default VariableGraphTraversal<S, Object> id() {
+ return this.asAdmin().addStep(new IdStep<>(this.asAdmin()));
+ }
+
+ public default VariableGraphTraversal<S, String> label() {
+ return this.asAdmin().addStep(new LabelStep<>(this.asAdmin()));
+ }
+
+ public default VariableGraphTraversal<S, E> identity() {
+ return this.asAdmin().addStep(new IdentityStep<>(this.asAdmin()));
+ }
+
+ public default VariableGraphTraversal<S, Vertex> to(final Direction direction, final String... edgeLabels) {
+ return this.asAdmin().addStep(new VertexStep<>(this.asAdmin(), Vertex.class, direction, edgeLabels));
+ }
+
+ public default VariableGraphTraversal<S, Vertex> out(final String... edgeLabels) {
+ return this.to(Direction.OUT, edgeLabels);
+ }
+
+ public default VariableGraphTraversal<S, Vertex> in(final String... edgeLabels) {
+ return this.to(Direction.IN, edgeLabels);
+ }
+
+ public default VariableGraphTraversal<S, Vertex> both(final String... edgeLabels) {
+ return this.to(Direction.BOTH, edgeLabels);
+ }
+
+ public default VariableGraphTraversal<S, Edge> toE(final Direction direction, final String... edgeLabels) {
+ return this.asAdmin().addStep(new VertexStep<>(this.asAdmin(), Edge.class, direction, edgeLabels));
+ }
+
+ public default VariableGraphTraversal<S, Edge> outE(final String... edgeLabels) {
+ return this.toE(Direction.OUT, edgeLabels);
+ }
+
+ public default VariableGraphTraversal<S, Edge> inE(final String... edgeLabels) {
+ return this.toE(Direction.IN, edgeLabels);
+ }
+
+ public default VariableGraphTraversal<S, Edge> bothE(final String... edgeLabels) {
+ return this.toE(Direction.BOTH, edgeLabels);
+ }
+
+ public default VariableGraphTraversal<S, Vertex> toV(final Direction direction) {
+ return this.asAdmin().addStep(new EdgeVertexStep(this.asAdmin(), direction));
+ }
+
+ public default VariableGraphTraversal<S, Vertex> inV() {
+ return this.toV(Direction.IN);
+ }
+
+ public default VariableGraphTraversal<S, Vertex> outV() {
+ return this.toV(Direction.OUT);
+ }
+
+ public default VariableGraphTraversal<S, Vertex> bothV() {
+ return this.toV(Direction.BOTH);
+ }
+
+ public default VariableGraphTraversal<S, Vertex> otherV() {
+ return this.asAdmin().addStep(new EdgeOtherVertexStep(this.asAdmin()));
+ }
+
+ public default VariableGraphTraversal<S, E> order() {
+ return this.order(Scope.global);
+ }
+
+ public default VariableGraphTraversal<S, E> order(final Scope scope) {
+ return this.asAdmin().addStep(scope.equals(Scope.global) ? new OrderGlobalStep<>(this.asAdmin()) : new OrderLocalStep<>(this.asAdmin()));
+ }
+
+ public default <E2> VariableGraphTraversal<S, ? extends Property<E2>> properties(final String... propertyKeys) {
+ return this.asAdmin().addStep(new PropertiesStep<>(this.asAdmin(), PropertyType.PROPERTY, propertyKeys));
+ }
+
+ public default <E2> VariableGraphTraversal<S, E2> values(final String... propertyKeys) {
+ return this.asAdmin().addStep(new PropertiesStep<>(this.asAdmin(), PropertyType.VALUE, propertyKeys));
+ }
+
+ public default <E2> VariableGraphTraversal<S, Map<String, E2>> propertyMap(final String... propertyKeys) {
+ return this.asAdmin().addStep(new PropertyMapStep<>(this.asAdmin(), false, PropertyType.PROPERTY, propertyKeys));
+ }
+
+ public default <E2> VariableGraphTraversal<S, Map<String, E2>> valueMap(final String... propertyKeys) {
+ return this.asAdmin().addStep(new PropertyMapStep<>(this.asAdmin(), false, PropertyType.VALUE, propertyKeys));
+ }
+
+ public default <E2> VariableGraphTraversal<S, Map<String, E2>> valueMap(final boolean includeTokens, final String... propertyKeys) {
+ return this.asAdmin().addStep(new PropertyMapStep<>(this.asAdmin(), includeTokens, PropertyType.VALUE, propertyKeys));
+ }
+
+ public default VariableGraphTraversal<S, String> key() {
+ return this.asAdmin().addStep(new KeyStep(this.asAdmin()));
+ }
+
+ public default <E2> VariableGraphTraversal<S, E2> value() {
+ return this.asAdmin().addStep(new PropertyValueStep<>(this.asAdmin()));
+ }
+
+ public default VariableGraphTraversal<S, Path> path() {
+ return this.asAdmin().addStep(new PathStep<>(this.asAdmin()));
+ }
+
+ public default <E2> VariableGraphTraversal<S, Map<String, E2>> match(final String startLabel, final Traversal... traversals) {
+ return (VariableGraphTraversal) this.asAdmin().addStep(new MatchStep<E, Map<String, E2>>(this.asAdmin(), startLabel, traversals));
+ }
+
+ public default <E2> VariableGraphTraversal<S, E2> sack() {
+ return this.asAdmin().addStep(new SackStep<>(this.asAdmin()));
+ }
+
+ public default <E2> VariableGraphTraversal<S, Map<String, E2>> select(final String... stepLabels) {
+ return this.asAdmin().addStep(new SelectStep<>(this.asAdmin(), stepLabels));
+ }
+
+ public default <E2> VariableGraphTraversal<S, E2> select(final String stepLabel) {
+ return this.asAdmin().addStep(new SelectOneStep(this.asAdmin(), stepLabel));
+ }
+
+ public default <E2> VariableGraphTraversal<S, E2> unfold() {
+ return this.asAdmin().addStep(new UnfoldStep<>(this.asAdmin()));
+ }
+
+ public default VariableGraphTraversal<S, List<E>> fold() {
+ return this.asAdmin().addStep(new FoldStep<>(this.asAdmin()));
+ }
+
+ public default <E2> VariableGraphTraversal<S, E2> fold(final E2 seed, final BiFunction<E2, E, E2> foldFunction) {
+ return this.asAdmin().addStep(new FoldStep<>(this.asAdmin(), new ConstantSupplier<>(seed), foldFunction)); // TODO: User should provide supplier?
+ }
+
+ public default VariableGraphTraversal<S, Long> count() {
+ return this.count(Scope.global);
+ }
+
+ public default VariableGraphTraversal<S, Long> count(final Scope scope) {
+ return this.asAdmin().addStep(scope.equals(Scope.global) ? new CountGlobalStep<>(this.asAdmin()) : new CountLocalStep<>(this.asAdmin()));
+ }
+
+ public default VariableGraphTraversal<S, Double> sum() {
+ return this.sum(Scope.global);
+ }
+
+ public default VariableGraphTraversal<S, Double> sum(final Scope scope) {
+ return this.asAdmin().addStep(scope.equals(Scope.global) ? new SumGlobalStep(this.asAdmin()) : new SumLocalStep<>(this.asAdmin()));
+ }
+
+ public default <E2 extends Number> VariableGraphTraversal<S, E2> max() {
+ return this.max(Scope.global);
+ }
+
+ public default <E2 extends Number> VariableGraphTraversal<S, E2> max(final Scope scope) {
+ return this.asAdmin().addStep(scope.equals(Scope.global) ? new MaxGlobalStep<E2>(this.asAdmin()) : new MaxLocalStep(this.asAdmin()));
+ }
+
+ public default <E2 extends Number> VariableGraphTraversal<S, E2> min() {
+ return this.min(Scope.global);
+ }
+
+ public default <E2 extends Number> VariableGraphTraversal<S, E2> min(final Scope scope) {
+ return this.asAdmin().addStep(scope.equals(Scope.global) ? new MinGlobalStep<E2>(this.asAdmin()) : new MinLocalStep(this.asAdmin()));
+ }
+
+
+ public default VariableGraphTraversal<S, Double> mean() {
+ return this.mean(Scope.global);
+ }
+
+ public default VariableGraphTraversal<S, Double> mean(final Scope scope) {
+ return this.asAdmin().addStep(scope.equals(Scope.global) ? new MeanGlobalStep<>(this.asAdmin()) : new MeanLocalStep<>(this.asAdmin()));
+ }
+
+ public default <K, R> VariableGraphTraversal<S, Map<K, R>> group() {
+ return this.asAdmin().addStep(new GroupStep<>(this.asAdmin()));
+ }
+
+ public default <E2> VariableGraphTraversal<S, Map<E2, Long>> groupCount() {
+ return this.asAdmin().addStep(new GroupCountStep<>(this.asAdmin()));
+ }
+
+ public default VariableGraphTraversal<S, Tree> tree() {
+ return this.asAdmin().addStep(new TreeStep<>(this.asAdmin()));
+ }
+
+ public default VariableGraphTraversal<S, Vertex> addV(final Object... keyValues) {
+ return this.asAdmin().addStep(new AddVertexStep<>(this.asAdmin(), keyValues));
+ }
+
+ public default VariableGraphTraversal<S, Edge> addE(final Direction direction, final String edgeLabel, final String stepLabel, final Object... propertyKeyValues) {
+ return this.asAdmin().addStep(new AddEdgeByPathStep(this.asAdmin(), direction, edgeLabel, stepLabel, propertyKeyValues));
+ }
+
+ public default VariableGraphTraversal<S, Edge> addE(final Direction direction, final String edgeLabel, final Vertex otherVertex, final Object... propertyKeyValues) {
+ return this.asAdmin().addStep(new AddEdgeStep(this.asAdmin(), direction, edgeLabel, otherVertex, propertyKeyValues));
+ }
+
+ public default VariableGraphTraversal<S, Edge> addE(final Direction direction, final String edgeLabel, final Iterator<Vertex> otherVertices, final Object... propertyKeyValues) {
+ return this.asAdmin().addStep(new AddEdgeStep(this.asAdmin(), direction, edgeLabel, otherVertices, propertyKeyValues));
+ }
+
+ public default VariableGraphTraversal<S, Edge> addInE(final String edgeLabel, final String stepLabel, final Object... propertyKeyValues) {
+ return this.addE(Direction.IN, edgeLabel, stepLabel, propertyKeyValues);
+ }
+
+ public default VariableGraphTraversal<S, Edge> addInE(final String edgeLabel, final Vertex otherVertex, final Object... propertyKeyValues) {
+ return this.addE(Direction.IN, edgeLabel, otherVertex, propertyKeyValues);
+ }
+
+ public default VariableGraphTraversal<S, Edge> addInE(final String edgeLabel, final Iterator<Vertex> otherVertices, final Object... propertyKeyValues) {
+ return this.addE(Direction.IN, edgeLabel, otherVertices, propertyKeyValues);
+ }
+
+ public default VariableGraphTraversal<S, Edge> addOutE(final String edgeLabel, final String stepLabel, final Object... propertyKeyValues) {
+ return this.addE(Direction.OUT, edgeLabel, stepLabel, propertyKeyValues);
+ }
+
+ public default VariableGraphTraversal<S, Edge> addOutE(final String edgeLabel, final Vertex otherVertex, final Object... propertyKeyValues) {
+ return this.addE(Direction.OUT, edgeLabel, otherVertex, propertyKeyValues);
+ }
+
+ public default VariableGraphTraversal<S, Edge> addOutE(final String edgeLabel, final Iterator<Vertex> otherVertices, final Object... propertyKeyValues) {
+ return this.addE(Direction.OUT, edgeLabel, otherVertices, propertyKeyValues);
+ }
+
+ ///////////////////// FILTER STEPS /////////////////////
+
+ public default VariableGraphTraversal<S, E> filter(final Predicate<Traverser<E>> predicate) {
+ return this.asAdmin().addStep(new LambdaFilterStep<>(this.asAdmin(), predicate));
+ }
+
+ public default VariableGraphTraversal<S, E> or(final Traversal<?, ?>... orTraversals) {
+ return this.asAdmin().addStep(0 == orTraversals.length ?
+ new OrStep.OrMarker<>(this.asAdmin()) :
+ new OrStep(this.asAdmin(), Arrays.copyOf(orTraversals, orTraversals.length, Traversal.Admin[].class)));
+ }
+
+ public default VariableGraphTraversal<S, E> and(final Traversal<?, ?>... andTraversals) {
+ return this.asAdmin().addStep(0 == andTraversals.length ?
+ new AndStep.AndMarker<>(this.asAdmin()) :
+ new AndStep(this.asAdmin(), Arrays.copyOf(andTraversals, andTraversals.length, Traversal.Admin[].class)));
+ }
+
+ public default VariableGraphTraversal<S, E> inject(final E... injections) {
+ return this.asAdmin().addStep(new InjectStep<>(this.asAdmin(), injections));
+ }
+
+ public default VariableGraphTraversal<S, E> dedup() {
+ return this.dedup(Scope.global);
+ }
+
+ public default VariableGraphTraversal<S, E> dedup(final Scope scope) {
+ return this.asAdmin().addStep(scope.equals(Scope.global) ? new DedupGlobalStep<>(this.asAdmin()) : new DedupLocalStep(this.asAdmin()));
+ }
+
+ public default VariableGraphTraversal<S, E> except(final String sideEffectKeyOrPathLabel) {
+ return this.asAdmin().addStep(new ExceptStep<E>(this.asAdmin(), sideEffectKeyOrPathLabel));
+ }
+
+ public default VariableGraphTraversal<S, E> except(final E exceptObject) {
+ return this.asAdmin().addStep(new ExceptStep<>(this.asAdmin(), exceptObject));
+ }
+
+ public default VariableGraphTraversal<S, E> except(final Collection<E> exceptCollection) {
+ return this.asAdmin().addStep(new ExceptStep<>(this.asAdmin(), exceptCollection));
+ }
+
- public default <E2> VariableGraphTraversal<S, Map<String, E2>> where(final String firstKey, final String secondKey, final BiPredicate predicate) {
- return this.asAdmin().addStep(new WhereStep(this.asAdmin(), firstKey, secondKey, predicate));
- }
-
- public default <E2> VariableGraphTraversal<S, Map<String, E2>> where(final String firstKey, final BiPredicate predicate, final String secondKey) {
- return this.where(firstKey, secondKey, predicate);
++ public default <E2> VariableGraphTraversal<S, Map<String, E2>> where(final String firstKey, final P<?> predicate) {
++ return this.asAdmin().addStep(new WhereStep<>(this.asAdmin(), firstKey, predicate));
+ }
+
+ public default <E2> VariableGraphTraversal<S, Map<String, E2>> where(final Traversal constraint) {
+ return this.asAdmin().addStep(new WhereStep<>(this.asAdmin(), constraint.asAdmin()));
+ }
+
+ public default VariableGraphTraversal<S, E> has(final Traversal<?, ?> hasNextTraversal) {
+ return this.asAdmin().addStep(new HasTraversalStep<>(this.asAdmin(), (Traversal.Admin<E, ?>) hasNextTraversal, false));
+ }
+
+ public default VariableGraphTraversal<S, E> hasNot(final Traversal<?, ?> hasNotNextTraversal) {
+ return this.asAdmin().addStep(new HasTraversalStep<>(this.asAdmin(), (Traversal.Admin<E, ?>) hasNotNextTraversal, true));
+ }
+
+ public default VariableGraphTraversal<S, E> has(final String key) {
+ return this.asAdmin().addStep(new HasStep(this.asAdmin(), new HasContainer(key, Contains.within)));
+ }
+
+ public default VariableGraphTraversal<S, E> has(final String key, final Object value) {
+ return this.has(key, Compare.eq, value);
+ }
+
+ public default VariableGraphTraversal<S, E> has(final T accessor, final Object value) {
+ return this.has(accessor.getAccessor(), value);
+ }
+
+ public VariableGraphTraversal<S, E> has(final CharSequence key, final BiPredicate predicate, final Object value);
+
+ public default VariableGraphTraversal<S, E> has(final T accessor, final BiPredicate predicate, final Object value) {
+ return this.has(accessor.getAccessor(), predicate, value);
+ }
+
+ public default VariableGraphTraversal<S, E> has(final String label, final String key, final Object value) {
+ return this.has(label, key, Compare.eq, value);
+ }
+
+ public default VariableGraphTraversal<S, E> has(final String label, final String key, final BiPredicate predicate, final Object value) {
+ return this.has(T.label, label).has(key, predicate, value);
+ }
+
+ public default VariableGraphTraversal<S, E> hasNot(final String key) {
+ return this.asAdmin().addStep(new HasStep(this.asAdmin(), new HasContainer(key, Contains.without)));
+ }
+
+ public default VariableGraphTraversal<S, E> hasLabel(final String... labels) {
+ return labels.length == 1 ? this.has(T.label, labels[0]) : this.has(T.label, Contains.within, Arrays.asList(labels));
+ }
+
+ public default VariableGraphTraversal<S, E> hasId(final Object... ids) {
+ return ids.length == 1 ? this.has(T.id, ids[0]) : this.has(T.id, Contains.within, Arrays.asList(ids));
+ }
+
+ public default VariableGraphTraversal<S, E> hasKey(final String... keys) {
+ return keys.length == 1 ? this.has(T.key, keys[0]) : this.has(T.key, Contains.within, Arrays.asList(keys));
+ }
+
+ public default VariableGraphTraversal<S, E> hasValue(final Object... values) {
+ return values.length == 1 ? this.has(T.value, values[0]) : this.has(T.value, Contains.within, Arrays.asList(values));
+ }
+
- public default VariableGraphTraversal<S, E> is(final Object value) {
- return this.is(Compare.eq, value);
++ public default VariableGraphTraversal<S, E> is(final P<E>... predicates) {
++ return this.asAdmin().addStep(new IsStep<>(this.asAdmin(), predicates));
+ }
+
- public VariableGraphTraversal<S, E> is(final BiPredicate predicate, final Object value);
++ public default VariableGraphTraversal<S, E> is(final Object value) {
++ return this.is(new P[]{value instanceof P ? (P) value : P.eq(value)});
++ }
+
+ public default VariableGraphTraversal<S, E> coin(final double probability) {
+ return this.asAdmin().addStep(new CoinStep<>(this.asAdmin(), probability));
+ }
+
+ public default VariableGraphTraversal<S, E> range(final Number low, final Number high) {
+ return this.range(Scope.global, low, high);
+ }
+
+ public VariableGraphTraversal<S, E> range(final Scopeable scope, final Number low, final Number high);
+
+ public default VariableGraphTraversal<S, E> limit(final long limit) {
+ return this.range(Scope.global, 0, limit);
+ }
+
+ public default VariableGraphTraversal<S, E> limit(final Scope scope, final long limit) {
+ return this.range(scope, 0, limit);
+ }
+
+ public default VariableGraphTraversal<S, E> retain(final String sideEffectKeyOrPathLabel) {
+ return this.asAdmin().addStep(new RetainStep<>(this.asAdmin(), sideEffectKeyOrPathLabel));
+ }
+
+ public default VariableGraphTraversal<S, E> retain(final E retainObject) {
+ return this.asAdmin().addStep(new RetainStep<>(this.asAdmin(), retainObject));
+ }
+
+ public default VariableGraphTraversal<S, E> retain(final Collection<E> retainCollection) {
+ return this.asAdmin().addStep(new RetainStep<>(this.asAdmin(), retainCollection));
+ }
+
+ public default VariableGraphTraversal<S, E> simplePath() {
+ return this.asAdmin().addStep(new SimplePathStep<>(this.asAdmin()));
+ }
+
+ public default VariableGraphTraversal<S, E> cyclicPath() {
+ return this.asAdmin().addStep(new CyclicPathStep<>(this.asAdmin()));
+ }
+
+ public default VariableGraphTraversal<S, E> sample(final int amountToSample) {
+ return this.sample(Scope.global, amountToSample);
+ }
+
+ public default VariableGraphTraversal<S, E> sample(final Scope scope, final int amountToSample) {
+ return this.asAdmin().addStep(scope.equals(Scope.global)
+ ? new SampleGlobalStep<>(this.asAdmin(), amountToSample)
+ : new SampleLocalStep<>(this.asAdmin(), amountToSample));
+ }
+
+ public default VariableGraphTraversal<S, E> drop() {
+ return this.asAdmin().addStep(new DropStep<>(this.asAdmin()));
+ }
+
+ ///////////////////// SIDE-EFFECT STEPS /////////////////////
+
+ public default VariableGraphTraversal<S, E> sideEffect(final Consumer<Traverser<E>> consumer) {
+ return this.asAdmin().addStep(new LambdaSideEffectStep<>(this.asAdmin(), consumer));
+ }
+
+ public default <E2> VariableGraphTraversal<S, E2> cap(final String sideEffectKey, final String... sideEffectKeys) {
+ return this.asAdmin().addStep(new SideEffectCapStep<>(this.asAdmin(), sideEffectKey, sideEffectKeys));
+ }
+
+ public default VariableGraphTraversal<S, Edge> subgraph(final String sideEffectKey) {
+ return this.asAdmin().addStep(new SubgraphStep(this.asAdmin(), sideEffectKey));
+ }
+
+ public default VariableGraphTraversal<S, E> aggregate(final String sideEffectKey) {
+ return this.asAdmin().addStep(new AggregateStep<>(this.asAdmin(), sideEffectKey));
+ }
+
+ public default VariableGraphTraversal<S, E> group(final String sideEffectKey) {
+ return this.asAdmin().addStep(new GroupSideEffectStep<>(this.asAdmin(), sideEffectKey));
+ }
+
+ public default VariableGraphTraversal<S, E> groupCount(final String sideEffectKey) {
+ return this.asAdmin().addStep(new GroupCountSideEffectStep<>(this.asAdmin(), sideEffectKey));
+ }
+
+ public default VariableGraphTraversal<S, E> timeLimit(final long timeLimit) {
+ return this.asAdmin().addStep(new TimeLimitStep<E>(this.asAdmin(), timeLimit));
+ }
+
+ public default VariableGraphTraversal<S, E> tree(final String sideEffectKey) {
+ return this.asAdmin().addStep(new TreeSideEffectStep<>(this.asAdmin(), sideEffectKey));
+ }
+
+ public default <V> VariableGraphTraversal<S, E> sack(final BiFunction<V, E, V> sackFunction) {
+ return this.asAdmin().addStep(new SackObjectStep<>(this.asAdmin(), sackFunction));
+ }
+
+ public default <V> VariableGraphTraversal<S, E> sack(final BinaryOperator<V> sackOperator, final String elementPropertyKey) {
+ return this.asAdmin().addStep(new SackElementValueStep(this.asAdmin(), sackOperator, elementPropertyKey));
+ }
+
+ public default VariableGraphTraversal<S, E> store(final String sideEffectKey) {
+ return this.asAdmin().addStep(new StoreStep<>(this.asAdmin(), sideEffectKey));
+ }
+
+ public default VariableGraphTraversal<S, E> profile() {
+ return this.asAdmin().addStep(new ProfileStep<>(this.asAdmin()));
+ }
+
+ public default VariableGraphTraversal<S, E> property(final String key, final Object value, final Object... keyValues) {
+ return this.asAdmin().addStep(new AddPropertyStep(this.asAdmin(), key, value, keyValues));
+ }
+
+ public default VariableGraphTraversal<S, E> property(final VertexProperty.Cardinality cardinality, final String key, final Object value, final Object... keyValues) {
+ return this.asAdmin().addStep(new AddPropertyStep(this.asAdmin(), cardinality, key, value, keyValues));
+ }
+
+ ///////////////////// BRANCH STEPS /////////////////////
+
+ public default <M, E2> VariableGraphTraversal<S, E2> branch(final Traversal<?, M> branchTraversal) {
+ final BranchStep<E, E2, M> branchStep = new BranchStep<>(this.asAdmin());
+ branchStep.setBranchTraversal((Traversal.Admin<E, M>) branchTraversal);
+ return this.asAdmin().addStep(branchStep);
+ }
+
+ public default <M, E2> VariableGraphTraversal<S, E2> branch(final Function<Traverser<E>, M> function) {
+ return this.branch(new MapTraverserTraversal<>(function));
+ }
+
+ public default <M, E2> VariableGraphTraversal<S, E2> choose(final Traversal<?, M> choiceTraversal) {
+ return this.asAdmin().addStep(new ChooseStep<>(this.asAdmin(), (Traversal.Admin<E, M>) choiceTraversal));
+ }
+
+ public default <E2> VariableGraphTraversal<S, E2> choose(final Traversal<?, ?> traversalPredicate, final Traversal<?, E2> trueChoice, final Traversal<?, E2> falseChoice) {
+ return this.asAdmin().addStep(new ChooseStep<E, E2, Boolean>(this.asAdmin(), (Traversal.Admin<E, ?>) traversalPredicate, (Traversal.Admin<E, E2>) trueChoice, (Traversal.Admin<E, E2>) falseChoice));
+ }
+
+ public default <M, E2> VariableGraphTraversal<S, E2> choose(final Function<E, M> choiceFunction) {
+ return this.choose(new MapTraversal<>(choiceFunction));
+ }
+
+ public default <E2> VariableGraphTraversal<S, E2> choose(final Predicate<E> choosePredicate, final Traversal<?, E2> trueChoice, final Traversal<?, E2> falseChoice) {
+ return this.choose(new FilterTraversal<>(choosePredicate), trueChoice, falseChoice);
+ }
+
+ public default <E2> VariableGraphTraversal<S, E2> union(final Traversal<?, E2>... unionTraversals) {
+ return this.asAdmin().addStep(new UnionStep(this.asAdmin(), Arrays.copyOf(unionTraversals, unionTraversals.length, Traversal.Admin[].class)));
+ }
+
+ public default <E2> VariableGraphTraversal<S, E2> coalesce(final Traversal<?, E2>... coalesceTraversals) {
+ return this.asAdmin().addStep(new CoalesceStep(this.asAdmin(), Arrays.copyOf(coalesceTraversals, coalesceTraversals.length, Traversal.Admin[].class)));
+ }
+
+ public default VariableGraphTraversal<S, E> repeat(final Traversal<?, E> repeatTraversal) {
+ return RepeatStep.addRepeatToTraversal(this, (Traversal.Admin<E, E>) repeatTraversal);
+ }
+
+ public default VariableGraphTraversal<S, E> emit(final Traversal<?, ?> emitTraversal) {
+ return RepeatStep.addEmitToTraversal(this, (Traversal.Admin<E, ?>) emitTraversal);
+ }
+
+ public default VariableGraphTraversal<S, E> emit(final Predicate<Traverser<E>> emitPredicate) {
+ return this.emit(new FilterTraverserTraversal<>(emitPredicate));
+ }
+
+ public default VariableGraphTraversal<S, E> emit() {
+ return this.emit(TrueTraversal.instance());
+ }
+
+ public default VariableGraphTraversal<S, E> until(final Traversal<?, ?> untilTraversal) {
+ return RepeatStep.addUntilToTraversal(this, (Traversal.Admin<E, ?>) untilTraversal);
+ }
+
+ public default VariableGraphTraversal<S, E> until(final Predicate<Traverser<E>> untilPredicate) {
+ return this.until(new FilterTraverserTraversal<>(untilPredicate));
+ }
+
+ public default VariableGraphTraversal<S, E> times(final int maxLoops) {
+ return this.until(new LoopTraversal(maxLoops));
+ }
+
+ public default <E2> VariableGraphTraversal<S, E2> local(final Traversal<?, E2> localTraversal) {
+ return this.asAdmin().addStep(new LocalStep<>(this.asAdmin(), localTraversal.asAdmin()));
+ }
+
+ ///////////////////// UTILITY STEPS /////////////////////
+
+ public default VariableGraphTraversal<S, E> withSideEffect(final String key, final Supplier supplier) {
+ this.asAdmin().getSideEffects().registerSupplier(key, supplier);
+ return this;
+ }
+
+ public default <A> VariableGraphTraversal<S, E> withSack(final Supplier<A> initialValue, final UnaryOperator<A> splitOperator) {
+ this.asAdmin().getSideEffects().setSack(initialValue, Optional.of(splitOperator));
+ return this;
+ }
+
+ public default <A> VariableGraphTraversal<S, E> withSack(final Supplier<A> initialValue) {
+ this.asAdmin().getSideEffects().setSack(initialValue, Optional.empty());
+ return this;
+ }
+
+ public default <A> VariableGraphTraversal<S, E> withSack(final A initialValue, final UnaryOperator<A> splitOperator) {
+ this.asAdmin().getSideEffects().setSack(new ConstantSupplier<>(initialValue), Optional.of(splitOperator));
+ return this;
+ }
+
+ public default <A> VariableGraphTraversal<S, E> withSack(A initialValue) {
+ this.asAdmin().getSideEffects().setSack(new ConstantSupplier<>(initialValue), Optional.empty());
+ return this;
+ }
+
+ public default VariableGraphTraversal<S, E> withPath() {
+ return this.asAdmin().addStep(new PathIdentityStep<>(this.asAdmin()));
+ }
+
+ public default VariableGraphTraversal<S, E> as(final String stepLabel) {
+ if (this.asAdmin().getSteps().size() == 0) this.asAdmin().addStep(new StartStep<>(this.asAdmin()));
+ this.asAdmin().getEndStep().setLabel(stepLabel);
+ return this;
+ }
+
+ public default VariableGraphTraversal<S, E> barrier() {
+ return this.asAdmin().addStep(new CollectingBarrierStep(asAdmin()) {
+ @Override
+ public void barrierConsumer(TraverserSet traverserSet) {
+
+ }
+ }); // TODO: THIS IS NOT SERIALIZABLE
+ }
+
+ ////
+
+ public default VariableGraphTraversal<S, E> by() {
+ ((TraversalParent) this.asAdmin().getEndStep()).addLocalChild(new IdentityTraversal<>());
+ return this;
+ }
+
+ public default <V> VariableGraphTraversal<S, E> by(final Function<V, Object> functionProjection) {
+ ((TraversalParent) this.asAdmin().getEndStep()).addLocalChild(new MapTraversal<>(functionProjection));
+ return this;
+ }
+
+ public default VariableGraphTraversal<S, E> by(final T tokenProjection) {
+ ((TraversalParent) this.asAdmin().getEndStep()).addLocalChild(new TokenTraversal<>(tokenProjection));
+ return this;
+ }
+
+ public default VariableGraphTraversal<S, E> by(final String elementPropertyKey) {
+ ((TraversalParent) this.asAdmin().getEndStep()).addLocalChild(new ElementValueTraversal<>(elementPropertyKey));
+ return this;
+ }
+
+ public default VariableGraphTraversal<S, E> by(final Traversal<?, ?> byTraversal) {
+ ((TraversalParent) this.asAdmin().getEndStep()).addLocalChild(byTraversal.asAdmin());
+ return this;
+ }
+
+ ////
+
+ public default VariableGraphTraversal<S, E> by(final Order order) {
+ ((ComparatorHolder) this.asAdmin().getEndStep()).addComparator(order);
+ return this;
+ }
+
+ public default VariableGraphTraversal<S, E> by(final Comparator<E> comparator) {
+ ((ComparatorHolder<E>) this.asAdmin().getEndStep()).addComparator(comparator);
+ return this;
+ }
+
+ public default <V> VariableGraphTraversal<S, E> by(final Function<Element, V> elementFunctionProjection, final Comparator<V> elementFunctionValueComparator) {
+ ((ComparatorHolder<Element>) this.asAdmin().getEndStep()).addComparator(new ElementFunctionComparator<>(elementFunctionProjection, elementFunctionValueComparator));
+ return this;
+ }
+
+ public default <V> VariableGraphTraversal<S, E> by(final String elementPropertyProjection, final Comparator<V> propertyValueComparator) {
+ ((ComparatorHolder<Element>) this.asAdmin().getEndStep()).addComparator(new ElementValueComparator<>(elementPropertyProjection, propertyValueComparator));
+ return this;
+ }
+
+ public default <V> VariableGraphTraversal<S, E> by(final Traversal<?, ?> traversal, final Comparator<V> endComparator) {
+ ((ComparatorHolder<E>) this.asAdmin().getEndStep()).addComparator(new TraversalComparator(traversal.asAdmin(), endComparator));
+ return this;
+ }
+
+ ////
+
+ public default <M, E2> VariableGraphTraversal<S, E> option(final M pickToken, final Traversal<E, E2> traversalOption) {
+ ((TraversalOptionParent<M, E, E2>) this.asAdmin().getEndStep()).addGlobalChildOption(pickToken, traversalOption.asAdmin());
+ return this;
+ }
+
+ public default <E2> VariableGraphTraversal<S, E> option(final Traversal<E, E2> traversalOption) {
+ ((TraversalOptionParent<TraversalOptionParent.Pick, E, E2>) this.asAdmin().getEndStep()).addGlobalChildOption(TraversalOptionParent.Pick.any, traversalOption.asAdmin());
+ return this;
+ }
+
+ ////
+
+ @Override
+ public default VariableGraphTraversal<S, E> iterate() {
+ Traversal.super.iterate();
+ return this;
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/bd54cf69/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphTest.java
----------------------------------------------------------------------
diff --cc tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphTest.java
index e71bb66,290b818..27b020c
--- a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphTest.java
+++ b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphTest.java
@@@ -18,61 -18,24 +18,35 @@@
*/
package org.apache.tinkerpop.gremlin.tinkergraph.structure;
- import org.apache.commons.io.FileUtils;
- import org.apache.tinkerpop.gremlin.AbstractGremlinTest;
+ import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
-import org.apache.tinkerpop.gremlin.structure.Order;
+ import org.apache.tinkerpop.gremlin.structure.P;
+ import org.apache.tinkerpop.gremlin.structure.T;
+import org.apache.tinkerpop.gremlin.groovy.jsr223.GremlinGroovyScriptEngine;
+import org.apache.tinkerpop.gremlin.process.traversal.Step;
- import org.apache.tinkerpop.gremlin.TestHelper;
- import org.apache.tinkerpop.gremlin.algorithm.generator.DistributionGenerator;
- import org.apache.tinkerpop.gremlin.algorithm.generator.PowerLawDistribution;
- import org.apache.tinkerpop.gremlin.structure.util.star.StarGraph;
- import org.apache.tinkerpop.gremlin.process.traversal.T;
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.GraphTraversalSource;
+import org.apache.tinkerpop.gremlin.process.traversal.engine.StandardTraversalEngine;
- import org.apache.tinkerpop.gremlin.process.traversal.step.filter.HasStep;
- import org.apache.tinkerpop.gremlin.process.traversal.step.filter.IsStep;
- import org.apache.tinkerpop.gremlin.process.traversal.step.map.PropertiesStep;
- import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.GraphStep;
- import org.apache.tinkerpop.gremlin.process.traversal.step.util.HasContainer;
- import org.apache.tinkerpop.gremlin.structure.Direction;
import org.apache.tinkerpop.gremlin.structure.Edge;
import org.apache.tinkerpop.gremlin.structure.Graph;
import org.apache.tinkerpop.gremlin.structure.Operator;
import org.apache.tinkerpop.gremlin.structure.Vertex;
- import org.apache.tinkerpop.gremlin.structure.io.GraphReader;
- import org.apache.tinkerpop.gremlin.structure.io.graphml.GraphMLWriter;
- import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper;
- import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONWriter;
- import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoReader;
- import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoWriter;
- import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedFactory;
- import org.apache.tinkerpop.gremlin.tinkergraph.process.traversal.dsl.graph.DefaultVariableGraphTraversal;
+ import org.apache.tinkerpop.gremlin.structure.io.graphml.GraphMLIo;
+import org.apache.tinkerpop.gremlin.tinkergraph.process.traversal.dsl.graph.TraversalVariable;
+import org.apache.tinkerpop.gremlin.tinkergraph.process.traversal.dsl.graph.TraversalVariablePosition;
+import org.apache.tinkerpop.gremlin.tinkergraph.process.traversal.dsl.graph.VariableGraphTraversal;
+import org.apache.tinkerpop.gremlin.tinkergraph.process.traversal.dsl.graph.VariableGraphTraversalSource;
- import org.apache.tinkerpop.gremlin.util.StreamFactory;
- import org.junit.BeforeClass;
import org.junit.Ignore;
import org.junit.Test;
+import javax.script.Bindings;
+import javax.script.CompiledScript;
+import javax.script.ScriptException;
+import javax.script.SimpleBindings;
- import java.io.File;
- import java.io.FileOutputStream;
- import java.io.IOException;
- import java.io.InputStream;
- import java.io.OutputStream;
import java.util.Arrays;
import java.util.List;
+import java.util.Map;
import java.util.Set;
import java.util.function.Supplier;
- import java.util.stream.IntStream;
import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.*;
import static org.junit.Assert.assertEquals;
@@@ -636,181 -383,11 +394,96 @@@ public class TinkerGraphTest
// is used because only oid 1 should pass through the pipeline due to the inclusion of the
// key index lookup on "oid". If there's an weight of something other than 0.5f in the pipeline being
// evaluated then something is wrong.
- assertEquals(new Long(1), g.traversal().E().has("weight", (t, u) -> {
+ assertEquals(new Long(1), g.traversal().E().has("weight", P.test((t, u) -> {
assertEquals(0.5f, t);
return true;
- }, 0.5).has("oid", "1").count().next());
- }
-
- @Test
- public void shouldWriteSampleForGremlinServer() throws IOException {
- final Graph g = TinkerGraph.open();
- IntStream.range(0, 10000).forEach(i -> g.addVertex("oid", i));
- DistributionGenerator.build(g)
- .label("knows")
- .seedGenerator(() -> 987654321l)
- .outDistribution(new PowerLawDistribution(2.1))
- .inDistribution(new PowerLawDistribution(2.1))
- .expectedNumEdges(100000).create().generate();
-
- final OutputStream os = new FileOutputStream(tempPath + "sample.kryo");
- GryoWriter.build().create().writeGraph(os, g);
- os.close();
- }
-
- /**
- * This test helps with data conversions on Grateful Dead. No Assertions...run as needed. Never read from the
- * GraphML source as it will always use a String identifier.
- */
- @Test
- public void shouldWriteGratefulDead() throws IOException {
- final Graph g = TinkerGraph.open();
-
- final GraphReader reader = GryoReader.build().create();
- try (final InputStream stream = AbstractGremlinTest.class.getResourceAsStream("/org/apache/tinkerpop/gremlin/structure/io/gryo/grateful-dead.kryo")) {
- reader.readGraph(stream, g);
- }
-
- /* keep this hanging around because changes to gryo format will need grateful dead generated from json so you can generate the gio
- final GraphSONMapper mapper = GraphSONMapper.build().embedTypes(true).create();
- final GraphReader reader = org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONReader.build().mapper(mapper).create();
- try (final InputStream stream = AbstractGremlinTest.class.getResourceAsStream("/org/apache/tinkerpop/gremlin/structure/io/graphson/grateful-dead.json")) {
- reader.readGraph(stream, g);
- }
- */
-
- final Graph ng = TinkerGraph.open();
- g.traversal().V().sideEffect(ov -> {
- final Vertex v = ov.get();
- if (v.label().equals("song"))
- ng.addVertex(T.id, Integer.parseInt(v.id().toString()), T.label, "song", "name", v.value("name"), "performances", v.property("performances").orElse(0), "songType", v.property("songType").orElse(""));
- else if (v.label().equals("artist"))
- ng.addVertex(T.id, Integer.parseInt(v.id().toString()), T.label, "artist", "name", v.value("name"));
- else
- throw new RuntimeException("damn");
- }).iterate();
-
- g.traversal().E().sideEffect(oe -> {
- final Edge e = oe.get();
- final Vertex v2 = ng.traversal().V(Integer.parseInt(e.inVertex().id().toString())).next();
- final Vertex v1 = ng.traversal().V(Integer.parseInt(e.outVertex().id().toString())).next();
-
- if (e.label().equals("followedBy"))
- v1.addEdge("followedBy", v2, T.id, Integer.parseInt(e.id().toString()), "weight", e.value("weight"));
- else if (e.label().equals("sungBy"))
- v1.addEdge("sungBy", v2, T.id, Integer.parseInt(e.id().toString()));
- else if (e.label().equals("writtenBy"))
- v1.addEdge("writtenBy", v2, T.id, Integer.parseInt(e.id().toString()));
- else
- throw new RuntimeException("bah");
-
- }).iterate();
-
- final OutputStream os = new FileOutputStream(tempPath + "grateful-dead.kryo");
- GryoWriter.build().create().writeGraph(os, ng);
- os.close();
-
- final OutputStream os2 = new FileOutputStream(tempPath + "grateful-dead.json");
- GraphSONWriter.build().mapper(GraphSONMapper.build().embedTypes(true).create()).create().writeGraph(os2, g);
- os2.close();
-
- final OutputStream os3 = new FileOutputStream(tempPath + "grateful-dead.xml");
- GraphMLWriter.build().create().writeGraph(os3, g);
- os3.close();
-
- final OutputStream os4 = new FileOutputStream(tempPath + "grateful-dead-vertices.kryo");
- GryoWriter.build().create().writeVertices(os4, g.traversal().V(), Direction.BOTH);
- os.close();
-
- final OutputStream os5 = new FileOutputStream(tempPath + "grateful-dead-vertices.ldjson");
- GraphSONWriter.build().create().writeVertices(os5, g.traversal().V(), Direction.BOTH);
- os.close();
+ }, 0.5)).has("oid", "1").count().next());
}
+ @Test
+ public void shouldGrabParameters() throws Exception {
+ // compile() should cache the script to avoid future compilation
+ final GremlinGroovyScriptEngine engine = new GremlinGroovyScriptEngine();
+
+ final Graph graph = TinkerFactory.createModern();
+
+ // initially bind "g" to the variablized version of a Traversal
+ final VariableGraphTraversalSource gVar = graph.traversal(VariableGraphTraversalSource.build().engine(StandardTraversalEngine.build()));
+
+ final String script = "g.V(x).out().has('name',y).values('age').is(z).range(aa,10)";
+ final CompiledScript compilable = engine.compile(script);
+
+ // get the variablized Traversal instance. variables are tracked within the Traversal implementation itself
+ // and are referenced by step as a key within a Map
+ try {
+ final Bindings b = new SimpleBindings();
+ b.put("g", gVar);
+ b.put("x", new TraversalVariable("x"));
+ b.put("y", new TraversalVariable("y"));
+ b.put("z", new TraversalVariable("z"));
+ b.put("aa", new TraversalVariable("aa"));
+ final VariableGraphTraversal o = (VariableGraphTraversal) compilable.eval(b);
+ System.out.println(o);
+
+ final Map<Step, List<TraversalVariablePosition>> variables = o.getStepVariables();
+
+ assertEquals(b.get("x"), variables.get(o.asAdmin().getStartStep()).get(0).getVariable());
+ assertEquals(b.get("y"), variables.get(o.asAdmin().getSteps().get(2)).get(0).getVariable());
+ assertEquals(b.get("z"), variables.get(o.asAdmin().getSteps().get(4)).get(0).getVariable());
+ assertEquals(b.get("aa"), variables.get(o.asAdmin().getSteps().get(5)).get(0).getVariable());
+ } catch (ScriptException se) {
+ se.printStackTrace();
+ }
+
+ // at this point the script is compiled so we saved that step and can re-use it with a different
+ // and standard GraphTraversalSource for the binding to "g" in the ScriptEngine:
+ final GraphTraversalSource g = graph.traversal();
+ final Bindings b = new SimpleBindings();
+ b.put("g", g);
+ b.put("x", 1);
+ b.put("y", "josh");
+ b.put("z", 32);
+ b.put("aa", 0);
+
+ final Traversal t = (Traversal) engine.eval(script, b);
+ assertEquals(32, t.next());
+ }
+ @Test
+ public void shouldTrackTraversalVariables() throws Exception {
+ final Graph graph = TinkerFactory.createModern();
+
+ final VariableGraphTraversalSource gVar = graph.traversal(VariableGraphTraversalSource.build().engine(StandardTraversalEngine.build()));
+ final TraversalVariable varX = new TraversalVariable("x");
+ final TraversalVariable varY = new TraversalVariable("y");
+ final TraversalVariable varZ = new TraversalVariable("z");
+ final TraversalVariable varAa = new TraversalVariable("aa");
+
+ final VariableGraphTraversal<Vertex,Object> t = gVar.V(varX).out().has("name", varY)
+ .values("age").is(varZ).range(varAa, 10);
+
+ final Map<Step, List<TraversalVariablePosition>> variables = t.getStepVariables();
+
+ assertEquals(varX, variables.get(t.asAdmin().getStartStep()).get(0).getVariable());
+ assertEquals(varY, variables.get(t.asAdmin().getSteps().get(2)).get(0).getVariable());
+ assertEquals(varZ, variables.get(t.asAdmin().getSteps().get(4)).get(0).getVariable());
+ assertEquals(varAa, variables.get(t.asAdmin().getSteps().get(5)).get(0).getVariable());
+
+ /*
+ final Map<String,Object> bindings = new HashMap<>();
+ bindings.put("x", 1);
+ bindings.put("y", "josh");
+ bindings.put("z", 32);
+ bindings.put("aa", 0);
+
+ // bind() would clone "t" with traversals applied, as possible, given statically defined steps (i.e. that
+ // don't have variables). in this way the traversal is "prepared" as best it can be given the information
+ // that it has available. TraversalVariables would be replaced with the values from the "bindings" Map
+ // thus making the traversal "final" or "static"
+ final Traversal t1 = t.bind(bindings);
+
+ // when next() is called on "t1", remaining strategies can be executed given that the bindings are final
+ assertEquals(32, t1.next());
+ */
+ }
}
[42/50] [abbrv] incubator-tinkerpop git commit: fixed a bug in
SelectStep around multi-label traversals.
Posted by sp...@apache.org.
fixed a bug in SelectStep around multi-label traversals.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/4588b73d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/4588b73d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/4588b73d
Branch: refs/heads/variables
Commit: 4588b73df67c703ffc6db39bafd70c3502a6830f
Parents: 96e1219
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Thu Apr 30 16:07:27 2015 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Thu Apr 30 16:07:27 2015 -0600
----------------------------------------------------------------------
.../process/traversal/step/map/SelectStep.java | 7 +---
.../apache/tinkerpop/gremlin/structure/P.java | 4 +--
.../traversal/step/map/GroovySelectTest.groovy | 19 ++++++++---
.../process/traversal/step/map/SelectTest.java | 35 ++++++++++++++++++--
4 files changed, 49 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/4588b73d/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SelectStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SelectStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SelectStep.java
index 60c4450..0bbf54f 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SelectStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SelectStep.java
@@ -62,12 +62,7 @@ public final class SelectStep<S, E> extends MapStep<S, Map<String, E>> implement
} else {
final Path path = traverser.path();
if (this.selectLabels.isEmpty()) {
- path.forEach((object, labels) -> {
- if (!labels.isEmpty()) {
- final E e = (E) TraversalUtil.apply(object, this.traversalRing.next());
- labels.forEach(label -> bindings.put(label, e));
- }
- });
+ path.labels().stream().flatMap(labels -> labels.stream()).distinct().forEach(label -> bindings.put(label, (E) TraversalUtil.apply(path.<Object>get(label), this.traversalRing.next())));
} else {
this.selectLabels.forEach(label -> {
if (path.hasLabel(label))
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/4588b73d/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/P.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/P.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/P.java
index 93b64fe..a745cbd 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/P.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/P.java
@@ -60,8 +60,8 @@ public class P<V> implements Predicate<V>, Serializable {
@Override
public boolean equals(final Object other) {
- return other instanceof P && (
- (P) other).getBiPredicate().equals(this.biPredicate) &&
+ return other instanceof P &&
+ ((P) other).getBiPredicate().equals(this.biPredicate) &&
((((P) other).getValue() == null && this.getValue() == null) || ((P) other).getValue().equals(this.getValue()));
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/4588b73d/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovySelectTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovySelectTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovySelectTest.groovy
index ee6cda1..ee5e65c 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovySelectTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovySelectTest.groovy
@@ -82,25 +82,29 @@ public abstract class GroovySelectTest {
@Override
public Traversal<Vertex, Map<String, Object>> get_g_V_hasXname_isXmarkoXX_asXaX_select() {
- return g.V.has(values('name').is('marko')).as('a').select
+ g.V.has(values('name').is('marko')).as('a').select
}
@Override
public Traversal<Vertex, Map<String, Object>> get_g_V_label_groupCount_asXxX_select() {
- return g.V().label().groupCount().as('x').select()
+ g.V().label().groupCount().as('x').select()
}
@Override
public Traversal<Vertex, Map<String, Object>> get_g_V_hasLabelXpersonX_asXpersonX_localXbothE_label_groupCountX_asXrelationsX_select_byXnameX_by() {
- return g.V().hasLabel('person').as('person').local(__.bothE().label().groupCount()).as('relations').select().by('name').by()
+ g.V().hasLabel('person').as('person').local(__.bothE().label().groupCount()).as('relations').select().by('name').by()
}
@Override
public Traversal<Vertex, Map<String, Vertex>> get_g_V_chooseXoutE_count_isX0X__asXaX__asXbXX_select() {
- return g.V().choose(__.outE().count().is(0L), __.as('a'), __.as('b')).select();
+ g.V().choose(__.outE().count().is(0L), __.as('a'), __.as('b')).select();
}
- //
+ @Override
+ Traversal<Vertex, Map<String, List<Vertex>>> get_g_V_asXaX_outXcreatedX_asXaX_select() {
+ g.V.as('a').out('created').as('a').select
+ }
+//
@Override
public Traversal<Vertex, Vertex> get_g_VX1X_asXhereX_out_selectXhereX(final Object v1Id) {
@@ -268,6 +272,11 @@ public abstract class GroovySelectTest {
ComputerTestHelper.compute("g.V.choose(__.outE.count.is(0L), __.as('a'), __.as('b')).select()", g)
}
+ @Override
+ public Traversal<Vertex, Map<String, List<Vertex>>> get_g_V_asXaX_outXcreatedX_asXaX_select() {
+ ComputerTestHelper.compute("g.V.as('a').out('created').as('a').select", g);
+ }
+
//
@Override
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/4588b73d/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SelectTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SelectTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SelectTest.java
index ac3f9ee..31ac82d 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SelectTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SelectTest.java
@@ -74,6 +74,8 @@ public abstract class SelectTest extends AbstractGremlinProcessTest {
public abstract Traversal<Vertex, Map<String, Vertex>> get_g_V_chooseXoutE_count_isX0X__asXaX__asXbXX_select();
+ public abstract Traversal<Vertex, Map<String, List<Vertex>>> get_g_V_asXaX_outXcreatedX_asXaX_select();
+
// below we original back()-tests
public abstract Traversal<Vertex, Vertex> get_g_VX1X_asXhereX_out_selectXhereX(final Object v1Id);
@@ -237,8 +239,7 @@ public abstract class SelectTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
- @Ignore("There is a HashMap to Element cast problem happening here for some reason in both OLTP and OLAP")
- // TODO: dkuppitz this has been ignored for some time now -- don't know if the test is bad or the code is bad.
+ @Ignore("There is a HashMap to Element cast problem happening here for some reason in both OLTP and OLAP -- has to do with local barriers! -- thus, bad test.")
@IgnoreEngine(TraversalEngine.Type.COMPUTER)
public void g_V_hasLabelXpersonX_asXpersonX_localXbothE_label_groupCountX_asXrelationsX_select_byXnameX_by() {
final Traversal<Vertex, Map<String, Object>> traversal = get_g_V_hasLabelXpersonX_asXpersonX_localXbothE_label_groupCountX_asXrelationsX_select_byXnameX_by();
@@ -307,6 +308,30 @@ public abstract class SelectTest extends AbstractGremlinProcessTest {
assertEquals(3, xCounter);
}
+ @Test
+ @LoadGraphWith(MODERN)
+ public void g_V_asXaX_outXcreatedX_asXaX_select() {
+ final Traversal<Vertex, Map<String, List<Vertex>>> traversal = get_g_V_asXaX_outXcreatedX_asXaX_select();
+ printTraversalForm(traversal);
+ int counter = 0;
+ while (traversal.hasNext()) {
+ counter++;
+ final Map<String, List<Vertex>> map = traversal.next();
+ assertEquals(1, map.size());
+ final List<Vertex> list = map.get("a");
+ assertEquals(2, list.size());
+ if (list.get(0).equals(convertToVertex(graph, "marko")))
+ assertEquals(convertToVertex(graph, "lop"), list.get(1));
+ else if (list.get(0).equals(convertToVertex(graph, "peter")))
+ assertEquals(convertToVertex(graph, "lop"), list.get(1));
+ else {
+ assertEquals(convertToVertex(graph, "josh"), list.get(0));
+ assertTrue(convertToVertex(graph, "lop").equals(list.get(1)) || convertToVertex(graph, "ripple").equals(list.get(1)));
+ }
+ }
+ assertEquals(4, counter);
+ }
+
//
@Test
@@ -401,7 +426,6 @@ public abstract class SelectTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
- @IgnoreEngine(TraversalEngine.Type.STANDARD) // TODO: dkuppitz this fails on OLTP, but passes on OLAP
public void g_V_outXcreatedX_unionXasXprojectX_inXcreatedX_hasXname_markoX_selectXprojectX__asXprojectX_inXcreatedX_inXknowsX_hasXname_markoX_selectXprojectXX_groupCount_byXnameX() {
final List<Traversal<Vertex, Map<String, Long>>> traversals = Arrays.asList(get_g_V_outXcreatedX_unionXasXprojectX_inXcreatedX_hasXname_markoX_selectXprojectX__asXprojectX_inXcreatedX_inXknowsX_hasXname_markoX_selectXprojectXX_groupCount_byXnameX());
traversals.forEach(traversal -> {
@@ -478,6 +502,11 @@ public abstract class SelectTest extends AbstractGremlinProcessTest {
return g.V().choose(__.outE().count().is(0L), __.as("a"), __.as("b")).select();
}
+ @Override
+ public Traversal<Vertex, Map<String, List<Vertex>>> get_g_V_asXaX_outXcreatedX_asXaX_select() {
+ return g.V().as("a").out("created").as("a").select();
+ }
+
//
@Override
[43/50] [abbrv] incubator-tinkerpop git commit: fixed a bug in
SelectStep around multi-label traversals.
Posted by sp...@apache.org.
fixed a bug in SelectStep around multi-label traversals.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/8ee70568
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/8ee70568
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/8ee70568
Branch: refs/heads/variables
Commit: 8ee705680d13c36dd682fa332d39716f81662edc
Parents: 4588b73
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Thu Apr 30 16:09:33 2015 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Thu Apr 30 16:09:33 2015 -0600
----------------------------------------------------------------------
.../gremlin/process/traversal/step/map/SelectStep.java | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/8ee70568/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SelectStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SelectStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SelectStep.java
index 0bbf54f..1235129 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SelectStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SelectStep.java
@@ -64,10 +64,7 @@ public final class SelectStep<S, E> extends MapStep<S, Map<String, E>> implement
if (this.selectLabels.isEmpty()) {
path.labels().stream().flatMap(labels -> labels.stream()).distinct().forEach(label -> bindings.put(label, (E) TraversalUtil.apply(path.<Object>get(label), this.traversalRing.next())));
} else {
- this.selectLabels.forEach(label -> {
- if (path.hasLabel(label))
- bindings.put(label, (E) TraversalUtil.apply(path.<Object>get(label), this.traversalRing.next()));
- });
+ this.selectLabels.forEach(label -> bindings.put(label, (E) TraversalUtil.apply(path.<Object>get(label), this.traversalRing.next())));
}
}
[37/50] [abbrv] incubator-tinkerpop git commit: minor fix ups to
SideEffectCapStep.
Posted by sp...@apache.org.
minor fix ups to SideEffectCapStep.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/4326a40a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/4326a40a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/4326a40a
Branch: refs/heads/variables
Commit: 4326a40a7c0dbd4bab7b8ce0aa3adbcdb1d82dbc
Parents: d36bc42
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Thu Apr 30 12:56:42 2015 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Thu Apr 30 12:56:42 2015 -0600
----------------------------------------------------------------------
.../traversal/step/sideEffect/SideEffectCapStep.java | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/4326a40a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SideEffectCapStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SideEffectCapStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SideEffectCapStep.java
index 830d01f..52d0f87 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SideEffectCapStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SideEffectCapStep.java
@@ -24,8 +24,7 @@ import org.apache.tinkerpop.gremlin.process.traversal.traverser.TraverserRequire
import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper;
import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.EnumSet;
+import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -36,18 +35,15 @@ import java.util.Set;
*/
public final class SideEffectCapStep<S, E> extends SupplyingBarrierStep<S, E> {
- private static final Set<TraverserRequirement> REQUIREMENTS = EnumSet.of(
- TraverserRequirement.SIDE_EFFECTS,
- TraverserRequirement.OBJECT
- );
-
private List<String> sideEffectKeys;
public SideEffectCapStep(final Traversal.Admin traversal, final String sideEffectKey, final String... sideEffectKeys) {
super(traversal);
this.sideEffectKeys = new ArrayList<>(1 + sideEffectKeys.length);
this.sideEffectKeys.add(sideEffectKey);
- this.sideEffectKeys.addAll(Arrays.asList(sideEffectKeys));
+ for (final String key : sideEffectKeys) {
+ this.sideEffectKeys.add(key);
+ }
}
@Override
@@ -61,7 +57,7 @@ public final class SideEffectCapStep<S, E> extends SupplyingBarrierStep<S, E> {
@Override
public Set<TraverserRequirement> getRequirements() {
- return REQUIREMENTS;
+ return Collections.singleton(TraverserRequirement.SIDE_EFFECTS);
}
@Override
[49/50] [abbrv] incubator-tinkerpop git commit: Update with IO
instructions.
Posted by sp...@apache.org.
Update with IO instructions.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/433f584a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/433f584a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/433f584a
Branch: refs/heads/variables
Commit: 433f584a168dd2ae8e2c3f3d8747845813ddc155
Parents: 8435e51
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Fri May 1 10:40:10 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Fri May 1 10:40:10 2015 -0400
----------------------------------------------------------------------
docs/src/implementations.asciidoc | 27 +++++++++++++++++++++++++--
1 file changed, 25 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/433f584a/docs/src/implementations.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/implementations.asciidoc b/docs/src/implementations.asciidoc
index d27fa55..1b85f6a 100644
--- a/docs/src/implementations.asciidoc
+++ b/docs/src/implementations.asciidoc
@@ -38,7 +38,7 @@ The classes that a vendor should focus on implemented are itemized below. Please
.. Everything required of OTLP is required of OLAP (but not vice versa).
.. GraphComputer API: `GraphComputer`, `Messenger`, `Memory`.
-A collection of implementation notes:
+Please consider the following implementation notes:
* Be sure your `Graph` implementation is named as `XXXGraph` (e.g. TinkerGraph, Neo4jGraph, HadoopGraph, etc.).
* Use `StringHelper` to ensuring that the `toString()` representation of classes are consistent with other implementations.
@@ -46,7 +46,6 @@ A collection of implementation notes:
* Use the numerous static method helper classes such as `ElementHelper`, `GraphComputerHelper`, `VertexProgramHelper`, etc.
* There are a number of default methods on the provided interfaces that are semantically correct. However, if they are not efficient for the implementation, override them.
* Implement the `structure/` package interfaces first and then, if desired, interfaces in the `process/` package interfaces.
-* Implement the `Graph.Io` interface if there are custom classes used in the implementation that will need to be serialized. In this way, `Graph` implementations can pre-configure custom serializers for IO interactions and users will not need to know about those details. For example, if the identifier system for the `Graph` uses a non-primitive, such as OrientDB's `Rid` class, register the methods for serialization of that class in the various `GraphReader` and `GraphWriter` builders returned from the `Io` interface. Following this pattern will ensure proper execution for the test suite as well as simplified usage for end-users.
[[oltp-implementations]]
OLTP Implementations
@@ -230,6 +229,30 @@ for (final MapReduce mapReduce : this.mapReduces) {
<1> Note that the final results of the reducer are provided to the Memory as specified by the application developer's `MapReduce.addSideEffectToMemory()` implementation.
<2> If there is no reduce stage, the the map-stage results are inserted into Memory as specified by the application developer's `MapReduce.addSideEffectToMemory()` implementation.
+[[io-implementations]]
+IO Implementations
+^^^^^^^^^^^^^^^^^^
+
+If a `Graph` requires custom serializers for IO to work properly, implement the `Graph.io` method. A typical example of where a `Graph` would require such a custom serializers is if their identifier system uses non-primitive values, such as OrientDB's `Rid` class. From basic serialization of a single `Vertex` all the way up the stack to Gremlin Server, the need to know how to handle these complex identifiers is an important requirement.
+
+The first step to implementing custom serializers is to first create an `IoRegistry` object and register the custom classes and serializers to it. Each `Io` implementation has different requirements for what it expects from the `IoRegistry`:
+
+* *GraphML* - No custom serializers expected/allowed.
+* *GraphSON* - Register a Jackson `SimpleModule`. The `SimpleModule` encapsulates specific classes to be serialized, so it does not need to be registered to a specific class in the `IoRegistry` (use `null`).
+* *Gryo* - Expects registration of one of three objects:
+** Register just the custom class with a `null` Kryo `Serializer` implementation - this class will use default "field-level" Kryo serialization.
+** Register the custom class with a specific Kryo `Serializer' implementation.
+** Register the custom class with a `Function<Kryo, Serializer>` for those cases where the Kryo `Serializer` requires the `Kryo` instance to get constructed.
+
+The following code provides a simple example for registering classes as described above:
+
+[source,java]
+IoRegistry registry = new IoRegistry();
+registry.register(GraphSONIo.class, null, new MySimpleModule());
+registry.register(GryoIo.class, MySimpleClass.class, new MySimpleClassSerializer());
+
+In the `Graph.io` method, provide the `IoRegistry` object to the supplied `Builder` and call the `create` method to return that `Io` instance. In this way, `Graph` implementations can pre-configure custom serializers for IO interactions and users will not need to know about those details. Following this pattern will ensure proper execution of the test suite as well as simplified usage for end-users.
+
[[validating-with-gremlin-test]]
Validating with Gremlin-Test
~~~~~~~~~~~~~~~~~~~~~~~~~~~~
[28/50] [abbrv] incubator-tinkerpop git commit: Merge branch 'master'
of https://git-wip-us.apache.org/repos/asf/incubator-tinkerpop
Posted by sp...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-tinkerpop
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/250b27dc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/250b27dc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/250b27dc
Branch: refs/heads/variables
Commit: 250b27dc5fbf13f36d8b8d3e64daa8eec2f0891c
Parents: 1a8f0ac 2e4e2ed
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Thu Apr 30 19:01:10 2015 +0200
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Thu Apr 30 19:01:10 2015 +0200
----------------------------------------------------------------------
README.asciidoc | 2 +-
.../gremlin/process/traversal/Traverser.java | 2 +-
.../strategy/decoration/EventStrategy.java | 2 +-
.../tinkerpop/gremlin/structure/Graph.java | 18 ++---
.../gremlin/structure/Transaction.java | 2 +-
.../gremlin/structure/VertexProperty.java | 2 +-
.../gremlin/structure/io/GraphMigrator.java | 28 ++++----
.../gremlin/structure/io/GraphReader.java | 4 +-
.../gremlin/structure/io/GraphWriter.java | 10 +--
.../tinkerpop/gremlin/structure/io/IoCore.java | 2 +-
.../structure/io/gryo/GryoClassResolver.java | 2 +-
.../gremlin/structure/io/gryo/GryoIo.java | 19 +++++-
.../gremlin/structure/io/gryo/GryoMapper.java | 28 +++++++-
.../gremlin/structure/io/gryo/GryoReader.java | 72 +++++++++++++++++++-
.../structure/io/gryo/GryoSerializers.java | 11 +--
.../gremlin/structure/io/gryo/GryoWriter.java | 31 ++++++++-
.../structure/util/AbstractTransaction.java | 2 +-
.../structure/util/detached/DetachedEdge.java | 2 +-
.../structure/util/detached/DetachedVertex.java | 2 +-
.../groovy/GroovyEnvironmentIntegrateSuite.java | 4 +-
.../GroovyEnvironmentPerformanceSuite.java | 4 +-
.../gremlin/groovy/GroovyEnvironmentSuite.java | 2 +-
.../process/GroovyProcessComputerSuite.java | 2 +-
.../process/GroovyProcessStandardSuite.java | 2 +-
.../gremlin/groovy/engine/GremlinExecutor.java | 2 +-
.../groovy/jsr223/DependencyManager.java | 2 +-
.../jsr223/GremlinGroovyScriptEngine.java | 2 +-
.../gremlin/server/AbstractChannelizer.java | 2 +-
.../server/GremlinDriverIntegrateTest.java | 2 +-
.../apache/tinkerpop/gremlin/GraphProvider.java | 10 +--
.../apache/tinkerpop/gremlin/LoadGraphWith.java | 4 +-
.../gremlin/process/ProcessComputerSuite.java | 2 +-
.../process/ProcessPerformanceSuite.java | 2 +-
.../gremlin/process/ProcessStandardSuite.java | 2 +-
.../structure/StructurePerformanceSuite.java | 2 +-
.../structure/StructureStandardSuite.java | 2 +-
pom.xml | 4 +-
.../tinkergraph/structure/TinkerGraph.java | 6 +-
.../structure/IoDataGenerationTest.java | 1 -
39 files changed, 212 insertions(+), 88 deletions(-)
----------------------------------------------------------------------
[30/50] [abbrv] incubator-tinkerpop git commit: Update javadoc for
some of the GraphSON.
Posted by sp...@apache.org.
Update javadoc for some of the GraphSON.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/e6e4e6fd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/e6e4e6fd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/e6e4e6fd
Branch: refs/heads/variables
Commit: e6e4e6fdd2d34d36d407c1f691bad401f72dd396
Parents: 0fa302a
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Apr 30 13:23:19 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Apr 30 13:23:19 2015 -0400
----------------------------------------------------------------------
.../gremlin/structure/io/graphson/GraphSONIo.java | 3 +++
.../gremlin/structure/io/graphson/GraphSONMapper.java | 12 +++++++++++-
.../gremlin/structure/io/graphson/GraphSONModule.java | 10 +++++++++-
3 files changed, 23 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/e6e4e6fd/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONIo.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONIo.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONIo.java
index 480ae9e..3aabaf2 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONIo.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONIo.java
@@ -29,6 +29,9 @@ import java.io.InputStream;
import java.io.OutputStream;
/**
+ * Constructs Gryo IO implementations given a {@link Graph} and {@link IoRegistry}. Implementers of the {@link Graph}
+ * interfaces should see the {@link GraphSONMapper} for information on the expectations for the {@link IoRegistry}.
+ *
* @author Stephen Mallette (http://stephen.genoprime.com)
*/
public class GraphSONIo implements Io<GraphSONReader.Builder, GraphSONWriter.Builder, GraphSONMapper.Builder> {
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/e6e4e6fd/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapper.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapper.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapper.java
index a3dab2c..03af2d4 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapper.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapper.java
@@ -23,6 +23,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.SerializationFeature;
import com.fasterxml.jackson.databind.module.SimpleModule;
import com.fasterxml.jackson.databind.ser.DefaultSerializerProvider;
+import org.apache.tinkerpop.gremlin.structure.Graph;
import org.apache.tinkerpop.gremlin.structure.io.IoRegistry;
import org.apache.tinkerpop.gremlin.structure.io.Mapper;
import org.javatuples.Pair;
@@ -32,8 +33,17 @@ import java.util.List;
/**
* An extension to the standard Jackson {@code ObjectMapper} which automatically registers the standard
- * {@link GraphSONModule} for serializing {@link org.apache.tinkerpop.gremlin.structure.Graph} elements. This class
+ * {@link GraphSONModule} for serializing {@link Graph} elements. This class
* can be used for generalized JSON serialization tasks that require meeting GraphSON standards.
+ * <p/>
+ * {@link Graph} implementations providing an {@link IoRegistry} should register their {@code SimpleModule}
+ * implementations to it as follows:
+ * <pre>
+ * {@code
+ * IoRegistry registry = new IoRegistry();
+ * registry.register(GraphSONIo.class, null, new MySimpleModule());
+ * }
+ * </pre>
*
* @author Stephen Mallette (http://stephen.genoprime.com)
*/
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/e6e4e6fd/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONModule.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONModule.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONModule.java
index 39fe40e..1ee5137 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONModule.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONModule.java
@@ -28,12 +28,20 @@ import org.apache.tinkerpop.gremlin.structure.VertexProperty;
import org.apache.tinkerpop.gremlin.structure.util.star.StarGraphGraphSONSerializer;
/**
- * The set of serializers that handle the core graph interfaces.
+ * The set of serializers that handle the core graph interfaces. These serializers support normalization which
+ * ensures that generated GraphSON will be compatible with line-based versioning tools. This setting comes with
+ * some overhead, with respect to key sorting and other in-memory operations.
*
* @author Stephen Mallette (http://stephen.genoprime.com)
*/
public class GraphSONModule extends SimpleModule {
+ /**
+ * Constructs a new object.
+ *
+ * @param normalize when set to true, keys and objects are ordered to ensure that they are the occur in
+ * the same order
+ */
public GraphSONModule(final boolean normalize) {
super("graphson");
addSerializer(Edge.class, new GraphSONSerializers.EdgeJacksonSerializer(normalize));
[09/50] [abbrv] incubator-tinkerpop git commit: Merge branch 'master'
of https://git-wip-us.apache.org/repos/asf/incubator-tinkerpop
Posted by sp...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-tinkerpop
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/a8b0a2a5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/a8b0a2a5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/a8b0a2a5
Branch: refs/heads/variables
Commit: a8b0a2a545838dfe07edb7735a384f2f211000f0
Parents: e330ce3 e2b3dd8
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Tue Apr 28 23:45:30 2015 +0200
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Tue Apr 28 23:45:30 2015 +0200
----------------------------------------------------------------------
docs/src/the-traversal.asciidoc | 4 +++-
.../gremlin/process/traversal/dsl/graph/GraphTraversal.java | 5 ++++-
2 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/a8b0a2a5/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
----------------------------------------------------------------------
[46/50] [abbrv] incubator-tinkerpop git commit: Dropped BatchGraph.
Posted by sp...@apache.org.
Dropped BatchGraph.
It will be replaced by OLAP style loaders.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/4150a16d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/4150a16d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/4150a16d
Branch: refs/heads/variables
Commit: 4150a16d3b098446ed8a2f51c98eb762b36a2038
Parents: be4bb3e
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Fri May 1 09:01:44 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Fri May 1 09:01:44 2015 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
.../structure/io/graphml/GraphMLReader.java | 3 +-
.../structure/io/graphson/GraphSONReader.java | 3 +-
.../io/graphson/LegacyGraphSONReader.java | 3 +-
.../gremlin/structure/io/gryo/GryoReader.java | 3 +-
.../structure/util/batch/BatchFeatures.java | 216 -------
.../structure/util/batch/BatchGraph.java | 643 -------------------
.../gremlin/structure/util/batch/Exists.java | 62 --
.../structure/util/batch/VertexIdType.java | 65 --
.../util/batch/cache/AbstractIDVertexCache.java | 78 ---
.../util/batch/cache/LongIDVertexCache.java | 94 ---
.../util/batch/cache/ObjectIDVertexCache.java | 25 -
.../util/batch/cache/StringCompression.java | 29 -
.../util/batch/cache/StringIDVertexCache.java | 87 ---
.../util/batch/cache/URLCompression.java | 67 --
.../structure/util/batch/cache/VertexCache.java | 36 --
.../driver/benchmark/ProfilingApplication.java | 27 +-
.../AbstractImportCustomizerProvider.java | 2 -
.../tinkerpop/gremlin/structure/BatchTest.java | 475 --------------
.../structure/StructureStandardSuite.java | 6 -
20 files changed, 26 insertions(+), 1899 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/4150a16d/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 9fc55cf..35926dd 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -25,6 +25,7 @@ image::http://www.tinkerpop.com/docs/current/images/gremlin-hindu.png[width=225]
TinkerPop 3.0.0.M9 (NOT OFFICIALLY RELEASED YET)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+* Dropped `BatchGraph` from the code base - it will be replaced by bulk loader functionality over OLAP.
* `TraversalSideEffects` now implements `Optional` semantics. Less code as Java8 provides the helper methods.
* `TraversalScriptSupplier` now takes an `Object` var args for setting `ScriptEngine` bindings if needed.
* `Compare` is now more lenient on `Number`-types.
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/4150a16d/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphml/GraphMLReader.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphml/GraphMLReader.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphml/GraphMLReader.java
index bcb462d..6a50679 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphml/GraphMLReader.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphml/GraphMLReader.java
@@ -29,7 +29,6 @@ import org.apache.tinkerpop.gremlin.structure.io.GraphReader;
import org.apache.tinkerpop.gremlin.structure.io.Io;
import org.apache.tinkerpop.gremlin.structure.util.Attachable;
import org.apache.tinkerpop.gremlin.structure.util.ElementHelper;
-import org.apache.tinkerpop.gremlin.structure.util.batch.BatchGraph;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamException;
@@ -318,7 +317,7 @@ public class GraphMLReader implements GraphReader {
public static final class Builder implements ReaderBuilder<GraphMLReader> {
private String edgeLabelKey = GraphMLTokens.LABEL_E;
private String vertexLabelKey = GraphMLTokens.LABEL_V;
- private long batchSize = BatchGraph.DEFAULT_BUFFER_SIZE;
+ private long batchSize = 10000;
private Builder() {
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/4150a16d/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONReader.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONReader.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONReader.java
index 79365af..e90faa3 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONReader.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONReader.java
@@ -31,7 +31,6 @@ import org.apache.tinkerpop.gremlin.structure.io.GraphWriter;
import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoWriter;
import org.apache.tinkerpop.gremlin.structure.util.Attachable;
import org.apache.tinkerpop.gremlin.structure.util.Host;
-import org.apache.tinkerpop.gremlin.structure.util.batch.BatchGraph;
import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedEdge;
import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedProperty;
import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertexProperty;
@@ -240,7 +239,7 @@ public class GraphSONReader implements GraphReader {
}
public static class Builder implements ReaderBuilder<GraphSONReader> {
- private long batchSize = BatchGraph.DEFAULT_BUFFER_SIZE;
+ private long batchSize = 10000;
private GraphSONMapper mapper = GraphSONMapper.build().create();
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/4150a16d/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/LegacyGraphSONReader.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/LegacyGraphSONReader.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/LegacyGraphSONReader.java
index 11fd97b..e2834c2 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/LegacyGraphSONReader.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/LegacyGraphSONReader.java
@@ -34,7 +34,6 @@ import org.apache.tinkerpop.gremlin.structure.VertexProperty;
import org.apache.tinkerpop.gremlin.structure.io.GraphReader;
import org.apache.tinkerpop.gremlin.structure.io.Io;
import org.apache.tinkerpop.gremlin.structure.util.Attachable;
-import org.apache.tinkerpop.gremlin.structure.util.batch.BatchGraph;
import java.io.IOException;
import java.io.InputStream;
@@ -205,7 +204,7 @@ public class LegacyGraphSONReader implements GraphReader {
public static class Builder {
private boolean loadCustomModules = false;
private List<SimpleModule> customModules = new ArrayList<>();
- private long batchSize = BatchGraph.DEFAULT_BUFFER_SIZE;
+ private long batchSize = 10000;
private boolean embedTypes = false;
private Builder() {
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/4150a16d/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoReader.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoReader.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoReader.java
index 70eae85..bdce1af 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoReader.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoReader.java
@@ -33,7 +33,6 @@ import org.apache.tinkerpop.gremlin.structure.Edge;
import org.apache.tinkerpop.gremlin.structure.Graph;
import org.apache.tinkerpop.gremlin.structure.Vertex;
import org.apache.tinkerpop.gremlin.structure.io.GraphReader;
-import org.apache.tinkerpop.gremlin.structure.util.batch.BatchGraph;
import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedEdge;
import org.apache.tinkerpop.shaded.kryo.io.Input;
@@ -238,7 +237,7 @@ public class GryoReader implements GraphReader {
public static class Builder implements ReaderBuilder<GryoReader> {
- private long batchSize = BatchGraph.DEFAULT_BUFFER_SIZE;
+ private long batchSize = 10000;
/**
* Always use the most recent gryo version by default
*/
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/4150a16d/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/batch/BatchFeatures.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/batch/BatchFeatures.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/batch/BatchFeatures.java
deleted file mode 100644
index 7c9a533..0000000
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/batch/BatchFeatures.java
+++ /dev/null
@@ -1,216 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.structure.util.batch;
-
-import org.apache.tinkerpop.gremlin.structure.Graph;
-
-/**
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-class BatchFeatures implements Graph.Features {
-
- private final Graph.Features baseFeatures;
- private final BatchGraphFeatures graphFeatures = new BatchGraphFeatures();
-
- private final VertexFeatures vertexFeatures = new VertexFeatures() {
- @Override
- public boolean supportsUserSuppliedIds() {
- // batch loading supports user supplied ids
- return true;
- }
-
- @Override
- public VertexPropertyFeatures properties() {
- return vertexPropertyFeatures;
- }
- };
-
- private final EdgeFeatures edgeFeatures = new EdgeFeatures() {
- @Override
- public boolean supportsUserSuppliedIds() {
- // batch loading supports user supplied identifiers
- return true;
- }
-
- @Override
- public EdgePropertyFeatures properties() {
- return edgePropertyFeatures;
- }
- };
-
- private final EdgePropertyFeatures edgePropertyFeatures = new BatchEdgePropertyFeatures();
- private final VertexPropertyFeatures vertexPropertyFeatures = new BatchVertexPropertyFeatures();
-
- public BatchFeatures(final Graph.Features baseFeatures) {
- this.baseFeatures = baseFeatures;
- }
-
- @Override
- public GraphFeatures graph() {
- return graphFeatures;
- }
-
- @Override
- public VertexFeatures vertex() {
- return vertexFeatures;
- }
-
- @Override
- public EdgeFeatures edge() {
- return edgeFeatures;
- }
-
- class BatchVertexPropertyFeatures extends BatchDataTypeFeature implements VertexPropertyFeatures {
- @Override
- public boolean supportsProperties() {
- return baseFeatures.vertex().properties().supportsProperties();
- }
- }
-
- class BatchEdgePropertyFeatures extends BatchDataTypeFeature implements EdgePropertyFeatures {
- @Override
- public boolean supportsProperties() {
- return baseFeatures.edge().properties().supportsProperties();
- }
- }
-
- class BatchGraphFeatures implements GraphFeatures {
-
- @Override
- public boolean supportsComputer() {
- return false;
- }
-
- @Override
- public boolean supportsPersistence() {
- return baseFeatures.graph().supportsPersistence();
- }
-
- @Override
- public boolean supportsTransactions() {
- // the transaction is true because as a wrapper the BatchGraph will check the features of the
- // underlying graph and not let it fail if the underlying graph does not support tx.
- return true;
- }
-
- @Override
- public boolean supportsThreadedTransactions() {
- return false;
- }
-
- @Override
- public VariableFeatures variables() {
- return new BatchVariableFeatures();
- }
- }
-
- class BatchVariableFeatures extends BatchDataTypeFeature implements VariableFeatures {
- @Override
- public boolean supportsVariables() {
- return baseFeatures.graph().variables().supportsVariables();
- }
- }
-
- class BatchDataTypeFeature implements DataTypeFeatures {
- @Override
- public boolean supportsBooleanValues() {
- return baseFeatures.graph().variables().supportsBooleanValues();
- }
-
- @Override
- public boolean supportsDoubleValues() {
- return baseFeatures.graph().variables().supportsDoubleValues();
- }
-
- @Override
- public boolean supportsFloatValues() {
- return baseFeatures.graph().variables().supportsFloatValues();
- }
-
- @Override
- public boolean supportsIntegerValues() {
- return baseFeatures.graph().variables().supportsIntegerValues();
- }
-
- @Override
- public boolean supportsLongValues() {
- return baseFeatures.graph().variables().supportsLongValues();
- }
-
- @Override
- public boolean supportsMapValues() {
- return baseFeatures.graph().variables().supportsMapValues();
- }
-
- @Override
- public boolean supportsByteValues() {
- return baseFeatures.graph().variables().supportsByteValues();
- }
-
- @Override
- public boolean supportsMixedListValues() {
- return baseFeatures.graph().variables().supportsMixedListValues();
- }
-
- @Override
- public boolean supportsBooleanArrayValues() {
- return baseFeatures.graph().variables().supportsBooleanArrayValues();
- }
-
- @Override
- public boolean supportsByteArrayValues() {
- return baseFeatures.graph().variables().supportsByteArrayValues();
- }
-
- @Override
- public boolean supportsDoubleArrayValues() {
- return baseFeatures.graph().variables().supportsDoubleArrayValues();
- }
-
- @Override
- public boolean supportsFloatArrayValues() {
- return baseFeatures.graph().variables().supportsFloatArrayValues();
- }
-
- @Override
- public boolean supportsIntegerArrayValues() {
- return baseFeatures.graph().variables().supportsIntegerArrayValues();
- }
-
- @Override
- public boolean supportsLongArrayValues() {
- return baseFeatures.graph().variables().supportsLongArrayValues();
- }
-
- @Override
- public boolean supportsSerializableValues() {
- return baseFeatures.graph().variables().supportsSerializableValues();
- }
-
- @Override
- public boolean supportsStringValues() {
- return baseFeatures.graph().variables().supportsStringValues();
- }
-
- @Override
- public boolean supportsUniformListValues() {
- return baseFeatures.graph().variables().supportsUniformListValues();
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/4150a16d/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/batch/BatchGraph.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/batch/BatchGraph.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/batch/BatchGraph.java
deleted file mode 100644
index ffa5fff..0000000
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/batch/BatchGraph.java
+++ /dev/null
@@ -1,643 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.structure.util.batch;
-
-import org.apache.commons.configuration.BaseConfiguration;
-import org.apache.commons.configuration.Configuration;
-import org.apache.tinkerpop.gremlin.process.computer.GraphComputer;
-import org.apache.tinkerpop.gremlin.structure.T;
-import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
-import org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.ElementIdStrategy;
-import org.apache.tinkerpop.gremlin.structure.Direction;
-import org.apache.tinkerpop.gremlin.structure.Edge;
-import org.apache.tinkerpop.gremlin.structure.Element;
-import org.apache.tinkerpop.gremlin.structure.Graph;
-import org.apache.tinkerpop.gremlin.structure.Property;
-import org.apache.tinkerpop.gremlin.structure.Transaction;
-import org.apache.tinkerpop.gremlin.structure.Vertex;
-import org.apache.tinkerpop.gremlin.structure.VertexProperty;
-import org.apache.tinkerpop.gremlin.structure.util.ElementHelper;
-import org.apache.tinkerpop.gremlin.structure.util.batch.cache.VertexCache;
-import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
-
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.NoSuchElementException;
-import java.util.Optional;
-import java.util.Set;
-import java.util.function.BiConsumer;
-import java.util.function.Consumer;
-import java.util.function.Function;
-
-/**
- * {@code BatchGraph} is a wrapper that enables batch loading of a large number of edges and vertices by chunking the
- * entire load into smaller batches and maintaining a sideEffects-efficient vertex cache so that the entire
- * transactional state can be flushed after each chunk is loaded.
- * <br />
- * {@code BatchGraph} is ONLY meant for loading data and does not support any retrieval or removal operations.
- * That is, BatchGraph only supports the following methods:
- * - {@link #addVertex(Object...)} for adding vertices
- * - {@link Vertex#addEdge(String, org.apache.tinkerpop.gremlin.structure.Vertex, Object...)} for adding edges
- * - Property getter, setter and removal methods for vertices and edges.
- * <br />
- * An important limitation of BatchGraph is that edge properties can only be set immediately after the edge has been
- * added. If other vertices or edges have been created in the meantime, setting, getting or removing properties will
- * throw exceptions. This is done to avoid caching of edges which would require a great amount of sideEffects.
- * <br />
- * {@code BatchGraph} can also automatically set the provided element ids as properties on the respective element. Use
- * {@link Builder#vertexIdKey(String)} and {@link Builder#edgeIdKey(String)} to set the keys
- * for the vertex and edge properties respectively. This allows to make the loaded baseGraph compatible for later
- * operation with {@link ElementIdStrategy}.
- *
- * @author Matthias Broecheler (http://www.matthiasb.com)
- * @author Stephen Mallette (http://stephen.genoprime.com)
- * @author Marko A. Rodriguez (http://markorodriguez.com)
- */
-public class BatchGraph<G extends Graph> implements Graph {
- /**
- * Default buffer size is 10000.
- */
- public static final long DEFAULT_BUFFER_SIZE = 10000;
-
- private final G baseGraph;
-
- private final String vertexIdKey;
- private final String edgeIdKey;
- private final boolean incrementalLoading;
- private final boolean baseSupportsSuppliedVertexId;
- private final boolean baseSupportsSuppliedEdgeId;
- private final boolean baseSupportsTransactions;
- private final BiConsumer<Element, Object[]> existingVertexStrategy;
- private final BiConsumer<Element, Object[]> existingEdgeStrategy;
-
- private final VertexCache cache;
-
- private final long bufferSize;
- private long remainingBufferSize;
-
- private BatchEdge currentEdge = null;
- private Edge currentEdgeCached = null;
-
- private Object previousOutVertexId = null;
-
- private final BatchFeatures batchFeatures;
-
- private final Transaction batchTransaction;
-
- /**
- * Constructs a BatchGraph wrapping the provided baseGraph, using the specified buffer size and expecting vertex
- * ids of the specified IdType. Supplying vertex ids which do not match this type will throw exceptions.
- *
- * @param graph Graph to be wrapped
- * @param type Type of vertex id expected. This information is used to apply the vertex cache
- * sideEffects footprint.
- * @param bufferSize Defines the number of vertices and edges loaded before starting a new transaction. The
- * larger this value, the more sideEffects is required but the faster the loading process.
- */
- private BatchGraph(final G graph, final VertexIdType type, final long bufferSize, final String vertexIdKey,
- final String edgeIdKey, final boolean incrementalLoading,
- final BiConsumer<Element, Object[]> existingVertexStrategy,
- final BiConsumer<Element, Object[]> existingEdgeStrategy) {
- this.baseGraph = graph;
- this.batchTransaction = new BatchTransaction();
- this.batchFeatures = new BatchFeatures(graph.features());
- this.bufferSize = bufferSize;
- this.cache = type.getVertexCache();
- this.remainingBufferSize = this.bufferSize;
- this.vertexIdKey = vertexIdKey;
- this.edgeIdKey = edgeIdKey;
- this.incrementalLoading = incrementalLoading;
- this.baseSupportsSuppliedEdgeId = this.baseGraph.features().edge().supportsUserSuppliedIds();
- this.baseSupportsSuppliedVertexId = this.baseGraph.features().vertex().supportsUserSuppliedIds();
- this.baseSupportsTransactions = this.baseGraph.features().graph().supportsTransactions();
- this.existingEdgeStrategy = existingEdgeStrategy;
- this.existingVertexStrategy = existingVertexStrategy;
- }
-
- private void nextElement() {
- currentEdge = null;
- currentEdgeCached = null;
- if (remainingBufferSize <= 0) {
- if (this.baseSupportsTransactions) baseGraph.tx().commit();
- cache.newTransaction();
- remainingBufferSize = bufferSize;
- }
- remainingBufferSize--;
- }
-
- private Vertex retrieveFromCache(final Object externalID) {
- final Object internal = cache.getEntry(externalID);
- if (internal instanceof Vertex) {
- return (Vertex) internal;
- } else if (internal != null) { //its an internal id
- final Vertex v = baseGraph.traversal().V(internal).next();
- cache.set(v, externalID);
- return v;
- } else return null;
- }
-
- private Vertex getCachedVertex(final Object externalID) {
- final Vertex v = retrieveFromCache(externalID);
- if (v == null) throw new IllegalArgumentException("Vertex for given ID cannot be found: " + externalID);
- return v;
- }
-
- @Override
- public Vertex addVertex(final Object... keyValues) {
- final Object id = ElementHelper.getIdValue(keyValues).orElseThrow(() -> new IllegalArgumentException("Vertex id value cannot be null"));
- if (!incrementalLoading && retrieveFromCache(id) != null)
- throw new IllegalArgumentException("Vertex id already exists");
- nextElement();
-
- // if the vertexIdKey is not the T.id then append it as a name/value pair. this will overwrite what
- // is present in that field already
- final Object[] keysVals = T.id.getAccessor().equals(vertexIdKey) ? keyValues : ElementHelper.upsert(keyValues, vertexIdKey, id);
-
- // if the graph doesn't support vertex ids or the vertex id is not the T.id then remove that key
- // value pair as it will foul up insertion (i.e. an exception for graphs that don't support it and the
- // id will become the value of the vertex id which might not be expected.
- final Optional<Object[]> kvs = this.baseSupportsSuppliedVertexId && T.id.getAccessor().equals(vertexIdKey) ?
- Optional.ofNullable(keyValues) : ElementHelper.remove(T.id, keysVals);
-
- Vertex currentVertex;
- if (!incrementalLoading)
- currentVertex = kvs.isPresent() ? baseGraph.addVertex(kvs.get()) : baseGraph.addVertex();
- else {
- final Traversal<Vertex, Vertex> traversal = baseGraph.traversal().V().has(vertexIdKey, id);
- if (traversal.hasNext()) {
- final Vertex v = traversal.next();
- if (traversal.hasNext())
- throw new IllegalStateException(String.format("There is more than one vertex identified by %s=%s", vertexIdKey, id));
-
- // let the caller decide how to handle conflict
- kvs.ifPresent(keyvals -> existingVertexStrategy.accept(v, keyvals));
- currentVertex = v;
- } else
- currentVertex = kvs.isPresent() ? baseGraph.addVertex(kvs.get()) : baseGraph.addVertex();
- }
-
- cache.set(currentVertex, id);
-
- return new BatchVertex(id);
- }
-
- @Override
- public Iterator<Vertex> vertices(final Object... vertexIds) {
- if (vertexIds.length > 1)
- throw new IllegalArgumentException("BatchGraph only allows a single vertex id at one time");
- if ((this.previousOutVertexId != null) && (this.previousOutVertexId.equals(vertexIds[0]))) {
- return IteratorUtils.of(new BatchVertex(this.previousOutVertexId));
- } else {
- Vertex vertex = retrieveFromCache(vertexIds[0]);
- if (null == vertex) {
- if (!this.incrementalLoading) return Collections.emptyIterator();
- else {
- final Iterator<Vertex> iterator = this.baseGraph.traversal().V().has(this.vertexIdKey, vertexIds[0]);
- if (!iterator.hasNext()) return Collections.emptyIterator();
- vertex = iterator.next();
- if (iterator.hasNext())
- throw new IllegalStateException("There are multiple vertices with the provided id in the graph: " + vertexIds[0]);
- this.cache.set(vertex, vertexIds[0]);
- }
- }
- return IteratorUtils.of(new BatchVertex(vertexIds[0]));
- }
- }
-
- @Override
- public Iterator<Edge> edges(final Object... edgeIds) {
- throw retrievalNotSupported();
- }
-
- @Override
- public <C extends GraphComputer> C compute(final Class<C> graphComputerClass) {
- throw Exceptions.graphComputerNotSupported();
- }
-
- @Override
- public GraphComputer compute() {
- throw Exceptions.graphComputerNotSupported();
- }
-
- @Override
- public Transaction tx() {
- return this.batchTransaction;
- }
-
- @Override
- public Variables variables() {
- throw Exceptions.variablesNotSupported();
- }
-
- @Override
- public Configuration configuration() {
- return new BaseConfiguration();
- }
-
- @Override
- public Features features() {
- return this.batchFeatures;
- }
-
- @Override
- public void close() throws Exception {
- baseGraph.close();
-
- // call reset after the close in case the close behavior fails
- reset();
- }
-
- private void reset() {
- currentEdge = null;
- currentEdgeCached = null;
- remainingBufferSize = 0;
- }
-
- public static <T extends Graph> Builder build(final T g) {
- return new Builder<>(g);
- }
-
- private class BatchTransaction implements Transaction {
- private final boolean supportsTx;
-
- public BatchTransaction() {
- supportsTx = baseGraph.features().graph().supportsTransactions();
- }
-
- @Override
- public Transaction onClose(final Consumer<Transaction> consumer) {
- throw new UnsupportedOperationException("Transaction behavior cannot be altered in batch mode - set the behavior on the base graph");
- }
-
- @Override
- public Transaction onReadWrite(final Consumer<Transaction> consumer) {
- throw new UnsupportedOperationException("Transaction behavior cannot be altered in batch mode - set the behavior on the base graph");
- }
-
- @Override
- public void close() {
- if (supportsTx) baseGraph.tx().close();
-
- // call reset after the close in case the close behavior fails
- reset();
- }
-
- @Override
- public void readWrite() {
- if (supportsTx) baseGraph.tx().readWrite();
- }
-
- @Override
- public boolean isOpen() {
- return !supportsTx || baseGraph.tx().isOpen();
- }
-
- @Override
- public <G extends Graph> G create() {
- throw new UnsupportedOperationException("Cannot start threaded transaction during batch loading");
- }
-
- @Override
- public <R> Workload<R> submit(final Function<Graph, R> work) {
- throw new UnsupportedOperationException("Cannot submit a workload during batch loading");
- }
-
- @Override
- public void rollback() {
- throw new UnsupportedOperationException("Cannot issue a rollback during batch loading");
- }
-
- @Override
- public void commit() {
- if (supportsTx) baseGraph.tx().commit();
-
- // call reset after the close in case the close behavior fails
- reset();
- }
-
- @Override
- public void open() {
- if (supportsTx) baseGraph.tx().open();
- }
-
- @Override
- public void addTransactionListener(final Consumer<Status> listener) {
- throw new UnsupportedOperationException("Listeners not supported during batch loading");
- }
-
- @Override
- public void removeTransactionListener(final Consumer<Status> listener) {
- throw new UnsupportedOperationException("Listeners not supported during batch loading");
- }
-
- @Override
- public void clearTransactionListeners() {
- throw new UnsupportedOperationException("Listeners not supported during batch loading");
- }
- }
-
- private class BatchVertex implements Vertex {
-
- private final Object externalID;
-
- BatchVertex(final Object id) {
- if (id == null) throw new IllegalArgumentException("External id may not be null");
- externalID = id;
- }
-
- @Override
- public Edge addEdge(final String label, final Vertex inVertex, final Object... keyValues) {
- if (!BatchVertex.class.isInstance(inVertex))
- throw new IllegalArgumentException("Given element was not created in this baseGraph");
- nextElement();
-
- final Vertex ov = getCachedVertex(externalID);
- final Vertex iv = getCachedVertex(inVertex.id());
-
- previousOutVertexId = externalID; //keep track of the previous out vertex id
-
- if (!incrementalLoading) {
- final Optional<Object[]> kvs = baseSupportsSuppliedEdgeId && T.id.getAccessor().equals(edgeIdKey) ?
- Optional.ofNullable(keyValues) : ElementHelper.remove(T.id, keyValues);
- currentEdgeCached = kvs.isPresent() ? ov.addEdge(label, iv, kvs.get()) : ov.addEdge(label, iv);
- } else {
- final Optional<Object> id = ElementHelper.getIdValue(keyValues);
- // if the edgeIdKey is not the Element.ID then append it as a name/value pair. this will overwrite what
- // is present in that field already
- final Object[] keysVals = id.isPresent() && T.id.getAccessor().equals(edgeIdKey) ? keyValues :
- id.isPresent() ? ElementHelper.upsert(keyValues, edgeIdKey, id.get()) : keyValues;
-
- // if the graph doesn't support edge ids or the edge id is not the Element.ID then remove that key
- // value pair as it will foul up insertion (i.e. an exception for graphs that don't support it and the
- // id will become the value of the edge id which might not be expected.
- final Optional<Object[]> kvs = baseSupportsSuppliedEdgeId && T.id.getAccessor().equals(edgeIdKey) ?
- Optional.ofNullable(keyValues) : ElementHelper.remove(T.id, keysVals);
-
- if (id.isPresent()) {
- final Traversal<Edge, Edge> traversal = baseGraph.traversal().E().has(edgeIdKey, id.get());
- if (traversal.hasNext()) {
- final Edge e = traversal.next();
- // let the user decide how to handle conflict
- kvs.ifPresent(keyvals -> existingEdgeStrategy.accept(e, keyvals));
- currentEdgeCached = e;
- } else
- currentEdgeCached = kvs.isPresent() ? ov.addEdge(label, iv, kvs.get()) : ov.addEdge(label, iv);
- } else {
- currentEdgeCached = kvs.isPresent() ? ov.addEdge(label, iv, kvs.get()) : ov.addEdge(label, iv);
- }
- }
-
- currentEdge = new BatchEdge();
-
- return currentEdge;
- }
-
- @Override
- public Object id() {
- return this.externalID;
- }
-
- @Override
- public Graph graph() {
- return getCachedVertex(externalID).graph();
- }
-
- @Override
- public String label() {
- return getCachedVertex(externalID).label();
- }
-
- @Override
- public void remove() {
- throw removalNotSupported();
- }
-
- @Override
- public Set<String> keys() {
- return getCachedVertex(externalID).keys();
- }
-
- @Override
- public <V> VertexProperty<V> property(VertexProperty.Cardinality cardinality, String key, V value, Object... keyValues) {
- return getCachedVertex(externalID).property(cardinality, key, value, keyValues);
- }
-
- @Override
- public <V> VertexProperty<V> property(final String key) {
- return getCachedVertex(externalID).property(key);
- }
-
- @Override
- public <V> VertexProperty<V> property(final String key, final V value, final Object... keyValues) {
- return getCachedVertex(externalID).property(key, value, keyValues);
- }
-
- @Override
- public <V> V value(final String key) throws NoSuchElementException {
- return getCachedVertex(externalID).value(key);
- }
-
- @Override
- public Iterator<Edge> edges(final Direction direction, final String... edgeLabels) {
- throw retrievalNotSupported();
- }
-
- @Override
- public Iterator<Vertex> vertices(final Direction direction, final String... labels) {
- throw retrievalNotSupported();
- }
-
- @Override
- public <V> Iterator<VertexProperty<V>> properties(final String... propertyKeys) {
- return getCachedVertex(externalID).properties(propertyKeys);
- }
- }
-
- private class BatchEdge implements Edge {
-
-
- @Override
- public Graph graph() {
- return getWrappedEdge().graph();
- }
-
- @Override
- public Object id() {
- return getWrappedEdge().label();
- }
-
- @Override
- public String label() {
- return getWrappedEdge().label();
- }
-
- @Override
- public void remove() {
- throw removalNotSupported();
- }
-
- @Override
- public <V> Property<V> property(final String key) {
- return getWrappedEdge().property(key);
- }
-
- @Override
- public <V> Property<V> property(final String key, final V value) {
- return getWrappedEdge().property(key, value);
- }
-
- @Override
- public Set<String> keys() {
- return getWrappedEdge().keys();
- }
-
- @Override
- public <V> V value(final String key) throws NoSuchElementException {
- return getWrappedEdge().value(key);
- }
-
- private Edge getWrappedEdge() {
- if (this != currentEdge) {
- throw new UnsupportedOperationException("This edge is no longer in scope");
- }
- return currentEdgeCached;
- }
-
- @Override
- public <V> Iterator<Property<V>> properties(final String... propertyKeys) {
- return getWrappedEdge().properties(propertyKeys);
- }
-
- @Override
- public Iterator<Vertex> vertices(final Direction direction) {
- return getWrappedEdge().vertices(direction);
- }
- }
-
- private static UnsupportedOperationException retrievalNotSupported() {
- return new UnsupportedOperationException("Retrieval operations are not supported during batch loading");
- }
-
- private static UnsupportedOperationException removalNotSupported() {
- return new UnsupportedOperationException("Removal operations are not supported during batch loading");
- }
-
- public static class Builder<G extends Graph> {
- private final G graphToLoad;
- private boolean incrementalLoading = false;
- private String vertexIdKey = T.id.getAccessor();
- private String edgeIdKey = T.id.getAccessor();
- private long bufferSize = DEFAULT_BUFFER_SIZE;
- private VertexIdType vertexIdType = VertexIdType.OBJECT;
- private BiConsumer<Element, Object[]> existingVertexStrategy = Exists.IGNORE;
- private BiConsumer<Element, Object[]> existingEdgeStrategy = Exists.IGNORE;
-
- private Builder(final G g) {
- if (null == g) throw new IllegalArgumentException("Graph may not be null");
- if (g instanceof BatchGraph)
- throw new IllegalArgumentException("BatchGraph cannot wrap another BatchGraph instance");
- this.graphToLoad = g;
- }
-
- /**
- * Sets the key to be used when setting the vertex id as a property on the respective vertex. If this
- * value is not set it defaults to {@link T#id}.
- *
- * @param key Key to be used.
- */
- public Builder vertexIdKey(final String key) {
- if (null == key) throw new IllegalArgumentException("Key cannot be null");
- this.vertexIdKey = key;
- return this;
- }
-
- /**
- * Sets the key to be used when setting the edge id as a property on the respective edge.
- * If the key is null, then no property will be set.
- *
- * @param key Key to be used.
- */
- public Builder edgeIdKey(final String key) {
- if (null == key) throw new IllegalArgumentException("Optional value for key cannot be null");
- this.edgeIdKey = key;
- return this;
- }
-
- /**
- * Number of mutations to perform between calls to {@link org.apache.tinkerpop.gremlin.structure.Transaction#commit}.
- */
- public Builder bufferSize(long bufferSize) {
- if (bufferSize <= 0) throw new IllegalArgumentException("BufferSize must be positive");
- this.bufferSize = bufferSize;
- return this;
- }
-
- /**
- * Sets the type of the id used for the vertex which in turn determines the cache type that is used.
- */
- public Builder vertexIdType(final VertexIdType type) {
- if (null == type) throw new IllegalArgumentException("Type may not be null");
- this.vertexIdType = type;
- return this;
- }
-
- /**
- * Sets whether the graph loaded through this instance of {@link BatchGraph} is loaded from scratch
- * (i.e. the wrapped graph is initially empty) or whether graph is loaded incrementally into an
- * existing graph.
- * <p/>
- * In the former case, BatchGraph does not need to check for the existence of vertices with the wrapped
- * graph but only needs to consult its own cache which can be significantly faster. In the latter case,
- * the cache is checked first but an additional check against the wrapped graph may be necessary if
- * the vertex does not exist.
- * <p/>
- * By default, BatchGraph assumes that the data is loaded from scratch.
- */
- public Builder incrementalLoading(final boolean incrementalLoading) {
- this.incrementalLoading = incrementalLoading;
- return this;
- }
-
- /**
- * Sets whether the graph loaded through this instance of {@link BatchGraph} is loaded from scratch
- * (i.e. the wrapped graph is initially empty) or whether graph is loaded incrementally into an
- * existing graph.
- * <p/>
- * In the former case, BatchGraph does not need to check for the existence of vertices with the wrapped
- * graph but only needs to consult its own cache which can be significantly faster. In the latter case,
- * the cache is checked first but an additional check against the wrapped graph may be necessary if
- * the vertex does not exist.
- * <p/>
- * By default, BatchGraph assumes that the data is loaded from scratch.
- */
- public Builder incrementalLoading(final boolean incrementalLoading,
- final BiConsumer<Element, Object[]> existingVertexStrategy,
- final BiConsumer<Element, Object[]> existingEdgeStrategy) {
- this.incrementalLoading = incrementalLoading;
- this.existingVertexStrategy = existingVertexStrategy;
- this.existingEdgeStrategy = existingEdgeStrategy;
- return this;
- }
-
- public BatchGraph<G> create() {
- return new BatchGraph<>(graphToLoad, vertexIdType, bufferSize, vertexIdKey, edgeIdKey,
- incrementalLoading, this.existingVertexStrategy, this.existingEdgeStrategy);
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/4150a16d/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/batch/Exists.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/batch/Exists.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/batch/Exists.java
deleted file mode 100644
index a4a9a4e..0000000
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/batch/Exists.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.structure.util.batch;
-
-import org.apache.tinkerpop.gremlin.structure.Element;
-import org.apache.tinkerpop.gremlin.structure.Vertex;
-import org.apache.tinkerpop.gremlin.structure.VertexProperty;
-import org.apache.tinkerpop.gremlin.structure.util.ElementHelper;
-
-import java.util.function.BiConsumer;
-
-/**
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public enum Exists implements BiConsumer<Element, Object[]> {
- IGNORE {
- @Override
- public void accept(final Element element, final Object[] objects) {
- // do nothing
- }
- },
- THROW {
- @Override
- public void accept(final Element element, final Object[] objects) {
- throw new IllegalStateException(String.format(
- "Element of type %s with id of [%s] was not expected to exist in target graph",
- element.getClass().getSimpleName(), element.id()));
- }
- },
- OVERWRITE {
- @Override
- public void accept(final Element element, final Object[] keyValues) {
- if (element instanceof Vertex)
- ElementHelper.attachProperties((Vertex) element, VertexProperty.Cardinality.list, keyValues);
- else
- ElementHelper.attachProperties(element, keyValues);
-
- }
- },
- OVERWRITE_SINGLE {
- @Override
- public void accept(final Element element, final Object[] keyValues) {
- ElementHelper.attachProperties(element, keyValues);
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/4150a16d/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/batch/VertexIdType.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/batch/VertexIdType.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/batch/VertexIdType.java
deleted file mode 100644
index 29cf4ce..0000000
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/batch/VertexIdType.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.structure.util.batch;
-
-import org.apache.tinkerpop.gremlin.structure.util.batch.cache.LongIDVertexCache;
-import org.apache.tinkerpop.gremlin.structure.util.batch.cache.ObjectIDVertexCache;
-import org.apache.tinkerpop.gremlin.structure.util.batch.cache.StringIDVertexCache;
-import org.apache.tinkerpop.gremlin.structure.util.batch.cache.URLCompression;
-import org.apache.tinkerpop.gremlin.structure.util.batch.cache.VertexCache;
-
-/**
- * Type of vertex ids expected by BatchGraph. The default is IdType.OBJECT.
- * Use the IdType that best matches the used vertex id types in order to save sideEffects.
- *
- * @author Matthias Broecheler (http://www.matthiasb.com)
- */
-public enum VertexIdType {
-
- OBJECT {
- @Override
- public VertexCache getVertexCache() {
- return new ObjectIDVertexCache();
- }
- },
-
- NUMBER {
- @Override
- public VertexCache getVertexCache() {
- return new LongIDVertexCache();
- }
- },
-
- STRING {
- @Override
- public VertexCache getVertexCache() {
- return new StringIDVertexCache();
- }
- },
-
- URL {
- @Override
- public VertexCache getVertexCache() {
- return new StringIDVertexCache(new URLCompression());
-
- }
- };
-
- public abstract VertexCache getVertexCache();
-}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/4150a16d/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/batch/cache/AbstractIDVertexCache.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/batch/cache/AbstractIDVertexCache.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/batch/cache/AbstractIDVertexCache.java
deleted file mode 100644
index 5672842..0000000
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/batch/cache/AbstractIDVertexCache.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.structure.util.batch.cache;
-
-import org.apache.tinkerpop.gremlin.structure.Vertex;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * @author Matthias Broecheler (http://www.matthiasb.com)
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-abstract class AbstractIDVertexCache implements VertexCache {
-
- static final int INITIAL_CAPACITY = 1000;
- static final int INITIAL_TX_CAPACITY = 100;
-
- private final Map<Object, Object> map;
- private final Set<Object> mapKeysInCurrentTx;
-
- AbstractIDVertexCache() {
- map = new HashMap<>(INITIAL_CAPACITY);
- mapKeysInCurrentTx = new HashSet<>(INITIAL_TX_CAPACITY);
- }
-
- @Override
- public Object getEntry(final Object externalId) {
- return map.get(externalId);
- }
-
- @Override
- public void set(final Vertex vertex, final Object externalId) {
- setId(vertex, externalId);
- }
-
- @Override
- public void setId(final Object vertexId, final Object externalId) {
- map.put(externalId, vertexId);
- mapKeysInCurrentTx.add(externalId);
- }
-
- @Override
- public boolean contains(final Object externalId) {
- return map.containsKey(externalId);
- }
-
- @Override
- public void newTransaction() {
- for (Object id : mapKeysInCurrentTx) {
- Object o = map.get(id);
- assert null != o;
- if (o instanceof Vertex) {
- Vertex v = (Vertex) o;
- map.put(id, v.id());
- }
- }
- mapKeysInCurrentTx.clear();
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/4150a16d/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/batch/cache/LongIDVertexCache.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/batch/cache/LongIDVertexCache.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/batch/cache/LongIDVertexCache.java
deleted file mode 100644
index aef4a72..0000000
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/batch/cache/LongIDVertexCache.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.structure.util.batch.cache;
-
-import com.carrotsearch.hppc.LongArrayList;
-import com.carrotsearch.hppc.LongObjectMap;
-import com.carrotsearch.hppc.LongObjectOpenHashMap;
-import com.carrotsearch.hppc.procedures.LongProcedure;
-import org.apache.tinkerpop.gremlin.structure.Vertex;
-
-/**
- * @author Matthias Broecheler (http://www.matthiasb.com)
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public class LongIDVertexCache implements VertexCache {
-
- private final LongObjectMap<Object> map;
- private final LongArrayList mapKeysInCurrentTx;
- private final LongProcedure newTransactionProcedure;
-
- public LongIDVertexCache() {
- map = new LongObjectOpenHashMap<>(AbstractIDVertexCache.INITIAL_CAPACITY);
- mapKeysInCurrentTx = new LongArrayList(AbstractIDVertexCache.INITIAL_TX_CAPACITY);
- newTransactionProcedure = new VertexConverterLP();
- }
-
- private static long getID(final Object externalID) {
- if (!(externalID instanceof Number)) throw new IllegalArgumentException("Number expected.");
- return ((Number) externalID).longValue();
- }
-
- @Override
- public Object getEntry(final Object externalId) {
- return map.get(getID(externalId));
- }
-
- @Override
- public void set(final Vertex vertex, final Object externalId) {
- setId(vertex, externalId);
- }
-
- @Override
- public void setId(final Object vertexId, final Object externalId) {
- final long id = getID(externalId);
- map.put(id, vertexId);
- mapKeysInCurrentTx.add(id);
- }
-
- @Override
- public boolean contains(final Object externalId) {
- return map.containsKey(getID(externalId));
- }
-
- @Override
- public void newTransaction() {
- mapKeysInCurrentTx.forEach(newTransactionProcedure);
- mapKeysInCurrentTx.clear();
- }
-
- /**
- * See {@link LongIDVertexCache#newTransaction()}
- */
- private class VertexConverterLP implements LongProcedure {
- /**
- * Retrieve the Object associated with each long from {@code map}. If it
- * is an {@code instanceof Vertex}, then replace it in the map with
- * {@link Vertex#id()}. Otherwise, do nothing.
- */
- @Override
- public void apply(final long l) {
- final Object o = map.get(l);
- assert null != o;
- if (o instanceof Vertex) {
- map.put(l, ((Vertex) o).id());
- }
- }
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/4150a16d/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/batch/cache/ObjectIDVertexCache.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/batch/cache/ObjectIDVertexCache.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/batch/cache/ObjectIDVertexCache.java
deleted file mode 100644
index 7487430..0000000
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/batch/cache/ObjectIDVertexCache.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.structure.util.batch.cache;
-
-/**
- * @author Matthias Broecheler (http://www.matthiasb.com)
- */
-public class ObjectIDVertexCache extends AbstractIDVertexCache {
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/4150a16d/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/batch/cache/StringCompression.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/batch/cache/StringCompression.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/batch/cache/StringCompression.java
deleted file mode 100644
index c862f71..0000000
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/batch/cache/StringCompression.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.structure.util.batch.cache;
-
-/**
- * @author Matthias Broecheler (http://www.matthiasb.com)
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public interface StringCompression {
- public static final StringCompression NO_COMPRESSION = input -> input;
-
- public String compress(final String input);
-}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/4150a16d/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/batch/cache/StringIDVertexCache.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/batch/cache/StringIDVertexCache.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/batch/cache/StringIDVertexCache.java
deleted file mode 100644
index 865fd70..0000000
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/batch/cache/StringIDVertexCache.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.structure.util.batch.cache;
-
-import org.apache.tinkerpop.gremlin.structure.Vertex;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * @author Matthias Broecheler (http://www.matthiasb.com)
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public class StringIDVertexCache implements VertexCache {
-
- private static final int INITIAL_CAPACITY = 1000;
- private static final int INITIAL_TX_CAPACITY = 100;
-
- private final Map<String, Object> map;
- private final Set<String> mapKeysInCurrentTx;
- private final StringCompression compression;
-
- public StringIDVertexCache(final StringCompression compression) {
- if (compression == null) throw new IllegalArgumentException("Compression expected.");
- this.compression = compression;
- map = new HashMap<>(INITIAL_CAPACITY);
- mapKeysInCurrentTx = new HashSet<>(INITIAL_TX_CAPACITY);
- }
-
- public StringIDVertexCache() {
- this(StringCompression.NO_COMPRESSION);
- }
-
- @Override
- public Object getEntry(final Object externalId) {
- final String id = compression.compress(externalId.toString());
- return map.get(id);
- }
-
- @Override
- public void set(final Vertex vertex, final Object externalId) {
- setId(vertex, externalId);
- }
-
- @Override
- public void setId(final Object vertexId, final Object externalId) {
- final String id = compression.compress(externalId.toString());
- map.put(id, vertexId);
- mapKeysInCurrentTx.add(id);
- }
-
- @Override
- public boolean contains(final Object externalId) {
- return map.containsKey(compression.compress(externalId.toString()));
- }
-
- @Override
- public void newTransaction() {
- for (String id : mapKeysInCurrentTx) {
- final Object o = map.get(id);
- assert null != o;
- if (o instanceof Vertex) {
- Vertex v = (Vertex) o;
- map.put(id, v.id());
- }
- }
- mapKeysInCurrentTx.clear();
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/4150a16d/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/batch/cache/URLCompression.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/batch/cache/URLCompression.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/batch/cache/URLCompression.java
deleted file mode 100644
index 4113cc7..0000000
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/batch/cache/URLCompression.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.structure.util.batch.cache;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * @author Matthias Broecheler (http://www.matthiasb.com)
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public class URLCompression implements StringCompression {
-
- private static final String DELIMITER = "$";
-
- private int prefixCounter = 0;
-
- private final Map<String, String> urlPrefix = new HashMap<>();
-
- @Override
- public String compress(final String input) {
- final String[] url = splitURL(input);
- String prefix = urlPrefix.get(url[0]);
- if (prefix == null) {
- //New Prefix
- prefix = Long.toString(prefixCounter, Character.MAX_RADIX) + DELIMITER;
- prefixCounter++;
- urlPrefix.put(url[0], prefix);
- }
- return prefix + url[1];
- }
-
- private final static char[] urlDelimiters = new char[]{'/', '#', ':'};
-
- private static String[] splitURL(final String url) {
- final String[] res = new String[2];
- int pos = -1;
- for (char delimiter : urlDelimiters) {
- int currentpos = url.lastIndexOf(delimiter);
- if (currentpos > pos) pos = currentpos;
- }
- if (pos < 0) {
- res[0] = "";
- res[1] = url;
- } else {
- res[0] = url.substring(0, pos + 1);
- res[1] = url.substring(pos + 1);
- }
- return res;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/4150a16d/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/batch/cache/VertexCache.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/batch/cache/VertexCache.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/batch/cache/VertexCache.java
deleted file mode 100644
index 3ee7626..0000000
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/batch/cache/VertexCache.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.structure.util.batch.cache;
-
-import org.apache.tinkerpop.gremlin.structure.Vertex;
-
-/**
- * @author Matthias Broecheler (http://www.matthiasb.com)
- */
-public interface VertexCache {
- public Object getEntry(final Object externalId);
-
- public void set(final Vertex vertex, final Object externalId);
-
- public void setId(final Object vertexId, final Object externalId);
-
- public boolean contains(final Object externalId);
-
- public void newTransaction();
-}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/4150a16d/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/benchmark/ProfilingApplication.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/benchmark/ProfilingApplication.java b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/benchmark/ProfilingApplication.java
index 839a13b..6b96eed 100644
--- a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/benchmark/ProfilingApplication.java
+++ b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/benchmark/ProfilingApplication.java
@@ -24,6 +24,9 @@ import org.apache.tinkerpop.gremlin.driver.Cluster;
import java.util.List;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.CyclicBarrier;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
@@ -37,13 +40,15 @@ public class ProfilingApplication {
final String host = args.length == 0 ? "localhost" : args[0];
- final int clients = 2;
+ final int clients = 1;
final int requests = 10000;
final Cluster cluster = Cluster.build(host)
- .minConnectionPoolSize(64)
- .maxConnectionPoolSize(128)
+ .minConnectionPoolSize(256)
+ .maxConnectionPoolSize(256)
.nioPoolSize(clients)
- .workerPoolSize(clients * 4).create();
+ .workerPoolSize(clients * 2).create();
+
+ final AtomicInteger tooSlow = new AtomicInteger(0);
// let all the clients fully init before starting to send messages
final CyclicBarrier barrier = new CyclicBarrier(clients);
@@ -61,7 +66,17 @@ public class ProfilingApplication {
System.out.println("Executing at [" + t + "]:" + start);
IntStream.range(0, requests).forEach(i -> {
- client.submitAsync("1+1").thenAccept(r -> r.all()).thenRun(latch::countDown);
+ client.submitAsync("1+1").thenAcceptAsync(r -> {
+ try {
+ r.all().get(100, TimeUnit.MILLISECONDS);
+ } catch (TimeoutException ex) {
+ tooSlow.incrementAndGet();
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ } finally {
+ latch.countDown();
+ }
+ });
});
latch.await();
@@ -74,7 +89,7 @@ public class ProfilingApplication {
final long totalSeconds = Math.round(total / 1000000000d);
final long requestCount = requests;
final long reqSec = Math.round(requestCount / totalSeconds);
- System.out.println(String.format("[" + t + "] clients: %s requests: %s time(s): %s req/sec: %s", clients, requestCount, totalSeconds, reqSec));
+ System.out.println(String.format("[" + t + "] clients: %s | requests: %s | time(s): %s | req/sec: %s | too slow: %s", clients, requestCount, totalSeconds, reqSec, tooSlow.get()));
} catch (Exception ex) {
ex.printStackTrace();
throw new RuntimeException(ex);
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/4150a16d/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/AbstractImportCustomizerProvider.java
----------------------------------------------------------------------
diff --git a/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/AbstractImportCustomizerProvider.java b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/AbstractImportCustomizerProvider.java
index c9d2228..c78497b 100644
--- a/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/AbstractImportCustomizerProvider.java
+++ b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/AbstractImportCustomizerProvider.java
@@ -53,7 +53,6 @@ import org.apache.tinkerpop.gremlin.structure.io.graphml.GraphMLReader;
import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONReader;
import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoReader;
import org.apache.tinkerpop.gremlin.structure.util.GraphFactory;
-import org.apache.tinkerpop.gremlin.structure.util.batch.BatchGraph;
import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedElement;
import org.apache.tinkerpop.gremlin.util.Gremlin;
import org.apache.tinkerpop.gremlin.util.TimeUtil;
@@ -82,7 +81,6 @@ public abstract class AbstractImportCustomizerProvider implements ImportCustomiz
// graph structure
imports.add(Graph.class.getPackage().getName() + DOT_STAR);
imports.add(GraphFactory.class.getPackage().getName() + DOT_STAR);
- imports.add(BatchGraph.class.getPackage().getName() + DOT_STAR);
imports.add(DetachedElement.class.getPackage().getName() + DOT_STAR);
staticImports.add(T.class.getCanonicalName() + DOT_STAR);
staticImports.add(Direction.class.getCanonicalName() + DOT_STAR);
[40/50] [abbrv] incubator-tinkerpop git commit: Relaxed number
comparisons for Compare.[gt, lt, gte,
lte] and added more test cases in CompareTest
Posted by sp...@apache.org.
Relaxed number comparisons for Compare.[gt,lt,gte,lte] and added more test cases in CompareTest
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/c42e5bc8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/c42e5bc8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/c42e5bc8
Branch: refs/heads/variables
Commit: c42e5bc8f2fd39573d1f6bd30e152fbbae5ecd4a
Parents: 250b27d
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Thu Apr 30 22:02:40 2015 +0200
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Thu Apr 30 22:02:40 2015 +0200
----------------------------------------------------------------------
.../tinkerpop/gremlin/structure/Compare.java | 25 +++++++++-------
.../gremlin/structure/CompareTest.java | 30 +++++++++++++-------
2 files changed, 35 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c42e5bc8/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Compare.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Compare.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Compare.java
index 8184381..df9f612 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Compare.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Compare.java
@@ -31,11 +31,10 @@ public enum Compare implements BiPredicate<Object, Object> {
eq {
@Override
public boolean test(final Object first, final Object second) {
- if (null == first)
- return second == null;
- return first instanceof Number && second instanceof Number && !first.getClass().equals(second.getClass())
+ return null == first ? null == second : (first instanceof Number && second instanceof Number
+ && !first.getClass().equals(second.getClass())
? ((Number) first).doubleValue() == ((Number) second).doubleValue()
- : first.equals(second);
+ : first.equals(second));
}
@Override
@@ -55,7 +54,10 @@ public enum Compare implements BiPredicate<Object, Object> {
}, gt {
@Override
public boolean test(final Object first, final Object second) {
- return !(null == first || second == null) && ((Comparable) first).compareTo(second) >= 1;
+ return null != first && null != second && (
+ first instanceof Number && second instanceof Number && !first.getClass().equals(second.getClass())
+ ? ((Number) first).doubleValue() > ((Number) second).doubleValue()
+ : ((Comparable) first).compareTo(second) > 0);
}
@Override
@@ -65,7 +67,7 @@ public enum Compare implements BiPredicate<Object, Object> {
}, gte {
@Override
public boolean test(final Object first, final Object second) {
- return !(null == first || second == null) && ((Comparable) first).compareTo(second) >= 0;
+ return null == first ? null == second : (null != second && !lt.test(first, second));
}
@Override
@@ -75,7 +77,10 @@ public enum Compare implements BiPredicate<Object, Object> {
}, lt {
@Override
public boolean test(final Object first, final Object second) {
- return !(null == first || second == null) && ((Comparable) first).compareTo(second) <= -1;
+ return null != first && null != second && (
+ first instanceof Number && second instanceof Number && !first.getClass().equals(second.getClass())
+ ? ((Number) first).doubleValue() < ((Number) second).doubleValue()
+ : ((Comparable) first).compareTo(second) < 0);
}
@Override
@@ -85,7 +90,7 @@ public enum Compare implements BiPredicate<Object, Object> {
}, lte {
@Override
public boolean test(final Object first, final Object second) {
- return !(null == first || second == null) && ((Comparable) first).compareTo(second) <= 0;
+ return null == first ? null == second : (null != second && !gt.test(first, second));
}
@Override
@@ -97,8 +102,8 @@ public enum Compare implements BiPredicate<Object, Object> {
/**
* {@inheritDoc}
*/
- @Override
- public abstract boolean test(final Object first, final Object second);
+ /*@Override
+ public abstract boolean test(final Object first, final Object second);*/
/**
* Produce the opposite representation of the current {@code Compare} enum.
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c42e5bc8/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/CompareTest.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/CompareTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/CompareTest.java
index 81546f5..06dcafc 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/CompareTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/CompareTest.java
@@ -22,7 +22,11 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.ArrayList;
import java.util.Arrays;
+import java.util.List;
import static org.junit.Assert.assertEquals;
@@ -34,11 +38,11 @@ public class CompareTest {
@Parameterized.Parameters(name = "{0}.test({1},{2}) = {3}")
public static Iterable<Object[]> data() {
- return Arrays.asList(new Object[][]{
+ final List<Object> one = Arrays.asList(1, 1l, 1d, 1f, BigDecimal.ONE, BigInteger.ONE);
+ final List<Object[]> testCases = new ArrayList<>(Arrays.asList(new Object[][]{
{Compare.eq, null, null, true},
{Compare.eq, null, 1, false},
{Compare.eq, 1, null, false},
- {Compare.eq, 1, 1, true},
{Compare.eq, "1", "1", true},
{Compare.eq, 100, 99, false},
{Compare.eq, 100, 101, false},
@@ -47,7 +51,6 @@ public class CompareTest {
{Compare.neq, null, null, false},
{Compare.neq, null, 1, true},
{Compare.neq, 1, null, true},
- {Compare.neq, 1, 1, false},
{Compare.neq, "1", "1", false},
{Compare.neq, 100, 99, true},
{Compare.neq, 100, 101, true},
@@ -56,7 +59,6 @@ public class CompareTest {
{Compare.gt, null, null, false},
{Compare.gt, null, 1, false},
{Compare.gt, 1, null, false},
- {Compare.gt, 1, 1, false},
{Compare.gt, "1", "1", false},
{Compare.gt, 100, 99, true},
{Compare.gt, 100, 101, false},
@@ -65,31 +67,39 @@ public class CompareTest {
{Compare.lt, null, null, false},
{Compare.lt, null, 1, false},
{Compare.lt, 1, null, false},
- {Compare.lt, 1, 1, false},
{Compare.lt, "1", "1", false},
{Compare.lt, 100, 99, false},
{Compare.lt, 100, 101, true},
{Compare.lt, "z", "a", false},
{Compare.lt, "a", "z", true},
- {Compare.gte, null, null, false},
+ {Compare.gte, null, null, true},
{Compare.gte, null, 1, false},
{Compare.gte, 1, null, false},
- {Compare.gte, 1, 1, true},
{Compare.gte, "1", "1", true},
{Compare.gte, 100, 99, true},
{Compare.gte, 100, 101, false},
{Compare.gte, "z", "a", true},
{Compare.gte, "a", "z", false},
- {Compare.lte, null, null, false},
+ {Compare.lte, null, null, true},
{Compare.lte, null, 1, false},
{Compare.lte, 1, null, false},
- {Compare.lte, 1, 1, true},
{Compare.lte, "1", "1", true},
{Compare.lte, 100, 99, false},
{Compare.lte, 100, 101, true},
{Compare.lte, "z", "a", false},
{Compare.lte, "a", "z", true}
- });
+ }));
+ for (int i = 0; i < one.size(); i++) {
+ for (int j = 0; j < one.size(); j++) {
+ testCases.add(new Object[]{Compare.eq, one.get(i), one.get(j), true});
+ testCases.add(new Object[]{Compare.neq, one.get(i), one.get(j), false});
+ testCases.add(new Object[]{Compare.gt, one.get(i), one.get(j), false});
+ testCases.add(new Object[]{Compare.lt, one.get(i), one.get(j), false});
+ testCases.add(new Object[]{Compare.gte, one.get(i), one.get(j), true});
+ testCases.add(new Object[]{Compare.lte, one.get(i), one.get(j), true});
+ }
+ }
+ return testCases;
}
@Parameterized.Parameter(value = 0)
[47/50] [abbrv] incubator-tinkerpop git commit: Drop BatchGraph docs.
Posted by sp...@apache.org.
Drop BatchGraph docs.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/edd8e709
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/edd8e709
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/edd8e709
Branch: refs/heads/variables
Commit: edd8e709648bf83e430e961110b289df24d10fa4
Parents: 4150a16
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Fri May 1 09:14:42 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Fri May 1 09:14:42 2015 -0400
----------------------------------------------------------------------
docs/src/the-graph.asciidoc | 96 ----------------------------------------
1 file changed, 96 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/edd8e709/docs/src/the-graph.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/the-graph.asciidoc b/docs/src/the-graph.asciidoc
index 128e24a..2482f04 100644
--- a/docs/src/the-graph.asciidoc
+++ b/docs/src/the-graph.asciidoc
@@ -239,102 +239,6 @@ gremlin> graph.tx().submit {it.addVertex("name","daniel")}.exponentialBackoff(10
As shown above, the `submit` method takes a `Function<Graph, R>` which is the unit of work to execute and possibly retry on failure. The method returns a `Transaction.Workload` object which has a number of default methods for common retry strategies. It is also possible to supply a custom retry function if a default one does not suit the required purpose.
-BatchGraph
-----------
-
-image:batch-graph.png[width=280,float=left] `BatchGraph` wraps any `Graph` to enable batch loading of a large number of edges and vertices by chunking the entire load into smaller batches and maintaining a memory-efficient vertex cache so that intermediate transactional states can be flushed after each chunk is loaded to release memory.
-
-`BatchGraph` is *only* meant for loading data and does not support any retrieval or removal operations. That is, `BatchGraph` only supports the following methods:
-
-* `Graph.addVertex()` for adding vertices
-* `Vertex.addEdge()` for adding edges
-* `Graph.V()` to get vertices by their id
-* Property getter, setter and removal methods for vertices and edges as well as `Element.id()`
-
-An important limitation of `BatchGraph` is that edge properties can only be set immediately after the edge has been added. If other vertices or edges have been created in the meantime, setting, getting or removing properties will throw exceptions. This is done to avoid caching of edges which would require memory.
-
-`BatchGraph` can also automatically set the provided element identifiers as properties on the respective element. Use `vertexIdKey()` and `edgeIdKey()` on the `BatchGraph.Builder` to set the keys for the vertex and edge properties, respectively. This is useful when the graph implementation ignores supplied identifiers (as is the case with most implementations).
-
-As an example, consider loading a large number of edges defined by a `String` array with four entries called _quads_:
-
-. The out vertex id
-. The in vertex id
-. The label of the edge
-. A string annotation for the edge, i.e. an edge property
-
-Assuming this array is very large, loading all these edges in a single transaction is likely to exhaust main memory. Furthermore, one would have to rely on the database indexes to retrieve previously created vertices for a given identifier. `BatchGraph` addresses both of these issues.
-
-[source,java]
-----
-BatchGraph bgraph = BatchGraph.build(graph).vertexIdType(VertexIdType.STRING).bufferSize(1000).create();
-for (String[] quad : quads) {
- Vertex[] vertices = new Vertex[2];
- for (int i=0;i<2;i++) {
- vertices[i] = bgraph.V(quad[i]);
- if (null == vertices[i]) vertices[i]=bgraph.addVertex(T.id, quad[i]);
- }
- Edge edge = vertices[0].addEdge(quad[2],vertices[1], "annotation",quad[3]);
-}
-----
-
-First, a `BatchGraph` `bgraph` is created wrapping an existing `graph` and setting the identifier type to `VertexIDType.STRING` and the batch size to 1000. `BatchGraph` maintains a mapping from the external vertex identifiers (in the example the first two entries in the `String` array describing the edge) to the internal vertex identifiers assigned by the wrapped graph database. Since this mapping is maintained in memory, it is potentially much faster than the database index. By specifying the `VertexIDType`, `BatchGraph` chooses the most memory-efficient mapping data structure and applies compression algorithms if possible. There are four different `VertexIDType`:
-
-* `OBJECT` : For arbitrary object vertex identifiers. This is the most generic and least space efficient type.
-* `STRING` : For string vertex identifiers. Attempts to apply string compression and prefixing strategies to reduce the memory footprint.
-* `URL` : For string vertex identifiers that parse as URLs. Applies URL specific compression schemes that are more efficient than generic string compression.
-* `NUMBER` : For numeric vertex identifiers. Uses primitive data structures that requires significantly less memory.
-
-The `bufferSize` represents the number of vertices and edges to load before committing a transaction and starting a new one.
-
-The `for` loop then iterates over all the quad `String` arrays and creates an edge for each by first retrieving or creating the vertex end points and then creating the edge. Note, that the edge property is set immediately after creating the edge. This property assignment is required because edges are only kept in memory until the next edge is created for efficiency reasons.
-
-Presorting Data
-~~~~~~~~~~~~~~~
-
-In the previous example, there is a big speed advantage if the next edge loaded has the same out vertex as the previous edge. Loading all of the out going edges for a particular vertex at once before moving on to the next out vertex makes optimal use of the cache, whereas loading edges in a random order causes many more writes to and flushes of the cache.
-
-To take advantage of this, the data can be presorted quickly and efficiently using the linux built-in link:http://en.wikipedia.org/wiki/Sort_(Unix)[sort] command. Assume that edges are read from a text file `edges.txt` with one edge per line:
-
-[source,text]
-----
-4 created 5 weight=1.0
-1 knows 4 weight=1.0
-1 knows 2 weight=0.5
-4 created 3 weight=0.4
-6 created 3 weight=0.2
-1 created 3 weight=0.4
-----
-
-This file can be sorted before loading with
-
-[source,text]
-$ sort -S4G -o edges_sorted.txt edges.txt
-
-The `-S4G` flag gives sort 4Gb of memory to work with. If the file fits into memory the sort will be very fast; otherwise `sort` will use scratch space on disk to perform the operation. Although this is not as fast, the linux `sort` command is highly optimized and is not limited in the size of files it can process. If the input data contain unwanted duplicate lines, using the `-u` flag will cause `sort` to remove these duplicate lines during processing.
-
-The sorted file `edges_sorted.txt` now has the edges ordered by out vertex:
-
-[source,text]
-----
-1 created 3 weight=0.4
-1 knows 2 weight=0.5
-1 knows 4 weight=1.0
-4 created 3 weight=0.4
-4 created 5 weight=1.0
-6 created 3 weight=0.2
-----
-
-This way, any given out vertex is kept in the cache for all of its out going edges. The time needed to sort the data is nearly always much less than the loading time saved by maximizing use of the cache, especially for large input data.
-
-Incremental Loading
-~~~~~~~~~~~~~~~~~~~
-
-The above describes how `BatchGraph` can be used to load data into a graph under the assumption that the wrapped graph is initially empty. `BatchGraph` can also be used to incrementally batch load edges and vertices into a graph with existing data. In this case, vertices may already exist for given identifiers.
-
-If the wrapped graph does not ignore identifiers, then enabling incremental batch loading is as simple as calling `incrementalLoading(false)` on the `Builder`, i.e. to disable the assumption that data is loaded into an empty graph. If the wrapped graph does ignore identifiers, then one has to tell `BatchGraph` how to find existing vertices for a given identifier by specifying the vertex identifier key using `vertexIdKey(key)` where `key` is some `String` for the property key. The `key` selected should be indexed by the underlying store for lookups to be efficient.
-
-NOTE: Incremental batch loading is more expensive than loading from scratch because `BatchGraph` has to call on the wrapped graph to determine whether a vertex exists for a given identifier.
-
Gremlin I/O
-----------
[33/50] [abbrv] incubator-tinkerpop git commit: Update javadoc in IO
packages.
Posted by sp...@apache.org.
Update javadoc in IO packages.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/e2e76c70
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/e2e76c70
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/e2e76c70
Branch: refs/heads/variables
Commit: e2e76c707e431b92b5f59b6ca2b7a79851445a93
Parents: 290a5e3
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Apr 30 13:53:13 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Apr 30 13:53:13 2015 -0400
----------------------------------------------------------------------
.../gremlin/structure/io/graphml/GraphMLIo.java | 20 +++++++
.../structure/io/graphml/GraphMLMapper.java | 4 ++
.../structure/io/graphml/GraphMLReader.java | 35 +++++++++++
.../structure/io/graphml/GraphMLWriter.java | 40 +++++++++++++
.../structure/io/graphson/GraphSONIo.java | 17 +++++-
.../structure/io/graphson/GraphSONReader.java | 63 +++++++++++++++++---
.../structure/io/graphson/GraphSONWriter.java | 35 ++++++-----
.../io/graphson/LegacyGraphSONReader.java | 35 +++++++++++
.../gremlin/structure/io/gryo/GryoReader.java | 5 +-
9 files changed, 224 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/e2e76c70/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphml/GraphMLIo.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphml/GraphMLIo.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphml/GraphMLIo.java
index 3e7c631..e334b67 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphml/GraphMLIo.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphml/GraphMLIo.java
@@ -21,6 +21,7 @@ package org.apache.tinkerpop.gremlin.structure.io.graphml;
import org.apache.tinkerpop.gremlin.structure.Graph;
import org.apache.tinkerpop.gremlin.structure.io.Io;
import org.apache.tinkerpop.gremlin.structure.io.IoRegistry;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper;
import java.io.FileInputStream;
import java.io.FileOutputStream;
@@ -29,6 +30,10 @@ import java.io.InputStream;
import java.io.OutputStream;
/**
+ * Constructs GraphML IO implementations given a {@link Graph} and {@link IoRegistry}. Implementers of the {@link Graph}
+ * interfaces do not have to register any special serializers to the {@link IoRegistry} as GraphML does not support
+ * such things.
+ *
* @author Stephen Mallette (http://stephen.genoprime.com)
*/
public class GraphMLIo implements Io<GraphMLReader.Builder, GraphMLWriter.Builder, GraphMLMapper.Builder> {
@@ -38,21 +43,33 @@ public class GraphMLIo implements Io<GraphMLReader.Builder, GraphMLWriter.Builde
this.graph = graph;
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public GraphMLReader.Builder reader() {
return GraphMLReader.build();
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public GraphMLWriter.Builder writer() {
return GraphMLWriter.build();
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public GraphMLMapper.Builder mapper() {
return GraphMLMapper.build();
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public void writeGraph(final String file) throws IOException {
try (final OutputStream out = new FileOutputStream(file)) {
@@ -60,6 +77,9 @@ public class GraphMLIo implements Io<GraphMLReader.Builder, GraphMLWriter.Builde
}
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public void readGraph(final String file) throws IOException {
try (final InputStream in = new FileInputStream(file)) {
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/e2e76c70/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphml/GraphMLMapper.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphml/GraphMLMapper.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphml/GraphMLMapper.java
index 1443c19..6d37c2e 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphml/GraphMLMapper.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphml/GraphMLMapper.java
@@ -18,10 +18,14 @@
*/
package org.apache.tinkerpop.gremlin.structure.io.graphml;
+import org.apache.tinkerpop.gremlin.structure.io.Io;
import org.apache.tinkerpop.gremlin.structure.io.IoRegistry;
import org.apache.tinkerpop.gremlin.structure.io.Mapper;
/**
+ * This is an "empty" implementation only present for compatibility with {@link Io}. GraphML is a "whole graph"
+ * serialization format and does not have the notion of generic serialization functions.
+ *
* @author Stephen Mallette (http://stephen.genoprime.com)
*/
public class GraphMLMapper implements Mapper<Object> {
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/e2e76c70/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphml/GraphMLReader.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphml/GraphMLReader.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphml/GraphMLReader.java
index 47a26a8..bcb462d 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphml/GraphMLReader.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphml/GraphMLReader.java
@@ -201,6 +201,11 @@ public class GraphMLReader implements GraphReader {
}
}
+ /**
+ * This method is not supported for this reader.
+ *
+ * @throws UnsupportedOperationException when called.
+ */
@Override
public Iterator<Vertex> readVertices(final InputStream inputStream,
final Function<Attachable<Vertex>, Vertex> vertexAttachMethod,
@@ -209,11 +214,21 @@ public class GraphMLReader implements GraphReader {
throw Io.Exceptions.readerFormatIsForFullGraphSerializationOnly(this.getClass());
}
+ /**
+ * This method is not supported for this reader.
+ *
+ * @throws UnsupportedOperationException when called.
+ */
@Override
public Vertex readVertex(final InputStream inputStream, final Function<Attachable<Vertex>, Vertex> vertexAttachMethod) throws IOException {
throw Io.Exceptions.readerFormatIsForFullGraphSerializationOnly(this.getClass());
}
+ /**
+ * This method is not supported for this reader.
+ *
+ * @throws UnsupportedOperationException when called.
+ */
@Override
public Vertex readVertex(final InputStream inputStream, final Function<Attachable<Vertex>, Vertex> vertexAttachMethod,
final Function<Attachable<Edge>, Edge> edgeAttachMethod,
@@ -221,23 +236,43 @@ public class GraphMLReader implements GraphReader {
throw Io.Exceptions.readerFormatIsForFullGraphSerializationOnly(this.getClass());
}
+ /**
+ * This method is not supported for this reader.
+ *
+ * @throws UnsupportedOperationException when called.
+ */
@Override
public Edge readEdge(final InputStream inputStream, final Function<Attachable<Edge>, Edge> edgeAttachMethod) throws IOException {
throw Io.Exceptions.readerFormatIsForFullGraphSerializationOnly(this.getClass());
}
+ /**
+ * This method is not supported for this reader.
+ *
+ * @throws UnsupportedOperationException when called.
+ */
@Override
public VertexProperty readVertexProperty(final InputStream inputStream,
final Function<Attachable<VertexProperty>, VertexProperty> vertexPropertyAttachMethod) throws IOException {
throw Io.Exceptions.readerFormatIsForFullGraphSerializationOnly(this.getClass());
}
+ /**
+ * This method is not supported for this reader.
+ *
+ * @throws UnsupportedOperationException when called.
+ */
@Override
public Property readProperty(final InputStream inputStream,
final Function<Attachable<Property>, Property> propertyAttachMethod) throws IOException {
throw Io.Exceptions.readerFormatIsForFullGraphSerializationOnly(this.getClass());
}
+ /**
+ * This method is not supported for this reader.
+ *
+ * @throws UnsupportedOperationException when called.
+ */
@Override
public <C> C readObject(final InputStream inputStream, final Class<? extends C> clazz) throws IOException {
throw Io.Exceptions.readerFormatIsForFullGraphSerializationOnly(this.getClass());
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/e2e76c70/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphml/GraphMLWriter.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphml/GraphMLWriter.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphml/GraphMLWriter.java
index b000d1e..5ff950b 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphml/GraphMLWriter.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphml/GraphMLWriter.java
@@ -77,41 +77,81 @@ public class GraphMLWriter implements GraphWriter {
this.vertexLabelKey = vertexLabelKey;
}
+ /**
+ * This method is not supported for this writer.
+ *
+ * @throws UnsupportedOperationException when called.
+ */
@Override
public void writeVertex(final OutputStream outputStream, final Vertex v, Direction direction) throws IOException {
throw Io.Exceptions.writerFormatIsForFullGraphSerializationOnly(this.getClass());
}
+ /**
+ * This method is not supported for this writer.
+ *
+ * @throws UnsupportedOperationException when called.
+ */
@Override
public void writeVertex(final OutputStream outputStream, final Vertex v) throws IOException {
throw Io.Exceptions.writerFormatIsForFullGraphSerializationOnly(this.getClass());
}
+ /**
+ * This method is not supported for this writer.
+ *
+ * @throws UnsupportedOperationException when called.
+ */
@Override
public void writeEdge(final OutputStream outputStream, final Edge e) throws IOException {
throw Io.Exceptions.writerFormatIsForFullGraphSerializationOnly(this.getClass());
}
+ /**
+ * This method is not supported for this writer.
+ *
+ * @throws UnsupportedOperationException when called.
+ */
@Override
public void writeVertices(final OutputStream outputStream, final Iterator<Vertex> vertexIterator, final Direction direction) throws IOException {
throw Io.Exceptions.writerFormatIsForFullGraphSerializationOnly(this.getClass());
}
+ /**
+ * This method is not supported for this writer.
+ *
+ * @throws UnsupportedOperationException when called.
+ */
@Override
public void writeVertices(final OutputStream outputStream, final Iterator<Vertex> vertexIterator) throws IOException {
throw Io.Exceptions.writerFormatIsForFullGraphSerializationOnly(this.getClass());
}
+ /**
+ * This method is not supported for this writer.
+ *
+ * @throws UnsupportedOperationException when called.
+ */
@Override
public void writeVertexProperty(final OutputStream outputStream, final VertexProperty vp) throws IOException {
throw Io.Exceptions.writerFormatIsForFullGraphSerializationOnly(this.getClass());
}
+ /**
+ * This method is not supported for this writer.
+ *
+ * @throws UnsupportedOperationException when called.
+ */
@Override
public void writeProperty(final OutputStream outputStream, final Property p) throws IOException {
throw Io.Exceptions.writerFormatIsForFullGraphSerializationOnly(this.getClass());
}
+ /**
+ * This method is not supported for this writer.
+ *
+ * @throws UnsupportedOperationException when called.
+ */
@Override
public void writeObject(final OutputStream outputStream, final Object object) throws IOException {
throw Io.Exceptions.writerFormatIsForFullGraphSerializationOnly(this.getClass());
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/e2e76c70/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONIo.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONIo.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONIo.java
index 3aabaf2..57cfc62 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONIo.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONIo.java
@@ -29,7 +29,7 @@ import java.io.InputStream;
import java.io.OutputStream;
/**
- * Constructs Gryo IO implementations given a {@link Graph} and {@link IoRegistry}. Implementers of the {@link Graph}
+ * Constructs GraphSON IO implementations given a {@link Graph} and {@link IoRegistry}. Implementers of the {@link Graph}
* interfaces should see the {@link GraphSONMapper} for information on the expectations for the {@link IoRegistry}.
*
* @author Stephen Mallette (http://stephen.genoprime.com)
@@ -43,21 +43,33 @@ public class GraphSONIo implements Io<GraphSONReader.Builder, GraphSONWriter.Bui
this.graph = graph;
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public GraphSONReader.Builder reader() {
return GraphSONReader.build().mapper(mapper().create());
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public GraphSONWriter.Builder writer() {
return GraphSONWriter.build().mapper(mapper().create());
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public GraphSONMapper.Builder mapper() {
return GraphSONMapper.build().addRegistry(this.registry);
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public void writeGraph(final String file) throws IOException {
try (final OutputStream out = new FileOutputStream(file)) {
@@ -65,6 +77,9 @@ public class GraphSONIo implements Io<GraphSONReader.Builder, GraphSONWriter.Bui
}
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public void readGraph(final String file) throws IOException {
try (final InputStream in = new FileInputStream(file)) {
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/e2e76c70/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONReader.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONReader.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONReader.java
index fd5b12b..79365af 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONReader.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONReader.java
@@ -27,7 +27,10 @@ import org.apache.tinkerpop.gremlin.structure.Property;
import org.apache.tinkerpop.gremlin.structure.Vertex;
import org.apache.tinkerpop.gremlin.structure.VertexProperty;
import org.apache.tinkerpop.gremlin.structure.io.GraphReader;
+import org.apache.tinkerpop.gremlin.structure.io.GraphWriter;
+import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoWriter;
import org.apache.tinkerpop.gremlin.structure.util.Attachable;
+import org.apache.tinkerpop.gremlin.structure.util.Host;
import org.apache.tinkerpop.gremlin.structure.util.batch.BatchGraph;
import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedEdge;
import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedProperty;
@@ -42,6 +45,7 @@ import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
+import java.io.OutputStream;
import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
@@ -72,7 +76,12 @@ public class GraphSONReader implements GraphReader {
}
/**
- * {@inheritDoc}
+ * Read data into a {@link Graph} from output generated by any of the {@link GraphSONWriter} {@code writeVertex} or
+ * {@code writeVertices} methods or by {@link GryoWriter#writeGraph(OutputStream, Graph)}.
+ *
+ * @param inputStream a stream containing an entire graph of vertices and edges as defined by the accompanying
+ * {@link GraphSONWriter#writeGraph(OutputStream, Graph)}.
+ * @param graphToWriteTo the graph to write to when reading from the stream.
*/
@Override
public void readGraph(final InputStream inputStream, final Graph graphToWriteTo) throws IOException {
@@ -98,7 +107,15 @@ public class GraphSONReader implements GraphReader {
}
/**
- * {@inheritDoc}
+ * Read {@link Vertex} objects from output generated by any of the {@link GraphSONWriter} {@code writeVertex} or
+ * {@code writeVertices} methods or by {@link GraphSONWriter#writeGraph(OutputStream, Graph)}.
+ *
+ * @param inputStream a stream containing at least one {@link Vertex} as defined by the accompanying
+ * {@link GraphWriter#writeVertices(OutputStream, Iterator, Direction)} or
+ * {@link GraphWriter#writeVertices(OutputStream, Iterator)} methods.
+ * @param vertexAttachMethod a function that creates re-attaches a {@link Vertex} to a {@link Host} object.
+ * @param edgeAttachMethod a function that creates re-attaches a {@link Edge} to a {@link Host} object.
+ * @param attachEdgesOfThisDirection only edges of this direction are passed to the {@code edgeMaker}.
*/
@Override
public Iterator<Vertex> readVertices(final InputStream inputStream,
@@ -110,7 +127,12 @@ public class GraphSONReader implements GraphReader {
}
/**
- * {@inheritDoc}
+ * Read a {@link Vertex} from output generated by any of the {@link GraphSONWriter} {@code writeVertex} or
+ * {@code writeVertices} methods or by {@link GraphSONWriter#writeGraph(OutputStream, Graph)}.
+ *
+ * @param inputStream a stream containing at least a single vertex as defined by the accompanying
+ * {@link GraphWriter#writeVertex(OutputStream, Vertex)}.
+ * @param vertexAttachMethod a function that creates re-attaches a {@link Vertex} to a {@link Host} object.
*/
@Override
public Vertex readVertex(final InputStream inputStream, final Function<Attachable<Vertex>, Vertex> vertexAttachMethod) throws IOException {
@@ -118,7 +140,14 @@ public class GraphSONReader implements GraphReader {
}
/**
- * {@inheritDoc}
+ * Read a {@link Vertex} from output generated by any of the {@link GraphSONWriter} {@code writeVertex} or
+ * {@code writeVertices} methods or by {@link GraphSONWriter#writeGraph(OutputStream, Graph)}.
+ *
+ * @param inputStream a stream containing at least one {@link Vertex} as defined by the accompanying
+ * {@link GraphWriter#writeVertices(OutputStream, Iterator, Direction)} method.
+ * @param vertexAttachMethod a function that creates re-attaches a {@link Vertex} to a {@link Host} object.
+ * @param edgeAttachMethod a function that creates re-attaches a {@link Edge} to a {@link Host} object.
+ * @param attachEdgesOfThisDirection only edges of this direction are passed to the {@code edgeMaker}.
*/
@Override
public Vertex readVertex(final InputStream inputStream,
@@ -139,7 +168,12 @@ public class GraphSONReader implements GraphReader {
}
/**
- * {@inheritDoc}
+ * Read an {@link Edge} from output generated by {@link GraphSONWriter#writeEdge(OutputStream, Edge)} or via
+ * an {@link Edge} passed to {@link GraphSONWriter#writeObject(OutputStream, Object)}.
+ *
+ * @param inputStream a stream containing at least one {@link Edge} as defined by the accompanying
+ * {@link GraphWriter#writeEdge(OutputStream, Edge)} method.
+ * @param edgeAttachMethod a function that creates re-attaches a {@link Edge} to a {@link Host} object.
*/
@Override
public Edge readEdge(final InputStream inputStream, final Function<Attachable<Edge>, Edge> edgeAttachMethod) throws IOException {
@@ -157,7 +191,14 @@ public class GraphSONReader implements GraphReader {
}
/**
- * {@inheritDoc}
+ * Read a {@link VertexProperty} from output generated by
+ * {@link GraphSONWriter#writeVertexProperty(OutputStream, VertexProperty)} or via an {@link VertexProperty} passed
+ * to {@link GraphSONWriter#writeObject(OutputStream, Object)}.
+ *
+ * @param inputStream a stream containing at least one {@link VertexProperty} as written by the accompanying
+ * {@link GraphWriter#writeVertexProperty(OutputStream, VertexProperty)} method.
+ * @param vertexPropertyAttachMethod a function that creates re-attaches a {@link VertexProperty} to a
+ * {@link Host} object.
*/
@Override
public VertexProperty readVertexProperty(final InputStream inputStream,
@@ -171,7 +212,12 @@ public class GraphSONReader implements GraphReader {
}
/**
- * {@inheritDoc}
+ * Read a {@link Property} from output generated by {@link GraphSONWriter#writeProperty(OutputStream, Property)} or
+ * via an {@link Property} passed to {@link GraphSONWriter#writeObject(OutputStream, Object)}.
+ *
+ * @param inputStream a stream containing at least one {@link Property} as written by the accompanying
+ * {@link GraphWriter#writeProperty(OutputStream, Property)} method.
+ * @param propertyAttachMethod a function that creates re-attaches a {@link Property} to a {@link Host} object.
*/
@Override
public Property readProperty(final InputStream inputStream,
@@ -202,7 +248,8 @@ public class GraphSONReader implements GraphReader {
}
/**
- * Number of mutations to perform before a commit is executed.
+ * Number of mutations to perform before a commit is executed when using
+ * {@link GraphSONReader#readGraph(InputStream, Graph)}.
*/
public Builder batchSize(final long batchSize) {
this.batchSize = batchSize;
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/e2e76c70/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONWriter.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONWriter.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONWriter.java
index d1c2430..bbbfb3b 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONWriter.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONWriter.java
@@ -53,8 +53,8 @@ public class GraphSONWriter implements GraphWriter {
* Writes a {@link Graph} to stream in an adjacency list format where vertices are written with edges from both
* directions. Under this serialization model, edges are grouped by label.
*
- * @param outputStream The stream to write to.
- * @param g The graph to write to stream.
+ * @param outputStream the stream to write to.
+ * @param g the graph to write to stream.
*/
@Override
public void writeGraph(final OutputStream outputStream, final Graph g) throws IOException {
@@ -75,8 +75,8 @@ public class GraphSONWriter implements GraphWriter {
/**
* Writes a single {@link Vertex} with no edges serialized.
*
- * @param outputStream The stream to write to.
- * @param v The vertex to write.
+ * @param outputStream the stream to write to.
+ * @param v the vertex to write.
*/
@Override
public void writeVertex(final OutputStream outputStream, final Vertex v) throws IOException {
@@ -87,9 +87,9 @@ public class GraphSONWriter implements GraphWriter {
* Writes a list of vertices in adjacency list format where vertices are written with edges from both
* directions. Under this serialization model, edges are grouped by label.
*
- * @param outputStream The stream to write to.
- * @param vertexIterator A traversal that returns a list of vertices.
- * @param direction If direction is null then no edges are written.
+ * @param outputStream the stream to write to.
+ * @param vertexIterator a traversal that returns a list of vertices.
+ * @param direction if direction is null then no edges are written.
*/
@Override
public void writeVertices(final OutputStream outputStream, final Iterator<Vertex> vertexIterator, final Direction direction) throws IOException {
@@ -109,8 +109,8 @@ public class GraphSONWriter implements GraphWriter {
/**
* Writes a list of vertices without edges.
*
- * @param outputStream The stream to write to.
- * @param vertexIterator A iterator that returns a list of vertices.
+ * @param outputStream the stream to write to.
+ * @param vertexIterator a iterator that returns a list of vertices.
*/
@Override
public void writeVertices(final OutputStream outputStream, final Iterator<Vertex> vertexIterator) throws IOException {
@@ -124,8 +124,8 @@ public class GraphSONWriter implements GraphWriter {
* {@link #writeVertices(OutputStream, Iterator, Direction)} in that the edge label is part of the object and
* vertex labels are included with their identifiers.
*
- * @param outputStream The stream to write to.
- * @param e The edge to write.
+ * @param outputStream the stream to write to.
+ * @param e the edge to write.
*/
@Override
public void writeEdge(final OutputStream outputStream, final Edge e) throws IOException {
@@ -135,8 +135,8 @@ public class GraphSONWriter implements GraphWriter {
/**
* Write a {@link VertexProperty} object to the stream.
*
- * @param outputStream The stream to write to.
- * @param vp The vertex property to write.
+ * @param outputStream the stream to write to.
+ * @param vp the vertex property to write.
*/
@Override
public void writeVertexProperty(final OutputStream outputStream, final VertexProperty vp) throws IOException {
@@ -146,8 +146,8 @@ public class GraphSONWriter implements GraphWriter {
/**
* Write a {@link Property} object to the stream.
*
- * @param outputStream The stream to write to.
- * @param p The property to write.
+ * @param outputStream the stream to write to.
+ * @param p the property to write.
*/
@Override
public void writeProperty(final OutputStream outputStream, final Property p) throws IOException {
@@ -159,9 +159,8 @@ public class GraphSONWriter implements GraphWriter {
* thus the format of the GraphSON for a {@link Vertex} will be somewhat different from the format supplied
* when using {@link #writeVertex(OutputStream, Vertex, Direction)}. For example, edges will never be included.
*
- * @param outputStream The stream to write to
- * @param object The object to write which will use the standard serializer set
- * @throws IOException
+ * @param outputStream the stream to write to
+ * @param object the object to write which will use the standard serializer set
*/
@Override
public void writeObject(final OutputStream outputStream, final Object object) throws IOException {
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/e2e76c70/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/LegacyGraphSONReader.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/LegacyGraphSONReader.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/LegacyGraphSONReader.java
index 3b37bed..11fd97b 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/LegacyGraphSONReader.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/LegacyGraphSONReader.java
@@ -121,6 +121,11 @@ public class LegacyGraphSONReader implements GraphReader {
}
+ /**
+ * This method is not supported for this reader.
+ *
+ * @throws UnsupportedOperationException when called.
+ */
@Override
public Iterator<Vertex> readVertices(final InputStream inputStream,
final Function<Attachable<Vertex>, Vertex> vertexAttachMethod,
@@ -129,16 +134,31 @@ public class LegacyGraphSONReader implements GraphReader {
throw Io.Exceptions.readerFormatIsForFullGraphSerializationOnly(this.getClass());
}
+ /**
+ * This method is not supported for this reader.
+ *
+ * @throws UnsupportedOperationException when called.
+ */
@Override
public Edge readEdge(final InputStream inputStream, final Function<Attachable<Edge>, Edge> edgeAttachMethod) throws IOException {
throw Io.Exceptions.readerFormatIsForFullGraphSerializationOnly(this.getClass());
}
+ /**
+ * This method is not supported for this reader.
+ *
+ * @throws UnsupportedOperationException when called.
+ */
@Override
public Vertex readVertex(final InputStream inputStream, final Function<Attachable<Vertex>, Vertex> vertexAttachMethod) throws IOException {
throw Io.Exceptions.readerFormatIsForFullGraphSerializationOnly(this.getClass());
}
+ /**
+ * This method is not supported for this reader.
+ *
+ * @throws UnsupportedOperationException when called.
+ */
@Override
public Vertex readVertex(final InputStream inputStream, final Function<Attachable<Vertex>, Vertex> vertexAttachMethod,
final Function<Attachable<Edge>, Edge> edgeAttachMethod,
@@ -146,18 +166,33 @@ public class LegacyGraphSONReader implements GraphReader {
throw Io.Exceptions.readerFormatIsForFullGraphSerializationOnly(this.getClass());
}
+ /**
+ * This method is not supported for this reader.
+ *
+ * @throws UnsupportedOperationException when called.
+ */
@Override
public VertexProperty readVertexProperty(final InputStream inputStream,
final Function<Attachable<VertexProperty>, VertexProperty> vertexPropertyAttachMethod) throws IOException {
throw Io.Exceptions.readerFormatIsForFullGraphSerializationOnly(this.getClass());
}
+ /**
+ * This method is not supported for this reader.
+ *
+ * @throws UnsupportedOperationException when called.
+ */
@Override
public Property readProperty(final InputStream inputStream,
final Function<Attachable<Property>, Property> propertyAttachMethod) throws IOException {
throw Io.Exceptions.readerFormatIsForFullGraphSerializationOnly(this.getClass());
}
+ /**
+ * This method is not supported for this reader.
+ *
+ * @throws UnsupportedOperationException when called.
+ */
@Override
public <C> C readObject(final InputStream inputStream, final Class<? extends C> clazz) throws IOException {
throw Io.Exceptions.readerFormatIsForFullGraphSerializationOnly(this.getClass());
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/e2e76c70/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoReader.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoReader.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoReader.java
index c87a73b..70eae85 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoReader.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoReader.java
@@ -28,7 +28,6 @@ import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertexProper
import org.apache.tinkerpop.gremlin.structure.util.star.StarGraph;
import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
import org.apache.tinkerpop.shaded.kryo.Kryo;
-import org.apache.tinkerpop.gremlin.structure.T;
import org.apache.tinkerpop.gremlin.structure.Direction;
import org.apache.tinkerpop.gremlin.structure.Edge;
import org.apache.tinkerpop.gremlin.structure.Graph;
@@ -249,8 +248,8 @@ public class GryoReader implements GraphReader {
}
/**
- * Set the size between commits when reading into the {@link Graph} instance. This value defaults to
- * {@link BatchGraph#DEFAULT_BUFFER_SIZE}.
+ * Number of mutations to perform before a commit is executed when using
+ * {@link GryoReader#readGraph(InputStream, Graph)}.
*/
public Builder batchSize(final long batchSize) {
this.batchSize = batchSize;
[13/50] [abbrv] incubator-tinkerpop git commit: Fixed bug in gremlin
server load script - calling bad method.
Posted by sp...@apache.org.
Fixed bug in gremlin server load script - calling bad method.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/8646e9ee
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/8646e9ee
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/8646e9ee
Branch: refs/heads/variables
Commit: 8646e9eece4c2a99631218a3ad5f5a2c50315fa3
Parents: 84f736f
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Apr 29 12:25:52 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Apr 29 12:25:52 2015 -0400
----------------------------------------------------------------------
gremlin-server/scripts/load-sample.groovy | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/8646e9ee/gremlin-server/scripts/load-sample.groovy
----------------------------------------------------------------------
diff --git a/gremlin-server/scripts/load-sample.groovy b/gremlin-server/scripts/load-sample.groovy
index 59b8c53..84c30fe 100644
--- a/gremlin-server/scripts/load-sample.groovy
+++ b/gremlin-server/scripts/load-sample.groovy
@@ -20,7 +20,7 @@
// An example of an initialization script that can be configured to run in Gremlin Server.
// Functions defined here will go into global cache and will not be removed from there
// unless there is a reset of the ScriptEngine.
-graph.io(GryoIo.build()).read('data/sample.kryo')
+graph.io(GryoIo.build()).readGraph('data/sample.kryo')
// define the default TraversalSource to bind queries to.
g = graph.traversal()
[05/50] [abbrv] incubator-tinkerpop git commit: users can not double
name a step with as().
Posted by sp...@apache.org.
users can not double name a step with as().
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/7a657fd8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/7a657fd8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/7a657fd8
Branch: refs/heads/variables
Commit: 7a657fd84557bad693f1ce6b0fe5dcde1517c96e
Parents: 970f24d
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Tue Apr 28 13:03:15 2015 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Tue Apr 28 13:03:15 2015 -0600
----------------------------------------------------------------------
.../gremlin/process/traversal/dsl/graph/GraphTraversal.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/7a657fd8/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
index 1e63986..9d80328 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
@@ -470,7 +470,7 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
}
public default GraphTraversal<S, E> has(final String key, final Object value) {
- return this.has(key,new P<?>[]{value instanceof P ? (P)value : P.eq(value)});
+ return this.has(key, new P<?>[]{value instanceof P ? (P) value : P.eq(value)});
}
public default GraphTraversal<S, E> has(final T accessor, final P<?> predicate) {
@@ -707,6 +707,8 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
public default GraphTraversal<S, E> as(final String stepLabel) {
if (this.asAdmin().getSteps().size() == 0) this.asAdmin().addStep(new StartStep<>(this.asAdmin()));
+ if (this.asAdmin().getEndStep().getLabel().isPresent())
+ throw new IllegalStateException("The previous step has already been labeled: " + this.asAdmin().getEndStep());
this.asAdmin().getEndStep().setLabel(stepLabel);
return this;
}
[26/50] [abbrv] incubator-tinkerpop git commit: Replace all
tags in javadoc with
for consistency.
Posted by sp...@apache.org.
Replace all <br/> tags in javadoc with <p/> for consistency.
<p/> seems to space in the intended way expected when the javadoc is generated (<br/> seems to drop a single line feed only).
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/2e4e2eda
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/2e4e2eda
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/2e4e2eda
Branch: refs/heads/variables
Commit: 2e4e2eda83f112d212ecc0627b2375eedd9c70be
Parents: 4203c81
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Apr 30 12:58:41 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Apr 30 12:58:41 2015 -0400
----------------------------------------------------------------------
.../gremlin/process/traversal/Traverser.java | 2 +-
.../strategy/decoration/EventStrategy.java | 2 +-
.../apache/tinkerpop/gremlin/structure/Graph.java | 18 +++++++++---------
.../tinkerpop/gremlin/structure/Transaction.java | 2 +-
.../gremlin/structure/VertexProperty.java | 2 +-
.../gremlin/structure/io/GraphReader.java | 2 +-
.../gremlin/structure/io/GraphWriter.java | 2 +-
.../gremlin/structure/io/gryo/GryoMapper.java | 2 +-
.../gremlin/structure/io/gryo/GryoReader.java | 2 +-
.../structure/util/AbstractTransaction.java | 2 +-
.../structure/util/detached/DetachedEdge.java | 2 +-
.../structure/util/detached/DetachedVertex.java | 2 +-
.../groovy/GroovyEnvironmentIntegrateSuite.java | 4 ++--
.../groovy/GroovyEnvironmentPerformanceSuite.java | 4 ++--
.../gremlin/groovy/GroovyEnvironmentSuite.java | 2 +-
.../process/GroovyProcessComputerSuite.java | 2 +-
.../process/GroovyProcessStandardSuite.java | 2 +-
.../gremlin/groovy/engine/GremlinExecutor.java | 2 +-
.../gremlin/groovy/jsr223/DependencyManager.java | 2 +-
.../groovy/jsr223/GremlinGroovyScriptEngine.java | 2 +-
.../gremlin/server/AbstractChannelizer.java | 2 +-
.../server/GremlinDriverIntegrateTest.java | 2 +-
.../apache/tinkerpop/gremlin/GraphProvider.java | 10 +++++-----
.../apache/tinkerpop/gremlin/LoadGraphWith.java | 4 ++--
.../gremlin/process/ProcessComputerSuite.java | 2 +-
.../gremlin/process/ProcessPerformanceSuite.java | 2 +-
.../gremlin/process/ProcessStandardSuite.java | 2 +-
.../structure/StructurePerformanceSuite.java | 2 +-
.../gremlin/structure/StructureStandardSuite.java | 2 +-
.../tinkergraph/structure/TinkerGraph.java | 6 +++---
30 files changed, 47 insertions(+), 47 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/2e4e2eda/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Traverser.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Traverser.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Traverser.java
index 3a265f1..3ded892 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Traverser.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Traverser.java
@@ -27,7 +27,7 @@ import java.util.function.Function;
* A {@code Traverser} represents the current state of an object flowing through a {@link Traversal}.
* A traverser maintains a reference to the current object, a traverser-local "sack", a traversal-global sideEffect,
* a bulk count, and a path history.
- * <br/>
+ * <p/>
* Different types of traverser can exist depending on the semantics of the traversal and the desire for
* space/time optimizations of the developer.
*
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/2e4e2eda/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/EventStrategy.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/EventStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/EventStrategy.java
index 1843190..64725d2 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/EventStrategy.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/EventStrategy.java
@@ -38,7 +38,7 @@ import java.util.List;
/**
* A strategy that raises events when {@link org.apache.tinkerpop.gremlin.process.traversal.step.Mutating} steps are
* encountered and successfully executed.
- * <br/>
+ * <p/>
* Note that this implementation requires a {@link Graph} on the {@link Traversal} instance. If that is not present
* an {@link java.lang.IllegalStateException} will be thrown.
*
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/2e4e2eda/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Graph.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Graph.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Graph.java
index 511dd13..62ae93f 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Graph.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Graph.java
@@ -145,7 +145,7 @@ public interface Graph extends AutoCloseable, Host {
* vertices. Note that a vertex identifier does not need to correspond to the actual id used in the graph. It
* needs to be a bit more flexible than that in that given the {@link Graph.Features} around id support, multiple
* arguments might be applicable here.
- * <br/>
+ * <p/>
* If the graph return {@code true} for {@link Features.VertexFeatures#supportsNumericIds()} then it should support
* filters as with:
* <ul>
@@ -156,20 +156,20 @@ public interface Graph extends AutoCloseable, Host {
* <li>g.vertices(1.0f)</li>
* <li>g.vertices("1")</li>
* </ul>
- * <br/>
+ * <p/>
* If the graph return {@code true} for {@link Features.VertexFeatures#supportsCustomIds()} ()} then it should support
* filters as with:
* <ul>
* <li>g.vertices(v.id())</li>
* <li>g.vertices(v.id().toString())</li>
* </ul>
- * <br/>
+ * <p/>
* If the graph return {@code true} for {@link Features.VertexFeatures#supportsAnyIds()} ()} then it should support
* filters as with:
* <ul>
* <li>g.vertices(v.id())</li>
* </ul>
- * <br/>
+ * <p/>
* If the graph return {@code true} for {@link Features.VertexFeatures#supportsStringIds()} ()} then it should support
* filters as with:
* <ul>
@@ -177,7 +177,7 @@ public interface Graph extends AutoCloseable, Host {
* <li>g.vertices(v.id().toString())</li>
* <li>g.vertices("id")</li>
* </ul>
- * <br/>
+ * <p/>
* If the graph return {@code true} for {@link Features.EdgeFeatures#supportsStringIds()} ()} then it should support
* filters as with:
* <ul>
@@ -195,7 +195,7 @@ public interface Graph extends AutoCloseable, Host {
* Note that an edge identifier does not need to correspond to the actual id used in the graph. It
* needs to be a bit more flexible than that in that given the {@link Graph.Features} around id support, multiple
* arguments might be applicable here.
- * <br/>
+ * <p/>
* If the graph return {@code true} for {@link Features.EdgeFeatures#supportsNumericIds()} then it should support
* filters as with:
* <ul>
@@ -206,20 +206,20 @@ public interface Graph extends AutoCloseable, Host {
* <li>g.edges(1.0f)</li>
* <li>g.edges("1")</li>
* </ul>
- * <br/>
+ * <p/>
* If the graph return {@code true} for {@link Features.EdgeFeatures#supportsCustomIds()} ()} then it should support
* filters as with:
* <ul>\
* <li>g.edges(e.id())</li>
* <li>g.edges(e.id().toString())</li>
* </ul>
- * <br/>
+ * <p/>
* If the graph return {@code true} for {@link Features.EdgeFeatures#supportsAnyIds()} ()} then it should support
* filters as with:
* <ul>
* <li>g.edges(e.id())</li>
* </ul>
- * <br/>
+ * <p/>
* If the graph return {@code true} for {@link Features.EdgeFeatures#supportsStringIds()} ()} then it should support
* filters as with:
* <ul>
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/2e4e2eda/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Transaction.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Transaction.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Transaction.java
index 4a26373..6a1014e 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Transaction.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Transaction.java
@@ -29,7 +29,7 @@ import java.util.function.Function;
* A set of methods that allow for control of transactional behavior of a {@link Graph} instance. Vendors may
* consider using {@link org.apache.tinkerpop.gremlin.structure.util.AbstractTransaction} as a base implementation
* that provides default features for most of these methods.
- * <br/>
+ * <p/>
* It is expected that this interface be implemented by vendors in a {@link ThreadLocal} fashion. In other words
* transactions are bound to the current thread, which means that any graph operation executed by the thread occurs
* in the context of that transaction and that there may only be one thread executing in a single transaction.
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/2e4e2eda/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/VertexProperty.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/VertexProperty.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/VertexProperty.java
index bf641da..ecbefb3 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/VertexProperty.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/VertexProperty.java
@@ -26,7 +26,7 @@ import java.util.Iterator;
* A {@code VertexProperty} is similar to a {@link Property} in that it denotes a key/value pair associated with an
* {@link Vertex}, however it is different in the sense that it also represents an entity that it is an {@link Element}
* that can have properties of its own.
- * <br/>
+ * <p/>
* A property is much like a Java8 {@link java.util.Optional} in that a property can be not present (i.e. empty).
* The key of a property is always a String and the value of a property is an arbitrary Java object.
* Each underlying graph engine will typically have constraints on what Java objects are allowed to be used as values.
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/2e4e2eda/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/GraphReader.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/GraphReader.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/GraphReader.java
index a4c7a80..b548f07 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/GraphReader.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/GraphReader.java
@@ -39,7 +39,7 @@ import java.util.function.Function;
* equivalent to another. In other words the input to {@link #readVertex(InputStream, Function)}} need not also
* be readable by {@link #readObject(InputStream, Class)}. In other words, implementations are free
* to optimize as is possible for a specific serialization method.
- * <br/>
+ * <p/>
* That said, it is however important that the complementary "write" operation in {@link GraphWriter} be capable of
* writing output compatible to its reader. In other words, the output of
* {@link GraphWriter#writeObject(OutputStream, Object)} should always be readable by
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/2e4e2eda/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/GraphWriter.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/GraphWriter.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/GraphWriter.java
index 946cdb8..5d7d7b3 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/GraphWriter.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/GraphWriter.java
@@ -39,7 +39,7 @@ import java.util.Iterator;
* {@link #writeVertex(OutputStream, Vertex, Direction)} need to match the representation of that same
* {@link Edge} when provided to {@link #writeEdge(OutputStream, Edge)}. In other words, implementations are free
* to optimize as is possible for a specific serialization method.
- * <br/>
+ * <p/>
* That said, it is however important that the complementary "read" operation in {@link GraphReader} be capable of
* reading the output of the writer. In other words, the output of {@link #writeObject(OutputStream, Object)}
* should always be readable by {@link GraphReader#readObject(InputStream, Class)} and the output of
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/2e4e2eda/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoMapper.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoMapper.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoMapper.java
index da8caff..844eea6 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoMapper.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoMapper.java
@@ -91,7 +91,7 @@ import java.util.stream.Collectors;
/**
* A {@link Mapper} implementation for Kryo. This implementation requires that all classes to be serialized by
* Kryo are registered to it.
- * <br/>
+ * <p/>
* {@link Graph} implementations providing an {@link IoRegistry} should register their custom classs and/or
* serializers in one of three ways:
* <ol>
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/2e4e2eda/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoReader.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoReader.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoReader.java
index dd3c995..c87a73b 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoReader.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoReader.java
@@ -52,7 +52,7 @@ import java.util.function.Function;
* The {@link GraphReader} for the Gremlin Structure serialization format based on Kryo. The format is meant to be
* non-lossy in terms of Gremlin Structure to Gremlin Structure migrations (assuming both structure implementations
* support the same graph features).
- * <br/>
+ * <p/>
* This implementation is not thread-safe. Have one {@code GryoReader} instance per thread.
*
* @author Stephen Mallette (http://stephen.genoprime.com)
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/2e4e2eda/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/AbstractTransaction.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/AbstractTransaction.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/AbstractTransaction.java
index ea0d62c..9fb8e2f 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/AbstractTransaction.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/AbstractTransaction.java
@@ -32,7 +32,7 @@ import java.util.function.Function;
* can use this class as a starting point for their own implementations. Implementers should note that this
* class assumes that threaded transactions are not enabled. Vendors should explicitly override
* {@link #create} to implement that functionality if required.
- * <br/>
+ * <p/>
* Note that transaction listeners are registered in a {@link ThreadLocal} fashion which matches the pattern
* expected of vendor implementations of a {@link Transaction}.
*
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/2e4e2eda/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/detached/DetachedEdge.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/detached/DetachedEdge.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/detached/DetachedEdge.java
index 02c2fd0..776d313 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/detached/DetachedEdge.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/detached/DetachedEdge.java
@@ -37,7 +37,7 @@ import java.util.Map;
* a {@link Graph} in the sense that the {@link Edge} was constructed from a {@link Graph} instance and this reference
* was removed or it can mean that the {@code DetachedEdge} could have been constructed independently of a
* {@link Graph} instance in the first place.
- * <br/>
+ * <p/>
* A {@code DetachedEdge} only has reference to the properties and in/out vertices that are associated with it at the
* time of detachment (or construction) and is not traversable or mutable. Note that the references to the in/out
* vertices are {@link DetachedVertex} instances that only have reference to the
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/2e4e2eda/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/detached/DetachedVertex.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/detached/DetachedVertex.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/detached/DetachedVertex.java
index 76e6dc2..1c5ee92 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/detached/DetachedVertex.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/detached/DetachedVertex.java
@@ -40,7 +40,7 @@ import java.util.stream.Collectors;
* a {@link Graph} in the sense that a {@link Vertex} was constructed from a {@link Graph} instance and this reference
* was removed or it can mean that the {@code DetachedVertex} could have been constructed independently of a
* {@link Graph} instance in the first place.
- * <br/>
+ * <p/>
* A {@code DetachedVertex} only has reference to the properties that are associated with it at the time of detachment
* (or construction) and is not traversable or mutable.
*
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/2e4e2eda/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/groovy/GroovyEnvironmentIntegrateSuite.java
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/groovy/GroovyEnvironmentIntegrateSuite.java b/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/groovy/GroovyEnvironmentIntegrateSuite.java
index b1c5dd3..db4d0e5 100644
--- a/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/groovy/GroovyEnvironmentIntegrateSuite.java
+++ b/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/groovy/GroovyEnvironmentIntegrateSuite.java
@@ -40,9 +40,9 @@ import java.util.stream.Stream;
* {@link Graph} implementation. This test suite covers ensures that a vendor implementation is compliant with
* the Groovy "environment" which will typically ensure that the {@link Graph} will work as expected in the Gremlin
* Console, Gremlin Server, and other Groovy environments.
- * <br/>
+ * <p/>
* Note that this suite contains "long-run" tests. At this time, this suite can be considered optional to vendors.
- * <br/>
+ * <p/>
* For more information on the usage of this suite, please see {@link StructureStandardSuite}.
*
* @author Stephen Mallette (http://stephen.genoprime.com)
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/2e4e2eda/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/groovy/GroovyEnvironmentPerformanceSuite.java
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/groovy/GroovyEnvironmentPerformanceSuite.java b/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/groovy/GroovyEnvironmentPerformanceSuite.java
index ccff0d1..1108185 100644
--- a/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/groovy/GroovyEnvironmentPerformanceSuite.java
+++ b/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/groovy/GroovyEnvironmentPerformanceSuite.java
@@ -41,10 +41,10 @@ import java.util.stream.Stream;
* {@link Graph} implementation. This test suite covers ensures that a vendor implementation is compliant with
* the Groovy "environment" which will typically ensure that the {@link Graph} will work as expected in the Gremlin
* Console, Gremlin Server, and other Groovy environments.
- * <br/>
+ * <p/>
* Note that this suite contains "long-run" tests. At this time, this suite can be considered optional to vendors
* as the functionality that it provides is generally covered elsewhere.
- * <br/>
+ * <p/>
* For more information on the usage of this suite, please see {@link StructureStandardSuite}.
*
* @author Stephen Mallette (http://stephen.genoprime.com)
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/2e4e2eda/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/groovy/GroovyEnvironmentSuite.java
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/groovy/GroovyEnvironmentSuite.java b/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/groovy/GroovyEnvironmentSuite.java
index a938c7a..8b947c7 100644
--- a/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/groovy/GroovyEnvironmentSuite.java
+++ b/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/groovy/GroovyEnvironmentSuite.java
@@ -43,7 +43,7 @@ import java.util.stream.Stream;
* {@link Graph} implementation. This test suite covers ensures that a vendor implementation is compliant with
* the Groovy "environment" which will typically ensure that the {@link Graph} will work as expected in the Gremlin
* Console, Gremlin Server, and other Groovy environments.
- * <br/>
+ * <p/>
* For more information on the usage of this suite, please see {@link StructureStandardSuite}.
*
* @author Stephen Mallette (http://stephen.genoprime.com)
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/2e4e2eda/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/process/GroovyProcessComputerSuite.java
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/process/GroovyProcessComputerSuite.java b/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/process/GroovyProcessComputerSuite.java
index ad93092..562771c 100644
--- a/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/process/GroovyProcessComputerSuite.java
+++ b/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/process/GroovyProcessComputerSuite.java
@@ -77,7 +77,7 @@ import org.junit.runners.model.RunnerBuilder;
* be implemented by vendors to validate that their implementations are compliant with the Groovy flavor of the
* Gremlin language. Implementations that use this test suite should return {@code true} for
* {@link Graph.Features.GraphFeatures#supportsComputer()}.
- * <br/>
+ * <p/>
* For more information on the usage of this suite, please see {@link StructureStandardSuite}.
*
* @author Stephen Mallette (http://stephen.genoprime.com)
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/2e4e2eda/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/process/GroovyProcessStandardSuite.java
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/process/GroovyProcessStandardSuite.java b/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/process/GroovyProcessStandardSuite.java
index e8303b2..7798682 100644
--- a/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/process/GroovyProcessStandardSuite.java
+++ b/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/process/GroovyProcessStandardSuite.java
@@ -83,7 +83,7 @@ import org.junit.runners.model.RunnerBuilder;
* The {@code GroovyProcessStandardSuite} is a JUnit test runner that executes the Gremlin Test Suite over a
* {@link Graph} implementation. This test suite covers traversal operations and should be implemented by vendors
* to validate that their implementations are compliant with the Groovy flavor of the Gremlin language.
- * <br/>
+ * <p/>
* For more information on the usage of this suite, please see {@link StructureStandardSuite}.
*
* @author Stephen Mallette (http://stephen.genoprime.com)
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/2e4e2eda/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/engine/GremlinExecutor.java
----------------------------------------------------------------------
diff --git a/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/engine/GremlinExecutor.java b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/engine/GremlinExecutor.java
index 5d87fc5..ce4cd1a 100644
--- a/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/engine/GremlinExecutor.java
+++ b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/engine/GremlinExecutor.java
@@ -63,7 +63,7 @@ import java.util.stream.Collectors;
* {@code ScriptEngine} and assumes such engines are designed to be thread-safe in the evaluation. Script evaluation
* functions return a {@link CompletableFuture} where scripts may timeout if their evaluation
* takes too long. The default timeout is 8000ms.
- * <br/>
+ * <p/>
* By default, the {@code GremlinExecutor} initializes itself to use a shared thread pool initialized with four
* threads. This default thread pool is shared for both the task of executing script evaluations and for scheduling
* timeouts. It is worth noting that a timeout simply triggers the returned {@link CompletableFuture} to abort, but
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/2e4e2eda/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/DependencyManager.java
----------------------------------------------------------------------
diff --git a/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/DependencyManager.java b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/DependencyManager.java
index 6071c5c..e182ac8 100644
--- a/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/DependencyManager.java
+++ b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/DependencyManager.java
@@ -38,7 +38,7 @@ public interface DependencyManager {
* that can support script engine plugins should check if there are any new {@link GremlinPlugin}
* implementations in the classloader. The {@link org.apache.tinkerpop.gremlin.groovy.jsr223.GremlinGroovyScriptEngine}
* implementation uses ServiceLoader to figure out if there are such classes to return.
- * <br/>
+ * <p/>
* It is up to the caller to execute the
* {@link GremlinPlugin#pluginTo(org.apache.tinkerpop.gremlin.groovy.plugin.PluginAcceptor)} method. The reason for
* this has to do with conflicts that can occur with mapper imports that are added via the
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/2e4e2eda/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngine.java
----------------------------------------------------------------------
diff --git a/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngine.java b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngine.java
index af26613..821acc8 100644
--- a/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngine.java
+++ b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngine.java
@@ -159,7 +159,7 @@ public class GremlinGroovyScriptEngine extends GroovyScriptEngineImpl implements
/**
* {@inheritDoc}
- * <br/>
+ * <p/>
* This method should be called after "expected" imports have been added to the {@code DependencyManager}
* because adding imports with {@link #addImports(java.util.Set)} will reset the classloader and flush away
* dependencies.
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/2e4e2eda/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/AbstractChannelizer.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/AbstractChannelizer.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/AbstractChannelizer.java
index c535c8d..baa4551 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/AbstractChannelizer.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/AbstractChannelizer.java
@@ -50,7 +50,7 @@ import java.util.stream.Stream;
* A base implementation for the {@code Channelizer} which does a basic configuration of the the pipeline, one that
* is generally common to virtually any Gremlin Server operation (i.e. where the server's purpose is to process
* Gremlin scripts).
- * <br/>
+ * <p/>
* Implementers need only worry about determining how incoming data is converted to a
* {@link org.apache.tinkerpop.gremlin.driver.message.RequestMessage} and outgoing data is converted from a
* {@link org.apache.tinkerpop.gremlin.driver.message.ResponseMessage} to whatever expected format is needed by the pipeline.
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/2e4e2eda/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java
index ecdb677..2a2a7de 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java
@@ -134,7 +134,7 @@ public class GremlinDriverIntegrateTest extends AbstractGremlinServerIntegration
/**
* This test arose from this issue: https://github.org/apache/tinkerpop/tinkerpop3/issues/515
- * <br/>
+ * <p/>
* ResultSet.all returns a CompleteableFuture that blocks on the worker pool until isExausted returns false.
* isExausted in turn needs a thread on the worker pool to even return. So its totally possible to consume all
* threads on the worker pool waiting for .all to finish such that you can't even get one to wait for
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/2e4e2eda/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/GraphProvider.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/GraphProvider.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/GraphProvider.java
index a2d67c9..e58c1c4 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/GraphProvider.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/GraphProvider.java
@@ -91,7 +91,7 @@ public interface GraphProvider {
* {@link StandardTraversalEngine} so vendors should override as necessary if their implementation is testing
* something that requires a different engine type, like those tests for
* {@link org.apache.tinkerpop.gremlin.process.traversal.TraversalEngine.Type}.
- * <br/>
+ * <p/>
* Implementations should apply strategies as necessary to the
* {@link org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource.Builder} before calling
* it's {@code create} method.
@@ -145,7 +145,7 @@ public interface GraphProvider {
* Clears a {@link Graph} of all data and settings. Implementations will have different ways of handling this.
* For a brute force approach, implementers can simply delete data directories provided in the configuration.
* Implementers may choose a more elegant approach if it exists.
- * <br/>
+ * <p/>
* Implementations should be able to accept an argument of null for the Graph, in which case the only action
* that can be performed is a clear given the configuration. The method will typically be called this way
* as clean up task on setup to ensure that a persisted graph has a clear space to create a test graph.
@@ -237,7 +237,7 @@ public interface GraphProvider {
* <li>{@link Vertex}</li>
* <li>{@link VertexProperty}</li>
* </ul>
- * <br/>
+ * <p/>
* The test suite only enforces registration of the following core structure interfaces (i.e. these classes must
* be registered or the tests will fail to execute):
* <ul>
@@ -249,10 +249,10 @@ public interface GraphProvider {
* <li>{@link Vertex}</li>
* <li>{@link VertexProperty}</li>
* </ul>
- * <br/>
+ * <p/>
* The remaining interfaces and classes should be registered however as failure to do so, might cause failures
* in the Groovy environment testing suite.
- * <br/>
+ * <p/>
* Internally speaking, tests that make use of this method should bind in {@link #CORE_IMPLEMENTATIONS} to the
* {@link Set} because these represent {@code gremlin-core} implementations that are likely not registered
* by the vendor implementations.
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/2e4e2eda/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/LoadGraphWith.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/LoadGraphWith.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/LoadGraphWith.java
index 20dac12..17893e5 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/LoadGraphWith.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/LoadGraphWith.java
@@ -37,12 +37,12 @@ import static org.apache.tinkerpop.gremlin.structure.Graph.Features.VertexFeatur
/**
* Annotations to define a graph example to load from test resources prior to test execution. This annotation is
* for use only with test that extend from {@link AbstractGremlinTest}.
- * <br/>
+ * <p/>
* Note that the annotation assumes that the @{link GraphData} referenced by the annotation can be made available
* to the graph in the test. In other words, even a graph that has "read-only" features, should have some method of
* getting the data available to it. That said, graphs must minimally support the data types that the sample
* data contains for the test to be executed.
- * <br/>
+ * <p/>
* If a graph implementation is "read-only", it can override the
* {@link GraphProvider#loadGraphData(org.apache.tinkerpop.gremlin.structure.Graph, LoadGraphWith, Class, String)} method
* to provide some other mechanism for making that data available to the graph in time for the test. See the
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/2e4e2eda/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/ProcessComputerSuite.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/ProcessComputerSuite.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/ProcessComputerSuite.java
index 84556e2..0d64680 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/ProcessComputerSuite.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/ProcessComputerSuite.java
@@ -84,7 +84,7 @@ import java.util.stream.Stream;
* be implemented by vendors to validate that their implementations are compliant with that Gremlin language.
* Implementations that use this test suite should return {@code true} for
* {@link org.apache.tinkerpop.gremlin.structure.Graph.Features.GraphFeatures#supportsComputer()}.
- * <br/>
+ * <p/>
* For more information on the usage of this suite, please see {@link StructureStandardSuite}.
*
* @author Stephen Mallette (http://stephen.genoprime.com)
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/2e4e2eda/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/ProcessPerformanceSuite.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/ProcessPerformanceSuite.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/ProcessPerformanceSuite.java
index 073dacc..f787450 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/ProcessPerformanceSuite.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/ProcessPerformanceSuite.java
@@ -32,7 +32,7 @@ import org.junit.runners.model.RunnerBuilder;
* implementation. This suite contains "long-run" tests that produce reports on the traversal execution
* performance of a vendor implementation {@link Graph}. Its usage is optional to vendors as the tests are
* somewhat redundant to those found elsewhere in other required test suites.
- * <br/>
+ * <p/>
* For more information on the usage of this suite, please see {@link StructureStandardSuite}.
*
* @author Stephen Mallette (http://stephen.genoprime.com)
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/2e4e2eda/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/ProcessStandardSuite.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/ProcessStandardSuite.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/ProcessStandardSuite.java
index f056d2e..5be6765 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/ProcessStandardSuite.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/ProcessStandardSuite.java
@@ -90,7 +90,7 @@ import java.util.stream.Stream;
* The {@code ProcessStandardSuite} is a JUnit test runner that executes the Gremlin Test Suite over a
* {@link Graph} implementation. This test suite covers traversal operations and should be implemented by vendors
* to validate that their implementations are compliant with the Gremlin language.
- * <br/>
+ * <p/>
* For more information on the usage of this suite, please see {@link StructureStandardSuite}.
*
* @author Stephen Mallette (http://stephen.genoprime.com)
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/2e4e2eda/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/StructurePerformanceSuite.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/StructurePerformanceSuite.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/StructurePerformanceSuite.java
index e25fac8..3506e9b 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/StructurePerformanceSuite.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/StructurePerformanceSuite.java
@@ -28,7 +28,7 @@ import org.junit.runners.model.RunnerBuilder;
* {@link Graph} implementation. This suite contains "long-run" tests that produce reports on the read/write
* performance of a vendor implementation {@link Graph}. Its usage is optional to vendors as the tests are
* somewhat redundant to those found elsewhere in other required test suites.
- * <br/>
+ * <p/>
* For more information on the usage of this suite, please see {@link StructureStandardSuite}.
*
* @author Stephen Mallette (http://stephen.genoprime.com)
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/2e4e2eda/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/StructureStandardSuite.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/StructureStandardSuite.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/StructureStandardSuite.java
index b18fdcf..209c9e7 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/StructureStandardSuite.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/StructureStandardSuite.java
@@ -63,7 +63,7 @@ import java.util.stream.Stream;
* {@code StructureStandardSuite} will utilized Features defined in the suite to determine which tests will be
* executed. Note that while the above example demonstrates configuration of this suite, this approach generally
* applies to all other test suites.
- * <br/>
+ * <p/>
* Set the {@code GREMLIN_TESTS} environment variable to a comma separated list of test classes to execute.
* This setting can be helpful to restrict execution of tests to specific ones being focused on during development.
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/2e4e2eda/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraph.java
----------------------------------------------------------------------
diff --git a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraph.java b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraph.java
index bcaefed..e9058a8 100644
--- a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraph.java
+++ b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraph.java
@@ -109,7 +109,7 @@ public class TinkerGraph implements Graph {
/**
* Open a new {@link TinkerGraph} instance.
- * <br/>
+ * <p/>
* <b>Reference Implementation Help:</b> If a {@link Graph} implementation does not require a {@code Configuration}
* (or perhaps has a default configuration) it can choose to implement a zero argument
* {@code open()} method. This is an optional constructor method for TinkerGraph. It is not enforced by the Gremlin
@@ -121,7 +121,7 @@ public class TinkerGraph implements Graph {
/**
* Open a new {@code TinkerGraph} instance.
- * <br/>
+ * <p/>
* <b>Reference Implementation Help:</b> This method is the one use by the {@link GraphFactory} to instantiate
* {@link Graph} instances. This method must be overridden for the Structure Test Suite to pass. Implementers have
* latitude in terms of how exceptions are handled within this method. Such exceptions will be considered
@@ -253,7 +253,7 @@ public class TinkerGraph implements Graph {
/**
* Return TinkerGraph feature set.
- * <br/>
+ * <p/>
* <b>Reference Implementation Help:</b> Implementers only need to implement features for which there are
* negative or instance configured features. By default, all
* {@link org.apache.tinkerpop.gremlin.structure.Graph.Features} return true.
[07/50] [abbrv] incubator-tinkerpop git commit: fixed a minor typo
bug in docs.
Posted by sp...@apache.org.
fixed a minor typo bug in docs.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/e2b3dd88
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/e2b3dd88
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/e2b3dd88
Branch: refs/heads/variables
Commit: e2b3dd88a8ea3492989b40e5bd0c5c55388d451d
Parents: 38cb8aa
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Tue Apr 28 15:43:06 2015 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Tue Apr 28 15:43:06 2015 -0600
----------------------------------------------------------------------
docs/src/the-traversal.asciidoc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/e2b3dd88/docs/src/the-traversal.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/the-traversal.asciidoc b/docs/src/the-traversal.asciidoc
index b64617d..8e18694 100644
--- a/docs/src/the-traversal.asciidoc
+++ b/docs/src/the-traversal.asciidoc
@@ -29,7 +29,7 @@ At the most general level there is `Traversal<S,E>` which implements `Iterator<E
The classic notion of a graph traversal is provided by `GraphTraversal<S,E>` which extends `Traversal<S,E>`. GraphTraversal provides an interpretation of the graph data in terms of vertices, edges, etc. and thus, a graph traversal link:http://en.wikipedia.org/wiki/Domain-specific_language[DSL].
-:IMPORTANT The underlying `Step` implementations provided by TinkerPop should encompass most of the functionality required by a DSL author. It is important that DSL authors leverage the provided steps as then the common optimization and decoration strategies can reason on the underlying traversal sequence. If new steps are introduced, then common traversal strategies may not function properly.
+IMPORTANT: The underlying `Step` implementations provided by TinkerPop should encompass most of the functionality required by a DSL author. It is important that DSL authors leverage the provided steps as then the common optimization and decoration strategies can reason on the underlying traversal sequence. If new steps are introduced, then common traversal strategies may not function properly.
[[graph-traversal-steps]]
Graph Traversal Steps
[45/50] [abbrv] incubator-tinkerpop git commit: Dropped BatchGraph.
Posted by sp...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/4150a16d/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/BatchTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/BatchTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/BatchTest.java
deleted file mode 100644
index bebbc97..0000000
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/BatchTest.java
+++ /dev/null
@@ -1,475 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tinkerpop.gremlin.structure;
-
-import org.apache.tinkerpop.gremlin.AbstractGremlinTest;
-import org.apache.tinkerpop.gremlin.FeatureRequirement;
-import org.apache.tinkerpop.gremlin.FeatureRequirementSet;
-import org.apache.tinkerpop.gremlin.GraphManager;
-import org.apache.tinkerpop.gremlin.structure.util.batch.BatchGraph;
-import org.apache.tinkerpop.gremlin.structure.util.batch.Exists;
-import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
-import org.junit.Test;
-
-import java.util.List;
-
-import static org.apache.tinkerpop.gremlin.structure.Graph.Features.VertexFeatures.FEATURE_USER_SUPPLIED_IDS;
-import static org.apache.tinkerpop.gremlin.structure.Graph.Features.VertexPropertyFeatures.FEATURE_INTEGER_VALUES;
-import static org.junit.Assert.*;
-
-/**
- * BatchGraph tests are also handled by the IOTest battery. These tests focus mostly on issues with the incremental
- * loading setting turned on since that is not supported by the IO library.
- *
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public class BatchTest extends AbstractGremlinTest {
- @Test
- @FeatureRequirementSet(FeatureRequirementSet.Package.SIMPLE)
- @FeatureRequirement(featureClass = Graph.Features.VertexPropertyFeatures.class, feature = FEATURE_INTEGER_VALUES)
- @FeatureRequirement(featureClass = Graph.Features.EdgePropertyFeatures.class, feature = Graph.Features.EdgePropertyFeatures.FEATURE_DOUBLE_VALUES)
- @FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = FEATURE_USER_SUPPLIED_IDS)
- public void shouldLoadVerticesIncrementallyWithSuppliedIdentifier() {
- final BatchGraph batchGraph = BatchGraph.build(graph)
- .incrementalLoading(true)
- .bufferSize(1).create();
- final Object id1 = GraphManager.getGraphProvider().convertId("1", Vertex.class);
- final Object id2 = GraphManager.getGraphProvider().convertId("2", Vertex.class);
- batchGraph.addVertex(T.id, id1, "name", "marko", "age", 29);
- final Vertex v1 = batchGraph.addVertex(T.id, id2, "name", "stephen", "age", 37);
- final Vertex v2 = batchGraph.addVertex(T.id, id1, "name", "marko", "age", 34);
- v1.addEdge("knows", v2, "weight", 1.0d);
- tryCommit(batchGraph);
-
- final Vertex vStephen = g.V().has("name", "stephen").next();
- assertEquals(37, vStephen.property("age").value());
- assertEquals(new Long(1), g.V(vStephen).outE("knows").has("weight", 1.0d).inV().has("name", "marko").count().next());
-
- final Vertex vMarko = g.V().has("name", "marko").next();
- assertEquals(29, vMarko.property("age").value());
- }
-
- @Test
- @FeatureRequirementSet(FeatureRequirementSet.Package.SIMPLE)
- @FeatureRequirement(featureClass = Graph.Features.VertexPropertyFeatures.class, feature = FEATURE_INTEGER_VALUES)
- @FeatureRequirement(featureClass = Graph.Features.EdgePropertyFeatures.class, feature = Graph.Features.EdgePropertyFeatures.FEATURE_DOUBLE_VALUES)
- public void shouldLoadVerticesIncrementallyWithNamedIdentifier() {
- final BatchGraph batchGraph = BatchGraph.build(graph)
- .incrementalLoading(true)
- .vertexIdKey("name")
- .bufferSize(1).create();
- batchGraph.addVertex(T.id, "marko", "age", 29);
- final Vertex v1 = batchGraph.addVertex(T.id, "stephen", "age", 37);
- final Vertex v2 = batchGraph.addVertex(T.id, "marko", "age", 34);
- v1.addEdge("knows", v2, "weight", 1.0d);
- tryCommit(batchGraph);
-
- final Vertex vStephen = g.V().has("name", "stephen").next();
- assertEquals(37, vStephen.property("age").value());
- assertEquals(new Long(1), g.V(vStephen).outE("knows").has("weight", 1.0d).inV().has("name", "marko").count().next());
-
- final Vertex vMarko = g.V().has("name", "marko").next();
- assertEquals(29, vMarko.property("age").value());
- }
-
- @Test
- @FeatureRequirementSet(FeatureRequirementSet.Package.VERTICES_ONLY)
- @FeatureRequirement(featureClass = Graph.Features.VertexPropertyFeatures.class, feature = FEATURE_INTEGER_VALUES)
- @FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = FEATURE_USER_SUPPLIED_IDS)
- public void shouldLoadVerticesIncrementallyWithSuppliedIdentifierThrowOnExistingVertex() {
- final BatchGraph batchGraph = BatchGraph.build(graph)
- .incrementalLoading(true, Exists.THROW, Exists.IGNORE)
- .bufferSize(1).create();
- final Object id1 = GraphManager.getGraphProvider().convertId("1", Vertex.class);
- batchGraph.addVertex(T.id, id1, "name", "marko", "age", 29);
- try {
- batchGraph.addVertex(T.id, id1, "name", "marko", "age", 34);
- fail("Should have thrown an error because the vertex already exists");
- } catch (Exception ex) {
- assertTrue(ex instanceof IllegalStateException);
- }
- }
-
- @Test
- @FeatureRequirementSet(FeatureRequirementSet.Package.VERTICES_ONLY)
- @FeatureRequirement(featureClass = Graph.Features.VertexPropertyFeatures.class, feature = FEATURE_INTEGER_VALUES)
- public void shouldLoadVerticesIncrementallyWithNamedIdentifierThrowOnExistingVertex() {
- final BatchGraph batchGraph = BatchGraph.build(graph)
- .incrementalLoading(true, Exists.THROW, Exists.IGNORE)
- .vertexIdKey("name")
- .bufferSize(1).create();
- batchGraph.addVertex(T.id, "marko", "age", 29);
- try {
- batchGraph.addVertex(T.id, "marko", "age", 34);
- fail("Should have thrown an error because the vertex already exists");
- } catch (Exception ex) {
- assertTrue(ex instanceof IllegalStateException);
- }
- }
-
- @Test
- @FeatureRequirementSet(FeatureRequirementSet.Package.SIMPLE)
- @FeatureRequirement(featureClass = Graph.Features.VertexPropertyFeatures.class, feature = FEATURE_INTEGER_VALUES)
- @FeatureRequirement(featureClass = Graph.Features.EdgePropertyFeatures.class, feature = Graph.Features.EdgePropertyFeatures.FEATURE_DOUBLE_VALUES)
- @FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = FEATURE_USER_SUPPLIED_IDS)
- public void shouldLoadVerticesIncrementallyWithSuppliedIdentifierOverwriteSingleExistingVertex() {
- final BatchGraph batchGraph = BatchGraph.build(graph)
- .incrementalLoading(true, Exists.OVERWRITE_SINGLE, Exists.IGNORE)
- .bufferSize(1).create();
- final Object id1 = GraphManager.getGraphProvider().convertId("1", Vertex.class);
- final Object id2 = GraphManager.getGraphProvider().convertId("2", Vertex.class);
- batchGraph.addVertex(T.id, id1, "name", "marko", "age", 29);
- final Vertex v1 = batchGraph.addVertex(T.id, id2, "name", "stephen", "age", 37);
- final Vertex v2 = batchGraph.addVertex(T.id, id1, "name", "marko", "age", 34);
- v1.addEdge("knows", v2, "weight", 1.0d);
- tryCommit(batchGraph);
-
- final Vertex vStephen = g.V().has("name", "stephen").next();
- assertEquals(37, vStephen.property("age").value());
- assertEquals(new Long(1), g.V(vStephen).outE("knows").has("weight", 1.0d).inV().has("name", "marko").count().next());
-
- final Vertex vMarko = g.V().has("name", "marko").next();
- assertEquals(34, vMarko.property("age").value());
- }
-
- @Test
- @FeatureRequirementSet(FeatureRequirementSet.Package.SIMPLE)
- @FeatureRequirement(featureClass = Graph.Features.VertexPropertyFeatures.class, feature = FEATURE_INTEGER_VALUES)
- @FeatureRequirement(featureClass = Graph.Features.EdgePropertyFeatures.class, feature = Graph.Features.EdgePropertyFeatures.FEATURE_DOUBLE_VALUES)
- public void shouldLoadVerticesIncrementallyWithNamedIdentifierOverwriteSingleExistingVertex() {
- final BatchGraph batchGraph = BatchGraph.build(graph)
- .incrementalLoading(true, Exists.OVERWRITE_SINGLE, Exists.IGNORE)
- .vertexIdKey("name")
- .bufferSize(1).create();
- batchGraph.addVertex(T.id, "marko", "age", 29);
- final Vertex v1 = batchGraph.addVertex(T.id, "stephen", "age", 37);
- final Vertex v2 = batchGraph.addVertex(T.id, "marko", "age", 34);
- v1.addEdge("knows", v2, "weight", 1.0d);
- tryCommit(batchGraph);
-
- final Vertex vStephen = g.V().has("name", "stephen").next();
- assertEquals(37, vStephen.property("age").value());
- assertEquals(new Long(1), g.V(vStephen).outE("knows").has("weight", 1.0d).inV().has("name", "marko").count().next());
-
- final Vertex vMarko = g.V().has("name", "marko").next();
- assertEquals(34, vMarko.property("age").value());
- }
-
- @Test
- @FeatureRequirementSet(FeatureRequirementSet.Package.SIMPLE)
- @FeatureRequirement(featureClass = Graph.Features.VertexPropertyFeatures.class, feature = FEATURE_INTEGER_VALUES)
- @FeatureRequirement(featureClass = Graph.Features.EdgePropertyFeatures.class, feature = Graph.Features.EdgePropertyFeatures.FEATURE_DOUBLE_VALUES)
- @FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = FEATURE_USER_SUPPLIED_IDS)
- public void shouldLoadVerticesIncrementallyWithSuppliedIdentifierOverwriteExistingVertex() {
- final BatchGraph<?> batchGraph = BatchGraph.build(graph)
- .incrementalLoading(true, Exists.OVERWRITE, Exists.IGNORE)
- .bufferSize(1).create();
- final Object id1 = GraphManager.getGraphProvider().convertId("1", Vertex.class);
- final Object id2 = GraphManager.getGraphProvider().convertId("2", Vertex.class);
- batchGraph.addVertex(T.id, id1, "name", "marko", "age", 29);
- final Vertex v1 = batchGraph.addVertex(T.id, id2, "name", "stephen", "age", 37);
- final Vertex v2 = batchGraph.addVertex(T.id, id1, "name", "marko", "age", 34);
- v1.addEdge("knows", v2, "weight", 1.0d);
- tryCommit(batchGraph);
-
- final Vertex vStephen = g.V().has("name", "stephen").next();
- assertEquals(37, vStephen.property("age").value());
- assertEquals(new Long(1), g.V(vStephen).outE("knows").has("weight", 1.0d).inV().has("name", "marko").count().next());
-
- final Vertex vMarko = g.V().has("name", "marko").next();
- assertEquals(2, IteratorUtils.count(vMarko.properties("age")));
- assertEquals(2, IteratorUtils.count(vMarko.properties("name")));
- assertTrue(((List) g.V(vMarko).valueMap().next().get("age")).contains(29));
- assertTrue(((List) g.V(vMarko).valueMap().next().get("age")).contains(34));
- }
-
- @Test
- @FeatureRequirementSet(FeatureRequirementSet.Package.SIMPLE)
- @FeatureRequirement(featureClass = Graph.Features.VertexPropertyFeatures.class, feature = FEATURE_INTEGER_VALUES)
- @FeatureRequirement(featureClass = Graph.Features.EdgePropertyFeatures.class, feature = Graph.Features.EdgePropertyFeatures.FEATURE_DOUBLE_VALUES)
- @FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_MULTI_PROPERTIES)
- public void shouldLoadVerticesIncrementallyWithNamedIdentifierAddMultiPropertyExistingVertex() {
- final BatchGraph batchGraph = BatchGraph.build(graph)
- .incrementalLoading(true, Exists.OVERWRITE, Exists.IGNORE)
- .vertexIdKey("name")
- .bufferSize(1).create();
- batchGraph.addVertex(T.id, "marko", "age", 29);
- final Vertex v1 = batchGraph.addVertex(T.id, "stephen", "age", 37);
- final Vertex v2 = batchGraph.addVertex(T.id, "marko", "age", 34);
- v1.addEdge("knows", v2, "weight", 1.0d);
- tryCommit(batchGraph);
-
- final Vertex vStephen = g.V().has("name", "stephen").next();
- assertEquals(37, vStephen.property("age").value());
- assertEquals(new Long(1), g.V(vStephen).outE("knows").has("weight", 1.0d).inV().has("name", "marko").count().next());
-
- final Vertex vMarko = g.V().has("name", "marko").next();
- assertEquals(2, IteratorUtils.count(vMarko.properties("age")));
- assertEquals(2, IteratorUtils.count(vMarko.properties("name")));
- assertTrue(((List) g.V(vMarko).valueMap().next().get("age")).contains(29));
- assertTrue(((List) g.V(vMarko).valueMap().next().get("age")).contains(34));
- }
-
- @Test
- @FeatureRequirementSet(FeatureRequirementSet.Package.SIMPLE)
- @FeatureRequirement(featureClass = Graph.Features.VertexPropertyFeatures.class, feature = FEATURE_INTEGER_VALUES)
- @FeatureRequirement(featureClass = Graph.Features.EdgePropertyFeatures.class, feature = Graph.Features.EdgePropertyFeatures.FEATURE_DOUBLE_VALUES)
- @FeatureRequirement(featureClass = Graph.Features.EdgeFeatures.class, feature = Graph.Features.EdgeFeatures.FEATURE_USER_SUPPLIED_IDS)
- public void shouldLoadEdgesIncrementallyWithSuppliedIdentifier() {
- final BatchGraph batchGraph = BatchGraph.build(graph)
- .incrementalLoading(true)
- .vertexIdKey("name")
- .bufferSize(1).create();
- final Vertex v2 = batchGraph.addVertex(T.id, "marko", "age", 29);
- final Vertex v1 = batchGraph.addVertex(T.id, "stephen", "age", 37);
-
- final Object id1 = GraphManager.getGraphProvider().convertId("1", Edge.class);
-
- v1.addEdge("knows", v2, "weight", 1.0d, T.id, id1);
- v1.addEdge("knows", v2, "weight", 0.5d, T.id, id1); // second edge is ignored as it already exists
- tryCommit(batchGraph);
-
- final Vertex vStephen = g.V().has("name", "stephen").next();
- assertEquals(37, vStephen.property("age").value());
- assertEquals(new Long(1), g.V(vStephen).outE("knows").has("weight", 1.0d).inV().has("name", "marko").count().next());
- assertEquals(new Long(0), g.V(vStephen).outE("knows").has("weight", 0.5d).inV().has("name", "marko").count().next());
-
- final Vertex vMarko = g.V().has("name", "marko").next();
- assertEquals(29, vMarko.property("age").value());
- }
-
- @Test
- @FeatureRequirementSet(FeatureRequirementSet.Package.SIMPLE)
- @FeatureRequirement(featureClass = Graph.Features.VertexPropertyFeatures.class, feature = FEATURE_INTEGER_VALUES)
- @FeatureRequirement(featureClass = Graph.Features.EdgePropertyFeatures.class, feature = Graph.Features.EdgePropertyFeatures.FEATURE_DOUBLE_VALUES)
- public void shouldLoadEdgesIncrementallyWithNamedIdentifier() {
- final BatchGraph batchGraph = BatchGraph.build(graph)
- .incrementalLoading(true)
- .vertexIdKey("name")
- .edgeIdKey("uid")
- .bufferSize(1).create();
- final Vertex v2 = batchGraph.addVertex(T.id, "marko", "age", 29);
- final Vertex v1 = batchGraph.addVertex(T.id, "stephen", "age", 37);
- v1.addEdge("knows", v2, "weight", 1.0d, T.id, "abcde");
- v1.addEdge("knows", v2, "weight", 0.5d, T.id, "abcde"); // second edge is ignored as it already exists
- tryCommit(batchGraph);
-
- final Vertex vStephen = g.V().has("name", "stephen").next();
- assertEquals(37, vStephen.property("age").value());
- assertEquals(new Long(1), g.V(vStephen).outE("knows").has("uid", "abcde").has("weight", 1.0d).inV().has("name", "marko").count().next());
- assertEquals(new Long(0), g.V(vStephen).outE("knows").has("weight", 0.5d).inV().has("name", "marko").count().next());
-
- final Vertex vMarko = g.V().has("name", "marko").next();
- assertEquals(29, vMarko.property("age").value());
- }
-
- @Test
- @FeatureRequirementSet(FeatureRequirementSet.Package.SIMPLE)
- @FeatureRequirement(featureClass = Graph.Features.VertexPropertyFeatures.class, feature = FEATURE_INTEGER_VALUES)
- @FeatureRequirement(featureClass = Graph.Features.EdgePropertyFeatures.class, feature = Graph.Features.EdgePropertyFeatures.FEATURE_DOUBLE_VALUES)
- @FeatureRequirement(featureClass = Graph.Features.EdgeFeatures.class, feature = Graph.Features.EdgeFeatures.FEATURE_USER_SUPPLIED_IDS)
- public void shouldLoadEdgesIncrementallyWithSuppliedIdentifierOverwriteSingleExistingEdge() {
- final BatchGraph batchGraph = BatchGraph.build(graph)
- .incrementalLoading(true, Exists.IGNORE, Exists.OVERWRITE_SINGLE)
- .vertexIdKey("name")
- .bufferSize(1).create();
- final Vertex v2 = batchGraph.addVertex(T.id, "marko", "age", 29);
- final Vertex v1 = batchGraph.addVertex(T.id, "stephen", "age", 37);
- final Object id1 = GraphManager.getGraphProvider().convertId("1", Edge.class);
- v1.addEdge("knows", v2, "weight", 1.0d, T.id, id1);
- v1.addEdge("knows", v2, "weight", 0.5d, T.id, id1); // second edge is overwrites properties of the first
- tryCommit(batchGraph);
-
- final Vertex vStephen = g.V().has("name", "stephen").next();
- assertEquals(37, vStephen.property("age").value());
- assertEquals(new Long(0), g.V(vStephen).outE("knows").has("weight", 1.0d).inV().has("name", "marko").count().next());
- assertEquals(new Long(1), g.V(vStephen).outE("knows").has("weight", 0.5d).inV().has("name", "marko").count().next());
-
- final Vertex vMarko = g.V().has("name", "marko").next();
- assertEquals(29, vMarko.property("age").value());
- }
-
- @Test
- @FeatureRequirementSet(FeatureRequirementSet.Package.SIMPLE)
- @FeatureRequirement(featureClass = Graph.Features.VertexPropertyFeatures.class, feature = FEATURE_INTEGER_VALUES)
- @FeatureRequirement(featureClass = Graph.Features.EdgePropertyFeatures.class, feature = Graph.Features.EdgePropertyFeatures.FEATURE_DOUBLE_VALUES)
- public void shouldLoadEdgesIncrementallyWithNamedIdentifierOverwriteSingleExistingEdge() {
- final BatchGraph batchGraph = BatchGraph.build(graph)
- .incrementalLoading(true, Exists.IGNORE, Exists.OVERWRITE_SINGLE)
- .vertexIdKey("name")
- .edgeIdKey("uid")
- .bufferSize(1).create();
- final Vertex v2 = batchGraph.addVertex(T.id, "marko", "age", 29);
- final Vertex v1 = batchGraph.addVertex(T.id, "stephen", "age", 37);
- v1.addEdge("knows", v2, "weight", 1.0d, T.id, "abcde");
- v1.addEdge("knows", v2, "weight", 0.5d, T.id, "abcde"); // second edge overwrites properties of the first
- tryCommit(batchGraph);
-
- final Vertex vStephen = g.V().has("name", "stephen").next();
- assertEquals(37, vStephen.property("age").value());
- assertEquals(new Long(0), g.V(vStephen).outE("knows").has("uid", "abcde").has("weight", 1.0d).inV().has("name", "marko").count().next());
- assertEquals(new Long(1), g.V(vStephen).outE("knows").has("weight", 0.5d).inV().has("name", "marko").count().next());
-
- final Vertex vMarko = g.V().has("name", "marko").next();
- assertEquals(29, vMarko.property("age").value());
- }
-
- @Test
- @FeatureRequirementSet(FeatureRequirementSet.Package.SIMPLE)
- @FeatureRequirement(featureClass = Graph.Features.VertexPropertyFeatures.class, feature = FEATURE_INTEGER_VALUES)
- @FeatureRequirement(featureClass = Graph.Features.EdgePropertyFeatures.class, feature = Graph.Features.EdgePropertyFeatures.FEATURE_DOUBLE_VALUES)
- @FeatureRequirement(featureClass = Graph.Features.EdgeFeatures.class, feature = Graph.Features.EdgeFeatures.FEATURE_USER_SUPPLIED_IDS)
- public void shouldLoadEdgesIncrementallyWithSuppliedIdentifierOverwriteExistingEdge() {
- final BatchGraph batchGraph = BatchGraph.build(graph)
- .incrementalLoading(true, Exists.IGNORE, Exists.OVERWRITE)
- .vertexIdKey("name")
- .bufferSize(1).create();
- final Vertex v2 = batchGraph.addVertex(T.id, "marko", "age", 29);
- final Vertex v1 = batchGraph.addVertex(T.id, "stephen", "age", 37);
- final Object id1 = GraphManager.getGraphProvider().convertId("1", Edge.class);
- v1.addEdge("knows", v2, "weight", 1.0d, T.id, id1);
- v1.addEdge("knows", v2, "weight", 0.5d, T.id, id1); // second edge is overwrites properties of the first
- tryCommit(batchGraph);
-
- final Vertex vStephen = g.V().has("name", "stephen").next();
- assertEquals(37, vStephen.property("age").value());
- assertEquals(new Long(0), g.V(vStephen).outE("knows").has("weight", 1.0d).inV().has("name", "marko").count().next());
- assertEquals(new Long(1), g.V(vStephen).outE("knows").has("weight", 0.5d).inV().has("name", "marko").count().next());
-
- final Vertex vMarko = g.V().has("name", "marko").next();
- assertEquals(29, vMarko.property("age").value());
- }
-
- @Test
- @FeatureRequirementSet(FeatureRequirementSet.Package.SIMPLE)
- @FeatureRequirement(featureClass = Graph.Features.VertexPropertyFeatures.class, feature = FEATURE_INTEGER_VALUES)
- @FeatureRequirement(featureClass = Graph.Features.EdgePropertyFeatures.class, feature = Graph.Features.EdgePropertyFeatures.FEATURE_DOUBLE_VALUES)
- public void shouldLoadEdgesIncrementallyWithNamedIdentifierOverwriteExistingEdge() {
- final BatchGraph batchGraph = BatchGraph.build(graph)
- .incrementalLoading(true, Exists.IGNORE, Exists.OVERWRITE)
- .vertexIdKey("name")
- .edgeIdKey("uid")
- .bufferSize(1).create();
- final Vertex v2 = batchGraph.addVertex(T.id, "marko", "age", 29);
- final Vertex v1 = batchGraph.addVertex(T.id, "stephen", "age", 37);
- v1.addEdge("knows", v2, "weight", 1.0d, T.id, "abcde");
- v1.addEdge("knows", v2, "weight", 0.5d, T.id, "abcde"); // second edge overwrites properties of the first
- tryCommit(batchGraph);
-
- final Vertex vStephen = g.V().has("name", "stephen").next();
- assertEquals(37, vStephen.property("age").value());
- assertEquals(new Long(0), g.V(vStephen).outE("knows").has("uid", "abcde").has("weight", 1.0d).inV().has("name", "marko").count().next());
- assertEquals(new Long(1), g.V(vStephen).outE("knows").has("weight", 0.5d).inV().has("name", "marko").count().next());
-
- final Vertex vMarko = g.V().has("name", "marko").next();
- assertEquals(29, vMarko.property("age").value());
- }
-
- @Test
- @FeatureRequirementSet(FeatureRequirementSet.Package.SIMPLE)
- @FeatureRequirement(featureClass = Graph.Features.VertexPropertyFeatures.class, feature = FEATURE_INTEGER_VALUES)
- @FeatureRequirement(featureClass = Graph.Features.EdgePropertyFeatures.class, feature = Graph.Features.EdgePropertyFeatures.FEATURE_DOUBLE_VALUES)
- @FeatureRequirement(featureClass = Graph.Features.EdgeFeatures.class, feature = Graph.Features.EdgeFeatures.FEATURE_USER_SUPPLIED_IDS)
- public void shouldLoadEdgesIncrementallyWithSuppliedIdentifierThrowOnExistingEdge() {
- final BatchGraph batchGraph = BatchGraph.build(graph)
- .incrementalLoading(true, Exists.IGNORE, Exists.THROW)
- .vertexIdKey("name")
- .bufferSize(1).create();
- final Vertex v2 = batchGraph.addVertex(T.id, "marko", "age", 29);
- final Vertex v1 = batchGraph.addVertex(T.id, "stephen", "age", 37);
- final Object id1 = GraphManager.getGraphProvider().convertId("1", Edge.class);
- v1.addEdge("knows", v2, "weight", 1.0d, T.id, id1);
- try {
- v1.addEdge("knows", v2, "weight", 0.5d, T.id, id1); // second edge is overwrites properties of the first
- fail("Should have thrown an error because the vertex already exists");
- } catch (Exception ex) {
- assertTrue(ex instanceof IllegalStateException);
- }
- }
-
- @Test
- @FeatureRequirementSet(FeatureRequirementSet.Package.SIMPLE)
- @FeatureRequirement(featureClass = Graph.Features.VertexPropertyFeatures.class, feature = FEATURE_INTEGER_VALUES)
- @FeatureRequirement(featureClass = Graph.Features.EdgePropertyFeatures.class, feature = Graph.Features.EdgePropertyFeatures.FEATURE_DOUBLE_VALUES)
- public void shouldLoadEdgesIncrementallyWithNamedIdentifierThrowOnExistingEdge() {
- final BatchGraph batchGraph = BatchGraph.build(graph)
- .incrementalLoading(true, Exists.IGNORE, Exists.THROW)
- .vertexIdKey("name")
- .edgeIdKey("uid")
- .bufferSize(1).create();
- final Vertex v2 = batchGraph.addVertex(T.id, "marko", "age", 29);
- final Vertex v1 = batchGraph.addVertex(T.id, "stephen", "age", 37);
- v1.addEdge("knows", v2, "weight", 1.0d, T.id, "abcde");
- try {
- v1.addEdge("knows", v2, "weight", 0.5d, T.id, "abcde"); // second edge is overwrites properties of the first
- fail("Should have thrown an error because the vertex already exists");
- } catch (Exception ex) {
- assertTrue(ex instanceof IllegalStateException);
- }
- }
-
- @Test
- @FeatureRequirementSet(FeatureRequirementSet.Package.SIMPLE)
- @FeatureRequirement(featureClass = Graph.Features.VertexPropertyFeatures.class, feature = FEATURE_INTEGER_VALUES)
- @FeatureRequirement(featureClass = Graph.Features.EdgePropertyFeatures.class, feature = Graph.Features.EdgePropertyFeatures.FEATURE_DOUBLE_VALUES)
- public void shouldLoadEdgesIncrementallyNoIdSpecified() {
- final BatchGraph batchGraph = BatchGraph.build(graph)
- .incrementalLoading(true)
- .vertexIdKey("name")
- .bufferSize(1).create();
- final Vertex v2 = batchGraph.addVertex(T.id, "marko", "age", 29);
- final Vertex v1 = batchGraph.addVertex(T.id, "stephen", "age", 37);
- v1.addEdge("knows", v2, "weight", 1.0d);
- v1.addEdge("knows", v2, "weight", 0.5d);
- tryCommit(batchGraph);
-
- final Vertex vStephen = g.V().has("name", "stephen").next();
- assertEquals(37, vStephen.property("age").value());
- assertEquals(new Long(1), g.V(vStephen).outE("knows").has("weight", 1.0d).inV().has("name", "marko").count().next());
- assertEquals(new Long(1), g.V(vStephen).outE("knows").has("weight", 0.5d).inV().has("name", "marko").count().next());
-
- final Vertex vMarko = g.V().has("name", "marko").next();
- assertEquals(29, vMarko.property("age").value());
- }
-
- @Test
- @FeatureRequirementSet(FeatureRequirementSet.Package.SIMPLE)
- @FeatureRequirement(featureClass = Graph.Features.VertexPropertyFeatures.class, feature = FEATURE_INTEGER_VALUES)
- @FeatureRequirement(featureClass = Graph.Features.EdgePropertyFeatures.class, feature = Graph.Features.EdgePropertyFeatures.FEATURE_DOUBLE_VALUES)
- public void shouldLoadEdgesIncrementallyWithNamedIdentifierAndNoIdSpecified() {
- final BatchGraph batchGraph = BatchGraph.build(graph)
- .incrementalLoading(true)
- .vertexIdKey("name")
- .edgeIdKey("uid")
- .bufferSize(1).create();
- final Vertex v2 = batchGraph.addVertex(T.id, "marko", "age", 29);
- final Vertex v1 = batchGraph.addVertex(T.id, "stephen", "age", 37);
- v1.addEdge("knows", v2, "weight", 1.0d);
- v1.addEdge("knows", v2, "weight", 0.5d);
- tryCommit(batchGraph);
-
- final Vertex vStephen = g.V().has("name", "stephen").next();
- assertEquals(37, vStephen.property("age").value());
- assertEquals(new Long(1), g.V(vStephen).outE("knows").has("weight", 1.0d).inV().has("name", "marko").count().next());
- assertEquals(new Long(1), g.V(vStephen).outE("knows").has("weight", 0.5d).inV().has("name", "marko").count().next());
-
- final Vertex vMarko = g.V().has("name", "marko").next();
- assertEquals(29, vMarko.property("age").value());
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/4150a16d/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/StructureStandardSuite.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/StructureStandardSuite.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/StructureStandardSuite.java
index 209c9e7..4625bc7 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/StructureStandardSuite.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/StructureStandardSuite.java
@@ -36,11 +36,6 @@ import org.apache.tinkerpop.gremlin.structure.util.star.StarGraphTest;
import org.junit.runners.model.InitializationError;
import org.junit.runners.model.RunnerBuilder;
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
/**
* The {@code StructureStandardSuite} is a JUnit test runner that executes the Gremlin Test Suite over a
* {@link Graph} implementation. This specialized test suite and runner is for use by
@@ -76,7 +71,6 @@ public class StructureStandardSuite extends AbstractGremlinSuite {
* as needed to enforce tests upon implementations.
*/
private static final Class<?>[] allTests = new Class<?>[]{
- BatchTest.class,
CommunityGeneratorTest.class,
DetachedGraphTest.class,
DetachedEdgeTest.class,
[03/50] [abbrv] incubator-tinkerpop git commit: removed
Compare.inside and Compare.outside as they can be composed from more
primitive comparators. HasStep and IsStep now take predicate arrays.
Posted by sp...@apache.org.
removed Compare.inside and Compare.outside as they can be composed from more primitive comparators. HasStep and IsStep now take predicate arrays.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/fad02932
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/fad02932
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/fad02932
Branch: refs/heads/variables
Commit: fad0293297fdac035b2c02f20d76f81fe84d44ee
Parents: ab1aaf2
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Tue Apr 28 12:05:54 2015 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Tue Apr 28 12:05:54 2015 -0600
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
.../traversal/dsl/graph/GraphTraversal.java | 12 ++++----
.../process/traversal/step/filter/HasStep.java | 20 ++++++++------
.../process/traversal/step/filter/IsStep.java | 22 ++++++++++-----
.../optimization/RangeByIsCountStrategy.java | 8 +++---
.../tinkerpop/gremlin/structure/Compare.java | 29 --------------------
.../apache/tinkerpop/gremlin/structure/P.java | 12 +++++---
.../RangeByIsCountStrategyTest.java | 8 ++++--
.../process/util/TraversalHelperTest.java | 12 ++++----
9 files changed, 60 insertions(+), 64 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/fad02932/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 59cf11f..c3f6f4f 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -25,6 +25,7 @@ image::http://www.tinkerpop.com/docs/current/images/gremlin-hindu.png[width=225]
TinkerPop 3.0.0.M9 (NOT OFFICIALLY RELEASED YET)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+* Removed `Compare.inside` and `Compare.outside` as they are not primitive comparators and should be composed from primitives.
* Introduced `P` (predicate) for cleaner looking `is()`, `has()`, and `where()` calls -- e.g. `has('age',eq(32))`.
* `GraphTraversalSource` is now the location for `withXXX()` operations. No longer do they exist at `GraphTraversal`.
* All `Traverser` objects now extend from `AbstractTraverser` or a child that ultimately extends from `AbstractTraverser`.
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/fad02932/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
index 0f7204c..1e63986 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
@@ -132,13 +132,11 @@ import org.apache.tinkerpop.gremlin.util.function.ConstantSupplier;
import java.util.Arrays;
import java.util.Collection;
-import java.util.Collections;
import java.util.Comparator;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.function.BiFunction;
-import java.util.function.BiPredicate;
import java.util.function.BinaryOperator;
import java.util.function.Consumer;
import java.util.function.Function;
@@ -463,12 +461,16 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
return this.asAdmin().addStep(new HasTraversalStep<>(this.asAdmin(), (Traversal.Admin<E, ?>) hasNotNextTraversal, true));
}
- public default GraphTraversal<S, E> has(final String key, final P<?> predicate) {
- return this.asAdmin().addStep(new HasStep(this.asAdmin(), new HasContainer(key, predicate.getBiPredicate(), predicate.getValue())));
+ public default GraphTraversal<S, E> has(final String key, final P<?>... predicates) {
+ final HasContainer[] hasContainers = new HasContainer[predicates.length];
+ for (int i = 0; i < predicates.length; i++) {
+ hasContainers[i] = new HasContainer(key, predicates[i].getBiPredicate(), predicates[i].getValue());
+ }
+ return this.asAdmin().addStep(new HasStep(this.asAdmin(), hasContainers));
}
public default GraphTraversal<S, E> has(final String key, final Object value) {
- return this.has(key, P.eq(value));
+ return this.has(key,new P<?>[]{value instanceof P ? (P)value : P.eq(value)});
}
public default GraphTraversal<S, E> has(final T accessor, final P<?> predicate) {
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/fad02932/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/HasStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/HasStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/HasStep.java
index 3efbe5b..4471d22 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/HasStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/HasStep.java
@@ -22,10 +22,11 @@ import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
import org.apache.tinkerpop.gremlin.process.traversal.step.HasContainerHolder;
import org.apache.tinkerpop.gremlin.process.traversal.step.util.HasContainer;
-import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper;
import org.apache.tinkerpop.gremlin.process.traversal.traverser.TraverserRequirement;
+import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper;
import org.apache.tinkerpop.gremlin.structure.Element;
+import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Set;
@@ -35,31 +36,34 @@ import java.util.Set;
*/
public class HasStep<S extends Element> extends FilterStep<S> implements HasContainerHolder { // TODO: make final when graph strategies are fixed up
- private final HasContainer hasContainer;
+ private final List<HasContainer> hasContainers;
- public HasStep(final Traversal.Admin traversal, final HasContainer hasContainer) {
+ public HasStep(final Traversal.Admin traversal, final HasContainer... hasContainers) {
super(traversal);
- this.hasContainer = hasContainer;
+ this.hasContainers = new ArrayList<>();
+ for (final HasContainer hasContainer : hasContainers) {
+ this.hasContainers.add(hasContainer);
+ }
}
@Override
protected boolean filter(final Traverser.Admin<S> traverser) {
- return this.hasContainer.test(traverser.get());
+ return HasContainer.testAll(traverser.get(), this.hasContainers);
}
@Override
public String toString() {
- return TraversalHelper.makeStepString(this, this.hasContainer);
+ return TraversalHelper.makeStepString(this, this.hasContainers);
}
@Override
public List<HasContainer> getHasContainers() {
- return Collections.singletonList(this.hasContainer);
+ return this.hasContainers;
}
@Override
public void addHasContainer(final HasContainer hasContainer) {
- throw new UnsupportedOperationException(this.getClass().getSimpleName() + " does not support adding new HasContainers");
+ this.hasContainers.add(hasContainer);
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/fad02932/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/IsStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/IsStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/IsStep.java
index 4f7da24..31df276 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/IsStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/IsStep.java
@@ -24,7 +24,9 @@ import org.apache.tinkerpop.gremlin.process.traversal.traverser.TraverserRequire
import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper;
import org.apache.tinkerpop.gremlin.structure.P;
+import java.util.Arrays;
import java.util.Collections;
+import java.util.List;
import java.util.Set;
/**
@@ -32,21 +34,27 @@ import java.util.Set;
*/
public final class IsStep<S> extends FilterStep<S> {
- private final P<S> predicate;
+ private final List<P<S>> predicates;
+ // todo: boolean isSizeOne for optimization
- public IsStep(final Traversal.Admin traversal, final P<S> predicate) {
+ public IsStep(final Traversal.Admin traversal, final P<S>... predicates) {
super(traversal);
- this.predicate = predicate;
+ this.predicates = Arrays.asList(predicates);
}
@Override
protected boolean filter(final Traverser.Admin<S> traverser) {
- return this.predicate.test(traverser.get());
+ final S s = traverser.get();
+ for (final P<S> predicate : this.predicates) {
+ if (!predicate.test(s))
+ return false;
+ }
+ return true;
}
@Override
public String toString() {
- return TraversalHelper.makeStepString(this, this.predicate);
+ return TraversalHelper.makeStepString(this, this.predicates);
}
@Override
@@ -54,7 +62,7 @@ public final class IsStep<S> extends FilterStep<S> {
return Collections.singleton(TraverserRequirement.OBJECT);
}
- public P<S> getPredicate() {
- return this.predicate;
+ public List<P<S>> getPredicates() {
+ return this.predicates;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/fad02932/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/RangeByIsCountStrategy.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/RangeByIsCountStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/RangeByIsCountStrategy.java
index fd37985..8b3e35f 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/RangeByIsCountStrategy.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/RangeByIsCountStrategy.java
@@ -38,8 +38,8 @@ import java.util.function.BiPredicate;
public final class RangeByIsCountStrategy extends AbstractTraversalStrategy implements TraversalStrategy {
private static final Map<BiPredicate, Long> RANGE_PREDICATES = new HashMap<BiPredicate, Long>() {{
- put(Compare.inside, 0L);
- put(Compare.outside, 1L);
+ //put(Compare.inside, 0L);
+ //put(Compare.outside, 1L);
put(Contains.within, 1L);
put(Contains.without, 0L);
}};
@@ -55,7 +55,7 @@ public final class RangeByIsCountStrategy extends AbstractTraversalStrategy impl
public void apply(final Traversal.Admin<?, ?> traversal) {
final int size = traversal.getSteps().size();
Step prev = null;
- for (int i = 0; i < size; i++) {
+ /*for (int i = 0; i < size; i++) {
final Step curr = traversal.getSteps().get(i);
if (curr instanceof CountGlobalStep && i < size - 1) {
final Step next = traversal.getSteps().get(i + 1);
@@ -82,7 +82,7 @@ public final class RangeByIsCountStrategy extends AbstractTraversalStrategy impl
}
}
prev = curr;
- }
+ } */
}
public static RangeByIsCountStrategy instance() {
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/fad02932/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Compare.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Compare.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Compare.java
index 9e95cf1..bddf109 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Compare.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Compare.java
@@ -18,7 +18,6 @@
*/
package org.apache.tinkerpop.gremlin.structure;
-import java.util.List;
import java.util.function.BiPredicate;
/**
@@ -93,26 +92,6 @@ public enum Compare implements BiPredicate<Object, Object> {
public Compare opposite() {
return gt;
}
- }, inside {
- @Override
- public boolean test(final Object first, final Object second) {
- return !(null == first || second == null) && gt.test(first, ((List) second).get(0)) && lt.test(first, ((List) second).get(1));
- }
-
- @Override
- public Compare opposite() {
- return outside;
- }
- }, outside {
- @Override
- public boolean test(final Object first, final Object second) {
- return !(null == first || second == null) && lt.test(first, ((List) second).get(0)) || gt.test(first, ((List) second).get(1));
- }
-
- @Override
- public Compare opposite() {
- return inside;
- }
};
/**
@@ -125,12 +104,4 @@ public enum Compare implements BiPredicate<Object, Object> {
* Produce the opposite representation of the current {@code Compare} enum.
*/
public abstract Compare opposite();
-
- public static final boolean hasCompare(final String name) {
- for(final Compare compare : Compare.values()) {
- if(compare.name().equals(name))
- return true;
- }
- return false;
- }
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/fad02932/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/P.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/P.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/P.java
index f0e162e..93b64fe 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/P.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/P.java
@@ -96,12 +96,16 @@ public class P<V> implements Predicate<V>, Serializable {
return new P(Compare.gte, value);
}
- public static <V> P<V> inside(final V first, final V second) {
- return new P(Compare.inside, Arrays.asList(first, second));
+ public static <V> P<V>[] inside(final V first, final V second) {
+ return new P[]{new P(Compare.gt, first), new P(Compare.lt, second)};
}
- public static <V> P<V> outside(final V first, final V second) {
- return new P(Compare.outside, Arrays.asList(first, second));
+ public static <V> P<V>[] outside(final V first, final V second) {
+ return new P[]{new P(Compare.lt, first), new P(Compare.gt, second)};
+ }
+
+ public static <V> P<V>[] between(final V first, final V second) {
+ return new P[]{new P(Compare.gte, first), new P(Compare.lt, second)};
}
public static <V> P<V> within(final V... values) {
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/fad02932/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/RangeByIsCountStrategyTest.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/RangeByIsCountStrategyTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/RangeByIsCountStrategyTest.java
index 135e9da..efc8fd0 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/RangeByIsCountStrategyTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/RangeByIsCountStrategyTest.java
@@ -31,6 +31,7 @@ import org.apache.tinkerpop.gremlin.structure.Compare;
import org.apache.tinkerpop.gremlin.structure.Contains;
import org.apache.tinkerpop.gremlin.structure.P;
import org.junit.Before;
+import org.junit.Ignore;
import org.junit.Test;
import org.junit.experimental.runners.Enclosed;
import org.junit.runner.RunWith;
@@ -78,6 +79,7 @@ public class RangeByIsCountStrategyTest {
}
@Test
+ @Ignore
public void shouldApplyStrategy() {
doTest(predicate, value, expectedHighRange);
}
@@ -110,6 +112,7 @@ public class RangeByIsCountStrategyTest {
}
@Test
+ @Ignore
public void shouldApplyStrategy() {
doTest(predicate, value, expectedHighRange);
}
@@ -124,6 +127,7 @@ public class RangeByIsCountStrategyTest {
}
@Test
+ @Ignore
public void nestedCountEqualsNullShouldLimitToOne() {
final AtomicInteger counter = new AtomicInteger(0);
final Traversal traversal = __.out().has(__.outE("created").count().is(0));
@@ -179,8 +183,8 @@ public class RangeByIsCountStrategyTest {
{"countLessThanThreeShouldLimitToThree", Compare.lt, 3l, 3l},
{"countGreaterThanTwoShouldLimitToThree", Compare.gt, 2l, 3l},
{"countGreaterThanOrEqualTwoShouldLimitToTwo", Compare.gte, 2l, 2l},
- {"countInsideTwoAndFourShouldLimitToFour", Compare.inside, Arrays.asList(2l, 4l), 4l},
- {"countOutsideTwoAndFourShouldLimitToFive", Compare.outside, Arrays.asList(2l, 4l), 5l},
+ //{"countInsideTwoAndFourShouldLimitToFour", Compare.inside, Arrays.asList(2l, 4l), 4l},
+ //{"countOutsideTwoAndFourShouldLimitToFive", Compare.outside, Arrays.asList(2l, 4l), 5l},
{"countWithinTwoSixFourShouldLimitToSeven", Contains.within, Arrays.asList(2l, 6l, 4l), 7l},
{"countWithoutTwoSixFourShouldLimitToSix", Contains.without, Arrays.asList(2l, 6l, 4l), 6l}});
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/fad02932/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/util/TraversalHelperTest.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/util/TraversalHelperTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/util/TraversalHelperTest.java
index 6add61a..bdd3123 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/util/TraversalHelperTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/util/TraversalHelperTest.java
@@ -24,9 +24,11 @@ import org.apache.tinkerpop.gremlin.process.traversal.step.filter.HasStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.filter.LambdaFilterStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.map.PropertiesStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.IdentityStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.util.HasContainer;
import org.apache.tinkerpop.gremlin.process.traversal.util.DefaultTraversal;
import org.apache.tinkerpop.gremlin.process.traversal.step.util.EmptyStep;
import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper;
+import org.apache.tinkerpop.gremlin.structure.Compare;
import org.apache.tinkerpop.gremlin.structure.PropertyType;
import org.apache.tinkerpop.gremlin.structure.util.empty.EmptyGraph;
import org.junit.Test;
@@ -44,7 +46,7 @@ public class TraversalHelperTest {
public void shouldChainTogetherStepsWithNextPreviousInALinkedListStructure() {
Traversal.Admin traversal = new DefaultTraversal<>(EmptyGraph.instance());
traversal.asAdmin().addStep(new IdentityStep(traversal));
- traversal.asAdmin().addStep(new HasStep(traversal, null));
+ traversal.asAdmin().addStep(new HasStep(traversal));
traversal.asAdmin().addStep(new LambdaFilterStep(traversal, traverser -> true));
validateToyTraversal(traversal);
}
@@ -53,13 +55,13 @@ public class TraversalHelperTest {
public void shouldAddStepsCorrectly() {
Traversal.Admin traversal = new DefaultTraversal<>(EmptyGraph.instance());
traversal.asAdmin().addStep(0, new LambdaFilterStep(traversal, traverser -> true));
- traversal.asAdmin().addStep(0, new HasStep(traversal, null));
+ traversal.asAdmin().addStep(0, new HasStep(traversal));
traversal.asAdmin().addStep(0, new IdentityStep(traversal));
validateToyTraversal(traversal);
traversal = new DefaultTraversal<>(EmptyGraph.instance());
traversal.asAdmin().addStep(0, new IdentityStep(traversal));
- traversal.asAdmin().addStep(1, new HasStep(traversal, null));
+ traversal.asAdmin().addStep(1, new HasStep(traversal));
traversal.asAdmin().addStep(2, new LambdaFilterStep(traversal, traverser -> true));
validateToyTraversal(traversal);
}
@@ -68,7 +70,7 @@ public class TraversalHelperTest {
public void shouldRemoveStepsCorrectly() {
Traversal.Admin traversal = new DefaultTraversal<>(EmptyGraph.instance());
traversal.asAdmin().addStep(new IdentityStep(traversal));
- traversal.asAdmin().addStep(new HasStep(traversal, null));
+ traversal.asAdmin().addStep(new HasStep(traversal));
traversal.asAdmin().addStep(new LambdaFilterStep(traversal, traverser -> true));
traversal.asAdmin().addStep(new PropertiesStep(traversal, PropertyType.VALUE, "marko"));
@@ -80,7 +82,7 @@ public class TraversalHelperTest {
validateToyTraversal(traversal);
traversal.asAdmin().removeStep(1);
- traversal.asAdmin().addStep(1, new HasStep(traversal, null));
+ traversal.asAdmin().addStep(1, new HasStep(traversal));
validateToyTraversal(traversal);
}
[08/50] [abbrv] incubator-tinkerpop git commit: fixed minor bug
around IsStep and reimplemented RangeByIsCountStrategy
Posted by sp...@apache.org.
fixed minor bug around IsStep and reimplemented RangeByIsCountStrategy
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/e330ce39
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/e330ce39
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/e330ce39
Branch: refs/heads/variables
Commit: e330ce39422ff0901814c1b5e5894a9cec5a26e9
Parents: fad0293
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Tue Apr 28 23:45:18 2015 +0200
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Tue Apr 28 23:45:18 2015 +0200
----------------------------------------------------------------------
.../traversal/dsl/graph/GraphTraversal.java | 135 ++-----------------
.../gremlin/process/traversal/dsl/graph/__.java | 4 +-
.../optimization/RangeByIsCountStrategy.java | 40 +++---
.../RangeByIsCountStrategyTest.java | 57 ++++----
.../tinkergraph/structure/TinkerGraphTest.java | 11 +-
5 files changed, 66 insertions(+), 181 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/e330ce39/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
index 1e63986..acf13c2 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
@@ -18,129 +18,22 @@
*/
package org.apache.tinkerpop.gremlin.process.traversal.dsl.graph;
-import org.apache.tinkerpop.gremlin.process.traversal.Path;
-import org.apache.tinkerpop.gremlin.process.traversal.Scope;
-import org.apache.tinkerpop.gremlin.process.traversal.Step;
-import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
-import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
-import org.apache.tinkerpop.gremlin.process.traversal.lambda.ElementValueTraversal;
-import org.apache.tinkerpop.gremlin.process.traversal.lambda.FilterTraversal;
-import org.apache.tinkerpop.gremlin.process.traversal.lambda.FilterTraverserTraversal;
-import org.apache.tinkerpop.gremlin.process.traversal.lambda.IdentityTraversal;
-import org.apache.tinkerpop.gremlin.process.traversal.lambda.LoopTraversal;
-import org.apache.tinkerpop.gremlin.process.traversal.lambda.MapTraversal;
-import org.apache.tinkerpop.gremlin.process.traversal.lambda.MapTraverserTraversal;
-import org.apache.tinkerpop.gremlin.process.traversal.lambda.TokenTraversal;
-import org.apache.tinkerpop.gremlin.process.traversal.lambda.TrueTraversal;
+import org.apache.tinkerpop.gremlin.process.traversal.*;
+import org.apache.tinkerpop.gremlin.process.traversal.lambda.*;
import org.apache.tinkerpop.gremlin.process.traversal.step.ComparatorHolder;
import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalOptionParent;
import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalParent;
-import org.apache.tinkerpop.gremlin.process.traversal.step.branch.BranchStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.branch.ChooseStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.branch.LocalStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.branch.RepeatStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.branch.UnionStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.filter.AndStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.filter.CoinStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.filter.CyclicPathStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.filter.DedupGlobalStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.filter.DropStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.filter.ExceptStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.filter.HasStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.filter.HasTraversalStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.filter.IsStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.filter.LambdaFilterStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.filter.OrStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.filter.RangeGlobalStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.filter.RetainStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.filter.SampleGlobalStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.filter.SimplePathStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.filter.TimeLimitStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.filter.WhereStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.AddEdgeByPathStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.AddEdgeStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.AddVertexStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.CoalesceStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.CountGlobalStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.CountLocalStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.DedupLocalStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.EdgeOtherVertexStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.EdgeVertexStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.FoldStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.GroupCountStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.GroupStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.IdStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.KeyStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.LabelStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.LambdaFlatMapStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.LambdaMapStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.MaxGlobalStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.MaxLocalStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.MeanGlobalStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.MeanLocalStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.MinGlobalStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.MinLocalStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.OrderGlobalStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.OrderLocalStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.PathStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.PropertiesStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.PropertyMapStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.PropertyValueStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.RangeLocalStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.SackStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.SampleLocalStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.SelectOneStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.SelectStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.SumGlobalStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.SumLocalStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.TreeStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.UnfoldStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.VertexStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.branch.*;
+import org.apache.tinkerpop.gremlin.process.traversal.step.filter.*;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.*;
import org.apache.tinkerpop.gremlin.process.traversal.step.map.match.MatchStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.AddPropertyStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.AggregateStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.GroupCountSideEffectStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.GroupSideEffectStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.IdentityStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.InjectStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.LambdaSideEffectStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.ProfileStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.SackElementValueStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.SackObjectStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.SideEffectCapStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.StartStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.StoreStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.SubgraphStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.TreeSideEffectStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.util.ElementFunctionComparator;
-import org.apache.tinkerpop.gremlin.process.traversal.step.util.ElementValueComparator;
-import org.apache.tinkerpop.gremlin.process.traversal.step.util.HasContainer;
-import org.apache.tinkerpop.gremlin.process.traversal.step.util.NoOpBarrierStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.util.TraversalComparator;
-import org.apache.tinkerpop.gremlin.process.traversal.step.util.Tree;
-import org.apache.tinkerpop.gremlin.structure.Direction;
-import org.apache.tinkerpop.gremlin.structure.Edge;
-import org.apache.tinkerpop.gremlin.structure.Element;
-import org.apache.tinkerpop.gremlin.structure.Order;
-import org.apache.tinkerpop.gremlin.structure.P;
-import org.apache.tinkerpop.gremlin.structure.Property;
-import org.apache.tinkerpop.gremlin.structure.PropertyType;
-import org.apache.tinkerpop.gremlin.structure.T;
-import org.apache.tinkerpop.gremlin.structure.Vertex;
-import org.apache.tinkerpop.gremlin.structure.VertexProperty;
+import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.*;
+import org.apache.tinkerpop.gremlin.process.traversal.step.util.*;
+import org.apache.tinkerpop.gremlin.structure.*;
import org.apache.tinkerpop.gremlin.util.function.ConstantSupplier;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Comparator;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.function.BiFunction;
-import java.util.function.BinaryOperator;
-import java.util.function.Consumer;
-import java.util.function.Function;
-import java.util.function.Predicate;
+import java.util.*;
+import java.util.function.*;
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
@@ -470,7 +363,7 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
}
public default GraphTraversal<S, E> has(final String key, final Object value) {
- return this.has(key,new P<?>[]{value instanceof P ? (P)value : P.eq(value)});
+ return this.has(key, new P<?>[]{value instanceof P ? (P) value : P.eq(value)});
}
public default GraphTraversal<S, E> has(final T accessor, final P<?> predicate) {
@@ -513,12 +406,12 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
return values.length == 1 ? this.has(T.value, values[0]) : this.has(T.value, P.within(values));
}
- public default GraphTraversal<S, E> is(final P<E> predicate) {
- return this.asAdmin().addStep(new IsStep<>(this.asAdmin(), predicate));
+ public default GraphTraversal<S, E> is(final P<E>... predicates) {
+ return this.asAdmin().addStep(new IsStep<>(this.asAdmin(), predicates));
}
public default GraphTraversal<S, E> is(final Object value) {
- return this.is((P<E>) P.eq(value));
+ return this.is(new P[]{value instanceof P ? (P) value : P.eq(value)});
}
public default GraphTraversal<S, E> coin(final double probability) {
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/e330ce39/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/__.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/__.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/__.java
index c869d48..4c4dc2a 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/__.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/__.java
@@ -374,8 +374,8 @@ public class __ {
return __.<A>start().where(constraint);
}
- public static <A> GraphTraversal<A, A> is(final P<A> predicate) {
- return __.<A>start().is(predicate);
+ public static <A> GraphTraversal<A, A> is(final P<A>... predicates) {
+ return __.<A>start().is(predicates);
}
public static <A> GraphTraversal<A, A> is(final Object value) {
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/e330ce39/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/RangeByIsCountStrategy.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/RangeByIsCountStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/RangeByIsCountStrategy.java
index 8b3e35f..7781f59 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/RangeByIsCountStrategy.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/RangeByIsCountStrategy.java
@@ -28,6 +28,7 @@ import org.apache.tinkerpop.gremlin.process.traversal.strategy.AbstractTraversal
import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper;
import org.apache.tinkerpop.gremlin.structure.Compare;
import org.apache.tinkerpop.gremlin.structure.Contains;
+import org.apache.tinkerpop.gremlin.structure.P;
import java.util.*;
import java.util.function.BiPredicate;
@@ -55,34 +56,39 @@ public final class RangeByIsCountStrategy extends AbstractTraversalStrategy impl
public void apply(final Traversal.Admin<?, ?> traversal) {
final int size = traversal.getSteps().size();
Step prev = null;
- /*for (int i = 0; i < size; i++) {
+ for (int i = 0; i < size; i++) {
final Step curr = traversal.getSteps().get(i);
if (curr instanceof CountGlobalStep && i < size - 1) {
final Step next = traversal.getSteps().get(i + 1);
if (next instanceof IsStep && !(prev instanceof RangeGlobalStep)) { // if a RangeStep was provided, assume that the user knows what he's doing
final IsStep isStep = (IsStep) next;
- final Object value = isStep.getPredicate().getValue();
- final BiPredicate predicate = isStep.getPredicate().getBiPredicate();
- if (value instanceof Number) {
- final long highRangeOffset = INCREASED_OFFSET_SCALAR_PREDICATES.contains(predicate) ? 1L : 0L;
- final long highRange = ((Number) value).longValue() + highRangeOffset;
- TraversalHelper.insertBeforeStep(new RangeGlobalStep<>(traversal, 0L, highRange), curr, traversal);
- i++;
- } else {
- final Long highRangeOffset = RANGE_PREDICATES.get(predicate);
- if (value instanceof Collection && highRangeOffset != null) {
- final Object high = Collections.max((Collection) value);
- if (high instanceof Number) {
- final long highRange = ((Number) high).longValue() + highRangeOffset;
- TraversalHelper.insertBeforeStep(new RangeGlobalStep<>(traversal, 0L, highRange), curr, traversal);
- i++;
+ Long highRange = null;
+ for (P p : (Iterable<P>) isStep.getPredicates()) {
+ final Object value = p.getValue();
+ final BiPredicate predicate = p.getBiPredicate();
+ if (value instanceof Number) {
+ final long highRangeOffset = INCREASED_OFFSET_SCALAR_PREDICATES.contains(predicate) ? 1L : 0L;
+ final Long highRangeCandidate = ((Number) value).longValue() + highRangeOffset;
+ highRange = highRange == null || highRangeCandidate > highRange ? highRangeCandidate : highRange;
+ } else {
+ final Long highRangeOffset = RANGE_PREDICATES.get(predicate);
+ if (value instanceof Collection && highRangeOffset != null) {
+ final Object high = Collections.max((Collection) value);
+ if (high instanceof Number) {
+ final Long highRangeCandidate = ((Number) high).longValue() + highRangeOffset;
+ highRange = highRange == null || highRangeCandidate > highRange ? highRangeCandidate : highRange;
+ }
}
}
}
+ if (highRange != null) {
+ TraversalHelper.insertBeforeStep(new RangeGlobalStep<>(traversal, 0L, highRange), curr, traversal);
+ i++;
+ }
}
}
prev = curr;
- } */
+ }
}
public static RangeByIsCountStrategy instance() {
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/e330ce39/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/RangeByIsCountStrategyTest.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/RangeByIsCountStrategyTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/RangeByIsCountStrategyTest.java
index efc8fd0..fff8a8e 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/RangeByIsCountStrategyTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/RangeByIsCountStrategyTest.java
@@ -24,14 +24,10 @@ import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategies;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
import org.apache.tinkerpop.gremlin.process.traversal.step.filter.HasTraversalStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.filter.RangeGlobalStep;
-import org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.RangeByIsCountStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.util.DefaultTraversalStrategies;
import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper;
-import org.apache.tinkerpop.gremlin.structure.Compare;
-import org.apache.tinkerpop.gremlin.structure.Contains;
import org.apache.tinkerpop.gremlin.structure.P;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Test;
import org.junit.experimental.runners.Enclosed;
import org.junit.runner.RunWith;
@@ -40,10 +36,11 @@ import org.junit.runners.Parameterized;
import java.util.Arrays;
import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;
-import java.util.function.BiPredicate;
+import static org.apache.tinkerpop.gremlin.structure.P.*;
import static org.junit.Assert.assertEquals;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
/**
* @author Daniel Kuppitz (http://gremlin.guru)
@@ -64,12 +61,9 @@ public class RangeByIsCountStrategyTest {
public String name;
@Parameterized.Parameter(value = 1)
- public BiPredicate predicate;
+ public Object predicate;
@Parameterized.Parameter(value = 2)
- public Object value;
-
- @Parameterized.Parameter(value = 3)
public long expectedHighRange;
@Before
@@ -79,9 +73,8 @@ public class RangeByIsCountStrategyTest {
}
@Test
- @Ignore
public void shouldApplyStrategy() {
- doTest(predicate, value, expectedHighRange);
+ doTest(predicate, expectedHighRange);
}
}
@@ -97,12 +90,9 @@ public class RangeByIsCountStrategyTest {
public String name;
@Parameterized.Parameter(value = 1)
- public BiPredicate predicate;
+ public Object predicate;
@Parameterized.Parameter(value = 2)
- public Object value;
-
- @Parameterized.Parameter(value = 3)
public long expectedHighRange;
@Before
@@ -112,9 +102,8 @@ public class RangeByIsCountStrategyTest {
}
@Test
- @Ignore
public void shouldApplyStrategy() {
- doTest(predicate, value, expectedHighRange);
+ doTest(predicate, expectedHighRange);
}
}
@@ -127,7 +116,6 @@ public class RangeByIsCountStrategyTest {
}
@Test
- @Ignore
public void nestedCountEqualsNullShouldLimitToOne() {
final AtomicInteger counter = new AtomicInteger(0);
final Traversal traversal = __.out().has(__.outE("created").count().is(0));
@@ -157,9 +145,16 @@ public class RangeByIsCountStrategyTest {
traversal.asAdmin().setEngine(traversalEngine);
}
- public void doTest(final BiPredicate predicate, final Object value, final long expectedHighRange) {
+ public void doTest(final Object predicate, final long expectedHighRange) {
final AtomicInteger counter = new AtomicInteger(0);
- final Traversal traversal = __.out().count().is(P.test(predicate,value));
+ final Traversal traversal;
+ if (predicate instanceof P) {
+ traversal = __.out().count().is(new P[]{(P) predicate});
+ } else if (predicate instanceof P[]) {
+ traversal = __.out().count().is((P[]) predicate);
+ } else {
+ traversal = __.out().count().is(predicate);
+ }
applyRangeByIsCountStrategy(traversal);
final List<RangeGlobalStep> steps = TraversalHelper.getStepsOfClass(RangeGlobalStep.class, traversal.asAdmin());
@@ -177,16 +172,16 @@ public class RangeByIsCountStrategyTest {
static Iterable<Object[]> generateTestParameters() {
return Arrays.asList(new Object[][]{
- {"countEqualsNullShouldLimitToOne", Compare.eq, 0l, 1l},
- {"countNotEqualsFourShouldLimitToFive", Compare.neq, 4l, 5l},
- {"countLessThanOrEqualThreeShouldLimitToFour", Compare.lte, 3l, 4l},
- {"countLessThanThreeShouldLimitToThree", Compare.lt, 3l, 3l},
- {"countGreaterThanTwoShouldLimitToThree", Compare.gt, 2l, 3l},
- {"countGreaterThanOrEqualTwoShouldLimitToTwo", Compare.gte, 2l, 2l},
- //{"countInsideTwoAndFourShouldLimitToFour", Compare.inside, Arrays.asList(2l, 4l), 4l},
- //{"countOutsideTwoAndFourShouldLimitToFive", Compare.outside, Arrays.asList(2l, 4l), 5l},
- {"countWithinTwoSixFourShouldLimitToSeven", Contains.within, Arrays.asList(2l, 6l, 4l), 7l},
- {"countWithoutTwoSixFourShouldLimitToSix", Contains.without, Arrays.asList(2l, 6l, 4l), 6l}});
+ {"countEqualsNullShouldLimitToOne", eq(0l), 1l},
+ {"countNotEqualsFourShouldLimitToFive", neq(4l), 5l},
+ {"countLessThanOrEqualThreeShouldLimitToFour", lte(3l), 4l},
+ {"countLessThanThreeShouldLimitToThree", lt(3l), 3l},
+ {"countGreaterThanTwoShouldLimitToThree", gt(2l), 3l},
+ {"countGreaterThanOrEqualTwoShouldLimitToTwo", gte(2l), 2l},
+ {"countInsideTwoAndFourShouldLimitToFour", inside(2l, 4l), 4l},
+ {"countOutsideTwoAndFourShouldLimitToFive", outside(2l, 4l), 5l},
+ {"countWithinTwoSixFourShouldLimitToSeven", within(2l, 6l, 4l), 7l},
+ {"countWithoutTwoSixFourShouldLimitToSix", without(2l, 6l, 4l), 6l}});
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/e330ce39/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphTest.java
----------------------------------------------------------------------
diff --git a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphTest.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphTest.java
index 3bbd6b3..2f61e7f 100644
--- a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphTest.java
+++ b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphTest.java
@@ -145,16 +145,7 @@ public class TinkerGraphTest {
@Ignore
public void testPlayDK() throws Exception {
GraphTraversalSource g = TinkerFactory.createModern().traversal();
- Traversal t = g.V().hasLabel("person").as("person").local(bothE().label().groupCount("x").cap("x")).as("relations").select().by("name").by();
- t.forEachRemaining(System.out::println);
- System.out.println("--");
-
- t = g.V().match("a",
- as("a").out("knows").as("b"),
- as("b").out("created").has("name", "lop"),
- as("b").match("a1",
- as("a1").out("created").as("b1"),
- as("b1").in("created").as("c1")).select("c1").as("c")).<String>select().by("name");
+ Traversal t = g.V().<Integer>values("age").is(P.gte(29)).is(P.lt(34));
t.forEachRemaining(System.out::println);
}
[35/50] [abbrv] incubator-tinkerpop git commit: TraversalSideEffects
now make use of Java8 Optional. Less code to maintain and easier to
understand semantics for users.
Posted by sp...@apache.org.
TraversalSideEffects now make use of Java8 Optional. Less code to maintain and easier to understand semantics for users.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/4cfa7f6b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/4cfa7f6b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/4cfa7f6b
Branch: refs/heads/variables
Commit: 4cfa7f6b42dbaf3c8c12d62b0779004a607ed934
Parents: 0ee87f8
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Thu Apr 30 12:44:27 2015 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Thu Apr 30 12:44:49 2015 -0600
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
.../traversal/VertexTraversalSideEffects.java | 13 +----
.../process/traversal/TraversalSideEffects.java | 51 +++-----------------
.../gremlin/process/traversal/Traverser.java | 2 +-
.../traversal/step/filter/ExceptStep.java | 2 +-
.../traversal/step/filter/RetainStep.java | 2 +-
.../step/sideEffect/AggregateStep.java | 16 +++---
.../sideEffect/GroupCountSideEffectStep.java | 12 ++---
.../step/sideEffect/GroupSideEffectStep.java | 17 +++----
.../traversal/step/sideEffect/ProfileStep.java | 16 +++---
.../step/sideEffect/SideEffectCapStep.java | 6 +--
.../traversal/step/sideEffect/StoreStep.java | 12 ++---
.../step/sideEffect/TreeSideEffectStep.java | 2 +-
.../util/DefaultTraversalSideEffects.java | 27 +++--------
.../util/EmptyTraversalSideEffects.java | 4 +-
.../traversal/TraversalSideEffectsTest.java | 6 +--
.../traversal/step/sideEffect/ProfileTest.java | 10 ++--
.../step/sideEffect/SideEffectTest.java | 4 +-
.../traversal/step/sideEffect/SubgraphTest.java | 2 +-
19 files changed, 71 insertions(+), 134 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/4cfa7f6b/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 5290b61..9fc55cf 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -25,6 +25,7 @@ image::http://www.tinkerpop.com/docs/current/images/gremlin-hindu.png[width=225]
TinkerPop 3.0.0.M9 (NOT OFFICIALLY RELEASED YET)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+* `TraversalSideEffects` now implements `Optional` semantics. Less code as Java8 provides the helper methods.
* `TraversalScriptSupplier` now takes an `Object` var args for setting `ScriptEngine` bindings if needed.
* `Compare` is now more lenient on `Number`-types.
* Removed `Compare.inside` and `Compare.outside` as they are not primitive comparators and should be composed from primitives.
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/4cfa7f6b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/VertexTraversalSideEffects.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/VertexTraversalSideEffects.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/VertexTraversalSideEffects.java
index 272de75..d4bb2cb 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/VertexTraversalSideEffects.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/VertexTraversalSideEffects.java
@@ -73,22 +73,13 @@ public final class VertexTraversalSideEffects implements TraversalSideEffects {
}
@Override
- public boolean exists(final String key) {
- return this.objectMap.containsKey(key);
- }
-
- @Override
public void set(final String key, final Object value) {
throw EXCEPTION;
}
@Override
- public <V> V get(final String key) throws IllegalArgumentException {
- final V value = (V) this.objectMap.get(key);
- if (null != value)
- return value;
- else
- throw TraversalSideEffects.Exceptions.sideEffectDoesNotExist(key);
+ public <V> Optional<V> get(final String key) throws IllegalArgumentException {
+ return Optional.ofNullable((V) this.objectMap.get(key));
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/4cfa7f6b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalSideEffects.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalSideEffects.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalSideEffects.java
index 9ef9b28..ebdddcf 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalSideEffects.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalSideEffects.java
@@ -24,7 +24,6 @@ import java.io.Serializable;
import java.util.Optional;
import java.util.Set;
import java.util.function.BiConsumer;
-import java.util.function.Consumer;
import java.util.function.Supplier;
import java.util.function.UnaryOperator;
@@ -36,17 +35,6 @@ public interface TraversalSideEffects extends Cloneable, Serializable {
public static final String SIDE_EFFECTS = "gremlin.traversal.sideEffects";
/**
- * Determines if the {@link TraversalSideEffects} contains the respective key.
- * If the key references a stored {@link java.util.function.Supplier}, then it should return true as it will be dynamically created on get().
- *
- * @param key the key to check for
- * @return whether the key exists in the sideEffects
- */
- public default boolean exists(final String key) {
- return this.keys().contains(key);
- }
-
- /**
* Set the specified key to the specified value.
* If a {@link java.util.function.Supplier} is provided, it is NOT assumed to be a supplier as set by registerSupplier().
*
@@ -57,7 +45,7 @@ public interface TraversalSideEffects extends Cloneable, Serializable {
/**
* Get the sideEffect associated with the provided key.
- * If the sideEffect contains an object for the key, return it.
+ * If the sideEffect contains an object for the key, return it in an {@link Optional}.
* Else if the sideEffect has a registered {@link java.util.function.Supplier} for that key, generate the object, store the object in the sideEffects, and return it.
*
* @param key the key to get the value for
@@ -65,31 +53,7 @@ public interface TraversalSideEffects extends Cloneable, Serializable {
* @return the value associated with key
* @throws IllegalArgumentException if the key does not reference an object or a registered supplier.
*/
- public <V> V get(final String key) throws IllegalArgumentException;
-
- /**
- * Return the value associated with the key or return the provided otherValue.
- * The otherValue will not be stored in the sideEffect.
- *
- * @param key the key to get the value for
- * @param otherValue if not value is associated with key, return the other value.
- * @param <V> the type of the value to get
- * @return the value associated with the key or the otherValue
- */
- public default <V> V orElse(final String key, final V otherValue) {
- return this.exists(key) ? this.get(key) : otherValue;
- }
-
- /**
- * If a value or registered {@link java.util.function.Supplier} exists for the provided key, consume it with the provided consumer.
- *
- * @param key the key to the value
- * @param consumer the consumer to process the value
- * @param <V> the type of the value to consume
- */
- public default <V> void ifPresent(final String key, final Consumer<V> consumer) {
- if (this.exists(key)) consumer.accept(this.get(key));
- }
+ public <V> Optional<V> get(final String key) throws IllegalArgumentException;
/**
* Remove both the value and registered {@link java.util.function.Supplier} associated with provided key.
@@ -156,8 +120,9 @@ public interface TraversalSideEffects extends Cloneable, Serializable {
* @return the object that is either retrieved, generated, or supplier via orCreate
*/
public default <V> V getOrCreate(final String key, final Supplier<V> orCreate) {
- if (this.exists(key))
- return this.<V>get(key);
+ final Optional<V> optional = this.get(key);
+ if (optional.isPresent())
+ return optional.get();
final Optional<Supplier<V>> with = this.getRegisteredSupplier(key);
if (with.isPresent()) {
final V v = with.get().get();
@@ -173,7 +138,7 @@ public interface TraversalSideEffects extends Cloneable, Serializable {
////////////
public default <V> void forEach(final BiConsumer<String, V> biConsumer) {
- this.keys().forEach(key -> biConsumer.accept(key, this.get(key)));
+ this.keys().forEach(key -> biConsumer.accept(key, this.<V>get(key).get()));
}
/**
@@ -214,10 +179,6 @@ public interface TraversalSideEffects extends Cloneable, Serializable {
return new IllegalArgumentException("Side effect value can not be null");
}
- public static IllegalArgumentException sideEffectDoesNotExist(final String key) {
- return new IllegalArgumentException("Side effects do not have a value for provided key: " + key);
- }
-
public static UnsupportedOperationException dataTypeOfSideEffectValueNotSupported(final Object val) {
return new UnsupportedOperationException(String.format("Side effect value [%s] is of type %s is not supported", val, val.getClass()));
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/4cfa7f6b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Traverser.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Traverser.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Traverser.java
index 3ded892..4aed398 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Traverser.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Traverser.java
@@ -98,7 +98,7 @@ public interface Traverser<T> extends Serializable, Comparable<Traverser<T>>, Cl
* @return the object in the sideEffects of the respective key
*/
public default <A> A sideEffects(final String sideEffectKey) {
- return this.asAdmin().getSideEffects().get(sideEffectKey);
+ return this.asAdmin().getSideEffects().<A>get(sideEffectKey).get();
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/4cfa7f6b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/ExceptStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/ExceptStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/ExceptStep.java
index 21ea5d3..8ad0749 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/ExceptStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/ExceptStep.java
@@ -67,7 +67,7 @@ public final class ExceptStep<S> extends FilterStep<S> {
protected boolean filter(final Traverser.Admin<S> traverser) {
switch (this.choice) {
case 0: {
- final Object except = traverser.asAdmin().getSideEffects().exists(this.sideEffectKeyOrPathLabel) ?
+ final Object except = traverser.asAdmin().getSideEffects().get(this.sideEffectKeyOrPathLabel).isPresent() ?
traverser.sideEffects(this.sideEffectKeyOrPathLabel) :
traverser.path(this.sideEffectKeyOrPathLabel);
return except instanceof Collection ?
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/4cfa7f6b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/RetainStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/RetainStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/RetainStep.java
index e056380..06b8a62 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/RetainStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/RetainStep.java
@@ -67,7 +67,7 @@ public final class RetainStep<S> extends FilterStep<S> {
protected boolean filter(final Traverser.Admin<S> traverser) {
switch (this.choice) {
case 0: {
- final Object retain = traverser.asAdmin().getSideEffects().exists(this.sideEffectKeyOrPathLabel) ?
+ final Object retain = traverser.asAdmin().getSideEffects().get(this.sideEffectKeyOrPathLabel).isPresent() ?
traverser.sideEffects(this.sideEffectKeyOrPathLabel) :
traverser.path(this.sideEffectKeyOrPathLabel);
return retain instanceof Collection ?
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/4cfa7f6b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/AggregateStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/AggregateStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/AggregateStep.java
index 502037e..996357c 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/AggregateStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/AggregateStep.java
@@ -19,21 +19,21 @@
package org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect;
import org.apache.commons.configuration.Configuration;
-import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.computer.KeyValue;
import org.apache.tinkerpop.gremlin.process.computer.MapReduce;
import org.apache.tinkerpop.gremlin.process.computer.traversal.TraversalVertexProgram;
import org.apache.tinkerpop.gremlin.process.computer.traversal.VertexTraversalSideEffects;
import org.apache.tinkerpop.gremlin.process.computer.util.StaticMapReduce;
-import org.apache.tinkerpop.gremlin.process.traversal.step.SideEffectCapable;
-import org.apache.tinkerpop.gremlin.process.traversal.step.util.CollectingBarrierStep;
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.step.MapReducer;
+import org.apache.tinkerpop.gremlin.process.traversal.step.SideEffectCapable;
import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalParent;
-import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper;
-import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalUtil;
-import org.apache.tinkerpop.gremlin.process.traversal.traverser.TraverserRequirement;
import org.apache.tinkerpop.gremlin.process.traversal.step.util.BulkSet;
+import org.apache.tinkerpop.gremlin.process.traversal.step.util.CollectingBarrierStep;
+import org.apache.tinkerpop.gremlin.process.traversal.traverser.TraverserRequirement;
import org.apache.tinkerpop.gremlin.process.traversal.traverser.util.TraverserSet;
+import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper;
+import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalUtil;
import org.apache.tinkerpop.gremlin.structure.Vertex;
import org.apache.tinkerpop.gremlin.util.function.BulkSetSupplier;
@@ -87,7 +87,7 @@ public final class AggregateStep<S> extends CollectingBarrierStep<S> implements
public void barrierConsumer(final TraverserSet<S> traverserSet) {
traverserSet.forEach(traverser ->
TraversalHelper.addToCollection(
- traverser.getSideEffects().get(this.sideEffectKey),
+ traverser.getSideEffects().<Collection<Object>>get(this.sideEffectKey).get(),
TraversalUtil.applyNullable(traverser, this.aggregateTraversal),
traverser.bulk()));
}
@@ -142,7 +142,7 @@ public final class AggregateStep<S> extends CollectingBarrierStep<S> implements
@Override
public void map(final Vertex vertex, final MapEmitter<NullObject, Object> emitter) {
- VertexTraversalSideEffects.of(vertex).<Collection<?>>orElse(this.sideEffectKey, Collections.emptyList()).forEach(emitter::emit);
+ VertexTraversalSideEffects.of(vertex).<Collection<?>>get(this.sideEffectKey).ifPresent(list -> list.forEach(emitter::emit));
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/4cfa7f6b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroupCountSideEffectStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroupCountSideEffectStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroupCountSideEffectStep.java
index 5a80c4f..de88730 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroupCountSideEffectStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroupCountSideEffectStep.java
@@ -19,20 +19,20 @@
package org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect;
import org.apache.commons.configuration.Configuration;
-import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
-import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
import org.apache.tinkerpop.gremlin.process.computer.KeyValue;
import org.apache.tinkerpop.gremlin.process.computer.MapReduce;
import org.apache.tinkerpop.gremlin.process.computer.traversal.TraversalVertexProgram;
import org.apache.tinkerpop.gremlin.process.computer.traversal.VertexTraversalSideEffects;
import org.apache.tinkerpop.gremlin.process.computer.util.StaticMapReduce;
-import org.apache.tinkerpop.gremlin.process.traversal.step.SideEffectCapable;
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
import org.apache.tinkerpop.gremlin.process.traversal.step.MapReducer;
+import org.apache.tinkerpop.gremlin.process.traversal.step.SideEffectCapable;
import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalParent;
+import org.apache.tinkerpop.gremlin.process.traversal.step.util.MapHelper;
+import org.apache.tinkerpop.gremlin.process.traversal.traverser.TraverserRequirement;
import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper;
import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalUtil;
-import org.apache.tinkerpop.gremlin.process.traversal.traverser.TraverserRequirement;
-import org.apache.tinkerpop.gremlin.process.traversal.step.util.MapHelper;
import org.apache.tinkerpop.gremlin.structure.Vertex;
import org.apache.tinkerpop.gremlin.util.function.HashMapSupplier;
@@ -139,7 +139,7 @@ public final class GroupCountSideEffectStep<S, E> extends SideEffectStep<S> impl
@Override
public void map(final Vertex vertex, final MapEmitter<E, Long> emitter) {
- VertexTraversalSideEffects.of(vertex).<Map<E, Number>>orElse(this.sideEffectKey, Collections.emptyMap()).forEach((k, v) -> emitter.emit(k, v.longValue()));
+ VertexTraversalSideEffects.of(vertex).<Map<E, Number>>get(this.sideEffectKey).ifPresent(map -> map.forEach((k, v) -> emitter.emit(k, v.longValue())));
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/4cfa7f6b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroupSideEffectStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroupSideEffectStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroupSideEffectStep.java
index d344953..57fbc6f 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroupSideEffectStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroupSideEffectStep.java
@@ -19,29 +19,28 @@
package org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect;
import org.apache.commons.configuration.Configuration;
-import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
-import org.apache.tinkerpop.gremlin.process.traversal.TraversalEngine;
-import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
import org.apache.tinkerpop.gremlin.process.computer.KeyValue;
import org.apache.tinkerpop.gremlin.process.computer.MapReduce;
import org.apache.tinkerpop.gremlin.process.computer.traversal.TraversalVertexProgram;
import org.apache.tinkerpop.gremlin.process.computer.traversal.VertexTraversalSideEffects;
-import org.apache.tinkerpop.gremlin.process.traversal.step.SideEffectCapable;
-import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalMatrix;
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.TraversalEngine;
+import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
import org.apache.tinkerpop.gremlin.process.traversal.step.EngineDependent;
import org.apache.tinkerpop.gremlin.process.traversal.step.MapReducer;
+import org.apache.tinkerpop.gremlin.process.traversal.step.SideEffectCapable;
import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalParent;
+import org.apache.tinkerpop.gremlin.process.traversal.step.util.BulkSet;
+import org.apache.tinkerpop.gremlin.process.traversal.traverser.TraverserRequirement;
import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper;
+import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalMatrix;
import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalUtil;
-import org.apache.tinkerpop.gremlin.process.traversal.traverser.TraverserRequirement;
-import org.apache.tinkerpop.gremlin.process.traversal.step.util.BulkSet;
import org.apache.tinkerpop.gremlin.structure.Vertex;
import org.apache.tinkerpop.gremlin.structure.util.StringFactory;
import org.apache.tinkerpop.gremlin.util.function.HashMapSupplier;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
@@ -206,7 +205,7 @@ public final class GroupSideEffectStep<S, K, V, R> extends SideEffectStep<S> imp
@Override
public void map(final Vertex vertex, final MapEmitter<K, Collection<V>> emitter) {
- VertexTraversalSideEffects.of(vertex).<Map<K, Collection<V>>>orElse(this.sideEffectKey, Collections.emptyMap()).forEach(emitter::emit);
+ VertexTraversalSideEffects.of(vertex).<Map<K, Collection<V>>>get(this.sideEffectKey).ifPresent(map -> map.forEach(emitter::emit));
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/4cfa7f6b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/ProfileStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/ProfileStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/ProfileStep.java
index 4be3483..29cbfdf 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/ProfileStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/ProfileStep.java
@@ -18,17 +18,17 @@
*/
package org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect;
-import org.apache.tinkerpop.gremlin.process.traversal.Step;
-import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
-import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
import org.apache.tinkerpop.gremlin.process.computer.KeyValue;
import org.apache.tinkerpop.gremlin.process.computer.MapReduce;
import org.apache.tinkerpop.gremlin.process.computer.traversal.VertexTraversalSideEffects;
import org.apache.tinkerpop.gremlin.process.computer.util.StaticMapReduce;
-import org.apache.tinkerpop.gremlin.process.traversal.step.util.AbstractStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.util.EmptyStep;
+import org.apache.tinkerpop.gremlin.process.traversal.Step;
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
import org.apache.tinkerpop.gremlin.process.traversal.step.MapReducer;
import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalParent;
+import org.apache.tinkerpop.gremlin.process.traversal.step.util.AbstractStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.util.EmptyStep;
import org.apache.tinkerpop.gremlin.process.traversal.util.DependantMutableMetrics;
import org.apache.tinkerpop.gremlin.process.traversal.util.MutableMetrics;
import org.apache.tinkerpop.gremlin.process.traversal.util.StandardTraversalMetrics;
@@ -103,12 +103,12 @@ public final class ProfileStep<S> extends AbstractStep<S, S> implements MapReduc
while (!(t.asAdmin().getParent() instanceof EmptyStep)) {
t = t.asAdmin().getParent().asStep().getTraversal();
}
- traversalMetrics = t.asAdmin().getSideEffects().get(TraversalMetrics.METRICS_KEY);
+ traversalMetrics = t.asAdmin().getSideEffects().<StandardTraversalMetrics>get(TraversalMetrics.METRICS_KEY).get();
}
}
private void createTraversalMetricsSideEffectIfNecessary() {
- if (this.getTraversal().getSideEffects().exists(TraversalMetrics.METRICS_KEY)) {
+ if (this.getTraversal().getSideEffects().get(TraversalMetrics.METRICS_KEY).isPresent()) {
// Already initialized
return;
}
@@ -194,7 +194,7 @@ public final class ProfileStep<S> extends AbstractStep<S, S> implements MapReduc
@Override
public void map(final Vertex vertex, final MapEmitter<NullObject, StandardTraversalMetrics> emitter) {
- VertexTraversalSideEffects.of(vertex).<StandardTraversalMetrics>ifPresent(TraversalMetrics.METRICS_KEY, emitter::emit);
+ VertexTraversalSideEffects.of(vertex).<StandardTraversalMetrics>get(TraversalMetrics.METRICS_KEY).ifPresent(emitter::emit);
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/4cfa7f6b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SideEffectCapStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SideEffectCapStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SideEffectCapStep.java
index 32e7d86..c1759e1 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SideEffectCapStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SideEffectCapStep.java
@@ -20,8 +20,8 @@ package org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.step.util.SupplyingBarrierStep;
-import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper;
import org.apache.tinkerpop.gremlin.process.traversal.traverser.TraverserRequirement;
+import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper;
import java.util.ArrayList;
import java.util.Arrays;
@@ -67,14 +67,14 @@ public final class SideEffectCapStep<S, E> extends SupplyingBarrierStep<S, E> {
@Override
public E supply() {
return this.sideEffectKeys.size() == 1 ?
- this.getTraversal().asAdmin().getSideEffects().get(this.sideEffectKeys.get(0)) :
+ this.getTraversal().asAdmin().getSideEffects().<E>get(this.sideEffectKeys.get(0)).get() :
(E) this.getMapOfSideEffects();
}
public Map<String, Object> getMapOfSideEffects() {
final Map<String, Object> sideEffects = new HashMap<>();
for (final String sideEffectKey : this.sideEffectKeys) {
- sideEffects.put(sideEffectKey, this.getTraversal().asAdmin().getSideEffects().get(sideEffectKey));
+ this.getTraversal().asAdmin().getSideEffects().get(sideEffectKey).ifPresent(value -> sideEffects.put(sideEffectKey, value));
}
return sideEffects;
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/4cfa7f6b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/StoreStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/StoreStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/StoreStep.java
index 20c92d6..3c1a979 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/StoreStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/StoreStep.java
@@ -19,20 +19,20 @@
package org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect;
import org.apache.commons.configuration.Configuration;
-import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
-import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
import org.apache.tinkerpop.gremlin.process.computer.KeyValue;
import org.apache.tinkerpop.gremlin.process.computer.MapReduce;
import org.apache.tinkerpop.gremlin.process.computer.traversal.TraversalVertexProgram;
import org.apache.tinkerpop.gremlin.process.computer.traversal.VertexTraversalSideEffects;
import org.apache.tinkerpop.gremlin.process.computer.util.StaticMapReduce;
-import org.apache.tinkerpop.gremlin.process.traversal.step.SideEffectCapable;
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
import org.apache.tinkerpop.gremlin.process.traversal.step.MapReducer;
+import org.apache.tinkerpop.gremlin.process.traversal.step.SideEffectCapable;
import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalParent;
+import org.apache.tinkerpop.gremlin.process.traversal.step.util.BulkSet;
+import org.apache.tinkerpop.gremlin.process.traversal.traverser.TraverserRequirement;
import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper;
import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalUtil;
-import org.apache.tinkerpop.gremlin.process.traversal.traverser.TraverserRequirement;
-import org.apache.tinkerpop.gremlin.process.traversal.step.util.BulkSet;
import org.apache.tinkerpop.gremlin.structure.Vertex;
import org.apache.tinkerpop.gremlin.util.function.BulkSetSupplier;
@@ -140,7 +140,7 @@ public final class StoreStep<S> extends SideEffectStep<S> implements SideEffectC
@Override
public void map(final Vertex vertex, final MapEmitter<NullObject, Object> emitter) {
- VertexTraversalSideEffects.of(vertex).<Collection<?>>orElse(this.sideEffectKey, Collections.emptyList()).forEach(emitter::emit);
+ VertexTraversalSideEffects.of(vertex).<Collection<?>>get(this.sideEffectKey).ifPresent(list -> list.forEach(emitter::emit));
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/4cfa7f6b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/TreeSideEffectStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/TreeSideEffectStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/TreeSideEffectStep.java
index a423512..c4f1288 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/TreeSideEffectStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/TreeSideEffectStep.java
@@ -149,7 +149,7 @@ public final class TreeSideEffectStep<S> extends SideEffectStep<S> implements Si
@Override
public void map(final Vertex vertex, final MapEmitter<Object, Tree> emitter) {
- VertexTraversalSideEffects.of(vertex).<Tree<?>>ifPresent(this.sideEffectKey, tree -> tree.splitParents().forEach(branches -> emitter.emit(branches.keySet().iterator().next(), branches)));
+ VertexTraversalSideEffects.of(vertex).<Tree<?>>get(this.sideEffectKey).ifPresent(tree -> tree.splitParents().forEach(branches -> emitter.emit(branches.keySet().iterator().next(), branches)));
}
/*
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/4cfa7f6b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversalSideEffects.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversalSideEffects.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversalSideEffects.java
index fe8f83e..4eb463d 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversalSideEffects.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversalSideEffects.java
@@ -92,14 +92,6 @@ public class DefaultTraversalSideEffects implements TraversalSideEffects {
* {@inheritDoc}
*/
@Override
- public boolean exists(final String key) {
- return this.objectMap.containsKey(key) || this.supplierMap.containsKey(key);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
public void set(final String key, final Object value) {
SideEffectHelper.validateSideEffect(key, value);
this.objectMap.put(key, value);
@@ -109,17 +101,17 @@ public class DefaultTraversalSideEffects implements TraversalSideEffects {
* {@inheritDoc}
*/
@Override
- public <V> V get(final String key) throws IllegalArgumentException {
+ public <V> Optional<V> get(final String key) throws IllegalArgumentException {
final V value = (V) this.objectMap.get(key);
if (null != value)
- return value;
+ return Optional.of(value);
else {
if (this.supplierMap.containsKey(key)) {
final V v = (V) this.supplierMap.get(key).get();
this.objectMap.put(key, v);
- return v;
+ return Optional.of(v);
} else {
- throw TraversalSideEffects.Exceptions.sideEffectDoesNotExist(key);
+ return Optional.empty();
}
}
}
@@ -129,13 +121,10 @@ public class DefaultTraversalSideEffects implements TraversalSideEffects {
*/
@Override
public <V> V getOrCreate(final String key, final Supplier<V> orCreate) {
- if (this.objectMap.containsKey(key))
- return (V) this.objectMap.get(key);
- else if (this.supplierMap.containsKey(key)) {
- final V value = (V) this.supplierMap.get(key).get();
- this.objectMap.put(key, value);
- return value;
- } else {
+ final Optional<V> optional = this.get(key);
+ if (optional.isPresent())
+ return optional.get();
+ else {
final V value = orCreate.get();
this.objectMap.put(key, value);
return value;
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/4cfa7f6b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/EmptyTraversalSideEffects.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/EmptyTraversalSideEffects.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/EmptyTraversalSideEffects.java
index e82ac1f..39ce9a6 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/EmptyTraversalSideEffects.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/EmptyTraversalSideEffects.java
@@ -44,8 +44,8 @@ public final class EmptyTraversalSideEffects implements TraversalSideEffects {
}
@Override
- public <V> V get(final String key) throws IllegalArgumentException {
- throw TraversalSideEffects.Exceptions.sideEffectDoesNotExist(key);
+ public <V> Optional<V> get(final String key) throws IllegalArgumentException {
+ return Optional.empty();
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/4cfa7f6b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalSideEffectsTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalSideEffectsTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalSideEffectsTest.java
index 16bf2fe..bafda0c 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalSideEffectsTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalSideEffectsTest.java
@@ -38,11 +38,7 @@ public abstract class TraversalSideEffectsTest extends AbstractGremlinProcessTes
@LoadGraphWith(MODERN)
public void g_V_sideEffects() {
final TraversalSideEffects sideEffects = get_g_V_asAdmin_getSideEffects();
- try {
- assertFalse(sideEffects.get("a"));
- } catch (IllegalArgumentException e) {
- assertEquals(TraversalSideEffects.Exceptions.sideEffectDoesNotExist("a").getMessage(), e.getMessage());
- }
+ assertFalse(sideEffects.get("a").isPresent());
assertEquals(StringFactory.traversalSideEffectsString(sideEffects), sideEffects.toString());
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/4cfa7f6b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/ProfileTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/ProfileTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/ProfileTest.java
index eeea89e..01abfd5 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/ProfileTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/ProfileTest.java
@@ -59,7 +59,7 @@ public abstract class ProfileTest extends AbstractGremlinProcessTest {
traversal.iterate();
- final TraversalMetrics traversalMetrics = traversal.asAdmin().getSideEffects().get(TraversalMetrics.METRICS_KEY);
+ final TraversalMetrics traversalMetrics = traversal.asAdmin().getSideEffects().<TraversalMetrics>get(TraversalMetrics.METRICS_KEY).get();
traversalMetrics.toString(); // ensure no exceptions are thrown
Metrics metrics = traversalMetrics.getMetrics(0);
@@ -95,7 +95,7 @@ public abstract class ProfileTest extends AbstractGremlinProcessTest {
printTraversalForm(traversal);
traversal.iterate();
- final TraversalMetrics traversalMetrics = traversal.asAdmin().getSideEffects().get(TraversalMetrics.METRICS_KEY);
+ final TraversalMetrics traversalMetrics = traversal.asAdmin().getSideEffects().<TraversalMetrics>get(TraversalMetrics.METRICS_KEY).get();
traversalMetrics.toString(); // ensure no exceptions are thrown
Metrics metrics = traversalMetrics.getMetrics(0);
@@ -134,7 +134,7 @@ public abstract class ProfileTest extends AbstractGremlinProcessTest {
assertEquals("There should be 6 steps in this traversal (counting injected profile steps).", 6, traversal.asAdmin().getSteps().size());
- TraversalMetrics traversalMetrics = traversal.asAdmin().getSideEffects().get(TraversalMetrics.METRICS_KEY);
+ TraversalMetrics traversalMetrics = traversal.asAdmin().getSideEffects().<TraversalMetrics>get(TraversalMetrics.METRICS_KEY).get();
traversalMetrics.toString(); // ensure no exceptions are thrown
// Grab the second (sideEffect{sleep}) step and check the times.
@@ -168,7 +168,7 @@ public abstract class ProfileTest extends AbstractGremlinProcessTest {
traversal.iterate();
- final TraversalMetrics traversalMetrics = traversal.asAdmin().getSideEffects().get(TraversalMetrics.METRICS_KEY);
+ final TraversalMetrics traversalMetrics = traversal.asAdmin().getSideEffects().<TraversalMetrics>get(TraversalMetrics.METRICS_KEY).get();
traversalMetrics.toString(); // ensure no exceptions are thrown
Metrics metrics = traversalMetrics.getMetrics(0);
@@ -213,7 +213,7 @@ public abstract class ProfileTest extends AbstractGremlinProcessTest {
traversal.iterate();
- final TraversalMetrics traversalMetrics = traversal.asAdmin().getSideEffects().get(TraversalMetrics.METRICS_KEY);
+ final TraversalMetrics traversalMetrics = traversal.asAdmin().getSideEffects().<TraversalMetrics>get(TraversalMetrics.METRICS_KEY).get();
traversalMetrics.toString(); // ensure no exceptions are thrown
assertEquals("There should be 3 top-level metrics.", 3, traversalMetrics.getMetrics().size());
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/4cfa7f6b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SideEffectTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SideEffectTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SideEffectTest.java
index 8f42867..7d8cada 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SideEffectTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SideEffectTest.java
@@ -52,7 +52,7 @@ public abstract class SideEffectTest extends AbstractGremlinTest {
printTraversalForm(traversal);
assertEquals(traversal.next(), "marko");
assertFalse(traversal.hasNext());
- assertEquals(convertToVertexId("marko"), traversal.asAdmin().getSideEffects().<List<Vertex>>get("a").get(0).id());
+ assertEquals(convertToVertexId("marko"), traversal.asAdmin().getSideEffects().<List<Vertex>>get("a").get().get(0).id());
}
@Test
@@ -61,7 +61,7 @@ public abstract class SideEffectTest extends AbstractGremlinTest {
final Traversal<Vertex, String> traversal = get_g_VX1X_out_sideEffectXincr_cX_name(convertToVertexId("marko"));
printTraversalForm(traversal);
assert_g_v1_out_sideEffectXincr_cX_valueXnameX(traversal);
- assertEquals(new Integer(3), traversal.asAdmin().getSideEffects().<List<Integer>>get("c").get(0));
+ assertEquals(new Integer(3), traversal.asAdmin().getSideEffects().<List<Integer>>get("c").get().get(0));
}
private void assert_g_v1_out_sideEffectXincr_cX_valueXnameX(final Iterator<String> traversal) {
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/4cfa7f6b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SubgraphTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SubgraphTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SubgraphTest.java
index bdcf436..a3cc8ed 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SubgraphTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SubgraphTest.java
@@ -94,7 +94,7 @@ public abstract class SubgraphTest extends AbstractGremlinProcessTest {
final Traversal<Vertex, String> traversal = get_g_V_withSideEffectXsgX_repeatXbothEXcreatedX_subgraphXsgX_outVX_timesX5X_name_dedup(subgraph);
printTraversalForm(traversal);
checkResults(Arrays.asList("marko", "josh", "peter"), traversal);
- final Graph subGraph = traversal.asAdmin().getSideEffects().get("sg");
+ final Graph subGraph = traversal.asAdmin().getSideEffects().<Graph>get("sg").get();
assertVertexEdgeCounts(5, 4).accept(subGraph);
graphProvider.clear(subgraph, config);
[20/50] [abbrv] incubator-tinkerpop git commit: select() now works
off the path labels,
not via a static analysis of the traversal. Thanks Matt Frantz.
Posted by sp...@apache.org.
select() now works off the path labels, not via a static analysis of the traversal. Thanks Matt Frantz.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/c41b199d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/c41b199d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/c41b199d
Branch: refs/heads/variables
Commit: c41b199d2de45750b3e5a9f8dbe0bdfcc28450c4
Parents: cf1594c
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Thu Apr 30 09:06:23 2015 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Thu Apr 30 09:06:35 2015 -0600
----------------------------------------------------------------------
.../traversal/dsl/graph/GraphTraversal.java | 127 +++++++++++++++++--
.../gremlin/process/traversal/dsl/graph/__.java | 1 -
.../traversal/step/map/SelectOneStep.java | 6 +-
.../process/traversal/step/map/SelectStep.java | 26 ++--
.../optimization/RangeByIsCountStrategy.java | 7 +-
.../tinkerpop/gremlin/structure/Element.java | 2 +-
.../tinkerpop/gremlin/structure/Property.java | 4 +-
.../traversal/step/map/GroovySelectTest.groovy | 12 +-
.../process/AbstractGremlinProcessTest.java | 2 +-
.../process/traversal/step/map/SelectTest.java | 47 ++++++-
.../gremlin/structure/PropertyTest.java | 4 +-
.../tinkergraph/structure/TinkerGraphTest.java | 7 +-
12 files changed, 207 insertions(+), 38 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c41b199d/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
index ae0d99e..11a036b 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
@@ -18,22 +18,129 @@
*/
package org.apache.tinkerpop.gremlin.process.traversal.dsl.graph;
-import org.apache.tinkerpop.gremlin.process.traversal.*;
-import org.apache.tinkerpop.gremlin.process.traversal.lambda.*;
+import org.apache.tinkerpop.gremlin.process.traversal.Path;
+import org.apache.tinkerpop.gremlin.process.traversal.Scope;
+import org.apache.tinkerpop.gremlin.process.traversal.Step;
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
+import org.apache.tinkerpop.gremlin.process.traversal.lambda.ElementValueTraversal;
+import org.apache.tinkerpop.gremlin.process.traversal.lambda.FilterTraversal;
+import org.apache.tinkerpop.gremlin.process.traversal.lambda.FilterTraverserTraversal;
+import org.apache.tinkerpop.gremlin.process.traversal.lambda.IdentityTraversal;
+import org.apache.tinkerpop.gremlin.process.traversal.lambda.LoopTraversal;
+import org.apache.tinkerpop.gremlin.process.traversal.lambda.MapTraversal;
+import org.apache.tinkerpop.gremlin.process.traversal.lambda.MapTraverserTraversal;
+import org.apache.tinkerpop.gremlin.process.traversal.lambda.TokenTraversal;
+import org.apache.tinkerpop.gremlin.process.traversal.lambda.TrueTraversal;
import org.apache.tinkerpop.gremlin.process.traversal.step.ComparatorHolder;
import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalOptionParent;
import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalParent;
-import org.apache.tinkerpop.gremlin.process.traversal.step.branch.*;
-import org.apache.tinkerpop.gremlin.process.traversal.step.filter.*;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.*;
+import org.apache.tinkerpop.gremlin.process.traversal.step.branch.BranchStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.branch.ChooseStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.branch.LocalStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.branch.RepeatStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.branch.UnionStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.filter.AndStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.filter.CoinStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.filter.CyclicPathStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.filter.DedupGlobalStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.filter.DropStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.filter.ExceptStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.filter.HasStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.filter.HasTraversalStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.filter.IsStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.filter.LambdaFilterStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.filter.OrStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.filter.RangeGlobalStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.filter.RetainStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.filter.SampleGlobalStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.filter.SimplePathStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.filter.TimeLimitStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.filter.WhereStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.AddEdgeByPathStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.AddEdgeStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.AddVertexStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.CoalesceStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.CountGlobalStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.CountLocalStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.DedupLocalStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.EdgeOtherVertexStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.EdgeVertexStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.FoldStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.GroupCountStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.GroupStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.IdStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.KeyStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.LabelStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.LambdaFlatMapStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.LambdaMapStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.MaxGlobalStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.MaxLocalStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.MeanGlobalStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.MeanLocalStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.MinGlobalStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.MinLocalStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.OrderGlobalStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.OrderLocalStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.PathStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.PropertiesStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.PropertyMapStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.PropertyValueStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.RangeLocalStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.SackStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.SampleLocalStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.SelectOneStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.SelectStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.SumGlobalStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.SumLocalStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.TreeStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.UnfoldStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.VertexStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.map.match.MatchStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.*;
-import org.apache.tinkerpop.gremlin.process.traversal.step.util.*;
-import org.apache.tinkerpop.gremlin.structure.*;
+import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.AddPropertyStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.AggregateStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.GroupCountSideEffectStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.GroupSideEffectStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.IdentityStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.InjectStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.LambdaSideEffectStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.ProfileStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.SackElementValueStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.SackObjectStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.SideEffectCapStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.StartStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.StoreStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.SubgraphStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.TreeSideEffectStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.util.ElementFunctionComparator;
+import org.apache.tinkerpop.gremlin.process.traversal.step.util.ElementValueComparator;
+import org.apache.tinkerpop.gremlin.process.traversal.step.util.HasContainer;
+import org.apache.tinkerpop.gremlin.process.traversal.step.util.NoOpBarrierStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.util.TraversalComparator;
+import org.apache.tinkerpop.gremlin.process.traversal.step.util.Tree;
+import org.apache.tinkerpop.gremlin.structure.Direction;
+import org.apache.tinkerpop.gremlin.structure.Edge;
+import org.apache.tinkerpop.gremlin.structure.Element;
+import org.apache.tinkerpop.gremlin.structure.Order;
+import org.apache.tinkerpop.gremlin.structure.P;
+import org.apache.tinkerpop.gremlin.structure.Property;
+import org.apache.tinkerpop.gremlin.structure.PropertyType;
+import org.apache.tinkerpop.gremlin.structure.T;
+import org.apache.tinkerpop.gremlin.structure.Vertex;
+import org.apache.tinkerpop.gremlin.structure.VertexProperty;
import org.apache.tinkerpop.gremlin.util.function.ConstantSupplier;
-import java.util.*;
-import java.util.function.*;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.function.BiFunction;
+import java.util.function.BinaryOperator;
+import java.util.function.Consumer;
+import java.util.function.Function;
+import java.util.function.Predicate;
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c41b199d/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/__.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/__.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/__.java
index 4c4dc2a..4ade570 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/__.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/__.java
@@ -37,7 +37,6 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.function.BiFunction;
-import java.util.function.BiPredicate;
import java.util.function.BinaryOperator;
import java.util.function.Consumer;
import java.util.function.Function;
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c41b199d/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SelectOneStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SelectOneStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SelectOneStep.java
index 6f6fe77..f957c7a 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SelectOneStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SelectOneStep.java
@@ -38,7 +38,6 @@ public final class SelectOneStep<S, E> extends MapStep<S, E> implements Traversa
private final String selectLabel;
private Traversal.Admin<Object, Object> selectTraversal = new IdentityTraversal<>();
- private boolean requiresPaths = false;
public SelectOneStep(final Traversal.Admin traversal, final String selectLabel) {
super(traversal);
@@ -48,10 +47,7 @@ public final class SelectOneStep<S, E> extends MapStep<S, E> implements Traversa
@Override
protected E map(final Traverser.Admin<S> traverser) {
final S start = traverser.get();
- if (start instanceof Map && ((Map) start).containsKey(this.selectLabel))
- return (E) TraversalUtil.apply(((Map) start).get(this.selectLabel), this.selectTraversal);
- else
- return (E) TraversalUtil.apply(traverser.path().<Object>get(this.selectLabel), this.selectTraversal);
+ return (E) TraversalUtil.apply(start instanceof Map ? ((Map) start).get(this.selectLabel) : traverser.path().<Object>get(this.selectLabel), this.selectTraversal);
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c41b199d/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SelectStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SelectStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SelectStep.java
index 3c2bf76..60c4450 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SelectStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SelectStep.java
@@ -40,11 +40,10 @@ public final class SelectStep<S, E> extends MapStep<S, Map<String, E>> implement
protected TraversalRing<Object, Object> traversalRing = new TraversalRing<>();
private final List<String> selectLabels;
- private boolean requiresPaths = false;
public SelectStep(final Traversal.Admin traversal, final String... selectLabels) {
super(traversal);
- this.selectLabels = selectLabels.length == 0 ? TraversalHelper.getLabelsUpTo(this, this.traversal) : Arrays.asList(selectLabels);
+ this.selectLabels = Arrays.asList(selectLabels);
}
@Override
@@ -52,14 +51,6 @@ public final class SelectStep<S, E> extends MapStep<S, Map<String, E>> implement
final S start = traverser.get();
final Map<String, E> bindings = new LinkedHashMap<>();
- ////// PROCESS STEP BINDINGS
- final Path path = traverser.path();
- this.selectLabels.forEach(label -> {
- if (path.hasLabel(label))
- bindings.put(label, (E) TraversalUtil.apply(path.<Object>get(label), this.traversalRing.next()));
- });
-
- ////// PROCESS MAP BINDINGS
if (start instanceof Map) {
if (this.selectLabels.isEmpty())
((Map<String, Object>) start).forEach((k, v) -> bindings.put(k, (E) TraversalUtil.apply(v, this.traversalRing.next())));
@@ -68,6 +59,21 @@ public final class SelectStep<S, E> extends MapStep<S, Map<String, E>> implement
if (((Map) start).containsKey(label))
bindings.put(label, (E) TraversalUtil.apply(((Map) start).get(label), this.traversalRing.next()));
});
+ } else {
+ final Path path = traverser.path();
+ if (this.selectLabels.isEmpty()) {
+ path.forEach((object, labels) -> {
+ if (!labels.isEmpty()) {
+ final E e = (E) TraversalUtil.apply(object, this.traversalRing.next());
+ labels.forEach(label -> bindings.put(label, e));
+ }
+ });
+ } else {
+ this.selectLabels.forEach(label -> {
+ if (path.hasLabel(label))
+ bindings.put(label, (E) TraversalUtil.apply(path.<Object>get(label), this.traversalRing.next()));
+ });
+ }
}
this.traversalRing.reset();
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c41b199d/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/RangeByIsCountStrategy.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/RangeByIsCountStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/RangeByIsCountStrategy.java
index 7781f59..32abcd1 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/RangeByIsCountStrategy.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/RangeByIsCountStrategy.java
@@ -30,7 +30,12 @@ import org.apache.tinkerpop.gremlin.structure.Compare;
import org.apache.tinkerpop.gremlin.structure.Contains;
import org.apache.tinkerpop.gremlin.structure.P;
-import java.util.*;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.EnumSet;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
import java.util.function.BiPredicate;
/**
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c41b199d/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Element.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Element.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Element.java
index d2e94b9..8ba3c62 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Element.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Element.java
@@ -91,7 +91,7 @@ public abstract interface Element {
* @throws NoSuchElementException if the property does not exist on the {@code Element}.
*/
public default <V> V value(final String key) throws NoSuchElementException {
- return this.<V>property(key).orElseThrow(() -> Property.Exceptions.propertyDoesNotExist(key));
+ return this.<V>property(key).orElseThrow(() -> Property.Exceptions.propertyDoesNotExist(this,key));
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c41b199d/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Property.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Property.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Property.java
index 7cd17ed..33599f9 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Property.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Property.java
@@ -151,8 +151,8 @@ public interface Property<V> {
return new IllegalStateException("The property does not exist as it has no key, value, or associated element");
}
- public static IllegalStateException propertyDoesNotExist(final String key) {
- return new IllegalStateException("The property does not exist as the key has no associated value: " + key);
+ public static IllegalStateException propertyDoesNotExist(final Element element, final String key) {
+ return new IllegalStateException("The property does not exist as the key has no associated value for the provided element: " + element + ":" + key);
}
public static IllegalArgumentException dataTypeOfPropertyValueNotSupported(final Object val) {
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c41b199d/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovySelectTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovySelectTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovySelectTest.groovy
index 8c2c75f..02d4956 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovySelectTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovySelectTest.groovy
@@ -18,10 +18,10 @@
*/
package org.apache.tinkerpop.gremlin.process.traversal.step.map
+import org.apache.tinkerpop.gremlin.process.UseEngine
import org.apache.tinkerpop.gremlin.process.computer.ComputerTestHelper
import org.apache.tinkerpop.gremlin.process.traversal.Traversal
import org.apache.tinkerpop.gremlin.process.traversal.TraversalEngine
-import org.apache.tinkerpop.gremlin.process.UseEngine
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__
import org.apache.tinkerpop.gremlin.structure.Edge
import org.apache.tinkerpop.gremlin.structure.Order
@@ -95,6 +95,11 @@ public abstract class GroovySelectTest {
return g.V().hasLabel('person').as('person').local(__.bothE().label().groupCount()).as('relations').select().by('name').by()
}
+ @Override
+ public Traversal<Vertex, Map<String, Vertex>> get_g_V_chooseXoutE_count_isX0X__asXaX__asXbXX_select() {
+ return g.V().choose(__.outE().count().is(0L), __.as('a'), __.as('b')).select();
+ }
+
//
@Override
@@ -258,6 +263,11 @@ public abstract class GroovySelectTest {
return null
}
+ @Override
+ public Traversal<Vertex, Map<String, Vertex>> get_g_V_chooseXoutE_count_isX0X__asXaX__asXbXX_select() {
+ ComputerTestHelper.compute("g.V.choose(__.outE.count.is(0L), __.as('a'), __.as('b')).select()", g)
+ }
+
//
@Override
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c41b199d/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/AbstractGremlinProcessTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/AbstractGremlinProcessTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/AbstractGremlinProcessTest.java
index 949dc92..494dbf8 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/AbstractGremlinProcessTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/AbstractGremlinProcessTest.java
@@ -102,7 +102,7 @@ public abstract class AbstractGremlinProcessTest extends AbstractGremlinTest {
checkResults(list, traversal);
}
- private <A, B> boolean checkMap(final Map<A, B> expectedMap, final Map<A, B> actualMap) {
+ public static <A, B> boolean checkMap(final Map<A, B> expectedMap, final Map<A, B> actualMap) {
final List<Map.Entry<A, B>> actualList = actualMap.entrySet().stream().sorted((a, b) -> a.getKey().toString().compareTo(b.getKey().toString())).collect(Collectors.toList());
final List<Map.Entry<A, B>> expectedList = expectedMap.entrySet().stream().sorted((a, b) -> a.getKey().toString().compareTo(b.getKey().toString())).collect(Collectors.toList());
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c41b199d/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SelectTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SelectTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SelectTest.java
index b9dba83..ac3f9ee 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SelectTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SelectTest.java
@@ -21,9 +21,9 @@ package org.apache.tinkerpop.gremlin.process.traversal.step.map;
import org.apache.tinkerpop.gremlin.LoadGraphWith;
import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest;
import org.apache.tinkerpop.gremlin.process.IgnoreEngine;
+import org.apache.tinkerpop.gremlin.process.UseEngine;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.TraversalEngine;
-import org.apache.tinkerpop.gremlin.process.UseEngine;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
import org.apache.tinkerpop.gremlin.structure.Edge;
import org.apache.tinkerpop.gremlin.structure.Order;
@@ -31,7 +31,12 @@ import org.apache.tinkerpop.gremlin.structure.Vertex;
import org.junit.Ignore;
import org.junit.Test;
-import java.util.*;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.CREW;
import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN;
@@ -67,6 +72,8 @@ public abstract class SelectTest extends AbstractGremlinProcessTest {
public abstract Traversal<Vertex, Map<String, Object>> get_g_V_hasLabelXpersonX_asXpersonX_localXbothE_label_groupCountX_asXrelationsX_select_byXnameX_by();
+ public abstract Traversal<Vertex, Map<String, Vertex>> get_g_V_chooseXoutE_count_isX0X__asXaX__asXbXX_select();
+
// below we original back()-tests
public abstract Traversal<Vertex, Vertex> get_g_VX1X_asXhereX_out_selectXhereX(final Object v1Id);
@@ -211,6 +218,7 @@ public abstract class SelectTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
@IgnoreEngine(TraversalEngine.Type.COMPUTER)
+ @Ignore
public void g_V_label_groupCount_asXxX_select() {
final Traversal<Vertex, Map<String, Object>> traversal = get_g_V_label_groupCount_asXxX_select();
printTraversalForm(traversal);
@@ -229,7 +237,8 @@ public abstract class SelectTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
- @Ignore("There is a HashMap to Element cast problem happening here for some reason in both OLTP and OLAP") // TODO: dkuppitz this has been ignored for some time now -- don't know if the test is bad or the code is bad.
+ @Ignore("There is a HashMap to Element cast problem happening here for some reason in both OLTP and OLAP")
+ // TODO: dkuppitz this has been ignored for some time now -- don't know if the test is bad or the code is bad.
@IgnoreEngine(TraversalEngine.Type.COMPUTER)
public void g_V_hasLabelXpersonX_asXpersonX_localXbothE_label_groupCountX_asXrelationsX_select_byXnameX_by() {
final Traversal<Vertex, Map<String, Object>> traversal = get_g_V_hasLabelXpersonX_asXpersonX_localXbothE_label_groupCountX_asXrelationsX_select_byXnameX_by();
@@ -271,6 +280,33 @@ public abstract class SelectTest extends AbstractGremlinProcessTest {
assertEquals(4, persons.size());
}
+ @Test
+ @LoadGraphWith(MODERN)
+ public void g_V_chooseXoutE_count_isX0X__asXaX__asXbXX_select() {
+ final Traversal<Vertex, Map<String, Vertex>> traversal = get_g_V_chooseXoutE_count_isX0X__asXaX__asXbXX_select();
+ printTraversalForm(traversal);
+ int counter = 0;
+ int xCounter = 0;
+ int yCounter = 0;
+ while (traversal.hasNext()) {
+ counter++;
+ final Map<String, Vertex> map = traversal.next();
+ assertEquals(1, map.size());
+ if (map.containsKey("a")) {
+ final Vertex vertex = map.get("a");
+ xCounter++;
+ assertTrue(vertex.equals(convertToVertex(graph, "vadas")) || vertex.equals(convertToVertex(graph, "lop")) || vertex.equals(convertToVertex(graph, "ripple")));
+ } else {
+ final Vertex vertex = map.get("b");
+ yCounter++;
+ assertTrue(vertex.equals(convertToVertex(graph, "marko")) || vertex.equals(convertToVertex(graph, "josh")) || vertex.equals(convertToVertex(graph, "peter")));
+ }
+ }
+ assertEquals(6, counter);
+ assertEquals(3, yCounter);
+ assertEquals(3, xCounter);
+ }
+
//
@Test
@@ -437,6 +473,11 @@ public abstract class SelectTest extends AbstractGremlinProcessTest {
return g.V().hasLabel("person").as("person").local(__.bothE().label().groupCount()).as("relations").select().by("name").by();
}
+ @Override
+ public Traversal<Vertex, Map<String, Vertex>> get_g_V_chooseXoutE_count_isX0X__asXaX__asXbXX_select() {
+ return g.V().choose(__.outE().count().is(0L), __.as("a"), __.as("b")).select();
+ }
+
//
@Override
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c41b199d/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/PropertyTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/PropertyTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/PropertyTest.java
index 43218f7..42083b8 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/PropertyTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/PropertyTest.java
@@ -194,7 +194,7 @@ public class PropertyTest {
v.value("does-not-exist");
fail("Call to Element.value() with a key that is not present should throw an exception");
} catch (Exception ex) {
- validateException(Property.Exceptions.propertyDoesNotExist("does-not-exist"), ex);
+ validateException(Property.Exceptions.propertyDoesNotExist(v, "does-not-exist"), ex);
}
}
@@ -210,7 +210,7 @@ public class PropertyTest {
e.value("does-not-exist");
fail("Call to Element.value() with a key that is not present should throw an exception");
} catch (Exception ex) {
- validateException(Property.Exceptions.propertyDoesNotExist("does-not-exist"), ex);
+ validateException(Property.Exceptions.propertyDoesNotExist(e, "does-not-exist"), ex);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c41b199d/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphTest.java
----------------------------------------------------------------------
diff --git a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphTest.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphTest.java
index 2f61e7f..290b818 100644
--- a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphTest.java
+++ b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphTest.java
@@ -18,6 +18,8 @@
*/
package org.apache.tinkerpop.gremlin.tinkergraph.structure;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
+import org.apache.tinkerpop.gremlin.structure.Order;
import org.apache.tinkerpop.gremlin.structure.P;
import org.apache.tinkerpop.gremlin.structure.T;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
@@ -153,7 +155,10 @@ public class TinkerGraphTest {
@Ignore
public void testPlay5() throws Exception {
GraphTraversalSource g = TinkerFactory.createModern().traversal();
- g.V().has("age").values("name").forEachRemaining(System.out::println);
+ //g.V().has("name", "gremlin").inE("uses").order().by("skill", Order.incr).as("a").outV().as("b").path().forEachRemaining(System.out::println);
+ //g.V().has("name", "gremlin").inE("uses").order().by("skill", Order.incr).as("a").outV().as("b").select().by("skill").by("name").forEachRemaining(System.out::println);
+ //g.V().label().groupCount().as("x").select().forEachRemaining(System.out::println);
+ g.V().choose(__.outE().count().is(0L),__.as("x"),__.as("y")).select("x","y").forEachRemaining(System.out::println);
}
@Test
[48/50] [abbrv] incubator-tinkerpop git commit: Add docs around
changes to IO and serialization formats.
Posted by sp...@apache.org.
Add docs around changes to IO and serialization formats.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/8435e518
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/8435e518
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/8435e518
Branch: refs/heads/variables
Commit: 8435e5187fa70ed7b3305e198a79f01eaa78c6ec
Parents: edd8e70
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Fri May 1 09:37:24 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Fri May 1 09:37:24 2015 -0400
----------------------------------------------------------------------
docs/src/the-graph.asciidoc | 281 +++++++++++++++++----------------------
1 file changed, 121 insertions(+), 160 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/8435e518/docs/src/the-graph.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/the-graph.asciidoc b/docs/src/the-graph.asciidoc
index 2482f04..88a5127 100644
--- a/docs/src/the-graph.asciidoc
+++ b/docs/src/the-graph.asciidoc
@@ -248,8 +248,13 @@ image:gremlin-io.png[width=250,float=right] The task of getting data in and out
* Reading and writing a `Traversal<Vertex>` as adjacency list format
* Reading and writing a single `Vertex` (with and without associated `Edge` objects)
* Reading and writing a single `Edge`
+* Reading and writing a single `VertexProperty`
+* Reading and writing a single `Property`
+* Reading and writing an arbitrary `Object`
-In all cases, these methods operate in the currency of `InputStream` and `OutputStream` objects, allowing graphs and their related elements to be written to and read from files, byte arrays, etc. The `Graph` interface offers the `io` method, which provides access to helper methods for the various I/O capabilities. This method also potentially provides vendor specific implementations of some of these methods, which may be important for serialization of vendor graphs. Unless there are very advanced requirements for the serialization process, it is always best to utilize the methods on the `Io` interface to construct `GraphReader` and `GraphWriter` instances, as the implementation may provide some custom settings that would otherwise have to be configured manually by the user to do the serialization.
+In all cases, these methods operate in the currency of `InputStream` and `OutputStream` objects, allowing graphs and their related elements to be written to and read from files, byte arrays, etc. The `Graph` interface offers the `io` method, which provides access to "reader/writer builder" objects that are pre-configured with serializers provided by the `Graph`, as well as helper methods for the various I/O capabilities. Unless there are very advanced requirements for the serialization process, it is always best to utilize the methods on the `Io` interface to construct `GraphReader` and `GraphWriter` instances, as the implementation may provide some custom settings that would otherwise have to be configured manually by the user to do the serialization.
+
+It is up to the implementations of the `GraphReader` and `GraphWriter` interfaces to choose the methods they implement and the manner in which they work together. The only semantics enforced and expected is that the write methods should produce output that is compatible with the corresponding read method (e.g. the output of `writeVertices` should be readable as input to `readVertices` and the output of `writeProperty` should be readable as input to `readProperty`).
GraphML Reader/Writer
~~~~~~~~~~~~~~~~~~~~~
@@ -260,7 +265,7 @@ image:gremlin-graphml.png[width=350,float=left] The link:http://graphml.graphdra
* Produce a subgraph and export it to GraphML to be consumed by and visualized in link:https://gephi.org/[Gephi].
* Migrate the data of an entire graph to a different graph database not supported by TinkerPop.
-As GraphML is a specification for the serialization of an entire graph and not the individual elements of a graph, methods that support input and output of single vertices and edges are not supported.
+As GraphML is a specification for the serialization of an entire graph and not the individual elements of a graph, methods that support input and output of single vertices, edges, etc. are not supported.
CAUTION: GraphML is a "lossy" format in that it only supports primitive values for properties and does not have support for `Graph` variables. It will use `toString` to serialize property values outside of those primitives.
@@ -298,7 +303,7 @@ image:gremlin-graphson.png[width=350,float=left] GraphSON is a link:http://json.
* A text format of the graph or its elements is desired (e.g. debugging, usage in source control, etc.)
* The graph or its elements need to be consumed by code that is not JVM-based (e.g. JavaScript, Python, .NET, etc.)
-GraphSON supports all of the `GraphReader` and `GraphWriter` interface methods and can therefore read or write an entire `Graph`, a single `Vertex` or a single `Edge`. The following code shows how to write a `Graph` instance to file called `tinkerpop-modern.json` and then how to read that file back into a different instance:
+GraphSON supports all of the `GraphReader` and `GraphWriter` interface methods and can therefore read or write an entire `Graph`, vertices, arbitrary objects, etc. The following code shows how to write a `Graph` instance to file called `tinkerpop-modern.json` and then how to read that file back into a different instance:
[source,java]
----
@@ -341,70 +346,49 @@ The following GraphSON example shows the output of `GraphSonWriter.writeVertex()
[source,json]
----
{
- "inE": [],
- "outE": [
- {
- "inV": 3,
- "inVLabel": "software",
- "outVLabel": "person",
- "id": 9,
- "label": "created",
- "type": "edge",
- "outV": 1,
- "properties": {
- "weight": 0.4
- }
- },
- {
- "inV": 2,
- "inVLabel": "person",
- "outVLabel": "person",
- "id": 7,
- "label": "knows",
- "type": "edge",
- "outV": 1,
- "properties": {
- "weight": 0.5
- }
+ "id": 1,
+ "label": "person",
+ "outE": {
+ "created": [
+ {
+ "id": 9,
+ "inV": 3,
+ "properties": {
+ "weight": 0.4
+ }
+ }
+ ],
+ "knows": [
+ {
+ "id": 7,
+ "inV": 2,
+ "properties": {
+ "weight": 0.5
+ }
+ },
+ {
+ "id": 8,
+ "inV": 4,
+ "properties": {
+ "weight": 1
+ }
+ }
+ ]
},
- {
- "inV": 4,
- "inVLabel": "person",
- "outVLabel": "person",
- "id": 8,
- "label": "knows",
- "type": "edge",
- "outV": 1,
- "properties": {
- "weight": 1
- }
+ "properties": {
+ "name": [
+ {
+ "id": 0,
+ "value": "marko"
+ }
+ ],
+ "age": [
+ {
+ "id": 1,
+ "value": 29
+ }
+ ]
}
- ],
- "id": 1,
- "label": "person",
- "type": "vertex",
- "properties": {
- "name": [
- {
- "id": 0,
- "label": "name",
- "value": "marko",
- "properties": {
-
- }
- }
- ],
- "age": [
- {
- "id": 1,
- "label": "age",
- "value": 29,
- "properties": {
-
- }
- }
- ]
- }
}
----
@@ -427,100 +411,78 @@ In the above code, the `embedTypes` option is set to `true` and the output below
[source,json]
----
{
- "@class": "java.util.HashMap",
- "inE": [
- "java.util.ArrayList",
- [
-
- ]
- ],
- "outE": [
- "java.util.ArrayList",
- [
- {
- "@class": "java.util.HashMap",
- "inV": 3,
- "inVLabel": "software",
- "outVLabel": "person",
- "id": 9,
- "label": "created",
- "type": "edge",
- "outV": 1,
- "properties": {
- "@class": "java.util.HashMap",
- "weight": 0.4
- }
- },
- {
+ "@class": "java.util.HashMap",
+ "id": 1,
+ "label": "person",
+ "outE": {
"@class": "java.util.HashMap",
- "inV": 2,
- "inVLabel": "person",
- "outVLabel": "person",
- "id": 7,
- "label": "knows",
- "type": "edge",
- "outV": 1,
- "properties": {
- "@class": "java.util.HashMap",
- "weight": 0.5
- }
- },
- {
+ "created": [
+ "java.util.ArrayList",
+ [
+ {
+ "@class": "java.util.HashMap",
+ "id": 9,
+ "inV": 3,
+ "properties": {
+ "@class": "java.util.HashMap",
+ "weight": 0.4
+ }
+ }
+ ]
+ ],
+ "knows": [
+ "java.util.ArrayList",
+ [
+ {
+ "@class": "java.util.HashMap",
+ "id": 7,
+ "inV": 2,
+ "properties": {
+ "@class": "java.util.HashMap",
+ "weight": 0.5
+ }
+ },
+ {
+ "@class": "java.util.HashMap",
+ "id": 8,
+ "inV": 4,
+ "properties": {
+ "@class": "java.util.HashMap",
+ "weight": 1
+ }
+ }
+ ]
+ ]
+ },
+ "properties": {
"@class": "java.util.HashMap",
- "inV": 4,
- "inVLabel": "person",
- "outVLabel": "person",
- "id": 8,
- "label": "knows",
- "type": "edge",
- "outV": 1,
- "properties": {
- "@class": "java.util.HashMap",
- "weight": 1
- }
- }
- ]
- ],
- "id": 1,
- "label": "person",
- "type": "vertex",
- "properties": {
- "@class": "java.util.HashMap",
- "name": [
- "java.util.ArrayList",
- [
- {
- "@class": "java.util.HashMap",
- "id": [
- "java.lang.Long",
- 0
- ],
- "label": "name",
- "value": "marko",
- "properties": {
- "@class": "java.util.HashMap"
- }
- }
- ]
- ],
- "age": [
- "java.util.ArrayList",
- [
- {
- "@class": "java.util.HashMap",
- "id": [
- "java.lang.Long",
- 1
- ],
- "label": "age",
- "value": 29,
- "properties": {
- "@class": "java.util.HashMap"
- }
- }
- ]
- ]
- }
+ "name": [
+ "java.util.ArrayList",
+ [
+ {
+ "@class": "java.util.HashMap",
+ "id": [
+ "java.lang.Long",
+ 0
+ ],
+ "value": "marko"
+ }
+ ]
+ ],
+ "age": [
+ "java.util.ArrayList",
+ [
+ {
+ "@class": "java.util.HashMap",
+ "id": [
+ "java.lang.Long",
+ 1
+ ],
+ "value": 29
+ }
+ ]
+ ]
+ }
}
----
@@ -530,7 +492,7 @@ The ambiguity of components of the GraphSON is now removed by the `@class` prope
Gryo Reader/Writer
~~~~~~~~~~~~~~~~~~
-image:gremlin-kryo.png[width=400,float=left] link:https://github.com/EsotericSoftware/kryo[Kryo] is a popular serialization package for the JVM. Gremlin-Kryo is a binary Graph serialization format for use on the JVM by JVM languages. It is designed to be space efficient, non-lossy and is promoted as the standard format to use when working with graph data inside of the TinkerPop stack. A list of common use cases is presented below:
+image:gremlin-kryo.png[width=400,float=left] link:https://github.com/EsotericSoftware/kryo[Kryo] is a popular serialization package for the JVM. Gremlin-Kryo is a binary `Graph` serialization format for use on the JVM by JVM languages. It is designed to be space efficient, non-lossy and is promoted as the standard format to use when working with graph data inside of the TinkerPop stack. A list of common use cases is presented below:
* Migration from one Gremlin Structure implementation to another (e.g. `TinkerGraph` to `Neo4jGraph`)
* Serialization of individual graph elements to be sent over the network to another JVM.
@@ -538,8 +500,7 @@ image:gremlin-kryo.png[width=400,float=left] link:https://github.com/EsotericSof
CAUTION: When migrating between Gremlin Structure implementations, Kryo may not lose data, but it is important to consider the features of each `Graph` and whether or not the data types supported in one will be supported in the other. Failure to do so, may result in errors.
-Kryo supports all of the `GraphReader` and `GraphWriter` interface methods and can therefore read or write an entire `Graph`, a single `Vertex` or a single `Edge`. The following code shows how to write a `Graph` instance to file called `tinkerpop-modern.kryo` and then how to read that file back into a different instance:
-
+Kryo supports all of the `GraphReader` and `GraphWriter` interface methods and can therefore read or write an entire `Graph`, vertices, edges, etc. The following code shows how to write a `Graph` instance to file called `tinkerpop-modern.kryo` and then how to read that file back into a different instance:
[source,java]
----