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 2024-04-10 22:01:39 +08:00
commit 7fe3f7e2d2
3 changed files with 26 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
kernel/model/cloud_service.go
View file

@ -246,7 +246,7 @@ func refreshSubscriptionExpirationRemind() {
if 0 < remains && expireDay > remains {
util.WaitForUILoaded()
time.Sleep(time.Second * 3)
time.Sleep(time.Second * 7)
util.PushErrMsg(fmt.Sprintf(Conf.Language(127), remains), 0)
return
}

43
kernel/sql/database.go
View file

@ -166,6 +166,10 @@ func initDBTables() {
if nil != err {
logging.LogFatalf(logging.ExitCodeReadOnlyDatabase, "create table [spans] failed: %s", err)
}
_, err = db.Exec("CREATE INDEX idx_spans_root_id ON spans(root_id)")
if nil != err {
logging.LogFatalf(logging.ExitCodeReadOnlyDatabase, "create index [idx_spans_root_id] failed: %s", err)
}
_, err = db.Exec("DROP TABLE IF EXISTS assets")
if nil != err {
@ -175,6 +179,10 @@ func initDBTables() {
if nil != err {
logging.LogFatalf(logging.ExitCodeReadOnlyDatabase, "create table [assets] failed: %s", err)
}
_, err = db.Exec("CREATE INDEX idx_assets_root_id ON assets(root_id)")
if nil != err {
logging.LogFatalf(logging.ExitCodeReadOnlyDatabase, "create index [idx_assets_root_id] failed: %s", err)
}
_, err = db.Exec("DROP TABLE IF EXISTS attributes")
if nil != err {
@ -184,6 +192,10 @@ func initDBTables() {
if nil != err {
logging.LogFatalf(logging.ExitCodeReadOnlyDatabase, "create table [attributes] failed: %s", err)
}
_, err = db.Exec("CREATE INDEX idx_attributes_root_id ON attributes(root_id)")
if nil != err {
logging.LogFatalf(logging.ExitCodeReadOnlyDatabase, "create index [idx_attributes_root_id] failed: %s", err)
}
_, err = db.Exec("DROP TABLE IF EXISTS refs")
if nil != err {
@ -1008,12 +1020,6 @@ func deleteBlocksByBoxTx(tx *sql.Tx, box string) (err error) {
return
}
func deleteSpansByPathTx(tx *sql.Tx, box, path string) (err error) {
stmt := "DELETE FROM spans WHERE box = ? AND path = ?"
err = execStmtTx(tx, stmt, box, path)
return
}
func deleteSpansByRootID(tx *sql.Tx, rootID string) (err error) {
stmt := "DELETE FROM spans WHERE root_id =?"
err = execStmtTx(tx, stmt, rootID)
@ -1026,21 +1032,9 @@ func deleteSpansByBoxTx(tx *sql.Tx, box string) (err error) {
return
}
func deleteAssetsByPathTx(tx *sql.Tx, box, path string) (err error) {
stmt := "DELETE FROM assets WHERE box = ? AND docpath = ?"
err = execStmtTx(tx, stmt, box, path)
return
}
func deleteAttributeByBlockID(tx *sql.Tx, blockID string) (err error) {
stmt := "DELETE FROM attributes WHERE block_id = ?"
err = execStmtTx(tx, stmt, blockID)
return
}
func deleteAttributesByPathTx(tx *sql.Tx, box, path string) (err error) {
stmt := "DELETE FROM attributes WHERE box = ? AND path = ?"
err = execStmtTx(tx, stmt, box, path)
func deleteAssetsByRootID(tx *sql.Tx, rootID string) (err error) {
stmt := "DELETE FROM assets WHERE root_id = ?"
err = execStmtTx(tx, stmt, rootID)
return
}
@ -1050,6 +1044,13 @@ func deleteAssetsByBoxTx(tx *sql.Tx, box string) (err error) {
return
}
func deleteAttributesByRootID(tx *sql.Tx, rootID string) (err error) {
stmt := "DELETE FROM attributes WHERE root_id = ?"
err = execStmtTx(tx, stmt, rootID)
return
}
func deleteAttributesByBoxTx(tx *sql.Tx, box string) (err error) {
stmt := "DELETE FROM attributes WHERE box = ?"
err = execStmtTx(tx, stmt, box)

6
kernel/sql/upsert.go
View file

@ -440,13 +440,13 @@ func upsertTree(tx *sql.Tx, tree *parse.Tree, context map[string]interface{}) (e
return
}
if err = deleteSpansByPathTx(tx, tree.Box, tree.Path); nil != err {
if err = deleteSpansByRootID(tx, tree.ID); nil != err {
return
}
if err = deleteAssetsByPathTx(tx, tree.Box, tree.Path); nil != err {
if err = deleteAssetsByRootID(tx, tree.ID); nil != err {
return
}
if err = deleteAttributesByPathTx(tx, tree.Box, tree.Path); nil != err {
if err = deleteAttributesByRootID(tx, tree.ID); nil != err {
return
}
if err = deleteRefsByPathTx(tx, tree.Box, tree.Path); nil != err {