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.

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

[fix](auth)Prohibit deleting admin user #44751

Merged
merged 4 commits into from
Dec 2, 2024
Merged

[fix](auth)Prohibit deleting admin user #44751

merged 4 commits into from
Dec 2, 2024

Conversation

zddr
Copy link
Contributor

@zddr zddr commented Nov 28, 2024 •
edited
Loading

What problem does this PR solve?

Issue Number: close #xxx

Related PR: #xxx

Problem Summary:
Prohibit deleting admin user

Release note

Prohibit deleting admin user

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

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

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?

@zddr
Copy link
Contributor Author

zddr commented Nov 28, 2024

run buildall

@doris-robot
Copy link

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

------ Round 1 ----------------------------------
q1	17594	7914	7257	7257
q2	2051	186	193	186
q3	10579	1117	1137	1117
q4	10220	726	810	726
q5	7607	2741	2715	2715
q6	236	148	148	148
q7	963	616	609	609
q8	9250	1791	1946	1791
q9	6618	6527	6495	6495
q10	6977	2293	2314	2293
q11	450	271	262	262
q12	411	219	215	215
q13	17775	3026	2986	2986
q14	251	204	215	204
q15	569	521	520	520
q16	662	586	581	581
q17	960	587	482	482
q18	7265	6813	6922	6813
q19	1358	951	1034	951
q20	463	177	180	177
q21	3969	3199	3289	3199
q22	377	306	306	306
Total cold run time: 106605 ms
Total hot run time: 40033 ms

----- Round 2, with runtime_filter_mode=off -----
q1	7279	7218	7228	7218
q2	333	229	230	229
q3	2909	2695	2996	2695
q4	2138	1873	1789	1789
q5	5551	5704	5601	5601
q6	217	137	141	137
q7	2200	1759	1813	1759
q8	3364	3522	3465	3465
q9	8991	8985	9024	8985
q10	3570	3574	3515	3515
q11	583	511	498	498
q12	808	615	627	615
q13	13761	3176	3134	3134
q14	305	268	267	267
q15	584	535	547	535
q16	686	616	641	616
q17	1791	1590	1543	1543
q18	7811	7389	7479	7389
q19	1671	1377	1537	1377
q20	2045	1825	1787	1787
q21	5271	5145	5225	5145
q22	623	541	569	541
Total cold run time: 72491 ms
Total hot run time: 58840 ms

@doris-robot
Copy link

TPC-DS: Total hot run time: 190035 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 6be9f2e448a5123aae6715b686fbbf989d73927b, data reload: false

