Mirror/MarginaliaSearch
1
0
Fork 0
mirror of https://github.com/MarginaliaSearch/MarginaliaSearch.git synced 2025-02-24 05:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

(mq) MqPersistence no longer relies on autoCommit being enabled

Browse Source
This commit is contained in:
Viktor Lofgren 2023-08-09 14:23:22 +02:00
parent 251fc63b42
commit b5ed21be21
1 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
code/common/message-queue/src/main/java/nu/marginalia/mq/persistence/MqPersistence.java
View File

@ -67,6 +67,10 @@ public class MqPersistence {
else stmt.setLong(6, ttl.toSeconds()); else stmt.setLong(6, ttl.toSeconds());
stmt.executeUpdate(); stmt.executeUpdate();
if (!conn.getAutoCommit())
conn.commit();
var rsp = lastIdQuery.executeQuery(); var rsp = lastIdQuery.executeQuery();
if (!rsp.next()) { if (!rsp.next()) {
@ -104,6 +108,9 @@ public class MqPersistence {
if (stmt.executeUpdate() != 1) { if (stmt.executeUpdate() != 1) {
throw new IllegalArgumentException("No rows updated"); throw new IllegalArgumentException("No rows updated");
} }
if (!conn.getAutoCommit())
conn.commit();
} }
} }
@ -124,6 +131,9 @@ public class MqPersistence {
if (stmt.executeUpdate() != 1) { if (stmt.executeUpdate() != 1) {
throw new IllegalArgumentException("No rows updated"); throw new IllegalArgumentException("No rows updated");
} }
if (!conn.getAutoCommit())
conn.commit();
} }
} }
@ -199,7 +209,10 @@ public class MqPersistence {
updateStmt.setLong(2, tick); updateStmt.setLong(2, tick);
updateStmt.setString(3, inboxName); updateStmt.setString(3, inboxName);
updateStmt.setInt(4, n); updateStmt.setInt(4, n);
return updateStmt.executeUpdate(); var ret = updateStmt.executeUpdate();
if (!conn.getAutoCommit())
conn.commit();
return ret;
} }
} }
@ -429,6 +442,10 @@ public class MqPersistence {
stmt.setInt(2, tick); stmt.setInt(2, tick);
stmt.setLong(3, id); stmt.setLong(3, id);
stmt.executeUpdate(); stmt.executeUpdate();
if (!conn.getAutoCommit())
conn.commit();
} catch (SQLException e) { } catch (SQLException e) {
throw new RuntimeException(e); throw new RuntimeException(e);
} }
@ -445,7 +462,10 @@ public class MqPersistence {
AND TTL IS NOT NULL AND TTL IS NOT NULL
AND TIMESTAMPDIFF(SECOND, UPDATED_TIME, CURRENT_TIMESTAMP(6)) > TTL AND TIMESTAMPDIFF(SECOND, UPDATED_TIME, CURRENT_TIMESTAMP(6)) > TTL
""")) { """)) {
return setToDead.executeUpdate(); int ret = setToDead.executeUpdate();
if (!conn.getAutoCommit())
conn.commit();
return ret;
} }
} }
@ -458,7 +478,10 @@ public class MqPersistence {
AND TTL IS NOT NULL AND TTL IS NOT NULL
AND TIMESTAMPDIFF(SECOND, UPDATED_TIME, CURRENT_TIMESTAMP(6)) > 3600 AND TIMESTAMPDIFF(SECOND, UPDATED_TIME, CURRENT_TIMESTAMP(6)) > 3600
""")) { """)) {
return setToDead.executeUpdate(); int ret = setToDead.executeUpdate();
if (!conn.getAutoCommit())
conn.commit();
return ret;
} }
} }
} }