Return-Path: X-Original-To: apmail-trafodion-commits-archive@www.apache.org Delivered-To: apmail-trafodion-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id EE91A1737C for ; Tue, 6 Oct 2015 19:26:22 +0000 (UTC) Received: (qmail 59648 invoked by uid 500); 6 Oct 2015 19:26:22 -0000 Delivered-To: apmail-trafodion-commits-archive@trafodion.apache.org Received: (qmail 59617 invoked by uid 500); 6 Oct 2015 19:26:22 -0000 Mailing-List: contact commits-help@trafodion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: commits@trafodion.apache.org Delivered-To: mailing list commits@trafodion.apache.org Received: (qmail 59608 invoked by uid 99); 6 Oct 2015 19:26:22 -0000 Received: from Unknown (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 06 Oct 2015 19:26:22 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id 667D6C3C0F for ; Tue, 6 Oct 2015 19:26:22 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.77 X-Spam-Level: * X-Spam-Status: No, score=1.77 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, T_RP_MATCHES_RCVD=-0.01] autolearn=disabled Received: from mx1-us-east.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id 7A7DfvKlQzT8 for ; Tue, 6 Oct 2015 19:26:20 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-east.apache.org (ASF Mail Server at mx1-us-east.apache.org) with SMTP id 52A1D439FF for ; Tue, 6 Oct 2015 19:26:10 +0000 (UTC) Received: (qmail 59259 invoked by uid 99); 6 Oct 2015 19:26:09 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 06 Oct 2015 19:26:09 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id E77A3DFFA9; Tue, 6 Oct 2015 19:26:08 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sureshs@apache.org To: commits@trafodion.incubator.apache.org Date: Tue, 06 Oct 2015 19:26:29 -0000 Message-Id: <7dcd9f37ecf04f1f876cabce67d0bdb8@git.apache.org> In-Reply-To: <5d3912ea6dda4b8684e142fc4e801b6c@git.apache.org> References: <5d3912ea6dda4b8684e142fc4e801b6c@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [22/31] incubator-trafodion git commit: Copyright changes part 3 and cleanup work in dcs http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/69f18872/core/conn/unixodbc/odbc/Krypton/odbc.idl ---------------------------------------------------------------------- diff --git a/core/conn/unixodbc/odbc/Krypton/odbc.idl b/core/conn/unixodbc/odbc/Krypton/odbc.idl deleted file mode 100644 index c05c94e..0000000 --- a/core/conn/unixodbc/odbc/Krypton/odbc.idl +++ /dev/null @@ -1,340 +0,0 @@ -/********************************************************************** -// @@@ START COPYRIGHT @@@ -// -// Licensed to the Apache Software Foundation (ASF) under one -// or more contributor license agreements. See the NOTICE file -// distributed with this work for additional information -// regarding copyright ownership. The ASF licenses this file -// to you under the Apache License, Version 2.0 (the -// "License"); you may not use this file except in compliance -// with the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, -// software distributed under the License is distributed on an -// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the License for the -// specific language governing permissions and limitations -// under the License. -// -// @@@ END COPYRIGHT @@@ -********************************************************************/ -/************************************************************************** -**************************************************************************/ -// -// MODULE: ODBC.IDL -// PURPOSE: Describes the Tandem ODBC/MX RPC services. -// -// Modification History -// 15Jan98 Changed MonitorCallContext method to include diaglogueId -// -// 22Aug97 Changed some of the typedefs into basic types, since these typedefs -// are declared elsewhere. Modified Error as an Exception instead of -// out parameters. Other changes to fit to compile without any error -// 09Sep97 Added a new method SetConnectionOption and added a stmtType parameter -// in Prepare. (StmtType could be INTERNAL_STMT or EXTERNAL_STMT -// 13Sep97 Added a new method GetSQLGetTypeInfo. -// 22Sep97 Removed Association Services, moved to own IDL - -#ifndef ODBCSVC_DEFINED -#define ODBCSVC_DEFINED -#include "odbcCommon.idl" - -module odbc { - -#define ODBCsvc_uuid ((UUID_def) "9101c0ac-e07a-11d0-a543-0060b01ad6ae") - -interface SQLSvc { - - exception ParamError {string ParamDesc;}; - exception SQLError {ERROR_DESC_LIST_def errorList;}; - exception SQLInvalidHandle{}; - exception SQLNeedData{}; - exception SQLNoDataFound {}; - exception InvalidUser{ERROR_DESC_LIST_def errorList;}; - exception SQLRetryCompile{ERROR_DESC_LIST_def errorList;}; - exception InvalidConnection {}; -// exception RGError {RES_HIT_DESC_def resGov;}; - exception ProcessStopError {string ErrorText;}; - exception SQLStillExecuting{}; - exception SQLQueryCancelled{long sqlcode;}; - exception CancelNotPossible {}; - exception CancelSQLError { long sqlcode;}; - exception TransactionError{}; - exception StatisticsError{}; - exception StatisticsAlreadyDisabled{}; - exception StatisticsAlreadyEnabled{}; - exception TraceError{}; - exception TraceAlreadyDisabled{}; - exception TraceAlreadyEnabled{}; - - void InitializeDialogue( - in USER_DESC_def userDesc, - in CONNECTION_CONTEXT_def inContext, - in DIALOGUE_ID_def dialogueId, - out OUT_CONNECTION_CONTEXT_def outContext) - raises (ParamError, InvalidConnection, SQLError, SQLInvalidHandle, SQLNeedData, InvalidUser); - - void TerminateDialogue ( - in DIALOGUE_ID_def dialogueId) - raises (ParamError, InvalidConnection, SQLError); - - void MonitorCall(in DIALOGUE_ID_def dialogueId); - - void SetConnectionOption( - in DIALOGUE_ID_def dialogueId, - in short connectionOption, - in long optionValueNum, - in string optionValueStr, - out ERROR_DESC_LIST_def sqlWarning) - raises (ParamError, InvalidConnection, SQLError, SQLInvalidHandle); - - void EndTransaction ( - in DIALOGUE_ID_def dialogueId, - in unsigned short transactionOpt, - out ERROR_DESC_LIST_def sqlWarning) - raises (ParamError, InvalidConnection, SQLError, SQLInvalidHandle, TransactionError); - - void Prepare ( - in DIALOGUE_ID_def dialogueId, - in STMT_NAME_def stmtLabel, - in STMT_NAME_def stmtExplainLabel, - in short stmtType, - in string sqlString, - in short sqlAsyncEnable, - in long queryTimeout, - out long estimatedCost, - out SQLItemDescList_def inputDesc, - out SQLItemDescList_def outputDesc, - out ERROR_DESC_LIST_def sqlWarning) - raises (ParamError, InvalidConnection, SQLError, SQLStillExecuting, SQLQueryCancelled, TransactionError); - - void ExecDirect ( - in DIALOGUE_ID_def dialogueId, - in STMT_NAME_def stmtLabel, - in string cursorName, - in STMT_NAME_def stmtExplainLabel, - in short stmtType, - in short sqlStmtType, - in string sqlString, - in short sqlAsyncEnable, - in long queryTimeout, - out long estimatedCost, - out SQLItemDescList_def outputDesc, - out long rowsAffected, - out ERROR_DESC_LIST_def sqlWarning) - raises (ParamError, InvalidConnection, SQLError, SQLStillExecuting, SQLQueryCancelled, TransactionError); - - void ExecuteN ( - in DIALOGUE_ID_def dialogueId, - in STMT_NAME_def stmtLabel, - in string cursorName, - in short sqlStmtType, - in long inputRowCnt, - in SQLValueList_def inputValueList, - in short sqlAsyncEnable, - in long queryTimeout, - out long rowsAffected, - out ERROR_DESC_LIST_def sqlWarning) - raises (ParamError, InvalidConnection, SQLError, SQLInvalidHandle, SQLNeedData, - SQLRetryCompile, SQLStillExecuting, SQLQueryCancelled, TransactionError); - - void FetchN ( - in DIALOGUE_ID_def dialogueId, - in STMT_NAME_def stmtLabel, - in long maxRowCnt, - in long maxRowLen, - in short sqlAsyncEnable, - in long queryTimeout, - out long rowsAffected, - out SQLValueList_def outputValueList, - out ERROR_DESC_LIST_def sqlWarning) - raises (ParamError, InvalidConnection, SQLError, SQLInvalidHandle, - SQLNoDataFound, SQLStillExecuting, SQLQueryCancelled, TransactionError); - - void Close ( - in DIALOGUE_ID_def dialogueId, - in STMT_NAME_def stmtLabel, - in unsigned short freeResourceOpt, - out long rowsAffected, - out ERROR_DESC_LIST_def sqlWarning) - raises (ParamError, InvalidConnection, SQLError, TransactionError); - - void CancelStatement ( - in DIALOGUE_ID_def dialogueId, - in STMT_NAME_def stmtLabel, - out ERROR_DESC_LIST_def sqlWarning) - raises (ParamError, InvalidConnection, CancelSQLError, SQLInvalidHandle, CancelNotPossible); - - - void SetDiagInfo ( - in DIALOGUE_ID_def dialogueId, - in long DiagnosticFlag, - in string ClientPCName); - - void StopServer(in DIALOGUE_ID_def dialogueId, - in long StopType, - in string ReasonText) - raises (ParamError, ProcessStopError); - - void SetTestPoint( - in DIALOGUE_ID_def dialogueId, - in short TestPoint, - in unsigned long Operation) - raises (ParamError, InvalidConnection); - - void ClearTestPoint( - in DIALOGUE_ID_def dialogueId, - in short TestPoint, - in unsigned short Operation) - raises (ParamError, InvalidConnection); - - void GetSQLCatalogs ( - in DIALOGUE_ID_def dialogueId, - in STMT_NAME_def stmtLabel, - in short APIType, - in SQL_IDENTIFIER_def catalogNm, - in SQL_IDENTIFIER_def schemaNm, - in SQL_IDENTIFIER_def tableNm, - in string<128> tableTypeList, - in SQL_IDENTIFIER_def columnNm, - in long columnType, - in long rowIdScope, - in long nullable, - in long uniqueness, - in long accuracy, - in short sqlType, - in unsigned long metadataId, - in SQL_IDENTIFIER_def fkcatalogNm, - in SQL_IDENTIFIER_def fkschemaNm, - in SQL_IDENTIFIER_def fktableNm, - out STMT_NAME_def catStmtLabel, - out SQLItemDescList_def outputDesc, - out ERROR_DESC_LIST_def sqlWarning) - raises (ParamError, InvalidConnection, SQLError, SQLInvalidHandle); -// -// General Parameter Interface -// - void GeneralParam( - in GEN_ParamList_def paramList) - raises (ParamError); - -// -// Performance -// - void FetchPerf ( - in DIALOGUE_ID_def dialogueId, - in STMT_NAME_def stmtLabel, - in long maxRowCnt, - in long maxRowLen, - in short sqlAsyncEnable, - in long queryTimeout, - out long rowsAffected, - out SQL_DataValue_def outputDataValue, - out ERROR_DESC_LIST_def sqlWarning) - raises (ParamError, InvalidConnection, SQLError, SQLInvalidHandle, - SQLNoDataFound, SQLStillExecuting, SQLQueryCancelled, TransactionError); - -// -// Rowset -// - void FetchRowset ( - in DIALOGUE_ID_def dialogueId, - in STMT_NAME_def stmtLabel, - in long maxRowCnt, - in long maxRowLen, - in short sqlAsyncEnable, - in long queryTimeout, - out long rowsAffected, - out SQL_DataValue_def outputDataValue, - out ERROR_DESC_LIST_def sqlWarning) - raises (ParamError, InvalidConnection, SQLError, SQLInvalidHandle, - SQLNoDataFound, SQLStillExecuting, SQLQueryCancelled, TransactionError); - - void PrepareRowset ( - in DIALOGUE_ID_def dialogueId, - in STMT_NAME_def stmtLabel, - in STMT_NAME_def stmtExplainLabel, - in short stmtType, - in short sqlStmtType, - in string sqlString, - in short sqlAsyncEnable, - in long queryTimeout, - in long maxRowsetSize, - out long estimatedCost, - out SQLItemDescList_def inputDesc, - out SQLItemDescList_def outputDesc, - out ERROR_DESC_LIST_def sqlWarning) - raises (ParamError, InvalidConnection, SQLError, SQLStillExecuting, SQLQueryCancelled, TransactionError); - - void ExecDirectRowset ( - in DIALOGUE_ID_def dialogueId, - in STMT_NAME_def stmtLabel, - in string cursorName, - in STMT_NAME_def stmtExplainLabel, - in short stmtType, - in short sqlStmtType, - in string sqlString, - in short sqlAsyncEnable, - in long queryTimeout, - in long maxRowsetSize, - out long estimatedCost, - out SQLItemDescList_def outputDesc, - out long rowsAffected, - out ERROR_DESC_LIST_def sqlWarning) - raises (ParamError, InvalidConnection, SQLError, SQLStillExecuting, SQLQueryCancelled, TransactionError); - - void ExecuteRowset ( - in DIALOGUE_ID_def dialogueId, - in STMT_NAME_def stmtLabel, - in string cursorName, - in short sqlStmtType, - in long inputRowCnt, - in SQL_DataValue_def inputDataValue, - in short sqlAsyncEnable, - in long queryTimeout, - out long rowsAffected, - out ERROR_DESC_LIST_def sqlWarning) - raises (ParamError, InvalidConnection, SQLError, SQLInvalidHandle, SQLNeedData, - SQLRetryCompile, SQLStillExecuting, SQLQueryCancelled, TransactionError); - - void EnableServerTrace(in DIALOGUE_ID_def dialogueId, - in long TraceType) - raises (ParamError, TraceError, TraceAlreadyEnabled); - - void DisableServerTrace(in DIALOGUE_ID_def dialogueId, - in long TraceType) - raises (ParamError, TraceError, TraceAlreadyDisabled); - - void EnableServerStatistics( - in DIALOGUE_ID_def dialogueId, - in long StatisticsType) - raises (ParamError, StatisticsError, StatisticsAlreadyEnabled); - - void DisableServerStatistics( - in DIALOGUE_ID_def dialogueId) - raises (ParamError, StatisticsError, StatisticsAlreadyDisabled); - - void UpdateServerContext(in SRVR_CONTEXT_def srvrContext) - raises (ParamError, SQLError); - - void ExecuteCall ( - in DIALOGUE_ID_def dialogueId, - in STMT_NAME_def stmtLabel, - in string cursorName, - in short sqlStmtType, - in long inputRowCnt, - in SQLValueList_def inputValueList, - in short sqlAsyncEnable, - in long queryTimeout, - out SQLValueList_def outputValueList, - out long rowsAffected, - out ERROR_DESC_LIST_def sqlWarning) - raises (ParamError, InvalidConnection, SQLError, SQLInvalidHandle, SQLNeedData, - SQLRetryCompile, SQLStillExecuting, SQLQueryCancelled, TransactionError); - - }; // end of SQL interface -}; // end of ODBC module - -#endif \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/69f18872/core/conn/unixodbc/odbc/Krypton/odbcCommon.idl ---------------------------------------------------------------------- diff --git a/core/conn/unixodbc/odbc/Krypton/odbcCommon.idl b/core/conn/unixodbc/odbc/Krypton/odbcCommon.idl deleted file mode 100644 index ee76e3e..0000000 --- a/core/conn/unixodbc/odbc/Krypton/odbcCommon.idl +++ /dev/null @@ -1,235 +0,0 @@ -/********************************************************************** -// @@@ START COPYRIGHT @@@ -// -// Licensed to the Apache Software Foundation (ASF) under one -// or more contributor license agreements. See the NOTICE file -// distributed with this work for additional information -// regarding copyright ownership. The ASF licenses this file -// to you under the Apache License, Version 2.0 (the -// "License"); you may not use this file except in compliance -// with the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, -// software distributed under the License is distributed on an -// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the License for the -// specific language governing permissions and limitations -// under the License. -// -// @@@ END COPYRIGHT @@@ -********************************************************************/ -/************************************************************************** -**************************************************************************/ -// -// MODULE: TDM_COMMON.IDL -// PURPOSE: Describes common typedefs used by the Tandem ODBC/MX -// Krypton IDL specifications. -// -//// Modification History -// 11Nov97 Changed to colHeadingNm to be of 60 characters in length -// 09Sep97 Changed the parameter name autoCommitOn to autocommit and its type from -// boolean to short in CONNECTION_CONTEXT_def -// -// 22Aug97 Changed some of the typedefs into basic types, since these typedefs -// are declared elsewhere. -// 1JAN98 TJA Changes for Association Service integration -#ifndef _COMMON_DEFINED -#define _COMMON_DEFINED - -typedef string UUID_def; - -#define common_uuid ((UUID_def) "d1894a72-0326-11d1-a54a-0060b01ad6ae") - -#define MAX_TEXT_SID_LEN 186 // check the comment in SecDrvr.cpp - // When you change this, Make sure you change in DrvrSrvr.h - -#define MAX_COMPUTERNAME_LENGTH 15 // defined in WINBASE.H - -#define MAX_PROCESS_NAME_LEN 9 - -typedef long DIALOGUE_ID_def; -typedef string<128> SQL_IDENTIFIER_def; -typedef string<30> STMT_NAME_def; -typedef long SQL_DATATYPE_def; -typedef string<5> SQLSTATE_def; -typedef string ERROR_STR_def; -typedef sequence SQL_DataValue_def; -typedef short SQL_INDICATOR_def; -typedef long long INTERVAL_NUM_def; -typedef string<30> TIMESTAMP_STR_def; -typedef sequence USER_SID_def; -typedef sequence USER_PASSWORD_def; -typedef sequence USER_NAME_def; -typedef long TIME_def; // This should be in sync with time_t declaration - -typedef short GEN_PARAM_TOKEN_def; -typedef short GEN_PARAM_OPERATION_def; -typedef sequence GEN_PARAM_VALUE_def; - -typedef string<32> VPROC_def; - -typedef struct ERROR_DESC_t { - long rowId; // 0 indicates all - long errorDiagnosticId; - long sqlcode; - SQLSTATE_def sqlstate; - ERROR_STR_def errorText; - long operationAbortId; - long errorCodeType; - string Param1; - string Param2; - string Param3; - string Param4; - string Param5; - string Param6; - string Param7; -} ERROR_DESC_def; - -typedef sequence ERROR_DESC_LIST_def; - -typedef struct SQLItemDesc_t { - long version; - SQL_DATATYPE_def dataType; - long datetimeCode; - long maxLen; - short precision; - short scale; - boolean nullInfo; - string<60> colHeadingNm; - boolean signType; - long ODBCDataType; - short ODBCPrecision; - long SQLCharset; - long ODBCCharset; - string<128+1> TableName; - string<128+1> CatalogName; - string<128+1> SchemaName; - string<128+1> Heading; - long intLeadPrec; - long paramMode; -} SQLItemDesc_def; - -typedef sequence SQLItemDescList_def; - -typedef struct SQLValue_t { - SQL_DATATYPE_def dataType; - SQL_INDICATOR_def dataInd; - SQL_DataValue_def dataValue; - long dataCharset; -} SQLValue_def; - -typedef sequence SQLValueList_def; - -typedef enum USER_DESC_TYPE_t { - SID_TYPE, - AUTHENTICATED_USER_TYPE, - UNAUTHENTICATED_USER_TYPE, - PASSWORD_ENCRYPTED_USER_TYPE, - SID_ENCRYPTED_USER_TYPE, - WIN95_USER_TYPE -} USER_DESC_TYPE_def; - -typedef struct USER_DESC_t -{ - USER_DESC_TYPE_def userDescType; - USER_SID_def userSid; - string domainName; - string userName; - USER_PASSWORD_def password; -} USER_DESC_def; - -// Note: This output context has to be kept to a minimum since all context -// cannot be retrieved at the connection time (to speed up -// the connection process, we reply to the driver before we are -// done with the connection process on the server side). -// If more information is needed, then a different approach has to be taken. -typedef struct VERSION_t { - short componentId; - short majorVersion; - short minorVersion; - unsigned long buildId; -} VERSION_def; - -typedef sequence VERSION_LIST_def; - -typedef struct CONNECTION_CONTEXT_t { - SQL_IDENTIFIER_def datasource; - SQL_IDENTIFIER_def catalog; - SQL_IDENTIFIER_def schema; - SQL_IDENTIFIER_def location; - SQL_IDENTIFIER_def userRole; - short accessMode; - short autoCommit; - short queryTimeoutSec; - short idleTimeoutSec; - short loginTimeoutSec; - short txnIsolationLevel; - short rowSetSize; - long diagnosticFlag; - unsigned long processId; - char computerName[MAX_COMPUTERNAME_LENGTH+1]; - string windowText; -// locale sensitive data (for language and code pages) - unsigned long ctxACP; - unsigned long ctxDataLang; - unsigned long ctxErrorLang; - short ctxCtrlInferNCHAR; - VERSION_LIST_def clientVersionList; -} CONNECTION_CONTEXT_def; - - -typedef struct OUT_CONNECTION_CONTEXT_t { - VERSION_LIST_def versionList; - short nodeId; - unsigned long processId; - char computerName[MAX_COMPUTERNAME_LENGTH+1]; - SQL_IDENTIFIER_def catalog; - SQL_IDENTIFIER_def schema; -} OUT_CONNECTION_CONTEXT_def; - -// -// Object reference -// -typedef char IDL_OBJECT_def[128]; - -typedef struct GEN_Param_t { - GEN_PARAM_TOKEN_def paramToken; - GEN_PARAM_OPERATION_def paramOperation; - GEN_PARAM_VALUE_def paramValue; -} GEN_Param_def; - -typedef sequence GEN_ParamList_def; - -typedef struct RES_DESC_t { - SQL_IDENTIFIER_def AttrNm; - long long Limit; - string Action; - long Settable; -} RES_DESC_def; - - -typedef sequence RES_DESC_LIST_def; - -typedef struct ENV_DESC_t { - long VarSeq; - long VarType; - string VarVal; -} ENV_DESC_def; - -typedef sequence ENV_DESC_LIST_def; - -typedef struct SRVR_CONTEXT_t -{ - INTERVAL_NUM_def srvrIdleTimeout; - INTERVAL_NUM_def connIdleTimeout; - RES_DESC_LIST_def resDescList; - ENV_DESC_LIST_def envDescList; -} SRVR_CONTEXT_def; - -// -// Performance -// - -#endif