You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ty...@apache.org on 2015/02/06 23:37:53 UTC

cassandra git commit: Clarify default timestamp in CQL docs

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.0 cf73de2dc -> 08deff70a


Clarify default timestamp in CQL docs

Patch by Tyler Hobbs for CASSANDRA-8538


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/08deff70
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/08deff70
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/08deff70

Branch: refs/heads/cassandra-2.0
Commit: 08deff70a0f22e235b7c246c9ff6f4f7877c66ff
Parents: cf73de2
Author: Tyler Hobbs <ty...@datastax.com>
Authored: Fri Feb 6 16:36:55 2015 -0600
Committer: Tyler Hobbs <ty...@datastax.com>
Committed: Fri Feb 6 16:37:45 2015 -0600

----------------------------------------------------------------------
 doc/cql3/CQL.textile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/08deff70/doc/cql3/CQL.textile
----------------------------------------------------------------------
diff --git a/doc/cql3/CQL.textile b/doc/cql3/CQL.textile
index ab7da50..6085d00 100644
--- a/doc/cql3/CQL.textile
+++ b/doc/cql3/CQL.textile
@@ -545,7 +545,7 @@ The @id = id + <collection-literal>@ and @id[value1] = value2@ forms of @<assign
 h4(#updateOptions). @<options>@
 
 The @UPDATE@ and @INSERT@ statements allows to specify the following options for the insertion:
-* @TIMESTAMP@: sets the timestamp for the operation. If not specified, the current time of the insertion (in microseconds) is used. This is usually a suitable default.
+* @TIMESTAMP@: sets the timestamp for the operation. If not specified, the coordinator will use the current time (in microseconds) at the start of statement execution as the timestamp. This is usually a suitable default.
 * @TTL@: allows to specify an optional Time To Live (in seconds) for the inserted values. If set, the inserted values are automatically removed from the database after the specified time. Note that the TTL concerns the inserted values, not the column themselves. This means that any subsequent update of the column will also reset the TTL (to whatever TTL is specified in that update). By default, values never expire. A TTL of 0 or a negative one is equivalent to no TTL.