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 2018/09/04 18:48:22 UTC
[1/2] tinkerpop git commit: TINKERPOP-2021 Fixed max recursion depth
failure in python
Repository: tinkerpop
Updated Branches:
refs/heads/master a3ba09b5c -> 1300f174c
TINKERPOP-2021 Fixed max recursion depth failure in python
Looks like this was just a bad merge along the way in the tp33 line that caused this. CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/69bbbed7
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/69bbbed7
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/69bbbed7
Branch: refs/heads/master
Commit: 69bbbed7b4282c5a7f7439c06e7113c0d99f6566
Parents: 8c280c1
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Sep 4 14:46:40 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Sep 4 14:46:40 2018 -0400
----------------------------------------------------------------------
.../src/main/jython/gremlin_python/driver/protocol.py | 5 +----
gremlin-python/src/main/jython/tests/driver/test_client.py | 2 --
2 files changed, 1 insertion(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/69bbbed7/gremlin-python/src/main/jython/gremlin_python/driver/protocol.py
----------------------------------------------------------------------
diff --git a/gremlin-python/src/main/jython/gremlin_python/driver/protocol.py b/gremlin-python/src/main/jython/gremlin_python/driver/protocol.py
index 014daff..e0a2f7e 100644
--- a/gremlin-python/src/main/jython/gremlin_python/driver/protocol.py
+++ b/gremlin-python/src/main/jython/gremlin_python/driver/protocol.py
@@ -89,10 +89,7 @@ class GremlinServerWSProtocol(AbstractBaseProtocol):
return status_code
elif status_code in [200, 206]:
result_set.stream.put_nowait(data)
- if status_code == 206:
- message = self._transport.read()
- self.data_received(message, results_dict)
- else:
+ if status_code == 200:
del results_dict[request_id]
return status_code
else:
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/69bbbed7/gremlin-python/src/main/jython/tests/driver/test_client.py
----------------------------------------------------------------------
diff --git a/gremlin-python/src/main/jython/tests/driver/test_client.py b/gremlin-python/src/main/jython/tests/driver/test_client.py
index e03ffee..fbfe2d7 100644
--- a/gremlin-python/src/main/jython/tests/driver/test_client.py
+++ b/gremlin-python/src/main/jython/tests/driver/test_client.py
@@ -22,7 +22,6 @@ from gremlin_python.driver.client import Client
from gremlin_python.driver.request import RequestMessage
from gremlin_python.process.graph_traversal import __
from gremlin_python.structure.graph import Graph
-from unittest import skip
__author__ = 'David M. Brown (davebshow@gmail.com)'
@@ -114,7 +113,6 @@ def test_multi_conn_pool(client):
assert len(result_set.all().result()) == 6
-@skip("TINKERPOP-2021")
def test_big_result_set(client):
g = Graph().traversal()
t = g.inject(1).repeat(__.addV('person').property('name', __.loops())).times(20000).count()
[2/2] tinkerpop git commit: Merge branch 'tp33'
Posted by sp...@apache.org.
Merge branch 'tp33'
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/1300f174
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/1300f174
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/1300f174
Branch: refs/heads/master
Commit: 1300f174c70e2796647b193b4a57a4c274a49f62
Parents: a3ba09b 69bbbed
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Sep 4 14:48:05 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Sep 4 14:48:05 2018 -0400
----------------------------------------------------------------------
.../src/main/jython/gremlin_python/driver/protocol.py | 5 +----
gremlin-python/src/main/jython/tests/driver/test_client.py | 2 --
2 files changed, 1 insertion(+), 6 deletions(-)
----------------------------------------------------------------------