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

[refactor](metrics) Remove IntAtomicCounter & CoreLocal #45742

Merged
merged 2 commits into from
Dec 23, 2024

Conversation

zhiqiang-hhhh
Copy link
Contributor

What problem does this PR solve?

  1. Remove IntAtomicCounter, it is equal to IntCounter.
  2. Remove CoreLocal related code. It is not used any more.

Related PR: #xxx

Problem Summary:

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

@Thearas
Copy link
Contributor

Thearas commented Dec 20, 2024

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?

@zhiqiang-hhhh
Copy link
Contributor Author

run buildall

@zhiqiang-hhhh zhiqiang-hhhh changed the title [refactor](metrics) Remove [refactor](metrics) Remove IntAtomicCounter & CoreLocal Dec 20, 2024
@doris-robot
Copy link

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

------ Round 1 ----------------------------------
q1	17596	7626	7443	7443
q2	2051	184	186	184
q3	10526	1941	1193	1193
q4	10235	814	706	706
q5	7596	2744	2730	2730
q6	237	147	145	145
q7	1008	622	604	604
q8	9248	1880	1969	1880
q9	6625	6503	6506	6503
q10	7016	2274	2314	2274
q11	467	250	259	250
q12	438	229	229	229
q13	17813	2968	2974	2968
q14	239	213	227	213
q15	565	503	494	494
q16	664	578	593	578
q17	1031	535	531	531
q18	7382	6739	6624	6624
q19	1348	1054	1180	1054
q20	481	180	181	180
q21	4152	3350	3293	3293
q22	375	307	321	307
Total cold run time: 107093 ms
Total hot run time: 40383 ms

----- Round 2, with runtime_filter_mode=off -----
q1	7276	7244	7237	7237
q2	337	232	238	232
q3	2965	2965	3082	2965
q4	2143	1921	1814	1814
q5	5686	5652	5619	5619
q6	224	142	139	139
q7	2169	1804	1888	1804
q8	3390	3520	3586	3520
q9	8934	8969	8955	8955
q10	3620	3554	3538	3538
q11	595	504	512	504
q12	853	647	615	615
q13	13318	3020	3096	3020
q14	309	259	278	259
q15	564	494	496	494
q16	663	620	643	620
q17	1819	1609	1567	1567
q18	7935	7374	7499	7374
q19	1704	1495	1458	1458
q20	2048	1871	1819	1819
q21	5470	5238	5315	5238
q22	637	554	557	554
Total cold run time: 72659 ms
Total hot run time: 59345 ms

@doris-robot
Copy link

TPC-DS: Total hot run time: 190027 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 4cb10a58d44c088b5489780710553e6e1d6a7050, data reload: false

