check that multithread db->get uses MALLOC+REALLOC+USERMEM. closes #167

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

src/tests/test_db_thread.c

+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <assert.h>
+#include <errno.h>
+#include <arpa/inet.h>
+#include <db.h>
+#include "test.h"
+
+const char *dbfile = "test.db";
+const char *dbname = 0;
+
+int db_put(DB *db, int k, int v) {
+    DBT key, val;
+    int r = db->put(db, 0, dbt_init(&key, &k, sizeof k), dbt_init(&val, &v, sizeof v), 0);
+    return r;
+}
+
+int db_get(DB *db, int k, int expectv, int val_flags) {
+    int v;
+    DBT key, val;
+    memset(&val, 0, sizeof val); val.flags = val_flags;
+    if (val.flags == DB_DBT_USERMEM) {
+        val.ulen = sizeof v; val.data = &v;
+    }
+    int r = db->get(db, 0, dbt_init(&key, &k, sizeof k), &val, 0);
+    if (r == 0) {
+        assert(val.size == sizeof v); 
+        if ((val.flags & DB_DBT_USERMEM) == 0) memcpy(&v, val.data, val.size); 
+        assert(v == expectv);
+    } else {
+        if (verbose) printf("%s:%d:%d:%s\n", __FILE__, __LINE__, r, db_strerror(r));
+    }
+    if (val.flags & (DB_DBT_MALLOC|DB_DBT_REALLOC))
+        free(val.data);
+    return r;
+}
+
+void test_db_create() {
+    int r;
+    DB *db;
+
+    unlink(dbfile);
+    r = db_create(&db, 0, 0); assert(r == 0);
+    r = db->open(db, 0, dbfile, dbname, DB_BTREE, DB_CREATE, 0777); assert(r == 0);
+    r = db_put(db, htonl(1), 1); assert(r == 0);
+    r = db_get(db, htonl(1), 1, 0); assert(r == 0);
+    r = db_get(db, htonl(1), 1, DB_DBT_USERMEM); assert(r == 0);
+    r = db->close(db, 0); assert(r == 0);
+}
+
+void test_db_thread() {
+    int r;
+    DB *db;
+
+    unlink(dbfile);
+    r = db_create(&db, 0, 0); assert(r == 0);
+    r = db->open(db, 0, dbfile, dbname, DB_BTREE, DB_CREATE + DB_THREAD, 0777); assert(r == 0);
+    r = db_put(db, htonl(1), 1); assert(r == 0);
+    r = db_get(db, htonl(1), 1, 0); assert(r == EINVAL);
+    r = db_get(db, htonl(1), 1, DB_DBT_MALLOC); assert(r == 0);
+    r = db_get(db, htonl(1), 1, DB_DBT_REALLOC); assert(r == 0);
+    r = db_get(db, htonl(1), 1, DB_DBT_USERMEM); assert(r == 0);
+    r = db->close(db, 0); assert(r == 0);
+}
+
+int main(int argc, const char *argv[]) {
+    parse_args(argc, argv);
+    test_db_create();
+    test_db_thread();
+    return 0;
+}

src/ydb.c

@@ -1595,6 +1595,9 @@ static int toku_db_get (DB * db, DB_TXN * txn, DBT * key, DBT * data, u_int32_t
     HANDLE_PANICKED_DB(db);
     int r;
 
+    if ((db->i->open_flags & DB_THREAD) && (data->flags & (DB_DBT_MALLOC+DB_DBT_REALLOC+DB_DBT_USERMEM)) == 0)
+        return EINVAL;
+
     if (db->i->primary==0) r = toku_db_get_noassociate(db, txn, key, data, flags);
     else {
         // It's a get on a secondary.
@@ -1716,7 +1719,7 @@ static int toku_db_open(DB * db, DB_TXN * txn, const char *fname, const char *db
     int is_db_create  = flags & DB_CREATE;  flags&=~DB_CREATE;
     int is_db_rdonly  = flags & DB_RDONLY;  flags&=~DB_RDONLY;
     int is_db_unknown = flags & DB_UNKNOWN; flags&=~DB_UNKNOWN;
-    if (flags) return EINVAL; // unknown flags
+    if (flags & ~DB_THREAD) return EINVAL; // unknown flags
 
     if (is_db_excl && !is_db_create) return EINVAL;
     if (dbtype==DB_UNKNOWN && is_db_excl) return EINVAL;