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

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) { if gulu.File.IsExist(util.BlockTreePath) {
os.RemoveAll(util.BlockTreePath) treenode.InitBlockTree(true)
} }
initDBConnection() initDBConnection()

8
kernel/treenode/blocktree.go
View File

@ -375,7 +375,7 @@ func InitBlockTree(force bool) {
if force { if force {
err := os.RemoveAll(util.BlockTreePath) err := os.RemoveAll(util.BlockTreePath)
if nil != err { if nil != err {
logging.LogErrorf("remove blocktree file failed: %s", err) logging.LogErrorf("remove block tree file failed: %s", err)
} }
blockTrees = &sync.Map{} blockTrees = &sync.Map{}
return return
@ -456,7 +456,11 @@ func SaveBlockTree(force bool) {
defer blockTreeLock.Unlock() defer blockTreeLock.Unlock()
start := time.Now() 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) size := uint64(0)
var count int var count int