[SCM] PostGIS branch stable-3.5 updated. 3.5.7-138-g9d9957c32
git at osgeo.org
git at osgeo.org
Fri Aug 21 04:49:48 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.5 has been updated
via 9d9957c325c8e41e2cf8bfc4c937b47aaccc5e60 (commit)
via 70874e3967e5cd9fc73cef8c31f2a7106f37070d (commit)
via f89cd7ed415d5a356ba975a100750e3d9a5bd679 (commit)
via a28a4c1bd06378dfcc9f1054b7e7d7cb8a6f9b94 (commit)
from 4486e53f99c77e34dd4496d0a1242208486cccf8 (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 9d9957c325c8e41e2cf8bfc4c937b47aaccc5e60
Merge: 4486e53f9 70874e396
Author: Darafei Praliaskouski <komzpa at gmail.com>
Date: Fri Aug 21 04:49:47 2026 -0700
Merge pull request 'regress: keep interrupt relate assertions bounded' (!751) from Komzpa/postgis:fix/interrupt-relation-timeout-3.5-20260821 into stable-3.5
The local-baseline calls run the pathological predicate without a statement timeout, so every stable-3.5 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/751
commit 70874e3967e5cd9fc73cef8c31f2a7106f37070d
Author: Darafei Praliaskouski <me at komzpa.net>
Date: Fri Aug 21 15:26:51 2026 +0400
Revert "test(core): align interrupt_relate expected with current output"
This reverts commit f89cd7ed415d5a356ba975a100750e3d9a5bd679.
diff --git a/regress/core/interrupt_relate_expected b/regress/core/interrupt_relate_expected
index 2c29d8991..d050570bf 100644
--- a/regress/core/interrupt_relate_expected
+++ b/regress/core/interrupt_relate_expected
@@ -1,8 +1,16 @@
+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 f89cd7ed415d5a356ba975a100750e3d9a5bd679
Author: Darafei Praliaskouski <me at komzpa.net>
Date: Fri Aug 21 15:16:55 2026 +0400
test(core): align interrupt_relate expected with current output
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 a28a4c1bd06378dfcc9f1054b7e7d7cb8a6f9b94
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 0e0e85ff6..278abde28 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');
-- NOTE: we're reversing one of the operands to avoid the
-- short-circuit described in #3226
@@ -86,15 +46,7 @@ BEGIN;
SET LOCAL statement_timeout TO 100;
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');
-- NOTE: intersects became very fast, so we segmentize
-- input to make it slower
@@ -102,38 +54,22 @@ BEGIN;
SET LOCAL statement_timeout TO 100;
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 +++++----------------------------------
1 file changed, 9 insertions(+), 73 deletions(-)
hooks/post-receive
--
PostGIS
More information about the postgis-tickets
mailing list