Skip to content

[fix](iceberg) Remove duplicated warehouse propert #54525

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
merged 2 commits into from
Aug 12, 2025
Merged

[fix](iceberg) Remove duplicated warehouse propert #54525

merged 2 commits into from
Aug 12, 2025

Conversation

zy-kkk
Copy link
Member

@zy-kkk zy-kkk commented Aug 10, 2025

AbstractIcebergProperties already defines the warehouse property, so there is no need to redefine it in IcebergRestProperties. Also, iceberg.rest.warehouse is not a standard Iceberg API name and should be unified as warehouse.

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

@zy-kkk
Copy link
Member Author

zy-kkk commented Aug 10, 2025

run buildall

CalvinKirs
CalvinKirs previously approved these changes Aug 10, 2025
View reviewed changes
@github-actions github-actions bot added the approved Indicates a PR has been approved by one committer. label Aug 10, 2025
@github-actions GitHub Actions
Copy link
Contributor

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

@github-actions GitHub Actions
Copy link
Contributor

PR approved by anyone and no changes requested.

@doris-robot
Copy link

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

------ Round 1 ----------------------------------
q1	17563	5174	5158	5158
q2	1927	296	195	195
q3	10296	1478	700	700
q4	10220	1033	498	498
q5	7514	2198	2318	2198
q6	173	165	131	131
q7	910	773	619	619
q8	9313	1240	1033	1033
q9	6804	4988	5192	4988
q10	6900	2363	1981	1981
q11	475	283	260	260
q12	349	354	229	229
q13	17783	3454	2987	2987
q14	244	246	226	226
q15	563	458	465	458
q16	415	421	377	377
q17	576	814	353	353
q18	7809	7230	7053	7053
q19	4120	971	563	563
q20	667	309	212	212
q21	4512	3086	2249	2249
q22	1043	1011	996	996
Total cold run time: 110176 ms
Total hot run time: 33464 ms

----- Round 2, with runtime_filter_mode=off -----
q1	5509	5251	5248	5248
q2	589	308	217	217
q3	2098	2517	2214	2214
q4	1337	1709	1343	1343
q5	4410	4431	4479	4431
q6	217	178	149	149
q7	1946	1822	1729	1729
q8	2541	2604	2479	2479
q9	7484	7428	7354	7354
q10	3360	3284	2898	2898
q11	535	526	475	475
q12	711	1017	599	599
q13	3307	3634	3231	3231
q14	299	320	324	320
q15	532	461	453	453
q16	588	690	455	455
q17	2331	1497	1431	1431
q18	15076	8206	7806	7806
q19	16641	939	1037	939
q20	2589	1920	1739	1739
q21	14911	4370	4298	4298
q22	1070	1003	1029	1003
Total cold run time: 88081 ms
Total hot run time: 50811 ms

@doris-robot
Copy link

TPC-DS: Total hot run time: 170806 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 434bc49fcfa52cd4aa77ed2026fbd7f1d8cb3bb3, data reload: false

