Merge lp:~mmcm/akiban-server/lookahead-quantum-index-scan into lp:~akiban-technologies/akiban-server/trunk

[Mike McMahon]

Pipelining option for IndexScan_Default.

When quantum is set > 1, open() tries to keep this many Cursors in play. It does this by looking ahead in the bindings stream and opening new cursors for those that match the depth at which it is being opened. It queues these bindings (whether a cursor was opened or not) so that it can later honor nextBindings().

Most of the trickiness is in implementing the cursor lifecycle. For instance, although all these cursors are open ahead of where downstream is, and one of them gets associated when moving to its bindings, the IS cursor itself is not yet active until open().

[Nathan Williams (nwilliams)]

The static Integer and config lookup in the cursor() call is a little unfortunate. What about moving them to named methods on the QueryContext, which could then be initialized more explicitly?

Otherwise looks pretty good.

[lp:~mmcm/akiban-server/lookahead-quantum-index-scan]

2732. By Mike McMahon on 2013-07-12

Merge from origin.

2733. By Mike McMahon on 2013-07-12

Update test.

2734. By Mike McMahon on 2013-07-13

Merge from origin.

2735. By Mike McMahon on 2013-07-13

Use new configuration technique.

2736. By Mike McMahon on 2013-07-13

Javadoc.

Unmerged revisions

=== modified file 'src/main/java/com/akiban/qp/operator/API.java'
--- src/main/java/com/akiban/qp/operator/API.java	2013-07-10 18:42:14 +0000
+++ src/main/java/com/akiban/qp/operator/API.java	2013-07-13 21:10:31 +0000
@@ -385,7 +385,16 @@
                                              Ordering ordering,
                                              IndexScanSelector indexScanSelector)
     {
-        return new IndexScan_Default(indexType, indexKeyRange, ordering, indexScanSelector, USE_PVALUES);
+        return indexScan_Default(indexType, indexKeyRange, ordering, indexScanSelector, 1);
+    }
+
+    public static Operator indexScan_Default(IndexRowType indexType,
+                                             IndexKeyRange indexKeyRange,
+                                             Ordering ordering,
+                                             IndexScanSelector indexScanSelector,
+                                             int lookaheadQuantum)
+    {
+        return new IndexScan_Default(indexType, indexKeyRange, ordering, indexScanSelector, lookaheadQuantum, USE_PVALUES);
     }
 
     // Select
@@ -497,9 +506,11 @@
     public static Operator map_NestedLoops(Operator outerInput,
                                            Operator innerInput,
                                            int inputBindingPosition,
+                                           boolean pipeline,
                                            int depth)
     {
-        return new Map_NestedLoops(outerInput, innerInput, inputBindingPosition, depth);
+        return new Map_NestedLoops(outerInput, innerInput, inputBindingPosition, 
+                                   pipeline, depth);
     }
 
     // IfEmpty

=== modified file 'src/main/java/com/akiban/qp/operator/IndexScan_Default.java'
--- src/main/java/com/akiban/qp/operator/IndexScan_Default.java	2013-07-09 17:26:33 +0000
+++ src/main/java/com/akiban/qp/operator/IndexScan_Default.java	2013-07-13 21:10:31 +0000
@@ -31,7 +31,9 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.ArrayDeque;
 import java.util.List;
