From b65f46640926fc55a4e6262c6c6494f47915074b Mon Sep 17 00:00:00 2001 From: Howon Lee <hlee.howon@gmail.com> Date: Tue, 6 Jul 2021 13:22:47 -0700 Subject: [PATCH] Excise 45 day clause from view line graph in audit (#16906) --- .../audit/pages/queries.clj | 45 +++++++++---------- 1 file changed, 22 insertions(+), 23 deletions(-) diff --git a/enterprise/backend/src/metabase_enterprise/audit/pages/queries.clj b/enterprise/backend/src/metabase_enterprise/audit/pages/queries.clj index a32ae7df434..9c4344ae228 100644 --- a/enterprise/backend/src/metabase_enterprise/audit/pages/queries.clj +++ b/enterprise/backend/src/metabase_enterprise/audit/pages/queries.clj @@ -12,13 +12,12 @@ [:views {:display_name "Views", :base_type :type/Integer}] [:avg_running_time {:display_name "Avg. Running Time (ms)", :base_type :type/Decimal}]] :results (common/reducible-query - (-> {:select [[(hx/cast :date :started_at) :day] - [:%count.* :views] - [:%avg.running_time :avg_running_time]] - :from [:query_execution] - :group-by [(hx/cast :date :started_at)] - :order-by [[(hx/cast :date :started_at) :asc]]} - (common/add-45-days-clause :started_at)))}) + {:select [[(hx/cast :date :started_at) :day] + [:%count.* :views] + [:%avg.running_time :avg_running_time]] + :from [:query_execution] + :group-by [(hx/cast :date :started_at)] + :order-by [[(hx/cast :date :started_at) :asc]]})}) (defn ^:internal-query-fn most-popular "Query that returns the 10 most-popular Cards based on number of query executions, in descending order." @@ -27,14 +26,14 @@ [:card_name {:display_name "Card", :base_type :type/Title, :remapped_from :card_id}] [:executions {:display_name "Executions", :base_type :type/Integer}]] :results (common/reducible-query - {:select [[:c.id :card_id] - [:c.name :card_name] - [:%count.* :executions]] - :from [[:query_execution :qe]] - :join [[:report_card :c] [:= :qe.card_id :c.id]] - :group-by [:c.id] - :order-by [[:executions :desc]] - :limit 10})}) + {:select [[:c.id :card_id] + [:c.name :card_name] + [:%count.* :executions]] + :from [[:query_execution :qe]] + :join [[:report_card :c] [:= :qe.card_id :c.id]] + :group-by [:c.id] + :order-by [[:executions :desc]] + :limit 10})}) (defn ^:internal-query-fn ^:deprecated slowest "Query that returns the 10 slowest-running Cards based on average query execution time, in descending order." @@ -43,14 +42,14 @@ [:card_name {:display_name "Card", :base_type :type/Title, :remapped_from :card_id}] [:avg_running_time {:display_name "Avg. Running Time (ms)", :base_type :type/Decimal}]] :results (common/reducible-query - {:select [[:c.id :card_id] - [:c.name :card_name] - [:%avg.running_time :avg_running_time]] - :from [[:query_execution :qe]] - :join [[:report_card :c] [:= :qe.card_id :c.id]] - :group-by [:c.id] - :order-by [[:avg_running_time :desc]] - :limit 10})}) + {:select [[:c.id :card_id] + [:c.name :card_name] + [:%avg.running_time :avg_running_time]] + :from [[:query_execution :qe]] + :join [[:report_card :c] [:= :qe.card_id :c.id]] + :group-by [:c.id] + :order-by [[:avg_running_time :desc]] + :limit 10})}) (s/defn ^:internal-query-fn table "A list of all questions. -- GitLab