New experimental page store.

h2/src/docsrc/html/changelog.html

@@ -18,7 +18,7 @@ Change Log
 <h1>Change Log</h1>
 
 <h2>Next Version (unreleased)</h2>
-<ul><li>-
+<ul><li>Bugfixes in the new storage mechanism (page store).
 </li></ul>
 
 <h2>Version 1.1.115 (2009-06-21)</h2>

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

@@ -320,12 +320,18 @@ public class ConnectionInfo implements Cloneable {
      */
     String getName() throws SQLException {
         if (persistent) {
-            String n = FileUtils.normalize(name + Constants.SUFFIX_DATA_FILE);
+            String suffix;
+            if (SysProperties.PAGE_STORE) {
+                suffix = Constants.SUFFIX_PAGE_FILE;
+            } else {
+                suffix = Constants.SUFFIX_DATA_FILE;
+            }
+            String n = FileUtils.normalize(name + suffix);
             String fileName = FileUtils.getFileName(n);
-            if (fileName.length() < Constants.SUFFIX_DATA_FILE.length() + 1) {
+            if (fileName.length() < suffix.length() + 1) {
                 throw Message.getSQLException(ErrorCode.INVALID_DATABASE_NAME_1, name);
             }
-            n = n.substring(0, n.length() - Constants.SUFFIX_DATA_FILE.length());
+            n = n.substring(0, n.length() - suffix.length());
             return FileUtils.normalize(n);
         }
         return name;

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

@@ -531,17 +531,21 @@ public class Database implements DataHandler {
 
     private synchronized void open(int traceLevelFile, int traceLevelSystemOut) throws SQLException {
         if (persistent) {
+            boolean exists;
             if (SysProperties.PAGE_STORE) {
                 String pageFileName = databaseName + Constants.SUFFIX_PAGE_FILE;
-                if (FileUtils.exists(pageFileName) && FileUtils.isReadOnly(pageFileName)) {
+                exists = FileUtils.exists(pageFileName);
+                if (exists && FileUtils.isReadOnly(pageFileName)) {
                     readOnly = true;
                 }
-            }
+            } else {
                 String dataFileName = databaseName + Constants.SUFFIX_DATA_FILE;
+                exists = FileUtils.exists(dataFileName);
                 if (FileUtils.exists(dataFileName)) {
                     // if it is already read-only because ACCESS_MODE_DATA=r
                     readOnly = readOnly | FileUtils.isReadOnly(dataFileName);
                 }
+            }
             if (readOnly) {
                 traceSystem = new TraceSystem(null, false);
             } else {
@@ -573,7 +577,7 @@ public class Database implements DataHandler {
                 getPageStore();
                 starting = false;
             }
-            if (FileUtils.exists(dataFileName)) {
+            if (exists) {
                 lobFilesInDirectories &= !ValueLob.existsLobFile(getDatabasePath());
                 lobFilesInDirectories |= FileUtils.exists(databaseName + Constants.SUFFIX_LOBS_DIRECTORY);
             }

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

@@ -114,7 +114,7 @@ public class Engine {
                 try {
                     backup = (ConnectionInfo) ci.clone();
                 } catch (CloneNotSupportedException e) {
-                    // ignore (can not occur)
+                    throw Message.getInternalError("clone failed", e);
                 }
             }
             Session session = openSession(ci);

h2/src/main/org/h2/tools/Backup.java

@@ -16,6 +16,7 @@ import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 
 import org.h2.command.dml.BackupCommand;
+import org.h2.constant.SysProperties;
 import org.h2.engine.Constants;
 import org.h2.message.Message;
 import org.h2.store.FileLister;
@@ -107,10 +108,16 @@ public class Backup extends Tool {
             ZipOutputStream zipOut = new ZipOutputStream(fileOut);
             String base = "";
             for (String fileName : list) {
+                if (SysProperties.PAGE_STORE) {
+                    if (fileName.endsWith(Constants.SUFFIX_PAGE_FILE)) {
+                        base = FileUtils.getParent(fileName);
+                    }
+                } else {
                     if (fileName.endsWith(Constants.SUFFIX_DATA_FILE)) {
                         base = FileUtils.getParent(fileName);
                     }
                 }
+            }
             for (String fileName : list) {
                 String f = FileUtils.getAbsolutePath(fileName);
                 if (!f.startsWith(base)) {