Skip to content

[opt](iceberg)support drop tag and branch - #52453

Merged
morningman merged 3 commits into
apache:masterfrom
wuwenchi:opt-iceberg-drop-tag-branch
Jun 30, 2025
Merged

morningman merged 3 commits into
apache:masterfrom
wuwenchi:opt-iceberg-drop-tag-branch

Conversation

@wuwenchi

Copy link
Copy Markdown
Contributor

What problem does this PR solve?

Related Issue: #48285

Problem Summary:

support drop tag and branch:

alter table tb1 drop branch b1;
alter table tb1 drop branch if exists b2;

alter table tb1 drop tag t1;
alter table tb1 drop tag if exists t2;

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

Thearas commented Jun 27, 2025

Copy link
Copy Markdown
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?

@wuwenchi

Copy link
Copy Markdown
Contributor Author

run buildall

@doris-robot

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

------ Round 1 ----------------------------------
q1	17689	5183	5069	5069
q2	1938	292	184	184
q3	10641	1315	713	713
q4	10306	1017	518	518
q5	8668	2333	2352	2333
q6	181	160	127	127
q7	869	737	595	595
q8	9309	1204	1111	1111
q9	6828	5069	5084	5069
q10	6877	2359	1979	1979
q11	477	284	266	266
q12	338	352	212	212
q13	17773	3660	3079	3079
q14	217	231	204	204
q15	556	477	472	472
q16	428	416	367	367
q17	578	859	359	359
q18	7476	7154	7135	7135
q19	1293	950	534	534
q20	321	336	215	215
q21	3684	2545	2355	2355
q22	1021	971	936	936
Total cold run time: 107468 ms
Total hot run time: 33832 ms

----- Round 2, with runtime_filter_mode=off -----
q1	5111	5059	5520	5059
q2	238	324	215	215
q3	2189	2648	2307	2307
q4	1329	1737	1354	1354
q5	4195	4340	4320	4320
q6	201	165	127	127
q7	1997	1975	1776	1776
q8	2619	2509	2546	2509
q9	7104	7161	7062	7062
q10	3142	3278	2824	2824
q11	558	534	495	495
q12	688	780	641	641
q13	3502	3939	3254	3254
q14	299	310	255	255
q15	511	467	472	467
q16	434	467	409	409
q17	1093	1505	1310	1310
q18	7373	7138	7165	7138
q19	741	750	994	750
q20	1888	2003	1791	1791
q21	4705	4359	4168	4168
q22	1036	1004	1008	1004
Total cold run time: 50953 ms
Total hot run time: 49235 ms

@doris-robot

Copy link
Copy Markdown
TPC-DS: Total hot run time: 185014 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 0563834b57e68dff0e885686a9e9c75cfe6e6b6c, data reload: false

query1	1000	383	398	383
query2	6513	1792	1772	1772
query3	6733	219	228	219
query4	26547	23517	23488	23488
query5	4364	577	433	433
query6	301	209	202	202
query7	4624	488	285	285
query8	267	220	218	218
query9	8544	2581	2594	2581
query10	453	311	267	267
query11	15604	15055	15058	15055
query12	150	103	99	99
query13	1642	511	400	400
query14	9270	5651	5711	5651
query15	207	186	174	174
query16	7362	645	471	471
query17	1217	706	584	584
query18	1991	405	352	352
query19	185	186	148	148
query20	113	109	108	108
query21	205	122	104	104
query22	4037	4252	3950	3950
query23	34433	32983	33187	32983
query24	8443	2346	2382	2346
query25	539	486	381	381
query26	1236	265	146	146
query27	2757	503	341	341
query28	4311	2115	2088	2088
query29	741	575	418	418
query30	280	215	183	183
query31	913	850	766	766
query32	72	63	63	63
query33	565	378	298	298
query34	772	838	509	509
query35	818	819	735	735
query36	948	989	887	887
query37	105	97	80	80
query38	4140	4196	4157	4157
query39	1495	1445	1418	1418
query40	208	111	100	100
query41	54	52	51	51
query42	119	106	101	101
query43	514	522	506	506
query44	1275	803	805	803
query45	180	173	165	165
query46	828	996	626	626
query47	1746	1815	1694	1694
query48	401	405	312	312
query49	726	470	374	374
query50	620	690	409	409
query51	4147	4114	4156	4114
query52	109	108	98	98
query53	223	249	189	189
query54	565	558	499	499
query55	78	79	77	77
query56	304	303	290	290
query57	1163	1192	1128	1128
query58	267	251	262	251
query59	2732	2819	2642	2642
query60	315	305	288	288
query61	122	121	143	121
query62	779	710	664	664
query63	223	190	187	187
query64	4423	1088	747	747
query65	4292	4187	4164	4164
query66	1135	412	316	316
query67	15648	15546	15249	15249
query68	9328	890	522	522
query69	471	356	262	262
query70	1229	1203	1119	1119
query71	455	312	308	308
query72	5249	4672	4624	4624
query73	674	556	345	345
query74	8906	9294	8737	8737
query75	4212	3177	2705	2705
query76	3754	1141	714	714
query77	981	375	308	308
query78	9934	10528	9382	9382
query79	1401	817	591	591
query80	583	508	435	435
query81	479	250	215	215
query82	443	125	91	91
query83	279	256	233	233
query84	289	100	77	77
query85	778	436	329	329
query86	334	313	286	286
query87	4418	4473	4337	4337
query88	2804	2227	2260	2227
query89	387	318	284	284
query90	1921	203	199	199
query91	216	136	112	112
query92	73	59	54	54
query93	1112	928	589	589
query94	672	386	299	299
query95	375	290	282	282
query96	495	557	282	282
query97	2705	2784	2662	2662
query98	226	201	201	201
query99	1479	1410	1295	1295
Total cold run time: 273755 ms
Total hot run time: 185014 ms

