[tor-commits] [metrics-web/master] Remove CSV containing platform strings.

[karsten@xxxxxxxxxxxxxx]

commit 13f385a95d350d80454f217ca44382733f3cf1f0
Author: Karsten Loesing <karsten.loesing@xxxxxxx>
Date:   Sun Feb 12 12:56:07 2012 +0100

    Remove CSV containing platform strings.
    
    The query behind this CSV file didn't like that we partitioned the
    statusentry table.  This wasn't a job for metrics, but rather for
    TorStatus anyway.  Remove the CSV file.
---
 rserve/csv.R                                 |   16 ----------------
 src/org/torproject/ernie/web/CsvServlet.java |    1 -
 web/WEB-INF/network.jsp                      |    4 ----
 3 files changed, 0 insertions(+), 21 deletions(-)

diff --git a/rserve/csv.R b/rserve/csv.R
index a2c61a3..596d305 100644
--- a/rserve/csv.R
+++ b/rserve/csv.R
@@ -40,22 +40,6 @@ export_versions <- function(path) {
   write.csv(versions, path, quote = FALSE, row.names = FALSE)
 }
 
-export_current_platform_strings <- function(path) {
-  drv <- dbDriver("PostgreSQL")
-  con <- dbConnect(drv, user = dbuser, password = dbpassword, dbname = db)
-  q <- paste("SELECT platform FROM statusentry",
-             "JOIN descriptor ON statusentry.descriptor =",
-             "descriptor.descriptor WHERE validafter IN (",
-             "SELECT MAX(validafter) FROM consensus)",
-             "ORDER BY platform DESC")
-  rs <- dbSendQuery(con, q)
-  platforms <- fetch(rs, n = -1)
-  dbDisconnect(con)
-  dbUnloadDriver(drv)
-  write.table(platforms, path, quote = FALSE, row.names = FALSE,
-              col.names = FALSE)
-}
-
 export_platforms <- function(path) {
   drv <- dbDriver("PostgreSQL")
   con <- dbConnect(drv, user = dbuser, password = dbpassword, dbname = db)
diff --git a/src/org/torproject/ernie/web/CsvServlet.java b/src/org/torproject/ernie/web/CsvServlet.java
index 593f584..2e752aa 100644
--- a/src/org/torproject/ernie/web/CsvServlet.java
+++ b/src/org/torproject/ernie/web/CsvServlet.java
@@ -33,7 +33,6 @@ public class CsvServlet extends HttpServlet {
     this.availableCsvFiles.add("bridge-users");
     this.availableCsvFiles.add("bwhist-flags");
     this.availableCsvFiles.add("connbidirect");
-    this.availableCsvFiles.add("current-platform-strings");
     this.availableCsvFiles.add("direct-users");
     this.availableCsvFiles.add("dirreq-stats");
     this.availableCsvFiles.add("dirbytes");
diff --git a/web/WEB-INF/network.jsp b/web/WEB-INF/network.jsp
index d105575..73205e0 100644
--- a/web/WEB-INF/network.jsp
+++ b/web/WEB-INF/network.jsp
@@ -163,8 +163,6 @@ The following graph shows the number of relays by version.</p>
   </div>
 </form>
 <p><a href="csv/versions.csv">CSV</a> file containing all data.</p>
-<p><a href="csv/current-platform-strings.csv">CSV</a> file containing
-platform strings of currently running relays.</p>
 <br>
 
 <a name="platforms"></a>
@@ -197,8 +195,6 @@ platform.</p>
   </div>
 </form>
 <p><a href="csv/platforms.csv">CSV</a> file containing all data.</p>
-<p><a href="csv/current-platform-strings.csv">CSV</a> file containing
-platform strings of currently running relays.</p>
 <br>
 
 <a name="bandwidth"></a>

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits