Check some mdb integer type assumptions

[openldap] / libraries / libmdb / mtest.c

diff --git a/libraries/libmdb/mtest.c b/libraries/libmdb/mtest.c
index e631f8d94dfb3c914565644c222ba8dfe7f324cb..8f2ecbf0e906ecb2f5951d72e2ef65997766ae19 100644 (file)
--- a/libraries/libmdb/mtest.c
+++ b/libraries/libmdb/mtest.c
@@ -1,3 +1,16 @@
+/* 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
+ * <http://www.OpenLDAP.org/license.html>.
+ */
 #define _XOPEN_SOURCE 500              /* srandom(), random() */
 #include <stdio.h>
 #include <stdlib.h>
@@ -12,7 +25,7 @@ int main(int argc,char * argv[])
        MDB_val key, data;
        MDB_txn *txn;
        MDB_stat mst;
-       MDB_cursor *cursor, *cur2;
+       MDB_cursor *cursor;
        int count;
        int *values;
        char sval[32];
@@ -26,9 +39,9 @@ int main(int argc,char * argv[])
                        values[i] = random()%1024;
            }
     
-               rc = mdbenv_create(&env);
-               rc = mdbenv_set_mapsize(env, 10485760);
-               rc = mdbenv_open(env, "./testdb", MDB_FIXEDMAP|MDB_NOSYNC, 0664);
+               rc = mdb_env_create(&env);
+               rc = mdb_env_set_mapsize(env, 10485760);
+               rc = mdb_env_open(env, "./testdb", MDB_FIXEDMAP /*|MDB_NOSYNC*/, 0664);
                rc = mdb_txn_begin(env, 0, &txn);
                rc = mdb_open(txn, NULL, 0, &dbi);
    
@@ -45,7 +58,7 @@ 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_cursor_open(txn, dbi, &cursor);
@@ -75,14 +88,21 @@ int main(int argc,char * argv[])
            free(values);
                printf("Deleted %d values\n", j);
 
-               rc = mdbenv_stat(env, &mst);
+               rc = mdb_env_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);
+               }
 #if 0
                /* write ops aren't coordinated with cursors,
                 * this stuff all breaks
@@ -126,10 +146,10 @@ int main(int argc,char * argv[])
                }
 #endif
                mdb_cursor_close(cursor);
-               mdb_txn_abort(txn);
+               mdb_close(txn, dbi);
 
-               mdb_close(env, dbi);
-               mdbenv_close(env);
+               mdb_txn_abort(txn);
+               mdb_env_close(env);
 
        return 0;
 }