add errno & item_type for cg
This commit is contained in:
		@ -2083,6 +2083,13 @@ typedef enum ObItemType
 | 
				
			|||||||
  T_OB_DDL_SCHEMA_VERSION,
 | 
					  T_OB_DDL_SCHEMA_VERSION,
 | 
				
			||||||
  T_TG_ORDER,
 | 
					  T_TG_ORDER,
 | 
				
			||||||
  T_ODBC_ESCAPE_SEQUENCES,
 | 
					  T_ODBC_ESCAPE_SEQUENCES,
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  // column group
 | 
				
			||||||
 | 
					  T_COLUMN_GROUP,
 | 
				
			||||||
 | 
					  T_ALL_COLUMN_GROUP,
 | 
				
			||||||
 | 
					  T_SINGLE_COLUMN_GROUP,
 | 
				
			||||||
 | 
					  T_NORMAL_COLUMN_GROUP,
 | 
				
			||||||
 | 
					  
 | 
				
			||||||
  T_MAX //Attention: add a new type before T_MAX
 | 
					  T_MAX //Attention: add a new type before T_MAX
 | 
				
			||||||
} ObItemType;
 | 
					} ObItemType;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
@ -10725,6 +10725,18 @@ static const _error _error_OB_DDL_SCHEMA_VERSION_NOT_MATCH = {
 | 
				
			|||||||
      .oracle_str_error      = "ORA-00600: internal error code, arguments: -5403, ddl schema version not match",
 | 
					      .oracle_str_error      = "ORA-00600: internal error code, arguments: -5403, ddl schema version not match",
 | 
				
			||||||
      .oracle_str_user_error = "ORA-00600: internal error code, arguments: -5403, ddl schema version not match"
 | 
					      .oracle_str_user_error = "ORA-00600: internal error code, arguments: -5403, ddl schema version not match"
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					static const _error _error_OB_ERR_COLUMN_GROUP_DUPLICATE = {
 | 
				
			||||||
 | 
					      .error_name            = "OB_ERR_COLUMN_GROUP_DUPLICATE",
 | 
				
			||||||
 | 
					      .error_cause           = "Internal Error",
 | 
				
			||||||
 | 
					      .error_solution        = "Contact OceanBase Support",
 | 
				
			||||||
 | 
					      .mysql_errno           = ER_DUP_FIELDNAME,
 | 
				
			||||||
 | 
					      .sqlstate              = "42S21",
 | 
				
			||||||
 | 
					      .str_error             = "Duplicate column group name",
 | 
				
			||||||
 | 
					      .str_user_error        = "Duplicate column group name '%.*s'",
 | 
				
			||||||
 | 
					      .oracle_errno          = 600,
 | 
				
			||||||
 | 
					      .oracle_str_error      = "ORA-00600: internal error code, arguments: -5404, Duplicate column group name",
 | 
				
			||||||
 | 
					      .oracle_str_user_error = "ORA-00600: internal error code, arguments: -5404, Duplicate column group name '%.*s'"
 | 
				
			||||||
 | 
					};
 | 
				
			||||||
static const _error _error_OB_ERR_INVALID_JSON_TEXT = {
 | 
					static const _error _error_OB_ERR_INVALID_JSON_TEXT = {
 | 
				
			||||||
      .error_name            = "OB_ERR_INVALID_JSON_TEXT",
 | 
					      .error_name            = "OB_ERR_INVALID_JSON_TEXT",
 | 
				
			||||||
      .error_cause           = "Internal Error",
 | 
					      .error_cause           = "Internal Error",
 | 
				
			||||||
@ -22856,6 +22868,7 @@ struct ObStrErrorInit
 | 
				
			|||||||
    _errors[-OB_ERR_RESULTANT_DATA_TYPE_OF_VIRTUAL_COLUMN_IS_NOT_SUPPORTED] = &_error_OB_ERR_RESULTANT_DATA_TYPE_OF_VIRTUAL_COLUMN_IS_NOT_SUPPORTED;
 | 
					    _errors[-OB_ERR_RESULTANT_DATA_TYPE_OF_VIRTUAL_COLUMN_IS_NOT_SUPPORTED] = &_error_OB_ERR_RESULTANT_DATA_TYPE_OF_VIRTUAL_COLUMN_IS_NOT_SUPPORTED;
 | 
				
			||||||
    _errors[-OB_ERR_GET_STACKED_DIAGNOSTICS] = &_error_OB_ERR_GET_STACKED_DIAGNOSTICS;
 | 
					    _errors[-OB_ERR_GET_STACKED_DIAGNOSTICS] = &_error_OB_ERR_GET_STACKED_DIAGNOSTICS;
 | 
				
			||||||
    _errors[-OB_DDL_SCHEMA_VERSION_NOT_MATCH] = &_error_OB_DDL_SCHEMA_VERSION_NOT_MATCH;
 | 
					    _errors[-OB_DDL_SCHEMA_VERSION_NOT_MATCH] = &_error_OB_DDL_SCHEMA_VERSION_NOT_MATCH;
 | 
				
			||||||
 | 
					    _errors[-OB_ERR_COLUMN_GROUP_DUPLICATE] = &_error_OB_ERR_COLUMN_GROUP_DUPLICATE;
 | 
				
			||||||
    _errors[-OB_ERR_INVALID_JSON_TEXT] = &_error_OB_ERR_INVALID_JSON_TEXT;
 | 
					    _errors[-OB_ERR_INVALID_JSON_TEXT] = &_error_OB_ERR_INVALID_JSON_TEXT;
 | 
				
			||||||
    _errors[-OB_ERR_INVALID_JSON_TEXT_IN_PARAM] = &_error_OB_ERR_INVALID_JSON_TEXT_IN_PARAM;
 | 
					    _errors[-OB_ERR_INVALID_JSON_TEXT_IN_PARAM] = &_error_OB_ERR_INVALID_JSON_TEXT_IN_PARAM;
 | 
				
			||||||
    _errors[-OB_ERR_INVALID_JSON_BINARY_DATA] = &_error_OB_ERR_INVALID_JSON_BINARY_DATA;
 | 
					    _errors[-OB_ERR_INVALID_JSON_BINARY_DATA] = &_error_OB_ERR_INVALID_JSON_BINARY_DATA;
 | 
				
			||||||
 | 
				
			|||||||
@ -997,6 +997,7 @@ DEFINE_ORACLE_ERROR_EXT(OB_ERR_OBJECT_STRING_DOES_NOT_EXIST, -5400, -1, "HY000",
 | 
				
			|||||||
DEFINE_ORACLE_ERROR(OB_ERR_RESULTANT_DATA_TYPE_OF_VIRTUAL_COLUMN_IS_NOT_SUPPORTED, -5401, -1, "HY000", "resultant data type of virtual column is not supported", 54004, "resultant data type of virtual column is not supported");
 | 
					DEFINE_ORACLE_ERROR(OB_ERR_RESULTANT_DATA_TYPE_OF_VIRTUAL_COLUMN_IS_NOT_SUPPORTED, -5401, -1, "HY000", "resultant data type of virtual column is not supported", 54004, "resultant data type of virtual column is not supported");
 | 
				
			||||||
DEFINE_ERROR(OB_ERR_GET_STACKED_DIAGNOSTICS, -5402, ER_GET_STACKED_DIAGNOSTICS_INACTIVE, "0Z002", "GET STACKED DIAGNOSTICS when handler not active");
 | 
					DEFINE_ERROR(OB_ERR_GET_STACKED_DIAGNOSTICS, -5402, ER_GET_STACKED_DIAGNOSTICS_INACTIVE, "0Z002", "GET STACKED DIAGNOSTICS when handler not active");
 | 
				
			||||||
DEFINE_ERROR(OB_DDL_SCHEMA_VERSION_NOT_MATCH, -5403, -1, "HY000", "ddl schema version not match");
 | 
					DEFINE_ERROR(OB_DDL_SCHEMA_VERSION_NOT_MATCH, -5403, -1, "HY000", "ddl schema version not match");
 | 
				
			||||||
 | 
					DEFINE_ERROR_EXT(OB_ERR_COLUMN_GROUP_DUPLICATE, -5404, ER_DUP_FIELDNAME, "42S21", "Duplicate column group name", "Duplicate column group name '%.*s'");
 | 
				
			||||||
 | 
					
 | 
				
			||||||
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 | 
					//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 | 
				
			||||||
//error code for json  -5410 ---- -5433, as for json only support mysql mode, error code for oracle use special values 
 | 
					//error code for json  -5410 ---- -5433, as for json only support mysql mode, error code for oracle use special values 
 | 
				
			||||||
 | 
				
			|||||||
@ -763,6 +763,7 @@ constexpr int OB_ERR_OBJECT_STRING_DOES_NOT_EXIST = -5400;
 | 
				
			|||||||
constexpr int OB_ERR_RESULTANT_DATA_TYPE_OF_VIRTUAL_COLUMN_IS_NOT_SUPPORTED = -5401;
 | 
					constexpr int OB_ERR_RESULTANT_DATA_TYPE_OF_VIRTUAL_COLUMN_IS_NOT_SUPPORTED = -5401;
 | 
				
			||||||
constexpr int OB_ERR_GET_STACKED_DIAGNOSTICS = -5402;
 | 
					constexpr int OB_ERR_GET_STACKED_DIAGNOSTICS = -5402;
 | 
				
			||||||
constexpr int OB_DDL_SCHEMA_VERSION_NOT_MATCH = -5403;
 | 
					constexpr int OB_DDL_SCHEMA_VERSION_NOT_MATCH = -5403;
 | 
				
			||||||
 | 
					constexpr int OB_ERR_COLUMN_GROUP_DUPLICATE = -5404;
 | 
				
			||||||
constexpr int OB_SQL_RETRY_SPM = -5434;
 | 
					constexpr int OB_SQL_RETRY_SPM = -5434;
 | 
				
			||||||
constexpr int OB_OUTLINE_NOT_REPRODUCIBLE = -5435;
 | 
					constexpr int OB_OUTLINE_NOT_REPRODUCIBLE = -5435;
 | 
				
			||||||
constexpr int OB_ERR_SP_ALREADY_EXISTS = -5541;
 | 
					constexpr int OB_ERR_SP_ALREADY_EXISTS = -5541;
 | 
				
			||||||
@ -2491,6 +2492,7 @@ constexpr int OB_ERR_INVALID_DATE_MSG_FMT_V2 = -4219;
 | 
				
			|||||||
#define OB_ERR_RESULTANT_DATA_TYPE_OF_VIRTUAL_COLUMN_IS_NOT_SUPPORTED__USER_ERROR_MSG "resultant data type of virtual column is not supported"
 | 
					#define OB_ERR_RESULTANT_DATA_TYPE_OF_VIRTUAL_COLUMN_IS_NOT_SUPPORTED__USER_ERROR_MSG "resultant data type of virtual column is not supported"
 | 
				
			||||||
#define OB_ERR_GET_STACKED_DIAGNOSTICS__USER_ERROR_MSG "GET STACKED DIAGNOSTICS when handler not active"
 | 
					#define OB_ERR_GET_STACKED_DIAGNOSTICS__USER_ERROR_MSG "GET STACKED DIAGNOSTICS when handler not active"
 | 
				
			||||||
#define OB_DDL_SCHEMA_VERSION_NOT_MATCH__USER_ERROR_MSG "ddl schema version not match"
 | 
					#define OB_DDL_SCHEMA_VERSION_NOT_MATCH__USER_ERROR_MSG "ddl schema version not match"
 | 
				
			||||||
 | 
					#define OB_ERR_COLUMN_GROUP_DUPLICATE__USER_ERROR_MSG "Duplicate column group name '%.*s'"
 | 
				
			||||||
#define OB_ERR_INVALID_JSON_TEXT__USER_ERROR_MSG "Invalid JSON text."
 | 
					#define OB_ERR_INVALID_JSON_TEXT__USER_ERROR_MSG "Invalid JSON text."
 | 
				
			||||||
#define OB_ERR_INVALID_JSON_TEXT_IN_PARAM__USER_ERROR_MSG "Invalid JSON text in argument."
 | 
					#define OB_ERR_INVALID_JSON_TEXT_IN_PARAM__USER_ERROR_MSG "Invalid JSON text in argument."
 | 
				
			||||||
#define OB_ERR_INVALID_JSON_BINARY_DATA__USER_ERROR_MSG "The JSON binary value contains invalid data."
 | 
					#define OB_ERR_INVALID_JSON_BINARY_DATA__USER_ERROR_MSG "The JSON binary value contains invalid data."
 | 
				
			||||||
@ -4322,6 +4324,7 @@ constexpr int OB_ERR_INVALID_DATE_MSG_FMT_V2 = -4219;
 | 
				
			|||||||
#define OB_ERR_RESULTANT_DATA_TYPE_OF_VIRTUAL_COLUMN_IS_NOT_SUPPORTED__ORA_USER_ERROR_MSG "ORA-54004: resultant data type of virtual column is not supported"
 | 
					#define OB_ERR_RESULTANT_DATA_TYPE_OF_VIRTUAL_COLUMN_IS_NOT_SUPPORTED__ORA_USER_ERROR_MSG "ORA-54004: resultant data type of virtual column is not supported"
 | 
				
			||||||
#define OB_ERR_GET_STACKED_DIAGNOSTICS__ORA_USER_ERROR_MSG "ORA-00600: internal error code, arguments: -5402, GET STACKED DIAGNOSTICS when handler not active"
 | 
					#define OB_ERR_GET_STACKED_DIAGNOSTICS__ORA_USER_ERROR_MSG "ORA-00600: internal error code, arguments: -5402, GET STACKED DIAGNOSTICS when handler not active"
 | 
				
			||||||
#define OB_DDL_SCHEMA_VERSION_NOT_MATCH__ORA_USER_ERROR_MSG "ORA-00600: internal error code, arguments: -5403, ddl schema version not match"
 | 
					#define OB_DDL_SCHEMA_VERSION_NOT_MATCH__ORA_USER_ERROR_MSG "ORA-00600: internal error code, arguments: -5403, ddl schema version not match"
 | 
				
			||||||
 | 
					#define OB_ERR_COLUMN_GROUP_DUPLICATE__ORA_USER_ERROR_MSG "ORA-00600: internal error code, arguments: -5404, Duplicate column group name '%.*s'"
 | 
				
			||||||
#define OB_ERR_INVALID_JSON_TEXT__ORA_USER_ERROR_MSG "ORA-00600: Invalid JSON text."
 | 
					#define OB_ERR_INVALID_JSON_TEXT__ORA_USER_ERROR_MSG "ORA-00600: Invalid JSON text."
 | 
				
			||||||
#define OB_ERR_INVALID_JSON_TEXT_IN_PARAM__ORA_USER_ERROR_MSG "ORA-00600: Invalid JSON text in argument."
 | 
					#define OB_ERR_INVALID_JSON_TEXT_IN_PARAM__ORA_USER_ERROR_MSG "ORA-00600: Invalid JSON text in argument."
 | 
				
			||||||
#define OB_ERR_INVALID_JSON_BINARY_DATA__ORA_USER_ERROR_MSG "ORA-00600: The JSON binary value contains invalid data."
 | 
					#define OB_ERR_INVALID_JSON_BINARY_DATA__ORA_USER_ERROR_MSG "ORA-00600: The JSON binary value contains invalid data."
 | 
				
			||||||
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user