Skip to content

Commit 6bb9e67

Browse files
authored
zeroalloc: don't use unsafe.Pointer (#959)
* zeroalloc: don't use unsafe.Pointer * replace siddontang/go/hack with zeroalloc * remove rest of siddontang/go dependencies
1 parent c6114ee commit 6bb9e67

File tree

14 files changed

+49
-51
lines changed

14 files changed

+49
-51
lines changed

client/resp.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import (
99
"fmt"
1010

1111
"github.com/pingcap/errors"
12-
"github.com/siddontang/go/hack"
1312

1413
. "github.com/go-mysql-org/go-mysql/mysql"
1514
"github.com/go-mysql-org/go-mysql/utils"
@@ -78,11 +77,11 @@ func (c *Conn) handleErrorPacket(data []byte) error {
7877
if c.capability&CLIENT_PROTOCOL_41 > 0 {
7978
// skip '#'
8079
pos++
81-
e.State = hack.String(data[pos : pos+5])
80+
e.State = utils.ByteSliceToString(data[pos : pos+5])
8281
pos += 5
8382
}
8483

85-
e.Message = hack.String(data[pos:])
84+
e.Message = utils.ByteSliceToString(data[pos:])
8685

8786
return e
8887
}
@@ -372,7 +371,7 @@ func (c *Conn) readResultColumns(result *Result) (err error) {
372371
return err
373372
}
374373

375-
result.FieldNames[hack.String(result.Fields[i].Name)] = i
374+
result.FieldNames[utils.ByteSliceToString(result.Fields[i].Name)] = i
376375

377376
i++
378377
}

driver/driver.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ import (
1717

1818
"github.com/go-mysql-org/go-mysql/client"
1919
"github.com/go-mysql-org/go-mysql/mysql"
20+
"github.com/go-mysql-org/go-mysql/utils"
2021
"github.com/pingcap/errors"
21-
"github.com/siddontang/go/hack"
2222
)
2323

