Opening a connection with AUTO_SERVER=TRUE is now fast.

h2/src/main/org/h2/engine/Database.java

@@ -220,7 +220,13 @@ public class Database implements DataHandler {
             }
         } catch (Exception e) {
             if (traceSystem != null) {
-                traceSystem.getTrace(Trace.DATABASE).error("opening " + databaseName, e);
+                if (e instanceof SQLException) {
+                    SQLException e2 = (SQLException) e;
+                    if (e2.getErrorCode() != ErrorCode.DATABASE_ALREADY_OPEN_1) {
+                        // only write if the database is not already in use
+                        traceSystem.getTrace(Trace.DATABASE).error("opening " + databaseName, e);
+                    }
+                }
                 traceSystem.close();
             }
             closeOpenFilesAndUnlock();
@@ -495,13 +501,7 @@ public class Database implements DataHandler {
             if (FileUtils.exists(dataFileName)) {
                 // if it is already read-only because ACCESS_MODE_DATA=r
                 readOnly = readOnly | FileUtils.isReadOnly(dataFileName);
-                textStorage = isTextStorage(dataFileName, textStorage);
-                lobFilesInDirectories &= !ValueLob.existsLobFile(getDatabasePath());
-                lobFilesInDirectories |= FileUtils.exists(databaseName + Constants.SUFFIX_LOBS_DIRECTORY);
-            }
-        }
-        dummy = DataPage.create(this, 0);
-        if (persistent) {
+            }            
             if (readOnly) {
                 traceSystem = new TraceSystem(null, false);
             } else {
@@ -526,6 +526,12 @@ public class Database implements DataHandler {
                     startServer(lock.getUniqueId());
                 }
             }
+            if (FileUtils.exists(dataFileName)) {
+                textStorage = isTextStorage(dataFileName, textStorage);
+                lobFilesInDirectories &= !ValueLob.existsLobFile(getDatabasePath());
+                lobFilesInDirectories |= FileUtils.exists(databaseName + Constants.SUFFIX_LOBS_DIRECTORY);
+            }
+            dummy = DataPage.create(this, 0);            
             deleteOldTempFiles();
             log = new LogSystem(this, databaseName, readOnly, accessModeLog);
             openFileData();

h2/src/main/org/h2/engine/SessionRemote.java

@@ -56,6 +56,7 @@ public class SessionRemote implements SessionInterface, DataHandler {
     public static final int SESSION_PREPARE_READ_PARAMS = 11;
     public static final int SESSION_SET_ID = 12;
     public static final int SESSION_CANCEL_STATEMENT = 13;
+    public static final int SESSION_CHECK_KEY = 14;
 
     public static final int STATUS_ERROR = 0;
     public static final int STATUS_OK = 1;

h2/src/main/org/h2/server/TcpServerThread.java

@@ -83,8 +83,17 @@ public class TcpServerThread implements Runnable {
                     int command = transfer.readInt();
                     stop = true;
                     if (command == SessionRemote.SESSION_CANCEL_STATEMENT) {
+                        // cancel a running statement
                         int statementId = transfer.readInt();
                         server.cancelStatement(sessionId, statementId);
+                    } else if (command == SessionRemote.SESSION_CHECK_KEY) {
+                        // check if this is the correct server
+                        db = server.checkKeyAndGetDatabaseName(sessionId);
+                        if (!sessionId.equals(db)) {
+                            transfer.writeInt(SessionRemote.STATUS_OK);
+                        } else {
+                            transfer.writeInt(SessionRemote.STATUS_ERROR);
+                        }
                     }
                 }
                 String baseDir = server.getBaseDir();

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

@@ -19,6 +19,8 @@ import java.util.Properties;
 
 import org.h2.constant.ErrorCode;
 import org.h2.constant.SysProperties;
+import org.h2.engine.Constants;
+import org.h2.engine.SessionRemote;
 import org.h2.jdbc.JdbcSQLException;
 import org.h2.message.Message;
 import org.h2.message.Trace;
@@ -28,6 +30,7 @@ import org.h2.util.ByteUtils;
 import org.h2.util.NetUtils;
 import org.h2.util.RandomUtils;
 import org.h2.util.SortedProperties;
+import org.h2.value.Transfer;
 
 /**
  * The file lock is used to lock a database so that only one process can write
@@ -120,6 +123,7 @@ public class FileLock {
     public synchronized void lock(String fileName, boolean allowSocket) throws SQLException {
         this.fs = FileSystem.getInstance(fileName);
         this.fileName = fileName;
+        checkServer();
         if (locked) {
             throw Message.getInternalError("already locked");
         }
@@ -204,6 +208,43 @@ public class FileLock {
             throw getException(e);
         }
     }
+    
+    private void checkServer() throws SQLException {
+        Properties prop = load();
+        String server = prop.getProperty("server");
+        if (server == null) {
+            return;
+        }
+        boolean running = false;
+        String id = prop.getProperty("id");
+        try {
+            Socket socket = NetUtils.createSocket(server, Constants.DEFAULT_SERVER_PORT, false);
+            Transfer transfer = new Transfer(null);
+            transfer.setSocket(socket);
+            transfer.init();
+            transfer.writeInt(Constants.TCP_PROTOCOL_VERSION_6);
+            transfer.writeInt(Constants.TCP_PROTOCOL_VERSION_6);
+            transfer.writeString(null);
+            transfer.writeString(null);
+            transfer.writeString(id);
+            transfer.writeInt(SessionRemote.SESSION_CHECK_KEY);
+            transfer.flush();
+            int state = transfer.readInt();
+            if (state == SessionRemote.STATUS_OK) {
+                running = true;
+            }
+            transfer.close();
+            socket.close();
+        } catch (IOException e) {
+            return;
+        }
+        if (running) {
+            String payload = server + "/" + id;
+            JdbcSQLException ex = Message.getSQLException(ErrorCode.DATABASE_ALREADY_OPEN_1, "Server is running");
+            ex.setPayload(payload);
+            throw ex;
+        }
+    }
 
     private Properties load() throws SQLException {
         try {

h2/src/test/org/h2/test/server/TestAutoServer.java

@@ -59,7 +59,6 @@ public class TestAutoServer extends TestBase {
         if (i <= 0) {
             fail();
         }
-        
         Connection conn = getConnection(url + ";OPEN_NEW=TRUE");
         Statement stat = conn.createStatement();
         if (config.big) {