@doris-robot

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

query1	0.04	0.04	0.03
query2	0.11	0.06	0.05
query3	0.29	0.07	0.06
query4	1.62	0.09	0.08
query5	0.43	0.40	0.41
query6	1.17	0.66	0.66
query7	0.03	0.02	0.02
query8	0.06	0.04	0.05
query9	0.67	0.53	0.53
query10	0.58	0.60	0.59
query11	0.26	0.13	0.13
query12	0.25	0.14	0.14
query13	0.66	0.64	0.64
query14	0.83	0.84	0.84
query15	1.03	0.91	0.92
query16	0.42	0.40	0.39
query17	1.11	1.10	1.12
query18	0.27	0.24	0.24
query19	2.02	1.84	2.00
query20	0.01	0.01	0.01
query21	15.35	0.97	0.68
query22	0.92	1.09	0.80
query23	14.70	1.54	0.75
query24	5.53	0.57	0.29
query25	0.17	0.09	0.09
query26	0.55	0.23	0.19
query27	0.09	0.09	0.09
query28	11.00	1.16	0.58
query29	12.54	4.05	3.39
query30	0.28	0.08	0.07
query31	2.83	0.62	0.43
query32	3.24	0.61	0.51
query33	3.13	3.19	3.16
query34	16.88	5.36	4.72
query35	4.75	4.78	4.80
query36	0.65	0.51	0.50
query37	0.20	0.18	0.18
query38	0.17	0.15	0.15
query39	0.05	0.05	0.04
query40	0.21	0.19	0.16
query41	0.11	0.05	0.05
query42	0.06	0.06	0.06
query43	0.05	0.05	0.04
Total cold run time: 105.32 s
Total hot run time: 30.41 s

@hello-stephen

Copy link
Copy Markdown
Contributor

FE UT Coverage Report

Increment line coverage 58.02% (76/131) 🎉
Increment coverage report
Complete coverage report

wuwenchi.wwc and others added 3 commits June 28, 2025 12:23
@morningman
morningman force-pushed the opt-iceberg-drop-tag-branch branch from 0563834 to 6e1b8d4 Compare June 28, 2025 05:29
@morningman

Copy link
Copy Markdown
Contributor

run buildall

@doris-robot

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

------ Round 1 ----------------------------------
q1	17738	5250	5136	5136
q2	1932	288	189	189
q3	10677	1287	704	704
q4	10317	1033	551	551
q5	9108	2357	2329	2329
q6	182	160	131	131
q7	889	784	612	612
q8	9319	1294	1085	1085
q9	7334	5079	5116	5079
q10	6886	2387	1997	1997
q11	477	309	282	282
q12	345	366	219	219
q13	17776	3750	3121	3121
q14	227	233	218	218
q15	540	481	481	481
q16	427	450	393	393
q17	596	866	361	361
q18	7617	7162	7082	7082
q19	1259	947	560	560
q20	334	354	223	223
q21	3797	3192	2348	2348
q22	1030	991	960	960
Total cold run time: 108807 ms
Total hot run time: 34061 ms

----- Round 2, with runtime_filter_mode=off -----
q1	5190	5156	5089	5089
q2	244	339	220	220
q3	2173	2692	2297	2297
q4	1383	1825	1311	1311
q5	4361	4429	4492	4429
q6	217	173	129	129
q7	1997	1914	1819	1819
q8	2727	2736	2533	2533
q9	7150	6985	7062	6985
q10	3088	3318	2860	2860
q11	581	532	492	492
q12	687	778	632	632
q13	3595	3942	3323	3323
q14	262	292	281	281
q15	515	475	491	475
q16	442	477	448	448
q17	1115	1502	1336	1336
q18	7334	7222	7059	7059
q19	747	751	857	751
q20	1888	1978	1841	1841
q21	4820	4387	4357	4357
q22	1042	1004	976	976
Total cold run time: 51558 ms
Total hot run time: 49643 ms

@doris-robot

Copy link
Copy Markdown
TPC-DS: Total hot run time: 185643 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 6e1b8d438c40d8d974d30af48d8b85d6db9b446c, data reload: false

query1	1000	389	389	389
query2	6540	1838	1752	1752
query3	6753	209	211	209
query4	25933	23911	23148	23148
query5	4369	577	448	448
query6	292	217	201	201
query7	4624	493	290	290
query8	269	227	213	213
query9	8611	2622	2582	2582
query10	488	328	287	287
query11	15725	15134	14886	14886
query12	148	108	107	107
query13	1653	527	416	416
query14	9240	5717	5716	5716
query15	202	194	188	188
query16	7524	657	470	470
query17	1189	728	604	604
query18	2097	407	306	306
query19	191	210	176	176
query20	121	116	115	115
query21	211	124	113	113
query22	3948	4057	4100	4057
query23	34028	33068	33044	33044
query24	8425	2390	2362	2362
query25	528	474	410	410
query26	1239	261	144	144
query27	2753	499	333	333
query28	4367	2132	2110	2110
query29	767	561	432	432
query30	278	213	192	192
query31	934	833	765	765
query32	77	63	61	61
query33	555	354	316	316
query34	791	824	517	517
query35	806	830	742	742
query36	970	986	884	884
query37	109	102	75	75
query38	4161	4164	4223	4164
query39	1499	1428	1452	1428
query40	209	120	103	103
query41	54	56	50	50
query42	124	104	110	104
query43	506	503	466	466
query44	1275	821	831	821
query45	181	173	198	173
query46	856	1021	645	645
query47	1811	1858	1766	1766
query48	408	424	320	320
query49	731	496	384	384
query50	653	703	418	418
query51	4235	4208	4109	4109
query52	111	107	97	97
query53	221	249	184	184
query54	567	585	502	502
query55	84	77	82	77
query56	295	282	299	282
query57	1196	1199	1134	1134
query58	260	252	260	252
query59	2849	2746	2610	2610
query60	320	316	307	307
query61	123	122	121	121
query62	797	722	675	675
query63	225	180	186	180
query64	4273	1014	659	659
query65	4295	4192	4200	4192
query66	1081	398	334	334
query67	15623	15437	15548	15437
query68	8018	895	526	526
query69	473	318	258	258
query70	1227	1172	1125	1125
query71	465	322	286	286
query72	5792	4773	4813	4773
query73	707	622	345	345
query74	8947	9136	8721	8721
query75	3844	3195	2718	2718
query76	3707	1141	741	741
query77	781	398	295	295
query78	10221	10203	9491	9491
query79	2511	805	594	594
query80	638	518	452	452
query81	473	259	229	229
query82	454	128	93	93
query83	283	267	244	244
query84	289	109	88	88
query85	793	443	318	318
query86	343	320	280	280
query87	4519	4426	4451	4426
query88	3374	2280	2259	2259
query89	372	326	293	293
query90	1932	217	211	211
query91	141	142	191	142
query92	79	57	54	54
query93	1717	980	593	593
query94	661	422	297	297
query95	385	295	277	277
query96	492	571	285	285
query97	2723	2727	2695	2695
query98	231	205	198	198
query99	1434	1379	1282	1282
Total cold run time: 274804 ms
Total hot run time: 185643 ms

