wip

h2/src/main/org/h2/command/Command.java

@@ -68,6 +68,11 @@ public abstract class Command implements CommandInterface {
     @Override
     public abstract boolean isQuery();
 
+    /**
+     * Prepare join batching.
+     */
+    public abstract void prepareJoinBatch();
+
     /**
      * Get the list of parameters.
      *

h2/src/main/org/h2/command/CommandContainer.java

@@ -7,6 +7,7 @@ package org.h2.command;
 
 import java.util.ArrayList;
 import org.h2.api.DatabaseEventListener;
+import org.h2.command.dml.Query;
 import org.h2.expression.Parameter;
 import org.h2.expression.ParameterInterface;
 import org.h2.result.ResultInterface;
@@ -44,6 +45,13 @@ public class CommandContainer extends Command {
         return prepared.isQuery();
     }
 
+    @Override
+    public void prepareJoinBatch() {
+        if (session.isJoinBatchEnabled() && prepared.isQuery()) {
+            ((Query) prepared).prepareJoinBatch();
+        }
+    }
+
     private void recompileIfRequired() {
         if (prepared.needRecompile()) {
             // TODO test with 'always recompile'
@@ -65,6 +73,7 @@ public class CommandContainer extends Command {
             }
             prepared.prepare();
             prepared.setModificationMetaId(mod);
+            prepareJoinBatch();
         }
     }
 

h2/src/main/org/h2/command/CommandList.java

@@ -44,6 +44,11 @@ class CommandList extends Command {
         return updateCount;
     }
 
+    @Override
+    public void prepareJoinBatch() {
+        command.prepareJoinBatch();
+    }
+
     @Override
     public ResultInterface query(int maxrows) {
         ResultInterface result = command.query(maxrows);

h2/src/main/org/h2/command/dml/Query.java

@@ -71,8 +71,18 @@ public abstract class Query extends Prepared {
         super(session);
     }
 
+    /**
+     * Check if this is a UNION query.
+     * 
+     * @return {@code true} if this is a UNION query
+     */
     public abstract boolean isUnion();
 
+    /**
+     * Prepare join batching.
+     */
+    public abstract void prepareJoinBatch();
+
     /**
      * Execute the query without checking the cache. If a target is specified,
      * the results are written to it, and the method returns null. If no target

h2/src/main/org/h2/command/dml/Select.java

@@ -947,12 +947,29 @@ public class Select extends Query {
         }
         expressionArray = new Expression[expressions.size()];
         expressions.toArray(expressionArray);
-        if (!session.isParsingView()) {
-            topTableFilter.prepareJoinBatch(0);
-        }
         isPrepared = true;
     }
 
+    @Override
+    public void prepareJoinBatch() {
+        ArrayList<TableFilter> list = New.arrayList();
+        TableFilter f = getTopTableFilter();
+        do {
+            if (f.getNestedJoin() != null) {
+                // we do not support batching with nested joins 
+                return;
+            }
+            list.add(f);
+            f = f.getJoin();
+        } while (f != null);
+        TableFilter[] fs = list.toArray(new TableFilter[list.size()]);
+        // prepare join batch
+        JoinBatch jb = null;
+        for (int i = fs.length - 1; i >= 0; i--) {
+            jb = fs[i].prepareJoinBatch(jb, fs, i);
+        }
+    }
+
     public JoinBatch getJoinBatch() {
         return getTopTableFilter().getJoinBatch();
     }

h2/src/main/org/h2/command/dml/SelectUnion.java

@@ -76,6 +76,12 @@ public class SelectUnion extends Query {
         return true;
     }
 
+    @Override
+    public void prepareJoinBatch() {
+        left.prepareJoinBatch();
+        right.prepareJoinBatch();
+    }
+
     public void setUnionType(int type) {
         this.unionType = type;
     }

h2/src/main/org/h2/command/dml/Set.java

@@ -497,6 +497,15 @@ public class Set extends Prepared {
             database.setRowFactory(rowFactory);
             break;
         }
+        case SetTypes.BATCH_JOINS: {
+            int value = getIntValue();
+            if (value != 0 && value != 1) {
+                throw DbException.getInvalidValueException("BATCH_JOINS",
+                        getIntValue());
+            }
+            session.setJoinBatchEnabled(value == 1);
+            break;
+        }
         default:
             DbException.throwInternalError("type="+type);
         }

h2/src/main/org/h2/command/dml/SetTypes.java

@@ -228,6 +228,11 @@ public class SetTypes {
      */
     public static final int ROW_FACTORY = 43;
 
+    /**
+     * The type of SET BATCH_JOINS statement.
+     */
+    public static final int BATCH_JOINS = 44;
+
     private static final ArrayList<String> TYPES = New.arrayList();
 
     private SetTypes() {
@@ -280,6 +285,7 @@ public class SetTypes {
         list.add(QUERY_STATISTICS, "QUERY_STATISTICS");
         list.add(QUERY_STATISTICS_MAX_ENTRIES, "QUERY_STATISTICS_MAX_ENTRIES");
         list.add(ROW_FACTORY, "ROW_FACTORY");
+        list.add(BATCH_JOINS, "BATCH_JOINS");
     }
 
     /**

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

@@ -30,12 +30,14 @@ import org.h2.mvstore.db.TransactionStore.Change;
 import org.h2.mvstore.db.TransactionStore.Transaction;
 import org.h2.result.LocalResult;
 import org.h2.result.Row;
+import org.h2.result.SortOrder;
 import org.h2.schema.Schema;
 import org.h2.store.DataHandler;
 import org.h2.store.InDoubtTransaction;
 import org.h2.store.LobStorageFrontend;
 import org.h2.table.SubQueryInfo;
 import org.h2.table.Table;
+import org.h2.table.TableFilter;
 import org.h2.util.New;
 import org.h2.util.SmallLRUCache;
 import org.h2.value.Value;
@@ -115,6 +117,7 @@ public class Session extends SessionWithState {
     private int parsingView;
     private volatile SmallLRUCache<Object, ViewIndex> viewIndexCache;
     private HashMap<Object, ViewIndex> subQueryIndexCache;
+    private boolean joinBatchEnabled;
 
     /**
      * Temporary LOBs from result sets. Those are kept for some time. The
@@ -148,12 +151,25 @@ public class Session extends SessionWithState {
         this.currentSchemaName = Constants.SCHEMA_MAIN;
     }
 
+    public void setJoinBatchEnabled(boolean joinBatchEnabled) {
+        this.joinBatchEnabled = joinBatchEnabled;
+    }
+
+    public boolean isJoinBatchEnabled() {
+        return joinBatchEnabled;
+    }
+
     public Row createRow(Value[] data, int memory) {
         return database.createRow(data, memory);
     }
 
-    public void setSubQueryInfo(SubQueryInfo subQueryInfo) {
-        this.subQueryInfo = subQueryInfo;
+    public void pushSubQueryInfo(int[] masks, TableFilter[] filters, int filter,
+            SortOrder sortOrder) {
+        subQueryInfo = new SubQueryInfo(subQueryInfo, masks, filters, filter, sortOrder);
+    }
+
+    public void popSubQueryInfo() {
+        subQueryInfo = subQueryInfo.getUpper();
     }
 
     public SubQueryInfo getSubQueryInfo() {
@@ -492,6 +508,7 @@ public class Session extends SessionWithState {
             // we can't reuse sub-query indexes, so just drop the whole cache
             subQueryIndexCache = null;
         }
+        command.prepareJoinBatch();
         if (queryCache != null) {
             if (command.isCacheable()) {
                 queryCache.put(sql, command);

h2/src/main/org/h2/index/MultiVersionIndex.java

@@ -6,8 +6,6 @@
 package org.h2.index;
 
 import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.Future;
 import org.h2.api.ErrorCode;
 import org.h2.engine.Database;
 import org.h2.engine.DbObject;

h2/src/main/org/h2/index/ViewIndex.java

@@ -22,7 +22,6 @@ import org.h2.result.SortOrder;
 import org.h2.table.Column;
 import org.h2.table.IndexColumn;
 import org.h2.table.JoinBatch;
-import org.h2.table.SubQueryInfo;
 import org.h2.table.TableFilter;
 import org.h2.table.TableView;
 import org.h2.util.IntArray;
@@ -209,14 +208,11 @@ public class ViewIndex extends BaseIndex implements SpatialIndex {
             TableFilter[] filters, int filter, SortOrder sortOrder, boolean preliminary) {
         assert filters != null;
         Prepared p;
-        SubQueryInfo upper = session.getSubQueryInfo();
-        SubQueryInfo info = new SubQueryInfo(upper,
-                masks, filters, filter, sortOrder, preliminary);
-        session.setSubQueryInfo(info);
+        session.pushSubQueryInfo(masks, filters, filter, sortOrder);
         try {
             p = session.prepare(sql, true);
         } finally {
-            session.setSubQueryInfo(upper);
+            session.popSubQueryInfo();
         }
         return (Query) p;
     }

h2/src/main/org/h2/table/JoinBatch.java

@@ -163,16 +163,16 @@ public final class JoinBatch {
         current = new JoinRow(new Object[filters.length]);
         // initialize top cursor
         Cursor cursor;
-        if (!batchedSubQuery) {
-            // it is a top level batched query
+        if (batchedSubQuery) {
+            // we are at the batched sub-query
+            assert viewTopFutureCursor != null;
+            cursor = get(viewTopFutureCursor);
+        } else {
+            // setup usual index cursor
             TableFilter f = top.filter;
             IndexCursor indexCursor = f.getIndexCursor();
             indexCursor.find(f.getSession(), f.getIndexConditions());
             cursor = indexCursor;
-        } else {
-            // we are at the batched sub-query
-            assert viewTopFutureCursor != null;
-            cursor = get(viewTopFutureCursor);
         }
         current.updateRow(top.id, cursor, JoinRow.S_NULL, JoinRow.S_CURSOR);
         // we need fake first row because batchedNext always will move to the next row
@@ -372,8 +372,6 @@ public final class JoinBatch {
      * @return Adapter to allow joining to this batch in sub-queries and views.
      */
     private IndexLookupBatch viewIndexLookupBatch(ViewIndex viewIndex) {
-        assert !batchedSubQuery;
-        batchedSubQuery = true;
         return new ViewIndexLookupBatch(viewIndex);
     }
 
@@ -385,20 +383,18 @@ public final class JoinBatch {
      */
     public static IndexLookupBatch createViewIndexLookupBatch(ViewIndex viewIndex) {
         Query query = viewIndex.getQuery();
+        query.prepareJoinBatch();
         if (query.isUnion()) {
-            ViewIndexLookupBatchUnion unionBatch = new ViewIndexLookupBatchUnion(viewIndex);
-            return unionBatch.initialize() ? unionBatch : null;
-        } else {
-            Select select = (Select) query;
-            // here we have already prepared plan for our sub-query,
-            // thus select already contains join batch for it (if it has to)
-            JoinBatch joinBatch = select.getJoinBatch();
-            if (joinBatch == null) {
-                // our sub-query itself is not batched, will run usual way
-                return null;
-            }
-            return joinBatch.viewIndexLookupBatch(viewIndex);
+            return new ViewIndexLookupBatchUnion(viewIndex);
+        }
+        JoinBatch jb = ((Select) query).getJoinBatch();
+        if (jb == null) {
+            // our sub-query is not batched, will run usual way
+            return null;
         }
+        assert !jb.batchedSubQuery;
+        jb.batchedSubQuery = true;
+        return jb.viewIndexLookupBatch(viewIndex);
     }
 
     @Override
@@ -850,12 +846,6 @@ public final class JoinBatch {
             return top.isBatchFull();
         }
 
-        @Override
-        public void reset() {
-            super.reset();
-            JoinBatch.this.reset();
-        }
-        
         @Override
         protected void startQueryRunners() {
             // we do batched find only for top table filter and then lazily run the ViewIndex query
@@ -913,29 +903,24 @@ public final class JoinBatch {
 
         protected ViewIndexLookupBatchUnion(ViewIndex viewIndex) {
             super(viewIndex);
+            collectTopTableFilters(viewIndex.getQuery());
         }
 
-        /**
-         * @return {@code true} if initialized successfully
-         */
-        private boolean initialize() {
-            return collectTopTableFilters(viewIndex.getQuery());
-        }
-
-        private boolean collectTopTableFilters(Query query) {
+        private void collectTopTableFilters(Query query) {
             if (query.isUnion()) {
                 SelectUnion union = (SelectUnion) query;
-                return collectTopTableFilters(union.getLeft()) &&
-                        collectTopTableFilters(union.getRight());
-            } 
-            Select select = (Select) query;
-            JoinBatch jb = select.getJoinBatch();
-            if (jb == null) {
-                // if we've found non-batched select then we can't do batching at all here
-                return false;
+                collectTopTableFilters(union.getLeft());
+                collectTopTableFilters(union.getRight());
+            } else {
+                Select select = (Select) query;
+                JoinBatch jb = select.getJoinBatch();
+                if (jb == null) {
+                    // TODO need some wrapper for a non-batched query
+                }
+                assert !jb.batchedSubQuery;
+                jb.batchedSubQuery = true;
+                tops.add(jb.filters[0]);
             }
-            tops.add(jb.filters[0]);
-            return true;
         }
 
         @Override

h2/src/main/org/h2/table/SubQueryInfo.java

@@ -19,7 +19,6 @@ public class SubQueryInfo {
     private TableFilter[] filters;
     private int filter;
     private SortOrder sortOrder;
-    private boolean preliminary;
     private SubQueryInfo upper;
 
     /**
@@ -28,17 +27,14 @@ public class SubQueryInfo {
      * @param filters table filters
      * @param filter current filter
      * @param sortOrder sort order
-     * @param preliminary if this is a preliminary query optimization 
-     *          without global conditions
      */
     public SubQueryInfo(SubQueryInfo upper, int[] masks, TableFilter[] filters, int filter,
-            SortOrder sortOrder, boolean preliminary) {
+            SortOrder sortOrder) {
         this.upper = upper;
         this.masks = masks;
         this.filters = filters;
         this.filter = filter;
         this.sortOrder = sortOrder;
-        this.preliminary = preliminary;
     }
 
     public SubQueryInfo getUpper() {
@@ -60,8 +56,4 @@ public class SubQueryInfo {
     public SortOrder getSortOrder() {
         return sortOrder;
     }
-
-    public boolean isPreliminary() {
-        return preliminary;
-    }
 }

h2/src/main/org/h2/table/Table.java

@@ -127,6 +127,10 @@ public abstract class Table extends SchemaObjectBase {
         }
     }
 
+    public boolean isView() {
+        return false;
+    }
+
     /**
      * Lock the table for the given session.
      * This method waits until the lock is granted.

h2/src/main/org/h2/table/TableFilter.java

@@ -340,8 +340,8 @@ public class TableFilter implements ColumnResolver {
         foundOne = false;
     }
 
-    private boolean isAlwaysTopTableFilter(int id) {
-        if (id != 0) {
+    private boolean isAlwaysTopTableFilter(int filter) {
+        if (filter != 0) {
             return false;
         }
         // check if we are at the top table filters all the way up
@@ -361,15 +361,12 @@ public class TableFilter implements ColumnResolver {
      * Attempt to initialize batched join.
      *
      * @param id join filter id (index of this table filter in join list)
+     * @param jb join batch if it is already created
      * @return join batch if query runs over index which supports batched lookups, {@code null} otherwise
      */
-    public JoinBatch prepareJoinBatch(int id) {
+    public JoinBatch prepareJoinBatch(JoinBatch jb, TableFilter[] filters, int filter) {
         joinBatch = null;
         joinFilterId = -1;
-        JoinBatch jb = null;
-        if (join != null) {
-            jb = join.prepareJoinBatch(id + 1);
-        }
         IndexLookupBatch lookupBatch = null;
         // For globally top table filter we don't need to create lookup batch, because
         // currently it will not be used (this will be shown in ViewIndex.getPlanSQL()). Probably
@@ -378,28 +375,40 @@ public class TableFilter implements ColumnResolver {
         // then we either not a top table filter or top table filter in a sub-query, which
         // in turn is not top in outer query, thus we need to enable batching here to allow
         // outer query run batched join against this sub-query.
-        if (jb == null && select != null && !isAlwaysTopTableFilter(id)) {
-            lookupBatch = index.createLookupBatch(this);
+        if (jb == null && select != null && !isAlwaysTopTableFilter(filter)) {
+            lookupBatch = createLookupBatch(filters, filter);
             if (lookupBatch != null) {
-                jb = new JoinBatch(id + 1, join);
+                jb = new JoinBatch(filter + 1, join);
             }
         }
         if (jb != null) {
             if (nestedJoin != null) {
-                throw DbException.getUnsupportedException("nested join with batched index");
+                throw DbException.throwInternalError();
             }
             joinBatch = jb;
-            joinFilterId = id;
-            if (lookupBatch == null && !isAlwaysTopTableFilter(id)) {
-                // index.createLookupBatch will be called at most once because jb can be
+            joinFilterId = filter;
+            if (lookupBatch == null && !isAlwaysTopTableFilter(filter)) {
+                // createLookupBatch will be called at most once because jb can be
                 // created only if lookupBatch is already not null from the call above.
-                lookupBatch = index.createLookupBatch(this);
+                lookupBatch = createLookupBatch(filters, filter);
             }
             jb.register(this, lookupBatch);
         }
         return jb;
     }
 
+    private IndexLookupBatch createLookupBatch(TableFilter[] filters, int filter) {
+        if (getTable().isView()) {
+            session.pushSubQueryInfo(masks, filters, filter, select.getSortOrder());
+            try {
+                return index.createLookupBatch(this);
+            } finally {
+                session.popSubQueryInfo();
+            }
+        }
+        return index.createLookupBatch(this);
+    }
+
     public int getJoinFilterId() {
         return joinFilterId;
     }

h2/src/main/org/h2/table/TableView.java

@@ -218,6 +218,11 @@ public class TableView extends Table {
         }
     }
 
+    @Override
+    public boolean isView() {
+        return true;
+    }
+
     /**
      * Check if this view is currently invalid.
      *