Spellcheck / formatting / docs

h2/src/docsrc/text/_docs_en.utf8.txt

@@ -1655,7 +1655,7 @@ Issue 454: Use Charset for type-safety.
 Queries with both LIMIT and OFFSET could throw an IllegalArgumentException. 
 
 @changelog_1006_li
-MVStore: multiple issues were fixed: 460, 461, 462. 
+MVStore: multiple issues were fixed: 460, 461, 462, 464, 466. 
 
 @changelog_1007_li
 MVStore: larger stores (multiple GB) are now much faster. 

h2/src/docsrc/text/_docs_ja.utf8.txt

@@ -1655,7 +1655,7 @@ Centralリポジトリの利用
 #Queries with both LIMIT and OFFSET could throw an IllegalArgumentException. 
 
 @changelog_1006_li
-#MVStore: multiple issues were fixed: 460, 461, 462. 
+#MVStore: multiple issues were fixed: 460, 461, 462, 464, 466. 
 
 @changelog_1007_li
 #MVStore: larger stores (multiple GB) are now much faster. 

h2/src/docsrc/textbase/_docs_en.properties

@@ -550,7 +550,7 @@ changelog_1002_li=The auto-analyze feature now only reads 1000 rows per table in
 changelog_1003_li=The optimization for IN(...) queries combined with OR could result in a strange exception of the type "column x must be included in the group by list". 
 changelog_1004_li=Issue 454\: Use Charset for type-safety. 
 changelog_1005_li=Queries with both LIMIT and OFFSET could throw an IllegalArgumentException. 
-changelog_1006_li=MVStore\: multiple issues were fixed\: 460, 461, 462. 
+changelog_1006_li=MVStore\: multiple issues were fixed\: 460, 461, 462, 464, 466. 
 changelog_1007_li=MVStore\: larger stores (multiple GB) are now much faster. 
 changelog_1008_li=When using local temporary tables and not dropping them manually before closing the session, and then killing the process could result in a database that couldn't be opened (except when using the recover tool). 
 changelog_1009_li=Support TRUNC(timestamp) for improved Oracle compatibility. 

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

@@ -1334,7 +1334,7 @@ public class Session extends SessionWithState {
         }
         return startStatement;
     }
-    
+
     /**
      * Start a new statement within a transaction.
      */

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

