Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

executor: enable revive #45138

Merged
merged 31 commits into from Jul 5, 2023
Merged

executor: enable revive #45138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
04f26ab
config: enable revive
hawkingrei Jul 4, 2023
2999d66
update
hawkingrei Jul 4, 2023
9bda053
update
hawkingrei Jul 4, 2023
cee394f
update
hawkingrei Jul 4, 2023
8b65b56
update
hawkingrei Jul 4, 2023
dd35753
update
hawkingrei Jul 4, 2023
5438cc6
update
hawkingrei Jul 4, 2023
2a726bc
update
hawkingrei Jul 4, 2023
40f39c3
update
hawkingrei Jul 4, 2023
a9eedd9
update
hawkingrei Jul 4, 2023
4c56490
update
hawkingrei Jul 4, 2023
6830809
update
hawkingrei Jul 4, 2023
8136f01
update
hawkingrei Jul 4, 2023
ac89ab4
update
hawkingrei Jul 4, 2023
6a7a428
update
hawkingrei Jul 4, 2023
4812c4f
update
hawkingrei Jul 4, 2023
812a30c
update
hawkingrei Jul 4, 2023
f14c14b
update
hawkingrei Jul 4, 2023
d4cb1ff
update
hawkingrei Jul 4, 2023
03fbca6
update
hawkingrei Jul 4, 2023
ec56398
update
hawkingrei Jul 4, 2023
124b894
update
hawkingrei Jul 4, 2023
a598314
update
hawkingrei Jul 4, 2023
1340718
update
hawkingrei Jul 4, 2023
6ec19dc
update
hawkingrei Jul 4, 2023
bb33134
update
hawkingrei Jul 4, 2023
78e607c
update
hawkingrei Jul 4, 2023
cb72702
update
hawkingrei Jul 4, 2023
4f5999a
update
hawkingrei Jul 4, 2023
1ca0a94
update
hawkingrei Jul 4, 2023
01a8884
update
hawkingrei Jul 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions build/nogo_config.json
View file
Open in desktop
Expand Up @@ -500,7 +500,12 @@
"br/pkg/lightning/": "br/pkg/lightning/",
"executor/aggregate.go": "executor/aggregate.go",
"executor/analyze_utils.go": "executor/analyze_utils.go",
"executor/change.go": "executor/change.go",
"executor/analyze_fast.go": "executor/analyze_fast.go",
"executor/internal/": "executor/internal/",
"executor/aggfuncs/": "executor/aggfuncs/",
"executor/asyncloaddata/": "executor/asyncloaddata/",
"executor/importer/": "executor/importer/",
"types/json_binary_functions.go": "types/json_binary_functions.go",
"types/json_binary_test.go": "types/json_binary_test.go",
"ddl/": "ddl",
Expand Down
2 changes: 1 addition & 1 deletion executor/aggfuncs/aggfuncs.go
View file
Open in desktop
Expand Up @@ -192,7 +192,7 @@ type baseAggFunc struct {
retTp *types.FieldType
}

func (*baseAggFunc) MergePartialResult(sctx sessionctx.Context, src, dst PartialResult) (memDelta int64, err error) {
func (*baseAggFunc) MergePartialResult(sessionctx.Context, PartialResult, PartialResult) (memDelta int64, err error) {
return 0, nil
}

Expand Down
3 changes: 1 addition & 2 deletions executor/aggfuncs/builder.go
View file
Open in desktop
Expand Up @@ -703,8 +703,7 @@ func buildLeadLag(ctx sessionctx.Context, aggFuncDesc *aggregation.AggFuncDesc,
defaultExpr = expression.NewNull()
if len(aggFuncDesc.Args) == 3 {
defaultExpr = aggFuncDesc.Args[2]
switch et := defaultExpr.(type) {
case *expression.Constant:
if et, ok := defaultExpr.(*expression.Constant); ok {
res, err1 := et.Value.ConvertTo(ctx.GetSessionVars().StmtCtx, aggFuncDesc.RetTp)
if err1 == nil {
defaultExpr = &expression.Constant{Value: res, RetType: aggFuncDesc.RetTp}
Expand Down
28 changes: 14 additions & 14 deletions executor/aggfuncs/func_avg.go
View file
Open in desktop
Expand Up @@ -52,17 +52,17 @@ type partialResult4AvgDecimal struct {
count int64
}

func (e *baseAvgDecimal) AllocPartialResult() (pr PartialResult, memDelta int64) {
func (*baseAvgDecimal) AllocPartialResult() (pr PartialResult, memDelta int64) {
return PartialResult(&partialResult4AvgDecimal{}), DefPartialResult4AvgDecimalSize
}

func (e *baseAvgDecimal) ResetPartialResult(pr PartialResult) {
func (*baseAvgDecimal) ResetPartialResult(pr PartialResult) {
p := (*partialResult4AvgDecimal)(pr)
p.sum = *types.NewDecFromInt(0)
p.count = int64(0)
}

func (e *baseAvgDecimal) AppendFinalResult2Chunk(sctx sessionctx.Context, pr PartialResult, chk *chunk.Chunk) error {
func (e *baseAvgDecimal) AppendFinalResult2Chunk(_ sessionctx.Context, pr PartialResult, chk *chunk.Chunk) error {
p := (*partialResult4AvgDecimal)(pr)
if p.count == 0 {
chk.AppendNull(e.ordinal)
Expand Down Expand Up @@ -188,7 +188,7 @@ func (e *avgPartial4Decimal) UpdatePartialResult(sctx sessionctx.Context, rowsIn
return 0, nil
}

func (e *avgPartial4Decimal) MergePartialResult(sctx sessionctx.Context, src, dst PartialResult) (memDelta int64, err error) {
func (*avgPartial4Decimal) MergePartialResult(_ sessionctx.Context, src, dst PartialResult) (memDelta int64, err error) {
p1, p2 := (*partialResult4AvgDecimal)(src), (*partialResult4AvgDecimal)(dst)
if p1.count == 0 {
return 0, nil
Expand All @@ -212,15 +212,15 @@ type avgOriginal4DistinctDecimal struct {
baseAggFunc
}

func (e *avgOriginal4DistinctDecimal) AllocPartialResult() (pr PartialResult, memDelta int64) {
func (*avgOriginal4DistinctDecimal) AllocPartialResult() (pr PartialResult, memDelta int64) {
valSet, setSize := set.NewStringSetWithMemoryUsage()
p := &partialResult4AvgDistinctDecimal{
valSet: valSet,
}
return PartialResult(p), DefPartialResult4AvgDistinctDecimalSize + setSize
}

func (e *avgOriginal4DistinctDecimal) ResetPartialResult(pr PartialResult) {
func (*avgOriginal4DistinctDecimal) ResetPartialResult(pr PartialResult) {
p := (*partialResult4AvgDistinctDecimal)(pr)
p.sum = *types.NewDecFromInt(0)
p.count = int64(0)
Expand Down Expand Up @@ -258,7 +258,7 @@ func (e *avgOriginal4DistinctDecimal) UpdatePartialResult(sctx sessionctx.Contex
return memDelta, nil
}

func (e *avgOriginal4DistinctDecimal) AppendFinalResult2Chunk(sctx sessionctx.Context, pr PartialResult, chk *chunk.Chunk) error {
func (e *avgOriginal4DistinctDecimal) AppendFinalResult2Chunk(_ sessionctx.Context, pr PartialResult, chk *chunk.Chunk) error {
p := (*partialResult4AvgDistinctDecimal)(pr)
if p.count == 0 {
chk.AppendNull(e.ordinal)
Expand Down Expand Up @@ -300,17 +300,17 @@ type partialResult4AvgFloat64 struct {
count int64
}

func (e *baseAvgFloat64) AllocPartialResult() (pr PartialResult, memDelta int64) {
func (*baseAvgFloat64) AllocPartialResult() (pr PartialResult, memDelta int64) {
return (PartialResult)(&partialResult4AvgFloat64{}), DefPartialResult4AvgFloat64Size
}

func (e *baseAvgFloat64) ResetPartialResult(pr PartialResult) {
func (*baseAvgFloat64) ResetPartialResult(pr PartialResult) {
p := (*partialResult4AvgFloat64)(pr)
p.sum = 0
p.count = 0
}

func (e *baseAvgFloat64) AppendFinalResult2Chunk(sctx sessionctx.Context, pr PartialResult, chk *chunk.Chunk) error {
func (e *baseAvgFloat64) AppendFinalResult2Chunk(_ sessionctx.Context, pr PartialResult, chk *chunk.Chunk) error {
p := (*partialResult4AvgFloat64)(pr)
if p.count == 0 {
chk.AppendNull(e.ordinal)
Expand Down Expand Up @@ -402,7 +402,7 @@ func (e *avgPartial4Float64) UpdatePartialResult(sctx sessionctx.Context, rowsIn
return 0, nil
}

func (e *avgPartial4Float64) MergePartialResult(sctx sessionctx.Context, src, dst PartialResult) (memDelta int64, err error) {
func (*avgPartial4Float64) MergePartialResult(_ sessionctx.Context, src, dst PartialResult) (memDelta int64, err error) {
p1, p2 := (*partialResult4AvgFloat64)(src), (*partialResult4AvgFloat64)(dst)
p2.sum += p1.sum
p2.count += p1.count
Expand All @@ -418,15 +418,15 @@ type avgOriginal4DistinctFloat64 struct {
baseAggFunc
}

func (e *avgOriginal4DistinctFloat64) AllocPartialResult() (pr PartialResult, memDelta int64) {
func (*avgOriginal4DistinctFloat64) AllocPartialResult() (pr PartialResult, memDelta int64) {
valSet, setSize := set.NewFloat64SetWithMemoryUsage()
p := &partialResult4AvgDistinctFloat64{
valSet: valSet,
}
return PartialResult(p), DefPartialResult4AvgDistinctFloat64Size + setSize
}

func (e *avgOriginal4DistinctFloat64) ResetPartialResult(pr PartialResult) {
func (*avgOriginal4DistinctFloat64) ResetPartialResult(pr PartialResult) {
p := (*partialResult4AvgDistinctFloat64)(pr)
p.sum = float64(0)
p.count = int64(0)
Expand All @@ -451,7 +451,7 @@ func (e *avgOriginal4DistinctFloat64) UpdatePartialResult(sctx sessionctx.Contex
return memDelta, nil
}

func (e *avgOriginal4DistinctFloat64) AppendFinalResult2Chunk(sctx sessionctx.Context, pr PartialResult, chk *chunk.Chunk) error {
func (e *avgOriginal4DistinctFloat64) AppendFinalResult2Chunk(_ sessionctx.Context, pr PartialResult, chk *chunk.Chunk) error {
p := (*partialResult4AvgDistinctFloat64)(pr)
if p.count == 0 {
chk.AppendNull(e.ordinal)
Expand Down
16 changes: 8 additions & 8 deletions executor/aggfuncs/func_bitfuncs.go
View file
Open in desktop
Expand Up @@ -33,16 +33,16 @@ type baseBitAggFunc struct {

type partialResult4BitFunc = uint64

func (e *baseBitAggFunc) AllocPartialResult() (pr PartialResult, memDelta int64) {
func (*baseBitAggFunc) AllocPartialResult() (pr PartialResult, memDelta int64) {
return PartialResult(new(partialResult4BitFunc)), DefPartialResult4BitFuncSize
}

func (e *baseBitAggFunc) ResetPartialResult(pr PartialResult) {
func (*baseBitAggFunc) ResetPartialResult(pr PartialResult) {
p := (*partialResult4BitFunc)(pr)
*p = 0
}

func (e *baseBitAggFunc) AppendFinalResult2Chunk(sctx sessionctx.Context, pr PartialResult, chk *chunk.Chunk) error {
func (e *baseBitAggFunc) AppendFinalResult2Chunk(_ sessionctx.Context, pr PartialResult, chk *chunk.Chunk) error {
p := (*partialResult4BitFunc)(pr)
chk.AppendUint64(e.ordinal, *p)
return nil
Expand All @@ -67,7 +67,7 @@ func (e *bitOrUint64) UpdatePartialResult(sctx sessionctx.Context, rowsInGroup [
return memDelta, nil
}

func (*bitOrUint64) MergePartialResult(sctx sessionctx.Context, src, dst PartialResult) (memDelta int64, err error) {
func (*bitOrUint64) MergePartialResult(_ sessionctx.Context, src, dst PartialResult) (memDelta int64, err error) {
p1, p2 := (*partialResult4BitFunc)(src), (*partialResult4BitFunc)(dst)
*p2 |= *p1
return memDelta, nil
Expand Down Expand Up @@ -119,7 +119,7 @@ func (e *bitXorUint64) Slide(sctx sessionctx.Context, getRow func(uint64) chunk.
return nil
}

func (*bitXorUint64) MergePartialResult(sctx sessionctx.Context, src, dst PartialResult) (memDelta int64, err error) {
func (*bitXorUint64) MergePartialResult(_ sessionctx.Context, src, dst PartialResult) (memDelta int64, err error) {
p1, p2 := (*partialResult4BitFunc)(src), (*partialResult4BitFunc)(dst)
*p2 ^= *p1
return memDelta, nil
Expand All @@ -129,13 +129,13 @@ type bitAndUint64 struct {
baseBitAggFunc
}

func (e *bitAndUint64) AllocPartialResult() (pr PartialResult, memDelta int64) {
func (*bitAndUint64) AllocPartialResult() (pr PartialResult, memDelta int64) {
p := new(partialResult4BitFunc)
*p = math.MaxUint64
return PartialResult(p), DefPartialResult4BitFuncSize
}

func (e *bitAndUint64) ResetPartialResult(pr PartialResult) {
func (*bitAndUint64) ResetPartialResult(pr PartialResult) {
p := (*partialResult4BitFunc)(pr)
*p = math.MaxUint64
}
Expand All @@ -156,7 +156,7 @@ func (e *bitAndUint64) UpdatePartialResult(sctx sessionctx.Context, rowsInGroup
return memDelta, nil
}

func (*bitAndUint64) MergePartialResult(sctx sessionctx.Context, src, dst PartialResult) (memDelta int64, err error) {
func (*bitAndUint64) MergePartialResult(_ sessionctx.Context, src, dst PartialResult) (memDelta int64, err error) {
p1, p2 := (*partialResult4BitFunc)(src), (*partialResult4BitFunc)(dst)
*p2 &= *p1
return memDelta, nil
Expand Down
8 changes: 4 additions & 4 deletions executor/aggfuncs/func_count.go
View file
Open in desktop
Expand Up @@ -32,16 +32,16 @@ type baseCount struct {

type partialResult4Count = int64

func (e *baseCount) AllocPartialResult() (pr PartialResult, memDelta int64) {
func (*baseCount) AllocPartialResult() (pr PartialResult, memDelta int64) {
return PartialResult(new(partialResult4Count)), DefPartialResult4CountSize
}

func (e *baseCount) ResetPartialResult(pr PartialResult) {
func (*baseCount) ResetPartialResult(pr PartialResult) {
p := (*partialResult4Count)(pr)
*p = 0
}

func (e *baseCount) AppendFinalResult2Chunk(sctx sessionctx.Context, pr PartialResult, chk *chunk.Chunk) error {
func (e *baseCount) AppendFinalResult2Chunk(_ sessionctx.Context, pr PartialResult, chk *chunk.Chunk) error {
p := (*partialResult4Count)(pr)
chk.AppendInt64(e.ordinal, *p)
return nil
Expand Down Expand Up @@ -410,7 +410,7 @@ func (e *countPartial) UpdatePartialResult(sctx sessionctx.Context, rowsInGroup
return 0, nil
}

func (*countPartial) MergePartialResult(sctx sessionctx.Context, src, dst PartialResult) (memDelta int64, err error) {
func (*countPartial) MergePartialResult(_ sessionctx.Context, src, dst PartialResult) (memDelta int64, err error) {
p1, p2 := (*partialResult4Count)(src), (*partialResult4Count)(dst)
*p2 += *p1
return 0, nil
Expand Down