Revert "Adds the ability to use uncompressed chunks in compressed files"
This reverts commit 058b95289bf815495fced0ac55a78bcceceea9fa. Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f1b0ba8a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f1b0ba8a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f1b0ba8a Branch: refs/heads/master Commit: f1b0ba8a1d60937b79ccac43b23c887da8ced32a Parents: 6f4e41e Author: Joel Knighton <joel.knigh...@datastax.com> Authored: Wed Jul 12 12:11:02 2017 -0500 Committer: Joel Knighton <joel.knigh...@datastax.com> Committed: Wed Jul 12 12:11:02 2017 -0500 ---------------------------------------------------------------------- cqlsh_tests/cqlsh_tests.py | 44 ++--------------------------------------- 1 file changed, 2 insertions(+), 42 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f1b0ba8a/cqlsh_tests/cqlsh_tests.py ---------------------------------------------------------------------- diff --git a/cqlsh_tests/cqlsh_tests.py b/cqlsh_tests/cqlsh_tests.py index dee1891..e7bc11c 100644 --- a/cqlsh_tests/cqlsh_tests.py +++ b/cqlsh_tests/cqlsh_tests.py @@ -847,25 +847,7 @@ VALUES (4, blobAsInt(0x), '', blobAsBigint(0x), 0x, blobAsBoolean(0x), blobAsDec PRIMARY KEY (id, col) """ - if self.cluster.version() >= LooseVersion('4.0'): - ret += """ - ) WITH CLUSTERING ORDER BY (col ASC) - AND bloom_filter_fp_chance = 0.01 - AND caching = {'keys': 'ALL', 'rows_per_partition': 'NONE'} - AND comment = '' - AND compaction = {'class': 'org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy', 'max_threshold': '32', 'min_threshold': '4'} - AND compression = {'chunk_length_in_kb': '64', 'class': 'org.apache.cassandra.io.compress.LZ4Compressor', 'min_compress_ratio': '1.1'} - AND crc_check_chance = 1.0 - AND dclocal_read_repair_chance = 0.1 - AND default_time_to_live = 0 - AND gc_grace_seconds = 864000 - AND max_index_interval = 2048 - AND memtable_flush_period_in_ms = 0 - AND min_index_interval = 128 - AND read_repair_chance = 0.0 - AND speculative_retry = '99PERCENTILE'; - """ - elif self.cluster.version() >= LooseVersion('3.9'): + if self.cluster.version() >= LooseVersion('3.9'): ret += """ ) WITH CLUSTERING ORDER BY (col ASC) AND bloom_filter_fp_chance = 0.01 @@ -931,29 +913,7 @@ VALUES (4, blobAsInt(0x), '', blobAsBigint(0x), 0x, blobAsBoolean(0x), blobAsDec return ret + "\n" + col_idx_def def get_users_table_output(self): - if self.cluster.version() >= LooseVersion('4.0'): - return """ - CREATE TABLE test.users ( - userid text PRIMARY KEY, - age int, - firstname text, - lastname text - ) WITH bloom_filter_fp_chance = 0.01 - AND caching = {'keys': 'ALL', 'rows_per_partition': 'NONE'} - AND comment = '' - AND compaction = {'class': 'org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy', 'max_threshold': '32', 'min_threshold': '4'} - AND compression = {'chunk_length_in_kb': '64', 'class': 'org.apache.cassandra.io.compress.LZ4Compressor', 'min_compress_ratio': '1.1'} - AND crc_check_chance = 1.0 - AND dclocal_read_repair_chance = 0.1 - AND default_time_to_live = 0 - AND gc_grace_seconds = 864000 - AND max_index_interval = 2048 - AND memtable_flush_period_in_ms = 0 - AND min_index_interval = 128 - AND read_repair_chance = 0.0 - AND speculative_retry = '99PERCENTILE'; - """ + self.get_index_output('myindex', 'test', 'users', 'age') - elif self.cluster.version() >= LooseVersion('3.9'): + if self.cluster.version() >= LooseVersion('3.9'): return """ CREATE TABLE test.users ( userid text PRIMARY KEY, --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org