query1	970	384	368	368
query2	6516	2111	2103	2103
query3	6704	207	210	207
query4	34000	23416	23587	23416
query5	4340	492	454	454
query6	270	189	171	171
query7	4626	317	303	303
query8	294	232	228	228
query9	9390	2723	2710	2710
query10	487	273	243	243
query11	18113	15318	15223	15223
query12	155	104	102	102
query13	1670	427	403	403
query14	9090	7259	6555	6555
query15	282	185	177	177
query16	8189	447	465	447
query17	1676	604	528	528
query18	2128	281	279	279
query19	349	145	144	144
query20	121	105	108	105
query21	203	104	100	100
query22	4635	4566	4369	4369
query23	34994	33917	34682	33917
query24	11663	2461	2363	2363
query25	659	383	381	381
query26	1845	144	150	144
query27	2929	274	285	274
query28	8230	2440	2444	2440
query29	1044	394	404	394
query30	298	150	150	150
query31	1023	776	813	776
query32	105	56	60	56
query33	771	290	294	290
query34	970	495	517	495
query35	892	763	760	760
query36	1095	944	938	938
query37	280	68	78	68
query38	4315	4276	4149	4149
query39	1616	1426	1398	1398
query40	275	96	96	96
query41	47	43	42	42
query42	119	99	99	99
query43	519	488	488	488
query44	1228	799	801	799
query45	187	166	171	166
query46	1178	711	721	711
query47	1927	1829	1836	1829
query48	418	316	324	316
query49	1239	394	374	374
query50	793	381	391	381
query51	7229	7055	7049	7049
query52	95	94	115	94
query53	252	176	180	176
query54	1019	387	392	387
query55	78	79	77	77
query56	264	237	242	237
query57	1287	1185	1174	1174
query58	227	202	222	202
query59	3293	3026	2861	2861
query60	275	247	238	238
query61	109	111	132	111
query62	858	652	704	652
query63	218	186	181	181
query64	5081	668	662	662
query65	3244	3176	3210	3176
query66	1206	316	316	316
query67	16075	15534	15917	15534
query68	5206	545	533	533
query69	432	250	250	250
query70	1243	1141	1132	1132
query71	369	248	251	248
query72	6369	4114	4044	4044
query73	771	363	366	363
query74	10294	9031	9142	9031
query75	3403	2628	2658	2628
query76	3152	1122	1123	1122
query77	498	278	288	278
query78	10443	9521	9346	9346
query79	2445	578	606	578
query80	960	421	423	421
query81	535	225	227	225
query82	636	122	115	115
query83	255	147	154	147
query84	235	69	67	67
query85	1731	302	299	299
query86	486	294	297	294
query87	4963	4686	4585	4585
query88	4032	2225	2192	2192
query89	408	298	297	297
query90	1967	191	184	184
query91	137	102	101	101
query92	68	54	51	51
query93	2084	537	537	537
query94	756	287	291	287
query95	350	245	249	245
query96	623	273	275	273
query97	2843	2677	2631	2631
query98	218	194	195	194
query99	1558	1334	1281	1281
Total cold run time: 305147 ms
Total hot run time: 190035 ms

@doris-robot
Copy link

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

query1	0.03	0.03	0.03
query2	0.07	0.03	0.03
query3	0.23	0.08	0.07
query4	1.62	0.10	0.11
query5	0.44	0.41	0.40
query6	1.17	0.66	0.64
query7	0.02	0.01	0.01
query8	0.04	0.03	0.03
query9	0.57	0.52	0.49
query10	0.59	0.56	0.57
query11	0.14	0.11	0.11
query12	0.15	0.11	0.11
query13	0.61	0.61	0.61
query14	2.84	2.73	2.76
query15	0.89	0.83	0.82
query16	0.39	0.39	0.38
query17	1.06	1.03	1.06
query18	0.22	0.20	0.20
query19	1.95	1.83	1.96
query20	0.02	0.01	0.01
query21	15.38	0.56	0.57
query22	2.44	2.39	1.94
query23	16.91	1.14	0.88
query24	2.72	1.22	2.09
query25	0.21	0.10	0.20
query26	0.56	0.15	0.15
query27	0.06	0.08	0.05
query28	10.21	1.10	1.07
query29	12.57	3.24	3.25
query30	0.25	0.06	0.07
query31	2.86	0.37	0.37
query32	3.30	0.47	0.46
query33	2.98	3.00	3.00
query34	17.00	4.50	4.49
query35	4.56	4.53	4.49
query36	0.67	0.48	0.49
query37	0.09	0.06	0.06
query38	0.04	0.03	0.03
query39	0.04	0.02	0.02
query40	0.16	0.14	0.12
query41	0.08	0.02	0.02
query42	0.03	0.02	0.02
query43	0.04	0.03	0.03
Total cold run time: 106.21 s
Total hot run time: 33.05 s

@zddr
Copy link
Contributor Author

zddr commented Nov 28, 2024

run buildall

@zddr zddr requested a review from morrySnow November 28, 2024 14:40
@doris-robot
Copy link

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

