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

[Refactor](admin-stmt) rename some admin-show statestmt #29492

Merged
merged 4 commits into from Jan 10, 2024

Conversation

morningman
Copy link
Contributor

@morningman morningman commented Jan 3, 2024

Proposed changes

The ADMIN SHOW statement can not be executed with high version of mysql 8.x jdbc driver.
So I rename these statement, remove the ADMIN keywords.

  1. ADMIN SHOW CONFIG -> SHOW CONFIG
  2. ADMIN SHOW REPLICA -> SHOW REPLICA
  3. ADMIN DIAGNOSE TABLET -> SHOW TABLET DIAGNOSIS
  4. ADMIN SHOW TABLET -> SHOW TABLET

for compatibility, the old statements are still supported, but not recommend to use.
They will be removed in later version

Further comments

If this is a relatively large or complex change, kick off the discussion at dev@doris.apache.org by explaining why you chose the solution you did and what alternatives you considered, etc...

@morningman morningman changed the title [Refactor])(admin-stmt) rename some admin-show statestmt [Refactor](admin-stmt) rename some admin-show statestmt Jan 3, 2024
@morningman
Copy link
Contributor Author

run buildall

@doris-robot
Copy link

TPC-H test result on machine: 'aliyun_ecs.c7a.8xlarge_32C64G', run with scripts in https://github.com/apache/doris/tree/master/tools/tpch-tools

Tpch sf100 test result on commit d4771cb9e8d1eec85a076b033f39af1b80084718, data reload: false

------ Round 1 ----------------------------------
q1	17640	5129	5124	5124
q2	2027	157	142	142
q3	10539	1092	1142	1092
q4	10193	770	881	770
q5	7793	2994	2940	2940
q6	213	138	137	137
q7	948	517	558	517
q8	9270	2010	2026	2010
q9	7050	6404	6409	6404
q10	8300	3119	3099	3099
q11	437	209	218	209
q12	408	228	231	228
q13	18013	3619	3655	3619
q14	242	214	222	214
q15	570	526	524	524
q16	498	381	384	381
q17	972	532	422	422
q18	7336	6751	6673	6673
q19	1605	1390	1421	1390
q20	696	360	325	325
q21	2795	2325	2452	2325
q22	364	325	334	325
Total cold run time: 107909 ms
Total hot run time: 38870 ms

----- Round 2, with runtime_filter_mode=off -----
q1	5097	5141	5086	5086
q2	340	243	237	237
q3	3319	3299	3302	3299
q4	2115	2023	2007	2007
q5	5834	5827	5811	5811
q6	215	126	127	126
q7	2370	1893	1939	1893
q8	3393	3442	3450	3442
q9	8825	8790	8704	8704
q10	3796	3832	3878	3832
q11	592	464	464	464
q12	811	631	639	631
q13	11736	3187	3204	3187
q14	306	271	271	271
q15	581	521	522	521
q16	543	514	496	496
q17	1943	1766	1745	1745
q18	8710	8308	8349	8308
q19	1625	1606	1568	1568
q20	2176	1988	1952	1952
q21	5577	5309	5320	5309
q22	566	464	466	464
Total cold run time: 70470 ms
Total hot run time: 59353 ms

@doris-robot
Copy link

TPC-H test result on machine: 'aliyun_ecs.c7a.8xlarge_32C64G', run with scripts in https://github.com/apache/doris/tree/master/tools/tpch-tools

Tpch sf100 test result on commit d4771cb9e8d1eec85a076b033f39af1b80084718, data reload: false

run tpch-sf100 query with default conf and session variables
q1	5474	5202	5189	5189
q2	398	156	159	156
q3	1470	1213	1188	1188
q4	1090	846	888	846
q5	3157	3118	3190	3118
q6	221	147	139	139
q7	998	562	519	519
q8	2164	2264	2216	2216
q9	6718	6674	6687	6674
q10	3204	3161	3182	3161
q11	338	211	208	208
q12	378	241	241	241
q13	4383	3678	3629	3629
q14	245	222	219	219
q15	581	530	529	529
q16	469	401	411	401
q17	1042	523	551	523
q18	7071	6733	6840	6733
q19	1645	1575	1486	1486
q20	593	322	361	322
q21	2919	2460	2511	2460
q22	398	319	330	319
Total cold run time: 44956 ms
Total hot run time: 40276 ms

