Skip to content
This repository was archived by the owner on Apr 25, 2025. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions .project
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>metabase</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
</buildSpec>
<natures>
</natures>
</projectDescription>
2 changes: 1 addition & 1 deletion resources/locales.clj
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
:locales #{"en" "ca" "de" "es" "fa" "fr" "it" "ja" "nb" "pl" "pt" "ru" "tr" "uk" "vi" "zh" }
:locales #{"en" "uk" "fr" "nl" "tr" "it" "es" "nb" "ca" "de" "ja" "vi" "pl" "pt" "ru" }
:packages ["metabase"]
:bundle "metabase.Messages"
}
2 changes: 1 addition & 1 deletion src/metabase/pulse.clj
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
(let [{:keys [creator_id dataset_query]} card
query (assoc dataset_query :async? false)]
{:card card
:result (qp/process-query-and-save-with-max-results-constraints! query
:result (qp/process-query-and-save-with-higher-max-results-constraints! query
(merge {:executed-by creator_id
:context :pulse
:card-id card-id}
Expand Down
10 changes: 10 additions & 0 deletions src/metabase/query_processor.clj
Original file line number Diff line number Diff line change
Expand Up @@ -353,3 +353,13 @@
[query, options :- mbql.s/Info]
(let [query (assoc-in query [:middleware :add-default-userland-constraints?] true)]
(process-query-and-save-execution! query options)))


(s/defn process-query-and-save-with-higher-max-results-constraints!
"Same as `process-query-and-save-execution!` but will include the default max rows returned as a constraint. (This
function is ulitmately what powers most API endpoints that run queries, including `POST /api/dataset`.)"
{:style/indent 1}
[query, options :- mbql.s/Info]
(let [query (assoc-in query [:middleware :add-higher-userland-constraints?] true)]
(process-query-and-save-execution! query options)))

21 changes: 21 additions & 0 deletions src/metabase/query_processor/middleware/constraints.clj
Original file line number Diff line number Diff line change
Expand Up @@ -40,3 +40,24 @@
[qp]
(fn [query respond raise canceled-chan]
(qp (add-default-userland-constraints* query) respond raise canceled-chan)))

(def higher-query-constraints
"Default map of constraints that we apply on dataset queries executed by the api for pulse emails."
{:max-results 30000
:max-results-bare-rows 20000})

(defn- merge-higher-constraints [constraints]
(merge higher-query-constraints constraints))

(defn- add-higher-userland-constraints*
"Add default values of `:max-results` and `:max-results-bare-rows` to `:constraints` map `m`."
[{{:keys [add-higher-userland-constraints?]} :middleware, :as query}]
(cond-> query
add-higher-userland-constraints? (update :constraints (comp ensure-valid-constraints merge-higher-constraints))))

(defn add-higher-userland-constraints
"Middleware that optionally adds expanded `max-results` and `max-results-bare-rows` constraints to queries, meant for
use with `process-query-and-save-with-higher-max-results-constraints!`, which ultimately powers the pulse attachments"
[qp]
(fn [query respond raise canceled-chan]
(qp (add-higher-userland-constraints* query) respond raise canceled-chan)))