3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-05-18 21:26:11 +02:00
Code Issues Projects Releases Packages Wiki Activity

✨ Improve the db api efficiency

Browse source 
Mainly setup proper defaults and reduce unnecesary allocations
on every db api call.
This commit is contained in:
Andrey Antukh 2024-01-02 21:41:49 +01:00
parent 93bf8c1478
commit 746d898245
28 changed files with 228 additions and 186 deletions
Download patch file Download diff file Expand all files Collapse all files

2
backend/deps.edn
View file

@ -26,7 +26,7 @@
:git/url "https://github.com/funcool/yetti.git" :git/url "https://github.com/funcool/yetti.git"
:exclusions [org.slf4j/slf4j-api]} :exclusions [org.slf4j/slf4j-api]}
com.github.seancorfield/next.jdbc {:mvn/version "1.3.894"} com.github.seancorfield/next.jdbc {:mvn/version "1.3.909"}
metosin/reitit-core {:mvn/version "0.6.0"} metosin/reitit-core {:mvn/version "0.6.0"}
nrepl/nrepl {:mvn/version "1.1.0"} nrepl/nrepl {:mvn/version "1.1.0"}
cider/cider-nrepl {:mvn/version "0.43.1"} cider/cider-nrepl {:mvn/version "0.43.1"}

144
backend/src/app/db.clj
View file

