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

Fixed the error when tracing query with cqlsh 

patch by Robert Stupp; reviewed by Mikhail Stepura for CASSANDRA-7613
This commit is contained in:
Robert Stupp 2014-08-14 14:24:54 -07:00 committed by Mikhail Stepura
parent a816e09d8b
commit 91e63d0546
2 changed files with 7 additions and 5 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.1 2.1.1
* (cqlsh) Error when tracing query (CASSANDRA-7613)
* Avoid IOOBE when building SyntaxError message snippet (CASSANDRA-7569) * Avoid IOOBE when building SyntaxError message snippet (CASSANDRA-7569)
* SSTableExport uses correct validator to create string representation of partition * SSTableExport uses correct validator to create string representation of partition
keys (CASSANDRA-7498) keys (CASSANDRA-7498)

11
bin/cqlsh
View File

@ -584,13 +584,14 @@ class Shell(cmd.Cmd):
self.decoding_errors.append(err) self.decoding_errors.append(err)
return format_value(err, self.output_codec.name, addcolor=self.color) return format_value(err, self.output_codec.name, addcolor=self.color)
def myformat_colname(self, name, cfMetaData): def myformat_colname(self, name, cfMetaData = None):
column_colors = COLUMN_NAME_COLORS.copy() column_colors = COLUMN_NAME_COLORS.copy()
# check column role and color appropriately # check column role and color appropriately
if name in [col.name for col in cfMetaData.partition_key]: if cfMetaData:
column_colors.default_factory = lambda : RED if name in [col.name for col in cfMetaData.partition_key]:
elif name in [col.name for col in cfMetaData.clustering_key]: column_colors.default_factory = lambda : RED
column_colors.default_factory = lambda : CYAN elif name in [col.name for col in cfMetaData.clustering_key]:
column_colors.default_factory = lambda : CYAN
return self.myformat_value(name, colormap=column_colors) return self.myformat_value(name, colormap=column_colors)
def report_connection(self): def report_connection(self):