diff options
| author | Alvaro Herrera <alvherre@alvh.no-ip.org> | 2018-07-30 17:18:42 -0400 |
|---|---|---|
| committer | Alvaro Herrera <alvherre@alvh.no-ip.org> | 2018-07-30 18:43:30 -0400 |
| commit | 192d1bbf99699de76473184c57fff9ff4b4246f4 (patch) | |
| tree | c191e7160f8d23ebc8f899d7b087584225734b8d /src/backend | |
| parent | 739d9b29948bb508656d7f6c779630788abac560 (diff) | |
| download | postgresql-192d1bbf99699de76473184c57fff9ff4b4246f4.tar.gz postgresql-192d1bbf99699de76473184c57fff9ff4b4246f4.zip | |
Change bms_add_range to be a no-op for empty ranges
In commit 84940644de93, bms_add_range was added with an API to fail with
an error if an empty range was specified. This seems arbitrary and
unhelpful, so turn that case into a no-op instead. Callers that require
further verification on the arguments or result can apply them by
themselves.
This fixes the bug that partition pruning throws an API error for a case
involving the default partition of a default partition, as in the
included test case.
Reported-by: Rajkumar Raghuwanshi <rajkumar.raghuwanshi@enterprisedb.com>
Diagnosed-by: Tom Lane <tgl@sss.pgh.pa.us>
Discussion: https://postgr.es/m/16590.1532622503@sss.pgh.pa.us
Diffstat (limited to 'src/backend')
| -rw-r--r-- | src/backend/nodes/bitmapset.c | 7 |
1 files changed, 5 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 */ |