NotificationsYou must be signed in to change notification settings
Fork5
Star26

Commit060b22a

committed

Fix subtly-wrong volatility checking in BeginCopyFrom().

contain_volatile_functions() is best applied to the output ofexpression_planner(), not its input, so that insertion of functiondefault arguments and constant-folding have been done. (See commentsat CheckMutability, for instance.) It's perhaps unlikely that anyonewill notice a difference in practice, but still we should do it properly.In passing, change variable type from Node* to Expr* to reduce the netnumber of casts needed.Noted while perusing uses of contain_volatile_functions().

1 parent20803d7 commit060b22aCopy full SHA for 060b22a

File tree

1 file changed

-5

lines changed

src/backend/commands
- copy.c

1 file changed

-5

lines changed

`‎src/backend/commands/copy.c`

Lines changed: 9 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -2506,18 +2506,22 @@ BeginCopyFrom(Relation rel,`
`2506`	`2506`	`{`
`2507`	`2507`	`/* attribute is NOT to be copied from input */`
`2508`	`2508`	`/* use default value if one exists */`
`2509`		`-Node*defexpr=build_column_default(cstate->rel,attnum);`
	`2509`	`+Exprdefexpr= (Expr)build_column_default(cstate->rel,`
	`2510`	`+attnum);`
`2510`	`2511`
`2511`	`2512`	`if (defexpr!=NULL)`
`2512`	`2513`	`{`
`2513`		`-/* Initialize expressions in copycontext. */`
`2514`		`-defexprs[num_defaults]=ExecInitExpr(`
`2515`		`-expression_planner((Expr*)defexpr),NULL);`
	`2514`	`+/* Run the expression through planner */`
	`2515`	`+defexpr=expression_planner(defexpr);`
	`2516`	`+`
	`2517`	`+/* Initialize executable expression in copycontext */`
	`2518`	`+defexprs[num_defaults]=ExecInitExpr(defexpr,NULL);`
`2516`	`2519`	`defmap[num_defaults]=attnum-1;`
`2517`	`2520`	`num_defaults++;`
`2518`	`2521`
	`2522`	`+/* Check to see if we have any volatile expressions */`
`2519`	`2523`	`if (!volatile_defexprs)`
`2520`		`-volatile_defexprs=contain_volatile_functions(defexpr);`
	`2524`	`+volatile_defexprs=contain_volatile_functions((Node*)defexpr);`
`2521`	`2525`	`}`
`2522`	`2526`	`}`
`2523`	`2527`	`}`

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!

Commit060b22a

File tree

1 file changed

1 file changed

`‎src/backend/commands/copy.c`

0 commit comments