Merge remote-tracking branch 'origin/mdb.master'

[openldap] / libraries / libmdb / mtest3.c

diff --git a/libraries/libmdb/mtest3.c b/libraries/libmdb/mtest3.c
index 581fe606f20dd0d203e7d06cf0a1d6b8f82af178..eb9723ba2e58148cdcb769d15765a56a73a3f65c 100644 (file)
--- a/libraries/libmdb/mtest3.c
+++ b/libraries/libmdb/mtest3.c
@@ -45,11 +45,11 @@ int main(int argc,char * argv[])
                values[i] = random()%1024;
        }
 
-       rc = mdbenv_create(&env);
-       rc = mdbenv_set_mapsize(env, 10485760);
-       rc = mdbenv_set_maxdbs(env, 4);
-       rc = mdbenv_open(env, "./testdb", MDB_FIXEDMAP|MDB_NOSYNC, 0664);
-       rc = mdb_txn_begin(env, 0, &txn);
+       rc = mdb_env_create(&env);
+       rc = mdb_env_set_mapsize(env, 10485760);
+       rc = mdb_env_set_maxdbs(env, 4);
+       rc = mdb_env_open(env, "./testdb", MDB_FIXEDMAP|MDB_NOSYNC, 0664);
+       rc = mdb_txn_begin(env, NULL, 0, &txn);
        rc = mdb_open(txn, "id2", MDB_CREATE|MDB_DUPSORT, &dbi);
 
        key.mv_size = sizeof(int);
@@ -67,9 +67,9 @@ int main(int argc,char * argv[])
        }
        if (j) printf("%d duplicates skipped\n", j);
        rc = mdb_txn_commit(txn);
-       rc = mdbenv_stat(env, &mst);
+       rc = mdb_env_stat(env, &mst);
 
-       rc = mdb_txn_begin(env, 1, &txn);
+       rc = mdb_txn_begin(env, NULL, 1, &txn);
        rc = mdb_cursor_open(txn, dbi, &cursor);
        while ((rc = mdb_cursor_get(cursor, &key, &data, MDB_NEXT)) == 0) {
                printf("key: %p %.*s, data: %p %.*s\n",
@@ -84,14 +84,14 @@ int main(int argc,char * argv[])
        for (i= count - 1; i > -1; i-= (random()%5)) {
                j++;
                txn=NULL;
-               rc = mdb_txn_begin(env, 0, &txn);
+               rc = mdb_txn_begin(env, NULL, 0, &txn);
                sprintf(kval, "%03x", values[i & ~0x0f]);
                sprintf(sval, "%03x %d foo bar", values[i], values[i]);
                key.mv_size = sizeof(int);
                key.mv_data = kval;
                data.mv_size = sizeof(sval);
                data.mv_data = sval;
-               rc = mdb_del(txn, dbi, &key, &data, MDB_DEL_DUP);
+               rc = mdb_del(txn, dbi, &key, &data);
                if (rc) {
                        j--;
                        mdb_txn_abort(txn);
@@ -102,8 +102,8 @@ int main(int argc,char * argv[])
        free(values);
        printf("Deleted %d values\n", j);
 
-       rc = mdbenv_stat(env, &mst);
-       rc = mdb_txn_begin(env, 1, &txn);
+       rc = mdb_env_stat(env, &mst);
+       rc = mdb_txn_begin(env, NULL, 1, &txn);
        rc = mdb_cursor_open(txn, dbi, &cursor);
        printf("Cursor next\n");
        while ((rc = mdb_cursor_get(cursor, &key, &data, MDB_NEXT)) == 0) {
@@ -118,10 +118,10 @@ int main(int argc,char * argv[])
                        (int) data.mv_size, (char *) data.mv_data);
        }
        mdb_cursor_close(cursor);
-       mdb_close(txn, dbi);
+       mdb_close(env, dbi);
 
        mdb_txn_abort(txn);
-       mdbenv_close(env);
+       mdb_env_close(env);
 
        return 0;
 }