Skip to content

[fix](catalog) synchronize reset methods in catalog classes and remove Lombok annotations #51787

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
morningman merged 2 commits into from
Jun 19, 2025
Merged

[fix](catalog) synchronize reset methods in catalog classes and remove Lombok annotations #51787

morningman merged 2 commits into from
Jun 19, 2025

Conversation

@zy-kkk
Copy link
Member

@zy-kkk zy-kkk commented Jun 17, 2025

Related PR: #51471

@Thearas
Copy link
Contributor

Thearas commented Jun 17, 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?

@zy-kkk zy-kkk added the p0_test label Jun 17, 2025
@zy-kkk
Copy link
Member Author

zy-kkk commented Jun 17, 2025

run buildall

morningman
morningman requested changes Jun 17, 2025
View reviewed changes
Copy link
Contributor

@morningman morningman left a comment

Choose a reason for hiding this comment

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

This will cause dead loop

@zy-kkk zy-kkk changed the title [fix](jdbc) make sure init the jdbc client before using it [fix](catalog) synchronize reset methods in catalog classes and remove Lombok annotations Jun 17, 2025
@zy-kkk
Copy link
Member Author

zy-kkk commented Jun 17, 2025

run buildall

morningman
morningman previously approved these changes Jun 17, 2025
View reviewed changes
@github-actions github-actions bot added the approved Indicates a PR has been approved by one committer. label Jun 17, 2025
@github-actions
Copy link
Contributor

github-actions bot commented Jun 17, 2025

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

@github-actions
Copy link
Contributor

github-actions bot commented Jun 17, 2025

PR approved by anyone and no changes requested.

@zy-kkk
Copy link
Member Author

zy-kkk commented Jun 17, 2025

run buildall

@zy-kkk
Copy link
Member Author

zy-kkk commented Jun 17, 2025

run buildall

@github-actions github-actions bot removed the approved Indicates a PR has been approved by one committer. label Jun 17, 2025
@doris-robot
Copy link

doris-robot commented Jun 17, 2025

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

------ Round 1 ----------------------------------
q1	17593	5089	4961	4961
q2	1935	277	169	169
q3	10324	1220	747	747
q4	10230	997	517	517
q5	7552	2340	2302	2302
q6	183	166	132	132
q7	903	806	628	628
q8	9328	1302	1084	1084
q9	6746	4990	4996	4990
q10	6888	2363	1950	1950
q11	480	291	273	273
q12	337	357	212	212
q13	17770	3695	3060	3060
q14	230	239	220	220
q15	578	509	488	488
q16	444	442	394	394
q17	591	843	358	358
q18	7914	7301	7264	7264
q19	1221	975	565	565
q20	337	367	236	236
q21	3890	3390	2929	2929
q22	1021	1014	931	931
Total cold run time: 106495 ms
Total hot run time: 34410 ms

----- Round 2, with runtime_filter_mode=off -----
q1	5011	5067	5018	5018
q2	249	315	223	223
q3	2146	2644	2278	2278
q4	1321	1793	1376	1376
q5	4230	4093	4323	4093
q6	218	174	136	136
q7	1997	1952	1759	1759
q8	2600	2591	2534	2534
q9	7195	7169	7224	7169
q10	3081	3216	2828	2828
q11	599	533	487	487
q12	682	806	580	580
q13	3499	3902	3281	3281
q14	283	290	289	289
q15	513	470	459	459
q16	436	480	438	438
q17	1204	1545	1371	1371
q18	7756	7527	7431	7431
q19	797	802	903	802
q20	2036	2045	1884	1884
q21	4943	4423	4402	4402
q22	1090	1047	1000	1000
Total cold run time: 51886 ms
Total hot run time: 49838 ms

@doris-robot
Copy link

doris-robot commented Jun 17, 2025

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

