Issue #430: Subquery not cached if number of rows exceeds MAX_MEMORY_ROWS

h2/src/docsrc/html/changelog.html

@@ -21,6 +21,8 @@ Change Log
 
 <h2>Next Version (unreleased)</h2>
 <ul>
+<li>#430: Subquery not cached if number of rows exceeds MAX_MEMORY_ROWS
+</li>
 <li>#411: "TIMEZONE" should be "TIME ZONE" in type "TIMESTAMP WITH TIMEZONE"
 </li>
 <li>PR #418, Implement Connection#createArrayOf and PreparedStatement#setArray

h2/src/main/org/h2/expression/ConditionInSelect.java

@@ -46,33 +46,32 @@ public class ConditionInSelect extends Condition {
         if (!query.hasOrder()) {
             query.setDistinct(true);
         }
-        try (LocalResult rows = query.query(0)) {
-            Value l = left.getValue(session);
-            if (rows.getRowCount() == 0) {
-                return ValueBoolean.get(all);
-            } else if (l == ValueNull.INSTANCE) {
-                return l;
-            }
-            if (!session.getDatabase().getSettings().optimizeInSelect) {
-                return getValueSlow(rows, l);
-            }
-            if (all || (compareType != Comparison.EQUAL &&
-                    compareType != Comparison.EQUAL_NULL_SAFE)) {
-                return getValueSlow(rows, l);
-            }
-            int dataType = rows.getColumnType(0);
-            if (dataType == Value.NULL) {
-                return ValueBoolean.get(false);
-            }
-            l = l.convertTo(dataType);
-            if (rows.containsDistinct(new Value[] { l })) {
-                return ValueBoolean.get(true);
-            }
-            if (rows.containsDistinct(new Value[] { ValueNull.INSTANCE })) {
-                return ValueNull.INSTANCE;
-            }
+        LocalResult rows = query.query(0);
+        Value l = left.getValue(session);
+        if (rows.getRowCount() == 0) {
+            return ValueBoolean.get(all);
+        } else if (l == ValueNull.INSTANCE) {
+            return l;
+        }
+        if (!session.getDatabase().getSettings().optimizeInSelect) {
+            return getValueSlow(rows, l);
+        }
+        if (all || (compareType != Comparison.EQUAL &&
+                compareType != Comparison.EQUAL_NULL_SAFE)) {
+            return getValueSlow(rows, l);
+        }
+        int dataType = rows.getColumnType(0);
+        if (dataType == Value.NULL) {
             return ValueBoolean.get(false);
         }
+        l = l.convertTo(dataType);
+        if (rows.containsDistinct(new Value[] { l })) {
+            return ValueBoolean.get(true);
+        }
+        if (rows.containsDistinct(new Value[] { ValueNull.INSTANCE })) {
+            return ValueNull.INSTANCE;
+        }
+        return ValueBoolean.get(false);
     }
 
     private Value getValueSlow(LocalResult rows, Value l) {