cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alek...@apache.org
Subject git commit: Fix preparing statements when current keyspace is not set
Date Mon, 15 Apr 2013 21:55:58 GMT
Updated Branches:
  refs/heads/cassandra-1.2 b7ef940ef -> cf532fe59


 Fix preparing statements when current keyspace is not set

 patch by Aleksey Yeschenko; reviewed by Jonathan Ellis for
 CASSANDRA-5468


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

Branch: refs/heads/cassandra-1.2
Commit: cf532fe59a6aff9e3f914e370471e9564898e391
Parents: b7ef940
Author: Aleksey Yeschenko <aleksey@apache.org>
Authored: Tue Apr 16 00:54:42 2013 +0300
Committer: Aleksey Yeschenko <aleksey@apache.org>
Committed: Tue Apr 16 00:54:42 2013 +0300

----------------------------------------------------------------------
 CHANGES.txt                                        |    1 +
 .../org/apache/cassandra/cql3/QueryProcessor.java  |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/cf532fe5/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index b17d8e1..008a9fb 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -4,6 +4,7 @@
    (CASSANDRA-5445)
  * Allow empty blob literals in CQL3 (CASSANDRA-5452)
  * Fix streaming RangeTombstones at column index boundary (CASSANDRA-5418)
+ * Fix preparing statements when current keyspace is not set (CASSANDRA-5468)
 Merged from 1.1:
  * Fix trying to load deleted row into row cache on startup (CASSANDRA-4463)
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/cf532fe5/src/java/org/apache/cassandra/cql3/QueryProcessor.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql3/QueryProcessor.java b/src/java/org/apache/cassandra/cql3/QueryProcessor.java
index 7dcd467..cd4ff25 100644
--- a/src/java/org/apache/cassandra/cql3/QueryProcessor.java
+++ b/src/java/org/apache/cassandra/cql3/QueryProcessor.java
@@ -205,7 +205,7 @@ public class QueryProcessor
         logger.trace("CQL QUERY: {}", queryString);
 
         ParsedStatement.Prepared prepared = getStatement(queryString, clientState);
-        ResultMessage.Prepared msg = storePreparedStatement(queryString, clientState.getKeyspace(),
prepared, forThrift);
+        ResultMessage.Prepared msg = storePreparedStatement(queryString, clientState.getRawKeyspace(),
prepared, forThrift);
 
         assert prepared.statement.getBoundsTerms() == prepared.boundNames.size();
         return msg;


Mime
View raw message