[SCM] postgis branch, master, updated. upstream/2.0.1-104-gfcd3fd8

Markus Wanner markus at bluegap.ch
Sat Jan 18 16:33:21 UTC 2014 

The following commit has been merged in the master branch:
commit fcd3fd8fbf6dd5acac1a1746ee4edf0d78b5e52c
Author: Markus Wanner <markus at bluegap.ch>
Date:   Sat Jan 18 17:32:04 2014 +0100

    Fix FTBFS (hopefully) and finalize 2.1.1-3.
    
    * Finalize 2.1.1-3 for upload to unstable
    * Fix FTBFS on at least powerpc and mips by commenting out a few tests
      that check against a serialized representation, which is architecture
      dependent.
    * Apply (experimental) upstream patch preventing against selectivity
      estimates bigger than 1.0.

diff --git a/debian/changelog b/debian/changelog
index 7d49b37..187cde0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,14 @@
-postgis (2.1.1-2) UNRELEASED; urgency=medium
+postgis (2.1.1-3) unstable; urgency=low
+
+  * Fix FTBFS on at least powerpc and mips by commenting out a few tests
+    that check against a serialized representation, which is architecture
+    dependent.
+  * Apply (experimental) upstream patch preventing against selectivity
+    estimates bigger than 1.0.
+
+ -- Markus Wanner <markus at bluegap.ch>  Tue, 14 Jan 2014 22:18:56 +0100
+
+postgis (2.1.1-2) unstable; urgency=medium
 
   * Fix FTBFS on armel, maybe others, with yet another patch.
   * debian/control: bumped Standard-Versions to 3.9.5, no changes needed.
