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 547a234b59..73d7de646f 100644 --- a/src/sql/engine/expr/ob_expr_merge_result_type.map +++ b/src/sql/engine/expr/ob_expr_merge_result_type.map @@ -1809,7 +1809,7 @@ static ObObjType MERGE_RESULT_TYPE[ObMaxType][ObMaxType] = { ObNCharType, /*ObEnumInnerType=>ObNCharType */ ObMaxType, /*ObEnumInnerType=>URowID*/ ObMaxType, /*ObEnumInnerType=>ObLobType*/ - ObMaxType, /*ObEnumInnerType=>ObJsonType*/ + ObVarcharType, /*ObEnumInnerType=>ObJsonType*/ }, /*ObSetInnerType*/ { @@ -1860,7 +1860,7 @@ static ObObjType MERGE_RESULT_TYPE[ObMaxType][ObMaxType] = { ObNCharType, /*ObSetInnerType=>ObNCharType */ ObMaxType, /*ObSetInnerType=>URowID*/ ObMaxType, /*ObSetInnerType=>ObLobType*/ - ObMaxType, /*ObSetInnerType=>ObJsonType*/ + ObVarcharType, /*ObSetInnerType=>ObJsonType*/ }, /*ObTimestampTZType*/ { @@ -2460,8 +2460,8 @@ static ObObjType MERGE_RESULT_TYPE[ObMaxType][ObMaxType] = { ObJsonType, /* ObJsonType=>ObBitType */ ObVarcharType, /* ObJsonType=>ObEnumType */ ObVarcharType, /* ObJsonType=>ObSetType */ - ObMaxType, /* ObJsonType=>ObEnumInnerType */ - ObMaxType, /* ObJsonType=>ObSetInnerType */ + ObVarcharType, /* ObJsonType=>ObEnumInnerType */ + ObVarcharType, /* ObJsonType=>ObSetInnerType */ ObMaxType, /* ObJsonType=>ObTimestampTZType */ ObMaxType, /* ObJsonType=>ObTimestampLTZType */ ObMaxType, /* ObJsonType=>ObTimestampNanoType */ diff --git a/src/sql/engine/expr/ob_expr_relational_cmp_type.map b/src/sql/engine/expr/ob_expr_relational_cmp_type.map index a5ddbd6e51..713c2394f7 100644 --- a/src/sql/engine/expr/ob_expr_relational_cmp_type.map +++ b/src/sql/engine/expr/ob_expr_relational_cmp_type.map @@ -1830,7 +1830,7 @@ static ObObjType RELATIONAL_CMP_TYPE[ObMaxType][ObMaxType] = ObVarcharType, /* ObNCharType */ ObNullType, /* ObURowIDType */ ObNullType, /* ObLobType */ - ObMaxType, /* ObJsonType */ + ObNumberType, /* ObJsonType */ }, /*SetInnerType*/ { @@ -1881,7 +1881,7 @@ static ObObjType RELATIONAL_CMP_TYPE[ObMaxType][ObMaxType] = ObVarcharType, /* ObNCharType */ ObNullType, /* ObURowIDType */ ObNullType, /* ObLobType */ - ObMaxType, /* ObJsonType */ + ObNumberType, /* ObJsonType */ }, /*ObTimestampTZType*/ { @@ -2481,8 +2481,8 @@ static ObObjType RELATIONAL_CMP_TYPE[ObMaxType][ObMaxType] = ObJsonType, /*BitType*/ ObNumberType, /* EnumType */ ObNumberType, /* SetType */ - ObMaxType, /* EnumInnerType */ - ObMaxType, /* SetInnerType */ + ObNumberType, /* EnumInnerType */ + ObNumberType, /* SetInnerType */ ObTimestampTZType, /* ObTimestampTZType */ ObTimestampLTZType, /* ObTimestampLTZType */ ObTimestampNanoType, /* ObTimestampNanoType */