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

[Bug](DECIMALV3) Fix wrong precision for plus/minus (#18052)

Browse Source 
Result type for DECIMAL(x, y) plus/minus DECIMAL(m, n) should be DECIMAL(max(x - y, m - n) + max(y + n) + 1, max(y + n))
This commit is contained in:
Gabriel
2023-03-25 09:42:39 +08:00
committed by GitHub
parent b2c70b51cc
commit 2408ca5da8
8 changed files with 61 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
fe/fe-common/src/main/java/org/apache/doris/catalog/Type.java
View File

@ -1816,6 +1816,10 @@ public abstract class Type {
// Whether `type1` matches the exact type of `type2`.
public static boolean matchExactType(Type type1, Type type2) {
return matchExactType(type1, type2, false);
}
public static boolean matchExactType(Type type1, Type type2, boolean ignorePrecision) {
if (type1.matchesType(type2)) {
if (PrimitiveType.typeWithPrecision.contains(type2.getPrimitiveType())) {
// For types which has precision and scale, we also need to check quality between precisions and scales
@ -1823,6 +1827,10 @@ public abstract class Type {
== ((ScalarType) type1).decimalPrecision()) && (((ScalarType) type2).decimalScale()
== ((ScalarType) type1).decimalScale())) {
return true;
} else if (((ScalarType) type2).decimalScale() == ((ScalarType) type1).decimalScale()
&& ignorePrecision) {
return isSameDecimalTypeWithDifferentPrecision(((ScalarType) type2).decimalPrecision(),
((ScalarType) type1).decimalPrecision());
}
} else if (type2.isArrayType()) {
// For types array, we also need to check contains null for case like
@ -1836,5 +1844,20 @@ public abstract class Type {
}
return false;
}
public static boolean isSameDecimalTypeWithDifferentPrecision(int precision1, int precision2) {
if (precision1 <= ScalarType.MAX_DECIMAL32_PRECISION && precision2 <= ScalarType.MAX_DECIMAL32_PRECISION) {
return true;
} else if (precision1 > ScalarType.MAX_DECIMAL32_PRECISION && precision2 > ScalarType.MAX_DECIMAL32_PRECISION
&& precision1 <= ScalarType.MAX_DECIMAL64_PRECISION
&& precision2 <= ScalarType.MAX_DECIMAL64_PRECISION) {
return true;
} else if (precision1 > ScalarType.MAX_DECIMAL64_PRECISION && precision2 > ScalarType.MAX_DECIMAL64_PRECISION
&& precision1 <= ScalarType.MAX_DECIMAL128_PRECISION
&& precision2 <= ScalarType.MAX_DECIMAL128_PRECISION) {
return true;
}
return false;
}
}