From 1e57028415195ef8484b1f4d5500ef02b6cba051 Mon Sep 17 00:00:00 2001
From: "Collin M. Barrett" <collinbarrett@users.noreply.github.com>
Date: Sat, 25 Aug 2018 08:51:47 -0500
Subject: [PATCH] add snapshotMetrics script, tidy other scripts

---
 FilterLists.sln                        | 5 +++--
 scripts/sql/duplicateRules.sql         | 4 ++++
 scripts/sql/failedSnapshotsRules.sql   | 5 -----
 scripts/sql/getDuplicateRules.sql      | 4 ----
 scripts/sql/orphanedSnapshotsRules.sql | 5 +++++
 scripts/sql/snapshotMetrics.sql        | 6 ++++++
 scripts/sql/snapshotTimeAnalysis.sql   | 6 +++---
 7 files changed, 21 insertions(+), 14 deletions(-)
 create mode 100644 scripts/sql/duplicateRules.sql
 delete mode 100644 scripts/sql/failedSnapshotsRules.sql
 delete mode 100644 scripts/sql/getDuplicateRules.sql
 create mode 100644 scripts/sql/orphanedSnapshotsRules.sql
 create mode 100644 scripts/sql/snapshotMetrics.sql

diff --git a/FilterLists.sln b/FilterLists.sln
index aa18437d4..8b345386c 100644
--- a/FilterLists.sln
+++ b/FilterLists.sln
@@ -41,9 +41,10 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sql", "sql", "{A4BB2C81-5232-4162-B410-704D123D2C01}"
 	ProjectSection(SolutionItems) = preProject
 		scripts\sql\createDb.sql = scripts\sql\createDb.sql
-		scripts\sql\failedSnapshotsRules.sql = scripts\sql\failedSnapshotsRules.sql
-		scripts\sql\getDuplicateRules.sql = scripts\sql\getDuplicateRules.sql
+		scripts\sql\duplicateRules.sql = scripts\sql\duplicateRules.sql
+		scripts\sql\orphanedSnapshotsRules.sql = scripts\sql\orphanedSnapshotsRules.sql
 		scripts\sql\resetSnapshotsRules.sql = scripts\sql\resetSnapshotsRules.sql
+		scripts\sql\snapshotMetrics.sql = scripts\sql\snapshotMetrics.sql
 		scripts\sql\snapshotTimeAnalysis.sql = scripts\sql\snapshotTimeAnalysis.sql
 	EndProjectSection
 EndProject
diff --git a/scripts/sql/duplicateRules.sql b/scripts/sql/duplicateRules.sql
new file mode 100644
index 000000000..93d599af8
--- /dev/null
+++ b/scripts/sql/duplicateRules.sql
@@ -0,0 +1,4 @@
+SELECT Raw, COUNT(*) 'Count'
+FROM rules
+GROUP BY Raw
+HAVING COUNT > 1;
\ No newline at end of file
diff --git a/scripts/sql/failedSnapshotsRules.sql b/scripts/sql/failedSnapshotsRules.sql
deleted file mode 100644
index 01ce514d6..000000000
--- a/scripts/sql/failedSnapshotsRules.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-SELECT snapshotid, COUNT(*)
-FROM snapshots_rules
-JOIN snapshots ON snapshots_rules.snapshotid = snapshots.id
-WHERE snapshots.wassuccessful = FALSE
-GROUP BY snapshots.id
\ No newline at end of file
diff --git a/scripts/sql/getDuplicateRules.sql b/scripts/sql/getDuplicateRules.sql
deleted file mode 100644
index 87b0cf45e..000000000
--- a/scripts/sql/getDuplicateRules.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-SELECT raw, COUNT(*) ct
-FROM rules
-GROUP BY raw
-HAVING ct > 1;
\ No newline at end of file
diff --git a/scripts/sql/orphanedSnapshotsRules.sql b/scripts/sql/orphanedSnapshotsRules.sql
new file mode 100644
index 000000000..75cef7238
--- /dev/null
+++ b/scripts/sql/orphanedSnapshotsRules.sql
@@ -0,0 +1,5 @@
+SELECT SnapshotId, COUNT(*)
+FROM snapshots_rules
+JOIN snapshots ON snapshots_rules.SnapshotId = snapshots.Id
+WHERE snapshots.WasSuccessful = FALSE
+GROUP BY snapshots.Id;
\ No newline at end of file
diff --git a/scripts/sql/snapshotMetrics.sql b/scripts/sql/snapshotMetrics.sql
new file mode 100644
index 000000000..a60db9a3c
--- /dev/null
+++ b/scripts/sql/snapshotMetrics.sql
@@ -0,0 +1,6 @@
+SELECT snapshots.CreatedDateUtc, FilterlistId, HttpStatusCode, WasSuccessful, WaybackTimestamp, BatchSize, COUNT(snapshots_rules.RuleId) AS 'Count'
+FROM snapshots
+JOIN snapshots_rules ON snapshots.Id = snapshots_rules.SnapshotId
+GROUP BY snapshots.Id
+ORDER BY snapshots.CreatedDateUtc DESC
+LIMIT 50;
\ No newline at end of file
diff --git a/scripts/sql/snapshotTimeAnalysis.sql b/scripts/sql/snapshotTimeAnalysis.sql
index 30da509d7..1491adb3d 100644
--- a/scripts/sql/snapshotTimeAnalysis.sql
+++ b/scripts/sql/snapshotTimeAnalysis.sql
@@ -1,9 +1,9 @@
 SELECT
  FilterListId,
- ModifiedDateUtc - CreatedDateUtc As ProcessingTimeSecs,
+ ModifiedDateUtc - CreatedDateUtc AS ProcessingTimeSecs,
  CreatedDateUtc,
  ModifiedDateUtc,
  WasSuccessful
 FROM snapshots
-WHERE ModifiedDateUtc - CreatedDateUtc > 30 OR IsCompleted = 0
-ORDER BY ProcessingTimeSecs DESC
\ No newline at end of file
+WHERE ModifiedDateUtc - CreatedDateUtc > 30 OR WasSuccessful = 0
+ORDER BY ProcessingTimeSecs DESC;
\ No newline at end of file