naming things

Author: zacharysierakowski

localtests/move-tables/three/create.sql …ts/move-tables/multiple-three/create.sqllocaltests/move-tables/three/create.sql renamed to localtests/move-tables/multiple-three/create.sql localtests/move-tables/three/create.sql renamed to localtests/move-tables/multiple-three/create.sql

@@ -5,7 +5,7 @@
 --
 -- These three tables are the canonical superset used by the manual harness
 -- (script/move-tables/setup, reset, insert-source-primary-loop). The `single`
--- and `multi` localtest fixtures move subsets of them.
+-- and `multiple-two` localtest fixtures move subsets of them.
 
 drop table if exists gh_ost_test;
 create table gh_ost_test (

localtests/move-tables/three/tables.txt …ts/move-tables/multiple-three/tables.txtlocaltests/move-tables/three/tables.txt renamed to localtests/move-tables/multiple-three/tables.txt localtests/move-tables/three/tables.txt renamed to localtests/move-tables/multiple-three/tables.txt

@@ -2,7 +2,7 @@
 
 Setup the multi-cluster topology and seed the data. This always seeds the same
 canonical **three** tables on the source — `gh_ost_test`, `gh_ost_test_other`,
-and `gh_ost_test_third` (see `localtests/move-tables/three/create.sql`) — into
+and `gh_ost_test_third` (see `localtests/move-tables/multiple-three/create.sql`) — into
 the `test` database. You then choose how many of them to move via `--move-tables`,
 so `setup`/`reset`/`teardown` behave identically regardless of which scenario you
 run.

localtests/move-tables/multi/create.sql …ests/move-tables/multiple-two/create.sqllocaltests/move-tables/multi/create.sql renamed to localtests/move-tables/multiple-two/create.sql localtests/move-tables/multi/create.sql renamed to localtests/move-tables/multiple-two/create.sql

@@ -8,7 +8,7 @@ SCRIPT_PATH="${GH_OST_ROOT}/script/move-tables"
 DATABASE_NAME="${GH_OST_TEST_DB:-test}"
 
 # The canonical superset of tables seeded by setup (and listed in
-# localtests/move-tables/three/tables.txt). The manual harness always
+# localtests/move-tables/multiple-three/tables.txt). The manual harness always
 # sets up / cleans up all of them, regardless of how many you actually move,
 # so reset works the same no matter which scenario you just ran.
 TABLES=(gh_ost_test gh_ost_test_other gh_ost_test_third)
@@ -23,7 +23,7 @@ source_drop="${source_drop%, }"
 ${SCRIPT_PATH}/mysql-source-primary -D "${DATABASE_NAME}" -e "DROP TABLE IF EXISTS ${source_drop};"
 
 # Recreate and seed source table data, same fixture as setup uses.
-${SCRIPT_PATH}/mysql-source-primary -D "${DATABASE_NAME}" < "${GH_OST_ROOT}/localtests/move-tables/three/create.sql"
+${SCRIPT_PATH}/mysql-source-primary -D "${DATABASE_NAME}" < "${GH_OST_ROOT}/localtests/move-tables/multiple-three/create.sql"
 
 # Drop the moved tables on the target cluster.
 target_drop=""

localtests/move-tables/multi/tables.txt …ests/move-tables/multiple-two/tables.txtlocaltests/move-tables/multi/tables.txt renamed to localtests/move-tables/multiple-two/tables.txt localtests/move-tables/multi/tables.txt renamed to localtests/move-tables/multiple-two/tables.txt

@@ -155,7 +155,7 @@ setup() {
     echo "OK"
 
     echo -n "Seeding data in source cluster..."
-    exec-mysql-source-primary -D $DATABASE_NAME < "$GH_OST_ROOT/localtests/move-tables/three/create.sql"
+    exec-mysql-source-primary -D $DATABASE_NAME < "$GH_OST_ROOT/localtests/move-tables/multiple-three/create.sql"
     echo "OK"
 }