Skip to content

Commit a526807

Browse files
wlandau-lillywlandau-lilly
committed
Change built to completed, started to dispatched
1 parent 1646e30 commit a526807

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+216
-184
lines changed

‎NAMESPACE

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -246,12 +246,12 @@ S3method(target_needs_worker,tar_builder)
246246
S3method(target_needs_worker,tar_pattern)
247247
S3method(target_patternview_canceled,default)
248248
S3method(target_patternview_canceled,tar_branch)
249+
S3method(target_patternview_dispatched,default)
250+
S3method(target_patternview_dispatched,tar_branch)
249251
S3method(target_patternview_errored,default)
250252
S3method(target_patternview_errored,tar_branch)
251253
S3method(target_patternview_meta,default)
252254
S3method(target_patternview_meta,tar_branch)
253-
S3method(target_patternview_started,default)
254-
S3method(target_patternview_started,tar_branch)
255255
S3method(target_prepare,default)
256256
S3method(target_prepare,tar_builder)
257257
S3method(target_produce_junction,tar_pattern)

‎R/class_branch.R

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,13 +106,13 @@ target_patternview_meta.tar_branch <- function(target, pipeline, meta) {
106106
}
107107

108108
#' @export
109-
target_patternview_started.tar_branch <- function(
109+
target_patternview_dispatched.tar_branch <- function(
110110
target,
111111
pipeline,
112112
scheduler
113113
) {
114114
parent <- pipeline_get_target(pipeline, target_get_parent(target))
115-
patternview_register_started(parent$patternview, parent, scheduler)
115+
patternview_register_dispatched(parent$patternview, parent, scheduler)
116116
}
117117

118118
#' @export

‎R/class_builder.R

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@ target_read_value.tar_builder <- function(target, pipeline = NULL) {
5050

5151
#' @export
5252
target_prepare.tar_builder <- function(target, pipeline, scheduler, meta) {
53-
target_patternview_started(target, pipeline, scheduler)
54-
scheduler$progress$register_started(target)
55-
scheduler$reporter$report_started(target, scheduler$progress)
53+
target_patternview_dispatched(target, pipeline, scheduler)
54+
scheduler$progress$register_dispatched(target)
55+
scheduler$reporter$report_dispatched(target, scheduler$progress)
5656
builder_ensure_deps(target, pipeline, "main")
5757
builder_update_subpipeline(target, pipeline)
5858
builder_marshal_subpipeline(target)
@@ -193,19 +193,19 @@ target_conclude.tar_builder <- function(target, pipeline, scheduler, meta) {
193193
metrics_outcome(target$metrics),
194194
cancel = builder_cancel(target, pipeline, scheduler, meta),
195195
error = builder_error(target, pipeline, scheduler, meta),
196-
built = builder_built(target, pipeline, scheduler, meta)
196+
completed = builder_completed(target, pipeline, scheduler, meta)
197197
)
198198
NextMethod()
199199
}
200200

201-
builder_built <- function(target, pipeline, scheduler, meta) {
201+
builder_completed <- function(target, pipeline, scheduler, meta) {
202202
store_cache_path(target$store, target$store$file$path)
203203
target_ensure_buds(target, pipeline, scheduler)
204204
meta$insert_record(target_produce_record(target, pipeline, meta))
205205
target_patternview_meta(target, pipeline, meta)
206206
pipeline_register_loaded(pipeline, target_get_name(target))
207-
scheduler$progress$register_built(target)
208-
scheduler$reporter$report_built(target, scheduler$progress)
207+
scheduler$progress$register_completed(target)
208+
scheduler$reporter$report_completed(target, scheduler$progress)
209209
}
210210

211211
builder_error <- function(target, pipeline, scheduler, meta) {

‎R/class_inspection.R

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -159,15 +159,17 @@ inspection_class <- R6::R6Class(
159159
target_get_type(pipeline_get_target(pipeline, name))
160160
})
161161
progress <- self$progress$database$read_condensed_data()
162-
# Keep this line for legacy reasons:
163-
progress$progress <- gsub("running", "started", x = progress$progress)
162+
# Keep these gsub lines for legacy reasons:
163+
progress$progress <- gsub("running", "dispatched", x = progress$progress)
164+
progress$progress <- gsub("started", "dispatched", x = progress$progress)
165+
progress$progress <- gsub("built", "completed", x = progress$progress)
164166
if (self$outdated) {
165-
index <- !(progress$progress %in% c("skipped", "built"))
167+
index <- !(progress$progress %in% c("skipped", "completed"))
166168
progress <- progress[index,, drop = FALSE] # nolint
167169
}
168170
out <- merge(vertices, progress, all.x = TRUE, sort = FALSE)
169171
out <- out[order(out$name),, drop = FALSE] # nolint
170-
levels <- c("skipped", "started", "built", "canceled", "errored")
172+
levels <- c("skipped", "dispatched", "completed", "canceled", "errored")
171173
in_levels <- !is.na(out$progress) & out$progress %in% levels
172174
status <- ifelse(in_levels, out$progress, status)
173175
status[is.na(status)] <- "queued"

‎R/class_metrics.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ metrics_outcome <- function(metrics) {
3535
if_any(
3636
metrics_has_cancel(metrics),
3737
"cancel",
38-
if_any(metrics_has_error(metrics), "error", "built")
38+
if_any(metrics_has_error(metrics), "error", "completed")
3939
)
4040
}
4141

‎R/class_pattern.R

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -270,8 +270,8 @@ pattern_conclude_final <- function(target, pipeline, scheduler, meta) {
270270
pattern_begin_final(target, pipeline, scheduler, meta)
271271
pattern_record_meta(target, pipeline, meta)
272272
patternview_register_final(target$patternview, target, scheduler)
273-
if (identical(target$patternview$progress, "built")) {
274-
scheduler$reporter$report_built(target, scheduler$progress)
273+
if (identical(target$patternview$progress, "completed")) {
274+
scheduler$reporter$report_completed(target, scheduler$progress)
275275
} else if (identical(target$patternview$progress, "skipped")) {
276276
scheduler$reporter$report_skipped(target, scheduler$progress)
277277
}

‎R/class_patternview.R

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ patternview_register_bytes <- function(patternview, record) {
2323
patternview$bytes <- patternview$bytes + record$bytes
2424
}
2525

26-
patternview_register_started <- function(patternview, target, scheduler) {
26+
patternview_register_dispatched <- function(patternview, target, scheduler) {
2727
if (identical(patternview$progress, "queued")) {
28-
patternview$progress <- "started"
29-
scheduler$progress$buffer_started(target)
28+
patternview$progress <- "dispatched"
29+
scheduler$progress$buffer_dispatched(target)
3030
}
3131
}
3232

@@ -45,9 +45,9 @@ patternview_register_errored <- function(patternview, target, scheduler) {
4545
}
4646

4747
patternview_register_final <- function(patternview, target, scheduler) {
48-
if (identical(patternview$progress, "started")) {
49-
patternview$progress <- "built"
50-
scheduler$progress$buffer_built(target)
48+
if (identical(patternview$progress, "dispatched")) {
49+
patternview$progress <- "completed"
50+
scheduler$progress$buffer_completed(target)
5151
} else if (identical(patternview$progress, "queued")) {
5252
patternview$progress <- "skipped"
5353
scheduler$progress$buffer_skipped(target)
@@ -58,6 +58,6 @@ patternview_validate <- function(patternview) {
5858
tar_assert_correct_fields(patternview, patternview_new)
5959
tar_assert_in(
6060
patternview$progress,
61-
c("queued", "started", "built", "canceled", "errored")
61+
c("queued", "dispatched", "completed", "canceled", "errored")
6262
)
6363
}

‎R/class_progress.R

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
progress_init <- function(
22
path_store = path_store_default(),
33
queued = counter_init(),
4-
started = counter_init(),
5-
built = counter_init(),
4+
dispatched = counter_init(),
5+
completed = counter_init(),
66
skipped = counter_init(),
77
errored = counter_init(),
88
warned = counter_init(),
@@ -12,8 +12,8 @@ progress_init <- function(
1212
progress_new(
1313
database = database,
1414
queued = queued,
15-
started = started,
16-
built = built,
15+
dispatched = dispatched,
16+
completed = completed,
1717
skipped = skipped,
1818
errored = errored,
1919
warned = warned,
@@ -24,19 +24,19 @@ progress_init <- function(
2424
progress_new <- function(
2525
database = NULL,
2626
queued = NULL,
27-
started = NULL,
27+
dispatched = NULL,
2828
skipped = NULL,
29-
built = NULL,
29+
completed = NULL,
3030
errored = NULL,
3131
warned = NULL,
3232
canceled = NULL
3333
) {
3434
progress_class$new(
3535
database = database,
3636
queued = queued,
37-
started = started,
37+
dispatched = dispatched,
3838
skipped = skipped,
39-
built = built,
39+
completed = completed,
4040
errored = errored,
4141
warned = warned,
4242
canceled = canceled
@@ -51,27 +51,27 @@ progress_class <- R6::R6Class(
5151
public = list(
5252
database = NULL,
5353
queued = NULL,
54-
started = NULL,
54+
dispatched = NULL,
5555
skipped = NULL,
56-
built = NULL,
56+
completed = NULL,
5757
errored = NULL,
5858
warned = NULL,
5959
canceled = NULL,
6060
initialize = function(
6161
database = NULL,
6262
queued = NULL,
63-
started = NULL,
63+
dispatched = NULL,
6464
skipped = NULL,
65-
built = NULL,
65+
completed = NULL,
6666
errored = NULL,
6767
warned = NULL,
6868
canceled = NULL
6969
) {
7070
self$database <- database
7171
self$queued <- queued
72-
self$started <- started
72+
self$dispatched <- dispatched
7373
self$skipped <- skipped
74-
self$built <- built
74+
self$completed <- completed
7575
self$errored <- errored
7676
self$warned <- warned
7777
self$canceled <- canceled
@@ -87,30 +87,30 @@ progress_class <- R6::R6Class(
8787
counter_del_name(self$queued, name)
8888
counter_set_name(self$skipped, name)
8989
},
90-
assign_started = function(target) {
90+
assign_dispatched = function(target) {
9191
name <- target_get_name(target)
9292
counter_del_name(self$queued, name)
93-
counter_set_name(self$started, name)
93+
counter_set_name(self$dispatched, name)
9494
},
95-
assign_built = function(target) {
95+
assign_completed = function(target) {
9696
name <- target_get_name(target)
9797
counter_del_name(self$queued, name)
98-
counter_del_name(self$started, name)
99-
counter_set_name(self$built, name)
98+
counter_del_name(self$dispatched, name)
99+
counter_set_name(self$completed, name)
100100
},
101101
assign_canceled = function(target) {
102102
name <- target_get_name(target)
103-
counter_del_name(self$started, name)
103+
counter_del_name(self$dispatched, name)
104104
counter_set_name(self$canceled, name)
105105
},
106106
assign_errored = function(target) {
107107
name <- target_get_name(target)
108-
counter_del_name(self$started, name)
108+
counter_del_name(self$dispatched, name)
109109
counter_set_name(self$errored, name)
110110
},
111111
assign_warned = function(target) {
112112
name <- target_get_name(target)
113-
counter_del_name(self$started, name)
113+
counter_del_name(self$dispatched, name)
114114
counter_set_name(self$warned, name)
115115
},
116116
produce_row = function(target, progress) {
@@ -135,11 +135,11 @@ progress_class <- R6::R6Class(
135135
buffer_skipped = function(target) {
136136
self$buffer_progress(target, progress = "skipped")
137137
},
138-
buffer_started = function(target) {
139-
self$buffer_progress(target, progress = "started")
138+
buffer_dispatched = function(target) {
139+
self$buffer_progress(target, progress = "dispatched")
140140
},
141-
buffer_built = function(target) {
142-
self$buffer_progress(target, progress = "built")
141+
buffer_completed = function(target) {
142+
self$buffer_progress(target, progress = "completed")
143143
},
144144
buffer_errored = function(target) {
145145
self$buffer_progress(target, progress = "errored")
@@ -151,13 +151,13 @@ progress_class <- R6::R6Class(
151151
self$assign_skipped(target)
152152
self$buffer_skipped(target)
153153
},
154-
register_started = function(target) {
155-
self$assign_started(target)
156-
self$buffer_started(target)
154+
register_dispatched = function(target) {
155+
self$assign_dispatched(target)
156+
self$buffer_dispatched(target)
157157
},
158-
register_built = function(target) {
159-
self$assign_built(target)
160-
self$buffer_built(target)
158+
register_completed = function(target) {
159+
self$assign_completed(target)
160+
self$buffer_completed(target)
161161
},
162162
register_errored = function(target) {
163163
self$assign_errored(target)
@@ -169,7 +169,7 @@ progress_class <- R6::R6Class(
169169
},
170170
uptodate = function() {
171171
self$skipped$count > 0L &&
172-
self$built$count == 0L &&
172+
self$completed$count == 0L &&
173173
self$errored$count == 0L &&
174174
self$canceled$count == 0L
175175
},
@@ -188,12 +188,12 @@ progress_class <- R6::R6Class(
188188
)
189189
},
190190
any_remaining = function() {
191-
self$queued$count > 0L || self$started$count > 0L
191+
self$queued$count > 0L || self$dispatched$count > 0L
192192
},
193193
any_targets = function() {
194-
count <- self$started$count +
194+
count <- self$dispatched$count +
195195
self$skipped$count +
196-
self$built$count +
196+
self$completed$count +
197197
self$errored$count +
198198
self$warned$count +
199199
self$canceled$count
@@ -203,8 +203,8 @@ progress_class <- R6::R6Class(
203203
list(
204204
queue = self$queued$count,
205205
skip = self$skipped$count,
206-
start = self$started$count,
207-
built = self$built$count,
206+
start = self$dispatched$count,
207+
completed = self$completed$count,
208208
error = self$errored$count,
209209
warn = self$warned$count,
210210
cancel = self$canceled$count,
@@ -216,8 +216,8 @@ progress_class <- R6::R6Class(
216216
},
217217
validate = function() {
218218
counter_validate(self$queued)
219-
counter_validate(self$started)
220-
counter_validate(self$built)
219+
counter_validate(self$dispatched)
220+
counter_validate(self$completed)
221221
counter_validate(self$skipped)
222222
counter_validate(self$errored)
223223
counter_validate(self$canceled)

‎R/class_reporter.R

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@ reporter_class <- R6::R6Class(
5353
cli_warned(progress$warned$count)
5454
}
5555
},
56-
report_started = function(target = NULL, progress = NULL) {
56+
report_dispatched = function(target = NULL, progress = NULL) {
5757
},
58-
report_built = function(target = NULL, progress = NULL) {
58+
report_completed = function(target = NULL, progress = NULL) {
5959
},
6060
report_skipped = function(target = NULL, progress = NULL) {
6161
},

‎R/class_scheduler.R

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,11 +87,11 @@ scheduler_class <- R6::R6Class(
8787
self$progress$queued,
8888
deps
8989
)
90-
deps_started <- counter_filter_exists(
91-
self$progress$started,
90+
deps_dispatched <- counter_filter_exists(
91+
self$progress$dispatched,
9292
deps
9393
)
94-
length(deps_queued) + length(deps_started)
94+
length(deps_queued) + length(deps_dispatched)
9595
},
9696
abridge = function(target) {
9797
self$reporter$report_error(target$metrics$error)

‎R/class_summary.R

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ summary_class <- R6::R6Class(
2424
},
2525
report_error = function(error) {
2626
},
27-
report_started = function(target = NULL, progress) {
27+
report_dispatched = function(target = NULL, progress) {
2828
self$report_progress(progress)
2929
},
30-
report_built = function(target = NULL, progress) {
30+
report_completed = function(target = NULL, progress) {
3131
self$report_progress(progress)
3232
},
3333
report_skipped = function(target = NULL, progress) {

0 commit comments

Comments
 (0)