Merge lp:~mmcm/akiban-server/sql-assemble-index-scan-pegged-count into lp:~akiban-technologies/akiban-server/trunk

[Mike McMahon]

(Relatively) recently added key comparable code in index intersection was mistakenly using the same skip ("pegged") count for the left and right sides.

[Nathan Williams (nwilliams)]

Makes sense. And tested.

review: Approve

[Thomas Jones-Low (tjoneslo)]

There were 4 failures during build/test:

* job insert-regression-test failed at build number 3804: http://sneezy.softstart.com:8080/job/insert-regression-test/3804/

* job sqlselect-regression-test failed at build number 1894: http://sneezy.softstart.com:8080/job/sqlselect-regression-test/1894/

* view must-pass failed: insert-regression-test is red

* view must-pass failed: sqlselect-regression-test is red

review: Needs Fixing

[Thomas Jones-Low (tjoneslo)]

This is my fault, and not related to the fix. Reapproving.

review: Approve

=== modified file 'src/main/java/com/akiban/sql/optimizer/rule/OperatorAssembler.java'
--- src/main/java/com/akiban/sql/optimizer/rule/OperatorAssembler.java	2013-04-30 23:01:23 +0000
+++ src/main/java/com/akiban/sql/optimizer/rule/OperatorAssembler.java	2013-06-05 23:02:25 +0000
@@ -1125,8 +1125,8 @@
            
             for (int n = 0; n < nFieldsToCompare; ++n)
             {
-                TClass left = selectorRowType.typeInstanceAt(index.getPeggedCount() + n).typeClass();
-                TClass right = outputRowType.typeInstanceAt(index.getPeggedCount() + n).typeClass();
+                TClass left = selectorRowType.typeInstanceAt(index.getSelectorIndexScan().getPeggedCount() + n).typeClass();
+                TClass right = outputRowType.typeInstanceAt(index.getOutputIndexScan().getPeggedCount() + n).typeClass();
                 if (left != right)
                     comparisons.add(n, reg.getKeyComparable(left, right).getComparison());
                 else

=== modified file 'src/test/resources/com/akiban/sql/optimizer/rule/operator/README.txt'
--- src/test/resources/com/akiban/sql/optimizer/rule/operator/README.txt	2013-03-05 18:54:27 +0000
+++ src/test/resources/com/akiban/sql/optimizer/rule/operator/README.txt	2013-06-05 23:02:25 +0000
@@ -26,6 +26,8 @@
 
 select-5: index one branch, join in another
 
+select-6: index intersection with different column counts
+
 update-1: set to literal
 
 geospatial-1: compute max radius for N neighbors

=== added file 'src/test/resources/com/akiban/sql/optimizer/rule/operator/select-6.ddl'
--- src/test/resources/com/akiban/sql/optimizer/rule/operator/select-6.ddl	1970-01-01 00:00:00 +0000
+++ src/test/resources/com/akiban/sql/optimizer/rule/operator/select-6.ddl	2013-06-05 23:02:25 +0000
@@ -0,0 +1,3 @@
+CREATE TABLE t(id BIGINT NOT NULL PRIMARY KEY, viewable_id INT, viewable_type VARCHAR(255), type VARCHAR(75));
+CREATE INDEX viewable_id ON t(viewable_id);
+CREATE INDEX viewable_type_and_type ON t(viewable_type, type);
\ No newline at end of file

=== added file 'src/test/resources/com/akiban/sql/optimizer/rule/operator/select-6.expected'
--- src/test/resources/com/akiban/sql/optimizer/rule/operator/select-6.expected	1970-01-01 00:00:00 +0000
+++ src/test/resources/com/akiban/sql/optimizer/rule/operator/select-6.expected	2013-06-05 23:02:25 +0000
@@ -0,0 +1,6 @@
+PhysicalSelect@533b13f9[_SQL_COL_1]
+  Project_Default(Field(0))
+    Count_Default(*)
+      Intersect_Ordered(skip 1 left, skip 2 right, compare 1)
+        IndexScan_Default(Index(test.t.viewable_id), viewable_id = 1, id ASC)
+        IndexScan_Default(Index(test.t.viewable_type_and_type), viewable_type = 'bar', type = 'foo', id ASC)
\ No newline at end of file

=== added file 'src/test/resources/com/akiban/sql/optimizer/rule/operator/select-6.sql'
--- src/test/resources/com/akiban/sql/optimizer/rule/operator/select-6.sql	1970-01-01 00:00:00 +0000
+++ src/test/resources/com/akiban/sql/optimizer/rule/operator/select-6.sql	2013-06-05 23:02:25 +0000
@@ -0,0 +1,1 @@
+SELECT COUNT(*) FROM t WHERE type = 'foo' AND viewable_id = 1 AND viewable_type = 'bar'
\ No newline at end of file