Skip to content

Conversation

@cambyzju
Copy link
Contributor

What problem does this PR solve?

come from #35874

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

@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?

@cambyzju
Copy link
Contributor Author

run buildall

@cambyzju cambyzju changed the title [fix](alter) fix alter partition without storage_policy property will also cancel storage_policy [fix](alter) alter partition without storage_policy property will also cancel storage_policy Jun 12, 2025
@hello-stephen
Copy link
Contributor

FE UT Coverage Report

Increment line coverage 25.00% (1/4) 🎉
Increment coverage report
Complete coverage report

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

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

@github-actions
Copy link
Contributor

PR approved by anyone and no changes requested.

@doris-robot
Copy link

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

------ Round 1 ----------------------------------
q1	27772	5147	5355	5147
q2	1969	285	192	192
q3	10372	1310	734	734
q4	10234	1010	548	548
q5	7668	2385	2388	2385
q6	193	169	138	138
q7	919	767	637	637
q8	9322	1358	1162	1162
q9	6809	5140	5251	5140
q10	6907	2330	1949	1949
q11	494	311	301	301
q12	369	360	225	225
q13	17804	3726	3128	3128
q14	249	244	231	231
q15	567	492	496	492
q16	446	453	396	396
q17	659	881	378	378
q18	7803	7139	7039	7039
q19	1680	987	581	581
q20	371	356	247	247
q21	4275	3374	2483	2483
q22	1045	1009	996	996
Total cold run time: 117927 ms
Total hot run time: 34529 ms

----- Round 2, with runtime_filter_mode=off -----
q1	5204	5092	5092	5092
q2	255	330	231	231
q3	2176	2725	2373	2373
q4	1605	1927	1481	1481
q5	4532	4390	4481	4390
q6	230	173	134	134
q7	2018	1910	1803	1803
q8	2642	2689	2646	2646
q9	7332	7036	7345	7036
q10	3062	3211	2778	2778
q11	594	517	509	509
q12	698	776	635	635
q13	3586	3994	3447	3447
q14	291	314	277	277
q15	531	491	488	488
q16	479	514	462	462
q17	1193	1619	1388	1388
q18	7839	7638	7475	7475
q19	907	896	984	896
q20	1987	2018	1862	1862
q21	5121	4586	4541	4541
q22	1156	1082	1033	1033
Total cold run time: 53438 ms
Total hot run time: 50977 ms

@doris-robot
Copy link

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

query1	1439	1109	1103	1103
query2	6312	1942	1923	1923
query3	11039	4706	4540	4540
query4	25864	24359	23243	23243
query5	5200	668	476	476
query6	324	229	221	221
query7	4005	535	310	310
query8	285	250	239	239
query9	8554	2926	2927	2926
query10	511	348	289	289
query11	15325	15206	14941	14941
query12	166	113	113	113
query13	1563	577	434	434
query14	8744	6382	6333	6333
query15	217	189	186	186
query16	7388	667	533	533
query17	1141	786	627	627
query18	2229	446	329	329
query19	219	208	187	187
query20	139	138	131	131
query21	210	132	120	120
query22	4634	4538	4468	4468
query23	35036	34141	33905	33905
query24	8633	2497	2458	2458
query25	540	504	442	442
query26	1383	290	157	157
query27	2964	528	370	370
query28	4741	2378	2366	2366
query29	742	584	486	486
query30	301	227	195	195
query31	946	890	824	824
query32	102	70	72	70
query33	552	373	340	340
query34	846	903	573	573
query35	843	862	797	797
query36	1022	1048	970	970
query37	129	105	79	79
query38	4292	4343	4295	4295
query39	1589	1470	1477	1470
query40	224	124	122	122
query41	67	60	59	59
query42	130	124	119	119
query43	553	552	540	540
query44	1442	908	900	900
query45	196	184	168	168
query46	906	1062	686	686
query47	1843	1904	1793	1793
query48	427	454	355	355
query49	764	511	423	423
query50	721	731	422	422
query51	4354	4376	4287	4287
query52	124	126	115	115
query53	259	273	199	199
query54	652	633	569	569
query55	104	96	91	91
query56	342	342	306	306
query57	1221	1284	1176	1176
query58	283	283	281	281
query59	2827	2848	2744	2744
query60	362	354	333	333
query61	136	127	127	127
query62	781	754	722	722
query63	248	196	214	196
query64	4012	1081	782	782
query65	4367	4330	4272	4272
query66	935	418	324	324
query67	16306	15877	15594	15594
query68	8376	956	567	567
query69	538	336	279	279
query70	1256	1159	1129	1129
query71	492	337	320	320
query72	5841	4933	5089	4933
query73	784	750	395	395
query74	9018	9276	9021	9021
query75	3893	3248	2754	2754
query76	3772	1243	789	789
query77	793	388	306	306
query78	10165	10431	9364	9364
query79	3429	867	602	602
query80	663	540	464	464
query81	487	258	226	226
query82	470	133	102	102
query83	298	276	255	255
query84	292	117	100	100
query85	847	368	333	333
query86	336	303	288	288
query87	4474	4568	4543	4543
query88	3419	2454	2439	2439
query89	446	340	305	305
query90	2021	218	214	214
query91	149	150	119	119
query92	83	65	56	56
query93	2299	1014	616	616
query94	695	423	313	313
query95	395	317	307	307
query96	537	592	305	305
query97	2788	2803	2637	2637
query98	234	208	201	201
query99	1460	1425	1303	1303
Total cold run time: 285505 ms
Total hot run time: 196759 ms

