Docs and performance

Author: wlandau

Diff for: R/class_builder.R

@@ -128,7 +128,7 @@ target_run.tar_builder <- function(target, envir, path_store) {
   target_gc(target)
   builder_ensure_deps(target, target$subpipeline, "worker")
   frames <- frames_produce(envir, target, target$subpipeline)
-  builder_set_tar_runtime(target, frames, path_store)
+  builder_set_tar_runtime(target, frames)
   store_update_stage_early(target$store, target$settings$name, path_store)
   builder_update_build(target, frames_get_envir(frames))
   builder_ensure_paths(target, path_store)
@@ -186,6 +186,8 @@ target_skip.tar_builder <- function(
 
 #' @export
 target_conclude.tar_builder <- function(target, pipeline, scheduler, meta) {
+  on.exit(builder_unset_tar_runtime())
+  builder_set_tar_runtime(target, NULL)
   target_update_queue(target, scheduler)
   builder_handle_warnings(target, scheduler)
   builder_ensure_workspace(
@@ -496,7 +498,7 @@ builder_wait_correct_hash <- function(target) {
   store_ensure_correct_hash(target$store, storage, deployment)
 }
 
-builder_set_tar_runtime <- function(target, frames, path_store) {
+builder_set_tar_runtime <- function(target, frames) {
   tar_runtime$target <- target
   tar_runtime$frames <- frames
 }

Diff for: R/class_store_repository_cas.R

@@ -35,15 +35,6 @@ store_upload_object.tar_repository_cas <- function(store) {
     text = store$methods_repository$upload,
     args = list(key = store$file$hash, path = store$file$stage)
   )
-  tar_assert_true(
-    all(file.exists(store$file$stage)),
-    msg = paste0(
-      "CAS repository upload attempted deleted file ",
-      store$file$stage,
-      ". Uploads should not delete the output files from targets ",
-      "because it causes problems with format = \"file\"."
-    )
-  )
 }
 
 #' @export

Diff for: R/class_store_repository_cas_file.R

@@ -25,10 +25,9 @@ store_upload_object.tar_repository_cas_file <- function(store) {
   tar_assert_true(
     all(file.exists(store$file$path)),
     msg = paste0(
-      "CAS repository upload attempted deleted file ",
+      "CAS repository upload deleted file ",
       store$file$path,
-      ". Uploads should not delete the output files from targets ",
-      "because it causes problems with format = \"file\""
+      ". Uploads should not delete format = \"file\" output files."
     )
   )
 }

Diff for: R/tar_definition.R

@@ -31,6 +31,10 @@
 tar_definition <- function(
   default = targets::tar_target_raw("target_name", quote(identity()))
 ) {
-  tar_assert_target(default)
-  if_any(!is.null(tar_runtime$target), tar_runtime$target, default)
+  if (is.null(tar_runtime$target)) {
+    tar_assert_target(default)
+    default
+  } else {
+    .subset2(tar_runtime, "target")
+  }
 }

Diff for: R/tar_repository_cas.R

@@ -42,10 +42,9 @@
 #'
 #'   See the [tar_repository_cas_local()] function for an example
 #'   CAS system based on a local folder on disk.
-#'   It uses [tar_repository_cas_local_upload()],
-#'   [tar_repository_cas_local_download()], and
-#'   [tar_repository_cas_local_exists()] for the respective
-#'   `upload`, `download`, and `exists` methods.
+#'   It uses [tar_cas_u()] for uploads,
+#'   [tar_cas_d()] for downloads, and
+#'   [tar_cas_e()] for existence.
 #'   See the "Repository functions" section for specific advice on how
 #'   to write your own methods.
 #' @section Repository functions:

Diff for: R/tar_repository_cas_local.R

@@ -93,8 +93,11 @@ tar_cas_u <- function(cas, key, path) {
   cas <- cas %|||% path_cas_dir(tar_runtime$store)
   to <- file.path(cas, key)
   if (!file.exists(to)) {
-    # Defined in R/utils_files.R. Works on both files and directories.
-    file_copy(path, to)
+    if_any(
+      identical(tar_definition()$settings$format, "file"),
+      file_copy(path, to), # Defined in R/utils_files.R for files & dirs.
+      file_move(path, to)  # Defined in R/utils_files.R for files & dirs.
+    )
   }
 }
 
@@ -106,7 +109,7 @@ tar_cas_u <- function(cas, key, path) {
 #' @inheritParams tar_cas_u
 tar_cas_d <- function(cas, key, path) {
   cas <- cas %|||% path_cas_dir(tar_runtime$store)
-  # Defined in R/utils_files.R. Works on both directories.
+  # Defined in R/utils_files.R. Works on both files and directories.
   file_copy(file.path(cas, key), path)
 }
 

Diff for: man/tar_repository_cas.Rd

@@ -46,15 +46,19 @@ tar_test("local CAS repository works on default directory", {
       tar_target(z, write_file(y), format = "file", repository = repository)
     )
   })
-  tar_make(reporter = "silent")
-  expect_equal(tar_read(x), c(2L, 4L))
-  expect_equal(unname(tar_read(y)), c(2L, 4L))
-  expect_equal(unname(tar_read(y, branches = 2L)), 4L)
-  expect_equal(readLines(tar_read(z)), c("2", "4"))
-  expect_equal(tar_outdated(), character(0L))
-  unlink(file.path(tar_config_get("store"), "cas", tar_meta(z)$data))
-  expect_equal(tar_outdated(), "z")
-  tar_destroy()
+  on.exit(tar_option_reset())
+  for (storage in c("main", "worker")) {
+    tar_option_set(storage = storage, retrieval = storage)
+    tar_make(callr_function = NULL, reporter = "silent")
+    expect_equal(tar_read(x), c(2L, 4L))
+    expect_equal(unname(tar_read(y)), c(2L, 4L))
+    expect_equal(unname(tar_read(y, branches = 2L)), 4L)
+    expect_equal(readLines(tar_read(z)), c("2", "4"))
+    expect_equal(tar_outdated(), character(0L))
+    unlink(file.path(tar_config_get("store"), "cas", tar_meta(z)$data))
+    expect_equal(tar_outdated(), "z")
+    tar_destroy()
+  }
 })
 
 tar_test("local CAS repository works on custom directory", {