Documentation

h2/src/docsrc/help/help.csv

@@ -580,7 +580,7 @@ CREATE SEQUENCE SEQ_ID
 CREATE [ CACHED | MEMORY ] [ TEMP | [ GLOBAL | LOCAL ] TEMPORARY ]
 TABLE [ IF NOT EXISTS ] name
 [ ( { columnDefinition | constraint } [,...] ) ]
-[ ENGINE tableEngineName [ WITH tableEngineParam [,...] ] ]
+[ ENGINE tableEngineName [ WITH tableEngineParamName [,...] ] ]
 [ NOT PERSISTENT ] [ TRANSACTIONAL ]
 [ AS select ]","
 Creates a new table.
@@ -2341,7 +2341,7 @@ GEOMETRY
 A spatial geometry type, based on the com.vividsolutions.jts library.
 Normally represented in textual format using the WKT (Well Known Text) format.
 
-Use a quoted string containing a KWB formatted string or ""PreparedStatement.setObject()"" to store values,
+Use a quoted string containing a WKT formatted string or ""PreparedStatement.setObject()"" to store values,
 and ""ResultSet.getObject(..)"" or ""ResultSet.getString(..)"" to retrieve the values.
 ","
 ARRAY

h2/src/docsrc/html/changelog.html

@@ -46,7 +46,8 @@ Change Log
 </li><li>Issue 481: Further extensions to PgServer to support better support PG JDBC, patch from Andrew Franklin.
 </li><li>Add support for spatial datatype GEOMETRY.
 </li><li>Add support for in-memory spatial index.
-</li><li>change the PageStore#changeCount field from an int to a long, to cope with databases with very high transaction rates.
+</li><li>change the PageStore#changeCount field from an int to a long,
+    to cope with databases with very high transaction rates.
 </li></ul>
 
 <h2>Version 1.3.172 (2013-05-25)</h2>

h2/src/docsrc/html/mvstore.html

@@ -39,6 +39,7 @@ MVStore
     - <a href="#encryption">Encrypted Files</a><br />
     - <a href="#tools">Tools</a><br />
     - <a href="#exceptionHandling">Exception Handling</a><br />
+    - <a href="#tableEngine">Table Engine for H2</a><br />
 <a href="#differences">
     Similar Projects and Differences to Other Storage Engines</a><br />
 <a href="#current_state">
@@ -427,6 +428,22 @@ The following exceptions can occur:
 </li><li><code>ConcurrentModificationException</code> if the object is modified concurrently.
 </li></ul>
 
+<h3 id="tableEngine">Table Engine for H2</h3>
+<p>
+The plan is to use the MVStore as the default storage engine for the H2 database
+in the future (supporting SQL, JDBC, transactions, MVCC, and so on).
+This is work in progress. To try it out, append
+<code>;DEFAULT_TABLE_ENGINE=org.h2.mvstore.db.MVTableEngine</code>
+to the database URL. In general, functionality and performance should be
+similar than the current default storage engine (the page store).
+There are a few features that have not been implemented yet or are not complete:
+</p>
+<ul><li>Changing the cache size.
+</li><li>Two-phase commit.
+</li><li>The database metadata is still stored in a <code>.h2.db</code> file.
+</li><li>The database file(s) sometimes do not shrink as expected.
+</li></ul>
+
 <h2 id="differences">Similar Projects and Differences to Other Storage Engines</h2>
 <p>
 Unlike similar storage engines like LevelDB and Kyoto Cabinet,

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

@@ -194,7 +194,8 @@ Creates a new sequence."
 CREATE [ CACHED | MEMORY ] [ TEMP | [ GLOBAL | LOCAL ] TEMPORARY ]
 TABLE [ IF NOT EXISTS ] name
 [ ( { columnDefinition | constraint } [,...] ) ]
-[ ENGINE tableEngineName ] [ NOT PERSISTENT ] [ TRANSACTIONAL ]
+[ ENGINE tableEngineName [ WITH tableEngineParamName [,...] ] ]
+[ NOT PERSISTENT ] [ TRANSACTIONAL ]
 [ AS select ]","
 Creates a new table."
 "Commands (DDL)","CREATE TRIGGER","
@@ -273,7 +274,7 @@ Removes all rows from a table."
 "Commands (Other)","CHECKPOINT","
 CHECKPOINT
 ","
-Flushes the data to disk and switches to a new transaction log if possible."
+Flushes the data to disk."
 "Commands (Other)","CHECKPOINT SYNC","
 CHECKPOINT SYNC
 ","
@@ -786,6 +787,10 @@ Universally unique identifier."
 ARRAY
 ","
 An array of values."
