[master] add new ERROR code OB_TENANT_ID_NOT_MATCH

deps/oblib/src/lib/ob_errno.h

@@ -351,6 +351,7 @@ constexpr int OB_ERR_INVALID_OPTION_KEY = -7286;
 constexpr int OB_ERR_INVALID_OPTION_VALUE = -7287;
 constexpr int OB_ERR_INVALID_GEOMETRY_TYPE = -7288;
 constexpr int OB_PACKET_CLUSTER_ID_NOT_MATCH = -8004;
+constexpr int OB_TENANT_ID_NOT_MATCH = -8005;
 constexpr int OB_URI_ERROR = -9001;
 constexpr int OB_FINAL_MD5_ERROR = -9002;
 constexpr int OB_OSS_ERROR = -9003;

src/share/ob_errno.def

@@ -1853,6 +1853,7 @@ DEFINE_ERROR(OB_SERVER_IS_INIT, -8001, -1, "08004", "Server is initializing");
 DEFINE_ERROR(OB_SERVER_IS_STOPPING, -8002, -1, "08004", "Server is stopping");
 DEFINE_ERROR(OB_PACKET_CHECKSUM_ERROR, -8003, -1, "08004", "Packet checksum error");
 DEFINE_ERROR_DEP(OB_PACKET_CLUSTER_ID_NOT_MATCH, -8004, -1, "08004", "Packet cluster_id not match");
+DEFINE_ERROR_DEP(OB_TENANT_ID_NOT_MATCH, -8005, -1, "08005", "Tenant id not match");
 
 ////////////////////////////////////////////////////////////////
 // backup and restore error codes 9000 - 9099

src/share/ob_errno.h

@@ -3378,6 +3378,7 @@ constexpr int OB_ERR_INVALID_DATE_MSG_FMT_V2 = -4219;
 #define OB_SERVER_IS_STOPPING__USER_ERROR_MSG "Server is stopping"
 #define OB_PACKET_CHECKSUM_ERROR__USER_ERROR_MSG "Packet checksum error"
 #define OB_PACKET_CLUSTER_ID_NOT_MATCH__USER_ERROR_MSG "Packet cluster_id not match"
+#define OB_TENANT_ID_NOT_MATCH__USER_ERROR_MSG "Tenant id not match"
 #define OB_URI_ERROR__USER_ERROR_MSG "URI error"
 #define OB_FINAL_MD5_ERROR__USER_ERROR_MSG "OSS file MD5 error"
 #define OB_OSS_ERROR__USER_ERROR_MSG "OSS error"
@@ -5405,6 +5406,7 @@ constexpr int OB_ERR_INVALID_DATE_MSG_FMT_V2 = -4219;
 #define OB_SERVER_IS_STOPPING__ORA_USER_ERROR_MSG "ORA-00600: internal error code, arguments: -8002, Server is stopping"
 #define OB_PACKET_CHECKSUM_ERROR__ORA_USER_ERROR_MSG "ORA-00600: internal error code, arguments: -8003, Packet checksum error"
 #define OB_PACKET_CLUSTER_ID_NOT_MATCH__ORA_USER_ERROR_MSG "ORA-00600: internal error code, arguments: -8004, Packet cluster_id not match"
+#define OB_TENANT_ID_NOT_MATCH__ORA_USER_ERROR_MSG "ORA-00600: internal error code, arguments: -8005, Tenant id not match"
 #define OB_URI_ERROR__ORA_USER_ERROR_MSG "ORA-00600: internal error code, arguments: -9001, URI error"
 #define OB_FINAL_MD5_ERROR__ORA_USER_ERROR_MSG "ORA-00600: internal error code, arguments: -9002, OSS file MD5 error"
 #define OB_OSS_ERROR__ORA_USER_ERROR_MSG "ORA-00600: internal error code, arguments: -9003, OSS error"
@@ -5749,7 +5751,7 @@ constexpr int OB_ERR_INVALID_DATE_MSG_FMT_V2 = -4219;
 #define OB_ERR_DATA_TOO_LONG_MSG_FMT_V2__ORA_USER_ERROR_MSG "ORA-12899: value too large for column %.*s (actual: %ld, maximum: %ld)"
 #define OB_ERR_INVALID_DATE_MSG_FMT_V2__ORA_USER_ERROR_MSG "ORA-01861: Incorrect datetime value for column '%.*s' at row %ld"
 
-extern int g_all_ob_errnos[2023];
+extern int g_all_ob_errnos[2024];
 
   const char *ob_error_name(const int oberr);
   const char* ob_error_cause(const int oberr);

src/sql/ob_sql_trans_control.cpp

@@ -75,7 +75,7 @@ static int get_tx_service(ObBasicSessionInfo *session,
   if (session->get_tx_desc() != NULL) {
     auto tx_tenant_id = session->get_tx_desc()->get_tenant_id();
     if (effective_tenant_id != tx_tenant_id) {
-      ret = OB_ERR_UNEXPECTED;
+      ret = OB_TENANT_ID_NOT_MATCH;
       LOG_ERROR("effective_tenant_id not equals to tx_tenant_id", K(ret), K(effective_tenant_id), K(tx_tenant_id), KPC(session));
     }
   }