From ecde2719b19dcc61991e013d391da478f907e1e1 Mon Sep 17 00:00:00 2001 From: David Hall Date: Mon, 9 Aug 2021 11:33:09 -0500 Subject: [PATCH] MCOL-3741 Change IDB-xxxx error codes to MCS-xxxx --- dbcon/mysql/ha_mcs_impl.cpp | 2 +- utils/loggingcpp/idberrorinfo.cpp | 2 +- utils/udfsdk/udfsdk.cpp | 4 ++-- utils/udfsdk/udfsdk.h | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dbcon/mysql/ha_mcs_impl.cpp b/dbcon/mysql/ha_mcs_impl.cpp index 459365ae4..978561745 100644 --- a/dbcon/mysql/ha_mcs_impl.cpp +++ b/dbcon/mysql/ha_mcs_impl.cpp @@ -1397,7 +1397,7 @@ uint32_t doUpdateDelete(THD* thd, gp_walk_info& gwi, const std::vector& c // avoid double set IDB error string emsg; - if (gwi.parseErrorText.find("IDB-") == string::npos) + if (gwi.parseErrorText.find("MCS-") == string::npos) { Message::Args args; args.add(gwi.parseErrorText); diff --git a/utils/loggingcpp/idberrorinfo.cpp b/utils/loggingcpp/idberrorinfo.cpp index 0fe755fe1..18940dcb8 100644 --- a/utils/loggingcpp/idberrorinfo.cpp +++ b/utils/loggingcpp/idberrorinfo.cpp @@ -210,7 +210,7 @@ string IDBErrorInfo::lookupError(const unsigned eid) msgstr = iter->second; ostringstream oss; - oss << "IDB-" << setw(4) << setfill('0') << eid << ": " << msgstr; + oss << "MCS-" << setw(4) << setfill('0') << eid << ": " << msgstr; return oss.str(); } diff --git a/utils/udfsdk/udfsdk.cpp b/utils/udfsdk/udfsdk.cpp index 6feb267d3..97ef87d2e 100644 --- a/utils/udfsdk/udfsdk.cpp +++ b/utils/udfsdk/udfsdk.cpp @@ -260,7 +260,7 @@ IDB_Decimal MCS_add::getDecimalVal(Row& row, /** * This API should never be called for MCS_add, because the latter * is not for date/datetime values addition. In such case, one can - * either not implement this API and an IDB-5001 error will be thrown, + * either not implement this API and an MCS5001 error will be thrown, * or throw a customized exception here. */ int32_t MCS_add::getDateIntVal(Row& row, @@ -274,7 +274,7 @@ int32_t MCS_add::getDateIntVal(Row& row, /** * This API should never be called for MCS_add, because the latter * is not for date/datetime values addition. In such case, one can - * either not implement this API and an IDB-5001 error will be thrown, + * either not implement this API and an MCS-5001 error will be thrown, * or throw a customized exception here. */ int64_t MCS_add::getDatetimeIntVal(Row& row, diff --git a/utils/udfsdk/udfsdk.h b/utils/udfsdk/udfsdk.h index 4587d067d..dafb89bd7 100644 --- a/utils/udfsdk/udfsdk.h +++ b/utils/udfsdk/udfsdk.h @@ -99,7 +99,7 @@ private: * getIntVal() will be called, because MCS_add() is passed as the third argument * to substr function, and an integer result is expected. * - * If one API is not implemented but called for a function, IDB-5001 error will + * If one API is not implemented but called for a function, MCS-5001 error will * be returned. */ class MCS_add : public funcexp::Func