Updated Branches: refs/heads/cassandra-2.0 1b858be48 -> 8bbb6eda6
Fix preparing statement with batch and delete from collection patch by Jan Chochol; reviewed by slebresne for CASSANDRA-6607 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/09563ab2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/09563ab2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/09563ab2 Branch: refs/heads/cassandra-2.0 Commit: 09563ab2cc12bc5968b281080478885cb8f7f352 Parents: c612a36 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Mon Jan 27 18:43:05 2014 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Mon Jan 27 18:45:23 2014 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/cql3/statements/BatchStatement.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/09563ab2/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 524ffb7..c690150 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -15,6 +15,7 @@ * skip blocking on streaming during drain (CASSANDRA-6603) * Improve error message when schema doesn't match loaded sstable (CASSANDRA-6262) * Add properties to adjust FD initial value and max interval (CASSANDRA-4375) + * Fix preparing with batch and delete from collection (CASSANDRA-6607) 1.2.13 http://git-wip-us.apache.org/repos/asf/cassandra/blob/09563ab2/src/java/org/apache/cassandra/cql3/statements/BatchStatement.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cql3/statements/BatchStatement.java b/src/java/org/apache/cassandra/cql3/statements/BatchStatement.java index 05dae48..f9b9a68 100644 --- a/src/java/org/apache/cassandra/cql3/statements/BatchStatement.java +++ b/src/java/org/apache/cassandra/cql3/statements/BatchStatement.java @@ -139,7 +139,7 @@ public class BatchStatement extends ModificationStatement public ParsedStatement.Prepared prepare() throws InvalidRequestException { - CFDefinition.Name[] boundNames = new CFDefinition.Name[getBoundTerms()]; + ColumnSpecification[] boundNames = new ColumnSpecification[getBoundTerms()]; return prepare(boundNames); }
