Merge lp:~mmcm/akiban-server/sql-in-subquery-wo-project into lp:~akiban-technologies/akiban-server/trunk

[Mike McMahon]

Handle subquery predicates with VALUES.

IN (1,2) is a special kind of node.
IN (SELECT x FROM ...) has a Project which is used to extract the comparison operand for the semi-join.
IN (VALUES 1,2) is somewhere in between. The Project isn't there, but enough information is to form the identical plan to the first case. Add that.

See new test and note that the expected result is identical to in-l3.

[Nathan Williams (nwilliams)]

Simple enough.

review: Approve

=== modified file 'src/main/java/com/akiban/sql/optimizer/rule/ASTStatementLoader.java'
--- src/main/java/com/akiban/sql/optimizer/rule/ASTStatementLoader.java	2013-07-31 20:40:42 +0000
+++ src/main/java/com/akiban/sql/optimizer/rule/ASTStatementLoader.java	2013-08-07 21:31:27 +0000
@@ -926,6 +926,19 @@
                     plan = next;
                 }
             }
+            if ((operands == null) &&
+                (subquery instanceof ColumnSource) &&
+                (subquery instanceof TypedPlan)) {
+                int nfields = ((TypedPlan)subquery).nFields();
+                if (!multipleOperands && (nfields != 1))
+                    throw new UnsupportedSQLException("Subquery must have exactly one column", subqueryNode);
+                operands = new ArrayList<>(nfields);
+                for (int i = 0; i < nfields; i++) {
+                    operands.add(new ColumnExpression(((ColumnSource)subquery), i, null, null));
+                }
+                if (nfields > 0)
+                    operand = operands.get(0);
+            }
             ConditionExpression condition;
             if (needOperand) {
                 assert (operand != null);

=== modified file 'src/test/resources/com/akiban/sql/optimizer/rule/parse/README.txt'
--- src/test/resources/com/akiban/sql/optimizer/rule/parse/README.txt	2013-07-31 20:41:01 +0000
+++ src/test/resources/com/akiban/sql/optimizer/rule/parse/README.txt	2013-08-07 21:31:27 +0000
@@ -76,6 +76,8 @@
 
 in-4: IN with row value subquery
 
+in-5: IN with VALUES (explicitly as subquery)
+
 insert-1: from VALUES
 
 insert-2: from SELECT

=== added file 'src/test/resources/com/akiban/sql/optimizer/rule/parse/in-5.expected'
--- src/test/resources/com/akiban/sql/optimizer/rule/parse/in-5.expected	1970-01-01 00:00:00 +0000
+++ src/test/resources/com/akiban/sql/optimizer/rule/parse/in-5.expected	2013-08-07 21:31:27 +0000
@@ -0,0 +1,9 @@
+SelectQuery@6e92b1a1
+  ResultSet@68c0890f[cid, name]
+    Project@38666d83[customers.cid, customers.name]
+      Select@6f7918f0[ANY(Subquery@40b86944)]
+        TableSource@47f08ed8(customers)
+
+Subquery@40b86944
+  Project@3ab28980[customers.name == VALUES[0]]
+    ExpressionsSource@2322bce([[Smith], [Jones], [Adams]])

=== added file 'src/test/resources/com/akiban/sql/optimizer/rule/parse/in-5.sql'
--- src/test/resources/com/akiban/sql/optimizer/rule/parse/in-5.sql	1970-01-01 00:00:00 +0000
+++ src/test/resources/com/akiban/sql/optimizer/rule/parse/in-5.sql	2013-08-07 21:31:27 +0000
@@ -0,0 +1,2 @@
+SELECT * FROM customers
+ WHERE name IN (VALUES('Smith'), ('Jones'), ('Adams'))