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

[refactor](column) remove confused field (#12187)

Browse Source
This commit is contained in:
Mingyu Chen
2022-08-31 09:13:31 +08:00
committed by GitHub
parent f72d2559cf
commit 8251e7cbfc
5 changed files with 5 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
fe/fe-core/src/main/cup/sql_parser.cup
View File

@ -4837,12 +4837,10 @@ type ::=
{: RESULT = ScalarType.createStringType(); :}
| KW_VARCHAR LPAREN INTEGER_LITERAL:len RPAREN
{: ScalarType type = ScalarType.createVarcharType(len.intValue());
type.setAssignedStrLenInColDefinition();
RESULT = type;
:}
| KW_VARCHAR LPAREN ident_or_text:lenStr RPAREN
{: ScalarType type = ScalarType.createVarcharType(lenStr);
type.setAssignedStrLenInColDefinition();
RESULT = type;
:}
| KW_VARCHAR
@ -4857,12 +4855,10 @@ type ::=
{: RESULT = new StructType(fields); :}
| KW_CHAR LPAREN INTEGER_LITERAL:len RPAREN
{: ScalarType type = ScalarType.createCharType(len.intValue());
type.setAssignedStrLenInColDefinition();
RESULT = type;
:}
| KW_CHAR LPAREN ident_or_text:lenStr RPAREN
{: ScalarType type = ScalarType.createCharType(lenStr);
type.setAssignedStrLenInColDefinition();
RESULT = type;
:}
| KW_CHAR
@ -4889,7 +4885,6 @@ type ::=
{: RESULT = ScalarType.createDecimalV3Type(precision, scale); :}
| KW_HLL
{: ScalarType type = ScalarType.createHllType();
type.setAssignedStrLenInColDefinition();
RESULT = type;
:}
| KW_ALL

3
fe/fe-core/src/main/java/org/apache/doris/analysis/CastExpr.java
View File

@ -342,8 +342,7 @@ public class CastExpr extends Expr {
// of cast is decided by child.
if (targetTypeDef.getType().isScalarType()) {
final ScalarType targetType = (ScalarType) targetTypeDef.getType();
if (!(targetType.getPrimitiveType().isStringType()
&& !targetType.isAssignedStrLenInColDefinition())) {
if (!(targetType.getPrimitiveType().isStringType() && !targetType.isLengthSet())) {
targetTypeDef.analyze(analyzer);
}
} else {

3
fe/fe-core/src/main/java/org/apache/doris/analysis/ColumnDef.java
View File

@ -205,8 +205,7 @@ public class ColumnDef {
// When string type length is not assigned, it need to be assigned to 1.
if (typeDef.getType().isScalarType()) {
final ScalarType targetType = (ScalarType) typeDef.getType();
if (targetType.getPrimitiveType().isStringType()
&& !targetType.isAssignedStrLenInColDefinition()) {
if (targetType.getPrimitiveType().isStringType() && !targetType.isLengthSet()) {
targetType.setLength(1);
}
}

3
fe/fe-core/src/main/java/org/apache/doris/analysis/TypeDef.java
View File

@ -129,8 +129,7 @@ public class TypeDef implements ParseNode {
throw new AnalysisException("Array unsupported sub-type: " + type.toSql());
}
if (type.getPrimitiveType().isStringType()
&& !type.isAssignedStrLenInColDefinition()) {
if (type.getPrimitiveType().isStringType() && !type.isLengthSet()) {
type.setLength(1);
}
analyze(type);

10
fe/fe-core/src/main/java/org/apache/doris/catalog/ScalarType.java
View File

@ -87,8 +87,6 @@ public class ScalarType extends Type {
// Only used for type CHAR.
@SerializedName(value = "len")
private int len = -1;
@SerializedName(value = "isAssignedStrLenInColDefinition")
private boolean isAssignedStrLenInColDefinition = false;
// Only used if type is DECIMAL. -1 (for both) is used to represent a
// decimal with any precision and scale.
@ -660,12 +658,8 @@ public class ScalarType extends Type {
this.len = len;
}
public boolean isAssignedStrLenInColDefinition() {
return isAssignedStrLenInColDefinition;
}
public void setAssignedStrLenInColDefinition() {
this.isAssignedStrLenInColDefinition = true;
public boolean isLengthSet() {
return getPrimitiveType() == PrimitiveType.HLL || len > 0 || !Strings.isNullOrEmpty(lenStr);
}
// add scalar infix to override with getPrecision