[tor-commits] [metrics-web/master] Add levels = NULL to col_factor().

[karsten@xxxxxxxxxxxxxx]

commit a9fac06cc120a13dd35ba77983dc2d54aacc75ed
Author: Karsten Loesing <karsten.loesing@xxxxxxx>
Date:   Fri Jan 11 09:30:53 2019 +0100

    Add levels = NULL to col_factor().
    
    This is not required for readr_1.3.0 which runs locally here but
    required for readr_1.1.1 which runs on the server.
---
 src/main/R/rserver/graphs.R | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/main/R/rserver/graphs.R b/src/main/R/rserver/graphs.R
index 205afbe..18a9d3e 100644
--- a/src/main/R/rserver/graphs.R
+++ b/src/main/R/rserver/graphs.R
@@ -682,7 +682,7 @@ prepare_connbidirect <- function(start_p = NULL, end_p = NULL) {
   read_csv(file = paste(stats_dir, "connbidirect2.csv", sep = ""),
       col_types = cols(
         date = col_date(format = ""),
-        direction = col_factor(),
+        direction = col_factor(levels = NULL),
         quantile = col_double(),
         fraction = col_double())) %>%
     filter(if (!is.null(start_p)) date >= as.Date(start_p) else TRUE) %>%
@@ -1109,7 +1109,7 @@ prepare_hidserv_dir_onions_seen <- function(start_p = NULL, end_p = NULL) {
   read_csv(file = paste(stats_dir, "hidserv.csv", sep = ""),
       col_types = cols(
         date = col_date(format = ""),
-        type = col_factor(),
+        type = col_factor(levels = NULL),
         wmean = col_skip(),
         wmedian = col_skip(),
         wiqm = col_double(),
@@ -1137,7 +1137,7 @@ prepare_hidserv_rend_relayed_cells <- function(start_p = NULL, end_p = NULL) {
   read_csv(file = paste(stats_dir, "hidserv.csv", sep = ""),
       col_types = cols(
         date = col_date(format = ""),
-        type = col_factor(),
+        type = col_factor(levels = NULL),
         wmean = col_skip(),
         wmedian = col_skip(),
         wiqm = col_double(),
@@ -1167,7 +1167,7 @@ prepare_webstats_tb <- function(start_p = NULL, end_p = NULL) {
   read_csv(file = paste(stats_dir, "webstats.csv", sep = ""),
       col_types = cols(
         log_date = col_date(format = ""),
-        request_type = col_factor(),
+        request_type = col_factor(levels = NULL),
         platform = col_skip(),
         channel = col_skip(),
         locale = col_skip(),
@@ -1210,8 +1210,8 @@ prepare_webstats_tb_platform <- function(start_p = NULL, end_p = NULL) {
   read_csv(file = paste(stats_dir, "webstats.csv", sep = ""),
       col_types = cols(
         log_date = col_date(format = ""),
-        request_type = col_factor(),
-        platform = col_factor(),
+        request_type = col_factor(levels = NULL),
+        platform = col_factor(levels = NULL),
         channel = col_skip(),
         locale = col_skip(),
         incremental = col_skip(),
@@ -1253,10 +1253,10 @@ prepare_webstats_tb_locale <- function(start_p = NULL, end_p = NULL) {
   read_csv(file = paste(stats_dir, "webstats.csv", sep = ""),
       col_types = cols(
         log_date = col_date(format = ""),
-        request_type = col_factor(),
+        request_type = col_factor(levels = NULL),
         platform = col_skip(),
         channel = col_skip(),
-        locale = col_factor(),
+        locale = col_factor(levels = NULL),
         incremental = col_skip(),
         count = col_double())) %>%
     filter(if (!is.null(start_p)) log_date >= as.Date(start_p) else TRUE) %>%
@@ -1308,7 +1308,7 @@ prepare_webstats_tm <- function(start_p = NULL, end_p = NULL) {
   read_csv(file = paste(stats_dir, "webstats.csv", sep = ""),
       col_types = cols(
         log_date = col_date(format = ""),
-        request_type = col_factor(),
+        request_type = col_factor(levels = NULL),
         platform = col_skip(),
         channel = col_skip(),
         locale = col_skip(),
@@ -1348,7 +1348,7 @@ prepare_relays_ipv6 <- function(start_p = NULL, end_p = NULL) {
   read_csv(file = paste(stats_dir, "ipv6servers.csv", sep = ""),
       col_types = cols(
         valid_after_date = col_date(format = ""),
-        server = col_factor(),
+        server = col_factor(levels = NULL),
         guard_relay = col_skip(),
         exit_relay = col_skip(),
         announced_ipv6 = col_logical(),
@@ -1395,7 +1395,7 @@ prepare_bridges_ipv6 <- function(start_p = NULL, end_p = NULL) {
   read_csv(file = paste(stats_dir, "ipv6servers.csv", sep = ""),
       col_types = cols(
         valid_after_date = col_date(format = ""),
-        server = col_factor(),
+        server = col_factor(levels = NULL),
         guard_relay = col_skip(),
         exit_relay = col_skip(),
         announced_ipv6 = col_logical(),
@@ -1436,7 +1436,7 @@ prepare_advbw_ipv6 <- function(start_p = NULL, end_p = NULL) {
   read_csv(file = paste(stats_dir, "ipv6servers.csv", sep = ""),
       col_types = cols(
         valid_after_date = col_date(format = ""),
-        server = col_factor(),
+        server = col_factor(levels = NULL),
         guard_relay = col_logical(),
         exit_relay = col_logical(),
         announced_ipv6 = col_logical(),



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