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

enhance: batch refresh! when apply remote ops (#10545)

Browse Source
This commit is contained in:
Tienson Qin
2023-11-24 18:16:59 +08:00
committed by GitHub
parent e8acfdefea
commit 769b541790
4 changed files with 59 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/frontend/db/model.cljs
View File

@@ -1108,7 +1108,7 @@ independent of format as format specific heading characters are stripped"
(drawer/remove-logbook))))
patterns))]
(->> (react/q repo [:frontend.db.react/page-unlinked-refs page-id]
{:query-fn (fn [db _tx-report _result]
{:query-fn (fn [db _result]
(let [ids
(->> (d/datoms db :aevt :block/content)
(filter filter-fn)

77
src/main/frontend/db/react.cljs
View File

@@ -11,7 +11,8 @@
[frontend.state :as state]
[frontend.util :as util :refer [react]]
[cljs.spec.alpha :as s]
[clojure.core.async :as async]))
[clojure.core.async :as async]
[clojure.set :as set]))
;;; keywords specs for reactive query, used by `react/q` calls
;; ::block
@@ -141,7 +142,7 @@
(let [{:keys [result time]} (util/with-time
(-> (cond
query-fn
(query-fn db nil nil)
(query-fn db nil)
inputs-fn
(let [inputs (inputs-fn)]
@@ -262,7 +263,7 @@
set)))
(defn- execute-query!
[graph db k tx {:keys [query _query-time inputs transform-fn query-fn inputs-fn result]}
[graph db k {:keys [query _query-time inputs transform-fn query-fn inputs-fn result]}
{:keys [_skip-query-time-check?]}]
;; FIXME:
(when true
@@ -271,7 +272,7 @@
(let [new-result (->
(cond
query-fn
(let [result (query-fn db tx result)]
(let [result (query-fn db result)]
(if (coll? result)
(doall result)
result))
@@ -299,35 +300,51 @@
(contains? #{:collapse-expand-blocks :delete-blocks} outliner-op)
(:undo? tx-meta) (:redo? tx-meta)))))
(defn- refresh-affected-queries!
[repo-url affected-keys]
(let [db (conn/get-db repo-url)]
(doseq [[k cache] @query-state]
(let [custom? (= :custom (second k))
kv? (= :kv (second k))]
(when (and
(= (first k) repo-url)
(or (get affected-keys (vec (rest k)))
custom?
kv?))
(let [{:keys [query query-fn]} cache
{:keys [custom-query?]} (state/edit-in-query-or-refs-component)]
(util/profile
(str "refresh! " (rest k))
(when (or query query-fn)
(try
(let [f #(execute-query! repo-url db k cache {:skip-query-time-check? custom-query?})]
;; Detects whether user is editing in a custom query, if so, execute the query immediately
(if (and custom? (not custom-query?))
(async/put! (state/get-reactive-custom-queries-chan) [f query])
(f)))
(catch :default e
(js/console.error e)))))))))))
(defn refresh!
"Re-compute corresponding queries (from tx) and refresh the related react components."
[repo-url {:keys [tx-data tx-meta] :as tx}]
(when (and repo-url
(not (:skip-refresh? tx-meta)))
(when (seq tx-data)
(let [db (conn/get-db repo-url)
affected-keys (get-affected-queries-keys tx)]
(doseq [[k cache] @query-state]
(let [custom? (= :custom (second k))
kv? (= :kv (second k))]
(when (and
(= (first k) repo-url)
(or (get affected-keys (vec (rest k)))
custom?
kv?))
(let [{:keys [query query-fn]} cache
{:keys [custom-query?]} (state/edit-in-query-or-refs-component)]
(util/profile
(str "refresh! " (rest k))
(when (or query query-fn)
(try
(let [f #(execute-query! repo-url db k tx cache {:skip-query-time-check? custom-query?})]
;; Detects whether user is editing in a custom query, if so, execute the query immediately
(if (and custom? (not custom-query?))
(async/put! (state/get-reactive-custom-queries-chan) [f query])
(f)))
(catch :default e
(js/console.error e)))))))))))))
(when repo-url
(if (get-in @state/state [:rtc/remote-batch-tx-state repo-url :in-transaction?])
(state/update-state! [:rtc/remote-batch-tx-state repo-url :txs]
(fn [txs]
(conj txs tx)))
(when (and (not (:skip-refresh? tx-meta)) (seq tx-data))
(let [affected-keys (get-affected-queries-keys tx)]
(refresh-affected-queries! repo-url affected-keys))))))
(defn batch-refresh!
[repo-url txs]
(when (and repo-url (seq txs))
(let [affected-keys (apply set/union (map get-affected-queries-keys txs))]
(refresh-affected-queries! repo-url affected-keys)))
(state/set-state! [:rtc/remote-batch-tx-state repo-url]
{:in-transaction? false
:txs []}))
(defn set-key-value
[repo-url key value]

9
src/main/frontend/db/rtc/core.cljs
View File

@@ -8,6 +8,7 @@
[clojure.set :as set]
[cognitect.transit :as transit]
[frontend.db :as db]
[frontend.db.react :as react]
[frontend.db.rtc.const :as rtc-const]
[frontend.db.rtc.op-mem-layer :as op-mem-layer]
[frontend.db.rtc.ws :as ws]
@@ -338,7 +339,6 @@
affected-blocks-map))
affected-blocks-map local-unpushed-ops))
(defn <apply-remote-data
[repo data-from-ws]
(assert (rtc-const/data-from-ws-validator data-from-ws) data-from-ws)
@@ -375,11 +375,18 @@
update-ops (vals update-ops-map)
update-page-ops (vals update-page-ops-map)
remove-page-ops (vals remove-page-ops-map)]
(state/set-state! [:rtc/remote-batch-tx-state repo]
{:in-transaction? true
:txs []})
(util/profile :apply-remote-update-page-ops (apply-remote-update-page-ops repo update-page-ops))
(util/profile :apply-remote-remove-ops (apply-remote-remove-ops repo remove-ops))
(util/profile :apply-remote-move-ops (apply-remote-move-ops repo sorted-move-ops))
(util/profile :apply-remote-update-ops (apply-remote-update-ops repo update-ops))
(util/profile :apply-remote-remove-page-ops (apply-remote-remove-page-ops repo remove-page-ops))
(let [txs (get-in @state/state [:rtc/remote-batch-tx-state repo :txs])]
(util/profile
:batch-refresh
(react/batch-refresh! repo txs)))
(op-mem-layer/update-local-tx! repo remote-t))
:else (throw (ex-info "unreachable" {:remote-t remote-t
:remote-t-before remote-t-before

3
src/main/frontend/state.cljs
View File

@@ -289,6 +289,9 @@
:file-sync/graph-state {:current-graph-uuid nil}
;; graph-uuid -> ...
;; graph-url -> {:in-transaction? Boolean :txs []}
:rtc/remote-batch-tx-state {}
:user/info {:UserGroups (storage/get :user-groups)}
:encryption/graph-parsing? false