2424
var customTLSMutex sync.Mutex
@@ -352,7 +352,7 @@ func newRows(r *mysql.Resultset) (*rows, error) {
352352
rs.columns = make([]string, len(r.Fields))
353353

354354
for i, f := range r.Fields {
355-
rs.columns[i] = hack.String(f.Name)
355+
rs.columns[i] = utils.ByteSliceToString(f.Name)
356356
}
357357
rs.step = 0
358358

driver/driver_options_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616
"time"
1717

1818
"github.com/pingcap/errors"
19-
"github.com/siddontang/go/log"
19+
"github.com/siddontang/go-log/log"
2020
"github.com/stretchr/testify/require"
2121

2222
"github.com/go-mysql-org/go-mysql/client"

go.mod

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ require (
1515
github.com/pingcap/errors v0.11.5-0.20240311024730-e056997136bb
1616
github.com/pingcap/tidb/pkg/parser v0.0.0-20241118164214-4f047be191be
1717
github.com/shopspring/decimal v1.2.0
18-
github.com/siddontang/go v0.0.0-20180604090527-bdc77568d726
1918
github.com/siddontang/go-log v0.0.0-20180807004314-8d05993dda07
2019
github.com/stretchr/testify v1.8.4
2120
)

go.sum

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,6 @@ github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjR
4848
github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog=
4949
github.com/shopspring/decimal v1.2.0 h1:abSATXmQEYyShuxI4/vyW3tV1MrKAJzCZ/0zLUXYbsQ=
5050
github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
51-
github.com/siddontang/go v0.0.0-20180604090527-bdc77568d726 h1:xT+JlYxNGqyT+XcU8iUrN18JYed2TvG9yN5ULG2jATM=
52-
github.com/siddontang/go v0.0.0-20180604090527-bdc77568d726/go.mod h1:3yhqj7WBBfRhbBlzyOC3gUxftwsU0u8gqevxwIHQpMw=
5351
github.com/siddontang/go-log v0.0.0-20180807004314-8d05993dda07 h1:oI+RNwuC9jF2g2lP0u0cVEEZrc/AYBCuFdvwrLWM/6Q=
5452
github.com/siddontang/go-log v0.0.0-20180807004314-8d05993dda07/go.mod h1:yFdBgwXP24JziuRl2NMUahT7nGLNOKi1SIiFxMttVD4=
5553
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=

mysql/mysql_gtid.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ import (
1010
"strconv"
1111
"strings"
1212

13+
"github.com/go-mysql-org/go-mysql/utils"
1314
"github.com/google/uuid"
1415
"github.com/pingcap/errors"
15-
"github.com/siddontang/go/hack"
1616
)
1717

1818
// Like MySQL GTID Interval struct, [start, stop), left closed and right open
@@ -318,7 +318,7 @@ func (s *UUIDSet) MinusInterval(in IntervalSlice) {
318318
}
319319

320320
func (s *UUIDSet) String() string {
321-
return hack.String(s.Bytes())
321+
return utils.ByteSliceToString(s.Bytes())
322322
}
323323

324324
func (s *UUIDSet) encode(w io.Writer) {
@@ -571,7 +571,7 @@ func (s *MysqlGTIDSet) String() string {
571571
sep = ","
572572
}
573573

574-
return hack.String(buf.Bytes())
574+
return utils.ByteSliceToString(buf.Bytes())
575575
}
576576

577577
func (s *MysqlGTIDSet) Encode() []byte {

mysql/resultset.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import (
55
"strconv"
66
"sync"
77

8+
"github.com/go-mysql-org/go-mysql/utils"
89
"github.com/pingcap/errors"
9-
"github.com/siddontang/go/hack"
1010
)
1111

1212
type StreamingType int
@@ -263,7 +263,7 @@ func (r *Resultset) GetString(row, column int) (string, error) {
263263
case string:
264264
return v, nil
265265
case []byte:
266-
return hack.String(v), nil
266+
return utils.ByteSliceToString(v), nil
267267
case int, int8, int16, int32, int64,
268268
uint, uint8, uint16, uint32, uint64:
269269
return fmt.Sprintf("%d", v), nil

mysql/resultset_helper.go

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ import (
55
"strconv"
66

77
"github.com/pingcap/errors"
8-
"github.com/siddontang/go/hack"
8+
9+
"github.com/go-mysql-org/go-mysql/utils"
910
)
1011

1112
func FormatTextValue(value interface{}) ([]byte, error) {
@@ -37,7 +38,7 @@ func FormatTextValue(value interface{}) ([]byte, error) {
3738
case []byte:
3839
return v, nil
3940
case string:
40-
return hack.Slice(v), nil
41+
return utils.StringToByteSlice(v), nil
4142
case nil:
4243
return nil, nil
4344
default:
@@ -74,7 +75,7 @@ func formatBinaryValue(value interface{}) ([]byte, error) {
7475
case []byte:
7576
return v, nil
7677
case string:
77-
return hack.Slice(v), nil
78+
return utils.StringToByteSlice(v), nil
7879
default:
7980
return nil, errors.Errorf("invalid type %T", value)
8081
}
@@ -128,7 +129,7 @@ func BuildSimpleTextResultset(names []string, values [][]interface{}) (*Resultse
128129

129130
if len(values) == 0 {
130131
for i, name := range names {
131-
r.Fields[i] = &Field{Name: hack.Slice(name), Charset: 33, Type: MYSQL_TYPE_NULL}
132+
r.Fields[i] = &Field{Name: utils.StringToByteSlice(name), Charset: 33, Type: MYSQL_TYPE_NULL}
132133
}
133134
return r, nil
134135
}
@@ -145,7 +146,7 @@ func BuildSimpleTextResultset(names []string, values [][]interface{}) (*Resultse
145146
return nil, errors.Trace(err)
146147
}
147148
if r.Fields[j] == nil {
148-
r.Fields[j] = &Field{Name: hack.Slice(names[j]), Type: typ}
149+
r.Fields[j] = &Field{Name: utils.StringToByteSlice(names[j]), Type: typ}
149150
err = formatField(r.Fields[j], value)
150151
if err != nil {
151152
return nil, errors.Trace(err)
@@ -213,7 +214,7 @@ func BuildSimpleBinaryResultset(names []string, values [][]interface{}) (*Result
213214
if i == 0 {
214215
field := &Field{Type: typ}
215216
r.Fields[j] = field
216-
field.Name = hack.Slice(names[j])
217+
field.Name = utils.StringToByteSlice(names[j])
217218

218219
if err = formatField(field, value); err != nil {
219220
return nil, errors.Trace(err)

mysql/util.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ import (
1616
"time"
1717

1818
"github.com/Masterminds/semver"
19+
"github.com/go-mysql-org/go-mysql/utils"
1920
"github.com/pingcap/errors"
20-
"github.com/siddontang/go/hack"
2121
)
2222

2323
func Pstack() string {
@@ -375,7 +375,7 @@ var (
375375
func Escape(sql string) string {
376376
dest := make([]byte, 0, 2*len(sql))
377377

378-
for _, w := range hack.Slice(sql) {
378+
for _, w := range utils.StringToByteSlice(sql) {
379379
if c := EncodeMap[w]; c == DONTESCAPE {
380380
dest = append(dest, w)
381381
} else {

replication/json_binary.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ import (
44
"fmt"
55
"math"
66

7+
"github.com/go-mysql-org/go-mysql/utils"
78
"github.com/goccy/go-json"
89
"github.com/pingcap/errors"
9-
"github.com/siddontang/go/hack"
1010

1111
. "github.com/go-mysql-org/go-mysql/mysql"
1212
)
@@ -243,7 +243,7 @@ func (d *jsonBinaryDecoder) decodeObjectOrArray(data []byte, isSmall bool, isObj
243243
return nil
244244
}
245245

246-
keys[i] = hack.String(data[keyOffset : keyOffset+keyLength])
246+
keys[i] = utils.ByteSliceToString(data[keyOffset : keyOffset+keyLength])
247247
}
248248
}
249249

@@ -411,7 +411,7 @@ func (d *jsonBinaryDecoder) decodeString(data []byte) string {
411411

412412
data = data[n:]
413413

414-
v := hack.String(data[0:l])
414+
v := utils.ByteSliceToString(data[0:l])
415415
return v
416416
}
417417

@@ -439,7 +439,7 @@ func (d *jsonBinaryDecoder) decodeOpaque(data []byte) interface{} {
439439
case MYSQL_TYPE_DATE, MYSQL_TYPE_DATETIME, MYSQL_TYPE_TIMESTAMP:
440440
return d.decodeDateTime(data)
441441
default:
442-
return hack.String(data)
442+
return utils.ByteSliceToString(data)
443443
}
444444
}
445445

0 commit comments

Comments
 (0)