[SCM] PostGIS branch stable-3.4 updated. 3.4.6-88-g5371c9a8c
git at osgeo.org
git at osgeo.org
Thu Jul 23 04:27:41 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.4 has been updated
via 5371c9a8c938b55a2a58dd713fe60cadb8f2d3df (commit)
from 1bf66b05846cf99ed1430868004ff8646bf5728e (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 5371c9a8c938b55a2a58dd713fe60cadb8f2d3df
Author: Darafei Praliaskouski <komzpa at gmail.com>
Date: Thu Jul 23 04:27:40 2026 -0700
regress: relax stable 3.4 interrupt tolerances (!492)
Summary:
- widen stable-3.4 interrupt timing windows for slow PG15 Woodpecker upgradecheck runs
- keep the tests verifying cancellation happens far before the multi-second uninterruptible paths
Woodpecker stable-3.4 pipeline `5415` failed in `upgradecheck-pg15` because the interrupt checks reported late, but still sub-second, cancellation on a slow worker:
- `segmentize` reported `00:00:00.67018` with `00:00:00.5658` tolerated
- `contains` reported `00:00:00.791379` with `00:00:00.41492` tolerated
This branch leaves margin for that slow PG15 upgradecheck path while keeping the checks well below the 6+ second uninterruptible paths described by the tests.
Failure:
- https://woodie.osgeo.org/repos/30/pipeline/5415
Validation:
- `git diff --check HEAD~1..HEAD`
- `sh -n utils/check_all_upgrades.sh`
- `perl -c regress/run_test.pl`
---------
Co-authored-by: Darafei Praliaskouski <me at komzpa.net>
Reviewed-on: https://gitea.osgeo.org/postgis/postgis/pulls/492
diff --git a/regress/core/interrupt.sql b/regress/core/interrupt.sql
index 616e74fd7..f975e44e2 100644
--- a/regress/core/interrupt.sql
+++ b/regress/core/interrupt.sql
@@ -11,7 +11,10 @@ SET statement_timeout TO 100;
-- would run for many seconds if uninterruptible...
SELECT 'segmentize', ST_NPoints(ST_Segmentize(ST_MakeLine(ST_Point(4,39), ST_Point(1,41)), 1e-8));
-SELECT _timecheck('segmentize', '300ms');
+-- PG15 upgradecheck on slow Woodpecker workers can report the interrupt a
+-- little later than the scaled 300ms window while still aborting far ahead of
+-- the multi-second uninterruptible path this test guards.
+SELECT _timecheck('segmentize', '450ms');
SET statement_timeout TO 0;
-- Not affected by old timeout
SELECT '1',ST_AsText(ST_Segmentize('LINESTRING(0 0,4 0)'::geometry, 2));
diff --git a/regress/core/interrupt_relate.sql b/regress/core/interrupt_relate.sql
index d80dacf1c..ab0f223c3 100644
--- a/regress/core/interrupt_relate.sql
+++ b/regress/core/interrupt_relate.sql
@@ -19,32 +19,32 @@ SELECT 1::int as id, ST_Collect(g) g FROM (
SET statement_timeout TO 100;
select ST_Contains(g,g) from _inputs WHERE id = 1; -- 6+ seconds
-SELECT _timecheck('contains', '220ms');
+SELECT _timecheck('contains', '500ms');
select ST_Covers(g,g) from _inputs WHERE id = 1; -- 6+ seconds
-SELECT _timecheck('covers', '220ms');
+SELECT _timecheck('covers', '500ms');
select ST_CoveredBy(g,g) from _inputs WHERE id = 1; -- 6+ seconds
-SELECT _timecheck('coveredby', '250ms');
+SELECT _timecheck('coveredby', '500ms');
select ST_Crosses(g,g) from _inputs WHERE id = 1; -- 6+ seconds
-SELECT _timecheck('crosses', '220ms');
+SELECT _timecheck('crosses', '500ms');
-- NOTE: we're reversing one of the operands to avoid the
-- short-circuit described in #3226
select ST_Equals(g,st_reverse(g)) from _inputs WHERE id = 1; -- 6+ seconds
-SELECT _timecheck('equals', '220ms');
+SELECT _timecheck('equals', '500ms');
-- NOTE: intersects became very fast, so we segmentize
-- input to make it slower
select ST_Intersects(g,ST_Segmentize(g,1e-4)) from _inputs WHERE id = 1; -- 6+ seconds
-SELECT _timecheck('intersects', '210ms');
+SELECT _timecheck('intersects', '500ms');
select ST_Overlaps(g,g) from _inputs WHERE id = 1; -- 6+ seconds
-SELECT _timecheck('overlaps', '220ms');
+SELECT _timecheck('overlaps', '500ms');
select ST_Relate(g,g) from _inputs WHERE id = 1; -- 6+ seconds
-SELECT _timecheck('relate', '220ms');
+SELECT _timecheck('relate', '500ms');
DROP FUNCTION _timecheck(text, interval);
DROP TABLE _inputs;
-----------------------------------------------------------------------
Summary of changes:
regress/core/interrupt.sql | 5 ++++-
regress/core/interrupt_relate.sql | 16 ++++++++--------
2 files changed, 12 insertions(+), 9 deletions(-)
hooks/post-receive
--
PostGIS
More information about the postgis-tickets
mailing list