Skip to content

Conversation

@Hastyshell
Copy link
Collaborator

@Hastyshell Hastyshell commented Jul 31, 2025

What problem does this PR solve?

Problem Summary:

Fix logic conflict of #52538 and #52715

Release note

None

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

@Hastyshell Hastyshell requested a review from morrySnow as a code owner July 31, 2025 03:05
@hello-stephen
Copy link
Contributor

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?

@Hastyshell
Copy link
Collaborator Author

run buildall

@doris-robot
Copy link

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

------ Round 1 ----------------------------------
q1	17657	5495	5518	5495
q2	2065	296	164	164
q3	10678	1271	783	783
q4	10563	868	449	449
q5	9675	2334	2154	2154
q6	192	169	136	136
q7	887	769	624	624
q8	9324	1465	1182	1182
q9	5247	4939	4954	4939
q10	6788	2290	1847	1847
q11	467	285	265	265
q12	345	365	214	214
q13	17770	3650	3034	3034
q14	241	229	205	205
q15	522	481	468	468
q16	424	435	377	377
q17	595	871	370	370
q18	6573	6527	6472	6472
q19	1088	959	577	577
q20	329	357	208	208
q21	2916	2161	1999	1999
q22	1054	1027	994	994
Total cold run time: 105400 ms
Total hot run time: 32956 ms

----- Round 2, with runtime_filter_mode=off -----
q1	5625	5525	5540	5525
q2	245	326	234	234
q3	2241	2665	2339	2339
q4	1336	1802	1330	1330
q5	4479	4952	5006	4952
q6	183	166	132	132
q7	2064	1986	1834	1834
q8	2682	2855	2781	2781
q9	7278	7249	7243	7243
q10	3011	3375	2765	2765
q11	574	506	507	506
q12	678	780	605	605
q13	3399	3755	3153	3153
q14	281	304	285	285
q15	518	477	475	475
q16	439	485	429	429
q17	1227	1783	1264	1264
q18	7580	7521	7404	7404
q19	873	1202	1172	1172
q20	1991	2055	1886	1886
q21	5359	4895	4724	4724
q22	1091	1047	986	986
Total cold run time: 53154 ms
Total hot run time: 52024 ms

@doris-robot
Copy link

TPC-DS: Total hot run time: 198058 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 0acd6436250e65528d02e88236a97fc8fb7b2da6, data reload: false

query1	1294	954	938	938
query2	6247	1909	1903	1903
query3	10925	4292	4328	4292
query4	32728	23725	23564	23564
query5	3706	629	472	472
query6	277	196	192	192
query7	3999	496	332	332
query8	321	259	253	253
query9	9234	2586	2584	2584
query10	472	341	266	266
query11	17985	15426	15230	15230
query12	165	110	106	106
query13	1554	577	430	430
query14	9700	7325	7832	7325
query15	216	198	201	198
query16	7896	672	479	479
query17	1623	768	626	626
query18	2085	422	315	315
query19	216	202	170	170
query20	133	125	118	118
query21	206	130	110	110
query22	4640	4483	4404	4404
query23	35502	34650	34266	34266
query24	7313	2719	2722	2719
query25	500	495	426	426
query26	1197	284	173	173
query27	2079	482	361	361
query28	5108	2230	2197	2197
query29	670	585	459	459
query30	247	201	170	170
query31	987	917	846	846
query32	68	63	57	57
query33	504	364	315	315
query34	762	865	540	540
query35	795	879	738	738
query36	1024	1069	942	942
query37	100	94	68	68
query38	4037	4056	3982	3982
query39	1542	1472	1484	1472
query40	209	122	111	111
query41	53	53	52	52
query42	127	117	107	107
query43	518	542	489	489
query44	1308	822	811	811
query45	187	181	175	175
query46	888	1098	693	693
query47	1936	1983	1933	1933
query48	432	445	350	350
query49	770	512	409	409
query50	692	711	439	439
query51	7335	7272	7329	7272
query52	104	103	102	102
query53	242	271	188	188
query54	548	551	479	479
query55	85	81	87	81
query56	283	303	260	260
query57	1283	1264	1215	1215
query58	241	225	224	224
query59	3139	3225	3070	3070
query60	295	292	277	277
query61	132	116	130	116
query62	822	779	715	715
query63	232	198	209	198
query64	4336	1112	729	729
query65	3392	3382	3303	3303
query66	1004	445	342	342
query67	16294	15732	15568	15568
query68	5265	843	548	548
query69	526	342	274	274
query70	1165	1104	1123	1104
query71	393	293	270	270
query72	5852	3802	3796	3796
query73	644	753	373	373
query74	9826	9137	9088	9088
query75	3157	3161	2668	2668
query76	3193	1186	783	783
query77	480	360	277	277
query78	10392	10520	9615	9615
query79	3545	909	592	592
query80	651	529	440	440
query81	518	259	219	219
query82	634	119	89	89
query83	172	166	153	153
query84	237	99	77	77
query85	781	378	303	303
query86	401	286	304	286
query87	4323	4321	4222	4222
query88	5138	2425	2468	2425
query89	423	342	299	299
query90	1788	196	209	196
query91	138	135	112	112
query92	67	56	51	51
query93	2295	905	543	543
query94	695	416	297	297
query95	350	276	268	268
query96	499	614	291	291
query97	3233	3278	3155	3155
query98	228	207	196	196
query99	1323	1422	1302	1302
Total cold run time: 293276 ms
Total hot run time: 198058 ms

