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

addresses #814

Browse source 
some function cleanup

git-svn-id: file:///svn/mysql/tokudb-engine/src@4932 c7de825b-a66e-492c-adef-691d508d4ae1
This commit is contained in:
Zardosht Kasheff 2013-04-17 00:01:43 -04:00 committed by Yoni Fogel
parent 155a4687ab
commit 72ec7d38a1
2 changed files with 32 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
storage/tokudb/ha_tokudb.cc
View file

@ -1174,7 +1174,11 @@ int ha_tokudb::open(const char *name, int mode, uint test_if_locked) {
}
share->ref_length = ref_length;
get_status();
error = get_status();
if (error) {
__close(1);
TOKUDB_DBUG_RETURN(1);
}
}
ref_length = share->ref_length; // If second open
@ -1760,12 +1764,12 @@ void ha_tokudb::init_hidden_prim_key_info() {
/** @brief
Get metadata info stored in status.tokudb
*/
void ha_tokudb::get_status() {
int ha_tokudb::get_status() {
TOKUDB_DBUG_ENTER("ha_tokudb::get_status");
//
// retrieve metadata from status_block
//
DB_TXN* txn = NULL;
DBT key, value;
HA_METADATA_KEY curr_key;
int error;
//
// open status.tokudb
//
@ -1779,31 +1783,23 @@ void ha_tokudb::get_status() {
if (tokudb_debug & TOKUDB_DEBUG_OPEN) {
TOKUDB_TRACE("open:%s\n", newname);
}
if (!db_create(&share->status_block, db_env, 0)) {
if (share->status_block->open(share->status_block, NULL, name_buff, NULL, DB_BTREE, open_mode, 0)) {
share->status_block->close(share->status_block, 0);
share->status_block = NULL;
}
}
error = db_create(&share->status_block, db_env, 0);
if (error) { goto cleanup; }
error = share->status_block->open(share->status_block, NULL, name_buff, NULL, DB_BTREE, open_mode, 0);
if (error) { goto cleanup; }
}
//
// get capabilities and version
//
//
// transaction to be used for putting metadata into status.tokudb
//
DB_TXN* txn = NULL;
DBT key, value;
HA_METADATA_KEY curr_key;
bzero(&key, sizeof(key));
bzero(&value, sizeof(value));
key.data = &curr_key;
key.size = sizeof(curr_key);
value.flags = DB_DBT_MALLOC;
int error = db_env->txn_begin(db_env, 0, &txn, 0);
if (error) { DBUG_VOID_RETURN; }
error = db_env->txn_begin(db_env, 0, &txn, 0);
if (error) { goto cleanup; }
if (share->status_block) {
int error;
@ -1825,7 +1821,7 @@ void ha_tokudb::get_status() {
share->version = *(uint *)value.data;
}
else {
// error case
goto cleanup;
}
//
// get capabilities
@ -1845,11 +1841,21 @@ void ha_tokudb::get_status() {
share->capabilities= *(uint *)value.data;
}
else {
// error case
goto cleanup;
}
}
txn->commit(txn,0);
DBUG_VOID_RETURN;
error = 0;
cleanup:
if (txn) {
txn->commit(txn,0);
}
if (error) {
if (share->status_block) {
share->status_block->close(share->status_block, 0);
share->status_block = NULL;
}
}
TOKUDB_DBUG_RETURN(error);
}
/** @brief

2
storage/tokudb/ha_tokudb.h
View file

@ -274,7 +274,7 @@ public:
THR_LOCK_DATA **store_lock(THD * thd, THR_LOCK_DATA ** to, enum thr_lock_type lock_type);
void get_status();
int get_status();
void init_hidden_prim_key_info();
inline void get_auto_primary_key(uchar * to) {
pthread_mutex_lock(&share->mutex);