Removed driver.close(); fixed session.close()

Author: technige

examples/test_examples.py

@@ -30,7 +30,7 @@ class FreshDatabaseTestCase(TestCase):
 
     def setUp(self):
         session = GraphDatabase.driver("bolt://localhost").session()
-        session.run("MATCH (n) DETACH DELETE n").close()
+        session.run("MATCH (n) DETACH DELETE n")
         session.close()
 
 
@@ -48,7 +48,6 @@ def test_minimal_working_example(self):
             print("Neo is %d years old." % cursor["p.age"])
 
         session.close()
-        driver.close()
         # end::minimal-example[]
 
 
@@ -91,7 +90,6 @@ def test_statement(self):
         session.run("CREATE (person:Person {name: {name}})", {"name": "Neo"}).close()
         # end::statement[]
         session.close()
-        driver.close()
 
     def test_statement_without_parameters(self):
         driver = GraphDatabase.driver("bolt://localhost")
@@ -100,7 +98,6 @@ def test_statement_without_parameters(self):
         session.run("CREATE (person:Person {name: 'Neo'})").close()
         # end::statement-without-parameters[]
         session.close()
-        driver.close()
 
     def test_result_cursor(self):
         driver = GraphDatabase.driver("bolt://localhost")
@@ -114,7 +111,6 @@ def test_result_cursor(self):
             print(cursor["tool.name"])
         # end::result-cursor[]
         session.close()
-        driver.close()
 
     def test_cursor_nesting(self):
         driver = GraphDatabase.driver("bolt://localhost")
@@ -128,7 +124,6 @@ def test_cursor_nesting(self):
                         "CREATE (person)-[:REPORTS_TO]->(boss)", {"id": cursor["minion"], "boss": "Bob"})
         # end::retain-result-query[]
         session.close()
-        driver.close()
 
     def test_result_retention(self):
         driver = GraphDatabase.driver("bolt://localhost")
@@ -144,7 +139,6 @@ def test_result_retention(self):
                         "CREATE (person)-[:REPORTS_TO]->(boss)", {"id": record["minion"], "boss": "Bob"})
         # end::retain-result-process[]
         session.close()
-        driver.close()
 
     def test_transaction_commit(self):
         driver = GraphDatabase.driver("bolt://localhost")
@@ -159,7 +153,6 @@ def test_transaction_commit(self):
         assert cursor["count(p)"] == 1
         assert cursor.at_end()
         session.close()
-        driver.close()
 
     def test_transaction_rollback(self):
         driver = GraphDatabase.driver("bolt://localhost")
@@ -174,7 +167,6 @@ def test_transaction_rollback(self):
         assert cursor["count(p)"] == 0
         assert cursor.at_end()
         session.close()
-        driver.close()
 
     def test_result_summary_query_profile(self):
         driver = GraphDatabase.driver("bolt://localhost")
@@ -187,7 +179,6 @@ def test_result_summary_query_profile(self):
         print(summary.profile)
         # end::result-summary-query-profile[]
         session.close()
-        driver.close()
 
     def test_result_summary_notifications(self):
         driver = GraphDatabase.driver("bolt://localhost")
@@ -198,4 +189,3 @@ def test_result_summary_notifications(self):
             print(notification)
         # end::result-summary-notifications[]
         session.close()
-        driver.close()

neo4j/v1/session.py

@@ -102,7 +102,7 @@ def session(self):
         return session
 
     def recycle(self, session):
-        """ Pass a session back to the driver for recycling, if healthy.
+        """ Accept a session for recycling, if healthy.
 
         :param session:
         :return:
@@ -114,9 +114,6 @@ def recycle(self, session):
         if session.healthy and len(pool) < self.max_pool_size and session not in pool:
             pool.appendleft(session)
 
-    def close(self):
-        pass  # TODO
-
 
 class ResultCursor(object):
     """ A handler for the result of Cypher statement execution.
@@ -138,6 +135,7 @@ def __init__(self, connection, statement, parameters):
         self._next = deque()
         self._position = -1
         self._summary = None
+        self._consumed = False
 
     def is_open(self):
         """ Return ``True`` if this cursor is still open, ``False`` otherwise.
@@ -161,7 +159,7 @@ def next(self):
             self._current = Record(self.keys, tuple(map(hydrated, values)))
             self._position += 1
             return True
-        elif self._summary:
+        elif self._consumed:
             return False
         else:
             self._connection.fetch_next()
@@ -183,7 +181,7 @@ def at_end(self):
         """
         if self._next:
             return False
-        elif self._summary:
+        elif self._consumed:
             return True
         else:
             self._connection.fetch_next()
@@ -221,7 +219,7 @@ def summarize(self):
     def _consume(self):
         # Consume the remainder of this result, triggering all appropriate callback functions.
         fetch_next = self._connection.fetch_next
-        while self._summary is None:
+        while not self._consumed:
             fetch_next()
 
     def _on_header(self, metadata):
@@ -235,9 +233,11 @@ def _on_record(self, values):
     def _on_footer(self, metadata):
         # Called on receipt of the result footer.
         self._summary = ResultSummary(self.statement, self.parameters, **metadata)
+        self._consumed = True
 
     def _on_failure(self, metadata):
         # Called on execution failure.
+        self._consumed = True
         raise CypherError(metadata)
 
 
@@ -411,6 +411,7 @@ def __init__(self, driver):
         self.driver = driver
         self.connection = connect(driver.host, driver.port, **driver.config)
         self.transaction = None
+        self.last_cursor = None
 
     def __del__(self):
         if not self.connection.closed:
@@ -468,11 +469,14 @@ def run(self, statement, parameters=None):
         self.connection.append(PULL_ALL, response=pull_all_response)
         self.connection.send()
 
+        self.last_cursor = cursor
         return cursor
 
     def close(self):
-        """ If still usable, return this session to the driver pool it came from.
+        """ Recycle this session through the driver it came from.
         """
+        if self.last_cursor:
+            self.last_cursor.close()
         self.driver.recycle(self)
 
     def begin_transaction(self):