You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by se...@apache.org on 2016/01/07 16:09:39 UTC
[1/5] incubator-trafodion git commit: Fixes for getTypeInfo()
Repository: incubator-trafodion
Updated Branches:
refs/heads/mrg_241 [created] 9934a0736
Fixes for getTypeInfo()
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/b0172435
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/b0172435
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/b0172435
Branch: refs/heads/mrg_241
Commit: b01724359e77d7f8b9f03d42d296e9ba58e40b7f
Parents: 5746be3
Author: Kevin Xu <ka...@esgyn.cn>
Authored: Fri Dec 25 17:58:57 2015 +0800
Committer: Kevin Xu <ka...@esgyn.cn>
Committed: Fri Dec 25 17:58:57 2015 +0800
----------------------------------------------------------------------
core/conn/jdbc_type2/native/CSrvrStmt.cpp | 2 +-
core/conn/jdbc_type2/native/SrvrCommon.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b0172435/core/conn/jdbc_type2/native/CSrvrStmt.cpp
----------------------------------------------------------------------
diff --git a/core/conn/jdbc_type2/native/CSrvrStmt.cpp b/core/conn/jdbc_type2/native/CSrvrStmt.cpp
index cba70b6..266a643 100644
--- a/core/conn/jdbc_type2/native/CSrvrStmt.cpp
+++ b/core/conn/jdbc_type2/native/CSrvrStmt.cpp
@@ -99,7 +99,7 @@ SRVR_STMT_HDL::SRVR_STMT_HDL(long inDialogueId)
moduleName[0] = '\0';
inputDescName[0] = '\0';
outputDescName[0] = '\0';
- isClosed = TRUE;
+ isClosed = FALSE;
IPD = NULL;
IRD = NULL;
useDefaultDesc = FALSE;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b0172435/core/conn/jdbc_type2/native/SrvrCommon.cpp
----------------------------------------------------------------------
diff --git a/core/conn/jdbc_type2/native/SrvrCommon.cpp b/core/conn/jdbc_type2/native/SrvrCommon.cpp
index c111b12..b1da3c8 100644
--- a/core/conn/jdbc_type2/native/SrvrCommon.cpp
+++ b/core/conn/jdbc_type2/native/SrvrCommon.cpp
@@ -1145,7 +1145,7 @@ short do_ExecSMD(
0,
0,
sqlStmtType,
- false,false);
+ false,true);
*stmtId = (long)pSrvrStmt;
SQLValue_def *sqlString = NULL;
[2/5] incubator-trafodion git commit: Remove useless code
Posted by se...@apache.org.
Remove useless code
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/a9af5024
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/a9af5024
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/a9af5024
Branch: refs/heads/mrg_241
Commit: a9af50240bea7fe91a37b4c058802030a7b63b0d
Parents: b017243
Author: Kevin Xu <ka...@esgyn.cn>
Authored: Tue Jan 5 09:52:49 2016 +0800
Committer: Kevin Xu <ka...@esgyn.cn>
Committed: Tue Jan 5 09:52:49 2016 +0800
----------------------------------------------------------------------
core/conn/jdbc_type2/native/SrvrCommon.cpp | 73 ++++++-------------------
1 file changed, 16 insertions(+), 57 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a9af5024/core/conn/jdbc_type2/native/SrvrCommon.cpp
----------------------------------------------------------------------
diff --git a/core/conn/jdbc_type2/native/SrvrCommon.cpp b/core/conn/jdbc_type2/native/SrvrCommon.cpp
index b1da3c8..d9bd6a9 100644
--- a/core/conn/jdbc_type2/native/SrvrCommon.cpp
+++ b/core/conn/jdbc_type2/native/SrvrCommon.cpp
@@ -1119,33 +1119,14 @@ short do_ExecSMD(
// Setup module filenames for MX metadata
//Module version is changed from 0 to "SQLCLI_ODBC_MODULE_VERSION" R3.0
- if (strncmp(stmtLabel, "SQL_GETTYPEINFO",15) == 0)
- pSrvrStmt = createSrvrStmt(dialogueId,
- stmtLabel,
- &sqlcode,
- "NONSTOP_SQLMX_NSK.MXCS_SCHEMA.CATANSIMXGTI",
- SQLCLI_ODBC_MODULE_VERSION,
- 1234567890,
- sqlStmtType,
- false,true);
- else if (strncmp(stmtLabel, "SQL_JAVA_",9) == 0)
- pSrvrStmt = createSrvrStmt(dialogueId,
- stmtLabel,
- &sqlcode,
- "NONSTOP_SQLMX_NSK.MXCS_SCHEMA.CATANSIMXJAVA",
- SQLCLI_ODBC_MODULE_VERSION,
- 1234567890,
- sqlStmtType,
- false,true);
- else
- pSrvrStmt = createSrvrStmt(dialogueId,
- stmtLabel,
- &sqlcode,
- NULL,
- 0,
- 0,
- sqlStmtType,
- false,true);
+ pSrvrStmt = createSrvrStmt(dialogueId,
+ stmtLabel,
+ &sqlcode,
+ NULL,
+ 0,
+ 0,
+ sqlStmtType,
+ false,true);
*stmtId = (long)pSrvrStmt;
SQLValue_def *sqlString = NULL;
@@ -1991,36 +1972,14 @@ short do_ExecFetchAppend(
long totalLength=0;
// Setup module filenames for MX metadata
- if (strncmp(stmtLabel, "SQL_GETTYPEINFO",15) == 0) {
- pSrvrStmt = createSrvrStmt(dialogueId,
- stmtLabel,
- &sqlcode,
- "NONSTOP_SQLMX_NSK.MXCS_SCHEMA.CATANSIMXGTI",
- SQLCLI_ODBC_MODULE_VERSION,
- 1234567890,
- sqlStmtType,
- false,true);
- }
- else if (strncmp(stmtLabel, "SQL_JAVA_",9) == 0) {
- pSrvrStmt = createSrvrStmt(dialogueId,
- stmtLabel,
- &sqlcode,
- "NONSTOP_SQLMX_NSK.MXCS_SCHEMA.CATANSIMXJAVA",
- SQLCLI_ODBC_MODULE_VERSION,
- 1234567890,
- sqlStmtType,
- false,true);
- }
- else {
- pSrvrStmt = createSrvrStmt(dialogueId,
- stmtLabel,
- &sqlcode,
- "NONSTOP_SQLMX_NSK.MXCS_SCHEMA.CATANSIMX",
- SQLCLI_ODBC_MODULE_VERSION,
- 1234567890,
- sqlStmtType,
- false,true);
- }
+ pSrvrStmt = createSrvrStmt(dialogueId,
+ stmtLabel,
+ &sqlcode,
+ "NONSTOP_SQLMX_NSK.MXCS_SCHEMA.CATANSIMX",
+ SQLCLI_ODBC_MODULE_VERSION,
+ 1234567890,
+ sqlStmtType,
+ false,true);
if (pSrvrStmt == NULL){
executeException->exception_nr = odbc_SQLSvc_PrepareFromModule_SQLError_exn_;
[3/5] incubator-trafodion git commit: replace "NONSTOP...SCHEMA" with
NULL
Posted by se...@apache.org.
replace "NONSTOP...SCHEMA" with NULL
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/482fc614
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/482fc614
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/482fc614
Branch: refs/heads/mrg_241
Commit: 482fc614226688fb2308bb6ddac3740e90c3a9b3
Parents: a9af502
Author: Kevin Xu <ka...@esgyn.cn>
Authored: Wed Jan 6 16:52:32 2016 +0800
Committer: Kevin Xu <ka...@esgyn.cn>
Committed: Wed Jan 6 16:52:32 2016 +0800
----------------------------------------------------------------------
core/conn/jdbc_type2/native/SrvrCommon.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/482fc614/core/conn/jdbc_type2/native/SrvrCommon.cpp
----------------------------------------------------------------------
diff --git a/core/conn/jdbc_type2/native/SrvrCommon.cpp b/core/conn/jdbc_type2/native/SrvrCommon.cpp
index d9bd6a9..e1daf73 100644
--- a/core/conn/jdbc_type2/native/SrvrCommon.cpp
+++ b/core/conn/jdbc_type2/native/SrvrCommon.cpp
@@ -1975,7 +1975,7 @@ short do_ExecFetchAppend(
pSrvrStmt = createSrvrStmt(dialogueId,
stmtLabel,
&sqlcode,
- "NONSTOP_SQLMX_NSK.MXCS_SCHEMA.CATANSIMX",
+ NULL,
SQLCLI_ODBC_MODULE_VERSION,
1234567890,
sqlStmtType,
[5/5] incubator-trafodion git commit: Merge [TRAFODION-1724] PR-241
Fixes for getTypeInfo()
Posted by se...@apache.org.
Merge [TRAFODION-1724] PR-241 Fixes for getTypeInfo()
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/9934a073
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/9934a073
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/9934a073
Branch: refs/heads/mrg_241
Commit: 9934a07366c8bc2155fdd8a72dbfa461c7f85d27
Parents: e5aeb0a 858f4f9
Author: selvaganesang <se...@apache.org>
Authored: Thu Jan 7 15:08:16 2016 +0000
Committer: selvaganesang <se...@apache.org>
Committed: Thu Jan 7 15:08:16 2016 +0000
----------------------------------------------------------------------
core/conn/jdbc_type2/native/SrvrCommon.cpp | 73 ++++++-------------------
1 file changed, 16 insertions(+), 57 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/9934a073/core/conn/jdbc_type2/native/SrvrCommon.cpp
----------------------------------------------------------------------
[4/5] incubator-trafodion git commit: Rollback isClosed status
Posted by se...@apache.org.
Rollback isClosed status
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/858f4f9b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/858f4f9b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/858f4f9b
Branch: refs/heads/mrg_241
Commit: 858f4f9b8e27f0eb7743ab45a9ff6a0e6c9b7506
Parents: 482fc61
Author: Kevin Xu <ka...@esgyn.cn>
Authored: Thu Jan 7 11:35:14 2016 +0800
Committer: Kevin Xu <ka...@esgyn.cn>
Committed: Thu Jan 7 11:35:14 2016 +0800
----------------------------------------------------------------------
core/conn/jdbc_type2/native/CSrvrStmt.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/858f4f9b/core/conn/jdbc_type2/native/CSrvrStmt.cpp
----------------------------------------------------------------------
diff --git a/core/conn/jdbc_type2/native/CSrvrStmt.cpp b/core/conn/jdbc_type2/native/CSrvrStmt.cpp
index 266a643..cba70b6 100644
--- a/core/conn/jdbc_type2/native/CSrvrStmt.cpp
+++ b/core/conn/jdbc_type2/native/CSrvrStmt.cpp
@@ -99,7 +99,7 @@ SRVR_STMT_HDL::SRVR_STMT_HDL(long inDialogueId)
moduleName[0] = '\0';
inputDescName[0] = '\0';
outputDescName[0] = '\0';
- isClosed = FALSE;
+ isClosed = TRUE;
IPD = NULL;
IRD = NULL;
useDefaultDesc = FALSE;