Skip to content

Conversation

@zddr
Copy link
Contributor

@zddr zddr commented Jul 8, 2025

… should be merged (#52349)

pick: #52349

… should be merged (apache#52349)

### What problem does this PR solve?

when user1 has two role: role1 and role2

role1 has priv1

role2 has priv2

when user1 needs both priv1 and priv2 for authorization

**expect behavior**:

Authentication successful

**Current system behavior**:

the system will throw a 'Permission Denied' error."

**Fix Solution**:

When validating permissions via the second role, retain awareness of
privileges assigned to the first role
# Conflicts:
#	fe/fe-core/src/test/java/org/apache/doris/mysql/privilege/AuthTest.java
#	fe/fe-core/src/test/java/org/apache/doris/utframe/TestWithFeService.java
@zddr zddr requested a review from dataroaring as a code owner July 8, 2025 10:42
@Thearas
Copy link
Contributor

Thearas commented Jul 8, 2025

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 Jul 8, 2025

run buildall

@doris-robot
Copy link

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

------ Round 1 ----------------------------------
q1	17631	6719	6662	6662
q2	2077	206	170	170
q3	10498	1109	1119	1109
q4	10226	709	713	709
q5	7729	2823	2867	2823
q6	215	134	135	134
q7	969	627	604	604
q8	9349	1933	1980	1933
q9	6602	6351	6359	6351
q10	6998	2246	2298	2246
q11	466	258	258	258
q12	395	213	214	213
q13	17784	2950	3006	2950
q14	237	201	217	201
q15	522	462	476	462
q16	503	385	371	371
q17	961	565	583	565
q18	7205	6772	6725	6725
q19	1386	1105	1075	1075
q20	468	207	213	207
q21	4153	3197	3170	3170
q22	1099	977	953	953
Total cold run time: 107473 ms
Total hot run time: 39891 ms

----- Round 2, with runtime_filter_mode=off -----
q1	6629	6636	6551	6551
q2	327	228	242	228
q3	2912	2899	2932	2899
q4	2015	1774	1887	1774
q5	5699	5691	5707	5691
q6	215	126	129	126
q7	2218	1848	1804	1804
q8	3380	3497	3445	3445
q9	8768	8827	8846	8827
q10	3591	3526	3482	3482
q11	611	488	497	488
q12	757	589	600	589
q13	10735	3097	3235	3097
q14	297	269	261	261
q15	514	464	476	464
q16	492	462	443	443
q17	1835	1613	1597	1597
q18	8136	7628	7847	7628
q19	1680	1631	1616	1616
q20	2124	1839	1799	1799
q21	5088	4849	4982	4849
q22	1103	1031	1011	1011
Total cold run time: 69126 ms
Total hot run time: 58669 ms

@doris-robot
Copy link

TPC-DS: Total hot run time: 197194 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 87cdf268879c85fd51220f1b8e184d7e0429056a, data reload: false

query1	1306	910	879	879
query2	6350	1910	1836	1836
query3	10855	4411	4404	4404
query4	33364	24028	23431	23431
query5	4414	474	447	447
query6	272	177	187	177
query7	3985	333	319	319
query8	285	223	215	215
query9	9464	2586	2600	2586
query10	455	268	255	255
query11	18208	15182	15557	15182
query12	163	105	104	104
query13	1575	432	420	420
query14	8808	7417	7392	7392
query15	258	198	191	191
query16	8011	454	514	454
query17	1618	592	602	592
query18	2155	318	309	309
query19	324	156	164	156
query20	119	118	112	112
query21	203	106	106	106
query22	4664	4357	4392	4357
query23	35223	34162	34482	34162
query24	11282	2904	2984	2904
query25	665	461	426	426
query26	1257	174	173	173
query27	2435	371	361	361
query28	7315	2200	2202	2200
query29	891	469	470	469
query30	249	160	164	160
query31	1040	837	818	818
query32	96	57	60	57
query33	790	312	310	310
query34	1165	527	541	527
query35	858	742	730	730
query36	1110	950	943	943
query37	130	70	69	69
query38	4099	3988	4013	3988
query39	1538	1468	1473	1468
query40	216	108	106	106
query41	52	55	56	55
query42	118	105	108	105
query43	519	483	474	474
query44	1324	815	847	815
query45	188	175	179	175
query46	1163	740	749	740
query47	1992	1896	1911	1896
query48	488	395	388	388
query49	949	453	415	415
query50	844	428	429	428
query51	7474	7313	7059	7059
query52	103	91	93	91
query53	265	184	198	184
query54	1248	474	480	474
query55	88	81	76	76
query56	271	266	254	254
query57	1302	1216	1182	1182
query58	222	212	232	212
query59	3128	2946	2986	2946
query60	294	275	278	275
query61	133	119	116	116
query62	854	707	692	692
query63	235	195	189	189
query64	4378	680	667	667
query65	3376	3205	3207	3205
query66	767	299	298	298
query67	15809	15401	15472	15401
query68	4631	589	583	583
query69	451	268	265	265
query70	1193	1131	1154	1131
query71	341	255	258	255
query72	6396	4094	4015	4015
query73	740	353	354	353
query74	10445	9052	9094	9052
query75	3380	2670	2664	2664
query76	2593	1068	1127	1068
query77	381	288	286	286
query78	10379	9656	9506	9506
query79	2449	620	627	620
query80	907	435	436	435
query81	547	219	214	214
query82	737	92	86	86
query83	243	142	144	142
query84	231	81	83	81
query85	1542	310	293	293
query86	465	302	289	289
query87	4404	4211	4328	4211
query88	4311	2389	2373	2373
query89	418	294	286	286
query90	1884	186	186	186
query91	178	146	149	146
query92	63	47	53	47
query93	2225	552	556	552
query94	813	313	301	301
query95	370	260	256	256
query96	624	278	275	275
query97	3303	3131	3154	3131
query98	218	193	197	193
query99	1537	1316	1292	1292
Total cold run time: 303198 ms
Total hot run time: 197194 ms

@doris-robot
Copy link

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

query1	0.03	0.02	0.03
query2	0.06	0.03	0.03
query3	0.23	0.07	0.07
query4	1.63	0.11	0.11
query5	0.53	0.53	0.54
query6	1.13	0.73	0.71
query7	0.02	0.01	0.01
query8	0.04	0.03	0.03
query9	0.57	0.52	0.49
query10	0.55	0.54	0.55
query11	0.14	0.10	0.10
query12	0.14	0.12	0.11
query13	0.61	0.60	0.60
query14	0.76	0.79	0.80
query15	0.86	0.82	0.82
query16	0.38	0.40	0.38
query17	1.05	1.04	1.03
query18	0.23	0.21	0.22
query19	1.99	1.84	1.89
query20	0.01	0.01	0.02
query21	15.39	0.58	0.58
query22	2.79	1.94	1.90
query23	17.00	1.08	0.90
query24	2.94	0.68	2.20
query25	0.25	0.22	0.04
query26	0.46	0.15	0.13
query27	0.05	0.04	0.05
query28	9.69	0.49	0.50
query29	12.55	3.20	3.23
query30	0.24	0.06	0.05
query31	2.86	0.40	0.39
query32	3.23	0.48	0.46
query33	2.96	3.01	3.02
query34	17.01	4.45	4.50
query35	4.48	4.51	4.46
query36	0.67	0.48	0.50
query37	0.09	0.07	0.07
query38	0.05	0.04	0.03
query39	0.03	0.02	0.02
query40	0.16	0.13	0.13
query41	0.08	0.03	0.02
query42	0.03	0.02	0.02
query43	0.03	0.03	0.03
Total cold run time: 104 s
Total hot run time: 30.01 s

@zddr
Copy link
Contributor Author

zddr commented Jul 9, 2025

run buildall

@doris-robot
Copy link

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

------ Round 1 ----------------------------------
q1	17945	7023	6646	6646
q2	2072	169	172	169
q3	10612	1139	1221	1139
q4	10332	780	733	733
q5	7713	2941	2846	2846
q6	216	130	129	129
q7	975	624	594	594
q8	9367	2027	2075	2027
q9	6663	6411	6465	6411
q10	7012	2268	2317	2268
q11	450	266	262	262
q12	394	217	221	217
q13	17780	2981	2983	2981
q14	239	206	208	206
q15	509	483	472	472
q16	497	387	373	373
q17	985	559	598	559
q18	7322	6780	6650	6650
q19	1398	1098	1163	1098
q20	476	201	204	201
q21	3887	3229	3043	3043
q22	1085	987	1005	987
Total cold run time: 107929 ms
Total hot run time: 40011 ms

----- Round 2, with runtime_filter_mode=off -----
q1	6628	6596	6586	6586
q2	331	238	235	235
q3	2940	2965	2904	2904
q4	2026	1800	1797	1797
q5	5692	5742	5707	5707
q6	213	130	130	130
q7	2245	1784	1811	1784
q8	3427	3529	3592	3529
q9	8667	8880	8918	8880
q10	3579	3510	3522	3510
q11	627	500	487	487
q12	824	595	609	595
q13	7909	3216	3151	3151
q14	303	266	262	262
q15	501	472	462	462
q16	490	453	434	434
q17	1843	1618	1614	1614
q18	8242	7753	7727	7727
q19	1710	1525	1629	1525
q20	2096	1826	1830	1826
q21	5102	5061	4953	4953
q22	1162	1025	1049	1025
Total cold run time: 66557 ms
Total hot run time: 59123 ms

@doris-robot
Copy link

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

query1	1291	928	912	912
query2	6262	1884	1866	1866
query3	10864	4379	4502	4379
query4	33466	23380	24030	23380
query5	4246	454	490	454
query6	291	204	169	169
query7	4019	311	324	311
query8	280	216	215	215
query9	9528	2593	2600	2593
query10	485	279	261	261
query11	17960	15101	15352	15101
query12	156	105	103	103
query13	1544	432	438	432
query14	9622	7351	6739	6739
query15	255	194	188	188
query16	7963	490	525	490
query17	1653	610	592	592
query18	2155	323	298	298
query19	221	161	162	161
query20	114	114	113	113
query21	201	106	103	103
query22	4758	4558	4613	4558
query23	34692	34322	33857	33857
query24	11501	2969	2935	2935
query25	640	402	416	402
query26	1278	163	166	163
query27	2476	346	358	346
query28	7581	2201	2161	2161
query29	864	452	470	452
query30	252	154	162	154
query31	1002	848	858	848
query32	92	61	62	61
query33	772	317	311	311
query34	1137	514	532	514
query35	891	767	731	731
query36	1114	956	966	956
query37	116	66	75	66
query38	4055	3955	3943	3943
query39	1533	1478	1474	1474
query40	210	102	104	102
query41	51	50	52	50
query42	120	101	106	101
query43	519	487	483	483
query44	1334	803	848	803
query45	198	183	170	170
query46	1171	755	745	745
query47	2026	1922	1935	1922
query48	484	390	388	388
query49	980	422	452	422
query50	878	451	428	428
query51	7339	7304	7308	7304
query52	106	98	92	92
query53	259	190	186	186
query54	1360	474	477	474
query55	83	77	77	77
query56	277	269	276	269
query57	1340	1227	1204	1204
query58	250	216	215	215
query59	3173	2966	2949	2949
query60	284	280	271	271
query61	114	113	108	108
query62	849	714	680	680
query63	225	191	190	190
query64	5120	665	658	658
query65	3392	3357	3292	3292
query66	1411	298	309	298
query67	16077	15562	15667	15562
query68	4480	588	583	583
query69	436	261	263	261
query70	1190	1110	1104	1104
query71	332	261	252	252
query72	6262	4046	4053	4046
query73	766	362	354	354
query74	10350	9230	9119	9119
query75	3354	2630	2637	2630
query76	2652	1043	1044	1043
query77	374	292	314	292
query78	10559	9680	9561	9561
query79	2392	608	609	608
query80	1061	417	428	417
query81	547	222	223	222
query82	850	87	86	86
query83	228	140	143	140
query84	242	79	83	79
query85	1483	311	285	285
query86	468	297	310	297
query87	4380	4264	4247	4247
query88	4104	2381	2388	2381
query89	422	292	287	287
query90	1986	183	186	183
query91	185	151	146	146
query92	69	51	53	51
query93	2254	553	548	548
query94	817	295	293	293
query95	363	251	256	251
query96	614	283	283	283
query97	3298	3173	3129	3129
query98	230	212	198	198
query99	1469	1272	1287	1272
Total cold run time: 305177 ms
Total hot run time: 196883 ms

@doris-robot
Copy link

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

query1	0.04	0.03	0.03
query2	0.06	0.04	0.03
query3	0.23	0.07	0.06
query4	1.62	0.10	0.10
query5	0.53	0.52	0.50
query6	1.13	0.73	0.72
query7	0.03	0.02	0.02
query8	0.04	0.03	0.03
query9	0.58	0.50	0.50
query10	0.55	0.56	0.57
query11	0.14	0.10	0.10
query12	0.14	0.12	0.11
query13	0.62	0.59	0.60
query14	0.78	0.79	0.80
query15	0.85	0.83	0.82
query16	0.36	0.37	0.40
query17	1.02	1.04	1.01
query18	0.23	0.22	0.21
query19	1.97	1.86	1.88
query20	0.02	0.02	0.01
query21	15.39	0.59	0.58
query22	2.75	2.08	1.92
query23	16.95	1.01	0.87
query24	3.34	1.17	1.59
query25	0.22	0.19	0.04
query26	0.44	0.14	0.14
query27	0.05	0.04	0.05
query28	9.55	0.46	0.52
query29	12.57	3.21	3.21
query30	0.24	0.06	0.07
query31	2.86	0.40	0.38
query32	3.22	0.47	0.46
query33	2.95	3.02	3.02
query34	17.02	4.44	4.48
query35	4.50	4.51	4.54
query36	0.66	0.47	0.46
query37	0.09	0.06	0.06
query38	0.05	0.03	0.04
query39	0.04	0.02	0.02
query40	0.17	0.13	0.12
query41	0.08	0.02	0.02
query42	0.03	0.02	0.02
query43	0.04	0.02	0.02
Total cold run time: 104.15 s
Total hot run time: 30.47 s

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

@dataroaring dataroaring merged commit e95458b into apache:branch-3.0 Jul 9, 2025
21 of 22 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants