Updated Branches: refs/heads/cassandra-1.1 a6c567ea9 -> 346ac03c2
change System.currentTimeMillis() to FBUtilities.timestampMicros(), related to CASSANDRA-4432 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/346ac03c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/346ac03c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/346ac03c Branch: refs/heads/cassandra-1.1 Commit: 346ac03c29cd1fe763bd01077a5e0c59f12181b3 Parents: a6c567e Author: Pavel Yaskevich <[email protected]> Authored: Tue Jul 10 23:41:39 2012 +0300 Committer: Pavel Yaskevich <[email protected]> Committed: Tue Jul 10 23:43:00 2012 +0300 ---------------------------------------------------------------------- .../apache/cassandra/service/MigrationManager.java | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/346ac03c/src/java/org/apache/cassandra/service/MigrationManager.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/service/MigrationManager.java b/src/java/org/apache/cassandra/service/MigrationManager.java index 3282e31..a067de3 100644 --- a/src/java/org/apache/cassandra/service/MigrationManager.java +++ b/src/java/org/apache/cassandra/service/MigrationManager.java @@ -123,7 +123,7 @@ public class MigrationManager implements IEndpointStateChangeSubscriber if (Schema.instance.getTableDefinition(ksm.name) != null) throw new ConfigurationException(String.format("Cannot add already existing keyspace '%s'.", ksm.name)); - announce(ksm.toSchema(System.currentTimeMillis())); + announce(ksm.toSchema(FBUtilities.timestampMicros())); } public static void announceNewColumnFamily(CFMetaData cfm) throws ConfigurationException @@ -136,7 +136,7 @@ public class MigrationManager implements IEndpointStateChangeSubscriber else if (ksm.cfMetaData().containsKey(cfm.cfName)) throw new ConfigurationException(String.format("Cannot add already existing column family '%s' to keyspace '%s'.", cfm.cfName, cfm.ksName)); - announce(cfm.toSchema(System.currentTimeMillis())); + announce(cfm.toSchema(FBUtilities.timestampMicros())); } public static void announceKeyspaceUpdate(KSMetaData ksm) throws ConfigurationException @@ -147,7 +147,7 @@ public class MigrationManager implements IEndpointStateChangeSubscriber if (oldKsm == null) throw new ConfigurationException(String.format("Cannot update non existing keyspace '%s'.", ksm.name)); - announce(oldKsm.toSchemaUpdate(ksm, System.currentTimeMillis())); + announce(oldKsm.toSchemaUpdate(ksm, FBUtilities.timestampMicros())); } public static void announceColumnFamilyUpdate(CFMetaData cfm) throws ConfigurationException @@ -158,7 +158,7 @@ public class MigrationManager implements IEndpointStateChangeSubscriber if (oldCfm == null) throw new ConfigurationException(String.format("Cannot update non existing column family '%s' in keyspace '%s'.", cfm.cfName, cfm.ksName)); - announce(oldCfm.toSchemaUpdate(cfm, System.currentTimeMillis())); + announce(oldCfm.toSchemaUpdate(cfm, FBUtilities.timestampMicros())); } public static void announceKeyspaceDrop(String ksName) throws ConfigurationException @@ -167,7 +167,7 @@ public class MigrationManager implements IEndpointStateChangeSubscriber if (oldKsm == null) throw new ConfigurationException(String.format("Cannot drop non existing keyspace '%s'.", ksName)); - announce(oldKsm.dropFromSchema(System.currentTimeMillis())); + announce(oldKsm.dropFromSchema(FBUtilities.timestampMicros())); } public static void announceColumnFamilyDrop(String ksName, String cfName) throws ConfigurationException @@ -176,7 +176,7 @@ public class MigrationManager implements IEndpointStateChangeSubscriber if (oldCfm == null) throw new ConfigurationException(String.format("Cannot drop non existing column family '%s' in keyspace '%s'.", cfName, ksName)); - announce(oldCfm.dropFromSchema(System.currentTimeMillis())); + announce(oldCfm.dropFromSchema(FBUtilities.timestampMicros())); } /**