============================================
query1	982	418	405	405
query2	6508	1977	1648	1648
query3	6740	221	232	221
query4	27407	23184	23153	23153
query5	4360	622	525	525
query6	336	248	220	220
query7	4630	546	307	307
query8	283	242	227	227
query9	8565	2951	2962	2951
query10	466	345	297	297
query11	15947	15029	14837	14837
query12	182	136	134	134
query13	1663	585	423	423
query14	8678	5888	5907	5888
query15	222	192	168	168
query16	7134	674	480	480
query17	973	769	652	652
query18	2002	470	308	308
query19	218	213	195	195
query20	142	137	132	132
query21	220	125	108	108
query22	3926	3901	3957	3901
query23	34297	34452	34191	34191
query24	5237	2443	2448	2443
query25	503	532	433	433
query26	706	297	161	161
query27	2216	521	355	355
query28	3018	2356	2348	2348
query29	618	601	510	510
query30	296	229	196	196
query31	828	788	705	705
query32	89	81	81	81
query33	473	412	366	366
query34	786	844	517	517
query35	814	846	747	747
query36	1017	1035	955	955
query37	138	111	96	96
query38	3918	3923	3952	3923
query39	1463	1416	1377	1377
query40	236	165	134	134
query41	60	57	57	57
query42	143	118	129	118
query43	511	503	488	488
query44	1459	882	871	871
query45	200	194	182	182
query46	954	1062	673	673
query47	1797	1828	1743	1743
query48	404	448	315	315
query49	674	511	435	435
query50	662	685	418	418
query51	4138	4214	4139	4139
query52	123	132	120	120
query53	264	299	235	235
query54	655	648	556	556
query55	93	90	88	88
query56	358	350	357	350
query57	1185	1208	1140	1140
query58	333	367	347	347
query59	2684	2665	2608	2608
query60	410	401	393	393
query61	161	123	126	123
query62	774	720	651	651
query63	252	224	223	223
query64	2366	1113	768	768
query65	4190	4121	4154	4121
query66	721	448	336	336
query67	query68	19679	960	1129	960
query69	1016	283	347	283
query70	1401	1166	1105	1105
query71	716	329	313	313
query72	9165	2329	2414	2329
query73	3872	638	356	356
query74	9121	8896	8858	8858
query75	7799	3112	2679	2679
query76	8847	1226	796	796
query77	1165	425	336	336
query78	9649	10525	9565	9565
query79	14327	595	576	576
query80	1770	551	549	549
query81	564	263	222	222
query82	477	151	114	114
query83	356	288	266	266
query84	310	104	81	81
query85	964	405	334	334
query86	371	331	308	308
query87	4314	4168	4061	4061
query88	5549	2230	2195	2195
query89	466	369	314	314
query90	2632	232	227	227
query91	144	140	112	112
query92	92	71	67	67
query93	6115	1020	653	653
query94	1006	398	274	274
query95	404	334	318	318
query96	504	584	281	281
query97	2672	2729	2570	2570
query98	246	251	221	221
query99	1490	1406	1267	1267
Total cold run time: 301011 ms
Total hot run time: 170806 ms

@doris-robot
Copy link

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

query1	0.04	0.04	0.03
query2	0.07	0.04	0.04
query3	0.24	0.07	0.08
query4	1.63	0.11	0.11
query5	0.42	0.44	0.45
query6	1.16	0.69	0.67
query7	0.03	0.02	0.02
query8	0.05	0.04	0.03
query9	0.55	0.49	0.48
query10	0.52	0.52	0.52
query11	0.15	0.10	0.10
query12	0.14	0.11	0.11
query13	0.66	0.65	0.64
query14	0.91	1.19	1.02
query15	0.91	0.90	0.90
query16	0.40	0.40	0.39
query17	1.09	1.07	1.13
query18	0.23	0.21	0.20
query19	1.91	1.80	1.82
query20	0.01	0.01	0.01
query21	15.38	0.86	0.55
query22	0.74	1.14	0.74
query23	14.91	1.19	0.67
query24	6.67	1.47	1.07
query25	0.53	0.14	0.13
query26	0.66	0.15	0.12
query27	0.06	0.05	0.04
query28	10.45	0.86	0.44
query29	12.59	3.79	3.31
query30	2.99	3.06	2.99
query31	2.81	0.57	0.40
query32	3.24	0.59	0.50
query33	3.04	3.15	3.21
query34	16.19	5.37	5.00
query35	4.86	4.97	4.93
query36	0.70	0.52	0.50
query37	0.10	0.07	0.08
query38	0.06	0.05	0.05
query39	0.04	0.03	0.03
query40	0.18	0.13	0.13
query41	0.08	0.03	0.02
query42	0.04	0.03	0.02
query43	0.05	0.03	0.04
Total cold run time: 107.49 s
Total hot run time: 33.54 s

@zy-kkk
Copy link
Member Author

zy-kkk commented Aug 10, 2025

run buildall

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

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