diff --git a/debian/patches/fix-big-endian b/debian/patches/fix-big-endian
new file mode 100644
index 0000000..7ec88d6
--- /dev/null
+++ b/debian/patches/fix-big-endian
@@ -0,0 +1,51 @@
+--- a/regress/sql-mm-curvepoly.sql
++++ b/regress/sql-mm-curvepoly.sql
+@@ -336,7 +336,9 @@
+ SELECT 'valid ewkb curve polygon 3', ST_asEWKT(ST_GeomFromEWKB(decode('010a00000001000000010800000007000000ccdf061ad9f3614054093e6d99093ec0ab9085dbb6dd614081540229216040c0ebd7a828c33e62409bf026782a7e41c0000000c06bb2624000000020adb440c08e632f616ead6240c9f7b0bf1dd33dc09011eec0de4362407dd6672f76323ec0ccdf061ad9f3614054093e6d99093ec0', 'hex')));
+ SELECT 'valid ewkb curve polygon 4', ST_asEWKT(ST_GeomFromEWKB(decode('010a00000002000000010800000007000000ccdf061ad9f3614054093e6d99093ec0ab9085dbb6dd614081540229216040c0ebd7a828c33e62409bf026782a7e41c0000000c06bb2624000000020adb440c08e632f616ead6240c9f7b0bf1dd33dc09011eec0de4362407dd6672f76323ec0ccdf061ad9f3614054093e6d99093ec00102000000060000006844c4fe011b6240342e2993e0423fc0d45daf9d93066240c4a0c305d62240c000000080ac31624000000020fbbe40c0000000e0107f6240000000c0a10440c04e1c0c14624c6240bf3fb6405c793fc06844c4fe011b6240342e2993e0423fc0', 'hex')));
+ SELECT 'valid ewkb curve polygon 5', ST_asEWKT(ST_GeomFromEWKB(decode('010a00000002000000010200000007000000ccdf061ad9f3614054093e6d99093ec0ab9085dbb6dd614081540229216040c0ebd7a828c33e62409bf026782a7e41c0000000c06bb2624000000020adb440c08e632f616ead6240c9f7b0bf1dd33dc09011eec0de4362407dd6672f76323ec0ccdf061ad9f3614054093e6d99093ec00109000000030000000108000000030000006844c4fe011b6240342e2993e0423fc0d45daf9d93066240c4a0c305d62240c000000080ac31624000000020fbbe40c001020000000200000000000080ac31624000000020fbbe40c0000000e0107f6240000000c0a10440c0010800000003000000000000e0107f6240000000c0a10440c04e1c0c14624c6240bf3fb6405c793fc06844c4fe011b6240342e2993e0423fc0', 'hex')));
+-SELECT 'valid curve 6', ST_GeomFromText('CURVEPOLYGON(COMPOUNDCURVE(CIRCULARSTRING(0 0,2 0, 2 1, 2 3, 4 3),(4 3, 4 5, 1 4, 0 0)), CIRCULARSTRING(1.7 1, 1.4 0.4, 1.7 1) )');
++-- Tests 'valid curve 6' and 'valid curve 8' will also fail on big endian architectures
++-- We need a way to handle multiple byte orderings
++-- SELECT 'valid curve 6', ST_GeomFromText('CURVEPOLYGON(COMPOUNDCURVE(CIRCULARSTRING(0 0,2 0, 2 1, 2 3, 4 3),(4 3, 4 5, 1 4, 0 0)), CIRCULARSTRING(1.7 1, 1.4 0.4, 1.7 1) )');
+ SELECT 'valid curve 7', ST_GeomFromText('CURVEPOLYGON(COMPOUNDCURVE(CIRCULARSTRING(0 0,2 0, 2 1, 2 3, 4 3),(4 3, 4 5, 1 4, 0 0)), (1.7 1, 1.4 0.4, 1.7 1) )');
+-SELECT 'valid curve 8', ST_GeomFromText('CURVEPOLYGON(COMPOUNDCURVE(CIRCULARSTRING(0 0,2 0, 2 1, 2 3, 4 3),(4 3, 0 0)), CIRCULARSTRING(1.7 1, 1.4 0.4, 1.7 1) )');
++-- SELECT 'valid curve 8', ST_GeomFromText('CURVEPOLYGON(COMPOUNDCURVE(CIRCULARSTRING(0 0,2 0, 2 1, 2 3, 4 3),(4 3, 0 0)), CIRCULARSTRING(1.7 1, 1.4 0.4, 1.7 1) )');
+ SELECT 'null response', ST_NumPoints(ST_GeomFromEWKT('CURVEPOLYGON(COMPOUNDCURVE(CIRCULARSTRING(0 0,2 0, 2 1, 2 3, 4 3),(4 3, 4 5, 1 4, 0 0)), CIRCULARSTRING(1.7 1, 1.4 0.4, 1.7 1) )'));
+--- a/regress/sql-mm-curvepoly_expected
++++ b/regress/sql-mm-curvepoly_expected
+@@ -89,7 +89,5 @@
+ valid ewkb curve polygon 3|CURVEPOLYGON(CIRCULARSTRING(143.620251668383 -30.0374973560768,142.928571472997 -32.751011968744,145.961323098919 -34.9856710615288,149.575653076172 -33.4115333557129,149.419724075848 -29.8246726805735,146.120941605547 -30.1971158627043,143.620251668383 -30.0374973560768))
+ valid ewkb curve polygon 4|CURVEPOLYGON(CIRCULARSTRING(143.620251668383 -30.0374973560768,142.928571472997 -32.751011968744,145.961323098919 -34.9856710615288,149.575653076172 -33.4115333557129,149.419724075848 -29.8246726805735,146.120941605547 -30.1971158627043,143.620251668383 -30.0374973560768),(144.843993552527 -31.2612392402209,144.205519526017 -32.2721564488616,145.552307128906 -33.4920387268066,147.970809936523 -32.0361862182617,146.386972449926 -31.4740639157242,144.843993552527 -31.2612392402209))
+ valid ewkb curve polygon 5|CURVEPOLYGON((143.620251668383 -30.0374973560768,142.928571472997 -32.751011968744,145.961323098919 -34.9856710615288,149.575653076172 -33.4115333557129,149.419724075848 -29.8246726805735,146.120941605547 -30.1971158627043,143.620251668383 -30.0374973560768),COMPOUNDCURVE(CIRCULARSTRING(144.843993552527 -31.2612392402209,144.205519526017 -32.2721564488616,145.552307128906 -33.4920387268066),(145.552307128906 -33.4920387268066,147.970809936523 -32.0361862182617),CIRCULARSTRING(147.970809936523 -32.0361862182617,146.386972449926 -31.4740639157242,144.843993552527 -31.2612392402209)))
+-valid curve 6|010A0000000200000001090000000200000001080000000500000000000000000000000000000000000000000000000000004000000000000000000000000000000040000000000000F03F00000000000000400000000000000840000000000000104000000000000008400102000000040000000000000000001040000000000000084000000000000010400000000000001440000000000000F03F000000000000104000000000000000000000000000000000010800000003000000333333333333FB3F000000000000F03F666666666666F63F9A9999999999D93F333333333333FB3F000000000000F03F
+ ERROR:  geometry requires more points
+-valid curve 8|010A0000000200000001090000000200000001080000000500000000000000000000000000000000000000000000000000004000000000000000000000000000000040000000000000F03F00000000000000400000000000000840000000000000104000000000000008400102000000020000000000000000001040000000000000084000000000000000000000000000000000010800000003000000333333333333FB3F000000000000F03F666666666666F63F9A9999999999D93F333333333333FB3F000000000000F03F
+ null response|
+--- a/regress/empty.sql
++++ b/regress/empty.sql
+@@ -123,13 +123,6 @@
+ WITH inp AS (SELECT
+  'POLYGON EMPTY'::geometry as empty,
+  1 as n
+- ) SELECT 'ST_GeometryN(empty, n) == empty', ST_GeometryN(empty, n) FROM inp;
+-WITH inp AS (SELECT
+- 'POLYGON EMPTY'::geometry as empty
+- ) SELECT 'ST_ExteriorRing(empty) == empty', ST_ExteriorRing(empty) FROM inp;
+-WITH inp AS (SELECT
+- 'POLYGON EMPTY'::geometry as empty,
+- 1 as n
+  ) SELECT 'ST_InteriorRingN(empty, n) == NULL', ST_InteriorRingN(empty, n) FROM inp;
+ WITH inp AS (SELECT
+  'POLYGON EMPTY'::geometry as empty
+--- a/regress/empty_expected
++++ b/regress/empty_expected
+@@ -47,8 +47,6 @@
+ ST_NRings(empty) == 0|0
+ ST_NumPoints(empty) == 0|0
+ ST_NPoints(empty) == 0|0
+-ST_GeometryN(empty, n) == empty|010300000000000000
+-ST_ExteriorRing(empty) == empty|010200000000000000
+ ST_InteriorRingN(empty, n) == NULL|
+ ST_Area(empty) == 0|0
+ ST_Length(empty) == 0|0
diff --git a/debian/patches/joinsel-issue2543 b/debian/patches/joinsel-issue2543
new file mode 100644
index 0000000..93aea83
--- /dev/null
+++ b/debian/patches/joinsel-issue2543
@@ -0,0 +1,23 @@
+Description: Apply proposed patch from upstream bug #2543
+ Not quite how important upstream issue #2543 is in the wild, but the
+ proposed fix seems save in any case. On MIPS, I occasionally see very
+ high selectivity values, with indicates a bug. For now, let's just
+ cap the selectivity at 1.0.
+Author: Paul Ramsey <pramsey at cleverelephant.ca>
+Bug: http://trac.osgeo.org/postgis/ticket/2543
+Origin: upstream, http://trac.osgeo.org/postgis/attachment/ticket/2543/joinsel.patch
+Last-Update: 2013-11-13
+
+--- a/postgis/gserialized_estimate.c
++++ b/postgis/gserialized_estimate.c
+@@ -1075,6 +1075,10 @@
+ 	 */
+ 	selectivity = val / ntuples_max;
+ 	
++	/* Guard against over-estimates :) */ 
++	if ( selectivity > 1.0 )  
++		selectivity = 1.0; 	
++
+ 	return selectivity;
+ }
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 66d1e02..8575423 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,4 +7,6 @@ use-debian-maven
 honor-build-flags
 fix-kfreebsd
 fix-armel
+fix-big-endian
 fix-manpage
+joinsel-issue2543

-- 
PostGIS for PostgreSQL

More information about the Pkg-grass-devel mailing list