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

cqlsh: Add row count to SELECT output 

patch by Aleksey Yeschenko; reviewed by Brandon Williams for
CASSANDRA-5636
This commit is contained in:
Aleksey Yeschenko 2013-06-15 01:53:40 +03:00
parent 241e82d719
commit 629abfb52d
3 changed files with 80 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -57,6 +57,7 @@
* Support native link w/o JNA in Java7 (CASSANDRA-3734) * Support native link w/o JNA in Java7 (CASSANDRA-3734)
* Use SASL authentication in binary protocol v2 (CASSANDRA-5545) * Use SASL authentication in binary protocol v2 (CASSANDRA-5545)
* Replace Thrift HsHa with LMAX Disruptor based implementation (CASSANDRA-5582) * Replace Thrift HsHa with LMAX Disruptor based implementation (CASSANDRA-5582)
* cqlsh: Add row count to SELECT output (CASSANDRA-5636)
1.2.6 1.2.6
* Reduce SSTableLoader memory usage (CASSANDRA-5555) * Reduce SSTableLoader memory usage (CASSANDRA-5555)

8
bin/cqlsh
View File

@ -891,7 +891,7 @@ class Shell(cmd.Cmd):
self.printerr(traceback.format_exc()) self.printerr(traceback.format_exc())
return False return False
if self.cursor.description is not _VOID_DESCRIPTION: if statement[:6].lower() == 'select':
self.print_result(self.cursor, with_default_limit) self.print_result(self.cursor, with_default_limit)
self.flush_output() self.flush_output()
return True return True
@ -911,7 +911,9 @@ class Shell(cmd.Cmd):
self.decoding_errors = [] self.decoding_errors = []
self.writeresult("") self.writeresult("")
self.print_static_result(cursor) if cursor.rowcount != 0:
self.print_static_result(cursor)
self.writeresult("(%d rows)" % cursor.rowcount)
self.writeresult("") self.writeresult("")
if self.decoding_errors: if self.decoding_errors:
@ -962,6 +964,8 @@ class Shell(cmd.Cmd):
line = ' | '.join(col.rjust(w, color=self.color) for (col, w) in zip(row, widths)) line = ' | '.join(col.rjust(w, color=self.color) for (col, w) in zip(row, widths))
self.writeresult(' ' + line) self.writeresult(' ' + line)
self.writeresult("")
def print_formatted_result_vertically(self, formatted_names, formatted_values): def print_formatted_result_vertically(self, formatted_names, formatted_values):
max_col_width = max([n.displaywidth for n in formatted_names]) max_col_width = max([n.displaywidth for n in formatted_names])
max_val_width = max([n.displaywidth for row in formatted_values for n in row]) max_val_width = max([n.displaywidth for row in formatted_values for n in row])

91
pylib/cqlshlib/test/test_cqlsh_output.py
View File

