forked frompostgres/postgres
- Notifications
You must be signed in to change notification settings - Fork6
Commit5935917
committed
Allow executor startup pruning to prune all child nodes.
Previously, if the startup pruning logic proved that all child nodesof an Append or MergeAppend could be pruned, we still kept one, justto keep EXPLAIN from failing. The previous commit removed theruleutils.c limitation that required this kluge, so drop it. Thatresults in less-confusing EXPLAIN output, as per a complaint fromYuzuko Hosoya.David RowleyDiscussion:https://postgr.es/m/001001d4f44b$2a2cca50$7e865ef0$@lab.ntt.co.jp1 parent6ef77cf commit5935917
File tree
5 files changed
+69
-104
lines changed- src
- backend/executor
- include/nodes
- test/regress
- expected
- sql
5 files changed
+69
-104
lines changedLines changed: 11 additions & 31 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
78 | 78 |
| |
79 | 79 |
| |
80 | 80 |
| |
81 |
| - | |
82 | 81 |
| |
83 | 82 |
| |
84 | 83 |
| |
| |||
141 | 140 |
| |
142 | 141 |
| |
143 | 142 |
| |
144 |
| - | |
145 |
| - | |
146 |
| - | |
147 |
| - | |
148 |
| - | |
149 |
| - | |
150 |
| - | |
151 |
| - | |
152 |
| - | |
153 |
| - | |
154 |
| - | |
155 |
| - | |
156 |
| - | |
157 |
| - | |
158 |
| - | |
159 |
| - | |
160 |
| - | |
161 | 143 |
| |
162 | 144 |
| |
163 | 145 |
| |
| |||
169 | 151 |
| |
170 | 152 |
| |
171 | 153 |
| |
172 |
| - | |
173 |
| - | |
| 154 | + | |
| 155 | + | |
| 156 | + | |
174 | 157 |
| |
175 |
| - | |
176 |
| - | |
177 |
| - | |
| 158 | + | |
178 | 159 |
| |
179 |
| - | |
180 | 160 |
| |
181 | 161 |
| |
182 | 162 |
| |
| |||
255 | 235 |
| |
256 | 236 |
| |
257 | 237 |
| |
| 238 | + | |
| 239 | + | |
| 240 | + | |
| 241 | + | |
258 | 242 |
| |
259 | 243 |
| |
260 | 244 |
| |
261 | 245 |
| |
262 | 246 |
| |
263 | 247 |
| |
264 | 248 |
| |
265 |
| - | |
266 |
| - | |
267 |
| - | |
268 |
| - | |
269 | 249 |
| |
270 | 250 |
| |
271 | 251 |
| |
| |||
460 | 440 |
| |
461 | 441 |
| |
462 | 442 |
| |
463 |
| - | |
| 443 | + | |
464 | 444 |
| |
465 | 445 |
| |
466 | 446 |
| |
| |||
511 | 491 |
| |
512 | 492 |
| |
513 | 493 |
| |
514 |
| - | |
| 494 | + | |
515 | 495 |
| |
516 | 496 |
| |
517 | 497 |
| |
| |||
592 | 572 |
| |
593 | 573 |
| |
594 | 574 |
| |
595 |
| - | |
| 575 | + | |
596 | 576 |
| |
597 | 577 |
| |
598 | 578 |
| |
|
Lines changed: 5 additions & 25 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
80 | 80 |
| |
81 | 81 |
| |
82 | 82 |
| |
83 |
| - | |
84 | 83 |
| |
85 | 84 |
| |
86 | 85 |
| |
| |||
101 | 100 |
| |
102 | 101 |
| |
103 | 102 |
| |
104 |
| - | |
105 |
| - | |
106 |
| - | |
107 |
| - | |
108 |
| - | |
109 |
| - | |
110 |
| - | |
111 |
| - | |
112 |
| - | |
113 |
| - | |
114 |
| - | |
115 |
| - | |
116 |
| - | |
117 |
| - | |
118 |
| - | |
119 |
| - | |
120 |
| - | |
121 | 103 |
| |
122 | 104 |
| |
123 | 105 |
| |
| |||
129 | 111 |
| |
130 | 112 |
| |
131 | 113 |
| |
132 |
| - | |
133 |
| - | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
134 | 117 |
| |
135 |
| - | |
136 |
| - | |
137 |
| - | |
| 118 | + | |
138 | 119 |
| |
139 |
| - | |
140 | 120 |
| |
141 | 121 |
| |
142 | 122 |
| |
| |||
240 | 220 |
| |
241 | 221 |
| |
242 | 222 |
| |
243 |
| - | |
| 223 | + | |
244 | 224 |
| |
245 | 225 |
| |
246 | 226 |
| |
|
Lines changed: 0 additions & 3 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
1234 | 1234 |
| |
1235 | 1235 |
| |
1236 | 1236 |
| |
1237 |
| - | |
1238 |
| - | |
1239 | 1237 |
| |
1240 | 1238 |
| |
1241 | 1239 |
| |
| |||
1252 | 1250 |
| |
1253 | 1251 |
| |
1254 | 1252 |
| |
1255 |
| - | |
1256 | 1253 |
| |
1257 | 1254 |
| |
1258 | 1255 |
| |
|
Lines changed: 42 additions & 41 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
2005 | 2005 |
| |
2006 | 2006 |
| |
2007 | 2007 |
| |
2008 |
| - | |
2009 | 2008 |
| |
2010 |
| - | |
2011 |
| - | |
| 2009 | + | |
| 2010 | + | |
2012 | 2011 |
| |
2013 | 2012 |
| |
2014 | 2013 |
| |
2015 | 2014 |
| |
2016 | 2015 |
| |
2017 | 2016 |
| |
2018 |
| - | |
2019 |
| - | |
2020 |
| - | |
2021 |
| - | |
| 2017 | + | |
| 2018 | + | |
2022 | 2019 |
| |
2023 | 2020 |
| |
2024 | 2021 |
| |
| |||
2854 | 2851 |
| |
2855 | 2852 |
| |
2856 | 2853 |
| |
2857 |
| - | |
2858 |
| - | |
| 2854 | + | |
2859 | 2855 |
| |
2860 |
| - | |
2861 |
| - | |
| 2856 | + | |
| 2857 | + | |
2862 | 2858 |
| |
2863 |
| - | |
2864 |
| - | |
2865 |
| - | |
2866 |
| - | |
| 2859 | + | |
| 2860 | + | |
2867 | 2861 |
| |
2868 | 2862 |
| |
2869 | 2863 |
| |
| |||
2879 | 2873 |
| |
2880 | 2874 |
| |
2881 | 2875 |
| |
2882 |
| - | |
2883 | 2876 |
| |
2884 |
| - | |
2885 |
| - | |
| 2877 | + | |
| 2878 | + | |
2886 | 2879 |
| |
2887 |
| - | |
2888 |
| - | |
2889 |
| - | |
2890 |
| - | |
| 2880 | + | |
| 2881 | + | |
2891 | 2882 |
| |
2892 | 2883 |
| |
2893 | 2884 |
| |
| |||
2971 | 2962 |
| |
2972 | 2963 |
| |
2973 | 2964 |
| |
2974 |
| - | |
2975 |
| - | |
| 2965 | + | |
| 2966 | + | |
2976 | 2967 |
| |
2977 |
| - | |
2978 |
| - | |
2979 |
| - | |
2980 |
| - | |
| 2968 | + | |
| 2969 | + | |
2981 | 2970 |
| |
2982 | 2971 |
| |
2983 | 2972 |
| |
| |||
3159 | 3148 |
| |
3160 | 3149 |
| |
3161 | 3150 |
| |
3162 |
| - | |
3163 |
| - | |
| 3151 | + | |
| 3152 | + | |
3164 | 3153 |
| |
3165 | 3154 |
| |
3166 |
| - | |
3167 |
| - | |
3168 |
| - | |
3169 |
| - | |
| 3155 | + | |
| 3156 | + | |
3170 | 3157 |
| |
3171 | 3158 |
| |
3172 | 3159 |
| |
3173 | 3160 |
| |
3174 | 3161 |
| |
3175 | 3162 |
| |
3176 | 3163 |
| |
| 3164 | + | |
| 3165 | + | |
| 3166 | + | |
| 3167 | + | |
| 3168 | + | |
| 3169 | + | |
| 3170 | + | |
| 3171 | + | |
| 3172 | + | |
| 3173 | + | |
| 3174 | + | |
| 3175 | + | |
| 3176 | + | |
| 3177 | + | |
| 3178 | + | |
3177 | 3179 |
| |
3178 | 3180 |
| |
3179 | 3181 |
| |
| |||
3591 | 3593 |
| |
3592 | 3594 |
| |
3593 | 3595 |
| |
3594 |
| - | |
3595 |
| - | |
| 3596 | + | |
| 3597 | + | |
3596 | 3598 |
| |
3597 | 3599 |
| |
3598 | 3600 |
| |
3599 |
| - | |
3600 | 3601 |
| |
3601 |
| - | |
| 3602 | + | |
3602 | 3603 |
| |
3603 |
| - | |
| 3604 | + | |
3604 | 3605 |
| |
3605 |
| - | |
3606 |
| - | |
| 3606 | + | |
| 3607 | + | |
3607 | 3608 |
| |
3608 | 3609 |
| |
3609 | 3610 |
| |
|
Lines changed: 11 additions & 4 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
477 | 477 |
| |
478 | 478 |
| |
479 | 479 |
| |
480 |
| - | |
481 | 480 |
| |
482 | 481 |
| |
483 | 482 |
| |
| |||
702 | 701 |
| |
703 | 702 |
| |
704 | 703 |
| |
705 |
| - | |
706 |
| - | |
| 704 | + | |
707 | 705 |
| |
708 | 706 |
| |
709 | 707 |
| |
| |||
715 | 713 |
| |
716 | 714 |
| |
717 | 715 |
| |
718 |
| - | |
719 | 716 |
| |
720 | 717 |
| |
721 | 718 |
| |
| |||
841 | 838 |
| |
842 | 839 |
| |
843 | 840 |
| |
| 841 | + | |
| 842 | + | |
| 843 | + | |
| 844 | + | |
| 845 | + | |
| 846 | + | |
| 847 | + | |
| 848 | + | |
| 849 | + | |
| 850 | + | |
844 | 851 |
| |
845 | 852 |
| |
846 | 853 |
| |
|
0 commit comments
Comments
(0)