[Bug-fix] Decimal Divide, Mod Zero Result Should be NULL. (#6051)

This commit is contained in:
HappenLee
2021-07-16 21:43:06 -05:00
committed by GitHub
parent bf5db6eefe
commit 8de09cbd21
2 changed files with 20 additions and 8 deletions

View File

@ -176,12 +176,24 @@ DateTimeVal DecimalV2Operators::cast_to_date_val(FunctionContext* context,
return result; \
}
#define DECIMAL_ARITHMETIC_OPS() \
DECIMAL_ARITHMETIC_OP(add, +); \
DECIMAL_ARITHMETIC_OP(subtract, -); \
DECIMAL_ARITHMETIC_OP(multiply, *); \
DECIMAL_ARITHMETIC_OP(divide, /); \
DECIMAL_ARITHMETIC_OP(mod, %);
#define DECIMAL_ARITHMETIC_OP_DIVIDE(FN_NAME, OP) \
DecimalV2Val DecimalV2Operators::FN_NAME##_decimalv2_val_decimalv2_val( \
FunctionContext* context, const DecimalV2Val& v1, const DecimalV2Val& v2) { \
if (v1.is_null || v2.is_null || v2.value() == 0) return DecimalV2Val::null(); \
DecimalV2Value iv1 = DecimalV2Value::from_decimal_val(v1); \
DecimalV2Value iv2 = DecimalV2Value::from_decimal_val(v2); \
DecimalV2Value ir = iv1 OP iv2; \
DecimalV2Val result; \
ir.to_decimal_val(&result); \
return result; \
}
#define DECIMAL_ARITHMETIC_OPS() \
DECIMAL_ARITHMETIC_OP(add, +); \
DECIMAL_ARITHMETIC_OP(subtract, -); \
DECIMAL_ARITHMETIC_OP(multiply, *); \
DECIMAL_ARITHMETIC_OP_DIVIDE(divide, /); \
DECIMAL_ARITHMETIC_OP_DIVIDE(mod, %);
DECIMAL_ARITHMETIC_OPS();

View File

@ -192,7 +192,7 @@ DecimalV2Value operator/(const DecimalV2Value& v1, const DecimalV2Value& v2) {
int128_t x = v1.value();
int128_t y = v2.value();
//todo: return 0 for divide zero
DCHECK(y != 0);
if (x == 0 || y == 0) return DecimalV2Value(0);
bool is_positive = (x > 0 && y > 0) || (x < 0 && y < 0);
do_div(abs(x), abs(y), &result);
@ -207,7 +207,7 @@ DecimalV2Value operator%(const DecimalV2Value& v1, const DecimalV2Value& v2) {
int128_t x = v1.value();
int128_t y = v2.value();
//todo: return 0 for divide zero
DCHECK(y != 0);
if (x == 0 || y == 0) return DecimalV2Value(0);
do_mod(x, y, &result);