allow null enums when wire send zero value

veqryn · veqryn · commit 3e3d029c4ba8 · 2020-06-23T18:43:03.000-06:00
diff --git a/lib/column/array.go b/lib/column/array.go
@@ -16,7 +16,7 @@ type Array struct {
 	column Column
 }
 
-func (array *Array) Read(decoder *binary.Decoder) (interface{}, error) {
+func (array *Array) Read(decoder *binary.Decoder, isNull bool) (interface{}, error) {
 	return nil, fmt.Errorf("do not use Read method for Array(T) column")
 }
 
@@ -69,7 +69,7 @@ func (array *Array) read(decoder *binary.Decoder, offsets [][]uint64, index uint
 			err   error
 		)
 		if level == array.depth-1 {
-			value, err = array.column.Read(decoder)
+			value, err = array.column.Read(decoder, false)
 		} else {
 			value, err = array.read(decoder, offsets, i, level+1)
 		}
diff --git a/lib/column/column.go b/lib/column/column.go
@@ -13,7 +13,7 @@ type Column interface {
 	Name() string
 	CHType() string
 	ScanType() reflect.Type
-	Read(*binary.Decoder) (interface{}, error)
+	Read(*binary.Decoder, bool) (interface{}, error)
 	Write(*binary.Encoder, interface{}) error
 	defaultValue() interface{}
 	Depth() int
diff --git a/lib/column/date.go b/lib/column/date.go
@@ -12,7 +12,7 @@ type Date struct {
 	offset   int64
 }
 
-func (dt *Date) Read(decoder *binary.Decoder) (interface{}, error) {
+func (dt *Date) Read(decoder *binary.Decoder, isNull bool) (interface{}, error) {
 	sec, err := decoder.Int16()
 	if err != nil {
 		return nil, err
diff --git a/lib/column/datetime.go b/lib/column/datetime.go
@@ -11,7 +11,7 @@ type DateTime struct {
 	Timezone *time.Location
 }
 
-func (dt *DateTime) Read(decoder *binary.Decoder) (interface{}, error) {
+func (dt *DateTime) Read(decoder *binary.Decoder, isNull bool) (interface{}, error) {
 	sec, err := decoder.Int32()
 	if err != nil {
 		return nil, err
diff --git a/lib/column/datetime64.go b/lib/column/datetime64.go
@@ -14,7 +14,7 @@ type DateTime64 struct {
 	Timezone *time.Location
 }
 
-func (dt *DateTime64) Read(decoder *binary.Decoder) (interface{}, error) {
+func (dt *DateTime64) Read(decoder *binary.Decoder, isNull bool) (interface{}, error) {
 	value, err := decoder.Int64()
 	if err != nil {
 		return nil, err
diff --git a/lib/column/decimal.go b/lib/column/decimal.go
@@ -27,7 +27,7 @@ type Decimal struct {
 	scale     int
 }
 
-func (d *Decimal) Read(decoder *binary.Decoder) (interface{}, error) {
+func (d *Decimal) Read(decoder *binary.Decoder, isNull bool) (interface{}, error) {
 	switch d.nobits {
 	case 32:
 		return decoder.Int32()
diff --git a/lib/column/enum.go b/lib/column/enum.go
@@ -15,7 +15,7 @@ type Enum struct {
 	baseType interface{}
 }
 
-func (enum *Enum) Read(decoder *binary.Decoder) (interface{}, error) {
+func (enum *Enum) Read(decoder *binary.Decoder, isNull bool) (interface{}, error) {
 	var (
 		err   error
 		ident interface{}
@@ -30,7 +30,7 @@ func (enum *Enum) Read(decoder *binary.Decoder) (interface{}, error) {
 			return nil, err
 		}
 	}
-	if ident, found := enum.vi[ident]; found {
+	if ident, found := enum.vi[ident]; found || isNull {
 		return ident, nil
 	}
 	return nil, fmt.Errorf("invalid Enum value: %v", ident)
diff --git a/lib/column/fixed_string.go b/lib/column/fixed_string.go
@@ -14,7 +14,7 @@ type FixedString struct {
 	scanType reflect.Type
 }
 
-func (str *FixedString) Read(decoder *binary.Decoder) (interface{}, error) {
+func (str *FixedString) Read(decoder *binary.Decoder, isNull bool) (interface{}, error) {
 	v, err := decoder.Fixed(str.len)
 	if err != nil {
 		return "", err
diff --git a/lib/column/float32.go b/lib/column/float32.go
@@ -6,7 +6,7 @@ import (
 
 type Float32 struct{ base }
 
-func (Float32) Read(decoder *binary.Decoder) (interface{}, error) {
+func (Float32) Read(decoder *binary.Decoder, isNull bool) (interface{}, error) {
 	v, err := decoder.Float32()
 	if err != nil {
 		return float32(0), err
diff --git a/lib/column/float64.go b/lib/column/float64.go
@@ -6,7 +6,7 @@ import (
 
 type Float64 struct{ base }
 
-func (Float64) Read(decoder *binary.Decoder) (interface{}, error) {
+func (Float64) Read(decoder *binary.Decoder, isNull bool) (interface{}, error) {
 	v, err := decoder.Float64()
 	if err != nil {
 		return float64(0), err
diff --git a/lib/column/int16.go b/lib/column/int16.go
@@ -6,7 +6,7 @@ import (
 
 type Int16 struct{ base }
 
-func (Int16) Read(decoder *binary.Decoder) (interface{}, error) {
+func (Int16) Read(decoder *binary.Decoder, isNull bool) (interface{}, error) {
 	v, err := decoder.Int16()
 	if err != nil {
 		return int16(0), err
diff --git a/lib/column/int32.go b/lib/column/int32.go
@@ -6,7 +6,7 @@ import (
 
 type Int32 struct{ base }
 
-func (Int32) Read(decoder *binary.Decoder) (interface{}, error) {
+func (Int32) Read(decoder *binary.Decoder, isNull bool) (interface{}, error) {
 	v, err := decoder.Int32()
 	if err != nil {
 		return int32(0), err
diff --git a/lib/column/int64.go b/lib/column/int64.go
@@ -6,7 +6,7 @@ import (
 
 type Int64 struct{ base }
 
-func (Int64) Read(decoder *binary.Decoder) (interface{}, error) {
+func (Int64) Read(decoder *binary.Decoder, isNull bool) (interface{}, error) {
 	v, err := decoder.Int64()
 	if err != nil {
 		return int64(0), err
diff --git a/lib/column/int8.go b/lib/column/int8.go
@@ -6,7 +6,7 @@ import (
 
 type Int8 struct{ base }
 
-func (Int8) Read(decoder *binary.Decoder) (interface{}, error) {
+func (Int8) Read(decoder *binary.Decoder, isNull bool) (interface{}, error) {
 	v, err := decoder.Int8()
 	if err != nil {
 		return int8(0), err
diff --git a/lib/column/ipv4.go b/lib/column/ipv4.go
@@ -10,7 +10,7 @@ type IPv4 struct {
 	base
 }
 
-func (*IPv4) Read(decoder *binary.Decoder) (interface{}, error) {
+func (*IPv4) Read(decoder *binary.Decoder, isNull bool) (interface{}, error) {
 	v, err := decoder.Fixed(4)
 	if err != nil {
 		return nil, err
diff --git a/lib/column/ipv6.go b/lib/column/ipv6.go
@@ -10,7 +10,7 @@ type IPv6 struct {
 	base
 }
 
-func (*IPv6) Read(decoder *binary.Decoder) (interface{}, error) {
+func (*IPv6) Read(decoder *binary.Decoder, isNull bool) (interface{}, error) {
 	v, err := decoder.Fixed(16)
 	if err != nil {
 		return nil, err
diff --git a/lib/column/nullable.go b/lib/column/nullable.go
@@ -17,8 +17,8 @@ func (null *Nullable) ScanType() reflect.Type {
 	return null.column.ScanType()
 }
 
-func (null *Nullable) Read(decoder *binary.Decoder) (interface{}, error) {
-	return null.column.Read(decoder)
+func (null *Nullable) Read(decoder *binary.Decoder, isNull bool) (interface{}, error) {
+	return null.column.Read(decoder, isNull)
 }
 
 func (null *Nullable) Write(encoder *binary.Encoder, v interface{}) error {
@@ -39,7 +39,7 @@ func (null *Nullable) ReadNull(decoder *binary.Decoder, rows int) (_ []interface
 		nulls[i] = isNull
 	}
 	for i, isNull := range nulls {
-		switch value, err = null.column.Read(decoder); true {
+		switch value, err = null.column.Read(decoder, isNull != 0); true {
 		case err != nil:
 			return nil, err
 		case isNull == 0:
diff --git a/lib/column/string.go b/lib/column/string.go
@@ -6,7 +6,7 @@ import (
 
 type String struct{ base }
 
-func (String) Read(decoder *binary.Decoder) (interface{}, error) {
+func (String) Read(decoder *binary.Decoder, isNull bool) (interface{}, error) {
 	v, err := decoder.String()
 	if err != nil {
 		return "", err
diff --git a/lib/column/uint16.go b/lib/column/uint16.go
@@ -6,7 +6,7 @@ import (
 
 type UInt16 struct{ base }
 
-func (UInt16) Read(decoder *binary.Decoder) (interface{}, error) {
+func (UInt16) Read(decoder *binary.Decoder, isNull bool) (interface{}, error) {
 	v, err := decoder.UInt16()
 	if err != nil {
 		return uint16(0), err
diff --git a/lib/column/uint32.go b/lib/column/uint32.go
@@ -6,7 +6,7 @@ import (
 
 type UInt32 struct{ base }
 
-func (UInt32) Read(decoder *binary.Decoder) (interface{}, error) {
+func (UInt32) Read(decoder *binary.Decoder, isNull bool) (interface{}, error) {
 	v, err := decoder.UInt32()
 	if err != nil {
 		return uint32(0), err
diff --git a/lib/column/uint64.go b/lib/column/uint64.go
@@ -6,7 +6,7 @@ import (
 
 type UInt64 struct{ base }
 
-func (UInt64) Read(decoder *binary.Decoder) (interface{}, error) {
+func (UInt64) Read(decoder *binary.Decoder, isNull bool) (interface{}, error) {
 	v, err := decoder.UInt64()
 	if err != nil {
 		return uint64(0), err
diff --git a/lib/column/uint8.go b/lib/column/uint8.go
@@ -6,7 +6,7 @@ import (
 
 type UInt8 struct{ base }
 
-func (UInt8) Read(decoder *binary.Decoder) (interface{}, error) {
+func (UInt8) Read(decoder *binary.Decoder, isNull bool) (interface{}, error) {
 	v, err := decoder.UInt8()
 	if err != nil {
 		return uint8(0), err
diff --git a/lib/column/uuid.go b/lib/column/uuid.go
@@ -21,7 +21,7 @@ type UUID struct {
 	scanType reflect.Type
 }
 
-func (*UUID) Read(decoder *binary.Decoder) (interface{}, error) {
+func (*UUID) Read(decoder *binary.Decoder, isNull bool) (interface{}, error) {
 	src, err := decoder.Fixed(UUIDLen)
 	if err != nil {
 		return "", err
diff --git a/lib/data/block.go b/lib/data/block.go
@@ -85,7 +85,7 @@ func (block *Block) Read(serverInfo *ServerInfo, decoder *binary.Decoder) (err e
 			}
 		default:
 			for row := 0; row < int(block.NumRows); row++ {
-				if value, err = column.Read(decoder); err != nil {
+				if value, err = column.Read(decoder, false); err != nil {
 					return err
 				}
 				block.Values[i] = append(block.Values[i], value)

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ type Array struct {`
`16`	`16`	`column Column`
`17`	`17`	`}`
`18`	`18`
`19`		`-func (array Array) Read(decoder binary.Decoder) (interface{}, error) {`
	`19`	`+func (array Array) Read(decoder binary.Decoder, isNull bool) (interface{}, error) {`
`20`	`20`	`return nil, fmt.Errorf("do not use Read method for Array(T) column")`
`21`	`21`	`}`
`22`	`22`
`@@ -69,7 +69,7 @@ func (array Array) read(decoder binary.Decoder, offsets [][]uint64, index uint`
`69`	`69`	`err error`
`70`	`70`	`)`
`71`	`71`	`if level == array.depth-1 {`
`72`		`- value, err = array.column.Read(decoder)`
	`72`	`+ value, err = array.column.Read(decoder, false)`
`73`	`73`	`} else {`
`74`	`74`	`value, err = array.read(decoder, offsets, i, level+1)`
`75`	`75`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ type Date struct {`
`12`	`12`	`offset int64`
`13`	`13`	`}`
`14`	`14`
`15`		`-func (dt Date) Read(decoder binary.Decoder) (interface{}, error) {`
	`15`	`+func (dt Date) Read(decoder binary.Decoder, isNull bool) (interface{}, error) {`
`16`	`16`	`sec, err := decoder.Int16()`
`17`	`17`	`if err != nil {`
`18`	`18`	`return nil, err`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ type DateTime struct {`
`11`	`11`	`Timezone *time.Location`
`12`	`12`	`}`
`13`	`13`
`14`		`-func (dt DateTime) Read(decoder binary.Decoder) (interface{}, error) {`
	`14`	`+func (dt DateTime) Read(decoder binary.Decoder, isNull bool) (interface{}, error) {`
`15`	`15`	`sec, err := decoder.Int32()`
`16`	`16`	`if err != nil {`
`17`	`17`	`return nil, err`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ type DateTime64 struct {`
`14`	`14`	`Timezone *time.Location`
`15`	`15`	`}`
`16`	`16`
`17`		`-func (dt DateTime64) Read(decoder binary.Decoder) (interface{}, error) {`
	`17`	`+func (dt DateTime64) Read(decoder binary.Decoder, isNull bool) (interface{}, error) {`
`18`	`18`	`value, err := decoder.Int64()`
`19`	`19`	`if err != nil {`
`20`	`20`	`return nil, err`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ type Decimal struct {`
`27`	`27`	`scale int`
`28`	`28`	`}`
`29`	`29`
`30`		`-func (d Decimal) Read(decoder binary.Decoder) (interface{}, error) {`
	`30`	`+func (d Decimal) Read(decoder binary.Decoder, isNull bool) (interface{}, error) {`
`31`	`31`	`switch d.nobits {`
`32`	`32`	`case 32:`
`33`	`33`	`return decoder.Int32()`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ type Enum struct {`
`15`	`15`	`baseType interface{}`
`16`	`16`	`}`
`17`	`17`
`18`		`-func (enum Enum) Read(decoder binary.Decoder) (interface{}, error) {`
	`18`	`+func (enum Enum) Read(decoder binary.Decoder, isNull bool) (interface{}, error) {`
`19`	`19`	`var (`
`20`	`20`	`err error`
`21`	`21`	`ident interface{}`
`@@ -30,7 +30,7 @@ func (enum Enum) Read(decoder binary.Decoder) (interface{}, error) {`
`30`	`30`	`return nil, err`
`31`	`31`	`}`
`32`	`32`	`}`
`33`		`- if ident, found := enum.vi[ident]; found {`
	`33`	`+ if ident, found := enum.vi[ident]; found \|\| isNull {`
`34`	`34`	`return ident, nil`
`35`	`35`	`}`
`36`	`36`	`return nil, fmt.Errorf("invalid Enum value: %v", ident)`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ type FixedString struct {`
`14`	`14`	`scanType reflect.Type`
`15`	`15`	`}`
`16`	`16`
`17`		`-func (str FixedString) Read(decoder binary.Decoder) (interface{}, error) {`
	`17`	`+func (str FixedString) Read(decoder binary.Decoder, isNull bool) (interface{}, error) {`
`18`	`18`	`v, err := decoder.Fixed(str.len)`
`19`	`19`	`if err != nil {`
`20`	`20`	`return "", err`