调整sonic的使用

farseer-go · Nov 29, 2024 · 152a8ce · 152a8ce
1 parent a7f3f80
commit 152a8ce
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 15 deletions.
diff --git a/dictionary.go b/dictionary.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"sync"
 
-	"github.com/bytedance/sonic"
+	"github.com/farseer-go/fs/snc"
 )
 
 // Dictionary 字典
@@ -79,7 +79,7 @@ func (receiver *Dictionary[TKey, TValue]) Scan(val any) error {
 // UnmarshalJSON to deserialize []byte
 func (receiver *Dictionary[TKey, TValue]) UnmarshalJSON(ba []byte) error {
 	t := map[TKey]TValue{}
-	err := sonic.Unmarshal(ba, &t)
+	err := snc.Unmarshal(ba, &t)
 	*receiver = NewDictionaryFromMap(t)
 	return err
 }

diff --git a/list.go b/list.go
@@ -6,8 +6,8 @@ import (
 	"fmt"
 	"sync"
 
-	"github.com/bytedance/sonic"
 	"github.com/farseer-go/fs/parse"
+	"github.com/farseer-go/fs/snc"
 )
 
 // List 集合
@@ -109,7 +109,7 @@ func (receiver List[T]) MarshalJSON() ([]byte, error) {
 	}
 	receiver.lock.RLock()
 	defer receiver.lock.RUnlock()
-	return sonic.Marshal(receiver.source)
+	return snc.Marshal(receiver.source)
 }
 
 // UnmarshalJSON to deserialize []byte
@@ -119,7 +119,7 @@ func (receiver *List[T]) UnmarshalJSON(b []byte) error {
 	}
 	receiver.lock.RLock()
 	defer receiver.lock.RUnlock()
-	return sonic.Unmarshal(b, receiver.source)
+	return snc.Unmarshal(b, receiver.source)
 }
 
 // GormDataType gorm common data type

diff --git a/readonlyDictionary.go b/readonlyDictionary.go
@@ -4,8 +4,8 @@ import (
 	"database/sql/driver"
 	"sync"
 
-	"github.com/bytedance/sonic"
 	"github.com/farseer-go/fs/parse"
+	"github.com/farseer-go/fs/snc"
 )
 
 // ReadonlyDictionary 只读字典
@@ -143,7 +143,7 @@ func (receiver ReadonlyDictionary[TKey, TValue]) MarshalJSON() ([]byte, error) {
 		return []byte("{}"), nil
 	}
 
-	return sonic.Marshal(receiver.ToMap())
+	return snc.Marshal(receiver.ToMap())
 }
 
 // GormDataType gorm common data type

diff --git a/test/collection_test.go b/test/collection_test.go
@@ -3,8 +3,8 @@ package test
 import (
 	"testing"
 
-	"github.com/bytedance/sonic"
 	"github.com/farseer-go/collections"
+	"github.com/farseer-go/fs/snc"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -78,7 +78,7 @@ func Test_collection_RemoveAll(t *testing.T) {
 func TestCollection_MarshalJSON(t *testing.T) {
 	lst := collections.NewList[int](1, 2, 3, 6)
 	strjson, _ := lst.MarshalJSON()
-	retjson, _ := sonic.Marshal(lst)
+	retjson, _ := snc.Marshal(lst)
 	assert.Equal(t, retjson, strjson)
 }
 

diff --git a/test/dictionary_test.go b/test/dictionary_test.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/bytedance/sonic"
 	"github.com/farseer-go/collections"
+	"github.com/farseer-go/fs/snc"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -212,10 +212,10 @@ func TestDictionary_IsNil(t *testing.T) {
 func TestDictionaryJson(t *testing.T) {
 	var dic collections.Dictionary[int, int]
 	assert.True(t, dic.IsNil())
-	marshal, _ := sonic.Marshal(dic)
+	marshal, _ := snc.Marshal(dic)
 	assert.Equal(t, "{}", string(marshal))
 
-	_ = sonic.Unmarshal([]byte("{}"), &dic)
+	_ = snc.Unmarshal([]byte("{}"), &dic)
 	assert.False(t, dic.IsNil())
 }
 

diff --git a/test/list_test.go b/test/list_test.go
@@ -4,8 +4,8 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/bytedance/sonic"
 	"github.com/farseer-go/collections"
+	"github.com/farseer-go/fs/snc"
 	"github.com/farseer-go/fs/types"
 	"github.com/stretchr/testify/assert"
 )
@@ -101,10 +101,10 @@ func TestNil(t *testing.T) {
 
 func TestListJson(t *testing.T) {
 	var lst collections.List[int]
-	marshal, _ := sonic.Marshal(lst)
+	marshal, _ := snc.Marshal(lst)
 	assert.Equal(t, "[]", string(marshal))
 
-	_ = sonic.Unmarshal([]byte("[]"), &lst)
+	_ = snc.Unmarshal([]byte("[]"), &lst)
 	assert.False(t, lst.IsNil())
 }