Skip to content

executor: fix nil buffer in basePartialResult4GroupConcat when hash aggregation is spilled #61808

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

Merged
merged 1 commit into from
Jun 19, 2025
Merged

executor: fix nil buffer in basePartialResult4GroupConcat when hash aggregation is spilled #61808

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 9 additions & 2 deletions pkg/executor/aggfuncs/spill_deserialize_helper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
package aggfuncs

import (
"bytes"

"github.com/pingcap/tidb/pkg/util/chunk"
"github.com/pingcap/tidb/pkg/util/hack"
util "github.com/pingcap/tidb/pkg/util/serialization"
Expand Down Expand Up @@ -216,8 +218,13 @@ func (s *deserializeHelper) deserializePartialResult4SumFloat64(dst *partialResu
func (s *deserializeHelper) deserializeBasePartialResult4GroupConcat(dst *basePartialResult4GroupConcat) bool {
if s.readRowIndex < s.totalRowCnt {
s.pab.Reset(s.column, s.readRowIndex)
dst.valsBuf = util.DeserializeBytesBuffer(s.pab)
dst.buffer = util.DeserializeBytesBuffer(s.pab)
dst.valsBuf = &bytes.Buffer{}
hasBuffer := util.DeserializeBool(s.pab)
if hasBuffer {
dst.buffer = util.DeserializeBytesBuffer(s.pab)
} else {
dst.buffer = nil
}
s.readRowIndex++
return true
}
Expand Down
17 changes: 11 additions & 6 deletions pkg/executor/aggfuncs/spill_helper_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ import (
"github.com/stretchr/testify/require"
)

var testLongStr1 string = getLongString("平p凯k星x辰c")
var testLongStr2 string = getLongString("123aa啊啊aa")
var testLongStr1 string = getLongString("平352p凯额6辰c")
var testLongStr2 string = getLongString("123a啊f24f去rsgvsfg")

func getChunk() *chunk.Chunk {
fieldTypes := make([]*types.FieldType, 1)
Expand Down Expand Up @@ -746,13 +746,15 @@ func TestPartialResult4SumFloat64(t *testing.T) {

func TestBasePartialResult4GroupConcat(t *testing.T) {
var serializeHelper = NewSerializeHelper()
serializeHelper.buf = make([]byte, 0)
bufSizeChecker := newBufferSizeChecker()

// Initialize test data
expectData := []basePartialResult4GroupConcat{
{valsBuf: bytes.NewBufferString("123"), buffer: nil},
{valsBuf: bytes.NewBufferString(""), buffer: bytes.NewBufferString("")},
{valsBuf: bytes.NewBufferString("xzxx"), buffer: bytes.NewBufferString(testLongStr2)},
{valsBuf: bytes.NewBufferString(testLongStr1), buffer: bytes.NewBufferString(testLongStr2)},
{valsBuf: bytes.NewBufferString(""), buffer: bytes.NewBufferString(testLongStr1)},
{valsBuf: bytes.NewBufferString(""), buffer: bytes.NewBufferString(testLongStr2)},
}
serializedPartialResults := make([]PartialResult, len(expectData))
testDataNum := len(serializedPartialResults)
Expand Down Expand Up @@ -787,8 +789,11 @@ func TestBasePartialResult4GroupConcat(t *testing.T) {
// Check some results
require.Equal(t, testDataNum, index)
for i := range testDataNum {
require.Equal(t, (*basePartialResult4GroupConcat)(serializedPartialResults[i]).valsBuf.String(), deserializedPartialResults[i].valsBuf.String())
require.Equal(t, (*basePartialResult4GroupConcat)(serializedPartialResults[i]).buffer.String(), deserializedPartialResults[i].buffer.String())
if (*basePartialResult4GroupConcat)(serializedPartialResults[i]).buffer != nil {
require.Equal(t, (*basePartialResult4GroupConcat)(serializedPartialResults[i]).buffer.String(), deserializedPartialResults[i].buffer.String())
} else {
require.Equal(t, (*bytes.Buffer)(nil), deserializedPartialResults[i].buffer)
}
}
}

Expand Down
8 changes: 6 additions & 2 deletions pkg/executor/aggfuncs/spill_serialize_helper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,8 +131,12 @@ func (s *SerializeHelper) serializePartialResult4SumFloat64(value partialResult4

func (s *SerializeHelper) serializeBasePartialResult4GroupConcat(value basePartialResult4GroupConcat) []byte {
s.buf = s.buf[:0]
s.buf = util.SerializeBytesBuffer(value.valsBuf, s.buf)
s.buf = util.SerializeBytesBuffer(value.buffer, s.buf)
if value.buffer != nil {
s.buf = util.SerializeBool(true, s.buf)
s.buf = util.SerializeBytesBuffer(value.buffer, s.buf)
} else {
s.buf = util.SerializeBool(false, s.buf)
}
return s.buf
}

Expand Down