query1	988	384	375	375
query2	6545	2373	2259	2259
query3	6705	214	222	214
query4	33626	23311	23290	23290
query5	4406	469	472	469
query6	287	210	185	185
query7	4642	304	307	304
query8	309	235	216	216
query9	9600	2645	2627	2627
query10	491	247	249	247
query11	18165	15088	15110	15088
query12	149	104	102	102
query13	1658	410	390	390
query14	10304	7374	7275	7275
query15	266	182	183	182
query16	8410	422	479	422
query17	1590	599	575	575
query18	2168	304	301	301
query19	345	166	159	159
query20	119	111	113	111
query21	217	106	110	106
query22	4757	4467	4337	4337
query23	34437	33608	33914	33608
query24	10639	2371	2358	2358
query25	634	386	374	374
query26	1608	147	152	147
query27	2797	329	327	327
query28	7839	2425	2360	2360
query29	970	406	413	406
query30	293	143	149	143
query31	1027	820	818	818
query32	100	54	59	54
query33	785	296	299	296
query34	966	509	509	509
query35	877	732	747	732
query36	1087	940	970	940
query37	166	74	76	74
query38	4203	4177	4033	4033
query39	1492	1440	1432	1432
query40	293	105	100	100
query41	51	44	44	44
query42	117	100	102	100
query43	567	494	491	491
query44	1274	804	820	804
query45	195	158	168	158
query46	1166	716	709	709
query47	1944	1853	1835	1835
query48	412	309	317	309
query49	1277	400	402	400
query50	812	382	406	382
query51	7260	7178	7134	7134
query52	104	94	91	91
query53	261	183	187	183
query54	1118	418	411	411
query55	85	76	81	76
query56	255	279	239	239
query57	1268	1119	1134	1119
query58	237	236	226	226
query59	3234	3037	3087	3037
query60	290	251	266	251
query61	133	127	146	127
query62	913	699	680	680
query63	248	191	187	187
query64	5182	678	616	616
query65	3272	3163	3228	3163
query66	1117	321	312	312
query67	15750	15574	15536	15536
query68	4928	546	554	546
query69	453	257	252	252
query70	1197	1169	1128	1128
query71	417	245	261	245
query72	6896	4060	4075	4060
query73	786	362	355	355
query74	10392	8925	8767	8767
query75	3413	2597	2612	2597
query76	3040	1079	1102	1079
query77	668	276	277	276
query78	10282	9460	9386	9386
query79	2220	612	617	612
query80	753	428	516	428
query81	509	241	233	233
query82	956	114	118	114
query83	171	150	162	150
query84	235	83	72	72
query85	1550	302	304	302
query86	451	304	310	304
query87	4422	4412	4254	4254
query88	4051	2176	2136	2136
query89	419	296	290	290
query90	1993	183	186	183
query91	138	111	104	104
query92	67	55	50	50
query93	1890	533	558	533
query94	843	293	292	292
query95	355	252	252	252
query96	622	274	276	274
query97	2860	2721	2686	2686
query98	226	198	197	197
query99	1591	1369	1305	1305
Total cold run time: 303296 ms
Total hot run time: 190027 ms

@doris-robot
Copy link

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

query1	0.03	0.04	0.03
query2	0.07	0.05	0.03
query3	0.23	0.07	0.08
query4	1.60	0.10	0.11
query5	0.42	0.44	0.40
query6	1.15	0.65	0.67
query7	0.02	0.02	0.01
query8	0.04	0.03	0.03
query9	0.58	0.51	0.50
query10	0.55	0.56	0.56
query11	0.14	0.10	0.10
query12	0.13	0.10	0.11
query13	0.61	0.60	0.60
query14	2.84	2.76	2.82
query15	0.90	0.83	0.82
query16	0.39	0.39	0.38
query17	1.04	1.07	1.01
query18	0.22	0.20	0.20
query19	1.95	1.90	2.04
query20	0.02	0.01	0.01
query21	15.36	0.60	0.59
query22	2.64	2.78	1.50
query23	17.11	0.92	0.88
query24	3.33	0.44	1.94
query25	0.21	0.19	0.13
query26	0.41	0.14	0.14
query27	0.05	0.06	0.04
query28	10.15	1.11	1.06
query29	12.63	3.22	3.24
query30	0.24	0.06	0.06
query31	2.86	0.39	0.38
query32	3.23	0.46	0.46
query33	3.04	3.14	3.09
query34	17.15	4.46	4.49
query35	4.52	4.46	4.49
query36	0.67	0.47	0.47
query37	0.10	0.06	0.06
query38	0.05	0.04	0.03
query39	0.04	0.03	0.02
query40	0.17	0.13	0.14
query41	0.08	0.02	0.02
query42	0.04	0.02	0.02
query43	0.04	0.03	0.03
Total cold run time: 107.05 s
Total hot run time: 31.95 s

yiguolei
yiguolei previously approved these changes Dec 22, 2024
@github-actions github-actions bot added the approved Indicates a PR has been approved by one committer. label Dec 22, 2024
Copy link
Contributor

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

Copy link
Contributor

PR approved by anyone and no changes requested.

@zhiqiang-hhhh
Copy link
Contributor Author

run buildall

@github-actions github-actions bot removed the approved Indicates a PR has been approved by one committer. label Dec 23, 2024
@doris-robot
Copy link

