Skip to content

Commit 585bfd4

Browse files
committed
stash
1 parent 2cbcda7 commit 585bfd4

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/AddTime.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ public class AddTime extends ScalarFunction implements BinaryExpression, Explici
4040
ComputeSignatureForTimeArithmetic, PropagateNullable, DateAddSubMonotonic {
4141

4242
private static final List<FunctionSignature> SIGNATURES = ImmutableList.of(
43-
FunctionSignature.ret(DateTimeV2Type.SYSTEM_DEFAULT).args(DateTimeV2Type.WILDCARD,
44-
TimeV2Type.WILDCARD),
43+
FunctionSignature.ret(DateTimeV2Type.WILDCARD)
44+
.args(DateTimeV2Type.WILDCARD, TimeV2Type.WILDCARD),
4545
FunctionSignature.ret(TimeV2Type.WILDCARD).args(TimeV2Type.WILDCARD, TimeV2Type.WILDCARD));
4646

4747
public AddTime(Expression arg0, Expression arg1) {

fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/SubTime.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public class SubTime extends ScalarFunction implements BinaryExpression, Explici
4040
ComputeSignatureForTimeArithmetic, PropagateNullable, DateAddSubMonotonic {
4141

4242
private static final List<FunctionSignature> SIGNATURES = ImmutableList.of(
43-
FunctionSignature.ret(DateTimeV2Type.SYSTEM_DEFAULT).args(DateTimeV2Type.WILDCARD,
43+
FunctionSignature.ret(DateTimeV2Type.WILDCARD).args(DateTimeV2Type.WILDCARD,
4444
TimeV2Type.WILDCARD),
4545
FunctionSignature.ret(TimeV2Type.WILDCARD).args(TimeV2Type.WILDCARD, TimeV2Type.WILDCARD));
4646

fe/fe-core/src/main/java/org/apache/doris/nereids/util/TypeCoercionUtils.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@
6767
import org.apache.doris.nereids.trees.expressions.literal.SmallIntLiteral;
6868
import org.apache.doris.nereids.trees.expressions.literal.StringLikeLiteral;
6969
import org.apache.doris.nereids.trees.expressions.literal.StringLiteral;
70+
import org.apache.doris.nereids.trees.expressions.literal.TimeV2Literal;
7071
import org.apache.doris.nereids.trees.expressions.literal.TinyIntLiteral;
7172
import org.apache.doris.nereids.trees.expressions.literal.VarcharLiteral;
7273
import org.apache.doris.nereids.trees.expressions.literal.format.DateTimeChecker;
@@ -623,6 +624,8 @@ public static Optional<Expression> characterLiteralTypeCoercion(String value, Da
623624
ret = new VarcharLiteral(value, ((VarcharType) dataType).getLen());
624625
} else if (dataType instanceof StringType) {
625626
ret = new StringLiteral(value);
627+
} else if (dataType instanceof TimeV2Type) {
628+
ret = new TimeV2Literal(value);
626629
} else if ((dataType.isDateTimeV2Type() || dataType.isDateTimeType())
627630
&& DateTimeChecker.isValidDateTime(value)) {
628631
ret = DateTimeLiteral.parseDateTimeLiteral(value, true).orElse(null);

0 commit comments

Comments
 (0)