plan: refine code. (pingcap#5565)

stevenberge · Jan 5, 2018 · c7b13ef · c7b13ef
1 parent c45111d
commit c7b13ef
Showing 1 changed file with 4 additions and 9 deletions.
diff --git a/plan/physical_plan_builder.go b/plan/physical_plan_builder.go
@@ -392,9 +392,8 @@ func (ds *DataSource) convertToIndexScan(prop *requiredProp, idx *model.IndexInf
 	return task, nil
 }
 
-// TODO: refine this.
 func (is *PhysicalIndexScan) initSchema(id int, idx *model.IndexInfo, isDoubleRead bool) {
-	var indexCols []*expression.Column
+	indexCols := make([]*expression.Column, 0, len(idx.Columns))
 	for _, col := range idx.Columns {
 		indexCols = append(indexCols, &expression.Column{FromID: id, Position: col.Offset})
 	}
@@ -455,13 +454,9 @@ func matchIndicesProp(idxCols []*model.IndexColumn, propCols []*expression.Colum
 func splitIndexFilterConditions(conditions []expression.Expression, indexColumns []*model.IndexColumn,
 	table *model.TableInfo) (indexConds, tableConds []expression.Expression) {
 	var pkName model.CIStr
-	if table.PKIsHandle {
-		for _, colInfo := range table.Columns {
-			if mysql.HasPriKeyFlag(colInfo.Flag) {
-				pkName = colInfo.Name
-				break
-			}
-		}
+	pkInfo := table.GetPkColInfo()
+	if pkInfo != nil {
+		pkName = pkInfo.Name
 	}
 	var indexConditions, tableConditions []expression.Expression
 	for _, cond := range conditions {