natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cassandra-2.1' into cassandra-2.2 

Conflicts:
	CHANGES.txt
This commit is contained in:
T Jake Luciani 2015-05-27 16:21:28 -04:00
parent 80ba11c62a fb1eaab412
commit 6fe6c99baa
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES.txt
View File

@ -159,6 +159,9 @@ Merged from 2.0:
* Fix streaming not holding ref when stream error (CASSANDRA-9295) * Fix streaming not holding ref when stream error (CASSANDRA-9295)
* Fix canonical view returning early opened SSTables (CASSANDRA-9396) * Fix canonical view returning early opened SSTables (CASSANDRA-9396)
Merged from 2.0: Merged from 2.0:
* Fix potential StackOverflow when setting CrcCheckChance over JMX (CASSANDRA-9488)
* Fix null static columns in pages after the first, paged reversed
queries (CASSANDRA-8502)
* Fix counting cache serialization in request metrics (CASSANDRA-9466) * Fix counting cache serialization in request metrics (CASSANDRA-9466)
* (cqlsh) Add LOGIN command to switch users (CASSANDRA-7212) * (cqlsh) Add LOGIN command to switch users (CASSANDRA-7212)
* Clone SliceQueryFilter in AbstractReadCommand implementations (CASSANDRA-8940) * Clone SliceQueryFilter in AbstractReadCommand implementations (CASSANDRA-8940)

2
src/java/org/apache/cassandra/io/compress/CompressionParameters.java
View File

@ -110,7 +110,7 @@ public class CompressionParameters
validateCrcCheckChance(crcCheckChance); validateCrcCheckChance(crcCheckChance);
this.crcCheckChance = crcCheckChance; this.crcCheckChance = crcCheckChance;
if (liveMetadata != null) if (liveMetadata != null && this != liveMetadata.compressionParameters)
liveMetadata.compressionParameters.setCrcCheckChance(crcCheckChance); liveMetadata.compressionParameters.setCrcCheckChance(crcCheckChance);
} }

2
test/unit/org/apache/cassandra/cql3/CrcCheckChanceTest.java
View File

@ -56,6 +56,8 @@ public class CrcCheckChanceTest extends CQLTester
Assert.assertEquals(0.99, indexCfs.metadata.compressionParameters.getCrcCheckChance()); Assert.assertEquals(0.99, indexCfs.metadata.compressionParameters.getCrcCheckChance());
Assert.assertEquals(0.99, indexCfs.getSSTables().iterator().next().getCompressionMetadata().parameters.getCrcCheckChance()); Assert.assertEquals(0.99, indexCfs.getSSTables().iterator().next().getCompressionMetadata().parameters.getCrcCheckChance());
//Test for stack overflow
cfs.setCrcCheckChance(0.99);
assertRows(execute("SELECT * FROM %s WHERE p=?", "p1"), assertRows(execute("SELECT * FROM %s WHERE p=?", "p1"),
row("p1", "k1", "sv1", "v1"), row("p1", "k1", "sv1", "v1"),