Call System.currentTimeMillis() less often.

h2/src/main/org/h2/store/PageStore.java

@@ -477,9 +477,6 @@ public class PageStore implements CacheWriter {
                         }
                         if (compact(full, free)) {
                             j++;
-                        }
-                    }
-                }
                             long now = System.currentTimeMillis();
                             if (now > start + maxCompactTime) {
                                 j = maxMove;
@@ -487,6 +484,9 @@ public class PageStore implements CacheWriter {
                             }
                         }
                     }
+                }
+            }
+        }
         // TODO can most likely be simplified
         checkpoint();
         log.checkpoint();

h2/src/main/org/h2/table/RegularTable.java

@@ -422,7 +422,8 @@ public class RegularTable extends TableBase {
 
     private void doLock(Session session, int lockMode, boolean exclusive) {
         traceLock(session, exclusive, "requesting for");
-        long max = System.currentTimeMillis() + session.getLockTimeout();
+        // don't get the current time unless necessary
+        long max = 0;
         boolean checkDeadlock = false;
         while (true) {
             if (lockExclusive == session) {
@@ -473,7 +474,10 @@ public class RegularTable extends TableBase {
                 checkDeadlock = true;
             }
             long now = System.currentTimeMillis();
-            if (now >= max) {
+            if (max == 0) {
+                // try at least one more time
+                max = now + session.getLockTimeout();
+            } else if (now >= max) {
                 traceLock(session, exclusive, "timeout after " + session.getLockTimeout());
                 throw DbException.get(ErrorCode.LOCK_TIMEOUT_1, getName());
             }