diff --git a/src/sql/engine/expr/ob_expr_merge_result_type.map b/src/sql/engine/expr/ob_expr_merge_result_type.map index 70f4b3770d..56e1bdc31b 100644 --- a/src/sql/engine/expr/ob_expr_merge_result_type.map +++ b/src/sql/engine/expr/ob_expr_merge_result_type.map @@ -55,16 +55,16 @@ static ObObjType MERGE_RESULT_TYPE[ObMaxType][ObMaxType] = { /*TinyIntType*/ { ObTinyIntType, /*TinyIntType=>NullType */ - ObTinyIntType, /*TinyIntType=>TinyIntType */ - ObSmallIntType, /*TinyIntType=>SmallIntType */ - ObMediumIntType, /*TinyIntType=>MediumIntType */ + ObInt32Type, /*TinyIntType=>TinyIntType */ + ObInt32Type, /*TinyIntType=>SmallIntType */ + ObInt32Type, /*TinyIntType=>MediumIntType */ ObInt32Type, /*TinyIntType=>Int32Type */ ObIntType, /*TinyIntType=>IntType */ - ObTinyIntType, /*TinyIntType=>UTinyIntType */ - ObSmallIntType, /*TinyIntType=>USmallIntType */ - ObMediumIntType, /*TinyIntType=>UMediumIntType */ - ObInt32Type, /*TinyIntType=>UInt32Type */ - ObIntType, /*TinyIntType=>UIntType */ + ObInt32Type, /*TinyIntType=>UTinyIntType */ + ObInt32Type, /*TinyIntType=>USmallIntType */ + ObInt32Type, /*TinyIntType=>UMediumIntType */ + ObIntType, /*TinyIntType=>UInt32Type */ + ObNumberType, /*TinyIntType=>UIntType */ ObFloatType, /*TinyIntType=>FloatType */ ObDoubleType, /*TinyIntType=>DoubleType */ ObFloatType, /*TinyIntType=>UFloatType */ @@ -108,16 +108,16 @@ static ObObjType MERGE_RESULT_TYPE[ObMaxType][ObMaxType] = { /*SmallIntType*/ { ObSmallIntType, /*SmallIntType=>NullType */ - ObSmallIntType, /*SmallIntType=>TinyIntType */ - ObSmallIntType, /*SmallIntType=>SmallIntType */ - ObMediumIntType, /*SmallIntType=>MediumIntType */ + ObInt32Type, /*SmallIntType=>TinyIntType */ + ObInt32Type, /*SmallIntType=>SmallIntType */ + ObInt32Type, /*SmallIntType=>MediumIntType */ ObInt32Type, /*SmallIntType=>Int32Type */ ObIntType, /*SmallIntType=>IntType */ - ObSmallIntType, /*SmallIntType=>UTinyIntType */ - ObSmallIntType, /*SmallIntType=>USmallIntType */ - ObMediumIntType, /*SmallIntType=>UMediumIntType */ - ObInt32Type, /*SmallIntType=>UInt32Type */ - ObIntType, /*SmallIntType=>UIntType */ + ObInt32Type, /*SmallIntType=>UTinyIntType */ + ObInt32Type, /*SmallIntType=>USmallIntType */ + ObInt32Type, /*SmallIntType=>UMediumIntType */ + ObIntType, /*SmallIntType=>UInt32Type */ + ObNumberType, /*SmallIntType=>UIntType */ ObFloatType, /*SmallIntType=>FloatType */ ObDoubleType, /*SmallIntType=>DoubleType */ ObFloatType, /*SmallIntType=>UFloatType */ @@ -161,16 +161,16 @@ static ObObjType MERGE_RESULT_TYPE[ObMaxType][ObMaxType] = { /*MediumIntType*/ { ObMediumIntType, /*MediumIntType=>NullType */ - ObMediumIntType, /*MediumIntType=>TinyIntType */ - ObMediumIntType, /*MediumIntType=>SmallIntType */ - ObMediumIntType, /*MediumIntType=>MediumIntType */ + ObInt32Type, /*MediumIntType=>TinyIntType */ + ObInt32Type, /*MediumIntType=>SmallIntType */ + ObInt32Type, /*MediumIntType=>MediumIntType */ ObInt32Type, /*MediumIntType=>Int32Type */ ObIntType, /*MediumIntType=>IntType */ - ObMediumIntType, /*MediumIntType=>UTinyIntType */ - ObMediumIntType, /*MediumIntType=>USmallIntType */ - ObMediumIntType, /*MediumIntType=>UMediumIntType */ - ObInt32Type, /*MediumIntType=>UInt32Type */ - ObIntType, /*MediumIntType=>UIntType */ + ObInt32Type, /*MediumIntType=>UTinyIntType */ + ObInt32Type, /*MediumIntType=>USmallIntType */ + ObInt32Type, /*MediumIntType=>UMediumIntType */ + ObIntType, /*MediumIntType=>UInt32Type */ + ObNumberType, /*MediumIntType=>UIntType */ ObFloatType, /*MediumIntType=>FloatType */ ObDoubleType, /*MediumIntType=>DoubleType */ ObFloatType, /*MediumIntType=>UFloatType */ @@ -222,8 +222,8 @@ static ObObjType MERGE_RESULT_TYPE[ObMaxType][ObMaxType] = { ObInt32Type, /*Int32Type=>UTinyIntType */ ObInt32Type, /*Int32Type=>USmallIntType */ ObInt32Type, /*Int32Type=>UMediumIntType */ - ObInt32Type, /*Int32Type=>UInt32Type */ - ObIntType, /*Int32Type=>UIntType */ + ObIntType, /*Int32Type=>UInt32Type */ + ObNumberType, /*Int32Type=>UIntType */ ObDoubleType, /*Int32Type=>FloatType */ ObDoubleType, /*Int32Type=>DoubleType */ ObDoubleType, /*Int32Type=>UFloatType */ @@ -269,12 +269,12 @@ static ObObjType MERGE_RESULT_TYPE[ObMaxType][ObMaxType] = { ObIntType, /*IntType=>NullType */ ObIntType, /*IntType=>TinyIntType */ ObIntType, /*IntType=>SmallIntType */ - ObInt32Type, /*IntType=>MediumIntType */ + ObIntType, /*IntType=>MediumIntType */ ObIntType, /*IntType=>Int32Type */ ObIntType, /*IntType=>IntType */ ObIntType, /*IntType=>UTinyIntType */ ObIntType, /*IntType=>USmallIntType */ - ObInt32Type, /*IntType=>UMediumIntType */ + ObIntType, /*IntType=>UMediumIntType */ ObIntType, /*IntType=>UInt32Type */ ObNumberType, /*IntType=>UIntType */ ObDoubleType, /*IntType=>FloatType */ @@ -319,15 +319,15 @@ static ObObjType MERGE_RESULT_TYPE[ObMaxType][ObMaxType] = { /*UTinyIntType*/ { - ObUTinyIntType, /*UTinyIntType=>NullType */ - ObTinyIntType, /*UTinyIntType=>TinyIntType */ - ObSmallIntType, /*UTinyIntType=>SmallIntType */ - ObMediumIntType, /*UTinyIntType=>MediumIntType */ + ObUTinyIntType, /*UTinyIntType=>NullType */ + ObInt32Type, /*UTinyIntType=>TinyIntType */ + ObInt32Type, /*UTinyIntType=>SmallIntType */ + ObInt32Type, /*UTinyIntType=>MediumIntType */ ObInt32Type, /*UTinyIntType=>Int32Type */ ObIntType, /*UTinyIntType=>IntType */ - ObUTinyIntType, /*UTinyIntType=>UTinyIntType */ - ObUSmallIntType, /*UTinyIntType=>USmallIntType */ - ObUMediumIntType, /*UTinyIntType=>UMediumIntType */ + ObUInt32Type, /*UTinyIntType=>UTinyIntType */ + ObUInt32Type, /*UTinyIntType=>USmallIntType */ + ObUInt32Type, /*UTinyIntType=>UMediumIntType */ ObUInt32Type, /*UTinyIntType=>UInt32Type */ ObUInt64Type, /*UTinyIntType=>UIntType */ ObFloatType, /*UTinyIntType=>FloatType */ @@ -373,14 +373,14 @@ static ObObjType MERGE_RESULT_TYPE[ObMaxType][ObMaxType] = { /*USmallIntType*/ { ObUSmallIntType, /*USmallIntType=>NullType */ - ObSmallIntType, /*USmallIntType=>TinyIntType */ - ObSmallIntType, /*USmallIntType=>SmallIntType */ - ObMediumIntType, /*USmallIntType=>MediumIntType */ + ObInt32Type, /*USmallIntType=>TinyIntType */ + ObInt32Type, /*USmallIntType=>SmallIntType */ + ObInt32Type, /*USmallIntType=>MediumIntType */ ObInt32Type, /*USmallIntType=>Int32Type */ ObIntType, /*USmallIntType=>IntType */ - ObUSmallIntType, /*USmallIntType=>UTinyIntType */ - ObUSmallIntType, /*USmallIntType=>USmallIntType */ - ObUMediumIntType, /*USmallIntType=>UMediumIntType */ + ObUInt32Type, /*USmallIntType=>UTinyIntType */ + ObUInt32Type, /*USmallIntType=>USmallIntType */ + ObUInt32Type, /*USmallIntType=>UMediumIntType */ ObUInt32Type, /*USmallIntType=>UInt32Type */ ObUInt64Type, /*USmallIntType=>UIntType */ ObFloatType, /*USmallIntType=>FloatType */ @@ -426,14 +426,14 @@ static ObObjType MERGE_RESULT_TYPE[ObMaxType][ObMaxType] = { /*UMediumIntType*/ { ObUMediumIntType, /*UMediumIntType=>NullType */ - ObMediumIntType, /*UMediumIntType=>TinyIntType */ - ObMediumIntType, /*UMediumIntType=>SmallIntType */ - ObMediumIntType, /*UMediumIntType=>MediumIntType */ + ObInt32Type, /*UMediumIntType=>TinyIntType */ + ObInt32Type, /*UMediumIntType=>SmallIntType */ + ObInt32Type, /*UMediumIntType=>MediumIntType */ ObInt32Type, /*UMediumIntType=>Int32Type */ ObIntType, /*UMediumIntType=>IntType */ - ObUMediumIntType, /*UMediumIntType=>UTinyIntType */ - ObUMediumIntType, /*UMediumIntType=>USmallIntType */ - ObUMediumIntType, /*UMediumIntType=>UMediumIntType */ + ObUInt32Type, /*UMediumIntType=>UTinyIntType */ + ObUInt32Type, /*UMediumIntType=>USmallIntType */ + ObUInt32Type, /*UMediumIntType=>UMediumIntType */ ObUInt32Type, /*UMediumIntType=>UInt32Type */ ObUInt64Type, /*UMediumIntType=>UIntType */ ObFloatType, /*UMediumIntType=>FloatType */ @@ -478,11 +478,11 @@ static ObObjType MERGE_RESULT_TYPE[ObMaxType][ObMaxType] = { /*UInt32Type*/ { - ObUInt32Type, /*UInt32Type=>NullType */ - ObInt32Type, /*UInt32Type=>TinyIntType */ - ObInt32Type, /*UInt32Type=>SmallIntType */ - ObInt32Type, /*UInt32Type=>MediumIntType */ - ObInt32Type, /*UInt32Type=>Int32Type */ + ObUInt32Type, /*UInt32Type=>NullType */ + ObIntType, /*UInt32Type=>TinyIntType */ + ObIntType, /*UInt32Type=>SmallIntType */ + ObIntType, /*UInt32Type=>MediumIntType */ + ObIntType, /*UInt32Type=>Int32Type */ ObIntType, /*UInt32Type=>IntType */ ObUInt32Type, /*UInt32Type=>UTinyIntType */ ObUInt32Type, /*UInt32Type=>USmallIntType */ @@ -531,15 +531,15 @@ static ObObjType MERGE_RESULT_TYPE[ObMaxType][ObMaxType] = { /*UIntType*/ { - ObUInt64Type, /*UIntType=>NullType */ - ObIntType, /*UIntType=>TinyIntType */ - ObIntType, /*UIntType=>SmallIntType */ - ObInt32Type, /*UIntType=>MediumIntType */ - ObIntType, /*UIntType=>Int32Type */ + ObUInt64Type, /*UIntType=>NullType */ + ObNumberType, /*UIntType=>TinyIntType */ + ObNumberType, /*UIntType=>SmallIntType */ + ObNumberType, /*UIntType=>MediumIntType */ + ObNumberType, /*UIntType=>Int32Type */ ObNumberType, /*UIntType=>IntType */ ObUInt64Type, /*UIntType=>UTinyIntType */ ObUInt64Type, /*UIntType=>USmallIntType */ - ObUInt32Type, /*UIntType=>UMediumIntType */ + ObUInt64Type, /*UIntType=>UMediumIntType */ ObUInt64Type, /*UIntType=>UInt32Type */ ObUInt64Type, /*UIntType=>UIntType */ ObDoubleType, /*UIntType=>FloatType */