Author: jbellis Date: Wed Jun 15 22:00:02 2011 New Revision: 1136218 URL: http://svn.apache.org/viewvc?rev=1136218&view=rev Log: cleanup
Modified: cassandra/drivers/py/cql/connection.py cassandra/drivers/py/cql/cursor.py Modified: cassandra/drivers/py/cql/connection.py URL: http://svn.apache.org/viewvc/cassandra/drivers/py/cql/connection.py?rev=1136218&r1=1136217&r2=1136218&view=diff ============================================================================== --- cassandra/drivers/py/cql/connection.py (original) +++ cassandra/drivers/py/cql/connection.py Wed Jun 15 22:00:02 2011 @@ -23,7 +23,6 @@ from cql.cassandra.ttypes import Authent class Connection(object): - def __init__(self, host, port, keyspace, user=None, password=None): """ Params: Modified: cassandra/drivers/py/cql/cursor.py URL: http://svn.apache.org/viewvc/cassandra/drivers/py/cql/cursor.py?rev=1136218&r1=1136217&r2=1136218&view=diff ============================================================================== --- cassandra/drivers/py/cql/cursor.py (original) +++ cassandra/drivers/py/cql/cursor.py Wed Jun 15 22:00:02 2011 @@ -34,14 +34,13 @@ _COUNT_DESCRIPTION = (None, None, None, _VOID_DESCRIPTION = (None) class Cursor: - _keyspace_re = re.compile("USE (\w+);?", re.I | re.M) _cfamily_re = re.compile("\s*SELECT\s+.+\s+FROM\s+[\']?(\w+)", re.I | re.M) _ddl_re = re.compile("\s*(CREATE|ALTER|DROP)\s+", re.I | re.M) def __init__(self, parent_connection): self.open_socket = True - self.parent_connection = parent_connection + self._connection = parent_connection self.description = None # A list of 7-tuples: # (column_name, type_code, none, none, @@ -52,7 +51,7 @@ class Cursor: self.rowcount = -1 # Populate on execute() self.compression = 'GZIP' - self._query_ks = self.parent_connection.keyspace + self._query_ks = self._connection.keyspace self._query_cf = None self.decoder = SchemaDecoder(self.__get_schema()) @@ -103,7 +102,7 @@ class Cursor: return d schema = {} - client = self.parent_connection.client + client = self._connection.client for ksdef in client.describe_keyspaces(): schema[ksdef.name] = column_families(ksdef.cf_defs) return schema @@ -126,7 +125,7 @@ class Cursor: request_compression = getattr(Compression, self.compression) try: - client = self.parent_connection.client + client = self._connection.client response = client.execute_cql_query(compressed_q, request_compression) except InvalidRequestException, ire: raise cql.ProgrammingError("Bad Request: %s" % ire.why) @@ -186,11 +185,11 @@ class Cursor: row = self.result[self.rs_idx] self.rs_idx += 1 - if self.description != _COUNT_DESCRIPTION: + if self.description == _COUNT_DESCRIPTION: + return row + else: self.description = self.decoder.decode_description(self._query_ks, self._query_cf, row) return self.decoder.decode_row(self._query_ks, self._query_cf, row) - else: - return row def fetchmany(self, size=None): self.__checksock() @@ -249,4 +248,4 @@ class Cursor: def __checksock(self): if not self.open_socket: raise cql.InternalError("Cursor belonging to %s has been closed." % - (self.parent_connection, )) + (self._connection, ))