[fix][runtime] Fix construct intervals using table fields

Author: wt0530

runtime/src/main/java/io/dingodb/expr/runtime/expr/Exprs.java

@@ -203,6 +203,8 @@ public final class Exprs {
         io.dingodb.expr.runtime.op.interval.SubOpFactory.INSTANCE;
     public static final io.dingodb.expr.runtime.op.interval.AddOpFactory INTERVAL_ADD =
         io.dingodb.expr.runtime.op.interval.AddOpFactory.INSTANCE;
+    public static final io.dingodb.expr.runtime.op.interval.MulOpFactory INTERVAL_MUL =
+        io.dingodb.expr.runtime.op.interval.MulOpFactory.INSTANCE;
 
     // Relations
     public static final EqOpFactory EQ = EqOpFactory.INSTANCE;

runtime/src/main/java/io/dingodb/expr/runtime/op/BinaryIntervalOp.java

@@ -44,7 +44,7 @@ public static IntervalType buildInterval(BigDecimal value0, IntervalType value1)
             return new IntervalYearType.IntervalYear(value0.multiply(new BigDecimal(12)),
                 ((IntervalYearType.IntervalYear) value1).elementType);
         } else if (value1 instanceof IntervalMonthType.IntervalMonth) {
-            return new IntervalMonthType.IntervalMonth(value0, null);
+            return new IntervalMonthType.IntervalMonth(value0, ((IntervalMonthType.IntervalMonth) value1).elementType);
         } else if (value1 instanceof IntervalDayType.IntervalDay) {
             return new IntervalDayType.IntervalDay(value0.multiply(new BigDecimal(24 * 60 * 60 * 1000)),
                 ((IntervalDayType.IntervalDay) value1).elementType

runtime/src/main/java/io/dingodb/expr/runtime/op/interval/AddOp.java

@@ -64,40 +64,6 @@ static Date add(Date value0, IntervalYearType.IntervalYear value1, ExprConfig co
         return (Date) processor.getTierProcessor().convertOutput(dateTime, DateTimeType.DATE);
     }
 
-    static IntervalType add(Integer value0, IntervalType value1) {
-        BigDecimal decimal = new BigDecimal(Math.round(CastWithString.doubleCastWithStringCompat(value0.toString())));
-        return buildInterval(decimal, value1);
-    }
-
-    static IntervalType add(Long value0, IntervalType value1) {
-        BigDecimal decimal = new BigDecimal(Math.round(CastWithString.doubleCastWithStringCompat(value0.toString())));
-        return buildInterval(decimal, value1);
-    }
-
-    static IntervalType add(Double value0, IntervalType value1) {
-        BigDecimal decimal = new BigDecimal(Math.round(CastWithString.doubleCastWithStringCompat(value0.toString())));
-        return buildInterval(decimal, value1);
-    }
-
-    static IntervalType add(Float value0, IntervalType value1) {
-        BigDecimal decimal = new BigDecimal(Math.round(CastWithString.doubleCastWithStringCompat(value0.toString())));
-        return buildInterval(decimal, value1);
-    }
-
-    static IntervalType add(Boolean value0, IntervalType value1) {
-        BigDecimal decimal = new BigDecimal(value0 ? 1 : 0);
-        return buildInterval(decimal, value1);
-    }
-
-    static IntervalType add(BigDecimal value0, IntervalType value1) {
-        BigDecimal decimal = new BigDecimal(Math.round(CastWithString.doubleCastWithStringCompat(value0.toString())));
-        return buildInterval(decimal, value1);
-    }
-
-    static IntervalType add(Void value0, IntervalType value1) {
-        return null;
-    }
-
     static Date add(Date value0, IntervalMonthType.IntervalMonth value1, ExprConfig config) {
         DingoTimeZoneProcessor processor = config.getProcessor();
         DingoDateTime input = processor.getTierProcessor().convertInput(value0, DateTimeType.DATE);

runtime/src/main/java/io/dingodb/expr/runtime/op/interval/MulOp.java

@@ -0,0 +1,84 @@
+/*
+ * Copyright 2021 DataCanvas
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.dingodb.expr.runtime.op.interval;
+
+import io.dingodb.expr.annotations.Operators;
+import io.dingodb.expr.common.type.IntervalType;
+import io.dingodb.expr.common.utils.CastWithString;
+import io.dingodb.expr.runtime.op.BinaryIntervalOp;
+
+import java.math.BigDecimal;
+import java.sql.Date;
+import java.sql.Time;
+import java.sql.Timestamp;
+
+@Operators
+public class MulOp extends BinaryIntervalOp {
+
+    private static final long serialVersionUID = -1357285098612662070L;
+
+    static IntervalType mul(String value0, IntervalType value1) {
+        BigDecimal decimal = new BigDecimal(CastWithString.longCastWithStringCompat(value0.split("\\.")[0]));
+        return buildInterval(decimal, value1);
+    }
+
+    static IntervalType mul(Integer value0, IntervalType value1) {
+        BigDecimal decimal = new BigDecimal(Math.round(CastWithString.doubleCastWithStringCompat(value0.toString())));
+        return buildInterval(decimal, value1);
+    }
+
+    static IntervalType mul(Long value0, IntervalType value1) {
+        BigDecimal decimal = new BigDecimal(Math.round(CastWithString.doubleCastWithStringCompat(value0.toString())));
+        return buildInterval(decimal, value1);
+    }
+
+    static IntervalType mul(Double value0, IntervalType value1) {
+        BigDecimal decimal = new BigDecimal(Math.round(CastWithString.doubleCastWithStringCompat(value0.toString())));
+        return buildInterval(decimal, value1);
+    }
+
+    static IntervalType mul(Float value0, IntervalType value1) {
+        BigDecimal decimal = new BigDecimal(Math.round(CastWithString.doubleCastWithStringCompat(value0.toString())));
+        return buildInterval(decimal, value1);
+    }
+
+    static IntervalType mul(Boolean value0, IntervalType value1) {
+        BigDecimal decimal = new BigDecimal(value0 ? 1 : 0);
+        return buildInterval(decimal, value1);
+    }
+
+    static IntervalType mul(BigDecimal value0, IntervalType value1) {
+        BigDecimal decimal = new BigDecimal(Math.round(CastWithString.doubleCastWithStringCompat(value0.toString())));
+        return buildInterval(decimal, value1);
+    }
+
+    static IntervalType mul(Date value0, IntervalType value1) {
+        return null;
+    }
+
+    static IntervalType mul(Time value0, IntervalType value1) {
+        return null;
+    }
+
+    static IntervalType mul(Timestamp value0, IntervalType value1) {
+        return null;
+    }
+
+    static IntervalType mul(Void value0, IntervalType value1) {
+        return null;
+    }
+}