Merge branch 'merge-tokudb-5.6' into 10.0-tokudb-merge

6 files changed, 40 insertions, 45 deletions

diff --git a/storage/tokudb/PerconaFT/src/indexer-undo-do.cc b/storage/tokudb/PerconaFT/src/indexer-undo-do.cc
index b93429407eb..8d0b080b9fe 100644
--- a/storage/tokudb/PerconaFT/src/indexer-undo-do.cc
+++ b/storage/tokudb/PerconaFT/src/indexer-undo-do.cc
@@ -313,7 +313,7 @@ indexer_undo_do_provisional(DB_INDEXER *indexer, DB *hotdb, struct ule_prov_info
             break;
 
         if (outermost_xid_state != TOKUTXN_LIVE && xrindex > num_committed) {
-            // if the outermost is not live, then the inner state must be retired.  thats the way that the txn API works.
+            // If the outermost is not live, then the inner state must be retired.  That's the way that the txn API works.
             assert(this_xid_state == TOKUTXN_RETIRED);
         }
 
diff --git a/storage/tokudb/PerconaFT/src/tests/rollback-inconsistency.cc b/storage/tokudb/PerconaFT/src/tests/rollback-inconsistency.cc
index 2fc05b23f0d..f8099c7a639 100644
--- a/storage/tokudb/PerconaFT/src/tests/rollback-inconsistency.cc
+++ b/storage/tokudb/PerconaFT/src/tests/rollback-inconsistency.cc
@@ -54,9 +54,9 @@ populate_table(int start, int end, DB_TXN * parent, DB_ENV * env, DB * db) {
         char str[220];
         memset(kk, 0, sizeof kk);
         memcpy(kk, &k, sizeof k);
-        memset(str,'a', sizeof str-1);
+        memset(str,'a', sizeof str);
         DBT key = { .data = kk, .size = sizeof kk };
-        DBT val = { .data = str, .size = 220 };
+        DBT val = { .data = str, .size = sizeof str };
         r = db->put(db, txn, &key, &val, 0);
         assert_zero(r);
     }
diff --git a/storage/tokudb/PerconaFT/src/tests/test_db_rowcount.cc b/storage/tokudb/PerconaFT/src/tests/test_db_rowcount.cc
index c3ebbd811bb..c440bdc59e7 100644
--- a/storage/tokudb/PerconaFT/src/tests/test_db_rowcount.cc
+++ b/storage/tokudb/PerconaFT/src/tests/test_db_rowcount.cc
@@ -83,7 +83,7 @@ static void add_records(DB* db, DB_TXN* txn, uint64_t start_id, uint64_t num) {
     for (uint64_t i = 0, j=start_id; i < num; i++,j++) {
         char key[100], val[256];
         DBT k,v;
-        snprintf(key, 100, "%08lu", j);
+        snprintf(key, 100, "%08" PRIu64, j);
         snprintf(val, 256, "%*s", 200, key);
         r =
             db->put(
@@ -105,7 +105,7 @@ static void delete_records(
     for (uint64_t i = 0, j=start_id; i < num; i++,j++) {
         char key[100];
         DBT k;
-        snprintf(key, 100, "%08lu", j);
+        snprintf(key, 100, "%08" PRIu64, j);
         r =
             db->del(
                 db,
@@ -143,7 +143,7 @@ static void test_insert_commit(DB_ENV* env) {
 
     CHECK_NUM_ROWS(num_records, stats);
     if (verbose)
-        printf("%s : before commit %lu rows\n", __FUNCTION__, stats.bt_ndata);
+        printf("%s : before commit %" PRIu64 " rows\n", __FUNCTION__, stats.bt_ndata);
 
     r = txn->commit(txn, 0); 
     assert(r == 0);
@@ -153,7 +153,7 @@ static void test_insert_commit(DB_ENV* env) {
 
     CHECK_NUM_ROWS(num_records, stats);
     if (verbose)
-        printf("%s : after commit %lu rows\n", __FUNCTION__, stats.bt_ndata);
+        printf("%s : after commit %" PRIu64 " rows\n", __FUNCTION__, stats.bt_ndata);
 
     db->close(db, 0);
 }
@@ -175,7 +175,7 @@ static void test_insert_delete_commit(DB_ENV* env) {
 
     CHECK_NUM_ROWS(num_records, stats);
     if (verbose)
-        printf("%s : before delete %lu rows\n", __FUNCTION__, stats.bt_ndata);
+        printf("%s : before delete %" PRIu64 " rows\n", __FUNCTION__, stats.bt_ndata);
 
     delete_records(db, txn, 0, num_records);
 
@@ -184,7 +184,7 @@ static void test_insert_delete_commit(DB_ENV* env) {
 
     CHECK_NUM_ROWS(0, stats);
     if (verbose)
-        printf("%s : after delete %lu rows\n", __FUNCTION__, stats.bt_ndata);
+        printf("%s : after delete %" PRIu64 " rows\n", __FUNCTION__, stats.bt_ndata);
 
     r = txn->commit(txn, 0);
     assert(r == 0);
@@ -194,7 +194,7 @@ static void test_insert_delete_commit(DB_ENV* env) {
 
     CHECK_NUM_ROWS(0, stats);
     if (verbose)
-        printf("%s : after commit %lu rows\n", __FUNCTION__, stats.bt_ndata);
+        printf("%s : after commit %" PRIu64 " rows\n", __FUNCTION__, stats.bt_ndata);
 
     db->close(db, 0);
 }
@@ -217,7 +217,7 @@ static void test_insert_commit_delete_commit(DB_ENV* env) {
     CHECK_NUM_ROWS(num_records, stats);
     if (verbose)
         printf(
-            "%s : before insert commit %lu rows\n",
+            "%s : before insert commit %" PRIu64 " rows\n",
             __FUNCTION__,
             stats.bt_ndata);
 
@@ -230,7 +230,7 @@ static void test_insert_commit_delete_commit(DB_ENV* env) {
     CHECK_NUM_ROWS(num_records, stats);
     if (verbose)
         printf(
-            "%s : after insert commit %lu rows\n",
+            "%s : after insert commit %" PRIu64 " rows\n",
             __FUNCTION__,
             stats.bt_ndata);
 
@@ -244,7 +244,7 @@ static void test_insert_commit_delete_commit(DB_ENV* env) {
 
     CHECK_NUM_ROWS(0, stats);
     if (verbose)
-        printf("%s : after delete %lu rows\n", __FUNCTION__, stats.bt_ndata);
+        printf("%s : after delete %" PRIu64 " rows\n", __FUNCTION__, stats.bt_ndata);
 
     r = txn->commit(txn, 0);
     assert(r == 0);
@@ -255,7 +255,7 @@ static void test_insert_commit_delete_commit(DB_ENV* env) {
     CHECK_NUM_ROWS(0, stats);
     if (verbose)
         printf(
-            "%s : after delete commit %lu rows\n",
+            "%s : after delete commit %" PRIu64 " rows\n",
             __FUNCTION__,
             stats.bt_ndata);
 
@@ -279,7 +279,7 @@ static void test_insert_rollback(DB_ENV* env) {
 
     CHECK_NUM_ROWS(num_records, stats);
     if (verbose)
-        printf("%s : before rollback %lu rows\n", __FUNCTION__, stats.bt_ndata);
+        printf("%s : before rollback %" PRIu64 " rows\n", __FUNCTION__, stats.bt_ndata);
 
     r = txn->abort(txn);
     assert(r == 0);
@@ -292,7 +292,7 @@ static void test_insert_rollback(DB_ENV* env) {
     // MESSAGES ARE "IN-FLIGHT" IN THE TREE AND MUST BE APPLIED IN ORDER TO
     // CORRECT THE RUNNING LOGICAL COUNT
     if (verbose)
-        printf("%s : after rollback %lu rows\n", __FUNCTION__, stats.bt_ndata);
+        printf("%s : after rollback %" PRIu64 " rows\n", __FUNCTION__, stats.bt_ndata);
 
     full_optimize(db);
 
@@ -302,7 +302,7 @@ static void test_insert_rollback(DB_ENV* env) {
     CHECK_NUM_ROWS(0, stats);
     if (verbose)
         printf(
-            "%s : after rollback optimize %lu rows\n",
+            "%s : after rollback optimize %" PRIu64 " rows\n",
             __FUNCTION__,
             stats.bt_ndata);
 
@@ -326,7 +326,7 @@ static void test_insert_delete_rollback(DB_ENV* env) {
 
     CHECK_NUM_ROWS(num_records, stats);
     if (verbose)
-        printf("%s : before delete %lu rows\n", __FUNCTION__, stats.bt_ndata);
+        printf("%s : before delete %" PRIu64 " rows\n", __FUNCTION__, stats.bt_ndata);
 
     delete_records(db, txn, 0, num_records);
 
@@ -335,7 +335,7 @@ static void test_insert_delete_rollback(DB_ENV* env) {
 
     CHECK_NUM_ROWS(0, stats);
     if (verbose)
-        printf("%s : after delete %lu rows\n", __FUNCTION__, stats.bt_ndata);
+        printf("%s : after delete %" PRIu64 " rows\n", __FUNCTION__, stats.bt_ndata);
 
     r = txn->abort(txn); 
     assert(r == 0);
@@ -345,7 +345,7 @@ static void test_insert_delete_rollback(DB_ENV* env) {
 
     CHECK_NUM_ROWS(0, stats);
     if (verbose)
-        printf("%s : after commit %lu rows\n", __FUNCTION__, stats.bt_ndata);
+        printf("%s : after commit %" PRIu64 " rows\n", __FUNCTION__, stats.bt_ndata);
 
     db->close(db, 0);
 }
@@ -368,7 +368,7 @@ static void test_insert_commit_delete_rollback(DB_ENV* env) {
     CHECK_NUM_ROWS(num_records, stats);
     if (verbose)
         printf(
-            "%s : before insert commit %lu rows\n",
+            "%s : before insert commit %" PRIu64 " rows\n",
             __FUNCTION__,
             stats.bt_ndata);
 
@@ -381,7 +381,7 @@ static void test_insert_commit_delete_rollback(DB_ENV* env) {
     CHECK_NUM_ROWS(num_records, stats);
     if (verbose)
         printf(
-            "%s : after insert commit %lu rows\n",
+            "%s : after insert commit %" PRIu64 " rows\n",
             __FUNCTION__,
             stats.bt_ndata);
 
@@ -395,7 +395,7 @@ static void test_insert_commit_delete_rollback(DB_ENV* env) {
 
     CHECK_NUM_ROWS(0, stats);
     if (verbose)
-        printf("%s : after delete %lu rows\n", __FUNCTION__, stats.bt_ndata);
+        printf("%s : after delete %" PRIu64 " rows\n", __FUNCTION__, stats.bt_ndata);
 
     r = txn->abort(txn); 
     assert(r == 0);
@@ -409,7 +409,7 @@ static void test_insert_commit_delete_rollback(DB_ENV* env) {
     // CORRECT THE RUNNING LOGICAL COUNT
     if (verbose)
         printf(
-            "%s : after delete rollback %lu rows\n",
+            "%s : after delete rollback %" PRIu64 " rows\n",
             __FUNCTION__,
             stats.bt_ndata);
 
@@ -421,17 +421,12 @@ static void test_insert_commit_delete_rollback(DB_ENV* env) {
     CHECK_NUM_ROWS(num_records, stats);
     if (verbose)
         printf(
-            "%s : after delete rollback optimize %lu rows\n",
+            "%s : after delete rollback optimize %" PRIu64 " rows\n",
             __FUNCTION__,
             stats.bt_ndata);
 
     db->close(db, 0);
 }
-static inline uint64_t time_in_microsec() {
-    struct timeval t;
-    gettimeofday(&t, NULL);
-    return t.tv_sec * (1UL * 1000 * 1000) + t.tv_usec;
-}
 
 static int test_recount_insert_commit_progress(
     uint64_t count,
@@ -440,7 +435,7 @@ static int test_recount_insert_commit_progress(
 
     if (verbose)
         printf(
-            "%s : count[%lu] deleted[%lu]\n",
+            "%s : count[%" PRIu64 "] deleted[%" PRIu64 "]\n",
             __FUNCTION__,
             count,
             deleted);
@@ -469,7 +464,7 @@ static void test_recount_insert_commit(DB_ENV* env) {
     CHECK_NUM_ROWS(num_records, stats);
     if (verbose)
         printf(
-            "%s : before commit %lu rows\n",
+            "%s : before commit %" PRIu64 " rows\n",
             __FUNCTION__,
             stats.bt_ndata);
 
@@ -481,7 +476,7 @@ static void test_recount_insert_commit(DB_ENV* env) {
 
     CHECK_NUM_ROWS(num_records, stats);
     if (verbose)
-        printf("%s : after commit %lu rows\n", __FUNCTION__, stats.bt_ndata);
+        printf("%s : after commit %" PRIu64 " rows\n", __FUNCTION__, stats.bt_ndata);
 
     // test that recount counted correct # of rows
     r = db->recount_rows(db, test_recount_insert_commit_progress, NULL);
diff --git a/storage/tokudb/PerconaFT/src/tests/txn_manager_handle_snapshot_atomicity.cc b/storage/tokudb/PerconaFT/src/tests/txn_manager_handle_snapshot_atomicity.cc
index b55610757e2..30cc16d73a7 100644
--- a/storage/tokudb/PerconaFT/src/tests/txn_manager_handle_snapshot_atomicity.cc
+++ b/storage/tokudb/PerconaFT/src/tests/txn_manager_handle_snapshot_atomicity.cc
@@ -92,19 +92,19 @@ struct start_txn_arg {
 
 static struct test_sync sync_s;
 
-static void test_callback(uint64_t self_tid, void * extra) {
+static void test_callback(pthread_t self_tid, void * extra) {
     pthread_t **p = (pthread_t **) extra;
     pthread_t tid_1 = *p[0];
     pthread_t tid_2 = *p[1];
-    assert(self_tid == tid_2);
-    printf("%s: the thread[%" PRIu64 "] is going to wait...\n", __func__, tid_1);
+    assert(pthread_equal(self_tid, tid_2));
+    printf("%s: the thread[%" PRIu64 "] is going to wait...\n", __func__, reinterpret_cast<uint64_t>(tid_1));
     test_sync_next_state(&sync_s);
     sleep(3);
     //test_sync_sleep(&sync_s,3);
     //using test_sync_sleep/test_sync_next_state pair can sync threads better, however
     //after the fix, this might cause a deadlock. just simply use sleep to do a proof-
     //of-concept test. 
-    printf("%s: the thread[%" PRIu64 "] is resuming...\n", __func__, tid_1);
+    printf("%s: the thread[%" PRIu64 "] is resuming...\n", __func__, reinterpret_cast<uint64_t>(tid_1));
     return;
 }
 
@@ -114,7 +114,7 @@ static void * start_txn2(void * extra) {
     DB * db = args->db;
     DB_TXN * parent = args->parent;
     test_sync_sleep(&sync_s, 1);
-    printf("start %s [thread %" PRIu64 "]\n", __func__, pthread_self());
+    printf("start %s [thread %" PRIu64 "]\n", __func__, reinterpret_cast<uint64_t>(pthread_self()));
     DB_TXN *txn;
     int r = env->txn_begin(env, parent, &txn,  DB_READ_COMMITTED);
     assert(r == 0);
@@ -127,7 +127,7 @@ static void * start_txn2(void * extra) {
    
     r = txn->commit(txn, 0);
     assert(r == 0);
-    printf("%s done[thread %" PRIu64 "]\n", __func__, pthread_self());
+    printf("%s done[thread %" PRIu64 "]\n", __func__, reinterpret_cast<uint64_t>(pthread_self()));
     return extra;
 }
 
@@ -135,14 +135,14 @@ static void * start_txn1(void * extra) {
     struct start_txn_arg * args = (struct start_txn_arg *) extra;
     DB_ENV * env = args -> env;
     DB * db = args->db;
-    printf("start %s: [thread %" PRIu64 "]\n", __func__, pthread_self());
+    printf("start %s: [thread %" PRIu64 "]\n", __func__, reinterpret_cast<uint64_t>(pthread_self()));
     DB_TXN *txn;
     int r = env->txn_begin(env, NULL, &txn,  DB_READ_COMMITTED);
     assert(r == 0);
-    printf("%s: txn began by [thread %" PRIu64 "], will wait\n", __func__, pthread_self());
+    printf("%s: txn began by [thread %" PRIu64 "], will wait\n", __func__, reinterpret_cast<uint64_t>(pthread_self()));
     test_sync_next_state(&sync_s);
     test_sync_sleep(&sync_s,2);
-    printf("%s: [thread %" PRIu64 "] resumed\n", __func__, pthread_self());
+    printf("%s: [thread %" PRIu64 "] resumed\n", __func__, reinterpret_cast<uint64_t>(pthread_self()));
     //do some random things...
     DBT key, data;
     dbt_init(&key, "hello", 6);
@@ -151,7 +151,7 @@ static void * start_txn1(void * extra) {
     db->get(db, txn, &key, &data, 0);
     r = txn->commit(txn, 0);
     assert(r == 0);
-    printf("%s: done[thread %" PRIu64 "]\n", __func__, pthread_self());
+    printf("%s: done[thread %" PRIu64 "]\n", __func__, reinterpret_cast<uint64_t>(pthread_self()));
     //test_sync_next_state(&sync_s);
     return extra;
 }
diff --git a/storage/tokudb/PerconaFT/src/ydb.cc b/storage/tokudb/PerconaFT/src/ydb.cc
index 61ce5a8476e..55da418a0de 100644
--- a/storage/tokudb/PerconaFT/src/ydb.cc
+++ b/storage/tokudb/PerconaFT/src/ydb.cc
@@ -3148,7 +3148,7 @@ toku_test_get_latest_lsn(DB_ENV *env) {
     return rval.lsn;
 }
 
-void toku_set_test_txn_sync_callback(void (* cb) (uint64_t, void *), void * extra) {
+void toku_set_test_txn_sync_callback(void (* cb) (pthread_t, void *), void * extra) {
     set_test_txn_sync_callback(cb, extra);
 }
 
diff --git a/storage/tokudb/PerconaFT/src/ydb.h b/storage/tokudb/PerconaFT/src/ydb.h
index bd2902e6c6e..facbfdc9252 100644
--- a/storage/tokudb/PerconaFT/src/ydb.h
+++ b/storage/tokudb/PerconaFT/src/ydb.h
@@ -60,4 +60,4 @@ extern "C" uint64_t toku_test_get_latest_lsn(DB_ENV *env) __attribute__((__visib
 extern "C" int toku_test_get_checkpointing_user_data_status(void) __attribute__((__visibility__("default")));
 
 // test-only function
-extern "C" void toku_set_test_txn_sync_callback(void (* ) (uint64_t, void *), void * extra) __attribute__((__visibility__("default")));
+extern "C" void toku_set_test_txn_sync_callback(void (* ) (pthread_t, void *), void * extra) __attribute__((__visibility__("default")));