You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by dk...@apache.org on 2019/04/08 19:48:44 UTC

[tinkerpop] branch master updated (e9817c0 -> 505debf)

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

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


    from e9817c0  Added Alibaba GDB to index listing CTR
     add 0769976  Implemented EdgeLabelVerificationStrategy
     add bc2c3f5  Merge pull request #1087 from apache/TINKERPOP-2191
     new 505debf  Merge branch 'tp33'

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                                 |   2 +-
 docs/src/upgrade/release-3.3.x.asciidoc            |  38 +++++
 .../tinkerpop/gremlin/jsr223/CoreImports.java      |   2 +
 .../EdgeLabelVerificationStrategy.java             | 131 ++++++++++++++
 .../structure/io/graphson/GraphSONModule.java      |   5 +
 .../gremlin/structure/io/gryo/GryoVersion.java     |   7 +-
 .../EdgeLabelVerificationStrategyTest.java         | 188 +++++++++++++++++++++
 7 files changed, 370 insertions(+), 3 deletions(-)
 create mode 100644 gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/verification/EdgeLabelVerificationStrategy.java
 create mode 100644 gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/verification/EdgeLabelVerificationStrategyTest.java


[tinkerpop] 01/01: Merge branch 'tp33'

Posted by dk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 505debf3e8fe1b8172fc362748e14be8f647b29d
Merge: e9817c0 bc2c3f5
Author: Daniel Kuppitz <da...@hotmail.com>
AuthorDate: Mon Apr 8 12:48:30 2019 -0700

    Merge branch 'tp33'

 CHANGELOG.asciidoc                                 |   2 +-
 docs/src/upgrade/release-3.3.x.asciidoc            |  38 +++++
 .../tinkerpop/gremlin/jsr223/CoreImports.java      |   2 +
 .../EdgeLabelVerificationStrategy.java             | 131 ++++++++++++++
 .../structure/io/graphson/GraphSONModule.java      |   5 +
 .../gremlin/structure/io/gryo/GryoVersion.java     |   7 +-
 .../EdgeLabelVerificationStrategyTest.java         | 188 +++++++++++++++++++++
 7 files changed, 370 insertions(+), 3 deletions(-)

diff --cc gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/CoreImports.java
index ccb7900,e298951..cc7881c
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/CoreImports.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/CoreImports.java
@@@ -253,8 -241,8 +254,9 @@@ public final class CoreImports 
          CLASS_IMPORTS.add(ComputerVerificationStrategy.class);
          CLASS_IMPORTS.add(LambdaRestrictionStrategy.class);
          CLASS_IMPORTS.add(ReadOnlyStrategy.class);
 +        CLASS_IMPORTS.add(ReferenceElementStrategy.class);
          CLASS_IMPORTS.add(StandardVerificationStrategy.class);
+         CLASS_IMPORTS.add(EdgeLabelVerificationStrategy.class);
          // graph traversal
          CLASS_IMPORTS.add(AnonymousTraversalSource.class);
          CLASS_IMPORTS.add(__.class);
diff --cc gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java
index 3d68036,974542d..73bac27
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java
@@@ -585,21 -557,12 +587,22 @@@ public enum GryoVersion 
              add(GryoTypeReg.of(GraphFilterStrategy.class, 157));
              add(GryoTypeReg.of(LambdaRestrictionStrategy.class, 158));
              add(GryoTypeReg.of(ReadOnlyStrategy.class, 159));
-             add(GryoTypeReg.of(EarlyLimitStrategy.class, 188));   // ***LAST ID***
+             add(GryoTypeReg.of(EarlyLimitStrategy.class, 188));
              add(GryoTypeReg.of(MatchStep.CountMatchAlgorithm.class, 160));
              add(GryoTypeReg.of(MatchStep.GreedyMatchAlgorithm.class, 167));
+             add(GryoTypeReg.of(EdgeLabelVerificationStrategy.class, 189));   // ***LAST ID***
              // skip 171, 172 to sync with tp33
              add(GryoTypeReg.of(IndexedTraverserSet.VertexIndexedTraverserSet.class, 173));
 +
 +            add(GryoTypeReg.of(B_LP_NL_O_P_S_SE_SL_Traverser.class, 174));
 +            add(GryoTypeReg.of(B_NL_O_S_SE_SL_Traverser.class, 175));
 +            add(GryoTypeReg.of(B_LP_NL_O_S_SE_SL_Traverser.class, 176));
 +            add(GryoTypeReg.of(NL_O_OB_S_SE_SL_Traverser.class, 177));
 +            add(GryoTypeReg.of(LP_NL_O_OB_S_SE_SL_Traverser.class, 178));
 +            add(GryoTypeReg.of(LP_NL_O_OB_P_S_SE_SL_Traverser.class, 179));
 +            add(GryoTypeReg.of(LabelledCounter.class, 180));
 +            add(GryoTypeReg.of(Stack.class, 181));
 +            add(GryoTypeReg.of(ReferenceMap.class, 182));
          }};
      }