cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject [04/10] cassandra git commit: Remove "atomic" wording for batches in CQL doc (CASSANDRA-10701)
Date Tue, 22 Dec 2015 10:56:16 GMT
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 <sylvain@datastax.com>
Authored: Tue Dec 22 11:52:00 2015 +0100
Committer: Sylvain Lebresne <sylvain@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@
 


Mime
View raw message