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

addresses #1923

Browse source 
git-svn-id: file:///svn/mysql/tokudb-engine/src@13833 c7de825b-a66e-492c-adef-691d508d4ae1
This commit is contained in:
Zardosht Kasheff 2009-08-04 14:20:12 +00:00 committed by Yoni Fogel
parent 4289f35f43
commit 526e1c8327
1 changed files with 17 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
storage/tokudb/ha_tokudb.cc
View file

@ -1397,14 +1397,14 @@ int ha_tokudb::estimate_num_rows(DB* db, u_int64_t* num_rows) {
*num_rows = equal + greater;
error = 0;
cleanup:
if (do_commit) {
transaction->commit(transaction, 0);
transaction = NULL;
}
if (crsr != NULL) {
crsr->c_close(crsr);
crsr = NULL;
}
if (do_commit) {
transaction->commit(transaction, 0);
transaction = NULL;
}
return error;
}
@ -5392,7 +5392,7 @@ int ha_tokudb::add_index(TABLE *table_arg, KEY *key_info, uint num_of_keys) {
//
error = db_env->txn_begin(db_env, 0, &txn, 0);
assert(error == 0);
if (error) { goto cleanup; }
//
// grab some locks to make this go faster
@ -5407,7 +5407,7 @@ int ha_tokudb::add_index(TABLE *table_arg, KEY *key_info, uint num_of_keys) {
share->file->dbt_pos_infty(),
NULL
);
if (error) { txn->commit(txn, 0); goto cleanup; }
if (error) { goto cleanup; }
//
// now grab a table write lock for secondary tables we
@ -5419,7 +5419,7 @@ int ha_tokudb::add_index(TABLE *table_arg, KEY *key_info, uint num_of_keys) {
share->key_file[curr_index],
txn
);
if (error) { txn->commit(txn, 0); goto cleanup; }
if (error) { goto cleanup; }
}
if ((error = share->file->cursor(share->file, txn, &tmp_cursor, 0))) {
@ -5465,13 +5465,6 @@ int ha_tokudb::add_index(TABLE *table_arg, KEY *key_info, uint num_of_keys) {
error = share->key_file[curr_index]->put(share->key_file[curr_index], txn, &secondary_key, &current_primary_key, put_flags);
}
if (error) {
//
// in the case of any error anywhere, we can just nuke all the files created, so we dont need
// to be tricky and try to roll back changes. That is why we commit the transaction,
// which should be fast. The DB is going to go away anyway, so no pt in trying to keep
// it in a good state.
//
txn->commit(txn, 0);
//
// found a duplicate in a no_dup DB
//
@ -5490,7 +5483,6 @@ int ha_tokudb::add_index(TABLE *table_arg, KEY *key_info, uint num_of_keys) {
thd_proc_info(thd, status_msg);
if (thd->killed) {
error = ER_ABORTING_CONNECTION;
txn->commit(txn, 0);
goto cleanup;
}
}
@ -5520,9 +5512,6 @@ int ha_tokudb::add_index(TABLE *table_arg, KEY *key_info, uint num_of_keys) {
while (error != DB_NOTFOUND) {
error = tmp_cursor->c_getf_next(tmp_cursor, DB_PRELOCKED, smart_dbt_do_nothing, NULL);
if (error && error != DB_NOTFOUND) {
tmp_cursor->c_close(tmp_cursor);
tmp_cursor = NULL;
txn->commit(txn, 0);
goto cleanup;
}
num_processed++;
@ -5531,7 +5520,6 @@ int ha_tokudb::add_index(TABLE *table_arg, KEY *key_info, uint num_of_keys) {
thd_proc_info(thd, status_msg);
if (thd->killed) {
error = ER_ABORTING_CONNECTION;
txn->commit(txn, 0);
goto cleanup;
}
}
@ -5542,6 +5530,7 @@ int ha_tokudb::add_index(TABLE *table_arg, KEY *key_info, uint num_of_keys) {
}
error = txn->commit(txn, 0);
txn = NULL;
assert(error == 0);
error = 0;
@ -5551,6 +5540,15 @@ cleanup:
tmp_cursor->c_close(tmp_cursor);
tmp_cursor = NULL;
}
if (txn) {
//
// in the case of any error anywhere, we can just nuke all the files created, so we dont need
// to be tricky and try to roll back changes. That is why we commit the transaction,
// which should be fast. The DB is going to go away anyway, so no pt in trying to keep
// it in a good state.
//
txn->commit(txn, 0);
}
//
// We need to delete all the files that may have been created
// The DB's must be closed and removed