You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2011/09/09 19:07:55 UTC
svn commit: r1167299 - in /cassandra/trunk/drivers:
java/test/org/apache/cassandra/cql/JdbcDriverTest.java py/cql/__init__.py
py/cql/marshal.py py/cqlsh
Author: jbellis
Date: Fri Sep 9 17:07:55 2011
New Revision: 1167299
URL: http://svn.apache.org/viewvc?rev=1167299&view=rev
Log:
update drivers for #3031
Modified:
cassandra/trunk/drivers/java/test/org/apache/cassandra/cql/JdbcDriverTest.java
cassandra/trunk/drivers/py/cql/__init__.py
cassandra/trunk/drivers/py/cql/marshal.py
cassandra/trunk/drivers/py/cqlsh
Modified: cassandra/trunk/drivers/java/test/org/apache/cassandra/cql/JdbcDriverTest.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/drivers/java/test/org/apache/cassandra/cql/JdbcDriverTest.java?rev=1167299&r1=1167298&r2=1167299&view=diff
==============================================================================
--- cassandra/trunk/drivers/java/test/org/apache/cassandra/cql/JdbcDriverTest.java (original)
+++ cassandra/trunk/drivers/java/test/org/apache/cassandra/cql/JdbcDriverTest.java Fri Sep 9 17:07:55 2011
@@ -176,11 +176,11 @@ public class JdbcDriverTest extends Embe
ResultSetMetaData md = rs.getMetaData();
assert md.getColumnCount() == 2;
- expectedMetaData(md, 1, Long.class.getName(), "JdbcLong", "Keyspace1", "1", Types.INTEGER, JdbcLong.class.getSimpleName(), true, false);
- expectedMetaData(md, 2, Long.class.getName(), "JdbcLong", "Keyspace1", "2", Types.INTEGER, JdbcLong.class.getSimpleName(), true, false);
+ expectedMetaData(md, 1, Long.class.getName(), "JdbcLong", "Keyspace1", "1", Types.BIGINT, JdbcLong.class.getSimpleName(), true, false);
+ expectedMetaData(md, 2, Long.class.getName(), "JdbcLong", "Keyspace1", "2", Types.BIGINT, JdbcLong.class.getSimpleName(), true, false);
for (int i = 0; i < md.getColumnCount(); i++)
- expectedMetaData(md, i + 1, Long.class.getName(), Types.INTEGER, JdbcLong.class.getSimpleName(), true, false);
+ expectedMetaData(md, i + 1, Long.class.getName(), Types.BIGINT, JdbcLong.class.getSimpleName(), true, false);
}
@Test
Modified: cassandra/trunk/drivers/py/cql/__init__.py
URL: http://svn.apache.org/viewvc/cassandra/trunk/drivers/py/cql/__init__.py?rev=1167299&r1=1167298&r2=1167299&view=diff
==============================================================================
--- cassandra/trunk/drivers/py/cql/__init__.py (original)
+++ cassandra/trunk/drivers/py/cql/__init__.py Fri Sep 9 17:07:55 2011
@@ -90,6 +90,7 @@ NUMBER = DBAPITypeObject(marshal.LONG_TY
DATETIME = DBAPITypeObject(marshal.TIME_UUID_TYPE)
ROWID = DBAPITypeObject(marshal.BYTES_TYPE, marshal.ASCII_TYPE, marshal.UTF8_TYPE,
+ marshal.INT32_TYPE,
marshal.INTEGER_TYPE, marshal.LONG_TYPE, marshal.UUID_TYPE,
marshal.LEXICAL_UUID_TYPE, marshal.TIME_UUID_TYPE)
Modified: cassandra/trunk/drivers/py/cql/marshal.py
URL: http://svn.apache.org/viewvc/cassandra/trunk/drivers/py/cql/marshal.py?rev=1167299&r1=1167298&r2=1167299&view=diff
==============================================================================
--- cassandra/trunk/drivers/py/cql/marshal.py (original)
+++ cassandra/trunk/drivers/py/cql/marshal.py Fri Sep 9 17:07:55 2011
@@ -26,6 +26,7 @@ __all__ = ['prepare', 'marshal', 'unmars
if hasattr(struct, 'Struct'): # new in Python 2.5
_have_struct = True
_long_packer = struct.Struct('>q')
+ _int32_packer = struct.Struct('>i')
else:
_have_struct = False
@@ -34,6 +35,7 @@ _param_re = re.compile(r"(?<!strategy_op
BYTES_TYPE = "org.apache.cassandra.db.marshal.BytesType"
ASCII_TYPE = "org.apache.cassandra.db.marshal.AsciiType"
UTF8_TYPE = "org.apache.cassandra.db.marshal.UTF8Type"
+INT32_TYPE = "org.apache.cassandra.db.marshal.Int32Type"
INTEGER_TYPE = "org.apache.cassandra.db.marshal.IntegerType"
LONG_TYPE = "org.apache.cassandra.db.marshal.LongType"
UUID_TYPE = "org.apache.cassandra.db.marshal.UUIDType"
@@ -64,6 +66,13 @@ def unmarshal_noop(bytestr):
def unmarshal_utf8(bytestr):
return bytestr.decode("utf8")
+if _have_struct:
+ def unmarshal_int32(bytestr):
+ return _int32_packer.unpack(bytestr)[0]
+else:
+ def unmarshal_int32(bytestr):
+ return struct.unpack(">i", bytestr)[0]
+
def unmarshal_int(bytestr):
return decode_bigint(bytestr)
@@ -80,6 +89,7 @@ def unmarshal_uuid(bytestr):
unmarshallers = {BYTES_TYPE: unmarshal_noop,
ASCII_TYPE: unmarshal_noop,
UTF8_TYPE: unmarshal_utf8,
+ INT32_TYPE: unmarshal_int32,
INTEGER_TYPE: unmarshal_int,
LONG_TYPE: unmarshal_long,
UUID_TYPE: unmarshal_uuid,
Modified: cassandra/trunk/drivers/py/cqlsh
URL: http://svn.apache.org/viewvc/cassandra/trunk/drivers/py/cqlsh?rev=1167299&r1=1167298&r2=1167299&view=diff
==============================================================================
--- cassandra/trunk/drivers/py/cqlsh (original)
+++ cassandra/trunk/drivers/py/cqlsh Fri Sep 9 17:07:55 2011
@@ -36,7 +36,7 @@ except ImportError:
from cql.cursor import _COUNT_DESCRIPTION, _VOID_DESCRIPTION
HISTORY = os.path.join(os.path.expanduser('~'), '.cqlsh')
-CQLTYPES = ("bytes", "ascii", "utf8", "timeuuid", "uuid", "long", "int")
+CQLTYPES = ("bytes", "ascii", "utf8", "timeuuid", "uuid", "long", "int", "int32")
RED = "\033[1;31m%s\033[0m"
GREEN = "\033[1;32m%s\033[0m"