@doris-robot
Copy link

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

query1	0.03	0.04	0.03
query2	0.06	0.03	0.03
query3	0.24	0.07	0.06
query4	1.62	0.11	0.11
query5	0.50	0.52	0.51
query6	1.13	0.74	0.72
query7	0.03	0.02	0.02
query8	0.04	0.03	0.03
query9	0.56	0.49	0.52
query10	0.55	0.55	0.54
query11	0.14	0.11	0.10
query12	0.15	0.11	0.10
query13	0.61	0.59	0.60
query14	0.78	0.80	0.78
query15	0.85	0.83	0.83
query16	0.40	0.40	0.39
query17	1.06	1.02	1.09
query18	0.23	0.21	0.22
query19	1.86	1.90	1.89
query20	0.02	0.01	0.02
query21	15.37	0.95	0.57
query22	0.74	0.66	0.68
query23	15.30	1.44	0.57
query24	2.70	1.51	0.73
query25	0.24	0.22	0.06
query26	0.33	0.16	0.13
query27	0.06	0.05	0.05
query28	13.73	1.09	0.45
query29	12.58	3.92	3.26
query30	0.24	0.09	0.07
query31	2.82	0.59	0.39
query32	3.23	0.55	0.46
query33	2.98	2.99	3.04
query34	16.50	5.20	4.53
query35	4.56	4.51	4.57
query36	0.65	0.49	0.48
query37	0.09	0.06	0.06
query38	0.05	0.03	0.03
query39	0.04	0.02	0.02
query40	0.17	0.13	0.13
query41	0.08	0.03	0.03
query42	0.03	0.03	0.02
query43	0.04	0.03	0.03
Total cold run time: 103.39 s
Total hot run time: 28.69 s

@hello-stephen
Copy link
Contributor

FE UT Coverage Report

Increment line coverage 0.00% (0/20) 🎉
Increment coverage report
Complete coverage report

@morrySnow
Copy link
Contributor

run buildall

@doris-robot
Copy link

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

------ Round 1 ----------------------------------
q1	17602	5413	5370	5370
q2	2045	294	164	164
q3	10422	1281	706	706
q4	10483	895	476	476
q5	8073	2402	2193	2193
q6	192	170	141	141
q7	903	745	614	614
q8	9475	1421	1135	1135
q9	5248	4902	4859	4859
q10	6746	2255	1830	1830
q11	479	290	268	268
q12	341	365	211	211
q13	17783	3597	2990	2990
q14	222	230	207	207
q15	528	477	471	471
q16	407	428	365	365
q17	631	864	361	361
q18	6832	6417	6424	6417
q19	1148	960	558	558
q20	326	331	202	202
q21	2974	2157	1915	1915
q22	1037	1020	1006	1006
Total cold run time: 103897 ms
Total hot run time: 32459 ms

----- Round 2, with runtime_filter_mode=off -----
q1	5543	5517	5631	5517
q2	232	331	228	228
q3	2240	2602	2292	2292
q4	1361	1826	1425	1425
q5	4386	4833	5053	4833
q6	172	164	133	133
q7	2091	1932	1786	1786
q8	2580	2813	2686	2686
q9	7201	7075	7149	7075
q10	2983	3228	2808	2808
q11	584	525	491	491
q12	687	740	594	594
q13	3349	3706	3162	3162
q14	274	310	269	269
q15	565	479	495	479
q16	425	478	430	430
q17	1212	1739	1265	1265
q18	7777	7450	7386	7386
q19	808	1112	1080	1080
q20	1968	2030	1856	1856
q21	5147	4839	4671	4671
q22	1114	1102	1069	1069
Total cold run time: 52699 ms
Total hot run time: 51535 ms

@doris-robot
Copy link

TPC-DS: Total hot run time: 189742 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 dbe80135d635443451cea47c66516daf441abdf0, data reload: false