query1	1404	1013	1003	1003
query2	6377	1861	1847	1847
query3	11048	4526	4459	4459
query4	54020	25835	22931	22931
query5	5300	493	445	445
query6	352	199	199	199
query7	4967	497	291	291
query8	286	226	212	212
query9	6187	2627	2632	2627
query10	412	346	287	287
query11	15120	15067	14758	14758
query12	154	108	110	108
query13	1089	530	412	412
query14	10099	6266	6215	6215
query15	216	194	184	184
query16	7081	644	511	511
query17	1061	739	571	571
query18	1545	414	314	314
query19	198	210	163	163
query20	127	128	115	115
query21	216	126	108	108
query22	4318	4288	4341	4288
query23	34195	33247	33578	33247
query24	6627	2420	2426	2420
query25	498	515	405	405
query26	662	270	161	161
query27	2417	513	354	354
query28	3084	2163	2164	2163
query29	578	551	438	438
query30	286	229	197	197
query31	867	859	760	760
query32	75	67	64	64
query33	464	351	316	316
query34	786	890	529	529
query35	800	853	761	761
query36	941	998	894	894
query37	114	105	73	73
query38	4228	4323	4262	4262
query39	1544	1453	1439	1439
query40	217	126	113	113
query41	61	62	57	57
query42	128	106	112	106
query43	508	498	499	498
query44	1331	852	848	848
query45	177	174	166	166
query46	848	1025	646	646
query47	1803	1870	1764	1764
query48	397	423	318	318
query49	654	503	402	402
query50	657	707	425	425
query51	4301	4304	4191	4191
query52	110	112	104	104
query53	226	253	183	183
query54	585	590	522	522
query55	79	83	84	83
query56	320	294	276	276
query57	1233	1221	1156	1156
query58	272	265	257	257
query59	2872	2818	2757	2757
query60	333	343	322	322
query61	125	122	121	121
query62	754	767	684	684
query63	238	192	191	191
query64	1409	1032	660	660
query65	4240	4175	4147	4147
query66	724	400	308	308
query67	15823	15280	15319	15280
query68	4665	889	529	529
query69	509	307	318	307
query70	1156	1098	1084	1084
query71	453	321	293	293
query72	5876	4564	4888	4564
query73	761	615	358	358
query74	9219	9142	8615	8615
query75	3382	3176	2706	2706
query76	3535	1188	734	734
query77	555	378	288	288
query78	10115	10409	9366	9366
query79	991	821	571	571
query80	571	511	481	481
query81	488	255	221	221
query82	373	134	94	94
query83	253	257	230	230
query84	292	104	97	97
query85	790	344	303	303
query86	330	302	302	302
query87	4349	4401	4395	4395
query88	2875	2265	2266	2265
query89	388	318	282	282
query90	1744	203	201	201
query91	135	139	112	112
query92	62	57	55	55
query93	1251	941	575	575
query94	616	415	307	307
query95	376	284	285	284
query96	492	573	278	278
query97	2654	2736	2597	2597
query98	224	207	200	200
query99	1304	1404	1279	1279
Total cold run time: 290952 ms
Total hot run time: 191089 ms

@doris-robot
Copy link

doris-robot commented Jun 17, 2025

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

query1	0.04	0.04	0.02
query2	0.08	0.03	0.03
query3	0.24	0.06	0.07
query4	1.62	0.10	0.10
query5	0.43	0.41	0.42
query6	1.17	0.66	0.67
query7	0.02	0.02	0.03
query8	0.04	0.03	0.04
query9	0.59	0.50	0.51
query10	0.56	0.59	0.55
query11	0.16	0.11	0.11
query12	0.14	0.12	0.12
query13	0.63	0.60	0.61
query14	0.81	0.83	0.81
query15	0.88	0.86	0.86
query16	0.39	0.38	0.38
query17	1.09	1.05	1.10
query18	0.22	0.22	0.21
query19	1.92	1.84	1.82
query20	0.01	0.02	0.01
query21	15.40	0.91	0.56
query22	0.76	1.22	0.72
query23	14.79	1.38	0.65
query24	7.23	0.95	0.54
query25	0.48	0.15	0.11
query26	0.72	0.16	0.14
query27	0.07	0.05	0.05
query28	9.30	0.95	0.47
query29	12.53	3.89	3.24
query30	0.26	0.09	0.06
query31	2.83	0.60	0.40
query32	3.23	0.55	0.47
query33	3.15	3.07	3.06
query34	15.96	5.38	4.79
query35	4.78	4.82	4.78
query36	0.69	0.54	0.48
query37	0.09	0.07	0.07
query38	0.06	0.04	0.03
query39	0.02	0.02	0.02
query40	0.18	0.15	0.14
query41	0.09	0.02	0.03
query42	0.04	0.02	0.02
query43	0.04	0.03	0.03
Total cold run time: 103.74 s
Total hot run time: 29.2 s

