mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-02 03:51:50 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

[t:4874], remove dependence of ydb lock from h->live_brts and live->txns

Browse source 
git-svn-id: file:///svn/toku/tokudb@43433 c7de825b-a66e-492c-adef-691d508d4ae1
This commit is contained in:
Zardosht Kasheff 2013-04-17 00:00:28 -04:00 • committed by Yoni Fogel
parent 20d141c02d
commit b5084ff8a0
3 changed files with 71 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

69
newbrt/brt_header.c
View file

@ -19,6 +19,19 @@ toku_brt_header_suppress_rollbacks(struct brt_header *h, TOKUTXN txn) {
h->root_that_created_or_locked_when_empty = rootid;
}
void
toku_reset_root_xid_that_created(struct brt_header* h, TXNID new_root_xid_that_created) {
// Reset the root_xid_that_created field to the given value.
// This redefines which xid created the dictionary.
// hold lock around setting and clearing of dirty bit
// (see cooperative use of dirty bit in brtheader_begin_checkpoint())
toku_brtheader_lock (h);
h->root_xid_that_created = new_root_xid_that_created;
h->dirty = 1;
toku_brtheader_unlock (h);
}
static void
brtheader_destroy(struct brt_header *h) {
if (!h->panic) assert(!h->checkpoint_header);
@ -804,17 +817,51 @@ cleanup:
return r;
}
void
toku_reset_root_xid_that_created(struct brt_header* h, TXNID new_root_xid_that_created) {
// Reset the root_xid_that_created field to the given value.
// This redefines which xid created the dictionary.
// hold lock around setting and clearing of dirty bit
// (see cooperative use of dirty bit in brtheader_begin_checkpoint())
toku_brtheader_lock (h);
h->root_xid_that_created = new_root_xid_that_created;
h->dirty = 1;
toku_brtheader_unlock (h);
//Heaviside function to find a TOKUTXN by TOKUTXN (used to find the index)
static int find_xid (OMTVALUE v, void *txnv) {
TOKUTXN txn = v;
TOKUTXN txnfind = txnv;
if (txn->txnid64<txnfind->txnid64) return -1;
if (txn->txnid64>txnfind->txnid64) return +1;
return 0;
}
void
toku_brtheader_maybe_add_txn_ref(struct brt_header* h, TOKUTXN txn) {
OMTVALUE txnv;
u_int32_t index;
toku_brtheader_lock(h);
// Does brt already know about transaction txn?
int r = toku_omt_find_zero(h->txns, find_xid, txn, &txnv, &index);
if (r==0) {
// It's already there.
assert((TOKUTXN)txnv==txn);
return 0;
}
// Otherwise it's not there.
// Insert reference to transaction into brt
r = toku_omt_insert_at(h->txns, txn, index);
assert(r==0);
toku_brtheader_unlock(h);
}
void
toku_brtheader_remove_txn_ref(struct brt_header* h, TOKUTXN txn) {
OMTVALUE txnv_again=NULL;
u_int32_t index;
toku_brtheader_lock(h);
int r = toku_omt_find_zero(h->txns, find_xid, txn, &txnv_again, &index);
assert(r==0);
assert(txnv_again == txn);
r = toku_omt_delete_at(h->txns, index);
assert(r==0);
if (!toku_brt_header_needed(h)) {
//Close immediately.
// I have no idea how this error string business works
char *error_string = NULL;
r = toku_remove_brtheader(h, &error_string, false, ZERO_LSN);
lazy_assert_zero(r);
}
toku_brtheader_unlock(h);
}

7
newbrt/brt_header.h
View file

@ -52,4 +52,11 @@ void toku_reset_root_xid_that_created(struct brt_header* h, TXNID new_root_xid_t
// Reset the root_xid_that_created field to the given value.
// This redefines which xid created the dictionary.
void
toku_brtheader_maybe_add_txn_ref(struct brt_header* h, TOKUTXN txn);
void
toku_brtheader_remove_txn_ref(struct brt_header* h, TOKUTXN txn);
#endif

36
newbrt/rollback.c
View file

@ -242,20 +242,13 @@ static int find_xid (OMTVALUE v, void *txnv) {
return 0;
}
static int remove_txn (OMTVALUE hv, u_int32_t UU(idx), void *txnv)
// Effect: This function is called on every open BRT that a transaction used.
// This function removes the transaction from that BRT.
{
struct brt_header* h = hv;
TOKUTXN txn = txnv;
OMTVALUE txnv_again=NULL;
u_int32_t index;
int r = toku_omt_find_zero(h->txns, find_xid, txn, &txnv_again, &index);
assert(r==0);
assert(txnv_again == txnv);
r = toku_omt_delete_at(h->txns, index);
assert(r==0);
if (txn->txnid64==h->txnid_that_created_or_locked_when_empty) {
h->txnid_that_created_or_locked_when_empty = TXNID_NONE;
h->root_that_created_or_locked_when_empty = TXNID_NONE;
@ -263,14 +256,9 @@ static int remove_txn (OMTVALUE hv, u_int32_t UU(idx), void *txnv)
if (txn->txnid64==h->txnid_that_suppressed_recovery_logs) {
h->txnid_that_suppressed_recovery_logs = TXNID_NONE;
}
if (!toku_brt_header_needed(h)) {
//Close immediately.
// I have no idea how this error string business works
char *error_string = NULL;
r = toku_remove_brtheader(h, &error_string, false, ZERO_LSN);
lazy_assert_zero(r);
}
return r;
toku_brtheader_remove_txn_ref(h, txn);
return 0;
}
// for every BRT in txn, remove it.
@ -697,21 +685,9 @@ static int find_filenum (OMTVALUE v, void *hv) {
//Notify a transaction that it has touched a brt.
int toku_txn_note_brt (TOKUTXN txn, struct brt_header* h) {
OMTVALUE txnv;
u_int32_t index;
// Does brt already know about transaction txn?
int r = toku_omt_find_zero(h->txns, find_xid, txn, &txnv, &index);
if (r==0) {
// It's already there.
assert((TOKUTXN)txnv==txn);
return 0;
}
// Otherwise it's not there.
// Insert reference to transaction into brt
r = toku_omt_insert_at(h->txns, txn, index);
assert(r==0);
toku_brtheader_maybe_add_txn_ref(h, txn);
// Insert reference to brt into transaction
r = toku_omt_insert(txn->open_brt_headers, h, find_filenum, h, 0);
int r = toku_omt_insert(txn->open_brt_headers, h, find_filenum, h, 0);
assert(r==0);
return 0;
}