From eb29a65ef2f521adea0f84d0199bb30d986a7d8a Mon Sep 17 00:00:00 2001 From: Lynn Date: Tue, 11 Aug 2020 11:01:02 +0800 Subject: [PATCH] ddl: tiny clean up and typo (#19110) --- ddl/db_change_test.go | 4 ++-- ddl/ddl_test.go | 8 ++++---- ddl/index.go | 10 ++-------- 3 files changed, 8 insertions(+), 14 deletions(-) diff --git a/ddl/db_change_test.go b/ddl/db_change_test.go index 0363954fb1..06f9f53d3f 100644 --- a/ddl/db_change_test.go +++ b/ddl/db_change_test.go @@ -1315,7 +1315,7 @@ func (s *testStateChangeSuite) TestParallelDDLBeforeRunDDLJob(c *C) { return info } d := s.dom.DDL() - d.(ddl.DDLForTest).SetInterceptoror(intercept) + d.(ddl.DDLForTest).SetInterceptor(intercept) // Make sure the connection 1 executes a SQL before the connection 2. // And the connection 2 executes a SQL with an outdated information schema. @@ -1343,7 +1343,7 @@ func (s *testStateChangeSuite) TestParallelDDLBeforeRunDDLJob(c *C) { wg.Wait() intercept = &ddl.TestInterceptor{} - d.(ddl.DDLForTest).SetInterceptoror(intercept) + d.(ddl.DDLForTest).SetInterceptor(intercept) } func (s *testStateChangeSuite) TestParallelAlterSchemaCharsetAndCollate(c *C) { diff --git a/ddl/ddl_test.go b/ddl/ddl_test.go index f70d8b9140..4efac65375 100644 --- a/ddl/ddl_test.go +++ b/ddl/ddl_test.go @@ -38,8 +38,8 @@ import ( type DDLForTest interface { // SetHook sets the hook. SetHook(h Callback) - // SetInterceptoror sets the interceptor. - SetInterceptoror(h Interceptor) + // SetInterceptor sets the interceptor. + SetInterceptor(h Interceptor) } // SetHook implements DDL.SetHook interface. @@ -50,8 +50,8 @@ func (d *ddl) SetHook(h Callback) { d.mu.hook = h } -// SetInterceptoror implements DDL.SetInterceptoror interface. -func (d *ddl) SetInterceptoror(i Interceptor) { +// SetInterceptor implements DDL.SetInterceptor interface. +func (d *ddl) SetInterceptor(i Interceptor) { d.mu.Lock() defer d.mu.Unlock() diff --git a/ddl/index.go b/ddl/index.go index 145bc9fa26..900589a915 100644 --- a/ddl/index.go +++ b/ddl/index.go @@ -1202,13 +1202,7 @@ func (w *addIndexWorker) run(d *ddlCtx) { logutil.BgLogger().Info("[ddl] add index worker exit", zap.Int("workerID", w.id)) } -func makeupDecodeColMap(sessCtx sessionctx.Context, t table.Table, indexInfo *model.IndexInfo) (map[int64]decoder.Column, error) { - cols := t.Cols() - indexedCols := make([]*table.Column, len(indexInfo.Columns)) - for i, v := range indexInfo.Columns { - indexedCols[i] = cols[v.Offset] - } - +func makeupDecodeColMap(sessCtx sessionctx.Context, t table.Table) (map[int64]decoder.Column, error) { dbName := model.NewCIStr(sessCtx.GetSessionVars().CurrentDB) exprCols, _, err := expression.ColumnInfos2ColumnsAndNames(sessCtx, dbName, t.Meta().Name, t.Meta().Columns, t.Meta()) if err != nil { @@ -1419,7 +1413,7 @@ func (w *worker) addPhysicalTableIndex(t table.PhysicalTable, indexInfo *model.I startHandle, endHandle := reorgInfo.StartHandle, reorgInfo.EndHandle sessCtx := newContext(reorgInfo.d.store) - decodeColMap, err := makeupDecodeColMap(sessCtx, t, indexInfo) + decodeColMap, err := makeupDecodeColMap(sessCtx, t) if err != nil { return errors.Trace(err) }