planner: set the partition id to table id in DAG request (#14745)

pingcap · Feb 14, 2020 · 36d2dbb · 36d2dbb
1 parent f71425b
commit 36d2dbb
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/planner/core/plan_to_pb.go b/planner/core/plan_to_pb.go
@@ -95,6 +95,9 @@ func (p *PhysicalTableScan) ToPB(ctx sessionctx.Context) (*tipb.Executor, error)
 		Columns: model.ColumnsToProto(p.Columns, p.Table.PKIsHandle),
 		Desc:    p.Desc,
 	}
+	if p.isPartition {
+		tsExec.TableId = p.physicalTableID
+	}
 	err := SetPBColumnsDefaultValue(ctx, tsExec.Columns, p.Columns)
 	return &tipb.Executor{Tp: tipb.ExecType_TypeTableScan, TblScan: tsExec}, err
 }
@@ -140,6 +143,9 @@ func (p *PhysicalIndexScan) ToPB(ctx sessionctx.Context) (*tipb.Executor, error)
 		Columns: model.ColumnsToProto(columns, p.Table.PKIsHandle),
 		Desc:    p.Desc,
 	}
+	if p.isPartition {
+		idxExec.TableId = p.physicalTableID
+	}
 	unique := checkCoverIndex(p.Index, p.Ranges)
 	idxExec.Unique = &unique
 	return &tipb.Executor{Tp: tipb.ExecType_TypeIndexScan, IdxScan: idxExec}, nil