1
0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-01 06:46:55 +03:00

Merge pull request #1744 from zhaorenhai/develop

Fixes MCOL-4511 and MCOL-4524
This commit is contained in:
Roman Nozdrin
2021-01-31 09:03:32 +03:00
committed by GitHub
8 changed files with 102 additions and 84 deletions

View File

@ -1076,7 +1076,7 @@ inline IDB_Decimal TreeNode::getDecimalVal()
if ((dlScaled > (long double)INT64_MAX) || (dlScaled < (long double)(INT64_MIN)))
{
datatypes::TFloat128 temp((__float128)dlScaled);
datatypes::TFloat128 temp((float128_t)dlScaled);
fResult.decimalVal = IDB_Decimal(0, fResultType.scale,
fResultType.precision, static_cast<int128_t>(temp));
}

View File

@ -227,7 +227,7 @@ float RowEstimator::estimateOpFactor(const T& min, const T& max, const T& value,
if (!ct.isWideDecimalType())
factor = (1.0 * value - min) / (max - min + 1);
else
factor = ((__float128) value - min) / (max - min + 1);
factor = ((float128_t) value - min) / (max - min + 1);
}
break;
@ -239,7 +239,7 @@ float RowEstimator::estimateOpFactor(const T& min, const T& max, const T& value,
if (!ct.isWideDecimalType())
factor = (1.0 * value - min + 1) / (max - min + 1);
else
factor = ((__float128) value - min + 1) / (max - min + 1);
factor = ((float128_t) value - min + 1) / (max - min + 1);
}
break;
@ -251,7 +251,7 @@ float RowEstimator::estimateOpFactor(const T& min, const T& max, const T& value,
if (!ct.isWideDecimalType())
factor = (1.0 * max - value) / (1.0 * max - min + 1);
else
factor = ((__float128) max - value) / (max - min + 1);
factor = ((float128_t) max - value) / (max - min + 1);
}
break;
@ -264,7 +264,7 @@ float RowEstimator::estimateOpFactor(const T& min, const T& max, const T& value,
if (!ct.isWideDecimalType())
factor = (1.0 * max - value + 1) / (max - min + 1);
else
factor = ((__float128) max - value + 1) / (max - min + 1);
factor = ((float128_t) max - value + 1) / (max - min + 1);
}
break;