Skip to content

Commit f42b151

Browse files
committed
Align naming for retentionPeriod passed through classes
1 parent b990c68 commit f42b151

File tree

5 files changed

+13
-12
lines changed

5 files changed

+13
-12
lines changed

core/src/main/java/org/neo4j/gds/core/utils/progress/TaskStoreService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public class TaskStoreService {
3838
// private final Map<DatabaseId, TaskStore> taskStores = new ConcurrentHashMap();
3939

4040
private final boolean progressTrackingEnabled;
41-
private Duration retentionPeriod;
41+
private final Duration retentionPeriod;
4242

4343
public TaskStoreService(boolean progressTrackingEnabled, Duration retentionPeriod) {
4444
this.progressTrackingEnabled = progressTrackingEnabled;

proc/test/src/main/java/org/neo4j/gds/InvocationCountingTaskStore.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ public class InvocationCountingTaskStore extends PerDatabaseTaskStore {
3636
public int removeTaskInvocations;
3737
public Set<JobId> seenJobIds = new HashSet<>();
3838

39-
public InvocationCountingTaskStore(Duration finishedTaskTTL) {
40-
super(finishedTaskTTL);
39+
public InvocationCountingTaskStore(Duration retentionPeriod) {
40+
super(retentionPeriod);
4141
}
4242

4343
@Override

progress-tracking/src/main/java/org/neo4j/gds/core/utils/progress/PerDatabaseTaskStore.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,11 @@
3232
public class PerDatabaseTaskStore extends ObservableTaskStore {
3333
private final Map<String, Map<JobId, UserTask>> registeredTasks;
3434

35-
public PerDatabaseTaskStore(Duration finishedTaskTTL) {
35+
public PerDatabaseTaskStore(Duration retentionPeriod) {
3636
super(new HashSet<>());
3737
this.registeredTasks = new ConcurrentHashMap<>();
3838

39-
this.addListener(new TaskStoreCleaner(this, finishedTaskTTL));
39+
this.addListener(new TaskStoreCleaner(this, retentionPeriod));
4040
}
4141

4242
@Override

progress-tracking/src/main/java/org/neo4j/gds/core/utils/progress/TaskStoreCleaner.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@
2525
import java.util.concurrent.ScheduledThreadPoolExecutor;
2626

2727
class TaskStoreCleaner implements TaskStoreListener {
28-
private final Duration finishedTaskTTL;
28+
private final Duration retentionPeriod;
2929
private final ScheduledThreadPoolExecutor cleanerPool;
3030
private final TaskStore taskStore;
3131

3232

33-
public TaskStoreCleaner(TaskStore taskStore, Duration finishedTaskTTL) {
33+
public TaskStoreCleaner(TaskStore taskStore, Duration retentionPeriod) {
3434
this.taskStore = taskStore;
35-
this.finishedTaskTTL = finishedTaskTTL;
35+
this.retentionPeriod = retentionPeriod;
3636
this.cleanerPool = new ScheduledThreadPoolExecutor(1, ExecutorServiceUtil.DEFAULT_THREAD_FACTORY);
3737
}
3838

@@ -44,13 +44,14 @@ public void onTaskAdded(UserTask userTask) {
4444
@Override
4545
public void onTaskCompleted(UserTask userTask) {
4646
// avoid scheduler if task should be cleaned up immediately
47-
if (finishedTaskTTL.toMillis() == 0) {
47+
if (retentionPeriod.toMillis() == 0) {
4848
taskStore.remove(userTask.username(), userTask.jobId());
49+
return;
4950
}
5051

5152
this.cleanerPool.schedule(
5253
() -> taskStore.remove(userTask.username(), userTask.jobId()),
53-
finishedTaskTTL.toMillis(),
54+
retentionPeriod.toMillis(),
5455
java.util.concurrent.TimeUnit.MILLISECONDS
5556
);
5657
}

progress-tracking/src/main/java/org/neo4j/gds/core/utils/progress/TaskStoreHolder.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,10 @@ private TaskStoreHolder() {}
6161
* Not using DatabaseId directly, because that would mead to some awful dependencies.
6262
* And we will eliminate this in due course.
6363
*/
64-
public static TaskStore getTaskStore(String databaseName, Duration finishedTaskTTL) {
64+
public static TaskStore getTaskStore(String databaseName, Duration retentionPeriod) {
6565
String normalizedDatabaseName = StringFormatting.toLowerCaseWithLocale(databaseName);
6666

67-
return TASK_STORES.computeIfAbsent(normalizedDatabaseName, __ -> new PerDatabaseTaskStore(finishedTaskTTL));
67+
return TASK_STORES.computeIfAbsent(normalizedDatabaseName, __ -> new PerDatabaseTaskStore(retentionPeriod));
6868
}
6969

7070
public static void purge(String databaseName) {

0 commit comments

Comments
 (0)