Prefer actual constants to pseudo-constants in equivalence class machinery.

tglsfdc · tglsfdc · commit 17804fa71b4a · 2012-10-26T14:19:34.000-04:00
generate_base_implied_equalities_const() should prefer plain Consts over
other em_is_const eclass members when choosing the "pivot" value that
all the other members will be equated to.  This makes it more likely that
the generated equalities will be useful in constraint-exclusion proofs.
Per report from Rushabh Lathia.
diff --git a/src/backend/optimizer/path/equivclass.c b/src/backend/optimizer/path/equivclass.c
@@ -769,15 +769,21 @@ generate_base_implied_equalities_const(PlannerInfo *root,
 		}
 	}
 
-	/* Find the constant member to use */
+	/*
+	 * Find the constant member to use.  We prefer an actual constant to
+	 * pseudo-constants (such as Params), because the constraint exclusion
+	 * machinery might be able to exclude relations on the basis of generated
+	 * "var = const" equalities, but "var = param" won't work for that.
+	 */
 	foreach(lc, ec->ec_members)
 	{
 		EquivalenceMember *cur_em = (EquivalenceMember *) lfirst(lc);
 
 		if (cur_em->em_is_const)
 		{
 			const_em = cur_em;
-			break;
+			if (IsA(cur_em->em_expr, Const))
+				break;
 		}
 	}
 	Assert(const_em != NULL);

Original file line number	Diff line number	Diff line change
`@@ -769,15 +769,21 @@ generate_base_implied_equalities_const(PlannerInfo *root,`
`769`	`769`	`}`
`770`	`770`	`}`
`771`	`771`
`772`		`- /* Find the constant member to use */`
	`772`	`+ /*`
	`773`	`+ * Find the constant member to use. We prefer an actual constant to`
	`774`	`+ * pseudo-constants (such as Params), because the constraint exclusion`
	`775`	`+ * machinery might be able to exclude relations on the basis of generated`
	`776`	`+ * "var = const" equalities, but "var = param" won't work for that.`
	`777`	`+ */`
`773`	`778`	`foreach(lc, ec->ec_members)`
`774`	`779`	`{`
`775`	`780`	`EquivalenceMember cur_em = (EquivalenceMember ) lfirst(lc);`
`776`	`781`
`777`	`782`	`if (cur_em->em_is_const)`
`778`	`783`	`{`
`779`	`784`	`const_em = cur_em;`
`780`		`- break;`
	`785`	`+ if (IsA(cur_em->em_expr, Const))`
	`786`	`+ break;`
`781`	`787`	`}`
`782`	`788`	`}`
`783`	`789`	`Assert(const_em != NULL);`