upstream/icingadb
1
0
Fork 0
mirror of https://github.com/Icinga/icingadb.git synced 2026-05-28 04:35:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

PackAny(): support types.Binary

Browse source
This commit is contained in:
Alexander A. Klimov 2021-05-06 18:00:47 +02:00
parent bb850ddb5d
commit ab43673593
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkg/icingadb/objectpacker/objectpacker.go
View file

@ -17,6 +17,8 @@ func PackAny(in interface{}, out io.Writer) error {
return packValue(reflect.ValueOf(in), out)
}
var tBytes = reflect.TypeOf([]uint8(nil))
// packValue does the actual job of packAny and just exists for recursion w/o unneccessary reflect.ValueOf calls.
func packValue(in reflect.Value, out io.Writer) error {
switch kind := in.Kind(); kind {
@ -50,7 +52,8 @@ func packValue(in reflect.Value, out io.Writer) error {
}
// Pack []byte as string, not array of numbers.
return packString(in.Interface().([]uint8), out)
return packString(in.Convert(tBytes). // Support types.Binary
Interface().([]uint8), out)
}
if _, err := out.Write([]byte{5}); err != nil {

2
pkg/icingadb/objectpacker/objectpacker_test.go
View file

@ -2,6 +2,7 @@ package objectpacker
import (
"bytes"
"github.com/icinga/icingadb/pkg/types"
"io"
"testing"
"unsafe"
@ -129,6 +130,7 @@ func TestPackAny(t *testing.T) {
assertPackAny(t, binary, append([]byte{4, 0, 0, 0, 0, 0, 0, 1, 0}, binary[:]...))
assertPackAny(t, binary[:], append([]byte{4, 0, 0, 0, 0, 0, 0, 1, 0}, binary[:]...))
assertPackAny(t, types.Binary(binary[:]), append([]byte{4, 0, 0, 0, 0, 0, 0, 1, 0}, binary[:]...))
}
assertPackAnyPanic(t, complex64(0+0i), 0)