MVStore mode: in-memory databases now also use the MVStore.

h2/src/docsrc/html/changelog.html

@@ -18,7 +18,8 @@ Change Log
 <h1>Change Log</h1>
 
 <h2>Next Version (unreleased)</h2>
-<ul><li>In server mode, appending ";autocommit=false" to the database URL was working,
+<ul><li>MVStore mode: in-memory databases now also use the MVStore.
+</li><li>In server mode, appending ";autocommit=false" to the database URL was working,
     but the return value of Connection.getAutoCommit() was wrong.
 </li><li>OSGi: the import package declaration of org.h2 excluded version 1.4.
 </li><li>Issue 558: with the MVStore, a NullPointerException could occur when using LOBs

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

@@ -20,9 +20,9 @@ public class Constants {
     public static final String BUILD_DATE = "2014-04-12";
 
     /**
-     * The build date is updated for each public release.
+     * The build date of the last stable release.
      */
-    public static final String BUILD_DATE_STABLE = "2014-01-18";
+    public static final String BUILD_DATE_STABLE = "2014-04-05";
 
     /**
      * The build id is incremented for each public release.

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

@@ -669,6 +669,7 @@ public class Database implements DataHandler {
             }
             traceSystem = new TraceSystem(null);
             trace = traceSystem.getTrace(Trace.DATABASE);
+            getPageStore();
         }
         systemUser = new User(this, 0, SYSTEM_USER_NAME, true);
         mainSchema = new Schema(this, 0, Constants.SCHEMA_MAIN, systemUser, true);

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

@@ -110,7 +110,7 @@ public class UndoLogRecord {
             try {
                 table.addRow(session, row);
                 table.fireAfterRow(session, null, row, true);
-                // reset session id, otherwise other session think
+                // reset session id, otherwise other sessions think
                 // that this row was inserted by this session
                 row.commit();
             } catch (DbException e) {

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

@@ -54,7 +54,6 @@ MVStore:
 
 - automated 'kill process' and 'power failure' test
 - test and possibly improve compact operation (for large dbs)
-- possibly split chunk metadata into immutable and mutable
 - compact: avoid processing pages using a counting bloom filter
 - defragment (re-creating maps, specially those with small pages)
 - store number of write operations per page (maybe defragment
@@ -109,6 +108,9 @@ MVStore:
 - test chunk id rollover
 - feature to auto-compact from time to time and on close
 - compact very small chunks
+- Page: to save memory, combine keys & values into one array 
+    (also children & counts). Maybe remove some other 
+    fields (childrenCount for example)
 
 */
 

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

@@ -90,6 +90,11 @@ public class Page {
      */
     private long[] children;
 
+    /**
+     * The entry count for the given children.
+     */
+    private long[] counts;
+
     /**
      * The child pages.
      * <p>
@@ -97,11 +102,6 @@ public class Page {
      */
     private Page[] childrenPages;
 
-    /**
-     * The entry count for the given children.
-     */
-    private long[] counts;
-
     Page(MVMap<?, ?> map, long version) {
         this.map = map;
         this.version = version;
@@ -318,7 +318,7 @@ public class Page {
         // the default value is used
         int x = cachedCompare - 1;
         if (x < 0 || x > high) {
-            x = (low + high) >>> 1;
+            x = high >>> 1;
         }
         Object[] k = keys;
         while (low <= high) {

h2/src/main/org/h2/mvstore/db/MVTableEngine.java

@@ -119,6 +119,7 @@ public class MVTableEngine implements TableEngine {
     public TableBase createTable(CreateTableData data) {
         Database db = data.session.getDatabase();
         if (!data.persistData) {
+            ; // TODO need in-memory tables for persistent stores
             return new RegularTable(data);
         }
         Store store = init(db);

h2/src/main/org/h2/schema/Schema.java

@@ -569,7 +569,7 @@ public class Schema extends DbObjectBase {
             }
             data.schema = this;
             if (data.tableEngine == null) {
-                if (database.getSettings().mvStore && database.isPersistent()) {
+                if (database.getSettings().mvStore) {
                     data.tableEngine = MVTableEngine.class.getName();
                 }
             }

h2/src/test/org/h2/test/db/TestCases.java

@@ -281,7 +281,7 @@ public class TestCases extends TestBase {
     private void testMaxMemoryRows() throws SQLException {
         deleteDb("cases");
         Connection conn = getConnection(
-                "cases;max_memory_rows=1");
+                "cases;MAX_MEMORY_ROWS=1");
         Statement stat = conn.createStatement();
         stat.execute("create table test(id int primary key)");
         stat.execute("insert into test values(1), (2)");

h2/src/test/org/h2/test/mvcc/TestMvcc3.java

@@ -11,6 +11,8 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Savepoint;
 import java.sql.Statement;
+
+import org.h2.api.ErrorCode;
 import org.h2.test.TestBase;
 
 /**
@@ -31,6 +33,7 @@ public class TestMvcc3 extends TestBase {
 
     @Override
     public void test() throws SQLException {
+        testFailedUpdate();
         testConcurrentUpdate();
         testInsertUpdateRollback();
         testCreateTableAsSelect();
@@ -40,6 +43,25 @@ public class TestMvcc3 extends TestBase {
         deleteDb("mvcc3");
     }
     
+    private void testFailedUpdate() throws SQLException {
+        deleteDb("mvcc3");
+        Connection conn = getConnection("mvcc3");
+        conn.setAutoCommit(false);
+        Statement stat = conn.createStatement();
+        stat.execute("create table test(id int primary key, a int unique, b int)");
+        stat.execute("insert into test values(1, 1, 1)");
+        stat.execute("insert into test values(2, 2, 2)");
+        assertThrows(ErrorCode.DUPLICATE_KEY_1, stat).execute("update test set a = 1 where id = 2");
+        ResultSet rs;
+        rs = stat.executeQuery("select * from test where id = 2");
+        assertTrue(rs.next());
+        rs = stat.executeQuery("select * from test where a = 2");
+        assertTrue(rs.next());
+        rs = stat.executeQuery("select * from test where b = 2");
+        assertTrue(rs.next());
+        conn.close();
+    }
+
     private void testConcurrentUpdate() throws SQLException {
         if (!config.mvcc) {
             return;

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

@@ -69,11 +69,10 @@ public class TestJmx extends TestBase {
                 getAttribute(name, "FileWriteCount").toString());
         assertEquals("0", mbeanServer.
                 getAttribute(name, "FileWriteCountTotal").toString());
-        assertEquals("0", mbeanServer.
+        assertEquals("1", mbeanServer.
                 getAttribute(name, "LogMode").toString());
-        // ignored for in-memory databases
-        mbeanServer.setAttribute(name, new Attribute("LogMode", 1));
-        assertEquals("0", mbeanServer.
+        mbeanServer.setAttribute(name, new Attribute("LogMode", 2));
+        assertEquals("2", mbeanServer.
                 getAttribute(name, "LogMode").toString());
         assertEquals("REGULAR", mbeanServer.
                 getAttribute(name, "Mode").toString());