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.

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

branch-3.0: [fix](nereids) fix join condition with AddMinMax rule hung #47772 #47807

Merged
merged 1 commit into from
Feb 22, 2025

Conversation

github-actions[bot]
Copy link
Contributor

Cherry-picked from #47772

fix join condition with AddMinMax rule hung, introduced by #45081
@Thearas
Copy link
Contributor

Thearas commented Feb 12, 2025

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

Please clearly describe your PR:

  1. What problem was fixed (it's best to include specific error reporting information). How it was fixed.
  2. Which behaviors were modified. What was the previous behavior, what is it now, why was it modified, and what possible impacts might there be.
  3. What features were added. Why was this function added?
  4. Which code was refactored and why was this part of the code refactored?
  5. Which functions were optimized and what is the difference before and after the optimization?

@dataroaring dataroaring reopened this Feb 12, 2025
@Thearas
Copy link
Contributor

Thearas commented Feb 12, 2025

run buildall

@doris-robot
Copy link

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

------ Round 1 ----------------------------------
q1	17577	7375	7227	7227
q2	2052	172	189	172
q3	10555	1050	1161	1050
q4	10571	735	721	721
q5	7732	2830	2842	2830
q6	238	145	142	142
q7	982	620	619	619
q8	9362	1907	2033	1907
q9	6644	6393	6378	6378
q10	6984	2276	2322	2276
q11	461	272	267	267
q12	403	215	212	212
q13	17797	2996	2991	2991
q14	250	215	211	211
q15	576	513	533	513
q16	657	612	575	575
q17	951	546	576	546
q18	7328	6726	6551	6551
q19	1404	1027	1014	1014
q20	491	213	211	211
q21	4041	3182	3237	3182
q22	1095	1028	1011	1011
Total cold run time: 108151 ms
Total hot run time: 40606 ms

----- Round 2, with runtime_filter_mode=off -----
q1	7329	7361	7301	7301
q2	330	247	228	228
q3	2993	3039	3080	3039
q4	2140	1897	1876	1876
q5	5720	5769	5798	5769
q6	223	139	139	139
q7	2282	1824	1849	1824
q8	3384	3558	3598	3558
q9	8883	9106	9129	9106
q10	3649	3685	3655	3655
q11	604	528	510	510
q12	835	644	654	644
q13	12888	3217	3229	3217
q14	325	285	276	276
q15	579	522	520	520
q16	698	661	667	661
q17	1827	1616	1665	1616
q18	8303	7785	7673	7673
q19	1723	1429	1557	1429
q20	2060	1825	1807	1807
q21	5443	5351	5199	5199
q22	1148	1073	1032	1032
Total cold run time: 73366 ms
Total hot run time: 61079 ms

@doris-robot
Copy link

TPC-DS: Total hot run time: 199422 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 5ca5de2f38926cd0580da756d47085ff3baedc63, data reload: false

query1	1297	920	903	903
query2	6270	2203	2088	2088
query3	10950	4704	4395	4395
query4	62492	29434	23710	23710
query5	5183	475	459	459
query6	402	183	176	176
query7	5489	315	315	315
query8	317	229	226	226
query9	8491	2693	2684	2684
query10	442	285	275	275
query11	17606	15251	15886	15251
query12	165	108	109	108
query13	1434	459	432	432
query14	10809	7448	7789	7448
query15	202	180	187	180
query16	7169	503	489	489
query17	1184	593	605	593
query18	1815	323	314	314
query19	210	162	160	160
query20	121	115	111	111
query21	209	104	110	104
query22	4778	4606	4658	4606
query23	34765	33992	34098	33992
query24	6242	2941	3015	2941
query25	546	442	435	435
query26	654	188	179	179
query27	1826	359	363	359
query28	4163	2459	2453	2453
query29	720	498	430	430
query30	244	167	166	166
query31	1016	830	837	830
query32	66	57	60	57
query33	407	294	295	294
query34	959	518	531	518
query35	870	735	730	730
query36	1096	964	995	964
query37	122	73	75	73
query38	4085	4085	4065	4065
query39	1513	1500	1499	1499
query40	203	102	100	100
query41	49	48	49	48
query42	127	102	100	100
query43	550	512	520	512
query44	1212	855	862	855
query45	190	174	179	174
query46	1147	725	730	725
query47	1993	1926	1941	1926
query48	478	375	388	375
query49	735	399	397	397
query50	848	449	432	432
query51	7361	7165	7371	7165
query52	111	92	96	92
query53	261	190	192	190
query54	593	471	472	471
query55	87	80	84	80
query56	286	255	247	247
query57	1282	1174	1179	1174
query58	228	235	224	224
query59	3358	3204	2903	2903
query60	291	255	261	255
query61	112	116	109	109
query62	837	747	740	740
query63	224	196	196	196
query64	1401	682	669	669
query65	3261	3265	3213	3213
query66	709	313	305	305
query67	15963	15665	15718	15665
query68	4190	606	572	572
query69	428	268	267	267
query70	1210	1119	1151	1119
query71	370	272	258	258
query72	6404	4115	4130	4115
query73	763	346	358	346
query74	10185	9182	9101	9101
query75	3374	2661	2644	2644
query76	1985	1010	1159	1010
query77	546	280	276	276
query78	10566	9695	9642	9642
query79	1442	620	603	603
query80	885	442	437	437
query81	506	246	240	240
query82	1309	118	127	118
query83	165	145	166	145
query84	286	85	84	84
query85	846	316	300	300
query86	323	309	300	300
query87	4462	4390	4284	4284
query88	3685	2377	2357	2357
query89	425	298	297	297
query90	2036	190	193	190
query91	185	151	153	151
query92	61	50	53	50
query93	1928	557	554	554
query94	752	314	296	296
query95	354	261	259	259
query96	626	280	285	280
query97	3315	3172	3221	3172
query98	229	218	224	218
query99	1906	1450	1383	1383
Total cold run time: 315973 ms
Total hot run time: 199422 ms

@doris-robot
Copy link

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

query1	0.03	0.03	0.03
query2	0.07	0.03	0.03
query3	0.23	0.06	0.06
query4	1.62	0.10	0.10
query5	0.53	0.51	0.53
query6	1.13	0.74	0.72
query7	0.02	0.02	0.02
query8	0.04	0.03	0.05
query9	0.58	0.50	0.48
query10	0.55	0.56	0.56
query11	0.14	0.10	0.11
query12	0.14	0.11	0.10
query13	0.60	0.59	0.61
query14	2.87	2.75	2.88
query15	0.91	0.83	0.82
query16	0.39	0.37	0.39
query17	1.03	1.08	1.06
query18	0.24	0.21	0.23
query19	1.96	1.81	2.03
query20	0.01	0.01	0.01
query21	15.36	0.57	0.54
query22	2.59	2.02	2.00
query23	16.94	1.04	0.91
query24	3.05	1.47	1.77
query25	0.21	0.16	0.15
query26	0.40	0.13	0.13
query27	0.05	0.05	0.04
query28	9.58	1.11	1.08
query29	12.59	3.27	3.29
query30	0.25	0.06	0.06
query31	2.88	0.39	0.38
query32	3.23	0.45	0.45
query33	3.01	2.99	3.07
query34	17.17	4.53	4.51
query35	4.58	4.53	4.51
query36	0.68	0.48	0.49
query37	0.09	0.06	0.06
query38	0.04	0.03	0.04
query39	0.03	0.02	0.03
query40	0.16	0.12	0.12
query41	0.07	0.02	0.02
query42	0.03	0.02	0.02
query43	0.03	0.03	0.03
Total cold run time: 106.11 s
Total hot run time: 33.63 s

@shuke987
Copy link
Collaborator

run buildall

@doris-robot
Copy link

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

------ Round 1 ----------------------------------
q1	17577	7280	7192	7192
q2	2053	166	171	166
q3	10558	1043	1124	1043
q4	10268	731	806	731
q5	7762	2780	2778	2778
q6	232	146	141	141
q7	954	597	595	595
q8	9344	1965	2015	1965
q9	6620	6402	6403	6402
q10	7266	2362	2375	2362
q11	464	263	272	263
q12	397	209	201	201
q13	17782	2959	3027	2959
q14	230	213	203	203
q15	570	524	529	524
q16	666	576	585	576
q17	972	540	598	540
q18	7196	6825	6982	6825
q19	1444	1100	1097	1097
q20	486	211	200	200
q21	3988	3260	3210	3210
q22	1113	1022	1020	1020
Total cold run time: 107942 ms
Total hot run time: 40993 ms

----- Round 2, with runtime_filter_mode=off -----
q1	7267	7243	7231	7231
q2	329	235	230	230
q3	2888	2941	2934	2934
q4	2134	1917	1905	1905
q5	5889	5925	5858	5858
q6	230	137	137	137
q7	2279	1845	1946	1845
q8	3422	3624	3657	3624
q9	8972	8992	8816	8816
q10	3613	3606	3584	3584
q11	617	517	517	517
q12	815	591	617	591
q13	16692	3205	3081	3081
q14	302	281	270	270
q15	587	527	528	527
q16	704	676	656	656
q17	1819	1627	1625	1625
q18	8221	7714	7712	7712
q19	1668	1457	1627	1457
q20	2042	1861	1866	1861
q21	5586	5250	5228	5228
q22	1140	1096	1031	1031
Total cold run time: 77216 ms
Total hot run time: 60720 ms

@doris-robot
Copy link

TPC-DS: Total hot run time: 197274 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 5ca5de2f38926cd0580da756d47085ff3baedc63, data reload: false

query1	1305	883	903	883
query2	6225	2167	2152	2152
query3	10951	4478	4416	4416
query4	62331	29043	23425	23425
query5	5279	434	433	433
query6	396	167	174	167
query7	5471	300	306	300
query8	294	223	229	223
query9	8708	2685	2680	2680
query10	455	267	255	255
query11	17916	15007	15643	15007
query12	167	108	104	104
query13	1439	445	429	429
query14	10483	7571	7132	7132
query15	202	177	180	177
query16	7189	497	522	497
query17	1142	599	582	582
query18	1827	324	320	320
query19	216	166	154	154
query20	116	113	109	109
query21	211	104	102	102
query22	4614	4686	4601	4601
query23	34740	33947	34172	33947
query24	6158	2858	2932	2858
query25	533	410	396	396
query26	654	164	168	164
query27	1859	361	350	350
query28	4115	2463	2461	2461
query29	682	446	411	411
query30	248	167	165	165
query31	1044	808	858	808
query32	77	60	60	60
query33	444	284	278	278
query34	919	505	509	505
query35	824	734	708	708
query36	1083	968	959	959
query37	114	69	76	69
query38	4110	4008	3975	3975
query39	1522	1455	1441	1441
query40	205	98	101	98
query41	52	47	49	47
query42	115	101	101	101
query43	558	509	505	505
query44	1187	817	831	817
query45	181	172	168	168
query46	1151	735	719	719
query47	2045	1940	1963	1940
query48	492	372	381	372
query49	750	413	389	389
query50	844	415	411	411
query51	7379	7286	7149	7149
query52	102	86	91	86
query53	264	180	185	180
query54	582	475	451	451
query55	73	72	79	72
query56	251	239	251	239
query57	1283	1216	1129	1129
query58	212	217	213	213
query59	3267	3057	3038	3038
query60	276	247	244	244
query61	103	103	104	103
query62	824	710	729	710
query63	208	184	187	184
query64	1377	657	643	643
query65	3294	3171	3262	3171
query66	693	289	307	289
query67	16004	15686	15682	15682
query68	3856	595	563	563
query69	426	265	262	262
query70	1146	1125	1099	1099
query71	349	260	245	245
query72	6351	4034	3973	3973
query73	744	340	349	340
query74	10167	8967	9333	8967
query75	3349	2622	2604	2604
query76	1982	1129	1124	1124
query77	480	267	262	262
query78	10501	9587	9551	9551
query79	1130	594	606	594
query80	763	420	412	412
query81	509	237	237	237
query82	1283	118	113	113
query83	157	138	149	138
query84	280	78	73	73
query85	815	293	280	280
query86	316	292	288	288
query87	4476	4264	4247	4247
query88	3599	2378	2329	2329
query89	413	292	285	285
query90	2009	181	185	181
query91	180	151	149	149
query92	61	49	50	49
query93	1160	536	543	536
query94	724	269	290	269
query95	349	251	250	250
query96	601	274	274	274
query97	3352	3140	3193	3140
query98	218	201	192	192
query99	1651	1429	1395	1395
Total cold run time: 313232 ms
Total hot run time: 197274 ms

@doris-robot
Copy link

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

query1	0.04	0.03	0.03
query2	0.07	0.03	0.03
query3	0.23	0.07	0.07
query4	1.63	0.10	0.10
query5	0.51	0.52	0.51
query6	1.14	0.72	0.73
query7	0.02	0.02	0.02
query8	0.04	0.05	0.03
query9	0.55	0.50	0.50
query10	0.54	0.54	0.57
query11	0.14	0.10	0.10
query12	0.13	0.11	0.12
query13	0.61	0.60	0.60
query14	2.72	2.73	2.85
query15	0.90	0.82	0.82
query16	0.38	0.39	0.38
query17	1.06	1.04	1.07
query18	0.23	0.22	0.22
query19	1.84	1.85	2.05
query20	0.01	0.00	0.01
query21	15.36	0.55	0.56
query22	2.76	2.08	1.46
query23	17.21	0.83	0.77
query24	3.23	1.09	1.90
query25	0.28	0.10	0.06
query26	0.61	0.14	0.13
query27	0.05	0.04	0.03
query28	9.82	1.10	1.06
query29	12.56	3.27	3.25
query30	0.24	0.05	0.05
query31	2.87	0.38	0.38
query32	3.25	0.47	0.45
query33	2.98	3.00	3.03
query34	17.00	4.48	4.51
query35	4.55	4.56	4.54
query36	0.67	0.49	0.48
query37	0.09	0.06	0.06
query38	0.04	0.03	0.04
query39	0.03	0.02	0.03
query40	0.15	0.13	0.12
query41	0.08	0.03	0.02
query42	0.03	0.03	0.02
query43	0.03	0.02	0.02
Total cold run time: 106.68 s
Total hot run time: 32.47 s

Copy link
Contributor

@dataroaring dataroaring left a comment

Choose a reason for hiding this comment

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

LGTM

@dataroaring dataroaring merged commit 936d21f into branch-3.0 Feb 22, 2025
23 of 24 checks passed
@github-actions github-actions bot deleted the auto-pick-47772-branch-3.0 branch February 22, 2025 06:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants