Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 544bbdb

Browse files
feodorfeodor
committed
improve tests
1 parent 83e97c0 commit 544bbdb

File tree

5 files changed

+167
-1
lines changed

5 files changed

+167
-1
lines changed

‎expected/altorder.out

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,33 @@ SELECT count(*) FROM atsts WHERE d > '2016-05-16 14:21:25';
8585
153
8686
(1 row)
8787

88+
SELECT id, d FROM atsts WHERE t @@ 'wr&qh' AND d <= '2016-05-16 14:21:25' ORDER BY d;
89+
id | d
90+
-----+---------------------------------
91+
16 | Mon May 02 11:21:22.326724 2016
92+
39 | Tue May 03 10:21:22.326724 2016
93+
71 | Wed May 04 18:21:22.326724 2016
94+
135 | Sat May 07 10:21:22.326724 2016
95+
168 | Sun May 08 19:21:22.326724 2016
96+
232 | Wed May 11 11:21:22.326724 2016
97+
252 | Thu May 12 07:21:22.326724 2016
98+
354 | Mon May 16 13:21:22.326724 2016
99+
355 | Mon May 16 14:21:22.326724 2016
100+
(9 rows)
101+
102+
SELECT id, d FROM atsts WHERE t @@ 'wr&qh' AND d >= '2016-05-16 14:21:25' ORDER BY d;
103+
id | d
104+
-----+---------------------------------
105+
371 | Tue May 17 06:21:22.326724 2016
106+
406 | Wed May 18 17:21:22.326724 2016
107+
415 | Thu May 19 02:21:22.326724 2016
108+
428 | Thu May 19 15:21:22.326724 2016
109+
457 | Fri May 20 20:21:22.326724 2016
110+
458 | Fri May 20 21:21:22.326724 2016
111+
484 | Sat May 21 23:21:22.326724 2016
112+
496 | Sun May 22 11:21:22.326724 2016
113+
(8 rows)
114+
88115
RESET enable_indexscan;
89116
RESET enable_indexonlyscan;
90117
RESET enable_bitmapscan;
@@ -249,3 +276,50 @@ SELECT id, d, d <=> '2016-05-16 14:21:25' FROM atsts ORDER BY d <=> '2016-05-16
249276
353 | Mon May 16 12:21:22.326724 2016 | 7202.673276
250277
(5 rows)
251278

279+
EXPLAIN (costs off)
280+
SELECT id, d FROM atsts WHERE t @@ 'wr&qh' AND d <= '2016-05-16 14:21:25' ORDER BY d;
281+
QUERY PLAN
282+
----------------------------------------------------------------------------------------------------------------------------
283+
Sort
284+
Sort Key: d
285+
-> Index Scan using atsts_idx on atsts
286+
Index Cond: ((t @@ '''wr'' & ''qh'''::tsquery) AND (d <= 'Mon May 16 14:21:25 2016'::timestamp without time zone))
287+
(4 rows)
288+
289+
SELECT id, d FROM atsts WHERE t @@ 'wr&qh' AND d <= '2016-05-16 14:21:25' ORDER BY d;
290+
id | d
291+
-----+---------------------------------
292+
16 | Mon May 02 11:21:22.326724 2016
293+
39 | Tue May 03 10:21:22.326724 2016
294+
71 | Wed May 04 18:21:22.326724 2016
295+
135 | Sat May 07 10:21:22.326724 2016
296+
168 | Sun May 08 19:21:22.326724 2016
297+
232 | Wed May 11 11:21:22.326724 2016
298+
252 | Thu May 12 07:21:22.326724 2016
299+
354 | Mon May 16 13:21:22.326724 2016
300+
355 | Mon May 16 14:21:22.326724 2016
301+
(9 rows)
302+
303+
EXPLAIN (costs off)
304+
SELECT id, d FROM atsts WHERE t @@ 'wr&qh' AND d >= '2016-05-16 14:21:25' ORDER BY d;
305+
QUERY PLAN
306+
----------------------------------------------------------------------------------------------------------------------------
307+
Sort
308+
Sort Key: d
309+
-> Index Scan using atsts_idx on atsts
310+
Index Cond: ((t @@ '''wr'' & ''qh'''::tsquery) AND (d >= 'Mon May 16 14:21:25 2016'::timestamp without time zone))
311+
(4 rows)
312+
313+
SELECT id, d FROM atsts WHERE t @@ 'wr&qh' AND d >= '2016-05-16 14:21:25' ORDER BY d;
314+
id | d
315+
-----+---------------------------------
316+
371 | Tue May 17 06:21:22.326724 2016
317+
406 | Wed May 18 17:21:22.326724 2016
318+
415 | Thu May 19 02:21:22.326724 2016
319+
428 | Thu May 19 15:21:22.326724 2016
320+
457 | Fri May 20 20:21:22.326724 2016
321+
458 | Fri May 20 21:21:22.326724 2016
322+
484 | Sat May 21 23:21:22.326724 2016
323+
496 | Sun May 22 11:21:22.326724 2016
324+
(8 rows)
325+

