commit 896935d33cda602d9b5656a9deed392889b50ffc Author: Karsten Loesing karsten.loesing@gmx.net Date: Wed Jun 19 04:26:35 2019 -0700

Include Torperf data in performance graphs again.

Fixes #30919. --- src/main/sql/onionperf/init-onionperf.sql | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/sql/onionperf/init-onionperf.sql b/src/main/sql/onionperf/init-onionperf.sql index b7c41d6..01bfef1 100644 --- a/src/main/sql/onionperf/init-onionperf.sql +++ b/src/main/sql/onionperf/init-onionperf.sql @@ -80,7 +80,7 @@ SELECT DATE(start) AS date, COUNT(*) AS requests FROM measurements WHERE DATE(start) < current_date - 1 -AND endpointremote NOT SIMILAR TO '_{56}.onion%' +AND (endpointremote IS NULL OR endpointremote NOT SIMILAR TO '_{56}.onion%') GROUP BY date, filesize, source, server UNION SELECT DATE(start) AS date, @@ -98,7 +98,7 @@ SELECT DATE(start) AS date, COUNT(*) AS requests FROM measurements WHERE DATE(start) < current_date - 1 -AND endpointremote NOT SIMILAR TO '_{56}.onion%' +AND (endpointremote IS NULL OR endpointremote NOT SIMILAR TO '_{56}.onion%') GROUP BY date, filesize, 3, server) sub ORDER BY date, filesize, source, server;

@@ -140,7 +140,7 @@ WITH filtered_measurements AS ( WHERE DATE(start) < current_date - 1 AND datarequest > 0 AND dataresponse > 0 - AND endpointremote NOT SIMILAR TO '_{56}.onion%' + AND (endpointremote IS NULL OR endpointremote NOT SIMILAR TO '_{56}.onion%') ), quartiles AS ( SELECT date, source, @@ -185,7 +185,7 @@ WITH filtered_measurements AS ( ELSE NULL END AS kbps FROM measurements WHERE DATE(start) < current_date - 1 - AND endpointremote NOT SIMILAR TO '_{56}.onion%' + AND (endpointremote IS NULL OR endpointremote NOT SIMILAR TO '_{56}.onion%') ), quartiles AS ( SELECT date, source,