NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit793beab

committed

Prevent generating EEOP_AGG_STRICT_INPUT_CHECK operations when nargs == 0.

This only became a problem with4c640f4, which didn't synchronizethe value agg_strict_input_check.nargs is set to, with the guardcondition for emitting the operation.Besides such instructions being unnecessary overhead, currently theLLVM JIT provider doesn't support them. It seems more sensible toavoid generating such instruction than supporting them. Add assertionsto make it easier to debug a potential further occurance.Discussion:https://postgr.es/m/2a505161-2727-2473-7c46-591ed108ac52@email.czBackpatch: 11-, like4c640f4.

1 parent4c640f4 commit793beabCopy full SHA for 793beab

File tree

2 files changed

-1

lines changed

src/backend
- executor
  - execExpr.c
- jit/llvm
  - llvmjit_expr.c

2 files changed

-1

lines changed

`‎src/backend/executor/execExpr.c`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -3023,7 +3023,7 @@ ExecBuildAggTrans(AggState *aggstate, AggStatePerPhase phase,`
`3023`	`3023`	`* just keep the prior transValue. This is true for both plain and`
`3024`	`3024`	`* sorted/distinct aggregates.`
`3025`	`3025`	`*/`
`3026`		`-if (trans_fcinfo->flinfo->fn_strict&&numInputs>0)`
	`3026`	`+if (trans_fcinfo->flinfo->fn_strict&&pertrans->numTransInputs>0)`
`3027`	`3027`	`{`
`3028`	`3028`	`scratch.opcode=EEOP_AGG_STRICT_INPUT_CHECK;`
`3029`	`3029`	`scratch.d.agg_strict_input_check.nulls=strictnulls;`

`‎src/backend/jit/llvm/llvmjit_expr.c`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -2124,6 +2124,8 @@ llvm_compile_expr(ExprState *state)`
`2124`	`2124`	`LLVMValueRefv_nullp;`
`2125`	`2125`	`LLVMBasicBlockRef*b_checknulls;`
`2126`	`2126`
	`2127`	`+Assert(nargs>0);`
	`2128`	`+`
`2127`	`2129`	`jumpnull=op->d.agg_strict_input_check.jumpnull;`
`2128`	`2130`	`v_nullp=l_ptr_const(nulls,l_ptr(TypeStorageBool));`
`2129`	`2131`

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!

Commit793beab

File tree

2 files changed

2 files changed

`‎src/backend/executor/execExpr.c`

`‎src/backend/jit/llvm/llvmjit_expr.c`

0 commit comments