Merge lp:~mmcm/akiban-server/query-bindings into lp:~akiban-technologies/akiban-server/trunk

[Mike McMahon]

Split off QueryBindings from QueryContext.

All the binding-related methods are on the new object and the context is now just the context proper, giving access to the current date, connection environment, etc. A context does not have any bindings, even at top level, but for convenience it can create them using the only implementation class yet.

A majority of methods that take a context now need a context and bindings, or have a similar method that takes the other one. This makes the diff pretty large, but fairly stylized.

Because the bindings have pretty much the same lifetime as the context, and there is only ever one set per context, this would all be pointless if it did not set the stage for more changes, which will allow for a stream of contexts along the same path as the stream of rows.

The next branch will change many of these same places again for the streams. If you could prefer, I can mark this WIP and remove the prereq from the other branch so that they only need to be reviewed once. However, the next branch has more substantial changes to the semantics, so I myself think it's clearer this way.

Also there is no urgency in getting this in, if we want to wait until the latency hiding that will actually make use of it all is working.

[Nathan Williams (nwilliams)]

Looks as described, with the same type of changes everywhere.

Given the likelihood for conflicts and very low risk, pushing it through now makes sense to me.

review: Approve

=== modified file 'src/main/java/com/akiban/qp/exec/UpdatePlannable.java'
--- src/main/java/com/akiban/qp/exec/UpdatePlannable.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/qp/exec/UpdatePlannable.java	2013-07-09 23:55:31 +0000
@@ -17,8 +17,9 @@
 
 package com.akiban.qp.exec;
 
+import com.akiban.qp.operator.QueryBindings;
 import com.akiban.qp.operator.QueryContext;
 
 public interface UpdatePlannable extends Plannable {
-    UpdateResult run(QueryContext context);
+    UpdateResult run(QueryContext context, QueryBindings bindings);
 }

=== modified file 'src/main/java/com/akiban/qp/expression/ExpressionRow.java'
--- src/main/java/com/akiban/qp/expression/ExpressionRow.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/qp/expression/ExpressionRow.java	2013-07-09 23:55:31 +0000
@@ -20,6 +20,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import com.akiban.qp.operator.QueryBindings;
 import com.akiban.qp.operator.QueryContext;
 import com.akiban.qp.row.AbstractRow;
 import com.akiban.qp.row.HKey;
@@ -40,7 +41,7 @@
     private List<? extends TPreparedExpression> pExpressions;
     private List<TEvaluatableExpression> pEvaluations;
 
-    public ExpressionRow(RowType rowType, QueryContext context, List<? extends Expression> expressions,
+    public ExpressionRow(RowType rowType, QueryContext context, QueryBindings bindings, List<? extends Expression> expressions,
                          List<? extends TPreparedExpression> pExpressions) {
         this.rowType = rowType;
         this.expressions = expressions;
@@ -51,6 +52,7 @@
             for (TPreparedExpression expression : pExpressions) {
                 TEvaluatableExpression evaluation = expression.build();
                 evaluation.with(context);
+                evaluation.with(bindings);
                 this.pEvaluations.add(evaluation);
             }
         }
@@ -62,6 +64,7 @@
                 }
                 ExpressionEvaluation evaluation = expression.evaluation();
                 evaluation.of(context);
+                evaluation.of(bindings);
                 this.evaluations.add(evaluation);
             }
         }

=== modified file 'src/main/java/com/akiban/qp/expression/IndexBound.java'
--- src/main/java/com/akiban/qp/expression/IndexBound.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/qp/expression/IndexBound.java	2013-07-09 23:55:31 +0000
@@ -17,6 +17,7 @@
 
 package com.akiban.qp.expression;
 
+import com.akiban.qp.operator.QueryBindings;
 import com.akiban.qp.operator.QueryContext;
 import com.akiban.server.api.dml.ColumnSelector;
 import com.akiban.server.explain.ExplainContext;
@@ -29,9 +30,9 @@
         return String.valueOf(unboundExpressions);
     }
 
-    public BoundExpressions boundExpressions(QueryContext context)
+    public BoundExpressions boundExpressions(QueryContext context, QueryBindings bindings)
     {
-        return unboundExpressions.get(context);
+        return unboundExpressions.get(context, bindings);
     }
 
     public ColumnSelector columnSelector()
