New experimental page store.

h2/src/docsrc/html/history.html

@@ -100,7 +100,8 @@ spread the word and have translated this project. Also many thanks to the donors
 via PayPal:
 </p>
 <ul>
-<li>Donald Bleyl, USA
+<li><a href="http://skycash.com">SkyCash, Poland</a>
+</li><li>Donald Bleyl, USA
 </li><li>lumber-mill.co.jp, Japan
 </li><li>Frank Berger, Germany
 </li><li>Ashwin Jayaprakash, USA
@@ -112,7 +113,7 @@ via PayPal:
 </li><li>Elisabetta Berlini, Italy
 </li><li>William Gilbert, USA
 </li><li>Antonio Dieguez, Chile
-</li><li><a href="http://ontologyworks.com/">Ontology Works, USA</a>
+</li><li><a href="http://ontologyworks.com">Ontology Works, USA</a>
 </li><li>Pete Haidinyak, USA
 </li><li>William Osmond, USA
 </li><li>Joachim Ansorg, Germany

h2/src/docsrc/html/links.html

@@ -355,6 +355,11 @@ by the user; require a license to Oracle; lack advanced
 query/retrieval; and the ability to handle chemical structures.
 </p>
 
+<p><a href="http://www.nuxeo.org">
+Nuxeo</a><br />
+Standards-based, open source platform for building ECM applications.
+</p>
+
 <p><a href="http://www.nwiresoftware.com">
 nWire</a><br />
 Eclipse plug-in which expedites Java development.

h2/src/main/org/h2/command/dml/TransactionCommand.java

@@ -14,6 +14,7 @@ import org.h2.engine.Session;
 import org.h2.log.LogSystem;
 import org.h2.message.Message;
 import org.h2.result.LocalResult;
+import org.h2.store.PageStore;
 
 /**
  * Represents a transactional statement.
@@ -122,6 +123,10 @@ public class TransactionCommand extends Prepared {
             break;
         case CHECKPOINT:
             session.getUser().checkAdmin();
+            PageStore store = session.getDatabase().getPageStore();
+            if (store != null) {
+                store.checkpoint();
+            }
             session.getDatabase().getLog().checkpoint();
             session.getDatabase().getTempFileDeleter().deleteUnused();
             break;

h2/src/main/org/h2/engine/Database.java

@@ -1134,6 +1134,9 @@ public class Database implements DataHandler {
             }
             log = null;
         }
+        if (pageStore != null) {
+            pageStore.checkpoint();
+        }
         closeFiles();
         if (persistent && lock == null && fileLockMethod != FileLock.LOCK_NO) {
             // everything already closed (maybe in checkPowerOff)
@@ -1165,7 +1168,6 @@ public class Database implements DataHandler {
                 fileIndex = null;
             }
             if (pageStore != null) {
-                pageStore.checkpoint();
                 pageStore.close();
                 pageStore = null;
             }

h2/src/main/org/h2/index/Page.java

@@ -6,7 +6,6 @@
  */
 package org.h2.index;
 
-
 /**
  * A page.
  */

h2/src/main/org/h2/index/PageDataLeaf.java

@@ -21,7 +21,8 @@ import org.h2.util.IntArray;
  * <ul><li>0-3: parent page id (0 for root)
  * </li><li>4-4: page type
  * </li><li>5-6: entry count
- * </li><li>only if there is overflow: 7-10: overflow page id
+ * </li><li>7-10: table id
+ * </li><li>only if there is overflow: 11-14: overflow page id
  * </li><li>list of key / offset pairs (4 bytes key, 2 bytes offset)
  * </li></ul>
  * The format of an overflow page is:
