[SCM] PostGIS branch stable-3.6 updated. 3.6.4-139-g304fb41ff
git at osgeo.org
git at osgeo.org
Fri Aug 21 04:49:55 PDT 2026
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "PostGIS".
The branch, stable-3.6 has been updated
via 304fb41ff9ed03c4acdb4667b46c794a0131911f (commit)
via fd411b65d2dfa51807ade8c0d1c7dbdb1cb01f49 (commit)
via c3284cf8279c8879dd727e719342c0ea0eb4e664 (commit)
via e00c592e8d7f9aee4414e67184b91fe726991b41 (commit)
from bef1bf6b2aa21a6e92af072aae8b19f39e6520e4 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 304fb41ff9ed03c4acdb4667b46c794a0131911f
Merge: bef1bf6b2 fd411b65d
Author: Darafei Praliaskouski <komzpa at gmail.com>
Date: Fri Aug 21 04:49:54 2026 -0700
Merge pull request 'regress: keep interrupt relate assertions bounded' (!752) from Komzpa/postgis:fix/interrupt-relation-timeout-3.6-20260821 into stable-3.6
The local-baseline calls run the pathological predicate without a statement timeout, so every stable-3.6 regression workflow stalls before it reaches the interruption assertion.
Use the established stable-3.4 form: retain all eight 100 ms statement_timeout checks and their 500 ms timing assertions, while removing only the unbounded baseline calls.
Reviewed-on: https://gitea.osgeo.org/postgis/postgis/pulls/752
commit fd411b65d2dfa51807ade8c0d1c7dbdb1cb01f49
Author: Darafei Praliaskouski <me at komzpa.net>
Date: Fri Aug 21 15:30:32 2026 +0400
test(core): align 3.6 interrupt relate expected output
diff --git a/regress/core/interrupt_relate_expected b/regress/core/interrupt_relate_expected
index 2c29d8991..354753a1f 100644
--- a/regress/core/interrupt_relate_expected
+++ b/regress/core/interrupt_relate_expected
@@ -1,8 +1,16 @@
-contains interrupted on time
-covers interrupted on time
-coveredby interrupted on time
-crosses interrupted on time
-equals interrupted on time
-intersects interrupted on time
-overlaps interrupted on time
-relate interrupted on time
+ERROR: canceling statement due to statement timeout
+contains interrupted
+ERROR: canceling statement due to statement timeout
+covers interrupted
+ERROR: canceling statement due to statement timeout
+coveredby interrupted
+ERROR: canceling statement due to statement timeout
+crosses interrupted
+ERROR: canceling statement due to statement timeout
+equals interrupted
+ERROR: canceling statement due to statement timeout
+intersects interrupted
+ERROR: canceling statement due to statement timeout
+overlaps interrupted
+ERROR: canceling statement due to statement timeout
+relate interrupted
commit c3284cf8279c8879dd727e719342c0ea0eb4e664
Author: Darafei Praliaskouski <me at komzpa.net>
Date: Fri Aug 21 15:17:10 2026 +0400
Update interrupt_relate expected output for interrupted predicates
diff --git a/regress/core/interrupt_relate_expected b/regress/core/interrupt_relate_expected
index d050570bf..2c29d8991 100644
--- a/regress/core/interrupt_relate_expected
+++ b/regress/core/interrupt_relate_expected
@@ -1,16 +1,8 @@
-ERROR: canceling statement due to statement timeout
contains interrupted on time
-ERROR: canceling statement due to statement timeout
covers interrupted on time
-ERROR: canceling statement due to statement timeout
coveredby interrupted on time
-ERROR: canceling statement due to statement timeout
crosses interrupted on time
-ERROR: canceling statement due to statement timeout
equals interrupted on time
-ERROR: canceling statement due to statement timeout
intersects interrupted on time
-ERROR: canceling statement due to statement timeout
overlaps interrupted on time
-ERROR: canceling statement due to statement timeout
relate interrupted on time
commit e00c592e8d7f9aee4414e67184b91fe726991b41
Author: Darafei Praliaskouski <me at komzpa.net>
Date: Fri Aug 21 13:46:07 2026 +0400
regress: keep interrupt relate assertions bounded
diff --git a/regress/core/interrupt_relate.sql b/regress/core/interrupt_relate.sql
index 65271e5d6..9bafbda16 100644
--- a/regress/core/interrupt_relate.sql
+++ b/regress/core/interrupt_relate.sql
@@ -16,69 +16,29 @@ SELECT 1::int as id, ST_Collect(g) g FROM (
-- IM9 based predicates
-----------------------------
-DO $$
-BEGIN
- PERFORM _timecheck_start();
- PERFORM ST_Contains(g,g) FROM _inputs WHERE id = 1;
- PERFORM _timecheck_baseline('contains');
-END;
-$$;
-
BEGIN;
SET LOCAL statement_timeout TO 100;
select ST_Contains(g,g) from _inputs WHERE id = 1; -- 6+ seconds
ROLLBACK;
-SELECT _timecheck('contains');
-
-DO $$
-BEGIN
- PERFORM _timecheck_start();
- PERFORM ST_Covers(g,g) FROM _inputs WHERE id = 1;
- PERFORM _timecheck_baseline('covers');
-END;
-$$;
+SELECT _timecheck('contains', '500ms');
BEGIN;
SET LOCAL statement_timeout TO 100;
select ST_Covers(g,g) from _inputs WHERE id = 1; -- 6+ seconds
ROLLBACK;
-SELECT _timecheck('covers');
-
-DO $$
-BEGIN
- PERFORM _timecheck_start();
- PERFORM ST_CoveredBy(g,g) FROM _inputs WHERE id = 1;
- PERFORM _timecheck_baseline('coveredby');
-END;
-$$;
+SELECT _timecheck('covers', '500ms');
BEGIN;
SET LOCAL statement_timeout TO 100;
select ST_CoveredBy(g,g) from _inputs WHERE id = 1; -- 6+ seconds
ROLLBACK;
-SELECT _timecheck('coveredby');
-
-DO $$
-BEGIN
- PERFORM _timecheck_start();
- PERFORM ST_Crosses(g,g) FROM _inputs WHERE id = 1;
- PERFORM _timecheck_baseline('crosses');
-END;
-$$;
+SELECT _timecheck('coveredby', '500ms');
BEGIN;
SET LOCAL statement_timeout TO 100;
select ST_Crosses(g,g) from _inputs WHERE id = 1; -- 6+ seconds
ROLLBACK;
-SELECT _timecheck('crosses');
-
-DO $$
-BEGIN
- PERFORM _timecheck_start();
- PERFORM ST_Equals(g,st_reverse(g)) FROM _inputs WHERE id = 1;
- PERFORM _timecheck_baseline('equals');
-END;
-$$;
+SELECT _timecheck('crosses', '500ms');
BEGIN;
SET LOCAL statement_timeout TO 100;
@@ -86,15 +46,7 @@ SET LOCAL statement_timeout TO 100;
-- short-circuit described in #3226
select ST_Equals(g,st_reverse(g)) from _inputs WHERE id = 1; -- 6+ seconds
ROLLBACK;
-SELECT _timecheck('equals');
-
-DO $$
-BEGIN
- PERFORM _timecheck_start();
- PERFORM ST_Intersects(g,ST_Segmentize(g,1e-4)) FROM _inputs WHERE id = 1;
- PERFORM _timecheck_baseline('intersects');
-END;
-$$;
+SELECT _timecheck('equals', '500ms');
BEGIN;
SET LOCAL statement_timeout TO 100;
@@ -102,38 +54,22 @@ SET LOCAL statement_timeout TO 100;
-- input to make it slower
select ST_Intersects(g,ST_Segmentize(g,1e-4)) from _inputs WHERE id = 1; -- 6+ seconds
ROLLBACK;
-SELECT _timecheck('intersects');
-
-DO $$
-BEGIN
- PERFORM _timecheck_start();
- PERFORM ST_Overlaps(g,g) FROM _inputs WHERE id = 1;
- PERFORM _timecheck_baseline('overlaps');
-END;
-$$;
+SELECT _timecheck('intersects', '500ms');
BEGIN;
SET LOCAL statement_timeout TO 100;
select ST_Overlaps(g,g) from _inputs WHERE id = 1; -- 6+ seconds
ROLLBACK;
-SELECT _timecheck('overlaps');
-
-DO $$
-BEGIN
- PERFORM _timecheck_start();
- PERFORM ST_Relate(g,g) FROM _inputs WHERE id = 1;
- PERFORM _timecheck_baseline('relate');
-END;
-$$;
+SELECT _timecheck('overlaps', '500ms');
BEGIN;
SET LOCAL statement_timeout TO 100;
select ST_Relate(g,g) from _inputs WHERE id = 1; -- 6+ seconds
ROLLBACK;
-SELECT _timecheck('relate');
+SELECT _timecheck('relate', '500ms');
-DROP FUNCTION _timecheck(text);
DROP FUNCTION _timecheck(text, interval);
+DROP FUNCTION _timecheck(text);
DROP FUNCTION _timecheck_baseline(text);
DROP FUNCTION _timecheck_start();
DROP TABLE _inputs;
-----------------------------------------------------------------------
Summary of changes:
regress/core/interrupt_relate.sql | 82 ++++------------------------------
regress/core/interrupt_relate_expected | 16 +++----
2 files changed, 17 insertions(+), 81 deletions(-)
hooks/post-receive
--
PostGIS
More information about the postgis-tickets
mailing list