You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sl...@apache.org on 2012/12/05 09:02:42 UTC
[2/2] git commit: Fix preparing INSERT queries
Fix preparing INSERT queries
patch by slebresne; reviewed by iamaleksey for CASSANDRA-5016
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/25d41ceb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/25d41ceb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/25d41ceb
Branch: refs/heads/cassandra-1.2.0
Commit: 25d41ceb0500145f29f443610e4fac4a61859fca
Parents: 2158131
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Wed Dec 5 08:59:37 2012 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Wed Dec 5 08:59:37 2012 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../cassandra/cql3/statements/UpdateStatement.java | 3 ++-
2 files changed, 3 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/25d41ceb/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 732cc5d..ad2a1a8 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,7 @@
1.2-rc1
* rename rpc_timeout settings to request_timeout (CASSANDRA-5027)
* add BF with 0.1 FP to LCS by default (CASSANDRA-5029)
+ * Fix preparing insert queries (CASSANDRA-5016)
1.2-beta3
http://git-wip-us.apache.org/repos/asf/cassandra/blob/25d41ceb/src/java/org/apache/cassandra/cql3/statements/UpdateStatement.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql3/statements/UpdateStatement.java b/src/java/org/apache/cassandra/cql3/statements/UpdateStatement.java
index 97844ad..c690530 100644
--- a/src/java/org/apache/cassandra/cql3/statements/UpdateStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/UpdateStatement.java
@@ -340,7 +340,8 @@ public class UpdateStatement extends ModificationStatement
case COLUMN_ALIAS:
if (processedKeys.containsKey(name.name))
throw new InvalidRequestException(String.format("Multiple definitions found for PRIMARY KEY part %s", name));
- if (operation.getType() != Operation.Type.COLUMN)
+ // We know collection are not accepted for key and column aliases
+ if (operation.getType() != Operation.Type.COLUMN && operation.getType() != Operation.Type.PREPARED)
throw new InvalidRequestException(String.format("Invalid definition for %s, not a collection type", name));
processedKeys.put(name.name, operation.getValues());
break;