Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ public void cancel() {
}

public void deregisterJob() {
analysisManager.removeJob(jobInfo.jobId);
analysisManager.removeJob(jobInfo);
}

protected void syncLoadStats() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -127,8 +127,6 @@ public class AnalysisManager implements Writable {

private final Map<Long, TableStatsMeta> idToTblStats = new ConcurrentHashMap<>();

private final Map<Long, AnalysisJob> idToAnalysisJob = new ConcurrentHashMap<>();

protected SimpleQueue<AnalysisInfo> autoJobs = createSimpleQueue(null, this);

private final Function<TaskStatusWrapper, Void> userJobStatusUpdater = w -> {
Expand Down Expand Up @@ -1075,16 +1073,11 @@ public ColStatsMeta findColStatsMeta(long tblId, String colName) {
return tableStats.findColumnStatsMeta(colName);
}

public AnalysisJob findJob(long id) {
return idToAnalysisJob.get(id);
}

public void constructJob(AnalysisInfo jobInfo, Collection<? extends BaseAnalysisTask> tasks) {
AnalysisJob job = new AnalysisJob(jobInfo, tasks);
idToAnalysisJob.put(jobInfo.jobId, job);
new AnalysisJob(jobInfo, tasks);
}

public void removeJob(long id) {
idToAnalysisJob.remove(id);
public void removeJob(AnalysisInfo jobInfo) {
analysisJobIdToTaskMap.remove(jobInfo.jobId);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -221,4 +221,12 @@ protected void syncLoadStats() {
Assertions.assertEquals(1, job.queryFinished.size());
}

@Test
public void testDeregisterJob(@Mocked AnalysisInfo analysisInfo) {
Env.getCurrentEnv().getAnalysisManager().analysisJobIdToTaskMap.put(0L, Collections.emptyMap());
AnalysisJob job = new AnalysisJob(analysisInfo, Collections.emptyList());
job.deregisterJob();
Assertions.assertEquals(0, Env.getCurrentEnv().getAnalysisManager().analysisJobIdToTaskMap.size());
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -380,6 +380,7 @@ public void testEvict() {
columnStatisticsCache.get(1);
columnStatisticsCache.get(2);
Assertions.assertTrue(columnStatisticsCache.synchronous().asMap().containsKey(2));
Assertions.assertEquals(1, columnStatisticsCache.synchronous().asMap().size());
// unstable
// Assertions.assertEquals(1, columnStatisticsCache.synchronous().asMap().size());
}
}