run tpch-sf100 query with default conf and set session variable runtime_filter_mode=off
q1	5126	5143	5120	5120
q2	344	239	229	229
q3	3381	3345	3321	3321
q4	2150	2052	2023	2023
q5	5961	5944	5965	5944
q6	223	127	132	127
q7	2421	1940	1932	1932
q8	3558	3693	3647	3647
q9	9116	9038	8982	8982
q10	3865	3921	3929	3921
q11	570	493	484	484
q12	807	631	618	618
q13	3889	3182	3186	3182
q14	294	273	269	269
q15	584	534	520	520
q16	555	483	482	482
q17	2047	1854	1870	1854
q18	8680	8406	8409	8406
q19	1765	1703	1711	1703
q20	2248	1982	1966	1966
q21	5759	5325	5382	5325
q22	567	489	477	477
Total cold run time: 63910 ms
Total hot run time: 60532 ms

@doris-robot
Copy link

TPC-DS test result on machine: 'aliyun_ecs.c7a.8xlarge_32C64G', run with scripts in https://github.com/apache/doris/tree/master/tools/tpcds-tools

TPC-DS sf100 test result on commit d4771cb9e8d1eec85a076b033f39af1b80084718, data reload: false

run tpcds-sf100 query with default conf and session variables
query1	889	348	336	336
query2	4027	2020	1860	1860
query3	5448	213	210	210
query4	26410	22375	22441	22375
query5	3217	507	560	507
query6	272	172	175	172
query7	4180	274	266	266
query8	223	208	194	194
query9	7271	2547	2492	2492
query10	351	238	264	238
query11	16115	15489	15512	15489
query12	128	77	78	77
query13	1456	339	319	319
query14	9812	7157	7180	7157
query15	214	177	188	177
query16	4865	266	271	266
query17	1671	502	477	477
query18	1615	270	262	262
query19	169	144	136	136
query20	80	75	74	74
query21	167	95	94	94
query22	4852	4547	4757	4547
query23	32333	31368	31190	31190
query24	11405	2827	2808	2808
query25	563	343	343	343
query26	1543	136	137	136
query27	2849	278	274	274
query28	6789	1903	1908	1903
query29	1815	389	385	385
query30	286	141	146	141
query31	1011	761	772	761
query32	81	59	58	58
query33	699	261	268	261
query34	882	451	445	445
query35	889	777	759	759
query36	1283	1227	1231	1227
query37	150	63	67	63
query38	3424	3321	3298	3298
query39	1323	1306	1285	1285
query40	270	88	89	88
query41	38	35	34	34
query42	91	82	85	82
query43	527	503	502	502
query44	1063	701	721	701
query45	193	186	188	186
query46	1084	636	640	636
query47	1647	1589	1498	1498
query48	329	256	257	256
query49	1183	317	306	306
query50	727	333	326	326
query51	5402	5284	5260	5260
query52	83	82	86	82
query53	214	152	143	143
query54	1811	553	575	553
query55	88	87	82	82
query56	203	197	186	186
query57	1007	909	912	909
query58	245	198	196	196
query59	2857	2642	2645	2642
query60	233	203	229	203
query61	83	91	83	83
query62	676	465	452	452
query63	163	151	151	151
query64	5182	1720	1690	1690
query65	3322	3239	3255	3239
query66	1426	354	341	341
query67	15830	15456	15118	15118
query68	12225	553	517	517
query69	497	240	229	229
query70	1784	1488	1529	1488
query71	473	223	217	217
query72	5689	3647	3565	3565
query73	3105	313	311	311
query74	7040	6507	6494	6494
query75	5616	2289	2258	2258
query76	6000	1121	1116	1116
query77	680	253	278	253
query78	9111	8657	8692	8657
query79	1235	502	502	502
query80	533	349	341	341
query81	460	211	214	211
query82	206	95	95	95
query83	169	138	138	138
query84	240	52	52	52
query85	960	266	255	255
query86	391	378	367	367
query87	3599	3483	3387	3387
query88	2982	2266	2267	2266
query89	332	252	258	252
query90	1955	193	191	191
query91	119	89	93	89
query92	60	50	53	50
query93	1510	496	501	496
query94	855	177	179	177
query95	451	411	425	411
query96	632	317	318	317
query97	4308	4151	4189	4151
query98	213	188	185	185
query99	1087	825	781	781
Total cold run time: 281251 ms
Total hot run time: 178826 ms

@doris-robot
Copy link

