done

Signed-off-by: wjhuang2016 <[email protected]>
pingcap · Jul 9, 2020 · 6cd1dda · 6cd1dda
1 parent dae1ecb
commit 6cd1dda
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/ddl/index.go b/ddl/index.go
@@ -1218,11 +1218,9 @@ func makeupDecodeColMap(sessCtx sessionctx.Context, t table.Table, indexInfo *mo
 	exprCols, _ := expression.ColumnInfos2ColumnsAndNames(sessCtx, dbName, t.Meta().Name, t.Meta().Columns, t.Meta())
 	mockSchema := expression.NewSchema(exprCols...)
 
-	decodeColMap, err := decoder.BuildFullDecodeColMap(t, mockSchema)
-	if err != nil {
-		return nil, err
-	}
+	decodeColMap := decoder.BuildFullDecodeColMap(t, mockSchema)
 
+	var err error
 	for _, col := range decodeColMap {
 		if col.GenExpr != nil {
 			col.GenExpr, err = col.GenExpr.ResolveIndices(mockSchema)

diff --git a/expression/expression.go b/expression/expression.go
@@ -803,7 +803,9 @@ func ColumnInfos2ColumnsAndNames(ctx sessionctx.Context, dbName, tblName model.C
 			if err != nil {
 				terror.Log(err)
 			}
-			columns[i].VirtualExpr = e.Clone()
+			if e != nil {
+				columns[i].VirtualExpr = e.Clone()
+			}
 		}
 	}
 	return columns, names

diff --git a/util/admin/admin.go b/util/admin/admin.go
@@ -397,8 +397,7 @@ func makeRowDecoder(t table.Table, sctx sessionctx.Context) *decoder.RowDecoder
 	dbName := model.NewCIStr(sctx.GetSessionVars().CurrentDB)
 	exprCols, _ := expression.ColumnInfos2ColumnsAndNames(sctx, dbName, t.Meta().Name, t.Meta().Columns, t.Meta())
 	mockSchema := expression.NewSchema(exprCols...)
-	decodeColsMap, ignored := decoder.BuildFullDecodeColMap(t, mockSchema)
-	_ = ignored
+	decodeColsMap := decoder.BuildFullDecodeColMap(t, mockSchema)
 
 	return decoder.NewRowDecoder(t, decodeColsMap)
 }

diff --git a/util/rowDecoder/decoder.go b/util/rowDecoder/decoder.go
@@ -180,13 +180,13 @@ func (rd *RowDecoder) DecodeAndEvalRowWithMap(ctx sessionctx.Context, handle kv.
 }
 
 // BuildFullDecodeColMap build a map that contains [columnID -> struct{*table.Column, expression.Expression}] from all columns.
-func BuildFullDecodeColMap(t table.Table, schema *expression.Schema) (map[int64]Column, error) {
+func BuildFullDecodeColMap(t table.Table, schema *expression.Schema) map[int64]Column {
 	decodeColMap := make(map[int64]Column, len(t.Cols()))
 	for _, col := range t.Cols() {
 		decodeColMap[col.ID] = Column{
 			Col:     col,
 			GenExpr: schema.Columns[col.Offset].VirtualExpr,
 		}
 	}
-	return decodeColMap, nil
+	return decodeColMap
 }