avro: allow encoding int32 and float32 types as long and double

codec_native.go

@@ -138,10 +138,13 @@ func createEncoderOfNative(schema Schema, typ reflect2.Type) ValEncoder {
 		return &int16Codec{}
 
 	case reflect.Int32:
-		if schema.Type() != Int {
-			break
+		switch schema.Type() {
+		case Long:
+			return &int32LongCodec{}
+
+		case Int:
+			return &int32Codec{}
 		}
-		return &int32Codec{}
 
 	case reflect.Int64:
 		st := schema.Type()
@@ -161,10 +164,13 @@ func createEncoderOfNative(schema Schema, typ reflect2.Type) ValEncoder {
 		}
 
 	case reflect.Float32:
-		if schema.Type() != Float {
-			break
+		switch schema.Type() {
+		case Double:
+			return &float32DoubleCodec{}
+
+		case Float:
+			return &float32Codec{}
 		}
-		return &float32Codec{}
 
 	case reflect.Float64:
 		if schema.Type() != Double {
@@ -296,6 +302,12 @@ func (*int32Codec) Encode(ptr unsafe.Pointer, w *Writer) {
 	w.WriteInt(*((*int32)(ptr)))
 }
 
+type int32LongCodec struct{}
+
+func (*int32LongCodec) Encode(ptr unsafe.Pointer, w *Writer) {
+	w.WriteLong(int64(*((*int32)(ptr))))
+}
+
 type int64Codec struct{}
 
 func (*int64Codec) Decode(ptr unsafe.Pointer, r *Reader) {
@@ -316,6 +328,12 @@ func (*float32Codec) Encode(ptr unsafe.Pointer, w *Writer) {
 	w.WriteFloat(*((*float32)(ptr)))
 }
 
+type float32DoubleCodec struct{}
+
+func (*float32DoubleCodec) Encode(ptr unsafe.Pointer, w *Writer) {
+	w.WriteDouble(float64(*((*float32)(ptr))))
+}
+
 type float64Codec struct{}
 
 func (*float64Codec) Decode(ptr unsafe.Pointer, r *Reader) {

encoder_native_test.go

@@ -172,6 +172,20 @@ func TestEncoder_Int64(t *testing.T) {
 	assert.Equal(t, []byte{0x36}, buf.Bytes())
 }
 
+func TestEncoder_Int64FromInt32(t *testing.T) {
+	defer ConfigTeardown()
+
+	schema := "long"
+	buf := bytes.NewBuffer([]byte{})
+	enc, err := avro.NewEncoder(schema, buf)
+	assert.NoError(t, err)
+
+	err = enc.Encode(int32(27))
+
+	assert.NoError(t, err)
+	assert.Equal(t, []byte{0x36}, buf.Bytes())
+}
+
 func TestEncoder_Int64InvalidSchema(t *testing.T) {
 	defer ConfigTeardown()
 
@@ -226,6 +240,20 @@ func TestEncoder_Float64(t *testing.T) {
 	assert.Equal(t, []byte{0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0xF2, 0x3F}, buf.Bytes())
 }
 
+func TestEncoder_Float64FromFloat32(t *testing.T) {
+	defer ConfigTeardown()
+
+	schema := "double"
+	buf := bytes.NewBuffer([]byte{})
+	enc, err := avro.NewEncoder(schema, buf)
+	assert.NoError(t, err)
+
+	err = enc.Encode(float32(1.15))
+
+	assert.NoError(t, err)
+	assert.Equal(t, []byte{0x0, 0x0, 0x0, 0x60, 0x66, 0x66, 0xf2, 0x3f}, buf.Bytes())
+}
+
 func TestEncoder_Float64InvalidSchema(t *testing.T) {
 	defer ConfigTeardown()