github/siyuan
4
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-05-20 02:50:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

⚡ Improve block loading performance on Windows/Linux/macOS amd64 arch https://github.com/siyuan-note/siyuan/issues/9084

Browse Source
This commit is contained in:
Daniel 2023-09-06 17:19:38 +08:00
parent 0987f5bbdb
commit 4eca8c43e6
No known key found for this signature in database
GPG Key ID: 86211BA83DF03017
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kernel/filesys/json_unmarshal.go
View File

@ -14,7 +14,7 @@
// You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see <https://www.gnu.org/licenses/>.
//go:build !(windows && amd64)
//go:build !amd64
package filesys

21
kernel/filesys/json_unmarshal_windows_amd64.go → kernel/filesys/json_unmarshal_amd64.go
View File

@ -18,13 +18,22 @@ package filesys
import (
"github.com/bytedance/sonic"
"github.com/goccy/go-json"
"github.com/siyuan-note/logging"
)
func unmarshalJSON(data []byte, v interface{}) error {
func unmarshalJSON(data []byte, v interface{}) (err error) {
//now := time.Now()
//defer func() {
// elapsed := time.Since(now)
// logging.LogInfof("[sonic] unmarshalJSON took %s", elapsed)
//}()
return sonic.Unmarshal(data, v)
defer func() {
if e := recover(); nil != e {
logging.LogWarnf("[sonic] unmarshalJSON failed: %s", e)
err = json.Unmarshal(data, v)
} /*else {
elapsed := time.Since(now)
logging.LogInfof("[sonic] unmarshalJSON took %s", elapsed)
}*/
}()
err = sonic.Unmarshal(data, v)
return
}