You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by db...@apache.org on 2016/08/17 18:35:06 UTC
[1/3] incubator-trafodion git commit: trafodion-1743 add connection
session
Repository: incubator-trafodion
Updated Branches:
refs/heads/master 0a31bbb9a -> d9e8233c8
trafodion-1743 add connection session
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/b25f9437
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/b25f9437
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/b25f9437
Branch: refs/heads/master
Commit: b25f9437e3beb356959eaa000f1bab13c0b4a0f5
Parents: f4d9910
Author: mashengchen <ma...@gmail.com>
Authored: Mon Aug 1 07:19:14 2016 +0000
Committer: mashengchen <ma...@gmail.com>
Committed: Mon Aug 1 07:19:14 2016 +0000
----------------------------------------------------------------------
core/conn/jdbc_type2/native/CoreCommon.h | 2 ++
core/conn/jdbc_type2/native/SQLMXConnection.cpp | 14 ++++++++++++++
core/conn/jdbc_type2/native/SrvrOthers.cpp | 9 +++++++++
3 files changed, 25 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b25f9437/core/conn/jdbc_type2/native/CoreCommon.h
----------------------------------------------------------------------
diff --git a/core/conn/jdbc_type2/native/CoreCommon.h b/core/conn/jdbc_type2/native/CoreCommon.h
index 92fc1c8..c131173 100644
--- a/core/conn/jdbc_type2/native/CoreCommon.h
+++ b/core/conn/jdbc_type2/native/CoreCommon.h
@@ -440,6 +440,8 @@ typedef struct _SRVR_GLOBAL_Def
#define CLEAR_SCHEMA 1013
#define CQD_DOOM_USER_TXN 1014
#define CQD_PCODE_OFF 1015
+#define BEGIN_SESSION 1016
+#define END_SESSION 1017
typedef struct tagDATE_TYPE
{
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b25f9437/core/conn/jdbc_type2/native/SQLMXConnection.cpp
----------------------------------------------------------------------
diff --git a/core/conn/jdbc_type2/native/SQLMXConnection.cpp b/core/conn/jdbc_type2/native/SQLMXConnection.cpp
index b25d940..e554715 100644
--- a/core/conn/jdbc_type2/native/SQLMXConnection.cpp
+++ b/core/conn/jdbc_type2/native/SQLMXConnection.cpp
@@ -591,6 +591,20 @@ JNIEXPORT void JNICALL Java_org_trafodion_jdbc_t2_SQLMXConnection_connectInit
}
+ odbc_SQLSvc_SetConnectionOption_sme_(NULL, NULL,
+ &setConnectException,
+ dialogueId,
+ BEGIN_SESSION,
+ 0,
+ NULL,
+ &sqlWarning);
+ if (setConnectException.exception_nr != CEE_SUCCESS)
+ {
+ throwSetConnectionException(jenv, &setConnectException);
+ FUNCTION_RETURN_VOID(("BEGIN_SESSION - setConnectException.exception_nr(%s) is not CEE_SUCCESS",
+ CliDebugSqlError(setConnectException.exception_nr)));
+ }
+
if(blnDoomUsrTxn)
{
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b25f9437/core/conn/jdbc_type2/native/SrvrOthers.cpp
----------------------------------------------------------------------
diff --git a/core/conn/jdbc_type2/native/SrvrOthers.cpp b/core/conn/jdbc_type2/native/SrvrOthers.cpp
index 16fa01e..08d8a7c 100644
--- a/core/conn/jdbc_type2/native/SrvrOthers.cpp
+++ b/core/conn/jdbc_type2/native/SrvrOthers.cpp
@@ -1125,6 +1125,15 @@ odbc_SQLSvc_SetConnectionOption_sme_(
}
strcat(sqlString, schemaValueStr);
break;
+ case BEGIN_SESSION:
+ if(optionValueStr != NULL && strlen(optionValueStr) > 0)
+ sprintf(sqlString,"SET SESSION DEFAULT SQL_SESSION 'BEGIN:%0.200s';",optionValueStr);
+ else
+ strcpy(sqlString, "SET SESSION DEFAULT SQL_SESSION 'BEGIN';");
+ break;
+ case END_SESSION:
+ strcpy(sqlString, "SET SESSION DEFAULT SQL_SESSION 'END'");
+ break;
case RESET_DEFAULTS:
strcpy(sqlString, "CONTROL QUERY DEFAULT * RESET");
break;
[3/3] incubator-trafodion git commit: Merge [TRAFODION-1743] PR 632
Add connection session
Posted by db...@apache.org.
Merge [TRAFODION-1743] PR 632 Add connection session
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/d9e8233c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/d9e8233c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/d9e8233c
Branch: refs/heads/master
Commit: d9e8233c83b0baca4352555721595903a3f61bf4
Parents: 0a31bbb 8be75cd
Author: Dave Birdsall <db...@apache.org>
Authored: Wed Aug 17 18:34:01 2016 +0000
Committer: Dave Birdsall <db...@apache.org>
Committed: Wed Aug 17 18:34:01 2016 +0000
----------------------------------------------------------------------
core/conn/jdbc_type2/native/CoreCommon.h | 2 ++
core/conn/jdbc_type2/native/SQLMXConnection.cpp | 32 +++++++++++++++++++-
core/conn/jdbc_type2/native/SrvrOthers.cpp | 9 ++++++
3 files changed, 42 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
[2/3] incubator-trafodion git commit: Update SQLMXConnection.cpp
Posted by db...@apache.org.
Update SQLMXConnection.cpp
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/8be75cdd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/8be75cdd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/8be75cdd
Branch: refs/heads/master
Commit: 8be75cddf081fd38ba48a8c78d7ed24d626387e8
Parents: b25f943
Author: mashengchen <ma...@gmail.com>
Authored: Fri Aug 12 18:29:56 2016 +0800
Committer: GitHub <no...@github.com>
Committed: Fri Aug 12 18:29:56 2016 +0800
----------------------------------------------------------------------
core/conn/jdbc_type2/native/SQLMXConnection.cpp | 18 +++++++++++++++++-
1 file changed, 17 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8be75cdd/core/conn/jdbc_type2/native/SQLMXConnection.cpp
----------------------------------------------------------------------
diff --git a/core/conn/jdbc_type2/native/SQLMXConnection.cpp b/core/conn/jdbc_type2/native/SQLMXConnection.cpp
index e554715..8c42bf7 100644
--- a/core/conn/jdbc_type2/native/SQLMXConnection.cpp
+++ b/core/conn/jdbc_type2/native/SQLMXConnection.cpp
@@ -240,7 +240,23 @@ JNIEXPORT void JNICALL Java_org_trafodion_jdbc_t2_SQLMXConnection_close
SRVR_CONNECT_HDL *jdbcConnect;
SQLRETURN rc;
-
+
+ ExceptionStruct setConnectException;
+ ERROR_DESC_LIST_def sqlWarning;
+ odbc_SQLSvc_SetConnectionOption_sme_(NULL, NULL,
+ &setConnectException,
+ dialogueId,
+ END_SESSION,
+ 0,
+ NULL,
+ &sqlWarning);
+ if (setConnectException.exception_nr != CEE_SUCCESS)
+ {
+ throwSetConnectionException(jenv, &setConnectException);
+ FUNCTION_RETURN_VOID(("END_SESSION - setConnectException.exception_nr(%s) is not CEE_SUCCESS",
+ CliDebugSqlError(setConnectException.exception_nr)));
+ }
+
jdbcConnect = (SRVR_CONNECT_HDL *)dialogueId;
rc = jdbcConnect->sqlClose();
switch (rc)