honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

changed end back to primitive long 

renamed private method

Original commit: elastic/x-pack-elasticsearch@fc1849dbc6
This commit is contained in:
Martijn van Groningen 2016-12-09 15:56:22 +01:00
parent de9dbdabe1
commit a85dfcd91f
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
elasticsearch/src/main/java/org/elasticsearch/xpack/prelert/action/GetJobsAction.java
View File

@ -505,7 +505,7 @@ public class GetJobsAction extends Action<GetJobsAction.Request, GetJobsAction.R
Job jobConfig = request.config() ? jobs.results().get(0) : null; Job jobConfig = request.config() ? jobs.results().get(0) : null;
DataCounts dataCounts = readDataCounts(request.dataCounts(), request.getJobId()); DataCounts dataCounts = readDataCounts(request.dataCounts(), request.getJobId());
ModelSizeStats modelSizeStats = readModelSizeStats(request.modelSizeStats(), request.getJobId()); ModelSizeStats modelSizeStats = readModelSizeStats(request.modelSizeStats(), request.getJobId());
SchedulerStatus schedulerStatus = readSchedulerState(request.schedulerStatus(), request.getJobId()); SchedulerStatus schedulerStatus = readSchedulerStatus(request.schedulerStatus(), request.getJobId());
JobStatus jobStatus = readJobStatus(request.status(), request.getJobId()); JobStatus jobStatus = readJobStatus(request.status(), request.getJobId());
Response.JobInfo jobInfo = new Response.JobInfo( Response.JobInfo jobInfo = new Response.JobInfo(
@ -522,7 +522,7 @@ public class GetJobsAction extends Action<GetJobsAction.Request, GetJobsAction.R
Job jobConfig = request.config() ? job : null; Job jobConfig = request.config() ? job : null;
DataCounts dataCounts = readDataCounts(request.dataCounts(), job.getId()); DataCounts dataCounts = readDataCounts(request.dataCounts(), job.getId());
ModelSizeStats modelSizeStats = readModelSizeStats(request.modelSizeStats(), job.getId()); ModelSizeStats modelSizeStats = readModelSizeStats(request.modelSizeStats(), job.getId());
SchedulerStatus schedulerStatus = readSchedulerState(request.schedulerStatus(), job.getId()); SchedulerStatus schedulerStatus = readSchedulerStatus(request.schedulerStatus(), job.getId());
JobStatus jobStatus = readJobStatus(request.status(), job.getId()); JobStatus jobStatus = readJobStatus(request.status(), job.getId());
Response.JobInfo jobInfo = new Response.JobInfo(job.getId(), jobConfig, dataCounts, modelSizeStats, Response.JobInfo jobInfo = new Response.JobInfo(job.getId(), jobConfig, dataCounts, modelSizeStats,
schedulerStatus, jobStatus); schedulerStatus, jobStatus);
@ -557,7 +557,7 @@ public class GetJobsAction extends Action<GetJobsAction.Request, GetJobsAction.R
return null; return null;
} }
private SchedulerStatus readSchedulerState(boolean schedulerState, String jobId) { private SchedulerStatus readSchedulerStatus(boolean schedulerState, String jobId) {
return schedulerState ? jobManager.getSchedulerStatus(jobId).orElse(null) : null; return schedulerState ? jobManager.getSchedulerStatus(jobId).orElse(null) : null;
} }

2
elasticsearch/src/main/java/org/elasticsearch/xpack/prelert/job/scheduler/ScheduledJob.java
View File

@ -112,7 +112,7 @@ class ScheduledJob {
return running; return running;
} }
private void run(long start, Long end, FlushJobAction.Request flushRequest) throws IOException { private void run(long start, long end, FlushJobAction.Request flushRequest) throws IOException {
if (end <= start) { if (end <= start) {
return; return;
} }