Limit card duration computation to 10 executions. Set DATASET_USUALLY_FAST_THRESHOLD to 15

frontend/src/dashboard/actions.js

@@ -11,7 +11,7 @@ import MetabaseAnalytics from "metabase/lib/analytics";
 import { getPositionForNewDashCard } from "metabase/lib/dashboard_grid";
 
 const DATASET_SLOW_TIMEOUT   = 15 * 1000;
-const DATASET_USUALLY_FAST_THRESHOLD = 30 * 1000;
+const DATASET_USUALLY_FAST_THRESHOLD = 15 * 1000;
 
 // normalizr schemas
 const dashcard = new Schema('dashcard');

src/metabase/api/dataset.clj

@@ -40,9 +40,12 @@
    (read-check Database database)
    ;; add sensible constraints for results limits on our query
    (let [query (assoc body :constraints dataset-query-api-constraints)]
-     (first (k/select QueryExecution
-                      (k/aggregate (avg :running_time) :average)
-                      (k/where {:json_query (json/generate-string query)})))))
+     (first (k/select [(k/subselect QueryExecution
+                        (k/fields :running_time)
+                        (k/where {:json_query (json/generate-string query)})
+                        (k/order :started_at :desc)
+                        (k/limit 10)) :_]
+              (k/aggregate (avg :running_time) :average)))))
 
 (defendpoint POST "/csv"
   "Execute an MQL query and download the result data as a CSV file."