[tor-commits] [metrics-web/master] Remove dead code from bwhist module.
karsten at torproject.org
karsten at torproject.org
Wed Mar 4 19:55:45 UTC 2020
commit cfd670a9442723c8c5e19996c2921c7c87697d17
Author: Karsten Loesing <karsten.loesing at gmx.net>
Date: Mon Jan 27 21:07:48 2020 +0100
Remove dead code from bwhist module.
---
.../bwhist/RelayDescriptorDatabaseImporter.java | 55 ++++---------------
src/main/sql/bwhist/tordir.sql | 64 +++-------------------
2 files changed, 18 insertions(+), 101 deletions(-)
diff --git a/src/main/java/org/torproject/metrics/stats/bwhist/RelayDescriptorDatabaseImporter.java b/src/main/java/org/torproject/metrics/stats/bwhist/RelayDescriptorDatabaseImporter.java
index 2958bda..91cd559 100644
--- a/src/main/java/org/torproject/metrics/stats/bwhist/RelayDescriptorDatabaseImporter.java
+++ b/src/main/java/org/torproject/metrics/stats/bwhist/RelayDescriptorDatabaseImporter.java
@@ -133,13 +133,8 @@ public final class RelayDescriptorDatabaseImporter {
this.psSs = conn.prepareStatement("SELECT fingerprint "
+ "FROM statusentry WHERE validafter = ?");
this.psR = conn.prepareStatement("INSERT INTO statusentry "
- + "(validafter, nickname, fingerprint, descriptor, "
- + "published, address, orport, dirport, isauthority, "
- + "isbadexit, isbaddirectory, isexit, isfast, isguard, "
- + "ishsdir, isnamed, isstable, isrunning, isunnamed, "
- + "isvalid, isv2dir, isv3dir, version, bandwidth, ports, "
- + "rawdesc) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, "
- + "?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)");
+ + "(validafter, fingerprint, isauthority, isexit, isguard, "
+ + "isrunning) VALUES (?, ?, ?, ?, ?, ?)");
this.csH = conn.prepareCall("{call insert_bwhist(?, ?, ?, ?, ?, "
+ "?)}");
this.psU = conn.prepareStatement("INSERT INTO scheduled_updates "
@@ -178,11 +173,8 @@ public final class RelayDescriptorDatabaseImporter {
/**
* Insert network status consensus entry into database.
*/
- public void addStatusEntryContents(long validAfter, String nickname,
- String fingerprint, String descriptor, long published,
- String address, long orPort, long dirPort,
- SortedSet<String> flags, String version, long bandwidth,
- String ports, byte[] rawDescriptor) {
+ public void addStatusEntryContents(long validAfter, String fingerprint,
+ SortedSet<String> flags) {
if (this.importIntoDatabase) {
try {
this.addDateToScheduledUpdates(validAfter);
@@ -201,31 +193,11 @@ public final class RelayDescriptorDatabaseImporter {
if (!insertedStatusEntries.contains(fingerprint)) {
this.psR.clearParameters();
this.psR.setTimestamp(1, validAfterTimestamp);
- this.psR.setString(2, nickname);
- this.psR.setString(3, fingerprint);
- this.psR.setString(4, descriptor);
- this.psR.setTimestamp(5, new Timestamp(published));
- this.psR.setString(6, address);
- this.psR.setLong(7, orPort);
- this.psR.setLong(8, dirPort);
- this.psR.setBoolean(9, flags.contains("Authority"));
- this.psR.setBoolean(10, flags.contains("BadExit"));
- this.psR.setBoolean(11, flags.contains("BadDirectory"));
- this.psR.setBoolean(12, flags.contains("Exit"));
- this.psR.setBoolean(13, flags.contains("Fast"));
- this.psR.setBoolean(14, flags.contains("Guard"));
- this.psR.setBoolean(15, flags.contains("HSDir"));
- this.psR.setBoolean(16, flags.contains("Named"));
- this.psR.setBoolean(17, flags.contains("Stable"));
- this.psR.setBoolean(18, flags.contains("Running"));
- this.psR.setBoolean(19, flags.contains("Unnamed"));
- this.psR.setBoolean(20, flags.contains("Valid"));
- this.psR.setBoolean(21, flags.contains("V2Dir"));
- this.psR.setBoolean(22, flags.contains("V3Dir"));
- this.psR.setString(23, version);
- this.psR.setLong(24, bandwidth);
- this.psR.setString(25, ports);
- this.psR.setBytes(26, rawDescriptor);
+ this.psR.setString(2, fingerprint);
+ this.psR.setBoolean(3, flags.contains("Authority"));
+ this.psR.setBoolean(4, flags.contains("Exit"));
+ this.psR.setBoolean(5, flags.contains("Guard"));
+ this.psR.setBoolean(6, flags.contains("Running"));
this.psR.executeUpdate();
rrsCount++;
if (rrsCount % autoCommitCount == 0) {
@@ -536,14 +508,7 @@ public final class RelayDescriptorDatabaseImporter {
for (NetworkStatusEntry statusEntry
: consensus.getStatusEntries().values()) {
this.addStatusEntryContents(consensus.getValidAfterMillis(),
- statusEntry.getNickname(),
- statusEntry.getFingerprint().toLowerCase(),
- statusEntry.getDescriptor().toLowerCase(),
- statusEntry.getPublishedMillis(), statusEntry.getAddress(),
- statusEntry.getOrPort(), statusEntry.getDirPort(),
- statusEntry.getFlags(), statusEntry.getVersion(),
- statusEntry.getBandwidth(), statusEntry.getPortList(),
- statusEntry.getStatusEntryBytes());
+ statusEntry.getFingerprint().toLowerCase(), statusEntry.getFlags());
}
}
diff --git a/src/main/sql/bwhist/tordir.sql b/src/main/sql/bwhist/tordir.sql
index e11bbc6..a2c3b65 100644
--- a/src/main/sql/bwhist/tordir.sql
+++ b/src/main/sql/bwhist/tordir.sql
@@ -35,31 +35,11 @@ $$ LANGUAGE plpgsql;
-- Each statusentry references a valid descriptor.
CREATE TABLE statusentry (
validafter TIMESTAMP WITHOUT TIME ZONE NOT NULL,
- nickname CHARACTER VARYING(19) NOT NULL,
fingerprint CHARACTER(40) NOT NULL,
- descriptor CHARACTER(40) NOT NULL,
- published TIMESTAMP WITHOUT TIME ZONE NOT NULL,
- address CHARACTER VARYING(15) NOT NULL,
- orport INTEGER NOT NULL,
- dirport INTEGER NOT NULL,
isauthority BOOLEAN DEFAULT FALSE NOT NULL,
- isbadexit BOOLEAN DEFAULT FALSE NOT NULL,
- isbaddirectory BOOLEAN DEFAULT FALSE NOT NULL,
isexit BOOLEAN DEFAULT FALSE NOT NULL,
- isfast BOOLEAN DEFAULT FALSE NOT NULL,
isguard BOOLEAN DEFAULT FALSE NOT NULL,
- ishsdir BOOLEAN DEFAULT FALSE NOT NULL,
- isnamed BOOLEAN DEFAULT FALSE NOT NULL,
- isstable BOOLEAN DEFAULT FALSE NOT NULL,
- isrunning BOOLEAN DEFAULT FALSE NOT NULL,
- isunnamed BOOLEAN DEFAULT FALSE NOT NULL,
- isvalid BOOLEAN DEFAULT FALSE NOT NULL,
- isv2dir BOOLEAN DEFAULT FALSE NOT NULL,
- isv3dir BOOLEAN DEFAULT FALSE NOT NULL,
- version CHARACTER VARYING(50),
- bandwidth BIGINT,
- ports TEXT,
- rawdesc BYTEA NOT NULL
+ isrunning BOOLEAN DEFAULT FALSE NOT NULL
);
CREATE OR REPLACE FUNCTION delete_old_statusentry()
@@ -85,25 +65,8 @@ CREATE TABLE bwhist_flags (
-- use to estimate user numbers.
CREATE TABLE user_stats (
date DATE NOT NULL,
- country CHARACTER(2) NOT NULL,
- r BIGINT,
dw BIGINT,
- dr BIGINT,
- drw BIGINT,
- drr BIGINT,
- bw BIGINT,
- br BIGINT,
- bwd BIGINT,
- brd BIGINT,
- bwr BIGINT,
- brr BIGINT,
- bwdr BIGINT,
- brdr BIGINT,
- bwp BIGINT,
- brp BIGINT,
- bwn BIGINT,
- brn BIGINT,
- CONSTRAINT user_stats_pkey PRIMARY KEY(date, country)
+ dr BIGINT
);
-- Dates to be included in the next refresh run.
@@ -236,22 +199,13 @@ CREATE OR REPLACE FUNCTION refresh_user_stats() RETURNS INTEGER AS $$
DELETE FROM user_stats WHERE date IN (SELECT date FROM updates);
-- Now insert new user statistics.
EXECUTE '
- INSERT INTO user_stats (date, country, dw, dr, bwd, brd, bwp, brp)
+ INSERT INTO user_stats (date, dw, dr)
SELECT
bwhist_by_relay.date AS date,
- ''zy'' AS country,
SUM(CASE WHEN authority IS NOT NULL
THEN NULL ELSE dirwritten END) AS dw,
SUM(CASE WHEN authority IS NOT NULL
- THEN NULL ELSE dirread END) AS dr,
- SUM(CASE WHEN dirwritten = 0 OR authority IS NOT NULL
- THEN NULL ELSE written END) AS bwd,
- SUM(CASE WHEN dirwritten = 0 OR authority IS NOT NULL
- THEN NULL ELSE read END) AS brd,
- SUM(CASE WHEN opendirport IS NULL OR authority IS NOT NULL
- THEN NULL ELSE written END) AS bwp,
- SUM(CASE WHEN opendirport IS NULL OR authority IS NOT NULL
- THEN NULL ELSE read END) AS brp
+ THEN NULL ELSE dirread END) AS dr
FROM (
-- Retrieve aggregate bandwidth histories of all relays in the given
-- time frame.
@@ -266,7 +220,6 @@ CREATE OR REPLACE FUNCTION refresh_user_stats() RETURNS INTEGER AS $$
-- For each relay, tell how often it had an open directory port and
-- how often it had the Authority flag assigned on a given date.
SELECT fingerprint, DATE(validafter) AS date,
- SUM(CASE WHEN dirport > 0 THEN 1 ELSE NULL END) AS opendirport,
SUM(CASE WHEN isauthority IS TRUE THEN 1 ELSE NULL END) AS authority
FROM statusentry
WHERE validafter >= ''' || min_date || '''
@@ -276,8 +229,8 @@ CREATE OR REPLACE FUNCTION refresh_user_stats() RETURNS INTEGER AS $$
) statusentry_by_relay
ON bwhist_by_relay.fingerprint = statusentry_by_relay.fingerprint
AND bwhist_by_relay.date = statusentry_by_relay.date
- -- Group by date and country, summing up the bandwidth histories.
- GROUP BY 1, 2';
+ -- Group by date, summing up the bandwidth histories.
+ GROUP BY 1';
RETURN 1;
END;
$$ LANGUAGE plpgsql;
@@ -292,7 +245,7 @@ CREATE OR REPLACE FUNCTION refresh_all() RETURNS INTEGER AS $$
INSERT INTO updates SELECT * FROM scheduled_updates;
RAISE NOTICE '% Refreshing bandwidth history.', timeofday();
PERFORM refresh_bwhist_flags();
- RAISE NOTICE '% Refreshing user statistics.', timeofday();
+ RAISE NOTICE '% Refreshing directory bytes history.', timeofday();
PERFORM refresh_user_stats();
RAISE NOTICE '% Deleting processed dates.', timeofday();
DELETE FROM scheduled_updates WHERE id IN (SELECT id FROM updates);
@@ -319,7 +272,6 @@ UNION ALL
FLOOR(CAST(dr AS NUMERIC) / CAST(86400 AS NUMERIC)) AS dirread,
FLOOR(CAST(dw AS NUMERIC) / CAST(86400 AS NUMERIC)) AS dirwrite
FROM user_stats
- WHERE country = 'zy'
- AND date < current_date - 2)
+ WHERE date < current_date - 2)
ORDER BY date, isexit, isguard;
More information about the tor-commits
mailing list