Commit29512d9

danolivo

authored and

Alena0704

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 parentfcfff8f commit29512d9Copy full SHA for 29512d9

File tree

3 files changed

+24

-7

lines changed

3 files changed

+24

-7

lines changed

`‎aqo_shared.c`

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`

`‎learn_cache.c`

Lines changed: 16 additions & 4 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"`
`@@ -227,7 +228,7 @@ init_with_dsm(OkNNrdata data, dsm_block_hdr hdr, List **reloids)`
`227`	`228`	`Assert(LWLockHeldByMeInMode(&aqo_state->lock,LW_EXCLUSIVE)\|\|`
`228`	`229`	`LWLockHeldByMeInMode(&aqo_state->lock,LW_SHARED));`
`229`	`230`	`Assert(hdr->magic==AQO_SHARED_MAGIC);`
`230`		`-Assert(hdr&&ptr);`
	`231`	`+Assert(hdr&&ptr&&hdr->rows>0);`
`231`	`232`
`232`	`233`	`data->rows=hdr->rows;`
`233`	`234`	`data->cols=hdr->cols;`
`@@ -245,6 +246,12 @@ init_with_dsm(OkNNrdata data, dsm_block_hdr hdr, List **reloids)`
`245`	`246`	`}`
`246`	`247`	`}`
`247`	`248`
	`249`	`+/*`
	`250`	`+ * Kludge code. But we should rewrite this code because now all knowledge`
	`251`	`+ * base lives in non-transactional shared memory.`
	`252`	`+ */`
	`253`	`+ptr= (char)hdr+sizeof(dsm_block_hdr)+ (sizeof(double)data->cols*aqo_K);`
	`254`	`+`
`248`	`255`	`memcpy(data->targets,ptr,sizeof(double)*hdr->rows);`
`249`	`256`	`ptr+=sizeof(double)*aqo_K;`
`250`	`257`	`memcpy(data->rfactors,ptr,sizeof(double)*hdr->rows);`
`@@ -261,7 +268,7 @@ init_with_dsm(OkNNrdata data, dsm_block_hdr hdr, List **reloids)`
`261`	`268`	`returncalculate_size(hdr->cols,*reloids);`
`262`	`269`	`}`
`263`	`270`
`264`		`-/* It is just read operation. No any interest in size calculation. */`
	`271`	`+/* It is justaread operation. No any interest in size calculation. */`
`265`	`272`	`return0;`
`266`	`273`	`}`
`267`	`274`
`@@ -310,20 +317,25 @@ lc_assign_hook(bool newval, void *extra)`
`310`	`317`	`HASH_SEQ_STATUSstatus;`
`311`	`318`	`htab_entry*entry;`
`312`	`319`
`313`		`-if (!fss_htab\|\| !IsUnderPostmaster)`
	`320`	`+if (!fss_htab\|\| !IsUnderPostmaster\|\|IsParallelWorker())`
	`321`	`+/* Clean this shared cache only in main backend process. */`
`314`	`322`	`return;`
`315`	`323`
`316`	`324`	`/* Remove all entries, reset memory context. */`
`317`	`325`
`318`	`326`	`elog(DEBUG5,"[AQO] Cleanup local cache of ML data.");`
`319`	`327`
`320`		`-/* Remove allfrozen plans from a plancache. */`
	`328`	`+/* Remove allentries in the shared hash table. */`
`321`	`329`	`LWLockAcquire(&aqo_state->lock,LW_EXCLUSIVE);`
`322`	`330`	`hash_seq_init(&status,fss_htab);`
`323`	`331`	`while ((entry= (htab_entry*)hash_seq_search(&status))!=NULL)`
`324`	`332`	`{`
`325`	`333`	`if (!hash_search(fss_htab, (void*)&entry->key,HASH_REMOVE,NULL))`
`326`	`334`	`elog(PANIC,"[AQO] The local ML cache is corrupted.");`
`327`	`335`	`}`
	`336`	`+`
	`337`	`+/* Now, clean additional DSM block */`
	`338`	`+reset_dsm_cache();`
	`339`	`+`
`328`	`340`	`LWLockRelease(&aqo_state->lock);`
`329`	`341`	`}`

`‎postprocessing.c`

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -640,6 +640,13 @@ set_timeout_if_need(QueryDesc *queryDesc)`
`640`	`640`	`{`
`641`	`641`	`TimestampTzfin_time;`
`642`	`642`
	`643`	`+if (IsParallelWorker())`
	`644`	`+/*`
	`645`	`+ * AQO timeout should stop only main worker. Other workers would be`
	`646`	`+* terminated by a regular ERROR machinery.`
	`647`	`+*/`
	`648`	`+return false;`
	`649`	`+`
`643`	`650`	`if (!get_timeout_active(STATEMENT_TIMEOUT)\|\| !aqo_learn_statement_timeout)`
`644`	`651`	`return false;`
`645`	`652`

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!

Commit29512d9

File tree

3 files changed

3 files changed

`‎aqo_shared.c`

`‎learn_cache.c`

`‎postprocessing.c`

0 commit comments