From 7eb141996a3aa47d947e989ae2645ab47ea04e1c Mon Sep 17 00:00:00 2001 From: Yoni Fogel Date: Tue, 20 Nov 2012 16:11:50 +0000 Subject: [PATCH] refs #5467 merge onto handlerton (kill putloader) git-svn-id: file:///svn/mysql/tokudb-engine/tokudb-engine@50180 c7de825b-a66e-492c-adef-691d508d4ae1 --- storage/tokudb/ha_tokudb.cc | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/storage/tokudb/ha_tokudb.cc b/storage/tokudb/ha_tokudb.cc index a7ef1a4bcec..171f0c48198 100644 --- a/storage/tokudb/ha_tokudb.cc +++ b/storage/tokudb/ha_tokudb.cc @@ -3144,7 +3144,7 @@ void ha_tokudb::start_bulk_insert(ha_rows rows) { mult_put_flags[primary_key] = DB_NOOVERWRITE; } uint32_t loader_flags = (get_load_save_space(thd)) ? - LOADER_USE_PUTS : 0; + LOADER_COMPRESS_INTERMEDIATES : 0; int error = db_env->create_loader( db_env, @@ -7336,9 +7336,9 @@ int ha_tokudb::tokudb_add_index( THD* thd = ha_thd(); DB_LOADER* loader = NULL; DB_INDEXER* indexer = NULL; - bool loader_use_puts = get_load_save_space(thd); + bool loader_save_space = get_load_save_space(thd); bool use_hot_index = (lock.type == TL_WRITE_ALLOW_WRITE); - uint32_t loader_flags = loader_use_puts ? LOADER_USE_PUTS : 0; + uint32_t loader_flags = loader_save_space ? LOADER_COMPRESS_INTERMEDIATES : 0; uint32_t indexer_flags = 0; uint32_t mult_db_flags[MAX_KEY + 1] = {0}; uint32_t mult_put_flags[MAX_KEY + 1]; @@ -7592,12 +7592,7 @@ int ha_tokudb::tokudb_add_index( num_processed++; if ((num_processed % 1000) == 0) { - if (loader_use_puts) { - sprintf(status_msg, "Adding indexes: Processed %llu of about %llu rows.", num_processed, (long long unsigned) share->rows); - } - else { - sprintf(status_msg, "Adding indexes: Fetched %llu of about %llu rows, loading of data still remains.", num_processed, (long long unsigned) share->rows); - } + sprintf(status_msg, "Adding indexes: Fetched %llu of about %llu rows, loading of data still remains.", num_processed, (long long unsigned) share->rows); thd_proc_info(thd, status_msg); #ifdef HA_TOKUDB_HAS_THD_PROGRESS