statistics->counters

technige · technige · commit 3547dd3bab17 · 2016-02-22T15:25:04.000Z
diff --git a/docs/source/index.rst b/docs/source/index.rst
@@ -32,7 +32,7 @@ Session API
 .. autoclass:: neo4j.v1.ResultSummary
    :members:
 
-.. autoclass:: neo4j.v1.StatementStatistics
+.. autoclass:: neo4j.v1.Counters
    :members:
 
 
diff --git a/neo4j/v1/exceptions.py b/neo4j/v1/exceptions.py
@@ -40,8 +40,8 @@ def __init__(self, data):
                 setattr(self, key, value)
 
 
-class DriverError(Exception):
-    """ Raised when the driver is used incorrectly.
+class ResultError(Exception):
+    """ Raised when the cursor encounters a problem.
     """
 
     pass
diff --git a/neo4j/v1/session.py b/neo4j/v1/session.py
@@ -32,7 +32,7 @@ class which can be used to obtain `Driver` instances that are used for
 
 from .compat import integer, string, urlparse
 from .connection import connect, Response, RUN, PULL_ALL
-from .exceptions import CypherError,  DriverError
+from .exceptions import CypherError,  ResultError
 from .typesystem import hydrated
 
 
@@ -222,12 +222,12 @@ def summary(self):
         Attempting to access the summary before then will raise an error.
 
         :rtype: ResultSummary
-        :raises DriverError: if the entire result has not yet been consumed
+        :raises ResultError: if the entire result has not yet been consumed
         """
         if self._consumed:
             return self._summary
         else:
-            raise DriverError("Summary not available until the entire result has been consumed")
+            raise ResultError("Summary not available until the entire result has been consumed")
 
     def _consume(self):
         # Consume the remainder of this result, triggering all appropriate callback functions.
@@ -267,8 +267,8 @@ class ResultSummary(object):
     #: The type of statement (``'r'`` = read-only, ``'rw'`` = read/write).
     statement_type = None
 
-    #: A set of statistical information held in a :class:`.StatementStatistics` instance.
-    statistics = None
+    #: A set of statistical information held in a :class:`.Counters` instance.
+    counters = None
 
     #: A :class:`.Plan` instance
     plan = None
@@ -286,7 +286,7 @@ def __init__(self, statement, parameters, **metadata):
         self.statement = statement
         self.parameters = parameters
         self.statement_type = metadata.get("type")
-        self.statistics = StatementStatistics(metadata.get("stats", {}))
+        self.counters = Counters(metadata.get("stats", {}))
         if "plan" in metadata:
             self.plan = make_plan(metadata["plan"])
         if "profile" in metadata:
@@ -301,7 +301,7 @@ def __init__(self, statement, parameters, **metadata):
                                                    notification["description"], position))
 
 
-class StatementStatistics(object):
+class Counters(object):
     """ Set of statistics from a Cypher statement execution.
     """
 
diff --git a/test/test_session.py b/test/test_session.py
@@ -22,7 +22,7 @@
 from unittest import TestCase
 
 from mock import patch
-from neo4j.v1.exceptions import DriverError
+from neo4j.v1.exceptions import ResultError
 from neo4j.v1.session import GraphDatabase, CypherError, Record, record
 from neo4j.v1.typesystem import Node, Relationship, Path
 
@@ -216,12 +216,12 @@ def test_can_obtain_summary_after_consuming_result(self):
             assert summary.statement == "CREATE (n) RETURN n"
             assert summary.parameters == {}
             assert summary.statement_type == "rw"
-            assert summary.statistics.nodes_created == 1
+            assert summary.counters.nodes_created == 1
 
     def test_cannot_obtain_summary_without_consuming_result(self):
         with GraphDatabase.driver("bolt://localhost").session() as session:
             cursor = session.run("CREATE (n) RETURN n")
-            with self.assertRaises(DriverError):
+            with self.assertRaises(ResultError):
                 _ = cursor.summary()
 
     # def test_can_obtain_summary_immediately_if_empty_result(self):
@@ -231,7 +231,7 @@ def test_cannot_obtain_summary_without_consuming_result(self):
     #         assert summary.statement == "CREATE (n)"
     #         assert summary.parameters == {}
     #         assert summary.statement_type == "rw"
-    #         assert summary.statistics.nodes_created == 1
+    #         assert summary.counters.nodes_created == 1
 
     def test_no_plan_info(self):
         with GraphDatabase.driver("bolt://localhost").session() as session:
