8000 Some formatting and new queries · postgrespro/pg_query_state@8c1a8d7 · GitHub
[go: up one dir, main page]
Skip to content

Commit 8c1a8d7

Browse files
ololobusololobus
committed
Some formatting and new queries
1 parent 5bc7769 commit 8c1a8d7

File tree

3 files changed

+34
-29
lines changed

3 files changed

+34
-29
lines changed

‎tests/pg_qs_test_runner.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ def main(config):
9999

100100
if os.environ['LEVEL'] == 'stress':
101101
print('Starting stress test')
102-
stress_test(config)
102+
test_tpc_ds(config)
103103
print('Stress finished successfully')
104104

105105
teardown(con)

‎tests/prepare_stress.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ cd tmp_stress
55
rm -rf ./*
66

77
git clone --depth 1 --single-branch --branch master https://github.com/gregrahn/tpcds-kit.git
8+
git clone --depth 1 --single-branch --branch master https://github.com/cwida/tpcds-result-reproduction.git
89
cd tpcds-kit/tools
910
make -s
1011

@@ -14,7 +15,7 @@ make -s
1415
#Prepare data
1516
mkdir -p tables
1617
for i in `ls *.dat`; do
17-
echo "Preparing file " $i
18+
echo "Preparing file" $i
1819
sed 's/|$//' $i > tables/$i
1920
done
2021

‎tests/test_cases.py

Lines changed: 31 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -60,35 +60,35 @@ def n_close(conns):
6060
def debug_output(qs, qs_len, pid, query, expected):
6161
something_happened = False
6262
if (qs_len and len(qs) != qs_len ):
63-
print( "len(qs): ", len(qs), ", expected: ", qs_len)
63+
print("len(qs): ", len(qs), ", expected: ", qs_len)
6464
something_happened = True
6565
if (pid and qs[0][0] != pid):
66-
print( "qs[0][0]: ", qs[0][0], " = ", pid)
66+
print("qs[0][0]: ", qs[0][0], " = ", pid)
6767
something_happened = True
6868
if (qs[0][1] != 0):
69-
print( "qs[0][1]: ", qs[0][1], ", expected: 0")
69+
print("qs[0][1]: ", qs[0][1], ", expected: 0")
7070
something_happened = True
7171
if (qs[0][2] != query):
72-
print( "qs[0][2]:\n", qs[0][2])
73-
print( "Expected:\n", query)
72+
print("qs[0][2]:\n", qs[0][2])
73+
print("Expected:\n", query)
7474
something_happened = True
7575
if (not (re.match(expected, qs[0][3]))):
76-
print( "qs[0][3]:\n", qs[0][3])
77-
print( "Expected:\n", expected)
76+
print("qs[0][3]:\n", qs[0][3])
77+
print("Expected:\n", expected)
7878
something_happened = True
7979
if (qs[0][4] != None):
80-
print( "qs[0][4]: ", qs[0][4], "Expected: None")
80+
print("qs[0][4]: ", qs[0][4], "Expected: None")
8181
something_happened = True
8282
if (qs_len and len(qs) > qs_len):
8383
for i in range(qs_len, len(qs)):
84-
print( "qs[",i,"][0]: ", qs[i][0])
85-
print( "qs[",i,"][1]: ", qs[i][1])
86-
print( "qs[",i,"][2]: ", qs[i][2])
87-
print( "qs[",i,"][3]: ", qs[i][3])
88-
print( "qs[",i,"][4]: ", qs[i][4])
84+
print("qs[",i,"][0]: ", qs[i][0])
85+
print("qs[",i,"][1]: ", qs[i][1])
86+
print("qs[",i,"][2]: ", qs[i][2])
87+
print("qs[",i,"][3]: ", qs[i][3])
88+
print("qs[",i,"][4]: ", qs[i][4])
8989
something_happened = True
9090
if (something_happened):
91-
print( "If test have not crashed, then it's OK")
91+
print("If test have not crashed, then it's OK")
9292

9393
def notices_warning():
9494
if (len(notices) > 0):
@@ -546,7 +546,7 @@ def load_tpcds_data(config):
546546
table_name = os.path.splitext(os.path.basename(table_datafile))[0]
547547
copy_cmd = "COPY %s FROM '/pg/testdir/tmp_stress/tpcds-kit/tools/tables/%s' CSV DELIMITER '|'" % (table_name, table_datafile)
548548

549-
print("Loading table", table_name)
549+
print('Loading table', table_name)
550550
# cur.execute("TRUNCATE %s" % table_name)
551551
cur.execute(copy_cmd)
552552

@@ -559,24 +559,28 @@ def load_tpcds_data(config):
559559

560560
print('done!')
561561

562-
def stress_test(config):
562+
def test_tpc_ds(config):
563563
"""TPC-DS stress test"""
564564
global stress_in_progress
565 6D40 565

566566
stress_in_progress = True
567567
load_tpcds_data(config)
568568

569569
print('Preparing TPC-DS queries...')
570-
# Execute query in separate thread
571-
# with open('tmp_stress/tpcds-kit/tools/query_0.sql', 'r') as f:
572-
with open('tests/query_tpcds.sql', 'r') as f:
573-
sql = f.read()
574-
575-
queries = sql.split(';')
576-
for i, query in enumerate(queries):
577-
queries[i] = query.replace('%','%%')
578-
if (len(query.strip()) == 0):
579-
del queries[i]
570+
# # Execute query in separate thread
571+
# # with open('tmp_stress/tpcds-kit/tools/query_0.sql', 'r') as f:
572+
# with open('tests/query_tpcds.sql', 'r') as f:
573+
# sql = f.read()
574+
575+
# queries = sql.split(';')
576+
# for i, query in enumerate(queries):
577+
# queries[i] = query.replace('%','%%')
578+
# if (len(query.strip()) == 0):
579+
# del queries[i]
580+
queries = []
581+
for query_file in sorted(os.listdir('tmp_stress/tpcds-result-reproduction/query_qualification/')):
582+
with open('tmp_stress/tpcds-result-reproduction/query_qualification/%s' % query_file, 'r') as f:
583+
queries.append(f.read())
580584

581585
acon, = n_async_connect(config)
582586

@@ -598,6 +602,6 @@ def stress_test(config):
598602
n_close((acon,))
599603

600604
if len(timeout_list) > 0:
601-
print('There were pg_query_state timeouts (%s s) on queries:' % TPC_DS_STATEMENT_TIMEOUT, timeout_list)
605+
print('\nThere were pg_query_state timeouts (%s s) on queries:' % TPC_DS_STATEMENT_TIMEOUT, timeout_list)
602606

603607
stress_in_progress = False

0 commit comments

Comments
 (0)
0