New experimental page store.

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

@@ -6,10 +6,10 @@
  */
 package org.h2.store;
 
+import java.io.EOFException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.sql.SQLException;
-import org.h2.message.Message;
 import org.h2.message.Trace;
 
 /**
@@ -71,7 +71,7 @@ public class PageInputStream extends InputStream {
             remaining -= l;
             return l;
         } catch (SQLException e) {
-            throw Message.convertToIOException(e);
+            throw new EOFException();
         }
     }
 

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

@@ -61,9 +61,11 @@ public class PageLog {
     private Trace trace;
 
     private DataOutputStream out;
+    private ByteArrayOutputStream buffer;
     private PageOutputStream pageOut;
     private DataInputStream in;
     private int firstTrunkPage;
+    private int firstDataPage;
     private DataPage data;
     private int logId, logPos;
     private int firstLogId;
@@ -82,9 +84,13 @@ public class PageLog {
      *
      * @param firstTrunkPage the first trunk page
      */
-    void openForWriting(int firstTrunkPage) {
+    void openForWriting(int firstTrunkPage) throws SQLException {
         trace.debug("log openForWriting firstPage:" + firstTrunkPage);
         pageOut = new PageOutputStream(store, firstTrunkPage);
+        pageOut.reserve(1);
+        store.setLogFirstPage(firstTrunkPage, pageOut.getCurrentDataPageId());
+        buffer = new ByteArrayOutputStream();
+        out = new DataOutputStream(buffer);
     }
 
     /**
@@ -95,10 +101,7 @@ public class PageLog {
      */
     void openForReading(int firstTrunkPage, int firstDataPage) {
         this.firstTrunkPage = firstTrunkPage;
-        in = new DataInputStream(new PageInputStream(store, firstTrunkPage, firstDataPage));
-        if (trace.isDebugEnabled()) {
-            trace.debug("log openForReading firstPage:" + firstTrunkPage);
-        }
+        this.firstDataPage = firstDataPage;
     }
 
     /**
@@ -112,6 +115,7 @@ public class PageLog {
         if (trace.isDebugEnabled()) {
             trace.debug("log recover undo:" + undo);
         }
+        in = new DataInputStream(new PageInputStream(store, firstTrunkPage, firstDataPage));
         int logId = 0;
         DataPage data = store.createDataPage();
         try {
@@ -209,15 +213,21 @@ public class PageLog {
                 trace.debug("log undo " + pageId);
             }
             undo.set(pageId);
-            pageOut.reserve(store.getPageSize() * 3);
             out.write(UNDO);
             out.writeInt(pageId);
             out.write(page.getBytes(), 0, store.getPageSize());
+            flushOut();
         } catch (IOException e) {
             throw Message.convertIOException(e, null);
         }
     }
 
+    private void flushOut() throws IOException {
+        out.flush();
+        pageOut.write(buffer.toByteArray());
+        buffer.reset();
+    }
+
     /**
      * Mark a committed transaction.
      *
@@ -233,9 +243,9 @@ public class PageLog {
                 // database already closed
                 return;
             }
-            pageOut.reserve(store.getPageSize());
             out.write(COMMIT);
             out.writeInt(session.getId());
+            flushOut();
             if (log.getFlushOnEachCommit()) {
                 flush();
             }
@@ -264,14 +274,13 @@ public class PageLog {
             data.reset();
             int todoWriteIntoOutputDirectly;
             row.write(data);
-
-            pageOut.reserve(data.length() + store.getPageSize());
             out.write(add ? ADD : REMOVE);
             out.writeInt(session.getId());
             out.writeInt(tableId);
             out.writeInt(row.getPos());
             out.writeInt(data.length());
             out.write(data.getBytes(), 0, data.length());
+            flushOut();
         } catch (IOException e) {
             throw Message.convertIOException(e, null);
         }
@@ -282,7 +291,7 @@ public class PageLog {
      */
     void flush() throws SQLException {
         try {
-            out.flush();
+            pageOut.flush();
         } catch (IOException e) {
             throw Message.convertIOException(e, null);
         }

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

@@ -88,8 +88,8 @@ public class PageOutputStream extends OutputStream {
         write(b, 0, b.length);
     }
 
-    private void initNextData() {
-        int nextData = trunk == null ? 0 : trunk.getNextDataPage();
+    private void initNextData() throws SQLException {
+        int nextData = trunk == null ? -1 : trunk.getNextDataPage();
         if (nextData == -1) {
             int parent = trunkPageId;
             if (trunkNext == 0) {
@@ -105,9 +105,11 @@ public class PageOutputStream extends OutputStream {
             }
             trunkNext = reservedPages.get(len);
             trunk = new PageStreamTrunk(store, parent, trunkPageId, trunkNext, pageIds);
-            reservedPages.removeRange(0, len + 1);
+            trunk.write(null);
+            reservedPages.removeRange(0, len);
+            nextData = trunk.getNextDataPage();
         }
-        data = new PageStreamData(store, trunk.getNextDataPage(), trunk.getPos());
+        data = new PageStreamData(store, nextData, trunk.getPos());
         data.initWrite();
     }
 
@@ -118,12 +120,12 @@ public class PageOutputStream extends OutputStream {
         if (writing) {
             Message.throwInternalError("writing while still writing");
         }
-        writing = true;
         try {
             reserve(len);
-            while (len >= 0) {
+            writing = true;
+            while (len > 0) {
                 int l = data.write(b, off, len);
-                if (l <= len) {
+                if (l < len) {
                     data.write(null);
                     initNextData();
                 }

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

@@ -61,9 +61,9 @@ import org.h2.value.ValueString;
  * <li>12-15: log data page (initially 5)</li>
  * <li>16-23: checksum of bytes 0-15 (CRC32)</li>
  * </ul>
- * Page 2 contains the first free list page.
- * Page 3 contains the meta table root page.
- * For a new database, page 4 contains the first log trunk page.
+ * Page 3 contains the first free list page.
+ * Page 4 contains the meta table root page.
+ * For a new database, page 5 contains the first log trunk page.
  */
 public class PageStore implements CacheWriter {
 
@@ -123,6 +123,7 @@ public class PageStore implements CacheWriter {
 
     private static final int PAGE_ID_FREE_LIST_ROOT = 2;
     private static final int PAGE_ID_META_ROOT = 3;
+    private static final int PAGE_ID_LOG_TRUNK = 5;
 
     private static final int INCREMENT_PAGES = 128;
 
@@ -221,27 +222,38 @@ public class PageStore implements CacheWriter {
             if (FileUtils.exists(fileName)) {
                 // existing
                 file = database.openFile(fileName, accessMode, true);
-                readHeader();
+                readStaticHeader();
                 freeListPagesPerList = PageFreeList.getPagesAddressed(pageSize);
                 fileLength = file.length();
                 pageCount = (int) (fileLength / pageSize);
+                if (pageCount < 6) {
+                    // not enough pages - must be a new database
+                    // that didn't get created correctly
+                    throw Message.getSQLException(ErrorCode.FILE_CORRUPTED_1, fileName);
+                }
+                readVariableHeader();
                 log = new PageLog(this);
+                log.openForReading(logFirstTrunkPage, logFirstDataPage);
                 recover(true);
                 recover(false);
+                recoveryRunning = true;
+                log.openForWriting(logFirstTrunkPage);
+                recoveryRunning = false;
                 checkpoint();
             } else {
                 // new
                 setPageSize(PAGE_SIZE_DEFAULT);
                 freeListPagesPerList = PageFreeList.getPagesAddressed(pageSize);
                 file = database.openFile(fileName, accessMode, false);
-                logFirstTrunkPage = 4;
-                pageCount = 5;
-                increaseFileSize(INCREMENT_PAGES - pageCount);
+                recoveryRunning = true;
+                increaseFileSize(INCREMENT_PAGES);
                 writeStaticHeader();
                 log = new PageLog(this);
-                log.openForWriting(logFirstTrunkPage);
                 openMetaIndex();
+                logFirstTrunkPage = allocatePage();
+                log.openForWriting(logFirstTrunkPage);
                 systemTableHeadPos = Index.EMPTY_HEAD;
+                recoveryRunning = false;
             }
             // lastUsedPage = getFreeList().getLastUsed() + 1;
         } catch (SQLException e) {
@@ -293,7 +305,7 @@ public class PageStore implements CacheWriter {
         log.removeUntil(firstUncommittedLog);
     }
 
-    private void readHeader() throws SQLException {
+    private void readStaticHeader() throws SQLException {
         long length = file.length();
         if (length < PAGE_SIZE_MIN * 2) {
             throw Message.getSQLException(ErrorCode.FILE_CORRUPTED_1, fileName);
@@ -317,6 +329,10 @@ public class PageStore implements CacheWriter {
             accessMode = "r";
             file = database.openFile(fileName, accessMode, true);
         }
+    }
+
+    private void readVariableHeader() throws SQLException {
+        DataPage page = DataPage.create(database, pageSize);
         for (int i = 1;; i++) {
             if (i == 3) {
                 throw Message.getSQLException(ErrorCode.FILE_CORRUPTED_1, fileName);
@@ -385,16 +401,17 @@ public class PageStore implements CacheWriter {
     }
 
     private void writeVariableHeader() throws SQLException {
-        DataPage page = DataPage.create(database, new byte[pageSize]);
+        DataPage page = DataPage.create(database, pageSize);
         page.writeLong(writeCounter);
         page.writeInt(logFirstTrunkPage);
+        page.writeInt(logFirstDataPage);
         CRC32 crc = new CRC32();
-        crc.update(page.getBytes(), 0, 12);
+        crc.update(page.getBytes(), 0, page.length());
         page.writeLong(crc.getValue());
         file.seek(pageSize);
-        file.write(page.getBytes(), 0, page.length());
+        file.write(page.getBytes(), 0, pageSize);
         file.seek(pageSize + pageSize);
-        file.write(page.getBytes(), 0, page.length());
+        file.write(page.getBytes(), 0, pageSize);
     }
 
     /**
@@ -413,7 +430,9 @@ public class PageStore implements CacheWriter {
     }
 
     public void flushLog() throws SQLException {
-        log.flush();
+        if (file != null) {
+            log.flush();
+        }
     }
 
     public Trace getTrace() {
@@ -478,10 +497,15 @@ public class PageStore implements CacheWriter {
         } else {
             p = i * freeListPagesPerList;
         }
+        while (p >= pageCount) {
+            increaseFileSize(INCREMENT_PAGES);
+        }
         PageFreeList list = (PageFreeList) getRecord(p);
         if (list == null) {
             list = new PageFreeList(this, p);
-            list.read();
+            if (p < pageCount) {
+                list.read();
+            }
             cache.put(list);
         }
         return list;
@@ -515,9 +539,6 @@ public class PageStore implements CacheWriter {
         } else {
             // TODO could remember the first possible free list page
             for (int i = 0;; i++) {
-                if (i * freeListPagesPerList > pageCount) {
-                    increaseFileSize(INCREMENT_PAGES);
-                }
                 PageFreeList list = getFreeList(i);
                 if (!list.isFull()) {
                     pos = list.allocate();
@@ -660,12 +681,13 @@ public class PageStore implements CacheWriter {
      */
     private void recover(boolean undo) throws SQLException {
         trace.debug("log recover #" + undo);
-        if (!undo) {
-            openMetaIndex();
-            readMetaData();
-        }
+
         try {
             recoveryRunning = true;
+            if (!undo) {
+                openMetaIndex();
+                readMetaData();
+            }
             log.recover(undo);
             if (!undo) {
                 switchLog();

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

@@ -43,6 +43,7 @@ public class PageStreamData extends Record {
     void read() throws SQLException {
         data = store.createDataPage();
         store.readPage(getPos(), data);
+        data.setPos(4);
         int t = data.readByte();
         if (t != Page.TYPE_STREAM_DATA) {
             throw Message.getSQLException(ErrorCode.FILE_CORRUPTED_1, "pos:" + getPos() + " type:" + t +

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

@@ -62,6 +62,7 @@ public class PageStreamTrunk extends Record {
         }
         nextTrunk = data.readInt();
         pageCount = data.readInt();
+        pageIds = new int[pageCount];
         for (int i = 0; i < pageCount; i++) {
             pageIds[i] = data.readInt();
         }