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

fix off-by-one error in MerkleTree. patch by Stu Hood; reviewed by gdusbabek for CASSANDRA-639 

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/branches/cassandra-0.5@892271 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jonathan Ellis 2009-12-18 15:10:26 +00:00
parent c4cc350585
commit 70ee8febbe
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -4,6 +4,7 @@
* fix data streaming on windows (CASSANDRA-630)
* GC compacted sstables after cleanup and compaction (CASSANDRA-621)
* Speed up anti-entropy validation (CASSANDRA-629)
* Fix anti-entropy assertion error (CASSANDRA-639)
* Fix pending range conflicts when bootstapping or moving
multiple nodes at once (CASSANDRA-603)

3
src/java/org/apache/cassandra/utils/MerkleTree.java
View File

@ -51,7 +51,7 @@ public class MerkleTree implements Serializable
{
private static final long serialVersionUID = 2L;
public static final byte RECOMMENDED_DEPTH = Byte.MAX_VALUE;
public static final byte RECOMMENDED_DEPTH = Byte.MAX_VALUE - 1;
public static final int CONSISTENT = 0;
public static final int FULLY_INCONSISTENT = 1;
@ -73,6 +73,7 @@ public class MerkleTree implements Serializable
*/
public MerkleTree(IPartitioner partitioner, byte hashdepth, long maxsize)
{
assert hashdepth < Byte.MAX_VALUE;
this.partitioner = partitioner;
this.hashdepth = hashdepth;
this.maxsize = maxsize;