🐛 Fix stale FTS tokens after content update in external content mode #17540

Author: TCOTC

kernel/sql/block.go

@@ -19,6 +19,7 @@ package sql
 import (
 	"bytes"
 	"database/sql"
+	"fmt"
 	"strings"
 
 	"github.com/88250/gulu"
@@ -68,11 +69,14 @@ func blockRowIDByBlockID(tx *sql.Tx, id string) (rowID int64, err error) {
 		return
 	}
 	defer rows.Close()
-	if rows.Next() {
-		if err = rows.Scan(&rowID); err != nil {
-			logging.LogErrorf("scan block rowid failed: %s", err)
-			return
-		}
+	if !rows.Next() {
+		logging.LogErrorf("query block rowid failed: id=%s not found", id)
+		err = fmt.Errorf("block rowid not found: %s", id)
+		return
+	}
+	if err = rows.Scan(&rowID); err != nil {
+		logging.LogErrorf("scan block rowid failed: %s", err)
+		return
 	}
 	return
 }
@@ -107,18 +111,20 @@ func queryBlockRowIDsTx(tx *sql.Tx, blocks []*Block) (ret map[string]int64, err
 	return
 }
 
+// 下列局部更新索引列的路径（updateRootContent、updateBlockContent、indexNode）须先写 blocks_fts、再写 blocks，
+// 以便 FTS 删除旧 token 时仍能从 blocks 读到旧值。
+
 func updateRootContent(tx *sql.Tx, content, updated, ialContent, id string) (err error) {
-	stmt := "UPDATE blocks SET content = ?, fcontent = ?, updated = ?, ial = ? WHERE id = ?"
-	if err = execStmtTx(tx, stmt, content, content, updated, ialContent, id); err != nil {
-		return
-	}
-	// external content 模式下按 rowid 定位 FTS 行
 	var rowID int64
 	if rowID, err = blockRowIDByBlockID(tx, id); err != nil {
 		return
 	}
-	stmt = "UPDATE blocks_fts SET content = ?, fcontent = ?, updated = ?, ial = ? WHERE rowid = ?"
-	if err = execStmtTx(tx, stmt, content, content, updated, ialContent, rowID); err != nil {
+	stmt := "UPDATE blocks_fts SET content = ?, fcontent = ?, ial = ? WHERE rowid = ?"
+	if err = execStmtTx(tx, stmt, content, content, ialContent, rowID); err != nil {
+		return
+	}
+	stmt = "UPDATE blocks SET content = ?, fcontent = ?, updated = ?, ial = ? WHERE id = ?"
+	if err = execStmtTx(tx, stmt, content, content, updated, ialContent, id); err != nil {
 		return
 	}
 	removeBlockCache(id)
@@ -127,22 +133,21 @@ func updateRootContent(tx *sql.Tx, content, updated, ialContent, id string) (err
 }
 
 func updateBlockContent(tx *sql.Tx, block *Block) (err error) {
-	stmt := "UPDATE blocks SET content = ? WHERE id = ?"
-	if err = execStmtTx(tx, stmt, block.Content, block.ID); err != nil {
-		tx.Rollback()
-		return
-	}
-	// external content 模式下按 rowid 定位 FTS 行
 	var rowID int64
 	if rowID, err = blockRowIDByBlockID(tx, block.ID); err != nil {
 		tx.Rollback()
 		return
 	}
-	stmt = "UPDATE blocks_fts SET content = ? WHERE rowid = ?"
+	stmt := "UPDATE blocks_fts SET content = ? WHERE rowid = ?"
 	if err = execStmtTx(tx, stmt, block.Content, rowID); err != nil {
 		tx.Rollback()
 		return
 	}
+	stmt = "UPDATE blocks SET content = ? WHERE id = ?"
+	if err = execStmtTx(tx, stmt, block.Content, block.ID); err != nil {
+		tx.Rollback()
+		return
+	}
 
 	putBlockCache(block)
 	return
@@ -166,22 +171,21 @@ func indexNode(tx *sql.Tx, id string) (err error) {
 
 	content := NodeStaticContent(node, nil, true, indexAssetPath, true)
 	content = strings.ReplaceAll(content, editor.Zwsp, "")
-	stmt := "UPDATE blocks SET content = ? WHERE id = ?"
-	if err = execStmtTx(tx, stmt, content, id); err != nil {
-		tx.Rollback()
-		return
-	}
-	// external content 模式下按 rowid 定位 FTS 行
 	var rowID int64
 	if rowID, err = blockRowIDByBlockID(tx, id); err != nil {
 		tx.Rollback()
 		return
 	}
-	stmt = "UPDATE blocks_fts SET content = ? WHERE rowid = ?"
+	stmt := "UPDATE blocks_fts SET content = ? WHERE rowid = ?"
 	if err = execStmtTx(tx, stmt, content, rowID); err != nil {
 		tx.Rollback()
 		return
 	}
+	stmt = "UPDATE blocks SET content = ? WHERE id = ?"
+	if err = execStmtTx(tx, stmt, content, id); err != nil {
+		tx.Rollback()
+		return
+	}
 	return
 }
 

kernel/sql/database.go

@@ -1095,12 +1095,12 @@ func deleteBlocksByIDs(tx *sql.Tx, ids []string) (err error) {
 		return
 	}
 
-	stmt = "DELETE FROM blocks WHERE ROWID IN (" + strings.Join(rowIDs, ",") + ")"
+	stmt = "DELETE FROM blocks_fts WHERE ROWID IN (" + strings.Join(rowIDs, ",") + ")"
 	if err = execStmtTx(tx, stmt); err != nil {
 		return
 	}
 
-	stmt = "DELETE FROM blocks_fts WHERE ROWID IN (" + strings.Join(rowIDs, ",") + ")"
+	stmt = "DELETE FROM blocks WHERE ROWID IN (" + strings.Join(rowIDs, ",") + ")"
 	if err = execStmtTx(tx, stmt); err != nil {
 		return
 	}
@@ -1322,11 +1322,6 @@ func batchUpdatePath(tx *sql.Tx, tree *parse.Tree, context map[string]any) (err
 	if err = execStmtTx(tx, stmt, tree.Box, tree.Path, tree.HPath, tree.ID); err != nil {
 		return
 	}
-	// external content 模式下按 rowid 定位 FTS 行
-	stmt = "UPDATE blocks_fts SET box = ?, path = ?, hpath = ? WHERE rowid IN (SELECT rowid FROM blocks WHERE root_id = ?)"
-	if err = execStmtTx(tx, stmt, tree.Box, tree.Path, tree.HPath, tree.ID); err != nil {
-		return
-	}
 
 	stmt = "UPDATE spans SET box = ?, path = ? WHERE root_id = ?"
 	if err = execStmtTx(tx, stmt, tree.Box, tree.Path, tree.ID); err != nil {
@@ -1365,12 +1360,6 @@ func batchUpdateHPath(tx *sql.Tx, tree *parse.Tree, context map[string]any) (err
 		return
 	}
 
-	// external content 模式下按 rowid 定位 FTS 行
-	stmt = "UPDATE blocks_fts SET hpath = ? WHERE rowid IN (SELECT rowid FROM blocks WHERE root_id = ?)"
-	if err = execStmtTx(tx, stmt, tree.HPath, tree.ID); err != nil {
-		return
-	}
-
 	ClearCache()
 	evtHash := fmt.Sprintf("%x", sha256.Sum256([]byte(tree.ID)))[:7]
 	eventbus.Publish(eventbus.EvtSQLUpdateBlocksHPaths, context, 1, evtHash)