Fix tests

Artur Zakirov · Artur Zakirov · commit 790c36229081 · 2016-05-30T13:03:23.000+03:00
diff --git a/expected/orderby.out b/expected/orderby.out
@@ -184,7 +184,22 @@ SELECT id, d, d |-> '2016-05-16 14:21:25' FROM tsts WHERE t @@ 'wr&qh' ORDER BY
  457 | Fri May 20 20:21:22.326724 2016 | 367197.326724
 (5 rows)
 
---to be fixed
---EXPLAIN (costs off)
---SELECT id, d, d <-> '2016-05-16 14:21:25' FROM tsts ORDER BY d <-> '2016-05-16 14:21:25' LIMIT 5;
---SELECT id, d, d <-> '2016-05-16 14:21:25' FROM tsts ORDER BY d <-> '2016-05-16 14:21:25' LIMIT 5;
+EXPLAIN (costs off)
+SELECT id, d, d <-> '2016-05-16 14:21:25' FROM tsts ORDER BY d <-> '2016-05-16 14:21:25' LIMIT 5;
+                                    QUERY PLAN                                     
+-----------------------------------------------------------------------------------
+ Limit
+   ->  Index Scan using tsts_idx on tsts
+         Order By: (d <-> 'Mon May 16 14:21:25 2016'::timestamp without time zone)
+(3 rows)
+
+SELECT id, d, d <-> '2016-05-16 14:21:25' FROM tsts ORDER BY d <-> '2016-05-16 14:21:25' LIMIT 5;
+ id  |                d                | ?column? 
+-----+---------------------------------+----------
+ 355 | Mon May 16 14:21:22.326724 2016 | 2.673276
+ 355 | Mon May 16 14:21:22.326724 2016 | 2.673276
+ 355 | Mon May 16 14:21:22.326724 2016 | 2.673276
+ 355 | Mon May 16 14:21:22.326724 2016 | 2.673276
+ 355 | Mon May 16 14:21:22.326724 2016 | 2.673276
+(5 rows)
+
diff --git a/rumget.c b/rumget.c
@@ -1655,6 +1655,9 @@ preConsistentCheck(RumScanOpaque so)
 		if (key->orderBy)
 			continue;
 
+		if (key->searchMode == GIN_SEARCH_MODE_EVERYTHING)
+			continue;
+
 		if (!so->rumstate.canPreConsistent[key->attnum - 1])
 			continue;
 
diff --git a/sql/orderby.sql b/sql/orderby.sql
@@ -49,8 +49,6 @@ EXPLAIN (costs off)
 SELECT id, d, d |-> '2016-05-16 14:21:25' FROM tsts WHERE t @@ 'wr&qh' ORDER BY d |-> '2016-05-16 14:21:25' LIMIT 5;
 SELECT id, d, d |-> '2016-05-16 14:21:25' FROM tsts WHERE t @@ 'wr&qh' ORDER BY d |-> '2016-05-16 14:21:25' LIMIT 5;
 
---to be fixed
---EXPLAIN (costs off)
---SELECT id, d, d <-> '2016-05-16 14:21:25' FROM tsts ORDER BY d <-> '2016-05-16 14:21:25' LIMIT 5;
---SELECT id, d, d <-> '2016-05-16 14:21:25' FROM tsts ORDER BY d <-> '2016-05-16 14:21:25' LIMIT 5;
-
+EXPLAIN (costs off)
+SELECT id, d, d <-> '2016-05-16 14:21:25' FROM tsts ORDER BY d <-> '2016-05-16 14:21:25' LIMIT 5;
+SELECT id, d, d <-> '2016-05-16 14:21:25' FROM tsts ORDER BY d <-> '2016-05-16 14:21:25' LIMIT 5;
