Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

METRIQA-599 port parameter #264

Merged
merged 1 commit into from
Dec 16, 2016
+6 −7
Merged

METRIQA-599 port parameter #264

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 6 additions & 7 deletions dbms/tests/external_dictionaries/generate_and_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,6 @@
prefix = base_dir = os.path.dirname(os.path.realpath(__file__))
generated_prefix = prefix + '/generated/'

clickhouse_port = '9001'


# [ name, key_type, has_parent ]
dictionaries = [
Expand Down Expand Up @@ -155,14 +153,14 @@ def columns():
'String_ String,'
'Date_ Date, DateTime_ DateTime, Parent UInt64'
') engine=Log; insert into test.dictionary_source format TabSeparated'
'"'.format(source = args.source, ch = args.client, port = clickhouse_port))
'"'.format(source = args.source, ch = args.client, port = args.port))

# generate 3 files with different key types
print 'Creating .tsv files'
file_source_query = 'select %s from test.dictionary_source format TabSeparated;'
for file, keys in zip(files, key_columns):
query = file_source_query % comma_separated(chain(keys, columns(), [ 'Parent' ] if 1 == len(keys) else []))
call([ args.client, '--port', clickhouse_port, '--query', query ], 'generated/' + file)
call([ args.client, '--port', args.port, '--query', query ], 'generated/' + file)

# create MySQL table from complete_query
print 'Creating MySQL table'
Expand All @@ -184,7 +182,7 @@ def columns():
table_rows = json.loads(subprocess.check_output([
args.client,
'--port',
clickhouse_port,
args.port,
'--query',
"select * from test.dictionary_source where not ignore(" \
"concat('new Date(\\'', toString(Date_), '\\')') as Date_, " \
Expand Down Expand Up @@ -261,7 +259,7 @@ def generate_dictionaries(args):
<db>test</db>
<table>dictionary_source</table>
</clickhouse>
''' % clickhouse_port
''' % args.port

source_mysql = '''
<mysql>
Expand Down Expand Up @@ -398,7 +396,7 @@ def test_query(dict, query, reference, name):
stdout_file = os.path.join(args.reference, reference) + '.stdout'
stderr_file = os.path.join(args.reference, reference) + '.stderr'

command = '{ch} --port {port} --query "{query}" > {stdout_file} 2> {stderr_file}'.format(ch = args.client, port = clickhouse_port, query = query, stdout_file = stdout_file, stderr_file = stderr_file)
command = '{ch} --port {port} --query "{query}" > {stdout_file} 2> {stderr_file}'.format(ch = args.client, port = args.port, query = query, stdout_file = stdout_file, stderr_file = stderr_file)
proc = Popen(command, shell = True)
start_time = datetime.now()
while (datetime.now() - start_time).total_seconds() < args.timeout and proc.poll() is None:
Expand Down Expand Up @@ -538,6 +536,7 @@ def main(args):
parser.add_argument('-g', '--generated', default = 'generated', help = 'Path to directory with generated data')
parser.add_argument('-r', '--reference', default = 'reference', help = 'Path to directory with reference data')
parser.add_argument('-c', '--client', default = 'clickhouse-client', help = 'Client program')
parser.add_argument('-p', '--port', default = 9001, help = 'ClickHouse port')
parser.add_argument('-o', '--output', default = 'output', help = 'Output xUnit compliant test report directory')
parser.add_argument('-t', '--timeout', type = int, default = 10, help = 'Timeout for each test case in seconds')

Expand Down