Merge branch 'cassandra-2.0' into cassandra-2.1 Conflicts: src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2cb811a2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2cb811a2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2cb811a2 Branch: refs/heads/cassandra-2.1 Commit: 2cb811a2cbc310db709b68ac289541b2f424c046 Parents: 872eef3 5ef53e6 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Thu Mar 6 10:27:48 2014 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Thu Mar 6 10:27:48 2014 +0100 ---------------------------------------------------------------------- .../org/apache/cassandra/cql3/statements/CQL3CasConditions.java | 3 ++- .../apache/cassandra/cql3/statements/ModificationStatement.java | 4 +--- 2 files changed, 3 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2cb811a2/src/java/org/apache/cassandra/cql3/statements/CQL3CasConditions.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2cb811a2/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java index f90293b,154c01c..160eb74 --- a/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java +++ b/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java @@@ -488,11 -534,9 +488,9 @@@ public abstract class ModificationState ByteBuffer key = keys.get(0); - // It's cleaner to use the query timestamp below, but it's in seconds while the conditions expects microseconds, so just - // put it back in millis (we don't really lose precision because the ultimate consumer, Column.isLive, re-divide it). - CQL3CasConditions conditions = new CQL3CasConditions(cfm, queryState.getTimestamp() * 1000); + CQL3CasConditions conditions = new CQL3CasConditions(cfm, queryState.getTimestamp()); - ColumnNameBuilder prefix = createClusteringPrefixBuilder(variables); - ColumnFamily updates = UnsortedColumns.factory.create(cfm); + Composite prefix = createClusteringPrefix(variables); + ColumnFamily updates = ArrayBackedSortedColumns.factory.create(cfm); addUpdatesAndConditions(key, prefix, updates, conditions, variables, getTimestamp(queryState.getTimestamp(), variables)); ColumnFamily result = StorageProxy.cas(keyspace(),