@ -71,8 +71,7 @@ class TestCqlshOutput(BaseTestCase):
for ver in cqlver: for ver in cqlver:
self.assertQueriesGiveColoredOutput(queries_and_expected_outputs, cqlver=ver, **kwargs) self.assertQueriesGiveColoredOutput(queries_and_expected_outputs, cqlver=ver, **kwargs)
def assertQueriesGiveColoredOutput(self, queries_and_expected_outputs, def assertQueriesGiveColoredOutput(self, queries_and_expected_outputs, **kwargs):
sort_results=False, **kwargs):
""" """
Allow queries and expected output to be specified in structured tuples, Allow queries and expected output to be specified in structured tuples,
along with expected color information. along with expected color information.
@ -84,17 +83,6 @@ class TestCqlshOutput(BaseTestCase):
c_output = ColoredText(output) c_output = ColoredText(output)
pairs = at_a_time(dedent(expected).split('\n'), 2) pairs = at_a_time(dedent(expected).split('\n'), 2)
outlines = c_output.splitlines() outlines = c_output.splitlines()
if sort_results:
if outlines[1].plain().startswith('---'):
firstpart = outlines[:2]
sortme = outlines[2:]
else:
firstpart = []
sortme = outlines
lastpart = []
while sortme[-1].plain() == '':
lastpart.append(sortme.pop(-1))
outlines = firstpart + sorted(sortme, key=lambda c:c.plain()) + lastpart
for (plain, colorcodes), outputline in zip(pairs, outlines): for (plain, colorcodes), outputline in zip(pairs, outlines):
self.assertEqual(outputline.plain().rstrip(), plain) self.assertEqual(outputline.plain().rstrip(), plain)
self.assertColorFromTags(outputline, colorcodes) self.assertColorFromTags(outputline, colorcodes)
@ -114,8 +102,8 @@ class TestCqlshOutput(BaseTestCase):
def test_no_prompt_or_colors_output(self): def test_no_prompt_or_colors_output(self):
# CQL queries and number of lines expected in output: # CQL queries and number of lines expected in output:
queries = (('select * from has_all_types limit 1;', 5), queries = (('select * from has_all_types limit 1;', 7),
('select * from has_value_encoding_errors limit 1;', 6)) ('select * from has_value_encoding_errors limit 1;', 8))
for termname in ('', 'dumb', 'vt100', 'xterm'): for termname in ('', 'dumb', 'vt100', 'xterm'):
cqlshlog.debug('TERM=%r' % termname) cqlshlog.debug('TERM=%r' % termname)
for cql, lines_expected in queries: for cql, lines_expected in queries:
@ -156,6 +144,9 @@ class TestCqlshOutput(BaseTestCase):
4 4
G G
(1 rows)
nnnnnnnn
"""), """),
('select COUNT(*) FROM empty_table;', """ ('select COUNT(*) FROM empty_table;', """
@ -166,6 +157,9 @@ class TestCqlshOutput(BaseTestCase):
0 0
G G
(1 rows)
nnnnnnnn
"""), """),
('select COUNT(*) FROM empty_composite_table;', """ ('select COUNT(*) FROM empty_composite_table;', """
@ -176,6 +170,9 @@ class TestCqlshOutput(BaseTestCase):
0 0
G G
(1 rows)
nnnnnnnn
"""), """),
('select COUNT(*) FROM twenty_rows_table limit 10;', """ ('select COUNT(*) FROM twenty_rows_table limit 10;', """
@ -186,6 +183,9 @@ class TestCqlshOutput(BaseTestCase):
10 10
GG GG
(1 rows)
nnnnnnnn
"""), """),
('select COUNT(*) FROM twenty_rows_table limit 1000000;', """ ('select COUNT(*) FROM twenty_rows_table limit 1000000;', """
@ -196,6 +196,9 @@ class TestCqlshOutput(BaseTestCase):
20 20
GG GG
(1 rows)
nnnnnnnn
"""), """),
), cqlver=3) ), cqlver=3)
@ -209,6 +212,9 @@ class TestCqlshOutput(BaseTestCase):
20 20
GG GG
(1 rows)
nnnnnnnn
"""), """),
), cqlver=3) ), cqlver=3)
@ -226,6 +232,9 @@ class TestCqlshOutput(BaseTestCase):
2 | 2 2 | 2
YY YY YY YY
(3 rows)
nnnnnnnn
"""), """),
), cqlver=3) ), cqlver=3)
@ -239,19 +248,23 @@ class TestCqlshOutput(BaseTestCase):
GG GGGGGGG YYYYYYYYYYYYYYYYYYYYYYY GG GGGGGGG YYYYYYYYYYYYYYYYYYYYYYY
2 | 2.3 | two point three 2 | 2.3 | two point three
GG GGGGGGG YYYYYYYYYYYYYYYYYYYYYYY GG GGGGGGG YYYYYYYYYYYYYYYYYYYYYYY
3 | 99 | ninety-nine point oh 3 | -0.0001 | negative ten thousandth
GG GGGGGGG YYYYYYYYYYYYYYYYYYYYYYY GG GGGGGGG YYYYYYYYYYYYYYYYYYYYYYY
3 | 3.46 | three point four six 3 | 3.46 | three point four six
GG GGGGGGG YYYYYYYYYYYYYYYYYYYYYYY GG GGGGGGG YYYYYYYYYYYYYYYYYYYYYYY
3 | -0.0001 | negative ten thousandth 3 | 99 | ninety-nine point oh
GG GGGGGGG YYYYYYYYYYYYYYYYYYYYYYY GG GGGGGGG YYYYYYYYYYYYYYYYYYYYYYY
(5 rows)
nnnnnnnn
"""), """),
), cqlver=3, sort_results=True) ), cqlver=3)
def test_empty_cf_output(self): def test_empty_cf_output(self):
self.assertCqlverQueriesGiveColoredOutput(( self.assertCqlverQueriesGiveColoredOutput((
('select * from empty_table;', """ ('select * from empty_table;', """
(0 rows)
"""), """),
), cqlver=3) ), cqlver=3)
@ -260,6 +273,7 @@ class TestCqlshOutput(BaseTestCase):
# same query should show up as empty in cql 3 # same query should show up as empty in cql 3
self.assertQueriesGiveColoredOutput(( self.assertQueriesGiveColoredOutput((
(q, """ (q, """
(0 rows)
"""), """),
), cqlver=3) ), cqlver=3)
@ -277,6 +291,9 @@ class TestCqlshOutput(BaseTestCase):
2 2
Y Y
(2 rows)
nnnnnnnn
"""), """),
), cqlver=3) ), cqlver=3)
@ -298,6 +315,9 @@ class TestCqlshOutput(BaseTestCase):
-2147483648 | -9223372036854775808 | -10000000000000000000000000 -2147483648 | -9223372036854775808 | -10000000000000000000000000
GGGGGGGGGGG GGGGGGGGGGGGGGGGGGGG GGGGGGGGGGGGGGGGGGGGGGGGGGG GGGGGGGGGGG GGGGGGGGGGGGGGGGGGGG GGGGGGGGGGGGGGGGGGGGGGGGGGG
(4 rows)
nnnnnnnn
"""), """),
('''select decimalcol, doublecol, floatcol \ ('''select decimalcol, doublecol, floatcol \
@ -316,6 +336,9 @@ class TestCqlshOutput(BaseTestCase):
10.0000000000000 | -1004.1 | 1e+08 10.0000000000000 | -1004.1 | 1e+08
GGGGGGGGGGGGGGGG GGGGGGG GGGGG GGGGGGGGGGGGGGGG GGGGGGG GGGGG
(4 rows)
nnnnnnnn
"""), """),
), cqlver=3) ), cqlver=3)
@ -329,6 +352,9 @@ class TestCqlshOutput(BaseTestCase):
2012-05-14 12:53:20+0000 2012-05-14 12:53:20+0000
GGGGGGGGGGGGGGGGGGGGGGGG GGGGGGGGGGGGGGGGGGGGGGGG
(1 rows)
nnnnnnnn
"""), """),
), env={'TZ': 'Etc/UTC'}) ), env={'TZ': 'Etc/UTC'})
@ -341,6 +367,9 @@ class TestCqlshOutput(BaseTestCase):
2012-05-14 07:53:20-0500 2012-05-14 07:53:20-0500
GGGGGGGGGGGGGGGGGGGGGGGG GGGGGGGGGGGGGGGGGGGGGGGG
(1 rows)
nnnnnnnn
"""), """),
), env={'TZ': 'EST'}) ), env={'TZ': 'EST'})
@ -360,6 +389,9 @@ class TestCqlshOutput(BaseTestCase):
3 | False 3 | False
G GGGGG G GGGGG
(4 rows)
nnnnnnnn
"""), """),
), cqlver=3) ), cqlver=3)
@ -376,6 +408,9 @@ class TestCqlshOutput(BaseTestCase):
k2 | c2 | null k2 | c2 | null
YY YY RRRR YY YY RRRR
(2 rows)
nnnnnnnn
"""), """),
), cqlver=3) ), cqlver=3)
@ -391,6 +426,9 @@ class TestCqlshOutput(BaseTestCase):
k2 | c2 | null k2 | c2 | null
YY YY RRRR YY YY RRRR
(2 rows)
nnnnnnnn
"""), """),
), cqlver=3) ), cqlver=3)
@ -412,6 +450,9 @@ class TestCqlshOutput(BaseTestCase):
4 | fake special chars\x00\n 4 | fake special chars\x00\n
G YYYYYYYYYYYYYYYYYYYYYYYY G YYYYYYYYYYYYYYYYYYYYYYYY
(5 rows)
nnnnnnnn
"""), """),
), cqlver=3) ), cqlver=3)
@ -443,6 +484,9 @@ class TestCqlshOutput(BaseTestCase):
6 | fake special chars\\x00\\n 6 | fake special chars\\x00\\n
G YYYYYYYYYYYYYYYYYYYYYYYY G YYYYYYYYYYYYYYYYYYYYYYYY
(7 rows)
nnnnnnnn
""".encode('utf-8')), """.encode('utf-8')),
), cqlver=3, env={'LANG': 'en_US.UTF-8'}) ), cqlver=3, env={'LANG': 'en_US.UTF-8'})
@ -462,6 +506,9 @@ class TestCqlshOutput(BaseTestCase):
3 | 0x80 3 | 0x80
G mmmmmmmmmmmmmmmmmmmm G mmmmmmmmmmmmmmmmmmmm
(4 rows)
nnnnnnnn
"""), """),
), cqlver=3) ), cqlver=3)
@ -485,6 +532,10 @@ class TestCqlshOutput(BaseTestCase):
Y RRRRRRRRRRRRRRRRRR Y RRRRRRRRRRRRRRRRRR
(1 rows)
nnnnnnnn
Failed to decode value '\x00\xff\x00\xff' (for column 'utf8col') as text: 'utf8' codec can't decode byte 0xff in position 1: invalid start byte Failed to decode value '\x00\xff\x00\xff' (for column 'utf8col') as text: 'utf8' codec can't decode byte 0xff in position 1: invalid start byte
RRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRR RRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRR
"""), """),
@ -501,6 +552,10 @@ class TestCqlshOutput(BaseTestCase):
RRRRRRRRRRRRRRRRRR YYYYYYYY RRRRRRRRRRRRRRRRRR YYYYYYYY
(1 rows)
nnnnnnnn
Failed to decode value '\x00\xff\x02\x8f' (for column 'pkey') as text: 'utf8' codec can't decode byte 0xff in position 1: invalid start byte Failed to decode value '\x00\xff\x02\x8f' (for column 'pkey') as text: 'utf8' codec can't decode byte 0xff in position 1: invalid start byte
RRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRR RRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRR
"""), """),