@ -19,6 +19,7 @@
[app.util.json :as json] [app.util.json :as json]
[app.util.time :as dt] [app.util.time :as dt]
[clojure.java.io :as io] [clojure.java.io :as io]
[clojure.set :as set]
[clojure.spec.alpha :as s] [clojure.spec.alpha :as s]
[integrant.core :as ig] [integrant.core :as ig]
[next.jdbc :as jdbc] [next.jdbc :as jdbc]
@ -239,6 +240,10 @@
(ex/raise :type :internal (ex/raise :type :internal
:code :unable-resolve-pool)))) :code :unable-resolve-pool))))
(defn get-update-count
[result]
(:next.jdbc/update-count result))
(defn get-connection (defn get-connection
[cfg-or-conn] [cfg-or-conn]
(if (connection? cfg-or-conn) (if (connection? cfg-or-conn)
@ -265,48 +270,120 @@
:code :unable-resolve-connectable :code :unable-resolve-connectable
:hint "expected conn, pool or system"))) :hint "expected conn, pool or system")))
(def ^:private params-mapping
{::return-keys? :return-keys
::return-keys :return-keys})
(defn rename-opts
[opts]
(set/rename-keys opts params-mapping))
(def ^:private default-insert-opts
{:builder-fn sql/as-kebab-maps
:return-keys true})
(def ^:private default-opts (def ^:private default-opts
{:builder-fn sql/as-kebab-maps}) {:builder-fn sql/as-kebab-maps})
(defn exec! (defn exec!
([ds sv] ([ds sv] (exec! ds sv nil))
(-> (get-connectable ds)
(jdbc/execute! sv default-opts)))
([ds sv opts] ([ds sv opts]
(-> (get-connectable ds) (let [conn (get-connectable ds)
(jdbc/execute! sv (into default-opts (sql/adapt-opts opts)))))) opts (if (empty? opts)
default-opts
(into default-opts (rename-opts opts)))]
(jdbc/execute! conn sv opts))))
(defn exec-one! (defn exec-one!
([ds sv] ([ds sv] (exec-one! ds sv nil))
(-> (get-connectable ds)
(jdbc/execute-one! sv default-opts)))
([ds sv opts] ([ds sv opts]
(-> (get-connectable ds) (let [conn (get-connectable ds)
(jdbc/execute-one! sv (into default-opts (sql/adapt-opts opts)))))) opts (if (empty? opts)
default-opts
(into default-opts (rename-opts opts)))]
(jdbc/execute-one! conn sv opts))))
(defn insert! (defn insert!
[ds table params & {:as opts :keys [::return-keys?] :or {return-keys? true}}] "A helper that builds an insert sql statement and executes it. By
(-> (get-connectable ds) default returns the inserted row with all the field; you can delimit
(exec-one! (sql/insert table params opts) the returned columns with the `::columns` option."
(assoc opts ::return-keys? return-keys?)))) [ds table params & {:as opts}]
(let [conn (get-connectable ds)
sql (sql/insert table params opts)
opts (if (empty? opts)
default-insert-opts
(into default-insert-opts (rename-opts opts)))]
(jdbc/execute-one! conn sql opts)))
(defn insert-multi! (defn insert-many!
[ds table cols rows & {:as opts :keys [::return-keys?] :or {return-keys? true}}] "An optimized version of `insert!` that perform insertion of multiple
(-> (get-connectable ds) values at once.
(exec! (sql/insert-multi table cols rows opts)
(assoc opts ::return-keys? return-keys?)))) This expands to a single SQL statement with placeholders for every
value being inserted. For large data sets, this may exceed the limit
of sql string size and/or number of parameters."
[ds table cols rows & {:as opts}]
(let [conn (get-connectable ds)
sql (sql/insert-many table cols rows opts)
opts (if (empty? opts)
default-insert-opts
(into default-insert-opts (rename-opts opts)))
opts (update opts :return-keys boolean)]
(jdbc/execute! conn sql opts)))
(defn update! (defn update!
[ds table params where & {:as opts :keys [::return-keys?] :or {return-keys? true}}] "A helper that build an UPDATE SQL statement and executes it.
(-> (get-connectable ds)
(exec-one! (sql/update table params where opts) Given a connectable object, a table name, a hash map of columns and
(assoc opts ::return-keys? return-keys?)))) values to set, and either a hash map of columns and values to search
on or a vector of a SQL where clause and parameters, perform an
update on the table.
By default returns an object with the number of affected rows; a
complete row can be returned if you pass `::return-keys` with `true`
or with a vector of columns.
Also it can be combined with the `::many` option if you perform an
update to multiple rows and you want all the affected rows to be
returned."
[ds table params where & {:as opts}]
(let [conn (get-connectable ds)
sql (sql/update table params where opts)
opts (if (empty? opts)
default-opts
(into default-opts (rename-opts opts)))
opts (update opts :return-keys boolean)]
(if (::many opts)
(jdbc/execute! conn sql opts)
(jdbc/execute-one! conn sql opts))))
(defn delete! (defn delete!
[ds table params & {:as opts :keys [::return-keys?] :or {return-keys? true}}] "A helper that builds an DELETE SQL statement and executes it.
(-> (get-connectable ds)
(exec-one! (sql/delete table params opts) Given a connectable object, a table name, and either a hash map of columns
(assoc opts ::return-keys? return-keys?)))) and values to search on or a vector of a SQL where clause and parameters,
perform a delete on the table.
By default returns an object with the number of affected rows; a
complete row can be returned if you pass `::return-keys` with `true`
or with a vector of columns.
Also it can be combined with the `::many` option if you perform an
update to multiple rows and you want all the affected rows to be
returned."
[ds table params & {:as opts}]
(let [conn (get-connectable ds)
sql (sql/delete table params opts)
opts (if (empty? opts)
default-opts
(into default-opts (rename-opts opts)))]
(if (::many opts)
(jdbc/execute! conn sql opts)
(jdbc/execute-one! conn sql opts))))
(defn query
[ds table params & {:as opts}]
(exec! ds (sql/select table params opts) opts))
(defn is-row-deleted? (defn is-row-deleted?
[{:keys [deleted-at]}] [{:keys [deleted-at]}]
@ -320,7 +397,7 @@
[ds table params & {:as opts}] [ds table params & {:as opts}]
(let [rows (exec! ds (sql/select table params opts)) (let [rows (exec! ds (sql/select table params opts))
rows (cond->> rows rows (cond->> rows
(::remove-deleted? opts true) (::remove-deleted opts true)
(remove is-row-deleted?))] (remove is-row-deleted?))]
(first rows))) (first rows)))
@ -329,7 +406,7 @@
filters. Raises :not-found exception if no object is found." filters. Raises :not-found exception if no object is found."
[ds table params & {:as opts}] [ds table params & {:as opts}]
(let [row (get* ds table params opts)] (let [row (get* ds table params opts)]
(when (and (not row) (::check-deleted? opts true)) (when (and (not row) (::check-deleted opts true))
(ex/raise :type :not-found (ex/raise :type :not-found
:code :object-not-found :code :object-not-found
:table table :table table
@ -364,10 +441,6 @@
[ds table id & {:as opts}] [ds table id & {:as opts}]
(get ds table {:id id} opts)) (get ds table {:id id} opts))
(defn query
[ds table params & {:as opts}]
(exec! ds (sql/select table params opts)))
(defn pgobject? (defn pgobject?
([v] ([v]
(instance? PGobject v)) (instance? PGobject v))
@ -567,11 +640,6 @@
(.setType "jsonb") (.setType "jsonb")
(.setValue (json/encode-str data))))) (.setValue (json/encode-str data)))))
(defn get-update-count
[result]
(:next.jdbc/update-count result))
;; --- Locks ;; --- Locks
(def ^:private siphash-state (def ^:private siphash-state

33
backend/src/app/db/sql.clj
View file

@ -8,7 +8,6 @@
(:refer-clojure :exclude [update]) (:refer-clojure :exclude [update])
(:require (:require
[app.db :as-alias db] [app.db :as-alias db]
[clojure.set :as set]
[clojure.string :as str] [clojure.string :as str]
[next.jdbc.optional :as jdbc-opt] [next.jdbc.optional :as jdbc-opt]
[next.jdbc.sql.builder :as sql])) [next.jdbc.sql.builder :as sql]))
@ -20,14 +19,6 @@
{:table-fn snake-case {:table-fn snake-case
:column-fn snake-case}) :column-fn snake-case})
(def params-mapping
{::db/return-keys? :return-keys
::db/columns :columns})
(defn adapt-opts
[opts]
(set/rename-keys opts params-mapping))
(defn as-kebab-maps (defn as-kebab-maps
[rs opts] [rs opts]
(jdbc-opt/as-unqualified-modified-maps rs (assoc opts :label-fn kebab-case))) (jdbc-opt/as-unqualified-modified-maps rs (assoc opts :label-fn kebab-case)))
@ -42,7 +33,7 @@
(assoc :suffix "ON CONFLICT DO NOTHING"))] (assoc :suffix "ON CONFLICT DO NOTHING"))]
(sql/for-insert table key-map opts)))) (sql/for-insert table key-map opts))))
(defn insert-multi (defn insert-many
[table cols rows opts] [table cols rows opts]
(let [opts (merge default-opts opts)] (let [opts (merge default-opts opts)]
(sql/for-insert-multi table cols rows opts))) (sql/for-insert-multi table cols rows opts)))
@ -53,11 +44,9 @@
([table where-params opts] ([table where-params opts]
(let [opts (merge default-opts opts) (let [opts (merge default-opts opts)
opts (cond-> opts opts (cond-> opts
(::db/columns opts) (assoc :columns (::db/columns opts)) (::columns opts) (assoc :columns (::columns opts))
(::db/for-update? opts) (assoc :suffix "FOR UPDATE") (::for-update opts) (assoc :suffix "FOR UPDATE")
(::db/for-share? opts) (assoc :suffix "FOR KEY SHARE") (::for-share opts) (assoc :suffix "FOR KEY SHARE"))]
(:for-update opts) (assoc :suffix "FOR UPDATE")
(:for-key-share opts) (assoc :suffix "FOR KEY SHARE"))]
(sql/for-query table where-params opts)))) (sql/for-query table where-params opts))))
(defn update (defn update
@ -65,11 +54,9 @@
(update table key-map where-params nil)) (update table key-map where-params nil))
([table key-map where-params opts] ([table key-map where-params opts]
(let [opts (into default-opts opts) (let [opts (into default-opts opts)
opts (if-let [columns (::db/columns opts)] keys (::db/return-keys opts)
(let [columns (if (seq columns) opts (if (vector? keys)
(sql/as-cols columns opts) (assoc opts :suffix (str "RETURNING " (sql/as-cols keys opts)))
"*")]
(assoc opts :suffix (str "RETURNING " columns)))
opts)] opts)]
(sql/for-update table key-map where-params opts)))) (sql/for-update table key-map where-params opts))))
@ -77,5 +64,9 @@
([table where-params] ([table where-params]
(delete table where-params nil)) (delete table where-params nil))
([table where-params opts] ([table where-params opts]
(let [opts (merge default-opts opts)] (let [opts (merge default-opts opts)
keys (::db/return-keys opts)
opts (if (vector? keys)
(assoc opts :suffix (str "RETURNING " (sql/as-cols keys opts)))
opts)]
(sql/for-delete table where-params opts)))) (sql/for-delete table where-params opts))))

7
backend/src/app/features/components_v2.clj
View file

