vendor: update all dependencies

This commit is contained in:
Nick Craig-Wood
2017-07-23 08:51:42 +01:00
parent 0b6fba34a3
commit eb87cf6f12
2008 changed files with 352617 additions and 1004734 deletions
+25 -42
View File
@@ -22,7 +22,6 @@ import (
"math"
"reflect"
"strconv"
"strings"
"time"
"cloud.google.com/go/civil"
@@ -142,7 +141,7 @@ func (v GenericColumnValue) Decode(ptr interface{}) error {
// NewGenericColumnValue creates a GenericColumnValue from Go value that is
// valid for Cloud Spanner.
func NewGenericColumnValue(v interface{}) (*GenericColumnValue, error) {
func newGenericColumnValue(v interface{}) (*GenericColumnValue, error) {
value, typ, err := encodeValue(v)
if err != nil {
return nil, err
@@ -187,7 +186,7 @@ func errDstNotForNull(dst interface{}) error {
return spannerErrorf(codes.InvalidArgument, "destination %T cannot support NULL SQL values", dst)
}
// errBadEncoding returns error for decoding wrongly encoded BYTES/INT64.
// errBadEncoding returns error for decoding wrongly encoded types.
func errBadEncoding(v *proto3.Value, err error) error {
return spannerErrorf(codes.FailedPrecondition, "%v wasn't correctly encoded: <%v>", v, err)
}
@@ -659,7 +658,7 @@ func decodeValue(v *proto3.Value, t *sppb.Type, ptr interface{}) error {
// errSrvVal returns an error for getting a wrong source protobuf value in decoding.
func errSrcVal(v *proto3.Value, want string) error {
return spannerErrorf(codes.FailedPrecondition, "cannot use %v(Kind: %T) as Value_%sValue in decoding",
return spannerErrorf(codes.FailedPrecondition, "cannot use %v(Kind: %T) as %s Value",
v, v.GetKind(), want)
}
@@ -871,28 +870,6 @@ func decodeRowArray(ty *sppb.StructType, pb *proto3.ListValue) ([]NullRow, error
return a, nil
}
// structFieldColumn returns the name of i-th field of struct type typ if the field
// is untagged; otherwise, it returns the tagged name of the field.
func structFieldColumn(typ reflect.Type, i int) (col string, ok bool) {
desc := typ.Field(i)
if desc.PkgPath != "" || desc.Anonymous {
// Skip unexported or anonymous fields.
return "", false
}
col = desc.Name
if tag := desc.Tag.Get("spanner"); tag != "" {
if tag == "-" {
// Skip fields tagged "-" to match encoding/json and others.
return "", false
}
col = tag
if idx := strings.Index(tag, ","); idx != -1 {
col = tag[:idx]
}
}
return col, true
}
// errNilSpannerStructType returns error for unexpected nil Cloud Spanner STRUCT schema type in decoding.
func errNilSpannerStructType() error {
return spannerErrorf(codes.FailedPrecondition, "unexpected nil StructType in decoding Cloud Spanner STRUCT")
@@ -1019,7 +996,7 @@ func decodeStructArray(ty *sppb.StructType, pb *proto3.ListValue, ptr interface{
// errEncoderUnsupportedType returns error for not being able to encode a value of
// certain type.
func errEncoderUnsupportedType(v interface{}) error {
return spannerErrorf(codes.InvalidArgument, "encoder doesn't support type %T", v)
return spannerErrorf(codes.InvalidArgument, "client doesn't support type %T", v)
}
// encodeValue encodes a Go native type into a proto3.Value.
@@ -1038,35 +1015,36 @@ func encodeValue(v interface{}) (*proto3.Value, *sppb.Type, error) {
if v.Valid {
return encodeValue(v.StringVal)
}
pt = stringType()
case []string:
if v != nil {
pb, err = encodeArray(len(v), func(i int) interface{} { return v[i] })
if err != nil {
return nil, nil, err
}
pt = listType(stringType())
}
pt = listType(stringType())
case []NullString:
if v != nil {
pb, err = encodeArray(len(v), func(i int) interface{} { return v[i] })
if err != nil {
return nil, nil, err
}
pt = listType(stringType())
}
pt = listType(stringType())
case []byte:
if v != nil {
pb.Kind = stringKind(base64.StdEncoding.EncodeToString(v))
pt = bytesType()
}
pt = bytesType()
case [][]byte:
if v != nil {
pb, err = encodeArray(len(v), func(i int) interface{} { return v[i] })
if err != nil {
return nil, nil, err
}
pt = listType(bytesType())
}
pt = listType(bytesType())
case int:
pb.Kind = stringKind(strconv.FormatInt(int64(v), 10))
pt = intType()
@@ -1076,8 +1054,8 @@ func encodeValue(v interface{}) (*proto3.Value, *sppb.Type, error) {
if err != nil {
return nil, nil, err
}
pt = listType(intType())
}
pt = listType(intType())
case int64:
pb.Kind = stringKind(strconv.FormatInt(v, 10))
pt = intType()
@@ -1087,20 +1065,21 @@ func encodeValue(v interface{}) (*proto3.Value, *sppb.Type, error) {
if err != nil {
return nil, nil, err
}
pt = listType(intType())
}
pt = listType(intType())
case NullInt64:
if v.Valid {
return encodeValue(v.Int64)
}
pt = intType()
case []NullInt64:
if v != nil {
pb, err = encodeArray(len(v), func(i int) interface{} { return v[i] })
if err != nil {
return nil, nil, err
}
pt = listType(intType())
}
pt = listType(intType())
case bool:
pb.Kind = &proto3.Value_BoolValue{BoolValue: v}
pt = boolType()
@@ -1110,20 +1089,21 @@ func encodeValue(v interface{}) (*proto3.Value, *sppb.Type, error) {
if err != nil {
return nil, nil, err
}
pt = listType(boolType())
}
pt = listType(boolType())
case NullBool:
if v.Valid {
return encodeValue(v.Bool)
}
pt = boolType()
case []NullBool:
if v != nil {
pb, err = encodeArray(len(v), func(i int) interface{} { return v[i] })
if err != nil {
return nil, nil, err
}
pt = listType(boolType())
}
pt = listType(boolType())
case float64:
pb.Kind = &proto3.Value_NumberValue{NumberValue: v}
pt = floatType()
@@ -1133,20 +1113,21 @@ func encodeValue(v interface{}) (*proto3.Value, *sppb.Type, error) {
if err != nil {
return nil, nil, err
}
pt = listType(floatType())
}
pt = listType(floatType())
case NullFloat64:
if v.Valid {
return encodeValue(v.Float64)
}
pt = floatType()
case []NullFloat64:
if v != nil {
pb, err = encodeArray(len(v), func(i int) interface{} { return v[i] })
if err != nil {
return nil, nil, err
}
pt = listType(floatType())
}
pt = listType(floatType())
case time.Time:
pb.Kind = stringKind(v.UTC().Format(time.RFC3339Nano))
pt = timeType()
@@ -1156,20 +1137,21 @@ func encodeValue(v interface{}) (*proto3.Value, *sppb.Type, error) {
if err != nil {
return nil, nil, err
}
pt = listType(timeType())
}
pt = listType(timeType())
case NullTime:
if v.Valid {
return encodeValue(v.Time)
}
pt = timeType()
case []NullTime:
if v != nil {
pb, err = encodeArray(len(v), func(i int) interface{} { return v[i] })
if err != nil {
return nil, nil, err
}
pt = listType(timeType())
}
pt = listType(timeType())
case civil.Date:
pb.Kind = stringKind(v.String())
pt = dateType()
@@ -1179,20 +1161,21 @@ func encodeValue(v interface{}) (*proto3.Value, *sppb.Type, error) {
if err != nil {
return nil, nil, err
}
pt = listType(dateType())
}
pt = listType(dateType())
case NullDate:
if v.Valid {
return encodeValue(v.Date)
}
pt = dateType()
case []NullDate:
if v != nil {
pb, err = encodeArray(len(v), func(i int) interface{} { return v[i] })
if err != nil {
return nil, nil, err
}
pt = listType(dateType())
}
pt = listType(dateType())
case GenericColumnValue:
// Deep clone to ensure subsequent changes to v before
// transmission don't affect our encoded value.