From 8cf3645ac551310e9a0b3acea573d2ff68ec8b3f Mon Sep 17 00:00:00 2001 From: Darafei Praliaskouski Date: Fri, 29 Dec 2017 16:48:09 +0300 Subject: [PATCH 01/10] Update lwgeom_regress.sql --- regress/lwgeom_regress.sql | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/regress/lwgeom_regress.sql b/regress/lwgeom_regress.sql index f7f149d3b9e..1a5beb1c94a 100644 --- a/regress/lwgeom_regress.sql +++ b/regress/lwgeom_regress.sql @@ -169,3 +169,10 @@ SELECT 'ST_Angle_empty' , St_Angle(p1,p2,p3,p4) SELECT 'ST_Angle_2_lines', St_Angle(l1,l2) FROM ST_GeomFromtext('LINESTRING(0 1,0 0)') AS l1 , ST_GeomFromtext('LINESTRING(1 0, 2 0)') AS l2 ; + +--- ST_ClusterKMeans +select '#3965', count(distinct cid), count(*) from ( + with points as (select ST_MakePoint(x,y) geom from generate_series(1,5) x, generate_series(1,5) y) + select ST_ClusterKMeans(geom, 25) over () as cid, geom + from points) z; + From 5aecd678d3fbfc82c92e69cb6004349ecc6d3d27 Mon Sep 17 00:00:00 2001 From: Darafei Praliaskouski Date: Fri, 29 Dec 2017 16:49:58 +0300 Subject: [PATCH 02/10] Update lwgeom_regress_expected --- regress/lwgeom_regress_expected | 1 + 1 file changed, 1 insertion(+) diff --git a/regress/lwgeom_regress_expected b/regress/lwgeom_regress_expected index 4c9408eee0c..268e3497c39 100644 --- a/regress/lwgeom_regress_expected +++ b/regress/lwgeom_regress_expected @@ -32,3 +32,4 @@ ST_Angle_3_pts|1.5707963267949 ERROR: Operation on mixed SRID geometries ERROR: Empty geometry ST_Angle_2_lines|4.71238898038469 +#9365|25|25 From b314d33376bf2f6cfedf7ac3225f0dbccf6a6dc8 Mon Sep 17 00:00:00 2001 From: Darafei Praliaskouski Date: Fri, 29 Dec 2017 16:55:15 +0300 Subject: [PATCH 03/10] Update lwkmeans.c --- liblwgeom/lwkmeans.c | 1 + 1 file changed, 1 insertion(+) diff --git a/liblwgeom/lwkmeans.c b/liblwgeom/lwkmeans.c index e7f576048fc..d92c41aed7a 100644 --- a/liblwgeom/lwkmeans.c +++ b/liblwgeom/lwkmeans.c @@ -201,6 +201,7 @@ lwgeom_cluster_2d_kmeans(const LWGEOM **geoms, int ngeoms, int k) if (seen[j] == closest) { closest = (closest + 1) % config.num_objs; + j = 0; } else { From 699dc5955e909423082b6f8039b43b1a325ce113 Mon Sep 17 00:00:00 2001 From: Darafei Praliaskouski Date: Fri, 29 Dec 2017 17:39:36 +0300 Subject: [PATCH 04/10] Update lwgeom_regress_expected --- regress/lwgeom_regress_expected | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/regress/lwgeom_regress_expected b/regress/lwgeom_regress_expected index 268e3497c39..93a991214f2 100644 --- a/regress/lwgeom_regress_expected +++ b/regress/lwgeom_regress_expected @@ -32,4 +32,4 @@ ST_Angle_3_pts|1.5707963267949 ERROR: Operation on mixed SRID geometries ERROR: Empty geometry ST_Angle_2_lines|4.71238898038469 -#9365|25|25 +#3965|25|25 From cc8d0a18b0ce621dfd7c78cbe959f573cf9e4f39 Mon Sep 17 00:00:00 2001 From: Darafei Praliaskouski Date: Fri, 29 Dec 2017 23:57:04 +0300 Subject: [PATCH 05/10] [travis][codecov] run postgres with travis uid so that sql tests count in coverage --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index dccfde79dbb..c24ef0a395e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,6 +14,10 @@ addons: before_install: - sudo sh -c "echo /usr/lib/libeatmydata/libeatmydata.so >> /etc/ld.so.preload" + - sudo service postgresql stop 9.6 + - sudo find /etc -user postgres | xargs sudo chown travis + - sudo usermod -u 1000 postgres + - sudo service postgresql start 9.6 - sudo add-apt-repository --yes ppa:ubuntugis/ppa - sudo add-apt-repository --yes ppa:ubuntugis/ubuntugis-unstable - sudo apt-get update -qq From ccc494bf4d7878603d342d0ad0924a44ea2d7ca1 Mon Sep 17 00:00:00 2001 From: Darafei Praliaskouski Date: Sat, 30 Dec 2017 00:03:17 +0300 Subject: [PATCH 06/10] Update .travis.yml --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index c24ef0a395e..7c1984efc1b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,6 +16,7 @@ before_install: - sudo sh -c "echo /usr/lib/libeatmydata/libeatmydata.so >> /etc/ld.so.preload" - sudo service postgresql stop 9.6 - sudo find /etc -user postgres | xargs sudo chown travis + - sudo find /var/lib/postgresql -user postgres | xargs sudo chown travis - sudo usermod -u 1000 postgres - sudo service postgresql start 9.6 - sudo add-apt-repository --yes ppa:ubuntugis/ppa From aada2df52a77921a8b67e357d289e578256354af Mon Sep 17 00:00:00 2001 From: Darafei Praliaskouski Date: Sat, 30 Dec 2017 00:04:24 +0300 Subject: [PATCH 07/10] Update .travis.yml --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 7c1984efc1b..650b46451b8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,6 +17,7 @@ before_install: - sudo service postgresql stop 9.6 - sudo find /etc -user postgres | xargs sudo chown travis - sudo find /var/lib/postgresql -user postgres | xargs sudo chown travis + - sudo find /var/log/postgresql -user postgres | xargs sudo chown travis - sudo usermod -u 1000 postgres - sudo service postgresql start 9.6 - sudo add-apt-repository --yes ppa:ubuntugis/ppa From 464680d7112084440969cb6b95cce7614c9cf560 Mon Sep 17 00:00:00 2001 From: Darafei Praliaskouski Date: Sat, 30 Dec 2017 00:15:35 +0300 Subject: [PATCH 08/10] Update .travis.yml --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 650b46451b8..693564d705f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,8 +16,7 @@ before_install: - sudo sh -c "echo /usr/lib/libeatmydata/libeatmydata.so >> /etc/ld.so.preload" - sudo service postgresql stop 9.6 - sudo find /etc -user postgres | xargs sudo chown travis - - sudo find /var/lib/postgresql -user postgres | xargs sudo chown travis - - sudo find /var/log/postgresql -user postgres | xargs sudo chown travis + - sudo find /var -user postgres | xargs sudo chown travis - sudo usermod -u 1000 postgres - sudo service postgresql start 9.6 - sudo add-apt-repository --yes ppa:ubuntugis/ppa From 180479c687000b5a243ecc47e46c6bc6c3eb5e63 Mon Sep 17 00:00:00 2001 From: Darafei Praliaskouski Date: Sat, 30 Dec 2017 00:21:23 +0300 Subject: [PATCH 09/10] Update .travis.yml --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 693564d705f..8434d6c3e5a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,6 +18,7 @@ before_install: - sudo find /etc -user postgres | xargs sudo chown travis - sudo find /var -user postgres | xargs sudo chown travis - sudo usermod -u 1000 postgres + - sudo adduser travis ssl-cert - sudo service postgresql start 9.6 - sudo add-apt-repository --yes ppa:ubuntugis/ppa - sudo add-apt-repository --yes ppa:ubuntugis/ubuntugis-unstable From 875fc51a4cd6018910968071e0b80b20a73093cd Mon Sep 17 00:00:00 2001 From: Darafei Praliaskouski Date: Sat, 30 Dec 2017 01:19:50 +0300 Subject: [PATCH 10/10] Update NEWS --- NEWS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/NEWS b/NEWS index d6408a749f5..d929af06292 100644 --- a/NEWS +++ b/NEWS @@ -29,6 +29,8 @@ PostGIS 2.5.0 - #3097, Really allow MULTILINESTRING blades in ST_Split() (Paul Ramsey) - #3942, geojson: Do not include private header for json-c >= 0.13 (Björn Esser) - #3954, ST_GeometricMedian now supports point weights (Darafei Praliaskouski) + - #3965, ST_ClusterKMeans used to lose some clusters on initialization + (Darafei Praliaskouski) PostGIS 2.4.0