You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by li...@apache.org on 2016/12/06 14:50:39 UTC
[05/13] incubator-trafodion git commit: jira 2227
jira 2227
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/4b806d12
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/4b806d12
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/4b806d12
Branch: refs/heads/master
Commit: 4b806d12e57296ffa111738c20be79842c241392
Parents: 4bb6282
Author: unknown <yo...@ESGYNCN.com>
Authored: Tue Nov 15 14:23:58 2016 +0800
Committer: unknown <yo...@ESGYNCN.com>
Committed: Tue Nov 15 14:23:58 2016 +0800
----------------------------------------------------------------------
core/conn/odbc/src/odbc/Common/QSData.h | 47 +++++++++++++++++++---------
1 file changed, 32 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/4b806d12/core/conn/odbc/src/odbc/Common/QSData.h
----------------------------------------------------------------------
diff --git a/core/conn/odbc/src/odbc/Common/QSData.h b/core/conn/odbc/src/odbc/Common/QSData.h
index a32fdd8..a600eb8 100644
--- a/core/conn/odbc/src/odbc/Common/QSData.h
+++ b/core/conn/odbc/src/odbc/Common/QSData.h
@@ -3578,6 +3578,22 @@ enum ExeErrorCode
EXE_EXTRACT_CANNOT_ALLOCATE_BUFFER = 8962,
// ---------------------------------------------------------------------
+// Execution errors related to JSon parser
+// ---------------------------------------------------------------------
+ EXE_JSON_INVALID_TOKEN = 8971,
+ EXE_JSON_INVALID_VALUE = 8972,
+ EXE_JSON_INVALID_STRING = 8973,
+ EXE_JSON_INVALID_ARRAY_START = 8974,
+ EXE_JSON_INVALID_ARRAY_NEXT = 8975,
+ EXE_JSON_INVALID_OBJECT_START = 8976,
+ EXE_JSON_INVALID_OBJECT_LABEL = 8977,
+ EXE_JSON_INVALID_OBJECT_NEXT = 8978,
+ EXE_JSON_INVALID_OBJECT_COMMA = 8979,
+ EXE_JSON_INVALID_END = 8980,
+ EXE_JSON_END_PREMATURELY = 8981,
+ EXE_JSON_UNEXPECTED_ERROR = 8982,
+
+// ---------------------------------------------------------------------
// Scratch file I/O errors (10100 - 10199)
// ---------------------------------------------------------------------
EXE_SCR_IO_CREATE = 10101,
@@ -3644,21 +3660,6 @@ enum ExeErrorCode
CLI_RWRS_DECOMPRESS_ERROR = 30045,
CLI_RWRS_DECOMPRESS_LENGTH_ERROR = 30046,
CLI_NAR_ERROR_DETAILS = 30047,
-// ---------------------------------------------------------------------
-// Execution errors related to JSon parser
-// ---------------------------------------------------------------------
- EXE_JSON_INVALID_TOKEN = 32001,
- EXE_JSON_INVALID_VALUE = 32002,
- EXE_JSON_INVALID_STRING = 32003,
- EXE_JSON_INVALID_ARRAY_START = 32004,
- EXE_JSON_INVALID_ARRAY_NEXT = 32005,
- EXE_JSON_INVALID_OBJECT_START = 32006,
- EXE_JSON_INVALID_OBJECT_LABEL = 32007,
- EXE_JSON_INVALID_OBJECT_NEXT = 32008,
- EXE_JSON_INVALID_OBJECT_COMMA = 32009,
- EXE_JSON_INVALID_END = 32010,
- EXE_JSON_END_PREMATURELY = 32011,
- EXE_JSON_UNEXPECTED_ERROR = 32012,
// ---------------------------------------------------------------------
// the trailer (use temporarily for new errors that aren't added yet)
@@ -4080,6 +4081,22 @@ const string FMT_EXE_EXTRACT_ERROR_WRITING_TO_FILE = "[8961],EXE_EXTRACT_ERROR_
const string FMT_EXE_EXTRACT_CANNOT_ALLOCATE_BUFFER = "[8962],EXE_EXTRACT_CANNOT_ALLOCATE_BUFFER";
// ---------------------------------------------------------------------
+// Execution errors related to JSon parser
+// ---------------------------------------------------------------------
+const string FMT_EXE_JSON_INVALID_TOKEN = "[8971],EXE_JSON_INVALID_TOKEN";
+const string FMT_EXE_JSON_INVALID_VALUE = "[8972],EXE_JSON_INVALID_VALUE";
+const string FMT_EXE_JSON_INVALID_STRING = "[8973],EXE_JSON_INVALID_STRING";
+const string FMT_EXE_JSON_INVALID_ARRAY_START = "[8974],EXE_JSON_INVALID_ARRAY_START";
+const string FMT_EXE_JSON_INVALID_ARRAY_NEXT = "[8975],EXE_JSON_INVALID_ARRAY_NEXT";
+const string FMT_EXE_JSON_INVALID_OBJECT_START = "[8976],EXE_JSON_INVALID_OBJECT_START";
+const string FMT_EXE_JSON_INVALID_OBJECT_LABEL = "[8977],EXE_JSON_INVALID_OBJECT_LABEL";
+const string FMT_EXE_JSON_INVALID_OBJECT_NEXT = "[8978],EXE_JSON_INVALID_OBJECT_NEXT";
+const string FMT_EXE_JSON_INVALID_OBJECT_COMMA = "[8979],EXE_JSON_INVALID_OBJECT_COMMA";
+const string FMT_EXE_JSON_INVALID_END = "[8980],EXE_JSON_INVALID_END";
+const string FMT_EXE_JSON_END_PREMATURELY = "[8981],EXE_JSON_END_PREMATURELY";
+const string FMT_EXE_JSON_UNEXPECTED_ERROR = "[8982],EXE_JSON_UNEXPECTED_ERROR";
+
+// ---------------------------------------------------------------------
// Scratch file I/O errors (10100 - 10199)
// ---------------------------------------------------------------------
const string FMT_EXE_SCR_IO_CREATE = "[10101],EXE_SCR_IO_CREATE";