fix ldap group filter for OpenDirectory #51379

nsivarajan · 2025-05-30T06:21:45Z

What problem does this PR solve?

Issue Number: close #xxx

Related PR: #42038

Problem Summary: Ldap group filter for OpenDirectory implementation is not functional, as it fetches everything. This fix filters on "dn" attribute to fetch group.

Release note

None

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

hello-stephen · 2025-05-30T06:21:51Z

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:

What problem was fixed (it's best to include specific error reporting information). How it was fixed.
Which behaviors were modified. What was the previous behavior, what is it now, why was it modified, and what possible impacts might there be.
What features were added. Why was this function added?
Which code was refactored and why was this part of the code refactored?
Which functions were optimized and what is the difference before and after the optimization?

nsivarajan · 2025-07-12T11:32:22Z

run buildall

doris-robot · 2025-07-12T12:07:55Z

TPC-H: Total hot run time: 33218 ms

machine: 'aliyun_ecs.c7a.8xlarge_32C64G'
scripts: https://github.com/apache/doris/tree/master/tools/tpch-tools
Tpch sf100 test result on commit 9ae4d3a4fe444608d89845916837df0db2369b29, data reload: false

------ Round 1 ----------------------------------
q1	17572	5200	5065	5065
q2	1932	282	192	192
q3	10316	1275	721	721
q4	10274	987	524	524
q5	8340	2371	2320	2320
q6	206	157	130	130
q7	893	739	594	594
q8	9328	1270	1101	1101
q9	6857	5086	5078	5078
q10	6945	2351	1947	1947
q11	474	304	267	267
q12	339	360	211	211
q13	17774	3738	3075	3075
q14	224	223	212	212
q15	556	493	481	481
q16	429	429	377	377
q17	610	851	369	369
q18	7537	7195	7163	7163
q19	1363	936	567	567
q20	338	341	216	216
q21	3785	3191	2317	2317
q22	372	316	291	291
Total cold run time: 106464 ms
Total hot run time: 33218 ms

----- Round 2, with runtime_filter_mode=off -----
q1	5081	5061	5036	5036
q2	233	327	217	217
q3	2187	2650	2337	2337
q4	1329	1742	1292	1292
q5	4226	4318	4534	4318
q6	215	169	127	127
q7	2099	1862	1876	1862
q8	2653	2632	2503	2503
q9	7332	7168	7249	7168
q10	3112	3308	2876	2876
q11	615	523	505	505
q12	685	792	631	631
q13	3563	4132	3393	3393
q14	279	319	283	283
q15	516	476	469	469
q16	467	485	443	443
q17	1197	1549	1367	1367
q18	7957	8066	7590	7590
q19	792	815	837	815
q20	1993	1971	1822	1822
q21	4610	4470	4320	4320
q22	659	577	564	564
Total cold run time: 51800 ms
Total hot run time: 49938 ms

doris-robot · 2025-07-12T12:19:38Z

TPC-DS: Total hot run time: 186820 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 9ae4d3a4fe444608d89845916837df0db2369b29, data reload: false

query1	990	380	381	380
query2	6514	1747	1675	1675
query3	6741	219	219	219
query4	26648	23727	23326	23326
query5	4347	571	443	443
query6	323	210	195	195
query7	4625	503	292	292
query8	267	226	211	211
query9	8635	2607	2613	2607
query10	514	337	268	268
query11	15414	15137	15125	15125
query12	150	105	101	101
query13	1654	526	391	391
query14	8631	5850	5855	5850
query15	195	193	169	169
query16	7125	600	486	486
query17	1009	701	572	572
query18	1966	405	293	293
query19	189	189	154	154
query20	123	128	115	115
query21	214	120	106	106
query22	4094	4492	4193	4193
query23	33747	33184	32986	32986
query24	8474	2397	2385	2385
query25	574	497	420	420
query26	1240	273	151	151
query27	2759	518	352	352
query28	4343	2094	2090	2090
query29	802	565	464	464
query30	281	212	186	186
query31	938	840	765	765
query32	79	66	63	63
query33	586	367	316	316
query34	793	840	528	528
query35	769	830	718	718
query36	954	1001	898	898
query37	113	106	78	78
query38	4160	4119	4024	4024
query39	1517	1426	1448	1426
query40	207	125	112	112
query41	61	58	57	57
query42	123	108	162	108
query43	513	496	475	475
query44	1345	833	822	822
query45	175	168	163	163
query46	829	1019	635	635
query47	1749	1814	1735	1735
query48	397	437	299	299
query49	752	475	402	402
query50	640	682	413	413
query51	5464	5532	5620	5532
query52	118	109	99	99
query53	222	253	184	184
query54	595	559	507	507
query55	85	83	90	83
query56	295	294	285	285
query57	1186	1209	1122	1122
query58	261	248	263	248
query59	2548	2661	2475	2475
query60	316	315	296	296
query61	123	117	146	117
query62	794	724	652	652
query63	219	186	189	186
query64	4312	976	624	624
query65	4296	4185	4199	4185
query66	1130	403	318	318
query67	15875	15553	15316	15316
query68	8095	899	523	523
query69	488	306	323	306
query70	1230	1144	1101	1101
query71	460	322	302	302
query72	5659	4767	4724	4724
query73	698	600	364	364
query74	8861	9263	8728	8728
query75	3787	3199	2745	2745
query76	3637	1155	727	727
query77	792	394	310	310
query78	10054	10192	9343	9343
query79	2200	838	597	597
query80	583	512	447	447
query81	506	258	226	226
query82	465	127	96	96
query83	250	254	225	225
query84	296	100	91	91
query85	804	426	314	314
query86	384	279	287	279
query87	4334	4441	4363	4363
query88	3801	2249	2244	2244
query89	375	321	292	292
query90	1831	212	202	202
query91	140	143	111	111
query92	73	59	54	54
query93	1716	949	595	595
query94	664	395	373	373
query95	374	293	285	285
query96	495	566	283	283
query97	2695	2804	2643	2643
query98	251	213	203	203
query99	1347	1385	1253	1253
Total cold run time: 274472 ms
Total hot run time: 186820 ms

doris-robot · 2025-07-12T12:24:56Z

ClickBench: Total hot run time: 29.5 s

machine: 'aliyun_ecs.c7a.8xlarge_32C64G'
scripts: https://github.com/apache/doris/tree/master/tools/clickbench-tools
ClickBench test result on commit 9ae4d3a4fe444608d89845916837df0db2369b29, data reload: false

query1	0.05	0.04	0.04
query2	0.07	0.04	0.04
query3	0.24	0.08	0.08
query4	1.61	0.11	0.10
query5	0.43	0.41	0.42
query6	1.19	0.67	0.65
query7	0.03	0.01	0.02
query8	0.05	0.04	0.04
query9	0.61	0.53	0.52
query10	0.57	0.58	0.58
query11	0.16	0.11	0.11
query12	0.16	0.12	0.12
query13	0.62	0.61	0.61
query14	0.80	0.80	0.82
query15	0.89	0.88	0.86
query16	0.39	0.39	0.40
query17	1.08	1.09	1.06
query18	0.24	0.22	0.21
query19	2.00	1.80	1.93
query20	0.02	0.01	0.02
query21	15.38	0.90	0.55
query22	0.76	1.31	0.67
query23	14.82	1.36	0.63
query24	6.84	2.28	0.57
query25	0.48	0.13	0.27
query26	0.65	0.16	0.14
query27	0.07	0.06	0.05
query28	9.61	0.89	0.44
query29	12.55	3.99	3.31
query30	0.25	0.09	0.06
query31	2.85	0.58	0.39
query32	3.22	0.58	0.47
query33	3.11	3.17	3.25
query34	16.03	5.37	4.80
query35	4.86	4.84	4.82
query36	0.70	0.50	0.52
query37	0.09	0.07	0.07
query38	0.05	0.05	0.04
query39	0.03	0.03	0.03
query40	0.18	0.15	0.14
query41	0.08	0.03	0.02
query42	0.03	0.03	0.03
query43	0.04	0.03	0.03
Total cold run time: 103.89 s
Total hot run time: 29.5 s

hello-stephen · 2025-07-12T12:45:41Z

FE UT Coverage Report

Increment line coverage 33.33% (9/27) 🎉
Increment coverage report
Complete coverage report

fe/fe-core/src/main/java/org/apache/doris/mysql/authenticate/ldap/LdapClient.java

dataroaring · 2025-08-12T03:56:11Z

run buildall

gavinchou

LGTM

github-actions · 2025-08-12T04:11:07Z

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

github-actions · 2025-08-12T04:11:10Z

PR approved by anyone and no changes requested.

doris-robot · 2025-08-12T05:04:56Z

TPC-H: Total hot run time: 33897 ms

machine: 'aliyun_ecs.c7a.8xlarge_32C64G'
scripts: https://github.com/apache/doris/tree/master/tools/tpch-tools
Tpch sf100 test result on commit 2885c38cfc0a11085709371b3446cc898d32add7, data reload: false

------ Round 1 ----------------------------------
q1	17578	5239	5111	5111
q2	1924	274	174	174
q3	10329	1267	702	702
q4	10231	999	502	502
q5	8080	2474	2302	2302
q6	215	159	126	126
q7	892	731	616	616
q8	9297	1344	1067	1067
q9	7187	5112	5147	5112
q10	6964	2364	1949	1949
q11	492	291	265	265
q12	364	351	217	217
q13	17789	3644	3126	3126
q14	224	234	215	215
q15	584	493	474	474
q16	436	430	376	376
q17	605	872	355	355
q18	7463	7210	7108	7108
q19	1103	956	580	580
q20	340	350	227	227
q21	3762	2563	2307	2307
q22	1059	1021	986	986
Total cold run time: 106918 ms
Total hot run time: 33897 ms

----- Round 2, with runtime_filter_mode=off -----
q1	5202	5100	5128	5100
q2	245	324	221	221
q3	2188	2650	2311	2311
q4	1317	1802	1375	1375
q5	4220	4495	4590	4495
q6	208	167	123	123
q7	2064	1989	1779	1779
q8	2649	2509	2829	2509
q9	7225	7328	7319	7319
q10	3079	3339	2856	2856
q11	589	512	488	488
q12	700	773	641	641
q13	3508	3872	3308	3308
q14	280	310	284	284
q15	522	480	461	461
q16	450	512	485	485
q17	1226	1571	1418	1418
q18	7934	7663	7569	7569
q19	828	794	859	794
q20	1985	2111	2003	2003
q21	4937	4383	4245	4245
q22	1099	1031	1009	1009
Total cold run time: 52455 ms
Total hot run time: 50793 ms

doris-robot · 2025-08-12T05:16:29Z

TPC-DS: Total hot run time: 185184 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 2885c38cfc0a11085709371b3446cc898d32add7, data reload: false

query1	974	410	421	410
query2	6499	1748	1771	1748
query3	6744	225	221	221
query4	26138	23631	23295	23295
query5	4343	629	489	489
query6	298	225	210	210
query7	4624	511	296	296
query8	276	246	219	219
query9	8589	2886	2865	2865
query10	483	313	290	290
query11	16001	14950	14720	14720
query12	162	110	114	110
query13	1653	564	422	422
query14	8752	5683	5735	5683
query15	201	191	166	166
query16	7155	604	475	475
query17	1211	699	570	570
query18	1978	409	306	306
query19	191	203	155	155
query20	122	126	114	114
query21	213	126	110	110
query22	4074	4265	4079	4079
query23	34135	33207	33240	33207
query24	8140	2350	2319	2319
query25	536	461	396	396
query26	1233	270	164	164
query27	2750	518	349	349
query28	4349	2250	2232	2232
query29	800	583	474	474
query30	286	233	194	194
query31	894	817	699	699
query32	89	76	76	76
query33	574	398	355	355
query34	795	838	523	523
query35	793	830	750	750
query36	984	1015	931	931
query37	122	107	86	86
query38	4004	4056	3931	3931
query39	1479	1415	1389	1389
query40	239	129	122	122
query41	65	61	59	59
query42	122	165	108	108
query43	494	484	464	464
query44	1338	861	836	836
query45	180	173	165	165
query46	857	1012	641	641
query47	1778	1846	1721	1721
query48	383	436	342	342
query49	702	480	379	379
query50	636	672	403	403
query51	4117	4119	4144	4119
query52	110	109	101	101
query53	229	257	195	195
query54	576	582	518	518
query55	83	87	90	87
query56	305	297	294	294
query57	1204	1199	1130	1130
query58	276	264	261	261
query59	2647	2755	2599	2599
query60	349	328	307	307
query61	127	121	126	121
query62	784	736	668	668
query63	234	187	188	187
query64	4294	1035	682	682
query65	4318	4197	4196	4196
query66	1144	418	317	317
query67	15560	15336	15258	15258
query68	8266	926	572	572
query69	489	316	284	284
query70	1262	1116	1160	1116
query71	471	329	309	309
query72	5743	4794	5065	4794
query73	771	685	356	356
query74	9208	9154	8977	8977
query75	3758	3056	2647	2647
query76	3633	1186	749	749
query77	799	408	323	323
query78	9682	9540	8910	8910
query79	2583	836	581	581
query80	626	533	482	482
query81	478	255	217	217
query82	440	134	107	107
query83	281	247	241	241
query84	292	103	82	82
query85	790	360	330	330
query86	339	327	298	298
query87	4292	4267	4126	4126
query88	3371	2207	2187	2187
query89	384	313	280	280
query90	1921	227	222	222
query91	141	145	112	112
query92	84	73	68	68
query93	1744	993	632	632
query94	673	405	269	269
query95	391	316	307	307
query96	486	576	269	269
query97	2648	2688	2542	2542
query98	237	213	208	208
query99	1458	1407	1279	1279
Total cold run time: 273536 ms
Total hot run time: 185184 ms

doris-robot · 2025-08-12T05:21:57Z

ClickBench: Total hot run time: 32.53 s

machine: 'aliyun_ecs.c7a.8xlarge_32C64G'
scripts: https://github.com/apache/doris/tree/master/tools/clickbench-tools
ClickBench test result on commit 2885c38cfc0a11085709371b3446cc898d32add7, data reload: false

query1	0.04	0.03	0.03
query2	0.08	0.05	0.04
query3	0.25	0.07	0.07
query4	1.62	0.10	0.11
query5	0.42	0.40	0.40
query6	1.18	0.64	0.63
query7	0.02	0.01	0.02
query8	0.05	0.04	0.04
query9	0.60	0.52	0.51
query10	0.56	0.58	0.58
query11	0.15	0.11	0.11
query12	0.15	0.12	0.11
query13	0.62	0.61	0.60
query14	0.80	0.81	0.85
query15	0.87	0.84	0.87
query16	0.38	0.39	0.39
query17	1.03	1.05	1.05
query18	0.21	0.20	0.19
query19	1.91	1.87	1.85
query20	0.01	0.01	0.01
query21	15.40	0.91	0.54
query22	0.75	1.18	0.80
query23	14.86	1.36	0.61
query24	7.22	1.29	0.84
query25	0.59	0.24	0.08
query26	0.52	0.16	0.14
query27	0.06	0.05	0.04
query28	9.80	0.90	0.43
query29	12.60	3.94	3.27
query30	3.06	2.98	2.95
query31	2.82	0.60	0.38
query32	3.23	0.54	0.47
query33	3.09	3.07	3.05
query34	15.98	5.55	4.85
query35	4.92	4.88	5.02
query36	0.69	0.50	0.50
query37	0.10	0.07	0.07
query38	0.05	0.05	0.03
query39	0.03	0.03	0.02
query40	0.17	0.14	0.14
query41	0.08	0.02	0.02
query42	0.04	0.03	0.02
query43	0.04	0.03	0.03
Total cold run time: 107.05 s
Total hot run time: 32.53 s

zddr

LGTM

### What problem does this PR solve? Related PR: #42038 Problem Summary: Ldap group filter for OpenDirectory implementation is not functional, as it fetches everything. This fix filters on "dn" attribute to fetch group.

Cherry-picked from #51379 Co-authored-by: nsivarajan <117266407+nsivarajan@users.noreply.github.com>

fix ldap group filter for OpenDirectory

ac03060

fixed syntax and ldap dn attribute

9ae4d3a

nsivarajan marked this pull request as ready for review July 10, 2025 16:20

morrySnow added dev/2.1.x dev/3.0.x dev/3.1.x labels Jul 14, 2025

gavinchou reviewed Jul 14, 2025

View reviewed changes

fe/fe-core/src/main/java/org/apache/doris/mysql/authenticate/ldap/LdapClient.java Outdated Show resolved Hide resolved

Sivarajan Narayanan added 2 commits July 14, 2025 21:02

PR review comments

6028bc4

PR review comments

a8388f0

zddr reviewed Jul 15, 2025

View reviewed changes

Sivarajan Narayanan added 2 commits July 15, 2025 20:11

fix review comments

4235652

fix styles

2885c38

morrySnow added the usercase Important user case type label label Aug 6, 2025

gavinchou approved these changes Aug 12, 2025

View reviewed changes

github-actions bot added the approved Indicates a PR has been approved by one committer. label Aug 12, 2025

github-actions bot added the reviewed label Aug 12, 2025

zddr approved these changes Aug 28, 2025

View reviewed changes

morrySnow merged commit ab319cf into apache:master Aug 28, 2025
29 of 31 checks passed

github-actions bot mentioned this pull request Aug 28, 2025

branch-3.0: fix ldap group filter for OpenDirectory #51379 #55399

Merged

github-actions bot mentioned this pull request Aug 28, 2025

branch-2.1: fix ldap group filter for OpenDirectory #51379 #55400

Open

github-actions bot mentioned this pull request Aug 28, 2025

branch-3.1: fix ldap group filter for OpenDirectory #51379 #55402

Merged

morrySnow pushed a commit that referenced this pull request Aug 29, 2025

branch-3.1: fix ldap group filter for OpenDirectory #51379 (#55402)

636ac44

Cherry-picked from #51379 Co-authored-by: nsivarajan <117266407+nsivarajan@users.noreply.github.com>

morrySnow added dev/3.1.0-merged and removed dev/3.1.x labels Aug 29, 2025

dataroaring pushed a commit that referenced this pull request Sep 5, 2025

branch-3.0: fix ldap group filter for OpenDirectory #51379 (#55399)

a50a51e

Cherry-picked from #51379 Co-authored-by: nsivarajan <117266407+nsivarajan@users.noreply.github.com>

dataroaring added dev/3.0.8-merged and removed dev/3.0.x labels Sep 26, 2025

fix ldap group filter for OpenDirectory #51379

fix ldap group filter for OpenDirectory #51379

Uh oh!

Conversation

nsivarajan commented May 30, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What problem does this PR solve?

Release note

Check List (For Author)

Check List (For Reviewer who merge this PR)

Uh oh!

hello-stephen commented May 30, 2025

Uh oh!

nsivarajan commented Jul 12, 2025

Uh oh!

doris-robot commented Jul 12, 2025

Uh oh!

doris-robot commented Jul 12, 2025

Uh oh!

doris-robot commented Jul 12, 2025

Uh oh!

hello-stephen commented Jul 12, 2025

FE UT Coverage Report

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

dataroaring commented Aug 12, 2025

Uh oh!

gavinchou left a comment

Choose a reason for hiding this comment

Uh oh!

github-actions bot commented Aug 12, 2025

Uh oh!

github-actions bot commented Aug 12, 2025

Uh oh!

doris-robot commented Aug 12, 2025

Uh oh!

doris-robot commented Aug 12, 2025

Uh oh!

doris-robot commented Aug 12, 2025

Uh oh!

zddr left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

nsivarajan commented May 30, 2025 •

edited

Loading