Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Fix](nereids) fix merge aggregate rule, rules should not have mutable members #36145

Merged
merged 3 commits into from
Jun 13, 2024
Merged

[Fix](nereids) fix merge aggregate rule, rules should not have mutable members #36145

merged 3 commits into from
Jun 13, 2024

Conversation

feiniaofeiafei
Copy link
Contributor

@feiniaofeiafei feiniaofeiafei commented Jun 11, 2024 •
edited
Loading

This bug is induced by #31811.
The innerAggExprIdToAggFunc was a member of MergeAggregate, which was wrong. Because rules like MergeAggregate are single instances, same rules applied to different sub-plans will affect each other. This pr changes innerAggExprIdToAggFunc to a local variable, fixes this bug.

No regression use case was added because it’s not a problem that will definitely reoccur and requires the same rule to be applied to multiple plans at the same time.

@doris-robot
Copy link

Thank you for your contribution to Apache Doris.
Don't know what should be done next? See How to process your PR

Since 2024-03-18, the Document has been moved to doris-website.
See Doris Document.

@feiniaofeiafei
Copy link
Contributor Author

run buildall

morrySnow
morrySnow reviewed Jun 12, 2024
View reviewed changes
fe/fe-core/src/main/java/org/apache/doris/nereids/rules/rewrite/MergeAggregate.java
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

add test case. add description about the root cause of bug and the PR intro it

@doris-robot
Copy link

TPC-H: Total hot run time: 40834 ms 
machine: 'aliyun_ecs.c7a.8xlarge_32C64G'
scripts: https://github.com/apache/doris/tree/master/tools/tpch-tools
Tpch sf100 test result on commit c15292d4cf0d25c52078fe9a3c2c2dc202c6c2ce, data reload: false

------ Round 1 ----------------------------------
q1	17622	4312	4307	4307
q2	2024	194	190	190
q3	10451	1136	1062	1062
q4	10198	796	751	751
q5	7446	2661	2739	2661
q6	219	146	139	139
q7	955	620	615	615
q8	9230	2074	2078	2074
q9	9046	6584	6544	6544
q10	8983	3777	3796	3777
q11	458	233	234	233
q12	496	237	231	231
q13	18140	3019	3034	3019
q14	262	225	212	212
q15	515	476	481	476
q16	498	390	385	385
q17	970	661	741	661
q18	8033	7479	7393	7393
q19	6635	1510	1546	1510
q20	651	323	318	318
q21	4999	3926	4049	3926
q22	418	363	350	350
Total cold run time: 118249 ms
Total hot run time: 40834 ms

----- Round 2, with runtime_filter_mode=off -----
q1	4547	4378	4381	4378
q2	376	271	267	267
q3	3337	3153	3067	3067
q4	2101	1877	1787	1787
q5	5656	5603	5653	5603
q6	221	133	138	133
q7	2258	1848	1890	1848
q8	3301	3433	3418	3418
q9	8676	8846	8684	8684
q10	4116	3723	3798	3723
q11	573	511	501	501
q12	824	654	633	633
q13	17176	3173	3183	3173
q14	320	294	283	283
q15	535	494	479	479
q16	487	440	412	412
q17	1790	1510	1514	1510
q18	8201	8046	7793	7793
q19	1807	1597	1604	1597
q20	3212	1897	1864	1864
q21	8574	4935	4689	4689
q22	646	551	571	551
Total cold run time: 78734 ms
Total hot run time: 56393 ms

@doris-robot
Copy link

TPC-DS: Total hot run time: 173293 ms 
machine: 'aliyun_ecs.c7a.8xlarge_32C64G'
scripts: https://github.com/apache/doris/tree/master/tools/tpcds-tools
TPC-DS sf100 test result on commit c15292d4cf0d25c52078fe9a3c2c2dc202c6c2ce, data reload: false