------ Round 1 ----------------------------------
q1	17602	7539	7321	7321
q2	2049	183	174	174
q3	10662	1087	1238	1087
q4	10433	769	712	712
q5	7618	2700	2684	2684
q6	243	149	147	147
q7	967	612	611	611
q8	9248	1879	1913	1879
q9	6737	6517	6522	6517
q10	6973	2284	2342	2284
q11	457	256	258	256
q12	422	213	212	212
q13	17789	2998	2988	2988
q14	261	214	215	214
q15	587	533	528	528
q16	664	585	581	581
q17	990	584	533	533
q18	7496	6786	6768	6768
q19	1336	1041	982	982
q20	478	177	184	177
q21	4028	3214	3212	3212
q22	373	318	318	318
Total cold run time: 107413 ms
Total hot run time: 40185 ms

----- Round 2, with runtime_filter_mode=off -----
q1	7289	7348	7303	7303
q2	331	237	230	230
q3	2926	2836	2958	2836
q4	2077	1823	1846	1823
q5	5696	5667	5674	5667
q6	222	145	138	138
q7	2250	1837	1807	1807
q8	3460	3595	3548	3548
q9	9061	9141	9098	9098
q10	3634	3606	3548	3548
q11	599	518	501	501
q12	835	598	617	598
q13	11552	3247	3249	3247
q14	303	276	271	271
q15	579	545	524	524
q16	710	656	639	639
q17	1855	1631	1619	1619
q18	8415	7839	7540	7540
q19	3537	1574	1635	1574
q20	2096	1861	1885	1861
q21	5618	5458	5411	5411
q22	686	592	610	592
Total cold run time: 73731 ms
Total hot run time: 60375 ms

@doris-robot
Copy link

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

query1	1236	954	956	954
query2	6247	2115	2014	2014
query3	11090	4605	4574	4574
query4	67041	29791	23686	23686
query5	5144	465	434	434
query6	420	185	176	176
query7	6072	305	304	304
query8	336	238	241	238
query9	9545	2770	2769	2769
query10	482	270	254	254
query11	17685	15630	15929	15630
query12	164	108	109	108
query13	1715	442	431	431
query14	10754	6913	7412	6913
query15	224	185	204	185
query16	7286	495	495	495
query17	1110	593	593	593
query18	1850	336	315	315
query19	220	192	173	173
query20	118	119	115	115
query21	209	102	108	102
query22	4775	4651	4502	4502
query23	35321	34672	34574	34574
query24	5414	2622	2557	2557
query25	491	381	391	381
query26	655	153	154	153
query27	2049	281	290	281
query28	4417	2520	2470	2470
query29	667	415	417	415
query30	212	154	163	154
query31	993	826	848	826
query32	65	55	57	55
query33	420	295	299	295
query34	958	510	525	510
query35	902	768	769	768
query36	1120	993	991	991
query37	131	74	79	74
query38	4494	4450	4478	4450
query39	1546	1494	1467	1467
query40	205	97	105	97
query41	44	43	42	42
query42	118	105	106	105
query43	554	485	505	485
query44	1214	826	853	826
query45	197	171	168	168
query46	1172	735	733	733
query47	2060	1903	1908	1903
query48	438	326	336	326
query49	732	403	409	403
query50	859	395	400	395
query51	7383	7069	7075	7069
query52	98	90	87	87
query53	257	180	190	180
query54	517	410	386	386
query55	75	79	79	79
query56	246	225	234	225
query57	1211	1124	1124	1124
query58	215	201	204	201
query59	3186	3172	3078	3078
query60	275	244	244	244
query61	108	105	105	105
query62	810	679	673	673
query63	213	190	188	188
query64	1390	671	638	638
query65	3317	3222	3243	3222
query66	705	307	303	303
query67	15940	15637	15470	15470
query68	4230	559	551	551
query69	423	246	259	246
query70	1196	1163	1145	1145
query71	359	265	254	254
query72	6307	4282	4109	4109
query73	767	375	369	369
query74	10075	8942	9055	8942
query75	3415	2704	2675	2675
query76	1892	1074	1193	1074
query77	503	278	286	278
query78	10447	9417	9335	9335
query79	1691	594	597	594
query80	992	439	440	439
query81	536	241	241	241
query82	216	124	120	120
query83	220	145	141	141
query84	286	70	70	70
query85	997	291	295	291
query86	390	297	306	297
query87	4696	4582	4573	4573
query88	4074	2225	2244	2225
query89	421	303	291	291
query90	2076	190	192	190
query91	142	104	100	100
query92	67	49	60	49
query93	2243	545	542	542
query94	882	301	292	292
query95	359	246	248	246
query96	626	284	285	284
query97	2845	2704	2688	2688
query98	214	195	204	195
query99	1601	1323	1320	1320
Total cold run time: 322305 ms
Total hot run time: 198307 ms

