Browse Source

Update fortunes query in kit (#10233)

Co-authored-by: jj <[email protected]>
ruroru 1 month ago
parent
commit
8228bc9e23

+ 1 - 0
frameworks/Clojure/kit/deps.edn

@@ -19,6 +19,7 @@
 
 
            ;; Database
            ;; Database
            org.postgresql/postgresql        {:mvn/version "42.7.8"}
            org.postgresql/postgresql        {:mvn/version "42.7.8"}
+           org.clojars.jj/boa-sql           {:mvn/version "1.0.0"}
 
 
 
 
            ;; kit Libs
            ;; kit Libs

+ 1 - 0
frameworks/Clojure/kit/resources/sql/fortunes.sql

@@ -0,0 +1 @@
+select * from "Fortune";

+ 1 - 2
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
 (defmethod ig/prep-key :db.sql/hikari-connection
   [_ config]
   [_ config]
-  (let [cpus (.availableProcessors (Runtime/getRuntime))]
-    (assoc config :maximum-pool-size (* 8 cpus))))
+  (assoc config :maximum-pool-size 520))

+ 3 - 1
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 :as jdbc]
     [next.jdbc.result-set :as rs]
     [next.jdbc.result-set :as rs]
     [jj.majavat :as majavat]
     [jj.majavat :as majavat]
+    [jj.sql.boa :as boa]
     [jj.majavat.renderer :refer [->StringRenderer]]
     [jj.majavat.renderer :refer [->StringRenderer]]
     [jj.majavat.renderer.sanitizer :refer [->Html]]
     [jj.majavat.renderer.sanitizer :refer [->Html]]
     [ring.util.http-response :as http-response]
     [ring.util.http-response :as http-response]
@@ -19,6 +20,7 @@
 (def ^:private render-fortune (majavat/build-renderer "html/fortunes.html"
 (def ^:private render-fortune (majavat/build-renderer "html/fortunes.html"
                                                       {:renderer (->StringRenderer
                                                       {:renderer (->StringRenderer
                                                                    {:sanitizer (->Html)})}))
                                                                    {:sanitizer (->Html)})}))
+(def query-fortunes (boa/execute (boa/->NextJdbcAdapter) "sql/fortunes.sql"))
 (def selmer-opts {:custom-resource-path (clojure.java.io/resource "html")})
 (def selmer-opts {:custom-resource-path (clojure.java.io/resource "html")})
 
 
 (defn selmer-html-response
 (defn selmer-html-response
@@ -143,7 +145,7 @@
 
 
 (defn majavat-fortune-handler
 (defn majavat-fortune-handler
   [db-conn _request]
   [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."})
         (conj fortunes {:id 0 :message "Additional fortune added at request time."})
         (sort-by :message fortunes)
         (sort-by :message fortunes)
         (majavat-html-response {:messages fortunes})))
         (majavat-html-response {:messages fortunes})))