kagkarlsson#515: fix naming

kamko · Jan 5, 2025 · 65cb952 · 65cb952
1 parent 1e9771d
commit 65cb952
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/db-scheduler/src/main/java/com/github/kagkarlsson/scheduler/Scheduler.java b/db-scheduler/src/main/java/com/github/kagkarlsson/scheduler/Scheduler.java
@@ -358,11 +358,11 @@ public List<CurrentlyExecuting> getCurrentlyExecutingWithStaleHeartbeat() {
   protected void detectDeadExecutions() {
     LOG.debug("Deleting executions with unresolved tasks.");
 
-    Map<String, Instant> unresolvedTaskToNewestExecution = new HashMap<>();
+    Map<String, Instant> taskToNewestExecutionTime = new HashMap<>();
     schedulerTaskRepository.getScheduledExecutions(
         ScheduledExecutionsFilter.all(),
         execution ->
-            unresolvedTaskToNewestExecution.merge(
+            taskToNewestExecutionTime.merge(
                 execution.taskInstance.getTaskName(),
                 execution.executionTime,
                 (oldValue, newValue) -> oldValue.isAfter(newValue) ? oldValue : newValue));
@@ -371,7 +371,7 @@ protected void detectDeadExecutions() {
         .map(UnresolvedTask::getTaskName)
         .filter(
             taskName -> {
-              Instant newestExecution = unresolvedTaskToNewestExecution.get(taskName);
+              Instant newestExecution = taskToNewestExecutionTime.get(taskName);
 
               if (newestExecution == null) {
                 // probably deleted by other node

diff --git a/...duler/src/test/java/com/github/kagkarlsson/scheduler/functional/DeleteUnresolvedTest.java b/...duler/src/test/java/com/github/kagkarlsson/scheduler/functional/DeleteUnresolvedTest.java
@@ -56,15 +56,16 @@ public void should_delete_executions_with_old_unresolved_tasknames() {
 
     scheduler.schedule(first.instance("id_f"), clock.now());
     scheduler.schedule(second.instance("id_s"), clock.now().minus(1, ChronoUnit.DAYS));
+    scheduler.schedule(second.instance("id_s_2"), clock.now().minus(2, ChronoUnit.DAYS));
     assertEquals(0, testableRegistry.getCount(StatsRegistry.SchedulerStatsEvent.UNRESOLVED_TASK));
 
     scheduler.runAnyDueExecutions();
-    assertEquals(2, testableRegistry.getCount(StatsRegistry.SchedulerStatsEvent.UNRESOLVED_TASK));
+    assertEquals(3, testableRegistry.getCount(StatsRegistry.SchedulerStatsEvent.UNRESOLVED_TASK));
 
-    assertEquals(2, DbUtils.countExecutions(postgres.getDataSource()));
+    assertEquals(3, DbUtils.countExecutions(postgres.getDataSource()));
 
     scheduler.runDeadExecutionDetection();
-    assertEquals(2, DbUtils.countExecutions(postgres.getDataSource()));
+    assertEquals(3, DbUtils.countExecutions(postgres.getDataSource()));
 
     clock.tick(Duration.ofDays(4));
     scheduler.runDeadExecutionDetection();