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

🎨 Improve init block tree

Browse source
This commit is contained in:
Daniel 2023-06-18 22:23:21 +08:00
parent 9b6fe676ab
commit f7c31b89bb
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
1 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
kernel/treenode/blocktree.go
View file

@ -389,23 +389,31 @@ func InitBlockTree(force bool) {
return
}
size := uint64(0)
size := int64(0)
waitGroup := &sync.WaitGroup{}
p, _ := ants.NewPoolWithFunc(4, func(arg interface{}) {
defer waitGroup.Done()
entry := arg.(os.DirEntry)
p := filepath.Join(util.BlockTreePath, entry.Name())
data, err := os.ReadFile(p)
f, err := os.OpenFile(p, os.O_RDONLY, 0644)
if nil != err {
logging.LogErrorf("read block tree failed: %s", err)
logging.LogErrorf("open block tree failed: %s", err)
os.Exit(logging.ExitCodeFileSysErr)
return
}
info, err := f.Stat()
if nil != err {
logging.LogErrorf("stat block tree failed: %s", err)
os.Exit(logging.ExitCodeFileSysErr)
return
}
size += info.Size()
sliceData := map[string]*BlockTree{}
if err = msgpack.Unmarshal(data, &sliceData); nil != err {
if err = msgpack.NewDecoder(f).Decode(&sliceData); nil != err {
logging.LogErrorf("unmarshal block tree failed: %s", err)
if err = os.RemoveAll(util.BlockTreePath); nil != err {
logging.LogErrorf("removed corrupted block tree failed: %s", err)
@ -414,9 +422,14 @@ func InitBlockTree(force bool) {
return
}
if err = f.Close(); nil != err {
logging.LogErrorf("close block tree failed: %s", err)
os.Exit(logging.ExitCodeFileSysErr)
return
}
name := entry.Name()[0:strings.Index(entry.Name(), ".")]
blockTrees.Store(name, &btSlice{data: sliceData, changed: time.Time{}, m: &sync.Mutex{}})
size += uint64(len(data))
})
for _, entry := range entries {
if !strings.HasSuffix(entry.Name(), ".msgpack") {
@ -432,7 +445,7 @@ func InitBlockTree(force bool) {
debug.FreeOSMemory()
elapsed := time.Since(start).Seconds()
logging.LogInfof("read block tree [%s] to [%s], elapsed [%.2fs]", humanize.Bytes((size)), util.BlockTreePath, elapsed)
logging.LogInfof("read block tree [%s] to [%s], elapsed [%.2fs]", humanize.Bytes(uint64(size)), util.BlockTreePath, elapsed)
return
}