Skip to content

[fix](nereids) fix join condition with AddMinMax rule hung#47772

Merged
924060929 merged 1 commit intoapache:masterfrom
924060929:fix_join_condition
Feb 12, 2025
Merged

[fix](nereids) fix join condition with AddMinMax rule hung#47772
924060929 merged 1 commit intoapache:masterfrom
924060929:fix_join_condition

Conversation

@924060929
Copy link
Contributor

@924060929 924060929 commented Feb 11, 2025 •
edited
Loading

What problem does this PR solve?

fix join condition with AddMinMax rule hung, introduced by #45081

Check List (For Author)

  • Test

    • Regression test
    • Unit Test
    • Manual test (add detailed scripts or steps below)
    • No need to test or manual test. Explain why:
      • This is a refactor/code format and no logic has been changed.
      • Previous test can cover this change.
      • No code files have been changed.
      • Other reason

  • Behavior changed:

    • No.
    • Yes.

  • Does this need documentation?

    • No.
    • Yes.

Check List (For Reviewer who merge this PR)

  • Confirm the release note
  • Confirm test cases
  • Confirm document
  • Add branch pick label

@Thearas
Copy link
Contributor

Thearas commented Feb 11, 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?

@924060929
Copy link
Contributor Author

924060929 commented Feb 11, 2025

run buildall

@morrySnow morrySnow added the p0_b label Feb 11, 2025
@github-actions github-actions bot added the approved Indicates a PR has been approved by one committer. label Feb 11, 2025
@github-actions
Copy link
Contributor

github-actions bot commented Feb 11, 2025

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

@github-actions
Copy link
Contributor

github-actions bot commented Feb 11, 2025

PR approved by anyone and no changes requested.

@doris-robot
Copy link

doris-robot commented Feb 11, 2025

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

------ Round 1 ----------------------------------
q1	17600	5195	5018	5018
q2	2056	299	168	168
q3	10425	1243	743	743
q4	10239	1000	534	534
q5	7946	2340	2302	2302
q6	193	168	134	134
q7	911	759	590	590
q8	9291	1280	1068	1068
q9	4895	4645	4619	4619
q10	6820	2308	1886	1886
q11	502	274	239	239
q12	339	347	214	214
q13	17767	3673	3022	3022
q14	225	224	211	211
q15	507	456	459	456
q16	643	603	578	578
q17	562	850	336	336
q18	6601	6254	6179	6179
q19	1608	930	532	532
q20	300	313	192	192
q21	2798	2118	1856	1856
q22	372	334	306	306
Total cold run time: 102600 ms
Total hot run time: 31183 ms

----- Round 2, with runtime_filter_mode=off -----
q1	5105	5084	5043	5043
q2	239	326	239	239
q3	2154	2709	2372	2372
q4	1407	1785	1353	1353
q5	4238	4139	4150	4139
q6	213	164	123	123
q7	1860	1806	1669	1669
q8	2595	2656	2556	2556
q9	7219	7160	7133	7133
q10	3016	3228	2820	2820
q11	561	510	509	509
q12	696	773	623	623
q13	3413	3937	3314	3314
q14	288	304	273	273
q15	506	476	446	446
q16	647	687	647	647
q17	1112	1523	1413	1413
q18	7593	7442	7308	7308
q19	764	805	864	805
q20	1950	2025	1860	1860
q21	5467	4948	4699	4699
q22	644	578	542	542
Total cold run time: 51687 ms
Total hot run time: 49886 ms

@doris-robot
Copy link

doris-robot commented Feb 11, 2025

TPC-DS: Total hot run time: 189551 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 1f56000fe3dc7421c1765b4aec636516c8745e2b, data reload: false

query1	1321	973	928	928
query2	6254	1818	1834	1818
query3	11006	4519	4426	4426
query4	56811	25588	23263	23263
query5	5169	504	461	461
query6	341	191	172	172
query7	4936	509	289	289
query8	299	251	218	218
query9	6017	2465	2487	2465
query10	422	302	253	253
query11	15294	15079	14867	14867
query12	157	115	107	107
query13	1143	519	385	385
query14	10135	6223	7035	6223
query15	203	205	187	187
query16	7048	675	482	482
query17	1081	707	549	549
query18	1516	406	318	318
query19	208	218	166	166
query20	127	125	124	124
query21	210	129	108	108
query22	4558	4364	4309	4309
query23	33828	33419	33452	33419
query24	5636	2429	2432	2429
query25	463	473	424	424
query26	684	278	158	158
query27	1734	511	337	337
query28	2802	2426	2409	2409
query29	563	554	429	429
query30	214	190	154	154
query31	905	882	836	836
query32	78	67	64	64
query33	461	381	329	329
query34	793	863	497	497
query35	809	834	755	755
query36	943	1035	911	911
query37	132	114	79	79
query38	4225	4385	4216	4216
query39	1508	1426	1433	1426
query40	224	117	105	105
query41	51	53	48	48
query42	128	107	105	105
query43	490	531	472	472
query44	1319	817	809	809
query45	171	173	163	163
query46	890	1064	651	651
query47	1880	1876	1823	1823
query48	398	423	315	315
query49	691	508	439	439
query50	704	754	414	414
query51	4232	4341	4260	4260
query52	105	102	93	93
query53	233	260	193	193
query54	482	504	416	416
query55	81	82	80	80
query56	258	272	261	261
query57	1159	1182	1111	1111
query58	242	247	278	247
query59	2816	2943	2804	2804
query60	304	277	268	268
query61	119	121	136	121
query62	783	742	688	688
query63	234	188	193	188
query64	1442	1022	680	680
query65	3281	3196	3126	3126
query66	700	393	307	307
query67	15767	15478	15245	15245
query68	2804	797	547	547
query69	444	317	268	268
query70	1181	1111	1144	1111
query71	330	334	260	260
query72	6108	3645	3873	3645
query73	646	744	355	355
query74	9061	9161	8840	8840
query75	3107	3147	2716	2716
query76	1618	1164	734	734
query77	462	411	294	294
query78	9932	10255	9227	9227
query79	1013	872	585	585
query80	820	555	461	461
query81	534	278	235	235
query82	287	153	120	120
query83	184	172	158	158
query84	285	97	74	74
query85	761	357	302	302
query86	343	322	287	287
query87	4447	4661	4504	4504
query88	2868	2226	2172	2172
query89	398	310	289	289
query90	1633	189	188	188
query91	137	145	109	109
query92	68	60	54	54
query93	1256	987	584	584
query94	631	406	300	300
query95	347	259	255	255
query96	476	558	272	272
query97	2804	2818	2742	2742
query98	226	209	212	209
query99	1275	1403	1232	1232
Total cold run time: 285704 ms
Total hot run time: 189551 ms

@doris-robot
Copy link

doris-robot commented Feb 11, 2025

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

query1	0.04	0.04	0.03
query2	0.07	0.04	0.03
query3	0.24	0.06	0.07
query4	1.63	0.10	0.10
query5	0.44	0.41	0.40
query6	1.16	0.66	0.67
query7	0.02	0.02	0.02
query8	0.04	0.04	0.03
query9	0.59	0.52	0.50
query10	0.57	0.57	0.56
query11	0.15	0.10	0.10
query12	0.14	0.11	0.11
query13	0.61	0.59	0.60
query14	2.70	2.78	2.82
query15	0.92	0.84	0.84
query16	0.39	0.38	0.37
query17	1.04	1.03	1.04
query18	0.21	0.20	0.19
query19	1.88	1.83	1.95
query20	0.01	0.01	0.01
query21	15.35	0.92	0.57
query22	0.76	1.15	0.72
query23	14.94	1.38	0.63
query24	7.21	1.55	1.28
query25	0.49	0.22	0.08
query26	0.63	0.17	0.15
query27	0.05	0.05	0.05
query28	10.36	0.83	0.42
query29	12.54	3.92	3.28
query30	0.25	0.09	0.06
query31	2.83	0.59	0.38
query32	3.22	0.55	0.46
query33	3.00	2.96	3.06
query34	15.64	5.13	4.50
query35	4.56	4.52	4.51
query36	0.67	0.49	0.49
query37	0.09	0.06	0.06
query38	0.05	0.04	0.04
query39	0.03	0.03	0.02
query40	0.17	0.14	0.12
query41	0.08	0.02	0.02
query42	0.04	0.03	0.02
query43	0.04	0.03	0.03
Total cold run time: 105.85 s
Total hot run time: 31.09 s

yujun777
yujun777 approved these changes Feb 12, 2025
View reviewed changes
Copy link
Contributor

@yujun777 yujun777 left a comment

Choose a reason for hiding this comment

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

LGTM

@924060929 924060929 merged commit 83ee63c into apache:master Feb 12, 2025
30 of 31 checks passed
@924060929 924060929 deleted the fix_join_condition branch February 12, 2025 03:54
github-actions bot pushed a commit that referenced this pull request Feb 12, 2025
@924060929
[fix](nereids) fix join condition with AddMinMax rule hung (#47772)
5ca5de2 
fix join condition with AddMinMax rule hung, introduced by #45081
@github-actions github-actions bot mentioned this pull request Feb 12, 2025
Merged
github-actions bot pushed a commit that referenced this pull request Feb 12, 2025
@924060929
[fix](nereids) fix join condition with AddMinMax rule hung (#47772)
6ffff0c 
fix join condition with AddMinMax rule hung, introduced by #45081
@github-actions github-actions bot mentioned this pull request Feb 12, 2025
Merged
@yiguolei yiguolei added the usercase Important user case type label label Feb 12, 2025
@morrySnow morrySnow removed the usercase Important user case type label label Feb 13, 2025
yiguolei pushed a commit that referenced this pull request Feb 14, 2025
@github-actions @924060929
branch-2.1: [fix](nereids) fix join condition with AddMinMax rule hung …
03529e3 
…#47772 (#47808)

Cherry-picked from #47772

Co-authored-by: 924060929 <lanhuajian@selectdb.com>
lzyy2024 pushed a commit to lzyy2024/doris that referenced this pull request Feb 21, 2025
@924060929 @lzyy2024
[fix](nereids) fix join condition with AddMinMax rule hung (apache#47772
9b0e432 
)

fix join condition with AddMinMax rule hung, introduced by apache#45081
dataroaring pushed a commit that referenced this pull request Feb 22, 2025
@github-actions @924060929
branch-3.0: [fix](nereids) fix join condition with AddMinMax rule hung …
936d21f 
…#47772 (#47807)

Cherry-picked from #47772

Co-authored-by: 924060929 <lanhuajian@selectdb.com>
koarz pushed a commit to koarz/doris that referenced this pull request Jun 4, 2025
@924060929
[fix](nereids) fix join condition with AddMinMax rule hung (apache#47772
db74ce2 
)

fix join condition with AddMinMax rule hung, introduced by apache#45081
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@morrySnow morrySnow morrySnow approved these changes

+1 more reviewer

@yujun777 yujun777 yujun777 approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

approved Indicates a PR has been approved by one committer. dev/2.1.9-merged dev/3.0.5-merged p0_b reviewed

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@924060929 @Thearas @doris-robot @yujun777 @morrySnow @yiguolei @dataroaring