diff --git a/deps/db-sync/src/logseq/db_sync/protocol.cljs b/deps/db-sync/src/logseq/db_sync/protocol.cljs index 314765303c..7657eafa21 100644 --- a/deps/db-sync/src/logseq/db_sync/protocol.cljs +++ b/deps/db-sync/src/logseq/db_sync/protocol.cljs @@ -17,13 +17,3 @@ (defn tx->transit [tx-data] (common/write-transit tx-data)) - -(defn datoms->wire [datoms] - (->> datoms - (map (fn [d] - {:e (:e d) - :a (:a d) - :v (:v d) - :tx (:tx d) - :added (:added d)})) - (vec))) diff --git a/deps/db/src/logseq/db/sqlite/gc.cljs b/deps/db/src/logseq/db/sqlite/gc.cljs index 08295ca919..20d6227eb9 100644 --- a/deps/db/src/logseq/db/sqlite/gc.cljs +++ b/deps/db/src/logseq/db/sqlite/gc.cljs @@ -57,27 +57,27 @@ (println :debug :db-gc "There's no garbage data that's need to be collected."))))) (defn- get-unused-addresses-node-version - [db] - (let [schema (let [stmt (.prepare db "select content from kvs where addr = ?") - content (.-content (.get stmt 0))] + [^object db] + (let [schema (let [^object stmt (.prepare db "select content from kvs where addr = ?") + content (.-content (.get ^object stmt 0))] (sqlite-util/transit-read content)) internal-addrs (set [0 1 (:eavt schema) (:avet schema) (:aevt schema)]) - non-refed-addrs (let [stmt (.prepare db get-non-refed-addrs-sql)] - (->> (.all ^object stmt) + non-refed-addrs (let [^object stmt (.prepare db get-non-refed-addrs-sql)] + (->> (.all stmt) bean/->clj (map :addr) (set)))] (set/difference non-refed-addrs internal-addrs))) (defn- get-unused-addresses-node-walk-version - [db] - (let [schema (let [stmt (.prepare db "select content from kvs where addr = ?") - content (.-content (.get stmt 0))] + [^object db] + (let [schema (let [^object stmt (.prepare db "select content from kvs where addr = ?") + content (.-content (.get ^object stmt 0))] (sqlite-util/transit-read content)) set-addresses #{(:eavt schema) (:avet schema) (:aevt schema)} internal-addresses (conj set-addresses 0 1) - parent->children (let [stmt (.prepare db "select addr, addresses from kvs")] - (->> (.all ^object stmt) + parent->children (let [^object stmt (.prepare db "select addr, addresses from kvs")] + (->> (.all stmt) bean/->clj (map (fn [{:keys [addr addresses]}] [addr (bean/->clj (js/JSON.parse addresses))])) @@ -95,18 +95,18 @@ (let [unused-addresses (if walk? (get-unused-addresses-node-walk-version db) (get-unused-addresses-node-version db)) - addrs-count (let [stmt (.prepare db "select count(*) as c from kvs")] + addrs-count (let [^object stmt (.prepare db "select count(*) as c from kvs")] (.-c (.get stmt)))] (println :debug "addrs total count: " addrs-count) (if (seq unused-addresses) (do (println :debug :db-gc :unused-addresses-count (count unused-addresses)) - (let [stmt (.prepare db "Delete from kvs where addr = ?") + (let [^object stmt (.prepare db "Delete from kvs where addr = ?") delete (.transaction db (fn [addrs] (doseq [addr addrs] - (.run stmt addr))))] + (.run ^object stmt addr))))] (delete (bean/->js unused-addresses)) (when-not walk? (gc-kvs-table-node-version! db false)))) diff --git a/src/main/frontend/handler/plugin_config.cljs b/src/main/frontend/handler/plugin_config.cljs index 848af41081..cd650f0222 100644 --- a/src/main/frontend/handler/plugin_config.cljs +++ b/src/main/frontend/handler/plugin_config.cljs @@ -86,8 +86,7 @@ returns map of plugins to install and uninstall" (do (notification/show! "Invalid plugins.edn provided. See javascript console for specific errors" :error) - (log/error :plugin-edn-errors errors) - (println "Invalid plugins.edn, errors: " errors)) + (log/error :plugin-edn-errors errors)) (let [plugins-to-change (determine-plugins-to-change (:plugin/installed-plugins @state/state) edn-plugins)] diff --git a/src/main/frontend/undo_redo.cljs b/src/main/frontend/undo_redo.cljs index 0a487b1aa8..0f102be100 100644 --- a/src/main/frontend/undo_redo.cljs +++ b/src/main/frontend/undo_redo.cljs @@ -330,7 +330,6 @@ (assert-reversed-tx-safe! conn reversed-tx-data) reversed-tx-data) (catch :default e - (prn :debug :undo-redo :error (:error (ex-data e))) (when-not (contains? #{:block-moved-or-target-deleted :block-children-exists :block-parent-missing} @@ -397,7 +396,6 @@ (undo-redo-aux repo undo?)))))))) (when ((if undo? empty-undo-stack? empty-redo-stack?) repo) - (prn (str "No further " (if undo? "undo" "redo") " information")) (if undo? ::empty-undo-stack ::empty-redo-stack)))) (defn undo diff --git a/src/main/frontend/worker/db_listener.cljs b/src/main/frontend/worker/db_listener.cljs index 0b17706b50..3d434a0d87 100644 --- a/src/main/frontend/worker/db_listener.cljs +++ b/src/main/frontend/worker/db_listener.cljs @@ -81,7 +81,6 @@ (or (nil? handler-keys) (contains? (set handler-keys) :sync-db-to-main-thread))] (d/unlisten! conn ::listen-db-changes!) - (prn :listen-db-changes! (keys handlers) :repo repo) (let [*batch-all-txs (volatile! []) get-batch-txs #(->> @*batch-all-txs (sort-by :tx) diff --git a/src/main/frontend/worker/pipeline.cljs b/src/main/frontend/worker/pipeline.cljs index dba0e5177e..d5d264df52 100644 --- a/src/main/frontend/worker/pipeline.cljs +++ b/src/main/frontend/worker/pipeline.cljs @@ -424,8 +424,6 @@ :else nil)))) tx-data)] - (when (seq tx-data') - (prn :debug ::revert-built-in-block-updates :tx-data (distinct tx-data'))) (distinct tx-data')))) (defn- compute-extra-tx-data diff --git a/src/main/frontend/worker/sync.cljs b/src/main/frontend/worker/sync.cljs index af1028b275..43bfce9ede 100644 --- a/src/main/frontend/worker/sync.cljs +++ b/src/main/frontend/worker/sync.cljs @@ -1260,7 +1260,6 @@ [repo graph-id source-conn aes-key update-progress] (p/let [temp (