- Notifications
You must be signed in to change notification settings - Fork5
Commit7a39b5e
committed
Abstract logic to allow for multiple kinds of child rels.
Currently, the only type of child relation is an "other member rel",which is the child of a baserel, but in the future joins and evenupper relations may have child rels. To facilitate that, introducemacros that test to test for particular RelOptKind values, and usethem in various places where they help to clarify the sense of a test.(For example, a test may allow RELOPT_OTHER_MEMBER_REL either becauseit intends to allow child rels, or because it intends to allow simplerels.)Also, remove find_childrel_top_parent, which will not work for achild rel that is not a baserel. Instead, add a new RelOptInfomember top_parent_relids to track the same kind of information in amore generic manner.Ashutosh Bapat, slightly tweaked by me. Review and testing of thepatch set from which this was taken by Rajkumar Raghuwanshi and RafiaSabih.Discussion:http://postgr.es/m/CA+TgmoagTnF2yqR3PT2rv=om=wJiZ4-A+ATwdnriTGku1CLYxA@mail.gmail.com1 parent93cd768 commit7a39b5e
File tree
16 files changed
+104
-90
lines changed- contrib/postgres_fdw
- src
- backend
- foreign
- optimizer
- path
- plan
- prep
- util
- utils/adt
- include
- nodes
- optimizer
16 files changed
+104
-90
lines changedLines changed: 16 additions & 26 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
243 | 243 |
| |
244 | 244 |
| |
245 | 245 |
| |
246 |
| - | |
| 246 | + | |
247 | 247 |
| |
248 | 248 |
| |
249 | 249 |
| |
| |||
677 | 677 |
| |
678 | 678 |
| |
679 | 679 |
| |
680 |
| - | |
| 680 | + | |
681 | 681 |
| |
682 | 682 |
| |
683 | 683 |
| |
| |||
874 | 874 |
| |
875 | 875 |
| |
876 | 876 |
| |
877 |
| - | |
| 877 | + | |
878 | 878 |
| |
879 | 879 |
| |
880 | 880 |
| |
| |||
929 | 929 |
| |
930 | 930 |
| |
931 | 931 |
| |
932 |
| - | |
933 |
| - | |
934 |
| - | |
935 |
| - | |
| 932 | + | |
936 | 933 |
| |
937 | 934 |
| |
938 | 935 |
| |
939 | 936 |
| |
940 | 937 |
| |
941 |
| - | |
942 |
| - | |
| 938 | + | |
943 | 939 |
| |
944 | 940 |
| |
945 | 941 |
| |
| |||
950 | 946 |
| |
951 | 947 |
| |
952 | 948 |
| |
953 |
| - | |
| 949 | + | |
954 | 950 |
| |
955 | 951 |
| |
956 | 952 |
| |
| |||
963 | 959 |
| |
964 | 960 |
| |
965 | 961 |
| |
966 |
| - | |
| 962 | + | |
967 | 963 |
| |
968 | 964 |
| |
969 | 965 |
| |
| |||
1020 | 1016 |
| |
1021 | 1017 |
| |
1022 | 1018 |
| |
1023 |
| - | |
1024 |
| - | |
| 1019 | + | |
1025 | 1020 |
| |
1026 | 1021 |
| |
1027 | 1022 |
| |
| |||
1062 | 1057 |
| |
1063 | 1058 |
| |
1064 | 1059 |
| |
1065 |
| - | |
1066 |
| - | |
1067 |
| - | |
| 1060 | + | |
| 1061 | + | |
1068 | 1062 |
| |
1069 | 1063 |
| |
1070 | 1064 |
| |
| |||
1219 | 1213 |
| |
1220 | 1214 |
| |
1221 | 1215 |
| |
1222 |
| - | |
| 1216 | + | |
1223 | 1217 |
| |
1224 | 1218 |
| |
1225 | 1219 |
| |
| |||
1384 | 1378 |
| |
1385 | 1379 |
| |
1386 | 1380 |
| |
1387 |
| - | |
1388 |
| - | |
| 1381 | + | |
1389 | 1382 |
| |
1390 | 1383 |
| |
1391 | 1384 |
| |
| |||
1417 | 1410 |
| |
1418 | 1411 |
| |
1419 | 1412 |
| |
1420 |
| - | |
| 1413 | + | |
1421 | 1414 |
| |
1422 | 1415 |
| |
1423 | 1416 |
| |
| |||
1495 | 1488 |
| |
1496 | 1489 |
| |
1497 | 1490 |
| |
1498 |
| - | |
1499 |
| - | |
| 1491 | + | |
1500 | 1492 |
| |
1501 | 1493 |
| |
1502 | 1494 |
| |
| |||
3097 | 3089 |
| |
3098 | 3090 |
| |
3099 | 3091 |
| |
3100 |
| - | |
3101 |
| - | |
3102 |
| - | |
| 3092 | + | |
3103 | 3093 |
| |
3104 | 3094 |
| |
3105 | 3095 |
| |
3106 | 3096 |
| |
3107 | 3097 |
| |
3108 |
| - | |
| 3098 | + | |
3109 | 3099 |
| |
3110 | 3100 |
| |
3111 | 3101 |
| |
|
Lines changed: 12 additions & 13 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
729 | 729 |
| |
730 | 730 |
| |
731 | 731 |
| |
732 |
| - | |
733 |
| - | |
| 732 | + | |
| 733 | + | |
| 734 | + | |
| 735 | + | |
| 736 | + | |
734 | 737 |
| |
735 | 738 |
| |
736 | 739 |
| |
| |||
1129 | 1132 |
| |
1130 | 1133 |
| |
1131 | 1134 |
| |
1132 |
| - | |
1133 |
| - | |
| 1135 | + | |
1134 | 1136 |
| |
1135 | 1137 |
| |
1136 | 1138 |
| |
| |||
1189 | 1191 |
| |
1190 | 1192 |
| |
1191 | 1193 |
| |
1192 |
| - | |
1193 |
| - | |
| 1194 | + | |
1194 | 1195 |
| |
1195 | 1196 |
| |
1196 | 1197 |
| |
| |||
1216 | 1217 |
| |
1217 | 1218 |
| |
1218 | 1219 |
| |
1219 |
| - | |
| 1220 | + | |
1220 | 1221 |
| |
1221 | 1222 |
| |
1222 | 1223 |
| |
| |||
1255 | 1256 |
| |
1256 | 1257 |
| |
1257 | 1258 |
| |
1258 |
| - | |
1259 |
| - | |
| 1259 | + | |
1260 | 1260 |
| |
1261 | 1261 |
| |
1262 | 1262 |
| |
| |||
2535 | 2535 |
| |
2536 | 2536 |
| |
2537 | 2537 |
| |
2538 |
| - | |
2539 |
| - | |
| 2538 | + | |
2540 | 2539 |
| |
2541 | 2540 |
| |
2542 | 2541 |
| |
| |||
2617 | 2616 |
| |
2618 | 2617 |
| |
2619 | 2618 |
| |
2620 |
| - | |
| 2619 | + | |
2621 | 2620 |
| |
2622 | 2621 |
| |
2623 | 2622 |
| |
| |||
2683 | 2682 |
| |
2684 | 2683 |
| |
2685 | 2684 |
| |
2686 |
| - | |
| 2685 | + | |
2687 | 2686 |
| |
2688 | 2687 |
| |
2689 | 2688 |
| |
|
Lines changed: 3 additions & 3 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
717 | 717 |
| |
718 | 718 |
| |
719 | 719 |
| |
720 |
| - | |
| 720 | + | |
721 | 721 |
| |
722 | 722 |
| |
723 | 723 |
| |
| |||
782 | 782 |
| |
783 | 783 |
| |
784 | 784 |
| |
785 |
| - | |
| 785 | + | |
786 | 786 |
| |
787 | 787 |
| |
788 | 788 |
| |
| |||
791 | 791 |
| |
792 | 792 |
| |
793 | 793 |
| |
794 |
| - | |
| 794 | + | |
795 | 795 |
| |
796 | 796 |
| |
797 | 797 |
| |
|
Lines changed: 4 additions & 3 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
539 | 539 |
| |
540 | 540 |
| |
541 | 541 |
| |
542 |
| - | |
543 |
| - | |
| 542 | + | |
544 | 543 |
| |
545 | 544 |
| |
546 | 545 |
| |
| |||
846 | 845 |
| |
847 | 846 |
| |
848 | 847 |
| |
849 |
| - | |
| 848 | + | |
850 | 849 |
| |
851 | 850 |
| |
852 | 851 |
| |
| |||
867 | 866 |
| |
868 | 867 |
| |
869 | 868 |
| |
| 869 | + | |
| 870 | + | |
870 | 871 |
| |
871 | 872 |
| |
872 | 873 |
| |
|
Lines changed: 13 additions & 6 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
1060 | 1060 |
| |
1061 | 1061 |
| |
1062 | 1062 |
| |
1063 |
| - | |
| 1063 | + | |
1064 | 1064 |
| |
| 1065 | + | |
| 1066 | + | |
1065 | 1067 |
| |
1066 |
| - | |
| 1068 | + | |
1067 | 1069 |
| |
1068 | 1070 |
| |
1069 | 1071 |
| |
| |||
1324 | 1326 |
| |
1325 | 1327 |
| |
1326 | 1328 |
| |
1327 |
| - | |
1328 |
| - | |
| 1329 | + | |
1329 | 1330 |
| |
1330 | 1331 |
| |
1331 | 1332 |
| |
| |||
2180 | 2181 |
| |
2181 | 2182 |
| |
2182 | 2183 |
| |
| 2184 | + | |
| 2185 | + | |
| 2186 | + | |
2183 | 2187 |
| |
2184 | 2188 |
| |
2185 | 2189 |
| |
| |||
2413 | 2417 |
| |
2414 | 2418 |
| |
2415 | 2419 |
| |
2416 |
| - | |
2417 |
| - | |
| 2420 | + | |
| 2421 | + | |
| 2422 | + | |
| 2423 | + | |
| 2424 | + | |
2418 | 2425 |
| |
2419 | 2426 |
| |
2420 | 2427 |
| |
|
Lines changed: 3 additions & 0 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
2779 | 2779 |
| |
2780 | 2780 |
| |
2781 | 2781 |
| |
| 2782 | + | |
| 2783 | + | |
| 2784 | + | |
2782 | 2785 |
| |
2783 | 2786 |
| |
2784 | 2787 |
| |
|
Lines changed: 1 addition & 1 deletion
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
3461 | 3461 |
| |
3462 | 3462 |
| |
3463 | 3463 |
| |
3464 |
| - | |
| 3464 | + | |
3465 | 3465 |
| |
3466 | 3466 |
| |
3467 | 3467 |
| |
|
Lines changed: 1 addition & 1 deletion
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
109 | 109 |
| |
110 | 110 |
| |
111 | 111 |
| |
112 |
| - | |
| 112 | + | |
113 | 113 |
| |
114 | 114 |
| |
115 | 115 |
| |
|
Lines changed: 1 addition & 2 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
242 | 242 |
| |
243 | 243 |
| |
244 | 244 |
| |
245 |
| - | |
246 |
| - | |
| 245 | + | |
247 | 246 |
| |
248 | 247 |
| |
249 | 248 |
| |
|
Lines changed: 1 addition & 1 deletion
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
6001 | 6001 |
| |
6002 | 6002 |
| |
6003 | 6003 |
| |
6004 |
| - | |
| 6004 | + | |
6005 | 6005 |
| |
6006 | 6006 |
| |
6007 | 6007 |
| |
|
Lines changed: 2 additions & 2 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
271 | 271 |
| |
272 | 272 |
| |
273 | 273 |
| |
274 |
| - | |
| 274 | + | |
275 | 275 |
| |
276 | 276 |
| |
277 | 277 |
| |
| |||
2143 | 2143 |
| |
2144 | 2144 |
| |
2145 | 2145 |
| |
2146 |
| - | |
| 2146 | + | |
2147 | 2147 |
| |
2148 | 2148 |
| |
2149 | 2149 |
| |
|
0 commit comments
Comments
(0)