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 2022-11-17 10:40:31 +08:00
commit 20411c4dc1
2 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
kernel/model/box.go
View file

@ -68,9 +68,9 @@ func autoStat() {
defer statLock.Unlock()
Conf.Stat.TreeCount = treenode.CountTrees()
Conf.Stat.CTreeCount = treenode.CeilCount(Conf.Stat.TreeCount)
Conf.Stat.CTreeCount = treenode.CeilTreeCount(Conf.Stat.TreeCount)
Conf.Stat.BlockCount = treenode.CountBlocks()
Conf.Stat.CBlockCount = treenode.CeilCount(Conf.Stat.BlockCount)
Conf.Stat.CBlockCount = treenode.CeilBlockCount(Conf.Stat.BlockCount)
Conf.Stat.DataSize, Conf.Stat.AssetsSize = util.DataSize()
Conf.Stat.CDataSize = util.CeilSize(Conf.Stat.DataSize)
Conf.Stat.CAssetsSize = util.CeilSize(Conf.Stat.AssetsSize)

15
kernel/treenode/blocktree.go
View file

@ -71,7 +71,7 @@ func CountBlocks() (ret int) {
return len(blockTrees)
}
func CeilCount(count int) int {
func CeilTreeCount(count int) int {
if 100 > count {
return 100
}
@ -84,6 +84,19 @@ func CeilCount(count int) int {
return 500*40 + 1
}
func CeilBlockCount(count int) int {
if 5000 > count {
return 5000
}
for i := 1; i < 100; i++ {
if count < i*10000 {
return i * 10000
}
}
return 10000*100 + 1
}
func GetBlockTreeRootByPath(boxID, path string) *BlockTree {
blockTreesLock.Lock()
defer blockTreesLock.Unlock()