revert index change

Author: James Cor

memory/index.go

@@ -73,15 +73,6 @@ func (idx *Index) Expressions() []string {
 	return exprs
 }
 
-func (idx *Index) UnqualifiedExpressions() []string {
-	exprs := make([]string, len(idx.Exprs))
-	for i, e := range idx.Exprs {
-		str := e.String()
-		exprs[i] = str[strings.IndexByte(str, '.')+1:]
-	}
-	return exprs
-}
-
 func (idx *Index) ExtendedExpressions() []string {
 	var exprs []string
 	foundCols := make(map[string]struct{})

sql/analyzer/index_analyzer_test.go

@@ -15,7 +15,6 @@
 package analyzer
 
 import (
-	"strings"
 	"testing"
 
 	"github.com/stretchr/testify/require"
@@ -132,26 +131,18 @@ type dummyIdx struct {
 
 var _ sql.Index = (*dummyIdx)(nil)
 
-func (i dummyIdx) CanSupport(context *sql.Context, r ...sql.Range) bool {
+func (i *dummyIdx) CanSupport(context *sql.Context, r ...sql.Range) bool {
 	return true
 }
 
-func (i dummyIdx) Expressions() []string {
+func (i *dummyIdx) Expressions() []string {
 	var exprs []string
 	for _, e := range i.expr {
 		exprs = append(exprs, e.String())
 	}
 	return exprs
 }
 
-func (i dummyIdx) UnqualifiedExpressions() []string {
-	exprs := make([]string, len(i.expr))
-	for i, e := range i.expr {
-		str := e.String()
-		exprs[i] = str[strings.IndexByte(str, '.')+1:]
-	}
-	return exprs
-}
 func (i *dummyIdx) ID() string                            { return i.id }
 func (i *dummyIdx) Database() string                      { return i.database }
 func (i *dummyIdx) Table() string                         { return i.table }

sql/index.go

@@ -102,8 +102,6 @@ type Index interface {
 	// one expression, it means the index has multiple columns indexed. If it's
 	// just one, it means it may be an expression or a column.
 	Expressions() []string
-	// UnqualifiedExpressions returns the indexed expressions without the source.
-	UnqualifiedExpressions() []string
 	// IsUnique returns whether this index is unique
 	IsUnique() bool
 	// IsSpatial returns whether this index is a spatial index

sql/index_builder_test.go

@@ -188,14 +188,6 @@ func (i testIndex) Expressions() []string {
 	return res
 }
 
-func (i testIndex) UnqualifiedExpressions() []string {
-	res := make([]string, i.numcols)
-	for i := range res {
-		res[i] = fmt.Sprintf("column_%d", i)
-	}
-	return res
-}
-
 func (testIndex) IsUnique() bool {
 	return false
 }

sql/index_registry_test.go

@@ -16,7 +16,6 @@ package sql
 
 import (
 	"fmt"
-	"strings"
 	"testing"
 
 	"github.com/stretchr/testify/require"
@@ -445,15 +444,6 @@ func (i dummyIdx) Expressions() []string {
 	return exprs
 }
 
-func (i dummyIdx) UnqualifiedExpressions() []string {
-	exprs := make([]string, len(i.expr))
-	for i, e := range i.expr {
-		str := e.String()
-		exprs[i] = str[strings.IndexByte(str, '.')+1:]
-	}
-	return exprs
-}
-
 func (i dummyIdx) ID() string              { return i.id }
 func (i dummyIdx) Database() string        { return i.database }
 func (i dummyIdx) Table() string           { return i.table }

sql/memo/rel_props.go

@@ -133,9 +133,9 @@ func newRelProps(rel RelExpr) *relProps {
 // idxExprsColumns returns the column names used in an index's expressions.
 // Identifiers are ambiguous.
 func idxExprsColumns(idx sql.Index) []string {
-	columns := idx.UnqualifiedExpressions()
+	columns := idx.Expressions()
 	for i := 0; i < len(columns); i++ {
-		columns[i] = strings.ToLower(columns[i])
+		columns[i] = strings.ToLower(columns[i][strings.IndexByte(columns[i], '.')+1:])
 	}
 	return columns
 }
@@ -789,7 +789,7 @@ func sortedColsForRel(rel RelExpr) sql.Schema {
 		}
 	case *MergeJoin:
 		var ret sql.Schema
-		for _, e := range r.InnerScan.Table.Index().UnqualifiedExpressions() {
+		for _, e := range r.InnerScan.Table.Index().Expressions() {
 			// TODO columns can have "." characters, this will miss cases
 			ret = append(ret, &sql.Column{
 				Name:     strings.ToLower(e),

sql/memo/rel_props_test.go

@@ -2,7 +2,6 @@ package memo
 
 import (
 	"fmt"
-	"strings"
 	"testing"
 
 	"github.com/stretchr/testify/require"
@@ -218,14 +217,6 @@ func (i dummyIndex) Expressions() []string {
 	return i.cols
 }
 
-func (i dummyIndex) UnqualifiedExpressions() []string {
-	res := make([]string, len(i.cols))
-	for idx, col := range i.cols {
-		res[idx] = col[strings.IndexByte(col, '.')+1:]
-	}
-	return res
-}
-
 func (dummyIndex) IsUnique() bool {
 	return true
 }

sql/planbuilder/ddl.go

@@ -412,7 +412,7 @@ func (b *Builder) getIndexDefs(table sql.Table) sql.IndexDefs {
 				constraint = sql.IndexConstraint_Unique
 			}
 		}
-		exprs := idx.UnqualifiedExpressions()
+		exprs := idx.Expressions()
 		columns := make([]sql.IndexColumn, len(exprs))
 		for i, col := range exprs {
 			columns[i] = sql.IndexColumn{Name: col}