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

update legacy test with corrected DCT

Browse Source
This commit is contained in:
Adam Holmberg
2016-07-21 12:19:30 -05:00
parent c509f5902f
commit 117e9ef885
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
tests/integration/standard/test_metadata.py
View File

@@ -1155,14 +1155,12 @@ Approximate structure, for reference:
CREATE TABLE legacy.composite_comp_with_col ( CREATE TABLE legacy.composite_comp_with_col (
key blob, key blob,
b blob, column1 'org.apache.cassandra.db.marshal.DynamicCompositeType(b=>org.apache.cassandra.db.marshal.BytesType, s=>org.apache.cassandra.db.marshal.UTF8Type, t=>org.apache.cassandra.db.marshal.TimeUUIDType)',
s text,
t timeuuid,
"b@6869746d65776974686d75736963" blob, "b@6869746d65776974686d75736963" blob,
"b@6d616d6d616a616d6d61" blob, "b@6d616d6d616a616d6d61" blob,
PRIMARY KEY (key, b, s, t) PRIMARY KEY (key, column1)
) WITH COMPACT STORAGE ) WITH COMPACT STORAGE
AND CLUSTERING ORDER BY (b ASC, s ASC, t ASC) AND CLUSTERING ORDER BY (column1 ASC)
AND caching = '{"keys":"ALL", "rows_per_partition":"NONE"}' AND caching = '{"keys":"ALL", "rows_per_partition":"NONE"}'
AND comment = 'Stores file meta data' AND comment = 'Stores file meta data'
AND compaction = {'min_threshold': '4', 'class': 'org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy', 'max_threshold': '32'} AND compaction = {'min_threshold': '4', 'class': 'org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy', 'max_threshold': '32'}
@@ -1283,12 +1281,11 @@ Approximate structure, for reference:
CREATE TABLE legacy.composite_comp_no_col ( CREATE TABLE legacy.composite_comp_no_col (
key blob, key blob,
column1 'org.apache.cassandra.db.marshal.DynamicCompositeType(org.apache.cassandra.db.marshal.BytesType, org.apache.cassandra.db.marshal.UTF8Type, org.apache.cassandra.db.marshal.TimeUUIDType)', column1 'org.apache.cassandra.db.marshal.DynamicCompositeType(b=>org.apache.cassandra.db.marshal.BytesType, s=>org.apache.cassandra.db.marshal.UTF8Type, t=>org.apache.cassandra.db.marshal.TimeUUIDType)',
column2 timeuuid,
value blob, value blob,
PRIMARY KEY (key, column1, column1, column2) PRIMARY KEY (key, column1)
) WITH COMPACT STORAGE ) WITH COMPACT STORAGE
AND CLUSTERING ORDER BY (column1 ASC, column1 ASC, column2 ASC) AND CLUSTERING ORDER BY (column1 ASC)
AND caching = '{"keys":"ALL", "rows_per_partition":"NONE"}' AND caching = '{"keys":"ALL", "rows_per_partition":"NONE"}'
AND comment = 'Stores file meta data' AND comment = 'Stores file meta data'
AND compaction = {'min_threshold': '4', 'class': 'org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy', 'max_threshold': '32'} AND compaction = {'min_threshold': '4', 'class': 'org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy', 'max_threshold': '32'}