+import java.util.Queue;
 
 /**
 
@@ -47,20 +49,19 @@
 
  <li><b>IndexRowType indexType:</b> The index's type.
 
- <li><b>boolean reverse:</b> Indicates whether keys should be visited
- in ascending order (reverse = false) or descending order (reverse =
- true).
-
  <li><b>IndexKeyRange indexKeyRange:</b> Describes the range of keys
  to be visited. The values specified by the indexKeyRange should
  restrict one or more of the leading fields of the index. If null,
  then the entire index will be scanned.
 
- <li><b>UserTableRowType innerJoinUntilRowType</b>: On a table index,
- this must be the UserTableRowType of the Index's table (but it's
- ignored). On a group index, this is the table until which the group
- index is interpreted with INNER JOIN semantics. The specified row
- type must be within the group index's branch segment.
+ <li><b>Ordering ordering:</b> Indicates whether keys should be visited
+  in ascending order or descending order.
+
+ <li><b>IndexScanSelector scanSelector:</b> On a group index, specify which
+  tables must be present for OUTER JOIN semantics.
+
+ <li><b>int lookaheadQuantum:</b> Number of cursors to try to keep open by looking
+  ahead in bindings stream.
 
  </ul>
 
@@ -165,7 +166,12 @@
     @Override
     protected Cursor cursor(QueryContext context, QueryBindingsCursor bindingsCursor)
     {
-        return new Execution(context, bindingsCursor);
+        if (lookaheadQuantum <= 1) {
+            return new Execution(context, bindingsCursor);
+        }
+        else {
+            return new LookaheadExecution(context, bindingsCursor, lookaheadQuantum);
+        }
     }
 
     // IndexScan_Default interface
@@ -174,6 +180,7 @@
                              IndexKeyRange indexKeyRange,
                              API.Ordering ordering,
                              IndexScanSelector scanSelector,
+                             int lookaheadQuantum,
                              boolean usePValues)
     {
         ArgumentValidation.notNull("indexType", indexType);
@@ -182,6 +189,7 @@
         this.ordering = ordering;
         this.indexKeyRange = indexKeyRange;
         this.scanSelector = scanSelector;
+        this.lookaheadQuantum = lookaheadQuantum;
         this.usePValues = usePValues;
     }
 
@@ -198,6 +206,7 @@
     private final API.Ordering ordering;
     private final IndexKeyRange indexKeyRange;
     private final IndexScanSelector scanSelector;
+    private final int lookaheadQuantum;
     private final boolean usePValues;
 
     @Override
@@ -372,4 +381,205 @@
 
         private final RowCursor cursor;
     }
+
+    static final class BindingsAndCursor {
+        QueryBindings bindings;
+        RowCursor cursor;
+            
+        BindingsAndCursor(QueryBindings bindings, RowCursor cursor) {
+            this.bindings = bindings;
+            this.cursor = cursor;
+        }
+    }
+
+    private class LookaheadExecution extends OperatorCursor
+    {
+        // Cursor interface
+
+        @Override
+        public void open() {
+            TAP_OPEN.in();
+            try {
+                CursorLifecycle.checkIdle(this);
+                if (currentCursor != null) {
+                    currentCursor.open();
+                }
+                else if (pendingCursor != null) {
+                    currentCursor = pendingCursor;
+                    pendingCursor = null;
+                }
+                else {
+                    // At the very beginning, the pipeline isn't started.
+                    currentCursor = openACursor(currentBindings);
+                }
+                while (!cursorPool.isEmpty() && !bindingsExhausted) {
+                    QueryBindings bindings = bindingsCursor.nextBindings();
+                    if (bindings == null) {
+                        bindingsExhausted = true;
+                        break;
+                    }
+                    RowCursor cursor = null;
+                    if (bindings.getDepth() == currentBindings.getDepth()) {
+                        cursor = openACursor(bindings);
+                        LOG.debug("IndexScan: lookahead {}", bindings);
+                    }
+                    pendingBindings.add(new BindingsAndCursor(bindings, cursor));
+                }
+            } finally {
+                TAP_OPEN.out();
+            }
+        }
+
+        @Override
+        public Row next() {
+            if (TAP_NEXT_ENABLED) {
+                TAP_NEXT.in();
+            }
+            try {
+                checkQueryCancelation();
+                Row row = currentCursor.next();
+                if (row == null) {
+                    currentCursor.close();
+                }
+                if (LOG_EXECUTION) {
+                    LOG.debug("IndexScan: yield {}", row);
+                }
+                return row;
+            } finally {
+                if (TAP_NEXT_ENABLED) {
+                    TAP_NEXT.out();
+                }
+            }
+        }
+
+        @Override
+        public void jump(Row row, ColumnSelector columnSelector) {
+            currentCursor.jump(row, columnSelector);
+        }
+
+        @Override
+        public void close() {
+            if (currentCursor != null) {
+                currentCursor.close();
+            }
+        }
+
+        @Override
+        public void destroy() {
+            CursorLifecycle.checkIdleOrActive(this);
+            if (currentCursor != null) {
+                currentCursor.destroy();
+                currentCursor = null;
+            }
+            if (pendingCursor != null) {
+                pendingCursor.destroy();
+                pendingCursor = null;
+            }
+            recyclePending();
+            while (true) {
+                RowCursor cursor = cursorPool.poll();
+                if (cursor == null) break;
+                cursor.destroy();
+            }
+            destroyed = true;
+        }
+
+        @Override
+        public boolean isIdle() {
+            return (currentCursor != null) ? currentCursor.isIdle() : !destroyed;
+        }
+
+        @Override
+        public boolean isActive() {
+            return ((currentCursor != null) && currentCursor.isActive());
+        }
+
+        @Override
+        public boolean isDestroyed() {
+            return destroyed;
+        }
+
+        @Override
+        public void openBindings() {
+            recyclePending();
+            bindingsCursor.openBindings();
+            bindingsExhausted = false;
+            currentCursor = pendingCursor = null;
+        }
+
+        @Override
+        public QueryBindings nextBindings() {
+            if (currentCursor != null) {
+                cursorPool.add(currentCursor);
+                currentCursor = null;
+            }
+            if (pendingCursor != null) {
+                pendingCursor.close(); // Abandoning lookahead.
+                cursorPool.add(pendingCursor);
+                pendingCursor = null;
+            }
+            BindingsAndCursor bandc = pendingBindings.poll();
+            if (bandc != null) {
+                currentBindings = bandc.bindings;
+                pendingCursor = bandc.cursor;
+                return currentBindings;
+            }
+            currentBindings = bindingsCursor.nextBindings();
+            if (currentBindings == null) {
+                bindingsExhausted = true;
+            }
+            return currentBindings;
+        }
+
+        @Override
+        public void closeBindings() {
+            bindingsCursor.closeBindings();
+            recyclePending();
+        }
+
+        // LookaheadExecution interface
+
+        LookaheadExecution(QueryContext context, QueryBindingsCursor bindingsCursor, 
+                           int quantum) {
+            super(context);
+            this.bindingsCursor = bindingsCursor;
+            this.pendingBindings = new ArrayDeque<>(quantum+1);
+            this.cursorPool = new ArrayDeque<>(quantum);
+            UserTable table = (UserTable)index.rootMostTable();
+            StoreAdapter adapter = adapter(table);
+            for (int i = 0; i < quantum; i++) {
+                RowCursor cursor = adapter.newIndexCursor(context, index, indexKeyRange, ordering, scanSelector, usePValues);
+                cursorPool.add(cursor);
+            }
+        }
+
+        // For use by this class
+
+        private void recyclePending() {
+            while (true) {
+                BindingsAndCursor bandc = pendingBindings.poll();
+                if (bandc == null) break;
+                if (bandc.cursor != null) {
+                    bandc.cursor.close();
+                    cursorPool.add(bandc.cursor);
+                }
+            }
+        }
+
+        private RowCursor openACursor(QueryBindings bindings) {
+            RowCursor cursor = cursorPool.remove();
+            ((BindingsAwareCursor)cursor).rebind(bindings);
+            cursor.open();
+            return cursor;
+        }
+
+        // Object state
+
+        private final QueryBindingsCursor bindingsCursor;
+        private final Queue<BindingsAndCursor> pendingBindings;
+        private final Queue<RowCursor> cursorPool;
+        private QueryBindings currentBindings;
+        private RowCursor pendingCursor, currentCursor;
+        private boolean bindingsExhausted, destroyed;
+    }
 }

=== modified file 'src/main/java/com/akiban/qp/operator/Map_NestedLoops.java'
--- src/main/java/com/akiban/qp/operator/Map_NestedLoops.java	2013-07-10 21:30:34 +0000
+++ src/main/java/com/akiban/qp/operator/Map_NestedLoops.java	2013-07-13 21:10:31 +0000
@@ -51,6 +51,8 @@
 
  <li><b>int inputBindingPosition:</b> Position of inner loop row in query context.
 
+ <li><b>boolean pipeline:</b> Whether to use bracketing cursors instead of rebinding.
+
  <li><b>int depth:</b> Number of nested Maps, including this one.
 
  </ul>
@@ -90,7 +92,7 @@
     @Override
     protected Cursor cursor(QueryContext context, QueryBindingsCursor bindingsCursor)
     {
-        if (false)
+        if (!pipeline)
             return new Execution(context, bindingsCursor); // Old-style
         else {
             Cursor outerCursor = outerInputOperator.cursor(context, bindingsCursor);
@@ -127,6 +129,7 @@
     public Map_NestedLoops(Operator outerInputOperator,
                            Operator innerInputOperator,
                            int inputBindingPosition,
+                           boolean pipeline,
                            int depth)
     {
         ArgumentValidation.notNull("outerInputOperator", outerInputOperator);
@@ -136,6 +139,7 @@
         this.outerInputOperator = outerInputOperator;
         this.innerInputOperator = innerInputOperator;
         this.inputBindingPosition = inputBindingPosition;
+        this.pipeline = pipeline;
         this.depth = depth;
     }
 
@@ -150,12 +154,14 @@
     private final Operator outerInputOperator;
     private final Operator innerInputOperator;
     private final int inputBindingPosition, depth;
+    private final boolean pipeline;
 
     @Override
     public CompoundExplainer getExplainer(ExplainContext context)
     {
         CompoundExplainer ex = new NestedLoopsExplainer(getName(), innerInputOperator, outerInputOperator, null, null, context);
         ex.addAttribute(Label.BINDING_POSITION, PrimitiveExplainer.getInstance(inputBindingPosition));
+        ex.addAttribute(Label.PIPELINE, PrimitiveExplainer.getInstance(pipeline));
         ex.addAttribute(Label.DEPTH, PrimitiveExplainer.getInstance(depth));
         if (context.hasExtraInfo(this))
             ex.get().putAll(context.getExtraInfo(this).get());
@@ -346,9 +352,13 @@
                 pendingBindings = null;
                 return bindings;
             }
-            bindings = input.nextBindings();
-            assert ((bindings == null) || (bindings.getDepth() < depth));
-            return bindings;
+            while (true) {
+                // Skip over any that we would elide.
+                bindings = input.nextBindings();
+                if ((bindings == null) || (bindings.getDepth() < depth))
+                    return bindings;
+                assert (bindings.getDepth() == depth);
+            }
         }
 
         @Override

=== modified file 'src/main/java/com/akiban/server/explain/Label.java'
--- src/main/java/com/akiban/server/explain/Label.java	2013-07-10 18:42:14 +0000
+++ src/main/java/com/akiban/server/explain/Label.java	2013-07-13 21:10:31 +0000
@@ -48,6 +48,7 @@
     INFIX_REPRESENTATION(Category.DESCRIPTION),
     ASSOCIATIVE(Category.DESCRIPTION),
     INDEX(Category.DESCRIPTION),
+    PIPELINE(Category.DESCRIPTION),
     DEPTH(Category.DESCRIPTION),
     
     // IDENTIFIER

=== modified file 'src/main/java/com/akiban/sql/optimizer/rule/OperatorAssembler.java'
--- src/main/java/com/akiban/sql/optimizer/rule/OperatorAssembler.java	2013-07-10 18:42:14 +0000
+++ src/main/java/com/akiban/sql/optimizer/rule/OperatorAssembler.java	2013-07-13 21:10:31 +0000
@@ -1182,7 +1182,8 @@
                 stream.operator = API.indexScan_Default(indexRowType,
                                                         assembleSpatialIndexKeyRange(indexScan, null),
                                                         API.ordering(), // TODO: what ordering?
-                                                        selector);
+                                                        selector,
+                                                        rulesContext.getPipelineConfiguration().getIndexScanLookaheadQuantum());
                 indexRowType = indexRowType.physicalRowType();
                 stream.rowType = indexRowType;
             }
@@ -1190,7 +1191,8 @@
                 stream.operator = API.indexScan_Default(indexRowType,
                                                         assembleIndexKeyRange(indexScan, null),
                                                         assembleIndexOrdering(indexScan, indexRowType),
-                                                        selector);
+                                                        selector,
+                                                        rulesContext.getPipelineConfiguration().getIndexScanLookaheadQuantum());
                 stream.rowType = indexRowType;
             }
             else {
@@ -1221,7 +1223,8 @@
                     Operator scan = API.indexScan_Default(indexRowType,
                                                           assembleIndexKeyRange(indexScan, null, rangeSegment),
                                                           assembleIndexOrdering(indexScan, indexRowType),
-                                                          selector);
+                                                          selector,
+                                                          rulesContext.getPipelineConfiguration().getIndexScanLookaheadQuantum());
                     if (stream.operator == null) {
                         stream.operator = scan;
                         stream.rowType = indexRowType;
@@ -1529,6 +1532,7 @@
             stream.operator = API.map_NestedLoops(ostream.operator, 
                                                   stream.operator,
                                                   currentBindingPosition(),
+                                                  rulesContext.getPipelineConfiguration().isMapEnabled(),
                                                   nestedBindingsDepth);
             nestedBindingsDepth--;
             popBoundRow();

=== added file 'src/main/java/com/akiban/sql/optimizer/rule/PipelineConfiguration.java'
--- src/main/java/com/akiban/sql/optimizer/rule/PipelineConfiguration.java	1970-01-01 00:00:00 +0000
+++ src/main/java/com/akiban/sql/optimizer/rule/PipelineConfiguration.java	2013-07-13 21:10:31 +0000
@@ -0,0 +1,67 @@
+/**
+ * Copyright (C) 2009-2013 Akiban Technologies, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.akiban.sql.optimizer.rule;
+
+import java.util.Properties;
+
+public class PipelineConfiguration
+{
+    private boolean mapEnabled = false;
+    private int indexScanLookaheadQuantum = 1;
+    private int groupLookupLookaheadQuantum = 1;
+    private boolean unionAllOpenBoth = false;
+
+    public PipelineConfiguration() {
+    }
+
+    public PipelineConfiguration(Properties properties) {
+        load(properties);
+    }
+
+    public boolean isMapEnabled() {
+        return mapEnabled;
+    }
+
+    public int getIndexScanLookaheadQuantum() {
+        return indexScanLookaheadQuantum;
+    }
+
+    public int getGroupLookupLookaheadQuantum() {
+        return groupLookupLookaheadQuantum;
+    }
+
+    public boolean isUnionAllOpenBoth() {
+        return unionAllOpenBoth;
+    }
+
+    public void load(Properties properties) {
+        for (String prop : properties.stringPropertyNames()) {
+            String val = properties.getProperty(prop);
+            if ("map.enabled".equals(prop))
+                mapEnabled = Boolean.parseBoolean(val);
+            else if ("indexScan.lookaheadQuantum".equals(prop))
+                indexScanLookaheadQuantum = Integer.parseInt(val);
+            else if ("groupLookup.lookaheadQuantum".equals(prop))
+                groupLookupLookaheadQuantum = Integer.parseInt(val);
+            else if ("unionAll.openBoth".equals(prop))
+                unionAllOpenBoth = Boolean.parseBoolean(val);
+            else
+                throw new IllegalArgumentException("Unknown property " + prop);
+        }
+    }
+}

=== modified file 'src/main/java/com/akiban/sql/optimizer/rule/SchemaRulesContext.java'
--- src/main/java/com/akiban/sql/optimizer/rule/SchemaRulesContext.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/sql/optimizer/rule/SchemaRulesContext.java	2013-07-13 21:10:31 +0000
@@ -36,6 +36,8 @@
     private FunctionsRegistry functionsRegistry;
     private CostEstimator costEstimator;
     private T3RegistryService t3Registry;
+    private PipelineConfiguration pipelineConfiguration;
+
     protected SchemaRulesContext() {
     }
 
@@ -55,12 +57,17 @@
         this.costEstimator = costEstimator;
     }
 
+    protected void initPipelineConfiguration(PipelineConfiguration pipelineConfiguration) {
+        this.pipelineConfiguration = pipelineConfiguration;
+    }
+
     @Override
     protected void initDone() {
         super.initDone();
         assert (schema != null) : "initSchema() not called";
         assert (functionsRegistry != null) : "initFunctionsRegistry() not called";
         assert (costEstimator != null) : "initCostEstimator() not called";
+        assert (pipelineConfiguration != null) : "initPipelineConfiguration() not called";
     }
 
     public Schema getSchema() {
@@ -89,4 +96,8 @@
 
     public abstract String getDefaultSchemaName();
 
+    public PipelineConfiguration getPipelineConfiguration() {
+        return pipelineConfiguration;
+    }
+
 }

=== modified file 'src/main/java/com/akiban/sql/server/ServerOperatorCompiler.java'
--- src/main/java/com/akiban/sql/server/ServerOperatorCompiler.java	2013-06-11 16:30:17 +0000
+++ src/main/java/com/akiban/sql/server/ServerOperatorCompiler.java	2013-07-13 21:10:31 +0000
@@ -36,6 +36,7 @@
         initParser(server.getParser());
         initFunctionsRegistry(server.functionsRegistry());
         initCostEstimator(server.costEstimator(this, keyCreator), usePValues);
+        initPipelineConfiguration(server.getPipelineConfiguration());
         if (usePValues)
             initT3Registry(server.t3RegistryService());
         

=== modified file 'src/main/java/com/akiban/sql/server/ServerSession.java'
--- src/main/java/com/akiban/sql/server/ServerSession.java	2013-06-11 16:32:59 +0000
+++ src/main/java/com/akiban/sql/server/ServerSession.java	2013-07-13 21:10:31 +0000
@@ -23,6 +23,7 @@
 import com.akiban.sql.parser.SQLParser;
 
 import com.akiban.sql.optimizer.AISBinderContext;
+import com.akiban.sql.optimizer.rule.PipelineConfiguration;
 import com.akiban.sql.optimizer.rule.cost.CostEstimator;
 
 import com.akiban.ais.model.AkibanInformationSchema;
@@ -165,4 +166,7 @@
 
     /** Check access to given schema */
     public boolean isSchemaAccessible(String schemaName);
