Return-Path: Delivered-To: apmail-incubator-cassandra-commits-archive@minotaur.apache.org Received: (qmail 62610 invoked from network); 18 Dec 2009 15:10:58 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 18 Dec 2009 15:10:58 -0000 Received: (qmail 98381 invoked by uid 500); 18 Dec 2009 15:10:58 -0000 Delivered-To: apmail-incubator-cassandra-commits-archive@incubator.apache.org Received: (qmail 98367 invoked by uid 500); 18 Dec 2009 15:10:58 -0000 Mailing-List: contact cassandra-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cassandra-dev@incubator.apache.org Delivered-To: mailing list cassandra-commits@incubator.apache.org Received: (qmail 98357 invoked by uid 99); 18 Dec 2009 15:10:58 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 18 Dec 2009 15:10:58 +0000 X-ASF-Spam-Status: No, hits=-2.6 required=5.0 tests=AWL,BAYES_00 X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 18 Dec 2009 15:10:51 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 533062388A66; Fri, 18 Dec 2009 15:10:31 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r892271 - in /incubator/cassandra/branches/cassandra-0.5: CHANGES.txt src/java/org/apache/cassandra/utils/MerkleTree.java Date: Fri, 18 Dec 2009 15:10:29 -0000 To: cassandra-commits@incubator.apache.org From: jbellis@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091218151031.533062388A66@eris.apache.org> Author: jbellis Date: Fri Dec 18 15:10:26 2009 New Revision: 892271 URL: http://svn.apache.org/viewvc?rev=892271&view=rev Log: fix off-by-one error in MerkleTree. patch by Stu Hood; reviewed by gdusbabek for CASSANDRA-639 Modified: incubator/cassandra/branches/cassandra-0.5/CHANGES.txt incubator/cassandra/branches/cassandra-0.5/src/java/org/apache/cassandra/utils/MerkleTree.java Modified: incubator/cassandra/branches/cassandra-0.5/CHANGES.txt URL: http://svn.apache.org/viewvc/incubator/cassandra/branches/cassandra-0.5/CHANGES.txt?rev=892271&r1=892270&r2=892271&view=diff ============================================================================== --- incubator/cassandra/branches/cassandra-0.5/CHANGES.txt (original) +++ incubator/cassandra/branches/cassandra-0.5/CHANGES.txt Fri Dec 18 15:10:26 2009 @@ -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) Modified: incubator/cassandra/branches/cassandra-0.5/src/java/org/apache/cassandra/utils/MerkleTree.java URL: http://svn.apache.org/viewvc/incubator/cassandra/branches/cassandra-0.5/src/java/org/apache/cassandra/utils/MerkleTree.java?rev=892271&r1=892270&r2=892271&view=diff ============================================================================== --- incubator/cassandra/branches/cassandra-0.5/src/java/org/apache/cassandra/utils/MerkleTree.java (original) +++ incubator/cassandra/branches/cassandra-0.5/src/java/org/apache/cassandra/utils/MerkleTree.java Fri Dec 18 15:10:26 2009 @@ -51,7 +51,7 @@ { 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 MerkleTree(IPartitioner partitioner, byte hashdepth, long maxsize) { + assert hashdepth < Byte.MAX_VALUE; this.partitioner = partitioner; this.hashdepth = hashdepth; this.maxsize = maxsize;