@@ -1738,7 +1738,7 @@ public class MVStore {
     public boolean isClosed() {
         return closed;
     }
-    
+
     private void stopBackgroundThread() {
         if (backgroundThread == null) {
             return;
@@ -1768,7 +1768,7 @@ public class MVStore {
             backgroundThread = t;
         }
     }
-    
+
     public int getWriteDelay() {
         return writeDelay;
     }

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

@@ -100,7 +100,12 @@ public class MVTableEngine implements TableEngine {
         public List<MVTable> getTables() {
             return openTables;
         }
-        
+
+        /**
+         * Remove a table.
+         *
+         * @param table the table
+         */
         public void removeTable(MVTable table) {
             openTables.remove(table);
         }

h2/src/test/org/h2/test/TestBase.java

@@ -269,8 +269,10 @@ public abstract class TestBase {
         } else {
             url = name;
         }
-        // url = addOption(url, "DEFAULT_TABLE_ENGINE",
-        //         "org.h2.mvstore.db.MVTableEngine");
+        if (config.mvStore) {
+            url = addOption(url, "DEFAULT_TABLE_ENGINE",
+                    "org.h2.mvstore.db.MVTableEngine");
+        }
         if (!config.memory) {
             if (config.smallLog && admin) {
                 url = addOption(url, "MAX_LOG_SIZE", "1");

h2/src/test/org/h2/test/bench/BenchB.java

@@ -26,8 +26,8 @@ public class BenchB implements Bench, Runnable {
     private static final int TELLERS = 10;
     private static final int ACCOUNTS = 100000;
 
-    private int noThreads = 10;
-    
+    private int threadCount = 10;
+
     // master data
     private Database database;
     private int transactionPerClient;
@@ -200,8 +200,8 @@ public class BenchB implements Bench, Runnable {
     }
 
     private void processTransactions() throws Exception {
-        Thread[] threads = new Thread[noThreads];
-        for (int i = 0; i < noThreads; i++) {
+        Thread[] threads = new Thread[threadCount];
+        for (int i = 0; i < threadCount; i++) {
             threads[i] = new Thread(new BenchB(this, i), "BenchB-" + i);
         }
         for (Thread t : threads) {
@@ -216,8 +216,8 @@ public class BenchB implements Bench, Runnable {
     public String getName() {
         return "BenchB";
     }
-    
-    public void setNoThreads(int noThreads) {
-        this.noThreads = noThreads;
+
+    public void setThreadCount(int threadCount) {
+        this.threadCount = threadCount;
     }
 }

h2/src/test/org/h2/test/bench/Database.java

@@ -30,13 +30,9 @@ import org.h2.util.StringUtils;
  */
 class Database {
 
-    public interface DatabaseParentInterface {
-        boolean isCollect();
-        void trace(String msg);
-    }
     private static final boolean TRACE = true;
 
-    private DatabaseParentInterface test;
+    private DatabaseTest test;
     private int id;
     private String name, url, user, password;
     private final ArrayList<String[]> replace = new ArrayList<String[]>();
@@ -49,8 +45,8 @@ class Database {
     private final ArrayList<Object[]> results = new ArrayList<Object[]>();
     private int totalTime;
     private final AtomicInteger executedStatements = new AtomicInteger(0);
-    private int noThreads;
-    
+    private int threadCount;
+
     private Server serverH2;
     private Object serverDerby;
     private boolean serverHSQLDB;
@@ -153,13 +149,15 @@ class Database {
      * @param test the test application
      * @param id the database id
      * @param dbString the configuration string
+     * @param threadCount the number of threads to use
      * @return a new database object with the given settings
      */
-    static Database parse(DatabaseParentInterface test, int id, String dbString) {
+    static Database parse(DatabaseTest test, int id, String dbString, int threadCount) {
         try {
             StringTokenizer tokenizer = new StringTokenizer(dbString, ",");
             Database db = new Database();
             db.id = id;
+            db.threadCount = threadCount;
             db.test = test;
             db.name = tokenizer.nextToken().trim();
             String driver = tokenizer.nextToken().trim();
@@ -177,12 +175,6 @@ class Database {
         }
     }
 
-    static Database parse(DatabaseParentInterface test, int id, String dbString, int noThreads) {
-        Database db = parse(test, id, dbString);
-        db.noThreads = noThreads;
-        return db;
-    }
-    
     /**
      * Open a new database connection. This connection must be closed
      * by calling conn.close().
@@ -463,9 +455,30 @@ class Database {
     int getId() {
         return id;
     }
-    
-    int getNoThreads() {
-        return noThreads;
+
+    int getThreadsCount() {
+        return threadCount;
+    }
+
+    /**
+     * The interface used for a test.
+     */
+    public interface DatabaseTest {
+
+        /**
+         * Whether data needs to be collected.
+         *
+         * @return true if yes
+         */
+        boolean isCollect();
+
+        /**
+         * Print a message to system out if trace is enabled.
+         *
+         * @param msg the message
+         */
+        void trace(String msg);
+
     }
 
 }

h2/src/test/org/h2/test/bench/TestPerformance.java

@@ -27,7 +27,7 @@ import org.h2.util.JdbcUtils;
  * The main controller class of the benchmark application.
  * To run the benchmark, call the main method of this class.
  */
-public class TestPerformance implements Database.DatabaseParentInterface {
+public class TestPerformance implements Database.DatabaseTest {
 
     /**
      * Whether data should be collected.
@@ -97,7 +97,7 @@ public class TestPerformance implements Database.DatabaseParentInterface {
             }
             String dbString = prop.getProperty("db" + i);
             if (dbString != null) {
-                Database db = Database.parse(this, i, dbString);
+                Database db = Database.parse(this, i, dbString, 1);
                 if (db != null) {
                     db.setTranslations(prop);
                     dbs.add(db);
@@ -248,17 +248,13 @@ public class TestPerformance implements Database.DatabaseParentInterface {
         bench.runTest();
     }
 
-    /**
-     * Print a message to system out if trace is enabled.
-     *
-     * @param s the message
-     */
-    public void trace(String s) {
+    @Override
+    public void trace(String msg) {
         if (trace) {
-            System.out.println(s);
+            System.out.println(msg);
         }
     }
-    
+
     @Override
     public boolean isCollect() {
         return collect;

h2/src/test/org/h2/test/bench/TestScalability.java

@@ -24,7 +24,7 @@ import org.h2.util.JdbcUtils;
  * Used to compare scalability between the old engine and the new MVStore engine.
  * Mostly it runs BenchB with various numbers of threads.
  */
-public class TestScalability implements Database.DatabaseParentInterface {
+public class TestScalability implements Database.DatabaseTest {
 
     /**
      * Whether data should be collected.
@@ -38,7 +38,7 @@ public class TestScalability implements Database.DatabaseParentInterface {
 
     /**
      * This method is called when executing this sample application.
-     * 
+     *
      * @param args the command line parameters
      */
     public static void main(String... args) throws Exception {
@@ -80,8 +80,8 @@ public class TestScalability implements Database.DatabaseParentInterface {
         dbs.add(createDbEntry(id++, "H2", 40, h2Url));
         dbs.add(createDbEntry(id++, "H2", 50, h2Url));
         dbs.add(createDbEntry(id++, "H2", 100, h2Url));
-        
-        final String mvUrl = "jdbc:h2:data/mvtest;LOCK_TIMEOUT=10000;DEFAULT_TABLE_ENGINE=org.h2.mvstore.db.MVTableEngine";
+
+        final String mvUrl = "jdbc:h2:data/mvTest;LOCK_TIMEOUT=10000;DEFAULT_TABLE_ENGINE=org.h2.mvstore.db.MVTableEngine";
         dbs.add(createDbEntry(id++, "MV", 1, mvUrl));
         dbs.add(createDbEntry(id++, "MV", 10, mvUrl));
         dbs.add(createDbEntry(id++, "MV", 20, mvUrl));
@@ -89,7 +89,7 @@ public class TestScalability implements Database.DatabaseParentInterface {
         dbs.add(createDbEntry(id++, "MV", 40, mvUrl));
         dbs.add(createDbEntry(id++, "MV", 50, mvUrl));
         dbs.add(createDbEntry(id++, "MV", 100, mvUrl));
-        
+
         final BenchB test = new BenchB();
         testAll(dbs, test, size);
         collect = false;
@@ -144,9 +144,9 @@ public class TestScalability implements Database.DatabaseParentInterface {
         }
     }
 
-    private Database createDbEntry(int id, String namePrefix, int noThreads, String url) {
+    private Database createDbEntry(int id, String namePrefix, int threadCount, String url) {
         Database db = Database.parse(this, id,
-                namePrefix + "(" + noThreads + "thread), org.h2.Driver, " + url + ", sa, sa", noThreads);
+                namePrefix + "(" + threadCount + "threads), org.h2.Driver, " + url + ", sa, sa", threadCount);
         return db;
     }
 
@@ -181,13 +181,13 @@ public class TestScalability implements Database.DatabaseParentInterface {
 
     private static void runDatabase(Database db, BenchB bench, int size) throws Exception {
         bench.init(db, size);
-        bench.setNoThreads(db.getNoThreads());
+        bench.setThreadCount(db.getThreadsCount());
         bench.runTest();
     }
 
     /**
      * Print a message to system out if trace is enabled.
-     * 
+     *
      * @param s the message
      */
     @Override

h2/src/test/org/h2/test/bench/test.properties

-db1 = H2(embedded), org.h2.Driver, jdbc:h2:data/test;LOCK_TIMEOUT=10000;LOCK_MODE=3, sa, sa
+db1 = H2, org.h2.Driver, jdbc:h2:data/test;LOCK_TIMEOUT=10000;LOCK_MODE=3, sa, sa
 
 #xdb1 = H2, org.h2.Driver, jdbc:h2:data/test;LOCK_TIMEOUT=10000;LOCK_MODE=3;DEFAULT_TABLE_ENGINE=org.h2.mvstore.db.MVTableEngine, sa, sa
 
@@ -14,7 +14,7 @@ db1 = H2(embedded), org.h2.Driver, jdbc:h2:data/test;LOCK_TIMEOUT=10000;LOCK_MOD
 db2 = HSQLDB, org.hsqldb.jdbcDriver, jdbc:hsqldb:data/test;hsqldb.default_table_type=cached;sql.enforce_size=true, sa
 db3 = Derby, org.apache.derby.jdbc.EmbeddedDriver, jdbc:derby:data/derby;create=true, sa, sa
 
-db4 = H2(tcpserver), org.h2.Driver, jdbc:h2:tcp://localhost/data/testServer;LOCK_TIMEOUT=10000;LOCK_MODE=3, sa, sa
+db4 = H2 (Server), org.h2.Driver, jdbc:h2:tcp://localhost/data/testServer;LOCK_TIMEOUT=10000;LOCK_MODE=3, sa, sa
 db5 = HSQLDB, org.hsqldb.jdbcDriver, jdbc:hsqldb:hsql://localhost/xdb, sa
 db6 = Derby, org.apache.derby.jdbc.ClientDriver, jdbc:derby://localhost/data/derbyServer;create=true, sa, sa
 db7 = PostgreSQL, org.postgresql.Driver, jdbc:postgresql:test, sa, sa

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

@@ -31,7 +31,7 @@ import org.h2.util.StringUtils;
 public class TestScript extends TestBase {
 
     private static final String FILENAME = "org/h2/test/testScript.sql";
-    
+
     private boolean failFast;
 
     private boolean alwaysReconnect;

h2/src/test/org/h2/test/jdbc/TestMetaData.java

@@ -328,11 +328,11 @@ public class TestMetaData extends TestBase {
         assertEquals(0, meta.getMaxTablesInSelect());
         assertEquals(0, meta.getMaxUserNameLength());
         assertEquals("procedure", meta.getProcedureTerm());
-        
+
         assertEquals(ResultSet.CLOSE_CURSORS_AT_COMMIT, meta.getResultSetHoldability());
         assertEquals(DatabaseMetaData.sqlStateSQL99, meta.getSQLStateType());
         assertFalse(meta.locatorsUpdateCopy());
-        
+
         assertEquals("schema", meta.getSchemaTerm());
         assertEquals("\\", meta.getSearchStringEscape());
         assertEquals("LIMIT,MINUS,ROWNUM,SYSDATE,SYSTIME,SYSTIMESTAMP,TODAY", meta.getSQLKeywords());

h2/src/test/org/h2/test/store/TestMVTableEngine.java

@@ -109,7 +109,7 @@ int test;
 //System.out.println(prof.getTop(10));
         System.out.println((System.currentTimeMillis() - time) + " " + dbName + " after");
     }
-    
+
     private void testReferentialIntegrity() throws Exception {
         FileUtils.deleteRecursive(getBaseDir(), true);
         Connection conn;
@@ -122,7 +122,7 @@ int test;
         stat.execute("insert into parent values(1)");
         stat.execute("insert into child values(2)");
         try {
-            stat.execute("alter table child add constraint cp " + 
+            stat.execute("alter table child add constraint cp " +
                     "foreign key(pid) references parent(id)");
             fail();
         } catch (SQLException e) {
@@ -137,26 +137,28 @@ int test;
         stat.execute("insert into parent values(1)");
         stat.execute("insert into child values(2)");
         try {
-            stat.execute("alter table child add constraint cp " + 
+            stat.execute("alter table child add constraint cp " +
                         "foreign key(pid) references parent(id)");
             fail();
         } catch (SQLException e) {
             // expected
         }
         stat.execute("drop table child, parent");
-        
+
         // currently not supported, as previous rows are not visible
-        // stat.execute("create table test(id identity, parent bigint, foreign key(parent) references(id))");
-        // stat.execute("insert into test values(0, 0), (1, NULL), (2, 1), (3, 3), (4, 3)");
+        // stat.execute("create table test(id identity, parent bigint,
+        //     foreign key(parent) references(id))");
+        // stat.execute("insert into test values(0, 0), (1, NULL),
+        //     (2, 1), (3, 3), (4, 3)");
         // stat.execute("drop table test");
-        
+
         stat.execute("create table parent(id int, x int)");
         stat.execute("insert into parent values(1, 2)");
         stat.execute("create table child(id int references parent(id)) as select 1");
 
         conn.close();
     }
-    
+
     private void testWriteDelay() throws Exception {
         FileUtils.deleteRecursive(getBaseDir(), true);
         Connection conn;

h2/src/test/org/h2/test/testScript.sql

+-- Copyright 2004-2013 H2 Group. Multiple-Licensed under the H2 License,
+-- Version 1.0, and under the Eclipse Public License, Version 1.0
+-- (http://h2database.com/html/license.html).
+-- Initial Developer: H2 Group
+
 --- special grammar and test cases ---------------------------------------------------------------------------------------------
 select * from dual where x = x + 1 or x in(2, 0);
 > X

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

@@ -726,4 +726,4 @@ simo unpredictable overtakes conditionally decreases warned coupled spin
 unsynchronized reality cores effort slice addleman koskela ville blocking seen
 isam charindex removal getdate jesse fake covers covering cheaper adjacent spot
 transition anthony goubard netherlands versioned orderable customizer cachable
-customizers retains
+customizers retains scalability