Get rid of SysProperties.CHECK2

h2/src/docsrc/html/roadmap.html

@@ -83,7 +83,7 @@ See also <a href="build.html#providing_patches">Providing Patches</a>.
 </li><li>Find a tool to view large text file (larger than 100 MB), with find, page up and down (like less), truncate before / after.
 </li><li>Implement, test, document XAConnection and so on.
 </li><li>Pluggable data type (for streaming, hashing, compression, validation, conversion, encryption).
-</li><li>CHECK: find out what makes CHECK=TRUE slow, move to CHECK2.
+</li><li>CHECK: find out what makes CHECK=TRUE slow, move to assertions.
 </li><li>Drop with invalidate views (so that source code is not lost). Check what other databases do exactly.
 </li><li>Index usage for (ID, NAME)=(1, 'Hi'); document.
 </li><li>Set a connection read only (Connection.setReadOnly) or using a connection parameter.

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

@@ -95,18 +95,11 @@ public class SysProperties {
     /**
      * System property <code>h2.check</code>
      * (default: true for JDK/JRE, false for Android).<br />
-     * Assertions in the database engine.
+     * Optional additional checks in the database engine.
      */
     public static final boolean CHECK =
             Utils.getProperty("h2.check", !"0.9".equals(Utils.getProperty("java.specification.version", null)));
 
-    /**
-     * System property <code>h2.check2</code> (default: false).<br />
-     * Additional assertions in the database engine.
-     */
-    public static final boolean CHECK2 =
-            Utils.getProperty("h2.check2", false);
-
     /**
      * System property <code>h2.clientTraceDirectory</code> (default:
      * trace.db/).<br />

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

@@ -465,7 +465,6 @@ java org.h2.test.TestAll timer
 
         System.setProperty("h2.maxMemoryRows", "100");
 
-        System.setProperty("h2.check2", "true");
         System.setProperty("h2.delayWrongPasswordMin", "0");
         System.setProperty("h2.delayWrongPasswordMax", "0");
         System.setProperty("h2.useThreadContextClassLoader", "true");
@@ -513,7 +512,6 @@ kill -9 `jps -l | grep "org.h2.test." | cut -d " " -f 1`
                 test.testAll();
             } else if ("reopen".equals(args[0])) {
                 System.setProperty("h2.delayWrongPasswordMin", "0");
-                System.setProperty("h2.check2", "false");
                 System.setProperty("h2.analyzeAuto", "100");
                 System.setProperty("h2.pageSize", "64");
                 System.setProperty("h2.reopenShift", "5");

h2/src/test/org/h2/test/todo/TestTempTableCrash.java

@@ -34,7 +34,6 @@ public class TestTempTableCrash {
         Statement stat;
 
         System.setProperty("h2.delayWrongPasswordMin", "0");
-        System.setProperty("h2.check2", "false");
         FilePathRec.register();
         System.setProperty("reopenShift", "4");
         TestReopen reopen = new TestReopen();

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

@@ -45,7 +45,6 @@ public class TestPageStore extends TestBase {
      * @param a ignored
      */
     public static void main(String... a) throws Exception {
-        System.setProperty("h2.check2", "true");
         TestBase.createCaller().init().test();
     }