Skip to content

P
Postgres FD Implementation
Commit bf4f96b5 authored by Tom Lane's avatar Tom Lane
Browse files
Options

Fix range_cmp_bounds for the case of equal-valued exclusive bounds. 

Also improve its comments and related regression tests.

Jeff Davis, with some further adjustments by Tom
parent ef27c81d
Show whitespace changes
Inline Side-by-side
Showing with 126 additions and 26 deletions
src/backend/utils/adt/rangetypes.c
View file @ bf4f96b5
......@@ -1622,33 +1622,89 @@ make_range(TypeCacheEntry *typcache, RangeBound *lower, RangeBound *upper,
return range;
}
/*
* Compare two range boundary points, returning <0, 0, or >0 according to
* whether b1 is less than, equal to, or greater than b2.
*
* The boundaries can be any combination of upper and lower; so it's useful
* for a variety of operators.
*
* The simple case is when b1 and b2 are both finite and inclusive, in which
* case the result is just a comparison of the values held in b1 and b2.
*
* If a bound is exclusive, then we need to know whether it's a lower bound,
* in which case we treat the boundary point as "just greater than" the held
* value; or an upper bound, in which case we treat the boundary point as
* "just less than" the held value.
*
* If a bound is infinite, it represents minus infinity (less than every other
* point) if it's a lower bound; or plus infinity (greater than every other
* point) if it's an upper bound.
*
* There is only one case where two boundaries compare equal but are not
* identical: when both bounds are inclusive and hold the same finite value,
* but one is an upper bound and the other a lower bound.
*/
int
range_cmp_bounds(TypeCacheEntry *typcache, RangeBound *b1, RangeBound *b2)
{
int32 result;
/*
* First, handle cases involving infinity, which don't require invoking
* the comparison proc.
*/
if (b1->infinite && b2->infinite)
{
/*
* Both are infinity, so they are equal unless one is lower and the
* other not.
*/
if (b1->lower == b2->lower)
return 0;
else
return (b1->lower) ? -1 : 1;
return b1->lower ? -1 : 1;
}
else if (b1->infinite && !b2->infinite)
return (b1->lower) ? -1 : 1;
else if (!b1->infinite && b2->infinite)
return (b2->lower) ? 1 : -1;
else if (b1->infinite)
return b1->lower ? -1 : 1;
else if (b2->infinite)
return b2->lower ? 1 : -1;
/*
* Both boundaries are finite, so compare the held values.
*/
result = DatumGetInt32(FunctionCall2Coll(&typcache->rng_cmp_proc_finfo,
typcache->rng_collation,
b1->val, b2->val));
/*
* If the comparison is anything other than equal, we're done. If they
* compare equal though, we still have to consider whether the boundaries
* are inclusive or exclusive.
*/
if (result == 0)
{
if (b1->inclusive && !b2->inclusive)
return (b2->lower) ? -1 : 1;
else if (!b1->inclusive && b2->inclusive)
return (b1->lower) ? 1 : -1;
if (!b1->inclusive && !b2->inclusive)
{
/* both are exclusive */
if (b1->lower == b2->lower)
return 0;
else
return b1->lower ? 1 : -1;
}
else if (!b1->inclusive)
return b1->lower ? 1 : -1;
else if (!b2->inclusive)
return b2->lower ? -1 : 1;
else
{
/*
* Both are inclusive and the values held are equal, so they are
* equal regardless of whether they are upper or lower boundaries,
* or a mix.
*/
return 0;
}
}
return result;
......
src/test/regress/expected/rangetypes.out
View file @ bf4f96b5
......@@ -48,6 +48,30 @@ ERROR: malformed range literal: "(a,])"
LINE 1: select '(a,])'::textrange;
^
DETAIL: Junk after right parenthesis or bracket.
select '( , )'::textrange;
ERROR: range lower bound must be less than or equal to range upper bound
LINE 1: select '( , )'::textrange;
^
select '("","")'::textrange;
ERROR: range lower bound must be less than or equal to range upper bound
LINE 1: select '("","")'::textrange;
^
select '(",",",")'::textrange;
ERROR: range lower bound must be less than or equal to range upper bound
LINE 1: select '(",",",")'::textrange;
^
select '("\\","\\")'::textrange;
ERROR: range lower bound must be less than or equal to range upper bound
LINE 1: select '("\\","\\")'::textrange;
^
select '[a,a)'::textrange;
ERROR: range lower bound must be less than or equal to range upper bound
LINE 1: select '[a,a)'::textrange;
^
select '(a,a]'::textrange;
ERROR: range lower bound must be less than or equal to range upper bound
LINE 1: select '(a,a]'::textrange;
^
-- should succeed
select ' empty '::textrange;
textrange
......@@ -91,35 +115,36 @@ select '[a,]'::textrange;
[a,)
(1 row)
select '( , )'::textrange;
select '(,)'::textrange;
textrange
-----------
(" "," ")
(,)
(1 row)
select '("","")'::textrange;
select '["",""]'::textrange;
textrange
-----------
("","")
["",""]
(1 row)
select '["",""]'::textrange;
select '[",",","]'::textrange;
textrange
-----------
["",""]
[",",","]
(1 row)
select '(",",",")'::textrange;
select '["\\","\\"]'::textrange;
textrange
-----------
(",",",")
-------------
["\\","\\"]
(1 row)
select '("\\","\\")'::textrange
select '(\\,a)'::textrange;
ERROR: syntax error at or near "select"
LINE 2: select '(\\,a)'::textrange;
^
textrange
-----------
("\\",a)
(1 row)
select '((,z)'::textrange;
textrange
-----------
......@@ -307,6 +332,18 @@ select numrange(1.0, 2.0) << numrange(3.0, 4.0);
t
(1 row)
select numrange(1.0, 3.0,'[]') << numrange(3.0, 4.0,'[]');
?column?
----------
f
(1 row)
select numrange(1.0, 3.0,'()') << numrange(3.0, 4.0,'()');
?column?
----------
t
(1 row)
select numrange(1.0, 2.0) >> numrange(3.0, 4.0);
?column?
----------
......
src/test/regress/sql/rangetypes.sql
View file @ bf4f96b5
......@@ -15,6 +15,12 @@ select '(),a)'::textrange;
select '(a,))'::textrange;
select '(],a)'::textrange;
select '(a,])'::textrange;
select '( , )'::textrange;
select '("","")'::textrange;
select '(",",",")'::textrange;
select '("\\","\\")'::textrange;
select '[a,a)'::textrange;
select '(a,a]'::textrange;
-- should succeed
select ' empty '::textrange;
......@@ -24,11 +30,10 @@ select '(,z)'::textrange;
select '(a,)'::textrange;
select '[,z]'::textrange;
select '[a,]'::textrange;
select '( , )'::textrange;
select '("","")'::textrange;
select '(,)'::textrange;
select '["",""]'::textrange;
select '(",",",")'::textrange;
select '("\\","\\")'::textrange
select '[",",","]'::textrange;
select '["\\","\\"]'::textrange;
select '(\\,a)'::textrange;
select '((,z)'::textrange;
select '([,z)'::textrange;
......@@ -81,6 +86,8 @@ select range_minus(numrange(10.1,12.2,'[]'), numrange(0.0,120.2,'(]'));
select numrange(4.5, 5.5, '[]') && numrange(5.5, 6.5);
select numrange(1.0, 2.0) << numrange(3.0, 4.0);
select numrange(1.0, 3.0,'[]') << numrange(3.0, 4.0,'[]');
select numrange(1.0, 3.0,'()') << numrange(3.0, 4.0,'()');
select numrange(1.0, 2.0) >> numrange(3.0, 4.0);
select numrange(3.0, 70.0) &< numrange(6.6, 100.0);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment