Skip to content

Commit

Permalink
Pass nil sql.QueryFlags to planbuilder.Binder and bump (#8393)
Browse files Browse the repository at this point in the history
  • Loading branch information
jycor authored Oct 4, 2024
1 parent b407a9c commit 7dc5ed5
Show file tree
Hide file tree
Showing 14 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion go/cmd/dolt/commands/dump.go
Original file line number Diff line number Diff line change
Expand Up @@ -440,7 +440,7 @@ func dumpViews(ctx *sql.Context, engine *engine.SqlEngine, root doltdb.RootValue
sqlEngine := engine.GetUnderlyingEngine()
binder := planbuilder.New(ctx, sqlEngine.Analyzer.Catalog, sqlEngine.Parser)
binder.SetParserOptions(sql.NewSqlModeFromString(sqlMode).ParserOptions())
cv, _, _, _, err := binder.Parse(row[fragColIdx].(string), false)
cv, _, _, _, err := binder.Parse(row[fragColIdx].(string), nil, false)
if err != nil {
return err
}
Expand Down
2 changes: 1 addition & 1 deletion go/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ require (
github.com/cespare/xxhash/v2 v2.2.0
github.com/creasty/defaults v1.6.0
github.com/dolthub/flatbuffers/v23 v23.3.3-dh.2
github.com/dolthub/go-mysql-server v0.18.2-0.20241002232427-c25ce0e8480e
github.com/dolthub/go-mysql-server v0.18.2-0.20241003233229-f43dafa9a8d6
github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63
github.com/dolthub/swiss v0.1.0
github.com/goccy/go-json v0.10.2
Expand Down
4 changes: 2 additions & 2 deletions go/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -183,8 +183,8 @@ github.com/dolthub/fslock v0.0.3 h1:iLMpUIvJKMKm92+N1fmHVdxJP5NdyDK5bK7z7Ba2s2U=
github.com/dolthub/fslock v0.0.3/go.mod h1:QWql+P17oAAMLnL4HGB5tiovtDuAjdDTPbuqx7bYfa0=
github.com/dolthub/go-icu-regex v0.0.0-20240916130659-0118adc6b662 h1:aC17hZD6iwzBwwfO5M+3oBT5E5gGRiQPdn+vzpDXqIA=
github.com/dolthub/go-icu-regex v0.0.0-20240916130659-0118adc6b662/go.mod h1:KPUcpx070QOfJK1gNe0zx4pA5sicIK1GMikIGLKC168=
github.com/dolthub/go-mysql-server v0.18.2-0.20241002232427-c25ce0e8480e h1:L5WKxYlGSg+OtiJUakFfEbUoca8YKTBk1Ni008EPaHI=
github.com/dolthub/go-mysql-server v0.18.2-0.20241002232427-c25ce0e8480e/go.mod h1:kXkvkPV9LdB2oCk1wC6mX+GpOayqwlmWJMjPnrGRgAk=
github.com/dolthub/go-mysql-server v0.18.2-0.20241003233229-f43dafa9a8d6 h1:aZwp9SdAzT/Saowo8GXxYzG8UXRjQgLREqpE1Q86eTo=
github.com/dolthub/go-mysql-server v0.18.2-0.20241003233229-f43dafa9a8d6/go.mod h1:kXkvkPV9LdB2oCk1wC6mX+GpOayqwlmWJMjPnrGRgAk=
github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63 h1:OAsXLAPL4du6tfbBgK0xXHZkOlos63RdKYS3Sgw/dfI=
github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63/go.mod h1:lV7lUeuDhH5thVGDCKXbatwKy2KW80L4rMT46n+Y2/Q=
github.com/dolthub/ishell v0.0.0-20240701202509-2b217167d718 h1:lT7hE5k+0nkBdj/1UOSFwjWpNxf+LCApbRHgnCA17XE=
Expand Down
2 changes: 1 addition & 1 deletion go/libraries/doltcore/mvdata/engine_table_reader.go
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ func NewSqlEngineReader(ctx context.Context, dEnv *env.DoltEnv, tableName string

sqlEngine := se.GetUnderlyingEngine()
binder := planbuilder.New(sqlCtx, sqlEngine.Analyzer.Catalog, sqlEngine.Parser)
ret, _, _, _, err := binder.Parse(fmt.Sprintf("show create table `%s`", tableName), false)
ret, _, _, _, err := binder.Parse(fmt.Sprintf("show create table `%s`", tableName), nil, false)
if err != nil {
return nil, err
}
Expand Down
2 changes: 1 addition & 1 deletion go/libraries/doltcore/mvdata/engine_table_writer.go
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ func (s *SqlEngineTableWriter) getInsertNode(inputChannel chan sql.Row, replace
sqlEngine := s.se.GetUnderlyingEngine()
binder := planbuilder.New(s.sqlCtx, sqlEngine.Analyzer.Catalog, sqlEngine.Parser)
insert := fmt.Sprintf("insert into `%s` (%s) VALUES (%s)%s", s.tableName, colNames, values, duplicate)
parsed, _, _, qFlags, err := binder.Parse(insert, false)
parsed, _, _, qFlags, err := binder.Parse(insert, nil, false)
if err != nil {
return nil, fmt.Errorf("error constructing import query '%s': %w", insert, err)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -902,7 +902,7 @@ func convertVitessJsonExpressionString(ctx *sql.Context, value sqltypes.Value) (
}

binder := planbuilder.New(ctx, server.Engine.Analyzer.Catalog, server.Engine.Parser)
node, _, _, qFlags, err := binder.Parse("SELECT "+strValue, false)
node, _, _, qFlags, err := binder.Parse("SELECT "+strValue, nil, false)
if err != nil {
return nil, err
}
Expand Down
2 changes: 1 addition & 1 deletion go/libraries/doltcore/sqle/database.go
Original file line number Diff line number Diff line change
Expand Up @@ -1825,7 +1825,7 @@ func (db Database) doltSchemaTableHash(ctx *sql.Context) (hash.Hash, error) {
func (db Database) createEventDefinitionFromFragment(ctx *sql.Context, frag schemaFragment) (*sql.EventDefinition, error) {
b := planbuilder.New(ctx, db.getCatalog(ctx), sql.NewMysqlParser())
b.SetParserOptions(sql.NewSqlModeFromString(frag.sqlMode).ParserOptions())
parsed, _, _, _, err := b.Parse(updateEventStatusTemporarilyForNonDefaultBranch(db.revision, frag.fragment), false)
parsed, _, _, _, err := b.Parse(updateEventStatusTemporarilyForNonDefaultBranch(db.revision, frag.fragment), nil, false)
if err != nil {
return nil, err
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -604,7 +604,7 @@ func TestIndexedAccess(t *testing.T, e enginetest.QueryEngine, harness enginetes

func analyzeQuery(ctx *sql.Context, e enginetest.QueryEngine, query string) (sql.Node, error) {
binder := planbuilder.New(ctx, e.EngineAnalyzer().Catalog, sql.NewMysqlParser())
parsed, _, _, qFlags, err := binder.Parse(query, false)
parsed, _, _, qFlags, err := binder.Parse(query, nil, false)
if err != nil {
return nil, err
}
Expand Down
2 changes: 1 addition & 1 deletion go/libraries/doltcore/sqle/enginetest/testgen_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ func TestGenNewFormatQueryPlans(t *testing.T) {
_, _ = w.WriteString("\t{\n")
ctx := enginetest.NewContextWithEngine(harness, engine)
binder := planbuilder.New(ctx, engine.EngineAnalyzer().Catalog, sql.NewMysqlParser())
parsed, _, _, qFlags, err := binder.Parse(tt.Query, false)
parsed, _, _, qFlags, err := binder.Parse(tt.Query, nil, false)
require.NoError(t, err)

node, err := engine.EngineAnalyzer().Analyze(ctx, parsed, nil, qFlags)
Expand Down
2 changes: 1 addition & 1 deletion go/libraries/doltcore/sqle/expranalysis/expranalysis.go
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ func parseCreateTable(_ *sql.Context, tableName string, sch schema.Schema) (*pla
parseCtx.SetCurrentDatabase("mydb")

b := planbuilder.New(parseCtx, catalog, sql.NewMysqlParser())
pseudoAnalyzedQuery, _, _, _, err := b.Parse(query, false)
pseudoAnalyzedQuery, _, _, _, err := b.Parse(query, nil, false)
if err != nil {
return nil, err
}
Expand Down
2 changes: 1 addition & 1 deletion go/libraries/doltcore/sqle/index/mergeable_indexes_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1565,7 +1565,7 @@ func TestMergeableIndexesNulls(t *testing.T) {

func ReadRangesFromQuery(ctx *sql.Context, eng *sqle.Engine, query string) ([]*noms.ReadRange, error) {
binder := planbuilder.New(ctx, eng.Analyzer.Catalog, eng.Parser)
parsed, _, _, qFlags, err := binder.Parse(query, false)
parsed, _, _, qFlags, err := binder.Parse(query, nil, false)
if err != nil {
return nil, err
}
Expand Down
2 changes: 1 addition & 1 deletion go/libraries/doltcore/sqle/kvexec/count_agg_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ func TestCountAgg(t *testing.T) {
}

binder := planbuilder.New(ctx, engine.EngineAnalyzer().Catalog, engine.Parser)
node, _, _, qFlags, err := binder.Parse(tt.query, false)
node, _, _, qFlags, err := binder.Parse(tt.query, nil, false)
require.NoError(t, err)
node, err = engine.EngineAnalyzer().Analyze(ctx, node, nil, qFlags)
require.NoError(t, err)
Expand Down
2 changes: 1 addition & 1 deletion go/libraries/doltcore/sqle/kvexec/lookup_join_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ func TestLookupJoin(t *testing.T) {
}

binder := planbuilder.New(ctx, engine.EngineAnalyzer().Catalog, engine.Parser)
node, _, _, qFlags, err := binder.Parse(tt.join, false)
node, _, _, qFlags, err := binder.Parse(tt.join, nil, false)
require.NoError(t, err)
node, err = engine.EngineAnalyzer().Analyze(ctx, node, nil, qFlags)
require.NoError(t, err)
Expand Down
2 changes: 1 addition & 1 deletion go/libraries/doltcore/sqle/sqlutil/schema.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import (
// is used to generate unique tags for the Schema
func ParseCreateTableStatement(ctx *sql.Context, root doltdb.RootValue, engine *sqle.Engine, query string) (string, schema.Schema, error) {
binder := planbuilder.New(ctx, engine.Analyzer.Catalog, engine.Parser)
parsed, _, _, _, err := binder.Parse(query, false)
parsed, _, _, _, err := binder.Parse(query, nil, false)
if err != nil {
return "", nil, err
}
Expand Down

0 comments on commit 7dc5ed5

Please sign in to comment.