Fix InMemoryCompactionJobTrackerTest

gchq · Feb 20, 2025 · e3bb3c0 · e3bb3c0
1 parent a761d21
commit e3bb3c0
Show file tree

Hide file tree

Showing 3 changed files with 80 additions and 44 deletions.
diff --git a/java/core/src/test/java/sleeper/core/tracker/compaction/job/CompactionJobEventTestData.java b/java/core/src/test/java/sleeper/core/tracker/compaction/job/CompactionJobEventTestData.java
@@ -44,17 +44,29 @@ public static CompactionJobCreatedEvent defaultCompactionJobCreatedEventForTable
     }
 
     public static CompactionJobStartedEvent.Builder compactionStartedEventBuilder(CompactionJobCreatedEvent created, Instant startTime) {
-        return CompactionJobStartedEvent.builder().jobId(created.getJobId()).tableId(created.getTableId()).startTime(startTime);
+        return CompactionJobStartedEvent.builder().jobId(created.getJobId()).tableId(created.getTableId()).startTime(startTime).jobRunId(UUID.randomUUID().toString());
+    }
+
+    public static CompactionJobFinishedEvent.Builder compactionFinishedEventBuilder(CompactionJobStartedEvent started, JobRunSummary summary) {
+        return CompactionJobFinishedEvent.builder().jobId(started.getJobId()).tableId(started.getTableId()).taskId(started.getTaskId()).jobRunId(started.getJobRunId()).summary(summary);
     }
 
     public static CompactionJobFinishedEvent.Builder compactionFinishedEventBuilder(CompactionJobCreatedEvent created, JobRunSummary summary) {
         return CompactionJobFinishedEvent.builder().jobId(created.getJobId()).tableId(created.getTableId()).summary(summary);
     }
 
+    public static CompactionJobCommittedEvent.Builder compactionCommittedEventBuilder(CompactionJobStartedEvent started, Instant commitTime) {
+        return CompactionJobCommittedEvent.builder().jobId(started.getJobId()).tableId(started.getTableId()).taskId(started.getTaskId()).jobRunId(started.getJobRunId()).commitTime(commitTime);
+    }
+
     public static CompactionJobCommittedEvent.Builder compactionCommittedEventBuilder(CompactionJobCreatedEvent created, Instant commitTime) {
         return CompactionJobCommittedEvent.builder().jobId(created.getJobId()).tableId(created.getTableId()).commitTime(commitTime);
     }
 
+    public static CompactionJobFailedEvent.Builder compactionFailedEventBuilder(CompactionJobStartedEvent started, Instant failureTime) {
+        return CompactionJobFailedEvent.builder().jobId(started.getJobId()).tableId(started.getTableId()).taskId(started.getTaskId()).jobRunId(started.getJobRunId()).failureTime(failureTime);
+    }
+
     public static CompactionJobFailedEvent.Builder compactionFailedEventBuilder(CompactionJobCreatedEvent created, Instant failureTime) {
         return CompactionJobFailedEvent.builder().jobId(created.getJobId()).tableId(created.getTableId()).failureTime(failureTime);
     }

diff --git a/java/core/src/test/java/sleeper/core/tracker/compaction/job/CompactionJobStatusTestData.java b/java/core/src/test/java/sleeper/core/tracker/compaction/job/CompactionJobStatusTestData.java
@@ -86,6 +86,14 @@ public static JobRun failedCompactionRun(String taskId, Instant startTime, Insta
                 compactionFailedStatus(failureTime, failureReasons));
     }
 
+    public static CompactionJobCreatedStatus compactionCreatedStatus(Instant createdTime, String partitionId, int inputFilesCount) {
+        return CompactionJobCreatedStatus.builder()
+                .updateTime(createdTime)
+                .partitionId(partitionId)
+                .inputFilesCount(inputFilesCount)
+                .build();
+    }
+
     public static CompactionJobStartedStatus compactionStartedStatus(Instant startTime) {
         return CompactionJobStartedStatus.startAndUpdateTime(startTime, defaultUpdateTime(startTime));
     }