Fix for handling LOBs during recovery

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

@@ -456,25 +456,31 @@ public class LobStorageBackend implements LobStorageInterface {
             synchronized (conn.getSession()) {
                 try {
                     init();
-                    long lobId = getNextLobId();
-                    String sql = "INSERT INTO " + LOB_MAP + "(LOB, SEQ, POS, HASH, BLOCK) " +
-                            "SELECT ?, SEQ, POS, HASH, BLOCK FROM " + LOB_MAP + " WHERE LOB = ?";
-                    PreparedStatement prep = prepare(sql);
-                    prep.setLong(1, lobId);
-                    prep.setLong(2, oldLobId);
-                    prep.executeUpdate();
-                    reuse(sql, prep);
-
-                    sql = "INSERT INTO " + LOBS + "(ID, BYTE_COUNT, TABLE) " +
-                            "SELECT ?, BYTE_COUNT, ? FROM " + LOBS + " WHERE ID = ?";
-                    prep = prepare(sql);
-                    prep.setLong(1, lobId);
-                    prep.setLong(2, tableId);
-                    prep.setLong(3, oldLobId);
-                    prep.executeUpdate();
-                    reuse(sql, prep);
-
-                    ValueLobDb v = ValueLobDb.create(type, database, tableId, lobId, null, length);
+                    ValueLobDb v = null;
+                    if(!old.isRecoveryReference()){
+                        long lobId = getNextLobId();
+                        String sql = "INSERT INTO " + LOB_MAP + "(LOB, SEQ, POS, HASH, BLOCK) " +
+                                "SELECT ?, SEQ, POS, HASH, BLOCK FROM " + LOB_MAP + " WHERE LOB = ?";
+                        PreparedStatement prep = prepare(sql);
+                        prep.setLong(1, lobId);
+                        prep.setLong(2, oldLobId);
+                        prep.executeUpdate();
+                        reuse(sql, prep);
+
+                        sql = "INSERT INTO " + LOBS + "(ID, BYTE_COUNT, TABLE) " +
+                                "SELECT ?, BYTE_COUNT, ? FROM " + LOBS + " WHERE ID = ?";
+                        prep = prepare(sql);
+                        prep.setLong(1, lobId);
+                        prep.setLong(2, tableId);
+                        prep.setLong(3, oldLobId);
+                        prep.executeUpdate();
+                        reuse(sql, prep);
+
+                        v = ValueLobDb.create(type, database, tableId, lobId, null, length);
+                    }else{
+                        //Recovery process, no need to copy LOB using normal infrastructure
+                        v = ValueLobDb.create(type, database, tableId, oldLobId, null, length);
+                    }
                     return v;
                 } catch (SQLException e) {
                     throw DbException.convert(e);

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

@@ -218,8 +218,10 @@ public class Recover extends Tool implements DataHandler {
             long precision) {
         DataHandler h = ((JdbcConnection) conn).getSession().getDataHandler();
         verifyPageStore(h);
-        return ValueLobDb.create(Value.BLOB, h, LobStorageFrontend.TABLE_TEMP,
+        ValueLobDb lob = ValueLobDb.create(Value.BLOB, h, LobStorageFrontend.TABLE_TEMP,
                 lobId, null, precision);
+        lob.setRecoveryReference(true);
+        return lob;
     }
 
     private static void verifyPageStore(DataHandler h) {
@@ -237,8 +239,10 @@ public class Recover extends Tool implements DataHandler {
             long precision) {
         DataHandler h = ((JdbcConnection) conn).getSession().getDataHandler();
         verifyPageStore(h);
-        return ValueLobDb.create(Value.CLOB, h, LobStorageFrontend.TABLE_TEMP,
+        ValueLobDb lob =  ValueLobDb.create(Value.CLOB, h, LobStorageFrontend.TABLE_TEMP,
                 lobId, null, precision);
+        lob.setRecoveryReference(true);
+        return lob;
     }
 
     /**

h2/src/main/org/h2/value/ValueLobDb.java

@@ -54,6 +54,11 @@ public class ValueLobDb extends Value implements Value.ValueClob,
     private final FileStore tempFile;
     private int tableId;
     private int hash;
+    
+    //Arbonaut: 13.07.2016
+    // Fix for recovery tool.
+    
+    private boolean isRecoveryReference = false;
 
     private ValueLobDb(int type, DataHandler handler, int tableId, long lobId,
             byte[] hmac, long precision) {
@@ -664,4 +669,12 @@ public class ValueLobDb extends Value implements Value.ValueClob,
         return new ValueLobDb(type, small, precision);
     }
 
+    
+    public void setRecoveryReference(boolean isRecoveryReference) {
+        this.isRecoveryReference = isRecoveryReference;
+    }
+    
+    public boolean isRecoveryReference() {
+        return isRecoveryReference;
+    }
 }