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

[feature-wip](Cloud) Support set default storage vault and pass vault id to all write paths #32910

Merged
merged 31 commits into from
Apr 2, 2024

Conversation

ByteYue
Copy link
Contributor

@ByteYue ByteYue commented Mar 27, 2024

Proposed changes

Issue Number: close #xxx

  1. Support set default storage vault. All tables which don't specify storage vault name would use this vault by default. Notice if there is no default vault and the table doesn't specify it's vault then it would fail.
  2. Pass the vault id to all write path.

Further comments

If this is a relatively large or complex change, kick off the discussion at [email protected] by explaining why you chose the solution you did and what alternatives you considered, etc...

@doris-robot
Copy link

Thank you for your contribution to Apache Doris.
Don't know what should be done next? See How to process your PR

Since 2024-03-18, the Document has been moved to doris-website.
See Doris Document.

Copy link
Contributor

clang-tidy review says "All clean, LGTM! 👍"

3 similar comments
Copy link
Contributor

clang-tidy review says "All clean, LGTM! 👍"

Copy link
Contributor

clang-tidy review says "All clean, LGTM! 👍"

Copy link
Contributor

clang-tidy review says "All clean, LGTM! 👍"

Copy link
Contributor

clang-tidy review says "All clean, LGTM! 👍"

2 similar comments
Copy link
Contributor

clang-tidy review says "All clean, LGTM! 👍"

Copy link
Contributor

clang-tidy review says "All clean, LGTM! 👍"

Copy link
Contributor

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

clang-tidy made some suggestions

