--no commit message

--no commit message

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

@@ -42,7 +42,8 @@ public class ConnectionInfo {
         // TODO document these settings
         String[] connectionTime = new String[]{
                 "PASSWORD", "USER", "STORAGE", "FILE_LOCK", "CIPHER", "DB_CLOSE_ON_EXIT",
-                "IGNORE_UNKNOWN_SETTINGS", "IFEXISTS", "RECOVER", "CREATE", "CACHE_TYPE"
+                "IGNORE_UNKNOWN_SETTINGS", "IFEXISTS", "RECOVER", "CREATE", "CACHE_TYPE",
+                "WRITE_MODE_LOG", "WRITE_MODE_DATA"
         };
         for(int i=0; i<connectionTime.length; i++) {
             String key = connectionTime[i];

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

@@ -58,6 +58,7 @@ package org.h2.engine;
  * - TestSystemExit
  * - Test with hibernate
  * - Scan for viruses
+ * - Newsletter: send to h2database-news@googlegroups.com (http://groups.google.com/group/h2database-news)
  * - newsletter: prepare, send (always send to BCC!!)
  * - http://maven.apache.org/guides/mini/guide-ibiblio-upload.html
  * - Add to freshmeat, http://code.google.com/p/h2database/downloads/list
@@ -200,7 +201,7 @@ public class Constants {
     public static final String CONN_URL_INTERNAL = "jdbc:default:connection";
     public static final String CONN_URL_COLUMNLIST = "jdbc:columnlist:connection";
     
-    public static final int VIEW_COST_CACHE_SIZE = 64;
+    public static final int VIEW_INDEX_CACHE_SIZE = 64;
     public static final int VIEW_COST_CACHE_MAX_AGE = 10000; // 10 seconds
     public static final int MAX_PARAMETER_INDEX = 100000;
     

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

@@ -135,6 +135,7 @@ public class Database implements DataHandler {
     private String cacheType;
     private boolean indexSummaryValid = true;
     private Object lobSyncObject = new Object();
+    private String writeModeLog, writeModeData;
 
     public static void setInitialPowerOffCount(int count) {
         initialPowerOffCount = count;
@@ -291,11 +292,11 @@ public class Database implements DataHandler {
         return traceSystem.getTrace(module);
     }
 
-    public FileStore openFile(String name, boolean mustExist) throws SQLException {
+    public FileStore openFile(String name, String mode, boolean mustExist) throws SQLException {
         if(mustExist && !FileUtils.exists(name)) {
             throw Message.getSQLException(Message.FILE_NOT_FOUND_1, name);
         }
-        FileStore store = FileStore.open(this, name, getMagic(), cipher, filePasswordHash);
+        FileStore store = FileStore.open(this, name, mode, getMagic(), cipher, filePasswordHash);
         try {
             store.init();
         } catch(SQLException e) {
@@ -312,11 +313,11 @@ public class Database implements DataHandler {
     }
 
     private void openFileData() throws SQLException {
-        fileData = new DiskFile(this, databaseName+Constants.SUFFIX_DATA_FILE, true, true, Constants.DEFAULT_CACHE_SIZE);
+        fileData = new DiskFile(this, databaseName+Constants.SUFFIX_DATA_FILE, writeModeData, true, true, Constants.DEFAULT_CACHE_SIZE);
     }
 
     private void openFileIndex() throws SQLException {
-        fileIndex = new DiskFile(this, databaseName+Constants.SUFFIX_INDEX_FILE, false, logIndexChanges, Constants.DEFAULT_CACHE_SIZE_INDEX);
+        fileIndex = new DiskFile(this, databaseName+Constants.SUFFIX_INDEX_FILE, "rw", false, logIndexChanges, Constants.DEFAULT_CACHE_SIZE_INDEX);
     }
 
     public DataPage getDataPage() {
@@ -348,6 +349,8 @@ public class Database implements DataHandler {
         this.databaseShortName = parseDatabaseShortName();
         this.cipher = cipher;
         String lockMethodName = ci.removeProperty("FILE_LOCK", null);
+        this.writeModeLog = ci.removeProperty("WRITE_MODE_LOG", "rw").toLowerCase();
+        this.writeModeData = ci.removeProperty("WRITE_MODE_DATA", "rw").toLowerCase();
         this.fileLockMethod = FileLock.getFileLockMethod(lockMethodName);
         this.textStorage = ci.getTextStorage();
         this.databaseURL = ci.getURL();
@@ -522,7 +525,7 @@ public class Database implements DataHandler {
         removeUnusedStorages();
         systemSession.commit();
         if(!readOnly) {
-            emergencyReserve = openFile(createTempFile(), false);
+            emergencyReserve = openFile(createTempFile(), "rw", false);
             emergencyReserve.autoDelete();
             emergencyReserve.setLength(Constants.EMERGENCY_SPACE_INITIAL);
         }
@@ -1487,4 +1490,8 @@ public class Database implements DataHandler {
         return lobSyncObject;
     }
 
+    public String getWriteModeLog() {
+        return writeModeLog;
+    }
+
 }

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

@@ -356,16 +356,16 @@ public class SessionRemote implements SessionInterface, DataHandler {
         throw Message.getSQLException(Message.FILE_CORRUPTED_1, "wrong checksum");
     }
 
-    public FileStore openFile(String name, boolean mustExist) throws SQLException {
+    public FileStore openFile(String name, String mode, boolean mustExist) throws SQLException {
         if(mustExist && !FileUtils.exists(name)) {
             throw Message.getSQLException(Message.FILE_CORRUPTED_1, name);
         }
         FileStore store;
         byte[] magic = Constants.MAGIC_FILE_HEADER.getBytes();
         if(cipher == null) {
-            store = FileStore.open(this, name, magic);
+            store = FileStore.open(this, name, mode, magic);
         } else {
-            store = FileStore.open(this, name, magic, cipher, fileEncryptionKey, 0);
+            store = FileStore.open(this, name, mode, magic, cipher, fileEncryptionKey, 0);
         }
         store.setCheckedWriting(false);
         try {