Take two for as.POSIXct() on R (< 4.3.0)

Author: HenrikBengtsson

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: future.p2p
 Title: A Peer-to-Peer Compute Cluster via Futureverse
-Version: 0.3.0-9030
+Version: 0.3.0-9031
 Description: Implementation of the 'Future' API <doi:10.32614/RJ-2021-048> that resolves futures on a peer-to-peer ('P2P') compute environment. By using this future backend, you and your friends can share your spare compute resources with each other.
 Imports:
     future (>= 1.67.0),

NAMESPACE

@@ -16,7 +16,6 @@ export(host_cluster)
 export(p2p_cluster_name)
 export(pico_username)
 export(worker)
-if (getRversion() < "4.3.0") S3method(as.POSIXct,numeric)
 importFrom(callr,r_bg)
 importFrom(future,Future)
 importFrom(future,FutureBackend)

R/001.import_future_functions.R

@@ -25,12 +25,3 @@ future_supports_state_submitted <- local({
     .value
   }
 })
-
-
-## Backports
-#' @rawNamespace if (getRversion() < "4.3.0") S3method(as.POSIXct,numeric)
-if (getRversion() < "4.3.0") {
-  as.POSIXct.numeric <- function(x, tz = "", origin, ...) {
-    .POSIXct(if (missing(origin)) x else as.POSIXct(origin, tz = "GMT", ...) + x, tz)
-  }
-}

R/pico_p2p.R

@@ -8,7 +8,7 @@ pico_p2p_time <- function(time = Sys.time(), delta = 0) {
 }
 
 now_str <- function(when = pico_p2p_time()) {
-  when <- as.POSIXct(when)
+  when <- as_POSIXct(when)
   format(when, format = "%FT%T")
 }
 
@@ -412,7 +412,7 @@ pico_p2p_dispatch_future <- function(future) {
         update_parent("request")
         m <- pico_p2p_have_future(pico, future = file, duration = duration)
         state <- "request"
-        request_expires <- as.POSIXct(as.numeric(m[["expires"]]))
+        request_expires <- as_POSIXct(as.numeric(m[["expires"]]))
         next
       }
 
@@ -440,7 +440,7 @@ pico_p2p_dispatch_future <- function(future) {
 
       if (state == "request" && m[["type"]] == "offer") {
         ## Ignore, if offer already expired
-        if (Sys.time() > as.POSIXct(as.numeric(m[["expires"]]))) {
+        if (Sys.time() > as_POSIXct(as.numeric(m[["expires"]]))) {
           if (debug) mdebug("Received expired work offer")
           next
         }
@@ -508,7 +508,7 @@ pico_p2p_dispatch_future <- function(future) {
 
       if (m[["type"]] == "result") {
         ## Ignore, if result already expired
-        if (Sys.time() > as.POSIXct(as.numeric(m[["expires"]]))) {
+        if (Sys.time() > as_POSIXct(as.numeric(m[["expires"]]))) {
           if (debug) mdebug("Receiving expired results")
           ## FIXME: We cannot just ignore the file transfer, because then the worker will
           ## stall forever. To do that, we need the worker coordinator to interrupt the

R/pico_username.R

@@ -49,7 +49,7 @@ pico_username <- local({
       if (length(out) < 3) {
         stop(sprintf("pico_username(): Received unexpected results: [n=%s]\n%s", length(out), paste(out, collapse = "\n")))
       }
-      username <<- structure(out[1], id = out[2], created_on = as.POSIXct(sub("T", " ", out[3])), class = "pico_username")
+      username <<- structure(out[1], id = out[2], created_on = as_POSIXct(sub("T", " ", out[3])), class = "pico_username")
     }
 
     username

R/utils-basic.R

@@ -89,3 +89,8 @@ hexpr <- function(expr, trim = TRUE, collapse = "; ", maxHead = 6L, maxTail = 3L
   if (trim) code <- trim(code)
   hpaste(code, collapse = collapse, maxHead = maxHead, maxTail = maxTail, ...)
 } # hexpr()
+
+
+as_POSIXct <- function(x, tz = "", origin = as.POSIXct("1970-01-01", tz = "GMT"), ...) {
+  as.POSIXct(x, tz = tz, origin = origin, ...)
+}

R/utils-debug.R

@@ -1,6 +1,6 @@
 now <- function(x = Sys.time(), format = "[%H:%M:%OS3] ") {
   ## format(x, format = format) ## slower
-  format(as.POSIXlt(x, tz = ""), format = format)
+  format(as_POSIXct(x, tz = ""), format = format)
 }
 
 debug_indent <- local({

R/worker.R

@@ -109,7 +109,7 @@ worker <- function(cluster = p2p_cluster_name(host = host, ssh_args = ssh_args),
   ## List of known requests
   requests <- data.frame(
     future = character(0L),
-    expires = as.POSIXct(NA_real_)[FALSE],
+    expires = as_POSIXct(NA_real_)[FALSE],
     client = character(0L)
   )
   stop_if_not(is.data.frame(requests))
@@ -190,7 +190,7 @@ worker <- function(cluster = p2p_cluster_name(host = host, ssh_args = ssh_args),
         if (! m[["future"]] %in% requests[["future"]]) {
           request <- data.frame(
             future = m[["future"]],
-            expires = as.POSIXct(as.numeric(m[["expires"]])),
+            expires = as_POSIXct(as.numeric(m[["expires"]])),
             client = m[["from"]]
           )
           requests <- rbind(requests, request)