TeamCity be ut coverage result:
Function Coverage: 38.78% (10092/26023)
Line Coverage: 29.76% (85101/285964)
Region Coverage: 28.90% (43481/150440)
Branch Coverage: 25.41% (22137/87126)
Coverage Report: http://coverage.selectdb-in.cc/coverage/18d380effa0d1713d40f3a99af2f8c61e4908206_18d380effa0d1713d40f3a99af2f8c61e4908206/report/index.html

@doris-robot
Copy link

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

------ Round 1 ----------------------------------
q1	17588	7532	7264	7264
q2	2053	178	172	172
q3	10707	1093	1198	1093
q4	10590	801	682	682
q5	7624	2766	2768	2766
q6	239	149	147	147
q7	980	633	602	602
q8	9249	1895	1981	1895
q9	6657	6441	6363	6363
q10	7000	2315	2346	2315
q11	460	259	259	259
q12	425	228	231	228
q13	17781	2965	2968	2965
q14	249	214	207	207
q15	566	509	492	492
q16	674	601	597	597
q17	1000	575	573	573
q18	7351	6764	6580	6580
q19	1355	1025	996	996
q20	465	184	185	184
q21	4145	3275	3095	3095
q22	388	325	325	325
Total cold run time: 107546 ms
Total hot run time: 39800 ms

----- Round 2, with runtime_filter_mode=off -----
q1	7217	7245	7222	7222
q2	326	238	239	238
q3	2923	2840	2966	2840
q4	2084	1864	1809	1809
q5	5688	5886	5674	5674
q6	235	145	150	145
q7	2240	1802	1835	1802
q8	3425	3576	3498	3498
q9	8862	9098	9020	9020
q10	3619	3522	3549	3522
q11	615	497	526	497
q12	837	575	597	575
q13	12010	3160	3061	3061
q14	311	289	277	277
q15	564	509	506	506
q16	722	656	656	656
q17	1854	1659	1614	1614
q18	8369	7739	7762	7739
q19	1740	1664	1554	1554
q20	2138	1877	1843	1843
q21	5638	5500	5450	5450
q22	662	634	605	605
Total cold run time: 72079 ms
Total hot run time: 60147 ms

@doris-robot
Copy link

TPC-DS: Total hot run time: 196894 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 18d380effa0d1713d40f3a99af2f8c61e4908206, data reload: false

query1	1285	963	919	919
query2	6233	2417	2355	2355
query3	11150	4873	4888	4873
query4	33213	23350	23557	23350
query5	3626	463	472	463
query6	292	196	180	180
query7	3984	311	313	311
query8	310	239	241	239
query9	9784	2772	2763	2763
query10	462	244	237	237
query11	17722	15079	15131	15079
query12	161	114	103	103
query13	1571	443	403	403
query14	8928	6693	7281	6693
query15	279	210	208	208
query16	7632	462	468	462
query17	1651	610	620	610
query18	2047	333	304	304
query19	231	151	174	151
query20	126	118	109	109
query21	217	105	102	102
query22	4730	4437	4486	4437
query23	34362	36326	33778	33778
query24	11887	2482	2599	2482
query25	586	394	392	392
query26	1465	157	152	152
query27	2909	338	347	338
query28	8075	2480	2472	2472
query29	745	413	406	406
query30	230	152	153	152
query31	1040	843	842	842
query32	98	60	56	56
query33	748	295	291	291
query34	1157	532	519	519
query35	903	754	779	754
query36	1131	983	967	967
query37	210	74	77	74
query38	4287	4314	4376	4314
query39	1495	1492	1463	1463
query40	271	105	108	105
query41	51	49	49	49
query42	118	109	106	106
query43	545	516	503	503
query44	1283	851	819	819
query45	189	179	176	176
query46	1190	749	721	721
query47	2041	1926	1933	1926
query48	418	326	330	326
query49	1068	390	409	390
query50	820	392	394	392
query51	7358	7225	7277	7225
query52	113	94	96	94
query53	271	211	184	184
query54	1086	418	419	418
query55	91	79	80	79
query56	271	260	241	241
query57	1278	1204	1171	1171
query58	237	218	223	218
query59	3406	3259	3294	3259
query60	306	268	251	251
query61	109	181	108	108
query62	843	720	701	701
query63	221	183	186	183
query64	4928	717	654	654
query65	3306	3217	3254	3217
query66	1074	311	307	307
query67	16577	15572	15472	15472
query68	6578	549	607	549
query69	489	255	247	247
query70	1209	1100	1070	1070
query71	491	252	250	250
query72	6797	4048	4149	4048
query73	788	369	371	369
query74	10098	8841	8783	8783
query75	3892	2697	2677	2677
query76	3899	1112	1096	1096
query77	651	280	270	270
query78	10252	9396	9337	9337
query79	1739	593	596	593
query80	1073	423	433	423
query81	512	243	243	243
query82	508	120	119	119
query83	207	141	155	141
query84	289	73	71	71
query85	1104	310	305	305
query86	347	308	292	292
query87	4656	4498	4537	4498
query88	3775	2255	2220	2220
query89	435	291	295	291
query90	2117	189	187	187
query91	140	105	105	105
query92	65	50	49	49
query93	3103	578	543	543
query94	744	290	291	290
query95	350	251	254	251
query96	631	289	275	275
query97	2873	2706	2686	2686
query98	216	197	198	197
query99	1632	1321	1331	1321
Total cold run time: 308091 ms
Total hot run time: 196894 ms