‎expected/orderby.out

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,33 @@ SELECT id, d, d |=> '2016-05-16 14:21:25' FROM tsts WHERE t @@ 'wr&qh' ORDER BY
7373
457 | Fri May 20 20:21:22.326724 2016 | 367197.326724
7474
(5 rows)
7575

76+
SELECT id, d FROM tsts WHERE t @@ 'wr&qh' AND d <= '2016-05-16 14:21:25' ORDER BY d;
77+
id | d
78+
-----+---------------------------------
79+
16 | Mon May 02 11:21:22.326724 2016
80+
39 | Tue May 03 10:21:22.326724 2016
81+
71 | Wed May 04 18:21:22.326724 2016
82+
135 | Sat May 07 10:21:22.326724 2016
83+
168 | Sun May 08 19:21:22.326724 2016
84+
232 | Wed May 11 11:21:22.326724 2016
85+
252 | Thu May 12 07:21:22.326724 2016
86+
354 | Mon May 16 13:21:22.326724 2016
87+
355 | Mon May 16 14:21:22.326724 2016
88+
(9 rows)
89+
90+
SELECT id, d FROM tsts WHERE t @@ 'wr&qh' AND d >= '2016-05-16 14:21:25' ORDER BY d;
91+
id | d
92+
-----+---------------------------------
93+
371 | Tue May 17 06:21:22.326724 2016
94+
406 | Wed May 18 17:21:22.326724 2016
95+
415 | Thu May 19 02:21:22.326724 2016
96+
428 | Thu May 19 15:21:22.326724 2016
97+
457 | Fri May 20 20:21:22.326724 2016
98+
458 | Fri May 20 21:21:22.326724 2016
99+
484 | Sat May 21 23:21:22.326724 2016
100+
496 | Sun May 22 11:21:22.326724 2016
101+
(8 rows)
102+
76103
RESET enable_indexscan;
77104
RESET enable_indexonlyscan;
78105
RESET enable_bitmapscan;
@@ -203,3 +230,50 @@ SELECT id, d, d <=> '2016-05-16 14:21:25' FROM tsts ORDER BY d <=> '2016-05-16 1
203230
353 | Mon May 16 12:21:22.326724 2016 | 7202.673276
204231
(5 rows)
205232

233+
EXPLAIN (costs off)
234+
SELECT id, d FROM tsts WHERE t @@ 'wr&qh' AND d <= '2016-05-16 14:21:25' ORDER BY d;
235+
QUERY PLAN
236+
----------------------------------------------------------------------------------------------------------------------------
237+
Sort
238+
Sort Key: d
239+
-> Index Scan using tsts_idx on tsts
240+
Index Cond: ((t @@ '''wr'' & ''qh'''::tsquery) AND (d <= 'Mon May 16 14:21:25 2016'::timestamp without time zone))
241+
(4 rows)
242+
243+
SELECT id, d FROM tsts WHERE t @@ 'wr&qh' AND d <= '2016-05-16 14:21:25' ORDER BY d;
244+
id | d
245+
-----+---------------------------------
246+
16 | Mon May 02 11:21:22.326724 2016
247+
39 | Tue May 03 10:21:22.326724 2016
248+
71 | Wed May 04 18:21:22.326724 2016
249+
135 | Sat May 07 10:21:22.326724 2016
250+
168 | Sun May 08 19:21:22.326724 2016
251+
232 | Wed May 11 11:21:22.326724 2016
252+
252 | Thu May 12 07:21:22.326724 2016
253+
354 | Mon May 16 13:21:22.326724 2016
254+
355 | Mon May 16 14:21:22.326724 2016
255+
(9 rows)
256+
257+
EXPLAIN (costs off)
258+
SELECT id, d FROM tsts WHERE t @@ 'wr&qh' AND d >= '2016-05-16 14:21:25' ORDER BY d;
259+
QUERY PLAN
260+
----------------------------------------------------------------------------------------------------------------------------
261+
Sort
262+
Sort Key: d
263+
-> Index Scan using tsts_idx on tsts
264+
Index Cond: ((t @@ '''wr'' & ''qh'''::tsquery) AND (d >= 'Mon May 16 14:21:25 2016'::timestamp without time zone))
265+
(4 rows)
266+
267+
SELECT id, d FROM tsts WHERE t @@ 'wr&qh' AND d >= '2016-05-16 14:21:25' ORDER BY d;
268+
id | d
269+
-----+---------------------------------
270+
371 | Tue May 17 06:21:22.326724 2016
271+
406 | Wed May 18 17:21:22.326724 2016
272+
415 | Thu May 19 02:21:22.326724 2016
273+
428 | Thu May 19 15:21:22.326724 2016
274+
457 | Fri May 20 20:21:22.326724 2016
275+
458 | Fri May 20 21:21:22.326724 2016
276+
484 | Sat May 21 23:21:22.326724 2016
277+
496 | Sun May 22 11:21:22.326724 2016
278+
(8 rows)
279+