------ Round 1 ----------------------------------
q1	17620	5255	5196	5196
q2	1910	303	180	180
q3	10298	1403	690	690
q4	10225	985	516	516
q5	7448	2281	2311	2281
q6	174	167	131	131
q7	886	772	633	633
q8	9312	1310	1097	1097
q9	6842	5208	5038	5038
q10	6887	2398	1979	1979
q11	460	282	266	266
q12	352	372	230	230
q13	17772	3470	2951	2951
q14	236	237	212	212
q15	527	471	476	471
q16	431	420	363	363
q17	570	822	360	360
q18	7306	7084	7083	7083
q19	1237	980	555	555
q20	331	314	217	217
q21	3385	3036	2313	2313
q22	1050	1040	985	985
Total cold run time: 105259 ms
Total hot run time: 33747 ms

----- Round 2, with runtime_filter_mode=off -----
q1	5375	5450	5351	5351
q2	241	308	218	218
q3	2040	2573	2214	2214
q4	1391	1705	1304	1304
q5	4123	4386	4528	4386
q6	222	173	134	134
q7	1961	1993	1816	1816
q8	2514	2470	2469	2469
q9	7299	7380	7290	7290
q10	3203	3399	2964	2964
q11	541	494	491	491
q12	723	866	812	812
q13	3469	3727	3321	3321
q14	296	298	319	298
q15	497	464	456	456
q16	565	496	461	461
q17	1187	1466	1401	1401
q18	10316	7840	7653	7653
q19	12533	873	898	873
q20	4309	1968	1754	1754
q21	15329	4423	4194	4194
q22	1093	1019	989	989
Total cold run time: 79227 ms
Total hot run time: 50849 ms

@doris-robot
Copy link

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

============================================
query1	979	406	421	406
query2	6519	1816	1660	1660
query3	6742	227	227	227
query4	27182	23862	22983	22983
query5	4396	626	512	512
query6	342	248	224	224
query7	4634	550	301	301
query8	287	239	234	234
query9	8609	2928	2967	2928
query10	514	356	297	297
query11	15467	14951	14812	14812
query12	188	140	134	134
query13	1669	561	424	424
query14	8664	5947	5958	5947
query15	242	194	174	174
query16	7137	673	474	474
query17	1217	747	628	628
query18	2071	433	309	309
query19	221	207	188	188
query20	159	144	134	134
query21	212	130	109	109
query22	4004	4005	3877	3877
query23	34597	34409	34391	34391
query24	8265	2405	2412	2405
query25	559	514	456	456
query26	1103	295	159	159
query27	2706	509	344	344
query28	4341	2363	2351	2351
query29	785	619	514	514
query30	305	227	198	198
query31	900	803	719	719
query32	94	78	76	76
query33	558	405	375	375
query34	820	858	524	524
query35	800	825	759	759
query36	1033	1038	948	948
query37	136	110	93	93
query38	3964	3981	3906	3906
query39	1483	1389	1359	1359
query40	240	145	135	135
query41	65	59	58	58
query42	142	124	126	124
query43	515	498	492	492
query44	1462	886	886	886
query45	202	187	184	184
query46	960	1060	676	676
query47	1799	1829	1762	1762
query48	406	423	315	315
query49	736	518	411	411
query50	690	683	409	409
query51	4190	4265	4153	4153
query52	126	131	120	120
query53	261	287	218	218
query54	655	645	555	555
query55	91	89	89	89
query56	381	363	363	363
query57	1243	1224	1124	1124
query58	345	333	343	333
query59	2640	2528	2449	2449
query60	403	387	393	387
query61	130	123	123	123
query62	828	739	655	655
query63	256	214	215	214
query64	3975	1068	813	813
query65	4230	4137	4102	4102
query66	1061	486	337	337
query67	query68	17830	778	585	585
query69	1016	308	286	286
query70	1448	1089	1136	1089
query71	710	345	333	333
query72	9263	2323	2366	2323
query73	3245	628	363	363
query74	9042	9008	8968	8968
query75	7539	3087	2599	2599
query76	8864	1230	784	784
query77	1147	395	344	344
query78	9806	11353	9163	9163
query79	14695	572	576	572
query80	1544	542	487	487
query81	558	271	225	225
query82	386	149	118	118
query83	380	285	272	272
query84	312	100	84	84
query85	972	371	366	366
query86	360	327	321	321
query87	4209	4091	4030	4030
query88	4856	2245	2273	2245
query89	487	359	307	307
query90	2669	233	232	232
query91	150	152	112	112
query92	92	74	68	68
query93	5727	956	644	644
query94	1087	392	277	277
query95	412	339	335	335
query96	501	591	286	286
query97	2706	2682	2614	2614
query98	253	234	226	226
query99	1463	1370	1258	1258
Total cold run time: 305665 ms
Total hot run time: 169962 ms

