You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by da...@apache.org on 2016/10/05 22:00:45 UTC
[1/3] tinkerpop git commit: added integration tests for
DriverRemoteTraversalSideEffects methods
Repository: tinkerpop
Updated Branches:
refs/heads/TINKERPOP-1458 d60def3d4 -> f3baae8ba
added integration tests for DriverRemoteTraversalSideEffects methods
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/790aa060
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/790aa060
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/790aa060
Branch: refs/heads/TINKERPOP-1458
Commit: 790aa060ce828b8d76f90b06f59e770431e7b732
Parents: d60def3
Author: davebshow <da...@gmail.com>
Authored: Wed Oct 5 15:01:59 2016 -0400
Committer: davebshow <da...@gmail.com>
Committed: Wed Oct 5 15:01:59 2016 -0400
----------------------------------------------------------------------
.../server/GremlinServerIntegrateTest.java | 79 ++++++++++++++++++--
1 file changed, 73 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/790aa060/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java
----------------------------------------------------------------------
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 e6e0021..61bf994 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
@@ -38,6 +38,7 @@ 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.NioClient;
import org.apache.tinkerpop.gremlin.driver.simple.SimpleClient;
@@ -55,6 +56,7 @@ import org.apache.tinkerpop.gremlin.structure.Graph;
import org.apache.tinkerpop.gremlin.structure.T;
import org.apache.tinkerpop.gremlin.server.channel.NioChannelizer;
import org.apache.tinkerpop.gremlin.server.op.session.SessionOpProcessor;
+import org.apache.tinkerpop.gremlin.structure.util.Host;
import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertex;
import org.apache.tinkerpop.gremlin.structure.util.empty.EmptyGraph;
import org.apache.tinkerpop.gremlin.util.Log4jRecordingAppender;
@@ -64,6 +66,7 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import java.lang.reflect.Field;
import java.nio.channels.ClosedChannelException;
import java.util.ArrayList;
import java.util.Collections;
@@ -71,6 +74,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.util.UUID;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
@@ -104,7 +108,6 @@ import static org.junit.Assert.assertEquals;
public class GremlinServerIntegrateTest extends AbstractGremlinServerIntegrationTest {
private Log4jRecordingAppender recordingAppender = null;
-
private final Supplier<Graph> graphGetter = () -> server.getServerGremlinExecutor().getGraphManager().getGraphs().get("graph");
private final Configuration conf = new BaseConfiguration() {{
setProperty(Graph.GRAPH, RemoteGraph.class.getName());
@@ -833,16 +836,80 @@ public class GremlinServerIntegrateTest extends AbstractGremlinServerIntegration
}
@Test
- public void shouldCloseLocalSideEffects() throws Exception {
+ public void shouldGetSideEffectKeysUsingWithRemote() throws Exception {
final Graph graph = EmptyGraph.instance();
final GraphTraversalSource g = graph.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 List sideEffects = traversal.asAdmin().getSideEffects().get("a");
- assertFalse(sideEffects.isEmpty());
- traversal.asAdmin().getSideEffects().close();
- assertNull(traversal.asAdmin().getSideEffects().get("b"));
+ final DriverRemoteTraversalSideEffects se = (DriverRemoteTraversalSideEffects) traversal.asAdmin().getSideEffects();
+
+ // Get keys
+ final Set<String> sideEffectKeys = se.keys();
+ assertEquals(2, sideEffectKeys.size());
+
+ // Get side effects
+ final List aSideEffects = se.get("a");
+ assertThat(aSideEffects.isEmpty(), is(false));
+ final List 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 List localASideEffects = se.get("a");
+ assertThat(localASideEffects.isEmpty(), is(false));
+
+ final List localBSideEffects = se.get("b");
+ assertThat(localBSideEffects.isEmpty(), is(false));
+ }
+
+ @Test
+ public void shouldCloseSideEffectsUsingWithRemote() throws Exception {
+ final Graph graph = EmptyGraph.instance();
+ final GraphTraversalSource g = graph.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 List sideEffects = se.get("a");
+ assertThat(sideEffects.isEmpty(), is(false));
+ se.close();
+
+ // Can't get new side effects after close
+ assertNull(se.get("b"));
+
+ // Earlier keys should be cached locally
+ final Set<String> localSideEffectKeys = se.keys();
+ assertEquals(1, localSideEffectKeys.size());
+ final List localSideEffects = se.get("a");
+ assertThat(localSideEffects.isEmpty(), is(false));
+
+ // Try to get side effect from server
+ final Cluster cluster = Cluster.build("localhost").create();
+ final Client client = cluster.connect();
+ Field field = DriverRemoteTraversalSideEffects.class.getDeclaredField("serverSideEffect");
+ field.setAccessible(true);
+ UUID serverSideEffectId = (UUID) field.get(se);
+ final RequestMessage msg = RequestMessage.build(Tokens.OPS_GATHER)
+ .addArg(Tokens.ARGS_SIDE_EFFECT, serverSideEffectId)
+ .addArg(Tokens.ARGS_SIDE_EFFECT_KEY, "b")
+ .processor("traversal").create();
+ boolean error;
+ try {
+ client.submitAsync(msg).get();
+ error = false;
+ } catch (Exception ex) {
+ error = true;
+ }
+ assertThat(error, is(true));
}
}
+
+
+
[3/3] tinkerpop git commit: updated driver to cache side effects
locally
Posted by da...@apache.org.
updated driver to cache side effects locally
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/f3baae8b
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/f3baae8b
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/f3baae8b
Branch: refs/heads/TINKERPOP-1458
Commit: f3baae8ba2415191e700c3842f983001096168e5
Parents: fd2d6eb
Author: davebshow <da...@gmail.com>
Authored: Wed Oct 5 18:00:27 2016 -0400
Committer: davebshow <da...@gmail.com>
Committed: Wed Oct 5 18:00:27 2016 -0400
----------------------------------------------------------------------
.../gremlin_python/driver/remote_connection.py | 26 ++++++++++---
.../driver/test_driver_remote_connection.py | 39 +++++++++++++++++---
2 files changed, 54 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f3baae8b/gremlin-python/src/main/jython/gremlin_python/driver/remote_connection.py
----------------------------------------------------------------------
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 3e7293f..46fb760 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
@@ -58,18 +58,32 @@ class RemoteTraversal(Traversal):
class RemoteTraversalSideEffects(TraversalSideEffects):
def __init__(self, keys_lambda, value_lambda, close_lambda):
- self.keys_lambda = keys_lambda
- self.value_lambda = value_lambda
- self.close_lambda = close_lambda
+ self._keys_lambda = keys_lambda
+ self._value_lambda = value_lambda
+ self._close_lambda = close_lambda
+ self._keys = set()
+ self._side_effects = {}
+ self._closed = False
def keys(self):
- return self.keys_lambda()
+ if not self._closed:
+ self._keys = self._keys_lambda()
+ return self._keys
def get(self, key):
- return self.value_lambda(key)
+ if not self._side_effects.get(key):
+ if not self._closed:
+ results = self._value_lambda(key)
+ self._side_effects[key] = results
+ self._keys.add(key)
+ else:
+ return None
+ return self._side_effects[key]
def close(self):
- return self.close_lambda()
+ results = self._close_lambda()
+ self._closed = True
+ return results
class RemoteStrategy(TraversalStrategy):
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f3baae8b/gremlin-python/src/main/jython/tests/driver/test_driver_remote_connection.py
----------------------------------------------------------------------
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 d96d35d..d3163d3 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
@@ -106,6 +106,7 @@ class TestDriverRemoteConnection(TestCase):
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)
@@ -117,11 +118,39 @@ class TestDriverRemoteConnection(TestCase):
raise Exception("Accessing a non-existent key should throw an error")
except KeyError:
pass
- result = t.side_effects.close()
- assert not result
- with pytest.raises(KeyError):
- x = t.side_effects['m']
- connection.close()
+
+ def test_side_effect_close(self):
+ connection = DriverRemoteConnection('ws://localhost:8182/gremlin', 'g')
+ g = Graph().traversal().withRemote(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')
if __name__ == '__main__':
[2/3] tinkerpop git commit: fixed side effect methods and updated
tests
Posted by da...@apache.org.
fixed side effect methods and updated tests
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/fd2d6eb8
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/fd2d6eb8
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/fd2d6eb8
Branch: refs/heads/TINKERPOP-1458
Commit: fd2d6eb86f9d45a709d0684a23d57c83c18f5826
Parents: 790aa06
Author: davebshow <da...@gmail.com>
Authored: Wed Oct 5 17:59:15 2016 -0400
Committer: davebshow <da...@gmail.com>
Committed: Wed Oct 5 17:59:15 2016 -0400
----------------------------------------------------------------------
.../DriverRemoteTraversalSideEffects.java | 6 ++++-
.../DriverRemoteTraversalSideEffectsTest.java | 24 ++++++++++++++++++--
.../server/GremlinServerIntegrateTest.java | 18 +++++++++------
3 files changed, 38 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fd2d6eb8/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/remote/DriverRemoteTraversalSideEffects.java
----------------------------------------------------------------------
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
index d2fced5..2dece11 100644
--- 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
@@ -28,6 +28,7 @@ import org.apache.tinkerpop.gremlin.process.remote.traversal.AbstractRemoteTrave
import java.util.Collections;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import java.util.UUID;
@@ -67,10 +68,13 @@ public class DriverRemoteTraversalSideEffects extends AbstractRemoteTraversalSid
try {
final Result result = client.submitAsync(msg).get().one();
sideEffects.put(key, null == result ? null : result.getObject());
+ if (keys.isEmpty())
+ keys = new HashSet<>();
keys.add(key);
} catch (Exception ex) {
final Throwable root = ExceptionUtils.getRootCause(ex);
- if (root.getMessage().equals("Could not find side-effects for " + serverSideEffect + "."))
+ final String exMsg = null == root ? "" : root.getMessage();
+ if (exMsg.equals("Could not find side-effects for " + serverSideEffect + "."))
sideEffects.put(key, null);
else
throw new RuntimeException("Could not get keys", root);
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fd2d6eb8/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/DriverRemoteTraversalSideEffectsTest.java
----------------------------------------------------------------------
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
index d4c5618..368ca92 100644
--- 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
@@ -29,6 +29,7 @@ import java.util.UUID;
import java.util.concurrent.CompletableFuture;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
@@ -63,10 +64,29 @@ public class DriverRemoteTraversalSideEffectsTest extends AbstractResultQueueTes
}
@Test
- public void shouldNotContactRemoteMoreThanOnceForClose() throws Exception {
+ 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 TraversalSideEffects sideEffects = new DriverRemoteTraversalSideEffects(client, sideEffectKey, null);
+
+ assertNotNull(sideEffects.get("a"));
+ sideEffects.close();
+
+ // Side effect 'a' should be cached locally
+ assertNotNull(sideEffects.get("a"));
+ assertNotNull(sideEffects.get("a"));
+ assertNotNull(sideEffects.get("a"));
+
+ // Once for get and once for close
+ verify(client, times(2)).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 TraversalSideEffects sideEffects = new DriverRemoteTraversalSideEffects(client, sideEffectKey, null);
@@ -79,7 +99,7 @@ public class DriverRemoteTraversalSideEffectsTest extends AbstractResultQueueTes
assertEquals(0, sideEffects.keys().size());
- // once for the keys and once for the close message
+ // once for the close message
verify(client, times(1)).submitAsync(any(RequestMessage.class));
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fd2d6eb8/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java
----------------------------------------------------------------------
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 61bf994..1c4d19e 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
@@ -52,6 +52,7 @@ import org.apache.tinkerpop.gremlin.groovy.jsr223.customizer.TimedInterruptCusto
import org.apache.tinkerpop.gremlin.process.remote.RemoteGraph;
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.step.util.BulkSet;
import org.apache.tinkerpop.gremlin.structure.Graph;
import org.apache.tinkerpop.gremlin.structure.T;
import org.apache.tinkerpop.gremlin.server.channel.NioChannelizer;
@@ -850,9 +851,9 @@ public class GremlinServerIntegrateTest extends AbstractGremlinServerIntegration
assertEquals(2, sideEffectKeys.size());
// Get side effects
- final List aSideEffects = se.get("a");
+ final BulkSet aSideEffects = se.get("a");
assertThat(aSideEffects.isEmpty(), is(false));
- final List bSideEffects = se.get("b");
+ final BulkSet bSideEffects = se.get("b");
assertThat(bSideEffects.isEmpty(), is(false));
// Should get local keys/side effects after close
@@ -861,10 +862,10 @@ public class GremlinServerIntegrateTest extends AbstractGremlinServerIntegration
final Set<String> localSideEffectKeys = se.keys();
assertEquals(2, localSideEffectKeys.size());
- final List localASideEffects = se.get("a");
+ final BulkSet localASideEffects = se.get("a");
assertThat(localASideEffects.isEmpty(), is(false));
- final List localBSideEffects = se.get("b");
+ final BulkSet localBSideEffects = se.get("b");
assertThat(localBSideEffects.isEmpty(), is(false));
}
@@ -877,7 +878,7 @@ public class GremlinServerIntegrateTest extends AbstractGremlinServerIntegration
final GraphTraversal traversal = g.V().aggregate("a").aggregate("b");
traversal.iterate();
final DriverRemoteTraversalSideEffects se = (DriverRemoteTraversalSideEffects) traversal.asAdmin().getSideEffects();
- final List sideEffects = se.get("a");
+ final BulkSet sideEffects = se.get("a");
assertThat(sideEffects.isEmpty(), is(false));
se.close();
@@ -887,7 +888,7 @@ public class GremlinServerIntegrateTest extends AbstractGremlinServerIntegration
// Earlier keys should be cached locally
final Set<String> localSideEffectKeys = se.keys();
assertEquals(1, localSideEffectKeys.size());
- final List localSideEffects = se.get("a");
+ final BulkSet localSideEffects = se.get("a");
assertThat(localSideEffects.isEmpty(), is(false));
// Try to get side effect from server
@@ -896,13 +897,16 @@ public class GremlinServerIntegrateTest extends AbstractGremlinServerIntegration
Field field = DriverRemoteTraversalSideEffects.class.getDeclaredField("serverSideEffect");
field.setAccessible(true);
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();
+ client.submitAsync(msg).get().one();
error = false;
} catch (Exception ex) {
error = true;