openstack/deb-python-cassandra-driver
Code Issues Proposed changes

Refactor _callbacks and _push_watchers init to Connection

Browse Source
This commit is contained in:
Adam Holmberg
2015-05-04 12:01:16 -05:00
parent 7f5e9df1b6
commit 67e19aad0b
7 changed files with 1 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cassandra/connection.py
View File

@@ -194,6 +194,7 @@ class Connection(object):
self.is_control_connection = is_control_connection self.is_control_connection = is_control_connection
self.user_type_map = user_type_map self.user_type_map = user_type_map
self._push_watchers = defaultdict(set) self._push_watchers = defaultdict(set)
self._callbacks = {}
self._iobuf = io.BytesIO() self._iobuf = io.BytesIO()
if protocol_version >= 3: if protocol_version >= 3:
self._header_unpack = v3_header_unpack self._header_unpack = v3_header_unpack

1
cassandra/io/asyncorereactor.py
View File

@@ -158,7 +158,6 @@ class AsyncoreConnection(Connection, asyncore.dispatcher):
Connection.__init__(self, *args, **kwargs) Connection.__init__(self, *args, **kwargs)
asyncore.dispatcher.__init__(self) asyncore.dispatcher.__init__(self)
self._callbacks = {}
self.deque = deque() self.deque = deque()
self.deque_lock = Lock() self.deque_lock = Lock()

3
cassandra/io/eventletreactor.py
View File

@@ -85,9 +85,6 @@ class EventletConnection(Connection):
self._write_queue = Queue() self._write_queue = Queue()
self._callbacks = {}
self._push_watchers = defaultdict(set)
sockerr = None sockerr = None
addresses = socket.getaddrinfo( addresses = socket.getaddrinfo(
self.host, self.port, socket.AF_UNSPEC, socket.SOCK_STREAM self.host, self.port, socket.AF_UNSPEC, socket.SOCK_STREAM

3
cassandra/io/geventreactor.py
View File

@@ -82,9 +82,6 @@ class GeventConnection(Connection):
self._write_queue = Queue() self._write_queue = Queue()
self._callbacks = {}
self._push_watchers = defaultdict(set)
sockerr = None sockerr = None
addresses = socket.getaddrinfo(self.host, self.port, socket.AF_UNSPEC, socket.SOCK_STREAM) addresses = socket.getaddrinfo(self.host, self.port, socket.AF_UNSPEC, socket.SOCK_STREAM)
for (af, socktype, proto, canonname, sockaddr) in addresses: for (af, socktype, proto, canonname, sockaddr) in addresses:

1
cassandra/io/libevreactor.py
View File

@@ -264,7 +264,6 @@ class LibevConnection(Connection):
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
Connection.__init__(self, *args, **kwargs) Connection.__init__(self, *args, **kwargs)
self._callbacks = {}
self.deque = deque() self.deque = deque()
self._deque_lock = Lock() self._deque_lock = Lock()

1
cassandra/io/twistedreactor.py
View File

@@ -189,7 +189,6 @@ class TwistedConnection(Connection):
self.is_closed = True self.is_closed = True
self.connector = None self.connector = None
self._callbacks = {}
reactor.callFromThread(self.add_connection) reactor.callFromThread(self.add_connection)
self._loop.maybe_start() self._loop.maybe_start()

3
tests/unit/test_connection.py
View File

@@ -261,10 +261,7 @@ class ConnectionTest(unittest.TestCase):
Ensure the following methods throw NIE's. If not, come back and test them. Ensure the following methods throw NIE's. If not, come back and test them.
""" """
c = self.make_connection() c = self.make_connection()
self.assertRaises(NotImplementedError, c.close) self.assertRaises(NotImplementedError, c.close)
self.assertRaises(NotImplementedError, c.register_watcher, None, None)
self.assertRaises(NotImplementedError, c.register_watchers, None)
def test_set_keyspace_blocking(self): def test_set_keyspace_blocking(self):
c = self.make_connection() c = self.make_connection()