fix: decoder and encoder support fallback

decoder/decoder_amd64.go

@@ -0,0 +1,50 @@
+// +build amd64,go1.15,!go1.21
+
+/*
+* Copyright 2023 ByteDance Inc.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+package decoder
+
+import (
+    `github.com/bytedance/sonic/internal/decoder`
+)
+
+type Decoder = decoder.Decoder
+
+type MismatchTypeError = decoder.MismatchTypeError
+
+type Options = decoder.Options
+
+const (
+    OptionUseInt64         Options = decoder.OptionUseInt64
+    OptionUseNumber        Options = decoder.OptionUseNumber
+    OptionUseUnicodeErrors Options = decoder.OptionUseUnicodeErrors
+    OptionDisableUnknown   Options = decoder.OptionDisableUnknown
+    OptionCopyString       Options = decoder.OptionCopyString
+    OptionValidateString   Options = decoder.OptionValidateString
+)
+
+type StreamDecoder = decoder.StreamDecoder
+
+type SyntaxError = decoder.SyntaxError
+
+var Pretouch = decoder.Pretouch
+
+var Skip = decoder.Skip
+
+var NewDecoder = decoder.NewDecoder
+
+var NewStreamDecoder = decoder.NewStreamDecoder

decoder/decoder_amd64_test.go

@@ -0,0 +1,276 @@
+// +build amd64,go1.15,!go1.21
+
+/*
+ * Copyright 2021 ByteDance Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package decoder
+
+import (
+    `encoding/json`
+    `strings`
+    `testing`
+    `reflect`
+
+    `github.com/bytedance/sonic/internal/rt`
+    `github.com/stretchr/testify/assert`
+)
+
+func TestSkipMismatchTypeAmd64Error(t *testing.T) {
+    t.Run("struct", func(t *testing.T) {
+        println("TestSkipError")
+        type skiptype struct {
+            A int `json:"a"`
+            B string `json:"b"`
+
+            Pass *int `json:"pass"`
+
+            C struct{
+
+                Pass4 interface{} `json:"pass4"`
+
+                D struct{
+                    E float32 `json:"e"`
+                } `json:"d"`
+
+                Pass2 int `json:"pass2"`
+
+            } `json:"c"`
+
+            E bool `json:"e"`
+            F []int `json:"f"`
+            G map[string]int `json:"g"`
+            H bool `json:"h,string"`
+
+            Pass3 int `json:"pass2"`
+
+            I json.Number `json:"i"`
+        }
+        var obj, obj2 = &skiptype{Pass:new(int)}, &skiptype{Pass:new(int)}
+        var data = `{"a":"","b":1,"c":{"d":true,"pass2":1,"pass4":true},"e":{},"f":"","g":[],"pass":null,"h":"1.0","i":true,"pass3":1}`
+        d := NewDecoder(data)
+        err := d.Decode(obj)
+        err2 := json.Unmarshal([]byte(data), obj2)
+        println(err2.Error())
+        assert.Equal(t, err2 == nil, err == nil)
+        // assert.Equal(t, len(data), d.i)
+        assert.Equal(t, obj2, obj)
+        if te, ok := err.(*MismatchTypeError); ok {
+            assert.Equal(t, reflect.TypeOf(obj.I), te.Type)
+            assert.Equal(t, strings.Index(data, `"i":t`)+4, te.Pos)
+            println(err.Error())
+        } else {
+            t.Fatal("invalid error")
+        }
+    })
+    t.Run("short array", func(t *testing.T) {
+        var obj, obj2 = &[]int{}, &[]int{}
+        var data = `[""]`
+        d := NewDecoder(data)
+        err := d.Decode(obj)
+        err2 := json.Unmarshal([]byte(data), obj2)
+        // println(err2.Error())
+        assert.Equal(t, err2 == nil, err == nil)
+        // assert.Equal(t, len(data), d.i)
+        assert.Equal(t, obj2, obj)
+    })
+
+    t.Run("int ", func(t *testing.T) {
+        var obj int = 123
+        var obj2 int = 123
+        var data = `[""]`
+        d := NewDecoder(data)
+        err := d.Decode(&obj)
+        err2 := json.Unmarshal([]byte(data), &obj2)
+        println(err.Error(), obj, obj2)
+        assert.Equal(t, err2 == nil, err == nil)
+        // assert.Equal(t, len(data), d.i)
+        assert.Equal(t, obj2, obj)
+    })
+
+    t.Run("array", func(t *testing.T) {
+        var obj, obj2 = &[]int{}, &[]int{}
+        var data = `["",true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true]`
+        d := NewDecoder(data)
+        err := d.Decode(obj)
+        err2 := json.Unmarshal([]byte(data), obj2)
+        // println(err2.Error())
+        assert.Equal(t, err2 == nil, err == nil)
+        // assert.Equal(t, len(data), d.i)
+        assert.Equal(t, obj2, obj)
+    })
+
+    t.Run("map", func(t *testing.T) {
+        var obj, obj2 = &map[int]int{}, &map[int]int{}
+        var data = `{"true" : { },"1":1,"2" : true,"3":3}`
+        d := NewDecoder(data)
+        err := d.Decode(obj)
+        err2 := json.Unmarshal([]byte(data), obj2)
+        assert.Equal(t, err2 == nil, err == nil)
+        // assert.Equal(t, len(data), d.i)
+        assert.Equal(t, obj2, obj)
+    })
+    t.Run("map error", func(t *testing.T) {
+        var obj, obj2 = &map[int]int{}, &map[int]int{}
+        var data = `{"true" : { ],"1":1,"2" : true,"3":3}`
+        d := NewDecoder(data)
+        err := d.Decode(obj)
+        err2 := json.Unmarshal([]byte(data), obj2)
+        println(err.Error())
+        println(err2.Error())
+        assert.Equal(t, err2 == nil, err == nil)
+        // assert.Equal(t, len(data), d.i)
+        // assert.Equal(t, obj2, obj)
+    })
+}
+
+func TestCopyString(t *testing.T) {
+    var data []byte
+    var dc *Decoder
+    var err error
+    data = []byte(`{"A":"0","B":"1"}`)
+    dc = NewDecoder(rt.Mem2Str(data))
+    dc.UseNumber()
+    dc.CopyString()
+    var obj struct{
+        A string
+        B string
+    }
+    err = dc.Decode(&obj)
+    if err != nil {
+        t.Fatal(err)
+    }
+    data[6] = '1'
+    if obj.A != "0" {
+        t.Fatal(obj)
+    }
+    data[14] = '0'
+    if obj.B != "1" {
+        t.Fatal(obj)
+    }
+
+    data = []byte(`{"A":"0","B":"1"}`)
+    dc = NewDecoder(rt.Mem2Str(data))
+    dc.UseNumber()
+    err = dc.Decode(&obj)
+    if err != nil {
+        t.Fatal(err)
+    }
+    data[6] = '1'
+    if obj.A != "1" {
+        t.Fatal(obj)
+    }
+    data[14] = '0'
+    if obj.B != "0" {
+        t.Fatal(obj)
+    }
+
+    data = []byte(`{"A":"0","B":"1"}`)
+    dc = NewDecoder(rt.Mem2Str(data))
+    dc.UseNumber()
+    dc.CopyString()
+    m := map[string]interface{}{}
+    err = dc.Decode(&m)
+    if err != nil {
+        t.Fatal(err)
+    }
+    data[2] = 'C'
+    data[6] = '1'
+    if m["A"] != "0" {
+        t.Fatal(m)
+    }
+    data[10] = 'D'
+    data[14] = '0'
+    if m["B"] != "1" {
+        t.Fatal(m)
+    }
+
+    data = []byte(`{"A":"0","B":"1"}`)
+    dc = NewDecoder(rt.Mem2Str(data))
+    dc.UseNumber()
+    m = map[string]interface{}{}
+    err = dc.Decode(&m)
+    if err != nil {
+        t.Fatal(err)
+    }
+    data[6] = '1'
+    if m["A"] != "1" {
+        t.Fatal(m)
+    }
+    data[14] = '0'
+    if m["B"] != "0" {
+        t.Fatal(m)
+    }
+
+    data = []byte(`{"A":"0","B":"1"}`)
+    dc = NewDecoder(rt.Mem2Str(data))
+    dc.UseNumber()
+    dc.CopyString()
+    var x interface{}
+    err = dc.Decode(&x)
+    if err != nil {
+        t.Fatal(err)
+    }
+    data[2] = 'C'
+    data[6] = '1'
+    m = x.(map[string]interface{})
+    if m["A"] != "0" {
+        t.Fatal(m)
+    }
+    data[10] = 'D'
+    data[14] = '0'
+    if m["B"] != "1" {
+        t.Fatal(m)
+    }
+
+    data = []byte(`{"A":"0","B":"1"}`)
+    dc = NewDecoder(rt.Mem2Str(data))
+    dc.UseNumber()
+    var y interface{}
+    err = dc.Decode(&y)
+    if err != nil {
+        t.Fatal(err)
+    }
+    m = y.(map[string]interface{})
+    data[6] = '1'
+    if m["A"] != "1" {
+        t.Fatal(m)
+    }
+    data[14] = '0'
+    if m["B"] != "0" {
+        t.Fatal(m)
+    }
+}
+
+func TestDecoder_SetOption(t *testing.T) {
+    var v interface{}
+    d := NewDecoder("123")
+    d.SetOptions(OptionUseInt64)
+    err := d.Decode(&v)
+    assert.NoError(t, err)
+    assert.Equal(t, v, int64(123))
+}
+
+func BenchmarkSkip_Sonic(b *testing.B) {
+    var data = rt.Str2Mem(TwitterJson)
+    if ret, _ := Skip(data); ret < 0 {
+        b.Fatal()
+    }
+    b.SetBytes(int64(len(TwitterJson)))
+    b.ResetTimer()
+    for i:=0; i<b.N; i++ {
+        _, _ = Skip(data)
+    }
+}