[fix][dingo-calcite] Change tableScan expression compilation from SqlExpr to RelOp

wt0530 · githubgxll · commit 504311c470df · 2026-01-27T17:54:17.000+08:00
diff --git a/dingo-calcite/src/main/java/io/dingodb/calcite/rel/LogicalDingoTableScan.java b/dingo-calcite/src/main/java/io/dingodb/calcite/rel/LogicalDingoTableScan.java
@@ -21,7 +21,11 @@
 import io.dingodb.calcite.fun.DingoOperatorTable;
 import io.dingodb.calcite.stats.StatsCache;
 import io.dingodb.calcite.utils.RelDataTypeUtils;
+import io.dingodb.calcite.visitor.RexConverter;
 import io.dingodb.common.type.TupleMapping;
+import io.dingodb.expr.rel.RelOp;
+import io.dingodb.expr.rel.op.RelOpBuilder;
+import io.dingodb.expr.runtime.expr.Expr;
 import io.dingodb.meta.entity.Column;
 import io.dingodb.meta.entity.IndexTable;
 import io.dingodb.meta.entity.Table;
@@ -67,6 +71,8 @@ public class LogicalDingoTableScan extends TableScan {
     @Getter
     protected final RexNode filter;
     @Getter
+    protected RelOp relOp;
+    @Getter
     protected TupleMapping selection;
     @Getter
     protected TupleMapping realSelection;
@@ -161,6 +167,10 @@ public LogicalDingoTableScan(
         // The vector distance function adapts to the corresponding function based on the table vector type
         // such as L2_ Distance, ip_ Distance, cosine_ Distance, etc
         if (filter != null) {
+            Expr expr = RexConverter.convert(filter);
+            relOp = RelOpBuilder.builder()
+                .filter(expr)
+                .build();
             dispatchDistanceCondition(filter, selection, dingoTable);
         }
     }
diff --git a/dingo-calcite/src/main/java/io/dingodb/calcite/utils/CalcValueUtils.java b/dingo-calcite/src/main/java/io/dingodb/calcite/utils/CalcValueUtils.java
@@ -52,6 +52,7 @@ public static Object calcValue(
         etx.setTuple(tuple);
 
         ExprCompiler exprCompiler = ExprCompiler.ADVANCED;
+        exprCompiler.setProcessor(config.getProcessor());
 
         try {
             if ((rexNode instanceof RexCall)
diff --git a/dingo-calcite/src/main/java/io/dingodb/calcite/visitor/function/DingoGetByIndexMergeVisitFun.java b/dingo-calcite/src/main/java/io/dingodb/calcite/visitor/function/DingoGetByIndexMergeVisitFun.java
@@ -43,6 +43,7 @@
 import io.dingodb.exec.operator.params.IndexMergeParam;
 import io.dingodb.exec.operator.params.TxnGetByIndexParam;
 import io.dingodb.exec.transaction.base.ITransaction;
+import io.dingodb.expr.rel.RelOp;
 import io.dingodb.meta.MetaService;
 import io.dingodb.meta.entity.Column;
 import io.dingodb.meta.entity.Table;
@@ -140,12 +141,14 @@ public static Collection<Vertex> visit(
                     visitor.isForUpdate());
 
                 Vertex vertex;
+                RelOp relOp = rel.getRelOp();
                 if (transaction != null) {
                     vertex = new Vertex(TXN_GET_BY_INDEX, new TxnGetByIndexParam(
                         idxId,
                         tableInfo.getId(),
                         tupleMapping,
-                        SqlExprUtils.toSqlExpr(rel.getFilter()),
+                        relOp != null ? null : SqlExprUtils.toSqlExpr(rel.getFilter()),
+                        relOp,
                         lookupKeyMapping,
                         rel.isUnique(),
                         indexTd,
diff --git a/dingo-calcite/src/main/java/io/dingodb/calcite/visitor/function/DingoGetByIndexVisitFun.java b/dingo-calcite/src/main/java/io/dingodb/calcite/visitor/function/DingoGetByIndexVisitFun.java
@@ -41,6 +41,7 @@
 import io.dingodb.exec.operator.params.GetByIndexParam;
 import io.dingodb.exec.operator.params.TxnGetByIndexParam;
 import io.dingodb.exec.transaction.base.ITransaction;
+import io.dingodb.expr.rel.RelOp;
 import io.dingodb.meta.MetaService;
 import io.dingodb.meta.entity.Column;
 import io.dingodb.meta.entity.Table;
@@ -140,12 +141,14 @@ public static LinkedList<Vertex> visit(
                     visitor.isForUpdate());
 
                 Vertex vertex;
+                RelOp relOp = rel.getRelOp();
                 if (transaction != null) {
                     vertex = new Vertex(TXN_GET_BY_INDEX, new TxnGetByIndexParam(
                         idxId,
                         tableInfo.getId(),
                         tupleMapping,
-                        SqlExprUtils.toSqlExpr(rel.getFilter()),
+                        relOp != null ? null : SqlExprUtils.toSqlExpr(rel.getFilter()),
+                        relOp,
                         rel.getSelection(),
                         rel.isUnique(),
                         indexTd,
diff --git a/dingo-calcite/src/main/java/io/dingodb/calcite/visitor/function/DingoGetByKeysFun.java b/dingo-calcite/src/main/java/io/dingodb/calcite/visitor/function/DingoGetByKeysFun.java
@@ -40,6 +40,7 @@
 import io.dingodb.exec.operator.params.GetDistributionParam;
 import io.dingodb.exec.operator.params.TxnGetByKeysParam;
 import io.dingodb.exec.transaction.base.ITransaction;
+import io.dingodb.expr.rel.RelOp;
 import io.dingodb.meta.entity.Table;
 import io.dingodb.store.api.transaction.data.IsolationLevel;
 import io.dingodb.tso.TsoService;
@@ -100,13 +101,15 @@ public static List<Vertex> visit(
         distributionVertex.setId(idGenerator.getOperatorId(task.getId()));
         task.putVertex(distributionVertex);
         Vertex getVertex;
+        RelOp relOp = rel.getRelOp();
         long scanTs = VisitUtils.getScanTs(transaction, visitor.getKind(), visitor.getPointTs(), visitor.isForUpdate());
         if (transaction != null) {
             TxnGetByKeysParam param = new TxnGetByKeysParam(
                 tableInfo.getId(),
                 td.tupleType(),
                 td.keyMapping(),
-                SqlExprUtils.toSqlExpr(rel.getFilter()),
+                relOp != null ? null : SqlExprUtils.toSqlExpr(rel.getFilter()),
+                relOp,
                 rel.getSelection(),
                 td,
                 scanTs,
diff --git a/dingo-calcite/src/main/java/io/dingodb/calcite/visitor/function/DingoTableScanVisitFun.java b/dingo-calcite/src/main/java/io/dingodb/calcite/visitor/function/DingoTableScanVisitFun.java
@@ -42,6 +42,7 @@
 import io.dingodb.exec.operator.params.PartRangeScanParam;
 import io.dingodb.exec.operator.params.TxnPartRangeScanParam;
 import io.dingodb.exec.transaction.base.ITransaction;
+import io.dingodb.expr.rel.RelOp;
 import io.dingodb.meta.entity.Table;
 import io.dingodb.store.api.transaction.data.IsolationLevel;
 import lombok.extern.slf4j.Slf4j;
@@ -121,6 +122,7 @@ private DingoTableScanVisitFun() {
         List<Vertex> outputs = new ArrayList<>();
 
         long scanTs = VisitUtils.getScanTs(transaction, visitor.getKind(), visitor.getPointTs(), visitor.isForUpdate());
+        RelOp relOp = rel.getRelOp();
         for (int i = 0; i < Optional.mapOrGet(td.getPartitions(), List::size, () -> 0); i++) {
             Vertex scanVertex;
             if (transaction != null) {
@@ -135,7 +137,8 @@ private DingoTableScanVisitFun() {
                     td.tupleType(),
                     td.keyMapping(),
                     td.version,
-                    Optional.mapOrNull(filter, SqlExpr::copy),
+                    relOp != null ? null : Optional.mapOrNull(filter, SqlExpr::copy),
+                    relOp,
                     rel.getSelection(),
                     rel.getGroupSet() == null ? null
                         : AggFactory.getAggKeys(rel.getGroupSet()),
diff --git a/dingo-client/src/main/java/io/dingodb/client/OperationServiceV2.java b/dingo-client/src/main/java/io/dingodb/client/OperationServiceV2.java
@@ -638,6 +638,7 @@ private List<Vertex> getByKey(Table td,
                     td.keyMapping(),
                     null,
                     null,
+                    null,
                     td,
                     scanTs,
                     transaction.getIsolationLevel(),
diff --git a/dingo-exec/src/main/java/io/dingodb/exec/operator/FilterProjectOperator.java b/dingo-exec/src/main/java/io/dingodb/exec/operator/FilterProjectOperator.java
@@ -22,6 +22,8 @@
 import io.dingodb.exec.expr.SqlExpr;
 import io.dingodb.exec.operator.data.Context;
 import io.dingodb.exec.operator.params.FilterProjectParam;
+import io.dingodb.expr.rel.RelOp;
+import io.dingodb.expr.rel.op.FilterOp;
 import org.checkerframework.checker.nullness.qual.NonNull;
 
 import java.util.Iterator;
@@ -33,6 +35,7 @@ protected Iterator<Object[]> createIterator(Context context, Object[] tuple, Ver
         FilterProjectParam param = vertex.getParam();
         Iterator<Object[]> iterator = createSourceIterator(context, tuple, vertex);
         SqlExpr filter = param.getFilter();
+        RelOp relOp = param.getRelOp();
         TupleMapping selection = param.getSelection();
         if (selection != null) {
             iterator = Iterators.transform(iterator, selection::revMap);
@@ -47,6 +50,16 @@ protected Iterator<Object[]> createIterator(Context context, Object[] tuple, Ver
                 }
             );
         }
+        if (relOp != null) {
+            iterator = Iterators.filter(
+                iterator,
+                t -> {
+                    vertex.incrementCnt();
+                    Object[] v = ((FilterOp) relOp).put(t);
+                    return v != null;
+                }
+            );
+        }
         return iterator;
     }
 
diff --git a/dingo-exec/src/main/java/io/dingodb/exec/operator/params/FilterProjectParam.java b/dingo-exec/src/main/java/io/dingodb/exec/operator/params/FilterProjectParam.java
@@ -24,7 +24,11 @@
 import io.dingodb.common.type.DingoType;
 import io.dingodb.common.type.TupleMapping;
 import io.dingodb.exec.dag.Vertex;
+import io.dingodb.exec.expr.DingoCompileContext;
+import io.dingodb.exec.expr.DingoRelConfig;
 import io.dingodb.exec.expr.SqlExpr;
+import io.dingodb.expr.common.type.TupleType;
+import io.dingodb.expr.rel.RelOp;
 import lombok.Getter;
 
 import static com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility.ANY;
@@ -44,10 +48,13 @@ public abstract class FilterProjectParam extends AbstractParams {
     public final int codecVersion;
     @JsonProperty("filter")
     public SqlExpr filter;
+    @JsonProperty("relOp")
+    public RelOp relOp;
     @JsonProperty("selection")
     public TupleMapping selection;
     @JsonProperty("keyMapping")
     public final TupleMapping keyMapping;
+    public final transient DingoRelConfig config;
 
     public FilterProjectParam(
         CommonId tableId,
@@ -57,6 +64,19 @@ public FilterProjectParam(
         TupleMapping selection,
         TupleMapping keyMapping,
         int codecVersion
+    ) {
+        this(tableId, schema, schemaVersion, filter, selection, keyMapping, codecVersion, null);
+    }
+
+    public FilterProjectParam(
+        CommonId tableId,
+        DingoType schema,
+        int schemaVersion,
+        SqlExpr filter,
+        TupleMapping selection,
+        TupleMapping keyMapping,
+        int codecVersion,
+        RelOp relOp
     ) {
         super();
         this.tableId = tableId;
@@ -66,10 +86,22 @@ public FilterProjectParam(
         this.selection = selection;
         this.keyMapping = keyMapping;
         this.codecVersion = codecVersion;
+        this.relOp = relOp;
+        this.config = new DingoRelConfig();
     }
 
     @Override
     public void init(Vertex vertex) {
+        if (relOp != null) {
+            TupleType tupleType = (TupleType) schema.getType();
+            if (selection != null) {
+                tupleType = (TupleType) schema.select(selection).getType();
+            }
+            relOp = relOp.compile(new DingoCompileContext(
+                tupleType,
+                (TupleType) vertex.getParasType().getType()
+            ), config);
+        }
         if (filter != null) {
             if (selection != null) {
                 filter.compileIn(schema.select(selection), vertex.getParasType());
@@ -85,6 +117,7 @@ public void setParas(Object[] paras) {
         if (filter != null) {
             filter.setParas(paras);
         }
+        config.getEvalContext().setParas(paras);
     }
 }
 
diff --git a/dingo-exec/src/main/java/io/dingodb/exec/operator/params/TxnGetByIndexParam.java b/dingo-exec/src/main/java/io/dingodb/exec/operator/params/TxnGetByIndexParam.java
@@ -27,6 +27,7 @@
 import io.dingodb.common.type.TupleMapping;
 import io.dingodb.exec.dag.Vertex;
 import io.dingodb.exec.expr.SqlExpr;
+import io.dingodb.expr.rel.RelOp;
 import io.dingodb.meta.entity.Column;
 import io.dingodb.meta.entity.Table;
 import lombok.Getter;
@@ -65,6 +66,7 @@ public TxnGetByIndexParam(
         CommonId tableId,
         TupleMapping keyMapping,
         SqlExpr filter,
+        RelOp relOp,
         TupleMapping selection,
         boolean isUnique,
         Table index,
@@ -74,7 +76,7 @@ public TxnGetByIndexParam(
         long timeout,
         boolean isAutoCommit
     ) {
-        super(tableId, table.tupleType(), table.version, filter, selection, keyMapping, table.getCodecVersion());
+        super(tableId, table.tupleType(), table.version, filter, selection, keyMapping, table.getCodecVersion(), relOp);
         this.indexTableId = indexTableId;
         this.isLookup = isLookup;
         this.isUnique = isUnique;
diff --git a/dingo-exec/src/main/java/io/dingodb/exec/operator/params/TxnGetByKeysParam.java b/dingo-exec/src/main/java/io/dingodb/exec/operator/params/TxnGetByKeysParam.java
@@ -25,6 +25,7 @@
 import io.dingodb.common.type.DingoType;
 import io.dingodb.common.type.TupleMapping;
 import io.dingodb.exec.expr.SqlExpr;
+import io.dingodb.expr.rel.RelOp;
 import io.dingodb.meta.entity.Table;
 import lombok.Getter;
 import lombok.Setter;
@@ -53,14 +54,15 @@ public TxnGetByKeysParam(
         DingoType schema,
         TupleMapping keyMapping,
         SqlExpr filter,
+        RelOp relOp,
         TupleMapping selection,
         Table table,
         long scanTs,
         int isolationLevel,
         long timeOut,
         boolean isSelect
     ) {
-        super(tableId, schema, table.version, filter, selection, keyMapping, table.getCodecVersion());
+        super(tableId, schema, table.version, filter, selection, keyMapping, table.getCodecVersion(), relOp);
         this.codec = CodecService.getDefault().createKeyValueCodec(
             table.getCodecVersion(), table.version, table.tupleType(), table.keyMapping());
         this.table = table;
diff --git a/dingo-exec/src/main/java/io/dingodb/exec/operator/params/TxnPartRangeScanParam.java b/dingo-exec/src/main/java/io/dingodb/exec/operator/params/TxnPartRangeScanParam.java
@@ -32,6 +32,7 @@
 import io.dingodb.exec.dag.Vertex;
 import io.dingodb.exec.expr.SqlExpr;
 import io.dingodb.exec.utils.SchemaWrapperUtils;
+import io.dingodb.expr.rel.RelOp;
 import lombok.Getter;
 
 import java.util.List;
@@ -72,6 +73,7 @@ public TxnPartRangeScanParam(
         TupleMapping keyMapping,
         int schemaVersion,
         SqlExpr filter,
+        RelOp relOp,
         TupleMapping selection,
         TupleMapping aggKeys,
         List<Agg> aggList,
@@ -83,7 +85,7 @@ public TxnPartRangeScanParam(
         int codecVersion,
         boolean isAutoCommit
     ) {
-        super(tableId, schema, schemaVersion, filter, selection, keyMapping, codecVersion);
+        super(tableId, schema, schemaVersion, filter, selection, keyMapping, codecVersion, relOp);
         this.aggKeys = aggKeys;
         this.aggList = aggList;
         this.outputSchema = outputSchema;
