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 2018/04/03 14:53:13 UTC
[01/50] tinkerpop git commit: Merge branch 'TINKERPOP-1758' into tp32
[Forced Update!]
Repository: tinkerpop
Updated Branches:
refs/heads/TINKERPOP-1878 748a06a2d -> 71d384534 (forced update)
Merge branch 'TINKERPOP-1758' into tp32
Conflicts:
CHANGELOG.asciidoc
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/6323f491
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/6323f491
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/6323f491
Branch: refs/heads/TINKERPOP-1878
Commit: 6323f4912433f64c1e890f7e6fd8156dc10b299e
Parents: 10d9095 5288514
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Mar 20 15:25:29 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Mar 20 15:25:29 2018 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
.../strategy/decoration/RemoteStrategy.java | 27 +++++++++++++++++++-
.../process/traversal/TraversalStrategies.java | 22 ++++++++--------
3 files changed, 38 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6323f491/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --cc CHANGELOG.asciidoc
index 0ec6f6d,037d94c..22073ad
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@@ -30,10 -27,8 +30,11 @@@ image::https://raw.githubusercontent.co
* Modified `GremlinDslProcessor` so that it generated the `getAnonymousTraversalClass()` method to return the DSL version of `__`.
* Added the "Kitchen Sink" test data set.
* Fixed deserialization of `P.not()` for GraphSON.
+* Bumped to Jackson 2.9.4.
+* Improved performance of `JavaTranslator` by caching reflected methods required for traversal construction.
+ * Ensure that `RemoteStrategy` is applied before all other `DecorationStrategy` instances.
* Added `idleConnectionTimeout` and `keepAliveInterval` to Gremlin Server that enables a "ping" and auto-close for seemingly dead clients.
+* Fixed a bug where lambdas in `gremlin-python` would trigger a failure if steps using python-only symbols were present (such as `as_()`).
* Fixed a bug in `NumberHelper` that led to wrong min/max results if numbers exceeded the Integer limits.
* Delayed setting of the request identifier until `RequestMessage` construction by the builder.
* Improved error messaging for failed serialization and deserialization of request/response messages.
[31/50] tinkerpop git commit: TINKERPOP-1878 Minor javadoc and code
cleanup
Posted by sp...@apache.org.
TINKERPOP-1878 Minor javadoc and code cleanup
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/fd7dddc5
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/fd7dddc5
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/fd7dddc5
Branch: refs/heads/TINKERPOP-1878
Commit: fd7dddc51ad1db5ee7539ee96e53251ede3fbb09
Parents: 1dec352
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Jan 25 15:36:53 2018 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Apr 3 09:16:16 2018 -0400
----------------------------------------------------------------------
.../process/traversal/dsl/sparql/SparqlTraversal.java | 12 +++---------
.../traversal/dsl/sparql/SparqlTraversalSource.java | 8 +++++++-
.../process/traversal/strategy/SparqlStrategy.java | 11 ++++++++---
3 files changed, 18 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fd7dddc5/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversal.java
----------------------------------------------------------------------
diff --git a/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversal.java b/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversal.java
index efa9489..843267d 100644
--- a/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversal.java
+++ b/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversal.java
@@ -22,6 +22,9 @@ import org.apache.tinkerpop.gremlin.process.traversal.Step;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
/**
+ * The {@code SparqlTraversal} has no additional traversal steps. The only step available for "SPARQL" is the
+ * {@link SparqlTraversalSource#sparql(String)} start step.
+ *
* @author Stephen Mallette (http://stephen.genoprime.com)
*/
public interface SparqlTraversal<S, E> extends Traversal<S, E> {
@@ -56,13 +59,4 @@ public interface SparqlTraversal<S, E> extends Traversal<S, E> {
Traversal.super.iterate();
return this;
}
-
- public static final class Symbols {
-
- private Symbols() {
- // static fields only
- }
-
- public static final String sparql = "sparql";
- }
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fd7dddc5/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversalSource.java
----------------------------------------------------------------------
diff --git a/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversalSource.java b/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversalSource.java
index 3596716..b156ed1 100644
--- a/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversalSource.java
+++ b/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversalSource.java
@@ -25,12 +25,15 @@ import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource;
import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategies;
import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategy;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal;
import org.apache.tinkerpop.gremlin.process.traversal.step.map.ConstantStep;
import org.apache.tinkerpop.gremlin.structure.Graph;
import org.apache.tinkerpop.gremlin.structure.Transaction;
import org.apache.tinkerpop.gremlin.structure.util.StringFactory;
/**
+ * A {@link TraversalSource} implementation that spawns {@link SparqlTraversal} instances.
+ *
* @author Stephen Mallette (http://stephen.genoprime.com)
*/
public class SparqlTraversalSource implements TraversalSource {
@@ -115,9 +118,12 @@ public class SparqlTraversalSource implements TraversalSource {
return (SparqlTraversalSource) clone;
}
+ /**
+ * The start step for a SPARQL based traversal that accepts a string representation of the query to execute.
+ */
public <S> SparqlTraversal<S,String> sparql(final String query) {
final SparqlTraversalSource clone = this.clone();
- clone.bytecode.addStep(SparqlTraversal.Symbols.sparql, query);
+ clone.bytecode.addStep(GraphTraversal.Symbols.constant, query);
final SparqlTraversal.Admin<S, S> traversal = new DefaultSparqlTraversal<>(clone);
return traversal.addStep(new ConstantStep<S,String>(traversal, query));
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fd7dddc5/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/strategy/SparqlStrategy.java
----------------------------------------------------------------------
diff --git a/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/strategy/SparqlStrategy.java b/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/strategy/SparqlStrategy.java
index 07ac4cf..bb0b326 100644
--- a/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/strategy/SparqlStrategy.java
+++ b/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/strategy/SparqlStrategy.java
@@ -22,17 +22,22 @@ import org.apache.tinkerpop.gremlin.process.computer.traversal.strategy.decorati
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.step.map.ConstantStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.map.TraversalMapStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.util.EmptyStep;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.AbstractTraversalStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper;
import org.apache.tinkerpop.gremlin.sparql.SparqlToGremlinCompiler;
+import org.apache.tinkerpop.gremlin.sparql.process.traversal.dsl.sparql.SparqlTraversalSource;
import org.apache.tinkerpop.gremlin.structure.Vertex;
import java.util.Collections;
import java.util.Set;
/**
+ * This {@link TraversalStrategy} is used in conjunction with the {@link SparqlTraversalSource} which has a single
+ * {@code sparql()} start step. That step adds a {@link ConstantStep} to the traversal with the SPARQL query within
+ * it as a string value. This strategy finds that step and transpiles it to a Gremlin traversal which then replaces
+ * the {@link ConstantStep}.
+ *
* @author Stephen Mallette (http://stephen.genoprime.com)
*/
public class SparqlStrategy extends AbstractTraversalStrategy<TraversalStrategy.DecorationStrategy>
@@ -69,11 +74,11 @@ public class SparqlStrategy extends AbstractTraversalStrategy<TraversalStrategy.
sparqlTraversal.asAdmin().getSteps().forEach(s -> traversal.addStep(s));
} else {
// The ConstantStep expects a string value
- throw new IllegalStateException("SparqlStrategy cannot be applied to this traversal");
+ throw new IllegalStateException("SparqlStrategy cannot be applied to a traversal that does not consist of a single ConstantStep<?,String>");
}
} else {
// SparqlStrategy requires that there be one step and it be a ConstantStep that contains some SPARQL
- throw new IllegalStateException("SparqlStrategy cannot be applied to this traversal");
+ throw new IllegalStateException("SparqlStrategy cannot be applied to a traversal that does not consist of a single ConstantStep<?,String>");
}
}
}
[14/50] tinkerpop git commit: Merge branch 'tp32' into tp33
Posted by sp...@apache.org.
Merge branch 'tp32' into tp33
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/eb351775
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/eb351775
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/eb351775
Branch: refs/heads/TINKERPOP-1878
Commit: eb3517753ece2f188afec1c4b20056374b8f73f7
Parents: 58691c6 8a76583
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Thu Mar 22 10:19:33 2018 -0700
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Thu Mar 22 10:19:33 2018 -0700
----------------------------------------------------------------------
----------------------------------------------------------------------
[21/50] tinkerpop git commit: Merge remote-tracking branch
'origin/TINKERPOP-1866' into tp33
Posted by sp...@apache.org.
Merge remote-tracking branch 'origin/TINKERPOP-1866' into tp33
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/762d370c
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/762d370c
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/762d370c
Branch: refs/heads/TINKERPOP-1878
Commit: 762d370cd770e59351887b637985bba295e549ef
Parents: 13a20e5 69eb333
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Fri Mar 23 13:51:06 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Fri Mar 23 13:51:06 2018 -0400
----------------------------------------------------------------------
gremlin-dotnet/glv/Enum.template | 37 +++++++++--
gremlin-dotnet/glv/generate.groovy | 15 +----
.../Gremlin.Net/Process/Traversal/Barrier.cs | 27 +++++++-
.../Process/Traversal/Cardinality.cs | 35 ++++++++--
.../src/Gremlin.Net/Process/Traversal/Column.cs | 31 +++++++--
.../Gremlin.Net/Process/Traversal/Direction.cs | 35 ++++++++--
.../Process/Traversal/EnumWrapper.cs | 31 ++++++++-
.../Process/Traversal/GraphSONVersion.cs | 35 ++++++++--
.../Process/Traversal/GryoVersion.cs | 31 +++++++--
.../Gremlin.Net/Process/Traversal/Operator.cs | 67 ++++++++++++++++----
.../src/Gremlin.Net/Process/Traversal/Order.cs | 35 ++++++++--
.../src/Gremlin.Net/Process/Traversal/Pick.cs | 31 +++++++--
.../src/Gremlin.Net/Process/Traversal/Pop.cs | 39 ++++++++++--
.../src/Gremlin.Net/Process/Traversal/Scope.cs | 31 +++++++--
.../src/Gremlin.Net/Process/Traversal/T.cs | 39 ++++++++++--
.../Structure/IO/GraphSON/GraphSONReader.cs | 1 +
.../Structure/IO/GraphSON/TDeserializer.cs | 36 +++++++++++
.../Gherkin/CommonSteps.cs | 3 +-
.../Gherkin/GherkinTestRunner.cs | 4 --
.../IO/GraphSON/GraphSONReaderTests.cs | 12 ++++
20 files changed, 488 insertions(+), 87 deletions(-)
----------------------------------------------------------------------
[17/50] tinkerpop git commit: Updated .NET version in Dockerfile for
the tinkerpop:base image
Posted by sp...@apache.org.
Updated .NET version in Dockerfile for the tinkerpop:base image
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/f972d117
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/f972d117
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/f972d117
Branch: refs/heads/TINKERPOP-1878
Commit: f972d117ad87cd7d850334b28ed6f8a706235b62
Parents: cbdce11
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Thu Mar 22 20:53:20 2018 -0700
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Thu Mar 22 20:53:20 2018 -0700
----------------------------------------------------------------------
docker/Dockerfile | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f972d117/docker/Dockerfile
----------------------------------------------------------------------
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 08b7b3c..ef6b06c 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -23,11 +23,12 @@ RUN apt-get update \
&& apt-get -y install software-properties-common python-software-properties apt-transport-https \
&& echo oracle-java8-installer shared/accepted-oracle-license-v1-1 select true | debconf-set-selections \
&& add-apt-repository -y ppa:webupd8team/java \
- && sh -c 'echo "deb [arch=amd64] https://apt-mo.trafficmanager.net/repos/dotnet-release/ trusty main" > /etc/apt/sources.list.d/dotnetdev.list' \
+ && sh -c 'echo "deb [arch=amd64] https://packages.microsoft.com/repos/microsoft-ubuntu-trusty-prod trusty main" > /etc/apt/sources.list.d/dotnetdev.list' \
&& apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 417A0893 \
&& apt-get update \
- && apt-get install -y oracle-java8-installer curl gawk git maven openssh-server dotnet-dev-1.0.4 subversion zip \
- && apt-get install -y python python-dev python-pip build-essential \
+ && apt-get install -y oracle-java8-installer curl gawk git maven openssh-server subversion zip \
+ && sh -c 'curl https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > /etc/apt/trusted.gpg.d/microsoft.gpg' \
+ && apt-get install -y --force-yes dotnet-sdk-2.1.101 python python-dev python-pip build-essential \
&& pip install virtualenv virtualenvwrapper \
&& pip install --upgrade pip \
&& rm -rf /var/lib/apt/lists/* /var/cache/oracle-jdk8-installer
[41/50] tinkerpop git commit: TINKERPOP-1878 Added a test for GROUP
Posted by sp...@apache.org.
TINKERPOP-1878 Added a test for GROUP
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/90789cad
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/90789cad
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/90789cad
Branch: refs/heads/TINKERPOP-1878
Commit: 90789cad190b3a06dbdbafe34938d335b01b5dbd
Parents: 78d9bba
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Jan 29 09:09:07 2018 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Apr 3 09:16:55 2018 -0400
----------------------------------------------------------------------
.../dsl/sparql/SparqlTraversalSourceTest.java | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/90789cad/sparql-gremlin/src/test/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversalSourceTest.java
----------------------------------------------------------------------
diff --git a/sparql-gremlin/src/test/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversalSourceTest.java b/sparql-gremlin/src/test/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversalSourceTest.java
index 56d62c9..0e56347 100644
--- a/sparql-gremlin/src/test/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversalSourceTest.java
+++ b/sparql-gremlin/src/test/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversalSourceTest.java
@@ -110,6 +110,7 @@ public class SparqlTraversalSourceTest {
assertEquals(x.get("a"), _g.V(1).next());
assertEquals(x.get("b"), _g.V(4).next());
assertEquals(x.get("c"), _g.V(3).next());
+ assertEquals(3, x.size());
}
@Test
@@ -134,4 +135,19 @@ public class SparqlTraversalSourceTest {
"ORDER BY ?name").toList();
assertThat(x, contains("josh", "marko", "peter"));
}
+
+ @Test
+ public void shouldGroup() {
+ final Map<String,Long> x = (Map) g.sparql(
+ "SELECT ?name (COUNT(?name) AS ?name_count)\n" +
+ "WHERE {\n" +
+ " ?a e:created ?b .\n" +
+ " ?a v:name ?name .\n" +
+ "}" +
+ "GROUP BY ?name").next();
+ assertEquals(new Long(2), x.get("josh"));
+ assertEquals(new Long(1), x.get("peter"));
+ assertEquals(new Long(1), x.get("marko"));
+ assertEquals(3, x.size());
+ }
}
[46/50] tinkerpop git commit: TINKERPOP-1878 Updates to changelog and
code comments
Posted by sp...@apache.org.
TINKERPOP-1878 Updates to changelog and code comments
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/c67524aa
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/c67524aa
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/c67524aa
Branch: refs/heads/TINKERPOP-1878
Commit: c67524aa1a05523c71952f0cef152644fd97847b
Parents: cc0922a
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Jan 25 17:09:17 2018 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Apr 3 09:16:55 2018 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
.../process/traversal/dsl/sparql/SparqlTraversalSource.java | 6 ++++++
2 files changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c67524aa/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index e968c95..47ead43 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -27,6 +27,7 @@ This release also includes changes from <<release-3-2-8, 3.2.8>>.
* Fixed regression issue where the HTTPChannelizer doesn't instantiate the specified AuthenticationHandler.
* Defaulted GLV tests for gremlin-python to run for GraphSON 3.0.
+* Fixed a bug in dynamic Gryo registration where registrations that did not have serializers would fail.
* Fixed a bug with `Tree` serialization in GraphSON 3.0.
* In gremlin-python, the GraphSON 3.0 `g:Set` type is now deserialized to `List`.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c67524aa/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversalSource.java
----------------------------------------------------------------------
diff --git a/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversalSource.java b/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversalSource.java
index 3889d95..deb16f7 100644
--- a/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversalSource.java
+++ b/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversalSource.java
@@ -124,6 +124,12 @@ public class SparqlTraversalSource implements TraversalSource {
*/
public <S> SparqlTraversal<S,String> sparql(final String query) {
final SparqlTraversalSource clone = this.clone();
+
+ // this is a bit of a hack to get remote traversals to work cleanly. on the remote side, we'd expect a
+ // GraphTraversalSource not a SparqlTraversalSource (given that sparql-gremlin is to be implemented in the
+ // DSL pattern). Instead of just sending the constant() step with the sparql query we also include an
+ // inject() step which will be recognized by a GraphTraversalSource on the remote side. Since SparqlStrategy
+ // wholly replaces both of these steps, the traversal bytecode can be read properly.
clone.bytecode.addStep(GraphTraversal.Symbols.inject);
clone.bytecode.addStep(GraphTraversal.Symbols.constant, query);
final SparqlTraversal.Admin<S, S> traversal = new DefaultSparqlTraversal<>(clone);
[18/50] tinkerpop git commit: TINKERPOP-1866 Avoid using reflection
for T deserialization
Posted by sp...@apache.org.
TINKERPOP-1866 Avoid using reflection for T deserialization
Expose GetByValue() static method on EnumWrapper implementation to
try to expose the same functionality as if it were an enum.
Use the GetByValue() to deserialize a T instance.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/69eb333a
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/69eb333a
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/69eb333a
Branch: refs/heads/TINKERPOP-1878
Commit: 69eb333af04357238b2fa5ce16c80a5f10cca39e
Parents: 4016c80
Author: Jorge Bay Gondra <jo...@gmail.com>
Authored: Fri Mar 23 12:07:25 2018 +0100
Committer: Jorge Bay Gondra <jo...@gmail.com>
Committed: Fri Mar 23 12:07:25 2018 +0100
----------------------------------------------------------------------
gremlin-dotnet/glv/Enum.template | 37 +++++++++--
gremlin-dotnet/glv/generate.groovy | 15 +----
.../Gremlin.Net/Process/Traversal/Barrier.cs | 27 +++++++-
.../Process/Traversal/Cardinality.cs | 35 ++++++++--
.../src/Gremlin.Net/Process/Traversal/Column.cs | 31 +++++++--
.../Gremlin.Net/Process/Traversal/Direction.cs | 35 ++++++++--
.../Process/Traversal/GraphSONVersion.cs | 35 ++++++++--
.../Process/Traversal/GryoVersion.cs | 31 +++++++--
.../Gremlin.Net/Process/Traversal/Operator.cs | 67 ++++++++++++++++----
.../src/Gremlin.Net/Process/Traversal/Order.cs | 35 ++++++++--
.../src/Gremlin.Net/Process/Traversal/Pick.cs | 31 +++++++--
.../src/Gremlin.Net/Process/Traversal/Pop.cs | 39 ++++++++++--
.../src/Gremlin.Net/Process/Traversal/Scope.cs | 31 +++++++--
.../src/Gremlin.Net/Process/Traversal/T.cs | 39 ++++++++++--
.../Structure/IO/GraphSON/TDeserializer.cs | 8 +--
.../Gherkin/CommonSteps.cs | 3 +-
16 files changed, 409 insertions(+), 90 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/69eb333a/gremlin-dotnet/glv/Enum.template
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/glv/Enum.template b/gremlin-dotnet/glv/Enum.template
index 1f11076..e785cd0 100644
--- a/gremlin-dotnet/glv/Enum.template
+++ b/gremlin-dotnet/glv/Enum.template
@@ -22,6 +22,9 @@
#endregion
// THIS IS A GENERATED FILE - DO NOT MODIFY THIS FILE DIRECTLY - see pom.xml
+using System;
+using System.Collections.Generic;
+
namespace Gremlin.Net.Process.Traversal
{
#pragma warning disable 1591
@@ -30,11 +33,37 @@ namespace Gremlin.Net.Process.Traversal
{
private <%= enumClass.simpleName %>(string enumValue)
: base("<%= enumClass.simpleName %>", enumValue)
- {
+ {
+ }
+<%
+ def toCSharpName = { enumClass, itemName ->
+ if (enumClass.equals(directionClass)) {
+ itemName = itemName.toLowerCase()
+ }
+
+ return itemName.substring(0, 1).toUpperCase() + itemName.substring(1)
+ }
+ constants.each { value -> %>
+ public static ${enumClass.simpleName} ${toCSharpName(enumClass, value.name())} => new ${enumClass.simpleName}("${value.name()}");
+<% }%>
+ private static readonly IDictionary<string, <%= enumClass.simpleName %>> Properties = new Dictionary<string, <%= enumClass.simpleName %>>
+ {<% constants.each { value -> %>
+ { "${value.name()}", ${toCSharpName(enumClass, value.name())} },<% }%>
+ };
+
+ /// <summary>
+ /// Gets the <%= enumClass.simpleName %> enumeration by value.
+ /// </summary>
+ public static <%= enumClass.simpleName %> GetByValue(string value)
+ {
+ if (!Properties.TryGetValue(value, out var property))
+ {
+ throw new ArgumentException(\$"No matching <%= enumClass.simpleName%> for value '{value}'");
+ }
+ return property;
}
-<% constants.each { constant -> %>
- <%= constant %><%}%>
}
-
+
+
#pragma warning restore 1591
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/69eb333a/gremlin-dotnet/glv/generate.groovy
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/glv/generate.groovy b/gremlin-dotnet/glv/generate.groovy
index bf7f03b..91f9b94 100644
--- a/gremlin-dotnet/glv/generate.groovy
+++ b/gremlin-dotnet/glv/generate.groovy
@@ -321,14 +321,6 @@ def pTemplate = engine.createTemplate(new File("${projectBaseDir}/glv/P.template
def pFile = new File("${projectBaseDir}/src/Gremlin.Net/Process/Traversal/P.cs")
pFile.newWriter().withWriter{ it << pTemplate }
-// Process enums
-def toCSharpName = { enumClass, itemName ->
- if (enumClass.equals(Direction.class)) {
- itemName = itemName.toLowerCase()
- }
-
- return itemName.substring(0, 1).toUpperCase() + itemName.substring(1)
-}
def createEnum = { enumClass ->
def b = ["enumClass": enumClass,
@@ -341,11 +333,8 @@ def createEnum = { enumClass ->
return toCSharpTypeMap[typeName]
}.join(", "),
"constants": enumClass.getEnumConstants().
- sort { a, b -> a.name() <=> b.name() }.
- collect { value ->
- def csharpName = toCSharpName(enumClass, value.name())
- return "public static ${enumClass.simpleName} ${csharpName} => new ${enumClass.simpleName}(\"${value.name()}\");"
- }]
+ sort { a, b -> a.name() <=> b.name() },
+ "directionClass": Direction.class ]
def enumTemplate = engine.createTemplate(new File("${projectBaseDir}/glv/Enum.template")).make(b)
def enumFile = new File("${projectBaseDir}/src/Gremlin.Net/Process/Traversal/" + enumClass.getSimpleName() + ".cs")
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/69eb333a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Barrier.cs
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Barrier.cs b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Barrier.cs
index df6d349..0f86f32 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Barrier.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Barrier.cs
@@ -22,6 +22,9 @@
#endregion
// THIS IS A GENERATED FILE - DO NOT MODIFY THIS FILE DIRECTLY - see pom.xml
+using System;
+using System.Collections.Generic;
+
namespace Gremlin.Net.Process.Traversal
{
#pragma warning disable 1591
@@ -30,11 +33,29 @@ namespace Gremlin.Net.Process.Traversal
{
private Barrier(string enumValue)
: base("Barrier", enumValue)
- {
+ {
}
-
+
public static Barrier NormSack => new Barrier("normSack");
+
+ private static readonly IDictionary<string, Barrier> Properties = new Dictionary<string, Barrier>
+ {
+ { "normSack", NormSack },
+ };
+
+ /// <summary>
+ /// Gets the Barrier enumeration by value.
+ /// </summary>
+ public static Barrier GetByValue(string value)
+ {
+ if (!Properties.TryGetValue(value, out var property))
+ {
+ throw new ArgumentException($"No matching Barrier for value '{value}'");
+ }
+ return property;
+ }
}
-
+
+
#pragma warning restore 1591
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/69eb333a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Cardinality.cs
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Cardinality.cs b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Cardinality.cs
index d2cbcf2..caced7d 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Cardinality.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Cardinality.cs
@@ -22,6 +22,9 @@
#endregion
// THIS IS A GENERATED FILE - DO NOT MODIFY THIS FILE DIRECTLY - see pom.xml
+using System;
+using System.Collections.Generic;
+
namespace Gremlin.Net.Process.Traversal
{
#pragma warning disable 1591
@@ -30,13 +33,35 @@ namespace Gremlin.Net.Process.Traversal
{
private Cardinality(string enumValue)
: base("Cardinality", enumValue)
- {
+ {
}
-
- public static Cardinality List => new Cardinality("list");
- public static Cardinality Set => new Cardinality("set");
+
+ public static Cardinality List => new Cardinality("list");
+
+ public static Cardinality Set => new Cardinality("set");
+
public static Cardinality Single => new Cardinality("single");
+
+ private static readonly IDictionary<string, Cardinality> Properties = new Dictionary<string, Cardinality>
+ {
+ { "list", List },
+ { "set", Set },
+ { "single", Single },
+ };
+
+ /// <summary>
+ /// Gets the Cardinality enumeration by value.
+ /// </summary>
+ public static Cardinality GetByValue(string value)
+ {
+ if (!Properties.TryGetValue(value, out var property))
+ {
+ throw new ArgumentException($"No matching Cardinality for value '{value}'");
+ }
+ return property;
+ }
}
-
+
+
#pragma warning restore 1591
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/69eb333a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Column.cs
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Column.cs b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Column.cs
index 9e0451e..cacf886 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Column.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Column.cs
@@ -22,6 +22,9 @@
#endregion
// THIS IS A GENERATED FILE - DO NOT MODIFY THIS FILE DIRECTLY - see pom.xml
+using System;
+using System.Collections.Generic;
+
namespace Gremlin.Net.Process.Traversal
{
#pragma warning disable 1591
@@ -30,12 +33,32 @@ namespace Gremlin.Net.Process.Traversal
{
private Column(string enumValue)
: base("Column", enumValue)
- {
+ {
}
-
- public static Column Keys => new Column("keys");
+
+ public static Column Keys => new Column("keys");
+
public static Column Values => new Column("values");
+
+ private static readonly IDictionary<string, Column> Properties = new Dictionary<string, Column>
+ {
+ { "keys", Keys },
+ { "values", Values },
+ };
+
+ /// <summary>
+ /// Gets the Column enumeration by value.
+ /// </summary>
+ public static Column GetByValue(string value)
+ {
+ if (!Properties.TryGetValue(value, out var property))
+ {
+ throw new ArgumentException($"No matching Column for value '{value}'");
+ }
+ return property;
+ }
}
-
+
+
#pragma warning restore 1591
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/69eb333a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Direction.cs
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Direction.cs b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Direction.cs
index 5a93f0a..92d9416 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Direction.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Direction.cs
@@ -22,6 +22,9 @@
#endregion
// THIS IS A GENERATED FILE - DO NOT MODIFY THIS FILE DIRECTLY - see pom.xml
+using System;
+using System.Collections.Generic;
+
namespace Gremlin.Net.Process.Traversal
{
#pragma warning disable 1591
@@ -30,13 +33,35 @@ namespace Gremlin.Net.Process.Traversal
{
private Direction(string enumValue)
: base("Direction", enumValue)
- {
+ {
}
-
- public static Direction Both => new Direction("BOTH");
- public static Direction In => new Direction("IN");
+
+ public static Direction Both => new Direction("BOTH");
+
+ public static Direction In => new Direction("IN");
+
public static Direction Out => new Direction("OUT");
+
+ private static readonly IDictionary<string, Direction> Properties = new Dictionary<string, Direction>
+ {
+ { "BOTH", Both },
+ { "IN", In },
+ { "OUT", Out },
+ };
+
+ /// <summary>
+ /// Gets the Direction enumeration by value.
+ /// </summary>
+ public static Direction GetByValue(string value)
+ {
+ if (!Properties.TryGetValue(value, out var property))
+ {
+ throw new ArgumentException($"No matching Direction for value '{value}'");
+ }
+ return property;
+ }
}
-
+
+
#pragma warning restore 1591
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/69eb333a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/GraphSONVersion.cs
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/GraphSONVersion.cs b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/GraphSONVersion.cs
index e55be6b..366c48c 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/GraphSONVersion.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/GraphSONVersion.cs
@@ -22,6 +22,9 @@
#endregion
// THIS IS A GENERATED FILE - DO NOT MODIFY THIS FILE DIRECTLY - see pom.xml
+using System;
+using System.Collections.Generic;
+
namespace Gremlin.Net.Process.Traversal
{
#pragma warning disable 1591
@@ -30,13 +33,35 @@ namespace Gremlin.Net.Process.Traversal
{
private GraphSONVersion(string enumValue)
: base("GraphSONVersion", enumValue)
- {
+ {
}
-
- public static GraphSONVersion V1_0 => new GraphSONVersion("V1_0");
- public static GraphSONVersion V2_0 => new GraphSONVersion("V2_0");
+
+ public static GraphSONVersion V1_0 => new GraphSONVersion("V1_0");
+
+ public static GraphSONVersion V2_0 => new GraphSONVersion("V2_0");
+
public static GraphSONVersion V3_0 => new GraphSONVersion("V3_0");
+
+ private static readonly IDictionary<string, GraphSONVersion> Properties = new Dictionary<string, GraphSONVersion>
+ {
+ { "V1_0", V1_0 },
+ { "V2_0", V2_0 },
+ { "V3_0", V3_0 },
+ };
+
+ /// <summary>
+ /// Gets the GraphSONVersion enumeration by value.
+ /// </summary>
+ public static GraphSONVersion GetByValue(string value)
+ {
+ if (!Properties.TryGetValue(value, out var property))
+ {
+ throw new ArgumentException($"No matching GraphSONVersion for value '{value}'");
+ }
+ return property;
+ }
}
-
+
+
#pragma warning restore 1591
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/69eb333a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/GryoVersion.cs
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/GryoVersion.cs b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/GryoVersion.cs
index 93fc369..01d2a99 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/GryoVersion.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/GryoVersion.cs
@@ -22,6 +22,9 @@
#endregion
// THIS IS A GENERATED FILE - DO NOT MODIFY THIS FILE DIRECTLY - see pom.xml
+using System;
+using System.Collections.Generic;
+
namespace Gremlin.Net.Process.Traversal
{
#pragma warning disable 1591
@@ -30,12 +33,32 @@ namespace Gremlin.Net.Process.Traversal
{
private GryoVersion(string enumValue)
: base("GryoVersion", enumValue)
- {
+ {
}
-
- public static GryoVersion V1_0 => new GryoVersion("V1_0");
+
+ public static GryoVersion V1_0 => new GryoVersion("V1_0");
+
public static GryoVersion V3_0 => new GryoVersion("V3_0");
+
+ private static readonly IDictionary<string, GryoVersion> Properties = new Dictionary<string, GryoVersion>
+ {
+ { "V1_0", V1_0 },
+ { "V3_0", V3_0 },
+ };
+
+ /// <summary>
+ /// Gets the GryoVersion enumeration by value.
+ /// </summary>
+ public static GryoVersion GetByValue(string value)
+ {
+ if (!Properties.TryGetValue(value, out var property))
+ {
+ throw new ArgumentException($"No matching GryoVersion for value '{value}'");
+ }
+ return property;
+ }
}
-
+
+
#pragma warning restore 1591
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/69eb333a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Operator.cs
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Operator.cs b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Operator.cs
index 8f0c9b3..8b87e40 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Operator.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Operator.cs
@@ -22,6 +22,9 @@
#endregion
// THIS IS A GENERATED FILE - DO NOT MODIFY THIS FILE DIRECTLY - see pom.xml
+using System;
+using System.Collections.Generic;
+
namespace Gremlin.Net.Process.Traversal
{
#pragma warning disable 1591
@@ -30,21 +33,59 @@ namespace Gremlin.Net.Process.Traversal
{
private Operator(string enumValue)
: base("Operator", enumValue)
- {
+ {
}
-
- public static Operator AddAll => new Operator("addAll");
- public static Operator And => new Operator("and");
- public static Operator Assign => new Operator("assign");
- public static Operator Div => new Operator("div");
- public static Operator Max => new Operator("max");
- public static Operator Min => new Operator("min");
- public static Operator Minus => new Operator("minus");
- public static Operator Mult => new Operator("mult");
- public static Operator Or => new Operator("or");
- public static Operator Sum => new Operator("sum");
+
+ public static Operator AddAll => new Operator("addAll");
+
+ public static Operator And => new Operator("and");
+
+ public static Operator Assign => new Operator("assign");
+
+ public static Operator Div => new Operator("div");
+
+ public static Operator Max => new Operator("max");
+
+ public static Operator Min => new Operator("min");
+
+ public static Operator Minus => new Operator("minus");
+
+ public static Operator Mult => new Operator("mult");
+
+ public static Operator Or => new Operator("or");
+
+ public static Operator Sum => new Operator("sum");
+
public static Operator SumLong => new Operator("sumLong");
+
+ private static readonly IDictionary<string, Operator> Properties = new Dictionary<string, Operator>
+ {
+ { "addAll", AddAll },
+ { "and", And },
+ { "assign", Assign },
+ { "div", Div },
+ { "max", Max },
+ { "min", Min },
+ { "minus", Minus },
+ { "mult", Mult },
+ { "or", Or },
+ { "sum", Sum },
+ { "sumLong", SumLong },
+ };
+
+ /// <summary>
+ /// Gets the Operator enumeration by value.
+ /// </summary>
+ public static Operator GetByValue(string value)
+ {
+ if (!Properties.TryGetValue(value, out var property))
+ {
+ throw new ArgumentException($"No matching Operator for value '{value}'");
+ }
+ return property;
+ }
}
-
+
+
#pragma warning restore 1591
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/69eb333a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Order.cs
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Order.cs b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Order.cs
index c6a1817..2430114 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Order.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Order.cs
@@ -22,6 +22,9 @@
#endregion
// THIS IS A GENERATED FILE - DO NOT MODIFY THIS FILE DIRECTLY - see pom.xml
+using System;
+using System.Collections.Generic;
+
namespace Gremlin.Net.Process.Traversal
{
#pragma warning disable 1591
@@ -30,13 +33,35 @@ namespace Gremlin.Net.Process.Traversal
{
private Order(string enumValue)
: base("Order", enumValue)
- {
+ {
}
-
- public static Order Decr => new Order("decr");
- public static Order Incr => new Order("incr");
+
+ public static Order Decr => new Order("decr");
+
+ public static Order Incr => new Order("incr");
+
public static Order Shuffle => new Order("shuffle");
+
+ private static readonly IDictionary<string, Order> Properties = new Dictionary<string, Order>
+ {
+ { "decr", Decr },
+ { "incr", Incr },
+ { "shuffle", Shuffle },
+ };
+
+ /// <summary>
+ /// Gets the Order enumeration by value.
+ /// </summary>
+ public static Order GetByValue(string value)
+ {
+ if (!Properties.TryGetValue(value, out var property))
+ {
+ throw new ArgumentException($"No matching Order for value '{value}'");
+ }
+ return property;
+ }
}
-
+
+
#pragma warning restore 1591
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/69eb333a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Pick.cs
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Pick.cs b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Pick.cs
index d4132ea..b7dd8c2 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Pick.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Pick.cs
@@ -22,6 +22,9 @@
#endregion
// THIS IS A GENERATED FILE - DO NOT MODIFY THIS FILE DIRECTLY - see pom.xml
+using System;
+using System.Collections.Generic;
+
namespace Gremlin.Net.Process.Traversal
{
#pragma warning disable 1591
@@ -30,12 +33,32 @@ namespace Gremlin.Net.Process.Traversal
{
private Pick(string enumValue)
: base("Pick", enumValue)
- {
+ {
}
-
- public static Pick Any => new Pick("any");
+
+ public static Pick Any => new Pick("any");
+
public static Pick None => new Pick("none");
+
+ private static readonly IDictionary<string, Pick> Properties = new Dictionary<string, Pick>
+ {
+ { "any", Any },
+ { "none", None },
+ };
+
+ /// <summary>
+ /// Gets the Pick enumeration by value.
+ /// </summary>
+ public static Pick GetByValue(string value)
+ {
+ if (!Properties.TryGetValue(value, out var property))
+ {
+ throw new ArgumentException($"No matching Pick for value '{value}'");
+ }
+ return property;
+ }
}
-
+
+
#pragma warning restore 1591
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/69eb333a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Pop.cs
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Pop.cs b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Pop.cs
index d1915fc..1210f5c 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Pop.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Pop.cs
@@ -22,6 +22,9 @@
#endregion
// THIS IS A GENERATED FILE - DO NOT MODIFY THIS FILE DIRECTLY - see pom.xml
+using System;
+using System.Collections.Generic;
+
namespace Gremlin.Net.Process.Traversal
{
#pragma warning disable 1591
@@ -30,14 +33,38 @@ namespace Gremlin.Net.Process.Traversal
{
private Pop(string enumValue)
: base("Pop", enumValue)
- {
+ {
}
-
- public static Pop All => new Pop("all");
- public static Pop First => new Pop("first");
- public static Pop Last => new Pop("last");
+
+ public static Pop All => new Pop("all");
+
+ public static Pop First => new Pop("first");
+
+ public static Pop Last => new Pop("last");
+
public static Pop Mixed => new Pop("mixed");
+
+ private static readonly IDictionary<string, Pop> Properties = new Dictionary<string, Pop>
+ {
+ { "all", All },
+ { "first", First },
+ { "last", Last },
+ { "mixed", Mixed },
+ };
+
+ /// <summary>
+ /// Gets the Pop enumeration by value.
+ /// </summary>
+ public static Pop GetByValue(string value)
+ {
+ if (!Properties.TryGetValue(value, out var property))
+ {
+ throw new ArgumentException($"No matching Pop for value '{value}'");
+ }
+ return property;
+ }
}
-
+
+
#pragma warning restore 1591
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/69eb333a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Scope.cs
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Scope.cs b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Scope.cs
index ee67c39..2df6a95 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Scope.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Scope.cs
@@ -22,6 +22,9 @@
#endregion
// THIS IS A GENERATED FILE - DO NOT MODIFY THIS FILE DIRECTLY - see pom.xml
+using System;
+using System.Collections.Generic;
+
namespace Gremlin.Net.Process.Traversal
{
#pragma warning disable 1591
@@ -30,12 +33,32 @@ namespace Gremlin.Net.Process.Traversal
{
private Scope(string enumValue)
: base("Scope", enumValue)
- {
+ {
}
-
- public static Scope Global => new Scope("global");
+
+ public static Scope Global => new Scope("global");
+
public static Scope Local => new Scope("local");
+
+ private static readonly IDictionary<string, Scope> Properties = new Dictionary<string, Scope>
+ {
+ { "global", Global },
+ { "local", Local },
+ };
+
+ /// <summary>
+ /// Gets the Scope enumeration by value.
+ /// </summary>
+ public static Scope GetByValue(string value)
+ {
+ if (!Properties.TryGetValue(value, out var property))
+ {
+ throw new ArgumentException($"No matching Scope for value '{value}'");
+ }
+ return property;
+ }
}
-
+
+
#pragma warning restore 1591
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/69eb333a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/T.cs
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/T.cs b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/T.cs
index bae1314..80ca0ec 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/T.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/T.cs
@@ -22,6 +22,9 @@
#endregion
// THIS IS A GENERATED FILE - DO NOT MODIFY THIS FILE DIRECTLY - see pom.xml
+using System;
+using System.Collections.Generic;
+
namespace Gremlin.Net.Process.Traversal
{
#pragma warning disable 1591
@@ -30,14 +33,38 @@ namespace Gremlin.Net.Process.Traversal
{
private T(string enumValue)
: base("T", enumValue)
- {
+ {
}
-
- public static T Id => new T("id");
- public static T Key => new T("key");
- public static T Label => new T("label");
+
+ public static T Id => new T("id");
+
+ public static T Key => new T("key");
+
+ public static T Label => new T("label");
+
public static T Value => new T("value");
+
+ private static readonly IDictionary<string, T> Properties = new Dictionary<string, T>
+ {
+ { "id", Id },
+ { "key", Key },
+ { "label", Label },
+ { "value", Value },
+ };
+
+ /// <summary>
+ /// Gets the T enumeration by value.
+ /// </summary>
+ public static T GetByValue(string value)
+ {
+ if (!Properties.TryGetValue(value, out var property))
+ {
+ throw new ArgumentException($"No matching T for value '{value}'");
+ }
+ return property;
+ }
}
-
+
+
#pragma warning restore 1591
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/69eb333a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/TDeserializer.cs
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/TDeserializer.cs b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/TDeserializer.cs
index e79783c..a3d972f 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/TDeserializer.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/TDeserializer.cs
@@ -21,9 +21,6 @@
#endregion
-using System;
-using System.Linq;
-using System.Reflection;
using Gremlin.Net.Process.Traversal;
using Newtonsoft.Json.Linq;
@@ -33,10 +30,7 @@ namespace Gremlin.Net.Structure.IO.GraphSON
{
public dynamic Objectify(JToken graphsonObject, GraphSONReader reader)
{
- var tValue = graphsonObject.ToString();
- return typeof(T).GetProperties()
- .First(p => string.Equals(p.Name, tValue, StringComparison.OrdinalIgnoreCase))
- .GetValue(null);
+ return T.GetByValue(graphsonObject.ToString());
}
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/69eb333a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/CommonSteps.cs
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/CommonSteps.cs b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/CommonSteps.cs
index 31948f4..6e21bd2 100644
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/CommonSteps.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/CommonSteps.cs
@@ -240,8 +240,7 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
private static object ToT(string enumName, string graphName)
{
- return typeof(T).GetProperties()
- .First(p => string.Equals(p.Name, enumName, StringComparison.OrdinalIgnoreCase)).GetValue(null);
+ return T.GetByValue(enumName);
}
private static object ToNumber(string stringNumber, string graphName)
[38/50] tinkerpop git commit: TINKERPOP-1878 Changed gryo version of
SparqlStrategy
Posted by sp...@apache.org.
TINKERPOP-1878 Changed gryo version of SparqlStrategy
Was using some temporary nonsense before...
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/2b6fd199
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/2b6fd199
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/2b6fd199
Branch: refs/heads/TINKERPOP-1878
Commit: 2b6fd19992533093f60273ed6d62116ffaf17f25
Parents: 0b71f45
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Fri Jan 26 08:16:24 2018 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Apr 3 09:16:55 2018 -0400
----------------------------------------------------------------------
.../tinkerpop/gremlin/structure/io/gryo/GryoVersion.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2b6fd199/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java
index 4a325dd..f922411 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java
@@ -373,7 +373,7 @@ public enum GryoVersion {
add(GryoTypeReg.of(RangeGlobalStep.RangeBiOperator.class, 114));
add(GryoTypeReg.of(OrderGlobalStep.OrderBiOperator.class, 118));
add(GryoTypeReg.of(ProfileStep.ProfileBiOperator.class, 119));
- add(GryoTypeReg.of(IndexedTraverserSet.VertexIndexedTraverserSet.class, 173)); // ***LAST ID***
+ add(GryoTypeReg.of(IndexedTraverserSet.VertexIndexedTraverserSet.class, 173));
// placeholder serializers for classes that don't live here in core. this will allow them to be used if
// present or ignored if the class isn't available. either way the registration numbers are held as
@@ -383,8 +383,9 @@ public enum GryoVersion {
tryAddDynamicType(this, "org.apache.tinkerpop.gremlin.driver.message.ResponseMessage",
"org.apache.tinkerpop.gremlin.driver.ser.ResponseMessageGryoSerializer", 169);
- tryAddDynamicType(this, "org.apache.tinkerpop.gremlin.sparql.process.traversal.strategy.SparqlStrategy",
- null, 1690);
+ tryAddDynamicType(this,
+ "org.apache.tinkerpop.gremlin.sparql.process.traversal.strategy.SparqlStrategy",
+ null, 174); // ***LAST ID***
}};
}
[06/50] tinkerpop git commit: Merge branch 'tp32' into tp33
Posted by sp...@apache.org.
Merge branch 'tp32' into tp33
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/31199000
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/31199000
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/31199000
Branch: refs/heads/TINKERPOP-1878
Commit: 3119900014d581daadcd995929dbd7c761dd09b4
Parents: 177aeac bddc756
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Wed Mar 21 12:58:41 2018 -0700
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Wed Mar 21 12:58:41 2018 -0700
----------------------------------------------------------------------
.travis.yml | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
[28/50] tinkerpop git commit: TINKERPOP-1878 sparql-gremlin is now
building
Posted by sp...@apache.org.
TINKERPOP-1878 sparql-gremlin is now building
Fixed some basic pom.xml issues and resolved dependency conflicts.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/def9774e
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/def9774e
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/def9774e
Branch: refs/heads/TINKERPOP-1878
Commit: def9774e67ae47b675fec196326b710f32b7f81c
Parents: 8623ecb
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Jan 24 15:23:57 2018 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Apr 3 09:16:15 2018 -0400
----------------------------------------------------------------------
gremlin-console/pom.xml | 1 -
gremlin-server/pom.xml | 1 -
pom.xml | 18 +++++++++++++++
sparql-gremlin/pom.xml | 52 ++++++++++++++++++--------------------------
4 files changed, 39 insertions(+), 33 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/def9774e/gremlin-console/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-console/pom.xml b/gremlin-console/pom.xml
index 365fc90..1209cfe 100644
--- a/gremlin-console/pom.xml
+++ b/gremlin-console/pom.xml
@@ -39,7 +39,6 @@ limitations under the License.
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>4.5.1</version>
</dependency>
<dependency>
<groupId>commons-cli</groupId>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/def9774e/gremlin-server/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-server/pom.xml b/gremlin-server/pom.xml
index 5f8fff3..cbd3c10 100644
--- a/gremlin-server/pom.xml
+++ b/gremlin-server/pom.xml
@@ -92,7 +92,6 @@ limitations under the License.
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>4.3.5</version>
<scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/def9774e/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index bab77a4..8e982f5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -108,6 +108,18 @@ limitations under the License.
<email>twilmes@gmail.com</email>
<url>https://github.com/twilmes</url>
</contributor>
+ <contributor>
+ <name>Harsh Thakkar</name>
+ <email>harsh9t@gmail.com</email>
+ <organization>University of Bonn</organization>
+ <organizationUrl>http://harshthakkar.in</organizationUrl>
+ </contributor>
+ <contributor>
+ <name>Dharmen Punjani</name>
+ <email>dharmen.punjani@gmail.com</email>
+ <organization>National and Kapodistrian University of Athens</organization>
+ <organizationUrl>http://wdaqua.eu/students/dharmen-punjani</organizationUrl>
+ </contributor>
</contributors>
<prerequisites>
<maven>3.0.5</maven>
@@ -125,6 +137,7 @@ limitations under the License.
<module>spark-gremlin</module>
<module>giraph-gremlin</module>
<module>neo4j-gremlin</module>
+ <module>sparql-gremlin</module>
<module>gremlin-driver</module>
<module>gremlin-console</module>
<module>gremlin-server</module>
@@ -644,6 +657,11 @@ limitations under the License.
</exclusions>
</dependency>
<dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <version>4.5.1</version>
+ </dependency>
+ <dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
<version>3.1</version>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/def9774e/sparql-gremlin/pom.xml
----------------------------------------------------------------------
diff --git a/sparql-gremlin/pom.xml b/sparql-gremlin/pom.xml
index e134d31..d38a85d 100644
--- a/sparql-gremlin/pom.xml
+++ b/sparql-gremlin/pom.xml
@@ -2,55 +2,46 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>tinkerpop</artifactId>
<groupId>org.apache.tinkerpop</groupId>
<version>3.3.2-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
-
<artifactId>sparql-gremlin</artifactId>
- <organization>
- <name>WDAQUA-ITN</name>
- <url>http://wdaqua.eu</url>
- </organization>
- <developers>
- <developer>
- <name>Harsh Thakkar</name>
- <email>harsh9t@gmail.com</email>
- <organization>University of Bonn</organization>
- <organizationUrl>http://harshthakkar.in</organizationUrl>
- </developer>
- <developer>
- <name>Dharmen Punjani</name>
- <email>dharmen.punjani@gmail.com</email>
- <organization>National and Kapodistrian University of Athens</organization>
- <organizationUrl>http://wdaqua.eu/students/dharmen-punjani</organizationUrl>
- </developer>
- </developers>
+ <name>Apache TinkerPop :: SPARQL Gremlin</name>
<properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <jena.version>3.0.0</jena.version>
<query.dir>src/test/resources/sparql/queries</query.dir>
</properties>
<dependencies>
- <dependency>
- <groupId>org.apache.jena</groupId>
- <artifactId>apache-jena-libs</artifactId>
- <type>pom</type>
- <version>${jena.version}</version>
- </dependency>
+ <dependency>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>apache-jena-libs</artifactId>
+ <type>pom</type>
+ <version>3.0.0</version>
+ <exclusions>
+ <!-- self-conflict -->
+ <exclusion>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>gremlin-core</artifactId>
- <version>3.3.2-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkergraph-gremlin</artifactId>
- <version>3.3.2-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tinkerpop</groupId>
@@ -59,5 +50,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-
</project>
\ No newline at end of file
[04/50] tinkerpop git commit: Merge branch 'tp32' into tp33
Posted by sp...@apache.org.
Merge branch 'tp32' into tp33
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/177aeac9
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/177aeac9
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/177aeac9
Branch: refs/heads/TINKERPOP-1878
Commit: 177aeac9da095fe96e3b13f77f27898d291612b3
Parents: 0f29e7e 827b76e
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Mar 21 09:14:06 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Mar 21 09:14:06 2018 -0400
----------------------------------------------------------------------
docs/src/reference/the-graph.asciidoc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/177aeac9/docs/src/reference/the-graph.asciidoc
----------------------------------------------------------------------
[33/50] tinkerpop git commit: TINKERPOP-1878 Added some Traversal
infrastructure
Posted by sp...@apache.org.
TINKERPOP-1878 Added some Traversal infrastructure
This is the start of getting Sparql working as a DSL in TinkerPop
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/e8e39be1
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/e8e39be1
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/e8e39be1
Branch: refs/heads/TINKERPOP-1878
Commit: e8e39be1117761830a86bed96ce80daf94f66192
Parents: def9774
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Jan 24 17:04:27 2018 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Apr 3 09:16:16 2018 -0400
----------------------------------------------------------------------
.../dsl/sparql/DefaultSparqlTraversal.java | 55 ++++++++
.../traversal/dsl/sparql/SparqlTraversal.java | 68 +++++++++
.../dsl/sparql/SparqlTraversalSource.java | 138 +++++++++++++++++++
.../traversal/strategy/SparqlStrategy.java | 25 ++++
4 files changed, 286 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e8e39be1/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/DefaultSparqlTraversal.java
----------------------------------------------------------------------
diff --git a/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/DefaultSparqlTraversal.java b/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/DefaultSparqlTraversal.java
new file mode 100644
index 0000000..133d4be
--- /dev/null
+++ b/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/DefaultSparqlTraversal.java
@@ -0,0 +1,55 @@
+/*
+ * 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.sparql.process.traversal.dsl.sparql;
+
+import org.apache.tinkerpop.gremlin.process.traversal.util.DefaultTraversal;
+import org.apache.tinkerpop.gremlin.structure.Graph;
+
+/**
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+public class DefaultSparqlTraversal<S, E> extends DefaultTraversal<S, E> implements SparqlTraversal.Admin<S, E> {
+
+ public DefaultSparqlTraversal() {
+ super();
+ }
+
+ public DefaultSparqlTraversal(final SparqlTraversalSource sparqlTraversalSource) {
+ super(sparqlTraversalSource);
+ }
+
+ public DefaultSparqlTraversal(final Graph graph) {
+ super(graph);
+ }
+
+ @Override
+ public SparqlTraversal.Admin<S, E> asAdmin() {
+ return this;
+ }
+
+ @Override
+ public SparqlTraversal<S, E> iterate() {
+ return SparqlTraversal.Admin.super.iterate();
+ }
+
+ @Override
+ public DefaultSparqlTraversal<S, E> clone() {
+ return (DefaultSparqlTraversal<S, E>) super.clone();
+ }
+}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e8e39be1/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversal.java
----------------------------------------------------------------------
diff --git a/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversal.java b/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversal.java
new file mode 100644
index 0000000..efa9489
--- /dev/null
+++ b/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversal.java
@@ -0,0 +1,68 @@
+/*
+ * 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.sparql.process.traversal.dsl.sparql;
+
+import org.apache.tinkerpop.gremlin.process.traversal.Step;
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+
+/**
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+public interface SparqlTraversal<S, E> extends Traversal<S, E> {
+ public interface Admin<S, E> extends Traversal.Admin<S, E>, SparqlTraversal<S, E> {
+
+ @Override
+ public default <E2> SparqlTraversal.Admin<S, E2> addStep(final Step<?, E2> step) {
+ return (SparqlTraversal.Admin<S, E2>) Traversal.Admin.super.addStep((Step) step);
+ }
+
+ @Override
+ public default SparqlTraversal<S, E> iterate() {
+ return SparqlTraversal.super.iterate();
+ }
+
+ @Override
+ public SparqlTraversal.Admin<S, E> clone();
+ }
+
+ @Override
+ public default SparqlTraversal.Admin<S, E> asAdmin() {
+ return (SparqlTraversal.Admin<S, E>) this;
+ }
+
+ ////
+
+ /**
+ * Iterates the traversal presumably for the generation of side-effects.
+ */
+ @Override
+ public default SparqlTraversal<S, E> iterate() {
+ Traversal.super.iterate();
+ return this;
+ }
+
+ public static final class Symbols {
+
+ private Symbols() {
+ // static fields only
+ }
+
+ public static final String sparql = "sparql";
+ }
+}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e8e39be1/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversalSource.java
----------------------------------------------------------------------
diff --git a/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversalSource.java b/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversalSource.java
new file mode 100644
index 0000000..3596716
--- /dev/null
+++ b/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversalSource.java
@@ -0,0 +1,138 @@
+/*
+ * 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.sparql.process.traversal.dsl.sparql;
+
+import org.apache.commons.configuration.Configuration;
+import org.apache.tinkerpop.gremlin.process.remote.RemoteConnection;
+import org.apache.tinkerpop.gremlin.process.remote.traversal.strategy.decoration.RemoteStrategy;
+import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
+import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource;
+import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategies;
+import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategy;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.ConstantStep;
+import org.apache.tinkerpop.gremlin.structure.Graph;
+import org.apache.tinkerpop.gremlin.structure.Transaction;
+import org.apache.tinkerpop.gremlin.structure.util.StringFactory;
+
+/**
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+public class SparqlTraversalSource implements TraversalSource {
+ protected transient RemoteConnection connection;
+ protected final Graph graph;
+ protected TraversalStrategies strategies;
+ protected Bytecode bytecode = new Bytecode();
+
+ public SparqlTraversalSource(final Graph graph, final TraversalStrategies traversalStrategies) {
+ this.graph = graph;
+ this.strategies = traversalStrategies;
+ }
+
+ public SparqlTraversalSource(final Graph graph) {
+ this(graph, TraversalStrategies.GlobalCache.getStrategies(graph.getClass()));
+ }
+
+ @Override
+ public TraversalStrategies getStrategies() {
+ return this.strategies;
+ }
+
+ @Override
+ public Graph getGraph() {
+ return this.graph;
+ }
+
+ @Override
+ public Bytecode getBytecode() {
+ return this.bytecode;
+ }
+
+ @SuppressWarnings("CloneDoesntDeclareCloneNotSupportedException")
+ public SparqlTraversalSource clone() {
+ try {
+ final SparqlTraversalSource clone = (SparqlTraversalSource) super.clone();
+ clone.strategies = this.strategies.clone();
+ clone.bytecode = this.bytecode.clone();
+ return clone;
+ } catch (final CloneNotSupportedException e) {
+ throw new IllegalStateException(e.getMessage(), e);
+ }
+ }
+
+ //// CONFIGURATIONS
+
+ @Override
+ public SparqlTraversalSource withStrategies(final TraversalStrategy... traversalStrategies) {
+ return (SparqlTraversalSource) TraversalSource.super.withStrategies(traversalStrategies);
+ }
+
+ @Override
+ @SuppressWarnings({"unchecked"})
+ public SparqlTraversalSource withoutStrategies(final Class<? extends TraversalStrategy>... traversalStrategyClasses) {
+ return (SparqlTraversalSource) TraversalSource.super.withoutStrategies(traversalStrategyClasses);
+ }
+
+ @Override
+ public SparqlTraversalSource withRemote(final Configuration conf) {
+ return (SparqlTraversalSource) TraversalSource.super.withRemote(conf);
+ }
+
+ @Override
+ public SparqlTraversalSource withRemote(final String configFile) throws Exception {
+ return (SparqlTraversalSource) TraversalSource.super.withRemote(configFile);
+ }
+
+ @Override
+ public SparqlTraversalSource withRemote(final RemoteConnection connection) {
+ try {
+ // check if someone called withRemote() more than once, so just release resources on the initial
+ // connection as you can't have more than one. maybe better to toss IllegalStateException??
+ if (this.connection != null)
+ this.connection.close();
+ } catch (Exception ignored) {
+ // not sure there's anything to do here
+ }
+
+ this.connection = connection;
+ final TraversalSource clone = this.clone();
+ clone.getStrategies().addStrategies(new RemoteStrategy(connection));
+ return (SparqlTraversalSource) clone;
+ }
+
+ public <S> SparqlTraversal<S,String> sparql(final String query) {
+ final SparqlTraversalSource clone = this.clone();
+ clone.bytecode.addStep(SparqlTraversal.Symbols.sparql, query);
+ final SparqlTraversal.Admin<S, S> traversal = new DefaultSparqlTraversal<>(clone);
+ return traversal.addStep(new ConstantStep<S,String>(traversal, query));
+ }
+
+ public Transaction tx() {
+ return this.graph.tx();
+ }
+
+ @Override
+ public void close() throws Exception {
+ if (connection != null) connection.close();
+ }
+
+ @Override
+ public String toString() {
+ return StringFactory.traversalSourceString(this);
+ }
+}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e8e39be1/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/strategy/SparqlStrategy.java
----------------------------------------------------------------------
diff --git a/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/strategy/SparqlStrategy.java b/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/strategy/SparqlStrategy.java
new file mode 100644
index 0000000..6440127
--- /dev/null
+++ b/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/strategy/SparqlStrategy.java
@@ -0,0 +1,25 @@
+/*
+ * 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.sparql.process.traversal.strategy;
+
+/**
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+public class SparqlStrategy {
+}
[08/50] tinkerpop git commit: Revert "Bind netty in spark to the
project level version CTR"
Posted by sp...@apache.org.
Revert "Bind netty in spark to the project level version CTR"
This reverts commit 0c930c0bdc5807c8d82d858fe2756bba08bf6e0b.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/a348d498
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/a348d498
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/a348d498
Branch: refs/heads/TINKERPOP-1878
Commit: a348d49838092dc9737f10db821f50d9c53f0919
Parents: 3119900
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Wed Mar 21 12:03:17 2018 -0700
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Wed Mar 21 12:59:06 2018 -0700
----------------------------------------------------------------------
spark-gremlin/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a348d498/spark-gremlin/pom.xml
----------------------------------------------------------------------
diff --git a/spark-gremlin/pom.xml b/spark-gremlin/pom.xml
index 91d7b50..906b7d2 100644
--- a/spark-gremlin/pom.xml
+++ b/spark-gremlin/pom.xml
@@ -281,7 +281,7 @@
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-all</artifactId>
- <version>${netty.version}</version>
+ <version>4.0.29.Final</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
[10/50] tinkerpop git commit: Merge branch 'tp32' into tp33
Posted by sp...@apache.org.
Merge branch 'tp32' into tp33
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/58691c68
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/58691c68
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/58691c68
Branch: refs/heads/TINKERPOP-1878
Commit: 58691c684f29707699e0111f52d38bc8cbfedc48
Parents: da8588b 373eba1
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Mar 22 09:13:23 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Mar 22 09:13:23 2018 -0400
----------------------------------------------------------------------
.../tinkerpop/gremlin/process/computer/GraphComputerTest.java | 2 +-
.../tinkerpop/gremlin/tinkergraph/structure/TinkerFactory.java | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/58691c68/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
----------------------------------------------------------------------
[27/50] tinkerpop git commit: CTR: Removed links to GremlinBin as it
no longer exists.
Posted by sp...@apache.org.
CTR: Removed links to GremlinBin as it no longer exists.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/d40d60a1
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/d40d60a1
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/d40d60a1
Branch: refs/heads/TINKERPOP-1878
Commit: d40d60a1df5ed6ddd9d4f50fc2f6116e108f2c5e
Parents: bd0324c
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Thu Mar 29 08:27:34 2018 -0700
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Thu Mar 29 08:27:34 2018 -0700
----------------------------------------------------------------------
docs/site/home/images/goutte-blue.png | Bin 13400 -> 0 bytes
docs/site/home/index.html | 1 -
docs/site/home/template/header-footer.html | 2 --
3 files changed, 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d40d60a1/docs/site/home/images/goutte-blue.png
----------------------------------------------------------------------
diff --git a/docs/site/home/images/goutte-blue.png b/docs/site/home/images/goutte-blue.png
deleted file mode 100644
index 224dd38..0000000
Binary files a/docs/site/home/images/goutte-blue.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d40d60a1/docs/site/home/index.html
----------------------------------------------------------------------
diff --git a/docs/site/home/index.html b/docs/site/home/index.html
index 817c392..9377530 100644
--- a/docs/site/home/index.html
+++ b/docs/site/home/index.html
@@ -280,7 +280,6 @@ limitations under the License.
<h4 id="poweredby">Powered By</h4>
<ul>
<li><a href="https://bricaud.github.io/graphexp/graphexp.html">Graphexp</a> - Interactive visualization of the Gremlin graph database with D3.js.</li>
- <li><a href="http://gremlinbin.com/">Gremlin-Bin</a> - A code pasting platform for Gremlin queries.</li>
<li><a href="http://www.pitneybowes.com/us/customer-information-management/data-integration-management/spectrum-data-hub-module.html">Pitney Bowes Spectrum Data Hub Module</a> - Uses Gremlin OLTP to query Neo4j-powered master data management based graph database.</li>
</ul>
<a name="committers"></a>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d40d60a1/docs/site/home/template/header-footer.html
----------------------------------------------------------------------
diff --git a/docs/site/home/template/header-footer.html b/docs/site/home/template/header-footer.html
index 023601b..de0ba5c 100644
--- a/docs/site/home/template/header-footer.html
+++ b/docs/site/home/template/header-footer.html
@@ -95,8 +95,6 @@ limitations under the License.
<li class="dropdown">
<a class="dropdown-toggle" data-toggle="dropdown" href="#">Tutorials<b class="caret"></b></a>
<ul class="dropdown-menu">
- <li><a href="http://gremlinbin.com/"><img src="images/goutte-blue.png" class="nav-icon"/>Try Gremlin</a></li>
- <li role="separator" class="divider"></li>
<li><a href="gremlin.html">Introduction to Gremlin</a></li>
<li><a href="http://tinkerpop.apache.org/docs/current/tutorials/getting-started/">Getting Started</a></li>
<li><a href="http://tinkerpop.apache.org/docs/current/tutorials/the-gremlin-console/">The Gremlin Console</a></li>
[25/50] tinkerpop git commit: Merge branch 'tp32' into tp33
Posted by sp...@apache.org.
Merge branch 'tp32' into tp33
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/9a75f921
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/9a75f921
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/9a75f921
Branch: refs/heads/TINKERPOP-1878
Commit: 9a75f921a496813a06b1205a017e952b45c203e9
Parents: 2e74c31 2a9e7e2
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Mar 27 13:33:03 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Mar 27 13:33:03 2018 -0400
----------------------------------------------------------------------
.../io/graphson/GraphSONTypeSerializerV2d0.java | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9a75f921/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeSerializerV2d0.java
----------------------------------------------------------------------
diff --cc gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeSerializerV2d0.java
index a335baf,0000000..3fdb50a
mode 100644,000000..100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeSerializerV2d0.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeSerializerV2d0.java
@@@ -1,150 -1,0 +1,146 @@@
+/*
+ * 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.io.graphson;
+
+import org.apache.tinkerpop.gremlin.process.traversal.Operator;
+import org.apache.tinkerpop.gremlin.process.traversal.Order;
+import org.apache.tinkerpop.gremlin.process.traversal.Path;
+import org.apache.tinkerpop.gremlin.process.traversal.Pop;
+import org.apache.tinkerpop.gremlin.process.traversal.SackFunctions;
+import org.apache.tinkerpop.gremlin.process.traversal.Scope;
+import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
+import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalOptionParent;
+import org.apache.tinkerpop.gremlin.process.traversal.util.Metrics;
+import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalMetrics;
+import org.apache.tinkerpop.gremlin.structure.Column;
+import org.apache.tinkerpop.gremlin.structure.Direction;
+import org.apache.tinkerpop.gremlin.structure.Edge;
+import org.apache.tinkerpop.gremlin.structure.Property;
+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.Lambda;
+import org.apache.tinkerpop.shaded.jackson.core.JsonGenerator;
+import org.apache.tinkerpop.shaded.jackson.core.JsonToken;
+import org.apache.tinkerpop.shaded.jackson.core.type.WritableTypeId;
+import org.apache.tinkerpop.shaded.jackson.databind.jsontype.TypeIdResolver;
+
+import java.io.IOException;
+import java.net.InetAddress;
+import java.nio.ByteBuffer;
+
+/**
+ * GraphSON 2.0 {@code TypeSerializer}.
+ *
+ * @author Kevin Gallardo (https://kgdo.me)
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+public class GraphSONTypeSerializerV2d0 extends AbstractGraphSONTypeSerializer {
+
+ GraphSONTypeSerializerV2d0(final TypeIdResolver idRes, final String propertyName, final TypeInfo typeInfo,
+ final String valuePropertyName) {
+ super(idRes, propertyName, typeInfo, valuePropertyName);
+ }
+
+ @Override
+ public WritableTypeId writeTypePrefix(final JsonGenerator jsonGenerator, final WritableTypeId writableTypeId) throws IOException {
- if (writableTypeId.valueShape == JsonToken.VALUE_STRING) {
- if (canWriteTypeId()) {
- writeTypePrefix(jsonGenerator, getTypeIdResolver().idFromValueAndType(writableTypeId.forValue, getClassFromObject(writableTypeId.forValue)));
- }
- } else if (writableTypeId.valueShape == JsonToken.START_OBJECT) {
++ if (writableTypeId.valueShape == JsonToken.START_OBJECT) {
+ jsonGenerator.writeStartObject();
+ } else if (writableTypeId.valueShape == JsonToken.START_ARRAY) {
+ jsonGenerator.writeStartArray();
++ } else if (canWriteTypeId()) {
++ writeTypePrefix(jsonGenerator, getTypeIdResolver().idFromValueAndType(writableTypeId.forValue, getClassFromObject(writableTypeId.forValue)));
+ } else {
+ throw new IllegalStateException("Could not write prefix: shape[" + writableTypeId.valueShape + "] value[" + writableTypeId.forValue + "]");
+ }
+
+ return writableTypeId;
+ }
+
+ @Override
+ public WritableTypeId writeTypeSuffix(final JsonGenerator jsonGenerator, final WritableTypeId writableTypeId) throws IOException {
- if (writableTypeId.valueShape == JsonToken.VALUE_STRING) {
- if (canWriteTypeId()) {
- writeTypeSuffix(jsonGenerator);
- }
- } else if (writableTypeId.valueShape == JsonToken.START_OBJECT) {
++ if (writableTypeId.valueShape == JsonToken.START_OBJECT) {
+ jsonGenerator.writeEndObject();
+ } else if (writableTypeId.valueShape == JsonToken.START_ARRAY) {
+ jsonGenerator.writeEndArray();
++ } else if (canWriteTypeId()) {
++ writeTypeSuffix(jsonGenerator);
+ } else {
+ throw new IllegalStateException("Could not write suffix: shape[" + writableTypeId.valueShape + "] value[" + writableTypeId.forValue + "]");
+ }
+
+ return writableTypeId;
+ }
+
+ @Override
+ protected Class getClassFromObject(final Object o) {
+ final Class c = o.getClass();
+ if (classMap.containsKey(c))
+ return classMap.get(c);
+
+ final Class mapped;
+ if (Vertex.class.isAssignableFrom(c))
+ mapped = Vertex.class;
+ else if (Edge.class.isAssignableFrom(c))
+ mapped = Edge.class;
+ else if (Path.class.isAssignableFrom(c))
+ mapped = Path.class;
+ else if (VertexProperty.class.isAssignableFrom(c))
+ mapped = VertexProperty.class;
+ else if (Metrics.class.isAssignableFrom(c))
+ mapped = Metrics.class;
+ else if (TraversalMetrics.class.isAssignableFrom(c))
+ mapped = TraversalMetrics.class;
+ else if (Property.class.isAssignableFrom(c))
+ mapped = Property.class;
+ else if (ByteBuffer.class.isAssignableFrom(c))
+ mapped = ByteBuffer.class;
+ else if (InetAddress.class.isAssignableFrom(c))
+ mapped = InetAddress.class;
+ else if (Traverser.class.isAssignableFrom(c))
+ mapped = Traverser.class;
+ else if (Lambda.class.isAssignableFrom(c))
+ mapped = Lambda.class;
+ else if (VertexProperty.Cardinality.class.isAssignableFrom(c))
+ mapped = VertexProperty.Cardinality.class;
+ else if (Column.class.isAssignableFrom(c))
+ mapped = Column.class;
+ else if (Direction.class.isAssignableFrom(c))
+ mapped = Direction.class;
+ else if (Operator.class.isAssignableFrom(c))
+ mapped = Operator.class;
+ else if (Order.class.isAssignableFrom(c))
+ mapped = Order.class;
+ else if (Pop.class.isAssignableFrom(c))
+ mapped = Pop.class;
+ else if (SackFunctions.Barrier.class.isAssignableFrom(c))
+ mapped = SackFunctions.Barrier.class;
+ else if (TraversalOptionParent.Pick.class.isAssignableFrom(c))
+ mapped = TraversalOptionParent.Pick.class;
+ else if (Scope.class.isAssignableFrom(c))
+ mapped = Scope.class;
+ else if (T.class.isAssignableFrom(c))
+ mapped = T.class;
+ else
+ mapped = c;
+
+ classMap.put(c, mapped);
+ return mapped;
+ }
+}
[07/50] tinkerpop git commit: Bind netty in spark to the version used
in Apache Spark
Posted by sp...@apache.org.
Bind netty in spark to the version used in Apache Spark
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/da8588b9
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/da8588b9
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/da8588b9
Branch: refs/heads/TINKERPOP-1878
Commit: da8588b9c315198a9ac4b61db57de32ada53d368
Parents: a348d49
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Wed Mar 21 12:29:16 2018 -0700
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Wed Mar 21 12:59:06 2018 -0700
----------------------------------------------------------------------
spark-gremlin/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/da8588b9/spark-gremlin/pom.xml
----------------------------------------------------------------------
diff --git a/spark-gremlin/pom.xml b/spark-gremlin/pom.xml
index 906b7d2..8e3d352 100644
--- a/spark-gremlin/pom.xml
+++ b/spark-gremlin/pom.xml
@@ -281,12 +281,12 @@
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-all</artifactId>
- <version>4.0.29.Final</version>
+ <version>4.0.43.Final</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty</artifactId>
- <version>3.8.0.Final</version>
+ <version>3.9.9.Final</version>
</dependency>
<!-- TEST -->
<dependency>
[35/50] tinkerpop git commit: TINKERPOP-1878 Test cleanup for
sparql-gremlin
Posted by sp...@apache.org.
TINKERPOP-1878 Test cleanup for sparql-gremlin
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/0b71f45c
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/0b71f45c
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/0b71f45c
Branch: refs/heads/TINKERPOP-1878
Commit: 0b71f45c282142f8f9365ad60d525bb8d569f808
Parents: c67524a
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Fri Jan 26 08:10:48 2018 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Apr 3 09:16:55 2018 -0400
----------------------------------------------------------------------
sparql-gremlin/pom.xml | 10 +-
.../dsl/sparql/SparqlTraversalSource.java | 4 +-
.../gremlin/sparql/ResourceHelper.java | 37 ---
.../sparql/SparqlToGremlinCompilerTest.java | 223 -------------------
.../dsl/sparql/SparqlTraversalSourceTest.java | 31 ++-
5 files changed, 36 insertions(+), 269 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0b71f45c/sparql-gremlin/pom.xml
----------------------------------------------------------------------
diff --git a/sparql-gremlin/pom.xml b/sparql-gremlin/pom.xml
index 0e3da38..731b822 100644
--- a/sparql-gremlin/pom.xml
+++ b/sparql-gremlin/pom.xml
@@ -41,9 +41,13 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.tinkerpop</groupId>
- <artifactId>gremlin-test</artifactId>
- <version>${project.version}</version>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-all</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0b71f45c/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversalSource.java
----------------------------------------------------------------------
diff --git a/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversalSource.java b/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversalSource.java
index deb16f7..cc54aa5 100644
--- a/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversalSource.java
+++ b/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversalSource.java
@@ -28,6 +28,7 @@ import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal;
import org.apache.tinkerpop.gremlin.process.traversal.step.map.ConstantStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.InjectStep;
+import org.apache.tinkerpop.gremlin.sparql.process.traversal.strategy.SparqlStrategy;
import org.apache.tinkerpop.gremlin.structure.Graph;
import org.apache.tinkerpop.gremlin.structure.Transaction;
import org.apache.tinkerpop.gremlin.structure.util.StringFactory;
@@ -46,6 +47,7 @@ public class SparqlTraversalSource implements TraversalSource {
public SparqlTraversalSource(final Graph graph, final TraversalStrategies traversalStrategies) {
this.graph = graph;
this.strategies = traversalStrategies;
+ this.strategies.addStrategies(SparqlStrategy.instance());
}
public SparqlTraversalSource(final Graph graph) {
@@ -122,7 +124,7 @@ public class SparqlTraversalSource implements TraversalSource {
/**
* The start step for a SPARQL based traversal that accepts a string representation of the query to execute.
*/
- public <S> SparqlTraversal<S,String> sparql(final String query) {
+ public <S> SparqlTraversal<S,?> sparql(final String query) {
final SparqlTraversalSource clone = this.clone();
// this is a bit of a hack to get remote traversals to work cleanly. on the remote side, we'd expect a
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0b71f45c/sparql-gremlin/src/test/java/org/apache/tinkerpop/gremlin/sparql/ResourceHelper.java
----------------------------------------------------------------------
diff --git a/sparql-gremlin/src/test/java/org/apache/tinkerpop/gremlin/sparql/ResourceHelper.java b/sparql-gremlin/src/test/java/org/apache/tinkerpop/gremlin/sparql/ResourceHelper.java
deleted file mode 100644
index 4f58e61..0000000
--- a/sparql-gremlin/src/test/java/org/apache/tinkerpop/gremlin/sparql/ResourceHelper.java
+++ /dev/null
@@ -1,37 +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.sparql;
-
-import org.apache.commons.io.IOUtils;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-/**
- * @author Daniel Kuppitz (http://gremlin.guru)
- */
-public class ResourceHelper {
-
- public static String loadQuery(final String prefix, final int number) throws IOException {
- final String path = "/queries/" + prefix + number + ".sparql";
- final InputStream stream = ResourceHelper.class.getResourceAsStream(path);
- return IOUtils.toString(stream, "UTF-8");
- }
-}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0b71f45c/sparql-gremlin/src/test/java/org/apache/tinkerpop/gremlin/sparql/SparqlToGremlinCompilerTest.java
----------------------------------------------------------------------
diff --git a/sparql-gremlin/src/test/java/org/apache/tinkerpop/gremlin/sparql/SparqlToGremlinCompilerTest.java b/sparql-gremlin/src/test/java/org/apache/tinkerpop/gremlin/sparql/SparqlToGremlinCompilerTest.java
deleted file mode 100644
index 3fb49e8..0000000
--- a/sparql-gremlin/src/test/java/org/apache/tinkerpop/gremlin/sparql/SparqlToGremlinCompilerTest.java
+++ /dev/null
@@ -1,223 +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.sparql;
-
-import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
-import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal;
-import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
-import org.apache.tinkerpop.gremlin.structure.Graph;
-import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerFactory;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.apache.tinkerpop.gremlin.process.computer.Computer;
-import org.apache.tinkerpop.gremlin.structure.Vertex;
-import static org.apache.tinkerpop.gremlin.sparql.SparqlToGremlinCompiler.convertToGremlinTraversal;
-import static org.junit.Assert.assertEquals;
-
-
-import java.io.IOException;
-
-import static org.apache.tinkerpop.gremlin.sparql.ResourceHelper.loadQuery;
-
-
-public class SparqlToGremlinCompilerTest {
-
- private Graph modern, crew;
- private GraphTraversalSource mg, cg;
- private GraphTraversalSource mc, cc;
-/*
- @Before
- public void setUp() throws Exception {
- modern = TinkerFactory.createModern();
- mg = modern.traversal();
- mc = modern.traversal(computer());
- crew = TinkerFactory.createTheCrew();
- cg = modern.traversal();
- cc = modern.traversal(computer());
- }
-
- @Ignore
- @Test
- public void play() throws IOException {
- final String query = loadQuery("modern", 11);
- final Traversal traversal = convertToGremlinTraversal(modern, query);
- System.out.println(traversal);
- System.out.println(traversal.toList());
- System.out.println(traversal);
- }
-
- /* Modern */
-
- /* @Test
- public void testModern1() throws Exception {
- final GraphTraversal expected = mg.V().match(
- as("a").hasLabel("person"),
- as("a").out("knows").as("b"),
- as("a").out("created").as("c"),
- as("b").out("created").as("c"),
- as("a").values("age").as("d")).where(as("d").is(lt(30))).
- select("a", "b", "c");
- assertEquals(expected, convertToGremlinTraversal(modern, loadQuery("modern", 1)));
- }
-
- @Test
- public void testModern2() throws Exception {
- final GraphTraversal expected = mg.V().match(
- as("a").hasLabel("person"),
- as("a").out("knows").as("b"),
- as("a").out("created").as("c"),
- as("b").out("created").as("c"),
- as("a").values("age").as("d")).where(as("d").is(lt(30)));
- assertEquals(expected, convertToGremlinTraversal(modern, loadQuery("modern", 2)));
- }
-
- @Test
- public void testModern3() throws Exception {
- final GraphTraversal expected = mg.V().match(
- as("person").values("name").as("name"),
- as("person").values("age").as("age")).select("name", "age");
- assertEquals(expected, convertToGremlinTraversal(modern, loadQuery("modern", 3)));
- }
-
- @Test
- public void testModern4() throws Exception {
- final GraphTraversal expected = mg.V().match(
- as("person").values("name").as("name"),
- as("person").values("age").as("age"),
- as("person").out("created").as("project"),
- as("project").values("name").is("lop")).select("name", "age");
- assertEquals(expected, convertToGremlinTraversal(modern, loadQuery("modern", 4)));
- }
-
- @Test
- public void testModern5() throws Exception {
- final GraphTraversal expected = mg.V().match(
- as("person").values("name").as("name"),
- as("person").values("age").is(29)).select("name");
- assertEquals(expected, convertToGremlinTraversal(modern, loadQuery("modern", 5)));
- }
-
- @Test
- public void testModern6() throws Exception {
- final GraphTraversal expected = mg.V().match(
- as("person").values("name").as("name"),
- as("person").values("age").as("age")).where(and(as("age").is(gt(30)), as("age").is(lt(40)))).
- select("name", "age");
- assertEquals(expected, convertToGremlinTraversal(modern, loadQuery("modern", 6)));
- }
-
- @Test
- public void testModern7() throws Exception {
- final GraphTraversal expected = mg.V().match(
- as("person").values("name").as("name"),
- as("person").values("age").as("age")).where(or(as("age").is(lt(30)), as("age").is(gt(40)))).
- select("name", "age");
- assertEquals(expected, convertToGremlinTraversal(modern, loadQuery("modern", 7)));
- }
-
- @Test
- public void testModern8() throws Exception {
- final GraphTraversal expected = mg.V().match(
- as("person").values("name").as("name"),
- as("person").values("age").as("age")).where(
- or(and(as("age").is(gt(30)), as("age").is(lt(40))), as("name").is("marko"))).
- select("name", "age");
- assertEquals(expected, convertToGremlinTraversal(modern, loadQuery("modern", 8)));
- }
-
- @Test
- public void testModern9() throws Exception {
- final GraphTraversal expected = mg.V().match(
- as("a").values("name").as("name")).where(as("a").values("age")).
- select("name");
- assertEquals(expected, convertToGremlinTraversal(modern, loadQuery("modern", 9)));
- }
-
- @Test
- public void testModern10() throws Exception {
- final GraphTraversal expected = mg.V().match(
- as("a").values("name").as("name")).where(__.not(as("a").values("age"))).
- select("name");
- assertEquals(expected, convertToGremlinTraversal(modern, loadQuery("modern", 10)));
- }
-
- @Test
- public void testModern11() throws Exception {
- final GraphTraversal expected = mg.V().match(
- as("a").out("created").as("b"),
- as("a").values("name").as("name")).dedup("name").select("name");
- assertEquals(expected, convertToGremlinTraversal(modern, loadQuery("modern", 11)));
- }
-
- @Test
- public void testModern12() throws Exception {
- final GraphTraversal expected = mg.V().match(
- as("a").out("created").as("b"),
- as("b").values("name").as("name")).dedup();
- assertEquals(expected, convertToGremlinTraversal(modern, loadQuery("modern", 12)));
- }
-
- @Test
- public void testModern13() throws Exception {
- final GraphTraversal expected = mg.V().match(
- as("a").out("created").as("b"),
- as("a").values("name").as("c")).dedup("a", "b", "c").select("a", "b", "c");
- assertEquals(expected, convertToGremlinTraversal(modern, loadQuery("modern", 13)));
- }
-
- /* The Crew */
-
- /* @Test
- public void testCrew1() throws Exception {
- final GraphTraversal expected = cg.V().match(
- as("a").values("name").is("daniel"),
- as("a").properties("location").as("b"),
- as("b").value().as("c"),
- as("b").values("startTime").as("d")).
- select("c", "d");
- assertEquals(expected, convertToGremlinTraversal(crew, loadQuery("crew", 1)));
- }
-
- /* Computer Mode */
-
- /* @Test
- public void testModernInComputerMode() throws Exception {
- final GraphTraversal expected = mc.V().match(
- as("a").hasLabel("person"),
- as("a").out("knows").as("b"),
- as("a").out("created").as("c"),
- as("b").out("created").as("c"),
- as("a").values("age").as("d")).where(as("d").is(lt(30))).
- select("a", "b", "c");
- assertEquals(expected, convertToGremlinTraversal(mc, loadQuery("modern", 1)));
- }
-
- @Test
- public void testCrewInComputerMode() throws Exception {
- final GraphTraversal expected = cc.V().match(
- as("a").values("name").is("daniel"),
- as("a").properties("location").as("b"),
- as("b").value().as("c"),
- as("b").values("startTime").as("d")).
- select("c", "d");
- assertEquals(expected, convertToGremlinTraversal(crew, loadQuery("crew", 1)));
- } */
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0b71f45c/sparql-gremlin/src/test/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversalSourceTest.java
----------------------------------------------------------------------
diff --git a/sparql-gremlin/src/test/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversalSourceTest.java b/sparql-gremlin/src/test/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversalSourceTest.java
index 9e5ffc0..9bb6025 100644
--- a/sparql-gremlin/src/test/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversalSourceTest.java
+++ b/sparql-gremlin/src/test/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversalSourceTest.java
@@ -18,11 +18,16 @@
*/
package org.apache.tinkerpop.gremlin.sparql.process.traversal.dsl.sparql;
-import org.apache.tinkerpop.gremlin.sparql.process.traversal.strategy.SparqlStrategy;
import org.apache.tinkerpop.gremlin.structure.Graph;
import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerFactory;
import org.junit.Test;
+import java.util.HashMap;
+import java.util.List;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.collection.IsIterableContainingInAnyOrder.containsInAnyOrder;
+
/**
* @author Stephen Mallette (http://stephen.genoprime.com)
*/
@@ -31,9 +36,25 @@ public class SparqlTraversalSourceTest {
@Test
public void shouldDoStuff() {
final Graph graph = TinkerFactory.createModern();
- final SparqlTraversalSource g = graph.traversal(SparqlTraversalSource.class).
- withStrategies(SparqlStrategy.instance());
- final Object x = g.sparql("SELECT ?name ?age WHERE { ?person v:name ?name . ?person v:age ?age }").toList();
- System.out.println(x);
+ final SparqlTraversalSource g = graph.traversal(SparqlTraversalSource.class);
+ final List<?> x = g.sparql("SELECT ?name ?age WHERE { ?person v:name ?name . ?person v:age ?age }").toList();
+ assertThat(x, containsInAnyOrder(
+ new HashMap<String,Object>(){{
+ put("name", "marko");
+ put("age", 29);
+ }},
+ new HashMap<String,Object>(){{
+ put("name", "vadas");
+ put("age", 27);
+ }},
+ new HashMap<String,Object>(){{
+ put("name", "josh");
+ put("age", 32);
+ }},
+ new HashMap<String,Object>(){{
+ put("name", "peter");
+ put("age", 35);
+ }}
+ ));
}
}
[15/50] tinkerpop git commit: Merge remote-tracking branch
'origin/TINKERPOP-1865' into tp33
Posted by sp...@apache.org.
Merge remote-tracking branch 'origin/TINKERPOP-1865' into tp33
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/ffabea86
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/ffabea86
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/ffabea86
Branch: refs/heads/TINKERPOP-1878
Commit: ffabea8656a435fd073e418b565885753bf820a3
Parents: eb35177 4c64bc0
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Mar 22 15:06:02 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Mar 22 15:06:02 2018 -0400
----------------------------------------------------------------------
.../Gherkin/CommonSteps.cs | 5 ++--
.../Gherkin/GherkinTestRunner.cs | 4 +++-
.../Gherkin/IgnoreException.cs | 4 ++++
.../Gherkin/ScenarioData.cs | 24 +++++---------------
.../RemoteConnectionFactory.cs | 6 ++---
gremlin-test/features/map/Order.feature | 2 +-
6 files changed, 19 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
[37/50] tinkerpop git commit: TINKERPOP-1878 Major refactoring of
sparql-gremlin classes
Posted by sp...@apache.org.
TINKERPOP-1878 Major refactoring of sparql-gremlin classes
Renamed the "compiler" to a "transpiler" since it's really transforming sparql to a language of a similar level of abstraction in Gremlin. Lots of code reformatting and dead code pruning.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/0d1e09c2
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/0d1e09c2
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/0d1e09c2
Branch: refs/heads/TINKERPOP-1878
Commit: 0d1e09c2bce1c5a511d95bd25d2152934ae74264
Parents: aacea62
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Fri Jan 26 13:36:29 2018 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Apr 3 09:16:55 2018 -0400
----------------------------------------------------------------------
.../gremlin/sparql/SparqlToGremlinCompiler.java | 381 -------------------
.../sparql/SparqlToGremlinTranspiler.java | 286 ++++++++++++++
.../gremlin/sparql/TraversalBuilder.java | 7 +-
.../gremlin/sparql/WhereTraversalBuilder.java | 66 ++--
.../traversal/strategy/SparqlStrategy.java | 5 +-
5 files changed, 322 insertions(+), 423 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0d1e09c2/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/SparqlToGremlinCompiler.java
----------------------------------------------------------------------
diff --git a/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/SparqlToGremlinCompiler.java b/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/SparqlToGremlinCompiler.java
deleted file mode 100644
index adb36e9..0000000
--- a/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/SparqlToGremlinCompiler.java
+++ /dev/null
@@ -1,381 +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.sparql;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.apache.jena.graph.Triple;
-import org.apache.jena.query.Query;
-import org.apache.jena.query.QueryFactory;
-import org.apache.jena.query.SortCondition;
-import org.apache.jena.query.Syntax;
-import org.apache.jena.sparql.algebra.Algebra;
-import org.apache.jena.sparql.algebra.Op;
-import org.apache.jena.sparql.algebra.OpVisitorBase;
-import org.apache.jena.sparql.algebra.OpWalker;
-import org.apache.jena.sparql.algebra.op.OpBGP;
-import org.apache.jena.sparql.algebra.op.OpFilter;
-import org.apache.jena.sparql.algebra.op.OpLeftJoin;
-import org.apache.jena.sparql.algebra.op.OpUnion;
-import org.apache.jena.sparql.core.Var;
-import org.apache.jena.sparql.core.VarExprList;
-import org.apache.jena.sparql.expr.Expr;
-import org.apache.jena.sparql.expr.ExprAggregator;
-import org.apache.tinkerpop.gremlin.process.traversal.Order;
-import org.apache.tinkerpop.gremlin.process.traversal.Scope;
-import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
-import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal;
-import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
-import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
-import org.apache.tinkerpop.gremlin.structure.Graph;
-import org.apache.tinkerpop.gremlin.structure.Vertex;
-
-// TODO: implement OpVisitor, don't extend OpVisitorBase
-public class SparqlToGremlinCompiler extends OpVisitorBase {
-
- private GraphTraversal<Vertex, ?> traversal;
-
- List<Traversal> traversalList = new ArrayList<Traversal>();
-
- String groupVariable = "";
- int sortingDirection = 0;
- long offsetLimit = 0;
- String sortingVariable = "";
-
- GraphTraversalSource temp;
- Graph graph;
-
- private SparqlToGremlinCompiler(final GraphTraversal<Vertex, ?> traversal) {
- this.traversal = traversal;
- }
-
- private SparqlToGremlinCompiler(final GraphTraversalSource g) {
- this(g.V());
- temp = g;
-
- }
-
- private SparqlToGremlinCompiler(final Graph g) {
- this.traversal = (GraphTraversal<Vertex, ?>) g.traversal();
- graph = g;
- }
-
- public String createMatchStep(String step) {
- String st = "";
- step = step.substring(1, step.length() - 2);
- String first = step.substring(0, step.indexOf(","));
- String second = step.substring(step.indexOf(",") + 1);
- //System.out.println("First : " + first);
- //System.out.println("Second : " + second);
- st = first.substring(first.indexOf("["), first.length() - 1);
- st = "[" + st + "," + second + "]";
- return st;
- }
-
- GraphTraversal<Vertex, ?> convertToGremlinTraversal(final Query query) {
-
- // long startTime = System.currentTimeMillis();
- // long endTime;
- final Op op = Algebra.compile(query); // SPARQL query compiles here to
- // OP
-// System.out.println("OP Tree: " + op.toString());
-
-
- OpWalker.walk(op, this); // OP is being walked here
-
-
-
-
- //System.out.println("time taken for opWalker:"+ (endTime-startTime));
- // startTime = System.currentTimeMillis();
- int traversalIndex = 0;
- int numberOfTraversal = traversalList.size();
- Traversal arrayOfAllTraversals[] = new Traversal[numberOfTraversal];
-
- if (query.hasOrderBy() && !query.hasGroupBy()) {
- List<SortCondition> sortingConditions = query.getOrderBy();
- int directionOfSort = 0;
-
- for (SortCondition sortCondition : sortingConditions) {
- Expr expr = sortCondition.getExpression();
- directionOfSort = sortCondition.getDirection();
- sortingVariable = expr.getVarName();
-
- }
-
- Order orderDirection = Order.incr;
- if (directionOfSort == -1) {
- orderDirection = Order.decr;
- }
- }
- for (Traversal tempTrav : traversalList) {
-
- arrayOfAllTraversals[traversalIndex++] = tempTrav;
- }
-
- int directionOfSort = 0;
- Order orderDirection = Order.incr;
- if (query.hasOrderBy()) {
- List<SortCondition> sortingConditions = query.getOrderBy();
-
- //
- for (SortCondition sortCondition : sortingConditions) {
- Expr expr = sortCondition.getExpression();
- directionOfSort = sortCondition.getDirection();
- sortingVariable = expr.getVarName();
-// System.out.println("order by var: "+sortingDirection);
- }
- //
-
- if (directionOfSort == -1) {
- orderDirection = Order.decr;
- }
-
- }
-
- if (traversalList.size() > 0)
- traversal = traversal.match(arrayOfAllTraversals);
-
- final List<String> vars = query.getResultVars();
- List<ExprAggregator> lstexpr = query.getAggregators();
- if (!query.isQueryResultStar() && !query.hasGroupBy()) {
-
- switch (vars.size()) {
- case 0:
- throw new IllegalStateException();
- case 1:
- if (query.isDistinct()) {
-// System.out.println("Inside ------------------- >Select 1------------------------> Distinct");
- traversal = traversal.dedup(vars.get(0));
- }
- if (query.hasOrderBy()) {
-// System.out.println("Inside ------------------- >Select 1");
- traversal = traversal.order().by(sortingVariable, orderDirection);
- } else {
-
- traversal = traversal.select(vars.get(0));
- }
- break;
- case 2:
- if (query.isDistinct()) {
- traversal = traversal.dedup(vars.get(0), vars.get(1));
- }
- if (query.hasOrderBy()) {
-// System.out.println("Inside ------------------- >Select 1");
- traversal = traversal.order().by(__.select(vars.get(0)), orderDirection).by(__.select(vars.get(1)));
- } else
- traversal = traversal.select(vars.get(0), vars.get(1));
- break;
- default:
- final String[] all = new String[vars.size()];
- vars.toArray(all);
- if (query.isDistinct()) {
-
- traversal = traversal.dedup(all);
- }
- final String[] others = Arrays.copyOfRange(all, 2, vars.size());
- if (query.hasOrderBy()) {
-
- traversal = traversal.order().by(__.select(vars.get(0)), orderDirection).by(__.select(vars.get(1)));
-
- } else
- traversal = traversal.select(vars.get(0), vars.get(1), others);
-
- break;
- }
-
- }
-
-
- if (query.hasGroupBy()) {
- VarExprList lstExpr = query.getGroupBy();
- String grpVar = "";
- Traversal tempTrav;
- for (Var expr : lstExpr.getVars()) {
- grpVar = expr.getName();
- // System.out.println("The Group by var: " + expr.getName());
- }
-
- if (query.hasLimit()) {
- long limit = query.getLimit(), offset = 0;
-
- if (query.hasOffset()) {
- offset = query.getOffset();
-
- }
- // if (query.hasGroupBy() && query.hasOrderBy())
- // traversal = traversal.range( offset, offset + limit);
- // else
- // traversal = traversal.range(offset, offset + limit);
-
- }
-
- if (!grpVar.isEmpty())
- traversal = traversal.select(grpVar);
- if (query.hasAggregators()) {
- List<ExprAggregator> exprAgg = query.getAggregators();
- for (ExprAggregator expr : exprAgg) {
-
-// System.out.println("The Aggregator by var: " + expr.getAggregator().getExprList().toString()
-// + " is :" + expr.getAggregator().toString());
- if (expr.getAggregator().getName().contains("COUNT")) {
- if (!query.toString().contains("GROUP")) {
- if (expr.getAggregator().toString().contains("DISTINCT")) {
- traversal = traversal
- .dedup(expr.getAggregator().getExprList().get(0).toString().substring(1));
- } else {
- traversal = traversal
- .select(expr.getAggregator().getExprList().get(0).toString().substring(1));
- }
- traversal = traversal.count();
- } else
- traversal = traversal.groupCount();
- }
- if (expr.getAggregator().getName().contains("MAX")) {
- traversal = traversal.max();
- }
- }
-
- } else {
-
- traversal = traversal.group();
- }
-
-
- }
-
-
- if (query.hasOrderBy() && query.hasGroupBy()) {
-
- traversal = traversal.order().by(sortingVariable, orderDirection);
- }
- if (query.hasLimit()) {
- long limit = query.getLimit(), offset = 0;
-
- if (query.hasOffset()) {
- offset = query.getOffset();
-
- }
- if (query.hasGroupBy() && query.hasOrderBy())
- traversal = traversal.range(Scope.local, offset, offset + limit);
- else
- traversal = traversal.range(offset, offset + limit);
-
- }
- // endTime = System.currentTimeMillis();
- // System.out.println("time taken for convertToGremlinTraversal Function : "+ (endTime-startTime)+" mili seconds");
-
- return traversal;
- }
-
- private static GraphTraversal<Vertex, ?> convertToGremlinTraversal(final GraphTraversalSource g,
- final Query query) {
- return new SparqlToGremlinCompiler(g).convertToGremlinTraversal(query);
- }
-
- public static GraphTraversal<Vertex, ?> convertToGremlinTraversal(final Graph graph, final String query) {
- return convertToGremlinTraversal(graph.traversal(), QueryFactory.create(Prefixes.prepend(query)));
- }
-
- public static GraphTraversal<Vertex, ?> convertToGremlinTraversal(final GraphTraversalSource g,
- final String query) {
- return convertToGremlinTraversal(g, QueryFactory.create(Prefixes.prepend(query), Syntax.syntaxSPARQL));
- }
-
- // VISITING SPARQL ALGEBRA OP BASIC TRIPLE PATTERNS - MAYBE
- @Override
- public void visit(final OpBGP opBGP) {
- {
-
- // System.out.println("Inside opBGP ---------------------------------------------->");
- final List<Triple> triples = opBGP.getPattern().getList();
- final Traversal[] matchTraversals = new Traversal[triples.size()];
- int i = 0;
- for (final Triple triple : triples) {
-
- matchTraversals[i++] = TraversalBuilder.transform(triple);
- traversalList.add(matchTraversals[i - 1]);
- }
-
- }
-
- }
-
- // VISITING SPARQL ALGEBRA OP FILTER - MAYBE
- @Override
- public void visit(final OpFilter opFilter) {
-
- // System.out.println("Inside opFilter ---------------------------------------------->");
- Traversal traversal = null;
-
- for (Expr expr : opFilter.getExprs().getList()) {
- if (expr != null) {
-
- traversal = __.where(WhereTraversalBuilder.transform(expr));
- traversalList.add(traversal);
- }
- }
-
- }
- // TODO: add more functions for operators other than FILTER, such as
- // OPTIONAL
- // This can be done by understanding how Jena handles these other
- // operators/filters inherently and then map them to Gremlin
-
- public void visit(final OpLeftJoin opLeftJoin) {
-
-// System.out.println("Inside opOptional ---------------------------------------------->");
-// System.out.println(opLeftJoin.getRight().toString());
-
- }
-
- @Override
- public void visit(final OpUnion opUnion) {
-
- // System.out.println("Inside opUnion ---------------------------------------------->");
- Traversal unionTemp[] = new Traversal[2];
- Traversal unionTemp1[] = new Traversal[traversalList.size() / 2];
- Traversal unionTemp2[] = new Traversal[traversalList.size() / 2];
-
- int count = 0;
-
- for (int i = 0; i < traversalList.size(); i++) {
-
- if (i < traversalList.size() / 2) {
-
- unionTemp1[i] = traversalList.get(i);
- } else {
- unionTemp2[count++] = traversalList.get(i);
- }
- }
-
- unionTemp[1] = __.match(unionTemp2);
- unionTemp[0] = __.match(unionTemp1);
-
- traversalList.clear();
- traversal = (GraphTraversal<Vertex, ?>) traversal.union(unionTemp);
- // System.out.println("Getting out from Union -------------------> :
- // "+traversal);
- // traversalList.add(__.union(unionTemp));
- // traversalList.clear();
- }
-}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0d1e09c2/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/SparqlToGremlinTranspiler.java
----------------------------------------------------------------------
diff --git a/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/SparqlToGremlinTranspiler.java b/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/SparqlToGremlinTranspiler.java
new file mode 100644
index 0000000..9db7d82
--- /dev/null
+++ b/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/SparqlToGremlinTranspiler.java
@@ -0,0 +1,286 @@
+/*
+ * 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.sparql;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import org.apache.jena.graph.Triple;
+import org.apache.jena.query.Query;
+import org.apache.jena.query.QueryFactory;
+import org.apache.jena.query.SortCondition;
+import org.apache.jena.query.Syntax;
+import org.apache.jena.sparql.algebra.Algebra;
+import org.apache.jena.sparql.algebra.Op;
+import org.apache.jena.sparql.algebra.OpVisitorBase;
+import org.apache.jena.sparql.algebra.OpWalker;
+import org.apache.jena.sparql.algebra.op.OpBGP;
+import org.apache.jena.sparql.algebra.op.OpFilter;
+import org.apache.jena.sparql.algebra.op.OpUnion;
+import org.apache.jena.sparql.core.Var;
+import org.apache.jena.sparql.core.VarExprList;
+import org.apache.jena.sparql.expr.Expr;
+import org.apache.jena.sparql.expr.ExprAggregator;
+import org.apache.tinkerpop.gremlin.process.traversal.Order;
+import org.apache.tinkerpop.gremlin.process.traversal.Scope;
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
+import org.apache.tinkerpop.gremlin.structure.Graph;
+import org.apache.tinkerpop.gremlin.structure.Vertex;
+
+/**
+ * The engine that transpiles SPARQL to Gremlin traversals thus enabling SPARQL to be executed on any TinkerPop-enabled
+ * graph system.
+ */
+public class SparqlToGremlinTranspiler {
+
+ private GraphTraversal<Vertex, ?> traversal;
+
+ private List<Traversal> traversalList = new ArrayList<>();
+
+ private String sortingVariable = "";
+
+ private SparqlToGremlinTranspiler(final GraphTraversal<Vertex, ?> traversal) {
+ this.traversal = traversal;
+ }
+
+ private SparqlToGremlinTranspiler(final GraphTraversalSource g) {
+ this(g.V());
+ }
+
+ /**
+ * Converts SPARQL to a Gremlin traversal.
+ *
+ * @param graph the {@link Graph} instance to execute the traversal from
+ * @param sparqlQuery the query to transpile to Gremlin
+ */
+ public static GraphTraversal<Vertex, ?> transpile(final Graph graph, final String sparqlQuery) {
+ return transpile(graph.traversal(), sparqlQuery);
+ }
+
+ /**
+ * Converts SPARQL to a Gremlin traversal.
+ *
+ * @param g the {@link GraphTraversalSource} instance to execute the traversal from
+ * @param sparqlQuery the query to transpile to Gremlin
+ */
+ public static GraphTraversal<Vertex, ?> transpile(final GraphTraversalSource g, final String sparqlQuery) {
+ return transpile(g, QueryFactory.create(Prefixes.prepend(sparqlQuery), Syntax.syntaxSPARQL));
+ }
+
+ private GraphTraversal<Vertex, ?> transpile(final Query query) {
+ final Op op = Algebra.compile(query);
+ OpWalker.walk(op, new GremlinOpVisitor());
+
+ int traversalIndex = 0;
+ final int numberOfTraversal = traversalList.size();
+ final Traversal arrayOfAllTraversals[] = new Traversal[numberOfTraversal];
+
+ if (query.hasOrderBy() && !query.hasGroupBy()) {
+ final List<SortCondition> sortingConditions = query.getOrderBy();
+
+ for (SortCondition sortCondition : sortingConditions) {
+ final Expr expr = sortCondition.getExpression();
+ sortingVariable = expr.getVarName();
+ }
+ }
+
+ for (Traversal tempTrav : traversalList) {
+ arrayOfAllTraversals[traversalIndex++] = tempTrav;
+ }
+
+ Order orderDirection = Order.incr;
+ if (query.hasOrderBy()) {
+ int directionOfSort = 0;
+ final List<SortCondition> sortingConditions = query.getOrderBy();
+
+ for (SortCondition sortCondition : sortingConditions) {
+ final Expr expr = sortCondition.getExpression();
+ directionOfSort = sortCondition.getDirection();
+ sortingVariable = expr.getVarName();
+ }
+
+ if (directionOfSort == -1) orderDirection = Order.decr;
+ }
+
+ if (traversalList.size() > 0)
+ traversal = traversal.match(arrayOfAllTraversals);
+
+ final List<String> vars = query.getResultVars();
+ if (!query.isQueryResultStar() && !query.hasGroupBy()) {
+ switch (vars.size()) {
+ case 0:
+ throw new IllegalStateException();
+ case 1:
+ if (query.isDistinct())
+ traversal = traversal.dedup(vars.get(0));
+
+ if (query.hasOrderBy())
+ traversal = traversal.order().by(sortingVariable, orderDirection);
+ else
+ traversal = traversal.select(vars.get(0));
+
+ break;
+ case 2:
+ if (query.isDistinct())
+ traversal = traversal.dedup(vars.get(0), vars.get(1));
+
+ if (query.hasOrderBy())
+ traversal = traversal.order().by(__.select(vars.get(0)), orderDirection).by(__.select(vars.get(1)));
+ else
+ traversal = traversal.select(vars.get(0), vars.get(1));
+
+ break;
+ default:
+ final String[] all = new String[vars.size()];
+ vars.toArray(all);
+ if (query.isDistinct())
+ traversal = traversal.dedup(all);
+
+ final String[] others = Arrays.copyOfRange(all, 2, vars.size());
+ if (query.hasOrderBy())
+ traversal = traversal.order().by(__.select(vars.get(0)), orderDirection).by(__.select(vars.get(1)));
+ else
+ traversal = traversal.select(vars.get(0), vars.get(1), others);
+
+ break;
+ }
+ }
+
+ if (query.hasGroupBy()) {
+ final VarExprList lstExpr = query.getGroupBy();
+ String grpVar = "";
+ for (Var expr : lstExpr.getVars()) {
+ grpVar = expr.getName();
+ }
+
+ if (!grpVar.isEmpty())
+ traversal = traversal.select(grpVar);
+ if (query.hasAggregators()) {
+ final List<ExprAggregator> exprAgg = query.getAggregators();
+ for (ExprAggregator expr : exprAgg) {
+ if (expr.getAggregator().getName().contains("COUNT")) {
+ if (!query.toString().contains("GROUP")) {
+ if (expr.getAggregator().toString().contains("DISTINCT"))
+ traversal = traversal.dedup(expr.getAggregator().getExprList().get(0).toString().substring(1));
+ else
+ traversal = traversal.select(expr.getAggregator().getExprList().get(0).toString().substring(1));
+
+ traversal = traversal.count();
+ } else {
+ traversal = traversal.groupCount();
+ }
+ }
+
+ if (expr.getAggregator().getName().contains("MAX")) {
+ traversal = traversal.max();
+ }
+ }
+ } else {
+ traversal = traversal.group();
+ }
+ }
+
+ if (query.hasOrderBy() && query.hasGroupBy())
+ traversal = traversal.order().by(sortingVariable, orderDirection);
+
+ if (query.hasLimit()) {
+ long limit = query.getLimit(), offset = 0;
+
+ if (query.hasOffset())
+ offset = query.getOffset();
+
+ if (query.hasGroupBy() && query.hasOrderBy())
+ traversal = traversal.range(Scope.local, offset, offset + limit);
+ else
+ traversal = traversal.range(offset, offset + limit);
+ }
+
+ return traversal;
+ }
+
+ private static GraphTraversal<Vertex, ?> transpile(final GraphTraversalSource g, final Query query) {
+ return new SparqlToGremlinTranspiler(g).transpile(query);
+ }
+
+ /**
+ * An {@code OpVisitor} implementation that reads SPARQL algebra operations into Gremlin traversals.
+ */
+ private class GremlinOpVisitor extends OpVisitorBase {
+
+ /**
+ * Visiting triple patterns in SPARQL algebra.
+ */
+ @Override
+ public void visit(final OpBGP opBGP) {
+ final List<Triple> triples = opBGP.getPattern().getList();
+ final Traversal[] matchTraversals = new Traversal[triples.size()];
+ int i = 0;
+ for (final Triple triple : triples) {
+
+ matchTraversals[i++] = TraversalBuilder.transform(triple);
+ traversalList.add(matchTraversals[i - 1]);
+ }
+ }
+
+ /**
+ * Visiting filters in SPARQL algebra.
+ */
+ @Override
+ public void visit(final OpFilter opFilter) {
+ Traversal traversal;
+ for (Expr expr : opFilter.getExprs().getList()) {
+ if (expr != null) {
+ traversal = __.where(WhereTraversalBuilder.transform(expr));
+ traversalList.add(traversal);
+ }
+ }
+ }
+
+ /**
+ * Visiting unions in SPARQL algebra.
+ */
+ @Override
+ public void visit(final OpUnion opUnion) {
+ final Traversal unionTemp[] = new Traversal[2];
+ final Traversal unionTemp1[] = new Traversal[traversalList.size() / 2];
+ final Traversal unionTemp2[] = new Traversal[traversalList.size() / 2];
+
+ int count = 0;
+
+ for (int i = 0; i < traversalList.size(); i++) {
+ if (i < traversalList.size() / 2)
+ unionTemp1[i] = traversalList.get(i);
+ else
+ unionTemp2[count++] = traversalList.get(i);
+ }
+
+ unionTemp[1] = __.match(unionTemp2);
+ unionTemp[0] = __.match(unionTemp1);
+
+ traversalList.clear();
+ traversal = (GraphTraversal<Vertex, ?>) traversal.union(unionTemp);
+ }
+
+ }
+}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0d1e09c2/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/TraversalBuilder.java
----------------------------------------------------------------------
diff --git a/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/TraversalBuilder.java b/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/TraversalBuilder.java
index 72a32a5..6d29442 100644
--- a/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/TraversalBuilder.java
+++ b/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/TraversalBuilder.java
@@ -26,10 +26,12 @@ import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
import org.apache.tinkerpop.gremlin.structure.PropertyType;
import org.apache.tinkerpop.gremlin.structure.Vertex;
-
+/**
+ * Converts triple patterns into {@link GraphTraversal} instances.
+ */
class TraversalBuilder {
- public static GraphTraversal<?, ?> transform(final Triple triple) {
+ static GraphTraversal<?, ?> transform(final Triple triple) {
final GraphTraversal<Vertex, ?> matchTraversal = __.as(triple.getSubject().getName());
final Node predicate = triple.getPredicate();
@@ -53,7 +55,6 @@ class TraversalBuilder {
final PropertyType type, final Node object) {
switch (propertyName) {
case "id":
-
return object.isConcrete()
? traversal.hasId(object.getLiteralValue())
: traversal.id().as(object.getName());
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0d1e09c2/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/WhereTraversalBuilder.java
----------------------------------------------------------------------
diff --git a/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/WhereTraversalBuilder.java b/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/WhereTraversalBuilder.java
index f4d49b6..80da707 100644
--- a/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/WhereTraversalBuilder.java
+++ b/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/WhereTraversalBuilder.java
@@ -33,61 +33,77 @@ import org.apache.jena.sparql.expr.E_LogicalAnd;
import org.apache.jena.sparql.expr.E_LogicalOr;
import org.apache.jena.sparql.expr.E_NotEquals;
import org.apache.jena.sparql.expr.E_NotExists;
-import org.apache.jena.sparql.expr.E_StrLength;
import org.apache.jena.sparql.expr.Expr;
import org.apache.tinkerpop.gremlin.process.traversal.P;
import org.apache.tinkerpop.gremlin.process.traversal.Step;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
+/**
+ * Converts SPARQL "where" expressions to Gremlin predicates.
+ */
class WhereTraversalBuilder {
- public static GraphTraversal<?, ?> transform(final E_Equals expression) {
- // System.out.println("The aggr one : "+expression.getArg1().getClass().getName() + "The aggr one :"+expression.getArg2().getClass().getName());
+ /**
+ * Converts a general {@code Expr} to an anonymous {@link GraphTraversal}.
+ */
+ static GraphTraversal<?, ?> transform(final Expr expression) {
+ if (expression instanceof E_Equals) return transform((E_Equals) expression);
+ if (expression instanceof E_NotEquals) return transform((E_NotEquals) expression);
+ if (expression instanceof E_LessThan) return transform((E_LessThan) expression);
+ if (expression instanceof E_LessThanOrEqual) return transform((E_LessThanOrEqual) expression);
+ if (expression instanceof E_GreaterThan) return transform((E_GreaterThan) expression);
+ if (expression instanceof E_GreaterThanOrEqual) return transform((E_GreaterThanOrEqual) expression);
+ if (expression instanceof E_LogicalAnd) return transform((E_LogicalAnd) expression);
+ if (expression instanceof E_LogicalOr) return transform((E_LogicalOr) expression);
+ if (expression instanceof E_Exists) return transform((E_Exists) expression);
+ if (expression instanceof E_NotExists) return transform((E_NotExists) expression);
+ throw new IllegalStateException(String.format("Unhandled expression: %s", expression));
+ }
+
+ private static GraphTraversal<?, ?> transform(final E_Equals expression) {
final Object value = expression.getArg2().getConstant().getNode().getLiteralValue();
return __.as(expression.getArg1().getVarName()).is(P.eq(value));
}
- public static GraphTraversal<?, ?> transform(final E_NotEquals expression) {
+ private static GraphTraversal<?, ?> transform(final E_NotEquals expression) {
final Object value = expression.getArg2().getConstant().getNode().getLiteralValue();
return __.as(expression.getArg1().getVarName()).is(P.neq(value));
}
- public static GraphTraversal<?, ?> transform(final E_LessThan expression) {
- // System.out.println("The aggr one : "+expression.getArg1().getClass().getName() + "The aggr one :"+expression.getArg2().getClass().getName());
+ private static GraphTraversal<?, ?> transform(final E_LessThan expression) {
final Object value = expression.getArg2().getConstant().getNode().getLiteralValue();
return __.as(expression.getArg1().getVarName()).is(P.lt(value));
}
- public static GraphTraversal<?, ?> transform(final E_LessThanOrEqual expression) {
- // System.out.println("The aggr one : "+expression.getArg1().getClass().getName() + "The aggr one :"+expression.getArg2().getClass().getName());
+ private static GraphTraversal<?, ?> transform(final E_LessThanOrEqual expression) {
final Object value = expression.getArg2().getConstant().getNode().getLiteralValue();
return __.as(expression.getArg1().getVarName()).is(P.lte(value));
}
- public static GraphTraversal<?, ?> transform(final E_GreaterThan expression) {
+ private static GraphTraversal<?, ?> transform(final E_GreaterThan expression) {
final Object value = expression.getArg2().getConstant().getNode().getLiteralValue();
return __.as(expression.getArg1().getVarName()).is(P.gt(value));
}
- public static GraphTraversal<?, ?> transform(final E_GreaterThanOrEqual expression) {
+ private static GraphTraversal<?, ?> transform(final E_GreaterThanOrEqual expression) {
final Object value = expression.getArg2().getConstant().getNode().getLiteralValue();
return __.as(expression.getArg1().getVarName()).is(P.gte(value));
}
- public static GraphTraversal<?, ?> transform(final E_LogicalAnd expression) {
+ private static GraphTraversal<?, ?> transform(final E_LogicalAnd expression) {
return __.and(
transform(expression.getArg1()),
transform(expression.getArg2()));
}
- public static GraphTraversal<?, ?> transform(final E_LogicalOr expression) {
+ private static GraphTraversal<?, ?> transform(final E_LogicalOr expression) {
return __.or(
transform(expression.getArg1()),
transform(expression.getArg2()));
}
- public static GraphTraversal<?, ?> transform(final E_Exists expression) {
+ private static GraphTraversal<?, ?> transform(final E_Exists expression) {
final OpBGP opBGP = (OpBGP) expression.getGraphPattern();
final List<Triple> triples = opBGP.getPattern().getList();
if (triples.size() != 1) throw new IllegalStateException("Unhandled EXISTS pattern");
@@ -99,7 +115,7 @@ class WhereTraversalBuilder {
}
- public static GraphTraversal<?, ?> transform(final E_NotExists expression) {
+ private static GraphTraversal<?, ?> transform(final E_NotExists expression) {
final OpBGP opBGP = (OpBGP) expression.getGraphPattern();
final List<Triple> triples = opBGP.getPattern().getList();
if (triples.size() != 1) throw new IllegalStateException("Unhandled NOT EXISTS pattern");
@@ -109,26 +125,4 @@ class WhereTraversalBuilder {
endStep.removeLabel(label);
return __.not(traversal);
}
-
- public static int getStrLength(final E_StrLength expression){
-
- return expression.getArg().toString().length();
-
- }
-
-
- //what does <?, ?> signify? possibly <S,E>
- public static GraphTraversal<?, ?> transform(final Expr expression) {
- if (expression instanceof E_Equals) return transform((E_Equals) expression);
- if (expression instanceof E_NotEquals) return transform((E_NotEquals) expression);
- if (expression instanceof E_LessThan) return transform((E_LessThan) expression);
- if (expression instanceof E_LessThanOrEqual) return transform((E_LessThanOrEqual) expression);
- if (expression instanceof E_GreaterThan) return transform((E_GreaterThan) expression);
- if (expression instanceof E_GreaterThanOrEqual) return transform((E_GreaterThanOrEqual) expression);
- if (expression instanceof E_LogicalAnd) return transform((E_LogicalAnd) expression);
- if (expression instanceof E_LogicalOr) return transform((E_LogicalOr) expression);
- if (expression instanceof E_Exists) return transform((E_Exists) expression);
- if (expression instanceof E_NotExists) return transform((E_NotExists) expression);
- throw new IllegalStateException(String.format("Unhandled expression: %s", expression));
- }
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0d1e09c2/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/strategy/SparqlStrategy.java
----------------------------------------------------------------------
diff --git a/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/strategy/SparqlStrategy.java b/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/strategy/SparqlStrategy.java
index d74ac3e..4073ec2 100644
--- a/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/strategy/SparqlStrategy.java
+++ b/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/strategy/SparqlStrategy.java
@@ -18,7 +18,6 @@
*/
package org.apache.tinkerpop.gremlin.sparql.process.traversal.strategy;
-import org.apache.tinkerpop.gremlin.process.computer.traversal.strategy.decoration.VertexProgramStrategy;
import org.apache.tinkerpop.gremlin.process.remote.traversal.strategy.decoration.RemoteStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategy;
@@ -26,7 +25,7 @@ import org.apache.tinkerpop.gremlin.process.traversal.step.map.ConstantStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.util.EmptyStep;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.AbstractTraversalStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper;
-import org.apache.tinkerpop.gremlin.sparql.SparqlToGremlinCompiler;
+import org.apache.tinkerpop.gremlin.sparql.SparqlToGremlinTranspiler;
import org.apache.tinkerpop.gremlin.sparql.process.traversal.dsl.sparql.SparqlTraversalSource;
import org.apache.tinkerpop.gremlin.structure.Vertex;
@@ -69,7 +68,7 @@ public class SparqlStrategy extends AbstractTraversalStrategy<TraversalStrategy.
final Object constant = stepWithSparql.getConstant();
if (constant instanceof String) {
final String sparql = (String) constant;
- final Traversal<Vertex, ?> sparqlTraversal = SparqlToGremlinCompiler.convertToGremlinTraversal(
+ final Traversal<Vertex, ?> sparqlTraversal = SparqlToGremlinTranspiler.transpile(
traversal.getGraph().get(), sparql);
TraversalHelper.removeAllSteps(traversal);
sparqlTraversal.asAdmin().getSteps().forEach(s -> traversal.addStep(s));
[11/50] tinkerpop git commit: TINKERPOP-1880 Sign assembly on Linux
and macOS
Posted by sp...@apache.org.
TINKERPOP-1880 Sign assembly on Linux and macOS
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/fcc49a1b
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/fcc49a1b
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/fcc49a1b
Branch: refs/heads/TINKERPOP-1878
Commit: fcc49a1b4ea3b15b102b576bc81053ba73b2a18e
Parents: bddc756
Author: Jorge Bay Gondra <jo...@gmail.com>
Authored: Thu Mar 22 13:21:03 2018 +0100
Committer: Jorge Bay Gondra <jo...@gmail.com>
Committed: Thu Mar 22 14:20:20 2018 +0100
----------------------------------------------------------------------
.travis.yml | 8 +++++---
gremlin-dotnet/glv/Gremlin.Net.csproj.template | 1 -
gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj | 1 -
.../Gremlin.Net.IntegrationTest.csproj | 3 +--
.../test/Gremlin.Net.UnitTest/Gremlin.Net.UnitTest.csproj | 3 +--
5 files changed, 7 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fcc49a1b/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 336c055..96cfe6a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,10 +18,12 @@ install:
- mvn -version
before_install:
- - sudo sh -c 'echo "deb [arch=amd64] https://apt-mo.trafficmanager.net/repos/dotnet-release/ trusty main" > /etc/apt/sources.list.d/dotnetdev.list'
- - sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 417A0893
+ - curl https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > microsoft.gpg
+ - sudo mv microsoft.gpg /etc/apt/trusted.gpg.d/microsoft.gpg
+ - sudo sh -c 'echo "deb [arch=amd64] https://packages.microsoft.com/repos/microsoft-ubuntu-trusty-prod trusty main" > /etc/apt/sources.list.d/dotnetdev.list'
+ - sudo apt-get install apt-transport-https
- sudo apt-get update
- - sudo apt-get install dotnet-dev-1.0.4
+ - sudo apt-get install dotnet-sdk-2.1.101
jobs:
include:
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fcc49a1b/gremlin-dotnet/glv/Gremlin.Net.csproj.template
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/glv/Gremlin.Net.csproj.template b/gremlin-dotnet/glv/Gremlin.Net.csproj.template
index ce36e76..897ec94 100644
--- a/gremlin-dotnet/glv/Gremlin.Net.csproj.template
+++ b/gremlin-dotnet/glv/Gremlin.Net.csproj.template
@@ -41,7 +41,6 @@ Please see the reference documentation at Apache TinkerPop for more information
NOTE: Gremlin.Net is an extension of the Gremlin.Net driver by Florian Hockmann (versions: 0.y.z) and is now included as part of the Apache TinkerPop project.</Description>
<AssemblyOriginatorKeyFile>../../build/tinkerpop.snk</AssemblyOriginatorKeyFile>
<SignAssembly>true</SignAssembly>
- <PublicSign Condition="'\$(OS)' != 'Windows_NT'">true</PublicSign>
<PackageId>Gremlin.Net</PackageId>
<PackageTags>gremlin;tinkerpop;apache</PackageTags>
<PackageProjectUrl>http://tinkerpop.apache.org</PackageProjectUrl>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fcc49a1b/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj b/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
index 445a9bc..454bcac 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
+++ b/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
@@ -41,7 +41,6 @@ Please see the reference documentation at Apache TinkerPop for more information
NOTE: Gremlin.Net is an extension of the Gremlin.Net driver by Florian Hockmann (versions: 0.y.z) and is now included as part of the Apache TinkerPop project.</Description>
<AssemblyOriginatorKeyFile>../../build/tinkerpop.snk</AssemblyOriginatorKeyFile>
<SignAssembly>true</SignAssembly>
- <PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign>
<PackageId>Gremlin.Net</PackageId>
<PackageTags>gremlin;tinkerpop;apache</PackageTags>
<PackageProjectUrl>http://tinkerpop.apache.org</PackageProjectUrl>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fcc49a1b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gremlin.Net.IntegrationTest.csproj
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gremlin.Net.IntegrationTest.csproj b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gremlin.Net.IntegrationTest.csproj
index 82727fd..953529b 100644
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gremlin.Net.IntegrationTest.csproj
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gremlin.Net.IntegrationTest.csproj
@@ -1,10 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>netcoreapp1.0</TargetFramework>
+ <TargetFramework>netcoreapp2.0</TargetFramework>
<DebugType>portable</DebugType>
<AssemblyName>Gremlin.Net.IntegrationTest</AssemblyName>
<PackageId>Gremlin.Net.IntegrationTest</PackageId>
- <RuntimeFrameworkVersion>1.0.4</RuntimeFrameworkVersion>
</PropertyGroup>
<ItemGroup>
<None Update="appsettings.json">
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fcc49a1b/gremlin-dotnet/test/Gremlin.Net.UnitTest/Gremlin.Net.UnitTest.csproj
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/test/Gremlin.Net.UnitTest/Gremlin.Net.UnitTest.csproj b/gremlin-dotnet/test/Gremlin.Net.UnitTest/Gremlin.Net.UnitTest.csproj
index eeb7c9f..d1d6372 100644
--- a/gremlin-dotnet/test/Gremlin.Net.UnitTest/Gremlin.Net.UnitTest.csproj
+++ b/gremlin-dotnet/test/Gremlin.Net.UnitTest/Gremlin.Net.UnitTest.csproj
@@ -1,11 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>netcoreapp1.0</TargetFramework>
+ <TargetFramework>netcoreapp2.0</TargetFramework>
<DebugType>portable</DebugType>
<AssemblyName>Gremlin.Net.UnitTest</AssemblyName>
<PackageId>Gremlin.Net.UnitTest</PackageId>
- <RuntimeFrameworkVersion>1.0.4</RuntimeFrameworkVersion>
<AssemblyOriginatorKeyFile>../../build/tinkerpop.snk</AssemblyOriginatorKeyFile>
<SignAssembly>true</SignAssembly>
<PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign>
[24/50] tinkerpop git commit: Minor bug fix to the graphson type
serializer
Posted by sp...@apache.org.
Minor bug fix to the graphson type serializer
There was no need to test for string JsonTokens - just needed to pass all other "shapes" through to check for type info. Credit to kevin gallardo for the fix. CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/2a9e7e24
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/2a9e7e24
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/2a9e7e24
Branch: refs/heads/TINKERPOP-1878
Commit: 2a9e7e24f4e255cad3eb300423634cbac110d74d
Parents: fdac653
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Mar 27 13:31:16 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Mar 27 13:31:16 2018 -0400
----------------------------------------------------------------------
.../io/graphson/GraphSONTypeSerializer.java | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2a9e7e24/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeSerializer.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeSerializer.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeSerializer.java
index 53ccc0b..765331a 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeSerializer.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeSerializer.java
@@ -96,14 +96,12 @@ public class GraphSONTypeSerializer extends TypeSerializer {
@Override
public WritableTypeId writeTypePrefix(final JsonGenerator jsonGenerator, final WritableTypeId writableTypeId) throws IOException {
- if (writableTypeId.valueShape == JsonToken.VALUE_STRING) {
- if (canWriteTypeId()) {
- writeTypePrefix(jsonGenerator, getTypeIdResolver().idFromValueAndType(writableTypeId.forValue, getClassFromObject(writableTypeId.forValue)));
- }
- } else if (writableTypeId.valueShape == JsonToken.START_OBJECT) {
+ if (writableTypeId.valueShape == JsonToken.START_OBJECT) {
jsonGenerator.writeStartObject();
} else if (writableTypeId.valueShape == JsonToken.START_ARRAY) {
jsonGenerator.writeStartArray();
+ } else if (canWriteTypeId()) {
+ writeTypePrefix(jsonGenerator, getTypeIdResolver().idFromValueAndType(writableTypeId.forValue, getClassFromObject(writableTypeId.forValue)));
} else {
throw new IllegalStateException("Could not write prefix: shape[" + writableTypeId.valueShape + "] value[" + writableTypeId.forValue + "]");
}
@@ -113,14 +111,12 @@ public class GraphSONTypeSerializer extends TypeSerializer {
@Override
public WritableTypeId writeTypeSuffix(final JsonGenerator jsonGenerator, final WritableTypeId writableTypeId) throws IOException {
- if (writableTypeId.valueShape == JsonToken.VALUE_STRING) {
- if (canWriteTypeId()) {
- writeTypeSuffix(jsonGenerator);
- }
- } else if (writableTypeId.valueShape == JsonToken.START_OBJECT) {
+ if (writableTypeId.valueShape == JsonToken.START_OBJECT) {
jsonGenerator.writeEndObject();
} else if (writableTypeId.valueShape == JsonToken.START_ARRAY) {
jsonGenerator.writeEndArray();
+ } else if (canWriteTypeId()) {
+ writeTypeSuffix(jsonGenerator);
} else {
throw new IllegalStateException("Could not write suffix: shape[" + writableTypeId.valueShape + "] value[" + writableTypeId.forValue + "]");
}
[45/50] tinkerpop git commit: TINKERPOP-1878 Code reformatting - bad
spacing/tabs or something
Posted by sp...@apache.org.
TINKERPOP-1878 Code reformatting - bad spacing/tabs or something
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/5ed585bc
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/5ed585bc
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/5ed585bc
Branch: refs/heads/TINKERPOP-1878
Commit: 5ed585bcb8813757c80263195a48a634a42f2099
Parents: cc8b120
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Fri Jan 26 16:03:49 2018 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Apr 3 09:16:55 2018 -0400
----------------------------------------------------------------------
.../sparql/SparqlToGremlinTranspiler.java | 138 +++++++++----------
1 file changed, 69 insertions(+), 69 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5ed585bc/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/SparqlToGremlinTranspiler.java
----------------------------------------------------------------------
diff --git a/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/SparqlToGremlinTranspiler.java b/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/SparqlToGremlinTranspiler.java
index c3bc907..1b28a1d 100644
--- a/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/SparqlToGremlinTranspiler.java
+++ b/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/SparqlToGremlinTranspiler.java
@@ -55,59 +55,59 @@ import org.apache.tinkerpop.gremlin.structure.Vertex;
*/
public class SparqlToGremlinTranspiler {
- private GraphTraversal<Vertex, ?> traversal;
+ private GraphTraversal<Vertex, ?> traversal;
private List<Traversal> traversalList = new ArrayList<>();
- private SparqlToGremlinTranspiler(final GraphTraversal<Vertex, ?> traversal) {
- this.traversal = traversal;
- }
+ private SparqlToGremlinTranspiler(final GraphTraversal<Vertex, ?> traversal) {
+ this.traversal = traversal;
+ }
- private SparqlToGremlinTranspiler(final GraphTraversalSource g) {
- this(g.V());
- }
+ private SparqlToGremlinTranspiler(final GraphTraversalSource g) {
+ this(g.V());
+ }
/**
* Converts SPARQL to a Gremlin traversal.
*
- * @param graph the {@link Graph} instance to execute the traversal from
+ * @param graph the {@link Graph} instance to execute the traversal from
* @param sparqlQuery the query to transpile to Gremlin
*/
public static GraphTraversal<Vertex, ?> transpile(final Graph graph, final String sparqlQuery) {
- return transpile(graph.traversal(), sparqlQuery);
+ return transpile(graph.traversal(), sparqlQuery);
}
/**
* Converts SPARQL to a Gremlin traversal.
*
- * @param g the {@link GraphTraversalSource} instance to execute the traversal from
+ * @param g the {@link GraphTraversalSource} instance to execute the traversal from
* @param sparqlQuery the query to transpile to Gremlin
*/
public static GraphTraversal<Vertex, ?> transpile(final GraphTraversalSource g, final String sparqlQuery) {
return transpile(g, QueryFactory.create(Prefixes.prepend(sparqlQuery), Syntax.syntaxSPARQL));
}
- private GraphTraversal<Vertex, ?> transpile(final Query query) {
- final Op op = Algebra.compile(query);
- OpWalker.walk(op, new GremlinOpVisitor());
+ private GraphTraversal<Vertex, ?> transpile(final Query query) {
+ final Op op = Algebra.compile(query);
+ OpWalker.walk(op, new GremlinOpVisitor());
- int traversalIndex = 0;
- final int numberOfTraversal = traversalList.size();
+ int traversalIndex = 0;
+ final int numberOfTraversal = traversalList.size();
final Traversal arrayOfAllTraversals[] = new Traversal[numberOfTraversal];
- for (Traversal tempTrav : traversalList) {
- arrayOfAllTraversals[traversalIndex++] = tempTrav;
- }
+ for (Traversal tempTrav : traversalList) {
+ arrayOfAllTraversals[traversalIndex++] = tempTrav;
+ }
- // creates a map of ordering keys and their ordering direction
+ // creates a map of ordering keys and their ordering direction
final Map<String, Order> orderingIndex = createOrderIndexFromQuery(query);
- if (traversalList.size() > 0)
- traversal = traversal.match(arrayOfAllTraversals);
+ if (traversalList.size() > 0)
+ traversal = traversal.match(arrayOfAllTraversals);
- final List<String> vars = query.getResultVars();
- if (!query.isQueryResultStar() && !query.hasGroupBy()) {
- // the result sizes have special handling to get the right signatures of select() called. perhaps this
+ final List<String> vars = query.getResultVars();
+ if (!query.isQueryResultStar() && !query.hasGroupBy()) {
+ // the result sizes have special handling to get the right signatures of select() called. perhaps this
// could be refactored to work more nicely
switch (vars.size()) {
case 0:
@@ -116,7 +116,7 @@ public class SparqlToGremlinTranspiler {
if (query.isDistinct())
traversal = traversal.dedup(vars.get(0));
- orderingIndex.forEach((k,v) -> traversal = traversal.order().by(__.select(k), v));
+ orderingIndex.forEach((k, v) -> traversal = traversal.order().by(__.select(k), v));
traversal = traversal.select(vars.get(0));
break;
@@ -124,7 +124,7 @@ public class SparqlToGremlinTranspiler {
if (query.isDistinct())
traversal = traversal.dedup(vars.get(0), vars.get(1));
- orderingIndex.forEach((k,v) -> traversal = traversal.order().by(__.select(k), v));
+ orderingIndex.forEach((k, v) -> traversal = traversal.order().by(__.select(k), v));
traversal = traversal.select(vars.get(0), vars.get(1));
break;
@@ -134,7 +134,7 @@ public class SparqlToGremlinTranspiler {
if (query.isDistinct())
traversal = traversal.dedup(all);
- orderingIndex.forEach((k,v) -> traversal = traversal.order().by(__.select(k), v));
+ orderingIndex.forEach((k, v) -> traversal = traversal.order().by(__.select(k), v));
// just some shenanigans to get the right signature of select() called
final String[] others = Arrays.copyOfRange(all, 2, vars.size());
@@ -142,59 +142,59 @@ public class SparqlToGremlinTranspiler {
break;
}
- }
-
- if (query.hasGroupBy()) {
- final VarExprList lstExpr = query.getGroupBy();
- String grpVar = "";
- for (Var expr : lstExpr.getVars()) {
- grpVar = expr.getName();
- }
-
- if (!grpVar.isEmpty())
- traversal = traversal.select(grpVar);
- if (query.hasAggregators()) {
+ }
+
+ if (query.hasGroupBy()) {
+ final VarExprList lstExpr = query.getGroupBy();
+ String grpVar = "";
+ for (Var expr : lstExpr.getVars()) {
+ grpVar = expr.getName();
+ }
+
+ if (!grpVar.isEmpty())
+ traversal = traversal.select(grpVar);
+ if (query.hasAggregators()) {
final List<ExprAggregator> exprAgg = query.getAggregators();
- for (ExprAggregator expr : exprAgg) {
- if (expr.getAggregator().getName().contains("COUNT")) {
- if (!query.toString().contains("GROUP")) {
- if (expr.getAggregator().toString().contains("DISTINCT"))
- traversal = traversal.dedup(expr.getAggregator().getExprList().get(0).toString().substring(1));
- else
- traversal = traversal.select(expr.getAggregator().getExprList().get(0).toString().substring(1));
-
- traversal = traversal.count();
- } else {
+ for (ExprAggregator expr : exprAgg) {
+ if (expr.getAggregator().getName().contains("COUNT")) {
+ if (!query.toString().contains("GROUP")) {
+ if (expr.getAggregator().toString().contains("DISTINCT"))
+ traversal = traversal.dedup(expr.getAggregator().getExprList().get(0).toString().substring(1));
+ else
+ traversal = traversal.select(expr.getAggregator().getExprList().get(0).toString().substring(1));
+
+ traversal = traversal.count();
+ } else {
traversal = traversal.groupCount();
}
- }
+ }
- if (expr.getAggregator().getName().contains("MAX")) {
- traversal = traversal.max();
- }
- }
- } else {
+ if (expr.getAggregator().getName().contains("MAX")) {
+ traversal = traversal.max();
+ }
+ }
+ } else {
traversal = traversal.group();
}
- }
+ }
- if (query.hasOrderBy() && query.hasGroupBy())
- orderingIndex.forEach((k,v) -> traversal = traversal.order().by(__.select(k), v));
+ if (query.hasOrderBy() && query.hasGroupBy())
+ orderingIndex.forEach((k, v) -> traversal = traversal.order().by(__.select(k), v));
- if (query.hasLimit()) {
- long limit = query.getLimit(), offset = 0;
+ if (query.hasLimit()) {
+ long limit = query.getLimit(), offset = 0;
- if (query.hasOffset())
- offset = query.getOffset();
+ if (query.hasOffset())
+ offset = query.getOffset();
- if (query.hasGroupBy() && query.hasOrderBy())
- traversal = traversal.range(Scope.local, offset, offset + limit);
- else
- traversal = traversal.range(offset, offset + limit);
- }
+ if (query.hasGroupBy() && query.hasOrderBy())
+ traversal = traversal.range(Scope.local, offset, offset + limit);
+ else
+ traversal = traversal.range(offset, offset + limit);
+ }
- return traversal;
- }
+ return traversal;
+ }
/**
* Extracts any {@code SortCondition} instances from the SPARQL query and holds them in an index of their keys
[05/50] tinkerpop git commit: run Spark integration tests in Travis
Posted by sp...@apache.org.
run Spark integration tests in Travis
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/bddc7560
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/bddc7560
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/bddc7560
Branch: refs/heads/TINKERPOP-1878
Commit: bddc7560ffc6f6188a0ea9df77b68838f0295f14
Parents: 827b76e
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Wed Mar 21 11:27:43 2018 -0700
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Wed Mar 21 12:58:24 2018 -0700
----------------------------------------------------------------------
.travis.yml | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/bddc7560/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 9c6a739..336c055 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,3 +28,4 @@ jobs:
- script: "mvn clean install -Dci --batch-mode -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn"
- script: "touch gremlin-dotnet/src/.glv && touch gremlin-dotnet/test/.glv && mvn clean install -q -DskipTests && mvn verify -pl :gremlin-dotnet,:gremlin-dotnet-tests -P gremlin-dotnet -DskipIntegrationTests=false"
- script: "mvn clean install -q -DskipTests && mvn verify -pl :gremlin-javascript -DskipIntegrationTests=false"
+ - script: "mvn clean install -q -DskipTests && mvn verify -pl :spark-gremlin -DskipIntegrationTests=false"
[19/50] tinkerpop git commit: Merge branch 'TINKERPOP-1880' into tp32
Posted by sp...@apache.org.
Merge branch 'TINKERPOP-1880' into tp32
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/fdac6531
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/fdac6531
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/fdac6531
Branch: refs/heads/TINKERPOP-1878
Commit: fdac6531f89e59306659ca850112b6a6857bd32a
Parents: 8a76583 f972d11
Author: Jorge Bay Gondra <jo...@gmail.com>
Authored: Fri Mar 23 12:21:00 2018 +0100
Committer: Jorge Bay Gondra <jo...@gmail.com>
Committed: Fri Mar 23 12:21:00 2018 +0100
----------------------------------------------------------------------
.travis.yml | 8 +++++---
docker/Dockerfile | 7 ++++---
docs/src/dev/developer/development-environment.asciidoc | 2 +-
gremlin-dotnet/glv/Gremlin.Net.csproj.template | 1 -
gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj | 1 -
.../Gremlin.Net.IntegrationTest.csproj | 3 +--
.../test/Gremlin.Net.UnitTest/Gremlin.Net.UnitTest.csproj | 3 +--
7 files changed, 12 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
[12/50] tinkerpop git commit: TINKERPOP-1880 Update .NET dev env doc
Posted by sp...@apache.org.
TINKERPOP-1880 Update .NET dev env doc
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/cbdce111
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/cbdce111
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/cbdce111
Branch: refs/heads/TINKERPOP-1878
Commit: cbdce11151294154d86bdeca75396cb7f72d43b3
Parents: fcc49a1
Author: Jorge Bay Gondra <jo...@gmail.com>
Authored: Thu Mar 22 15:14:03 2018 +0100
Committer: Jorge Bay Gondra <jo...@gmail.com>
Committed: Thu Mar 22 15:14:03 2018 +0100
----------------------------------------------------------------------
docs/src/dev/developer/development-environment.asciidoc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/cbdce111/docs/src/dev/developer/development-environment.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/dev/developer/development-environment.asciidoc b/docs/src/dev/developer/development-environment.asciidoc
index f2b286f..0cceb5e 100644
--- a/docs/src/dev/developer/development-environment.asciidoc
+++ b/docs/src/dev/developer/development-environment.asciidoc
@@ -100,7 +100,7 @@ mvn clean install -pl gremlin-console -DskipIntegrationTests=false
[[dotnet-environment]]
=== DotNet Environment
-The build optionally requires link:https://www.microsoft.com/net/core[.NET Core SDK] (>=1.1.0) to work with the
+The build optionally requires link:https://www.microsoft.com/net/core[.NET Core SDK] (>=2.1.101) to work with the
`gremlin-dotnet` module. If .NET Core SDK is not installed, TinkerPop will still build with Maven, but .NET projects
will be skipped.
[23/50] tinkerpop git commit: TINKERPOP-1884 Revert netty back to
4.0.56.Final
Posted by sp...@apache.org.
TINKERPOP-1884 Revert netty back to 4.0.56.Final
4.1.x conflicted with spark and there was no clear upgrade path that didn't look like a hack. CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/2e74c31c
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/2e74c31c
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/2e74c31c
Branch: refs/heads/TINKERPOP-1878
Commit: 2e74c31c39b959263605436555ba9cbc05eab2c5
Parents: 53a0b56
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Mar 27 07:21:39 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Mar 27 07:21:39 2018 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 -
gremlin-console/src/main/static/NOTICE | 2 +-
gremlin-server/src/main/static/NOTICE | 2 +-
pom.xml | 2 +-
4 files changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2e74c31c/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index e42c7b6..e968c95 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -26,7 +26,6 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
This release also includes changes from <<release-3-2-8, 3.2.8>>.
* Fixed regression issue where the HTTPChannelizer doesn't instantiate the specified AuthenticationHandler.
-* Bumped to Netty 4.1.21.Final.
* Defaulted GLV tests for gremlin-python to run for GraphSON 3.0.
* Fixed a bug with `Tree` serialization in GraphSON 3.0.
* In gremlin-python, the GraphSON 3.0 `g:Set` type is now deserialized to `List`.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2e74c31c/gremlin-console/src/main/static/NOTICE
----------------------------------------------------------------------
diff --git a/gremlin-console/src/main/static/NOTICE b/gremlin-console/src/main/static/NOTICE
index fed03e1..a6a6d10 100644
--- a/gremlin-console/src/main/static/NOTICE
+++ b/gremlin-console/src/main/static/NOTICE
@@ -54,7 +54,7 @@ JavaTuples 1.2
Copyright (c) 2010, The JAVATUPLES team (http://www.javatuples.org)
------------------------------------------------------------------------
-Netty 4.1.21
+Netty 4.0.56
------------------------------------------------------------------------
Copyright 2014 The Netty Project
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2e74c31c/gremlin-server/src/main/static/NOTICE
----------------------------------------------------------------------
diff --git a/gremlin-server/src/main/static/NOTICE b/gremlin-server/src/main/static/NOTICE
index f50caec..cc20c09 100644
--- a/gremlin-server/src/main/static/NOTICE
+++ b/gremlin-server/src/main/static/NOTICE
@@ -55,6 +55,6 @@ LongAdder), which was released with the following comments:
http://creativecommons.org/publicdomain/zero/1.0/
------------------------------------------------------------------------
-Netty 4.1.21
+Netty 4.0.56
------------------------------------------------------------------------
Copyright 2014 The Netty Project
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2e74c31c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index d4c8d28..bab77a4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -146,7 +146,7 @@ limitations under the License.
<javadoc-plugin.version>2.10.4</javadoc-plugin.version>
<jcabi.version>1.1</jcabi.version>
<metrics.version>3.0.2</metrics.version>
- <netty.version>4.1.21.Final</netty.version>
+ <netty.version>4.0.56.Final</netty.version>
<slf4j.version>1.7.21</slf4j.version>
<snakeyaml.version>1.15</snakeyaml.version>
<spark.version>2.2.0</spark.version>
[36/50] tinkerpop git commit: TINKERPOP-1878 Testing for DISTINCT
Posted by sp...@apache.org.
TINKERPOP-1878 Testing for DISTINCT
Refactoring around the distinct and ordering - much less code there now.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/78d9bba7
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/78d9bba7
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/78d9bba7
Branch: refs/heads/TINKERPOP-1878
Commit: 78d9bba7a4c1219be0366abc1aced9a2242ea69a
Parents: 5d604e9
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Fri Jan 26 16:56:14 2018 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Apr 3 09:16:55 2018 -0400
----------------------------------------------------------------------
.../sparql/SparqlToGremlinTranspiler.java | 44 ++++++++------------
.../dsl/sparql/SparqlTraversalSourceTest.java | 23 ++++++++++
2 files changed, 41 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/78d9bba7/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/SparqlToGremlinTranspiler.java
----------------------------------------------------------------------
diff --git a/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/SparqlToGremlinTranspiler.java b/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/SparqlToGremlinTranspiler.java
index 1b28a1d..67ac1e1 100644
--- a/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/SparqlToGremlinTranspiler.java
+++ b/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/SparqlToGremlinTranspiler.java
@@ -107,39 +107,28 @@ public class SparqlToGremlinTranspiler {
final List<String> vars = query.getResultVars();
if (!query.isQueryResultStar() && !query.hasGroupBy()) {
- // the result sizes have special handling to get the right signatures of select() called. perhaps this
- // could be refactored to work more nicely
- switch (vars.size()) {
+ final String[] all = new String[vars.size()];
+ vars.toArray(all);
+ if (query.isDistinct()) {
+ traversal = traversal.dedup(all);
+ }
+
+ // apply ordering from ORDER BY
+ orderingIndex.forEach((k, v) -> traversal = traversal.order().by(__.select(k), v));
+
+ // the result sizes have special handling to get the right signatures of select() called.
+ switch (all.length) {
case 0:
throw new IllegalStateException();
case 1:
- if (query.isDistinct())
- traversal = traversal.dedup(vars.get(0));
-
- orderingIndex.forEach((k, v) -> traversal = traversal.order().by(__.select(k), v));
- traversal = traversal.select(vars.get(0));
-
+ traversal = traversal.select(all[0]);
break;
case 2:
- if (query.isDistinct())
- traversal = traversal.dedup(vars.get(0), vars.get(1));
-
- orderingIndex.forEach((k, v) -> traversal = traversal.order().by(__.select(k), v));
- traversal = traversal.select(vars.get(0), vars.get(1));
-
+ traversal = traversal.select(all[0], all[1]);
break;
default:
- final String[] all = new String[vars.size()];
- vars.toArray(all);
- if (query.isDistinct())
- traversal = traversal.dedup(all);
-
- orderingIndex.forEach((k, v) -> traversal = traversal.order().by(__.select(k), v));
-
- // just some shenanigans to get the right signature of select() called
final String[] others = Arrays.copyOfRange(all, 2, vars.size());
- traversal = traversal.select(vars.get(0), vars.get(1), others);
-
+ traversal = traversal.select(all[0], all[1], others);
break;
}
}
@@ -207,7 +196,10 @@ public class SparqlToGremlinTranspiler {
for (SortCondition sortCondition : sortingConditions) {
final Expr expr = sortCondition.getExpression();
- orderingIndex.put(expr.getVarName(), sortCondition.getDirection() == 1 ? Order.incr : Order.decr);
+
+ // by default, the sort will be ascending. getDirection() returns -2 if the DESC/ASC isn't
+ // supplied - weird
+ orderingIndex.put(expr.getVarName(), sortCondition.getDirection() == -1 ? Order.decr : Order.incr);
}
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/78d9bba7/sparql-gremlin/src/test/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversalSourceTest.java
----------------------------------------------------------------------
diff --git a/sparql-gremlin/src/test/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversalSourceTest.java b/sparql-gremlin/src/test/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversalSourceTest.java
index 4092e58..56d62c9 100644
--- a/sparql-gremlin/src/test/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversalSourceTest.java
+++ b/sparql-gremlin/src/test/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversalSourceTest.java
@@ -111,4 +111,27 @@ public class SparqlTraversalSourceTest {
assertEquals(x.get("b"), _g.V(4).next());
assertEquals(x.get("c"), _g.V(3).next());
}
+
+ @Test
+ public void shouldDistinct() {
+ final List<?> x = g.sparql(
+ "SELECT DISTINCT ?name\n" +
+ "WHERE {\n" +
+ " ?a e:created ?b .\n" +
+ " ?a v:name ?name .\n" +
+ "}").toList();
+ assertThat(x, containsInAnyOrder("marko", "josh", "peter"));
+ }
+
+ @Test
+ public void shouldDistinctAndOrder() {
+ final List<?> x = g.sparql(
+ "SELECT DISTINCT ?name\n" +
+ "WHERE {\n" +
+ " ?a e:created ?b .\n" +
+ " ?a v:name ?name .\n" +
+ "}" +
+ "ORDER BY ?name").toList();
+ assertThat(x, contains("josh", "marko", "peter"));
+ }
}
[39/50] tinkerpop git commit: TINKERPOP-1878 Test for FILTER
Posted by sp...@apache.org.
TINKERPOP-1878 Test for FILTER
Also fixed how the SparqlStrategy was being added to the TraversalStrategies in SparqlTraversalSource...it was adding it globally and all spawned TraversalSource instances were getting that strategy.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/5d604e9e
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/5d604e9e
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/5d604e9e
Branch: refs/heads/TINKERPOP-1878
Commit: 5d604e9e692ea31ee6158614b165489db3da8e2c
Parents: 5ed585b
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Fri Jan 26 16:29:55 2018 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Apr 3 09:16:55 2018 -0400
----------------------------------------------------------------------
.../dsl/sparql/SparqlTraversalSource.java | 2 +-
.../dsl/sparql/SparqlTraversalSourceTest.java | 23 ++++++++++++++++++++
2 files changed, 24 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5d604e9e/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversalSource.java
----------------------------------------------------------------------
diff --git a/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversalSource.java b/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversalSource.java
index cc54aa5..f78708b 100644
--- a/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversalSource.java
+++ b/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversalSource.java
@@ -47,7 +47,6 @@ public class SparqlTraversalSource implements TraversalSource {
public SparqlTraversalSource(final Graph graph, final TraversalStrategies traversalStrategies) {
this.graph = graph;
this.strategies = traversalStrategies;
- this.strategies.addStrategies(SparqlStrategy.instance());
}
public SparqlTraversalSource(final Graph graph) {
@@ -126,6 +125,7 @@ public class SparqlTraversalSource implements TraversalSource {
*/
public <S> SparqlTraversal<S,?> sparql(final String query) {
final SparqlTraversalSource clone = this.clone();
+ clone.getStrategies().addStrategies(SparqlStrategy.instance());
// this is a bit of a hack to get remote traversals to work cleanly. on the remote side, we'd expect a
// GraphTraversalSource not a SparqlTraversalSource (given that sparql-gremlin is to be implemented in the
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5d604e9e/sparql-gremlin/src/test/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversalSourceTest.java
----------------------------------------------------------------------
diff --git a/sparql-gremlin/src/test/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversalSourceTest.java b/sparql-gremlin/src/test/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversalSourceTest.java
index 1b39813..4092e58 100644
--- a/sparql-gremlin/src/test/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversalSourceTest.java
+++ b/sparql-gremlin/src/test/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversalSourceTest.java
@@ -18,16 +18,21 @@
*/
package org.apache.tinkerpop.gremlin.sparql.process.traversal.dsl.sparql;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
+import org.apache.tinkerpop.gremlin.sparql.process.traversal.strategy.SparqlStrategy;
import org.apache.tinkerpop.gremlin.structure.Graph;
+import org.apache.tinkerpop.gremlin.structure.Vertex;
import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerFactory;
import org.junit.Test;
import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.collection.IsIterableContainingInAnyOrder.containsInAnyOrder;
import static org.hamcrest.collection.IsIterableContainingInOrder.contains;
+import static org.junit.Assert.assertEquals;
/**
* @author Stephen Mallette (http://stephen.genoprime.com)
@@ -36,6 +41,7 @@ public class SparqlTraversalSourceTest {
private static final Graph graph = TinkerFactory.createModern();
private static final SparqlTraversalSource g = graph.traversal(SparqlTraversalSource.class);
+ private static final GraphTraversalSource _g = graph.traversal();
@Test
public void shouldFindAllPersonsNamesAndAges() {
@@ -88,4 +94,21 @@ public class SparqlTraversalSourceTest {
final List<?> x = g.sparql("SELECT ?name WHERE { ?person v:name ?name } ORDER BY DESC(?name)").toList();
assertThat(x, contains("vadas", "ripple", "peter", "marko", "lop", "josh"));
}
+
+ @Test
+ public void shouldFilter() {
+ final Map<String,Vertex> x = (Map) g.sparql( "SELECT ?a ?b ?c\n" +
+ "WHERE {\n" +
+ " ?a v:label \"person\" .\n" +
+ " ?a e:knows ?b .\n" +
+ " ?a e:created ?c .\n" +
+ " ?b e:created ?c .\n" +
+ " ?a v:age ?d .\n" +
+ " FILTER (?d < 30)\n" +
+ "}").next();
+
+ assertEquals(x.get("a"), _g.V(1).next());
+ assertEquals(x.get("b"), _g.V(4).next());
+ assertEquals(x.get("c"), _g.V(3).next());
+ }
}
[02/50] tinkerpop git commit: Merge branch 'tp32' into tp33
Posted by sp...@apache.org.
Merge branch 'tp32' into tp33
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/0f29e7e8
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/0f29e7e8
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/0f29e7e8
Branch: refs/heads/TINKERPOP-1878
Commit: 0f29e7e8fedfa860fbf663e7398bbaf05e4d30e2
Parents: 38bcdb6 6323f49
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Mar 20 15:25:39 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Mar 20 15:25:39 2018 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
.../strategy/decoration/RemoteStrategy.java | 27 +++++++++++++++++++-
.../process/traversal/TraversalStrategies.java | 22 ++++++++--------
3 files changed, 38 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0f29e7e8/CHANGELOG.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0f29e7e8/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalStrategies.java
----------------------------------------------------------------------
[16/50] tinkerpop git commit: TINKERPOP-1866 Add a deserializer for
g:T to Gremlin.Net
Posted by sp...@apache.org.
TINKERPOP-1866 Add a deserializer for g:T to Gremlin.Net
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/4016c80b
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/4016c80b
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/4016c80b
Branch: refs/heads/TINKERPOP-1878
Commit: 4016c80b1dac10aff1509dbfabf268d4bb9b5c50
Parents: ffabea8
Author: Florian Hockmann <fh...@florian-hockmann.de>
Authored: Tue Mar 20 15:45:11 2018 +0100
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Mar 22 16:50:15 2018 -0400
----------------------------------------------------------------------
.../Process/Traversal/EnumWrapper.cs | 31 ++++++++++++++-
.../Structure/IO/GraphSON/GraphSONReader.cs | 1 +
.../Structure/IO/GraphSON/TDeserializer.cs | 42 ++++++++++++++++++++
.../Gherkin/CommonSteps.cs | 4 +-
.../Gherkin/GherkinTestRunner.cs | 4 --
.../IO/GraphSON/GraphSONReaderTests.cs | 12 ++++++
6 files changed, 88 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4016c80b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/EnumWrapper.cs
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/EnumWrapper.cs b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/EnumWrapper.cs
index 66b8c5a..20a0348 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/EnumWrapper.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/EnumWrapper.cs
@@ -21,12 +21,14 @@
#endregion
+using System;
+
namespace Gremlin.Net.Process.Traversal
{
/// <summary>
/// Represents an enum.
/// </summary>
- public abstract class EnumWrapper
+ public abstract class EnumWrapper : IEquatable<EnumWrapper>
{
/// <summary>
/// Gets the name of the enum.
@@ -48,5 +50,32 @@ namespace Gremlin.Net.Process.Traversal
EnumName = enumName;
EnumValue = enumValue;
}
+
+ /// <inheritdoc />
+ public bool Equals(EnumWrapper other)
+ {
+ if (ReferenceEquals(null, other)) return false;
+ if (ReferenceEquals(this, other)) return true;
+ return string.Equals(EnumName, other.EnumName) && string.Equals(EnumValue, other.EnumValue);
+ }
+
+ /// <inheritdoc />
+ public override bool Equals(object obj)
+ {
+ if (ReferenceEquals(null, obj)) return false;
+ if (ReferenceEquals(this, obj)) return true;
+ if (obj.GetType() != this.GetType()) return false;
+ return Equals((EnumWrapper) obj);
+ }
+
+ /// <inheritdoc />
+ public override int GetHashCode()
+ {
+ unchecked
+ {
+ return ((EnumName != null ? EnumName.GetHashCode() : 0) * 397) ^
+ (EnumValue != null ? EnumValue.GetHashCode() : 0);
+ }
+ }
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4016c80b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/GraphSONReader.cs
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/GraphSONReader.cs b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/GraphSONReader.cs
index fbec67d..94fcd8d 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/GraphSONReader.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/GraphSONReader.cs
@@ -52,6 +52,7 @@ namespace Gremlin.Net.Structure.IO.GraphSON
{"g:Property", new PropertyDeserializer()},
{"g:VertexProperty", new VertexPropertyDeserializer()},
{"g:Path", new PathDeserializer()},
+ {"g:T", new TDeserializer()},
{"gx:BigDecimal", new DecimalConverter()}
};
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4016c80b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/TDeserializer.cs
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/TDeserializer.cs b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/TDeserializer.cs
new file mode 100644
index 0000000..e79783c
--- /dev/null
+++ b/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/TDeserializer.cs
@@ -0,0 +1,42 @@
+#region License
+
+/*
+ * 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.
+ */
+
+#endregion
+
+using System;
+using System.Linq;
+using System.Reflection;
+using Gremlin.Net.Process.Traversal;
+using Newtonsoft.Json.Linq;
+
+namespace Gremlin.Net.Structure.IO.GraphSON
+{
+ internal class TDeserializer : IGraphSONDeserializer
+ {
+ public dynamic Objectify(JToken graphsonObject, GraphSONReader reader)
+ {
+ var tValue = graphsonObject.ToString();
+ return typeof(T).GetProperties()
+ .First(p => string.Equals(p.Name, tValue, StringComparison.OrdinalIgnoreCase))
+ .GetValue(null);
+ }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4016c80b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/CommonSteps.cs
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/CommonSteps.cs b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/CommonSteps.cs
index 9322da3..31948f4 100644
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/CommonSteps.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/CommonSteps.cs
@@ -26,6 +26,7 @@ using System.Collections;
using System.Collections.Generic;
using System.Globalization;
using System.Linq;
+using System.Reflection;
using System.Text.RegularExpressions;
using Gherkin.Ast;
using Gremlin.Net.IntegrationTest.Gherkin.Attributes;
@@ -239,7 +240,8 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
private static object ToT(string enumName, string graphName)
{
- return Enum.Parse(typeof(T), TraversalParser.GetCsharpName(enumName));
+ return typeof(T).GetProperties()
+ .First(p => string.Equals(p.Name, enumName, StringComparison.OrdinalIgnoreCase)).GetValue(null);
}
private static object ToNumber(string stringNumber, string graphName)
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4016c80b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
index 52646a7..68d10fe 100644
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
@@ -40,10 +40,6 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
private static readonly IDictionary<string, IgnoreReason> IgnoredScenarios =
new Dictionary<string, IgnoreReason>
{
- { "g_V_valueMapXtrueX", IgnoreReason.TraversalTDeserializationNotSupported }, // TINKERPOP-1866
- { "g_V_valueMapXtrue_name_ageX", IgnoreReason.TraversalTDeserializationNotSupported }, // TINKERPOP-1866
- { "g_V_hasLabelXpersonX_filterXoutEXcreatedXX_valueMapXtrueX", IgnoreReason.TraversalTDeserializationNotSupported }, // TINKERPOP-1866
- {"g_V_asXaX_hasXname_markoX_outXcreatedX_asXbX_addVXselectXaX_labelX_propertyXtest_selectXbX_labelX_valueMapXtrueX", IgnoreReason.TraversalTDeserializationNotSupported},
{"g_V_storeXaX_byXoutEXcreatedX_countX_out_out_storeXaX_byXinEXcreatedX_weight_sumX", IgnoreReason.ReceivedDataDoesntMatchExpected}
};
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4016c80b/gremlin-dotnet/test/Gremlin.Net.UnitTest/Structure/IO/GraphSON/GraphSONReaderTests.cs
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/test/Gremlin.Net.UnitTest/Structure/IO/GraphSON/GraphSONReaderTests.cs b/gremlin-dotnet/test/Gremlin.Net.UnitTest/Structure/IO/GraphSON/GraphSONReaderTests.cs
index ae4392b..c93630f 100644
--- a/gremlin-dotnet/test/Gremlin.Net.UnitTest/Structure/IO/GraphSON/GraphSONReaderTests.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.UnitTest/Structure/IO/GraphSON/GraphSONReaderTests.cs
@@ -23,6 +23,7 @@
using System;
using System.Collections.Generic;
+using Gremlin.Net.Process.Traversal;
using Gremlin.Net.Structure;
using Gremlin.Net.Structure.IO.GraphSON;
using Moq;
@@ -220,6 +221,17 @@ namespace Gremlin.Net.UnitTest.Structure.IO.GraphSON
Assert.Equal(new List<object> {5, 6}, deserializedValue);
}
+ [Theory, MemberData(nameof(Versions))]
+ public void ShouldDeserializeT(int version)
+ {
+ var graphSon = "{\"@type\":\"g:T\",\"@value\":\"label\"}";
+ var reader = CreateStandardGraphSONReader(version);
+
+ T readT = reader.ToObject(JObject.Parse(graphSon));
+
+ Assert.Equal(T.Label, readT);
+ }
+
[Fact]
public void ShouldDeserializePathFromGraphSON2()
{
[09/50] tinkerpop git commit: Fixed bad label in test for sink data
Posted by sp...@apache.org.
Fixed bad label in test for sink data
Not sure why all test implementations weren't failing here, but giraph was especially not happy. CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/373eba14
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/373eba14
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/373eba14
Branch: refs/heads/TINKERPOP-1878
Commit: 373eba1428f989743cab050fd253c26c36f922f0
Parents: bddc756
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Mar 22 09:12:03 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Mar 22 09:12:27 2018 -0400
----------------------------------------------------------------------
.../tinkerpop/gremlin/process/computer/GraphComputerTest.java | 2 +-
.../tinkerpop/gremlin/tinkergraph/structure/TinkerFactory.java | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/373eba14/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
index f9e79ae..3f492d6 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
@@ -2758,7 +2758,7 @@ public class GraphComputerTest extends AbstractGremlinProcessTest {
private static final String SIMPLE_VERTEX_PROGRAM_CFG_PREFIX = "gremlin.simpleVertexProgram";
private static final String PROPERTY_OUT = "propertyout";
private static final String PROPERTY_IN = "name";
- private static final String VERTEX_LABEL = "message_passing_test";
+ private static final String VERTEX_LABEL = "message";
private static final String DIRECTION_CFG_KEY = SIMPLE_VERTEX_PROGRAM_CFG_PREFIX + ".direction";
private Direction direction;
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/373eba14/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerFactory.java
----------------------------------------------------------------------
diff --git a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerFactory.java b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerFactory.java
index c464fa8..ef1ee7f 100644
--- a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerFactory.java
+++ b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerFactory.java
@@ -21,7 +21,6 @@ package org.apache.tinkerpop.gremlin.tinkergraph.structure;
import org.apache.commons.configuration.BaseConfiguration;
import org.apache.commons.configuration.Configuration;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
-import org.apache.tinkerpop.gremlin.structure.Graph;
import org.apache.tinkerpop.gremlin.structure.T;
import org.apache.tinkerpop.gremlin.structure.Vertex;
import org.apache.tinkerpop.gremlin.structure.VertexProperty;
[48/50] tinkerpop git commit: TINKERPOP-1878 Added basic docs for
sparql-gremlin
Posted by sp...@apache.org.
TINKERPOP-1878 Added basic docs for sparql-gremlin
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/ab5d99ed
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/ab5d99ed
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/ab5d99ed
Branch: refs/heads/TINKERPOP-1878
Commit: ab5d99ed44230abc1e1f3eee085e5a58eec60bad
Parents: 8a33cf2
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Jan 29 11:04:23 2018 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Apr 3 09:16:55 2018 -0400
----------------------------------------------------------------------
docs/preprocessor/install-plugins.sh | 2 +-
docs/src/reference/index.asciidoc | 2 +
docs/src/reference/transpilers.asciidoc | 66 ++++++++++++++++++++++++++++
3 files changed, 69 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ab5d99ed/docs/preprocessor/install-plugins.sh
----------------------------------------------------------------------
diff --git a/docs/preprocessor/install-plugins.sh b/docs/preprocessor/install-plugins.sh
index 990dbe4..9085469 100755
--- a/docs/preprocessor/install-plugins.sh
+++ b/docs/preprocessor/install-plugins.sh
@@ -25,7 +25,7 @@ TMP_DIR=$3
INSTALL_TEMPLATE="docs/preprocessor/install-plugins.groovy"
INSTALL_FILE="${TMP_DIR}/install-plugins.groovy"
-plugins=("hadoop-gremlin" "spark-gremlin" "giraph-gremlin" "neo4j-gremlin")
+plugins=("hadoop-gremlin" "spark-gremlin" "giraph-gremlin" "neo4j-gremlin", "sparql-gremlin")
# plugins=()
pluginsCount=${#plugins[@]}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ab5d99ed/docs/src/reference/index.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/reference/index.asciidoc b/docs/src/reference/index.asciidoc
index decc7ef..d4c4f1d 100644
--- a/docs/src/reference/index.asciidoc
+++ b/docs/src/reference/index.asciidoc
@@ -46,6 +46,8 @@ include::implementations-hadoop-end.asciidoc[]
include::gremlin-variants.asciidoc[]
+include::transpilers.asciidoc[]
+
include::conclusion.asciidoc[]
include::acknowledgements.asciidoc[]
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ab5d99ed/docs/src/reference/transpilers.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/reference/transpilers.asciidoc b/docs/src/reference/transpilers.asciidoc
new file mode 100644
index 0000000..305e3dc
--- /dev/null
+++ b/docs/src/reference/transpilers.asciidoc
@@ -0,0 +1,66 @@
+////
+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.
+////
+[[transpilers]]
+= Gremlin Transpilers
+
+There are many languages built to query data. SQL is typically used to query relational data. There is SPARQL for RDF
+data. Cypher is used to do pattern matching in graph data. The list could go on. Transpilers convert languages like
+these to Gremlin so that it becomes possible to use them in any context that Gremlin is used. In other words, a
+Gremlin Transpiler enables a particular query language to work on any TinkerPop-enabled graph system.
+
+== SPARQL-Gremlin
+
+[source,xml]
+----
+<dependency>
+ <groupId>org.apache.tinkerpop</groupId>
+ <artifactId>sparql-gremlin</artifactId>
+ <version>x.y.z</version>
+</dependency>
+----
+
+The SPARQL-Gremlin transpiler converts link:https://en.wikipedia.org/wiki/SPARQL[SPARQL] queries into Gremlin so that
+they can be executed across any TinkerPop-enabled graph system. To use this transpiler in the Gremlin Console, first
+install and activate the "tinkerpop.sparql" plugin:
+
+[source,text]
+----
+gremlin> :install org.apache.tinkerpop sparql-gremlin x.y.z
+==>Loaded: [org.apache.tinkerpop, sparql-gremlin, x.y.z]
+gremlin> :plugin use tinkerpop.sparql
+==>tinkerpop.sparql activated
+----
+
+Installing this plugin will download appropriate dependencies and import certain classes to the console so that they
+may be used as follows:
+
+[gremlin-groovy,modern]
+----
+graph = TinkerFactory.createModern()
+g = graph.traversal(SparqlTraversalSource) <1>
+g.sparql("""SELECT ?name ?age
+ WHERE { ?person v:name ?name . ?person v:age ?age }
+ ORDER BY ASC(?age)""") <2>
+----
+
+<1> Define `g` as a `TraversalSource` that uses the `SparqlTraversalSource` - by default, the `traversal()` method
+usually returns a `GraphTraversalSource` which includes the standard Gremlin starts steps like `V()` or `E()`. In this
+case, the `SparqlTraversalSource` enables starts steps that are specific to SPARQL only - in this case the `sparql()`
+start step.
+<2> Execute a SPARQL query against the TinkerGraph instance. The `SparqlTraversalSource` uses a
+<<traversalstrategy,TraversalStrategy>> to transparently converts that SPARQL query into a standard Gremlin traversal
+and then when finally iterated, executes that against the TinkerGraph.
[30/50] tinkerpop git commit: TINKERPOP-1878 Added a basics for
sparql execution in a traversal
Posted by sp...@apache.org.
TINKERPOP-1878 Added a basics for sparql execution in a traversal
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/9120b225
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/9120b225
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/9120b225
Branch: refs/heads/TINKERPOP-1878
Commit: 9120b225a78570f2242983f6ecb360f756986dfe
Parents: e8e39be
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Jan 25 14:46:31 2018 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Apr 3 09:16:16 2018 -0400
----------------------------------------------------------------------
.../traversal/step/map/ConstantStep.java | 4 ++
.../traversal/strategy/SparqlStrategy.java | 56 +++++++++++++++++++-
.../dsl/sparql/SparqlTraversalSourceTest.java | 39 ++++++++++++++
.../src/test/resources/log4j-silent.properties | 23 ++++++++
.../src/test/resources/log4j-test.properties | 23 ++++++++
5 files changed, 144 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9120b225/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ConstantStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ConstantStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ConstantStep.java
index 5d02e28..749de31 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ConstantStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ConstantStep.java
@@ -36,6 +36,10 @@ public class ConstantStep<S, E> extends MapStep<S, E> {
this.constant = constant;
}
+ public E getConstant() {
+ return this.constant;
+ }
+
@Override
protected E map(final Traverser.Admin<S> traverser) {
return this.constant;
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9120b225/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/strategy/SparqlStrategy.java
----------------------------------------------------------------------
diff --git a/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/strategy/SparqlStrategy.java b/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/strategy/SparqlStrategy.java
index 6440127..07ac4cf 100644
--- a/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/strategy/SparqlStrategy.java
+++ b/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/strategy/SparqlStrategy.java
@@ -18,8 +18,62 @@
*/
package org.apache.tinkerpop.gremlin.sparql.process.traversal.strategy;
+import org.apache.tinkerpop.gremlin.process.computer.traversal.strategy.decoration.VertexProgramStrategy;
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategy;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.ConstantStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.TraversalMapStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.util.EmptyStep;
+import org.apache.tinkerpop.gremlin.process.traversal.strategy.AbstractTraversalStrategy;
+import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper;
+import org.apache.tinkerpop.gremlin.sparql.SparqlToGremlinCompiler;
+import org.apache.tinkerpop.gremlin.structure.Vertex;
+
+import java.util.Collections;
+import java.util.Set;
+
/**
* @author Stephen Mallette (http://stephen.genoprime.com)
*/
-public class SparqlStrategy {
+public class SparqlStrategy extends AbstractTraversalStrategy<TraversalStrategy.DecorationStrategy>
+ implements TraversalStrategy.DecorationStrategy {
+ private static final SparqlStrategy INSTANCE = new SparqlStrategy();
+
+ private static final Set<Class<? extends DecorationStrategy>> POSTS = Collections.singleton(VertexProgramStrategy.class);
+
+ private SparqlStrategy() {}
+
+ public static SparqlStrategy instance() {
+ return INSTANCE;
+ }
+
+ @Override
+ public Set<Class<? extends DecorationStrategy>> applyPost() {
+ return POSTS;
+ }
+
+
+ @Override
+ public void apply(final Traversal.Admin<?, ?> traversal) {
+ if (!(traversal.getParent() instanceof EmptyStep))
+ return;
+
+ if (traversal.getSteps().size() == 1 && traversal.getEndStep() instanceof ConstantStep) {
+ final ConstantStep stepWithSparql = (ConstantStep) traversal.getEndStep();
+ final Object constant = stepWithSparql.getConstant();
+ if (constant instanceof String) {
+ final String sparql = (String) constant;
+ final Traversal<Vertex, ?> sparqlTraversal = SparqlToGremlinCompiler.convertToGremlinTraversal(
+ traversal.getGraph().get(), sparql);
+ TraversalHelper.removeAllSteps(traversal);
+ sparqlTraversal.asAdmin().getSteps().forEach(s -> traversal.addStep(s));
+ } else {
+ // The ConstantStep expects a string value
+ throw new IllegalStateException("SparqlStrategy cannot be applied to this traversal");
+ }
+ } else {
+ // SparqlStrategy requires that there be one step and it be a ConstantStep that contains some SPARQL
+ throw new IllegalStateException("SparqlStrategy cannot be applied to this traversal");
+ }
+ }
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9120b225/sparql-gremlin/src/test/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversalSourceTest.java
----------------------------------------------------------------------
diff --git a/sparql-gremlin/src/test/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversalSourceTest.java b/sparql-gremlin/src/test/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversalSourceTest.java
new file mode 100644
index 0000000..9e5ffc0
--- /dev/null
+++ b/sparql-gremlin/src/test/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversalSourceTest.java
@@ -0,0 +1,39 @@
+/*
+ * 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.sparql.process.traversal.dsl.sparql;
+
+import org.apache.tinkerpop.gremlin.sparql.process.traversal.strategy.SparqlStrategy;
+import org.apache.tinkerpop.gremlin.structure.Graph;
+import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerFactory;
+import org.junit.Test;
+
+/**
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+public class SparqlTraversalSourceTest {
+
+ @Test
+ public void shouldDoStuff() {
+ final Graph graph = TinkerFactory.createModern();
+ final SparqlTraversalSource g = graph.traversal(SparqlTraversalSource.class).
+ withStrategies(SparqlStrategy.instance());
+ final Object x = g.sparql("SELECT ?name ?age WHERE { ?person v:name ?name . ?person v:age ?age }").toList();
+ System.out.println(x);
+ }
+}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9120b225/sparql-gremlin/src/test/resources/log4j-silent.properties
----------------------------------------------------------------------
diff --git a/sparql-gremlin/src/test/resources/log4j-silent.properties b/sparql-gremlin/src/test/resources/log4j-silent.properties
new file mode 100644
index 0000000..1825bb0
--- /dev/null
+++ b/sparql-gremlin/src/test/resources/log4j-silent.properties
@@ -0,0 +1,23 @@
+# 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.
+
+# this file should always have logging set to OFF. it seems, however, that an appender of some sort is
+# required or else some logs throw error and use other log4j.properties files on the path.
+log4j.rootLogger=OFF, stdout
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=[%p] %C - %m%n
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9120b225/sparql-gremlin/src/test/resources/log4j-test.properties
----------------------------------------------------------------------
diff --git a/sparql-gremlin/src/test/resources/log4j-test.properties b/sparql-gremlin/src/test/resources/log4j-test.properties
new file mode 100644
index 0000000..79038b1
--- /dev/null
+++ b/sparql-gremlin/src/test/resources/log4j-test.properties
@@ -0,0 +1,23 @@
+#
+# 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.
+#
+
+log4j.rootLogger=WARN, stdout
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=[%p] %C - %m%n
\ No newline at end of file
[40/50] tinkerpop git commit: TINKERPOP-1878 General refactoring and
javadoc on Prefixes class
Posted by sp...@apache.org.
TINKERPOP-1878 General refactoring and javadoc on Prefixes class
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/aacea625
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/aacea625
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/aacea625
Branch: refs/heads/TINKERPOP-1878
Commit: aacea625e24b84f96531a0b4c571a7479c0e5686
Parents: 2b6fd19
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Fri Jan 26 09:39:28 2018 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Apr 3 09:16:55 2018 -0400
----------------------------------------------------------------------
.../tinkerpop/gremlin/sparql/Prefixes.java | 23 ++++++++++----------
1 file changed, 12 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/aacea625/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/Prefixes.java
----------------------------------------------------------------------
diff --git a/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/Prefixes.java b/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/Prefixes.java
index 452bf68..32768a7 100644
--- a/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/Prefixes.java
+++ b/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/Prefixes.java
@@ -22,15 +22,16 @@ package org.apache.tinkerpop.gremlin.sparql;
import java.util.Arrays;
import java.util.List;
+/**
+ * Helper methods for working with prefix lines in SPARQL queries.
+ */
+class Prefixes {
-public class Prefixes {
-
- // public final static String BASE_URI = "http://northwind.com/model/";
- public final static String BASE_URI = "http://www.tinkerpop.com/traversal/";
+ final static String BASE_URI = "http://tinkerpop.apache.org/traversal/";
- final static List<String> PREFIXES = Arrays.asList("edge", "property", "value");
+ private final static List<String> PREFIXES = Arrays.asList("edge", "property", "value");
- final static String PREFIX_DEFINITIONS;
+ private final static String PREFIX_DEFINITIONS;
static {
final StringBuilder builder = new StringBuilder();
@@ -41,24 +42,24 @@ public class Prefixes {
PREFIX_DEFINITIONS = builder.toString();
}
- public static String getURI(final String prefix) {
+ static String getURI(final String prefix) {
return BASE_URI + prefix + "#";
}
- public static String getURIValue(final String uri) {
+ static String getURIValue(final String uri) {
return uri.substring(uri.indexOf("#") + 1);
}
- public static String getPrefix(final String uri) {
+ static String getPrefix(final String uri) {
final String tmp = uri.substring(0, uri.indexOf("#"));
return tmp.substring(tmp.lastIndexOf("/") + 1);
}
- public static String prepend(final String script) {
+ static String prepend(final String script) {
return PREFIX_DEFINITIONS + script;
}
- public static StringBuilder prepend(final StringBuilder scriptBuilder) {
+ static StringBuilder prepend(final StringBuilder scriptBuilder) {
return scriptBuilder.insert(0, PREFIX_DEFINITIONS);
}
}
[34/50] tinkerpop git commit: TINKERPOP-1878 Dropped the console app
Posted by sp...@apache.org.
TINKERPOP-1878 Dropped the console app
This allows TinkerGraph to remain a test dependency only and the console app was more of a test rig than something that a user of this library would use, so it seemed like something that could be dropped.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/1dec3524
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/1dec3524
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/1dec3524
Branch: refs/heads/TINKERPOP-1878
Commit: 1dec352431755596cbe0f06bb67e88356bf1bd96
Parents: 9120b22
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Jan 25 14:49:18 2018 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Apr 3 09:16:16 2018 -0400
----------------------------------------------------------------------
sparql-gremlin/pom.xml | 1 +
.../gremlin/sparql/ConsoleCompiler.java | 165 -------------------
2 files changed, 1 insertion(+), 165 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1dec3524/sparql-gremlin/pom.xml
----------------------------------------------------------------------
diff --git a/sparql-gremlin/pom.xml b/sparql-gremlin/pom.xml
index d38a85d..0dceb85 100644
--- a/sparql-gremlin/pom.xml
+++ b/sparql-gremlin/pom.xml
@@ -42,6 +42,7 @@
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkergraph-gremlin</artifactId>
<version>${project.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.tinkerpop</groupId>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1dec3524/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/ConsoleCompiler.java
----------------------------------------------------------------------
diff --git a/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/ConsoleCompiler.java b/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/ConsoleCompiler.java
deleted file mode 100644
index 0d50475..0000000
--- a/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/ConsoleCompiler.java
+++ /dev/null
@@ -1,165 +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.sparql;
-
-import java.io.BufferedReader;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.StringReader;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.CommandLineParser;
-import org.apache.commons.cli.DefaultParser;
-import org.apache.commons.cli.Options;
-import org.apache.commons.cli.ParseException;
-import org.apache.tinkerpop.gremlin.jsr223.JavaTranslator;
-import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
-import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
-import org.apache.tinkerpop.gremlin.structure.Graph;
-import org.apache.tinkerpop.gremlin.structure.Vertex;
-import org.apache.tinkerpop.gremlin.structure.io.IoCore;
-import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerFactory;
-import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph;
-
-import org.apache.tinkerpop.gremlin.sparql.SparqlToGremlinCompiler;
-
-class ConsoleCompiler {
-
- public static void main(final String[] args) throws IOException {
- //args = "/examples/modern1.sparql";
- final Options options = new Options();
- options.addOption("f", "file", true, "a file that contains a SPARQL query");
- options.addOption("g", "graph", true, "the graph that's used to execute the query [classic|modern|crew|kryo file]");
- // TODO: add an OLAP option (perhaps: "--olap spark"?)
-
- final CommandLineParser parser = new DefaultParser();
- final CommandLine commandLine;
-
- try {
- commandLine = parser.parse(options, args);
- } catch (ParseException e) {
- System.out.println(e.getMessage());
- printHelp(1);
- return;
- }
-
- final InputStream inputStream = commandLine.hasOption("file")
- ? new FileInputStream(commandLine.getOptionValue("file"))
- : System.in;
- final BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream));
- final StringBuilder queryBuilder = new StringBuilder();
-
- if (!reader.ready()) {
- printHelp(1);
- }
-
- String line;
- while (null != (line = reader.readLine())) {
- queryBuilder.append(System.lineSeparator()).append(line);
- }
-
- final String queryString = queryBuilder.toString();
- Graph graph;
-
- if (commandLine.hasOption("graph")) {
- switch (commandLine.getOptionValue("graph").toLowerCase()) {
- case "classic":
- graph = TinkerFactory.createClassic();
- break;
- case "modern":
- graph = TinkerFactory.createModern();
- System.out.println("Modern Graph Created");
- break;
- case "crew":
- graph = TinkerFactory.createTheCrew();
- break;
- default:
- graph = TinkerGraph.open();
- System.out.println("Graph Created");
- String graphName = commandLine.getOptionValue("graph");
- long startTime= System.currentTimeMillis();
- if(graphName.endsWith(".graphml"))
- graph.io(IoCore.graphml()).readGraph(graphName);
- else if(graphName.endsWith(".kryo")||graphName.endsWith("gryo"))
- graph.io(IoCore.gryo()).readGraph(graphName);
- long endTime = System.currentTimeMillis();
- System.out.println("Time taken to load graph from kyro file: "+ (endTime-startTime)+" mili seconds");
- break;
- }
- } else {
-
- graph = TinkerFactory.createModern();
- }
-
- long startTime = System.currentTimeMillis();
- final Traversal<Vertex, ?> traversal = SparqlToGremlinCompiler.convertToGremlinTraversal(graph, queryString);
- long endTime = System.currentTimeMillis();
- System.out.println("Time traken to convert SPARQL to Gremlin Traversal : "+ (endTime - startTime)+ " miliseconds");
-
- printWithHeadline("SPARQL Query", queryString);
- // printWithHeadline("Traversal (prior execution)", traversal);
-
-
- Bytecode traversalByteCode = traversal.asAdmin().getBytecode();
-
-
-// JavaTranslator.of(graph.traversal()).translate(traversalByteCode);
-//
-// System.out.println("the Byte Code : "+ traversalByteCode.toString());
- printWithHeadline("Result", String.join(System.lineSeparator(),JavaTranslator.of(graph.traversal()).translate(traversalByteCode).toStream().map(Object::toString).collect(Collectors.toList())));
- // printWithHeadline("Traversal (after execution)", traversal);
- }
-
- private static void printHelp(final int exitCode) throws IOException {
- final Map<String, String> env = System.getenv();
- final String command = env.containsKey("LAST_COMMAND") ? env.get("LAST_COMMAND") : "sparql-gremlin.sh";
- printWithHeadline("Usage Examples", String.join("\n",
- command + " -f examples/modern1.sparql",
- command + " < examples/modern2.sparql",
- command + " <<< 'SELECT * WHERE { ?a e:knows ?b }'",
- command + " -g crew < examples/crew1.sparql"));
- if (exitCode >= 0) {
- System.exit(exitCode);
- }
- }
-
- private static void printWithHeadline(final String headline, final Object content) throws IOException {
- final StringReader sr = new StringReader(content != null ? content.toString() : "null");
- final BufferedReader br = new BufferedReader(sr);
- String line;
- System.out.println();
- System.out.println( headline );
- System.out.println();
- boolean skip = true;
- while (null != (line = br.readLine())) {
- skip &= line.isEmpty();
- if (!skip) {
- System.out.println(" " + line);
- }
- }
- System.out.println();
- br.close();
- sr.close();
- }
-}
[32/50] tinkerpop git commit: TINKERPOP-1878 sparql() step works over
remoting
Posted by sp...@apache.org.
TINKERPOP-1878 sparql() step works over remoting
At this point it is only tested to work with Gryo 3.0. Fixed a bug with how dynamic gryo registrations work - they failed if you didn't have a specific serializer specified. Introduced a bit of a hack to make SparqlTraversalSource behave like a GraphTraversalSource and thus more cleanly follow the DSL pattern. Not sure if that's a great approach yet or not, but it seems harmless at this point.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/cc0922ac
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/cc0922ac
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/cc0922ac
Branch: refs/heads/TINKERPOP-1878
Commit: cc0922accc30beb0e5f0f694ea0cd4c1bce7fb1b
Parents: fd7dddc
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Jan 25 17:00:54 2018 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Apr 3 09:16:16 2018 -0400
----------------------------------------------------------------------
.../apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java | 5 ++++-
sparql-gremlin/pom.xml | 4 ----
.../process/traversal/dsl/sparql/SparqlTraversalSource.java | 3 +++
.../sparql/process/traversal/strategy/SparqlStrategy.java | 5 +++--
4 files changed, 10 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/cc0922ac/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java
index 6bb7b34..4a325dd 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java
@@ -382,6 +382,9 @@ public enum GryoVersion {
"org.apache.tinkerpop.gremlin.driver.ser.RequestMessageGryoSerializer", 167);
tryAddDynamicType(this, "org.apache.tinkerpop.gremlin.driver.message.ResponseMessage",
"org.apache.tinkerpop.gremlin.driver.ser.ResponseMessageGryoSerializer", 169);
+
+ tryAddDynamicType(this, "org.apache.tinkerpop.gremlin.sparql.process.traversal.strategy.SparqlStrategy",
+ null, 1690);
}};
}
@@ -560,7 +563,7 @@ public enum GryoVersion {
final String serializer, final int registrationId) {
try {
final Class typeClass = Class.forName(type);
- final Optional<SerializerShim<?>> serializerInstance = Optional.of(serializer)
+ final Optional<SerializerShim<?>> serializerInstance = Optional.ofNullable(serializer)
.map(FunctionUtils.wrapFunction(Class::forName))
.map(FunctionUtils.wrapFunction(c -> (SerializerShim<?>) c.getConstructor().newInstance()));
if (serializerInstance.isPresent()) {
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/cc0922ac/sparql-gremlin/pom.xml
----------------------------------------------------------------------
diff --git a/sparql-gremlin/pom.xml b/sparql-gremlin/pom.xml
index 0dceb85..0e3da38 100644
--- a/sparql-gremlin/pom.xml
+++ b/sparql-gremlin/pom.xml
@@ -11,10 +11,6 @@
<artifactId>sparql-gremlin</artifactId>
<name>Apache TinkerPop :: SPARQL Gremlin</name>
- <properties>
- <query.dir>src/test/resources/sparql/queries</query.dir>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.jena</groupId>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/cc0922ac/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversalSource.java
----------------------------------------------------------------------
diff --git a/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversalSource.java b/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversalSource.java
index b156ed1..3889d95 100644
--- a/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversalSource.java
+++ b/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversalSource.java
@@ -27,6 +27,7 @@ import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategies;
import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal;
import org.apache.tinkerpop.gremlin.process.traversal.step.map.ConstantStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.InjectStep;
import org.apache.tinkerpop.gremlin.structure.Graph;
import org.apache.tinkerpop.gremlin.structure.Transaction;
import org.apache.tinkerpop.gremlin.structure.util.StringFactory;
@@ -123,8 +124,10 @@ public class SparqlTraversalSource implements TraversalSource {
*/
public <S> SparqlTraversal<S,String> sparql(final String query) {
final SparqlTraversalSource clone = this.clone();
+ clone.bytecode.addStep(GraphTraversal.Symbols.inject);
clone.bytecode.addStep(GraphTraversal.Symbols.constant, query);
final SparqlTraversal.Admin<S, S> traversal = new DefaultSparqlTraversal<>(clone);
+ traversal.addStep(new InjectStep<S>(traversal));
return traversal.addStep(new ConstantStep<S,String>(traversal, query));
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/cc0922ac/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/strategy/SparqlStrategy.java
----------------------------------------------------------------------
diff --git a/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/strategy/SparqlStrategy.java b/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/strategy/SparqlStrategy.java
index bb0b326..d74ac3e 100644
--- a/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/strategy/SparqlStrategy.java
+++ b/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/strategy/SparqlStrategy.java
@@ -19,6 +19,7 @@
package org.apache.tinkerpop.gremlin.sparql.process.traversal.strategy;
import org.apache.tinkerpop.gremlin.process.computer.traversal.strategy.decoration.VertexProgramStrategy;
+import org.apache.tinkerpop.gremlin.process.remote.traversal.strategy.decoration.RemoteStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.step.map.ConstantStep;
@@ -44,7 +45,7 @@ public class SparqlStrategy extends AbstractTraversalStrategy<TraversalStrategy.
implements TraversalStrategy.DecorationStrategy {
private static final SparqlStrategy INSTANCE = new SparqlStrategy();
- private static final Set<Class<? extends DecorationStrategy>> POSTS = Collections.singleton(VertexProgramStrategy.class);
+ private static final Set<Class<? extends DecorationStrategy>> POSTS = Collections.singleton(RemoteStrategy.class);
private SparqlStrategy() {}
@@ -63,7 +64,7 @@ public class SparqlStrategy extends AbstractTraversalStrategy<TraversalStrategy.
if (!(traversal.getParent() instanceof EmptyStep))
return;
- if (traversal.getSteps().size() == 1 && traversal.getEndStep() instanceof ConstantStep) {
+ if (traversal.getSteps().size() == 2 && traversal.getEndStep() instanceof ConstantStep) {
final ConstantStep stepWithSparql = (ConstantStep) traversal.getEndStep();
final Object constant = stepWithSparql.getConstant();
if (constant instanceof String) {
[22/50] tinkerpop git commit: Added a filter for release versions for
revapi
Posted by sp...@apache.org.
Added a filter for release versions for revapi
revapi will now only execute it's rules on the actual releases and not release candidates or other builds. CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/53a0b56b
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/53a0b56b
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/53a0b56b
Branch: refs/heads/TINKERPOP-1878
Commit: 53a0b56b9c58b9ee42e28e6ecc1b1429df247f50
Parents: 762d370
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Mar 26 08:17:05 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Mar 26 08:17:05 2018 -0400
----------------------------------------------------------------------
pom.xml | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/53a0b56b/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index ef3113f..d4c8d28 100644
--- a/pom.xml
+++ b/pom.xml
@@ -380,6 +380,7 @@ limitations under the License.
</dependencies>
<configuration>
<skip>${revapi.skip}</skip>
+ <versionFormat>\d*\.\d*\.\d*.</versionFormat>
<analysisConfiguration><![CDATA[
{
"revapi": {
[43/50] tinkerpop git commit: updating the reference documentation
Posted by sp...@apache.org.
updating the reference documentation
added the following:
- fix the logo
- added prefixes
- added limitations
- added examples
todo:
- cover all limitations and special cases with examples
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/c5ce52c8
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/c5ce52c8
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/c5ce52c8
Branch: refs/heads/TINKERPOP-1878
Commit: c5ce52c8126c2d5137a80e064391eef0eb431698
Parents: da4e294
Author: Harsh Thakkar <ha...@gmail.com>
Authored: Wed Mar 28 17:27:32 2018 +0200
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Apr 3 09:16:55 2018 -0400
----------------------------------------------------------------------
docs/src/reference/transpilers.asciidoc | 355 ++++++++++++++++++++++++++-
1 file changed, 351 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c5ce52c8/docs/src/reference/transpilers.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/reference/transpilers.asciidoc b/docs/src/reference/transpilers.asciidoc
index 9100f84..386b4a5 100644
--- a/docs/src/reference/transpilers.asciidoc
+++ b/docs/src/reference/transpilers.asciidoc
@@ -17,10 +17,6 @@ limitations under the License.
[[transpilers]]
= Gremlin Transpilers
-![gremlinator][SPARQL-Gremlin]
-
-[SPARQL-Gremlin]: https://raw.githubusercontent.com/LITMUS-Benchmark-Suite/sparql-to-gremlin/master/docs/images/sparql-gremlin-logo.png
-
There are many languages built to query data. SQL is typically used to query relational data. There is SPARQL for RDF
data. Cypher is used to do pattern matching in graph data. The list could go on. Transpilers convert languages like
these to Gremlin so that it becomes possible to use them in any context that Gremlin is used. In other words, a
@@ -28,6 +24,24 @@ Gremlin Transpiler enables a particular query language to work on any TinkerPop-
== SPARQL-Gremlin
+image:https://raw.githubusercontent.com/LITMUS-Benchmark-Suite/sparql-to-gremlin/master/docs/images/sparql-gremlin-logo.png[gremlinator]
+
+The SPARQL-Gremlin transpiler, transforms link:https://en.wikipedia.org/wiki/SPARQL[SPARQL] queries into Gremlin traversals. It is based on the https://jena.apache.org/index.html[Apache Jena] SPARQL processor https://jena.apache.org/documentation/query/index.html[ARQ], which provides access to a syntax tree of a SPARQL query.
+
+
+The goal of this work is to bridge the query interoperability gap between the two famous, yet fairly disconnected, graph communities: Semantic Web (which relies on the RDF data model) and Graph database
+(which relies on Property graph data model).
+
+NOTE: The foundational research work on SPARQL-Gremlin transpiler (aka Gremlinator) can be found from -
+https://arxiv.org/pdf/1801.02911.pdf[Gremlinator full paper]. In this
+paper, we present and discuss the notion of graph query language
+semantics of SPARQL and Gremlin, and a formal mapping between SPARQL
+pattern matching graph patterns and Gremlin traversals. Furthermore, we
+point the interested reader to the following resourcesfor a better
+understanding: (1) Gremlinator demonstration -
+(http://gremlinator.iai.uni-bonn.de:8080/Demo/[Public Demo Mirror 1])
+and (http://195.201.31.31:8080/Demo/[Public Demo Mirror 2]); (2) A short video tutorial on how to use the demonstration - https://www.youtube.com/watch?v=Z0ETx2IBamw[here]
+
[source,xml]
----
<dependency>
@@ -68,3 +82,336 @@ start step.
<2> Execute a SPARQL query against the TinkerGraph instance. The `SparqlTraversalSource` uses a
<<traversalstrategy,TraversalStrategy>> to transparently converts that SPARQL query into a standard Gremlin traversal
and then when finally iterated, executes that against the TinkerGraph.
+
+[[prefixes]]
+Prefixes
+~~~~~~~~~
+
+The SPARQL-Gremlin transpiler supports the following prefixes to traverse the graph:
+
+[cols=",",options="header",]
+|====================================
+|Prefix |Purpose
+|`v:<label>` |label-access traversal
+|`e:<label>` |out-edge traversal
+|`p:<name>` |property traversal
+|`v:<name>` |property-value traversal
+|====================================
+
+Note that element IDs and labels are treated like normal properties, hence they can be accessed using the same pattern:
+
+[gremlin-groovy,existing]
+----
+g.sparql("""SELECT ?name ?id ?label
+ WHERE {
+ ?element v:name ?name .
+ ?element v:id ?id .
+ ?element v:label ?label .}""")
+----
+
+[[supported-queries]]
+Supported Queries
+~~~~~~~~~~~~~~~~~~
+
+The SPARQL-Gremlin transpiler is currently an on-going effort with an aim to cover the entire SPARQL 1.1 query feature spectrum, however we currently only support translation of the SPARQL 1.0 specification, especially _SELECT_ queries. The supported SPARQL query types are:
+
+* Union
+* Optional
+* Order-By
+* Group-By
+* STAR-shaped or _neighbourhood queries_
+* Query modifiers, such as:
+** Filter with _restrictions_
+** Count
+** LIMIT
+** OFFSET
+
+[[limitations]]
+Limitations
+~~~~~~~~~~~~
+
+The current implementation of SPARQL-Gremlin transpiler (i.e. SPARQL-Gremlin) does
+not support the following cases:
+
+* SPARQL queries with variables in the
+predicate position are not currently covered, with an exception of the
+following case:
+
+[gremlin-groovy,existing]
+----
+g.sparql("""SELECT * WHERE { ?x ?y ?z . }""")
+----
+
+* A SPARQL Union query with un-balanced patterns, i.e. a gremlin union
+traversal can only be generated if the unput SPARQL query has the same
+number of patterns on both the side of the union operator. For instance,
+the following SPARQL query cannot be mapped using Gremlinator, since a
+union is executed between different number of graph patterns (two
+patterns _union_ 1 pattern).
+
+[gremlin-groovy,existing]
+----
+g.sparql("""SELECT *
+ WHERE {
+ {?person e:created ?software .
+ ?person v:name "daniel" .}
+ UNION
+ {?software v:lang "java" .} }""")
+----
+
+* order by
+....
+Adding more here...
+....
+
+* group by
+....
+Adding more here...
+....
+
+[[examples]]
+Examples
+~~~~~~~~~
+
+The following section presents a comprehensive examples of SPARQL queries that are currently covered by the SPARQL-Gremlin transpiler.
+
+[[select-all]]
+Select All
+^^^^^^^^^^
+
+.Select all vertices in the graph.
+
+[gremlin-groovy,existing]
+----
+g.sparql("""SELECT * WHERE { }""")
+----
+
+[[match-constant-values]]
+Match Constant Values
+^^^^^^^^^^^^^^^^^^^^^
+
+.Select all vertices with the label `person`.
+
+[gremlin-groovy,existing]
+----
+g.sparql("""SELECT * WHERE { ?person v:label "person" .}""")
+----
+
+[[select-specific-elements]]
+Select Specific Elements
+^^^^^^^^^^^^^^^^^^^^^^^^
+
+.Select the values of the properties `name` and `age` for each `person` vertex.
+
+[gremlin-groovy,existing]
+----
+g.sparql("""SELECT ?name ?age
+WHERE {
+ ?person v:label "person" .
+ ?person v:name ?name .
+ ?person v:age ?age . }""")
+----
+
+[[pattern-matching]]
+Pattern Matching
+^^^^^^^^^^^^^^^^
+
+.Select only those persons who created a project.
+
+[gremlin-groovy,existing]
+----
+g.sparql("""SELECT ?name ?age
+WHERE {
+ ?person v:label "person" .
+ ?person v:name ?name .
+ ?person v:age ?age .
+ ?person e:created ?project . }""")
+----
+
+[[filtering]]
+Filtering
+^^^^^^^^^
+
+.Select only those persons who are older than 30.
+
+[gremlin-groovy,existing]
+----
+g.sparql("""SELECT ?name ?age
+WHERE {
+ ?person v:label "person" .
+ ?person v:name ?name .
+ ?person v:age ?age .
+ ?person e:created ?project .
+ FILTER (?age > 30) }""")
+----
+
+[[deduplication]]
+Deduplication
+^^^^^^^^^^^^^
+
+.Select the distinct names of the created projects.
+
+[gremlin-groovy,existing]
+----
+g.sparql("""SELECT DISTINCT ?name
+WHERE {
+ ?person v:label "person" .
+ ?person e:created ?project .
+ ?project v:name ?name .
+ FILTER (?age > 30)}""")
+----
+
+[[multiple-filters]]
+Multiple Filters
+^^^^^^^^^^^^^^^^
+
+.Select the distinct names of all Java projects.
+
+[gremlin-groovy,existing]
+----
+g.sparql("""SELECT DISTINCT ?name
+WHERE {
+ ?person v:label "person" .
+ ?person v:age ?age .
+ ?person e:created ?project .
+ ?project v:name ?name .
+ ?project v:lang ?lang .
+ FILTER (?age > 30 && ?lang == "java") }""")
+----
+
+[[pattern-filters]]
+Pattern Filter(s)
+^^^^^^^^^^^^^^^^^
+
+.A different way to filter all person who created a project.
+
+[gremlin-groovy,existing]
+----
+g.sparql("""SELECT ?name
+WHERE {
+ ?person v:label "person" .
+ ?person v:name ?name .
+ FILTER EXISTS { ?person e:created ?project } }""")
+----
+
+.Filter all person who did not create a project.
+
+[gremlin-groovy,existing]
+----
+g.sparql("""SELECT ?name
+WHERE {
+ ?person v:label "person" .
+ ?person v:name ?name .
+ FILTER NOT EXISTS { ?person e:created ?project } }""")
+----
+
+[[meta-property-access]]
+Meta-Property Access
+^^^^^^^^^^^^^^^^^^^^
+
+.Accessing the Meta-Property of a graph element. Meta-Property can be perceived as the reified statements in an RDF graph.
+
+[gremlin-groovy,existing]
+----
+g.sparql("""SELECT ?name ?startTime
+WHERE {
+ ?person v:name "daniel" .
+ ?person p:location ?location .
+ ?location v:value ?name .
+ ?location v:startTime ?startTime }""")
+----
+
+[[union]]
+Union
+^^^^^
+
+.Select all persons who have developed a software in java using union.
+
+[gremlin-groovy,existing]
+----
+g.sparql("""SELECT *
+WHERE {
+ {?person e:created ?software .}
+ UNION
+ {?software v:lang "java" .} }""")
+----
+
+[[optional]]
+Optional
+^^^^^^^^
+
+.Return the names of the persons who have created a software in java and optionally python.
+
+[gremlin-groovy,existing]
+----
+g.sparql("""SELECT ?person
+WHERE {
+ ?person v:label "person" .
+ ?person e:created ?software .
+ ?software v:lang "java" .
+ OPTIONAL {?software v:lang "python" . }}""")
+----
+
+[[order-by]]
+Order By
+^^^^^^^^
+
+.Select all vertices with the label `person` and order them by their age.
+
+[gremlin-groovy,existing]
+----
+g.sparql("""SELECT *
+WHERE {
+ ?person v:label "person" .
+ ?person v:age ?age .
+} ORDER BY (?age)""")
+----
+
+[[group-by]]
+Group By
+^^^^^^^^
+
+.Select all vertices with the label `person` and group them by their age.
+
+[gremlin-groovy,existing]
+----
+g.sparql("""SELECT *
+WHERE {
+ ?person v:label "person" .
+ ?person v:age ?age .
+} GROUP BY (?age)""")
+----
+
+[[mixedcomplexaggregation-based-queries]]
+Mixed/complex/aggregation-based queries
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+.Count the number of projects which have been created by persons under the age of 30 and group them by age. Return only the top two.
+
+[gremlin-groovy,existing]
+----
+g.sparql("""SELECT COUNT(?project)
+WHERE {
+ ?person v:label "person" .
+ ?person v:age ?age . FILTER (?age < 30)
+ ?person e:created ?project .
+} GROUP BY (?age) LIMIT 2""")
+----
+
+[[star-shaped-queries]]
+STAR-shaped queries
+^^^^^^^^^^^^^^^^^^^
+
+.STAR-shaped queries are the queries that form/follow a star-shaped execution plan. These in terms of graph traversals can be perceived as path queries or neighbourhood queries. For instance, getting all the information about a specific `person` or `software`.
+
+[gremlin-groovy,existing]
+----
+g.sparql("""SELECT ?age ?software ?name ?location ?startTime
+WHERE {
+ ?person v:name "daniel" .
+ ?person v:age ?age .
+ ?person e:created ?software .
+ ?person p:location ?location .
+ ?location v:value ?name .
+ ?location v:startTime ?startTime }""")
+----
[42/50] tinkerpop git commit: testing logo
Posted by sp...@apache.org.
testing logo
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/da4e2945
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/da4e2945
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/da4e2945
Branch: refs/heads/TINKERPOP-1878
Commit: da4e2945512aeceda569227496785f91b7ec9cbb
Parents: ab5d99e
Author: Harsh Thakkar <ha...@gmail.com>
Authored: Wed Mar 28 10:29:43 2018 +0200
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Apr 3 09:16:55 2018 -0400
----------------------------------------------------------------------
docs/src/reference/transpilers.asciidoc | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/da4e2945/docs/src/reference/transpilers.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/reference/transpilers.asciidoc b/docs/src/reference/transpilers.asciidoc
index 305e3dc..9100f84 100644
--- a/docs/src/reference/transpilers.asciidoc
+++ b/docs/src/reference/transpilers.asciidoc
@@ -17,6 +17,10 @@ limitations under the License.
[[transpilers]]
= Gremlin Transpilers
+![gremlinator][SPARQL-Gremlin]
+
+[SPARQL-Gremlin]: https://raw.githubusercontent.com/LITMUS-Benchmark-Suite/sparql-to-gremlin/master/docs/images/sparql-gremlin-logo.png
+
There are many languages built to query data. SQL is typically used to query relational data. There is SPARQL for RDF
data. Cypher is used to do pattern matching in graph data. The list could go on. Transpilers convert languages like
these to Gremlin so that it becomes possible to use them in any context that Gremlin is used. In other words, a
[47/50] tinkerpop git commit: TINKERPOP-1878 More tests for ordering
Posted by sp...@apache.org.
TINKERPOP-1878 More tests for ordering
Factored the order index creation into its own method to tidy up a bit.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/cc8b1200
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/cc8b1200
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/cc8b1200
Branch: refs/heads/TINKERPOP-1878
Commit: cc8b1200a906424c91bc6da24aaeda0d66e8f152
Parents: 04eb138
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Fri Jan 26 15:56:55 2018 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Apr 3 09:16:55 2018 -0400
----------------------------------------------------------------------
.../sparql/SparqlToGremlinTranspiler.java | 29 ++++++++++++++------
.../dsl/sparql/SparqlTraversalSourceTest.java | 6 ++++
2 files changed, 26 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/cc8b1200/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/SparqlToGremlinTranspiler.java
----------------------------------------------------------------------
diff --git a/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/SparqlToGremlinTranspiler.java b/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/SparqlToGremlinTranspiler.java
index ea3f828..c3bc907 100644
--- a/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/SparqlToGremlinTranspiler.java
+++ b/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/SparqlToGremlinTranspiler.java
@@ -99,15 +99,8 @@ public class SparqlToGremlinTranspiler {
arrayOfAllTraversals[traversalIndex++] = tempTrav;
}
- final Map<String, Order> orderingIndex = new HashMap<>();
- if (query.hasOrderBy()) {
- final List<SortCondition> sortingConditions = query.getOrderBy();
-
- for (SortCondition sortCondition : sortingConditions) {
- final Expr expr = sortCondition.getExpression();
- orderingIndex.put(expr.getVarName(), sortCondition.getDirection() == 1 ? Order.incr : Order.decr);
- }
- }
+ // creates a map of ordering keys and their ordering direction
+ final Map<String, Order> orderingIndex = createOrderIndexFromQuery(query);
if (traversalList.size() > 0)
traversal = traversal.match(arrayOfAllTraversals);
@@ -203,6 +196,24 @@ public class SparqlToGremlinTranspiler {
return traversal;
}
+ /**
+ * Extracts any {@code SortCondition} instances from the SPARQL query and holds them in an index of their keys
+ * where the value is that keys sorting direction.
+ */
+ private static Map<String, Order> createOrderIndexFromQuery(final Query query) {
+ final Map<String, Order> orderingIndex = new HashMap<>();
+ if (query.hasOrderBy()) {
+ final List<SortCondition> sortingConditions = query.getOrderBy();
+
+ for (SortCondition sortCondition : sortingConditions) {
+ final Expr expr = sortCondition.getExpression();
+ orderingIndex.put(expr.getVarName(), sortCondition.getDirection() == 1 ? Order.incr : Order.decr);
+ }
+ }
+
+ return orderingIndex;
+ }
+
private static GraphTraversal<Vertex, ?> transpile(final GraphTraversalSource g, final Query query) {
return new SparqlToGremlinTranspiler(g).transpile(query);
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/cc8b1200/sparql-gremlin/src/test/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversalSourceTest.java
----------------------------------------------------------------------
diff --git a/sparql-gremlin/src/test/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversalSourceTest.java b/sparql-gremlin/src/test/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversalSourceTest.java
index 2743255..1b39813 100644
--- a/sparql-gremlin/src/test/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversalSourceTest.java
+++ b/sparql-gremlin/src/test/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversalSourceTest.java
@@ -82,4 +82,10 @@ public class SparqlTraversalSourceTest {
}}
));
}
+
+ @Test
+ public void shouldFindAllNamesOrdered() {
+ final List<?> x = g.sparql("SELECT ?name WHERE { ?person v:name ?name } ORDER BY DESC(?name)").toList();
+ assertThat(x, contains("vadas", "ripple", "peter", "marko", "lop", "josh"));
+ }
}
[26/50] tinkerpop git commit: Minor fix to GraphSON type serializer
Posted by sp...@apache.org.
Minor fix to GraphSON type serializer
No need to check for the string JsonToken - the remaining shapes can be passed straight through. CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/bd0324c0
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/bd0324c0
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/bd0324c0
Branch: refs/heads/TINKERPOP-1878
Commit: bd0324c0e9e7ec8e1d68a313aa07e4129e197249
Parents: 9a75f92
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Mar 27 13:56:34 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Mar 27 13:56:34 2018 -0400
----------------------------------------------------------------------
.../io/graphson/GraphSONTypeSerializerV3d0.java | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/bd0324c0/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeSerializerV3d0.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeSerializerV3d0.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeSerializerV3d0.java
index 4f4bbbb..3bdbc71 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeSerializerV3d0.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeSerializerV3d0.java
@@ -64,11 +64,7 @@ public class GraphSONTypeSerializerV3d0 extends AbstractGraphSONTypeSerializer {
@Override
public WritableTypeId writeTypePrefix(final JsonGenerator jsonGenerator, final WritableTypeId writableTypeId) throws IOException {
- if (writableTypeId.valueShape == JsonToken.VALUE_STRING) {
- if (canWriteTypeId()) {
- writeTypePrefix(jsonGenerator, getTypeIdResolver().idFromValueAndType(writableTypeId.forValue, getClassFromObject(writableTypeId.forValue)));
- }
- } else if (writableTypeId.valueShape == JsonToken.START_OBJECT) {
+ if (writableTypeId.valueShape == JsonToken.START_OBJECT) {
if (writableTypeId.forValue instanceof Map) {
writeTypePrefix(jsonGenerator, getTypeIdResolver().idFromValueAndType(writableTypeId.forValue, getClassFromObject(writableTypeId.forValue)));
jsonGenerator.writeStartArray();
@@ -82,6 +78,8 @@ public class GraphSONTypeSerializerV3d0 extends AbstractGraphSONTypeSerializer {
} else {
jsonGenerator.writeStartArray();
}
+ } else if (canWriteTypeId()) {
+ writeTypePrefix(jsonGenerator, getTypeIdResolver().idFromValueAndType(writableTypeId.forValue, getClassFromObject(writableTypeId.forValue)));
} else {
throw new IllegalStateException("Could not write prefix: shape[" + writableTypeId.valueShape + "] value[" + writableTypeId.forValue + "]");
}
@@ -91,11 +89,7 @@ public class GraphSONTypeSerializerV3d0 extends AbstractGraphSONTypeSerializer {
@Override
public WritableTypeId writeTypeSuffix(final JsonGenerator jsonGenerator, final WritableTypeId writableTypeId) throws IOException {
- if (writableTypeId.valueShape == JsonToken.VALUE_STRING) {
- if (canWriteTypeId()) {
- writeTypeSuffix(jsonGenerator);
- }
- } else if (writableTypeId.valueShape == JsonToken.START_OBJECT) {
+ if (writableTypeId.valueShape == JsonToken.START_OBJECT) {
if (writableTypeId.forValue instanceof Map) {
jsonGenerator.writeEndArray();
writeTypeSuffix(jsonGenerator);
@@ -109,6 +103,8 @@ public class GraphSONTypeSerializerV3d0 extends AbstractGraphSONTypeSerializer {
} else {
jsonGenerator.writeEndArray();
}
+ } else if (canWriteTypeId()) {
+ writeTypeSuffix(jsonGenerator);
} else {
throw new IllegalStateException("Could not write suffix: shape[" + writableTypeId.valueShape + "] value[" + writableTypeId.forValue + "]");
}
[50/50] tinkerpop git commit: TINKERPOP-1878 Fixed up formatting of
traspiler section
Posted by sp...@apache.org.
TINKERPOP-1878 Fixed up formatting of traspiler section
There were some examples that didn't return results or generated errors. These will need some review.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/71d38453
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/71d38453
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/71d38453
Branch: refs/heads/TINKERPOP-1878
Commit: 71d384534652a30a09949325b664d9d6c091e544
Parents: c5ce52c
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Apr 3 10:52:17 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Apr 3 10:52:17 2018 -0400
----------------------------------------------------------------------
docs/src/reference/transpilers.asciidoc | 156 ++++++++++++---------------
1 file changed, 71 insertions(+), 85 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/71d38453/docs/src/reference/transpilers.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/reference/transpilers.asciidoc b/docs/src/reference/transpilers.asciidoc
index 386b4a5..b05be68 100644
--- a/docs/src/reference/transpilers.asciidoc
+++ b/docs/src/reference/transpilers.asciidoc
@@ -84,8 +84,7 @@ start step.
and then when finally iterated, executes that against the TinkerGraph.
[[prefixes]]
-Prefixes
-~~~~~~~~~
+=== Prefixes
The SPARQL-Gremlin transpiler supports the following prefixes to traverse the graph:
@@ -110,10 +109,11 @@ g.sparql("""SELECT ?name ?id ?label
----
[[supported-queries]]
-Supported Queries
-~~~~~~~~~~~~~~~~~~
+=== Supported Queries
-The SPARQL-Gremlin transpiler is currently an on-going effort with an aim to cover the entire SPARQL 1.1 query feature spectrum, however we currently only support translation of the SPARQL 1.0 specification, especially _SELECT_ queries. The supported SPARQL query types are:
+The SPARQL-Gremlin transpiler is currently an on-going effort with an aim to cover the entire SPARQL 1.1 query feature
+spectrum, however we currently only support translation of the SPARQL 1.0 specification, especially _SELECT_ queries.
+The supported SPARQL query types are:
* Union
* Optional
@@ -127,29 +127,25 @@ The SPARQL-Gremlin transpiler is currently an on-going effort with an aim to cov
** OFFSET
[[limitations]]
-Limitations
-~~~~~~~~~~~~
+=== Limitations
The current implementation of SPARQL-Gremlin transpiler (i.e. SPARQL-Gremlin) does
not support the following cases:
-* SPARQL queries with variables in the
-predicate position are not currently covered, with an exception of the
-following case:
+* SPARQL queries with variables in the predicate position are not currently covered, with an exception of the following
+case:
-[gremlin-groovy,existing]
+[source,groovy]
----
g.sparql("""SELECT * WHERE { ?x ?y ?z . }""")
----
-* A SPARQL Union query with un-balanced patterns, i.e. a gremlin union
-traversal can only be generated if the unput SPARQL query has the same
-number of patterns on both the side of the union operator. For instance,
-the following SPARQL query cannot be mapped using Gremlinator, since a
-union is executed between different number of graph patterns (two
-patterns _union_ 1 pattern).
+* A SPARQL Union query with un-balanced patterns, i.e. a gremlin union traversal can only be generated if the input
+SPARQL query has the same number of patterns on both the side of the union operator. For instance, the following
+SPARQL query cannot be mapped using Gremlinator, since a union is executed between different number of graph patterns
+(two patterns _union_ 1 pattern).
-[gremlin-groovy,existing]
+[source,groovy]
----
g.sparql("""SELECT *
WHERE {
@@ -170,16 +166,15 @@ Adding more here...
....
[[examples]]
-Examples
-~~~~~~~~~
+=== Examples
-The following section presents a comprehensive examples of SPARQL queries that are currently covered by the SPARQL-Gremlin transpiler.
+The following section presents a comprehensive examples of SPARQL queries that are currently covered by the
+SPARQL-Gremlin transpiler.
[[select-all]]
-Select All
-^^^^^^^^^^
+==== Select All
-.Select all vertices in the graph.
+Select all vertices in the graph.
[gremlin-groovy,existing]
----
@@ -187,10 +182,9 @@ g.sparql("""SELECT * WHERE { }""")
----
[[match-constant-values]]
-Match Constant Values
-^^^^^^^^^^^^^^^^^^^^^
+==== Match Constant Values
-.Select all vertices with the label `person`.
+Select all vertices with the label `person`.
[gremlin-groovy,existing]
----
@@ -198,10 +192,9 @@ g.sparql("""SELECT * WHERE { ?person v:label "person" .}""")
----
[[select-specific-elements]]
-Select Specific Elements
-^^^^^^^^^^^^^^^^^^^^^^^^
+==== Select Specific Elements
-.Select the values of the properties `name` and `age` for each `person` vertex.
+Select the values of the properties `name` and `age` for each `person` vertex.
[gremlin-groovy,existing]
----
@@ -213,10 +206,9 @@ WHERE {
----
[[pattern-matching]]
-Pattern Matching
-^^^^^^^^^^^^^^^^
+==== Pattern Matching
-.Select only those persons who created a project.
+Select only those persons who created a project.
[gremlin-groovy,existing]
----
@@ -229,10 +221,9 @@ WHERE {
----
[[filtering]]
-Filtering
-^^^^^^^^^
+==== Filtering
-.Select only those persons who are older than 30.
+Select only those persons who are older than 30.
[gremlin-groovy,existing]
----
@@ -241,31 +232,29 @@ WHERE {
?person v:label "person" .
?person v:name ?name .
?person v:age ?age .
- ?person e:created ?project .
FILTER (?age > 30) }""")
----
[[deduplication]]
-Deduplication
-^^^^^^^^^^^^^
+==== Deduplication
-.Select the distinct names of the created projects.
+Select the distinct names of the created projects.
[gremlin-groovy,existing]
----
g.sparql("""SELECT DISTINCT ?name
WHERE {
?person v:label "person" .
+ ?person v:age ?age .
?person e:created ?project .
?project v:name ?name .
FILTER (?age > 30)}""")
----
[[multiple-filters]]
-Multiple Filters
-^^^^^^^^^^^^^^^^
+==== Multiple Filters
-.Select the distinct names of all Java projects.
+Select the distinct names of all Java projects.
[gremlin-groovy,existing]
----
@@ -276,14 +265,13 @@ WHERE {
?person e:created ?project .
?project v:name ?name .
?project v:lang ?lang .
- FILTER (?age > 30 && ?lang == "java") }""")
+ FILTER (?age > 30 && ?lang = "java") }""")
----
[[pattern-filters]]
-Pattern Filter(s)
-^^^^^^^^^^^^^^^^^
+==== Pattern Filter(s)
-.A different way to filter all person who created a project.
+A different way to filter all person who created a project.
[gremlin-groovy,existing]
----
@@ -294,7 +282,7 @@ WHERE {
FILTER EXISTS { ?person e:created ?project } }""")
----
-.Filter all person who did not create a project.
+Filter all person who did not create a project.
[gremlin-groovy,existing]
----
@@ -305,27 +293,10 @@ WHERE {
FILTER NOT EXISTS { ?person e:created ?project } }""")
----
-[[meta-property-access]]
-Meta-Property Access
-^^^^^^^^^^^^^^^^^^^^
-
-.Accessing the Meta-Property of a graph element. Meta-Property can be perceived as the reified statements in an RDF graph.
-
-[gremlin-groovy,existing]
-----
-g.sparql("""SELECT ?name ?startTime
-WHERE {
- ?person v:name "daniel" .
- ?person p:location ?location .
- ?location v:value ?name .
- ?location v:startTime ?startTime }""")
-----
-
[[union]]
-Union
-^^^^^
+==== Union
-.Select all persons who have developed a software in java using union.
+Select all persons who have developed a software in java using union.
[gremlin-groovy,existing]
----
@@ -337,12 +308,11 @@ WHERE {
----
[[optional]]
-Optional
-^^^^^^^^
+==== Optional
-.Return the names of the persons who have created a software in java and optionally python.
+Return the names of the persons who have created a software in java and optionally python.
-[gremlin-groovy,existing]
+[source,groovy]
----
g.sparql("""SELECT ?person
WHERE {
@@ -353,10 +323,9 @@ WHERE {
----
[[order-by]]
-Order By
-^^^^^^^^
+==== Order By
-.Select all vertices with the label `person` and order them by their age.
+Select all vertices with the label `person` and order them by their age.
[gremlin-groovy,existing]
----
@@ -368,12 +337,11 @@ WHERE {
----
[[group-by]]
-Group By
-^^^^^^^^
+==== Group By
-.Select all vertices with the label `person` and group them by their age.
+Select all vertices with the label `person` and group them by their age.
-[gremlin-groovy,existing]
+[source,groovy]
----
g.sparql("""SELECT *
WHERE {
@@ -383,12 +351,12 @@ WHERE {
----
[[mixedcomplexaggregation-based-queries]]
-Mixed/complex/aggregation-based queries
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+==== Mixed/complex/aggregation-based queries
-.Count the number of projects which have been created by persons under the age of 30 and group them by age. Return only the top two.
+Count the number of projects which have been created by persons under the age of 30 and group them by age. Return only
+the top two.
-[gremlin-groovy,existing]
+[source,groovy]
----
g.sparql("""SELECT COUNT(?project)
WHERE {
@@ -398,11 +366,29 @@ WHERE {
} GROUP BY (?age) LIMIT 2""")
----
+[[meta-property-access]]
+==== Meta-Property Access
+
+Accessing the Meta-Property of a graph element. Meta-Property can be perceived as the reified statements in an RDF
+graph.
+
+[gremlin-groovy,theCrew]
+----
+g = graph.traversal(SparqlTraversalSource)
+g.sparql("""SELECT ?name ?startTime
+WHERE {
+ ?person v:name "daniel" .
+ ?person p:location ?location .
+ ?location v:value ?name .
+ ?location v:startTime ?startTime }""")
+----
+
[[star-shaped-queries]]
-STAR-shaped queries
-^^^^^^^^^^^^^^^^^^^
+==== STAR-shaped queries
-.STAR-shaped queries are the queries that form/follow a star-shaped execution plan. These in terms of graph traversals can be perceived as path queries or neighbourhood queries. For instance, getting all the information about a specific `person` or `software`.
+STAR-shaped queries are the queries that form/follow a star-shaped execution plan. These in terms of graph traversals
+can be perceived as path queries or neighborhood queries. For instance, getting all the information about a specific
+`person` or `software`.
[gremlin-groovy,existing]
----
[44/50] tinkerpop git commit: TINKERPOP-1878 Added a test for
ordering and corrected some problems in logic
Posted by sp...@apache.org.
TINKERPOP-1878 Added a test for ordering and corrected some problems in logic
Ordering didn't work - at least not completely. The test, as it is written in this commit, that failed to sort properly. Changed the logic for ordering to track all of the keys specified to ORDER with their appropriate ASC/DESC operators and added all of them to the traversal.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/04eb138c
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/04eb138c
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/04eb138c
Branch: refs/heads/TINKERPOP-1878
Commit: 04eb138c4295434499bc0471cb1df7830bf5e432
Parents: 0d1e09c
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Fri Jan 26 15:41:10 2018 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Apr 3 09:16:55 2018 -0400
----------------------------------------------------------------------
.../sparql/SparqlToGremlinTranspiler.java | 55 ++++++--------------
.../dsl/sparql/SparqlTraversalSourceTest.java | 31 +++++++++--
2 files changed, 44 insertions(+), 42 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/04eb138c/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/SparqlToGremlinTranspiler.java
----------------------------------------------------------------------
diff --git a/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/SparqlToGremlinTranspiler.java b/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/SparqlToGremlinTranspiler.java
index 9db7d82..ea3f828 100644
--- a/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/SparqlToGremlinTranspiler.java
+++ b/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/SparqlToGremlinTranspiler.java
@@ -21,9 +21,10 @@ package org.apache.tinkerpop.gremlin.sparql;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
-import org.apache.jena.graph.Triple;
import org.apache.jena.query.Query;
import org.apache.jena.query.QueryFactory;
import org.apache.jena.query.SortCondition;
@@ -58,8 +59,6 @@ public class SparqlToGremlinTranspiler {
private List<Traversal> traversalList = new ArrayList<>();
- private String sortingVariable = "";
-
private SparqlToGremlinTranspiler(final GraphTraversal<Vertex, ?> traversal) {
this.traversal = traversal;
}
@@ -96,31 +95,18 @@ public class SparqlToGremlinTranspiler {
final int numberOfTraversal = traversalList.size();
final Traversal arrayOfAllTraversals[] = new Traversal[numberOfTraversal];
- if (query.hasOrderBy() && !query.hasGroupBy()) {
- final List<SortCondition> sortingConditions = query.getOrderBy();
-
- for (SortCondition sortCondition : sortingConditions) {
- final Expr expr = sortCondition.getExpression();
- sortingVariable = expr.getVarName();
- }
- }
-
for (Traversal tempTrav : traversalList) {
arrayOfAllTraversals[traversalIndex++] = tempTrav;
}
- Order orderDirection = Order.incr;
+ final Map<String, Order> orderingIndex = new HashMap<>();
if (query.hasOrderBy()) {
- int directionOfSort = 0;
final List<SortCondition> sortingConditions = query.getOrderBy();
for (SortCondition sortCondition : sortingConditions) {
final Expr expr = sortCondition.getExpression();
- directionOfSort = sortCondition.getDirection();
- sortingVariable = expr.getVarName();
+ orderingIndex.put(expr.getVarName(), sortCondition.getDirection() == 1 ? Order.incr : Order.decr);
}
-
- if (directionOfSort == -1) orderDirection = Order.decr;
}
if (traversalList.size() > 0)
@@ -128,6 +114,8 @@ public class SparqlToGremlinTranspiler {
final List<String> vars = query.getResultVars();
if (!query.isQueryResultStar() && !query.hasGroupBy()) {
+ // the result sizes have special handling to get the right signatures of select() called. perhaps this
+ // could be refactored to work more nicely
switch (vars.size()) {
case 0:
throw new IllegalStateException();
@@ -135,20 +123,16 @@ public class SparqlToGremlinTranspiler {
if (query.isDistinct())
traversal = traversal.dedup(vars.get(0));
- if (query.hasOrderBy())
- traversal = traversal.order().by(sortingVariable, orderDirection);
- else
- traversal = traversal.select(vars.get(0));
+ orderingIndex.forEach((k,v) -> traversal = traversal.order().by(__.select(k), v));
+ traversal = traversal.select(vars.get(0));
break;
case 2:
if (query.isDistinct())
traversal = traversal.dedup(vars.get(0), vars.get(1));
- if (query.hasOrderBy())
- traversal = traversal.order().by(__.select(vars.get(0)), orderDirection).by(__.select(vars.get(1)));
- else
- traversal = traversal.select(vars.get(0), vars.get(1));
+ orderingIndex.forEach((k,v) -> traversal = traversal.order().by(__.select(k), v));
+ traversal = traversal.select(vars.get(0), vars.get(1));
break;
default:
@@ -157,11 +141,11 @@ public class SparqlToGremlinTranspiler {
if (query.isDistinct())
traversal = traversal.dedup(all);
+ orderingIndex.forEach((k,v) -> traversal = traversal.order().by(__.select(k), v));
+
+ // just some shenanigans to get the right signature of select() called
final String[] others = Arrays.copyOfRange(all, 2, vars.size());
- if (query.hasOrderBy())
- traversal = traversal.order().by(__.select(vars.get(0)), orderDirection).by(__.select(vars.get(1)));
- else
- traversal = traversal.select(vars.get(0), vars.get(1), others);
+ traversal = traversal.select(vars.get(0), vars.get(1), others);
break;
}
@@ -202,7 +186,7 @@ public class SparqlToGremlinTranspiler {
}
if (query.hasOrderBy() && query.hasGroupBy())
- traversal = traversal.order().by(sortingVariable, orderDirection);
+ orderingIndex.forEach((k,v) -> traversal = traversal.order().by(__.select(k), v));
if (query.hasLimit()) {
long limit = query.getLimit(), offset = 0;
@@ -233,14 +217,7 @@ public class SparqlToGremlinTranspiler {
*/
@Override
public void visit(final OpBGP opBGP) {
- final List<Triple> triples = opBGP.getPattern().getList();
- final Traversal[] matchTraversals = new Traversal[triples.size()];
- int i = 0;
- for (final Triple triple : triples) {
-
- matchTraversals[i++] = TraversalBuilder.transform(triple);
- traversalList.add(matchTraversals[i - 1]);
- }
+ opBGP.getPattern().getList().forEach(triple -> traversalList.add(TraversalBuilder.transform(triple)));
}
/**
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/04eb138c/sparql-gremlin/src/test/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversalSourceTest.java
----------------------------------------------------------------------
diff --git a/sparql-gremlin/src/test/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversalSourceTest.java b/sparql-gremlin/src/test/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversalSourceTest.java
index 9bb6025..2743255 100644
--- a/sparql-gremlin/src/test/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversalSourceTest.java
+++ b/sparql-gremlin/src/test/java/org/apache/tinkerpop/gremlin/sparql/process/traversal/dsl/sparql/SparqlTraversalSourceTest.java
@@ -27,16 +27,18 @@ import java.util.List;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.collection.IsIterableContainingInAnyOrder.containsInAnyOrder;
+import static org.hamcrest.collection.IsIterableContainingInOrder.contains;
/**
* @author Stephen Mallette (http://stephen.genoprime.com)
*/
public class SparqlTraversalSourceTest {
+ private static final Graph graph = TinkerFactory.createModern();
+ private static final SparqlTraversalSource g = graph.traversal(SparqlTraversalSource.class);
+
@Test
- public void shouldDoStuff() {
- final Graph graph = TinkerFactory.createModern();
- final SparqlTraversalSource g = graph.traversal(SparqlTraversalSource.class);
+ public void shouldFindAllPersonsNamesAndAges() {
final List<?> x = g.sparql("SELECT ?name ?age WHERE { ?person v:name ?name . ?person v:age ?age }").toList();
assertThat(x, containsInAnyOrder(
new HashMap<String,Object>(){{
@@ -57,4 +59,27 @@ public class SparqlTraversalSourceTest {
}}
));
}
+
+ @Test
+ public void shouldFindAllPersonsNamesAndAgesOrdered() {
+ final List<?> x = g.sparql("SELECT ?name ?age WHERE { ?person v:name ?name . ?person v:age ?age } ORDER BY ASC(?age)").toList();
+ assertThat(x, contains(
+ new HashMap<String,Object>(){{
+ put("name", "vadas");
+ put("age", 27);
+ }},
+ new HashMap<String,Object>(){{
+ put("name", "marko");
+ put("age", 29);
+ }},
+ new HashMap<String,Object>(){{
+ put("name", "josh");
+ put("age", 32);
+ }},
+ new HashMap<String,Object>(){{
+ put("name", "peter");
+ put("age", 35);
+ }}
+ ));
+ }
}
[49/50] tinkerpop git commit: TINKERPOP-1878 Added the plugin for
sparql-gremlin
Posted by sp...@apache.org.
TINKERPOP-1878 Added the plugin for sparql-gremlin
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/8a33cf23
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/8a33cf23
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/8a33cf23
Branch: refs/heads/TINKERPOP-1878
Commit: 8a33cf23f191c87788eade864f321439dbd6f406
Parents: 90789ca
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Jan 29 09:37:15 2018 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Apr 3 09:16:55 2018 -0400
----------------------------------------------------------------------
.../sparql/jsr223/SparqlGremlinPlugin.java | 63 ++++++++++++++++++++
...pache.tinkerpop.gremlin.jsr223.GremlinPlugin | 1 +
2 files changed, 64 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8a33cf23/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/jsr223/SparqlGremlinPlugin.java
----------------------------------------------------------------------
diff --git a/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/jsr223/SparqlGremlinPlugin.java b/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/jsr223/SparqlGremlinPlugin.java
new file mode 100644
index 0000000..8d0115b
--- /dev/null
+++ b/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/jsr223/SparqlGremlinPlugin.java
@@ -0,0 +1,63 @@
+/*
+ * 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.sparql.jsr223;
+
+import org.apache.tinkerpop.gremlin.jsr223.AbstractGremlinPlugin;
+import org.apache.tinkerpop.gremlin.jsr223.DefaultImportCustomizer;
+import org.apache.tinkerpop.gremlin.jsr223.GremlinPlugin;
+import org.apache.tinkerpop.gremlin.jsr223.ImportCustomizer;
+import org.apache.tinkerpop.gremlin.sparql.process.traversal.dsl.sparql.DefaultSparqlTraversal;
+import org.apache.tinkerpop.gremlin.sparql.process.traversal.dsl.sparql.SparqlTraversal;
+import org.apache.tinkerpop.gremlin.sparql.process.traversal.dsl.sparql.SparqlTraversalSource;
+import org.apache.tinkerpop.gremlin.sparql.process.traversal.strategy.SparqlStrategy;
+
+/**
+ * {@link GremlinPlugin} implementation for {@code sparql-gremlin} that imports the key classes and interfaces required
+ * to use SPARQL in TinkerPop.
+ *
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+public final class SparqlGremlinPlugin extends AbstractGremlinPlugin {
+
+ private static final String NAME = "tinkerpop.sparql";
+
+ private static final ImportCustomizer imports;
+
+ static {
+ try {
+ imports = DefaultImportCustomizer.build().addClassImports(
+ SparqlTraversalSource.class,
+ SparqlTraversal.class,
+ DefaultSparqlTraversal.class,
+ SparqlStrategy.class).create();
+ } catch (Exception ex) {
+ throw new RuntimeException(ex);
+ }
+ }
+
+ private static final SparqlGremlinPlugin instance = new SparqlGremlinPlugin();
+
+ public SparqlGremlinPlugin() {
+ super(NAME, imports);
+ }
+
+ public static SparqlGremlinPlugin instance() {
+ return instance;
+ }
+}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8a33cf23/sparql-gremlin/src/main/resources/META-INF/services/org.apache.tinkerpop.gremlin.jsr223.GremlinPlugin
----------------------------------------------------------------------
diff --git a/sparql-gremlin/src/main/resources/META-INF/services/org.apache.tinkerpop.gremlin.jsr223.GremlinPlugin b/sparql-gremlin/src/main/resources/META-INF/services/org.apache.tinkerpop.gremlin.jsr223.GremlinPlugin
new file mode 100644
index 0000000..882054c
--- /dev/null
+++ b/sparql-gremlin/src/main/resources/META-INF/services/org.apache.tinkerpop.gremlin.jsr223.GremlinPlugin
@@ -0,0 +1 @@
+org.apache.tinkerpop.gremlin.sparql.jsr223.SparqlGremlinPlugin
\ No newline at end of file
[03/50] tinkerpop git commit: Minor fix to docs around
meta-properties CTR
Posted by sp...@apache.org.
Minor fix to docs around meta-properties CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/827b76ec
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/827b76ec
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/827b76ec
Branch: refs/heads/TINKERPOP-1878
Commit: 827b76ecfd1786c4ef9edd340d677cef7418f57d
Parents: 6323f49
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Mar 21 09:13:43 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Mar 21 09:13:43 2018 -0400
----------------------------------------------------------------------
docs/src/reference/the-graph.asciidoc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/827b76ec/docs/src/reference/the-graph.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/reference/the-graph.asciidoc b/docs/src/reference/the-graph.asciidoc
index 339b392..1855249 100644
--- a/docs/src/reference/the-graph.asciidoc
+++ b/docs/src/reference/the-graph.asciidoc
@@ -108,7 +108,7 @@ g.V(v).values('name') <8>
<2> If a property is added with a cardinality of `Cardinality.list`, an additional property with the provided key will be added.
<3> A vertex property can have standard key/value properties attached to it.
<4> Vertex property removal is identical to property removal.
-<5> It is property to get the properties of a vertex property.
+<5> Gets the meta-properties of each vertex property.
<6> A vertex property can have any number of key/value properties attached to it.
<7> `property(...)` will remove all existing key'd properties before adding the new single property (see `VertexProperty.Cardinality`).
<8> If only the value of a property is needed, then `values()` can be used.
[20/50] tinkerpop git commit: Merge branch 'tp32' into tp33
Posted by sp...@apache.org.
Merge branch 'tp32' into tp33
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/13a20e56
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/13a20e56
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/13a20e56
Branch: refs/heads/TINKERPOP-1878
Commit: 13a20e569f85dcb3e5a8f7b32b4491b47bae25d6
Parents: ffabea8 fdac653
Author: Jorge Bay Gondra <jo...@gmail.com>
Authored: Fri Mar 23 12:21:34 2018 +0100
Committer: Jorge Bay Gondra <jo...@gmail.com>
Committed: Fri Mar 23 12:21:34 2018 +0100
----------------------------------------------------------------------
.travis.yml | 8 +++++---
docker/Dockerfile | 7 ++++---
docs/src/dev/developer/development-environment.asciidoc | 2 +-
gremlin-dotnet/glv/Gremlin.Net.csproj.template | 1 -
gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj | 1 -
.../Gremlin.Net.IntegrationTest.csproj | 3 +--
.../test/Gremlin.Net.UnitTest/Gremlin.Net.UnitTest.csproj | 3 +--
7 files changed, 12 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/13a20e56/docs/src/dev/developer/development-environment.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/13a20e56/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
----------------------------------------------------------------------
[29/50] tinkerpop git commit: Initial commit for sparql-gremlin
changes
Posted by sp...@apache.org.
Initial commit for sparql-gremlin changes
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/8623ecb0
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/8623ecb0
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/8623ecb0
Branch: refs/heads/TINKERPOP-1878
Commit: 8623ecb0acdc6217c368617df7909bc50d27c659
Parents: d40d60a
Author: harsh9t <ha...@gmail.com>
Authored: Thu Jan 18 01:33:29 2018 +0100
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Apr 3 09:16:15 2018 -0400
----------------------------------------------------------------------
sparql-gremlin/pom.xml | 63 +++
.../gremlin/sparql/ConsoleCompiler.java | 165 ++++++++
.../tinkerpop/gremlin/sparql/Prefixes.java | 64 ++++
.../gremlin/sparql/SparqlToGremlinCompiler.java | 381 +++++++++++++++++++
.../gremlin/sparql/TraversalBuilder.java | 82 ++++
.../gremlin/sparql/WhereTraversalBuilder.java | 134 +++++++
.../tinkerpop/gremlin/sparql/PrefixesTest.java | 67 ++++
.../gremlin/sparql/ResourceHelper.java | 37 ++
.../sparql/SparqlToGremlinCompilerTest.java | 223 +++++++++++
9 files changed, 1216 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8623ecb0/sparql-gremlin/pom.xml
----------------------------------------------------------------------
diff --git a/sparql-gremlin/pom.xml b/sparql-gremlin/pom.xml
new file mode 100644
index 0000000..e134d31
--- /dev/null
+++ b/sparql-gremlin/pom.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <parent>
+ <artifactId>tinkerpop</artifactId>
+ <groupId>org.apache.tinkerpop</groupId>
+ <version>3.3.2-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>sparql-gremlin</artifactId>
+ <organization>
+ <name>WDAQUA-ITN</name>
+ <url>http://wdaqua.eu</url>
+ </organization>
+ <developers>
+ <developer>
+ <name>Harsh Thakkar</name>
+ <email>harsh9t@gmail.com</email>
+ <organization>University of Bonn</organization>
+ <organizationUrl>http://harshthakkar.in</organizationUrl>
+ </developer>
+ <developer>
+ <name>Dharmen Punjani</name>
+ <email>dharmen.punjani@gmail.com</email>
+ <organization>National and Kapodistrian University of Athens</organization>
+ <organizationUrl>http://wdaqua.eu/students/dharmen-punjani</organizationUrl>
+ </developer>
+ </developers>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <jena.version>3.0.0</jena.version>
+ <query.dir>src/test/resources/sparql/queries</query.dir>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>apache-jena-libs</artifactId>
+ <type>pom</type>
+ <version>${jena.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tinkerpop</groupId>
+ <artifactId>gremlin-core</artifactId>
+ <version>3.3.2-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tinkerpop</groupId>
+ <artifactId>tinkergraph-gremlin</artifactId>
+ <version>3.3.2-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tinkerpop</groupId>
+ <artifactId>gremlin-test</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8623ecb0/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/ConsoleCompiler.java
----------------------------------------------------------------------
diff --git a/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/ConsoleCompiler.java b/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/ConsoleCompiler.java
new file mode 100644
index 0000000..0d50475
--- /dev/null
+++ b/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/ConsoleCompiler.java
@@ -0,0 +1,165 @@
+/*
+ * 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.sparql;
+
+import java.io.BufferedReader;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.StringReader;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.CommandLineParser;
+import org.apache.commons.cli.DefaultParser;
+import org.apache.commons.cli.Options;
+import org.apache.commons.cli.ParseException;
+import org.apache.tinkerpop.gremlin.jsr223.JavaTranslator;
+import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.structure.Graph;
+import org.apache.tinkerpop.gremlin.structure.Vertex;
+import org.apache.tinkerpop.gremlin.structure.io.IoCore;
+import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerFactory;
+import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph;
+
+import org.apache.tinkerpop.gremlin.sparql.SparqlToGremlinCompiler;
+
+class ConsoleCompiler {
+
+ public static void main(final String[] args) throws IOException {
+ //args = "/examples/modern1.sparql";
+ final Options options = new Options();
+ options.addOption("f", "file", true, "a file that contains a SPARQL query");
+ options.addOption("g", "graph", true, "the graph that's used to execute the query [classic|modern|crew|kryo file]");
+ // TODO: add an OLAP option (perhaps: "--olap spark"?)
+
+ final CommandLineParser parser = new DefaultParser();
+ final CommandLine commandLine;
+
+ try {
+ commandLine = parser.parse(options, args);
+ } catch (ParseException e) {
+ System.out.println(e.getMessage());
+ printHelp(1);
+ return;
+ }
+
+ final InputStream inputStream = commandLine.hasOption("file")
+ ? new FileInputStream(commandLine.getOptionValue("file"))
+ : System.in;
+ final BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream));
+ final StringBuilder queryBuilder = new StringBuilder();
+
+ if (!reader.ready()) {
+ printHelp(1);
+ }
+
+ String line;
+ while (null != (line = reader.readLine())) {
+ queryBuilder.append(System.lineSeparator()).append(line);
+ }
+
+ final String queryString = queryBuilder.toString();
+ Graph graph;
+
+ if (commandLine.hasOption("graph")) {
+ switch (commandLine.getOptionValue("graph").toLowerCase()) {
+ case "classic":
+ graph = TinkerFactory.createClassic();
+ break;
+ case "modern":
+ graph = TinkerFactory.createModern();
+ System.out.println("Modern Graph Created");
+ break;
+ case "crew":
+ graph = TinkerFactory.createTheCrew();
+ break;
+ default:
+ graph = TinkerGraph.open();
+ System.out.println("Graph Created");
+ String graphName = commandLine.getOptionValue("graph");
+ long startTime= System.currentTimeMillis();
+ if(graphName.endsWith(".graphml"))
+ graph.io(IoCore.graphml()).readGraph(graphName);
+ else if(graphName.endsWith(".kryo")||graphName.endsWith("gryo"))
+ graph.io(IoCore.gryo()).readGraph(graphName);
+ long endTime = System.currentTimeMillis();
+ System.out.println("Time taken to load graph from kyro file: "+ (endTime-startTime)+" mili seconds");
+ break;
+ }
+ } else {
+
+ graph = TinkerFactory.createModern();
+ }
+
+ long startTime = System.currentTimeMillis();
+ final Traversal<Vertex, ?> traversal = SparqlToGremlinCompiler.convertToGremlinTraversal(graph, queryString);
+ long endTime = System.currentTimeMillis();
+ System.out.println("Time traken to convert SPARQL to Gremlin Traversal : "+ (endTime - startTime)+ " miliseconds");
+
+ printWithHeadline("SPARQL Query", queryString);
+ // printWithHeadline("Traversal (prior execution)", traversal);
+
+
+ Bytecode traversalByteCode = traversal.asAdmin().getBytecode();
+
+
+// JavaTranslator.of(graph.traversal()).translate(traversalByteCode);
+//
+// System.out.println("the Byte Code : "+ traversalByteCode.toString());
+ printWithHeadline("Result", String.join(System.lineSeparator(),JavaTranslator.of(graph.traversal()).translate(traversalByteCode).toStream().map(Object::toString).collect(Collectors.toList())));
+ // printWithHeadline("Traversal (after execution)", traversal);
+ }
+
+ private static void printHelp(final int exitCode) throws IOException {
+ final Map<String, String> env = System.getenv();
+ final String command = env.containsKey("LAST_COMMAND") ? env.get("LAST_COMMAND") : "sparql-gremlin.sh";
+ printWithHeadline("Usage Examples", String.join("\n",
+ command + " -f examples/modern1.sparql",
+ command + " < examples/modern2.sparql",
+ command + " <<< 'SELECT * WHERE { ?a e:knows ?b }'",
+ command + " -g crew < examples/crew1.sparql"));
+ if (exitCode >= 0) {
+ System.exit(exitCode);
+ }
+ }
+
+ private static void printWithHeadline(final String headline, final Object content) throws IOException {
+ final StringReader sr = new StringReader(content != null ? content.toString() : "null");
+ final BufferedReader br = new BufferedReader(sr);
+ String line;
+ System.out.println();
+ System.out.println( headline );
+ System.out.println();
+ boolean skip = true;
+ while (null != (line = br.readLine())) {
+ skip &= line.isEmpty();
+ if (!skip) {
+ System.out.println(" " + line);
+ }
+ }
+ System.out.println();
+ br.close();
+ sr.close();
+ }
+}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8623ecb0/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/Prefixes.java
----------------------------------------------------------------------
diff --git a/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/Prefixes.java b/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/Prefixes.java
new file mode 100644
index 0000000..452bf68
--- /dev/null
+++ b/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/Prefixes.java
@@ -0,0 +1,64 @@
+/*
+ * 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.sparql;
+
+import java.util.Arrays;
+import java.util.List;
+
+
+public class Prefixes {
+
+ // public final static String BASE_URI = "http://northwind.com/model/";
+ public final static String BASE_URI = "http://www.tinkerpop.com/traversal/";
+
+ final static List<String> PREFIXES = Arrays.asList("edge", "property", "value");
+
+ final static String PREFIX_DEFINITIONS;
+
+ static {
+ final StringBuilder builder = new StringBuilder();
+ for (final String prefix : PREFIXES) {
+ builder.append("PREFIX ").append(prefix.substring(0, 1)).append(": <").append(getURI(prefix)).
+ append(">").append(System.lineSeparator());
+ }
+ PREFIX_DEFINITIONS = builder.toString();
+ }
+
+ public static String getURI(final String prefix) {
+ return BASE_URI + prefix + "#";
+ }
+
+ public static String getURIValue(final String uri) {
+ return uri.substring(uri.indexOf("#") + 1);
+ }
+
+ public static String getPrefix(final String uri) {
+ final String tmp = uri.substring(0, uri.indexOf("#"));
+ return tmp.substring(tmp.lastIndexOf("/") + 1);
+ }
+
+ public static String prepend(final String script) {
+ return PREFIX_DEFINITIONS + script;
+ }
+
+ public static StringBuilder prepend(final StringBuilder scriptBuilder) {
+ return scriptBuilder.insert(0, PREFIX_DEFINITIONS);
+ }
+}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8623ecb0/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/SparqlToGremlinCompiler.java
----------------------------------------------------------------------
diff --git a/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/SparqlToGremlinCompiler.java b/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/SparqlToGremlinCompiler.java
new file mode 100644
index 0000000..adb36e9
--- /dev/null
+++ b/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/SparqlToGremlinCompiler.java
@@ -0,0 +1,381 @@
+/*
+ * 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.sparql;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import org.apache.jena.graph.Triple;
+import org.apache.jena.query.Query;
+import org.apache.jena.query.QueryFactory;
+import org.apache.jena.query.SortCondition;
+import org.apache.jena.query.Syntax;
+import org.apache.jena.sparql.algebra.Algebra;
+import org.apache.jena.sparql.algebra.Op;
+import org.apache.jena.sparql.algebra.OpVisitorBase;
+import org.apache.jena.sparql.algebra.OpWalker;
+import org.apache.jena.sparql.algebra.op.OpBGP;
+import org.apache.jena.sparql.algebra.op.OpFilter;
+import org.apache.jena.sparql.algebra.op.OpLeftJoin;
+import org.apache.jena.sparql.algebra.op.OpUnion;
+import org.apache.jena.sparql.core.Var;
+import org.apache.jena.sparql.core.VarExprList;
+import org.apache.jena.sparql.expr.Expr;
+import org.apache.jena.sparql.expr.ExprAggregator;
+import org.apache.tinkerpop.gremlin.process.traversal.Order;
+import org.apache.tinkerpop.gremlin.process.traversal.Scope;
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
+import org.apache.tinkerpop.gremlin.structure.Graph;
+import org.apache.tinkerpop.gremlin.structure.Vertex;
+
+// TODO: implement OpVisitor, don't extend OpVisitorBase
+public class SparqlToGremlinCompiler extends OpVisitorBase {
+
+ private GraphTraversal<Vertex, ?> traversal;
+
+ List<Traversal> traversalList = new ArrayList<Traversal>();
+
+ String groupVariable = "";
+ int sortingDirection = 0;
+ long offsetLimit = 0;
+ String sortingVariable = "";
+
+ GraphTraversalSource temp;
+ Graph graph;
+
+ private SparqlToGremlinCompiler(final GraphTraversal<Vertex, ?> traversal) {
+ this.traversal = traversal;
+ }
+
+ private SparqlToGremlinCompiler(final GraphTraversalSource g) {
+ this(g.V());
+ temp = g;
+
+ }
+
+ private SparqlToGremlinCompiler(final Graph g) {
+ this.traversal = (GraphTraversal<Vertex, ?>) g.traversal();
+ graph = g;
+ }
+
+ public String createMatchStep(String step) {
+ String st = "";
+ step = step.substring(1, step.length() - 2);
+ String first = step.substring(0, step.indexOf(","));
+ String second = step.substring(step.indexOf(",") + 1);
+ //System.out.println("First : " + first);
+ //System.out.println("Second : " + second);
+ st = first.substring(first.indexOf("["), first.length() - 1);
+ st = "[" + st + "," + second + "]";
+ return st;
+ }
+
+ GraphTraversal<Vertex, ?> convertToGremlinTraversal(final Query query) {
+
+ // long startTime = System.currentTimeMillis();
+ // long endTime;
+ final Op op = Algebra.compile(query); // SPARQL query compiles here to
+ // OP
+// System.out.println("OP Tree: " + op.toString());
+
+
+ OpWalker.walk(op, this); // OP is being walked here
+
+
+
+
+ //System.out.println("time taken for opWalker:"+ (endTime-startTime));
+ // startTime = System.currentTimeMillis();
+ int traversalIndex = 0;
+ int numberOfTraversal = traversalList.size();
+ Traversal arrayOfAllTraversals[] = new Traversal[numberOfTraversal];
+
+ if (query.hasOrderBy() && !query.hasGroupBy()) {
+ List<SortCondition> sortingConditions = query.getOrderBy();
+ int directionOfSort = 0;
+
+ for (SortCondition sortCondition : sortingConditions) {
+ Expr expr = sortCondition.getExpression();
+ directionOfSort = sortCondition.getDirection();
+ sortingVariable = expr.getVarName();
+
+ }
+
+ Order orderDirection = Order.incr;
+ if (directionOfSort == -1) {
+ orderDirection = Order.decr;
+ }
+ }
+ for (Traversal tempTrav : traversalList) {
+
+ arrayOfAllTraversals[traversalIndex++] = tempTrav;
+ }
+
+ int directionOfSort = 0;
+ Order orderDirection = Order.incr;
+ if (query.hasOrderBy()) {
+ List<SortCondition> sortingConditions = query.getOrderBy();
+
+ //
+ for (SortCondition sortCondition : sortingConditions) {
+ Expr expr = sortCondition.getExpression();
+ directionOfSort = sortCondition.getDirection();
+ sortingVariable = expr.getVarName();
+// System.out.println("order by var: "+sortingDirection);
+ }
+ //
+
+ if (directionOfSort == -1) {
+ orderDirection = Order.decr;
+ }
+
+ }
+
+ if (traversalList.size() > 0)
+ traversal = traversal.match(arrayOfAllTraversals);
+
+ final List<String> vars = query.getResultVars();
+ List<ExprAggregator> lstexpr = query.getAggregators();
+ if (!query.isQueryResultStar() && !query.hasGroupBy()) {
+
+ switch (vars.size()) {
+ case 0:
+ throw new IllegalStateException();
+ case 1:
+ if (query.isDistinct()) {
+// System.out.println("Inside ------------------- >Select 1------------------------> Distinct");
+ traversal = traversal.dedup(vars.get(0));
+ }
+ if (query.hasOrderBy()) {
+// System.out.println("Inside ------------------- >Select 1");
+ traversal = traversal.order().by(sortingVariable, orderDirection);
+ } else {
+
+ traversal = traversal.select(vars.get(0));
+ }
+ break;
+ case 2:
+ if (query.isDistinct()) {
+ traversal = traversal.dedup(vars.get(0), vars.get(1));
+ }
+ if (query.hasOrderBy()) {
+// System.out.println("Inside ------------------- >Select 1");
+ traversal = traversal.order().by(__.select(vars.get(0)), orderDirection).by(__.select(vars.get(1)));
+ } else
+ traversal = traversal.select(vars.get(0), vars.get(1));
+ break;
+ default:
+ final String[] all = new String[vars.size()];
+ vars.toArray(all);
+ if (query.isDistinct()) {
+
+ traversal = traversal.dedup(all);
+ }
+ final String[] others = Arrays.copyOfRange(all, 2, vars.size());
+ if (query.hasOrderBy()) {
+
+ traversal = traversal.order().by(__.select(vars.get(0)), orderDirection).by(__.select(vars.get(1)));
+
+ } else
+ traversal = traversal.select(vars.get(0), vars.get(1), others);
+
+ break;
+ }
+
+ }
+
+
+ if (query.hasGroupBy()) {
+ VarExprList lstExpr = query.getGroupBy();
+ String grpVar = "";
+ Traversal tempTrav;
+ for (Var expr : lstExpr.getVars()) {
+ grpVar = expr.getName();
+ // System.out.println("The Group by var: " + expr.getName());
+ }
+
+ if (query.hasLimit()) {
+ long limit = query.getLimit(), offset = 0;
+
+ if (query.hasOffset()) {
+ offset = query.getOffset();
+
+ }
+ // if (query.hasGroupBy() && query.hasOrderBy())
+ // traversal = traversal.range( offset, offset + limit);
+ // else
+ // traversal = traversal.range(offset, offset + limit);
+
+ }
+
+ if (!grpVar.isEmpty())
+ traversal = traversal.select(grpVar);
+ if (query.hasAggregators()) {
+ List<ExprAggregator> exprAgg = query.getAggregators();
+ for (ExprAggregator expr : exprAgg) {
+
+// System.out.println("The Aggregator by var: " + expr.getAggregator().getExprList().toString()
+// + " is :" + expr.getAggregator().toString());
+ if (expr.getAggregator().getName().contains("COUNT")) {
+ if (!query.toString().contains("GROUP")) {
+ if (expr.getAggregator().toString().contains("DISTINCT")) {
+ traversal = traversal
+ .dedup(expr.getAggregator().getExprList().get(0).toString().substring(1));
+ } else {
+ traversal = traversal
+ .select(expr.getAggregator().getExprList().get(0).toString().substring(1));
+ }
+ traversal = traversal.count();
+ } else
+ traversal = traversal.groupCount();
+ }
+ if (expr.getAggregator().getName().contains("MAX")) {
+ traversal = traversal.max();
+ }
+ }
+
+ } else {
+
+ traversal = traversal.group();
+ }
+
+
+ }
+
+
+ if (query.hasOrderBy() && query.hasGroupBy()) {
+
+ traversal = traversal.order().by(sortingVariable, orderDirection);
+ }
+ if (query.hasLimit()) {
+ long limit = query.getLimit(), offset = 0;
+
+ if (query.hasOffset()) {
+ offset = query.getOffset();
+
+ }
+ if (query.hasGroupBy() && query.hasOrderBy())
+ traversal = traversal.range(Scope.local, offset, offset + limit);
+ else
+ traversal = traversal.range(offset, offset + limit);
+
+ }
+ // endTime = System.currentTimeMillis();
+ // System.out.println("time taken for convertToGremlinTraversal Function : "+ (endTime-startTime)+" mili seconds");
+
+ return traversal;
+ }
+
+ private static GraphTraversal<Vertex, ?> convertToGremlinTraversal(final GraphTraversalSource g,
+ final Query query) {
+ return new SparqlToGremlinCompiler(g).convertToGremlinTraversal(query);
+ }
+
+ public static GraphTraversal<Vertex, ?> convertToGremlinTraversal(final Graph graph, final String query) {
+ return convertToGremlinTraversal(graph.traversal(), QueryFactory.create(Prefixes.prepend(query)));
+ }
+
+ public static GraphTraversal<Vertex, ?> convertToGremlinTraversal(final GraphTraversalSource g,
+ final String query) {
+ return convertToGremlinTraversal(g, QueryFactory.create(Prefixes.prepend(query), Syntax.syntaxSPARQL));
+ }
+
+ // VISITING SPARQL ALGEBRA OP BASIC TRIPLE PATTERNS - MAYBE
+ @Override
+ public void visit(final OpBGP opBGP) {
+ {
+
+ // System.out.println("Inside opBGP ---------------------------------------------->");
+ final List<Triple> triples = opBGP.getPattern().getList();
+ final Traversal[] matchTraversals = new Traversal[triples.size()];
+ int i = 0;
+ for (final Triple triple : triples) {
+
+ matchTraversals[i++] = TraversalBuilder.transform(triple);
+ traversalList.add(matchTraversals[i - 1]);
+ }
+
+ }
+
+ }
+
+ // VISITING SPARQL ALGEBRA OP FILTER - MAYBE
+ @Override
+ public void visit(final OpFilter opFilter) {
+
+ // System.out.println("Inside opFilter ---------------------------------------------->");
+ Traversal traversal = null;
+
+ for (Expr expr : opFilter.getExprs().getList()) {
+ if (expr != null) {
+
+ traversal = __.where(WhereTraversalBuilder.transform(expr));
+ traversalList.add(traversal);
+ }
+ }
+
+ }
+ // TODO: add more functions for operators other than FILTER, such as
+ // OPTIONAL
+ // This can be done by understanding how Jena handles these other
+ // operators/filters inherently and then map them to Gremlin
+
+ public void visit(final OpLeftJoin opLeftJoin) {
+
+// System.out.println("Inside opOptional ---------------------------------------------->");
+// System.out.println(opLeftJoin.getRight().toString());
+
+ }
+
+ @Override
+ public void visit(final OpUnion opUnion) {
+
+ // System.out.println("Inside opUnion ---------------------------------------------->");
+ Traversal unionTemp[] = new Traversal[2];
+ Traversal unionTemp1[] = new Traversal[traversalList.size() / 2];
+ Traversal unionTemp2[] = new Traversal[traversalList.size() / 2];
+
+ int count = 0;
+
+ for (int i = 0; i < traversalList.size(); i++) {
+
+ if (i < traversalList.size() / 2) {
+
+ unionTemp1[i] = traversalList.get(i);
+ } else {
+ unionTemp2[count++] = traversalList.get(i);
+ }
+ }
+
+ unionTemp[1] = __.match(unionTemp2);
+ unionTemp[0] = __.match(unionTemp1);
+
+ traversalList.clear();
+ traversal = (GraphTraversal<Vertex, ?>) traversal.union(unionTemp);
+ // System.out.println("Getting out from Union -------------------> :
+ // "+traversal);
+ // traversalList.add(__.union(unionTemp));
+ // traversalList.clear();
+ }
+}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8623ecb0/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/TraversalBuilder.java
----------------------------------------------------------------------
diff --git a/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/TraversalBuilder.java b/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/TraversalBuilder.java
new file mode 100644
index 0000000..72a32a5
--- /dev/null
+++ b/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/TraversalBuilder.java
@@ -0,0 +1,82 @@
+/*
+ * 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.sparql;
+
+import org.apache.jena.graph.Node;
+import org.apache.jena.graph.Triple;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
+import org.apache.tinkerpop.gremlin.structure.PropertyType;
+import org.apache.tinkerpop.gremlin.structure.Vertex;
+
+
+class TraversalBuilder {
+
+ public static GraphTraversal<?, ?> transform(final Triple triple) {
+ final GraphTraversal<Vertex, ?> matchTraversal = __.as(triple.getSubject().getName());
+
+ final Node predicate = triple.getPredicate();
+ final String uri = predicate.getURI();
+ final String uriValue = Prefixes.getURIValue(uri);
+ final String prefix = Prefixes.getPrefix(uri);
+
+ switch (prefix) {
+ case "edge":
+ return matchTraversal.out(uriValue).as(triple.getObject().getName());
+ case "property":
+ return matchProperty(matchTraversal, uriValue, PropertyType.PROPERTY, triple.getObject());
+ case "value":
+ return matchProperty(matchTraversal, uriValue, PropertyType.VALUE, triple.getObject());
+ default:
+ throw new IllegalStateException(String.format("Unexpected predicate: %s", predicate));
+ }
+ }
+
+ private static GraphTraversal<?, ?> matchProperty(final GraphTraversal<?, ?> traversal, final String propertyName,
+ final PropertyType type, final Node object) {
+ switch (propertyName) {
+ case "id":
+
+ return object.isConcrete()
+ ? traversal.hasId(object.getLiteralValue())
+ : traversal.id().as(object.getName());
+ case "label":
+ return object.isConcrete()
+ ? traversal.hasLabel(object.getLiteralValue().toString())
+ : traversal.label().as(object.getName());
+ case "key":
+ return object.isConcrete()
+ ? traversal.hasKey(object.getLiteralValue().toString())
+ : traversal.key().as(object.getName());
+ case "value":
+ return object.isConcrete()
+ ? traversal.hasValue(object.getLiteralValue().toString())
+ : traversal.value().as(object.getName());
+ default:
+ if (type.equals(PropertyType.PROPERTY)) {
+ return traversal.properties(propertyName).as(object.getName());
+ } else {
+ return object.isConcrete()
+ ? traversal.values(propertyName).is(object.getLiteralValue())
+ : traversal.values(propertyName).as(object.getName());
+ }
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8623ecb0/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/WhereTraversalBuilder.java
----------------------------------------------------------------------
diff --git a/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/WhereTraversalBuilder.java b/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/WhereTraversalBuilder.java
new file mode 100644
index 0000000..f4d49b6
--- /dev/null
+++ b/sparql-gremlin/src/main/java/org/apache/tinkerpop/gremlin/sparql/WhereTraversalBuilder.java
@@ -0,0 +1,134 @@
+/*
+ * 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.sparql;
+
+import java.util.List;
+
+import org.apache.jena.graph.Triple;
+import org.apache.jena.sparql.algebra.op.OpBGP;
+import org.apache.jena.sparql.expr.E_Equals;
+import org.apache.jena.sparql.expr.E_Exists;
+import org.apache.jena.sparql.expr.E_GreaterThan;
+import org.apache.jena.sparql.expr.E_GreaterThanOrEqual;
+import org.apache.jena.sparql.expr.E_LessThan;
+import org.apache.jena.sparql.expr.E_LessThanOrEqual;
+import org.apache.jena.sparql.expr.E_LogicalAnd;
+import org.apache.jena.sparql.expr.E_LogicalOr;
+import org.apache.jena.sparql.expr.E_NotEquals;
+import org.apache.jena.sparql.expr.E_NotExists;
+import org.apache.jena.sparql.expr.E_StrLength;
+import org.apache.jena.sparql.expr.Expr;
+import org.apache.tinkerpop.gremlin.process.traversal.P;
+import org.apache.tinkerpop.gremlin.process.traversal.Step;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
+
+class WhereTraversalBuilder {
+
+ public static GraphTraversal<?, ?> transform(final E_Equals expression) {
+ // System.out.println("The aggr one : "+expression.getArg1().getClass().getName() + "The aggr one :"+expression.getArg2().getClass().getName());
+ final Object value = expression.getArg2().getConstant().getNode().getLiteralValue();
+ return __.as(expression.getArg1().getVarName()).is(P.eq(value));
+ }
+
+ public static GraphTraversal<?, ?> transform(final E_NotEquals expression) {
+ final Object value = expression.getArg2().getConstant().getNode().getLiteralValue();
+ return __.as(expression.getArg1().getVarName()).is(P.neq(value));
+ }
+
+ public static GraphTraversal<?, ?> transform(final E_LessThan expression) {
+ // System.out.println("The aggr one : "+expression.getArg1().getClass().getName() + "The aggr one :"+expression.getArg2().getClass().getName());
+ final Object value = expression.getArg2().getConstant().getNode().getLiteralValue();
+ return __.as(expression.getArg1().getVarName()).is(P.lt(value));
+ }
+
+ public static GraphTraversal<?, ?> transform(final E_LessThanOrEqual expression) {
+ // System.out.println("The aggr one : "+expression.getArg1().getClass().getName() + "The aggr one :"+expression.getArg2().getClass().getName());
+ final Object value = expression.getArg2().getConstant().getNode().getLiteralValue();
+ return __.as(expression.getArg1().getVarName()).is(P.lte(value));
+ }
+
+ public static GraphTraversal<?, ?> transform(final E_GreaterThan expression) {
+ final Object value = expression.getArg2().getConstant().getNode().getLiteralValue();
+ return __.as(expression.getArg1().getVarName()).is(P.gt(value));
+ }
+
+ public static GraphTraversal<?, ?> transform(final E_GreaterThanOrEqual expression) {
+ final Object value = expression.getArg2().getConstant().getNode().getLiteralValue();
+ return __.as(expression.getArg1().getVarName()).is(P.gte(value));
+ }
+
+ public static GraphTraversal<?, ?> transform(final E_LogicalAnd expression) {
+ return __.and(
+ transform(expression.getArg1()),
+ transform(expression.getArg2()));
+ }
+
+ public static GraphTraversal<?, ?> transform(final E_LogicalOr expression) {
+ return __.or(
+ transform(expression.getArg1()),
+ transform(expression.getArg2()));
+ }
+
+ public static GraphTraversal<?, ?> transform(final E_Exists expression) {
+ final OpBGP opBGP = (OpBGP) expression.getGraphPattern();
+ final List<Triple> triples = opBGP.getPattern().getList();
+ if (triples.size() != 1) throw new IllegalStateException("Unhandled EXISTS pattern");
+ final GraphTraversal<?, ?> traversal = TraversalBuilder.transform(triples.get(0));
+ final Step endStep = traversal.asAdmin().getEndStep();
+ final String label = (String) endStep.getLabels().iterator().next();
+ endStep.removeLabel(label);
+ return traversal;
+ }
+
+
+ public static GraphTraversal<?, ?> transform(final E_NotExists expression) {
+ final OpBGP opBGP = (OpBGP) expression.getGraphPattern();
+ final List<Triple> triples = opBGP.getPattern().getList();
+ if (triples.size() != 1) throw new IllegalStateException("Unhandled NOT EXISTS pattern");
+ final GraphTraversal<?, ?> traversal = TraversalBuilder.transform(triples.get(0));
+ final Step endStep = traversal.asAdmin().getEndStep();
+ final String label = (String) endStep.getLabels().iterator().next();
+ endStep.removeLabel(label);
+ return __.not(traversal);
+ }
+
+ public static int getStrLength(final E_StrLength expression){
+
+ return expression.getArg().toString().length();
+
+ }
+
+
+ //what does <?, ?> signify? possibly <S,E>
+ public static GraphTraversal<?, ?> transform(final Expr expression) {
+ if (expression instanceof E_Equals) return transform((E_Equals) expression);
+ if (expression instanceof E_NotEquals) return transform((E_NotEquals) expression);
+ if (expression instanceof E_LessThan) return transform((E_LessThan) expression);
+ if (expression instanceof E_LessThanOrEqual) return transform((E_LessThanOrEqual) expression);
+ if (expression instanceof E_GreaterThan) return transform((E_GreaterThan) expression);
+ if (expression instanceof E_GreaterThanOrEqual) return transform((E_GreaterThanOrEqual) expression);
+ if (expression instanceof E_LogicalAnd) return transform((E_LogicalAnd) expression);
+ if (expression instanceof E_LogicalOr) return transform((E_LogicalOr) expression);
+ if (expression instanceof E_Exists) return transform((E_Exists) expression);
+ if (expression instanceof E_NotExists) return transform((E_NotExists) expression);
+ throw new IllegalStateException(String.format("Unhandled expression: %s", expression));
+ }
+}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8623ecb0/sparql-gremlin/src/test/java/org/apache/tinkerpop/gremlin/sparql/PrefixesTest.java
----------------------------------------------------------------------
diff --git a/sparql-gremlin/src/test/java/org/apache/tinkerpop/gremlin/sparql/PrefixesTest.java b/sparql-gremlin/src/test/java/org/apache/tinkerpop/gremlin/sparql/PrefixesTest.java
new file mode 100644
index 0000000..155680b
--- /dev/null
+++ b/sparql-gremlin/src/test/java/org/apache/tinkerpop/gremlin/sparql/PrefixesTest.java
@@ -0,0 +1,67 @@
+/*
+ * 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.sparql;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+public class PrefixesTest {
+
+ final static String TEST_QUERY = String.join(System.lineSeparator(), "SELECT *", "WHERE {}");
+ final static String PREFIXED_QUERY = String.join(System.lineSeparator(),
+ "PREFIX e: <" + Prefixes.BASE_URI + "edge#>",
+ "PREFIX p: <" + Prefixes.BASE_URI + "property#>",
+ "PREFIX v: <" + Prefixes.BASE_URI + "value#>",
+ TEST_QUERY);
+
+ @Test
+ public void testGetURI() throws Exception {
+ final String prefix = "test";
+ final String uri = Prefixes.BASE_URI + prefix + "#";
+ assertEquals(uri, Prefixes.getURI(prefix));
+ }
+
+ @Test
+ public void testGetURIValue() throws Exception {
+ final String prefix = "test";
+ final String value = "value";
+ final String uri = Prefixes.getURI(prefix) + value;
+ assertEquals(value, Prefixes.getURIValue(uri));
+ }
+
+ @Test
+ public void testGetPrefix() throws Exception {
+ final String prefix = "test";
+ final String uri = Prefixes.getURI(prefix);
+ assertEquals(prefix, Prefixes.getPrefix(uri));
+ }
+
+ @Test
+ public void testPrependString() throws Exception {
+ assertEquals(PREFIXED_QUERY, Prefixes.prepend(TEST_QUERY));
+ }
+
+ @Test
+ public void testPrependStringBuilder() throws Exception {
+ final StringBuilder builder = new StringBuilder(TEST_QUERY);
+ assertEquals(PREFIXED_QUERY, Prefixes.prepend(builder).toString());
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8623ecb0/sparql-gremlin/src/test/java/org/apache/tinkerpop/gremlin/sparql/ResourceHelper.java
----------------------------------------------------------------------
diff --git a/sparql-gremlin/src/test/java/org/apache/tinkerpop/gremlin/sparql/ResourceHelper.java b/sparql-gremlin/src/test/java/org/apache/tinkerpop/gremlin/sparql/ResourceHelper.java
new file mode 100644
index 0000000..4f58e61
--- /dev/null
+++ b/sparql-gremlin/src/test/java/org/apache/tinkerpop/gremlin/sparql/ResourceHelper.java
@@ -0,0 +1,37 @@
+/*
+ * 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.sparql;
+
+import org.apache.commons.io.IOUtils;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+/**
+ * @author Daniel Kuppitz (http://gremlin.guru)
+ */
+public class ResourceHelper {
+
+ public static String loadQuery(final String prefix, final int number) throws IOException {
+ final String path = "/queries/" + prefix + number + ".sparql";
+ final InputStream stream = ResourceHelper.class.getResourceAsStream(path);
+ return IOUtils.toString(stream, "UTF-8");
+ }
+}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8623ecb0/sparql-gremlin/src/test/java/org/apache/tinkerpop/gremlin/sparql/SparqlToGremlinCompilerTest.java
----------------------------------------------------------------------
diff --git a/sparql-gremlin/src/test/java/org/apache/tinkerpop/gremlin/sparql/SparqlToGremlinCompilerTest.java b/sparql-gremlin/src/test/java/org/apache/tinkerpop/gremlin/sparql/SparqlToGremlinCompilerTest.java
new file mode 100644
index 0000000..3fb49e8
--- /dev/null
+++ b/sparql-gremlin/src/test/java/org/apache/tinkerpop/gremlin/sparql/SparqlToGremlinCompilerTest.java
@@ -0,0 +1,223 @@
+/*
+ * 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.sparql;
+
+import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
+import org.apache.tinkerpop.gremlin.structure.Graph;
+import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerFactory;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.apache.tinkerpop.gremlin.process.computer.Computer;
+import org.apache.tinkerpop.gremlin.structure.Vertex;
+import static org.apache.tinkerpop.gremlin.sparql.SparqlToGremlinCompiler.convertToGremlinTraversal;
+import static org.junit.Assert.assertEquals;
+
+
+import java.io.IOException;
+
+import static org.apache.tinkerpop.gremlin.sparql.ResourceHelper.loadQuery;
+
+
+public class SparqlToGremlinCompilerTest {
+
+ private Graph modern, crew;
+ private GraphTraversalSource mg, cg;
+ private GraphTraversalSource mc, cc;
+/*
+ @Before
+ public void setUp() throws Exception {
+ modern = TinkerFactory.createModern();
+ mg = modern.traversal();
+ mc = modern.traversal(computer());
+ crew = TinkerFactory.createTheCrew();
+ cg = modern.traversal();
+ cc = modern.traversal(computer());
+ }
+
+ @Ignore
+ @Test
+ public void play() throws IOException {
+ final String query = loadQuery("modern", 11);
+ final Traversal traversal = convertToGremlinTraversal(modern, query);
+ System.out.println(traversal);
+ System.out.println(traversal.toList());
+ System.out.println(traversal);
+ }
+
+ /* Modern */
+
+ /* @Test
+ public void testModern1() throws Exception {
+ final GraphTraversal expected = mg.V().match(
+ as("a").hasLabel("person"),
+ as("a").out("knows").as("b"),
+ as("a").out("created").as("c"),
+ as("b").out("created").as("c"),
+ as("a").values("age").as("d")).where(as("d").is(lt(30))).
+ select("a", "b", "c");
+ assertEquals(expected, convertToGremlinTraversal(modern, loadQuery("modern", 1)));
+ }
+
+ @Test
+ public void testModern2() throws Exception {
+ final GraphTraversal expected = mg.V().match(
+ as("a").hasLabel("person"),
+ as("a").out("knows").as("b"),
+ as("a").out("created").as("c"),
+ as("b").out("created").as("c"),
+ as("a").values("age").as("d")).where(as("d").is(lt(30)));
+ assertEquals(expected, convertToGremlinTraversal(modern, loadQuery("modern", 2)));
+ }
+
+ @Test
+ public void testModern3() throws Exception {
+ final GraphTraversal expected = mg.V().match(
+ as("person").values("name").as("name"),
+ as("person").values("age").as("age")).select("name", "age");
+ assertEquals(expected, convertToGremlinTraversal(modern, loadQuery("modern", 3)));
+ }
+
+ @Test
+ public void testModern4() throws Exception {
+ final GraphTraversal expected = mg.V().match(
+ as("person").values("name").as("name"),
+ as("person").values("age").as("age"),
+ as("person").out("created").as("project"),
+ as("project").values("name").is("lop")).select("name", "age");
+ assertEquals(expected, convertToGremlinTraversal(modern, loadQuery("modern", 4)));
+ }
+
+ @Test
+ public void testModern5() throws Exception {
+ final GraphTraversal expected = mg.V().match(
+ as("person").values("name").as("name"),
+ as("person").values("age").is(29)).select("name");
+ assertEquals(expected, convertToGremlinTraversal(modern, loadQuery("modern", 5)));
+ }
+
+ @Test
+ public void testModern6() throws Exception {
+ final GraphTraversal expected = mg.V().match(
+ as("person").values("name").as("name"),
+ as("person").values("age").as("age")).where(and(as("age").is(gt(30)), as("age").is(lt(40)))).
+ select("name", "age");
+ assertEquals(expected, convertToGremlinTraversal(modern, loadQuery("modern", 6)));
+ }
+
+ @Test
+ public void testModern7() throws Exception {
+ final GraphTraversal expected = mg.V().match(
+ as("person").values("name").as("name"),
+ as("person").values("age").as("age")).where(or(as("age").is(lt(30)), as("age").is(gt(40)))).
+ select("name", "age");
+ assertEquals(expected, convertToGremlinTraversal(modern, loadQuery("modern", 7)));
+ }
+
+ @Test
+ public void testModern8() throws Exception {
+ final GraphTraversal expected = mg.V().match(
+ as("person").values("name").as("name"),
+ as("person").values("age").as("age")).where(
+ or(and(as("age").is(gt(30)), as("age").is(lt(40))), as("name").is("marko"))).
+ select("name", "age");
+ assertEquals(expected, convertToGremlinTraversal(modern, loadQuery("modern", 8)));
+ }
+
+ @Test
+ public void testModern9() throws Exception {
+ final GraphTraversal expected = mg.V().match(
+ as("a").values("name").as("name")).where(as("a").values("age")).
+ select("name");
+ assertEquals(expected, convertToGremlinTraversal(modern, loadQuery("modern", 9)));
+ }
+
+ @Test
+ public void testModern10() throws Exception {
+ final GraphTraversal expected = mg.V().match(
+ as("a").values("name").as("name")).where(__.not(as("a").values("age"))).
+ select("name");
+ assertEquals(expected, convertToGremlinTraversal(modern, loadQuery("modern", 10)));
+ }
+
+ @Test
+ public void testModern11() throws Exception {
+ final GraphTraversal expected = mg.V().match(
+ as("a").out("created").as("b"),
+ as("a").values("name").as("name")).dedup("name").select("name");
+ assertEquals(expected, convertToGremlinTraversal(modern, loadQuery("modern", 11)));
+ }
+
+ @Test
+ public void testModern12() throws Exception {
+ final GraphTraversal expected = mg.V().match(
+ as("a").out("created").as("b"),
+ as("b").values("name").as("name")).dedup();
+ assertEquals(expected, convertToGremlinTraversal(modern, loadQuery("modern", 12)));
+ }
+
+ @Test
+ public void testModern13() throws Exception {
+ final GraphTraversal expected = mg.V().match(
+ as("a").out("created").as("b"),
+ as("a").values("name").as("c")).dedup("a", "b", "c").select("a", "b", "c");
+ assertEquals(expected, convertToGremlinTraversal(modern, loadQuery("modern", 13)));
+ }
+
+ /* The Crew */
+
+ /* @Test
+ public void testCrew1() throws Exception {
+ final GraphTraversal expected = cg.V().match(
+ as("a").values("name").is("daniel"),
+ as("a").properties("location").as("b"),
+ as("b").value().as("c"),
+ as("b").values("startTime").as("d")).
+ select("c", "d");
+ assertEquals(expected, convertToGremlinTraversal(crew, loadQuery("crew", 1)));
+ }
+
+ /* Computer Mode */
+
+ /* @Test
+ public void testModernInComputerMode() throws Exception {
+ final GraphTraversal expected = mc.V().match(
+ as("a").hasLabel("person"),
+ as("a").out("knows").as("b"),
+ as("a").out("created").as("c"),
+ as("b").out("created").as("c"),
+ as("a").values("age").as("d")).where(as("d").is(lt(30))).
+ select("a", "b", "c");
+ assertEquals(expected, convertToGremlinTraversal(mc, loadQuery("modern", 1)));
+ }
+
+ @Test
+ public void testCrewInComputerMode() throws Exception {
+ final GraphTraversal expected = cc.V().match(
+ as("a").values("name").is("daniel"),
+ as("a").properties("location").as("b"),
+ as("b").value().as("c"),
+ as("b").values("startTime").as("d")).
+ select("c", "d");
+ assertEquals(expected, convertToGremlinTraversal(crew, loadQuery("crew", 1)));
+ } */
+}
\ No newline at end of file
[13/50] tinkerpop git commit: CTR: Fixed strategy lifecycle issues
caused by `PathRetractionStrategy`. Fix taken from `tp33/`.
Posted by sp...@apache.org.
CTR: Fixed strategy lifecycle issues caused by `PathRetractionStrategy`. Fix taken from `tp33/`.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/8a76583c
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/8a76583c
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/8a76583c
Branch: refs/heads/TINKERPOP-1878
Commit: 8a76583c9e783e15b4cdf0167e6b32940a525c00
Parents: 373eba1
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Thu Mar 22 08:30:40 2018 -0700
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Thu Mar 22 08:30:40 2018 -0700
----------------------------------------------------------------------
.../strategy/decoration/SubgraphStrategy.java | 13 +++++++++++++
.../optimization/IncidentToAdjacentStrategy.java | 12 +++++++++++-
2 files changed, 24 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8a76583c/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java
index e0d260f..508e9c6 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java
@@ -43,6 +43,7 @@ import org.apache.tinkerpop.gremlin.process.traversal.step.map.VertexStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.SideEffectStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.util.EmptyStep;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.AbstractTraversalStrategy;
+import org.apache.tinkerpop.gremlin.process.traversal.traverser.TraverserRequirement;
import org.apache.tinkerpop.gremlin.process.traversal.util.DefaultTraversal;
import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper;
import org.apache.tinkerpop.gremlin.structure.Direction;
@@ -148,6 +149,18 @@ public final class SubgraphStrategy extends AbstractTraversalStrategy<TraversalS
traversal.getStartStep().removeLabel(MARKER);
return;
}
+ for (final Step step : traversal.getSteps()) {
+ if (step instanceof TraversalParent) {
+ for (final Traversal.Admin t : ((TraversalParent) step).getLocalChildren()) {
+ this.apply(t);
+ t.getStartStep().addLabel(MARKER);
+ }
+ for (final Traversal.Admin t : ((TraversalParent) step).getGlobalChildren()) {
+ this.apply(t);
+ t.getStartStep().addLabel(MARKER);
+ }
+ }
+ }
//
final List<GraphStep> graphSteps = TraversalHelper.getStepsOfAssignableClass(GraphStep.class, traversal);
final List<VertexStep> vertexSteps = TraversalHelper.getStepsOfAssignableClass(VertexStep.class, traversal);
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8a76583c/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/IncidentToAdjacentStrategy.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/IncidentToAdjacentStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/IncidentToAdjacentStrategy.java
index 1c96cf8..8389112 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/IncidentToAdjacentStrategy.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/IncidentToAdjacentStrategy.java
@@ -23,6 +23,7 @@ import org.apache.tinkerpop.gremlin.process.traversal.Step;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.step.LambdaHolder;
+import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalParent;
import org.apache.tinkerpop.gremlin.process.traversal.step.filter.PathFilterStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.map.EdgeOtherVertexStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.map.EdgeVertexStep;
@@ -132,6 +133,10 @@ public final class IncidentToAdjacentStrategy extends AbstractTraversalStrategy<
final Collection<Pair<VertexStep, Step>> stepsToReplace = new ArrayList<>();
Step prev = null;
for (final Step curr : traversal.getSteps()) {
+ if (curr instanceof TraversalParent) {
+ ((TraversalParent) curr).getLocalChildren().forEach(this::apply);
+ ((TraversalParent) curr).getGlobalChildren().forEach(this::apply);
+ }
if (isOptimizable(prev, curr)) {
stepsToReplace.add(Pair.with((VertexStep) prev, curr));
}
@@ -148,4 +153,9 @@ public final class IncidentToAdjacentStrategy extends AbstractTraversalStrategy<
public Set<Class<? extends OptimizationStrategy>> applyPrior() {
return Collections.singleton(IdentityRemovalStrategy.class);
}
-}
+
+ @Override
+ public Set<Class<? extends OptimizationStrategy>> applyPost() {
+ return Collections.singleton(PathRetractionStrategy.class);
+ }
+}
\ No newline at end of file