‎rumscan.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -556,7 +556,6 @@ rumNewScanKey(IndexScanDesc scan)
556556
so->nkeys = nkeys;
557557
}
558558

559-
560559
/* initialize expansible array of RumScanEntry pointers */
561560
so->totalentries = 0;
562561
so->allocentries = 32;

‎sql/altorder.sql

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ SELECT id, d, d |=> '2016-05-16 14:21:25' FROM atsts WHERE t @@ 'wr&qh' ORDER BY
2727
SELECT count(*) FROM atsts WHERE d < '2016-05-16 14:21:25';
2828
SELECT count(*) FROM atsts WHERE d > '2016-05-16 14:21:25';
2929

30+
SELECT id, d FROM atsts WHERE t @@ 'wr&qh' AND d <= '2016-05-16 14:21:25' ORDER BY d;
31+
SELECT id, d FROM atsts WHERE t @@ 'wr&qh' AND d >= '2016-05-16 14:21:25' ORDER BY d;
3032

3133
RESET enable_indexscan;
3234
RESET enable_indexonlyscan;
@@ -63,3 +65,11 @@ SELECT id, d, d |=> '2016-05-16 14:21:25' FROM atsts WHERE t @@ 'wr&qh' ORDER BY
6365
EXPLAIN (costs off)
6466
SELECT id, d, d <=> '2016-05-16 14:21:25' FROM atsts ORDER BY d <=> '2016-05-16 14:21:25' LIMIT 5;
6567
SELECT id, d, d <=> '2016-05-16 14:21:25' FROM atsts ORDER BY d <=> '2016-05-16 14:21:25' LIMIT 5;
68+
69+
EXPLAIN (costs off)
70+
SELECT id, d FROM atsts WHERE t @@ 'wr&qh' AND d <= '2016-05-16 14:21:25' ORDER BY d;
71+
SELECT id, d FROM atsts WHERE t @@ 'wr&qh' AND d <= '2016-05-16 14:21:25' ORDER BY d;
72+
EXPLAIN (costs off)
73+
SELECT id, d FROM atsts WHERE t @@ 'wr&qh' AND d >= '2016-05-16 14:21:25' ORDER BY d;
74+
SELECT id, d FROM atsts WHERE t @@ 'wr&qh' AND d >= '2016-05-16 14:21:25' ORDER BY d;
75+

‎sql/orderby.sql

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ SET enable_bitmapscan=OFF;
2323
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;
2424
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;
2525
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;
26+
SELECT id, d FROM tsts WHERE t @@ 'wr&qh' AND d <= '2016-05-16 14:21:25' ORDER BY d;
27+
SELECT id, d FROM tsts WHERE t @@ 'wr&qh' AND d >= '2016-05-16 14:21:25' ORDER BY d;
2628

2729

2830
RESET enable_indexscan;
@@ -52,3 +54,10 @@ SELECT id, d, d |=> '2016-05-16 14:21:25' FROM tsts WHERE t @@ 'wr&qh' ORDER BY
5254
EXPLAIN (costs off)
5355
SELECT id, d, d <=> '2016-05-16 14:21:25' FROM tsts ORDER BY d <=> '2016-05-16 14:21:25' LIMIT 5;
5456
SELECT id, d, d <=> '2016-05-16 14:21:25' FROM tsts ORDER BY d <=> '2016-05-16 14:21:25' LIMIT 5;
57+
58+
EXPLAIN (costs off)
59+
SELECT id, d FROM tsts WHERE t @@ 'wr&qh' AND d <= '2016-05-16 14:21:25' ORDER BY d;
60+
SELECT id, d FROM tsts WHERE t @@ 'wr&qh' AND d <= '2016-05-16 14:21:25' ORDER BY d;
61+
EXPLAIN (costs off)
62+
SELECT id, d FROM tsts WHERE t @@ 'wr&qh' AND d >= '2016-05-16 14:21:25' ORDER BY d;
63+
SELECT id, d FROM tsts WHERE t @@ 'wr&qh' AND d >= '2016-05-16 14:21:25' ORDER BY d;

0 commit comments

Comments
 (0)