@@ -21,6 +21,7 @@ import (
2121 "database/sql"
2222 "database/sql/driver"
2323 "encoding/base64"
24+ "encoding/json"
2425 "fmt"
2526 "math"
2627 "math/big"
@@ -32,7 +33,6 @@ import (
3233 "cloud.google.com/go/civil"
3334 "cloud.google.com/go/internal/fields"
3435 sppb "cloud.google.com/go/spanner/apiv1/spannerpb"
35- jsoniter "github.com/json-iterator/go"
3636 "google.golang.org/grpc/codes"
3737 "google.golang.org/protobuf/proto"
3838 proto3 "google.golang.org/protobuf/types/known/structpb"
@@ -114,7 +114,7 @@ var (
114114
115115 jsonNullBytes = []byte ("null" )
116116
117- jsonProvider = jsoniter . ConfigCompatibleWithStandardLibrary
117+ jsonUseNumber bool
118118)
119119
120120// UseNumberWithJSONDecoderEncoder specifies whether Cloud Spanner JSON numbers are decoded
@@ -124,11 +124,15 @@ var (
124124// NOTE 1: Calling this method affects the behavior of all clients created by this library, both existing and future instances.
125125// NOTE 2: This method sets a global variable that is used by the client to encode/decode JSON numbers. Access to the global variable is not synchronized. You should only call this method when there are no goroutines encoding/decoding Cloud Spanner JSON values. It is recommended to only call this method during the initialization of your application, and preferably before you create any Cloud Spanner clients, and/or in tests when there are no queries being executed.
126126func UseNumberWithJSONDecoderEncoder (useNumber bool ) {
127- jsonProvider = jsoniter.Config {
128- EscapeHTML : true ,
129- SortMapKeys : true , // Sort map keys to ensure deterministic output, to be consistent with encoding.
130- UseNumber : useNumber ,
131- }.Froze ()
127+ jsonUseNumber = useNumber
128+ }
129+
130+ func jsonUnmarshal (data []byte , v any ) error {
131+ dec := json .NewDecoder (bytes .NewReader (data ))
132+ if jsonUseNumber {
133+ dec .UseNumber ()
134+ }
135+ return dec .Decode (v )
132136}
133137
134138// Encoder is the interface implemented by a custom type that can be encoded to
@@ -297,7 +301,7 @@ func (n *NullString) UnmarshalJSON(payload []byte) error {
297301 return nil
298302 }
299303 var s * string
300- if err := jsonProvider . Unmarshal (payload , & s ); err != nil {
304+ if err := jsonUnmarshal (payload , & s ); err != nil {
301305 return err
302306 }
303307 if s != nil {
@@ -866,7 +870,7 @@ func (n NullJSON) String() string {
866870 if ! n .Valid {
867871 return nullString
868872 }
869- b , err := jsonProvider .Marshal (n .Value )
873+ b , err := json .Marshal (n .Value )
870874 if err != nil {
871875 return fmt .Sprintf ("error: %v" , err )
872876 }
@@ -888,7 +892,7 @@ func (n *NullJSON) UnmarshalJSON(payload []byte) error {
888892 return nil
889893 }
890894 var v interface {}
891- err := jsonProvider . Unmarshal (payload , & v )
895+ err := jsonUnmarshal (payload , & v )
892896 if err != nil {
893897 return fmt .Errorf ("payload cannot be converted to a struct: got %v, err: %w" , string (payload ), err )
894898 }
@@ -972,7 +976,7 @@ func (n PGJsonB) String() string {
972976 if ! n .Valid {
973977 return nullString
974978 }
975- b , err := jsonProvider .Marshal (n .Value )
979+ b , err := json .Marshal (n .Value )
976980 if err != nil {
977981 return fmt .Sprintf ("error: %v" , err )
978982 }
@@ -994,7 +998,7 @@ func (n *PGJsonB) UnmarshalJSON(payload []byte) error {
994998 return nil
995999 }
9961000 var v interface {}
997- err := jsonProvider . Unmarshal (payload , & v )
1001+ err := jsonUnmarshal (payload , & v )
9981002 if err != nil {
9991003 return fmt .Errorf ("payload cannot be converted to a struct: got %v, err: %w" , string (payload ), err )
10001004 }
@@ -1007,7 +1011,7 @@ func nulljson(valid bool, v interface{}) ([]byte, error) {
10071011 if ! valid {
10081012 return jsonNullBytes , nil
10091013 }
1010- return jsonProvider .Marshal (v )
1014+ return json .Marshal (v )
10111015}
10121016
10131017// GenericColumnValue represents the generic encoded value and type of the
@@ -1714,7 +1718,7 @@ func decodeValue(v *proto3.Value, t *sppb.Type, ptr interface{}, opts ...DecodeO
17141718 }
17151719 x := v .GetStringValue ()
17161720 var y interface {}
1717- err := jsonProvider . Unmarshal ([]byte (x ), & y )
1721+ err := jsonUnmarshal ([]byte (x ), & y )
17181722 if err != nil {
17191723 return err
17201724 }
@@ -1873,7 +1877,7 @@ func decodeValue(v *proto3.Value, t *sppb.Type, ptr interface{}, opts ...DecodeO
18731877 }
18741878 x := v .GetStringValue ()
18751879 var y interface {}
1876- err := jsonProvider . Unmarshal ([]byte (x ), & y )
1880+ err := jsonUnmarshal ([]byte (x ), & y )
18771881 if err != nil {
18781882 return err
18791883 }
@@ -2566,7 +2570,7 @@ func (dsc decodableSpannerType) decodeValueToCustomType(v *proto3.Value, t *sppb
25662570 }
25672571 x := v .GetStringValue ()
25682572 var y interface {}
2569- err := jsonProvider . Unmarshal ([]byte (x ), & y )
2573+ err := jsonUnmarshal ([]byte (x ), & y )
25702574 if err != nil {
25712575 return err
25722576 }
@@ -2581,7 +2585,7 @@ func (dsc decodableSpannerType) decodeValueToCustomType(v *proto3.Value, t *sppb
25812585 }
25822586 x := v .GetStringValue ()
25832587 var y interface {}
2584- err := jsonProvider . Unmarshal ([]byte (x ), & y )
2588+ err := jsonUnmarshal ([]byte (x ), & y )
25852589 if err != nil {
25862590 return err
25872591 }
@@ -3272,7 +3276,7 @@ func decodeNullJSONArrayToNullJSON(pb *proto3.ListValue) (*NullJSON, error) {
32723276 }
32733277 s := fmt .Sprintf ("[%s]" , strings .Join (strs , "," ))
32743278 var y interface {}
3275- err := jsonProvider . Unmarshal ([]byte (s ), & y )
3279+ err := jsonUnmarshal ([]byte (s ), & y )
32763280 if err != nil {
32773281 return nil , err
32783282 }
@@ -3929,7 +3933,7 @@ func encodeValue(v interface{}) (*proto3.Value, *sppb.Type, error) {
39293933 pt = listType (pgNumericType ())
39303934 case NullJSON :
39313935 if v .Valid {
3932- b , err := jsonProvider .Marshal (v .Value )
3936+ b , err := json .Marshal (v .Value )
39333937 if err != nil {
39343938 return nil , nil , err
39353939 }
@@ -3946,7 +3950,7 @@ func encodeValue(v interface{}) (*proto3.Value, *sppb.Type, error) {
39463950 pt = listType (jsonType ())
39473951 case PGJsonB :
39483952 if v .Valid {
3949- b , err := jsonProvider .Marshal (v .Value )
3953+ b , err := json .Marshal (v .Value )
39503954 if err != nil {
39513955 return nil , nil , err
39523956 }
0 commit comments