#127 make tokudb_loader_memory_size a session variable

storage/tokudb/hatoku_hton.cc

@@ -181,7 +181,6 @@ void toku_hton_update_primary_key_bytes_inserted(uint64_t row_size) {
 static void tokudb_lock_timeout_callback(DB *db, uint64_t requesting_txnid, const DBT *left_key, const DBT *right_key, uint64_t blocking_txnid);
 static ulong tokudb_cleaner_period;
 static ulong tokudb_cleaner_iterations;
-static ulonglong tokudb_loader_memory_size;
 
 #define ASSERT_MSGLEN 1024
 
@@ -457,7 +456,7 @@ static int tokudb_init_func(void *p) {
     db_env_set_direct_io(tokudb_directio == TRUE);
     db_env->change_fsync_log_period(db_env, tokudb_fsync_log_period);
     db_env->set_lock_timeout_callback(db_env, tokudb_lock_timeout_callback);
-    db_env->set_loader_memory_size(db_env, tokudb_loader_memory_size);
+    db_env->set_loader_memory_size(db_env, tokudb_get_loader_memory_size_callback);
 
     r = db_env->open(db_env, tokudb_home, tokudb_init_flags, S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH);
 
@@ -1237,18 +1236,6 @@ static void tokudb_fsync_log_period_update(THD *thd, struct st_mysql_sys_var *sy
 
 static MYSQL_SYSVAR_UINT(fsync_log_period, tokudb_fsync_log_period, 0, "TokuDB fsync log period", NULL, tokudb_fsync_log_period_update, 0, 0, ~0U, 0);
 
-static void tokudb_update_loader_memory_size(THD * thd, struct st_mysql_sys_var * sys_var, void * var, const void * save) {
-    ulonglong *p = (ulonglong *) var;
-    *p = *(const ulonglong *) save;
-    db_env->set_loader_memory_size(db_env, *p);
-}
-
-static MYSQL_SYSVAR_ULONGLONG(
-    loader_memory_size, tokudb_loader_memory_size,
-    0, "TokuDB loader memory size", 
-    NULL, tokudb_update_loader_memory_size, 
-    100 * 1000 * 1000 /*default*/, 0 /*min*/, ~0ULL /*max*/, 0
-);
 
 static struct st_mysql_sys_var *tokudb_system_variables[] = {
     MYSQL_SYSVAR(cache_size),

storage/tokudb/hatoku_hton.h

@@ -360,6 +360,23 @@ static uint64_t tokudb_get_lock_wait_time_callback(uint64_t default_wait_time) {
     return wait_time;
 }
 
+static MYSQL_THDVAR_ULONGLONG(loader_memory_size,
+    0,
+    "TokuDB loader memory size",
+    NULL, 
+    NULL, 
+    100*1000*1000, /*default*/
+    0, /*min*/
+    ~0ULL, /*max*/
+    1 /*blocksize*/
+);
+
+static uint64_t tokudb_get_loader_memory_size_callback(void) {
+    THD *thd = current_thd;
+    uint64_t memory_size = THDVAR(thd, loader_memory_size);
+    return memory_size;
+}
+
 extern HASH tokudb_open_tables;
 extern pthread_mutex_t tokudb_mutex;
 extern pthread_mutex_t tokudb_meta_mutex;