You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2019/08/07 19:41:16 UTC
[tinkerpop] 01/01: TINKERPOP-2269 Remove remote side-effect
retrieval
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a commit to branch TINKERPOP-2269
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit d67c0e6158f265c0e705bb7929154510173e2213
Author: Stephen Mallette <sp...@genoprime.com>
AuthorDate: Wed Aug 7 15:40:17 2019 -0400
TINKERPOP-2269 Remove remote side-effect retrieval
This infrastucture was previously deprecated and can be removed.
---
CHANGELOG.asciidoc | 1 +
docs/src/dev/provider/index.asciidoc | 50 -----
docs/src/reference/gremlin-applications.asciidoc | 12 +-
docs/src/upgrade/release-3.5.x.asciidoc | 27 ++-
.../console/jsr223/DriverGremlinPlugin.java | 4 +-
.../remote/traversal/AbstractRemoteTraversal.java | 5 +
.../AbstractRemoteTraversalSideEffects.java | 103 ---------
.../remote/traversal/EmbeddedRemoteTraversal.java | 9 -
.../EmbeddedRemoteTraversalSideEffects.java | 51 -----
.../process/remote/traversal/RemoteTraversal.java | 10 -
.../traversal/RemoteTraversalSideEffects.java | 48 ----
.../remote/traversal/step/map/RemoteStep.java | 1 -
gremlin-dotnet/glv/TextP.template | 3 -
.../Driver/Remote/DriverRemoteTraversal.cs | 4 -
.../Remote/DriverRemoteTraversalSideEffects.cs | 129 -----------
.../Driver/ResultsAggregation/AggregatorFactory.cs | 46 ----
.../Driver/ResultsAggregation/DefaultAggregator.cs | 42 ----
.../ResultsAggregation/DictionaryAggregator.cs | 44 ----
.../Driver/ResultsAggregation/IAggregator.cs | 31 ---
.../ResultsAggregation/TraverserAggregator.cs | 44 ----
.../Driver/SingleMessageResultReceiver.cs | 23 +-
gremlin-dotnet/src/Gremlin.Net/Driver/Tokens.cs | 36 ---
.../Gremlin.Net/Process/Remote/RemoteStrategy.cs | 1 -
.../Process/Traversal/DefaultTraversal.cs | 16 --
.../Gremlin.Net/Process/Traversal/ITraversal.cs | 7 -
.../Process/Traversal/ITraversalSideEffects.cs | 53 -----
.../src/Gremlin.Net/Process/Traversal/TextP.cs | 3 -
.../DriverRemoteConnection/SideEffectTests.cs | 160 --------------
.../Process/Traversal/TraversalTests.cs | 12 -
.../apache/tinkerpop/gremlin/driver/Handler.java | 30 +--
.../tinkerpop/gremlin/driver/ResultQueue.java | 65 ------
.../apache/tinkerpop/gremlin/driver/Tokens.java | 71 +-----
.../driver/remote/DriverRemoteTraversal.java | 31 ---
.../remote/DriverRemoteTraversalSideEffects.java | 193 ----------------
.../tinkerpop/gremlin/driver/ResultQueueTest.java | 130 +----------
.../DriverRemoteTraversalSideEffectsTest.java | 140 ------------
gremlin-python/glv/TraversalSource.template | 21 --
.../driver/driver_remote_connection.py | 10 +-
.../gremlin_python/driver/remote_connection.py | 89 +-------
.../jython/gremlin_python/process/traversal.py | 21 --
.../tests/driver/test_driver_remote_connection.py | 112 ----------
.../python/jsr223/JythonTranslatorTest.java | 2 -
.../server/op/traversal/TraversalOpProcessor.java | 244 +--------------------
.../gremlin/server/util/SideEffectIterator.java | 97 --------
.../gremlin/server/GremlinServerIntegrateTest.java | 175 ---------------
.../process/AbstractGremlinProcessTest.java | 10 +-
.../tinkerpop/gremlin/structure/RemoteGraph.java | 8 +
47 files changed, 59 insertions(+), 2365 deletions(-)
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index dc2c43b..01aa6b3 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -35,6 +35,7 @@ This release also includes changes from <<release-3-4-3, 3.4.3>>.
* 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 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()`.
diff --git a/docs/src/dev/provider/index.asciidoc b/docs/src/dev/provider/index.asciidoc
index abebd36..88c7c92 100644
--- a/docs/src/dev/provider/index.asciidoc
+++ b/docs/src/dev/provider/index.asciidoc
@@ -1106,14 +1106,6 @@ The full iteration of a `Traversal` is thus left to the client. It must interpre
unroll it to represent the actual number of times it exists when iterated. The unrolling is typically handled
directly within TinkerPop's remote traversal implementations.
-One of the important aspects of the Traversal OpProcessor is that it enables the user to not only get the results of
-the `Traversal` but also the side-effects that it produces. When the `Traversal` is submitted with the "bytecode"
-operation, the results are iterated back as usual, but any side-effects are retained on the server in a cache keyed by
-the identifier of the request that originally submitted the `Traversal`. The client will want to retain that identifier
-if it intends to later get side-effects. The Traversal OpProcessor supplies the "keys" and "gather" operations to get
-the keys stored in the side-effect and to get the value of a specific side-effect respectively. Finally, a "close"
-operation is available to clear the cache of a specific side-effect.
-
[width="100%",cols="3,10a",options="header"]
|=========================================================
|Key |Description
@@ -1124,9 +1116,6 @@ operation is available to clear the cache of a specific side-effect.
!Key !Description
!`authentication` !A request that contains the response to a server challenge for authentication.
!`bytecode` !A request that contains the `Bytecode` representation of a `Traversal`.
-!`close` !Releases side-effects held in cache for a particular `Traversal`.
-!`gather` !Gets a particular side-effect as produced by a previously executed `Traversal`.
-!`keys` !Gets all the keys of all side-effects as produced by a previously executed `Traversal`.
|=========================================================
**`authentication` operation arguments**
@@ -1153,45 +1142,6 @@ one key value pair present (since only one `Traversal` is being submitted, there
single alias).
|=========================================================
-**`close` operation arguments**
-
-[width="100%",cols="2,2,9",options="header"]
-|=========================================================
-|Key |Type |Description
-|sideEffect |UUID | *Required* The unique identifier for the request that original submitted the traversal (side-effects are keyed by that value)
-|=========================================================
-
-**`gather` operation arguments**
-
-[width="100%",cols="2,2,9",options="header"]
-|=========================================================
-|Key |Type |Description
-|sideEffect |UUID | *Required* The unique identifier for the request that original submitted the traversal (side-effects are keyed by that value)
-|sideEffectKey |String | *Required* The key for a specific side-effect.
-|aliases |Map | *Required* A map with a single key/value pair that refers to a globally bound `TraversalSource` object
-to be aliased to different variable names for purposes of the current request. The value represents the name of the
-global variable and its key represents the new binding name as it will be referenced in the Gremlin query. For
-example, if the Gremlin Server defines two `TraversalSource` instances named `g1`, it would be possible
-to send an alias pair with key of "g" and value of "g1" and thus allow the script to refer to "g1" simply as "g". Note
-that unlike users of `alias` in other contexts, in this case, the key can *only* be set to "g" and there can be only
-one key value pair present (since only one `Traversal` is being submitted, there is no sense to having more than a
-single alias).
-|=========================================================
-
-When using "gather" it is important to note the metadata that is returned on the `ResponseMessage`. It returns both the
-"sideEffectKey" that was requested as well as a value keyed as "aggregateTo". The "aggregateTo" field describes how the
-streamed side-effect data should be treated on the client. It provides a hint as to whether or not the data should be
-rolled back up into a single object or simply left as-is. There are four values for "aggregateTo": `bulkset`, `list`,
-`map`, `set` and `none`.
-
-**`keys` operation arguments**
-
-[width="100%",cols="2,2,9",options="header"]
-|=========================================================
-|Key |Type |Description
-|sideEffect |UUID | *Required* The unique identifier for the request that original submitted the traversal (side-effects are keyed by that value)
-|=========================================================
-
=== Authentication
Gremlin Server supports link:https://en.wikipedia.org/wiki/Simple_Authentication_and_Security_Layer[SASL-based]
diff --git a/docs/src/reference/gremlin-applications.asciidoc b/docs/src/reference/gremlin-applications.asciidoc
index 0bdc7c8..a7b8edb 100644
--- a/docs/src/reference/gremlin-applications.asciidoc
+++ b/docs/src/reference/gremlin-applications.asciidoc
@@ -498,7 +498,6 @@ $ bin/gremlin-server.sh conf/gremlin-server-modern.yaml
[INFO] OpLoader - Adding the standard OpProcessor.
[INFO] OpLoader - Adding the session OpProcessor.
[INFO] OpLoader - Adding the traversal OpProcessor.
-[INFO] TraversalOpProcessor - Initialized cache for TraversalOpProcessor with size 1000 and expiration time of 600000 ms
[INFO] GremlinServer - Executing start up LifeCycleHook
[INFO] Logger$info - Loading 'modern' graph data.
[INFO] GremlinServer - idleConnectionTimeout was set to 0 which resolves to 0 seconds when configuring this value - this feature will be disabled
@@ -1075,16 +1074,7 @@ method for processing script evaluation requests.
===== TraversalOpProcessor
The `TraversalOpProcessor` provides a way to accept traversals configured via <<connecting-via-drivers,withRemote()>>.
-
-[width="100%",cols="3,10,^2",options="header"]
-|=========================================================
-|Name |Description |Default
-|cacheExpirationTime |Time in milliseconds before side-effects from a `Traversal` will be evicted. |60000
-|cacheMaxSize |The maximum number of entries in the side-effect cache. |1000
-|=========================================================
-
-If there is no intention to gather side-effects from traversals, the `cacheMaxSize` can be set to zero to disable the
-cache.
+It has no special configuration settings.
[[security]]
==== Security
diff --git a/docs/src/upgrade/release-3.5.x.asciidoc b/docs/src/upgrade/release-3.5.x.asciidoc
index 7665288..90f1f0a 100644
--- a/docs/src/upgrade/release-3.5.x.asciidoc
+++ b/docs/src/upgrade/release-3.5.x.asciidoc
@@ -107,6 +107,14 @@ Display stack trace? [yN]
See: link:https://issues.apache.org/jira/browse/TINKERPOP-2099[TINKERPOP-2099]
+==== Remote SideEffects
+
+Remote traversals no longer support the retrieval of remote side-effects. Users must therefore directly return
+side-effects as part of their query if they need that data. Note that server settings for `TraversalOpProcessor`, which
+formerly held the cache for these side-effects, no longer have any effect and can be removed.
+
+See: link:https://issues.apache.org/jira/browse/TINKERPOP-2269[TINKERPOP-2269]
+
==== Deprecation Removal
The following deprecated classes, methods or fields have been removed in this version:
@@ -124,6 +132,10 @@ The following deprecated classes, methods or fields have been removed in this ve
** `org.apache.tinkerpop.gremlin.process.computer.traversal.step.map.PageRankVertexProgramStep.modulateTimes()`
** `org.apache.tinkerpop.gremlin.process.computer.traversal.step.map.PeerPressureVertexProgramStep.modulateBy(*)`
** `org.apache.tinkerpop.gremlin.process.computer.traversal.step.map.PeerPressureVertexProgramStep.modulateTimes()`
+** `org.apache.tinkerpop.gremlin.process.remote.traversal.AbstractRemoteTraversalSideEffects`
+** `org.apache.tinkerpop.gremlin.process.remote.traversal.EmbeddedRemoteTraversalSideEffects`
+** `org.apache.tinkerpop.gremlin.process.remote.traversal.RemoteTraversalSideEffects`
+** `org.apache.tinkerpop.gremlin.process.remote.traversal.RemoteTraversal#getSideEffects()`
** `org.apache.tinkerpop.gremlin.process.traversal.Order.decr`
** `org.apache.tinkerpop.gremlin.process.traversal.Order.incr`
** `org.apache.tinkerpop.gremlin.process.traversal.TraversalSource#withRemote(*)`
@@ -131,12 +143,14 @@ The following deprecated classes, methods or fields have been removed in this ve
** `org.apache.tinkerpop.gremlin.process.traversal.step.map.PropertyMapStep(Traversal.Admin, boolean, PropertyType, String...)`
** `org.apache.tinkerpop.gremlin.process.traversal.step.map.PropertyMapStep#isIncludeTokens()`
** `org.apache.tinkerpop.gremlin.structure.util.star.StarGraph#builder()`
-** `org.apache.tinkerpop.gremlin.structure.util.star.StarGraph.Builder.create()`
+** `org.apache.tinkerpop.gremlin.structure.util.star.StarGraph.Builder#create()`
* `gremlin-driver`
** `org.apache.tinkerpop.gremlin.driver.Cluster.Builder#keyCertChainFile(String)`
** `org.apache.tinkerpop.gremlin.driver.Cluster.Builder#keyFile(String)`
** `org.apache.tinkerpop.gremlin.driver.Cluster.Builder#keyPassword(String)`
** `org.apache.tinkerpop.gremlin.driver.Cluster.Builder#trustCertificateChainFile(String)`
+** `org.apache.tinkerpop.gremlin.driver.remote.DriverRemoteTraversalSideEffects`
+** `org.apache.tinkerpop.gremlin.driver.remote.DriverRemoteTraversal#getSideEffects()`
* `gremlin-server`
** `org.apache.tinkerpop.gremlin.server.Settings.SslSettings.keyCertChainFile`
** `org.apache.tinkerpop.gremlin.server.Settings.SslSettings.keyFile`
@@ -150,6 +164,7 @@ The following deprecated classes, methods or fields have been removed in this ve
** `org.apache.tinkerpop.gremlin.server.op.AbstractOpProcessor.makeFrame(Context, RequestMessage, MessageSerializer, boolean, List, ResponseStatusCode, Map)`
** `org.apache.tinkerpop.gremlin.server.op.AbstractOpProcessor.makeFrame(ResponseHandlerContext, RequestMessage, MessageSerializer, boolean, List, ResponseStatusCode, Map)`
** `org.apache.tinkerpop.gremlin.server.op.AbstractOpProcessor.makeFrame(ResponseHandlerContext, RequestMessage, MessageSerializer, boolean, List, ResponseStatusCode, Map, Map)`
+** `org.apache.tinkerpop.gremlin.server.util.SideEffectIterator`
* `neo4j-gremlin`
** `org.apache.tinkerpop.gremlin.neo4j.structure.Neo4jGraph#getTrait()`
** `org.apache.tinkerpop.gremlin.neo4j.structure.Neo4jGraph#CONFIG_META_PROPERTIES`
@@ -162,6 +177,7 @@ See: link:https://issues.apache.org/jira/browse/TINKERPOP-2080[TINKERPOP-2080],
link:https://issues.apache.org/jira/browse/TINKERPOP-2231[TINKERPOP-2231],
link:https://issues.apache.org/jira/browse/TINKERPOP-2233[TINKERPOP-2233],
link:https://issues.apache.org/jira/browse/TINKERPOP-2239[TINKERPOP-2239],
+link:https://issues.apache.org/jira/browse/TINKERPOP-2269[TINKERPOP-2269],
link:https://issues.apache.org/jira/browse/TINKERPOP-2273[TINKERPOP-2273],
link:http://tinkerpop.apache.org/docs/3.5.0/upgrade/#_ssl_security[3.2.10 Upgrade Documentation for SSL]
@@ -182,4 +198,11 @@ Note that `StoreStep` has been renamed to `AggregateLocalStep` and `AggregateSte
`AggregateGlobalStep`. The renaming is important to consider if any custom `TraversalStrategies` have been written
that rely on the old step names.
-link:https://issues.apache.org/jira/browse/TINKERPOP-2254[TINKERPOP-2254]
\ No newline at end of file
+See: link:https://issues.apache.org/jira/browse/TINKERPOP-2254[TINKERPOP-2254]
+
+===== TraversalOpProcessor Side-effects
+
+`TraversalOpProcessor` no longer holds a cache of side-effects and more generally the entire side-effect protocol has
+been removed and is no longer supported in the server or drivers.
+
+See: link:https://issues.apache.org/jira/browse/TINKERPOP-2269[TINKERPOP-2269]
\ No newline at end of file
diff --git a/gremlin-console/src/main/java/org/apache/tinkerpop/gremlin/console/jsr223/DriverGremlinPlugin.java b/gremlin-console/src/main/java/org/apache/tinkerpop/gremlin/console/jsr223/DriverGremlinPlugin.java
index 80a78ab..2f12c4c 100644
--- a/gremlin-console/src/main/java/org/apache/tinkerpop/gremlin/console/jsr223/DriverGremlinPlugin.java
+++ b/gremlin-console/src/main/java/org/apache/tinkerpop/gremlin/console/jsr223/DriverGremlinPlugin.java
@@ -35,7 +35,6 @@ import org.apache.tinkerpop.gremlin.driver.message.ResponseStatus;
import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode;
import org.apache.tinkerpop.gremlin.driver.remote.DriverRemoteConnection;
import org.apache.tinkerpop.gremlin.driver.remote.DriverRemoteTraversal;
-import org.apache.tinkerpop.gremlin.driver.remote.DriverRemoteTraversalSideEffects;
import org.apache.tinkerpop.gremlin.driver.ser.GraphBinaryMessageSerializerV1;
import org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV1d0;
import org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV2d0;
@@ -93,8 +92,7 @@ public class DriverGremlinPlugin extends AbstractGremlinPlugin {
Serializers.class,
SerTokens.class,
DriverRemoteConnection.class,
- DriverRemoteTraversal.class,
- DriverRemoteTraversalSideEffects.class).create();
+ DriverRemoteTraversal.class).create();
public DriverGremlinPlugin() {
super(NAME, imports, new DriverConsoleCustomizer());
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/traversal/AbstractRemoteTraversal.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/traversal/AbstractRemoteTraversal.java
index 0c6a7aa..888ac05 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/traversal/AbstractRemoteTraversal.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/traversal/AbstractRemoteTraversal.java
@@ -53,6 +53,11 @@ public abstract class AbstractRemoteTraversal<S,E> implements RemoteTraversal<S,
public abstract Traverser.Admin<E> nextTraverser();
@Override
+ public TraversalSideEffects getSideEffects() {
+ throw new UnsupportedOperationException("Remote traversals do not support this method");
+ }
+
+ @Override
public Bytecode getBytecode() {
throw new UnsupportedOperationException("Remote traversals do not support this method");
}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/traversal/AbstractRemoteTraversalSideEffects.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/traversal/AbstractRemoteTraversalSideEffects.java
deleted file mode 100644
index 3456848..0000000
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/traversal/AbstractRemoteTraversalSideEffects.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * 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.process.remote.traversal;
-
-import org.apache.tinkerpop.gremlin.process.traversal.TraversalSideEffects;
-import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal;
-import org.apache.tinkerpop.gremlin.structure.util.StringFactory;
-
-import java.util.Optional;
-import java.util.function.BinaryOperator;
-import java.util.function.Supplier;
-import java.util.function.UnaryOperator;
-
-/**
- * @author Stephen Mallette (http://stephen.genoprime.com)
- * @deprecated As of release 3.3.8, not directly replaced, prefer use of {@link GraphTraversal#cap(String, String...)}
- * to return the result as part of the traversal iteration.
- */
-@Deprecated
-public abstract class AbstractRemoteTraversalSideEffects implements RemoteTraversalSideEffects {
-
- @Override
- public void set(final String key, final Object value) throws IllegalArgumentException {
- throw new UnsupportedOperationException("Remote traversals do not support this method");
- }
-
- @Override
- public void remove(final String key) {
- throw new UnsupportedOperationException("Remote traversals do not support this method");
- }
-
- @Override
- public <V> void register(final String key, final Supplier<V> initialValue, BinaryOperator<V> reducer) {
- throw new UnsupportedOperationException("Remote traversals do not support this method");
- }
-
- @Override
- public <V> void registerIfAbsent(final String key, final Supplier<V> initialValue, BinaryOperator<V> reducer) {
- throw new UnsupportedOperationException("Remote traversals do not support this method");
- }
-
- @Override
- public <V> BinaryOperator<V> getReducer(final String key) throws IllegalArgumentException {
- throw new UnsupportedOperationException("Remote traversals do not support this method");
- }
-
- @Override
- public <V> Supplier<V> getSupplier(final String key) throws IllegalArgumentException {
- throw new UnsupportedOperationException("Remote traversals do not support this method");
- }
-
- @Override
- public void add(final String key, final Object value) throws IllegalArgumentException {
- throw new UnsupportedOperationException("Remote traversals do not support this method");
- }
-
- @Override
- public <S> void setSack(final Supplier<S> initialValue, UnaryOperator<S> splitOperator, final BinaryOperator<S> mergeOperator) {
- throw new UnsupportedOperationException("Remote traversals do not support this method");
- }
-
- @Override
- public <S> Supplier<S> getSackInitialValue() {
- return null;
- // throw new UnsupportedOperationException("Remote traversals do not support this method");
- }
-
- @Override
- public <S> UnaryOperator<S> getSackSplitter() {
- throw new UnsupportedOperationException("Remote traversals do not support this method");
- }
-
- @Override
- public <S> BinaryOperator<S> getSackMerger() {
- throw new UnsupportedOperationException("Remote traversals do not support this method");
- }
-
- @Override
- public TraversalSideEffects clone() {
- throw new UnsupportedOperationException("Remote traversals do not support this method");
- }
-
- @Override
- public void mergeInto(final TraversalSideEffects sideEffects) {
- throw new UnsupportedOperationException("Remote traversals do not support this method");
- }
-}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/traversal/EmbeddedRemoteTraversal.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/traversal/EmbeddedRemoteTraversal.java
index 10e27ae..9dc37e7 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/traversal/EmbeddedRemoteTraversal.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/traversal/EmbeddedRemoteTraversal.java
@@ -39,15 +39,6 @@ public class EmbeddedRemoteTraversal<S,E> extends AbstractRemoteTraversal<S,E> {
return t.asAdmin().nextTraverser();
}
- /**
- * @deprecated as of release 3.3.8, not directly replaced, see {@link Admin#getSideEffects()} for more information.
- */
- @Override
- @Deprecated
- public RemoteTraversalSideEffects getSideEffects() {
- return new EmbeddedRemoteTraversalSideEffects(t.asAdmin().getSideEffects());
- }
-
@Override
public boolean hasNext() {
return t.hasNext();
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/traversal/EmbeddedRemoteTraversalSideEffects.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/traversal/EmbeddedRemoteTraversalSideEffects.java
deleted file mode 100644
index 06815fd..0000000
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/traversal/EmbeddedRemoteTraversalSideEffects.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * 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.process.remote.traversal;
-
-import org.apache.tinkerpop.gremlin.process.traversal.TraversalSideEffects;
-import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal;
-
-import java.util.Set;
-
-/**
- * Generated by the {@link EmbeddedRemoteTraversal} to help simulate a remote traversal side-effects within the same JVM.
- *
- * @author Stephen Mallette (http://stephen.genoprime.com)
- * @deprecated As of release 3.3.8, not directly replaced, prefer use of {@link GraphTraversal#cap(String, String...)}
- * to return the result as part of the traversal iteration.
- */
-@Deprecated
-public class EmbeddedRemoteTraversalSideEffects extends AbstractRemoteTraversalSideEffects {
-
- private final TraversalSideEffects sideEffects;
-
- public EmbeddedRemoteTraversalSideEffects(final TraversalSideEffects sideEffects) {
- this.sideEffects = sideEffects;
- }
-
- @Override
- public <V> V get(final String key) throws IllegalArgumentException {
- return sideEffects.get(key);
- }
-
- @Override
- public Set<String> keys() {
- return sideEffects.keys();
- }
-}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/traversal/RemoteTraversal.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/traversal/RemoteTraversal.java
index 4c5b41b..f1e22f7 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/traversal/RemoteTraversal.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/traversal/RemoteTraversal.java
@@ -37,14 +37,4 @@ import org.apache.tinkerpop.gremlin.process.traversal.step.util.AbstractStep;
* @author Stephen Mallette (http://stephen.genoprime.com)
*/
public interface RemoteTraversal<S,E> extends Traversal.Admin<S,E> {
-
- /**
- * Returns remote side-effects generated by the traversal so that they can be accessible to the client. Note that
- * "side-effect" refers to the value in "a" in the traversal {@code g.V().aggregate('a').values('name')}.
- *
- * @deprecated as of release 3.3.8, not directly replaced, see {@link Admin#getSideEffects()} for more information.
- */
- @Override
- @Deprecated
- public RemoteTraversalSideEffects getSideEffects();
}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/traversal/RemoteTraversalSideEffects.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/traversal/RemoteTraversalSideEffects.java
deleted file mode 100644
index 0d1a510..0000000
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/traversal/RemoteTraversalSideEffects.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * 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.process.remote.traversal;
-
-import org.apache.tinkerpop.gremlin.process.traversal.TraversalSideEffects;
-import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal;
-import org.apache.tinkerpop.gremlin.process.traversal.util.DefaultTraversalSideEffects;
-
-/**
- * When a traversal is executed remotely, the ability to retrieve those side-effects (i.e. the value in "a" in the
- * traversal {@code g.V().aggregate('a').values('name')}) can be exposed through this interface. As an example,
- * with TinkerPop's {@code DriverRemoteConnection} that connects to Gremlin Server as a "remote", the side-effects
- * are left on the server. The {@code RemoteTraversalSideEffects} implementation, in that case, lazily loads those
- * side-effects when requested. Implementations should attempt to match the features of the locally processed
- * {@link DefaultTraversalSideEffects} to keep consistency.
- *
- * @author Stephen Mallette (http://stephen.genoprime.com)
- * @deprecated As of release 3.3.8, not directly replaced, prefer use of {@link GraphTraversal#cap(String, String...)}
- * to return the result as part of the traversal iteration.
- */
-@Deprecated
-public interface RemoteTraversalSideEffects extends TraversalSideEffects, AutoCloseable {
-
- /**
- * If the "remote" that actually executed the traversal maintained resources that can be released, when the user
- * is done with the side-effects, then this method can be used to trigger that release.
- */
- @Override
- public default void close() throws Exception {
- // do nothing
- }
-}
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/traversal/step/map/RemoteStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/traversal/step/map/RemoteStep.java
index a103f6a..be623cd 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/traversal/step/map/RemoteStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/traversal/step/map/RemoteStep.java
@@ -88,7 +88,6 @@ public final class RemoteStep<S, E> extends AbstractStep<S, E> {
if (null == traversalFuture.get()) {
traversalFuture.set(this.remoteConnection.submitAsync(this.traversal.getBytecode()).<Traversal<?, E>>thenApply(t -> {
this.remoteTraversal = (RemoteTraversal<?, E>) t;
- this.traversal.setSideEffects(this.remoteTraversal.getSideEffects());
return traversal;
}));
}
diff --git a/gremlin-dotnet/glv/TextP.template b/gremlin-dotnet/glv/TextP.template
index 3e289f6..7b04533 100644
--- a/gremlin-dotnet/glv/TextP.template
+++ b/gremlin-dotnet/glv/TextP.template
@@ -22,11 +22,8 @@
#endregion
// THIS IS A GENERATED FILE - DO NOT MODIFY THIS FILE DIRECTLY - see pom.xml
-using System;
-using System.Collections;
using System.Collections.Generic;
using System.Linq;
-using System.Reflection;
namespace Gremlin.Net.Process.Traversal
{
diff --git a/gremlin-dotnet/src/Gremlin.Net/Driver/Remote/DriverRemoteTraversal.cs b/gremlin-dotnet/src/Gremlin.Net/Driver/Remote/DriverRemoteTraversal.cs
index 2197388..cf50646 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Driver/Remote/DriverRemoteTraversal.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Driver/Remote/DriverRemoteTraversal.cs
@@ -33,10 +33,6 @@ namespace Gremlin.Net.Driver.Remote
IEnumerable<Traverser> traversers)
{
Traversers = traversers;
-
- #pragma warning disable 612,618
- SideEffects = new DriverRemoteTraversalSideEffects(gremlinClient, requestId);
- #pragma warning disable 612,618
}
}
}
\ No newline at end of file
diff --git a/gremlin-dotnet/src/Gremlin.Net/Driver/Remote/DriverRemoteTraversalSideEffects.cs b/gremlin-dotnet/src/Gremlin.Net/Driver/Remote/DriverRemoteTraversalSideEffects.cs
deleted file mode 100644
index f7c6ca8..0000000
--- a/gremlin-dotnet/src/Gremlin.Net/Driver/Remote/DriverRemoteTraversalSideEffects.cs
+++ /dev/null
@@ -1,129 +0,0 @@
-#region License
-
-/*
- * 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.
- */
-
-#endregion
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Gremlin.Net.Driver.Messages;
-using Gremlin.Net.Process;
-using Gremlin.Net.Process.Traversal;
-
-namespace Gremlin.Net.Driver.Remote
-{
- #pragma warning disable 612,618
- internal class DriverRemoteTraversalSideEffects : ITraversalSideEffects
- {
- private readonly IGremlinClient _gremlinClient;
- private readonly List<string> _keys = new List<string>();
- private readonly Guid _serverSideEffectId;
- private readonly Dictionary<string, object> _sideEffects = new Dictionary<string, object>();
- private bool _closed;
- private bool _retrievedAllKeys;
-
- public DriverRemoteTraversalSideEffects(IGremlinClient gremlinClient, Guid serverSideEffectId)
- {
- _gremlinClient = gremlinClient;
- _serverSideEffectId = serverSideEffectId;
- }
-
- public void Dispose()
- {
- Close();
- }
-
- public IReadOnlyCollection<string> Keys()
- {
- if (_closed && !_retrievedAllKeys)
- throw new InvalidOperationException("Traversal has been closed - side-effect keys cannot be retrieved");
- if (!_retrievedAllKeys)
- {
- _keys.AddRange(RetrieveKeys());
- _retrievedAllKeys = true;
- }
- return _keys;
- }
-
- private IEnumerable<string> RetrieveKeys()
- {
- return _gremlinClient.SubmitAsync<string>(SideEffectKeysMessage()).Result;
- }
-
- private RequestMessage SideEffectKeysMessage()
- {
- return RequestMessage.Build(Tokens.OpsKeys)
- .AddArgument(Tokens.ArgsSideEffect, _serverSideEffectId)
- .Processor(Tokens.ProcessorTraversal)
- .Create();
- }
-
- public object Get(string key)
- {
- if (!Keys().Contains(key))
- throw new KeyNotFoundException($"Side effect key {key} does not exist");
- if (!_sideEffects.ContainsKey(key))
- {
- if (_closed)
- throw new InvalidOperationException(
- "Traversal has been closed - no new side-effects can be retrieved");
- _sideEffects.Add(key, RetrieveSideEffectsForKey(key));
- }
- return _sideEffects[key];
- }
-
- private object RetrieveSideEffectsForKey(string key)
- {
- return _gremlinClient.SubmitAsync<object>(SideEffectGatherMessage(key)).Result;
- }
-
- private RequestMessage SideEffectGatherMessage(string key)
- {
- return RequestMessage.Build(Tokens.OpsGather)
- .AddArgument(Tokens.ArgsSideEffect, _serverSideEffectId)
- .AddArgument(Tokens.ArgsSideEffectKey, key)
- .AddArgument(Tokens.ArgsAliases, new Dictionary<string, string> {{"g", "g"}})
- .Processor(Tokens.ProcessorTraversal)
- .Create();
- }
-
- public void Close()
- {
- if (_closed) return;
- CloseSideEffects();
- _closed = true;
- }
-
- private void CloseSideEffects()
- {
- _gremlinClient.SubmitAsync<object>(SideEffectCloseMessage()).WaitUnwrap();
- }
-
- private RequestMessage SideEffectCloseMessage()
- {
- return RequestMessage.Build(Tokens.OpsClose)
- .AddArgument(Tokens.ArgsSideEffect, _serverSideEffectId)
- .Processor(Tokens.ProcessorTraversal)
- .Create();
- }
- }
- #pragma warning disable 612,618
-}
\ No newline at end of file
diff --git a/gremlin-dotnet/src/Gremlin.Net/Driver/ResultsAggregation/AggregatorFactory.cs b/gremlin-dotnet/src/Gremlin.Net/Driver/ResultsAggregation/AggregatorFactory.cs
deleted file mode 100644
index 522225d..0000000
--- a/gremlin-dotnet/src/Gremlin.Net/Driver/ResultsAggregation/AggregatorFactory.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-#region License
-
-/*
- * 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.
- */
-
-#endregion
-
-using System.Collections.Generic;
-
-namespace Gremlin.Net.Driver.ResultsAggregation
-{
- #pragma warning disable 612,618
- internal class AggregatorFactory
- {
- private readonly Dictionary<string, IAggregator> _aggregatorByAggregateToType =
- new Dictionary<string, IAggregator>
- {
- {Tokens.ValAggregateToMap, new DictionaryAggregator()},
- {Tokens.ValAggregateToBulkSet, new TraverserAggregator()}
- };
-
- public IAggregator GetAggregatorFor(string aggregateTo)
- {
- if (_aggregatorByAggregateToType.ContainsKey(aggregateTo))
- return _aggregatorByAggregateToType[aggregateTo];
- return new DefaultAggregator();
- }
- }
- #pragma warning disable 612,618
-}
\ No newline at end of file
diff --git a/gremlin-dotnet/src/Gremlin.Net/Driver/ResultsAggregation/DefaultAggregator.cs b/gremlin-dotnet/src/Gremlin.Net/Driver/ResultsAggregation/DefaultAggregator.cs
deleted file mode 100644
index 82b247b..0000000
--- a/gremlin-dotnet/src/Gremlin.Net/Driver/ResultsAggregation/DefaultAggregator.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-#region License
-
-/*
- * 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.
- */
-
-#endregion
-
-using System.Collections.Generic;
-
-namespace Gremlin.Net.Driver.ResultsAggregation
-{
- internal class DefaultAggregator : IAggregator
- {
- private readonly List<dynamic> _result = new List<dynamic>();
-
- public void Add(object value)
- {
- _result.Add(value);
- }
-
- public object GetAggregatedResult()
- {
- return _result;
- }
- }
-}
\ No newline at end of file
diff --git a/gremlin-dotnet/src/Gremlin.Net/Driver/ResultsAggregation/DictionaryAggregator.cs b/gremlin-dotnet/src/Gremlin.Net/Driver/ResultsAggregation/DictionaryAggregator.cs
deleted file mode 100644
index 75764e3..0000000
--- a/gremlin-dotnet/src/Gremlin.Net/Driver/ResultsAggregation/DictionaryAggregator.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-#region License
-
-/*
- * 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.
- */
-
-#endregion
-
-using System.Collections.Generic;
-using System.Linq;
-
-namespace Gremlin.Net.Driver.ResultsAggregation
-{
- internal class DictionaryAggregator : IAggregator
- {
- private readonly Dictionary<string, dynamic> _result = new Dictionary<string, dynamic>();
-
- public void Add(object value)
- {
- var newEntry = ((Dictionary<string, dynamic>) value).First();
- _result.Add(newEntry.Key, newEntry.Value);
- }
-
- public object GetAggregatedResult()
- {
- return _result;
- }
- }
-}
\ No newline at end of file
diff --git a/gremlin-dotnet/src/Gremlin.Net/Driver/ResultsAggregation/IAggregator.cs b/gremlin-dotnet/src/Gremlin.Net/Driver/ResultsAggregation/IAggregator.cs
deleted file mode 100644
index bcc036a..0000000
--- a/gremlin-dotnet/src/Gremlin.Net/Driver/ResultsAggregation/IAggregator.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-#region License
-
-/*
- * 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.
- */
-
-#endregion
-
-namespace Gremlin.Net.Driver.ResultsAggregation
-{
- internal interface IAggregator
- {
- void Add(object value);
- object GetAggregatedResult();
- }
-}
\ No newline at end of file
diff --git a/gremlin-dotnet/src/Gremlin.Net/Driver/ResultsAggregation/TraverserAggregator.cs b/gremlin-dotnet/src/Gremlin.Net/Driver/ResultsAggregation/TraverserAggregator.cs
deleted file mode 100644
index 2d18804..0000000
--- a/gremlin-dotnet/src/Gremlin.Net/Driver/ResultsAggregation/TraverserAggregator.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-#region License
-
-/*
- * 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.
- */
-
-#endregion
-
-using System.Collections.Generic;
-using Gremlin.Net.Process.Traversal;
-
-namespace Gremlin.Net.Driver.ResultsAggregation
-{
- internal class TraverserAggregator : IAggregator
- {
- private readonly Dictionary<object, long> _result = new Dictionary<object, long>();
-
- public void Add(object value)
- {
- var traverser = (Traverser) value;
- _result.Add(traverser.Object, traverser.Bulk);
- }
-
- public object GetAggregatedResult()
- {
- return _result;
- }
- }
-}
\ No newline at end of file
diff --git a/gremlin-dotnet/src/Gremlin.Net/Driver/SingleMessageResultReceiver.cs b/gremlin-dotnet/src/Gremlin.Net/Driver/SingleMessageResultReceiver.cs
index 7b66e61..a78241c 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Driver/SingleMessageResultReceiver.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Driver/SingleMessageResultReceiver.cs
@@ -25,7 +25,6 @@ using System;
using System.Collections.Generic;
using System.Threading.Tasks;
using Gremlin.Net.Driver.Messages;
-using Gremlin.Net.Driver.ResultsAggregation;
using Gremlin.Net.Structure.IO.GraphSON;
using Newtonsoft.Json.Linq;
@@ -39,8 +38,6 @@ namespace Gremlin.Net.Driver
new TaskCompletionSource<ResultSet<T>>(TaskCreationOptions.RunContinuationsAsynchronously);
private readonly GraphSONReader _graphSONReader;
- private bool _isAggregatingSideEffects;
- private IAggregator _aggregator;
private readonly List<T> _result = new List<T>();
public ResponseHandlerForSingleRequestMessage(GraphSONReader graphSonReader)
@@ -53,32 +50,16 @@ namespace Gremlin.Net.Driver
var receivedData = typeof(T) == typeof(JToken)
? new[] {received.Result.Data}
: _graphSONReader.ToObject(received.Result.Data);
- #pragma warning disable 612,618
foreach (var d in receivedData)
{
- if (received.Result.Meta.ContainsKey(Tokens.ArgsSideEffectKey))
- {
- if (_aggregator == null)
- _aggregator =
- new AggregatorFactory().GetAggregatorFor(
- (string) received.Result.Meta[Tokens.ArgsAggregateTo]);
- _aggregator.Add(d);
- _isAggregatingSideEffects = true;
- }
- else
- {
- _result.Add(d);
- }
+ _result.Add(d);
}
- #pragma warning disable 612,618
}
public void Finalize(Dictionary<string, object> statusAttributes)
{
var resultSet =
- new ResultSet<T>(
- _isAggregatingSideEffects ? new List<T> {(T) _aggregator.GetAggregatedResult()} : _result,
- statusAttributes);
+ new ResultSet<T>(_result, statusAttributes);
_tcs.TrySetResult(resultSet);
}
diff --git a/gremlin-dotnet/src/Gremlin.Net/Driver/Tokens.cs b/gremlin-dotnet/src/Gremlin.Net/Driver/Tokens.cs
index 0e889d3..9d0416e 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Driver/Tokens.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Driver/Tokens.cs
@@ -47,18 +47,6 @@ namespace Gremlin.Net.Driver
public static string OpsEval = "eval";
/// <summary>
- /// Operation used to get a particular side-effect as produced by a previously executed Traversal.
- /// </summary>
- [Obsolete("As of release 3.3.8, not replaced, prefer use of cap()-step to retrieve side-effects as part of traversal iteration", false)]
- public static string OpsGather = "gather";
-
- /// <summary>
- /// Operation used to get all the keys of all side-effects as produced by a previously executed Traversal.
- /// </summary>
- [Obsolete("As of release 3.3.8, not replaced, prefer use of cap()-step to retrieve side-effects as part of traversal iteration", false)]
- public static string OpsKeys = "keys";
-
- /// <summary>
/// Operation used to get all the keys of all side-effects as produced by a previously executed Traversal.
/// </summary>
public static string OpsClose = "close";
@@ -91,24 +79,6 @@ namespace Gremlin.Net.Driver
public static string ArgsGremlin = "gremlin";
/// <summary>
- /// Argument name that allows to specify the unique identifier for the request.
- /// </summary>
- [Obsolete("As of release 3.3.8, not replaced, prefer use of cap()-step to retrieve side-effects as part of traversal iteration", false)]
- public static string ArgsSideEffect = "sideEffect";
-
- /// <summary>
- /// Argument name that allows to specify the key for a specific side-effect.
- /// </summary>
- [Obsolete("As of release 3.3.8, not replaced, prefer use of cap()-step to retrieve side-effects as part of traversal iteration", false)]
- public static string ArgsSideEffectKey = "sideEffectKey";
-
- /// <summary>
- /// <see cref="ResponseMessage{T}" /> argument that describes how side-effect data should be treated.
- /// </summary>
- [Obsolete("As of release 3.3.8, not replaced, prefer use of cap()-step to retrieve side-effects as part of traversal iteration", false)]
- public static string ArgsAggregateTo = "aggregateTo";
-
- /// <summary>
/// Argument name that allows to change the flavor of Gremlin used (e.g. gremlin-groovy).
/// </summary>
public static string ArgsLanguage = "language";
@@ -124,11 +94,5 @@ namespace Gremlin.Net.Driver
/// authentication mechanism required by the server.
/// </summary>
public static string ArgsSasl = "sasl";
-
- [Obsolete("As of release 3.3.8, not replaced, prefer use of cap()-step to retrieve side-effects as part of traversal iteration", false)]
- internal static string ValAggregateToMap = "map";
-
- [Obsolete("As of release 3.3.8, not replaced, prefer use of cap()-step to retrieve side-effects as part of traversal iteration", false)]
- internal static string ValAggregateToBulkSet = "bulkset";
}
}
\ No newline at end of file
diff --git a/gremlin-dotnet/src/Gremlin.Net/Process/Remote/RemoteStrategy.cs b/gremlin-dotnet/src/Gremlin.Net/Process/Remote/RemoteStrategy.cs
index 098a46d..d361ac4 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Process/Remote/RemoteStrategy.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Process/Remote/RemoteStrategy.cs
@@ -54,7 +54,6 @@ namespace Gremlin.Net.Process.Remote
{
if (traversal.Traversers != null) return;
var remoteTraversal = await _remoteConnection.SubmitAsync<S, E>(traversal.Bytecode).ConfigureAwait(false);
- traversal.SideEffects = remoteTraversal.SideEffects;
traversal.Traversers = remoteTraversal.Traversers;
}
}
diff --git a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/DefaultTraversal.cs b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/DefaultTraversal.cs
index 2b6d378..3124715 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/DefaultTraversal.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/DefaultTraversal.cs
@@ -42,12 +42,6 @@ namespace Gremlin.Net.Process.Traversal
public Bytecode Bytecode { get; protected set; }
/// <summary>
- /// Gets or sets the <see cref="ITraversalSideEffects" /> of this traversal.
- /// </summary>
- [Obsolete("As of release 3.3.8, not replaced, prefer use of cap()-step to retrieve side-effects as part of traversal iteration", false)]
- public ITraversalSideEffects SideEffects { get; set; }
-
- /// <summary>
/// Gets or sets the <see cref="Traverser" />'s of this traversal that hold the results of the traversal.
/// </summary>
public IEnumerable<Traverser> Traversers { get; set; }
@@ -71,7 +65,6 @@ namespace Gremlin.Net.Process.Traversal
/// <inheritdoc />
public void Dispose()
{
- Dispose(true);
}
/// <inheritdoc />
@@ -261,15 +254,6 @@ namespace Gremlin.Net.Process.Traversal
return objs;
}
- /// <inheritdoc />
- protected virtual void Dispose(bool disposing)
- {
- if (disposing)
- #pragma warning disable 612,618
- SideEffects?.Dispose();
- #pragma warning disable 612,618
- }
-
/// <summary>
/// Starts a promise to execute a function on the current traversal that will be completed in the future.
/// </summary>
diff --git a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/ITraversal.cs b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/ITraversal.cs
index 22f792a..39c88d1 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/ITraversal.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/ITraversal.cs
@@ -40,13 +40,6 @@ namespace Gremlin.Net.Process.Traversal
Bytecode Bytecode { get; }
/// <summary>
- /// Gets or sets the <see cref="ITraversalSideEffects" /> of this traversal.
- /// </summary>
- #pragma warning disable 612,618
- ITraversalSideEffects SideEffects { get; set; }
- #pragma warning disable 612,618
-
- /// <summary>
/// Gets or sets the <see cref="Traverser" />'s of this traversal that hold the results of the traversal.
/// </summary>
IEnumerable<Traverser> Traversers { get; set; }
diff --git a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/ITraversalSideEffects.cs b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/ITraversalSideEffects.cs
deleted file mode 100644
index d8d9fc1..0000000
--- a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/ITraversalSideEffects.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-#region License
-
-/*
- * 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.
- */
-
-#endregion
-
-using System;
-using System.Collections.Generic;
-
-namespace Gremlin.Net.Process.Traversal
-{
- /// <summary>
- /// A <see cref="ITraversal" /> can maintain global sideEffects.
- /// </summary>
- [Obsolete("As of release 3.3.8, not replaced, prefer use of cap()-step to retrieve side-effects as part of traversal iteration", false)]
- public interface ITraversalSideEffects : IDisposable
- {
- /// <summary>
- /// Retrieves the keys of the side-effect that can be supplied to <see cref="Get" />.
- /// </summary>
- /// <returns>The keys of the side-effect.</returns>
- IReadOnlyCollection<string> Keys();
-
- /// <summary>
- /// Gets the side-effect associated with the provided key.
- /// </summary>
- /// <param name="key">The key to get the value for.</param>
- /// <returns>The value associated with key.</returns>
- object Get(string key);
-
- /// <summary>
- /// Invalidates the side effect cache for traversal.
- /// </summary>
- void Close();
- }
-}
\ No newline at end of file
diff --git a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/TextP.cs b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/TextP.cs
index 3047f75..e57e69f 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/TextP.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/TextP.cs
@@ -22,11 +22,8 @@
#endregion
// THIS IS A GENERATED FILE - DO NOT MODIFY THIS FILE DIRECTLY - see pom.xml
-using System;
-using System.Collections;
using System.Collections.Generic;
using System.Linq;
-using System.Reflection;
namespace Gremlin.Net.Process.Traversal
{
diff --git a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Process/Traversal/DriverRemoteConnection/SideEffectTests.cs b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Process/Traversal/DriverRemoteConnection/SideEffectTests.cs
deleted file mode 100644
index 5d98f97..0000000
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Process/Traversal/DriverRemoteConnection/SideEffectTests.cs
+++ /dev/null
@@ -1,160 +0,0 @@
-#region License
-
-/*
- * 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.
- */
-
-#endregion
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Gremlin.Net.Process.Traversal;
-using Xunit;
-
-namespace Gremlin.Net.IntegrationTest.Process.Traversal.DriverRemoteConnection
-{
- public class SideEffectTests
- {
- private readonly RemoteConnectionFactory _connectionFactory = new RemoteConnectionFactory();
-
- [Fact]
- public void ShouldReturnCachedSideEffectWhenGetIsCalledAfterClose()
- {
- var connection = _connectionFactory.CreateRemoteConnection();
- var g = AnonymousTraversalSource.Traversal().WithRemote(connection);
- var t = g.V().Aggregate("a").Iterate();
-
- t.SideEffects.Get("a");
- t.SideEffects.Close();
- var results = t.SideEffects.Get("a");
-
- Assert.NotNull(results);
- }
-
- [Fact]
- public void ShouldThrowWhenGetIsCalledAfterCloseAndNoSideEffectsAreCachec()
- {
- var connection = _connectionFactory.CreateRemoteConnection();
- var g = AnonymousTraversalSource.Traversal().WithRemote(connection);
- var t = g.V().Aggregate("a").Iterate();
-
- t.SideEffects.Close();
- Assert.Throws<InvalidOperationException>(() => t.SideEffects.Get("a"));
- }
-
- [Fact]
- public void ShouldThrowWhenGetIsCalledAfterDisposeAndNoSideEffectsAreCachec()
- {
- var connection = _connectionFactory.CreateRemoteConnection();
- var g = AnonymousTraversalSource.Traversal().WithRemote(connection);
- var t = g.V().Aggregate("a").Iterate();
-
- t.SideEffects.Dispose();
- Assert.Throws<InvalidOperationException>(() => t.SideEffects.Get("a"));
- }
-
- [Fact]
- public void ShouldThrowWhenGetIsCalledWithAnUnknownKey()
- {
- var connection = _connectionFactory.CreateRemoteConnection();
- var g = AnonymousTraversalSource.Traversal().WithRemote(connection);
- var t = g.V().Iterate();
-
- Assert.Throws<KeyNotFoundException>(() => t.SideEffects.Get("m"));
- }
-
- [Fact]
- public void ShouldReturnAnEmptyCollectionWhenKeysIsCalledForTraversalWithoutSideEffect()
- {
- var connection = _connectionFactory.CreateRemoteConnection();
- var g = AnonymousTraversalSource.Traversal().WithRemote(connection);
-
- var t = g.V().Iterate();
- var keys = t.SideEffects.Keys();
-
- Assert.Equal(0, keys.Count);
- }
-
- [Fact]
- public void ShouldReturnCachedKeysWhenForCloseAfterSomeGet()
- {
- var connection = _connectionFactory.CreateRemoteConnection();
- var g = AnonymousTraversalSource.Traversal().WithRemote(connection);
- var t = g.V().Aggregate("a").Aggregate("b").Iterate();
-
- t.SideEffects.Get("a");
- t.SideEffects.Close();
- var keys = t.SideEffects.Keys();
-
- Assert.Equal(2, keys.Count);
- Assert.Contains("a", keys);
- Assert.Contains("b", keys);
- }
-
- [Fact]
- public void ShouldReturnSideEffectKeyWhenKeysIsCalledForNamedGroupCount()
- {
- var connection = _connectionFactory.CreateRemoteConnection();
- var g = AnonymousTraversalSource.Traversal().WithRemote(connection);
- var t = g.V().Out("created").GroupCount("m").By("name").Iterate();
-
- var keys = t.SideEffects.Keys();
-
- var keysList = keys.ToList();
- Assert.Equal(1, keysList.Count);
- Assert.Contains("m", keysList);
- }
-
- [Fact]
- public async Task ShouldReturnSideEffectsKeysWhenKeysIsCalledOnTraversalThatExecutedAsynchronously()
- {
- var connection = _connectionFactory.CreateRemoteConnection();
- var g = AnonymousTraversalSource.Traversal().WithRemote(connection);
-
- var t = await g.V().Aggregate("a").Promise(x => x);
- var keys = t.SideEffects.Keys();
-
- Assert.Equal(1, keys.Count);
- Assert.Contains("a", keys);
- }
-
- [Fact]
- public async Task ShouldReturnSideEffectValueWhenGetIsCalledOnTraversalThatExecutedAsynchronously()
- {
- var connection = _connectionFactory.CreateRemoteConnection();
- var g = AnonymousTraversalSource.Traversal().WithRemote(connection);
-
- var t = await g.V().Aggregate("a").Promise(x => x);
- var value = t.SideEffects.Get("a");
-
- Assert.NotNull(value);
- }
-
- [Fact]
- public async Task ShouldNotThrowWhenCloseIsCalledOnTraversalThatExecutedAsynchronously()
- {
- var connection = _connectionFactory.CreateRemoteConnection();
- var g = AnonymousTraversalSource.Traversal().WithRemote(connection);
-
- var t = await g.V().Aggregate("a").Promise(x => x);
- t.SideEffects.Close();
- }
- }
-}
\ No newline at end of file
diff --git a/gremlin-dotnet/test/Gremlin.Net.UnitTest/Process/Traversal/TraversalTests.cs b/gremlin-dotnet/test/Gremlin.Net.UnitTest/Process/Traversal/TraversalTests.cs
index a7d62ac..e773f74 100644
--- a/gremlin-dotnet/test/Gremlin.Net.UnitTest/Process/Traversal/TraversalTests.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.UnitTest/Process/Traversal/TraversalTests.cs
@@ -24,7 +24,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
-using Moq;
using Xunit;
using Gremlin.Net.Process.Traversal;
@@ -180,16 +179,5 @@ namespace Gremlin.Net.UnitTest.Process.Traversal
var expectedObjs = UnfoldBulks(objs, bulks);
Assert.Equal(expectedObjs, traversedObjs);
}
-
- [Fact]
- public void ShouldDisposeSideEffectsWhenDisposeIsCalled()
- {
- var sideEffectsMock = new Mock<ITraversalSideEffects>();
- var traversal = new TestTraversal(new List<object>()) {SideEffects = sideEffectsMock.Object};
-
- traversal.Dispose();
-
- sideEffectsMock.Verify(m => m.Dispose());
- }
}
}
\ No newline at end of file
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Handler.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Handler.java
index 74cf761..40231ec 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Handler.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Handler.java
@@ -223,29 +223,15 @@ final class Handler {
final Object data = response.getResult().getData();
final Map<String,Object> meta = response.getResult().getMeta();
- if (!meta.containsKey(Tokens.ARGS_SIDE_EFFECT_KEY)) {
- // this is a "result" from the server which is either the result of a script or a
- // serialized traversal
- if (data instanceof List) {
- // unrolls the collection into individual results to be handled by the queue.
- final List<Object> listToUnroll = (List<Object>) data;
- listToUnroll.forEach(item -> queue.add(new Result(item)));
- } else {
- // since this is not a list it can just be added to the queue
- queue.add(new Result(response.getResult().getData()));
- }
+ // this is a "result" from the server which is either the result of a script or a
+ // serialized traversal
+ if (data instanceof List) {
+ // unrolls the collection into individual results to be handled by the queue.
+ final List<Object> listToUnroll = (List<Object>) data;
+ listToUnroll.forEach(item -> queue.add(new Result(item)));
} else {
- // this is the side-effect from the server which is generated from a serialized traversal
- final String aggregateTo = meta.getOrDefault(Tokens.ARGS_AGGREGATE_TO, Tokens.VAL_AGGREGATE_TO_NONE).toString();
- if (data instanceof List) {
- // unrolls the collection into individual results to be handled by the queue.
- final List<Object> listOfSideEffects = (List<Object>) data;
- listOfSideEffects.forEach(sideEffect -> queue.addSideEffect(aggregateTo, sideEffect));
- } else {
- // since this is not a list it can just be added to the queue. this likely shouldn't occur
- // however as the protocol will typically push everything to list first.
- queue.addSideEffect(aggregateTo, data);
- }
+ // since this is not a list it can just be added to the queue
+ queue.add(new Result(response.getResult().getData()));
}
} else {
// this is a "success" but represents no results otherwise it is an error
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ResultQueue.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ResultQueue.java
index 29a6453..8ce4fba 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ResultQueue.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ResultQueue.java
@@ -18,21 +18,15 @@
*/
package org.apache.tinkerpop.gremlin.driver;
-import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
-import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
-import org.apache.tinkerpop.gremlin.process.traversal.step.util.BulkSet;
import org.javatuples.Pair;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Queue;
-import java.util.Set;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.LinkedBlockingQueue;
@@ -74,65 +68,6 @@ final class ResultQueue {
tryDrainNextWaiting(false);
}
- /**
- * Adds a side-effect to the queue which may later be read by the {@link ResultSet}. Note that the side-effect
- * is only returned when a {@link Traversal} is submitted and refers to the side-effects defined in that traversal.
- * A "script" will not return side-effects.
- *
- * @param aggregateTo the value of the {@link ResponseMessage} metadata for {@link Tokens#ARGS_AGGREGATE_TO}.
- * @param sideEffectValue the value of the side-effect itself
- * @deprecated As of release 3.3.8, not directly replaced in the protocol as side-effect retrieval after
- * traversal iteration is not being promoted anymore as a feature.
- */
- @Deprecated
- public void addSideEffect(final String aggregateTo, final Object sideEffectValue) {
- switch (aggregateTo) {
- case Tokens.VAL_AGGREGATE_TO_BULKSET:
- if (!(sideEffectValue instanceof Traverser.Admin))
- throw new IllegalStateException(String.format("Side-effect value %s is a %s which does not aggregate to %s",
- sideEffectValue, sideEffectValue.getClass().getSimpleName(), aggregateTo));
-
- if (null == aggregatedResult) aggregatedResult = new BulkSet();
-
- final BulkSet<Object> bs = validate(aggregateTo, BulkSet.class);
- final Traverser.Admin traverser = (Traverser.Admin) sideEffectValue;
- bs.add(traverser.get(), traverser.bulk());
- break;
- case Tokens.VAL_AGGREGATE_TO_LIST:
- if (null == aggregatedResult) aggregatedResult = new ArrayList();
- final List<Object> list = validate(aggregateTo, List.class);
- list.add(sideEffectValue);
- break;
- case Tokens.VAL_AGGREGATE_TO_SET:
- if (null == aggregatedResult) aggregatedResult = new HashSet();
- final Set<Object> set = validate(aggregateTo, Set.class);
- set.add(sideEffectValue);
- break;
- case Tokens.VAL_AGGREGATE_TO_MAP:
- if (!(sideEffectValue instanceof Map.Entry) && !(sideEffectValue instanceof Map))
- throw new IllegalStateException(String.format("Side-effect value %s is a %s which does not aggregate to %s",
- sideEffectValue, sideEffectValue.getClass().getSimpleName(), aggregateTo));
-
- // some serialization formats (e.g. graphson) may deserialize a Map.Entry to a Map with a single entry
- if (sideEffectValue instanceof Map && ((Map) sideEffectValue).size() != 1)
- throw new IllegalStateException(String.format("Side-effect value %s is a %s which does not aggregate to %s as it is a Map that does not have one entry",
- sideEffectValue, sideEffectValue.getClass().getSimpleName(), aggregateTo));
-
- if (null == aggregatedResult) aggregatedResult = new HashMap();
-
- final Map<Object,Object > m = validate(aggregateTo, Map.class);
- final Map.Entry entry = sideEffectValue instanceof Map.Entry ?
- (Map.Entry) sideEffectValue : (Map.Entry) ((Map) sideEffectValue).entrySet().iterator().next();
- m.put(entry.getKey(), entry.getValue());
- break;
- case Tokens.VAL_AGGREGATE_TO_NONE:
- if (null == aggregatedResult) aggregatedResult = sideEffectValue;
- break;
- default:
- throw new IllegalStateException(String.format("%s is an invalid value for %s", aggregateTo, Tokens.ARGS_AGGREGATE_TO));
- }
- }
-
private <V> V validate(final String aggregateTo, final Class<?> expected) {
if (!(expected.isAssignableFrom(aggregatedResult.getClass())))
throw new IllegalStateException(String.format("Side-effect \"%s\" contains the type %s that is not acceptable for %s",
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Tokens.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Tokens.java
index 94d04de..327ef5f 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Tokens.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Tokens.java
@@ -32,21 +32,8 @@ public final class Tokens {
public static final String OPS_INVALID = "invalid";
public static final String OPS_CLOSE = "close";
- /**
- * @deprecated As of release 3.3.8, not directly replaced in the protocol as side-effect retrieval after
- * traversal iteration is not being promoted anymore as a feature.
- */
- @Deprecated
- public static final String OPS_GATHER = "gather";
-
- /**
- * @deprecated As of release 3.3.8, not directly replaced in the protocol as side-effect retrieval after
- * traversal iteration is not being promoted anymore as a feature.
- */
- @Deprecated
- public static final String OPS_KEYS = "keys";
-
public static final String REQUEST_ID = "requestId";
+
public static final String ARGS_BATCH_SIZE = "batchSize";
public static final String ARGS_BINDINGS = "bindings";
public static final String ARGS_ALIASES = "aliases";
@@ -59,64 +46,8 @@ public final class Tokens {
public static final String ARGS_MANAGE_TRANSACTION = "manageTransaction";
public static final String ARGS_SASL = "sasl";
public static final String ARGS_SASL_MECHANISM = "saslMechanism";
-
- /**
- * @deprecated As of release 3.3.8, not directly replaced in the protocol as side-effect retrieval after
- * traversal iteration is not being promoted anymore as a feature.
- */
- @Deprecated
- public static final String ARGS_SIDE_EFFECT = "sideEffect";
-
- /**
- * @deprecated As of release 3.3.8, not directly replaced in the protocol as side-effect retrieval after
- * traversal iteration is not being promoted anymore as a feature.
- */
- @Deprecated
- public static final String ARGS_AGGREGATE_TO = "aggregateTo";
-
- /**
- * @deprecated As of release 3.3.8, not directly replaced in the protocol as side-effect retrieval after
- * traversal iteration is not being promoted anymore as a feature.
- */
- @Deprecated
- public static final String ARGS_SIDE_EFFECT_KEY = "sideEffectKey";
public static final String ARGS_USER_AGENT = "userAgent";
- /**
- * @deprecated As of release 3.3.8, not directly replaced in the protocol as side-effect retrieval after
- * traversal iteration is not being promoted anymore as a feature.
- */
- @Deprecated
- public static final String VAL_AGGREGATE_TO_BULKSET = "bulkset";
-
- /**
- * @deprecated As of release 3.3.8, not directly replaced in the protocol as side-effect retrieval after
- * traversal iteration is not being promoted anymore as a feature.
- */
- @Deprecated
- public static final String VAL_AGGREGATE_TO_LIST = "list";
-
- /**
- * @deprecated As of release 3.3.8, not directly replaced in the protocol as side-effect retrieval after
- * traversal iteration is not being promoted anymore as a feature.
- */
- @Deprecated
- public static final String VAL_AGGREGATE_TO_MAP = "map";
-
- /**
- * @deprecated As of release 3.3.8, not directly replaced in the protocol as side-effect retrieval after
- * traversal iteration is not being promoted anymore as a feature.
- */
- @Deprecated
- public static final String VAL_AGGREGATE_TO_NONE = "none";
-
- /**
- * @deprecated As of release 3.3.8, not directly replaced in the protocol as side-effect retrieval after
- * traversal iteration is not being promoted anymore as a feature.
- */
- @Deprecated
- public static final String VAL_AGGREGATE_TO_SET = "set";
-
public static final String VAL_TRAVERSAL_SOURCE_ALIAS = "g";
public static final String STATUS_ATTRIBUTE_EXCEPTIONS = "exceptions";
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/remote/DriverRemoteTraversal.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/remote/DriverRemoteTraversal.java
index c1c9e65..54e7cc8 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/remote/DriverRemoteTraversal.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/remote/DriverRemoteTraversal.java
@@ -23,12 +23,10 @@ import org.apache.tinkerpop.gremlin.driver.Client;
import org.apache.tinkerpop.gremlin.driver.Result;
import org.apache.tinkerpop.gremlin.driver.ResultSet;
import org.apache.tinkerpop.gremlin.process.remote.traversal.AbstractRemoteTraversal;
-import org.apache.tinkerpop.gremlin.process.remote.traversal.RemoteTraversalSideEffects;
import org.apache.tinkerpop.gremlin.process.remote.traversal.RemoteTraverser;
import org.apache.tinkerpop.gremlin.process.remote.traversal.step.map.RemoteStep;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
-import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal;
import org.apache.tinkerpop.gremlin.process.traversal.traverser.util.EmptyTraverser;
import org.apache.tinkerpop.gremlin.structure.Element;
import org.apache.tinkerpop.gremlin.structure.Graph;
@@ -53,7 +51,6 @@ public class DriverRemoteTraversal<S, E> extends AbstractRemoteTraversal<S, E> {
private final Iterator<Traverser.Admin<E>> traversers;
private Traverser.Admin<E> lastTraverser = EmptyTraverser.instance();
- private final RemoteTraversalSideEffects sideEffects;
public DriverRemoteTraversal(final ResultSet rs, final Client client, final boolean attach, final Optional<Configuration> conf) {
// attaching is really just for testing purposes. it doesn't make sense in any real-world scenario as it would
@@ -66,23 +63,6 @@ public class DriverRemoteTraversal<S, E> extends AbstractRemoteTraversal<S, E> {
} else {
this.traversers = new TraverserIterator<>(rs.iterator());
}
-
- this.sideEffects = new DriverRemoteTraversalSideEffects(client,rs);
- }
-
- /**
- * Gets a side-effect from the server. Do not call this method prior to completing the iteration of the
- * {@link DriverRemoteTraversal} that spawned this as the side-effect will not be ready. Generally
- * speaking, the common user would not get side-effects this way - they would use a call to {@code cap()}.
- *
- * @deprecated as of release 3.3.8, not directly replaced, see {@link Admin#getSideEffects()} for more information,
- * but further note that this method is not being removed, but will not be functional for remote execution. Prefer
- * {@link GraphTraversal#cap(String, String...)} to get side-effects as part of traversal iteration.
- */
- @Override
- @Deprecated
- public RemoteTraversalSideEffects getSideEffects() {
- return this.sideEffects;
}
@Override
@@ -117,17 +97,6 @@ public class DriverRemoteTraversal<S, E> extends AbstractRemoteTraversal<S, E> {
}
}
- /**
- * Releases server-side resources related to this traversal (i.e. clearing the side-effect cache of data related to
- * this traversal.
- */
- @Override
- public void close() throws Exception {
- sideEffects.close();
-
- // leave the client open as it is owned by the DriverRemoteConnection not the traversal or side-effects
- }
-
static class TraverserIterator<E> implements Iterator<Traverser.Admin<E>> {
private final Iterator<Result> inner;
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/remote/DriverRemoteTraversalSideEffects.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/remote/DriverRemoteTraversalSideEffects.java
deleted file mode 100644
index baf54f3..0000000
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/remote/DriverRemoteTraversalSideEffects.java
+++ /dev/null
@@ -1,193 +0,0 @@
-/*
- * 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.driver.remote;
-
-import org.apache.commons.lang3.exception.ExceptionUtils;
-import org.apache.tinkerpop.gremlin.driver.Client;
-import org.apache.tinkerpop.gremlin.driver.Host;
-import org.apache.tinkerpop.gremlin.driver.Result;
-import org.apache.tinkerpop.gremlin.driver.ResultSet;
-import org.apache.tinkerpop.gremlin.driver.Tokens;
-import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.process.remote.traversal.AbstractRemoteTraversalSideEffects;
-import org.apache.tinkerpop.gremlin.process.traversal.TraversalSideEffects;
-import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-import java.util.concurrent.CompletableFuture;
-
-/**
- * Java driver implementation of {@link TraversalSideEffects}. This class is not thread safe.
- *
- * @author Stephen Mallette (http://stephen.genoprime.com)
- * @deprecated As of release 3.3.8, not directly replaced, prefer use of {@link GraphTraversal#cap(String, String...)}
- * to return the result as part of the traversal iteration.
- */
-@Deprecated
-public class DriverRemoteTraversalSideEffects extends AbstractRemoteTraversalSideEffects {
-
- private final Client client;
- private Set<String> keys = Collections.emptySet();
- private final UUID serverSideEffect;
- private final Host host;
-
- private final Map<String, Object> sideEffects = new HashMap<>();
-
- private boolean closed = false;
- private boolean retrievedAllKeys = false;
- private final CompletableFuture<Void> ready;
- private final CompletableFuture<Map<String,Object>> statusAttributes;
-
- /**
- * @deprecated As of release 3.4.0, replaced by {@link #DriverRemoteTraversalSideEffects(Client, ResultSet)}
- */
- @Deprecated
- public DriverRemoteTraversalSideEffects(final Client client, final UUID serverSideEffect, final Host host,
- final CompletableFuture<Void> ready) {
- this.client = client;
- this.serverSideEffect = serverSideEffect;
- this.host = host;
- this.ready = ready;
- this.statusAttributes = CompletableFuture.completedFuture(Collections.emptyMap());
- }
-
- public DriverRemoteTraversalSideEffects(final Client client, final ResultSet rs) {
- this.client = client;
- this.serverSideEffect = rs.getOriginalRequestMessage().getRequestId();
- this.host = rs.getHost();
- this.ready = rs.allItemsAvailableAsync();
- this.statusAttributes = rs.statusAttributes();
- }
-
- /**
- * Gets the status attributes from the response from the server. This method will block until all results have
- * been retrieved.
- */
- public Map<String,Object> statusAttributes() {
- // wait for the read to complete (i.e. iteration on the server) before allowing the caller to get the
- // attribute. simply following the pattern from other methods here for now.
- return statusAttributes.join();
- }
-
- @Override
- public <V> V get(final String key) throws IllegalArgumentException {
- // wait for the read to complete (i.e. iteration on the server) before allowing the caller to get the
- // side-effect. calling prior to this will result in the side-effect not being found. of course, the
- // bad part here is that the method blocks indefinitely waiting for the result, but it prevents the
- // test failure problems that happen on slower systems. in practice, it's unlikely that a user would
- // try to get a side-effect prior to iteration, but since the API allows it, this at least prevents
- // the error.
- ready.join();
-
- if (!keys().contains(key)) throw TraversalSideEffects.Exceptions.sideEffectKeyDoesNotExist(key);
-
- if (!sideEffects.containsKey(key)) {
-
- if (closed) throw new IllegalStateException("Traversal has been closed - no new side-effects can be retrieved");
-
- // specify the ARGS_HOST so that the LoadBalancingStrategy is subverted and the connection is forced
- // from the specified host (i.e. the host from the previous request as that host will hold the side-effects)
- final RequestMessage msg = RequestMessage.build(Tokens.OPS_GATHER)
- .addArg(Tokens.ARGS_SIDE_EFFECT, serverSideEffect)
- .addArg(Tokens.ARGS_SIDE_EFFECT_KEY, key)
- .addArg(Tokens.ARGS_HOST, host)
- .processor("traversal").create();
- try {
- final Result result = client.submitAsync(msg).get().all().get().get(0);
- sideEffects.put(key, null == result ? null : result.getObject());
- } catch (Exception ex) {
- // we use to try to catch "no found" situations returned from the server here and then null the
- // side-effect for the requested key. doesn't seem like there is a need for that now because calls
- // to get() now initially trigger a call the keys() so you would know all of the keys available on
- // the server and would validate them up front throwing sideEffectKeyDoesNotExist(key) which thus
- // produces behavior similar to the non-remote side-effect implementations. if we get an exception
- // here at this point then we likely have a legit error in communicating to the remote server.
- throw new RuntimeException("Could not get side-effect for " + serverSideEffect + " with key of " + key, ex);
- }
- }
-
- return (V) sideEffects.get(key);
- }
-
- @Override
- public Set<String> keys() {
- // wait for the read to complete (i.e. iteration on the server) before allowing the caller to get the
- // side-effect. calling prior to this will result in the side-effect not being found. of course, the
- // bad part here is that the method blocks indefinitely waiting for the result, but it prevents the
- // test failure problems that happen on slower systems. in practice, it's unlikely that a user would
- // try to get a side-effect prior to iteration, but since the API allows it, this at least prevents
- // the error.
- ready.join();
-
- if (closed && !retrievedAllKeys) throw new IllegalStateException("Traversal has been closed - side-effect keys cannot be retrieved");
-
- if (!retrievedAllKeys) {
- // specify the ARGS_HOST so that the LoadBalancingStrategy is subverted and the connection is forced
- // from the specified host (i.e. the host from the previous request as that host will hold the side-effects)
- final RequestMessage msg = RequestMessage.build(Tokens.OPS_KEYS)
- .addArg(Tokens.ARGS_SIDE_EFFECT, serverSideEffect)
- .addArg(Tokens.ARGS_HOST, host)
- .processor("traversal").create();
- try {
- if (keys.equals(Collections.emptySet()))
- keys = new HashSet<>();
-
- client.submitAsync(msg).get().all().get().forEach(r -> keys.add(r.getString()));
-
- // only need to retrieve all keys once
- retrievedAllKeys = true;
- } catch (Exception ex) {
- final Throwable root = ExceptionUtils.getRootCause(ex);
- throw new RuntimeException("Could not get keys", null == root ? ex : root);
- }
- }
-
- return keys;
- }
-
- @Override
- public void close() throws Exception {
- if (!closed) {
- final RequestMessage msg = RequestMessage.build(Tokens.OPS_CLOSE)
- .addArg(Tokens.ARGS_SIDE_EFFECT, serverSideEffect)
- .addArg(Tokens.ARGS_HOST, host)
- .processor("traversal").create();
- try {
- client.submitAsync(msg).get();
- closed = true;
- } catch (Exception ex) {
- final Throwable root = ExceptionUtils.getRootCause(ex);
- throw new RuntimeException("Error on closing side effects", null == root ? ex : root);
- }
- }
- }
-
- @Override
- public String toString() {
- // have to override the implementation from TraversalSideEffects because it relies on calls to keys() as
- // calling that too early can cause unintended failures (i.e. in the debugger, toString() gets called when
- // introspecting the object from the moment of construction).
- return "sideEffects[size:" + keys.size() + "]";
- }
-}
diff --git a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ResultQueueTest.java b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ResultQueueTest.java
index 75afb74..4ca4664 100644
--- a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ResultQueueTest.java
+++ b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ResultQueueTest.java
@@ -19,16 +19,12 @@
package org.apache.tinkerpop.gremlin.driver;
import org.apache.commons.lang3.exception.ExceptionUtils;
-import org.apache.tinkerpop.gremlin.process.remote.traversal.DefaultRemoteTraverser;
-import org.apache.tinkerpop.gremlin.process.traversal.step.util.BulkSet;
import org.junit.Test;
import java.util.ArrayList;
import java.util.HashMap;
-import java.util.HashSet;
import java.util.List;
import java.util.Map;
-import java.util.Set;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
@@ -153,7 +149,7 @@ public class ResultQueueTest extends AbstractResultQueueTest {
}
@Test
- public void shouldAwaitFailTheFutureOnMarkError() throws Exception {
+ public void shouldAwaitFailTheFutureOnMarkError() {
final CompletableFuture<List<Result>> future = resultQueue.await(4);
resultQueue.add(new Result("test1"));
resultQueue.add(new Result("test2"));
@@ -298,128 +294,4 @@ public class ResultQueueTest extends AbstractResultQueueTest {
t.interrupt();
}
}
-
- @Test
- public void shouldHandleBulkSetSideEffects() throws Exception {
- final CompletableFuture<List<Result>> o = resultQueue.await(1);
- assertThat(o.isDone(), is(false));
-
- resultQueue.addSideEffect(Tokens.VAL_AGGREGATE_TO_BULKSET, new DefaultRemoteTraverser<>("brian", 2));
- assertThat(o.isDone(), is(false));
-
- resultQueue.addSideEffect(Tokens.VAL_AGGREGATE_TO_BULKSET, new DefaultRemoteTraverser<>("brian", 2));
- assertThat(o.isDone(), is(false));
-
- resultQueue.addSideEffect(Tokens.VAL_AGGREGATE_TO_BULKSET, new DefaultRemoteTraverser<>("belinda", 6));
- assertThat(o.isDone(), is(false));
-
- resultQueue.markComplete(ATTRIBUTES);
-
- assertThat(o.isDone(), is(true));
- final BulkSet<String> bulkSet = o.get().get(0).get(BulkSet.class);
- assertEquals(4, bulkSet.get("brian"));
- assertEquals(6, bulkSet.get("belinda"));
-
- assertEquals("that", resultQueue.getStatusAttributes().get("this"));
- }
-
- @Test
- public void shouldHandleListSideEffects() throws Exception {
- final CompletableFuture<List<Result>> o = resultQueue.await(1);
- assertThat(o.isDone(), is(false));
-
- resultQueue.addSideEffect(Tokens.VAL_AGGREGATE_TO_LIST, "stephen");
- assertThat(o.isDone(), is(false));
-
- resultQueue.addSideEffect(Tokens.VAL_AGGREGATE_TO_LIST, "daniel");
- assertThat(o.isDone(), is(false));
-
- resultQueue.addSideEffect(Tokens.VAL_AGGREGATE_TO_LIST, "dave");
- assertThat(o.isDone(), is(false));
-
- resultQueue.markComplete(ATTRIBUTES);
-
- assertThat(o.isDone(), is(true));
- final List<String> list = o.get().get(0).get(ArrayList.class);
- assertEquals("stephen", list.get(0));
- assertEquals("daniel", list.get(1));
- assertEquals("dave", list.get(2));
-
- assertEquals("that", resultQueue.getStatusAttributes().get("this"));
- }
-
- @Test
- public void shouldHandleSetSideEffects() throws Exception {
- final CompletableFuture<List<Result>> o = resultQueue.await(1);
- assertThat(o.isDone(), is(false));
-
- resultQueue.addSideEffect(Tokens.VAL_AGGREGATE_TO_SET, "stephen");
- assertThat(o.isDone(), is(false));
-
- resultQueue.addSideEffect(Tokens.VAL_AGGREGATE_TO_SET, "daniel");
- assertThat(o.isDone(), is(false));
-
- resultQueue.addSideEffect(Tokens.VAL_AGGREGATE_TO_SET, "dave");
- assertThat(o.isDone(), is(false));
-
- resultQueue.markComplete(ATTRIBUTES);
-
- assertThat(o.isDone(), is(true));
- final Set<String> set = o.get().get(0).get(HashSet.class);
- assertThat(set.contains("stephen"), is(true));
- assertThat(set.contains("daniel"), is(true));
- assertThat(set.contains("dave"), is(true));
-
- assertEquals("that", resultQueue.getStatusAttributes().get("this"));
- }
-
- @Test
- public void shouldHandleMapSideEffects() throws Exception {
- final CompletableFuture<List<Result>> o = resultQueue.await(1);
- assertThat(o.isDone(), is(false));
-
- final Map<String,String> m = new HashMap<>();
- m.put("s", "stephen");
- m.put("m", "marko");
- m.put("d", "daniel");
-
- m.entrySet().forEach(e -> {
- resultQueue.addSideEffect(Tokens.VAL_AGGREGATE_TO_MAP, e);
- assertThat(o.isDone(), is(false));
- });
-
- resultQueue.markComplete(ATTRIBUTES);
-
- assertThat(o.isDone(), is(true));
- final Map<String, String> list = o.get().get(0).get(HashMap.class);
- assertEquals("stephen", list.get("s"));
- assertEquals("daniel", list.get("d"));
- assertEquals("marko", list.get("m"));
-
- assertEquals("that", resultQueue.getStatusAttributes().get("this"));
- }
-
-
- @Test
- public void shouldHandleNotAggregateSideEffects() throws Exception {
- final CompletableFuture<List<Result>> o = resultQueue.await(1);
- assertThat(o.isDone(), is(false));
-
- final Map<String,String> m = new HashMap<>();
- m.put("s", "stephen");
- m.put("m", "marko");
- m.put("d", "daniel");
-
- resultQueue.addSideEffect(Tokens.VAL_AGGREGATE_TO_NONE, m);
-
- resultQueue.markComplete(ATTRIBUTES);
-
- assertThat(o.isDone(), is(true));
- final Map<String, String> list = o.get().get(0).get(HashMap.class);
- assertEquals("stephen", list.get("s"));
- assertEquals("daniel", list.get("d"));
- assertEquals("marko", list.get("m"));
-
- assertEquals("that", resultQueue.getStatusAttributes().get("this"));
- }
}
diff --git a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/DriverRemoteTraversalSideEffectsTest.java b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/DriverRemoteTraversalSideEffectsTest.java
deleted file mode 100644
index 4e6df93..0000000
--- a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/DriverRemoteTraversalSideEffectsTest.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * 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.driver.remote;
-
-import org.apache.tinkerpop.gremlin.driver.AbstractResultQueueTest;
-import org.apache.tinkerpop.gremlin.driver.Client;
-import org.apache.tinkerpop.gremlin.driver.ResultSet;
-import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
-import org.apache.tinkerpop.gremlin.process.traversal.TraversalSideEffects;
-import org.junit.Test;
-import org.mockito.stubbing.Answer;
-
-import java.util.UUID;
-import java.util.concurrent.CompletableFuture;
-
-import static org.hamcrest.core.IsInstanceOf.instanceOf;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.fail;
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-/**
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public class DriverRemoteTraversalSideEffectsTest extends AbstractResultQueueTest {
-
- @Test
- public void shouldNotContactRemoteForKeysAfterCloseIsCalled() throws Exception {
- final Client client = mock(Client.class);
- mockClientForCall(client);
- mockClientForCall(client);
-
- final UUID sideEffectKey = UUID.fromString("31dec2c6-b214-4a6f-a68b-996608dce0d9");
- final CompletableFuture<Void> ready = new CompletableFuture<>();
- ready.complete(null);
- final TraversalSideEffects sideEffects = new DriverRemoteTraversalSideEffects(client, sideEffectKey, null, ready);
-
- assertEquals(1, sideEffects.keys().size());
- sideEffects.close();
-
- // call this again and again and it will only hit the cached keys - no more server calls
- assertEquals(1, sideEffects.keys().size());
- assertEquals(1, sideEffects.keys().size());
- assertEquals(1, sideEffects.keys().size());
- assertEquals(1, sideEffects.keys().size());
-
- // once for the keys and once for the close message
- verify(client, times(2)).submitAsync(any(RequestMessage.class));
- }
-
- @Test
- public void shoudlNotContactRemoteForGetAfterCloseIsCalled() throws Exception {
- final Client client = mock(Client.class);
- mockClientForCall(client);
- mockClientForCall(client);
- final UUID sideEffectKey = UUID.fromString("31dec2c6-b214-4a6f-a68b-996608dce0d9");
- final CompletableFuture<Void> ready = new CompletableFuture<>();
- ready.complete(null);
- final TraversalSideEffects sideEffects = new DriverRemoteTraversalSideEffects(client, sideEffectKey, null, ready);
-
- assertNotNull(sideEffects.get("test-0"));
- sideEffects.close();
-
- // Side effect 'a' should be cached locally
- assertNotNull(sideEffects.get("test-0"));
- assertNotNull(sideEffects.get("test-0"));
- assertNotNull(sideEffects.get("test-0"));
-
- // Once for keys, once for get and once for close
- verify(client, times(3)).submitAsync(any(RequestMessage.class));
- }
-
- @Test
- public void shouldNotContactRemoteMoreThanOnceForClose() throws Exception {
- final Client client = mock(Client.class);
- mockClientForCall(client);
-
- final UUID sideEffectKey = UUID.fromString("31dec2c6-b214-4a6f-a68b-996608dce0d9");
- final CompletableFuture<Void> ready = new CompletableFuture<>();
- ready.complete(null);
- final TraversalSideEffects sideEffects = new DriverRemoteTraversalSideEffects(client, sideEffectKey, null, ready);
-
- sideEffects.close();
- sideEffects.close();
- sideEffects.close();
- sideEffects.close();
- sideEffects.close();
-
- try {
- sideEffects.keys();
- fail("The traversal is closed");
- } catch (Exception ex) {
- assertThat(ex, instanceOf(IllegalStateException.class));
- assertEquals("Traversal has been closed - side-effect keys cannot be retrieved", ex.getMessage());
- }
-
- try {
- sideEffects.get("a");
- fail("The traversal is closed");
- } catch (Exception ex) {
- assertThat(ex, instanceOf(IllegalStateException.class));
- assertEquals("Traversal has been closed - side-effect keys cannot be retrieved", ex.getMessage());
- }
-
- // once for the close message
- verify(client, times(1)).submitAsync(any(RequestMessage.class));
- }
-
- private void mockClientForCall(final Client client) throws Exception {
- // the return is just generic garbage from addToQueue for any call to submitAsync().
- when(client.submitAsync(any(RequestMessage.class))).thenAnswer((Answer<Object>) invocationOnMock -> {
- final ResultSet returnedResultSet = new ResultSet(resultQueue, pool, readCompleted, RequestMessage.build("traversal").create(), null);
- addToQueue(1, 0, true, true, 1);
- final CompletableFuture<ResultSet> returnedFuture = new CompletableFuture<>();
- returnedFuture.complete(returnedResultSet);
- return returnedFuture;
- });
- }
-}
diff --git a/gremlin-python/glv/TraversalSource.template b/gremlin-python/glv/TraversalSource.template
index 8a8b04d..3d4c79c 100644
--- a/gremlin-python/glv/TraversalSource.template
+++ b/gremlin-python/glv/TraversalSource.template
@@ -27,7 +27,6 @@ class Traversal(object):
self.graph = graph
self.traversal_strategies = traversal_strategies
self.bytecode = bytecode
- self.side_effects = TraversalSideEffects()
self.traversers = None
self.last_traverser = None
@@ -108,7 +107,6 @@ class Traversal(object):
future.set_exception(e)
else:
self.traversers = iter(traversal.traversers)
- self.side_effects = traversal.side_effects
if cb:
try:
result = cb(self)
@@ -251,25 +249,6 @@ class Traverser(object):
'''
-TRAVERSAL SIDE-EFFECTS
-'''
-
-
-class TraversalSideEffects(object):
- def keys(self):
- return set()
-
- def get(self, key):
- raise KeyError(key)
-
- def __getitem__(self, key):
- return self.get(key)
-
- def __repr__(self):
- return "sideEffects[size:" + str(len(self.keys())) + "]"
-
-
-'''
TRAVERSAL STRATEGIES
'''
diff --git a/gremlin-python/src/main/jython/gremlin_python/driver/driver_remote_connection.py b/gremlin-python/src/main/jython/gremlin_python/driver/driver_remote_connection.py
index dcd2fa3..18b3f3e 100644
--- a/gremlin-python/src/main/jython/gremlin_python/driver/driver_remote_connection.py
+++ b/gremlin-python/src/main/jython/gremlin_python/driver/driver_remote_connection.py
@@ -20,7 +20,7 @@ from concurrent.futures import Future
from gremlin_python.driver import client, serializer
from gremlin_python.driver.remote_connection import (
- RemoteConnection, RemoteTraversal, RemoteTraversalSideEffects)
+ RemoteConnection, RemoteTraversal)
__author__ = 'David M. Brown (davebshow@gmail.com)'
@@ -52,9 +52,7 @@ class DriverRemoteConnection(RemoteConnection):
def submit(self, bytecode):
result_set = self._client.submit(bytecode)
results = result_set.all().result()
- side_effects = RemoteTraversalSideEffects(result_set.request_id, self._client,
- result_set.status_attributes)
- return RemoteTraversal(iter(results), side_effects)
+ return RemoteTraversal(iter(results))
def submitAsync(self, bytecode):
future = Future()
@@ -64,9 +62,7 @@ class DriverRemoteConnection(RemoteConnection):
try:
result_set = f.result()
results = result_set.all().result()
- side_effects = RemoteTraversalSideEffects(result_set.request_id, self._client,
- result_set.status_attributes)
- future.set_result(RemoteTraversal(iter(results), side_effects))
+ future.set_result(RemoteTraversal(iter(results)))
except Exception as e:
future.set_exception(e)
diff --git a/gremlin-python/src/main/jython/gremlin_python/driver/remote_connection.py b/gremlin-python/src/main/jython/gremlin_python/driver/remote_connection.py
index e2893a0..4f3d3d1 100644
--- a/gremlin-python/src/main/jython/gremlin_python/driver/remote_connection.py
+++ b/gremlin-python/src/main/jython/gremlin_python/driver/remote_connection.py
@@ -48,95 +48,9 @@ class RemoteConnection(object):
class RemoteTraversal(traversal.Traversal):
- def __init__(self, traversers, side_effects):
+ def __init__(self, traversers):
super(RemoteTraversal, self).__init__(None, None, None)
self.traversers = traversers
- self._side_effects = side_effects
-
- @property
- def side_effects(self):
- return self._side_effects
-
- @side_effects.setter
- def side_effects(self, val):
- self._side_effects = val
-
-
-class RemoteTraversalSideEffects(traversal.TraversalSideEffects):
- def __init__(self, side_effect, client, status_attributes):
- self._side_effect = side_effect
- self._client = client
- self._keys = set()
- self._side_effects = {}
- self._closed = False
- self._status_attributes = status_attributes
-
- @property
- def status_attributes(self):
- return self._status_attributes
-
- def keys(self):
- if not self._closed:
- message = request.RequestMessage(
- 'traversal', 'keys',
- {'sideEffect': self._side_effect,
- 'aliases': {'g': self._client.traversal_source}})
- self._keys = set(self._client.submit(message).all().result())
- return self._keys
-
- def get(self, key):
-
- if not self._side_effects.get(key):
- if not self._closed:
- message = request.RequestMessage(
- 'traversal', 'gather',
- {'sideEffect': self._side_effect, 'sideEffectKey': key,
- 'aliases': {'g': self._client.traversal_source}})
- results = self._aggregate_results(self._client.submit(message))
- self._side_effects[key] = results
- self._keys.add(key)
- else:
- return None
- return self._side_effects[key]
-
- def close(self):
- if not self._closed:
- message = request.RequestMessage(
- 'traversal', 'close',
- {'sideEffect': self._side_effect,
- 'aliases': {'g': self._client._traversal_source}})
- results = self._client.submit(message).all().result()
- self._closed = True
- return results
-
- def _aggregate_results(self, result_set):
- aggregates = {'list': [], 'set': set(), 'map': {}, 'bulkset': {},
- 'none': None}
- results = None
- for msg in result_set:
- if results is None:
- aggregate_to = result_set.aggregate_to
- results = aggregates.get(aggregate_to, [])
- # on first message, get the right result data structure
- # if there is no update to a structure, then the item is the result
- if results is None:
- results = msg[0]
- # updating a map is different than a list or a set
- elif isinstance(results, dict):
- if aggregate_to == "map":
- for item in msg:
- results.update(item)
- else:
- for item in msg:
- results[item.object] = item.bulk
- elif isinstance(results, set):
- results.update(msg)
- # flat add list to result list
- else:
- results += msg
- if results is None:
- results = []
- return results
class RemoteStrategy(traversal.TraversalStrategy):
@@ -148,7 +62,6 @@ class RemoteStrategy(traversal.TraversalStrategy):
if traversal.traversers is None:
remote_traversal = self.remote_connection.submit(traversal.bytecode)
traversal.remote_results = remote_traversal
- traversal.side_effects = remote_traversal.side_effects
traversal.traversers = remote_traversal.traversers
def apply_async(self, traversal):
diff --git a/gremlin-python/src/main/jython/gremlin_python/process/traversal.py b/gremlin-python/src/main/jython/gremlin_python/process/traversal.py
index e5a9bbc..a934e18 100644
--- a/gremlin-python/src/main/jython/gremlin_python/process/traversal.py
+++ b/gremlin-python/src/main/jython/gremlin_python/process/traversal.py
@@ -27,7 +27,6 @@ class Traversal(object):
self.graph = graph
self.traversal_strategies = traversal_strategies
self.bytecode = bytecode
- self.side_effects = TraversalSideEffects()
self.traversers = None
self.last_traverser = None
@@ -108,7 +107,6 @@ class Traversal(object):
future.set_exception(e)
else:
self.traversers = iter(traversal.traversers)
- self.side_effects = traversal.side_effects
if cb:
try:
result = cb(self)
@@ -534,25 +532,6 @@ class Traverser(object):
'''
-TRAVERSAL SIDE-EFFECTS
-'''
-
-
-class TraversalSideEffects(object):
- def keys(self):
- return set()
-
- def get(self, key):
- raise KeyError(key)
-
- def __getitem__(self, key):
- return self.get(key)
-
- def __repr__(self):
- return "sideEffects[size:" + str(len(self.keys())) + "]"
-
-
-'''
TRAVERSAL STRATEGIES
'''
diff --git 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
index 2ecd113..6212a14 100644
--- 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
@@ -168,118 +168,6 @@ class TestDriverRemoteConnection(object):
assert 6 == g.V().count().next()
assert 6 == g.E().count().next()
- 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"]
- assert isinstance(m["lop"], long)
- assert isinstance(m["ripple"], long)
-
- # 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):
- t.side_effects.value_lambda('b')
-
- def test_promise(self, remote_connection):
- g = traversal().withRemote(remote_connection)
- future = g.V().aggregate('a').promise()
- t = future.result()
- assert len(t.toList()) == 6
- a, = t.side_effects.keys()
- assert a == 'a'
- results = t.side_effects.get('a')
- assert results
- results = t.side_effects.close()
- assert not results
-
def test_in_tornado_app(remote_connection):
# Make sure nothing weird with loops
diff --git a/gremlin-python/src/test/java/org/apache/tinkerpop/gremlin/python/jsr223/JythonTranslatorTest.java b/gremlin-python/src/test/java/org/apache/tinkerpop/gremlin/python/jsr223/JythonTranslatorTest.java
index 5e9b31a..8f33dbc 100644
--- a/gremlin-python/src/test/java/org/apache/tinkerpop/gremlin/python/jsr223/JythonTranslatorTest.java
+++ b/gremlin-python/src/test/java/org/apache/tinkerpop/gremlin/python/jsr223/JythonTranslatorTest.java
@@ -82,8 +82,6 @@ public class JythonTranslatorTest {
assertEquals(5, sacks.get(3).intValue());
assertEquals(6, sacks.get(4).intValue());
assertEquals(7, sacks.get(5).intValue());
- //
- assertEquals(24, t.getSideEffects().<Number>get("lengthSum").intValue());
}
@Test
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/traversal/TraversalOpProcessor.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/traversal/TraversalOpProcessor.java
index e9a0ce8..c94c07d 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/traversal/TraversalOpProcessor.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/traversal/TraversalOpProcessor.java
@@ -19,8 +19,6 @@
package org.apache.tinkerpop.gremlin.server.op.traversal;
import com.codahale.metrics.Timer;
-import com.github.benmanes.caffeine.cache.Cache;
-import com.github.benmanes.caffeine.cache.Caffeine;
import io.netty.channel.ChannelHandlerContext;
import org.apache.tinkerpop.gremlin.driver.MessageSerializer;
import org.apache.tinkerpop.gremlin.driver.Tokens;
@@ -30,7 +28,6 @@ import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode;
import org.apache.tinkerpop.gremlin.jsr223.JavaTranslator;
import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
-import org.apache.tinkerpop.gremlin.process.traversal.TraversalSideEffects;
import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource;
import org.apache.tinkerpop.gremlin.process.traversal.util.BytecodeHelper;
import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalInterruptedException;
@@ -44,7 +41,6 @@ import org.apache.tinkerpop.gremlin.server.handler.StateKey;
import org.apache.tinkerpop.gremlin.server.op.AbstractOpProcessor;
import org.apache.tinkerpop.gremlin.server.op.OpProcessorException;
import org.apache.tinkerpop.gremlin.server.util.MetricManager;
-import org.apache.tinkerpop.gremlin.server.util.SideEffectIterator;
import org.apache.tinkerpop.gremlin.server.util.TraverserIterator;
import org.apache.tinkerpop.gremlin.structure.Graph;
import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper;
@@ -58,13 +54,10 @@ import javax.script.Bindings;
import javax.script.SimpleBindings;
import java.lang.reflect.UndeclaredThrowableException;
import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Optional;
-import java.util.UUID;
import java.util.concurrent.Future;
import java.util.concurrent.FutureTask;
import java.util.concurrent.TimeUnit;
@@ -82,58 +75,6 @@ public class TraversalOpProcessor extends AbstractOpProcessor {
public static final String OP_PROCESSOR_NAME = "traversal";
public static final Timer traversalOpTimer = MetricManager.INSTANCE.getTimer(name(GremlinServer.class, "op", "traversal"));
- public static final Settings.ProcessorSettings DEFAULT_SETTINGS = new Settings.ProcessorSettings();
-
- /**
- * Configuration setting for how long a cached side-effect will be available before it is evicted from the cache.
- *
- * @deprecated As of release 3.3.8, not directly replaced in the protocol as side-effect retrieval after
- * traversal iteration is not being promoted anymore as a feature.
- */
- @Deprecated
- public static final String CONFIG_CACHE_EXPIRATION_TIME = "cacheExpirationTime";
-
- /**
- * Default timeout for a cached side-effect is ten minutes.
- *
- * @deprecated As of release 3.3.8, not directly replaced in the protocol as side-effect retrieval after
- * traversal iteration is not being promoted anymore as a feature.
- */
- @Deprecated
- public static final long DEFAULT_CACHE_EXPIRATION_TIME = 600000;
-
- /**
- * Configuration setting for the maximum number of entries the cache will have.
- *
- * @deprecated As of release 3.3.8, not directly replaced in the protocol as side-effect retrieval after
- * traversal iteration is not being promoted anymore as a feature.
- */
- @Deprecated
- public static final String CONFIG_CACHE_MAX_SIZE = "cacheMaxSize";
-
- /**
- * Default size of the max size of the cache.
- *
- * @deprecated As of release 3.3.8, not directly replaced in the protocol as side-effect retrieval after
- * traversal iteration is not being promoted anymore as a feature.
- */
- @Deprecated
- public static final long DEFAULT_CACHE_MAX_SIZE = 1000;
-
- static {
- DEFAULT_SETTINGS.className = TraversalOpProcessor.class.getCanonicalName();
- DEFAULT_SETTINGS.config = new HashMap<String, Object>() {{
- put(CONFIG_CACHE_EXPIRATION_TIME, DEFAULT_CACHE_EXPIRATION_TIME);
- put(CONFIG_CACHE_MAX_SIZE, DEFAULT_CACHE_MAX_SIZE);
- }};
- }
-
- /**
- * @deprecated As of release 3.3.8, not directly replaced in the protocol as side-effect retrieval after
- * traversal iteration is not being promoted anymore as a feature.
- */
- protected static Cache<UUID, TraversalSideEffects> cache = null;
-
private static final Bindings EMPTY_BINDINGS = new SimpleBindings();
public TraversalOpProcessor() {
@@ -151,23 +92,6 @@ public class TraversalOpProcessor extends AbstractOpProcessor {
}
@Override
- public void init(final Settings settings) {
- final Settings.ProcessorSettings processorSettings = settings.processors.stream()
- .filter(p -> p.className.equals(TraversalOpProcessor.class.getCanonicalName()))
- .findAny().orElse(TraversalOpProcessor.DEFAULT_SETTINGS);
- final long maxSize = Long.parseLong(processorSettings.config.get(TraversalOpProcessor.CONFIG_CACHE_MAX_SIZE).toString());
- final long expirationTime = Long.parseLong(processorSettings.config.get(TraversalOpProcessor.CONFIG_CACHE_EXPIRATION_TIME).toString());
-
- cache = Caffeine.newBuilder()
- .expireAfterWrite(expirationTime, TimeUnit.MILLISECONDS)
- .maximumSize(maxSize)
- .build();
-
- logger.info("Initialized cache for {} with size {} and expiration time of {} ms",
- TraversalOpProcessor.class.getSimpleName(), maxSize, expirationTime);
- }
-
- @Override
public ThrowingConsumer<Context> select(final Context context) throws OpProcessorException {
final RequestMessage message = context.getRequestMessage();
logger.debug("Selecting processor for RequestMessage {}", message);
@@ -178,62 +102,6 @@ public class TraversalOpProcessor extends AbstractOpProcessor {
validateTraversalSourceAlias(context, message, validateTraversalRequest(message));
op = this::iterateBytecodeTraversal;
break;
- case Tokens.OPS_GATHER:
- final Optional<String> sideEffectForGather = message.optionalArgs(Tokens.ARGS_SIDE_EFFECT);
- if (!sideEffectForGather.isPresent()) {
- final String msg = String.format("A message with an [%s] op code requires a [%s] argument.", Tokens.OPS_GATHER, Tokens.ARGS_SIDE_EFFECT);
- throw new OpProcessorException(msg, ResponseMessage.build(message).code(ResponseStatusCode.REQUEST_ERROR_INVALID_REQUEST_ARGUMENTS).statusMessage(msg).create());
- }
-
- final Optional<String> sideEffectKey = message.optionalArgs(Tokens.ARGS_SIDE_EFFECT_KEY);
- if (!sideEffectKey.isPresent()) {
- final String msg = String.format("A message with an [%s] op code requires a [%s] argument.", Tokens.OPS_GATHER, Tokens.ARGS_SIDE_EFFECT_KEY);
- throw new OpProcessorException(msg, ResponseMessage.build(message).code(ResponseStatusCode.REQUEST_ERROR_INVALID_REQUEST_ARGUMENTS).statusMessage(msg).create());
- }
-
- validateTraversalSourceAlias(context, message, validatedAliases(message).get());
-
- op = this::gatherSideEffect;
-
- break;
- case Tokens.OPS_KEYS:
- final Optional<String> sideEffectForKeys = message.optionalArgs(Tokens.ARGS_SIDE_EFFECT);
- if (!sideEffectForKeys.isPresent()) {
- final String msg = String.format("A message with an [%s] op code requires a [%s] argument.", Tokens.OPS_GATHER, Tokens.ARGS_SIDE_EFFECT);
- throw new OpProcessorException(msg, ResponseMessage.build(message).code(ResponseStatusCode.REQUEST_ERROR_INVALID_REQUEST_ARGUMENTS).statusMessage(msg).create());
- }
-
- op = varRhc -> {
- final RequestMessage msg = context.getRequestMessage();
- final Optional<UUID> sideEffect = msg.optionalArgs(Tokens.ARGS_SIDE_EFFECT);
- final TraversalSideEffects sideEffects = cache.getIfPresent(sideEffect.get());
-
- if (null == sideEffects)
- logger.warn("Request for side-effect keys on {} returned no side-effects in the cache", sideEffect.get());
-
- handleIterator(varRhc, null == sideEffects ? Collections.emptyIterator() : sideEffects.keys().iterator());
- };
-
- break;
- case Tokens.OPS_CLOSE:
- final Optional<String> sideEffectForClose = message.optionalArgs(Tokens.ARGS_SIDE_EFFECT);
- if (!sideEffectForClose.isPresent()) {
- final String msg = String.format("A message with an [%s] op code requires a [%s] argument.", Tokens.OPS_CLOSE, Tokens.ARGS_SIDE_EFFECT);
- throw new OpProcessorException(msg, ResponseMessage.build(message).code(ResponseStatusCode.REQUEST_ERROR_INVALID_REQUEST_ARGUMENTS).statusMessage(msg).create());
- }
-
- op = varRhc -> {
- final RequestMessage msg = context.getRequestMessage();
- logger.debug("Close request {} for in thread {}", msg.getRequestId(), Thread.currentThread().getName());
-
- final Optional<UUID> sideEffect = msg.optionalArgs(Tokens.ARGS_SIDE_EFFECT);
- cache.invalidate(sideEffect.get());
-
- final String successMessage = String.format("Successfully cleared side effect cache for [%s].", Tokens.ARGS_SIDE_EFFECT);
- varRhc.writeAndFlush(ResponseMessage.build(message).code(ResponseStatusCode.NO_CONTENT).statusMessage(successMessage).create());
- };
-
- break;
case Tokens.OPS_INVALID:
final String msgInvalid = String.format("Message could not be parsed. Check the format of the request. [%s]", message);
throw new OpProcessorException(msgInvalid, ResponseMessage.build(message).code(ResponseStatusCode.REQUEST_ERROR_MALFORMED_REQUEST).statusMessage(msgInvalid).create());
@@ -278,78 +146,6 @@ public class TraversalOpProcessor extends AbstractOpProcessor {
return aliases;
}
- private void gatherSideEffect(final Context context) throws OpProcessorException {
- final RequestMessage msg = context.getRequestMessage();
- logger.debug("Side-effect request {} for in thread {}", msg.getRequestId(), Thread.currentThread().getName());
-
- // earlier validation in selection of this op method should free us to cast this without worry
- final Optional<UUID> sideEffect = msg.optionalArgs(Tokens.ARGS_SIDE_EFFECT);
- final Optional<String> sideEffectKey = msg.optionalArgs(Tokens.ARGS_SIDE_EFFECT_KEY);
- final Map<String, String> aliases = (Map<String, String>) msg.optionalArgs(Tokens.ARGS_ALIASES).get();
-
- final GraphManager graphManager = context.getGraphManager();
- final String traversalSourceName = aliases.entrySet().iterator().next().getValue();
- final TraversalSource g = graphManager.getTraversalSource(traversalSourceName);
-
- final Timer.Context timerContext = traversalOpTimer.time();
- try {
- final ChannelHandlerContext ctx = context.getChannelHandlerContext();
- final Graph graph = g.getGraph();
-
- context.getGremlinExecutor().getExecutorService().submit(() -> {
- try {
- beforeProcessing(graph, context);
-
- try {
- final TraversalSideEffects sideEffects = cache.getIfPresent(sideEffect.get());
-
- if (null == sideEffects) {
- final String errorMessage = String.format("Could not find side-effects for %s.", sideEffect.get());
- logger.warn(errorMessage);
- context.writeAndFlush(ResponseMessage.build(msg).code(ResponseStatusCode.SERVER_ERROR).statusMessage(errorMessage).create());
- onError(graph, context);
- return;
- }
-
- if (!sideEffects.exists(sideEffectKey.get())) {
- final String errorMessage = String.format("Could not find side-effect key for %s in %s.", sideEffectKey.get(), sideEffect.get());
- logger.warn(errorMessage);
- context.writeAndFlush(ResponseMessage.build(msg).code(ResponseStatusCode.SERVER_ERROR).statusMessage(errorMessage).create());
- onError(graph, context);
- return;
- }
-
- handleIterator(context, new SideEffectIterator(sideEffects.get(sideEffectKey.get()), sideEffectKey.get()));
- } catch (Exception ex) {
- logger.warn(String.format("Exception processing a side-effect on iteration for request [%s].", msg.getRequestId()), ex);
- context.writeAndFlush(ResponseMessage.build(msg).code(ResponseStatusCode.SERVER_ERROR)
- .statusMessage(ex.getMessage())
- .statusAttributeException(ex).create());
- onError(graph, context);
- return;
- }
-
- onSideEffectSuccess(graph, context);
- } catch (Exception ex) {
- logger.warn(String.format("Exception processing a side-effect on request [%s].", msg.getRequestId()), ex);
- context.writeAndFlush(ResponseMessage.build(msg).code(ResponseStatusCode.SERVER_ERROR)
- .statusMessage(ex.getMessage())
- .statusAttributeException(ex).create());
- onError(graph, context);
- } finally {
- timerContext.stop();
- }
- });
-
- } catch (Exception ex) {
- timerContext.stop();
- throw new OpProcessorException("Could not iterate the side-effect instance",
- ResponseMessage.build(msg).code(ResponseStatusCode.SERVER_ERROR)
- .statusMessage(ex.getMessage())
- .statusAttributeException(ex).create());
- }
- }
-
private void iterateBytecodeTraversal(final Context context) throws Exception {
final RequestMessage msg = context.getRequestMessage();
logger.debug("Traversal request {} for in thread {}", msg.getRequestId(), Thread.currentThread().getName());
@@ -439,16 +235,6 @@ public class TraversalOpProcessor extends AbstractOpProcessor {
}
}
- @Override
- protected void iterateComplete(final ChannelHandlerContext ctx, final RequestMessage msg, final Iterator itty) {
- if (itty instanceof TraverserIterator) {
- final Traversal.Admin traversal = ((TraverserIterator) itty).getTraversal();
- if (!traversal.getSideEffects().isEmpty()) {
- cache.put(msg.getRequestId(), traversal.getSideEffects());
- }
- }
- }
-
protected void beforeProcessing(final Graph graph, final Context ctx) {
if (graph.features().graph().supportsTransactions() && graph.tx().isOpen()) graph.tx().rollback();
}
@@ -467,30 +253,6 @@ public class TraversalOpProcessor extends AbstractOpProcessor {
if (graph.features().graph().supportsTransactions() && graph.tx().isOpen()) graph.tx().rollback();
}
- @Override
- protected Map<String, Object> generateResultMetaData(final ChannelHandlerContext ctx, final RequestMessage msg,
- final ResponseStatusCode code, final Iterator itty,
- final Settings settings) {
- // leaving this overriding the deprecated version of this method because it provides a decent test to those
- // who might have their own OpProcessor implementations that apply meta-data. leaving this alone helps validate
- // that the upgrade path is clean. it can be removed at the next breaking change 3.5.0
- Map<String, Object> metaData = Collections.emptyMap();
- if (itty instanceof SideEffectIterator) {
- final SideEffectIterator traversalIterator = (SideEffectIterator) itty;
- final String key = traversalIterator.getSideEffectKey();
- if (key != null) {
- metaData = new HashMap<>();
- metaData.put(Tokens.ARGS_SIDE_EFFECT_KEY, key);
- metaData.put(Tokens.ARGS_AGGREGATE_TO, traversalIterator.getSideEffectAggregator());
- }
- } else {
- // this is a standard traversal iterator
- metaData = super.generateResultMetaData(ctx, msg, code, itty, settings);
- }
-
- return metaData;
- }
-
protected void handleIterator(final Context context, final Iterator itty, final Graph graph) throws InterruptedException {
final ChannelHandlerContext nettyContext = context.getChannelHandlerContext();
final RequestMessage msg = context.getRequestMessage();
@@ -502,11 +264,7 @@ public class TraversalOpProcessor extends AbstractOpProcessor {
// we have an empty iterator - happens on stuff like: g.V().iterate()
if (!itty.hasNext()) {
final Map<String, Object> attributes = generateStatusAttributes(nettyContext, msg, ResponseStatusCode.NO_CONTENT, itty, settings);
- // if it was a g.V().iterate(), then be sure to add the side-effects to the cache
- if (itty instanceof TraverserIterator &&
- !((TraverserIterator)itty).getTraversal().getSideEffects().isEmpty()) {
- cache.put(msg.getRequestId(), ((TraverserIterator)itty).getTraversal().getSideEffects());
- }
+
// as there is nothing left to iterate if we are transaction managed then we should execute a
// commit here before we send back a NO_CONTENT which implies success
onTraversalSuccess(graph, context);
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/util/SideEffectIterator.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/util/SideEffectIterator.java
deleted file mode 100644
index 2544634..0000000
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/util/SideEffectIterator.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * 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.util;
-
-import org.apache.tinkerpop.gremlin.driver.Tokens;
-import org.apache.tinkerpop.gremlin.process.remote.traversal.DefaultRemoteTraverser;
-import org.apache.tinkerpop.gremlin.process.traversal.step.util.BulkSet;
-import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
-
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public class SideEffectIterator implements Iterator<Object> {
-
- private final Iterator<Object> sideEffectIterator;
- private final String sideEffectKey;
- private final String sideEffectAggregator;
-
- public SideEffectIterator(final Object sideEffect, final String sideEffectKey) {
- this.sideEffectKey = sideEffectKey;
- sideEffectAggregator = getAggregatorType(sideEffect);
- sideEffectIterator = sideEffect instanceof BulkSet ?
- new BulkSetIterator((BulkSet) sideEffect) :
- IteratorUtils.asIterator(sideEffect);
- }
-
- public String getSideEffectKey() {
- return sideEffectKey;
- }
-
- public String getSideEffectAggregator() {
- return sideEffectAggregator;
- }
-
- @Override
- public boolean hasNext() {
- return sideEffectIterator.hasNext();
- }
-
- @Override
- public Object next() {
- return sideEffectIterator.next();
- }
-
- private String getAggregatorType(final Object o) {
- if (o instanceof BulkSet)
- return Tokens.VAL_AGGREGATE_TO_BULKSET;
- else if (o instanceof Set)
- return Tokens.VAL_AGGREGATE_TO_SET;
- else if (o instanceof Iterable || o instanceof Iterator)
- return Tokens.VAL_AGGREGATE_TO_LIST;
- else if (o instanceof Map)
- return Tokens.VAL_AGGREGATE_TO_MAP;
- else
- return Tokens.VAL_AGGREGATE_TO_NONE;
- }
-
- static class BulkSetIterator implements Iterator {
-
- private final Iterator<Map.Entry<Object,Long>> itty;
-
- public BulkSetIterator(final BulkSet<Object> bulkSet) {
- itty = bulkSet.asBulk().entrySet().iterator();
- }
-
- @Override
- public boolean hasNext() {
- return itty.hasNext();
- }
-
- @Override
- public Object next() {
- final Map.Entry<Object, Long> entry = itty.next();
- return new DefaultRemoteTraverser<>(entry.getKey(), entry.getValue());
- }
- }
-}
\ No newline at end of file
diff --git 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
index 4379329..ad80a9b 100644
--- 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
@@ -40,7 +40,6 @@ import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage;
import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode;
import org.apache.tinkerpop.gremlin.driver.remote.DriverRemoteConnection;
-import org.apache.tinkerpop.gremlin.driver.remote.DriverRemoteTraversalSideEffects;
import org.apache.tinkerpop.gremlin.driver.ser.Serializers;
import org.apache.tinkerpop.gremlin.driver.simple.SimpleClient;
import org.apache.tinkerpop.gremlin.groovy.jsr223.GremlinGroovyScriptEngine;
@@ -49,10 +48,8 @@ import org.apache.tinkerpop.gremlin.groovy.jsr223.customizer.SimpleSandboxExtens
import org.apache.tinkerpop.gremlin.jsr223.ScriptFileGremlinPlugin;
import org.apache.tinkerpop.gremlin.structure.RemoteGraph;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
-import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
-import org.apache.tinkerpop.gremlin.process.traversal.step.util.BulkSet;
import org.apache.tinkerpop.gremlin.server.handler.OpSelectorHandler;
import org.apache.tinkerpop.gremlin.server.op.AbstractEvalOpProcessor;
import org.apache.tinkerpop.gremlin.server.op.standard.StandardOpProcessor;
@@ -1123,178 +1120,6 @@ public class GremlinServerIntegrateTest extends AbstractGremlinServerIntegration
}
@Test
- public void shouldGetSideEffectKeysAndStatusUsingWithRemote() throws Exception {
- final GraphTraversalSource g = traversal().withRemote(conf);
- g.addV("person").property("age", 20).iterate();
- g.addV("person").property("age", 10).iterate();
- final GraphTraversal traversal = g.V().aggregate("a").aggregate("b");
- traversal.iterate();
- final DriverRemoteTraversalSideEffects se = (DriverRemoteTraversalSideEffects) traversal.asAdmin().getSideEffects();
- assertThat(se.statusAttributes().containsKey(Tokens.ARGS_HOST), is(true));
-
- // Get keys
- final Set<String> sideEffectKeys = se.keys();
- assertEquals(2, sideEffectKeys.size());
-
- // Get side effects
- final BulkSet aSideEffects = se.get("a");
- assertThat(aSideEffects.isEmpty(), is(false));
- final BulkSet bSideEffects = se.get("b");
- assertThat(bSideEffects.isEmpty(), is(false));
-
- // Should get local keys/side effects after close
- se.close();
-
- final Set<String> localSideEffectKeys = se.keys();
- assertEquals(2, localSideEffectKeys.size());
-
- final BulkSet localASideEffects = se.get("a");
- assertThat(localASideEffects.isEmpty(), is(false));
-
- final BulkSet localBSideEffects = se.get("b");
- assertThat(localBSideEffects.isEmpty(), is(false));
-
- final GraphTraversal gdotv = g.V();
- gdotv.toList();
- final DriverRemoteTraversalSideEffects gdotvSe = (DriverRemoteTraversalSideEffects) gdotv.asAdmin().getSideEffects();
- assertThat(gdotvSe.statusAttributes().containsKey(Tokens.ARGS_HOST), is(true));
- }
-
- @Test
- public void shouldCloseSideEffectsUsingWithRemote() throws Exception {
- final GraphTraversalSource g = traversal().withRemote(conf);
- g.addV("person").property("age", 20).iterate();
- g.addV("person").property("age", 10).iterate();
- final GraphTraversal traversal = g.V().aggregate("a").aggregate("b");
- traversal.iterate();
- final DriverRemoteTraversalSideEffects se = (DriverRemoteTraversalSideEffects) traversal.asAdmin().getSideEffects();
- final BulkSet sideEffects = se.get("a");
- assertThat(sideEffects.isEmpty(), is(false));
- se.close();
-
- // Can't get new side effects after close
- try {
- se.get("b");
- fail("The traversal is closed");
- } catch (Exception ex) {
- assertThat(ex, instanceOf(IllegalStateException.class));
- assertEquals("Traversal has been closed - no new side-effects can be retrieved", ex.getMessage());
- }
-
- // Earlier keys should be cached locally
- final Set<String> localSideEffectKeys = se.keys();
- assertEquals(2, localSideEffectKeys.size());
- final BulkSet localSideEffects = se.get("a");
- assertThat(localSideEffects.isEmpty(), is(false));
-
- // Try to get side effect from server
- final Cluster cluster = TestClientFactory.open();
- final Client client = cluster.connect();
- final Field field = DriverRemoteTraversalSideEffects.class.getDeclaredField("serverSideEffect");
- field.setAccessible(true);
- final UUID serverSideEffectId = (UUID) field.get(se);
- final Map<String, String> aliases = new HashMap<>();
- aliases.put("g", "g");
- final RequestMessage msg = RequestMessage.build(Tokens.OPS_GATHER)
- .addArg(Tokens.ARGS_SIDE_EFFECT, serverSideEffectId)
- .addArg(Tokens.ARGS_SIDE_EFFECT_KEY, "b")
- .addArg(Tokens.ARGS_ALIASES, aliases)
- .processor("traversal").create();
- boolean error;
- try {
- client.submitAsync(msg).get().one();
- error = false;
- } catch (Exception ex) {
- error = true;
- }
- assertThat(error, is(true));
- }
-
- @Test
- public void shouldBlockWhenGettingSideEffectKeysUsingWithRemote() throws Exception {
- final GraphTraversalSource g = traversal().withRemote(conf);
- g.addV("person").property("age", 20).iterate();
- g.addV("person").property("age", 10).iterate();
- final GraphTraversal traversal = g.V().aggregate("a")
- .sideEffect(Lambda.consumer("{Thread.sleep(3000)}"))
- .aggregate("b");
-
- // force strategy application - if this doesn't happen then getSideEffects() returns DefaultTraversalSideEffects
- traversal.hasNext();
-
- // start a separate thread to iterate
- final Thread t = new Thread(traversal::iterate);
- t.start();
-
- // blocks here until traversal iteration is complete
- final DriverRemoteTraversalSideEffects se = (DriverRemoteTraversalSideEffects) traversal.asAdmin().getSideEffects();
-
- // Get keys
- final Set<String> sideEffectKeys = se.keys();
- assertEquals(2, sideEffectKeys.size());
-
- // Get side effects
- final BulkSet aSideEffects = se.get("a");
- assertThat(aSideEffects.isEmpty(), is(false));
- final BulkSet bSideEffects = se.get("b");
- assertThat(bSideEffects.isEmpty(), is(false));
-
- // Should get local keys/side effects after close
- se.close();
-
- final Set<String> localSideEffectKeys = se.keys();
- assertEquals(2, localSideEffectKeys.size());
-
- final BulkSet localASideEffects = se.get("a");
- assertThat(localASideEffects.isEmpty(), is(false));
-
- final BulkSet localBSideEffects = se.get("b");
- assertThat(localBSideEffects.isEmpty(), is(false));
- }
-
- @Test
- public void shouldBlockWhenGettingSideEffectValuesUsingWithRemote() throws Exception {
- final GraphTraversalSource g = traversal().withRemote(conf);
- g.addV("person").property("age", 20).iterate();
- g.addV("person").property("age", 10).iterate();
- final GraphTraversal traversal = g.V().aggregate("a")
- .sideEffect(Lambda.consumer("{Thread.sleep(3000)}"))
- .aggregate("b");
-
- // force strategy application - if this doesn't happen then getSideEffects() returns DefaultTraversalSideEffects
- traversal.hasNext();
-
- // start a separate thread to iterate
- final Thread t = new Thread(traversal::iterate);
- t.start();
-
- // blocks here until traversal iteration is complete
- final DriverRemoteTraversalSideEffects se = (DriverRemoteTraversalSideEffects) traversal.asAdmin().getSideEffects();
-
- // Get side effects
- final BulkSet aSideEffects = se.get("a");
- assertThat(aSideEffects.isEmpty(), is(false));
- final BulkSet bSideEffects = se.get("b");
- assertThat(bSideEffects.isEmpty(), is(false));
-
- // Get keys
- final Set<String> sideEffectKeys = se.keys();
- assertEquals(2, sideEffectKeys.size());
-
- // Should get local keys/side effects after close
- se.close();
-
- final Set<String> localSideEffectKeys = se.keys();
- assertEquals(2, localSideEffectKeys.size());
-
- final BulkSet localASideEffects = se.get("a");
- assertThat(localASideEffects.isEmpty(), is(false));
-
- final BulkSet localBSideEffects = se.get("b");
- assertThat(localBSideEffects.isEmpty(), is(false));
- }
-
- @Test
public void shouldDoNonBlockingPromiseWithRemote() throws Exception {
final GraphTraversalSource g = traversal().withRemote(conf);
g.addV("person").property("age", 20).promise(Traversal::iterate).join();
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/AbstractGremlinProcessTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/AbstractGremlinProcessTest.java
index 0a2a405..ec9492b 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/AbstractGremlinProcessTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/AbstractGremlinProcessTest.java
@@ -20,7 +20,6 @@ package org.apache.tinkerpop.gremlin.process;
import org.apache.tinkerpop.gremlin.AbstractGremlinTest;
import org.apache.tinkerpop.gremlin.GraphManager;
-import org.apache.tinkerpop.gremlin.process.remote.traversal.RemoteTraversalSideEffects;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.TraversalEngine;
import org.apache.tinkerpop.gremlin.process.traversal.TraversalSideEffects;
@@ -98,14 +97,7 @@ public abstract class AbstractGremlinProcessTest extends AbstractGremlinTest {
assertThat(sideEffects.keys().contains(key), is(true));
assertThat(sideEffects.exists(key), is(true));
assertThat(sideEffects.exists(UUID.randomUUID().toString()), is(false));
-
- // there is slightly different behavior for remote side-effects so carving out a few asserts with that
- // in mind. the client really doesnt' really have a way of knowing what type of object to create when it
- // gets an empty iterator so it makes the result null and therefore we end up with a NPE if we try to
- // access it. the rest of the behavior is solid so better to do this than OptOut I think
- if (!(sideEffects instanceof RemoteTraversalSideEffects)) {
- assertEquals(clazz, sideEffects.get((String) keysClasses[i]).getClass());
- }
+ assertEquals(clazz, sideEffects.get((String) keysClasses[i]).getClass());
}
assertEquals(sideEffects.keys().size(), counter);
assertThat(sideEffects.keys().contains(UUID.randomUUID().toString()), is(false));
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/RemoteGraph.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/RemoteGraph.java
index a5d4522..0498dc0 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/RemoteGraph.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/RemoteGraph.java
@@ -94,6 +94,14 @@ import java.util.Iterator;
test = "org.apache.tinkerpop.gremlin.process.traversal.TraversalInterruptionComputerTest",
method = "*",
reason = "The interruption model in the test can't guarantee interruption at the right time with RemoteGraph.")
+@Graph.OptOut(
+ test = "org.apache.tinkerpop.gremlin.process.traversal.step.ComplexTest",
+ method = "classicRecommendation",
+ reason = "Test asserts traversal side-effects which are not supported by remote traversals.")
+@Graph.OptOut(
+ test = "org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.GroupTest",
+ method = "g_V_group_byXlabelX_byXbothE_groupXaX_byXlabelX_byXweight_sumX_weight_sumX",
+ reason = "Test asserts traversal side-effects which are not supported by remote traversals.")
public class RemoteGraph implements Graph {
private final RemoteConnection connection;