clone/logseq
1
0
Fork 0
mirror of https://github.com/logseq/logseq.git synced 2026-06-01 19:01:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: reversed datoms should be normalized too for rebase

Browse Source
This commit is contained in:
Tienson Qin
2026-04-10 14:49:54 +08:00
parent bf04d4cf5d
commit 32806264ce
3 changed files with 33 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/frontend/worker/sync/apply_txs.cljs
View File

@@ -98,12 +98,13 @@
(declare replay-canonical-outliner-op!
invalid-rebase-op!)
(defn reverse-tx-data [_db-before db-after tx-data]
(defn reverse-tx-data [db-before db-after tx-data]
(->> tx-data
reverse
(keep (fn [[e a v t added]]
(when (and (some? a) (some? v) (some? t) (boolean? added))
[(if added :db/retract :db/add) e a v t])))
(let [reversed-datom (d/datom e a v t (not added))]
;; trick: reverse the order of `db-before` and `db-after`
(db-normalize/normalize-datom db-before db-after reversed-datom))))
(db-normalize/replace-attr-retract-with-retract-entity-v2 db-after)))
(defn normalize-rebased-pending-tx
@@ -1075,6 +1076,7 @@
[repo {:keys [tx-data db-after db-before] :as tx-report}]
(let [normalized (normalize-tx-data db-after db-before tx-data)
reversed-datoms (reverse-tx-data db-before db-after tx-data)]
;; (prn :debug :reversed-datoms reversed-datoms)
;; (prn :debug :enqueue-local-tx :tx-data)
;; (cljs.pprint/pprint tx-data)
;; (prn :debug :enqueue-local-tx :normalized)