Fix index creation statements in MongoDB DDL script

Signed-off-by: yoseplee <[email protected]>
spring-projects · Feb 25, 2025 · a79b6f7 · a79b6f7
1 parent 9fbdf1e
commit a79b6f7
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 6 deletions.
diff --git a/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-mongodb.js b/spring-batch-core/src/main/resources/org/springframework/batch/core/schema-mongodb.js
@@ -10,9 +10,9 @@ db.getCollection("BATCH_SEQUENCES").insertOne({_id: "BATCH_JOB_EXECUTION_SEQ", c
 db.getCollection("BATCH_SEQUENCES").insertOne({_id: "BATCH_STEP_EXECUTION_SEQ", count: Long(0)});
 
 // INDICES
-db.getCollection("BATCH_JOB_INSTANCE").createIndex("job_name_idx", {"jobName": 1}, {});
-db.getCollection("BATCH_JOB_INSTANCE").createIndex("job_name_key_idx", {"jobName": 1, "jobKey": 1}, {});
-db.getCollection("BATCH_JOB_INSTANCE").createIndex("job_instance_idx", {"jobInstanceId": -1}, {});
-db.getCollection("BATCH_JOB_EXECUTION").createIndex("job_instance_idx", {"jobInstanceId": 1}, {});
-db.getCollection("BATCH_JOB_EXECUTION").createIndex("job_instance_idx", {"jobInstanceId": 1, "status": 1}, {});
-db.getCollection("BATCH_STEP_EXECUTION").createIndex("step_execution_idx", {"stepExecutionId": 1}, {});
+db.getCollection("BATCH_JOB_INSTANCE").createIndex( {"jobName": 1}, {"name": "job_name_idx"});
+db.getCollection("BATCH_JOB_INSTANCE").createIndex( {"jobName": 1, "jobKey": 1}, {"name": "job_name_key_idx"});
+db.getCollection("BATCH_JOB_INSTANCE").createIndex( {"jobInstanceId": -1}, {"name": "job_instance_idx"});
+db.getCollection("BATCH_JOB_EXECUTION").createIndex( {"jobInstanceId": 1}, {"name": "job_instance_idx"});
+db.getCollection("BATCH_JOB_EXECUTION").createIndex( {"jobInstanceId": 1, "status": 1}, {"name": "job_instance_status_idx"});
+db.getCollection("BATCH_STEP_EXECUTION").createIndex( {"stepExecutionId": 1}, {"name": "step_execution_idx"});
diff --git a/...g/springframework/batch/core/repository/support/MongoDBJobRepositoryIntegrationTests.java b/...g/springframework/batch/core/repository/support/MongoDBJobRepositoryIntegrationTests.java
@@ -24,6 +24,8 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.mongodb.core.index.Index;
 import org.springframework.test.context.DynamicPropertyRegistry;
 import org.springframework.test.context.DynamicPropertySource;
 import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
@@ -64,16 +66,35 @@ static void setMongoDbConnectionString(DynamicPropertyRegistry registry) {
 
 	@BeforeEach
 	public void setUp() {
+		// collections
 		mongoTemplate.createCollection("BATCH_JOB_INSTANCE");
 		mongoTemplate.createCollection("BATCH_JOB_EXECUTION");
 		mongoTemplate.createCollection("BATCH_STEP_EXECUTION");
+		// sequences
 		mongoTemplate.createCollection("BATCH_SEQUENCES");
 		mongoTemplate.getCollection("BATCH_SEQUENCES")
 			.insertOne(new Document(Map.of("_id", "BATCH_JOB_INSTANCE_SEQ", "count", 0L)));
 		mongoTemplate.getCollection("BATCH_SEQUENCES")
 			.insertOne(new Document(Map.of("_id", "BATCH_JOB_EXECUTION_SEQ", "count", 0L)));
 		mongoTemplate.getCollection("BATCH_SEQUENCES")
 			.insertOne(new Document(Map.of("_id", "BATCH_STEP_EXECUTION_SEQ", "count", 0L)));
+		// indices
+		mongoTemplate.indexOps("BATCH_JOB_INSTANCE")
+			.ensureIndex(new Index().on("jobName", Sort.Direction.ASC).named("job_name_idx"));
+		mongoTemplate.indexOps("BATCH_JOB_INSTANCE")
+			.ensureIndex(new Index().on("jobName", Sort.Direction.ASC)
+				.on("jobKey", Sort.Direction.ASC)
+				.named("job_name_key_idx"));
+		mongoTemplate.indexOps("BATCH_JOB_INSTANCE")
+			.ensureIndex(new Index().on("jobInstanceId", Sort.Direction.DESC).named("job_instance_idx"));
+		mongoTemplate.indexOps("BATCH_JOB_EXECUTION")
+			.ensureIndex(new Index().on("jobInstanceId", Sort.Direction.ASC).named("job_instance_idx"));
+		mongoTemplate.indexOps("BATCH_JOB_EXECUTION")
+			.ensureIndex(new Index().on("jobInstanceId", Sort.Direction.ASC)
+				.on("status", Sort.Direction.ASC)
+				.named("job_instance_status_idx"));
+		mongoTemplate.indexOps("BATCH_STEP_EXECUTION")
+			.ensureIndex(new Index().on("stepExecutionId", Sort.Direction.ASC).named("step_execution_idx"));
 	}
 
 	@Test