You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by xe...@apache.org on 2012/07/10 19:19:33 UTC
[2/2] git commit: change nanoTime() to currentTimeInMillis() in
schema related code patch by Pavel Yaskevich;
reviewed by Jonathan Ellis for CASSANDRA-4432
change nanoTime() to currentTimeInMillis() in schema related code
patch by Pavel Yaskevich; reviewed by Jonathan Ellis for CASSANDRA-4432
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a6c567ea
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a6c567ea
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a6c567ea
Branch: refs/heads/trunk
Commit: a6c567ea99ae883afa99b61e4e46463e62b611f6
Parents: 485c878
Author: Pavel Yaskevich <xe...@apache.org>
Authored: Tue Jul 10 19:58:22 2012 +0300
Committer: Pavel Yaskevich <xe...@apache.org>
Committed: Tue Jul 10 20:15:32 2012 +0300
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../apache/cassandra/service/MigrationManager.java | 12 ++++++------
2 files changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a6c567ea/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 85ff9ca..cb85459 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -9,6 +9,7 @@
* Correctly catch exception when Snappy cannot be loaded (CASSANDRA-4400)
* (cql3) Support ORDER BY when IN condition is given in WHERE clause (CASSANDRA-4327)
* (cql3) delete "component_index" column on DROP TABLE call (CASSANDRA-4420)
+ * change nanoTime() to currentTimeInMillis() in schema related code (CASSANDRA-4432)
Merged from 1.0:
* allow dropping columns shadowed by not-yet-expired supercolumn or row
tombstones in PrecompactedRow (CASSANDRA-4396)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a6c567ea/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 18ef298..3282e31 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.nanoTime()));
+ announce(ksm.toSchema(System.currentTimeMillis()));
}
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.nanoTime()));
+ announce(cfm.toSchema(System.currentTimeMillis()));
}
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.nanoTime()));
+ announce(oldKsm.toSchemaUpdate(ksm, System.currentTimeMillis()));
}
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.nanoTime()));
+ announce(oldCfm.toSchemaUpdate(cfm, System.currentTimeMillis()));
}
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.nanoTime()));
+ announce(oldKsm.dropFromSchema(System.currentTimeMillis()));
}
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.nanoTime()));
+ announce(oldCfm.dropFromSchema(System.currentTimeMillis()));
}
/**