mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-22 14:54:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

[t:4498], initialize a txn's lth on demand, in toku_txn_add_lt and not in the begin of a txn

Browse source 
git-svn-id: file:///svn/toku/tokudb@39758 c7de825b-a66e-492c-adef-691d508d4ae1
This commit is contained in:
Zardosht Kasheff 2013-04-17 00:00:10 -04:00 • committed by Yoni Fogel
parent ef15de4e90
commit 0f89d506f8
2 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/ydb-internal.h
View file

@ -209,7 +209,7 @@ typedef enum __toku_isolation_level {
struct __toku_db_txn_internal {
//TXNID txnid64; /* A sixty-four bit txn id. */
struct tokutxn *tokutxn;
struct __toku_lth *lth; //Hash table holding list of dictionaries this txn has touched
struct __toku_lth *lth; //Hash table holding list of dictionaries this txn has touched, only initialized if txn touches a dictionary
u_int32_t flags;
TOKU_ISOLATION iso;
DB_TXN *child;

25
src/ydb.c
View file

@ -2939,17 +2939,12 @@ toku_txn_begin(DB_ENV *env, DB_TXN * stxn, DB_TXN ** txn, u_int32_t flags, int i
db_txn_struct_i(result)->iso = child_isolation;
toku_list_init(&db_txn_struct_i(result)->dbs_that_must_close_before_abort);
int r;
if (env->i->open_flags & DB_INIT_LOCK && !stxn) {
r = toku_lth_create(&db_txn_struct_i(result)->lth);
if (r!=0) {
#if !TOKUDB_NATIVE_H
toku_free(db_txn_struct_i(result));
#endif
toku_free(result);
return r;
}
}
// we used to initialize the transaction's lth here.
// Now we initialize the lth only if the transaction needs the lth,
// in toku_txn_add_lt. If this transaction never does anything
// that requires using a lock tree, then the lth is never
// created.
int r = 0;
//r = toku_logger_txn_begin(stxn ? db_txn_struct_i(stxn)->tokutxn : 0, &db_txn_struct_i(result)->tokutxn, env->i->logger);
TXN_SNAPSHOT_TYPE snapshot_type;
@ -4536,7 +4531,13 @@ toku_txn_add_lt(DB_TXN* txn, toku_lock_tree* lt) {
int r = ENOSYS;
assert(txn && lt);
toku_lth* lth = db_txn_struct_i(txn)->lth;
assert(lth);
// we used to initialize the transaction's lth during begin.
// Now we initialize the lth only if the transaction needs the lth, here
if (!lth) {
r = toku_lth_create(&db_txn_struct_i(txn)->lth);
assert_zero(r);
lth = db_txn_struct_i(txn)->lth;
}
toku_lock_tree* find = toku_lth_find(lth, lt);
if (find) {