+
+    /** Get the pipeline configuration. */
+    public PipelineConfiguration getPipelineConfiguration();
 }

=== modified file 'src/main/java/com/akiban/sql/server/ServerSessionBase.java'
--- src/main/java/com/akiban/sql/server/ServerSessionBase.java	2013-06-12 21:51:17 +0000
+++ src/main/java/com/akiban/sql/server/ServerSessionBase.java	2013-07-13 21:10:31 +0000
@@ -40,6 +40,7 @@
 import com.akiban.server.service.tree.KeyCreator;
 import com.akiban.server.t3expressions.T3RegistryService;
 import com.akiban.sql.optimizer.AISBinderContext;
+import com.akiban.sql.optimizer.rule.PipelineConfiguration;
 import com.akiban.sql.optimizer.rule.cost.CostEstimator;
 
 import java.util.*;
@@ -47,10 +48,12 @@
 public abstract class ServerSessionBase extends AISBinderContext implements ServerSession
 {
     public static final String COMPILER_PROPERTIES_PREFIX = "optimizer.";
+    public static final String PIPELINE_PROPERTIES_PREFIX = "akserver.pipeline.";
 
     protected final ServerServiceRequirements reqs;
     protected Properties compilerProperties;
     protected Map<String,Object> attributes = new HashMap<>();
+    protected PipelineConfiguration pipelineConfiguration;
     
     protected Session session;
     protected Map<StoreAdapter.AdapterType, StoreAdapter> adapters = 
@@ -401,4 +404,11 @@
         return reqs.securityService().isAccessible(session, schemaName);
     }
 
