date:20180228

[2/2] tinkerpop git commit: Merge branch 'TINKERPOP-1586' into tp32

2018-02-28 Thread spmallette

Merge branch 'TINKERPOP-1586' into tp32


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/d5205161
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/d5205161
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/d5205161

Branch: refs/heads/tp32
Commit: d52051615783c83f7d185b257059ec2d37e97095
Parents: 3aa9e70 d112154
Author: Stephen Mallette 
Authored: Wed Feb 28 15:40:20 2018 -0500
Committer: Stephen Mallette 
Committed: Wed Feb 28 15:40:20 2018 -0500

--
 CHANGELOG.asciidoc  |  1 +
 .../strategy/decoration/SubgraphStrategy.java   | 58 ++
 .../decoration/SubgraphStrategyProcessTest.java | 84 
 3 files changed, 127 insertions(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d5205161/CHANGELOG.asciidoc
--
diff --cc CHANGELOG.asciidoc
index 60e0ef4,1701342..92e1d9e
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@@ -23,9 -23,9 +23,10 @@@ image::https://raw.githubusercontent.co
  [[release-3-2-8]]
  === TinkerPop 3.2.8 (Release Date: NOT OFFICIALLY RELEASED YET)
  
+ * Added `checkAdjacentVertices` option to `SubgraphStrategy`.
  * Modified `GremlinDslProcessor` so that it generated the 
`getAnonymousTraversalClass()` method to return the DSL version of `__`.
  * Added the "Kitchen Sink" test data set.
 +* Added `idleConnectionTimeout` and `keepAliveInterval` to Gremlin Server 
that enables a "ping" and auto-close for seemingly dead clients.
  * 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.

[1/2] tinkerpop git commit: TINKERPOP-1586 Added checkAdjacentVertices option to SubgraphStrategy

2018-02-28 Thread spmallette

Repository: tinkerpop
Updated Branches:
  refs/heads/tp32 3aa9e70ef -> d52051615


TINKERPOP-1586 Added checkAdjacentVertices option to SubgraphStrategy

This change allows the user to turn off an aspect of SubgraphStrategy that 
prevents it from working properly in OLAP situations.


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/d1121544
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/d1121544
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/d1121544

Branch: refs/heads/tp32
Commit: d1121544017acf1189f0270f60b5f1f402fec0ea
Parents: bcffaad
Author: Stephen Mallette 
Authored: Thu Feb 15 16:22:58 2018 -0500
Committer: Stephen Mallette 
Committed: Thu Feb 15 16:24:54 2018 -0500

--
 CHANGELOG.asciidoc  |  1 +
 .../strategy/decoration/SubgraphStrategy.java   | 58 ++
 .../decoration/SubgraphStrategyProcessTest.java | 84 
 3 files changed, 127 insertions(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d1121544/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index f1519b6..1701342 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -23,6 +23,7 @@ 
image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
 [[release-3-2-8]]
 === TinkerPop 3.2.8 (Release Date: NOT OFFICIALLY RELEASED YET)
 
+* Added `checkAdjacentVertices` option to `SubgraphStrategy`.
 * Modified `GremlinDslProcessor` so that it generated the 
`getAnonymousTraversalClass()` method to return the DSL version of `__`.
 * Added the "Kitchen Sink" test data set.
 * Fixed a bug in `NumberHelper` that led to wrong min/max results if numbers 
exceeded the Integer limits.

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d1121544/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 4747cd4..e0d260f 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
@@ -82,13 +82,14 @@ public final class SubgraphStrategy extends 
AbstractTraversalStrategy vertexCriterion, final 
Traversal edgeCriterion, final Traversal 
vertexPropertyCriterion) {
+private SubgraphStrategy(final Builder builder) {
 
-this.vertexCriterion = null == vertexCriterion ? null : 
vertexCriterion.asAdmin().clone();
+this.vertexCriterion = null == builder.vertexCriterion ? null : 
builder.vertexCriterion.asAdmin().clone();
 
-// if there is no vertex predicate there is no need to test either 
side of the edge
-if (null == this.vertexCriterion) {
-this.edgeCriterion = null == edgeCriterion ? null : 
edgeCriterion.asAdmin().clone();
+// if there is no vertex predicate there is no need to test either 
side of the edge - also this option can
+// be simply configured in the builder to not be used
+if (null == this.vertexCriterion || !builder.checkAdjacentVertices) {
+this.edgeCriterion = null == builder.edgeCriterion ? null : 
builder.edgeCriterion.asAdmin().clone();
 } else {
 final Traversal.Admin vertexPredicate;
 vertexPredicate = __.and(
@@ -97,12 +98,12 @@ public final class SubgraphStrategy extends 
AbstractTraversalStrategy(edgeCriterion.asAdmin(), vertexPredicate));
+builder.edgeCriterion.asAdmin().clone().addStep(new 
TraversalFilterStep<>(builder.edgeCriterion.asAdmin(), vertexPredicate));
 }
 
-this.vertexPropertyCriterion = null == vertexPropertyCriterion ? null 
: vertexPropertyCriterion.asAdmin().clone();
+this.vertexPropertyCriterion = null == builder.vertexPropertyCriterion 
? null : builder.vertexPropertyCriterion.asAdmin().clone();
 
 if (null != this.vertexCriterion)
 TraversalHelper.applyTraversalRecursively(t -> 
t.getStartStep().addLabel(MARKER), this.vertexCriterion);
@@ -316,25 +317,50 @@ public final class SubgraphStrategy extends 
AbstractTraversalStrategy vertexPredicate = null;
-private Traversal edgePredicate = null;
-private Traversal

[2/3] tinkerpop git commit: Merge branch 'TINKERPOP-1586' into tp32

2018-02-28 Thread spmallette

Merge branch 'TINKERPOP-1586' into tp32


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/d5205161
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/d5205161
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/d5205161

Branch: refs/heads/tp33
Commit: d52051615783c83f7d185b257059ec2d37e97095
Parents: 3aa9e70 d112154
Author: Stephen Mallette 
Authored: Wed Feb 28 15:40:20 2018 -0500
Committer: Stephen Mallette 
Committed: Wed Feb 28 15:40:20 2018 -0500

--
 CHANGELOG.asciidoc  |  1 +
 .../strategy/decoration/SubgraphStrategy.java   | 58 ++
 .../decoration/SubgraphStrategyProcessTest.java | 84 
 3 files changed, 127 insertions(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d5205161/CHANGELOG.asciidoc
--
diff --cc CHANGELOG.asciidoc
index 60e0ef4,1701342..92e1d9e
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@@ -23,9 -23,9 +23,10 @@@ image::https://raw.githubusercontent.co
  [[release-3-2-8]]
  === TinkerPop 3.2.8 (Release Date: NOT OFFICIALLY RELEASED YET)
  
+ * Added `checkAdjacentVertices` option to `SubgraphStrategy`.
  * Modified `GremlinDslProcessor` so that it generated the 
`getAnonymousTraversalClass()` method to return the DSL version of `__`.
  * Added the "Kitchen Sink" test data set.
 +* Added `idleConnectionTimeout` and `keepAliveInterval` to Gremlin Server 
that enables a "ping" and auto-close for seemingly dead clients.
  * 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.

[2/4] tinkerpop git commit: Merge branch 'TINKERPOP-1586' into tp32

2018-02-28 Thread spmallette

Merge branch 'TINKERPOP-1586' into tp32


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/d5205161
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/d5205161
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/d5205161

Branch: refs/heads/master
Commit: d52051615783c83f7d185b257059ec2d37e97095
Parents: 3aa9e70 d112154
Author: Stephen Mallette 
Authored: Wed Feb 28 15:40:20 2018 -0500
Committer: Stephen Mallette 
Committed: Wed Feb 28 15:40:20 2018 -0500

--
 CHANGELOG.asciidoc  |  1 +
 .../strategy/decoration/SubgraphStrategy.java   | 58 ++
 .../decoration/SubgraphStrategyProcessTest.java | 84 
 3 files changed, 127 insertions(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d5205161/CHANGELOG.asciidoc
--
diff --cc CHANGELOG.asciidoc
index 60e0ef4,1701342..92e1d9e
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@@ -23,9 -23,9 +23,10 @@@ image::https://raw.githubusercontent.co
  [[release-3-2-8]]
  === TinkerPop 3.2.8 (Release Date: NOT OFFICIALLY RELEASED YET)
  
+ * Added `checkAdjacentVertices` option to `SubgraphStrategy`.
  * Modified `GremlinDslProcessor` so that it generated the 
`getAnonymousTraversalClass()` method to return the DSL version of `__`.
  * Added the "Kitchen Sink" test data set.
 +* Added `idleConnectionTimeout` and `keepAliveInterval` to Gremlin Server 
that enables a "ping" and auto-close for seemingly dead clients.
  * 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.

[1/3] tinkerpop git commit: TINKERPOP-1586 Added checkAdjacentVertices option to SubgraphStrategy

2018-02-28 Thread spmallette

Repository: tinkerpop
Updated Branches:
  refs/heads/tp33 032124a50 -> e1d7f80ba


TINKERPOP-1586 Added checkAdjacentVertices option to SubgraphStrategy

This change allows the user to turn off an aspect of SubgraphStrategy that 
prevents it from working properly in OLAP situations.


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/d1121544
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/d1121544
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/d1121544

Branch: refs/heads/tp33
Commit: d1121544017acf1189f0270f60b5f1f402fec0ea
Parents: bcffaad
Author: Stephen Mallette 
Authored: Thu Feb 15 16:22:58 2018 -0500
Committer: Stephen Mallette 
Committed: Thu Feb 15 16:24:54 2018 -0500

--
 CHANGELOG.asciidoc  |  1 +
 .../strategy/decoration/SubgraphStrategy.java   | 58 ++
 .../decoration/SubgraphStrategyProcessTest.java | 84 
 3 files changed, 127 insertions(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d1121544/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index f1519b6..1701342 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -23,6 +23,7 @@ 
image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
 [[release-3-2-8]]
 === TinkerPop 3.2.8 (Release Date: NOT OFFICIALLY RELEASED YET)
 
+* Added `checkAdjacentVertices` option to `SubgraphStrategy`.
 * Modified `GremlinDslProcessor` so that it generated the 
`getAnonymousTraversalClass()` method to return the DSL version of `__`.
 * Added the "Kitchen Sink" test data set.
 * Fixed a bug in `NumberHelper` that led to wrong min/max results if numbers 
exceeded the Integer limits.

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d1121544/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 4747cd4..e0d260f 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
@@ -82,13 +82,14 @@ public final class SubgraphStrategy extends 
AbstractTraversalStrategy vertexCriterion, final 
Traversal edgeCriterion, final Traversal 
vertexPropertyCriterion) {
+private SubgraphStrategy(final Builder builder) {
 
-this.vertexCriterion = null == vertexCriterion ? null : 
vertexCriterion.asAdmin().clone();
+this.vertexCriterion = null == builder.vertexCriterion ? null : 
builder.vertexCriterion.asAdmin().clone();
 
-// if there is no vertex predicate there is no need to test either 
side of the edge
-if (null == this.vertexCriterion) {
-this.edgeCriterion = null == edgeCriterion ? null : 
edgeCriterion.asAdmin().clone();
+// if there is no vertex predicate there is no need to test either 
side of the edge - also this option can
+// be simply configured in the builder to not be used
+if (null == this.vertexCriterion || !builder.checkAdjacentVertices) {
+this.edgeCriterion = null == builder.edgeCriterion ? null : 
builder.edgeCriterion.asAdmin().clone();
 } else {
 final Traversal.Admin vertexPredicate;
 vertexPredicate = __.and(
@@ -97,12 +98,12 @@ public final class SubgraphStrategy extends 
AbstractTraversalStrategy(edgeCriterion.asAdmin(), vertexPredicate));
+builder.edgeCriterion.asAdmin().clone().addStep(new 
TraversalFilterStep<>(builder.edgeCriterion.asAdmin(), vertexPredicate));
 }
 
-this.vertexPropertyCriterion = null == vertexPropertyCriterion ? null 
: vertexPropertyCriterion.asAdmin().clone();
+this.vertexPropertyCriterion = null == builder.vertexPropertyCriterion 
? null : builder.vertexPropertyCriterion.asAdmin().clone();
 
 if (null != this.vertexCriterion)
 TraversalHelper.applyTraversalRecursively(t -> 
t.getStartStep().addLabel(MARKER), this.vertexCriterion);
@@ -316,25 +317,50 @@ public final class SubgraphStrategy extends 
AbstractTraversalStrategy vertexPredicate = null;
-private Traversal edgePredicate = null;
-private Traversal

[4/4] tinkerpop git commit: Merge branch 'tp33'

2018-02-28 Thread spmallette

Merge branch 'tp33'


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/773d5101
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/773d5101
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/773d5101

Branch: refs/heads/master
Commit: 773d5101400af98394728677f6a216ebad7088c8
Parents: a418226 e1d7f80
Author: Stephen Mallette 
Authored: Wed Feb 28 15:40:44 2018 -0500
Committer: Stephen Mallette 
Committed: Wed Feb 28 15:40:44 2018 -0500

--
 CHANGELOG.asciidoc  |  1 +
 .../strategy/decoration/SubgraphStrategy.java   | 58 ++
 .../decoration/SubgraphStrategyProcessTest.java | 84 
 3 files changed, 127 insertions(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/773d5101/CHANGELOG.asciidoc
--

[3/3] tinkerpop git commit: Merge branch 'tp32' into tp33

2018-02-28 Thread spmallette

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/e1d7f80b
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/e1d7f80b
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/e1d7f80b

Branch: refs/heads/tp33
Commit: e1d7f80ba01b7ad186f23979d98c69cb559a24c1
Parents: 032124a d520516
Author: Stephen Mallette 
Authored: Wed Feb 28 15:40:37 2018 -0500
Committer: Stephen Mallette 
Committed: Wed Feb 28 15:40:37 2018 -0500

--
 CHANGELOG.asciidoc  |  1 +
 .../strategy/decoration/SubgraphStrategy.java   | 58 ++
 .../decoration/SubgraphStrategyProcessTest.java | 84 
 3 files changed, 127 insertions(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e1d7f80b/CHANGELOG.asciidoc
--

[1/4] tinkerpop git commit: TINKERPOP-1586 Added checkAdjacentVertices option to SubgraphStrategy

2018-02-28 Thread spmallette

Repository: tinkerpop
Updated Branches:
  refs/heads/master a41822657 -> 773d51014


TINKERPOP-1586 Added checkAdjacentVertices option to SubgraphStrategy

This change allows the user to turn off an aspect of SubgraphStrategy that 
prevents it from working properly in OLAP situations.


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/d1121544
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/d1121544
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/d1121544

Branch: refs/heads/master
Commit: d1121544017acf1189f0270f60b5f1f402fec0ea
Parents: bcffaad
Author: Stephen Mallette 
Authored: Thu Feb 15 16:22:58 2018 -0500
Committer: Stephen Mallette 
Committed: Thu Feb 15 16:24:54 2018 -0500

--
 CHANGELOG.asciidoc  |  1 +
 .../strategy/decoration/SubgraphStrategy.java   | 58 ++
 .../decoration/SubgraphStrategyProcessTest.java | 84 
 3 files changed, 127 insertions(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d1121544/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index f1519b6..1701342 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -23,6 +23,7 @@ 
image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
 [[release-3-2-8]]
 === TinkerPop 3.2.8 (Release Date: NOT OFFICIALLY RELEASED YET)
 
+* Added `checkAdjacentVertices` option to `SubgraphStrategy`.
 * Modified `GremlinDslProcessor` so that it generated the 
`getAnonymousTraversalClass()` method to return the DSL version of `__`.
 * Added the "Kitchen Sink" test data set.
 * Fixed a bug in `NumberHelper` that led to wrong min/max results if numbers 
exceeded the Integer limits.

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d1121544/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 4747cd4..e0d260f 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
@@ -82,13 +82,14 @@ public final class SubgraphStrategy extends 
AbstractTraversalStrategy vertexCriterion, final 
Traversal edgeCriterion, final Traversal 
vertexPropertyCriterion) {
+private SubgraphStrategy(final Builder builder) {
 
-this.vertexCriterion = null == vertexCriterion ? null : 
vertexCriterion.asAdmin().clone();
+this.vertexCriterion = null == builder.vertexCriterion ? null : 
builder.vertexCriterion.asAdmin().clone();
 
-// if there is no vertex predicate there is no need to test either 
side of the edge
-if (null == this.vertexCriterion) {
-this.edgeCriterion = null == edgeCriterion ? null : 
edgeCriterion.asAdmin().clone();
+// if there is no vertex predicate there is no need to test either 
side of the edge - also this option can
+// be simply configured in the builder to not be used
+if (null == this.vertexCriterion || !builder.checkAdjacentVertices) {
+this.edgeCriterion = null == builder.edgeCriterion ? null : 
builder.edgeCriterion.asAdmin().clone();
 } else {
 final Traversal.Admin vertexPredicate;
 vertexPredicate = __.and(
@@ -97,12 +98,12 @@ public final class SubgraphStrategy extends 
AbstractTraversalStrategy(edgeCriterion.asAdmin(), vertexPredicate));
+builder.edgeCriterion.asAdmin().clone().addStep(new 
TraversalFilterStep<>(builder.edgeCriterion.asAdmin(), vertexPredicate));
 }
 
-this.vertexPropertyCriterion = null == vertexPropertyCriterion ? null 
: vertexPropertyCriterion.asAdmin().clone();
+this.vertexPropertyCriterion = null == builder.vertexPropertyCriterion 
? null : builder.vertexPropertyCriterion.asAdmin().clone();
 
 if (null != this.vertexCriterion)
 TraversalHelper.applyTraversalRecursively(t -> 
t.getStartStep().addLabel(MARKER), this.vertexCriterion);
@@ -316,25 +317,50 @@ public final class SubgraphStrategy extends 
AbstractTraversalStrategy vertexPredicate = null;
-private Traversal edgePredicate = null;
-private Traversal

[3/4] tinkerpop git commit: Merge branch 'tp32' into tp33

2018-02-28 Thread spmallette

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/e1d7f80b
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/e1d7f80b
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/e1d7f80b

Branch: refs/heads/master
Commit: e1d7f80ba01b7ad186f23979d98c69cb559a24c1
Parents: 032124a d520516
Author: Stephen Mallette 
Authored: Wed Feb 28 15:40:37 2018 -0500
Committer: Stephen Mallette 
Committed: Wed Feb 28 15:40:37 2018 -0500

--
 CHANGELOG.asciidoc  |  1 +
 .../strategy/decoration/SubgraphStrategy.java   | 58 ++
 .../decoration/SubgraphStrategyProcessTest.java | 84 
 3 files changed, 127 insertions(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e1d7f80b/CHANGELOG.asciidoc
--

tinkerpop git commit: Updated gremlin console location to 3.4.0-SNAPSHOT CTR

2018-02-28 Thread spmallette

Repository: tinkerpop
Updated Branches:
  refs/heads/master df3e83419 -> a41822657


Updated gremlin console location to 3.4.0-SNAPSHOT CTR


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/a4182265
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/a4182265
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/a4182265

Branch: refs/heads/master
Commit: a418226574f85d3289807f8bae5d28adc2114895
Parents: df3e834
Author: Stephen Mallette 
Authored: Wed Feb 28 15:33:08 2018 -0500
Committer: Stephen Mallette 
Committed: Wed Feb 28 15:33:08 2018 -0500

--
 gremlin-console/bin/gremlin.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a4182265/gremlin-console/bin/gremlin.sh
--
diff --git a/gremlin-console/bin/gremlin.sh b/gremlin-console/bin/gremlin.sh
index 0a92aa1..197a398 12
--- a/gremlin-console/bin/gremlin.sh
+++ b/gremlin-console/bin/gremlin.sh
@@ -1 +1 @@
-../target/apache-tinkerpop-gremlin-console-3.3.2-SNAPSHOT-standalone/bin/gremlin.sh
\ No newline at end of file
+../target/apache-tinkerpop-gremlin-console-3.4.0-SNAPSHOT-standalone/bin/gremlin.sh
\ No newline at end of file

[2/3] tinkerpop git commit: Merge branch 'tp32' into tp33

2018-02-28 Thread spmallette

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/032124a5
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/032124a5
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/032124a5

Branch: refs/heads/master
Commit: 032124a504c3d324708d96c1d4b52e8ed2b22346
Parents: 69a355f 3aa9e70
Author: Stephen Mallette 
Authored: Wed Feb 28 14:15:22 2018 -0500
Committer: Stephen Mallette 
Committed: Wed Feb 28 14:15:22 2018 -0500

--
 docs/src/index.asciidoc |   3 +
 .../tutorials/gremlins-anatomy/index.asciidoc   | 189 +++
 docs/static/images/gremlin-anatomy-filter.png   | Bin 0 -> 168854 bytes
 docs/static/images/gremlin-anatomy-group.png| Bin 0 -> 62410 bytes
 docs/static/images/gremlin-anatomy-navigate.png | Bin 0 -> 60514 bytes
 docs/static/images/gremlin-anatomy.png  | Bin 0 -> 87212 bytes
 pom.xml |  23 +++
 7 files changed, 215 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/032124a5/pom.xml
--

tinkerpop git commit: Added Gremlin's Anatomy tutorial

2018-02-28 Thread spmallette

Repository: tinkerpop
Updated Branches:
  refs/heads/tp32 1a857da8a -> 3aa9e70ef


Added Gremlin's Anatomy tutorial

I might add more to this, but wanted the basic component parts of Gremlin 
documented. Seemed best to make this part of a standalone document as it didn't 
quite fit that well in the reference documentation, as it already has a way of 
introducing those topics and I didn't want to disturb that too much. CTR


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/3aa9e70e
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/3aa9e70e
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/3aa9e70e

Branch: refs/heads/tp32
Commit: 3aa9e70ef7e50d81886954e398b4355524f7b576
Parents: 1a857da
Author: Stephen Mallette 
Authored: Wed Feb 28 14:14:01 2018 -0500
Committer: Stephen Mallette 
Committed: Wed Feb 28 14:14:01 2018 -0500

--
 docs/src/index.asciidoc |   3 +
 .../tutorials/gremlins-anatomy/index.asciidoc   | 189 +++
 docs/static/images/gremlin-anatomy-filter.png   | Bin 0 -> 168854 bytes
 docs/static/images/gremlin-anatomy-group.png| Bin 0 -> 62410 bytes
 docs/static/images/gremlin-anatomy-navigate.png | Bin 0 -> 60514 bytes
 docs/static/images/gremlin-anatomy.png  | Bin 0 -> 87212 bytes
 pom.xml |  23 +++
 7 files changed, 215 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3aa9e70e/docs/src/index.asciidoc
--
diff --git a/docs/src/index.asciidoc b/docs/src/index.asciidoc
index 40fbb8c..5cc3dd5 100644
--- a/docs/src/index.asciidoc
+++ b/docs/src/index.asciidoc
@@ -57,6 +57,8 @@ Note the "+" following the link in each table entry - it 
forces an asciidoc line
 A gentle introduction to TinkerPop and the Gremlin traversal language that is 
divided into five, ten and fifteen minute tutorial blocks.
 |image:gremlin-dashboard.png[] 
|link:http://tinkerpop.apache.org/docs/x.y.z/tutorials/the-gremlin-console/[The 
Gremlin Console] +
 Provides a detailed look at The Gremlin Console and how it can be used when 
working with TinkerPop.
+^|image:gremlin-anatomy.png[width=125] 
|link:http://tinkerpop.apache.org/docs/x.y.z/gremlins-anatomy/[Gremlin's 
Anatomy]
+Identifies and explains the component parts of a Gremlin traversal.
 ^|image:gremlin-chef.png[width=125] 
|link:http://tinkerpop.apache.org/docs/x.y.z/recipes/[Gremlin Recipes]
 A collection of best practices and common traversal patterns for Gremlin.
 ^|image:gremlin-house-of-mirrors-cropped.png[width=200] 
|link:http://tinkerpop.apache.org/docs/x.y.z/tutorials/gremlin-language-variants/[Gremlin
 Language Variants]
@@ -77,6 +79,7 @@ A getting started guide for users of graph databases and the 
Gremlin query langu
 
 Unless otherwise noted, all "publications" are externally managed:
 
+* Mallette, S.P., 
link:https://www.slideshare.net/StephenMallette/gremlins-anatomy-88713465["Gremlin's
 Anatomy,"] DataStax User Group, February 2018.
 * Rodriguez, M.A., 
link:https://www.slideshare.net/slidarko/gremlin-1013-on-your-fm-dial["Gremlin 
101.3 On Your FM Dial,"] DataStax Support and Engineering Summits, Carmel 
California and Las Vegas Nevada, May 2017.
 * Rodriguez, M.A., 
link:https://www.datastax.com/2017/03/graphoendodonticology["Graphoendodonticology,;]
 DataStax Engineering Blog, March 2017
 * Rodriguez, M.A., 
link:http://www.datastax.com/dev/blog/gremlins-time-machine["Gremlin's Time 
Machine,"] DataStax Engineering Blog, September 2016.

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3aa9e70e/docs/src/tutorials/gremlins-anatomy/index.asciidoc
--
diff --git a/docs/src/tutorials/gremlins-anatomy/index.asciidoc 
b/docs/src/tutorials/gremlins-anatomy/index.asciidoc
new file mode 100644
index 000..b36d881
--- /dev/null
+++ b/docs/src/tutorials/gremlins-anatomy/index.asciidoc
@@ -0,0 +1,189 @@
+
+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

[2/2] tinkerpop git commit: Merge branch 'tp32' into tp33

2018-02-28 Thread spmallette

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/032124a5
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/032124a5
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/032124a5

Branch: refs/heads/tp33
Commit: 032124a504c3d324708d96c1d4b52e8ed2b22346
Parents: 69a355f 3aa9e70
Author: Stephen Mallette 
Authored: Wed Feb 28 14:15:22 2018 -0500
Committer: Stephen Mallette 
Committed: Wed Feb 28 14:15:22 2018 -0500

--
 docs/src/index.asciidoc |   3 +
 .../tutorials/gremlins-anatomy/index.asciidoc   | 189 +++
 docs/static/images/gremlin-anatomy-filter.png   | Bin 0 -> 168854 bytes
 docs/static/images/gremlin-anatomy-group.png| Bin 0 -> 62410 bytes
 docs/static/images/gremlin-anatomy-navigate.png | Bin 0 -> 60514 bytes
 docs/static/images/gremlin-anatomy.png  | Bin 0 -> 87212 bytes
 pom.xml |  23 +++
 7 files changed, 215 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/032124a5/pom.xml
--

[1/3] tinkerpop git commit: Added Gremlin's Anatomy tutorial

2018-02-28 Thread spmallette

Repository: tinkerpop
Updated Branches:
  refs/heads/master 05c1c0472 -> df3e83419


Added Gremlin's Anatomy tutorial

I might add more to this, but wanted the basic component parts of Gremlin 
documented. Seemed best to make this part of a standalone document as it didn't 
quite fit that well in the reference documentation, as it already has a way of 
introducing those topics and I didn't want to disturb that too much. CTR


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/3aa9e70e
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/3aa9e70e
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/3aa9e70e

Branch: refs/heads/master
Commit: 3aa9e70ef7e50d81886954e398b4355524f7b576
Parents: 1a857da
Author: Stephen Mallette 
Authored: Wed Feb 28 14:14:01 2018 -0500
Committer: Stephen Mallette 
Committed: Wed Feb 28 14:14:01 2018 -0500

--
 docs/src/index.asciidoc |   3 +
 .../tutorials/gremlins-anatomy/index.asciidoc   | 189 +++
 docs/static/images/gremlin-anatomy-filter.png   | Bin 0 -> 168854 bytes
 docs/static/images/gremlin-anatomy-group.png| Bin 0 -> 62410 bytes
 docs/static/images/gremlin-anatomy-navigate.png | Bin 0 -> 60514 bytes
 docs/static/images/gremlin-anatomy.png  | Bin 0 -> 87212 bytes
 pom.xml |  23 +++
 7 files changed, 215 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3aa9e70e/docs/src/index.asciidoc
--
diff --git a/docs/src/index.asciidoc b/docs/src/index.asciidoc
index 40fbb8c..5cc3dd5 100644
--- a/docs/src/index.asciidoc
+++ b/docs/src/index.asciidoc
@@ -57,6 +57,8 @@ Note the "+" following the link in each table entry - it 
forces an asciidoc line
 A gentle introduction to TinkerPop and the Gremlin traversal language that is 
divided into five, ten and fifteen minute tutorial blocks.
 |image:gremlin-dashboard.png[] 
|link:http://tinkerpop.apache.org/docs/x.y.z/tutorials/the-gremlin-console/[The 
Gremlin Console] +
 Provides a detailed look at The Gremlin Console and how it can be used when 
working with TinkerPop.
+^|image:gremlin-anatomy.png[width=125] 
|link:http://tinkerpop.apache.org/docs/x.y.z/gremlins-anatomy/[Gremlin's 
Anatomy]
+Identifies and explains the component parts of a Gremlin traversal.
 ^|image:gremlin-chef.png[width=125] 
|link:http://tinkerpop.apache.org/docs/x.y.z/recipes/[Gremlin Recipes]
 A collection of best practices and common traversal patterns for Gremlin.
 ^|image:gremlin-house-of-mirrors-cropped.png[width=200] 
|link:http://tinkerpop.apache.org/docs/x.y.z/tutorials/gremlin-language-variants/[Gremlin
 Language Variants]
@@ -77,6 +79,7 @@ A getting started guide for users of graph databases and the 
Gremlin query langu
 
 Unless otherwise noted, all "publications" are externally managed:
 
+* Mallette, S.P., 
link:https://www.slideshare.net/StephenMallette/gremlins-anatomy-88713465["Gremlin's
 Anatomy,"] DataStax User Group, February 2018.
 * Rodriguez, M.A., 
link:https://www.slideshare.net/slidarko/gremlin-1013-on-your-fm-dial["Gremlin 
101.3 On Your FM Dial,"] DataStax Support and Engineering Summits, Carmel 
California and Las Vegas Nevada, May 2017.
 * Rodriguez, M.A., 
link:https://www.datastax.com/2017/03/graphoendodonticology["Graphoendodonticology,;]
 DataStax Engineering Blog, March 2017
 * Rodriguez, M.A., 
link:http://www.datastax.com/dev/blog/gremlins-time-machine["Gremlin's Time 
Machine,"] DataStax Engineering Blog, September 2016.

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3aa9e70e/docs/src/tutorials/gremlins-anatomy/index.asciidoc
--
diff --git a/docs/src/tutorials/gremlins-anatomy/index.asciidoc 
b/docs/src/tutorials/gremlins-anatomy/index.asciidoc
new file mode 100644
index 000..b36d881
--- /dev/null
+++ b/docs/src/tutorials/gremlins-anatomy/index.asciidoc
@@ -0,0 +1,189 @@
+
+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

[3/3] tinkerpop git commit: Merge branch 'tp33'

2018-02-28 Thread spmallette

Merge branch 'tp33'


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/df3e8341
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/df3e8341
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/df3e8341

Branch: refs/heads/master
Commit: df3e834191ec6061ece1dc64a659b4306faaa676
Parents: 05c1c04 032124a
Author: Stephen Mallette 
Authored: Wed Feb 28 14:15:31 2018 -0500
Committer: Stephen Mallette 
Committed: Wed Feb 28 14:15:31 2018 -0500

--
 docs/src/index.asciidoc |   3 +
 .../tutorials/gremlins-anatomy/index.asciidoc   | 189 +++
 docs/static/images/gremlin-anatomy-filter.png   | Bin 0 -> 168854 bytes
 docs/static/images/gremlin-anatomy-group.png| Bin 0 -> 62410 bytes
 docs/static/images/gremlin-anatomy-navigate.png | Bin 0 -> 60514 bytes
 docs/static/images/gremlin-anatomy.png  | Bin 0 -> 87212 bytes
 pom.xml |  23 +++
 7 files changed, 215 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/df3e8341/pom.xml
--

[2/2] tinkerpop git commit: Merge branch 'TINKERPOP-1586' into tp32

[1/2] tinkerpop git commit: TINKERPOP-1586 Added checkAdjacentVertices option to SubgraphStrategy

[2/3] tinkerpop git commit: Merge branch 'TINKERPOP-1586' into tp32

[2/4] tinkerpop git commit: Merge branch 'TINKERPOP-1586' into tp32

[1/3] tinkerpop git commit: TINKERPOP-1586 Added checkAdjacentVertices option to SubgraphStrategy

[4/4] tinkerpop git commit: Merge branch 'tp33'

[3/3] tinkerpop git commit: Merge branch 'tp32' into tp33

[1/4] tinkerpop git commit: TINKERPOP-1586 Added checkAdjacentVertices option to SubgraphStrategy

[3/4] tinkerpop git commit: Merge branch 'tp32' into tp33

tinkerpop git commit: Updated gremlin console location to 3.4.0-SNAPSHOT CTR

[2/3] tinkerpop git commit: Merge branch 'tp32' into tp33

tinkerpop git commit: Added Gremlin's Anatomy tutorial

[2/2] tinkerpop git commit: Merge branch 'tp32' into tp33

[1/3] tinkerpop git commit: Added Gremlin's Anatomy tutorial

[3/3] tinkerpop git commit: Merge branch 'tp33'

15 matches

Site Navigation

Mail list logo

Footer information