You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2023/07/18 11:15:30 UTC

[tinkerpop] 01/01: Merge pull request #2127 from apache/TINKERPOP-2957

This is an automated email from the ASF dual-hosted git repository.

spmallette pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit 541e2c145ac4958b78a0184c667f526214019bc5
Merge: 311dc6274b d3e798a276
Author: Stephen Mallette <sp...@users.noreply.github.com>
AuthorDate: Tue Jul 18 07:15:20 2023 -0400

    Merge pull request #2127 from apache/TINKERPOP-2957
    
    TINKERPOP-2957 allow cardinality to be specified for mergeV()

 CHANGELOG.asciidoc                                 |   1 +
 docs/src/reference/gremlin-variants.asciidoc       |  30 ++++-
 docs/src/reference/the-traversal.asciidoc          |  52 ++++++---
 docs/src/upgrade/release-3.7.x.asciidoc            |  71 ++++++++++++
 .../tinkerpop/gremlin/jsr223/JavaTranslator.java   |  34 ++++--
 .../grammar/DefaultGremlinBaseVisitor.java         |   5 +
 .../language/grammar/GenericLiteralVisitor.java    |  18 ++-
 .../language/grammar/TraversalMethodVisitor.java   |  15 +++
 .../gremlin/process/traversal/Bytecode.java        |   4 +-
 .../gremlin/process/traversal/Translator.java      |  14 ++-
 .../traversal/dsl/graph/GraphTraversal.java        |  60 +++++++++-
 .../lambda/CardinalityValueTraversal.java          |  82 +++++++++++++
 .../traversal/step/map/MergeVertexStep.java        |  17 ++-
 .../process/traversal/step/util/Parameters.java    |   1 -
 .../traversal/translator/DotNetTranslator.java     |  10 ++
 .../traversal/translator/GolangTranslator.java     |  10 ++
 .../traversal/translator/GroovyTranslator.java     |   9 ++
 .../traversal/translator/JavascriptTranslator.java |   9 ++
 .../traversal/translator/PythonTranslator.java     |   9 ++
 .../gremlin/structure/VertexProperty.java          |  18 ++-
 .../structure/io/binary/GraphBinaryWriter.java     |   4 +-
 .../io/binary/types/TransformSerializer.java       |   2 +-
 .../grammar/GeneralLiteralVisitorTest.java         |  40 ++++++-
 .../gremlin/process/traversal/CardinalityTest.java |  68 +++++++++++
 .../traversal/translator/DotNetTranslatorTest.java |   5 +
 .../traversal/translator/GolangTranslatorTest.java |   6 +
 .../traversal/translator/GroovyTranslatorTest.java |   6 +
 .../translator/JavascriptTranslatorTest.java       |   6 +
 .../traversal/translator/PythonTranslatorTest.java |  14 +++
 .../Process/Traversal/CardinalityValue.cs          |  92 +++++++++++++++
 .../Process/Traversal/GraphTraversal.cs            |   9 ++
 .../Docs/Reference/GremlinVariantsTests.cs         |   2 +
 .../Gremlin.Net.IntegrationTest/Gherkin/Gremlin.cs |   9 ++
 .../Process/Traversal/CardinalityValueTests.cs     |  55 +++++++++
 gremlin-go/driver/cucumber/gremlin.go              |   9 ++
 gremlin-go/driver/traversal.go                     |  34 +++++-
 .../gremlin/groovy/engine/GremlinExecutorTest.java |   6 +-
 gremlin-javascript/build/generate.groovy           |   1 +
 .../lib/process/graph-traversal.js                 |  42 ++++++-
 .../gremlin-javascript/test/cucumber/gremlin.js    |  10 ++
 gremlin-language/src/main/antlr4/Gremlin.g4        |   9 +-
 gremlin-python/build/generate.groovy               |   2 +-
 .../python/gremlin_python/process/traversal.py     |  18 +++
 gremlin-python/src/main/python/radish/gremlin.py   |  11 +-
 .../gremlin/test/features/map/AddVertex.feature    |  37 +++++-
 .../gremlin/test/features/map/MergeVertex.feature  | 129 +++++++++++++++++++++
 46 files changed, 1037 insertions(+), 58 deletions(-)