Skip to content

Commit d0c7bbf

Browse files
committed
[ga-format-pr] Run ./format_repo.sh to fix formatting
1 parent 35a2fb2 commit d0c7bbf

File tree

3 files changed

+45
-40
lines changed

3 files changed

+45
-40
lines changed

sql/rowexec/builder.go

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
package rowexec
1616

1717
import (
18-
"fmt"
19-
"runtime/trace"
18+
"fmt"
19+
"runtime/trace"
2020

21-
"github.com/dolthub/go-mysql-server/sql"
22-
"github.com/dolthub/go-mysql-server/sql/plan"
21+
"github.com/dolthub/go-mysql-server/sql"
22+
"github.com/dolthub/go-mysql-server/sql/plan"
2323
)
2424

2525
var DefaultBuilder = &BaseBuilder{}
@@ -38,25 +38,25 @@ type BaseBuilder struct {
3838

3939
// panicSafeExecBuilder wraps another sql.NodeExecBuilder and converts panics to errors,
4040
// preventing server-wide crashes when integrator-provided builders panic.
41-
type panicSafeExecBuilder struct{
42-
inner sql.NodeExecBuilder
41+
type panicSafeExecBuilder struct {
42+
inner sql.NodeExecBuilder
4343
}
4444

4545
func newPanicSafeExecBuilder(inner sql.NodeExecBuilder) sql.NodeExecBuilder {
46-
if inner == nil {
47-
return nil
48-
}
49-
return &panicSafeExecBuilder{inner: inner}
46+
if inner == nil {
47+
return nil
48+
}
49+
return &panicSafeExecBuilder{inner: inner}
5050
}
5151

5252
func (p *panicSafeExecBuilder) Build(ctx *sql.Context, n sql.Node, r sql.Row) (iter sql.RowIter, err error) {
53-
defer func() {
54-
if rec := recover(); rec != nil {
55-
err = fmt.Errorf("exec builder panic: %v", rec)
56-
iter = nil
57-
}
58-
}()
59-
return p.inner.Build(ctx, n, r)
53+
defer func() {
54+
if rec := recover(); rec != nil {
55+
err = fmt.Errorf("exec builder panic: %v", rec)
56+
iter = nil
57+
}
58+
}()
59+
return p.inner.Build(ctx, n, r)
6060
}
6161

6262
func (b *BaseBuilder) Build(ctx *sql.Context, n sql.Node, r sql.Row) (sql.RowIter, error) {
@@ -65,7 +65,7 @@ func (b *BaseBuilder) Build(ctx *sql.Context, n sql.Node, r sql.Row) (sql.RowIte
6565
}
6666

6767
func NewOverrideBuilder(override sql.NodeExecBuilder) sql.NodeExecBuilder {
68-
return &BaseBuilder{override: newPanicSafeExecBuilder(override)}
68+
return &BaseBuilder{override: newPanicSafeExecBuilder(override)}
6969
}
7070

7171
// FinalizeIters applies the final transformations on sql.RowIter before execution.

sql/rowexec/merge_join.go

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,10 @@ func newMergeJoinIter(ctx *sql.Context, b sql.NodeExecBuilder, j *plan.JoinNode,
4646
return nil, err
4747
}
4848

49-
fullRow := make(sql.Row, len(row)+len(j.Left().Schema())+len(j.Right().Schema()))
50-
if len(row) > 0 {
51-
copy(fullRow, row)
52-
}
49+
fullRow := make(sql.Row, len(row)+len(j.Left().Schema())+len(j.Right().Schema()))
50+
if len(row) > 0 {
51+
copy(fullRow, row)
52+
}
5353

5454
// a merge join's first filter provides direction information
5555
// for which iter to update next
@@ -71,16 +71,21 @@ func newMergeJoinIter(ctx *sql.Context, b sql.NodeExecBuilder, j *plan.JoinNode,
7171
}
7272

7373
var iter sql.RowIter = &mergeJoinIter{
74-
left: l,
75-
right: r,
76-
filters: filters[1:],
77-
cmp: cmp,
78-
typ: j.Op,
79-
fullRow: fullRow,
80-
scopeLen: j.ScopeLen,
81-
// parentLen is the portion of the parent row beyond the current scope.
82-
// Clamp to zero to avoid negative offsets when scopeLen > len(row).
83-
parentLen: func() int { if len(row) >= j.ScopeLen { return len(row) - j.ScopeLen }; return 0 }(),
74+
left: l,
75+
right: r,
76+
filters: filters[1:],
77+
cmp: cmp,
78+
typ: j.Op,
79+
fullRow: fullRow,
80+
scopeLen: j.ScopeLen,
81+
// parentLen is the portion of the parent row beyond the current scope.
82+
// Clamp to zero to avoid negative offsets when scopeLen > len(row).
83+
parentLen: func() int {
84+
if len(row) >= j.ScopeLen {
85+
return len(row) - j.ScopeLen
86+
}
87+
return 0
88+
}(),
8489
leftRowLen: len(j.Left().Schema()),
8590
rightRowLen: len(j.Right().Schema()),
8691
isReversed: j.IsReversed,

sql/rowexec/node_builder.gen.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,14 @@ import (
2626
func (b *BaseBuilder) buildNodeExec(ctx *sql.Context, n sql.Node, row sql.Row) (sql.RowIter, error) {
2727
var iter sql.RowIter
2828
var err error
29-
if b.override != nil {
30-
iter, err = b.override.Build(ctx, n, row)
31-
if err != nil {
32-
// If the override fails, fall back to the default builder
33-
iter = nil
34-
err = nil
35-
}
36-
}
29+
if b.override != nil {
30+
iter, err = b.override.Build(ctx, n, row)
31+
if err != nil {
32+
// If the override fails, fall back to the default builder
33+
iter = nil
34+
err = nil
35+
}
36+
}
3737
if iter == nil {
3838
iter, err = b.buildNodeExecNoAnalyze(ctx, n, row)
3939
}

0 commit comments

Comments
 (0)