You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by su...@apache.org on 2015/10/10 06:41:59 UTC
[5/6] incubator-trafodion git commit: Removed commented code
Removed commented 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/dd15115e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/dd15115e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/dd15115e
Branch: refs/heads/master
Commit: dd15115e81b16afea15e0d342c7ebf4e2d125bd4
Parents: 661f4ad
Author: Arvind Narain <ar...@dev02.trafodion.org>
Authored: Fri Oct 9 05:06:10 2015 +0000
Committer: Arvind Narain <ar...@dev02.trafodion.org>
Committed: Fri Oct 9 05:06:10 2015 +0000
----------------------------------------------------------------------
.../serverHandler/ServerApiGetCatalogs.java | 81 --------------------
1 file changed, 81 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/dd15115e/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerApiGetCatalogs.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerApiGetCatalogs.java b/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerApiGetCatalogs.java
index 86a5515..82b9bbc 100644
--- a/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerApiGetCatalogs.java
+++ b/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerApiGetCatalogs.java
@@ -445,13 +445,6 @@ public class ServerApiGetCatalogs {
if (outCount > 0){
trafStmt.addTResultSet(new TrafResultSet(rs, 0, stmtLabel, 0, outDescList,""));
}
-/*
- trafStmt.setoutCount(outCount);
- if (outCount > 0){
- trafStmt.setColumnLength(outDescList.getVarLength());
- trafStmt.setoutDescList(outDescList);
- }
-*/
//
//===================calculate length of output ByteBuffer========================
//
@@ -460,16 +453,6 @@ public class ServerApiGetCatalogs {
//
// check if ByteBuffer is big enough for output
//
-//===================== build output ==============================================
-//
-/* odbc_SQLSvc_GetSQLCatalogs_exc_ m_p1;
- String m_p2; stmtLabel
- SQLItemDescList_def m_p3;
- ERROR_DESC_LIST_def m_p4;
- String proxySyntax = "";
-*/
-// check if ByteBuffer is big enough for output
-//
int dataLength = serverException.lengthOfData();
dataLength += ByteBufferUtils.lengthOfString(stmtLabel); //stmtLabel
if (outDescList != null)
@@ -522,68 +505,4 @@ public class ServerApiGetCatalogs {
return clientData;
}
}
-/*
-//
-// length of odbc_SQLSvc_GetSQLCatalogs_exc_ *exception_
-//
- wlength += sizeof(exception_->exception_nr);
- wlength += sizeof(exception_->exception_detail);
-
- switch(exception_->exception_nr)
- {
- case odbc_SQLSvc_GetSQLCatalogs_ParamError_exn_:
- wlength += sizeof(exceptionLength);
- if (exception_->u.ParamError.ParamDesc != NULL)
- {
- exceptionLength = strlen(exception_->u.ParamError.ParamDesc) + 1;
- wlength += exceptionLength;
- }
- break;
-
- case odbc_SQLSvc_GetSQLCatalogs_SQLError_exn_:
- ERROR_DESC_LIST_length( (ERROR_DESC_LIST_def *)&exception_->u.SQLError.errorList, wlength);
- break;
-
- case odbc_SQLSvc_GetSQLCatalogs_InvalidConnection_exn_:
- case odbc_SQLSvc_GetSQLCatalogs_SQLInvalidHandle_exn_:
- break;
- default:
- break;
- }
-
-//
-// length of IDL_char *catStmtLabel
-//
- wlength += sizeof(catStmtLabelLength);
- if (catStmtLabel != NULL)
- {
- catStmtLabelLength = strlen(catStmtLabel)+1;
- wlength += catStmtLabelLength;
- }
-
-//
-// length of SQLItemDescList_def *outputDesc
-//
- SQLITEMDESC_LIST_length( outputDesc, wlength);
-
-//
-// length of ERROR_DESC_LIST_def *sqlWarning
-//
-//
- ERROR_DESC_LIST_LENGTH2(sqlWarning)
-
-//
-//
-//
-
- wlength += sizeof (proxySyntaxStringLen);
- if((pSrvrStmt != NULL) && (pSrvrStmt->SpjProxySyntaxString != NULL))
- proxySyntaxStringLen = strlen(pSrvrStmt->SpjProxySyntaxString);
- else
- proxySyntaxStringLen = 0;
-
- if(proxySyntaxStringLen > 0)
- wlength += proxySyntaxStringLen + 1; // null terminated string
-
- */