forked frompostgres/postgres
- Notifications
You must be signed in to change notification settings - Fork6
Commit9f5f212
committed
Allow the planner to collapse explicit inner JOINs together, rather than
necessarily following the JOIN syntax to develop the query plan. The oldbehavior is still available by setting GUC variable JOIN_COLLAPSE_LIMITto 1. Also create a GUC variable FROM_COLLAPSE_LIMIT to control thesimilar decision about when to collapse sub-SELECT lists into their parentlists. (This behavior existed already, but the limit was alwaysGEQO_THRESHOLD/2; now it's separately adjustable.)1 parent15ab7a8 commit9f5f212
File tree
12 files changed
+1040
-878
lines changed- doc/src/sgml
- src
- backend
- optimizer
- path
- plan
- prep
- utils/misc
- bin/psql
- include/optimizer
- test/regress/expected
12 files changed
+1040
-878
lines changedLines changed: 62 additions & 22 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
1 | 1 |
| |
2 |
| - | |
| 2 | + | |
3 | 3 |
| |
4 | 4 |
| |
5 | 5 |
| |
| |||
591 | 591 |
| |
592 | 592 |
| |
593 | 593 |
| |
594 |
| - | |
595 |
| - | |
596 |
| - | |
597 |
| - | |
| 594 | + | |
| 595 | + | |
| 596 | + | |
| 597 | + | |
| 598 | + | |
| 599 | + | |
| 600 | + | |
598 | 601 |
| |
599 | 602 |
| |
600 | 603 |
| |
601 | 604 |
| |
602 | 605 |
| |
| 606 | + | |
603 | 607 |
| |
604 | 608 |
| |
605 | 609 |
| |
606 | 610 |
| |
607 | 611 |
| |
| 612 | + | |
| 613 | + | |
| 614 | + | |
| 615 | + | |
| 616 | + | |
| 617 | + | |
608 | 618 |
| |
609 | 619 |
| |
610 |
| - | |
611 |
| - | |
| 620 | + | |
| 621 | + | |
612 | 622 |
| |
613 | 623 |
| |
614 | 624 |
| |
| 625 | + | |
615 | 626 |
| |
616 | 627 |
| |
617 | 628 |
| |
618 | 629 |
| |
619 | 630 |
| |
620 | 631 |
| |
621 |
| - | |
622 |
| - | |
623 |
| - | |
624 |
| - | |
625 |
| - | |
| 632 | + | |
| 633 | + | |
| 634 | + | |
| 635 | + | |
| 636 | + | |
| 637 | + | |
| 638 | + | |
| 639 | + | |
| 640 | + | |
| 641 | + | |
| 642 | + | |
| 643 | + | |
| 644 | + | |
| 645 | + | |
| 646 | + | |
| 647 | + | |
| 648 | + | |
| 649 | + | |
| 650 | + | |
| 651 | + | |
| 652 | + | |
626 | 653 |
| |
627 |
| - | |
628 |
| - | |
629 |
| - | |
| 654 | + | |
630 | 655 |
| |
631 |
| - | |
632 |
| - | |
| 656 | + | |
| 657 | + | |
| 658 | + | |
| 659 | + | |
| 660 | + | |
| 661 | + | |
| 662 | + | |
| 663 | + | |
| 664 | + | |
| 665 | + | |
| 666 | + | |
| 667 | + | |
633 | 668 |
| |
634 | 669 |
| |
635 | 670 |
| |
636 |
| - | |
637 |
| - | |
638 |
| - | |
639 |
| - | |
640 |
| - | |
| 671 | + | |
| 672 | + | |
| 673 | + | |
| 674 | + | |
| 675 | + | |
| 676 | + | |
| 677 | + | |
| 678 | + | |
| 679 | + | |
| 680 | + | |
641 | 681 |
| |
642 | 682 |
| |
643 | 683 |
| |
|
Lines changed: 2 additions & 1 deletion
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
1 | 1 |
| |
2 |
| - | |
| 2 | + | |
3 | 3 |
| |
4 | 4 |
| |
5 | 5 |
| |
| |||
24 | 24 |
| |
25 | 25 |
| |
26 | 26 |
| |
| 27 | + | |
27 | 28 |
| |
28 | 29 |
| |
29 | 30 |
| |
|
Lines changed: 41 additions & 11 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
1 | 1 |
| |
2 |
| - | |
| 2 | + | |
3 | 3 |
| |
4 | 4 |
| |
5 | 5 |
| |
| |||
773 | 773 |
| |
774 | 774 |
| |
775 | 775 |
| |
| 776 | + | |
| 777 | + | |
| 778 | + | |
| 779 | + | |
| 780 | + | |
| 781 | + | |
| 782 | + | |
| 783 | + | |
| 784 | + | |
| 785 | + | |
| 786 | + | |
| 787 | + | |
| 788 | + | |
776 | 789 |
| |
777 | 790 |
| |
778 | 791 |
| |
| |||
826 | 839 |
| |
827 | 840 |
| |
828 | 841 |
| |
829 |
| - | |
| 842 | + | |
830 | 843 |
| |
831 | 844 |
| |
832 |
| - | |
833 |
| - | |
834 |
| - | |
| 845 | + | |
| 846 | + | |
| 847 | + | |
| 848 | + | |
| 849 | + | |
| 850 | + | |
| 851 | + | |
| 852 | + | |
| 853 | + | |
| 854 | + | |
| 855 | + | |
| 856 | + | |
| 857 | + | |
| 858 | + | |
| 859 | + | |
| 860 | + | |
| 861 | + | |
| 862 | + | |
835 | 863 |
| |
836 | 864 |
| |
837 | 865 |
| |
| |||
1842 | 1870 |
| |
1843 | 1871 |
| |
1844 | 1872 |
| |
1845 |
| - | |
1846 |
| - | |
| 1873 | + | |
| 1874 | + | |
1847 | 1875 |
| |
1848 | 1876 |
| |
1849 | 1877 |
| |
| |||
1878 | 1906 |
| |
1879 | 1907 |
| |
1880 | 1908 |
| |
1881 |
| - | |
| 1909 | + | |
1882 | 1910 |
| |
1883 |
| - | |
1884 |
| - | |
1885 |
| - | |
| 1911 | + | |
| 1912 | + | |
| 1913 | + | |
1886 | 1914 |
| |
1887 | 1915 |
| |
1888 | 1916 |
| |
1889 | 1917 |
| |
| 1918 | + | |
| 1919 | + | |
1890 | 1920 |
| |
1891 | 1921 |
| |
1892 | 1922 |
| |
|
Lines changed: 5 additions & 4 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
8 | 8 |
| |
9 | 9 |
| |
10 | 10 |
| |
11 |
| - | |
| 11 | + | |
12 | 12 |
| |
13 | 13 |
| |
14 | 14 |
| |
| |||
30 | 30 |
| |
31 | 31 |
| |
32 | 32 |
| |
33 |
| - | |
34 |
| - | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
35 | 36 |
| |
36 | 37 |
| |
37 | 38 |
| |
| |||
422 | 423 |
| |
423 | 424 |
| |
424 | 425 |
| |
425 |
| - | |
| 426 | + | |
426 | 427 |
| |
427 | 428 |
| |
428 | 429 |
| |
|
Lines changed: 11 additions & 7 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
8 | 8 |
| |
9 | 9 |
| |
10 | 10 |
| |
11 |
| - | |
| 11 | + | |
12 | 12 |
| |
13 | 13 |
| |
14 | 14 |
| |
| |||
166 | 166 |
| |
167 | 167 |
| |
168 | 168 |
| |
169 |
| - | |
170 |
| - | |
171 |
| - | |
172 |
| - | |
173 |
| - | |
174 |
| - | |
175 | 169 |
| |
176 | 170 |
| |
177 | 171 |
| |
| |||
246 | 240 |
| |
247 | 241 |
| |
248 | 242 |
| |
| 243 | + | |
| 244 | + | |
| 245 | + | |
| 246 | + | |
| 247 | + | |
| 248 | + | |
| 249 | + | |
| 250 | + | |
| 251 | + | |
| 252 | + | |
249 | 253 |
| |
250 | 254 |
| |
251 | 255 |
| |
|
0 commit comments
Comments
(0)