NotificationsYou must be signed in to change notification settings
Fork28
Star153

Commitd5aa7a9

committed

Avoid unnecessary snapshot-acquisitions in BuildCachedPlan.

I had copied-and-pasted a claim that we couldn't reach this point whendealing with utility statements, but that was a leftover from when thecaller was required to supply a plan to start with. We now will gothrough here at least once when handling a utility statement, so itseems worth a check to see whether a snapshot is actually needed.(Note that analyze_requires_snapshot is quite a cheap test.)Per suggestion from Yamamoto Takashi. I don't think I believe that thisresolves his reported assertion failure; but it's worth changing anyway,just to save a cycle or two.

1 parent2594ad7 commitd5aa7a9Copy full SHA for d5aa7a9

File tree

1 file changed

-6

lines changed

src/backend/utils/cache
- plancache.c

1 file changed

-6

lines changed

`‎src/backend/utils/cache/plancache.c‎`

Lines changed: 5 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,7 @@`
`54`	`54`	`#include"nodes/nodeFuncs.h"`
`55`	`55`	`#include"optimizer/planmain.h"`
`56`	`56`	`#include"optimizer/prep.h"`
	`57`	`+#include"parser/analyze.h"`
`57`	`58`	`#include"parser/parsetree.h"`
`58`	`59`	`#include"storage/lmgr.h"`
`59`	`60`	`#include"tcop/pquery.h"`
`@@ -756,14 +757,12 @@ BuildCachedPlan(CachedPlanSource plansource, List qlist,`
`756`	`757`	`PushOverrideSearchPath(plansource->search_path);`
`757`	`758`
`758`	`759`	`/*`
`759`		`- * If a snapshot is already set (the normal case), we can just use`
`760`		`- * that for parsing/planning. But if it isn't, install one. Note: no`
`761`		`- * point in checking whether parse analysis requires a snapshot;`
`762`		`- * utility commands don't have invalidatable plans, so we'd not get`
`763`		`- * here for such a command.`
	`760`	`+ * If a snapshot is already set (the normal case), we can just use that`
	`761`	`+ * for planning. But if it isn't, and we need one, install one.`
`764`	`762`	`*/`
`765`	`763`	`snapshot_set= false;`
`766`		`-if (!ActiveSnapshotSet())`
	`764`	`+if (!ActiveSnapshotSet()&&`
	`765`	`+analyze_requires_snapshot(plansource->raw_parse_tree))`
`767`	`766`	`{`
`768`	`767`	`PushActiveSnapshot(GetTransactionSnapshot());`
`769`	`768`	`snapshot_set= true;`

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!

Commitd5aa7a9

File tree

1 file changed

1 file changed

`‎src/backend/utils/cache/plancache.c‎`

0 commit comments