[#265] proto: Implement functions for double (float64) protobuf data type

Signed-off-by: Leonard Lyubich <leonard@nspcc.ru>
This commit is contained in:
Leonard Lyubich 2021-03-24 10:10:30 +03:00 committed by Leonard Lyubich
parent 101d14d405
commit 0cbb8d0913
4 changed files with 65 additions and 0 deletions

View file

@ -8,6 +8,7 @@ package proto
import ( import (
"encoding/binary" "encoding/binary"
"math"
"math/bits" "math/bits"
"reflect" "reflect"
) )
@ -360,3 +361,26 @@ func Fixed64Size(fNum int, v uint64) int {
return VarUIntSize(uint64(prefix)) + 8 return VarUIntSize(uint64(prefix)) + 8
} }
func Float64Marshal(field int, buf []byte, v float64) (int, error) {
if v == 0 {
return 0, nil
}
prefix := field<<3 | 1
i := binary.PutUvarint(buf, uint64(prefix))
binary.LittleEndian.PutUint64(buf[i:], math.Float64bits(v))
return i + 8, nil
}
func Float64Size(fNum int, v float64) int {
if v == 0 {
return 0
}
prefix := fNum<<3 | 1
return VarUIntSize(uint64(prefix)) + 8
}

View file

@ -23,6 +23,7 @@ type stablePrimitives struct {
FieldG uint64 FieldG uint64
FieldH SomeEnum FieldH SomeEnum
FieldI uint64 // fixed64 FieldI uint64 // fixed64
FieldJ float64
} }
type stableRepPrimitives struct { type stableRepPrimitives struct {
@ -133,6 +134,16 @@ func (s *stablePrimitives) stableMarshal(buf []byte, wrongField bool) ([]byte, e
} }
i += offset i += offset
fieldNum = 206
if wrongField {
fieldNum++
}
offset, err = proto.Float64Marshal(fieldNum, buf, s.FieldJ)
if err != nil {
return nil, errors.Wrap(err, "can't marshal field J")
}
i += offset
fieldNum = 300 fieldNum = 300
if wrongField { if wrongField {
fieldNum++ fieldNum++
@ -155,6 +166,7 @@ func (s *stablePrimitives) stableSize() int {
proto.Int64Size(203, s.FieldF) + proto.Int64Size(203, s.FieldF) +
proto.UInt64Size(204, s.FieldG) + proto.UInt64Size(204, s.FieldG) +
proto.Fixed64Size(205, s.FieldI) + proto.Fixed64Size(205, s.FieldI) +
proto.Float64Size(206, s.FieldJ) +
proto.EnumSize(300, int32(s.FieldH)) proto.EnumSize(300, int32(s.FieldH))
} }
@ -453,6 +465,19 @@ func TestFixed64Marshal(t *testing.T) {
}) })
} }
func TestFloat64Marshal(t *testing.T) {
t.Run("zero", func(t *testing.T) {
testFloat64Marshal(t, 0, false)
})
t.Run("non zero", func(t *testing.T) {
f := math.Float64frombits(12345677890)
testFloat64Marshal(t, f, false)
testFloat64Marshal(t, f, true)
})
}
func testMarshal(t *testing.T, c stablePrimitives, tr test.Primitives, wrongField bool) *test.Primitives { func testMarshal(t *testing.T, c stablePrimitives, tr test.Primitives, wrongField bool) *test.Primitives {
var ( var (
wire []byte wire []byte
@ -589,6 +614,21 @@ func testUInt64Marshal(t *testing.T, n uint64, wrongField bool) {
} }
} }
func testFloat64Marshal(t *testing.T, n float64, wrongField bool) {
var (
custom = stablePrimitives{FieldJ: n}
transport = test.Primitives{FieldJ: n}
)
result := testMarshal(t, custom, transport, wrongField)
if !wrongField {
require.Equal(t, n, result.FieldJ)
} else {
require.EqualValues(t, 0, result.FieldJ)
}
}
func testEnumMarshal(t *testing.T, e SomeEnum, wrongField bool) { func testEnumMarshal(t *testing.T, e SomeEnum, wrongField bool) {
var ( var (
custom = stablePrimitives{FieldH: e} custom = stablePrimitives{FieldH: e}

Binary file not shown.

View file

@ -13,6 +13,7 @@ message Primitives {
int64 field_f = 203; int64 field_f = 203;
uint64 field_g = 204; uint64 field_g = 204;
fixed64 field_i = 205; fixed64 field_i = 205;
double field_j = 206;
enum SomeEnum { enum SomeEnum {
UNKNOWN = 0; UNKNOWN = 0;