@hello-stephen
Copy link
Contributor

hello-stephen commented Jun 17, 2025

FE UT Coverage Report

Increment line coverage 66.67% (12/18) 🎉
Increment coverage report
Complete coverage report

@morningman
Copy link
Contributor

morningman commented Jun 18, 2025

run buildall

@github-actions github-actions bot added the approved Indicates a PR has been approved by one committer. label Jun 18, 2025
@github-actions
Copy link
Contributor

github-actions bot commented Jun 18, 2025

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

kaka11chen
kaka11chen approved these changes Jun 18, 2025
View reviewed changes
Copy link
Contributor

@kaka11chen kaka11chen left a comment

Choose a reason for hiding this comment

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

LGTM

@morningman morningman merged commit 7060643 into apache:master Jun 19, 2025
24 of 27 checks passed
@zy-kkk zy-kkk deleted the zy-kkk-patch-3 branch June 27, 2025 08:06
morningman pushed a commit to morningman/doris that referenced this pull request Jun 29, 2025
@zy-kkk @morningman
[fix](catalog) synchronize reset methods in catalog classes and remov…
584a370 
…e Lombok annotations (apache#51787)

Related PR: apache#51471
@morningman morningman mentioned this pull request Jun 29, 2025
Merged
morrySnow pushed a commit that referenced this pull request Jun 30, 2025
@morningman @zy-kkk
branch-3.1: [feat][fix](jdbc) support custom function rules in catalo…
7d372b1 
…g properties #51471 #51787 (#52467)

bp #51471 #51787

---------

Co-authored-by: zy-kkk <zhongyk10@gmail.com>
zy-kkk added a commit to zy-kkk/doris that referenced this pull request Jul 13, 2025
@zy-kkk
[fix](catalog) synchronize reset methods in catalog classes and remov…
249e914 
…e Lombok annotations (apache#51787)

Related PR: apache#51471
@zy-kkk zy-kkk mentioned this pull request Jul 13, 2025
Merged
zy-kkk added a commit to zy-kkk/doris that referenced this pull request Jul 13, 2025
@zy-kkk
[fix](catalog) synchronize reset methods in catalog classes and remov…
4760f70 
…e Lombok annotations (apache#51787)

Related PR: apache#51471
@zy-kkk zy-kkk mentioned this pull request Jul 13, 2025
Merged
dataroaring pushed a commit that referenced this pull request Jul 16, 2025
@zy-kkk
branch-3.0: [fix](catalog) synchronize reset methods in catalog class…
300ec58 
…es and remove Lombok annotations (#53167)

pick (#51787)
yiguolei pushed a commit that referenced this pull request Jul 16, 2025
@zy-kkk
branch-2.1: [fix](catalog) synchronize reset methods in catalog class…
83cdd44 
…es and remove Lombok annotations (#53168)

pick (#51787)
@yiguolei yiguolei mentioned this pull request Aug 11, 2025
Open
@gavinchou gavinchou mentioned this pull request Aug 15, 2025
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@kaka11chen kaka11chen kaka11chen approved these changes

@morningman morningman morningman approved these changes

Assignees

No one assigned

Labels

approved Indicates a PR has been approved by one committer. dev/2.1.11-merged dev/3.0.7-merged dev/3.1.0-merged p0_test reviewed

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

9 participants

@zy-kkk @Thearas @doris-robot @hello-stephen @morningman @kaka11chen @yiguolei @dataroaring @morrySnow