Merge pull request #138 from andrewm4894/sql-optimize

Optimize SQL queries

Author: andrewm4894

metrics/defaults/sql/alerts.sql

@@ -20,7 +20,7 @@ where
   and
   metric_type = 'metric'
   and
-  date(metric_timestamp) >= date('now', '-{{ alert_metric_timestamp_max_days_ago }} day')
+  metric_timestamp >= date('now', '-{{ alert_metric_timestamp_max_days_ago }} day')
   {% if alert_exclude_metrics is defined %}
   and
   -- Exclude the specified metrics
@@ -43,7 +43,7 @@ where
   and
   metric_type = 'score'
   and
-  date(metric_timestamp) >= date('now', '-{{ alert_metric_timestamp_max_days_ago }} day')
+  metric_timestamp >= date('now', '-{{ alert_metric_timestamp_max_days_ago }} day')
 group by metric_timestamp, metric_batch, metric_name
 ),
 
@@ -61,7 +61,7 @@ where
   and
   metric_type = 'alert'
   and
-  date(metric_timestamp) >= date('now', '-{{ alert_metric_timestamp_max_days_ago }} day')
+  metric_timestamp >= date('now', '-{{ alert_metric_timestamp_max_days_ago }} day')
 group by metric_timestamp, metric_batch, metric_name
 ),
 

metrics/defaults/sql/change.sql

@@ -21,7 +21,7 @@ where
   metric_type = 'metric'
   and
   -- Filter to the last {{ change_metric_timestamp_max_days_ago }} days
-  date(metric_timestamp) >= date('now', '-{{ change_metric_timestamp_max_days_ago }} day')
+  metric_timestamp >= date('now', '-{{ change_metric_timestamp_max_days_ago }} day')
   {% if change_include_metrics is defined %}
   and
   -- Include only the specified metrics
@@ -51,7 +51,7 @@ where
   metric_type = 'change'
   and
   -- Filter to the last {{ change_metric_timestamp_max_days_ago }} days
-  date(metric_timestamp) >= date('now', '-{{ change_metric_timestamp_max_days_ago }} day')
+  metric_timestamp >= date('now', '-{{ change_metric_timestamp_max_days_ago }} day')
   {% if change_include_metrics is defined %}
   and
   -- Include only the specified metrics

metrics/defaults/sql/dashboard.sql

@@ -13,7 +13,7 @@ metric_value_data AS (
   FROM {{ table_key }}
   WHERE metric_batch = '{{ metric_batch }}'
     AND metric_type = 'metric'
-    AND DATE(metric_timestamp) >= DATE('now', '-{{ alert_metric_timestamp_max_days_ago }} day')
+    AND metric_timestamp >= DATE('now', '-{{ alert_metric_timestamp_max_days_ago }} day')
   GROUP BY metric_timestamp, metric_batch, metric_name
 ),
 
@@ -26,7 +26,7 @@ metric_score_data AS (
   FROM {{ table_key }}
   WHERE metric_batch = '{{ metric_batch }}'
     AND metric_type = 'score'
-    AND DATE(metric_timestamp) >= DATE('now', '-{{ alert_metric_timestamp_max_days_ago }} day')
+    AND metric_timestamp >= DATE('now', '-{{ alert_metric_timestamp_max_days_ago }} day')
   GROUP BY metric_timestamp, metric_batch, metric_name
 ),
 
@@ -39,7 +39,7 @@ metric_alert_data AS (
   FROM {{ table_key }}
   WHERE metric_batch = '{{ metric_batch }}'
     AND metric_type = 'alert'
-    AND DATE(metric_timestamp) >= DATE('now', '-{{ alert_metric_timestamp_max_days_ago }} day')
+    AND metric_timestamp >= DATE('now', '-{{ alert_metric_timestamp_max_days_ago }} day')
   GROUP BY metric_timestamp, metric_batch, metric_name
 ),
 