@doris-robot
Copy link

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

query1	0.04	0.04	0.03
query2	0.13	0.11	0.11
query3	0.26	0.20	0.21
query4	1.61	0.11	0.10
query5	0.44	0.42	0.43
query6	1.17	0.69	0.66
query7	0.02	0.02	0.01
query8	0.05	0.03	0.04
query9	0.61	0.52	0.55
query10	0.57	0.58	0.58
query11	0.17	0.11	0.11
query12	0.15	0.12	0.13
query13	0.62	0.60	0.61
query14	0.80	0.82	0.82
query15	0.90	0.86	0.90
query16	0.40	0.41	0.38
query17	1.07	1.06	1.06
query18	0.23	0.22	0.21
query19	1.99	1.86	1.90
query20	0.01	0.01	0.01
query21	15.39	0.93	0.58
query22	0.79	1.25	0.64
query23	14.90	1.46	0.62
query24	6.90	1.80	1.42
query25	0.47	0.24	0.12
query26	0.66	0.16	0.14
query27	0.06	0.05	0.04
query28	10.11	0.87	0.46
query29	12.82	4.02	3.35
query30	0.26	0.09	0.07
query31	2.83	0.61	0.39
query32	3.23	0.58	0.49
query33	3.08	3.10	3.19
query34	15.69	5.20	4.55
query35	4.52	4.57	4.52
query36	0.68	0.51	0.50
query37	0.09	0.07	0.06
query38	0.06	0.04	0.03
query39	0.03	0.02	0.03
query40	0.17	0.14	0.13
query41	0.08	0.03	0.03
query42	0.04	0.03	0.03
query43	0.05	0.04	0.04
Total cold run time: 104.15 s
Total hot run time: 30.02 s

@cambyzju
Copy link
Contributor Author

run buildall

1 similar comment
@cambyzju
Copy link
Contributor Author

run buildall

@doris-robot
Copy link

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

------ Round 1 ----------------------------------
q1	17638	5232	5076	5076
q2	1977	326	221	221
q3	10294	1360	782	782
q4	10225	1052	575	575
q5	7634	2502	2466	2466
q6	197	177	138	138
q7	947	767	652	652
q8	9353	1436	1239	1239
q9	7043	5242	5259	5242
q10	6873	2374	1952	1952
q11	526	346	326	326
q12	395	386	241	241
q13	17811	3837	3223	3223
q14	253	254	239	239
q15	588	517	500	500
q16	465	471	424	424
q17	722	928	458	458
q18	8105	7432	7324	7324
q19	1518	1026	608	608
q20	397	408	261	261
q21	4740	3997	3377	3377
q22	1146	1113	1052	1052
Total cold run time: 108847 ms
Total hot run time: 36376 ms

