simplify handle_opexpr()

funbringer · funbringer · commit 3d225b78de24 · 2017-05-22T18:40:08.000+03:00
diff --git a/src/pg_pathman.c b/src/pg_pathman.c
@@ -1140,6 +1140,9 @@ handle_opexpr(const OpExpr *expr,
 	Node					   *param;
 	const PartRelationInfo	   *prel = context->prel;
 
+	/* Save expression */
+	result->orig = (const Node *) expr;
+
 	if (list_length(expr->args) == 2)
 	{
 		/* Is it KEY OP PARAM or PARAM OP KEY? */
@@ -1157,9 +1160,6 @@ handle_opexpr(const OpExpr *expr,
 							 expr->inputcollid,
 							 strategy, context, result);
 
-				/* Save expression */
-				result->orig = (const Node *) expr;
-
 				return; /* done, exit */
 			}
 			/* TODO: estimate selectivity for param if it's Var */
@@ -1168,19 +1168,13 @@ handle_opexpr(const OpExpr *expr,
 				result->rangeset = list_make1_irange_full(prel, IR_LOSSY);
 				result->paramsel = estimate_paramsel_using_prel(prel, strategy);
 
-				/* Save expression */
-				result->orig = (const Node *) expr;
-
 				return; /* done, exit */
 			}
 		}
 	}
 
 	result->rangeset = list_make1_irange_full(prel, IR_LOSSY);
-	result->paramsel = 1.0; /* can't give any estimates */
-
-	/* Save expression */
-	result->orig = (const Node *) expr;
+	result->paramsel = 1.0;
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -1140,6 +1140,9 @@ handle_opexpr(const OpExpr *expr,`
`1140`	`1140`	`Node *param;`
`1141`	`1141`	`const PartRelationInfo *prel = context->prel;`
`1142`	`1142`
	`1143`	`+ /* Save expression */`
	`1144`	`+ result->orig = (const Node *) expr;`
	`1145`	`+`
`1143`	`1146`	`if (list_length(expr->args) == 2)`
`1144`	`1147`	`{`
`1145`	`1148`	`/* Is it KEY OP PARAM or PARAM OP KEY? */`
`@@ -1157,9 +1160,6 @@ handle_opexpr(const OpExpr *expr,`
`1157`	`1160`	`expr->inputcollid,`
`1158`	`1161`	`strategy, context, result);`
`1159`	`1162`
`1160`		`- /* Save expression */`
`1161`		`- result->orig = (const Node *) expr;`
`1162`		`-`
`1163`	`1163`	`return; /* done, exit */`
`1164`	`1164`	`}`
`1165`	`1165`	`/* TODO: estimate selectivity for param if it's Var */`
`@@ -1168,19 +1168,13 @@ handle_opexpr(const OpExpr *expr,`
`1168`	`1168`	`result->rangeset = list_make1_irange_full(prel, IR_LOSSY);`
`1169`	`1169`	`result->paramsel = estimate_paramsel_using_prel(prel, strategy);`
`1170`	`1170`
`1171`		`- /* Save expression */`
`1172`		`- result->orig = (const Node *) expr;`
`1173`		`-`
`1174`	`1171`	`return; /* done, exit */`
`1175`	`1172`	`}`
`1176`	`1173`	`}`
`1177`	`1174`	`}`
`1178`	`1175`
`1179`	`1176`	`result->rangeset = list_make1_irange_full(prel, IR_LOSSY);`
`1180`		`- result->paramsel = 1.0; /* can't give any estimates */`
`1181`		`-`
`1182`		`- /* Save expression */`
`1183`		`- result->orig = (const Node *) expr;`
	`1177`	`+ result->paramsel = 1.0;`
`1184`	`1178`	`}`
`1185`	`1179`
`1186`	`1180`