Skip to content

Commit 9bf66af

Browse files
antamelantamel
committed
PGPRO-12044: Fix output variants for 32-bit tests .
 Caused by: - 161320b4b960ee4fe918959be6529ae9b106ea5a (PostgreSQL) Adjust EXPLAIN's output for disabled nodes Tags: rum
1 parent 4d5a0ed commit 9bf66af

File tree

3 files changed

+64
-110
lines changed

3 files changed

+64
-110
lines changed

‎expected/altorder_1.out‎

Lines changed: 20 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -185,11 +185,10 @@ SELECT count(*) FROM atsts WHERE t @@ 'wr|qh';
185185
QUERY PLAN
186186
---------------------------------------------------
187187
Aggregate
188-
Disabled Nodes: 1
189188
-> Seq Scan on atsts
190-
Disabled Nodes: 1
189+
Disabled: true
191190
Filter: (t @@ '''wr'' | ''qh'''::tsquery)
192-
(5 rows)
191+
(4 rows)
193192

194193
SELECT count(*) FROM atsts WHERE t @@ 'wr|qh';
195194
count
@@ -232,11 +231,10 @@ SELECT count(*) FROM atsts WHERE d < '2016-05-16 14:21:25';
232231
QUERY PLAN
233232
-------------------------------------------------------------------------------
234233
Aggregate
235-
Disabled Nodes: 1
236234
-> Seq Scan on atsts
237-
Disabled Nodes: 1
235+
Disabled: true
238236
Filter: (d < 'Mon May 16 14:21:25 2016'::timestamp without time zone)
239-
(5 rows)
237+
(4 rows)
240238

241239
SELECT count(*) FROM atsts WHERE d < '2016-05-16 14:21:25';
242240
count
@@ -249,11 +247,10 @@ SELECT count(*) FROM atsts WHERE d > '2016-05-16 14:21:25';
249247
QUERY PLAN
250248
-------------------------------------------------------------------------------
251249
Aggregate
252-
Disabled Nodes: 1
253250
-> Seq Scan on atsts
254-
Disabled Nodes: 1
251+
Disabled: true
255252
Filter: (d > 'Mon May 16 14:21:25 2016'::timestamp without time zone)
256-
(5 rows)
253+
(4 rows)
257254

258255
SELECT count(*) FROM atsts WHERE d > '2016-05-16 14:21:25';
259256
count
@@ -270,14 +267,12 @@ SELECT id, d, d <=> '2016-05-16 14:21:25' FROM atsts WHERE t @@ 'wr&qh' ORDER BY
270267
QUERY PLAN
271268
-------------------------------------------------------------------------------------
272269
Limit
273-
Disabled Nodes: 1
274270
-> Sort
275-
Disabled Nodes: 1
276271
Sort Key: ((d <=> 'Mon May 16 14:21:25 2016'::timestamp without time zone))
277272
-> Seq Scan on atsts
278-
Disabled Nodes: 1
273+
Disabled: true
279274
Filter: (t @@ '''wr'' & ''qh'''::tsquery)
280-
(8 rows)
275+
(6 rows)
281276

282277
SELECT id, d, d <=> '2016-05-16 14:21:25' FROM atsts WHERE t @@ 'wr&qh' ORDER BY d <=> '2016-05-16 14:21:25' LIMIT 5;
283278
id | d | ?column?
@@ -294,14 +289,12 @@ SELECT id, d, d <=| '2016-05-16 14:21:25' FROM atsts WHERE t @@ 'wr&qh' ORDER BY
294289
QUERY PLAN
295290
-------------------------------------------------------------------------------------
296291
Limit
297-
Disabled Nodes: 1
298292
-> Sort
299-
Disabled Nodes: 1
300293
Sort Key: ((d <=| 'Mon May 16 14:21:25 2016'::timestamp without time zone))
301294
-> Seq Scan on atsts
302-
Disabled Nodes: 1
295+
Disabled: true
303296
Filter: (t @@ '''wr'' & ''qh'''::tsquery)
304-
(8 rows)
297+
(6 rows)
305298