query1	913	378	368	368
query2	6445	2460	2273	2273
query3	6632	210	210	210
query4	20316	17380	17355	17355
query5	3718	483	458	458
query6	244	165	161	161
query7	4584	324	299	299
query8	329	291	278	278
query9	8575	2355	2352	2352
query10	560	319	281	281
query11	10721	10083	10069	10069
query12	131	90	84	84
query13	1660	367	371	367
query14	9469	6194	6978	6194
query15	237	187	190	187
query16	7123	277	264	264
query17	1014	533	528	528
query18	1766	274	265	265
query19	193	156	151	151
query20	86	90	79	79
query21	216	131	129	129
query22	4361	4135	4112	4112
query23	33799	33927	33911	33911
query24	11231	2976	2907	2907
query25	675	359	376	359
query26	1504	159	157	157
query27	3161	322	327	322
query28	7477	2102	2082	2082
query29	970	655	618	618
query30	271	176	153	153
query31	970	766	764	764
query32	88	54	56	54
query33	747	289	274	274
query34	1059	504	493	493
query35	719	644	609	609
query36	1116	988	973	973
query37	179	75	75	75
query38	2965	2880	2887	2880
query39	884	861	853	853
query40	230	133	127	127
query41	55	53	51	51
query42	114	108	107	107
query43	609	559	566	559
query44	1233	747	753	747
query45	195	168	169	168
query46	1090	727	772	727
query47	1878	1763	1756	1756
query48	382	332	306	306
query49	853	404	414	404
query50	769	391	397	391
query51	6779	6688	6702	6688
query52	103	90	94	90
query53	367	291	287	287
query54	854	448	452	448
query55	76	74	74	74
query56	285	246	260	246
query57	1137	1041	1048	1041
query58	250	244	228	228
query59	3424	3235	3278	3235
query60	303	262	272	262
query61	91	89	86	86
query62	618	449	436	436
query63	324	294	289	289
query64	8847	2209	1722	1722
query65	3207	3112	3115	3112
query66	934	327	326	326
query67	15529	14880	14890	14880
query68	4504	551	549	549
query69	459	309	313	309
query70	1121	1162	1116	1116
query71	366	269	273	269
query72	7094	5339	5150	5150
query73	740	335	330	330
query74	5978	5567	5496	5496
query75	3351	2666	2690	2666
query76	2091	866	882	866
query77	422	293	312	293
query78	10370	9788	9834	9788
query79	2232	528	524	524
query80	984	464	487	464
query81	582	220	224	220
query82	768	106	99	99
query83	231	168	169	168
query84	263	89	90	89
query85	1965	280	262	262
query86	469	309	336	309
query87	3267	3140	3095	3095
query88	4035	2448	2430	2430
query89	488	390	374	374
query90	1724	202	191	191
query91	127	107	111	107
query92	63	51	55	51
query93	2342	511	502	502
query94	1084	199	202	199
query95	428	327	329	327
query96	596	290	277	277
query97	3184	3000	3038	3000
query98	214	204	200	200
query99	1144	840	832	832
Total cold run time: 270330 ms
Total hot run time: 173293 ms

@doris-robot
Copy link

ClickBench: Total hot run time: 31.11 s 
machine: 'aliyun_ecs.c7a.8xlarge_32C64G'
scripts: https://github.com/apache/doris/tree/master/tools/clickbench-tools
ClickBench test result on commit c15292d4cf0d25c52078fe9a3c2c2dc202c6c2ce, data reload: false

