From: Howard Chu Date: Thu, 11 Aug 2011 07:33:27 +0000 (-0700) Subject: More subDB stuff X-Git-Tag: OPENLDAP_REL_ENG_2_4_27~148^2~127 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=01c2f7816f643ef0c7080f2cf7964f5d34d20efe;p=openldap More subDB stuff --- diff --git a/libraries/libmdb/Makefile b/libraries/libmdb/Makefile index 4c30b2372b..92fed94935 100644 --- a/libraries/libmdb/Makefile +++ b/libraries/libmdb/Makefile @@ -15,6 +15,7 @@ test: all mdb_stat: mdb_stat.o mdb.o idl.o mtest: mtest.o mdb.o idl.o +mtest2: mtest2.o mdb.o idl.o %: %.o mdb.o $(CC) $(CFLAGS) $(LDFLAGS) $^ $(LDLIBS) -o $@ diff --git a/libraries/libmdb/mdb.c b/libraries/libmdb/mdb.c index 9b0e4f18f7..fffbdce443 100644 --- a/libraries/libmdb/mdb.c +++ b/libraries/libmdb/mdb.c @@ -452,8 +452,11 @@ mdb_alloc_page(MDB_txn *txn, MDB_page *parent, unsigned int parent_idx, int num) { MDB_dpage *dp; pgno_t pgno = P_INVALID; - ULONG oldest = txn->mt_txnid - 2; + ULONG oldest; + if (txn->mt_txnid > 2) { + + oldest = txn->mt_txnid - 2; if (!txn->mt_env->me_pghead && txn->mt_dbs[FREE_DBI].md_root != P_INVALID) { /* See if there's anything in the free DB */ MDB_pageparent mpp; @@ -534,6 +537,7 @@ mdb_alloc_page(MDB_txn *txn, MDB_page *parent, unsigned int parent_idx, int num) } } } + } if ((dp = malloc(txn->mt_env->me_psize * num + sizeof(MDB_dhead))) == NULL) return NULL; @@ -1101,8 +1105,6 @@ mdbenv_set_mapsize(MDB_env *env, size_t size) int mdbenv_set_maxdbs(MDB_env *env, int dbs) { - if (env->me_map) - return EINVAL; env->me_maxdbs = dbs; return MDB_SUCCESS; } @@ -1598,7 +1600,7 @@ mdb_search_page(MDB_txn *txn, MDB_dbi dbi, MDB_val *key, /* For sub-databases, update main root first */ if (dbi > MAIN_DBI && !txn->mt_dbxs[dbi].md_dirty) { MDB_pageparent mp2; - rc = mdb_search_page(txn, 0, &txn->mt_dbxs[dbi].md_name, + rc = mdb_search_page(txn, MAIN_DBI, &txn->mt_dbxs[dbi].md_name, NULL, 1, &mp2); if (rc) return rc; @@ -3066,7 +3068,7 @@ int mdb_open(MDB_txn *txn, const char *name, unsigned int flags, MDB_dbi *dbi) { MDB_val key, data; MDB_dbi i; - int rc; + int rc, dirty = 0; size_t len; /* main DB? */ @@ -3101,7 +3103,8 @@ int mdb_open(MDB_txn *txn, const char *name, unsigned int flags, MDB_dbi *dbi) memset(&dummy, 0, sizeof(dummy)); dummy.md_root = P_INVALID; dummy.md_flags = flags & 0xffff; - rc = mdb_put(txn, 0, &key, &data, 0); + rc = mdb_put(txn, MAIN_DBI, &key, &data, 0); + dirty = 1; } /* OK, got info, add to table */ @@ -3112,7 +3115,7 @@ int mdb_open(MDB_txn *txn, const char *name, unsigned int flags, MDB_dbi *dbi) txn->mt_dbxs[txn->mt_numdbs].md_dcmp = NULL; txn->mt_dbxs[txn->mt_numdbs].md_rel = NULL; txn->mt_dbxs[txn->mt_numdbs].md_parent = MAIN_DBI; - txn->mt_dbxs[txn->mt_numdbs].md_dirty = 0; + txn->mt_dbxs[txn->mt_numdbs].md_dirty = dirty; memcpy(&txn->mt_dbs[txn->mt_numdbs], data.mv_data, sizeof(MDB_db)); *dbi = txn->mt_numdbs; txn->mt_numdbs++; diff --git a/libraries/libmdb/mtest2.c b/libraries/libmdb/mtest2.c new file mode 100644 index 0000000000..7576027a98 --- /dev/null +++ b/libraries/libmdb/mtest2.c @@ -0,0 +1,114 @@ +/* mtest.c - memory-mapped database tester/toy */ +/* + * Copyright 2011 Howard Chu, Symas Corp. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted only as authorized by the OpenLDAP + * Public License. + * + * A copy of this license is available in the file LICENSE in the + * top-level directory of the distribution or, alternatively, at + * . + */ +#define _XOPEN_SOURCE 500 /* srandom(), random() */ +#include +#include +#include +#include "mdb.h" + +int main(int argc,char * argv[]) +{ + int i = 0, j = 0, rc; + MDB_env *env; + MDB_dbi dbi; + MDB_val key, data; + MDB_txn *txn; + MDB_stat mst; + MDB_cursor *cursor, *cur2; + int count; + int *values; + char sval[32]; + + srandom(time(NULL)); + + count = (random()%384) + 64; + values = (int *)malloc(count*sizeof(int)); + + for(i = 0;i -1; i-= (random()%5)) { + j++; + txn=NULL; + rc = mdb_txn_begin(env, 0, &txn); + sprintf(sval, "%03x ", values[i]); + rc = mdb_del(txn, dbi, &key, NULL, 0); + if (rc) { + j--; + mdb_txn_abort(txn); + } else { + rc = mdb_txn_commit(txn); + } + } + free(values); + printf("Deleted %d values\n", j); + + rc = mdbenv_stat(env, &mst); + rc = mdb_txn_begin(env, 1, &txn); + rc = mdb_cursor_open(txn, dbi, &cursor); + printf("Cursor next\n"); + while ((rc = mdb_cursor_get(cursor, &key, &data, MDB_NEXT)) == 0) { + printf("key: %.*s, data: %.*s\n", + (int) key.mv_size, (char *) key.mv_data, + (int) data.mv_size, (char *) data.mv_data); + } + printf("Cursor prev\n"); + while ((rc = mdb_cursor_get(cursor, &key, &data, MDB_PREV)) == 0) { + printf("key: %.*s, data: %.*s\n", + (int) key.mv_size, (char *) key.mv_data, + (int) data.mv_size, (char *) data.mv_data); + } + mdb_cursor_close(cursor); + mdb_close(txn, dbi); + + mdb_txn_abort(txn); + mdbenv_close(env); + + return 0; +}