提交 164f419c authored 作者: Thomas Mueller's avatar Thomas Mueller

Documentation (round corners for pre, shadow for pre and table).

上级 8cd9dc21
...@@ -545,7 +545,7 @@ You will be able to change the connection properties. ...@@ -545,7 +545,7 @@ You will be able to change the connection properties.
The property column represents the property key in the <code>odbc.ini</code> file The property column represents the property key in the <code>odbc.ini</code> file
(which may be different from the GUI). (which may be different from the GUI).
</p> </p>
<table> <table class="main">
<tr><th>Property</th><th>Example</th><th>Remarks</th></tr> <tr><th>Property</th><th>Example</th><th>Remarks</th></tr>
<tr><td>Data Source</td><td>H2 Test</td><td>The name of the ODBC Data Source</td></tr> <tr><td>Data Source</td><td>H2 Test</td><td>The name of the ODBC Data Source</td></tr>
<tr><td>Database</td><td>~/test;ifexists=true</td> <tr><td>Database</td><td>~/test;ifexists=true</td>
...@@ -1299,7 +1299,7 @@ public class Test { ...@@ -1299,7 +1299,7 @@ public class Test {
<p> <p>
Some values are: Some values are:
</p> </p>
<table> <table class="main">
<tr><th>Number of UUIs</th><th>Probability of Duplicates</th></tr> <tr><th>Number of UUIs</th><th>Probability of Duplicates</th></tr>
<tr><td>2^36=68'719'476'736</td><td>0.000'000'000'000'000'4</td></tr> <tr><td>2^36=68'719'476'736</td><td>0.000'000'000'000'000'4</td></tr>
<tr><td>2^41=2'199'023'255'552</td><td>0.000'000'000'000'4</td></tr> <tr><td>2^41=2'199'023'255'552</td><td>0.000'000'000'000'4</td></tr>
...@@ -1490,7 +1490,7 @@ OR X = 2 OR X = 2 OR X = 2 OR X = 2 OR X = 2 ...@@ -1490,7 +1490,7 @@ OR X = 2 OR X = 2 OR X = 2 OR X = 2 OR X = 2
</li></ul> </li></ul>
<h2 id="glossary_links">Glossary and Links</h2> <h2 id="glossary_links">Glossary and Links</h2>
<table> <table class="main">
<tr> <tr>
<th>Term</th> <th>Term</th>
<th>Description</th> <th>Description</th>
......
...@@ -18,7 +18,7 @@ Change Log ...@@ -18,7 +18,7 @@ Change Log
<h1>Change Log</h1> <h1>Change Log</h1>
<h2>Next Version (unreleased)</h2> <h2>Next Version (unreleased)</h2>
<ul><li>New experimental feature to speed up CREATE TABLE ... AS SELECT and INSERT INTO ... SELECT. <ul><li>New experimental feature to speed up CREATE TABLE ... AS SELECT.
To enable the feature, set the system property h2.optimizeInsertFromSelect to true. To enable the feature, set the system property h2.optimizeInsertFromSelect to true.
For large queries, performance can be doubled. For large queries, performance can be doubled.
</li><li>When LOB objects are stored in the database (using the experimental setting h2.lobInDatabase), </li><li>When LOB objects are stored in the database (using the experimental setting h2.lobInDatabase),
......
...@@ -156,7 +156,8 @@ encrypted using AES-128 and XTEA encryption algorithms ...@@ -156,7 +156,8 @@ encrypted using AES-128 and XTEA encryption algorithms
<h2 id="comparison">Comparison to Other Database Engines</h2> <h2 id="comparison">Comparison to Other Database Engines</h2>
<table><tr> <table class="main">
<tr>
<th>Feature</th> <th>Feature</th>
<th>H2</th> <th>H2</th>
<th><a href="http://db.apache.org/derby">Derby</a></th> <th><a href="http://db.apache.org/derby">Derby</a></th>
...@@ -433,7 +434,8 @@ it's an local or remote connection) can do so using the exact same database URL. ...@@ -433,7 +434,8 @@ it's an local or remote connection) can do so using the exact same database URL.
This database supports multiple connection modes and connection settings. This database supports multiple connection modes and connection settings.
This is achieved using different database URLs. Settings in the URLs are not case sensitive. This is achieved using different database URLs. Settings in the URLs are not case sensitive.
</p> </p>
<table><tr><th>Topic</th><th>URL Format and Examples</th></tr> <table class="main">
<tr><th>Topic</th><th>URL Format and Examples</th></tr>
<tr> <tr>
<td><a href="#embedded_databases">Embedded (local) connection</a></td> <td><a href="#embedded_databases">Embedded (local) connection</a></td>
<td class="notranslate"> <td class="notranslate">
...@@ -842,7 +844,7 @@ The locks are also released when the autocommit mode changes, and for connection ...@@ -842,7 +844,7 @@ The locks are also released when the autocommit mode changes, and for connection
autocommit set to true (this is the default), locks are released after each statement. autocommit set to true (this is the default), locks are released after each statement.
The following statements generate locks: The following statements generate locks:
</p> </p>
<table> <table class="main">
<tr> <tr>
<th>Type of Lock</th> <th>Type of Lock</th>
<th>SQL Statement</th> <th>SQL Statement</th>
...@@ -883,7 +885,8 @@ The initial lock timeout (that is the timeout used for new connections) can be s ...@@ -883,7 +885,8 @@ The initial lock timeout (that is the timeout used for new connections) can be s
<p> <p>
The following files are created for persistent databases: The following files are created for persistent databases:
</p> </p>
<table><tr><th>File Name</th><th>Description</th><th>Number of Files</th></tr> <table class="main">
<tr><th>File Name</th><th>Description</th><th>Number of Files</th></tr>
<tr><td class="notranslate"> <tr><td class="notranslate">
test.h2.db test.h2.db
</td><td> </td><td>
......
...@@ -170,7 +170,8 @@ syntax-end --> ...@@ -170,7 +170,8 @@ syntax-end -->
The system tables in the schema <code>INFORMATION_SCHEMA</code> contain the meta data The system tables in the schema <code>INFORMATION_SCHEMA</code> contain the meta data
of all tables in the database as well as the current settings. of all tables in the database as well as the current settings.
</p> </p>
<table><tr><th>Table</th><th>Columns</th></tr> <table class="main">
<tr><th>Table</th><th>Columns</th></tr>
<c:forEach var="item" items="informationSchema"> <c:forEach var="item" items="informationSchema">
<tr class="notranslate"> <tr class="notranslate">
<td>${item.topic}</td> <td>${item.topic}</td>
......
...@@ -60,7 +60,7 @@ To install the software, run the installer or unzip it to a directory of your ch ...@@ -60,7 +60,7 @@ To install the software, run the installer or unzip it to a directory of your ch
<p> <p>
After installing, you should get the following directory structure: After installing, you should get the following directory structure:
</p> </p>
<table> <table class="main">
<tr> <tr>
<th>Directory</th> <th>Directory</th>
<th>Contents</th> <th>Contents</th>
......
...@@ -39,7 +39,7 @@ Please note this is mostly a single connection benchmark run on one computer. ...@@ -39,7 +39,7 @@ Please note this is mostly a single connection benchmark run on one computer.
</p> </p>
<h3>Embedded</h3> <h3>Embedded</h3>
<table border="1" class="bar"> <table class="main">
<tr><th>Test Case</th><th>Unit</th><th>H2</th><th>HSQLDB</th><th>Derby</th></tr> <tr><th>Test Case</th><th>Unit</th><th>H2</th><th>HSQLDB</th><th>Derby</th></tr>
<tr><td>Simple: Init</td><td>ms</td><td>241</td><td>431</td><td>1027</td></tr> <tr><td>Simple: Init</td><td>ms</td><td>241</td><td>431</td><td>1027</td></tr>
<tr><td>Simple: Query (random)</td><td>ms</td><td>193</td><td>267</td><td>748</td></tr> <tr><td>Simple: Query (random)</td><td>ms</td><td>193</td><td>267</td><td>748</td></tr>
...@@ -62,7 +62,7 @@ Please note this is mostly a single connection benchmark run on one computer. ...@@ -62,7 +62,7 @@ Please note this is mostly a single connection benchmark run on one computer.
</table> </table>
<h3>Client-Server</h3> <h3>Client-Server</h3>
<table border="1" class="bar"> <table class="main">
<tr><th>Test Case</th><th>Unit</th><th>H2</th><th>HSQLDB</th><th>Derby</th><th>PostgreSQL</th><th>MySQL</th></tr> <tr><th>Test Case</th><th>Unit</th><th>H2</th><th>HSQLDB</th><th>Derby</th><th>PostgreSQL</th><th>MySQL</th></tr>
<tr><td>Simple: Init</td><td>ms</td><td>1715</td><td>2096</td><td>3008</td><td>3093</td><td>3084</td></tr> <tr><td>Simple: Init</td><td>ms</td><td>1715</td><td>2096</td><td>3008</td><td>3093</td><td>3084</td></tr>
<tr><td>Simple: Query (random)</td><td>ms</td><td>2615</td><td>2119</td><td>4450</td><td>3201</td><td>3313</td></tr> <tr><td>Simple: Query (random)</td><td>ms</td><td>2615</td><td>2119</td><td>4450</td><td>3201</td><td>3313</td></tr>
...@@ -265,7 +265,7 @@ It was developed / sponsored by db4o. ...@@ -265,7 +265,7 @@ It was developed / sponsored by db4o.
This test was not run for a longer time, so please be aware that the results below This test was not run for a longer time, so please be aware that the results below
are for older database versions (H2 version 1.1, HSQLDB 1.8, Java 1.4). are for older database versions (H2 version 1.1, HSQLDB 1.8, Java 1.4).
</p> </p>
<table border="1" class="bar"> <table class="main">
<tr><th>Test Case</th><th>Unit</th><th>H2</th><th>HSQLDB</th><th>MySQL</th></tr> <tr><th>Test Case</th><th>Unit</th><th>H2</th><th>HSQLDB</th><th>MySQL</th></tr>
<tr><td>Melbourne write</td><td>ms</td><td>369</td><td>249</td><td>2022</td></tr> <tr><td>Melbourne write</td><td>ms</td><td>369</td><td>249</td><td>2022</td></tr>
<tr><td>Melbourne read</td><td>ms</td><td>47</td><td>49</td><td>93</td></tr> <tr><td>Melbourne read</td><td>ms</td><td>47</td><td>49</td><td>93</td></tr>
......
...@@ -21,13 +21,29 @@ td, input, select, textarea, body, code, pre { ...@@ -21,13 +21,29 @@ td, input, select, textarea, body, code, pre {
pre { pre {
background-color: #ece9d8; background-color: #ece9d8;
border: 1px solid rgb(172, 168, 153); border: 1px solid #aca899;
padding: 4px; padding: 6px;
-moz-border-radius: 4px;
-webkit-border-radius: 4px;
-khtml-border-radius: 4px;
border-radius: 4px;
-moz-box-shadow: 2px 2px 2px #aca899;
-webkit-box-shadow: 2px 2px 2px #aca899;
-khtml-box-shadow: 2px 2px 2px #aca899;
-o-box-shadow: 2px 2px 2px #aca899;
box-shadow: 2px 2px 2px #aca899;
} }
code { code {
background-color: #ece9d8; background-color: #ece9d8;
padding: 0px 2px; padding: 0px 4px;
-moz-border-radius: 4px;
-webkit-border-radius: 4px;
-khtml-border-radius: 4px;
border-radius: 4px;
} }
img { img {
...@@ -77,6 +93,19 @@ table { ...@@ -77,6 +93,19 @@ table {
border: 1px solid #aca899; border: 1px solid #aca899;
} }
.main {
-moz-border-radius: 4px;
-webkit-border-radius: 4px;
-khtml-border-radius: 4px;
border-radius: 4px;
-moz-box-shadow: 2px 2px 2px #aca899;
-webkit-box-shadow: 2px 2px 2px #aca899;
-khtml-box-shadow: 2px 2px 2px #aca899;
-o-box-shadow: 2px 2px 2px #aca899;
box-shadow: 2px 2px 2px #aca899;
}
th { th {
text-align: left; text-align: left;
background-color: #ece9d8; background-color: #ece9d8;
...@@ -229,10 +258,6 @@ table.index { ...@@ -229,10 +258,6 @@ table.index {
border-collapse: collapse; border-collapse: collapse;
} }
/* width: 570px;
width: 190px;
*/
td.index { td.index {
width: 33%; width: 33%;
border: 0px; border: 0px;
...@@ -256,6 +281,8 @@ td.index { ...@@ -256,6 +281,8 @@ td.index {
margin: 0px 0px; margin: 0px 0px;
border: 2px solid; border: 2px solid;
-moz-border-radius: 0.4em; -moz-border-radius: 0.4em;
-webkit-border-radius: 0.4em;
-khtml-border-radius: 0.4em;
border-radius: 0.4em; border-radius: 0.4em;
background-color: #fff; background-color: #fff;
} }
......
...@@ -76,7 +76,7 @@ This is a client / server application, so both a server and a client (a browser) ...@@ -76,7 +76,7 @@ This is a client / server application, so both a server and a client (a browser)
</p><p> </p><p>
Depending on your platform and environment, there are multiple ways to start the application: Depending on your platform and environment, there are multiple ways to start the application:
</p> </p>
<table> <table class="main">
<tr><th>OS</th><th>Start</th></tr> <tr><th>OS</th><th>Start</th></tr>
<tr> <tr>
<td>Windows</td> <td>Windows</td>
...@@ -243,7 +243,7 @@ Those are interpreted within the H2 Console, that means they work with any datab ...@@ -243,7 +243,7 @@ Those are interpreted within the H2 Console, that means they work with any datab
They need to be at the beginning of a statement (before any remarks), They need to be at the beginning of a statement (before any remarks),
otherwise they are not parsed correctly. If in doubt, add ';' before the command. otherwise they are not parsed correctly. If in doubt, add ';' before the command.
</p> </p>
<table> <table class="main">
<tr> <tr>
<th>Command(s)</th> <th>Command(s)</th>
<th>Description</th> <th>Description</th>
......
...@@ -1523,7 +1523,7 @@ Change Log ...@@ -1523,7 +1523,7 @@ Change Log
Next Version (unreleased) Next Version (unreleased)
@changelog_1002_li @changelog_1002_li
New experimental feature to speed up CREATE TABLE ... AS SELECT and INSERT INTO ... SELECT. To enable the feature, set the system property h2.optimizeInsertFromSelect to true. For large queries, performance can be doubled. New experimental feature to speed up CREATE TABLE ... AS SELECT. To enable the feature, set the system property h2.optimizeInsertFromSelect to true. For large queries, performance can be doubled.
@changelog_1003_li @changelog_1003_li
When LOB objects are stored in the database (using the experimental setting h2.lobInDatabase), and using the MVCC mode, opening a database with uncommitted transactions could throw a NullPointerException. When LOB objects are stored in the database (using the experimental setting h2.lobInDatabase), and using the MVCC mode, opening a database with uncommitted transactions could throw a NullPointerException.
...@@ -8630,7 +8630,7 @@ For RUNSCRIPT and SCRIPT (commands and tools), use UTF-8 by default. ...@@ -8630,7 +8630,7 @@ For RUNSCRIPT and SCRIPT (commands and tools), use UTF-8 by default.
Set h2.maxMemoryRowsDistinct to a lower value. Set h2.maxMemoryRowsDistinct to a lower value.
@roadmap_1015_li @roadmap_1015_li
Enable h2.optimizeInsertFromSelect (speed up insert into ... select). Enable h2.optimizeInsertFromSelect (speed up CREATE TABLE ... AS SELECT).
@roadmap_1016_h2 @roadmap_1016_h2
Priority 1 Priority 1
......
...@@ -1523,7 +1523,7 @@ Centralリポジトリの利用 ...@@ -1523,7 +1523,7 @@ Centralリポジトリの利用
#Next Version (unreleased) #Next Version (unreleased)
@changelog_1002_li @changelog_1002_li
#New experimental feature to speed up CREATE TABLE ... AS SELECT and INSERT INTO ... SELECT. To enable the feature, set the system property h2.optimizeInsertFromSelect to true. For large queries, performance can be doubled. #New experimental feature to speed up CREATE TABLE ... AS SELECT. To enable the feature, set the system property h2.optimizeInsertFromSelect to true. For large queries, performance can be doubled.
@changelog_1003_li @changelog_1003_li
#When LOB objects are stored in the database (using the experimental setting h2.lobInDatabase), and using the MVCC mode, opening a database with uncommitted transactions could throw a NullPointerException. #When LOB objects are stored in the database (using the experimental setting h2.lobInDatabase), and using the MVCC mode, opening a database with uncommitted transactions could throw a NullPointerException.
...@@ -8630,7 +8630,7 @@ H2 コンソール アプリケーション ...@@ -8630,7 +8630,7 @@ H2 コンソール アプリケーション
#Set h2.maxMemoryRowsDistinct to a lower value. #Set h2.maxMemoryRowsDistinct to a lower value.
@roadmap_1015_li @roadmap_1015_li
#Enable h2.optimizeInsertFromSelect (speed up insert into ... select). #Enable h2.optimizeInsertFromSelect (speed up CREATE TABLE ... AS SELECT).
@roadmap_1016_h2 @roadmap_1016_h2
#Priority 1 #Priority 1
......
...@@ -506,7 +506,7 @@ build_1095_li=The rail images (one straight, four junctions, two turns) are gene ...@@ -506,7 +506,7 @@ build_1095_li=The rail images (one straight, four junctions, two turns) are gene
build_1096_p=\ To generate railroad diagrams for other grammars, see the package <code>org.h2.jcr</code>. This package is used to generate the SQL-2 railroad diagrams for the JCR 2.0 specification. build_1096_p=\ To generate railroad diagrams for other grammars, see the package <code>org.h2.jcr</code>. This package is used to generate the SQL-2 railroad diagrams for the JCR 2.0 specification.
changelog_1000_h1=Change Log changelog_1000_h1=Change Log
changelog_1001_h2=Next Version (unreleased) changelog_1001_h2=Next Version (unreleased)
changelog_1002_li=New experimental feature to speed up CREATE TABLE ... AS SELECT and INSERT INTO ... SELECT. To enable the feature, set the system property h2.optimizeInsertFromSelect to true. For large queries, performance can be doubled. changelog_1002_li=New experimental feature to speed up CREATE TABLE ... AS SELECT. To enable the feature, set the system property h2.optimizeInsertFromSelect to true. For large queries, performance can be doubled.
changelog_1003_li=When LOB objects are stored in the database (using the experimental setting h2.lobInDatabase), and using the MVCC mode, opening a database with uncommitted transactions could throw a NullPointerException. changelog_1003_li=When LOB objects are stored in the database (using the experimental setting h2.lobInDatabase), and using the MVCC mode, opening a database with uncommitted transactions could throw a NullPointerException.
changelog_1004_li=Support of stored procedures with OUT parameters in CallableStatement is implemented. changelog_1004_li=Support of stored procedures with OUT parameters in CallableStatement is implemented.
changelog_1005_li=PreparedStatement.getMetaData() was not always consistent with resulting ResultSet.getMetaData(). changelog_1005_li=PreparedStatement.getMetaData() was not always consistent with resulting ResultSet.getMetaData().
...@@ -2875,7 +2875,7 @@ roadmap_1011_li=Enable h2.dropRestrict (default action for DROP is RESTRICT). Ch ...@@ -2875,7 +2875,7 @@ roadmap_1011_li=Enable h2.dropRestrict (default action for DROP is RESTRICT). Ch
roadmap_1012_li=Use Lucene 3 by default. roadmap_1012_li=Use Lucene 3 by default.
roadmap_1013_li=For RUNSCRIPT and SCRIPT (commands and tools), use UTF-8 by default. roadmap_1013_li=For RUNSCRIPT and SCRIPT (commands and tools), use UTF-8 by default.
roadmap_1014_li=Set h2.maxMemoryRowsDistinct to a lower value. roadmap_1014_li=Set h2.maxMemoryRowsDistinct to a lower value.
roadmap_1015_li=Enable h2.optimizeInsertFromSelect (speed up insert into ... select). roadmap_1015_li=Enable h2.optimizeInsertFromSelect (speed up CREATE TABLE ... AS SELECT).
roadmap_1016_h2=Priority 1 roadmap_1016_h2=Priority 1
roadmap_1017_li=Bugfixes roadmap_1017_li=Bugfixes
roadmap_1018_li=Test if out of disk space can corrupt a database. roadmap_1018_li=Test if out of disk space can corrupt a database.
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论