(From new machine)TeamCity pipeline, clickbench performance test result:
the sum of best hot time: 47.14 seconds
stream load tsv: 565 seconds loaded 74807831229 Bytes, about 126 MB/s
stream load json: 19 seconds loaded 2358488459 Bytes, about 118 MB/s
stream load orc: 66 seconds loaded 1101869774 Bytes, about 15 MB/s
stream load parquet: 32 seconds loaded 861443392 Bytes, about 25 MB/s
insert into select: 28.2 seconds inserted 10000000 Rows, about 354K ops/s
storage size: 17183835153 Bytes

@morningman
Copy link
Contributor Author

run buildall

@doris-robot
Copy link

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

------ Round 1 ----------------------------------
q1	17696	4968	4965	4965
q2	2011	156	145	145
q3	10729	1093	1135	1093
q4	10507	781	851	781
q5	7806	2982	2969	2969
q6	202	124	123	123
q7	900	509	492	492
q8	9283	2019	2016	2016
q9	6494	6378	6329	6329
q10	8283	3006	2989	2989
q11	441	221	216	216
q12	386	223	224	223
q13	18023	3419	3396	3396
q14	241	204	200	200
q15	559	519	512	512
q16	493	383	409	383
q17	962	744	631	631
q18	7476	6748	6695	6695
q19	1580	1528	1532	1528
q20	748	325	330	325
q21	2768	2426	2358	2358
q22	353	317	304	304
Total cold run time: 107941 ms
Total hot run time: 38673 ms

----- Round 2, with runtime_filter_mode=off -----
q1	4959	4937	4928	4928
q2	336	239	236	236
q3	3300	3310	3258	3258
q4	2105	2015	2032	2015
q5	5797	5791	5777	5777
q6	209	116	116	116
q7	2316	1913	1921	1913
q8	3401	3482	3480	3480
q9	8821	8730	8729	8729
q10	3810	3858	3851	3851
q11	553	449	444	444
q12	793	611	628	611
q13	4089	3201	3169	3169
q14	298	267	277	267
q15	542	503	508	503
q16	554	487	511	487
q17	1867	1871	1870	1870
q18	8639	8422	8282	8282
q19	1616	1635	1625	1625
q20	2205	1957	1951	1951
q21	5524	5302	5209	5209
q22	499	429	481	429
Total cold run time: 62233 ms
Total hot run time: 59150 ms

@doris-robot
Copy link

TPC-DS: Total hot run time: 184159 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 44dbe4d3de611f8b2c345b5c616cfa47dd959de9, data reload: false

run tpcds-sf100 query with default conf and session variables
query1	841	345	331	331
query2	4743	2063	2006	2006
query3	5934	227	227	227
query4	26458	22495	22460	22460
query5	4762	617	586	586
query6	339	203	204	203
query7	4456	307	305	305
query8	248	240	227	227
query9	8407	2997	2999	2997
query10	571	313	338	313
query11	16467	15696	15685	15685
query12	173	101	104	101
query13	1627	338	338	338
query14	11429	7492	7679	7492
query15	280	230	229	229
query16	6232	337	306	306
query17	1575	522	521	521
query18	1870	315	291	291
query19	222	170	160	160
query20	110	104	102	102
query21	185	91	96	91
query22	4983	4548	4765	4548
query23	32530	31483	31273	31273
query24	11981	2934	2962	2934
query25	589	366	366	366
query26	1559	158	163	158
query27	3040	309	325	309
query28	6933	2138	2092	2092
query29	1620	437	409	409
query30	282	143	148	143
query31	1011	796	831	796
query32	124	86	87	86
query33	827	348	353	348
query34	863	482	475	475
query35	994	857	863	857
query36	1403	1247	1437	1247
query37	177	92	92	92
query38	3449	3400	3405	3400
query39	1368	1295	1294	1294
query40	282	89	91	89
query41	39	37	38	37
query42	120	108	108	108
query43	573	542	517	517
query44	1327	790	800	790
query45	213	205	205	205
query46	1065	735	682	682
query47	1788	1692	1730	1692
query48	371	297	283	283
query49	986	328	305	305
query50	743	334	337	334
query51	5468	5284	5270	5270
query52	113	100	97	97
query53	229	174	174	174
query54	1228	630	680	630
query55	104	102	101	101
query56	294	240	243	240
query57	1049	984	1041	984
query58	282	268	271	268
query59	3054	2938	2888	2888
query60	334	291	297	291
query61	147	127	158	127
query62	586	524	476	476
query63	199	185	192	185
query64	5172	1748	1681	1681
query65	3437	3379	3356	3356
query66	1330	392	385	385
query67	15598	15710	15267	15267
query68	12938	539	532	532
query69	637	289	318	289
query70	1702	1641	1641	1641
query71	621	295	284	284
query72	5557	3466	3456	3456
query73	2909	336	336	336
query74	7034	6517	6496	6496
query75	5702	2291	2293	2291
query76	6452	1099	1223	1099
query77	803	360	315	315
query78	9138	8714	8695	8695
query79	1080	513	522	513
query80	542	352	358	352
query81	474	215	220	215
query82	215	101	113	101
query83	180	139	142	139
query84	254	57	60	57
query85	929	279	268	268
query86	423	420	427	420
query87	3641	3473	3454	3454
query88	3049	2496	2499	2496
query89	385	291	286	286
query90	1979	263	246	246
query91	123	95	97	95
query92	89	83	68	68
query93	1316	479	430	430
query94	989	252	250	250
query95	585	506	507	506
query96	633	338	350	338
query97	4365	4393	4222	4222
query98	236	216	204	204
query99	1168	805	906	805
Total cold run time: 292941 ms
Total hot run time: 184159 ms

