Commit 26ccf76d authored by Rich Prohaska's avatar Rich Prohaska

tokutek/ft-index#80 tokutek/ft-engine#94 add tokudb_loader_memory_size system...

tokutek/ft-index#80 tokutek/ft-engine#94 add tokudb_loader_memory_size system variable that controls the size of each loader memory size
parent 22772547
...@@ -181,6 +181,7 @@ static ulonglong tokudb_lock_timeout; ...@@ -181,6 +181,7 @@ static ulonglong tokudb_lock_timeout;
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 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_period;
static ulong tokudb_cleaner_iterations; static ulong tokudb_cleaner_iterations;
static ulonglong tokudb_loader_memory_size;
#define ASSERT_MSGLEN 1024 #define ASSERT_MSGLEN 1024
...@@ -456,6 +457,7 @@ static int tokudb_init_func(void *p) { ...@@ -456,6 +457,7 @@ static int tokudb_init_func(void *p) {
db_env_set_direct_io(tokudb_directio == TRUE); db_env_set_direct_io(tokudb_directio == TRUE);
db_env->change_fsync_log_period(db_env, tokudb_fsync_log_period); 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_lock_timeout_callback(db_env, tokudb_lock_timeout_callback);
db_env->set_loader_memory_size(db_env, tokudb_loader_memory_size);
r = db_env->open(db_env, tokudb_home, tokudb_init_flags, S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH); r = db_env->open(db_env, tokudb_home, tokudb_init_flags, S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH);
...@@ -1249,6 +1251,19 @@ static void tokudb_fsync_log_period_update(THD *thd, struct st_mysql_sys_var *sy ...@@ -1249,6 +1251,19 @@ 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 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[] = { static struct st_mysql_sys_var *tokudb_system_variables[] = {
MYSQL_SYSVAR(cache_size), MYSQL_SYSVAR(cache_size),
MYSQL_SYSVAR(max_lock_memory), MYSQL_SYSVAR(max_lock_memory),
...@@ -1292,6 +1307,7 @@ static struct st_mysql_sys_var *tokudb_system_variables[] = { ...@@ -1292,6 +1307,7 @@ static struct st_mysql_sys_var *tokudb_system_variables[] = {
#endif #endif
MYSQL_SYSVAR(last_lock_timeout), MYSQL_SYSVAR(last_lock_timeout),
MYSQL_SYSVAR(lock_timeout_debug), MYSQL_SYSVAR(lock_timeout_debug),
MYSQL_SYSVAR(loader_memory_size),
NULL NULL
}; };
......
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