Skip to content

Commit 80f9f18

Browse files
chenghao-intelchenghao-intel
committed
Update the UnitTest for aggregation constant folding
1 parent 27ea3d7 commit 80f9f18

6 files changed

+1241
-2
lines changed

‎sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/Optimizer.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,8 @@ object NullPropagation extends Rule[LogicalPlan] {
9797
// Skip redundant folding of literals.
9898
case l: Literal => l
9999
case e @ Count(Literal(null, _)) => Literal(0, e.dataType)
100-
case e @ Sum(Literal(null, _)) => Literal(null, e.dataType)
101-
case e @ Average(Literal(null, _)) => Literal(null, e.dataType)
100+
case e @ Sum(Literal(c, _)) if(c == 0) => Literal(0, e.dataType)
101+
case e @ Average(Literal(c, _)) if(c == 0) => Literal(0.0, e.dataType)
102102
case e @ IsNull(c) if c.nullable == false => Literal(false, BooleanType)
103103
case e @ IsNotNull(c) if c.nullable == false => Literal(true, BooleanType)
104104
case e @ GetItem(Literal(null, _), _) => Literal(null, e.dataType)

‎sql/hive/src/test/resources/golden/Constant Folding Optimization for AVG_SUM_COUNT-0-45f5619d9e4510195fe67f7c8d14a5c0

Lines changed: 309 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,309 @@
1+
0.0 0 0 0 3
2+
2.0 0 2 0 1
3+
4.0 0 4 0 1
4+
5.0 0 15 0 3
5+
8.0 0 8 0 1
6+
9.0 0 9 0 1
7+
10.0 0 10 0 1
8+
11.0 0 11 0 1
9+
12.0 0 24 0 2
10+
15.0 0 30 0 2
11+
17.0 0 17 0 1
12+
18.0 0 36 0 2
13+
19.0 0 19 0 1
14+
20.0 0 20 0 1
15+
24.0 0 48 0 2
16+
26.0 0 52 0 2
17+
27.0 0 27 0 1
18+
28.0 0 28 0 1
19+
30.0 0 30 0 1
20+
33.0 0 33 0 1
21+
34.0 0 34 0 1
22+
35.0 0 105 0 3
23+
37.0 0 74 0 2
24+
41.0 0 41 0 1
25+
42.0 0 84 0 2
26+
43.0 0 43 0 1
27+
44.0 0 44 0 1
28+
47.0 0 47 0 1
29+
51.0 0 102 0 2
30+
53.0 0 53 0 1
31+
54.0 0 54 0 1
32+
57.0 0 57 0 1
33+
58.0 0 116 0 2
34+
64.0 0 64 0 1
35+
65.0 0 65 0 1
36+
66.0 0 66 0 1
37+
67.0 0 134 0 2
38+
69.0 0 69 0 1
39+
70.0 0 210 0 3
40+
72.0 0 144 0 2
41+
74.0 0 74 0 1
42+
76.0 0 152 0 2
43+
77.0 0 77 0 1
44+
78.0 0 78 0 1
45+
80.0 0 80 0 1
46+
82.0 0 82 0 1
47+
83.0 0 166 0 2
48+
84.0 0 168 0 2
49+
85.0 0 85 0 1
50+
86.0 0 86 0 1
51+
87.0 0 87 0 1
52+
90.0 0 270 0 3
53+
92.0 0 92 0 1
54+
95.0 0 190 0 2
55+
96.0 0 96 0 1
56+
97.0 0 194 0 2
57+
98.0 0 196 0 2
58+
100.0 0 200 0 2
59+
103.0 0 206 0 2
60+
104.0 0 208 0 2
61+
105.0 0 105 0 1
62+
111.0 0 111 0 1
63+
113.0 0 226 0 2
64+
114.0 0 114 0 1
65+
116.0 0 116 0 1
66+
118.0 0 236 0 2
67+
119.0 0 357 0 3
68+
120.0 0 240 0 2
69+
125.0 0 250 0 2
70+
126.0 0 126 0 1
71+
128.0 0 384 0 3
72+
129.0 0 258 0 2
73+
131.0 0 131 0 1
74+
133.0 0 133 0 1
75+
134.0 0 268 0 2
76+
136.0 0 136 0 1
77+
137.0 0 274 0 2
78+
138.0 0 552 0 4
79+
143.0 0 143 0 1
80+
145.0 0 145 0 1
81+
146.0 0 292 0 2
82+
149.0 0 298 0 2
83+
150.0 0 150 0 1
84+
152.0 0 304 0 2
85+
153.0 0 153 0 1
86+
155.0 0 155 0 1
87+
156.0 0 156 0 1
88+
157.0 0 157 0 1
89+
158.0 0 158 0 1
90+
160.0 0 160 0 1
91+
162.0 0 162 0 1
92+
163.0 0 163 0 1
93+
164.0 0 328 0 2
94+
165.0 0 330 0 2
95+
166.0 0 166 0 1
96+
167.0 0 501 0 3
97+
168.0 0 168 0 1
98+
169.0 0 676 0 4
99+
170.0 0 170 0 1
100+
172.0 0 344 0 2
101+
174.0 0 348 0 2
102+
175.0 0 350 0 2
103+
176.0 0 352 0 2
104+
177.0 0 177 0 1
105+
178.0 0 178 0 1
106+
179.0 0 358 0 2
107+
180.0 0 180 0 1
108+
181.0 0 181 0 1
109+
183.0 0 183 0 1
110+
186.0 0 186 0 1
111+
187.0 0 561 0 3
112+
189.0 0 189 0 1
113+
190.0 0 190 0 1
114+
191.0 0 382 0 2
115+
192.0 0 192 0 1
116+
193.0 0 579 0 3
117+
194.0 0 194 0 1
118+
195.0 0 390 0 2
119+
196.0 0 196 0 1
120+
197.0 0 394 0 2
121+
199.0 0 597 0 3
122+
200.0 0 400 0 2
123+
201.0 0 201 0 1
124+
202.0 0 202 0 1
125+
203.0 0 406 0 2
126+
205.0 0 410 0 2
127+
207.0 0 414 0 2
128+
208.0 0 624 0 3
129+
209.0 0 418 0 2
130+
213.0 0 426 0 2
131+
214.0 0 214 0 1
132+
216.0 0 432 0 2
133+
217.0 0 434 0 2
134+
218.0 0 218 0 1
135+
219.0 0 438 0 2
136+
221.0 0 442 0 2
137+
222.0 0 222 0 1
138+
223.0 0 446 0 2
139+
224.0 0 448 0 2
140+
226.0 0 226 0 1
141+
228.0 0 228 0 1
142+
229.0 0 458 0 2
143+
230.0 0 1150 0 5
144+
233.0 0 466 0 2
145+
235.0 0 235 0 1
146+
237.0 0 474 0 2
147+
238.0 0 476 0 2
148+
239.0 0 478 0 2
149+
241.0 0 241 0 1
150+
242.0 0 484 0 2
151+
244.0 0 244 0 1
152+
247.0 0 247 0 1
153+
248.0 0 248 0 1
154+
249.0 0 249 0 1
155+
252.0 0 252 0 1
156+
255.0 0 510 0 2
157+
256.0 0 512 0 2
158+
257.0 0 257 0 1
159+
258.0 0 258 0 1
160+
260.0 0 260 0 1
161+
262.0 0 262 0 1
162+
263.0 0 263 0 1
163+
265.0 0 530 0 2
164+
266.0 0 266 0 1
165+
272.0 0 544 0 2
166+
273.0 0 819 0 3
167+
274.0 0 274 0 1
168+
275.0 0 275 0 1
169+
277.0 0 1108 0 4
170+
278.0 0 556 0 2
171+
280.0 0 560 0 2
172+
281.0 0 562 0 2
173+
282.0 0 564 0 2
174+
283.0 0 283 0 1
175+
284.0 0 284 0 1
176+
285.0 0 285 0 1
177+
286.0 0 286 0 1
178+
287.0 0 287 0 1
179+
288.0 0 576 0 2
180+
289.0 0 289 0 1
181+
291.0 0 291 0 1
182+
292.0 0 292 0 1
183+
296.0 0 296 0 1
184+
298.0 0 894 0 3
185+
302.0 0 302 0 1
186+
305.0 0 305 0 1
187+
306.0 0 306 0 1
188+
307.0 0 614 0 2
189+
308.0 0 308 0 1
190+
309.0 0 618 0 2
191+
310.0 0 310 0 1
192+
311.0 0 933 0 3
193+
315.0 0 315 0 1
194+
316.0 0 948 0 3
195+
317.0 0 634 0 2
196+
318.0 0 954 0 3
197+
321.0 0 642 0 2
198+
322.0 0 644 0 2
199+
323.0 0 323 0 1
200+
325.0 0 650 0 2
201+
327.0 0 981 0 3
202+
331.0 0 662 0 2
203+
332.0 0 332 0 1
204+
333.0 0 666 0 2
205+
335.0 0 335 0 1
206+
336.0 0 336 0 1
207+
338.0 0 338 0 1
208+
339.0 0 339 0 1
209+
341.0 0 341 0 1
210+
342.0 0 684 0 2
211+
344.0 0 688 0 2
212+
345.0 0 345 0 1
213+
348.0 0 1740 0 5
214+
351.0 0 351 0 1
215+
353.0 0 706 0 2
216+
356.0 0 356 0 1
217+
360.0 0 360 0 1
218+
362.0 0 362 0 1
219+
364.0 0 364 0 1
220+
365.0 0 365 0 1
221+
366.0 0 366 0 1
222+
367.0 0 734 0 2
223+
368.0 0 368 0 1
224+
369.0 0 1107 0 3
225+
373.0 0 373 0 1
226+
374.0 0 374 0 1
227+
375.0 0 375 0 1
228+
377.0 0 377 0 1
229+
378.0 0 378 0 1
230+
379.0 0 379 0 1
231+
382.0 0 764 0 2
232+
384.0 0 1152 0 3
233+
386.0 0 386 0 1
234+
389.0 0 389 0 1
235+
392.0 0 392 0 1
236+
393.0 0 393 0 1
237+
394.0 0 394 0 1
238+
395.0 0 790 0 2
239+
396.0 0 1188 0 3
240+
397.0 0 794 0 2
241+
399.0 0 798 0 2
242+
400.0 0 400 0 1
243+
401.0 0 2005 0 5
244+
402.0 0 402 0 1
245+
403.0 0 1209 0 3
246+
404.0 0 808 0 2
247+
406.0 0 1624 0 4
248+
407.0 0 407 0 1
249+
409.0 0 1227 0 3
250+
411.0 0 411 0 1
251+
413.0 0 826 0 2
252+
414.0 0 828 0 2
253+
417.0 0 1251 0 3
254+
418.0 0 418 0 1
255+
419.0 0 419 0 1
256+
421.0 0 421 0 1
257+
424.0 0 848 0 2
258+
427.0 0 427 0 1
259+
429.0 0 858 0 2
260+
430.0 0 1290 0 3
261+
431.0 0 1293 0 3
262+
432.0 0 432 0 1
263+
435.0 0 435 0 1
264+
436.0 0 436 0 1
265+
437.0 0 437 0 1
266+
438.0 0 1314 0 3
267+
439.0 0 878 0 2
268+
443.0 0 443 0 1
269+
444.0 0 444 0 1
270+
446.0 0 446 0 1
271+
448.0 0 448 0 1
272+
449.0 0 449 0 1
273+
452.0 0 452 0 1
274+
453.0 0 453 0 1
275+
454.0 0 1362 0 3
276+
455.0 0 455 0 1
277+
457.0 0 457 0 1
278+
458.0 0 916 0 2
279+
459.0 0 918 0 2
280+
460.0 0 460 0 1
281+
462.0 0 924 0 2
282+
463.0 0 926 0 2
283+
466.0 0 1398 0 3
284+
467.0 0 467 0 1
285+
468.0 0 1872 0 4
286+
469.0 0 2345 0 5
287+
470.0 0 470 0 1
288+
472.0 0 472 0 1
289+
475.0 0 475 0 1
290+
477.0 0 477 0 1
291+
478.0 0 956 0 2
292+
479.0 0 479 0 1
293+
480.0 0 1440 0 3
294+
481.0 0 481 0 1
295+
482.0 0 482 0 1
296+
483.0 0 483 0 1
297+
484.0 0 484 0 1
298+
485.0 0 485 0 1
299+
487.0 0 487 0 1
300+
489.0 0 1956 0 4
301+
490.0 0 490 0 1
302+
491.0 0 491 0 1
303+
492.0 0 984 0 2
304+
493.0 0 493 0 1
305+
494.0 0 494 0 1
306+
495.0 0 495 0 1
307+
496.0 0 496 0 1
308+
497.0 0 497 0 1
309+
498.0 0 1494 0 3

0 commit comments

Comments
 (0)