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

executor: support new aggregate framework for HashAggExec #7268

Merged
merged 8 commits into from
Aug 21, 2018
Merged

executor: support new aggregate framework for HashAggExec #7268

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3e88f00
executor: use new aggregate framework for HashAggExec
XuHuaiyu Aug 13, 2018
26c6b16
fix bug for first_row/max/min(enum/set)
XuHuaiyu Aug 14, 2018
011e597
fix bug when agg funcs is empty or/and groupByItems is empty
XuHuaiyu Aug 15, 2018
9e1f1ae
fix group_concat bug when arg contains null
XuHuaiyu Aug 15, 2018
be45b8b
addess comment
XuHuaiyu Aug 15, 2018
f4b29f3
address comment
XuHuaiyu Aug 20, 2018
c013738
Merge branch 'master' of https://github.com/pingcap/tidb into hash_agg
XuHuaiyu Aug 20, 2018
d229be6
Merge branch 'master' into hash_agg
XuHuaiyu Aug 21, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 8 additions & 11 deletions executor/aggfuncs/func_group_concat.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,29 +82,28 @@ func (e *groupConcat) ResetPartialResult(pr PartialResult) {

func (e *groupConcat) UpdatePartialResult(sctx sessionctx.Context, rowsInGroup []chunk.Row, pr PartialResult) (err error) {
p := (*partialResult4GroupConcat)(pr)
v, isNull := "", false
v, isNull, preLen := "", false, 0
for _, row := range rowsInGroup {
if p.buffer != nil {
if p.buffer != nil && p.buffer.Len() != 0 {
preLen = p.buffer.Len()
p.buffer.WriteString(e.sep)
}
isAllNull := true
for _, arg := range e.args {
v, isNull, err = arg.EvalString(sctx, row)
if err != nil {
return errors.Trace(err)
}
if isNull {
continue
break
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why change here?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A bug-fix.
Test case is here. https://github.com/pingcap/tidb/pull/7268/files#diff-ab83e4a8f21f295ae805f30d7e889703R332

}
isAllNull = false
if p.buffer == nil {
p.buffer = &bytes.Buffer{}
}
p.buffer.WriteString(v)
}
if isAllNull {
if isNull {
if p.buffer != nil {
p.buffer.Truncate(p.buffer.Len() - len(e.sep))
p.buffer.Truncate(preLen)
}
continue
}
Expand Down Expand Up @@ -156,20 +155,18 @@ func (e *groupConcatDistinct) UpdatePartialResult(sctx sessionctx.Context, rowsI
p := (*partialResult4GroupConcatDistinct)(pr)
v, isNull := "", false
for _, row := range rowsInGroup {
allIsNull := true
p.valsBuf.Reset()
for _, arg := range e.args {
v, isNull, err = arg.EvalString(sctx, row)
if err != nil {
return errors.Trace(err)
}
if isNull {
continue
break
}
allIsNull = false
p.valsBuf.WriteString(v)
}
if allIsNull {
if isNull {
continue
}
joinedVals := p.valsBuf.String()
Expand Down
Loading