Optimise deleteByTypeAndClient method

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
+## 1.8.0 - 2022-04-29
+- Add index definition for `deleteByTypeAndClient`
+- `deleteByTypeAndClient` is now more performant without sorting in the query
+
 ## 1.7.0 - 2022-04-19
 - `deleteOlderThan` method on `ActionRepository` now forces use of a primitive for batch size.
 - Begin returning the number of rows deleted from deletion methods in `ActionRepository`

gradle.properties

@@ -1,2 +1,2 @@
 group=com.transferwise.idempotence4j
-version=1.7.0
+version=1.8.0

idempotence4j-mariadb/src/main/java/com/transferwise/idempotence4j/mariadb/JdbcMariaDbActionRepository.java

@@ -137,7 +137,6 @@ public int[] deleteByIds(List<ActionId> actionIdList) {
         "DELETE FROM idempotent_action " +
             "WHERE type = :type " +
             "  AND client = :client " +
-            "ORDER BY created_at ASC " +
             "LIMIT :limit";
 
     private final static String DELETE_BY_ACTION_ID_SQL =

idempotence4j-mariadb/src/main/resources/db/idempotence4j/mariadb/V20220429110000__add_idempotent_action_type_client_index.sql

@@ -0,0 +1,2 @@
+CREATE INDEX IF NOT EXISTS IDX_IDEMPOTENT_ACTION_TYPE_CLIENT
+    ON idempotent_action (type, client);

idempotence4j-mariadb/src/test-integration/groovy/com/transferwise/idempotence4j/mariadb/JdbcMariaDbActionRepositoryIntegrationTest.groovy

@@ -104,14 +104,11 @@ class JdbcMariaDbActionRepositoryIntegrationTest extends IntegrationTest {
             }
         and:
             List<ActionId> actionIds = actions.each { it -> repository.insertOrGet(it) } .collect({ it.actionId })
-            def firstHalfActionIds = actionIds.dropRight(actions.size() / 2 as int)
-            def lastHalfActionIds = actionIds.drop(actions.size() / 2 as int)
         when:
             int firstDeletionCount = repository.deleteByTypeAndClient(TYPE, CLIENT, 5)
         then:
             firstDeletionCount == 5
-            firstHalfActionIds.each { ActionId it -> assert repository.find(it).isEmpty() }
-            lastHalfActionIds.each { ActionId it -> assert !repository.find(it).isEmpty() }
+            actionIds.findAll { repository.find(it).isEmpty() }.size() == 5
         when:
             int secondDeletionCount = repository.deleteByTypeAndClient(TYPE, CLIENT, 5)
         then:

idempotence4j-postgres/src/main/java/com/transferwise/idempotence4j/postgres/JdbcPostgresActionRepository.java

@@ -148,7 +148,6 @@ public int[] deleteByIds(List<ActionId> actionIds) {
             "WHERE " +
             "type = :type " +
             "AND client = :client " +
-            "ORDER BY created_at ASC " +
             "LIMIT :limit";
 
     private final static String DELETE_BY_ACTION_ID_SQL =

idempotence4j-postgres/src/main/resources/db/idempotence4j/postgres/V20220429110000__add_idempotent_action_type_client_index.sql

@@ -0,0 +1,2 @@
+CREATE INDEX CONCURRENTLY IF NOT EXISTS IDX_IDEMPOTENT_ACTION_TYPE_CLIENT
+    ON idempotent_action (type, client);

idempotence4j-postgres/src/test-integration/groovy/com/transferwise/idempotence4j/postgres/JdbcPostgresActionRepositoryIntegrationTest.groovy

@@ -106,14 +106,11 @@ class JdbcPostgresActionRepositoryIntegrationTest extends IntegrationTest {
             }
         and:
             List<ActionId> actionIds = actions.each { it -> repository.insertOrGet(it) } .collect({ it.actionId })
-            def firstHalfActionIds = actionIds.dropRight(actions.size() / 2 as int)
-            def lastHalfActionIds = actionIds.drop(actions.size() / 2 as int)
         when:
             int firstDeletionCount = repository.deleteByTypeAndClient(TYPE, CLIENT, 5)
         then:
             firstDeletionCount == 5
-            firstHalfActionIds.each { ActionId it -> assert repository.find(it).isEmpty() }
-            lastHalfActionIds.each { ActionId it -> assert !repository.find(it).isEmpty() }
+            actionIds.findAll { repository.find(it).isEmpty() }.size() == 5
         when:
             int secondDeletionCount = repository.deleteByTypeAndClient(TYPE, CLIENT, 5)
         then: