[tinkerpop] 03/03: Merge branch 'tp34'
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 e560c5386ea9e3d590d255b03d4631a4608248cd Merge: e57d2b4 0ea7b45 Author: Stephen Mallette AuthorDate: Mon Jun 3 13:53:42 2019 -0400 Merge branch 'tp34' CHANGELOG.asciidoc | 2 ++ pom.xml| 2 +- 2 files changed, 3 insertions(+), 1 deletion(-)
[tinkerpop] 03/03: Merge branch 'tp34'
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 a8a004a8441c4819120ce490a6403f57e862bedc Merge: 66fc4e2 720e816 Author: Stephen Mallette AuthorDate: Mon Jun 3 16:40:09 2019 -0400 Merge branch 'tp34' CHANGELOG.asciidoc | 1 + .../gremlin/structure/io/graphml/GraphMLWriter.java| 18 -- .../apache/tinkerpop/gremlin/structure/io/IoTest.java | 14 ++ 3 files changed, 31 insertions(+), 2 deletions(-)
[tinkerpop] 03/03: Merge branch 'tp34'
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 5a4af6fa36b2899262ce4a3c637bb07cc2c345f7 Merge: 7e84948 f326b9b Author: Stephen Mallette AuthorDate: Tue Jun 4 14:22:52 2019 -0400 Merge branch 'tp34' .../io/graphson/GraphSONCompatibility.java | 4 + .../structure/io/gryo/GryoCompatibility.java | 2 + .../graphson/GraphSONTypedCompatibilityTest.java | 2 + .../graphson/GraphSONUntypedCompatibilityTest.java | 2 + .../structure/io/gryo/GryoCompatibilityTest.java | 2 + .../_3_3_8/authenticationchallenge-v1d0.json | 12 + .../authenticationchallenge-v2d0-no-types.json | 12 + .../authenticationchallenge-v2d0-partial.json | 12 + .../_3_3_8/authenticationchallenge-v3d0.json | 18 + .../_3_3_8/authenticationresponse-v1d0.json| 9 + .../authenticationresponse-v2d0-no-types.json | 9 + .../authenticationresponse-v2d0-partial.json | 9 + .../_3_3_8/authenticationresponse-v3d0.json| 9 + .../io/graphson/_3_3_8/barrier-v2d0-partial.json | 4 + .../structure/io/graphson/_3_3_8/barrier-v3d0.json | 4 + .../graphson/_3_3_8/bigdecimal-v2d0-partial.json | 4 + .../io/graphson/_3_3_8/bigdecimal-v3d0.json| 4 + .../graphson/_3_3_8/biginteger-v2d0-partial.json | 4 + .../io/graphson/_3_3_8/biginteger-v3d0.json| 4 + .../io/graphson/_3_3_8/binding-v2d0-partial.json | 10 + .../structure/io/graphson/_3_3_8/binding-v3d0.json | 10 + .../io/graphson/_3_3_8/byte-v2d0-partial.json | 4 + .../structure/io/graphson/_3_3_8/byte-v3d0.json| 4 + .../graphson/_3_3_8/bytebuffer-v2d0-partial.json | 4 + .../io/graphson/_3_3_8/bytebuffer-v3d0.json| 4 + .../io/graphson/_3_3_8/bytecode-v2d0-partial.json | 6 + .../io/graphson/_3_3_8/bytecode-v3d0.json | 6 + .../graphson/_3_3_8/cardinality-v2d0-partial.json | 4 + .../io/graphson/_3_3_8/cardinality-v3d0.json | 4 + .../io/graphson/_3_3_8/char-v2d0-partial.json | 4 + .../structure/io/graphson/_3_3_8/char-v3d0.json| 4 + .../io/graphson/_3_3_8/class-v2d0-partial.json | 4 + .../structure/io/graphson/_3_3_8/class-v3d0.json | 4 + .../io/graphson/_3_3_8/column-v2d0-partial.json| 4 + .../structure/io/graphson/_3_3_8/column-v3d0.json | 4 + .../io/graphson/_3_3_8/date-v2d0-no-types.json | 1 + .../io/graphson/_3_3_8/date-v2d0-partial.json | 4 + .../structure/io/graphson/_3_3_8/date-v3d0.json| 4 + .../io/graphson/_3_3_8/direction-v2d0-partial.json | 4 + .../io/graphson/_3_3_8/direction-v3d0.json | 4 + .../io/graphson/_3_3_8/double-v2d0-no-types.json | 1 + .../io/graphson/_3_3_8/double-v2d0-partial.json| 4 + .../structure/io/graphson/_3_3_8/double-v3d0.json | 4 + .../io/graphson/_3_3_8/duration-v2d0-partial.json | 4 + .../io/graphson/_3_3_8/duration-v3d0.json | 4 + .../structure/io/graphson/_3_3_8/edge-v1d0.json| 12 + .../io/graphson/_3_3_8/edge-v2d0-no-types.json | 14 + .../io/graphson/_3_3_8/edge-v2d0-partial.json | 32 + .../structure/io/graphson/_3_3_8/edge-v3d0.json| 32 + .../io/graphson/_3_3_8/float-v2d0-partial.json | 4 + .../structure/io/graphson/_3_3_8/float-v3d0.json | 4 + .../graphson/_3_3_8/inetaddress-v2d0-partial.json | 4 + .../io/graphson/_3_3_8/inetaddress-v3d0.json | 4 + .../io/graphson/_3_3_8/instant-v2d0-partial.json | 4 + .../structure/io/graphson/_3_3_8/instant-v3d0.json | 4 + .../io/graphson/_3_3_8/integer-v2d0-no-types.json | 1 + .../io/graphson/_3_3_8/integer-v2d0-partial.json | 4 + .../structure/io/graphson/_3_3_8/integer-v3d0.json | 4 + .../io/graphson/_3_3_8/lambda-v2d0-partial.json| 8 + .../structure/io/graphson/_3_3_8/lambda-v3d0.json | 8 + .../structure/io/graphson/_3_3_8/list-v3d0.json| 7 + .../io/graphson/_3_3_8/localdate-v2d0-partial.json | 4 + .../io/graphson/_3_3_8/localdate-v3d0.json | 4 + .../_3_3_8/localdatetime-v2d0-partial.json | 4 + .../io/graphson/_3_3_8/localdatetime-v3d0.json | 4 + .../io/graphson/_3_3_8/localtime-v2d0-partial.json | 4 + .../io/graphson/_3_3_8/localtime-v3d0.json | 4 + .../io/graphson/_3_3_8/long-v2d0-partial.json | 4 + .../structure/io/graphson/_3_3_8/long-v3d0.json| 4 + .../structure/io/graphson/_3_3_8/map-v3d0.json | 25 + .../io/graphson/_3_3_8/metrics-v2d0-partial.json | 54 ++ .../structure/io/graphson/_3_3_8/metrics-v3d0.json | 52 ++ .../io/graphson/_3_3_8/monthday-v2d0-partial.json | 4 + .../io/graphson/_3_3_8/monthday-v3d0.json | 4 + .../_3_3_8/offsetdatetime-v2d0-partial.json| 4 + .../io/graphson/_3_3_8/offsetdatetime-v3d0.json| 4 + .../graphson/_3_3_8/offsettime-v2d0-partial.json | 4 + .../io/graphson/_3_3_8/offsettime
[tinkerpop] 03/03: Merge branch 'tp34'
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 0fbca3a93bc1312456106c7a9f7f2fdecf46a4ab Merge: 6cd2dc4 09df708 Author: Stephen Mallette AuthorDate: Wed Jun 5 07:41:05 2019 -0400 Merge branch 'tp34' CHANGELOG.asciidoc | 1 + gremlin-shaded/pom.xml | 14 +++--- 2 files changed, 8 insertions(+), 7 deletions(-)
[tinkerpop] 03/03: Merge branch 'tp34'
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 64f0d84aecfbc5520876a6b40443b2f1029cccf0 Merge: 6edc834 d33f536 Author: Stephen Mallette AuthorDate: Wed Jun 5 14:35:46 2019 -0400 Merge branch 'tp34' .../src/main/jython/gremlin_python/driver/remote_connection.py | 1 + 1 file changed, 1 insertion(+)
[tinkerpop] 03/03: Merge branch 'tp34'
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 722e424798e1aedaddd74509ee2c94742f791dc7 Merge: 19a26d3 50b0fd3 Author: Stephen Mallette AuthorDate: Thu Jun 6 13:00:28 2019 -0400 Merge branch 'tp34' docs/src/dev/provider/index.asciidoc | 2 +- docs/src/reference/gremlin-applications.asciidoc | 5 - 2 files changed, 5 insertions(+), 2 deletions(-)
[tinkerpop] 03/03: Merge branch 'tp34'
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 7628a8ef0c408cc141f56d912d0aad03a8ff8086 Merge: acc9c3c e426bef Author: Stephen Mallette AuthorDate: Fri Jun 7 12:47:00 2019 -0400 Merge branch 'tp34' .travis.yml | 16 +--- 1 file changed, 13 insertions(+), 3 deletions(-)
[tinkerpop] 03/03: Merge branch 'tp34'
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 0b2510eebc99fe781c00e6320600b969333c9d3b Merge: 7628a8e 61ccbf4 Author: Stephen Mallette AuthorDate: Sun Jun 9 10:15:54 2019 -0400 Merge branch 'tp34' .../main/java/org/apache/tinkerpop/gremlin/process/traversal/Order.java | 2 ++ 1 file changed, 2 insertions(+)
[tinkerpop] 03/03: Merge branch 'tp34'
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 3aae55d79fbad5c48b69c36b04dcb81b434f1ae8 Merge: 0b2510e be17079 Author: Stephen Mallette AuthorDate: Mon Jun 10 06:40:44 2019 -0400 Merge branch 'tp34' .travis.yml | 9 - 1 file changed, 4 insertions(+), 5 deletions(-)
[tinkerpop] 03/03: Merge branch 'tp34'
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 d3c4898c87259ab2fb653966895428851ad64b80 Merge: 71a5a00 2f0b6fa Author: Stephen Mallette AuthorDate: Mon Jun 10 14:51:25 2019 -0400 Merge branch 'tp34' CHANGELOG.asciidoc | 4 +- docs/src/dev/provider/index.asciidoc | 10 +++ .../gremlin/process/traversal/Traversal.java | 9 +++ .../process/traversal/step/filter/NotStep.java | 2 +- .../traversal/step/filter/RangeGlobalStep.java | 4 + .../process/traversal/util/DefaultTraversal.java | 5 ++ .../process/traversal/util/TraversalUtil.java | 49 ++-- .../util/iterator/StoreIteratorCounter.java| 54 + .../process/traversal/step/filter/NotStepTest.java | 39 + .../tinkerpop/gremlin/AbstractGremlinTest.java | 20 - .../tinkerpop/gremlin/IgnoreIteratorLeak.java | 41 ++ .../generator/CommunityGeneratorTest.java | 33 +--- .../generator/DistributionGeneratorTest.java | 9 ++- .../process/computer/GraphComputerTest.java| 2 + .../traversal/TraversalInterruptionTest.java | 2 + .../process/traversal/step/filter/FilterTest.java | 11 +-- .../process/traversal/step/filter/HasTest.java | 2 + .../process/traversal/step/filter/WhereTest.java | 2 +- .../traversal/step/sideEffect/SubgraphTest.java| 2 + .../decoration/SubgraphStrategyProcessTest.java| 2 + .../tinkerpop/gremlin/structure/io/IoTest.java | 7 +- .../traversal/step/sideEffect/TinkerGraphStep.java | 49 +--- .../gremlin/tinkergraph/structure/TinkerGraph.java | 6 +- .../tinkergraph/structure/TinkerGraphIterator.java | 93 ++ 24 files changed, 406 insertions(+), 51 deletions(-)
[tinkerpop] 03/03: Merge branch 'tp34'
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 0627e2975d8ac577e407dbe71db85c487ae549dc Merge: d3c4898 6fbe3d0 Author: Stephen Mallette AuthorDate: Tue Jun 11 08:01:16 2019 -0400 Merge branch 'tp34' docs/src/reference/the-traversal.asciidoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
[tinkerpop] 03/03: Merge branch 'tp34'
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 5547f4e6f615e7fd2b07283d1f0b2cf84b912cd4 Merge: 61a1aff 6643f26 Author: Stephen Mallette AuthorDate: Wed Jun 12 06:36:02 2019 -0400 Merge branch 'tp34' docs/src/reference/the-graphcomputer.asciidoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[tinkerpop] 03/03: Merge branch 'tp34'
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 3b0042ee16c90157f279b43f50797a1d25bbd01d Merge: 5547f4e 8b0dd06 Author: Stephen Mallette AuthorDate: Wed Jun 12 06:38:17 2019 -0400 Merge branch 'tp34' CHANGELOG.asciidoc | 1 + .../apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessor.java| 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-)
[tinkerpop] 03/03: Merge branch 'tp34'
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 ed9df55732d8d8d170b8d6f75e955b7aa60bface Merge: 3b0042e b768f10 Author: Stephen Mallette AuthorDate: Wed Jun 12 08:26:01 2019 -0400 Merge branch 'tp34' gremlin-server/src/test/scripts/generate-all.groovy | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-)
[tinkerpop] 03/03: Merge branch 'tp34'
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 87c0527dc1042560d9114aff7dca9aea550645a6 Merge: aa300b6 c8ba4e8 Author: Stephen Mallette AuthorDate: Thu Jun 13 13:54:16 2019 -0400 Merge branch 'tp34' pom.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
[tinkerpop] 03/03: Merge branch 'tp34'
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 fe4b1c9afa480357a6449184b203d3ca48c2473c Merge: 87c0527 1e9b327 Author: Stephen Mallette AuthorDate: Thu Jun 13 14:19:17 2019 -0400 Merge branch 'tp34' docs/src/index.asciidoc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
[tinkerpop] 03/03: Merge branch 'tp34'
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 4aca11652396b6d0e31f0c08eb1767cde21370a7 Merge: 347776f 83ef37e Author: Stephen Mallette AuthorDate: Thu Jun 13 14:27:16 2019 -0400 Merge branch 'tp34' docs/src/reference/gremlin-applications.asciidoc | 22 +++--- 1 file changed, 11 insertions(+), 11 deletions(-)
[tinkerpop] 03/03: Merge branch 'tp34'
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 c3285366490362a5247d8f12705d579ef71781f2 Merge: a2fb0a8 31f9572 Author: Stephen Mallette AuthorDate: Fri Jun 14 07:38:24 2019 -0400 Merge branch 'tp34' docs/src/dev/developer/for-committers.asciidoc | 27 ++ 1 file changed, 27 insertions(+)
[tinkerpop] 03/03: Merge branch 'tp34'
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 780021137881ca35f57d837d3744159b2951db54 Merge: c328536 f4bc0ec Author: Stephen Mallette AuthorDate: Fri Jun 14 08:30:33 2019 -0400 Merge branch 'tp34' CHANGELOG.asciidoc | 1 + .../gremlin/server/op/session/SessionOpProcessor.java| 12 2 files changed, 5 insertions(+), 8 deletions(-)
[tinkerpop] 03/03: Merge branch 'tp34'
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 073828600ea6fb1bd3cbf33e10971dae965c4563 Merge: 7800211 551357b Author: Stephen Mallette AuthorDate: Fri Jun 14 11:38:27 2019 -0400 Merge branch 'tp34' docs/src/dev/developer/release.asciidoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[tinkerpop] 03/03: Merge branch 'tp34'
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 52884ac890122e4694197379b46e87c1263cb379 Merge: 0738286 c4afedb Author: Stephen Mallette AuthorDate: Fri Jun 14 13:46:44 2019 -0400 Merge branch 'tp34' CHANGELOG.asciidoc| 1 + .../java/org/apache/tinkerpop/gremlin/process/traversal/Order.java| 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-)
[tinkerpop] 03/03: Merge branch 'tp34'
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 2ba15943ff276167432a65ca5a6fc043c873492d Merge: 80f68fe d7daf2a Author: Stephen Mallette AuthorDate: Mon Jun 17 12:13:54 2019 -0400 Merge branch 'tp34' docs/src/tutorials/getting-started/index.asciidoc | 11 ++- 1 file changed, 6 insertions(+), 5 deletions(-)
[tinkerpop] 03/03: Merge branch 'tp34'
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 0b89ec69152368b919a3aab421a47f67beda3d4a Merge: 44498a7 4143487 Author: Stephen Mallette AuthorDate: Thu Jun 20 07:53:46 2019 -0400 Merge branch 'tp34' .../test/integration/traversal-test.js | 15 ++- .../gremlin-javascript/test/unit/graphson-test.js | 52 ++ 2 files changed, 66 insertions(+), 1 deletion(-)
[tinkerpop] 03/03: Merge branch 'tp34'
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 d79020fa6fbc55f8a260a1276f21e3844508a09b Merge: 2106549 01420c9 Author: Stephen Mallette AuthorDate: Thu Jun 20 10:09:15 2019 -0400 Merge branch 'tp34' gremlin-test/features/map/Vertex.feature | 53 .../tinkerpop/gremlin/AbstractGremlinTest.java | 6 +- .../process/traversal/step/map/VertexTest.java | 71 ++ 3 files changed, 129 insertions(+), 1 deletion(-)
[tinkerpop] 03/03: Merge branch 'tp34'
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 a52a8cc86cb5ddfdda82630fa4cd7470066237b0 Merge: d79020f 922934b Author: Stephen Mallette AuthorDate: Thu Jun 20 12:20:55 2019 -0400 Merge branch 'tp34' .../process/traversal/step/map/RangeLocalStep.java | 8 +++- .../traversal/step/map/TraversalSelectStep.java| 9 +++- .../gremlin/process/traversal/step/util/Tree.java | 7 +++- .../strategy/optimization/CountStrategy.java | 6 ++- .../traversal/step/branch/BranchStepTest.java | 4 +- .../traversal/step/map/CoalesceStepTest.java | 4 +- .../process/traversal/step/util/TreeTest.java | 4 +- .../decoration/ElementIdStrategyTraverseTest.java | 4 +- .../gremlin/structure/FeaturesConventionTest.java | 4 +- .../gremlin/structure/GraphHiddenTest.java | 4 +- .../gremlin/structure/util/ElementHelperTest.java | 10 - .../tinkerpop/gremlin/util/NumberHelperTest.java | 9 +++- .../gremlin/driver/RequestMessageTest.java | 4 +- .../apache/tinkerpop/gremlin/LoadGraphWith.java| 6 ++- .../generator/CommunityGeneratorTest.java | 4 +- .../process/traversal/step/branch/UnionTest.java | 9 +++- .../process/traversal/step/filter/IsTest.java | 4 +- .../process/traversal/step/filter/SampleTest.java | 4 +- .../process/traversal/step/map/CoalesceTest.java | 6 +-- .../process/traversal/step/map/FlatMapTest.java| 2 +- .../process/traversal/step/map/LoopsTest.java | 4 +- .../process/traversal/step/map/MapTest.java| 4 +- .../process/traversal/step/map/MaxTest.java| 7 +++- .../process/traversal/step/map/MeanTest.java | 4 +- .../process/traversal/step/map/MinTest.java| 5 ++- .../process/traversal/step/map/SumTest.java| 5 ++- .../process/traversal/step/map/UnfoldTest.java | 14 +-- .../step/sideEffect/SideEffectCapTest.java | 9 ++-- .../traversal/step/sideEffect/TreeTest.java| 4 +- .../decoration/SubgraphStrategyProcessTest.java| 15 --- .../IncidentToAdjacentStrategyProcessTest.java | 5 ++- .../tinkerpop/gremlin/structure/EdgeTest.java | 15 +-- .../gremlin/structure/FeatureSupportTest.java | 13 -- .../gremlin/structure/GraphConstructionTest.java | 4 +- .../tinkerpop/gremlin/structure/VariablesTest.java | 4 +- .../tinkerpop/gremlin/structure/VertexTest.java| 1 - .../tinkerpop/gremlin/structure/io/IoTest.java | 6 ++- .../structure/util/detached/DetachedEdgeTest.java | 5 ++- .../util/detached/DetachedPropertyTest.java| 6 ++- .../util/detached/DetachedVertexPropertyTest.java | 6 ++- .../util/reference/ReferenceVertexTest.java| 7 ++-- .../neo4j/structure/NativeNeo4jIndexCheck.java | 7 ++-- .../gremlin/spark/util/SugarTestHelper.java| 6 ++- .../tinkergraph/structure/TinkerGraphPlayTest.java | 49 +- 44 files changed, 228 insertions(+), 89 deletions(-)
[tinkerpop] 03/03: Merge branch 'tp34'
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 24cd5640c806cda23170662203e689dfc0ee3f3f Merge: a52a8cc e8de6e9 Author: Stephen Mallette AuthorDate: Thu Jun 20 15:29:00 2019 -0400 Merge branch 'tp34' CHANGELOG.asciidoc | 1 + .../gremlin/tinkergraph/structure/TinkerGraph.java | 38 +++--- .../tinkergraph/structure/IdManagerTest.java | 81 ++ 3 files changed, 110 insertions(+), 10 deletions(-)
[tinkerpop] 03/03: Merge branch 'tp34'
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 6f74db7551299334eb17a16cfebcc77634b53dc6 Merge: 75b2ab2 d0d32fa Author: Stephen Mallette AuthorDate: Tue Jun 25 15:29:39 2019 -0400 Merge branch 'tp34' .../dev/developer/development-environment.asciidoc | 1 + docs/src/dev/provider/index.asciidoc | 8 +- .../traversal/step/sideEffect/SubgraphStep.java| 17 +- .../structure/io/graphml/GraphMLWriter.java| 179 +++-- .../tinkerpop/gremlin/AbstractGremlinTest.java | 8 +- .../tinkerpop/gremlin/IgnoreIteratorLeak.java | 41 - .../algorithm/generator/AbstractGeneratorTest.java | 21 ++- .../generator/CommunityGeneratorTest.java | 3 - .../generator/DistributionGeneratorTest.java | 5 +- .../process/computer/GraphComputerTest.java| 9 +- .../traversal/TraversalInterruptionTest.java | 2 - .../traversal/step/sideEffect/SubgraphTest.java| 2 - .../decoration/SubgraphStrategyProcessTest.java| 4 +- .../tinkerpop/gremlin/structure/io/IoTest.java | 3 - .../tinkergraph/structure/TinkerGraphIterator.java | 12 +- 15 files changed, 147 insertions(+), 168 deletions(-)
[tinkerpop] 03/03: Merge branch 'tp34'
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 4c233a6a081629b9b0866509df4f5437360574ba Merge: 6f74db7 342df7d Author: Stephen Mallette AuthorDate: Tue Jun 25 15:34:07 2019 -0400 Merge branch 'tp34' CHANGELOG.asciidoc| 1 + .../main/java/org/apache/tinkerpop/gremlin/driver/Connection.java | 5 - .../java/org/apache/tinkerpop/gremlin/driver/ConnectionPool.java | 8 .../main/java/org/apache/tinkerpop/gremlin/driver/Handler.java| 2 +- 4 files changed, 10 insertions(+), 6 deletions(-)
[tinkerpop] 03/03: Merge branch 'tp34'
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 f7aeac4320bc673ec1c875bd781a1e5eb65ff634 Merge: 4c233a6 bd28ea2 Author: Stephen Mallette AuthorDate: Thu Jun 27 13:55:10 2019 -0400 Merge branch 'tp34'
[tinkerpop] 03/03: Merge branch 'tp34'
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 3cc807b8030d955e7a27d326495197591d854d53 Merge: f7aeac4 761dc05 Author: Stephen Mallette AuthorDate: Fri Jun 28 06:12:38 2019 -0400 Merge branch 'tp34' docs/src/reference/implementations-neo4j.asciidoc | 30 --- docs/src/tutorials/getting-started/index.asciidoc | 5 ++-- 2 files changed, 3 insertions(+), 32 deletions(-)
[tinkerpop] 03/03: Merge branch 'tp34'
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 5694a1773781793a54b475621e0d7f673de7b2e2 Merge: 2fd72bf 1e03e20 Author: Stephen Mallette AuthorDate: Mon Jul 1 08:08:59 2019 -0400 Merge branch 'tp34'
[tinkerpop] 03/03: Merge branch 'tp34'
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 f51e8d5430592ab149d2c595afe45da52418b20a Merge: 5694a17 96711c8 Author: Stephen Mallette AuthorDate: Mon Jul 1 08:10:30 2019 -0400 Merge branch 'tp34'
[tinkerpop] 03/03: Merge branch 'tp34'
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 e5adf47b19987679b48fea083c2145cc77c9e038 Merge: 4f36d85 8737d6c Author: Stephen Mallette AuthorDate: Mon Jul 1 14:56:34 2019 -0400 Merge branch 'tp34' gremlin-python/src/main/jython/setup.py | 5 + 1 file changed, 1 insertion(+), 4 deletions(-)
[tinkerpop] 03/03: Merge branch 'tp34'
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 354974a5febc48aa7c17b8bbe3e892c253cbabfa Merge: e5adf47 448e81e Author: Stephen Mallette AuthorDate: Mon Jul 1 18:56:17 2019 -0400 Merge branch 'tp34' gremlin-console/src/test/python/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[tinkerpop] 03/03: Merge branch 'tp34'
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 125385e0ef760a274aebd9aa8fa7cecbeef9c68b Merge: 1750593 2a337c6 Author: Stephen Mallette AuthorDate: Fri Jul 5 06:41:21 2019 -0400 Merge branch 'tp34' CHANGELOG.asciidoc | 1 + docs/src/reference/gremlin-variants.asciidoc| 2 +- .../src/main/java/org/apache/tinkerpop/gremlin/driver/Connection.java | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-)
[tinkerpop] 03/03: Merge branch 'tp34'
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 8da09c0435623421855d8596e54256368f84c3e5 Merge: 125385e 199da2e Author: Stephen Mallette AuthorDate: Fri Jul 5 08:19:12 2019 -0400 Merge branch 'tp34' CHANGELOG.asciidoc | 1 + .../org/apache/tinkerpop/gremlin/server/handler/OpSelectorHandler.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)
[tinkerpop] 03/03: Merge branch 'tp34'
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 199c9106a76b09652b8f4d9cb76cbed7ac7fd418 Merge: dce3e65 a62dc4f Author: Stephen Mallette AuthorDate: Fri Jul 5 13:39:44 2019 -0400 Merge branch 'tp34' CHANGELOG.asciidoc | 1 + docs/src/upgrade/release-3.3.x.asciidoc| 8 - .../glv/GraphTraversalSource.template | 16 +- .../lib/process/graph-traversal.js | 16 +- .../lib/process/traversal-strategy.js | 28 +- .../lib/structure/io/graph-serializer.js | 2 ++ .../lib/structure/io/type-serializers.js | 16 ++ .../test/cucumber/feature-steps.js | 34 ++ 8 files changed, 85 insertions(+), 36 deletions(-)
[tinkerpop] 03/03: Merge branch 'tp34'
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 64dd7e5a14538b69a208e6719f8cc645865df398 Merge: 199c910 2d6af03 Author: Stephen Mallette AuthorDate: Mon Jul 8 12:31:56 2019 -0400 Merge branch 'tp34' CHANGELOG.asciidoc | 1 + .../process/traversal/step/branch/OptionalStep.java | 1 + .../gremlin/tinkergraph/structure/TinkerGraphTest.java | 17 + 3 files changed, 19 insertions(+)
[tinkerpop] 03/03: Merge branch 'tp34'
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 c98284133858df026bf32f98d44df1217e7ff0e5 Merge: 06c5a90 4862624 Author: Stephen Mallette AuthorDate: Tue Jul 9 10:23:28 2019 -0400 Merge branch 'tp34' gremlin-server/pom.xml | 2 +- .../apache/tinkerpop/gremlin/server/KdcFixture.java | 2 +- .../apache/tinkerpop/gremlin/server/backend.conf| 19 --- .../gremlin/server/gremlin-console-jaas.conf| 4 ++-- .../org/apache/tinkerpop/gremlin/server/kdc.conf| 21 - 5 files changed, 4 insertions(+), 44 deletions(-)
[tinkerpop] 03/03: Merge branch 'tp34'
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 508981c72065fe3f488a98ad533102f1af0946d9 Merge: c982841 6c755e8 Author: Stephen Mallette AuthorDate: Wed Jul 10 05:56:44 2019 -0400 Merge branch 'tp34' CHANGELOG.asciidoc | 2 + .../tinkerpop/gremlin/driver/ser/SerTokens.java| 19 +++- .../tinkerpop/gremlin/driver/ser/Serializers.java | 16 .../server/GremlinResultSetIntegrateTest.java | 101 +++-- 4 files changed, 87 insertions(+), 51 deletions(-)
[tinkerpop] 03/03: Merge branch 'tp34'
This is an automated email from the ASF dual-hosted git repository. rdale pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tinkerpop.git commit 55db28c346c23b982b39caa09fcb7a383dab5f01 Merge: 06601d9 4d457b9 Author: Robert Dale AuthorDate: Wed Jul 10 08:03:31 2019 -0400 Merge branch 'tp34' CHANGELOG.asciidoc | 2 +- gremlin-shaded/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
[tinkerpop] 03/03: Merge branch 'tp34'
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 4ec2fbb47c2f6bb9023a6de0afdbdaeddf6722ce Merge: 0a30b73 b3866f4 Author: Stephen Mallette AuthorDate: Thu Jul 11 06:51:02 2019 -0400 Merge branch 'tp34' docs/src/upgrade/release-3.3.x.asciidoc | 8 +--- 1 file changed, 5 insertions(+), 3 deletions(-)
[tinkerpop] 03/03: Merge branch 'tp34'
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 b2ff2ff9111941476e2608024c60deab760a09aa Merge: f390a5d eb15413 Author: Stephen Mallette AuthorDate: Thu Jul 11 12:38:58 2019 -0400 Merge branch 'tp34' .../main/javascript/gremlin-javascript/test/cucumber/feature-steps.js | 3 --- 1 file changed, 3 deletions(-)
[tinkerpop] 03/03: Merge branch 'tp34'
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 9ea3664cb70157021a572ace942f2788a2e5cdb7 Merge: b2ff2ff 85c2175 Author: Stephen Mallette AuthorDate: Thu Jul 11 17:05:27 2019 -0400 Merge branch 'tp34' .../test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs | 8 ++-- gremlin-test/features/branch/Repeat.feature | 2 +- gremlin-test/features/map/PeerPressure.feature| 2 +- gremlin-test/features/sideEffect/Group.feature| 2 +- 4 files changed, 5 insertions(+), 9 deletions(-) diff --cc gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs index 8f0e434,ba3b4ee..641b9a4 --- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs +++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs @@@ -40,12 -40,8 +40,8 @@@ namespace Gremlin.Net.IntegrationTest.G private static readonly IDictionary IgnoredScenarios = new Dictionary { - // Add here the name of scenarios to ignore and the reason, e.g. - { "g_VX1X_outEXcreatedX_inV_inE_outV_path", IgnoreReason.NoReason }, - { "g_V_peerPressure_withXpropertyName_clusterX_withXedges_outEXknowsXX_pageRankX1X_byXrankX_withXedges_outEXknowsX_withXtimes_2X_group_byXclusterX_byXrank_sumX_limitX100X", IgnoreReason.NoReason }, - { "g_V_group_byXoutE_countX_byXnameX", IgnoreReason.NoReason }, - { "g_VX1X_repeatXgroupCountXmX_byXloopsX_outX_timesX3X_capXmX", IgnoreReason.NoReason }, - { "g_V_outXcreatedX_groupXmX_byXlabelX_pageRankX1X_byXpageRankX_byXinEX_timesX1X_inXcreatedX_groupXmX_byXpageRankX_capXmX", IgnoreReason.NoReason } + // Add here the name of scenarios to ignore and the reason, e.g.: -// { "g_V_peerPressure_byXclusterX_byXoutEXknowsXX_pageRankX1X_byXrankX_byXoutEXknowsXX_timesX2X_group_byXclusterX_byXrank_sumX_limitX100X", IgnoreReason.NoReason }, ++// { "g_V_peerPressure_withXpropertyName_clusterX_withXedges_outEXknowsXX_pageRankX1X_byXrankX_withXedges_outEXknowsX_withXtimes_2X_group_byXclusterX_byXrank_sumX_limitX100X", IgnoreReason.NoReason }, }; private static class Keywords diff --cc gremlin-test/features/map/PeerPressure.feature index ae246a5,81ca6f8..4b73300 --- a/gremlin-test/features/map/PeerPressure.feature +++ b/gremlin-test/features/map/PeerPressure.feature @@@ -43,9 -43,25 +43,9 @@@ Feature: Step - peerPressure( When iterated to list Then the result should be unordered | result | - | m[{"d[1].l":"d[0.5833].d","d[3].l":"d[0.1389].d","d[5].l":"d[0.1389].d","d[6].l":"d[0.1389].d"}] | + | m[{"d[1].i":"d[0.5833].d","d[3].i":"d[0.1389].d","d[5].i":"d[0.1389].d","d[6].i":"d[0.1389].d"}] | - Scenario: g_V_hasXname_rippleX_inXcreatedX_peerPressure_byXoutEX_byXclusterX_repeatXunionXidentity__bothX_timesX2X_dedup_valueMapXname_clusterX -Given the modern graph -And the traversal of - """ - g.withComputer().V().has("name", "ripple").in("created").peerPressure().by(__.outE()).by("cluster").repeat(__.union(__.identity(), __.both())).times(2).dedup().valueMap("name", "cluster") - """ -When iterated to list -Then the result should be unordered - | result | - | m[{"name": ["marko"], "cluster": [1]}] | - | m[{"name": ["vadas"], "cluster": [2]}] | - | m[{"name": ["lop"], "cluster": [4]}] | - | m[{"name": ["josh"], "cluster": [4]}] | - | m[{"name": ["ripple"], "cluster": [4]}] | - | m[{"name": ["peter"], "cluster": [6]}] | - - Scenario: g_V_hasXname_rippleX_inXcreatedX_peerPressure_withXEDGES_outEX_withXPROPERTY_NAME_clusterX_repeatXunionXidentity__bothX_timesX2X_dedup_valueMapXname_clusterX + Scenario: g_V_hasXname_rippleX_inXcreatedX_peerPressure_withXedges_outEX_withyXpropertyName_clusterX_repeatXunionXidentity__bothX_timesX2X_dedup_valueMapXname_clusterX Given the modern graph And the traversal of """
[tinkerpop] 03/03: Merge branch 'tp34'
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 588f7d099fe5949b7290e9b75ee00e421283b0c7 Merge: 52977a8 0f95e00 Author: Stephen Mallette AuthorDate: Tue Jul 16 07:39:52 2019 -0400 Merge branch 'tp34' CHANGELOG.asciidoc | 1 + .../apache/tinkerpop/gremlin/server/op/AbstractOpProcessor.java | 3 ++- .../gremlin/server/op/traversal/TraversalOpProcessor.java| 9 + 3 files changed, 8 insertions(+), 5 deletions(-)
[tinkerpop] 03/03: Merge branch 'tp34'
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 430c5e196d5f3b685ae12c06c93fa0b0b1fe2992 Merge: 90e538a 2f1e7d1 Author: Stephen Mallette AuthorDate: Tue Jul 23 07:19:26 2019 -0400 Merge branch 'tp34' CHANGELOG.asciidoc | 1 + docs/src/upgrade/release-3.3.x.asciidoc| 8 + .../Process/Traversal/DefaultTraversal.cs | 29 +++-- .../Gremlin.Net/Process/Traversal/ITraversal.cs| 6 .../Process/Traversal/TraversalTests.cs| 18 +++ gremlin-javascript/glv/TraversalSource.template| 12 .../gremlin-javascript/lib/process/traversal.js| 12 .../test/integration/traversal-test.js | 9 -- .../gremlin-javascript/test/unit/traversal-test.js | 36 ++ 9 files changed, 126 insertions(+), 5 deletions(-)
[tinkerpop] 03/03: Merge branch 'tp34'
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 706aad1bc6d8e2ee7745aa75ac8b6001aa6c06bc Merge: 430c5e1 a211c9a Author: Stephen Mallette AuthorDate: Tue Jul 23 10:23:10 2019 -0400 Merge branch 'tp34' .gitignore | 1 + 1 file changed, 1 insertion(+)
[tinkerpop] 03/03: Merge branch 'tp34'
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 d8059a41aff5e0ca305bec7afb7c8f7cf4108b27 Merge: 706aad1 18e3b06 Author: Stephen Mallette AuthorDate: Tue Jul 23 11:25:26 2019 -0400 Merge branch 'tp34' .gitignore | 1 + 1 file changed, 1 insertion(+)
[tinkerpop] 03/03: Merge branch 'tp34'
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 c698ea6906ad8c345dd20a2a4cbcba4384887cfd Merge: d8059a4 85301fb Author: Stephen Mallette AuthorDate: Tue Jul 23 18:55:16 2019 -0400 Merge branch 'tp34' gremlin-python/glv/GraphTraversalSource.template | 23 +- gremlin-python/glv/TraversalSource.template| 16 +- .../gremlin_python/process/graph_traversal.py | 373 +++-- .../jython/gremlin_python/process/traversal.py | 61 +++- 4 files changed, 357 insertions(+), 116 deletions(-)
[tinkerpop] 03/03: Merge branch 'tp34'
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 009053a6dc50244b9712810977ea0549d54b375a Merge: c698ea6 1213d3f Author: Stephen Mallette AuthorDate: Wed Jul 24 06:02:47 2019 -0400 Merge branch 'tp34' gremlin-server/pom.xml | 4 1 file changed, 4 insertions(+) diff --cc gremlin-server/pom.xml index 21205a3,8ee0091..cb5231d --- a/gremlin-server/pom.xml +++ b/gremlin-server/pom.xml @@@ -234,57 -226,13 +234,61 @@@ limitations under the License slf4j-api -info.ganglia.gmetric4j -gmetric4j +org.slf4j +slf4j-nop + + +org.apache.lucene +lucene-core + + +io.dropwizard.metrics +metrics-core + + +io.netty +netty-all + + + + +org.scala-lang +scala-library +2.11.8 +test + + +org.scala-lang +scala-reflect +2.11.8 +test + + +org.apache.lucene +lucene-core +5.5.0 +test + + +io.dropwizard.metrics +metrics-core +4.0.2 +test + + +org.neo4j +neo4j-kernel +3.4.11 +test + + +io.netty +netty-all + + org.ow2.asm + asm +
[tinkerpop] 03/03: Merge branch 'tp34'
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 aee038fe26ba399410720afb96c133602410fd6e Merge: a849fd3 92a2053 Author: Stephen Mallette AuthorDate: Thu Jul 25 11:02:10 2019 -0400 Merge branch 'tp34' gremlin-python/glv/TraversalSource.template| 20 -- .../jython/gremlin_python/process/traversal.py | 72 +++--- 2 files changed, 63 insertions(+), 29 deletions(-)
[tinkerpop] 03/03: Merge branch 'tp34'
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 64fce343d3c3c44565e3ff5e447f1433a37ab557 Merge: 0af88d5 18e9752 Author: Stephen Mallette AuthorDate: Tue Jul 30 10:54:06 2019 -0400 Merge branch 'tp34' .../main/java/org/apache/tinkerpop/gremlin/AbstractGremlinTest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
[tinkerpop] 03/03: Merge branch 'tp34'
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 38c94f423ff30cfe1ae026657d6515a5559bd9ba Merge: 7fad4ea 1aabcd6 Author: Stephen Mallette AuthorDate: Tue Jul 30 12:36:52 2019 -0400 Merge branch 'tp34' CHANGELOG.asciidoc | 3 +- gremlin-python/glv/GraphTraversalSource.template | 88 +++- gremlin-python/glv/TraversalSource.template| 26 gremlin-python/glv/generate.groovy | 27 ++-- .../gremlin_python/process/graph_traversal.py | 159 - .../jython/gremlin_python/process/traversal.py | 37 ++--- .../gremlin_python/structure/io/graphsonV2d0.py| 3 +- .../gremlin_python/structure/io/graphsonV3d0.py| 3 +- .../tests/driver/test_driver_remote_connection.py | 6 + 9 files changed, 288 insertions(+), 64 deletions(-) diff --cc gremlin-python/src/main/jython/gremlin_python/process/traversal.py index 1c4e704,dbc470f..e5a9bbc --- a/gremlin-python/src/main/jython/gremlin_python/process/traversal.py +++ b/gremlin-python/src/main/jython/gremlin_python/process/traversal.py @@@ -154,22 -154,10 +154,8 @@@ GryoVersion = Enum('GryoVersion', ' V1_ statics.add_static('V1_0', GryoVersion.V1_0) statics.add_static('V3_0', GryoVersion.V3_0) - Operator = Enum('Operator', ' addAll and_ assign div max min minus mult or_ sum sumLong') - - statics.add_static('sum', Operator.sum) - statics.add_static('minus', Operator.minus) - statics.add_static('mult', Operator.mult) - statics.add_static('div', Operator.div) - statics.add_static('min', Operator.min) - statics.add_static('max', Operator.max) - statics.add_static('assign', Operator.assign) - statics.add_static('and_', Operator.and_) - statics.add_static('or_', Operator.or_) - statics.add_static('addAll', Operator.addAll) - statics.add_static('sumLong', Operator.sumLong) - -Order = Enum('Order', ' asc decr desc incr shuffle') +Order = Enum('Order', ' asc desc shuffle') -statics.add_static('incr', Order.incr) -statics.add_static('decr', Order.decr) statics.add_static('shuffle', Order.shuffle) statics.add_static('asc', Order.asc) statics.add_static('desc', Order.desc)
[tinkerpop] 03/03: Merge branch 'tp34'
This is an automated email from the ASF dual-hosted git repository. rdale pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tinkerpop.git commit 0046f96fa4e84986bbfbaea461f382fff81e3640 Merge: bf41a5b b35eb2b Author: Robert Dale AuthorDate: Tue Aug 13 15:29:13 2019 -0400 Merge branch 'tp34' CHANGELOG.asciidoc | 2 ++ gremlin-shaded/pom.xml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-)
[tinkerpop] 03/03: Merge branch 'tp34'
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 6db489810629207a3f38340108162797c2f4155b Merge: 3473b1a fd4a44b Author: Stephen Mallette AuthorDate: Thu Aug 15 16:27:49 2019 -0400 Merge branch 'tp34' CHANGELOG.asciidoc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
[tinkerpop] 03/03: Merge branch 'tp34'
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 fcb6af0bf142a92e3d9ae68e00afaa718dd6bc49 Merge: 6db4898 68b7eea Author: Stephen Mallette AuthorDate: Mon Aug 19 07:42:58 2019 -0400 Merge branch 'tp34' CHANGELOG.asciidoc| 3 ++- .../src/main/jython/gremlin_python/driver/connection.py | 8 ++-- 2 files changed, 8 insertions(+), 3 deletions(-)
[tinkerpop] 03/03: Merge branch 'tp34'
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 0e4f57982d37f126a72ed7e96fbe9a0a2bd96283 Merge: fcb6af0 bff78f1 Author: Stephen Mallette AuthorDate: Mon Aug 19 08:02:25 2019 -0400 Merge branch 'tp34' docs/src/dev/developer/release.asciidoc | 2 ++ 1 file changed, 2 insertions(+)
[tinkerpop] 03/03: Merge branch 'tp34'
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 d04deb8a8d5271c6cba4196f0f24d52297052a08 Merge: 0e4f579 cf97903 Author: Stephen Mallette AuthorDate: Mon Aug 19 08:31:38 2019 -0400 Merge branch 'tp34' .../resources/archetype-resources/src/test/java/SocialDslTest.java | 6 ++ 1 file changed, 2 insertions(+), 4 deletions(-)
[tinkerpop] 03/03: Merge branch 'tp34'
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 4d0ffaa4acceae02de91ec2da959d905f0d7ee9b Merge: 3cbe6ea 447d120 Author: Stephen Mallette AuthorDate: Tue Aug 27 14:39:02 2019 -0400 Merge branch 'tp34' CHANGELOG.asciidoc | 1 + .../src/main/java/SocialTraversalSourceDsl.java| 5 ++ .../process/traversal/dsl/GremlinDslProcessor.java | 6 ++ .../traversal/dsl/GremlinDslProcessorTest.java | 69 -- .../dsl/SocialPackageTraversalSourceDsl.java | 9 +-- .../process/traversal/dsl/RemoteDslTraversal.java | 31 ++ .../credential/CredentialTraversalSourceDsl.java | 5 ++ 7 files changed, 118 insertions(+), 8 deletions(-)
[tinkerpop] 03/03: Merge branch 'tp34'
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 4c577cd6a7585e7f52b58c521f7d919c8b14399e Merge: debd561 091a528 Author: Stephen Mallette AuthorDate: Tue Sep 3 11:33:17 2019 -0400 Merge branch 'tp34' CHANGELOG.asciidoc | 1 + .../gremlin/process/traversal/step/map/GraphStep.java | 18 +++--- .../traversal/step/sideEffect/TinkerGraphStep.java | 2 +- 3 files changed, 13 insertions(+), 8 deletions(-)
[tinkerpop] 03/03: Merge branch 'tp34'
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 5120f2bfee1135944c12a9a2b3718add4501d47a Merge: 9cd6db2 3630afc Author: Stephen Mallette AuthorDate: Tue Sep 3 12:42:03 2019 -0400 Merge branch 'tp34' CHANGELOG.asciidoc | 2 + ...alExplanation.java => AbstractExplanation.java} | 104 +++ .../traversal/util/ImmutableExplanation.java | 80 +++ .../traversal/util/TraversalExplanation.java | 112 - .../structure/io/graphson/GraphSONModule.java | 2 + .../io/graphson/GraphSONSerializersV2d0.java | 28 ++ .../io/graphson/GraphSONSerializersV3d0.java | 28 ++ .../traversal/util/TraversalExplanationTest.java | 8 ++ .../graphson/GraphSONMapperEmbeddedTypeTest.java | 11 ++ 9 files changed, 215 insertions(+), 160 deletions(-)
[tinkerpop] 03/03: Merge branch 'tp34'
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 2c71bc2be2796dc3a2931e34fa343d7a257bdfe5 Merge: 6c8f245 c8f1c65 Author: Stephen Mallette AuthorDate: Mon Sep 9 17:49:18 2019 -0400 Merge branch 'tp34'
[tinkerpop] 03/03: Merge branch 'tp34'
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 85998299be6c48602718377a3b81f545a0549bcc Merge: d3b1bf3 2caf136 Author: Stephen Mallette AuthorDate: Fri Sep 20 07:03:59 2019 -0400 Merge branch 'tp34' .../apache/tinkerpop/gremlin/driver/message/ResponseStatusCode.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
[tinkerpop] 03/03: Merge branch 'tp34'
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 c164c765fa632717d80cfb2dcb2b80e46ddeaf3d Merge: 8599829 2e89be3 Author: Stephen Mallette AuthorDate: Fri Sep 20 09:15:06 2019 -0400 Merge branch 'tp34' CHANGELOG.asciidoc | 1 + .../server/op/traversal/TraversalOpProcessor.java | 7 + .../gremlin/server/GremlinServerIntegrateTest.java | 32 -- 3 files changed, 38 insertions(+), 2 deletions(-) diff --cc gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java index cc9d084,57f13e0..f0304f1 --- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java +++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java @@@ -590,8 -653,56 +618,8 @@@ public class GremlinServerIntegrateTes cluster.close(); } } - + @Test -public void shouldEnableSslAndClientCertificateAuthWithLegacyPem() { -final Cluster cluster = TestClientFactory.build().enableSsl(true) -.keyCertChainFile(PEM_CLIENT_CRT).keyFile(PEM_CLIENT_KEY) - .keyPassword(KEY_PASS).trustCertificateChainFile(PEM_SERVER_CRT).create(); -final Client client = cluster.connect(); - -try { -assertEquals("test", client.submit("'test'").one().getString()); -} finally { -cluster.close(); -} -} - -@Test -public void shouldEnableSslAndClientCertificateAuthAndFailWithoutCertWithLegacyPem() { -final Cluster cluster = TestClientFactory.build().enableSsl(true).keyStore(JKS_SERVER_KEY).keyStorePassword(KEY_PASS).sslSkipCertValidation(true).create(); -final Client client = cluster.connect(); - -try { -client.submit("'test'").one(); -fail("Should throw exception because ssl client auth is enabled on the server but client does not have a cert"); -} catch(Exception x) { -final Throwable root = ExceptionUtils.getRootCause(x); -assertThat(root, instanceOf(NoHostAvailableException.class)); -} finally { -cluster.close(); -} -} - -@Test -public void shouldEnableSslAndClientCertificateAuthAndFailWithoutTrustedClientCertWithLegacyPem() { -final Cluster cluster = TestClientFactory.build().enableSsl(true) -.keyCertChainFile(PEM_CLIENT_CRT).keyFile(PEM_CLIENT_KEY) - .keyPassword(KEY_PASS).trustCertificateChainFile(PEM_SERVER_CRT).create(); -final Client client = cluster.connect(); - -try { -client.submit("'test'").one(); -fail("Should throw exception because ssl client auth is enabled on the server but does not trust client's cert"); -} catch(Exception x) { -final Throwable root = ExceptionUtils.getRootCause(x); -assertThat(root, instanceOf(NoHostAvailableException.class)); -} finally { -cluster.close(); -} -} - -@Test public void shouldEnableSslAndClientCertificateAuthWithPkcs12() { final Cluster cluster = TestClientFactory.build().enableSsl(true).keyStore(P12_CLIENT_KEY).keyStorePassword(KEY_PASS) .keyStoreType(KEYSTORE_TYPE_PKCS12).trustStore(P12_CLIENT_TRUST).trustStorePassword(KEY_PASS).create();
[tinkerpop] 03/03: Merge branch 'tp34'
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 0da112f9eb94ee35b39e5d3d73f5507b83b0a5b0 Merge: 9b84456 9f500ec Author: Stephen Mallette AuthorDate: Mon Sep 23 10:11:46 2019 -0400 Merge branch 'tp34' CHANGELOG.asciidoc | 1 + docs/src/reference/gremlin-variants.asciidoc | 8 + .../tinkerpop/gremlin/util/function/Lambda.java| 31 ++ .../src/Gremlin.Net/Process/Traversal/Lambda.cs| 4 +-- .../Process/Traversal/StringBasedLambda.cs | 21 +++- .../GraphTraversalSourceTests.cs | 12 +++ .../gremlin/groovy/jsr223/GroovyTranslator.java| 37 +++--- .../groovy/jsr223/GroovyTranslatorTest.java| 27 .../gremlin_python/structure/io/graphsonV2d0.py| 8 +++-- .../gremlin_python/structure/io/graphsonV3d0.py| 8 +++-- .../tests/driver/test_driver_remote_connection.py | 11 +++ 11 files changed, 156 insertions(+), 12 deletions(-) diff --cc gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GroovyTranslator.java index 9cd06e7,505f88a..1c21d59 --- a/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GroovyTranslator.java +++ b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GroovyTranslator.java @@@ -41,16 -41,17 +42,16 @@@ import org.apache.tinkerpop.gremlin.str import org.apache.tinkerpop.gremlin.util.function.Lambda; import java.sql.Timestamp; --import java.util.ArrayList; import java.util.Date; --import java.util.HashSet; +import java.util.Iterator; import java.util.List; import java.util.Map; --import java.util.Optional; import java.util.Set; import java.util.UUID; +import java.util.stream.Collectors; + import java.util.function.BinaryOperator; + import java.util.function.Supplier; + import java.util.function.UnaryOperator; /** * Converts bytecode to a Groovy string of Gremlin. @@@ -281,46 -203,62 +282,72 @@@ public final class GroovyTranslator imp } } else if (object instanceof Lambda) { final String lambdaString = ((Lambda) object).getLambdaScript().trim(); -return lambdaString.startsWith("{") ? lambdaString : "{" + lambdaString + "}"; +final String wrapper = lambdaString.startsWith("{") ? lambdaString : "{" + lambdaString + "}"; +return script.getBoundKeyOrAssign(withParameters, withParameters ? object : wrapper); } else if (object instanceof TraversalStrategyProxy) { final TraversalStrategyProxy proxy = (TraversalStrategyProxy) object; -if (proxy.getConfiguration().isEmpty()) -return proxy.getStrategyClass().getCanonicalName() + ".instance()"; -else -return proxy.getStrategyClass().getCanonicalName() + ".create(new org.apache.commons.configuration.MapConfiguration(" + convertToString(ConfigurationConverter.getMap(proxy.getConfiguration())) + "))"; +if (proxy.getConfiguration().isEmpty()) { +return script.append(proxy.getStrategyClass().getCanonicalName() + ".instance()"); +} else { +script.append(proxy.getStrategyClass().getCanonicalName() + ".create(new org.apache.commons.configuration2.MapConfiguration("); + convertToScript(ConfigurationConverter.getMap(proxy.getConfiguration())); +return script.append("))"); +} } else if (object instanceof TraversalStrategy) { -return convertToString(new TraversalStrategyProxy(((TraversalStrategy) object))); -} else -return null == object ? "null" : object.toString(); +return convertToScript(new TraversalStrategyProxy(((TraversalStrategy) object))); +} else { +return null == object ? script.append("null") : script.getBoundKeyOrAssign(withParameters, object); +} } -protected String internalTranslate(final String start, final Bytecode bytecode) { -final StringBuilder traversalScript = new StringBuilder(start); +protected Script internalTranslate(final String start, final Bytecode bytecode) { +script.append(start); for (final Bytecode.Instruction instruction : bytecode.getInstructions()) { final String methodName = instruction.getOperator(); -if (0 == instruction.getArguments().length) - traversalScript.append(".").append(methodName).append("()"); -else { -traversalScript.append("."); -String temp = methodName + "("; +
[tinkerpop] 03/03: Merge branch 'tp34'
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 4d2142d70f0884e38e1a3492401797bc19bd9075 Merge: 35da997 8a236d3 Author: Stephen Mallette AuthorDate: Thu Sep 26 09:32:43 2019 -0400 Merge branch 'tp34' docs/src/dev/developer/development-environment.asciidoc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
[tinkerpop] 03/03: Merge branch 'tp34'
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 e69328fb19f20931dfd2e08e3a4599cc96914746 Merge: 87e914f 1ce6fe7 Author: Stephen Mallette AuthorDate: Thu Sep 26 18:10:14 2019 -0400 Merge branch 'tp34' .../apache/tinkerpop/gremlin/driver/Client.java| 5 +- .../tinkerpop/gremlin/driver/Connection.java | 23 --- .../tinkerpop/gremlin/driver/ConnectionPool.java | 16 +++-- .../apache/tinkerpop/gremlin/driver/Handler.java | 45 ++--- .../driver/exception/NoHostAvailableException.java | 31 - .../server/handler/SaslAuthenticationHandler.java | 15 ++--- .../gremlin/server/GremlinDriverIntegrateTest.java | 11 ++-- .../server/GremlinServerAuthIntegrateTest.java | 66 ++- .../server/GremlinServerAuthKrb5IntegrateTest.java | 75 ++ .../gremlin/server/GremlinServerIntegrateTest.java | 11 ++-- 10 files changed, 44 insertions(+), 254 deletions(-)
[tinkerpop] 03/03: Merge branch 'tp34'
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 5213563f01d4e92064540c390fe365bda46d8cd0 Merge: e69328f 39167fc Author: Stephen Mallette AuthorDate: Fri Sep 27 08:52:13 2019 -0400 Merge branch 'tp34' .../tinkerpop/gremlin/structure/io/graphson/GraphSONModule.java| 5 + .../apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java| 7 +-- .../src/main/jython/tests/driver/test_driver_remote_connection.py | 4 3 files changed, 10 insertions(+), 6 deletions(-) diff --cc gremlin-python/src/main/jython/tests/driver/test_driver_remote_connection.py index 3cb9fa0,ad73fb9..550e0e6 --- a/gremlin-python/src/main/jython/tests/driver/test_driver_remote_connection.py +++ b/gremlin-python/src/main/jython/tests/driver/test_driver_remote_connection.py @@@ -189,11 -189,117 +189,7 @@@ class TestDriverRemoteConnection(object assert False except GremlinServerError as gse: assert gse.status_code == 500 - except KeyError as ke: - # gross we need to fix this: https://issues.apache.org/jira/browse/TINKERPOP-2297 - # would prefer to assert a GremlinServerError status code - assert True -def test_side_effects(self, remote_connection): -statics.load_statics(globals()) -# -g = traversal().withRemote(remote_connection) -### -t = g.V().hasLabel("project").name.iterate() -assert 0 == len(t.side_effects.keys()) -with pytest.raises(Exception): -m = t.side_effects["m"] -### -t = g.V().out("created").groupCount("m").by("name") -results = t.toSet() -assert 2 == len(results) -assert Vertex(3) in results -assert Vertex(5) in results -assert 1 == len(t.side_effects.keys()) -assert "m" in t.side_effects.keys() -m = t.side_effects["m"] -assert isinstance(m, dict) -assert 2 == len(m) -assert 3 == m["lop"] -assert 1 == m["ripple"] - -# check status attributes -assert "host" in t.side_effects.status_attributes - -## -t = g.V().out("created").groupCount("m").by("name").name.aggregate("n") -results = t.toSet() -assert 2 == len(results) -assert "lop" in results -assert "ripple" in results -assert 2 == len(t.side_effects.keys()) -assert "m" in t.side_effects.keys() -assert "n" in t.side_effects.keys() -n = t.side_effects.get("n") -assert isinstance(n, dict) -assert 2 == len(n) -assert "lop" in n.keys() -assert "ripple" in n.keys() -assert 3 == n["lop"] -assert 1 == n["ripple"] - -t = g.withSideEffect('m', 32).V().map(lambda: "x: x.sideEffects('m')") -results = t.toSet() -assert 1 == len(results) -assert 32 == list(results)[0] -assert 32 == t.side_effects['m'] -assert 1 == len(t.side_effects.keys()) -with pytest.raises(Exception): -x = t.side_effects["x"] - -a = g.V().has("name", "marko").next() -b = g.V().has("name", "peter").next() -edge = g.withSideEffect("b", b).V(a).addE("knows").to("b").next() -assert "knows" == edge.label -assert a == edge.outV -assert b == edge.inV -g.V().has("name", "marko").outE("knows").where(__.inV().has("name", "peter")).drop().iterate() -## -edge = g.withSideEffect("a", a).withSideEffect("b", b).V().limit(1).addE("knows").from_("a").to("b").next() -assert "knows" == edge.label -assert a == edge.outV -assert b == edge.inV -g.V().has("name", "marko").outE("knows").where(__.inV().has("name", "peter")).drop().iterate() - -def test_side_effect_close(self, remote_connection): -g = traversal().withRemote(remote_connection) -t = g.V().aggregate('a').aggregate('b') -t.toList() - -# The 'a' key should return some side effects -results = t.side_effects.get('a') -assert results - -# Close result is None -results = t.side_effects.close() -assert not results - -# Shouldn't get any new info from server -# 'b' isn't in local cache -results = t.side_effects.get('b') -assert not results - -# But 'a' should still be cached locally -results = t.side_effects.get('a') -assert results - -# 'a' should have been added to local keys cache, but not 'b' -results = t.side_effects.keys() -assert len(results) == 1 -a, = results -assert a == 'a' - -# Try to get 'b' directly from server, should throw error -with pytest.raises(Exception):
[tinkerpop] 03/03: Merge branch 'tp34'
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 c4247cab5dadad81e2c685dec40592554cd58d06 Merge: 5213563 fe1cfcd Author: Stephen Mallette AuthorDate: Mon Sep 30 06:43:36 2019 -0400 Merge branch 'tp34' CHANGELOG.asciidoc | 3 +++ hadoop-gremlin/pom.xml | 9 + spark-gremlin/pom.xml | 10 ++ 3 files changed, 22 insertions(+) diff --cc CHANGELOG.asciidoc index 7cb8ef0,ad33e5c..a3c62cc --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@@ -16,39 -16,6 +16,40 @@@ limitations under the License = TinkerPop3 CHANGELOG +== TinkerPop 3.5.0 (The Sleeping Gremlin: No. 18 Entr'acte symphonique) + +image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/images/gremlin-sleeping-beauty.png[width=185] + +[[release-3-5-0]] +=== TinkerPop 3.5.0 (Release Date: NOT OFFICIALLY RELEASED YET) + +This release also includes changes from <>. + +* Modified `null` handling in mutations to be consistent for a new `Vertex` as well as update to an existing one. +* Upgraded to Apache Commons Configuration2. +* Renamed `StoreStep` to `AggregateLocalStep`. +* Renamed `AggregateStep` to `AggregateGlobalStep`. ++* Renamed `SERVER_ERROR_SCRIPT_EVALUATION` to `SERVER_ERROR_EVALUATION` given that this response code applies to remote traversals as well as scripts. +* Configured GraphBinary as the default binary serialization format for the Java Driver. +* Configured GraphSON 3.0 as the default text serialization format when no serializer can be determined. +* Upgraded to Neo4j 3.4.11. +* Added a parameterized `TypeTranslator` for use with `GroovyTranslator` that should produce more cache hits. +* Added support for `TextP` in Neo4j using its string search functions. +* Removed the "experimental" support for multi/meta-properties in Neo4j. +* Removed Gryo serialization configurations from Gremlin Server sample configurations and default configurations. +* Removed previously deprecated `scriptEvaluationTimeout`. +* Removed previously deprecated remote traversal side-effects. +* Removed previously deprecated `Serializers.DEFAULT_RESULT_SERIALIZER` and `Serializers.DEFAULT_REQUEST_SERIALIZER`. +* Removed previously deprecated `decr` and `incr` from `Order`. +* Removed previously deprecated `TraversalSource.withRemote()`. +* Removed previously deprecated `ResponseHandlerContext` infrastructure. +* Removed previously deprecated `VertexProgram` related infrastructure. +* Removed previously deprecated SSL settings: `keyCertChainFile`, `keyFile`, `keyPassword` and `trustCertChainFile` and related infrastructure. +* Removed previously deprecated `PropertyMapStep` constructor and `isIncludeTokens`. +* Removed previously deprecated `StarGraph.builder()` and `StarGraph.Builder.create()`. +* Removed previously deprecated `AbstractOpProcessor.generateMetaData(ChannelHandlerContext, RequestMessage, ResponseStatusCode, Iterator)` +* Removed previously deprecated `BulkDumperVertexProgram` and `BulkLoaderVertexProgram`. + == TinkerPop 3.4.0 (Avant-Gremlin Construction #3 for Theremin and Flowers) image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/images/avant-gremlin.png[width=185] diff --cc hadoop-gremlin/pom.xml index 62129af,4cc1d91..0afb7e7 --- a/hadoop-gremlin/pom.xml +++ b/hadoop-gremlin/pom.xml @@@ -100,9 -100,9 +100,13 @@@ limitations under the License servlet-api +commons-lang +commons-lang + ++ + org.apache.commons + commons-compress +
[tinkerpop] 03/03: Merge branch 'tp34'
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 2c3564e4640bb123b9274b6e3683bea6d444b4d0 Merge: c4247ca 2de0632 Author: Stephen Mallette AuthorDate: Mon Sep 30 06:49:10 2019 -0400 Merge branch 'tp34' CHANGELOG.asciidoc | 5 - gremlin-shaded/pom.xml | 2 +- neo4j-gremlin/pom.xml | 4 ++-- spark-gremlin/pom.xml | 16 +--- 4 files changed, 20 insertions(+), 7 deletions(-) diff --cc neo4j-gremlin/pom.xml index ceecedc,0becdea..9cb372c --- a/neo4j-gremlin/pom.xml +++ b/neo4j-gremlin/pom.xml @@@ -163,15 -151,9 +163,15 @@@ limitations under the License +org.apache.commons +commons-text +1.6 +test + + org.scala-lang scala-library - 2.11.8 + 2.11.12 test
[tinkerpop] 03/03: Merge branch 'tp34'
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 7ab458ccfda971e19b67b673e78154d7695db982 Merge: 67d55c9 ae38621 Author: Stephen Mallette AuthorDate: Mon Sep 30 14:19:30 2019 -0400 Merge branch 'tp34' gremlin-python/glv/GraphTraversalSource.template | 36 ++-- gremlin-python/glv/TraversalSource.template| 36 ++-- .../src/main/jython/gremlin_python/__init__.py | 36 ++-- .../main/jython/gremlin_python/driver/__init__.py | 36 ++-- .../main/jython/gremlin_python/driver/client.py| 36 ++-- .../jython/gremlin_python/driver/connection.py | 34 +-- .../driver/driver_remote_connection.py | 36 ++-- .../main/jython/gremlin_python/driver/protocol.py | 36 ++-- .../gremlin_python/driver/remote_connection.py | 36 ++-- .../main/jython/gremlin_python/driver/request.py | 36 ++-- .../main/jython/gremlin_python/driver/resultset.py | 36 ++-- .../jython/gremlin_python/driver/serializer.py | 39 +++--- .../gremlin_python/driver/tornado/__init__.py | 36 ++-- .../gremlin_python/driver/tornado/transport.py | 36 ++-- .../main/jython/gremlin_python/driver/transport.py | 36 ++-- .../main/jython/gremlin_python/process/__init__.py | 36 ++-- .../gremlin_python/process/anonymous_traversal.py | 36 ++-- .../gremlin_python/process/graph_traversal.py | 36 ++-- .../jython/gremlin_python/process/strategies.py| 36 ++-- .../jython/gremlin_python/process/traversal.py | 36 ++-- .../src/main/jython/gremlin_python/statics.py | 36 ++-- .../jython/gremlin_python/structure/__init__.py| 36 ++-- .../main/jython/gremlin_python/structure/graph.py | 36 ++-- .../jython/gremlin_python/structure/io/__init__.py | 36 ++-- .../gremlin_python/structure/io/graphsonV2d0.py| 36 ++-- .../gremlin_python/structure/io/graphsonV3d0.py| 34 +-- .../src/main/jython/radish/feature_steps.py| 36 ++-- gremlin-python/src/main/jython/radish/terrain.py | 36 ++-- gremlin-python/src/main/jython/runtest.py | 36 ++-- gremlin-python/src/main/jython/setup.py| 4 +-- gremlin-python/src/main/jython/tests/__init__.py | 36 ++-- gremlin-python/src/main/jython/tests/conftest.py | 36 ++-- .../src/main/jython/tests/driver/__init__.py | 36 ++-- .../src/main/jython/tests/driver/test_client.py| 36 ++-- .../tests/driver/test_driver_remote_connection.py | 37 ++-- .../test_driver_remote_connection_threaded.py | 36 ++-- .../main/jython/tests/driver/test_serializer.py| 36 ++-- .../src/main/jython/tests/process/__init__.py | 36 ++-- .../src/main/jython/tests/process/test_dsl.py | 36 ++-- .../main/jython/tests/process/test_strategies.py | 36 ++-- .../main/jython/tests/process/test_traversal.py| 36 ++-- .../src/main/jython/tests/structure/__init__.py| 36 ++-- .../src/main/jython/tests/structure/io/__init__.py | 36 ++-- .../jython/tests/structure/io/test_graphsonV2d0.py | 36 ++-- .../jython/tests/structure/io/test_graphsonV3d0.py | 36 ++-- .../src/main/jython/tests/structure/test_graph.py | 36 ++-- .../src/main/jython/tests/test_statics.py | 36 ++-- 47 files changed, 827 insertions(+), 833 deletions(-)
[tinkerpop] 03/03: Merge branch 'tp34'
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 dffbb74b0834e122516da97b69ff42135d4415ce Merge: 8a7dc91 045f9e0 Author: Stephen Mallette AuthorDate: Thu Oct 3 10:33:53 2019 -0400 Merge branch 'tp34' gremlin-dotnet/glv/Gremlin.Net.csproj.template | 11 ++-- gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj | 11 ++-- .../main/javascript/gremlin-javascript/README.md | 30 +- gremlin-python/src/main/jython/README | 17 +++- 4 files changed, 63 insertions(+), 6 deletions(-)
[tinkerpop] 03/03: Merge branch 'tp34'
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 c9ca1f228064b66b3698218a1371360d41716ec6 Merge: a13fa61 755e2e1 Author: Stephen Mallette AuthorDate: Thu Oct 3 16:53:55 2019 -0400 Merge branch 'tp34' .../java/org/apache/tinkerpop/gremlin/driver/Cluster.java | 9 - gremlin-test/pom.xml| 2 +- pom.xml | 13 + 3 files changed, 14 insertions(+), 10 deletions(-)
[tinkerpop] 03/03: Merge branch 'tp34'
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 3e3748e720eca17191b8f5545975b709ff9b022c Merge: c8b9262 395dd78 Author: Stephen Mallette AuthorDate: Mon Oct 14 07:48:43 2019 -0400 Merge branch 'tp34' CHANGELOG.asciidoc | 23 ++- docs/src/upgrade/release-3.3.x.asciidoc | 2 +- 2 files changed, 23 insertions(+), 2 deletions(-)
[tinkerpop] 03/03: Merge branch 'tp34'
This is an automated email from the ASF dual-hosted git repository. rdale pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tinkerpop.git commit 691cc6566f703f00a34e914973a2ed5fa8d1f856 Merge: 24ee434 725e905 Author: Robert Dale AuthorDate: Sun Oct 20 09:00:35 2019 -0400 Merge branch 'tp34' docs/src/reference/the-traversal.asciidoc | 8 1 file changed, 4 insertions(+), 4 deletions(-)
[tinkerpop] 03/03: Merge branch 'tp34'
This is an automated email from the ASF dual-hosted git repository. rdale pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tinkerpop.git commit d759b2081a3ff6ec152a335ed903478ce8d963ea Merge: 0c673cf bfa2cd8 Author: Robert Dale AuthorDate: Tue Oct 22 23:24:39 2019 -0400 Merge branch 'tp34' gremlin-python/pom.xml| 5 + gremlin-python/src/main/jython/{README => README.rst} | 4 ++-- gremlin-python/src/main/jython/setup.py | 3 ++- 3 files changed, 9 insertions(+), 3 deletions(-)
[tinkerpop] 03/03: Merge branch 'tp34'
This is an automated email from the ASF dual-hosted git repository. rdale pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tinkerpop.git commit 45fa7bc3feee5daa5536ef3d7279f9188f158efd Merge: d759b20 9556968 Author: Robert Dale AuthorDate: Tue Oct 22 23:35:33 2019 -0400 Merge branch 'tp34' gremlin-python/src/main/jython/README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[tinkerpop] 03/03: Merge branch 'tp34'
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 886a1668c5244b21f1ab93fc99a3f917ac9564b9 Merge: 45fa7bc f33d70b Author: stephen AuthorDate: Fri Oct 25 09:30:00 2019 -0400 Merge branch 'tp34' .../tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[tinkerpop] 03/03: Merge branch 'tp34'
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 e53c17f021575bea4b7e3afe78b6bb1ecb87e6f0 Merge: 78665fb 47e25aa Author: stephen AuthorDate: Thu Oct 31 13:36:24 2019 -0400 Merge branch 'tp34' CHANGELOG.asciidoc | 1 + .../tinkerpop/gremlin/process/traversal/TraversalStrategies.java| 3 +++ .../gremlin/process/traversal/util/DefaultTraversalStrategies.java | 6 +- 3 files changed, 9 insertions(+), 1 deletion(-)
[tinkerpop] 03/03: Merge branch 'tp34'
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 ef9dff9e235639e79bdee1b1d688ad8a5af4ccd4 Merge: f4de1d5 20a5093 Author: stephen AuthorDate: Wed Nov 13 19:00:00 2019 -0500 Merge branch 'tp34' gremlin-shaded/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[tinkerpop] 03/03: Merge branch 'tp34'
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 ea17408d106cccb498b00e8e1a438ee10d6e7952 Merge: 84e3a46 c8f8039 Author: Daniel Kuppitz AuthorDate: Thu Dec 5 12:56:11 2019 -0700 Merge branch 'tp34' docker/scripts/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
[tinkerpop] 03/03: Merge branch 'tp34'
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 80aceda24671e35dc97e1f1ade535d86846982e6 Merge: 2155e9c 272e0b1 Author: stephen AuthorDate: Fri Dec 13 21:21:42 2019 -0500 Merge branch 'tp34' CHANGELOG.asciidoc | 1 + .../apache/tinkerpop/gremlin/driver/Cluster.java | 18 +--- .../gremlin/server/GremlinDriverIntegrateTest.java | 6 .../gremlin/server/TestClientFactory.java | 1 + .../src/test/resources/conf/remote-objects.yaml| 32 ++ 5 files changed, 54 insertions(+), 4 deletions(-)
[tinkerpop] 03/03: Merge branch 'tp34'
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 a1299003945e410ef8884d5acee481a95c210278 Merge: 80aceda 21d878e Author: stephen AuthorDate: Fri Dec 13 21:49:57 2019 -0500 Merge branch 'tp34' CHANGELOG.asciidoc | 1 + .../apache/tinkerpop/gremlin/driver/Client.java| 2 ++ .../gremlin/server/GremlinDriverIntegrateTest.java | 27 ++ 3 files changed, 30 insertions(+) diff --cc gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Client.java index 12fd0ac,9cbc337..51b8ed6 --- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Client.java +++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Client.java @@@ -564,7 -564,9 +564,9 @@@ public abstract class Client // apply settings if they were made available options.getBatchSize().ifPresent(batchSize -> request.add(Tokens.ARGS_BATCH_SIZE, batchSize)); -options.getTimeout().ifPresent(timeout -> request.add(Tokens.ARGS_SCRIPT_EVAL_TIMEOUT, timeout)); +options.getTimeout().ifPresent(timeout -> request.add(Tokens.ARGS_EVAL_TIMEOUT, timeout)); + options.getOverrideRequestId().ifPresent(request::overrideRequestId); + options.getUserAgent().ifPresent(userAgent -> request.add(Tokens.ARGS_USER_AGENT, userAgent)); return submitAsync(request.create()); } catch (Exception ex) {
[tinkerpop] 03/03: Merge branch 'tp34'
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 33c67acf0727d9a04b8c47bd3b8d6e69b8253361 Merge: 0b24589 2d511a0 Author: stephen AuthorDate: Thu Jan 2 12:09:04 2020 -0500 Merge branch 'tp34' CHANGELOG.asciidoc| 1 + .../java/org/apache/tinkerpop/gremlin/driver/Connection.java | 11 +-- 2 files changed, 10 insertions(+), 2 deletions(-)
[tinkerpop] 03/03: Merge branch 'tp34'
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 2e5d31bf76fe8e35337a7134aab8ca5bcbe6de34 Merge: 33c67ac b1d0ab3 Author: stephen AuthorDate: Thu Jan 2 12:35:26 2020 -0500 Merge branch 'tp34' CHANGELOG.asciidoc | 1 + docs/src/upgrade/release-3.3.x.asciidoc| 30 ++ gremlin-dotnet/glv/GraphTraversal.template | 8 ++ .../Process/Traversal/GraphTraversal.cs| 8 ++ .../DriverRemoteConnection/GraphTraversalTests.cs | 13 ++ .../glv/GraphTraversalSource.template | 8 ++ .../lib/process/graph-traversal.js | 8 ++ .../test/integration/traversal-test.js | 14 ++ gremlin-python/glv/GraphTraversalSource.template | 3 +++ .../gremlin_python/process/graph_traversal.py | 3 +++ .../tests/driver/test_driver_remote_connection.py | 7 + 11 files changed, 103 insertions(+) diff --cc gremlin-python/src/main/python/tests/driver/test_driver_remote_connection.py index 41fc3d1,000..48d1224 mode 100644,00..100644 --- a/gremlin-python/src/main/python/tests/driver/test_driver_remote_connection.py +++ b/gremlin-python/src/main/python/tests/driver/test_driver_remote_connection.py @@@ -1,190 -1,0 +1,197 @@@ +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +import pytest + +from tornado import ioloop, gen + +from gremlin_python import statics +from gremlin_python.driver.protocol import GremlinServerError +from gremlin_python.statics import long +from gremlin_python.driver.driver_remote_connection import ( +DriverRemoteConnection) +from gremlin_python.process.traversal import Traverser +from gremlin_python.process.traversal import TraversalStrategy +from gremlin_python.process.traversal import P +from gremlin_python.process.graph_traversal import __ +from gremlin_python.process.anonymous_traversal import traversal +from gremlin_python.structure.graph import Vertex +from gremlin_python.process.strategies import SubgraphStrategy, ReservedKeysVerificationStrategy + +__author__ = 'Marko A. Rodriguez (http://markorodriguez.com)' + + +class TestDriverRemoteConnection(object): +def test_traversals(self, remote_connection): +statics.load_statics(globals()) +g = traversal().withRemote(remote_connection) + +assert long(6) == g.V().count().toList()[0] +# # +assert Vertex(1) == g.V(1).next() +assert 1 == g.V(1).id().next() +assert Traverser(Vertex(1)) == g.V(1).nextTraverser() +assert 1 == len(g.V(1).toList()) +assert isinstance(g.V(1).toList(), list) +results = g.V().repeat(out()).times(2).name +results = results.toList() +assert 2 == len(results) +assert "lop" in results +assert "ripple" in results +# # +assert 10 == g.V().repeat(both()).times(5)[0:10].count().next() +assert 1 == g.V().repeat(both()).times(5)[0:1].count().next() +assert 0 == g.V().repeat(both()).times(5)[0:0].count().next() +assert 4 == g.V()[2:].count().next() +assert 2 == g.V()[:2].count().next() +# # +results = g.withSideEffect('a', ['josh', 'peter']).V(1).out('created').in_('created').values('name').where(P.within('a')).toList() +assert 2 == len(results) +assert 'josh' in results +assert 'peter' in results +# # +results = g.V().out().profile().toList() +assert 1 == len(results) +assert 'metrics' in results[0] +assert 'dur' in results[0] +# # +results = g.V().has('name', 'peter').as_('a').out('created').as_('b').select('a', 'b').by( +__.valueMap()).toList() +assert 1 == len(results) +assert 'peter' == results[0]['a']['name'][0] +assert 35 == results[0]['a']['age'][0] +assert 'lop' == results[0]['b']['name'][0] +assert 'java' == results[0]['b']['lang'][0] +assert 2 == len(results[0]['a']) +assert 2 ==
[tinkerpop] 03/03: Merge branch 'tp34'
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 0b9eb170c93dd114f012cb63bfbd1c5a240e58f4 Merge: fbcc93e 794b312 Author: stephen AuthorDate: Thu Jan 2 12:44:33 2020 -0500 Merge branch 'tp34' CHANGELOG.asciidoc| 1 + .../gremlin/structure/io/graphml/GraphMLReader.java | 15 ++- 2 files changed, 15 insertions(+), 1 deletion(-)