----- Round 2, with runtime_filter_mode=off -----
q1	5149	5058	5056	5056
q2	268	331	240	240
q3	2253	2721	2414	2414
q4	1445	1853	1444	1444
q5	4330	4169	4230	4169
q6	213	178	130	130
q7	1962	1891	1727	1727
q8	2571	2552	2522	2522
q9	7053	6947	6995	6947
q10	2946	3197	2709	2709
q11	597	542	515	515
q12	738	787	634	634
q13	3510	3847	3244	3244
q14	286	296	277	277
q15	533	480	480	480
q16	468	508	477	477
q17	1210	1570	1366	1366
q18	7582	7269	7173	7173
q19	917	899	972	899
q20	1992	2050	1925	1925
q21	5177	4696	4754	4696
q22	1166	1075	1065	1065
Total cold run time: 52366 ms
Total hot run time: 50109 ms

@doris-robot
Copy link

TPC-DS: Total hot run time: 196405 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 6332d4b4f1d645ac16afa2bb18d09e16de3ddebc, data reload: false

query1	1060	433	431	431
query2	6587	2140	2180	2140
query3	6777	268	262	262
query4	26219	24107	23456	23456
query5	4924	731	534	534
query6	343	251	233	233
query7	4671	554	342	342
query8	303	256	256	256
query9	8676	3232	3226	3226
query10	520	378	328	328
query11	16364	15352	15444	15352
query12	185	118	121	118
query13	1670	612	471	471
query14	10645	6631	6729	6631
query15	212	206	180	180
query16	7669	695	548	548
query17	1318	777	622	622
query18	2065	459	339	339
query19	232	224	208	208
query20	146	133	144	133
query21	240	140	135	135
query22	4397	4517	4207	4207
query23	34731	33666	33731	33666
query24	8355	2558	2607	2558
query25	596	556	476	476
query26	936	301	188	188
query27	2673	564	412	412
query28	4321	2638	2593	2593
query29	771	638	514	514
query30	306	245	216	216
query31	961	887	818	818
query32	90	80	77	77
query33	592	418	430	418
query34	893	956	612	612
query35	859	859	796	796
query36	1123	1116	1031	1031
query37	129	109	91	91
query38	4309	4314	4306	4306
query39	1552	1455	1479	1455
query40	224	137	128	128
query41	78	67	71	67
query42	149	135	149	135
query43	605	595	581	581
query44	1556	1098	1006	1006
query45	196	185	183	183
query46	975	1124	718	718
query47	1827	1854	1774	1774
query48	471	482	368	368
query49	724	581	457	457
query50	746	741	472	472
query51	4471	4492	4282	4282
query52	128	131	118	118
query53	271	306	214	214
query54	687	687	616	616
query55	102	98	103	98
query56	366	348	353	348
query57	1210	1257	1189	1189
query58	321	327	299	299
query59	2969	3079	2906	2906
query60	379	372	365	365
query61	149	161	160	160
query62	833	756	677	677
query63	250	220	219	219
query64	3545	1120	761	761
query65	4348	4242	4306	4242
query66	920	439	353	353
query67	16757	16368	16019	16019
query68	8857	1037	654	654
query69	522	370	315	315
query70	1417	1283	1258	1258
query71	510	398	364	364
query72	5589	4847	4792	4792
query73	735	670	429	429
query74	9147	9340	9115	9115
query75	4339	3321	2840	2840
query76	3681	1306	825	825
query77	854	435	340	340
query78	10356	10665	9526	9526
query79	1852	930	680	680
query80	698	595	575	575
query81	500	267	234	234
query82	454	144	114	114
query83	297	291	281	281
query84	261	133	120	120
query85	814	399	362	362
query86	385	338	325	325
query87	4622	4685	4565	4565
query88	3864	2779	2727	2727
query89	438	347	325	325
query90	1960	245	242	242
query91	165	172	134	134
query92	83	73	70	70
query93	1385	1084	729	729
query94	703	437	361	361
query95	415	346	331	331
query96	606	637	339	339
query97	2839	2859	2764	2764
query98	265	231	228	228
query99	1602	1441	1307	1307
Total cold run time: 283892 ms
Total hot run time: 196405 ms

@cambyzju
Copy link
Contributor Author

run feut

@cambyzju
Copy link
Contributor Author

run performance

@doris-robot
Copy link

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 6332d4b4f1d645ac16afa2bb18d09e16de3ddebc, data reload: false

