Commit834dc64

committed

Several bugfixes here:

1. don't enable statement timeout in parallel worker and2. minor DSM cache fix.3. don't clear learn_cache in a parallel worker.

1 parented3e227 commit834dc64Copy full SHA for 834dc64

File tree

-5

lines changed

-5

lines changed

Lines changed: 1 addition & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -77,12 +77,10 @@ reset_dsm_cache(void)`
`77`	`77`
`78`	`78`	`Assert(LWLockHeldByMeInMode(&aqo_state->lock,LW_EXCLUSIVE));`
`79`	`79`
`80`		`-if (aqo_state->dsm_handler==DSM_HANDLE_INVALID)`
	`80`	`+if (aqo_state->dsm_handler==DSM_HANDLE_INVALID\|\| !seg)`
`81`	`81`	`/* Fast path. No any cached data exists. */`
`82`	`82`	`return;`
`83`	`83`
`84`		`-Assert(seg);`
`85`		`-`
`86`	`84`	`hdr= (dsm_seg_hdr*)dsm_segment_address(seg);`
`87`	`85`	`start= (char*)hdr+sizeof(dsm_seg_hdr);`
`88`	`86`

Lines changed: 8 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@`
`13`	`13`	`*/`
`14`	`14`
`15`	`15`	`#include"postgres.h"`
	`16`	`+#include"access/parallel.h"/* Just for IsParallelWorker() */`
`16`	`17`	`#include"miscadmin.h"`
`17`	`18`
`18`	`19`	`#include"aqo.h"`
`@@ -316,20 +317,25 @@ lc_assign_hook(bool newval, void *extra)`
`316`	`317`	`HASH_SEQ_STATUSstatus;`
`317`	`318`	`htab_entry*entry;`
`318`	`319`
`319`		`-if (!fss_htab\|\| !IsUnderPostmaster)`
	`320`	`+if (!fss_htab\|\| !IsUnderPostmaster\|\|IsParallelWorker())`
	`321`	`+/* Clean this shared cache only in main backend process. */`
`320`	`322`	`return;`
`321`	`323`
`322`	`324`	`/* Remove all entries, reset memory context. */`
`323`	`325`
`324`	`326`	`elog(DEBUG5,"[AQO] Cleanup local cache of ML data.");`
`325`	`327`
`326`		`-/* Remove allfrozen plans from a plancache. */`
	`328`	`+/* Remove allentries in the shared hash table. */`
`327`	`329`	`LWLockAcquire(&aqo_state->lock,LW_EXCLUSIVE);`
`328`	`330`	`hash_seq_init(&status,fss_htab);`
`329`	`331`	`while ((entry= (htab_entry*)hash_seq_search(&status))!=NULL)`
`330`	`332`	`{`
`331`	`333`	`if (!hash_search(fss_htab, (void*)&entry->key,HASH_REMOVE,NULL))`
`332`	`334`	`elog(PANIC,"[AQO] The local ML cache is corrupted.");`
`333`	`335`	`}`
	`336`	`+`
	`337`	`+/* Now, clean additional DSM block */`
	`338`	`+reset_dsm_cache();`
	`339`	`+`
`334`	`340`	`LWLockRelease(&aqo_state->lock);`
`335`	`341`	`}`

Comments

(0)