H2 Console: The progress display when opening a database has been improved.

h2/src/main/org/h2/server/web/WebThread.java

@@ -1115,16 +1115,16 @@ class WebThread extends Thread implements DatabaseEventListener {
             }
 
             public void setProgress(int state, String name, int x, int max) {
-                name = PageParser.escapeHtml(name);
                 if (state == listenerLastState) {
                     long time = System.currentTimeMillis();
-                    if (listenerLastEvent + 500 < time) {
+                    if (time < listenerLastEvent + 1000) {
                         return;
                     }
                     listenerLastEvent = time;
                 } else {
                     listenerLastState = state;
                 }
+                name = PageParser.escapeHtml(name);
                 switch (state) {
                 case DatabaseEventListener.STATE_BACKUP_FILE:
                     log("Backing up " + name + " " + (100L * x / max) + "%");

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

@@ -187,7 +187,7 @@ public class TableData extends Table implements RecordReader {
                 int bufferSize = Constants.DEFAULT_MAX_MEMORY_ROWS;
                 ObjectArray buffer = new ObjectArray(bufferSize);
                 while (cursor.next()) {
-                    database.setProgress(DatabaseEventListener.STATE_CREATE_INDEX, getName(), MathUtils
+                    database.setProgress(DatabaseEventListener.STATE_CREATE_INDEX, getName() + ":" + index.getName(), MathUtils
                             .convertLongToInt(i++), MathUtils.convertLongToInt(total));
                     Row row = cursor.get();
                     // index.add(session, row);

h2/src/test/org/h2/test/db/TestOpenClose.java

@@ -164,7 +164,7 @@ public class TestOpenClose extends TestBase implements DatabaseEventListener {
             break;
         case STATE_CREATE_INDEX:
             stateName = "Create Index " + name + " " + current + "/" + max;
-            if (!"SYS".equals(name)) {
+            if (!"SYS:SYS_ID".equals(name)) {
                 throw new Error("unexpected: " + stateName);
             }
             break;