Code review of get_qual_for_list.

robertmhaas · robertmhaas · commit 85c2b9a15a1d · 2017-05-24T16:45:58.000-04:00
We need not consider the case where both nulltest1 and nulltest2 are
NULL; the partition either accepts nulls or it does not.

Jeevan Ladhe.  I added an assertion.
diff --git a/src/backend/catalog/partition.c b/src/backend/catalog/partition.c
@@ -1383,15 +1383,14 @@ get_qual_for_list(PartitionKey key, PartitionBoundSpec *spec)
 
 	if (nulltest1)
 		result = list_make2(nulltest1, opexpr);
-	else if (nulltest2)
+	else
 	{
 		Expr	   *or;
 
+		Assert(nulltest2 != NULL);
 		or = makeBoolExpr(OR_EXPR, list_make2(nulltest2, opexpr), -1);
 		result = list_make1(or);
 	}
-	else
-		result = list_make1(opexpr);
 
 	return result;
 }

Original file line number	Diff line number	Diff line change
`@@ -1383,15 +1383,14 @@ get_qual_for_list(PartitionKey key, PartitionBoundSpec *spec)`
`1383`	`1383`
`1384`	`1384`	`if (nulltest1)`
`1385`	`1385`	`result = list_make2(nulltest1, opexpr);`
`1386`		`- else if (nulltest2)`
	`1386`	`+ else`
`1387`	`1387`	`{`
`1388`	`1388`	`Expr *or;`
`1389`	`1389`
	`1390`	`+ Assert(nulltest2 != NULL);`
`1390`	`1391`	`or = makeBoolExpr(OR_EXPR, list_make2(nulltest2, opexpr), -1);`
`1391`	`1392`	`result = list_make1(or);`
`1392`	`1393`	`}`
`1393`		`- else`
`1394`		`- result = list_make1(opexpr);`
`1395`	`1394`
`1396`	`1395`	`return result;`
`1397`	`1396`	`}`