Skip to content

Commit

Permalink
Merge pull request #178 from notmahsa/fix/zstd-decode-argument-swap
Browse files Browse the repository at this point in the history
fix: swapped dst and src arguments in zstd decode call
  • Loading branch information
vmihailenco authored Jun 22, 2022
2 parents 8faa953 + e61a842 commit 9453f48
Showing 1 changed file with 17 additions and 17 deletions.
34 changes: 17 additions & 17 deletions message.go
Original file line number Diff line number Diff line change
Expand Up @@ -102,13 +102,28 @@ func (m *Message) setNameFromArgs(period time.Duration, args ...interface{}) {
m.Name = internal.BytesToString(b)
}

var zdec, _ = zstd.NewReader(nil)

func (m *Message) decompress() ([]byte, error) {
switch m.ArgsCompression {
case "":
return m.ArgsBin, nil
case "zstd":
return zdec.DecodeAll(m.ArgsBin, nil)
case "s2":
return s2.Decode(nil, m.ArgsBin)
default:
return nil, fmt.Errorf("taskq: unsupported compression=%s", m.ArgsCompression)
}
}

func (m *Message) MarshalArgs() ([]byte, error) {
if m.ArgsBin != nil {
if m.ArgsCompression == "" {
return m.ArgsBin, nil
}
if m.Args == nil {
return decompress(nil, m.ArgsBin, m.ArgsCompression)
return m.decompress()
}
}

Expand Down Expand Up @@ -162,7 +177,7 @@ func (m *Message) UnmarshalBinary(b []byte) error {
return err
}

b, err := decompress(nil, m.ArgsBin, m.ArgsCompression)
b, err := m.decompress()
if err != nil {
return err
}
Expand All @@ -173,21 +188,6 @@ func (m *Message) UnmarshalBinary(b []byte) error {
return nil
}

var zdec, _ = zstd.NewReader(nil)

func decompress(dst, src []byte, compression string) ([]byte, error) {
switch compression {
case "":
return src, nil
case "zstd":
return zdec.DecodeAll(dst, src)
case "s2":
return s2.Decode(dst, src)
default:
return nil, fmt.Errorf("taskq: unsupported compression=%s", compression)
}
}

func appendTimeSlot(b []byte, period time.Duration) []byte {
l := len(b)
b = append(b, make([]byte, 16)...)
Expand Down

0 comments on commit 9453f48

Please sign in to comment.