JIRA TRAFODION-2731 CodeCleanup: Phase 6. Cleanup of obsolete/unused cqds.
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/665def4f Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/665def4f Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/665def4f Branch: refs/heads/master Commit: 665def4ff674d5020814f320cb3051f165beae6f Parents: 1e86914 Author: Anoop Sharma <[email protected]> Authored: Thu Nov 30 00:57:44 2017 +0000 Committer: Anoop Sharma <[email protected]> Committed: Thu Nov 30 00:57:44 2017 +0000 ---------------------------------------------------------------------- core/sql/optimizer/Cost.h | 6 - core/sql/optimizer/CostMethod.h | 6 +- core/sql/optimizer/OptPhysRelExpr.cpp | 4 +- core/sql/optimizer/costmethod.cpp | 4 +- core/sql/optimizer/opt.cpp | 2 +- core/sql/porting_layer/PortProcessCalls.cpp | 51 +- core/sql/porting_layer/PortProcessCalls.h | 12 +- core/sql/qmscommon/QRQueries.cpp | 2 +- core/sql/regress/compGeneral/EXPECTED006.SB | 18 - core/sql/regress/compGeneral/TEST006 | 7 - core/sql/regress/core/EXPECTED020.SB | 80 +- core/sql/regress/core/EXPECTEDRTS | 1899 +++++++++++----------- core/sql/regress/core/TEST020 | 6 +- core/sql/regress/core/TESTRTS | 1 + core/sql/regress/fullstack2/EXPECTED062 | 11 - core/sql/regress/fullstack2/TEST062 | 2 - core/sql/regress/hive/EXPECTED002 | 24 +- core/sql/regress/hive/TEST002 | 2 +- core/sql/regress/udr/EXPECTED107.SB | 6 - core/sql/regress/udr/TEST107 | 2 - core/sql/sqlcomp/DefaultConstants.h | 382 +---- core/sql/sqlcomp/nadefaults.cpp | 512 +----- core/sql/sqlcomp/parser.cpp | 29 - core/sql/ustat/hs_cli.cpp | 4 - core/sql/ustat/hs_globals.cpp | 9 - core/sql/ustat/hs_update.cpp | 4 - 26 files changed, 1095 insertions(+), 1990 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/665def4f/core/sql/optimizer/Cost.h ---------------------------------------------------------------------- diff --git a/core/sql/optimizer/Cost.h b/core/sql/optimizer/Cost.h index e5c1cfc..2223e94 100644 --- a/core/sql/optimizer/Cost.h +++ b/core/sql/optimizer/Cost.h @@ -1341,12 +1341,6 @@ private: //#define CPUCOST_COPY_ROW (0.01) // ----------------------------------------------------------------------- -// Assume 100 instructions for reading a row across the DM interface -// (executor does a DM^GET in DP2) -// ----------------------------------------------------------------------- -//#define CPUCOST_DM_GET (0.1) - -// ----------------------------------------------------------------------- // Assume 100 instructions for updating/deleting a row across the DM // interface (executor does a DM^UPDATE in DP2) // ----------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/665def4f/core/sql/optimizer/CostMethod.h ---------------------------------------------------------------------- diff --git a/core/sql/optimizer/CostMethod.h b/core/sql/optimizer/CostMethod.h index 737fee7..cb35d2b 100644 --- a/core/sql/optimizer/CostMethod.h +++ b/core/sql/optimizer/CostMethod.h @@ -999,8 +999,7 @@ public: memoryLimitInDP2_( CostPrimitives::getBasicCostFactor(HGB_DP2_MEMORY_LIMIT)), groupingFactorForSpilledClusters_( - CostPrimitives::getBasicCostFactor( - HGB_GROUPING_FACTOR_FOR_SPILLED_CLUSTERS)) + CostPrimitives::getBasicCostFactor(HGB_GROUPING_FACTOR_FOR_SPILLED_CLUSTERS)) { cpuCostPerProbeInit_ = CostPrimitives::getBasicCostFactor(HGB_CPUCOST_INITIALIZE); @@ -1324,8 +1323,7 @@ public: hashedRowOverhead_( (Lng32)CostPrimitives::getBasicCostFactor(HH_OP_HASHED_ROW_OVERHEAD)), initialBucketCountPerCluster_( - (Lng32)CostPrimitives::getBasicCostFactor( - HJ_INITIAL_BUCKETS_PER_CLUSTER)), + (Lng32)CostPrimitives::getBasicCostFactor(HJ_INITIAL_BUCKETS_PER_CLUSTER)), cpuCostAllocateHashTable_( CostPrimitives::getBasicCostFactor(HH_OP_ALLOCATE_HASH_TABLE)), cpuCostInsertRowToChain_( http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/665def4f/core/sql/optimizer/OptPhysRelExpr.cpp ---------------------------------------------------------------------- diff --git a/core/sql/optimizer/OptPhysRelExpr.cpp b/core/sql/optimizer/OptPhysRelExpr.cpp index 323fd21..838eae4 100644 --- a/core/sql/optimizer/OptPhysRelExpr.cpp +++ b/core/sql/optimizer/OptPhysRelExpr.cpp @@ -14545,8 +14545,8 @@ PhysicalProperty * FileScan::synthHiveScanPhysicalProperty( // Try to make the # of ESPs a factor, the same or a multiple // of the # of SQ nodes to avoid an imbalance. If we use locality, // make the # of ESPs a multiple of the # of nodes for now. - double allowedDev = 1.0 + ActiveSchemaDB()->getDefaults().getAsDouble( - HIVE_NUM_ESPS_ROUND_DEVIATION)/100.0; + double allowedDev = 1.0 + ActiveSchemaDB()-> + getDefaults().getAsDouble(HIVE_NUM_ESPS_ROUND_DEVIATION)/100.0; Lng32 maxRoundedESPs = MINOF((Lng32) (numESPs * allowedDev), maxESPs); Lng32 minRoundedESPs = MAXOF((Lng32) (numESPs / allowedDev), minESPs); Lng32 delta = 0; http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/665def4f/core/sql/optimizer/costmethod.cpp ---------------------------------------------------------------------- diff --git a/core/sql/optimizer/costmethod.cpp b/core/sql/optimizer/costmethod.cpp index ec0fc4f..0ce8fd8 100644 --- a/core/sql/optimizer/costmethod.cpp +++ b/core/sql/optimizer/costmethod.cpp @@ -7018,8 +7018,8 @@ CostMethodHashGroupBy::computePassCost(NABoolean isFirstPass, if ( CmpCommon::getDefault(COMP_BOOL_52) == DF_OFF) { CostScalar averageChainLength = (groupCountPerCluster/ - ActiveSchemaDB()->getDefaults().getAsLong( - MAX_HEADER_ENTREIS_PER_HASH_TABLE)).getFloor(); + ActiveSchemaDB()->getDefaults() + .getAsLong(MAX_HEADER_ENTREIS_PER_HASH_TABLE)).getFloor(); CostScalar costToInsert = calculateCostToInsertIntoChain (averageChainLength); http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/665def4f/core/sql/optimizer/opt.cpp ---------------------------------------------------------------------- diff --git a/core/sql/optimizer/opt.cpp b/core/sql/optimizer/opt.cpp index 26c456a..ffe2359 100644 --- a/core/sql/optimizer/opt.cpp +++ b/core/sql/optimizer/opt.cpp @@ -4975,7 +4975,7 @@ void OptDefaults::initialize(RelExpr* rootExpr) histMissingStatsWarningLevel_ = defs_->getAsLong(HIST_MISSING_STATS_WARNING_LEVEL); histOptimisticCardOpt_ = defs_->getAsLong(HIST_OPTIMISTIC_CARD_OPTIMIZATION); histAssumeIndependentReduction_ = (CmpCommon::getDefault(HIST_ASSUME_INDEPENDENT_REDUCTION) == DF_ON); - histUseSampleForCardEst_ = (CmpCommon::getDefault(HIST_USE_SAMPLE_FOR_CARDINALITY_ESTIMATION ) == DF_ON); + histUseSampleForCardEst_ = (CmpCommon::getDefault(HIST_USE_SAMPLE_FOR_CARDINALITY_ESTIMATION) == DF_ON); maxSkewValuesDetected_ = defs_->getAsULong(MAX_SKEW_VALUES_DETECTED); skewSensitivityThreshold_ = defs_->getAsDouble(SKEW_SENSITIVITY_THRESHOLD); http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/665def4f/core/sql/porting_layer/PortProcessCalls.cpp ---------------------------------------------------------------------- diff --git a/core/sql/porting_layer/PortProcessCalls.cpp b/core/sql/porting_layer/PortProcessCalls.cpp index 43df8a4..aee6eb5 100755 --- a/core/sql/porting_layer/PortProcessCalls.cpp +++ b/core/sql/porting_layer/PortProcessCalls.cpp @@ -41,8 +41,6 @@ #include <string.h> #include "PortProcessCalls.h" - - #include "seabed/fs.h" @@ -94,9 +92,6 @@ NAProcessHandle::NAProcessHandle(const SB_Phandle_Type *phandle) // ------------------------------------------------------------------------------ // DECOMPOSE // ------------------------------------------------------------------------------ -// Encapsulates the PROCESSHANDLE_DECOMPOSE_ request for the different supported -// platforms - NSK, WINNT, and LINUX -// // After decomposing phandle, various phandle components can be extracted // using accessor methods provided. // @@ -122,14 +117,9 @@ short NAProcessHandle::decompose() ,(SB_Int64_Type *)&this->seqNum_ ); processName[processNameLen] = '\0'; -#ifdef SQ_PHANDLE_VERIFIER - this->phandleStringLen_ = sprintf(this->phandleString_, "%s:%ld", - processName, this->seqNum_); -#else this->phandleStringLen_ = strlen(processName); strcpy(this->phandleString_, processName); this->phandleString_[this->phandleStringLen_] = '\0'; -#endif return err; } @@ -138,8 +128,6 @@ short NAProcessHandle::decompose() // --------------------------------------------------------------------------- // GETMINE // --------------------------------------------------------------------------- -// Encapsulates the PROCESSHANDLE_GETMINE_ request for the different supported -// platforms - NSK, WINNT, and LINUX // // Keeps a copy of phandle in the NAProcessHandle instance and copies to // phandle input parameter to be returned to the caller. @@ -148,28 +136,25 @@ short NAProcessHandle::decompose() // --------------------------------------------------------------------------- short NAProcessHandle::getmine(SB_Phandle_Type *phandle) { - -Int32 err=0; - - err = XPROCESSHANDLE_GETMINE_( (SB_Phandle_Type *) &this->phandle_); - - memcpy (phandle, &this->phandle_, PhandleSize); - + Int32 err=0; + + err = XPROCESSHANDLE_GETMINE_( (SB_Phandle_Type *) &this->phandle_); + + memcpy (phandle, &this->phandle_, PhandleSize); + return err; } short NAProcessHandle::getmine() { - - short err=0; - - err = XPROCESSHANDLE_GETMINE_( (SB_Phandle_Type *) &this->phandle_); - return err; + short err=0; + + err = XPROCESSHANDLE_GETMINE_( (SB_Phandle_Type *) &this->phandle_); + return err; } + // --------------------------------------------------------------------------- // --------------------------------------------------------------------------- -// Encapsulates the PROCESSHANDLE_NULLIT_ request for the different supported -// platforms - NSK, WINNT, and LINUX // // Keeps a copy of phandle in the NAProcessHandle instance and copies to // phandle input parameter to be returned to the caller. @@ -179,12 +164,12 @@ short NAProcessHandle::getmine() short NAProcessHandle::nullit(SB_Phandle_Type *phandle) { -Int32 err=0; - - err = XPROCESSHANDLE_NULLIT_( (SB_Phandle_Type *) &this->phandle_); - - memcpy (phandle, &this->phandle_, 20); - + Int32 err=0; + + err = XPROCESSHANDLE_NULLIT_( (SB_Phandle_Type *) &this->phandle_); + + memcpy (phandle, &this->phandle_, 20); + return err; } @@ -198,7 +183,6 @@ void NAProcessHandle::setPhandle(SB_Phandle_Type *phandle) char *NAProcessHandle::getNodeName() { - return nodeName_; } @@ -212,7 +196,6 @@ short NAProcessHandle::getNodeNameLen() char *NAProcessHandle::getPhandleString() { - return phandleString_; } http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/665def4f/core/sql/porting_layer/PortProcessCalls.h ---------------------------------------------------------------------- diff --git a/core/sql/porting_layer/PortProcessCalls.h b/core/sql/porting_layer/PortProcessCalls.h index 18d313e..5c70e33 100755 --- a/core/sql/porting_layer/PortProcessCalls.h +++ b/core/sql/porting_layer/PortProcessCalls.h @@ -41,18 +41,10 @@ #define PORTPROCESSCALLS_H #include "Platform.h" - #include "seabed/fs.h" -//#include "seabed/int/types.h" #define PhandleSize 64 - -#ifdef SQ_PHANDLE_VERIFIER -#define PhandleStringLen (MS_MON_MAX_PROCESS_NAME + 1 + 10 + 1) -#else #define PhandleStringLen (MS_MON_MAX_PROCESS_NAME + 1) -#endif - #define NodeNameLen 9 // @@ -61,9 +53,7 @@ // This class encapsulates the differences between platforms for the // Process Handle. // -// On NSK, the PHANDLE is a 20 bytes // On LINUX, the PHANDLE is 64 bytes -// On Windows, the PHANDLE is 20 bytes ?? // // ------------------------------------------------------------------------ class NAProcessHandle @@ -93,7 +83,7 @@ class NAProcessHandle // Wrapper for PROCESSHANDLE_NULLIT_ short nullit( SB_Phandle_Type * phandle); -// Accessors to access various process handle components + // Accessors to access various process handle components SB_Phandle_Type *getPhandle() { return &phandle_; } Int32 getCpu() {return cpu_;} Int32 getPin() {return pin_;} http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/665def4f/core/sql/qmscommon/QRQueries.cpp ---------------------------------------------------------------------- diff --git a/core/sql/qmscommon/QRQueries.cpp b/core/sql/qmscommon/QRQueries.cpp index acc8f90..84236cb 100644 --- a/core/sql/qmscommon/QRQueries.cpp +++ b/core/sql/qmscommon/QRQueries.cpp @@ -3262,7 +3262,7 @@ SQL_EXEC_ExecFetch(&__SQL_id0,(long)0,0)) != 0);} *********************************************************/ Lng32 QRQueries::reDescribeMV(const NAString& mvName, NABoolean rePublish) { -#ifdef __ignore +#if 0 /* EXEC SQL BEGIN DECLARE SECTION; */ /* char */ char catRequestText[MAX_UTF8_CMD_LEN_IN_BYTES_PLUS_1]; /* EXEC SQL END DECLARE SECTION; */ http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/665def4f/core/sql/regress/compGeneral/EXPECTED006.SB ---------------------------------------------------------------------- diff --git a/core/sql/regress/compGeneral/EXPECTED006.SB b/core/sql/regress/compGeneral/EXPECTED006.SB index 0caed73..bc0a75d 100644 --- a/core/sql/regress/compGeneral/EXPECTED006.SB +++ b/core/sql/regress/compGeneral/EXPECTED006.SB @@ -1138,24 +1138,6 @@ >>--cqd PUBLISHING_ROLES 'a.b'; >>--cqd PUBLISHING_ROLES reset; >> ->> ->>cqd EID_TRACE_STR 'abc'; - ---- SQL operation complete. ->>cqd EID_TRACE_STR reset; - ---- SQL operation complete. ->> ->>cqd POS_ABSOLUTE_MAX_TABLE_SIZE '123,456,789'; - -*** ERROR[2055] The specified value '123,456,789' for DEFAULTS attribute POS_ABSOLUTE_MAX_TABLE_SIZE is not valid. - -*** ERROR[8822] The statement was not prepared. - ->>cqd POS_ABSOLUTE_MAX_TABLE_SIZE reset; - ---- SQL operation complete. ->> >>cqd DEFAULT_SCHEMA_NAMETYPE 'user'; --- SQL operation complete. http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/665def4f/core/sql/regress/compGeneral/TEST006 ---------------------------------------------------------------------- diff --git a/core/sql/regress/compGeneral/TEST006 b/core/sql/regress/compGeneral/TEST006 index e31054f..9fcfd2e 100644 --- a/core/sql/regress/compGeneral/TEST006 +++ b/core/sql/regress/compGeneral/TEST006 @@ -536,13 +536,6 @@ cqd COMP_INT_51 reset; --cqd PUBLISHING_ROLES 'a.b'; --cqd PUBLISHING_ROLES reset; - -cqd EID_TRACE_STR 'abc'; -cqd EID_TRACE_STR reset; - -cqd POS_ABSOLUTE_MAX_TABLE_SIZE '123,456,789'; -cqd POS_ABSOLUTE_MAX_TABLE_SIZE reset; - cqd DEFAULT_SCHEMA_NAMETYPE 'user'; cqd DEFAULT_SCHEMA_NAMETYPE reset; http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/665def4f/core/sql/regress/core/EXPECTED020.SB ---------------------------------------------------------------------- diff --git a/core/sql/regress/core/EXPECTED020.SB b/core/sql/regress/core/EXPECTED020.SB index 11872f7..097a530 100644 --- a/core/sql/regress/core/EXPECTED020.SB +++ b/core/sql/regress/core/EXPECTED020.SB @@ -253,7 +253,7 @@ TNAME OPERATOR ------------------------------------------------------------ ------------------------------ -TAB1 SEABASE_SCAN +TAB1 TRAFODION_SCAN --- 1 row(s) selected. >> @@ -286,8 +286,8 @@ TAB1 SEABASE_SCAN OPERATOR TNAME ------------------------------ ------------------------------------------------------------ -SEABASE_SCAN TAB1 -SEABASE_SCAN TAB2 +TRAFODION_SCAN TAB1 +TRAFODION_SCAN TAB2 --- 2 row(s) selected. >> @@ -306,8 +306,8 @@ OPERATOR SEQ_NUM HYBRID_HASH_JOIN 3 ROOT 4 -SEABASE_SCAN 1 -SEABASE_SCAN 2 +TRAFODION_SCAN 1 +TRAFODION_SCAN 2 --- 4 row(s) selected. >> @@ -419,31 +419,31 @@ TUPLE_FLOW SEQ_NUM LEFT_CHILD_SEQ_NUM OPERATOR RIGHT_CHILD_SEQ_NUM ----------- ------------------ ------------------------------ ------------------- - 1 ? SEABASE_INSERT ? - 1 ? SEABASE_SCAN ? - 1 ? SEABASE_SCAN ? - 1 ? SEABASE_SCAN ? - 1 ? SEABASE_SCAN ? - 1 ? SEABASE_SCAN ? - 1 ? SEABASE_SCAN ? - 1 ? SEABASE_UPDATE ? + 1 ? TRAFODION_INSERT ? + 1 ? TRAFODION_SCAN ? + 1 ? TRAFODION_SCAN ? + 1 ? TRAFODION_SCAN ? + 1 ? TRAFODION_SCAN ? + 1 ? TRAFODION_SCAN ? + 1 ? TRAFODION_SCAN ? + 1 ? TRAFODION_UPDATE ? 1 ? TUPLELIST ? 2 1 ROOT ? 2 1 ROOT ? 2 1 SORT ? - 2 ? SEABASE_INSERT ? - 2 ? SEABASE_SCAN ? - 2 ? SEABASE_SCAN ? - 2 ? SEABASE_SCAN ? - 2 ? SEABASE_SCAN ? - 2 ? SEABASE_SCAN ? + 2 ? TRAFODION_INSERT ? + 2 ? TRAFODION_SCAN ? + 2 ? TRAFODION_SCAN ? + 2 ? TRAFODION_SCAN ? + 2 ? TRAFODION_SCAN ? + 2 ? TRAFODION_SCAN ? 3 1 TUPLE_FLOW 2 3 2 HYBRID_HASH_JOIN 1 3 2 HYBRID_HASH_JOIN 1 3 2 HYBRID_HASH_JOIN 1 3 2 HYBRID_HASH_SEMI_JOIN 1 3 2 HYBRID_HASH_SEMI_JOIN 1 - 3 ? SEABASE_SCAN ? + 3 ? TRAFODION_SCAN ? 4 2 NESTED_JOIN 3 4 3 ROOT ? 4 3 ROOT ? @@ -469,8 +469,8 @@ OPERATOR HYBRID_HASH_JOIN ROOT -SEABASE_SCAN -SEABASE_SCAN +TRAFODION_SCAN +TRAFODION_SCAN --- 4 row(s) selected. >> @@ -487,8 +487,8 @@ OPERATOR HYBRID_HASH_JOIN ROOT -SEABASE_SCAN -SEABASE_SCAN +TRAFODION_SCAN +TRAFODION_SCAN --- 4 row(s) selected. >> @@ -505,8 +505,8 @@ OPERATOR HYBRID_HASH_JOIN ROOT -SEABASE_SCAN -SEABASE_SCAN +TRAFODION_SCAN +TRAFODION_SCAN --- 4 row(s) selected. >> @@ -525,8 +525,8 @@ NESTED_JOIN ROOT SORT SORT_GROUPBY -TRAFODION_SCAN -TRAFODION_SCAN +TRAFODION_SCAN +TRAFODION_SCAN --- 6 row(s) selected. >> @@ -542,7 +542,7 @@ OPERATOR ------------------------------ ROOT -SEABASE_INSERT +TRAFODION_INSERT --- 2 row(s) selected. >> @@ -558,7 +558,7 @@ OPERATOR ------------------------------ ROOT -SEABASE_INSERT +TRAFODION_INSERT TUPLELIST TUPLE_FLOW @@ -576,7 +576,7 @@ OPERATOR ------------------------------ ROOT -SEABASE_UPDATE +TRAFODION_UPDATE --- 2 row(s) selected. >> @@ -593,8 +593,8 @@ OPERATOR HYBRID_HASH_SEMI_JOIN ROOT -SEABASE_SCAN -SEABASE_SCAN +TRAFODION_SCAN +TRAFODION_SCAN --- 4 row(s) selected. >> @@ -611,8 +611,8 @@ OPERATOR HYBRID_HASH_SEMI_JOIN ROOT -SEABASE_SCAN -SEABASE_SCAN +TRAFODION_SCAN +TRAFODION_SCAN --- 4 row(s) selected. >> @@ -630,14 +630,8 @@ SEABASE_SCAN >> >>--QUERY 19 >>-- Solution 10-060524-6738. Make sure "explain" with access options ->>-- work. This also turns off the fast_dp2_subset_opt option so the ->>-- plans are identical under Windows and NSK. This is only tested ->>-- under MX because the output is easier to deal with, and this test ->>-- is mainly to ensure that the parser deals with the syntax correctly. +>>-- work. >>#ifMX ->>control query default fast_dp2_subset_opt 'off'; - ---- SQL operation complete. >>explain options 'f' select * from TAB1 where col1 < 15 +> for serializable access; @@ -645,7 +639,7 @@ LC RC OP OPERATOR OPT DESCRIPTION CARD ---- ---- ---- -------------------- -------- -------------------- --------- 1 . 2 root 3.29E+001 -. . 1 seabase_scan TAB1 3.29E+001 +. . 1 trafodion_scan TAB1 3.29E+001 --- SQL operation complete. >>#ifMX
