perf tuning ring-handler

modules/reitit-ring/src/reitit/ring.cljc

@@ -4,8 +4,8 @@
             [reitit.core :as r]
             [reitit.impl :as impl]))
 
-(def http-methods #{:get :head :patch :delete :options :post :put})
+(def http-methods #{:get :head :post :put :delete :connect :options :trace :patch})
-(defrecord Methods [get head post put delete trace options connect patch any])
+(defrecord Methods [get head post put delete connect options trace patch])
 (defrecord Endpoint [data handler path method middleware])
 
 (defn- group-keys [data]
@@ -64,28 +64,23 @@
             (let [method (:request-method request :any)
                   path-params (:path-params match)
                   result (:result match)
-                  handler (or (-> result method :handler)
+                  handler (-> result method :handler (or default-handler))
-                              (-> result :any (:handler default-handler)))
                   request (-> request
+                              (impl/fast-assoc :path-params path-params)
                               (impl/fast-assoc ::r/match match)
-                              (impl/fast-assoc ::r/router router)
+                              (impl/fast-assoc ::r/router router))]
-                              (cond-> (seq path-params) (impl/fast-assoc :path-params path-params)))
+              (or (handler request) (default-handler request)))
-                  response (handler request)]
-              (if (nil? response)
-                (default-handler request)
-                response))
             (default-handler request)))
          ([request respond raise]
           (if-let [match (r/match-by-path router (:uri request))]
             (let [method (:request-method request :any)
                   path-params (:path-params match)
                   result (:result match)
-                  handler (or (-> result method :handler)
+                  handler (-> result method :handler (or default-handler))
-                              (-> result :any (:handler default-handler)))
                   request (-> request
+                              (impl/fast-assoc :path-params path-params)
                               (impl/fast-assoc ::r/match match)
-                              (impl/fast-assoc ::r/router router)
+                              (impl/fast-assoc ::r/router router))]
-                              (cond-> (seq path-params) (impl/fast-assoc :path-params path-params)))]
               (handler request respond raise))
             (default-handler request respond raise))))
        {::r/router router}))))
@@ -109,14 +104,21 @@
                      (-> (middleware/compile-result [p d] opts s)
                          (map->Endpoint)
                          (assoc :path p)
-                         (assoc :method m)))]
+                         (assoc :method m)))
+        ->methods (fn [any? data]
+                    (reduce
+                      (fn [acc method]
+                        (cond-> acc
+                                any? (assoc method (->endpoint path data method nil))))
+                      (map->Methods {})
+                      http-methods))]
     (if-not (seq childs)
-      (map->Methods {:any (->endpoint path top :any nil)})
+      (->methods true top)
       (reduce-kv
         (fn [acc method data]
           (let [data (meta-merge top data)]
             (assoc acc method (->endpoint path data method method))))
-        (map->Methods {:any (if (:handler top) (->endpoint path data :any nil))})
+        (->methods (:handler top) data)
         childs))))
 
 (defn router

perf-test/clj/reitit/ring_perf_test.clj

@@ -0,0 +1,38 @@
+(ns reitit.ring-perf-test
+  (:require [criterium.core :as cc]
+            [reitit.perf-utils :refer :all]
+            [reitit.ring :as ring]))
+
+;;
+;; start repl with `lein perf repl`
+;; perf measured with the following setup:
+;;
+;; Model Name:            MacBook Pro
+;; Model Identifier:      MacBookPro11,3
+;; Processor Name:        Intel Core i7
+;; Processor Speed:       2,5 GHz
+;; Number of Processors:  1
+;; Total Number of Cores: 4
+;; L2 Cache (per Core):   256 KB
+;; L3 Cache:              6 MB
+;; Memory:                16 GB
+;;
+
+(def app
+  (ring/ring-handler
+    (ring/router
+      [["/auth/login" identity]
+       ["/auth/recovery/token/:token" identity]
+       ["/workspace/:project/:page" identity]])))
+
+(comment
+  (let [request {:request-method :post, :uri "/auth/login"}]
+    ;; 192ns (initial)
+    ;; 163ns (always assoc path params)
+    ;; 132ns (expand methods)
+    (cc/quick-bench
+      (app request))
+
+    ;; 113ns (don't inject router)
+    ;;  89ns (don't inject router & match)
+    ))