@ -816,8 +816,7 @@
{:data (blob/encode (:data file)) {:data (blob/encode (:data file))
:features (db/create-array conn "text" (:features file)) :features (db/create-array conn "text" (:features file))
:revn (:revn file)} :revn (:revn file)}
{:id (:id file)} {:id (:id file)})
{::db/return-keys? false})
(dissoc file :data))) (dissoc file :data)))
@ -900,7 +899,9 @@
(conj "styles/v2"))] (conj "styles/v2"))]
(db/update! conn :team (db/update! conn :team
{:features (db/create-array conn "text" features)} {:features (db/create-array conn "text" features)}
{:id team-id}))))))) {:id team-id})
nil))))))
(finally (finally
(some-> *semaphore* ps/release!) (some-> *semaphore* ps/release!)
(let [elapsed (tpoint)] (let [elapsed (tpoint)]

5
backend/src/app/features/fdata.clj
View file

@ -11,6 +11,7 @@
[app.common.exceptions :as ex] [app.common.exceptions :as ex]
[app.common.logging :as l] [app.common.logging :as l]
[app.db :as db] [app.db :as db]
[app.db.sql :as-alias sql]
[app.util.blob :as blob] [app.util.blob :as blob]
[app.util.objects-map :as omap] [app.util.objects-map :as omap]
[app.util.pointer-map :as pmap])) [app.util.pointer-map :as pmap]))
@ -38,8 +39,8 @@
[system file-id id] [system file-id id]
(let [{:keys [content]} (db/get system :file-data-fragment (let [{:keys [content]} (db/get system :file-data-fragment
{:id id :file-id file-id} {:id id :file-id file-id}
{::db/columns [:content] {::sql/columns [:content]
::db/check-deleted? false})] ::db/check-deleted false})]
(when-not content (when-not content
(ex/raise :type :internal (ex/raise :type :internal
:code :fragment-not-found :code :fragment-not-found

6
backend/src/app/loggers/webhooks.clj
View file

@ -111,9 +111,11 @@
" where id=?") " where id=?")
err err
(:id whook)] (:id whook)]
res (db/exec-one! pool sql {::db/return-keys? true})] res (db/exec-one! pool sql {::db/return-keys true})]
(when (>= (:error-count res) max-errors) (when (>= (:error-count res) max-errors)
(db/update! pool :webhook {:is-active false} {:id (:id whook)}))) (db/update! pool :webhook
{:is-active false}
{:id (:id whook)})))
(db/update! pool :webhook (db/update! pool :webhook
{:updated-at (dt/now) {:updated-at (dt/now)

2
backend/src/app/rpc/commands/audit.clj
View file

@ -48,7 +48,7 @@
(map event->row)) (map event->row))
events (sequence xform events)] events (sequence xform events)]
(when (seq events) (when (seq events)
(db/insert-multi! pool :audit-log event-columns events)))) (db/insert-many! pool :audit-log event-columns events))))
(def schema:event (def schema:event
[:map {:title "Event"} [:map {:title "Event"}

6
backend/src/app/rpc/commands/auth.clj
View file

@ -133,7 +133,8 @@
(update-password [conn profile-id] (update-password [conn profile-id]
(let [pwd (profile/derive-password cfg password)] (let [pwd (profile/derive-password cfg password)]
(db/update! conn :profile {:password pwd} {:id profile-id})))] (db/update! conn :profile {:password pwd} {:id profile-id})
nil))]
(db/with-atomic [conn pool] (db/with-atomic [conn pool]
(->> (validate-token token) (->> (validate-token token)
@ -303,7 +304,8 @@
(-> (db/update! conn :profile (-> (db/update! conn :profile
{:default-team-id (:id team) {:default-team-id (:id team)
:default-project-id (:default-project-id team)} :default-project-id (:default-project-id team)}
{:id id}) {:id id}
{::db/return-keys true})
(profile/decode-row)))) (profile/decode-row))))

2
backend/src/app/rpc/commands/binfile.clj
View file

@ -317,7 +317,7 @@
[cfg file-id] [cfg file-id]
(db/run! cfg (fn [{:keys [::db/conn] :as cfg}] (db/run! cfg (fn [{:keys [::db/conn] :as cfg}]
(binding [pmap/*load-fn* (partial feat.fdata/load-pointer cfg file-id)] (binding [pmap/*load-fn* (partial feat.fdata/load-pointer cfg file-id)]
(some-> (db/get* conn :file {:id file-id} {::db/remove-deleted? false}) (some-> (db/get* conn :file {:id file-id} {::db/remove-deleted false})
(files/decode-row) (files/decode-row)
(update :data feat.fdata/process-pointers deref)))))) (update :data feat.fdata/process-pointers deref))))))

27
backend/src/app/rpc/commands/comments.clj
View file

@ -12,6 +12,7 @@
[app.common.spec :as us] [app.common.spec :as us]
[app.common.uuid :as uuid] [app.common.uuid :as uuid]
[app.db :as db] [app.db :as db]
[app.db.sql :as sql]
[app.features.fdata :as feat.fdata] [app.features.fdata :as feat.fdata]
[app.loggers.audit :as-alias audit] [app.loggers.audit :as-alias audit]
[app.loggers.webhooks :as-alias webhooks] [app.loggers.webhooks :as-alias webhooks]
@ -62,8 +63,8 @@
(decode-row))) (decode-row)))
(defn- get-comment (defn- get-comment
[conn comment-id & {:keys [for-update?]}] [conn comment-id & {:as opts}]
(db/get-by-id conn :comment comment-id {:for-update for-update?})) (db/get-by-id conn :comment comment-id opts))
(defn- get-next-seqn (defn- get-next-seqn
[conn file-id] [conn file-id]
@ -375,7 +376,7 @@
{::doc/added "1.15"} {::doc/added "1.15"}
[{:keys [::db/pool] :as cfg} {:keys [::rpc/profile-id id share-id] :as params}] [{:keys [::db/pool] :as cfg} {:keys [::rpc/profile-id id share-id] :as params}]
(db/with-atomic [conn pool] (db/with-atomic [conn pool]
(let [{:keys [file-id] :as thread} (get-comment-thread conn id ::db/for-update? true)] (let [{:keys [file-id] :as thread} (get-comment-thread conn id ::sql/for-update true)]
(files/check-comment-permissions! conn profile-id file-id share-id) (files/check-comment-permissions! conn profile-id file-id share-id)
(upsert-comment-thread-status! conn profile-id id)))) (upsert-comment-thread-status! conn profile-id id))))
@ -392,7 +393,7 @@
{::doc/added "1.15"} {::doc/added "1.15"}
[{:keys [::db/pool] :as cfg} {:keys [::rpc/profile-id id is-resolved share-id] :as params}] [{:keys [::db/pool] :as cfg} {:keys [::rpc/profile-id id is-resolved share-id] :as params}]
(db/with-atomic [conn pool] (db/with-atomic [conn pool]
(let [{:keys [file-id] :as thread} (get-comment-thread conn id ::db/for-update? true)] (let [{:keys [file-id] :as thread} (get-comment-thread conn id ::sql/for-update true)]
(files/check-comment-permissions! conn profile-id file-id share-id) (files/check-comment-permissions! conn profile-id file-id share-id)
(db/update! conn :comment-thread (db/update! conn :comment-thread
{:is-resolved is-resolved} {:is-resolved is-resolved}
@ -415,7 +416,7 @@
[cfg {:keys [::rpc/profile-id ::rpc/request-at thread-id share-id content]}] [cfg {:keys [::rpc/profile-id ::rpc/request-at thread-id share-id content]}]
(db/tx-run! cfg (db/tx-run! cfg
(fn [{:keys [::db/conn] :as cfg}] (fn [{:keys [::db/conn] :as cfg}]
(let [{:keys [file-id page-id] :as thread} (get-comment-thread conn thread-id ::db/for-update? true) (let [{:keys [file-id page-id] :as thread} (get-comment-thread conn thread-id ::sql/for-update true)
{:keys [team-id project-id page-name] :as file} (get-file cfg file-id page-id)] {:keys [team-id project-id page-name] :as file} (get-file cfg file-id page-id)]
(files/check-comment-permissions! conn profile-id (:id file) share-id) (files/check-comment-permissions! conn profile-id (:id file) share-id)
@ -471,8 +472,8 @@
(db/tx-run! cfg (db/tx-run! cfg
(fn [{:keys [::db/conn] :as cfg}] (fn [{:keys [::db/conn] :as cfg}]
(let [{:keys [thread-id owner-id] :as comment} (get-comment conn id ::db/for-update? true) (let [{:keys [thread-id owner-id] :as comment} (get-comment conn id ::sql/for-update true)
{:keys [file-id page-id] :as thread} (get-comment-thread conn thread-id ::db/for-update? true)] {:keys [file-id page-id] :as thread} (get-comment-thread conn thread-id ::sql/for-update true)]
(files/check-comment-permissions! conn profile-id file-id share-id) (files/check-comment-permissions! conn profile-id file-id share-id)
@ -504,7 +505,7 @@
{::doc/added "1.15"} {::doc/added "1.15"}
[{:keys [::db/pool] :as cfg} {:keys [::rpc/profile-id id share-id]}] [{:keys [::db/pool] :as cfg} {:keys [::rpc/profile-id id share-id]}]
(db/with-atomic [conn pool] (db/with-atomic [conn pool]
(let [{:keys [owner-id file-id] :as thread} (get-comment-thread conn id ::db/for-update? true)] (let [{:keys [owner-id file-id] :as thread} (get-comment-thread conn id ::sql/for-update true)]
(files/check-comment-permissions! conn profile-id file-id share-id) (files/check-comment-permissions! conn profile-id file-id share-id)
(when-not (= owner-id profile-id) (when-not (= owner-id profile-id)
(ex/raise :type :validation (ex/raise :type :validation
@ -524,14 +525,14 @@
{::doc/added "1.15"} {::doc/added "1.15"}
[{:keys [::db/pool] :as cfg} {:keys [::rpc/profile-id id share-id] :as params}] [{:keys [::db/pool] :as cfg} {:keys [::rpc/profile-id id share-id] :as params}]
(db/with-atomic [conn pool] (db/with-atomic [conn pool]
(let [{:keys [owner-id thread-id] :as comment} (get-comment conn id ::db/for-update? true) (let [{:keys [owner-id thread-id] :as comment} (get-comment conn id ::sql/for-update true)
{:keys [file-id] :as thread} (get-comment-thread conn thread-id)] {:keys [file-id] :as thread} (get-comment-thread conn thread-id)]
(files/check-comment-permissions! conn profile-id file-id share-id) (files/check-comment-permissions! conn profile-id file-id share-id)
(when-not (= owner-id profile-id) (when-not (= owner-id profile-id)
(ex/raise :type :validation (ex/raise :type :validation
:code :not-allowed)) :code :not-allowed))
(db/delete! conn :comment {:id id})))) (db/delete! conn :comment {:id id})
nil)))
;; --- COMMAND: Update comment thread position ;; --- COMMAND: Update comment thread position
@ -544,7 +545,7 @@
{::doc/added "1.15"} {::doc/added "1.15"}
[{:keys [::db/pool] :as cfg} {:keys [::rpc/profile-id ::rpc/request-at id position frame-id share-id]}] [{:keys [::db/pool] :as cfg} {:keys [::rpc/profile-id ::rpc/request-at id position frame-id share-id]}]
(db/with-atomic [conn pool] (db/with-atomic [conn pool]
(let [{:keys [file-id] :as thread} (get-comment-thread conn id ::db/for-update? true)] (let [{:keys [file-id] :as thread} (get-comment-thread conn id ::sql/for-update true)]
(files/check-comment-permissions! conn profile-id file-id share-id) (files/check-comment-permissions! conn profile-id file-id share-id)
(db/update! conn :comment-thread (db/update! conn :comment-thread
{:modified-at request-at {:modified-at request-at
@ -564,7 +565,7 @@
{::doc/added "1.15"} {::doc/added "1.15"}
[{:keys [::db/pool] :as cfg} {:keys [::rpc/profile-id ::rpc/request-at id frame-id share-id]}] [{:keys [::db/pool] :as cfg} {:keys [::rpc/profile-id ::rpc/request-at id frame-id share-id]}]
(db/with-atomic [conn pool] (db/with-atomic [conn pool]
(let [{:keys [file-id] :as thread} (get-comment-thread conn id ::db/for-update? true)] (let [{:keys [file-id] :as thread} (get-comment-thread conn id ::sql/for-update true)]
(files/check-comment-permissions! conn profile-id file-id share-id) (files/check-comment-permissions! conn profile-id file-id share-id)
(db/update! conn :comment-thread (db/update! conn :comment-thread
{:modified-at request-at {:modified-at request-at

29
backend/src/app/rpc/commands/files.clj
View file

@ -20,6 +20,7 @@
[app.common.types.file :as ctf] [app.common.types.file :as ctf]
[app.config :as cf] [app.config :as cf]
[app.db :as db] [app.db :as db]
[app.db.sql :as-alias sql]
[app.features.fdata :as feat.fdata] [app.features.fdata :as feat.fdata]
[app.loggers.audit :as-alias audit] [app.loggers.audit :as-alias audit]
[app.loggers.webhooks :as-alias webhooks] [app.loggers.webhooks :as-alias webhooks]
@ -238,8 +239,7 @@
(db/update! conn :file (db/update! conn :file
{:data (blob/encode (:data file)) {:data (blob/encode (:data file))
:features (db/create-array conn "text" (:features file))} :features (db/create-array conn "text" (:features file))}
{:id id} {:id id})
{::db/return-keys? false})
(when (contains? (:features file) "fdata/pointer-map") (when (contains? (:features file) "fdata/pointer-map")
(feat.fdata/persist-pointers! cfg id))) (feat.fdata/persist-pointers! cfg id)))
@ -262,9 +262,9 @@
(when (some? project-id) (when (some? project-id)
{:project-id project-id})) {:project-id project-id}))
file (-> (db/get conn :file params file (-> (db/get conn :file params
{::db/check-deleted? (not include-deleted?) {::db/check-deleted (not include-deleted?)
::db/remove-deleted? (not include-deleted?) ::db/remove-deleted (not include-deleted?)
::db/for-update? lock-for-update?}) ::sql/for-update lock-for-update?})
(decode-row))] (decode-row))]
(if migrate? (if migrate?
(migrate-file cfg file) (migrate-file cfg file)
@ -733,7 +733,8 @@
(db/update! conn :file (db/update! conn :file
{:name name {:name name
:modified-at (dt/now)} :modified-at (dt/now)}
{:id id})) {:id id}
{::db/return-keys true}))
(sv/defmethod ::rename-file (sv/defmethod ::rename-file
{::doc/added "1.17" {::doc/added "1.17"
@ -860,9 +861,7 @@
(let [file (assoc file :is-shared true)] (let [file (assoc file :is-shared true)]
(db/update! conn :file (db/update! conn :file
{:is-shared true} {:is-shared true}
{:id id} {:id id})
::db/return-keys? false)
file) file)
:else :else
@ -899,7 +898,7 @@
(db/update! conn :file (db/update! conn :file
{:deleted-at (dt/now)} {:deleted-at (dt/now)}
{:id file-id} {:id file-id}
{::db/columns [:id :name :is-shared :project-id :created-at :modified-at]})) {::db/return-keys [:id :name :is-shared :project-id :created-at :modified-at]}))
(def ^:private (def ^:private
schema:delete-file schema:delete-file
@ -998,8 +997,8 @@
[{:keys [::db/pool] :as cfg} {:keys [::rpc/profile-id file-id] :as params}] [{:keys [::db/pool] :as cfg} {:keys [::rpc/profile-id file-id] :as params}]
(db/with-atomic [conn pool] (db/with-atomic [conn pool]
(check-edition-permissions! conn profile-id file-id) (check-edition-permissions! conn profile-id file-id)
(unlink-file-from-library conn params))) (unlink-file-from-library conn params)
nil))
;; --- MUTATION COMMAND: update-sync ;; --- MUTATION COMMAND: update-sync
@ -1008,7 +1007,8 @@
(db/update! conn :file-library-rel (db/update! conn :file-library-rel
{:synced-at (dt/now)} {:synced-at (dt/now)}
{:file-id file-id {:file-id file-id
:library-file-id library-id})) :library-file-id library-id}
{::db/return-keys true}))
(def ^:private schema:update-file-library-sync-status (def ^:private schema:update-file-library-sync-status
[:map {:title "update-file-library-sync-status"} [:map {:title "update-file-library-sync-status"}
@ -1031,7 +1031,8 @@
[conn {:keys [file-id date] :as params}] [conn {:keys [file-id date] :as params}]
(db/update! conn :file (db/update! conn :file
{:ignore-sync-until date} {:ignore-sync-until date}
{:id file-id})) {:id file-id}
{::db/return-keys true}))
(s/def ::ignore-file-library-sync-status (s/def ::ignore-file-library-sync-status
(s/keys :req [::rpc/profile-id] (s/keys :req [::rpc/profile-id]

14
backend/src/app/rpc/commands/files_thumbnails.clj
View file

@ -17,6 +17,7 @@
[app.common.types.shape-tree :as ctt] [app.common.types.shape-tree :as ctt]
[app.config :as cf] [app.config :as cf]
[app.db :as db] [app.db :as db]
[app.db.sql :as-alias sql]
[app.features.fdata :as feat.fdata] [app.features.fdata :as feat.fdata]
[app.loggers.audit :as-alias audit] [app.loggers.audit :as-alias audit]
[app.loggers.webhooks :as-alias webhooks] [app.loggers.webhooks :as-alias webhooks]
@ -236,8 +237,8 @@
{:file-id file-id {:file-id file-id
:object-id object-id :object-id object-id
:tag tag} :tag tag}
{::db/remove-deleted? false {::db/remove-deleted false
::db/for-update? true}) ::sql/for-update true})
path (:path media) path (:path media)
mtype (:mtype media) mtype (:mtype media)
@ -312,14 +313,13 @@
(when-let [{:keys [media-id tag]} (db/get* conn :file-tagged-object-thumbnail (when-let [{:keys [media-id tag]} (db/get* conn :file-tagged-object-thumbnail
{:file-id file-id {:file-id file-id
:object-id object-id} :object-id object-id}
{::db/for-update? true})] {::sql/for-update true})]
(sto/touch-object! storage media-id) (sto/touch-object! storage media-id)
(db/update! conn :file-tagged-object-thumbnail (db/update! conn :file-tagged-object-thumbnail
{:deleted-at (dt/now)} {:deleted-at (dt/now)}
{:file-id file-id {:file-id file-id
:object-id object-id :object-id object-id
:tag tag} :tag tag})))
{::db/return-keys? false})))
(s/def ::delete-file-object-thumbnail (s/def ::delete-file-object-thumbnail
(s/keys :req [::rpc/profile-id] (s/keys :req [::rpc/profile-id]
@ -365,8 +365,8 @@
thumb (db/get* conn :file-thumbnail thumb (db/get* conn :file-thumbnail
{:file-id file-id {:file-id file-id
:revn revn} :revn revn}
{::db/remove-deleted? false {::db/remove-deleted false
::db/for-update? true})] ::sql/for-update true})]
(if (some? thumb) (if (some? thumb)
(do (do

3
backend/src/app/rpc/commands/files_update.clj
View file

@ -250,7 +250,8 @@
:features (db/create-array conn "text" (:features file)) :features (db/create-array conn "text" (:features file))
:data (when (take-snapshot? file) :data (when (take-snapshot? file)
(:data file)) (:data file))
:changes (blob/encode changes)}) :changes (blob/encode changes)}
{::db/return-keys false})
(db/update! conn :file (db/update! conn :file
{:revn (:revn file) {:revn (:revn file)

15
backend/src/app/rpc/commands/fonts.clj
View file

@ -11,6 +11,7 @@
[app.common.schema :as sm] [app.common.schema :as sm]
[app.common.uuid :as uuid] [app.common.uuid :as uuid]
[app.db :as db] [app.db :as db]
[app.db.sql :as-alias sql]
[app.loggers.audit :as-alias audit] [app.loggers.audit :as-alias audit]
[app.loggers.webhooks :as-alias webhooks] [app.loggers.webhooks :as-alias webhooks]
[app.media :as media] [app.media :as media]
@ -179,8 +180,7 @@
(db/update! conn :team-font-variant (db/update! conn :team-font-variant
{:font-family name} {:font-family name}
{:font-id id {:font-id id
:team-id team-id} :team-id team-id})
{::db/return-keys? false})
(rph/with-meta (rph/wrap nil) (rph/with-meta (rph/wrap nil)
{::audit/replace-props {:id id {::audit/replace-props {:id id
@ -201,7 +201,6 @@
::webhooks/event? true ::webhooks/event? true
::sm/params schema:delete-font} ::sm/params schema:delete-font}
[cfg {:keys [::rpc/profile-id id team-id]}] [cfg {:keys [::rpc/profile-id id team-id]}]
(db/tx-run! cfg (db/tx-run! cfg
(fn [{:keys [::db/conn ::sto/storage] :as cfg}] (fn [{:keys [::db/conn ::sto/storage] :as cfg}]
(teams/check-edition-permissions! conn profile-id team-id) (teams/check-edition-permissions! conn profile-id team-id)
@ -209,7 +208,7 @@
{:team-id team-id {:team-id team-id
:font-id id :font-id id
:deleted-at nil} :deleted-at nil}
{::db/for-update? true}) {::sql/for-update true})
storage (media/configure-assets-storage storage conn) storage (media/configure-assets-storage storage conn)
tnow (dt/now)] tnow (dt/now)]
@ -220,8 +219,7 @@
(doseq [font fonts] (doseq [font fonts]
(db/update! conn :team-font-variant (db/update! conn :team-font-variant
{:deleted-at tnow} {:deleted-at tnow}
{:id (:id font)} {:id (:id font)})
{::db/return-keys? false})
(some->> (:woff1-file-id font) (sto/touch-object! storage)) (some->> (:woff1-file-id font) (sto/touch-object! storage))
(some->> (:woff2-file-id font) (sto/touch-object! storage)) (some->> (:woff2-file-id font) (sto/touch-object! storage))
(some->> (:ttf-file-id font) (sto/touch-object! storage)) (some->> (:ttf-file-id font) (sto/touch-object! storage))
@ -250,13 +248,12 @@
(teams/check-edition-permissions! conn profile-id team-id) (teams/check-edition-permissions! conn profile-id team-id)
(let [variant (db/get conn :team-font-variant (let [variant (db/get conn :team-font-variant
{:id id :team-id team-id} {:id id :team-id team-id}
{::db/for-update? true}) {::sql/for-update true})
storage (media/configure-assets-storage storage conn)] storage (media/configure-assets-storage storage conn)]
(db/update! conn :team-font-variant (db/update! conn :team-font-variant
{:deleted-at (dt/now)} {:deleted-at (dt/now)}
{:id (:id variant)} {:id (:id variant)})
{::db/return-keys? false})
(some->> (:woff1-file-id variant) (sto/touch-object! storage)) (some->> (:woff1-file-id variant) (sto/touch-object! storage))
(some->> (:woff2-file-id variant) (sto/touch-object! storage)) (some->> (:woff2-file-id variant) (sto/touch-object! storage))

6
backend/src/app/rpc/commands/management.clj
View file

@ -215,7 +215,7 @@
(-> file (-> file
(update :features #(db/create-array conn "text" %)) (update :features #(db/create-array conn "text" %))
(update :data blob/encode)) (update :data blob/encode))
{::db/return-keys? false}) {::db/return-keys false})
;; The file profile creation is optional, so when no profile is ;; The file profile creation is optional, so when no profile is
;; present (when this function is called from profile less ;; present (when this function is called from profile less
@ -231,10 +231,10 @@
{::db/return-keys? false})) {::db/return-keys? false}))
(doseq [params flibs] (doseq [params flibs]
(db/insert! conn :file-library-rel params ::db/return-keys? false)) (db/insert! conn :file-library-rel params ::db/return-keys false))
(doseq [params fmeds] (doseq [params fmeds]
(db/insert! conn :file-media-object params ::db/return-keys? false)) (db/insert! conn :file-media-object params ::db/return-keys false))
file)) file))

3
backend/src/app/rpc/commands/media.clj
View file

@ -157,8 +157,7 @@
(db/update! conn :file (db/update! conn :file
{:modified-at (dt/now) {:modified-at (dt/now)
:has-media-trimmed false} :has-media-trimmed false}
{:id file-id} {:id file-id})
{::db/return-keys? false})
(db/exec-one! conn [sql:create-file-media-object (db/exec-one! conn [sql:create-file-media-object
(or id (uuid/next)) (or id (uuid/next))

12
backend/src/app/rpc/commands/profile.clj
View file

@ -13,6 +13,7 @@
[app.common.uuid :as uuid] [app.common.uuid :as uuid]
[app.config :as cf] [app.config :as cf]
[app.db :as db] [app.db :as db]
[app.db.sql :as-alias sql]
[app.email :as eml] [app.email :as eml]
[app.http.session :as session] [app.http.session :as session]
[app.loggers.audit :as audit] [app.loggers.audit :as audit]
@ -99,7 +100,7 @@
;; NOTE: we need to retrieve the profile independently if we use ;; NOTE: we need to retrieve the profile independently if we use
;; it or not for explicit locking and avoid concurrent updates of ;; it or not for explicit locking and avoid concurrent updates of
;; the same row/object. ;; the same row/object.
(let [profile (-> (db/get-by-id conn :profile profile-id ::db/for-update? true) (let [profile (-> (db/get-by-id conn :profile profile-id ::sql/for-update true)
(decode-row)) (decode-row))
;; Update the profile map with direct params ;; Update the profile map with direct params
@ -164,7 +165,7 @@
(defn- validate-password! (defn- validate-password!
[{:keys [::db/conn] :as cfg} {:keys [profile-id old-password] :as params}] [{:keys [::db/conn] :as cfg} {:keys [profile-id old-password] :as params}]
(let [profile (db/get-by-id conn :profile profile-id ::db/for-update? true)] (let [profile (db/get-by-id conn :profile profile-id ::sql/for-update true)]
(when (and (not= (:password profile) "!") (when (and (not= (:password profile) "!")
(not (:valid (verify-password cfg old-password (:password profile))))) (not (:valid (verify-password cfg old-password (:password profile)))))
(ex/raise :type :validation (ex/raise :type :validation
@ -176,7 +177,8 @@
(when-not (db/read-only? conn) (when-not (db/read-only? conn)
(db/update! conn :profile (db/update! conn :profile
{:password (auth/derive-password password)} {:password (auth/derive-password password)}
{:id id}))) {:id id})
nil))
;; --- MUTATION: Update Photo ;; --- MUTATION: Update Photo
@ -202,7 +204,7 @@
(defn update-profile-photo (defn update-profile-photo
[{:keys [::db/pool ::sto/storage] :as cfg} {:keys [profile-id file] :as params}] [{:keys [::db/pool ::sto/storage] :as cfg} {:keys [profile-id file] :as params}]
(let [photo (upload-photo cfg params) (let [photo (upload-photo cfg params)
profile (db/get-by-id pool :profile profile-id ::db/for-update? true)] profile (db/get-by-id pool :profile profile-id ::sql/for-update true)]
;; Schedule deletion of old photo ;; Schedule deletion of old photo
(when-let [id (:photo-id profile)] (when-let [id (:photo-id profile)]
@ -329,7 +331,7 @@
::sm/params schema:update-profile-props} ::sm/params schema:update-profile-props}
[{:keys [::db/pool]} {:keys [::rpc/profile-id props]}] [{:keys [::db/pool]} {:keys [::rpc/profile-id props]}]
(db/with-atomic [conn pool] (db/with-atomic [conn pool]
(let [profile (get-profile conn profile-id ::db/for-update? true) (let [profile (get-profile conn profile-id ::sql/for-update true)
props (reduce-kv (fn [props k v] props (reduce-kv (fn [props k v]
;; We don't accept namespaced keys ;; We don't accept namespaced keys
(if (simple-ident? k) (if (simple-ident? k)

6
backend/src/app/rpc/commands/projects.clj
View file

@ -9,6 +9,7 @@
[app.common.data.macros :as dm] [app.common.data.macros :as dm]
[app.common.spec :as us] [app.common.spec :as us]
[app.db :as db] [app.db :as db]
[app.db.sql :as-alias sql]
[app.loggers.audit :as-alias audit] [app.loggers.audit :as-alias audit]
[app.loggers.webhooks :as webhooks] [app.loggers.webhooks :as webhooks]
[app.rpc :as-alias rpc] [app.rpc :as-alias rpc]
@ -233,7 +234,7 @@
[{:keys [::db/pool] :as cfg} {:keys [::rpc/profile-id id name] :as params}] [{:keys [::db/pool] :as cfg} {:keys [::rpc/profile-id id name] :as params}]
(db/with-atomic [conn pool] (db/with-atomic [conn pool]
(check-edition-permissions! conn profile-id id) (check-edition-permissions! conn profile-id id)
(let [project (db/get-by-id conn :project id ::db/for-update? true)] (let [project (db/get-by-id conn :project id ::sql/for-update true)]
(db/update! conn :project (db/update! conn :project
{:name name} {:name name}
{:id id}) {:id id})
@ -259,7 +260,8 @@
(check-edition-permissions! conn profile-id id) (check-edition-permissions! conn profile-id id)
(let [project (db/update! conn :project (let [project (db/update! conn :project
{:deleted-at (dt/now)} {:deleted-at (dt/now)}
{:id id :is-default false})] {:id id :is-default false}
{::db/return-keys true})]
(rph/with-meta (rph/wrap) (rph/with-meta (rph/wrap)
{::audit/props {:team-id (:team-id project) {::audit/props {:team-id (:team-id project)
:name (:name project) :name (:name project)

3
backend/src/app/rpc/commands/teams.clj
View file

@ -963,5 +963,6 @@
(let [invitation (db/delete! conn :team-invitation (let [invitation (db/delete! conn :team-invitation
{:team-id team-id {:team-id team-id
:email-to (str/lower email)})] :email-to (str/lower email)}
{::db/return-keys true})]
(rph/wrap nil {::audit/props {:invitation-id (:id invitation)}}))))) (rph/wrap nil {::audit/props {:invitation-id (:id invitation)}})))))

3
backend/src/app/rpc/commands/webhooks.clj
View file

@ -95,7 +95,8 @@
:mtype mtype :mtype mtype
:error-code nil :error-code nil
:error-count 0} :error-count 0}
{:id id}) {:id id}
{::db/return-keys true})
(decode-row))) (decode-row)))
(sv/defmethod ::create-webhook (sv/defmethod ::create-webhook

13
backend/src/app/srepl/cli.clj
View file

@ -65,9 +65,8 @@
(let [res (db/update! conn :profile (let [res (db/update! conn :profile
params params
{:email email {:email email
:deleted-at nil} :deleted-at nil})]
{::db/return-keys? false})] (pos? (db/get-update-count res))))))))
(pos? (:next.jdbc/update-count res))))))))
(defmethod exec-command :delete-profile (defmethod exec-command :delete-profile
[{:keys [email soft]}] [{:keys [email soft]}]
@ -82,12 +81,10 @@
(let [res (if soft (let [res (if soft
(db/update! conn :profile (db/update! conn :profile
{:deleted-at (dt/now)} {:deleted-at (dt/now)}
{:email email :deleted-at nil} {:email email :deleted-at nil})
{::db/return-keys? false})
(db/delete! conn :profile (db/delete! conn :profile
{:email email} {:email email}))]
{::db/return-keys? false}))] (pos? (db/get-update-count res))))))
(pos? (:next.jdbc/update-count res))))))
(defmethod exec-command :search-profile (defmethod exec-command :search-profile
[{:keys [email]}] [{:keys [email]}]

6
backend/src/app/storage.clj
View file

@ -170,8 +170,7 @@
(let [id (if (impl/object? object-or-id) (:id object-or-id) object-or-id) (let [id (if (impl/object? object-or-id) (:id object-or-id) object-or-id)
rs (db/update! pool-or-conn :storage-object rs (db/update! pool-or-conn :storage-object
{:touched-at (dt/now)} {:touched-at (dt/now)}
{:id id} {:id id})]
{::db/return-keys? false})]
(pos? (db/get-update-count rs)))) (pos? (db/get-update-count rs))))
(defn get-object-data (defn get-object-data
@ -220,8 +219,7 @@
(let [id (if (impl/object? object-or-id) (:id object-or-id) object-or-id) (let [id (if (impl/object? object-or-id) (:id object-or-id) object-or-id)
res (db/update! pool-or-conn :storage-object res (db/update! pool-or-conn :storage-object
{:deleted-at (dt/now)} {:deleted-at (dt/now)}
{:id id} {:id id})]
{::db/return-keys? false})]
(pos? (db/get-update-count res)))) (pos? (db/get-update-count res))))
(dm/export impl/resolve-backend) (dm/export impl/resolve-backend)

5
backend/src/app/storage/gc_deleted.clj
View file

@ -47,8 +47,7 @@
[conn ids] [conn ids]
(let [ids (db/create-array conn "uuid" ids)] (let [ids (db/create-array conn "uuid" ids)]
(-> (db/exec-one! conn [sql:delete-sobjects ids]) (-> (db/exec-one! conn [sql:delete-sobjects ids])
(db/get-update-count)))) (db/get-update-count))))
(defn- delete-in-bulk! (defn- delete-in-bulk!
[cfg backend-id ids] [cfg backend-id ids]
@ -60,7 +59,6 @@
(fn [{:keys [::db/conn ::sto/storage]}] (fn [{:keys [::db/conn ::sto/storage]}]
(when-let [ids (lock-ids conn ids)] (when-let [ids (lock-ids conn ids)]
(let [total (delete-sobjects! conn ids)] (let [total (delete-sobjects! conn ids)]
(-> (impl/resolve-backend storage backend-id) (-> (impl/resolve-backend storage backend-id)
(impl/del-objects-in-bulk ids)) (impl/del-objects-in-bulk ids))
@ -68,7 +66,6 @@
(l/dbg :hint "permanently delete storage object" (l/dbg :hint "permanently delete storage object"
:id (str id) :id (str id)
:backend (name backend-id))) :backend (name backend-id)))
total)))) total))))
(catch Throwable cause (catch Throwable cause
(l/err :hint "unexpected error on bulk deletion" (l/err :hint "unexpected error on bulk deletion"

6
backend/src/app/tasks/file_gc.clj
View file

@ -249,8 +249,7 @@
(blob/encode))] (blob/encode))]
(db/update! conn :file (db/update! conn :file
{:data data} {:data data}
{:id file-id} {:id file-id}))
{::db/return-keys? false}))
(count unused)))) (count unused))))
@ -315,7 +314,6 @@
;; Mark file as trimmed ;; Mark file as trimmed
(db/update! conn :file (db/update! conn :file
{:has-media-trimmed true} {:has-media-trimmed true}
{:id id} {:id id})
{::db/return-keys? false})
(feat.fdata/persist-pointers! cfg id)))) (feat.fdata/persist-pointers! cfg id))))

40
backend/src/app/tasks/objects_gc.clj
View file

@ -89,9 +89,7 @@
;; CASCADE database triggers. This may leave orphan ;; CASCADE database triggers. This may leave orphan
;; teams, but there is a special task for deleting ;; teams, but there is a special task for deleting
;; orphaned teams. ;; orphaned teams.
(db/delete! conn :profile (db/delete! conn :profile {:id id})
{:id id}
{::db/return-keys? false})
(inc total)) (inc total))
0))) 0)))
@ -118,20 +116,16 @@
(some->> photo-id (sto/touch-object! storage)) (some->> photo-id (sto/touch-object! storage))
;; And finally, permanently delete the team. ;; And finally, permanently delete the team.
(db/delete! conn :team (db/delete! conn :team {:id id})
{:id id}
{::db/return-keys? false})
;; Mark for deletion in cascade ;; Mark for deletion in cascade
(db/update! conn :team-font-variant (db/update! conn :team-font-variant
{:deleted-at deleted-at} {:deleted-at deleted-at}
{:team-id id} {:team-id id})
{::db/return-keys? false})
(db/update! conn :project (db/update! conn :project
{:deleted-at deleted-at} {:deleted-at deleted-at}
{:team-id id} {:team-id id})
{::db/return-keys? false})
(inc total)) (inc total))
0))) 0)))
@ -162,9 +156,7 @@
(some->> (:ttf-file-id font) (sto/touch-object! storage)) (some->> (:ttf-file-id font) (sto/touch-object! storage))
;; And finally, permanently delete the team font variant ;; And finally, permanently delete the team font variant
(db/delete! conn :team-font-variant (db/delete! conn :team-font-variant {:id id})
{:id id}
{::db/return-keys? false})
(inc total)) (inc total))
0))) 0)))
@ -187,16 +179,14 @@
:id (str id) :id (str id)
:team-id (str team-id) :team-id (str team-id)
:deleted-at (dt/format-instant deleted-at)) :deleted-at (dt/format-instant deleted-at))
;; And finally, permanently delete the project. ;; And finally, permanently delete the project.
(db/delete! conn :project (db/delete! conn :project {:id id})
{:id id}
{::db/return-keys? false})
;; Mark files to be deleted ;; Mark files to be deleted
(db/update! conn :file (db/update! conn :file
{:deleted-at deleted-at} {:deleted-at deleted-at}
{:project-id id} {:project-id id})
{::db/return-keys? false})
(inc total)) (inc total))
0))) 0)))
@ -221,25 +211,21 @@
:deleted-at (dt/format-instant deleted-at)) :deleted-at (dt/format-instant deleted-at))
;; And finally, permanently delete the file. ;; And finally, permanently delete the file.
(db/delete! conn :file (db/delete! conn :file {:id id})
{:id id}
{::db/return-keys? false})
;; Mark file media objects to be deleted ;; Mark file media objects to be deleted
(db/update! conn :file-media-object (db/update! conn :file-media-object
{:deleted-at deleted-at} {:deleted-at deleted-at}
{:file-id id} {:file-id id})
{::db/return-keys? false})
;; Mark thumbnails to be deleted ;; Mark thumbnails to be deleted
(db/update! conn :file-thumbnail (db/update! conn :file-thumbnail
{:deleted-at deleted-at} {:deleted-at deleted-at}
{:file-id id} {:file-id id})
{::db/return-keys? false})
(db/update! conn :file-tagged-object-thumbnail (db/update! conn :file-tagged-object-thumbnail
{:deleted-at deleted-at} {:deleted-at deleted-at}
{:file-id id} {:file-id id})
{::db/return-keys? false})
(inc total)) (inc total))
0))) 0)))

3
backend/src/app/tasks/orphan_teams_gc.clj
View file

@ -54,7 +54,6 @@
(l/trc :hint "mark orphan team for deletion" :id (str team-id)) (l/trc :hint "mark orphan team for deletion" :id (str team-id))
(db/update! conn :team (db/update! conn :team
{:deleted-at (dt/now)} {:deleted-at (dt/now)}
{:id team-id} {:id team-id})
{::db/return-keys? false})
(inc total)) (inc total))
0))) 0)))

9
backend/test/backend_tests/rpc_file_thumbnails_test.clj
View file

@ -140,7 +140,7 @@
(t/is (= 0 (:freeze res)))) (t/is (= 0 (:freeze res))))
;; check that storage object is still exists but is marked as deleted ;; check that storage object is still exists but is marked as deleted
(let [row (th/db-get :storage-object {:id (:media-id row1)} {::db/remove-deleted? false})] (let [row (th/db-get :storage-object {:id (:media-id row1)} {::db/remove-deleted false})]
(t/is (some? (:deleted-at row)))) (t/is (some? (:deleted-at row))))
;; Run the storage gc deleted task, it should permanently delete ;; Run the storage gc deleted task, it should permanently delete
@ -152,7 +152,7 @@
(t/is (some? (sto/get-object storage (:media-id row2)))) (t/is (some? (sto/get-object storage (:media-id row2))))
;; check that storage object is still exists but is marked as deleted ;; check that storage object is still exists but is marked as deleted
(let [row (th/db-get :storage-object {:id (:media-id row1)} {::db/remove-deleted? false})] (let [row (th/db-get :storage-object {:id (:media-id row1)} {::db/remove-deleted false})]
(t/is (nil? row)))))) (t/is (nil? row))))))
(t/deftest create-file-thumbnail (t/deftest create-file-thumbnail
@ -240,7 +240,7 @@
(t/is (nil? (sto/get-object storage (:media-id row1)))) (t/is (nil? (sto/get-object storage (:media-id row1))))
(t/is (some? (sto/get-object storage (:media-id row2)))) (t/is (some? (sto/get-object storage (:media-id row2))))
(let [row (th/db-get :storage-object {:id (:media-id row1)} {::db/remove-deleted? false})] (let [row (th/db-get :storage-object {:id (:media-id row1)} {::db/remove-deleted false})]
(t/is (some? (:deleted-at row)))) (t/is (some? (:deleted-at row))))
;; Run the storage gc deleted task, it should permanently delete ;; Run the storage gc deleted task, it should permanently delete
@ -320,6 +320,3 @@
(let [result (:result out)] (let [result (:result out)]
(t/is (contains? result "test-key-2")))))) (t/is (contains? result "test-key-2"))))))

4
backend/test/backend_tests/rpc_profile_test.clj
View file

@ -149,7 +149,7 @@
(let [row (th/db-get :team (let [row (th/db-get :team
{:id (:default-team-id prof)} {:id (:default-team-id prof)}
{::db/remove-deleted? false})] {::db/remove-deleted false})]
(t/is (nil? (:deleted-at row)))) (t/is (nil? (:deleted-at row))))
(let [result (th/run-task! :orphan-teams-gc {:min-age 0})] (let [result (th/run-task! :orphan-teams-gc {:min-age 0})]
@ -157,7 +157,7 @@
(let [row (th/db-get :team (let [row (th/db-get :team
{:id (:default-team-id prof)} {:id (:default-team-id prof)}
{::db/remove-deleted? false})] {::db/remove-deleted false})]
(t/is (dt/instant? (:deleted-at row)))) (t/is (dt/instant? (:deleted-at row))))
;; query profile after delete ;; query profile after delete