query1	0.04	0.04	0.04
query2	0.08	0.04	0.04
query3	0.23	0.05	0.05
query4	1.69	0.07	0.06
query5	0.50	0.51	0.51
query6	1.13	0.72	0.72
query7	0.02	0.01	0.01
query8	0.05	0.04	0.04
query9	0.54	0.48	0.48
query10	0.55	0.55	0.55
query11	0.15	0.12	0.12
query12	0.15	0.12	0.12
query13	0.59	0.58	0.61
query14	0.78	0.78	0.78
query15	0.84	0.81	0.81
query16	0.37	0.37	0.36
query17	1.04	1.02	1.02
query18	0.21	0.24	0.26
query19	1.91	1.72	1.79
query20	0.01	0.01	0.01
query21	15.42	0.67	0.65
query22	3.78	7.46	2.14
query23	18.29	1.31	1.27
query24	2.11	0.21	0.22
query25	0.15	0.08	0.09
query26	0.25	0.18	0.17
query27	0.07	0.08	0.08
query28	13.35	1.03	0.99
query29	13.13	3.30	3.32
query30	0.26	0.06	0.06
query31	2.93	0.39	0.39
query32	3.28	0.48	0.47
query33	2.91	2.84	2.86
query34	17.24	4.68	4.70
query35	4.72	4.64	4.47
query36	0.65	0.47	0.46
query37	0.17	0.15	0.16
query38	0.15	0.14	0.15
query39	0.04	0.04	0.04
query40	0.16	0.15	0.15
query41	0.09	0.04	0.04
query42	0.06	0.04	0.04
query43	0.04	0.03	0.04
Total cold run time: 110.13 s
Total hot run time: 31.11 s

@feiniaofeiafei
Copy link
Contributor Author

run buildall

morrySnow
morrySnow previously approved these changes Jun 12, 2024
View reviewed changes
@github-actions GitHub Actions
Copy link
Contributor

PR approved by at least one committer and no changes requested.

@github-actions github-actions bot added the approved Indicates a PR has been approved by one committer. label Jun 12, 2024
@github-actions GitHub Actions
Copy link
Contributor

PR approved by anyone and no changes requested.

@doris-robot
Copy link

TPC-H: Total hot run time: 40126 ms 
machine: 'aliyun_ecs.c7a.8xlarge_32C64G'
scripts: https://github.com/apache/doris/tree/master/tools/tpch-tools
Tpch sf100 test result on commit aa5fe985c6329aea19826da7595bd77a25d16883, data reload: false

------ Round 1 ----------------------------------
q1	17625	4281	4247	4247
q2	2029	194	200	194
q3	10441	1189	1093	1093
q4	10193	876	714	714
q5	7452	2676	2608	2608
q6	220	143	137	137
q7	953	617	602	602
q8	9219	2038	2044	2038
q9	8955	6479	6465	6465
q10	8961	3725	3699	3699
q11	459	241	241	241
q12	451	222	226	222
q13	17770	2965	2974	2965
q14	260	216	237	216
q15	517	474	467	467
q16	537	378	374	374
q17	966	674	707	674
q18	7983	7375	7363	7363
q19	5529	1388	1535	1388
q20	657	306	321	306
q21	4854	3782	3890	3782
q22	395	331	336	331
Total cold run time: 116426 ms
Total hot run time: 40126 ms

----- Round 2, with runtime_filter_mode=off -----
q1	4353	4229	4187	4187
q2	359	270	258	258
q3	2962	2853	2907	2853
q4	1982	1704	1628	1628
q5	5636	5486	5472	5472
q6	217	130	131	130
q7	2166	1835	1871	1835
q8	3287	3371	3373	3371
q9	8716	8725	8802	8725
q10	4037	3931	3669	3669
q11	573	507	487	487
q12	828	646	625	625
q13	16058	3146	3213	3146
q14	295	274	269	269
q15	546	497	485	485
q16	493	435	418	418
q17	1812	1492	1452	1452
q18	8005	7995	7911	7911
q19	1783	1688	1645	1645
q20	3040	1956	1837	1837
q21	5024	4835	4837	4835
q22	619	502	567	502
Total cold run time: 72791 ms
Total hot run time: 55740 ms

@doris-robot
Copy link

TPC-DS: Total hot run time: 173666 ms 
machine: 'aliyun_ecs.c7a.8xlarge_32C64G'
scripts: https://github.com/apache/doris/tree/master/tools/tpcds-tools
TPC-DS sf100 test result on commit aa5fe985c6329aea19826da7595bd77a25d16883, data reload: false

