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 Chunk in LimitExec #5200

Merged
merged 17 commits into from
Nov 28, 2017
Merged

executor: support Chunk in LimitExec #5200

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
026639d
executor: support Chunk in LimitExec
zz-jason Nov 23, 2017
b6ea510
code refine
zz-jason Nov 23, 2017
bb6800a
address comment
zz-jason Nov 24, 2017
e78ba99
make check happy
zz-jason Nov 24, 2017
b087b5d
address comment
zz-jason Nov 26, 2017
ebcf9e7
address comment
zz-jason Nov 27, 2017
020b467
merge master && resolve conflict
zz-jason Nov 27, 2017
fc22575
revert unmeant modifications
zz-jason Nov 27, 2017
58a268f
fix build && ci
zz-jason Nov 27, 2017
3bf7898
address comment
zz-jason Nov 27, 2017
5d3b288
address comment
zz-jason Nov 27, 2017
0bfd4cc
address comment
zz-jason Nov 27, 2017
0f29c41
Merge branch 'master' into dev/chunk/limit
zz-jason Nov 27, 2017
62ebe32
Merge branch 'master' of github.com:pingcap/tidb into dev/chunk/limit
zz-jason Nov 28, 2017
9c0710d
address comment
zz-jason Nov 28, 2017
95c4a90
Merge branch 'master' of github.com:pingcap/tidb into dev/chunk/limit
zz-jason Nov 28, 2017
78f9b91
Merge branch 'master' into dev/chunk/limit
zz-jason Nov 28, 2017
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
2 changes: 1 addition & 1 deletion util/chunk/chunk.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ func (c *Chunk) Truncate(tailRows int) {
elemLen := len(col.elemBuf)
col.data = col.data[:(col.length-tailRows)*elemLen]
} else if col.isVarlen() {
col.data = col.data[:col.offsets[col.length-tailRows+1]]
col.data = col.data[:col.offsets[col.length-tailRows]]
col.offsets = col.offsets[:col.length-tailRows+1]
} else {
col.ifaces = col.ifaces[:col.length-tailRows]
Expand Down
122 changes: 122 additions & 0 deletions util/chunk/chunk_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import (
"time"

. "github.com/pingcap/check"
"github.com/pingcap/tidb/mysql"
"github.com/pingcap/tidb/types"
"github.com/pingcap/tidb/types/json"
)
Expand Down Expand Up @@ -122,6 +123,127 @@ func (s *testChunkSuite) TestChunk(c *C) {
c.Assert(chk.GetRow(2).GetFloat32(0), Equals, float32(1))
}

func (s *testChunkSuite) TestAppend(c *C) {
fieldTypes := make([]*types.FieldType, 0, 3)
fieldTypes = append(fieldTypes, &types.FieldType{Tp: mysql.TypeFloat})
fieldTypes = append(fieldTypes, &types.FieldType{Tp: mysql.TypeVarchar})
fieldTypes = append(fieldTypes, &types.FieldType{Tp: mysql.TypeJSON})

src := NewChunk(fieldTypes)
dst := NewChunk(fieldTypes)

src.AppendFloat32(0, 12.8)
src.AppendString(1, "abc")
jsonObj, err := json.ParseFromString("{\"k1\":\"v1\"}")
c.Assert(err, IsNil)
src.AppendJSON(2, jsonObj)
src.AppendNull(0)
src.AppendNull(1)
src.AppendNull(2)

dst.Append(src, 0, 2)
dst.Append(src, 0, 2)
dst.Append(src, 0, 2)
dst.Append(src, 0, 2)
dst.Append(dst, 2, 6)

c.Assert(len(dst.columns), Equals, 3)

c.Assert(dst.columns[0].length, Equals, 12)
c.Assert(dst.columns[0].nullCount, Equals, 6)
c.Assert(string(dst.columns[0].nullBitmap), Equals, string([]byte{0x55, 0x05}))
c.Assert(len(dst.columns[0].offsets), Equals, 0)
c.Assert(len(dst.columns[0].data), Equals, 4*12)
c.Assert(len(dst.columns[0].elemBuf), Equals, 4)
c.Assert(len(dst.columns[0].ifaces), Equals, 0)

c.Assert(dst.columns[1].length, Equals, 12)
c.Assert(dst.columns[1].nullCount, Equals, 6)
c.Assert(string(dst.columns[0].nullBitmap), Equals, string([]byte{0x55, 0x05}))
c.Assert(string(dst.columns[1].offsets), Equals, string([]int32{0, 3, 3, 6, 6, 9, 9, 12, 12, 15, 15, 18, 18}))
c.Assert(string(dst.columns[1].data), Equals, "abcabcabcabcabcabc")
c.Assert(len(dst.columns[1].elemBuf), Equals, 0)
c.Assert(len(dst.columns[1].ifaces), Equals, 0)

c.Assert(dst.columns[2].length, Equals, 12)
c.Assert(dst.columns[2].nullCount, Equals, 6)
c.Assert(string(dst.columns[0].nullBitmap), Equals, string([]byte{0x55, 0x05}))
c.Assert(len(dst.columns[2].offsets), Equals, 0)
c.Assert(len(dst.columns[2].data), Equals, 0)
c.Assert(len(dst.columns[2].elemBuf), Equals, 0)
c.Assert(len(dst.columns[2].ifaces), Equals, 12)
for i := 0; i < 12; i += 2 {
elem := dst.columns[2].ifaces[i]
jsonElem, ok := elem.(json.JSON)
c.Assert(ok, IsTrue)
cmpRes, err := json.CompareJSON(jsonElem, jsonObj)
c.Assert(err, IsNil)
c.Assert(cmpRes, Equals, 0)
}
}

func (s *testChunkSuite) TestTruncate(c *C) {
fieldTypes := make([]*types.FieldType, 0, 3)
fieldTypes = append(fieldTypes, &types.FieldType{Tp: mysql.TypeFloat})
fieldTypes = append(fieldTypes, &types.FieldType{Tp: mysql.TypeVarchar})
fieldTypes = append(fieldTypes, &types.FieldType{Tp: mysql.TypeJSON})

jsonObj, err := json.ParseFromString("{\"k1\":\"v1\"}")
c.Assert(err, IsNil)

src := NewChunk(fieldTypes)
src.AppendFloat32(0, 12.8)
src.AppendString(1, "abc")
src.AppendJSON(2, jsonObj)
src.AppendNull(0)
src.AppendNull(1)
src.AppendNull(2)

for i := 0; i < 7; i++ {
Copy link
Member

Choose a reason for hiding this comment

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

Why not i < 8 to save the above 6 lines?

src.AppendFloat32(0, 12.8)
src.AppendString(1, "abc")
src.AppendJSON(2, jsonObj)
src.AppendNull(0)
src.AppendNull(1)
src.AppendNull(2)
}

src.Truncate(4)
c.Assert(len(src.columns), Equals, 3)

c.Assert(src.columns[0].length, Equals, 12)
c.Assert(src.columns[0].nullCount, Equals, 6)
c.Assert(string(src.columns[0].nullBitmap), Equals, string([]byte{0x55, 0x55}))
c.Assert(len(src.columns[0].offsets), Equals, 0)
c.Assert(len(src.columns[0].data), Equals, 4*12)
c.Assert(len(src.columns[0].elemBuf), Equals, 4)
c.Assert(len(src.columns[0].ifaces), Equals, 0)

c.Assert(src.columns[1].length, Equals, 12)
c.Assert(src.columns[1].nullCount, Equals, 6)
c.Assert(string(src.columns[0].nullBitmap), Equals, string([]byte{0x55, 0x55}))
c.Assert(string(src.columns[1].offsets), Equals, string([]int32{0, 3, 3, 6, 6, 9, 9, 12, 12, 15, 15, 18, 18}))
c.Assert(string(src.columns[1].data), Equals, "abcabcabcabcabcabc")
c.Assert(len(src.columns[1].elemBuf), Equals, 0)
c.Assert(len(src.columns[1].ifaces), Equals, 0)

c.Assert(src.columns[2].length, Equals, 12)
c.Assert(src.columns[2].nullCount, Equals, 6)
c.Assert(string(src.columns[0].nullBitmap), Equals, string([]byte{0x55, 0x55}))
c.Assert(len(src.columns[2].offsets), Equals, 0)
c.Assert(len(src.columns[2].data), Equals, 0)
c.Assert(len(src.columns[2].elemBuf), Equals, 0)
c.Assert(len(src.columns[2].ifaces), Equals, 12)
for i := 0; i < 12; i += 2 {
elem := src.columns[2].ifaces[i]
jsonElem, ok := elem.(json.JSON)
c.Assert(ok, IsTrue)
cmpRes, err := json.CompareJSON(jsonElem, jsonObj)
c.Assert(err, IsNil)
c.Assert(cmpRes, Equals, 0)
}
}

// newChunk creates a new chunk and initialize columns with element length.
// 0 adds an varlen column, positive len add a fixed length column, negative len adds a interface column.
func newChunk(elemLen ...int) *Chunk {
Expand Down