You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by bl...@apache.org on 2020/03/16 17:00:22 UTC
[cassandra] branch trunk updated: Use ClientState timestamp for
when dropping columns
This is an automated email from the ASF dual-hosted git repository.
blerer pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
The following commit(s) were added to refs/heads/trunk by this push:
new 61b8a14 Use ClientState timestamp for when dropping columns
61b8a14 is described below
commit 61b8a14a59e824854f87b54afc08289a3278942c
Author: Ryan Svihla <43...@users.noreply.github.com>
AuthorDate: Mon Mar 16 17:55:59 2020 +0100
Use ClientState timestamp for when dropping columns
patch by Ryan Svihla; reviewed by Benjamin Lerer for CASSANDRA-15557
---
.../apache/cassandra/cql3/statements/schema/AlterTableStatement.java | 2 +-
src/java/org/apache/cassandra/service/ClientState.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/java/org/apache/cassandra/cql3/statements/schema/AlterTableStatement.java b/src/java/org/apache/cassandra/cql3/statements/schema/AlterTableStatement.java
index d784796..b269762 100644
--- a/src/java/org/apache/cassandra/cql3/statements/schema/AlterTableStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/schema/AlterTableStatement.java
@@ -270,7 +270,7 @@ public abstract class AlterTableStatement extends AlterSchemaStatement
*/
private long getTimestamp()
{
- return timestamp == null ? FBUtilities.timestampMicros() : timestamp;
+ return timestamp == null ? ClientState.getTimestamp() : timestamp;
}
}
diff --git a/src/java/org/apache/cassandra/service/ClientState.java b/src/java/org/apache/cassandra/service/ClientState.java
index 81574e6..496cabd 100644
--- a/src/java/org/apache/cassandra/service/ClientState.java
+++ b/src/java/org/apache/cassandra/service/ClientState.java
@@ -194,7 +194,7 @@ public class ClientState
* This clock guarantees that updates for the same ClientState will be ordered
* in the sequence seen, even if multiple updates happen in the same millisecond.
*/
- public long getTimestamp()
+ public static long getTimestamp()
{
while (true)
{
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org