http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/optimizer/mdam.cpp ---------------------------------------------------------------------- diff --git a/core/sql/optimizer/mdam.cpp b/core/sql/optimizer/mdam.cpp index 05db172..faa9ffb 100644 --- a/core/sql/optimizer/mdam.cpp +++ b/core/sql/optimizer/mdam.cpp @@ -334,14 +334,11 @@ void DisjunctArray::orDisjunctArray -// LCOV_EXCL_START :dpm void DisjunctArray::display() const { print(); } -// LCOV_EXCL_STOP -// LCOV_EXCL_START :dpm void DisjunctArray::print( FILE* ofd, const char* indent, const char* title) const @@ -364,7 +361,6 @@ void DisjunctArray::print( FILE* ofd, } // for every disjunct } // display() -// LCOV_EXCL_STOP //--------------------------------------------------------- @@ -950,10 +946,8 @@ ScanKey::isAKeyPredicateForColumn( } else { - // LCOV_EXCL_START :rfi DCMPASSERT(FALSE); return FALSE; // internal error case - // LCOV_EXCL_STOP } } @@ -1893,7 +1887,6 @@ MdamKey::isAPartKeyPredicateForMdam(const ValueId& predId, const ValueIdSet& inp -// LCOV_EXCL_START :dpm void MdamKey::print( FILE* ofd, const char* indent, const char* title) const @@ -1956,7 +1949,6 @@ void MdamKey::print( FILE* ofd, } // is printing enabled? } // MdamKey::print() -// LCOV_EXCL_STOP @@ -2052,7 +2044,6 @@ void Disjuncts::computeCommonPredicates() } } // Disjuncts::computeCommonPredicates(..) -// LCOV_EXCL_START :dpm void Disjuncts::print( FILE* ofd, const char* indent, const char* title) const @@ -2085,7 +2076,6 @@ void Disjuncts::print() const { print(stdout); } -// LCOV_EXCL_STOP NABoolean Disjuncts:: get(Disjunct& disjunct, CollIndex i) const @@ -2438,7 +2428,7 @@ void KeyColumns::KeyColumn::insert(const ValueId &predicate) break; default: // The column MUST be EMPTY, EQUAL, INLIST, IS_NULL, RANGE, etc - DCMPASSERT(FALSE); // LCOV_EXCL_LINE :rfi + DCMPASSERT(FALSE); } // switch getType(predicate) // Now insert the new predicate: @@ -2469,13 +2459,12 @@ KeyColumns::KeyColumn::getType(const ValueId& predId) const case ITM_ASSIGN: return ASSIGN; default: - CMPABORT; // LCOV_EXCL_LINE :rfi // unsupported predicate! + CMPABORT; // unsupported predicate break; } return INLIST; // to keep the compiler happy, fix this! } // getType(predId) -// LCOV_EXCL_START :dpm void KeyColumns::KeyColumn::print( FILE* ofd, const char* indent, const char* /*title*/ ) const @@ -2517,7 +2506,6 @@ void KeyColumns::KeyColumn::print( FILE* ofd, getPredicates().print(ofd,indent,""); fprintf(ofd,"\n"); } -// LCOV_EXCL_STOP void KeyColumns::KeyColumn::clearPredicates() @@ -2704,7 +2692,7 @@ KeyColumns::getKeyColumn(const ValueId& column) const } } if (result == NULL) - DCMPASSERT(FALSE); // LCOV_EXCL_LINE :rfi + DCMPASSERT(FALSE); return *result; } @@ -2813,7 +2801,7 @@ void KeyColumns::insertPredicate(const ValueId& predicate, // continue processing break; default: - DCMPASSERT(FALSE); // LCOV_EXCL_LINE :rfi // invalid predicate + DCMPASSERT(FALSE); // invalid predicate } // Some veggies can be rewritted to preds like 2 = 7 @@ -2828,7 +2816,7 @@ void KeyColumns::insertPredicate(const ValueId& predicate, AND (predicate.getItemExpr()->getConstChild(1)-> castToItemExpr()->getOperatorType() == ITM_CONSTANT) ) - DCMPASSERT(FALSE); // LCOV_EXCL_LINE :rfi // $$$ How do we handle CONST OPERATOR CONST??? + DCMPASSERT(FALSE); // $$$ How do we handle CONST OPERATOR CONST??? // Because of VEG rewriting, the predicate may look like: // A=2 AND B=2, parse it if so: @@ -2921,7 +2909,6 @@ void KeyColumns::clearPredicates() } } -// LCOV_EXCL_START :dpm void KeyColumns::print( FILE* ofd, const char* indent, const char* title) const @@ -2953,7 +2940,6 @@ void KeyColumns::print( FILE* ofd, } // for every column } // KeyColumns::print -// LCOV_EXCL_STOP // ----------------------------------------------------------------------- @@ -2990,7 +2976,6 @@ NABoolean ColumnOrderList::containsPredicates() const return containsPreds; } // containsPredicates() -// LCOV_EXCL_START :dpm void ColumnOrderList::print( FILE* ofd, const char* indent, const char* /*title*/) const @@ -3021,7 +3006,6 @@ void ColumnOrderList::print( FILE* ofd, } } } // ColumnOrderList::print(...) -// LCOV_EXCL_STOP @@ -3325,7 +3309,6 @@ computeCommonKeyPredicates(ValueIdSet& commonKeyPredicates) const -// LCOV_EXCL_START :dpm void ColumnOrderListPtrArray::print( FILE* ofd, const char* indent, const char* /*title*/) const @@ -3339,7 +3322,6 @@ void ColumnOrderListPtrArray::print( FILE* ofd, } } -// LCOV_EXCL_STOP const ValueIdSet ScanKey::getAllColumnsReferenced() const {
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/optimizer/memo.cpp ---------------------------------------------------------------------- diff --git a/core/sql/optimizer/memo.cpp b/core/sql/optimizer/memo.cpp index 181c805..0298e1b 100644 --- a/core/sql/optimizer/memo.cpp +++ b/core/sql/optimizer/memo.cpp @@ -116,12 +116,10 @@ CascadesGroup::~CascadesGroup() //<pb> -// LCOV_EXCL_START void CascadesGroup::print(FILE * f, const char * prefix, const char *) const { } // CascadesGroup::print -// LCOV_EXCL_STOP //<pb> void CascadesGroup::addLogExpr(RelExpr * expr, RelExpr *src) { @@ -158,7 +156,7 @@ void CascadesGroup::addLogExpr(RelExpr * expr, RelExpr *src) // improve log prop's/group attributes; recost all plans if required if (expr->reconcileGroupAttr(getGroupAttr())) // XXX recost all plans in this group - ABORT("reoptimizing after improveLogProp() not implemented"); // LCOV_EXCL_LINE + ABORT("reoptimizing after improveLogProp() not implemented"); } // remember that expr came from src @@ -290,7 +288,6 @@ RelExpr * CascadesGroup::unlinkLogExpr(RelExpr *expr) } //<pb> // A dangling method -// LCOV_EXCL_START RelExpr * CascadesGroup::unlinkPhysExpr(RelExpr *expr) { // ------------------------------------------------------------- @@ -326,7 +323,6 @@ RelExpr * CascadesGroup::unlinkPhysExpr(RelExpr *expr) // to remind the calling procedure that it owns that expression now) return expr; } -// LCOV_EXCL_STOP //<pb> CascadesPlan * CascadesGroup::getFirstPlan() const @@ -351,7 +347,6 @@ RelExpr * CascadesGroup::getLastLogExpr() const } // use by OptDebug::showMemoStats(). Mask it out from code coverage -// // LCOV_EXCL_START Lng32 CascadesGroup::getCountOfLogicalExpr() const { RelExpr * expr = logExprs_; @@ -392,7 +387,6 @@ double CascadesGroup::calculateNoOfLogPlans() const result = result + (result*numOfMergedExprs); return result; } -// LCOV_EXCL_STOP HashValue CascadesGroup::hash() { @@ -767,7 +761,6 @@ CascadesMemo::CascadesMemo(CascadesGroupId groups, Lng32 buckets) // RelExpr::optimizeNode() by setting memo = NULL. This is a speeding // deletion. -// LCOV_EXCL_START CascadesMemo::~CascadesMemo() { if (NOT (CURRSTMT_OPTGLOBALS->BeSilent)) @@ -820,10 +813,8 @@ CascadesMemo::~CascadesMemo() delete group_[groupId]; } // CascadesMemo::~CascadesMemo -// LCOV_EXCL_STOP //<pb> -// LCOV_EXCL_START void CascadesMemo::print(FILE * f, const char *, const char *) const { } // CascadesMemo::print @@ -841,7 +832,6 @@ void CascadesMemo::print_all_trees(CascadesGroupId root, // entire body of this method is essentially dead code until someone // resurrects the MOTIF/X11 based mxcmp "display" GUI too. } // CascadesMemo::print_all_trees -// LCOV_EXCL_STOP //<pb> RelExpr * CascadesMemo::include(RelExpr * expr, http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/optimizer/opt.cpp ---------------------------------------------------------------------- diff --git a/core/sql/optimizer/opt.cpp b/core/sql/optimizer/opt.cpp index 2ab3de9..4fe847f 100644 --- a/core/sql/optimizer/opt.cpp +++ b/core/sql/optimizer/opt.cpp @@ -88,26 +88,22 @@ extern const WordAsBits SingleBitArray[]; // global display methods for purposes of debugging // ----------------------------------------------------------------------- -// LCOV_EXCL_START void displayContext (const Context & context) { context.print(); } -// LCOV_EXCL_STOP // ----------------------------------------------------------------------- // local helper functions // ----------------------------------------------------------------------- #ifdef _DEBUG -// LCOV_EXCL_START static const char *getCOMPILE_TIME_MONITOR_OUTPUT_FILEname() { const char * fname = ActiveSchemaDB()->getDefaults(). getValue(COMPILE_TIME_MONITOR_OUTPUT_FILE); return (*fname && stricmp(fname,"NONE") != 0) ? fname : NULL; } -// LCOV_EXCL_STOP #endif //_DEBUG @@ -221,7 +217,6 @@ void clearFailedPlanWarningsForStream() // This method is for the old driver and not used unless CQD NEW_OPT_DRIVER // is OFF. We use the new driver by default. -// LCOV_EXCL_START RelExpr * RelExpr::optimize(NABoolean exceptionMode, Guidance * guidance, ReqdPhysicalProperty * rpp, @@ -931,7 +926,6 @@ if (plan && context->getGroupAttr()->isStream()) return ( plan ); } // optimize -// LCOV_EXCL_STOP #pragma warn(262) // warning elimination #pragma warning (default : 4101) //warning elimination @@ -976,7 +970,6 @@ Context::~Context() } // Context::~Context //<pb> -// LCOV_EXCL_START void Context::print(FILE * f, const char * prefix, const char * suffix) const { #ifdef _DEBUG @@ -1342,7 +1335,6 @@ NAString Context::getStatusString() const return result; } -// LCOV_EXCL_STOP //<pb> // ---------------------------------------------------------------------- @@ -4233,7 +4225,6 @@ void OptDefaults::initializeCostInfo() // Ideally this values shl'd be placed in nadefaults.cpp once regressions are resolved. // on SQ, CB_155 is off and we mask the following code from code coverage. - // LCOV_EXCL_START if(CmpCommon::getDefault(COMP_BOOL_155) == DF_ON ) { NAString v="1600.0"; @@ -4328,7 +4319,6 @@ void OptDefaults::initializeCostInfo() defs_->validateAndInsert("CPUCOST_SCAN_OVH_PER_KB", v, FALSE); defs_->validateAndInsert("CPUCOST_SCAN_OVH_PER_ROW", v, FALSE); } - // LCOV_EXCL_STOP // ----------------------------------------------------------------------- // All resource-to-time multipliers need to be re-calibrated in // a per statement basis since they may have been changed by the @@ -5098,7 +5088,6 @@ NABoolean OptDefaults::InitCostVariables() { defaultPerformanceGoal_ = new (heap_) OptimizeForLastRow(); } -// LCOV_EXCL_START else if (goalTok == DF_FIRSTROW) { defaultPerformanceGoal_ = new (heap_) OptimizeForFirstRow(); @@ -5117,7 +5106,6 @@ NABoolean OptDefaults::InitCostVariables() << DgString0(goalText) << DgString1("OPTIMIZATION_GOAL"); } -// LCOV_EXCL_STOP if (resourcePerformanceGoal_ == NULL) { @@ -5453,7 +5441,6 @@ OptDebug::~OptDebug() // OptDebug::openLog() is called only when CQD NSK_DBG_LOG_FILE is ON // in ControlDB.cpp. -// LCOV_EXCL_START NABoolean OptDebug::openLog( const char* filename ) { if (fileIsGood_) @@ -5498,7 +5485,6 @@ void OptDebug::closeLog() logFileName_[0] = '\0'; fileIsGood_ = FALSE; } -// LCOV_EXCL_STOP // --------------------------------------------------------------------- // Accessor functions @@ -5554,7 +5540,6 @@ void OptDebug::setCompileInstanceClass(const char* str) // For a SQL query, either show the query tree or query execution plan tree. // Equivalent to the main window in GUI display. // --------------------------------------------------------------------- -// LCOV_EXCL_START void OptDebug::showTree( const ExprNode *tree, const CascadesPlan *plan, const char *prefix, @@ -6610,7 +6595,6 @@ void OptDebug::showMemoStats(CascadesMemo *memo, out << "\n\tMemo Contexts: \t" << contextCnt << endl; } -// LCOV_EXCL_STOP // New optimization driver RelExpr *RelExpr::optimize2() http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/optimizer/tasks.cpp ---------------------------------------------------------------------- diff --git a/core/sql/optimizer/tasks.cpp b/core/sql/optimizer/tasks.cpp index 065a370..1fa57eb 100644 --- a/core/sql/optimizer/tasks.cpp +++ b/core/sql/optimizer/tasks.cpp @@ -79,7 +79,6 @@ CascadesTask::~CascadesTask() } // CascadesTask::~CascadesTask -// LCOV_EXCL_START void CascadesTask::print(FILE *, const char *, const char *) const { ABORT("CascadesTask::print() needs to be redefined"); @@ -89,7 +88,6 @@ NAString CascadesTask::taskText() const { return "Shouldn't ever see a generic task"; } -// LCOV_EXCL_STOP CascadesGroupId CascadesTask::getGroupId() const { @@ -173,7 +171,6 @@ OptimizeGroupTask::OptimizeGroupTask(Context * context, { } // OptimizeGroupTask::OptimizeGroupTask -// LCOV_EXCL_START void OptimizeGroupTask::print(FILE * f, const char * prefix, const char * suffix) const { @@ -192,7 +189,6 @@ NAString OptimizeGroupTask::taskText() const getParentTaskId(), getSubTaskId(), groupId_); return NAString(returnText) + context_->getRequirementsString(); } -// LCOV_EXCL_STOP CascadesGroupId OptimizeGroupTask::getGroupId() const { @@ -475,7 +471,6 @@ OptimizeExprTask::OptimizeExprTask(RelExpr * expr, context_->incrOutstanding(); } // OptimizeExprTask::OptimizeExprTask -// LCOV_EXCL_START void OptimizeExprTask::print(FILE * f, const char *, const char * suffix) const { #ifndef NDEBUG @@ -511,7 +506,6 @@ NAString OptimizeExprTask::taskText() const #endif returnText + context_->getRequirementsString(); } -// LCOV_EXCL_STOP CascadesGroupId OptimizeExprTask::getGroupId() const { @@ -776,7 +770,6 @@ ExploreGroupTask::ExploreGroupTask(CascadesGroupId group_no, { } // ExploreGroupTask::ExploreGroupTask -// LCOV_EXCL_START void ExploreGroupTask::print(FILE * f, const char * prefix, const char * suffix) const { #ifndef NDEBUG @@ -794,7 +787,6 @@ NAString ExploreGroupTask::taskText() const getParentTaskId(), getSubTaskId(), groupId_); return returnText; } -// LCOV_EXCL_STOP CascadesGroupId ExploreGroupTask::getGroupId() const { @@ -860,7 +852,6 @@ ExploreExprTask::ExploreExprTask(RelExpr * expr, { } // ExploreExprTask::ExploreExprTask -// LCOV_EXCL_START void ExploreExprTask::print(FILE * f, const char *, const char * suffix) const { #ifndef NDEBUG @@ -885,7 +876,6 @@ NAString ExploreExprTask::taskText() const else return NAString(prefix) + expr_->getText() + returnText; } -// LCOV_EXCL_STOP //<pb> CascadesGroupId ExploreExprTask::getGroupId() const @@ -1055,7 +1045,6 @@ ApplyRuleTask::ApplyRuleTask(Rule * rule, context_->incrOutstanding(); } // ApplyRuleTask::ApplyRuleTask -// LCOV_EXCL_START void ApplyRuleTask::print(FILE * f, const char * prefix, const char *) const { #ifndef NDEBUG @@ -1083,7 +1072,6 @@ NAString ApplyRuleTask::taskText() const return NAString(prefix) + "Enforcer Rule \"" + rule_->getName() + returnText; } -// LCOV_EXCL_STOP CascadesGroupId ApplyRuleTask::getGroupId() const { @@ -1519,14 +1507,12 @@ void CreatePlanTask::perform(Lng32 taskId) FALSE, taskId, ++stride)); -// LCOV_EXCL_START if ( showThisPlan ) { out << endl << prefix << "*** Incomplete plan ***" << endl; CURRCONTEXT_OPTDEBUG->showTree( getExpr(), getPlan(), prefix, showPlanCost ); out << endl; } -// LCOV_EXCL_STOP } else { @@ -1564,13 +1550,11 @@ void CreatePlanTask::perform(Lng32 taskId) // that is never re-optimized in this pass: plan_->setSuccessInCurrentPass(); -// LCOV_EXCL_START if ( showThisPlan ) { out << endl << prefix << "*** Qualified plan ***" << endl; CURRCONTEXT_OPTDEBUG->showTree( getExpr(), getPlan(), prefix, showPlanCost ); } -// LCOV_EXCL_STOP // This is a solution for the optimization goal represented // by the context; now check whether it's the optimal one so far @@ -1641,11 +1625,9 @@ void CreatePlanTask::perform(Lng32 taskId) // This is the first solution for this pass and therefore // it is the optimal one so far. context_->setSolution(plan_); -// LCOV_EXCL_START if ( showThisPlan ) out << prefix << "*** Chosen plan ***" << endl << endl; -// LCOV_EXCL_STOP // if because of nice context we have an enforcer above // partial plan that already satisfies requirement - // replace solution with that partial plan because @@ -1758,7 +1740,6 @@ void CreatePlanTask::garbageCollection(RelExpr * /* oldx */, } // CreatePlanTask::garbageCollection -// LCOV_EXCL_START void CreatePlanTask::print(FILE * f, const char * prefix, const char * suffix) const { fprintf(f, "%screate plan -- incarnation %d (%d) of %d\n", @@ -1796,7 +1777,6 @@ NAString CreatePlanTask::taskText() const return returnString + context_->getRequirementsString(); } -// LCOV_EXCL_STOP //<pb> @@ -1810,7 +1790,6 @@ GarbageCollectionTask::~GarbageCollectionTask () {} -// LCOV_EXCL_START void GarbageCollectionTask::print (FILE * f, const char * prefix, const char * /*suffix*/) const @@ -1823,7 +1802,6 @@ NAString GarbageCollectionTask::taskText() const return "Garbage Collection"; } -// LCOV_EXCL_STOP void GarbageCollectionTask::perform (Lng32 /*taskId*/) { http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/optimizer/vers_liboptimizer.cpp ---------------------------------------------------------------------- diff --git a/core/sql/optimizer/vers_liboptimizer.cpp b/core/sql/optimizer/vers_liboptimizer.cpp index 3ea35ed..1c8e3cc 100644 --- a/core/sql/optimizer/vers_liboptimizer.cpp +++ b/core/sql/optimizer/vers_liboptimizer.cpp @@ -26,6 +26,4 @@ #define VERS_CV_MIN 0 #define VERS_CV_UPD 1 -// LCOV_EXCL_START VERS_LIB(liboptimizer) -// LCOV_EXCL_STOP http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/parser/BindStmtDDL.cpp ---------------------------------------------------------------------- diff --git a/core/sql/parser/BindStmtDDL.cpp b/core/sql/parser/BindStmtDDL.cpp index 10003a8..d564d41 100644 --- a/core/sql/parser/BindStmtDDL.cpp +++ b/core/sql/parser/BindStmtDDL.cpp @@ -868,7 +868,6 @@ NABoolean StmtDDLCreateTrigger::isTransitionName(const NAString& tableName) // to the select list of the root. This will make sure the system added // columns are analyzed correctly. // ----------------------------------------------------------------------- -// LCOV_EXCL_START :cnu Expanded pass not used anymore. void addSystemColumnsToRootSelectList(RelRoot *queryRoot, MVInfoForDDL *mvInfo, BindWA *bindWA) @@ -894,7 +893,6 @@ void addSystemColumnsToRootSelectList(RelRoot *queryRoot, // Add the system added column expressions to the root select list. queryRoot->addCompExprTree(systemAddedColsExpr); } -// LCOV_EXCL_STOP // ----------------------------------------------------------------------- // definition of method bindNode() for class StmtDDLCreateMV @@ -956,12 +954,10 @@ StmtDDLCreateMV::bindNode(BindWA * pBindWA ) ((COM_RECOMPUTE != mvInfo->getRefreshType()) && (COM_BY_USER !=mvInfo->getRefreshType())) ) { - // LCOV_EXCL_START :cnu (MV on View not supported) *CmpCommon::diags() << DgSqlCode(-4222) << DgString0("Non-recompute MVs on views"); pBindWA->setErrStatus(); return this; - // LCOV_EXCL_STOP } // Transform the direct tree. http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/parser/ElemDDLCreateMVOneAttributeTableList.cpp ---------------------------------------------------------------------- diff --git a/core/sql/parser/ElemDDLCreateMVOneAttributeTableList.cpp b/core/sql/parser/ElemDDLCreateMVOneAttributeTableList.cpp index 32b6348..7600531 100644 --- a/core/sql/parser/ElemDDLCreateMVOneAttributeTableList.cpp +++ b/core/sql/parser/ElemDDLCreateMVOneAttributeTableList.cpp @@ -76,7 +76,6 @@ ElemDDLCreateMVOneAttributeTableList::getType() const // methods for tracing -// LCOV_EXCL_START :dpm const NAString ElemDDLCreateMVOneAttributeTableList::displayLabel1() const { @@ -96,7 +95,6 @@ ElemDDLCreateMVOneAttributeTableList::getText() const { return "ElemDDLCreateMVOneAttributeTableList"; } -// LCOV_EXCL_STOP http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/parser/ElemDDLCreateMVOneAttributeTableList.h ---------------------------------------------------------------------- diff --git a/core/sql/parser/ElemDDLCreateMVOneAttributeTableList.h b/core/sql/parser/ElemDDLCreateMVOneAttributeTableList.h index dd8172a..cff1255 100644 --- a/core/sql/parser/ElemDDLCreateMVOneAttributeTableList.h +++ b/core/sql/parser/ElemDDLCreateMVOneAttributeTableList.h @@ -63,9 +63,7 @@ public: ElemDDLCreateMVOneAttributeTableList( ComMVSUsedTableAttribute type, ElemDDLNode *pTableList); -// LCOV_EXCL_START :dd virtual ~ElemDDLCreateMVOneAttributeTableList(){} -// LCOV_EXCL_STOP virtual ElemDDLCreateMVOneAttributeTableList* castToElemDDLCreateMVOneAttributeTableList() http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/parser/ElemDDLLobAttrs.h ---------------------------------------------------------------------- diff --git a/core/sql/parser/ElemDDLLobAttrs.h b/core/sql/parser/ElemDDLLobAttrs.h index b11e73b..cc999bd 100644 --- a/core/sql/parser/ElemDDLLobAttrs.h +++ b/core/sql/parser/ElemDDLLobAttrs.h @@ -54,7 +54,6 @@ public: // virtual destructor - // LCOV_EXCL_LINE virtual ~ElemDDLLobAttrs(){} // cast @@ -88,7 +87,6 @@ public: } // virtual destructor - // LCOV_EXCL_LINE virtual ~ElemDDLSeabaseSerialized(){} // cast http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/parser/ElemDDLLoggable.h ---------------------------------------------------------------------- diff --git a/core/sql/parser/ElemDDLLoggable.h b/core/sql/parser/ElemDDLLoggable.h index 1a69e3a..9d57239 100644 --- a/core/sql/parser/ElemDDLLoggable.h +++ b/core/sql/parser/ElemDDLLoggable.h @@ -56,7 +56,6 @@ public: // virtual destructor - // LCOV_EXCL_LINE virtual ~ElemDDLLoggable(){} // cast http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/parser/ElemDDLTableFeature.h ---------------------------------------------------------------------- diff --git a/core/sql/parser/ElemDDLTableFeature.h b/core/sql/parser/ElemDDLTableFeature.h index 886f754..d3abc85 100644 --- a/core/sql/parser/ElemDDLTableFeature.h +++ b/core/sql/parser/ElemDDLTableFeature.h @@ -56,7 +56,6 @@ public: // virtual destructor - // LCOV_EXCL_LINE virtual ~ElemDDLTableFeature(){} // cast http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/parser/StmtDDLAlterMV.h ---------------------------------------------------------------------- diff --git a/core/sql/parser/StmtDDLAlterMV.h b/core/sql/parser/StmtDDLAlterMV.h index 400d681..06d413b 100644 --- a/core/sql/parser/StmtDDLAlterMV.h +++ b/core/sql/parser/StmtDDLAlterMV.h @@ -76,9 +76,7 @@ public: AlterType alterType); -// LCOV_EXCL_START :dd virtual ~StmtDDLAlterMV() {} -// LCOV_EXCL_STOP void synthesize(); @@ -179,7 +177,6 @@ private: // definitions of inline methods for class StmtDDLAlterMV // ----------------------------------------------------------------------- -// LCOV_EXCL_START :cnu inline const NAString StmtDDLAlterMV::displayLabel1() const { return NAString("Materialized View name: ") + getMVName(); @@ -189,7 +186,6 @@ inline const NAString StmtDDLAlterMV::getText() const { return "StmtDDLAlterMV"; } -// LCOV_EXCL_STOP inline const NAString StmtDDLAlterMV::getMVName() const { http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/parser/StmtDDLCreate.cpp ---------------------------------------------------------------------- diff --git a/core/sql/parser/StmtDDLCreate.cpp b/core/sql/parser/StmtDDLCreate.cpp index 56cf307..8aae850 100644 --- a/core/sql/parser/StmtDDLCreate.cpp +++ b/core/sql/parser/StmtDDLCreate.cpp @@ -1027,7 +1027,6 @@ StmtDDLCreateComponentPrivilege::castToStmtDDLCreateComponentPrivilege() // methods for tracing // -// LCOV_EXCL_START const NAString StmtDDLCreateComponentPrivilege::displayLabel1() const @@ -1059,7 +1058,6 @@ StmtDDLCreateComponentPrivilege::getText() const return "StmtDDLCreateComponentPrivilege"; } -// LCOV_EXCL_STOP //---------------------------------------------------------------------------- // MV - RG (refresh groups) http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/parser/StmtDDLCreateComponentPrivilege.h ---------------------------------------------------------------------- diff --git a/core/sql/parser/StmtDDLCreateComponentPrivilege.h b/core/sql/parser/StmtDDLCreateComponentPrivilege.h index 2bf7a9d..3283068 100644 --- a/core/sql/parser/StmtDDLCreateComponentPrivilege.h +++ b/core/sql/parser/StmtDDLCreateComponentPrivilege.h @@ -71,11 +71,9 @@ public: inline NABoolean isSystem() const { return isSystem_; } // for tracing - // LCOV_EXCL_START virtual const NAString displayLabel1() const; virtual const NAString displayLabel2() const; virtual const NAString getText() const; - // LCOV_EXCL_STOP private: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/parser/StmtDDLCreateMV.h ---------------------------------------------------------------------- diff --git a/core/sql/parser/StmtDDLCreateMV.h b/core/sql/parser/StmtDDLCreateMV.h index 9e3f8ae..a6442c1 100644 --- a/core/sql/parser/StmtDDLCreateMV.h +++ b/core/sql/parser/StmtDDLCreateMV.h @@ -460,13 +460,11 @@ StmtDDLCreateMV::getMVNameAsQualifiedName() const return MVQualName_; } -// LCOV_EXCL_START :cnu (MV on View not supported) inline CollIndex StmtDDLCreateMV::getCurViewColNum() const { return getViewUsages().getCurViewColNum(); } -// LCOV_EXCL_STOP inline const StringPos StmtDDLCreateMV::getEndPosition() const @@ -542,7 +540,6 @@ StmtDDLCreateMV::getMVName() const return MVQualName_.getQualifiedNameAsAnsiString(); } -// LCOV_EXCL_START :cnu (MV on View not supported) inline const ParViewUsages & StmtDDLCreateMV::getViewUsages() const { @@ -554,7 +551,6 @@ StmtDDLCreateMV::getViewUsages() { return viewUsages_; } -// LCOV_EXCL_STOP inline const LIST(OptUDFInfo *) & StmtDDLCreateMV::getUDFList() const @@ -574,13 +570,11 @@ StmtDDLCreateMV::isItmColRefInColInRowVals() const return getViewUsages().isItmColRefInColInRowVals(); } -// LCOV_EXCL_START :cnu (MV on View not supported) inline NABoolean StmtDDLCreateMV::isProcessingViewColList() const { return getCurViewColNum() NEQ NULL_COLL_INDEX; } -// LCOV_EXCL_STOP // // mutators @@ -592,13 +586,11 @@ StmtDDLCreateMV::resetCurViewColNum() getViewUsages().setCurViewColNum(NULL_COLL_INDEX); } -// LCOV_EXCL_START :cnu (MV on View not supported) inline void StmtDDLCreateMV::setCurViewColNum(const CollIndex curVwCol) { getViewUsages().setCurViewColNum(curVwCol); } -// LCOV_EXCL_STOP inline void StmtDDLCreateMV::setEndPosition(const StringPos endPos) http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/parser/StmtDDLCreateTrigger.h ---------------------------------------------------------------------- diff --git a/core/sql/parser/StmtDDLCreateTrigger.h b/core/sql/parser/StmtDDLCreateTrigger.h index 446b7a9..b7b66c1 100644 --- a/core/sql/parser/StmtDDLCreateTrigger.h +++ b/core/sql/parser/StmtDDLCreateTrigger.h @@ -475,14 +475,12 @@ StmtDDLCreateTrigger::isOwnerSpecified() const return pOwner_ ? TRUE : FALSE; } -// LCOV_EXCL_START // Not used by Triggers inline const ElemDDLGrantee * StmtDDLCreateTrigger::getOwner() const { return pOwner_; } -// LCOV_EXCL_STOP #endif // STMTDDLCREATETRIGGER_H http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/parser/StmtDDLDrop.cpp ---------------------------------------------------------------------- diff --git a/core/sql/parser/StmtDDLDrop.cpp b/core/sql/parser/StmtDDLDrop.cpp index 938831b..02e564e 100644 --- a/core/sql/parser/StmtDDLDrop.cpp +++ b/core/sql/parser/StmtDDLDrop.cpp @@ -132,7 +132,6 @@ StmtDDLDropComponentPrivilege::castToStmtDDLDropComponentPrivilege() // methods for tracing // -// LCOV_EXCL_START const NAString StmtDDLDropComponentPrivilege::displayLabel1() const @@ -162,7 +161,6 @@ StmtDDLDropComponentPrivilege::getText() const return "StmtDDLDropComponentPrivilege"; } -// LCOV_EXCL_STOP //---------------------------------------------------------------------------- // MV - RG http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/parser/StmtDDLDropComponentPrivilege.h ---------------------------------------------------------------------- diff --git a/core/sql/parser/StmtDDLDropComponentPrivilege.h b/core/sql/parser/StmtDDLDropComponentPrivilege.h index 0e9ac3f..9616b97 100644 --- a/core/sql/parser/StmtDDLDropComponentPrivilege.h +++ b/core/sql/parser/StmtDDLDropComponentPrivilege.h @@ -67,11 +67,9 @@ public: inline const ComDropBehavior getDropBehavior() const { return dropBehavior_; } // for tracing - // LCOV_EXCL_START virtual const NAString displayLabel1() const; virtual const NAString displayLabel2() const; virtual const NAString getText() const; - // LCOV_EXCL_STOP private: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/parser/StmtDDLDropMV.h ---------------------------------------------------------------------- diff --git a/core/sql/parser/StmtDDLDropMV.h b/core/sql/parser/StmtDDLDropMV.h index 5dc957a..6aa90c5 100644 --- a/core/sql/parser/StmtDDLDropMV.h +++ b/core/sql/parser/StmtDDLDropMV.h @@ -146,7 +146,6 @@ StmtDDLDropMV::isValidateSpecified()const return isValidateSpec_; } -// LCOV_EXCL_START :dpm inline const NABoolean StmtDDLDropMV::isLogFileSpecified() const { @@ -161,6 +160,5 @@ StmtDDLDropMV::getLogFile() const ComASSERT(pLogFile_ NEQ NULL); return *pLogFile_; } -// LCOV_EXCL_STOP #endif // STMTDDLDROPMV_H http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/parser/StmtDDLGrantComponentPrivilege.h ---------------------------------------------------------------------- diff --git a/core/sql/parser/StmtDDLGrantComponentPrivilege.h b/core/sql/parser/StmtDDLGrantComponentPrivilege.h index 300f513..c46a158 100644 --- a/core/sql/parser/StmtDDLGrantComponentPrivilege.h +++ b/core/sql/parser/StmtDDLGrantComponentPrivilege.h @@ -70,12 +70,10 @@ public: inline ElemDDLGrantee * getGrantedBy() const { return grantedBy_; }; // for tracing - // LCOV_EXCL_START virtual const NAString displayLabel1() const; virtual const NAString displayLabel2() const; virtual NATraceList getDetailInfo() const; virtual const NAString getText(); - // LCOV_EXCL_STOP private: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/parser/StmtDDLNode.cpp ---------------------------------------------------------------------- diff --git a/core/sql/parser/StmtDDLNode.cpp b/core/sql/parser/StmtDDLNode.cpp index 1946735..ea3fd15 100644 --- a/core/sql/parser/StmtDDLNode.cpp +++ b/core/sql/parser/StmtDDLNode.cpp @@ -660,7 +660,6 @@ StmtDDLGrantComponentPrivilege::castToStmtDDLGrantComponentPrivilege() // methods for tracing // -// LCOV_EXCL_START const NAString StmtDDLGrantComponentPrivilege::displayLabel1() const { @@ -730,7 +729,6 @@ const NAString StmtDDLGrantComponentPrivilege::getText() return "StmtDDLGrantComponentPrivilege"; } -// LCOV_EXCL_STOP // ----------------------------------------------------------------------- // methods for class StmtDDLRevokeComponentPrivilege @@ -780,7 +778,6 @@ StmtDDLRevokeComponentPrivilege::castToStmtDDLRevokeComponentPrivilege() // methods for tracing // -// LCOV_EXCL_START const NAString StmtDDLRevokeComponentPrivilege::displayLabel1() const { @@ -850,7 +847,6 @@ const NAString StmtDDLRevokeComponentPrivilege::getText() return "StmtDDLRevokeComponentPrivilege"; } -// LCOV_EXCL_STOP // ----------------------------------------------------------------------- // methodsn for class StmtDDLReInitializeSQL @@ -1418,7 +1414,6 @@ StmtDDLSchRevoke::setChild(Lng32 index, ExprNode * pChildNode) // methods for tracing // -// LCOV_EXCL_START const NAString StmtDDLSchRevoke::displayLabel1() const @@ -1516,7 +1511,6 @@ StmtDDLSchRevoke::getText() const return "StmtDDLSchRevoke"; } -// LCOV_EXCL_STOP // ----------------------------------------------------------------------- // methods for class StmtDDLRegisterComponent @@ -1570,7 +1564,6 @@ StmtDDLRegisterComponent::castToStmtDDLRegisterComponent() // methods for tracing // -// LCOV_EXCL_START const NAString StmtDDLRegisterComponent::displayLabel1() const @@ -1614,7 +1607,6 @@ StmtDDLRegisterComponent::getText() const return "StmtDDLRegisterComponent"; } -// LCOV_EXCL_STOP // // End of File http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/parser/StmtDDLRevokeComponentPrivilege.h ---------------------------------------------------------------------- diff --git a/core/sql/parser/StmtDDLRevokeComponentPrivilege.h b/core/sql/parser/StmtDDLRevokeComponentPrivilege.h index 36b09c9..be61ccf 100644 --- a/core/sql/parser/StmtDDLRevokeComponentPrivilege.h +++ b/core/sql/parser/StmtDDLRevokeComponentPrivilege.h @@ -70,12 +70,10 @@ public: inline ElemDDLGrantee * getGrantedBy() const { return grantedBy_; }; // for tracing - // LCOV_EXCL_START virtual const NAString displayLabel1() const; virtual const NAString displayLabel2() const; virtual NATraceList getDetailInfo() const; virtual const NAString getText(); - // LCOV_EXCL_STOP private: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/parser/sqlparser.y ---------------------------------------------------------------------- diff --git a/core/sql/parser/sqlparser.y b/core/sql/parser/sqlparser.y index 076c9e7..2d3265d 100755 --- a/core/sql/parser/sqlparser.y +++ b/core/sql/parser/sqlparser.y @@ -11337,10 +11337,8 @@ string_type : tok_char_or_character_or_byte new_optional_left_charlen_right char if ( $3/*toggled_optional_left_charlen_right*/->isCharLenUnitSpecified() AND $1/*tok_char_or_character_or_byte*/ EQU TOK_BYTE ) { - //LCOV_EXCL_START : cnu - Used only in ModeSpecial1 emitError3435( $1, eCharSet, parCLU ); // BYTES/CHARS not allowed with BYTE VARYING YYERROR; - //LCOV_EXCL_STOP : cnu - Used only in ModeSpecial1 } if ( eCharSet EQU CharInfo::UCS2 AND parCLU EQU ParAuxCharLenSpec::eBYTES ) { @@ -26840,8 +26838,8 @@ file_attribute_uid_clause : TOK_UID NUMERIC_LITERAL_EXACT_NO_SCALE // This syntax to be used by Backup/Restore only. // If Backup/Restore is ever implemented then add a parserflag for it // and report the 3001 error only if flag is not set. - *SqlParser_Diags << DgSqlCode(-3001) << DgString0("UID"); // LCOV_EXCL_LINE - YYERROR; // LCOV_EXCL_LINE + *SqlParser_Diags << DgSqlCode(-3001) << DgString0("UID"); + // Uncomment the next 2 lines if Backup/Restore is ever implemented. //$$ = new (PARSERHEAP()) ElemDDLFileAttrUID(atoInt64($2->data())); //delete $2; http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/parser/vers_libparser.cpp ---------------------------------------------------------------------- diff --git a/core/sql/parser/vers_libparser.cpp b/core/sql/parser/vers_libparser.cpp index 51fb4ab..e1d10d6 100644 --- a/core/sql/parser/vers_libparser.cpp +++ b/core/sql/parser/vers_libparser.cpp @@ -26,6 +26,4 @@ #define VERS_CV_MIN 0 #define VERS_CV_UPD 1 -// LCOV_EXCL_START VERS_LIB(libparser) -// LCOV_EXCL_STOP http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/qms/QRDescriptorStubs.cpp ---------------------------------------------------------------------- diff --git a/core/sql/qms/QRDescriptorStubs.cpp b/core/sql/qms/QRDescriptorStubs.cpp index b2a5afa..97c7856 100644 --- a/core/sql/qms/QRDescriptorStubs.cpp +++ b/core/sql/qms/QRDescriptorStubs.cpp @@ -36,7 +36,6 @@ #define THROW_EXCEPTION assertLogAndThrow(CAT_QR_DESC_GEN, LL_ERROR, FALSE, QRLogicException, "Method toItemExpr() called from server process."); -// LCOV_EXCL_START :rfi ItemExpr* QRColumn::toItemExpr(const NAString& mvName, CollHeap* heap, TableNameScanHash* scanhash) { THROW_EXCEPTION; return NULL; } ItemExpr* QRMVColumn::toItemExpr(const NAString& mvName, CollHeap* heap, TableNameScanHash* scanhash) { THROW_EXCEPTION; return NULL; } ItemExpr* QRScalarValue::toItemExpr(const NAString& mvName, CollHeap* heap, TableNameScanHash* scanhash){ THROW_EXCEPTION; return NULL; } @@ -44,4 +43,3 @@ ItemExpr* QRNullVal::toItemExpr(const NAString& mvName, CollHeap* heap, TableNam ItemExpr* QRBinaryOper::toItemExpr(const NAString& mvName, CollHeap* heap, TableNameScanHash* scanhash) { THROW_EXCEPTION; return NULL; } ItemExpr* QRUnaryOper::toItemExpr(const NAString& mvName, CollHeap* heap, TableNameScanHash* scanhash) { THROW_EXCEPTION; return NULL; } ItemExpr* QRFunction::toItemExpr(const NAString& mvName, CollHeap* heap, TableNameScanHash* scanhash) { THROW_EXCEPTION; return NULL; } -// LCOV_EXCL_STOP http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/qms/QmpMain.cpp ---------------------------------------------------------------------- diff --git a/core/sql/qms/QmpMain.cpp b/core/sql/qms/QmpMain.cpp index e0944d3..4c2a784 100644 --- a/core/sql/qms/QmpMain.cpp +++ b/core/sql/qms/QmpMain.cpp @@ -59,12 +59,10 @@ PublishTarget publishTarget = PUBLISH_TO_QMM; const char* targetFilename = NULL; // This is needed to avoid a link error. -// LCOV_EXCL_START :ale NABoolean NAType::isComparable(const NAType &other, ItemExpr *parentOp, Int32 emitErr) const { return FALSE; } -// LCOV_EXCL_STOP void usage(char *progName) { @@ -130,13 +128,11 @@ Int32 main(Int32 argc, char *argv[]) file_mon_process_startup(true); atexit(my_mpi_fclose); } - // LCOV_EXCL_START :rfi catch (...) { cerr << "Error while initializing messaging system. Exiting..." << endl; exit(1); } - // LCOV_EXCL_STOP NAHeap qmpHeap("QMP Heap", NAMemory::DERIVED_FROM_SYS_HEAP, (Lng32)131072); @@ -172,20 +168,16 @@ Int32 main(Int32 argc, char *argv[]) // Process any command-line arguments. if (processCommandLine(argc, argv) == FALSE) { - // LCOV_EXCL_START :rfi QRLogger::log(CAT_QMP, LL_ERROR, "QMP processing of command-line arguments failed."); return -1; - // LCOV_EXCL_STOP } if (qmpPublisher.setTarget(publishTarget, targetFilename) == FALSE) { - // LCOV_EXCL_START :rfi QRLogger::log(CAT_QMP, LL_ERROR, "QMP opening publish target failed."); return -1; - // LCOV_EXCL_STOP } // Process the REWRITE_PUBLISH table reading from the stream @@ -198,14 +190,12 @@ Int32 main(Int32 argc, char *argv[]) QRLogger::log(CAT_QMP, LL_DEBUG, "QMP REWRITE_TABLE reading completed with result code - %d", result); } - // LCOV_EXCL_START :rfi catch(...) { // Handle database errors here. QRLogger::log(CAT_QMP, LL_ERROR, "Unknown exception - exiting."); exit(0); } - // LCOV_EXCL_STOP // Delay waiting to try again for a successful SQL table read // Wait 3 minutes http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/qms/QmpPublish.cpp ---------------------------------------------------------------------- diff --git a/core/sql/qms/QmpPublish.cpp b/core/sql/qms/QmpPublish.cpp index 278ccad..74d5045 100644 --- a/core/sql/qms/QmpPublish.cpp +++ b/core/sql/qms/QmpPublish.cpp @@ -124,7 +124,6 @@ void QmpPublish::performRewritePublishReading() // commit the last transaction. sqlInterface_.commitTransaction(); } - // LCOV_EXCL_START :rfi catch(QRDatabaseException ex) { // Handle database errors here. @@ -133,7 +132,6 @@ void QmpPublish::performRewritePublishReading() "Error reading PUBLISH table from database - exiting."); exit(0); } - // LCOV_EXCL_STOP } // End of performRewritePublishReading // *************************************************************** @@ -151,7 +149,7 @@ void QmpPublish::preparePublishRewritePublishRowToSend(MVQR_Publish* publishData sqlInterface_.getSchemaVersion(publishData->catalogUID_); if (version == NULL) { - QRLogger::log(CAT_QMP, LL_ERROR, // LCOV_EXCL_LINE :rfi + QRLogger::log(CAT_QMP, LL_ERROR, "Not expecting an empty catalog."); return; } @@ -241,7 +239,7 @@ QRPublishDescriptorPtr QmpPublish::createPublishDescriptor(MVQR_Publish* publish ComPublishMVOperationType QmpPublish::convertOperationType(char * operation) { if (operation == NULL) - return COM_PUBLISH_MV_UNKNOWN; // LCOV_EXCL_LINE :rfi + return COM_PUBLISH_MV_UNKNOWN; if (strncmp(operation,COM_PUBLISH_MV_CREATE_LIT,2) == 0) return COM_PUBLISH_MV_CREATE; @@ -261,12 +259,10 @@ ComPublishMVOperationType QmpPublish::convertOperationType(char * operation) return COM_PUBLISH_MV_TOUCH; else if (strncmp(operation,COM_PUBLISH_MV_REPUBLISH_LIT,2) == 0) return COM_PUBLISH_MV_REPUBLISH; - // LCOV_EXCL_START :rfi else if (strncmp(operation,COM_PUBLISH_MV_UNKNOWN_LIT,2) == 0) return COM_PUBLISH_MV_UNKNOWN; else return COM_PUBLISH_MV_UNKNOWN; - // LCOV_EXCL_STOP } // End of convertOperationType http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/qms/QmsGroupLattice.cpp ---------------------------------------------------------------------- diff --git a/core/sql/qms/QmsGroupLattice.cpp b/core/sql/qms/QmsGroupLattice.cpp index d5ca2e6..80fada4 100644 --- a/core/sql/qms/QmsGroupLattice.cpp +++ b/core/sql/qms/QmsGroupLattice.cpp @@ -43,7 +43,6 @@ QRGroupLattice::~QRGroupLattice() deletePtr(lattice_); } -// LCOV_EXCL_START :cnu void QRGroupLattice::dumpLattice(const char* tag) { QRTRACER("QRGroupLattice::dumpLattice()"); @@ -54,7 +53,6 @@ void QRGroupLattice::dumpLattice(const char* tag) QRLogger::log(CAT_GRP_LATTCE_INDX, LL_DEBUG, graph.data()); } } -// LCOV_EXCL_STOP /** * This method can be used to dump detailed usage stats to the log file, @@ -62,14 +60,12 @@ void QRGroupLattice::dumpLattice(const char* tag) * Currently not used. ***************************************************************************** */ -// LCOV_EXCL_START :cnu void QRGroupLattice::reportStats(NAString& text) { QRTRACER("QRGroupLattice::reportStats()"); text += "\nLatticeIndex Graph:\n"; lattice_->dumpLattice(text, "stats"); } -// LCOV_EXCL_STOP void QRGroupLattice::collectMVGroups(WorkloadAnalysisPtr workload, Int32 minQueriesPerMV, CollHeap* heap) { http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/qms/QmsInitializer.cpp ---------------------------------------------------------------------- diff --git a/core/sql/qms/QmsInitializer.cpp b/core/sql/qms/QmsInitializer.cpp index 84398c2..4ee59d6 100644 --- a/core/sql/qms/QmsInitializer.cpp +++ b/core/sql/qms/QmsInitializer.cpp @@ -77,12 +77,10 @@ Lng32 QmsInitializer::performInitialization() NABoolean collectQMSStats = sqlInterface_.getCollectQMSStatsEnabled(); if (collectQMSStats) { - // LCOV_EXCL_START :cnu CQD that controls this is not defined. collectQMSStats_ = TRUE; // report initial heap size of QMS logQMSStats (); - // LCOV_EXCL_STOP } // Obtain all the MV descriptor text for all the MVs known for @@ -108,7 +106,6 @@ Lng32 QmsInitializer::performInitialization() } // End of performInitialization -// LCOV_EXCL_START :cnu The cqd does not exist. /** * dump QMS statistics to the log * statistics collection and logging is controlled @@ -127,7 +124,6 @@ void QmsInitializer::logQMSStats () QRLogger::log(CAT_MEMORY, LL_DEBUG, "QMS total memory size: (%Ld)", totalSize); QRLogger::log(CAT_MEMORY, LL_DEBUG, "QMS allocated memory size: (%Ld)", allocatedSize); } -// LCOV_EXCL_STOP // *************************************************************** // * processCharset @@ -138,7 +134,6 @@ void QmsInitializer::logQMSStats () // * to read the ISO_MAPPING and DEFAULT_CHARSET attribute values // * from the system defaults table. // *************************************************************** -// LCOV_EXCL_START :cnu void QmsInitializer::processCharset() { isoMapping_ = sqlInterface_.getIsoMapping(); @@ -147,7 +142,6 @@ void QmsInitializer::processCharset() return; } // End of processCharset -// LCOV_EXCL_STOP // *************************************************************** // * Process the results of the catalog and MV searches @@ -249,12 +243,10 @@ void QmsInitializer::processMvDescriptor(const QRMVDefinition* mvDef, // something else. if (mvDescriptor->getElementType() != ET_MVDescriptor) { - // LCOV_EXCL_START :rfi QRLogger::log(CAT_QMS_INIT, LL_WARN, "XML document parsed ok, but had wrong document element -- %s", mvDescriptor->getElementName()); return; - // LCOV_EXCL_STOP } QRMVDescriptorPtr mvDesc = static_cast<QRMVDescriptorPtr>(mvDescriptor); @@ -280,7 +272,6 @@ void QmsInitializer::processMvDescriptor(const QRMVDefinition* mvDef, qms_->insert(mvDesc, mvDef); } - // LCOV_EXCL_START :rfi catch (QRException ex) { QRLogger::log(CAT_QMS_INIT, LL_MVQR_FAIL, @@ -291,7 +282,6 @@ void QmsInitializer::processMvDescriptor(const QRMVDefinition* mvDef, QRLogger::log(CAT_QMS_INIT, LL_MVQR_FAIL, "Unknown exception thrown processing MV Descriptor. Skipping."); } - // LCOV_EXCL_STOP return; http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/qms/QmsJoinGraph.cpp ---------------------------------------------------------------------- diff --git a/core/sql/qms/QmsJoinGraph.cpp b/core/sql/qms/QmsJoinGraph.cpp index 49d6cbb..3fbc757 100644 --- a/core/sql/qms/QmsJoinGraph.cpp +++ b/core/sql/qms/QmsJoinGraph.cpp @@ -96,7 +96,6 @@ JoinGraphEqualitySetPtr JoinGraphTable::getEqSetUsing(JoinGraphHalfPredicatePtr } -// LCOV_EXCL_START :dpm /** * Prepare the input text for the Dotty graphical graph viewer, for this table. * @param[out] to Output string. @@ -115,7 +114,6 @@ void JoinGraphTable::dumpGraph(NAString& to) id.data(), id.data(), getName().data(), color); to += text; } -// LCOV_EXCL_STOP //***************************************************************************** //***************************************************************************** @@ -390,7 +388,6 @@ void JoinGraphEqualitySet::setOnKeyTo(const JoinGraphTablePtr targetTable) //***************************************************************************** //***************************************************************************** -// LCOV_EXCL_START :cnu Not called from anywhere. NABoolean JoinGraphEqualitySet::isOnKeyTo(const JoinGraphTablePtr targetTable) { if (isOnKey_ == FALSE) @@ -408,7 +405,6 @@ NABoolean JoinGraphEqualitySet::isOnKeyTo(const JoinGraphTablePtr targetTable) return FALSE; // Should not get here! } -// LCOV_EXCL_STOP //***************************************************************************** //***************************************************************************** @@ -422,12 +418,10 @@ JoinGraphTablePtr JoinGraphEqualitySet::getOtherTable(JoinGraphHalfPredicatePtr return halfPred->getTable(); } - // LCOV_EXCL_START :rfi assertLogAndThrow(CAT_MVMEMO_JOINGRAPH, LL_MVQR_FAIL, FALSE, QRLogicException, "getOtherTable() called with a bad half pred pointer."); return NULL; - // LCOV_EXCL_STOP } //***************************************************************************** @@ -467,7 +461,6 @@ JoinGraphHalfPredicatePtr JoinGraphEqualitySet::getForeignKeySide() // to += text; // } //} // JoinGraphEqualitySet::dumpGraph() -// LCOV_EXCL_START :dpm void JoinGraphEqualitySet::dumpGraph(NAString& to) { char text[256]; @@ -517,7 +510,6 @@ void JoinGraphEqualitySet::dumpGraph(NAString& to) } } } // JoinGraphEqualitySet::dumpGraph() -// LCOV_EXCL_STOP //======================================================================== @@ -584,7 +576,6 @@ void QRJoinGraph::addTable(const QRTablePtr tableElement, Int32 compareResult = thisName.compareTo(lastName); if (compareResult < 0) { - // LCOV_EXCL_START :cnu Table names should always be sorted. // If not - it means the table names are not sorted. // Looks like we will have to sort them here... QRLogger::log(CAT_MVMEMO_JOINGRAPH, LL_INFO, @@ -595,7 +586,6 @@ void QRJoinGraph::addTable(const QRTablePtr tableElement, // Correct the ordinal number of the new entry. newTablePtr->setOrdinalNumber(insertPos); - // LCOV_EXCL_STOP } else if (compareResult == 0) { @@ -618,7 +608,6 @@ void QRJoinGraph::addTable(const QRTablePtr tableElement, tableHashByID_.insert(&id, newTablePtr); } // QRJoinGraph::addTable() -// LCOV_EXCL_START :cnu Table names should always be sorted, which avoids call of this fn. /** * Find the spot in the table array where to insert the new table, and shift * the tables in the array beyond it to create an open entry for it. @@ -662,9 +651,7 @@ CollIndex QRJoinGraph::shiftArray(const NAString thisName) return insertPos; } // QRJoinGraph::shiftArray() -// LCOV_EXCL_STOP -// LCOV_EXCL_START :cnu Table names should always be sorted, which avoids call of this fn. /** * Shift the table in position insertPos-1 to position insertPos, and * fix its ordinal number. @@ -677,7 +664,6 @@ void QRJoinGraph::shiftTable(CollIndex insertPos) shiftedTable->setOrdinalNumber(insertPos); tableArray_.insertAt(insertPos, shiftedTable); } -// LCOV_EXCL_STOP /** * Create a new JoinGraphHalfPredicate object, and add it to the equality @@ -771,14 +757,12 @@ void QRJoinGraph::addEqualitySet(const QRJoinPredPtr predElement) break; } - // LCOV_EXCL_START :rfi default: { assertLogAndThrow1(CAT_MVMEMO_JOINGRAPH, LL_MVQR_FAIL, FALSE, QRLogicException, "Not expecting Equi-join predicate of type: %s", equalityElement->getElementName()); } - // LCOV_EXCL_STOP } // case on element type } @@ -907,7 +891,7 @@ void QRJoinGraph::initFromJBB(const QRJBBPtr jbb, MVDetailsPtr mv) // Now dump the graph if priority of MvMemo category is set DEBUG. if (QRLogger::isCategoryInDebug(CAT_MVMEMO_JOINGRAPH)) - dumpGraph(mv); // LCOV_EXCL_LINE :dpm + dumpGraph(mv); } // QRJoinGraph::initFromJBB() @@ -1031,7 +1015,6 @@ JoinGraphTablePtr QRJoinGraph::getNextTable(QRJoinSubGraphPtr subGraph) return table; } -// LCOV_EXCL_START :dpm /** * Prepare the input text for the Dotty graphical graph viewer. * @param[out] to Output string. @@ -1068,7 +1051,6 @@ void QRJoinGraph::dumpGraph(MVDetailsPtr mv) QRLogger::log(CAT_MVMEMO_JOINGRAPH, LL_DEBUG, dotGraph); } // QRJoinGraph::dumpGraph() -// LCOV_EXCL_STOP //======================================================================== @@ -1443,7 +1425,6 @@ QRJoinSubGraphMapPtr QRJoinSubGraphMap::nextEquivalentMap() const Int32* shiftRow = new(heap) Int32[numberOfTables]; selfJoinHandler->getNextShiftVector(shiftRow); - // LCOV_EXCL_START :dpm if (QRLogger::isCategoryInDebug(CAT_MVMEMO_JOINGRAPH)) { NAString text("shiftRow is: "); @@ -1457,7 +1438,6 @@ QRJoinSubGraphMapPtr QRJoinSubGraphMap::nextEquivalentMap() const newMap->shiftVector_ = text; // For debugging. } - // LCOV_EXCL_STOP for (CollIndex table=0; table<numberOfTables; table++) { http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/qms/QmsLatticeIndex.cpp ---------------------------------------------------------------------- diff --git a/core/sql/qms/QmsLatticeIndex.cpp b/core/sql/qms/QmsLatticeIndex.cpp index f42a823..326b5fb 100644 --- a/core/sql/qms/QmsLatticeIndex.cpp +++ b/core/sql/qms/QmsLatticeIndex.cpp @@ -54,7 +54,6 @@ QRLatticeIndexNode::QRLatticeIndexNode(const LatticeKeyList& keys, isValid_ = lattice->addKeysToBitmap(keys, noNewEntry, keyBitmap_); } -// LCOV_EXCL_START :cnu Supports currently unused feature of QRLatticeIndexSearchNode QRLatticeIndexNode::QRLatticeIndexNode(QRLatticeIndexPtr lattice, NABoolean noNewEntry, ADD_MEMCHECK_ARGS_DEF(CollHeap* heap)) @@ -74,7 +73,6 @@ QRLatticeIndexNode::QRLatticeIndexNode(QRLatticeIndexPtr lattice, QRTRACER("QRLatticeIndexNode::QRLatticeIndexNode()"); *nodeName_ = '\0'; } -// LCOV_EXCL_STOP QRLatticeIndexNode::QRLatticeIndexNode(const char* const name, QRLatticeIndexPtr lattice, @@ -193,14 +191,12 @@ void QRLatticeIndexNode::dumpNode(NAString& nodeContents, for (CollIndex i=0; i<mapList_.entries(); i++) { - // LCOV_EXCL_START :dpm if (first) first = FALSE; else nodeContents.append(", "); nodeContents.append(mapList_[i]->getMVDetails()->getMVName().data()); - // LCOV_EXCL_STOP } char gbText[50]; @@ -229,7 +225,6 @@ void QRLatticeIndexNode::dumpNode(NAString& nodeContents, * Currently not used. ***************************************************************************** */ -// LCOV_EXCL_START :cnu void QRLatticeIndexNode::dumpLattice(NAString& graphText, NAString& graphLabel) { @@ -256,7 +251,6 @@ void QRLatticeIndexNode::dumpLattice(NAString& graphText, child->dumpLattice(graphText, graphLabel); } } -// LCOV_EXCL_STOP void QRLatticeIndexNode::collectMVGroups(WorkloadAnalysisPtr workload, Int32 minQueriesPerMV, CollHeap* heap) { @@ -489,7 +483,6 @@ NABoolean QRLatticeIndex::addKeysToBitmap(const LatticeKeyList& keys, return isOK; } -// LCOV_EXCL_START :cnu void QRLatticeIndex::findSubsets(QRLatticeIndexNode& supersetNode, NAPtrList<QRLatticeIndexNodePtr>& subsets) { @@ -502,9 +495,7 @@ void QRLatticeIndex::findSubsets(QRLatticeIndexNode& supersetNode, else getSubsets(exactNode, subsets); } -// LCOV_EXCL_STOP -// LCOV_EXCL_START :cnu void QRLatticeIndex::findSubsets_(QRLatticeIndexNode& supersetNode, QRLatticeIndexNodePtr childNode, NAPtrList<QRLatticeIndexNodePtr>& subsets) @@ -527,9 +518,7 @@ void QRLatticeIndex::findSubsets_(QRLatticeIndexNode& supersetNode, } } } -// LCOV_EXCL_STOP -// LCOV_EXCL_START :cnu void QRLatticeIndex::getSubsets(QRLatticeIndexNodePtr node, NAPtrList<QRLatticeIndexNodePtr>& subsets) { @@ -547,7 +536,6 @@ void QRLatticeIndex::getSubsets(QRLatticeIndexNodePtr node, getSubsets(subsetNode, subsets); } } -// LCOV_EXCL_STOP void QRLatticeIndex::findSupersets(QRLatticeIndexNode& subsetNode, NAPtrList<QRLatticeIndexNodePtr>& supersets) @@ -807,7 +795,6 @@ NABoolean QRLatticeIndex::contains(LatticeIndexablePtr key) * Currently not used. ***************************************************************************** */ -// LCOV_EXCL_START :dpm void QRLatticeIndex::dumpLattice(NAString& graphText, const char* tag) { QRTRACER("QRLatticeIndex::dumpLattice()"); @@ -829,7 +816,6 @@ void QRLatticeIndex::dumpLattice(NAString& graphText, const char* tag) (graphText += "}\n#ENDLATTICE ") += tag; graphText += '\n'; } -// LCOV_EXCL_STOP void QRLatticeIndex::collectMVGroups(WorkloadAnalysisPtr workload, Int32 minQueriesPerMV, CollHeap* heap) { http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/qms/QmsMVMemo.cpp ---------------------------------------------------------------------- diff --git a/core/sql/qms/QmsMVMemo.cpp b/core/sql/qms/QmsMVMemo.cpp index e2b2c2c..1c9461e 100644 --- a/core/sql/qms/QmsMVMemo.cpp +++ b/core/sql/qms/QmsMVMemo.cpp @@ -133,14 +133,12 @@ NABoolean MVMemoGroup::addPhysicalExpression(const QRJoinSubGraphMapPtr map, map->setMVDetails(mv); groupLattice_->insert(map, jbb); } - // LCOV_EXCL_START :rfi catch (...) { QRLogger::log(CAT_GRP_LATTCE_INDX, LL_MVQR_FAIL, "Caught exception creating group lattice or inserting mv"); throw; } - // LCOV_EXCL_STOP } return TRUE; @@ -187,14 +185,12 @@ void MVMemoGroup::getPhysicalExpressions(MVCandidatesForJBBPtr mvCandidates, mvCandidates->insert(jbbSubset); } } - // LCOV_EXCL_START :rfi catch (...) { QRLogger::log(CAT_GRP_LATTCE_INDX, LL_MVQR_FAIL, "Caught exception searching group lattice or setting subgraph maps"); throw; } - // LCOV_EXCL_STOP } else { @@ -226,7 +222,6 @@ void MVMemoGroup::getPhysicalExpressions(MVCandidatesForJBBPtr mvCandidates, } } // MVMemoGroup::getPhysicalExpressions() -// LCOV_EXCL_START :cnu /** * Remove a physical expression for an MV that has been dropped. * @param key The hash key for the MV to remove. @@ -251,7 +246,6 @@ void MVMemoGroup::removePhysicalExpression(MVMemoPhysicalExpressionPtr expr) } } } -// LCOV_EXCL_STOP /** * @@ -324,7 +318,6 @@ Int32 MVMemoGroup::getNumOfMVs() * Currently not used. ***************************************************************************** */ -// LCOV_EXCL_START :cnu void MVMemoGroup::reportStats(NAString& text) { text += "\n== These MVs:"; @@ -349,7 +342,6 @@ void MVMemoGroup::reportStats(NAString& text) groupLattice_->reportStats(text); } } -// LCOV_EXCL_STOP /** * Create a ProposedMV object and add to it all the MVs that are in physical @@ -740,7 +732,6 @@ MVMemoGroupPtr MVMemo::probeForSubGraph(HubIteratorPtr hubIterator, const QRJoin * Currently not used. ***************************************************************************** */ -// LCOV_EXCL_START :cnu void MVMemo::reportStats(Int32 numOfMVs) { typedef NAPtrList<MVMemoGroupPtr> GroupList; @@ -805,7 +796,6 @@ void MVMemo::reportStats(Int32 numOfMVs) groupsProcessed++; } } -// LCOV_EXCL_STOP /** * Iterate over all the MVMemo groups to collect proposed MVs. http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/qms/QmsMain.cpp ---------------------------------------------------------------------- diff --git a/core/sql/qms/QmsMain.cpp b/core/sql/qms/QmsMain.cpp index 1d438b9..0941ceb 100644 --- a/core/sql/qms/QmsMain.cpp +++ b/core/sql/qms/QmsMain.cpp @@ -81,13 +81,11 @@ Int32 main(Int32 argc, char *argv[]) file_mon_process_startup(true); atexit(my_mpi_fclose); } - // LCOV_EXCL_START :rfi catch (...) { cerr << "Error while initializing messaging system. Exiting..." << endl; exit(1); } - // LCOV_EXCL_STOP NABoolean performSMDInit = FALSE; NABoolean performXMLInit = FALSE; http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/qms/QmsQms.cpp ---------------------------------------------------------------------- diff --git a/core/sql/qms/QmsQms.cpp b/core/sql/qms/QmsQms.cpp index 4739a0f..7b2209b 100644 --- a/core/sql/qms/QmsQms.cpp +++ b/core/sql/qms/QmsQms.cpp @@ -43,13 +43,11 @@ * MATCH request. */ -// LCOV_EXCL_START :ale // This is needed to avoid a link error. NABoolean NAType::isComparable(const NAType &other, ItemExpr *parentOp, Int32 emitErr) const { return FALSE; } -// LCOV_EXCL_STOP Qms* Qms::instance_ = NULL; @@ -111,7 +109,6 @@ QRResultDescriptorPtr Qms::match(QRQueryDescriptorPtr qryDescPtr, NAMemory* requ { mvMemo_.search(jbb, jbbCandidates, requestHeap); } - // LCOV_EXCL_START :rfi catch (...) { // Exception occurred, skip this JBB and keep going. @@ -120,7 +117,6 @@ QRResultDescriptorPtr Qms::match(QRQueryDescriptorPtr qryDescPtr, NAMemory* requ deletePtr(jbbCandidates); continue; } - // LCOV_EXCL_STOP mvCandidates->insert(jbbCandidates); } @@ -135,7 +131,6 @@ QRResultDescriptorPtr Qms::match(QRQueryDescriptorPtr qryDescPtr, NAMemory* requ //dumpInventoryHash(); return resultDesc; } - // LCOV_EXCL_START :rfi catch (QRException e) { QRLogger::instance().log(CAT_QMS_MAIN, LL_MVQR_FAIL, "MATCH operation aborted."); @@ -151,7 +146,6 @@ QRResultDescriptorPtr Qms::match(QRQueryDescriptorPtr qryDescPtr, NAMemory* requ QRResultDescriptorPtr resultDesc = MVCandidateCollection::generateEmptyResultDescriptor(requestHeap); return resultDesc; } - // LCOV_EXCL_STOP } /** @@ -198,7 +192,6 @@ void Qms::insert(QRMVDescriptorPtr mvDescPtr, const QRMVDefinition* mvDefPtr) MVInventoryHash_.insert(&mvDetails->getMVName(), mvDetails); //dumpInventoryHash(); } - // LCOV_EXCL_START :rfi catch (QRException e) { // Ignore exceptions for now. @@ -211,7 +204,6 @@ void Qms::insert(QRMVDescriptorPtr mvDescPtr, const QRMVDefinition* mvDefPtr) QRLogger::instance().log(CAT_QMS_MAIN, LL_MVQR_FAIL, "PUBLISH operation aborted, An unknown exception occurred."); } - // LCOV_EXCL_STOP } /** @@ -237,7 +229,6 @@ void Qms::drop(const NAString& mvName) } //dumpInventoryHash(); } - // LCOV_EXCL_START :rfi catch (QRException e) { // Ignore exceptions for now. @@ -250,7 +241,6 @@ void Qms::drop(const NAString& mvName) QRLogger::instance().log(CAT_QMS_MAIN, LL_MVQR_FAIL, "DROP operation aborted because of unknown exception."); } - // LCOV_EXCL_STOP } /** @@ -335,7 +325,6 @@ void Qms::rename(const NAString& oldName, const NAString& newName) QRLogger::instance().log(CAT_QMS_MAIN, LL_INFO, "Unable to rename MV %s - not found in QMS.", oldName.data()); } - // LCOV_EXCL_START :rfi catch (QRException e) { // Ignore exceptions for now. @@ -347,7 +336,6 @@ void Qms::rename(const NAString& oldName, const NAString& newName) QRLogger::instance().log(CAT_QMS_MAIN, LL_MVQR_FAIL, "Rename operation aborted because of unknown exception."); } - // LCOV_EXCL_STOP } /** @@ -374,7 +362,6 @@ const Int64 *Qms::getMVTimestamp(const NAString& mvName) return &mvDetails->getRedefTimestamp(); } -// LCOV_EXCL_START :cnu void Qms::dumpInventoryHash() { QRLogger::instance().log(CAT_QMS_MAIN, LL_DEBUG, "Dumping MV Inventory:"); @@ -387,7 +374,6 @@ void Qms::dumpInventoryHash() QRLogger::instance().log(CAT_QMS_MAIN, LL_DEBUG, key->data()); } } -// LCOV_EXCL_STOP /** * Perform workload analysis. http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/qms/QmsRequest.cpp ---------------------------------------------------------------------- diff --git a/core/sql/qms/QmsRequest.cpp b/core/sql/qms/QmsRequest.cpp index f074b9b..dc6dee3 100644 --- a/core/sql/qms/QmsRequest.cpp +++ b/core/sql/qms/QmsRequest.cpp @@ -279,21 +279,17 @@ void QmsMessageStream::actOnReceive(IpcConnection* connection) respond(responseObj); } -// LCOV_EXCL_START :rfi static void error(const char* text) { cerr << text << endl; } -// LCOV_EXCL_STOP -// LCOV_EXCL_START :rfi static void usage(char *progName) { cerr << "Usage: " << progName << " infile outfile" << endl; QRLogger::log(CAT_QR_IPC, LL_ERROR, "Usage: %s infile outfile", progName); } -// LCOV_EXCL_STOP // These static member functions are called from QmsMain.cpp. @@ -325,11 +321,9 @@ QRRequestResult QRRequest::parseXMLDoc(QRRequest& request, if (!descriptor) { - // LCOV_EXCL_START :rfi QRLogger::log(CAT_QMS_MAIN, LL_WARN, "XMLDocument.parse() returned NULL."); return XMLParseError; - // LCOV_EXCL_STOP } else { @@ -337,7 +331,6 @@ QRRequestResult QRRequest::parseXMLDoc(QRRequest& request, "Parsed XML document successfully."); } } - // LCOV_EXCL_START :rfi catch (XMLException& ex) { QRLogger::log(CAT_QMS_MAIN, LL_MVQR_FAIL, @@ -356,7 +349,6 @@ QRRequestResult QRRequest::parseXMLDoc(QRRequest& request, "An Unknown exception occurred"); return InternalError; } - // LCOV_EXCL_STOP return Success; } // End of parseXmlDoc @@ -478,12 +470,10 @@ QRRequestResult QRRequest::handleMatchRequest(QRRequest& request, // something else. if (descriptor->getElementType() != ET_QueryDescriptor) { - // LCOV_EXCL_START :rfi result = WrongDescriptor; QRLogger::log(CAT_QMS_MAIN, LL_ERROR, "XML document parsed ok, but had wrong document element -- %s", descriptor->getElementName()); - // LCOV_EXCL_STOP } // If it is Success, perform "match" and add the resulting Result @@ -570,7 +560,7 @@ QRMessageObj* QRMessageRequest::processRequestMessage(QRMessageStream* msgStream // collect and log qms stats if (qmsInitializer.doCollectQMSStats()) { - qmsInitializer.logQMSStats(); // LCOV_EXCL_LINE :cnu cqd that drives this does not exist + qmsInitializer.logQMSStats(); } if (result == QR::Success) @@ -596,7 +586,7 @@ QRMessageObj* QRMessageRequest::processRequestMessage(QRMessageStream* msgStream // collect and log qms stats if (qmsInitializer.doCollectQMSStats()) { - qmsInitializer.logQMSStats(); // LCOV_EXCL_LINE :cnu CQD that controls this is not defined. + qmsInitializer.logQMSStats(); } if (result == QR::Success) @@ -641,14 +631,12 @@ QRMessageObj* QRMessageRequest::processRequestMessage(QRMessageStream* msgStream responseMsgPtr = new QRStatusMessageObj(QR::InvalidRequest); break; - // LCOV_EXCL_START :rfi default: QRLogger::log(CAT_QMS_MAIN, LL_ERROR, "Unhandled message: %d", msgStream->getNextObjType()); noBadRequest = FALSE; responseMsgPtr = new QRStatusMessageObj(QR::InvalidRequest); break; - // LCOV_EXCL_STOP } // switch } // while @@ -695,22 +683,18 @@ Int32 QRCommandLineRequest::processCommandLine(Int32 argc, char *argv[]) if (!inFile.rdbuf()->is_open()) { - // LCOV_EXCL_START :rfi QRLogger::log(CAT_QMS_MAIN, LL_ERROR, "Can't open input file. %s", argv[1]); error("Can't open input file."); usage(argv[0]); return -1; - // LCOV_EXCL_STOP } if (!outFile.rdbuf()->is_open()) { - // LCOV_EXCL_START :rfi QRLogger::log(CAT_QMS_MAIN, LL_ERROR, "Can't open output file. %s", argv[2]); error("Can't open output file."); usage(argv[0]); return -1; - // LCOV_EXCL_STOP } QRCommandLineRequest request(inFile); @@ -795,7 +779,7 @@ Int32 QRCommandLineRequest::processCommandLine(Int32 argc, char *argv[]) // collect and log qms stats if (qmsInitializer.doCollectQMSStats()) { - qmsInitializer.logQMSStats(); // LCOV_EXCL_LINE :cnu CQD that controls this is not defined. + qmsInitializer.logQMSStats(); } moreInput = request.readRequestType(requestType); http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/qms/QmsRequest.h ---------------------------------------------------------------------- diff --git a/core/sql/qms/QmsRequest.h b/core/sql/qms/QmsRequest.h index bca9d03..137776d 100644 --- a/core/sql/qms/QmsRequest.h +++ b/core/sql/qms/QmsRequest.h @@ -349,7 +349,7 @@ class QRCommandLineRequest : public QRRequest virtual size_t readXml(char *buffer, size_t bufferSize) { if (isInlined_) - return readXmlInlined(buffer, bufferSize); // LCOV_EXCL_LINE :cnu + return readXmlInlined(buffer, bufferSize); else return readXmlFile(buffer, bufferSize); } @@ -371,7 +371,6 @@ protected: return xmlFile_.gcount(); } - // LCOV_EXCL_START :cnu size_t readXmlInlined(char *buffer, size_t bufferSize) { if (!inFile_.rdbuf()->is_open() || inlinedLineRead_) @@ -382,7 +381,6 @@ protected: inFile_.getline(buffer, bufferSize); return strlen(buffer); } - // LCOV_EXCL_STOP private: // Copy construction/assignment not defined. http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/qms/QmsSelfJoinHandler.cpp ---------------------------------------------------------------------- diff --git a/core/sql/qms/QmsSelfJoinHandler.cpp b/core/sql/qms/QmsSelfJoinHandler.cpp index dfd8c11..9c830f9 100644 --- a/core/sql/qms/QmsSelfJoinHandler.cpp +++ b/core/sql/qms/QmsSelfJoinHandler.cpp @@ -95,7 +95,6 @@ void Array2D::setElement(UInt32 row, UInt32 col, Int32 value) //***************************************************************************** //***************************************************************************** -// LCOV_EXCL_START :dpm void Array2D::dump(NAString& text) { char buffer[100]; @@ -113,7 +112,6 @@ void Array2D::dump(NAString& text) } } } -// LCOV_EXCL_STOP //======================================================================== // Class ShiftMatrix @@ -241,7 +239,6 @@ void ShiftMatrix::initNext(NABitVector& usedValuesV, // Which values were alread //***************************************************************************** //***************************************************************************** -// LCOV_EXCL_START :dpm void ShiftMatrix::dump(NAString& text) { char buffer[100]; @@ -249,7 +246,6 @@ void ShiftMatrix::dump(NAString& text) text += buffer; theMatrix_->dump(text); } -// LCOV_EXCL_STOP //======================================================================== // Class ShiftMatrixFactory @@ -584,7 +580,6 @@ Int32 SelfJoinHandler::howmanyPermutations() //***************************************************************************** //***************************************************************************** -// LCOV_EXCL_START :dpm void SelfJoinHandler::dump(NAString& text) { char buffer[100]; @@ -605,4 +600,3 @@ void SelfJoinHandler::dump(NAString& text) text += "\nPermutationMatrix:\n"; permMatrix_->dump(text); } -// LCOV_EXCL_STOP http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/qms/QmsStubs.cpp ---------------------------------------------------------------------- diff --git a/core/sql/qms/QmsStubs.cpp b/core/sql/qms/QmsStubs.cpp index e50e9f0..1957b55 100644 --- a/core/sql/qms/QmsStubs.cpp +++ b/core/sql/qms/QmsStubs.cpp @@ -24,7 +24,6 @@ //#include "Platform.h" -// LCOV_EXCL_START :ale extern "C" void CmpAssertInternal__FPcT1i(void){}; @@ -48,6 +47,5 @@ void __eq__16ExtendedQualNameCFRC16ExtendedQualName(void) {}; extern "C" void __eq__13QualifiedNameCFRC8NAString(void) {}; -// LCOV_EXCL_STOP
