Test the other cursor operations against the multithread DBT cursor problem. Fixes #538.

git-svn-id: file:///svn/tokudb@2855 c7de825b-a66e-492c-adef-691d508d4ae1

src/tests/test_cursor_2.c

@@ -13,7 +13,7 @@
 
 #include "test.h"
 
-void test_cursor() {
+void test_cursor(void) {
     if (verbose) printf("test_cursor\n");
 
     DB_ENV * env;
@@ -22,8 +22,6 @@ void test_cursor() {
     const char * const fname = "test.cursor.brt";
     int r;
 
-    unlink(fname);
-
     /* create the dup database file */
     r = db_env_create(&env, 0);        assert(r == 0);
     env->set_errfile(env, stderr);

src/tests/test_cursor_3.c

+/* -*- mode: C; c-basic-offset: 4 -*- */
+// Verify that different cursors return different data items when DBT is given no flags.
+
+#ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <assert.h>
+#include <unistd.h>
+#include <string.h>
+#include <errno.h>
+#include <sys/stat.h>
+#include <arpa/inet.h>
+#include <db.h>
+
+#include "test.h"
+
+void verify_distinct_pointers (void **ptrs, int n) {
+    int i,j;
+    for (i=0; i<n; i++) {
+	for (j=i+1; j<n; j++) {
+	    assert(ptrs[i]!=ptrs[j]);
+	}
+    }
+}
+
+DB_ENV * env;
+DB *db;
+DB_TXN * const null_txn = 0;
+
+enum { ncursors = 2 };
+DBC *cursor[ncursors];
+
+void testit (u_int32_t cop)  {
+    void *kptrs[ncursors];
+    void *vptrs[ncursors];
+    int i;
+    for (i=0; i<ncursors; i++) {
+	DBT k0; memset(&k0, 0, sizeof k0);
+	DBT v0; memset(&v0, 0, sizeof v0);
+	int r = cursor[i]->c_get(cursor[i], &k0, &v0, cop);
+	CKERR(r);
+	kptrs[i] = k0.data;
+	vptrs[i] = v0.data;
+    }
+    verify_distinct_pointers(kptrs, ncursors);
+    verify_distinct_pointers(vptrs, ncursors);
+}
+
+void test(void) {
+    if (verbose) printf("test_cursor\n");
+
+    const char * const fname = "test.cursor.brt";
+    int r;
+
+    /* create the dup database file */
+    r = db_env_create(&env, 0);        assert(r == 0);
+    env->set_errfile(env, stderr);
+    r = env->open(env, ENVDIR, DB_CREATE|DB_INIT_MPOOL|DB_THREAD|DB_PRIVATE, 0777); CKERR(r);
+    r = db_create(&db, env, 0); assert(r == 0);
+    db->set_errfile(db,stderr); // Turn off those annoying errors
+    r = db->open(db, null_txn, fname, "main", DB_BTREE, DB_CREATE, 0666); assert(r == 0);
+
+    int i;
+    int n = 42;
+    for (i=0; i<n; i++) {
+        int k = htonl(i);
+        int v = htonl(i);
+        DBT key, val;
+        r = db->put(db, null_txn, dbt_init(&key, &k, sizeof k), dbt_init(&val, &v, sizeof v), 0);
+        assert(r == 0); 
+    }
+
+    for (i=0; i<ncursors; i++) {
+	r = db->cursor(db, null_txn, &cursor[i], 0); CKERR(r);
+    }
+
+    testit(DB_FIRST);
+    testit(DB_NEXT);
+    testit(DB_PREV);
+    testit(DB_LAST);
+
+    r = cursor[0]->c_close(cursor[0]); assert(r == 0);
+    r = cursor[1]->c_close(cursor[1]); assert(r == 0);
+
+    r = db->close(db, 0); assert(r == 0);
+    r = env->close(env, 0); assert(r == 0);
+}
+
+int main(int argc, const char *argv[]) {
+
+    parse_args(argc, argv);
+  
+    system("rm -rf " ENVDIR);
+    mkdir(ENVDIR, 0777);
+    
+    test();
+
+    return 0;
+}