cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [1/4] git commit: note that using KEY instead of the defined key_alias has been removed
Date Tue, 10 Jan 2012 20:01:53 GMT
Updated Branches:
  refs/heads/cassandra-1.0 044eb1ede -> e2231a197
  refs/heads/trunk a3f2e9c3b -> d48a6c14f


note that using KEY instead of the defined key_alias has been removed


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d48a6c14
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d48a6c14
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d48a6c14

Branch: refs/heads/trunk
Commit: d48a6c14f370dfe97eb4e45c567ea9d1923914c6
Parents: d371edf
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Tue Jan 10 12:56:23 2012 -0600
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Tue Jan 10 12:56:23 2012 -0600

----------------------------------------------------------------------
 NEWS.txt                                           |    5 +++++
 src/java/org/apache/cassandra/cql/WhereClause.java |    4 +---
 2 files changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d48a6c14/NEWS.txt
----------------------------------------------------------------------
diff --git a/NEWS.txt b/NEWS.txt
index 24039e6..868ff73 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -39,6 +39,11 @@ Upgrading
     - Hadoop input and output details are now separated.  If you were
       previously using methods such as getRpcPort you now need to use
       getInputRpcPort or getOutputRpcPort depending on the circumstance.
+    - CQL changes:
+      + Prior to 1.1, you could use KEY as the primary key name in some
+        select statements, even if the PK was actually given a different
+        name.  In 1.1+ you must use the defined PK name.
+        
 
 Features
 --------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/d48a6c14/src/java/org/apache/cassandra/cql/WhereClause.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql/WhereClause.java b/src/java/org/apache/cassandra/cql/WhereClause.java
index 13e27e9..0007c98 100644
--- a/src/java/org/apache/cassandra/cql/WhereClause.java
+++ b/src/java/org/apache/cassandra/cql/WhereClause.java
@@ -160,7 +160,7 @@ public class WhereClause
         for (Relation relation : clauseRelations)
         {
             String name = relation.getEntity().getText().toUpperCase();
-            if (name.equals(realKeyAlias) || name.equals("KEY"))
+            if (name.equals(realKeyAlias))
             {
                 if (keyAlias == null) // setting found key as an alias
                     keyAlias = name;
@@ -199,6 +199,4 @@ public class WhereClause
                              multiKey,
                              keyAlias);
     }
-    
-
 }


Mime
View raw message