Commit 67828ac0 authored by Christian Rober's avatar Christian Rober Committed by Yoni Fogel
Browse files

[t:4502] Merged new Garbage Collection to main, one test, stat64-root-changes... 

[t:4502] Merged new Garbage Collection to main, one test, stat64-root-changes fails, but just needs to be updated now that GC is removed from message application.

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

newbrt/brt-internal.h

+3 −11
Original line number Diff line number Diff line
@@ -912,8 +912,6 @@ brt_leaf_apply_cmd_once ( 
    const BRT_MSG cmd,

    u_int32_t idx,

    LEAFENTRY le,

    OMT snapshot_txnids,

    OMT live_list_reverse,

    uint64_t *workdonep

    );
@@ -927,9 +925,7 @@ brt_leaf_put_cmd ( 
    BASEMENTNODE bn, 

    BRT_MSG cmd, 

    bool* made_change,

    uint64_t *workdone,

    OMT snapshot_txnids,

    OMT live_list_reverse

    uint64_t *workdone

    );



void toku_apply_cmd_to_leaf(
@@ -939,9 +935,7 @@ void toku_apply_cmd_to_leaf( 
    BRTNODE node, 

    BRT_MSG cmd, 

    bool *made_change, 

    uint64_t *workdone, 

    OMT snapshot_txnids, 

    OMT live_list_reverse

    uint64_t *workdone

    );



// FIXME needs toku prefix
@@ -951,9 +945,7 @@ void brtnode_put_cmd ( 
    DESCRIPTOR desc,

    BRTNODE node, 

    BRT_MSG cmd, 

    bool is_fresh, 

    OMT snapshot_txnids, 

    OMT live_list_reverse

    bool is_fresh

    );



void toku_reset_root_xid_that_created(BRT brt, TXNID new_root_xid_that_created);

newbrt/brt-test-helpers.c

+1 −3
Original line number Diff line number Diff line
@@ -143,9 +143,7 @@ int toku_testsetup_insert_to_leaf (BRT brt, BLOCKNUM blocknum, char *key, int ke 
        &brt->h->descriptor,

        node,

        &cmd,

        true, 

        NULL, 

        NULL

        true

        );    



    toku_verify_or_set_counts(node);

newbrt/brt.c

+179 −88

File changed.

Preview size limit exceeded, changes collapsed.

newbrt/brtloader.c

+1 −1
Original line number Diff line number Diff line
@@ -2788,7 +2788,7 @@ static void add_pair_to_leafnode (struct leaf_buf *lbuf, unsigned char *key, int 
    DBT theval = { .data = val, .size = vallen };

    BRT_MSG_S cmd = { BRT_INSERT, ZERO_MSN, lbuf->xids, .u.id = { &thekey, &theval } };

    uint64_t workdone=0;

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

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

}



static int write_literal(struct dbout *out, void*data,  size_t len) {

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, NULL, NULL);

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



    leafnode->max_msn_applied_to_node_on_disk = msn;