-
Notifications
You must be signed in to change notification settings - Fork 5.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
executor: add builtin aggregate function
json_arrayagg (#19957)
- Loading branch information
1 parent
15ca386
commit 853c41e
Showing
11 changed files
with
371 additions
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,103 @@ | ||
| // Copyright 2020 PingCAP, Inc. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package aggfuncs | ||
|
|
||
| import ( | ||
| "unsafe" | ||
|
|
||
| "github.com/pingcap/errors" | ||
| "github.com/pingcap/tidb/sessionctx" | ||
| "github.com/pingcap/tidb/types" | ||
| "github.com/pingcap/tidb/types/json" | ||
| "github.com/pingcap/tidb/util/chunk" | ||
| ) | ||
|
|
||
| const ( | ||
| // DefPartialResult4JsonArrayagg is the size of partialResult4JsonArrayagg | ||
| DefPartialResult4JsonArrayagg = int64(unsafe.Sizeof(partialResult4JsonArrayagg{})) | ||
| ) | ||
|
|
||
| type jsonArrayagg struct { | ||
| baseAggFunc | ||
| } | ||
|
|
||
| type partialResult4JsonArrayagg struct { | ||
| entries []interface{} | ||
| } | ||
|
|
||
| func (e *jsonArrayagg) AllocPartialResult() (pr PartialResult, memDelta int64) { | ||
| p := partialResult4JsonArrayagg{} | ||
| p.entries = make([]interface{}, 0) | ||
| return PartialResult(&p), DefPartialResult4JsonArrayagg + DefSliceSize | ||
| } | ||
|
|
||
| func (e *jsonArrayagg) ResetPartialResult(pr PartialResult) { | ||
| p := (*partialResult4JsonArrayagg)(pr) | ||
| p.entries = p.entries[:0] | ||
| } | ||
|
|
||
| func (e *jsonArrayagg) AppendFinalResult2Chunk(sctx sessionctx.Context, pr PartialResult, chk *chunk.Chunk) error { | ||
| p := (*partialResult4JsonArrayagg)(pr) | ||
| if len(p.entries) == 0 { | ||
| chk.AppendNull(e.ordinal) | ||
| return nil | ||
| } | ||
|
|
||
| // appendBinary does not support some type such as uint8、types.time，so convert is needed here | ||
| for idx, val := range p.entries { | ||
| switch x := val.(type) { | ||
| case *types.MyDecimal: | ||
| float64Val, err := x.ToFloat64() | ||
| if err != nil { | ||
| return errors.Trace(err) | ||
| } | ||
| p.entries[idx] = float64Val | ||
| case []uint8, types.Time, types.Duration: | ||
| strVal, err := types.ToString(x) | ||
| if err != nil { | ||
| return errors.Trace(err) | ||
| } | ||
| p.entries[idx] = strVal | ||
| } | ||
| } | ||
|
|
||
| chk.AppendJSON(e.ordinal, json.CreateBinary(p.entries)) | ||
| return nil | ||
| } | ||
|
|
||
| func (e *jsonArrayagg) UpdatePartialResult(sctx sessionctx.Context, rowsInGroup []chunk.Row, pr PartialResult) (memDelta int64, err error) { | ||
| p := (*partialResult4JsonArrayagg)(pr) | ||
| for _, row := range rowsInGroup { | ||
| item, err := e.args[0].Eval(row) | ||
| if err != nil { | ||
| return 0, errors.Trace(err) | ||
| } | ||
|
|
||
| realItem := item.Clone().GetValue() | ||
| switch x := realItem.(type) { | ||
| case nil, bool, int64, uint64, float64, string, json.BinaryJSON, *types.MyDecimal, []uint8, types.Time, types.Duration: | ||
| p.entries = append(p.entries, realItem) | ||
| memDelta += getValMemDelta(realItem) | ||
| default: | ||
| return 0, json.ErrUnsupportedSecondArgumentType.GenWithStackByArgs(x) | ||
| } | ||
| } | ||
| return memDelta, nil | ||
| } | ||
|
|
||
| func (e *jsonArrayagg) MergePartialResult(sctx sessionctx.Context, src, dst PartialResult) (memDelta int64, err error) { | ||
| p1, p2 := (*partialResult4JsonArrayagg)(src), (*partialResult4JsonArrayagg)(dst) | ||
| p2.entries = append(p2.entries, p1.entries...) | ||
| return 0, nil | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,139 @@ | ||
| // Copyright 2020 PingCAP, Inc. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package aggfuncs_test | ||
|
|
||
| import ( | ||
| . "github.com/pingcap/check" | ||
| "github.com/pingcap/errors" | ||
| "github.com/pingcap/parser/ast" | ||
| "github.com/pingcap/parser/mysql" | ||
| "github.com/pingcap/tidb/executor/aggfuncs" | ||
| "github.com/pingcap/tidb/types" | ||
| "github.com/pingcap/tidb/types/json" | ||
| "github.com/pingcap/tidb/util/chunk" | ||
| ) | ||
|
|
||
| func (s *testSuite) TestMergePartialResult4JsonArrayagg(c *C) { | ||
| typeList := []byte{mysql.TypeLonglong, mysql.TypeDouble, mysql.TypeString, mysql.TypeJSON} | ||
|
|
||
| var tests []aggTest | ||
| numRows := 5 | ||
| for _, argType := range typeList { | ||
| entries1 := make([]interface{}, 0) | ||
| entries2 := make([]interface{}, 0) | ||
| entries3 := make([]interface{}, 0) | ||
|
|
||
| genFunc := getDataGenFunc(types.NewFieldType(argType)) | ||
|
|
||
| for m := 0; m < numRows; m++ { | ||
| arg := genFunc(m) | ||
| entries1 = append(entries1, arg.GetValue()) | ||
| } | ||
| // to adapt the `genSrcChk` Chunk format | ||
| entries1 = append(entries1, nil) | ||
|
|
||
| for m := 2; m < numRows; m++ { | ||
| arg := genFunc(m) | ||
| entries2 = append(entries2, arg.GetValue()) | ||
| } | ||
| // to adapt the `genSrcChk` Chunk format | ||
| entries2 = append(entries2, nil) | ||
|
|
||
| entries3 = append(entries3, entries1...) | ||
| entries3 = append(entries3, entries2...) | ||
|
|
||
| tests = append(tests, buildAggTester(ast.AggFuncJsonArrayagg, argType, numRows, json.CreateBinary(entries1), json.CreateBinary(entries2), json.CreateBinary(entries3))) | ||
| } | ||
|
|
||
| for _, test := range tests { | ||
| s.testMergePartialResult(c, test) | ||
| } | ||
| } | ||
|
|
||
| func (s *testSuite) TestJsonArrayagg(c *C) { | ||
| typeList := []byte{mysql.TypeLonglong, mysql.TypeDouble, mysql.TypeString, mysql.TypeJSON} | ||
|
|
||
| var tests []aggTest | ||
| numRows := 5 | ||
|
|
||
| for _, argType := range typeList { | ||
| entries := make([]interface{}, 0) | ||
|
|
||
| genFunc := getDataGenFunc(types.NewFieldType(argType)) | ||
|
|
||
| for m := 0; m < numRows; m++ { | ||
| arg := genFunc(m) | ||
| entries = append(entries, arg.GetValue()) | ||
| } | ||
| // to adapt the `genSrcChk` Chunk format | ||
| entries = append(entries, nil) | ||
|
|
||
| tests = append(tests, buildAggTester(ast.AggFuncJsonArrayagg, argType, numRows, nil, json.CreateBinary(entries))) | ||
| } | ||
|
|
||
| for _, test := range tests { | ||
| s.testAggFuncWithoutDistinct(c, test) | ||
| } | ||
| } | ||
|
|
||
| func jsonArrayaggMemDeltaGens(srcChk *chunk.Chunk, dataType *types.FieldType) (memDeltas []int64, err error) { | ||
| memDeltas = make([]int64, 0) | ||
| for i := 0; i < srcChk.NumRows(); i++ { | ||
| row := srcChk.GetRow(i) | ||
| if row.IsNull(0) { | ||
| memDeltas = append(memDeltas, aggfuncs.DefInterfaceSize) | ||
| continue | ||
| } | ||
|
|
||
| memDelta := int64(0) | ||
| memDelta += aggfuncs.DefInterfaceSize | ||
| switch dataType.Tp { | ||
| case mysql.TypeLonglong: | ||
| memDelta += aggfuncs.DefUint64Size | ||
| case mysql.TypeDouble: | ||
| memDelta += aggfuncs.DefFloat64Size | ||
| case mysql.TypeString: | ||
| val := row.GetString(0) | ||
| memDelta += int64(len(val)) | ||
| case mysql.TypeJSON: | ||
| val := row.GetJSON(0) | ||
| // +1 for the memory usage of the TypeCode of json | ||
| memDelta += int64(len(val.Value) + 1) | ||
| case mysql.TypeDuration: | ||
| memDelta += aggfuncs.DefDurationSize | ||
| case mysql.TypeDate: | ||
| memDelta += aggfuncs.DefTimeSize | ||
| case mysql.TypeNewDecimal: | ||
| memDelta += aggfuncs.DefMyDecimalSize | ||
| default: | ||
| return memDeltas, errors.Errorf("unsupported type - %v", dataType.Tp) | ||
| } | ||
| memDeltas = append(memDeltas, memDelta) | ||
| } | ||
| return memDeltas, nil | ||
| } | ||
|
|
||
| func (s *testSuite) TestMemJsonArrayagg(c *C) { | ||
| typeList := []byte{mysql.TypeLonglong, mysql.TypeDouble, mysql.TypeString, mysql.TypeJSON} | ||
|
|
||
| var tests []aggMemTest | ||
| numRows := 5 | ||
| for _, argType := range typeList { | ||
| tests = append(tests, buildAggMemTester(ast.AggFuncJsonArrayagg, argType, numRows, aggfuncs.DefPartialResult4JsonArrayagg+aggfuncs.DefSliceSize, jsonArrayaggMemDeltaGens, false)) | ||
| } | ||
|
|
||
| for _, test := range tests { | ||
| s.testAggMemFunc(c, test) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.