Commit e7c2cad

committed

Bugfix. Assertion on disabled query at the ExecutorEnd hook.

In an extravagant situation: (mode=disabled, forced stat gathering = 'on') we can get into a situation when AQO is disabled for a query, but previously cached plan contains some AQO preferences. Even so, we should ignore the query at the end of execution.

1 parent 6631e6c commit e7c2cadCopy full SHA for e7c2cad

File tree

1 file changed

-2

lines changed

postprocessing.c

1 file changed

-2

lines changed

`‎postprocessing.c‎`

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -757,7 +757,7 @@ aqo_ExecutorEnd(QueryDesc *queryDesc)`
`757`	`757`	`cardinality_sum_errors = 0.;`
`758`	`758`	`cardinality_num_objects = 0;`
`759`	`759`
`760`		`- if (!ExtractFromQueryEnv(queryDesc))`
	`760`	`+ if (IsQueryDisabled() \|\|!ExtractFromQueryEnv(queryDesc))`
`761`	`761`	`/* AQO keep all query-related preferences at the query context.`
`762`	`762`	`* It is needed to prevent from possible recursive changes, at`
`763`	`763`	`* preprocessing stage of subqueries.`
`@@ -768,7 +768,6 @@ aqo_ExecutorEnd(QueryDesc *queryDesc)`
`768`	`768`
`769`	`769`	`njoins = (enr != NULL) ? (int ) enr->reldata : -1;`
`770`	`770`
`771`		`- Assert(!IsQueryDisabled());`
`772`	`771`	`Assert(!IsParallelWorker());`
`773`	`772`
`774`	`773`	`if (query_context.explain_only)`

0 commit comments

Comments

(0)

Navigation Menu

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit e7c2cad

File tree

1 file changed

1 file changed

`‎postprocessing.c‎`

0 commit comments