Merge lp:~mmcm/akiban-server/sql-product-map-depth into lp:~akiban-technologies/akiban-server/trunk

[Mike McMahon]

Fix depth setting for the left-deep Maps generated by Product.

They do not get deeper and deeper. Rather all but the first are one-deeper. This is different from the nested Maps for cross-product, which tend to be right-deep and so do get deeper.

To test this, and for the future, add a new Postgres IT that runs SQL queries with the pipeline options on.

Also add a Map IT for this kind of nesting, although it was already executing fine if the depths were consistent.

[Nathan Williams (nwilliams)]

Looks good.

review: Approve

[Thomas Jones-Low (tjoneslo)]

There were 3 failures during build/test:

* job server-build failed at build number 4140: http://sneezy.softstart.com:8080/job/server-build/4140/

* view must-pass failed: server-build is yellow

* view must-pass failed: server-packages is blue_anime

review: Needs Fixing

[Nathan Williams (nwilliams)]

Unrelated.

=== modified file 'src/main/java/com/akiban/sql/optimizer/rule/OperatorAssembler.java'
--- src/main/java/com/akiban/sql/optimizer/rule/OperatorAssembler.java	2013-07-24 23:06:43 +0000
+++ src/main/java/com/akiban/sql/optimizer/rule/OperatorAssembler.java	2013-07-25 22:02:24 +0000
@@ -1583,8 +1583,10 @@
             for (PlanNode subplan : product.getSubplans()) {
                 if (pstream.operator != null) {
                     pushBoundRow(flattened);
-                    nestedBindingsDepth++;
-                    nbound++;
+                    if (nbound++ == 0) {
+                        // Only one deeper for all, since nest on the outer side.
+                        nestedBindingsDepth++;
+                    }
                 }
                 RowStream stream = assembleStream(subplan);
                 if (pstream.operator == null) {
@@ -1615,9 +1617,11 @@
                 }
                 flattened.setRowType(pstream.rowType);
             }
+            if (nbound > 0) {
+                nestedBindingsDepth--;
+            }
             while (nbound > 0) {
                 popBoundRow();
-                nestedBindingsDepth--;
                 nbound--;
             }
             return pstream;

=== modified file 'src/test/java/com/akiban/server/test/it/qp/Map_NestedLoopsIT.java'
--- src/test/java/com/akiban/server/test/it/qp/Map_NestedLoopsIT.java	2013-07-24 23:06:43 +0000
+++ src/test/java/com/akiban/server/test/it/qp/Map_NestedLoopsIT.java	2013-07-25 22:02:24 +0000
@@ -346,6 +346,50 @@
         compareRows(expected, cursor(plan, queryContext, queryBindings));
     }
 
