diff options
| author | Rich Prohaska <prohaska@tokutek.com> | 2013-09-30 11:08:53 -0400 |
|---|---|---|
| committer | Rich Prohaska <prohaska@tokutek.com> | 2013-09-30 11:08:53 -0400 |
| commit | c8fc4d662ba797a1433333aee4fae08dc2f9a30e (patch) | |
| tree | e292b1223b53f918374e5350aa51e04779ccf061 | |
| parent | e99cb96b9d3bcc0947f08e6da49e46f0c80a782e (diff) | |
| download | mariadb-git-c8fc4d662ba797a1433333aee4fae08dc2f9a30e.tar.gz | |
#80 default compress tokudb bulk loader temp files
| -rwxr-xr-x | scripts/run.atc.ontime.bash | 7 | ||||
| -rwxr-xr-x | scripts/run.tpch.bash | 2 | ||||
| -rw-r--r-- | storage/tokudb/hatoku_hton.h | 4 |
3 files changed, 5 insertions, 8 deletions
diff --git a/scripts/run.atc.ontime.bash b/scripts/run.atc.ontime.bash index 75df3b9266c..9727f35ba28 100755 --- a/scripts/run.atc.ontime.bash +++ b/scripts/run.atc.ontime.bash @@ -96,6 +96,7 @@ popd if [ $dbname = "atc" -a $engine != "tokudb" ] ; then dbname="atc_$engine"; fi runfile=$testresultsdir/$dbname-$tblname-$mysqlbuild-$mysqlserver +if [ $tokudb_load_save_space != 0 ] ; then runfile=$runfile-compress; fi rm -rf $runfile testresult="PASS" @@ -173,11 +174,7 @@ fi if [ $load -ne 0 -a $testresult = "PASS" ] ; then echo `date` load data >>$runfile start=$(date +%s) - if [ $tokudb_load_save_space -ne 0 ] ; then - mysql -S $mysqlsocket -u $mysqluser -D $dbname -e "set tokudb_load_save_space=$tokudb_load_save_space; load data infile '$basedir/atc_On_Time_Performance.mysql.csv' into table $tblname" >>$runfile 2>&1 - else - mysql -S $mysqlsocket -u $mysqluser -D $dbname -e "load data infile '$basedir/atc_On_Time_Performance.mysql.csv' into table $tblname" >>$runfile 2>&1 - fi + mysql -S $mysqlsocket -u $mysqluser -D $dbname -e "set tokudb_load_save_space=$tokudb_load_save_space; load data infile '$basedir/atc_On_Time_Performance.mysql.csv' into table $tblname" >>$runfile 2>&1 exitcode=$? let loadtime=$(date +%s)-$start echo `date` load data loadtime=$loadtime $exitcode >>$runfile diff --git a/scripts/run.tpch.bash b/scripts/run.tpch.bash index 34c7527b066..5a711c011a3 100755 --- a/scripts/run.tpch.bash +++ b/scripts/run.tpch.bash @@ -314,7 +314,7 @@ fi # commit results if [ $commit != 0 ] ; then svn add $runfile - retry svn commit -m \"$testresult $dbname $mysqlbuild $mysqlserver compress=$tokudb_load_save_space\" $runfile + retry svn commit -m \"$testresult $dbname $mysqlbuild $mysqlserver\" $runfile fi popd diff --git a/storage/tokudb/hatoku_hton.h b/storage/tokudb/hatoku_hton.h index 48e51e90593..266551751c2 100644 --- a/storage/tokudb/hatoku_hton.h +++ b/storage/tokudb/hatoku_hton.h @@ -135,10 +135,10 @@ static uint get_pk_insert_mode(THD* thd) { static MYSQL_THDVAR_BOOL(load_save_space, 0, - "if on, intial loads are slower but take less space", + "compress intermediate bulk loader files to save space", NULL, NULL, - false + true ); static bool get_load_save_space(THD* thd) { |