You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by mi...@apache.org on 2014/04/21 23:55:27 UTC
[1/6] git commit: Use timestamp from the statement instead of "now"
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.0 54bf92f37 -> 1104653a4
refs/heads/cassandra-2.1 02d1e7497 -> 2b89cf6a8
refs/heads/trunk d224c0f87 -> 462c2dcc0
Use timestamp from the statement instead of "now"
patch by Mikhail Stepura; reviewed by Aleksey Yeschenko for CASSANDRA-7053
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1104653a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1104653a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1104653a
Branch: refs/heads/cassandra-2.0
Commit: 1104653a40c921be2c6fde3fc423173c28720916
Parents: 54bf92f
Author: Mikhail Stepura <mi...@apache.org>
Authored: Thu Apr 17 17:15:52 2014 -0700
Committer: Mikhail Stepura <mi...@apache.org>
Committed: Mon Apr 21 14:51:18 2014 -0700
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/cql3/statements/BatchStatement.java | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1104653a/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index b976d64..bcbde4a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,6 @@
2.0.8
* Queries on compact tables can return more rows that requested (CASSANDRA-7052)
+ * USING TIMESTAMP for batches does not work (CASSANDRA-7053)
Merged from 1.2:
* Fix batchlog to account for CF truncation records (CASSANDRA-6999)
* Fix CQLSH parsing of functions and BLOB literals (CASSANDRA-7018)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1104653a/src/java/org/apache/cassandra/cql3/statements/BatchStatement.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql3/statements/BatchStatement.java b/src/java/org/apache/cassandra/cql3/statements/BatchStatement.java
index 799d8ea..7f26341 100644
--- a/src/java/org/apache/cassandra/cql3/statements/BatchStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/BatchStatement.java
@@ -117,7 +117,8 @@ public class BatchStatement implements CQLStatement, MeasurableForPreparedCache
{
ModificationStatement statement = statements.get(i);
List<ByteBuffer> statementVariables = variables.getVariablesForStatement(i);
- addStatementMutations(statement, statementVariables, local, cl, now, mutations);
+ long timestamp = attrs.getTimestamp(now, statementVariables);
+ addStatementMutations(statement, statementVariables, local, cl, timestamp, mutations);
}
return unzipMutations(mutations);
}
[3/6] git commit: Use timestamp from the statement instead of "now"
Posted by mi...@apache.org.
Use timestamp from the statement instead of "now"
patch by Mikhail Stepura; reviewed by Aleksey Yeschenko for CASSANDRA-7053
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1104653a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1104653a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1104653a
Branch: refs/heads/trunk
Commit: 1104653a40c921be2c6fde3fc423173c28720916
Parents: 54bf92f
Author: Mikhail Stepura <mi...@apache.org>
Authored: Thu Apr 17 17:15:52 2014 -0700
Committer: Mikhail Stepura <mi...@apache.org>
Committed: Mon Apr 21 14:51:18 2014 -0700
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/cql3/statements/BatchStatement.java | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1104653a/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index b976d64..bcbde4a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,6 @@
2.0.8
* Queries on compact tables can return more rows that requested (CASSANDRA-7052)
+ * USING TIMESTAMP for batches does not work (CASSANDRA-7053)
Merged from 1.2:
* Fix batchlog to account for CF truncation records (CASSANDRA-6999)
* Fix CQLSH parsing of functions and BLOB literals (CASSANDRA-7018)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1104653a/src/java/org/apache/cassandra/cql3/statements/BatchStatement.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql3/statements/BatchStatement.java b/src/java/org/apache/cassandra/cql3/statements/BatchStatement.java
index 799d8ea..7f26341 100644
--- a/src/java/org/apache/cassandra/cql3/statements/BatchStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/BatchStatement.java
@@ -117,7 +117,8 @@ public class BatchStatement implements CQLStatement, MeasurableForPreparedCache
{
ModificationStatement statement = statements.get(i);
List<ByteBuffer> statementVariables = variables.getVariablesForStatement(i);
- addStatementMutations(statement, statementVariables, local, cl, now, mutations);
+ long timestamp = attrs.getTimestamp(now, statementVariables);
+ addStatementMutations(statement, statementVariables, local, cl, timestamp, mutations);
}
return unzipMutations(mutations);
}
[6/6] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by mi...@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/462c2dcc
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/462c2dcc
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/462c2dcc
Branch: refs/heads/trunk
Commit: 462c2dcc0d2f737e8bc9620d2e72eeffbc6dad08
Parents: d224c0f 2b89cf6
Author: Mikhail Stepura <mi...@apache.org>
Authored: Mon Apr 21 14:54:54 2014 -0700
Committer: Mikhail Stepura <mi...@apache.org>
Committed: Mon Apr 21 14:54:54 2014 -0700
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/cql3/statements/BatchStatement.java | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/462c2dcc/CHANGES.txt
----------------------------------------------------------------------
[5/6] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Posted by mi...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1
Conflicts:
CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2b89cf6a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2b89cf6a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2b89cf6a
Branch: refs/heads/cassandra-2.1
Commit: 2b89cf6a8c0491ec6b389512a085195e389ab3c6
Parents: 02d1e74 1104653
Author: Mikhail Stepura <mi...@apache.org>
Authored: Mon Apr 21 14:54:07 2014 -0700
Committer: Mikhail Stepura <mi...@apache.org>
Committed: Mon Apr 21 14:54:07 2014 -0700
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/cql3/statements/BatchStatement.java | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2b89cf6a/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index d6d13c5,bcbde4a..5d15eac
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -98,7 -57,6 +98,8 @@@ Merged from 2.0
(CASSANDRA-6906)
* Fix SSTable not released if stream session fails (CASSANDRA-6818)
* Avoid build failure due to ANTLR timeout (CASSANDRA-6991)
+ * Queries on compact tables can return more rows that requested (CASSANDRA-7052)
++ * USING TIMESTAMP for batches does not work (CASSANDRA-7053)
Merged from 1.2:
* Add UNLOGGED, COUNTER options to BATCH documentation (CASSANDRA-6816)
* add extra SSL cipher suites (CASSANDRA-6613)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2b89cf6a/src/java/org/apache/cassandra/cql3/statements/BatchStatement.java
----------------------------------------------------------------------
[2/6] git commit: Use timestamp from the statement instead of "now"
Posted by mi...@apache.org.
Use timestamp from the statement instead of "now"
patch by Mikhail Stepura; reviewed by Aleksey Yeschenko for CASSANDRA-7053
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1104653a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1104653a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1104653a
Branch: refs/heads/cassandra-2.1
Commit: 1104653a40c921be2c6fde3fc423173c28720916
Parents: 54bf92f
Author: Mikhail Stepura <mi...@apache.org>
Authored: Thu Apr 17 17:15:52 2014 -0700
Committer: Mikhail Stepura <mi...@apache.org>
Committed: Mon Apr 21 14:51:18 2014 -0700
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/cql3/statements/BatchStatement.java | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1104653a/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index b976d64..bcbde4a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,6 @@
2.0.8
* Queries on compact tables can return more rows that requested (CASSANDRA-7052)
+ * USING TIMESTAMP for batches does not work (CASSANDRA-7053)
Merged from 1.2:
* Fix batchlog to account for CF truncation records (CASSANDRA-6999)
* Fix CQLSH parsing of functions and BLOB literals (CASSANDRA-7018)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1104653a/src/java/org/apache/cassandra/cql3/statements/BatchStatement.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql3/statements/BatchStatement.java b/src/java/org/apache/cassandra/cql3/statements/BatchStatement.java
index 799d8ea..7f26341 100644
--- a/src/java/org/apache/cassandra/cql3/statements/BatchStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/BatchStatement.java
@@ -117,7 +117,8 @@ public class BatchStatement implements CQLStatement, MeasurableForPreparedCache
{
ModificationStatement statement = statements.get(i);
List<ByteBuffer> statementVariables = variables.getVariablesForStatement(i);
- addStatementMutations(statement, statementVariables, local, cl, now, mutations);
+ long timestamp = attrs.getTimestamp(now, statementVariables);
+ addStatementMutations(statement, statementVariables, local, cl, timestamp, mutations);
}
return unzipMutations(mutations);
}
[4/6] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Posted by mi...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1
Conflicts:
CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2b89cf6a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2b89cf6a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2b89cf6a
Branch: refs/heads/trunk
Commit: 2b89cf6a8c0491ec6b389512a085195e389ab3c6
Parents: 02d1e74 1104653
Author: Mikhail Stepura <mi...@apache.org>
Authored: Mon Apr 21 14:54:07 2014 -0700
Committer: Mikhail Stepura <mi...@apache.org>
Committed: Mon Apr 21 14:54:07 2014 -0700
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/cql3/statements/BatchStatement.java | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2b89cf6a/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index d6d13c5,bcbde4a..5d15eac
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -98,7 -57,6 +98,8 @@@ Merged from 2.0
(CASSANDRA-6906)
* Fix SSTable not released if stream session fails (CASSANDRA-6818)
* Avoid build failure due to ANTLR timeout (CASSANDRA-6991)
+ * Queries on compact tables can return more rows that requested (CASSANDRA-7052)
++ * USING TIMESTAMP for batches does not work (CASSANDRA-7053)
Merged from 1.2:
* Add UNLOGGED, COUNTER options to BATCH documentation (CASSANDRA-6816)
* add extra SSL cipher suites (CASSANDRA-6613)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2b89cf6a/src/java/org/apache/cassandra/cql3/statements/BatchStatement.java
----------------------------------------------------------------------