--no commit message

--no commit message

h2/src/main/org/h2/index/PageBtreeLeaf.java

@@ -222,6 +222,7 @@ class PageBtreeLeaf extends PageBtree {
     }
 
     void remapChildren() {
+        // nothing to do
     }
 
     /**

h2/src/main/org/h2/index/PageDataLeafOverflow.java

@@ -46,12 +46,12 @@ public class PageDataLeafOverflow extends Record {
     /**
      * The previous page (overflow or leaf).
      */
-    private final int previous;
+    private final int previousPage;
 
     /**
      * The next overflow page, or 0.
      */
-    private final int next;
+    private final int nextPage;
 
     /**
      * The number of content bytes.
@@ -70,8 +70,8 @@ public class PageDataLeafOverflow extends Record {
         this.leaf = leaf;
         setPos(pageId);
         this.type = type;
-        this.previous = previous;
-        this.next = next;
+        this.previousPage = previous;
+        this.nextPage = next;
         this.offset = offset;
         this.size = size;
     }
@@ -81,14 +81,14 @@ public class PageDataLeafOverflow extends Record {
         setPos(pageId);
         this.data = data;
         this.offset = offset;
-        previous = data.readInt();
+        previousPage = data.readInt();
         type = data.readByte();
         if (type == (Page.TYPE_DATA_OVERFLOW | Page.FLAG_LAST)) {
             size = data.readShortInt();
-            next = 0;
+            nextPage = 0;
         } else if (type == Page.TYPE_DATA_OVERFLOW) {
             size = leaf.getPageStore().getPageSize() - START_MORE;
-            next = data.readInt();
+            nextPage = data.readInt();
         } else {
             throw Message.getSQLException(ErrorCode.FILE_CORRUPTED_1, "page:" + getPos() + " type:" + type);
         }
@@ -106,7 +106,7 @@ public class PageDataLeafOverflow extends Record {
             return 0;
         }
         target.write(data.getBytes(), START_MORE, size);
-        return next;
+        return nextPage;
     }
 
     public int getByteCount(DataPage dummy) {
@@ -117,10 +117,10 @@ public class PageDataLeafOverflow extends Record {
         PageStore store = leaf.getPageStore();
         DataPage overflow = store.createDataPage();
         DataPage data = leaf.getDataPage();
-        overflow.writeInt(previous);
+        overflow.writeInt(previousPage);
         overflow.writeByte((byte) type);
         if (type == Page.TYPE_DATA_OVERFLOW) {
-            overflow.writeInt(next);
+            overflow.writeInt(nextPage);
         } else {
             overflow.writeShortInt(size);
         }
@@ -129,7 +129,7 @@ public class PageDataLeafOverflow extends Record {
     }
 
     public String toString() {
-        return "page[" + getPos() + "] data leaf overflow prev:" + previous + " next:" + next;
+        return "page[" + getPos() + "] data leaf overflow prev:" + previousPage + " next:" + nextPage;
     }
 
     /**

h2/src/main/org/h2/jdbc/JdbcConnection.java

@@ -22,7 +22,6 @@ import java.sql.Statement;
 import java.util.Map;
 import java.util.Properties;
 
-
 import org.h2.command.CommandInterface;
 import org.h2.constant.ErrorCode;
 import org.h2.constant.SysProperties;

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

@@ -83,10 +83,6 @@ public class PageFreeList extends Record {
      */
     void free(int pageId) throws SQLException {
         full = false;
-int test;
-if (pageId - getPos() <= 0) {
-    System.out.println("stop!");
-}
         used.clear(pageId - getPos());
         store.updateRecord(this, true, data);
     }

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

@@ -22,12 +22,10 @@ import org.h2.index.PageBtreeIndex;
 import org.h2.index.PageScanIndex;
 import org.h2.log.InDoubtTransaction;
 import org.h2.log.LogSystem;
