Replaced some BDB api call parameter checking asserts

with return EINVAL
Addresses #194

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

src/tests/test_db_assert_einval.c

+/* -*- mode: C; c-basic-offset: 4 -*- */
+#ident "Copyright (c) 2007 Tokutek Inc.  All rights reserved."
+
+#include <string.h>
+#include <db.h>
+#include <assert.h>
+#include <errno.h>
+#include <sys/stat.h>
+
+#include "test.h"
+
+// DIR is defined in the Makefile
+
+typedef struct {
+	int pkey;
+	int skey;
+} RECORD;
+
+DB *dbp;
+DB_TXN *const null_txn = 0;
+DB_ENV *dbenv;
+
+void setup(u_int32_t flags) {
+    int r;
+
+    system("rm -rf " DIR);
+    mkdir(DIR, 0777);
+    /* Open/create primary */
+    r = db_create(&dbp, dbenv, 0);                                              CKERR(r);
+    if (flags) {
+        r = dbp->set_flags(dbp, flags);                                       CKERR(r);
+    }    
+    r = dbp->open(dbp, NULL, DIR "/primary.db", NULL, DB_BTREE, DB_CREATE, 0600);   CKERR(r);
+}
+
+void close_dbs() {
+    int r;
+    r = dbp->close(dbp, 0);                             CKERR(r);
+}
+
+void insert_bad_flags(u_int32_t flags, int r_expect) {
+    DBT key;
+    DBT data;
+    int r;
+    int keyint  = 0;
+    int dataint = 0;
+    
+    dbt_init(&key, &keyint, sizeof(keyint));
+    dbt_init(&data,&dataint,sizeof(dataint));
+    r = dbp->put(dbp, null_txn, &key, &data, flags);
+    CKERR2(r, r_expect);
+}
+
+void get_bad_flags(u_int32_t flags, int r_expect) {
+    DBT key;
+    DBT data;
+    int r;
+    int keyint  = 0;
+    int dataint = 0;
+    
+    dbt_init(&key, &keyint, sizeof(keyint));
+    dbt_init(&data,&dataint,sizeof(dataint));
+    r = dbp->get(dbp, null_txn, &key, &data, flags);
+    CKERR2(r, r_expect);
+}
+
+typedef struct {
+    int       skip_bdb;
+    u_int32_t db_flags;
+    u_int32_t flags;
+    int       r_expect;
+} PUT_TEST;
+
+typedef struct {
+    PUT_TEST put;
+    u_int32_t flags;
+    int     r_expect;
+} GET_TEST;
+
+PUT_TEST put_tests[] = {
+    {0, 0,                 DB_NODUPDATA, EINVAL},
+    {1, DB_DUP|DB_DUPSORT, DB_NODUPDATA, EINVAL},  //Might need to be removed later.
+};
+const int num_put = sizeof(put_tests) / sizeof(put_tests[0]);
+
+GET_TEST get_tests[] = {
+    {{1, 0,                 0, 0}, DB_GET_BOTH, EINVAL},
+    {{0, DB_DUP|DB_DUPSORT, 0, 0}, DB_GET_BOTH, 0},
+    {{0, 0,                 0, 0}, DB_RMW,      EINVAL},
+    {{0, DB_DUP|DB_DUPSORT, 0, 0}, DB_RMW,      EINVAL},
+};
+const int num_get = sizeof(get_tests) / sizeof(get_tests[0]);
+
+int main(int argc, const char *argv[]) {
+    int i;
+    
+    parse_args(argc, argv);
+    
+    for (i = 0; i < num_put; i++) {
+        if (verbose) printf("PutTest [%d]\n", i);
+#ifndef USE_TDB
+        if (!put_tests[i].skip_bdb)
+#endif
+        {
+            setup(put_tests[i].db_flags);
+            insert_bad_flags(put_tests[i].flags, put_tests[i].r_expect);
+            close_dbs();
+        }
+    }
+
+    for (i = 0; i < num_get; i++) {
+        if (verbose) printf("GetTest [%d]\n", i);
+#ifndef USE_TDB
+        if (!get_tests[i].put.skip_bdb)
+#endif
+        {
+            setup(get_tests[i].put.db_flags);
+            insert_bad_flags(get_tests[i].put.flags, get_tests[i].put.r_expect);
+            get_bad_flags(get_tests[i].flags, get_tests[i].r_expect);
+            close_dbs();
+        }
+    }
+    return 0;
+}

src/ydb.c

@@ -837,8 +837,8 @@ static int toku_db_get_noassociate(DB * db, DB_TXN * txn, DBT * key, DBT * data,
     toku_brt_get_flags(db->i->brt, &brtflags);
     if (brtflags & TOKU_DB_DUPSORT) {
 
-        if (flags != 0 && flags != DB_GET_BOTH)
-            assert(flags == 0); // We aren't ready to handle flags such as DB_GET_BOTH  or DB_READ_COMMITTED or DB_READ_UNCOMMITTED or DB_RMW
+        if (flags != 0 && flags != DB_GET_BOTH) return EINVAL;
+        // We aren't ready to handle flags such as DB_READ_COMMITTED or DB_READ_UNCOMMITTED or DB_RMW
         
         DBC *dbc;
         r = db->cursor(db, txn, &dbc, 0);
@@ -848,7 +848,7 @@ static int toku_db_get_noassociate(DB * db, DB_TXN * txn, DBT * key, DBT * data,
         if (r!=0) return r;
         return r2;
     } else {
-        assert(flags == 0);
+        if (flags != 0) return EINVAL;
         return toku_brt_lookup(db->i->brt, key, data);
     }
 }