From 26f019853e388c6cfd2ce29012f43f6cc3f8ad08 Mon Sep 17 00:00:00 2001 From: rcmerci Date: Tue, 7 May 2024 21:34:13 +0800 Subject: [PATCH] fix: FIXME in carve config --- .carve/config.edn | 4 +- .../frontend/worker/rtc/op_mem_layer.cljs | 55 ++++++++++--------- 2 files changed, 30 insertions(+), 29 deletions(-) diff --git a/.carve/config.edn b/.carve/config.edn index 383c08a08..612c6b788 100644 --- a/.carve/config.edn +++ b/.carve/config.edn @@ -5,7 +5,5 @@ frontend.db ;; Used for debugging frontend.db.debug - frontend.worker.debug - ;; FIXME: Are these unused fns? - frontend.worker.rtc.op-mem-layer] + frontend.worker.debug] :report {:format :ignore}} diff --git a/src/main/frontend/worker/rtc/op_mem_layer.cljs b/src/main/frontend/worker/rtc/op_mem_layer.cljs index 5e633a236..3ad158490 100644 --- a/src/main/frontend/worker/rtc/op_mem_layer.cljs +++ b/src/main/frontend/worker/rtc/op_mem_layer.cljs @@ -416,15 +416,16 @@ vals (mapcat vals))) -(defn get-min-epoch-asset-ops - [repo] - (let [repo-ops-store (get @*ops-store repo) - {:keys [epoch->asset-uuid-sorted-map asset-uuid->ops]} (:current-branch repo-ops-store)] - (assert (contains? repo-ops-store :current-branch) repo) - (when-let [[_epoch asset-uuid] (first epoch->asset-uuid-sorted-map)] - (assert (contains? asset-uuid->ops asset-uuid)) - {:asset-uuid asset-uuid - :ops (asset-uuid->ops asset-uuid)}))) +(comment + (defn get-min-epoch-asset-ops + [repo] + (let [repo-ops-store (get @*ops-store repo) + {:keys [epoch->asset-uuid-sorted-map asset-uuid->ops]} (:current-branch repo-ops-store)] + (assert (contains? repo-ops-store :current-branch) repo) + (when-let [[_epoch asset-uuid] (first epoch->asset-uuid-sorted-map)] + (assert (contains? asset-uuid->ops asset-uuid)) + {:asset-uuid asset-uuid + :ops (asset-uuid->ops asset-uuid)})))) (comment (defn get-asset-ops @@ -450,13 +451,14 @@ count) 0)) -(defn get-unpushed-asset-update-count - [repo] - (some-> (get @*ops-store repo) - :current-branch - :asset-uuid->ops - keys - count)) +(comment + (defn get-unpushed-asset-update-count + [repo] + (some-> (get @*ops-store repo) + :current-branch + :asset-uuid->ops + keys + count))) (defn intersection-block-uuids [repo block-uuid-coll] @@ -479,16 +481,17 @@ :block-uuid->ops (dissoc block-uuid->ops block-uuid) :epoch->block-uuid-sorted-map (dissoc epoch->block-uuid-sorted-map min-epoch))))) -(defn remove-asset-ops! - [repo asset-uuid] - {:pre [(uuid? asset-uuid)]} - (let [repo-ops-store (get @*ops-store repo) - {:keys [epoch->asset-uuid-sorted-map asset-uuid->ops]} (:current-branch repo-ops-store)] - (assert (contains? repo-ops-store :current-branch) repo) - (let [min-epoch (asset-uuid->min-epoch asset-uuid->ops asset-uuid)] - (swap! *ops-store update-in [repo :current-branch] assoc - :asset-uuid->ops (dissoc asset-uuid->ops asset-uuid) - :epoch->asset-uuid-sorted-map (dissoc epoch->asset-uuid-sorted-map min-epoch))))) +(comment + (defn remove-asset-ops! + [repo asset-uuid] + {:pre [(uuid? asset-uuid)]} + (let [repo-ops-store (get @*ops-store repo) + {:keys [epoch->asset-uuid-sorted-map asset-uuid->ops]} (:current-branch repo-ops-store)] + (assert (contains? repo-ops-store :current-branch) repo) + (let [min-epoch (asset-uuid->min-epoch asset-uuid->ops asset-uuid)] + (swap! *ops-store update-in [repo :current-branch] assoc + :asset-uuid->ops (dissoc asset-uuid->ops asset-uuid) + :epoch->asset-uuid-sorted-map (dissoc epoch->asset-uuid-sorted-map min-epoch)))))) (defn