fixed a bunch of clang warnings

ft/tests/ft-test-cursor.cc

@@ -94,7 +94,6 @@ PATENT RIGHTS GRANT:
 static const char *fname = TOKU_TEST_FILENAME;
 
 static TOKUTXN const null_txn = 0;
-static DB * const null_db = 0;
 
 static int test_cursor_debug = 0;
 

ft/tests/ft-test.cc

@@ -92,7 +92,6 @@ PATENT RIGHTS GRANT:
 #include "test.h"
 
 static TOKUTXN const null_txn = 0;
-static DB * const null_db = 0;
 
 static const char *fname = TOKU_TEST_FILENAME;
 

ft/tests/ft-test0.cc

@@ -92,7 +92,6 @@ PATENT RIGHTS GRANT:
 #include "test.h"
 
 static TOKUTXN const null_txn = 0;
-static DB * const null_db = 0;
 
 static void test0 (void) {
     FT_HANDLE t;

ft/tests/ft-test1.cc

@@ -92,7 +92,6 @@ PATENT RIGHTS GRANT:
 #include "test.h"
 
 static TOKUTXN const null_txn = 0;
-static DB * const null_db = 0;
 
 static void test1 (void) {
     FT_HANDLE t;

ft/tests/ft-test2.cc

@@ -92,7 +92,6 @@ PATENT RIGHTS GRANT:
 #include "test.h"
 
 static TOKUTXN const null_txn = 0;
-static DB * const null_db = 0;
 
 static void test2 (int limit) {
     FT_HANDLE t;

ft/tests/ft-test3.cc

@@ -97,7 +97,6 @@ static const char *fname = TOKU_TEST_FILENAME;
 static const enum toku_compression_method compression_method = TOKU_DEFAULT_COMPRESSION_METHOD;
 
 static TOKUTXN const null_txn = 0;
-static DB * const null_db = 0;
 
 static void test3 (int nodesize, int basementnodesize, int count) {
     FT_HANDLE t;

ft/tests/ft-test4.cc

@@ -95,7 +95,6 @@ PATENT RIGHTS GRANT:
 static const char *fname = TOKU_TEST_FILENAME;
 
 static TOKUTXN const null_txn = 0;
-static DB * const null_db = 0;
 
 static void test4 (int nodesize, int count) {
     FT_HANDLE t;

ft/tests/ft-test5.cc

@@ -92,7 +92,6 @@ PATENT RIGHTS GRANT:
 #include "test.h"
 
 static TOKUTXN const null_txn = 0;
-static DB * const null_db = 0;
 
 static void test5 (void) {
     int r;

ft/tests/keyrange.cc

@@ -96,7 +96,6 @@ PATENT RIGHTS GRANT:
 #include <unistd.h>
 
 static TOKUTXN const null_txn = 0;
-static DB * const null_db = 0;
 
 static const char *fname = TOKU_TEST_FILENAME;
 static CACHETABLE ct;

ft/tests/le-cursor-provdel.cc

@@ -95,8 +95,6 @@ PATENT RIGHTS GRANT:
 #include "le-cursor.h"
 #include "test.h"
 
-static TOKUTXN const null_txn = 0;
-static DB * const null_db = 0;
 
 static int
 get_next_callback(ITEMLEN keylen, bytevec key, ITEMLEN vallen UU(), bytevec val UU(), void *extra, bool lock_only) {

ft/tests/le-cursor-right.cc

@@ -99,7 +99,6 @@ PATENT RIGHTS GRANT:
 #include "test.h"
 
 static TOKUTXN const null_txn = 0;
-static DB * const null_db = 0;
 
 static int
 get_next_callback(ITEMLEN keylen, bytevec key, ITEMLEN vallen UU(), bytevec val UU(), void *extra, bool lock_only) {

ft/tests/le-cursor-walk.cc

@@ -97,7 +97,6 @@ PATENT RIGHTS GRANT:
 #include <unistd.h>
 
 static TOKUTXN const null_txn = 0;
-static DB * const null_db = 0;
 
 static int
 get_next_callback(ITEMLEN keylen, bytevec key, ITEMLEN vallen UU(), bytevec val UU(), void *extra, bool lock_only) {

ft/tests/orthopush-flush.cc

@@ -94,7 +94,6 @@ PATENT RIGHTS GRANT:
 #include "ule.h"
 
 static TOKUTXN const null_txn = 0;
-static DB * const null_db = 0;
 static const char *fname = TOKU_TEST_FILENAME;
 static txn_gc_info non_mvcc_gc_info(nullptr, TXNID_NONE, TXNID_NONE, false);
 static toku::comparator dummy_cmp;
@@ -320,8 +319,6 @@ insert_random_update_message(NONLEAF_CHILDINFO bnc, FT_MSG_S **save, bool is_fre
     }
 }
 
-const int M = 1024 * 1024;
-
 // flush from one internal node to another, where both only have one
 // buffer
 static void
@@ -551,29 +548,29 @@ flush_to_internal_multiple(FT_HANDLE t) {
                 MSN msn = msg->msn;
                 enum ft_msg_type type = ft_msg_get_type(msg);
                 XIDS xids = ft_msg_get_xids(msg);
-                for (int i = 0; i < num_parent_messages; ++i) {
-                    if (dummy_cmp(&keydbt, parent_messages[i]->u.id.key) == 0 &&
-                            msn.msn == parent_messages[i]->msn.msn) {
-                        assert(parent_messages_present[i] == 0);
+                for (int _i = 0; _i < num_parent_messages; ++_i) {
+                    if (dummy_cmp(&keydbt, parent_messages[_i]->u.id.key) == 0 &&
+                            msn.msn == parent_messages[_i]->msn.msn) {
+                        assert(parent_messages_present[_i] == 0);
                         assert(found == 0);
-                        assert(dummy_cmp(&valdbt, parent_messages[i]->u.id.val) == 0);
-                        assert(type == parent_messages[i]->type);
-                        assert(xids_get_innermost_xid(xids) == xids_get_innermost_xid(parent_messages[i]->xids));
-                        assert(parent_messages_is_fresh[i] == is_fresh);
-                        parent_messages_present[i]++;
+                        assert(dummy_cmp(&valdbt, parent_messages[_i]->u.id.val) == 0);
+                        assert(type == parent_messages[_i]->type);
+                        assert(xids_get_innermost_xid(xids) == xids_get_innermost_xid(parent_messages[_i]->xids));
+                        assert(parent_messages_is_fresh[_i] == is_fresh);
+                        parent_messages_present[_i]++;
                         found++;
                     }
                 }
-                for (int i = 0; i < num_child_messages; ++i) {
-                    if (dummy_cmp(&keydbt, child_messages[i]->u.id.key) == 0 &&
-                            msn.msn == child_messages[i]->msn.msn) {
-                        assert(child_messages_present[i] == 0);
+                for (int _i = 0; _i < num_child_messages; ++_i) {
+                    if (dummy_cmp(&keydbt, child_messages[_i]->u.id.key) == 0 &&
+                            msn.msn == child_messages[_i]->msn.msn) {
+                        assert(child_messages_present[_i] == 0);
                         assert(found == 0);
-                        assert(dummy_cmp(&valdbt, child_messages[i]->u.id.val) == 0);
-                        assert(type == child_messages[i]->type);
-                        assert(xids_get_innermost_xid(xids) == xids_get_innermost_xid(child_messages[i]->xids));
-                        assert(child_messages_is_fresh[i] == is_fresh);
-                        child_messages_present[i]++;
+                        assert(dummy_cmp(&valdbt, child_messages[_i]->u.id.val) == 0);
+                        assert(type == child_messages[_i]->type);
+                        assert(xids_get_innermost_xid(xids) == xids_get_innermost_xid(child_messages[_i]->xids));
+                        assert(child_messages_is_fresh[_i] == is_fresh);
+                        child_messages_present[_i]++;
                         found++;
                     }
                 }
@@ -985,10 +982,10 @@ flush_to_leaf_with_keyrange(FT_HANDLE t, bool make_leaf_up_to_date) {
             toku_fill_dbt(&keydbt, ft_msg_get_key(msg), ft_msg_get_keylen(msg));
             MSN msn = msg->msn;
             if (dummy_cmp(&keydbt, &childkeys[7]) > 0) {
-                for (int i = 0; i < num_parent_messages; ++i) {
-                    if (dummy_cmp(&keydbt, parent_messages[i]->u.id.key) == 0 &&
-                            msn.msn == parent_messages[i]->msn.msn) {
-                        assert(is_fresh == parent_messages_is_fresh[i]);
+                for (int _i = 0; _i < num_parent_messages; ++_i) {
+                    if (dummy_cmp(&keydbt, parent_messages[_i]->u.id.key) == 0 &&
+                            msn.msn == parent_messages[_i]->msn.msn) {
+                        assert(is_fresh == parent_messages_is_fresh[_i]);
                         break;
                     }
                 }

ft/tests/test-checkpoint-during-flush.cc

@@ -99,7 +99,6 @@ PATENT RIGHTS GRANT:
 #include "checkpoint.h"
 
 static TOKUTXN const null_txn = 0;
-static DB * const null_db = 0;
 
 enum { NODESIZE = 1024, KSIZE=NODESIZE-100, TOKU_PSIZE=20 };
 

ft/tests/test-checkpoint-during-merge.cc

@@ -99,7 +99,6 @@ PATENT RIGHTS GRANT:
 #include "checkpoint.h"
 
 static TOKUTXN const null_txn = 0;
-static DB * const null_db = 0;
 
 enum { NODESIZE = 1024, KSIZE=NODESIZE-100, TOKU_PSIZE=20 };
 

ft/tests/test-checkpoint-during-rebalance.cc

@@ -99,7 +99,6 @@ PATENT RIGHTS GRANT:
 #include "checkpoint.h"
 
 static TOKUTXN const null_txn = 0;
-static DB * const null_db = 0;
 
 enum { NODESIZE = 1024, KSIZE=NODESIZE-100, TOKU_PSIZE=20 };
 

ft/tests/test-checkpoint-during-split.cc

@@ -99,7 +99,6 @@ PATENT RIGHTS GRANT:
 #include "checkpoint.h"
 
 static TOKUTXN const null_txn = 0;
-static DB * const null_db = 0;
 
 enum { NODESIZE = 1024, KSIZE=NODESIZE-100, TOKU_PSIZE=20 };
 

ft/tests/test-del-inorder.cc

@@ -95,7 +95,6 @@ PATENT RIGHTS GRANT:
 
 
 static TOKUTXN const null_txn = 0;
-static DB * const null_db = 0;
 
 enum { NODESIZE = 1024, KSIZE=NODESIZE-100, TOKU_PSIZE=20 };
 

ft/tests/test-dirty-flushes-on-cleaner.cc

@@ -98,7 +98,6 @@ PATENT RIGHTS GRANT:
 
 
 static TOKUTXN const null_txn = 0;
-static DB * const null_db = 0;
 
 enum { NODESIZE = 1024, KSIZE=NODESIZE-100, TOKU_PSIZE=20 };
 

ft/tests/test-dump-ft.cc

@@ -94,7 +94,6 @@ PATENT RIGHTS GRANT:
 #include "test.h"
 
 static TOKUTXN const null_txn = 0;
-static DB * const null_db = 0;
 
 int
 test_main(int argc, const char *argv[]) {

ft/tests/test-flushes-on-cleaner.cc

@@ -98,7 +98,6 @@ PATENT RIGHTS GRANT:
 
 
 static TOKUTXN const null_txn = 0;
-static DB * const null_db = 0;
 
 enum { NODESIZE = 1024, KSIZE=NODESIZE-100, TOKU_PSIZE=20 };
 

ft/tests/test-ft-overflow.cc

@@ -97,7 +97,6 @@ PATENT RIGHTS GRANT:
 static const char *fname = TOKU_TEST_FILENAME;
 
 static TOKUTXN const null_txn = 0;
-static DB * const null_db = 0;
 
 static void
 test_overflow (void) {

ft/tests/test-hot-with-bounds.cc

@@ -99,7 +99,6 @@ PATENT RIGHTS GRANT:
 #include "checkpoint.h"
 
 static TOKUTXN const null_txn = 0;
-static DB * const null_db = 0;
 
 enum { NODESIZE = 1024, KSIZE=NODESIZE-100, TOKU_PSIZE=20 };
 

ft/tests/test-inc-split.cc

@@ -120,7 +120,6 @@ PATENT RIGHTS GRANT:
 
 
 static TOKUTXN const null_txn = 0;
-static DB * const null_db = 0;
 
 enum { NODESIZE = 1024, KSIZE=NODESIZE-100, TOKU_PSIZE=20 };
 

ft/tests/test-merges-on-cleaner.cc

@@ -97,7 +97,6 @@ PATENT RIGHTS GRANT:
 #include "checkpoint.h"
 
 static TOKUTXN const null_txn = 0;
-static DB * const null_db = 0;
 
 enum { NODESIZE = 1024, KSIZE=NODESIZE-100, TOKU_PSIZE=20 };
 

ft/tests/test-pick-child-to-flush.cc

@@ -100,7 +100,6 @@ PATENT RIGHTS GRANT:
 #include "checkpoint.h"
 
 static TOKUTXN const null_txn = 0;
-static DB * const null_db = 0;
 
 enum { NODESIZE = 1024, KSIZE=NODESIZE-100, TOKU_PSIZE=20 };
 

ft/tests/test3681.cc

@@ -101,7 +101,6 @@ PATENT RIGHTS GRANT:
 CACHETABLE ct;
 FT_HANDLE t;
 
-static DB * const null_db = 0;
 static TOKUTXN const null_txn = 0;
 
 volatile bool done = false;

ft/tests/test3856.cc

@@ -99,7 +99,6 @@ PATENT RIGHTS GRANT:
 static const char *fname = TOKU_TEST_FILENAME;
 
 static TOKUTXN const null_txn = 0;
-static DB * const null_db = 0;
 static int const nodesize = 1<<12, basementnodesize = 1<<9;
 static const enum toku_compression_method compression_method = TOKU_DEFAULT_COMPRESSION_METHOD;
 static int const count = 1000;

ft/tests/test3884.cc

@@ -111,7 +111,6 @@ static const int vallen = 64 - sizeof(long) - (sizeof(((LEAFENTRY)NULL)->type)
 #define dummy_msn_3884 ((MSN) { (uint64_t) 3884 * MIN_MSN.msn })
 
 static TOKUTXN const null_txn = 0;
-static DB * const null_db = 0;
 static const char *fname = TOKU_TEST_FILENAME;
 
 static void

ft/tests/test4115.cc

@@ -96,7 +96,6 @@ PATENT RIGHTS GRANT:
 #include <unistd.h>
 
 static TOKUTXN const null_txn = 0;
-static DB * const null_db = 0;
 
 const char *fname = TOKU_TEST_FILENAME;
 CACHETABLE ct;

ft/tests/test4244.cc

@@ -96,7 +96,6 @@ PATENT RIGHTS GRANT:
 #include <ft-cachetable-wrappers.h>
 
 static TOKUTXN const null_txn = 0;
-static DB * const null_db = 0;
 
 enum { NODESIZE = 1024, KSIZE=NODESIZE-100, TOKU_PSIZE=20 };
 

ft/tests/test_logcursor.cc

@@ -105,7 +105,6 @@ const char LOGDIR[100] = "./dir.test_logcursor";
 const int FSYNC = 1;
 const int NO_FSYNC = 0;
 
-const int envflags = DB_INIT_MPOOL|DB_CREATE|DB_THREAD |DB_INIT_LOCK|DB_INIT_LOG|DB_INIT_TXN;
 const char *namea="a.db";
 const char *nameb="b.db";
 const char *a="a";

ft/tests/upgrade_test_simple.cc

@@ -100,7 +100,6 @@ PATENT RIGHTS GRANT:
 #include "checkpoint.h"
 
 static TOKUTXN const null_txn = NULL;
-static DB * const null_db = NULL;
 
 static int
 noop_getf(ITEMLEN UU(keylen), bytevec UU(key), ITEMLEN UU(vallen), bytevec UU(val), void *extra, bool UU(lock_only))

src/tests/dump-env.cc

@@ -95,7 +95,6 @@ static DB_ENV *env;
 static DB *db;
 DB_TXN *txn;
 
-const int num_insert = 25000;
 
 static void
 setup (void) {

src/tests/hotindexer-bw.cc

@@ -103,7 +103,6 @@ static int num_rows;
 static const int FORWARD = 0;
 static const int BACKWARD = 1;
 typedef int Direction;
-static const int TXN_NONE = 0;
 static const int TXN_CREATE = 1;
 static const int TXN_END = 2;
 typedef int TxnWork;

src/tests/recover-2483.cc

@@ -94,8 +94,6 @@ PATENT RIGHTS GRANT:
 #include "test.h"
 
 
-const int envflags = DB_INIT_MPOOL|DB_CREATE|DB_THREAD |DB_INIT_LOCK|DB_INIT_LOG|DB_INIT_TXN|DB_PRIVATE;
-
 DB_ENV *env;
 DB_TXN *tid;
 DB     *db;

src/tests/recover-test2.cc

@@ -94,7 +94,6 @@ PATENT RIGHTS GRANT:
 #include "test.h"
 
 
-const int envflags = DB_INIT_MPOOL|DB_CREATE|DB_THREAD |DB_INIT_LOCK|DB_INIT_LOG|DB_INIT_TXN|DB_PRIVATE;
 const char *namea="a.db";
 
 DB_ENV *env;

src/tests/recover-test3.cc

@@ -94,7 +94,6 @@ PATENT RIGHTS GRANT:
 #include "test.h"
 
 
-const int envflags = DB_INIT_MPOOL|DB_CREATE|DB_THREAD |DB_INIT_LOCK|DB_INIT_LOG|DB_INIT_TXN|DB_PRIVATE;
 const char *namea="a.db";
 
 DB_ENV *env;

src/tests/recovery_fileops_stress.cc

@@ -104,7 +104,6 @@ DB** db_array;
 DB* states;
 static const int percent_do_op = 20;
 static const int percent_do_abort = 25;
-static const int commit_abort_ratio = 3;
 static const int start_crashing_iter = 10;
 // iterations_per_crash_in_recovery should be an odd number;
 static const int iterations_per_crash_in_recovery = 7;