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 2015/12/22 11:56:13 UTC
[01/10] cassandra git commit: Remove "atomic" wording for batches in
CQL doc (CASSANDRA-10701)
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 3740f815c -> e43883137
refs/heads/cassandra-2.2 ebbd51698 -> e654c1bf0
refs/heads/cassandra-3.0 21103bea2 -> 450fca99d
refs/heads/trunk c4428c7dd -> 7950d8033
Remove "atomic" wording for batches in CQL doc (CASSANDRA-10701)
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e4388313
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e4388313
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e4388313
Branch: refs/heads/cassandra-2.1
Commit: e43883137750d62d8bafb3058d5ee4e322221733
Parents: 3740f81
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue Dec 22 11:52:00 2015 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Dec 22 11:52:36 2015 +0100
----------------------------------------------------------------------
doc/cql3/CQL.textile | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e4388313/doc/cql3/CQL.textile
----------------------------------------------------------------------
diff --git a/doc/cql3/CQL.textile b/doc/cql3/CQL.textile
index cc041df..3b69fcc 100644
--- a/doc/cql3/CQL.textile
+++ b/doc/cql3/CQL.textile
@@ -748,7 +748,7 @@ APPLY BATCH;
The @BATCH@ statement group multiple modification statements (insertions/updates and deletions) into a single statement. It serves several purposes:
# It saves network round-trips between the client and the server (and sometimes between the server coordinator and the replicas) when batching multiple updates.
# All updates in a @BATCH@ belonging to a given partition key are performed in isolation.
-# By default, all operations in the batch are performed atomically. See the notes on "@UNLOGGED@":#unloggedBatch for more details.
+# By default, all operations in the batch are performed as @LOGGED@, to ensure all mutations eventually complete (or none will). See the notes on "@UNLOGGED@":#unloggedBatch for more details.
Note that:
* @BATCH@ statements may only contain @UPDATE@, @INSERT@ and @DELETE@ statements.
@@ -757,9 +757,9 @@ Note that:
h4(#unloggedBatch). @UNLOGGED@
-By default, Cassandra uses a batch log to ensure all operations in a batch are applied atomically. (Note that the operations are still only isolated within a single partition.)
+By default, Cassandra uses a batch log to ensure all operations in a batch eventually complete or none will (note however that operations are only isolated within a single partition).
-There is a performance penalty for batch atomicity when a batch spans multiple partitions. If you do not want to incur this penalty, you can tell Cassandra to skip the batchlog with the @UNLOGGED@ option. If the @UNLOGGED@ option is used, operations are only atomic within a single partition.
+There is a performance penalty for batch atomicity when a batch spans multiple partitions. If you do not want to incur this penalty, you can tell Cassandra to skip the batchlog with the @UNLOGGED@ option. If the @UNLOGGED@ option is used, a failed batch might leave the patch only partly applied.
h4(#counterBatch). @COUNTER@
[04/10] cassandra git commit: Remove "atomic" wording for batches in
CQL doc (CASSANDRA-10701)
Posted by sl...@apache.org.
Remove "atomic" wording for batches in CQL doc (CASSANDRA-10701)
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e4388313
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e4388313
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e4388313
Branch: refs/heads/trunk
Commit: e43883137750d62d8bafb3058d5ee4e322221733
Parents: 3740f81
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue Dec 22 11:52:00 2015 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Dec 22 11:52:36 2015 +0100
----------------------------------------------------------------------
doc/cql3/CQL.textile | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e4388313/doc/cql3/CQL.textile
----------------------------------------------------------------------
diff --git a/doc/cql3/CQL.textile b/doc/cql3/CQL.textile
index cc041df..3b69fcc 100644
--- a/doc/cql3/CQL.textile
+++ b/doc/cql3/CQL.textile
@@ -748,7 +748,7 @@ APPLY BATCH;
The @BATCH@ statement group multiple modification statements (insertions/updates and deletions) into a single statement. It serves several purposes:
# It saves network round-trips between the client and the server (and sometimes between the server coordinator and the replicas) when batching multiple updates.
# All updates in a @BATCH@ belonging to a given partition key are performed in isolation.
-# By default, all operations in the batch are performed atomically. See the notes on "@UNLOGGED@":#unloggedBatch for more details.
+# By default, all operations in the batch are performed as @LOGGED@, to ensure all mutations eventually complete (or none will). See the notes on "@UNLOGGED@":#unloggedBatch for more details.
Note that:
* @BATCH@ statements may only contain @UPDATE@, @INSERT@ and @DELETE@ statements.
@@ -757,9 +757,9 @@ Note that:
h4(#unloggedBatch). @UNLOGGED@
-By default, Cassandra uses a batch log to ensure all operations in a batch are applied atomically. (Note that the operations are still only isolated within a single partition.)
+By default, Cassandra uses a batch log to ensure all operations in a batch eventually complete or none will (note however that operations are only isolated within a single partition).
-There is a performance penalty for batch atomicity when a batch spans multiple partitions. If you do not want to incur this penalty, you can tell Cassandra to skip the batchlog with the @UNLOGGED@ option. If the @UNLOGGED@ option is used, operations are only atomic within a single partition.
+There is a performance penalty for batch atomicity when a batch spans multiple partitions. If you do not want to incur this penalty, you can tell Cassandra to skip the batchlog with the @UNLOGGED@ option. If the @UNLOGGED@ option is used, a failed batch might leave the patch only partly applied.
h4(#counterBatch). @COUNTER@
[09/10] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by sl...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/450fca99
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/450fca99
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/450fca99
Branch: refs/heads/trunk
Commit: 450fca99df3ddec25114f614de535f5eae0d9ec9
Parents: 21103be e654c1b
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue Dec 22 11:54:21 2015 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Dec 22 11:54:21 2015 +0100
----------------------------------------------------------------------
doc/cql3/CQL.textile | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/450fca99/doc/cql3/CQL.textile
----------------------------------------------------------------------
[05/10] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by sl...@apache.org.
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e654c1bf
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e654c1bf
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e654c1bf
Branch: refs/heads/cassandra-3.0
Commit: e654c1bf040ffe14e0da9a0c3246aaababe12178
Parents: ebbd516 e438831
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue Dec 22 11:53:40 2015 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Dec 22 11:53:40 2015 +0100
----------------------------------------------------------------------
doc/cql3/CQL.textile | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e654c1bf/doc/cql3/CQL.textile
----------------------------------------------------------------------
[03/10] cassandra git commit: Remove "atomic" wording for batches in
CQL doc (CASSANDRA-10701)
Posted by sl...@apache.org.
Remove "atomic" wording for batches in CQL doc (CASSANDRA-10701)
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e4388313
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e4388313
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e4388313
Branch: refs/heads/cassandra-3.0
Commit: e43883137750d62d8bafb3058d5ee4e322221733
Parents: 3740f81
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue Dec 22 11:52:00 2015 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Dec 22 11:52:36 2015 +0100
----------------------------------------------------------------------
doc/cql3/CQL.textile | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e4388313/doc/cql3/CQL.textile
----------------------------------------------------------------------
diff --git a/doc/cql3/CQL.textile b/doc/cql3/CQL.textile
index cc041df..3b69fcc 100644
--- a/doc/cql3/CQL.textile
+++ b/doc/cql3/CQL.textile
@@ -748,7 +748,7 @@ APPLY BATCH;
The @BATCH@ statement group multiple modification statements (insertions/updates and deletions) into a single statement. It serves several purposes:
# It saves network round-trips between the client and the server (and sometimes between the server coordinator and the replicas) when batching multiple updates.
# All updates in a @BATCH@ belonging to a given partition key are performed in isolation.
-# By default, all operations in the batch are performed atomically. See the notes on "@UNLOGGED@":#unloggedBatch for more details.
+# By default, all operations in the batch are performed as @LOGGED@, to ensure all mutations eventually complete (or none will). See the notes on "@UNLOGGED@":#unloggedBatch for more details.
Note that:
* @BATCH@ statements may only contain @UPDATE@, @INSERT@ and @DELETE@ statements.
@@ -757,9 +757,9 @@ Note that:
h4(#unloggedBatch). @UNLOGGED@
-By default, Cassandra uses a batch log to ensure all operations in a batch are applied atomically. (Note that the operations are still only isolated within a single partition.)
+By default, Cassandra uses a batch log to ensure all operations in a batch eventually complete or none will (note however that operations are only isolated within a single partition).
-There is a performance penalty for batch atomicity when a batch spans multiple partitions. If you do not want to incur this penalty, you can tell Cassandra to skip the batchlog with the @UNLOGGED@ option. If the @UNLOGGED@ option is used, operations are only atomic within a single partition.
+There is a performance penalty for batch atomicity when a batch spans multiple partitions. If you do not want to incur this penalty, you can tell Cassandra to skip the batchlog with the @UNLOGGED@ option. If the @UNLOGGED@ option is used, a failed batch might leave the patch only partly applied.
h4(#counterBatch). @COUNTER@
[06/10] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by sl...@apache.org.
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e654c1bf
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e654c1bf
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e654c1bf
Branch: refs/heads/cassandra-2.2
Commit: e654c1bf040ffe14e0da9a0c3246aaababe12178
Parents: ebbd516 e438831
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue Dec 22 11:53:40 2015 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Dec 22 11:53:40 2015 +0100
----------------------------------------------------------------------
doc/cql3/CQL.textile | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e654c1bf/doc/cql3/CQL.textile
----------------------------------------------------------------------
[10/10] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Posted by sl...@apache.org.
Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7950d803
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7950d803
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7950d803
Branch: refs/heads/trunk
Commit: 7950d80330ba0a786e62c27d5051e66ee4e41464
Parents: c4428c7 450fca9
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue Dec 22 11:55:46 2015 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Dec 22 11:55:46 2015 +0100
----------------------------------------------------------------------
doc/cql3/CQL.textile | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7950d803/doc/cql3/CQL.textile
----------------------------------------------------------------------
[02/10] cassandra git commit: Remove "atomic" wording for batches in
CQL doc (CASSANDRA-10701)
Posted by sl...@apache.org.
Remove "atomic" wording for batches in CQL doc (CASSANDRA-10701)
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e4388313
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e4388313
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e4388313
Branch: refs/heads/cassandra-2.2
Commit: e43883137750d62d8bafb3058d5ee4e322221733
Parents: 3740f81
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue Dec 22 11:52:00 2015 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Dec 22 11:52:36 2015 +0100
----------------------------------------------------------------------
doc/cql3/CQL.textile | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e4388313/doc/cql3/CQL.textile
----------------------------------------------------------------------
diff --git a/doc/cql3/CQL.textile b/doc/cql3/CQL.textile
index cc041df..3b69fcc 100644
--- a/doc/cql3/CQL.textile
+++ b/doc/cql3/CQL.textile
@@ -748,7 +748,7 @@ APPLY BATCH;
The @BATCH@ statement group multiple modification statements (insertions/updates and deletions) into a single statement. It serves several purposes:
# It saves network round-trips between the client and the server (and sometimes between the server coordinator and the replicas) when batching multiple updates.
# All updates in a @BATCH@ belonging to a given partition key are performed in isolation.
-# By default, all operations in the batch are performed atomically. See the notes on "@UNLOGGED@":#unloggedBatch for more details.
+# By default, all operations in the batch are performed as @LOGGED@, to ensure all mutations eventually complete (or none will). See the notes on "@UNLOGGED@":#unloggedBatch for more details.
Note that:
* @BATCH@ statements may only contain @UPDATE@, @INSERT@ and @DELETE@ statements.
@@ -757,9 +757,9 @@ Note that:
h4(#unloggedBatch). @UNLOGGED@
-By default, Cassandra uses a batch log to ensure all operations in a batch are applied atomically. (Note that the operations are still only isolated within a single partition.)
+By default, Cassandra uses a batch log to ensure all operations in a batch eventually complete or none will (note however that operations are only isolated within a single partition).
-There is a performance penalty for batch atomicity when a batch spans multiple partitions. If you do not want to incur this penalty, you can tell Cassandra to skip the batchlog with the @UNLOGGED@ option. If the @UNLOGGED@ option is used, operations are only atomic within a single partition.
+There is a performance penalty for batch atomicity when a batch spans multiple partitions. If you do not want to incur this penalty, you can tell Cassandra to skip the batchlog with the @UNLOGGED@ option. If the @UNLOGGED@ option is used, a failed batch might leave the patch only partly applied.
h4(#counterBatch). @COUNTER@
[07/10] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by sl...@apache.org.
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e654c1bf
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e654c1bf
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e654c1bf
Branch: refs/heads/trunk
Commit: e654c1bf040ffe14e0da9a0c3246aaababe12178
Parents: ebbd516 e438831
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue Dec 22 11:53:40 2015 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Dec 22 11:53:40 2015 +0100
----------------------------------------------------------------------
doc/cql3/CQL.textile | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e654c1bf/doc/cql3/CQL.textile
----------------------------------------------------------------------
[08/10] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by sl...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/450fca99
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/450fca99
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/450fca99
Branch: refs/heads/cassandra-3.0
Commit: 450fca99df3ddec25114f614de535f5eae0d9ec9
Parents: 21103be e654c1b
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue Dec 22 11:54:21 2015 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Dec 22 11:54:21 2015 +0100
----------------------------------------------------------------------
doc/cql3/CQL.textile | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/450fca99/doc/cql3/CQL.textile
----------------------------------------------------------------------