sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

ldb_tdb: Optimise ltdb_search_and_return_base() to re-use casefolding

Browse Source 
The casefolding of a DN is one of the more expensive and pointless things in LDB
operation.  The ldb_dn abstraction works hard to avoid duplicating this work, but
we can work harder to save that information.

Here we copy in the DN, that has been casefolded already for the index,
and keep that as the returned DN, after stripping any extended components.

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
This commit is contained in:
Andrew Bartlett 2017-08-30 13:18:20 +12:00
parent f14370d471
commit b0a6b5ab51
1 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
lib/ldb/ldb_tdb/ldb_search.c
View File

@ -593,6 +593,8 @@ static int ltdb_search_and_return_base(struct ltdb_private *ltdb,
{
struct ldb_message *msg, *filtered_msg;
struct ldb_context *ldb = ldb_module_get_ctx(ctx->module);
const char *dn_linearized;
const char *msg_dn_linearlized;
int ret;
bool matched;
@ -642,9 +644,32 @@ static int ltdb_search_and_return_base(struct ltdb_private *ltdb,
return LDB_SUCCESS;
}
/* filter the attributes that the user wants */
dn_linearized = ldb_dn_get_linearized(ctx->base);
msg_dn_linearlized = ldb_dn_get_linearized(msg->dn);
if (strcmp(dn_linearized, msg_dn_linearlized) == 0) {
/*
* If the DN is exactly the same string, then
* re-use the full incoming DN for the
* returned result, as it has already been
* casefolded
*/
msg->dn = ctx->base;
}
/*
* filter the attributes that the user wants.
*
* This copies msg->dn including the casefolding, so the above
* assignment is safe
*/
ret = ltdb_filter_attrs(ctx, msg, ctx->attrs, &filtered_msg);
/*
* Remove any extended components possibly copied in from
* msg->dn, we just want the casefold components
*/
ldb_dn_remove_extended_components(filtered_msg->dn);
talloc_free(msg);
if (ret == -1) {