Page store bugfixes

h2/src/docsrc/html/changelog.html

@@ -18,7 +18,11 @@ Change Log
 <h1>Change Log</h1>
 
 <h2>Next Version (unreleased)</h2>
-<ul><li>Issue 119: JaQu creates wrong WHERE condition on some inputs.
+<ul><li>The new page store mechanism is now alpha-level quality. The next release
+    will most likely be "1.2.120 beta" where this mode is enabled by default. To use
+    it right now, append ;PAGE_STORE=TRUE to the database URL. The file format
+    of this mode will probably not change any more.
+</li><li>Issue 119: JaQu creates wrong WHERE conditions on some inputs.
 </li><li>SELECT COUNT(*) FROM SYSTEM_RANGE(...) returned the wrong result. Fixed.
 </li><li>The Recover tool now also processes the log files, however applying those changes
     is still a manual process.

h2/src/docsrc/html/roadmap.html

@@ -83,6 +83,7 @@ See also <a href="build.html#providing_patches">Providing Patches</a>.
 </li><li>Index usage for (ID, NAME)=(1, 'Hi'); document
 </li><li>Make DDL (Data Definition) operations transactional
 </li><li>RANK() and DENSE_RANK(), Partition using OVER()
+</li><li>Set a connection read only (Connection.setReadOnly) or using a connection parameter
 </li><li>Suggestion: include Jetty as Servlet Container (like LAMP)
 </li><li>Trace shipping to server
 </li><li>Version check: docs / web console (using Javascript), and maybe in the library (using TCP/IP)
@@ -249,7 +250,6 @@ See also <a href="build.html#providing_patches">Providing Patches</a>.
 </li><li>Support N'text'
 </li><li>Pure SQL triggers (example: update parent table if the child table is changed).
 </li><li>Support SCOPE_IDENTITY() to avoid problems when inserting rows in a trigger
-</li><li>Set a connection read only (Connection.setReadOnly)
 </li><li>In MySQL mode, for AUTO_INCREMENT columns, don't set the primary key
 </li><li>Use JDK 1.4 file locking to create the lock file (but not yet by default); writing a system property to detect concurrent access from the same VM (different classloaders).
 </li><li>Support compatibility for jdbc:hsqldb:res:

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

@@ -149,8 +149,8 @@ public class PageStore implements CacheWriter {
     private static final int META_TYPE_BTREE_INDEX = 1;
     private static final int META_TABLE_ID = -1;
 
-    private static final int MAX_COMACT_TIME = 2000;
-    private static final int MAX_COMACT_COUNT = Integer.MAX_VALUE;
+    private static final int MAX_COMPACT_TIME = 2000;
+    private static final int MAX_COMPACT_COUNT = Integer.MAX_VALUE;
 
     private static final SearchRow[] EMPTY_SEARCH_ROW = new SearchRow[0];
 
@@ -373,8 +373,8 @@ public class PageStore implements CacheWriter {
             recoveryRunning = false;
         }
         long start = System.currentTimeMillis();
-        int maxCompactTime = MAX_COMACT_TIME;
-        int maxMove = MAX_COMACT_COUNT;
+        int maxCompactTime = MAX_COMPACT_TIME;
+        int maxMove = MAX_COMPACT_COUNT;
         for (int x = lastUsed, j = 0; x > MIN_PAGE_COUNT && j < maxMove; x--, j++) {
             compact(x);
             long now = System.currentTimeMillis();
@@ -1461,6 +1461,7 @@ public class PageStore implements CacheWriter {
      * Check if the stored checksum is correct
      * @param d the data
      * @param pageId the page id
+     * @param pageSize the page size
      * @return true if it is correct
      */
     public static boolean checksumTest(byte[] d, int pageId, int pageSize) {

h2/src/test/org/h2/test/TestAll.java

@@ -299,6 +299,8 @@ java org.h2.test.TestAll timer
 
 /*
 
+test cacheTQ
+
 javadoc: constructor parameters are not verified (PageOutputStream)
 
 System.setProperty("h2.optimizeInList", "true");

h2/src/test/org/h2/test/synth/TestBtreeIndex.java

@@ -91,8 +91,11 @@ public class TestBtreeIndex extends TestBase {
         StringBuilder buff = new StringBuilder();
         for (int j = 0; j < prefixLength; j++) {
             buff.append("x");
+            if (buff.length() % 10 == 0) {
+                buff.append(buff.length());
+            }
         }
-        String prefix = buff.toString();
+        String prefix = buff.toString().substring(0, prefixLength);
         DeleteDbFiles.execute(baseDir, null, true);
         Connection conn = getConnection("index");
         try {
@@ -148,6 +151,17 @@ public class TestBtreeIndex extends TestBase {
             testCount = 0;
             ResultSet rs = stat.executeQuery("SELECT text FROM a ORDER BY text");
             ResultSet rs2 = conn.createStatement().executeQuery("SELECT text FROM a ORDER BY 'x' || text");
+
+//System.out.println("-----------");
+//while(rs.next()) {
+//    System.out.println(rs.getString(1));
+//}
+//System.out.println("-----------");
+//while(rs2.next()) {
+//    System.out.println(rs2.getString(1));
+//}
+//if (true) throw new Error("stop");
+//
             testCount = 0;
             while (rs.next() && rs2.next()) {
                 if (!rs.getString(1).equals(rs2.getString(1))) {

h2/src/tools/org/h2/build/doc/dictionary.txt

@@ -611,4 +611,4 @@ daload dstore saload anewarray tableswitch lushr ladd lshr lreturn acmpne
 locals multianewarray icmpne fneg faload ifeq decompiler zeroes forgot
 modern slight boost characteristics significantly gae vfs centrally ten
 approach risky getters suxxess gmb delegate delegating delegates collisions
-linkage superfluous
+linkage superfluous disallow scoop moebius inputs
\ No newline at end of file