Skip to content

Commit

Permalink
[bug](fold) fix fold date/datetime error as null
Browse files Browse the repository at this point in the history
  • Loading branch information
@zhangstar333
zhangstar333 committed Apr 18, 2024
1 parent 21230a3 commit b5a9093
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 15 deletions.
44 changes: 30 additions & 14 deletions ...e/src/main/java/org/apache/doris/nereids/rules/expression/rules/FoldConstantRuleOnBE.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,12 @@
import org.apache.doris.nereids.rules.expression.ExpressionPatternMatcher;
import org.apache.doris.nereids.rules.expression.ExpressionPatternRuleFactory;
import org.apache.doris.nereids.trees.expressions.Alias;
import org.apache.doris.nereids.trees.expressions.ArrayItemReference;
import org.apache.doris.nereids.trees.expressions.Cast;
import org.apache.doris.nereids.trees.expressions.Expression;
import org.apache.doris.nereids.trees.expressions.Match;
import org.apache.doris.nereids.trees.expressions.functions.generator.TableGeneratingFunction;
import org.apache.doris.nereids.trees.expressions.functions.scalar.Sleep;
import org.apache.doris.nereids.trees.expressions.functions.scalar.Tokenize;
import org.apache.doris.nereids.trees.expressions.literal.ArrayLiteral;
import org.apache.doris.nereids.trees.expressions.literal.BigIntLiteral;
import org.apache.doris.nereids.trees.expressions.literal.BooleanLiteral;
Expand Down Expand Up @@ -197,7 +198,12 @@ private static void collectConst(Expression expr, Map<String, Expression> constM
|| expr.getDataType().isIPv6Type()) {
return;
}
if (skipSleepFunction(expr) || (expr instanceof TableGeneratingFunction)) {
// first need pass PlanTranslatorContext value,
// and ArrayItemReference translate, can't findColumnRef
// Match need give more info rather then as left child a NULL, in
// match_phrase_prefix/MATCH_PHRASE/MATCH_PHRASE/MATCH_ANY
if (skipSleepFunction(expr) || (expr instanceof TableGeneratingFunction)
|| (expr instanceof ArrayItemReference) || (expr instanceof Match)) {
return;
}
// Tokenize function want check the second child literal must be string type
Expand Down Expand Up @@ -286,7 +292,7 @@ private static Map<String, Expression> evalOnBE(Map<String, Map<String, TExpr>>
List<Literal> resultExpression = getResultExpression(type, resultContent);
if (resultExpression.isEmpty()) {
ret = constMap.get(e1.getKey());
LOG.debug("Be constant folding convert {} to {} failed query_id: {}", e1.getKey(), ret,
LOG.warn("Be constant folding convert {} to {} failed query_id: {}", e1.getKey(), ret,
DebugUtil.printId(context.queryId()));
} else {
ret = resultExpression.get(0);
Expand Down Expand Up @@ -320,8 +326,7 @@ public static List<Literal> getResultExpression(DataType type, PValues resultCon
if (type.isNullType()) {
int num = resultContent.getNullMapCount();
for (int i = 0; i < num; ++i) {
Literal literal = new NullLiteral(type);
res.add(literal);
res.add(new NullLiteral(type));
}
} else if (type.isBooleanType()) {
int num = resultContent.getUint32ValueCount();
Expand Down Expand Up @@ -412,19 +417,27 @@ public static List<Literal> getResultExpression(DataType type, PValues resultCon
for (int i = 0; i < num; ++i) {
long uint64Value = resultContent.getUint64Value(i);
LocalDateTime dateTimeV2 = convertToJavaDateTimeV2(uint64Value);
Literal literal = new DateTimeV2Literal((DateTimeV2Type) type, dateTimeV2.getYear(),
dateTimeV2.getMonthValue(), dateTimeV2.getDayOfMonth(), dateTimeV2.getHour(),
dateTimeV2.getMinute(), dateTimeV2.getSecond(), dateTimeV2.getNano() / 1000);
res.add(literal);
if (dateTimeV2 == null && resultContent.hasHasNull()) {
res.add(new NullLiteral(type));
} else {
Literal literal = new DateTimeV2Literal((DateTimeV2Type) type, dateTimeV2.getYear(),
dateTimeV2.getMonthValue(), dateTimeV2.getDayOfMonth(), dateTimeV2.getHour(),
dateTimeV2.getMinute(), dateTimeV2.getSecond(), dateTimeV2.getNano() / 1000);
res.add(literal);
}
}
} else if (type.isDateV2Type()) {
int num = resultContent.getUint32ValueCount();
for (int i = 0; i < num; ++i) {
int uint32Value = resultContent.getUint32Value(i);
LocalDate localDate = convertToJavaDateV2(uint32Value);
DateV2Literal dateV2Literal = new DateV2Literal(localDate.getYear(), localDate.getMonthValue(),
localDate.getDayOfMonth());
res.add(dateV2Literal);
if (localDate == null && resultContent.hasHasNull()) {
res.add(new NullLiteral(type));
} else {
DateV2Literal dateV2Literal = new DateV2Literal(localDate.getYear(), localDate.getMonthValue(),
localDate.getDayOfMonth());
res.add(dateV2Literal);
}
}
} else if (type.isIPv4Type()) {
int num = resultContent.getUint32ValueCount();
Expand All @@ -438,8 +451,11 @@ public static List<Literal> getResultExpression(DataType type, PValues resultCon
for (int i = 0; i < num; ++i) {
String stringValue = resultContent.getStringValue(i);
// maybe need handle NULL_IN_CSV_FOR_ORDINARY_TYPE = "\\N";
JsonLiteral jsonLiteral = new JsonLiteral(stringValue);
res.add(jsonLiteral);
if ("\\N".equalsIgnoreCase(stringValue) && resultContent.hasHasNull()) {
res.add(new NullLiteral(type));
} else {
res.add(new JsonLiteral(stringValue));
}
}
} else if (type.isStringLikeType()) {
int num = resultContent.getStringValueCount();
Expand Down
2 changes: 1 addition & 1 deletion ...e/src/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/Tokenize.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public Tokenize(Expression arg0, Expression arg1) {
}

@Override
public void checkLegalityAfterRewrite() {
public void checkLegalityBeforeTypeCoercion() {
if (!(child(1) instanceof StringLikeLiteral)) {
throw new AnalysisException("tokenize second argument must be string literal");
}
Expand Down

0 comments on commit b5a9093

Please sign in to comment.