+    @Override
+    public PipelineConfiguration getPipelineConfiguration() {
+        if (pipelineConfiguration == null)
+            pipelineConfiguration = new PipelineConfiguration(reqs.config().deriveProperties(PIPELINE_PROPERTIES_PREFIX));
+        return pipelineConfiguration;
+    }
+
 }

=== modified file 'src/main/java/com/akiban/util/SparseArray.java'
--- src/main/java/com/akiban/util/SparseArray.java	2013-07-10 17:31:42 +0000
+++ src/main/java/com/akiban/util/SparseArray.java	2013-07-13 21:10:31 +0000
@@ -118,13 +118,14 @@
 
     public StringBuilder describeElements(StringBuilder sb) {
         sb.append('[');
+        int ilen = sb.length();
         
         int size = definedElements.size(); 
         for (int i = 0; i < size; ++i) {
             if (isDefined(i))
                 sb.append(internalGet(i)).append(", ");
         }
-        if (sb.length() > 1)                // sb is not just the initial '['
+        if (sb.length() > ilen)             // sb is not just the initial '['
             sb.setLength(sb.length() - 2);  // snip off the trailing ", "
         sb.append(']');
 

=== modified file 'src/main/resources/com/akiban/server/service/config/configuration-defaults.properties'
--- src/main/resources/com/akiban/server/service/config/configuration-defaults.properties	2013-06-11 21:35:24 +0000
+++ src/main/resources/com/akiban/server/service/config/configuration-defaults.properties	2013-07-13 21:10:31 +0000
@@ -43,6 +43,7 @@
 akserver.gc_monitor.interval=1000
 akserver.gc_monitor.log_threshold_ms=100
 akserver.write_lock_enabled=true
+akserver.lookaheadQuantum.indexScan=1
 
 persistit.buffersize=16384
 

=== modified file 'src/test/java/com/akiban/server/test/ApiTestBase.java'
--- src/test/java/com/akiban/server/test/ApiTestBase.java	2013-07-03 15:32:40 +0000
+++ src/test/java/com/akiban/server/test/ApiTestBase.java	2013-07-13 21:10:31 +0000
@@ -1353,6 +1353,10 @@
         return true;
     }
 
+    protected boolean pipelineMap() {
+        return false;
+    }
+
     protected DDLFunctions ddlForAlter() {
         return ddl();
     }

=== modified file 'src/test/java/com/akiban/server/test/costmodel/MapCT.java'
--- src/test/java/com/akiban/server/test/costmodel/MapCT.java	2013-07-10 18:42:14 +0000
+++ src/test/java/com/akiban/server/test/costmodel/MapCT.java	2013-07-13 21:10:31 +0000
@@ -83,7 +83,8 @@
         TimeOperator timeSetupOuter = new TimeOperator(setupOuter);
         Operator setupInner = limit_Default(groupScan_Default(group), innerRows);
         TimeOperator timeSetupInner = new TimeOperator(setupInner);
