plan, executor: change 'out of order' to 'keep order'. (pingcap#5607)

doerjiayi · Jan 10, 2018 · 3cd1066 · 3cd1066
1 parent 4136b81
commit 3cd1066
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/executor/builder.go b/executor/builder.go
@@ -1189,7 +1189,7 @@ func buildNoRangeIndexReader(b *executorBuilder, v *plan.PhysicalIndexReader) (*
 		tableID:      is.Table.ID,
 		table:        table,
 		index:        is.Index,
-		keepOrder:    !is.OutOfOrder,
+		keepOrder:    is.KeepOrder,
 		desc:         is.Desc,
 		columns:      is.Columns,
 		priority:     b.priority,
@@ -1243,7 +1243,7 @@ func buildNoRangeIndexLookUpReader(b *executorBuilder, v *plan.PhysicalIndexLook
 		tableID:           is.Table.ID,
 		table:             table,
 		index:             is.Index,
-		keepOrder:         !is.OutOfOrder,
+		keepOrder:         is.KeepOrder,
 		desc:              is.Desc,
 		tableRequest:      tableReq,
 		columns:           is.Columns,

diff --git a/plan/explain.go b/plan/explain.go
@@ -52,7 +52,7 @@ func (p *PhysicalIndexScan) ExplainInfo() string {
 			}
 		}
 	}
-	buffer.WriteString(fmt.Sprintf(", out of order:%v", p.OutOfOrder))
+	buffer.WriteString(fmt.Sprintf(", keep order:%v", p.KeepOrder))
 	if p.Desc {
 		buffer.WriteString(", desc")
 	}

diff --git a/plan/physical_plan_builder.go b/plan/physical_plan_builder.go
@@ -259,7 +259,7 @@ func (ds *DataSource) forceToIndexScan(idx *model.IndexInfo, remainedConds []exp
 		Index:            idx,
 		dataSourceSchema: ds.schema,
 		Ranges:           ranger.FullNewRange(),
-		OutOfOrder:       true,
+		KeepOrder:        false,
 	}.init(ds.ctx)
 	is.filterCondition = remainedConds
 	is.stats = ds.stats
@@ -373,9 +373,9 @@ func (ds *DataSource) convertToIndexScan(prop *requiredProp, idx *model.IndexInf
 			cop.tablePlan.(*PhysicalTableScan).appendExtraHandleCol(ds)
 		}
 		cop.keepOrder = true
+		is.KeepOrder = true
 		is.addPushedDownSelection(cop, ds, prop.expectedCnt)
 	} else {
-		is.OutOfOrder = true
 		expectedCnt := math.MaxFloat64
 		if prop.isEmpty() {
 			expectedCnt = prop.expectedCnt

diff --git a/plan/physical_plans.go b/plan/physical_plans.go
@@ -90,13 +90,13 @@ type PhysicalIndexScan struct {
 	AccessCondition []expression.Expression
 	filterCondition []expression.Expression
 
-	Table      *model.TableInfo
-	Index      *model.IndexInfo
-	Ranges     []*ranger.NewRange
-	Columns    []*model.ColumnInfo
-	DBName     model.CIStr
-	Desc       bool
-	OutOfOrder bool
+	Table     *model.TableInfo
+	Index     *model.IndexInfo
+	Ranges    []*ranger.NewRange
+	Columns   []*model.ColumnInfo
+	DBName    model.CIStr
+	Desc      bool
+	KeepOrder bool
 	// DoubleRead means if the index executor will read kv two times.
 	// If the query requires the columns that don't belong to index, DoubleRead will be true.
 	DoubleRead bool