knn_recheck: Force row_number order in all axis

Fixes failing tests in PG11 due to parallel INSERT INTO * SELECT
postgis · Jan 10, 2018 · eba5211 · eba5211
1 parent 8bd5d2e
commit eba5211
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 17 deletions.
diff --git a/regress/knn_recheck.sql b/regress/knn_recheck.sql
@@ -139,7 +139,7 @@ DELETE FROM spatial_ref_sys WHERE srid = 4326;
 -- create table and load
 CREATE TABLE knn_recheck_geom_nd(gid serial primary key, geom geometry);
 INSERT INTO knn_recheck_geom_nd(gid,geom)
-SELECT ROW_NUMBER() OVER(ORDER BY x,y) AS gid, ST_MakePoint(x*0.777,y*0.887,z*1.05) As geom
+SELECT ROW_NUMBER() OVER(ORDER BY x,y,z) AS gid, ST_MakePoint(x*0.777,y*0.887,z*1.05) As geom
 FROM generate_series(-100,1000, 7) AS x , 
     generate_series(-300,1000,9) As y,
  generate_series(1005,10000,5555) As z ;

diff --git a/regress/knn_recheck_expected b/regress/knn_recheck_expected
@@ -62,43 +62,43 @@
 #2g|30512|25313.2118|25313.2118
 #3g|1000|t
 #3g|500000|t
-#1nd-3|290|260.6797|260.6797
+#1nd-3|289|260.6797|260.6797
 #1nd-3|287|264.3000|264.3000
 #1nd-3|579|265.4356|265.4356
 #1nd-3|285|268.1092|268.1092
-#1nd-3|578|268.9919|268.9919
+#1nd-3|577|268.9919|268.9919
 #2nd-3|9749|3.7272|3.7272
 #2nd-3|600001|3.9451|3.9451
 #2nd-3|600002|3.9950|3.9950
-#2nd-3|9748|4.1707|4.1707
-#2nd-3|10040|6.1761|6.1761
-#3nd-3|1|292|5.4390|5.4390
+#2nd-3|9747|4.1707|4.1707
+#2nd-3|10039|6.1761|6.1761
+#3nd-3|1|291|5.4390|5.4390
 #3nd-3|1|3|7.9830|7.9830
-#3nd-3|1|294|9.6598|9.6598
-#3nd-3|1|582|10.8780|10.8780
+#3nd-3|1|293|9.6598|9.6598
+#3nd-3|1|581|10.8780|10.8780
 #3nd-3|1|583|13.4929|13.4929
 #3nd-3|600001|600002|0.0000|0.0000
-#3nd-3|600001|9752|54.2730|54.2730
+#3nd-3|600001|9751|54.2730|54.2730
 #3nd-3|600001|9461|54.3900|54.3900
 #3nd-3|600001|9749|54.5453|54.5453
 #3nd-3|600001|10041|54.6233|54.6233
-#1nd-3|290|260.6797|260.6797
+#1nd-3|289|260.6797|260.6797
 #1nd-3|287|264.3000|264.3000
 #1nd-3|579|265.4356|265.4356
 #1nd-3|285|268.1092|268.1092
-#1nd-3|578|268.9919|268.9919
+#1nd-3|577|268.9919|268.9919
 #2nd-3|9749|3.7272|3.7272
 #2nd-3|600001|3.9451|3.9451
 #2nd-3|600002|3.9950|3.9950
-#2nd-3|9748|4.1707|4.1707
-#2nd-3|10040|6.1761|6.1761
-#3nd-3|1|292|5.4390|5.4390
+#2nd-3|9747|4.1707|4.1707
+#2nd-3|10039|6.1761|6.1761
+#3nd-3|1|291|5.4390|5.4390
 #3nd-3|1|3|7.9830|7.9830
-#3nd-3|1|294|9.6598|9.6598
-#3nd-3|1|582|10.8780|10.8780
+#3nd-3|1|293|9.6598|9.6598
+#3nd-3|1|581|10.8780|10.8780
 #3nd-3|1|583|13.4929|13.4929
 #3nd-3|600001|600002|0.0000|0.0000
-#3nd-3|600001|9752|54.2730|54.2730
+#3nd-3|600001|9751|54.2730|54.2730
 #3nd-3|600001|9461|54.3900|54.3900
 #3nd-3|600001|9749|54.5453|54.5453
 #3nd-3|600001|10041|54.6233|54.6233