query1	928	387	379	379
query2	6457	2381	2259	2259
query3	6637	224	214	214
query4	18922	17181	17298	17181
query5	3658	474	453	453
query6	239	166	173	166
query7	4582	302	293	293
query8	314	293	306	293
query9	8436	2363	2323	2323
query10	569	311	285	285
query11	10503	9931	9860	9860
query12	124	99	85	85
query13	1677	375	373	373
query14	9471	7159	7074	7074
query15	230	182	187	182
query16	7109	269	267	267
query17	1399	547	520	520
query18	1796	275	275	275
query19	195	156	155	155
query20	89	88	83	83
query21	217	127	125	125
query22	4331	4159	4043	4043
query23	33422	33710	33519	33519
query24	11155	2946	2959	2946
query25	642	364	380	364
query26	1212	162	162	162
query27	3088	334	339	334
query28	7369	2106	2099	2099
query29	928	648	621	621
query30	246	160	158	158
query31	955	737	770	737
query32	101	56	58	56
query33	763	289	284	284
query34	1093	524	504	504
query35	756	618	664	618
query36	1135	965	988	965
query37	150	72	73	72
query38	2914	2888	2789	2789
query39	892	857	848	848
query40	222	139	163	139
query41	55	55	50	50
query42	129	109	108	108
query43	622	558	580	558
query44	1229	739	759	739
query45	199	159	161	159
query46	1067	728	757	728
query47	1850	1763	1777	1763
query48	378	297	298	297
query49	867	411	424	411
query50	766	397	407	397
query51	6840	6716	6631	6631
query52	104	96	93	93
query53	356	300	292	292
query54	879	469	457	457
query55	78	79	75	75
query56	282	257	274	257
query57	1140	1043	1050	1043
query58	261	243	242	242
query59	3422	3106	3066	3066
query60	317	326	278	278
query61	91	91	89	89
query62	616	434	466	434
query63	317	291	288	288
query64	8826	2253	1773	1773
query65	3151	3075	3090	3075
query66	833	337	345	337
query67	15415	14910	14862	14862
query68	5574	543	563	543
query69	655	472	387	387
query70	1118	1146	1096	1096
query71	454	283	284	283
query72	8020	5721	5687	5687
query73	773	332	326	326
query74	5799	5559	5478	5478
query75	3660	2683	2621	2621
query76	3178	927	918	918
query77	612	310	300	300
query78	10411	10040	9659	9659
query79	1775	519	521	519
query80	1152	480	469	469
query81	518	227	222	222
query82	758	104	108	104
query83	197	169	174	169
query84	268	98	87	87
query85	1358	301	288	288
query86	466	329	327	327
query87	3315	3094	3083	3083
query88	3810	2447	2447	2447
query89	464	386	384	384
query90	1718	196	193	193
query91	138	117	137	117
query92	61	57	52	52
query93	1920	509	506	506
query94	1131	193	186	186
query95	405	317	309	309
query96	583	276	269	269
query97	3163	3011	2998	2998
query98	219	200	197	197
query99	1304	842	837	837
Total cold run time: 269993 ms
Total hot run time: 173666 ms

@doris-robot
Copy link

ClickBench: Total hot run time: 30.39 s 
machine: 'aliyun_ecs.c7a.8xlarge_32C64G'
scripts: https://github.com/apache/doris/tree/master/tools/clickbench-tools
ClickBench test result on commit aa5fe985c6329aea19826da7595bd77a25d16883, data reload: false

