Skip to content

branch-3.0: [fix](trash) Fix shadow variable causing garbage scheduling time errors #51647 #51687

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
Merged
dataroaring merged 1 commit into from
Jun 20, 2025
Merged

branch-3.0: [fix](trash) Fix shadow variable causing garbage scheduling time errors #51647 #51687

dataroaring merged 1 commit into from
Jun 20, 2025

Conversation

@github-actions
Copy link
Contributor

@github-actions github-actions bot commented Jun 12, 2025

Cherry-picked from #51647

@deardeng
[fix](trash) Fix shadow variable causing garbage scheduling time erro…
14b9875 
…rs (#51647)

shadow variable lead to curr_interval always equal 300s
@github-actions github-actions bot requested a review from dataroaring as a code owner June 12, 2025 14:12
@hello-stephen
Copy link
Contributor

hello-stephen commented Jun 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 Jun 12, 2025
@hello-stephen
Copy link
Contributor

hello-stephen commented Jun 12, 2025

run buildall

1 similar comment
@dataroaring
Copy link
Contributor

dataroaring commented Jun 18, 2025

run buildall

@doris-robot
Copy link

doris-robot commented Jun 18, 2025

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

------ Round 1 ----------------------------------
q1	17586	6762	6590	6590
q2	2084	168	170	168
q3	10592	1091	1192	1091
q4	10577	789	728	728
q5	7749	2885	2823	2823
q6	208	133	135	133
q7	967	623	619	619
q8	9365	2003	2035	2003
q9	6579	6366	6422	6366
q10	7040	2282	2322	2282
q11	460	260	257	257
q12	402	219	218	218
q13	17796	3013	3000	3000
q14	235	212	208	208
q15	488	472	456	456
q16	478	379	376	376
q17	992	552	611	552
q18	7299	6737	6702	6702
q19	1402	1040	1139	1040
q20	490	199	201	199
q21	3938	3201	3097	3097
q22	1082	960	968	960
Total cold run time: 107809 ms
Total hot run time: 39868 ms

----- Round 2, with runtime_filter_mode=off -----
q1	6543	6536	6585	6536
q2	335	235	232	232
q3	2928	2794	2920	2794
q4	2092	1829	1832	1829
q5	5763	5774	5774	5774
q6	208	131	129	129
q7	2232	1825	1811	1811
q8	3390	3557	3532	3532
q9	8959	8804	8919	8804
q10	3585	3529	3498	3498
q11	592	485	489	485
q12	787	610	641	610
q13	8911	3178	3180	3178
q14	313	281	274	274
q15	510	465	466	465
q16	483	442	441	441
q17	1851	1630	1616	1616
q18	8208	7831	7645	7645
q19	1745	1826	1456	1456
q20	2128	1888	1817	1817
q21	5109	4988	5146	4988
q22	1119	1003	1036	1003
Total cold run time: 67791 ms
Total hot run time: 58917 ms

@doris-robot
Copy link

doris-robot commented Jun 18, 2025

TPC-DS: Total hot run time: 196065 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 14b98750c9b2da33d0f82ccf472b4d5f67b65d39, data reload: false

query1	1280	895	881	881
query2	6409	1997	1957	1957
query3	10810	4144	4033	4033
query4	61714	29572	23501	23501
query5	5152	461	451	451
query6	413	186	200	186
query7	5534	316	302	302
query8	315	225	225	225
query9	8892	2587	2579	2579
query10	468	277	257	257
query11	17634	15225	16174	15225
query12	156	109	106	106
query13	1441	441	423	423
query14	10512	7650	6924	6924
query15	221	181	184	181
query16	7131	512	501	501
query17	1120	601	581	581
query18	1873	319	321	319
query19	215	165	161	161
query20	119	112	115	112
query21	200	104	101	101
query22	4693	4482	4628	4482
query23	34428	33659	33796	33659
query24	6123	2987	2932	2932
query25	547	419	416	416
query26	656	172	168	168
query27	1803	367	356	356
query28	3908	2194	2132	2132
query29	710	465	448	448
query30	244	155	158	155
query31	1001	792	862	792
query32	68	57	60	57
query33	446	312	311	311
query34	911	521	550	521
query35	826	746	713	713
query36	1079	944	967	944
query37	109	69	72	69
query38	4031	3958	3936	3936
query39	1517	1500	1457	1457
query40	208	97	97	97
query41	49	49	46	46
query42	118	103	105	103
query43	553	479	501	479
query44	1210	826	833	826
query45	183	170	173	170
query46	1131	744	743	743
query47	2026	1883	1887	1883
query48	484	391	382	382
query49	742	414	425	414
query50	856	420	453	420
query51	7344	7388	7313	7313
query52	99	92	89	89
query53	265	179	182	179
query54	586	454	458	454
query55	74	80	75	75
query56	268	244	253	244
query57	1300	1219	1196	1196
query58	212	208	232	208
query59	3274	3140	3074	3074
query60	289	256	260	256
query61	114	107	106	106
query62	771	678	674	674
query63	217	192	188	188
query64	1366	655	622	622
query65	3240	3184	3202	3184
query66	708	294	306	294
query67	15947	15436	15571	15436
query68	4249	585	586	585
query69	439	271	263	263
query70	1170	1143	1106	1106
query71	359	250	253	250
query72	6337	3963	4161	3963
query73	760	345	355	345
query74	10162	9204	9033	9033
query75	3339	2639	2647	2639
query76	1990	1007	1067	1007
query77	489	265	265	265
query78	10503	9557	9505	9505
query79	2166	613	591	591
query80	1391	429	427	427
query81	524	216	219	216
query82	1274	88	88	88
query83	270	144	152	144
query84	281	79	78	78
query85	1044	297	302	297
query86	411	299	308	299
query87	4474	4245	4256	4245
query88	3819	2365	2381	2365
query89	423	298	293	293
query90	1957	185	187	185
query91	184	148	146	146
query92	63	46	49	46
query93	2774	560	563	560
query94	811	296	298	296
query95	357	254	255	254
query96	621	300	279	279
query97	3298	3132	3119	3119
query98	215	200	196	196
query99	1573	1325	1271	1271
Total cold run time: 316070 ms
Total hot run time: 196065 ms

@doris-robot
Copy link

doris-robot commented Jun 18, 2025

BE UT Coverage Report

Increment line coverage 0.00% (0/3) 🎉

Increment coverage report
Complete coverage report

Category Coverage
Function Coverage 41.16% (10903/26487)
Line Coverage 31.97% (93240/291662)
Region Coverage 31.05% (48090/154883)
Branch Coverage 27.52% (24638/89520)

@doris-robot
Copy link

doris-robot commented Jun 18, 2025

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

query1	0.04	0.03	0.02
query2	0.07	0.03	0.03
query3	0.24	0.06	0.07
query4	1.62	0.11	0.10
query5	0.53	0.53	0.51
query6	1.14	0.73	0.74
query7	0.03	0.02	0.01
query8	0.04	0.03	0.03
query9	0.57	0.50	0.51
query10	0.56	0.54	0.56
query11	0.14	0.11	0.11
query12	0.14	0.13	0.11
query13	0.61	0.59	0.60
query14	0.76	0.80	0.81
query15	0.84	0.82	0.82
query16	0.39	0.38	0.39
query17	1.05	1.02	1.09
query18	0.24	0.22	0.21
query19	1.92	1.87	1.87
query20	0.01	0.00	0.01
query21	15.40	0.60	0.57
query22	2.60	2.14	1.89
query23	16.94	0.84	0.85
query24	3.47	0.99	2.20
query25	0.33	0.18	0.07
query26	0.42	0.14	0.13
query27	0.04	0.04	0.04
query28	9.26	0.50	0.45
query29	12.56	3.28	3.24
query30	0.24	0.06	0.06
query31	2.84	0.39	0.39
query32	3.24	0.46	0.46
query33	2.94	2.98	3.02
query34	16.51	4.51	4.51
query35	4.55	4.55	4.52
query36	0.69	0.48	0.48
query37	0.08	0.06	0.06
query38	0.04	0.03	0.04
query39	0.03	0.02	0.02
query40	0.17	0.14	0.13
query41	0.07	0.03	0.02
query42	0.03	0.02	0.02
query43	0.03	0.02	0.02
Total cold run time: 103.42 s
Total hot run time: 30.36 s

dataroaring
dataroaring approved these changes Jun 20, 2025
View reviewed changes
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 75d29d8 into branch-3.0 Jun 20, 2025
21 of 25 checks passed
@github-actions github-actions bot deleted the auto-pick-51647-branch-3.0 branch June 20, 2025 01:54
deardeng added a commit to deardeng/incubator-doris that referenced this pull request Jul 30, 2025
@deardeng
Revert "branch-3.0: [fix](trash) Fix shadow variable causing garbage …
4d222fa 
…scheduling time errors apache#51647 (apache#51687)"

This reverts commit 75d29d8.
@deardeng deardeng mentioned this pull request Jul 30, 2025
Merged
16 tasks
dataroaring pushed a commit that referenced this pull request Jul 31, 2025
@deardeng
Revert "branch-3.0: [fix](trash) Fix shadow variable causing garbage … (
967df47 
#54073)

…scheduling time errors #51647 (#51687)"

This reverts commit 75d29d8.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@dataroaring dataroaring dataroaring approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@hello-stephen @dataroaring @doris-robot @deardeng