--no commit message

--no commit message

h2/src/docsrc/html/mainWeb.html

@@ -17,13 +17,14 @@ h3 { margin-top: 0px; margin-bottom: 10px; }
 
 <h1>H2 Database Engine</h1>
 <p>
-Welcome to H2, the free SQL database. The main feature of H2 are:
+Welcome to H2, the Java SQL database. The main feature of H2 are:
 </p>
 <ul>
 <li>Very fast, free for everybody, source code is included
-</li><li>Written in Java; can be compiled with GCJ (Linux)
-</li><li>Embedded, Server and Cluster modes
-</li><li>JDBC and (partial) ODBC API; Web Client application
+</li><li>Embedded, server and cluster modes
+</li><li>JDBC and ODBC API; browser based Console application
+</li><li>Written in Java; can be compiled with GCJ and IKVM.NET
+</li><li>Small footprint: around 1 MB
 </li></ul>
 
 <table style="border: 0px; width: 395px;">

h2/src/docsrc/html/roadmap.html

@@ -60,6 +60,7 @@ Roadmap
 </li><li>Procedural language / script language (Javascript)
 </li><li>Change LOB mechanism (less files, keep index of lob files, point to files and row, delete unused files earlier, maybe bundle files into a tar file)
 </li><li>Clustering: recovery needs to becomes fully automatic. Global write lock feature.
