--no commit message

--no commit message

h2/src/docsrc/html/changelog.html

@@ -18,7 +18,20 @@ Change Log
 <h1>Change Log</h1>
 
 <h2>Next Version (unreleased)</h2>
-<ul><li>Improved error messages: identifiers and values are now quoted.
+<ul><li>Page store: new databases can not be opened with older versions.
+</li><li>Page store: updating large rows (rows with more than 2000 bytes of data)
+    could corrupt the database.
+</li><li>When using multi-threaded kernel mode, setting disabling locking (LOCK_MODE=0)
+    will now throw an exception. At this time this combination will result in corruption when
+    multiple threads try to update the same table.
+</li><li>The fulltext search methods and fields are now protected instead of private,
+    to make the classes more easily extensible.
+</li><li>The Lucene fulltext search now also returns the score.
+</li><li> New function SCOPE_IDENTITY() to avoid problems when inserting
+    rows in a trigger.
+</li><li>Statement.getGeneratedKeys() returned the wrong value if a trigger
+    changed the identity value after inserting the row.
+</li><li>Improved error messages: identifiers and values are now quoted.
 </li><li>Improved error message when casting a value failed:
     the column name and type is included in the message.
 </li><li>Page store: inserting very large rows failed with ArrayIndexOutOfBoundsException.

h2/src/docsrc/html/roadmap.html

@@ -54,7 +54,6 @@ See also <a href="build.html#providing_patches">Providing Patches</a>.
 </li><li>Support alter table add column if table has views defined
 </li><li>Support hints for the optimizer (which index to use, enforce the join order).
 </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>Support SCOPE_IDENTITY() to avoid problems when inserting rows in a trigger.
 </li><li>Clustering: recovery needs to becomes fully automatic. Global write lock feature.
 </li><li>Support mixed clustering mode (one embedded, others in server mode)
 </li><li>Sequence: add features [NO] MINVALUE, MAXVALUE, CYCLE
