Remove the wrong assertion from match_orclause_to_indexcol()

akorotkov · akorotkov · commit d4d11940df94 · 2024-11-25T09:07:30.000+02:00
Obviously, the constant could be zero. Also, add the relevant check to regression tests. Reported-by: Richard Guo Discussion: https://postgr.es/m/CAMbWs4-siKJdtWhcbqk4Y-xG12do2Ckm1qw672GNsSnDqL9FQg%40mail.gmail.com
diff --git a/src/backend/optimizer/path/indxpath.c b/src/backend/optimizer/path/indxpath.c
@@ -3430,7 +3430,7 @@ match_orclause_to_indexcol(PlannerInfo *root,
 		elems = (Datum *) palloc(sizeof(Datum) * list_length(consts));
 		foreach_node(Const, value, consts)
 		{
-			Assert(!value->constisnull && value->constvalue);
+			Assert(!value->constisnull);
 
 			elems[i++] = value->constvalue;
 		}
diff --git a/src/test/regress/expected/create_index.out b/src/test/regress/expected/create_index.out
@@ -1843,15 +1843,15 @@ DROP TABLE onek_with_null;
 --
 EXPLAIN (COSTS OFF)
 SELECT * FROM tenk1
-  WHERE thousand = 42 AND (tenthous = 1 OR tenthous = 3 OR tenthous = 42);
-                                  QUERY PLAN                                  
-------------------------------------------------------------------------------
+  WHERE thousand = 42 AND (tenthous = 1 OR tenthous = 3 OR tenthous = 42 OR tenthous = 0);
+                                   QUERY PLAN                                   
+--------------------------------------------------------------------------------
  Index Scan using tenk1_thous_tenthous on tenk1
-   Index Cond: ((thousand = 42) AND (tenthous = ANY ('{1,3,42}'::integer[])))
+   Index Cond: ((thousand = 42) AND (tenthous = ANY ('{1,3,42,0}'::integer[])))
 (2 rows)
 
 SELECT * FROM tenk1
-  WHERE thousand = 42 AND (tenthous = 1 OR tenthous = 3 OR tenthous = 42);
+  WHERE thousand = 42 AND (tenthous = 1 OR tenthous = 3 OR tenthous = 42 OR tenthous = 0);
  unique1 | unique2 | two | four | ten | twenty | hundred | thousand | twothousand | fivethous | tenthous | odd | even | stringu1 | stringu2 | string4 
 ---------+---------+-----+------+-----+--------+---------+----------+-------------+-----------+----------+-----+------+----------+----------+---------
       42 |    5530 |   0 |    2 |   2 |      2 |      42 |       42 |          42 |        42 |       42 |  84 |   85 | QBAAAA   | SEIAAA   | OOOOxx
diff --git a/src/test/regress/sql/create_index.sql b/src/test/regress/sql/create_index.sql
@@ -728,9 +728,9 @@ DROP TABLE onek_with_null;
 
 EXPLAIN (COSTS OFF)
 SELECT * FROM tenk1
-  WHERE thousand = 42 AND (tenthous = 1 OR tenthous = 3 OR tenthous = 42);
+  WHERE thousand = 42 AND (tenthous = 1 OR tenthous = 3 OR tenthous = 42 OR tenthous = 0);
 SELECT * FROM tenk1
-  WHERE thousand = 42 AND (tenthous = 1 OR tenthous = 3 OR tenthous = 42);
+  WHERE thousand = 42 AND (tenthous = 1 OR tenthous = 3 OR tenthous = 42 OR tenthous = 0);
 
 EXPLAIN (COSTS OFF)
 SELECT * FROM tenk1

Original file line number	Diff line number	Diff line change
`@@ -3430,7 +3430,7 @@ match_orclause_to_indexcol(PlannerInfo *root,`
`3430`	`3430`	`elems = (Datum ) palloc(sizeof(Datum) list_length(consts));`
`3431`	`3431`	`foreach_node(Const, value, consts)`
`3432`	`3432`	`{`
`3433`		`- Assert(!value->constisnull && value->constvalue);`
	`3433`	`+ Assert(!value->constisnull);`
`3434`	`3434`
`3435`	`3435`	`elems[i++] = value->constvalue;`
`3436`	`3436`	`}`