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/06 10:28:54 UTC
[1/4] git commit: Fix timestamp scaling issue for 6623
Repository: cassandra
Updated Branches:
refs/heads/trunk 35e5721f8 -> e30d6dca5
Fix timestamp scaling issue for 6623
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5ef53e6f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5ef53e6f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5ef53e6f
Branch: refs/heads/trunk
Commit: 5ef53e6f7cc64585e93a84311f58fc62b781379d
Parents: ba95ca0
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Thu Mar 6 10:26:20 2014 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Thu Mar 6 10:26:20 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/5ef53e6f/src/java/org/apache/cassandra/cql3/statements/CQL3CasConditions.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql3/statements/CQL3CasConditions.java b/src/java/org/apache/cassandra/cql3/statements/CQL3CasConditions.java
index 194ff0c..668f98f 100644
--- a/src/java/org/apache/cassandra/cql3/statements/CQL3CasConditions.java
+++ b/src/java/org/apache/cassandra/cql3/statements/CQL3CasConditions.java
@@ -43,7 +43,8 @@ public class CQL3CasConditions implements CASConditions
public CQL3CasConditions(CFMetaData cfm, long now)
{
this.cfm = cfm;
- this.now = now;
+ // We will use now for Column.isLive() which expects milliseconds but the argument is in microseconds.
+ this.now = now / 1000;
this.conditions = new TreeMap<>(cfm.comparator);
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5ef53e6f/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java b/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
index ecefcb9..154c01c 100644
--- a/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
@@ -534,9 +534,7 @@ public abstract class ModificationStatement implements CQLStatement, MeasurableF
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);
addUpdatesAndConditions(key, prefix, updates, conditions, variables, getTimestamp(queryState.getTimestamp(), variables));
[3/4] git commit: Fix comment post-merge
Posted by sl...@apache.org.
Fix comment post-merge
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a052a912
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a052a912
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a052a912
Branch: refs/heads/trunk
Commit: a052a912ef6feb84b1421d23d0db4df0dbbb1e58
Parents: 2cb811a
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Thu Mar 6 10:28:31 2014 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Thu Mar 6 10:28:31 2014 +0100
----------------------------------------------------------------------
.../org/apache/cassandra/cql3/statements/CQL3CasConditions.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a052a912/src/java/org/apache/cassandra/cql3/statements/CQL3CasConditions.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql3/statements/CQL3CasConditions.java b/src/java/org/apache/cassandra/cql3/statements/CQL3CasConditions.java
index 1749806..21b1de6 100644
--- a/src/java/org/apache/cassandra/cql3/statements/CQL3CasConditions.java
+++ b/src/java/org/apache/cassandra/cql3/statements/CQL3CasConditions.java
@@ -44,7 +44,7 @@ public class CQL3CasConditions implements CASConditions
public CQL3CasConditions(CFMetaData cfm, long now)
{
this.cfm = cfm;
- // We will use now for Column.isLive() which expects milliseconds but the argument is in microseconds.
+ // We will use now for Cell.isLive() which expects milliseconds but the argument is in microseconds.
this.now = now / 1000;
this.conditions = new TreeMap<>(cfm.comparator);
}
[4/4] 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/e30d6dca
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e30d6dca
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e30d6dca
Branch: refs/heads/trunk
Commit: e30d6dca52cc33ab04f9296cb6961afdbf1e9c2b
Parents: 35e5721 a052a91
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Thu Mar 6 10:28:48 2014 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Thu Mar 6 10:28: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(-)
----------------------------------------------------------------------
[2/4] 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:
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/trunk
Commit: 2cb811a2cbc310db709b68ac289541b2f424c046
Parents: 872eef3 5ef53e6
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Thu Mar 6 10:27:48 2014 +0100
Committer: Sylvain Lebresne <sy...@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(),