You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by dk...@apache.org on 2018/03/02 17:40:55 UTC
[01/30] tinkerpop git commit: TINKERPOP-1586 Added
checkAdjacentVertices option to SubgraphStrategy [Forced Update!]
Repository: tinkerpop
Updated Branches:
refs/heads/TINKERPOP-1777 be3a5db18 -> 087525e24 (forced update)
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/TINKERPOP-1777
Commit: d1121544017acf1189f0270f60b5f1f402fec0ea
Parents: bcffaad
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Feb 15 16:22:58 2018 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
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<TraversalS
private final String MARKER = Graph.Hidden.hide("gremlin.subgraphStrategy");
- private SubgraphStrategy(final Traversal<Vertex, ?> vertexCriterion, final Traversal<Edge, ?> edgeCriterion, final Traversal<VertexProperty, ?> 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<Edge, ?> vertexPredicate;
vertexPredicate = __.<Edge>and(
@@ -97,12 +98,12 @@ public final class SubgraphStrategy extends AbstractTraversalStrategy<TraversalS
// if there is a vertex predicate then there is an implied edge filter on vertices even if there is no
// edge predicate provided by the user.
- this.edgeCriterion = null == edgeCriterion ?
+ this.edgeCriterion = null == builder.edgeCriterion ?
vertexPredicate :
- edgeCriterion.asAdmin().clone().addStep(new TraversalFilterStep<>(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<TraversalS
public final static class Builder {
- private Traversal<Vertex, ?> vertexPredicate = null;
- private Traversal<Edge, ?> edgePredicate = null;
- private Traversal<VertexProperty, ?> vertexPropertyPredicate = null;
+ private Traversal<Vertex, ?> vertexCriterion = null;
+ private Traversal<Edge, ?> edgeCriterion = null;
+ private Traversal<VertexProperty, ?> vertexPropertyCriterion = null;
+ private boolean checkAdjacentVertices = true;
private Builder() {
}
+ /**
+ * Enables the strategy to apply the {@link #vertices(Traversal)} filter to the adjacent vertices of an edge.
+ * If using this strategy for OLAP then this value should be set to {@code false} as checking adjacent vertices
+ * will force the traversal to leave the local star graph (which is not possible in OLAP) and will cause an
+ * error. By default, this value is {@code true}.
+ */
+ public Builder checkAdjacentVertices(final boolean enable) {
+ this.checkAdjacentVertices = enable;
+ return this;
+ }
+
+ /**
+ * The traversal predicate that defines the vertices to include in the subgraph. If
+ * {@link #checkAdjacentVertices(boolean)} is {@code true} then this predicate will also be applied to the
+ * adjacent vertices of edges. Take care when setting this value for OLAP based traversals as the traversal
+ * predicate cannot be written in such a way as to leave the local star graph and can thus only evaluate the
+ * current vertex and its related edges.
+ */
public Builder vertices(final Traversal<Vertex, ?> vertexPredicate) {
- this.vertexPredicate = vertexPredicate;
+ this.vertexCriterion = vertexPredicate;
return this;
}
+ /**
+ * The traversal predicate that defines the edges to include in the subgraph.
+ */
public Builder edges(final Traversal<Edge, ?> edgePredicate) {
- this.edgePredicate = edgePredicate;
+ this.edgeCriterion = edgePredicate;
return this;
}
+ /**
+ * The traversal predicate that defines the vertex properties to include in the subgraph.
+ */
public Builder vertexProperties(final Traversal<VertexProperty, ?> vertexPropertyPredicate) {
- this.vertexPropertyPredicate = vertexPropertyPredicate;
+ this.vertexPropertyCriterion = vertexPropertyPredicate;
return this;
}
@@ -355,9 +381,9 @@ public final class SubgraphStrategy extends AbstractTraversalStrategy<TraversalS
}
public SubgraphStrategy create() {
- if (null == this.vertexPredicate && null == this.edgePredicate && null == this.vertexPropertyPredicate)
+ if (null == this.vertexCriterion && null == this.edgeCriterion && null == this.vertexPropertyCriterion)
throw new IllegalStateException("A subgraph must be filtered by a vertex, edge, or vertex property criterion");
- return new SubgraphStrategy(this.vertexPredicate, this.edgePredicate, this.vertexPropertyPredicate);
+ return new SubgraphStrategy(this);
}
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d1121544/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyProcessTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyProcessTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyProcessTest.java
index ad2501d..2565770 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyProcessTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyProcessTest.java
@@ -252,6 +252,90 @@ public class SubgraphStrategyProcessTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
+ public void shouldFilterMixedCriteriaButNotCheckAdjacentVertices() {
+ final Traversal<Vertex, ?> vertexCriterion = has("name", P.within("josh", "lop", "ripple"));
+
+ // 9 isn't present because marko is not in the vertex list
+ final Traversal<Edge, ?> edgeCriterion = __.or(
+ has("weight", 0.4d).hasLabel("created"), // 11
+ has("weight", 1.0d).hasLabel("created") // 10
+ );
+
+ final SubgraphStrategy strategy = SubgraphStrategy.build().
+ checkAdjacentVertices(false).
+ edges(edgeCriterion).vertices(vertexCriterion).create();
+ final GraphTraversalSource sg = g.withStrategies(strategy);
+
+ // three vertices are included in the subgraph
+ assertEquals(6, g.V().count().next().longValue());
+ assertEquals(3, sg.V().count().next().longValue());
+
+ // three edges are explicitly included as we ignore checking of adjacent vertices
+ assertEquals(6, g.E().count().next().longValue());
+ assertEquals(3, sg.E().count().next().longValue());
+
+ // from vertex
+
+ assertEquals(2, g.V(convertToVertexId("josh")).outE().count().next().longValue());
+ assertEquals(2, sg.V(convertToVertexId("josh")).outE().count().next().longValue());
+ assertEquals(2, g.V(convertToVertexId("josh")).out().count().next().longValue());
+ assertEquals(2, sg.V(convertToVertexId("josh")).out().count().next().longValue());
+
+ assertEquals(1, g.V(convertToVertexId("josh")).inE().count().next().longValue());
+ assertEquals(0, sg.V(convertToVertexId("josh")).inE().count().next().longValue());
+ assertEquals(1, g.V(convertToVertexId("josh")).in().count().next().longValue());
+ assertEquals(0, sg.V(convertToVertexId("josh")).in().count().next().longValue());
+
+ assertEquals(3, g.V(convertToVertexId("josh")).bothE().count().next().longValue());
+ assertEquals(2, sg.V(convertToVertexId("josh")).bothE().count().next().longValue());
+ assertEquals(3, g.V(convertToVertexId("josh")).both().count().next().longValue());
+ assertEquals(2, sg.V(convertToVertexId("josh")).both().count().next().longValue());
+
+ // marko not present directly because of vertexCriterion - only accessible via vertices in the subgraph
+ assertEquals(1, g.V(convertToVertexId("marko")).count().next().longValue());
+ assertEquals(0, sg.V(convertToVertexId("marko")).count().next().longValue());
+
+ // with label
+
+ assertEquals(2, g.V(convertToVertexId("josh")).outE("created").count().next().longValue());
+ assertEquals(2, sg.V(convertToVertexId("josh")).outE("created").count().next().longValue());
+ assertEquals(2, g.V(convertToVertexId("josh")).out("created").count().next().longValue());
+ assertEquals(2, sg.V(convertToVertexId("josh")).out("created").count().next().longValue());
+ assertEquals(2, g.V(convertToVertexId("josh")).bothE("created").count().next().longValue());
+ assertEquals(2, sg.V(convertToVertexId("josh")).bothE("created").count().next().longValue());
+ assertEquals(2, g.V(convertToVertexId("josh")).both("created").count().next().longValue());
+ assertEquals(2, sg.V(convertToVertexId("josh")).both("created").count().next().longValue());
+
+ assertEquals(1, g.V(convertToVertexId("josh")).inE("knows").count().next().longValue());
+ assertEquals(0, sg.V(convertToVertexId("josh")).inE("knows").count().next().longValue());
+ assertEquals(1, g.V(convertToVertexId("josh")).in("knows").count().next().longValue());
+ assertEquals(0, sg.V(convertToVertexId("josh")).in("knows").count().next().longValue());
+ assertEquals(1, g.V(convertToVertexId("josh")).bothE("knows").count().next().longValue());
+ assertEquals(0, sg.V(convertToVertexId("josh")).bothE("knows").count().next().longValue());
+ assertEquals(1, g.V(convertToVertexId("josh")).both("knows").count().next().longValue());
+ assertEquals(0, sg.V(convertToVertexId("josh")).both("knows").count().next().longValue());
+
+ // with branch factor
+
+ assertEquals(1, g.V(convertToVertexId("josh")).local(bothE().limit(1)).count().next().longValue());
+ assertEquals(1, sg.V(convertToVertexId("josh")).local(bothE().limit(1)).count().next().longValue());
+ assertEquals(1, g.V(convertToVertexId("josh")).local(bothE().limit(1)).inV().count().next().longValue());
+ assertEquals(1, sg.V(convertToVertexId("josh")).local(bothE().limit(1)).inV().count().next().longValue());
+ assertEquals(1, g.V(convertToVertexId("josh")).local(bothE("knows", "created").limit(1)).count().next().longValue());
+ assertEquals(1, sg.V(convertToVertexId("josh")).local(bothE("knows", "created").limit(1)).count().next().longValue());
+ assertEquals(1, g.V(convertToVertexId("josh")).local(bothE("knows", "created").limit(1)).inV().count().next().longValue());
+ assertEquals(1, sg.V(convertToVertexId("josh")).local(bothE("knows", "created").limit(1)).inV().count().next().longValue());
+
+ // from edge
+
+ // marko is not accessible from the edge
+ assertEquals(2, g.E(convertToEdgeId("marko", "created", "lop")).bothV().count().next().longValue());
+ assertEquals(1, sg.E(convertToEdgeId("marko", "created", "lop")).bothV().count().next().longValue());
+ }
+
+
+ @Test
+ @LoadGraphWith(MODERN)
public void shouldFilterMixedCriteria() throws Exception {
final Traversal<Vertex, ?> vertexCriterion = has("name", P.within("josh", "lop", "ripple"));
[14/30] tinkerpop git commit: Fixed typing in GLV tests that were
failing for .NET CTR
Posted by dk...@apache.org.
Fixed typing in GLV tests that were failing for .NET CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/eab4bce6
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/eab4bce6
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/eab4bce6
Branch: refs/heads/TINKERPOP-1777
Commit: eab4bce69d113adc766f141eb5adcba006ee6398
Parents: 85b7338
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Mar 1 09:32:34 2018 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Mar 1 09:32:34 2018 -0500
----------------------------------------------------------------------
.../test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs | 2 --
gremlin-test/features/sideEffect/Sack.feature | 2 +-
2 files changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/eab4bce6/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 7fa9716..0685d89 100644
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
@@ -40,9 +40,7 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
private static readonly IDictionary<string, IgnoreReason> IgnoredScenarios = new Dictionary<string, IgnoreReason> {
{ "g_V_hasLabelXpersonX_hasXage_notXlteX10X_andXnotXbetweenX11_20XXXX_andXltX29X_orXeqX35XXXX_name", IgnoreReason.NeedsFurtherInvestigation }, // TINKERPOP-1859??
{ "g_VX1X_out_aggregateXxX_out_whereXnotXwithinXaXXX", IgnoreReason.NeedsFurtherInvestigation }, // TINKERPOP-1859??
- { "g_withBulkXfalseX_withSackX1_sumX_VX1X_localXoutEXknowsX_barrierXnormSackX_inVX_inXknowsX_barrier_sack", IgnoreReason.NeedsFurtherInvestigation },
{ "g_withBulkXfalseX_withSackX1_sumX_V_out_barrier_sack", IgnoreReason.NeedsFurtherInvestigation },
- { "g_withSackX1_sumX_VX1X_localXoutXknowsX_barrierXnormSackXX_inXknowsX_barrier_sack", IgnoreReason.NeedsFurtherInvestigation },
{ "g_V_hasXname_markoX_propertyXfriendWeight_outEXknowsX_weight_sum__acl_privateX", IgnoreReason.NeedsFurtherInvestigation },
{ "g_V_outE_weight_groupCount_unfold_selectXkeysX_unfold", IgnoreReason.NeedsFurtherInvestigation },
{ "g_V_outE_weight_groupCount_selectXkeysX_unfold", IgnoreReason.NeedsFurtherInvestigation },
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/eab4bce6/gremlin-test/features/sideEffect/Sack.feature
----------------------------------------------------------------------
diff --git a/gremlin-test/features/sideEffect/Sack.feature b/gremlin-test/features/sideEffect/Sack.feature
index f5baf64..89e3946 100644
--- a/gremlin-test/features/sideEffect/Sack.feature
+++ b/gremlin-test/features/sideEffect/Sack.feature
@@ -80,7 +80,7 @@ Feature: Step - sack()
When iterated to list
Then the result should be unordered
| result |
- | d[1.0].d |
+ | d[1.0].m |
Scenario: g_withBulkXfalseX_withSackX1_sumX_V_out_barrier_sack
Given the modern graph
[24/30] tinkerpop git commit: CTR: Minor change in the doc generation
process. In case of an error,
we'll now see the last 10 lines first and after a short 5 second break the
errornous file will be opened for full inspection. This should make i
Posted by dk...@apache.org.
CTR: Minor change in the doc generation process. In case of an error, we'll now
see the last 10 lines first and after a short 5 second break the errornous
file will be opened for full inspection. This should make it much easier to
identify errors that are not obvious in the output of the last 10 lines.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/aaf51464
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/aaf51464
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/aaf51464
Branch: refs/heads/TINKERPOP-1777
Commit: aaf51464d91e481f9bd943e9d21303122f8ca981
Parents: 8ef717f
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Thu Mar 1 09:15:48 2018 -0700
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Thu Mar 1 09:15:48 2018 -0700
----------------------------------------------------------------------
docs/preprocessor/preprocess-file.sh | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/aaf51464/docs/preprocessor/preprocess-file.sh
----------------------------------------------------------------------
diff --git a/docs/preprocessor/preprocess-file.sh b/docs/preprocessor/preprocess-file.sh
index 0ca534a..d5076f1 100755
--- a/docs/preprocessor/preprocess-file.sh
+++ b/docs/preprocessor/preprocess-file.sh
@@ -76,6 +76,9 @@ function cleanup {
echo -e "\n\e[1mLast 10 lines of ${output}:\e[0m\n"
tail -n10 ${output}
echo
+ echo "Opening ${output} for full inspection"
+ sleep 5
+ less ${output}
fi
fi
rm -rf ${output} ${CONSOLE_HOME}/.ext
[16/30] tinkerpop git commit: Fixed some types in GLV tests that were
failing for .NET CTR
Posted by dk...@apache.org.
Fixed some types in GLV tests that were failing for .NET CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/bbc96eea
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/bbc96eea
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/bbc96eea
Branch: refs/heads/TINKERPOP-1777
Commit: bbc96eeaf41e97ec0fecc1e7a36da824e9654015
Parents: 2ddf2e3
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Mar 1 10:07:33 2018 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Mar 1 10:07:33 2018 -0500
----------------------------------------------------------------------
.../Gherkin/GherkinTestRunner.cs | 4 +---
gremlin-test/features/map/Order.feature | 16 ++++++++--------
2 files changed, 9 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/bbc96eea/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 a8c25ec..3b39cd3 100644
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
@@ -43,9 +43,7 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
{ "g_withBulkXfalseX_withSackX1_sumX_V_out_barrier_sack", IgnoreReason.NeedsFurtherInvestigation },
{ "g_V_hasXname_markoX_propertyXfriendWeight_outEXknowsX_weight_sum__acl_privateX", IgnoreReason.NeedsFurtherInvestigation },
{ "g_V_outE_weight_groupCount_unfold_selectXkeysX_unfold", IgnoreReason.NeedsFurtherInvestigation },
- { "g_V_outE_weight_groupCount_selectXkeysX_unfold", IgnoreReason.NeedsFurtherInvestigation },
- { "g_V_hasLabelXpersonX_group_byXnameX_byXoutE_weight_sumX_orderXlocalX_byXvaluesX", IgnoreReason.NeedsFurtherInvestigation },
- { "g_V_hasLabelXpersonX_group_byXnameX_byXoutE_weight_sumX_unfold_order_byXvalues_decrX", IgnoreReason.NeedsFurtherInvestigation }
+ { "g_V_outE_weight_groupCount_selectXkeysX_unfold", IgnoreReason.NeedsFurtherInvestigation }
};
private static class Keywords
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/bbc96eea/gremlin-test/features/map/Order.feature
----------------------------------------------------------------------
diff --git a/gremlin-test/features/map/Order.feature b/gremlin-test/features/map/Order.feature
index e7ff00c..6dd8ac4 100644
--- a/gremlin-test/features/map/Order.feature
+++ b/gremlin-test/features/map/Order.feature
@@ -192,7 +192,7 @@ Feature: Step - order()
When iterated to list
Then the result should be ordered
| result |
- | m[{"vadas":"d[0].d","peter":"d[0.2].d","josh":"d[1.4].d","marko":"d[1.9].d"}] |
+ | m[{"vadas":"d[0].i","peter":"d[0.2].d","josh":"d[1.4].d","marko":"d[1.9].d"}] |
Scenario: g_V_localXbothE_weight_foldX_order_byXsumXlocalX_decrX
Given the modern graph
@@ -203,12 +203,12 @@ Feature: Step - order()
When iterated to list
Then the result should be ordered
| result |
- | l[d[1.0].f,d[0.4].f,d[1.0].f] |
- | l[d[0.4].f,d[0.5].f,d[1.0].f] |
- | l[d[0.4].f,d[0.4].f,d[0.2].f] |
- | l[d[1.0].f] |
- | l[d[0.5].f] |
- | l[d[0.2].f] |
+ | l[d[1.0].d,d[0.4].d,d[1.0].d] |
+ | l[d[0.4].d,d[0.5].d,d[1.0].d] |
+ | l[d[0.4].d,d[0.4].d,d[0.2].d] |
+ | l[d[1.0].d] |
+ | l[d[0.5].d] |
+ | l[d[0.2].d] |
Scenario: g_V_group_byXlabelX_byXname_order_byXdecrX_foldX
Given the modern graph
@@ -233,7 +233,7 @@ Feature: Step - order()
| m[{"marko":"d[1.9].d"}] |
| m[{"josh":"d[1.4].d"}] |
| m[{"peter":"d[0.2].d"}] |
- | m[{"vadas":"d[0].d"}] |
+ | m[{"vadas":"d[0].i"}] |
Scenario: g_V_asXvX_mapXbothE_weight_foldX_sumXlocalX_asXsX_selectXv_sX_order_byXselectXsX_decrX
Given the modern graph
[23/30] tinkerpop git commit: Merge branch 'tp33'
Posted by dk...@apache.org.
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/b31e27d0
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/b31e27d0
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/b31e27d0
Branch: refs/heads/TINKERPOP-1777
Commit: b31e27d047878462e2f99c2bfb8ca814f4a60548
Parents: c722cda 532a5de
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Mar 1 10:37:46 2018 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Mar 1 10:37:46 2018 -0500
----------------------------------------------------------------------
.../Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[05/30] tinkerpop git commit: Updated gremlin console location to
3.4.0-SNAPSHOT CTR
Posted by dk...@apache.org.
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/TINKERPOP-1777
Commit: a418226574f85d3289807f8bae5d28adc2114895
Parents: df3e834
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Feb 28 15:33:08 2018 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
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 120000
--- 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
[13/30] tinkerpop git commit: Removed more ignored GLV tests for .NET
Posted by dk...@apache.org.
Removed more ignored GLV tests for .NET
Not sure why these suddenly pass. Makes me wonder if they were ever really failing in the first place. CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/85b73387
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/85b73387
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/85b73387
Branch: refs/heads/TINKERPOP-1777
Commit: 85b733879abd7836f400ecff969eaee0a5b517f2
Parents: 2c96d42
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Mar 1 09:06:26 2018 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Mar 1 09:07:01 2018 -0500
----------------------------------------------------------------------
.../Gherkin/GherkinTestRunner.cs | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/85b73387/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 402a910..7fa9716 100644
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
@@ -38,12 +38,8 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
public class GherkinTestRunner
{
private static readonly IDictionary<string, IgnoreReason> IgnoredScenarios = new Dictionary<string, IgnoreReason> {
- { "g_V_hasLabelXpersonX_hasXage_notXlteX10X_andXnotXbetweenX11_20XXXX_andXltX29X_orXeqX35XXXX_name", IgnoreReason.NeedsFurtherInvestigation },
- { "g_VX1X_out_aggregateXxX_out_whereXnotXwithinXaXXX", IgnoreReason.NeedsFurtherInvestigation },
- { "g_V_asXaX_out_asXbX_whereXandXasXaX_outXknowsX_asXbX__orXasXbX_outXcreatedX_hasXname_rippleX__asXbX_inXknowsX_count_isXnotXeqX0XXXXX_selectXa_bX", IgnoreReason.NeedsFurtherInvestigation },
- { "g_V_asXaX_outXcreatedX_asXbX_inXcreatedX_asXcX_bothXknowsX_bothXknowsX_asXdX_whereXc__notXeqXaX_orXeqXdXXXX_selectXa_b_c_dX", IgnoreReason.NeedsFurtherInvestigation },
- { "g_V_asXaX_outEXcreatedX_asXbX_inV_asXcX_whereXa_gtXbX_orXeqXbXXX_byXageX_byXweightX_byXweightX_selectXa_cX_byXnameX", IgnoreReason.NeedsFurtherInvestigation },
- { "g_V_asXaX_outEXcreatedX_asXbX_inV_asXcX_inXcreatedX_asXdX_whereXa_ltXbX_orXgtXcXX_andXneqXdXXX_byXageX_byXweightX_byXinXcreatedX_valuesXageX_minX_selectXa_c_dX", IgnoreReason.NeedsFurtherInvestigation },
+ { "g_V_hasLabelXpersonX_hasXage_notXlteX10X_andXnotXbetweenX11_20XXXX_andXltX29X_orXeqX35XXXX_name", IgnoreReason.NeedsFurtherInvestigation }, // TINKERPOP-1859??
+ { "g_VX1X_out_aggregateXxX_out_whereXnotXwithinXaXXX", IgnoreReason.NeedsFurtherInvestigation }, // TINKERPOP-1859??
{ "g_withBulkXfalseX_withSackX1_sumX_VX1X_localXoutEXknowsX_barrierXnormSackX_inVX_inXknowsX_barrier_sack", IgnoreReason.NeedsFurtherInvestigation },
{ "g_withBulkXfalseX_withSackX1_sumX_V_out_barrier_sack", IgnoreReason.NeedsFurtherInvestigation },
{ "g_withSackX1_sumX_VX1X_localXoutXknowsX_barrierXnormSackXX_inXknowsX_barrier_sack", IgnoreReason.NeedsFurtherInvestigation },
@@ -52,7 +48,6 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
{ "g_V_outE_weight_groupCount_selectXkeysX_unfold", IgnoreReason.NeedsFurtherInvestigation },
{ "g_V_foo_injectX9999999999X_min", IgnoreReason.NeedsFurtherInvestigation },
{ "g_V_hasLabelXpersonX_group_byXnameX_byXoutE_weight_sumX_orderXlocalX_byXvaluesX", IgnoreReason.NeedsFurtherInvestigation },
- { "g_V_localXbothE_weight_foldX_order_byXsumXlocalX_decrX", IgnoreReason.NeedsFurtherInvestigation },
{ "g_V_hasLabelXpersonX_group_byXnameX_byXoutE_weight_sumX_unfold_order_byXvalues_decrX", IgnoreReason.NeedsFurtherInvestigation }
};
[06/30] tinkerpop git commit: Merge branch 'TINKERPOP-1586' into tp32
Posted by dk...@apache.org.
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/TINKERPOP-1777
Commit: d52051615783c83f7d185b257059ec2d37e97095
Parents: 3aa9e70 d112154
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Feb 28 15:40:20 2018 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
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.
[02/30] tinkerpop git commit: Added Gremlin's Anatomy tutorial
Posted by dk...@apache.org.
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/TINKERPOP-1777
Commit: 3aa9e70ef7e50d81886954e398b4355524f7b576
Parents: 1a857da
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Feb 28 14:14:01 2018 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
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 0000000..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 under the License.
+////
+
+image::apache-tinkerpop-logo.png[width=500,link="http://tinkerpop.apache.org"]
+
+*x.y.z*
+
+== Gremlin's Anatomy
+
+image:gremlin-anatomy.png[width=160,float=left]The Gremlin language is typically described by the individual
+link:http://tinkerpop.apache.org/docs/x.y.z/reference/#graph-traversal-steps[steps] that make up the language, but it
+is worth taking a look at the component parts of Gremlin that make a traversal work. Understanding these component
+parts make it possible to discuss and understand more advanced Gremlin topics, such as
+link:http://tinkerpop.apache.org/docs/x.y.z/reference/#dsl[Gremlin DSL] development and Gremlin debugging techniques.
+Ultimately, Gremlin's Anatomy provides a foundational understanding for helping to read and follow Gremlin of arbitrary
+complexity, which will lead you to more easily identify traversal patterns and thus enable you to craft better
+traversals of your own.
+
+NOTE: This tutorial is based on Stephen Mallette's presentation on Gremlin's Anatomy - the slides for that presentation
+can be found link:https://www.slideshare.net/StephenMallette/gremlins-anatomy-88713465[here].
+
+The component parts of a Gremlin traversal can be all be identified from the following code:
+
+[gremlin-groovy,modern]
+----
+g.V().
+ has('person', 'name', within('marko', 'josh')).
+ outE().
+ groupCount().
+ by(label()).next()
+----
+
+In plain English, this traversal requests an out-edge label distribution for "marko" and "josh". The following
+sections, will pick this traversal apart to show each component part and discuss it in some detail.
+
+=== GraphTraversalSource
+
+_`g.V()`_ - You are likely well acquainted with this bit of Gremlin. It is in virtually every traversal you read in
+documentation, blog posts, or examples and is likely the start of most every traversal you will write in your own
+applications.
+
+[gremlin-groovy,modern]
+----
+g.V()
+----
+
+While it is well known that `g.V()` returns a list of all the vertices in the graph, the technical underpinnings of
+this ubiquitous statement may be less so well established. First of all, the `g` is a variable. It could have been
+`x`, `y` or anything else, but by convention, you will normally see `g`. This `g` is a `GraphTraversalSource`
+and it spawns `GraphTraversal` instances with start steps. `V()` is one such start step, but there are others like
+`E` for getting all the edges in the graph. The important part is that these start steps begin the traversal.
+
+In addition to exposing the available start steps, the `GraphTraversalSource` also holds configuration options (perhaps
+think of them as pre-instructions for Gremlin) to be used for the traversal execution. The methods that allow you to
+set these configurations are prefixed by the word "with". Here are a few examples to consider:
+
+[source,groovy]
+----
+g.withStrategies(SubgraphStrategy.build().vertices(hasLabel('person')).create()). <1>
+ V().has('name','marko').out().values('name')
+g.withSack(1.0f).V().sack() <2>
+g.withComputer().V().pageRank() <3>
+----
+
+<1> Define a link:http://tinkerpop.apache.org/docs/x.y.z/reference/#traversalstrategy[strategy] for the traversal
+<2> Define an initial link:http://tinkerpop.apache.org/docs/x.y.z/reference/#sack-step[sack] value
+<3> Define a link:http://tinkerpop.apache.org/docs/x.y.z/reference/#graphcomputer[GraphComputer] to use in conjunction
+with a `VertexProgram` for OLAP based traversals - for example, see
+link:http://tinkerpop.apache.org/docs/x.y.z/reference/#sparkgraphcomputer[Spark]
+
+IMPORTANT: How you instantiate the `GraphTraversalSource` is highly depending on the graph database implementation that
+you are using. Typically, they are instantiated from a `Graph` instance with the `traversal()` method, but some graph
+databases, ones that are managed or "server-oriented", will simply give you a `g` to work with. Consult the
+documentation of your graph database to determine how the `GraphTraversalSource` is constructed.
+
+=== GraphTraversal
+
+As you now know, a `GraphTraversal` is spawned from the start steps of a `GraphTraversalSource`. The `GraphTraversal`
+contain the steps that make up the Gremlin language. Each step returns a `GraphTraversal` so that the steps can be
+chained together in a fluent fashion. Revisiting the example from above:
+
+[gremlin-groovy,modern]
+----
+g.V().
+ has('person', 'name', within('marko', 'josh')).
+ outE().
+ groupCount().
+ by(label()).next()
+----
+
+the `GraphTraversal` components are represented by the `has()`, `outE()` and `groupCount()` steps. The key to reading
+this Gremlin is to realize that the output of one step becomes the input to the next. Therefore, if you consider the
+start step of `V()` and realize that it returns vertices in the graph, the input to `has()` is going to be a `Vertex`.
+The `has()` step is a filtering step and will take the vertices that are passed into it and block any that do not
+meet the criteria it has specified. In this case, that means that the output of the `has()` step is vertices that have
+the label of "person" and the "name" property value of "josh" or "marko".
+
+image::gremlin-anatomy-filter.png[width=600]
+
+Given that you know the output of `has()`, you then also know the input to `outE()`. Recall that `outE()` is a
+navigational step in that it enables movement about the graph. In this case, `outE()` tells Gremlin to take the
+incoming "marko" and "josh" vertices and traverse their outgoing edges as the output.
+
+image::gremlin-anatomy-navigate.png[width=600]
+
+Now that it is clear that the output of `outE()` is an edge, you are aware of the input to `groupCount()` - edges.
+The `groupCount()` step requires a bit more discussion of other Gremlin components and will thus be examined in the
+following sections. At this point, it is simply worth noting that the output of `groupCount()` is a `Map` and if a
+Gremlin step followed it, the input to that step would therefore be a `Map`.
+
+The previous paragraph ended with an interesting point, in that it implied that there were no "steps" following
+`groupCount()`. Clearly, `groupCount()` is not the last function to be called in that Gremlin statement so you might
+wonder what the remaining bits are, specifically: `by(label()).next()`. The following sections will discuss those
+remaining pieces.
+
+=== Step Modulators
+
+It's been explained in several ways now that the output of one step becomes the input to the next, so surely the `Map`
+produced by `groupCount()` will feed the `by()` step. As alluded to at the end of the previous section, that
+expectation is not correct. Technically, `by()` is not a step. It is a step modulator. A step modulator modifies the
+behavior of the previous step. In this case, it is telling Gremlin how the key for the `groupCount()` should be
+determined. Or said another way in the context of the example, it answers this question: What do you want the "marko"
+and "josh" edges to be grouped by?
+
+=== Anonymous Traversals
+
+In this case, the answer to that question is provided by the anonymous traversal `label()` as the argument to the step
+modulator `by()`. An anonymous traversal is a traversal that is not bound to a `GraphTraversalSource`. It is
+constructed from the double underscore class (i.e. `__`), which exposes static functions to spawn the anonymous
+traversals. Typically, the double underscore is not visible in examples and code as by convention, TinkerPop typically
+recommends that the functions of that class be exposed in a standalone fashion. In Java, that would mean
+link:https://docs.oracle.com/javase/7/docs/technotes/guides/language/static-import.html[statically importing] the
+methods, thus allowing `__.label()` to be referred to simply as `label()`.
+
+NOTE: In Java, the full package name for the `__` is `org.apache.tinkerpop.gremlin.process.traversal.dsl.graph`.
+
+In the context of the example traversal, you can imagine Gremlin getting to the `groupCount()` step with a "marko" or
+"josh" outgoing edge, checking the `by()` modulator to see "what to group by", and then putting edges into buckets
+by their `label()` and incrementing a counter on each bucket.
+
+image::gremlin-anatomy-group.png[width=600]
+
+The output is thus an edge label distribution for the outgoing edges of the "marko" and "josh" vertices.
+
+=== Terminal Step
+
+Terminal steps are different from the `GraphTraversal` steps in that terminal steps do not return a `GraphTraversal`
+instance, but instead return the result of the `GraphTraversal`. In the case of the example, `next()` is the terminal
+step and it returns the `Map` constructed in the `groupCount()` step. Other examples of terminal steps include:
+`hasNext()`, `toList()`, and `iterate()`. Without terminal steps, you don't have a result. You only have a
+`GraphTraversal`
+
+NOTE: You can read more about traversal iteration in the
+link:http://tinkerpop.apache.org/docs/x.y.z/tutorials/the-gremlin-console/#result-iteration[Gremlin Console Tutorial].
+
+=== Expressions
+
+It is worth backing up a moment to re-examine the `has()` step. Now that you have come to understand anonymous
+traversals, it would be reasonable to make the assumption that the `within()` argument to `has()` falls into that
+category. It does not. The `within()` option is not a step either, but instead, something called an expression. An
+expression typically refers to anything not mentioned in the previously described Gremlin component categories that
+can make Gremlin easier to read, write and maintain. Common examples of expressions would be string tokens, enum
+values, and classes with static methods that might spawn certain required values.
+
+A concrete example would be the class from which `within()` is called - `P`. The `P` class spawns `Predicate` values
+that can be used as arguments for certain traversals teps. Another example would be the `T` enum which provides a type
+safe way to reference `id` and `label` keys in a traversal. Like anonymous traversals, these classes are usually
+statically imported so that instead of having to write `P.within()`, you can simply write `within()`, as shown in the
+example.
+
+== Conclusion
+
+There's much more to a traversal than just a bunch of steps. Gremlin's Anatomy puts names to each of these component
+parts of a traversal and explains how they connect together. Understanding these components part should help provide
+more insight into how Gremlin works and help you grow in your Gremlin abilities.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3aa9e70e/docs/static/images/gremlin-anatomy-filter.png
----------------------------------------------------------------------
diff --git a/docs/static/images/gremlin-anatomy-filter.png b/docs/static/images/gremlin-anatomy-filter.png
new file mode 100755
index 0000000..317bb8c
Binary files /dev/null and b/docs/static/images/gremlin-anatomy-filter.png differ
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3aa9e70e/docs/static/images/gremlin-anatomy-group.png
----------------------------------------------------------------------
diff --git a/docs/static/images/gremlin-anatomy-group.png b/docs/static/images/gremlin-anatomy-group.png
new file mode 100755
index 0000000..0039c02
Binary files /dev/null and b/docs/static/images/gremlin-anatomy-group.png differ
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3aa9e70e/docs/static/images/gremlin-anatomy-navigate.png
----------------------------------------------------------------------
diff --git a/docs/static/images/gremlin-anatomy-navigate.png b/docs/static/images/gremlin-anatomy-navigate.png
new file mode 100755
index 0000000..152e40e
Binary files /dev/null and b/docs/static/images/gremlin-anatomy-navigate.png differ
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3aa9e70e/docs/static/images/gremlin-anatomy.png
----------------------------------------------------------------------
diff --git a/docs/static/images/gremlin-anatomy.png b/docs/static/images/gremlin-anatomy.png
new file mode 100755
index 0000000..d83ebf7
Binary files /dev/null and b/docs/static/images/gremlin-anatomy.png differ
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3aa9e70e/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 259f16a..f6ff536 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1036,6 +1036,29 @@ limitations under the License.
</attributes>
</configuration>
</execution>
+ <execution>
+ <id>tutorial-gremlins-anatomy</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>process-asciidoc</goal>
+ </goals>
+ <configuration>
+ <sourceDirectory>${asciidoc.input.dir}/tutorials/gremlins-anatomy</sourceDirectory>
+ <sourceDocumentName>index.asciidoc</sourceDocumentName>
+ <outputDirectory>${htmlsingle.output.dir}/tutorials/gremlins-anatomy
+ </outputDirectory>
+ <backend>html5</backend>
+ <doctype>article</doctype>
+ <attributes>
+ <imagesdir>../../images</imagesdir>
+ <encoding>UTF-8</encoding>
+ <stylesdir>${asciidoctor.style.dir}</stylesdir>
+ <stylesheet>tinkerpop.css</stylesheet>
+ <source-highlighter>coderay</source-highlighter>
+ <basedir>${project.basedir}</basedir>
+ </attributes>
+ </configuration>
+ </execution>
</executions>
</plugin>
</plugins>
[25/30] tinkerpop git commit: Merge branch 'tp32' into tp33
Posted by dk...@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/9eed217f
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/9eed217f
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/9eed217f
Branch: refs/heads/TINKERPOP-1777
Commit: 9eed217fb50e82fc09e17462e0fe1fd655177384
Parents: 532a5de aaf5146
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Thu Mar 1 09:18:15 2018 -0700
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Thu Mar 1 09:18:15 2018 -0700
----------------------------------------------------------------------
docs/preprocessor/preprocess-file.sh | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
[27/30] tinkerpop git commit: Fixed the behavior of `min()`, `max()`,
`mean()` and `sum()`. If no input is given,
these steps will now throw a `FastNoElementException`.
Posted by dk...@apache.org.
Fixed the behavior of `min()`, `max()`, `mean()` and `sum()`.
If no input is given, these steps will now throw a `FastNoElementException`.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/fb05ea79
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/fb05ea79
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/fb05ea79
Branch: refs/heads/TINKERPOP-1777
Commit: fb05ea797ae95611ce03b6b027513a79567b6a25
Parents: cef13dd
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Tue Feb 27 10:15:07 2018 -0700
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Thu Mar 1 09:20:29 2018 -0700
----------------------------------------------------------------------
CHANGELOG.asciidoc | 2 +
.../traversal/step/map/ComputerResultStep.java | 4 +-
.../process/traversal/step/filter/AndStep.java | 2 +-
.../traversal/step/map/MaxGlobalStep.java | 8 ++-
.../traversal/step/map/MaxLocalStep.java | 9 ++-
.../traversal/step/map/MeanGlobalStep.java | 6 ++
.../traversal/step/map/MeanLocalStep.java | 4 +-
.../traversal/step/map/MinGlobalStep.java | 6 ++
.../traversal/step/map/MinLocalStep.java | 9 ++-
.../traversal/step/map/SumGlobalStep.java | 8 ++-
.../traversal/step/map/SumLocalStep.java | 9 ++-
.../process/traversal/step/map/MaxTest.java | 48 +++++++++++++++-
.../process/traversal/step/map/MeanTest.java | 43 ++++++++++++--
.../process/traversal/step/map/MinTest.java | 46 +++++++++++++++
.../process/traversal/step/map/SumTest.java | 60 ++++++++++++++++++--
.../SparkStarBarrierInterceptor.java | 32 ++++++-----
.../structure/TinkerGraphPlayTest.java | 7 +--
17 files changed, 251 insertions(+), 52 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fb05ea79/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 26d53b4..a07128b 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -25,6 +25,8 @@ NEED AND IMAGE
This release also includes changes from <<release-3-3-2, 3.3.2>>.
+* Fixed a bug in `ReducingBarrierStep`, that returned the provided seed value despite no elements being available.
+
== TinkerPop 3.3.0 (Gremlin Symphony #40 in G Minor)
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fb05ea79/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/ComputerResultStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/ComputerResultStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/ComputerResultStep.java
index b5fd8e8..95e572d 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/ComputerResultStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/ComputerResultStep.java
@@ -66,7 +66,9 @@ public final class ComputerResultStep<S> extends AbstractStep<ComputerResult, S>
return this.currentIterator.next();
else {
final ComputerResult result = this.starts.next().get();
- this.currentIterator = attach(result.memory().<TraverserSet<S>>get(TraversalVertexProgram.HALTED_TRAVERSERS).iterator(), result.graph());
+ this.currentIterator = attach(result.memory().exists(TraversalVertexProgram.HALTED_TRAVERSERS)
+ ? result.memory().<TraverserSet<S>>get(TraversalVertexProgram.HALTED_TRAVERSERS).iterator()
+ : EmptyIterator.instance(), result.graph());
}
}
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fb05ea79/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/AndStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/AndStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/AndStep.java
index 5d9d124..5c20cd8 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/AndStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/AndStep.java
@@ -39,4 +39,4 @@ public final class AndStep<S> extends ConnectiveStep<S> {
}
return true;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fb05ea79/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MaxGlobalStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MaxGlobalStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MaxGlobalStep.java
index 954dbfe..8cb798c 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MaxGlobalStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MaxGlobalStep.java
@@ -41,7 +41,13 @@ public final class MaxGlobalStep<S extends Number> extends ReducingBarrierStep<S
}
@Override
- public S projectTraverser(Traverser.Admin<S> traverser) {
+ public void processAllStarts() {
+ if (this.starts.hasNext())
+ super.processAllStarts();
+ }
+
+ @Override
+ public S projectTraverser(final Traverser.Admin<S> traverser) {
return traverser.get();
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fb05ea79/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MaxLocalStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MaxLocalStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MaxLocalStep.java
index 2baca28..909a4c7 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MaxLocalStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MaxLocalStep.java
@@ -21,6 +21,7 @@ package org.apache.tinkerpop.gremlin.process.traversal.step.map;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
import org.apache.tinkerpop.gremlin.process.traversal.traverser.TraverserRequirement;
+import org.apache.tinkerpop.gremlin.process.traversal.util.FastNoSuchElementException;
import java.util.Collections;
import java.util.Iterator;
@@ -40,17 +41,15 @@ public final class MaxLocalStep<E extends Number, S extends Iterable<E>> extends
@Override
protected E map(final Traverser.Admin<S> traverser) {
- Number result;
final Iterator<E> iterator = traverser.get().iterator();
if (iterator.hasNext()) {
- result = iterator.next();
+ Number result = iterator.next();
while (iterator.hasNext()) {
result = max(iterator.next(), result);
}
- } else {
- result = Double.NaN;
+ return (E) result;
}
- return (E) result;
+ throw FastNoSuchElementException.instance();
}
@Override
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fb05ea79/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MeanGlobalStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MeanGlobalStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MeanGlobalStep.java
index 2f1c1dc..5e90336 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MeanGlobalStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MeanGlobalStep.java
@@ -49,6 +49,12 @@ public final class MeanGlobalStep<S extends Number, E extends Number> extends Re
}
@Override
+ public void processAllStarts() {
+ if (this.starts.hasNext())
+ super.processAllStarts();
+ }
+
+ @Override
public E projectTraverser(final Traverser.Admin<S> traverser) {
return (E) new MeanNumber(traverser.get(), traverser.bulk());
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fb05ea79/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MeanLocalStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MeanLocalStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MeanLocalStep.java
index 99005c9..91447fd 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MeanLocalStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MeanLocalStep.java
@@ -22,6 +22,7 @@ import org.apache.tinkerpop.gremlin.util.NumberHelper;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
import org.apache.tinkerpop.gremlin.process.traversal.traverser.TraverserRequirement;
+import org.apache.tinkerpop.gremlin.process.traversal.util.FastNoSuchElementException;
import java.util.Collections;
import java.util.Iterator;
@@ -48,9 +49,8 @@ public final class MeanLocalStep<E extends Number, S extends Iterable<E>> extend
counter++;
}
return NumberHelper.div(result, counter, true);
- } else {
- return Double.NaN;
}
+ throw FastNoSuchElementException.instance();
}
@Override
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fb05ea79/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MinGlobalStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MinGlobalStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MinGlobalStep.java
index 7d0eb56..e476f5c 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MinGlobalStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MinGlobalStep.java
@@ -41,6 +41,12 @@ public final class MinGlobalStep<S extends Number> extends ReducingBarrierStep<S
}
@Override
+ public void processAllStarts() {
+ if (this.starts.hasNext())
+ super.processAllStarts();
+ }
+
+ @Override
public S projectTraverser(final Traverser.Admin<S> traverser) {
return traverser.get();
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fb05ea79/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MinLocalStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MinLocalStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MinLocalStep.java
index e7e001c..64c89e3 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MinLocalStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MinLocalStep.java
@@ -21,6 +21,7 @@ package org.apache.tinkerpop.gremlin.process.traversal.step.map;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
import org.apache.tinkerpop.gremlin.process.traversal.traverser.TraverserRequirement;
+import org.apache.tinkerpop.gremlin.process.traversal.util.FastNoSuchElementException;
import java.util.Collections;
import java.util.Iterator;
@@ -40,17 +41,15 @@ public final class MinLocalStep<E extends Number, S extends Iterable<E>> extends
@Override
protected E map(final Traverser.Admin<S> traverser) {
- Number result;
final Iterator<E> iterator = traverser.get().iterator();
if (iterator.hasNext()) {
- result = iterator.next();
+ Number result = iterator.next();
while (iterator.hasNext()) {
result = min(iterator.next(), result);
}
- } else {
- result = Double.NaN;
+ return (E) result;
}
- return (E) result;
+ throw FastNoSuchElementException.instance();
}
@Override
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fb05ea79/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SumGlobalStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SumGlobalStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SumGlobalStep.java
index 7942d9b..3711cfe 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SumGlobalStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SumGlobalStep.java
@@ -48,6 +48,12 @@ public final class SumGlobalStep<S extends Number> extends ReducingBarrierStep<S
}
@Override
+ public void processAllStarts() {
+ if (this.starts.hasNext())
+ super.processAllStarts();
+ }
+
+ @Override
public S projectTraverser(final Traverser.Admin<S> traverser) {
return (S) mul(traverser.get(), traverser.bulk());
}
@@ -57,4 +63,4 @@ public final class SumGlobalStep<S extends Number> extends ReducingBarrierStep<S
public Set<TraverserRequirement> getRequirements() {
return REQUIREMENTS;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fb05ea79/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SumLocalStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SumLocalStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SumLocalStep.java
index b062a7e..72e6539 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SumLocalStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SumLocalStep.java
@@ -22,6 +22,7 @@ import org.apache.tinkerpop.gremlin.util.NumberHelper;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
import org.apache.tinkerpop.gremlin.process.traversal.traverser.TraverserRequirement;
+import org.apache.tinkerpop.gremlin.process.traversal.util.FastNoSuchElementException;
import java.util.Collections;
import java.util.Iterator;
@@ -39,17 +40,15 @@ public final class SumLocalStep<E extends Number, S extends Iterable<E>> extends
@Override
protected E map(final Traverser.Admin<S> traverser) {
- Number result;
final Iterator<E> iterator = traverser.get().iterator();
if (iterator.hasNext()) {
- result = iterator.next();
+ Number result = iterator.next();
while (iterator.hasNext()) {
result = NumberHelper.add(result, iterator.next());
}
- } else {
- result = 0;
+ return (E) result;
}
- return (E) result;
+ throw FastNoSuchElementException.instance();
}
@Override
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fb05ea79/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MaxTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MaxTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MaxTest.java
index fae3f92..f13cdb5 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MaxTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MaxTest.java
@@ -21,6 +21,7 @@ package org.apache.tinkerpop.gremlin.process.traversal.step.map;
import org.apache.tinkerpop.gremlin.LoadGraphWith;
import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest;
import org.apache.tinkerpop.gremlin.process.GremlinProcessRunner;
+import org.apache.tinkerpop.gremlin.process.traversal.Scope;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.structure.Vertex;
import org.junit.Test;
@@ -41,6 +42,12 @@ public abstract class MaxTest extends AbstractGremlinProcessTest {
public abstract Traversal<Vertex, Integer> get_g_V_age_max();
+ public abstract Traversal<Vertex, Integer> get_g_V_age_fold_maxXlocalX();
+
+ public abstract Traversal<Vertex, Number> get_g_V_foo_max();
+
+ public abstract Traversal<Vertex, Number> get_g_V_foo_fold_maxXlocalX();
+
public abstract Traversal<Vertex, Integer> get_g_V_repeatXbothX_timesX5X_age_max();
public abstract Traversal<Vertex, Map<String, Number>> get_g_V_hasLabelXsoftwareX_group_byXnameX_byXbothE_weight_maxX();
@@ -55,6 +62,30 @@ public abstract class MaxTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
+ public void g_V_age_fold_maxXlocalX() {
+ final Traversal<Vertex, Integer> traversal = get_g_V_age_fold_maxXlocalX();
+ printTraversalForm(traversal);
+ checkResults(Arrays.asList(35), traversal);
+ }
+
+ @Test
+ @LoadGraphWith(MODERN)
+ public void g_V_foo_max() {
+ final Traversal<Vertex, Number> traversal = get_g_V_foo_max();
+ printTraversalForm(traversal);
+ assertFalse(traversal.hasNext());
+ }
+
+ @Test
+ @LoadGraphWith(MODERN)
+ public void g_V_foo_fold_maxXlocalX() {
+ final Traversal<Vertex, Number> traversal = get_g_V_foo_fold_maxXlocalX();
+ printTraversalForm(traversal);
+ assertFalse(traversal.hasNext());
+ }
+
+ @Test
+ @LoadGraphWith(MODERN)
public void g_V_repeatXbothX_timesX5X_age_max() {
final Traversal<Vertex, Integer> traversal = get_g_V_repeatXbothX_timesX5X_age_max();
printTraversalForm(traversal);
@@ -82,6 +113,21 @@ public abstract class MaxTest extends AbstractGremlinProcessTest {
}
@Override
+ public Traversal<Vertex, Integer> get_g_V_age_fold_maxXlocalX() {
+ return g.V().values("age").fold().max(Scope.local);
+ }
+
+ @Override
+ public Traversal<Vertex, Number> get_g_V_foo_max() {
+ return g.V().values("foo").max();
+ }
+
+ @Override
+ public Traversal<Vertex, Number> get_g_V_foo_fold_maxXlocalX() {
+ return g.V().values("foo").fold().max(Scope.local);
+ }
+
+ @Override
public Traversal<Vertex, Integer> get_g_V_repeatXbothX_timesX5X_age_max() {
return g.V().repeat(both()).times(5).values("age").max();
}
@@ -91,4 +137,4 @@ public abstract class MaxTest extends AbstractGremlinProcessTest {
return g.V().hasLabel("software").<String, Number>group().by("name").by(bothE().values("weight").max());
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fb05ea79/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MeanTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MeanTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MeanTest.java
index ab47605..34bef6d 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MeanTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MeanTest.java
@@ -21,11 +21,13 @@ package org.apache.tinkerpop.gremlin.process.traversal.step.map;
import org.apache.tinkerpop.gremlin.LoadGraphWith;
import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest;
import org.apache.tinkerpop.gremlin.process.GremlinProcessRunner;
+import org.apache.tinkerpop.gremlin.process.traversal.Scope;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.structure.Vertex;
import org.junit.Test;
import org.junit.runner.RunWith;
+import java.util.Arrays;
import java.util.Map;
import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN;
@@ -40,16 +42,32 @@ public abstract class MeanTest extends AbstractGremlinProcessTest {
public abstract Traversal<Vertex, Double> get_g_V_age_mean();
+ public abstract Traversal<Vertex, Double> get_g_V_age_fold_meanXlocalX();
+
+ public abstract Traversal<Vertex, Number> get_g_V_foo_mean();
+
+ public abstract Traversal<Vertex, Number> get_g_V_foo_fold_meanXlocalX();
+
public abstract Traversal<Vertex, Map<String, Number>> get_g_V_hasLabelXsoftwareX_group_byXnameX_byXbothE_weight_meanX();
@Test
@LoadGraphWith(MODERN)
public void g_V_age_mean() {
- final Traversal<Vertex, Double> traversal = get_g_V_age_mean();
- printTraversalForm(traversal);
- final Double mean = traversal.next();
- assertEquals(30.75, mean, 0.05);
- assertFalse(traversal.hasNext());
+ for (final Traversal<Vertex, Double> traversal : Arrays.asList(get_g_V_age_mean(), get_g_V_age_fold_meanXlocalX())) {
+ printTraversalForm(traversal);
+ final Double mean = traversal.next();
+ assertEquals(30.75, mean, 0.05);
+ assertFalse(traversal.hasNext());
+ }
+ }
+
+ @Test
+ @LoadGraphWith(MODERN)
+ public void g_V_foo_mean() {
+ for (final Traversal<Vertex, Number> traversal : Arrays.asList(get_g_V_foo_mean(), get_g_V_foo_fold_meanXlocalX())) {
+ printTraversalForm(traversal);
+ assertFalse(traversal.hasNext());
+ }
}
@Test
@@ -73,6 +91,21 @@ public abstract class MeanTest extends AbstractGremlinProcessTest {
}
@Override
+ public Traversal<Vertex, Double> get_g_V_age_fold_meanXlocalX() {
+ return g.V().values("age").fold().mean(Scope.local);
+ }
+
+ @Override
+ public Traversal<Vertex, Number> get_g_V_foo_mean() {
+ return g.V().values("foo").mean();
+ }
+
+ @Override
+ public Traversal<Vertex, Number> get_g_V_foo_fold_meanXlocalX() {
+ return g.V().values("foo").fold().mean(Scope.local);
+ }
+
+ @Override
public Traversal<Vertex, Map<String, Number>> get_g_V_hasLabelXsoftwareX_group_byXnameX_byXbothE_weight_meanX() {
return g.V().hasLabel("software").<String, Number>group().by("name").by(bothE().values("weight").mean());
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fb05ea79/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MinTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MinTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MinTest.java
index 947137f..10f6bc8 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MinTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MinTest.java
@@ -21,6 +21,7 @@ package org.apache.tinkerpop.gremlin.process.traversal.step.map;
import org.apache.tinkerpop.gremlin.LoadGraphWith;
import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest;
import org.apache.tinkerpop.gremlin.process.GremlinProcessRunner;
+import org.apache.tinkerpop.gremlin.process.traversal.Scope;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.structure.Vertex;
import org.junit.Test;
@@ -43,6 +44,12 @@ public abstract class MinTest extends AbstractGremlinProcessTest {
public abstract Traversal<Vertex, Integer> get_g_V_age_min();
+ public abstract Traversal<Vertex, Integer> get_g_V_age_fold_minXlocalX();
+
+ public abstract Traversal<Vertex, Number> get_g_V_foo_min();
+
+ public abstract Traversal<Vertex, Number> get_g_V_foo_fold_minXlocalX();
+
public abstract Traversal<Vertex, Integer> get_g_V_repeatXbothX_timesX5X_age_min();
public abstract Traversal<Vertex, Map<String, Number>> get_g_V_hasLabelXsoftwareX_group_byXnameX_byXbothE_weight_minX();
@@ -59,6 +66,30 @@ public abstract class MinTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
+ public void g_V_age_fold_minXlocalX() {
+ final Traversal<Vertex, Integer> traversal = get_g_V_age_fold_minXlocalX();
+ printTraversalForm(traversal);
+ checkResults(Arrays.asList(27), traversal);
+ }
+
+ @Test
+ @LoadGraphWith(MODERN)
+ public void g_V_foo_min() {
+ final Traversal<Vertex, Number> traversal = get_g_V_foo_min();
+ printTraversalForm(traversal);
+ assertFalse(traversal.hasNext());
+ }
+
+ @Test
+ @LoadGraphWith(MODERN)
+ public void g_V_foo_fold_minXlocalX() {
+ final Traversal<Vertex, Number> traversal = get_g_V_foo_fold_minXlocalX();
+ printTraversalForm(traversal);
+ assertFalse(traversal.hasNext());
+ }
+
+ @Test
+ @LoadGraphWith(MODERN)
public void g_V_repeatXbothX_timesX5X_age_min() {
final Traversal<Vertex, Integer> traversal = get_g_V_repeatXbothX_timesX5X_age_min();
printTraversalForm(traversal);
@@ -96,6 +127,21 @@ public abstract class MinTest extends AbstractGremlinProcessTest {
}
@Override
+ public Traversal<Vertex, Integer> get_g_V_age_fold_minXlocalX() {
+ return g.V().values("age").fold().min(Scope.local);
+ }
+
+ @Override
+ public Traversal<Vertex, Number> get_g_V_foo_min() {
+ return g.V().values("foo").min();
+ }
+
+ @Override
+ public Traversal<Vertex, Number> get_g_V_foo_fold_minXlocalX() {
+ return g.V().values("foo").fold().min(Scope.local);
+ }
+
+ @Override
public Traversal<Vertex, Integer> get_g_V_repeatXbothX_timesX5X_age_min() {
return g.V().repeat(both()).times(5).values("age").min();
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fb05ea79/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SumTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SumTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SumTest.java
index 1183863..e1bbd0b 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SumTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SumTest.java
@@ -21,6 +21,7 @@ package org.apache.tinkerpop.gremlin.process.traversal.step.map;
import org.apache.tinkerpop.gremlin.LoadGraphWith;
import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest;
import org.apache.tinkerpop.gremlin.process.GremlinProcessRunner;
+import org.apache.tinkerpop.gremlin.process.traversal.Scope;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.structure.Vertex;
import org.junit.Test;
@@ -39,17 +40,49 @@ import static org.junit.Assert.*;
@RunWith(GremlinProcessRunner.class)
public abstract class SumTest extends AbstractGremlinProcessTest {
- public abstract Traversal<Vertex, Double> get_g_V_valuesXageX_sum();
+ public abstract Traversal<Vertex, Integer> get_g_V_valuesXageX_sum();
+
+ public abstract Traversal<Vertex, Integer> get_g_V_age_fold_sumXlocalX();
+
+ public abstract Traversal<Vertex, Number> get_g_V_foo_sum();
+
+ public abstract Traversal<Vertex, Number> get_g_V_foo_fold_sumXlocalX();
public abstract Traversal<Vertex, Map<String, Number>> get_g_V_hasLabelXsoftwareX_group_byXnameX_byXbothE_weight_sumX();
@Test
@LoadGraphWith(MODERN)
public void g_V_valuesXageX_sum() {
- final Traversal<Vertex, Double> traversal = get_g_V_valuesXageX_sum();
+ final Traversal<Vertex, Integer> traversal = get_g_V_valuesXageX_sum();
+ printTraversalForm(traversal);
+ final Integer sum = traversal.next();
+ assertEquals(123, sum.intValue());
+ assertFalse(traversal.hasNext());
+ }
+
+ @Test
+ @LoadGraphWith(MODERN)
+ public void g_V_age_fold_sumXlocalX() {
+ final Traversal<Vertex, Integer> traversal = get_g_V_age_fold_sumXlocalX();
+ printTraversalForm(traversal);
+ final Integer sum = traversal.next();
+ assertEquals(123, sum.intValue());
+ assertFalse(traversal.hasNext());
+ }
+
+ @Test
+ @LoadGraphWith(MODERN)
+ public void g_V_foo_sum() {
+ final Traversal<Vertex, Number> traversal = get_g_V_foo_sum();
+ printTraversalForm(traversal);
+ assertFalse(traversal.hasNext());
+ }
+
+ @Test
+ @LoadGraphWith(MODERN)
+ public void g_V_foo_fold_sumXlocalX() {
+ final Traversal<Vertex, Number> traversal = get_g_V_foo_fold_sumXlocalX();
printTraversalForm(traversal);
- final Number sum = traversal.next();
- assertEquals(123L, sum);
assertFalse(traversal.hasNext());
}
@@ -69,13 +102,28 @@ public abstract class SumTest extends AbstractGremlinProcessTest {
public static class Traversals extends SumTest {
@Override
- public Traversal<Vertex, Double> get_g_V_valuesXageX_sum() {
+ public Traversal<Vertex, Integer> get_g_V_valuesXageX_sum() {
return g.V().values("age").sum();
}
@Override
+ public Traversal<Vertex, Integer> get_g_V_age_fold_sumXlocalX() {
+ return g.V().values("age").fold().sum(Scope.local);
+ }
+
+ @Override
+ public Traversal<Vertex, Number> get_g_V_foo_sum() {
+ return g.V().values("foo").sum();
+ }
+
+ @Override
+ public Traversal<Vertex, Number> get_g_V_foo_fold_sumXlocalX() {
+ return g.V().values("foo").fold().sum(Scope.local);
+ }
+
+ @Override
public Traversal<Vertex, Map<String, Number>> get_g_V_hasLabelXsoftwareX_group_byXnameX_byXbothE_weight_sumX() {
return g.V().hasLabel("software").<String, Number>group().by("name").by(bothE().values("weight").sum());
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fb05ea79/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/process/computer/traversal/strategy/optimization/interceptor/SparkStarBarrierInterceptor.java
----------------------------------------------------------------------
diff --git a/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/process/computer/traversal/strategy/optimization/interceptor/SparkStarBarrierInterceptor.java b/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/process/computer/traversal/strategy/optimization/interceptor/SparkStarBarrierInterceptor.java
index 3c74e5a..3c89c1d 100644
--- a/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/process/computer/traversal/strategy/optimization/interceptor/SparkStarBarrierInterceptor.java
+++ b/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/process/computer/traversal/strategy/optimization/interceptor/SparkStarBarrierInterceptor.java
@@ -45,6 +45,7 @@ import org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.Subgra
import org.apache.tinkerpop.gremlin.process.traversal.strategy.verification.ComputerVerificationStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.traverser.TraverserRequirement;
import org.apache.tinkerpop.gremlin.process.traversal.traverser.util.TraverserSet;
+import org.apache.tinkerpop.gremlin.process.traversal.util.FastNoSuchElementException;
import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper;
import org.apache.tinkerpop.gremlin.spark.process.computer.SparkMemory;
import org.apache.tinkerpop.gremlin.spark.process.computer.traversal.strategy.SparkVertexProgramInterceptor;
@@ -52,6 +53,7 @@ import org.apache.tinkerpop.gremlin.structure.Vertex;
import org.apache.tinkerpop.gremlin.structure.util.ElementHelper;
import org.apache.tinkerpop.gremlin.util.NumberHelper;
import org.apache.tinkerpop.gremlin.util.function.ArrayListSupplier;
+import org.apache.tinkerpop.gremlin.util.function.MeanNumberSupplier;
import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
import java.util.ArrayList;
@@ -97,24 +99,24 @@ public final class SparkStarBarrierInterceptor implements SparkVertexProgramInte
final Object result;
if (endStep instanceof CountGlobalStep)
result = nextRDD.map(Traverser::bulk).fold(0l, (a, b) -> a + b);
- else if (endStep instanceof SumGlobalStep)
+ else if (endStep instanceof SumGlobalStep) {
result = nextRDD
.map(traverser -> NumberHelper.mul(traverser.bulk(), (Number) traverser.get()))
.fold(0, NumberHelper::add);
- else if (endStep instanceof MeanGlobalStep)
- result = nextRDD
+ } else if (endStep instanceof MeanGlobalStep) {
+ result = nextRDD.isEmpty() ? null : nextRDD
.map(traverser -> new MeanGlobalStep.MeanNumber((Number) traverser.get(), traverser.bulk()))
- .fold(new MeanGlobalStep.MeanNumber(), MeanGlobalStep.MeanNumber::add)
+ .fold(MeanNumberSupplier.instance().get(), MeanGlobalStep.MeanNumber::add)
.getFinal();
- else if (endStep instanceof MinGlobalStep)
- result = nextRDD
+ } else if (endStep instanceof MinGlobalStep) {
+ result = nextRDD.isEmpty() ? null : nextRDD
.map(traverser -> (Number) traverser.get())
- .fold(Integer.MAX_VALUE, NumberHelper::min);
- else if (endStep instanceof MaxGlobalStep)
- result = nextRDD
+ .fold(Double.NaN, NumberHelper::min);
+ } else if (endStep instanceof MaxGlobalStep) {
+ result = nextRDD.isEmpty() ? null : nextRDD
.map(traverser -> (Number) traverser.get())
- .fold(Integer.MIN_VALUE, NumberHelper::max);
- else if (endStep instanceof FoldStep) {
+ .fold(Double.NaN, NumberHelper::max);
+ } else if (endStep instanceof FoldStep) {
final BinaryOperator biOperator = endStep.getBiOperator();
result = nextRDD.map(traverser -> {
if (endStep.getSeedSupplier() instanceof ArrayListSupplier) {
@@ -148,9 +150,11 @@ public final class SparkStarBarrierInterceptor implements SparkVertexProgramInte
///////////////////////////////
// generate the HALTED_TRAVERSERS for the memory
- final TraverserSet<Long> haltedTraversers = new TraverserSet<>();
- haltedTraversers.add(traversal.getTraverserGenerator().generate(result, endStep, 1l)); // all reducing barrier steps produce a result of bulk 1
- memory.set(TraversalVertexProgram.HALTED_TRAVERSERS, haltedTraversers);
+ if (result != null) {
+ final TraverserSet<Long> haltedTraversers = new TraverserSet<>();
+ haltedTraversers.add(traversal.getTraverserGenerator().generate(result, endStep, 1l)); // all reducing barrier steps produce a result of bulk 1
+ memory.set(TraversalVertexProgram.HALTED_TRAVERSERS, haltedTraversers);
+ }
memory.incrIteration(); // any local star graph reduction takes a single iteration
return inputRDD;
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fb05ea79/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphPlayTest.java
----------------------------------------------------------------------
diff --git a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphPlayTest.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphPlayTest.java
index a13a4ad..eacc3db 100644
--- a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphPlayTest.java
+++ b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphPlayTest.java
@@ -132,11 +132,8 @@ public class TinkerGraphPlayTest {
public void testPlayDK() throws Exception {
Graph graph = TinkerGraph.open();
- GraphTraversalSource g = graph.traversal();
- graph.io(GraphMLIo.build()).readGraph("/projects/apache/tinkerpop/data/grateful-dead.xml");
- System.out.println(g.V().filter(outE("sungBy").count().is(0)).explain());
- System.out.println(g.V().filter(outE("sungBy").count().is(lt(1))).explain());
- System.out.println(g.V().filter(outE("sungBy").count().is(1)).explain());
+ GraphTraversalSource g = graph.traversal().withComputer();
+ g.V().values("test").max().forEachRemaining(System.out::println);
}
@Test
[19/30] tinkerpop git commit: Created issue for ignored GLV test in
.NET CTR
Posted by dk...@apache.org.
Created issue for ignored GLV test in .NET CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/8ef717f6
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/8ef717f6
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/8ef717f6
Branch: refs/heads/TINKERPOP-1777
Commit: 8ef717f6c0e04161e43c87a83f67ada0f5e60349
Parents: 153f852
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Mar 1 10:31:56 2018 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Mar 1 10:31:56 2018 -0500
----------------------------------------------------------------------
.../test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8ef717f6/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 c2a8850..f3e823a 100644
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
@@ -40,7 +40,7 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
private static readonly IDictionary<string, IgnoreReason> IgnoredScenarios = new Dictionary<string, IgnoreReason> {
{ "g_V_hasLabelXpersonX_hasXage_notXlteX10X_andXnotXbetweenX11_20XXXX_andXltX29X_orXeqX35XXXX_name", IgnoreReason.NeedsFurtherInvestigation }, // TINKERPOP-1859??
{ "g_VX1X_out_aggregateXxX_out_whereXnotXwithinXaXXX", IgnoreReason.NeedsFurtherInvestigation }, // TINKERPOP-1859??
- { "g_withBulkXfalseX_withSackX1_sumX_V_out_barrier_sack", IgnoreReason.NeedsFurtherInvestigation }
+ { "g_withBulkXfalseX_withSackX1_sumX_V_out_barrier_sack", IgnoreReason.NeedsFurtherInvestigation } // TINKERPOP-1907
};
private static class Keywords
[29/30] tinkerpop git commit: Fixed expected data type in sum() test
Posted by dk...@apache.org.
Fixed expected data type in sum() test
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/674d800a
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/674d800a
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/674d800a
Branch: refs/heads/TINKERPOP-1777
Commit: 674d800a587ba630a716729673786cdd323a2816
Parents: 3310b31
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Fri Mar 2 10:40:15 2018 -0700
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Fri Mar 2 10:40:15 2018 -0700
----------------------------------------------------------------------
gremlin-test/features/map/Sum.feature | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/674d800a/gremlin-test/features/map/Sum.feature
----------------------------------------------------------------------
diff --git a/gremlin-test/features/map/Sum.feature b/gremlin-test/features/map/Sum.feature
index 816fd2b..0e20368 100644
--- a/gremlin-test/features/map/Sum.feature
+++ b/gremlin-test/features/map/Sum.feature
@@ -26,7 +26,7 @@ Feature: Step - sum()
When iterated to list
Then the result should be unordered
| result |
- | d[123].i |
+ | d[123].l |
Scenario: g_V_foo_sum
Given the modern graph
[15/30] tinkerpop git commit: Fixed up failing .NET GLV test
Posted by dk...@apache.org.
Fixed up failing .NET GLV test
Was using "foo" as a property key that .NET gherkin parser didn't know about. CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/2ddf2e31
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/2ddf2e31
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/2ddf2e31
Branch: refs/heads/TINKERPOP-1777
Commit: 2ddf2e3110376acfd6ef7d8142ba156eb27de6c5
Parents: eab4bce
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Mar 1 09:46:16 2018 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Mar 1 09:46:16 2018 -0500
----------------------------------------------------------------------
.../test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs | 1 -
.../Gherkin/TraversalEvaluation/ModernGraphTypeInformation.cs | 3 ++-
gremlin-test/features/map/Min.feature | 3 ++-
3 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2ddf2e31/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 0685d89..a8c25ec 100644
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
@@ -44,7 +44,6 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
{ "g_V_hasXname_markoX_propertyXfriendWeight_outEXknowsX_weight_sum__acl_privateX", IgnoreReason.NeedsFurtherInvestigation },
{ "g_V_outE_weight_groupCount_unfold_selectXkeysX_unfold", IgnoreReason.NeedsFurtherInvestigation },
{ "g_V_outE_weight_groupCount_selectXkeysX_unfold", IgnoreReason.NeedsFurtherInvestigation },
- { "g_V_foo_injectX9999999999X_min", IgnoreReason.NeedsFurtherInvestigation },
{ "g_V_hasLabelXpersonX_group_byXnameX_byXoutE_weight_sumX_orderXlocalX_byXvaluesX", IgnoreReason.NeedsFurtherInvestigation },
{ "g_V_hasLabelXpersonX_group_byXnameX_byXoutE_weight_sumX_unfold_order_byXvalues_decrX", IgnoreReason.NeedsFurtherInvestigation }
};
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2ddf2e31/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/TraversalEvaluation/ModernGraphTypeInformation.cs
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/TraversalEvaluation/ModernGraphTypeInformation.cs b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/TraversalEvaluation/ModernGraphTypeInformation.cs
index aec3d3e..7eca018 100644
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/TraversalEvaluation/ModernGraphTypeInformation.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/TraversalEvaluation/ModernGraphTypeInformation.cs
@@ -37,7 +37,8 @@ namespace Gremlin.Net.IntegrationTest.Gherkin.TraversalEvaluation
{"age", typeof(int)},
{"name", typeof(string)},
{"lang", typeof(string)},
- {"weight", typeof(float)}
+ {"weight", typeof(float)},
+ {"foo", typeof(object)} // used when for invalid property key lookups
};
/// <summary>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2ddf2e31/gremlin-test/features/map/Min.feature
----------------------------------------------------------------------
diff --git a/gremlin-test/features/map/Min.feature b/gremlin-test/features/map/Min.feature
index 99d53dd..d77e9f3 100644
--- a/gremlin-test/features/map/Min.feature
+++ b/gremlin-test/features/map/Min.feature
@@ -52,9 +52,10 @@ Feature: Step - min()
Scenario: g_V_foo_injectX9999999999X_min
Given the modern graph
+ And using the parameter injectVal defined as "d[9999999999].l"
And the traversal of
"""
- g.V().values("foo").inject(9999999999L).min()
+ g.V().values("foo").inject(injectVal).min()
"""
When iterated to list
Then the result should be unordered
[11/30] tinkerpop git commit: Merge branch 'tp33'
Posted by dk...@apache.org.
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/e48e8340
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/e48e8340
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/e48e8340
Branch: refs/heads/TINKERPOP-1777
Commit: e48e8340f4b2ac14ffd0bbf87b3cc2bcb61da97b
Parents: 773d510 b516a6a
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Mar 1 08:38:00 2018 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Mar 1 08:38:00 2018 -0500
----------------------------------------------------------------------
.../test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs | 2 --
gremlin-test/features/map/Match.feature | 2 +-
2 files changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------
[28/30] tinkerpop git commit: Fixed a few test cases
Posted by dk...@apache.org.
Fixed a few test cases
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/3310b310
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/3310b310
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/3310b310
Branch: refs/heads/TINKERPOP-1777
Commit: 3310b310244fa1aad1615da05ab907a6a46bf6c5
Parents: fb05ea7
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Wed Feb 28 15:34:00 2018 -0700
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Thu Mar 1 09:23:03 2018 -0700
----------------------------------------------------------------------
.../Gherkin/GherkinTestRunner.cs | 12 +++++--
gremlin-test/features/branch/Union.feature | 3 +-
gremlin-test/features/map/Max.feature | 29 ++++++++++++++++
gremlin-test/features/map/Mean.feature | 31 ++++++++++++++++-
gremlin-test/features/map/Min.feature | 29 ++++++++++++++++
gremlin-test/features/map/Order.feature | 7 ++--
gremlin-test/features/map/Sum.feature | 35 ++++++++++++++++++--
gremlin-test/features/sideEffect/Group.feature | 4 +--
.../process/computer/GraphComputerTest.java | 12 +++----
.../traversal/step/branch/UnionTest.java | 2 +-
.../process/traversal/step/map/OrderTest.java | 18 ++++------
.../process/traversal/step/map/SumTest.java | 18 +++++-----
.../traversal/step/sideEffect/GroupTest.java | 11 ++----
13 files changed, 161 insertions(+), 50 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3310b310/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 eb0a7e1..580708c 100644
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
@@ -43,7 +43,15 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
{ "g_V_valueMapXtrue_name_ageX", IgnoreReason.TraversalTDeserializationNotSupported }, // TINKERPOP-1866
{ "g_V_hasLabelXpersonX_hasXage_notXlteX10X_andXnotXbetweenX11_20XXXX_andXltX29X_orXeqX35XXXX_name", IgnoreReason.NeedsFurtherInvestigation }, // TINKERPOP-1859??
{ "g_VX1X_out_aggregateXxX_out_whereXnotXwithinXaXXX", IgnoreReason.NeedsFurtherInvestigation }, // TINKERPOP-1859??
- { "g_withBulkXfalseX_withSackX1_sumX_V_out_barrier_sack", IgnoreReason.NeedsFurtherInvestigation } // TINKERPOP-1907
+ { "g_withBulkXfalseX_withSackX1_sumX_V_out_barrier_sack", IgnoreReason.NeedsFurtherInvestigation }, // TINKERPOP-1907
+ { "g_V_foo_min", IgnoreReason.NeedsFurtherInvestigation },
+ { "g_V_foo_fold_minXlocalX", IgnoreReason.NeedsFurtherInvestigation },
+ { "g_V_foo_max", IgnoreReason.NeedsFurtherInvestigation },
+ { "g_V_foo_fold_maxXlocalX", IgnoreReason.NeedsFurtherInvestigation },
+ { "g_V_foo_mean", IgnoreReason.NeedsFurtherInvestigation },
+ { "g_V_foo_fold_meanXlocalX", IgnoreReason.NeedsFurtherInvestigation },
+ { "g_V_foo_sum", IgnoreReason.NeedsFurtherInvestigation },
+ { "g_V_foo_fold_sumXlocalX", IgnoreReason.NeedsFurtherInvestigation }
};
private static class Keywords
@@ -384,4 +392,4 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
return rootDir.FullName;
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3310b310/gremlin-test/features/branch/Union.feature
----------------------------------------------------------------------
diff --git a/gremlin-test/features/branch/Union.feature b/gremlin-test/features/branch/Union.feature
index 83318f6..8f5297e 100644
--- a/gremlin-test/features/branch/Union.feature
+++ b/gremlin-test/features/branch/Union.feature
@@ -135,7 +135,6 @@ Feature: Step - union()
| d[3].l |
| d[0].l |
| d[1.9].d |
- | d[0].i |
| d[0].l |
| d[1].l |
@@ -151,4 +150,4 @@ Feature: Step - union()
Then the result should be unordered
| result |
| d[1].l |
- | d[1].l |
\ No newline at end of file
+ | d[1].l |
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3310b310/gremlin-test/features/map/Max.feature
----------------------------------------------------------------------
diff --git a/gremlin-test/features/map/Max.feature b/gremlin-test/features/map/Max.feature
index ad0a270..7139f65 100644
--- a/gremlin-test/features/map/Max.feature
+++ b/gremlin-test/features/map/Max.feature
@@ -28,6 +28,35 @@ Feature: Step - max()
| result |
| d[35].i |
+ Scenario: g_V_foo_max
+ Given the modern graph
+ And the traversal of
+ """
+ g.V().values("foo").max()
+ """
+ When iterated to list
+ Then the result should be empty
+
+ Scenario: g_V_age_fold_maxXlocalX
+ Given the modern graph
+ And the traversal of
+ """
+ g.V().values("age").fold().max(Scope.local)
+ """
+ When iterated to list
+ Then the result should be unordered
+ | result |
+ | d[35].i |
+
+ Scenario: g_V_foo_fold_maxXlocalX
+ Given the modern graph
+ And the traversal of
+ """
+ g.V().values("foo").fold().max(Scope.local)
+ """
+ When iterated to list
+ Then the result should be empty
+
Scenario: g_V_repeatXbothX_timesX5X_age_max
Given the modern graph
And the traversal of
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3310b310/gremlin-test/features/map/Mean.feature
----------------------------------------------------------------------
diff --git a/gremlin-test/features/map/Mean.feature b/gremlin-test/features/map/Mean.feature
index b109356..dc28ecb 100644
--- a/gremlin-test/features/map/Mean.feature
+++ b/gremlin-test/features/map/Mean.feature
@@ -28,6 +28,35 @@ Feature: Step - mean()
| result |
| d[30.75].d |
+ Scenario: g_V_foo_mean
+ Given the modern graph
+ And the traversal of
+ """
+ g.V().values("foo").mean()
+ """
+ When iterated to list
+ Then the result should be empty
+
+ Scenario: g_V_age_fold_meanXlocalX
+ Given the modern graph
+ And the traversal of
+ """
+ g.V().values("age").fold().mean(Scope.local)
+ """
+ When iterated to list
+ Then the result should be unordered
+ | result |
+ | d[30.75].d |
+
+ Scenario: g_V_foo_fold_meanXlocalX
+ Given the modern graph
+ And the traversal of
+ """
+ g.V().values("foo").fold().mean(Scope.local)
+ """
+ When iterated to list
+ Then the result should be empty
+
Scenario: g_V_hasLabelXsoftwareX_group_byXnameX_byXbothE_weight_meanX
Given the modern graph
And the traversal of
@@ -37,4 +66,4 @@ Feature: Step - mean()
When iterated to list
Then the result should be unordered
| result |
- | m[{"ripple":"d[1.0].d","lop":"d[0.3333333333333333].d"}] |
\ No newline at end of file
+ | m[{"ripple":"d[1.0].d","lop":"d[0.3333333333333333].d"}] |
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3310b310/gremlin-test/features/map/Min.feature
----------------------------------------------------------------------
diff --git a/gremlin-test/features/map/Min.feature b/gremlin-test/features/map/Min.feature
index d77e9f3..6e3fb5d 100644
--- a/gremlin-test/features/map/Min.feature
+++ b/gremlin-test/features/map/Min.feature
@@ -28,6 +28,35 @@ Feature: Step - min()
| result |
| d[27].i |
+ Scenario: g_V_foo_min
+ Given the modern graph
+ And the traversal of
+ """
+ g.V().values("foo").min()
+ """
+ When iterated to list
+ Then the result should be empty
+
+ Scenario: g_V_age_fold_minXlocalX
+ Given the modern graph
+ And the traversal of
+ """
+ g.V().values("age").fold().min(Scope.local)
+ """
+ When iterated to list
+ Then the result should be unordered
+ | result |
+ | d[27].i |
+
+ Scenario: g_V_foo_fold_minXlocalX
+ Given the modern graph
+ And the traversal of
+ """
+ g.V().values("foo").fold().min(Scope.local)
+ """
+ When iterated to list
+ Then the result should be empty
+
Scenario: g_V_repeatXbothX_timesX5X_age_min
Given the modern graph
And the traversal of
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3310b310/gremlin-test/features/map/Order.feature
----------------------------------------------------------------------
diff --git a/gremlin-test/features/map/Order.feature b/gremlin-test/features/map/Order.feature
index 6dd8ac4..8347ad2 100644
--- a/gremlin-test/features/map/Order.feature
+++ b/gremlin-test/features/map/Order.feature
@@ -192,13 +192,13 @@ Feature: Step - order()
When iterated to list
Then the result should be ordered
| result |
- | m[{"vadas":"d[0].i","peter":"d[0.2].d","josh":"d[1.4].d","marko":"d[1.9].d"}] |
+ | m[{"peter":"d[0.2].d","josh":"d[1.4].d","marko":"d[1.9].d"}] |
- Scenario: g_V_localXbothE_weight_foldX_order_byXsumXlocalX_decrX
+ Scenario: g_V_mapXbothE_weight_foldX_order_byXsumXlocalX_decrX
Given the modern graph
And the traversal of
"""
- g.V().local(__.bothE().values("weight").fold()).order().by(__.sum(Scope.local), Order.decr)
+ g.V().map(__.bothE().values("weight").fold()).order().by(__.sum(Scope.local), Order.decr)
"""
When iterated to list
Then the result should be ordered
@@ -233,7 +233,6 @@ Feature: Step - order()
| m[{"marko":"d[1.9].d"}] |
| m[{"josh":"d[1.4].d"}] |
| m[{"peter":"d[0.2].d"}] |
- | m[{"vadas":"d[0].i"}] |
Scenario: g_V_asXvX_mapXbothE_weight_foldX_sumXlocalX_asXsX_selectXv_sX_order_byXselectXsX_decrX
Given the modern graph
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3310b310/gremlin-test/features/map/Sum.feature
----------------------------------------------------------------------
diff --git a/gremlin-test/features/map/Sum.feature b/gremlin-test/features/map/Sum.feature
index 2c89946..816fd2b 100644
--- a/gremlin-test/features/map/Sum.feature
+++ b/gremlin-test/features/map/Sum.feature
@@ -17,7 +17,7 @@
Feature: Step - sum()
- Scenario: g_V_valuesXageX_sum
+ Scenario: g_V_age_sum
Given the modern graph
And the traversal of
"""
@@ -26,7 +26,36 @@ Feature: Step - sum()
When iterated to list
Then the result should be unordered
| result |
- | d[123].l |
+ | d[123].i |
+
+ Scenario: g_V_foo_sum
+ Given the modern graph
+ And the traversal of
+ """
+ g.V().values("foo").sum()
+ """
+ When iterated to list
+ Then the result should be empty
+
+ Scenario: g_V_age_fold_sumXlocalX
+ Given the modern graph
+ And the traversal of
+ """
+ g.V().values("age").fold().sum(Scope.local)
+ """
+ When iterated to list
+ Then the result should be unordered
+ | result |
+ | d[123].i |
+
+ Scenario: g_V_foo_fold_sumXlocalX
+ Given the modern graph
+ And the traversal of
+ """
+ g.V().values("foo").fold().sum(Scope.local)
+ """
+ When iterated to list
+ Then the result should be empty
Scenario: g_V_hasLabelXsoftwareX_group_byXnameX_byXbothE_weight_sumX
Given the modern graph
@@ -37,4 +66,4 @@ Feature: Step - sum()
When iterated to list
Then the result should be unordered
| result |
- | m[{"ripple":"d[1.0].d","lop":"d[1.0].d"}] |
\ No newline at end of file
+ | m[{"ripple":"d[1.0].d","lop":"d[1.0].d"}] |
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3310b310/gremlin-test/features/sideEffect/Group.feature
----------------------------------------------------------------------
diff --git a/gremlin-test/features/sideEffect/Group.feature b/gremlin-test/features/sideEffect/Group.feature
index 94d2191..2686f09 100644
--- a/gremlin-test/features/sideEffect/Group.feature
+++ b/gremlin-test/features/sideEffect/Group.feature
@@ -101,7 +101,7 @@ Feature: Step - group()
When iterated to list
Then the result should be unordered
| result |
- | m[{"software":"d[0].i", "person":"d[3.5].d"}] |
+ | m[{"person":"d[3.5].d"}] |
Scenario: g_V_repeatXbothXfollowedByXX_timesX2X_group_byXsongTypeX_byXcountX
Given the grateful graph
@@ -207,7 +207,7 @@ Feature: Step - group()
When iterated to list
Then the result should be unordered
| result |
- | m[{"cover":{"followedBy":"d[777982].l", "sungBy":"d[0].i", "writtenBy":"d[0].i"}, "":{"followedBy":"d[179350].l"}, "original":{"followedBy":"d[2185613].l", "sungBy":"d[0].i", "writtenBy":"d[0].i"}}] |
+ | m[{"cover":{"followedBy":"d[777982].l"}, "":{"followedBy":"d[179350].l"}, "original":{"followedBy":"d[2185613].l"}}] |
Scenario: g_V_groupXmX_byXnameX_byXinXknowsX_nameX_capXmX
Given the modern graph
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3310b310/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 2f4f103..228b975 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
@@ -1347,13 +1347,13 @@ public class GraphComputerTest extends AbstractGremlinProcessTest {
assertEquals(Long.valueOf(0l), result.graph().traversal().E().count().next());
assertEquals(Long.valueOf(0l), result.graph().traversal().V().values().count().next());
assertEquals(Long.valueOf(0l), result.graph().traversal().E().values().count().next());
- assertEquals(0, result.graph().traversal().V().values("money").sum().next());
+ assertFalse(result.graph().traversal().V().values("money").sum().hasNext());
///
assertEquals(Long.valueOf(6l), graph.traversal().V().count().next());
assertEquals(Long.valueOf(6l), graph.traversal().E().count().next());
assertEquals(Long.valueOf(12l), graph.traversal().V().values().count().next());
assertEquals(Long.valueOf(6l), graph.traversal().E().values().count().next());
- assertEquals(0, graph.traversal().V().values("money").sum().next());
+ assertFalse(graph.traversal().V().values("money").sum().hasNext());
}
}
@@ -1373,7 +1373,7 @@ public class GraphComputerTest extends AbstractGremlinProcessTest {
assertEquals(Long.valueOf(6l), graph.traversal().E().count().next());
assertEquals(Long.valueOf(12l), graph.traversal().V().values().count().next());
assertEquals(Long.valueOf(6l), graph.traversal().E().values().count().next());
- assertEquals(0, graph.traversal().V().values("money").sum().next());
+ assertFalse(graph.traversal().V().values("money").sum().hasNext());
}
}
@@ -1393,7 +1393,7 @@ public class GraphComputerTest extends AbstractGremlinProcessTest {
assertEquals(Long.valueOf(6l), graph.traversal().E().count().next());
assertEquals(Long.valueOf(12l), graph.traversal().V().values().count().next());
assertEquals(Long.valueOf(6l), graph.traversal().E().values().count().next());
- assertEquals(0, graph.traversal().V().values("money").sum().next());
+ assertFalse(graph.traversal().V().values("money").sum().hasNext());
}
}
@@ -1407,13 +1407,13 @@ public class GraphComputerTest extends AbstractGremlinProcessTest {
assertEquals(Long.valueOf(6l), result.graph().traversal().E().count().next());
assertEquals(Long.valueOf(12l), result.graph().traversal().V().values().count().next());
assertEquals(Long.valueOf(6l), result.graph().traversal().E().values().count().next());
- assertEquals(0, result.graph().traversal().V().values("money").sum().next());
+ assertFalse(result.graph().traversal().V().values("money").sum().hasNext());
///
assertEquals(Long.valueOf(6l), graph.traversal().V().count().next());
assertEquals(Long.valueOf(6l), graph.traversal().E().count().next());
assertEquals(Long.valueOf(12l), graph.traversal().V().values().count().next());
assertEquals(Long.valueOf(6l), graph.traversal().E().values().count().next());
- assertEquals(0, graph.traversal().V().values("money").sum().next());
+ assertFalse(graph.traversal().V().values("money").sum().hasNext());
}
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3310b310/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/UnionTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/UnionTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/UnionTest.java
index 1c06943..bbe5eff 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/UnionTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/UnionTest.java
@@ -135,7 +135,7 @@ public abstract class UnionTest extends AbstractGremlinProcessTest {
public void g_VX1_2X_localXunionXoutE_count__inE_count__outE_weight_sumXX() {
final Traversal<Vertex, Number> traversal = get_g_VX1_2X_localXunionXoutE_count__inE_count__outE_weight_sumXX(convertToVertexId("marko"), convertToVertexId("vadas"));
printTraversalForm(traversal);
- checkResults(Arrays.asList(0l, 0l, 0, 3l, 1l, 1.9d), traversal);
+ checkResults(Arrays.asList(3L, 0L, 1.9, 0L, 1L), traversal);
}
@Test
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3310b310/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderTest.java
index bbf63ef..d5cd6fd 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderTest.java
@@ -76,7 +76,7 @@ public abstract class OrderTest extends AbstractGremlinProcessTest {
public abstract Traversal<Vertex, Map<String, List<Vertex>>> get_g_V_group_byXlabelX_byXname_order_byXdecrX_foldX();
- public abstract Traversal<Vertex, List<Double>> get_g_V_localXbothE_weight_foldX_order_byXsumXlocalX_decrX();
+ public abstract Traversal<Vertex, List<Double>> get_g_V_mapXbothE_weight_foldX_order_byXsumXlocalX_decrX();
public abstract Traversal<Vertex, Map<String, Object>> get_g_V_asXvX_mapXbothE_weight_foldX_sumXlocalX_asXsX_selectXv_sX_order_byXselectXsX_decrX();
@@ -244,8 +244,8 @@ public abstract class OrderTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
- public void g_V_localXbothE_weight_foldX_order_byXsumXlocalX_decrX() {
- final Traversal<Vertex, List<Double>> traversal = get_g_V_localXbothE_weight_foldX_order_byXsumXlocalX_decrX();
+ public void g_V_mapXbothE_weight_foldX_order_byXsumXlocalX_decrX() {
+ final Traversal<Vertex, List<Double>> traversal = get_g_V_mapXbothE_weight_foldX_order_byXsumXlocalX_decrX();
final List<List<Double>> list = traversal.toList();
assertEquals(list.get(0).size(), 3);
assertEquals(list.get(1).size(), 3);
@@ -386,12 +386,9 @@ public abstract class OrderTest extends AbstractGremlinProcessTest {
assertTrue(traversal.hasNext());
final Map<String, Number> m = traversal.next();
assertFalse(traversal.hasNext());
- assertEquals(4, m.size());
+ assertEquals(3, m.size());
final Iterator<Map.Entry<String, Number>> iterator = m.entrySet().iterator();
Map.Entry<String, Number> entry = iterator.next();
- assertEquals("vadas", entry.getKey());
- assertEquals(0.0, entry.getValue().doubleValue(), 0.0001);
- entry = iterator.next();
assertEquals("peter", entry.getKey());
assertEquals(0.2, entry.getValue().doubleValue(), 0.0001);
entry = iterator.next();
@@ -417,9 +414,6 @@ public abstract class OrderTest extends AbstractGremlinProcessTest {
entry = traversal.next();
assertEquals("peter", entry.getKey());
assertEquals(0.2, entry.getValue().doubleValue(), 0.0001);
- entry = traversal.next();
- assertEquals("vadas", entry.getKey());
- assertEquals(0.0, entry.getValue().doubleValue(), 0.0001);
assertFalse(traversal.hasNext());
}
@@ -485,8 +479,8 @@ public abstract class OrderTest extends AbstractGremlinProcessTest {
}
@Override
- public Traversal<Vertex, List<Double>> get_g_V_localXbothE_weight_foldX_order_byXsumXlocalX_decrX() {
- return g.V().local(__.bothE().<Double>values("weight").fold()).order().by(__.sum(Scope.local), Order.decr);
+ public Traversal<Vertex, List<Double>> get_g_V_mapXbothE_weight_foldX_order_byXsumXlocalX_decrX() {
+ return g.V().map(__.bothE().<Double>values("weight").fold()).order().by(__.sum(Scope.local), Order.decr);
}
@Override
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3310b310/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SumTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SumTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SumTest.java
index e1bbd0b..f8bfbcb 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SumTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SumTest.java
@@ -40,9 +40,9 @@ import static org.junit.Assert.*;
@RunWith(GremlinProcessRunner.class)
public abstract class SumTest extends AbstractGremlinProcessTest {
- public abstract Traversal<Vertex, Integer> get_g_V_valuesXageX_sum();
+ public abstract Traversal<Vertex, Number> get_g_V_age_sum();
- public abstract Traversal<Vertex, Integer> get_g_V_age_fold_sumXlocalX();
+ public abstract Traversal<Vertex, Number> get_g_V_age_fold_sumXlocalX();
public abstract Traversal<Vertex, Number> get_g_V_foo_sum();
@@ -52,10 +52,10 @@ public abstract class SumTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
- public void g_V_valuesXageX_sum() {
- final Traversal<Vertex, Integer> traversal = get_g_V_valuesXageX_sum();
+ public void g_V_age_sum() {
+ final Traversal<Vertex, Number> traversal = get_g_V_age_sum();
printTraversalForm(traversal);
- final Integer sum = traversal.next();
+ final Number sum = traversal.next();
assertEquals(123, sum.intValue());
assertFalse(traversal.hasNext());
}
@@ -63,9 +63,9 @@ public abstract class SumTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
public void g_V_age_fold_sumXlocalX() {
- final Traversal<Vertex, Integer> traversal = get_g_V_age_fold_sumXlocalX();
+ final Traversal<Vertex, Number> traversal = get_g_V_age_fold_sumXlocalX();
printTraversalForm(traversal);
- final Integer sum = traversal.next();
+ final Number sum = traversal.next();
assertEquals(123, sum.intValue());
assertFalse(traversal.hasNext());
}
@@ -102,12 +102,12 @@ public abstract class SumTest extends AbstractGremlinProcessTest {
public static class Traversals extends SumTest {
@Override
- public Traversal<Vertex, Integer> get_g_V_valuesXageX_sum() {
+ public Traversal<Vertex, Number> get_g_V_age_sum() {
return g.V().values("age").sum();
}
@Override
- public Traversal<Vertex, Integer> get_g_V_age_fold_sumXlocalX() {
+ public Traversal<Vertex, Number> get_g_V_age_fold_sumXlocalX() {
return g.V().values("age").fold().sum(Scope.local);
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3310b310/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroupTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroupTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroupTest.java
index 3e1e53b..6a58aa7 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroupTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroupTest.java
@@ -218,8 +218,7 @@ public abstract class GroupTest extends AbstractGremlinProcessTest {
assertTrue(traversal.hasNext());
final Map<String, Number> map = traversal.next();
assertFalse(traversal.hasNext());
- assertEquals(2, map.size());
- assertEquals(0, map.get("software"));
+ assertEquals(1, map.size());
assertEquals(3.5d, (double) map.get("person"), 0.01d);
checkSideEffects(traversal.asAdmin().getSideEffects(), "a", HashMap.class);
}
@@ -424,16 +423,12 @@ public abstract class GroupTest extends AbstractGremlinProcessTest {
assertEquals(179350, subMap.get("followedBy").intValue());
//
subMap = map.get("original");
- assertEquals(3, subMap.size());
+ assertEquals(1, subMap.size());
assertEquals(2185613, subMap.get("followedBy").intValue());
- assertEquals(0, subMap.get("writtenBy").intValue());
- assertEquals(0, subMap.get("sungBy").intValue());
//
subMap = map.get("cover");
- assertEquals(3, subMap.size());
+ assertEquals(1, subMap.size());
assertEquals(777982, subMap.get("followedBy").intValue());
- assertEquals(0, subMap.get("writtenBy").intValue());
- assertEquals(0, subMap.get("sungBy").intValue());
}
@Test
[17/30] tinkerpop git commit: Fixed GLV types in tests that were
failing for .NET CTR
Posted by dk...@apache.org.
Fixed GLV types in tests that were failing for .NET CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/c9725129
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/c9725129
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/c9725129
Branch: refs/heads/TINKERPOP-1777
Commit: c97251297e47a3dafb3541d886e14e4cd28cc5f5
Parents: bbc96ee
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Mar 1 10:16:08 2018 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Mar 1 10:16:45 2018 -0500
----------------------------------------------------------------------
.../Gherkin/GherkinTestRunner.cs | 4 +---
gremlin-test/features/map/Select.feature | 16 ++++++++--------
2 files changed, 9 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c9725129/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 3b39cd3..cc2b540 100644
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
@@ -41,9 +41,7 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
{ "g_V_hasLabelXpersonX_hasXage_notXlteX10X_andXnotXbetweenX11_20XXXX_andXltX29X_orXeqX35XXXX_name", IgnoreReason.NeedsFurtherInvestigation }, // TINKERPOP-1859??
{ "g_VX1X_out_aggregateXxX_out_whereXnotXwithinXaXXX", IgnoreReason.NeedsFurtherInvestigation }, // TINKERPOP-1859??
{ "g_withBulkXfalseX_withSackX1_sumX_V_out_barrier_sack", IgnoreReason.NeedsFurtherInvestigation },
- { "g_V_hasXname_markoX_propertyXfriendWeight_outEXknowsX_weight_sum__acl_privateX", IgnoreReason.NeedsFurtherInvestigation },
- { "g_V_outE_weight_groupCount_unfold_selectXkeysX_unfold", IgnoreReason.NeedsFurtherInvestigation },
- { "g_V_outE_weight_groupCount_selectXkeysX_unfold", IgnoreReason.NeedsFurtherInvestigation }
+ { "g_V_hasXname_markoX_propertyXfriendWeight_outEXknowsX_weight_sum__acl_privateX", IgnoreReason.NeedsFurtherInvestigation }
};
private static class Keywords
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c9725129/gremlin-test/features/map/Select.feature
----------------------------------------------------------------------
diff --git a/gremlin-test/features/map/Select.feature b/gremlin-test/features/map/Select.feature
index d77e21f..35d9322 100644
--- a/gremlin-test/features/map/Select.feature
+++ b/gremlin-test/features/map/Select.feature
@@ -347,10 +347,10 @@ Feature: Step - select()
When iterated to list
Then the result should be unordered
| result |
- | d[0.5].f |
- | d[1.0].f |
- | d[0.4].f |
- | d[0.2].f |
+ | d[0.5].d |
+ | d[1.0].d |
+ | d[0.4].d |
+ | d[0.2].d |
Scenario: g_V_hasLabelXsoftwareX_asXnameX_asXlanguageX_asXcreatorsX_selectXname_language_creatorsX_byXnameX_byXlangX_byXinXcreatedX_name_fold_orderXlocalXX
Given the modern graph
@@ -374,10 +374,10 @@ Feature: Step - select()
When iterated to list
Then the result should be unordered
| result |
- | d[0.5].f |
- | d[1.0].f |
- | d[0.4].f |
- | d[0.2].f |
+ | d[0.5].d |
+ | d[1.0].d |
+ | d[0.4].d |
+ | d[0.2].d |
Scenario: g_V_outE_weight_groupCount_unfold_selectXvaluesX_unfold
Given the modern graph
[07/30] tinkerpop git commit: Merge branch 'tp32' into tp33
Posted by dk...@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/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/TINKERPOP-1777
Commit: e1d7f80ba01b7ad186f23979d98c69cb559a24c1
Parents: 032124a d520516
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Feb 28 15:40:37 2018 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
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
----------------------------------------------------------------------
[30/30] tinkerpop git commit: fixed sum() in Spark
Posted by dk...@apache.org.
fixed sum() in Spark
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/087525e2
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/087525e2
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/087525e2
Branch: refs/heads/TINKERPOP-1777
Commit: 087525e2449741aa7278f38c729d048b633ee5bc
Parents: 674d800
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Fri Mar 2 10:40:39 2018 -0700
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Fri Mar 2 10:40:39 2018 -0700
----------------------------------------------------------------------
.../optimization/interceptor/SparkStarBarrierInterceptor.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/087525e2/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/process/computer/traversal/strategy/optimization/interceptor/SparkStarBarrierInterceptor.java
----------------------------------------------------------------------
diff --git a/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/process/computer/traversal/strategy/optimization/interceptor/SparkStarBarrierInterceptor.java b/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/process/computer/traversal/strategy/optimization/interceptor/SparkStarBarrierInterceptor.java
index 3c89c1d..6509928 100644
--- a/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/process/computer/traversal/strategy/optimization/interceptor/SparkStarBarrierInterceptor.java
+++ b/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/process/computer/traversal/strategy/optimization/interceptor/SparkStarBarrierInterceptor.java
@@ -98,9 +98,9 @@ public final class SparkStarBarrierInterceptor implements SparkVertexProgramInte
// USE SPARK DSL FOR THE RESPECTIVE END REDUCING BARRIER STEP OF THE TRAVERSAL
final Object result;
if (endStep instanceof CountGlobalStep)
- result = nextRDD.map(Traverser::bulk).fold(0l, (a, b) -> a + b);
+ result = nextRDD.map(Traverser::bulk).fold(0L, (a, b) -> a + b);
else if (endStep instanceof SumGlobalStep) {
- result = nextRDD
+ result = nextRDD.isEmpty() ? null : nextRDD
.map(traverser -> NumberHelper.mul(traverser.bulk(), (Number) traverser.get()))
.fold(0, NumberHelper::add);
} else if (endStep instanceof MeanGlobalStep) {
[09/30] tinkerpop git commit: Fixed a GLV test definition.
Posted by dk...@apache.org.
Fixed a GLV test definition.
This allowed some ignored tests to pass CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/6cfdfa93
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/6cfdfa93
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/6cfdfa93
Branch: refs/heads/TINKERPOP-1777
Commit: 6cfdfa93787ff7620ac73dcda70dc8e11be519cc
Parents: d520516
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Mar 1 08:35:57 2018 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Mar 1 08:35:57 2018 -0500
----------------------------------------------------------------------
.../test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs | 2 --
gremlin-test/features/map/Match.feature | 2 +-
2 files changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6cfdfa93/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 69af86f..627570c 100644
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
@@ -39,7 +39,6 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
{
private static readonly IDictionary<string, IgnoreReason> IgnoredScenarios = new Dictionary<string, IgnoreReason> {
{ "g_V_hasLabelXpersonX_hasXage_notXlteX10X_andXnotXbetweenX11_20XXXX_andXltX29X_orXeqX35XXXX_name", IgnoreReason.NeedsFurtherInvestigation },
- { "g_V_hasIdXwithinXemptyXX_count", IgnoreReason.NeedsFurtherInvestigation },
{ "g_VX1X_out_aggregateXxX_out_whereXnotXwithinXaXXX", IgnoreReason.NeedsFurtherInvestigation },
{ "g_V_asXaX_out_asXbX_whereXandXasXaX_outXknowsX_asXbX__orXasXbX_outXcreatedX_hasXname_rippleX__asXbX_inXknowsX_count_isXnotXeqX0XXXXX_selectXa_bX", IgnoreReason.NeedsFurtherInvestigation },
{ "g_V_asXaX_outXcreatedX_asXbX_inXcreatedX_asXcX_bothXknowsX_bothXknowsX_asXdX_whereXc__notXeqXaX_orXeqXdXXXX_selectXa_b_c_dX", IgnoreReason.NeedsFurtherInvestigation },
@@ -53,7 +52,6 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
{ "g_V_outE_weight_groupCount_unfold_selectXkeysX_unfold", IgnoreReason.NeedsFurtherInvestigation },
{ "g_V_outE_weight_groupCount_selectXkeysX_unfold", IgnoreReason.NeedsFurtherInvestigation },
{ "g_V_asXaX_out_asXbX_matchXa_out_count_c__b_in_count_cX", IgnoreReason.NeedsFurtherInvestigation },
- { "g_V_matchXa_knows_b__andXa_created_c__b_created_c__andXb_created_count_d__a_knows_count_dXXX", IgnoreReason.NeedsFurtherInvestigation },
{ "g_V_foo_injectX9999999999X_min", IgnoreReason.NeedsFurtherInvestigation },
{ "g_V_hasLabelXpersonX_group_byXnameX_byXoutE_weight_sumX_orderXlocalX_byXvaluesX", IgnoreReason.NeedsFurtherInvestigation },
{ "g_V_localXbothE_weight_foldX_order_byXsumXlocalX_decrX", IgnoreReason.NeedsFurtherInvestigation },
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6cfdfa93/gremlin-test/features/map/Match.feature
----------------------------------------------------------------------
diff --git a/gremlin-test/features/map/Match.feature b/gremlin-test/features/map/Match.feature
index 006692a..e44d363 100644
--- a/gremlin-test/features/map/Match.feature
+++ b/gremlin-test/features/map/Match.feature
@@ -230,7 +230,7 @@ Feature: Step - match()
When iterated to list
Then the result should be unordered
| result |
- | m[{"a":"v[marko]","b":"v[josh]","c":"v[lop]","d":2}] |
+ | m[{"a":"v[marko]","b":"v[josh]","c":"v[lop]","d":"d[2].l"}] |
Scenario: g_V_matchXa_whereXa_neqXcXX__a_created_b__orXa_knows_vadas__a_0knows_and_a_hasXlabel_personXX__b_0created_c__b_0created_count_isXgtX1XXX_selectXa_b_cX_byXidX
Given the modern graph
[26/30] tinkerpop git commit: Merge branch 'tp33'
Posted by dk...@apache.org.
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/cef13dd6
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/cef13dd6
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/cef13dd6
Branch: refs/heads/TINKERPOP-1777
Commit: cef13dd659a360b93f7f6911e9868c943e060575
Parents: b31e27d 9eed217
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Thu Mar 1 09:18:33 2018 -0700
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Thu Mar 1 09:18:33 2018 -0700
----------------------------------------------------------------------
docs/preprocessor/preprocess-file.sh | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
[12/30] tinkerpop git commit: Fixed up more GLV definitions to get
more .NET tests pass
Posted by dk...@apache.org.
Fixed up more GLV definitions to get more .NET tests pass
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/2c96d424
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/2c96d424
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/2c96d424
Branch: refs/heads/TINKERPOP-1777
Commit: 2c96d424d825ce98d8ad28d915f6fa375fc3b714
Parents: 6cfdfa9
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Mar 1 08:46:53 2018 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Mar 1 08:46:53 2018 -0500
----------------------------------------------------------------------
.../test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs | 2 --
gremlin-test/features/map/Match.feature | 2 +-
gremlin-test/features/sideEffect/SideEffectCap.feature | 2 +-
3 files changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2c96d424/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 627570c..402a910 100644
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
@@ -47,11 +47,9 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
{ "g_withBulkXfalseX_withSackX1_sumX_VX1X_localXoutEXknowsX_barrierXnormSackX_inVX_inXknowsX_barrier_sack", IgnoreReason.NeedsFurtherInvestigation },
{ "g_withBulkXfalseX_withSackX1_sumX_V_out_barrier_sack", IgnoreReason.NeedsFurtherInvestigation },
{ "g_withSackX1_sumX_VX1X_localXoutXknowsX_barrierXnormSackXX_inXknowsX_barrier_sack", IgnoreReason.NeedsFurtherInvestigation },
- { "g_V_hasXageX_groupCountXaX_byXnameX_out_capXaX", IgnoreReason.NeedsFurtherInvestigation },
{ "g_V_hasXname_markoX_propertyXfriendWeight_outEXknowsX_weight_sum__acl_privateX", IgnoreReason.NeedsFurtherInvestigation },
{ "g_V_outE_weight_groupCount_unfold_selectXkeysX_unfold", IgnoreReason.NeedsFurtherInvestigation },
{ "g_V_outE_weight_groupCount_selectXkeysX_unfold", IgnoreReason.NeedsFurtherInvestigation },
- { "g_V_asXaX_out_asXbX_matchXa_out_count_c__b_in_count_cX", IgnoreReason.NeedsFurtherInvestigation },
{ "g_V_foo_injectX9999999999X_min", IgnoreReason.NeedsFurtherInvestigation },
{ "g_V_hasLabelXpersonX_group_byXnameX_byXoutE_weight_sumX_orderXlocalX_byXvaluesX", IgnoreReason.NeedsFurtherInvestigation },
{ "g_V_localXbothE_weight_foldX_order_byXsumXlocalX_decrX", IgnoreReason.NeedsFurtherInvestigation },
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2c96d424/gremlin-test/features/map/Match.feature
----------------------------------------------------------------------
diff --git a/gremlin-test/features/map/Match.feature b/gremlin-test/features/map/Match.feature
index e44d363..55dffcf 100644
--- a/gremlin-test/features/map/Match.feature
+++ b/gremlin-test/features/map/Match.feature
@@ -134,7 +134,7 @@ Feature: Step - match()
When iterated to list
Then the result should be unordered
| result |
- | m[{"a":"v[marko]","b":"v[lop]","c":3}] |
+ | m[{"a":"v[marko]","b":"v[lop]","c":"d[3].l"}] |
Scenario: g_V_matchXa__a_out_b__notXa_created_bXX
Given the modern graph
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2c96d424/gremlin-test/features/sideEffect/SideEffectCap.feature
----------------------------------------------------------------------
diff --git a/gremlin-test/features/sideEffect/SideEffectCap.feature b/gremlin-test/features/sideEffect/SideEffectCap.feature
index 795db7e..437bd08 100644
--- a/gremlin-test/features/sideEffect/SideEffectCap.feature
+++ b/gremlin-test/features/sideEffect/SideEffectCap.feature
@@ -26,7 +26,7 @@ Feature: Step - cap()
When iterated to list
Then the result should be unordered
| result |
- | m[{"peter":"d[1].i", "vadas":"d[1].i", "josh":"d[1].i", "marko": "d[1].i"}] |
+ | m[{"peter":"d[1].l", "vadas":"d[1].l", "josh":"d[1].l", "marko": "d[1].l"}] |
Scenario: g_V_chooseXlabel_person__age_groupCountXaX__name_groupCountXbXX_capXa_bX
Given an unsupported test
[18/30] tinkerpop git commit: Added friendWeight to type info in .NET
Posted by dk...@apache.org.
Added friendWeight to type info in .NET
Tests were failing for .NET as a result of the missing type information. We really shouldn't have tests that modify the toy graphs, but something to resolve another day. CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/153f852b
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/153f852b
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/153f852b
Branch: refs/heads/TINKERPOP-1777
Commit: 153f852b3abbe801f77d4cc3cd15ca8bc88ad5ed
Parents: c972512
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Mar 1 10:22:59 2018 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Mar 1 10:22:59 2018 -0500
----------------------------------------------------------------------
.../test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs | 3 +--
.../Gherkin/TraversalEvaluation/ModernGraphTypeInformation.cs | 3 ++-
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/153f852b/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 cc2b540..c2a8850 100644
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
@@ -40,8 +40,7 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
private static readonly IDictionary<string, IgnoreReason> IgnoredScenarios = new Dictionary<string, IgnoreReason> {
{ "g_V_hasLabelXpersonX_hasXage_notXlteX10X_andXnotXbetweenX11_20XXXX_andXltX29X_orXeqX35XXXX_name", IgnoreReason.NeedsFurtherInvestigation }, // TINKERPOP-1859??
{ "g_VX1X_out_aggregateXxX_out_whereXnotXwithinXaXXX", IgnoreReason.NeedsFurtherInvestigation }, // TINKERPOP-1859??
- { "g_withBulkXfalseX_withSackX1_sumX_V_out_barrier_sack", IgnoreReason.NeedsFurtherInvestigation },
- { "g_V_hasXname_markoX_propertyXfriendWeight_outEXknowsX_weight_sum__acl_privateX", IgnoreReason.NeedsFurtherInvestigation }
+ { "g_withBulkXfalseX_withSackX1_sumX_V_out_barrier_sack", IgnoreReason.NeedsFurtherInvestigation }
};
private static class Keywords
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/153f852b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/TraversalEvaluation/ModernGraphTypeInformation.cs
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/TraversalEvaluation/ModernGraphTypeInformation.cs b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/TraversalEvaluation/ModernGraphTypeInformation.cs
index 7eca018..327a50a 100644
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/TraversalEvaluation/ModernGraphTypeInformation.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/TraversalEvaluation/ModernGraphTypeInformation.cs
@@ -38,7 +38,8 @@ namespace Gremlin.Net.IntegrationTest.Gherkin.TraversalEvaluation
{"name", typeof(string)},
{"lang", typeof(string)},
{"weight", typeof(float)},
- {"foo", typeof(object)} // used when for invalid property key lookups
+ {"foo", typeof(object)}, // used when for invalid property key lookups
+ {"friendWeight", typeof(float)} // used in an AddVertex.feature test
};
/// <summary>
[10/30] tinkerpop git commit: Merge branch 'tp32' into tp33
Posted by dk...@apache.org.
Merge branch 'tp32' into tp33
Conflicts:
gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/b516a6a5
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/b516a6a5
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/b516a6a5
Branch: refs/heads/TINKERPOP-1777
Commit: b516a6a571e3a1891af4f4245d42ac408638329f
Parents: e1d7f80 6cfdfa9
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Mar 1 08:37:53 2018 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Mar 1 08:37:53 2018 -0500
----------------------------------------------------------------------
.../test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs | 2 --
gremlin-test/features/map/Match.feature | 2 +-
2 files changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b516a6a5/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
----------------------------------------------------------------------
diff --cc gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
index 5f331cb,627570c..bb97867
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
@@@ -37,32 -37,26 +37,30 @@@ namespace Gremlin.Net.IntegrationTest.G
{
public class GherkinTestRunner
{
- private static readonly IDictionary<string, IgnoreReason> IgnoredScenarios = new Dictionary<string, IgnoreReason> {
- { "g_V_hasLabelXpersonX_hasXage_notXlteX10X_andXnotXbetweenX11_20XXXX_andXltX29X_orXeqX35XXXX_name", IgnoreReason.NeedsFurtherInvestigation },
- { "g_VX1X_out_aggregateXxX_out_whereXnotXwithinXaXXX", IgnoreReason.NeedsFurtherInvestigation },
- { "g_V_asXaX_out_asXbX_whereXandXasXaX_outXknowsX_asXbX__orXasXbX_outXcreatedX_hasXname_rippleX__asXbX_inXknowsX_count_isXnotXeqX0XXXXX_selectXa_bX", IgnoreReason.NeedsFurtherInvestigation },
- { "g_V_asXaX_outXcreatedX_asXbX_inXcreatedX_asXcX_bothXknowsX_bothXknowsX_asXdX_whereXc__notXeqXaX_orXeqXdXXXX_selectXa_b_c_dX", IgnoreReason.NeedsFurtherInvestigation },
- { "g_V_asXaX_outEXcreatedX_asXbX_inV_asXcX_whereXa_gtXbX_orXeqXbXXX_byXageX_byXweightX_byXweightX_selectXa_cX_byXnameX", IgnoreReason.NeedsFurtherInvestigation },
- { "g_V_asXaX_outEXcreatedX_asXbX_inV_asXcX_inXcreatedX_asXdX_whereXa_ltXbX_orXgtXcXX_andXneqXdXXX_byXageX_byXweightX_byXinXcreatedX_valuesXageX_minX_selectXa_c_dX", IgnoreReason.NeedsFurtherInvestigation },
- { "g_withBulkXfalseX_withSackX1_sumX_VX1X_localXoutEXknowsX_barrierXnormSackX_inVX_inXknowsX_barrier_sack", IgnoreReason.NeedsFurtherInvestigation },
- { "g_withBulkXfalseX_withSackX1_sumX_V_out_barrier_sack", IgnoreReason.NeedsFurtherInvestigation },
- { "g_withSackX1_sumX_VX1X_localXoutXknowsX_barrierXnormSackXX_inXknowsX_barrier_sack", IgnoreReason.NeedsFurtherInvestigation },
- { "g_V_hasXageX_groupCountXaX_byXnameX_out_capXaX", IgnoreReason.NeedsFurtherInvestigation },
- { "g_V_hasXname_markoX_propertyXfriendWeight_outEXknowsX_weight_sum__acl_privateX", IgnoreReason.NeedsFurtherInvestigation },
- { "g_V_outE_weight_groupCount_unfold_selectXkeysX_unfold", IgnoreReason.NeedsFurtherInvestigation },
- { "g_V_outE_weight_groupCount_selectXkeysX_unfold", IgnoreReason.NeedsFurtherInvestigation },
- { "g_V_asXaX_out_asXbX_matchXa_out_count_c__b_in_count_cX", IgnoreReason.NeedsFurtherInvestigation },
- { "g_V_foo_injectX9999999999X_min", IgnoreReason.NeedsFurtherInvestigation },
- { "g_V_hasLabelXpersonX_group_byXnameX_byXoutE_weight_sumX_orderXlocalX_byXvaluesX", IgnoreReason.NeedsFurtherInvestigation },
- { "g_V_localXbothE_weight_foldX_order_byXsumXlocalX_decrX", IgnoreReason.NeedsFurtherInvestigation },
- { "g_V_hasLabelXpersonX_group_byXnameX_byXoutE_weight_sumX_unfold_order_byXvalues_decrX", IgnoreReason.NeedsFurtherInvestigation }
- };
+ private static readonly IDictionary<string, IgnoreReason> IgnoredScenarios =
+ new Dictionary<string, IgnoreReason>
+ {
+ { "g_V_valueMapXtrueX", IgnoreReason.TraversalTDeserializationNotSupported },
+ { "g_V_valueMapXtrue_name_ageX", IgnoreReason.TraversalTDeserializationNotSupported },
+ { "g_V_hasLabelXpersonX_hasXage_notXlteX10X_andXnotXbetweenX11_20XXXX_andXltX29X_orXeqX35XXXX_name", IgnoreReason.NeedsFurtherInvestigation },
- { "g_V_hasIdXwithinXemptyXX_count", IgnoreReason.NeedsFurtherInvestigation },
+ { "g_VX1X_out_aggregateXxX_out_whereXnotXwithinXaXXX", IgnoreReason.NeedsFurtherInvestigation },
+ { "g_V_asXaX_out_asXbX_whereXandXasXaX_outXknowsX_asXbX__orXasXbX_outXcreatedX_hasXname_rippleX__asXbX_inXknowsX_count_isXnotXeqX0XXXXX_selectXa_bX", IgnoreReason.NeedsFurtherInvestigation },
+ { "g_V_asXaX_outXcreatedX_asXbX_inXcreatedX_asXcX_bothXknowsX_bothXknowsX_asXdX_whereXc__notXeqXaX_orXeqXdXXXX_selectXa_b_c_dX", IgnoreReason.NeedsFurtherInvestigation },
+ { "g_V_asXaX_outEXcreatedX_asXbX_inV_asXcX_whereXa_gtXbX_orXeqXbXXX_byXageX_byXweightX_byXweightX_selectXa_cX_byXnameX", IgnoreReason.NeedsFurtherInvestigation },
+ { "g_V_asXaX_outEXcreatedX_asXbX_inV_asXcX_inXcreatedX_asXdX_whereXa_ltXbX_orXgtXcXX_andXneqXdXXX_byXageX_byXweightX_byXinXcreatedX_valuesXageX_minX_selectXa_c_dX", IgnoreReason.NeedsFurtherInvestigation },
+ { "g_withBulkXfalseX_withSackX1_sumX_VX1X_localXoutEXknowsX_barrierXnormSackX_inVX_inXknowsX_barrier_sack", IgnoreReason.NeedsFurtherInvestigation },
+ { "g_withBulkXfalseX_withSackX1_sumX_V_out_barrier_sack", IgnoreReason.NeedsFurtherInvestigation },
+ { "g_withSackX1_sumX_VX1X_localXoutXknowsX_barrierXnormSackXX_inXknowsX_barrier_sack", IgnoreReason.NeedsFurtherInvestigation },
+ { "g_V_hasXageX_groupCountXaX_byXnameX_out_capXaX", IgnoreReason.NeedsFurtherInvestigation },
+ { "g_V_hasXname_markoX_propertyXfriendWeight_outEXknowsX_weight_sum__acl_privateX", IgnoreReason.NeedsFurtherInvestigation },
+ { "g_V_outE_weight_groupCount_unfold_selectXkeysX_unfold", IgnoreReason.NeedsFurtherInvestigation },
+ { "g_V_outE_weight_groupCount_selectXkeysX_unfold", IgnoreReason.NeedsFurtherInvestigation },
+ { "g_V_asXaX_out_asXbX_matchXa_out_count_c__b_in_count_cX", IgnoreReason.NeedsFurtherInvestigation },
- { "g_V_matchXa_knows_b__andXa_created_c__b_created_c__andXb_created_count_d__a_knows_count_dXXX", IgnoreReason.NeedsFurtherInvestigation },
+ { "g_V_foo_injectX9999999999X_min", IgnoreReason.NeedsFurtherInvestigation },
+ { "g_V_hasLabelXpersonX_group_byXnameX_byXoutE_weight_sumX_orderXlocalX_byXvaluesX", IgnoreReason.NeedsFurtherInvestigation },
+ { "g_V_localXbothE_weight_foldX_order_byXsumXlocalX_decrX", IgnoreReason.NeedsFurtherInvestigation },
+ { "g_V_hasLabelXpersonX_group_byXnameX_byXoutE_weight_sumX_unfold_order_byXvalues_decrX", IgnoreReason.NeedsFurtherInvestigation }
+ };
private static class Keywords
{
[20/30] tinkerpop git commit: Merge branch 'tp32' into tp33
Posted by dk...@apache.org.
Merge branch 'tp32' into tp33
Conflicts:
gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/247e008c
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/247e008c
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/247e008c
Branch: refs/heads/TINKERPOP-1777
Commit: 247e008c4ef12cc2c12b731e445ffe743523ee5e
Parents: b516a6a 8ef717f
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Mar 1 10:34:44 2018 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Mar 1 10:34:44 2018 -0500
----------------------------------------------------------------------
.../Gherkin/GherkinTestRunner.cs | 32 +++++---------------
.../ModernGraphTypeInformation.cs | 4 ++-
gremlin-test/features/map/Match.feature | 2 +-
gremlin-test/features/map/Min.feature | 3 +-
gremlin-test/features/map/Order.feature | 16 +++++-----
gremlin-test/features/map/Select.feature | 16 +++++-----
gremlin-test/features/sideEffect/Sack.feature | 2 +-
.../features/sideEffect/SideEffectCap.feature | 2 +-
8 files changed, 32 insertions(+), 45 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/247e008c/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
----------------------------------------------------------------------
diff --cc gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
index bb97867,f3e823a..7e15757
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
@@@ -37,30 -37,11 +37,14 @@@ namespace Gremlin.Net.IntegrationTest.G
{
public class GherkinTestRunner
{
- private static readonly IDictionary<string, IgnoreReason> IgnoredScenarios =
- new Dictionary<string, IgnoreReason>
- {
- { "g_V_valueMapXtrueX", IgnoreReason.TraversalTDeserializationNotSupported },
- { "g_V_valueMapXtrue_name_ageX", IgnoreReason.TraversalTDeserializationNotSupported },
- { "g_V_hasLabelXpersonX_hasXage_notXlteX10X_andXnotXbetweenX11_20XXXX_andXltX29X_orXeqX35XXXX_name", IgnoreReason.NeedsFurtherInvestigation },
- { "g_VX1X_out_aggregateXxX_out_whereXnotXwithinXaXXX", IgnoreReason.NeedsFurtherInvestigation },
- { "g_V_asXaX_out_asXbX_whereXandXasXaX_outXknowsX_asXbX__orXasXbX_outXcreatedX_hasXname_rippleX__asXbX_inXknowsX_count_isXnotXeqX0XXXXX_selectXa_bX", IgnoreReason.NeedsFurtherInvestigation },
- { "g_V_asXaX_outXcreatedX_asXbX_inXcreatedX_asXcX_bothXknowsX_bothXknowsX_asXdX_whereXc__notXeqXaX_orXeqXdXXXX_selectXa_b_c_dX", IgnoreReason.NeedsFurtherInvestigation },
- { "g_V_asXaX_outEXcreatedX_asXbX_inV_asXcX_whereXa_gtXbX_orXeqXbXXX_byXageX_byXweightX_byXweightX_selectXa_cX_byXnameX", IgnoreReason.NeedsFurtherInvestigation },
- { "g_V_asXaX_outEXcreatedX_asXbX_inV_asXcX_inXcreatedX_asXdX_whereXa_ltXbX_orXgtXcXX_andXneqXdXXX_byXageX_byXweightX_byXinXcreatedX_valuesXageX_minX_selectXa_c_dX", IgnoreReason.NeedsFurtherInvestigation },
- { "g_withBulkXfalseX_withSackX1_sumX_VX1X_localXoutEXknowsX_barrierXnormSackX_inVX_inXknowsX_barrier_sack", IgnoreReason.NeedsFurtherInvestigation },
- { "g_withBulkXfalseX_withSackX1_sumX_V_out_barrier_sack", IgnoreReason.NeedsFurtherInvestigation },
- { "g_withSackX1_sumX_VX1X_localXoutXknowsX_barrierXnormSackXX_inXknowsX_barrier_sack", IgnoreReason.NeedsFurtherInvestigation },
- { "g_V_hasXageX_groupCountXaX_byXnameX_out_capXaX", IgnoreReason.NeedsFurtherInvestigation },
- { "g_V_hasXname_markoX_propertyXfriendWeight_outEXknowsX_weight_sum__acl_privateX", IgnoreReason.NeedsFurtherInvestigation },
- { "g_V_outE_weight_groupCount_unfold_selectXkeysX_unfold", IgnoreReason.NeedsFurtherInvestigation },
- { "g_V_outE_weight_groupCount_selectXkeysX_unfold", IgnoreReason.NeedsFurtherInvestigation },
- { "g_V_asXaX_out_asXbX_matchXa_out_count_c__b_in_count_cX", IgnoreReason.NeedsFurtherInvestigation },
- { "g_V_foo_injectX9999999999X_min", IgnoreReason.NeedsFurtherInvestigation },
- { "g_V_hasLabelXpersonX_group_byXnameX_byXoutE_weight_sumX_orderXlocalX_byXvaluesX", IgnoreReason.NeedsFurtherInvestigation },
- { "g_V_localXbothE_weight_foldX_order_byXsumXlocalX_decrX", IgnoreReason.NeedsFurtherInvestigation },
- { "g_V_hasLabelXpersonX_group_byXnameX_byXoutE_weight_sumX_unfold_order_byXvalues_decrX", IgnoreReason.NeedsFurtherInvestigation }
- };
- private static readonly IDictionary<string, IgnoreReason> IgnoredScenarios = new Dictionary<string, IgnoreReason> {
++ private static readonly IDictionary<string, IgnoreReason> IgnoredScenarios = new Dictionary<string, IgnoreReason>
++ {
++ { "g_V_valueMapXtrueX", IgnoreReason.TraversalTDeserializationNotSupported },
++ { "g_V_valueMapXtrue_name_ageX", IgnoreReason.TraversalTDeserializationNotSupported },
+ { "g_V_hasLabelXpersonX_hasXage_notXlteX10X_andXnotXbetweenX11_20XXXX_andXltX29X_orXeqX35XXXX_name", IgnoreReason.NeedsFurtherInvestigation }, // TINKERPOP-1859??
- { "g_VX1X_out_aggregateXxX_out_whereXnotXwithinXaXXX", IgnoreReason.NeedsFurtherInvestigation }, // TINKERPOP-1859??
- { "g_withBulkXfalseX_withSackX1_sumX_V_out_barrier_sack", IgnoreReason.NeedsFurtherInvestigation } // TINKERPOP-1907
++ { "g_VX1X_out_aggregateXxX_out_whereXnotXwithinXaXXX", IgnoreReason.NeedsFurtherInvestigation }, // TINKERPOP-1859??
++ { "g_withBulkXfalseX_withSackX1_sumX_V_out_barrier_sack", IgnoreReason.NeedsFurtherInvestigation } // TINKERPOP-1907
+ };
private static class Keywords
{
[08/30] tinkerpop git commit: Merge branch 'tp33'
Posted by dk...@apache.org.
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/TINKERPOP-1777
Commit: 773d5101400af98394728677f6a216ebad7088c8
Parents: a418226 e1d7f80
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Feb 28 15:40:44 2018 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
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
----------------------------------------------------------------------
[04/30] tinkerpop git commit: Merge branch 'tp33'
Posted by dk...@apache.org.
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/TINKERPOP-1777
Commit: df3e834191ec6061ece1dc64a659b4306faaa676
Parents: 05c1c04 032124a
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Feb 28 14:15:31 2018 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
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
----------------------------------------------------------------------
[21/30] tinkerpop git commit: Merge branch 'tp33'
Posted by dk...@apache.org.
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/c722cda0
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/c722cda0
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/c722cda0
Branch: refs/heads/TINKERPOP-1777
Commit: c722cda0541ed1ef3133ce19a5a5c10863a445af
Parents: e48e834 247e008
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Mar 1 10:34:57 2018 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Mar 1 10:34:57 2018 -0500
----------------------------------------------------------------------
.../Gherkin/GherkinTestRunner.cs | 32 +++++---------------
.../ModernGraphTypeInformation.cs | 4 ++-
gremlin-test/features/map/Match.feature | 2 +-
gremlin-test/features/map/Min.feature | 3 +-
gremlin-test/features/map/Order.feature | 16 +++++-----
gremlin-test/features/map/Select.feature | 16 +++++-----
gremlin-test/features/sideEffect/Sack.feature | 2 +-
.../features/sideEffect/SideEffectCap.feature | 2 +-
8 files changed, 32 insertions(+), 45 deletions(-)
----------------------------------------------------------------------
[22/30] tinkerpop git commit: Added JIRA issue for ignored GLV test
for .NET CTR
Posted by dk...@apache.org.
Added JIRA issue for ignored GLV test for .NET CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/532a5de2
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/532a5de2
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/532a5de2
Branch: refs/heads/TINKERPOP-1777
Commit: 532a5de26fb7b5ec64c00ce7c99d431d16c48dba
Parents: 247e008
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Mar 1 10:37:28 2018 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Mar 1 10:37:28 2018 -0500
----------------------------------------------------------------------
.../Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/532a5de2/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 7e15757..eb0a7e1 100644
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
@@ -39,8 +39,8 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
{
private static readonly IDictionary<string, IgnoreReason> IgnoredScenarios = new Dictionary<string, IgnoreReason>
{
- { "g_V_valueMapXtrueX", IgnoreReason.TraversalTDeserializationNotSupported },
- { "g_V_valueMapXtrue_name_ageX", IgnoreReason.TraversalTDeserializationNotSupported },
+ { "g_V_valueMapXtrueX", IgnoreReason.TraversalTDeserializationNotSupported }, // TINKERPOP-1866
+ { "g_V_valueMapXtrue_name_ageX", IgnoreReason.TraversalTDeserializationNotSupported }, // TINKERPOP-1866
{ "g_V_hasLabelXpersonX_hasXage_notXlteX10X_andXnotXbetweenX11_20XXXX_andXltX29X_orXeqX35XXXX_name", IgnoreReason.NeedsFurtherInvestigation }, // TINKERPOP-1859??
{ "g_VX1X_out_aggregateXxX_out_whereXnotXwithinXaXXX", IgnoreReason.NeedsFurtherInvestigation }, // TINKERPOP-1859??
{ "g_withBulkXfalseX_withSackX1_sumX_V_out_barrier_sack", IgnoreReason.NeedsFurtherInvestigation } // TINKERPOP-1907
[03/30] tinkerpop git commit: Merge branch 'tp32' into tp33
Posted by dk...@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/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/TINKERPOP-1777
Commit: 032124a504c3d324708d96c1d4b52e8ed2b22346
Parents: 69a355f 3aa9e70
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Feb 28 14:15:22 2018 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
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
----------------------------------------------------------------------