Set index on query that looks for dead jobs

Co-authored-by: Henning Strueber <henning.strueber@otto.de>
otto-de · Jul 11, 2018 · b06300a · b06300a
1 parent d92ed33
commit b06300a
Showing 1 changed file with 23 additions and 23 deletions.
diff --git a/edison-mongo/src/main/java/de/otto/edison/mongo/jobs/MongoJobRepository.java b/edison-mongo/src/main/java/de/otto/edison/mongo/jobs/MongoJobRepository.java
@@ -1,10 +1,10 @@
 package de.otto.edison.mongo.jobs;
 
-import com.mongodb.BasicDBObject;
 import com.mongodb.client.MongoCollection;
 import com.mongodb.client.MongoDatabase;
-import com.mongodb.client.model.DeleteOptions;
 import com.mongodb.client.model.Filters;
+import com.mongodb.client.model.IndexOptions;
+import com.mongodb.client.model.Indexes;
 import de.otto.edison.jobs.domain.JobInfo;
 import de.otto.edison.jobs.domain.JobInfo.JobStatus;
 import de.otto.edison.jobs.domain.JobMessage;
@@ -21,9 +21,7 @@
 
 import static com.mongodb.ReadPreference.primaryPreferred;
 import static com.mongodb.client.model.Filters.eq;
-import static com.mongodb.client.model.Updates.combine;
-import static com.mongodb.client.model.Updates.push;
-import static com.mongodb.client.model.Updates.set;
+import static com.mongodb.client.model.Updates.*;
 import static de.otto.edison.jobs.domain.JobInfo.newJobInfo;
 import static de.otto.edison.jobs.domain.JobMessage.jobMessage;
 import static java.time.Clock.systemDefaultZone;
@@ -224,8 +222,10 @@ protected final MongoCollection<Document> collection() {
 
     @Override
     protected final void ensureIndexes() {
-        collection().createIndex(new BasicDBObject(JobStructure.JOB_TYPE.key(), 1));
-        collection().createIndex(new BasicDBObject(JobStructure.STARTED.key(), 1));
+        IndexOptions options = new IndexOptions().background(true);
+        collection().createIndex(Indexes.ascending(JobStructure.JOB_TYPE.key()), options);
+        collection().createIndex(Indexes.ascending(JobStructure.STARTED.key()), options);
+        collection().createIndex(Indexes.ascending(JobStructure.LAST_UPDATED.key(), JobStructure.STOPPED.key()), options);
     }
 
     private String getMessage(final Document document) {
@@ -244,27 +244,27 @@ private Document orderByStarted(final int order) {
         return new Document(JobStructure.STARTED.key(), order);
     }
 
-	@Override
-	public List<JobInfo> findAllJobInfoWithoutMessages() {
+    @Override
+    public List<JobInfo> findAllJobInfoWithoutMessages() {
         return collection()
                 .find()
                 .maxTime(500, TimeUnit.MILLISECONDS)
                 .projection(new Document(getJobInfoWithoutMessagesProjection()))
                 .map(this::decode)
                 .into(new ArrayList<>());
-	}
-	
-	private Map<String, Object> getJobInfoWithoutMessagesProjection() {
-		final Map<String, Object> projection = new HashMap<>();
-		projection.put(JobStructure.ID.key(), true);
-		projection.put(JobStructure.JOB_TYPE.key(), true);
-		projection.put(JobStructure.STARTED.key(), true);
-		projection.put(JobStructure.LAST_UPDATED.key(), true);
-		projection.put(JobStructure.STOPPED.key(), true);
-		projection.put(JobStructure.STATUS.key(), true);
-		projection.put(JobStructure.HOSTNAME.key(), true);
-		return projection;
-		
-	}
+    }
+
+    private Map<String, Object> getJobInfoWithoutMessagesProjection() {
+        final Map<String, Object> projection = new HashMap<>();
+        projection.put(JobStructure.ID.key(), true);
+        projection.put(JobStructure.JOB_TYPE.key(), true);
+        projection.put(JobStructure.STARTED.key(), true);
+        projection.put(JobStructure.LAST_UPDATED.key(), true);
+        projection.put(JobStructure.STOPPED.key(), true);
+        projection.put(JobStructure.STATUS.key(), true);
+        projection.put(JobStructure.HOSTNAME.key(), true);
+        return projection;
+
+    }
 
 }