Commit9c5f67f

committed

Add support for NullIfExpr in eval_const_expressions

1 parent96bdb7e commit9c5f67fCopy full SHA for 9c5f67f

File tree

+66

-0

lines changed

+66

-0

lines changed

Lines changed: 30 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -2497,6 +2497,36 @@ eval_const_expressions_mutator(Node *node,`
`2497`	`2497`	`newexpr->location=expr->location;`
`2498`	`2498`	`return (Node*)newexpr;`
`2499`	`2499`	`}`
	`2500`	`+caseT_NullIfExpr:`
	`2501`	`+{`
	`2502`	`+NullIfExpr*expr;`
	`2503`	`+ListCell*arg;`
	`2504`	`+boolhas_nonconst_input= false;`
	`2505`	`+`
	`2506`	`+/* Copy the node and const-simplify its arguments */`
	`2507`	`+expr= (NullIfExpr*)ece_generic_processing(node);`
	`2508`	`+`
	`2509`	`+/* If either argument is NULL they can't be equal */`
	`2510`	`+foreach(arg,expr->args)`
	`2511`	`+{`
	`2512`	`+if (!IsA(lfirst(arg),Const))`
	`2513`	`+has_nonconst_input= true;`
	`2514`	`+elseif (((Const*)lfirst(arg))->constisnull)`
	`2515`	`+return (Node*)linitial(expr->args);`
	`2516`	`+}`
	`2517`	`+`
	`2518`	`+/*`
	`2519`	`+ * Need to get OID of underlying function before checking if`
	`2520`	`+ * the function is OK to evaluate.`
	`2521`	`+ */`
	`2522`	`+set_opfuncid((OpExpr*)expr);`
	`2523`	`+`
	`2524`	`+if (!has_nonconst_input&&`
	`2525`	`+ece_function_is_safe(expr->opfuncid,context))`
	`2526`	`+returnece_evaluate_expr(expr);`
	`2527`	`+`
	`2528`	`+return (Node*)expr;`
	`2529`	`+}`
`2500`	`2530`	`caseT_ScalarArrayOpExpr:`
`2501`	`2531`	`{`
`2502`	`2532`	`ScalarArrayOpExpr*saop;`

Lines changed: 25 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -263,6 +263,31 @@ SELECT *`
`263`	`263`	`4 \| \| 2 \| -4`
`264`	`264`	`(2 rows)`
`265`	`265`
	`266`	`+-- Tests for constant subexpression simplification`
	`267`	`+explain (costs off)`
	`268`	`+SELECT * FROM CASE_TBL WHERE NULLIF(1, 2) = 2;`
	`269`	`+ QUERY PLAN`
	`270`	`+--------------------------`
	`271`	`+ Result`
	`272`	`+ One-Time Filter: false`
	`273`	`+(2 rows)`
	`274`	`+`
	`275`	`+explain (costs off)`
	`276`	`+SELECT * FROM CASE_TBL WHERE NULLIF(1, 1) IS NOT NULL;`
	`277`	`+ QUERY PLAN`
	`278`	`+--------------------------`
	`279`	`+ Result`
	`280`	`+ One-Time Filter: false`
	`281`	`+(2 rows)`
	`282`	`+`
	`283`	`+explain (costs off)`
	`284`	`+SELECT * FROM CASE_TBL WHERE NULLIF(1, null) = 2;`
	`285`	`+ QUERY PLAN`
	`286`	`+--------------------------`
	`287`	`+ Result`
	`288`	`+ One-Time Filter: false`
	`289`	`+(2 rows)`
	`290`	`+`
`266`	`291`	`--`
`267`	`292`	`-- Examples of updates involving tables`
`268`	`293`	`--`

Lines changed: 11 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -137,6 +137,17 @@ SELECT *`
`137`	`137`	`FROM CASE_TBL a, CASE2_TBL b`
`138`	`138`	`WHERE COALESCE(f,b.i)=2;`
`139`	`139`
	`140`	`+-- Tests for constant subexpression simplification`
	`141`	`+`
	`142`	`+explain (costs off)`
	`143`	`+SELECT*FROM CASE_TBLWHERE NULLIF(1,2)=2;`
	`144`	`+`
	`145`	`+explain (costs off)`
	`146`	`+SELECT*FROM CASE_TBLWHERE NULLIF(1,1)IS NOT NULL;`
	`147`	`+`
	`148`	`+explain (costs off)`
	`149`	`+SELECT*FROM CASE_TBLWHERE NULLIF(1,null)=2;`
	`150`	`+`
`140`	`151`	`--`
`141`	`152`	`-- Examples of updates involving tables`
`142`	`153`	`--`

Comments

(0)