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 9CB84D4A0 for ; Fri, 5 Oct 2012 16:52:52 +0000 (UTC) Received: (qmail 91200 invoked by uid 500); 5 Oct 2012 16:52:52 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 91151 invoked by uid 500); 5 Oct 2012 16:52:52 -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 91142 invoked by uid 99); 5 Oct 2012 16:52:52 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 05 Oct 2012 16:52:52 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 1BBED3A7C6; Fri, 5 Oct 2012 16:52:52 +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: git commit: Correctly accept upper-case data type (CQL3) Message-Id: <20121005165252.1BBED3A7C6@tyr.zones.apache.org> Date: Fri, 5 Oct 2012 16:52:52 +0000 (UTC) Updated Branches: refs/heads/cassandra-1.1 0d44159e6 -> 6eafeb2b0 Correctly accept upper-case data type (CQL3) patch by slebresne; reviewed by jbellis for CASSANDRA-4770 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6eafeb2b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6eafeb2b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6eafeb2b Branch: refs/heads/cassandra-1.1 Commit: 6eafeb2b0147a923d66405a7f376242acab790d5 Parents: 0d44159 Author: Sylvain Lebresne Authored: Fri Oct 5 17:59:47 2012 +0200 Committer: Sylvain Lebresne Committed: Fri Oct 5 18:52:07 2012 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/cql3/CFPropDefs.java | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6eafeb2b/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 218c320..c680f03 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -18,6 +18,7 @@ * (CQL3) Don't return ReversedType in result set metadata (CASSANDRA-4717) * Pluggable Thrift transport factories for CLI (CASSANDRA-4609) * Backport adding AlterKeyspace statement (CASSANDRA-4611) + * (CQL3) Correcty accept upper-case data types (CASSANDRA-4770) Merged from 1.0: * Switch from NBHM to CHM in MessagingService's callback map, which prevents OOM in long-running instances (CASSANDRA-4708) http://git-wip-us.apache.org/repos/asf/cassandra/blob/6eafeb2b/src/java/org/apache/cassandra/cql3/CFPropDefs.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cql3/CFPropDefs.java b/src/java/org/apache/cassandra/cql3/CFPropDefs.java index ab209dd..ec8bd5a 100644 --- a/src/java/org/apache/cassandra/cql3/CFPropDefs.java +++ b/src/java/org/apache/cassandra/cql3/CFPropDefs.java @@ -105,7 +105,7 @@ public class CFPropDefs extends PropertyDefinitions { try { - String className = comparators.get(type); + String className = comparators.get(type.toLowerCase()); if (className == null) className = type; return TypeParser.parse(className);