@doris-robot
Copy link

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

query1	0.04	0.04	0.03
query2	0.06	0.03	0.04
query3	0.23	0.07	0.07
query4	1.62	0.11	0.11
query5	0.40	0.41	0.42
query6	1.17	0.65	0.66
query7	0.02	0.01	0.01
query8	0.04	0.04	0.03
query9	0.58	0.51	0.51
query10	0.55	0.56	0.55
query11	0.14	0.10	0.10
query12	0.14	0.12	0.12
query13	0.61	0.59	0.59
query14	2.70	2.86	2.71
query15	0.91	0.84	0.82
query16	0.39	0.38	0.37
query17	1.05	1.00	1.00
query18	0.23	0.21	0.21
query19	1.82	1.87	1.93
query20	0.01	0.01	0.01
query21	15.36	0.60	0.58
query22	2.31	2.26	2.53
query23	16.91	1.06	0.90
query24	3.05	1.24	1.26
query25	0.13	0.15	0.16
query26	0.51	0.14	0.13
query27	0.04	0.04	0.05
query28	10.25	1.10	1.08
query29	12.56	3.31	3.29
query30	0.25	0.07	0.06
query31	2.85	0.37	0.37
query32	3.29	0.46	0.47
query33	2.99	3.07	2.99
query34	16.79	4.44	4.55
query35	4.53	4.48	4.49
query36	0.68	0.48	0.48
query37	0.09	0.06	0.06
query38	0.05	0.04	0.04
query39	0.03	0.02	0.03
query40	0.17	0.13	0.13
query41	0.08	0.03	0.02
query42	0.03	0.02	0.02
query43	0.03	0.03	0.04
Total cold run time: 105.69 s
Total hot run time: 33.47 s

@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 Nov 29, 2024
@github-actions GitHub Actions
Copy link
Contributor

PR approved by anyone and no changes requested.

@morrySnow morrySnow merged commit ce9c717 into apache:master Dec 2, 2024
24 of 25 checks passed
zddr added a commit to zddr/incubator-doris that referenced this pull request Dec 6, 2024
@zddr
[fix](auth) Prohibit deleting admin user (apache#44751)
bea6eef
@zddr zddr mentioned this pull request Dec 6, 2024
Merged
zddr added a commit to zddr/incubator-doris that referenced this pull request Dec 6, 2024
@zddr
[fix](auth) Prohibit deleting admin user (apache#44751)
49d2427
@zddr zddr mentioned this pull request Dec 6, 2024
Merged
morningman pushed a commit that referenced this pull request Dec 8, 2024
@zddr
[fix](auth) Prohibit deleting admin user (#44751) (#45084)
7c94ac5 
pick: #44751
morningman pushed a commit that referenced this pull request Dec 8, 2024
@zddr
[fix](auth) Prohibit deleting admin user (#44751) (#45083)
99e51ae 
pick: #44751
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@morrySnow morrySnow morrySnow approved these changes

@morningman morningman morningman approved these changes

@starocean999 starocean999 Awaiting requested review from starocean999

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

Successfully merging this pull request may close these issues.
4 participants
@zddr @doris-robot @morningman @morrySnow