------ Round 1 ----------------------------------
q1	17619	5236	4962	4962
q2	1931	299	177	177
q3	10390	1229	746	746
q4	10211	992	521	521
q5	7581	2386	2351	2351
q6	181	162	133	133
q7	913	730	625	625
q8	9314	1268	1118	1118
q9	6814	5146	5129	5129
q10	6869	2293	1886	1886
q11	521	292	282	282
q12	346	355	215	215
q13	17779	3670	3035	3035
q14	236	238	232	232
q15	578	476	484	476
q16	431	426	375	375
q17	620	876	383	383
q18	7508	7223	7065	7065
q19	1921	955	541	541
q20	341	351	227	227
q21	3998	2630	2357	2357
q22	1048	1038	996	996
Total cold run time: 107150 ms
Total hot run time: 33832 ms

----- Round 2, with runtime_filter_mode=off -----
q1	5171	5037	5034	5034
q2	236	319	225	225
q3	2198	2637	2282	2282
q4	1351	1768	1380	1380
q5	4231	4093	4327	4093
q6	215	170	132	132
q7	2034	1905	1777	1777
q8	2661	2574	2576	2574
q9	7158	7115	7252	7115
q10	3007	3149	2644	2644
q11	563	491	506	491
q12	655	804	629	629
q13	3553	3878	3257	3257
q14	291	306	287	287
q15	533	485	481	481
q16	432	477	451	451
q17	1160	1582	1368	1368
q18	7826	7495	7562	7495
q19	824	886	991	886
q20	1989	2059	1874	1874
q21	4950	4454	4312	4312
q22	1109	1033	1018	1018
Total cold run time: 52147 ms
Total hot run time: 49805 ms

@doris-robot
Copy link

TPC-DS: Total hot run time: 191835 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 6332d4b4f1d645ac16afa2bb18d09e16de3ddebc, data reload: false

query1	1416	1027	987	987
query2	6253	1830	1834	1830
query3	11012	4518	4520	4518
query4	54956	25930	23079	23079
query5	4901	553	460	460
query6	348	219	205	205
query7	4904	488	293	293
query8	286	234	214	214
query9	5746	2641	2636	2636
query10	453	355	274	274
query11	15088	14914	14838	14838
query12	160	104	109	104
query13	1039	503	419	419
query14	10169	6147	6247	6147
query15	205	205	177	177
query16	7158	648	479	479
query17	1089	755	629	629
query18	1642	410	322	322
query19	208	199	181	181
query20	134	123	118	118
query21	212	131	111	111
query22	4225	4330	4194	4194
query23	34324	33583	33632	33583
query24	6697	2441	2437	2437
query25	511	525	415	415
query26	691	268	147	147
query27	2227	505	343	343
query28	3297	2186	2178	2178
query29	585	571	427	427
query30	277	230	199	199
query31	920	862	813	813
query32	72	72	60	60
query33	443	363	313	313
query34	793	890	546	546
query35	798	833	752	752
query36	1010	984	890	890
query37	109	100	84	84
query38	4229	4421	4239	4239
query39	1521	1455	1471	1455
query40	209	121	110	110
query41	78	62	64	62
query42	139	118	109	109
query43	496	519	482	482
query44	1332	859	848	848
query45	188	177	169	169
query46	852	1039	642	642
query47	1842	1890	1793	1793
query48	398	441	323	323
query49	659	502	438	438
query50	686	690	421	421
query51	4194	4294	4164	4164
query52	114	107	107	107
query53	224	258	185	185
query54	587	570	521	521
query55	87	87	88	87
query56	317	297	318	297
query57	1215	1230	1191	1191
query58	261	277	260	260
query59	2751	2826	2555	2555
query60	366	326	319	319
query61	132	127	123	123
query62	750	727	692	692
query63	214	182	184	182
query64	1743	1033	688	688
query65	4244	4160	4244	4160
query66	715	399	311	311
query67	16003	15726	15330	15330
query68	6977	927	527	527
query69	548	302	280	280
query70	1195	1119	1106	1106
query71	503	315	290	290
query72	5773	4754	4897	4754
query73	1440	646	360	360
query74	9372	9118	8658	8658
query75	3984	3201	2706	2706
query76	4185	1196	844	844
query77	659	402	281	281
query78	10151	10155	9350	9350
query79	2337	824	570	570
query80	585	499	444	444
query81	478	256	216	216
query82	470	124	94	94
query83	251	255	235	235
query84	289	100	80	80
query85	799	344	316	316
query86	376	305	282	282
query87	4426	4377	4311	4311
query88	3805	2283	2272	2272
query89	398	307	280	280
query90	1839	208	211	208
query91	141	137	111	111
query92	80	61	58	58
query93	1842	920	569	569
query94	663	418	287	287
query95	366	294	288	288
query96	492	559	276	276
query97	2702	2752	2614	2614
query98	249	201	200	200
query99	1424	1386	1303	1303
Total cold run time: 299703 ms
Total hot run time: 191835 ms

