fix: greatly improve performance of often-executed ping-fetch-query

Change-Id: Ic574b193f65f1fd362bf7451fe343e0caa788910

diff --git a/src/org/cacert/gigi/database/DatabaseConnection.java b/src/org/cacert/gigi/database/DatabaseConnection.java
index fd77be1ea1e7629d299f35a3c522205bf5b4f4f1..2bdf9f1ca1ab1cb7fe694569655547c6a400b493 100644 (file)
--- a/src/org/cacert/gigi/database/DatabaseConnection.java
+++ b/src/org/cacert/gigi/database/DatabaseConnection.java
@@ -122,7 +122,7 @@ public class DatabaseConnection {
 
     }
 
-    public static final int CURRENT_SCHEMA_VERSION = 25;
+    public static final int CURRENT_SCHEMA_VERSION = 26;
 
     public static final int CONNECTION_TIMEOUT = 24 * 60 * 60;
 

diff --git a/src/org/cacert/gigi/database/tableStructure.sql b/src/org/cacert/gigi/database/tableStructure.sql
index 8b1a77d6d0910a2e912f1aeff5582e395fbd8b3a..304d85d995b3f71cf5959b1a74c3a5e452389859 100644 (file)
--- a/src/org/cacert/gigi/database/tableStructure.sql
+++ b/src/org/cacert/gigi/database/tableStructure.sql
@@ -105,6 +105,7 @@ CREATE TABLE "domainPinglog" (
   "challenge" varchar(16),
   "result" varchar(255)
 );
+CREATE INDEX ON "domainPinglog" ("configId","when");
 
 DROP TABLE IF EXISTS "baddomains";
 CREATE TABLE "baddomains" (
@@ -374,7 +375,7 @@ CREATE TABLE "schemeVersion" (
   "version" smallint NOT NULL,
   PRIMARY KEY ("version")
 );
-INSERT INTO "schemeVersion" (version)  VALUES(25);
+INSERT INTO "schemeVersion" (version)  VALUES(26);
 
 DROP TABLE IF EXISTS `passwordResetTickets`;
 CREATE TABLE `passwordResetTickets` (

diff --git a/src/org/cacert/gigi/database/upgrade/from_25.sql b/src/org/cacert/gigi/database/upgrade/from_25.sql
new file mode 100644 (file)
index 0000000..59e9218
--- /dev/null
+++ b/src/org/cacert/gigi/database/upgrade/from_25.sql
@@ -0,0 +1 @@
+CREATE INDEX ON "domainPinglog" ("configId","when");

diff --git a/src/org/cacert/gigi/ping/PingerDaemon.java b/src/org/cacert/gigi/ping/PingerDaemon.java
index a8d90f9c784398dbc9fd8969b1afe786aa4be8f3..0e4e3bd39df9c4ba216d729c84c066668d5a8645 100644 (file)
--- a/src/org/cacert/gigi/ping/PingerDaemon.java
+++ b/src/org/cacert/gigi/ping/PingerDaemon.java
@@ -38,15 +38,15 @@ public class PingerDaemon extends Thread {
     }
 
     public void runWithConnection() {
-        searchNeededPings = new GigiPreparedStatement("SELECT  `pc`.`id`" //
-                + " FROM  `pingconfig` AS `pc`" //
-                + " INNER JOIN `domains` AS `d` ON `pc`.`domainid` = `d`.`id`" //
-                + " LEFT JOIN `domainPinglog` AS `dpl` ON `pc`.`id` = `dpl`.`configId`" //
-                + " WHERE  `pc`.`deleted` IS NULL" //
-                + " AND  `d`.`deleted` IS NULL" //
-                + " GROUP BY `pc`.`id`"//
-                + " HAVING  ( MAX(`dpl`.`when`) < CURRENT_TIMESTAMP - interval '6 mons')" //
-                + " OR  COUNT(`dpl`.`configId`) < 1");
+        searchNeededPings = new GigiPreparedStatement("SELECT `pc`.`id`" //
+                + " FROM `pingconfig` AS `pc`" //
+                + " INNER JOIN `domains` AS `d` ON `d`.`id` = `pc`.`domainid`" //
+                + " WHERE `d`.`deleted` IS NULL" //
+                + "  AND `pc`.`deleted` IS NULL" //
+                + "  AND NOT EXISTS (" //
+                + "    SELECT 1 FROM `domainPinglog` AS `dpl`" //
+                + "    WHERE `dpl`.`configId` = `pc`.`id`" //
+                + "     AND `dpl`.`when` >= CURRENT_TIMESTAMP - interval '6 mons')");
         pingers.put(DomainPingType.EMAIL, new EmailPinger());
         pingers.put(DomainPingType.SSL, new SSLPinger(truststore));
         pingers.put(DomainPingType.HTTP, new HTTPFetch());