database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-30 19:23:07 +03:00
Code Activity

MDEV-25080 Fix some corner cases in DataConvert::joinColTypeForUnion().

Browse Source
This commit is contained in:
Gagan Goel
2023-02-21 14:49:59 -05:00
parent e4100928d1
commit 4e2123ca80
1 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
utils/dataconvert/dataconvert.cpp
View File

@ -2975,7 +2975,7 @@ void DataConvert::joinColTypeForUnion(datatypes::SystemCatalog::TypeHolderStd& u
case datatypes::SystemCatalog::UBIGINT: case datatypes::SystemCatalog::UBIGINT:
case datatypes::SystemCatalog::UDECIMAL: case datatypes::SystemCatalog::UDECIMAL:
if (type.scale != 0) if (type.scale != 0 && unionedType.scale != 0)
{ {
const unsigned int digitsBeforeDecimal = type.precision - type.scale; const unsigned int digitsBeforeDecimal = type.precision - type.scale;
const unsigned int digitsBeforeDecimalUnion = unionedType.precision - unionedType.scale; const unsigned int digitsBeforeDecimalUnion = unionedType.precision - unionedType.scale;
@ -2988,7 +2988,18 @@ void DataConvert::joinColTypeForUnion(datatypes::SystemCatalog::TypeHolderStd& u
} }
} }
// Handle the scenario where the upstream code assigns special values of 9999
// and -1 as the precision of the unionedType.
if ((unionedType.precision == 9999 || unionedType.precision == -1) &&
(type.precision != 9999 && type.precision != -1))
{
unionedType.precision = type.precision;
}
else
{
unionedType.precision = std::max(type.precision, unionedType.precision); unionedType.precision = std::max(type.precision, unionedType.precision);
}
unionedType.scale = std::max(type.scale, unionedType.scale); unionedType.scale = std::max(type.scale, unionedType.scale);
if (datatypes::Decimal::isWideDecimalTypeByPrecision(unionedType.precision)) if (datatypes::Decimal::isWideDecimalTypeByPrecision(unionedType.precision))
@ -3056,6 +3067,10 @@ void DataConvert::joinColTypeForUnion(datatypes::SystemCatalog::TypeHolderStd& u
case datatypes::SystemCatalog::UFLOAT: case datatypes::SystemCatalog::UFLOAT:
case datatypes::SystemCatalog::UDOUBLE: case datatypes::SystemCatalog::UDOUBLE:
case datatypes::SystemCatalog::LONGDOUBLE: case datatypes::SystemCatalog::LONGDOUBLE:
if (datatypes::isWideDecimalType(type.colDataType, type.colWidth))
unionedType = type;
break;
default: break; default: break;
} }