You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by ok...@apache.org on 2016/08/23 23:51:27 UTC
tinkerpop git commit: SideEffectsManager has been renamed to
TraversalSideEffects. Again, consistency between Java and Python. Also,
got rid of Traversal.sideEffects(),
just do a direct property reference at traversal.side_effects. Tomorrow I will
start
Repository: tinkerpop
Updated Branches:
refs/heads/TINKERPOP-1278 7bdc0b270 -> 5cd3cd8b8
SideEffectsManager has been renamed to TraversalSideEffects. Again, consistency between Java and Python. Also, got rid of Traversal.sideEffects(), just do a direct property reference at traversal.side_effects. Tomorrow I will start the GraphSONDeserialization process.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/5cd3cd8b
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/5cd3cd8b
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/5cd3cd8b
Branch: refs/heads/TINKERPOP-1278
Commit: 5cd3cd8b8b92dc09702ef22f6ac27352e47b1165
Parents: 7bdc0b2
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Tue Aug 23 17:51:23 2016 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Tue Aug 23 17:51:23 2016 -0600
----------------------------------------------------------------------
.../tinkerpop/gremlin/python/TraversalSourceGenerator.groovy | 6 +-----
.../jython/gremlin_python/driver/driver_remote_connection.py | 4 ++--
2 files changed, 3 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5cd3cd8b/gremlin-python/src/main/groovy/org/apache/tinkerpop/gremlin/python/TraversalSourceGenerator.groovy
----------------------------------------------------------------------
diff --git a/gremlin-python/src/main/groovy/org/apache/tinkerpop/gremlin/python/TraversalSourceGenerator.groovy b/gremlin-python/src/main/groovy/org/apache/tinkerpop/gremlin/python/TraversalSourceGenerator.groovy
index 3c08eef..ba2edf7 100644
--- a/gremlin-python/src/main/groovy/org/apache/tinkerpop/gremlin/python/TraversalSourceGenerator.groovy
+++ b/gremlin-python/src/main/groovy/org/apache/tinkerpop/gremlin/python/TraversalSourceGenerator.groovy
@@ -81,17 +81,13 @@ class Traversal(object):
if self.last_traverser.bulk <= 0:
self.last_traverser = None
return object
- def sideEffects(self):
- if self.traversers is None:
- self.traversal_strategies.apply_strategies(self)
- return self.side_effects
def toList(self):
return list(iter(self))
def toSet(self):
return set(iter(self))
def iterate(self):
while True:
- try: self.__next__()
+ try: self.nextTraverser()
except StopIteration: return self
def nextTraverser(self):
if self.traversers is None:
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5cd3cd8b/gremlin-python/src/main/jython/gremlin_python/driver/driver_remote_connection.py
----------------------------------------------------------------------
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 946d2c3..26d9ed3 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
@@ -59,7 +59,7 @@ class DriverRemoteConnection(RemoteConnection):
traversers = self._loop.run_sync(lambda: self.submit_bytecode(
bytecode, request_id))
return RemoteTraversal(iter(traversers),
- SideEffectManager(self, request_id))
+ TraversalSideEffects(self, request_id))
@gen.coroutine
def submit_bytecode(self, bytecode, request_id):
@@ -224,7 +224,7 @@ class Response:
raise gen.Return(results)
-class SideEffectManager(object):
+class TraversalSideEffects(object):
def __init__(self, remote_connection, request_id):
self._remote_connection = remote_connection
self._request_id = request_id