+</li><li>Option for Java functions: constant/isDeterministic to allow early evaluation when all parameters are constant
 </li><li>Deferred integrity checking (DEFERRABLE INITIALLY DEFERRED)
 </li><li>Groovy Stored Procedures (http://groovy.codehaus.org/Groovy+SQL)
 </li><li>System table / function: cache usage
@@ -102,7 +103,6 @@ Roadmap
 </li><li>Include SMPT (mail) server (at least client) (alert on cluster failure, low disk space,...)
 </li><li>Drop with restrict (currently cascade is the default)
 </li><li>JSON parser and functions
-</li><li>Option for Java functions: constant/isDeterministic to allow early evaluation when all parameters are constant
 </li><li>Automatic collection of statistics (auto ANALYZE)
 </li><li>Server: client ping from time to time (to avoid timeout - is timeout a problem?)
 </li><li>Copy database: Tool with config GUI and batch mode, extensible (example: compare)

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

@@ -49,9 +49,10 @@ public interface Service {
     /**
      * Check if the service is running.
      *
+     * @param traceError if errors should be written
      * @return if the server is running
      */
-    boolean isRunning();
+    boolean isRunning(boolean traceError);
 
     /**
      * Check if remote connections are allowed.

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

@@ -224,7 +224,7 @@ public class TcpServer implements Service {
         stopManagementDb();
     }
 
-    public synchronized boolean isRunning() {
+    public synchronized boolean isRunning(boolean traceError) {
         if (serverSocket == null) {
             return false;
         }
@@ -233,6 +233,9 @@ public class TcpServer implements Service {
             s.close();
             return true;
         } catch (Exception e) {
+            if (traceError) {
+                traceError(e);
+            }
             return false;
         }
     }

h2/src/main/org/h2/server/ftp/FtpServer.java

@@ -205,7 +205,7 @@ public class FtpServer implements Service {
         serverSocket = null;
     }
 
-    public boolean isRunning() {
+    public boolean isRunning(boolean traceError) {
         if (serverSocket == null) {
             return false;
         }
@@ -214,6 +214,9 @@ public class FtpServer implements Service {
             s.close();
             return true;
         } catch (Exception e) {
+            if (traceError) {
+                traceError(e);
+            }
             return false;
         }
     }

h2/src/main/org/h2/server/pg/PgServer.java

@@ -172,7 +172,7 @@ public class PgServer implements Service {
         }
     }
 
-    public boolean isRunning() {
+    public boolean isRunning(boolean traceError) {
         if (serverSocket == null) {
             return false;
         }
@@ -181,6 +181,9 @@ public class PgServer implements Service {
             s.close();
             return true;
         } catch (Exception e) {
+            if (traceError) {
+                traceError(e);
+            }
             return false;
         }
     }

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

@@ -276,7 +276,7 @@ public class WebServer implements Service {
         }
     }
 
-    public boolean isRunning() {
+    public boolean isRunning(boolean traceError) {
         if (serverSocket == null) {
             return false;
         }
@@ -285,6 +285,9 @@ public class WebServer implements Service {
             s.close();
             return true;
         } catch (Exception e) {
+            if (traceError) {
+                traceError(e);
+            }
             return false;
         }
     }

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

@@ -572,15 +572,15 @@ class WebThread extends Thread implements DatabaseEventListener {
             } else {
                 throw Message.getInternalError(toolName);
             }
-            ByteArrayOutputStream bout = new ByteArrayOutputStream();
-            PrintStream out = new PrintStream(bout, false, "UTF-8");
-            tool.setPrintStream(out);
+            ByteArrayOutputStream outBuff = new ByteArrayOutputStream();
+            PrintStream out = new PrintStream(outBuff, false, "UTF-8");
+            tool.setOut(out);
             try {
                 tool.run(argList);
                 out.flush();
-                byte[] data = bout.toByteArray();
-                String result = new String(data, "UTF-8");
-                session.put("toolResult", PageParser.escapeHtml(result));
+                String o = new String(outBuff.toByteArray(), "UTF-8");
+                String result = PageParser.escapeHtml(o);
+                session.put("toolResult", result);
             } catch (Exception e) {
                 session.put("toolResult", getStackTrace(0, e, true));
             }

h2/src/main/org/h2/server/web/res/tools.jsp

@@ -32,11 +32,10 @@ function quote(x) {
     var q = '';
     for (var i=0; i<x.length; i++) {
         var c = x.charAt(i);
-        if(c == '"') {
-            q += '\\"';
-        } else {
-            q += c;
+        if(c == '"' || c == '\\') {
+            q += '\\';
         }
+        q += c;
     }
     return q;
 }

h2/src/main/org/h2/tools/Console.java

@@ -135,7 +135,7 @@ ShutdownHandler {
         // because some people don't look at the output,
         // but are wondering why nothing happens
         StartBrowser.openURL(web.getURL());
-        if (!web.isRunning()) {
+        if (!web.isRunning(true)) {
             exitCode = EXIT_ERROR;
         }
         return exitCode;
@@ -158,15 +158,15 @@ ShutdownHandler {
     }
 
     private void stopAll() {
-        if (web != null && web.isRunning()) {
+        if (web != null && web.isRunning(false)) {
             web.stop();
             web = null;
         }
-        if (tcp != null && tcp.isRunning()) {
+        if (tcp != null && tcp.isRunning(false)) {
             tcp.stop();
             tcp = null;
         }
-        if (pg != null && pg.isRunning()) {
+        if (pg != null && pg.isRunning(false)) {
             pg.stop();
             pg = null;
         }

h2/src/main/org/h2/tools/CreateCluster.java

@@ -128,10 +128,10 @@ public class CreateCluster extends Tool {
 
             String scriptFile = "backup.sql";
             Script sc = new Script();
-            sc.setPrintStream(out);
+            sc.setOut(out);
             sc.process(urlSource, user, password, scriptFile);
             RunScript runscript = new RunScript();
-            runscript.setPrintStream(out);
+            runscript.setOut(out);
             runscript.process(urlTarget, user, password, scriptFile, null, false);
             FileUtils.delete(scriptFile);
 

h2/src/main/org/h2/tools/Recover.java

@@ -161,7 +161,7 @@ public class Recover extends Tool implements DataHandler {
     private void traceError(String message, Throwable t) {
         out.println(message + ": " + t.toString());
         if (trace) {
-            t.printStackTrace();
+            t.printStackTrace(out);
         }
     }
 
@@ -272,7 +272,7 @@ public class Recover extends Tool implements DataHandler {
                     }
                     break;
                 } catch (Throwable e) {
-                    e.printStackTrace();
+                    e.printStackTrace(out);
                 }
             }
         }
@@ -688,21 +688,34 @@ public class Recover extends Tool implements DataHandler {
     }
 
     private void dumpData(String fileName) throws SQLException {
+        setDatabaseName(fileName.substring(0, fileName.length() - Constants.SUFFIX_DATA_FILE.length()));
+        try {
+            textStorage = Database.isTextStorage(fileName, false);
+            dumpData(fileName, textStorage, fileName, FileStore.HEADER_LENGTH);
+        } catch (SQLException e) {
+            traceError("Can not parse file header", e);
+            for (int i = 0; i < 256; i += 16) {
+                textStorage = (i % 2) == 0;
+                int offset = i / 2;
+                String out = fileName + (textStorage ? ".txt." : ".") + offset + ".data.db";
+                dumpData(fileName, textStorage, out, offset);
+            }
+        }
+    }
+    
+    private void dumpData(String fileName, boolean textStorage, String outputName, int offset) {
         PrintWriter writer = null;
         FileStore store = null;
         try {
-            setDatabaseName(fileName.substring(0, fileName.length() - Constants.SUFFIX_DATA_FILE.length()));
-            writer = getWriter(fileName, ".sql");
+            writer = getWriter(outputName, ".sql");
             writer.println("CREATE ALIAS IF NOT EXISTS READ_CLOB FOR \"" + this.getClass().getName() + ".readClob\";");
             writer.println("CREATE ALIAS IF NOT EXISTS READ_BLOB FOR \"" + this.getClass().getName() + ".readBlob\";");
             ObjectArray schema = new ObjectArray();
             HashSet objectIdSet = new HashSet();
             HashMap tableMap = new HashMap();
-            textStorage = Database.isTextStorage(fileName, false);
             byte[] magic = Database.getMagic(textStorage);
             store = FileStore.open(null, fileName, "r", magic);
             long length = store.length();
-            int offset = FileStore.HEADER_LENGTH;
             int blockSize = DiskFile.BLOCK_SIZE;
             int blocks = (int) (length / blockSize);
             blockCount = 1;

h2/src/main/org/h2/tools/RunScript.java

@@ -207,7 +207,7 @@ public class RunScript extends Tool {
                     }
                 } catch (SQLException e) {
                     if (continueOnError) {
-                        e.printStackTrace();
+                        e.printStackTrace(out);
                     } else {
                         throw e;
                     }

h2/src/main/org/h2/tools/Server.java

@@ -356,7 +356,7 @@ public class Server implements Runnable, ShutdownHandler {
 
     String getStatus() {
         StringBuffer buff = new StringBuffer();
-        if (isRunning()) {
+        if (isRunning(false)) {
             buff.append(service.getType());
             buff.append(" server running on ");
             buff.append(service.getURL());
@@ -450,10 +450,13 @@ public class Server implements Runnable, ShutdownHandler {
         t.start();
         for (int i = 1; i < 64; i += i) {
             wait(i);
-            if (isRunning()) {
+            if (isRunning(false)) {
                 return this;
             }
         }
+        if (isRunning(true)) {
+            return this;
+        }        
         throw Message.getSQLException(ErrorCode.CONNECTION_BROKEN);
     }
 
@@ -468,19 +471,19 @@ public class Server implements Runnable, ShutdownHandler {
     }
 
     private void stopAll() {
-        if (web != null && web.isRunning()) {
+        if (web != null && web.isRunning(false)) {
             web.stop();
             web = null;
         }
-        if (tcp != null && tcp.isRunning()) {
+        if (tcp != null && tcp.isRunning(false)) {
             tcp.stop();
             tcp = null;
         }
-        if (pg != null && pg.isRunning()) {
+        if (pg != null && pg.isRunning(false)) {
             pg.stop();
             pg = null;
         }
-        if (ftp != null && ftp.isRunning()) {
+        if (ftp != null && ftp.isRunning(false)) {
             ftp.stop();
             ftp = null;
         }
@@ -489,10 +492,11 @@ public class Server implements Runnable, ShutdownHandler {
     /**
      * Checks if the server is running.
      *
+     * @param traceError if errors should be written
      * @return if the server is running
      */
-    public boolean isRunning() {
-        return service.isRunning();
+    public boolean isRunning(boolean traceError) {
+        return service.isRunning(traceError);
     }
 
     /**

h2/src/main/org/h2/util/Tool.java

@@ -15,13 +15,14 @@ import java.sql.SQLException;
 public abstract class Tool {
     
     protected PrintStream out = System.out;
+    protected PrintStream err = System.err;
     
     /**
-     * Sets the print stream.
+     * Sets the standard output stream.
      * 
-     * @param out the new print stream
+     * @param out the new standard output stream
      */
-    public void setPrintStream(PrintStream out) {
+    public void setOut(PrintStream out) {
         this.out = out;
     }
 

h2/src/test/org/h2/test/TestAll.java

@@ -159,7 +159,8 @@ java org.h2.test.TestAll timer
 
 /*
 
-database.tgz
+server problem : only log error the last iteration
+
 output.zip
 function table called twice: document:
 Yes. The first call is to get the list of columns, and the second call is to get the data.