306299
SELECT id, d, d <=| '2016-05-16 14:21:25' FROM atsts WHERE t @@ 'wr&qh' ORDER BY d <=| '2016-05-16 14:21:25' LIMIT 5;
307300
id | d | ?column?
@@ -318,14 +311,12 @@ SELECT id, d, d |=> '2016-05-16 14:21:25' FROM atsts WHERE t @@ 'wr&qh' ORDER BY
318311
QUERY PLAN
319312
-------------------------------------------------------------------------------------
320313
Limit
321-
Disabled Nodes: 1
322314
-> Sort
323-
Disabled Nodes: 1
324315
Sort Key: ((d |=> 'Mon May 16 14:21:25 2016'::timestamp without time zone))
325316
-> Seq Scan on atsts
326-
Disabled Nodes: 1
317+
Disabled: true
327318
Filter: (t @@ '''wr'' & ''qh'''::tsquery)
328-
(8 rows)
319+
(6 rows)
329320

330321
SELECT id, d, d |=> '2016-05-16 14:21:25' FROM atsts WHERE t @@ 'wr&qh' ORDER BY d |=> '2016-05-16 14:21:25' LIMIT 5;
331322
id | d | ?column?
@@ -342,13 +333,11 @@ SELECT id, d, d <=> '2016-05-16 14:21:25' FROM atsts ORDER BY d <=> '2016-05-16
342333
QUERY PLAN
343334
-------------------------------------------------------------------------------------
344335
Limit
345-
Disabled Nodes: 1
346336
-> Sort
347-
Disabled Nodes: 1
348337
Sort Key: ((d <=> 'Mon May 16 14:21:25 2016'::timestamp without time zone))
349338
-> Seq Scan on atsts
350-
Disabled Nodes: 1
351-
(7 rows)
339+
Disabled: true
340+
(5 rows)
352341

353342
SELECT id, d, d <=> '2016-05-16 14:21:25' FROM atsts ORDER BY d <=> '2016-05-16 14:21:25' LIMIT 5;
354343
id | d | ?column?
@@ -365,12 +354,11 @@ SELECT id, d FROM atsts WHERE t @@ 'wr&qh' AND d <= '2016-05-16 14:21:25' ORDER
365354
QUERY PLAN
366355
------------------------------------------------------------------------------------------------------------------------
367356
Sort
368-
Disabled Nodes: 1
369357
Sort Key: d
370358
-> Seq Scan on atsts
371-
Disabled Nodes: 1
359+
Disabled: true
372360
Filter: ((t @@ '''wr'' & ''qh'''::tsquery) AND (d <= 'Mon May 16 14:21:25 2016'::timestamp without time zone))
373-
(6 rows)
361+
(5 rows)
374362

375363
SELECT id, d FROM atsts WHERE t @@ 'wr&qh' AND d <= '2016-05-16 14:21:25' ORDER BY d;
376364
id | d
@@ -418,12 +406,11 @@ SELECT id, d FROM atsts WHERE t @@ 'wr&qh' AND d >= '2016-05-16 14:21:25' ORDER
418406
QUERY PLAN
419407
------------------------------------------------------------------------------------------------------------------------
420408
Sort
421-
Disabled Nodes: 1
422409
Sort Key: d
423410
-> Seq Scan on atsts
424-
Disabled Nodes: 1
411+
Disabled: true
425412
Filter: ((t @@ '''wr'' & ''qh'''::tsquery) AND (d >= 'Mon May 16 14:21:25 2016'::timestamp without time zone))
426-
(6 rows)
413+
(5 rows)
427414

