Author: slebresne Date: Tue Nov 15 07:39:12 2011 New Revision: 1202080 URL: http://svn.apache.org/viewvc?rev=1202080&view=rev Log: Fix bad handling of the chunk_length_kb compression option patch by slebresne; reviewed by xedin for CASSANDRA-3492
Modified: cassandra/branches/cassandra-1.0/CHANGES.txt cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/io/compress/CompressionParameters.java Modified: cassandra/branches/cassandra-1.0/CHANGES.txt URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0/CHANGES.txt?rev=1202080&r1=1202079&r2=1202080&view=diff ============================================================================== --- cassandra/branches/cassandra-1.0/CHANGES.txt (original) +++ cassandra/branches/cassandra-1.0/CHANGES.txt Tue Nov 15 07:39:12 2011 @@ -14,6 +14,7 @@ * Fix race introduced by CASSANDRA-2503 (CASSANDRA-3482) * Fix incomplete deletion of delivered hints (CASSANDRA-3466) * Avoid reschuling compactions when no compaction was executed (CASSANDRA-3483) + * fix handling of the chunk_length_kb compression options (CASSANDRA-3492) Merged from 0.8: * Make counter shard merging thread safe (CASSANDRA-3178) * fix updating CF row_cache_provider (CASSANDRA-3414) Modified: cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/io/compress/CompressionParameters.java URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/io/compress/CompressionParameters.java?rev=1202080&r1=1202079&r2=1202080&view=diff ============================================================================== --- cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/io/compress/CompressionParameters.java (original) +++ cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/io/compress/CompressionParameters.java Tue Nov 15 07:39:12 2011 @@ -137,6 +137,9 @@ public class CompressionParameters return compressionOptions; } + /** + * Parse the chunk length (in KB) and returns it as bytes. + */ private static Integer parseChunkLength(String chLength) throws ConfigurationException { if (chLength == null) @@ -144,7 +147,7 @@ public class CompressionParameters try { - return Integer.parseInt(chLength); + return 1024 * Integer.parseInt(chLength); } catch (NumberFormatException e) {