Commit5437c07

committed

Bugfix. Switch off quickly all AQO features if queryId is disabled.

One installcheck test was added into the github actions workflow.Reviewed by:@Anisimov-ds

1 parentd91095f commit5437c07Copy full SHA for 5437c07

File tree

+14

-2

lines changed

+14

-2

lines changed

Lines changed: 13 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -132,12 +132,24 @@ jobs:`
`132`	`132`	`psql -c "ALTER SYSTEM SET aqo.mode = 'learn'"`
`133`	`133`	`psql -c "ALTER SYSTEM SET aqo.force_collect_stat = 'on'"`
`134`	`134`	`psql -c "SELECT pg_reload_conf()"`
`135`		`- learn_result=$(make -k installcheck-world)`
	`135`	`+ make -k installcheck-world`
	`136`	`+`
	`137`	`+# Should work like a total off for all the AQO features`
	`138`	`+ -name:installcheck_learn_queryid_off`
	`139`	`+continue-on-error:true`
	`140`	`+run:\|`
	`141`	`+ cd $PG_DIR`
	`142`	`+ aqo_instance_launch.sh`
	`143`	`+ psql -c "ALTER SYSTEM SET compute_query_id = 'off'"`
	`144`	`+ psql -c "SELECT pg_reload_conf()"`
	`145`	`+ # The AQO tests itself wouldn't pass`
	`146`	`+ make -k installcheck-world`
`136`	`147`
`137`	`148`	`-name:installcheck_intelligent`
`138`	`149`	`continue-on-error:true`
`139`	`150`	`run:\|`
`140`	`151`	`cd $PG_DIR`
	`152`	`+ psql -c "ALTER SYSTEM SET compute_query_id = 'regress'"`
`141`	`153`	`psql -c "ALTER SYSTEM SET aqo.mode = 'intelligent'"`
`142`	`154`	`psql -c "ALTER SYSTEM SET aqo.force_collect_stat = 'on'"`
`143`	`155`	`psql -c "SELECT pg_reload_conf()"`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ static bool isQueryUsingSystemRelation_walker(Node node, void context);`
`83`	`83`	`staticbool`
`84`	`84`	`aqoIsEnabled(Query*parse)`
`85`	`85`	`{`
`86`		`-if (creating_extension\|\|`
	`86`	`+if (creating_extension\|\| !IsQueryIdEnabled()\|\|`
`87`	`87`	`(aqo_mode==AQO_MODE_DISABLED&& !force_collect_stat)\|\|`
`88`	`88`	`(parse->commandType!=CMD_SELECT&&parse->commandType!=CMD_INSERT&&`
`89`	`89`	`parse->commandType!=CMD_UPDATE&&parse->commandType!=CMD_DELETE))`

Comments

(0)