query1	0.05	0.03	0.03
query2	0.08	0.05	0.04
query3	0.23	0.06	0.06
query4	1.66	0.09	0.09
query5	0.51	0.49	0.49
query6	1.13	0.71	0.72
query7	0.02	0.01	0.02
query8	0.05	0.04	0.05
query9	0.53	0.48	0.49
query10	0.55	0.55	0.55
query11	0.15	0.11	0.12
query12	0.15	0.12	0.12
query13	0.59	0.59	0.60
query14	0.78	0.76	0.78
query15	0.83	0.81	0.82
query16	0.37	0.36	0.37
query17	1.01	0.96	0.97
query18	0.20	0.26	0.24
query19	1.78	1.75	1.72
query20	0.01	0.01	0.01
query21	15.42	0.66	0.66
query22	4.53	7.95	1.69
query23	18.34	1.40	1.30
query24	2.13	0.24	0.21
query25	0.16	0.08	0.09
query26	0.26	0.17	0.17
query27	0.08	0.08	0.08
query28	13.25	1.03	1.02
query29	13.84	3.33	3.34
query30	0.27	0.06	0.06
query31	3.24	0.38	0.39
query32	3.29	0.47	0.46
query33	2.92	2.87	2.97
query34	17.01	4.44	4.42
query35	4.48	4.48	4.44
query36	0.66	0.47	0.45
query37	0.18	0.16	0.15
query38	0.15	0.15	0.15
query39	0.04	0.03	0.03
query40	0.17	0.14	0.14
query41	0.10	0.05	0.04
query42	0.06	0.05	0.05
query43	0.05	0.03	0.04
Total cold run time: 111.31 s
Total hot run time: 30.39 s

@morrySnow morrySnow added the p0_w label Jun 12, 2024
@feiniaofeiafei
Copy link
Contributor Author

run buildall

@github-actions github-actions bot removed the approved Indicates a PR has been approved by one committer. label Jun 12, 2024
@feiniaofeiafei
Copy link
Contributor Author

run feet

@feiniaofeiafei
Copy link
Contributor Author

run feut

@feiniaofeiafei
Copy link
Contributor Author

run performance

@doris-robot
Copy link

TPC-H: Total hot run time: 40076 ms 
machine: 'aliyun_ecs.c7a.8xlarge_32C64G'
scripts: https://github.com/apache/doris/tree/master/tools/tpch-tools
Tpch sf100 test result on commit fc2a170d015f77d49d0ac2867e11c68d65fe4605, data reload: false

------ Round 1 ----------------------------------
q1	17814	6100	4289	4289
q2	2039	190	186	186
q3	10659	1158	1062	1062
q4	10399	785	906	785
q5	7705	2706	2700	2700
q6	226	139	141	139
q7	975	620	609	609
q8	9819	2099	2132	2099
q9	8959	6612	6566	6566
q10	9421	3671	3677	3671
q11	463	241	244	241
q12	428	237	223	223
q13	18668	2983	2985	2983
q14	271	214	216	214
q15	526	467	474	467
q16	504	392	371	371
q17	974	672	667	667
q18	8050	7448	7407	7407
q19	4854	1525	1460	1460
q20	653	311	324	311
q21	4926	3295	3921	3295
q22	402	331	333	331
Total cold run time: 118735 ms
Total hot run time: 40076 ms

----- Round 2, with runtime_filter_mode=off -----
q1	4371	4214	4262	4214
q2	358	264	252	252
q3	2954	2734	2718	2718
q4	1874	1610	1610	1610
q5	5227	5296	5275	5275
q6	220	126	129	126
q7	2069	1714	1744	1714
q8	3165	3341	3323	3323
q9	8276	8295	8351	8295
q10	3877	3619	3684	3619
q11	601	479	496	479
q12	774	592	608	592
q13	16561	2974	3002	2974
q14	310	287	257	257
q15	515	483	472	472
q16	471	407	428	407
q17	1788	1482	1467	1467
q18	7622	7467	7379	7379
q19	1733	1538	1629	1538
q20	1990	1802	1772	1772
q21	5050	4600	4669	4600
q22	611	536	518	518
Total cold run time: 70417 ms
Total hot run time: 53601 ms

@doris-robot
Copy link

