From fc28d0c3db7942aa058804e2844a46703df49c8c Mon Sep 17 00:00:00 2001 From: ti-srebot <66930949+ti-srebot@users.noreply.github.com> Date: Wed, 21 Oct 2020 11:38:44 +0800 Subject: [PATCH] syncer: split DDL after fetching online DDL to execute (#1184) Signed-off-by: ti-srebot Co-authored-by: lance6716 --- go.mod | 2 +- go.sum | 2 ++ tests/_utils/run_sql_file_online_ddl | 4 ++++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index d66ba80b55..7b8e9eb665 100644 --- a/go.mod +++ b/go.mod @@ -24,7 +24,7 @@ require ( github.com/pingcap/errors v0.11.5-0.20200917111840-a15ef68f753d github.com/pingcap/failpoint v0.0.0-20200702092429-9f69995143ce github.com/pingcap/log v0.0.0-20200828042413-fce0951f1463 - github.com/pingcap/parser v0.0.0-20200924053142-5d7e8ebf605e + github.com/pingcap/parser v0.0.0-20201020021731-5af7d42c2022 github.com/pingcap/tidb v1.1.0-beta.0.20200927065602-486e473a86e9 github.com/pingcap/tidb-tools v4.0.7-0.20200927084250-e47e0e12c7f3+incompatible github.com/prometheus/client_golang v1.5.1 diff --git a/go.sum b/go.sum index 4e78dc86e1..0709ae412e 100644 --- a/go.sum +++ b/go.sum @@ -608,6 +608,8 @@ github.com/pingcap/parser v0.0.0-20200821073936-cf85e80665c4/go.mod h1:vQdbJqobJ github.com/pingcap/parser v0.0.0-20200909072241-6dac7bb703e2/go.mod h1:RlLfMRJwFBSiXd2lUaWdV5pSXtrpyvZM8k5bbZWsheU= github.com/pingcap/parser v0.0.0-20200924053142-5d7e8ebf605e h1:IFD2pEbIcN+EzG/RGMLrv/Tt6U9KzJGT6hSbGkQ1v7c= github.com/pingcap/parser v0.0.0-20200924053142-5d7e8ebf605e/go.mod h1:RlLfMRJwFBSiXd2lUaWdV5pSXtrpyvZM8k5bbZWsheU= +github.com/pingcap/parser v0.0.0-20201020021731-5af7d42c2022 h1:OQb5ZNXI0mkc04nGob7czVaowOWnyLT2QOhYBlIDLMc= +github.com/pingcap/parser v0.0.0-20201020021731-5af7d42c2022/go.mod h1:RlLfMRJwFBSiXd2lUaWdV5pSXtrpyvZM8k5bbZWsheU= github.com/pingcap/pd/v4 v4.0.0-rc.1.0.20200422143320-428acd53eba2 h1:JTzYYukREvxVSKW/ncrzNjFitd8snoQ/Xz32pw8i+s8= github.com/pingcap/pd/v4 v4.0.0-rc.1.0.20200422143320-428acd53eba2/go.mod h1:s+utZtXDznOiL24VK0qGmtoHjjXNsscJx3m1n8cC56s= github.com/pingcap/pd/v4 v4.0.0-rc.2.0.20200520083007-2c251bd8f181/go.mod h1:q4HTx/bA8aKBa4S7L+SQKHvjRPXCRV0tA0yRw0qkZSA= diff --git a/tests/_utils/run_sql_file_online_ddl b/tests/_utils/run_sql_file_online_ddl index fde24db7f9..d27582c129 100755 --- a/tests/_utils/run_sql_file_online_ddl +++ b/tests/_utils/run_sql_file_online_ddl @@ -42,6 +42,10 @@ do --alter="$alter" D=$schema,t=$table \ --recursion-method=none --print --execute \ >> $TEST_DIR/pt-osc.log + $ptosc_bin --user=root --host=$host --port=$port --password=$password \ + --alter "row_format=compressed key_block_size=8" D=$schema,t=$table \ + --recursion-method=none --print --execute \ + >> $TEST_DIR/pt-osc.log else mysql -uroot -h$host -P$port -p$password --default-character-set utf8 -E -e "use $schema; $line" >> "$TEST_DIR/sql_res.$TEST_NAME.txt" fi