@@ -52,7 +52,7 @@ metric_change_data AS (
   FROM {{ table_key }}
   WHERE metric_batch = '{{ metric_batch }}'
     AND metric_type = 'change'
-    AND DATE(metric_timestamp) >= DATE('now', '-{{ change_metric_timestamp_max_days_ago }} day')
+    AND metric_timestamp >= DATE('now', '-{{ change_metric_timestamp_max_days_ago }} day')
   GROUP BY metric_timestamp, metric_batch, metric_name
 ),
 

metrics/defaults/sql/llmalert.sql

@@ -18,7 +18,7 @@ where
   and
   metric_type = 'metric'
   and
-  date(metric_timestamp) >= date('now', '-{{ llmalert_metric_timestamp_max_days_ago }} day')
+  metric_timestamp >= date('now', '-{{ llmalert_metric_timestamp_max_days_ago }} day')
 group by metric_timestamp, metric_batch, metric_name
 ),
 
@@ -36,7 +36,7 @@ where
   and
   metric_type = 'score'
   and
-  date(metric_timestamp) >= date('now', '-{{ llmalert_metric_timestamp_max_days_ago }} day')
+  metric_timestamp >= date('now', '-{{ llmalert_metric_timestamp_max_days_ago }} day')
 group by metric_timestamp, metric_batch, metric_name
 ),
 
@@ -54,7 +54,7 @@ where
   and
   metric_type = 'alert'
   and
-  date(metric_timestamp) >= date('now', '-{{ llmalert_metric_timestamp_max_days_ago }} day')
+  metric_timestamp >= date('now', '-{{ llmalert_metric_timestamp_max_days_ago }} day')
 group by metric_timestamp, metric_batch, metric_name
 ),
 

metrics/defaults/sql/plot.sql

@@ -13,7 +13,7 @@ metric_value_data AS (
   FROM {{ table_key }}
   WHERE metric_batch = '{{ metric_batch }}'
     AND metric_type = 'metric'
-    AND DATE(metric_timestamp) >= DATE('now', '-{{ alert_metric_timestamp_max_days_ago }} day')
+    AND metric_timestamp >= DATE('now', '-{{ alert_metric_timestamp_max_days_ago }} day')
   GROUP BY metric_timestamp, metric_batch, metric_name
 ),
 
@@ -26,7 +26,7 @@ metric_score_data AS (
   FROM {{ table_key }}
   WHERE metric_batch = '{{ metric_batch }}'
     AND metric_type = 'score'
-    AND DATE(metric_timestamp) >= DATE('now', '-{{ alert_metric_timestamp_max_days_ago }} day')
+    AND metric_timestamp >= DATE('now', '-{{ alert_metric_timestamp_max_days_ago }} day')
   GROUP BY metric_timestamp, metric_batch, metric_name
 ),
 
@@ -39,7 +39,7 @@ metric_alert_data AS (
   FROM {{ table_key }}
   WHERE metric_batch = '{{ metric_batch }}'
     AND metric_type = 'alert'
-    AND DATE(metric_timestamp) >= DATE('now', '-{{ alert_metric_timestamp_max_days_ago }} day')
+    AND metric_timestamp >= DATE('now', '-{{ alert_metric_timestamp_max_days_ago }} day')
   GROUP BY metric_timestamp, metric_batch, metric_name
 ),
 
@@ -52,7 +52,7 @@ metric_change_data AS (
   FROM {{ table_key }}
   WHERE metric_batch = '{{ metric_batch }}'
     AND metric_type = 'change'
-    AND DATE(metric_timestamp) >= DATE('now', '-{{ change_metric_timestamp_max_days_ago }} day')
+    AND metric_timestamp >= DATE('now', '-{{ change_metric_timestamp_max_days_ago }} day')
   GROUP BY metric_timestamp, metric_batch, metric_name
 ),
 

metrics/defaults/sql/summary.sql

@@ -8,7 +8,7 @@ SELECT
 FROM {{ table_key }}
 WHERE
   -- Limit to the last {{ summary_metric_timestamp_max_days_ago }} days
-  DATE(metric_timestamp) >= DATE('now', '-{{ summary_metric_timestamp_max_days_ago }} day')
+  metric_timestamp >= DATE('now', '-{{ summary_metric_timestamp_max_days_ago }} day')
 GROUP BY metric_batch, metric_name
 ORDER BY n_alert DESC
 ;