-import org.h2.log.SessionState;
 import org.h2.message.Message;
 import org.h2.message.Trace;
 import org.h2.message.TraceSystem;
 import org.h2.result.Row;
-import org.h2.result.SortOrder;
 import org.h2.schema.Schema;
 import org.h2.table.Column;
 import org.h2.table.IndexColumn;
@@ -968,8 +966,8 @@ public class PageStore implements CacheWriter {
     }
 
     /**
-     * Commit or rollback a prepared transaction after opening a database with in-doubt
-     * transactions.
+     * Commit or rollback a prepared transaction after opening a database with
+     * in-doubt transactions.
      *
      * @param sessionId the session id
      * @param pageId the page where the transaction was prepared

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

@@ -807,13 +807,13 @@ public class Recover extends Tool implements DataHandler {
                 case Page.TYPE_BTREE_NODE:
                     writer.println("-- page " + page + ": btree node" + (last ? "(last)" : ""));
                     if (trace) {
-                        dumpPageBtreeNode(store, pageSize, writer, s, last, page);
+                        dumpPageBtreeNode(writer, s);
                     }
                     break;
                 case Page.TYPE_BTREE_LEAF:
                     writer.println("-- page " + page + ": btree leaf " + (last ? "(last)" : ""));
                     if (trace) {
-                        dumpPageBtreeLeaf(store, pageSize, writer, s, last, page);
+                        dumpPageBtreeLeaf(writer, s);
                     }
                     break;
                 case Page.TYPE_FREE_LIST:
@@ -1012,7 +1012,7 @@ public class Recover extends Tool implements DataHandler {
         }
     }
 
-    private void dumpPageBtreeNode(FileStore store, int pageSize, PrintWriter writer, DataPage s, boolean last, long pageId) {
+    private void dumpPageBtreeNode(PrintWriter writer, DataPage s) {
         int entryCount = s.readShortInt();
         int rowCount = s.readInt();
         int[] children = new int[entryCount + 1];
@@ -1038,7 +1038,7 @@ public class Recover extends Tool implements DataHandler {
         writer.println("-- [" + entryCount + "] child: " + children[entryCount] + " rowCount: " + rowCount);
     }
 
-    private void dumpPageBtreeLeaf(FileStore store, int pageSize, PrintWriter writer, DataPage s, boolean last, long pageId) {
+    private void dumpPageBtreeLeaf(PrintWriter writer, DataPage s) {
         s.readInt();
         int entryCount = s.readShortInt();
         int[] offsets = new int[entryCount];

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

@@ -21,8 +21,8 @@ import org.h2.constant.SysProperties;
 public class ObjectArray<T> implements Iterable<T> {
     private static final int CAPACITY_INIT = 4, CAPACITY_SHRINK = 256;
 
+    int size;
     private T[] data;
-    private int size;
 
     private ObjectArray(int capacity) {
         data = createArray(capacity);
@@ -323,7 +323,7 @@ public class ObjectArray<T> implements Iterable<T> {
     /**
      * The iterator for this list.
      */
-    private class ObjectArrayIterator implements Iterator<T> {
+    class ObjectArrayIterator implements Iterator<T> {
         private int index;
 
         public boolean hasNext() {

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

@@ -29,13 +29,15 @@ package org.h2.util;
  *</pre>
  */
 public class StatementBuilder {
-    private StringBuilder builder = new StringBuilder();
+
+    private final StringBuilder builder = new StringBuilder();
     private int index;
 
     /**
      * Create a new builder.
      */
     public StatementBuilder() {
+        // nothing to do
     }
 
     /**

h2/src/test/org/h2/test/unit/TestPageStore.java

@@ -13,8 +13,6 @@ import java.sql.Statement;
 import java.util.Random;
 import java.util.Set;
 import java.util.TreeSet;
-import org.h2.engine.ConnectionInfo;
-import org.h2.engine.Database;
 import org.h2.test.TestBase;
 
 /**