Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A9A0FEBC8 for ; Thu, 28 Feb 2013 13:06:20 +0000 (UTC) Received: (qmail 72089 invoked by uid 500); 28 Feb 2013 13:06:20 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 71941 invoked by uid 500); 28 Feb 2013 13:06:20 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 71920 invoked by uid 99); 28 Feb 2013 13:06:20 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 28 Feb 2013 13:06:20 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id F14F610C2C; Thu, 28 Feb 2013 13:06:19 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: slebresne@apache.org To: commits@cassandra.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [1/2] git commit: Fix composite comparator with super columns Message-Id: <20130228130619.F14F610C2C@tyr.zones.apache.org> Date: Thu, 28 Feb 2013 13:06:19 +0000 (UTC) Fix composite comparator with super columns patch by slebresne; reviewed by thobbs for CASSANDRA-5287 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/500c3f31 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/500c3f31 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/500c3f31 Branch: refs/heads/trunk Commit: 500c3f3158f0becbdbde8bfdc0e2aa934e8f0bec Parents: ab23afa Author: Sylvain Lebresne Authored: Thu Feb 28 14:03:25 2013 +0100 Committer: Sylvain Lebresne Committed: Thu Feb 28 14:03:25 2013 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/config/CFMetaData.java | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/500c3f31/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 4a7dd1a..9d0468b 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -2,6 +2,7 @@ * Avoid allocating SSTableBoundedScanner during repair when the range does not intersect the sstable (CASSANDRA-5249) * Don't lowercase property map keys (this breaks NTS) (CASSANDRA-5292) + * Fix composite comparator with super columns (CASSANDRA-5287) Merged from 1.1: * nodetool: ability to repair specific range (CASSANDRA-5280) * Fix possible assertion triggered in SliceFromReadCommand (CASSANDRA-5284) http://git-wip-us.apache.org/repos/asf/cassandra/blob/500c3f31/src/java/org/apache/cassandra/config/CFMetaData.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/config/CFMetaData.java b/src/java/org/apache/cassandra/config/CFMetaData.java index 73b7b6b..ae91d23 100644 --- a/src/java/org/apache/cassandra/config/CFMetaData.java +++ b/src/java/org/apache/cassandra/config/CFMetaData.java @@ -977,7 +977,7 @@ public final class CFMetaData */ public ColumnDefinition getColumnDefinitionFromColumnName(ByteBuffer columnName) { - if (comparator instanceof CompositeType) + if (cfType == ColumnFamilyType.Standard && comparator instanceof CompositeType) { CompositeType composite = (CompositeType)comparator; ByteBuffer[] components = composite.split(columnName);