Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'cassandra-1.2' into trunk

Conflicts:
	src/java/org/apache/cassandra/cql3/statements/BatchStatement.java
  • Loading branch information...
commit 71e764cb04d291597af8d6b65044bf5ae09360b2 2 parents 23d15ee + 1429c54
@iamaleksey iamaleksey authored
View
1  CHANGES.txt
@@ -61,6 +61,7 @@
* Add null syntax support in CQL3 for inserts (CASSANDRA-3783)
* Allow unauthenticated set_keyspace() calls (CASSANDRA-5423)
* Fix potential incremental backups race (CASSANDRA-5410)
+ * Fix prepared BATCH statements with batch-level timestamps (CASSANDRA-5415)
Merged from 1.1:
* cli: Quote ks and cf names in schema output when needed (CASSANDRA-5052)
* Fix bad default for min/max timestamp in SSTableMetadata (CASSANDRA-5372)
View
5 src/java/org/apache/cassandra/cql3/statements/BatchStatement.java
@@ -96,11 +96,8 @@ protected void validateConsistency(ConsistencyLevel cl) throws InvalidRequestExc
Map<Pair<String, ByteBuffer>, IMutation> mutations = new HashMap<Pair<String, ByteBuffer>, IMutation>();
for (ModificationStatement statement : statements)
{
- if (isSetTimestamp())
- statement.setTimestamp(getTimestamp(now));
-
// Group mutation together, otherwise they won't get applied atomically
- for (IMutation m : statement.getMutationsInternal(variables, local, cl, now, true))
+ for (IMutation m : statement.getMutationsInternal(variables, local, cl, getTimestamp(now), true))
{
if (m instanceof CounterMutation && type != Type.COUNTER)
throw new InvalidRequestException("Counter mutations are only allowed in COUNTER batches");
Please sign in to comment.
Something went wrong with that request. Please try again.