This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a change to branch TINKERPOP-2681
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git.
discard 7da32a0 Fixed some failing spark tests
discard e3e6caa fix some neo4j problems
discard 8829381 f
discard a91aad4 TINKERPOP-2681 mergeE() and mergeV()
add af82ce1 Gremlin Value Expressions 2.0 / Ternary Boolean Logics
add 47d4115 Merge pull request #1553 from mikepersonick/TINKERPOP-2687
add e7e127c TINKERPOP-2681 mergeE() and mergeV()
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (7da32a0)
\
N -- N -- N refs/heads/TINKERPOP-2681 (e7e127c)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
No new revisions were added by this update.
Summary of changes:
CHANGELOG.asciidoc | 7 +-
docs/src/dev/developer/for-committers.asciidoc | 1 -
docs/src/dev/provider/gremlin-semantics.asciidoc | 301 +++++++++++--------
docs/src/upgrade/release-3.6.x.asciidoc | 21 +-
.../gremlin/process/traversal/Compare.java | 64 +---
.../gremlin/process/traversal/Contains.java | 16 +-
.../GremlinTypeErrorException.java} | 17 +-
.../tinkerpop/gremlin/process/traversal/Order.java | 24 +-
.../tinkerpop/gremlin/process/traversal/Text.java | 9 +
.../process/traversal/step/filter/AndStep.java | 13 +-
.../step/filter/BinaryReductionStep.java} | 18 +-
.../process/traversal/step/filter/FilterStep.java | 21 +-
.../process/traversal/step/filter/OrStep.java | 13 +-
.../traversal/step/filter/TraversalFilterStep.java | 2 +-
.../traversal/step/filter/WhereTraversalStep.java | 2 +-
.../traversal/translator/DotNetTranslator.java | 4 +
.../traversal/translator/GroovyTranslator.java | 4 +-
.../gremlin/process/traversal/util/AndP.java | 14 +-
.../gremlin/process/traversal/util/OrP.java | 14 +-
.../gremlin/util/GremlinValueComparator.java | 330 +++++++++++++++++++++
.../tinkerpop/gremlin/util/NumberHelper.java | 104 +++++--
.../gremlin/util/OrderabilityComparator.java | 189 ------------
.../gremlin/util/tools/CollectionFactory.java | 52 ++++
.../tinkerpop/gremlin/util/tools/MultiMap.java | 1 -
.../process/traversal/CompareExceptionTest.java | 76 -----
.../gremlin/process/traversal/CompareTest.java | 195 ++++++++++--
.../gremlin/process/traversal/ConnectiveTest.java | 161 ++++++++++
.../gremlin/process/traversal/ContainsTest.java | 17 +-
.../gremlin/process/traversal/OrderTest.java | 180 ++++++++---
.../tinkerpop/gremlin/process/traversal/PTest.java | 24 +-
.../features/semantics/Orderability.feature | 4 +-
.../tinkerpop/gremlin/AbstractGremlinTest.java | 11 -
.../process/AbstractGremlinProcessTest.java | 7 +
.../process/ProcessLimitedStandardSuite.java | 2 +
.../gremlin/process/ProcessStandardSuite.java | 2 +
.../process/traversal/step/OrderabilityTest.java | 18 +-
.../traversal/step/TernaryBooleanLogicsTest.java | 321 ++++++++++++++++++++
.../process/traversal/step/map/MergeEdgeTest.java | 3 +-
.../traversal/step/map/MergeVertexTest.java | 15 +-
.../traversal/step/sideEffect/TinkerGraphStep.java | 19 +-
40 files changed, 1662 insertions(+), 634 deletions(-)
copy
gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/{remote/RemoteConnectionException.java
=> traversal/GremlinTypeErrorException.java} (61%)
copy
gremlin-core/src/{test/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/DropStepTest.java
=>
main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/BinaryReductionStep.java}
(65%)
create mode 100644
gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/GremlinValueComparator.java
delete mode 100644
gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/OrderabilityComparator.java
create mode 100644
gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/tools/CollectionFactory.java
delete mode 100644
gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/CompareExceptionTest.java
create mode 100644
gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/ConnectiveTest.java
create mode 100644
gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/TernaryBooleanLogicsTest.java
