From 87fdc52d43b27c92675b63c8a5e60f202186a677 Mon Sep 17 00:00:00 2001 From: jj Date: Sat, 1 Nov 2025 15:33:29 +0200 Subject: [PATCH] Update fortunes query in kit --- frameworks/Clojure/kit/deps.edn | 1 + frameworks/Clojure/kit/resources/sql/fortunes.sql | 1 + .../kit/src/clj/io/github/kit_clj/te_bench/db/sql/hikari.clj | 3 +-- .../clj/io/github/kit_clj/te_bench/web/controllers/bench.clj | 4 +++- 4 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 frameworks/Clojure/kit/resources/sql/fortunes.sql diff --git a/frameworks/Clojure/kit/deps.edn b/frameworks/Clojure/kit/deps.edn index a365a40b6ab..d517f976be1 100644 --- a/frameworks/Clojure/kit/deps.edn +++ b/frameworks/Clojure/kit/deps.edn @@ -19,6 +19,7 @@ ;; Database org.postgresql/postgresql {:mvn/version "42.7.8"} + org.clojars.jj/boa-sql {:mvn/version "1.0.0"} ;; kit Libs diff --git a/frameworks/Clojure/kit/resources/sql/fortunes.sql b/frameworks/Clojure/kit/resources/sql/fortunes.sql new file mode 100644 index 00000000000..2fff964d0f4 --- /dev/null +++ b/frameworks/Clojure/kit/resources/sql/fortunes.sql @@ -0,0 +1 @@ +select * from "Fortune"; \ No newline at end of file diff --git a/frameworks/Clojure/kit/src/clj/io/github/kit_clj/te_bench/db/sql/hikari.clj b/frameworks/Clojure/kit/src/clj/io/github/kit_clj/te_bench/db/sql/hikari.clj index 7fd502127cf..f37b2f526f8 100644 --- a/frameworks/Clojure/kit/src/clj/io/github/kit_clj/te_bench/db/sql/hikari.clj +++ b/frameworks/Clojure/kit/src/clj/io/github/kit_clj/te_bench/db/sql/hikari.clj @@ -5,5 +5,4 @@ (defmethod ig/prep-key :db.sql/hikari-connection [_ config] - (let [cpus (.availableProcessors (Runtime/getRuntime))] - (assoc config :maximum-pool-size (* 8 cpus)))) + (assoc config :maximum-pool-size 520)) diff --git a/frameworks/Clojure/kit/src/clj/io/github/kit_clj/te_bench/web/controllers/bench.clj b/frameworks/Clojure/kit/src/clj/io/github/kit_clj/te_bench/web/controllers/bench.clj index d2d5b692124..2057a175140 100644 --- a/frameworks/Clojure/kit/src/clj/io/github/kit_clj/te_bench/web/controllers/bench.clj +++ b/frameworks/Clojure/kit/src/clj/io/github/kit_clj/te_bench/web/controllers/bench.clj @@ -4,6 +4,7 @@ [next.jdbc :as jdbc] [next.jdbc.result-set :as rs] [jj.majavat :as majavat] + [jj.sql.boa :as boa] [jj.majavat.renderer :refer [->StringRenderer]] [jj.majavat.renderer.sanitizer :refer [->Html]] [ring.util.http-response :as http-response] @@ -19,6 +20,7 @@ (def ^:private render-fortune (majavat/build-renderer "html/fortunes.html" {:renderer (->StringRenderer {:sanitizer (->Html)})})) +(def query-fortunes (boa/execute (boa/->NextJdbcAdapter) "sql/fortunes.sql")) (def selmer-opts {:custom-resource-path (clojure.java.io/resource "html")}) (defn selmer-html-response @@ -143,7 +145,7 @@ (defn majavat-fortune-handler [db-conn _request] - (as-> (jdbc/execute! db-conn ["select * from \"Fortune\";"] jdbc-opts) fortunes + (as-> (query-fortunes db-conn) fortunes (conj fortunes {:id 0 :message "Additional fortune added at request time."}) (sort-by :message fortunes) (majavat-html-response {:messages fortunes}))) \ No newline at end of file