Commit459a060

committed

Use committed TPC-DS queries for now

1 parentbbc89f5 commit459a060Copy full SHA for 459a060

File tree

+14

-2

lines changed

+14

-2

lines changed

Lines changed: 2 additions & 0 deletions

Lines changed: 12 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -98,10 +98,19 @@ def pg_query_state(config, pid, verbose=False, costs=False, timing=False, \`
`98`	`98`
`99`	`99`	`conn=psycopg2.connect(**config)`
`100`	`100`	`curs=conn.cursor()`
	`101`	`+set_guc(conn,'statement_timeout',10000)`
	`102`	`+`
`101`	`103`	`result= []`
	`104`	`+n_retries=0`
`102`	`105`	`whilenotresult:`
`103`	`106`	`curs.callproc('pg_query_state', (pid,verbose,costs,timing,buffers,triggers,format))`
`104`	`107`	`result=curs.fetchall()`
	`108`	`+n_retries+=1`
	`109`	`+`
	`110`	`+ifn_retries==25:`
	`111`	`+print('pg_query_state tried 25 times with no effect')`
	`112`	`+break`
	`113`	`+`
`105`	`114`	`notices=conn.notices[:]`
`106`	`115`	`conn.close()`
`107`	`116`	`returnresult`
`@@ -544,7 +553,8 @@ def stress_test(config):`
`544`	`553`
`545`	`554`	`print('Preparing TPC-DS queries...')`
`546`	`555`	`# Execute query in separate thread`
`547`		`-withopen('tmp_stress/tpcds-kit/tools/query_0.sql','r')asf:`
	`556`	`+# with open('tmp_stress/tpcds-kit/tools/query_0.sql', 'r') as f:`
	`557`	`+withopen('tests/query_tpcds.sql','r')asf:`
`548`	`558`	`sql=f.read()`
`549`	`559`
`550`	`560`	`queries=sql.split(';')`
`@@ -557,7 +567,7 @@ def stress_test(config):`
`557`	`567`
`558`	`568`	`print('Starting test...')`
`559`	`569`	`timeout_list= []`
`560`		`-exclude_list= [2]`
	`570`	`+exclude_list= []`
`561`	`571`	`bar=progressbar.ProgressBar(max_value=len(queries))`
`562`	`572`	`fori,queryinenumerate(queries):`
`563`	`573`	`bar.update(i+1)`

Comments

(0)