Commit 1338a2dd authored by Leif Walsh's avatar Leif Walsh Committed by Yoni Fogel
Browse files

[t:4502] fix newbrt tests to compile with the apis that changed back this morning 

git-svn-id: file:///svn/toku/tokudb@40110 c7de825b-a66e-492c-adef-691d508d4ae1
parent 875036d1

newbrt/tests/make-tree.c

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ append_leaf(BRTNODE leafnode, void *key, size_t keylen, void *val, size_t vallen 


    // apply an insert to the leaf node

    BRT_MSG_S cmd = { BRT_INSERT, msn, xids_get_root_xids(), .u.id = { &thekey, &theval } };

    brt_leaf_apply_cmd_once(leafnode, BLB(leafnode,0), &cmd, idx, NULL, NULL);

    brt_leaf_apply_cmd_once(leafnode, BLB(leafnode,0), &cmd, idx, NULL, NULL, NULL, NULL);



    leafnode->max_msn_applied_to_node_on_disk = msn;

newbrt/tests/msnfilter.c

+4 −4
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ append_leaf(BRT brt, BRTNODE leafnode, void *key, size_t keylen, void *val, size 


    bool made_change;

    u_int64_t workdone=0;

    toku_apply_cmd_to_leaf(brt->compare_fun, brt->update_fun, &brt->h->descriptor, leafnode, &cmd, &made_change, &workdone);

    toku_apply_cmd_to_leaf(brt->compare_fun, brt->update_fun, &brt->h->descriptor, leafnode, &cmd, &made_change, &workdone, NULL, NULL);

    {

	int r = toku_brt_lookup(brt, &thekey, lookup_checkf, &pair);

	assert(r==0);
@@ -56,7 +56,7 @@ append_leaf(BRT brt, BRTNODE leafnode, void *key, size_t keylen, void *val, size 
    }



    BRT_MSG_S badcmd = { BRT_INSERT, msn, xids_get_root_xids(), .u.id = { &thekey, &badval } };

    toku_apply_cmd_to_leaf(brt->compare_fun, brt->update_fun, &brt->h->descriptor, leafnode, &badcmd, &made_change, &workdone);

    toku_apply_cmd_to_leaf(brt->compare_fun, brt->update_fun, &brt->h->descriptor, leafnode, &badcmd, &made_change, &workdone, NULL, NULL);



    

    // message should be rejected for duplicate msn, row should still have original val
@@ -69,7 +69,7 @@ append_leaf(BRT brt, BRTNODE leafnode, void *key, size_t keylen, void *val, size 
    // now verify that message with proper msn gets through

    msn = next_dummymsn();

    BRT_MSG_S cmd2 = { BRT_INSERT, msn, xids_get_root_xids(), .u.id = { &thekey, &val2 } };

    toku_apply_cmd_to_leaf(brt->compare_fun, brt->update_fun, &brt->h->descriptor, leafnode, &cmd2, &made_change, &workdone);

    toku_apply_cmd_to_leaf(brt->compare_fun, brt->update_fun, &brt->h->descriptor, leafnode, &cmd2, &made_change, &workdone, NULL, NULL);

    

    // message should be accepted, val should have new value

    {
@@ -81,7 +81,7 @@ append_leaf(BRT brt, BRTNODE leafnode, void *key, size_t keylen, void *val, size 
    // now verify that message with lesser (older) msn is rejected

    msn.msn = msn.msn - 10;

    BRT_MSG_S cmd3 = { BRT_INSERT, msn, xids_get_root_xids(), .u.id = { &thekey, &badval } };

    toku_apply_cmd_to_leaf(brt->compare_fun, brt->update_fun, &brt->h->descriptor, leafnode, &cmd3, &made_change, &workdone);

    toku_apply_cmd_to_leaf(brt->compare_fun, brt->update_fun, &brt->h->descriptor, leafnode, &cmd3, &made_change, &workdone, NULL, NULL);

    

    // message should be rejected, val should still have value in pair2

    {

newbrt/tests/orthopush-flush.c

+9 −9
Original line number Diff line number Diff line
@@ -125,10 +125,10 @@ insert_random_message_to_leaf(BRT t, BRTNODE leafnode, BASEMENTNODE blb, LEAFENT 
    msg.u.id.val = valdbt;

    size_t memsize;

    int64_t numbytes;

    int r = apply_msg_to_leafentry(&msg, NULL, &memsize, save, NULL, NULL, NULL, &numbytes);

    int r = apply_msg_to_leafentry(&msg, NULL, &memsize, save, NULL, NULL, NULL, NULL, NULL, &numbytes);

    assert_zero(r);

    bool made_change;

    brt_leaf_put_cmd(t->compare_fun, t->update_fun, NULL, leafnode, blb, &msg, &made_change, NULL);

    brt_leaf_put_cmd(t->compare_fun, t->update_fun, NULL, leafnode, blb, &msg, &made_change, NULL, NULL, NULL);

    if (msn.msn > blb->max_msn_applied.msn) {

        blb->max_msn_applied = msn;

    }
@@ -167,14 +167,14 @@ insert_same_message_to_leaves(BRT t, BRTNODE child1, BASEMENTNODE blb1, BRTNODE 
    msg.u.id.val = valdbt;

    size_t memsize;

    int64_t numbytes;

    int r = apply_msg_to_leafentry(&msg, NULL, &memsize, save, NULL, NULL, NULL, &numbytes);

    int r = apply_msg_to_leafentry(&msg, NULL, &memsize, save, NULL, NULL, NULL, NULL, NULL, &numbytes);

    assert_zero(r);

    bool made_change;

    brt_leaf_put_cmd(t->compare_fun, t->update_fun, NULL, child1, blb1, &msg, &made_change, NULL);

    brt_leaf_put_cmd(t->compare_fun, t->update_fun, NULL, child1, blb1, &msg, &made_change, NULL, NULL, NULL);

    if (msn.msn > blb1->max_msn_applied.msn) {

        blb1->max_msn_applied = msn;

    }

    brt_leaf_put_cmd(t->compare_fun, t->update_fun, NULL, child2, blb2, &msg, &made_change, NULL);

    brt_leaf_put_cmd(t->compare_fun, t->update_fun, NULL, child2, blb2, &msg, &made_change, NULL, NULL, NULL);

    if (msn.msn > blb2->max_msn_applied.msn) {

        blb2->max_msn_applied = msn;

    }
@@ -587,7 +587,7 @@ flush_to_leaf(BRT t, bool make_leaf_up_to_date, bool use_flush) { 
        for (i = 0; i < num_parent_messages; ++i) {

            if (!parent_messages_is_fresh[i]) {

                bool made_change;

                toku_apply_cmd_to_leaf(t->compare_fun, t->update_fun, &t->h->descriptor, child, parent_messages[i], &made_change, NULL);

                toku_apply_cmd_to_leaf(t->compare_fun, t->update_fun, &t->h->descriptor, child, parent_messages[i], &made_change, NULL, NULL, NULL);

            }

        }

        for (i = 0; i < 8; ++i) {
@@ -811,7 +811,7 @@ flush_to_leaf_with_keyrange(BRT t, bool make_leaf_up_to_date) { 
            if (dummy_cmp(NULL, parent_messages[i]->u.id.key, &childkeys[7]) <= 0 &&

                !parent_messages_is_fresh[i]) {

                bool made_change;

                toku_apply_cmd_to_leaf(t->compare_fun, t->update_fun, &t->h->descriptor, child, parent_messages[i], &made_change, NULL);

                toku_apply_cmd_to_leaf(t->compare_fun, t->update_fun, &t->h->descriptor, child, parent_messages[i], &made_change, NULL, NULL, NULL);

            }

        }

        for (i = 0; i < 8; ++i) {
@@ -998,8 +998,8 @@ compare_apply_and_flush(BRT t, bool make_leaf_up_to_date) { 
        for (i = 0; i < num_parent_messages; ++i) {

            if (!parent_messages_is_fresh[i]) {

                bool made_change;

                toku_apply_cmd_to_leaf(t->compare_fun, t->update_fun, &t->h->descriptor, child1, parent_messages[i], &made_change, NULL);

                toku_apply_cmd_to_leaf(t->compare_fun, t->update_fun, &t->h->descriptor, child2, parent_messages[i], &made_change, NULL);

                toku_apply_cmd_to_leaf(t->compare_fun, t->update_fun, &t->h->descriptor, child1, parent_messages[i], &made_change, NULL, NULL, NULL);

                toku_apply_cmd_to_leaf(t->compare_fun, t->update_fun, &t->h->descriptor, child2, parent_messages[i], &made_change, NULL, NULL, NULL);

            }

        }

        for (i = 0; i < 8; ++i) {

newbrt/tests/test-leafentry-nested.c

+1 −1
Original line number Diff line number Diff line
@@ -399,7 +399,7 @@ test_le_apply(ULE ule_initial, BRT_MSG msg, ULE ule_expected) { 
                               &result_memsize,

                               &le_result,

                               NULL, 

                               NULL, NULL, &ignoreme);

                               NULL, NULL, NULL, NULL, &ignoreme);

    CKERR(r);



    if (le_result)

newbrt/tests/verify-bad-msn.c

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ append_leaf(BRTNODE leafnode, void *key, size_t keylen, void *val, size_t vallen 


    // apply an insert to the leaf node

    BRT_MSG_S cmd = { BRT_INSERT, msn, xids_get_root_xids(), .u.id = { &thekey, &theval } };

    brt_leaf_apply_cmd_once(leafnode, BLB(leafnode, 0), &cmd, idx, NULL, NULL);

    brt_leaf_apply_cmd_once(leafnode, BLB(leafnode, 0), &cmd, idx, NULL, NULL, NULL, NULL);



    // Create bad tree (don't do following):

    // leafnode->max_msn_applied_to_node = msn;