Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-03-13 16:06:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

🎨 Improve reindex

Browse source 
Signed-off-by: Daniel <845765@qq.com>
This commit is contained in:
Daniel 2026-03-09 11:25:05 +08:00
parent ecfb9329f9
commit f7f05ffad1
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
3 changed files with 51 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

39
kernel/treenode/blocktree.go
View file

@ -62,12 +62,7 @@ func initDatabase(forceRebuild bool) (err error) {
}
closeDatabase()
if gulu.File.IsExist(util.BlockTreeDBPath) {
if err = removeDatabaseFile(); err != nil {
logging.LogErrorf("remove database file [%s] failed: %s", util.BlockTreeDBPath, err)
err = nil
}
}
util.RemoveDatabaseFile(util.BlockTreeDBPath)
initDBConnection()
initDBTables()
@ -141,22 +136,6 @@ func closeDatabase() {
return
}
func removeDatabaseFile() (err error) {
err = os.RemoveAll(util.BlockTreeDBPath)
if err != nil {
return
}
err = os.RemoveAll(util.BlockTreeDBPath + "-shm")
if err != nil {
return
}
err = os.RemoveAll(util.BlockTreeDBPath + "-wal")
if err != nil {
return
}
return
}
func GetBlockTreesByType(typ string) (ret []*BlockTree) {
sqlStmt := "SELECT * FROM blocktrees WHERE type = ?"
rows, err := db.Query(sqlStmt, typ)
@ -643,7 +622,13 @@ func execInsertBlocktrees(tx *sql.Tx, tree *parse.Tree, changedNodes []*ast.Node
stmt, err := tx.Prepare(sqlStmt)
if err != nil {
tx.Rollback()
logging.LogErrorf("prepare statement [%s] failed: %s", sqlStmt, err)
logging.LogErrorf("exec database stmt [%s] failed: %s\n %s", sqlStmt, err, logging.ShortStack())
if strings.Contains(err.Error(), "database disk image is malformed") {
closeDatabase()
util.RemoveDatabaseFile(util.BlockTreeDBPath)
logging.LogFatalf(logging.ExitCodeUnavailableDatabase, "database disk image [%s] is malformed, please restart SiYuan kernel to rebuild it\n\t%s", util.BlockTreeDBPath, err)
}
return
}
defer stmt.Close()
@ -655,7 +640,13 @@ func execInsertBlocktrees(tx *sql.Tx, tree *parse.Tree, changedNodes []*ast.Node
}
if _, err = tx.Exec(sqlStmt, n.ID, tree.ID, parentID, tree.Box, tree.Path, tree.HPath, n.IALAttr("updated"), TypeAbbr(n.Type.String())); err != nil {
tx.Rollback()
logging.LogErrorf("sql exec [%s] failed: %s", sqlStmt, err)
logging.LogErrorf("exec database stmt [%s] failed: %s\n %s", stmt, err, logging.ShortStack())
if strings.Contains(err.Error(), "database disk image is malformed") {
closeDatabase()
util.RemoveDatabaseFile(util.BlockTreeDBPath)
logging.LogFatalf(logging.ExitCodeUnavailableDatabase, "database disk image [%s] is malformed, please restart SiYuan kernel to rebuild it\n\t%s", util.BlockTreeDBPath, err)
}
return
}
}