@doris-robot
Copy link

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

query1	0.04	0.04	0.03
query2	0.07	0.04	0.03
query3	0.23	0.08	0.08
query4	1.60	0.11	0.10
query5	0.42	0.41	0.40
query6	1.14	0.66	0.66
query7	0.02	0.02	0.01
query8	0.04	0.03	0.03
query9	0.57	0.51	0.51
query10	0.58	0.60	0.55
query11	0.14	0.11	0.11
query12	0.13	0.11	0.12
query13	0.61	0.59	0.61
query14	2.82	2.75	2.72
query15	0.89	0.82	0.82
query16	0.38	0.39	0.39
query17	1.07	1.05	0.96
query18	0.21	0.21	0.21
query19	1.99	1.88	2.03
query20	0.01	0.01	0.01
query21	15.36	0.58	0.57
query22	2.67	1.80	1.87
query23	17.10	1.13	0.69
query24	3.08	0.35	1.59
query25	0.16	0.07	0.06
query26	0.62	0.13	0.15
query27	0.05	0.04	0.04
query28	10.65	1.10	1.08
query29	12.61	3.27	3.31
query30	0.25	0.06	0.06
query31	2.86	0.39	0.38
query32	3.23	0.46	0.46
query33	3.09	3.09	3.17
query34	17.08	4.50	4.49
query35	4.56	4.49	4.53
query36	0.69	0.49	0.49
query37	0.09	0.06	0.06
query38	0.05	0.04	0.04
query39	0.04	0.03	0.03
query40	0.17	0.13	0.14
query41	0.07	0.02	0.02
query42	0.04	0.02	0.02
query43	0.03	0.03	0.03
Total cold run time: 107.51 s
Total hot run time: 31.98 s

@github-actions github-actions bot added the approved Indicates a PR has been approved by one committer. label Dec 23, 2024
Copy link
Contributor

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

Copy link
Contributor

@xinyiZzz xinyiZzz left a comment

Choose a reason for hiding this comment

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

LGTM

@yiguolei yiguolei merged commit 2a3a439 into apache:master Dec 23, 2024
24 of 26 checks passed
@zhiqiang-hhhh zhiqiang-hhhh deleted the refactor-metrics branch December 23, 2024 13:27
zhiqiang-hhhh added a commit to zhiqiang-hhhh/doris that referenced this pull request Dec 24, 2024
1. Remove `IntAtomicCounter`, it is equal to `IntCounter`.
2. Remove `CoreLocal` related code. It is not used any more.
zhiqiang-hhhh added a commit to zhiqiang-hhhh/doris that referenced this pull request Dec 24, 2024
1. Remove `IntAtomicCounter`, it is equal to `IntCounter`.
2. Remove `CoreLocal` related code. It is not used any more.
yiguolei pushed a commit that referenced this pull request Dec 24, 2024
yiguolei pushed a commit that referenced this pull request Dec 24, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants