new override logic

Author: zachmu

server/analyzer/init.go

@@ -117,7 +117,6 @@ func initEngine() {
 	// There are a couple places during analysis where SplitConjunction in GMS cannot correctly split up
 	// Doltgres expressions, so we need to override the default function used.
 	analyzer.SplitConjunction = SplitConjunction
-	analyzer.CostedIndexScanExpressionWalker = &LogicTreeWalker{}
 	memo.SplitConjunction = SplitConjunction
 }
 

server/analyzer/split.go

@@ -16,7 +16,6 @@ package analyzer
 
 import (
 	"github.com/dolthub/go-mysql-server/sql"
-	"github.com/dolthub/go-mysql-server/sql/analyzer"
 	"github.com/dolthub/go-mysql-server/sql/expression"
 
 	pgexprs "github.com/dolthub/doltgresql/server/expression"
@@ -53,9 +52,9 @@ func SplitConjunction(expr sql.Expression) []sql.Expression {
 // to apply indexes.
 type LogicTreeWalker struct{}
 
-var _ analyzer.LogicTreeWalker = &LogicTreeWalker{}
+var _ sql.ExpressionTreeFilter = &LogicTreeWalker{}
 
-// Next implements the analyzer.LogicTreeWalker interface.
+// Next implements the sql.ExpressionTreeFilter interface.
 func (l *LogicTreeWalker) Next(e sql.Expression) sql.Expression {
 	switch expr := e.(type) {
 	case *pgexprs.GMSCast:

servercfg/config.go

@@ -18,6 +18,7 @@ import (
 	"github.com/cockroachdb/errors"
 	doltservercfg "github.com/dolthub/dolt/go/libraries/doltcore/servercfg"
 	"github.com/dolthub/dolt/go/libraries/utils/filesys"
+	"github.com/dolthub/doltgresql/server/analyzer"
 	"github.com/dolthub/go-mysql-server/sql"
 	"gopkg.in/yaml.v2"
 
@@ -43,7 +44,8 @@ func (*DoltgresConfig) Overrides() sql.EngineOverrides {
 			ParseTableAsColumn: expression.NewTableToComposite,
 			Parser:             pgsql.NewPostgresParser(),
 		},
-		SchemaFormatter: pgsql.NewPostgresSchemaFormatter(),
+		SchemaFormatter:                 pgsql.NewPostgresSchemaFormatter(),
+		CostedIndexScanExpressionFilter: &analyzer.LogicTreeWalker{},
 	}
 }