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

Commit 34be4b1

Browse files
vbwagnervbwagner
committed
Merge branch 'PGPROEE9_6' into PGPROEE9_6_MULTIMASTER
2 parents c8a9610 + c341722 commit 34be4b1

34 files changed

+3697
-3035
lines changed

‎contrib/pg_hint_plan/expected/pg_hint_plan.out

Lines changed: 169 additions & 190 deletions
Large diffs are not rendered by default.

‎contrib/pg_hint_plan/expected/ut-G.out

Lines changed: 72 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -15,22 +15,22 @@ LOG: statement: EXPLAIN (COSTS false) UPDATE s1.r1 SET c1 = c1 WHERE c1 = 1 AND
1515
Aggregate
1616
-> Nested Loop
1717
Join Filter: (t1.c1 = t4.c1)
18-
-> Tid Scan on t4
19-
TID Cond: (ctid = '(1,1)'::tid)
2018
-> Nested Loop
2119
Join Filter: (t1.c1 = t3.c1)
22-
-> Tid Scan on t3
23-
TID Cond: (ctid = '(1,1)'::tid)
2420
-> Nested Loop
2521
Join Filter: (t1.c1 = t2.c1)
26-
-> Seq Scan on t2
27-
Filter: (ctid = '(1,1)'::tid)
2822
-> Nested Loop
2923
-> Tid Scan on r1
3024
TID Cond: (ctid = '(1,1)'::tid)
3125
Filter: (c1 = 1)
3226
-> Tid Scan on t1
3327
TID Cond: (ctid = '(1,1)'::tid)
28+
-> Seq Scan on t2
29+
Filter: (ctid = '(1,1)'::tid)
30+
-> Tid Scan on t3
31+
TID Cond: (ctid = '(1,1)'::tid)
32+
-> Tid Scan on t4
33+
TID Cond: (ctid = '(1,1)'::tid)
3434
(19 rows)
3535

