*: fix parallel execution "alter index" (cherry-pick #45582 and fixed…

… "alter index" issue) (#45584) close #45575
pingcap · Jul 27, 2023 · 4b8ac1a · 4b8ac1a
1 parent 2db988e
commit 4b8ac1a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/ddl/db_change_test.go b/ddl/db_change_test.go
@@ -946,6 +946,16 @@ func (s *stateChangeSuite) TestShowIndex() {
 	tk.MustQuery("select key_name, clustered from information_schema.tidb_indexes where table_name = 'tr' order by key_name").Check(testkit.Rows("PRIMARY NO", "vv NO"))
 }
 
+func (s *stateChangeSuite) TestParallelAlterIndex() {
+	sql := "alter table t alter index idx1 invisible;"
+	f := func(err1, err2 error) {
+		s.Require().NoError(err1)
+		s.Require().NoError(err2)
+		s.tk.MustExec("select * from t")
+	}
+	s.testControlParallelExecSQL("", sql, sql, f)
+}
+
 func (s *stateChangeSuite) TestParallelAlterModifyColumn() {
 	sql := "ALTER TABLE t MODIFY COLUMN b int FIRST;"
 	f := func(err1, err2 error) {

diff --git a/ddl/index.go b/ddl/index.go
@@ -1002,6 +1002,7 @@ func checkAlterIndexVisibility(t *meta.Meta, job *model.Job) (*model.TableInfo,
 		return nil, indexName, invisible, errors.Trace(err)
 	}
 	if skip {
+		job.State = model.JobStateDone
 		return nil, indexName, invisible, nil
 	}
 	return tblInfo, indexName, invisible, nil