+    @Test
+    public void testLeftDeepMap()
+    {
+        RowType intRowType = schema.newValuesType(AkType.INT);
+        List<ExpressionGenerator> outerExprs = Arrays.asList(boundField(intRowType, 0, 0), field(intRowType, 0));
+        Operator middle = 
+            project_Default(
+                valuesScan_Default(
+                    bindableExpressions(intRow(intRowType, 10),
+                                        intRow(intRowType, 20)),
+                    intRowType),
+                intRowType, outerExprs);
+        RowType outerRowType = middle.rowType();
+        Operator outer =
+            map_NestedLoops(
+                valuesScan_Default(
+                    bindableExpressions(intRow(intRowType, 100),
+                                        intRow(intRowType, 200)),
+                    intRowType),
+                middle,
+                0, pipelineMap(), 1);
+        List<ExpressionGenerator> innerExprs = Arrays.asList(boundField(outerRowType, 1, 0), boundField(outerRowType, 1, 1), field(intRowType, 0));
+        Operator inner =
+            project_Default(
+                valuesScan_Default(
+                    bindableExpressions(intRow(intRowType, 1),
+                                        intRow(intRowType, 2)),
+                    intRowType),
+                intRowType, innerExprs);
+        RowType innerRowType = inner.rowType();
+        Operator plan = map_NestedLoops(outer, inner, 1, pipelineMap(), 1);
+        RowBase[] expected = new RowBase[]{
+            row(innerRowType, 100L, 10L, 1L),
+            row(innerRowType, 100L, 10L, 2L),
+            row(innerRowType, 100L, 20L, 1L),
+            row(innerRowType, 100L, 20L, 2L),
+            row(innerRowType, 200L, 10L, 1L),
+            row(innerRowType, 200L, 10L, 2L),
+            row(innerRowType, 200L, 20L, 1L),
+            row(innerRowType, 200L, 20L, 2L),
+        };
+        compareRows(expected, cursor(plan, queryContext, queryBindings));
+    }
+
     private Row intRow(RowType rowType, int x)
     {
         List<Expression> expressions;

=== added file 'src/test/java/com/akiban/sql/pg/PostgresServerPipelineSelectIT.java'
--- src/test/java/com/akiban/sql/pg/PostgresServerPipelineSelectIT.java	1970-01-01 00:00:00 +0000
+++ src/test/java/com/akiban/sql/pg/PostgresServerPipelineSelectIT.java	2013-07-25 22:02:24 +0000
@@ -0,0 +1,78 @@
+/**
+ * Copyright (C) 2009-2013 Akiban Technologies, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.akiban.sql.pg;
+
+import com.akiban.sql.NamedParamsTestBase;
+import com.akiban.sql.TestBase;
+
+import com.akiban.junit.NamedParameterizedRunner;
+import com.akiban.junit.NamedParameterizedRunner.TestParameters;
+import com.akiban.junit.Parameterization;
+import org.junit.runner.RunWith;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+
+@RunWith(NamedParameterizedRunner.class)
+public class PostgresServerPipelineSelectIT extends PostgresServerSelectIT 
+{
+    public static final File RESOURCE_DIR = 
+        new File(PostgresServerITBase.RESOURCE_DIR, "pipeline-select");
+
+    @Override
+    protected Map<String, String> startupConfigProperties() {
+        Properties loadedProperties = new Properties();
+        try {
+            FileInputStream istr = new FileInputStream(new File(RESOURCE_DIR,
+                                                                "pipeline.properties"));
+            loadedProperties.load(istr);
+            istr.close();
+        }
+        catch (IOException ex) {
+            throw new RuntimeException(ex);
+        }
+
+        Map<String, String> properties = new HashMap<>();
+        for (String key : loadedProperties.stringPropertyNames()) {
+            properties.put(key, loadedProperties.getProperty(key));
+        }
+        return properties;
+    }
+
+    @Override
+    public void loadDatabase() throws Exception {
+        loadDatabase(RESOURCE_DIR);
+    }
+
+    @TestParameters
+    public static Collection<Parameterization> queries() throws Exception {
+        return NamedParamsTestBase.namedCases(TestBase.sqlAndExpectedAndParams(RESOURCE_DIR));
+    }
+
+    public PostgresServerPipelineSelectIT(String caseName, String sql, 
+                                          String expected, String error,
+                                          String[] params) {
+        super(caseName, sql, expected, error, params);
+    }
+
+}

=== added directory 'src/test/resources/com/akiban/sql/pg/pipeline-select'
=== added file 'src/test/resources/com/akiban/sql/pg/pipeline-select/README.txt'
--- src/test/resources/com/akiban/sql/pg/pipeline-select/README.txt	1970-01-01 00:00:00 +0000
+++ src/test/resources/com/akiban/sql/pg/pipeline-select/README.txt	2013-07-25 22:02:24 +0000
@@ -0,0 +1,3 @@
+select-1: Index to GroupLookup
+
+select-3: 3-way product

=== added file 'src/test/resources/com/akiban/sql/pg/pipeline-select/addresses.dat'
--- src/test/resources/com/akiban/sql/pg/pipeline-select/addresses.dat	1970-01-01 00:00:00 +0000
+++ src/test/resources/com/akiban/sql/pg/pipeline-select/addresses.dat	2013-07-25 22:02:24 +0000
@@ -0,0 +1,2 @@
+101	1	MA	Boston
+201	2	NY	New York

=== added file 'src/test/resources/com/akiban/sql/pg/pipeline-select/customers.dat'
--- src/test/resources/com/akiban/sql/pg/pipeline-select/customers.dat	1970-01-01 00:00:00 +0000
+++ src/test/resources/com/akiban/sql/pg/pipeline-select/customers.dat	2013-07-25 22:02:24 +0000
@@ -0,0 +1,3 @@
+1	Smith
+2	Jones
+3	Adams

=== added file 'src/test/resources/com/akiban/sql/pg/pipeline-select/items.dat'
--- src/test/resources/com/akiban/sql/pg/pipeline-select/items.dat	1970-01-01 00:00:00 +0000
+++ src/test/resources/com/akiban/sql/pg/pipeline-select/items.dat	2013-07-25 22:02:24 +0000
@@ -0,0 +1,6 @@
[phone]
[phone]
[phone]
[phone]
[phone]
[phone]

=== added file 'src/test/resources/com/akiban/sql/pg/pipeline-select/orders.dat'
--- src/test/resources/com/akiban/sql/pg/pipeline-select/orders.dat	1970-01-01 00:00:00 +0000
+++ src/test/resources/com/akiban/sql/pg/pipeline-select/orders.dat	2013-07-25 22:02:24 +0000
@@ -0,0 +1,6 @@
[phone]
[phone]
[phone]
[phone]
[phone]
[phone]

=== added file 'src/test/resources/com/akiban/sql/pg/pipeline-select/pipeline.properties'
--- src/test/resources/com/akiban/sql/pg/pipeline-select/pipeline.properties	1970-01-01 00:00:00 +0000
+++ src/test/resources/com/akiban/sql/pg/pipeline-select/pipeline.properties	2013-07-25 22:02:24 +0000
@@ -0,0 +1,5 @@
+akserver.pipeline.map.enabled=true
+akserver.pipeline.indexScan.lookaheadQuantum=10
+akserver.pipeline.groupLookup.lookaheadQuantum=10
+akserver.pipeline.unionAll.openBoth=true
+akserver.pipeline.selectBloomFilter.enabled=true

=== added file 'src/test/resources/com/akiban/sql/pg/pipeline-select/schema.ddl'
--- src/test/resources/com/akiban/sql/pg/pipeline-select/schema.ddl	1970-01-01 00:00:00 +0000
+++ src/test/resources/com/akiban/sql/pg/pipeline-select/schema.ddl	2013-07-25 22:02:24 +0000
@@ -0,0 +1,44 @@
+
+CREATE TABLE customers
+(
+  cid int NOT NULL, 
+  PRIMARY KEY(cid),
+  name varchar(32) NOT NULL
+);
+CREATE INDEX name ON customers(name);
+
+CREATE TABLE orders
+(
+  oid int NOT NULL, 
+  PRIMARY KEY(oid),
+  cid int NOT NULL,
+  order_date date NOT NULL,
+  GROUPING FOREIGN KEY (cid) REFERENCES customers(cid)
+);
+CREATE INDEX cid ON orders(cid);
+CREATE INDEX order_date ON orders(order_date);
+
+CREATE TABLE items
+(
+  iid int NOT NULL, 
+  PRIMARY KEY(iid),
+  oid int NOT NULL,
+  sku varchar(32) NOT NULL,
+  quan int NOT NULL,
+  GROUPING FOREIGN KEY (oid) REFERENCES orders(oid)
+);
+CREATE INDEX sku ON items(sku);
+
+CREATE TABLE addresses
+(
+  aid int NOT NULL, 
+  PRIMARY KEY(aid),
+  cid int NOT NULL,
+  state CHAR(2),
+  city VARCHAR(100),
+  GROUPING FOREIGN KEY (cid) REFERENCES customers(cid)
+);
+
+CREATE INDEX cname_and_sku ON customers(customers.name, items.sku) USING LEFT JOIN;
+CREATE INDEX sku_and_date ON customers(items.sku, orders.order_date) USING LEFT JOIN;
+CREATE INDEX date_and_name ON customers(orders.order_date, customers.name) USING RIGHT JOIN;

=== added file 'src/test/resources/com/akiban/sql/pg/pipeline-select/select-1.expected'
--- src/test/resources/com/akiban/sql/pg/pipeline-select/select-1.expected	1970-01-01 00:00:00 +0000
+++ src/test/resources/com/akiban/sql/pg/pipeline-select/select-1.expected	2013-07-25 22:02:24 +0000
@@ -0,0 +1,4 @@
+name	order_date	sku	quan
+Smith	2011-03-02	null	null
+Jones	2011-03-03	9876	1
+Adams	2011-03-04	9876	2

=== added file 'src/test/resources/com/akiban/sql/pg/pipeline-select/select-1.sql'
--- src/test/resources/com/akiban/sql/pg/pipeline-select/select-1.sql	1970-01-01 00:00:00 +0000
+++ src/test/resources/com/akiban/sql/pg/pipeline-select/select-1.sql	2013-07-25 22:02:24 +0000
@@ -0,0 +1,3 @@
+SELECT name, order_date, sku, quan 
+  FROM customers INNER JOIN orders ON customers.cid = orders.cid LEFT JOIN items ON orders.oid = items.oid
+ WHERE order_date > '2011-03-01'
\ No newline at end of file

=== added file 'src/test/resources/com/akiban/sql/pg/pipeline-select/select-3.expected'
--- src/test/resources/com/akiban/sql/pg/pipeline-select/select-3.expected	1970-01-01 00:00:00 +0000
+++ src/test/resources/com/akiban/sql/pg/pipeline-select/select-3.expected	2013-07-25 22:02:24 +0000
@@ -0,0 +1,3 @@
+name	city	state	order_date	quan	order_date	sku	quan
+Smith	Boston	MA	2011-03-01	100	2011-03-01	4567	50
+Jones	New York	NY	2011-02-28	99	2011-03-03	9876	1

=== added file 'src/test/resources/com/akiban/sql/pg/pipeline-select/select-3.sql'
--- src/test/resources/com/akiban/sql/pg/pipeline-select/select-3.sql	1970-01-01 00:00:00 +0000
+++ src/test/resources/com/akiban/sql/pg/pipeline-select/select-3.sql	2013-07-25 22:02:24 +0000
@@ -0,0 +1,6 @@
+SELECT c.name, a.city, a.state, o1.order_date, i1.quan, o2.order_date, i2.sku, i2.quan
+  FROM customers c
+ INNER JOIN addresses a ON c.cid = a.cid
+ INNER JOIN orders o1 ON c.cid = o1.cid INNER JOIN items i1 ON o1.oid = i1.oid
+ INNER JOIN orders o2 ON c.cid = o2.cid INNER JOIN items i2 ON o2.oid = i2.oid
+ WHERE i1.sku = '1234' AND i1.iid <> i2.iid
\ No newline at end of file