[tor-commits] [metrics-web/release] Ignore v3 onion OnionPerf measurements.

[karsten at torproject.org]

commit 7af8f108136b5bb37a0e88f794ce7154c4660ba9
Author: Karsten Loesing <karsten.loesing at gmx.net>
Date:   Fri Mar 29 15:14:10 2019 +0100

    Ignore v3 onion OnionPerf measurements.
    
    We're later going to include these measurements in graphs, but that
    requires more changes. For now, let's ignore these measurements rather
    than include them in the v2 onion results. They will be in the
    database, so we'll be able to make those graphs including past
    measurements.
---
 src/main/sql/onionperf/init-onionperf.sql | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/sql/onionperf/init-onionperf.sql b/src/main/sql/onionperf/init-onionperf.sql
index e9af3b1..7c0176e 100644
--- a/src/main/sql/onionperf/init-onionperf.sql
+++ b/src/main/sql/onionperf/init-onionperf.sql
@@ -36,7 +36,7 @@ CREATE TABLE IF NOT EXISTS measurements (
   used_by INTEGER,
   endpointlocal CHARACTER VARYING(64),
   endpointproxy CHARACTER VARYING(64),
-  endpointremote CHARACTER VARYING(64),
+  endpointremote CHARACTER VARYING(96),
   hostnamelocal CHARACTER VARYING(64),
   hostnameremote CHARACTER VARYING(64),
   sourceaddress CHARACTER VARYING(64),
@@ -80,6 +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%'
 GROUP BY date, filesize, source, server
 UNION
 SELECT DATE(start) AS date,
@@ -97,6 +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%'
 GROUP BY date, filesize, 3, server) sub
 ORDER BY date, filesize, source, server;
 
@@ -145,6 +147,7 @@ FROM measurements
 WHERE DATE(start) < current_date - 1
 AND datarequest > 0
 AND dataresponse > 0
+AND endpointremote NOT SIMILAR TO '_{56}.onion%'
 GROUP BY date, source, server
 UNION
 SELECT DATE(start) AS date,
@@ -157,6 +160,7 @@ FROM measurements
 WHERE DATE(start) < current_date - 1
 AND datarequest > 0
 AND dataresponse > 0
+AND endpointremote NOT SIMILAR TO '_{56}.onion%'
 GROUP BY date, 2, server) sub
 ORDER BY date, source, server;