mirror of https://github.com/apache/cassandra
Merge branch 'cassandra-2.1.0' into cassandra-2.1
This commit is contained in:
Tyler Hobbs
commit
d9b463ef52
|
|
@ -12,6 +12,7 @@
|
|||
* Configurable client timeout for cqlsh (CASSANDRA-7516)
|
||||
* Include snippet of CQL query near syntax error in messages (CASSANDRA-7111)
|
||||
Merged from 2.0:
|
||||
* (cqlsh) Fix failing cqlsh formatting tests (CASSANDRA-7703)
|
||||
* Fix IncompatibleClassChangeError from hadoop2 (CASSANDRA-7229)
|
||||
* Add 'nodetool sethintedhandoffthrottlekb' (CASSANDRA-7635)
|
||||
* (cqlsh) Add tab-completion for CREATE/DROP USER IF [NOT] EXISTS (CASSANDRA-7611)
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ from __future__ import with_statement
|
|||
|
||||
import re
|
||||
from itertools import izip
|
||||
from .basecase import (BaseTestCase, cqlshlog, dedent, at_a_time, cql, cqlsh,
|
||||
from .basecase import (BaseTestCase, cqlshlog, dedent, at_a_time, cqlsh,
|
||||
TEST_HOST, TEST_PORT)
|
||||
from .cassconnect import (get_test_keyspace, testrun_cqlsh, testcall_cqlsh,
|
||||
cassandra_cursor, split_cql_commands, quote_name)
|
||||
|
|
@ -31,7 +31,9 @@ from .ansi_colors import (ColoredText, lookup_colorcode, lookup_colorname,
|
|||
CONTROL_C = '\x03'
|
||||
CONTROL_D = '\x04'
|
||||
|
||||
|
||||
class TestCqlshOutput(BaseTestCase):
|
||||
|
||||
def setUp(self):
|
||||
pass
|
||||
|
||||
|
|
@ -93,33 +95,28 @@ class TestCqlshOutput(BaseTestCase):
|
|||
with testrun_cqlsh(tty=True, env={'TERM': termname}) as c:
|
||||
c.send('select * from has_all_types;\n')
|
||||
self.assertNoHasColors(c.read_to_next_prompt())
|
||||
c.send('select * from has_value_encoding_errors;\n')
|
||||
self.assertNoHasColors(c.read_to_next_prompt())
|
||||
c.send('select count(*) from has_all_types;\n')
|
||||
self.assertNoHasColors(c.read_to_next_prompt())
|
||||
c.send('totally invalid cql;\n')
|
||||
self.assertNoHasColors(c.read_to_next_prompt())
|
||||
|
||||
def test_no_prompt_or_colors_output(self):
|
||||
# CQL queries and number of lines expected in output:
|
||||
queries = (('select * from has_all_types limit 1;', 7),
|
||||
('select * from has_value_encoding_errors limit 1;', 8))
|
||||
for termname in ('', 'dumb', 'vt100', 'xterm'):
|
||||
cqlshlog.debug('TERM=%r' % termname)
|
||||
for cql, lines_expected in queries:
|
||||
output, result = testcall_cqlsh(prompt=None, env={'TERM': termname},
|
||||
tty=False, input=cql + '\n')
|
||||
output = output.splitlines()
|
||||
for line in output:
|
||||
self.assertNoHasColors(line)
|
||||
self.assertNotRegexpMatches(line, r'^cqlsh\S*>')
|
||||
self.assertEqual(len(output), lines_expected,
|
||||
msg='output: %r' % '\n'.join(output))
|
||||
self.assertEqual(output[0], '')
|
||||
self.assertNicelyFormattedTableHeader(output[1])
|
||||
self.assertNicelyFormattedTableRule(output[2])
|
||||
self.assertNicelyFormattedTableData(output[3])
|
||||
self.assertEqual(output[4].strip(), '')
|
||||
query = 'select * from has_all_types limit 1;'
|
||||
output, result = testcall_cqlsh(prompt=None, env={'TERM': termname},
|
||||
tty=False, input=query + '\n')
|
||||
output = output.splitlines()
|
||||
for line in output:
|
||||
self.assertNoHasColors(line)
|
||||
self.assertNotRegexpMatches(line, r'^cqlsh\S*>')
|
||||
self.assertTrue(6 <= len(output) <= 8,
|
||||
msg='output: %r' % '\n'.join(output))
|
||||
self.assertEqual(output[0], '')
|
||||
self.assertNicelyFormattedTableHeader(output[1])
|
||||
self.assertNicelyFormattedTableRule(output[2])
|
||||
self.assertNicelyFormattedTableData(output[3])
|
||||
self.assertEqual(output[4].strip(), '')
|
||||
|
||||
def test_color_output(self):
|
||||
for termname in ('xterm', 'unknown-garbage'):
|
||||
|
|
@ -127,8 +124,6 @@ class TestCqlshOutput(BaseTestCase):
|
|||
with testrun_cqlsh(tty=True, env={'TERM': termname}) as c:
|
||||
c.send('select * from has_all_types;\n')
|
||||
self.assertHasColors(c.read_to_next_prompt())
|
||||
c.send('select * from has_value_encoding_errors;\n')
|
||||
self.assertHasColors(c.read_to_next_prompt())
|
||||
c.send('select count(*) from has_all_types;\n')
|
||||
self.assertHasColors(c.read_to_next_prompt())
|
||||
c.send('totally invalid cql;\n')
|
||||
|
|
@ -449,7 +444,7 @@ class TestCqlshOutput(BaseTestCase):
|
|||
|
||||
def test_string_output_ascii(self):
|
||||
self.assertCqlverQueriesGiveColoredOutput((
|
||||
("select * from ascii_with_invalid_and_special_chars where k in (0, 1, 2, 3, 4);", r"""
|
||||
("select * from ascii_with_special_chars where k in (0, 1, 2, 3);", r"""
|
||||
k | val
|
||||
R MMM
|
||||
---+-----------------------------------------------
|
||||
|
|
@ -460,13 +455,11 @@ class TestCqlshOutput(BaseTestCase):
|
|||
G YYYYYYmmYYYYYYYYmmmmY
|
||||
2 | \x00\x01\x02\x03\x04\x05control chars\x06\x07
|
||||
G mmmmmmmmmmmmmmmmmmmmmmmmYYYYYYYYYYYYYmmmmmmmm
|
||||
3 | \xfe\xffbyte order mark
|
||||
G mmmmmmmmYYYYYYYYYYYYYYY
|
||||
4 | fake special chars\x00\n
|
||||
3 | fake special chars\x00\n
|
||||
G YYYYYYYYYYYYYYYYYYYYYYYY
|
||||
|
||||
|
||||
(5 rows)
|
||||
(4 rows)
|
||||
nnnnnnnn
|
||||
"""),
|
||||
), cqlver=cqlsh.DEFAULT_CQLVER)
|
||||
|
|
@ -527,55 +520,6 @@ class TestCqlshOutput(BaseTestCase):
|
|||
"""),
|
||||
), cqlver=cqlsh.DEFAULT_CQLVER)
|
||||
|
||||
def test_colname_decoding_errors(self):
|
||||
# not clear how to achieve this situation in the first place. the
|
||||
# validator works pretty well, and we can't change the comparator
|
||||
# after insertion.
|
||||
#
|
||||
# guess we could monkey-patch cqlsh or python-cql source to
|
||||
# explicitly generate an exception on the deserialization of type X..
|
||||
pass
|
||||
|
||||
def test_colval_decoding_errors(self):
|
||||
self.assertCqlverQueriesGiveColoredOutput((
|
||||
("select * from has_value_encoding_errors;", r"""
|
||||
pkey | utf8col
|
||||
MMMM MMMMMMM
|
||||
------+--------------------
|
||||
|
||||
A | '\x00\xff\x00\xff'
|
||||
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
|
||||
RRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRR
|
||||
"""),
|
||||
), cqlver=cqlsh.DEFAULT_CQLVER)
|
||||
|
||||
def test_key_decoding_errors(self):
|
||||
self.assertCqlverQueriesGiveColoredOutput((
|
||||
("select * from has_key_encoding_errors;", r"""
|
||||
pkey | col
|
||||
MMMM MMM
|
||||
--------------------+----------
|
||||
|
||||
'\x00\xff\x02\x8f' | whatever
|
||||
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
|
||||
RRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRR
|
||||
"""),
|
||||
), cqlver=cqlsh.DEFAULT_CQLVER)
|
||||
|
||||
def test_prompt(self):
|
||||
with testrun_cqlsh(tty=True, keyspace=None, cqlver=cqlsh.DEFAULT_CQLVER) as c:
|
||||
self.assertEqual(c.output_header.splitlines()[-1], 'cqlsh> ')
|
||||
|
|
@ -712,7 +656,7 @@ class TestCqlshOutput(BaseTestCase):
|
|||
cfnames = section.group('cfnames')
|
||||
self.assertNotIn('\n\n', cfnames)
|
||||
if ksname == ks:
|
||||
self.assertIn('ascii_with_invalid_and_special_chars', cfnames)
|
||||
self.assertIn('ascii_with_special_chars', cfnames)
|
||||
|
||||
self.assertIn('system', ksnames)
|
||||
self.assertIn(quote_name(ks), ksnames)
|
||||
|
|
@ -728,7 +672,6 @@ class TestCqlshOutput(BaseTestCase):
|
|||
self.assertEqual(output[0], '\n')
|
||||
self.assertEqual(output[-1], '\n')
|
||||
self.assertNotIn('Keyspace %s' % quote_name(ks), output)
|
||||
self.assertIn('has_value_encoding_errors', output)
|
||||
self.assertIn('undefined_values_table', output)
|
||||
|
||||
def test_describe_cluster_output(self):
|
||||
|
|
@ -807,8 +750,7 @@ class TestCqlshOutput(BaseTestCase):
|
|||
|
||||
def test_help_types(self):
|
||||
with testrun_cqlsh(tty=True) as c:
|
||||
output = c.cmd_and_response('help types')
|
||||
|
||||
c.cmd_and_response('help types')
|
||||
|
||||
def test_help(self):
|
||||
pass
|
||||
|
|
@ -873,10 +815,10 @@ class TestCqlshOutput(BaseTestCase):
|
|||
("select info from songs;", r"""
|
||||
info
|
||||
MMMM
|
||||
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
|
||||
-------------------------------------------------------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
{founded: '1970-01-02 20:24:54-0800', members: {'Adrian Smith', 'Bruce Dickinson', 'Dave Murray', 'Janick Gers', 'Nicko McBrain', 'Steve Harris'}, description: 'Pure evil metal'}
|
||||
BYYYYYYYBBGGGGGGGGGGGGGGGGGGGGGGGGGGBBYYYYYYYBBBYYYYYYYYYYYYYYBBYYYYYYYYYYYYYYYYYBBYYYYYYYYYYYYYBBYYYYYYYYYYYYYBBYYYYYYYYYYYYYYYBBYYYYYYYYYYYYYYBBBYYYYYYYYYYYBBYYYYYYYYYYYYYYYYYB
|
||||
{founded: 188694000, members: {'Adrian Smith', 'Bruce Dickinson', 'Dave Murray', 'Janick Gers', 'Nicko McBrain', 'Steve Harris'}, description: 'Pure evil metal'}
|
||||
BYYYYYYYBBGGGGGGGGGBBYYYYYYYBBBYYYYYYYYYYYYYYBBYYYYYYYYYYYYYYYYYBBYYYYYYYYYYYYYBBYYYYYYYYYYYYYBBYYYYYYYYYYYYYYYBBYYYYYYYYYYYYYYBBBYYYYYYYYYYYBBYYYYYYYYYYYYYYYYYB
|
||||
|
||||
|
||||
(1 rows)
|
||||
|
|
@ -896,4 +838,4 @@ class TestCqlshOutput(BaseTestCase):
|
|||
(1 rows)
|
||||
nnnnnnnn
|
||||
"""),
|
||||
), cqlver=cqlsh.DEFAULT_CQLVER)
|
||||
), cqlver=cqlsh.DEFAULT_CQLVER)
|
||||
|
|
|
|||
|
|
@ -52,20 +52,6 @@ VALUES (4, blobAsInt(0x), '', blobAsBigint(0x), 0x, blobAsBoolean(0x), blobAsDec
|
|||
blobAsVarint(0x));
|
||||
|
||||
|
||||
CREATE TABLE has_value_encoding_errors (
|
||||
pkey ascii PRIMARY KEY,
|
||||
utf8col text
|
||||
);
|
||||
|
||||
INSERT INTO has_value_encoding_errors (pkey, utf8col) VALUES ('A', blobAsText(0x00ff00ff));
|
||||
|
||||
CREATE TABLE has_key_encoding_errors (
|
||||
pkey blob PRIMARY KEY,
|
||||
col text
|
||||
);
|
||||
|
||||
INSERT INTO has_key_encoding_errors (pkey, col) VALUES (0x00ff028f, 'whatever');
|
||||
|
||||
|
||||
CREATE TABLE empty_table (
|
||||
lonelykey float primary key,
|
||||
|
|
@ -127,21 +113,19 @@ INSERT INTO undefined_values_table (k, c) VALUES ('k2', 'c2');
|
|||
|
||||
|
||||
|
||||
CREATE TABLE ascii_with_invalid_and_special_chars (
|
||||
CREATE TABLE ascii_with_special_chars (
|
||||
k int PRIMARY KEY,
|
||||
val ascii
|
||||
);
|
||||
|
||||
-- "newline:\n"
|
||||
INSERT INTO ascii_with_invalid_and_special_chars (k, val) VALUES (0, blobAsAscii(0x6e65776c696e653a0a));
|
||||
INSERT INTO ascii_with_special_chars (k, val) VALUES (0, blobAsAscii(0x6e65776c696e653a0a));
|
||||
-- "return\rand null\0!"
|
||||
INSERT INTO ascii_with_invalid_and_special_chars (k, val) VALUES (1, blobAsAscii(0x72657475726e0d616e64206e756c6c0021));
|
||||
INSERT INTO ascii_with_special_chars (k, val) VALUES (1, blobAsAscii(0x72657475726e0d616e64206e756c6c0021));
|
||||
-- "\x00\x01\x02\x03\x04\x05control chars\x06\x07"
|
||||
INSERT INTO ascii_with_invalid_and_special_chars (k, val) VALUES (2, blobAsAscii(0x000102030405636f6e74726f6c2063686172730607));
|
||||
-- "\xfe\xffbyte order mark"
|
||||
INSERT INTO ascii_with_invalid_and_special_chars (k, val) VALUES (3, blobAsAscii(0xfeff62797465206f72646572206d61726b));
|
||||
INSERT INTO ascii_with_special_chars (k, val) VALUES (2, blobAsAscii(0x000102030405636f6e74726f6c2063686172730607));
|
||||
-- "fake special chars\\x00\\n"
|
||||
INSERT INTO ascii_with_invalid_and_special_chars (k, val) VALUES (4, blobAsAscii(0x66616b65207370656369616c2063686172735c7830305c6e));
|
||||
INSERT INTO ascii_with_special_chars (k, val) VALUES (3, blobAsAscii(0x66616b65207370656369616c2063686172735c7830305c6e));
|
||||
|
||||
|
||||
|
||||
|
|
@ -233,7 +217,7 @@ values ('vpupkin',
|
|||
{country: null, number: '03'}});
|
||||
|
||||
CREATE TYPE band_info_type (
|
||||
founded timestamp,
|
||||
founded varint,
|
||||
members set<text>,
|
||||
description text
|
||||
);
|
||||
|
|
|
|||
Loading…
Reference in New Issue