Merge pull request #423 from IBM/Albert-Master-New2

issue #396 fix for derby dead lock issue

Author: prb112

fhir-persistence-schema/src/main/java/com/ibm/fhir/schema/control/FhirResourceGroup.java

@@ -159,6 +159,11 @@ public void addLogicalResources(List<IDatabaseObject> group, String prefix) {
                 .setTablespace(fhirTablespace)
                 .addPrivileges(resourceTablePrivileges)
                 .enableAccessControl(this.sessionVariable)
+                // Add indexes to avoid dead lock issue of derby, and improve Db2 performance
+                // Derby requires all columns used in where clause to be indexed, otherwise whole table lock will be
+                // used instead of row lock, which can cause dead lock issue frequently during concurrent accesses.
+                .addIndex(IDX + tableName + CURRENT_RESOURCE_ID, CURRENT_RESOURCE_ID)
+                .addIndex(IDX + tableName + LOGICAL_ID, LOGICAL_ID)
                 .build(model);
 
         group.add(tbl);