Docs

h2/src/docsrc/help/help.csv

@@ -441,7 +441,7 @@ ON tableName ( indexColumn [,...] )
 Creates a new index.
 This command commits an open transaction.
 
-Hash indexes are kept in memory. They can only test for equality, and do not support 
+Hash indexes are kept in memory. They can only test for equality, and do not support
 range queries (similar to a hash table). They do support non-unique keys.
 A multi-column hash index is only used if all column values are known.
 ","

h2/src/docsrc/html/changelog.html

@@ -18,7 +18,16 @@ Change Log
 <h1>Change Log</h1>
 
 <h2>Next Version (unreleased)</h2>
-<ul><li>Result sets larger than 2 GB threw an exception "Negative seek offset". Fixed.
+<ul><li>File system: getting the file name from a path is now faster. This should
+    speed up BLOB and CLOB access.
+</li><li>PgServer: incorrect SQL types were returned in result set meta data.
+    Concurrently opening a database could fail (PG catalog initialization was not synchronized).
+    Thanks a lot to S. Vladykin for providing the patches!
+</li><li>SHOW COLUMNS did not work correctly if there where multiple indexes
+    on the same columns.
+</li><li>Page store: the wrong write count was written to the database header.
+    This could cause the server-less multi-connection mode to fail.
+</li><li>Result sets larger than 2 GB threw an exception "Negative seek offset". Fixed.
 </li><li>If the system property h2.check was set to false, an ArrayIndexOutOfBoundsException could occur.
 </li><li>Alter table is now supported even if a table has views defined.
 </li><li>Fulltext search: exceptions within the fulltext search package had the wrong SQL state.

h2/src/docsrc/html/links.html

@@ -132,6 +132,16 @@ Tool to copy data from one database to another.
 
 <h2>Products and Projects</h2>
 
+<p><a href="http://www.adeptiabpm.com">
+Adeptia BPM</a><br />
+A Business Process Management (BPM) suite to quickly and easily automate business processes and workflows.
+</p>
+
+<p><a href="http://www.adeptia.com">
+Adeptia Integration</a><br />
+Process-centric, services-based application integration suite.
+</p>
+
 <p><a href="http://aejaks.sf.net">
 &AElig;jaks</a><br />
 A server-side scripting environment to build AJAX enabled web applications.

h2/src/docsrc/html/performance.html

@@ -328,10 +328,6 @@ There are various ways to analyze an application. Sometimes two implementations
 <code>System.currentTimeMillis()</code>. But this does not work for complex applications with many modules, and for memory problems.
 </p>
 <p>
-A good tool to measure both memory usage and performance is the
-<a href="http://www.yourkit.com">YourKit Java Profiler</a>.
-</p>
-<p>
 A simple way to profile an application is to use the built-in profiling tool of java. Example:
 </p>
 <pre>
@@ -343,6 +339,18 @@ a number of full thread dumps. To do that, first run <code>jps -l</code> to get
 run <code>jstack &lt;pid&gt;</code> or <code>kill -QUIT &lt;pid&gt;</code> (Linux) or press
 Ctrl+C (Windows).
 </p>
+<p>
+A simple profiling tool is included in H2. To use it, the application needs to be changed slightly. Example:
+</p>
+<pre>
+import org.h2.util;
+...
+profiler = new Profiler();
+profiler.startCollecting();
+// application code
+profiler.stopCollecting();
+System.out.println(profiler.getTop(3));
+</pre>
 
 <h2 id="database_profiling">Database Profiling</h2>
 <p>

h2/src/docsrc/html/roadmap.html

@@ -188,6 +188,7 @@ See also <a href="build.html#providing_patches">Providing Patches</a>.
 </li><li>Feature matrix as in <a href="http://www.inetsoftware.de/products/jdbc/mssql/features/default.asp">i-net software</a>.
 </li><li>Updatable result set on table without primary key or unique index
 </li><li>Use LinkedList instead of ArrayList where applicable
+</li><li>Allow execution time prepare for SELECT * FROM CSVREAD(?, 'columnNameString')
 </li><li>Support % operator (modulo)
 </li><li>Support JMX: create an MBean for each database and server (support JConsole).
     See http://thedevcloud.blogspot.com/2008/10/displaying-hsql-database-manager-in.html
@@ -218,7 +219,6 @@ See also <a href="build.html#providing_patches">Providing Patches</a>.
 </li><li>Benchmark: add a graph to show how databases scale (performance/database size)
 </li><li>Implement a SQLData interface to map your data over to a custom object
 </li><li>In the MySQL and PostgreSQL mode, use lower case identifiers by default (DatabaseMetaData.storesLowerCaseIdentifiers = true)
-</li><li>Allow execution time prepare for SELECT * FROM CSVREAD(?, 'columnNameString')
 </li><li>Support multiple directories (on different hard drives) for the same database
 </li><li>Server protocol: use challenge response authentication, but client sends hash(user+password) encrypted with response
 </li><li>Support EXEC[UTE] (doesn't return a result set, compatible to MS SQL Server)
@@ -469,6 +469,7 @@ See also <a href="build.html#providing_patches">Providing Patches</a>.
 </li><li>Cluster: support load balance with values for each server / auto detect.
 </li><li>Implement GiST (Generalized Search Tree for Secondary Storage).
 </li><li>Function to read a number of bytes/characters from an BLOB or CLOB.
+</li><li>Issue 156: Support SELECT ? UNION SELECT ?.
 </li></ul>
 
 <h2>Not Planned</h2>

h2/src/test/org/h2/test/todo/tools.sql

@@ -18,8 +18,8 @@ import java.io.*;
 byte[] firstBytes(InputStream in, int len) throws IOException {
     try {
         byte[] data = new byte[len];
-        DataInputStream din = new DataInputStream(in);
-        din.readFully(data, 0, len);
+        DataInputStream dIn = new DataInputStream(in);
+        dIn.readFully(data, 0, len);
         return data;
     } finally {
         in.close();

h2/src/tools/org/h2/build/doc/dictionary.txt

@@ -628,4 +628,4 @@ galapagos pacific pastebin mystic posting mysticpaste reject prof tick freeing
 sweden abbreviated xmx trede googlecode gustav standing hashes
 decompressed expansion ziv abbreviated augments omitted gain
 subtracted maxed logical lempel increases sibling impersonate proper remembers
-moon
+moon centric adeptia workflows generalized bpchar