-        Operator plan = map_NestedLoops(timeSetupOuter, timeSetupInner, 0, 1);
+        Operator plan = map_NestedLoops(timeSetupOuter, timeSetupInner, 
+                                        0, pipelineMap(), 1);
         long start = System.nanoTime();
         for (int r = 0; r < runs; r++) {
             Cursor cursor = cursor(plan, queryContext, queryBindings);

=== modified file 'src/test/java/com/akiban/server/test/it/qp/AncestorLookup_NestedIT.java'
--- src/test/java/com/akiban/server/test/it/qp/AncestorLookup_NestedIT.java	2013-07-10 21:30:34 +0000
+++ src/test/java/com/akiban/server/test/it/qp/AncestorLookup_NestedIT.java	2013-07-13 21:10:31 +0000
@@ -141,7 +141,7 @@
             map_NestedLoops(
                 indexScan_Default(aValueIndexRowType),
                 ancestorLookup_Nested(rabc, aValueIndexRowType, Collections.singleton(aRowType), 0),
-                0, 1);
+                0, pipelineMap(), 1);
         Cursor cursor = cursor(plan, queryContext, queryBindings);
         RowBase[] expected = new RowBase[]{
             row(aRowType, 13L, 1L, "a13"),
@@ -159,7 +159,7 @@
             map_NestedLoops(
                 indexScan_Default(aValueIndexRowType),
                 ancestorLookup_Nested(rabc, aValueIndexRowType, Arrays.asList(aRowType, rRowType), 0),
-                0, 1);
+                0, pipelineMap(), 1);
         Cursor cursor = cursor(plan, queryContext, queryBindings);
         RowBase[] expected = new RowBase[]{
             row(rRowType, 1L, "r1"),
@@ -181,7 +181,7 @@
             map_NestedLoops(
                 indexScan_Default(aValueIndexRowType),
                 ancestorLookup_Nested(rabc, aValueIndexRowType, Arrays.asList(rRowType, aRowType), 0),
-                0, 1);
+                0, pipelineMap(), 1);
         Cursor cursor = cursor(plan, queryContext, queryBindings);
         RowBase[] expected = new RowBase[]{
             row(rRowType, 1L, "r1"),
@@ -204,9 +204,9 @@
                 map_NestedLoops(
                     indexScan_Default(aValueIndexRowType),
                     ancestorLookup_Nested(rabc, aValueIndexRowType, Arrays.asList(aRowType), 0),
-                    0, 1),
+                    0, pipelineMap(), 1),
                 ancestorLookup_Nested(rabc, aRowType, Arrays.asList(rRowType), 1),
-                1, 1);
+                1, pipelineMap(), 1);
         Cursor cursor = cursor(plan, queryContext, queryBindings);
         RowBase[] expected = new RowBase[]{
             row(rRowType, 1L, "r1"),
@@ -236,7 +236,7 @@
             map_NestedLoops(
                 abIndexScan,
                 ancestorLookup_Nested(rabc, abIndexScan.rowType(), Collections.singleton(rRowType), 0),
-                0, 1);
+                0, pipelineMap(), 1);
         Cursor cursor = cursor(plan, queryContext, queryBindings);
         RowBase[] expected = new RowBase[]{
             row(rRowType, 1L, "r1"),
@@ -272,7 +272,7 @@
             map_NestedLoops(
                 abcIndexScan,
                 ancestorLookup_Nested(rabc, abcIndexScan.rowType(), Collections.singleton(rRowType), 0),
-                0, 1);
+                0, pipelineMap(), 1);
         Cursor cursor = cursor(plan, queryContext, queryBindings);
         RowBase[] expected = new RowBase[]{
             row(rRowType, 1L, "r1"),
@@ -287,7 +287,7 @@
             map_NestedLoops(
                 indexScan_Default(aValueIndexRowType),
                 ancestorLookup_Nested(rabc, aValueIndexRowType, Collections.singleton(aRowType), 0),
-                0, 1);
+                0, pipelineMap(), 1);
         CursorLifecycleTestCase testCase = new CursorLifecycleTestCase()
         {
             @Override

=== modified file 'src/test/java/com/akiban/server/test/it/qp/BranchLookup_NestedIT.java'
--- src/test/java/com/akiban/server/test/it/qp/BranchLookup_NestedIT.java	2013-07-10 21:30:34 +0000
+++ src/test/java/com/akiban/server/test/it/qp/BranchLookup_NestedIT.java	2013-07-13 21:10:31 +0000
@@ -154,7 +154,7 @@
             map_NestedLoops(
                 indexScan_Default(aValueIndexRowType),
                 branchLookup_Nested(rabc, aValueIndexRowType, rRowType, InputPreservationOption.DISCARD_INPUT, 0),
-                0, 1);
+                0, pipelineMap(), 1);
         Cursor cursor = cursor(plan, queryContext, queryBindings);
         RowBase[] expected = new RowBase[]{
             // Each r row, and everything below it, is duplicated, because the A index refers to each r value twice.
@@ -202,7 +202,7 @@
                     Collections.singleton(aRowType),
                     InputPreservationOption.DISCARD_INPUT),
                 branchLookup_Nested(rabc, aRowType, rRowType, InputPreservationOption.DISCARD_INPUT, 0),
-                0, 1);
+                0, pipelineMap(), 1);
         Cursor cursor = cursor(plan, queryContext, queryBindings);
         RowBase[] expected = new RowBase[]{
             // Each r row, and everything below it, is duplicated, because the A index refers to each r value twice.
@@ -247,7 +247,7 @@
                     groupScan_Default(rabc),
                     Collections.singleton(aRowType)),
                 branchLookup_Nested(rabc, aRowType, bRowType, InputPreservationOption.DISCARD_INPUT, 0),
-                0, 1);
+                0, pipelineMap(), 1);
         Cursor cursor = cursor(plan, queryContext, queryBindings);
         RowBase[] expected = new RowBase[]{
             row(bRowType, 15L, 1L, "b15"),
@@ -272,9 +272,9 @@
                         groupScan_Default(rabc),
                         Collections.singleton(aRowType)),
                     branchLookup_Nested(rabc, aRowType, bRowType, InputPreservationOption.DISCARD_INPUT, 0),
-                    0, 1),
+                    0, pipelineMap(), 1),
                 branchLookup_Nested(rabc, bRowType, cRowType, InputPreservationOption.KEEP_INPUT, 1),
