Author: eevans
Date: Fri Apr 8 16:30:03 2011
New Revision: 1090333
URL: http://svn.apache.org/viewvc?rev=1090333&view=rev
Log:
Python driver support for Compression.NONE
Patch by eevans
Modified:
cassandra/trunk/drivers/py/cql/connection.py
cassandra/trunk/test/system/test_cql.py
Modified: cassandra/trunk/drivers/py/cql/connection.py
URL:
http://svn.apache.org/viewvc/cassandra/trunk/drivers/py/cql/connection.py?rev=1090333&r1=1090332&r2=1090333&view=diff
==============================================================================
--- cassandra/trunk/drivers/py/cql/connection.py (original)
+++ cassandra/trunk/drivers/py/cql/connection.py Fri Apr 8 16:30:03 2011
@@ -30,7 +30,7 @@ from cassandra.ttypes import Compression
CqlResultType, AuthenticationRequest, \
SchemaDisagreementException
-COMPRESSION_SCHEMES = ['GZIP']
+COMPRESSION_SCHEMES = ['GZIP', 'NONE']
DEFAULT_COMPRESSION = 'GZIP'
__all__ = ['COMPRESSION_SCHEMES', 'DEFAULT_COMPRESSION', 'Connection']
@@ -191,5 +191,7 @@ class Connection(object):
if compression == 'GZIP':
return zlib.compress(query)
+
+ return query
# vi: ai ts=4 tw=0 sw=4 et
Modified: cassandra/trunk/test/system/test_cql.py
URL:
http://svn.apache.org/viewvc/cassandra/trunk/test/system/test_cql.py?rev=1090333&r1=1090332&r2=1090333&view=diff
==============================================================================
--- cassandra/trunk/test/system/test_cql.py (original)
+++ cassandra/trunk/test/system/test_cql.py Fri Apr 8 16:30:03 2011
@@ -638,3 +638,23 @@ class TestCql(ThriftTester):
"name2",
"key0",
"value1")
+
+ def test_compression_disabled(self):
+ "reading and writing w/ compression disabled"
+ conn = init()
+ conn.execute("UPDATE StandardString1 SET ? = ? WHERE KEY = ?",
+ "some_name",
+ "some_value",
+ "compression_test",
+ compression='NONE')
+
+ r = conn.execute("SELECT ? FROM StandardString1 WHERE KEY = ?",
+ "some_name",
+ "compression_test",
+ compression='NONE')
+
+ assert len(r) == 1, "expected 1 result, got %d" % len(r)
+ assert r[0][0].name == "some_name", \
+ "unrecognized name '%s'" % r[0][0].name
+ assert r[0][0].value == "some_value", \
+ "unrecognized value '%s'" % r[0][0].value
