Bearloga has uploaded a new change for review.
https://gerrit.wikimedia.org/r/251004
Change subject: Move to 'date' column name
......................................................................
Move to 'date' column name
Change-Id: I674ee6e4f707bd08c47d62cfc7aa0794c1f1b138
---
M server.R
M utils.R
2 files changed, 21 insertions(+), 13 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/discovery/rainbow
refs/changes/04/251004/1
diff --git a/server.R b/server.R
index d91a6ab..a17775e 100644
--- a/server.R
+++ b/server.R
@@ -250,7 +250,7 @@
date_range <- input$kpi_summary_date_range_selector
switch(date_range,
daily = {
- temp <- polloi::safe_tail(desktop_load_data, 2)$timestamp %>% {
+ temp <- polloi::safe_tail(desktop_load_data, 2)$date %>% {
paste0(as.character(., "%A, %b "),
sub("([a-z]{2})", "<sup>\\1</sup>",
sapply(as.numeric(as.character(., "%e")),
toOrdinal)))
@@ -258,7 +258,7 @@
},
weekly = {
date_range_index <- c(1, 7, 8, 14)
- temp <- polloi::safe_tail(desktop_load_data,
date_range_index[4])$timestamp %>% {
+ temp <- polloi::safe_tail(desktop_load_data,
date_range_index[4])$date %>% {
paste0(as.character(.[date_range_index], "%b "),
sub("([a-z]{2})", "<sup>\\1</sup>",
sapply(as.numeric(as.character(.[date_range_index],
"%e")), toOrdinal)))
@@ -268,7 +268,7 @@
},
monthly = {
date_range_index <- c(1, 31, 31, 60)
- temp <- polloi::safe_tail(desktop_load_data,
date_range_index[4])$timestamp %>% {
+ temp <- polloi::safe_tail(desktop_load_data,
date_range_index[4])$date %>% {
paste0(as.character(.[date_range_index], "%b "),
sub("([a-z]{2})", "<sup>\\1</sup>",
sapply(as.numeric(as.character(.[date_range_index],
"%e")), toOrdinal)))
@@ -278,7 +278,7 @@
},
quarterly = {
date_range_index <- c(1, 90)
- temp <- polloi::safe_tail(desktop_load_data,
date_range_index[2])$timestamp %>% {
+ temp <- polloi::safe_tail(desktop_load_data,
date_range_index[2])$date %>% {
paste0(as.character(.[date_range_index], "%B "),
sub("([a-z]{2})", "<sup>\\1</sup>",
sapply(as.numeric(as.character(.[date_range_index],
"%e")), toOrdinal)))
@@ -402,7 +402,7 @@
Median = apply(., 1, median)
cbind(Median = Median, .)
} %>%
- cbind(timestamp = polloi::safe_tail(desktop_load_data,
num_of_days_in_common)$timestamp, .) %>%
+ cbind(date = polloi::safe_tail(desktop_load_data,
num_of_days_in_common)$date, .) %>%
polloi::smoother(smooth_level = ifelse(smooth_level == "global",
input$smoothing_global, smooth_level), rename = FALSE) %>%
{ xts::xts(.[, -1], order.by = .[, 1]) }
return(dygraph(load_times,
@@ -449,7 +449,7 @@
})
output$kpi_api_usage_series <- renderDygraph({
smooth_level <- input$smoothing_kpi_api_usage
- api_usage <- cbind(timestamp = split_dataset$cirrus$timestamp,
as.data.frame(lapply(split_dataset, function(x) x$events)))
+ api_usage <- cbind(date = split_dataset$cirrus$date,
as.data.frame(lapply(split_dataset, function(x) x$events)))
if ( input$kpi_api_usage_series_include_open ) {
api_usage <- transform(api_usage, all = cirrus + geo + language + open +
prefix)
} else {
diff --git a/utils.R b/utils.R
index 3391e39..f6535f0 100644
--- a/utils.R
+++ b/utils.R
@@ -10,28 +10,34 @@
## dygraphs.
read_desktop <- function() {
data <- polloi::read_dataset("search/desktop_event_counts.tsv")
- interim <- reshape2::dcast(data, formula = timestamp ~ action, fun.aggregate
= sum)
+ names(data)[1] <- 'date' # Will be unnecessary after
https://gerrit.wikimedia.org/r/#/c/250856/
+ interim <- reshape2::dcast(data, formula = date ~ action, fun.aggregate =
sum)
interim[is.na(interim)] <- 0
desktop_dygraph_set <<- interim
desktop_dygraph_means <<- round(colMeans(desktop_dygraph_set[,2:5]))
- desktop_load_data <<- polloi::read_dataset("search/desktop_load_times.tsv")
+ interim <- polloi::read_dataset("search/desktop_load_times.tsv")
+ names(interim)[1] <- 'date' # Will be unnecessary after
https://gerrit.wikimedia.org/r/#/c/250856/
+ desktop_load_data <<- interim
}
read_web <- function() {
data <- polloi::read_dataset("search/mobile_event_counts.tsv")
- interim <- reshape2::dcast(data, formula = timestamp ~ action, fun.aggregate
= sum)
+ names(data)[1] <- 'date' # Will be unnecessary after
https://gerrit.wikimedia.org/r/#/c/250856/
+ interim <- reshape2::dcast(data, formula = date ~ action, fun.aggregate =
sum)
interim[is.na(interim)] <- 0
mobile_dygraph_set <<- interim
mobile_dygraph_means <<- round(colMeans(mobile_dygraph_set[,2:4]))
- mobile_load_data <<- polloi::read_dataset("search/mobile_load_times.tsv")
+ interim <- polloi::read_dataset("search/mobile_load_times.tsv")
+ names(interim)[1] <- 'date' # Will be unnecessary after
https://gerrit.wikimedia.org/r/#/c/250856/
+ mobile_load_data <<- interim
}
read_apps <- function() {
data <- polloi::read_dataset("search/app_event_counts.tsv")
-
- ios <- reshape2::dcast(data[data$platform == "iOS",], formula = timestamp ~
action, fun.aggregate = sum)
- android <- reshape2::dcast(data[data$platform == "Android",], formula =
timestamp ~ action, fun.aggregate = sum)
+ names(data)[1] <- 'date' # Will be unnecessary after
https://gerrit.wikimedia.org/r/#/c/250856/
+ ios <- reshape2::dcast(data[data$platform == "iOS",], formula = date ~
action, fun.aggregate = sum)
+ android <- reshape2::dcast(data[data$platform == "Android",], formula = date
~ action, fun.aggregate = sum)
ios_dygraph_set <<- ios
ios_dygraph_means <<- round(colMeans(ios[,2:4]))
@@ -39,6 +45,7 @@
android_dygraph_means <<- round(colMeans(android[,2:4]))
app_load_data <- polloi::read_dataset("search/app_load_times.tsv")
+ names(app_load_data)[1] <- 'date' # Will be unnecessary after
https://gerrit.wikimedia.org/r/#/c/250856/
ios_load_data <<- app_load_data[app_load_data$platform == "iOS",
names(app_load_data) != "platform"]
android_load_data <<- app_load_data[app_load_data$platform == "Android",
names(app_load_data) != "platform"]
@@ -46,6 +53,7 @@
read_api <- function(){
data <- polloi::read_dataset("search/search_api_aggregates.tsv")
+ names(data)[1] <- 'date' # Will be unnecessary after
https://gerrit.wikimedia.org/r/#/c/250856/
data <- data[order(data$event_type),]
split_dataset <<- split(data, f = data$event_type)
}
--
To view, visit https://gerrit.wikimedia.org/r/251004
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I674ee6e4f707bd08c47d62cfc7aa0794c1f1b138
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/discovery/rainbow
Gerrit-Branch: master
Gerrit-Owner: Bearloga <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