query1	965	411	384	384
query2	6531	1936	1885	1885
query3	6710	212	221	212
query4	33908	23570	23847	23570
query5	4350	612	449	449
query6	281	188	175	175
query7	4625	486	322	322
query8	297	236	233	233
query9	9662	2600	2587	2587
query10	461	328	269	269
query11	18548	15366	15171	15171
query12	147	108	106	106
query13	1668	560	411	411
query14	9950	7043	6494	6494
query15	246	191	178	178
query16	8127	606	464	464
query17	1635	756	559	559
query18	2149	419	331	331
query19	228	181	152	152
query20	129	119	113	113
query21	203	125	112	112
query22	4666	4720	4341	4341
query23	34508	33410	33651	33410
query24	7467	2599	2598	2598
query25	481	445	390	390
query26	1204	276	161	161
query27	2048	474	336	336
query28	5150	2179	2119	2119
query29	750	547	440	440
query30	250	177	159	159
query31	978	861	825	825
query32	94	60	57	57
query33	504	350	310	310
query34	733	843	499	499
query35	794	790	705	705
query36	985	1016	942	942
query37	98	88	67	67
query38	3914	3880	3875	3875
query39	1492	1419	1397	1397
query40	198	115	103	103
query41	49	48	47	47
query42	118	100	102	100
query43	522	524	483	483
query44	1328	813	823	813
query45	184	173	168	168
query46	863	1027	658	658
query47	1936	1960	1871	1871
query48	423	421	352	352
query49	793	529	401	401
query50	673	693	450	450
query51	7230	7193	7018	7018
query52	102	102	99	99
query53	233	256	182	182
query54	547	539	474	474
query55	81	78	79	78
query56	283	286	257	257
query57	1243	1231	1139	1139
query58	243	224	222	222
query59	3003	3089	2900	2900
query60	302	294	283	283
query61	135	190	142	142
query62	813	737	658	658
query63	230	196	191	191
query64	4718	1068	713	713
query65	3292	3219	3184	3184
query66	1070	437	321	321
query67	16027	15620	15619	15619
query68	4557	841	558	558
query69	530	320	263	263
query70	1202	1077	1130	1077
query71	504	304	263	263
query72	5788	3692	3877	3692
query73	634	730	357	357
query74	10278	9081	9004	9004
query75	3190	3180	2674	2674
query76	3227	1167	758	758
query77	455	355	271	271
query78	10373	10339	9635	9635
query79	3457	903	586	586
query80	781	516	430	430
query81	498	253	220	220
query82	646	117	88	88
query83	169	160	143	143
query84	243	108	75	75
query85	781	341	291	291
query86	400	313	271	271
query87	4245	4318	4295	4295
query88	5150	2379	2364	2364
query89	400	336	297	297
query90	1843	184	187	184
query91	134	136	107	107
query92	64	56	53	53
query93	2557	915	537	537
query94	701	408	308	308
query95	355	270	278	270
query96	497	609	283	283
query97	3184	3259	3115	3115
query98	227	209	202	202
query99	1500	1407	1337	1337
Total cold run time: 292145 ms
Total hot run time: 189742 ms

@doris-robot
Copy link

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

query1	0.04	0.04	0.03
query2	0.07	0.03	0.03
query3	0.24	0.07	0.07
query4	1.62	0.11	0.10
query5	0.51	0.53	0.52
query6	1.15	0.72	0.73
query7	0.02	0.02	0.02
query8	0.04	0.04	0.03
query9	0.58	0.51	0.53
query10	0.56	0.55	0.56
query11	0.14	0.10	0.10
query12	0.14	0.12	0.11
query13	0.62	0.60	0.58
query14	0.77	0.79	0.80
query15	0.85	0.84	0.82
query16	0.37	0.38	0.38
query17	1.03	1.06	1.01
query18	0.24	0.22	0.22
query19	1.91	1.86	1.70
query20	0.01	0.01	0.02
query21	15.39	0.97	0.58
query22	0.76	0.81	0.58
query23	15.22	1.43	0.54
query24	3.50	1.20	0.70
query25	0.23	0.11	0.13
query26	0.24	0.15	0.14
query27	0.05	0.05	0.05
query28	13.47	0.98	0.43
query29	12.58	4.06	3.44
query30	0.26	0.10	0.06
query31	2.81	0.60	0.38
query32	3.23	0.53	0.46
query33	2.98	2.97	2.96
query34	16.62	5.18	4.52
query35	4.54	4.62	4.51
query36	0.64	0.48	0.47
query37	0.08	0.06	0.06
query38	0.04	0.04	0.03
query39	0.04	0.02	0.02
query40	0.16	0.14	0.13
query41	0.08	0.03	0.02
query42	0.04	0.03	0.02
query43	0.04	0.03	0.03
Total cold run time: 103.91 s
Total hot run time: 28.54 s

@hello-stephen
Copy link
Contributor

FE UT Coverage Report

Increment line coverage 0.00% (0/19) 🎉
Increment coverage report
Complete coverage report

1 similar comment
@hello-stephen
Copy link
Contributor

FE UT Coverage Report

Increment line coverage 0.00% (0/19) 🎉
Increment coverage report
Complete coverage report

@morrySnow morrySnow merged commit c798c20 into apache:branch-3.1 Aug 4, 2025
22 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants