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/03/17 11:09:09 UTC
[1/5] git commit: Properly use the paxos consistency for
(non-protocol) batches
Repository: cassandra
Updated Branches:
refs/heads/trunk b74c2ade5 -> 67b852182
Properly use the paxos consistency for (non-protocol) batches
patch by slebresne; reviewed by jbellis for CASSANDRA-6837
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9527b17f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9527b17f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9527b17f
Branch: refs/heads/trunk
Commit: 9527b17f1f1eaa572b036ce2c33300b36fc533e6
Parents: 245038f
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Mon Mar 17 11:01:28 2014 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Mon Mar 17 11:01:28 2014 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../org/apache/cassandra/cql3/statements/BatchStatement.java | 8 ++++----
2 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9527b17f/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 61b1ee1..c4e1bd4 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -11,6 +11,7 @@
* Fix CompactionManager.needsCleanup (CASSANDRA-6845)
* Correctly compare BooleanType values other than 0 and 1 (CASSANDRA-6779)
* Read message id as string from earlier versions (CASSANDRA-6840)
+ * Properly use the Paxos consistency for (non-protocol) batch (CASSANDRA-6837)
Merged from 1.2:
* fix nodetool getsstables for blob PK (CASSANDRA-6803)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9527b17f/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 b1dbb31..675ce7a 100644
--- a/src/java/org/apache/cassandra/cql3/statements/BatchStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/BatchStatement.java
@@ -181,7 +181,7 @@ public class BatchStatement implements CQLStatement, MeasurableForPreparedCache
if (options.getConsistency() == null)
throw new InvalidRequestException("Invalid empty consistency level");
- return execute(new PreparedBatchVariables(options.getValues()), false, options.getConsistency(), queryState.getTimestamp());
+ return execute(new PreparedBatchVariables(options.getValues()), false, options.getConsistency(), options.getSerialConsistency(), queryState.getTimestamp());
}
public ResultMessage executeWithPerStatementVariables(ConsistencyLevel cl, QueryState queryState, List<List<ByteBuffer>> variables) throws RequestExecutionException, RequestValidationException
@@ -189,16 +189,16 @@ public class BatchStatement implements CQLStatement, MeasurableForPreparedCache
if (cl == null)
throw new InvalidRequestException("Invalid empty consistency level");
- return execute(new BatchOfPreparedVariables(variables), false, cl, queryState.getTimestamp());
+ return execute(new BatchOfPreparedVariables(variables), false, cl, ConsistencyLevel.SERIAL, queryState.getTimestamp());
}
- public ResultMessage execute(BatchVariables variables, boolean local, ConsistencyLevel cl, long now)
+ public ResultMessage execute(BatchVariables variables, boolean local, ConsistencyLevel cl, ConsistencyLevel serialCl, long now)
throws RequestExecutionException, RequestValidationException
{
// TODO: we don't support a serial consistency for batches in the protocol so defaulting to SERIAL for now.
// We'll need to fix that.
if (hasConditions)
- return executeWithConditions(variables, cl, ConsistencyLevel.SERIAL, now);
+ return executeWithConditions(variables, cl, serialCl, now);
executeWithoutConditions(getMutations(variables, local, cl, now), cl);
return null;
[2/5] git commit: Update copyright date in NOTICE file
Posted by sl...@apache.org.
Update copyright date in NOTICE file
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8526347c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8526347c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8526347c
Branch: refs/heads/trunk
Commit: 8526347cad86037ce0caefa711e0568f88c87da0
Parents: 8c52cc0
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Mon Mar 17 11:03:32 2014 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Mon Mar 17 11:03:32 2014 +0100
----------------------------------------------------------------------
NOTICE.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8526347c/NOTICE.txt
----------------------------------------------------------------------
diff --git a/NOTICE.txt b/NOTICE.txt
index 9826990..36cacce 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -1,5 +1,5 @@
Apache Cassandra
-Copyright 2009, 2010 The Apache Software Foundation
+Copyright 2009-2014 The Apache Software Foundation
This product includes software developed by The Apache Software
Foundation (http://www.apache.org/).
[4/5] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Posted by sl...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1
Conflicts:
CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/67119a5a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/67119a5a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/67119a5a
Branch: refs/heads/trunk
Commit: 67119a5ab57eb254fea4e78133a63bf28644c01f
Parents: 4bed978 1e64972
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Mon Mar 17 11:08:47 2014 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Mon Mar 17 11:08:47 2014 +0100
----------------------------------------------------------------------
CHANGES.txt | 2 ++
NOTICE.txt | 2 +-
.../org/apache/cassandra/cql3/statements/BatchStatement.java | 8 ++++----
3 files changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/67119a5a/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index ea436f0,c4e1bd4..0cd9d4a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -75,51 -55,23 +75,53 @@@ Merged from 2.0
* Fix CQLSStableWriter.addRow(Map<String, Object>) (CASSANDRA-6526)
* Fix HSHA server introducing corrupt data (CASSANDRA-6285)
* Fix CAS conditions for COMPACT STORAGE tables (CASSANDRA-6813)
-Merged from 1.2:
- * Add CMSClassUnloadingEnabled JVM option (CASSANDRA-6541)
- * Catch memtable flush exceptions during shutdown (CASSANDRA-6735)
- * Fix broken streams when replacing with same IP (CASSANDRA-6622)
- * Fix upgradesstables NPE for non-CF-based indexes (CASSANDRA-6645)
- * Fix partition and range deletes not triggering flush (CASSANDRA-6655)
- * Fix mean cells and mean row size per sstable calculations (CASSANDRA-6667)
- * Compact hints after partial replay to clean out tombstones (CASSANDRA-6666)
- * Log USING TTL/TIMESTAMP in a counter update warning (CASSANDRA-6649)
- * Don't exchange schema between nodes with different versions (CASSANDRA-6695)
- * Use real node messaging versions for schema exchange decisions (CASSANDRA-6700)
- * IN on the last clustering columns + ORDER BY DESC yield no results (CASSANDRA-6701)
- * Fix SecondaryIndexManager#deleteFromIndexes() (CASSANDRA-6711)
- * Fix snapshot repair not snapshotting coordinator itself (CASSANDRA-6713)
- * Support negative timestamps for CQL3 dates in query string (CASSANDRA-6718)
- * Avoid NPEs when receiving table changes for an unknown keyspace (CASSANDRA-5631)
- * Fix bootstrapping when there is no schema (CASSANDRA-6685)
+ * Fix saving triggers to schema (CASSANDRA-6789)
+ * Fix trigger mutations when base mutation list is immutable (CASSANDRA-6790)
+ * Fix accounting in FileCacheService to allow re-using RAR (CASSANDRA-6838)
+ * Fix static counter columns (CASSANDRA-6827)
+ * Restore expiring->deleted (cell) compaction optimization (CASSANDRA-6844)
+ * Fix CompactionManager.needsCleanup (CASSANDRA-6845)
+ * Correctly compare BooleanType values other than 0 and 1 (CASSANDRA-6779)
++ * Read message id as string from earlier versions (CASSANDRA-6840)
++ * Properly use the Paxos consistency for (non-protocol) batch (CASSANDRA-6837)
+
+
+2.1.0-beta1
+ * Add flush directory distinct from compaction directories (CASSANDRA-6357)
+ * Require JNA by default (CASSANDRA-6575)
+ * add listsnapshots command to nodetool (CASSANDRA-5742)
+ * Introduce AtomicBTreeColumns (CASSANDRA-6271, 6692)
+ * Multithreaded commitlog (CASSANDRA-3578)
+ * allocate fixed index summary memory pool and resample cold index summaries
+ to use less memory (CASSANDRA-5519)
+ * Removed multithreaded compaction (CASSANDRA-6142)
+ * Parallelize fetching rows for low-cardinality indexes (CASSANDRA-1337)
+ * change logging from log4j to logback (CASSANDRA-5883)
+ * switch to LZ4 compression for internode communication (CASSANDRA-5887)
+ * Stop using Thrift-generated Index* classes internally (CASSANDRA-5971)
+ * Remove 1.2 network compatibility code (CASSANDRA-5960)
+ * Remove leveled json manifest migration code (CASSANDRA-5996)
+ * Remove CFDefinition (CASSANDRA-6253)
+ * Use AtomicIntegerFieldUpdater in RefCountedMemory (CASSANDRA-6278)
+ * User-defined types for CQL3 (CASSANDRA-5590)
+ * Use of o.a.c.metrics in nodetool (CASSANDRA-5871, 6406)
+ * Batch read from OTC's queue and cleanup (CASSANDRA-1632)
+ * Secondary index support for collections (CASSANDRA-4511, 6383)
+ * SSTable metadata(Stats.db) format change (CASSANDRA-6356)
+ * Push composites support in the storage engine
+ (CASSANDRA-5417, CASSANDRA-6520)
+ * Add snapshot space used to cfstats (CASSANDRA-6231)
+ * Add cardinality estimator for key count estimation (CASSANDRA-5906)
+ * CF id is changed to be non-deterministic. Data dir/key cache are created
+ uniquely for CF id (CASSANDRA-5202)
+ * New counters implementation (CASSANDRA-6504)
+ * Replace UnsortedColumns, EmptyColumns, TreeMapBackedSortedColumns with new
+ ArrayBackedSortedColumns (CASSANDRA-6630, CASSANDRA-6662, CASSANDRA-6690)
+ * Add option to use row cache with a given amount of rows (CASSANDRA-5357)
+ * Avoid repairing already repaired data (CASSANDRA-5351)
+ * Reject counter updates with USING TTL/TIMESTAMP (CASSANDRA-6649)
+ * Replace index_interval with min/max_index_interval (CASSANDRA-6379)
+ * Lift limitation that order by columns must be selected for IN queries (CASSANDRA-4911)
2.0.5
http://git-wip-us.apache.org/repos/asf/cassandra/blob/67119a5a/NOTICE.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/67119a5a/src/java/org/apache/cassandra/cql3/statements/BatchStatement.java
----------------------------------------------------------------------
[5/5] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by sl...@apache.org.
Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/67b85218
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/67b85218
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/67b85218
Branch: refs/heads/trunk
Commit: 67b852182b73b3ac95f496209c97f5957cc248bf
Parents: b74c2ad 67119a5
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Mon Mar 17 11:09:02 2014 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Mon Mar 17 11:09:02 2014 +0100
----------------------------------------------------------------------
CHANGES.txt | 2 ++
NOTICE.txt | 2 +-
.../org/apache/cassandra/cql3/statements/BatchStatement.java | 8 ++++----
3 files changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/67b85218/CHANGES.txt
----------------------------------------------------------------------
[3/5] 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
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1e64972b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1e64972b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1e64972b
Branch: refs/heads/trunk
Commit: 1e64972be5c9237a10b4b2635206b0790d7489ff
Parents: 9527b17 8526347
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Mon Mar 17 11:03:47 2014 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Mon Mar 17 11:03:47 2014 +0100
----------------------------------------------------------------------
NOTICE.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1e64972b/NOTICE.txt
----------------------------------------------------------------------