Merge commit 'b729a60e019c8fec2cbae007b5b273697cac04b8' into fast-poi…

…nt-select

Conflicts:
	plan/plan.go
	plan/stats.go

plan/plan.go

@@ -40,8 +40,8 @@ type Plan interface {
 
 	context() sessionctx.Context
 
-	// StatsInfo will return the statsInfo for this plan.
-	StatsInfo() *statsInfo
+	// statsInfo will return the statsInfo for this plan.
+	statsInfo() *statsInfo
 }
 
 // taskType is the type of execution task.
@@ -229,9 +229,6 @@ type PhysicalPlan interface {
 	// getChildReqProps gets the required property by child index.
 	getChildReqProps(idx int) *requiredProp
 
-	// StatsInfo will return the statsInfo for this plan.
-	statsInfo() *statsInfo
-
 	// StatsCount returns the count of statsInfo for this plan.
 	StatsCount() float64
 
@@ -355,8 +352,8 @@ func (p *basePlan) ID() int {
 	return p.id
 }
 
-// StatsInfo implements the Plan interface.
-func (p *basePlan) StatsInfo() *statsInfo {
+// statsInfo implements the Plan interface.
+func (p *basePlan) statsInfo() *statsInfo {
 	return p.stats
 }
 

plan/point_select_plan.go

@@ -91,7 +91,7 @@ func (fp *PointSelectPlan) SetChildren(...PhysicalPlan) {}
 func (fp *PointSelectPlan) ResolveIndices() {}
 
 func tryFastPlan(ctx sessionctx.Context, node ast.Node) Plan {
-	if PreparedPlanCacheEnabled || ctx.GetSessionVars().PlanCacheEnabled {
+	if PreparedPlanCacheEnabled {
 		// plan cache not supported yet.
 		return nil
 	}

plan/stats.go

@@ -60,6 +60,10 @@ func (s *statsInfo) scaleByExpectCnt(expectCnt float64) *statsInfo {
 	return s
 }
 
+func newSimpleStats(rowCount float64) *statsInfo {
+	return &statsInfo{count: rowCount}
+}
+
 func (p *basePhysicalPlan) statsInfo() *statsInfo {
 	return p.stats
 }