database/doris
2
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Fix bug: Enable StringLiteral cast to Varchar (#1846)

Browse Source 
StringLiteral could be cast to VARCHAR or CHAR.
The default value of lead and lag function could be 'String' when the column type is CHAR or VARCHAR.
This commit is contained in:
EmmyMiao87
2019-09-23 18:42:25 +08:00
committed by ZHAO Chun
parent 4c7b52d077
commit fded13e3cd
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
fe/src/main/java/org/apache/doris/analysis/AnalyticExpr.java
View File

@ -17,10 +17,6 @@
package org.apache.doris.analysis;
import com.google.common.base.Joiner;
import com.google.common.base.Objects;
import com.google.common.base.Preconditions;
import com.google.common.collect.Lists;
import org.apache.doris.analysis.AnalyticWindow.Boundary;
import org.apache.doris.analysis.AnalyticWindow.BoundaryType;
import org.apache.doris.catalog.AggregateFunction;
@ -30,6 +26,12 @@ import org.apache.doris.catalog.Type;
import org.apache.doris.common.AnalysisException;
import org.apache.doris.common.TreeNode;
import org.apache.doris.thrift.TExprNode;
import com.google.common.base.Joiner;
import com.google.common.base.Objects;
import com.google.common.base.Preconditions;
import com.google.common.collect.Lists;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -288,6 +290,10 @@ public class AnalyticExpr extends Expr {
return;
}
if (!getFnCall().getChild(0).getType().getPrimitiveType().isNumericType()) {
return;
}
double value = val.getConstFromExpr(val);
PrimitiveType type = getFnCall().getChild(0).getType().getPrimitiveType();
boolean out = false;

6
fe/src/main/java/org/apache/doris/analysis/StringLiteral.java
View File

@ -28,6 +28,7 @@ import org.apache.doris.thrift.TExprNodeType;
import org.apache.doris.thrift.TStringLiteral;
import com.google.common.base.Preconditions;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@ -202,6 +203,11 @@ public class StringLiteral extends LiteralExpr {
} catch (AnalysisException e) {
// pass;
}
} else if (targetType.equals(type)) {
return this;
} else if (targetType.isStringType()) {
type = targetType;
return this;
}
return super.uncheckedCastTo(targetType);
}