+"Data Types","GEOMETRY Type","
+GEOMETRY
+","
+A spatial geometry type, based on the com."
 "Functions (Aggregate)","AVG","
 AVG ( [ DISTINCT ] { numeric } )
 ","
@@ -981,7 +986,7 @@ HASH(algorithmString, dataBytes, iterationInt)
 ","
 Calculate the hash value using an algorithm, and repeat this process for a number of iterations."
 "Functions (Numeric)","TRUNCATE","
-{ TRUNC | TRUNCATE } ({numeric, digitsInt} | timestamp)
+{ TRUNC | TRUNCATE } ( { {numeric, digitsInt} | timestamp } )
 ","
 Truncates to a number of digits (to the next value closer to 0)."
 "Functions (Numeric)","COMPRESS","

h2/src/main/org/h2/res/javadoc.properties

@@ -38,4 +38,4 @@ org.h2.tools.Script.main=Options are case sensitive. Supported options are\:\n[-
 org.h2.tools.Server=Starts the H2 Console (web-) server, TCP, and PG server.
 org.h2.tools.Server.main=When running without options, -tcp, -web, -browser and -pg are started.\nOptions are case sensitive. Supported options are\:\n[-help] or [-?]         Print the list of options\n[-web]                  Start the web server with the H2 Console\n[-webAllowOthers]       Allow other computers to connect - see below\n[-webDaemon]            Use a daemon thread\n[-webPort <port>]       The port (default\: 8082)\n[-webSSL]               Use encrypted (HTTPS) connections\n[-browser]              Start a browser connecting to the web server\n[-tcp]                  Start the TCP server\n[-tcpAllowOthers]       Allow other computers to connect - see below\n[-tcpDaemon]            Use a daemon thread\n[-tcpPort <port>]       The port (default\: 9092)\n[-tcpSSL]               Use encrypted (SSL) connections\n[-tcpPassword <pwd>]    The password for shutting down a TCP server\n[-tcpShutdown "<url>"]  Stop the TCP server; example\: tcp\://localhost\n[-tcpShutdownForce]     Do not wait until all connections are closed\n[-pg]                   Start the PG server\n[-pgAllowOthers]        Allow other computers to connect - see below\n[-pgDaemon]             Use a daemon thread\n[-pgPort <port>]        The port (default\: 5435)\n[-properties "<dir>"]   Server properties (default\: ~, disable\: null)\n[-baseDir <dir>]        The base directory for H2 databases (all servers)\n[-ifExists]             Only existing databases may be opened (all servers)\n[-trace]                Print additional trace information (all servers)\nThe options -xAllowOthers are potentially risky.\nFor details, see Advanced Topics / Protection against Remote Access.
 org.h2.tools.Shell=Interactive command line tool to access a database using JDBC.
-org.h2.tools.Shell.main=Options are case sensitive. Supported options are\:\n[-help] or [-?]        Print the list of options\n[-list]                Enable list mode for printing results\n[-url "<url>"]         The database URL (jdbc\:h2\:...)\n[-user <user>]         The user name\n[-password <pwd>]      The password\n[-driver <class>]      The JDBC driver class to use (not required in most cases)\n[-sql "<statements>"]  Execute the SQL statements and exit\n[-properties "<dir>"]  Load the server properties from this directory\nIf special characters don't work as expected, you may need to use\n -Dfile.encoding\=UTF-8 (Mac OS X) or CP850 (Windows).
+org.h2.tools.Shell.main=Options are case sensitive. Supported options are\:\n[-help] or [-?]        Print the list of options\n[-url "<url>"]         The database URL (jdbc\:h2\:...)\n[-user <user>]         The user name\n[-password <pwd>]      The password\n[-driver <class>]      The JDBC driver class to use (not required in most cases)\n[-sql "<statements>"]  Execute the SQL statements and exit\n[-properties "<dir>"]  Load the server properties from this directory\nIf special characters don't work as expected, you may need to use\n -Dfile.encoding\=UTF-8 (Mac OS X) or CP850 (Windows).

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

@@ -728,4 +728,6 @@ isam charindex removal getdate jesse fake covers covering cheaper adjacent spot
 transition anthony goubard netherlands versioned orderable customizer cachable
 customizers retains scalability assuming gili cancelled departments juerg
 franklin indicated offending unimplemented executors dumping variants
-presence spiess azeckoski aaron cowwoc decompiles canceling
+presence spiess azeckoski aaron cowwoc decompiles canceling vividsolutions
+quadtree envelope geometry polygon typname intersects wkt intersects wkb
+coordinate geometric rates cope