Merge lp:~mmcm/akiban-server/sql-overload-complex-case into lp:~akiban-technologies/akiban-server/trunk

[Mike McMahon]

A CASE condition with BETWEEN (or AND) would get an error in the overload resolver.

It was calling the method meant to be used after conditions are compacted (near the end).

[Nathan Williams (nwilliams)]

Looks good.

review: Approve

[Thomas Jones-Low (tjoneslo)]

There were 2 failures during build/test:

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

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

review: Needs Fixing

[Thomas Jones-Low (tjoneslo)]

I'm not sure if this is an unrelated failure, or something we should be concern about because the test order changed.

com.akiban.sql.optimizer.rule.RulesTest.testRules [operator/select-1]

com.persistit.exception.RollbackException
 at com.persistit.Exchange$MvvVisitor.sawVersion(Exchange.java:231)
 at com.persistit.MVV.visitAllVersions(MVV.java:745)
 at com.persistit.Exchange.storeInternal(Exchange.java:1599)
 at com.persistit.Exchange.store(Exchange.java:1366)
 at com.persistit.Exchange.store(Exchange.java:2744)
 at com.akiban.server.service.text.FullTextIndexServiceImpl.addPopulate(FullTextIndexServiceImpl.java:639)
 at com.akiban.server.service.text.FullTextIndexServiceImpl.schedulePopulate(FullTextIndexServiceImpl.java:326)
 at com.akiban.sql.aisddl.IndexDDL.buildFullTextIndex(IndexDDL.java:371)
 at com.akiban.sql.aisddl.IndexDDL.buildIndex(IndexDDL.java:179)
 at com.akiban.sql.aisddl.IndexDDL.createIndex(IndexDDL.java:159)
 at com.akiban.server.rowdata.SchemaFactory.ais(SchemaFactory.java:128)
 at com.akiban.server.rowdata.SchemaFactory.ais(SchemaFactory.java:100)
 at com.akiban.server.rowdata.SchemaFactory.ais(SchemaFactory.java:85)
 at com.akiban.sql.optimizer.OptimizerTestBase.parseSchema(OptimizerTestBase.java:91)
 at com.akiban.sql.optimizer.OptimizerTestBase.loadSchema(OptimizerTestBase.java:100)
 at com.akiban.sql.optimizer.rule.RulesTest.loadDDL(RulesTest.java:137)
 at sun.reflect.GeneratedMethodAccessor293.invoke(Unknown Source)
 at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
 at java.lang.reflect.Method.invoke(Method.java:601)
 at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:44)
 at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:15)
 at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:41)
 at org.junit.internal.runners.statements.RunBefores.evaluate(RunBefores.java:27)
 at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:76)

[Nathan Williams (nwilliams)]

Known issue, see bug1172013.

=== modified file 'src/main/java/com/akiban/sql/optimizer/rule/OverloadAndTInstanceResolver.java'
--- src/main/java/com/akiban/sql/optimizer/rule/OverloadAndTInstanceResolver.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/sql/optimizer/rule/OverloadAndTInstanceResolver.java	2013-06-05 23:00:36 +0000
@@ -59,6 +59,7 @@
 import com.akiban.sql.optimizer.plan.ColumnExpression;
 import com.akiban.sql.optimizer.plan.ColumnSource;
 import com.akiban.sql.optimizer.plan.ComparisonCondition;
+import com.akiban.sql.optimizer.plan.ConditionList;
 import com.akiban.sql.optimizer.plan.ConstantExpression;
 import com.akiban.sql.optimizer.plan.Distinct;
 import com.akiban.sql.optimizer.plan.DMLStatement;
@@ -515,14 +516,17 @@
         }
 
         ExpressionNode handleIfElseExpression(IfElseExpression expression) {
+            ConditionList conditions = expression.getTestConditions();
             ExpressionNode thenExpr = expression.getThenExpression();
             ExpressionNode elseExpr = expression.getElseExpression();
 
             // constant-fold if the condition is constant
-            PValueSource conditionVal = pval(expression.getTestCondition());
-            if (conditionVal != null) {
-                boolean conditionMet = conditionVal.getBoolean(false);
-                return conditionMet ? thenExpr : elseExpr;
+            if (conditions.size() == 1) {
+                PValueSource conditionVal = pval(conditions.get(0));
+                if (conditionVal != null) {
+                    boolean conditionMet = conditionVal.getBoolean(false);
+                    return conditionMet ? thenExpr : elseExpr;
+                }
             }
 
             TInstance commonInstance = commonInstance(registry.getCastsResolver(), tinst(thenExpr), tinst(elseExpr));
 
=== modified file 'src/test/resources/com/akiban/sql/optimizer/rule/fold-constants/README.txt'
--- src/test/resources/com/akiban/sql/optimizer/rule/fold-constants/README.txt	2012-10-04 20:02:24 +0000
+++ src/test/resources/com/akiban/sql/optimizer/rule/fold-constants/README.txt	2013-06-05 23:00:36 +0000
@@ -4,6 +4,8 @@
 
 case-2: CASE only partially worked out.
 
+case-3: CASE complex condition
+
 counts: COUNT(NOT NULL column) turns into COUNT(*) but not NULL.
 
 current-date-time: Current date / time is not a constant.
 
=== added file 'src/test/resources/com/akiban/sql/optimizer/rule/fold-constants/case-3.expected'
--- src/test/resources/com/akiban/sql/optimizer/rule/fold-constants/case-3.expected	1970-01-01 00:00:00 +0000
+++ src/test/resources/com/akiban/sql/optimizer/rule/fold-constants/case-3.expected	2013-06-05 23:00:36 +0000
@@ -0,0 +1,5 @@
+SelectQuery@1eeafb34
+  ResultSet@551222c7[_SQL_COL_1]
+    Project@19a96273[IF([customers.cid >= 1, customers.cid <= 10], customers.name, n/a)]
+      Select@3f7e792e[]
+        TableSource@7224152f(customers)
 \ No newline at end of file
 
=== added file 'src/test/resources/com/akiban/sql/optimizer/rule/fold-constants/case-3.sql'
--- src/test/resources/com/akiban/sql/optimizer/rule/fold-constants/case-3.sql	1970-01-01 00:00:00 +0000
+++ src/test/resources/com/akiban/sql/optimizer/rule/fold-constants/case-3.sql	2013-06-05 23:00:36 +0000
@@ -0,0 +1,1 @@
+SELECT CASE WHEN cid BETWEEN 1 AND 10 THEN name ELSE 'n/a' END FROM customers
 \ No newline at end of file