This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git.
from c996567 Rephrase roadmap item CTR
add fd6607d TINKERPOP-2681 mergeE() and mergeV()
add 6999b6b address feedback from first round of code review
add 30ef1e7 Added from/to aliases for Direction OUT/IN
add d4ff085 Prevent creation of vertices if they do not exist for mergeE()
add 5a9d62b TINKERPOP-2681 Finalize mergeV semantics around null/empty
args
add 8fbb956 TINKERPOP-2681 Fixed problems with GLVs processing null
add 9d0bb95 TINKERPOP-2681 mergeE() improvements around null/empty
arguments and other semantics
add 6a0b71b TINKERPOP-2661 Fixed GremlinGroovyScriptEngine null handling
No new revisions were added by this update.
Summary of changes:
CHANGELOG.asciidoc | 3 +
docs/src/dev/io/graphbinary.asciidoc | 5 +
docs/src/dev/io/graphson.asciidoc | 190 +++---
docs/src/dev/provider/gremlin-semantics.asciidoc | 133 +++-
docs/src/reference/gremlin-variants.asciidoc | 12 +-
docs/src/upgrade/release-3.6.x.asciidoc | 90 +++
.../tinkerpop/gremlin/jsr223/CoreImports.java | 10 +-
.../language/grammar/GenericLiteralVisitor.java | 21 +-
.../language/grammar/GremlinBaseVisitor.java | 67 +-
.../language/grammar/TraversalEnumParser.java | 11 +
.../language/grammar/TraversalMethodVisitor.java | 86 +++
.../grammar/TraversalSourceSpawnMethodVisitor.java | 28 +
.../TraversalOptionParent.java => Merge.java} | 27 +-
.../{step/TraversalOptionParent.java => Pick.java} | 13 +-
.../gremlin/process/traversal/Translator.java | 9 +-
.../traversal/dsl/graph/GraphTraversal.java | 170 ++++-
.../traversal/dsl/graph/GraphTraversalSource.java | 92 ++-
.../gremlin/process/traversal/dsl/graph/__.java | 44 +-
.../traversal/step/TraversalOptionParent.java | 12 +-
.../process/traversal/step/branch/BranchStep.java | 3 +-
.../process/traversal/step/branch/ChooseStep.java | 9 +-
.../process/traversal/step/branch/UnionStep.java | 10 +-
.../process/traversal/step/map/MergeEdgeStep.java | 485 ++++++++++++++
.../traversal/step/map/MergeVertexStep.java | 383 +++++++++++
.../process/traversal/step/util/event/Event.java | 6 +-
.../traversal/translator/DotNetTranslator.java | 34 +-
.../traversal/translator/GroovyTranslator.java | 8 +-
.../traversal/translator/JavascriptTranslator.java | 4 +-
.../traversal/translator/PythonTranslator.java | 4 +-
.../tinkerpop/gremlin/structure/Direction.java | 34 +
.../gremlin/structure/io/binary/DataType.java | 1 +
.../io/binary/TypeSerializerRegistry.java | 6 +-
.../structure/io/binary/types/EnumSerializer.java | 6 +-
.../structure/io/graphson/GraphSONModule.java | 21 +-
.../io/graphson/GraphSONTypeSerializerV2d0.java | 6 +-
.../io/graphson/GraphSONTypeSerializerV3d0.java | 6 +-
.../gremlin/structure/io/gryo/GryoVersion.java | 13 +-
.../gremlin/structure/util/ElementHelper.java | 4 +-
.../structure/util/reference/ReferenceVertex.java | 4 +
.../language/grammar/TraversalEnumParserTest.java | 4 +-
.../dsl/graph/GraphTraversalSourceTest.java | 12 +
.../traversal/dsl/graph/GraphTraversalTest.java | 11 +
.../traversal/step/branch/BranchStepTest.java | 2 +-
.../traversal/step/branch/ChooseStepTest.java | 2 +-
.../traversal/step/map/MergeEdgeStepTest.java | 103 +++
.../traversal/step/map/MergeVertexStepTest.java | 78 +++
.../traversal/translator/DotNetTranslatorTest.java | 8 +
.../tinkerpop/gremlin/structure/DirectionTest.java | 8 +
.../gremlin/structure/io/gryo/GryoMapperTest.java | 7 +
gremlin-dotnet/build/generate.groovy | 29 +-
.../src/Gremlin.Net/Process/Traversal/Direction.cs | 6 +
.../Process/Traversal/GraphTraversal.cs | 64 ++
.../Process/Traversal/GraphTraversalSource.cs | 54 +-
.../Process/Traversal/{Direction.cs => Merge.cs} | 25 +-
.../src/Gremlin.Net/Process/Traversal/__.cs | 48 ++
.../Structure/IO/GraphBinary/DataType.cs | 1 +
.../IO/GraphBinary/TypeSerializerRegistry.cs | 2 +
.../IO/GraphBinary/Types/EnumSerializer.cs | 6 +
.../Structure/IO/GraphSON/GraphSONReader.cs | 1 +
.../Structure/IO/GraphSON/MergeDeserializer.cs | 27 +-
.../Gherkin/CommonSteps.cs | 9 +-
.../Gherkin/GherkinTestRunner.cs | 10 +-
.../Gremlin.Net.IntegrationTest/Gherkin/Gremlin.cs | 71 +-
.../Gherkin/IgnoreException.cs | 9 +-
.../Structure/IO/GraphBinary/GraphBinaryTests.cs | 15 +
.../Structure/IO/GraphSON/GraphSONReaderTests.cs | 12 +
.../Structure/IO/GraphSON/GraphSONWriterTests.cs | 13 +-
.../gremlin/driver/message/RequestMessage.java | 3 +-
.../GraphBinaryReaderWriterRoundTripTest.java | 4 +-
.../ast/AmbiguousMethodASTTransformation.groovy | 93 +++
.../ast/VarAsBindingASTTransformation.groovy | 7 +-
.../jsr223/GremlinGroovyScriptEngineTest.java | 52 +-
gremlin-javascript/build/generate.groovy | 38 +-
.../lib/process/graph-traversal.js | 42 ++
.../gremlin-javascript/lib/process/traversal.js | 1 +
.../test/cucumber/feature-steps.js | 20 +-
.../gremlin-javascript/test/cucumber/gremlin.js | 76 ++-
gremlin-language/src/main/antlr4/Gremlin.g4 | 42 +-
.../language/corpus/DocumentationReader.java | 2 +
.../language/grammar/ReferenceGrammarTest.java | 16 +-
.../src/test/resources/incorrect-traversals.txt | 4 +-
gremlin-python/build/generate.groovy | 31 +-
.../gremlin_python/process/graph_traversal.py | 38 ++
.../python/gremlin_python/process/traversal.py | 7 +
.../gremlin_python/structure/io/graphbinaryV1.py | 10 +-
.../src/main/python/radish/feature_steps.py | 21 +-
gremlin-python/src/main/python/radish/gremlin.py | 79 ++-
.../tests/driver/test_driver_remote_connection.py | 1 +
.../tests/structure/io/test_graphbinaryV1.py | 7 +-
.../handler/WsGremlinBinaryRequestDecoder.java | 1 +
.../handler/WsGremlinTextRequestDecoder.java | 1 +
gremlin-test/features/map/AddEdge.feature | 2 +-
gremlin-test/features/map/MergeEdge.feature | 720 +++++++++++++++++++++
gremlin-test/features/map/MergeVertex.feature | 610 +++++++++++++++++
gremlin-test/features/sideEffect/Group.feature | 27 +-
gremlin-test/features/sideEffect/Inject.feature | 7 +-
.../tinkerpop/gremlin/AbstractGremlinTest.java | 3 +
.../tinkerpop/gremlin/features/StepDefinition.java | 33 +-
.../gremlin/process/ProcessStandardSuite.java | 4 +
.../process/traversal/step/branch/BranchTest.java | 4 +-
.../process/traversal/step/branch/ChooseTest.java | 6 +-
.../process/traversal/step/map/MergeEdgeTest.java | 246 +++++++
.../traversal/step/map/MergeVertexTest.java | 222 +++++++
.../decoration/EventStrategyProcessTest.java | 132 ++++
.../tinkerpop/gremlin/structure/io/Model.java | 4 +-
.../gremlin/hadoop/structure/HadoopGraph.java | 12 +-
.../gremlin/neo4j/structure/Neo4jGraph.java | 8 +-
.../spark/SparkGraphFeatureIntegrateTest.java | 1 +
.../traversal/step/map/TinkerMergeEdgeStep.java | 115 ++++
.../traversal/step/map/TinkerMergeVertexStep.java | 90 +++
.../optimization/TinkerMergeEVStepStrategy.java | 61 ++
.../gremlin/tinkergraph/structure/TinkerGraph.java | 4 +-
.../gremlin/tinkergraph/TinkerGraphWorld.java | 1 +
...tractTinkerGraphGraphSONTranslatorProvider.java | 8 +
114 files changed, 5281 insertions(+), 342 deletions(-)
copy
gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/{step/TraversalOptionParent.java
=> Merge.java} (50%)
copy
gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/{step/TraversalOptionParent.java
=> Pick.java} (66%)
create mode 100644
gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MergeEdgeStep.java
create mode 100644
gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MergeVertexStep.java
create mode 100644
gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MergeEdgeStepTest.java
create mode 100644
gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MergeVertexStepTest.java
copy gremlin-dotnet/src/Gremlin.Net/Process/Traversal/{Direction.cs =>
Merge.cs} (63%)
copy
gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/TraversalOptionParent.java
=> gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/MergeDeserializer.cs
(62%)
create mode 100644
gremlin-groovy/src/main/groovy/org/apache/tinkerpop/gremlin/groovy/jsr223/ast/AmbiguousMethodASTTransformation.groovy
create mode 100644 gremlin-test/features/map/MergeEdge.feature
create mode 100644 gremlin-test/features/map/MergeVertex.feature
create mode 100644
gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MergeEdgeTest.java
create mode 100644
gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MergeVertexTest.java
create mode 100644
tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/traversal/step/map/TinkerMergeEdgeStep.java
create mode 100644
tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/traversal/step/map/TinkerMergeVertexStep.java
create mode 100644
tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/traversal/strategy/optimization/TinkerMergeEVStepStrategy.java
