thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-24 08:32:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #27637 from Algunenano/antlr_tests

Browse Source 
Remove the remains of ANTLR in the tests
This commit is contained in:
alexey-milovidov 2021-08-15 09:02:27 +03:00 committed by GitHub
commit 8a843ae15f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tests/queries/conftest.py
View File

@ -11,7 +11,6 @@ from .server import ServerThread
def pytest_addoption(parser):
parser.addoption("--builddir", action="store", default=None, help="Path to build directory to use binaries from")
parser.addoption("--antlr", action="store_true", default=False, help="Use ANTLR parser")
# HTML report hooks
@ -32,8 +31,7 @@ def pytest_itemcollected(item):
@pytest.fixture(scope='module')
def cmdopts(request):
return {
'builddir': request.config.getoption("--builddir"),
'antlr': request.config.getoption("--antlr"),
'builddir': request.config.getoption("--builddir")
}
@ -48,11 +46,6 @@ def bin_prefix(cmdopts):
return prefix
@pytest.fixture(scope='module')
def use_antlr(cmdopts):
return cmdopts['antlr']
# TODO: also support stateful queries.
QUERIES_PATH = os.path.join(os.path.dirname(os.path.abspath(__file__)), '0_stateless')

32
tests/queries/query_test.py
View File

@ -156,11 +156,9 @@ def check_result(result, error, return_code, reference, replace_map):
pytrace=False)
def run_client(use_antlr, bin_prefix, port, database, query, reference, replace_map=None):
def run_client(bin_prefix, port, database, query, reference, replace_map=None):
# We can't use `text=True` since some tests may return binary data
cmd = [bin_prefix + '-client', '--port', str(port), '-d', database, '-m', '-n', '--testmode']
if use_antlr:
cmd.append('--use_antlr_parser=1')
client = subprocess.Popen(cmd, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
result, error = client.communicate(query.encode('utf-8'))
assert client.returncode is not None, "Client should exit after processing all queries"
@ -168,7 +166,7 @@ def run_client(use_antlr, bin_prefix, port, database, query, reference, replace_
check_result(result, error, client.returncode, reference, replace_map)
def run_shell(use_antlr, bin_prefix, server, database, path, reference, replace_map=None):
def run_shell(bin_prefix, server, database, path, reference, replace_map=None):
env = {
'CLICKHOUSE_BINARY': bin_prefix,
'CLICKHOUSE_DATABASE': database,
@ -182,8 +180,6 @@ def run_shell(use_antlr, bin_prefix, server, database, path, reference, replace_
'CLICKHOUSE_CONFIG_CLIENT': server.client_config,
'PROTOC_BINARY': os.path.abspath(os.path.join(os.path.dirname(bin_prefix), '..', 'contrib', 'protobuf', 'protoc')), # FIXME: adhoc solution
}
if use_antlr:
env['CLICKHOUSE_CLIENT_OPT'] = '--use_antlr_parser=1'
shell = subprocess.Popen([path], env=env, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
result, error = shell.communicate()
assert shell.returncode is not None, "Script should exit after executing all commands"
@ -197,7 +193,7 @@ def random_str(length=10):
return ''.join(random.choice(alphabet) for _ in range(length))
def test_sql_query(use_antlr, bin_prefix, sql_query, standalone_server):
def test_sql_query(bin_prefix, sql_query, standalone_server):
for test in SKIP_LIST:
if test in sql_query:
pytest.skip("Test matches skip-list: " + test)
@ -217,21 +213,21 @@ def test_sql_query(use_antlr, bin_prefix, sql_query, standalone_server):
reference = file.read()
random_name = 'test_{random}'.format(random=random_str())
run_client(use_antlr, bin_prefix, tcp_port, 'default', 'CREATE DATABASE {random};'.format(random=random_name), b'')
run_client(bin_prefix, tcp_port, 'default', 'CREATE DATABASE {random};'.format(random=random_name), b'')
run_client(use_antlr, bin_prefix, tcp_port, random_name, query, reference, {random_name: 'default'})
run_client(bin_prefix, tcp_port, random_name, query, reference, {random_name: 'default'})
query = "SELECT 'SHOW ORPHANED TABLES'; SELECT name FROM system.tables WHERE database != 'system' ORDER BY (database, name);"
run_client(use_antlr, bin_prefix, tcp_port, 'default', query, b'SHOW ORPHANED TABLES\n')
run_client(bin_prefix, tcp_port, 'default', query, b'SHOW ORPHANED TABLES\n')
query = 'DROP DATABASE {random};'.format(random=random_name)
run_client(use_antlr, bin_prefix, tcp_port, 'default', query, b'')
run_client(bin_prefix, tcp_port, 'default', query, b'')
query = "SELECT 'SHOW ORPHANED DATABASES'; SHOW DATABASES;"
run_client(use_antlr, bin_prefix, tcp_port, 'default', query, b'SHOW ORPHANED DATABASES\ndefault\nsystem\n')
run_client(bin_prefix, tcp_port, 'default', query, b'SHOW ORPHANED DATABASES\ndefault\nsystem\n')
def test_shell_query(use_antlr, bin_prefix, shell_query, standalone_server):
def test_shell_query(bin_prefix, shell_query, standalone_server):
for test in SKIP_LIST:
if test in shell_query:
pytest.skip("Test matches skip-list: " + test)
@ -250,15 +246,15 @@ def test_shell_query(use_antlr, bin_prefix, shell_query, standalone_server):
random_name = 'test_{random}'.format(random=random_str())
query = 'CREATE DATABASE {random};'.format(random=random_name)
run_client(use_antlr, bin_prefix, tcp_port, 'default', query, b'')
run_client(bin_prefix, tcp_port, 'default', query, b'')
run_shell(use_antlr, bin_prefix, standalone_server, random_name, shell_path, reference, {random_name: 'default'})
run_shell(bin_prefix, standalone_server, random_name, shell_path, reference, {random_name: 'default'})
query = "SELECT 'SHOW ORPHANED TABLES'; SELECT name FROM system.tables WHERE database != 'system' ORDER BY (database, name);"
run_client(use_antlr, bin_prefix, tcp_port, 'default', query, b'SHOW ORPHANED TABLES\n')
run_client(bin_prefix, tcp_port, 'default', query, b'SHOW ORPHANED TABLES\n')
query = 'DROP DATABASE {random};'.format(random=random_name)
run_client(use_antlr, bin_prefix, tcp_port, 'default', query, b'')
run_client(bin_prefix, tcp_port, 'default', query, b'')
query = "SELECT 'SHOW ORPHANED DATABASES'; SHOW DATABASES;"
run_client(use_antlr, bin_prefix, tcp_port, 'default', query, b'SHOW ORPHANED DATABASES\ndefault\nsystem\n')
run_client(bin_prefix, tcp_port, 'default', query, b'SHOW ORPHANED DATABASES\ndefault\nsystem\n')