Merge pull request #2410 from IBM/robin-perf-eval

issue 2405 fix version concurrency issue for Derby
LinuxForHealth · May 21, 2021 · 5002d1e · 5002d1e
2 parents 31e51de + e4d25ab
commit 5002d1e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/fhir-database-utils/src/main/java/com/ibm/fhir/database/utils/derby/DerbyTranslator.java b/fhir-database-utils/src/main/java/com/ibm/fhir/database/utils/derby/DerbyTranslator.java
@@ -29,7 +29,7 @@ public class DerbyTranslator implements IDatabaseTranslator {
 
     @Override
     public String addForUpdate(String sql) {
-        return sql + " FOR UPDATE";
+        return sql + " FOR UPDATE WITH RS";
     }
 
     @Override

diff --git a/...-persistence-jdbc/src/main/java/com/ibm/fhir/persistence/jdbc/derby/DerbyResourceDAO.java b/...-persistence-jdbc/src/main/java/com/ibm/fhir/persistence/jdbc/derby/DerbyResourceDAO.java
@@ -222,7 +222,7 @@ public long storeResource(String tablePrefix, List<ExtractedParameterValue> para
         }
 
         // Get a lock at the system-wide logical resource level. Note the Derby-specific syntax
-        final String SELECT_FOR_UPDATE = "SELECT logical_resource_id FROM logical_resources WHERE resource_type_id = ? AND logical_id = ? FOR UPDATE";
+        final String SELECT_FOR_UPDATE = "SELECT logical_resource_id FROM logical_resources WHERE resource_type_id = ? AND logical_id = ? FOR UPDATE WITH RS";
         try (PreparedStatement stmt = conn.prepareStatement(SELECT_FOR_UPDATE)) {
             stmt.setInt(1, v_resource_type_id);
             stmt.setString(2, p_logical_id);