You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by mi...@apache.org on 2023/01/07 18:14:20 UTC
[tinkerpop] branch 3.6-dev updated (2ba2dc29bd -> c09ba3665d)
This is an automated email from the ASF dual-hosted git repository.
mikepersonick pushed a change to branch 3.6-dev
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
from 2ba2dc29bd TINKERPOP-2805 Fixed bug in select() with multiple labels CTR
add bc98a99a70 Quality of life changes to mergeV/E semantics
new c09ba3665d Merge pull request #1929 from apache/TINKERPOP-2850-3.6
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-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 +-
39 files changed, 1538 insertions(+), 1243 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 pull request #1929 from apache/TINKERPOP-2850-3.6
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mikepersonick pushed a commit to branch 3.6-dev
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit c09ba3665d2f336ac77d22a69d9e66c517c94993
Merge: 2ba2dc29bd bc98a99a70
Author: Mike Personick <mi...@supersonick.io>
AuthorDate: Sat Jan 7 11:14:14 2023 -0700
Merge pull request #1929 from apache/TINKERPOP-2850-3.6
Modifications to mergeV/E semantics
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-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 +-
39 files changed, 1538 insertions(+), 1243 deletions(-)
diff --cc CHANGELOG.asciidoc
index ed8feed7cf,a14acb9b99..9435fbfa62
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@@ -27,8 -27,8 +27,9 @@@ This release also includes changes fro
* Fixed bug in the Gremlin grammar for parsing of empty queries.
* Provided mechanism for provider plugins to get notified on script/query processing via `GraphManager`.
+* Fixed bug in `select()` when using multiple labels.
* Moved Gherkin feature tests to `gremlin-test` resources so that they are more easily referenced by providers.
+ * Made quality of life changes to semantics for `mergeV/E` based on initial feedback.
[[release-3-6-1]]
=== TinkerPop 3.6.1 (Release Date: July 18, 2022)