Skip to content

Commit 3bcf16b

Browse files
committed
Removed benchmark code as no longer appropriate with cursor
1 parent b0faed3 commit 3bcf16b

File tree

3 files changed

+2
-289
lines changed

3 files changed

+2
-289
lines changed

README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Example Usage
2828
driver = GraphDatabase.driver("bolt://localhost")
2929
session = driver.session()
3030
session.run("CREATE (a:Person {name:'Bob'})")
31-
for name, in session.run("MATCH (a:Person) RETURN a.name AS name"):
31+
for name, in session.run("MATCH (a:Person) RETURN a.name AS name").records():
3232
print(name)
3333
session.close()
3434

neo4j/v1/bench.py

Lines changed: 0 additions & 254 deletions
This file was deleted.

neo4j/v1/session.py

Lines changed: 1 addition & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class which can be used to obtain `Driver` instances that are used for
3030

3131
from collections import deque, namedtuple
3232

33-
from .compat import integer, perf_counter, string, urlparse
33+
from .compat import integer, string, urlparse
3434
from .connection import connect, Response, RUN, PULL_ALL
3535
from .exceptions import CypherError
3636
from .typesystem import hydrated
@@ -44,24 +44,6 @@ class which can be used to obtain `Driver` instances that are used for
4444
STATEMENT_TYPE_SCHEMA_WRITE = "sw"
4545

4646

47-
Latency = namedtuple("Latency", ("overall", "network", "wait"))
48-
49-
50-
class BenchTest(object):
51-
52-
init = None
53-
start_send = None
54-
end_send = None
55-
start_recv = None
56-
end_recv = None
57-
done = None
58-
59-
def latency(self):
60-
return Latency(self.done - self.init,
61-
self.end_recv - self.start_send,
62-
self.start_recv - self.end_send)
63-
64-
6547
class GraphDatabase(object):
6648
""" The :class:`.GraphDatabase` class provides access to all graph
6749
database functionality. This is primarily used to construct a driver
@@ -153,7 +135,6 @@ def __init__(self, connection, statement, parameters):
153135
self._next = deque()
154136
self._position = -1
155137
self._summary = None
156-
self._bench_test = None
157138

158139
def is_open(self):
159140
""" Return ``True`` if this cursor is still open, ``False`` otherwise.
@@ -269,8 +250,6 @@ def _consume(self):
269250
def _on_header(self, metadata):
270251
# Called on receipt of the result header.
271252
self.keys = metadata["fields"]
272-
if self._bench_test:
273-
self._bench_test.start_recv = perf_counter()
274253

275254
def _on_record(self, values):
276255
# Called on receipt of each result record.
@@ -279,8 +258,6 @@ def _on_record(self, values):
279258
def _on_footer(self, metadata):
280259
# Called on receipt of the result footer.
281260
self._summary = ResultSummary(self.statement, self.parameters, **metadata)
282-
if self._bench_test:
283-
self._bench_test.end_recv = perf_counter()
284261

285262
def _on_failure(self, metadata):
286263
# Called on execution failure.
@@ -457,7 +434,6 @@ def __init__(self, driver):
457434
self.driver = driver
458435
self.connection = connect(driver.host, driver.port, **driver.config)
459436
self.transaction = None
460-
self.bench_tests = []
461437

462438
def __del__(self):
463439
if not self.connection.closed:
@@ -500,11 +476,7 @@ def run(self, statement, parameters=None):
500476
params[key] = value
501477
parameters = params
502478

503-
t = BenchTest()
504-
t.init = perf_counter()
505-
506479
cursor = ResultCursor(self.connection, statement, parameters)
507-
cursor._bench_test = t
508480

509481
run_response = Response(self.connection)
510482
run_response.on_success = cursor._on_header
@@ -517,12 +489,7 @@ def run(self, statement, parameters=None):
517489

518490
self.connection.append(RUN, (statement, parameters), response=run_response)
519491
self.connection.append(PULL_ALL, response=pull_all_response)
520-
t.start_send = perf_counter()
521492
self.connection.send()
522-
t.end_send = perf_counter()
523-
524-
t.done = perf_counter()
525-
self.bench_tests.append(t)
526493

527494
return cursor
528495

0 commit comments

Comments
 (0)