Commit772062a

committed

Segregate setup and running of stress test

1 parentb2f8e82 commit772062aCopy full SHA for 772062a

File tree

+15

-19

lines changed

+15

-19

lines changed

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`#!/usr/bin/env bash`
`2`	`2`
`3`	`3`	`#`
`4`		`-# Copyright (c)2018, Postgres Professional`
	`4`	`+# Copyright (c)2019, Postgres Professional`
`5`	`5`	`#`
`6`	`6`	`# supported levels:`
`7`	`7`	`#* standard`
`@@ -55,7 +55,7 @@ fi`
`55`	`55`
`56`	`56`	`# build and install PostgreSQL`
`57`	`57`	`if ["$LEVEL"="hardcore" ]\|\| \`
`58`		`- ["$LEVEL"="nightmare" ];then`
	`58`	`+["$LEVEL"="nightmare" ];then`
`59`	`59`	`# enable Valgrind support`
`60`	`60`	`sed -i.bak"s/\/* #define USE_VALGRIND *\//#define USE_VALGRIND/g" src/include/pg_config_manual.h`
`61`	`61`
`@@ -148,7 +148,8 @@ pip install -r tests/requirements.txt`
`148`	`148`	`set -e#exit virtualenv with error code`
`149`	`149`	`python tests/pg_qs_test_runner.py --port$PGPORT`
`150`	`150`	`if [["$USE_TPCDS"=="1" ]];then`
`151`		`-python tests/pg_qs_test_runner.py --port$PGPORT --tpc-ds`
	`151`	`+python tests/pg_qs_test_runner.py --port$PGPORT --tpc-ds-setup`
	`152`	`+python tests/pg_qs_test_runner.py --port$PGPORT --tpc-ds-run`
`152`	`153`	`fi`
`153`	`154`	`deactivate`
`154`	`155`	`set -x`

Lines changed: 10 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -86,9 +86,15 @@ def main(config):`
`86`	`86`	`key:config.__dict__[key]forkeyin ('host','port','user','database','password')`
`87`	`87`	`}`
`88`	`88`
`89`		`-ifconfig.use_tpcds:`
	`89`	`+ifconfig.tpcds_setup:`
	`90`	`+print('Setup database for TPC-DS bench')`
	`91`	`+tpcds.setup_tpcds(conn_params)`
	`92`	`+print('Database is setup successfully')`
	`93`	`+return`
	`94`	`+`
	`95`	`+ifconfig.tpcds_run:`
`90`	`96`	`print('Starting stress test')`
`91`		`-tpcds.test_tpc_ds(conn_params)`
	`97`	`+tpcds.run_tpcds(conn_params)`
`92`	`98`	`print('Stress finished successfully')`
`93`	`99`	`return`
`94`	`100`
`@@ -115,7 +121,8 @@ def main(config):`
`115`	`121`	`parser.add_argument('--user',dest='user',default='postgres',help='user name')`
`116`	`122`	`parser.add_argument('--database',dest='database',default='postgres',help='database name')`
`117`	`123`	`parser.add_argument('--password',dest='password',nargs=0,action=PasswordPromptAction,default='',help='password')`
`118`		`-parser.add_argument('--tpc-ds',dest='use_tpcds',action='store_true',help='run only stress test based on TPC-DS benchmark')`
	`124`	`+parser.add_argument('--tpc-ds-setup',dest='tpcds_setup',action='store_true',help='setup database to run TPC-DS benchmark')`
	`125`	`+parser.add_argument('--tpc-ds-run',dest='tpcds_run',action='store_true',help='run only stress test based on TPC-DS benchmark')`
`119`	`126`
`120`	`127`	`args=parser.parse_args()`
`121`	`128`	`main(args)`

Lines changed: 1 addition & 13 deletions

Original file line number	Diff line number	Diff line change
`@@ -48,22 +48,10 @@ def setup_tpcds(config):`
`48`	`48`
`49`	`49`	`print('done!')`
`50`	`50`
`51`		`-deftest_tpc_ds(config):`
	`51`	`+defrun_tpcds(config):`
`52`	`52`	`"""TPC-DS stress test"""`
`53`	`53`
`54`		`-setup_tpcds(config)`
`55`		`-`
`56`	`54`	`print('Preparing TPC-DS queries...')`
`57`		`-# # Execute query in separate thread`
`58`		`-# # with open('tmp_stress/tpcds-kit/tools/query_0.sql', 'r') as f:`
`59`		`-# with open('tests/query_tpcds.sql', 'r') as f:`
`60`		`-# sql = f.read()`
`61`		`-`
`62`		`-# queries = sql.split(';')`
`63`		`-# for i, query in enumerate(queries):`
`64`		`-# queries[i] = query.replace('%','%%')`
`65`		`-# if (len(query.strip()) == 0):`
`66`		`-# del queries[i]`
`67`	`55`	`queries= []`
`68`	`56`	`forquery_fileinsorted(os.listdir('tmp_stress/tpcds-result-reproduction/query_qualification/')):`
`69`	`57`	`withopen('tmp_stress/tpcds-result-reproduction/query_qualification/%s'%query_file,'r')asf:`

Comments

(0)