clean up

Author: James Cor

sql/analyzer/replace_sort.go

@@ -57,9 +57,8 @@ func replaceIdxSortHelper(ctx *sql.Context, scope *plan.Scope, node sql.Node, so
 			return n, transform.NewTree, nil
 		}
 
-		// TODO: need to check for indexOrder = None?
 		// if the index is not reversible, do nothing
-		if oi, ok := lookup.Index.(sql.OrderedIndex); ok && !oi.Reversible() {
+		if oi, ok := lookup.Index.(sql.OrderedIndex); ok && (!oi.Reversible() || oi.Order() == sql.IndexOrderNone) {
 			return n, transform.SameTree, nil
 		}
 		lookup = sql.NewIndexLookup(

sql/plan/join.go

@@ -291,7 +291,6 @@ type JoinNode struct {
 	CommentStr string
 	ScopeLen   int
 	UsingCols  []string
-
 	IsReversed bool
 }
 

sql/rowexec/merge_join.go

@@ -82,8 +82,7 @@ func newMergeJoinIter(ctx *sql.Context, b sql.NodeExecBuilder, j *plan.JoinNode,
 		parentLen:   len(row) - j.ScopeLen,
 		leftRowLen:  len(j.Left().Schema()),
 		rightRowLen: len(j.Right().Schema()),
-
-		isReversed: j.IsReversed,
+		isReversed:  j.IsReversed,
 	}
 	return iter, nil
 }
@@ -116,6 +115,8 @@ type mergeJoinIter struct {
 	// leftMatched indicates whether the current left in |i.fullRow|
 	// has satisfied the join condition.
 	leftMatched bool
+	// isReversed indicates if this join is over two reversed indexes.
+	isReversed bool
 
 	// lifecycle maintenance
 	init           bool
@@ -127,8 +128,6 @@ type mergeJoinIter struct {
 	leftRowLen  int
 	rightRowLen int
 	parentLen   int
-
-	isReversed bool
 }
 
 var _ sql.RowIter = (*mergeJoinIter)(nil)