From 5ecd5ab4212d5354059da0b01fa21d45f8193b0a Mon Sep 17 00:00:00 2001 From: obdev Date: Wed, 2 Nov 2022 17:08:21 +0000 Subject: [PATCH] [CP] fix coalesce(tinytext, enum) bug --- .../engine/expr/ob_expr_merge_result_type.map | 48 +++++++++---------- 1 file changed, 24 insertions(+), 24 deletions(-) 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 6d48be03c7..f50f90bcc9 100644 --- a/src/sql/engine/expr/ob_expr_merge_result_type.map +++ b/src/sql/engine/expr/ob_expr_merge_result_type.map @@ -1172,9 +1172,9 @@ static ObObjType MERGE_RESULT_TYPE[ObMaxType][ObMaxType] = { ObVarcharType, /*VarcharType=>HexStringType */ ObMaxType, /*VarcharType=>ExtendType */ ObVarcharType, /*VarcharType=>UnknownType */ - ObTinyTextType, /*VarcharType=>ObTinyTextType */ - ObTextType, /* VarcharType=>ObTextType */ - ObMediumTextType, /* VarcharType=>ObMediumTextType */ + ObLongTextType, /*VarcharType=>ObTinyTextType */ + ObLongTextType, /* VarcharType=>ObTextType */ + ObLongTextType, /* VarcharType=>ObMediumTextType */ ObLongTextType, /* VarcharType=>ObLongTextType */ ObVarcharType, /* VarcharType=>ObBitType */ ObVarcharType, /* VarcharType=>ObEnumType */ @@ -1224,9 +1224,9 @@ static ObObjType MERGE_RESULT_TYPE[ObMaxType][ObMaxType] = { ObVarcharType, /*CharType=>HexStringType */ ObMaxType, /*CharType=>ExtendType */ ObVarcharType, /*CharType=>UnknownType */ - ObTinyTextType, /*CharType=>ObTinyTextType */ - ObTextType, /* CharType=>ObTextType */ - ObMediumTextType, /* CharType=>ObMediumTextType */ + ObLongTextType, /*CharType=>ObTinyTextType */ + ObLongTextType, /* CharType=>ObTextType */ + ObLongTextType, /* CharType=>ObMediumTextType */ ObLongTextType, /* CharType=>ObLongTextType */ ObCharType, /* CharType=>ObBitType */ ObCharType, /* CharType=>ObEnumType */ @@ -1426,8 +1426,8 @@ static ObObjType MERGE_RESULT_TYPE[ObMaxType][ObMaxType] = { ObTinyTextType, /*ObTinyTextType=>DateType */ ObTinyTextType, /*ObTinyTextType=>TimeType */ ObTinyTextType, /*ObTinyTextType=>YearType */ - ObTinyTextType, /*ObTinyTextType=>VarcharType */ - ObTinyTextType, /*ObTinyTextType=>CharType */ + ObLongTextType, /*ObTinyTextType=>VarcharType */ + ObLongTextType, /*ObTinyTextType=>CharType */ ObTinyTextType, /*ObTinyTextType=>HexStringType */ ObMaxType, /*ObTinyTextType=>ExtendType */ ObTinyTextType, /*ObTinyTextType=>UnknownType */ @@ -1435,9 +1435,9 @@ static ObObjType MERGE_RESULT_TYPE[ObMaxType][ObMaxType] = { ObTextType, /* ObTinyTextType=>ObTextType */ ObMediumTextType, /* ObTinyTextType=>ObMediumTextType */ ObLongTextType, /* ObTinyTextType=>ObLongTextType */ - ObTextType, /* ObTinyTextType=>ObBitType */ - ObTextType, /* ObTinyTextType=>ObEnumType */ - ObTextType, /* ObTinyTextType=>ObSetType */ + ObLongTextType, /* ObTinyTextType=>ObBitType */ + ObLongTextType, /* ObTinyTextType=>ObEnumType */ + ObLongTextType, /* ObTinyTextType=>ObSetType */ ObMaxType, /* ObTinyTextType=>ObEnumInnerType */ ObMaxType, /* ObTinyTextType=>ObSetInnerType */ ObTinyTextType, /*ObTinyTextType=>ObTimestampTZType */ @@ -1477,8 +1477,8 @@ static ObObjType MERGE_RESULT_TYPE[ObMaxType][ObMaxType] = { ObTextType, /*ObTextType=>DateType */ ObTextType, /*ObTextType=>TimeType */ ObTextType, /*ObTextType=>YearType */ - ObTextType, /*ObTextType=>VarcharType */ - ObTextType, /*ObTextType=>CharType */ + ObLongTextType, /*ObTextType=>VarcharType */ + ObLongTextType, /*ObTextType=>CharType */ ObTextType, /*ObTextType=>HexStringType */ ObMaxType, /*ObTextType=>ExtendType */ ObTextType, /*ObTextType=>UnknownType */ @@ -1486,9 +1486,9 @@ static ObObjType MERGE_RESULT_TYPE[ObMaxType][ObMaxType] = { ObTextType, /* ObTextType=>ObTextType */ ObMediumTextType, /* ObTextType=>ObMediumTextType */ ObLongTextType, /* ObTextType=>ObLongTextType */ - ObMediumTextType, /* ObTextType=>ObBitType */ - ObMediumTextType, /* ObTextType=>ObEnumType */ - ObMediumTextType, /* ObTextType=>ObSetType */ + ObLongTextType, /* ObTextType=>ObBitType */ + ObLongTextType, /* ObTextType=>ObEnumType */ + ObLongTextType, /* ObTextType=>ObSetType */ ObMaxType, /* ObTextType=>ObEnumInnerType */ ObMaxType, /* ObTextType=>ObSetInnerType */ ObTextType, /*ObTextType=>ObTimestampTZType */ @@ -1529,8 +1529,8 @@ static ObObjType MERGE_RESULT_TYPE[ObMaxType][ObMaxType] = { ObMediumTextType, /*ObMediumTextType=>DateType */ ObMediumTextType, /*ObMediumTextType=>TimeType */ ObMediumTextType, /*ObMediumTextType=>YearType */ - ObMediumTextType, /*ObMediumTextType=>VarcharType */ - ObMediumTextType, /*ObMediumTextType=>CharType */ + ObLongTextType, /*ObMediumTextType=>VarcharType */ + ObLongTextType, /*ObMediumTextType=>CharType */ ObMediumTextType, /*ObMediumTextType=>HexStringType */ ObMaxType, /*ObMediumTextType=>ExtendType */ ObMediumTextType, /*ObMediumTextType=>UnknownType */ @@ -1636,8 +1636,8 @@ static ObObjType MERGE_RESULT_TYPE[ObMaxType][ObMaxType] = { ObVarcharType, /*ObBitType=>HexStringType */ ObMaxType, /*ObBitType=>ExtendType */ ObVarcharType, /*ObBitType=>UnknownType */ - ObTextType, /*ObBitType=>ObTinyTextType */ - ObMediumTextType, /* ObBitType=>ObTextType */ + ObLongTextType, /*ObBitType=>ObTinyTextType */ + ObLongTextType, /* ObBitType=>ObTextType */ ObLongTextType, /* ObBitType=>ObMediumTextType */ ObLongTextType, /* ObBitType=>ObLongTextType */ ObBitType, /* ObBitType=>ObBitType */ @@ -1687,8 +1687,8 @@ static ObObjType MERGE_RESULT_TYPE[ObMaxType][ObMaxType] = { ObVarcharType, /*ObEnumType=>HexStringType */ ObMaxType, /*ObEnumType=>ExtendType */ ObVarcharType, /*ObEnumType=>UnknownType */ - ObTextType, /*ObEnumType=>ObTinyTextType */ - ObMediumTextType, /* ObEnumType=>ObTextType */ + ObLongTextType, /*ObEnumType=>ObTinyTextType */ + ObLongTextType, /* ObEnumType=>ObTextType */ ObLongTextType, /* ObEnumType=>ObMediumTextType */ ObLongTextType, /* ObEnumType=>ObLongTextType */ ObVarcharType, /* ObEnumType=>ObBitType */ @@ -1738,8 +1738,8 @@ static ObObjType MERGE_RESULT_TYPE[ObMaxType][ObMaxType] = { ObVarcharType, /*ObSetType=>HexStringType */ ObMaxType, /*ObSetType=>ExtendType */ ObVarcharType, /*ObSetType=>UnknownType */ - ObTextType, /*ObSetType=>ObTinyTextType */ - ObMediumTextType, /* ObSetType=>ObTextType */ + ObLongTextType, /*ObSetType=>ObTinyTextType */ + ObLongTextType, /* ObSetType=>ObTextType */ ObLongTextType, /* ObSetType=>ObMediumTextType */ ObLongTextType, /* ObSetType=>ObLongTextType */ ObVarcharType, /* ObSetType=>ObBitType */