select first to not increment primary key foreign key constraint viol…

…ation with h2
kono · Sep 23, 2016 · fb7f32d · fb7f32d
1 parent ea2c87a
commit fb7f32d
Showing 1 changed file with 25 additions and 23 deletions.
diff --git a/digdag-core/src/main/java/io/digdag/core/database/DatabaseSessionStoreManager.java b/digdag-core/src/main/java/io/digdag/core/database/DatabaseSessionStoreManager.java
@@ -965,33 +965,35 @@ public <T> T putAndLockSession(Session session, SessionLockAction<T> func)
             return DatabaseSessionStoreManager.this.<T, ResourceConflictException, ResourceNotFoundException>transaction((handle, dao) -> {
                 StoredSession storedSession;
 
-                if (dao instanceof H2Dao) {
-                    catchForeignKeyNotFound(
-                        () -> {
-                            ((H2Dao) dao).upsertAndLockSession(
+                // select first so that conflicting insert (postgresql) or foreign key constraint violation (h2)
+                // doesn't increment sequence of primary key unnecessarily
+                storedSession = dao.getSessionByConflictedNamesInternal(
+                        session.getProjectId(),
+                        session.getWorkflowName(),
+                        session.getSessionTime().getEpochSecond());
+
+                if (storedSession == null) {
+                    if (dao instanceof H2Dao) {
+                        catchForeignKeyNotFound(
+                            () -> {
+                                ((H2Dao) dao).upsertAndLockSession(
+                                    session.getProjectId(),
+                                    session.getWorkflowName(),
+                                    session.getSessionTime().getEpochSecond());
+                                return 0;
+                            },
+                            "project id=%d", session.getProjectId());
+                        storedSession = dao.getSessionByConflictedNamesInternal(
                                 session.getProjectId(),
                                 session.getWorkflowName(),
                                 session.getSessionTime().getEpochSecond());
-                            return 0;
-                        },
-                        "project id=%d", session.getProjectId());
-                    storedSession = dao.getSessionByConflictedNamesInternal(
-                            session.getProjectId(),
-                            session.getWorkflowName(),
-                            session.getSessionTime().getEpochSecond());
-                    if (storedSession == null) {
-                        throw new IllegalStateException(String.format(ENGLISH,
-                                    "Database state error: locked session is null: project_id=%d, workflow_name=%s, session_time=%d",
-                                    session.getProjectId(), session.getWorkflowName(), session.getSessionTime().getEpochSecond()));
+                        if (storedSession == null) {
+                            throw new IllegalStateException(String.format(ENGLISH,
+                                        "Database state error: locked session is null: project_id=%d, workflow_name=%s, session_time=%d",
+                                        session.getProjectId(), session.getWorkflowName(), session.getSessionTime().getEpochSecond()));
+                        }
                     }
-                }
-                else {
-                    // select first so that conflicting insert doesn't increment sequence of primary key unnecessarily
-                    storedSession = dao.getSessionByConflictedNamesInternal(
-                            session.getProjectId(),
-                            session.getWorkflowName(),
-                            session.getSessionTime().getEpochSecond());
-                    if (storedSession == null) {
+                    else {
                         storedSession = catchForeignKeyNotFound(
                                 () -> ((PgDao) dao).upsertAndLockSession(
                                     session.getProjectId(),