0ct0pu5/siyuan
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/dev' into dev

Browse source
This commit is contained in:
Vanessa 2023-07-18 01:39:13 +08:00
commit fe9a128d22
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
kernel/sql/database.go
View file

@ -99,7 +99,7 @@ func InitDatabase(forceRebuild bool) (err error) {
}
}
if gulu.File.IsExist(util.BlockTreePath) {
os.RemoveAll(util.BlockTreePath)
treenode.InitBlockTree(true)
}
initDBConnection()

8
kernel/treenode/blocktree.go
View file

@ -375,7 +375,7 @@ func InitBlockTree(force bool) {
if force {
err := os.RemoveAll(util.BlockTreePath)
if nil != err {
logging.LogErrorf("remove blocktree file failed: %s", err)
logging.LogErrorf("remove block tree file failed: %s", err)
}
blockTrees = &sync.Map{}
return
@ -456,7 +456,11 @@ func SaveBlockTree(force bool) {
defer blockTreeLock.Unlock()
start := time.Now()
os.MkdirAll(util.BlockTreePath, 0755)
if err := os.MkdirAll(util.BlockTreePath, 0755); nil != err {
logging.LogErrorf("create block tree dir [%s] failed: %s", util.BlockTreePath, err)
os.Exit(logging.ExitCodeFileSysErr)
return
}
size := uint64(0)
var count int