Merge pull request h2database#4094 from andreitokar/issue_4075

Issue 4075

h2/src/main/org/h2/mvstore/FileStore.java

@@ -693,7 +693,9 @@ private boolean isSeasonedChunk(C chunk, long time) {
     }
 
     private boolean isRewritable(C chunk, long time) {
-        return chunk.isRewritable() && isSeasonedChunk(chunk, time);
+        return chunk.isRewritable() && isSeasonedChunk(chunk, time)
+                // to prevent last saved chunk from being re-written as it may cause "endless" re-write loop
+                && chunk.version < getMvStore().getCurrentVersion() - 1;
     }
 
     /**

h2/src/main/org/h2/mvstore/MVStoreTool.java

@@ -153,6 +153,7 @@ public static void dump(String fileName, Writer writer, boolean details) {
                 Chunk c;
                 try {
                     c = new SFChunk(Chunk.readChunkHeader(buffer));
+                    c.block = pos / blockSize;
                 } catch (MVStoreException e) {
                     // Chunks are not always contiguous (due to chunk compaction/move/drop and space re-use)
                     // Blocks following a chunk can therefore contain something else than a valid chunk header

h2/src/main/org/h2/mvstore/RandomAccessStore.java

@@ -657,11 +657,11 @@ private boolean moveChunk(SFChunk chunk, long reservedAreaLow, long reservedArea
         assert reservedAreaHigh > 0 || block <= chunk.block : block + " " + chunk;
         ByteBuffer readBuff = readFully(chunk, start, length);
         writeFully(null, pos, readBuff);
-        free(start, length);
-        // can not set chunk's new block/len until it's fully written at new location,
+        // can not set chunk's new block until it's fully written at new location,
         // because concurrent reader can pick it up prematurely,
         chunk.block = block;
         chunk.next = 0;
+        free(start, length);
         saveChunkMetadataChanges(chunk);
         return true;
     }