BaseIndex.getCostRangeIndex changed to accept TableFilter[]

h2/src/main/org/h2/index/BaseIndex.java

@@ -152,12 +152,13 @@ public abstract class BaseIndex extends SchemaObjectBase implements Index {
      *
      * @param masks the search mask
      * @param rowCount the number of rows in the index
-     * @param filter the table filter
+     * @param filters all joined table filters
+     * @param filter the current table filter index
      * @param sortOrder the sort order
      * @return the estimated cost
      */
     protected long getCostRangeIndex(int[] masks, long rowCount,
-            TableFilter filter, SortOrder sortOrder) {
+            TableFilter[] filters, int filter, SortOrder sortOrder) {
         rowCount += Constants.COST_ROW_OFFSET;
         long cost = rowCount;
         long rows = rowCount;
@@ -201,6 +202,7 @@ public abstract class BaseIndex extends SchemaObjectBase implements Index {
             boolean sortOrderMatches = true;
             int coveringCount = 0;
             int[] sortTypes = sortOrder.getSortTypes();
+            TableFilter tableFilter = filters == null ? null : filters[filter];
             for (int i = 0, len = sortTypes.length; i < len; i++) {
                 if (i >= indexColumns.length) {
                     // we can still use this index if we are sorting by more
@@ -209,7 +211,7 @@ public abstract class BaseIndex extends SchemaObjectBase implements Index {
                     // more of the order by columns
                     break;
                 }
-                Column col = sortOrder.getColumn(i, filter);
+                Column col = sortOrder.getColumn(i, tableFilter);
                 if (col == null) {
                     sortOrderMatches = false;
                     break;

h2/src/main/org/h2/index/LinkedIndex.java

@@ -144,7 +144,7 @@ public class LinkedIndex extends BaseIndex {
     public double getCost(Session session, int[] masks,
             TableFilter[] filters, int filter, SortOrder sortOrder) {
         return 100 + getCostRangeIndex(masks, rowCount +
-                Constants.COST_ROW_OFFSET, filters == null ? null : filters[filter], sortOrder);
+                Constants.COST_ROW_OFFSET, filters, filter, sortOrder);
     }
 
     @Override

h2/src/main/org/h2/index/MetaIndex.java

@@ -58,7 +58,7 @@ public class MetaIndex extends BaseIndex {
             return 10 * MetaTable.ROW_COUNT_APPROXIMATION;
         }
         return getCostRangeIndex(masks, MetaTable.ROW_COUNT_APPROXIMATION,
-                filters == null ? null : filters[filter], sortOrder);
+                filters, filter, sortOrder);
     }
 
     @Override

h2/src/main/org/h2/index/PageBtreeIndex.java

@@ -220,7 +220,7 @@ public class PageBtreeIndex extends PageIndex {
     public double getCost(Session session, int[] masks,
             TableFilter[] filters, int filter, SortOrder sortOrder) {
         return 10 * getCostRangeIndex(masks, tableData.getRowCount(session),
-                filters == null ? null : filters[filter], sortOrder);
+                filters, filter, sortOrder);
     }
 
     @Override

h2/src/main/org/h2/index/PageDelegateIndex.java

@@ -99,7 +99,7 @@ public class PageDelegateIndex extends PageIndex {
     public double getCost(Session session, int[] masks,
             TableFilter[] filters, int filter, SortOrder sortOrder) {
         return 10 * getCostRangeIndex(masks, mainIndex.getRowCount(session),
-                filters == null ? null : filters[filter], sortOrder);
+                filters, filter, sortOrder);
     }
 
     @Override

h2/src/main/org/h2/index/SpatialTreeIndex.java

@@ -180,7 +180,7 @@ public class SpatialTreeIndex extends BaseIndex implements SpatialIndex {
 
     @Override
     protected long getCostRangeIndex(int[] masks, long rowCount,
-            TableFilter filter, SortOrder sortOrder) {
+            TableFilter[] filters, int filter, SortOrder sortOrder) {
         return getCostRangeIndex(masks, rowCount, columns);
     }
 
@@ -211,7 +211,7 @@ public class SpatialTreeIndex extends BaseIndex implements SpatialIndex {
     public double getCost(Session session, int[] masks,
             TableFilter[] filters, int filter, SortOrder sortOrder) {
         return getCostRangeIndex(masks, table.getRowCountApproximation(),
-                filters == null ? null : filters[filter], sortOrder);
+                filters, filter, sortOrder);
     }
 
     @Override

h2/src/main/org/h2/index/TreeIndex.java

@@ -321,7 +321,7 @@ public class TreeIndex extends BaseIndex {
     public double getCost(Session session, int[] masks, TableFilter[] filters, int filter,
             SortOrder sortOrder) {
         return getCostRangeIndex(masks, tableData.getRowCountApproximation(),
-                filters == null ? null : filters[filter], sortOrder);
+                filters, filter, sortOrder);
     }
 
     @Override

h2/src/main/org/h2/mvstore/db/MVDelegateIndex.java

@@ -91,7 +91,7 @@ public class MVDelegateIndex extends BaseIndex implements MVIndex {
     public double getCost(Session session, int[] masks,
             TableFilter[] filters, int filter, SortOrder sortOrder) {
         return 10 * getCostRangeIndex(masks, mainIndex.getRowCountApproximation(),
-                filters == null ? null : filters[filter], sortOrder);
+                filters, filter, sortOrder);
     }
 
     @Override

h2/src/main/org/h2/mvstore/db/MVSecondaryIndex.java

@@ -355,7 +355,7 @@ public class MVSecondaryIndex extends BaseIndex implements MVIndex {
             TableFilter[] filters, int filter, SortOrder sortOrder) {
         try {
             return 10 * getCostRangeIndex(masks, dataMap.sizeAsLongMax(),
-                    filters == null ? null : filters[filter], sortOrder);
+                    filters, filter, sortOrder);
         } catch (IllegalStateException e) {
             throw DbException.get(ErrorCode.OBJECT_CLOSED, e);
         }

h2/src/main/org/h2/mvstore/db/MVSpatialIndex.java

@@ -240,12 +240,12 @@ public class MVSpatialIndex extends BaseIndex implements SpatialIndex, MVIndex {
     public double getCost(Session session, int[] masks,
             TableFilter[] filters, int filter, SortOrder sortOrder) {
         return getCostRangeIndex(masks, table.getRowCountApproximation(),
-                filters == null ? null : filters[filter], sortOrder);
+                filters, filter, sortOrder);
     }
 
     @Override
     protected long getCostRangeIndex(int[] masks, long rowCount,
-            TableFilter filter, SortOrder sortOrder) {
+            TableFilter[] filters, int filter, SortOrder sortOrder) {
         return SpatialTreeIndex.getCostRangeIndex(masks, rowCount, columns);
     }
 

h2/src/test/org/h2/test/db/TestTableEngines.java

@@ -1206,8 +1206,7 @@ public class TestTableEngines extends TestBase {
         @Override
         public double getCost(Session session, int[] masks,
                 TableFilter[] filters, int filter, SortOrder sortOrder) {
-            return getCostRangeIndex(masks, set.size(), filters == null ?
-                    null : filters[filter], sortOrder);
+            return getCostRangeIndex(masks, set.size(), filters, filter, sortOrder);
         }
 
         @Override