HappenLee commented on code in PR #15452:
URL: https://github.com/apache/doris/pull/15452#discussion_r1058713866
##########
be/src/vec/data_types/data_type_decimal.h:
##########
@@ -219,56 +219,29 @@ class DataTypeDecimal final : public IDataType {
};
template <typename T, typename U>
-typename std::enable_if_t<(sizeof(T) >= sizeof(U)), const DataTypeDecimal<T>>
decimal_result_type(
- const DataTypeDecimal<T>& tx, const DataTypeDecimal<U>& ty, bool
is_multiply,
- bool is_divide) {
+DataTypePtr decimal_result_type(const DataTypeDecimal<T>& tx, const
DataTypeDecimal<U>& ty,
+ bool is_multiply, bool is_divide, bool
is_plus_minus) {
+ using Type = std::conditional_t<sizeof(T) >= sizeof(U), T, U>;
if constexpr (IsDecimalV2<T> && IsDecimalV2<U>) {
- return DataTypeDecimal<T>(max_decimal_precision<T>(), 9);
+ return
std::make_shared<DataTypeDecimal<Type>>((max_decimal_precision<T>(), 9));
} else {
- UInt32 scale = (tx.get_scale() > ty.get_scale() ? tx.get_scale() :
ty.get_scale());
- if (is_multiply) {
- scale = tx.get_scale() + ty.get_scale();
- } else if (is_divide) {
- scale = tx.get_scale();
- }
- return DataTypeDecimal<T>(max_decimal_precision<T>(), scale);
- }
-}
+ UInt32 scale = std::max(tx.get_scale(), ty.get_scale());
+ auto precision = max_decimal_precision<Type>();
-template <typename T, typename U>
-typename std::enable_if_t<(sizeof(T) < sizeof(U)), const DataTypeDecimal<U>>
decimal_result_type(
- const DataTypeDecimal<T>& tx, const DataTypeDecimal<U>& ty, bool
is_multiply,
- bool is_divide) {
- if constexpr (IsDecimalV2<T> && IsDecimalV2<U>) {
- return DataTypeDecimal<U>(max_decimal_precision<U>(), 9);
- } else {
- UInt32 scale = (tx.get_scale() > ty.get_scale() ? tx.get_scale() :
ty.get_scale());
+ size_t multiply_divide_precision = tx.get_precision() +
ty.get_precision();
+ size_t plus_minus_precision =
+ std::max(tx.get_precision() - tx.get_scale(),
ty.get_precision() - ty.get_scale()) +
+ scale;
if (is_multiply) {
scale = tx.get_scale() + ty.get_scale();
+ precision = std::min(multiply_divide_precision,
max_decimal_precision<Decimal128I>());
} else if (is_divide) {
scale = tx.get_scale();
+ precision = std::min(multiply_divide_precision,
max_decimal_precision<Decimal128I>());
+ } else if (is_plus_minus) {
+ precision = std::min(plus_minus_precision,
max_decimal_precision<Decimal128I>());
Review Comment:
use default max
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
