Repository navigation
Commit 526ed6c
authored
Prevent empty grouping sets from being eliminated on empty input (apache#22039)
## Which issue does this PR close?
- Closes apache#22040
## Rationale for this change
`GROUPING SETS (())` should return one row even when the input is empty,
because the empty grouping set represents a global aggregate. In the
current behavior, queries such as `WHERE false GROUP BY GROUPING
SETS(())` can incorrectly be optimized into an empty result, returning 0
rows instead of the expected 1 row. This change fixes that SQL semantics
bug.
## What changes are included in this PR?
This PR makes two related fixes:
1. It updates the empty-relation propagation rule so aggregates with an
empty grouping set are not eliminated.
2. It updates the grouped hash aggregate execution path so empty
grouping sets are initialized correctly and still produce output on
empty input.
It also adds regression coverage in `grouping.slt` for:
- `GROUPING SETS (())` on empty input
- `COUNT(*)` on empty input
- mixed grouping sets where only the empty grouping set should produce a
row
## Are these changes tested?
Yes. I ran:
- `cargo test -p datafusion-sqllogictest -- grouping`
- cargo test -p datafusion-optimizer -- propagate_empty
- `cargo clippy --tests --all-features -p datafusion-physical-plan -p
datafusion-optimizer -- -D warnings`
- `cargo fmt --check`
## Are there any user-facing changes?
Yes. Queries using `GROUPING SETS (())`, and other grouping-set forms
that include the empty set such as `ROLLUP` and `CUBE`, will now return
the correct row on empty input instead of incorrectly returning no rows.1 parent 0305098 commit 526ed6c
4 files changed
Lines changed: 169 additions & 7 deletions
File tree
- datafusion
- optimizer/src
- physical-plan/src/aggregates
- sqllogictest/test_files
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
23 | 23 | | |
24 | 24 | | |
25 | 25 | | |
26 | | - | |
| 26 | + | |
27 | 27 | | |
28 | 28 | | |
29 | 29 | | |
| |||
174 | 174 | | |
175 | 175 | | |
176 | 176 | | |
| 177 | + | |
| 178 | + | |
| 179 | + | |
| 180 | + | |
| 181 | + | |
177 | 182 | | |
| 183 | + | |
178 | 184 | | |
179 | 185 | | |
180 | 186 | | |
| |||
315 | 321 | | |
316 | 322 | | |
317 | 323 | | |
| 324 | + | |
| 325 | + | |
| 326 | + | |
| 327 | + | |
| 328 | + | |
| 329 | + | |
| 330 | + | |
| 331 | + | |
| 332 | + | |
| 333 | + | |
| 334 | + | |
| 335 | + | |
| 336 | + | |
| 337 | + | |
| 338 | + | |
| 339 | + | |
| 340 | + | |
| 341 | + | |
| 342 | + | |
| 343 | + | |
| 344 | + | |
| 345 | + | |
| 346 | + | |
| 347 | + | |
318 | 348 | | |
319 | 349 | | |
320 | 350 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2063 | 2063 | | |
2064 | 2064 | | |
2065 | 2065 | | |
2066 | | - | |
| 2066 | + | |
2067 | 2067 | | |
2068 | 2068 | | |
2069 | 2069 | | |
2070 | | - | |
| 2070 | + | |
2071 | 2071 | | |
2072 | 2072 | | |
2073 | 2073 | | |
| |||
2087 | 2087 | | |
2088 | 2088 | | |
2089 | 2089 | | |
2090 | | - | |
2091 | 2090 | | |
2092 | 2091 | | |
2093 | 2092 | | |
| |||
2106 | 2105 | | |
2107 | 2106 | | |
2108 | 2107 | | |
2109 | | - | |
| 2108 | + | |
2110 | 2109 | | |
2111 | 2110 | | |
2112 | 2111 | | |
| |||
2160 | 2159 | | |
2161 | 2160 | | |
2162 | 2161 | | |
2163 | | - | |
| 2162 | + | |
2164 | 2163 | | |
2165 | 2164 | | |
2166 | 2165 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
27 | 27 | | |
28 | 28 | | |
29 | 29 | | |
30 | | - | |
| 30 | + | |
| 31 | + | |
31 | 32 | | |
32 | 33 | | |
33 | 34 | | |
| |||
360 | 361 | | |
361 | 362 | | |
362 | 363 | | |
| 364 | + | |
363 | 365 | | |
364 | 366 | | |
365 | 367 | | |
| |||
661 | 663 | | |
662 | 664 | | |
663 | 665 | | |
| 666 | + | |
664 | 667 | | |
665 | 668 | | |
666 | 669 | | |
| |||
1125 | 1128 | | |
1126 | 1129 | | |
1127 | 1130 | | |
| 1131 | + | |
| 1132 | + | |
| 1133 | + | |
| 1134 | + | |
| 1135 | + | |
| 1136 | + | |
| 1137 | + | |
| 1138 | + | |
| 1139 | + | |
| 1140 | + | |
| 1141 | + | |
| 1142 | + | |
| 1143 | + | |
| 1144 | + | |
| 1145 | + | |
| 1146 | + | |
| 1147 | + | |
| 1148 | + | |
| 1149 | + | |
| 1150 | + | |
| 1151 | + | |
| 1152 | + | |
| 1153 | + | |
| 1154 | + | |
| 1155 | + | |
| 1156 | + | |
| 1157 | + | |
| 1158 | + | |
| 1159 | + | |
| 1160 | + | |
| 1161 | + | |
| 1162 | + | |
| 1163 | + | |
| 1164 | + | |
| 1165 | + | |
| 1166 | + | |
| 1167 | + | |
| 1168 | + | |
| 1169 | + | |
| 1170 | + | |
| 1171 | + | |
| 1172 | + | |
| 1173 | + | |
| 1174 | + | |
| 1175 | + | |
| 1176 | + | |
| 1177 | + | |
| 1178 | + | |
| 1179 | + | |
| 1180 | + | |
| 1181 | + | |
| 1182 | + | |
| 1183 | + | |
| 1184 | + | |
| 1185 | + | |
| 1186 | + | |
| 1187 | + | |
| 1188 | + | |
| 1189 | + | |
| 1190 | + | |
| 1191 | + | |
| 1192 | + | |
| 1193 | + | |
| 1194 | + | |
| 1195 | + | |
| 1196 | + | |
| 1197 | + | |
| 1198 | + | |
| 1199 | + | |
| 1200 | + | |
| 1201 | + | |
| 1202 | + | |
| 1203 | + | |
| 1204 | + | |
| 1205 | + | |
| 1206 | + | |
| 1207 | + | |
| 1208 | + | |
| 1209 | + | |
| 1210 | + | |
| 1211 | + | |
| 1212 | + | |
| 1213 | + | |
| 1214 | + | |
| 1215 | + | |
| 1216 | + | |
| 1217 | + | |
| 1218 | + | |
| 1219 | + | |
| 1220 | + | |
| 1221 | + | |
| 1222 | + | |
| 1223 | + | |
| 1224 | + | |
| 1225 | + | |
| 1226 | + | |
| 1227 | + | |
| 1228 | + | |
1128 | 1229 | | |
1129 | 1230 | | |
1130 | 1231 | | |
| |||
1223 | 1324 | | |
1224 | 1325 | | |
1225 | 1326 | | |
| 1327 | + | |
1226 | 1328 | | |
1227 | 1329 | | |
1228 | 1330 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
224 | 224 | | |
225 | 225 | | |
226 | 226 | | |
| 227 | + | |
| 228 | + | |
| 229 | + | |
| 230 | + | |
| 231 | + | |
| 232 | + | |
| 233 | + | |
| 234 | + | |
| 235 | + | |
| 236 | + | |
| 237 | + | |
| 238 | + | |
| 239 | + | |
| 240 | + | |
| 241 | + | |
| 242 | + | |
| 243 | + | |
| 244 | + | |
| 245 | + | |
| 246 | + | |
| 247 | + | |
| 248 | + | |
| 249 | + | |
| 250 | + | |
| 251 | + | |
| 252 | + | |
| 253 | + | |
| 254 | + | |
| 255 | + | |
| 256 | + | |
| 257 | + | |
0 commit comments