3636
/*+
@@ -81,22 +81,22 @@ LOG: statement: EXPLAIN (COSTS false) UPDATE s1.r1_ SET c1 = c1 WHERE c1 = 1 AN
8181
Aggregate
8282
-> Nested Loop
8383
Join Filter: (b1t1.c1 = b1t4.c1)
84-
-> Tid Scan on t4 b1t4
85-
TID Cond: (ctid = '(1,1)'::tid)
8684
-> Nested Loop
8785
Join Filter: (b1t1.c1 = b1t3.c1)
88-
-> Tid Scan on t3 b1t3
89-
TID Cond: (ctid = '(1,1)'::tid)
9086
-> Nested Loop
9187
Join Filter: (b1t1.c1 = b1t2.c1)
92-
-> Seq Scan on t2 b1t2
93-
Filter: (ctid = '(1,1)'::tid)
9488
-> Nested Loop
9589
-> Tid Scan on r1_
9690
TID Cond: (ctid = '(1,1)'::tid)
9791
Filter: (c1 = 1)
9892
-> Tid Scan on t1 b1t1
9993
TID Cond: (ctid = '(1,1)'::tid)
94+
-> Seq Scan on t2 b1t2
95+
Filter: (ctid = '(1,1)'::tid)
96+
-> Tid Scan on t3 b1t3
97+
TID Cond: (ctid = '(1,1)'::tid)
98+
-> Tid Scan on t4 b1t4
99+
TID Cond: (ctid = '(1,1)'::tid)
100100
(19 rows)
101101

102102
/*+
@@ -148,42 +148,42 @@ LOG: statement: EXPLAIN (COSTS false) UPDATE s1.r2 SET c1 = c1 WHERE c1 = 1 AND
148148
Aggregate
149149
-> Nested Loop
150150
Join Filter: (t1.c1 = t4.c1)
151-
-> Tid Scan on t4
152-
TID Cond: (ctid = '(1,1)'::tid)
153151
-> Nested Loop
154152
Join Filter: (t1.c1 = t3.c1)
155-
-> Tid Scan on t3
156-
TID Cond: (ctid = '(1,1)'::tid)
157153
-> Nested Loop
158154
Join Filter: (t1.c1 = t2.c1)
159-
-> Seq Scan on t2
160-
Filter: (ctid = '(1,1)'::tid)
161155
-> Nested Loop
162156
-> Tid Scan on r2
163157
TID Cond: (ctid = '(1,1)'::tid)
164158
Filter: (c1 = 1)
165159
-> Tid Scan on t1
166160
TID Cond: (ctid = '(1,1)'::tid)
161+
-> Seq Scan on t2
162+
Filter: (ctid = '(1,1)'::tid)
163+
-> Tid Scan on t3
164+
TID Cond: (ctid = '(1,1)'::tid)
165+
-> Tid Scan on t4
166+
TID Cond: (ctid = '(1,1)'::tid)
167167

168168
Aggregate
169169
-> Nested Loop
170170
Join Filter: (t1.c1 = t4.c1)
171-
-> Tid Scan on t4
172-
TID Cond: (ctid = '(1,1)'::tid)
173171
-> Nested Loop
174172
Join Filter: (t1.c1 = t3.c1)
175-
-> Tid Scan on t3
176-
TID Cond: (ctid = '(1,1)'::tid)
177173
-> Nested Loop
178174
Join Filter: (t1.c1 = t2.c1)
179-
-> Seq Scan on t2
180-
Filter: (ctid = '(1,1)'::tid)
181175
-> Nested Loop
182176
-> Tid Scan on r2
183177
TID Cond: (ctid = '(1,1)'::tid)
184178
Filter: (c1 = 1)
185179
-> Tid Scan on t1
186180
TID Cond: (ctid = '(1,1)'::tid)
181+
-> Seq Scan on t2
182+
Filter: (ctid = '(1,1)'::tid)
183+
-> Tid Scan on t3
184+
TID Cond: (ctid = '(1,1)'::tid)
185+
-> Tid Scan on t4
186+
TID Cond: (ctid = '(1,1)'::tid)
187187
(39 rows)
188188

189189
/*+
@@ -264,42 +264,42 @@ LOG: statement: EXPLAIN (COSTS false) UPDATE s1.r2_ SET c1 = c1 WHERE c1 = 1 AN
264264
Aggregate
265265
-> Nested Loop
266266
Join Filter: (b1t1.c1 = b1t4.c1)
267-
-> Tid Scan on t4 b1t4
268-
TID Cond: (ctid = '(1,1)'::tid)
269267
-> Nested Loop
270268
Join Filter: (b1t1.c1 = b1t3.c1)
271-
-> Tid Scan on t3 b1t3
272-
TID Cond: (ctid = '(1,1)'::tid)
273269
-> Nested Loop
274270
Join Filter: (b1t1.c1 = b1t2.c1)
275-
-> Seq Scan on t2 b1t2
276-
Filter: (ctid = '(1,1)'::tid)
277271
-> Nested Loop
278272
-> Tid Scan on r2_
279273
TID Cond: (ctid = '(1,1)'::tid)
280274
Filter: (c1 = 1)
281275
-> Tid Scan on t1 b1t1
282276
TID Cond: (ctid = '(1,1)'::tid)
277+
-> Seq Scan on t2 b1t2
278+
Filter: (ctid = '(1,1)'::tid)
279+
-> Tid Scan on t3 b1t3
280+
TID Cond: (ctid = '(1,1)'::tid)
281+
-> Tid Scan on t4 b1t4
282+
TID Cond: (ctid = '(1,1)'::tid)
283283

284284
Aggregate
285285
-> Nested Loop
286286
Join Filter: (b2t1.c1 = b2t4.c1)
287-
-> Tid Scan on t4 b2t4
288-
TID Cond: (ctid = '(1,1)'::tid)
289287
-> Nested Loop
290288
Join Filter: (b2t1.c1 = b2t3.c1)
291-
-> Tid Scan on t3 b2t3
292-
TID Cond: (ctid = '(1,1)'::tid)
293289
-> Nested Loop
294290
Join Filter: (b2t1.c1 = b2t2.c1)
295-
-> Seq Scan on t2 b2t2
296-
Filter: (ctid = '(1,1)'::tid)
297291
-> Nested Loop
298292
-> Tid Scan on r2_
299293
TID Cond: (ctid = '(1,1)'::tid)
300294
Filter: (c1 = 1)
301295
-> Tid Scan on t1 b2t1
302296
TID Cond: (ctid = '(1,1)'::tid)
297+
-> Seq Scan on t2 b2t2
298+
Filter: (ctid = '(1,1)'::tid)
299+
-> Tid Scan on t3 b2t3
300+
TID Cond: (ctid = '(1,1)'::tid)
301+
-> Tid Scan on t4 b2t4
302+
TID Cond: (ctid = '(1,1)'::tid)
303303
(39 rows)
304304

305305
/*+
@@ -381,62 +381,62 @@ LOG: statement: EXPLAIN (COSTS false) UPDATE s1.r3 SET c1 = c1 WHERE c1 = 1 AND
381381
Aggregate
382382
-> Nested Loop
383383
Join Filter: (t1.c1 = t4.c1)
384-
-> Tid Scan on t4
385-
TID Cond: (ctid = '(1,1)'::tid)
386384
-> Nested Loop
387385
Join Filter: (t1.c1 = t3.c1)
388-
-> Tid Scan on t3
389-
TID Cond: (ctid = '(1,1)'::tid)
390386
-> Nested Loop
391387
Join Filter: (t1.c1 = t2.c1)
392-
-> Seq Scan on t2
393-
Filter: (ctid = '(1,1)'::tid)
394388
-> Nested Loop
395389
-> Tid Scan on r3
396390
TID Cond: (ctid = '(1,1)'::tid)
397391
Filter: (c1 = 1)
398392
-> Tid Scan on t1
399393
TID Cond: (ctid = '(1,1)'::tid)
394+
-> Seq Scan on t2
395+
Filter: (ctid = '(1,1)'::tid)
396+
-> Tid Scan on t3
397+
TID Cond: (ctid = '(1,1)'::tid)
398+
-> Tid Scan on t4
399+
TID Cond: (ctid = '(1,1)'::tid)
400400

401401
Aggregate
402402
-> Nested Loop
403403
Join Filter: (t1.c1 = t4.c1)
404-
-> Tid Scan on t4
405-
TID Cond: (ctid = '(1,1)'::tid)
406404
-> Nested Loop
407405
Join Filter: (t1.c1 = t3.c1)
408-
-> Tid Scan on t3
409-
TID Cond: (ctid = '(1,1)'::tid)
410406
-> Nested Loop
411407
Join Filter: (t1.c1 = t2.c1)
412-
-> Seq Scan on t2
413-
Filter: (ctid = '(1,1)'::tid)
414408
-> Nested Loop
415409
-> Tid Scan on r3
416410
TID Cond: (ctid = '(1,1)'::tid)
417411
Filter: (c1 = 1)
418412
-> Tid Scan on t1
419413
TID Cond: (ctid = '(1,1)'::tid)
414+
-> Seq Scan on t2
415+
Filter: (ctid = '(1,1)'::tid)
416+
-> Tid Scan on t3
417+
TID Cond: (ctid = '(1,1)'::tid)
418+
-> Tid Scan on t4
419+
TID Cond: (ctid = '(1,1)'::tid)
420420

421421
Aggregate
422422
-> Nested Loop
423423
Join Filter: (t1.c1 = t4.c1)
424-
-> Tid Scan on t4
425-
TID Cond: (ctid = '(1,1)'::tid)
426424
-> Nested Loop
427425
Join Filter: (t1.c1 = t3.c1)
428-
-> Tid Scan on t3
429-
TID Cond: (ctid = '(1,1)'::tid)
430426
-> Nested Loop
431427
Join Filter: (t1.c1 = t2.c1)
432-
-> Seq Scan on t2
433-
Filter: (ctid = '(1,1)'::tid)
434428
-> Nested Loop
435429
-> Tid Scan on r3
436430
TID Cond: (ctid = '(1,1)'::tid)
437431
Filter: (c1 = 1)
438432
-> Tid Scan on t1
439433
TID Cond: (ctid = '(1,1)'::tid)
434+
-> Seq Scan on t2
435+
Filter: (ctid = '(1,1)'::tid)
436+
-> Tid Scan on t3
437+
TID Cond: (ctid = '(1,1)'::tid)
438+
-> Tid Scan on t4
439+
TID Cond: (ctid = '(1,1)'::tid)
440440
(59 rows)
441441

442442
/*+
@@ -547,62 +547,62 @@ LOG: statement: EXPLAIN (COSTS false) UPDATE s1.r3_ SET c1 = c1 WHERE c1 = 1 AN
547547
Aggregate
548548
-> Nested Loop
549549
Join Filter: (b1t1.c1 = b1t4.c1)
550-
-> Tid Scan on t4 b1t4
551-
TID Cond: (ctid = '(1,1)'::tid)
552550
-> Nested Loop
553551
Join Filter: (b1t1.c1 = b1t3.c1)
554-
-> Tid Scan on t3 b1t3
555-
TID Cond: (ctid = '(1,1)'::tid)
556552
-> Nested Loop
557553
Join Filter: (b1t1.c1 = b1t2.c1)
558-
-> Seq Scan on t2 b1t2
559-
Filter: (ctid = '(1,1)'::tid)
560554
-> Nested Loop
561555
-> Tid Scan on r3_
562556
TID Cond: (ctid = '(1,1)'::tid)
563557
Filter: (c1 = 1)
564558
-> Tid Scan on t1 b1t1
565559
TID Cond: (ctid = '(1,1)'::tid)
560+
-> Seq Scan on t2 b1t2
561+
Filter: (ctid = '(1,1)'::tid)
562+
-> Tid Scan on t3 b1t3
563+
TID Cond: (ctid = '(1,1)'::tid)
564+
-> Tid Scan on t4 b1t4
565+
TID Cond: (ctid = '(1,1)'::tid)
566566

567567
Aggregate
568568
-> Nested Loop
569569
Join Filter: (b2t1.c1 = b2t4.c1)
570-
-> Tid Scan on t4 b2t4
571-
TID Cond: (ctid = '(1,1)'::tid)
572570
-> Nested Loop
573571
Join Filter: (b2t1.c1 = b2t3.c1)
574-
-> Tid Scan on t3 b2t3
575-
TID Cond: (ctid = '(1,1)'::tid)
576572
-> Nested Loop
577573
Join Filter: (b2t1.c1 = b2t2.c1)
578-
-> Seq Scan on t2 b2t2
579-
Filter: (ctid = '(1,1)'::tid)
580574
-> Nested Loop
581575
-> Tid Scan on r3_
582576
TID Cond: (ctid = '(1,1)'::tid)
583577
Filter: (c1 = 1)
584578
-> Tid Scan on t1 b2t1
585579
TID Cond: (ctid = '(1,1)'::tid)
580+
-> Seq Scan on t2 b2t2
581+
Filter: (ctid = '(1,1)'::tid)
582+
-> Tid Scan on t3 b2t3
583+
TID Cond: (ctid = '(1,1)'::tid)
584+
-> Tid Scan on t4 b2t4
585+
TID Cond: (ctid = '(1,1)'::tid)
586586

587587
Aggregate
588588
-> Nested Loop
589589
Join Filter: (b3t1.c1 = b3t4.c1)
590-
-> Tid Scan on t4 b3t4
591-
TID Cond: (ctid = '(1,1)'::tid)
592590
-> Nested Loop
593591
Join Filter: (b3t1.c1 = b3t3.c1)
594-
-> Tid Scan on t3 b3t3
595-
TID Cond: (ctid = '(1,1)'::tid)
596592
-> Nested Loop
597593
Join Filter: (b3t1.c1 = b3t2.c1)
598-
-> Seq Scan on t2 b3t2
599-
Filter: (ctid = '(1,1)'::tid)
600594
-> Nested Loop
601595
-> Tid Scan on r3_
602596
TID Cond: (ctid = '(1,1)'::tid)
603597
Filter: (c1 = 1)
604598
-> Tid Scan on t1 b3t1
605599
TID Cond: (ctid = '(1,1)'::tid)
600+
-> Seq Scan on t2 b3t2
601+
Filter: (ctid = '(1,1)'::tid)
602+
-> Tid Scan on t3 b3t3
603+
TID Cond: (ctid = '(1,1)'::tid)
604+
-> Tid Scan on t4 b3t4
605+
TID Cond: (ctid = '(1,1)'::tid)
606606
(59 rows)
607607

608608
/*+

0 commit comments

Comments
 (0)