[1/2] git commit: Explicitly use Long.MAX_VALUE timestamp for counter deletions
Repository: cassandra
Updated Branches:
refs/heads/trunk 204442452 -> 9aace4836
Explicitly use Long.MAX_VALUE timestamp for counter deletions
patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for
CASSANDRA-7346
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5fe75576
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5fe75576
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5fe75576
Branch: refs/heads/trunk
Commit: 5fe7557627fac6ace2554a4f8ef552c9d9512490
Parents: deaf5ba
Author: Aleksey Yeschenko
Authored: Wed Jun 11 09:47:22 2014 -0500
Committer: Aleksey Yeschenko
Committed: Wed Jun 11 09:47:22 2014 -0500
--
CHANGES.txt | 2 ++
.../cassandra/cql/AbstractModification.java | 9 --
.../apache/cassandra/cql/DeleteStatement.java | 27 ++
.../apache/cassandra/cql/UpdateStatement.java | 7 -
.../apache/cassandra/cql3/UpdateParameters.java | 19 ++---
.../cql3/statements/DeleteStatement.java| 2 +-
.../apache/cassandra/db/CounterMutation.java| 3 ++
.../cassandra/thrift/CassandraServer.java | 29
8 files changed, 59 insertions(+), 39 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5fe75576/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index b70782b..a8a84d8 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,6 @@
2.1.0
+ * Explicitly use Long.MAX_VALUE timestamp for counter deletions
+ (CASSANDRA-7346)
* Fix native protocol CAS batches (CASSANDRA-7337)
* Reduce likelihood of contention on local paxos locking (CASSANDRA-7359)
* Upgrade to Pig 0.12.1 (CASSANDRA-6556)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5fe75576/src/java/org/apache/cassandra/cql/AbstractModification.java
--
diff --git a/src/java/org/apache/cassandra/cql/AbstractModification.java
b/src/java/org/apache/cassandra/cql/AbstractModification.java
index 8da2611..9b88b5e 100644
--- a/src/java/org/apache/cassandra/cql/AbstractModification.java
+++ b/src/java/org/apache/cassandra/cql/AbstractModification.java
@@ -107,8 +107,11 @@ public abstract class AbstractModification
*
* @throws InvalidRequestException on the wrong request
*/
-public abstract List prepareRowMutations(String keyspace,
ThriftClientState clientState, List variables)
-throws InvalidRequestException, UnauthorizedException;
+public List prepareRowMutations(String keyspace,
ThriftClientState clientState, List variables)
+throws InvalidRequestException, UnauthorizedException
+{
+return prepareRowMutations(keyspace, clientState, null, variables);
+}
/**
* Convert statement into a list of mutations to apply on the server
@@ -121,6 +124,6 @@ public abstract class AbstractModification
*
* @throws InvalidRequestException on the wrong request
*/
-public abstract List prepareRowMutations(String keyspace,
ThriftClientState clientState, Long timestamp, List variables)
+public abstract List prepareRowMutations(String keyspace,
ThriftClientState clientState, Long batchTimestamp, List variables)
throws InvalidRequestException, UnauthorizedException;
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5fe75576/src/java/org/apache/cassandra/cql/DeleteStatement.java
--
diff --git a/src/java/org/apache/cassandra/cql/DeleteStatement.java
b/src/java/org/apache/cassandra/cql/DeleteStatement.java
index 71942e4..e00ffc7 100644
--- a/src/java/org/apache/cassandra/cql/DeleteStatement.java
+++ b/src/java/org/apache/cassandra/cql/DeleteStatement.java
@@ -24,6 +24,7 @@ import java.util.List;
import org.apache.cassandra.auth.Permission;
import org.apache.cassandra.config.CFMetaData;
import org.apache.cassandra.config.Schema;
+import org.apache.cassandra.db.CounterMutation;
import org.apache.cassandra.db.Mutation;
import org.apache.cassandra.db.composites.CellName;
import org.apache.cassandra.db.IMutation;
@@ -62,13 +63,7 @@ public class DeleteStatement extends AbstractModification
return keys;
}
-public List prepareRowMutations(String keyspace,
ThriftClientState clientState, List variables)
-throws InvalidRequestException, UnauthorizedException
-{
-return prepareRowMutations(keyspace, clientState, null, variables);
-}
-
-public List prepareRowMutations(String keyspace,
ThriftClientState clientState, Long timestamp, List variables)
+public List prepareRowMutations(String keyspace,
ThriftClientState clientState, Long batchTimestamp, Lis
git commit: Explicitly use Long.MAX_VALUE timestamp for counter deletions
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 deaf5ba15 -> 5fe755762
Explicitly use Long.MAX_VALUE timestamp for counter deletions
patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for
CASSANDRA-7346
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5fe75576
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5fe75576
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5fe75576
Branch: refs/heads/cassandra-2.1
Commit: 5fe7557627fac6ace2554a4f8ef552c9d9512490
Parents: deaf5ba
Author: Aleksey Yeschenko
Authored: Wed Jun 11 09:47:22 2014 -0500
Committer: Aleksey Yeschenko
Committed: Wed Jun 11 09:47:22 2014 -0500
--
CHANGES.txt | 2 ++
.../cassandra/cql/AbstractModification.java | 9 --
.../apache/cassandra/cql/DeleteStatement.java | 27 ++
.../apache/cassandra/cql/UpdateStatement.java | 7 -
.../apache/cassandra/cql3/UpdateParameters.java | 19 ++---
.../cql3/statements/DeleteStatement.java| 2 +-
.../apache/cassandra/db/CounterMutation.java| 3 ++
.../cassandra/thrift/CassandraServer.java | 29
8 files changed, 59 insertions(+), 39 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5fe75576/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index b70782b..a8a84d8 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,6 @@
2.1.0
+ * Explicitly use Long.MAX_VALUE timestamp for counter deletions
+ (CASSANDRA-7346)
* Fix native protocol CAS batches (CASSANDRA-7337)
* Reduce likelihood of contention on local paxos locking (CASSANDRA-7359)
* Upgrade to Pig 0.12.1 (CASSANDRA-6556)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5fe75576/src/java/org/apache/cassandra/cql/AbstractModification.java
--
diff --git a/src/java/org/apache/cassandra/cql/AbstractModification.java
b/src/java/org/apache/cassandra/cql/AbstractModification.java
index 8da2611..9b88b5e 100644
--- a/src/java/org/apache/cassandra/cql/AbstractModification.java
+++ b/src/java/org/apache/cassandra/cql/AbstractModification.java
@@ -107,8 +107,11 @@ public abstract class AbstractModification
*
* @throws InvalidRequestException on the wrong request
*/
-public abstract List prepareRowMutations(String keyspace,
ThriftClientState clientState, List variables)
-throws InvalidRequestException, UnauthorizedException;
+public List prepareRowMutations(String keyspace,
ThriftClientState clientState, List variables)
+throws InvalidRequestException, UnauthorizedException
+{
+return prepareRowMutations(keyspace, clientState, null, variables);
+}
/**
* Convert statement into a list of mutations to apply on the server
@@ -121,6 +124,6 @@ public abstract class AbstractModification
*
* @throws InvalidRequestException on the wrong request
*/
-public abstract List prepareRowMutations(String keyspace,
ThriftClientState clientState, Long timestamp, List variables)
+public abstract List prepareRowMutations(String keyspace,
ThriftClientState clientState, Long batchTimestamp, List variables)
throws InvalidRequestException, UnauthorizedException;
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5fe75576/src/java/org/apache/cassandra/cql/DeleteStatement.java
--
diff --git a/src/java/org/apache/cassandra/cql/DeleteStatement.java
b/src/java/org/apache/cassandra/cql/DeleteStatement.java
index 71942e4..e00ffc7 100644
--- a/src/java/org/apache/cassandra/cql/DeleteStatement.java
+++ b/src/java/org/apache/cassandra/cql/DeleteStatement.java
@@ -24,6 +24,7 @@ import java.util.List;
import org.apache.cassandra.auth.Permission;
import org.apache.cassandra.config.CFMetaData;
import org.apache.cassandra.config.Schema;
+import org.apache.cassandra.db.CounterMutation;
import org.apache.cassandra.db.Mutation;
import org.apache.cassandra.db.composites.CellName;
import org.apache.cassandra.db.IMutation;
@@ -62,13 +63,7 @@ public class DeleteStatement extends AbstractModification
return keys;
}
-public List prepareRowMutations(String keyspace,
ThriftClientState clientState, List variables)
-throws InvalidRequestException, UnauthorizedException
-{
-return prepareRowMutations(keyspace, clientState, null, variables);
-}
-
-public List prepareRowMutations(String keyspace,
ThriftClientState clientState, Long timestamp, List variables)
+public List prepareRowMutations(String keyspace,
ThriftClientState clientState, Long bat
