NotificationsYou must be signed in to change notification settings
Fork54
Star463

Commitf85ccdf

committed

Improvement. Clean a list of deactivated queries during the call of

the aqo_reset() routine: we want to clean all the AQO internal state on reset.

1 parentdb8179b commitf85ccdfCopy full SHA for f85ccdf

File tree

1 file changed

+21

-4

lines changed

storage.c

1 file changed

+21

-4

lines changed

`‎storage.c`

Lines changed: 21 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -195,7 +195,7 @@ init_deactivated_queries_storage(void)`
`195`	`195`	`MemSet(&hash_ctl,0,sizeof(hash_ctl));`
`196`	`196`	`hash_ctl.keysize=sizeof(uint64);`
`197`	`197`	`hash_ctl.entrysize=sizeof(uint64);`
`198`		`-deactivated_queries=hash_create("aqo_deactivated_queries",`
	`198`	`+deactivated_queries=hash_create("AQO deactivated queries",`
`199`	`199`	`128,/* start small and extend */`
`200`	`200`	`&hash_ctl,`
`201`	`201`	`HASH_ELEM \|HASH_BLOBS);`
`@@ -207,15 +207,29 @@ query_is_deactivated(uint64 queryid)`
`207`	`207`	`{`
`208`	`208`	`boolfound;`
`209`	`209`
`210`		`-hash_search(deactivated_queries,&queryid,HASH_FIND,&found);`
	`210`	`+(void)hash_search(deactivated_queries,&queryid,HASH_FIND,&found);`
`211`	`211`	`returnfound;`
`212`	`212`	`}`
`213`	`213`
`214`	`214`	`/* Adds given query hash into the set of hashes of deactivated queries */`
`215`	`215`	`void`
`216`	`216`	`add_deactivated_query(uint64queryid)`
`217`	`217`	`{`
`218`		`-hash_search(deactivated_queries,&queryid,HASH_ENTER,NULL);`
	`218`	`+(void)hash_search(deactivated_queries,&queryid,HASH_ENTER,NULL);`
	`219`	`+}`
	`220`	`+`
	`221`	`+staticvoid`
	`222`	`+reset_deactivated_queries(void)`
	`223`	`+{`
	`224`	`+HASH_SEQ_STATUShash_seq;`
	`225`	`+uint64*queryid;`
	`226`	`+`
	`227`	`+hash_seq_init(&hash_seq,deactivated_queries);`
	`228`	`+while ((queryid=hash_seq_search(&hash_seq))!=NULL)`
	`229`	`+{`
	`230`	`+if (!hash_search(deactivated_queries,queryid,HASH_REMOVE,NULL))`
	`231`	`+elog(PANIC,"[AQO] hash table corrupted");`
	`232`	`+}`
`219`	`233`	`}`
`220`	`234`
`221`	`235`	`/*`
`@@ -2177,7 +2191,6 @@ aqo_queries_update(PG_FUNCTION_ARGS)`
`2177`	`2191`	`{PG_ARGISNULL(AQ_FS),PG_ARGISNULL(AQ_LEARN_AQO),`
`2178`	`2192`	`PG_ARGISNULL(AQ_USE_AQO),PG_ARGISNULL(AQ_AUTO_TUNING) };`
`2179`	`2193`
`2180`		`-`
`2181`	`2194`	`if (PG_ARGISNULL(AQ_QUERYID))`
`2182`	`2195`	`PG_RETURN_BOOL(false);`
`2183`	`2196`
`@@ -2209,6 +2222,10 @@ aqo_reset(PG_FUNCTION_ARGS)`
`2209`	`2222`	`counter+=aqo_qtexts_reset();`
`2210`	`2223`	`counter+=aqo_data_reset();`
`2211`	`2224`	`counter+=aqo_queries_reset();`
	`2225`	`+`
	`2226`	`+/* Cleanup cache of deactivated queries */`
	`2227`	`+reset_deactivated_queries();`
	`2228`	`+`
`2212`	`2229`	`PG_RETURN_INT64(counter);`
`2213`	`2230`	`}`
`2214`	`2231`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitf85ccdf

File tree

1 file changed

1 file changed

`‎storage.c`

0 commit comments