Skip to content

Commit b855b92

Browse files
committed
[ga-format-pr] Run ./format_repo.sh to fix formatting
1 parent 9bacd9b commit b855b92

File tree

5 files changed

+4
-5
lines changed

5 files changed

+4
-5
lines changed

sql/analyzer/indexed_joins.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1105,7 +1105,7 @@ func addMergeJoins(ctx *sql.Context, m *memo.Memo) error {
11051105
}
11061106
if rightIndexMatchesFilters(rIndex, join.Left.RelProps.FuncDeps().Constants(), matchedEqFilters) {
11071107
jb := join.Copy()
1108-
if d, ok := jb.Left.First.(*memo.Distinct); ok && lIndex.SqlIdx().IsUnique() {
1108+
if d, ok := jb.Left.First.(*memo.Distinct); ok && lIndex.SqlIdx().IsUnique() {
11091109
jb.Left = d.Child
11101110
}
11111111
if d, ok := jb.Right.First.(*memo.Distinct); ok && rIndex.SqlIdx().IsUnique() {

sql/analyzer/unnest_exists_subqueries.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,6 @@ func unnestExistSubqueries(ctx *sql.Context, scope *plan.Scope, a *Analyzer, fil
151151
retFilters = append(retFilters, f)
152152
continue
153153
}
154-
155154

156155
// recurse
157156
if s.inner != nil {

sql/plan/subquery.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import (
1818
"fmt"
1919
"io"
2020
"sync"
21+
2122
"github.com/dolthub/go-mysql-server/sql"
2223
"github.com/dolthub/go-mysql-server/sql/hash"
2324
"github.com/dolthub/go-mysql-server/sql/transform"
@@ -430,7 +431,7 @@ func (s *Subquery) HashMultiple(ctx *sql.Context, row sql.Row) (sql.KeyValueCach
430431

431432
// HasResultRow returns whether the subquery has a result set > 0.
432433
func (s *Subquery) HasResultRow(ctx *sql.Context, row sql.Row) (bool, error) {
433-
434+
434435
// First check if the query was cached.
435436
s.cacheMu.Lock()
436437
cached := s.resultsCached

sql/rowexec/merge_join.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -588,4 +588,3 @@ func (i *mergeJoinIter) Close(ctx *sql.Context) (err error) {
588588

589589
return err
590590
}
591-

sql/rowexec/rel.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ func (b *BaseBuilder) buildJoinNode(ctx *sql.Context, n *plan.JoinNode, row sql.
282282
case n.Op.IsRange():
283283
return newRangeHeapJoinIter(ctx, b, n, row)
284284
default:
285-
return newJoinIter(ctx, b, n, row)
285+
return newJoinIter(ctx, b, n, row)
286286
}
287287
}
288288

0 commit comments

Comments
 (0)