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

#3129 fix recover of insert multiple and delete multiple with a valid source filenum closes[t:3129]

Browse source 
git-svn-id: file:///svn/toku/tokudb@26506 c7de825b-a66e-492c-adef-691d508d4ae1
This commit is contained in:
Rich Prohaska 2013-04-16 23:59:33 -04:00 • committed by Yoni Fogel
parent 8a810eafd8
commit 7c059f7af2
1 changed files with 53 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

99
newbrt/recover.c
View file

@ -839,38 +839,42 @@ static int toku_recover_enq_insert_multiple (struct logtype_enq_insert_multiple
if (r == 0) if (r == 0)
src_db = tuple->brt->db; src_db = tuple->brt->db;
else else
do_inserts = FALSE; // src file was probably deleted do_inserts = FALSE; // src file was probably deleted, #3129
} }
} }
DBT src_key, src_val, dest_key, dest_val;
toku_fill_dbt(&src_key, l->src_key.data, l->src_key.len); if (do_inserts) {
toku_fill_dbt(&src_val, l->src_val.data, l->src_val.len); DBT src_key, src_val, dest_key, dest_val;
toku_init_dbt_flags(&dest_key, DB_DBT_REALLOC); toku_fill_dbt(&src_key, l->src_key.data, l->src_key.len);
toku_init_dbt_flags(&dest_val, DB_DBT_REALLOC); toku_fill_dbt(&src_val, l->src_val.data, l->src_val.len);
toku_init_dbt_flags(&dest_key, DB_DBT_REALLOC);
toku_init_dbt_flags(&dest_val, DB_DBT_REALLOC);
for (uint32_t file = 0; do_inserts && file < l->dest_filenums.num; file++) { for (uint32_t file = 0; file < l->dest_filenums.num; file++) {
struct file_map_tuple *tuple = NULL; struct file_map_tuple *tuple = NULL;
r = file_map_find(&renv->fmap, l->dest_filenums.filenums[file], &tuple); r = file_map_find(&renv->fmap, l->dest_filenums.filenums[file], &tuple);
if (r==0) { if (r==0) {
// We found the cachefile. (maybe) Do the insert. // We found the cachefile. (maybe) Do the insert.
DB *db = tuple->brt->db; DB *db = tuple->brt->db;
r = renv->generate_row_for_put(db, src_db, &dest_key, &dest_val, &src_key, &src_val); r = renv->generate_row_for_put(db, src_db, &dest_key, &dest_val, &src_key, &src_val);
assert(r==0); assert(r==0);
r = toku_brt_maybe_insert(tuple->brt, &dest_key, &dest_val, txn, TRUE, l->lsn, FALSE, BRT_INSERT); r = toku_brt_maybe_insert(tuple->brt, &dest_key, &dest_val, txn, TRUE, l->lsn, FALSE, BRT_INSERT);
assert(r == 0); assert(r == 0);
//flags==0 means generate_row_for_put callback changed it //flags==0 means generate_row_for_put callback changed it
//(and freed any memory necessary to do so) so that values are now stored //(and freed any memory necessary to do so) so that values are now stored
//in temporary memory that does not need to be freed. We need to continue //in temporary memory that does not need to be freed. We need to continue
//using DB_DBT_REALLOC however. //using DB_DBT_REALLOC however.
if (dest_key.flags == 0) if (dest_key.flags == 0)
toku_init_dbt_flags(&dest_key, DB_DBT_REALLOC); toku_init_dbt_flags(&dest_key, DB_DBT_REALLOC);
if (dest_val.flags == 0) if (dest_val.flags == 0)
toku_init_dbt_flags(&dest_val, DB_DBT_REALLOC); toku_init_dbt_flags(&dest_val, DB_DBT_REALLOC);
}
} }
if (dest_key.data) toku_free(dest_key.data); //TODO: #2321 May need windows hack
if (dest_val.data) toku_free(dest_val.data); //TODO: #2321 May need windows hack
} }
if (dest_key.data) toku_free(dest_key.data); //TODO: #2321 May need windows hack
if (dest_val.data) toku_free(dest_val.data); //TODO: #2321 May need windows hack
return 0; return 0;
} }
@ -897,33 +901,36 @@ static int toku_recover_enq_delete_multiple (struct logtype_enq_delete_multiple
if (r == 0) if (r == 0)
src_db = tuple->brt->db; src_db = tuple->brt->db;
else else
do_deletes = FALSE; // src file was probably deleted do_deletes = FALSE; // src file was probably deleted, #3129
} }
} }
DBT src_key, src_val, dest_key; if (do_deletes) {
toku_fill_dbt(&src_key, l->src_key.data, l->src_key.len); DBT src_key, src_val, dest_key;
toku_fill_dbt(&src_val, l->src_val.data, l->src_val.len); toku_fill_dbt(&src_key, l->src_key.data, l->src_key.len);
toku_init_dbt_flags(&dest_key, DB_DBT_REALLOC); toku_fill_dbt(&src_val, l->src_val.data, l->src_val.len);
toku_init_dbt_flags(&dest_key, DB_DBT_REALLOC);
for (uint32_t file = 0; do_deletes && file < l->dest_filenums.num; file++) { for (uint32_t file = 0; file < l->dest_filenums.num; file++) {
struct file_map_tuple *tuple = NULL; struct file_map_tuple *tuple = NULL;
r = file_map_find(&renv->fmap, l->dest_filenums.filenums[file], &tuple); r = file_map_find(&renv->fmap, l->dest_filenums.filenums[file], &tuple);
if (r==0) { if (r==0) {
// We found the cachefile. (maybe) Do the delete. // We found the cachefile. (maybe) Do the delete.
DB *db = tuple->brt->db; DB *db = tuple->brt->db;
r = renv->generate_row_for_del(db, src_db, &dest_key, &src_key, &src_val); r = renv->generate_row_for_del(db, src_db, &dest_key, &src_key, &src_val);
assert(r==0); assert(r==0);
r = toku_brt_maybe_delete(tuple->brt, &dest_key, txn, TRUE, l->lsn, FALSE); r = toku_brt_maybe_delete(tuple->brt, &dest_key, txn, TRUE, l->lsn, FALSE);
assert(r == 0); assert(r == 0);
//flags==0 indicates the return values are stored in temporary memory that does //flags==0 indicates the return values are stored in temporary memory that does
//not need to be freed. We need to continue using DB_DBT_REALLOC however. //not need to be freed. We need to continue using DB_DBT_REALLOC however.
if (dest_key.flags == 0) if (dest_key.flags == 0)
toku_init_dbt_flags(&dest_key, DB_DBT_REALLOC); toku_init_dbt_flags(&dest_key, DB_DBT_REALLOC);
}
} }
if (dest_key.flags & DB_DBT_REALLOC && dest_key.data) toku_free(dest_key.data); //TODO: #2321 May need windows hack
} }
if (dest_key.flags & DB_DBT_REALLOC && dest_key.data) toku_free(dest_key.data); //TODO: #2321 May need windows hack
return 0; return 0;
} }