@doris-robot
Copy link

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

query1	0.04	0.03	0.03
query2	0.07	0.04	0.03
query3	0.23	0.07	0.07
query4	1.62	0.10	0.10
query5	0.43	0.41	0.41
query6	1.19	0.66	0.66
query7	0.02	0.02	0.02
query8	0.05	0.04	0.04
query9	0.58	0.51	0.53
query10	0.57	0.59	0.56
query11	0.17	0.11	0.12
query12	0.15	0.12	0.12
query13	0.62	0.59	0.61
query14	0.80	0.81	0.81
query15	0.90	0.86	0.87
query16	0.38	0.40	0.38
query17	1.07	1.04	1.01
query18	0.22	0.21	0.21
query19	2.00	1.90	1.85
query20	0.01	0.02	0.01
query21	15.40	0.90	0.55
query22	0.75	1.26	0.73
query23	14.77	1.41	0.67
query24	7.60	1.15	0.36
query25	0.48	0.12	0.19
query26	0.67	0.17	0.15
query27	0.05	0.05	0.06
query28	9.35	0.93	0.45
query29	12.61	3.99	3.36
query30	0.25	0.09	0.06
query31	2.83	0.63	0.40
query32	3.24	0.56	0.47
query33	3.02	3.05	3.13
query34	15.82	5.04	4.47
query35	4.51	4.52	4.48
query36	0.66	0.50	0.48
query37	0.09	0.06	0.07
query38	0.05	0.04	0.04
query39	0.04	0.03	0.02
query40	0.17	0.14	0.12
query41	0.08	0.03	0.03
query42	0.03	0.03	0.02
query43	0.04	0.03	0.04
Total cold run time: 103.63 s
Total hot run time: 28.55 s

Copy link
Contributor

@lide-reed lide-reed left a comment

Choose a reason for hiding this comment

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

LGTM

@cambyzju cambyzju merged commit 7094151 into apache:master Jun 17, 2025
23 of 24 checks passed
github-actions bot pushed a commit that referenced this pull request Jun 17, 2025
cambyzju added a commit to cambyzju/incubator-doris that referenced this pull request Jun 19, 2025
dataroaring pushed a commit that referenced this pull request Jun 20, 2025
…rty will also cancel storage_policy #51662 (#51779)

Cherry-picked from #51662

Co-authored-by: camby <104178625@qq.com>
yiguolei pushed a commit that referenced this pull request Jun 20, 2025
…o cancel storage_policy (#51662) (#51910)

### What problem does this PR solve?

pick #51662 to branch-2.1

### Release note

None

### Check List (For Author)

- Test <!-- At least one of them must be included. -->
    - [ ] 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 <!-- Add your reason?  -->

- Behavior changed:
    - [ ] No.
    - [ ] Yes. <!-- Explain the behavior change -->

- Does this need documentation?
    - [ ] No.
- [ ] Yes. <!-- Add document PR link here. eg:
apache/doris-website#1214 -->

### Check List (For Reviewer who merge this PR)

- [ ] Confirm the release note
- [ ] Confirm test cases
- [ ] Confirm document
- [ ] Add branch pick label <!-- Add branch pick label that this PR
should merge into -->
github-actions bot pushed a commit that referenced this pull request Jun 20, 2025
morrySnow pushed a commit that referenced this pull request Jun 20, 2025
…rty will also cancel storage_policy #51662 (#52026)

Cherry-picked from #51662

Co-authored-by: camby <104178625@qq.com>
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.

8 participants