--no commit message

--no commit message

h2/src/docsrc/html/history.html

@@ -35,6 +35,8 @@ Hypersonic SQL or HSQLDB. H2 is built from scratch.
 <h3>Version 1.0 (Current)</h3>
 
 <h3>Version 1.0 / 2007-TODO</h3><ul>
+<li>In some situations the log file got corrupt if the process was terminated while the database was opening.
+<li>Using ;RECOVER=1 in the database URL threw a syntax exception. Fixed.
 <li>If a CLOB or BLOB was deleted in a transaction and the database crashed before the transaction was committed or rolled back,
 	the object was lost if it was large. Fixed.
 <li>Now using ant-build.properties. The jdk is automatically updated when using ant codeswitch_...

h2/src/main/org/h2/command/Parser.java

@@ -3364,6 +3364,9 @@ public class Parser {
         } else if(readIf("DB_CLOSE_ON_EXIT")) {
             read();
             return new NoOperation(session);
+        } else if(readIf("RECOVER")) {
+            read();
+            return new NoOperation(session);            
         } else if(readIf("SCHEMA")) {
             Set command = new Set(session, SetTypes.SCHEMA);
             command.setString(readAliasIdentifier());

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

@@ -523,7 +523,7 @@ public class Database implements DataHandler {
         removeUnusedStorages();
         systemSession.commit();
         if(!readOnly) {
-            emergencyReserve = openFile(createTempFile(), true);
+            emergencyReserve = openFile(createTempFile(), false);
             emergencyReserve.autoDelete();
             emergencyReserve.setLength(Constants.EMERGENCY_SPACE_INITIAL);
         }

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

@@ -194,7 +194,9 @@ public class DiskFile implements CacheWriter {
             ObjectArray list = database.getAllStorages();
             for(int i=0; i<list.size(); i++) {
                 Storage s = (Storage)list.get(i);
-                database.removeStorage(s.getId(), this);
+                if(s.getDiskFile() == this) {
+                    database.removeStorage(s.getId(), this);
+                }
             }
             reset();
             initAlreadyTried = false;
@@ -304,6 +306,7 @@ public class DiskFile implements CacheWriter {
     }
 
     synchronized void flush() throws SQLException {
+        database.checkPowerOff();
         ObjectArray list = cache.getAllChanged();
         CacheObject.sort(list);
         for(int i=0; i<list.size(); i++) {

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

@@ -281,15 +281,6 @@ public class LogFile {
         default:
             throw Message.getInternalError("type="+type);
         }
-        if(undo) {
-            int posNow = getBlock();
-            in.setInt(0, -blocks);
-            in.fill(blocks * BLOCK_SIZE);
-            in.updateChecksum();
-            go(pos);
-            file.write(in.getBytes(), 0, BLOCK_SIZE * blocks);
-            go(posNow);
-        }
         return true;
     }
     
@@ -341,7 +332,7 @@ public class LogFile {
         if(bufferPos > 0) {
             if(file == null) {
                 throw Message.getSQLException(Message.SIMULATED_POWER_OFF);
-            }                
+            }
             file.write(buffer, 0, bufferPos);
             for(int i=0; i<unwritten.size(); i++) {
                 Record r = (Record) unwritten.get(i);

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

@@ -34,6 +34,7 @@ import org.h2.store.FileStore;
 import org.h2.store.FileStoreInputStream;
 import org.h2.store.LogFile;
 import org.h2.util.ByteUtils;
+import org.h2.util.FileUtils;
 import org.h2.util.IOUtils;
 import org.h2.util.ObjectArray;
 import org.h2.util.RandomUtils;
@@ -300,8 +301,9 @@ public class Recover implements DataHandler {
     private void dumpLob(String fileName, boolean lobCompression) {
         FileOutputStream out = null;
         FileStore store = null;
+        int size = 0;
+        String n = fileName + (lobCompression ? ".comp" : "") + ".txt";
         try {
-            String n = fileName + (lobCompression ? ".comp" : "") + ".txt";
             out = new FileOutputStream(n);
             textStorage = Database.isTextStorage(fileName, false);
             byte[] magic = Database.getMagic(textStorage);
@@ -315,13 +317,24 @@ public class Recover implements DataHandler {
                     break;
                 }
                 out.write(buffer, 0, l);
+                size += l;
             }
         } catch(Throwable e) {
-            logError(fileName, e);
+            // this is usually not a problem, because we try both compressed and uncompressed
+            if(log) {
+                logError(fileName, e);
+            }
         } finally {
             IOUtils.closeSilently(out);
             closeSilently(store);
         }
+        if(size == 0) {
+            try {
+                FileUtils.delete(n);
+            } catch (SQLException e) {
+                logError(n, e);
+            }
+        }
     }
     
     private void dumpLog(String fileName) throws SQLException {
@@ -371,14 +384,17 @@ public class Recover implements DataHandler {
                     byte[] b2 = new byte[blocks * blockSize];
                     System.arraycopy(buff, 0, b2, 0, blockSize);
                     buff = b2;
-                    store.readFully(buff, blockSize, blocks * blockSize - blockSize);
+                    try {
+                        store.readFully(buff, blockSize, blocks * blockSize - blockSize);
+                    } catch(SQLException e) {
+                        break;
+                    }
                     s = DataPage.create(this, buff);
                     s.check(blocks * blockSize);
-                } else {
-                    s.reset();
                 }
-                blocks = s.readInt();
-                if(blocks<=0) {
+                s.reset();
+                blocks = Math.abs(s.readInt());
+                if(blocks==0) {
                     writer.println("// [" + pos+"] blocks: "+blocks+" (end)");
                     break;
                 } else {
@@ -386,12 +402,12 @@ public class Recover implements DataHandler {
                     int sessionId = s.readInt();
                     if(type == 'P') {
                         String transaction = s.readString();
-                        writer.println("//   prepared session:"+sessionId+" tx: " + transaction);
+                        writer.println("//   prepared session:"+sessionId+" tx:" + transaction);
                     } else if(type == 'C') {
                         writer.println("//   commit session:" + sessionId);
                     } else {
                         int storageId = s.readInt();
-                        int recordId = s.readInt();
+                        int recId = s.readInt();
                         int blockCount = s.readInt();
                         if(type != 'T') {
                             s.readDataPageNoSize();
@@ -404,21 +420,21 @@ public class Recover implements DataHandler {
                             if(sumLength > 0) {
                                 s.read(summary, 0, sumLength);
                             }
-                            writer.println("//   summary session:"+sessionId+" fileType: " + fileType + " sumLength: " + sumLength);
+                            writer.println("//   summary session:"+sessionId+" fileType:" + fileType + " sumLength:" + sumLength);
                             dumpSummary(writer, summary);
                             break;
                         }
                         case 'T':
-                            writer.println("//   truncate session:"+sessionId+" storage: " + storageId + " recordId: " + recordId + " blockCount: "+blockCount);
+                            writer.println("//   truncate session:"+sessionId+" storage:" + storageId + " pos:" + recId + " blockCount:"+blockCount);
                             break;
                         case 'I':
-                            writer.println("//   insert session:"+sessionId+" storage: " + storageId + " recordId: " + recordId + " blockCount: "+blockCount);
+                            writer.println("//   insert session:"+sessionId+" storage:" + storageId + " pos:" + recId + " blockCount:"+blockCount);
                             break;
                         case 'D':
-                            writer.println("//   delete session:"+sessionId+" storage: " + storageId + " recordId: " + recordId + " blockCount: "+blockCount);
+                            writer.println("//   delete session:"+sessionId+" storage:" + storageId + " pos:" + recId + " blockCount:"+blockCount);
                             break;
                         default:
-                            writer.println("//   type?:"+type+" session:"+sessionId+" storage: " + storageId + " recordId: " + recordId + " blockCount: "+blockCount);
+                            writer.println("//   type?:"+type+" session:"+sessionId+" storage:" + storageId + " pos:" + recId + " blockCount:"+blockCount);
                             break;
                         }
                     }                    
@@ -441,8 +457,20 @@ public class Recover implements DataHandler {
             DataInputStream in = new DataInputStream(new ByteArrayInputStream(summary));
             int b2 = in.readInt();
             for(int i=0; i<b2 / 8; i++) {
-                in.read();
+                int x = in.read();
+                if((i % 8) == 0) {
+                    writer.print("//  ");
+                }
+                writer.print(" " + Long.toString(i * 8) + ":");
+                for(int j=0; j<8; j++) {
+                    writer.print(((x & 1) == 1) ? "1" : "0");
+                    x >>>= 1;
+                }
+                if((i % 8) == 7) {
+                    writer.println("");
+                }
             }
+            writer.println("//");
             int len = in.readInt();
             for(int i=0; i<len; i++) {
                 int storageId = in.readInt();
@@ -542,7 +570,7 @@ public class Recover implements DataHandler {
         PrintWriter writer = null;        
         FileStore store = null;
         try {
-            databaseName = fileName.substring(fileName.length() - Constants.SUFFIX_DATA_FILE.length());
+            databaseName = fileName.substring(0, fileName.length() - Constants.SUFFIX_DATA_FILE.length());
             writer = getWriter(fileName, ".sql");
             ObjectArray schema = new ObjectArray();
             HashSet objectIdSet = new HashSet();
@@ -578,6 +606,7 @@ public class Recover implements DataHandler {
                     blockCount = 1;
                     continue;
                 }
+                writer.println("-- block " + block + " - " + (block + blockCount-1));
                 try {
                     s.checkCapacity(blockCount * blockSize);
                 } catch(OutOfMemoryError e) {
@@ -643,11 +672,12 @@ public class Recover implements DataHandler {
                 sb.append("INSERT INTO O_" + storageId + " VALUES(");
                 for(valueId=0; valueId<recordLength; valueId++) {
                     try {
-                        data[valueId] = s.readValue();
+                        Value v = s.readValue();
+                        data[valueId] = v;
                         if(valueId>0) {
                             sb.append(", ");
                         }
-                        sb.append(data[valueId].getSQL());
+                        sb.append(v.getSQL());
                     } catch(Exception e) {
                         writeDataError(writer, "exception " + e, s.getBytes(), blockCount);
                         continue;

h2/src/main/org/h2/util/FileUtils.java

@@ -117,14 +117,18 @@ public class FileUtils {
         if(oldFile.getName().equals(newFile.getName())) {
             throw Message.getInternalError("rename file old=new");
         }
-        if(oldFile.exists() && !newFile.exists()) {
-            for(int i=0; i<16; i++) {
-                boolean ok = oldFile.renameTo(newFile);
-                if(ok) {
-                    return;
-                }
-                wait(i);
+        if(!oldFile.exists()) {
+            throw Message.getSQLException(Message.FILE_RENAME_FAILED_2, new String[]{oldName, newName}, null);
+        }            
+        if(newFile.exists()) {
+            throw Message.getSQLException(Message.FILE_RENAME_FAILED_2, new String[]{oldName, newName}, null);
+        }
+        for(int i=0; i<16; i++) {
+            boolean ok = oldFile.renameTo(newFile);
+            if(ok) {
+                return;
             }
+            wait(i);
         }
         throw Message.getSQLException(Message.FILE_RENAME_FAILED_2, new String[]{oldName, newName}, null);
     }