@doris-robot
Copy link

(From new machine)TeamCity pipeline, clickbench performance test result:
the sum of best hot time: 46.38 seconds
stream load tsv: 563 seconds loaded 74807831229 Bytes, about 126 MB/s
stream load json: 19 seconds loaded 2358488459 Bytes, about 118 MB/s
stream load orc: 66 seconds loaded 1101869774 Bytes, about 15 MB/s
stream load parquet: 32 seconds loaded 861443392 Bytes, about 25 MB/s
insert into select: 27.5 seconds inserted 10000000 Rows, about 363K ops/s
storage size: 17184143175 Bytes

Copy link
Contributor

@yiguolei yiguolei 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 Jan 8, 2024
Copy link
Contributor

github-actions bot commented Jan 8, 2024

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

Copy link
Contributor

github-actions bot commented Jan 8, 2024

PR approved by anyone and no changes requested.

@zy-kkk
Copy link
Member

zy-kkk commented Jan 10, 2024

run pipelinex

Copy link
Member

@zy-kkk zy-kkk left a comment

Choose a reason for hiding this comment

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

LGTM

@zy-kkk zy-kkk merged commit afceb6f into apache:master Jan 10, 2024
31 of 32 checks passed
yiguolei pushed a commit that referenced this pull request Jan 12, 2024
The `ADMIN SHOW` statement can not be executed with high version of mysql 8.x jdbc driver.
So I rename these statement, remove the `ADMIN` keywords.

1. ADMIN SHOW CONFIG -> SHOW CONFIG
2. ADMIN SHOW REPLICA -> SHOW REPLICA
3. ADMIN DIAGNOSE TABLET -> SHOW TABLET DIAGNOSIS
4. ADMIN SHOW TABLET -> SHOW TABLET

for compatibility, the old statements are still supported, but not recommend to use.
They will be removed in later version
wsjz pushed a commit to wsjz/incubator-doris that referenced this pull request Feb 4, 2024
The `ADMIN SHOW` statement can not be executed with high version of mysql 8.x jdbc driver.
So I rename these statement, remove the `ADMIN` keywords.

1. ADMIN SHOW CONFIG -> SHOW CONFIG
2. ADMIN SHOW REPLICA -> SHOW REPLICA
3. ADMIN DIAGNOSE TABLET -> SHOW TABLET DIAGNOSIS
4. ADMIN SHOW TABLET -> SHOW TABLET

for compatibility, the old statements are still supported, but not recommend to use.
They will be removed in later version
morningman added a commit to morningman/doris that referenced this pull request Mar 28, 2024
The `ADMIN SHOW` statement can not be executed with high version of mysql 8.x jdbc driver.
So I rename these statement, remove the `ADMIN` keywords.

1. ADMIN SHOW CONFIG -> SHOW CONFIG
2. ADMIN SHOW REPLICA -> SHOW REPLICA
3. ADMIN DIAGNOSE TABLET -> SHOW TABLET DIAGNOSIS
4. ADMIN SHOW TABLET -> SHOW TABLET

for compatibility, the old statements are still supported, but not recommend to use.
They will be removed in later version
@xiaokang xiaokang mentioned this pull request Apr 5, 2024
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.

None yet

6 participants