@@ -64,7 +65,7 @@
     private static class PreBoundExpressions implements UnboundExpressions {
 
         @Override
-        public BoundExpressions get(QueryContext context) {
+        public BoundExpressions get(QueryContext context, QueryBindings bindings) {
             return expressions;
         }
 

=== modified file 'src/main/java/com/akiban/qp/expression/RowBasedUnboundExpressions.java'
--- src/main/java/com/akiban/qp/expression/RowBasedUnboundExpressions.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/qp/expression/RowBasedUnboundExpressions.java	2013-07-09 23:55:31 +0000
@@ -19,6 +19,7 @@
 
 import com.akiban.qp.operator.API;
 import com.akiban.qp.operator.ExpressionGenerator;
+import com.akiban.qp.operator.QueryBindings;
 import com.akiban.qp.operator.QueryContext;
 import com.akiban.qp.rowtype.RowType;
 import com.akiban.server.explain.Attributes;
@@ -35,8 +36,8 @@
 
 public final class RowBasedUnboundExpressions implements UnboundExpressions {
     @Override
-    public BoundExpressions get(QueryContext context) {
-        return new ExpressionsAndBindings(rowType, expressions, pExprs, context);
+    public BoundExpressions get(QueryContext context, QueryBindings bindings) {
+        return new ExpressionsAndBindings(rowType, expressions, pExprs, context, bindings);
     }
 
     @Override
@@ -106,9 +107,9 @@
         }
 
         ExpressionsAndBindings(RowType rowType, List<Expression> expressions, List<TPreparedExpression> pExprs,
-                               QueryContext context)
+                               QueryContext context, QueryBindings bindings)
         {
-            expressionRow = new ExpressionRow(rowType, context, expressions, pExprs);
+            expressionRow = new ExpressionRow(rowType, context, bindings, expressions, pExprs);
         }
 
         private final ExpressionRow expressionRow;

=== modified file 'src/main/java/com/akiban/qp/expression/UnboundExpressions.java'
--- src/main/java/com/akiban/qp/expression/UnboundExpressions.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/qp/expression/UnboundExpressions.java	2013-07-09 23:55:31 +0000
@@ -17,11 +17,12 @@
 
 package com.akiban.qp.expression;
 
+import com.akiban.qp.operator.QueryBindings;
 import com.akiban.qp.operator.QueryContext;
 import com.akiban.server.explain.ExplainContext;
 import com.akiban.server.explain.CompoundExplainer;
 
 public interface UnboundExpressions {
-    BoundExpressions get(QueryContext context);
+    BoundExpressions get(QueryContext context, QueryBindings bindings);
     CompoundExplainer getExplainer(ExplainContext context);
 }

=== modified file 'src/main/java/com/akiban/qp/loadableplan/DirectObjectPlan.java'
--- src/main/java/com/akiban/qp/loadableplan/DirectObjectPlan.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/qp/loadableplan/DirectObjectPlan.java	2013-07-09 23:55:31 +0000
@@ -17,12 +17,13 @@
 
 package com.akiban.qp.loadableplan;
 
+import com.akiban.qp.operator.QueryBindings;
 import com.akiban.qp.operator.QueryContext;
 
 /** A plan that uses a {@link DirectObjectCursor}. */
 public abstract class DirectObjectPlan
 {
-    public abstract DirectObjectCursor cursor(QueryContext context);
+    public abstract DirectObjectCursor cursor(QueryContext context, QueryBindings bindings);
 
     public enum OutputMode { TABLE, COPY_WITH_NEWLINE, COPY };
 

=== modified file 'src/main/java/com/akiban/qp/loadableplan/std/DumpGroupLoadablePlan.java'
--- src/main/java/com/akiban/qp/loadableplan/std/DumpGroupLoadablePlan.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/qp/loadableplan/std/DumpGroupLoadablePlan.java	2013-07-09 23:55:31 +0000
@@ -24,6 +24,7 @@
 import com.akiban.qp.loadableplan.LoadableDirectObjectPlan;
 import com.akiban.qp.operator.BindingNotSetException;
 import com.akiban.qp.operator.Cursor;
+import com.akiban.qp.operator.QueryBindings;
 import com.akiban.qp.operator.QueryContext;
 import com.akiban.qp.row.Row;
 import com.akiban.qp.rowtype.RowType;
@@ -48,8 +49,8 @@
         return new DirectObjectPlan() {
 
             @Override
-            public DirectObjectCursor cursor(QueryContext context) {
-                return new DumpGroupDirectObjectCursor(context);
+            public DirectObjectCursor cursor(QueryContext context, QueryBindings bindings) {
+                return new DumpGroupDirectObjectCursor(context, bindings);
             }
 
             @Override
@@ -65,6 +66,7 @@
 
     public static class DumpGroupDirectObjectCursor extends DirectObjectCursor {
         private final QueryContext context;
+        private final QueryBindings bindings;
         private UserTable rootTable;
         private Cursor cursor;
         private Map<UserTable,Integer> tableSizes;
@@ -72,8 +74,9 @@
         private GroupRowFormatter formatter;
         private int messagesSent;
 
-        public DumpGroupDirectObjectCursor(QueryContext context) {
+        public DumpGroupDirectObjectCursor(QueryContext context, QueryBindings bindings) {
             this.context = context;
+            this.bindings = bindings;
         }
 
         @Override
@@ -81,18 +84,18 @@
             String currentSchema = context.getCurrentSchema();
             String schemaName, tableName;
             if (Types3Switch.ON) {
-                if (context.getPValue(0).isNull())
+                if (bindings.getPValue(0).isNull())
                     schemaName = currentSchema;
                 else
-                    schemaName = context.getPValue(0).getString();
-                tableName = context.getPValue(1).getString();
+                    schemaName = bindings.getPValue(0).getString();
+                tableName = bindings.getPValue(1).getString();
             }
             else {
-                if (context.getValue(0).isNull())
+                if (bindings.getValue(0).isNull())
                     schemaName = currentSchema;
                 else
-                    schemaName = context.getValue(0).getString();
-                tableName = context.getValue(1).getString();
+                    schemaName = bindings.getValue(0).getString();
+                tableName = bindings.getValue(1).getString();
             }
             rootTable = context.getStore().schema().ais()
                 .getUserTable(schemaName, tableName);
@@ -106,10 +109,10 @@
             int insertMaxRowCount;
             try {
                 if (Types3Switch.ON) {
-                    insertMaxRowCount = context.getPValue(2).getInt32();
+                    insertMaxRowCount = bindings.getPValue(2).getInt32();
                 }
                 else {
-                    insertMaxRowCount = (int)context.getValue(2).getLong();
+                    insertMaxRowCount = (int)bindings.getValue(2).getLong();
                 }
             }
             catch (BindingNotSetException ex) {

=== modified file 'src/main/java/com/akiban/qp/loadableplan/std/PersistitCLILoadablePlan.java'
--- src/main/java/com/akiban/qp/loadableplan/std/PersistitCLILoadablePlan.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/qp/loadableplan/std/PersistitCLILoadablePlan.java	2013-07-09 23:55:31 +0000
@@ -27,6 +27,7 @@
 import com.akiban.qp.loadableplan.DirectObjectPlan;
 import com.akiban.qp.loadableplan.LoadableDirectObjectPlan;
 import com.akiban.qp.operator.BindingNotSetException;
+import com.akiban.qp.operator.QueryBindings;
 import com.akiban.qp.operator.QueryContext;
 import com.akiban.qp.persistitadapter.PersistitAdapter;
 import com.akiban.server.error.AkibanInternalException;
@@ -48,8 +49,8 @@
         return new DirectObjectPlan() {
 
             @Override
-            public DirectObjectCursor cursor(QueryContext context) {
-                return new PersistitCliDirectObjectCursor(context);
+            public DirectObjectCursor cursor(QueryContext context, QueryBindings bindings) {
+                return new PersistitCliDirectObjectCursor(context, bindings);
             }
 
             @Override
@@ -61,6 +62,7 @@
 
     public static class PersistitCliDirectObjectCursor extends DirectObjectCursor {
         final QueryContext context;
+        final QueryBindings bindings;
         final Persistit db;
         final Session session;
         boolean done = false;
@@ -68,8 +70,9 @@
         long taskId;
         ArrayList<String> messages = new ArrayList<>();
 
-        public PersistitCliDirectObjectCursor(QueryContext context) {
+        public PersistitCliDirectObjectCursor(QueryContext context, QueryBindings bindings) {
             this.context = context;
+            this.bindings = bindings;
             this.db = ((PersistitAdapter)context.getStore()).persistit().getDb();
             this.session = context.getSession();
         }
@@ -81,9 +84,9 @@
                 String carg;
                 try {
                     if (Types3Switch.ON)
-                        carg = context.getPValue(i).getString();
+                        carg = bindings.getPValue(i).getString();
                     else
-                        carg = context.getValue(i).getString();
+                        carg = bindings.getValue(i).getString();
                 } catch (BindingNotSetException ex) {
                     break;
                 }

=== modified file 'src/main/java/com/akiban/qp/memoryadapter/MemoryAdapter.java'
--- src/main/java/com/akiban/qp/memoryadapter/MemoryAdapter.java	2013-07-05 21:42:55 +0000
+++ src/main/java/com/akiban/qp/memoryadapter/MemoryAdapter.java	2013-07-09 23:55:31 +0000
@@ -26,6 +26,7 @@
 import com.akiban.qp.operator.Cursor;
 import com.akiban.qp.operator.GroupCursor;
 import com.akiban.qp.operator.IndexScanSelector;
+import com.akiban.qp.operator.QueryBindings;
 import com.akiban.qp.operator.QueryContext;
 import com.akiban.qp.operator.StoreAdapter;
 import com.akiban.qp.operator.API.Ordering;
@@ -71,7 +72,7 @@
     }
 
     @Override
-    public Cursor newIndexCursor(QueryContext context, Index index,
+    public Cursor newIndexCursor(QueryContext context, QueryBindings bindings, Index index,
             IndexKeyRange keyRange, Ordering ordering,
             IndexScanSelector scanSelector, boolean usePValues) {
         
@@ -92,7 +93,7 @@
     }
 
     @Override
-    public Sorter createSorter(QueryContext context, Cursor input, RowType rowType,
+    public Sorter createSorter(QueryContext context, QueryBindings bindings, Cursor input, RowType rowType,
                                Ordering ordering, SortOption sortOption, InOutTap loadTap) {
         throw new UnsupportedOperationException();
     }

=== modified file 'src/main/java/com/akiban/qp/operator/API.java'
--- src/main/java/com/akiban/qp/operator/API.java	2013-07-02 21:23:43 +0000
+++ src/main/java/com/akiban/qp/operator/API.java	2013-07-09 23:55:31 +0000
@@ -738,10 +738,10 @@
 
     // Execution interface
 
-    public static Cursor cursor(Operator root, QueryContext context)
+    public static Cursor cursor(Operator root, QueryContext context, QueryBindings bindings)
     {
         // if all they need is the wrapped cursor, create it directly
-        return new ChainedCursor(context, root.cursor(context));
+        return new ChainedCursor(context, bindings, root.cursor(context, bindings));
     }
 
     // Options

=== modified file 'src/main/java/com/akiban/qp/operator/Aggregate_Partial.java'
--- src/main/java/com/akiban/qp/operator/Aggregate_Partial.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/qp/operator/Aggregate_Partial.java	2013-07-09 23:55:31 +0000
@@ -165,7 +165,7 @@
     // Operator interface
 
     @Override
-    protected Cursor cursor(QueryContext context) {
+    protected Cursor cursor(QueryContext context, QueryBindings bindings) {
         final List<Aggregator> aggregators;
         if (aggregatorFactories != null) {
             aggregators = new ArrayList<>();
@@ -182,7 +182,7 @@
             aggregators = null;
         }
         return new AggregateCursor(
-                context,
+                context, bindings,
                 aggregators
         );
     }
@@ -641,10 +641,10 @@
 
         // AggregateCursor interface
 
-        private AggregateCursor(QueryContext context,
+        private AggregateCursor(QueryContext context, QueryBindings bindings,
                                 List<Aggregator> aggregators) {
-            super(context);
-            this.inputCursor = inputOperator.cursor(context);
+            super(context, bindings);
+            this.inputCursor = inputOperator.cursor(context, bindings);
             this.aggregators = aggregators;
             if (aggregators != null) {
                 keyValues = new ArrayList<>();

=== modified file 'src/main/java/com/akiban/qp/operator/AncestorLookup_Default.java'
--- src/main/java/com/akiban/qp/operator/AncestorLookup_Default.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/qp/operator/AncestorLookup_Default.java	2013-07-09 23:55:31 +0000
@@ -131,9 +131,9 @@
     }
 
     @Override
-    protected Cursor cursor(QueryContext context)
+    protected Cursor cursor(QueryContext context, QueryBindings bindings)
     {
-        return new Execution(context, inputOperator.cursor(context));
+        return new Execution(context, bindings, inputOperator.cursor(context, bindings));
     }
 
     @Override
@@ -333,9 +333,9 @@
 
         // Execution interface
 
-        Execution(QueryContext context, Cursor input)
+        Execution(QueryContext context, QueryBindings bindings, Cursor input)
         {
-            super(context);
+            super(context, bindings);
             this.input = input;
             // Why + 1: Because the input row (whose ancestors get discovered) also goes into pending.
             this.pending = new PendingRows(ancestors.size() + 1);

=== modified file 'src/main/java/com/akiban/qp/operator/AncestorLookup_Nested.java'
--- src/main/java/com/akiban/qp/operator/AncestorLookup_Nested.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/qp/operator/AncestorLookup_Nested.java	2013-07-09 23:55:31 +0000
@@ -129,9 +129,9 @@
     }
 
     @Override
-    protected Cursor cursor(QueryContext context)
+    protected Cursor cursor(QueryContext context, QueryBindings bindings)
     {
-        return new Execution(context);
+        return new Execution(context, bindings);
     }
 
     @Override
@@ -245,7 +245,7 @@
             TAP_OPEN.in();
             try {
                 CursorLifecycle.checkIdle(this);
-                Row rowFromBindings = context.getRow(inputBindingPosition);
+                Row rowFromBindings = bindings.getRow(inputBindingPosition);
                 if (LOG_EXECUTION) {
                     LOG.debug("AncestorLookup_Nested: open using {}", rowFromBindings);
                 }
@@ -320,9 +320,9 @@
 
         // Execution interface
 
-        Execution(QueryContext context)
+        Execution(QueryContext context, QueryBindings bindings)
         {
-            super(context);
+            super(context, bindings);
             this.pending = new PendingRows(ancestors.size() + 1);
             this.ancestorCursor = adapter().newGroupCursor(group);
         }

=== modified file 'src/main/java/com/akiban/qp/operator/BranchLookup_Default.java'
--- src/main/java/com/akiban/qp/operator/BranchLookup_Default.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/qp/operator/BranchLookup_Default.java	2013-07-09 23:55:31 +0000
@@ -162,9 +162,9 @@
     }
 
     @Override
-    public Cursor cursor(QueryContext context)
+    public Cursor cursor(QueryContext context, QueryBindings bindings)
     {
-        return new Execution(context, inputOperator.cursor(context));
+        return new Execution(context, bindings, inputOperator.cursor(context, bindings));
     }
 
     @Override
@@ -407,9 +407,9 @@
 
         // Execution interface
 
-        Execution(QueryContext context, Cursor input)
+        Execution(QueryContext context, QueryBindings bindings, Cursor input)
         {
-            super(context);
+            super(context, bindings);
             this.inputCursor = input;
             this.lookupCursor = adapter().newGroupCursor(group);
             this.lookupRowHKey = adapter().newHKey(outputRowType.hKey());

=== modified file 'src/main/java/com/akiban/qp/operator/BranchLookup_Nested.java'
--- src/main/java/com/akiban/qp/operator/BranchLookup_Nested.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/qp/operator/BranchLookup_Nested.java	2013-07-09 23:55:31 +0000
@@ -148,9 +148,9 @@
     }
 
     @Override
-    public Cursor cursor(QueryContext context)
+    public Cursor cursor(QueryContext context, QueryBindings bindings)
     {
-        return new Execution(context);
+        return new Execution(context, bindings);
     }
 
     @Override
@@ -295,7 +295,7 @@
             TAP_OPEN.in();
             try {
                 CursorLifecycle.checkIdle(this);
-                Row rowFromBindings = context.getRow(inputBindingPosition);
+                Row rowFromBindings = bindings.getRow(inputBindingPosition);
                 if (LOG_EXECUTION) {
                     LOG.debug("BranchLookup_Nested: open using {}", rowFromBindings);
                 }
@@ -383,9 +383,9 @@
 
         // Execution interface
 
-        Execution(QueryContext context)
+        Execution(QueryContext context, QueryBindings bindings)
         {
-            super(context);
+            super(context, bindings);
             this.cursor = adapter().newGroupCursor(group);
             this.hKey = adapter().newHKey(outputRowType.hKey());
         }

=== modified file 'src/main/java/com/akiban/qp/operator/ChainedCursor.java'
--- src/main/java/com/akiban/qp/operator/ChainedCursor.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/qp/operator/ChainedCursor.java	2013-07-09 23:55:31 +0000
@@ -24,8 +24,8 @@
 {
     protected final Cursor input;
 
-    protected ChainedCursor(QueryContext context, Cursor input) {
-        super(context);
+    protected ChainedCursor(QueryContext context, QueryBindings bindings, Cursor input) {
+        super(context, bindings);
         this.input = input;
     }
 

=== modified file 'src/main/java/com/akiban/qp/operator/Count_Default.java'
--- src/main/java/com/akiban/qp/operator/Count_Default.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/qp/operator/Count_Default.java	2013-07-09 23:55:31 +0000
@@ -93,9 +93,9 @@
     }
 
     @Override
-    protected Cursor cursor(QueryContext context)
+    protected Cursor cursor(QueryContext context, QueryBindings bindings)
     {
-        return new Execution(context, inputOperator.cursor(context));
+        return new Execution(context, bindings, inputOperator.cursor(context, bindings));
     }
 
     @Override
@@ -241,9 +241,9 @@
 
         // Execution interface
 
-        Execution(QueryContext context, Cursor input)
+        Execution(QueryContext context, QueryBindings bindings, Cursor input)
         {
-            super(context);
+            super(context, bindings);
             this.input = input;
         }
 

=== modified file 'src/main/java/com/akiban/qp/operator/Count_TableStatus.java'
--- src/main/java/com/akiban/qp/operator/Count_TableStatus.java	2013-06-10 15:32:10 +0000
+++ src/main/java/com/akiban/qp/operator/Count_TableStatus.java	2013-07-09 23:55:31 +0000
@@ -86,9 +86,9 @@
     // Operator interface
 
     @Override
-    protected Cursor cursor(QueryContext context)
+    protected Cursor cursor(QueryContext context, QueryBindings bindings)
     {
-        return new Execution(context);
+        return new Execution(context, bindings);
     }
 
     @Override
@@ -219,9 +219,9 @@
 
         // Execution interface
 
-        Execution(QueryContext context)
+        Execution(QueryContext context, QueryBindings bindings)
         {
-            super(context);
+            super(context, bindings);
         }
 
         // Object state

=== modified file 'src/main/java/com/akiban/qp/operator/Delete_Default.java'
--- src/main/java/com/akiban/qp/operator/Delete_Default.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/qp/operator/Delete_Default.java	2013-07-09 23:55:31 +0000
@@ -117,8 +117,8 @@
     }
 
     @Override
-    public UpdateResult run(QueryContext context) {
-        return new Execution(context, inputOperator.cursor(context)).run();
+    public UpdateResult run(QueryContext context, QueryBindings bindings) {
+        return new Execution(context, bindings, inputOperator.cursor(context, bindings)).run();
     }
 
     @Override
@@ -174,9 +174,9 @@
             return new StandardUpdateResult(seen, modified);
         }
 
-        protected Execution(QueryContext queryContext, Cursor input)
+        protected Execution(QueryContext queryContext, QueryBindings bindings, Cursor input)
         {
-            super(queryContext);
+            super(queryContext, bindings);
             this.input = input;
         }
 

=== modified file 'src/main/java/com/akiban/qp/operator/Delete_Returning.java'
--- src/main/java/com/akiban/qp/operator/Delete_Returning.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/qp/operator/Delete_Returning.java	2013-07-09 23:55:31 +0000
@@ -84,8 +84,8 @@
 
 
     @Override
-    protected Cursor cursor(QueryContext context) {
-        return new Execution(context, inputOperator.cursor(context));
+    protected Cursor cursor(QueryContext context, QueryBindings bindings) {
+        return new Execution(context, bindings, inputOperator.cursor(context, bindings));
     }
 
     @Override
@@ -210,9 +210,9 @@
     
         // Execution interface
     
-        Execution(QueryContext context, Cursor input)
+        Execution(QueryContext context, QueryBindings bindings, Cursor input)
         {
-            super(context);
+            super(context, bindings);
             this.input = input;
         }
     

=== modified file 'src/main/java/com/akiban/qp/operator/Distinct_Partial.java'
--- src/main/java/com/akiban/qp/operator/Distinct_Partial.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/qp/operator/Distinct_Partial.java	2013-07-09 23:55:31 +0000
@@ -102,9 +102,9 @@
     }
 
     @Override
-    protected Cursor cursor(QueryContext context)
+    protected Cursor cursor(QueryContext context, QueryBindings bindings)
     {
-        return new Execution(context, inputOperator.cursor(context), usePValue);
+        return new Execution(context, bindings, inputOperator.cursor(context, bindings), usePValue);
     }
 
     @Override
@@ -240,9 +240,9 @@
 
         // Execution interface
 
-        Execution(QueryContext context, Cursor input, boolean usePValue)
+        Execution(QueryContext context, QueryBindings bindings, Cursor input, boolean usePValue)
         {
-            super(context);
+            super(context, bindings);
             this.input = input;
 
             nfields = distinctType.nFields();

=== modified file 'src/main/java/com/akiban/qp/operator/EmitBoundRow_Nested.java'
--- src/main/java/com/akiban/qp/operator/EmitBoundRow_Nested.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/qp/operator/EmitBoundRow_Nested.java	2013-07-09 23:55:31 +0000
@@ -92,9 +92,9 @@
     }
 
     @Override
-    protected Cursor cursor(QueryContext context)
+    protected Cursor cursor(QueryContext context, QueryBindings bindings)
     {
-        return new Execution(context, inputOperator.cursor(context));
+        return new Execution(context, bindings, inputOperator.cursor(context, bindings));
     }
 
     @Override
@@ -199,7 +199,7 @@
                 }
                 else  {
                     assert (row.rowType() == inputRowType);
-                    Row rowFromBindings = context.getRow(bindingPosition);
+                    Row rowFromBindings = bindings.getRow(bindingPosition);
                     assert (rowFromBindings.rowType() == boundRowType);
                     if (boundRowType == outputRowType) {
                         row = rowFromBindings;
@@ -256,9 +256,9 @@
 
         // Execution interface
 
-        Execution(QueryContext context, Cursor input)
+        Execution(QueryContext context, QueryBindings bindings, Cursor input)
         {
-            super(context);
+            super(context, bindings);
             this.input = input;
         }
 

=== modified file 'src/main/java/com/akiban/qp/operator/ExecutionBase.java'
--- src/main/java/com/akiban/qp/operator/ExecutionBase.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/qp/operator/ExecutionBase.java	2013-07-09 23:55:31 +0000
@@ -36,12 +36,14 @@
         context.checkQueryCancelation();
     }
 
-    public ExecutionBase(QueryContext context)
+    public ExecutionBase(QueryContext context, QueryBindings bindings)
     {
         this.context = context;
+        this.bindings = bindings;
     }
 
     protected QueryContext context;
+    protected QueryBindings bindings;
 
     protected static final boolean LOG_EXECUTION = false;
     protected static final boolean TAP_NEXT_ENABLED = false;

=== modified file 'src/main/java/com/akiban/qp/operator/Filter_Default.java'
--- src/main/java/com/akiban/qp/operator/Filter_Default.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/qp/operator/Filter_Default.java	2013-07-09 23:55:31 +0000
@@ -93,9 +93,9 @@
     }
 
     @Override
-    protected Cursor cursor(QueryContext context)
+    protected Cursor cursor(QueryContext context, QueryBindings bindings)
     {
-        return new Execution(context, inputOperator.cursor(context));
+        return new Execution(context, bindings, inputOperator.cursor(context, bindings));
     }
 
     @Override
@@ -216,9 +216,9 @@
 
         // Execution interface
 
-        Execution(QueryContext context, Cursor input)
+        Execution(QueryContext context, QueryBindings bindings, Cursor input)
         {
-            super(context);
+            super(context, bindings);
             this.input = input;
         }
 

=== modified file 'src/main/java/com/akiban/qp/operator/Flatten_HKeyOrdered.java'
--- src/main/java/com/akiban/qp/operator/Flatten_HKeyOrdered.java	2013-05-24 21:45:54 +0000
+++ src/main/java/com/akiban/qp/operator/Flatten_HKeyOrdered.java	2013-07-09 23:55:31 +0000
@@ -179,9 +179,9 @@
     // Operator interface
 
     @Override
-    protected Cursor cursor(QueryContext context)
+    protected Cursor cursor(QueryContext context, QueryBindings bindings)
     {
-        return new Execution(context, inputOperator.cursor(context));
+        return new Execution(context, bindings, inputOperator.cursor(context, bindings));
     }
 
     @Override
@@ -410,9 +410,9 @@
 
         // Execution interface
 
-        Execution(QueryContext context, Cursor input)
+        Execution(QueryContext context, QueryBindings bindings, Cursor input)
         {
-            super(context);
+            super(context, bindings);
             this.input = input;
             this.leftJoinHKey = adapter().newHKey(childType.hKey());
         }

=== modified file 'src/main/java/com/akiban/qp/operator/GroupScan_Default.java'
--- src/main/java/com/akiban/qp/operator/GroupScan_Default.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/qp/operator/GroupScan_Default.java	2013-07-09 23:55:31 +0000
@@ -88,9 +88,9 @@
     // Operator interface
 
     @Override
-    protected Cursor cursor(QueryContext context)
+    protected Cursor cursor(QueryContext context, QueryBindings bindings)
     {
-        return new Execution(context, cursorCreator);
+        return new Execution(context, bindings, cursorCreator);
     }
 
     // GroupScan_Default interface
@@ -198,10 +198,10 @@
 
         // Execution interface
 
-        Execution(QueryContext context, GroupCursorCreator cursorCreator)
+        Execution(QueryContext context, QueryBindings bindings, GroupCursorCreator cursorCreator)
         {
-            super(context);
-            this.cursor = cursorCreator.cursor(context);
+            super(context, bindings);
+            this.cursor = cursorCreator.cursor(context, bindings);
         }
 
         // Object state
@@ -211,7 +211,7 @@
 
     static interface GroupCursorCreator
     {
-        Cursor cursor(QueryContext context);
+        Cursor cursor(QueryContext context, QueryBindings bindings);
 
         Group group();
         
@@ -254,7 +254,7 @@
         // GroupCursorCreator interface
 
         @Override
-        public Cursor cursor(QueryContext context)
+        public Cursor cursor(QueryContext context, QueryBindings bindings)
         {
             return context.getStore(group().getRoot()).newGroupCursor(group());
         }
@@ -281,9 +281,9 @@
         // GroupCursorCreator interface
 
         @Override
-        public Cursor cursor(QueryContext context)
+        public Cursor cursor(QueryContext context, QueryBindings bindings)
         {
-            return new HKeyBoundCursor(context, 
+            return new HKeyBoundCursor(context, bindings,
                     context.getStore(group().getRoot()).newGroupCursor(group()),
                     hKeyBindingPosition, 
                     deep, 
@@ -367,13 +367,14 @@
         }
 
         HKeyBoundCursor(QueryContext context,
+                        QueryBindings bindings,
                         GroupCursor input,
                         int hKeyBindingPosition,
                         boolean deep,
                         UserTable hKeyType,
                         UserTable shortenUntil)
         {
-            super(context, input);
+            super(context, bindings, input);
             this.input = input;
             this.hKeyBindingPosition = hKeyBindingPosition;
             this.deep = deep;
@@ -382,7 +383,7 @@
         }
 
         private HKey getHKeyFromBindings() {
-            return context.getHKey(hKeyBindingPosition);
+            return bindings.getHKey(hKeyBindingPosition);
         }
 
         private final GroupCursor input;

=== modified file 'src/main/java/com/akiban/qp/operator/HKeyUnion_Ordered.java'
--- src/main/java/com/akiban/qp/operator/HKeyUnion_Ordered.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/qp/operator/HKeyUnion_Ordered.java	2013-07-09 23:55:31 +0000
@@ -86,9 +86,9 @@
     // Operator interface
 
     @Override
-    protected Cursor cursor(QueryContext context)
+    protected Cursor cursor(QueryContext context, QueryBindings bindings)
     {
-        return new Execution(context);
+        return new Execution(context, bindings);
     }
 
     @Override
@@ -310,11 +310,11 @@
 
         // Execution interface
 
-        Execution(QueryContext context)
+        Execution(QueryContext context, QueryBindings bindings)
         {
-            super(context);
-            leftInput = left.cursor(context);
-            rightInput = right.cursor(context);
+            super(context, bindings);
+            leftInput = left.cursor(context, bindings);
+            rightInput = right.cursor(context, bindings);
             hKeyCache = new HKeyCache<>(context.getStore());
         }
         

=== modified file 'src/main/java/com/akiban/qp/operator/IfEmpty_Default.java'
--- src/main/java/com/akiban/qp/operator/IfEmpty_Default.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/qp/operator/IfEmpty_Default.java	2013-07-09 23:55:31 +0000
@@ -116,9 +116,9 @@
     // Operator interface
 
     @Override
-    protected Cursor cursor(QueryContext context)
+    protected Cursor cursor(QueryContext context, QueryBindings bindings)
     {
-        return new Execution(context);
+        return new Execution(context, bindings);
     }
 
     @Override
@@ -318,10 +318,10 @@
 
         // Execution interface
 
-        Execution(QueryContext context)
+        Execution(QueryContext context, QueryBindings bindings)
         {
-            super(context);
-            this.input = inputOperator.cursor(context);
+            super(context, bindings);
+            this.input = inputOperator.cursor(context, bindings);
             if (pExpressions != null) {
                 this.oEvaluations = null;
                 this.pEvaluations = new ArrayList<>(pExpressions.size());
@@ -349,6 +349,7 @@
                 for (int i = 0; i < nFields; i++) {
                     TEvaluatableExpression outerJoinRowColumnEvaluation = pEvaluations.get(i);
                     outerJoinRowColumnEvaluation.with(context);
+                    outerJoinRowColumnEvaluation.with(bindings);
                     outerJoinRowColumnEvaluation.evaluate();
                     PValueTargets.copyFrom(
                             outerJoinRowColumnEvaluation.resultValue(),
@@ -359,6 +360,7 @@
                 for (int i = 0; i < nFields; i++) {
                     ExpressionEvaluation outerJoinRowColumnEvaluation = oEvaluations.get(i);
                     outerJoinRowColumnEvaluation.of(context);
+                    outerJoinRowColumnEvaluation.of(bindings);
                     valuesHolderRow.holderAt(i).copyFrom(outerJoinRowColumnEvaluation.eval());
                 }
             }

=== modified file 'src/main/java/com/akiban/qp/operator/IndexScan_Default.java'
--- src/main/java/com/akiban/qp/operator/IndexScan_Default.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/qp/operator/IndexScan_Default.java	2013-07-09 23:55:31 +0000
@@ -163,9 +163,9 @@
     // Operator interface
 
     @Override
-    protected Cursor cursor(QueryContext context)
+    protected Cursor cursor(QueryContext context, QueryBindings bindings)
     {
-        return new Execution(context);
+        return new Execution(context, bindings);
     }
 
     // IndexScan_Default interface
@@ -353,11 +353,11 @@
 
         // Execution interface
 
-        Execution(QueryContext context)
+        Execution(QueryContext context, QueryBindings bindings)
         {
-            super(context);
+            super(context, bindings);
             UserTable table = (UserTable)index.rootMostTable();
-            this.cursor = adapter(table).newIndexCursor(context, index, indexKeyRange, ordering, scanSelector, usePValues);
+            this.cursor = adapter(table).newIndexCursor(context, bindings, index, indexKeyRange, ordering, scanSelector, usePValues);
         }
 
         // Object state

=== modified file 'src/main/java/com/akiban/qp/operator/Insert_Default.java'
--- src/main/java/com/akiban/qp/operator/Insert_Default.java	2013-07-07 19:23:59 +0000
+++ src/main/java/com/akiban/qp/operator/Insert_Default.java	2013-07-09 23:55:31 +0000
@@ -85,8 +85,8 @@
     }
 
     @Override
-    public UpdateResult run(QueryContext context) {
-        return new Execution(context, inputOperator.cursor(context)).run();
+    public UpdateResult run(QueryContext context, QueryBindings bindings) {
+        return new Execution(context, bindings, inputOperator.cursor(context, bindings)).run();
     }
 
     @Override
@@ -163,9 +163,9 @@
             return new StandardUpdateResult(seen, modified);
         }
 
-        protected Execution(QueryContext queryContext, Cursor input)
+        protected Execution(QueryContext queryContext, QueryBindings queryBindings, Cursor input)
         {
-            super(queryContext);
+            super(queryContext, queryBindings);
             this.input = input;
         }
 

=== modified file 'src/main/java/com/akiban/qp/operator/Insert_Returning.java'
--- src/main/java/com/akiban/qp/operator/Insert_Returning.java	2013-07-07 19:23:59 +0000
+++ src/main/java/com/akiban/qp/operator/Insert_Returning.java	2013-07-09 23:55:31 +0000
@@ -82,8 +82,8 @@
 public class Insert_Returning extends Operator {
 
     @Override
-    protected Cursor cursor(QueryContext context) {
-        return new Execution(context, inputOperator.cursor(context));
+    protected Cursor cursor(QueryContext context, QueryBindings bindings) {
+        return new Execution(context, bindings, inputOperator.cursor(context, bindings));
     }
 
     @Override
@@ -214,9 +214,9 @@
     
         // Execution interface
     
-        Execution(QueryContext context, Cursor input)
+        Execution(QueryContext context, QueryBindings bindings, Cursor input)
         {
-            super(context);
+            super(context, bindings);
             this.input = input;
         }
     

=== modified file 'src/main/java/com/akiban/qp/operator/Intersect_Ordered.java'
--- src/main/java/com/akiban/qp/operator/Intersect_Ordered.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/qp/operator/Intersect_Ordered.java	2013-07-09 23:55:31 +0000
@@ -118,9 +118,9 @@
     // Operator interface
 
     @Override
-    protected Cursor cursor(QueryContext context)
+    protected Cursor cursor(QueryContext context, QueryBindings bindings)
     {
-        return new Execution(context);
+        return new Execution(context, bindings);
     }
 
     @Override
@@ -409,11 +409,11 @@
 
         // Execution interface
 
-        Execution(QueryContext context)
+        Execution(QueryContext context, QueryBindings bindings)
         {
-            super(context);
-            leftInput = left.cursor(context);
-            rightInput = right.cursor(context);
+            super(context, bindings);
+            leftInput = left.cursor(context, bindings);
+            rightInput = right.cursor(context, bindings);
         }
 
         // For use by this class

=== modified file 'src/main/java/com/akiban/qp/operator/Limit_Default.java'
--- src/main/java/com/akiban/qp/operator/Limit_Default.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/qp/operator/Limit_Default.java	2013-07-09 23:55:31 +0000
@@ -87,8 +87,8 @@
     // Operator interface
 
     @Override
-    protected Cursor cursor(QueryContext context) {
-        return new Execution(context, inputOperator.cursor(context));
+    protected Cursor cursor(QueryContext context, QueryBindings bindings) {
+        return new Execution(context, bindings, inputOperator.cursor(context, bindings));
     }
 
     // Plannable interface
@@ -199,12 +199,12 @@
                 closed = false;
                 if (isSkipBinding()) {
                     if (usePVals) {
-                        PValueSource value = context.getPValue(skip());
+                        PValueSource value = bindings.getPValue(skip());
                         if (!value.isNull())
                             this.skipLeft = value.getInt32();
                     }
                     else {
-                        ValueSource value = context.getValue(skip());
+                        ValueSource value = bindings.getValue(skip());
                         if (!value.isNull())
                             this.skipLeft = (int)Extractors.getLongExtractor(AkType.LONG).getLong(value);
                     }
@@ -216,7 +216,7 @@
                     throw new NegativeLimitException("OFFSET", skipLeft);
                 if (isLimitBinding()) {
                     if (usePVals) {
-                        PValueSource value = context.getPValue(limit());
+                        PValueSource value = bindings.getPValue(limit());
                         if (value.isNull())
                             this.limitLeft = Integer.MAX_VALUE;
                         else {
@@ -229,7 +229,7 @@
                         }
                     }
                     else {
-                        ValueSource value = context.getValue(limit());
+                        ValueSource value = bindings.getValue(limit());
                         if (value.isNull())
                             this.limitLeft = Integer.MAX_VALUE;
                         else
@@ -326,8 +326,8 @@
         }
 
         // Execution interface
-        Execution(QueryContext context, Cursor input) {
-            super(context, input);
+        Execution(QueryContext context, QueryBindings bindings, Cursor input) {
+            super(context, bindings, input);
         }
 
         // object state

=== modified file 'src/main/java/com/akiban/qp/operator/Map_NestedLoops.java'
--- src/main/java/com/akiban/qp/operator/Map_NestedLoops.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/qp/operator/Map_NestedLoops.java	2013-07-09 23:55:31 +0000
@@ -85,9 +85,9 @@
     // Operator interface
 
     @Override
-    protected Cursor cursor(QueryContext context)
+    protected Cursor cursor(QueryContext context, QueryBindings bindings)
     {
-        return new Execution(context);
+        return new Execution(context, bindings);
     }
 
     @Override
@@ -244,11 +244,11 @@
 
         // Execution interface
 
-        Execution(QueryContext context)
+        Execution(QueryContext context, QueryBindings bindings)
         {
-            super(context);
-            this.outerInput = outerInputOperator.cursor(context);
-            this.innerInput = innerInputOperator.cursor(context);
+            super(context, bindings);
+            this.outerInput = outerInputOperator.cursor(context, bindings);
+            this.innerInput = innerInputOperator.cursor(context, bindings);
         }
 
         // For use by this class
@@ -276,7 +276,7 @@
         private void startNewInnerLoop(Row row)
         {
             innerInput.close();
-            context.setRow(inputBindingPosition, row);
+            bindings.setRow(inputBindingPosition, row);
             innerInput.open();
         }
 

=== modified file 'src/main/java/com/akiban/qp/operator/Operator.java'
--- src/main/java/com/akiban/qp/operator/Operator.java	2013-05-24 21:45:54 +0000
+++ src/main/java/com/akiban/qp/operator/Operator.java	2013-07-09 23:55:31 +0000
@@ -69,7 +69,7 @@
         return Collections.emptyList();
     }
 
-    protected abstract Cursor cursor(QueryContext context);
+    protected abstract Cursor cursor(QueryContext context, QueryBindings bindings);
 
     @Override
     public String describePlan()

=== modified file 'src/main/java/com/akiban/qp/operator/OperatorExecutionBase.java'
--- src/main/java/com/akiban/qp/operator/OperatorExecutionBase.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/qp/operator/OperatorExecutionBase.java	2013-07-09 23:55:31 +0000
@@ -81,8 +81,8 @@
         }
     }
 
-    protected OperatorExecutionBase(QueryContext context)
+    protected OperatorExecutionBase(QueryContext context, QueryBindings bindings)
     {
-        super(context);
+        super(context, bindings);
     }
 }

=== modified file 'src/main/java/com/akiban/qp/operator/Product_NestedLoops.java'
--- src/main/java/com/akiban/qp/operator/Product_NestedLoops.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/qp/operator/Product_NestedLoops.java	2013-07-09 23:55:31 +0000
@@ -123,9 +123,9 @@
     // Operator interface
 
     @Override
-    protected Cursor cursor(QueryContext context)
+    protected Cursor cursor(QueryContext context, QueryBindings bindings)
     {
-        return new Execution(context);
+        return new Execution(context, bindings);
     }
 
     @Override
@@ -303,11 +303,11 @@
 
         // Execution interface
 
-        Execution(QueryContext context)
+        Execution(QueryContext context, QueryBindings bindings)
         {
-            super(context);
-            this.outerInput = outerInputOperator.cursor(context);
-            this.innerRows = new InnerRows(innerInputOperator.cursor(context));
+            super(context, bindings);
+            this.outerInput = outerInputOperator.cursor(context, bindings);
+            this.innerRows = new InnerRows(innerInputOperator.cursor(context, bindings));
         }
 
         // For use by this class
@@ -368,7 +368,7 @@
             public void newBranchRow(Row branchRow)
             {
                 close();
-                context.setRow(inputBindingPosition, branchRow);
+                bindings.setRow(inputBindingPosition, branchRow);
                 innerInput.open();
                 rows.clear();
                 Row row;

=== modified file 'src/main/java/com/akiban/qp/operator/Project_Default.java'
--- src/main/java/com/akiban/qp/operator/Project_Default.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/qp/operator/Project_Default.java	2013-07-09 23:55:31 +0000
@@ -88,9 +88,9 @@
     // Operator interface
 
     @Override
-    protected Cursor cursor(QueryContext context)
+    protected Cursor cursor(QueryContext context, QueryBindings bindings)
     {
-        return new Execution(context, inputOperator.cursor(context));
+        return new Execution(context, bindings, inputOperator.cursor(context, bindings));
     }
 
     @Override
@@ -238,7 +238,7 @@
                 if ((inputRow = input.next()) != null) {
                     projectedRow =
                         inputRow.rowType() == rowType
-                        ? new ProjectedRow(projectType, inputRow, context, projections, pEvalExpr, tInstances)
+                        ? new ProjectedRow(projectType, inputRow, context, bindings, projections, pEvalExpr, tInstances)
                         : inputRow;
                 }
                 if (projectedRow == null) {
@@ -296,9 +296,9 @@
 
         // Execution interface
 
-        Execution(QueryContext context, Cursor input)
+        Execution(QueryContext context, QueryBindings bindings, Cursor input)
         {
-            super(context);
+            super(context, bindings);
             this.input = input;
             // one list of evaluatables per execution    
             if (pExpressions != null)

=== added file 'src/main/java/com/akiban/qp/operator/QueryBindings.java'
--- src/main/java/com/akiban/qp/operator/QueryBindings.java	1970-01-01 00:00:00 +0000
+++ src/main/java/com/akiban/qp/operator/QueryBindings.java	2013-07-09 23:55:31 +0000
@@ -0,0 +1,110 @@
+/**
+ * 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.qp.operator;
+
+import com.akiban.qp.row.HKey;
+import com.akiban.qp.row.Row;
+import com.akiban.server.types.AkType;
+import com.akiban.server.types.ValueSource;
+import com.akiban.server.types3.pvalue.PValueSource;
+import com.akiban.util.BloomFilter;
+
+/** The bindings associated with the execution of a query.
+ * This includes query parameters (? markers) as well as current values for iteration.
+ * More than one QueryBindings may be active at the same time if
+ * iteration is being done in parallel for pipelining.
+ */
+public interface QueryBindings
+{
+    public PValueSource getPValue(int index);
+
+    public void setPValue(int index, PValueSource value);
+
+    /**
+     * Gets the value bound to the given index.
+     * @param index the index to look up
+     * @return the value at that index
+     * @throws BindingNotSetException if the given index wasn't set
+     */
+    public ValueSource getValue(int index);
+
+    /**
+     * Bind a value to the given index.
+     * @param index the index to set
+     * @param value the value to assign
+     */
+    public void setValue(int index, ValueSource value);
+
+    /**
+     * Bind a value to the given index.
+     * @param index the index to set
+     * @param value the value to assign
+     * @param type the type to convert the value to for binding
+     */
+    public void setValue(int index, ValueSource value, AkType type);
+
+    /**
+     * Gets the row bound to the given index.
+     * @param index the index to look up
+     * @return the row at that index
+     * @throws BindingNotSetException if the given index wasn't set
+     */
+    public Row getRow(int index);
+
+    /**
+     * Bind a row to the given index.
+     * @param index the index to set
+     * @param row the row to assign
+     */
+    public void setRow(int index, Row row);
+
+    /**
+     * Gets the hKey bound to the given index.
+     * @param index the index to look up
+     * @return the hKey at that index
+     * @throws BindingNotSetException if the given index wasn't set
+     */
+    public HKey getHKey(int index);
+
+    /**
+     * Bind an hkey to the given index.
+     * @param index the index to set
+     * @param hKey the hKey to assign
+     */
+    public void setHKey(int index, HKey hKey);
+
+    /**
+     * Gets the bloom filter bound to the given index.
+     * @param index the index to look up
+     * @return the bloom filter at that index
+     * @throws BindingNotSetException if the given index wasn't set
+     */
+    public BloomFilter getBloomFilter(int index);
+
+    /**
+     * Bind a bloom filter to the given index.
+     * @param index the index to set
+     * @param filter the bloom filter to assign
+     */
+    public void setBloomFilter(int index, BloomFilter filter);
+
+    /**
+     * Clear all bindings.
+     */
+    public void clear();
+}

=== modified file 'src/main/java/com/akiban/qp/operator/QueryContext.java'
--- src/main/java/com/akiban/qp/operator/QueryContext.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/qp/operator/QueryContext.java	2013-07-09 23:55:31 +0000
@@ -19,98 +19,21 @@
 
 import com.akiban.ais.model.TableName;
 import com.akiban.ais.model.UserTable;
-import com.akiban.qp.row.HKey;
 import com.akiban.qp.row.Row;
 import com.akiban.server.service.ServiceManager;
 import com.akiban.server.service.session.Session;
 import com.akiban.server.error.ErrorCode;
 import com.akiban.server.error.InvalidOperationException;
-import com.akiban.server.types.AkType;
-import com.akiban.server.types.ValueSource;
-import com.akiban.server.types3.pvalue.PValueSource;
-import com.akiban.util.BloomFilter;
 
 import java.util.Date;
 
-public interface QueryContext 
+/** The context for the execution of a query.
+ * Associated the query with the running environment.
+ * The context is global for the whole query; it does not change for
+ * different iteration values at different places in the query.
+ */
+public interface QueryContext
 {
-    public PValueSource getPValue(int index);
-
-    public void setPValue(int index, PValueSource value);
-
-    /**
-     * Gets the value bound to the given index.
-     * @param index the index to look up
-     * @return the value at that index
-     * @throws BindingNotSetException if the given index wasn't set
-     */
-    public ValueSource getValue(int index);
-
-    /**
-     * Bind a value to the given index.
-     * @param index the index to set
-     * @param value the value to assign
-     */
-    public void setValue(int index, ValueSource value);
-
-    /**
-     * Bind a value to the given index.
-     * @param index the index to set
-     * @param value the value to assign
-     * @param type the type to convert the value to for binding
-     */
-    public void setValue(int index, ValueSource value, AkType type);
-
-    /**
-     * Gets the row bound to the given index.
-     * @param index the index to look up
-     * @return the row at that index
-     * @throws BindingNotSetException if the given index wasn't set
-     */
-    public Row getRow(int index);
-
-    /**
-     * Bind a row to the given index.
-     * @param index the index to set
-     * @param row the row to assign
-     */
-    public void setRow(int index, Row row);
-
-    /**
-     * Gets the hKey bound to the given index.
-     * @param index the index to look up
-     * @return the hKey at that index
-     * @throws BindingNotSetException if the given index wasn't set
-     */
-    public HKey getHKey(int index);
-
-    /**
-     * Bind an hkey to the given index.
-     * @param index the index to set
-     * @param hKey the hKey to assign
-     */
-    public void setHKey(int index, HKey hKey);
-
-    /**
-     * Gets the bloom filter bound to the given index.
-     * @param index the index to look up
-     * @return the bloom filter at that index
-     * @throws BindingNotSetException if the given index wasn't set
-     */
-    public BloomFilter getBloomFilter(int index);
-
-    /**
-     * Bind a bloom filter to the given index.
-     * @param index the index to set
-     * @param filter the bloom filter to assign
-     */
-    public void setBloomFilter(int index, BloomFilter filter);
-
-    /**
-     * Clear all bindings.
-     */
-    public void clear();
-
     /**
      * Get the store associated with this query.
      */
@@ -203,4 +126,9 @@
      * @throws NoSuchSequenceException if the name does not exist in the system.  
      */
     public long sequenceCurrentValue(TableName sequence); 
+
+    /**
+     * Create a new empty set of bindings.
+     */
+    public QueryBindings createBindings();
 }

=== modified file 'src/main/java/com/akiban/qp/operator/QueryContextBase.java'
--- src/main/java/com/akiban/qp/operator/QueryContextBase.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/qp/operator/QueryContextBase.java	2013-07-09 23:55:31 +0000
@@ -17,176 +17,20 @@
 
 package com.akiban.qp.operator;
 
-import com.akiban.qp.row.HKey;
 import com.akiban.qp.row.Row;
 import com.akiban.server.error.*;
-import com.akiban.server.types.AkType;
-import com.akiban.server.types.ValueSource;
-import com.akiban.server.types.conversion.Converters;
-import com.akiban.server.types.util.ValueHolder;
-import com.akiban.server.types3.pvalue.PValue;
-import com.akiban.server.types3.pvalue.PValueSource;
-import com.akiban.server.types3.pvalue.PValueTargets;
-import com.akiban.util.BloomFilter;
-import com.akiban.util.SparseArray;
 
-import java.math.BigDecimal;
-import java.math.BigInteger;
 import java.util.Date;
 
 public abstract class QueryContextBase implements QueryContext
 {
-    private SparseArray<Object> bindings = new SparseArray<>();
     // startTimeMsec is used to control query timeouts.
     private final long startTimeMsec = System.currentTimeMillis();
     private long queryTimeoutMsec = Long.MAX_VALUE;
 
-    @Override
-    public String toString() {
-        return getClass().getSimpleName() + "[" + bindings.describeElements() + "]";
-    }
-
     /* QueryContext interface */
 
     @Override
-    public PValueSource getPValue(int index) {
-        if (!bindings.isDefined(index))
-            throw new BindingNotSetException(index);
-        return (PValueSource)bindings.get(index);
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see com.akiban.qp.operator.QueryContext#setPValue(int, com.akiban.server.types3.pvalue.PValueSource)
-     * This makes a copy of the PValueSource value, rather than simply
-     * storing the reference. The assumption is the PValueSource parameter
-     * will be reused by the caller as rows are processed, so the QueryContext
-     * needs to keep a copy of the underlying value.
-     *
-     */
-    @Override
-    public void setPValue(int index, PValueSource value) {
-        PValue holder = null;
-        if (bindings.isDefined(index)) {
-            holder = (PValue)bindings.get(index);
-            if (holder.tInstance() != value.tInstance())
-                holder = null;
-        }
-        if (holder == null) {
-            holder = new PValue(value.tInstance());
-            bindings.set(index, holder);
-        }
-        PValueTargets.copyFrom(value, holder);
-    }
-    
-    @Override
-    public ValueSource getValue(int index) {
-        if (!bindings.isDefined(index))
-            throw new BindingNotSetException(index);
-        return (ValueSource)bindings.get(index);
-    }
-
-    @Override
-    public void setValue(int index, ValueSource value, AkType type)
-    {
-        ValueHolder holder;
-        if (bindings.isDefined(index))
-            holder = (ValueHolder)bindings.get(index);
-        else {
-            holder = new ValueHolder();
-            bindings.set(index, holder);
-        }
-        
-        holder.expectType(type);
-        try
-        {
-            Converters.convert(value, holder);
-        }
-        catch (InvalidDateFormatException e)
-        {
-            errorCase(e, holder);
-        }
-        catch (InconvertibleTypesException e)
-        {
-            errorCase(e, holder);
-        }
-        catch (InvalidCharToNumException e)
-        {
-            errorCase(e, holder);
-        }
-    }
-    
-    private void errorCase (InvalidOperationException e, ValueHolder holder)
-    {
-        warnClient(e);
-        switch(holder.getConversionType())
-        {
-            case DECIMAL:   holder.putDecimal(BigDecimal.ZERO); break;
-            case U_BIGINT:  holder.putUBigInt(BigInteger.ZERO); break;
-            case LONG:
-            case U_INT:
-            case INT:        holder.putRaw(holder.getConversionType(), 0L); break;
-            case U_DOUBLE:   
-            case DOUBLE:     holder.putRaw(holder.getConversionType(), 0.0d);
-            case U_FLOAT:
-            case FLOAT:      holder.putRaw(holder.getConversionType(), 0.0f); break;
-            case TIME:       holder.putTime(0L);
-            default:         holder.putNull();
-
-        }
-    }
-
-    @Override
-    public void setValue(int index, ValueSource value)
-    {
-        setValue(index, value, value.getConversionType());
-    }
-
-    @Override
-    public Row getRow(int index) {
-        if (!bindings.isDefined(index))
-            throw new BindingNotSetException(index);
-        return (Row)bindings.get(index);
-    }
-
-    @Override
-    public void setRow(int index, Row row)
-    {
-        // TODO: Should this use a RowHolder or will that make things worse?
-        bindings.set(index, row);
-    }
-
-    @Override
-    public HKey getHKey(int index) {
-        if (!bindings.isDefined(index))
-            throw new BindingNotSetException(index);
-        return (HKey)bindings.get(index);
-    }
-
-    @Override
-    public void setHKey(int index, HKey hKey)
-    {
-        bindings.set(index, hKey);
-    }
-
-    @Override
-    public BloomFilter getBloomFilter(int index) {
-        if (!bindings.isDefined(index))
-            throw new BindingNotSetException(index);
-        return (BloomFilter)bindings.get(index);
-    }
-
-    @Override
-    public void setBloomFilter(int index, BloomFilter filter) {
-        bindings.set(index, filter);
-    }
-
-    @Override
-    public void clear() {
-        bindings.clear();
-    }
-
-    @Override
     public Date getCurrentDate() {
         return new Date();
     }
@@ -232,4 +76,9 @@
     public void checkConstraints(Row row, boolean usePValues) throws InvalidOperationException {
         row.rowType().constraintChecker().checkConstraints(row, usePValues);
     }
+
+    @Override
+    public QueryBindings createBindings() {
+        return new SparseArrayQueryBindings();
+    }
 }

=== modified file 'src/main/java/com/akiban/qp/operator/Select_BloomFilter.java'
--- src/main/java/com/akiban/qp/operator/Select_BloomFilter.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/qp/operator/Select_BloomFilter.java	2013-07-09 23:55:31 +0000
@@ -101,12 +101,12 @@
     }
 
     @Override
-    protected Cursor cursor(QueryContext context)
+    protected Cursor cursor(QueryContext context, QueryBindings bindings)
     {
         if (tFields == null)
-            return new Execution<>(context, fields, oldExpressionsAdapater);
+            return new Execution<>(context, bindings, fields, oldExpressionsAdapater);
         else
-            return new Execution<>(context, tFields, newExpressionsAdapter);
+            return new Execution<>(context, bindings, tFields, newExpressionsAdapter);
     }
 
     @Override
@@ -243,8 +243,8 @@
             TAP_OPEN.in();
             try {
                 CursorLifecycle.checkIdle(this);
-                filter = context.getBloomFilter(bindingPosition);
-                context.setBloomFilter(bindingPosition, null);
+                filter = bindings.getBloomFilter(bindingPosition);
+                bindings.setBloomFilter(bindingPosition, null);
                 inputCursor.open();
                 idle = false;
             } finally {
@@ -324,12 +324,12 @@
 
         // Execution interface
 
-        <EXPR> Execution(QueryContext context,
+        <EXPR> Execution(QueryContext context, QueryBindings bindings,
                               List<? extends EXPR> expressions, ExpressionAdapter<EXPR,E> adapter)
         {
-            super(context);
-            this.inputCursor = input.cursor(context);
-            this.onPositiveCursor = onPositive.cursor(context);
+            super(context, bindings);
+            this.inputCursor = input.cursor(context, bindings);
+            this.onPositiveCursor = onPositive.cursor(context, bindings);
             this.adapter = adapter;
             for (EXPR field : expressions) {
                 E eval = adapter.evaluate(field, context);
@@ -359,13 +359,13 @@
             // occurs during next().
             TAP_CHECK.in();
             try {
-                context.setRow(bindingPosition, row);
+                bindings.setRow(bindingPosition, row);
                 onPositiveCursor.open();
                 try {
                     return onPositiveCursor.next() != null;
                 } finally {
                     onPositiveCursor.close();
-                    context.setRow(bindingPosition, null);
+                    bindings.setRow(bindingPosition, null);
                 }
             } finally {
                 TAP_CHECK.out();

=== modified file 'src/main/java/com/akiban/qp/operator/Select_HKeyOrdered.java'
--- src/main/java/com/akiban/qp/operator/Select_HKeyOrdered.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/qp/operator/Select_HKeyOrdered.java	2013-07-09 23:55:31 +0000
@@ -102,9 +102,9 @@
     }
 
     @Override
-    protected Cursor cursor(QueryContext context)
+    protected Cursor cursor(QueryContext context, QueryBindings bindings)
     {
-        return new Execution(context, inputOperator.cursor(context));
+        return new Execution(context, bindings, inputOperator.cursor(context, bindings));
     }
 
     @Override
@@ -188,10 +188,14 @@
             try {
                 CursorLifecycle.checkIdle(this);
                 input.open();
-                if (evaluation == null)
+                if (evaluation == null) {
                     pEvaluation.with(context);
-                else
+                    pEvaluation.with(bindings);
+                }
+                else {
                     evaluation.of(context);
+                    evaluation.of(bindings);
+                }
                 idle = false;
             } finally {
                 TAP_OPEN.out();
@@ -302,9 +306,9 @@
 
         // Execution interface
 
-        Execution(QueryContext context, Cursor input)
+        Execution(QueryContext context, QueryBindings bindings, Cursor input)
         {
-            super(context);
+            super(context, bindings);
             this.input = input;
             if (predicate == null) {
                 this.evaluation = null;

=== modified file 'src/main/java/com/akiban/qp/operator/Sort_General.java'
--- src/main/java/com/akiban/qp/operator/Sort_General.java	2013-06-06 19:56:32 +0000
+++ src/main/java/com/akiban/qp/operator/Sort_General.java	2013-07-09 23:55:31 +0000
@@ -92,9 +92,9 @@
     }
 
     @Override
-    protected Cursor cursor(QueryContext context)
+    protected Cursor cursor(QueryContext context, QueryBindings bindings)
     {
-        return new Execution(context, inputOperator.cursor(context));
+        return new Execution(context, bindings, inputOperator.cursor(context, bindings));
     }
 
     @Override
@@ -164,7 +164,7 @@
             try {
                 CursorLifecycle.checkIdle(this);
                 input.open();
-                output = new SorterToCursorAdapter(adapter(), context, input, sortType, ordering, sortOption, TAP_LOAD);
+                output = new SorterToCursorAdapter(adapter(), context, bindings, input, sortType, ordering, sortOption, TAP_LOAD);
                 output.open();
             } finally {
                 TAP_OPEN.out();
@@ -243,9 +243,9 @@
 
         // Execution interface
 
-        Execution(QueryContext context, Cursor input)
+        Execution(QueryContext context, QueryBindings bindings, Cursor input)
         {
-            super(context);
+            super(context, bindings);
             this.input = input;
         }
 

=== modified file 'src/main/java/com/akiban/qp/operator/Sort_InsertionLimited.java'
--- src/main/java/com/akiban/qp/operator/Sort_InsertionLimited.java	2013-04-30 23:01:23 +0000
+++ src/main/java/com/akiban/qp/operator/Sort_InsertionLimited.java	2013-07-09 23:55:31 +0000
@@ -104,9 +104,9 @@
     }
 
     @Override
-    protected Cursor cursor(QueryContext context)
+    protected Cursor cursor(QueryContext context, QueryBindings bindings)
     {
-        return new Execution(context, inputOperator.cursor(context));
+        return new Execution(context, bindings, inputOperator.cursor(context, bindings));
     }
 
     @Override
@@ -185,8 +185,10 @@
                 CursorLifecycle.checkIdle(this);
                 input.open();
                 state = State.FILLING;
-                for (TEvaluatableExpression eval : tEvaluations)
+                for (TEvaluatableExpression eval : tEvaluations) {
                     eval.with(context);
+                    eval.with(bindings);
+                }
                 sorted = new TreeSet<>();
             } finally {
                 TAP_OPEN.out();
@@ -333,9 +335,9 @@
 
         // Execution interface
 
-        Execution(QueryContext context, Cursor input)
+        Execution(QueryContext context, QueryBindings bindings, Cursor input)
         {
-            super(context);
+            super(context, bindings);
             this.input = input;
             int nsort = ordering.sortColumns();
             tEvaluations = new ArrayList<>(nsort);

=== modified file 'src/main/java/com/akiban/qp/operator/SorterToCursorAdapter.java'
--- src/main/java/com/akiban/qp/operator/SorterToCursorAdapter.java	2013-06-06 14:38:02 +0000
+++ src/main/java/com/akiban/qp/operator/SorterToCursorAdapter.java	2013-07-09 23:55:31 +0000
@@ -35,7 +35,7 @@
     public void open()
     {
         CursorLifecycle.checkIdle(this);
-        sorter = adapter.createSorter(context, input, rowType, ordering, sortOption, loadTap);
+        sorter = adapter.createSorter(context, bindings, input, rowType, ordering, sortOption, loadTap);
         cursor = sorter.sort();
         cursor.open();
     }
@@ -98,6 +98,7 @@
 
     public SorterToCursorAdapter(StoreAdapter adapter,
                                  QueryContext context,
+                                 QueryBindings bindings,
                                  Cursor input,
                                  RowType rowType,
                                  API.Ordering ordering,
@@ -106,6 +107,7 @@
     {
         this.adapter = adapter;
         this.context = context;
+        this.bindings = bindings;
         this.input = input;
         this.rowType = rowType;
         this.ordering = ordering;
@@ -115,6 +117,7 @@
 
     private final StoreAdapter adapter;
     private final QueryContext context;
+    private final QueryBindings bindings;
     private final Cursor input;
     private final RowType rowType;
     private final API.Ordering ordering;

=== added file 'src/main/java/com/akiban/qp/operator/SparseArrayQueryBindings.java'
--- src/main/java/com/akiban/qp/operator/SparseArrayQueryBindings.java	1970-01-01 00:00:00 +0000
+++ src/main/java/com/akiban/qp/operator/SparseArrayQueryBindings.java	2013-07-09 23:55:31 +0000
@@ -0,0 +1,184 @@
+/**
+ * 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.qp.operator;
+
+import com.akiban.qp.row.HKey;
+import com.akiban.qp.row.Row;
+import com.akiban.server.error.*;
+import com.akiban.server.types.AkType;
+import com.akiban.server.types.ValueSource;
+import com.akiban.server.types.conversion.Converters;
+import com.akiban.server.types.util.ValueHolder;
+import com.akiban.server.types3.pvalue.PValue;
+import com.akiban.server.types3.pvalue.PValueSource;
+import com.akiban.server.types3.pvalue.PValueTargets;
+import com.akiban.util.BloomFilter;
+import com.akiban.util.SparseArray;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+
+public class SparseArrayQueryBindings implements QueryBindings
+{
+    private SparseArray<Object> bindings = new SparseArray<>();
+
+    @Override
+    public String toString() {
+        return getClass().getSimpleName() + "[" + bindings.describeElements() + "]";
+    }
+
+    /* QueryBindings interface */
+
+    @Override
+    public PValueSource getPValue(int index) {
+        if (!bindings.isDefined(index))
+            throw new BindingNotSetException(index);
+        return (PValueSource)bindings.get(index);
+    }
+
+    /*
+     * (non-Javadoc)
+     * @see com.akiban.qp.operator.QueryContext#setPValue(int, com.akiban.server.types3.pvalue.PValueSource)
+     * This makes a copy of the PValueSource value, rather than simply
+     * storing the reference. The assumption is the PValueSource parameter
+     * will be reused by the caller as rows are processed, so the QueryContext
+     * needs to keep a copy of the underlying value.
+     *
+     */
+    @Override
+    public void setPValue(int index, PValueSource value) {
+        PValue holder = null;
+        if (bindings.isDefined(index)) {
+            holder = (PValue)bindings.get(index);
+            if (holder.tInstance() != value.tInstance())
+                holder = null;
+        }
+        if (holder == null) {
+            holder = new PValue(value.tInstance());
+            bindings.set(index, holder);
+        }
+        PValueTargets.copyFrom(value, holder);
+    }
+    
+    @Override
+    public ValueSource getValue(int index) {
+        if (!bindings.isDefined(index))
+            throw new BindingNotSetException(index);
+        return (ValueSource)bindings.get(index);
+    }
+
+    @Override
+    public void setValue(int index, ValueSource value, AkType type)
+    {
+        ValueHolder holder;
+        if (bindings.isDefined(index))
+            holder = (ValueHolder)bindings.get(index);
+        else {
+            holder = new ValueHolder();
+            bindings.set(index, holder);
+        }
+        
+        holder.expectType(type);
+        try
+        {
+            Converters.convert(value, holder);
+        }
+        catch (InvalidDateFormatException e)
+        {
+            errorCase(e, holder);
+        }
+        catch (InconvertibleTypesException e)
+        {
+            errorCase(e, holder);
+        }
+        catch (InvalidCharToNumException e)
+        {
+            errorCase(e, holder);
+        }
+    }
+    
+    private void errorCase (InvalidOperationException e, ValueHolder holder)
+    {
+        //warnClient(e);
+        switch(holder.getConversionType())
+        {
+            case DECIMAL:   holder.putDecimal(BigDecimal.ZERO); break;
+            case U_BIGINT:  holder.putUBigInt(BigInteger.ZERO); break;
+            case LONG:
+            case U_INT:
+            case INT:        holder.putRaw(holder.getConversionType(), 0L); break;
+            case U_DOUBLE:   
+            case DOUBLE:     holder.putRaw(holder.getConversionType(), 0.0d);
+            case U_FLOAT:
+            case FLOAT:      holder.putRaw(holder.getConversionType(), 0.0f); break;
+            case TIME:       holder.putTime(0L);
+            default:         holder.putNull();
+
+        }
+    }
+
+    @Override
+    public void setValue(int index, ValueSource value)
+    {
+        setValue(index, value, value.getConversionType());
+    }
+
+    @Override
+    public Row getRow(int index) {
+        if (!bindings.isDefined(index))
+            throw new BindingNotSetException(index);
+        return (Row)bindings.get(index);
+    }
+
+    @Override
+    public void setRow(int index, Row row)
+    {
+        // TODO: Should this use a RowHolder or will that make things worse?
+        bindings.set(index, row);
+    }
+
+    @Override
+    public HKey getHKey(int index) {
+        if (!bindings.isDefined(index))
+            throw new BindingNotSetException(index);
+        return (HKey)bindings.get(index);
+    }
+
+    @Override
+    public void setHKey(int index, HKey hKey)
+    {
+        bindings.set(index, hKey);
+    }
+
+    @Override
+    public BloomFilter getBloomFilter(int index) {
+        if (!bindings.isDefined(index))
+            throw new BindingNotSetException(index);
+        return (BloomFilter)bindings.get(index);
+    }
+
+    @Override
+    public void setBloomFilter(int index, BloomFilter filter) {
+        bindings.set(index, filter);
+    }
+
+    @Override
+    public void clear() {
+        bindings.clear();
+    }
+}

=== modified file 'src/main/java/com/akiban/qp/operator/StoreAdapter.java'
--- src/main/java/com/akiban/qp/operator/StoreAdapter.java	2013-07-07 19:23:59 +0000
+++ src/main/java/com/akiban/qp/operator/StoreAdapter.java	2013-07-09 23:55:31 +0000
@@ -53,6 +53,7 @@
     public abstract GroupCursor newGroupCursor(Group group);
 
     public abstract Cursor newIndexCursor(QueryContext context,
+                                          QueryBindings bindings,
                                           Index index,
                                           IndexKeyRange keyRange,
                                           API.Ordering ordering,
@@ -73,6 +74,7 @@
     public abstract void deleteRow (Row oldRow, boolean usePValues, boolean cascadeDelete);
 
     public abstract Sorter createSorter(QueryContext context,
+                                        QueryBindings bindings,
                                         Cursor input,
                                         RowType rowType,
                                         API.Ordering ordering,

=== modified file 'src/main/java/com/akiban/qp/operator/UnionAll_Default.java'
--- src/main/java/com/akiban/qp/operator/UnionAll_Default.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/qp/operator/UnionAll_Default.java	2013-07-09 23:55:31 +0000
@@ -101,8 +101,8 @@
     }
 
     @Override
-    protected Cursor cursor(QueryContext context) {
-        return new Execution(context);
+    protected Cursor cursor(QueryContext context, QueryBindings bindings) {
+        return new Execution(context, bindings);
     }
 
     UnionAll_Default(Operator input1, RowType input1Type, Operator input2, RowType input2Type, boolean usePValues) {
@@ -299,9 +299,9 @@
             return destroyed;
         }
 
-        private Execution(QueryContext context)
+        private Execution(QueryContext context, QueryBindings bindings)
         {
-            super(context);
+            super(context, bindings);
             cursors = new Cursor[inputs.size()];
         }
 
@@ -353,7 +353,7 @@
         private Cursor cursor(int i)
         {
             if (cursors[i] == null) {
-                cursors[i] = inputs.get(i).cursor(context);
+                cursors[i] = inputs.get(i).cursor(context, bindings);
             }
             return cursors[i];
         }

=== modified file 'src/main/java/com/akiban/qp/operator/Union_Ordered.java'
--- src/main/java/com/akiban/qp/operator/Union_Ordered.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/qp/operator/Union_Ordered.java	2013-07-09 23:55:31 +0000
@@ -95,9 +95,9 @@
     // Operator interface
 
     @Override
-    protected Cursor cursor(QueryContext context)
+    protected Cursor cursor(QueryContext context, QueryBindings bindings)
     {
-        return new Execution(context);
+        return new Execution(context, bindings);
     }
 
     @Override
@@ -311,11 +311,11 @@
 
         // Execution interface
 
-        Execution(QueryContext context)
+        Execution(QueryContext context, QueryBindings bindings)
         {
-            super(context);
-            leftInput = left.cursor(context);
-            rightInput = right.cursor(context);
+            super(context, bindings);
+            leftInput = left.cursor(context, bindings);
+            rightInput = right.cursor(context, bindings);
         }
         
         // For use by this class

=== modified file 'src/main/java/com/akiban/qp/operator/UpdateFunction.java'
--- src/main/java/com/akiban/qp/operator/UpdateFunction.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/qp/operator/UpdateFunction.java	2013-07-09 23:55:31 +0000
@@ -24,10 +24,11 @@
      * Updates the given row by returning another row with the required modifications.
      * @param original the original row, which will remain untouched
      * @param context the query context for evaluation
+     * @param bindings the variable bindings for evaluation
      * @return a row of the same type as the original, but different fields
      * @throws IllegalArgumentException if the row could not be updated
      * (ie, if {@linkplain #rowIsSelected(Row)} returned {@code false})
      */
-    Row evaluate(Row original, QueryContext context);
+    Row evaluate(Row original, QueryContext context, QueryBindings bindings);
     boolean usePValues();
 }

=== modified file 'src/main/java/com/akiban/qp/operator/Update_Default.java'
--- src/main/java/com/akiban/qp/operator/Update_Default.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/qp/operator/Update_Default.java	2013-07-09 23:55:31 +0000
@@ -109,8 +109,8 @@
     // UpdatePlannable interface
 
     @Override
-    public UpdateResult run(QueryContext context) {
-        return new Execution(context, inputOperator.cursor(context)).run();
+    public UpdateResult run(QueryContext context, QueryBindings bindings) {
+        return new Execution(context, bindings, inputOperator.cursor(context, bindings)).run();
     }
 
     // Plannable interface
@@ -173,7 +173,7 @@
                     checkQueryCancelation();
                     ++seen;
                     if (updateFunction.rowIsSelected(oldRow)) {
-                        Row newRow = updateFunction.evaluate(oldRow, context);
+                        Row newRow = updateFunction.evaluate(oldRow, context, bindings);
                         context.checkConstraints(newRow, usePValues);
                         adapter().updateRow(oldRow, newRow, usePValues);
                         if (LOG_EXECUTION && LOG.isDebugEnabled()) {
@@ -193,9 +193,9 @@
             return new StandardUpdateResult(seen, modified);
         }
 
-        public Execution(QueryContext queryContext, Cursor input)
+        public Execution(QueryContext queryContext, QueryBindings bindings, Cursor input)
         {
-            super(queryContext);
+            super(queryContext, bindings);
             this.input = input;
         }
 

=== modified file 'src/main/java/com/akiban/qp/operator/Update_Returning.java'
--- src/main/java/com/akiban/qp/operator/Update_Returning.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/qp/operator/Update_Returning.java	2013-07-09 23:55:31 +0000
@@ -94,8 +94,8 @@
     }
 
     @Override
-    protected Cursor cursor(QueryContext context) {
-        return new Execution(context, inputOperator.cursor(context));
+    protected Cursor cursor(QueryContext context, QueryBindings bindings) {
+        return new Execution(context, bindings, inputOperator.cursor(context, bindings));
     }
     
     public Update_Returning (Operator inputOperator, UpdateFunction updateFunction, boolean usePvals) {
@@ -153,7 +153,7 @@
                 Row inputRow;
                 Row newRow = null;
                 if ((inputRow = input.next()) != null) {
-                    newRow = updateFunction.evaluate(inputRow, context);
+                    newRow = updateFunction.evaluate(inputRow, context, bindings);
                     context.checkConstraints(newRow, usePValues);
                     adapter().updateRow(inputRow, newRow, usePValues);
                 }
@@ -208,9 +208,9 @@
     
         // Execution interface
     
-        Execution(QueryContext context, Cursor input)
+        Execution(QueryContext context, QueryBindings bindings, Cursor input)
         {
-            super(context);
+            super(context, bindings);
             this.input = input;
         }
     

=== modified file 'src/main/java/com/akiban/qp/operator/Using_BloomFilter.java'
--- src/main/java/com/akiban/qp/operator/Using_BloomFilter.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/qp/operator/Using_BloomFilter.java	2013-07-09 23:55:31 +0000
@@ -95,9 +95,9 @@
     }
 
     @Override
-    protected Cursor cursor(QueryContext context)
+    protected Cursor cursor(QueryContext context, QueryBindings bindings)
     {
-        return new Execution(context, streamInput.cursor(context));
+        return new Execution(context, bindings, streamInput.cursor(context, bindings));
     }
 
     @Override
@@ -184,7 +184,7 @@
             TAP_OPEN.in();
             try {
                 BloomFilter filter = loadBloomFilter();
-                context.setBloomFilter(filterBindingPosition, filter);
+                bindings.setBloomFilter(filterBindingPosition, filter);
                 input.open();
             } finally {
                 TAP_OPEN.out();
@@ -221,7 +221,7 @@
         {
             close();
             input.destroy();
-            context.setBloomFilter(filterBindingPosition, null);
+            bindings.setBloomFilter(filterBindingPosition, null);
         }
 
         @Override
@@ -244,9 +244,9 @@
 
         // Execution interface
 
-        Execution(QueryContext context, Cursor input)
+        Execution(QueryContext context, QueryBindings bindings, Cursor input)
         {
-            super(context);
+            super(context, bindings);
             this.input = input;
         }
 
@@ -268,7 +268,7 @@
         {
             int fields = filterRowType.nFields();
             int rows = 0;
-            Cursor loadCursor = filterInput.cursor(context);
+            Cursor loadCursor = filterInput.cursor(context, bindings);
             loadCursor.open();
             Row row;
             while ((row = loadCursor.next()) != null) {

=== modified file 'src/main/java/com/akiban/qp/operator/ValuesScan_Default.java'
--- src/main/java/com/akiban/qp/operator/ValuesScan_Default.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/qp/operator/ValuesScan_Default.java	2013-07-09 23:55:31 +0000
@@ -77,8 +77,8 @@
     }
 
     @Override
-    protected Cursor cursor(QueryContext context) {
-        return new Execution(context, rows);
+    protected Cursor cursor(QueryContext context, QueryBindings bindings) {
+        return new Execution(context, bindings, rows);
     }
     
     @Override
@@ -123,8 +123,8 @@
         private Iterator<? extends BindableRow> iter;
         private boolean destroyed = false;
 
-        public Execution (QueryContext context, Collection<? extends BindableRow> rows) {
-            super(context);
+        public Execution (QueryContext context, QueryBindings bindings, Collection<? extends BindableRow> rows) {
+            super(context, bindings);
             this.rows = rows;
         }
 
@@ -145,7 +145,7 @@
                 }
                 Row output;
                 if (iter != null && iter.hasNext()) {
-                    output = iter.next().bind(context);
+                    output = iter.next().bind(context, bindings);
                 } else {
                     close();
                     output = null;

=== modified file 'src/main/java/com/akiban/qp/persistitadapter/OperatorBasedRowCollector.java'
--- src/main/java/com/akiban/qp/persistitadapter/OperatorBasedRowCollector.java	2013-05-20 14:18:40 +0000
+++ src/main/java/com/akiban/qp/persistitadapter/OperatorBasedRowCollector.java	2013-07-09 23:55:31 +0000
@@ -22,6 +22,8 @@
 import com.akiban.qp.operator.Cursor;
 import com.akiban.qp.operator.Limit;
 import com.akiban.qp.operator.Operator;
+import com.akiban.qp.operator.QueryBindings;
+import com.akiban.qp.operator.QueryContext;
 import com.akiban.qp.operator.SimpleQueryContext;
 import com.akiban.qp.operator.StoreAdapter;
 import com.akiban.qp.row.AbstractRow;
@@ -65,7 +67,9 @@
         if (cursor != null) {
             throw new IllegalStateException("cursor is already open");
         }
-        cursor = cursor(operator, new SimpleQueryContext(adapter));
+        QueryContext context = new SimpleQueryContext(adapter);
+        QueryBindings bindings = context.createBindings();
+        cursor = cursor(operator, context, bindings);
         cursor.open();
         // closed was initialized to true, because hasMore is checked before open. (This is due to scan being
         // spread across possibly multiple requests.) Now set closed to false for the actual scanning of rows.

=== modified file 'src/main/java/com/akiban/qp/persistitadapter/PersistitAdapter.java'
--- src/main/java/com/akiban/qp/persistitadapter/PersistitAdapter.java	2013-07-07 19:04:43 +0000
+++ src/main/java/com/akiban/qp/persistitadapter/PersistitAdapter.java	2013-07-09 23:55:31 +0000
@@ -71,10 +71,11 @@
     }
 
     @Override
-    public Cursor newIndexCursor(QueryContext context, Index index, IndexKeyRange keyRange, API.Ordering ordering,
+    public Cursor newIndexCursor(QueryContext context, QueryBindings bindings, Index index, IndexKeyRange keyRange, API.Ordering ordering,
                                  IndexScanSelector selector, boolean usePValues)
     {
         return new PersistitIndexCursor(context,
+                                        bindings,
                                         schema.indexRowType(index),
                                         keyRange,
                                         ordering,
@@ -84,13 +85,14 @@
 
     @Override
     public Sorter createSorter(QueryContext context,
+                               QueryBindings bindings,
                                Cursor input,
                                RowType rowType,
                                API.Ordering ordering,
                                API.SortOption sortOption,
                                InOutTap loadTap)
     {
-        return new PersistitSorter(context, input, rowType, ordering, sortOption, loadTap);
+        return new PersistitSorter(context, bindings, input, rowType, ordering, sortOption, loadTap);
     }
 
     @Override

=== modified file 'src/main/java/com/akiban/qp/persistitadapter/PersistitIndexCursor.java'
--- src/main/java/com/akiban/qp/persistitadapter/PersistitIndexCursor.java	2013-06-28 15:04:00 +0000
+++ src/main/java/com/akiban/qp/persistitadapter/PersistitIndexCursor.java	2013-07-09 23:55:31 +0000
@@ -106,6 +106,7 @@
     // For use by this package
 
     PersistitIndexCursor(QueryContext context,
+                         QueryBindings bindings,
                          IndexRowType indexRowType,
                          IndexKeyRange keyRange,
                          API.Ordering ordering,
@@ -115,13 +116,14 @@
         this.keyRange = keyRange;
         this.ordering = ordering;
         this.context = context;
+        this.bindings = bindings;
         this.indexRowType = indexRowType;
         this.isTableIndex = indexRowType.index().isTableIndex();
         this.usePValues = usePValues;
         this.selector = selector;
         this.idle = true;
         this.rowState = context.getStore().createIterationHelper(indexRowType);
-        this.indexCursor = IndexCursor.create(context, keyRange, ordering, rowState, usePValues);
+        this.indexCursor = IndexCursor.create(context, bindings, keyRange, ordering, rowState, usePValues);
     }
 
     // For use by this class
@@ -129,6 +131,7 @@
     // Object state
 
     private final QueryContext context;
+    private final QueryBindings bindings;
     private final IndexRowType indexRowType;
     private final IndexKeyRange keyRange;
     private final API.Ordering ordering;

=== modified file 'src/main/java/com/akiban/qp/persistitadapter/indexcursor/IndexCursor.java'
--- src/main/java/com/akiban/qp/persistitadapter/indexcursor/IndexCursor.java	2013-06-27 21:06:53 +0000
+++ src/main/java/com/akiban/qp/persistitadapter/indexcursor/IndexCursor.java	2013-07-09 23:55:31 +0000
@@ -21,6 +21,7 @@
 import com.akiban.qp.operator.API;
 import com.akiban.qp.operator.Cursor;
 import com.akiban.qp.operator.CursorLifecycle;
+import com.akiban.qp.operator.QueryBindings;
 import com.akiban.qp.operator.QueryContext;
 import com.akiban.qp.operator.StoreAdapter;
 import com.akiban.qp.row.Row;
@@ -118,6 +119,7 @@
     // IndexCursor interface
 
     public static IndexCursor create(QueryContext context,
+                                     QueryBindings bindings,
                                      IndexKeyRange keyRange,
                                      API.Ordering ordering,
                                      IterationHelper iterationHelper,
@@ -130,20 +132,21 @@
         return
             keyRange != null && keyRange.spatial()
             ? keyRange.hi() == null
-                ? IndexCursorSpatial_NearPoint.create(context, iterationHelper, keyRange)
-                : IndexCursorSpatial_InBox.create(context, iterationHelper, keyRange)
+                ? IndexCursorSpatial_NearPoint.create(context, bindings, iterationHelper, keyRange)
+                : IndexCursorSpatial_InBox.create(context, bindings, iterationHelper, keyRange)
             : ordering.allAscending() || ordering.allDescending()
                 ? (keyRange != null && keyRange.lexicographic()
-                    ? IndexCursorUnidirectionalLexicographic.create(context, iterationHelper, keyRange, ordering, adapter)
-                    : IndexCursorUnidirectional.create(context, iterationHelper, keyRange, ordering, adapter))
-                : IndexCursorMixedOrder.create(context, iterationHelper, keyRange, ordering, adapter);
+                    ? IndexCursorUnidirectionalLexicographic.create(context, bindings, iterationHelper, keyRange, ordering, adapter)
+                    : IndexCursorUnidirectional.create(context, bindings, iterationHelper, keyRange, ordering, adapter))
+                : IndexCursorMixedOrder.create(context, bindings, iterationHelper, keyRange, ordering, adapter);
     }
 
     // For use by subclasses
 
-    protected IndexCursor(QueryContext context, IterationHelper iterationHelper)
+    protected IndexCursor(QueryContext context, QueryBindings bindings, IterationHelper iterationHelper)
     {
         this.context = context;
+        this.bindings = bindings;
         this.adapter = context.getStore();
         this.iterationHelper = iterationHelper;
     }
@@ -156,6 +159,7 @@
     // Object state
 
     protected final QueryContext context;
+    protected final QueryBindings bindings;
     protected final StoreAdapter adapter;
     protected final IterationHelper iterationHelper;
     private boolean idle = true;

=== modified file 'src/main/java/com/akiban/qp/persistitadapter/indexcursor/IndexCursorMixedOrder.java'
--- src/main/java/com/akiban/qp/persistitadapter/indexcursor/IndexCursorMixedOrder.java	2013-06-27 21:06:53 +0000
+++ src/main/java/com/akiban/qp/persistitadapter/indexcursor/IndexCursorMixedOrder.java	2013-07-09 23:55:31 +0000
@@ -24,6 +24,7 @@
 import com.akiban.qp.expression.IndexBound;
 import com.akiban.qp.expression.IndexKeyRange;
 import com.akiban.qp.operator.API;
+import com.akiban.qp.operator.QueryBindings;
 import com.akiban.qp.operator.QueryContext;
 import com.akiban.qp.persistitadapter.indexrow.PersistitIndexRow;
 import com.akiban.qp.persistitadapter.indexrow.PersistitIndexRowBuffer;
@@ -180,12 +181,13 @@
     // IndexCursorMixedOrder interface
 
     public static <S, E> IndexCursorMixedOrder<S, E> create(QueryContext context,
+                                              QueryBindings bindings,
                                               IterationHelper iterationHelper,
                                               IndexKeyRange keyRange,
                                               API.Ordering ordering,
                                               SortKeyAdapter<S, E> sortKeyAdapter)
     {
-        return new IndexCursorMixedOrder<>(context, iterationHelper, keyRange, ordering, sortKeyAdapter);
+        return new IndexCursorMixedOrder<>(context, bindings, iterationHelper, keyRange, ordering, sortKeyAdapter);
     }
 
     public void initializeScanStates()
@@ -198,8 +200,8 @@
             keyRange == null /* sorting */ ? Integer.MAX_VALUE :
             index().isUnique() ? index().getKeyColumns().size() : index().getAllColumns().size();
         while (f < min(loBoundColumns, maxSegments)) {
-            BoundExpressions lo = keyRange.lo().boundExpressions(context);
-            BoundExpressions hi = keyRange.hi().boundExpressions(context);
+            BoundExpressions lo = keyRange.lo().boundExpressions(context, bindings);
+            BoundExpressions hi = keyRange.hi().boundExpressions(context, bindings);
             S loSource = sortKeyAdapter.get(lo, f);
             S hiSource = sortKeyAdapter.get(hi, f);
             /*
@@ -275,12 +277,13 @@
     // For use by subclasses
 
     protected IndexCursorMixedOrder(QueryContext context,
+                                    QueryBindings bindings,
                                     IterationHelper iterationHelper,
                                     IndexKeyRange keyRange,
                                     API.Ordering ordering,
                                     SortKeyAdapter<S, E> sortKeyAdapter)
     {
-        super(context, iterationHelper);
+        super(context, bindings, iterationHelper);
         this.keyRange = keyRange;
         this.ordering = ordering;
         this.ascending = new boolean[ordering.sortColumns()];
@@ -375,8 +378,8 @@
             assert endKey != null : index();
             IndexBound lo = keyRange.lo();
             IndexBound hi = keyRange.hi();
-            BoundExpressions loExpressions = lo.boundExpressions(context);
-            BoundExpressions hiExpressions = hi.boundExpressions(context);
+            BoundExpressions loExpressions = lo.boundExpressions(context, bindings);
+            BoundExpressions hiExpressions = hi.boundExpressions(context, bindings);
             int nColumns = keyRange.boundColumns();
             clear(startKey);
             clear(endKey);

=== modified file 'src/main/java/com/akiban/qp/persistitadapter/indexcursor/IndexCursorSpatial_InBox.java'
--- src/main/java/com/akiban/qp/persistitadapter/indexcursor/IndexCursorSpatial_InBox.java	2013-06-27 21:06:53 +0000
+++ src/main/java/com/akiban/qp/persistitadapter/indexcursor/IndexCursorSpatial_InBox.java	2013-07-09 23:55:31 +0000
@@ -22,6 +22,7 @@
 import com.akiban.qp.expression.IndexBound;
 import com.akiban.qp.expression.IndexKeyRange;
 import com.akiban.qp.operator.API;
+import com.akiban.qp.operator.QueryBindings;
 import com.akiban.qp.operator.QueryContext;
 import com.akiban.qp.row.Row;
 import com.akiban.qp.rowtype.IndexRowType;
@@ -84,17 +85,18 @@
     // IndexCursorSpatial_InBox interface
 
     public static IndexCursorSpatial_InBox create(QueryContext context,
+                                                  QueryBindings bindings,
                                                   IterationHelper iterationHelper,
                                                   IndexKeyRange keyRange)
     {
-        return  new IndexCursorSpatial_InBox(context, iterationHelper, keyRange);
+        return  new IndexCursorSpatial_InBox(context, bindings, iterationHelper, keyRange);
     }
 
     // For use by this class
 
-    private IndexCursorSpatial_InBox(QueryContext context, IterationHelper iterationHelper, IndexKeyRange keyRange)
+    private IndexCursorSpatial_InBox(QueryContext context, QueryBindings bindings, IterationHelper iterationHelper, IndexKeyRange keyRange)
     {
-        super(context, iterationHelper);
+        super(context, bindings, iterationHelper);
         assert keyRange.spatial();
         this.multiCursor = new MultiCursor();
         this.iterationHelper = iterationHelper;
@@ -114,7 +116,7 @@
             IterationHelper rowState = adapter.createIterationHelper(keyRange.indexRowType());
             if (Types3Switch.ON) {
                 IndexCursorUnidirectional<PValueSource> zIntervalCursor =
-                    new IndexCursorUnidirectional<>(context,
+                    new IndexCursorUnidirectional<>(context, bindings,
                                                                 rowState,
                                                                 zKeyRange,
                                                                 zOrdering,
@@ -123,7 +125,7 @@
             }
             else {
                 IndexCursorUnidirectional<ValueSource> zIntervalCursor =
-                    new IndexCursorUnidirectional<>(context,
+                    new IndexCursorUnidirectional<>(context, bindings,
                                                                rowState,
                                                                zKeyRange,
                                                                zOrdering,
@@ -139,8 +141,8 @@
         Index index = keyRange.indexRowType().index();
         IndexBound loBound = keyRange.lo();
         IndexBound hiBound = keyRange.hi();
-        BoundExpressions loExpressions = loBound.boundExpressions(context);
-        BoundExpressions hiExpressions = hiBound.boundExpressions(context);
+        BoundExpressions loExpressions = loBound.boundExpressions(context, bindings);
+        BoundExpressions hiExpressions = hiBound.boundExpressions(context, bindings);
         // Only 2d, lat/lon supported for now
         BigDecimal xLo, xHi, yLo, yHi;
         if (Types3Switch.ON) {

=== modified file 'src/main/java/com/akiban/qp/persistitadapter/indexcursor/IndexCursorSpatial_NearPoint.java'
--- src/main/java/com/akiban/qp/persistitadapter/indexcursor/IndexCursorSpatial_NearPoint.java	2013-06-27 21:06:53 +0000
+++ src/main/java/com/akiban/qp/persistitadapter/indexcursor/IndexCursorSpatial_NearPoint.java	2013-07-09 23:55:31 +0000
@@ -23,6 +23,7 @@
 import com.akiban.qp.expression.IndexKeyRange;
 import com.akiban.qp.operator.API;
 import com.akiban.qp.operator.Cursor;
+import com.akiban.qp.operator.QueryBindings;
 import com.akiban.qp.operator.QueryContext;
 import com.akiban.qp.row.Row;
 import com.akiban.qp.rowtype.IndexRowType;
@@ -112,17 +113,18 @@
     // IndexCursorSpatial_InBox interface
 
     public static IndexCursorSpatial_NearPoint create(QueryContext context,
+                                                      QueryBindings bindings,
                                                       IterationHelper iterationHelper,
                                                       IndexKeyRange keyRange)
     {
-        return new IndexCursorSpatial_NearPoint(context, iterationHelper, keyRange);
+        return new IndexCursorSpatial_NearPoint(context, bindings, iterationHelper, keyRange);
     }
 
     // For use by this class
 
-    private IndexCursorSpatial_NearPoint(QueryContext context, IterationHelper iterationHelper, IndexKeyRange keyRange)
+    private IndexCursorSpatial_NearPoint(QueryContext context, QueryBindings bindings, IterationHelper iterationHelper, IndexKeyRange keyRange)
     {
-        super(context, iterationHelper);
+        super(context, bindings, iterationHelper);
         assert keyRange.spatial();
         this.iterationHelper = iterationHelper;
         IndexRowType physicalIndexRowType = keyRange.indexRowType().physicalRowType();
@@ -133,7 +135,7 @@
         // The index column selector needs to select all the columns before the z column, and the z column itself.
         IndexRowPrefixSelector indexColumnSelector = new IndexRowPrefixSelector(latColumn + 1);
         IndexBound loBound = keyRange.lo();
-        BoundExpressions loExpressions = loBound.boundExpressions(context);
+        BoundExpressions loExpressions = loBound.boundExpressions(context, bindings);
         // Compute z-value at beginning of forward and backward scans
         TInstance latInstance = index.getAllColumns().get(latColumn).getColumn().tInstance();
         TInstance lonInstance = index.getAllColumns().get(lonColumn).getColumn().tInstance();
@@ -181,12 +183,12 @@
             upOrdering.append((TPreparedExpression)null, true);
             downOrdering.append((TPreparedExpression)null, false);
         }
-        geCursor = new IndexCursorUnidirectional<>(context,
+        geCursor = new IndexCursorUnidirectional<>(context, bindings,
                                                                geRowState,
                                                                geKeyRange,
                                                                upOrdering,
                                                                PValueSortKeyAdapter.INSTANCE);
-        ltCursor = new IndexCursorUnidirectional<>(context,
+        ltCursor = new IndexCursorUnidirectional<>(context, bindings,
                                                                ltRowState,
                                                                ltKeyRange,
                                                                downOrdering,

=== modified file 'src/main/java/com/akiban/qp/persistitadapter/indexcursor/IndexCursorUnidirectional.java'
--- src/main/java/com/akiban/qp/persistitadapter/indexcursor/IndexCursorUnidirectional.java	2013-06-27 21:06:53 +0000
+++ src/main/java/com/akiban/qp/persistitadapter/indexcursor/IndexCursorUnidirectional.java	2013-07-09 23:55:31 +0000
@@ -25,6 +25,7 @@
 import com.akiban.qp.expression.IndexBound;
 import com.akiban.qp.expression.IndexKeyRange;
 import com.akiban.qp.operator.API;
+import com.akiban.qp.operator.QueryBindings;
 import com.akiban.qp.operator.QueryContext;
 import com.akiban.qp.persistitadapter.SpatialHelper;
 import com.akiban.qp.persistitadapter.indexrow.PersistitIndexRow;
@@ -139,6 +140,7 @@
     // IndexCursorUnidirectional interface
 
     public static <S> IndexCursorUnidirectional<S> create(QueryContext context,
+                                                  QueryBindings bindings,
                                                   IterationHelper iterationHelper,
                                                   IndexKeyRange keyRange,
                                                   API.Ordering ordering,
@@ -146,19 +148,20 @@
     {
         return
             keyRange == null // occurs if we're doing a sort (PersistitSorter)
-            ? new IndexCursorUnidirectional<>(context, iterationHelper, ordering, sortKeyAdapter)
-            : new IndexCursorUnidirectional<>(context, iterationHelper, keyRange, ordering, sortKeyAdapter);
+            ? new IndexCursorUnidirectional<>(context, bindings, iterationHelper, ordering, sortKeyAdapter)
+            : new IndexCursorUnidirectional<>(context, bindings, iterationHelper, keyRange, ordering, sortKeyAdapter);
     }
 
     // For use by this subclasses
 
     protected IndexCursorUnidirectional(QueryContext context,
+                                        QueryBindings bindings,
                                         IterationHelper iterationHelper,
                                         IndexKeyRange keyRange,
                                         API.Ordering ordering,
                                         SortKeyAdapter<S, ?> sortKeyAdapter)
     {
-        super(context, iterationHelper);
+        super(context, bindings, iterationHelper);
         // end state never changes. start state can change on a jump, so it is set in initializeCursor.
         this.endBoundColumns = keyRange.boundColumns();
         this.endKey = endBoundColumns == 0 ? null : adapter.takeIndexRow(keyRange.indexRowType());
@@ -173,8 +176,8 @@
                 startKey.append(startBoundary);
             } else {
                 // Check constraints on start and end
-                BoundExpressions loExpressions = lo.boundExpressions(context);
-                BoundExpressions hiExpressions = hi.boundExpressions(context);
+                BoundExpressions loExpressions = lo.boundExpressions(context, bindings);
+                BoundExpressions hiExpressions = hi.boundExpressions(context, bindings);
                 for (int f = 0; f < endBoundColumns - 1; f++) {
                     keyAdapter.checkConstraints(loExpressions, hiExpressions, f, collators, tInstances);
                 }
@@ -202,8 +205,8 @@
                       lo and hi to be null, so write null, not Key.AFTER to endKey.
                 */
                 // Construct start and end keys
-                BoundExpressions startExpressions = start.boundExpressions(context);
-                BoundExpressions endExpressions = end.boundExpressions(context);
+                BoundExpressions startExpressions = start.boundExpressions(context, bindings);
+                BoundExpressions endExpressions = end.boundExpressions(context, bindings);
                 // startBoundColumns == endBoundColumns because jump() hasn't been called.
                 // If it had we'd be in reevaluateBoundaries, not here.
                 assert startBoundColumns == endBoundColumns;
@@ -296,7 +299,7 @@
             startKey.append(startBoundary);
         } else {
             // Construct start key
-            BoundExpressions startExpressions = start.boundExpressions(context);
+            BoundExpressions startExpressions = start.boundExpressions(context, bindings);
             S[] startValues = keyAdapter.createSourceArray(startBoundColumns);
             for (int f = 0; f < startBoundColumns; f++) {
                 startValues[f] = keyAdapter.get(startExpressions, f);
@@ -480,11 +483,12 @@
     }
 
     private IndexCursorUnidirectional(QueryContext context,
+                                      QueryBindings bindings,
                                       IterationHelper iterationHelper,
                                       API.Ordering ordering,
                                       SortKeyAdapter<S, ?> sortKeyAdapter)
     {
-        super(context, iterationHelper);
+        super(context, bindings, iterationHelper);
         this.keyRange = null;
         this.ordering = ordering;
         if (ordering.allAscending()) {

=== modified file 'src/main/java/com/akiban/qp/persistitadapter/indexcursor/IndexCursorUnidirectionalLexicographic.java'
--- src/main/java/com/akiban/qp/persistitadapter/indexcursor/IndexCursorUnidirectionalLexicographic.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/qp/persistitadapter/indexcursor/IndexCursorUnidirectionalLexicographic.java	2013-07-09 23:55:31 +0000
@@ -20,6 +20,7 @@
 import com.akiban.qp.expression.BoundExpressions;
 import com.akiban.qp.expression.IndexKeyRange;
 import com.akiban.qp.operator.API;
+import com.akiban.qp.operator.QueryBindings;
 import com.akiban.qp.operator.QueryContext;
 import com.persistit.Key;
 
@@ -30,23 +31,25 @@
     // IndexCursorUnidirectional interface
 
     public static <S> IndexCursorUnidirectionalLexicographic<S> create(QueryContext context,
+                                                               QueryBindings bindings,
                                                                IterationHelper iterationHelper,
                                                                IndexKeyRange keyRange,
                                                                API.Ordering ordering,
                                                                SortKeyAdapter<S, ?> sortKeyAdapter)
     {
-        return new IndexCursorUnidirectionalLexicographic<>(context, iterationHelper, keyRange, ordering, sortKeyAdapter);
+        return new IndexCursorUnidirectionalLexicographic<>(context, bindings, iterationHelper, keyRange, ordering, sortKeyAdapter);
     }
 
     // For use by this class
 
     private IndexCursorUnidirectionalLexicographic(QueryContext context,
+                                                   QueryBindings bindings,
                                                    IterationHelper iterationHelper,
                                                    IndexKeyRange keyRange,
                                                    API.Ordering ordering,
                                                    SortKeyAdapter<S, ?> sortKeyAdapter)
     {
-        super(context, iterationHelper, keyRange, ordering, sortKeyAdapter);
+        super(context, bindings, iterationHelper, keyRange, ordering, sortKeyAdapter);
     }
 
     @Override
@@ -56,7 +59,7 @@
         if (startBoundColumns == 0 || start == null) {
             startKey.append(startBoundary);
         } else {
-            startExpressions = start.boundExpressions(context);
+            startExpressions = start.boundExpressions(context, bindings);
             clearStart();
             for (int f = 0; f < startBoundColumns; f++) {
                 if (start.columnSelector().includesColumn(f)) {
@@ -69,7 +72,7 @@
         if (endBoundColumns == 0 || end == null) {
             endKey = null;
         } else {
-            endExpressions = end.boundExpressions(context);
+            endExpressions = end.boundExpressions(context, bindings);
             clearEnd();
             for (int f = 0; f < endBoundColumns; f++) {
                 if (end.columnSelector().includesColumn(f)) {

=== modified file 'src/main/java/com/akiban/qp/persistitadapter/indexcursor/MemorySorter.java'
--- src/main/java/com/akiban/qp/persistitadapter/indexcursor/MemorySorter.java	2013-06-07 19:06:29 +0000
+++ src/main/java/com/akiban/qp/persistitadapter/indexcursor/MemorySorter.java	2013-07-09 23:55:31 +0000
@@ -20,6 +20,7 @@
 import com.akiban.qp.operator.API;
 import com.akiban.qp.operator.Cursor;
 import com.akiban.qp.operator.CursorLifecycle;
+import com.akiban.qp.operator.QueryBindings;
 import com.akiban.qp.operator.QueryContext;
 import com.akiban.qp.persistitadapter.Sorter;
 import com.akiban.qp.row.Row;
@@ -73,6 +74,7 @@
     private final List<Integer> orderChanges;
 
     private final QueryContext context;
+    private final QueryBindings bindings;
     private final Cursor input;
     private final API.Ordering ordering;
     private final Key key;
@@ -80,6 +82,7 @@
     private final SorterAdapter<?, ?, ?> sorterAdapter;
 
     public MemorySorter(QueryContext context,
+                        QueryBindings bindings,
                         Cursor input,
                         RowType rowType,
                         API.Ordering ordering,
@@ -88,13 +91,14 @@
                         Key key)
     {
         this.context = context;
+        this.bindings = bindings;
         this.input = input;
         this.ordering = ordering.copy();
         this.key = key;
         this.loadTap = loadTap;
         this.sorterAdapter = new PValueSorterAdapter();
         // Note: init may change this.ordering
-        sorterAdapter.init(rowType, this.ordering, this.key, null, this.context, sortOption);
+        sorterAdapter.init(rowType, this.ordering, this.key, null, this.context, this.bindings, sortOption);
         // Explicitly use input ordering to avoid appended field
         this.orderChanges = new ArrayList<>();
         List<Comparator<KeyState>> comparators = new ArrayList<>();

=== modified file 'src/main/java/com/akiban/qp/persistitadapter/indexcursor/OldSorterAdapter.java'
--- src/main/java/com/akiban/qp/persistitadapter/indexcursor/OldSorterAdapter.java	2013-04-30 23:01:23 +0000
+++ src/main/java/com/akiban/qp/persistitadapter/indexcursor/OldSorterAdapter.java	2013-07-09 23:55:31 +0000
@@ -17,6 +17,7 @@
 package com.akiban.qp.persistitadapter.indexcursor;
 
 import com.akiban.qp.operator.API;
+import com.akiban.qp.operator.QueryBindings;
 import com.akiban.qp.operator.QueryContext;
 import com.akiban.qp.row.Row;
 import com.akiban.qp.row.ValuesHolderRow;
@@ -60,7 +61,7 @@
     }
 
     @Override
-    protected ExpressionEvaluation evaluation(API.Ordering ordering, QueryContext context, int i) {
+    protected ExpressionEvaluation evaluation(API.Ordering ordering, QueryContext context, QueryBindings bindings, int i) {
         throw new IllegalStateException("types3 off");
     }
 

=== modified file 'src/main/java/com/akiban/qp/persistitadapter/indexcursor/PValueSorterAdapter.java'
--- src/main/java/com/akiban/qp/persistitadapter/indexcursor/PValueSorterAdapter.java	2013-04-30 23:01:23 +0000
+++ src/main/java/com/akiban/qp/persistitadapter/indexcursor/PValueSorterAdapter.java	2013-07-09 23:55:31 +0000
@@ -17,6 +17,7 @@
 package com.akiban.qp.persistitadapter.indexcursor;
 
 import com.akiban.qp.operator.API;
+import com.akiban.qp.operator.QueryBindings;
 import com.akiban.qp.operator.QueryContext;
 import com.akiban.qp.row.Row;
 import com.akiban.qp.row.ValuesHolderRow;
@@ -60,9 +61,10 @@
     }
 
     @Override
-    protected TEvaluatableExpression evaluation(API.Ordering ordering, QueryContext context, int i) {
+    protected TEvaluatableExpression evaluation(API.Ordering ordering, QueryContext context, QueryBindings bindings, int i) {
         TEvaluatableExpression evaluation = ordering.tExpression(i).build();
         evaluation.with(context);
+        evaluation.with(bindings);
         return evaluation;
     }
 

=== modified file 'src/main/java/com/akiban/qp/persistitadapter/indexcursor/PersistitSorter.java'
--- src/main/java/com/akiban/qp/persistitadapter/indexcursor/PersistitSorter.java	2013-06-27 21:06:53 +0000
+++ src/main/java/com/akiban/qp/persistitadapter/indexcursor/PersistitSorter.java	2013-07-09 23:55:31 +0000
@@ -19,6 +19,7 @@
 
 import com.akiban.qp.operator.API;
 import com.akiban.qp.operator.Cursor;
+import com.akiban.qp.operator.QueryBindings;
 import com.akiban.qp.operator.QueryContext;
 import com.akiban.qp.persistitadapter.PersistitAdapter;
 import com.akiban.qp.persistitadapter.Sorter;
@@ -65,6 +66,7 @@
 public class PersistitSorter implements Sorter
 {
     public PersistitSorter(QueryContext context,
+                           QueryBindings bindings,
                            Cursor input,
                            RowType rowType,
                            API.Ordering ordering,
@@ -73,6 +75,7 @@
     {
         this.usePValues = Types3Switch.ON;
         this.context = context;
+        this.bindings = bindings;
         this.adapter = (PersistitAdapter)context.getStore();
         this.input = input;
         this.rowType = rowType;
@@ -85,7 +88,7 @@
         sorterAdapter = usePValues
                 ? new PValueSorterAdapter()
                 : new OldSorterAdapter();
-        sorterAdapter.init(this.rowType, this.ordering, key, value, this.context, sortOption);
+        sorterAdapter.init(this.rowType, this.ordering, key, value, this.context, this.bindings, sortOption);
         iterationHelper = new SorterIterationHelper(sorterAdapter.createValueAdapter());
         this.loadTap = loadTap;
 
@@ -144,7 +147,7 @@
     private Cursor cursor()
     {
         exchange.clear();
-        return IndexCursor.create(context, null, ordering, iterationHelper, usePValues);
+        return IndexCursor.create(context, bindings, null, ordering, iterationHelper, usePValues);
     }
 
     private void createKey(Row row)
@@ -189,6 +192,7 @@
     final RowType rowType;
     final API.Ordering ordering;
     final QueryContext context;
+    final QueryBindings bindings;
     final Key key;
     final Value value;
     final int rowFields;

=== modified file 'src/main/java/com/akiban/qp/persistitadapter/indexcursor/SorterAdapter.java'
--- src/main/java/com/akiban/qp/persistitadapter/indexcursor/SorterAdapter.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/qp/persistitadapter/indexcursor/SorterAdapter.java	2013-07-09 23:55:31 +0000
@@ -18,6 +18,7 @@
 
 import com.akiban.qp.operator.API;
 import com.akiban.qp.operator.API.Ordering;
+import com.akiban.qp.operator.QueryBindings;
 import com.akiban.qp.operator.QueryContext;
 import com.akiban.qp.row.Row;
 import com.akiban.qp.row.ValuesHolderRow;
@@ -38,7 +39,7 @@
         keyTarget = sortKeyAdapter.createTarget();
     }
     
-    public void init(RowType rowType, Ordering ordering, Key key, Value value, QueryContext context,
+    public void init(RowType rowType, Ordering ordering, Key key, Value value, QueryContext context, QueryBindings bindings,
                      API.SortOption sortOption)
     {
         
@@ -69,7 +70,7 @@
         for (int i = 0; i < nsort; i++) {
             initTypes(ordering, i, oOrderingTypes, tOrderingTypes);
             orderingCollators[i] = ordering.collator(i);
-            V evaluation = evaluation(ordering, context, i);
+            V evaluation = evaluation(ordering, context, bindings, i);
             evaluations.add(evaluation);
         }
     }
@@ -100,7 +101,7 @@
     
     protected abstract void initTypes(RowType rowType, AkType[] ofFieldTypes, TInstance[] tFieldTypes, int i);
     protected abstract void initTypes(Ordering ordering, int i, AkType[] akTypes, TInstance[] tInstances);
-    protected abstract V evaluation(Ordering ordering, QueryContext context, int i);
+    protected abstract V evaluation(Ordering ordering, QueryContext context, QueryBindings bindings, int i);
     protected abstract S evaluateRow(V evaluation, Row row);
     protected abstract void attachValueTarget(Value value);
 

=== modified file 'src/main/java/com/akiban/qp/row/BindableRow.java'
--- src/main/java/com/akiban/qp/row/BindableRow.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/qp/row/BindableRow.java	2013-07-09 23:55:31 +0000
@@ -20,6 +20,7 @@
 import com.akiban.qp.expression.ExpressionRow;
 import com.akiban.qp.operator.API;
 import com.akiban.qp.operator.ExpressionGenerator;
+import com.akiban.qp.operator.QueryBindings;
 import com.akiban.qp.operator.QueryContext;
 import com.akiban.qp.rowtype.RowType;
 import com.akiban.server.explain.*;
@@ -83,7 +84,7 @@
 
     // BindableRow instance interface
 
-    public abstract Row bind(QueryContext context);
+    public abstract Row bind(QueryContext context, QueryBindings bindings);
     public abstract CompoundExplainer getExplainer(ExplainContext context);
 
     private static ImmutableRow strictCopy(Row input, boolean usePValues) {
@@ -104,8 +105,8 @@
 
     private static class BindingExpressions extends BindableRow {
         @Override
-        public Row bind(QueryContext context) {
-            return new ExpressionRow(rowType, context, expressions, pExprs);
+        public Row bind(QueryContext context, QueryBindings bindings) {
+            return new ExpressionRow(rowType, context, bindings, expressions, pExprs);
         }
 
         @Override
@@ -263,7 +264,7 @@
 
     private static class Delegating extends BindableRow {
         @Override
-        public Row bind(QueryContext context) {
+        public Row bind(QueryContext context, QueryBindings bindings) {
             return row;
         }
 

=== modified file 'src/main/java/com/akiban/qp/row/ProjectedRow.java'
--- src/main/java/com/akiban/qp/row/ProjectedRow.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/qp/row/ProjectedRow.java	2013-07-09 23:55:31 +0000
@@ -17,6 +17,7 @@
 
 package com.akiban.qp.row;
 
+import com.akiban.qp.operator.QueryBindings;
 import com.akiban.qp.operator.QueryContext;
 import com.akiban.qp.rowtype.ProjectedRowType;
 import com.akiban.qp.rowtype.RowType;
@@ -96,8 +97,9 @@
     public PValueSource pvalue(int index) {
         TEvaluatableExpression evaluatableExpression = pEvaluatableExpressions.get(index);
         if (!evaluated[index]) {
+            evaluatableExpression.with(context);
+            evaluatableExpression.with(bindings);
             evaluatableExpression.with(row);
-            evaluatableExpression.with(context);
             evaluatableExpression.evaluate();
             evaluated[index] = true;
         }
@@ -129,14 +131,16 @@
     public ProjectedRow(ProjectedRowType rowType,
                         Row row,
                         QueryContext context,
+                        QueryBindings bindings,
                         List<? extends Expression> expressions,
                         List<TEvaluatableExpression> pEvaluatableExprs,
                         List<? extends TInstance> tInstances)
     {
         this.context = context;
+        this.bindings = bindings;
         this.rowType = rowType;
         this.row = row;
-        this.evaluations = createEvaluations(expressions, row, context);
+        this.evaluations = createEvaluations(expressions, row, context, bindings);
         this.pEvaluatableExpressions = pEvaluatableExprs;
         if (pEvaluatableExpressions == null)
             evaluated = null;
@@ -176,7 +180,7 @@
     // For use by this class
 
     private List<ExpressionEvaluation> createEvaluations(List<? extends Expression> expressions,
-                                                         Row row, QueryContext context)
+                                                         Row row, QueryContext context, QueryBindings bindings)
     {
         if (expressions == null)
             return null;
@@ -185,6 +189,7 @@
         for (int i = 0; i < n; i++) {
             ExpressionEvaluation evaluation = expressions.get(i).evaluation();
             evaluation.of(context);
+            evaluation.of(bindings);
             evaluation.of(row);
             result.add(evaluation);
         }
@@ -209,6 +214,7 @@
     // Object state
 
     private final QueryContext context;
+    private final QueryBindings bindings;
     private final ProjectedRowType rowType;
     private final Row row;
     private final List<ExpressionEvaluation> evaluations;

=== modified file 'src/main/java/com/akiban/server/expression/ExpressionEvaluation.java'
--- src/main/java/com/akiban/server/expression/ExpressionEvaluation.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/server/expression/ExpressionEvaluation.java	2013-07-09 23:55:31 +0000
@@ -17,6 +17,7 @@
 
 package com.akiban.server.expression;
 
+import com.akiban.qp.operator.QueryBindings;
 import com.akiban.qp.operator.QueryContext;
 import com.akiban.qp.row.Row;
 import com.akiban.server.types.ValueSource;
@@ -74,11 +75,17 @@
 
     /**
      * Binds this evaluation to a query context
-     * @param context the query context to use to access storage and bindings
+     * @param context the query context to use to access storage and state
      */
     void of(QueryContext context);
 
     /**
+     * Binds this evaluation to a query bindings
+     * @param bindings the query binding to use to access bound values
+     */
+    void of(QueryBindings bindings);
+
+    /**
      * Gets a ValueSource that represents this evaluation. The returned ValueSource is mutable, and may change
      * if you call either {@code of} method <em>or</em> let the bound (input) QueryContext or Row change. The ValueSource
      * may be lazily evaluated, too.

=== modified file 'src/main/java/com/akiban/server/expression/std/AbstractCompositeExpressionEvaluation.java'
--- src/main/java/com/akiban/server/expression/std/AbstractCompositeExpressionEvaluation.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/server/expression/std/AbstractCompositeExpressionEvaluation.java	2013-07-09 23:55:31 +0000
@@ -17,6 +17,7 @@
 
 package com.akiban.server.expression.std;
 
+import com.akiban.qp.operator.QueryBindings;
 import com.akiban.qp.operator.QueryContext;
 import com.akiban.qp.row.Row;
 import com.akiban.server.expression.ExpressionEvaluation;
@@ -48,6 +49,15 @@
     }
 
     @Override
+    public void of(QueryBindings bindings)
+    {
+        for (int i = 0; i < nChildren; i++) {
+            children.get(i).of(bindings);
+        }
+        this.bindings = bindings;
+    }
+
+    @Override
     public void destroy()
     {
         for (int i = 0; i < nChildren; i++) {
@@ -105,10 +115,15 @@
         return context;
     }
     
+    protected QueryBindings queryBindings() {
+        return bindings;
+    }
+    
     // object state
 
     private final List<? extends ExpressionEvaluation> children;
     private final int nChildren;
     private ValueHolder valueHolder;
     private QueryContext context;
+    private QueryBindings bindings;
 }

=== modified file 'src/main/java/com/akiban/server/expression/std/AbstractNoArgExpressionEvaluation.java'
--- src/main/java/com/akiban/server/expression/std/AbstractNoArgExpressionEvaluation.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/server/expression/std/AbstractNoArgExpressionEvaluation.java	2013-07-09 23:55:31 +0000
@@ -17,6 +17,7 @@
 
 package com.akiban.server.expression.std;
 
+import com.akiban.qp.operator.QueryBindings;
 import com.akiban.qp.operator.QueryContext;
 import com.akiban.qp.row.Row;
 import com.akiban.server.expression.ExpressionEvaluation;
@@ -32,6 +33,10 @@
     }
 
     @Override
+    public void of(QueryBindings bindings) {
+    }
+
+    @Override
     public void acquire() {
     }
 

=== modified file 'src/main/java/com/akiban/server/expression/std/AbstractUnaryExpressionEvaluation.java'
--- src/main/java/com/akiban/server/expression/std/AbstractUnaryExpressionEvaluation.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/server/expression/std/AbstractUnaryExpressionEvaluation.java	2013-07-09 23:55:31 +0000
@@ -17,6 +17,7 @@
 
 package com.akiban.server.expression.std;
 
+import com.akiban.qp.operator.QueryBindings;
 import com.akiban.qp.operator.QueryContext;
 import com.akiban.qp.row.Row;
 import com.akiban.server.expression.ExpressionEvaluation;
@@ -37,6 +38,12 @@
     }
 
     @Override
+    public void of(QueryBindings bindings) {
+        operandEvaluation.of(bindings);
+        this.bindings = bindings;
+    }
+
+    @Override
     public void destroy() {
         operandEvaluation.destroy();
     }
@@ -81,4 +88,5 @@
     private final ExpressionEvaluation operandEvaluation;
     private ValueHolder valueHolder;
     private QueryContext context;
+    private QueryBindings bindings;
 }

=== modified file 'src/main/java/com/akiban/server/expression/std/BoundFieldExpression.java'
--- src/main/java/com/akiban/server/expression/std/BoundFieldExpression.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/server/expression/std/BoundFieldExpression.java	2013-07-09 23:55:31 +0000
@@ -18,6 +18,7 @@
 package com.akiban.server.expression.std;
 
 import com.akiban.qp.exec.Plannable;
+import com.akiban.qp.operator.QueryBindings;
 import com.akiban.qp.operator.QueryContext;
 import com.akiban.qp.row.Row;
 import com.akiban.server.explain.CompoundExplainer;
@@ -107,7 +108,11 @@
 
         @Override
         public void of(QueryContext context) {
-            fieldExpressionEvaluation.of(context.getRow(rowBindingPosition));
+        }
+
+        @Override
+        public void of(QueryBindings bindings) {
+            fieldExpressionEvaluation.of(bindings.getRow(rowBindingPosition));
         }
 
         @Override

=== modified file 'src/main/java/com/akiban/server/expression/std/ColumnExpression.java'
--- src/main/java/com/akiban/server/expression/std/ColumnExpression.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/server/expression/std/ColumnExpression.java	2013-07-09 23:55:31 +0000
@@ -19,6 +19,7 @@
 
 import com.akiban.ais.model.Column;
 import com.akiban.qp.exec.Plannable;
+import com.akiban.qp.operator.QueryBindings;
 import com.akiban.qp.operator.QueryContext;
 import com.akiban.qp.row.Row;
 import com.akiban.server.explain.CompoundExplainer;
@@ -116,6 +117,10 @@
         }
 
         @Override
+        public void of(QueryBindings bindings) {
+        }
+
+        @Override
         public ValueSource eval() {
             if (row == null)
                 throw new IllegalStateException("haven't seen a row to target");

=== modified file 'src/main/java/com/akiban/server/expression/std/FieldExpression.java'
--- src/main/java/com/akiban/server/expression/std/FieldExpression.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/server/expression/std/FieldExpression.java	2013-07-09 23:55:31 +0000
@@ -18,6 +18,7 @@
 package com.akiban.server.expression.std;
 
 import com.akiban.qp.exec.Plannable;
+import com.akiban.qp.operator.QueryBindings;
 import com.akiban.qp.operator.QueryContext;
 import com.akiban.qp.row.Row;
 import com.akiban.qp.rowtype.RowType;
@@ -131,6 +132,10 @@
         }
 
         @Override
+        public void of(QueryBindings bindings) {
+        }
+
+        @Override
         public ValueSource eval() {
             if (row == null)
                 throw new IllegalStateException("haven't seen a row to target");

=== modified file 'src/main/java/com/akiban/server/expression/std/LiteralExpression.java'
--- src/main/java/com/akiban/server/expression/std/LiteralExpression.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/server/expression/std/LiteralExpression.java	2013-07-09 23:55:31 +0000
@@ -18,6 +18,7 @@
 package com.akiban.server.expression.std;
 
 import com.akiban.qp.exec.Plannable;
+import com.akiban.qp.operator.QueryBindings;
 import com.akiban.qp.operator.QueryContext;
 import com.akiban.qp.row.Row;
 import com.akiban.server.explain.Explainer;
@@ -155,6 +156,10 @@
         }
 
         @Override
+        public void of(QueryBindings bindings) {
+        }
+
+        @Override
         public ValueSource eval() {
             return valueSource;
         }

=== modified file 'src/main/java/com/akiban/server/expression/std/SequenceCurrentValueExpression.java'
--- src/main/java/com/akiban/server/expression/std/SequenceCurrentValueExpression.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/server/expression/std/SequenceCurrentValueExpression.java	2013-07-09 23:55:31 +0000
@@ -18,6 +18,7 @@
 package com.akiban.server.expression.std;
 
 import com.akiban.ais.model.TableName;
+import com.akiban.qp.operator.QueryBindings;
 import com.akiban.qp.operator.QueryContext;
 import com.akiban.qp.row.Row;
 import com.akiban.server.expression.Expression;
@@ -99,6 +100,12 @@
         }
 
         @Override
+        public void of(QueryBindings bindings) {
+            super.of(bindings);
+            needAnother = true;
+        }
+
+        @Override
         public void of(Row row) {
             super.of(row);
             needAnother = true;

=== modified file 'src/main/java/com/akiban/server/expression/std/SequenceNextValueExpression.java'
--- src/main/java/com/akiban/server/expression/std/SequenceNextValueExpression.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/server/expression/std/SequenceNextValueExpression.java	2013-07-09 23:55:31 +0000
@@ -18,6 +18,7 @@
 package com.akiban.server.expression.std;
 
 import com.akiban.ais.model.TableName;
+import com.akiban.qp.operator.QueryBindings;
 import com.akiban.qp.operator.QueryContext;
 import com.akiban.qp.row.Row;
 import com.akiban.server.expression.Expression;
@@ -99,6 +100,12 @@
         }
 
         @Override
+        public void of(QueryBindings bindings) {
+            super.of(bindings);
+            needAnother = true;
+        }
+
+        @Override
         public void of(Row row) {
             super.of(row);
             needAnother = true;

=== modified file 'src/main/java/com/akiban/server/expression/std/ValueSourceExpression.java'
--- src/main/java/com/akiban/server/expression/std/ValueSourceExpression.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/server/expression/std/ValueSourceExpression.java	2013-07-09 23:55:31 +0000
@@ -18,6 +18,7 @@
 package com.akiban.server.expression.std;
 
 import com.akiban.qp.exec.Plannable;
+import com.akiban.qp.operator.QueryBindings;
 import com.akiban.qp.operator.QueryContext;
 import com.akiban.qp.row.Row;
 import com.akiban.server.explain.CompoundExplainer;
@@ -118,6 +119,11 @@
         }
 
         @Override
+        public void of(QueryBindings bindings)
+        {
+        }
+
+        @Override
         public ValueSource eval()
         {
             return valueSource;

=== modified file 'src/main/java/com/akiban/server/expression/std/VariableExpression.java'
--- src/main/java/com/akiban/server/expression/std/VariableExpression.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/server/expression/std/VariableExpression.java	2013-07-09 23:55:31 +0000
@@ -18,6 +18,7 @@
 package com.akiban.server.expression.std;
 
 import com.akiban.qp.exec.Plannable;
+import com.akiban.qp.operator.QueryBindings;
 import com.akiban.qp.operator.QueryContext;
 import com.akiban.qp.row.Row;
 import com.akiban.server.explain.CompoundExplainer;
@@ -106,12 +107,16 @@
 
         @Override
         public void of(QueryContext context) {
-            this.context = context;
+        }
+
+        @Override
+        public void of(QueryBindings bindings) {
+            this.bindings = bindings;
         }
 
         @Override
         public ValueSource eval() {
-            return context.getValue(position);
+            return bindings.getValue(position);
         }
 
         @Override
@@ -137,7 +142,7 @@
 
         private final AkType type;
         private final int position;
-        private QueryContext context;
+        private QueryBindings bindings;
         private int ownedBy = 0;
     }
 }

=== modified file 'src/main/java/com/akiban/server/expression/subquery/AnySubqueryExpression.java'
--- src/main/java/com/akiban/server/expression/subquery/AnySubqueryExpression.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/server/expression/subquery/AnySubqueryExpression.java	2013-07-09 23:55:31 +0000
@@ -74,6 +74,7 @@
         @Override
         public ValueSource doEval() {
             expressionEvaluation.of(queryContext());
+            expressionEvaluation.of(queryBindings());
             Boolean result = Boolean.FALSE;
             BooleanExtractor extractor = Extractors.getBooleanExtractor();
             while (true) {

=== modified file 'src/main/java/com/akiban/server/expression/subquery/ResultSetSubqueryExpression.java'
--- src/main/java/com/akiban/server/expression/subquery/ResultSetSubqueryExpression.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/server/expression/subquery/ResultSetSubqueryExpression.java	2013-07-09 23:55:31 +0000
@@ -20,6 +20,7 @@
 import com.akiban.qp.operator.API;
 import com.akiban.qp.operator.Cursor;
 import com.akiban.qp.operator.Operator;
+import com.akiban.qp.operator.QueryBindings;
 import com.akiban.qp.operator.QueryContext;
 import com.akiban.qp.row.Row;
 import com.akiban.qp.rowtype.RowType;
@@ -65,6 +66,11 @@
         }
 
         @Override
+        public void of(QueryBindings bindings) {
+            this.bindings = bindings;
+        }
+
+        @Override
         public void of(Row row) {
             if (row.rowType() != outerRowType) {
                 throw new IllegalArgumentException("wrong row type: " + outerRowType +
@@ -75,8 +81,8 @@
 
         @Override
         public ValueSource eval() {
-            context.setRow(bindingPosition, outerRow);
-            Cursor cursor = API.cursor(subquery, context);
+            bindings.setRow(bindingPosition, outerRow);
+            Cursor cursor = API.cursor(subquery, context, bindings);
             cursor.open();
             return new ValueHolder(AkType.RESULT_SET, cursor);
         }
@@ -110,6 +116,7 @@
         private final RowType outerRowType;
         private final int bindingPosition;
         private QueryContext context;
+        private QueryBindings bindings;
         private Row outerRow;
     }
 

=== modified file 'src/main/java/com/akiban/server/expression/subquery/ScalarSubqueryExpression.java'
--- src/main/java/com/akiban/server/expression/subquery/ScalarSubqueryExpression.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/server/expression/subquery/ScalarSubqueryExpression.java	2013-07-09 23:55:31 +0000
@@ -76,6 +76,7 @@
             if (row == null)
                 return NullValueSource.only();
             expressionEvaluation.of(queryContext());
+            expressionEvaluation.of(queryBindings());
             expressionEvaluation.of(row);
             // Make a copy of the value evaluated right now, rather
             // than holding on to the row from the subquery cursor

=== modified file 'src/main/java/com/akiban/server/expression/subquery/SubqueryExpressionEvaluation.java'
--- src/main/java/com/akiban/server/expression/subquery/SubqueryExpressionEvaluation.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/server/expression/subquery/SubqueryExpressionEvaluation.java	2013-07-09 23:55:31 +0000
@@ -20,6 +20,7 @@
 import com.akiban.qp.operator.API;
 import com.akiban.qp.operator.Cursor;
 import com.akiban.qp.operator.Operator;
+import com.akiban.qp.operator.QueryBindings;
 import com.akiban.qp.operator.QueryContext;
 import com.akiban.qp.row.Row;
 import com.akiban.qp.rowtype.RowType;
@@ -31,7 +32,13 @@
     @Override
     public void of(QueryContext context) {
         this.context = context;
-        this.cursor = API.cursor(subquery, context);
+        cursor = null;
+    }
+
+    @Override
+    public void of(QueryBindings bindings) {
+        this.bindings = bindings;
+        cursor = null;
     }
 
     @Override
@@ -45,7 +52,10 @@
 
     @Override
     public final ValueSource eval() {
-        context.setRow(bindingPosition, outerRow);
+        bindings.setRow(bindingPosition, outerRow);
+        if (cursor == null) {
+            cursor = API.cursor(subquery, context, bindings);
+        }
         cursor.open();
         try {
             return doEval();
@@ -88,6 +98,10 @@
         return context;
     }
 
+    protected QueryBindings queryBindings() {
+        return bindings;
+    }
+
     protected Row next() {
         Row row = cursor.next();
         if ((row != null) &&
@@ -113,6 +127,7 @@
     private final int bindingPosition;
     private Cursor cursor;
     private QueryContext context;
+    private QueryBindings bindings;
     private Row outerRow;
 
 }

=== modified file 'src/main/java/com/akiban/server/service/dxl/BasicDDLFunctions.java'
--- src/main/java/com/akiban/server/service/dxl/BasicDDLFunctions.java	2013-07-07 19:27:17 +0000
+++ src/main/java/com/akiban/server/service/dxl/BasicDDLFunctions.java	2013-07-09 23:55:31 +0000
@@ -50,6 +50,7 @@
 import com.akiban.ais.util.TableChangeValidatorException;
 import com.akiban.qp.operator.API;
 import com.akiban.qp.operator.Operator;
+import com.akiban.qp.operator.QueryBindings;
 import com.akiban.qp.operator.QueryContext;
 import com.akiban.qp.operator.QueryContextBase;
 import com.akiban.qp.operator.SimpleQueryContext;
@@ -292,12 +293,13 @@
             final RowType oldSourceType = oldSchema.userTableRowType(origTable);
             final StoreAdapter adapter = store().createAdapter(session, oldSchema);
             final QueryContext queryContext = new ShimContext(adapter, context);
+            final QueryBindings queryBindings = queryContext.createBindings();
 
             Operator plan = filter_Default(
                     groupScan_Default(origTable.getGroup()),
                     Collections.singleton(oldSourceType)
             );
-            com.akiban.qp.operator.Cursor cursor = API.cursor(plan, queryContext);
+            com.akiban.qp.operator.Cursor cursor = API.cursor(plan, queryContext, queryBindings);
 
             cursor.open();
             try {
@@ -369,6 +371,7 @@
         // Build transformation
         final StoreAdapter adapter = store().createAdapter(session, origSchema);
         final QueryContext queryContext = new ShimContext(adapter, context);
+        final QueryBindings queryBindings = queryContext.createBindings();
 
         final AkibanInformationSchema newAIS = getAIS(session);
         final UserTable newTable = newAIS.getUserTable(newDefinition.getName());
@@ -474,7 +477,7 @@
 
         for(UserTable root : roots) {
             Operator plan = groupScan_Default(root.getGroup());
-            com.akiban.qp.operator.Cursor cursor = API.cursor(plan, queryContext);
+            com.akiban.qp.operator.Cursor cursor = API.cursor(plan, queryContext, queryBindings);
             cursor.open();
             try {
                 Row oldRow;
@@ -486,6 +489,7 @@
                         newRow = new ProjectedRow(newTableType,
                                                   oldRow,
                                                   queryContext,
+                                                  queryBindings,
                                                   projections,
                                                   ProjectedRow.createTEvaluatableExpressions(pProjections),
                                                   TInstance.createTInstances(pProjections));

=== modified file 'src/main/java/com/akiban/server/service/externaldata/ExternalDataServiceImpl.java'
--- src/main/java/com/akiban/server/service/externaldata/ExternalDataServiceImpl.java	2013-06-12 21:51:17 +0000
+++ src/main/java/com/akiban/server/service/externaldata/ExternalDataServiceImpl.java	2013-07-09 23:55:31 +0000
@@ -25,10 +25,11 @@
 import com.akiban.qp.operator.API;
 import com.akiban.qp.operator.Cursor;
 import com.akiban.qp.operator.Operator;
+import com.akiban.qp.operator.QueryBindings;
 import com.akiban.qp.operator.QueryContext;
-import com.akiban.qp.rowtype.RowType;
 import com.akiban.qp.operator.SimpleQueryContext;
 import com.akiban.qp.operator.StoreAdapter;
+import com.akiban.qp.rowtype.RowType;
 import com.akiban.qp.rowtype.Schema;
 import com.akiban.server.api.dml.scan.NewRow;
 import com.akiban.server.api.DMLFunctions;
@@ -118,6 +119,7 @@
                     return serviceManager;
                 }
             };
+        QueryBindings queryBindings = queryContext.createBindings();
         JsonRowWriter json = new JsonRowWriter(new TableRowTracker(table, depth));
         WriteTableRow rowWriter = new WriteTableRow();
         AkibanAppender appender = AkibanAppender.of(writer);
@@ -128,7 +130,7 @@
                 transactionService.beginTransaction(session);
                 transaction = true;
             }
-            cursor = API.cursor(plan, queryContext);
+            cursor = API.cursor(plan, queryContext, queryBindings);
             appender.append("[");
             boolean begun = false;
 
@@ -140,7 +142,7 @@
                     for (int i = 0; i < key.size(); i++) {
                         String akey = key.get(i);
                         pvalue.putString(akey, null);
-                        queryContext.setPValue(i, pvalue);
+                        queryBindings.setPValue(i, pvalue);
                     }
                     if (json.writeRows(cursor, appender, begun ? ",\n" : "\n", rowWriter))
                         begun = true;

=== modified file 'src/main/java/com/akiban/server/service/restdml/DMLProcessor.java'
--- src/main/java/com/akiban/server/service/restdml/DMLProcessor.java	2013-06-11 16:32:59 +0000
+++ src/main/java/com/akiban/server/service/restdml/DMLProcessor.java	2013-07-09 23:55:31 +0000
@@ -24,6 +24,7 @@
 import com.akiban.ais.model.Column;
 import com.akiban.ais.model.TableName;
 import com.akiban.ais.model.UserTable;
+import com.akiban.qp.operator.QueryBindings;
 import com.akiban.qp.operator.QueryContext;
 import com.akiban.qp.operator.StoreAdapter;
 import com.akiban.qp.rowtype.Schema;
@@ -59,7 +60,7 @@
         return column;
     }
 
-    protected void setValue (QueryContext queryContext, Column column, String value) {
+    protected void setValue (QueryBindings queryBindings, Column column, String value) {
         PValue pvalue = null;
         if (value == null) {
             pvalue = new PValue(MString.varchar());
@@ -67,7 +68,7 @@
         } else {
             pvalue = new PValue(MString.varcharFor(value), value);
         }
-        queryContext.setPValue(column.getPosition(), pvalue);
+        queryBindings.setPValue(column.getPosition(), pvalue);
         
     }
 
@@ -81,6 +82,7 @@
         public TableName tableName;
         public UserTable table;
         public QueryContext queryContext;
+        public QueryBindings queryBindings;
         public Session session;
         public Map<Column, PValueSource> pkValues;
         public Map<Column, String> allValues;
@@ -94,20 +96,16 @@
             this.session = session;
             this.schema = SchemaCache.globalSchema(ais);
             this.table = getTable();
-            this.queryContext = newQueryContext(); 
+            this.queryContext = new RestQueryContext(getAdapter());
+            this.queryBindings = queryContext.createBindings();
             allValues = new HashMap<>();
+            setColumnsNull (queryBindings, table);
         }
      
         protected AkibanInformationSchema ais() {
             return ais;
         }
         
-        private QueryContext newQueryContext () {
-            QueryContext queryContext = new RestQueryContext(getAdapter());
-            setColumnsNull (queryContext, table);
-            return queryContext;
-        }
-        
         private StoreAdapter getAdapter() {
             // no writing to the memory tables. 
             if (table.hasMemoryTableFactory())
@@ -127,11 +125,11 @@
             }
             return table;
         }
-        protected void setColumnsNull (QueryContext queryContext, UserTable table) {
+        protected void setColumnsNull (QueryBindings queryBindings, UserTable table) {
             for (Column column : table.getColumns()) {
                 PValue pvalue = new PValue (column.tInstance());
                 pvalue.putNull();
-                queryContext.setPValue(column.getPosition(), pvalue);
+                queryBindings.setPValue(column.getPosition(), pvalue);
             }
         }
     }

=== modified file 'src/main/java/com/akiban/server/service/restdml/DeleteProcessor.java'
--- src/main/java/com/akiban/server/service/restdml/DeleteProcessor.java	2013-06-11 16:32:59 +0000
+++ src/main/java/com/akiban/server/service/restdml/DeleteProcessor.java	2013-07-09 23:55:31 +0000
@@ -67,13 +67,13 @@
 
         try {
             Operator delete = deleteGenerator.get(tableName);
-            cursor = API.cursor(delete, context.queryContext);
+            cursor = API.cursor(delete, context.queryContext, context.queryBindings);
 
             for (List<String> key : pks) {
                 for (int i = 0; i < key.size(); i++) {
                     String akey = key.get(i);
                     pvalue.putString(akey, null);
-                    context.queryContext.setPValue(i, pvalue);
+                    context.queryBindings.setPValue(i, pvalue);
                 }
     
                 cursor.open();

=== modified file 'src/main/java/com/akiban/server/service/restdml/InsertProcessor.java'
--- src/main/java/com/akiban/server/service/restdml/InsertProcessor.java	2013-06-11 16:32:59 +0000
+++ src/main/java/com/akiban/server/service/restdml/InsertProcessor.java	2013-07-09 23:55:31 +0000
@@ -143,9 +143,9 @@
     private void setValue (String field, JsonNode node, ProcessContext context) {
         Column column = getColumn (context.table, field);
         if (node.isNull()) {
-            setValue (context.queryContext, column, null);
+            setValue (context.queryBindings, column, null);
         } else {
-            setValue (context.queryContext, column, node.asText());
+            setValue (context.queryBindings, column, node.asText());
         }
     }
 
@@ -162,17 +162,17 @@
                 int pos = join.getMatchingChild(entry.getKey()).getPosition();
                 PValue fkValue = getFKPvalue (entry.getValue());
                 
-                if (context.queryContext.getPValue(pos).isNull()) {
-                    context.queryContext.setPValue(join.getMatchingChild(entry.getKey()).getPosition(), fkValue);
-                } else if (TClass.compare (context.queryContext.getPValue(pos).tInstance(), 
-                                context.queryContext.getPValue(pos),
+                if (context.queryBindings.getPValue(pos).isNull()) {
+                    context.queryBindings.setPValue(join.getMatchingChild(entry.getKey()).getPosition(), fkValue);
+                } else if (TClass.compare (context.queryBindings.getPValue(pos).tInstance(), 
+                                context.queryBindings.getPValue(pos),
                                 fkValue.tInstance(),
                                 fkValue) != 0) {
                     throw new FKValueMismatchException (join.getMatchingChild(entry.getKey()).getName());
                 }
             }
         }
-        Cursor cursor = API.cursor(insert, context.queryContext);
+        Cursor cursor = API.cursor(insert, context.queryContext, context.queryBindings);
         JsonRowWriter writer = new JsonRowWriter(new TableRowTracker(context.table, 0));
         WriteCapturePKRow rowWriter = new WriteCapturePKRow();
         writer.writeRows(cursor, appender, context.anyUpdates ? "\n" : "", rowWriter);

=== modified file 'src/main/java/com/akiban/server/service/restdml/ModelBuilder.java'
--- src/main/java/com/akiban/server/service/restdml/ModelBuilder.java	2013-06-11 16:32:59 +0000
+++ src/main/java/com/akiban/server/service/restdml/ModelBuilder.java	2013-07-09 23:55:31 +0000
@@ -27,6 +27,7 @@
 import com.akiban.qp.operator.API;
 import com.akiban.qp.operator.Cursor;
 import com.akiban.qp.operator.Operator;
+import com.akiban.qp.operator.QueryBindings;
 import com.akiban.qp.operator.QueryContext;
 import com.akiban.qp.operator.SimpleQueryContext;
 import com.akiban.qp.operator.StoreAdapter;
@@ -130,14 +131,15 @@
             List<List<String>> keys = PrimaryKeyParser.parsePrimaryKeys(identifiers, table.getPrimaryKey().getIndex());
             Operator plan = PlanGenerator.generateBranchPlan(ais, table);
             QueryContext context = queryContext(session, ais);
-            Cursor cursor = API.cursor(plan, context);
+            QueryBindings bindings = context.createBindings();
+            Cursor cursor = API.cursor(plan, context, bindings);
             boolean first = true;
             writer.append('[');
             for(List<String> pk : keys) {
                 for(int i = 0; i < pk.size(); i++) {
                     PValue pvalue = new PValue(MString.varchar());
                     pvalue.putString(pk.get(i), null);
-                    context.setPValue(i, pvalue);
+                    bindings.setPValue(i, pvalue);
                 }
                 first = scanCursor(writer, cursor, first);
             }
@@ -307,7 +309,8 @@
         );
         StoreAdapter adapter = store.createAdapter(session, schema);
         QueryContext queryContext = new SimpleQueryContext(adapter);
-        Cursor cursor = API.cursor(plan, queryContext);
+        QueryBindings queryBindings = queryContext.createBindings();
+        Cursor cursor = API.cursor(plan, queryContext, queryBindings);
         cursor.open();
         try {
             return cursor.next();
@@ -324,7 +327,9 @@
     private Cursor groupScanCursor(Session session, TableName tableName) {
         UserTable table = ddlFunctions.getUserTable(session, tableName);
         Operator plan = PlanGenerator.generateScanPlan(table.getAIS(), table);
-        return API.cursor(plan, queryContext(session, table.getAIS()));
+        QueryContext queryContext = queryContext(session, table.getAIS());
+        QueryBindings queryBindings = queryContext.createBindings();
+        return API.cursor(plan, queryContext, queryBindings);
     }
 
     private boolean scanCursor(PrintWriter writer, Cursor cursor, boolean first) throws IOException {

=== modified file 'src/main/java/com/akiban/server/service/restdml/UpsertProcessor.java'
--- src/main/java/com/akiban/server/service/restdml/UpsertProcessor.java	2013-06-11 16:32:59 +0000
+++ src/main/java/com/akiban/server/service/restdml/UpsertProcessor.java	2013-07-09 23:55:31 +0000
@@ -90,7 +90,7 @@
                 }
                 if (arrayElement.isObject()) {
                     processRow (arrayElement, appender, context);
-                    context.queryContext.clear();
+                    context.queryBindings.clear();
                     context.allValues.clear();
                 }
                 // else throw Bad Json Format Exception
@@ -151,10 +151,10 @@
                     return null;
                 }
                 pvalue.putString(context.allValues.get(column), null);
-                context.queryContext.setPValue(i, pvalue);
+                context.queryBindings.setPValue(i, pvalue);
                 i++;
             }
-            cursor = API.cursor(plan, context.queryContext);
+            cursor = API.cursor(plan, context.queryContext, context.queryBindings);
             cursor.open();
             return cursor.next();
         } finally {
@@ -179,14 +179,14 @@
                 } else {
                     pvalue.putString(context.allValues.get(column), null);
                 }
-                context.queryContext.setPValue(i, pvalue);
+                context.queryBindings.setPValue(i, pvalue);
                 upList.add(column);
                 i++;
             }
         }
         
         Operator update = updateGenerator.create(context.tableName,upList);
-        Cursor cursor = API.cursor(update, context.queryContext);
+        Cursor cursor = API.cursor(update, context.queryContext, context.queryBindings);
         JsonRowWriter writer = new JsonRowWriter(new TableRowTracker(context.table, 0));
         WriteCapturePKRow rowWriter = new WriteCapturePKRow();
         writer.writeRows(cursor, appender, "\n", rowWriter);

=== modified file 'src/main/java/com/akiban/server/service/restdml/UpsertRowUpdateFunction.java'
--- src/main/java/com/akiban/server/service/restdml/UpsertRowUpdateFunction.java	2013-04-12 04:21:35 +0000
+++ src/main/java/com/akiban/server/service/restdml/UpsertRowUpdateFunction.java	2013-07-09 23:55:31 +0000
@@ -18,6 +18,7 @@
 
 import java.util.List;
 
+import com.akiban.qp.operator.QueryBindings;
 import com.akiban.qp.operator.QueryContext;
 import com.akiban.qp.operator.UpdateFunction;
 import com.akiban.qp.row.OverlayingRow;
@@ -53,7 +54,7 @@
     }
 
     @Override
-    public Row evaluate(Row original, QueryContext context) {
+    public Row evaluate(Row original, QueryContext context, QueryBindings bindings) {
         OverlayingRow result = new OverlayingRow(original, pExpressions != null);
         int nfields = rowType.nFields();
         for (int i = 0; i < nfields; i++) {
@@ -62,6 +63,7 @@
                 TEvaluatableExpression evaluation = expression.build();
                 evaluation.with(original);
                 evaluation.with(context);
+                evaluation.with(bindings);
                 evaluation.evaluate();
                 result.overlay(i, evaluation.resultValue());
             }

=== modified file 'src/main/java/com/akiban/server/service/text/FullTextIndexServiceImpl.java'
--- src/main/java/com/akiban/server/service/text/FullTextIndexServiceImpl.java	2013-07-02 21:57:02 +0000
+++ src/main/java/com/akiban/server/service/text/FullTextIndexServiceImpl.java	2013-07-09 23:55:31 +0000
@@ -25,6 +25,7 @@
 import com.akiban.qp.operator.API;
 import com.akiban.qp.operator.Cursor;
 import com.akiban.qp.operator.Operator;
+import com.akiban.qp.operator.QueryBindings;
 import com.akiban.qp.operator.QueryContext;
 import com.akiban.qp.operator.SimpleQueryContext;
 import com.akiban.qp.operator.StoreAdapter;
@@ -252,12 +253,13 @@
         if (adapter == null)
             adapter = store.createAdapter(session, index.getSchema());
         QueryContext queryContext = new SimpleQueryContext(adapter);
+        QueryBindings queryBindings = queryContext.createBindings();
         IndexWriter writer = indexer.getWriter();
 
         Cursor cursor = null;
         boolean success = false;
         try(RowIndexer rowIndexer = new RowIndexer(index, writer, false)) {
-            cursor = API.cursor(plan, queryContext);
+            cursor = API.cursor(plan, queryContext, queryBindings);
             long count = rowIndexer.indexRows(cursor);
             writer.commit();
             success = true;
@@ -284,6 +286,7 @@
             if (adapter == null)
                 adapter = store.createAdapter(session, indexInfo.getSchema());
             QueryContext queryContext = new SimpleQueryContext(adapter);
+            QueryBindings queryBindings = queryContext.createBindings();
             HKeyCache<com.akiban.qp.row.HKey> cache = new HKeyCache<>(adapter);
             IndexWriter writer = indexInfo.getIndexer().getWriter();
 
@@ -296,8 +299,8 @@
                 while(it.hasNext()) {
                     byte[] row = it.next();
                     HKeyRow hkeyRow = toHKeyRow(row, indexInfo.getHKeyRowType(), adapter, cache);
-                    queryContext.setRow(0, hkeyRow);
-                    cursor = API.cursor(operator, queryContext);
+                    queryBindings.setRow(0, hkeyRow);
+                    cursor = API.cursor(operator, queryContext, queryBindings);
                     rowIndexer.updateDocument(cursor, row);
                     it.remove();
                 }

=== modified file 'src/main/java/com/akiban/server/service/text/FullTextQueryBuilder.java'
--- src/main/java/com/akiban/server/service/text/FullTextQueryBuilder.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/server/service/text/FullTextQueryBuilder.java	2013-07-09 23:55:31 +0000
@@ -21,6 +21,7 @@
 import com.akiban.ais.model.FullTextIndex;
 import com.akiban.ais.model.IndexColumn;
 import com.akiban.ais.model.IndexName;
+import com.akiban.qp.operator.QueryBindings;
 import com.akiban.qp.operator.QueryContext;
 import com.akiban.qp.rowtype.RowType;
 import com.akiban.qp.rowtype.Schema;
@@ -103,7 +104,7 @@
         }
 
         @Override
-        public Query getQuery(QueryContext context) {
+        public Query getQuery(QueryContext context, QueryBindings bindings) {
             return query;
         }
 
@@ -137,7 +138,7 @@
         }
         return new FullTextQueryExpression() {
                 @Override
-                public Query getQuery(QueryContext context) {
+                public Query getQuery(QueryContext context, QueryBindings bindings) {
                     return infos.parseQuery(context, indexName, fieldName, query);
                 }
 
@@ -160,9 +161,10 @@
         final String fieldName = (defaultField == null) ? null : defaultField.getColumn().getName();
         return new FullTextQueryExpression() {
                 @Override
-                public Query getQuery(QueryContext context) {
+                public Query getQuery(QueryContext context, QueryBindings bindings) {
                     TEvaluatableExpression qeval = qexpr.build();
                     qeval.with(context);
+                    qeval.with(bindings);
                     qeval.evaluate();
                     if (qeval.resultValue().isNull())
                         return null;
@@ -195,9 +197,10 @@
         final String fieldName = checkFieldForMatch(field);
         return new FullTextQueryExpression() {
                 @Override
-                public Query getQuery(QueryContext context) {
+                public Query getQuery(QueryContext context, QueryBindings bindings) {
                     TEvaluatableExpression qeval = qexpr.build();
                     qeval.with(context);
+                    qeval.with(bindings);
                     qeval.evaluate();
                     if (qeval.resultValue().isNull())
                         return null;
@@ -243,7 +246,7 @@
         FullTextQueryExpression result = 
             new FullTextQueryExpression() {
                 @Override
-                public Query getQuery(QueryContext context) {
+                public Query getQuery(QueryContext context, QueryBindings bindings) {
                     BooleanQuery query = new BooleanQuery();
                     for (int i = 0; i < queries.size(); i++) {
                         BooleanClause.Occur occur;
@@ -260,7 +263,7 @@
                         default:
                             throw new IllegalArgumentException(types.get(i).toString());
                         }
-                        query.add(queries.get(i).getQuery(context), occur);
+                        query.add(queries.get(i).getQuery(context, bindings), occur);
                     }
                     return query;
                 }
@@ -281,7 +284,7 @@
                 }
             };
         if (isConstant) {
-            return new Constant(result.getQuery(buildContext));
+            return new Constant(result.getQuery(buildContext, null));
         }
         else {
             return result;

=== modified file 'src/main/java/com/akiban/server/service/text/FullTextQueryExpression.java'
--- src/main/java/com/akiban/server/service/text/FullTextQueryExpression.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/server/service/text/FullTextQueryExpression.java	2013-07-09 23:55:31 +0000
@@ -17,6 +17,7 @@
 
 package com.akiban.server.service.text;
 
+import com.akiban.qp.operator.QueryBindings;
 import com.akiban.qp.operator.QueryContext;
 import com.akiban.server.explain.Explainable;
 
@@ -26,5 +27,5 @@
  * parsed from a string, or built up from expressions.
  */
 public interface FullTextQueryExpression extends Explainable {
-    public Query getQuery(QueryContext context);
+    public Query getQuery(QueryContext context, QueryBindings bindings);
 }

=== modified file 'src/main/java/com/akiban/server/service/text/IndexScan_FullText.java'
--- src/main/java/com/akiban/server/service/text/IndexScan_FullText.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/server/service/text/IndexScan_FullText.java	2013-07-09 23:55:31 +0000
@@ -20,6 +20,7 @@
 import com.akiban.ais.model.IndexName;
 import com.akiban.qp.operator.Cursor;
 import com.akiban.qp.operator.Operator;
+import com.akiban.qp.operator.QueryBindings;
 import com.akiban.qp.operator.QueryContext;
 import com.akiban.qp.rowtype.RowType;
 import com.akiban.server.explain.*;
@@ -52,8 +53,8 @@
     }
 
     @Override
-    protected Cursor cursor(QueryContext context) {
-        Query query = queryExpression.getQuery(context);
+    protected Cursor cursor(QueryContext context, QueryBindings bindings) {
+        Query query = queryExpression.getQuery(context, bindings);
         FullTextIndexService service = context.getServiceManager().getServiceByClass(FullTextIndexService.class);
         return service.searchIndex(context, index, query, limit);
     }

=== modified file 'src/main/java/com/akiban/server/store/AbstractStore.java'
--- src/main/java/com/akiban/server/store/AbstractStore.java	2013-07-07 19:27:17 +0000
+++ src/main/java/com/akiban/server/store/AbstractStore.java	2013-07-09 23:55:31 +0000
@@ -34,6 +34,7 @@
 import com.akiban.qp.operator.Cursor;
 import com.akiban.qp.operator.GroupCursor;
 import com.akiban.qp.operator.Operator;
+import com.akiban.qp.operator.QueryBindings;
 import com.akiban.qp.operator.QueryContext;
 import com.akiban.qp.operator.SimpleQueryContext;
 import com.akiban.qp.operator.StoreAdapter;
@@ -758,9 +759,10 @@
         }
         if(!groupIndexes.isEmpty()) {
             QueryContext context = new SimpleQueryContext(adapter);
+            QueryBindings bindings = context.createBindings();
             for(GroupIndex groupIndex : groupIndexes) {
                 runMaintenancePlan(
-                        context,
+                        context, bindings,
                         groupIndex,
                         StoreGIMaintenancePlans.groupIndexCreationPlan(adapter.schema(), groupIndex),
                         StoreGIHandler.forBuilding(this, adapter),
@@ -1192,14 +1194,15 @@
         Operator plan = PlanGenerator.generateBranchPlan(ais, uTable);
 
         QueryContext queryContext = new SimpleQueryContext(adapter);
-        Cursor cursor = API.cursor(plan, queryContext);
+        QueryBindings queryBindings = queryContext.createBindings();
+        Cursor cursor = API.cursor(plan, queryContext, queryBindings);
 
         List<Column> lookupCols = uTable.getPrimaryKeyIncludingInternal().getColumns();
         RowDataPValueSource pSource = new RowDataPValueSource();
         for(int i = 0; i < lookupCols.size(); ++i) {
             Column col = lookupCols.get(i);
             pSource.bind(col.getFieldDef(), rowData);
-            queryContext.setPValue(i, pSource);
+            queryBindings.setPValue(i, pSource);
         }
         try {
             Row row;
@@ -1288,11 +1291,12 @@
     }
 
     private static void runMaintenancePlan(QueryContext context,
+                                           QueryBindings bindings,
                                            GroupIndex groupIndex,
                                            Operator rootOperator,
                                            StoreGIHandler handler,
                                            StoreGIHandler.Action action) {
-        Cursor cursor = API.cursor(rootOperator, context);
+        Cursor cursor = API.cursor(rootOperator, context, bindings);
         cursor.open();
         try {
             Row row;

=== modified file 'src/main/java/com/akiban/server/store/StoreGIMaintenance.java'
--- src/main/java/com/akiban/server/store/StoreGIMaintenance.java	2013-06-21 23:27:44 +0000
+++ src/main/java/com/akiban/server/store/StoreGIMaintenance.java	2013-07-09 23:55:31 +0000
@@ -25,6 +25,7 @@
 import com.akiban.qp.operator.API;
 import com.akiban.qp.operator.Cursor;
 import com.akiban.qp.operator.Operator;
+import com.akiban.qp.operator.QueryBindings;
 import com.akiban.qp.operator.QueryContext;
 import com.akiban.qp.operator.SimpleQueryContext;
 import com.akiban.qp.operator.StoreAdapter;
@@ -65,9 +66,10 @@
             if (planOperator == null)
                 return;
             QueryContext context = new SimpleQueryContext(adapter);
+            QueryBindings bindings = context.createBindings();
             List<Column> lookupCols = rowType.userTable().getPrimaryKeyIncludingInternal().getColumns();
 
-            context.setHKey(StoreGIMaintenance.HKEY_BINDING_POSITION, hKey);
+            bindings.setHKey(StoreGIMaintenance.HKEY_BINDING_POSITION, hKey);
 
             // Copy the values into the array bindings
             RowDataValueSource source = new RowDataValueSource();
@@ -79,10 +81,10 @@
                 source.bind(col.getFieldDef(), forRow);
 
                 // New types
-                if (Types3Switch.ON) context.setPValue(bindingsIndex, pSource);
-                else context.setValue(bindingsIndex, source);
+                if (Types3Switch.ON) bindings.setPValue(bindingsIndex, pSource);
+                else bindings.setValue(bindingsIndex, source);
             }
-            cursor = API.cursor(planOperator, context);
+            cursor = API.cursor(planOperator, context, bindings);
             RUN_TAP.in();
             runTapEntered = true;
             cursor.open();
@@ -98,7 +100,7 @@
                     Index.JoinType giJoin = groupIndex.getJoinType();
                     switch (giJoin) {
                     case LEFT:
-                        if (row.rowType().equals(storePlan.leftHalf) && useInvertType(action, context) &&
+                        if (row.rowType().equals(storePlan.leftHalf) && useInvertType(action, context, bindings) &&
                                 !skipCascadeRow(action, row, handler)) {
                             Row outerRow = new FlattenedRow(storePlan.topLevelFlattenType, row, null, row.hKey());
                             doAction(invert(action), handler, outerRow);
@@ -106,7 +108,7 @@
                         }
                         break;
                     case RIGHT:
-                        if (row.rowType().equals(storePlan.rightHalf) && useInvertType(action, context) &&
+                        if (row.rowType().equals(storePlan.rightHalf) && useInvertType(action, context, bindings) &&
                                 !skipCascadeRow(action, row, handler)) {
                             Row outerRow = new FlattenedRow(storePlan.topLevelFlattenType, null, row, row.hKey());
                             doAction(invert(action), handler, outerRow);
@@ -144,7 +146,7 @@
                row.rowType().typeComposition().tables().contains(handler.getSourceTable());
     }
 
-    private boolean useInvertType(StoreGIHandler.Action action, QueryContext context) {
+    private boolean useInvertType(StoreGIHandler.Action action, QueryContext context, QueryBindings bindings) {
         switch (groupIndex.getJoinType()) {
         case LEFT:
             switch (action) {
@@ -155,7 +157,7 @@
             case DELETE:
                 if (siblingsLookup == null)
                     return false;
-                Cursor siblingsCounter = API.cursor(siblingsLookup, context);
+                Cursor siblingsCounter = API.cursor(siblingsLookup, context, bindings);
                 SIBLING_ALL_TAP.in();
                 try {
                     siblingsCounter.open();

=== modified file 'src/main/java/com/akiban/server/types3/texpressions/AnySubqueryTExpression.java'
--- src/main/java/com/akiban/server/types3/texpressions/AnySubqueryTExpression.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/server/types3/texpressions/AnySubqueryTExpression.java	2013-07-09 23:55:31 +0000
@@ -61,6 +61,7 @@
         @Override
         protected void doEval(PValueTarget out) {
             evaluation.with(queryContext());
+            evaluation.with(queryBindings());
             Boolean result = Boolean.FALSE;
             while (true) {
                 Row row = next();

=== modified file 'src/main/java/com/akiban/server/types3/texpressions/ContextualEvaluation.java'
--- src/main/java/com/akiban/server/types3/texpressions/ContextualEvaluation.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/server/types3/texpressions/ContextualEvaluation.java	2013-07-09 23:55:31 +0000
@@ -17,6 +17,7 @@
 
 package com.akiban.server.types3.texpressions;
 
+import com.akiban.qp.operator.QueryBindings;
 import com.akiban.qp.operator.QueryContext;
 import com.akiban.qp.row.Row;
 import com.akiban.server.types3.TInstance;
@@ -35,6 +36,10 @@
     }
 
     @Override
+    public void with(QueryBindings bindings) {
+    }
+
+    @Override
     public PValueSource resultValue() {
         if (readyValue == null)
             throw new IllegalStateException("haven't evaluated since having seen a new context");

=== modified file 'src/main/java/com/akiban/server/types3/texpressions/ResultSetSubqueryTExpression.java'
--- src/main/java/com/akiban/server/types3/texpressions/ResultSetSubqueryTExpression.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/server/types3/texpressions/ResultSetSubqueryTExpression.java	2013-07-09 23:55:31 +0000
@@ -20,6 +20,7 @@
 import com.akiban.qp.operator.API;
 import com.akiban.qp.operator.Cursor;
 import com.akiban.qp.operator.Operator;
+import com.akiban.qp.operator.QueryBindings;
 import com.akiban.qp.operator.QueryContext;
 import com.akiban.qp.row.Row;
 import com.akiban.qp.rowtype.RowType;
@@ -39,8 +40,8 @@
 
         @Override
         public void evaluate() {
-            context.setRow(bindingPosition, outerRow);
-            Cursor cursor = API.cursor(subquery, context);
+            bindings.setRow(bindingPosition, outerRow);
+            Cursor cursor = API.cursor(subquery, context, bindings);
             cursor.open();
             pvalue.putObject(cursor);
         }
@@ -59,6 +60,11 @@
             this.context = context;
         }
 
+        @Override
+        public void with(QueryBindings bindings) {
+            this.bindings = bindings;
+        }
+
         InnerEvaluation(Operator subquery, RowType outerRowType, int bindingPosition)
         {
             this.subquery = subquery;
@@ -72,6 +78,7 @@
         private final int bindingPosition;
         private final PValue pvalue;
         private QueryContext context;
+        private QueryBindings bindings;
         private Row outerRow;
     }
 

=== modified file 'src/main/java/com/akiban/server/types3/texpressions/ScalarSubqueryTExpression.java'
--- src/main/java/com/akiban/server/types3/texpressions/ScalarSubqueryTExpression.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/server/types3/texpressions/ScalarSubqueryTExpression.java	2013-07-09 23:55:31 +0000
@@ -52,6 +52,7 @@
                 TEvaluatableExpression eval = expression.build();
                 
                 eval.with(queryContext());
+                eval.with(queryBindings());
                 eval.with(row);
 
                 // evaluate the result

=== modified file 'src/main/java/com/akiban/server/types3/texpressions/SubqueryTEvaluateble.java'
--- src/main/java/com/akiban/server/types3/texpressions/SubqueryTEvaluateble.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/server/types3/texpressions/SubqueryTEvaluateble.java	2013-07-09 23:55:31 +0000
@@ -20,6 +20,7 @@
 import com.akiban.qp.operator.API;
 import com.akiban.qp.operator.Cursor;
 import com.akiban.qp.operator.Operator;
+import com.akiban.qp.operator.QueryBindings;
 import com.akiban.qp.operator.QueryContext;
 import com.akiban.qp.row.Row;
 import com.akiban.qp.rowtype.RowType;
@@ -38,7 +39,10 @@
 
     @Override
     public void evaluate() {
-        context.setRow(bindingPosition, outerRow);
+        bindings.setRow(bindingPosition, outerRow);
+        if (cursor == null) {
+            cursor = API.cursor(subquery, context, bindings);
+        }
         cursor.open();
         try {
             doEval(pvalue);
@@ -60,7 +64,13 @@
     @Override
     public void with(QueryContext context) {
         this.context = context;
-        this.cursor = API.cursor(subquery, context);
+        cursor = null;
+    }
+
+    @Override
+    public void with(QueryBindings bindings) {
+        this.bindings = bindings;
+        cursor = null;
     }
 
     protected abstract void doEval(PValueTarget out);
@@ -69,6 +79,10 @@
         return context;
     }
 
+    protected QueryBindings queryBindings() {
+        return bindings;
+    }
+
     protected Row next() {
         Row row = cursor.next();
         if ((row != null) &&
@@ -96,5 +110,6 @@
     private final PValue pvalue;
     private Cursor cursor;
     private QueryContext context;
+    private QueryBindings bindings;
     private Row outerRow;
 }

=== modified file 'src/main/java/com/akiban/server/types3/texpressions/TCastExpression.java'
--- src/main/java/com/akiban/server/types3/texpressions/TCastExpression.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/server/types3/texpressions/TCastExpression.java	2013-07-09 23:55:31 +0000
@@ -17,6 +17,7 @@
 
 package com.akiban.server.types3.texpressions;
 
+import com.akiban.qp.operator.QueryBindings;
 import com.akiban.qp.operator.QueryContext;
 import com.akiban.qp.row.Row;
 import com.akiban.server.explain.*;
@@ -125,6 +126,11 @@
             this.executionContext.setQueryContext(context);
         }
 
+        @Override
+        public void with(QueryBindings bindings) {
+            inputEval.with(bindings);
+        }
+
         private CastEvaluation(TEvaluatableExpression inputEval, TCast cast,
                                TInstance sourceInstance, TInstance targetInstance, QueryContext preptimeContext)
         {

=== modified file 'src/main/java/com/akiban/server/types3/texpressions/TComparisonExpressionBase.java'
--- src/main/java/com/akiban/server/types3/texpressions/TComparisonExpressionBase.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/server/types3/texpressions/TComparisonExpressionBase.java	2013-07-09 23:55:31 +0000
@@ -17,6 +17,7 @@
 
 package com.akiban.server.types3.texpressions;
 
+import com.akiban.qp.operator.QueryBindings;
 import com.akiban.qp.operator.QueryContext;
 import com.akiban.qp.row.Row;
 import com.akiban.server.explain.*;
@@ -172,6 +173,12 @@
             right.with(context);
         }
 
+        @Override
+        public void with(QueryBindings bindings) {
+            left.with(bindings);
+            right.with(bindings);
+        }
+
         private CompareEvaluation(TInstance leftInstance, TEvaluatableExpression left,
                                   TInstance rightInstance, TEvaluatableExpression right)
         {

=== modified file 'src/main/java/com/akiban/server/types3/texpressions/TEvaluatableExpression.java'
--- src/main/java/com/akiban/server/types3/texpressions/TEvaluatableExpression.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/server/types3/texpressions/TEvaluatableExpression.java	2013-07-09 23:55:31 +0000
@@ -17,6 +17,7 @@
 
 package com.akiban.server.types3.texpressions;
 
+import com.akiban.qp.operator.QueryBindings;
 import com.akiban.qp.operator.QueryContext;
 import com.akiban.qp.row.Row;
 import com.akiban.server.types3.pvalue.PValueSource;
@@ -29,4 +30,5 @@
 
     void with(Row row);
     void with(QueryContext context);
+    void with(QueryBindings bindings);
 }

=== modified file 'src/main/java/com/akiban/server/types3/texpressions/TNullExpression.java'
--- src/main/java/com/akiban/server/types3/texpressions/TNullExpression.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/server/types3/texpressions/TNullExpression.java	2013-07-09 23:55:31 +0000
@@ -17,6 +17,7 @@
 
 package com.akiban.server.types3.texpressions;
 
+import com.akiban.qp.operator.QueryBindings;
 import com.akiban.qp.operator.QueryContext;
 import com.akiban.qp.row.Row;
 import com.akiban.server.explain.*;
@@ -81,6 +82,10 @@
         public void with(QueryContext context) {
         }
 
+        @Override
+        public void with(QueryBindings bindings) {
+        }
+
         private InnerEvaluation(TInstance underlying) {
             this.valueSource = PValueSources.getNullSource(underlying);
         }

=== modified file 'src/main/java/com/akiban/server/types3/texpressions/TPreparedBoundField.java'
--- src/main/java/com/akiban/server/types3/texpressions/TPreparedBoundField.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/server/types3/texpressions/TPreparedBoundField.java	2013-07-09 23:55:31 +0000
@@ -17,6 +17,7 @@
 
 package com.akiban.server.types3.texpressions;
 
+import com.akiban.qp.operator.QueryBindings;
 import com.akiban.qp.operator.QueryContext;
 import com.akiban.qp.row.Row;
 import com.akiban.qp.rowtype.RowType;
@@ -86,7 +87,11 @@
 
         @Override
         public void with(QueryContext context) {
-            fieldEvaluation.with(context.getRow(rowPosition));
+        }
+
+        @Override
+        public void with(QueryBindings bindings) {
+            fieldEvaluation.with(bindings.getRow(rowPosition));
         }
 
         private InnerEvaluation(TEvaluatableExpression fieldEvaluation, int rowPosition) {

=== modified file 'src/main/java/com/akiban/server/types3/texpressions/TPreparedFunction.java'
--- src/main/java/com/akiban/server/types3/texpressions/TPreparedFunction.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/server/types3/texpressions/TPreparedFunction.java	2013-07-09 23:55:31 +0000
@@ -17,6 +17,7 @@
 
 package com.akiban.server.types3.texpressions;
 
+import com.akiban.qp.operator.QueryBindings;
 import com.akiban.qp.operator.QueryContext;
 import com.akiban.qp.row.Row;
 import com.akiban.server.explain.*;
@@ -132,6 +133,15 @@
         }
 
         @Override
+        public void with(QueryBindings bindings) {
+            for (int i = 0, inputsSize = inputs.size(); i < inputsSize; i++) {
+                TEvaluatableExpression input = inputs.get(i);
+                input.with(bindings);
+                inputValues[i] = null;
+            }
+        }
+
+        @Override
         public PValueSource resultValue() {
             return resultValue;
         }

=== modified file 'src/main/java/com/akiban/server/types3/texpressions/TPreparedLiteral.java'
--- src/main/java/com/akiban/server/types3/texpressions/TPreparedLiteral.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/server/types3/texpressions/TPreparedLiteral.java	2013-07-09 23:55:31 +0000
@@ -17,6 +17,7 @@
 
 package com.akiban.server.types3.texpressions;
 
+import com.akiban.qp.operator.QueryBindings;
 import com.akiban.qp.operator.QueryContext;
 import com.akiban.qp.row.Row;
 import com.akiban.server.explain.*;
@@ -102,6 +103,10 @@
         public void with(QueryContext context) {
         }
 
+        @Override
+        public void with(QueryBindings bindings) {
+        }
+
         private Evaluation(PValueSource value) {
             this.value = value;
         }

=== modified file 'src/main/java/com/akiban/server/types3/texpressions/TPreparedParameter.java'
--- src/main/java/com/akiban/server/types3/texpressions/TPreparedParameter.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/server/types3/texpressions/TPreparedParameter.java	2013-07-09 23:55:31 +0000
@@ -17,6 +17,7 @@
 
 package com.akiban.server.types3.texpressions;
 
+import com.akiban.qp.operator.QueryBindings;
 import com.akiban.qp.operator.QueryContext;
 import com.akiban.qp.row.Row;
 import com.akiban.server.explain.*;
@@ -78,7 +79,7 @@
         public void evaluate() {
             if (!pValue.hasAnyValue()) { // only need to compute this once
                 TClass tClass = tInstance.typeClass();
-                PValueSource inSource = context.getPValue(position);
+                PValueSource inSource = bindings.getPValue(position);
                 // TODO need a better execution context thinger
                 TExecutionContext executionContext = new TExecutionContext(
                         null,
@@ -102,6 +103,11 @@
             this.context = context;
         }
 
+        @Override
+        public void with(QueryBindings bindings) {
+            this.bindings = bindings;
+        }
+
         private InnerEvaluation(int position, TInstance tInstance) {
             this.position = position;
             this.tInstance = tInstance;
@@ -111,6 +117,7 @@
         private final int position;
         private final PValue pValue;
         private QueryContext context;
+        private QueryBindings bindings;
         private final TInstance tInstance;
     }
 }

=== modified file 'src/main/java/com/akiban/sql/embedded/ExecutableDDLStatement.java'
--- src/main/java/com/akiban/sql/embedded/ExecutableDDLStatement.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/sql/embedded/ExecutableDDLStatement.java	2013-07-09 23:55:31 +0000
@@ -17,6 +17,8 @@
 
 package com.akiban.sql.embedded;
 
+import com.akiban.qp.operator.QueryBindings;
+
 import com.akiban.sql.aisddl.AISDDL;
 import com.akiban.sql.parser.DDLStatementNode;
 import static com.akiban.server.service.dxl.DXLFunctionsHook.DXLFunction;
@@ -32,7 +34,7 @@
     }
 
     @Override
-    public ExecuteResults execute(EmbeddedQueryContext context) {
+    public ExecuteResults execute(EmbeddedQueryContext context, QueryBindings bindings) {
         context.lock(DXLFunction.UNSPECIFIED_DDL_WRITE);
         try {
             AISDDL.execute(ddl, sql, context);

=== modified file 'src/main/java/com/akiban/sql/embedded/ExecutableJavaMethod.java'
--- src/main/java/com/akiban/sql/embedded/ExecutableJavaMethod.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/sql/embedded/ExecutableJavaMethod.java	2013-07-09 23:55:31 +0000
@@ -21,6 +21,8 @@
 import com.akiban.sql.server.ServerJavaMethod;
 import com.akiban.sql.server.ServerJavaRoutine;
 
+import com.akiban.qp.operator.QueryBindings;
+
 import java.lang.reflect.Method;
 
 class ExecutableJavaMethod extends ExecutableJavaRoutine
@@ -44,8 +46,8 @@
     }
 
     @Override
-    protected ServerJavaRoutine javaRoutine(EmbeddedQueryContext context) {
-        return new ServerJavaMethod(context, invocation, method);
+    protected ServerJavaRoutine javaRoutine(EmbeddedQueryContext context, QueryBindings bindings) {
+        return new ServerJavaMethod(context, bindings, invocation, method);
     }
     
 }

=== modified file 'src/main/java/com/akiban/sql/embedded/ExecutableJavaRoutine.java'
--- src/main/java/com/akiban/sql/embedded/ExecutableJavaRoutine.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/sql/embedded/ExecutableJavaRoutine.java	2013-07-09 23:55:31 +0000
@@ -21,6 +21,8 @@
 import com.akiban.sql.server.ServerJavaRoutine;
 import com.akiban.sql.server.ServerCallContextStack;
 
+import com.akiban.qp.operator.QueryBindings;
+
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.Queue;
@@ -33,12 +35,12 @@
         super(invocation, parameterMetaData);
     }
 
-    protected abstract ServerJavaRoutine javaRoutine(EmbeddedQueryContext context);
+    protected abstract ServerJavaRoutine javaRoutine(EmbeddedQueryContext context, QueryBindings bindings);
 
     @Override
-    public ExecuteResults execute(EmbeddedQueryContext context) {
+    public ExecuteResults execute(EmbeddedQueryContext context, QueryBindings bindings) {
         Queue<ResultSet> resultSets = null;
-        ServerJavaRoutine call = javaRoutine(context);
+        ServerJavaRoutine call = javaRoutine(context, bindings);
         call.push();
         boolean success = false;
         try {

=== modified file 'src/main/java/com/akiban/sql/embedded/ExecutableLoadableOperator.java'
--- src/main/java/com/akiban/sql/embedded/ExecutableLoadableOperator.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/sql/embedded/ExecutableLoadableOperator.java	2013-07-09 23:55:31 +0000
@@ -21,6 +21,8 @@
 
 import com.akiban.qp.loadableplan.LoadableOperator;
 import com.akiban.qp.loadableplan.LoadablePlan;
+import com.akiban.qp.operator.QueryBindings;
+import com.akiban.qp.operator.SparseArrayQueryBindings;
 import com.akiban.server.error.UnsupportedSQLException;
 import com.akiban.server.types3.TInstance;
 import com.akiban.server.types3.Types3Switch;
@@ -61,11 +63,11 @@
     }
     
     @Override
-    public ExecuteResults execute(EmbeddedQueryContext context) {
-        context = setParameters(context, invocation);
+    public ExecuteResults execute(EmbeddedQueryContext context, QueryBindings bindings) {
+        bindings = setParameters(bindings, invocation);
         ServerCallContextStack.push(context, invocation);
         try {
-            return super.execute(context);
+            return super.execute(context, bindings);
         }
         finally {
             ServerCallContextStack.pop(context, invocation);
@@ -88,19 +90,18 @@
         return new JDBCResultSetMetaData(columns);
     }
 
-    protected static EmbeddedQueryContext setParameters(EmbeddedQueryContext context, ServerCallInvocation invocation) {
+    protected static QueryBindings setParameters(QueryBindings bindings, ServerCallInvocation invocation) {
         if (!invocation.parametersInOrder()) {
             if (invocation.hasParameters()) {
-                EmbeddedQueryContext calleeContext = 
-                    new EmbeddedQueryContext(context.getServer());
-                invocation.copyParameters(context, calleeContext, Types3Switch.ON);
-                context = calleeContext;
+                QueryBindings calleeBindings = new SparseArrayQueryBindings();
+                invocation.copyParameters(bindings, calleeBindings, Types3Switch.ON);
+                bindings = calleeBindings;
             }
             else {
-                invocation.copyParameters(null, context, Types3Switch.ON);
+                invocation.copyParameters(null, bindings, Types3Switch.ON);
             }
         }
-        return context;
+        return bindings;
     }
 
 }

=== modified file 'src/main/java/com/akiban/sql/embedded/ExecutableModifyOperatorStatement.java'
--- src/main/java/com/akiban/sql/embedded/ExecutableModifyOperatorStatement.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/sql/embedded/ExecutableModifyOperatorStatement.java	2013-07-09 23:55:31 +0000
@@ -21,6 +21,7 @@
 import com.akiban.qp.operator.Cursor;
 import com.akiban.qp.operator.CursorLifecycle;
 import com.akiban.qp.operator.Operator;
+import com.akiban.qp.operator.QueryBindings;
 import com.akiban.qp.row.ImmutableRow;
 import com.akiban.qp.row.ProjectedRow;
 import com.akiban.qp.row.Row;
@@ -51,7 +52,7 @@
     }
     
     @Override
-    public ExecuteResults execute(EmbeddedQueryContext context) {
+    public ExecuteResults execute(EmbeddedQueryContext context, QueryBindings bindings) {
         int updateCount = 0;
         SpoolCursor  returningRows = null;
         if (resultSetMetaData != null)
@@ -63,7 +64,7 @@
         Cursor cursor = null;
         RuntimeException runtimeException = null;
         try {
-            cursor = API.cursor(resultOperator, context);
+            cursor = API.cursor(resultOperator, context, bindings);
             cursor.open();
             Row row;
             while ((row = cursor.next()) != null) {

=== modified file 'src/main/java/com/akiban/sql/embedded/ExecutableQueryOperatorStatement.java'
--- src/main/java/com/akiban/sql/embedded/ExecutableQueryOperatorStatement.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/sql/embedded/ExecutableQueryOperatorStatement.java	2013-07-09 23:55:31 +0000
@@ -20,6 +20,7 @@
 import com.akiban.qp.operator.API;
 import com.akiban.qp.operator.Cursor;
 import com.akiban.qp.operator.Operator;
+import com.akiban.qp.operator.QueryBindings;
 import com.akiban.sql.optimizer.plan.CostEstimate;
 
 class ExecutableQueryOperatorStatement extends ExecutableOperatorStatement
@@ -35,10 +36,10 @@
     }
     
     @Override
-    public ExecuteResults execute(EmbeddedQueryContext context) {
+    public ExecuteResults execute(EmbeddedQueryContext context, QueryBindings bindings) {
         Cursor cursor = null;
         try {
-            cursor = API.cursor(resultOperator, context);
+            cursor = API.cursor(resultOperator, context, bindings);
             cursor.open();
             ExecuteResults result = new ExecuteResults(cursor);
             cursor = null;

=== modified file 'src/main/java/com/akiban/sql/embedded/ExecutableScriptBindingsRoutine.java'
--- src/main/java/com/akiban/sql/embedded/ExecutableScriptBindingsRoutine.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/sql/embedded/ExecutableScriptBindingsRoutine.java	2013-07-09 23:55:31 +0000
@@ -17,6 +17,7 @@
 
 package com.akiban.sql.embedded;
 
+import com.akiban.qp.operator.QueryBindings;
 import com.akiban.server.service.routines.ScriptEvaluator;
 import com.akiban.server.service.routines.ScriptPool;
 import com.akiban.sql.script.ScriptBindingsRoutine;
@@ -45,8 +46,8 @@
     }
 
     @Override
-    protected ServerJavaRoutine javaRoutine(EmbeddedQueryContext context) {
-        return new ScriptBindingsRoutine(context, invocation, pool);
+    protected ServerJavaRoutine javaRoutine(EmbeddedQueryContext context, QueryBindings bindings) {
+        return new ScriptBindingsRoutine(context, bindings, invocation, pool);
     }
     
 }

=== modified file 'src/main/java/com/akiban/sql/embedded/ExecutableScriptFunctionJavaRoutine.java'
--- src/main/java/com/akiban/sql/embedded/ExecutableScriptFunctionJavaRoutine.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/sql/embedded/ExecutableScriptFunctionJavaRoutine.java	2013-07-09 23:55:31 +0000
@@ -17,6 +17,7 @@
 
 package com.akiban.sql.embedded;
 
+import com.akiban.qp.operator.QueryBindings;
 import com.akiban.server.service.routines.ScriptInvoker;
 import com.akiban.server.service.routines.ScriptPool;
 import com.akiban.sql.script.ScriptFunctionJavaRoutine;
@@ -45,8 +46,8 @@
     }
 
     @Override
-    protected ServerJavaRoutine javaRoutine(EmbeddedQueryContext context) {
-        return new ScriptFunctionJavaRoutine(context, invocation, pool);
+    protected ServerJavaRoutine javaRoutine(EmbeddedQueryContext context, QueryBindings bindings) {
+        return new ScriptFunctionJavaRoutine(context, bindings, invocation, pool);
     }
     
 }

=== modified file 'src/main/java/com/akiban/sql/embedded/ExecutableStatement.java'
--- src/main/java/com/akiban/sql/embedded/ExecutableStatement.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/sql/embedded/ExecutableStatement.java	2013-07-09 23:55:31 +0000
@@ -17,11 +17,12 @@
 
 package com.akiban.sql.embedded;
 
+import com.akiban.qp.operator.QueryBindings;
 import com.akiban.sql.server.ServerStatement;
 
 abstract class ExecutableStatement implements ServerStatement
 {
-    public abstract ExecuteResults execute(EmbeddedQueryContext context);
+    public abstract ExecuteResults execute(EmbeddedQueryContext context, QueryBindings bindings);
 
     public JDBCResultSetMetaData getResultSetMetaData() {
         return null;

=== modified file 'src/main/java/com/akiban/sql/embedded/JDBCPreparedStatement.java'
--- src/main/java/com/akiban/sql/embedded/JDBCPreparedStatement.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/sql/embedded/JDBCPreparedStatement.java	2013-07-09 23:55:31 +0000
@@ -17,6 +17,7 @@
 
 package com.akiban.sql.embedded;
 
+import com.akiban.qp.operator.QueryBindings;
 import com.akiban.server.types.AkType;
 import com.akiban.server.types.ValueSource;
 import com.akiban.server.types3.TInstance;
@@ -33,8 +34,9 @@
 
 public class JDBCPreparedStatement extends JDBCStatement implements PreparedStatement
 {
-    protected ExecutableStatement executableStatement;
-    protected EmbeddedQueryContext context;
+    protected final ExecutableStatement executableStatement;
+    protected final EmbeddedQueryContext context;
+    protected final QueryBindings bindings;
     protected final Values values = new Values();
 
     protected JDBCPreparedStatement(JDBCConnection connection, 
@@ -42,6 +44,7 @@
         super(connection);
         this.executableStatement = executableStatement;
         context = new EmbeddedQueryContext(this);
+        bindings = context.createBindings();
     }
 
     protected class Values extends ServerJavaValues {
@@ -57,22 +60,22 @@
 
         @Override
         protected ValueSource getValue(int index) {
-            return context.getValue(index);
+            return bindings.getValue(index);
         }
 
         @Override
         protected void setValue(int index, ValueSource source, AkType akType) {
-            context.setValue(index, source, akType);
+            bindings.setValue(index, source, akType);
         }
 
         @Override
         protected PValueSource getPValue(int index) {
-            return context.getPValue(index);
+            return bindings.getPValue(index);
         }
 
         @Override
         protected void setPValue(int index, PValueSource source) {
-            context.setPValue(index, source);
+            bindings.setPValue(index, source);
         }
 
         @Override
@@ -105,12 +108,12 @@
 
     @Override
     public ResultSet executeQuery() throws SQLException {
-        return executeQueryInternal(executableStatement, context);
+        return executeQueryInternal(executableStatement, context, bindings);
     }
 
     @Override
     public int executeUpdate() throws SQLException {
-        return executeUpdateInternal(executableStatement, context);
+        return executeUpdateInternal(executableStatement, context, bindings);
     }
 
     @Override
@@ -294,7 +297,7 @@
 
     @Override
     public void clearParameters() throws SQLException {
-        context.clear();
+        bindings.clear();
     }
 
     @Override
@@ -314,7 +317,7 @@
 
     @Override
     public boolean execute() throws SQLException {
-        return executeInternal(executableStatement, context);
+        return executeInternal(executableStatement, context, bindings);
     }
 
     @Override

=== modified file 'src/main/java/com/akiban/sql/embedded/JDBCStatement.java'
--- src/main/java/com/akiban/sql/embedded/JDBCStatement.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/sql/embedded/JDBCStatement.java	2013-07-09 23:55:31 +0000
@@ -17,6 +17,8 @@
 
 package com.akiban.sql.embedded;
 
+import com.akiban.qp.operator.QueryBindings;
+
 import java.sql.*;
 import java.util.ArrayList;
 import java.util.Queue;
@@ -41,18 +43,21 @@
         this.connection = connection;
     }
 
-    public boolean executeInternal(ExecutableStatement stmt, EmbeddedQueryContext context) 
+    public boolean executeInternal(ExecutableStatement stmt, EmbeddedQueryContext context, QueryBindings bindings) 
             throws SQLException {
         if (context == null) {
             if (stmt.getParameterMetaData() != null)
                 throw new JDBCException("Statement requires parameters; must prepare");
             context = new EmbeddedQueryContext(this);
         }
+        if (bindings == null) {
+            bindings = context.createBindings();
+        }
         boolean hasResultSet = false;
         connection.beforeExecuteStatement(stmt);
         boolean success = false;
         try {
-            ExecuteResults results = stmt.execute(context);
+            ExecuteResults results = stmt.execute(context, bindings);
             currentUpdateCount = results.getUpdateCount();
             if (results.getCursor() != null) {
                 JDBCResultSet resultSet = new JDBCResultSet(this, stmt.getResultSetMetaData(), results.getCursor());
@@ -88,17 +93,19 @@
     }
 
     public ResultSet executeQueryInternal(ExecutableStatement stmt, 
-                                          EmbeddedQueryContext context) 
+                                          EmbeddedQueryContext context,
+                                          QueryBindings bindings)
             throws SQLException {
-        boolean hasResultSet = executeInternal(stmt, context);
+        boolean hasResultSet = executeInternal(stmt, context, bindings);
         if (!hasResultSet) throw new JDBCException("Statement is not SELECT");
         return getResultSet();
     }
 
     public int executeUpdateInternal(ExecutableStatement stmt, 
-                                     EmbeddedQueryContext context) 
+                                     EmbeddedQueryContext context,
+                                     QueryBindings bindings)
             throws SQLException {
-        boolean hasResultSet = executeInternal(stmt, context);
+        boolean hasResultSet = executeInternal(stmt, context, bindings);
         if (hasResultSet) throw new JDBCException("Statement is SELECT");
         return getUpdateCount();
     }
@@ -141,12 +148,12 @@