Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 74E94200D1B for ; Thu, 7 Sep 2017 03:55:30 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 73771160E9C; Thu, 7 Sep 2017 01:55:30 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 50EE0160F9F for ; Thu, 7 Sep 2017 03:55:28 +0200 (CEST) Received: (qmail 84785 invoked by uid 500); 7 Sep 2017 01:55:27 -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 84670 invoked by uid 99); 7 Sep 2017 01:55:27 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 07 Sep 2017 01:55:27 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id DCE731A03C1 for ; Thu, 7 Sep 2017 01:55:26 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -4.222 X-Spam-Level: X-Spam-Status: No, score=-4.222 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.001, SPF_PASS=-0.001] autolearn=disabled Received: from mx1-lw-us.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id wgwOGvdSEQGu for ; Thu, 7 Sep 2017 01:55:06 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-us.apache.org (ASF Mail Server at mx1-lw-us.apache.org) with SMTP id 78D935FB9F for ; Thu, 7 Sep 2017 01:54:59 +0000 (UTC) Received: (qmail 82184 invoked by uid 99); 7 Sep 2017 01:54:57 -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; Thu, 07 Sep 2017 01:54:57 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 57E19F56DB; Thu, 7 Sep 2017 01:54:56 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ansharma@apache.org To: commits@trafodion.incubator.apache.org Date: Thu, 07 Sep 2017 01:55:19 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [25/30] incubator-trafodion git commit: TRAFODION-2731 CodeCleanup: Remove obsolete, legacy and unused code archived-at: Thu, 07 Sep 2017 01:55:30 -0000 http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/cli/NoWaitOp.cpp ---------------------------------------------------------------------- diff --git a/core/sql/cli/NoWaitOp.cpp b/core/sql/cli/NoWaitOp.cpp index 8430d85..f6dc8d2 100644 --- a/core/sql/cli/NoWaitOp.cpp +++ b/core/sql/cli/NoWaitOp.cpp @@ -203,18 +203,7 @@ RETCODE NoWaitOp::awaitIox(Lng32 * tag) rc = SUCCESS; } } // end if rc != NOT_FINISHED - // update Measure elapsed time if Measure enabled. - if (stmt_->getRootTdb() && - ((ComTdb*)stmt_->getRootTdb())->getCollectStatsType() == - ComTdb::MEASURE_STATS && - stmt_->getGlobals()->getStatsArea() != NULL) - { - if (stmt_->getGlobals()->getStatsArea()->getStmtCntrs() != NULL) - { - stmt_->getGlobals()->getStatsArea()->getStmtCntrs()-> - incElapseBusyTime(NA_JulianTimestamp() - startTime); - } - } + } if (rc != NOT_FINISHED && op_ == FETCH_CLOSE) http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/cli/SQLCLIdev.h ---------------------------------------------------------------------- diff --git a/core/sql/cli/SQLCLIdev.h b/core/sql/cli/SQLCLIdev.h index 9ef68b8..438b052 100644 --- a/core/sql/cli/SQLCLIdev.h +++ b/core/sql/cli/SQLCLIdev.h @@ -49,32 +49,19 @@ class ComTdb; class ExStatisticsArea; // For internal use only -- do not document! -SQLCLI_LIB_FUNC Lng32 SQL_EXEC_AttachCodeToStatement_Internal( - /*IN*/ SQLSTMT_ID * statement_id, - /*IN*/ ComDiagsArea & comDiagsArea, - /*IN*/ char *generated_code, - /*IN*/ ULng32 generated_code_length); - -SQLCLI_LIB_FUNC Lng32 SQL_EXEC_DropModule ( - /*IN*/ SQLMODULE_ID * module_name); - -// For internal use only -- do not document! -SQLCLI_LIB_FUNC Lng32 SQL_EXEC_IsTransactionStarted_Internal(); - -// For internal use only -- do not document! -SQLCLI_LIB_FUNC void SQL_EXEC_SetParserFlagsForExSqlComp_Internal( +void SQL_EXEC_SetParserFlagsForExSqlComp_Internal( /*IN*/ ULng32 flagbits); // For internal use only -- do not document! -SQLCLI_LIB_FUNC Lng32 SQL_EXEC_SetParserFlagsForExSqlComp_Internal2( +Lng32 SQL_EXEC_SetParserFlagsForExSqlComp_Internal2( /*IN*/ ULng32 flagbits); // For internal use only -- do not document! -SQLCLI_LIB_FUNC void SQL_EXEC_ResetParserFlagsForExSqlComp_Internal( +void SQL_EXEC_ResetParserFlagsForExSqlComp_Internal( /*IN*/ ULng32 flagbits); // For internal use only -- do not document! -SQLCLI_LIB_FUNC Lng32 SQL_EXEC_ResetParserFlagsForExSqlComp_Internal2( +Lng32 SQL_EXEC_ResetParserFlagsForExSqlComp_Internal2( /*IN*/ ULng32 flagbits); Lng32 SQL_EXEC_AssignParserFlagsForExSqlComp_Internal( @@ -83,108 +70,8 @@ Lng32 SQL_EXEC_AssignParserFlagsForExSqlComp_Internal( Lng32 SQL_EXEC_GetParserFlagsForExSqlComp_Internal( /*IN*/ ULng32 &flagbits); -// For internal use only -- do not document! -SQLCLI_LIB_FUNC short SQL_EXEC_GetDefaultVolume_Internal( - /*OUT*/ char outBuf[], - /*IN */ const short outBufMaxLen, // NULL-terminated - /*OUT*/ short &defaultVolLen); - -// For internal use only -- do not document! -SQLCLI_LIB_FUNC Lng32 -SQL_EXEC_GetListOfAuditedVolumes_Internal( - /*INOUT*/ char **volNames, - /*INOUT*/ Lng32 *numOfVols); - -// For internal use only -- do not document! -SQLCLI_LIB_FUNC const char *const *const - SQL_EXEC_GetListOfVolumes_Internal(); - - -SQLCLI_LIB_FUNC Lng32 -SQL_EXEC_GetNumOfQualifyingVolumes_Internal( - /*IN */ const char *nodeName, - /*INOUT*/ Lng32 *numOfVols); - -SQLCLI_LIB_FUNC Lng32 -SQL_EXEC_GetListOfQualifyingVolumes_Internal(/*IN*/ const char *nodeName, - /*IN*/ Lng32 numOfVols, - /*OUT*/ char **volNames, - /*OUT*/ Lng32 *cpuNums, - /*OUT*/ Lng32 *capacities, - /*OUT*/ Lng32 *freespaces, - /*OUT*/ Lng32 *largestFragments); - -// For internal use only -- do not document! -// -// returns TRUE if the specified Guardian volume is up and -// would be useful for creating MX objects; returns FALSE otherwise. -// -// FILE_GETINFOLISTBYNAME_ is used to obtain information about the -// parameter volume, which can be local or remote. Any error from -// FILE_GETINFOLISTBYNAME_ will cause FALSE to be returned. -// -// If FILE_GETINFOLISTBYNAME_ completes successfully, the following -// checks are performed -// - the volume must be a volume (doh!) The device type is checked, -// and must have the value 3 -// - the volume must be a physical volume. The device subtype is -// checked, it cannot be 36 (SMF volume) or 52 (OSF) -// - the volume must be a TMF datavol. -// -// When FALSE is returned, the fileSystemError parameter will -// have one of the following values -// -// fileSystemError Means ... -// --------------- ------------------------------------------ -// 2 (FEINVALOP) The volume is not a physical volume -// 80 (FEAUDITINVALOP) The volume is not audited -// other FS error Examples are 14 (device does not exist) and -// 66 (device is down) -// -SQLCLI_LIB_FUNC Lng32 SQL_EXEC_IsVolumeUseful_Internal( - /* IN*/ const char *const volName, // NULL-terminated - /*OUT*/ short &fileSystemError); - -// For internal use only -- do not document! -// -// returns pointer pointing to the Tandem System Volume name -// (NULL-terminated) cached in the Executor dynamic global -// memory area. Returns NULL if cannot get the name (after -// logging an error message in the Windows NT Even log). -// -SQLCLI_LIB_FUNC Lng32 SQL_EXEC_GetSystemVolume_Internal( - /*INOUT*/ char * SMDlocation); - -// For internal use only -- do not document! -// -// returns pointer pointing to the Tandem System Volume name -// (NULL-terminated) from any accessible NSK node. Returns -// local node's System Volume name if nodeName param is passed -// in as null. On NT, if the nodeName param is any of null, "NSK" -// or "\NSK", this function returns local node's System Volume name. -// Return value is 0, -EXE_NAME_MAPPING_BAD_ANCHOR (-8303), or -// -EXE_NAME_MAPPING_FS_ERROR. In the latter case, the feError param -// is used to return the original FS error. -// -SQLCLI_LIB_FUNC Lng32 SQL_EXEC_GetRemoteSystemVolume_Internal( - /*INOUT*/ char *SMDlocation, - /*IN*/ const char *nodeName, - /*INOUT*/ Lng32 *fsError); - -// For internal use only -- do not document -// A new CLI call to allow catman to specify the the CLI which version of compiler -// to use to prepare a query. The caller can specify either a node name or a version but -// not both. If both are specified an error will be returned. - - -SQLCLI_LIB_FUNC Lng32 SQL_EXEC_SetCompilerVersion_Internal( short mxcmpVersionToUse, char *nodeName); - -SQLCLI_LIB_FUNC Lng32 SQL_EXEC_GetCompilerVersion_Internal( short &mxcmpVersionToUse, char *nodeName); - - - -SQLCLI_LIB_FUNC Lng32 SQL_EXEC_GetTotalTcbSpace(char*tdb, char*otherInfo); +Lng32 SQL_EXEC_GetTotalTcbSpace(char*tdb, char*otherInfo); // For internal use only -- do not document! // This method returns the type of stats that were collected. @@ -200,9 +87,8 @@ enum SQLCLIDevCollectStatsType { SQLCLIDEV_SAME_STATS = SQLCLI_SAME_STATS, SQLCLIDEV_NO_STATS = SQLCLI_NO_STATS, - SQLCLIDEV_MEASURE_STATS = SQLCLI_MEASURE_STATS, // collect statistics for measure counters - SQLCLIDEV_ACCUMULATED_STATS = SQLCLI_ACCUMULATED_STATS, // collect accumulated stats. Same as measure. - SQLCLIDEV_PERTABLE_STATS = SQLCLI_PERTABLE_STATS, // collect same stats that were collected in sql/mp on a per table basis + SQLCLIDEV_ACCUMULATED_STATS = SQLCLI_ACCUMULATED_STATS, // collect accumulated stats. + SQLCLIDEV_PERTABLE_STATS = SQLCLI_PERTABLE_STATS, // collect stats on a per table basis SQLCLIDEV_ALL_STATS = SQLCLI_ALL_STATS, // collect all stats about all exe operators SQLCLIDEV_OPERATOR_STATS = SQLCLI_OPERATOR_STATS // collect all stats but merge at // operator(tdb) granularity. @@ -219,7 +105,7 @@ enum SQLATTRHOLDABLE_INTERNAL_TYPE SQLCLIDEV_PUBSUB_HOLDABLE = 3 }; -SQLCLI_LIB_FUNC Lng32 SQL_EXEC_GetCollectStatsType_Internal( +Lng32 SQL_EXEC_GetCollectStatsType_Internal( /*OUT*/ ULng32 * collectStatsType, /*IN*/ SQLSTMT_ID * statement_id); @@ -229,7 +115,7 @@ SQLCLI_LIB_FUNC Lng32 SQL_EXEC_GetCollectStatsType_Internal( // if propagate is set to 1, then propagate environment to mxcmp now. // Otherwise, set them in internal cli globals so they could be propagated // the next time mxcmp is started. -SQLCLI_LIB_FUNC Lng32 SQL_EXEC_SetEnviron_Internal(/*IN*/Lng32 propagate); +Lng32 SQL_EXEC_SetEnviron_Internal(/*IN*/Lng32 propagate); #ifndef NO_SQLCLIDEV_INCLUDES #include "sql_charset_strings.h" @@ -327,18 +213,14 @@ enum UDRErrorFlag { SQLUDR_XACT_ABORT = 0x10 /* transaction was aborted */ }; -SQLCLI_LIB_FUNC Lng32 SQL_EXEC_GetUdrErrorFlags_Internal(/*OUT*/ Lng32 *udrErrorFlags); /* returns a bitmap vector of flags defined in enum UDRErrorFlag */ -SQLCLI_LIB_FUNC Lng32 SQL_EXEC_ResetUdrErrorFlags_Internal(); -SQLCLI_LIB_FUNC Lng32 SQL_EXEC_SetUdrAttributes_Internal(/*IN*/ Lng32 sqlAccessMode, /*IN*/ Lng32 /* for future use */); -SQLCLI_LIB_FUNC Lng32 SQL_EXEC_SetUdrRuntimeOptions_Internal(/*IN*/ const char *options, /*IN*/ ULng32 optionsLen, /*IN*/ const char *delimiters, @@ -346,7 +228,6 @@ Lng32 SQL_EXEC_SetUdrRuntimeOptions_Internal(/*IN*/ const char *options, // For internal use only -- do not document! // This method sets flag in CliGlobal to enable break handling. -SQLCLI_LIB_FUNC Lng32 SQL_EXEC_BreakEnabled_Internal(/*IN*/ UInt32 enabled ); // For internal use only -- do not document! @@ -354,17 +235,14 @@ Lng32 SQL_EXEC_BreakEnabled_Internal(/*IN*/ UInt32 enabled ); // received while executing a stored proc. It also resets this // flag. This flag is used by mxci to display the appropriate break error // message for operations that require the RECOVER command to be run. -SQLCLI_LIB_FUNC Lng32 SQL_EXEC_SPBreakReceived_Internal(/*OUT*/ UInt32 *breakRecvd); // For internal use only -- do not document! // This method merges the CLI diags area into the caller's diags area -SQLCLI_LIB_FUNC Lng32 SQL_EXEC_MergeDiagnostics_Internal (/*INOUT*/ ComDiagsArea & newDiags); // For internal use only -- do not document! // This method returns the CLI diags area in packed format -SQLCLI_LIB_FUNC Lng32 SQL_EXEC_GetPackedDiagnostics_Internal( /*OUT*/ char * message_buffer_ptr, /*IN*/ ULng32 message_obj_size, @@ -390,7 +268,6 @@ enum SQLCLIDevVersionType SQLCLIDEV_MODULE_VPROC_VERSION = 6 }; -SQLCLI_LIB_FUNC Lng32 SQL_EXEC_GetVersion_Internal (/*IN*/ Lng32 versionType, /*OUT*/ Lng32 * versionValue, @@ -398,515 +275,11 @@ Lng32 SQL_EXEC_GetVersion_Internal /*IN OPTIONAL*/ const SQLMODULE_ID * module_name, /*IN OPTIONAL*/ const SQLSTMT_ID * statement_id); -/****************************************************************** - * Procedures to support TMFARLB2 features for SQL/MX tables * - ******************************************************************/ - #ifdef __cplusplus /* use C linkage */ extern "C" { #endif -#define MXARLibCurrentVersion 1200 - -/* note that the following structures will work with any alignment - directive, they are designed not to have any implicit fillers */ - -#define MXARLibAuditParamsFillerSize 88 - -typedef struct MXARLibAuditParamsStruct -{ - /***************************************************************** - - version_ interface version, this field should be set to - MXARLibCurrentVersion. If the version of the - caller does not match the version of the SQL/MX - procedures, an error may get returned (or the - procedures may handle the older version - correctly in some cases). The versioning scheme - here is a "lazy" scheme that avoids changing the - version number until the length or non-filler - fields of the structure change. - - guardianName_ Pointer to a Guardian name with fully qualified - Volume, subvolume, and file name. The system - name is optional and must be the local system - if provided. - - guardianNameLen_ Length of the Guardian name that is passed in - (bytes). - - modifiedFieldMap_ Pointer to an optional ModifiedFieldMap structure - (declared here as a char pointer to avoid - dependencies on other include files), set - to NULL (0) if this parameter is not present. - - modifiedFieldMapLen_ Length of the optional modified field map - structure (in bytes) or 0. - - encodedKey_ The encoded key of the record or a NULL (0) - pointer. This parameter is optional and is - not used in R2 EAP. It may at some point be - used to return key columns that are otherwise - not contained in the audit record. - - encodedKeyLen_ Length of the encoded key (in bytes) or 0 or -1. - If set to -1, the auditImage_ buffer is - assumed to contain the encoded key and the - after and/or before audit image(s) in a - contiguous block, starting at the address - encodedKey_. The entire block has to be - contained in the address range auditImage_ - to auditImage_ + auditImageLen_. - - auditImage_ Pointer to a before or after image or a NULL - (0) pointer. The image must be for the table - specified in guardianName, and this must be - an SQL/MX table that exists and has the same - column layout as at the time when the audit - record was created. An error or invalid data - may be returned otherwise. - - auditImageLen_ Length of the audit image that is passed in - (bytes). - - sqlmxAuditVersion_ Version of the SQL/MX audit image format. This - version is passed in by the caller to make - sure that the generated audit can be - intepreted by this version of the software. - - crvsn_ CRVSN from the audit record, or zero. If non-zero - then the value is compared against the CRVSN of - the table and an error is returned if the two do - not match. If zero then the CRVSN check is - bypassed. - - filler_ For future additions. The caller must - initialize the filler space with zeroes. - - ****************************************************************** - */ - - Lng32 version_; - const char *guardianName_; - Lng32 guardianNameLen_; - const char *modifiedFieldMap_; - Lng32 modifiedFieldMapLen_; - const char *encodedKey_; - Lng32 encodedKeyLen_; - const char *auditImage_; - Lng32 auditImageLen_; - Lng32 sqlmxAuditVersion_; - - _int64 crvsn_; - - char filler_[MXARLibAuditParamsFillerSize]; - -} MXARLibAuditParams; - - -typedef struct MXARLibColumnInfoStruct -{ - /***************************************************************** - - columnNum_ Column number (same as in SQL/MX metadata tables). - User column numbers start with 1, the SYSKEY - column is column #0. - - columnAnsiType_ ANSI type code for the data type of the column. - See table 18 in the ANSI SQL92 standard. - - columnFsType_ FS data type of the column. See file - sqlcli.h for the _SQLDT_* defines that describe - the codes returned here. - - keyField_ Set to -1 if this column is not part of the - clustering key, set to the key column position - otherwise (first column is column #0). - - dataOffset_ Offset in bytes of the data portion of this - column. Note that the data portion does not - include the null indicator or the varchar - length. - - dataLength_ Length in bytes of the data portion of this - column. The data portion will occupy - bytes, starting at offset . - - nullIndOffset_ Offset of the NULL indicator of this column - in bytes. This value is undefined if the - column is not nullable. - - nullIndLength_ Length in bytes of the NULL indicator of this - column. The length is 0 if the column is not - nullable. Otherwise, the NULL indicator will - occupy bytes, starting at - offset . Note that the NULL - indicator may or may not be adjacent to the - data portion of the column. This value could - be 0, 2, 4, or 8. - - VarLenOffset_ Similar to the NULL indicator, this - describes the offset of the length indicator - for varchars (and maybe other variable-length - columns in the future). This value is undefined - if the column does not have a variable length - indicator. - - varLenLength_ Size (length) in bytes of the variable length - indicator. This value could be 0, 2, 4, or 8. - A value of 0 indicates that the column does not - have a variable length indicator. - - datetimeIntCode_ Detailed information on datetime or interval - ANSI datatypes. See Tables 19 and 20 in the - ANSI SQL92 standard or see the SQLDTCODE_ and - SQLINTCODE_ constants defined in file sqlcli.h. - - datetimeFsCode_ A more detailed description if has - the value 192 (_SQLDT_DATETIME). Other interfaces - such as GET DESCRIPTOR sometimes return this - information as the "precision" of a datetime - value. Here in the MXARLIB interface this value is - NOT returned in the precision field. See the - SQLDTCODE_* constants defined in file sqlcli.h for - the values returned. This value is undefined if - is not _SQLDT_DATETIME. - - Currently this value is always equal to - datetimeIntCode_. If we ever implement time zones - we may have to return different codes, since - SQL/MP uses some of the ANSI values for time zones - for its own datatypes. - - leadingPrecision_ This value is only set for interval data types - and indicates the precision of the leading part - of the interval (years, months, etc.). - - precision_ The precision (number of significant decimal - digits) for numeric values. - - scale_ The scale (decimal digits after the decimal point) - for numeric values. For interval, time and - timestamp columns, this is the "fraction - precision", the precision of fractional - seconds (a value between 0 for whole - seconds and 6 for microsecond resolution). - - characterSet_ Character set for a character column. See - SQLCHARSETCODE_ literals in file sqlcli.h. - - futureCollation_ a literal identifying the collation of a - character column, should collations be - supported in Release 2. - - filler_ for future column attributes, initialized to 0. - - To ensure upward-compatibility, please do not make assumptions on - how information gets returned. For example, the following - assumptions should NOT be made: - - Assuming that the offsets in the columns are in ascending order - - Assuming that the null indicator offset, varlen offset and - data offset are within a contiguous range without intervening - fillers or data from other columns - - Assuming that the data in the image buffer is "dense", - meaning that there are no unused spaces in it - - Assuming that the first field in the record starts at a fixed - offset - - Assuming that the values of nullIndLength_ and varLenLength_ - are fixed at 2 and 4, respectively, if non-zero - - Assuming that fields in the image buffer that are not described - by an MXARLibColumnInfo structure are set to any given value - - ****************************************************************** - */ - - Lng32 columnNum_; - Lng32 columnAnsiType_; - Lng32 columnFsType_; - Lng32 keyField_; - Lng32 dataOffset_; - Lng32 dataLength_; - Lng32 nullIndOffset_; - Lng32 nullIndLength_; - Lng32 varLenOffset_; - Lng32 varLenLength_; - Lng32 datetimeIntCode_; - Lng32 datetimeFsCode_; - Lng32 leadingPrecision_; - Lng32 precision_; - Lng32 scale_; - Lng32 characterSet_; - Lng32 futureCollation_; - char filler_[20]; -} MXARLibColumnInfo; - - - - - -/******************************************************************* - Container for MXARLibColumnInfo structs - - ColumnCount_ Number of MXARLibColumnInfo structs present - - EncodedKeyLength_ Length of the encoded key for this table - (needed more for internal reasons than for - customers), probably not returned by TMFARLB2 - -******************************************************************** -*/ -typedef struct MXARLibImageInfoStruct -{ - Lng32 columnCount_; - Lng32 encodedKeyLength_; - char filler_[120]; - MXARLibColumnInfo columnInfoArray_[1]; -} MXARLibImageInfo; - - - - - -/******************************************************************* - Get before image data for a given audit record - - return code out: FEOK or FE error number if the call is - not successful. NOTE: This procedure does not - return SQLCODE values nor does it set the - SQL diagnostics area. - Other possible error codes: - FENOTFOUND: underlying SQL/MX object - not found - more errors to be added. - - arlibParams in: Guardian name, audit record, and - global parameters - - requestBitmap in: Requested columns bitmap. One bit is set - to 1 for each requested column. Bits - that don't correspond to any column - are ignored, so that the caller can - just pass a longer array initialized - with all 1 bits if desired. - - replyBitmap out: Bitmap for returned columns, one bit - is set for each returned column in the - image. - - bitmapLength in: Length of request and reply bitmaps in - bytes. - - imageBuffer out: Buffer with "presentation format" of - the before or after image - - imageBufferLength in: Allocated length of imageBuffer - - endImageDataOffset out: Length of the area in the image buffer - that contains valid data (in bytes). - - replyHint out: Highest column number for which data was - returned, if this procedure completes - successfully. Otherwise, if FEBUFTOOSMALL - is returned as an error, then the - reply hint contains the needed size - of imageBuffer. - -******************************************************************** -*/ -SQLCLI_LIB_FUNC short SQL_MXARLIB_FETCHBEFOREDATA( - MXARLibAuditParams *arlibParams, - const Lng32 *requestBitmap, - Lng32 *replyBitmap, - Lng32 bitmapLength, - Lng32 *imageBuffer, // $$$$ Int64?? - Lng32 imageBufferLength, - Lng32 *endImageDataOffset, - Lng32 *replyHint); - - -/******************************************************************* - Get after image for a given audit record - Same parameters as SQL_MXARLIB_FETCHBEFOREDATA -*/ -SQLCLI_LIB_FUNC short SQL_MXARLIB_FETCHAFTERDATA( - MXARLibAuditParams *arlibParams, - const Lng32 *requestBitmap, - Lng32 *replyBitmap, - Lng32 bitmapLength, - Lng32 *imageBuffer, // $$$$ Int64 - Lng32 imageBufferLength, - Lng32 *endImageDataOffset, - Lng32 *replyHint); - - - -/******************************************************************* - Get information on the column layout of an SQL/MX table - - return code out: FEOK or FE error number if the call is - not successful. NOTE: This procedure does not - return SQLCODE values nor does it set the - SQL diagnostics area. - Other possible error codes: - FENOTFOUND: underlying SQL/MX object - not found - more errors to be added. - - guardianName in: Physical Guardian name of a - partition of the table for which info - is to be retrieved - - infoBuffer out: Buffer with record information - - infoBufferLength in: allocated length of infoBuffer - in bytes - - imageBufferLengthNeeded out: needed length for the - imageBuffer used in a subsequent - call to SQL_MXARLIB_FETCHxxxDATA - (in bytes). - - replyHint out: This parameter indicates the needed length - (in bytes) for infoBuffer. If the needed - length for infoBuffer - is greater than infoBufferLength - then error FEBUFTOOSMALL is returned - and this parameter indicates the smallest - acceptable value for infoBufferLength. - -******************************************************************** -*/ -SQLCLI_LIB_FUNC short SQL_MXARLIB_GETCOLUMNINFO( - const char *guardianName, - Lng32 guardianNameLen, - MXARLibImageInfo *infoBuffer, - Lng32 infoBufferLength, - Lng32 *imageBufferLengthNeeded, - Lng32 *replyHint); - - -/******************************************************************* - Invalidate an entry in the cache of table information that the - CLI maintains. - - return code out: FEOK or FE error number if the call is - not successful. - guardianName in: physical Guardian name of a partition which - should be invalidated in the cache. All - other partitions of the same file may be - invalidated as well. - guardianNameLen in: length of Guardian name passed in -******************************************************************** -*/ -SQLCLI_LIB_FUNC short SQL_MXARLIB_INVALTABLEINFOCACHE( - const char *guardianName, - Lng32 guardianNameLen); - - -/******************************************************************* - Set the size of the cache of table information that the CLI - maintains. This procedure should be called before any other - CLI calls described in this section are made, but doing so is - optional. If this method is not called before any of the calls - that use the cache, then some default values for the cache size - and the expiration time are assumed. - - return code out: FEOK or FE error number if the call is - not successful. - cacheSize in: Size of an internal cache (in megabytes) - that is used to store information about - columns, partitions, and ANSI names of - SQL/MX tables used in the CLI procedures. - - cacheInvTimeout in: Time (in centiseconds) for which we will - consider a cache entry valid. The timeout - may be 0. If a cache entry has not been - verified for longer than the timeout, the - procedures will verify it again, using a - comparison of the redefinition timestamp. - In case the redefinition timestamp does - not match, the cache entry will be - invalidated. -******************************************************************** -*/ -SQLCLI_LIB_FUNC short SQL_MXARLIB_SETTABLEINFOCACHE( - Lng32 cacheSize, - Lng32 cacheInvTimeout); - - -/******************************************************************* - Return the ANSI name that corresponds to the - Guardian name passed in - - return code out: FEOK or FE error number if the call is - not successful. NOTE: This procedure does not - return SQLCODE values nor does it set the - SQL diagnostics area. - Other possible error codes: - FENOTFOUND: underlying SQL/MX object - not found - more errors to be added. - - guardianName in: Physcical (non-SMF) Guardian name - to be resolved. The name is in external - format, partially or fully qualified. - - guardianNameLen in: Length of Guardian name passed in in bytes. - - ansiName out: Buffer for the returned ANSI name in external - form. ANSI names in their external form are no - longer than776 bytes (3 times 258 bytes for - catalog, schema, and name, plus two dots). - - ansiNameMaxLength in: Max. length of buffer for ANSI name. - - returnedAnsiNameLength out: Length of returned ANSI name. If the length - is greater than ansiNameLength, then an error - is also returned, the name is truncated, and - this parameter indicates the needed length. - - nameSpace out: A pointer to a two-character buffer (to be - allocated by the caller) in which the name - space of the ANSI name will be returned. - Current name spaces are: - "TA" Base table - "IX" Index - "IL" Log table for Materialized Views - "RL" Range log table for Materialized Views - "TT" Trigger temp table - " " Unknown name space (e. g. Resource fork) - - partitionName An identifier of the partition of the table, - index, etc. (if applicable). A partition name - can be used for TMF recovery operations on - particular table partitions if the user wants - to specify ANSI names for these partitions. - The partition name should never be longer than - 128 bytes. This parameter is optional, no - partition information will be returned if it - is set to a NULL pointer (0). - - partitionNameMaxLength Length of the buffer allocated for the - partition name. - - returnedPartitionNameLength actual length of the returned - partition identifier. Optional parameter, can - be set to a NULL pointer (0). - -******************************************************************** -*/ -SQLCLI_LIB_FUNC short SQL_MXARLIB_GETANSINAME( - const char *guardianName, /* in: Guardian name */ - Lng32 guardianNameLen, /* in: lenght of name */ - char *ansiName, /* out: ANSI name */ - Lng32 ansiNameMaxLength, /* in: len of buffer */ - Lng32 *returnedAnsiNameLength, /* out: len of name */ - char *nameSpace, /* out: table/index/etc. */ - char *partitionName, /* out: partition ident. */ - Lng32 partitionNameMaxLength, /* in: length of buffer */ - Lng32 *returnedPartitionNameLength); /* out: p name len */ - Lng32 SQL_EXEC_GetAuthID( const char * authName, Lng32 & authID); @@ -917,30 +290,30 @@ Lng32 SQL_EXEC_GetAuthName_Internal( Lng32 max_string_len, Lng32 &len_of_item); -SQLCLI_LIB_FUNC Lng32 SQL_EXEC_GetDatabaseUserName_Internal ( +Lng32 SQL_EXEC_GetDatabaseUserName_Internal ( /*IN*/ Lng32 user_id, /*OUT*/ char *string_value, /*IN*/ Lng32 max_string_len, /*OUT OPTIONAL*/ Lng32 *len_of_item); -SQLCLI_LIB_FUNC Lng32 SQL_EXEC_GetDatabaseUserID_Internal ( +Lng32 SQL_EXEC_GetDatabaseUserID_Internal ( /*IN*/ char *string_value, /*OUT*/ Lng32 *numeric_value); -SQLCLI_LIB_FUNC Lng32 SQL_EXEC_SetSessionAttr_Internal ( +Lng32 SQL_EXEC_SetSessionAttr_Internal ( /*IN (SESSIONATTR_TYPE)*/ Lng32 attrName, /*IN OPTIONAL*/ Lng32 numeric_value, /*IN OPTIONAL*/ char *string_value); -SQLCLI_LIB_FUNC Lng32 SQL_EXEC_SetErrorCodeInRTS( +Lng32 SQL_EXEC_SetErrorCodeInRTS( /*IN*/ SQLSTMT_ID * statement_id, /*IN*/ Lng32 sqlErrorCode); -SQLCLI_LIB_FUNC Lng32 SQL_EXEC_GetRoleList( +Lng32 SQL_EXEC_GetRoleList( Int32 &numRoles, Int32 *&roleIDs); -SQLCLI_LIB_FUNC Lng32 SQL_EXEC_ResetRoleList_Internal (); +Lng32 SQL_EXEC_ResetRoleList_Internal (); /* @@ -980,7 +353,7 @@ on the tdb type. Tdb Type Struct type ComTdb::ex_REPLICATE SQL_REPLICATOR_OPERATOR_STATS */ -SQLCLI_LIB_FUNC Lng32 SQL_EXEC_RegisterQuery(SQLQUERY_ID *queryId, +Lng32 SQL_EXEC_RegisterQuery(SQLQUERY_ID *queryId, Lng32 fragId, Lng32 tdbId, Lng32 explainTdbId, @@ -995,7 +368,7 @@ SQLCLI_LIB_FUNC Lng32 SQL_EXEC_RegisterQuery(SQLQUERY_ID *queryId, /* Deregisters the query in RMS shared segment */ -SQLCLI_LIB_FUNC Lng32 SQL_EXEC_DeregisterQuery(SQLQUERY_ID *queryId, +Lng32 SQL_EXEC_DeregisterQuery(SQLQUERY_ID *queryId, Lng32 fragId); enum SECliQueryType @@ -1053,7 +426,7 @@ enum SECliQueryType SE_CLI_TRAFQ_GET }; -SQLCLI_LIB_FUNC Lng32 SQL_EXEC_SEcliInterface +Lng32 SQL_EXEC_SEcliInterface ( SECliQueryType qType, @@ -1098,7 +471,7 @@ Int32 SQL_EXEC_SWITCH_BACK_COMPILER ( ); -SQLCLI_LIB_FUNC Lng32 SQL_EXEC_SeqGenCliInterface +Lng32 SQL_EXEC_SeqGenCliInterface ( void* *cliInterface, /* IN: if passed in and not null, use it. OUT: if returned, save it and pass it back in */ @@ -1108,7 +481,7 @@ SQLCLI_LIB_FUNC Lng32 SQL_EXEC_SeqGenCliInterface const Int32 NullCliRoutineHandle = -1; -SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetRoutine +Int32 SQL_EXEC_GetRoutine ( /* IN */ const char *serializedInvocationInfo, /* IN */ Int32 invocationInfoLen, @@ -1124,7 +497,7 @@ SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetRoutine ); -SQLCLI_LIB_FUNC Int32 SQL_EXEC_InvokeRoutine +Int32 SQL_EXEC_InvokeRoutine ( /* IN */ Int32 handle, /* IN */ Int32 phaseEnumAsInt, @@ -1141,7 +514,7 @@ SQLCLI_LIB_FUNC Int32 SQL_EXEC_InvokeRoutine /* IN */ Int32 outputRowLen ); -SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetRoutineInvocationInfo +Int32 SQL_EXEC_GetRoutineInvocationInfo ( /* IN */ Int32 handle, /* IN/OUT */ char *serializedInvocationInfo, @@ -1153,7 +526,7 @@ SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetRoutineInvocationInfo /* OUT */ Int32 *planInfoLenOut ); -SQLCLI_LIB_FUNC Int32 SQL_EXEC_PutRoutine +Int32 SQL_EXEC_PutRoutine ( /* IN */ Int32 handle ); http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/cli/SessionDefaults.cpp ---------------------------------------------------------------------- diff --git a/core/sql/cli/SessionDefaults.cpp b/core/sql/cli/SessionDefaults.cpp index 8922244..25dd67c 100644 --- a/core/sql/cli/SessionDefaults.cpp +++ b/core/sql/cli/SessionDefaults.cpp @@ -776,10 +776,6 @@ static const AQRInfo::AQRErrorMap aqrErrorMap[] = AQREntry( 4023, 0, 1, 0, 1, 1, "03", 0, 0), AQREntry( 4039, 0, 1, 0, 1, 1, "03", 0, 0), - // ReadTableDef mismatch transaction, transaction state needs to be cleaned up in compiler - kill compiler - // only valid after prepare errors - AQREntry( 4419, 0, 1, 0, 4, 0, "", 0, 0), - // parallel purgedata failed AQREntry( 8022, 0, 3, 60, 0, 0, "", 0, 1), http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/cli/Statement.cpp ---------------------------------------------------------------------- diff --git a/core/sql/cli/Statement.cpp b/core/sql/cli/Statement.cpp index a6aead5..8246d9c 100644 --- a/core/sql/cli/Statement.cpp +++ b/core/sql/cli/Statement.cpp @@ -65,17 +65,10 @@ #include "Int64.h" #include "ComSqlId.h" #include "CmpErrors.h" -#if !defined(__EID) && !defined(ARKFS_OPEN) -#include "ComResWords.h" -#endif - -// begin includes for similarity check. -#include "exp_tuple_desc.h" -// end includes for similarity check #include "TriggerEnable.h" // triggers -# include "ComSmallDefs.h" // MV -# include "ComMvAttributeBitmap.h" // MV +#include "ComSmallDefs.h" // MV +#include "ComMvAttributeBitmap.h" // MV #include "logmxevent.h" @@ -88,22 +81,13 @@ #include "ComAnsiNamePart.h" #include "ExRsInfo.h" -#include "PortProcessCalls.h" - -#if (defined(NA_LINUX) && defined (SQ_NEW_PHANDLE)) -#include "nsk/nskport.h" -#include "seabed/ms.h" -#include "seabed/fs.h" -#endif -#ifdef NA_CMPDLL #include "arkcmp_proc.h" #include "CmpContext.h" -#endif // NA_CMPDLL // Printf-style tracing macros for the debug build. The macros are // no-ops in the release build. -#ifdef NA_DEBUG_C_RUNTIME +#ifdef _DEBUG #include #define StmtDebug0(s) StmtPrintf((s)) #define StmtDebug1(s,a1) StmtPrintf((s),(a1)) @@ -144,9 +128,6 @@ const char *RetcodeToString(RETCODE r) } } -#ifdef _DEBUG -#endif // _DEBUG - class Dealloc { NAHeap *heap_; @@ -157,6 +138,7 @@ public: NAHeap * setHeap(NAHeap *heap) { return heap_ = heap; } void * getAddr(void *addr) { return addr_ = addr; } }; + //////////////////////////////////////////////////////////////////// // class StatementInfo //////////////////////////////////////////////////////////////////// @@ -240,7 +222,7 @@ Statement::Statement(SQLSTMT_ID * statement_id_, space_.setJmpBuf(cliGlobals_->getJmpBuf()); heap_.setJmpBuf(cliGlobals_->getJmpBuf()); -#ifdef NA_DEBUG_C_RUNTIME +#ifdef _DEBUG stmtDebug_ = FALSE; stmtListDebug_ = FALSE; Lng32 numCliCalls = context_->getNumOfCliCalls(); @@ -475,7 +457,7 @@ Statement::Statement(SQLSTMT_ID * statement_id_, break; } -#ifdef NA_DEBUG_C_RUNTIME +#ifdef _DEBUG switch (statement_id->name_mode) { case stmt_handle: @@ -546,9 +528,6 @@ Statement::Statement(SQLSTMT_ID * statement_id_, 1 /* create gui scheduler */, &space_, &heap_); - - // set Measure sqlstmt counter flag - statementGlobals_->setMeasStmtEnabled(cliGlobals_->getMeasStmtEnabled()); // stored the type in statementGlobals if(stmt_type_ == STATIC_STMT){ @@ -571,7 +550,6 @@ Statement::~Statement() { StmtDebug1("[BEGIN destructor] %p", this); - dealloc(); if (compileStatsArea_ != NULL) { @@ -1419,13 +1397,11 @@ RETCODE Statement::prepare2(char *source, ComDiagsArea &diagsArea, char *fetched_gen_code = NULL; short retcode = SUCCESS; short indexIntoCompilerArray = 0; -#ifdef NA_CMPDLL // if there is any error using embedded cmpiler and we will switch to regular compiler NABoolean canUseEmbeddedArkcmp = ((cliFlags & PREPARE_USE_EMBEDDED_ARKCMP) != 0) ; // This flag // will be set only by the master. If a Prepare call is made from the // compiler(including the embedded compiler), it will use the regular compiler. -#endif // NA_CMPDLL ExSqlComp::OperationStatus status; Dealloc dealloc; // DTOR calls NAHeap::deallocateMemory for an object @@ -1502,39 +1478,34 @@ RETCODE Statement::prepare2(char *source, ComDiagsArea &diagsArea, Lng32 rsa = getRowsetAtomicity(); if (context_->getSessionDefaults()->getRowsetAtomicity() != -1) rsa = context_->getSessionDefaults()->getRowsetAtomicity(); //NOT_ATOMIC_; -#ifdef NA_CMPDLL - // if (context_->getSessionDefaults()->callEmbeddedArkcmp() && canUseEmbeddedArkcmp && !aqRetry) - // { - if (canUseEmbeddedArkcmp && !context_->isEmbeddedArkcmpInitialized()) + + if (canUseEmbeddedArkcmp && !context_->isEmbeddedArkcmpInitialized()) + { + Int32 embeddedArkcmpSetup; + // embeddedArkcmpSetup = arkcmp_main_entry(); + embeddedArkcmpSetup = context_->switchToCmpContext((Int32)0); + if (embeddedArkcmpSetup == 0) { - Int32 embeddedArkcmpSetup; - // embeddedArkcmpSetup = arkcmp_main_entry(); - embeddedArkcmpSetup = context_->switchToCmpContext((Int32)0); - if (embeddedArkcmpSetup == 0) - { - context_->setEmbeddedArkcmpIsInitialized(TRUE); - // context_->setEmbeddedArkcmpContext(CmpCommon::context()); - } - else if (embeddedArkcmpSetup == -2) - { - diagsArea << DgSqlCode(-2079); - return ERROR; - } - else - { - context_->setEmbeddedArkcmpIsInitialized(FALSE); - context_->setEmbeddedArkcmpContext(NULL); - } + context_->setEmbeddedArkcmpIsInitialized(TRUE); } - // Set the Global CmpContext from the one saved in the CLI context - // for proper operation - if (context_->isEmbeddedArkcmpInitialized() && - context_->getEmbeddedArkcmpContext()) - { - cmpCurrentContext = context_->getEmbeddedArkcmpContext(); - } - // } -#endif // NA_CMPDLL + else if (embeddedArkcmpSetup == -2) + { + diagsArea << DgSqlCode(-2079); + return ERROR; + } + else + { + context_->setEmbeddedArkcmpIsInitialized(FALSE); + context_->setEmbeddedArkcmpContext(NULL); + } + } + // Set the Global CmpContext from the one saved in the CLI context + // for proper operation + if (context_->isEmbeddedArkcmpInitialized() && + context_->getEmbeddedArkcmpContext()) + { + cmpCurrentContext = context_->getEmbeddedArkcmpContext(); + } if (newOperation) assert ((aqRetry && source) || @@ -1645,7 +1616,6 @@ RETCODE Statement::prepare2(char *source, ComDiagsArea &diagsArea, (reComp ? sourceLenplus1() : octetLenplus1(source, charset)), (Lng32) (reComp ? charset_ : charset), schemaName_, schemaNameLength_+1, - recompControlInfo_, recompControlInfoLen_, getInputArrayMaxsize(), (short)rsa); if (aqRetry) @@ -1657,12 +1627,6 @@ RETCODE Statement::prepare2(char *source, ComDiagsArea &diagsArea, if (standaloneQuery) c.setStandaloneQuery(standaloneQuery); - // set the nametype that was specified when this stmt was - // statically compiled. mxcmp will resolve table names based on - // this nametype. This field is only valid for auto recomp of - // static stmts. It is not looked at for dynamic stmt. - c.setNametypeNsk(nametypeNsk()); - // if this statement was statically compiled with odbc process // on, then set it here. This will be used at auto recomp time. c.setOdbcProcess(odbcProcess()); @@ -1699,7 +1663,7 @@ RETCODE Statement::prepare2(char *source, ComDiagsArea &diagsArea, else { CmpCompileInfo c(source, octetLenplus1(source, charset), (Lng32) charset, - NULL, 0, NULL, 0, + NULL, 0, getInputArrayMaxsize(), (short)rsa); if (aqRetry) @@ -1868,11 +1832,7 @@ Lng32 Statement::unpackAndInit(ComDiagsArea &diagsArea, // CmpDescribePlan will unpack it. ComTdbRoot *thisTdb = root_tdb; - //#if defined (NA_WINNT) - // if (root_tdb) - //#else if (root_tdb && !thisTdb->isFromShowplan()) - //#endif { // Here, we have just freshly (re)prepared the plan using the latest // version of the compiler. Unpacking should be uneventful (i.e. no @@ -2674,8 +2634,7 @@ RETCODE Statement::execute(CliGlobals * cliGlobals, Descriptor * input_desc, // or an embedded static statement), then re-initizalize the stat // area. ExStatisticsArea *statsArea = getStatsArea(); - if (statsArea != NULL && - statsArea->getCollectStatsType() != ComTdb::MEASURE_STATS) + if (statsArea != NULL) { StatsGlobals *statsGlobals = cliGlobals->getStatsGlobals(); if (statsGlobals != NULL) @@ -2832,22 +2791,6 @@ RETCODE Statement::execute(CliGlobals * cliGlobals, Descriptor * input_desc, break; } - // update Measure stmt counters for recompilation. - // stats area is allocated in fixup (ex_root_tdb::build). - - ExStatisticsArea *stats = getStatsArea(); - if ( reCompileTime > 0 && - /*root_tdb->getCollectStats() == ComTdb::MEASURE_STATS &&*/ - stats != NULL ) - { - if (stats->getStmtCntrs() != NULL) - { - stats->getStmtCntrs()->incRecompiles(1); - stats->getStmtCntrs()->incElapsedCompileTime(reCompileTime); - reCompileTime = (Int64) 0; - } - } - if (doSimCheck || partitionUnavailable) { state_ = DO_SIM_CHECK_; @@ -4011,8 +3954,7 @@ RETCODE Statement::doOltExecute(CliGlobals *cliGlobals, } ExStatisticsArea *statsArea = getStatsArea(); - if (statsArea != NULL && - statsArea->getCollectStatsType() != ComTdb::MEASURE_STATS) + if (statsArea != NULL) { StatsGlobals *statsGlobals = cliGlobals->getStatsGlobals(); if (statsGlobals != NULL) @@ -4757,55 +4699,6 @@ void Statement::copyRecompControlInfo(char * basePtr, char * recompControlInfo, Lng32 recompControlInfoLength) { - if (recompControlInfo_) - NADELETEBASIC(recompControlInfo_, (&heap_)); - - // do some basic sanity checking - if ((recompControlInfo == 0) || (recompControlInfoLength <= 0)) - { - recompControlInfo_ = 0; - recompControlInfoLen_ = 0; - return; - } - - RtduRecompControlInfo inRCI; - str_cpy_all((char*)&inRCI, recompControlInfo, sizeof(RtduRecompControlInfo)); - recompControlInfo_ = new (&heap_) char[inRCI.packedLength()]; - RtduRecompControlInfo * stmtRCI = - (RtduRecompControlInfo *)recompControlInfo_; - - inRCI.unpackIt(basePtr); - - char * cqdInfo = (char *)stmtRCI + sizeof(RtduRecompControlInfo); - char * ctoInfo = (char *)cqdInfo + inRCI.cqdInfoLength(); - char * cqsInfo = (char *)ctoInfo + inRCI.ctoInfoLength(); - - stmtRCI->initialize(inRCI.numCqdInfoEntries(), - cqdInfo, inRCI.cqdInfoLength(), - ctoInfo, inRCI.ctoInfoLength(), - cqsInfo, inRCI.cqsInfoLength()); - - if (stmtRCI->cqdInfoLength() > 0) - { - str_cpy_all(stmtRCI->cqdInfo(), inRCI.cqdInfo(), - inRCI.cqdInfoLength()); - } - - if (stmtRCI->ctoInfoLength() > 0) - { - str_cpy_all(stmtRCI->ctoInfo(), inRCI.ctoInfo(), - inRCI.ctoInfoLength()); - } - - if (stmtRCI->cqsInfoLength() > 0) - { - str_cpy_all(stmtRCI->cqsInfo(), inRCI.cqsInfo(), - inRCI.cqsInfoLength()); - } - - stmtRCI->packIt((char*)stmtRCI); - - recompControlInfoLen_ = inRCI.packedLength(); } @@ -5732,11 +5625,7 @@ void Statement::setUniqueStmtId(char * id) char tmpLong[ 20 ]; if (statement_id->name_mode == stmt_handle) -#ifdef NA_64BIT str_ltoa((ULong)getStmtHandle(), tmpLong); -#else - str_itoa((ULong)getStmtHandle(), tmpLong); -#endif ComSqlId::createSqlQueryId(uniqueStmtId_, ComSqlId::MAX_QUERY_ID_LEN+1, uniqueStmtIdLen_, @@ -5794,7 +5683,7 @@ ex_root_tdb * Statement::assignRootTdb(ex_root_tdb *new_root_tdb) root_tdb = new_root_tdb; StmtDebug2(" Stmt %p root TDB is now %p", this, root_tdb); -#ifdef NA_DEBUG_C_RUNTIME +#ifdef _DEBUG Lng32 rs = (Lng32) (root_tdb ? root_tdb->getMaxResultSets() : 0); if (rs > 0) StmtDebug1(" Max result sets: %d", rs); @@ -5879,23 +5768,6 @@ NABoolean Statement::containsUdrInteractions() const return (root_tdb && root_tdb->containsUdrInteractions()); } -//----------------------------------------------------------------------------- -// -// Read the trigger status array for a given table from its resource fork. -// fsRTMD.fetch() is used for the reading. -// - -RETCODE -Statement::rforkReadTriggerStatus(TriggerStatusWA* triggerStatusWA, - char* physFileName, - const char* ansiName, - ComDiagsArea &diagsArea) -{ - return SUCCESS; - -} - - //------------------------------------------------------------------------------ // // For each stoi that is marked as subject table, get trigger status array from @@ -5911,45 +5783,41 @@ RETCODE Statement::getTriggersStatus(SqlTableOpenInfoPtr* stoiList, ComDiagsArea for (Int32 i=0; i< root_tcb->getTableCount(); i++) { - stoi=stoiList[i]; - if (stoi->subjectTable()) - { - - // save the current diags before entering CLI again - ComDiagsArea* copyOfDiagsArea = diagsArea.copy(); - rc = rforkReadTriggerStatus(&triggerStatusWA, - stoi->fileName(), - stoi->ansiName(), - diagsArea); - // remove warning 100 from diags. - diagsArea.removeFinalCondition100(); - - // merge diags - diagsArea.mergeAfter(*copyOfDiagsArea); - copyOfDiagsArea->decrRefCount(); - copyOfDiagsArea = NULL; - - // select the status of the triggers relevant to this statement - // and update them in the root_tcb->triggerStatusVector_ - triggerStatusWA.updateTriggerStatusPerTable(); - triggerStatusWA.deallocateStatusArray(); - } + stoi=stoiList[i]; + if (stoi->subjectTable()) + { + + // save the current diags before entering CLI again + ComDiagsArea* copyOfDiagsArea = diagsArea.copy(); + // remove warning 100 from diags. + diagsArea.removeFinalCondition100(); + + // merge diags + diagsArea.mergeAfter(*copyOfDiagsArea); + copyOfDiagsArea->decrRefCount(); + copyOfDiagsArea = NULL; + + // select the status of the triggers relevant to this statement + // and update them in the root_tcb->triggerStatusVector_ + triggerStatusWA.updateTriggerStatusPerTable(); + triggerStatusWA.deallocateStatusArray(); + } } - + #ifdef _DEBUG if (getenv("SHOW_ENABLE")) - { - char int64Str[128]; - cout << "Trigger Ids in TDB:" << endl; - cout << "-------------------" << endl; - for (Int32 i=0; igetTriggersList()[i], int64Str); - cout << i << " : " << int64Str << endl; - } - cout << endl; - - } + { + char int64Str[128]; + cout << "Trigger Ids in TDB:" << endl; + cout << "-------------------" << endl; + for (Int32 i=0; igetTriggersList()[i], int64Str); + cout << i << " : " << int64Str << endl; + } + cout << endl; + + } #endif //_DEBUG // we cannot check that status was received for all triggers, since @@ -6818,7 +6686,7 @@ RETCODE Statement::getExtractConsumerSyntax(char *proxy, Lng32 maxlength, return getProxySyntax(proxy, maxlength, spaceRequired, prefix, suffix); } -#ifdef NA_DEBUG_C_RUNTIME +#ifdef _DEBUG void Statement::StmtPrintf(const char *formatString, ...) const { if (!stmtDebug_) http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/cli/Statement.h ---------------------------------------------------------------------- diff --git a/core/sql/cli/Statement.h b/core/sql/cli/Statement.h index f0f816b..30b5c3f 100644 --- a/core/sql/cli/Statement.h +++ b/core/sql/cli/Statement.h @@ -179,10 +179,6 @@ public: // execution if this flag is set for that statement. AUTOCOMMIT_XN = 0x0200, - // set, if nametype was specified as NSK at static compilation time. - // Used to send this info to mxcmp at auto recompilation time. - NAMETYPE_NSK = 0x0400, - // set, if odbc_process was on at static compilation time. // Used to send this info to mxcmp at auto recompilation time. ODBC_PROCESS = 0x0800, @@ -438,12 +434,6 @@ private: // and the Xn needs to be aborted. short rollbackSavepoint(ComDiagsArea &diagsArea, NABoolean &rollbackXn); - // a private helper function to get trigger status info from the rfork - RETCODE rforkReadTriggerStatus(TriggerStatusWA* triggerStatusWA, - char* physFileName, - const char* ansiName, - ComDiagsArea &diagsArea); - unsigned short &defineContext() { return defineContext_;}; Int64 &envvarsContext() { return envvarsContext_;}; @@ -582,7 +572,7 @@ public: // reads trigger status from rfork and updates trigger status vector in TCB. RETCODE getTriggersStatus(SqlTableOpenInfoPtr* stoiList, - ComDiagsArea &diagsArea); + ComDiagsArea &diagsArea); inline void * getStmtHandle(); inline Module * getModule() { return module_; } @@ -734,10 +724,6 @@ public: void setAutocommitXn(short v) { (v ? flags_ |= AUTOCOMMIT_XN : flags_ &= ~AUTOCOMMIT_XN); }; - NABoolean nametypeNsk() { return (flags_ & NAMETYPE_NSK) != 0; }; - void setNametypeNsk(short v) - { (v ? flags_ |= NAMETYPE_NSK : flags_ &= ~NAMETYPE_NSK); }; - NABoolean odbcProcess() { return (flags_ & ODBC_PROCESS) != 0; }; void setOdbcProcess(short v) { (v ? flags_ |= ODBC_PROCESS : flags_ &= ~ODBC_PROCESS); }; @@ -908,7 +894,7 @@ public: //return TRUE if query is prefixed by display, // e.g. display select ... NABoolean isDISPLAY(); -#ifdef NA_DEBUG_C_RUNTIME +#ifdef _DEBUG public: void StmtPrintf(const char *formatString, ...) const; NABoolean stmtDebugEnabled() const { return stmtDebug_; } @@ -1060,7 +1046,7 @@ class UdrSecurityInfo : public NABasicObject public: UdrSecurityInfo () : previousSecurityTS_(0), previouslyChecked_(FALSE) - ,previousResult_(ERROR), rforkLastModTS_(0) + ,previousResult_(ERROR) { } @@ -1085,11 +1071,6 @@ public: return previousResult_; } - Int64 getRforkLastModTS() const - { - return rforkLastModTS_; - } - // Mutators void setUdrName(char *udrName) { @@ -1111,16 +1092,10 @@ public: previousResult_ = result; } - void setRforkLastModTS(Int64 modTime) - { - rforkLastModTS_ = modTime; - } - private: char *udrName_; Int64 previousSecurityTS_; - Int64 rforkLastModTS_; NABoolean previouslyChecked_; RETCODE previousResult_; }; http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/cli/StoredProcInterface.cpp ---------------------------------------------------------------------- diff --git a/core/sql/cli/StoredProcInterface.cpp b/core/sql/cli/StoredProcInterface.cpp index 965c6a8..4e9fe14 100644 --- a/core/sql/cli/StoredProcInterface.cpp +++ b/core/sql/cli/StoredProcInterface.cpp @@ -49,7 +49,6 @@ // pointers. To be called after receiving the input buffer // from Executor and before retrieving rows from it. /////////////////////////////////////////////////////////////// -SQLCLI_LIB_FUNC short ExSPPrepareInputBuffer(void * inputBuffer) { SqlBuffer * ib = (SqlBuffer *)inputBuffer; @@ -66,7 +65,6 @@ short ExSPPrepareInputBuffer(void * inputBuffer) // called before retrieving input rows from it. // RETURNS: 0, if all ok. -1, in case of an error. ///////////////////////////////////////////////////////////////// -SQLCLI_LIB_FUNC short ExSPPosition(void * inputBuffer) { SqlBuffer * ib = (SqlBuffer *)inputBuffer; @@ -93,7 +91,6 @@ short ExSPPosition(void * inputBuffer) // RETURNS: 0, if all is Ok. 1, if all rows have been returned. // -1, in case of error. //////////////////////////////////////////////////////////////////////////// -SQLCLI_LIB_FUNC short ExSPGetInputRow(void * inputBuffer, // IN: input sql buffer void* &controlInfo, // OUT: control info char* &rowPtr, // OUT: pointer to the row @@ -131,7 +128,6 @@ short ExSPGetInputRow(void * inputBuffer, // IN: input sql buffer // Once the reply buffer is sent from Arkcmp to Executor, it // must be re-initialized by calling this proc again. ///////////////////////////////////////////////////////////////// -SQLCLI_LIB_FUNC short ExSPInitReplyBuffer(void * replyBuffer, ULng32 replyBufLen) { @@ -162,7 +158,6 @@ short ExSPInitReplyBuffer(void * replyBuffer, // -1, in case of error. // 2 in case of warning. ///////////////////////////////////////////////////////////////// -SQLCLI_LIB_FUNC short ExSPPutReplyRow(void * replyBuffer, // IN: the reply buffer void * controlInfo, // IN: control info char * replyRow, // IN: pointer to reply row @@ -255,7 +250,6 @@ short ExSPPutReplyRow(void * replyBuffer, // IN: the reply buffer // offsets. To be called before sending the reply buffer to // Executor. /////////////////////////////////////////////////////////// -SQLCLI_LIB_FUNC short ExSPPrepareReplyBuffer(void * replyBuffer) { SqlBuffer * rb = (SqlBuffer *)replyBuffer; @@ -271,7 +265,6 @@ short ExSPPrepareReplyBuffer(void * replyBuffer) return 0; } -SQLCLI_LIB_FUNC short ExSPUnpackIOExpr(void * & extractInputExpr, void * & moveOutputExpr, CollHeap * heap) @@ -315,7 +308,6 @@ short ExSPUnpackIOExpr(void * & extractInputExpr, return 0; } -SQLCLI_LIB_FUNC short ExSPExtractInputValue(void * extractInputExpr, ULng32 fieldNum, char * inputRow, char * data, ULng32 datalen, NABoolean casting, @@ -327,7 +319,6 @@ short ExSPExtractInputValue(void * extractInputExpr, ); } -SQLCLI_LIB_FUNC short ExSPMoveOutputValue(void * moveOutputExpr, ULng32 fieldNum, char * outputRow, char * data, ULng32 datalen, NABoolean casting, http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/cli/StoredProcInterface.h ---------------------------------------------------------------------- diff --git a/core/sql/cli/StoredProcInterface.h b/core/sql/cli/StoredProcInterface.h index e712d1c..3824733 100644 --- a/core/sql/cli/StoredProcInterface.h +++ b/core/sql/cli/StoredProcInterface.h @@ -46,45 +46,36 @@ class ComDiagsArea; // See executor/ex_stored_proc.cpp for details about these // procs... //////////////////////////////////////////////////////////// -SQLCLI_LIB_FUNC short ExSPPrepareInputBuffer(void * inputBuffer); -SQLCLI_LIB_FUNC short ExSPPosition(void * inputBuffer); -SQLCLI_LIB_FUNC short ExSPGetInputRow(void * inputBuffer, // IN: input sql buffer void* &controlInfo, // OUT: control info char* &rowPtr, // OUT: pointer to the row ULng32 &rowLen);// OUT: length of returned row -SQLCLI_LIB_FUNC short ExSPInitReplyBuffer(void * replyBuffer, ULng32 replyBufLen); -SQLCLI_LIB_FUNC short ExSPPutReplyRow(void * replyBuffer, // IN: the reply buffer void * controlInfo, // IN: control info char * replyRow, // IN: pointer to reply row ULng32 rowLen, // IN: length of reply row ComDiagsArea* diagsDesc);// IN: pointer to diags -SQLCLI_LIB_FUNC short ExSPPrepareReplyBuffer(void * replyBuffer); -SQLCLI_LIB_FUNC short ExSPUnpackIOExpr(void * & extractInputExpr, void * & moveOutputExpr, CollHeap * heap); -SQLCLI_LIB_FUNC short ExSPExtractInputValue(void * extractInputExpr, ULng32 fieldNum, char * inputRow, char * data, ULng32 datalen, NABoolean casting, // if TRUE,data in varchar, to be casted ComDiagsArea * diagsArea); -SQLCLI_LIB_FUNC short ExSPMoveOutputValue(void * moveOutputExpr, ULng32 fieldNum, char * outputRow, char * data, ULng32 datalen, http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/cli/VicKeyValuePair.h ---------------------------------------------------------------------- diff --git a/core/sql/cli/VicKeyValuePair.h b/core/sql/cli/VicKeyValuePair.h index e97f6fb..ade3632 100644 --- a/core/sql/cli/VicKeyValuePair.h +++ b/core/sql/cli/VicKeyValuePair.h @@ -20,17 +20,3 @@ // // @@@ END COPYRIGHT @@@ **********************************************************************/ -// Vicz: base data structure - -class VicKeyValuePair : public NABasicObject -{ -public: - - void * key_; - - void * value_; - - inline VicKeyValuePair(void *key, void *value) - : key_(key), value_(value){} - -}; http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/cli/cli_stdh.h ---------------------------------------------------------------------- diff --git a/core/sql/cli/cli_stdh.h b/core/sql/cli/cli_stdh.h index 92c364a..db5b670 100644 --- a/core/sql/cli/cli_stdh.h +++ b/core/sql/cli/cli_stdh.h @@ -33,7 +33,6 @@ #include "Module.h" #include "Context.h" #include "Globals.h" -#include "rtdu.h" #include "ex_error.h" http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/cli/globalsrlversion.cpp ---------------------------------------------------------------------- diff --git a/core/sql/cli/globalsrlversion.cpp b/core/sql/cli/globalsrlversion.cpp index 3123f4d..f519696 100644 --- a/core/sql/cli/globalsrlversion.cpp +++ b/core/sql/cli/globalsrlversion.cpp @@ -36,5 +36,5 @@ * **************************************************************************** */ -#include "platform.h" +//#include "platform.h" http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/cli/globalstubs.cpp ---------------------------------------------------------------------- diff --git a/core/sql/cli/globalstubs.cpp b/core/sql/cli/globalstubs.cpp index 90edbdf..e224f47 100644 --- a/core/sql/cli/globalstubs.cpp +++ b/core/sql/cli/globalstubs.cpp @@ -35,20 +35,3 @@ ***************************************************************************** */ -extern "C" -void NAAbort__FPciT1(void){}; - -extern "C" -void NAAssert__FPcT1i(void){}; - -extern "C" -void __ct__13NABasicObjectFv(void){}; - -extern "C" -void __dl__13NABasicObjectSFPv(void){}; - -extern "C" -void __dt__8NAStringFv(void){}; - -extern "C" -void __nw__13NABasicObjectSFUiP8CollHeap(void){}; http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/cli/memorymonitor.cpp ---------------------------------------------------------------------- diff --git a/core/sql/cli/memorymonitor.cpp b/core/sql/cli/memorymonitor.cpp index adb9d3a..d36c2da 100644 --- a/core/sql/cli/memorymonitor.cpp +++ b/core/sql/cli/memorymonitor.cpp @@ -164,8 +164,6 @@ MemoryMonitor::~MemoryMonitor() { // Called by main thread only. Lng32 MemoryMonitor::memoryPressure() { -//SQ_LINUX #ifdef NA_WINNT - return pressure_; }; http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/cli/memorymonitor.h ---------------------------------------------------------------------- diff --git a/core/sql/cli/memorymonitor.h b/core/sql/cli/memorymonitor.h index a688808..36d5973 100644 --- a/core/sql/cli/memorymonitor.h +++ b/core/sql/cli/memorymonitor.h @@ -38,7 +38,6 @@ * ***************************************************************************** */ -//SQ_LINUX #ifdef NA_WINNT #include #include "NAMemory.h" @@ -119,8 +118,6 @@ private: NABoolean loggerEnabled_; -//SQ_LINUX #ifdef NA_WINNT - // SQ_LINUX will use Win32 API for worker thread to update pressure. static NABoolean threadIsCreated_; static HANDLE updateThread_; http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/cli/muse.cpp ---------------------------------------------------------------------- diff --git a/core/sql/cli/muse.cpp b/core/sql/cli/muse.cpp index 3176eac..4eaff53 100644 --- a/core/sql/cli/muse.cpp +++ b/core/sql/cli/muse.cpp @@ -304,9 +304,6 @@ void ExHeapStats::DisplayLongMemStats(ostream &os, char *ind, size_t minSize) case NAMemory::NO_MEMORY_TYPE: os << "NO_MEMORY_TYPE" << endl; break; - case NAMemory::DP2_MEMORY: - os << "DP2_MEMORY" << endl; - break; case NAMemory::EXECUTOR_MEMORY: os << "EXECUTOR_MEMORY" << endl; break; @@ -390,9 +387,6 @@ void ExSpaceStats::DisplayLongMemStats(ostream &os, char *ind, size_t minSize) switch (space->ComSpace::type_) { - case ComSpace::DP2_SPACE: - os << "DP2_SPACE" << endl; - break; case ComSpace::EXECUTOR_SPACE: os << "EXECUTOR_SPACE" << endl; break; http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/cli/privsrlversion.cpp ---------------------------------------------------------------------- diff --git a/core/sql/cli/privsrlversion.cpp b/core/sql/cli/privsrlversion.cpp index 079bd5a..ac1006a 100644 --- a/core/sql/cli/privsrlversion.cpp +++ b/core/sql/cli/privsrlversion.cpp @@ -36,6 +36,6 @@ * **************************************************************************** */ -#include "platform.h" + http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/cli/rtdu.cpp ---------------------------------------------------------------------- diff --git a/core/sql/cli/rtdu.cpp b/core/sql/cli/rtdu.cpp index a432ff7..da1a5fa 100644 --- a/core/sql/cli/rtdu.cpp +++ b/core/sql/cli/rtdu.cpp @@ -35,64 +35,3 @@ * ***************************************************************************** */ -#include "rtdu.h" -#include "ComVersionDefs.h" - -// StaticCompiler.cpp's code to create and initialize a sql module's -// plt_header_struct, plt_entry_struct, -// dlt_header_struct, dlt_entry_struct, -// desc_header_struct, desc_entry_struct -// is constructor-less: it simply allocates space for each struct -// and later computes that struct's contents, field by field. Their -// private members such as flags_, classID_, versionID_, and so on -// remain uninitialized because these struct's constructors are -// never called. So, we use these functions to initialize the -// hidden versioning fields. - - -void module_header_struct::initialize() -{ - prep_timestamp = 0; - compile_timestamp = 0; - - strncpy(eye_catcher, MODULE_EYE_CATCHER, EYE_CATCHER_LEN); - module_length = 0; - flags = 0; - - num_areas = 7; // this is quite true -- see rtdu.h - - plt_area_length = 0; - plt_area_offset = NULL_RTDU_OFFSET; - plt_hdr_length = sizeof(plt_header_struct); - plt_entry_length = sizeof(plt_entry_struct); - - source_area_length = 0; - source_area_offset = NULL_RTDU_OFFSET; - - recomp_control_area_length = 0; - recomp_control_area_offset = NULL_RTDU_OFFSET; - - schema_names_area_length = 0; - schema_names_area_offset = NULL_RTDU_OFFSET; - - dlt_area_length = 0; - dlt_area_offset = NULL_RTDU_OFFSET; - dlt_hdr_length = sizeof(dlt_header_struct); - dlt_entry_length = sizeof(dlt_entry_struct); - - descriptor_area_length = 0; - descriptor_area_offset = NULL_RTDU_OFFSET; - desc_hdr_length = sizeof(desc_header_struct); - desc_entry_length = sizeof(desc_entry_struct); - - object_area_length = 0; - object_area_offset = NULL_RTDU_OFFSET; - - vproc_area_length = 0; - vproc_area_offset = NULL_RTDU_OFFSET; - - memset(module_name, 0, sizeof(module_name)); - version_ = ComVersion_GetCurrentPlanVersion(); - - memset(filler_, 0, sizeof(filler_)); -}