-                1, 1);
+                1, pipelineMap(), 1);
         Cursor cursor = cursor(plan, queryContext, queryBindings);
         RowBase[] expected = new RowBase[]{
             row(bRowType, 15L, 1L, "b15"),
@@ -324,7 +324,7 @@
             map_NestedLoops(
                 abIndexScan,
                 branchLookup_Nested(rabc, abIndexScan.rowType(), cRowType, InputPreservationOption.DISCARD_INPUT, 0),
-                0, 1);
+                0, pipelineMap(), 1);
         Cursor cursor = cursor(plan, queryContext, queryBindings);
         RowBase[] expected = new RowBase[]{
             row(cRowType, 17L, 1L, "c17"),
@@ -342,7 +342,7 @@
                                 groupScan_Default(rabc),
                                 Collections.singleton(aRowType)),
                         branchLookup_Nested(rabc, aRowType, rRowType, aRowType, InputPreservationOption.DISCARD_INPUT, 0),
-                        0, 1);
+                        0, pipelineMap(), 1);
         Cursor cursor = cursor(plan, queryContext, queryBindings);
         RowBase[] expected = new RowBase[]{
                 row(aRowType, 13L, 1L, "a13"),
@@ -366,7 +366,7 @@
                     groupScan_Default(rabc),
                     Collections.singleton(aRowType)),
                 branchLookup_Nested(rabc, aRowType, rRowType, aRowType, InputPreservationOption.DISCARD_INPUT, 0),
