[fix][dingo-calcite] Support hashjoin nonEqui expr

dingodb · Feb 11, 2025 · cea52cb · cea52cb
1 parent a860ce8
commit cea52cb
Show file tree

Hide file tree

Showing 12 changed files with 71 additions and 513 deletions.
diff --git a/dingo-calcite/src/main/java/io/dingodb/calcite/DingoDdlExecutor.java b/dingo-calcite/src/main/java/io/dingodb/calcite/DingoDdlExecutor.java
@@ -798,7 +798,7 @@ public void execute(DingoSqlCreateView sqlCreateView, CalcitePrepare.Context con
                 int precision = f.getType().getPrecision();
                 int scale = f.getType().getScale();
                 String name = f.getType().getSqlTypeName().getName();
-                if ("BIGINT".equals(name) || "FLOAT".equals(name)) {
+                if ("BIGINT".equals(name) || "FLOAT".equals(name) || "INTEGER".equals(name)) {
                     precision = -1;
                     scale = -2147483648;
                 }

diff --git a/dingo-calcite/src/main/java/io/dingodb/calcite/plan/RelUtil.java b/dingo-calcite/src/main/java/io/dingodb/calcite/plan/RelUtil.java
diff --git a/dingo-calcite/src/main/java/io/dingodb/calcite/rule/DingoRules.java b/dingo-calcite/src/main/java/io/dingodb/calcite/rule/DingoRules.java
@@ -192,7 +192,6 @@ public final class DingoRules {
     public static final  DingoDocumentProjectRule DINGO_DOCUMENT_PROJECT_RULE
         = DingoDocumentProjectRule.Config.DEFAULT.toRule();
 
-    public static final FilterOrJoinRule filterOrJoinRule = FilterOrJoinRule.Config.DEFAULT.toRule();
 
     private static final List<RelOptRule> rules = ImmutableList.of(
         CoreRules.AGGREGATE_EXPAND_DISTINCT_AGGREGATES,
@@ -206,7 +205,6 @@ public final class DingoRules {
         CoreRules.JOIN_ASSOCIATE,
         //JoinPushThroughJoinRule.LEFT,
         //JoinPushThroughJoinRule.RIGHT,
-        filterOrJoinRule,
         CoreRules.PROJECT_SUB_QUERY_TO_CORRELATE,
         DingoPhysicalRules.DINGO_HASH_JOIN_RULE,
         DingoPhysicalRules.DINGO_ROOT_RULE,