ddl: make the column type change switch transparent (#25213)

pingcap · Jun 8, 2021 · 7538818 · 7538818
1 parent a7f3c4d
commit 7538818
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 1 deletion.
diff --git a/ddl/column_test.go b/ddl/column_test.go
@@ -1159,6 +1159,8 @@ func (s *testColumnSuite) TestModifyColumn(c *C) {
 		WithLease(testLease),
 	)
 	ctx := testNewContext(d)
+	ctx.GetSessionVars().EnableChangeColumnType = false
+
 	defer func() {
 		err := d.Stop()
 		c.Assert(err, IsNil)

diff --git a/ddl/column_type_change_test.go b/ddl/column_type_change_test.go
@@ -1651,6 +1651,7 @@ func (s *testColumnTypeChangeSuite) TestRowFormat(c *C) {
 func (s *testColumnTypeChangeSuite) TestColumnTypeChangeFlenErrorMsg(c *C) {
 	tk := testkit.NewTestKit(c, s.store)
 	tk.MustExec("use test")
+	tk.Se.GetSessionVars().EnableChangeColumnType = false
 
 	tk.MustExec("drop table if exists t")
 	tk.MustExec("create table t(a int4)")

diff --git a/ddl/db_change_test.go b/ddl/db_change_test.go
@@ -82,6 +82,11 @@ func (s *testStateChangeSuiteBase) SetUpSuite(c *C) {
 	c.Assert(err, IsNil)
 	_, err = s.se.Execute(context.Background(), "use test_db_state")
 	c.Assert(err, IsNil)
+	// Set the variable to default 0 as it was before in case of modifying the test.
+	_, err = s.se.Execute(context.Background(), "set @@global.tidb_enable_change_column_type=0")
+	c.Assert(err, IsNil)
+	_, err = s.se.Execute(context.Background(), "set @@tidb_enable_change_column_type=0")
+	c.Assert(err, IsNil)
 	s.p = parser.New()
 }
 

diff --git a/ddl/db_integration_test.go b/ddl/db_integration_test.go
@@ -88,6 +88,10 @@ func setupIntegrationSuite(s *testIntegrationSuite, c *C) {
 	s.ctx = se.(sessionctx.Context)
 	_, err = se.Execute(context.Background(), "create database test_db")
 	c.Assert(err, IsNil)
+	_, err = se.Execute(context.Background(), "set @@global.tidb_enable_change_column_type=0")
+	c.Assert(err, IsNil)
+	_, err = se.Execute(context.Background(), "set @@tidb_enable_change_column_type=0")
+	c.Assert(err, IsNil)
 }
 
 func tearDownIntegrationSuiteTest(s *testIntegrationSuite, c *C) {

diff --git a/ddl/db_test.go b/ddl/db_test.go
@@ -123,6 +123,10 @@ func setUpSuite(s *testDBSuite, c *C) {
 	c.Assert(err, IsNil)
 	_, err = s.s.Execute(context.Background(), "set @@global.tidb_max_delta_schema_count= 4096")
 	c.Assert(err, IsNil)
+	_, err = s.s.Execute(context.Background(), "set @@global.tidb_enable_change_column_type=0")
+	c.Assert(err, IsNil)
+	_, err = s.s.Execute(context.Background(), "set @@tidb_enable_change_column_type=0")
+	c.Assert(err, IsNil)
 }
 
 func tearDownSuite(s *testDBSuite, c *C) {

diff --git a/executor/executor_test.go b/executor/executor_test.go
@@ -202,6 +202,13 @@ func (s *baseTestSuite) SetUpSuite(c *C) {
 	}
 	d, err := session.BootstrapSession(s.store)
 	c.Assert(err, IsNil)
+	se, err := session.CreateSession4Test(s.store)
+	c.Assert(err, IsNil)
+	// Set the variable to default 0 as it was before in case of modifying the test.
+	_, err = se.Execute(context.Background(), "set @@global.tidb_enable_change_column_type=0")
+	c.Assert(err, IsNil)
+	_, err = se.Execute(context.Background(), "set @@tidb_enable_change_column_type=0")
+	c.Assert(err, IsNil)
 	d.SetStatsUpdating(true)
 	s.domain = d
 	config.UpdateGlobal(func(conf *config.Config) {

diff --git a/expression/integration_test.go b/expression/integration_test.go
@@ -94,6 +94,13 @@ func (s *testIntegrationSuiteBase) SetUpSuite(c *C) {
 	s.store, s.dom, err = newStoreWithBootstrap()
 	c.Assert(err, IsNil)
 	s.ctx = mock.NewContext()
+	se, err := session.CreateSession4Test(s.store)
+	c.Assert(err, IsNil)
+	// Set the variable to default 0 as it was before in case of modifying the test.
+	_, err = se.Execute(context.Background(), "set @@global.tidb_enable_change_column_type=0")
+	c.Assert(err, IsNil)
+	_, err = se.Execute(context.Background(), "set @@tidb_enable_change_column_type=0")
+	c.Assert(err, IsNil)
 }
 
 func (s *testIntegrationSuiteBase) TearDownSuite(c *C) {

diff --git a/sessionctx/variable/tidb_vars.go b/sessionctx/variable/tidb_vars.go
@@ -650,7 +650,7 @@ const (
 	DefTiDBDDLReorgBatchSize           = 256
 	DefTiDBDDLErrorCountLimit          = 512
 	DefTiDBMaxDeltaSchemaCount         = 1024
-	DefTiDBChangeColumnType            = false
+	DefTiDBChangeColumnType            = true
 	DefTiDBChangeMultiSchema           = false
 	DefTiDBPointGetCache               = false
 	DefTiDBEnableAlterPlacement        = false