-                0, 1);
+                0, pipelineMap(), 1);
         CursorLifecycleTestCase testCase = new CursorLifecycleTestCase()
         {
             @Override

=== added file 'src/test/java/com/akiban/server/test/it/qp/IndexScanLookaheadIT.java'
--- src/test/java/com/akiban/server/test/it/qp/IndexScanLookaheadIT.java	1970-01-01 00:00:00 +0000
+++ src/test/java/com/akiban/server/test/it/qp/IndexScanLookaheadIT.java	2013-07-13 21:10:31 +0000
@@ -0,0 +1,227 @@
+/**
+ * Copyright (C) 2009-2013 Akiban Technologies, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.akiban.server.test.it.qp;
+
+import com.akiban.qp.expression.ExpressionRow;
+import com.akiban.qp.expression.IndexBound;
+import com.akiban.qp.expression.IndexKeyRange;
+import com.akiban.qp.expression.RowBasedUnboundExpressions;
+import com.akiban.qp.operator.Cursor;
+import com.akiban.qp.operator.ExpressionGenerator;
+import com.akiban.qp.operator.IndexScanSelector;
+import com.akiban.qp.operator.Operator;
+import com.akiban.qp.row.BindableRow;
+import com.akiban.qp.row.Row;
+import com.akiban.qp.rowtype.IndexRowType;
+import com.akiban.qp.rowtype.RowType;
+import com.akiban.server.api.dml.SetColumnSelector;
+import com.akiban.server.api.dml.scan.NewRow;
+import com.akiban.server.types.AkType;
+import com.akiban.server.types3.mcompat.mtypes.MNumeric;
+import com.akiban.server.types3.pvalue.PValue;
+import com.akiban.server.types3.texpressions.TPreparedExpression;
+import com.akiban.server.types3.texpressions.TPreparedLiteral;
+
+import static com.akiban.qp.operator.API.*;
+import static com.akiban.server.test.ExpressionGenerators.*;
+
+import org.junit.Test;
+import static junit.framework.Assert.assertEquals;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class IndexScanLookaheadIT extends OperatorITBase
+{
+    @Override
+    protected boolean pipelineMap() {
+        return true;
+    }
+
+    protected int lookaheadQuantum() {
+        return 4;
+    }
+
+    @Override
+    protected void setupPostCreateSchema() {
+        super.setupPostCreateSchema();
+        // Like super, but with a whole lot more cid=2 orders.
+        db = new NewRow[]{createNewRow(customer, 1L, "xyz"),
+                          createNewRow(customer, 2L, "abc"),
+                          createNewRow(customer, 4L, "qqq"),
+                          createNewRow(order, 11L, 1L, "ori"),
+                          createNewRow(order, 12L, 1L, "david"),
+                          createNewRow(order, 21L, 2L, "tom"),
+                          createNewRow(order, 22L, 2L, "jack"),
+                          createNewRow(order, 23L, 2L, "dave"),
+                          createNewRow(order, 24L, 2L, "dave"),
+                          createNewRow(order, 25L, 2L, "dave"),
+                          createNewRow(order, 26L, 2L, "dave"),
+                          createNewRow(order, 27L, 2L, "dave"),
+                          createNewRow(order, 28L, 2L, "dave"),
+                          createNewRow(order, 29L, 2L, "dave"),
+                          createNewRow(order, 41L, 4L, "nathan"),
+                          createNewRow(item, 111L, 11L),
+                          createNewRow(item, 112L, 11L),
+                          createNewRow(item, 121L, 12L),
+                          createNewRow(item, 122L, 12L),
+                          createNewRow(item, 211L, 21L),
+                          createNewRow(item, 212L, 21L),
+                          createNewRow(item, 221L, 22L),
+                          createNewRow(item, 222L, 22L),
+                          createNewRow(item, 241L, 24L),
+                          createNewRow(item, 251L, 25L)};
+        use(db);
+    }
+
+    @Test
+    public void testCursor()
+    {
+        Operator indexScan = indexScan_Default(itemIidIndexRowType, iidKeyRange(100, false, 125, false), ordering(itemIidIndexRowType), IndexScanSelector.leftJoinAfter(itemIidIndexRowType.index(), itemRowType.userTable()), lookaheadQuantum());
+        CursorLifecycleTestCase testCase = new CursorLifecycleTestCase()
+        {
+            @Override
+            public boolean hKeyComparison()
+            {
+                return true;
+            }
+
+            @Override
+            public String[] firstExpectedHKeys()
+            {
+                return new String[]{hkey(1, 11, 111), hkey(1, 11, 112), hkey(1, 12, 121), hkey(1, 12, 122)};
+            }
+        };
+        testCursorLifecycle(indexScan, testCase);
+    }
+
+    @Test
+    public void testSingle()
+    {
+        Operator indexScan = indexScan_Default(itemIidIndexRowType, iidKeyRange(212, true, 212, true), ordering(itemIidIndexRowType), IndexScanSelector.leftJoinAfter(itemIidIndexRowType.index(), itemRowType.userTable()), lookaheadQuantum());
+        Cursor cursor = cursor(indexScan, queryContext, queryBindings);
+        String[] expected = new String[]{hkey(2, 21, 212)};
+        compareRenderedHKeys(expected, cursor);
+    }
+
+    @Test
+    public void testMap()
+    {
+        RowType cidValueRowType = schema.newValuesType(AkType.INT);
+        List<ExpressionGenerator> cidExprs = Arrays.asList(boundField(cidValueRowType, 1, 0));
+        IndexBound cidBound =
+            new IndexBound(
+                new RowBasedUnboundExpressions(orderCidIndexRowType, cidExprs),
+                new SetColumnSelector(0));
+        IndexKeyRange cidRange = IndexKeyRange.bounded(orderCidIndexRowType, cidBound, true, cidBound, true);
+        Operator plan =
+            map_NestedLoops(
+                valuesScan_Default(
+                    bindableExpressions(intRow(cidValueRowType, 2),
+                                        intRow(cidValueRowType, 4),
+                                        intRow(cidValueRowType, 6)),
+                    cidValueRowType),
+                indexScan_Default(orderCidIndexRowType, cidRange, ordering(orderCidIndexRowType), IndexScanSelector.leftJoinAfter(orderCidIndexRowType.index(), orderRowType.userTable()), lookaheadQuantum()),
+                1, pipelineMap(), 1);
+        Cursor cursor = cursor(plan, queryContext, queryBindings);
+        String[] expected = new String[]{hkey(2, 21),hkey(2, 22),hkey(2, 23),hkey(2, 24),hkey(2, 25),hkey(2, 26),hkey(2, 27),hkey(2, 28),hkey(2, 29),hkey(4, 41)};
+        compareRenderedHKeys(expected, cursor);
+    }
+
+    @Test
+    public void testNested()
+    {
+        RowType cidValueRowType = schema.newValuesType(AkType.INT);
+        List<ExpressionGenerator> cidExprs = Arrays.asList(boundField(cidValueRowType, 1, 0));
+        IndexBound cidBound =
+            new IndexBound(
+                new RowBasedUnboundExpressions(orderCidIndexRowType, cidExprs),
+                new SetColumnSelector(0));
+        IndexKeyRange cidRange = IndexKeyRange.bounded(orderCidIndexRowType, cidBound, true, cidBound, true);
+        List<ExpressionGenerator> oidExprs = Arrays.asList(boundField(orderCidIndexRowType, 2, 1));
+        IndexBound oidBound =
+            new IndexBound(
+                new RowBasedUnboundExpressions(itemOidIndexRowType, oidExprs),
+                new SetColumnSelector(0));
+        IndexKeyRange oidRange = IndexKeyRange.bounded(itemOidIndexRowType, oidBound, true, oidBound, true);
+        Operator plan =
+            map_NestedLoops(
+                valuesScan_Default(
+                    bindableExpressions(intRow(cidValueRowType, 2),
+                                        intRow(cidValueRowType, 4),
+                                        intRow(cidValueRowType, 6)),
+                    cidValueRowType),
+                map_NestedLoops(
+                    indexScan_Default(orderCidIndexRowType, cidRange, ordering(orderCidIndexRowType), IndexScanSelector.leftJoinAfter(orderCidIndexRowType.index(), orderRowType.userTable()), lookaheadQuantum()),
+                    indexScan_Default(itemOidIndexRowType, oidRange, ordering(itemOidIndexRowType), IndexScanSelector.leftJoinAfter(itemOidIndexRowType.index(), itemRowType.userTable()), lookaheadQuantum()),
+                    2, pipelineMap(), 2),
+                1, pipelineMap(), 1);
+        Cursor cursor = cursor(plan, queryContext, queryBindings);
+        String[] expected = new String[]{hkey(2, 21, 211),hkey(2, 21, 212),hkey(2, 22, 221),hkey(2, 22, 222),hkey(2, 24, 241),hkey(2, 25, 251)};
+        compareRenderedHKeys(expected, cursor);
+    }
+
+    // For use by this class
+
+    private IndexKeyRange iidKeyRange(int lo, boolean loInclusive, int hi, boolean hiInclusive)
+    {
+        return IndexKeyRange.bounded(itemIidIndexRowType, iidBound(lo), loInclusive, iidBound(hi), hiInclusive);
+    }
+
+    private IndexBound iidBound(int iid)
+    {
+        return new IndexBound(row(itemIidIndexRowType, iid), new SetColumnSelector(0));
+    }
+
+    private Row intRow(RowType rowType, int x)
+    {
+        List<TPreparedExpression> pExpressions = Arrays.<TPreparedExpression>asList(new TPreparedLiteral(MNumeric.INT.instance(false), new PValue(MNumeric.INT.instance(false), x)));
+        return new ExpressionRow(rowType, queryContext, queryBindings, null, pExpressions);
+    }
+
+    private Collection<? extends BindableRow> bindableExpressions(Row... rows) {
+        List<BindableRow> result = new ArrayList<>();
+        for (Row row : rows) {
+            result.add(BindableRow.of(row, true));
+        }
+        return result;
+    }
+
+    private String hkey(int cid, int oid)
+    {
+        return String.format("{1,(long)%s,2,(long)%s}", cid, oid);
+    }
+
+    private String hkey(int cid, int oid, int iid)
+    {
+        return String.format("{1,(long)%s,2,(long)%s,3,(long)%s}", cid, oid, iid);
+    }
+
+    private Ordering ordering(IndexRowType indexRowType) {
+        Ordering ordering = new Ordering();
+        for (int i = 0; i < indexRowType.nFields(); i++) {
+            ordering.append(field(indexRowType, i), true);
+        }
+        return ordering;
+    }
+
+}

=== modified file 'src/test/java/com/akiban/server/test/it/qp/Map_NestedLoopsIT.java'
--- src/test/java/com/akiban/server/test/it/qp/Map_NestedLoopsIT.java	2013-07-10 21:30:34 +0000
+++ src/test/java/com/akiban/server/test/it/qp/Map_NestedLoopsIT.java	2013-07-13 21:10:31 +0000
@@ -102,25 +102,25 @@
     @Test(expected = IllegalArgumentException.class)
     public void testLeftInputNull()
     {
-        map_NestedLoops(null, groupScan_Default(coi), 0, 1);
+        map_NestedLoops(null, groupScan_Default(coi), 0, pipelineMap(), 1);
     }
 
     @Test(expected = IllegalArgumentException.class)
     public void testRightInputNull()
     {
-        map_NestedLoops(groupScan_Default(coi), null, 0, 1);
+        map_NestedLoops(groupScan_Default(coi), null, 0, pipelineMap(), 1);
     }
 
     @Test(expected = IllegalArgumentException.class)
     public void testNegativeInputBindingPosition()
     {
-        map_NestedLoops(groupScan_Default(coi), groupScan_Default(coi), -1, 1);
+        map_NestedLoops(groupScan_Default(coi), groupScan_Default(coi), -1, pipelineMap(), 1);
     }
 
     @Test(expected = IllegalArgumentException.class)
     public void testNonPositiveDepth()
     {
-        map_NestedLoops(groupScan_Default(coi), groupScan_Default(coi), 0, 0);
+        map_NestedLoops(groupScan_Default(coi), groupScan_Default(coi), 0, pipelineMap(),0);
     }
 
     // Test operator execution
@@ -132,7 +132,7 @@
             map_NestedLoops(
                 indexScan_Default(itemOidIndexRowType, false),
                 ancestorLookup_Nested(coi, itemOidIndexRowType, Collections.singleton(itemRowType), 0),
-                0, 1);
+                0, pipelineMap(), 1);
         RowBase[] expected = new RowBase[]{
             row(itemRowType, 1000L, 100L),
             row(itemRowType, 1001L, 100L),
@@ -175,7 +175,7 @@
                     groupScan_Default(coi),
                     Collections.singleton(customerRowType)),
                 project,
-                0, 1);
+                0, pipelineMap(), 1);
         RowType projectRowType = project.rowType();
         RowBase[] expected = new RowBase[]{
             row(projectRowType, 1L, 100L),
@@ -212,7 +212,7 @@
                     groupScan_Default(coi),
                     Collections.singleton(customerRowType)),
                 ifEmpty_Default(project, projectRowType, Arrays.asList(boundField(customerRowType, 0, 0), literal(null)), InputPreservationOption.KEEP_INPUT),
-                0, 1);
+                0, pipelineMap(), 1);
         RowBase[] expected = new RowBase[]{
             row(projectRowType, 1L, 100L),
             row(projectRowType, 1L, 101L),
@@ -234,7 +234,7 @@
             map_NestedLoops(
                 indexScan_Default(itemOidIndexRowType, false),
                 ancestorLookup_Nested(coi, itemOidIndexRowType, Collections.singleton(itemRowType), 0),
-                0, 1);
+                0, pipelineMap(), 1);
         CursorLifecycleTestCase testCase = new CursorLifecycleTestCase()
         {
             @Override
@@ -291,8 +291,8 @@
                 map_NestedLoops(
                     indexScan_Default(customerCidIndexRowType, false, cidRange),
                     ancestorLookup_Nested(coi, customerCidIndexRowType, Collections.singleton(customerRowType), 0),
-                    0, 2),
-                1, 1);
+                    0, pipelineMap(), 2),
+                1, pipelineMap(), 1);
         RowBase[] expected = new RowBase[]{
             row(customerRowType, 1L, "northbridge"),
             row(customerRowType, 2L, "foundation"),

=== added file 'src/test/java/com/akiban/server/test/it/qp/Map_NestedLoopsPipelineIT.java'
--- src/test/java/com/akiban/server/test/it/qp/Map_NestedLoopsPipelineIT.java	1970-01-01 00:00:00 +0000
+++ src/test/java/com/akiban/server/test/it/qp/Map_NestedLoopsPipelineIT.java	2013-07-13 21:10:31 +0000
@@ -0,0 +1,26 @@
+/**
+ * Copyright (C) 2009-2013 Akiban Technologies, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.akiban.server.test.it.qp;
+
+public class Map_NestedLoopsPipelineIT extends Map_NestedLoopsIT 
+{
+    @Override
+    protected boolean pipelineMap() {
+        return true;
+    }
+}

=== modified file 'src/test/java/com/akiban/server/test/it/qp/Sort_InsertionLimitedIT.java'
--- src/test/java/com/akiban/server/test/it/qp/Sort_InsertionLimitedIT.java	2013-07-10 18:42:14 +0000
+++ src/test/java/com/akiban/server/test/it/qp/Sort_InsertionLimitedIT.java	2013-07-13 21:10:31 +0000
@@ -540,7 +540,7 @@
                 map_NestedLoops(
                     filter_Default(groupScan_Default(coi),
                                    Collections.singleton(customerRowType)),
-                    project, 0, 1),
+                    project, 0, pipelineMap(), 1),
                 projectType,
                 ordering(field(projectType, 0), true),
                 SortOption.PRESERVE_DUPLICATES,

=== modified file 'src/test/java/com/akiban/server/test/it/qp/UnionAll_DefaultIT.java'
--- src/test/java/com/akiban/server/test/it/qp/UnionAll_DefaultIT.java	2013-07-10 18:42:14 +0000
+++ src/test/java/com/akiban/server/test/it/qp/UnionAll_DefaultIT.java	2013-07-13 21:10:31 +0000
@@ -270,7 +270,7 @@
                                       xEQ9Range,
                                       ordering),
                     txIndexRowType),
-                0, 1);
+                0, pipelineMap(), 1);
         String[] expected = new String[]{
             hKey(1000),
             hKey(1002),

=== modified file 'src/test/java/com/akiban/sql/optimizer/OperatorCompilerTest.java'
--- src/test/java/com/akiban/sql/optimizer/OperatorCompilerTest.java	2013-03-22 20:05:57 +0000
+++ src/test/java/com/akiban/sql/optimizer/OperatorCompilerTest.java	2013-07-13 21:10:31 +0000
@@ -33,6 +33,7 @@
 import com.akiban.sql.optimizer.plan.ResultSet.ResultField;
 import com.akiban.sql.optimizer.rule.ExplainPlanContext;
 import com.akiban.sql.optimizer.rule.RulesTestHelper;
+import com.akiban.sql.optimizer.rule.PipelineConfiguration;
 import com.akiban.sql.optimizer.rule.cost.TestCostEstimator;
 
 import com.akiban.junit.NamedParameterizedRunner;
@@ -122,6 +123,7 @@
                 compiler.initT3Registry(t3Registry);
             }
             compiler.initCostEstimator(new TestCostEstimator(ais, compiler.getSchema(), statsFile, false, properties), usePValues);
+            compiler.initPipelineConfiguration(new PipelineConfiguration());
             compiler.initDone();
             return compiler;
         }

=== modified file 'src/test/java/com/akiban/sql/optimizer/rule/RulesTestContext.java'
--- src/test/java/com/akiban/sql/optimizer/rule/RulesTestContext.java	2013-03-22 20:05:57 +0000
+++ src/test/java/com/akiban/sql/optimizer/rule/RulesTestContext.java	2013-07-13 21:10:31 +0000
@@ -50,6 +50,7 @@
         context.initCostEstimator(new TestCostEstimator(ais, context.getSchema(), 
                                                         statsFile, statsIgnoreMissingIndexes,
                                                         properties), false);
+        context.initPipelineConfiguration(new PipelineConfiguration());
         context.initDone();
         return context;
     }