git.postgresql.org Git - postgresql.git/commitdiff

git projects / postgresql.git / commitdiff

Fix bugs in comparison functions for multirange_bsearch_match()

author Alexander Korotkov <akorotkov@postgresql.org>

2020年12月29日 20:35:26 +0000 (23:35 +0300)

committer Alexander Korotkov <akorotkov@postgresql.org>

2020年12月29日 20:35:26 +0000 (23:35 +0300)

Two functions multirange_range_overlaps_bsearch_comparison() and
multirange_range_contains_bsearch_comparison() contain bugs of returning -1
instead of 1. This commit fixes these bugs and adds corresponding regression
tests.

src/backend/utils/adt/multirangetypes.c patch | blob | blame | history

src/test/regress/expected/multirangetypes.out patch | blob | blame | history

src/test/regress/sql/multirangetypes.sql patch | blob | blame | history

diff --git a/src/backend/utils/adt/multirangetypes.c b/src/backend/utils/adt/multirangetypes.c

index 06316ba6b6570d032d2f372e5bea1874f86b2dd1..46f661fee49e4a392cd5891dbc2eb0f43bdfb8f9 100644 (file)

--- a/src/backend/utils/adt/multirangetypes.c

+++ b/src/backend/utils/adt/multirangetypes.c

@@ -1660,7 +1660,7 @@ multirange_range_contains_bsearch_comparison(TypeCacheEntry *typcache,

if (range_cmp_bounds(typcache, keyUpper, lower) < 0)

return -1;

if (range_cmp_bounds(typcache, keyLower, upper) > 0)

- return -1;

+ return 1;

* At this point we found overlapping range. But we have to check if it

@@ -1825,7 +1825,7 @@ multirange_range_overlaps_bsearch_comparison(TypeCacheEntry *typcache,

if (range_cmp_bounds(typcache, keyUpper, lower) < 0)

return -1;

if (range_cmp_bounds(typcache, keyLower, upper) > 0)

- return -1;

+ return 1;

*match = true;

return 0;

diff --git a/src/test/regress/expected/multirangetypes.out b/src/test/regress/expected/multirangetypes.out

index e81e565cab753b82628ceba764e91b3ce7ddf9f6..180aa1e8a535e398dbc1751f512066ec8ac3a8e3 100644 (file)

--- a/src/test/regress/expected/multirangetypes.out

+++ b/src/test/regress/expected/multirangetypes.out

@@ -834,6 +834,12 @@ SELECT nummultirange(numrange(1,2), numrange(3.5,8)) && nummultirange(numrange(3

(1 row)

+select '{(10,20),(30,40),(50,60)}'::nummultirange && '(42,92)'::numrange;

+ ?column?

+----------

+ t

+(1 row)

-- contains

SELECT nummultirange() @> nummultirange();

?column?

@@ -967,6 +973,12 @@ SELECT '{[1,5), [6,9)}'::nummultirange @> '{[6,7)}';

(1 row)

+select '{(10,20),(30,40),(50,60)}'::nummultirange @> '(52,56)'::numrange;

+ ?column?

+----------

+ t

+(1 row)

-- is contained by

SELECT nummultirange() <@ nummultirange();

?column?

diff --git a/src/test/regress/sql/multirangetypes.sql b/src/test/regress/sql/multirangetypes.sql

index 9be26f10d381f4af61a48f55606a80e49706b959..c9f84cf81d4672b8bed2e3d56e8341ad6a166652 100644 (file)

--- a/src/test/regress/sql/multirangetypes.sql

+++ b/src/test/regress/sql/multirangetypes.sql

@@ -162,6 +162,7 @@ SELECT nummultirange(numrange(1,2), numrange(7,8)) && nummultirange(numrange(3,4

SELECT nummultirange(numrange(3,4)) && nummultirange(numrange(1,2), numrange(3.5,8));

SELECT nummultirange(numrange(1,2), numrange(3.5,8)) && numrange(3,4);

SELECT nummultirange(numrange(1,2), numrange(3.5,8)) && nummultirange(numrange(3,4));

+select '{(10,20),(30,40),(50,60)}'::nummultirange && '(42,92)'::numrange;

-- contains

SELECT nummultirange() @> nummultirange();

@@ -186,6 +187,7 @@ SELECT '{[-4,-2), [1,5)}'::nummultirange @> '{[1,5)}';

SELECT '{[1,5), [8,9)}'::nummultirange @> '{[1,5)}';

SELECT '{[1,5), [8,9)}'::nummultirange @> '{[6,7)}';

SELECT '{[1,5), [6,9)}'::nummultirange @> '{[6,7)}';

+select '{(10,20),(30,40),(50,60)}'::nummultirange @> '(52,56)'::numrange;

-- is contained by

SELECT nummultirange() <@ nummultirange();

This is the main PostgreSQL git repository.

RSS Atom