@@ -34,6 +35,11 @@ import org.h2.util.IntArray;
  */
 class PageDataLeaf extends PageData {
 
+    private static final int KEY_OFFSET_PAIR_LENGTH = 6;
+    private static final int KEY_OFFSET_PAIR_START = 11;
+    private static final int OVERFLOW_DATA_START_MORE = 9;
+    private static final int OVERFLOW_DATA_START_LAST = 7;
+
     /**
      * The row offsets.
      */
@@ -61,7 +67,7 @@ class PageDataLeaf extends PageData {
 
     PageDataLeaf(PageScanIndex index, int pageId, int parentPageId, DataPage data) {
         super(index, pageId, parentPageId, data);
-        start = 7;
+        start = KEY_OFFSET_PAIR_START;
     }
 
     void read() throws SQLException {
@@ -94,7 +100,7 @@ class PageDataLeaf extends PageData {
         // TODO currently the order is important
         // TODO and can only add at the end
         int last = entryCount == 0 ? pageSize : offsets[entryCount - 1];
-        if (entryCount > 0 && last - rowLength < start + 6) {
+        if (entryCount > 0 && last - rowLength < start + KEY_OFFSET_PAIR_LENGTH) {
             int todoSplitAtLastInsertionPoint;
             return (entryCount / 2) + 1;
         }
@@ -117,7 +123,7 @@ class PageDataLeaf extends PageData {
             }
         }
         entryCount++;
-        start += 6;
+        start += KEY_OFFSET_PAIR_LENGTH;
         newOffsets[x] = offset;
         newKeys[x] = row.getPos();
         newRows[x] = row;
@@ -138,7 +144,7 @@ class PageDataLeaf extends PageData {
             do {
                 int next = index.getPageStore().allocatePage();
                 array.add(next);
-                remaining -= pageSize - 7;
+                remaining -= pageSize - OVERFLOW_DATA_START_LAST;
                 if (remaining > 0) {
                     remaining += 2;
                 }
@@ -165,7 +171,7 @@ class PageDataLeaf extends PageData {
         System.arraycopy(offsets, i + 1, newOffsets, i, entryCount - i);
         System.arraycopy(keys, i + 1, newKeys, i, entryCount - i);
         System.arraycopy(rows, i + 1, newRows, i, entryCount - i);
-        start -= 6;
+        start -= KEY_OFFSET_PAIR_LENGTH;
         offsets = newOffsets;
         keys = newKeys;
         rows = newRows;
@@ -182,10 +188,6 @@ class PageDataLeaf extends PageData {
      * @return the row
      */
     Row getRowAt(int at) throws SQLException {
-        int test;
-if(rows == null) {
-    System.out.println("stop");
-}
         Row r = rows[at];
         if (r == null) {
             if (firstOverflowPageId != 0) {
@@ -199,12 +201,12 @@ if(rows == null) {
                     int type = page.readByte();
                     if (type == (Page.TYPE_DATA_OVERFLOW | Page.FLAG_LAST)) {
                         int size = page.readShortInt();
-                        data.write(page.getBytes(), 7, size);
+                        data.write(page.getBytes(), OVERFLOW_DATA_START_LAST, size);
                         break;
                     } else {
                         next = page.readInt();
-                        int size = pageSize - 9;
-                        data.write(page.getBytes(), 9, size);
+                        int size = pageSize - OVERFLOW_DATA_START_MORE;
+                        data.write(page.getBytes(), OVERFLOW_DATA_START_MORE, size);
                     }
                 }
             }
@@ -335,7 +337,7 @@ if(rows == null) {
                 overflow.reset();
                 overflow.writeInt(parent);
                 int size;
-                if (remaining > pageSize - 7) {
+                if (remaining > pageSize - OVERFLOW_DATA_START_LAST) {
                     overflow.writeByte((byte) Page.TYPE_DATA_OVERFLOW);
                     overflow.writeInt(overflowPageIds[i + 1]);
                     size = pageSize - overflow.length();

h2/src/main/org/h2/log/LogSystem.java

@@ -633,7 +633,7 @@ public class LogSystem {
      *
      * @return true if it is
      */
-    boolean getFlushOnEachCommit() {
+    public boolean getFlushOnEachCommit() {
         return flushOnEachCommit;
     }
 

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

@@ -453,6 +453,7 @@ CREATE SEQUENCE [IF NOT EXISTS] newSequenceName
 [CACHE long]
 ","
 Creates a new sequence. The data type of a sequence is BIGINT.
+Used values are never re-used, even when the transaction is rolled back.
 The cache is the number of pre-allocated numbers. If the system crashes without closing the
 database, at most this many numbers are lost. The default cache size is 32.
 ","
@@ -475,6 +476,7 @@ Cached tables (the default) are persistent, and the number or rows is not limite
 Memory tables are persistent, but the index data is kept in the main memory, so memory tables should not get too large.
 Temporary tables are not persistent. Temporary tables can be global (accessible by all connections)
 or local (only accessible by the current connection). The default is for temporary tables is global.
+Identity and auto-increment columns are columns with a sequence as the default.
 ","
 CREATE TABLE TEST(ID INT PRIMARY KEY, NAME VARCHAR(255))
 "
@@ -1667,6 +1669,7 @@ IDENTITY
 ","
 Auto-Increment value.
 Possible values: -9223372036854775808 to 9223372036854775807.
+Used values are never re-used, even when the transaction is rolled back.
 See also java.lang.Long.
 ","
 IDENTITY
@@ -2989,6 +2992,7 @@ MEMORY_USED()
 NEXTVAL([schemaName, ] sequenceString): long
 ","
 Returns the next value of the sequence.
+Used values are never re-used, even when the transaction is rolled back.
 If the schema name is not set, the current schema is used.
 If the schema name is not set, the sequence name is converted to uppercase (for compatibility).
 ","

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

@@ -43,6 +43,7 @@ public class PageLog {
     private int firstPage;
     private DataPage data;
     private boolean recoveryRunning;
+    private long operation;
 
     PageLog(PageStore store, int firstPage) {
         this.store = store;
@@ -57,7 +58,7 @@ public class PageLog {
      */
     void openForWriting() {
         trace.debug("log openForWriting");
-        pageOut = new PageOutputStream(store, 0, firstPage, Page.TYPE_LOG);
+        pageOut = new PageOutputStream(store, 0, firstPage, Page.TYPE_LOG, true);
         out = new DataOutputStream(pageOut);
     }
 
@@ -150,7 +151,7 @@ public class PageLog {
             out.write(page.getBytes(), 0, store.getPageSize());
             undo.set(pageId);
         } catch (IOException e) {
-            throw Message.convertIOException(e, "recovering");
+            throw Message.convertIOException(e, null);
         }
     }
 
@@ -164,8 +165,11 @@ public class PageLog {
             trace.debug("log commit");
             out.write(COMMIT);
             out.writeInt(session.getId());
+            if (store.getDatabase().getLog().getFlushOnEachCommit()) {
+                flush();
+            }
         } catch (IOException e) {
-            throw Message.convertIOException(e, "recovering");
+            throw Message.convertIOException(e, null);
         }
     }
 
@@ -186,6 +190,9 @@ public class PageLog {
                 trace.debug("log " + (add?"+":"-") + " table:" + tableId +
                         " remaining:" + pageOut.getRemainingBytes() + " row:" + row);
             }
+            int todoLogPosShouldBeLong;
+            session.addLogPos(0, (int) operation);
+            row.setLastLog(0, (int) operation);
             out.write(add ? ADD : REMOVE);
             out.writeInt(session.getId());
             out.writeInt(tableId);
@@ -220,6 +227,7 @@ public class PageLog {
      */
     public void flush() throws SQLException {
         try {
+            int todoUseLessSpace;
             trace.debug("log flush");
             out.flush();
             int filler = pageOut.getRemainingBytes();

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

@@ -26,6 +26,7 @@ public class PageOutputStream extends OutputStream {
     private int nextPage;
     private DataPage page;
     private int remaining;
+    private final boolean allocateAtEnd;
 
     /**
      * Create a new page output stream.
@@ -35,12 +36,13 @@ public class PageOutputStream extends OutputStream {
      * @param headPage the first page
      * @param type the page type
      */
-    public PageOutputStream(PageStore store, int parentPage, int headPage, int type) {
+    public PageOutputStream(PageStore store, int parentPage, int headPage, int type, boolean allocateAtEnd) {
         this.trace = store.getTrace();
         this.store = store;
         this.parentPage = parentPage;
         this.nextPage = headPage;
         this.type = type;
+        this.allocateAtEnd = allocateAtEnd;
         page = store.createDataPage();
         initPage();
     }
@@ -73,7 +75,7 @@ public class PageOutputStream extends OutputStream {
             parentPage = nextPage;
             pageId = nextPage;
             try {
-                nextPage = store.allocatePage();
+                nextPage = store.allocatePage(allocateAtEnd);
             } catch (SQLException e) {
                 throw Message.convertToIOException(e);
             }

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

@@ -105,7 +105,7 @@ public class PageStore implements CacheWriter {
         this.database = database;
         trace = database.getTrace(Trace.PAGE_STORE);
         int test;
-//trace.setLevel(TraceSystem.DEBUG);
+// trace.setLevel(TraceSystem.DEBUG);
         this.fileName = fileName;
         this.accessMode = accessMode;
         this.cacheSize = cacheSizeDefault;
@@ -189,6 +189,10 @@ public class PageStore implements CacheWriter {
      */
     public void checkpoint() throws SQLException {
         trace.debug("checkpoint");
+        if (log == null) {
+            // the file was never fully opened
+            return;
+        }
         synchronized (database) {
             database.checkPowerOff();
             ObjectArray list = cache.getAllChanged();
@@ -345,25 +349,33 @@ public class PageStore implements CacheWriter {
      * @return the page id
      */
     public int allocatePage() throws SQLException {
-        if (freePageCount == 0) {
-            if (pageCount * pageSize >= fileLength) {
-                increaseFileSize(INCREMENT_PAGES);
+        return allocatePage(false);
+    }
+
+    /**
+     * Allocate a page.
+     *
+     * @param atEnd if the allocated page must be at the end of the file
+     * @return the page id
+     */
+    public int allocatePage(boolean atEnd) throws SQLException {
+        if (freePageCount > 0 && !atEnd) {
+            if (freeListRootPageId == 0) {
+                Message.throwInternalError();
             }
+            PageFreeList free = (PageFreeList) cache.find(freeListRootPageId);
+            if (free == null) {
+                free = new PageFreeList(this, freeListRootPageId, 0);
+                free.read();
+            }
+            int id = free.allocate();
+            freePageCount--;
+            return id;
         }
-        if (lastUsedPage < pageCount) {
-            return ++lastUsedPage;
-        }
-        if (freeListRootPageId == 0) {
-            Message.throwInternalError();
-        }
-        PageFreeList free = (PageFreeList) cache.find(freeListRootPageId);
-        if (free == null) {
-            free = new PageFreeList(this, freeListRootPageId, 0);
-            free.read();
+        if (lastUsedPage >= pageCount) {
+            increaseFileSize(INCREMENT_PAGES);
         }
-        int id = free.allocate();
-        freePageCount--;
-        return id;
+        return ++lastUsedPage;
     }
 
     private void increaseFileSize(int increment) throws SQLException {

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

@@ -282,9 +282,6 @@ java org.h2.test.TestAll timer
 
 /*
 
-document: sequences and auto-increment number
-that were used once are never re-used
-
 JCR: for each node type, create a table; one 'dynamic' table with parameter;
     option to cache the results
 <link rel="icon" type="image/png" href="/path/image.png">

h2/src/test/org/h2/test/TestBase.java

@@ -1037,6 +1037,7 @@ public abstract class TestBase {
      */
     public static TestBase createCaller() {
         String className = new Exception().getStackTrace()[1].getClassName();
+        org.h2.Driver.load();
         try {
             return (TestBase) Class.forName(className).newInstance();
         } catch (Exception e) {

h2/src/test/org/h2/test/db/TestOpenClose.java

@@ -23,7 +23,16 @@ import org.h2.util.FileUtils;
  */
 public class TestOpenClose extends TestBase implements DatabaseEventListener {
 
-    int nextId = 10;
+    private int nextId = 10;
+
+    /**
+     * Run just this test.
+     *
+     * @param a ignored
+     */
+    public static void main(String[] a) throws Exception {
+        TestBase.createCaller().init().test();
+    }
 
     public void test() throws Exception {
         testCloseDelay();
@@ -35,6 +44,7 @@ public class TestOpenClose extends TestBase implements DatabaseEventListener {
     }
 
     private void testCloseDelay() throws Exception {
+        deleteDb(baseDir, "openClose");
         String url = getURL("openClose;DB_CLOSE_DELAY=1", true);
         String user = getUser(), password = getPassword();
         Connection conn = DriverManager.getConnection(url, user, password);

h2/src/test/org/h2/test/unit/TestPageStore.java

@@ -99,7 +99,7 @@ public class TestPageStore extends TestBase {
         if (file) {
             out = new BufferedOutputStream(new FileOutputStream(f), 4 * 1024);
         } else {
-            out = new PageOutputStream(store, 0, head, Page.TYPE_LOG);
+            out = new PageOutputStream(store, 0, head, Page.TYPE_LOG, false);
         }
         for (int i = 0; i < count; i++) {
             out.write(buff);
@@ -139,7 +139,7 @@ public class TestPageStore extends TestBase {
             byte[] data = new byte[len];
             random.nextBytes(data);
             int head = store.allocatePage();
-            PageOutputStream out = new PageOutputStream(store, 0, head, Page.TYPE_LOG);
+            PageOutputStream out = new PageOutputStream(store, 0, head, Page.TYPE_LOG, false);
             for (int p = 0; p < len;) {
                 int l = len == 0 ? 0 : Math.min(len - p, random.nextInt(len / 10));
                 out.write(data, p, l);

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

@@ -578,4 +578,4 @@ connecturl problematic transformation lazy querydsl squill empire liq fle
 xive evolving mssqlserver eric respond faulhaber fixing northern lying
 federal santa america county clara courts california york venue away stages
 titles headers grew orchestration social razor finder ranging friend intervals
-bot jot delicious rife appenders circles spelling
+bot jot delicious rife appenders circles spelling cash sky ecm nuxeo poland