[tinkerpop] 01/01: 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 fbcc93e8c70a07b905f2784e811ab0aaecde1f4f Merge: 2e5d31b b47aa38 Author: stephen AuthorDate: Thu Jan 2 12:38:48 2020 -0500 Merge branch 'tp34' CHANGELOG.asciidoc| 1 + .../apache/tinkerpop/gremlin/server/op/AbstractOpProcessor.java | 8 +++- .../gremlin/server/op/traversal/TraversalOpProcessor.java | 8 +++- 3 files changed, 15 insertions(+), 2 deletions(-)
[tinkerpop] 01/01: 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 d8921d0b2c4524035505299b16c2d67bd613672d Merge: bbdd44f 4537b47 Author: stephen AuthorDate: Thu Dec 19 13:05:52 2019 -0500 Merge branch 'tp34' CHANGELOG.asciidoc | 1 + .../tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngine.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)
[tinkerpop] 01/01: 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 d86a7ab2cfe2de28ff09a58f68316444974d0157 Merge: 4c1b690 5c50b4c Author: stephen AuthorDate: Wed Dec 18 08:48:11 2019 -0500 Merge branch 'tp34' docs/src/reference/gremlin-applications.asciidoc | 55 1 file changed, 55 insertions(+)
[tinkerpop] 01/01: 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 5dfb28a021b9ce0e3cd7d3d0a0eb380864b16ec6 Merge: 454f11c e02a551 Author: stephen AuthorDate: Wed Dec 18 06:40:25 2019 -0500 Merge branch 'tp34' CHANGELOG.asciidoc| 1 + docs/src/reference/gremlin-applications.asciidoc | 2 +- .../main/java/org/apache/tinkerpop/gremlin/driver/Channelizer.java| 4 .../tinkerpop/gremlin/driver/handler/NioGremlinRequestEncoder.java| 3 +++ .../tinkerpop/gremlin/driver/handler/NioGremlinResponseDecoder.java | 3 +++ .../java/org/apache/tinkerpop/gremlin/driver/simple/NioClient.java| 2 ++ .../main/java/org/apache/tinkerpop/gremlin/server/Channelizer.java| 2 +- .../org/apache/tinkerpop/gremlin/server/channel/NioChannelizer.java | 3 +++ .../gremlin/server/handler/NioGremlinBinaryRequestDecoder.java| 4 .../gremlin/server/handler/NioGremlinResponseFrameEncoder.java| 3 +++ 10 files changed, 25 insertions(+), 2 deletions(-) diff --cc gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/NioGremlinRequestEncoder.java index b76b96b,1330a7e..be99226 --- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/NioGremlinRequestEncoder.java +++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/NioGremlinRequestEncoder.java @@@ -27,12 -27,18 +27,15 @@@ import io.netty.buffer.ByteBuf import io.netty.channel.ChannelHandlerContext; import io.netty.handler.codec.MessageToByteEncoder; import io.netty.util.CharsetUtil; + import org.apache.tinkerpop.gremlin.driver.simple.WebSocketClient; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * @author Stephen Mallette (http://stephen.genoprime.com) + * @deprecated As of release 3.3.10, not replaced, use {@link WebSocketClient}. */ + @Deprecated public final class NioGremlinRequestEncoder extends MessageToByteEncoder { -private boolean binaryEncoding = false; +private boolean binaryEncoding; private final MessageSerializer serializer;
[tinkerpop] 01/01: 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 454f11ceac19c47c29aa0653ea13928f8a778a0c Merge: a129900 ce3c798 Author: stephen AuthorDate: Mon Dec 16 10:32:52 2019 -0500 Merge branch 'tp34' CHANGELOG.asciidoc | 1 + .../src/main/java/org/apache/tinkerpop/gremlin/driver/Cluster.java | 7 +++ .../org/apache/tinkerpop/gremlin/driver/ClusterBuilderTest.java| 3 ++- 3 files changed, 10 insertions(+), 1 deletion(-)
[tinkerpop] 01/01: 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 fcf340d60ec274f7a30d4553039273338d9671de Merge: 06180aa 4ede832 Author: stephen AuthorDate: Tue Dec 10 08:17:22 2019 -0500 Merge branch 'tp34' gremlin-python/src/main/jython/setup.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
[tinkerpop] 01/01: 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 06180aacee420e15bbad762f69e4611db93a532f Merge: ea17408 61e4585 Author: stephen AuthorDate: Mon Dec 9 15:13:32 2019 -0500 Merge branch 'tp34' CHANGELOG.asciidoc | 4 +- docs/src/upgrade/release-3.4.x.asciidoc| 162 + .../process/traversal/step/util/HasContainer.java | 50 --- .../gremlin/structure/util/ElementHelper.java | 12 +- .../gremlin/structure/util/ElementHelperTest.java | 12 +- gremlin-test/features/filter/Has.feature | 54 +-- .../process/traversal/step/filter/HasTest.java | 30 .../util/detached/DetachedPropertyTest.java| 14 +- 8 files changed, 282 insertions(+), 56 deletions(-)
[tinkerpop] 01/01: 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 84e3a4671dd0a216c101d8297cbbd49d0acea04c Merge: 05ebdc8 c660d1c Author: stephen AuthorDate: Thu Dec 5 07:01:15 2019 -0500 Merge branch 'tp34' CHANGELOG.asciidoc | 1 + docs/src/reference/gremlin-variants.asciidoc| 3 +++ docs/src/upgrade/release-3.3.x.asciidoc | 17 + .../python/jsr223/GremlinJythonScriptEngine.java| 3 +++ .../python/jsr223/GremlinJythonScriptEngineFactory.java | 3 +++ .../gremlin/python/jsr223/JythonTranslator.java | 3 +++ .../gremlin/python/jsr223/PythonTranslator.java | 3 +++ .../tinkerpop/gremlin/python/jsr223/SymbolHelper.java | 3 +++ 8 files changed, 36 insertions(+)
[tinkerpop] 01/01: 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 7e961335d91ea18d0f307f10f119491d53d71ce4 Merge: 057cd3b 6610e7b Author: stephen AuthorDate: Tue Dec 3 11:33:38 2019 -0500 Merge branch 'tp34' docker/Dockerfile | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-)
[tinkerpop] 01/01: 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 057cd3b61b1ca6e2026fd4320ae548210a6c187e Merge: 91a25a7 035afd1 Author: stephen AuthorDate: Tue Nov 26 06:58:56 2019 -0500 Merge branch 'tp34' CHANGELOG.asciidoc | 2 + docs/src/recipes/appendix.asciidoc | 10 +-- docs/src/recipes/centrality.asciidoc | 2 +- docs/src/recipes/duplicate-edge.asciidoc | 2 +- docs/src/upgrade/release-3.4.x.asciidoc| 66 ++ .../traversal/lambda/ElementValueTraversal.java| 24 ++- .../lambda/ElementValueTraversalTest.java | 78 ++ gremlin-test/features/map/Project.feature | 18 - .../process/traversal/step/map/ProjectTest.java| 22 ++ 9 files changed, 215 insertions(+), 9 deletions(-)
[tinkerpop] 01/01: 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 91a25a7c9db0379a855a276d770c8bbb69cd22da Merge: be4defb adebb32 Author: stephen AuthorDate: Mon Nov 25 16:11:14 2019 -0500 Merge branch 'tp34' .travis.yml| 10 +- .../gremlin-server-integration-secure.yaml | 1 + .../gremlin-server/gremlin-server-integration.yaml | 1 + .../tinkerpop/gremlin/driver/Connection.java | 2 +- .../gremlin/server/op/session/Session.java | 8 +- .../server/op/session/SessionOpProcessor.java | 1 - .../gremlin/server/GremlinServerIntegrateTest.java | 246 ++- .../server/GremlinServerSessionIntegrateTest.java | 46 ++-- .../server/GremlinServerSslIntegrateTest.java | 266 + .../gremlin/server/gremlin-server-integration.yaml | 1 + 10 files changed, 325 insertions(+), 257 deletions(-) diff --cc gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java index 9a97064,5448a26..cf511e0 --- 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 @@@ -18,14 -18,8 +18,8 @@@ */ package org.apache.tinkerpop.gremlin.server; - import io.netty.handler.ssl.ClientAuth; - import io.netty.handler.ssl.SslContext; - import io.netty.handler.ssl.SslContextBuilder; - import io.netty.handler.ssl.SslProvider; - import io.netty.handler.ssl.util.InsecureTrustManagerFactory; - import io.netty.handler.ssl.util.SelfSignedCertificate; -import org.apache.commons.configuration.BaseConfiguration; -import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration2.BaseConfiguration; +import org.apache.commons.configuration2.Configuration; import org.apache.commons.lang3.exception.ExceptionUtils; import org.apache.log4j.Level; import org.apache.log4j.Logger; diff --cc gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerSslIntegrateTest.java index 000,7a3d499..772dc33 mode 00,100644..100644 --- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerSslIntegrateTest.java +++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerSslIntegrateTest.java @@@ -1,0 -1,340 +1,266 @@@ + /* + * 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. + */ + package org.apache.tinkerpop.gremlin.server; + + import io.netty.handler.ssl.ClientAuth; + import io.netty.handler.ssl.SslContext; + import io.netty.handler.ssl.SslContextBuilder; + import io.netty.handler.ssl.SslProvider; + import io.netty.handler.ssl.util.InsecureTrustManagerFactory; + import io.netty.handler.ssl.util.SelfSignedCertificate; + import org.apache.commons.lang3.exception.ExceptionUtils; + import org.apache.tinkerpop.gremlin.driver.Client; + import org.apache.tinkerpop.gremlin.driver.Cluster; + import org.junit.Test; + + import java.util.Arrays; + import java.util.Collections; + import java.util.concurrent.TimeoutException; + + import static org.hamcrest.MatcherAssert.assertThat; + import static org.hamcrest.core.IsInstanceOf.instanceOf; + import static org.junit.Assert.assertEquals; + import static org.junit.Assert.fail; + + public class GremlinServerSslIntegrateTest extends AbstractGremlinServerIntegrationTest { -private static final String PEM_SERVER_KEY = "src/test/resources/server.key.pk8"; -private static final String PEM_SERVER_CRT = "src/test/resources/server.crt"; -private static final String PEM_CLIENT_KEY = "src/test/resources/client.key.pk8"; -private static final String PEM_CLIENT_CRT = "src/test/resources/client.crt"; + + /** + * Configure specific Gremlin Server settings for specific tests. + */ + @Override + public Settings overrideSettings(final Settings settings) { + final String nameOfTest = name.getMethodName(); + switch (nameOfTest) { + case "shouldEnableSsl": +
[tinkerpop] 01/01: 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 View the commit online: https://github.com/apache/tinkerpop/commit/be4defb541e9ce99712a53200dbe7794c63f06a3 commit be4defb541e9ce99712a53200dbe7794c63f06a3 Merge: 82dd208 75e3acc Author: stephen AuthorDate: Wed Nov 20 14:30:02 2019 -0500 Merge branch 'tp34' .../GephiTraversalVisualizationStrategy.groovy | 2 +- .../gremlin/process/computer/ComputerResult.java | 5 ++- .../gremlin/process/computer/GraphComputer.java| 49 -- .../gremlin/process/computer/MapReduce.java| 13 +++--- .../gremlin/process/computer/VertexProgram.java| 6 +-- .../computer/traversal/step/VertexComputing.java | 5 ++- .../computer/util/DefaultComputerResult.java | 6 ++- .../remote/traversal/AbstractRemoteTraversal.java | 4 +- .../process/remote/traversal/RemoteTraversal.java | 2 +- .../gremlin/process/traversal/Bindings.java| 5 +-- .../gremlin/process/traversal/Compare.java | 2 +- .../tinkerpop/gremlin/process/traversal/Step.java | 9 ++-- .../gremlin/process/traversal/Traversal.java | 17 .../process/traversal/TraversalSideEffects.java| 10 +++-- .../gremlin/process/traversal/TraversalSource.java | 24 +-- .../traversal/dsl/graph/GraphTraversal.java| 8 ++-- .../gremlin/process/traversal/step/Barrier.java| 10 +++-- .../gremlin/process/traversal/step/Bypassing.java | 4 +- .../process/traversal/step/FromToModulating.java | 5 ++- .../process/traversal/step/GraphComputing.java | 8 ++-- .../process/traversal/step/LambdaHolder.java | 7 +++- .../process/traversal/step/MemoryComputing.java| 4 +- .../process/traversal/step/map/GroupStep.java | 4 +- .../process/traversal/step/util/WithOptions.java | 18 .../step/util/event/MutationListener.java | 8 ++-- .../strategy/decoration/EventStrategy.java | 2 +- .../traversal/util/FastNoSuchElementException.java | 4 +- .../process/traversal/util/TraversalMatrix.java| 4 +- .../apache/tinkerpop/gremlin/structure/Column.java | 3 +- .../apache/tinkerpop/gremlin/structure/Graph.java | 19 - .../tinkerpop/gremlin/structure/Property.java | 2 +- .../gremlin/structure/VertexProperty.java | 2 +- .../gremlin/structure/io/GraphMigrator.java| 2 +- .../tinkerpop/gremlin/structure/io/IoCore.java | 6 +-- .../structure/io/graphml/GraphMLWriter.java| 2 +- .../structure/io/graphson/GraphSONReader.java | 5 ++- .../io/gryo/VertexByteArrayInputStream.java| 4 +- .../structure/io/gryo/kryoshim/InputShim.java | 5 ++- .../structure/io/gryo/kryoshim/KryoShim.java | 5 ++- .../structure/io/gryo/kryoshim/OutputShim.java | 5 ++- .../structure/io/gryo/kryoshim/SerializerShim.java | 5 ++- .../gremlin/structure/util/ElementHelper.java | 38 - .../gremlin/structure/util/GraphFactory.java | 15 --- .../gremlin/structure/util/StringFactory.java | 8 ++-- .../util/star/StarGraphGraphSONDeserializer.java | 8 ++-- .../gremlin/util/function/TriConsumer.java | 2 +- .../apache/tinkerpop/gremlin/driver/Client.java| 6 +-- .../driver/ser/AbstractMessageSerializer.java | 7 ++-- .../ser/GraphSONMessageSerializerGremlinV2d0.java | 3 +- .../driver/ser/GraphSONMessageSerializerV3d0.java | 3 +- .../gremlin/groovy/engine/GremlinExecutor.java | 13 +++--- .../gremlin/server/AbstractChannelizer.java| 6 ++- .../apache/tinkerpop/gremlin/server/Context.java | 3 +- .../tinkerpop/gremlin/server/GremlinServer.java| 2 +- .../gremlin/server/channel/NioChannelizer.java | 4 +- .../server/channel/WebSocketChannelizer.java | 4 +- .../gremlin/server/op/AbstractEvalOpProcessor.java | 3 +- .../server/op/session/SessionOpProcessor.java | 6 +-- .../server/op/standard/StandardOpProcessor.java| 2 +- .../tinkerpop/gremlin/AbstractGraphProvider.java | 2 +- .../tinkerpop/gremlin/AbstractGremlinSuite.java| 13 +++--- .../tinkerpop/gremlin/FeatureRequirementSet.java | 3 +- .../org/apache/tinkerpop/gremlin/GraphHelper.java | 2 +- .../apache/tinkerpop/gremlin/GraphProvider.java| 9 ++-- .../apache/tinkerpop/gremlin/LoadGraphWith.java| 3 +- .../algorithm/generator/AbstractGenerator.java | 6 +-- .../gremlin/structure/FeatureSupportTest.java | 22 +- .../gremlin/structure/GraphConstructionTest.java | 6 +-- .../tinkerpop/gremlin/structure/GraphTest.java | 2 +- .../tinkerpop/gremlin/structure/PropertyTest.java | 12 +++--- .../tinkerpop/gremlin/structure/VariablesTest.java | 19 - .../gremlin/process/GraphMutateBenchmark.java | 5 ++- .../gremlin/process/GraphTraversalBenchmark.java | 4 +-
[tinkerpop] 01/01: 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 19763a2a142734a9fc032b3c2c2bd569d6779760 Merge: 8852f4d 8367eef Author: stephen AuthorDate: Mon Nov 11 13:40:24 2019 -0500 Merge branch 'tp34' docs/src/recipes/anti-patterns.asciidoc| 19 --- docs/src/recipes/appendix.asciidoc | 14 +-- docs/src/recipes/collections.asciidoc | 10 ++-- docs/src/recipes/duplicate-edge.asciidoc | 4 ++-- docs/src/recipes/edge-move.asciidoc| 4 ++-- docs/src/recipes/traversal-induced-values.asciidoc | 8 +++ docs/src/reference/gremlin-applications.asciidoc | 8 +++ docs/src/reference/gremlin-variants.asciidoc | 10 docs/src/reference/the-graphcomputer.asciidoc | 14 +-- docs/src/reference/the-traversal.asciidoc | 28 -- 10 files changed, 64 insertions(+), 55 deletions(-) diff --cc docs/src/reference/the-graphcomputer.asciidoc index 894e1ff,f8c2452..5249b38 --- a/docs/src/reference/the-graphcomputer.asciidoc +++ b/docs/src/reference/the-graphcomputer.asciidoc @@@ -376,13 -376,8 +376,13 @@@ Note that `GraphTraversal` provides a < [gremlin-groovy,modern] g = graph.traversal().withComputer() - g.V().pageRank().valueMap() + g.V().pageRank().elementMap() -g.V().pageRank().by('pageRank').times(5).order().by('pageRank').elementMap() +g.V().pageRank(). +with(PageRank.propertyName, 'pageRank'). +with(PageRank.times, 5). + order(). +by('pageRank'). - valueMap() ++ elementMap() [[peerpressurevertexprogram]] @@@ -404,11 -399,8 +404,11 @@@ Note that `GraphTraversal` provides a < [gremlin-groovy,modern] g = graph.traversal().withComputer() - g.V().peerPressure().with(PeerPressure.propertyName, 'cluster').valueMap() -g.V().peerPressure().by('cluster').elementMap() -g.V().peerPressure().by(outE('knows')).by('cluster').elementMap() ++g.V().peerPressure().with(PeerPressure.propertyName, 'cluster').elementMap() +g.V().peerPressure(). +with(PeerPressure.edges,outE('knows')). +with(PeerPressure.propertyName, 'cluster'). - valueMap() ++ elementMap() [[connectedcomponentvertexprogram]]
[tinkerpop] 01/01: 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 8852f4dad4adbb9aa9b76aad10adecffba00f190 Merge: d717990 00c15c0 Author: stephen AuthorDate: Sat Nov 9 07:04:57 2019 -0500 Merge branch 'tp34' .../gremlin/driver/ser/binary/GraphBinaryReaderWriterRoundTripTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[tinkerpop] 01/01: 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 d717990d24998c18d178dbab4baac01c6b0fe89e Merge: b779cdf ce2f3b6 Author: stephen AuthorDate: Fri Nov 8 21:33:07 2019 -0500 Merge branch 'tp34' gremlin-console/src/main/static/NOTICE | 2 +- gremlin-server/src/main/static/NOTICE | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
[tinkerpop] 01/01: 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 b779cdf6fb864bcb8ee1f8d6cd5f453b115f8720 Merge: a2dfcd0 b2eefb0 Author: stephen AuthorDate: Fri Nov 8 16:10:09 2019 -0500 Merge branch 'tp34' .../util/{CoreTestHelper.java => TestSupport.java} | 15 +-- .../jsr223/DefaultScriptCustomizerTest.java| 6 +++--- .../jsr223/ScriptFileGremlinPluginTest.java| 8 +++- .../StandardVerificationStrategyTest.java | 5 ++--- .../gremlin/structure/util/GraphFactoryTest.java | 16 .../org/apache/tinkerpop/gremlin/TestHelper.java | 22 +++--- 6 files changed, 28 insertions(+), 44 deletions(-)
[tinkerpop] 01/01: 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 a2dfcd0f8174ce59d617efd47b8b596797bcd2b8 Merge: 4240b35 ef941e3 Author: stephen AuthorDate: Fri Nov 8 07:23:36 2019 -0500 Merge branch 'tp34' docs/preprocessor/install-plugins.groovy | 2 +- gremlin-archetype/pom.xml | 1 + .../tinkerpop/gremlin/console/ConsoleFs.groovy | 8 +- .../console/commands/UninstallCommand.groovy | 12 +- .../jsr223/DriverRemoteAcceptorIntegrateTest.java | 25 +-- .../console/jsr223/DriverRemoteAcceptorTest.java | 4 +- gremlin-core/pom.xml | 6 + .../tinkerpop/gremlin/structure/io/Storage.java| 101 +-- .../tinkerpop/gremlin/util/CoreTestHelper.java | 188 + .../SerializerTest.java => AssertHelper.java} | 27 +-- .../org/apache/tinkerpop/gremlin/TestHelper.java | 147 .../jsr223/DefaultScriptCustomizerTest.java| 6 +- .../gremlin/jsr223/ScriptEngineCacheTest.java | 8 +- .../jsr223/ScriptFileGremlinPluginTest.java| 11 +- .../gremlin/process/traversal/OrderTest.java | 3 +- .../optimization/EarlyLimitStrategyTest.java | 4 +- .../optimization/OrderLimitStrategyTest.java | 2 +- .../StandardVerificationStrategyTest.java | 6 +- .../gremlin/structure/io/GraphMigratorTest.java| 4 +- .../tinkerpop/gremlin/structure/io/IoCoreTest.java | 4 +- .../structure/io/graphson/GraphSONTokensTest.java | 4 +- .../structure/io/graphson/GraphSONUtilTest.java| 4 +- .../gremlin/structure/util/ComparatorsTest.java| 4 +- .../gremlin/structure/util/ElementHelperTest.java | 4 +- .../gremlin/structure/util/GraphFactoryTest.java | 32 ++-- .../structure/util/GraphVariableHelperTest.java| 4 +- .../gremlin/structure/util/StringFactoryTest.java | 4 +- .../apache/tinkerpop/gremlin/util/GremlinTest.java | 4 +- .../tinkerpop/gremlin/util/SerializerTest.java | 4 +- .../tinkerpop/gremlin/util/TimeUtilTest.java | 4 +- .../gremlin/util/function/FunctionUtilsTest.java | 5 +- .../gremlin/util/iterator/IteratorUtilsTest.java | 4 +- .../tinkerpop/gremlin/util/tools/MultiMapTest.java | 5 +- .../gremlin/groovy/util/DependencyGrabber.groovy | 74 .../gremlin/groovy/engine/GremlinExecutorTest.java | 4 +- .../GremlinGroovyScriptEngineFileSandboxTest.java | 5 +- .../util/DependencyGrabberIntegrateTest.java | 76 + .../gremlin/util/TinkerGraphProvider.java | 4 +- .../gremlin/server/util/GremlinServerInstall.java | 7 +- .../gremlin/server/GremlinDriverIntegrateTest.java | 6 +- .../tinkerpop/gremlin/server/ServerTestHelper.java | 57 +-- .../gremlin/util/Log4jRecordingAppender.java | 17 +- .../gremlin/AbstractFileGraphProvider.java | 12 +- .../apache/tinkerpop/gremlin/GraphProvider.java| 3 +- .../org/apache/tinkerpop/gremlin/TestHelper.java | 142 ++-- .../gremlin/jsr223/BindingsScriptEngineTest.java | 3 +- .../gremlin/structure/io/IoGraphTest.java | 8 +- .../tinkerpop/gremlin/structure/io/IoTest.java | 31 ++-- hadoop-gremlin/README.md | 52 ++ hadoop-gremlin/pom.xml | 29 .../apache/tinkerpop/gremlin/hadoop/Constants.java | 22 +++ .../computer/AbstractHadoopGraphComputer.java | 12 +- .../hadoop/structure/io/FileSystemStorage.java | 101 ++- .../hadoop/structure/io/InputOutputHelper.java | 2 +- .../computer/AbstractHadoopGraphComputerTest.java | 59 --- .../structure/io/RecordReaderWriterTest.java | 5 +- pom.xml| 18 +- .../tinkerpop/gremlin/spark/structure/Spark.java | 7 +- .../spark/structure/io/SparkContextStorage.java| 107 +--- .../structure/io/AbstractIoRegistryCheck.java | 7 +- .../hadoop/structure/io/AbstractStorageCheck.java | 48 +++--- .../structure/io/FileSystemStorageCheck.java | 24 ++- .../spark/process/computer/LocalPropertyTest.java | 2 +- .../SparkHadoopGraphGryoSerializerProvider.java| 1 + .../gremlin/spark/structure/SparkTest.java | 3 +- .../structure/io/SparkContextStorageCheck.java | 26 +-- .../io/gryo/GryoSerializerIntegrateTest.java | 4 +- .../gremlin/tinkergraph/TinkerGraphProvider.java | 4 +- .../tinkergraph/TinkerGraphUUIDProvider.java | 4 +- .../structure/IoDataGenerationTest.java| 127 +++--- .../tinkergraph/structure/TinkerGraphTest.java | 13 +- 71 files changed, 1036 insertions(+), 741 deletions(-) diff --cc gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/util/GraphFactoryTest.java index c146f72,514b28c..5fc6951 ---
[tinkerpop] 01/01: 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 4240b353f0cfc0fc9c8ad2d8803319d5ca6830ee Merge: 96f5609 c8d63b4 Author: stephen AuthorDate: Fri Nov 8 06:29:32 2019 -0500 Merge branch 'tp34' CHANGELOG.asciidoc | 7 +-- 1 file changed, 1 insertion(+), 6 deletions(-)
[tinkerpop] 01/01: 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 96f5609637018dfc13ff19efa78c397e4b757152 Merge: d0838e2 b5b3bd7 Author: stephen AuthorDate: Thu Nov 7 07:31:31 2019 -0500 Merge branch 'tp34' .travis.yml | 15 --- CHANGELOG.asciidoc| 1 + gremlin-python/src/main/jython/setup.py | 2 +- .../jython/tests/driver/test_driver_remote_connection.py | 14 -- 4 files changed, 10 insertions(+), 22 deletions(-) diff --cc gremlin-python/src/main/jython/tests/driver/test_driver_remote_connection.py index db4398f,dbb0046..1865e9f --- 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 @@@ -188,17 -188,113 +188,3 @@@ class TestDriverRemoteConnection(object assert False except GremlinServerError as gse: assert gse.status_code == 500 -- -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"] -- - def test_in_tornado_app(): - # Make sure nothing weird with loops - @gen.coroutine - def go(): - conn = DriverRemoteConnection('ws://localhost:45940/gremlin', 'gmodern', pool_size=4) - g = traversal().withRemote(conn) - yield gen.sleep(0) - assert len(g.V().toList()) == 6 - conn.close() -# check status attributes -assert "host" in t.side_effects.status_attributes -- - io_loop = ioloop.IOLoop.current() - io_loop.run_sync(go) -## -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' -
[tinkerpop] 01/01: Merge branch 'tp34'
This is an automated email from the ASF dual-hosted git repository. jorgebg pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tinkerpop.git commit d0838e2cc468e7f4f5c27216692349fad37cbf85 Merge: 172b77b 2b9f40e Author: Jorge Bay Gondra AuthorDate: Thu Nov 7 10:18:13 2019 +0100 Merge branch 'tp34' CHANGELOG.asciidoc | 6 + docs/src/upgrade/release-3.4.x.asciidoc| 25 ++ .../tinkerpop/gremlin/structure/io/Buffer.java | 250 + .../gremlin/structure/io/BufferFactory.java| 21 +- .../gremlin/structure/io}/binary/DataType.java | 5 +- .../structure/io}/binary/GraphBinaryIo.java| 5 +- .../structure/io}/binary/GraphBinaryReader.java| 15 +- .../structure/io}/binary/GraphBinaryWriter.java| 30 +- .../structure/io}/binary/TypeSerializer.java | 16 +- .../io}/binary/TypeSerializerRegistry.java | 18 +- .../io}/binary/types/BigDecimalSerializer.java | 16 +- .../io}/binary/types/BigIntegerSerializer.java | 16 +- .../io}/binary/types/BindingSerializer.java| 17 +- .../io}/binary/types/BulkSetSerializer.java| 19 +- .../io}/binary/types/ByteBufferSerializer.java | 16 +- .../io}/binary/types/ByteCodeSerializer.java | 24 +- .../structure/io}/binary/types/CharSerializer.java | 17 +- .../io}/binary/types/ClassSerializer.java | 17 +- .../io}/binary/types/CollectionSerializer.java | 16 +- .../io}/binary/types/CustomTypeSerializer.java | 4 +- .../structure/io}/binary/types/DateSerializer.java | 14 +- .../io}/binary/types/DurationSerializer.java | 16 +- .../structure/io}/binary/types/EdgeSerializer.java | 17 +- .../structure/io}/binary/types/EnumSerializer.java | 16 +- .../io}/binary/types/GraphSerializer.java | 24 +- .../io}/binary/types/InetAddressSerializer.java| 18 +- .../io}/binary/types/InstantSerializer.java| 16 +- .../io}/binary/types/LambdaSerializer.java | 17 +- .../structure/io}/binary/types/ListSerializer.java | 16 +- .../io}/binary/types/LocalDateSerializer.java | 16 +- .../io}/binary/types/LocalDateTimeSerializer.java | 16 +- .../io}/binary/types/LocalTimeSerializer.java | 16 +- .../io}/binary/types/MapEntrySerializer.java | 18 +- .../structure/io}/binary/types/MapSerializer.java | 16 +- .../io}/binary/types/MetricsSerializer.java| 16 +- .../io}/binary/types/MonthDaySerializer.java | 16 +- .../io}/binary/types/OffsetDateTimeSerializer.java | 16 +- .../io}/binary/types/OffsetTimeSerializer.java | 16 +- .../structure/io}/binary/types/PSerializer.java| 24 +- .../structure/io}/binary/types/PathSerializer.java | 16 +- .../io}/binary/types/PeriodSerializer.java | 16 +- .../io}/binary/types/PropertySerializer.java | 17 +- .../structure/io}/binary/types/SetSerializer.java | 16 +- .../io}/binary/types/SimpleTypeSerializer.java | 33 +- .../io}/binary/types/SingleTypeSerializer.java | 36 +- .../io}/binary/types/StringSerializer.java | 14 +- .../io}/binary/types/TransformSerializer.java | 4 +- .../types/TraversalExplanationSerializer.java | 18 +- .../binary/types/TraversalMetricsSerializer.java | 16 +- .../binary/types/TraversalStrategySerializer.java | 16 +- .../io}/binary/types/TraverserSerializer.java | 17 +- .../structure/io}/binary/types/TreeSerializer.java | 17 +- .../structure/io}/binary/types/UUIDSerializer.java | 14 +- .../io}/binary/types/VertexPropertySerializer.java | 17 +- .../io}/binary/types/VertexSerializer.java | 17 +- .../io}/binary/types/YearMonthSerializer.java | 16 +- .../io}/binary/types/ZoneOffsetSerializer.java | 16 +- .../io}/binary/types/ZonedDateTimeSerializer.java | 16 +- .../driver/ser/GraphBinaryMessageSerializerV1.java | 10 +- .../tinkerpop/gremlin/driver/ser/NettyBuffer.java | 267 ++ .../gremlin/driver/ser/NettyBufferFactory.java | 114 ++ .../ser/binary/RequestMessageSerializer.java | 58 +++- .../ser/binary/ResponseMessageSerializer.java | 65 ++-- .../gremlin/driver/ser/NettyBufferFactoryTest.java | 385 + .../binary/GraphBinaryMessageSerializerV1Test.java | 1 + .../GraphBinaryReaderWriterRoundTripTest.java | 8 +- .../ser/binary/TypeSerializerFailureTests.java | 11 +- .../ser/binary/TypeSerializerRegistryTest.java | 29 +- .../ser/binary/types/CharSerializerTest.java | 23 +- .../types/sample/SamplePersonSerializer.java | 19 +- .../types/sample/SamplePersonSerializerTest.java | 25 +- .../driver/GraphBinaryReaderWriterBenchmark.java | 29 +- .../gremlin/driver/SerializationBenchmark.java | 2 +- .../scripts/generate-graphbinary-resources.groovy | 7 +- .../graphbinary/GraphBinaryCompatibilityTest.java | 21 +- 75 files changed, 1704
[tinkerpop] 01/01: 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 78665fbf4fc5178388553256af0c9b1239a1aba1 Merge: f2bb01d 82c2f5f Author: stephen AuthorDate: Thu Oct 31 13:28:58 2019 -0400 Merge branch 'tp34' gremlin-console/src/main/static/NOTICE | 2 +- gremlin-server/src/main/static/NOTICE | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
[tinkerpop] 01/01: 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 0c673cf4c0a8e8999bb5de282320cc6a295ba38b Merge: 77b4293 9992aac Author: Robert Dale AuthorDate: Tue Oct 22 20:59:23 2019 -0400 Merge branch 'tp34' CHANGELOG.asciidoc | 2 ++ pom.xml| 2 +- 2 files changed, 3 insertions(+), 1 deletion(-)
[tinkerpop] 01/01: 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 77b429302a70e1c113393ebcd41a0a4aabf64ea4 Merge: 6f1e0a9 49a4253 Author: Stephen Mallette AuthorDate: Mon Oct 21 08:55:36 2019 -0400 Merge branch 'tp34' docs/src/dev/developer/contributing.asciidoc | 34 1 file changed, 34 insertions(+)
[tinkerpop] 01/01: 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 6f1e0a95124d916e52693be4736ec0fa3a8660ab Merge: 691cc65 5a0d3f0 Author: Stephen Mallette AuthorDate: Mon Oct 21 07:43:52 2019 -0400 Merge branch 'tp34' docs/src/dev/developer/release.asciidoc| 16 ++-- docs/src/recipes/connected-components.asciidoc | 6 +++--- 2 files changed, 17 insertions(+), 5 deletions(-)
[tinkerpop] 01/01: 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 24ee43461897a80958841eaaa2ab3131fa98c0bb Merge: a1fecc6 ee14de7 Author: Stephen Mallette AuthorDate: Fri Oct 18 19:02:25 2019 -0400 Merge branch 'tp34' CHANGELOG.asciidoc | 9 + 1 file changed, 9 insertions(+)
[tinkerpop] 01/01: 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 6447f3ddf2b7198f3725739526c63f21f30aba6e Merge: 3e3748e 828f300 Author: Stephen Mallette AuthorDate: Mon Oct 14 14:58:07 2019 -0400 Merge branch 'tp34' CHANGELOG.asciidoc | 29 - bin/validate-distribution.sh| 2 +- docs/src/upgrade/release-3.4.x.asciidoc | 2 +- 3 files changed, 30 insertions(+), 3 deletions(-)
[tinkerpop] 01/01: Merge branch 'tp34'
This is an automated email from the ASF dual-hosted git repository. jorgebg pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tinkerpop.git commit f835b416f83c1a56238ed0d511093938de24c26f Merge: 25a34d1 ae9d257 Author: Jorge Bay Gondra AuthorDate: Wed Oct 9 12:59:04 2019 +0200 Merge branch 'tp34' CHANGELOG.asciidoc | 1 + .../gremlin-javascript/lib/driver/client.js | 21 +++-- .../gremlin-javascript/lib/driver/connection.js | 2 +- .../lib/driver/driver-remote-connection.js | 10 ++ 4 files changed, 31 insertions(+), 3 deletions(-)
[tinkerpop] 01/01: 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 77cbeede986635a2d88e713b69edc533cbb4efc6 Merge: 97f0d4a 3e08b63 Author: Stephen Mallette AuthorDate: Tue Oct 1 06:30:11 2019 -0400 Merge branch 'tp34'
[tinkerpop] 01/01: 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 35da997fe59e4eadf873e18f608667dfd3e21911 Merge: c59714b 2ba3942 Author: Stephen Mallette AuthorDate: Wed Sep 25 14:34:43 2019 -0400 Merge branch 'tp34' sparql-gremlin/pom.xml | 18 ++ 1 file changed, 6 insertions(+), 12 deletions(-)
[tinkerpop] 01/01: 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 75b190665c0689e95847b0f9def145da172e1f9d Merge: 2c71bc2 d4f7e9d Author: Stephen Mallette AuthorDate: Fri Sep 13 05:39:05 2019 -0400 Merge branch 'tp34' CHANGELOG.asciidoc | 3 + docs/src/reference/the-traversal.asciidoc | 33 +++- docs/src/upgrade/release-3.4.x.asciidoc| 78 + .../traversal/dsl/graph/GraphTraversal.java| 27 ++- .../gremlin/process/traversal/dsl/graph/__.java| 7 + .../process/traversal/step/map/ElementMapStep.java | 122 ++ .../org/apache/tinkerpop/gremlin/structure/T.java | 8 + .../traversal/step/map/ElementMapStepTest.java | 42 + .../Process/Traversal/GraphTraversal.cs| 11 ++ .../src/Gremlin.Net/Process/Traversal/__.cs| 10 ++ .../Structure/IO/GraphSON/DirectionDeserializer.cs | 36 .../Structure/IO/GraphSON/GraphSONReader.cs| 1 + .../Gherkin/CommonSteps.cs | 10 +- .../Structure/IO/GraphSON/GraphSONReaderTests.cs | 12 ++ .../lib/process/graph-traversal.js | 11 ++ .../lib/structure/io/graph-serializer.js | 1 + .../lib/structure/io/type-serializers.js | 7 + .../test/cucumber/feature-steps.js | 8 +- .../gremlin_python/process/graph_traversal.py | 14 ++ .../gremlin_python/structure/io/graphsonV3d0.py| 16 +- .../src/main/jython/radish/feature_steps.py| 8 +- gremlin-test/features/map/ElementMap.feature | 62 +++ .../tinkerpop/gremlin/AbstractGremlinTest.java | 4 +- .../gremlin/process/ProcessComputerSuite.java | 3 + .../gremlin/process/ProcessStandardSuite.java | 3 + .../process/traversal/step/map/ElementMapTest.java | 187 + 26 files changed, 710 insertions(+), 14 deletions(-)
[tinkerpop] 01/01: 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 2f6b2a7adda5c498a8d318197208d6f84d5cbe5d Merge: 1adf4f4 f203aca Author: Stephen Mallette AuthorDate: Tue Aug 6 06:25:25 2019 -0400 Merge branch 'tp34' CHANGELOG.asciidoc | 35 - docs/src/upgrade/release-3.4.x.asciidoc | 2 +- 2 files changed, 35 insertions(+), 2 deletions(-)
[tinkerpop] 01/01: 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 57478b88e05054591c1bb20ad202309c8b7faf90 Merge: 590fc20 44fb998 Author: Stephen Mallette AuthorDate: Sun Aug 4 09:52:41 2019 -0400 Merge branch 'tp34' .../gremlin/process/traversal/step/branch/RepeatTest.java | 7 +-- 1 file changed, 1 insertion(+), 6 deletions(-)
[tinkerpop] 01/01: 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 c2d7bd9c31b9d48f88017c1a077cb69437924d38 Merge: 16700b2 27e40b6 Author: Daniel Kuppitz AuthorDate: Sat Jul 13 18:05:11 2019 -0700 Merge branch 'tp34' docker/scripts/build.sh | 2 +- .../strategy/optimization/EarlyLimitStrategy.java | 6 +++--- .../strategy/optimization/FilterRankingStrategy.java | 8 .../optimization/IdentityRemovalStrategy.java | 3 +-- .../optimization/IncidentToAdjacentStrategy.java | 9 ++--- .../strategy/optimization/LazyBarrierStrategy.java| 9 + .../strategy/optimization/MatchPredicateStrategy.java | 6 ++ .../strategy/optimization/OrderLimitStrategy.java | 19 +++ .../strategy/optimization/PathProcessorStrategy.java | 7 --- .../strategy/optimization/RepeatUnrollStrategy.java | 13 + 10 files changed, 62 insertions(+), 20 deletions(-)
[tinkerpop] 01/01: 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 1750593d4beb8b2c4f32bcfc30dc98ac431a278c Merge: 60e08a9 525e24e Author: Stephen Mallette AuthorDate: Wed Jul 3 13:21:16 2019 -0400 Merge branch 'tp34' CHANGELOG.asciidoc | 1 + docs/src/reference/the-traversal.asciidoc | 70 ++-- docs/src/upgrade/release-3.4.x.asciidoc| 13 +++ .../traversal/dsl/graph/GraphTraversal.java| 24 - .../gremlin/process/traversal/dsl/graph/__.java| 9 ++ .../Process/Traversal/GraphTraversal.cs| 9 ++ .../src/Gremlin.Net/Process/Traversal/__.cs| 8 ++ .../test/cucumber/feature-steps.js | 1 + gremlin-test/features/sideEffect/Aggregate.feature | 88 ++- .../traversal/step/sideEffect/AggregateTest.java | 118 - ...tractTinkerGraphGraphSONTranslatorProvider.java | 4 + 11 files changed, 303 insertions(+), 42 deletions(-)
[tinkerpop] 01/01: 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 60e08a91d02d9e300cec58c1fe9c6b99f59dba7b Merge: d6b5e3c 8fe711d Author: Daniel Kuppitz AuthorDate: Wed Jul 3 08:56:03 2019 -0700 Merge branch 'tp34' docker/gremlin-server.sh | 9 +++-- docker/gremlin-server/Dockerfile.template | 5 ++--- docker/gremlin-server/docker-entrypoint.sh | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-)