IGNITE-24664 SQL Calcite: Use PK index scan instead of hash index scan - Fixes #11900.

Signed-off-by: Aleksey Plekhanov <plehanov.alex@gmail.com>

Author: alex-plekhanov

modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/IndexFirstLastScan.java

@@ -67,9 +67,11 @@ public IndexFirstLastScan(
     @Override protected IndexQueryContext indexQueryContext() {
         IndexQueryContext res = super.indexQueryContext();
 
+        boolean checkExpired = !cctx.config().isEagerTtl();
+
         return new IndexQueryContext(
             res.cacheFilter(),
-            createNotNullRowFilter(idx, true)
+            createNotNullRowFilter(idx, checkExpired)
         );
     }
 

modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/IndexScan.java

@@ -255,7 +255,9 @@ protected IndexQueryContext indexQueryContext() {
             ? new InlineIndexRowFactory(rowHnd.inlineIndexKeyTypes().toArray(new InlineIndexKeyType[0]), rowHnd)
             : null;
 
-        BPlusTree.TreeRowClosure<IndexRow, IndexRow> rowFilter = isInlineScan() ? null : createNotExpiredRowFilter();
+        boolean checkExpired = !cctx.config().isEagerTtl();
+
+        BPlusTree.TreeRowClosure<IndexRow, IndexRow> rowFilter = checkExpired ? createNotExpiredRowFilter() : null;
 
         return new IndexQueryContext(filter, rowFilter, rowFactory);
     }

modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/LogicalRelImplementor.java

@@ -38,6 +38,7 @@
 import org.apache.calcite.rex.RexNode;
 import org.apache.calcite.util.ImmutableBitSet;
 import org.apache.ignite.internal.processors.failure.FailureProcessor;
+import org.apache.ignite.internal.processors.query.QueryUtils;
 import org.apache.ignite.internal.processors.query.calcite.exec.RowHandler.RowFactory;
 import org.apache.ignite.internal.processors.query.calcite.exec.exp.ExpressionFactory;
 import org.apache.ignite.internal.processors.query.calcite.exec.exp.RangeIterable;
@@ -512,21 +513,30 @@ private boolean hasExchange(RelNode rel) {
     @Override public Node<Row> visit(IgniteTableScan rel) {
         RexNode condition = rel.condition();
         List<RexNode> projects = rel.projects();
-        ImmutableBitSet requiredColunms = rel.requiredColumns();
+        ImmutableBitSet requiredColumns = rel.requiredColumns();
 
         IgniteTable tbl = rel.getTable().unwrap(IgniteTable.class);
         IgniteTypeFactory typeFactory = ctx.getTypeFactory();
 
-        RelDataType rowType = tbl.getRowType(typeFactory, requiredColunms);
+        RelDataType rowType = tbl.getRowType(typeFactory, requiredColumns);
 
         Predicate<Row> filters = condition == null ? null : expressionFactory.predicate(condition, rowType);
         Function<Row, Row> prj = projects == null ? null : expressionFactory.project(projects, rowType);
 
         ColocationGroup grp = ctx.group(rel.sourceId());
 
-        Iterable<Row> rowsIter = tbl.scan(ctx, grp, requiredColunms);
+        IgniteIndex idx = tbl.getIndex(QueryUtils.PRIMARY_KEY_INDEX);
 
-        return new ScanStorageNode<>(tbl.name(), ctx, rowType, rowsIter, filters, prj);
+        if (idx != null && !tbl.isIndexRebuildInProgress()) {
+            Iterable<Row> rowsIter = idx.scan(ctx, grp, null, requiredColumns);
+
+            return new ScanStorageNode<>(idx.name(), ctx, rowType, rowsIter, filters, prj);
+        }
+        else {
+            Iterable<Row> rowsIter = tbl.scan(ctx, grp, requiredColumns);
+
+            return new ScanStorageNode<>(tbl.name(), ctx, rowType, rowsIter, filters, prj);
+        }
     }
 
     /** {@inheritDoc} */

modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/exp/ExpressionFactoryImpl.java

@@ -109,6 +109,9 @@ public class ExpressionFactoryImpl<Row> implements ExpressionFactory<Row> {
     /** */
     private final RelDataType nullType;
 
+    /** */
+    private final RelDataType booleanType;
+
     /** */
     private final ExecutionContext<Row> ctx;
 
@@ -126,6 +129,7 @@ public ExpressionFactoryImpl(
 
         emptyType = new RelDataTypeFactory.Builder(this.typeFactory).build();
         nullType = typeFactory.createSqlType(SqlTypeName.NULL);
+        booleanType = typeFactory.createJavaType(Boolean.class);
     }
 
     /** {@inheritDoc} */
@@ -624,7 +628,7 @@ private abstract class AbstractScalarPredicate<T extends Scalar> {
         private AbstractScalarPredicate(T scalar) {
             this.scalar = scalar;
             hnd = ctx.rowHandler();
-            out = hnd.factory(typeFactory, typeFactory.createJavaType(Boolean.class)).create();
+            out = hnd.factory(typeFactory, booleanType).create();
         }
     }
 

modules/core/src/main/java/org/apache/ignite/spi/indexing/IndexingQueryCacheFilter.java

@@ -17,7 +17,7 @@
 
 package org.apache.ignite.spi.indexing;
 
-import java.util.Set;
+import java.util.BitSet;
 import org.apache.ignite.cluster.ClusterNode;
 import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
 import org.apache.ignite.internal.processors.cache.GridCacheAffinityManager;
@@ -30,7 +30,7 @@ public class IndexingQueryCacheFilter {
     private final GridCacheAffinityManager aff;
 
     /** Partitions. */
-    private final Set<Integer> parts;
+    private final BitSet parts;
 
     /** Topology version. */
     private final AffinityTopologyVersion topVer;
@@ -46,7 +46,7 @@ public class IndexingQueryCacheFilter {
      * @param topVer Topology version.
      * @param locNode Local node.
      */
-    public IndexingQueryCacheFilter(GridCacheAffinityManager aff, Set<Integer> parts,
+    public IndexingQueryCacheFilter(GridCacheAffinityManager aff, BitSet parts,
         AffinityTopologyVersion topVer, ClusterNode locNode) {
         this.aff = aff;
         this.parts = parts;
@@ -76,6 +76,6 @@ public boolean applyPartition(int part) {
         if (parts == null)
             return aff.primaryByPartition(locNode, part, topVer);
         else
-            return parts.contains(part);
+            return parts.get(part);
     }
 }

modules/core/src/main/java/org/apache/ignite/spi/indexing/IndexingQueryFilterImpl.java

@@ -17,7 +17,7 @@
 
 package org.apache.ignite.spi.indexing;
 
-import java.util.HashSet;
+import java.util.BitSet;
 import org.apache.ignite.internal.GridKernalContext;
 import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
 import org.apache.ignite.internal.processors.cache.GridCacheAdapter;
@@ -37,7 +37,7 @@ public class IndexingQueryFilterImpl implements IndexingQueryFilter {
     private final AffinityTopologyVersion topVer;
 
     /** Partitions. */
-    private final HashSet<Integer> parts;
+    private final BitSet parts;
 
     /**
      * Treat replicated as partitioned.
@@ -71,10 +71,10 @@ public IndexingQueryFilterImpl(GridKernalContext ctx, @Nullable AffinityTopology
         if (F.isEmpty(partsArr))
             parts = null;
         else {
-            parts = new HashSet<>();
+            parts = new BitSet();
 
             for (int part : partsArr)
-                parts.add(part);
+                parts.set(part);
         }
 
         this.treatReplicatedAsPartitioned = treatReplicatedAsPartitioned;