From 33ca3207e7c23af102b2816ae3cd8f1388d6d0bd Mon Sep 17 00:00:00 2001
From: Joscha <joscha@plugh.de>
Date: Tue, 15 Aug 2023 00:59:35 +0200
Subject: [PATCH] Show only tracked commits

---
 ...dd190d880b89b415cecfd70dec9b56905027e27455c1dd4db02e.json} | 4 ++--
 src/server/web/pages/graph.rs                                 | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)
 rename .sqlx/{query-9f70a2d2932837e4fcd927bcc56d9bd72a8341511486d2c0e6612f4eed2b4b95.json => query-75264d014081dd190d880b89b415cecfd70dec9b56905027e27455c1dd4db02e.json} (73%)

diff --git a/.sqlx/query-9f70a2d2932837e4fcd927bcc56d9bd72a8341511486d2c0e6612f4eed2b4b95.json b/.sqlx/query-75264d014081dd190d880b89b415cecfd70dec9b56905027e27455c1dd4db02e.json
similarity index 73%
rename from .sqlx/query-9f70a2d2932837e4fcd927bcc56d9bd72a8341511486d2c0e6612f4eed2b4b95.json
rename to .sqlx/query-75264d014081dd190d880b89b415cecfd70dec9b56905027e27455c1dd4db02e.json
index 8e735d2..e8a5f47 100644
--- a/.sqlx/query-9f70a2d2932837e4fcd927bcc56d9bd72a8341511486d2c0e6612f4eed2b4b95.json
+++ b/.sqlx/query-75264d014081dd190d880b89b415cecfd70dec9b56905027e27455c1dd4db02e.json
@@ -1,6 +1,6 @@
 {
   "db_name": "SQLite",
-  "query": "WITH measurements AS ( SELECT hash, value, MAX(start) FROM runs JOIN run_measurements USING (id) WHERE name = ? GROUP BY hash ) SELECT value FROM commits LEFT JOIN measurements USING (hash) ORDER BY unixepoch(committer_date) ASC, hash ASC ",
+  "query": "WITH measurements AS ( SELECT hash, value, MAX(start) FROM runs JOIN run_measurements USING (id) WHERE name = ? GROUP BY hash ) SELECT value FROM commits LEFT JOIN measurements USING (hash) WHERE reachable = 2 ORDER BY unixepoch(committer_date) ASC, hash ASC ",
   "describe": {
     "columns": [
       {
@@ -16,5 +16,5 @@
       true
     ]
   },
-  "hash": "9f70a2d2932837e4fcd927bcc56d9bd72a8341511486d2c0e6612f4eed2b4b95"
+  "hash": "75264d014081dd190d880b89b415cecfd70dec9b56905027e27455c1dd4db02e"
 }
diff --git a/src/server/web/pages/graph.rs b/src/server/web/pages/graph.rs
index 9d20604..a45e66c 100644
--- a/src/server/web/pages/graph.rs
+++ b/src/server/web/pages/graph.rs
@@ -75,6 +75,8 @@ pub async fn get_graph_data(
         times.push(row.committer_date.unix_timestamp());
     }
 
+    // TODO Somehow sort topologically if committer_date is the same
+    // TODO Overhaul indices once I know how the query looks
     let mut metrics = HashMap::new();
     for metric in form.metric {
         let values = sqlx::query_scalar!(
@@ -90,6 +92,7 @@ pub async fn get_graph_data(
             SELECT value \
             FROM commits \
             LEFT JOIN measurements USING (hash) \
+            WHERE reachable = 2 \
             ORDER BY unixepoch(committer_date) ASC, hash ASC \
             ",
             metric,