*: fix bugs that creating index on clustered index table or table with the virtual generated column

ddl/db_test.go

@@ -139,27 +139,44 @@ type testDBSuite6 struct{ *testDBSuite }
 type testDBSuite7 struct{ *testDBSuite }
 type testSerialDBSuite struct{ *testDBSuite }
 
-func (s *testDBSuite4) TestAddIndexWithPK(c *C) {
-	s.tk = testkit.NewTestKit(c, s.store)
-	s.tk.MustExec("use " + s.schemaName)
-
+func testAddIndexWithPK(s *testSerialDBSuite, c *C)  {
+	s.tk.MustExec("drop table if exists test_add_index_with_pk")
 	s.tk.MustExec("create table test_add_index_with_pk(a int not null, b int not null default '0', primary key(a))")
 	s.tk.MustExec("insert into test_add_index_with_pk values(1, 2)")
 	s.tk.MustExec("alter table test_add_index_with_pk add index idx (a)")
 	s.tk.MustQuery("select a from test_add_index_with_pk").Check(testkit.Rows("1"))
 	s.tk.MustExec("insert into test_add_index_with_pk values(2, 2)")
 	s.tk.MustExec("alter table test_add_index_with_pk add index idx1 (a, b)")
 	s.tk.MustQuery("select * from test_add_index_with_pk").Check(testkit.Rows("1 2", "2 2"))
+	s.tk.MustExec("drop table if exists test_add_index_with_pk1")
 	s.tk.MustExec("create table test_add_index_with_pk1(a int not null, b int not null default '0', c int, d int, primary key(c))")
 	s.tk.MustExec("insert into test_add_index_with_pk1 values(1, 1, 1, 1)")
 	s.tk.MustExec("alter table test_add_index_with_pk1 add index idx (c)")
 	s.tk.MustExec("insert into test_add_index_with_pk1 values(2, 2, 2, 2)")
 	s.tk.MustQuery("select * from test_add_index_with_pk1").Check(testkit.Rows("1 1 1 1", "2 2 2 2"))
+	s.tk.MustExec("drop table if exists test_add_index_with_pk2")
 	s.tk.MustExec("create table test_add_index_with_pk2(a int not null, b int not null default '0', c int unsigned, d int, primary key(c))")
 	s.tk.MustExec("insert into test_add_index_with_pk2 values(1, 1, 1, 1)")
 	s.tk.MustExec("alter table test_add_index_with_pk2 add index idx (c)")
 	s.tk.MustExec("insert into test_add_index_with_pk2 values(2, 2, 2, 2)")
 	s.tk.MustQuery("select * from test_add_index_with_pk2").Check(testkit.Rows("1 1 1 1", "2 2 2 2"))
+	s.tk.MustExec("drop table if exists t")
+	s.tk.MustExec("create table t (a int, b int, c int, primary key(a, b));")
+	s.tk.MustExec("insert into t values (1, 2, 3);")
+	s.tk.MustExec("create index idx on t (a, b);")
+}
+
+func (s *testSerialDBSuite) TestAddIndexWithPK(c *C) {
+	s.tk = testkit.NewTestKit(c, s.store)
+	s.tk.MustExec("use " + s.schemaName)
+	config.UpdateGlobal(func(conf *config.Config) {
+		conf.AlterPrimaryKey = false
+	})
+	defer config.RestoreFunc()()
+
+	testAddIndexWithPK(s, c)
+	s.tk.MustExec("set @@tidb_enable_clustered_index = 1;")
+	testAddIndexWithPK(s, c)
 }
 
 func (s *testDBSuite1) TestRenameIndex(c *C) {
@@ -3713,9 +3730,9 @@ func (s *testDBSuite4) TestIfExists(c *C) {
 	s.tk.MustQuery("show warnings").Check(testutil.RowsWithSep("|", "Note|1507|Error in list of partitions to p1"))
 }
 
-func (s *testDBSuite5) TestAddIndexForGeneratedColumn(c *C) {
-	s.tk = testkit.NewTestKit(c, s.store)
+func testAddIndexForGeneratedColumn(s *testSerialDBSuite, c *C) {
 	s.tk.MustExec("use test_db")
+	s.tk.MustExec("drop table if exists t")
 	s.tk.MustExec("create table t(y year NOT NULL DEFAULT '2155')")
 	defer s.mustExec(c, "drop table t;")
 	for i := 0; i < 50; i++ {
@@ -3737,6 +3754,7 @@ func (s *testDBSuite5) TestAddIndexForGeneratedColumn(c *C) {
 	//s.mustExec(c, "alter table t drop index idx_y")
 
 	// Fix issue 9311.
+	s.tk.MustExec("drop table if exists gcai_table")
 	s.tk.MustExec("create table gcai_table (id int primary key);")
 	s.tk.MustExec("insert into gcai_table values(1);")
 	s.tk.MustExec("ALTER TABLE gcai_table ADD COLUMN d date DEFAULT '9999-12-31';")
@@ -3752,6 +3770,17 @@ func (s *testDBSuite5) TestAddIndexForGeneratedColumn(c *C) {
 	s.tk.MustQuery("select id1 from gcai_table use index(idx1)").Check(testkit.Rows("6"))
 	s.tk.MustExec("admin check table gcai_table")
 }
+func (s *testSerialDBSuite) TestAddIndexForGeneratedColumn(c *C) {
+	s.tk = testkit.NewTestKit(c, s.store)
+	config.UpdateGlobal(func(conf *config.Config) {
+		conf.AlterPrimaryKey = false
+	})
+	defer config.RestoreFunc()()
+
+	testAddIndexForGeneratedColumn(s, c)
+	s.tk.MustExec("set @@tidb_enable_clustered_index = 1;")
+	testAddIndexForGeneratedColumn(s, c)
+}
 
 func (s *testDBSuite5) TestModifyGeneratedColumn(c *C) {
 	tk := testkit.NewTestKit(c, s.store)

ddl/index.go

@@ -875,21 +875,13 @@ func (w *addIndexWorker) getIndexRecord(handle kv.Handle, recordKey []byte, rawR
 	cols := t.Cols()
 	idxInfo := w.index.Meta()
 	sysZone := timeutil.SystemLocation()
-	_, err := w.rowDecoder.DecodeAndEvalRowWithMap(w.sessCtx, handle, rawRecord, time.UTC, sysZone, w.rowMap)
+	_, err := w.rowDecoder.DecodeAndEvalRowWithMap(w.sessCtx, handle, rawRecord, time.UTC, sysZone, w.rowMap, t.Meta())
 	if err != nil {
 		return nil, errors.Trace(errCantDecodeIndex.GenWithStackByArgs(err))
 	}
 	idxVal := make([]types.Datum, len(idxInfo.Columns))
 	for j, v := range idxInfo.Columns {
 		col := cols[v.Offset]
-		if col.IsPKHandleColumn(t.Meta()) {
-			if mysql.HasUnsignedFlag(col.Flag) {
-				idxVal[j].SetUint64(uint64(handle.IntValue()))
-			} else {
-				idxVal[j].SetInt64(handle.IntValue())
-			}
-			continue
-		}
 		idxColumnVal, ok := w.rowMap[col.ID]
 		if ok {
 			idxVal[j] = idxColumnVal

executor/batch_checker.go

@@ -86,13 +86,8 @@ func getKeysNeedCheck(ctx context.Context, sctx sessionctx.Context, t table.Tabl
 				break
 			}
 		}
-	}
-	if t.Meta().IsCommonHandle {
-		pkIdx := tables.FindPrimaryIndex(t.Meta())
-		cols := t.Cols()
-		for _, idxCol := range pkIdx.Columns {
-			handleCols = append(handleCols, cols[idxCol.Offset])
-		}
+	} else {
+		handleCols = tables.TryGetCommonPkColumns(t)
 	}
 
 	var err error

executor/builder.go

@@ -1845,13 +1845,8 @@ func (b *executorBuilder) buildAnalyzeColumnsPushdown(task plannercore.AnalyzeCo
 		CmsketchDepth: &depth,
 		CmsketchWidth: &width,
 	}
-	if task.TblInfo != nil && task.TblInfo.IsCommonHandle {
-		pkIdx := tables.FindPrimaryIndex(task.TblInfo)
-		var pkColIds []int64
-		for _, idxCol := range pkIdx.Columns {
-			pkColIds = append(pkColIds, task.TblInfo.Columns[idxCol.Offset].ID)
-		}
-		e.analyzePB.ColReq.PrimaryColumnIds = pkColIds
+	if task.TblInfo != nil {
+		e.analyzePB.ColReq.PrimaryColumnIds = tables.TryGetCommonPkColumnIds(task.TblInfo)
 	}
 	b.err = plannercore.SetPBColumnsDefaultValue(b.ctx, e.analyzePB.ColReq.ColumnsInfo, cols)
 	job := &statistics.AnalyzeJob{DBName: task.DBName, TableName: task.TableName, PartitionName: task.PartitionName, JobInfo: autoAnalyze + "analyze columns"}
@@ -3017,12 +3012,8 @@ func newRowDecoder(ctx sessionctx.Context, schema *expression.Schema, tbl *model
 		}
 	}
 	if len(pkCols) == 0 {
-		if tbl.IsCommonHandle {
-			pkIdx := tables.FindPrimaryIndex(tbl)
-			for _, idxCol := range pkIdx.Columns {
-				pkCols = append(pkCols, tbl.Columns[idxCol.Offset].ID)
-			}
-		} else {
+		pkCols = tables.TryGetCommonPkColumnIds(tbl)
+		if len(pkCols) == 0 {
 			pkCols = []int64{0}
 		}
 	}

executor/point_get.go

@@ -16,6 +16,7 @@ package executor
 import (
 	"context"
 
+	"github.com/pingcap/errors"
 	"github.com/pingcap/failpoint"
 	"github.com/pingcap/parser/model"
 	"github.com/pingcap/parser/mysql"
@@ -354,6 +355,7 @@ func decodeRowValToChunk(e *baseExecutor, tblInfo *model.TableInfo, handle kv.Ha
 }
 
 func decodeOldRowValToChunk(e *baseExecutor, tblInfo *model.TableInfo, handle kv.Handle, rowVal []byte, chk *chunk.Chunk) error {
+	pkCols := tables.TryGetCommonPkColumnIds(tblInfo)
 	colID2CutPos := make(map[int64]int, e.schema.Len())
 	for _, col := range e.schema.Columns {
 		if _, ok := colID2CutPos[col.ID]; !ok {
@@ -374,7 +376,11 @@ func decodeOldRowValToChunk(e *baseExecutor, tblInfo *model.TableInfo, handle kv
 			chk.AppendNull(i)
 			continue
 		}
-		if tryDecodeFromHandle(tblInfo, i, col, handle, chk, decoder) {
+		ok, err := tryDecodeFromHandle(tblInfo, i, col, handle, chk, decoder, pkCols)
+		if err != nil {
+			return err
+		}
+		if ok {
 			continue
 		}
 		cutPos := colID2CutPos[col.ID]
@@ -395,23 +401,28 @@ func decodeOldRowValToChunk(e *baseExecutor, tblInfo *model.TableInfo, handle kv
 	return nil
 }
 
-func tryDecodeFromHandle(tblInfo *model.TableInfo, i int, col *expression.Column, handle kv.Handle, chk *chunk.Chunk, decoder *codec.Decoder) bool {
+func tryDecodeFromHandle(tblInfo *model.TableInfo, i int, col *expression.Column, handle kv.Handle, chk *chunk.Chunk, decoder *codec.Decoder, pkCols []int64) (bool, error) {
 	if tblInfo.PKIsHandle && mysql.HasPriKeyFlag(col.RetType.Flag) {
 		chk.AppendInt64(i, handle.IntValue())
-		return true
+		return true, nil
 	}
 	if col.ID == model.ExtraHandleID {
 		chk.AppendInt64(i, handle.IntValue())
-		return true
-	}
-	if tblInfo.IsCommonHandle && mysql.HasPriKeyFlag(col.RetType.Flag) {
-		_, err := decoder.DecodeOne(handle.EncodedCol(i), i, col.RetType)
-		if err != nil {
-			return false
+		return true, nil
+	}
+	// Try to decode common handle.
+	if mysql.HasPriKeyFlag(col.RetType.Flag) {
+		for i, hid := range pkCols {
+			if col.ID == hid {
+				_, err := decoder.DecodeOne(handle.EncodedCol(i), i, col.RetType)
+				if err != nil {
+					return false, errors.Trace(err)
+				}
+				return true, nil
+			}
 		}
-		return true
 	}
-	return false
+	return false, nil
 }
 
 func getColInfoByID(tbl *model.TableInfo, colID int64) *model.ColumnInfo {

planner/core/plan_to_pb.go

@@ -104,13 +104,7 @@ func (p *PhysicalLimit) ToPB(ctx sessionctx.Context) (*tipb.Executor, error) {
 
 // ToPB implements PhysicalPlan ToPB interface.
 func (p *PhysicalTableScan) ToPB(ctx sessionctx.Context) (*tipb.Executor, error) {
-	var pkColIds []int64
-	if p.Table.IsCommonHandle {
-		pkIdx := tables.FindPrimaryIndex(p.Table)
-		for _, idxCol := range pkIdx.Columns {
-			pkColIds = append(pkColIds, p.Table.Columns[idxCol.Offset].ID)
-		}
-	}
+	pkColIds := tables.TryGetCommonPkColumnIds(p.Table)
 	tsExec := &tipb.TableScan{
 		TableId:          p.Table.ID,
 		Columns:          util.ColumnsToProto(p.Columns, p.Table.PKIsHandle),
@@ -161,10 +155,7 @@ func (p *PhysicalIndexScan) ToPB(ctx sessionctx.Context) (*tipb.Executor, error)
 	}
 	var pkColIds []int64
 	if p.NeedCommonHandle {
-		pkIdx := tables.FindPrimaryIndex(p.Table)
-		for _, idxCol := range pkIdx.Columns {
-			pkColIds = append(pkColIds, p.Table.Columns[idxCol.Offset].ID)
-		}
+		pkColIds = tables.TryGetCommonPkColumnIds(p.Table)
 	}
 	idxExec := &tipb.IndexScan{
 		TableId:          p.Table.ID,

table/tables/tables.go

@@ -497,6 +497,33 @@ func FindPrimaryIndex(tblInfo *model.TableInfo) *model.IndexInfo {
 	return pkIdx
 }
 
+// TryGetCommonPkColumnIds get the IDs of primary key column if the table has common handle.
+func TryGetCommonPkColumnIds(tbl *model.TableInfo) []int64 {
+	var pkColIds []int64
+	if !tbl.IsCommonHandle {
+		return nil
+	}
+	pkIdx := FindPrimaryIndex(tbl)
+	for _, idxCol := range pkIdx.Columns {
+		pkColIds = append(pkColIds, tbl.Columns[idxCol.Offset].ID)
+	}
+	return pkColIds
+}
+
+// TryGetCommonPkColumns get the primary key columns if the table has common handle.
+func TryGetCommonPkColumns(tbl table.Table) []*table.Column {
+	var pkCols []*table.Column
+	if !tbl.Meta().IsCommonHandle {
+		return nil
+	}
+	pkIdx := FindPrimaryIndex(tbl.Meta())
+	cols := tbl.Cols()
+	for _, idxCol := range pkIdx.Columns {
+		pkCols = append(pkCols, cols[idxCol.Offset])
+	}
+	return pkCols
+}
+
 // AddRecord implements table.Table AddRecord interface.
 func (t *TableCommon) AddRecord(ctx sessionctx.Context, r []types.Datum, opts ...table.AddRecordOption) (recordID kv.Handle, err error) {
 	var opt table.AddRecordOpt

util/admin/admin.go

@@ -438,21 +438,13 @@ func iterRecords(sessCtx sessionctx.Context, retriever kv.Retriever, t table.Tab
 			return errors.Trace(err)
 		}
 
-		rowMap, err := rowDecoder.DecodeAndEvalRowWithMap(sessCtx, handle, it.Value(), sessCtx.GetSessionVars().Location(), time.UTC, nil)
+		rowMap, err := rowDecoder.DecodeAndEvalRowWithMap(sessCtx, handle, it.Value(), sessCtx.GetSessionVars().Location(), time.UTC, nil, t.Meta())
 		if err != nil {
 			return errors.Trace(err)
 		}
 		data := make([]types.Datum, 0, len(cols))
 		for _, col := range cols {
-			if col.IsPKHandleColumn(t.Meta()) {
-				if mysql.HasUnsignedFlag(col.Flag) {
-					data = append(data, types.NewUintDatum(uint64(handle.IntValue())))
-				} else {
-					data = append(data, types.NewIntDatum(handle.IntValue()))
-				}
-			} else {
-				data = append(data, rowMap[col.ID])
-			}
+			data = append(data, rowMap[col.ID])
 		}
 		more, err := fn(handle.IntValue(), data, cols)
 		if !more || err != nil {