natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(cqlsh) fix COPY using wrong variable name for time_format 

patch by Stefania Alborghetti; reviewed by Paulo Motta for
CASSANDRA-10633
This commit is contained in:
Stefania Alborghetti 2015-11-03 09:10:22 +08:00 committed by Aleksey Yeschenko
parent 2ca7599023
commit 81e520c54b
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -1,4 +1,5 @@
2.1.12
* (cqlsh) fix COPY using wrong variable name for time_format (CASSANDRA-10633)
* Do not run SizeEstimatesRecorder if a node is not a member of the ring (CASSANDRA-9912)
* Improve handling of dead nodes in gossip (CASSANDRA-10298)
* Fix logback-tools.xml incorrectly configured for outputing to System.err

7
bin/cqlsh
View File

@ -1507,7 +1507,7 @@ class Shell(cmd.Cmd):
HEADER=false - whether to ignore the first line
NULL='' - string that represents a null value
ENCODING='utf8' - encoding for CSV output (COPY TO only)
TIME_FORMAT= - timestamp strftime format (COPY TO only)
TIMEFORMAT= - timestamp strftime format (COPY TO only)
'%Y-%m-%d %H:%M:%S%z' defaults to time_format value in cqlshrc
When entering CSV data on STDIN, you can use the sequence "\."
@ -1816,7 +1816,7 @@ class Shell(cmd.Cmd):
encoding = opts.pop('encoding', 'utf8')
nullval = opts.pop('null', '')
header = bool(opts.pop('header', '').lower() == 'true')
timestamp_format = opts.pop('time_format', self.display_timestamp_format)
time_format = opts.pop('timeformat', self.display_time_format)
if dialect_options['quotechar'] == dialect_options['escapechar']:
dialect_options['doublequote'] = True
del dialect_options['escapechar']
@ -1839,7 +1839,6 @@ class Shell(cmd.Cmd):
meter = RateMeter(10000)
try:
dtformats = DateTimeFormat(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:
@ -1847,7 +1846,7 @@ class Shell(cmd.Cmd):
for row in dump:
fmt = lambda v: \
format_value(v, output_encoding=encoding, nullval=nullval,
time_format=dtformats,
time_format=time_format,
float_precision=self.display_float_precision).strval
writer.writerow(map(fmt, row.values()))
meter.increment()