Merge branch 'PGPROEE10' into PGPROEE10_test_xid-64

Author: Alexander Korotkov

contrib/rum/expected/array_1.out

@@ -525,14 +525,7 @@ EXPLAIN (COSTS OFF) SELECT * FROM test_array WHERE i && '{1}' ORDER BY add_info
 (4 rows)
 
 SELECT * FROM test_array WHERE i && '{1}' ORDER BY add_info <=> '2016-05-16 14:21:25' LIMIT 10;
-     i     |         add_info         
------------+--------------------------
- {1}       | Thu May 19 14:21:25 2016
- {1,2}     | Fri May 20 14:21:25 2016
- {1,2,3}   | Sat May 21 14:21:25 2016
- {1,2,3,4} | Sun May 22 14:21:25 2016
-(4 rows)
-
+ERROR:  doesn't support order by over pass-by-reference column
 DROP INDEX idx_array;
 /*
  * Sanity checks for popular array types.
@@ -841,3 +834,37 @@ EXPLAIN (COSTS OFF) SELECT * FROM test_array WHERE i % '{}';
 (2 rows)
 
 DROP INDEX idx_array;
+/*
+ * Check ordering using distance operator
+ */
+CREATE TABLE test_array_order (
+    i int2[]
+);
+\copy test_array_order(i) from 'data/rum_array.data';
+CREATE INDEX idx_array_order ON test_array_order USING rum (i rum_anyarray_ops);
+EXPLAIN (COSTS OFF)
+SELECT *, i <=> '{51}' from test_array_order WHERE i @> '{23,20}' order by i <=> '{51}';
+                      QUERY PLAN                      
+------------------------------------------------------
+ Index Scan using idx_array_order on test_array_order
+   Index Cond: (i @> '{23,20}'::smallint[])
+   Order By: (i <=> '{51}'::smallint[])
+(3 rows)
+
+SELECT *, i <=> '{51}' from test_array_order WHERE i @> '{23,20}' order by i <=> '{51}';
+          i          |     ?column?     
+---------------------+------------------
+ {20,23,51}          | 1.73205080756888
+ {33,51,20,77,23,65} | 2.44948974278318
+ {23,76,34,23,2,20}  |         Infinity
+ {20,60,45,23,29}    |         Infinity
+ {23,89,38,20,40,95} |         Infinity
+ {23,20,72}          |         Infinity
+ {73,23,20}          |         Infinity
+ {6,97,20,89,23}     |         Infinity
+ {20,98,30,23,1,66}  |         Infinity
+ {57,23,39,46,50,20} |         Infinity
+ {81,20,26,22,23}    |         Infinity
+ {18,23,10,90,15,20} |         Infinity
+(12 rows)
+

src/backend/commands/vacuum.c

@@ -639,7 +639,7 @@ vacuum_set_xid_limits(Relation rel,
 
 	if (xidFullScanLimit != NULL)
 	{
-		int			freezetable;
+		int64		freezetable;
 
 		Assert(mxactFullScanLimit != NULL);