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 2014/01/27 18:47:06 UTC
[1/2] git commit: Fix preparing statement with batch and delete from
collection
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 <sy...@datastax.com>
Authored: Mon Jan 27 18:43:05 2014 +0100
Committer: Sylvain Lebresne <sy...@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);
}
[2/2] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by sl...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0
Conflicts:
src/java/org/apache/cassandra/cql3/statements/BatchStatement.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8bbb6eda
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8bbb6eda
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8bbb6eda
Branch: refs/heads/cassandra-2.0
Commit: 8bbb6eda66412bdf347e302d5677538b82d26948
Parents: 1b858be 09563ab
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Mon Jan 27 18:46:54 2014 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Mon Jan 27 18:46:54 2014 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8bbb6eda/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 6aa944d,c690150..6acbc87
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -19,29 -15,10 +19,30 @@@ Merged from 1.2
* 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
+2.0.4
+ * Allow removing snapshots of no-longer-existing CFs (CASSANDRA-6418)
+ * add StorageService.stopDaemon() (CASSANDRA-4268)
+ * add IRE for invalid CF supplied to get_count (CASSANDRA-5701)
+ * add client encryption support to sstableloader (CASSANDRA-6378)
+ * Fix accept() loop for SSL sockets post-shutdown (CASSANDRA-6468)
+ * Fix size-tiered compaction in LCS L0 (CASSANDRA-6496)
+ * Fix assertion failure in filterColdSSTables (CASSANDRA-6483)
+ * Fix row tombstones in larger-than-memory compactions (CASSANDRA-6008)
+ * Fix cleanup ClassCastException (CASSANDRA-6462)
+ * Reduce gossip memory use by interning VersionedValue strings (CASSANDRA-6410)
+ * Allow specifying datacenters to participate in a repair (CASSANDRA-6218)
+ * Fix divide-by-zero in PCI (CASSANDRA-6403)
+ * Fix setting last compacted key in the wrong level for LCS (CASSANDRA-6284)
+ * Add millisecond precision formats to the timestamp parser (CASSANDRA-6395)
+ * Expose a total memtable size metric for a CF (CASSANDRA-6391)
+ * cqlsh: handle symlinks properly (CASSANDRA-6425)
+ * Fix potential infinite loop when paging query with IN (CASSANDRA-6464)
+ * Fix assertion error in AbstractQueryPager.discardFirst (CASSANDRA-6447)
+ * Fix streaming older SSTable yields unnecessary tombstones (CASSANDRA-6527)
+Merged from 1.2:
* Improved error message on bad properties in DDL queries (CASSANDRA-6453)
* Randomize batchlog candidates selection (CASSANDRA-6481)
* Fix thundering herd on endpoint cache invalidation (CASSANDRA-6345, 6485)