cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tylerho...@apache.org
Subject [2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk
Date Wed, 22 Apr 2015 15:51:14 GMT
Merge branch 'cassandra-2.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/e6bc6385
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e6bc6385
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e6bc6385

Branch: refs/heads/trunk
Commit: e6bc6385ae83bbc432f5dc4d2fffac868c528159
Parents: 6ad452e 93b36d4
Author: Tyler Hobbs <tylerlhobbs@gmail.com>
Authored: Wed Apr 22 10:50:55 2015 -0500
Committer: Tyler Hobbs <tylerlhobbs@gmail.com>
Committed: Wed Apr 22 10:50:55 2015 -0500

----------------------------------------------------------------------
 bin/cqlsh                                    | 57 ++++++++++++++---------
 pylib/cqlshlib/test/test_cqlsh_completion.py |  3 +-
 2 files changed, 36 insertions(+), 24 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e6bc6385/bin/cqlsh
----------------------------------------------------------------------
diff --cc bin/cqlsh
index 9dffa7f,903cb72..efd1069
--- a/bin/cqlsh
+++ b/bin/cqlsh
@@@ -1758,9 -1708,10 +1743,10 @@@ class Shell(cmd.Cmd)
              except IOError, e:
                  self.printerr("Can't open %r for writing: %s" % (fname, e))
                  return 0
-         wmeter = meter.Meter()
+ 
+         meter = RateMeter(10000)
          try:
 -
 +            dtformats = DateTimeFormat(self.display_timestamp_format, self.display_date_format,
self.display_nanotime_format)
              dump = self.prep_export_dump(ks, cf, columns)
              writer = csv.writer(csvdest, **dialect_options)
              if header:
@@@ -1768,11 -1719,10 +1754,10 @@@
              for row in dump:
                  fmt = lambda v: \
                      format_value(v, output_encoding=encoding, nullval=nullval,
 -                                 time_format=self.display_time_format,
 +                                 date_time_format=dtformats,
                                   float_precision=self.display_float_precision).strval
                  writer.writerow(map(fmt, row.values()))
-                 wmeter.mark_written()
-             wmeter.done()
+                 meter.increment()
          finally:
              if do_close:
                  csvdest.close()

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e6bc6385/pylib/cqlshlib/test/test_cqlsh_completion.py
----------------------------------------------------------------------


Mime
View raw message