428415
SELECT id, d FROM atsts WHERE t @@ 'wr&qh' AND d >= '2016-05-16 14:21:25' ORDER BY d;
429416
id | d
@@ -467,12 +454,11 @@ SELECT id, d FROM atsts WHERE t @@ 'wr&q:*' AND d >= '2016-05-16 14:21:25' ORDE
467454
QUERY PLAN
468455
-------------------------------------------------------------------------------------------------------------------------
469456
Sort
470-
Disabled Nodes: 1
471457
Sort Key: d
472458
-> Seq Scan on atsts
473-
Disabled Nodes: 1
459+
Disabled: true
474460
Filter: ((t @@ '''wr'' & ''q'':*'::tsquery) AND (d >= 'Mon May 16 14:21:25 2016'::timestamp without time zone))
475-
(6 rows)
461+
(5 rows)
476462

477463
SELECT id, d FROM atsts WHERE t @@ 'wr&q:*' AND d >= '2016-05-16 14:21:25' ORDER BY d;
478464
id | d

‎expected/altorder_hash_1.out‎

Lines changed: 18 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -130,11 +130,10 @@ SELECT count(*) FROM atstsh WHERE t @@ 'wr|qh';
130130
QUERY PLAN
131131
---------------------------------------------------
132132
Aggregate
133-
Disabled Nodes: 1
134133
-> Seq Scan on atstsh
135-
Disabled Nodes: 1
134+
Disabled: true
136135
Filter: (t @@ '''wr'' | ''qh'''::tsquery)
137-
(5 rows)
136+
(4 rows)
138137

139138
SELECT count(*) FROM atstsh WHERE t @@ 'wr|qh';
140139
count
@@ -177,11 +176,10 @@ SELECT count(*) FROM atstsh WHERE d < '2016-05-16 14:21:25';
177176
QUERY PLAN
178177
-------------------------------------------------------------------------------
179178
Aggregate
180-
Disabled Nodes: 1
181179
-> Seq Scan on atstsh
182-
Disabled Nodes: 1
180+
Disabled: true
183181
Filter: (d < 'Mon May 16 14:21:25 2016'::timestamp without time zone)
184-
(5 rows)
182+
(4 rows)
185183

186184
SELECT count(*) FROM atstsh WHERE d < '2016-05-16 14:21:25';
187185
count
@@ -194,11 +192,10 @@ SELECT count(*) FROM atstsh WHERE d > '2016-05-16 14:21:25';
194192
QUERY PLAN
195193
-------------------------------------------------------------------------------
196194
Aggregate
197-
Disabled Nodes: 1
198195
-> Seq Scan on atstsh
199-
Disabled Nodes: 1
196+
Disabled: true
200197
Filter: (d > 'Mon May 16 14:21:25 2016'::timestamp without time zone)
201-
(5 rows)
198+
(4 rows)
202199

203200
SELECT count(*) FROM atstsh WHERE d > '2016-05-16 14:21:25';
204201
count
@@ -215,14 +212,12 @@ SELECT id, d, d <=> '2016-05-16 14:21:25' FROM atstsh WHERE t @@ 'wr&qh' ORDER B
215212
QUERY PLAN
216213
-------------------------------------------------------------------------------------
217214
Limit
218-
Disabled Nodes: 1
219215
-> Sort
220-
Disabled Nodes: 1
221216
Sort Key: ((d <=> 'Mon May 16 14:21:25 2016'::timestamp without time zone))
222217
-> Seq Scan on atstsh
223-
Disabled Nodes: 1
218+
Disabled: true
224219
Filter: (t @@ '''wr'' & ''qh'''::tsquery)
225-
(8 rows)
220+
(6 rows)
226221

227222
SELECT id, d, d <=> '2016-05-16 14:21:25' FROM atstsh WHERE t @@ 'wr&qh' ORDER BY d <=> '2016-05-16 14:21:25' LIMIT 5;
228223
id | d | ?column?
@@ -239,14 +234,12 @@ SELECT id, d, d <=| '2016-05-16 14:21:25' FROM atstsh WHERE t @@ 'wr&qh' ORDER B
239234
QUERY PLAN
240235
-------------------------------------------------------------------------------------
241236
Limit
242-
Disabled Nodes: 1
243237
-> Sort
244-
Disabled Nodes: 1
245238
Sort Key: ((d <=| 'Mon May 16 14:21:25 2016'::timestamp without time zone))
246239
-> Seq Scan on atstsh
247-
Disabled Nodes: 1
240+
Disabled: true
248241
Filter: (t @@ '''wr'' & ''qh'''::tsquery)
249-
(8 rows)
242+
(6 rows)
250243

251244
SELECT id, d, d <=| '2016-05-16 14:21:25' FROM atstsh WHERE t @@ 'wr&qh' ORDER BY d <=| '2016-05-16 14:21:25' LIMIT 5;
252245
id | d | ?column?
@@ -263,14 +256,12 @@ SELECT id, d, d |=> '2016-05-16 14:21:25' FROM atstsh WHERE t @@ 'wr&qh' ORDER B
263256
QUERY PLAN
264257
-------------------------------------------------------------------------------------
265258
Limit
266-
Disabled Nodes: 1
267259
-> Sort
268-
Disabled Nodes: 1
269260
Sort Key: ((d |=> 'Mon May 16 14:21:25 2016'::timestamp without time zone))
270261
-> Seq Scan on atstsh
271-
Disabled Nodes: 1
262+
Disabled: true
272263
Filter: (t @@ '''wr'' & ''qh'''::tsquery)
273-
(8 rows)
264+
(6 rows)
274265

275266
SELECT id, d, d |=> '2016-05-16 14:21:25' FROM atstsh WHERE t @@ 'wr&qh' ORDER BY d |=> '2016-05-16 14:21:25' LIMIT 5;
276267
id | d | ?column?
@@ -287,13 +278,11 @@ SELECT id, d, d <=> '2016-05-16 14:21:25' FROM atstsh ORDER BY d <=> '2016-05-16
287278
QUERY PLAN
288279
-------------------------------------------------------------------------------------
289280
Limit
290-
Disabled Nodes: 1
291281
-> Sort
292-
Disabled Nodes: 1
293282
Sort Key: ((d <=> 'Mon May 16 14:21:25 2016'::timestamp without time zone))
294283
-> Seq Scan on atstsh
295-
Disabled Nodes: 1
296-
(7 rows)
284+
Disabled: true
285+
(5 rows)
297286

298287
SELECT id, d, d <=> '2016-05-16 14:21:25' FROM atstsh ORDER BY d <=> '2016-05-16 14:21:25' LIMIT 5;
299288
id | d | ?column?
@@ -310,12 +299,11 @@ SELECT id, d FROM atstsh WHERE t @@ 'wr&qh' AND d <= '2016-05-16 14:21:25' ORDE
310299
QUERY PLAN
311300
------------------------------------------------------------------------------------------------------------------------
312301
Sort
313-
Disabled Nodes: 1
314302
Sort Key: d
315303
-> Seq Scan on atstsh
316-
Disabled Nodes: 1
304+
Disabled: true
317305
Filter: ((t @@ '''wr'' & ''qh'''::tsquery) AND (d <= 'Mon May 16 14:21:25 2016'::timestamp without time zone))
318-
(6 rows)
306+
(5 rows)
319307

320308
SELECT id, d FROM atstsh WHERE t @@ 'wr&qh' AND d <= '2016-05-16 14:21:25' ORDER BY d;
321309
id | d
@@ -336,12 +324,11 @@ SELECT id, d FROM atstsh WHERE t @@ 'wr&qh' AND d >= '2016-05-16 14:21:25' ORDE
336324
QUERY PLAN
337325
------------------------------------------------------------------------------------------------------------------------
338326
Sort
339-
Disabled Nodes: 1
340327
Sort Key: d
341328
-> Seq Scan on atstsh
342-
Disabled Nodes: 1
329+
Disabled: true
343330
Filter: ((t @@ '''wr'' & ''qh'''::tsquery) AND (d >= 'Mon May 16 14:21:25 2016'::timestamp without time zone))
344-
(6 rows)
331+
(5 rows)
345332

346333
SELECT id, d FROM atstsh WHERE t @@ 'wr&qh' AND d >= '2016-05-16 14:21:25' ORDER BY d;
347334
id | d

0 commit comments

Comments
 (0)