Updated Branches: refs/heads/cassandra-1.1 93bd3d896 -> c7ce11f00 refs/heads/trunk 0b94b191d -> 29353b8aa
Merge branch 'cassandra-1.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/29353b8a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/29353b8a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/29353b8a Branch: refs/heads/trunk Commit: 29353b8aa230db77f173dde334be9531ad32bdf0 Parents: 0b94b19 c7ce11f Author: Yuki Morishita <yu...@apache.org> Authored: Thu Sep 27 16:57:51 2012 -0500 Committer: Yuki Morishita <yu...@apache.org> Committed: Thu Sep 27 16:59:33 2012 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/cli/CliClient.java | 30 +++++++++++++---- 2 files changed, 24 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/29353b8a/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/29353b8a/src/java/org/apache/cassandra/cli/CliClient.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/cli/CliClient.java index 0c3e133,b32b0f7..87981fe --- a/src/java/org/apache/cassandra/cli/CliClient.java +++ b/src/java/org/apache/cassandra/cli/CliClient.java @@@ -398,8 -402,6 +398,8 @@@ public class CliClien return; } - long startTime = System.currentTimeMillis(); ++ long startTime = System.nanoTime(); + Tree columnTree = (columnSpecCnt >= 1) ? columnFamilySpec.getChild(2) : null; @@@ -2930,11 -2968,27 +2930,27 @@@ return false; } + /** + * Print elapsed time. Print 2 fraction digits if eta is under 10 ms. + * @param startTime starting time in nanoseconds + */ private void elapsedTime(long startTime) { - sessionState.out.println("Elapsed time: " + (System.currentTimeMillis() - startTime) + " msec(s)."); + /** time elapsed in nanoseconds */ + long eta = System.nanoTime() - startTime; + + sessionState.out.print("Elapsed time: "); + if (eta < 10000000) + { + sessionState.out.print(Math.round(eta/10000.0)/100.0); + } + else + { + sessionState.out.print(Math.round(eta/1000000.0)); + } + sessionState.out.println(" msec(s)."); } - + class CfAssumptions { //Map<KeySpace, Map<ColumnFamily, Map<Property, Value>>>
