diff options
| author | Simo Sorce <idra@samba.org> | 2006-11-22 00:59:34 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:28:22 -0500 |
| commit | 4889eb9f7aae9349e426d0f6d2217adff67eaebd (patch) | |
| tree | 7eb63c32bcbd19bf64d5c315f01785f30d3a789c /source4/torture/local | |
| parent | ce0c2236b953dc977655dbceef40916825e843ae (diff) | |
| download | samba-4889eb9f7aae9349e426d0f6d2217adff67eaebd.tar.gz samba-4889eb9f7aae9349e426d0f6d2217adff67eaebd.tar.bz2 samba-4889eb9f7aae9349e426d0f6d2217adff67eaebd.zip | |
r19831: Big ldb_dn optimization and interfaces enhancement patch
This patch changes a lot of the code in ldb_dn.c, and also
removes and add a number of manipulation functions around.
The aim is to avoid validating a dn if not necessary as the
validation code is necessarily slow. This is mainly to speed up
internal operations where input is not user generated and so we
can assume the DNs need no validation. The code is designed to
keep the data as a string if possible.
The code is not yet 100% perfect, but pass all the tests so far.
A memleak is certainly present, I'll work on that next.
Simo.
(This used to be commit a580c871d3784602a9cce32d33419e63c8236e63)
Diffstat (limited to 'source4/torture/local')
| -rw-r--r-- | source4/torture/local/dbspeed.c | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/source4/torture/local/dbspeed.c b/source4/torture/local/dbspeed.c index 555f02588c..2d521394ce 100644 --- a/source4/torture/local/dbspeed.c +++ b/source4/torture/local/dbspeed.c @@ -133,8 +133,7 @@ static BOOL ldb_add_record(struct ldb_context *ldb, unsigned rid) return False; } - msg->dn = ldb_dn_string_compose(msg, NULL, "SID=S-1-5-21-53173311-3623041448-2049097239-%u", - rid); + msg->dn = ldb_dn_new_fmt(msg, ldb, "SID=S-1-5-21-53173311-3623041448-2049097239-%u", rid); if (msg->dn == NULL) { return False; } @@ -206,25 +205,20 @@ static BOOL test_ldb_speed(struct torture_context *torture, const void *_data) char *expr; i = random() % torture_entries; - dn = ldb_dn_string_compose(tmp_ctx, NULL, "SID=S-1-5-21-53173311-3623041448-2049097239-%u", - i); - if (ldb_search(ldb, dn, LDB_SCOPE_BASE, NULL, NULL, &res) != LDB_SUCCESS || - res->count != 1) { - torture_fail(torture, talloc_asprintf(torture, - "Failed to find SID %d\n", i)); + dn = ldb_dn_new_fmt(tmp_ctx, ldb, "SID=S-1-5-21-53173311-3623041448-2049097239-%u", i); + if (ldb_search(ldb, dn, LDB_SCOPE_BASE, NULL, NULL, &res) != LDB_SUCCESS || res->count != 1) { + torture_fail(torture, talloc_asprintf(torture, "Failed to find SID %d\n", i)); } talloc_free(res); talloc_free(dn); expr = talloc_asprintf(tmp_ctx, "(UID=%u)", i); - if (ldb_search(ldb, NULL, LDB_SCOPE_SUBTREE, expr, NULL, &res) != LDB_SUCCESS || - res->count != 1) { - torture_fail(torture, talloc_asprintf(torture, - "Failed to find UID %d\n", i)); + if (ldb_search(ldb, NULL, LDB_SCOPE_SUBTREE, expr, NULL, &res) != LDB_SUCCESS || res->count != 1) { + torture_fail(torture, talloc_asprintf(torture, "Failed to find UID %d\n", i)); } talloc_free(res); talloc_free(expr); } - + if (talloc_total_blocks(torture) > 100) { torture_fail(torture, "memory leak in ldb search\n"); goto failed; |