TPC-DS: Total hot run time: 169468 ms 
machine: 'aliyun_ecs.c7a.8xlarge_32C64G'
scripts: https://github.com/apache/doris/tree/master/tools/tpcds-tools
TPC-DS sf100 test result on commit fc2a170d015f77d49d0ac2867e11c68d65fe4605, data reload: false

query1	944	380	365	365
query2	6456	2394	2271	2271
query3	6643	214	209	209
query4	19660	17321	17136	17136
query5	4151	466	443	443
query6	237	165	159	159
query7	4587	290	282	282
query8	327	292	296	292
query9	8481	2400	2354	2354
query10	609	303	300	300
query11	10636	9948	9926	9926
query12	138	89	87	87
query13	1636	368	372	368
query14	10204	6968	7717	6968
query15	234	195	194	194
query16	7735	265	265	265
query17	1896	535	527	527
query18	1821	276	283	276
query19	194	154	156	154
query20	92	83	86	83
query21	211	129	125	125
query22	4306	4107	3983	3983
query23	33757	32935	33202	32935
query24	12022	2860	2820	2820
query25	698	388	384	384
query26	1791	189	149	149
query27	2917	319	321	319
query28	7628	2048	2016	2016
query29	1123	612	603	603
query30	283	147	150	147
query31	985	741	752	741
query32	83	54	53	53
query33	768	285	280	280
query34	978	472	467	467
query35	727	634	635	634
query36	1091	987	961	961
query37	286	68	73	68
query38	2850	2700	2752	2700
query39	858	799	783	783
query40	283	124	124	124
query41	55	51	52	51
query42	123	93	104	93
query43	604	538	557	538
query44	1242	731	730	730
query45	199	172	163	163
query46	1109	705	713	705
query47	1820	1744	1750	1744
query48	367	292	289	289
query49	1183	402	396	396
query50	767	398	388	388
query51	6816	6747	6559	6559
query52	108	88	105	88
query53	354	289	286	286
query54	991	447	471	447
query55	74	76	74	74
query56	278	265	260	260
query57	1149	1042	1045	1042
query58	239	232	246	232
query59	3586	3218	3182	3182
query60	301	270	273	270
query61	94	87	89	87
query62	636	454	461	454
query63	317	288	284	284
query64	9785	2246	1739	1739
query65	3214	3130	3087	3087
query66	1359	337	338	337
query67	15345	15020	15184	15020
query68	4501	542	540	540
query69	463	304	303	303
query70	1129	1118	1138	1118
query71	388	287	280	280
query72	7218	5453	2778	2778
query73	744	328	320	320
query74	6056	5561	5458	5458
query75	3359	2594	2700	2594
query76	2772	953	884	884
query77	435	298	290	290
query78	10250	9868	9747	9747
query79	2386	507	501	501
query80	1101	461	451	451
query81	587	221	220	220
query82	776	108	101	101
query83	233	171	173	171
query84	241	90	82	82
query85	2021	281	260	260
query86	506	300	316	300
query87	3274	3073	3057	3057
query88	4327	2463	2448	2448
query89	499	376	385	376
query90	1832	198	194	194
query91	139	110	111	110
query92	64	59	51	51
query93	2256	516	496	496
query94	1348	187	183	183
query95	412	310	317	310
query96	600	275	271	271
query97	3251	3072	3071	3071
query98	252	198	188	188
query99	1163	819	845	819
Total cold run time: 277024 ms
Total hot run time: 169468 ms

@doris-robot
Copy link

ClickBench: Total hot run time: 31.23 s 
machine: 'aliyun_ecs.c7a.8xlarge_32C64G'
scripts: https://github.com/apache/doris/tree/master/tools/clickbench-tools
ClickBench test result on commit fc2a170d015f77d49d0ac2867e11c68d65fe4605, data reload: false

