natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Warn when timestamps are provided on CAS batch 

patch by slebresne; reviewed by iamaleksey for CASSANDRA-7067
This commit is contained in:
Sylvain Lebresne 2014-05-07 10:27:04 +02:00
parent b4a3b52076
commit 32e1b16b81
2 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGES.txt
View File

@ -1,3 +1,7 @@
2.0.9
* Warn when 'USING TIMESTAMP' is used on a CAS BATCH (CASSANDRA-7067)
2.0.8
* Correctly delete scheduled range xfers (CASSANDRA-7143)
* Make batchlog replica selection rack-aware (CASSANDRA-6551)

24
src/java/org/apache/cassandra/cql3/statements/BatchStatement.java
View File

@ -41,6 +41,9 @@ import org.apache.cassandra.transport.messages.ResultMessage;
*/
public class BatchStatement implements CQLStatement, MeasurableForPreparedCache
{
private static boolean loggedCASTimestamp = false;
private static boolean loggedCounterTimestamp = false;
public static enum Type
{
LOGGED, UNLOGGED, COUNTER
@ -102,9 +105,28 @@ public class BatchStatement implements CQLStatement, MeasurableForPreparedCache
if (attrs.isTimeToLiveSet())
throw new InvalidRequestException("Global TTL on the BATCH statement is not supported.");
boolean timestampSet = attrs.isTimestampSet();
if (timestampSet)
{
if (hasConditions && !loggedCASTimestamp)
{
logger.warn("Detected use of 'USING TIMESTAMP' on a BATCH with conditions. This is invalid, " +
"custom timestamps are not allowed when conditions are used and the timestamp has been ignored. " +
"Such queries will be rejected in Cassandra 2.1+ - please fix your queries before then.");
loggedCASTimestamp = true;
}
if (type == Type.COUNTER && !loggedCounterTimestamp)
{
logger.warn("Detected use of 'USING TIMESTAMP' in a counter BATCH. This is invalid " +
"because counters do not use timestamps, and the timestamp has been ignored. " +
"Such queries will be rejected in Cassandra 2.1+ - please fix your queries before then.");
loggedCounterTimestamp = true;
}
}
for (ModificationStatement statement : statements)
{
if (attrs.isTimestampSet() && statement.isTimestampSet())
if (timestampSet && statement.isTimestampSet())
throw new InvalidRequestException("Timestamp must be set either on BATCH or individual statements");
}
}