[t:4527],[t:4528], merge fixes to main

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

newbrt/brt.c

@@ -835,8 +835,9 @@ int toku_brtnode_pe_callback (void *brtnode_pv, PAIR_ATTR UU(old_attr), PAIR_ATT
 }
 
 static inline void
-brt_status_update_partial_fetch(u_int8_t state)
+brt_status_update_partial_fetch(u_int8_t UU(state))
 {
+#if 0
     if (state == PT_AVAIL) {
         STATUS_VALUE(BRT_PARTIAL_FETCH_HIT)++;
     }
@@ -849,6 +850,7 @@ brt_status_update_partial_fetch(u_int8_t state)
     else {
         invariant(FALSE);
     }
+#endif
 }
 
 // Callback that states if a partial fetch of the node is necessary
@@ -930,12 +932,13 @@ BOOL toku_brtnode_pf_req_callback(void* brtnode_pv, void* read_extraargs) {
 
 static void
 brt_status_update_partial_fetch_reason(
-    struct brtnode_fetch_extra *bfe,
-    int i,
-    int state,
-    BOOL is_leaf
+    struct brtnode_fetch_extra* UU(bfe),
+    int UU(i),
+    int UU(state),
+    BOOL UU(is_leaf)
     )
 {
+#if 0
     invariant(state == PT_COMPRESSED || state == PT_ON_DISK);
     if (is_leaf) {
         if (bfe->type == brtnode_fetch_prefetch) {
@@ -991,6 +994,7 @@ brt_status_update_partial_fetch_reason(
             }
         }
     }
+#endif
 }
 
 // callback for partially reading a node
@@ -5283,7 +5287,7 @@ toku_brt_search (BRT brt, brt_search_t *search, BRT_GET_CALLBACK_FUNCTION getf,
 {
     int r;
     uint trycount = 0;     // How many tries did it take to get the result?
-    uint root_tries = 0;   // How many times did we fetch the root node from disk?
+    //uint root_tries = 0;   // How many times did we fetch the root node from disk?
     uint tree_height;      // How high is the tree?  This is the height of the root node plus one (leaf is at height 0).
 
 try_again:
@@ -5395,7 +5399,7 @@ toku_brt_search (BRT brt, brt_search_t *search, BRT_GET_CALLBACK_FUNCTION getf,
         int r2 = getf(0,NULL, 0,NULL, getf_v, false);
         if (r2!=0) r = r2;
     }
-
+#if 0
     {   // accounting (to detect and measure thrashing)
         uint retrycount = trycount - 1;         // how many retries were needed?
         STATUS_VALUE(BRT_TOTAL_SEARCHES)++;
@@ -5414,7 +5418,7 @@ toku_brt_search (BRT brt, brt_search_t *search, BRT_GET_CALLBACK_FUNCTION getf,
                 STATUS_VALUE(BRT_SEARCH_TRIES_GT_HEIGHTPLUS3)++;
         }
     }
-
+#endif
     return r;
 }
 

newbrt/cachetable.h

@@ -470,9 +470,7 @@ void toku_cachetable_maybe_flush_some(CACHETABLE ct);
 u_int64_t toku_cachefile_size_in_memory(CACHEFILE cf);
 
 typedef enum {
-    CT_LOCK_TAKEN = 0,
-    CT_LOCK_RELEASED,
-    CT_HIT,
+    CT_HIT = 0,
     CT_MISS,
     CT_MISSTIME,               // how many usec spent waiting for disk read because of cache miss
     CT_WAITTIME,               // how many usec spent waiting for another thread to release cache line

newbrt/tests/cachetable-3969.c

@@ -50,7 +50,7 @@ run_test (void) {
     r = toku_cachetable_get_and_pin(f1, make_blocknum(1), 1, &v2, &s2, def_write_callback(NULL), def_fetch, def_pf_req_callback, def_pf_callback, NULL);
     r = toku_cachetable_begin_checkpoint(ct, NULL);
     // mark nodes as pending a checkpoint, so that get_and_pin_nonblocking on block 1 will return TOKUDB_TRY_AGAIN
-    r = toku_cachetable_unpin(f1, make_blocknum(1), 1, CACHETABLE_CLEAN, make_pair_attr(8)); assert(r==0);
+    r = toku_cachetable_unpin(f1, make_blocknum(1), 1, CACHETABLE_DIRTY, make_pair_attr(8)); assert(r==0);
 
     r = toku_cachetable_get_and_pin(f1, make_blocknum(2), 2, &v2, &s2, def_write_callback(NULL), def_fetch, def_pf_req_callback, def_pf_callback, NULL);
     // now we try to pin 1, and it should get evicted out from under us

newbrt/tests/cachetable-debug-test.c

@@ -49,8 +49,6 @@ cachetable_debug_test (int n) {
     }
     toku_cachetable_verify(ct);
 
-    if (verbose) toku_cachetable_print_hash_histogram();
-
     r = toku_cachefile_close(&f1, 0, FALSE, ZERO_LSN); assert(r == 0 && f1 == 0);
     r = toku_cachetable_close(&ct); assert(r == 0 && ct == 0);
 }

newbrt/tests/cachetable-pin-nonblocking-checkpoint-clean.c

+#ident "$Id: cachetable-3969.c 39504 2012-02-03 16:19:33Z zardosht $"
+#ident "Copyright (c) 2007-2011 Tokutek Inc.  All rights reserved."
+#include "includes.h"
+#include "test.h"
+
+CACHETABLE ct;
+
+CACHEFILE f1;
+
+
+static void
+run_test (void) {
+    const int test_limit = 20;
+    int r;
+    ct = NULL;
+    r = toku_create_cachetable(&ct, test_limit, ZERO_LSN, NULL_LOGGER); assert(r == 0);
+    char fname1[] = __FILE__ "test1.dat";
+    unlink(fname1);
+    f1 = NULL;
+    r = toku_cachetable_openf(&f1, ct, fname1, O_RDWR|O_CREAT, S_IRWXU|S_IRWXG|S_IRWXO); assert(r == 0);
+    
+    void* v1;
+    void* v2;
+    long s1;
+    long s2;
+    
+    r = toku_cachetable_get_and_pin(f1, make_blocknum(1), 1, &v1, &s1, def_write_callback(NULL), def_fetch, def_pf_req_callback, def_pf_callback, NULL);
+    r = toku_cachetable_unpin(f1, make_blocknum(1), 1, CACHETABLE_CLEAN, make_pair_attr(8)); assert(r==0);
+
+    for (int i = 0; i < 20; i++) {
+        r = toku_cachetable_get_and_pin(f1, make_blocknum(2), 2, &v2, &s2, def_write_callback(NULL), def_fetch, def_pf_req_callback, def_pf_callback, NULL);
+        r = toku_cachetable_unpin(f1, make_blocknum(2), 2, CACHETABLE_CLEAN, make_pair_attr(8)); assert(r==0);
+    }
+
+    r = toku_cachetable_get_and_pin(f1, make_blocknum(1), 1, &v2, &s2, def_write_callback(NULL), def_fetch, def_pf_req_callback, def_pf_callback, NULL);
+    r = toku_cachetable_begin_checkpoint(ct, NULL);
+    // mark nodes as pending a checkpoint, so that get_and_pin_nonblocking on block 1 will return TOKUDB_TRY_AGAIN
+    r = toku_cachetable_unpin(f1, make_blocknum(1), 1, CACHETABLE_CLEAN, make_pair_attr(8)); assert(r==0);
+
+    r = toku_cachetable_get_and_pin_nonblocking(
+        f1,
+        make_blocknum(1),
+        1,
+        &v1,
+        &s1,
+        def_write_callback(NULL),
+        def_fetch,
+        def_pf_req_callback,
+        def_pf_callback,
+        NULL,
+        NULL
+        );
+    assert(r==0);
+    r = toku_cachetable_unpin(f1, make_blocknum(1), 1, CACHETABLE_CLEAN, make_pair_attr(8)); assert(r==0);
+    
+    r = toku_cachetable_end_checkpoint(
+        ct, 
+        NULL, 
+        fake_ydb_lock,
+        fake_ydb_unlock,
+        NULL,
+        NULL
+        );
+    assert(r==0);
+    
+    toku_cachetable_verify(ct);
+    r = toku_cachefile_close(&f1, 0, FALSE, ZERO_LSN); assert(r == 0 && f1 == 0);
+    r = toku_cachetable_close(&ct); lazy_assert_zero(r);
+    
+    
+}
+
+int
+test_main(int argc, const char *argv[]) {
+  default_parse_args(argc, argv);
+  run_test();
+  return 0;
+}

src/ydb_cursor.c

@@ -196,7 +196,7 @@ static int
 toku_c_getf_first(DBC *c, u_int32_t flag, YDB_CALLBACK_FUNCTION f, void *extra) {
     HANDLE_PANICKED_DB(c->dbp);
     HANDLE_CURSOR_ILLEGAL_WORKING_PARENT_TXN(c);
-    STATUS_VALUE(YDB_C_LAYER_NUM_POINT_QUERIES)++;
+    //STATUS_VALUE(YDB_C_LAYER_NUM_POINT_QUERIES)++;
     int r = 0;
     QUERY_CONTEXT_S context; //Describes the context of this query.
     c_query_context_init(&context, c, flag, f, extra);
@@ -249,7 +249,7 @@ static int
 toku_c_getf_last(DBC *c, u_int32_t flag, YDB_CALLBACK_FUNCTION f, void *extra) {
     HANDLE_PANICKED_DB(c->dbp);
     HANDLE_CURSOR_ILLEGAL_WORKING_PARENT_TXN(c);
-    STATUS_VALUE(YDB_C_LAYER_NUM_POINT_QUERIES)++;
+    //STATUS_VALUE(YDB_C_LAYER_NUM_POINT_QUERIES)++;
     int r = 0;
     QUERY_CONTEXT_S context; //Describes the context of this query.
     c_query_context_init(&context, c, flag, f, extra); 
@@ -347,7 +347,7 @@ c_getf_next_callback(ITEMLEN keylen, bytevec key, ITEMLEN vallen, bytevec val, v
 
     //Call application-layer callback if found and locks were successfully obtained.
     if (r==0 && key!=NULL && !lock_only) {
-        STATUS_VALUE(YDB_C_LAYER_NUM_SEQUENTIAL_QUERIES)++;  // accountability
+        //STATUS_VALUE(YDB_C_LAYER_NUM_SEQUENTIAL_QUERIES)++;  // accountability
         DBT found_val = { .data = (void *) val, .size = vallen };
         context->r_user_callback = context->f(&found_key, &found_val, context->f_extra);
         r = context->r_user_callback;
@@ -407,7 +407,7 @@ c_getf_prev_callback(ITEMLEN keylen, bytevec key, ITEMLEN vallen, bytevec val, v
 
     //Call application-layer callback if found and locks were successfully obtained.
     if (r==0 && key!=NULL && !lock_only) {
-        STATUS_VALUE(YDB_C_LAYER_NUM_SEQUENTIAL_QUERIES)++;  // accountability
+        //STATUS_VALUE(YDB_C_LAYER_NUM_SEQUENTIAL_QUERIES)++;  // accountability
         DBT found_val = { .data = (void *) val, .size = vallen };
         context->r_user_callback = context->f(&found_key, &found_val, context->f_extra);
         r = context->r_user_callback;
@@ -425,7 +425,7 @@ toku_c_getf_current(DBC *c, u_int32_t flag, YDB_CALLBACK_FUNCTION f, void *extra
     HANDLE_CURSOR_ILLEGAL_WORKING_PARENT_TXN(c);
 
     QUERY_CONTEXT_S context; //Describes the context of this query.
-    STATUS_VALUE(YDB_C_LAYER_NUM_SEQUENTIAL_QUERIES)++;  // accountability
+    //STATUS_VALUE(YDB_C_LAYER_NUM_SEQUENTIAL_QUERIES)++;  // accountability
     c_query_context_init(&context, c, flag, f, extra); 
     //toku_brt_cursor_current will call c_getf_current_callback(..., context) (if query is successful)
     int r = toku_brt_cursor_current(dbc_struct_i(c)->c, DB_CURRENT, c_getf_current_callback, &context);
@@ -461,7 +461,7 @@ toku_c_getf_current_binding(DBC *c, u_int32_t flag, YDB_CALLBACK_FUNCTION f, voi
     HANDLE_CURSOR_ILLEGAL_WORKING_PARENT_TXN(c);
 
     QUERY_CONTEXT_S context; //Describes the context of this query.
-    STATUS_VALUE(YDB_C_LAYER_NUM_SEQUENTIAL_QUERIES)++;  // accountability
+    //STATUS_VALUE(YDB_C_LAYER_NUM_SEQUENTIAL_QUERIES)++;  // accountability
     c_query_context_init(&context, c, flag, f, extra); 
     //toku_brt_cursor_current will call c_getf_current_callback(..., context) (if query is successful)
     int r = toku_brt_cursor_current(dbc_struct_i(c)->c, DB_CURRENT_BINDING, c_getf_current_callback, &context);
@@ -479,7 +479,7 @@ toku_c_getf_set(DBC *c, u_int32_t flag, DBT *key, YDB_CALLBACK_FUNCTION f, void
 
     int r = 0;
     QUERY_CONTEXT_WITH_INPUT_S context; //Describes the context of this query.
-    STATUS_VALUE(YDB_C_LAYER_NUM_POINT_QUERIES)++;
+    //STATUS_VALUE(YDB_C_LAYER_NUM_POINT_QUERIES)++;
     query_context_with_input_init(&context, c, flag, key, NULL, f, extra); 
     while (r == 0) {
         //toku_brt_cursor_set will call c_getf_set_callback(..., context) (if query is successful)
@@ -534,7 +534,7 @@ toku_c_getf_set_range(DBC *c, u_int32_t flag, DBT *key, YDB_CALLBACK_FUNCTION f,
 
     int r = 0;
     QUERY_CONTEXT_WITH_INPUT_S context; //Describes the context of this query.
-    STATUS_VALUE(YDB_C_LAYER_NUM_POINT_QUERIES)++;
+    //STATUS_VALUE(YDB_C_LAYER_NUM_POINT_QUERIES)++;
     query_context_with_input_init(&context, c, flag, key, NULL, f, extra); 
     while (r == 0) {
         //toku_brt_cursor_set_range will call c_getf_set_range_callback(..., context) (if query is successful)
@@ -592,7 +592,7 @@ toku_c_getf_set_range_reverse(DBC *c, u_int32_t flag, DBT *key, YDB_CALLBACK_FUN
 
     int r = 0;
     QUERY_CONTEXT_WITH_INPUT_S context; //Describes the context of this query.
-    STATUS_VALUE(YDB_C_LAYER_NUM_POINT_QUERIES)++;
+    //STATUS_VALUE(YDB_C_LAYER_NUM_POINT_QUERIES)++;
     query_context_with_input_init(&context, c, flag, key, NULL, f, extra); 
     while (r == 0) {
         //toku_brt_cursor_set_range_reverse will call c_getf_set_range_reverse_callback(..., context) (if query is successful)