query1	0.04	0.04	0.03
query2	0.08	0.04	0.04
query3	0.23	0.04	0.04
query4	1.69	0.07	0.06
query5	0.50	0.47	0.47
query6	1.12	0.72	0.72
query7	0.02	0.01	0.01
query8	0.05	0.05	0.04
query9	0.55	0.49	0.50
query10	0.56	0.56	0.55
query11	0.15	0.11	0.11
query12	0.15	0.12	0.12
query13	0.59	0.58	0.60
query14	0.79	0.78	0.78
query15	0.82	0.81	0.81
query16	0.37	0.36	0.37
query17	1.05	1.04	1.04
query18	0.21	0.24	0.25
query19	1.92	1.81	1.69
query20	0.02	0.02	0.01
query21	15.43	0.67	0.66
query22	4.06	6.86	2.42
query23	18.32	1.41	1.29
query24	2.10	0.24	0.21
query25	0.16	0.08	0.08
query26	0.27	0.18	0.17
query27	0.08	0.07	0.07
query28	13.27	1.02	1.01
query29	12.63	3.36	3.30
query30	0.26	0.07	0.07
query31	2.85	0.38	0.38
query32	3.30	0.48	0.48
query33	2.88	2.93	2.92
query34	17.01	4.42	4.42
query35	4.48	4.51	4.55
query36	0.66	0.46	0.47
query37	0.19	0.16	0.15
query38	0.15	0.14	0.14
query39	0.04	0.03	0.04
query40	0.17	0.14	0.15
query41	0.10	0.05	0.05
query42	0.05	0.04	0.04
query43	0.03	0.04	0.04
Total cold run time: 109.4 s
Total hot run time: 31.23 s

@github-actions GitHub Actions
Copy link
Contributor

PR approved by at least one committer and no changes requested.

@github-actions github-actions bot added the approved Indicates a PR has been approved by one committer. label Jun 12, 2024
@morrySnow morrySnow merged commit 5c0adca into apache:master Jun 13, 2024
27 of 30 checks passed
feiniaofeiafei added a commit to feiniaofeiafei/doris that referenced this pull request Jun 13, 2024
@feiniaofeiafei
[Fix](nereids) fix merge aggregate rule, rules should not have mutabl…
6372fc0 
…e members (apache#36145)

This bug is induced by apache#31811.
The innerAggExprIdToAggFunc was a member of MergeAggregate, which was
wrong. Because rules like MergeAggregate are single instances, same
rules applied to different sub-plans will affect each other. This pr
changes innerAggExprIdToAggFunc to a local variable, fixes this bug.

No regression use case was added because it’s not a problem that will
definitely reoccur and requires the same rule to be applied to multiple
plans at the same time.
@feiniaofeiafei feiniaofeiafei mentioned this pull request Jun 13, 2024
Merged
dataroaring pushed a commit that referenced this pull request Jun 13, 2024
@feiniaofeiafei @dataroaring
[Fix](nereids) fix merge aggregate rule, rules should not have mutabl…
58ec058 
…e members (#36145)

This bug is induced by #31811.
The innerAggExprIdToAggFunc was a member of MergeAggregate, which was
wrong. Because rules like MergeAggregate are single instances, same
rules applied to different sub-plans will affect each other. This pr
changes innerAggExprIdToAggFunc to a local variable, fixes this bug.

No regression use case was added because it’s not a problem that will
definitely reoccur and requires the same rule to be applied to multiple
plans at the same time.
morningman pushed a commit that referenced this pull request Jun 13, 2024
@feiniaofeiafei
[Fix](nereids) fix merge aggregate rule, rules should not have mutabl…
e2f7e0d 
…e members (#36223)

cherry-pick #36145  to branch-2.1
@morningman morningman mentioned this pull request Jun 22, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@924060929 924060929 924060929 approved these changes

@morrySnow morrySnow morrySnow approved these changes

Assignees
No one assigned
Labels
approved Indicates a PR has been approved by one committer. dev/2.1.4-merged p0_w reviewed
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@feiniaofeiafei @doris-robot @924060929 @morrySnow @morningman