#208 rename ft-engine to tokudb-engine

README.md

@@ -76,5 +76,5 @@ TokuDB is available under the GPL version 2.  See [COPYING][copying]
 The TokuKV component of TokuDB is available under the GPL version 2, with
 slight modifications.  See [README-TOKUDB][license].
 
-[copying]: http://github.com/Tokutek/ft-engine/blob/master/COPYING
-[license]: http://github.com/Tokutek/ft-index/blob/master/README-TOKUDB
+[copying]: http://github.com/Tokutek/tokudb-engine/blob/master/COPYING
+[license]: http://github.com/Tokutek/tokudb-index/blob/master/README-TOKUDB

scripts/atc.readme

 The script to run the load the air traffic ontime database and run queries against it
 is called run.atc.ontime.bas.
 
-The queries are in the ft-engine/scripts/atc.ontime directory.
+The queries are in the tokudb-engine/scripts/atc.ontime directory.
 
 The data for the ontime database is in the amazon s3 bucket called tokutek-mysql-data.
 

scripts/common.sh

@@ -161,7 +161,7 @@ function parse_mysqlbuild() {
             if [ -z $jemalloc_tree ] ; then jemalloc_tree=$jemalloc_version; fi
         fi
         mysql_repo=$mysql_distro
-        if [[ $mysql_version =~ ^([0-9]+\\.[0-9]+) ]] ; then mysql_repo=$mysql_distro-${BASH_REMATCH[1]}; else exitcode=1; fi
+        if [[ $mysql_version =~ ^([0-9]+\.[0-9]+) ]] ; then mysql_repo=$mysql_distro-${BASH_REMATCH[1]}; else exitcode=1; fi
     else
         exitcode=1
     fi
@@ -175,7 +175,7 @@ function parse_mysql() {
         mysql_distro=${BASH_REMATCH[1]}
         mysql_version=${BASH_REMATCH[2]}
         mysql_repo=$mysql_distro
-        if [[ $mysql_version =~ ^([0-9]+\\.[0-9]+) ]] ; then mysql_repo=$mysql_distro-${BASH_REMATCH[1]}; else exitcode=1; fi
+        if [[ $mysql_version =~ ^([0-9]+\.[0-9]+) ]] ; then mysql_repo=$mysql_distro-${BASH_REMATCH[1]}; else exitcode=1; fi
         exitcode=0
     else
         exitcode=1

scripts/make.mysql.bash

@@ -9,7 +9,7 @@ function usage() {
     echo "--mysqlbuild=$mysqlbuild"
     echo "--mysql=$mysql"
     echo "--tokudb_version=$tokudb_version"
-    echo "--mysql_tree=$mysql_tree --ftengine_tree=$ftengine_tree --ftindex_tree=$ftindex_tree --jemalloc_tree=$jemalloc_tree --backup_tree=$backup_tree"
+    echo "--mysql_tree=$mysql_tree --tokudbengine_tree=$tokudbengine_tree --ftindex_tree=$ftindex_tree --jemalloc_tree=$jemalloc_tree --backup_tree=$backup_tree"
     echo 
     echo "community release builds using the tokudb-7.0.1 git tag"
     echo "    make.mysql.bash --mysqlbuild=mysql-5.5.30-tokudb-7.0.1-linux-x86_64"
@@ -23,7 +23,7 @@ function usage() {
     echo "    make.mysql.bash --mysqlbuild=mysql-5.5.30-tokudb-test-e-linux-x86_64"
     echo 
     echo "community release builds of a branch"
-    echo "    make.mysql.bash --mysql=mysql-5.5.30 --mysql_tree=<your mysql tree name> --ftengine_tree=<your ft-engine tree name> --tokudb_version=<your test string>>"
+    echo "    make.mysql.bash --mysql=mysql-5.5.30 --mysql_tree=<your mysql tree name> --tokudbengine_tree=<your tokudb-engine tree name> --tokudb_version=<your test string>>"
     return 1
 }
 
@@ -50,7 +50,7 @@ tokudb_version=
 tokudb_patches=1
 cmake_build_type=RelWithDebInfo
 mysql_tree=
-ftengine_tree=
+tokudbengine_tree=
 ftindex_tree=
 jemalloc_version=3.3.0
 jemalloc_tree=
@@ -109,20 +109,20 @@ if [ ! -d toku_backup ] ; then
     cp -r backup-$build_type/backup toku_backup
 fi
 
-if [ ! -d ft-engine ] ; then
-    github_download Tokutek/ft-engine $(git_tree $git_tag $ftengine_tree) ft-engine
+if [ ! -d tokudb-engine ] ; then
+    github_download Tokutek/tokudb-engine $(git_tree $git_tag $tokudbengine_tree) tokudb-engine
 
     # install the tokudb storage engine source
-    cp -r ft-engine/storage/tokudb storage/
+    cp -r tokudb-engine/storage/tokudb storage/
 
     # merge the mysql tests
     mv mysql-test mysql-test-save
-    cp -r ft-engine/mysql-test .
+    cp -r tokudb-engine/mysql-test .
     cp -r mysql-test-save/* mysql-test
     rm -rf mysql-test-save
 
     # install the tokudb scripts
-    cp -r ft-engine/scripts/* scripts/
+    cp -r tokudb-engine/scripts/* scripts/
 fi
 
 if [ ! -d storage/tokudb/ft-index ] ; then

scripts/make.mysql.debug.env.bash

@@ -7,7 +7,7 @@ function usage() {
     echo "with default parameters it builds a debug $mysql-$mysql_tree"
     echo "--git_tag=$git_tag"
     echo "--mysql=$mysql --mysql_tree=$mysql_tree"
-    echo "--ftengine=$ftengine --ftengine_tree=$ftengine_tree"
+    echo "--tokudbengine=$tokudbengine --tokudbengine_tree=$tokudbengine_tree"
     echo "--ftindex=$ftindex --ftindex_tree=$ftindex_tree"
     echo "--jemalloc=$jemalloc --jemalloc_tree=$jemalloc_tree"
     echo "--backup=$backup --backup_tree=$backup_tree"
@@ -54,12 +54,12 @@ function github_clone() {
 # shopt -s compat31 2>/dev/null
 
 git_tag=
-mysql=mysql
+mysql=mysql-5.5
 mysql_tree=mysql-5.5.35
 jemalloc=jemalloc
 jemalloc_tree=3.3.1
-ftengine=ft-engine
-ftengine_tree=master
+tokudbengine=tokudb-engine
+tokudbengine_tree=master
 ftindex=ft-index
 ftindex_tree=master
 backup=backup-community
@@ -73,13 +73,18 @@ cmake_debug_paranoid=
 
 while [ $# -ne 0 ] ; do
     arg=$1; shift
-    if [[ $arg =~ --(.*)=(.*) ]] ; then
+    if [[ $arg =~ ^--(.*)=(.*) ]] ; then
         eval ${BASH_REMATCH[1]}=${BASH_REMATCH[2]};
     else
         usage; exit 1;
     fi
 done
 
+if [[ $mysql =~ ^(.*)-(([0-9]+\.[0-9]+)\.[0-9]+.*)$ ]] ; then
+    mysql=${BASH_REMATCH[1]}-${BASH_REMATCH[3]}
+    mysql_tree=${BASH_REMATCH[1]}-${BASH_REMATCH[2]}
+fi
+
 # setup environment variables
 build_dir=$PWD/build
 mkdir $build_dir
@@ -101,17 +106,17 @@ github_clone $mysql $mysql_tree $mysql_tree
 github_clone $backup $backup_tree
 
 # checkout the tokudb handlerton
-github_clone $ftengine $ftengine_tree
+github_clone $tokudbengine $tokudbengine_tree
 
 # setup links'
-pushd $ftengine/storage/tokudb
+pushd $tokudbengine/storage/tokudb
 if [ $? != 0 ] ; then exit 1; fi
 ln -s ../../../$ftindex ft-index
 if [ $? != 0 ] ; then exit 1; fi
 popd
 pushd $mysql_tree/storage
 if [ $? != 0 ] ; then exit 1; fi
-ln -s ../../$ftengine/storage/tokudb tokudb
+ln -s ../../$tokudbengine/storage/tokudb tokudb
 if [ $? != 0 ] ; then exit 1; fi
 popd
 pushd $mysql_tree
@@ -121,9 +126,9 @@ if [ $? != 0 ] ; then exit 1; fi
 popd
 pushd $mysql_tree/scripts
 if [ $? != 0 ] ; then exit 1; fi
-ln ../../$ftengine/scripts/tokustat.py
+ln ../../$tokudbengine/scripts/tokustat.py
 if [ $? != 0 ] ; then exit 1; fi
-ln ../../$ftengine/scripts/tokufilecheck.py
+ln ../../$tokudbengine/scripts/tokufilecheck.py
 if [ $? != 0 ] ; then exit 1; fi
 popd
 if [[ $mysql =~ mariadb ]] || [[ $mysql_tree =~ mariadb ]] ; then

scripts/nightly.mysql.build.and.test.bash

@@ -8,9 +8,9 @@ function usage() {
 # generate a script that makes a mysql release and run tests on it
 function make_and_test_mysql() {
     echo $(date) $* >>$nightlytrace 2>&1
-    echo "bash -x \$HOME/github/ft-engine/scripts/tokutek.make.mysql.bash $* >>$mysqltrace 2>&1; \
+    echo "bash -x \$HOME/github/tokudb-engine/scripts/tokutek.make.mysql.bash $* >>$mysqltrace 2>&1; \
         buildexitcode=\$?; \
-        echo \$(date) \$HOME/github/ft-engine/scripts/tokutek.make.mysql.bash -$* \$buildexitcode >>$mysqltrace; \
+        echo \$(date) \$HOME/github/tokudb-engine/scripts/tokutek.make.mysql.bash -$* \$buildexitcode >>$mysqltrace; \
         if [ \$buildexitcode -eq 0 ] ; then \$HOME/bin/test.mysql.bash $* >>/tmp/mysql.test.trace 2>&1; fi" \
         | $gearmandir/bin/gearman -b -f mysql-build-$system-$arch -h $gearmandhost -p 4730 >>$nightlytrace 2>&1
 }
@@ -18,7 +18,7 @@ function make_and_test_mysql() {
 # make a mysql release
 function make_mysql() {
     echo $(date) $* >>$nightlytrace 2>&1
-    echo "\$HOME/github/ft-engine/scripts/tokutek.make.mysql.bash $* >>$mysqltrace 2>&1" | $gearmandir/bin/gearman -b -f mysql-build-$system-$arch -h $gearmandhost -p 4730 >>$nightlytrace 2>&1
+    echo "\$HOME/github/tokudb-engine/scripts/tokutek.make.mysql.bash $* >>$mysqltrace 2>&1" | $gearmandir/bin/gearman -b -f mysql-build-$system-$arch -h $gearmandhost -p 4730 >>$nightlytrace 2>&1
 }
 
 # setup the PATH since cron gives us a minimal PATH

scripts/tokutek.make.mysql.bash

@@ -81,7 +81,7 @@ pushd $build_dir
 if [ $? != 0 ] ; then exit 1; fi
 
 # make mysql
-bash -x $HOME/github/ft-engine/scripts/make.mysql.bash $make_args
+bash -x $HOME/github/tokudb-engine/scripts/make.mysql.bash $make_args
 if [ $? != 0 ] ; then exitcode=1; fi
 
 # generate md5 sums