Db2 forupdate fix

ebean-test/src/test/java/org/tests/basic/TestQueryForUpdate.java

@@ -39,6 +39,56 @@ public void testForUpdate() {
  }
  }
 
+ @Test
+ public void testConcurrentForUpdate() throws InterruptedException {
+
+ ResetBasicData.reset();
+
+ Thread t1 = new Thread() {
+ @Override
+ public void run() {
+ try (final Transaction transaction = DB.beginTransaction()) {
+ System.out.println("Thread: before find");
+ DB.find(Customer.class)
+ .forUpdate()
+ // .orderBy().desc("1") // this would help by the locks in DB2
+ .findList();
+
+ System.out.println("Thread: after find");
+ try {
+ Thread.sleep(3000);
+ } catch (InterruptedException e) {
+ throw new RuntimeException(e);
+ }
+ System.out.println("Thread: done");
+ }
+ }
+ };
+
+ t1.start();
+
+ Thread.sleep(100);
+
+ long start = System.currentTimeMillis();
+ try (final Transaction transaction = DB.beginTransaction()) {
+ if (isH2()) {
+ DB.sqlUpdate("SET LOCK_TIMEOUT 5000").execute();
+ }
+ System.out.println("Main: before find");
+ DB.find(Customer.class)
+ .forUpdate()
+ //.orderBy().desc("1") // this would help by the locks in DB2
+ .findList();
+
+ System.out.println("Main: after find");
+ }
+
+ start = System.currentTimeMillis() - start;
+
+ assertThat(start).isGreaterThan(2800);
+
+ }
+
  @Test
  public void testForUpdate_withLimit() {
  ResetBasicData.reset();

platforms/db2/src/main/java/io/ebean/platform/db2/BaseDB2Platform.java

@@ -57,6 +57,6 @@ public PlatformIdGenerator createSequenceIdGenerator(BackgroundExecutor be, Data
  @Override
  protected String withForUpdate(String sql, Query.LockWait lockWait, Query.LockType lockType) {
  // NOWAIT and SKIP LOCKED not supported with Db2
- return sql + " for update";
+ return sql + " with rs use and keep update locks";
  }
 }