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

Fix += decimal error (#1272)

Browse Source 
This change fix the +=decimal error when integer is zero or fraction is zero.
In this situation, the += operator will make a mistake.
This commit is contained in:
EmmyMiao87
2019-06-10 16:30:57 +08:00
committed by ZHAO Chun
parent 038ddcfa0b
commit 8cd29d194e
2 changed files with 34 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
be/src/olap/field_info.h
View File

@ -149,7 +149,7 @@ struct decimal12_t {
}
// if sign of fraction is different from integer
if ((fraction ^ integer) < 0) {
if ((fraction != 0) && (integer != 0) && (fraction ^ integer) < 0) {
bool sign = integer < 0;
integer += (sign ? 1 : -1);
fraction += (sign ? -FRAC_RATIO : FRAC_RATIO);

34
be/test/olap/field_info_test.cpp
View File

@ -21,7 +21,7 @@
namespace doris {
TEST(FieldInfoTest, HandleNoneZeroInput) {
TEST(FieldInfoTest, Add) {
int64_t a_integer = 9223372036854775806L;
int a_fraction = 1;
decimal12_t a(a_integer, a_fraction);
@ -36,6 +36,38 @@ TEST(FieldInfoTest, HandleNoneZeroInput) {
a += b;
ASSERT_EQ(-9223372036854775807L, a.integer);
ASSERT_EQ(-1, a.fraction);
a.integer = -1;
a.fraction = 0;
b.integer = -7;
b.fraction = 0;
a += b;
ASSERT_EQ(-8, a.integer);
ASSERT_EQ(0, a.fraction);
a.integer = 0;
a.fraction = -1;
b.integer = 0;
b.fraction = -2;
a +=b;
ASSERT_EQ(0, a.integer);
ASSERT_EQ(-3, a.fraction);
a.integer = 0;
a.fraction = -999999999;
b.integer = 0;
b.fraction = -1;
a += b;
ASSERT_EQ(-1, a.integer);
ASSERT_EQ(0, a.fraction);
a.integer = -8;
a.fraction = 0;
b.integer = 2;
b.fraction = 0;
a += b;
ASSERT_EQ(-6, a.integer);
ASSERT_EQ(0, a.fraction);
}
} // namespace doris