Repository: trafodion Updated Branches: refs/heads/master c40ca2700 -> 1e100f413
[TRAFODION-3023] Add more enum files to analyzeMessageGuide.py Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/3444e174 Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/3444e174 Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/3444e174 Branch: refs/heads/master Commit: 3444e174ce80c4753b5505b63701a3a92f6e18f7 Parents: 51935dc Author: Dave Birdsall <[email protected]> Authored: Tue Apr 17 16:14:28 2018 +0000 Committer: Dave Birdsall <[email protected]> Committed: Tue Apr 17 16:14:28 2018 +0000 ---------------------------------------------------------------------- core/sqf/sql/scripts/analyzeMessageGuide.py | 4 ++- core/sql/sort/SortError.h | 2 +- core/sql/udrserv/udrdefs.h | 39 +++++++++++------------- 3 files changed, 22 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafodion/blob/3444e174/core/sqf/sql/scripts/analyzeMessageGuide.py ---------------------------------------------------------------------- diff --git a/core/sqf/sql/scripts/analyzeMessageGuide.py b/core/sqf/sql/scripts/analyzeMessageGuide.py index d903421..efc1f65 100644 --- a/core/sqf/sql/scripts/analyzeMessageGuide.py +++ b/core/sqf/sql/scripts/analyzeMessageGuide.py @@ -622,7 +622,9 @@ enumFileList = ( [ ['ustat/hs_const.h','USTAT_ERROR_CODES'], ['sqlcomp/CmpDDLCatErrorCodes.h','CatErrorCode'], ['optimizer/opt_error.h','OptimizerSQLErrorCode'], ['optimizer/UdrErrors.h','UDRErrors'], - ['exp/ExpErrorEnums.h','ExeErrorCode'] ] ) + ['exp/ExpErrorEnums.h','ExeErrorCode'], + ['sort/SortError.h','SortErrorEnum'], + ['udrserv/udrdefs.h','UdrErrorEnum'] ] ) for entry in enumFileList: fileName = mySQroot + '/../sql/' + entry[0] messagesTable.parseEnumFile(fileName,entry[1]) http://git-wip-us.apache.org/repos/asf/trafodion/blob/3444e174/core/sql/sort/SortError.h ---------------------------------------------------------------------- diff --git a/core/sql/sort/SortError.h b/core/sql/sort/SortError.h index b00eefb..ae809df 100644 --- a/core/sql/sort/SortError.h +++ b/core/sql/sort/SortError.h @@ -26,7 +26,7 @@ #include "Platform.h" #include "NABasicObject.h" -enum { +enum SortErrorEnum { EMissErrTxt = 10001 // internal error, missing error text ,EFromEOF = 10002 // from file eof ,EScrEOF = 10003 // scratch file eof http://git-wip-us.apache.org/repos/asf/trafodion/blob/3444e174/core/sql/udrserv/udrdefs.h ---------------------------------------------------------------------- diff --git a/core/sql/udrserv/udrdefs.h b/core/sql/udrserv/udrdefs.h index c264610..f3e253b 100644 --- a/core/sql/udrserv/udrdefs.h +++ b/core/sql/udrserv/udrdefs.h @@ -40,33 +40,30 @@ #define MAXERRTEXT 255 -#define UDR_ERR_UNKNOWN_MSG_TYPE 11101 // udrserv -#define UDR_ERR_MISSING_UDRHANDLE 11102 // udrunload, udrcontext, udrinvoke -#define UDR_ERR_MISSING_LMROUTINE 11103 // udrunload, udrinvoke -#define UDR_ERR_CLI_ERROR 11104 // udrcancel, udrcommit, udrload +enum UdrErrorEnum { + UDR_ERR_UNKNOWN_MSG_TYPE = 11101, // udrserv + UDR_ERR_MISSING_UDRHANDLE = 11102, // udrunload, udrcontext, udrinvoke + UDR_ERR_MISSING_LMROUTINE = 11103, // udrunload, udrinvoke + UDR_ERR_CLI_ERROR = 11104, // udrcancel, udrcommit, udrload // spinfo, udrinvoke -#define UDR_ERR_INVALID_LM_PARAMMODE 11105 // udrinvoke -#define UDR_ERR_UNABLE_TO_ALLOCATE_MEMORY 11108 // udrload -#define UDR_ERR_TOO_MANY_OPENERS 11109 // udrserv -#define UDR_ERR_MESSAGE_PROCESSING 11110 // udrcancel, udrcommint, + UDR_ERR_INVALID_LM_PARAMMODE = 11105, // udrinvoke + UDR_ERR_UNABLE_TO_ALLOCATE_MEMORY=11108, // udrload + UDR_ERR_TOO_MANY_OPENERS = 11109, // udrserv + UDR_ERR_MESSAGE_PROCESSING = 11110, // udrcancel, udrcommint, // udrimok, rsload, rsfetch // rscontinue, rsunload -#define UDR_ERR_INTERNAL_ERROR 11111 // spinfo -#define UDR_ERR_DUPLICATE_LOADS 11112 -#define UDR_ERR_UNEXPECTED_UNLOAD 11113 + UDR_ERR_INTERNAL_ERROR = 11111, // spinfo + UDR_ERR_DUPLICATE_LOADS = 11112, + UDR_ERR_UNEXPECTED_UNLOAD = 11113, // RS related messages -#define UDR_ERR_MISSING_RSHANDLE 11114 // RS handle missing -#define UDR_ERR_INTERNAL_CLI_ERROR 11115 // RS Internal CLI error -#define UDR_ERR_INVALID_RS_INDEX 11116 // RS Invalid index in RS_LOAD -#define UDR_ERR_INVALID_RS_STATE 11117 // RS is in invalid state for + UDR_ERR_MISSING_RSHANDLE = 11114, // RS handle missing + UDR_ERR_INTERNAL_CLI_ERROR = 11115, // RS Internal CLI error + UDR_ERR_INVALID_RS_INDEX = 11116, // RS Invalid index in RS_LOAD + UDR_ERR_INVALID_RS_STATE = 11117, // RS is in invalid state for // current operation -#define UDR_ERR_INVALID_RS_COLUMN_COUNT 11118 // RS column count is <= 0 - - -#define UDR_ERR_TRANSACTION_WAS_ABORTED 8839 // udrinvoke -#define UDR_ERR_SQL_ACCESS_VIOLATION 8882 // udrinvoke -#define UDR_ERR_NO_TRANSACTION_VIOLATION 8884 // udrinvoke + UDR_ERR_INVALID_RS_COLUMN_COUNT = 11118 // RS column count is <= 0 +}; #define INVOKE_ERR_NO_REQUEST_BUFFER 1 #define INVOKE_ERR_NO_INPUT_ROW 2
