Skip to content

Commit b3fb641

Browse files
DCjanusDCjanus
authored
chore: upgrade project to Go 1.26 (#1054)
Assisted-by: Codex:gpt-5.5
1 parent 5f47969 commit b3fb641

20 files changed

Lines changed: 70 additions & 70 deletions

File tree

‎Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.21-alpine AS builder
1+
FROM golang:1.26-alpine AS builder
22
WORKDIR /app
33
COPY . .
44
RUN go mod download
@@ -13,4 +13,4 @@ COPY entrypoint.sh .
1313

1414
RUN chmod +x entrypoint.sh
1515

16-
ENTRYPOINT ["/bin/sh", "entrypoint.sh"]
16+
ENTRYPOINT ["/bin/sh", "entrypoint.sh"]

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module RedisShake
22

3-
go 1.21
3+
go 1.26
44

55
require (
66
github.com/dustin/go-humanize v1.0.1

‎internal/client/func.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ func EncodeArgv(argv []string, buf *bytes.Buffer) {
1818
}
1919
err := writer.WriteArgs(argvInterface)
2020
if err != nil {
21-
log.Panicf(err.Error())
21+
log.Panicf("%v", err)
2222
}
2323
}
2424

‎internal/client/redis.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ func (r *Redis) DoWithStringReply(args ...interface{}) string {
177177

178178
replyInterface, err := r.Receive()
179179
if err != nil {
180-
log.Panicf(err.Error())
180+
log.Panicf("%v", err)
181181
}
182182
reply := replyInterface.(string)
183183
return reply
@@ -188,7 +188,7 @@ func (r *Redis) Do(args ...interface{}) interface{} {
188188

189189
reply, err := r.Receive()
190190
if err != nil {
191-
log.Panicf(err.Error())
191+
log.Panicf("%v", err)
192192
}
193193
return reply
194194
}
@@ -200,7 +200,7 @@ func (r *Redis) Send(args ...interface{}) {
200200
}
201201
err := r.protoWriter.WriteArgs(argsInterface)
202202
if err != nil {
203-
log.Panicf(err.Error())
203+
log.Panicf("%v", err)
204204
}
205205
r.Flush()
206206
}
@@ -209,14 +209,14 @@ func (r *Redis) Send(args ...interface{}) {
209209
func (r *Redis) SendBytesBuff(buf []byte) {
210210
_, err := r.writer.Write(buf)
211211
if err != nil {
212-
log.Panicf(err.Error())
212+
log.Panicf("%v", err)
213213
}
214214
}
215215

216216
func (r *Redis) Flush() {
217217
err := r.writer.Flush()
218218
if err != nil {
219-
log.Panicf(err.Error())
219+
log.Panicf("%v", err)
220220
}
221221
}
222222

@@ -227,7 +227,7 @@ func (r *Redis) Receive() (interface{}, error) {
227227
func (r *Redis) ReceiveString() string {
228228
reply, err := r.Receive()
229229
if err != nil {
230-
log.Panicf(err.Error())
230+
log.Panicf("%v", err)
231231
}
232232
return reply.(string)
233233
}
@@ -264,7 +264,7 @@ func (r *Redis) Scan(cursor uint64, count int) (newCursor uint64, keys []string)
264264
r.Send("scan", strconv.FormatUint(cursor, 10), "count", count)
265265
reply, err := r.Receive()
266266
if err != nil {
267-
log.Panicf(err.Error())
267+
log.Panicf("%v", err)
268268
}
269269

270270
array := reply.([]interface{})
@@ -275,7 +275,7 @@ func (r *Redis) Scan(cursor uint64, count int) (newCursor uint64, keys []string)
275275
// cursor
276276
newCursor, err = strconv.ParseUint(array[0].(string), 10, 64)
277277
if err != nil {
278-
log.Panicf(err.Error())
278+
log.Panicf("%v", err)
279279
}
280280
// keys
281281
keys = make([]string, 0)

‎internal/client/reply.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import "RedisShake/internal/log"
44

55
func ArrayString(replyInterface interface{}, err error) []string {
66
if err != nil {
7-
log.Panicf(err.Error())
7+
log.Panicf("%v", err)
88
}
99
replyArray := replyInterface.([]interface{})
1010
replyArrayString := make([]string, len(replyArray))

‎internal/commands/keys.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ func CalcKeys(argv []string) (cmaName string, group string, keys []string, keysI
7979
}
8080
keyCount, err := strconv.Atoi(argv[keynumIdx])
8181
if err != nil {
82-
log.Panicf(err.Error())
82+
log.Panicf("%v", err)
8383
}
8484
firstKey := spec.findKeysKeynumFirstKey
8585
step := spec.findKeysKeynumKeyStep

‎internal/entry/entry.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ func (e *Entry) Serialize() []byte {
4646
}
4747
err := writer.WriteArgs(argvInterface)
4848
if err != nil {
49-
log.Panicf(err.Error())
49+
log.Panicf("%v", err)
5050
}
5151
e.SerializedSize = int64(buf.Len())
5252
return buf.Bytes()

‎internal/rdb/rdb.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ func (ld *Loader) ParseRDB(ctx context.Context) int {
8989
buf := make([]byte, 9)
9090
_, err = io.ReadFull(rd, buf)
9191
if err != nil {
92-
log.Panicf(err.Error())
92+
log.Panicf("%v", err)
9393
}
9494
var version int
9595
if bytes.Equal(buf[:5], []byte("REDIS")) {
@@ -104,7 +104,7 @@ func (ld *Loader) ParseRDB(ctx context.Context) int {
104104
log.Panicf("verify magic string, invalid file format. bytes=[%v]", buf[:6])
105105
}
106106
if err != nil {
107-
log.Panicf(err.Error())
107+
log.Panicf("%v", err)
108108
}
109109
log.Debugf("[%s] RDB version: %d", ld.name, version)
110110

@@ -122,7 +122,7 @@ func (ld *Loader) parseRDBEntry(ctx context.Context, rd *bufio.Reader) {
122122
}
123123
offset, err := ld.fp.Seek(0, io.SeekCurrent)
124124
if err != nil {
125-
log.Panicf(err.Error())
125+
log.Panicf("%v", err)
126126
}
127127
ld.updateFunc(offset)
128128
}
@@ -180,7 +180,7 @@ func (ld *Loader) parseRDBEntry(ctx context.Context, rd *bufio.Reader) {
180180
var err error
181181
ld.replStreamDbId, err = strconv.Atoi(value)
182182
if err != nil {
183-
log.Panicf(err.Error())
183+
log.Panicf("%v", err)
184184
}
185185
log.Debugf("[%s] RDB repl-stream-db: [%s]", ld.name, value)
186186
} else if key == "lua" {

‎internal/rdb/structure/byte.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ func ReadBytes(rd io.Reader, n int) []byte {
1515
buf := make([]byte, n)
1616
_, err := io.ReadFull(rd, buf)
1717
if err != nil {
18-
log.Panicf(err.Error())
18+
log.Panicf("%v", err)
1919
}
2020
return buf
2121
}

‎internal/rdb/structure/float.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ func ReadFloat(rd io.Reader) float64 {
2828

2929
v, err := strconv.ParseFloat(string(buf), 64)
3030
if err != nil {
31-
log.Panicf(err.Error())
31+
log.Panicf("%v", err)
3232
}
3333
return v
3434
}
@@ -38,7 +38,7 @@ func ReadDouble(rd io.Reader) float64 {
3838
var buf = make([]byte, 8)
3939
_, err := io.ReadFull(rd, buf)
4040
if err != nil {
41-
log.Panicf(err.Error())
41+
log.Panicf("%v", err)
4242
}
4343
num := binary.LittleEndian.Uint64(buf)
4444
return math.Float64frombits(num)

0 commit comments

Comments
 (0)