--no commit message

--no commit message

h2/src/docsrc/html/roadmap.html

@@ -425,7 +425,11 @@ See also <a href="build.html#providing_patches">Providing Patches</a>.
 </li><li>Support INTERVAL data type (see Oracle and others).
 </li><li>Combine Server and Console tool (only keep Server).
 </li><li>Store the Lucene index in the database itself.
-</li><li>Oracle compatibility: support DECODE(x, ...)
+</li><li>Oracle compatibility: support DECODE(x, ...).
+</li><li>Console: Start Browser: if ip number changed, try localhost instead.
+</li><li>MVCC: compare concurrent update behavior with PostgreSQL and Oracle.
+</li><li>HSQLDB compatibility: CREATE FUNCTION (maybe using a Function interface). 
+</li><li>HSQLDB compatibility: support CALL "java.lang.Math.sqrt"(2.0)
 </li></ul>
 
 <h2>Not Planned</h2>

h2/src/installer/cheatSheet.html

@@ -86,14 +86,14 @@ li {
 <div style="float:left; margin:5px; width:320px;">
 
 <h2>Using H2</h2>
-<ul><li>Download the
+<ul><li>H2 is open source, free to use and distribute.
+</li><li>Download the
     <a href="http://repo1.maven.org/maven2/com/h2database/h2/1.1.111/h2-1.1.111.jar">jar file</a>,
     <a href="http://www.h2database.com/h2-setup-2009-04-10.exe">Windows installer</a>, or
     <a href="http://www.h2database.com/h2-2009-04-10.zip">zip file</a>.
 </li><li>To start the H2 Console tool, double click the jar file, or run <code>java -jar h2*.jar</code>, <code>h2.bat</code> or <code>h2.sh</code>.
 </li><li>A new database is automatically created if it does not yet exist.
 </li><li>Closing the last connection closes a database.
-</li><li>H2 is open source, free to use and distribute.
 </li></ul>
 
 <h2>Database URLs</h2>
@@ -105,7 +105,7 @@ li {
 </p><p>
 <b>In-Memory</b><br />
 <code>jdbc:h2:mem:test</code> multiple connections in one process<br />
-<code>jdbc:h2:mem:</code> unnamed private database; one connection<br />
+<code>jdbc:h2:mem:</code> unnamed private; one connection<br />
 </p><p>
 <b>Server Mode</b><br />
 <code>jdbc:h2:tcp://localhost/~/test</code> user home dir<br />
@@ -113,7 +113,7 @@ li {
 </p><p>
 <b>Settings</b><br />
 <code>jdbc:h2:..;MODE=MySQL</code> compatibility (or HSQLDB,...)<br />
-<code>jdbc:h2:..;TRACE_LEVEL_FILE=3</code> log to .trace.db<br />
+<code>jdbc:h2:..;TRACE_LEVEL_FILE=3</code> log to *.trace.db<br />
 </p>
 
 <h2>Documentation</h2>
@@ -157,15 +157,6 @@ conn.close(); cp.dispose();
 java -cp h2*.jar org.h2.tools.Server
 </pre>
 
-<h2>Hibernate</h2>
-In the file hibernate.cfg.xml, set:
-<pre>
-&lt;property name="dialect"&gt;
-    org.hibernate.dialect.H2Dialect
-&lt;/property&gt;
-</pre>
-As an alternative, use the HSQLDialect.
-
 <h2>Maven</h2>
 <pre>
 &lt;dependency&gt;
@@ -175,9 +166,17 @@ As an alternative, use the HSQLDialect.
 &lt;/dependency&gt;
 </pre>
 
+<h2>Hibernate</h2>
+hibernate.cfg.xml (or use the HSQLDialect):
+<pre>
+&lt;property name="dialect"&gt;
+    org.hibernate.dialect.H2Dialect
+&lt;/property&gt;
+</pre>
+
 <h2>TopLink and Glassfish</h2>
-Datasource Classname: org.h2.jdbcx.JdbcDataSource
-toplink.target-database: oracle.toplink.essentials.platform.database.H2Platform
+datasource classname: org.h2.jdbcx.JdbcDataSource<br />
+oracle.toplink.essentials.platform.database.H2Platform
 
 </div>
 

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

@@ -113,6 +113,8 @@ public class PageStore implements CacheWriter {
     // TODO space re-use: run TestPerformance multiple times, size should stay
     // TODO when inserting many rows, do not split at (entryCount / 2) + 1
     // TODO maybe split at the last insertion point
+    // TODO test running out of disk space (using a special file system)
+    // TODO check for file size (exception if not exact size expected)
 
     // TODO when removing DiskFile:
     // remove CacheObject.blockCount
@@ -1047,7 +1049,8 @@ public class PageStore implements CacheWriter {
 //        s2 += s1 += d[ps - 1] & 255;
 //        if (d[5] != (byte) (((s1 & 255) + (s1 >> 8)) ^ pos)
 //                || d[6] != (byte) (((s2 & 255) + (s2 >> 8)) ^ (pos >> 8))) {
-//            throw Message.getSQLException(ErrorCode.FILE_CORRUPTED_1, "wrong checksum");
+//            throw Message.getSQLException(
+//                ErrorCode.FILE_CORRUPTED_1, "wrong checksum");
 //        }
 //    }
 

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

@@ -285,31 +285,16 @@ java org.h2.test.TestAll timer
         System.setProperty("h2.maxMemoryRowsDistinct", "128");
         System.setProperty("h2.check2", "true");
 
-//        System.setProperty("h2.pageStore", "true");
+        // System.setProperty("h2.pageStore", "true");
 
 /*
 
-Console: Start Browser: if ip number changed, try localhost
-
-test case for running out of disk space (using a special file system)
-
-auto-build: prepare release
-
-documentation: rolling review at roadmap.html: done
-
 create a short documentation
 
-test performance with log=2
+documentation: rolling review at roadmap.html: done
 
 remove old TODO, move to roadmap
 
-TestMVCC:
-Concurrent update in table test: another transaction has updated or
-deleted the same row when exactly does it occur in other databases
-(PostgreSQL, Oracle)?
-
-CREATE FUNCTION? Function interface; HSQLDB compatibility
-
 kill a specific java process:
 kill -9 `jps -l | grep "org.h2.test.TestAll" | cut -d " " -f 1`