@doris-robot
Copy link

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

query1	0.04	0.04	0.03
query2	0.08	0.04	0.04
query3	0.26	0.07	0.07
query4	1.62	0.11	0.11
query5	0.44	0.42	0.44
query6	1.17	0.66	0.65
query7	0.02	0.02	0.02
query8	0.05	0.04	0.04
query9	0.54	0.48	0.46
query10	0.53	0.52	0.52
query11	0.15	0.11	0.10
query12	0.15	0.12	0.11
query13	0.67	0.64	0.64
query14	0.96	1.04	1.27
query15	0.89	0.88	0.89
query16	0.39	0.40	0.40
query17	1.08	1.05	1.02
query18	0.21	0.21	0.20
query19	1.97	1.90	1.80
query20	0.02	0.01	0.01
query21	15.40	0.86	0.55
query22	0.75	1.41	0.72
query23	14.74	1.13	0.63
query24	6.88	1.12	0.91
query25	0.51	0.36	0.07
query26	0.48	0.15	0.14
query27	0.06	0.05	0.05
query28	10.03	0.86	0.44
query29	12.64	3.81	3.27
query30	2.98	2.95	2.95
query31	2.81	0.56	0.40
query32	3.24	0.57	0.49
query33	3.05	3.16	3.19
query34	16.20	5.36	4.93
query35	4.85	5.12	4.99
query36	0.70	0.52	0.50
query37	0.10	0.08	0.07
query38	0.06	0.05	0.04
query39	0.03	0.02	0.02
query40	0.17	0.15	0.13
query41	0.09	0.03	0.03
query42	0.03	0.02	0.03
query43	0.04	0.03	0.04
Total cold run time: 107.08 s
Total hot run time: 33.1 s

@hello-stephen
Copy link
Contributor

FE UT Coverage Report

Increment line coverage 100.00% (2/2) 🎉
Increment coverage report
Complete coverage report

@github-actions GitHub Actions
Copy link
Contributor

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

@github-actions github-actions bot added the approved Indicates a PR has been approved by one committer. label Aug 11, 2025
@zy-kkk zy-kkk merged commit 4455d58 into apache:master Aug 12, 2025
27 of 29 checks passed
@zy-kkk zy-kkk deleted the fix_iceberg_rest_warehouse branch August 12, 2025 03:16
github-actions bot pushed a commit that referenced this pull request Aug 12, 2025
@zy-kkk
[fix](iceberg) Remove duplicated warehouse propert (#54525)
ea9a068 
`AbstractIcebergProperties` already defines the warehouse property, so
there is no need to redefine it in `IcebergRestProperties`. Also,
`iceberg.rest.warehouse` is not a standard Iceberg API name and should
be unified as `warehouse`.
@github-actions github-actions bot mentioned this pull request Aug 12, 2025
Merged
morrySnow pushed a commit that referenced this pull request Aug 13, 2025
@github-actions @zy-kkk
branch-3.1: [fix](iceberg) Remove duplicated warehouse propert #54525 (…
49bd21f 
…#54600)

Cherry-picked from #54525

Co-authored-by: zy-kkk <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@morningman morningman morningman approved these changes

@CalvinKirs CalvinKirs CalvinKirs approved these changes

Assignees
No one assigned
Labels
approved Indicates a PR has been approved by one committer. dev/3.1.0-merged reviewed
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@zy-kkk @hello-stephen @doris-robot @morningman @CalvinKirs @morrySnow