diff --git a/backend/src/app/db.clj b/backend/src/app/db.clj index 128c3f44e6..625fe872fc 100644 --- a/backend/src/app/db.clj +++ b/backend/src/app/db.clj @@ -411,13 +411,20 @@ :hint "database object not found")) row)) +(def ^:private default-plan-opts + (-> default-opts + (assoc :fetch-size 1) + (assoc :concurrency :read-only) + (assoc :cursors :close) + (assoc :result-type :forward-only))) + (defn plan ([ds sql] (-> (get-connectable ds) - (jdbc/plan sql default-opts))) + (jdbc/plan sql default-plan-opts))) ([ds sql opts] (-> (get-connectable ds) - (jdbc/plan sql (merge default-opts opts))))) + (jdbc/plan sql (merge default-plan-opts opts))))) (defn cursor "Return a lazy seq of rows using server side cursors" diff --git a/backend/src/app/tasks/file_gc.clj b/backend/src/app/tasks/file_gc.clj index 7bbdfa07e1..30f6c2f5ae 100644 --- a/backend/src/app/tasks/file_gc.clj +++ b/backend/src/app/tasks/file_gc.clj @@ -56,12 +56,6 @@ (map :data) (mapcat bfc/collect-used-media))) -(def ^:private plan-opts - {:fetch-size 1 - :concurrency :read-only - :cursors :close - :result-type :forward-only}) - (defn- clean-file-media! "Performs the garbage collection of file media objects." [{:keys [::db/conn] :as cfg} {:keys [id] :as file}] @@ -69,7 +63,7 @@ (map (partial decode-file cfg)) xf:collect-used-media) - used (->> (db/plan conn [sql:get-snapshots id] plan-opts) + used (->> (db/plan conn [sql:get-snapshots id]) (transduce xform conj #{})) used (into used xf:collect-used-media [file]) @@ -175,7 +169,7 @@ (mapcat (partial get-used-components deleted-components file-id)) used-remote - (->> (db/plan conn [sql:get-files-for-library file-id] plan-opts) + (->> (db/plan conn [sql:get-files-for-library file-id]) (transduce (comp (map (partial decode-file cfg)) xform) conj #{})) used-local