Commit a0f84bd0 authored by Zardosht Kasheff's avatar Zardosht Kasheff Committed by Yoni Fogel

addresses #1517

make buffer that prints status message in 'show processlist' 
be a member variable instead of a local one

git-svn-id: file:///svn/mysql/tokudb-engine/src@10022 c7de825b-a66e-492c-adef-691d508d4ae1
parent 7aa5b238
...@@ -1935,11 +1935,6 @@ int ha_tokudb::write_row(uchar * record) { ...@@ -1935,11 +1935,6 @@ int ha_tokudb::write_row(uchar * record) {
DB_TXN* sub_trans = NULL; DB_TXN* sub_trans = NULL;
DB_TXN* txn = NULL; DB_TXN* txn = NULL;
//
// status message to be shown in "show process list"
//
char status_msg[200]; //buffer of 200 should be a good upper bound.
// //
// some crap that needs to be done because MySQL does not properly abstract // some crap that needs to be done because MySQL does not properly abstract
// this work away from us, namely filling in auto increment and setting auto timestamp // this work away from us, namely filling in auto increment and setting auto timestamp
...@@ -2062,8 +2057,8 @@ int ha_tokudb::write_row(uchar * record) { ...@@ -2062,8 +2057,8 @@ int ha_tokudb::write_row(uchar * record) {
added_rows++; added_rows++;
num_added_rows_in_stmt++; num_added_rows_in_stmt++;
if ((num_added_rows_in_stmt % 1000) == 0) { if ((num_added_rows_in_stmt % 1000) == 0) {
sprintf(status_msg, "Inserted about %llu rows", num_added_rows_in_stmt); sprintf(write_status_msg, "Inserted about %llu rows", num_added_rows_in_stmt);
thd_proc_info(thd, status_msg); thd_proc_info(thd, write_status_msg);
} }
} }
cleanup: cleanup:
...@@ -2155,10 +2150,6 @@ int ha_tokudb::update_row(const uchar * old_row, uchar * new_row) { ...@@ -2155,10 +2150,6 @@ int ha_tokudb::update_row(const uchar * old_row, uchar * new_row) {
THD* thd = ha_thd(); THD* thd = ha_thd();
DB_TXN* sub_trans = NULL; DB_TXN* sub_trans = NULL;
DB_TXN* txn = NULL; DB_TXN* txn = NULL;
//
// status message to be shown in "show process list"
//
char status_msg[200]; //buffer of 200 should be a good upper bound.
LINT_INIT(error); LINT_INIT(error);
statistic_increment(table->in_use->status_var.ha_update_count, &LOCK_status); statistic_increment(table->in_use->status_var.ha_update_count, &LOCK_status);
...@@ -2275,8 +2266,8 @@ int ha_tokudb::update_row(const uchar * old_row, uchar * new_row) { ...@@ -2275,8 +2266,8 @@ int ha_tokudb::update_row(const uchar * old_row, uchar * new_row) {
if (!error) { if (!error) {
num_updated_rows_in_stmt++; num_updated_rows_in_stmt++;
if ((num_updated_rows_in_stmt % 1000) == 0) { if ((num_updated_rows_in_stmt % 1000) == 0) {
sprintf(status_msg, "Inserted about %llu rows", num_updated_rows_in_stmt); sprintf(write_status_msg, "Updated about %llu rows", num_updated_rows_in_stmt);
thd_proc_info(thd, status_msg); thd_proc_info(thd, write_status_msg);
} }
} }
...@@ -2387,10 +2378,6 @@ int ha_tokudb::delete_row(const uchar * record) { ...@@ -2387,10 +2378,6 @@ int ha_tokudb::delete_row(const uchar * record) {
DBT prim_key; DBT prim_key;
key_map keys = table_share->keys_in_use; key_map keys = table_share->keys_in_use;
bool has_null; bool has_null;
//
// status message to be shown in "show process list"
//
char status_msg[200]; //buffer of 200 should be a good upper bound.
THD* thd = ha_thd(); THD* thd = ha_thd();
statistic_increment(table->in_use->status_var.ha_delete_count, &LOCK_status); statistic_increment(table->in_use->status_var.ha_delete_count, &LOCK_status);
...@@ -2409,8 +2396,8 @@ int ha_tokudb::delete_row(const uchar * record) { ...@@ -2409,8 +2396,8 @@ int ha_tokudb::delete_row(const uchar * record) {
deleted_rows++; deleted_rows++;
num_deleted_rows_in_stmt++; num_deleted_rows_in_stmt++;
if ((num_deleted_rows_in_stmt % 1000) == 0) { if ((num_deleted_rows_in_stmt % 1000) == 0) {
sprintf(status_msg, "Inserted about %llu rows", num_deleted_rows_in_stmt); sprintf(write_status_msg, "Deleted about %llu rows", num_deleted_rows_in_stmt);
thd_proc_info(thd, status_msg); thd_proc_info(thd, write_status_msg);
} }
} }
TOKUDB_DBUG_RETURN(error); TOKUDB_DBUG_RETURN(error);
......
...@@ -199,6 +199,14 @@ private: ...@@ -199,6 +199,14 @@ private:
PRIM_KEY_PART_INFO* primary_key_offsets; PRIM_KEY_PART_INFO* primary_key_offsets;
//
// buffer for updating the status of long insert, delete, and update
// statements. Right now, the the messages are
// "[inserted|updated|deleted] about %llu rows",
// so a buffer of 200 is good enough.
//
char write_status_msg[200]; //buffer of 200 should be a good upper bound.
bool fix_rec_buff_for_blob(ulong length); bool fix_rec_buff_for_blob(ulong length);
#define TOKUDB_HIDDEN_PRIMARY_KEY_LENGTH 5 // QQQ why 5? #define TOKUDB_HIDDEN_PRIMARY_KEY_LENGTH 5 // QQQ why 5?
uchar current_ident[TOKUDB_HIDDEN_PRIMARY_KEY_LENGTH]; uchar current_ident[TOKUDB_HIDDEN_PRIMARY_KEY_LENGTH];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment