Updated Branches: refs/heads/cassandra-1.2 feb7f2934 -> edc37bc84
Fix cqlsh tests Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/edc37bc8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/edc37bc8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/edc37bc8 Branch: refs/heads/cassandra-1.2 Commit: edc37bc8413132493046b3df289ca7dd04516f5c Parents: feb7f29 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Mon Mar 11 21:17:05 2013 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Mon Mar 11 21:17:05 2013 +0300 ---------------------------------------------------------------------- pylib/cqlshlib/test/test_cqlsh_output.py | 27 ++++++++------- pylib/cqlshlib/test/test_keyspace_init2.cql | 2 +- pylib/cqlshlib/test/test_keyspace_init3.cql | 40 +++++++++++----------- 3 files changed, 35 insertions(+), 34 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/edc37bc8/pylib/cqlshlib/test/test_cqlsh_output.py ---------------------------------------------------------------------- diff --git a/pylib/cqlshlib/test/test_cqlsh_output.py b/pylib/cqlshlib/test/test_cqlsh_output.py index dbce527..8127adf 100644 --- a/pylib/cqlshlib/test/test_cqlsh_output.py +++ b/pylib/cqlshlib/test/test_cqlsh_output.py @@ -275,7 +275,7 @@ class TestCqlshOutput(BaseTestCase): def test_static_cf_output(self): self.assertCqlverQueriesGiveColoredOutput(( - ('select a, b from twenty_rows_table where a in (1, 13, 2);', """ + ("select a, b from twenty_rows_table where a in ('1', '13', '2');", """ a | b MM MM ----+---- @@ -336,7 +336,7 @@ class TestCqlshOutput(BaseTestCase): ), cqlver=3) def test_columnless_key_output(self): - q = 'select a from twenty_rows_table where a in (1, 2, -9192);' + q = "select a from twenty_rows_table where a in ('1', '2', '-9192');" self.assertQueriesGiveColoredOutput(( (q, """ a @@ -580,16 +580,16 @@ class TestCqlshOutput(BaseTestCase): ("select num, blobcol from has_all_types where num in (0, 1, 2, 3);", r""" num | blobcol MMM MMMMMMM - -----+-------------------- + -----+---------------------- - 0 | 000102030405fffefd - G mmmmmmmmmmmmmmmmmm - 1 | ffffffffffffffffff - G mmmmmmmmmmmmmmmmmm - 2 | - G mmmmmmmmmmmmmmmmmm - 3 | 80 - G mmmmmmmmmmmmmmmmmm + 0 | 0x000102030405fffefd + G mmmmmmmmmmmmmmmmmmmm + 1 | 0xffffffffffffffffff + G mmmmmmmmmmmmmmmmmmmm + 2 | 0x + G mmmmmmmmmmmmmmmmmmmm + 3 | 0x80 + G mmmmmmmmmmmmmmmmmmmm """), ), cqlver=(2, 3)) @@ -749,7 +749,7 @@ class TestCqlshOutput(BaseTestCase): max_compaction_threshold=32 AND replicate_on_write='true' AND compaction_strategy_class='SizeTieredCompactionStrategy' AND - compression_parameters:sstable_compression='SnappyCompressor'; + compression_parameters:sstable_compression='LZ4Compressor'; """) @@ -779,8 +779,9 @@ class TestCqlshOutput(BaseTestCase): gc_grace_seconds=864000 AND read_repair_chance=0.100000 AND replicate_on_write='true' AND + populate_io_cache_on_flush='false' AND compaction={'class': 'SizeTieredCompactionStrategy'} AND - compression={'sstable_compression': 'SnappyCompressor'}; + compression={'sstable_compression': 'LZ4Compressor'}; """) http://git-wip-us.apache.org/repos/asf/cassandra/blob/edc37bc8/pylib/cqlshlib/test/test_keyspace_init2.cql ---------------------------------------------------------------------- diff --git a/pylib/cqlshlib/test/test_keyspace_init2.cql b/pylib/cqlshlib/test/test_keyspace_init2.cql index 415becc..ca5f4a4 100644 --- a/pylib/cqlshlib/test/test_keyspace_init2.cql +++ b/pylib/cqlshlib/test/test_keyspace_init2.cql @@ -13,7 +13,7 @@ CREATE TABLE has_all_types ( uuidcol uuid, varcharcol varchar, varintcol varint -); +) WITH compression_parameters:sstable_compression='LZ4Compressor'; INSERT INTO has_all_types (num, intcol, asciicol, bigintcol, blobcol, booleancol, decimalcol, doublecol, floatcol, textcol, http://git-wip-us.apache.org/repos/asf/cassandra/blob/edc37bc8/pylib/cqlshlib/test/test_keyspace_init3.cql ---------------------------------------------------------------------- diff --git a/pylib/cqlshlib/test/test_keyspace_init3.cql b/pylib/cqlshlib/test/test_keyspace_init3.cql index 8c5e4be..b801c55 100644 --- a/pylib/cqlshlib/test/test_keyspace_init3.cql +++ b/pylib/cqlshlib/test/test_keyspace_init3.cql @@ -14,23 +14,23 @@ CREATE TABLE twenty_rows_composite_table ( -- all in the same storage engine row: -INSERT INTO twenty_rows_composite_table (a, b, c) VALUES ('A', 1, 1); -INSERT INTO twenty_rows_composite_table (a, b, c) VALUES ('A', 2, 2); -INSERT INTO twenty_rows_composite_table (a, b, c) VALUES ('A', 3, 3); -INSERT INTO twenty_rows_composite_table (a, b, c) VALUES ('A', 4, 4); -INSERT INTO twenty_rows_composite_table (a, b, c) VALUES ('A', 5, 5); -INSERT INTO twenty_rows_composite_table (a, b, c) VALUES ('A', 6, 6); -INSERT INTO twenty_rows_composite_table (a, b, c) VALUES ('A', 7, 7); -INSERT INTO twenty_rows_composite_table (a, b, c) VALUES ('A', 8, 8); -INSERT INTO twenty_rows_composite_table (a, b, c) VALUES ('A', 9, 9); -INSERT INTO twenty_rows_composite_table (a, b, c) VALUES ('A', 10, 10); -INSERT INTO twenty_rows_composite_table (a, b, c) VALUES ('A', 11, 11); -INSERT INTO twenty_rows_composite_table (a, b, c) VALUES ('A', 12, 12); -INSERT INTO twenty_rows_composite_table (a, b, c) VALUES ('A', 13, 13); -INSERT INTO twenty_rows_composite_table (a, b, c) VALUES ('A', 14, 14); -INSERT INTO twenty_rows_composite_table (a, b, c) VALUES ('A', 15, 15); -INSERT INTO twenty_rows_composite_table (a, b, c) VALUES ('A', 16, 16); -INSERT INTO twenty_rows_composite_table (a, b, c) VALUES ('A', 17, 17); -INSERT INTO twenty_rows_composite_table (a, b, c) VALUES ('A', 18, 18); -INSERT INTO twenty_rows_composite_table (a, b, c) VALUES ('A', 19, 19); -INSERT INTO twenty_rows_composite_table (a, b, c) VALUES ('A', 20, 20); +INSERT INTO twenty_rows_composite_table (a, b, c) VALUES ('A', '1', '1'); +INSERT INTO twenty_rows_composite_table (a, b, c) VALUES ('A', '2', '2'); +INSERT INTO twenty_rows_composite_table (a, b, c) VALUES ('A', '3', '3'); +INSERT INTO twenty_rows_composite_table (a, b, c) VALUES ('A', '4', '4'); +INSERT INTO twenty_rows_composite_table (a, b, c) VALUES ('A', '5', '5'); +INSERT INTO twenty_rows_composite_table (a, b, c) VALUES ('A', '6', '6'); +INSERT INTO twenty_rows_composite_table (a, b, c) VALUES ('A', '7', '7'); +INSERT INTO twenty_rows_composite_table (a, b, c) VALUES ('A', '8', '8'); +INSERT INTO twenty_rows_composite_table (a, b, c) VALUES ('A', '9', '9'); +INSERT INTO twenty_rows_composite_table (a, b, c) VALUES ('A', '10', '10'); +INSERT INTO twenty_rows_composite_table (a, b, c) VALUES ('A', '11', '11'); +INSERT INTO twenty_rows_composite_table (a, b, c) VALUES ('A', '12', '12'); +INSERT INTO twenty_rows_composite_table (a, b, c) VALUES ('A', '13', '13'); +INSERT INTO twenty_rows_composite_table (a, b, c) VALUES ('A', '14', '14'); +INSERT INTO twenty_rows_composite_table (a, b, c) VALUES ('A', '15', '15'); +INSERT INTO twenty_rows_composite_table (a, b, c) VALUES ('A', '16', '16'); +INSERT INTO twenty_rows_composite_table (a, b, c) VALUES ('A', '17', '17'); +INSERT INTO twenty_rows_composite_table (a, b, c) VALUES ('A', '18', '18'); +INSERT INTO twenty_rows_composite_table (a, b, c) VALUES ('A', '19', '19'); +INSERT INTO twenty_rows_composite_table (a, b, c) VALUES ('A', '20', '20');
