clone/logseq
1
0
Fork 0
mirror of https://github.com/logseq/logseq.git synced 2026-04-24 14:14:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: attrs missing when rebase

Browse Source
This commit is contained in:
Tienson Qin
2026-01-30 00:13:04 +08:00
parent 5fe4ec4dde
commit fb57514530
2 changed files with 7 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/main/frontend/worker/sync.cljs
View File

@@ -434,19 +434,6 @@
(= :block/uuid (first x))) (= :block/uuid (first x)))
(second x))) (second x)))
;; TODO: is this really needed?
(defn- keep-last-update
[tx-data]
tx-data
;; (->> tx-data
;; (common-util/distinct-by-last-wins
;; (fn [item]
;; (if (and (vector? item) (= 5 (count item))
;; (contains? #{:block/updated-at :block/title :block/name :block/order} (nth item 2)))
;; (take 3 item)
;; item))))
)
(defn- sanitize-tx-data (defn- sanitize-tx-data
[db tx-data local-deleted-ids] [db tx-data local-deleted-ids]
(let [sanitized-tx-data (->> tx-data (let [sanitized-tx-data (->> tx-data
@@ -457,7 +444,11 @@
(contains? #{:block/created-at :block/updated-at :block/title} (contains? #{:block/created-at :block/updated-at :block/title}
(nth item 2))) (nth item 2)))
(contains? local-deleted-ids (get-lookup-id (last item)))))) (contains? local-deleted-ids (get-lookup-id (last item))))))
keep-last-update)] ;; Notice: rebase should generate larger tx-id than reverse tx
(map (fn [item]
(if (= (count item) 5)
(vec (butlast item))
item))))]
;; (when (not= tx-data sanitized-tx-data) ;; (when (not= tx-data sanitized-tx-data)
;; (prn :debug :tx-data tx-data) ;; (prn :debug :tx-data tx-data)
;; (prn :debug :sanitized-tx-data sanitized-tx-data)) ;; (prn :debug :sanitized-tx-data sanitized-tx-data))
@@ -479,7 +470,6 @@
txs (mapcat :tx batch) txs (mapcat :tx batch)
tx-data (->> txs tx-data (->> txs
(db-normalize/remove-retract-entity-ref @conn) (db-normalize/remove-retract-entity-ref @conn)
keep-last-update
distinct)] distinct)]
;; (prn :debug :before-keep-last-update txs) ;; (prn :debug :before-keep-last-update txs)
;; (prn :debug :upload :tx-data tx-data) ;; (prn :debug :upload :tx-data tx-data)
@@ -724,13 +714,11 @@
(->> (->>
tx-data' tx-data'
(concat (map (fn [id] [:db/retractEntity id]) retract-block-ids)) (concat (map (fn [id] [:db/retractEntity id]) retract-block-ids)))))
keep-last-update)))
(defn- apply-remote-tx-with-local-changes! (defn- apply-remote-tx-with-local-changes!
[{:keys [conn local-txs reversed-tx-data safe-remote-tx-data remote-deleted-blocks [{:keys [conn local-txs reversed-tx-data safe-remote-tx-data remote-deleted-blocks
temp-tx-meta *remote-tx-report *reversed-tx-report *remote-deleted-ids *rebase-tx-data]}] temp-tx-meta *remote-tx-report *reversed-tx-report *remote-deleted-ids *rebase-tx-data]}]
(prn :debug :apply-remote-tx-with-local-changes!)
(let [batch-tx-meta {:rtc-tx? true}] (let [batch-tx-meta {:rtc-tx? true}]
(ldb/transact-with-temp-conn! (ldb/transact-with-temp-conn!
conn conn
@@ -769,7 +757,6 @@
(defn- apply-remote-tx-without-local-changes! (defn- apply-remote-tx-without-local-changes!
[{:keys [conn safe-remote-tx-data remote-deleted-block-ids temp-tx-meta]}] [{:keys [conn safe-remote-tx-data remote-deleted-block-ids temp-tx-meta]}]
(prn :debug :apply-remote-tx-without-local-changes!)
(let [db @conn] (let [db @conn]
(ldb/transact-with-temp-conn! (ldb/transact-with-temp-conn!
conn conn
@@ -787,8 +774,7 @@
[repo client tx-data*] [repo client tx-data*]
(if-let [conn (worker-state/get-datascript-conn repo)] (if-let [conn (worker-state/get-datascript-conn repo)]
(let [tx-data (->> tx-data* (let [tx-data (->> tx-data*
(db-normalize/remove-retract-entity-ref @conn) (db-normalize/remove-retract-entity-ref @conn))
keep-last-update)
local-txs (pending-txs repo) local-txs (pending-txs repo)
reversed-tx-data (get-reverse-tx-data local-txs) reversed-tx-data (get-reverse-tx-data local-txs)
has-local-changes? (seq reversed-tx-data) has-local-changes? (seq reversed-tx-data)
@@ -834,7 +820,6 @@
(normalize-tx-data (:db-after tx-report) (normalize-tx-data (:db-after tx-report)
(or (:db-after remote-tx-report) (or (:db-after remote-tx-report)
(:db-after @*reversed-tx-report))) (:db-after @*reversed-tx-report)))
keep-last-update
(remove (fn [[op _e a]] (remove (fn [[op _e a]]
(and (= op :db/retract) (and (= op :db/retract)
(contains? #{:block/updated-at :block/created-at :block/title} a))))) (contains? #{:block/updated-at :block/created-at :block/title} a)))))

1
src/test/frontend/worker/db_sync_sim_test.cljs
View File

@@ -224,7 +224,6 @@
(let [txs (mapcat :tx pending)] (let [txs (mapcat :tx pending)]
(->> txs (->> txs
(db-normalize/remove-retract-entity-ref @conn) (db-normalize/remove-retract-entity-ref @conn)
(#'db-sync/keep-last-update)
distinct distinct
vec))) vec)))