diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/nodes/bitmapset.c | 7 | ||||
| -rw-r--r-- | src/test/regress/expected/partition_prune.out | 15 | ||||
| -rw-r--r-- | src/test/regress/sql/partition_prune.sql | 7 |
3 files changed, 27 insertions, 2 deletions
diff --git a/src/backend/nodes/bitmapset.c b/src/backend/nodes/bitmapset.c index 9bf9a29d6b1..6208f4ed936 100644 --- a/src/backend/nodes/bitmapset.c +++ b/src/backend/nodes/bitmapset.c @@ -867,6 +867,10 @@ bms_add_range(Bitmapset *a, int lower, int upper) ushiftbits, wordnum; + /* do nothing if nothing is called for, without further checking */ + if (upper < lower) + return a; + if (lower < 0 || upper < 0) elog(ERROR, "negative bitmapset member not allowed"); if (lower > upper) @@ -878,13 +882,12 @@ bms_add_range(Bitmapset *a, int lower, int upper) a = (Bitmapset *) palloc0(BITMAPSET_SIZE(uwordnum + 1)); a->nwords = uwordnum + 1; } - - /* ensure we have enough words to store the upper bit */ else if (uwordnum >= a->nwords) { int oldnwords = a->nwords; int i; + /* ensure we have enough words to store the upper bit */ a = (Bitmapset *) repalloc(a, BITMAPSET_SIZE(uwordnum + 1)); a->nwords = uwordnum + 1; /* zero out the enlarged portion */ diff --git a/src/test/regress/expected/partition_prune.out b/src/test/regress/expected/partition_prune.out index 38bd179c222..3fef4921aac 100644 --- a/src/test/regress/expected/partition_prune.out +++ b/src/test/regress/expected/partition_prune.out @@ -1180,6 +1180,21 @@ explain (costs off) select * from coercepart where a !~ all ('{ab,bc}'); (7 rows) drop table coercepart; +CREATE TABLE part (a INT, b INT) PARTITION BY LIST (a); +CREATE TABLE part_p1 PARTITION OF part FOR VALUES IN (-2,-1,0,1,2); +CREATE TABLE part_p2 PARTITION OF part DEFAULT PARTITION BY RANGE(a); +CREATE TABLE part_p2_p1 PARTITION OF part_p2 DEFAULT; +INSERT INTO part VALUES (-1,-1), (1,1), (2,NULL), (NULL,-2),(NULL,NULL); +EXPLAIN (COSTS OFF) SELECT tableoid::regclass as part, a, b FROM part WHERE a IS NULL ORDER BY 1, 2, 3; + QUERY PLAN +--------------------------------------------------------------------------- + Sort + Sort Key: ((part_p2_p1.tableoid)::regclass), part_p2_p1.a, part_p2_p1.b + -> Append + -> Seq Scan on part_p2_p1 + Filter: (a IS NULL) +(5 rows) + -- -- some more cases -- diff --git a/src/test/regress/sql/partition_prune.sql b/src/test/regress/sql/partition_prune.sql index e5e7789fc5b..4b198b1a1d7 100644 --- a/src/test/regress/sql/partition_prune.sql +++ b/src/test/regress/sql/partition_prune.sql @@ -173,6 +173,13 @@ explain (costs off) select * from coercepart where a !~ all ('{ab,bc}'); drop table coercepart; +CREATE TABLE part (a INT, b INT) PARTITION BY LIST (a); +CREATE TABLE part_p1 PARTITION OF part FOR VALUES IN (-2,-1,0,1,2); +CREATE TABLE part_p2 PARTITION OF part DEFAULT PARTITION BY RANGE(a); +CREATE TABLE part_p2_p1 PARTITION OF part_p2 DEFAULT; +INSERT INTO part VALUES (-1,-1), (1,1), (2,NULL), (NULL,-2),(NULL,NULL); +EXPLAIN (COSTS OFF) SELECT tableoid::regclass as part, a, b FROM part WHERE a IS NULL ORDER BY 1, 2, 3; + -- -- some more cases -- |