@@ -62,7 +61,7 @@ See also <a href="build.html#providing_patches">Providing Patches</a>.
 </li><li>Groovy Stored Procedures (http://groovy.codehaus.org/Groovy+SQL)
 </li><li>Add a migration guide (list differences between databases)
 </li><li>Migrate database tool (also from other database engines)
-</li><li>Automatic collection of statistics (auto ANALYZE)
+</li><li>Automatic collection of statistics (auto ANALYZE; AUTOVACUUM). See http://www.postgresql.org/docs/current/static/routine-vacuuming.html#AUTOVACUUM
 </li><li>Optimization: automatic index creation suggestion using the trace file?
 </li><li>Compression performance: don't allocate buffers, compress / expand in to out buffer
 </li><li>Rebuild index functionality to shrink index size and improve performance
@@ -76,9 +75,8 @@ See also <a href="build.html#providing_patches">Providing Patches</a>.
 </li><li>Write more tests and documentation for MVCC (Multi Version Concurrency Control)
 </li><li>Find a tool to view large text file (larger than 100 MB), with find, page up and down (like less), truncate before / after
 </li><li>Implement, test, document XAConnection and so on
-</li><li>Pluggable data type (for compression, validation, conversion, encryption)
+</li><li>Pluggable data type (for streaming, hashing, compression, validation, conversion, encryption)
 </li><li>CHECK: find out what makes CHECK=TRUE slow, move to CHECK2
-</li><li>Improve recovery: improve code for log recovery problems (less try/catch)
 </li><li>Index usage for (ID, NAME)=(1, 'Hi'); document
 </li><li>Make DDL (Data Definition) operations transactional
 </li><li>RANK() and DENSE_RANK(), Partition using OVER()
@@ -155,7 +153,6 @@ See also <a href="build.html#providing_patches">Providing Patches</a>.
 </li><li>Auto-Update feature for database, .jar file
 </li><li>ResultSet SimpleResultSet.readFromURL(String url): id varchar, state varchar, released timestamp
 </li><li>Partial indexing (see PostgreSQL)
-</li><li>The build should fail if the test fails
 </li><li>Add GUI to build a custom version (embedded, fulltext,...) using build flags
 </li><li>http://rubyforge.org/projects/hypersonic/
 </li><li>Add comparator (x === y) : (x = y or (x is null and y is null))
@@ -194,7 +191,7 @@ See also <a href="build.html#providing_patches">Providing Patches</a>.
 </li><li>Public interface for functions (not public static)
 </li><li>Autocomplete: if I type the name of a table that does not exist (should say: syntax not supported)
 </li><li>Eliminate undo log records if stored on disk (just one pointer per block, not per record)
-</li><li>Feature matrix like in <a href="http://www.inetsoftware.de/products/jdbc/mssql/features/default.asp">i-net software</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>Support % operator (modulo)
@@ -254,7 +251,6 @@ See also <a href="build.html#providing_patches">Providing Patches</a>.
 </li><li>Document SET SEARCH_PATH, BEGIN, EXECUTE, parameters
 </li><li>Browser: use Desktop.isDesktopSupported and browse when using JDK 1.6
 </li><li>Server: use one listener (detect if the request comes from an PG or TCP client)
-</li><li>Store dates as 'local'. Existing files use GMT. Use escape syntax for compatibility.
 </li><li>Support data type INTERVAL
 </li><li>Optimize SELECT MIN(ID), MAX(ID), COUNT(*) FROM TEST WHERE ID BETWEEN 100 AND 200
 </li><li>Sequence: PostgreSQL compatibility (rename, create) (http://www.postgresql.org/docs/8.2/static/sql-altersequence.html)
@@ -279,7 +275,7 @@ See also <a href="build.html#providing_patches">Providing Patches</a>.
 </li><li>Move Maven 2 repository from hsql.sf.net to h2database.sf.net
 </li><li>Java 1.5 tool: JdbcUtils.closeSilently(s1, s2,...)
 </li><li>Javadoc: document design patterns used
-</li><li>Write an article about SQLInjection (h2\src\docsrc\html\images\SQLInjection.txt)
+</li><li>Write an article about SQLInjection (h2/src/docsrc/html/images/SQLInjection.txt)
 </li><li>Convert SQL-injection-2.txt to html document, include SQLInjection.java sample
 </li><li>Improve LOB in directories performance
 </li><li>Web site design: http://www.igniterealtime.org/projects/openfire/index.jsp
@@ -294,7 +290,6 @@ See also <a href="build.html#providing_patches">Providing Patches</a>.
 </li><li>Recovery should work with encrypted databases
 </li><li>Corruption: new error code, add help
 </li><li>Space reuse: after init, scan all storages and free those that don't belong to a live database object
-</li><li>SysProperties: change everything to H2_...
 </li><li>Use FilterIn / FilterOut putStream?
 </li><li>Access rights: add missing features (users should be 'owner' of objects; missing rights for sequences; dropping objects)
 </li><li>Support NOCACHE table option (Oracle)
@@ -331,7 +326,6 @@ See also <a href="build.html#providing_patches">Providing Patches</a>.
 </li><li>H2 Console: support configuration option for fixed width (monospace) font.
 </li><li>Native fulltext search: support analyzers (specially for Chinese, Japanese).
 </li><li>Automatically compact databases from time to time (as a background process).
-</li><li>Support SCOPE_IDENTITY().
 </li><li>Support GRANT SELECT, UPDATE ON *.
 </li><li>Test Eclipse DTP.
 </li><li>H2 Console: autocomplete: keep the previous setting
@@ -348,14 +342,13 @@ See also <a href="build.html#providing_patches">Providing Patches</a>.
 </li><li>Sequences: CURRVAL should be session specific. Compatibility with PostgreSQL.
 </li><li>Support DatabaseMetaData.insertsAreDetected: updatable result sets should detect inserts.
 </li><li>Auto-server: add option to define the IP address range or list.
-</li><li>Index creation only using deterministic functions.
+</li><li>Index creation using deterministic functions.
 </li><li>Use http://recaptcha.net somehow to secure the Google Group.
 </li><li>Support DELETE with TOP or LIMIT. See also: http://dev.mysql.com/doc/refman/5.1/de/delete.html
-</li><li>Change the default for NULL || 'x' to return NULL
 </li><li>ANALYZE: use a bloom filter for each indexed column to estimate count of distinct values.
 </li><li>ANALYZE: for unique indexes that allow null, count the number of null.
 </li><li>AUTO_SERVER: support changing IP addresses (disable a network while the database is open).
-</li><li>Avoid using java.util.Calendar internally because it's slow, complicated, and seems to be buggy.
+</li><li>Avoid using java.util.Calendar internally because it's slow, complicated, and buggy.
 </li><li>Support TRUNCATE .. CASCADE like PostgreSQL.
 </li><li>Support opening a database that is in the classpath, maybe using a new file system.
 </li><li>Fulltext search: lazy result generation using SimpleRowSource.

h2/src/docsrc/html/tutorial.html

@@ -779,7 +779,7 @@ INSERT INTO TEST VALUES(1, 'Hello World');
 CALL FT_CREATE_INDEX('PUBLIC', 'TEST', NULL);
 </pre>
 <p>
-PUBLIC is the schema, TEST is the table name. The list of column names (column separated) is optional,
+PUBLIC is the schema name, TEST is the table name. The list of column names (column separated) is optional,
 in this case all columns are indexed. The index is updated in realtime.
 To search the index, use the following query:
 </p>
@@ -832,7 +832,7 @@ INSERT INTO TEST VALUES(1, 'Hello World');
 CALL FTL_CREATE_INDEX('PUBLIC', 'TEST', NULL);
 </pre>
 <p>
-PUBLIC is the schema, TEST is the table name. The list of column names (column separated) is optional,
+PUBLIC is the schema name, TEST is the table name. The list of column names (column separated) is optional,
 in this case all columns are indexed. The index is updated in realtime. To search the index,
 use the following query:
 </p>

h2/src/main/org/h2/res/help.csv

@@ -18,7 +18,7 @@ INSERT INTO tableName [ ( columnName [,...] ) ]
 ","
 Inserts a new row / new rows into a table."
 "Commands (DML)","UPDATE","
-UPDATE tableName SET { columnName= { DEFAULT | expression } } [,...]
+UPDATE tableName [ [ AS ] newTableAlias ] SET { columnName= { DEFAULT | expression } } [,...]
 [ WHERE expression ]
 ","
 Updates data in a table."
@@ -1304,6 +1304,10 @@ Returns the number of the current row."
 SCHEMA()
 ","
 Returns the name of the default  schema for this session."
+"Functions (System)","SCOPE_IDENTITY","
+SCOPE_IDENTITY()
+","
+Returns the last inserted identity value for this session for the current scope."
 "Functions (System)","SESSION_ID","
 SESSION_ID()
 ","

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

@@ -297,6 +297,10 @@ java org.h2.test.TestAll timer
 
 /*
 
+Describe workaround?
+System.setProperty("h2.maxCompactCount", "0");
+
+Increase write file format version
 testConcurrentMerge
 sort > tools
 

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

@@ -618,4 +618,5 @@ notranslate vince bonfanti alphabetically sysdummy sysibm activation
 deactivation concatenating reproducing black railroads railroad radius moz
 imageio argb bilinear rendering stroke interpolation flip diagrams draw
 delim overlap subselect bitwise dclassifier dgenerate compacts chartrand phane
-sval cement slave ulimit eclipselink glenn kidd rapidshare
+sval cement slave ulimit eclipselink glenn kidd rapidshare score relevance
+autovacuum vacuuming

h2/src/tools/org/h2/dev/util/ArrayUtils.java

+/*
+ * Copyright 2004-2009 H2 Group. Multiple-Licensed under the H2 License,
+ * Version 1.0, and under the Eclipse Public License, Version 1.0
+ * (http://h2database.com/html/license.html).
+ * Initial Developer: H2 Group
+ */
+package org.h2.dev.util;
+
+import java.util.Comparator;
+
+/**
+ * Array utility methods.
+ */
+public class ArrayUtils {
+
+    /**
+     * Sort an array using binary insertion sort
+     *
+     * @param <T> the type
+     * @param d the data
+     * @param left the index of the leftmost element
+     * @param right the index of the rightmost element
+     * @param comp the comparison class
+     */
+    public <T> void binaryInsertionSort(T[] d, int left, int right, Comparator<T> comp) {
+        for (int i = left + 1; i <= right; i++) {
+            T t = d[i];
+            int l = left;
+            for (int r = i; l < r;) {
+                int m = (l + r) >>> 1;
+                if (comp.compare(t, d[m]) >= 0) {
+                    l = m + 1;
+                } else {
+                    r = m;
+                }
+            }
+            for (int n = i - l; n > 0;) {
+                d[l + n--] = d[l + n];
+            }
+            d[l] = t;
+        }
+    }
+
+    /**
+     * Sort an array using insertion sort
+     *
+     * @param <T> the type
+     * @param d the data
+     * @param left the index of the leftmost element
+     * @param right the index of the rightmost element
+     * @param comp the comparison class
+     */
+    public <T> void insertionSort(T[] d, int left, int right, Comparator<T> comp) {
+        for (int i = left + 1, j; i <= right; i++) {
+            T t = d[i];
+            for (j = i - 1; j >= left && comp.compare(d[j], t) > 0; j--) {
+                d[j + 1] = d[j];
+            }
+            d[j + 1] = t;
+        }
+    }
+
+
+}