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

[FIX](complextype)fix complex type nested version type but not hide version (#30419)

Browse Source
This commit is contained in:
amory
2024-01-29 18:19:14 +08:00
committed by yiguolei
parent 6231300e9e
commit 0f81d2d533
9 changed files with 116 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
fe/fe-core/src/main/java/org/apache/doris/analysis/DescribeStmt.java
View File

@ -136,26 +136,7 @@ public class DescribeStmt extends ShowStmt {
? FeConstants.null_string : column.getDefaultValue(),
"NONE"
);
if (column.getOriginType().isDatetimeV2()) {
StringBuilder typeStr = new StringBuilder("DATETIME");
if (((ScalarType) column.getOriginType()).getScalarScale() > 0) {
typeStr.append("(").append(((ScalarType) column.getOriginType()).getScalarScale()).append(")");
}
row.set(1, typeStr.toString());
} else if (column.getOriginType().isDateV2()) {
row.set(1, "DATE");
} else if (column.getOriginType().isDecimalV3()) {
StringBuilder typeStr = new StringBuilder("DECIMAL");
ScalarType sType = (ScalarType) column.getOriginType();
int scale = sType.getScalarScale();
int precision = sType.getScalarPrecision();
// not default
if (scale > 0 && precision != 9) {
typeStr.append("(").append(precision).append(", ").append(scale)
.append(")");
}
row.set(1, typeStr.toString());
}
row.set(1, column.getOriginType().hideVersionForVersionColumn(false));
totalRows.add(row);
}
return;

21
fe/fe-core/src/main/java/org/apache/doris/catalog/Column.java
View File

@ -783,26 +783,7 @@ public class Column implements Writable, GsonPostProcessable {
// show change datetimeV2/dateV2 to datetime/date
if (isCompatible) {
if (type.isDatetimeV2()) {
sb.append("DATETIME");
if (((ScalarType) type).getScalarScale() > 0) {
sb.append("(").append(((ScalarType) type).getScalarScale()).append(")");
}
} else if (type.isDateV2()) {
sb.append("DATE");
} else if (type.isDecimalV3()) {
sb.append("DECIMAL");
ScalarType sType = (ScalarType) type;
int scale = sType.getScalarScale();
int precision = sType.getScalarPrecision();
// not default
if (!sType.isDefaultDecimal()) {
sb.append("(").append(precision).append(", ").append(scale)
.append(")");
}
} else {
sb.append(typeStr);
}
sb.append(type.hideVersionForVersionColumn(true));
} else {
sb.append(typeStr);
}

24
fe/fe-core/src/main/java/org/apache/doris/common/proc/IndexSchemaProcNode.java
View File

@ -18,7 +18,6 @@
package org.apache.doris.common.proc;
import org.apache.doris.catalog.Column;
import org.apache.doris.catalog.ScalarType;
import org.apache.doris.common.AnalysisException;
import org.apache.doris.common.FeConstants;
@ -76,28 +75,7 @@ public class IndexSchemaProcNode implements ProcNodeInterface {
? FeConstants.null_string : column.getDefaultValue(),
extraStr);
if (column.getOriginType().isDateV2()) {
rowList.set(1, "DATE");
}
if (column.getOriginType().isDatetimeV2()) {
StringBuilder typeStr = new StringBuilder("DATETIME");
if (((ScalarType) column.getOriginType()).getScalarScale() > 0) {
typeStr.append("(").append(((ScalarType) column.getOriginType()).getScalarScale()).append(")");
}
rowList.set(1, typeStr.toString());
}
if (column.getOriginType().isDecimalV3()) {
StringBuilder typeStr = new StringBuilder("DECIMAL");
ScalarType sType = (ScalarType) column.getOriginType();
int scale = sType.getScalarScale();
int precision = sType.getScalarPrecision();
// not default
if (scale > 0 && precision != 9) {
typeStr.append("(").append(precision).append(", ").append(scale)
.append(")");
}
rowList.set(1, typeStr.toString());
}
rowList.set(1, column.getOriginType().hideVersionForVersionColumn(false));
result.addRow(rowList);
}
return result;