You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by fl...@apache.org on 2023/01/09 07:53:47 UTC
[tinkerpop] branch master updated (64e66c2fe6 -> 08afd4e475)
This is an automated email from the ASF dual-hosted git repository.
florianhockmann pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
from 64e66c2fe6 Add Eclipse JNoSQL to community page CTR
add bc98a99a70 Quality of life changes to mergeV/E semantics
add c09ba3665d Merge pull request #1929 from apache/TINKERPOP-2850-3.6
add e2af01c078 Bump gherkin from 26.0.2 to 26.0.3 in /gremlin-dotnet
add 41591f76e3 Merge pull request #1930 from apache/dependabot/nuget/gremlin-dotnet/3.5-dev/gherkin-26.0.3
add b55871e748 Merge branch '3.5-dev' into 3.6-dev
new 08afd4e475 Merge branch '3.6-dev'
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
CHANGELOG.asciidoc | 1 +
docs/src/dev/provider/gremlin-semantics.asciidoc | 54 +-
docs/src/reference/the-traversal.asciidoc | 59 +-
docs/src/upgrade/release-3.6.x.asciidoc | 19 +
.../language/grammar/GenericLiteralVisitor.java | 9 +
.../tinkerpop/gremlin/process/traversal/Merge.java | 16 +-
.../traversal/dsl/graph/GraphTraversal.java | 2 -
.../traversal/dsl/graph/GraphTraversalSource.java | 2 -
.../process/traversal/step/map/MergeEdgeStep.java | 655 ++++++++++-----------
.../process/traversal/step/map/MergeStep.java | 299 ++++++++++
.../traversal/step/map/MergeVertexStep.java | 401 ++++---------
.../traversal/translator/PythonTranslator.java | 2 +
.../gremlin/structure/util/CloseableIterator.java | 4 +
.../gremlin/util/iterator/IteratorUtils.java | 163 +++--
.../gremlin/util/iterator/IteratorUtilsTest.java | 12 +
.../src/Gremlin.Net/Process/Traversal/Merge.cs | 6 +
.../Gherkin/CommonSteps.cs | 8 +-
.../Gremlin.Net.IntegrationTest/Gherkin/Gremlin.cs | 31 +-
.../Gremlin.Net.IntegrationTest.csproj | 2 +-
gremlin-go/driver/cucumber/cucumberSteps_test.go | 16 +
gremlin-go/driver/cucumber/gremlin.go | 31 +-
gremlin-go/driver/traversal.go | 6 +
.../main/javascript/gremlin-javascript/index.js | 1 +
.../gremlin-javascript/lib/process/traversal.js | 2 +-
.../test/cucumber/feature-steps.js | 19 +-
.../gremlin-javascript/test/cucumber/gremlin.js | 31 +-
gremlin-language/src/main/antlr4/Gremlin.g4 | 3 +
.../python/gremlin_python/process/traversal.py | 4 +-
.../src/main/python/radish/feature_steps.py | 17 +-
gremlin-python/src/main/python/radish/gremlin.py | 163 ++---
.../tinkerpop/gremlin/features/StepDefinition.java | 19 +-
.../process/ProcessLimitedStandardSuite.java | 6 +
.../process/traversal/step/map/MergeEdgeTest.java | 33 +-
.../decoration/EventStrategyProcessTest.java | 5 +-
.../gremlin/test/features/map/MergeEdge.feature | 313 ++++++----
.../gremlin/test/features/map/MergeVertex.feature | 99 +++-
.../traversal/step/map/TinkerMergeEdgeStep.java | 115 ----
.../traversal/step/map/TinkerMergeVertexStep.java | 90 ---
.../optimization/TinkerMergeEVStepStrategy.java | 61 --
.../gremlin/tinkergraph/structure/TinkerGraph.java | 4 +-
40 files changed, 1539 insertions(+), 1244 deletions(-)
create mode 100644 gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MergeStep.java
delete mode 100644 tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/traversal/step/map/TinkerMergeEdgeStep.java
delete mode 100644 tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/traversal/step/map/TinkerMergeVertexStep.java
delete mode 100644 tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/traversal/strategy/optimization/TinkerMergeEVStepStrategy.java
[tinkerpop] 01/01: Merge branch '3.6-dev'
Posted by fl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
florianhockmann pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit 08afd4e475b56189500c31361b624ecc687e8b7b
Merge: 64e66c2fe6 b55871e748
Author: Florian Hockmann <fh...@florian-hockmann.de>
AuthorDate: Mon Jan 9 08:53:31 2023 +0100
Merge branch '3.6-dev'
CHANGELOG.asciidoc | 1 +
docs/src/dev/provider/gremlin-semantics.asciidoc | 54 +-
docs/src/reference/the-traversal.asciidoc | 59 +-
docs/src/upgrade/release-3.6.x.asciidoc | 19 +
.../language/grammar/GenericLiteralVisitor.java | 9 +
.../tinkerpop/gremlin/process/traversal/Merge.java | 16 +-
.../traversal/dsl/graph/GraphTraversal.java | 2 -
.../traversal/dsl/graph/GraphTraversalSource.java | 2 -
.../process/traversal/step/map/MergeEdgeStep.java | 655 ++++++++++-----------
.../process/traversal/step/map/MergeStep.java | 299 ++++++++++
.../traversal/step/map/MergeVertexStep.java | 401 ++++---------
.../traversal/translator/PythonTranslator.java | 2 +
.../gremlin/structure/util/CloseableIterator.java | 4 +
.../gremlin/util/iterator/IteratorUtils.java | 163 +++--
.../gremlin/util/iterator/IteratorUtilsTest.java | 12 +
.../src/Gremlin.Net/Process/Traversal/Merge.cs | 6 +
.../Gherkin/CommonSteps.cs | 8 +-
.../Gremlin.Net.IntegrationTest/Gherkin/Gremlin.cs | 31 +-
.../Gremlin.Net.IntegrationTest.csproj | 2 +-
gremlin-go/driver/cucumber/cucumberSteps_test.go | 16 +
gremlin-go/driver/cucumber/gremlin.go | 31 +-
gremlin-go/driver/traversal.go | 6 +
.../main/javascript/gremlin-javascript/index.js | 1 +
.../gremlin-javascript/lib/process/traversal.js | 2 +-
.../test/cucumber/feature-steps.js | 19 +-
.../gremlin-javascript/test/cucumber/gremlin.js | 31 +-
gremlin-language/src/main/antlr4/Gremlin.g4 | 3 +
.../python/gremlin_python/process/traversal.py | 4 +-
.../src/main/python/radish/feature_steps.py | 17 +-
gremlin-python/src/main/python/radish/gremlin.py | 163 ++---
.../tinkerpop/gremlin/features/StepDefinition.java | 19 +-
.../process/ProcessLimitedStandardSuite.java | 6 +
.../process/traversal/step/map/MergeEdgeTest.java | 33 +-
.../decoration/EventStrategyProcessTest.java | 5 +-
.../gremlin/test/features/map/MergeEdge.feature | 313 ++++++----
.../gremlin/test/features/map/MergeVertex.feature | 99 +++-
.../traversal/step/map/TinkerMergeEdgeStep.java | 115 ----
.../traversal/step/map/TinkerMergeVertexStep.java | 90 ---
.../optimization/TinkerMergeEVStepStrategy.java | 61 --
.../gremlin/tinkergraph/structure/TinkerGraph.java | 4 +-
40 files changed, 1539 insertions(+), 1244 deletions(-)
diff --cc gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/CommonSteps.cs
index a63b8d9a2f,6da7935bd5..db99a831e2
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/CommonSteps.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/CommonSteps.cs
@@@ -60,12 -60,13 +60,13 @@@ namespace Gremlin.Net.IntegrationTest.G
{@"vp\[(.+)\]", ToVertexProperty},
{@"d\[(.*)\]\.([bsilfdmn])", ToNumber},
{@"D\[(.+)\]", ToDirection},
+ {@"M\[(.+)\]", ToMerge},
{@"v\[(.+)\]", ToVertex},
{@"v\[(.+)\]\.id", (x, graphName) => ToVertex(x, graphName).Id},
- {@"v\[(.+)\]\.sid", (x, graphName) => ToVertex(x, graphName).Id.ToString()},
+ {@"v\[(.+)\]\.sid", (x, graphName) => ToVertex(x, graphName).Id!.ToString()},
{@"e\[(.+)\]", ToEdge},
{@"e\[(.+)\].id", (x, graphName) => ToEdge(x, graphName).Id},
- {@"e\[(.+)\].sid", (x, graphName) => ToEdge(x, graphName).Id.ToString()},
+ {@"e\[(.+)\].sid", (x, graphName) => ToEdge(x, graphName).Id!.ToString()},
{@"p\[(.+)\]", ToPath},
{@"l\[(.*)\]", ToList},
{@"s\[(.*)\]", ToSet},
@@@ -131,9 -132,9 +132,9 @@@
{
_g = _g.WithComputer();
}
-
+
_traversal =
- Gremlin.UseTraversal(ScenarioData.CurrentScenario.Name, _g, _parameters);
+ Gremlin.UseTraversal(ScenarioData.CurrentScenario!.Name, _g, _parameters);
}
[Given("the graph initializer of")]