@doris-robot

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

query1	0.04	0.04	0.03
query2	0.11	0.06	0.06
query3	0.29	0.06	0.07
query4	1.60	0.08	0.07
query5	0.43	0.42	0.42
query6	1.16	0.66	0.67
query7	0.02	0.01	0.01
query8	0.06	0.05	0.05
query9	0.65	0.54	0.53
query10	0.59	0.57	0.58
query11	0.26	0.13	0.13
query12	0.25	0.14	0.14
query13	0.66	0.64	0.65
query14	0.84	0.84	0.88
query15	1.00	0.90	0.91
query16	0.39	0.40	0.40
query17	1.10	1.09	1.08
query18	0.26	0.24	0.24
query19	2.00	1.83	1.96
query20	0.03	0.02	0.01
query21	15.38	0.97	0.68
query22	0.93	1.05	0.77
query23	14.70	1.55	0.75
query24	5.48	0.55	0.29
query25	0.17	0.10	0.09
query26	0.55	0.22	0.19
query27	0.09	0.09	0.08
query28	11.03	1.17	0.60
query29	12.54	4.05	3.38
query30	0.27	0.08	0.06
query31	2.83	0.64	0.44
query32	3.24	0.63	0.51
query33	3.21	3.17	3.14
query34	16.79	5.43	4.71
query35	4.80	4.83	4.81
query36	0.66	0.54	0.52
query37	0.21	0.18	0.17
query38	0.18	0.18	0.16
query39	0.06	0.05	0.05
query40	0.20	0.18	0.17
query41	0.11	0.05	0.05
query42	0.06	0.06	0.06
query43	0.06	0.05	0.05
Total cold run time: 105.29 s
Total hot run time: 30.4 s

@github-actions

Copy link
Copy Markdown
Contributor

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

@github-actions github-actions Bot added approved Indicates a PR has been approved by one committer. reviewed labels Jun 28, 2025
@github-actions

Copy link
Copy Markdown
Contributor

PR approved by anyone and no changes requested.

@suxiaogang223 suxiaogang223 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

+1

@morningman
morningman merged commit 0fe5b93 into apache:master Jun 30, 2025
koarz pushed a commit to koarz/doris that referenced this pull request Jul 4, 2025
### What problem does this PR solve?

Related Issue: apache#48285

Problem Summary:

support drop tag and branch:
```sql
alter table tb1 drop branch b1;
alter table tb1 drop branch if exists b2;

alter table tb1 drop tag t1;
alter table tb1 drop tag if exists t2;
```

Co-authored-by: wuwenchi.wwc <[email protected]>
koarz pushed a commit to koarz/doris that referenced this pull request Jul 4, 2025
### What problem does this PR solve?

Related Issue: apache#48285

Problem Summary:

support drop tag and branch:
```sql
alter table tb1 drop branch b1;
alter table tb1 drop branch if exists b2;

alter table tb1 drop tag t1;
alter table tb1 drop tag if exists t2;
```

Co-authored-by: wuwenchi.wwc <[email protected]>
koarz pushed a commit to koarz/doris that referenced this pull request Jul 4, 2025
### What problem does this PR solve?

Related Issue: apache#48285

Problem Summary:

support drop tag and branch:
```sql
alter table tb1 drop branch b1;
alter table tb1 drop branch if exists b2;

alter table tb1 drop tag t1;
alter table tb1 drop tag if exists t2;
```

Co-authored-by: wuwenchi.wwc <[email protected]>
morningman pushed a commit to morningman/doris that referenced this pull request Jul 8, 2025
Related Issue: apache#48285

Problem Summary:

support drop tag and branch:
```sql
alter table tb1 drop branch b1;
alter table tb1 drop branch if exists b2;

alter table tb1 drop tag t1;
alter table tb1 drop tag if exists t2;
```

Co-authored-by: wuwenchi.wwc <[email protected]>
morningman pushed a commit to morningman/doris that referenced this pull request Jul 8, 2025
Related Issue: apache#48285

Problem Summary:

support drop tag and branch:
```sql
alter table tb1 drop branch b1;
alter table tb1 drop branch if exists b2;

alter table tb1 drop tag t1;
alter table tb1 drop tag if exists t2;
```

Co-authored-by: wuwenchi.wwc <[email protected]>
morrySnow pushed a commit that referenced this pull request Jul 9, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants