Return-Path: Delivered-To: apmail-incubator-cassandra-commits-archive@minotaur.apache.org Received: (qmail 35259 invoked from network); 28 Sep 2009 17:38:34 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 28 Sep 2009 17:38:34 -0000 Received: (qmail 59997 invoked by uid 500); 28 Sep 2009 17:38:34 -0000 Delivered-To: apmail-incubator-cassandra-commits-archive@incubator.apache.org Received: (qmail 59977 invoked by uid 500); 28 Sep 2009 17:38:34 -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 59967 invoked by uid 99); 28 Sep 2009 17:38:34 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 28 Sep 2009 17:38:34 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED 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; Mon, 28 Sep 2009 17:38:32 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 38CC923888D4; Mon, 28 Sep 2009 17:38:12 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r819659 - in /incubator/cassandra/branches/cassandra-0.4: ./ interface/gen-java/org/apache/cassandra/service/ src/java/org/ src/java/org/apache/cassandra/db/ test/unit/org/ Date: Mon, 28 Sep 2009 17:38:12 -0000 To: cassandra-commits@incubator.apache.org From: jbellis@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090928173812.38CC923888D4@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jbellis Date: Mon Sep 28 17:38:11 2009 New Revision: 819659 URL: http://svn.apache.org/viewvc?rev=819659&view=rev Log: merge r819612 from trunk (fix bit math on column name read) Modified: incubator/cassandra/branches/cassandra-0.4/ (props changed) incubator/cassandra/branches/cassandra-0.4/interface/gen-java/org/apache/cassandra/service/Cassandra.java (props changed) incubator/cassandra/branches/cassandra-0.4/interface/gen-java/org/apache/cassandra/service/Column.java (props changed) incubator/cassandra/branches/cassandra-0.4/interface/gen-java/org/apache/cassandra/service/InvalidRequestException.java (props changed) incubator/cassandra/branches/cassandra-0.4/interface/gen-java/org/apache/cassandra/service/NotFoundException.java (props changed) incubator/cassandra/branches/cassandra-0.4/interface/gen-java/org/apache/cassandra/service/SuperColumn.java (props changed) incubator/cassandra/branches/cassandra-0.4/src/java/org/ (props changed) incubator/cassandra/branches/cassandra-0.4/src/java/org/apache/cassandra/db/ColumnSerializer.java incubator/cassandra/branches/cassandra-0.4/test/unit/org/ (props changed) Propchange: incubator/cassandra/branches/cassandra-0.4/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Sep 28 17:38:11 2009 @@ -1,2 +1,2 @@ /incubator/cassandra/branches/cassandra-0.3:774578-796573 -/incubator/cassandra/trunk:810540 +/incubator/cassandra/trunk:810540,819612 Propchange: incubator/cassandra/branches/cassandra-0.4/interface/gen-java/org/apache/cassandra/service/Cassandra.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Sep 28 17:38:11 2009 @@ -1,2 +1,2 @@ /incubator/cassandra/branches/cassandra-0.3/interface/gen-java/org/apache/cassandra/service/Cassandra.java:774578-796573 -/incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/Cassandra.java:749219-768588,810540 +/incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/Cassandra.java:749219-768588,810540,819612 Propchange: incubator/cassandra/branches/cassandra-0.4/interface/gen-java/org/apache/cassandra/service/Column.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Sep 28 17:38:11 2009 @@ -1,3 +1,3 @@ /incubator/cassandra/branches/cassandra-0.3/interface/gen-java/org/apache/cassandra/service/column_t.java:774578-792198 -/incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/Column.java:810540 +/incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/Column.java:810540,819612 /incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/column_t.java:749219-768588 Propchange: incubator/cassandra/branches/cassandra-0.4/interface/gen-java/org/apache/cassandra/service/InvalidRequestException.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Sep 28 17:38:11 2009 @@ -1,2 +1,2 @@ /incubator/cassandra/branches/cassandra-0.3/interface/gen-java/org/apache/cassandra/service/InvalidRequestException.java:774578-796573 -/incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/InvalidRequestException.java:749219-768588,810540 +/incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/InvalidRequestException.java:749219-768588,810540,819612 Propchange: incubator/cassandra/branches/cassandra-0.4/interface/gen-java/org/apache/cassandra/service/NotFoundException.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Sep 28 17:38:11 2009 @@ -1,2 +1,2 @@ /incubator/cassandra/branches/cassandra-0.3/interface/gen-java/org/apache/cassandra/service/NotFoundException.java:774578-796573 -/incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/NotFoundException.java:749219-768588,810540 +/incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/NotFoundException.java:749219-768588,810540,819612 Propchange: incubator/cassandra/branches/cassandra-0.4/interface/gen-java/org/apache/cassandra/service/SuperColumn.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Sep 28 17:38:11 2009 @@ -1,3 +1,3 @@ /incubator/cassandra/branches/cassandra-0.3/interface/gen-java/org/apache/cassandra/service/superColumn_t.java:774578-792198 -/incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/SuperColumn.java:810540 +/incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/SuperColumn.java:810540,819612 /incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/superColumn_t.java:749219-768588 Propchange: incubator/cassandra/branches/cassandra-0.4/src/java/org/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Sep 28 17:38:11 2009 @@ -1,2 +1,2 @@ /incubator/cassandra/branches/cassandra-0.3/src/java/org:774578-796573 -/incubator/cassandra/trunk/src/java/org:749219-769885,810540 +/incubator/cassandra/trunk/src/java/org:749219-769885,810540,819612 Modified: incubator/cassandra/branches/cassandra-0.4/src/java/org/apache/cassandra/db/ColumnSerializer.java URL: http://svn.apache.org/viewvc/incubator/cassandra/branches/cassandra-0.4/src/java/org/apache/cassandra/db/ColumnSerializer.java?rev=819659&r1=819658&r2=819659&view=diff ============================================================================== --- incubator/cassandra/branches/cassandra-0.4/src/java/org/apache/cassandra/db/ColumnSerializer.java (original) +++ incubator/cassandra/branches/cassandra-0.4/src/java/org/apache/cassandra/db/ColumnSerializer.java Mon Sep 28 17:38:11 2009 @@ -41,8 +41,8 @@ public static byte[] readName(DataInput in) throws IOException { int length = 0; - length |= (in.readByte() << 8); - length |= in.readByte(); + length |= (in.readByte() & 0xFF) << 8; + length |= in.readByte() & 0xFF; byte[] bytes = new byte[length]; in.readFully(bytes); return bytes; Propchange: incubator/cassandra/branches/cassandra-0.4/test/unit/org/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Sep 28 17:38:11 2009 @@ -1,2 +1,2 @@ /incubator/cassandra/branches/cassandra-0.3/test/unit/org:774578-796573 -/incubator/cassandra/trunk/test/unit/org:749219-768583,810540 +/incubator/cassandra/trunk/test/unit/org:749219-768583,810540,819612