cloud/src/meta-service/meta_service.cpp Outdated Show resolved Hide resolved
@@ -1379,6 +1398,8 @@ service MetaService {

// routine load progress
rpc get_rl_task_commit_attach(GetRLTaskCommitAttachRequest) returns (GetRLTaskCommitAttachResponse);

rpc get_default_vault(GetDefaultVaultRequest) returns (GetDefaultVaultResponse);
Copy link
Collaborator

Choose a reason for hiding this comment

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

no need this rpc

Copy link
Contributor

clang-tidy review says "All clean, LGTM! 👍"

2 similar comments
Copy link
Contributor

clang-tidy review says "All clean, LGTM! 👍"

Copy link
Contributor

clang-tidy review says "All clean, LGTM! 👍"

Copy link
Contributor

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

clang-tidy made some suggestions

@@ -5426,6 +5426,210 @@ TEST(MetaServiceTest, DropHdfsInfoTest) {
SyncPoint::get_instance()->clear_all_call_backs();
}

TEST(MetaServiceTest, GetDefaultVaultTest) {
Copy link
Contributor

Choose a reason for hiding this comment

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

warning: function 'TEST' exceeds recommended size/complexity thresholds [readability-function-size]

TEST(MetaServiceTest, GetDefaultVaultTest) {
^
Additional context

cloud/test/meta_service_test.cpp:5428: 99 lines including whitespace and comments (threshold 80)

TEST(MetaServiceTest, GetDefaultVaultTest) {
^

hdfs.mutable_build_conf()->CopyFrom(conf);
req.mutable_hdfs_info()->CopyFrom(hdfs);

auto sp = SyncPoint::get_instance();
Copy link
Contributor

Choose a reason for hiding this comment

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

warning: 'auto sp' can be declared as 'auto *sp' [readability-qualified-auto]

Suggested change
auto sp = SyncPoint::get_instance();
auto *sp = SyncPoint::get_instance();

instance.add_obj_info()->CopyFrom(obj_info);
req.mutable_obj_info()->CopyFrom(obj_info);

auto sp = SyncPoint::get_instance();
Copy link
Contributor

Choose a reason for hiding this comment

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

warning: 'auto sp' can be declared as 'auto *sp' [readability-qualified-auto]

Suggested change
auto sp = SyncPoint::get_instance();
auto *sp = SyncPoint::get_instance();

}
}

TEST(MetaServiceTest, SetDefaultVaultTest) {
Copy link
Contributor

Choose a reason for hiding this comment

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

warning: function 'TEST' exceeds recommended size/complexity thresholds [readability-function-size]

TEST(MetaServiceTest, SetDefaultVaultTest) {
^
Additional context

cloud/test/meta_service_test.cpp:5529: 101 lines including whitespace and comments (threshold 80)

TEST(MetaServiceTest, SetDefaultVaultTest) {
^

hdfs.mutable_build_conf()->CopyFrom(conf);
req.mutable_hdfs_info()->CopyFrom(hdfs);

auto sp = SyncPoint::get_instance();
Copy link
Contributor

Choose a reason for hiding this comment

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

warning: 'auto sp' can be declared as 'auto *sp' [readability-qualified-auto]

Suggested change
auto sp = SyncPoint::get_instance();
auto *sp = SyncPoint::get_instance();

// Try to set one non-existent vault as default
{
StorageVaultPB hdfs;
auto name = "test_alter_add_hdfs_info_no";
Copy link
Contributor

Choose a reason for hiding this comment

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

warning: 'auto name' can be declared as 'const auto *name' [readability-qualified-auto]

Suggested change
auto name = "test_alter_add_hdfs_info_no";
const auto *name = "test_alter_add_hdfs_info_no";

@ByteYue
Copy link
Contributor Author

ByteYue commented Mar 30, 2024

run buildall

@doris-robot
Copy link

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

------ Round 1 ----------------------------------
q1	17616	4361	4221	4221
q2	2082	186	184	184
q3	10441	1249	1129	1129
q4	10200	814	734	734
q5	7470	2796	2763	2763
q6	214	134	132	132
q7	1010	614	598	598
q8	9224	2074	2025	2025
q9	7566	6569	6518	6518
q10	8572	3516	3556	3516
q11	480	237	231	231
q12	478	234	216	216
q13	17782	2979	2998	2979
q14	267	230	226	226
q15	524	476	455	455
q16	546	397	383	383
q17	966	606	594	594
q18	7473	6744	6624	6624
q19	3214	1463	1396	1396
q20	683	322	304	304
q21	3425	2651	2845	2651
q22	376	307	321	307
Total cold run time: 110609 ms
Total hot run time: 38186 ms

----- Round 2, with runtime_filter_mode=off -----
q1	4336	4195	4208	4195
q2	375	276	267	267
q3	3003	2730	2664	2664
q4	1881	1561	1610	1561
q5	5288	5221	5239	5221
q6	207	125	126	125
q7	2224	1899	1880	1880
q8	3206	3295	3295	3295
q9	8556	8466	8528	8466
q10	3945	3814	3850	3814
q11	590	523	488	488
q12	808	653	679	653
q13	17862	3363	3207	3207
q14	331	296	283	283
q15	512	475	463	463
q16	540	453	440	440
q17	1815	1455	1462	1455
q18	8300	8008	7851	7851
q19	1705	1591	1576	1576
q20	1973	1812	1882	1812
q21	6905	4912	4952	4912
q22	559	452	474	452
Total cold run time: 74921 ms
Total hot run time: 55080 ms

@doris-robot
Copy link

TPC-DS: Total hot run time: 182617 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 40aaafbaf567d5343441698be0808f3400f3dbdd, data reload: false

query1	1220	1133	1116	1116
query2	6362	2119	1941	1941
query3	6655	208	206	206
query4	32695	21421	21256	21256
query5	4195	390	402	390
query6	224	180	175	175
query7	3993	315	287	287
query8	218	173	180	173
query9	5677	2330	2321	2321
query10	367	224	244	224
query11	14741	14157	14221	14157
query12	138	91	83	83
query13	950	357	366	357
query14	9150	6949	6907	6907
query15	223	178	179	178
query16	7624	273	266	266
query17	1452	623	585	585
query18	1893	289	281	281
query19	206	164	161	161
query20	94	91	88	88
query21	201	133	137	133
query22	5014	4828	4849	4828
query23	33323	32783	32939	32783
query24	9869	2977	2979	2977
query25	572	415	417	415
query26	686	160	168	160
query27	3013	365	368	365
query28	6240	1930	1889	1889
query29	934	650	664	650
query30	301	166	164	164
query31	953	756	745	745
query32	72	60	57	57
query33	484	258	254	254
query34	915	497	504	497
query35	834	742	734	734
query36	1046	917	917	917
query37	110	70	76	70
query38	3679	3698	3693	3693
query39	1639	1607	1622	1607
query40	173	132	131	131
query41	49	47	48	47
query42	107	112	104	104
query43	518	474	469	469
query44	1085	733	737	733
query45	293	271	268	268
query46	1109	720	716	716
query47	2047	1913	1963	1913
query48	388	302	302	302
query49	848	378	386	378
query50	808	413	393	393
query51	6880	6691	6757	6691
query52	115	96	90	90
query53	354	281	299	281
query54	262	233	237	233
query55	79	77	80	77
query56	257	244	250	244
query57	1257	1242	1221	1221
query58	223	213	208	208
query59	2992	2750	2537	2537
query60	246	234	241	234
query61	95	90	89	89
query62	571	427	452	427
query63	307	282	286	282
query64	4759	4069	3994	3994
query65	3067	3030	3025	3025
query66	761	351	340	340
query67	15481	14857	14945	14857
query68	10197	553	539	539
query69	593	309	307	307
query70	1248	1097	1096	1096
query71	520	266	278	266
query72	6558	2616	2427	2427
query73	1276	315	317	315
query74	7351	6433	6399	6399
query75	3569	2344	2316	2316
query76	6074	968	935	935
query77	567	244	245	244
query78	11005	10299	10104	10104
query79	12231	536	506	506
query80	2381	433	422	422
query81	487	216	218	216
query82	635	101	87	87
query83	213	163	160	160
query84	261	83	81	81
query85	946	271	281	271
query86	370	292	317	292
query87	3711	3548	3533	3533
query88	4861	2290	2270	2270
query89	506	371	360	360
query90	2036	181	173	173
query91	123	97	94	94
query92	59	46	47	46
query93	5848	508	503	503
query94	1274	176	179	176
query95	403	311	311	311
query96	604	273	266	266
query97	2670	2506	2485	2485
query98	233	222	216	216
query99	1097	827	848	827
Total cold run time: 303000 ms
Total hot run time: 182617 ms

@doris-robot
Copy link

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

query1	0.05	0.03	0.03
query2	0.08	0.04	0.05
query3	0.24	0.05	0.05
query4	1.68	0.07	0.07
query5	0.49	0.49	0.49
query6	1.18	0.66	0.66
query7	0.02	0.01	0.02
query8	0.05	0.04	0.04
query9	0.56	0.48	0.50
query10	0.55	0.56	0.56
query11	0.16	0.10	0.12
query12	0.14	0.12	0.10
query13	0.58	0.59	0.58
query14	0.76	0.78	0.78
query15	0.82	0.81	0.81
query16	0.36	0.41	0.36
query17	1.01	1.02	1.03
query18	0.21	0.26	0.22
query19	1.76	1.77	1.70
query20	0.02	0.01	0.01
query21	15.53	0.65	0.66
query22	2.48	2.06	1.84
query23	17.11	1.01	0.76
query24	1.14	0.23	0.20
query25	0.09	0.08	0.07
query26	0.21	0.17	0.15
query27	0.08	0.07	0.08
query28	14.08	0.94	0.92
query29	12.51	3.28	3.26
query30	0.30	0.08	0.08
query31	2.80	0.37	0.38
query32	3.30	0.46	0.45
query33	2.83	2.83	2.80
query34	16.73	4.41	4.46
query35	4.54	4.44	4.47
query36	0.60	0.46	0.46
query37	0.18	0.15	0.14
query38	0.14	0.14	0.13
query39	0.05	0.04	0.04
query40	0.17	0.14	0.14
query41	0.08	0.04	0.05
query42	0.06	0.05	0.05
query43	0.05	0.04	0.04
Total cold run time: 105.78 s
Total hot run time: 29.62 s

@doris-robot
Copy link

TeamCity be ut coverage result:
Function Coverage: 35.55% (8840/24865)
Line Coverage: 27.29% (72487/265603)
Region Coverage: 26.51% (37523/141557)
Branch Coverage: 23.31% (19132/82060)
Coverage Report: http://coverage.selectdb-in.cc/coverage/40aaafbaf567d5343441698be0808f3400f3dbdd_40aaafbaf567d5343441698be0808f3400f3dbdd/report/index.html

@ByteYue
Copy link
Contributor Author

ByteYue commented Mar 30, 2024

run buildall

@doris-robot
Copy link

TeamCity be ut coverage result:
Function Coverage: 35.54% (8838/24865)
Line Coverage: 27.28% (72465/265603)
Region Coverage: 26.50% (37506/141557)
Branch Coverage: 23.30% (19120/82060)
Coverage Report: http://coverage.selectdb-in.cc/coverage/bb362680694b8c93e9050f46d53cd02afc068de0_bb362680694b8c93e9050f46d53cd02afc068de0/report/index.html

@doris-robot
Copy link

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

------ Round 1 ----------------------------------
q1	17630	4365	4276	4276
q2	2093	194	187	187
q3	10422	1159	1146	1146
q4	10203	792	819	792
q5	7427	2811	2714	2714
q6	214	131	133	131
q7	1019	616	591	591
q8	9206	2048	2026	2026
q9	7648	6591	6533	6533
q10	8554	3511	3495	3495
q11	469	254	241	241
q12	423	222	217	217
q13	17786	2965	2945	2945
q14	266	237	230	230
q15	505	460	473	460
q16	535	393	384	384
q17	945	553	621	553
q18	7247	6636	6557	6557
q19	3355	1403	1414	1403
q20	682	320	308	308
q21	3372	2752	2870	2752
q22	359	307	306	306
Total cold run time: 110360 ms
Total hot run time: 38247 ms

----- Round 2, with runtime_filter_mode=off -----
q1	4294	4203	4203	4203
q2	378	268	283	268
q3	2939	2687	2658	2658
q4	1856	1585	1558	1558
q5	5267	5236	5155	5155
q6	211	126	131	126
q7	2181	1852	1857	1852
q8	3171	3313	3275	3275
q9	8522	8476	8567	8476
q10	3914	4392	3833	3833
q11	620	499	485	485
q12	801	656	687	656
q13	17621	3265	3101	3101
q14	325	307	284	284
q15	513	484	474	474
q16	519	455	472	455
q17	1842	1466	1465	1465
q18	8260	8028	7759	7759
q19	1641	1527	1531	1527
q20	2062	1860	1848	1848
q21	5251	4974	5010	4974
q22	564	471	469	469
Total cold run time: 72752 ms
Total hot run time: 54901 ms

@doris-robot
Copy link

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

query1	1218	1121	1120	1120
query2	6849	2041	1962	1962
query3	6661	205	200	200
query4	34747	21525	21313	21313
query5	4104	425	441	425
query6	249	191	180	180
query7	4101	302	288	288
query8	234	177	178	177
query9	5986	2315	2310	2310
query10	359	255	250	250
query11	14743	14278	14298	14278
query12	133	96	92	92
query13	1087	345	362	345
query14	8974	7086	6953	6953
query15	208	174	176	174
query16	7059	255	263	255
query17	1686	575	544	544
query18	1494	313	297	297
query19	205	160	158	158
query20	93	90	89	89
query21	203	140	125	125
query22	4966	4809	4801	4801
query23	33470	32820	32869	32820
query24	11086	2961	2893	2893
query25	620	412	424	412
query26	1412	158	160	158
query27	3240	379	374	374
query28	7440	1939	1891	1891
query29	894	641	668	641
query30	302	1065	160	160
query31	988	764	753	753
query32	64	59	58	58
query33	590	256	271	256
query34	1007	505	500	500
query35	898	693	733	693
query36	1056	904	930	904
query37	139	81	80	80
query38	3663	3656	3586	3586
query39	1630	1605	1579	1579
query40	180	127	131	127
query41	48	46	55	46
query42	106	103	99	99
query43	500	458	450	450
query44	1239	734	739	734
query45	312	270	282	270
query46	1109	711	713	711
query47	1986	1965	1995	1965
query48	426	316	313	313
query49	910	394	396	394
query50	816	403	408	403
query51	6786	6686	6662	6662
query52	116	99	93	93
query53	345	277	280	277
query54	266	243	251	243
query55	81	74	74	74
query56	240	221	232	221
query57	1231	1169	1149	1149
query58	211	203	203	203
query59	2791	2586	2608	2586
query60	259	238	236	236
query61	96	94	91	91
query62	605	448	433	433
query63	302	273	280	273
query64	4727	4096	4107	4096
query65	3058	3028	2997	2997
query66	744	353	337	337
query67	15571	14833	14900	14833
query68	10304	532	549	532
query69	602	309	314	309
query70	1219	1146	1123	1123
query71	503	281	265	265
query72	7310	2646	2448	2448
query73	1178	325	326	325
query74	7394	6404	6407	6404
query75	3595	2291	2296	2291
query76	6247	991	960	960
query77	590	260	257	257
query78	11024	10126	10232	10126
query79	12166	527	518	518
query80	2534	425	418	418
query81	541	222	1071	222
query82	616	91	90	90
query83	211	174	168	168
query84	262	83	81	81
query85	1084	294	279	279
query86	349	288	289	288
query87	3663	3516	3548	3516
query88	4925	2306	2279	2279
query89	511	371	371	371
query90	2047	183	177	177
query91	134	104	97	97
query92	60	47	48	47
query93	6418	513	505	505
query94	1380	184	180	180
query95	415	321	314	314
query96	610	268	268	268
query97	2678	2463	2495	2463
query98	231	221	209	209
query99	1095	829	828	828
Total cold run time: 310815 ms
Total hot run time: 182768 ms

@doris-robot
Copy link

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

query1	0.04	0.03	0.03
query2	0.08	0.04	0.04
query3	0.22	0.05	0.05
query4	1.68	0.07	0.06
query5	0.49	0.49	0.50
query6	1.13	0.66	0.65
query7	0.02	0.02	0.01
query8	0.05	0.05	0.04
query9	0.54	0.49	0.49
query10	0.54	0.55	0.55
query11	0.16	0.10	0.11
query12	0.14	0.11	0.11
query13	0.59	0.57	0.59
query14	0.76	0.77	0.80
query15	0.83	0.81	0.81
query16	0.36	0.40	0.37
query17	0.97	0.97	0.95
query18	0.23	0.24	0.24
query19	1.80	1.75	1.70
query20	0.02	0.01	0.01
query21	15.52	0.66	0.65
query22	2.72	3.52	1.59
query23	17.31	0.93	0.78
query24	1.16	0.22	0.21
query25	0.09	0.08	0.08
query26	0.20	0.16	0.16
query27	0.08	0.07	0.07
query28	14.06	0.97	0.93
query29	12.59	3.28	3.24
query30	0.29	0.09	0.08
query31	2.83	0.36	0.38
query32	3.32	0.46	0.45
query33	2.80	2.91	2.80
query34	16.34	4.46	4.43
query35	4.51	4.48	4.43
query36	0.63	0.46	0.46
query37	0.18	0.15	0.15
query38	0.14	0.14	0.13
query39	0.04	0.03	0.03
query40	0.18	0.15	0.14
query41	0.09	0.04	0.04
query42	0.05	0.05	0.05
query43	0.05	0.04	0.03
Total cold run time: 105.83 s
Total hot run time: 29.33 s

@ByteYue
Copy link
Contributor Author

ByteYue commented Apr 1, 2024

run buildall

@doris-robot
Copy link

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

------ Round 1 ----------------------------------
q1	18348	4248	4199	4199
q2	2553	201	198	198
q3	11751	1274	1474	1274
q4	10557	905	1039	905
q5	7838	3116	3029	3029
q6	225	136	137	136
q7	1171	668	655	655
q8	10237	2092	2065	2065
q9	6723	6208	6186	6186
q10	8436	3552	3509	3509
q11	412	247	252	247
q12	387	218	218	218
q13	17776	2939	2947	2939
q14	267	243	248	243
q15	530	500	508	500
q16	499	387	377	377
q17	981	938	912	912
q18	7263	6480	6428	6428
q19	1618	1547	1538	1538
q20	606	327	321	321
q21	3575	3141	3120	3120
q22	377	330	316	316
Total cold run time: 112130 ms
Total hot run time: 39315 ms

----- Round 2, with runtime_filter_mode=off -----
q1	4105	4075	4038	4038
q2	335	226	224	224
q3	2980	2952	2951	2951
q4	1898	1986	1861	1861
q5	5353	5262	5248	5248
q6	208	125	124	124
q7	2270	1818	1808	1808
q8	3232	3312	3289	3289
q9	8527	8518	8541	8518
q10	3753	3828	3820	3820
q11	544	460	439	439
q12	712	544	543	543
q13	11898	2935	2921	2921
q14	300	255	270	255
q15	512	476	468	468
q16	471	419	413	413
q17	1742	1711	1688	1688
q18	7679	7429	7303	7303
q19	1650	1662	1637	1637
q20	1957	1723	1706	1706
q21	5093	4814	4788	4788
q22	500	430	421	421
Total cold run time: 65719 ms
Total hot run time: 54463 ms

@doris-robot
Copy link

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

query1	1249	1116	1122	1116
query2	6491	1835	1824	1824
query3	6665	215	220	215
query4	24503	21659	21573	21573
query5	4211	432	431	431
query6	275	194	186	186
query7	4608	309	313	309
query8	243	194	214	194
query9	8485	2231	2218	2218
query10	580	262	262	262
query11	14966	14407	14546	14407
query12	150	101	96	96
query13	1639	393	381	381
query14	8674	6766	6861	6766
query15	216	176	175	175
query16	7151	273	270	270
query17	1009	608	577	577
query18	1930	294	294	294
query19	209	167	167	167
query20	105	100	96	96
query21	202	135	134	134
query22	4959	4798	4798	4798
query23	33710	33034	32836	32836
query24	12584	3170	3143	3143
query25	699	408	407	407
query26	1920	171	168	168
query27	3006	340	336	336
query28	6789	1865	1850	1850
query29	1365	623	606	606
query30	304	153	153	153
query31	995	729	733	729
query32	96	65	61	61
query33	724	275	274	274
query34	1006	504	510	504
query35	852	714	721	714
query36	1037	896	878	878
query37	282	81	78	78
query38	3547	3373	3405	3373
query39	1603	1546	1506	1506
query40	297	141	140	140
query41	51	47	49	47
query42	119	107	110	107
query43	451	415	400	400
query44	1114	726	708	708
query45	290	257	273	257
query46	1086	797	776	776
query47	1868	1781	1775	1775
query48	388	310	308	308
query49	1174	379	370	370
query50	802	400	403	400
query51	6782	6680	6687	6680
query52	113	105	113	105
query53	373	312	303	303
query54	334	248	245	245
query55	86	87	80	80
query56	259	236	240	236
query57	1206	1144	1102	1102
query58	256	241	240	240
query59	2533	2235	2285	2235
query60	269	243	249	243
query61	110	111	110	110
query62	713	470	476	470
query63	325	288	300	288
query64	6528	3161	3298	3161
query65	3098	3012	3018	3012
query66	1427	337	324	324
query67	15717	14978	14886	14886
query68	9005	564	573	564
query69	563	331	330	330
query70	1355	1133	1124	1124
query71	491	284	279	279
query72	6335	2581	2431	2431
query73	1435	328	327	327
query74	6720	6382	6448	6382
query75	3652	2306	2284	2284
query76	5205	1082	1200	1082
query77	602	274	256	256
query78	11069	10124	10119	10119
query79	8479	547	539	539
query80	1366	434	432	432
query81	498	228	225	225
query82	712	109	114	109
query83	200	166	161	161
query84	271	92	89	89
query85	1427	293	287	287
query86	414	285	298	285
query87	3679	3527	3451	3451
query88	3747	2289	2282	2282
query89	577	385	375	375
query90	1952	181	192	181
query91	135	107	106	106
query92	67	55	52	52
query93	6639	531	533	531
query94	1123	196	197	196
query95	435	335	332	332
query96	606	269	274	269
query97	2645	2502	2467	2467
query98	236	217	216	216
query99	1354	816	833	816
Total cold run time: 299802 ms
Total hot run time: 181692 ms

@doris-robot
Copy link

TeamCity be ut coverage result:
Function Coverage: 35.55% (8841/24869)
Line Coverage: 27.27% (72499/265808)
Region Coverage: 26.49% (37532/141696)
Branch Coverage: 23.29% (19135/82158)
Coverage Report: http://coverage.selectdb-in.cc/coverage/c1175cbb92ddfdd0ea02e11023a29f90967cebb8_c1175cbb92ddfdd0ea02e11023a29f90967cebb8/report/index.html

@doris-robot
Copy link

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

query1	0.04	0.03	0.04
query2	0.07	0.04	0.04
query3	0.23	0.05	0.05
query4	1.67	0.07	0.07
query5	0.49	0.48	0.49
query6	1.13	0.66	0.66
query7	0.02	0.01	0.02
query8	0.05	0.04	0.04
query9	0.57	0.51	0.50
query10	0.56	0.57	0.58
query11	0.15	0.11	0.11
query12	0.14	0.11	0.11
query13	0.61	0.60	0.61
query14	0.76	0.78	0.82
query15	0.85	0.84	0.84
query16	0.34	0.35	0.37
query17	0.99	1.00	1.00
query18	0.25	0.24	0.26
query19	1.80	1.73	1.71
query20	0.01	0.01	0.00
query21	15.42	0.76	0.67
query22	3.33	5.52	2.63
query23	17.63	1.45	1.12
query24	1.44	0.20	0.24
query25	0.13	0.10	0.09
query26	0.28	0.17	0.18
query27	0.08	0.08	0.08
query28	13.83	0.95	0.93
query29	12.61	3.44	3.50
query30	0.25	0.06	0.05
query31	2.87	0.38	0.39
query32	3.28	0.47	0.47
query33	2.84	2.86	2.91
query34	15.51	4.35	4.34
query35	4.38	4.41	4.35
query36	0.68	0.48	0.48
query37	0.20	0.18	0.17
query38	0.18	0.17	0.17
query39	0.04	0.04	0.03
query40	0.18	0.15	0.15
query41	0.09	0.06	0.05
query42	0.06	0.05	0.05
query43	0.05	0.04	0.04
Total cold run time: 106.09 s
Total hot run time: 31.11 s

@doris-robot
Copy link

Load test result on machine: 'aliyun_ecs.c7a.8xlarge_32C64G'

Load test result on commit c1175cbb92ddfdd0ea02e11023a29f90967cebb8 with default session variables
Stream load json:         19 seconds loaded 2358488459 Bytes, about 118 MB/s
Stream load orc:          58 seconds loaded 1101869774 Bytes, about 18 MB/s
Stream load parquet:      31 seconds loaded 861443392 Bytes, about 26 MB/s
Insert into select:       15.6 seconds inserted 10000000 Rows, about 641K ops/s

be/src/cloud/cloud_storage_engine.cpp Outdated Show resolved Hide resolved
});

if (s3_obj != instance.obj_info().end()) {
response->set_storage_vault_id(s3_obj->id());
Copy link
Collaborator

Choose a reason for hiding this comment

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

should we also just set storage_vault_id in tablet meta?

cloud/src/meta-service/meta_service_resource.cpp Outdated Show resolved Hide resolved
@ByteYue
Copy link
Contributor Author

ByteYue commented Apr 1, 2024

run buildall

@doris-robot
Copy link

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

------ Round 1 ----------------------------------
q1	17674	4132	4083	4083
q2	2009	191	189	189
q3	10466	1255	1414	1255
q4	10195	845	1028	845
q5	7473	3025	2983	2983
q6	218	132	131	131
q7	1113	635	620	620
q8	9408	2118	2066	2066
q9	6749	6252	6197	6197
q10	8489	3554	3537	3537
q11	424	241	241	241
q12	380	223	216	216
q13	17788	2902	2947	2902
q14	275	243	246	243
q15	531	505	482	482
q16	496	398	386	386
q17	997	924	929	924
q18	7368	6599	6405	6405
q19	1607	1549	1549	1549
q20	609	327	309	309
q21	3595	3190	3162	3162
q22	355	307	306	306
Total cold run time: 108219 ms
Total hot run time: 39031 ms

----- Round 2, with runtime_filter_mode=off -----
q1	4058	4050	4047	4047
q2	330	228	230	228
q3	2970	2997	2966	2966
q4	1905	1881	1887	1881
q5	5277	5256	5273	5256
q6	208	125	125	125
q7	2266	1795	1811	1795
q8	3243	3302	3335	3302
q9	8564	8515	8542	8515
q10	3781	3853	3840	3840
q11	555	433	440	433
q12	708	547	563	547
q13	13203	2916	2934	2916
q14	303	256	260	256
q15	523	482	468	468
q16	451	420	418	418
q17	1750	1706	1682	1682
q18	7671	7258	7271	7258
q19	1649	1652	1656	1652
q20	1946	1753	1726	1726
q21	5103	4764	4754	4754
q22	486	422	421	421
Total cold run time: 66950 ms
Total hot run time: 54486 ms

@doris-robot
Copy link

TPC-DS: Total hot run time: 181070 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 1b712832b05c5bb396de08ccec425066fd365ce0, data reload: false

query1	897	1116	367	367
query2	5989	1886	1841	1841
query3	6672	214	221	214
query4	24652	21454	21407	21407
query5	4155	410	403	403
query6	274	188	184	184
query7	4597	311	297	297
query8	238	193	175	175
query9	8454	2261	2251	2251
query10	581	263	258	258
query11	14966	14621	14495	14495
query12	141	101	99	99
query13	1646	384	393	384
query14	8504	6830	6850	6830
query15	218	193	186	186
query16	6243	276	275	275
query17	919	605	592	592
query18	1885	294	289	289
query19	207	165	164	164
query20	103	93	95	93
query21	203	132	129	129
query22	4959	4794	4808	4794
query23	33624	32737	32719	32719
query24	12493	3261	3077	3077
query25	649	403	410	403
query26	1663	167	161	161
query27	3001	325	343	325
query28	6636	1870	1851	1851
query29	1004	606	601	601
query30	242	154	156	154
query31	997	724	737	724
query32	70	61	59	59
query33	619	259	257	257
query34	912	490	505	490
query35	857	705	716	705
query36	990	872	871	871
query37	128	80	75	75
query38	3463	3429	3402	3402
query39	1572	1528	1539	1528
query40	217	141	140	140
query41	51	46	46	46
query42	113	101	105	101
query43	459	413	399	399
query44	1073	710	706	706
query45	277	272	276	272
query46	1061	789	783	783
query47	1909	1776	1816	1776
query48	394	304	309	304
query49	766	371	361	361
query50	809	391	400	391
query51	6823	6768	6750	6750
query52	117	94	98	94
query53	362	298	291	291
query54	317	255	248	248
query55	90	78	83	78
query56	245	222	233	222
query57	1201	1141	1139	1139
query58	241	238	230	230
query59	2561	2371	2341	2341
query60	261	235	250	235
query61	113	109	111	109
query62	693	450	483	450
query63	313	287	292	287
query64	3907	3276	3351	3276
query65	3052	3022	3001	3001
query66	917	329	338	329
query67	15852	14927	14914	14914
query68	8958	569	583	569
query69	559	338	336	336
query70	1226	1132	1109	1109
query71	579	296	280	280
query72	5464	2570	2414	2414
query73	932	335	335	335
query74	6788	6401	6337	6337
query75	4024	2307	2308	2307
query76	5524	1148	1198	1148
query77	624	258	256	256
query78	10822	10250	10175	10175
query79	9373	537	547	537
query80	935	431	438	431
query81	470	230	221	221
query82	411	109	114	109
query83	204	165	161	161
query84	268	89	93	89
query85	1037	300	290	290
query86	353	275	283	275
query87	3694	3573	3459	3459
query88	3706	2300	2290	2290
query89	551	386	384	384
query90	2104	174	183	174
query91	136	107	105	105
query92	62	55	53	53
query93	6623	536	525	525
query94	1120	189	194	189
query95	427	338	341	338
query96	603	273	269	269
query97	2635	2501	2468	2468
query98	240	223	215	215
query99	1252	820	824	820
Total cold run time: 291321 ms
Total hot run time: 181070 ms

@doris-robot
Copy link

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

query1	0.05	0.03	0.03
query2	0.07	0.04	0.04
query3	0.23	0.05	0.05
query4	1.68	0.06	0.07
query5	0.49	0.50	0.49
query6	1.14	0.65	0.65
query7	0.02	0.01	0.01
query8	0.05	0.04	0.04
query9	0.56	0.50	0.51
query10	0.57	0.56	0.57
query11	0.14	0.11	0.12
query12	0.14	0.12	0.12
query13	0.60	0.60	0.60
query14	0.80	0.78	0.81
query15	0.87	0.84	0.84
query16	0.36	0.36	0.36
query17	0.97	0.98	0.97
query18	0.24	0.25	0.21
query19	1.80	1.70	1.75
query20	0.01	0.01	0.01
query21	15.40	0.74	0.69
query22	3.45	5.49	1.31
query23	17.31	1.40	1.04
query24	1.42	0.33	0.23
query25	0.12	0.10	0.08
query26	0.28	0.16	0.18
query27	0.08	0.09	0.08
query28	13.60	0.95	0.94
query29	12.81	3.69	3.25
query30	0.26	0.06	0.06
query31	2.87	0.39	0.38
query32	3.29	0.48	0.48
query33	2.86	2.88	2.87
query34	15.49	4.34	4.32
query35	4.38	4.36	4.38
query36	0.67	0.49	0.48
query37	0.18	0.19	0.17
query38	0.17	0.16	0.16
query39	0.04	0.04	0.04
query40	0.18	0.17	0.15
query41	0.09	0.05	0.05
query42	0.06	0.05	0.05
query43	0.04	0.04	0.04
Total cold run time: 105.84 s
Total hot run time: 29.52 s

@doris-robot
Copy link

TeamCity be ut coverage result:
Function Coverage: 35.54% (8841/24873)
Line Coverage: 27.27% (72493/265791)
Region Coverage: 26.48% (37527/141741)
Branch Coverage: 23.27% (19128/82186)
Coverage Report: http://coverage.selectdb-in.cc/coverage/1b712832b05c5bb396de08ccec425066fd365ce0_1b712832b05c5bb396de08ccec425066fd365ce0/report/index.html

@doris-robot
Copy link

Load test result on machine: 'aliyun_ecs.c7a.8xlarge_32C64G'

Load test result on commit 1b712832b05c5bb396de08ccec425066fd365ce0 with default session variables
Stream load json:         19 seconds loaded 2358488459 Bytes, about 118 MB/s
Stream load orc:          59 seconds loaded 1101869774 Bytes, about 17 MB/s
Stream load parquet:      32 seconds loaded 861443392 Bytes, about 25 MB/s
Insert into select:       15.6 seconds inserted 10000000 Rows, about 641K ops/s

} while (true);

CHECK(!vault_infos.empty()) << "no vault infos";
} while (vault_infos.empty());
Copy link
Collaborator

Choose a reason for hiding this comment

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

while true and remember to clear vault_info each iteration

Copy link
Contributor

github-actions bot commented Apr 1, 2024

PR approved by anyone and no changes requested.

Copy link
Contributor

@dataroaring dataroaring left a comment

Choose a reason for hiding this comment

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

LGTM

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

github-actions bot commented Apr 2, 2024

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

@dataroaring dataroaring merged commit db1ebe7 into apache:master Apr 2, 2024
28 of 31 checks passed
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. meta-change reviewed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants