http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/refresh/RuMultiTxnRefreshTaskExecutor.cpp ---------------------------------------------------------------------- diff --git a/core/sql/refresh/RuMultiTxnRefreshTaskExecutor.cpp b/core/sql/refresh/RuMultiTxnRefreshTaskExecutor.cpp index bfd47d3..55e3baf 100644 --- a/core/sql/refresh/RuMultiTxnRefreshTaskExecutor.cpp +++ b/core/sql/refresh/RuMultiTxnRefreshTaskExecutor.cpp @@ -190,7 +190,6 @@ void CRUMultiTxnRefreshTaskExecutor::UpdateTargetEpoch(TInt32 epoch) // In reality, it is retryable, but we have to handle that ourselves. pStat->ExecuteUpdate(TRUE); } - // LCOV_EXCL_START :rfi catch (CDMException &eDm) { if (eDm.GetErrorCode (0) == -VERSION_PLAN_VERSION_ERROR_NON_RETRYABLE_STATEMENT) @@ -199,7 +198,6 @@ void CRUMultiTxnRefreshTaskExecutor::UpdateTargetEpoch(TInt32 epoch) else throw; } - // LCOV_EXCL_STOP pStat->Close(); } @@ -610,7 +608,6 @@ void CRUMultiTxnRefreshTaskExecutor:: CommitTransaction(); } - // LCOV_EXCL_START :rfi catch (CDSException &ex) { pStat->Close(); @@ -626,7 +623,6 @@ void CRUMultiTxnRefreshTaskExecutor:: return; } - // LCOV_EXCL_STOP #ifdef _DEBUG // This section is only for the regression test @@ -708,7 +704,6 @@ CDMPreparedStatement * CRUMultiTxnRefreshTaskExecutor:: // Simulate a system error at this point! TESTPOINT_SEVERE2(CRUGlobals::SEVERE_PREPARE_CRASH, GetRootMVName()); } - // LCOV_EXCL_START :rfi catch (CDSException &ex) { ex.SetError(IDS_RU_IREFRESH_FAILED); @@ -725,7 +720,6 @@ CDMPreparedStatement * CRUMultiTxnRefreshTaskExecutor:: GetLastSQL(type)); throw ex; // Re-throw } - // LCOV_EXCL_STOP return pStat; } @@ -793,7 +787,6 @@ void CRUMultiTxnRefreshTaskExecutor::LogClosureMessage() //--------------------------------------------------------------------------// // CRUMultiTxnRefreshTaskExecutor::StoreRequest() //--------------------------------------------------------------------------// -// LCOV_EXCL_START :cnu void CRUMultiTxnRefreshTaskExecutor:: StoreRequest(CUOFsIpcMessageTranslator &translator) { @@ -812,12 +805,10 @@ void CRUMultiTxnRefreshTaskExecutor:: translator.SetMessageType(CUOFsIpcMessageTranslator:: RU_MULTI_TXN_REFRESH_EXECUTOR); } -// LCOV_EXCL_STOP //--------------------------------------------------------------------------// // CRUMultiTxnRefreshTaskExecutor::StoreReply() //--------------------------------------------------------------------------// -// LCOV_EXCL_START :cnu void CRUMultiTxnRefreshTaskExecutor:: StoreReply(CUOFsIpcMessageTranslator &translator) { @@ -831,12 +822,10 @@ void CRUMultiTxnRefreshTaskExecutor:: translator.WriteBlock(&txnCounter_, sizeof(short)); } -// LCOV_EXCL_STOP //--------------------------------------------------------------------------// // CRUAuditRefreshTaskExecutor::LoadRequest() //--------------------------------------------------------------------------// -// LCOV_EXCL_START :cnu void CRUMultiTxnRefreshTaskExecutor:: LoadRequest(CUOFsIpcMessageTranslator &translator) { @@ -852,12 +841,10 @@ void CRUMultiTxnRefreshTaskExecutor:: translator.ReadBlock(&multiTxnTargetEpoch_, sizeof(TInt32)); translator.ReadBlock(&txnCounter_, sizeof(short)); } -// LCOV_EXCL_STOP //--------------------------------------------------------------------------// // CRUAuditRefreshTaskExecutor::LoadReply() //--------------------------------------------------------------------------// -// LCOV_EXCL_START :cnu void CRUMultiTxnRefreshTaskExecutor:: LoadReply(CUOFsIpcMessageTranslator &translator) { @@ -870,5 +857,4 @@ void CRUMultiTxnRefreshTaskExecutor:: translator.ReadBlock(&multiTxnTargetEpoch_, sizeof(TInt32)); translator.ReadBlock(&txnCounter_, sizeof(short)); } -// LCOV_EXCL_STOP
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/refresh/RuOptions.cpp ---------------------------------------------------------------------- diff --git a/core/sql/refresh/RuOptions.cpp b/core/sql/refresh/RuOptions.cpp index bb1f0a7..e3991b3 100644 --- a/core/sql/refresh/RuOptions.cpp +++ b/core/sql/refresh/RuOptions.cpp @@ -134,7 +134,6 @@ void CRUOptions::AddDebugOption(Int32 testpoint, const CDSString &objName) //--------------------------------------------------------------------------// // CRUOptions::Dump() //--------------------------------------------------------------------------// -// LCOV_EXCL_START :dpm void CRUOptions::Dump(CDSString &to) { to += "\n\t\tCOMMAND OPTIONS DUMP\n\n"; @@ -195,7 +194,6 @@ void CRUOptions::Dump(CDSString &to) to += CDSString(buf); } } -// LCOV_EXCL_STOP #endif //--------------------------------------------------------------------------// @@ -217,7 +215,6 @@ operator = (const CRUOptions::DebugOption &other) // The LoadData/StoreData methods move only the output // file's name and the debug options between the processes. //--------------------------------------------------------------------------// -// LCOV_EXCL_START :cnu void CRUOptions::StoreData(CUOFsIpcMessageTranslator &translator) { Int32 stringSize; @@ -254,12 +251,10 @@ void CRUOptions::StoreData(CUOFsIpcMessageTranslator &translator) #pragma warn(1506) // warning elimination } } -// LCOV_EXCL_STOP //--------------------------------------------------------------------------// // CRUOptions::LoadData() //--------------------------------------------------------------------------// -// LCOV_EXCL_START :cnu void CRUOptions::LoadData(CUOFsIpcMessageTranslator &translator) { char buf[PACK_BUFFER_SIZE]; @@ -305,4 +300,3 @@ void CRUOptions::LoadData(CUOFsIpcMessageTranslator &translator) AddDebugOption(testpoint, objName); } } -// LCOV_EXCL_STOP http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/refresh/RuRcReleaseTaskExecutor.h ---------------------------------------------------------------------- diff --git a/core/sql/refresh/RuRcReleaseTaskExecutor.h b/core/sql/refresh/RuRcReleaseTaskExecutor.h index 5aa7792..79a72a6 100644 --- a/core/sql/refresh/RuRcReleaseTaskExecutor.h +++ b/core/sql/refresh/RuRcReleaseTaskExecutor.h @@ -58,7 +58,6 @@ public: public: // These functions serialize/de-serialize the executor's context // for the message communication with the remote server process - // LCOV_EXCL_START :cnu // Used in the main process side virtual void StoreRequest(CUOFsIpcMessageTranslator &translator) {}; @@ -67,7 +66,6 @@ public: // Used in the remote process side virtual void LoadRequest(CUOFsIpcMessageTranslator &translator) {}; virtual void StoreReply(CUOFsIpcMessageTranslator &translator) {}; - // LCOV_EXCL_STOP protected: //-- Implementation of pure virtual http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/refresh/RuRefreshSQLComposer.cpp ---------------------------------------------------------------------- diff --git a/core/sql/refresh/RuRefreshSQLComposer.cpp b/core/sql/refresh/RuRefreshSQLComposer.cpp index 23ed465..61629a9 100644 --- a/core/sql/refresh/RuRefreshSQLComposer.cpp +++ b/core/sql/refresh/RuRefreshSQLComposer.cpp @@ -66,9 +66,7 @@ void CRURefreshSQLComposer::StartInternalRefresh() } else { - // LCOV_EXCL_START :dpm sql_ = "DISPLAY INTERNAL REFRESH "; - // LCOV_EXCL_STOP } sql_ += GetRootMV().GetFullName(); @@ -293,7 +291,6 @@ void CRURefreshSQLComposer::AddPipeLineClause() // // //--------------------------------------------------------------------------// -// LCOV_EXCL_START :rfi void CRURefreshSQLComposer::ComposeCntrlTableMDAMText( CRUForceOptions::MdamOptions mdamOption, const CDSString* pName) @@ -326,7 +323,6 @@ void CRURefreshSQLComposer::ComposeCntrlTableMDAMText( ASSERT(FALSE); } } -// LCOV_EXCL_STOP //--------------------------------------------------------------------------// // CRURefreshSQLComposer::ComposeResetCntrlTableText() @@ -337,7 +333,6 @@ void CRURefreshSQLComposer::ComposeCntrlTableMDAMText( // // //--------------------------------------------------------------------------// -// LCOV_EXCL_START :rfi void CRURefreshSQLComposer::ComposeResetCntrlTableMDAMText(const CDSString* pName) { sql_ = "CONTROL TABLE "; @@ -353,7 +348,6 @@ void CRURefreshSQLComposer::ComposeResetCntrlTableMDAMText(const CDSString* pNam sql_ += " RESET; "; } -// LCOV_EXCL_STOP //--------------------------------------------------------------------------// // CRURefreshSQLComposer::GetContextLogName() @@ -378,7 +372,6 @@ void CRURefreshSQLComposer::ComposeDeleteContextLogTable() // // //--------------------------------------------------------------------------// -// LCOV_EXCL_START :rfi void CRURefreshSQLComposer::ComposeControlQueryShape() { RUASSERT(NULL != GetRootMV().GetMVForceOption()); @@ -389,7 +382,6 @@ void CRURefreshSQLComposer::ComposeControlQueryShape() sql_ += ";"; } -// LCOV_EXCL_STOP //--------------------------------------------------------------------------// // CRURefreshSQLComposer::ComposeQueryShape() @@ -408,7 +400,6 @@ void CRURefreshSQLComposer::ComposeControlQueryShape() // We allow the user to force the join between the MV and the GROUP BY // block and the GROUP BY node above the DELTA CALCULATION sub-tree //--------------------------------------------------------------------------// -// LCOV_EXCL_START :rfi void CRURefreshSQLComposer::ComposeQueryShape() { CDSString grbyStr,joinStr; @@ -451,23 +442,19 @@ void CRURefreshSQLComposer::ComposeQueryShape() sql_ += " JOIN( " + joinStr + grbyStr + ",CUT),CUT)"; } -// LCOV_EXCL_STOP //--------------------------------------------------------------------------// // CRURefreshSQLComposer::ComposeControlQueryShapeCut() //--------------------------------------------------------------------------// -// LCOV_EXCL_START :rfi void CRURefreshSQLComposer::ComposeControlQueryShapeCut() { sql_ = "CONTROL QUERY SHAPE CUT;"; } -// LCOV_EXCL_STOP //--------------------------------------------------------------------------// // CRURefreshSQLComposer::ComposeControlQueryShapeCut() // //--------------------------------------------------------------------------// -// LCOV_EXCL_START :rfi void CRURefreshSQLComposer::ComposeShowExplain() { sql_ = "INSERT INTO "; @@ -487,7 +474,6 @@ void CRURefreshSQLComposer::ComposeShowExplain() sql_ += "SUBSTRING(DESCRIPTION,1,2024)"; sql_ += " FROM TABLE(EXPLAIN(NULL,'DESCRIPTOR_FOR_SQLSTMT'));"; } -// LCOV_EXCL_STOP /* // This is the definition of the table in which the explain data is inserted http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/refresh/RuRefreshTaskExecutor.cpp ---------------------------------------------------------------------- diff --git a/core/sql/refresh/RuRefreshTaskExecutor.cpp b/core/sql/refresh/RuRefreshTaskExecutor.cpp index 343d8d2..aca1c64 100644 --- a/core/sql/refresh/RuRefreshTaskExecutor.cpp +++ b/core/sql/refresh/RuRefreshTaskExecutor.cpp @@ -78,7 +78,6 @@ CRURefreshTaskExecutor::~CRURefreshTaskExecutor() //--------------------------------------------------------------------------// // CRURefreshTaskExecutor::StoreRequest() //--------------------------------------------------------------------------// -// LCOV_EXCL_START :cnu void CRURefreshTaskExecutor:: StoreRequest(CUOFsIpcMessageTranslator &translator) { @@ -134,12 +133,10 @@ void CRURefreshTaskExecutor:: } } -// LCOV_EXCL_STOP //--------------------------------------------------------------------------// // CRURefreshTaskExecutor::StoreReply() //--------------------------------------------------------------------------// -// LCOV_EXCL_START :cnu void CRURefreshTaskExecutor:: StoreReply(CUOFsIpcMessageTranslator &translator) { @@ -147,12 +144,10 @@ void CRURefreshTaskExecutor:: translator.WriteBlock(&isRecompute_,sizeof(BOOL)); } -// LCOV_EXCL_STOP //--------------------------------------------------------------------------// // CRURefreshTaskExecutor::LoadRequest() //--------------------------------------------------------------------------// -// LCOV_EXCL_START :cnu void CRURefreshTaskExecutor:: LoadRequest(CUOFsIpcMessageTranslator &translator) { @@ -212,12 +207,10 @@ void CRURefreshTaskExecutor:: tableLockProtocol_->LoadData(translator); } } -// LCOV_EXCL_STOP //--------------------------------------------------------------------------// // CRURefreshTaskExecutor::LoadReply() //--------------------------------------------------------------------------// -// LCOV_EXCL_START :cnu void CRURefreshTaskExecutor:: LoadReply(CUOFsIpcMessageTranslator &translator) { @@ -225,7 +218,6 @@ void CRURefreshTaskExecutor:: translator.ReadBlock(&isRecompute_,sizeof(BOOL)); } -// LCOV_EXCL_STOP //--------------------------------------------------------------------------// // CRURefreshTaskExecutor::Init() @@ -291,7 +283,6 @@ void CRURefreshTaskExecutor::ComposeForceStatements() CRURefreshSQLComposer myComposer(GetRefreshTask()); // Deal with explain data - // LCOV_EXCL_START :rfi if (NULL != pForceOption && CRUForceOptions::EXPLAIN_ON == pForceOption->GetExplainOption()) { @@ -299,7 +290,6 @@ void CRURefreshTaskExecutor::ComposeForceStatements() myComposer.ComposeShowExplain(); pRefreshTEDynamicContainer_->SetStatementText(SHOW_EXPLAIN, myComposer.GetSQL()); } - // LCOV_EXCL_STOP ComposeCQSStatements(); @@ -324,7 +314,6 @@ void CRURefreshTaskExecutor::ComposeMDAMStatements() ComposeControlTableStmtForUsedTables(); // MV base tables force options - // LCOV_EXCL_START :rfi if (NULL != pForceOption && CRUForceOptions::MDAM_NO_FORCE != pForceOption->GetMDAMoption()) { @@ -343,7 +332,6 @@ void CRURefreshTaskExecutor::ComposeMDAMStatements() myComposer.ComposeResetCntrlTableMDAMText(); pRefreshTEDynamicContainer_->SetStatementText(RESET_MDAM_STAT, myComposer.GetSQL()); } - // LCOV_EXCL_STOP } //--------------------------------------------------------------------------// @@ -365,7 +353,6 @@ void CRURefreshTaskExecutor::ComposeCQSStatements() } // MV force options - // LCOV_EXCL_START :rfi if ((CRUForceOptions::GB_NO_FORCE != pForceOption->GetGroupByoption() || CRUForceOptions::JOIN_NO_FORCE != pForceOption->GetJoinoption())) { @@ -390,7 +377,6 @@ void CRURefreshTaskExecutor::ComposeCQSStatements() myComposer.ComposeControlQueryShapeCut(); pRefreshTEDynamicContainer_->SetStatementText(CQS_CUT_STAT, myComposer.GetSQL()); } - // LCOV_EXCL_STOP } //--------------------------------------------------------------------------// @@ -398,7 +384,6 @@ void CRURefreshTaskExecutor::ComposeCQSStatements() // // Compose the Control MDAM option for all base tables for forced tables //--------------------------------------------------------------------------// -// LCOV_EXCL_START :rfi void CRURefreshTaskExecutor::ComposeControlTableStmtForUsedTables() { CRUMV &rootMV = GetRefreshTask()->GetRootMV(); @@ -430,7 +415,6 @@ void CRURefreshTaskExecutor::ComposeControlTableStmtForUsedTables() ComposeControlTableStmtForUsedTable(*pTbl,stmtIndex,mdamOpt); } } -// LCOV_EXCL_STOP //--------------------------------------------------------------------------// // CRURefreshTaskExecutor::ComposeControlTableStmtForUsedTables() @@ -1039,7 +1023,6 @@ void CRURefreshTaskExecutor::ApplyIRCompilerDefaults() return; } - // LCOV_EXCL_START :rfi RUASSERT(NULL != pRefreshTEDynamicContainer_); @@ -1091,7 +1074,6 @@ void CRURefreshTaskExecutor::ApplyIRCompilerDefaults() #pragma warn(1506) // warning elimination } } - // LCOV_EXCL_STOP } //--------------------------------------------------------------------------// @@ -1137,7 +1119,6 @@ void CRURefreshTaskExecutor::SetAllowOfflineAccess() void CRURefreshTaskExecutor::ResetIRCompilerDefaults() { - // LCOV_EXCL_START :rfi if ((FORCE_CQS & forceFlags_) || (FORCE_USER_CQS & forceFlags_)) { CDMPreparedStatement *pStat = pRefreshTEDynamicContainer_-> @@ -1154,7 +1135,6 @@ void CRURefreshTaskExecutor::ResetIRCompilerDefaults() ExecuteStatement(*pStat,RESET_MDAM_STAT); } - // LCOV_EXCL_STOP } //--------------------------------------------------------------------------// @@ -1314,7 +1294,6 @@ void CRUTableLockProtocol::Init(CRUTblList &tblList, // CRUTableLockProtocol::StoreData() // //--------------------------------------------------------------------------// -// LCOV_EXCL_START :cnu void CRUTableLockProtocol::StoreData(CUOFsIpcMessageTranslator &translator) { // Store the NothingToLock_ flag @@ -1336,13 +1315,11 @@ void CRUTableLockProtocol::StoreData(CUOFsIpcMessageTranslator &translator) } } -// LCOV_EXCL_STOP //--------------------------------------------------------------------------// // CRUTableLockProtocol::LoadData() // //--------------------------------------------------------------------------// -// LCOV_EXCL_START :cnu void CRUTableLockProtocol::LoadData(CUOFsIpcMessageTranslator &translator) { // Load the NothingToLock_ flag @@ -1366,7 +1343,6 @@ void CRUTableLockProtocol::LoadData(CUOFsIpcMessageTranslator &translator) } } -// LCOV_EXCL_STOP //--------------------------------------------------------------------------// // CRUTableLockProtocol::IsEnsureUsedTableLockContinuityNeeded() http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/refresh/RuSQLStatementContainer.cpp ---------------------------------------------------------------------- diff --git a/core/sql/refresh/RuSQLStatementContainer.cpp b/core/sql/refresh/RuSQLStatementContainer.cpp index cbd6058..e36abd5 100644 --- a/core/sql/refresh/RuSQLStatementContainer.cpp +++ b/core/sql/refresh/RuSQLStatementContainer.cpp @@ -47,7 +47,6 @@ //--------------------------------------------------------------------------// // CRUSQLStatementContainer::StoreData() //--------------------------------------------------------------------------// -// LCOV_EXCL_START :cnu void CRUSQLStatementContainer:: StoreData(CUOFsIpcMessageTranslator &translator) { @@ -62,12 +61,10 @@ StoreData(CUOFsIpcMessageTranslator &translator) #pragma warn(1506) // warning elimination } } -// LCOV_EXCL_STOP //--------------------------------------------------------------------------// // CRUSQLStatementContainer::LoadData() //--------------------------------------------------------------------------// -// LCOV_EXCL_START :cnu void CRUSQLStatementContainer:: LoadData(CUOFsIpcMessageTranslator &translator) { @@ -84,29 +81,24 @@ void CRUSQLStatementContainer:: #pragma warn(1506) // warning elimination } } -// LCOV_EXCL_STOP //--------------------------------------------------------------------------// // CRUSQLStatementContainer::Stmt::StoreData() //--------------------------------------------------------------------------// -// LCOV_EXCL_START :cnu void CRUSQLStatementContainer::Stmt:: StoreData(CUOFsIpcMessageTranslator &translator) { translator.WriteBlock(&executionCounter_,sizeof(Lng32)); } -// LCOV_EXCL_STOP //--------------------------------------------------------------------------// // CRUSQLStatementContainer::Stmt::LoadData() //--------------------------------------------------------------------------// -// LCOV_EXCL_START :cnu void CRUSQLStatementContainer::Stmt:: LoadData(CUOFsIpcMessageTranslator &translator) { translator.ReadBlock(&executionCounter_,sizeof(Lng32)); } -// LCOV_EXCL_STOP //--------------------------------------------------------------------------// // CRUSQLStatementContainer::Stmt::ExecuteQuery() http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/refresh/RuSimpleRefreshTaskExecutor.cpp ---------------------------------------------------------------------- diff --git a/core/sql/refresh/RuSimpleRefreshTaskExecutor.cpp b/core/sql/refresh/RuSimpleRefreshTaskExecutor.cpp index 70f041c..f369ef6 100644 --- a/core/sql/refresh/RuSimpleRefreshTaskExecutor.cpp +++ b/core/sql/refresh/RuSimpleRefreshTaskExecutor.cpp @@ -60,7 +60,6 @@ CRUSimpleRefreshTaskExecutor(CRURefreshTask *pParentTask) : //--------------------------------------------------------------------------// // CRUSimpleRefreshTaskExecutor::StoreRequest() //--------------------------------------------------------------------------// -// LCOV_EXCL_START :cnu void CRUSimpleRefreshTaskExecutor:: StoreRequest(CUOFsIpcMessageTranslator &translator) { @@ -72,12 +71,10 @@ void CRUSimpleRefreshTaskExecutor:: // Handle refresh executor sql dynamic container simpleRefreshTEDynamicContainer_.StoreData(translator); } -// LCOV_EXCL_STOP //--------------------------------------------------------------------------// // CRUSimpleRefreshTaskExecutor::StoreReply() //--------------------------------------------------------------------------// -// LCOV_EXCL_START :cnu void CRUSimpleRefreshTaskExecutor:: StoreReply(CUOFsIpcMessageTranslator &translator) { @@ -86,12 +83,10 @@ void CRUSimpleRefreshTaskExecutor:: // Handle numOfPhases_ data member translator.WriteBlock(&numOfPhases_,sizeof(short)); } -// LCOV_EXCL_STOP //--------------------------------------------------------------------------// // CRUSimpleRefreshTaskExecutor::LoadRequest() //--------------------------------------------------------------------------// -// LCOV_EXCL_START :cnu void CRUSimpleRefreshTaskExecutor:: LoadRequest(CUOFsIpcMessageTranslator &translator) { @@ -103,12 +98,10 @@ void CRUSimpleRefreshTaskExecutor:: // Handle refresh executor sql dynamic container simpleRefreshTEDynamicContainer_.LoadData(translator); } -// LCOV_EXCL_STOP //--------------------------------------------------------------------------// // CRUSimpleRefreshTaskExecutor::LoadReply() //--------------------------------------------------------------------------// -// LCOV_EXCL_START :cnu void CRUSimpleRefreshTaskExecutor:: LoadReply(CUOFsIpcMessageTranslator &translator) { @@ -117,7 +110,6 @@ void CRUSimpleRefreshTaskExecutor:: // Handle numOfPhases_ data member translator.ReadBlock(&numOfPhases_,sizeof(short)); } -// LCOV_EXCL_STOP //--------------------------------------------------------------------------// // CRUSimpleRefreshTaskExecutor::Init() @@ -197,7 +189,6 @@ void CRUSimpleRefreshTaskExecutor::ComposeMySql() // (an MV with min/max on non insert only tables may require this method). // //--------------------------------------------------------------------------// -// LCOV_EXCL_START :rfi void CRUSimpleRefreshTaskExecutor::HandleSqlError(CDSException &ex, Lng32 errorCode, const char *errorArgument) @@ -209,7 +200,6 @@ void CRUSimpleRefreshTaskExecutor::HandleSqlError(CDSException &ex, inherited::HandleSqlError(ex,errorCode,errorArgument); } -// LCOV_EXCL_STOP //--------------------------------------------------------------------------// // CRUSimpleRefreshTaskExecutor::PrepareRecomputeMV() @@ -392,7 +382,6 @@ BOOL CRUSimpleRefreshTaskExecutor:: pStat = simpleRefreshTEDynamicContainer_. GetPreparedStatement(INTERNAL_REFRESH, FALSE); } - // LCOV_EXCL_START :rfi catch (CDSException &ex) { if (ex.GetErrorCode(0) == MIN_MAX_RECOMPUTATION_NEEDED || @@ -408,7 +397,6 @@ BOOL CRUSimpleRefreshTaskExecutor:: GetLastSQL(INTERNAL_REFRESH)); throw ex; // Re-throw } - // LCOV_EXCL_STOP if (TRUE == pStat->HasWarning() ) { http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/refresh/RuTableSyncTaskExecutor.h ---------------------------------------------------------------------- diff --git a/core/sql/refresh/RuTableSyncTaskExecutor.h b/core/sql/refresh/RuTableSyncTaskExecutor.h index f609d50..ddde509 100644 --- a/core/sql/refresh/RuTableSyncTaskExecutor.h +++ b/core/sql/refresh/RuTableSyncTaskExecutor.h @@ -78,7 +78,6 @@ public: public: // These functions serialize/de-serialize the executor's context // for the message communication with the remote server process - // LCOV_EXCL_START :cnu // Used in the main process side virtual void StoreRequest(CUOFsIpcMessageTranslator &translator); @@ -93,7 +92,6 @@ public: { inherited::StoreReply(translator); } - // LCOV_EXCL_STOP public: //-- Implementation of pure virtual functions http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/refresh/RuTask.cpp ---------------------------------------------------------------------- diff --git a/core/sql/refresh/RuTask.cpp b/core/sql/refresh/RuTask.cpp index bbfc863..4fc5bf3 100644 --- a/core/sql/refresh/RuTask.cpp +++ b/core/sql/refresh/RuTask.cpp @@ -89,7 +89,6 @@ CRUTask::~CRUTask() // // Prints the "standard" task's dump //--------------------------------------------------------------------------// -// LCOV_EXCL_START :dpm void CRUTask::Dump(CDSString &to) { char idStr[10]; @@ -115,7 +114,6 @@ void CRUTask::Dump(CDSString &to) } } } -// LCOV_EXCL_STOP //--------------------------------------------------------------------------// // CRUTask::DumpGraphNode() @@ -125,7 +123,6 @@ void CRUTask::Dump(CDSString &to) // Prints the task's node dump acceptable for the Dotty GUI //--------------------------------------------------------------------------// -// LCOV_EXCL_START :dpm void CRUTask::DumpGraphNode(CDSString &to) { char fromChr[10]; @@ -178,7 +175,6 @@ void CRUTask::DumpGraphNode(CDSString &to) } to += "];\n"; } -// LCOV_EXCL_STOP //--------------------------------------------------------------------------// // CRUTask::DumpGraphNode() @@ -188,7 +184,6 @@ void CRUTask::DumpGraphNode(CDSString &to) // Prints the task's edges dump acceptable for the Dotty GUI // //--------------------------------------------------------------------------// -// LCOV_EXCL_START :dpm void CRUTask::DumpGraphEdges(CDSString &to) { if (0 == pSuccList_->GetCount()) @@ -211,7 +206,6 @@ void CRUTask::DumpGraphEdges(CDSString &to) } } #endif -// LCOV_EXCL_STOP //--------------------------------------------------------------------------// // MUTATORS http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/refresh/RuTaskExecutor.cpp ---------------------------------------------------------------------- diff --git a/core/sql/refresh/RuTaskExecutor.cpp b/core/sql/refresh/RuTaskExecutor.cpp index a47d6da..e039cc5 100644 --- a/core/sql/refresh/RuTaskExecutor.cpp +++ b/core/sql/refresh/RuTaskExecutor.cpp @@ -170,14 +170,12 @@ void CRUTaskExecutor::RollbackTransaction() SetTransIdx(-1); } - // LCOV_EXCL_START :rfi catch(...) { SetTransIdx(-1); // If the system has already aborted the transaction // by itself - do nothing } - // LCOV_EXCL_STOP } //--------------------------------------------------------------------------// @@ -211,26 +209,22 @@ void CRUTaskExecutor::LeaveTransaction() //--------------------------------------------------------------------------// // CRUTaskExecutor::StoreData() //--------------------------------------------------------------------------// -// LCOV_EXCL_START :cnu void CRUTaskExecutor:: StoreData(CUOFsIpcMessageTranslator &translator) { translator.WriteBlock(&state_,sizeof(Lng32)); translator.WriteBlock(&processId_,sizeof(Lng32)); } -// LCOV_EXCL_STOP //--------------------------------------------------------------------------// // CRUTaskExecutor::LoadData() //--------------------------------------------------------------------------// -// LCOV_EXCL_START :cnu void CRUTaskExecutor:: LoadData(CUOFsIpcMessageTranslator &translator) { translator.ReadBlock(&state_,sizeof(Lng32)); translator.ReadBlock(&processId_,sizeof(Lng32)); } -// LCOV_EXCL_STOP //--------------------------------------------------------------------------// // CRUTaskExecutor::AllocateBuffer() @@ -247,7 +241,6 @@ void CRUTaskExecutor::AllocateBuffer() Lng32 bufsize = GetIpcBufferSize(); #ifdef _DEBUG - // LCOV_EXCL_START :dpm // Force here an artificially small buffer size for testing purposes enum { MIN_BUFFER_SIZE = 50 }; @@ -260,7 +253,6 @@ void CRUTaskExecutor::AllocateBuffer() { bufsize = MIN_BUFFER_SIZE; } - // LCOV_EXCL_STOP #endif CreateBufferAndTranslator(bufsize); @@ -378,7 +370,6 @@ ExecuteStatement(CDMPreparedStatement &stmt, // error code and (optionally) a string argument. // //--------------------------------------------------------------------------// -// LCOV_EXCL_START :rfi void CRUTaskExecutor::HandleSqlError(CDSException &ex, Lng32 errorCode, const char *errorArgument) @@ -392,7 +383,6 @@ void CRUTaskExecutor::HandleSqlError(CDSException &ex, throw ex; // Re-throw } -// LCOV_EXCL_STOP //--------------------------------------------------------------------------// // CRUTaskExecutor::CreateBufferAndTranslator() http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/refresh/RuTaskExecutor.h ---------------------------------------------------------------------- diff --git a/core/sql/refresh/RuTaskExecutor.h b/core/sql/refresh/RuTaskExecutor.h index bf2d227..a087b41 100644 --- a/core/sql/refresh/RuTaskExecutor.h +++ b/core/sql/refresh/RuTaskExecutor.h @@ -305,7 +305,6 @@ private: Lng32 processId_; }; -// LCOV_EXCL_START :cnu void CRUTaskExecutor::StoreRequest(CUOFsIpcMessageTranslator &translator) { StoreData(translator); @@ -326,6 +325,5 @@ void CRUTaskExecutor::StoreReply(CUOFsIpcMessageTranslator &translator) { StoreData(translator); } -// LCOV_EXCL_STOP #endif http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/refresh/RuTaskServerExecControler.cpp ---------------------------------------------------------------------- diff --git a/core/sql/refresh/RuTaskServerExecControler.cpp b/core/sql/refresh/RuTaskServerExecControler.cpp index 98fb89d..1bf898c 100644 --- a/core/sql/refresh/RuTaskServerExecControler.cpp +++ b/core/sql/refresh/RuTaskServerExecControler.cpp @@ -73,7 +73,6 @@ static void DisplayDebugBox(Int32 num) #endif // This class is not used at all. -// LCOV_EXCL_START :cnu //--------------------------------------------------------------------------// // CRUTaskServerExecController constructors & destructors @@ -433,4 +432,3 @@ void CRUTaskServerExecController::logError(CDSException &ex) #endif -// LCOV_EXCL_STOP http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/refresh/RuTbl.cpp ---------------------------------------------------------------------- diff --git a/core/sql/refresh/RuTbl.cpp b/core/sql/refresh/RuTbl.cpp index 8ff9ac6..af056d0 100644 --- a/core/sql/refresh/RuTbl.cpp +++ b/core/sql/refresh/RuTbl.cpp @@ -272,7 +272,6 @@ BOOL CRUTbl::IsUsedOnlyByMultiTxnMvs() const //------------------------------------------------------------------------// // CRUTbl::Dump() //------------------------------------------------------------------------// -// LCOV_EXCL_START :dpb void CRUTbl::Dump(CDSString &to, BOOL isExtended) { char statusStr[10]; @@ -301,7 +300,6 @@ void CRUTbl::Dump(CDSString &to, BOOL isExtended) to += "\t" + (pMV->GetFullName()) + "\n"; } } -// LCOV_EXCL_STOP #endif //------------------------------------------------------------------------// http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/refresh/RuTestTaskExecutor.cpp ---------------------------------------------------------------------- diff --git a/core/sql/refresh/RuTestTaskExecutor.cpp b/core/sql/refresh/RuTestTaskExecutor.cpp index a978209..010e1d7 100644 --- a/core/sql/refresh/RuTestTaskExecutor.cpp +++ b/core/sql/refresh/RuTestTaskExecutor.cpp @@ -43,7 +43,6 @@ #include "RuSQLComposer.h" #include "uofsIpcMessageTranslator.h" -// LCOV_EXCL_START :rfi //--------------------------------------------------------------------------// // CRUTestTaskExecutor::Work() @@ -363,4 +362,3 @@ void CRUTestTaskExecutor:: translator.ReadBlock(&groupId_,sizeof(Int32)); } -// LCOV_EXCL_STOP http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/refresh/RuTestTaskExecutor.h ---------------------------------------------------------------------- diff --git a/core/sql/refresh/RuTestTaskExecutor.h b/core/sql/refresh/RuTestTaskExecutor.h index 8e79a0e..368b078 100644 --- a/core/sql/refresh/RuTestTaskExecutor.h +++ b/core/sql/refresh/RuTestTaskExecutor.h @@ -42,7 +42,6 @@ #include "RuTaskExecutor.h" #include "RuSQLDynamicStatementContainer.h" -// LCOV_EXCL_START :rfi class REFRESH_LIB_CLASS CRUTestTaskExecutor : public CRUTaskExecutor { @@ -171,6 +170,5 @@ private: CRUSQLDynamicStatementContainer errorDynamicSQLContainer_; }; -// LCOV_EXCL_STOP #endif http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/refresh/RuUnAuditRefreshTaskExecutor.h ---------------------------------------------------------------------- diff --git a/core/sql/refresh/RuUnAuditRefreshTaskExecutor.h b/core/sql/refresh/RuUnAuditRefreshTaskExecutor.h index 02fe174..68d6d73 100644 --- a/core/sql/refresh/RuUnAuditRefreshTaskExecutor.h +++ b/core/sql/refresh/RuUnAuditRefreshTaskExecutor.h @@ -96,7 +96,6 @@ public: public: // These functions serialize/de-serialize the executor's context // for the message communication with the remote server process - // LCOV_EXCL_START :cnu // Used at the main process side virtual void StoreRequest(CUOFsIpcMessageTranslator &translator); @@ -111,7 +110,6 @@ public: { inherited::StoreReply(translator); } - // LCOV_EXCL_STOP //----------------------------------// // Private Members http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/runtimestats/RtsStubs.cpp ---------------------------------------------------------------------- diff --git a/core/sql/runtimestats/RtsStubs.cpp b/core/sql/runtimestats/RtsStubs.cpp index 143299e..e5e33e4 100644 --- a/core/sql/runtimestats/RtsStubs.cpp +++ b/core/sql/runtimestats/RtsStubs.cpp @@ -36,7 +36,6 @@ #include "ex_ex.h" // Turn off code coverage collection for these stubs. -// LCOV_EXCL_START extern "C" { void unpackObj__13UdrMessageObjFlT1iUlPCc() { ex_assert(0, "Entering stub unpackObj__13UdrMessageObjFlT1iUlPCc"); @@ -686,7 +685,6 @@ void CmpAssertInternal(const char*, const char*, Int32) { ex_assert(0, "Entering stub CmpAssertInternal(const char*, const char*, int)"); } -// LCOV_EXCL_STOP void NA_MM_FreeMemory_(char *startAddr, Int32 byteCount) { // do nothing and do not assert here. http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/runtimestats/sscpipc.cpp ---------------------------------------------------------------------- diff --git a/core/sql/runtimestats/sscpipc.cpp b/core/sql/runtimestats/sscpipc.cpp index 7c678c5..16d5d60 100755 --- a/core/sql/runtimestats/sscpipc.cpp +++ b/core/sql/runtimestats/sscpipc.cpp @@ -107,12 +107,10 @@ SscpGlobals::SscpGlobals(NAHeap *sscpheap, StatsGlobals *statsGlobals) doLogCancelKillServers_ = true; } -// LCOV_EXCL_START SscpGlobals::~SscpGlobals() { sem_close((sem_t *)semId_); } -// LCOV_EXCL_STOP void SscpGuaReceiveControlConnection::actOnSystemMessage( short messageNum, http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/smdio/vers_libsmdio.cpp ---------------------------------------------------------------------- diff --git a/core/sql/smdio/vers_libsmdio.cpp b/core/sql/smdio/vers_libsmdio.cpp index b547d0c..a813580 100644 --- a/core/sql/smdio/vers_libsmdio.cpp +++ b/core/sql/smdio/vers_libsmdio.cpp @@ -26,6 +26,4 @@ #define VERS_CV_MIN 0 #define VERS_CV_UPD 1 -// LCOV_EXCL_START VERS_LIB(libsmdio) -// LCOV_EXCL_STOP http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/sort/DiskPool_sq.h ---------------------------------------------------------------------- diff --git a/core/sql/sort/DiskPool_sq.h b/core/sql/sort/DiskPool_sq.h index ce4cc73..588348c 100644 --- a/core/sql/sort/DiskPool_sq.h +++ b/core/sql/sort/DiskPool_sq.h @@ -49,7 +49,6 @@ public: unsigned short threshold ); -// LCOV_EXCL_START #ifdef FORDEBUG virtual NABoolean printDiskTable(){return TRUE;}; @@ -61,7 +60,6 @@ private: virtual NABoolean refreshDisk(DiskDetails *diskPtr){ return TRUE;}; virtual NABoolean computeNumScratchFiles(DiskDetails *diskptr ){return TRUE;}; -// LCOV_EXCL_STOP short factorImportanceTotalFreeSpace_; short factorImportanceNumScrFiles_; http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/sort/ScratchFileConnection.h ---------------------------------------------------------------------- diff --git a/core/sql/sort/ScratchFileConnection.h b/core/sql/sort/ScratchFileConnection.h index d413f1f..9c74004 100644 --- a/core/sql/sort/ScratchFileConnection.h +++ b/core/sql/sort/ScratchFileConnection.h @@ -44,7 +44,6 @@ class ex_queue; #include "ExScheduler.h" class ScratchFile; -// LCOV_EXCL_START class ScratchFileConnection: public IpcConnection { public : @@ -78,5 +77,4 @@ private: NABoolean isWriteIO_; // Indicates if read or write IO Int32 fileIndex_; //Corresponds to a perticular open on the scratch file among multiple opens. }; -// LCOV_EXCL_STOP #endif http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/sort/SortUtil.cpp ---------------------------------------------------------------------- diff --git a/core/sql/sort/SortUtil.cpp b/core/sql/sort/SortUtil.cpp index 722c60b..97a7141 100644 --- a/core/sql/sort/SortUtil.cpp +++ b/core/sql/sort/SortUtil.cpp @@ -928,7 +928,6 @@ NABoolean SortUtil::consumeMemoryQuota(UInt32 bufferSizeBytes) { return FALSE; } -// LCOV_EXCL_START //artificially increase the quota before pressure check. //if pressure is detected, decrement the quota back. config_->memoryQuotaMB_ += (short)memNeededMB; @@ -951,7 +950,6 @@ NABoolean SortUtil::consumeMemoryQuota(UInt32 bufferSizeBytes) config_->memoryQuotaMB_ -= (short)memNeededMB; } } -// LCOV_EXCL_STOP return FALSE;//memory grab failed or reached limit. } @@ -1051,7 +1049,6 @@ NABoolean SortUtil::withinMemoryLimitsAndPressure(Int64 reqMembytes) size_t lastSegSize, freeSize, totalSize; if((config_->heapAddr_)->getUsage(&lastSegSize, &freeSize, &totalSize)) { -// LCOV_EXCL_START if(config_->logInfoEvent()) { char msg[500]; @@ -1062,16 +1059,13 @@ NABoolean SortUtil::withinMemoryLimitsAndPressure(Int64 reqMembytes) SQLMXLoggingArea::logExecRtInfo(NULL, 0,msg, explainNodeId_); } return FALSE; -// LCOV_EXCL_STOP } */ if(!memMonitor_) { -// LCOV_EXCL_START memMonitor_ = config_->callingTcb_->getGlobals()->castToExExeStmtGlobals()->getMemoryMonitor(); ex_assert(memMonitor_ != NULL, "SortUtil::withinMemoryLimitsAndPressure, memMonitor_ is NULL"); -// LCOV_EXCL_STOP } @@ -1149,7 +1143,6 @@ if(!config_->getDisableCmpHintsOverflow()) //check extreme case first. Expected cannot be more than //available quota. if( E > config_->memoryQuotaMB_) -// LCOV_EXCL_LINE return FALSE; #endif @@ -1162,10 +1155,8 @@ if(!config_->getDisableCmpHintsOverflow()) //large delta memory requirement for sort, which in essence may trigger overflow. if(C > E) //already { -// LCOV_EXCL_START E = MAXOF( E, C *( 1 + estimateErrorPenalty)); config_->setSortMemEstInKBPerNode(E * 1024); -// LCOV_EXCL_STOP } Float32 m = E - C; //delta memory required to avoid overflow. @@ -1174,7 +1165,6 @@ if(!config_->getDisableCmpHintsOverflow()) //overflow. if( m > ( Z * (M -U))) { -// LCOV_EXCL_START if(config_->logInfoEvent()) { char msg[500]; @@ -1185,7 +1175,6 @@ if(!config_->getDisableCmpHintsOverflow()) SQLMXLoggingArea::logExecRtInfo(NULL, 0,msg, explainNodeId_); } return FALSE; -// LCOV_EXCL_STOP } } else @@ -1197,7 +1186,6 @@ if(!config_->getDisableCmpHintsOverflow()) if( m > ( Z * (M - U))) { -// LCOV_EXCL_START if(config_->logInfoEvent()) { char msg[500]; @@ -1208,14 +1196,12 @@ if(!config_->getDisableCmpHintsOverflow()) SQLMXLoggingArea::logExecRtInfo(NULL, 0,msg, explainNodeId_); } return FALSE; -// LCOV_EXCL_STOP } } } if(memMonitor_->memoryPressure() > config_->pressureThreshold_) { -// LCOV_EXCL_START if(config_->logInfoEvent()) { char msg[500]; @@ -1226,7 +1212,6 @@ if(!config_->getDisableCmpHintsOverflow()) SQLMXLoggingArea::logExecRtInfo(NULL, 0,msg, explainNodeId_); } return FALSE; -// LCOV_EXCL_STOP } //The following checks any threshold limits set by the user. This http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/sort/Statistics.cpp ---------------------------------------------------------------------- diff --git a/core/sql/sort/Statistics.cpp b/core/sql/sort/Statistics.cpp index d429f24..b0e7a25 100644 --- a/core/sql/sort/Statistics.cpp +++ b/core/sql/sort/Statistics.cpp @@ -79,7 +79,6 @@ Lng32 SortStatistics::getStatNumRuns() const } -// LCOV_EXCL_START Lng32 SortStatistics::getStatMemSizeB() const { @@ -173,7 +172,6 @@ Lng32 SortStatistics::getStatScrAwaitIo() const return scrNumAwaitio_; } -// LCOV_EXCL_STOP http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/sort/TourTree.cpp ---------------------------------------------------------------------- diff --git a/core/sql/sort/TourTree.cpp b/core/sql/sort/TourTree.cpp index 04e4674..6f284ad 100644 --- a/core/sql/sort/TourTree.cpp +++ b/core/sql/sort/TourTree.cpp @@ -418,7 +418,6 @@ Lng32 Tree::generateInterRuns() } // **********************UNUSED METHODS ******************************** -// LCOV_EXCL_START Lng32 Tree::sortClientOutOfMem(void) { @@ -507,7 +506,6 @@ UInt32 Tree::getOverheadPerRecord(void) return(2 * (sizeof(TreeNode) + sizeof(Record))); } -// LCOV_EXCL_STOP http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/sort/scratchfileconnection.cpp ---------------------------------------------------------------------- diff --git a/core/sql/sort/scratchfileconnection.cpp b/core/sql/sort/scratchfileconnection.cpp index 99003c2..de9dfc6 100644 --- a/core/sql/sort/scratchfileconnection.cpp +++ b/core/sql/sort/scratchfileconnection.cpp @@ -45,7 +45,6 @@ $ #include "ScratchFileConnection.h" #include "ex_ex.h" -// LCOV_EXCL_START ScratchFileConnection::ScratchFileConnection(Int32 index, ScratchFile *sf, ExSubtask *eventHandler, IpcEnvironment *env, @@ -151,4 +150,3 @@ void ScratchFileConnection::populateDiagsArea(ComDiagsArea *&, CollHeap *) ex_assert(0,"Should never call SqlTableConnection::populateDiagsArea()"); } -// LCOV_EXCL_STOP http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/sort/vers_libsort.cpp ---------------------------------------------------------------------- diff --git a/core/sql/sort/vers_libsort.cpp b/core/sql/sort/vers_libsort.cpp index 1c8a77e..1d3d8f0 100644 --- a/core/sql/sort/vers_libsort.cpp +++ b/core/sql/sort/vers_libsort.cpp @@ -26,6 +26,4 @@ #define VERS_CV_MIN 0 #define VERS_CV_UPD 1 -// LCOV_EXCL_START VERS_LIB(libsort) -// LCOV_EXCL_STOP http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/sqlcomp/CmpDescribe.cpp ---------------------------------------------------------------------- diff --git a/core/sql/sqlcomp/CmpDescribe.cpp b/core/sql/sqlcomp/CmpDescribe.cpp index cccdf6c..f6d82cf 100644 --- a/core/sql/sqlcomp/CmpDescribe.cpp +++ b/core/sql/sqlcomp/CmpDescribe.cpp @@ -1096,7 +1096,6 @@ short CmpDescribe(const char *query, const RelExpr *queryExpr, } // end of try block - // LCOV_EXCL_START // exception handling catch(...) { @@ -1111,7 +1110,6 @@ short CmpDescribe(const char *query, const RelExpr *queryExpr, } rc = -1; } - // LCOV_EXCL_STOP finally: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/sqlcomp/CmpMain.cpp ---------------------------------------------------------------------- diff --git a/core/sql/sqlcomp/CmpMain.cpp b/core/sql/sqlcomp/CmpMain.cpp index 64cf37b..b7b8851 100644 --- a/core/sql/sqlcomp/CmpMain.cpp +++ b/core/sql/sqlcomp/CmpMain.cpp @@ -269,7 +269,6 @@ void CmpMain::initGuiDisplay(RelExpr *queryExpr) const char *txt, RelExpr *queryExpr ) { - // LCOV_EXCL_START // for NSK only if (( CmpCommon::getDefault(NSK_DBG) == DF_ON ) && ( CmpCommon::getDefault(nadef) == DF_ON )) @@ -278,7 +277,6 @@ void CmpMain::initGuiDisplay(RelExpr *queryExpr) CURRCONTEXT_OPTDEBUG->showTree( queryExpr, NULL, " " ); CURRCONTEXT_OPTDEBUG->stream() << endl; } - // LCOV_EXCL_STOP } #ifdef NA_DEBUG_GUI @@ -1813,7 +1811,7 @@ CmpMain::ReturnStatus CmpMain::compile(const char *input_str, //IN if (useQueryCache != NOCACHE && CmpCommon::getDefault(NSK_DBG) == DF_ON) { - useQueryCache = NOCACHE; // LCOV_EXCL_LINE + useQueryCache = NOCACHE; } // Every compile goes through here so we are guranteed that the @@ -1958,7 +1956,6 @@ CmpMain::ReturnStatus CmpMain::compile(const char *input_str, //IN } #endif - // LCOV_EXCL_START // for NSK only if ( CmpCommon::getDefault(NSK_DBG) == DF_ON ) { @@ -1993,7 +1990,6 @@ CmpMain::ReturnStatus CmpMain::compile(const char *input_str, //IN CURRCONTEXT_OPTDEBUG->stream() << endl << endl; } } - // LCOV_EXCL_STOP #ifdef NA_DEBUG #ifdef NA_DEBUG_GUI http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/sqlcomp/CmpMain.h ---------------------------------------------------------------------- diff --git a/core/sql/sqlcomp/CmpMain.h b/core/sql/sqlcomp/CmpMain.h index 52602cd..3e158e6 100644 --- a/core/sql/sqlcomp/CmpMain.h +++ b/core/sql/sqlcomp/CmpMain.h @@ -88,7 +88,7 @@ class QryStmtAttribute : public NABasicObject { QryStmtAttribute(const QryStmtAttribute& s) : attr(s.attr), value(s.value) {} // destructor - virtual ~QryStmtAttribute() {} // LCOV_EXCL_LINE + virtual ~QryStmtAttribute() {} // equality comparison used by CompilerEnv::isEqual NABoolean isEqual(const QryStmtAttribute &o) const @@ -112,7 +112,7 @@ class QryStmtAttributeSet : public NABasicObject { QryStmtAttributeSet(const QryStmtAttributeSet& s); // destructor frees all query statement attribute settings - virtual ~QryStmtAttributeSet() {} // LCOV_EXCL_LINE + virtual ~QryStmtAttributeSet() {} // add a query statement attribute to attrs void addStmtAttribute(SQLATTR_TYPE a, ULng32 v); @@ -156,7 +156,7 @@ public: }; CmpMain(); - virtual ~CmpMain() {} // LCOV_EXCL_LINE + virtual ~CmpMain() {} #ifdef NA_DEBUG_GUI http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/sqlcomp/DefaultValidator.cpp ---------------------------------------------------------------------- diff --git a/core/sql/sqlcomp/DefaultValidator.cpp b/core/sql/sqlcomp/DefaultValidator.cpp index 70e1124..cd16e50 100644 --- a/core/sql/sqlcomp/DefaultValidator.cpp +++ b/core/sql/sqlcomp/DefaultValidator.cpp @@ -127,7 +127,6 @@ Int32 ValidateTraceStr::validate( const char *value, return TRUE; } -// LCOV_EXCL_START :cnu Int32 ValidateAnsiList::validate( const char *value, const NADefaults *nad, Int32 attrEnum, @@ -220,7 +219,6 @@ Int32 ValidateRoleNameList::validate( const char *value, return TRUE; } -// LCOV_EXCL_STOP Int32 ValidatePOSTableSizes::validate(const char *value, const NADefaults *nad, @@ -477,7 +475,6 @@ Int32 ValidateCollationList::validate(const char *value, // Set collStr to be the fragment up to (excluding) the semicolon or zero; // set collList to be the rest of itself (after the semicolon). // -// LCOV_EXCL_START :mp char *s = collList; for (NABoolean quoted = FALSE; *s; s++) { if (*s == '"') @@ -546,7 +543,6 @@ Int32 ValidateCollationList::validate(const char *value, << DgString0(collStr) << DgString1(nad->lookupAttrName(attrEnum, errOrWarn)); -// LCOV_EXCL_STOP } // !collStr.isNull() } // while http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/sqlcomp/NADefaults.h ---------------------------------------------------------------------- diff --git a/core/sql/sqlcomp/NADefaults.h b/core/sql/sqlcomp/NADefaults.h index 032c91c..f71c23c 100644 --- a/core/sql/sqlcomp/NADefaults.h +++ b/core/sql/sqlcomp/NADefaults.h @@ -256,13 +256,11 @@ public: Int32 errOrWarn = -1, NABoolean overwrite = TRUE, NABoolean alreadyCanonical = FALSE); - // LCOV_EXCL_START // code not used NABoolean setCatalogTrustedFast(NAString &value) { return setCatalog(value, -1, TRUE, TRUE); } NABoolean setSchemaTrustedFast (NAString &value) { return setSchema(value, -1, TRUE, TRUE); } - // LCOV_EXCL_STOP void getCatalogAndSchema (NAString &cat, NAString &sch); void setState (Provenance s) { currentState_ = s; } @@ -290,7 +288,6 @@ public: const char* &value, NABoolean userDefaultsOnly); - // LCOV_EXCL_START void readFromFlatFile (const char *fname, Provenance overwriteIf = SET_BY_CQD, Int32 errOrWarn = +1/*warning*/) @@ -298,7 +295,6 @@ public: spName.prepend(" "); // space signals FLAT FILE not SQL TABLE readFromSQLTable(spName, overwriteIf, errOrWarn); } - // LCOV_EXCL_STOP void readFromSQLTables(Provenance overwriteIfNotYet = SET_BY_CQD, Int32 errOrWarn = +1/*warning*/); http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/sqlcomp/NewDel.cpp ---------------------------------------------------------------------- diff --git a/core/sql/sqlcomp/NewDel.cpp b/core/sql/sqlcomp/NewDel.cpp index 0113286..19d58c8 100644 --- a/core/sql/sqlcomp/NewDel.cpp +++ b/core/sql/sqlcomp/NewDel.cpp @@ -162,10 +162,8 @@ PNH CmpSetNewHandler(PNH handler) return old; } -// LCOV_EXCL_START // Code not used PNH CmpGetNewHandler() { return globalCmpNewHandler; } -// LCOV_EXCL_STOP http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/sqlcomp/QCache.cpp ---------------------------------------------------------------------- diff --git a/core/sql/sqlcomp/QCache.cpp b/core/sql/sqlcomp/QCache.cpp index fd96627..21af778 100644 --- a/core/sql/sqlcomp/QCache.cpp +++ b/core/sql/sqlcomp/QCache.cpp @@ -1989,7 +1989,6 @@ ULng32 QCache::getSizeOfPostParserEntry(KeyDataPair& entry) + sizeof(CacheEntry) + CacheHashTbl::getBucketEntrySize(); } -// LCOV_EXCL_START // this routine is used for debugging qcache bugs only void QCache::sanityCheck(Int32 mark) { @@ -2000,7 +1999,6 @@ void QCache::sanityCheck(Int32 mark) getSizeOfPostParserEntry(entry); } } -// LCOV_EXCL_STOP // return TRUE iff cache can accommodate a new entry of this size NABoolean QCache::canFit(ULng32 size) http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/sqlcomp/nadefaults.cpp ---------------------------------------------------------------------- diff --git a/core/sql/sqlcomp/nadefaults.cpp b/core/sql/sqlcomp/nadefaults.cpp index 382d430..dba86b6 100644 --- a/core/sql/sqlcomp/nadefaults.cpp +++ b/core/sql/sqlcomp/nadefaults.cpp @@ -3942,7 +3942,6 @@ void NADefaults::initCurrentDefaultsWithDefaultDefaults() return; } - // LCOV_EXCL_START // for debugging only #ifndef NDEBUG if (nadval) { // additional sanity checking we want to do occasionally @@ -4008,7 +4007,6 @@ void NADefaults::initCurrentDefaultsWithDefaultDefaults() } } // if env-var #endif // NDEBUG - // LCOV_EXCL_STOP } // for i @@ -5048,7 +5046,6 @@ NABoolean NADefaults::domainMatch(Int32 attrEnum, // and calling getAsULong, instead of using 'long' fields to retrieve // unsigned(DDui*) attr values via getAsLong ... // - // LCOV_EXCL_START // if we get here the compiler will crash if (flt) { DefaultValidator *validator = NULL; @@ -5077,7 +5074,6 @@ NABoolean NADefaults::domainMatch(Int32 attrEnum, DefaultValidatorType(expectedType)) << " " << (flt ? *flt : 123.45) << endl; #endif - // LCOV_EXCL_STOP return FALSE; } http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/sqlcomp/vers_libsqlcomp.cpp ---------------------------------------------------------------------- diff --git a/core/sql/sqlcomp/vers_libsqlcomp.cpp b/core/sql/sqlcomp/vers_libsqlcomp.cpp index 892c538..5501028 100644 --- a/core/sql/sqlcomp/vers_libsqlcomp.cpp +++ b/core/sql/sqlcomp/vers_libsqlcomp.cpp @@ -26,6 +26,4 @@ #define VERS_CV_MIN 0 #define VERS_CV_UPD 1 -// LCOV_EXCL_START VERS_LIB(libsqlcomp) -// LCOV_EXCL_STOP http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/sqlmxevents/logmxevent_sq.cpp ---------------------------------------------------------------------- diff --git a/core/sql/sqlmxevents/logmxevent_sq.cpp b/core/sql/sqlmxevents/logmxevent_sq.cpp index a1ab58b..1e0d57d 100644 --- a/core/sql/sqlmxevents/logmxevent_sq.cpp +++ b/core/sql/sqlmxevents/logmxevent_sq.cpp @@ -252,12 +252,10 @@ void SQLMXLoggingArea::resetSqlText() sql_error_event.set_string3(String3); if (String4) sql_error_event.set_string4(String4); - //LCOV_EXCL_START - unused members of diags are if (serverName) sql_error_event.set_server_name(serverName); if (connectionName) sql_error_event.set_connection_name(connectionName); - //LCOV_EXCL_STOP if (constraintCatalog) sql_error_event.set_constraint_catalog(constraintCatalog); if (constraintSchema) @@ -930,10 +928,6 @@ void SQLMXLoggingArea::logSortDiskInfo(char *diskname, short percentfree, short //** use event id SQEV_SQL_SRT_INFO ** } -//LCOV_EXCL_START -// ss_cc_changes: these are stubs that need to be removed by components. -// Excluding these from code coverage - static void check_assert_bug_catcher() { @@ -1176,4 +1170,3 @@ void SQLMXLoggingArea::logPMAudDoneEvent(ULng32 eventId, } #endif // #if 0 -// LCOV_EXCL_STOP http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/udrserv/UdrAbortCallBack.cpp ---------------------------------------------------------------------- diff --git a/core/sql/udrserv/UdrAbortCallBack.cpp b/core/sql/udrserv/UdrAbortCallBack.cpp index 6abfdef..45a5805 100644 --- a/core/sql/udrserv/UdrAbortCallBack.cpp +++ b/core/sql/udrserv/UdrAbortCallBack.cpp @@ -39,7 +39,6 @@ #include "UdrFFDC.h" #include "string.h" -// LCOV_EXCL_START void UdrAbortCallBack::doCallBack(const char *msg, const char *file, UInt32 line){ #define TEXT_SIZE 1024 char extMsg[TEXT_SIZE]; @@ -47,4 +46,3 @@ void UdrAbortCallBack::doCallBack(const char *msg, const char *file, UInt32 line strncat(extMsg, msg, sizeof(extMsg)-strlen(extMsg)); makeTFDSCall(extMsg,(char *)file,line); } -// LCOV_EXCL_STOP http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/udrserv/UdrDebug.cpp ---------------------------------------------------------------------- diff --git a/core/sql/udrserv/UdrDebug.cpp b/core/sql/udrserv/UdrDebug.cpp index 089fd76..5ee4e8e 100644 --- a/core/sql/udrserv/UdrDebug.cpp +++ b/core/sql/udrserv/UdrDebug.cpp @@ -64,7 +64,6 @@ NABoolean doUdrDebug(){ return doUdrDebugFlag; } -// LCOV_EXCL_START void udrDebug(const char *formatString, ...) { if (doUdrDebug()) @@ -77,7 +76,6 @@ void udrDebug(const char *formatString, ...) fflush(udrDebugFile); } } -// LCOV_EXCL_STOP #endif // UDR_DEBUG http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/udrserv/UdrFFDC.cpp ---------------------------------------------------------------------- diff --git a/core/sql/udrserv/UdrFFDC.cpp b/core/sql/udrserv/UdrFFDC.cpp index afe3a53..2ffbd99 100644 --- a/core/sql/udrserv/UdrFFDC.cpp +++ b/core/sql/udrserv/UdrFFDC.cpp @@ -343,7 +343,6 @@ void setUdrSignalHandlers() } } -// LCOV_EXCL_START void printSignalHandlers() { struct sigaction oldAction; @@ -365,7 +364,6 @@ void printSignalHandlers() } } } -// LCOV_EXCL_STOP // Saves the UDR trap signal handlers NABoolean saveUdrTrapSignalHandlers() http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/udrserv/UdrImplLmExtFunc.cpp ---------------------------------------------------------------------- diff --git a/core/sql/udrserv/UdrImplLmExtFunc.cpp b/core/sql/udrserv/UdrImplLmExtFunc.cpp index b76d63e..e0eb33e 100644 --- a/core/sql/udrserv/UdrImplLmExtFunc.cpp +++ b/core/sql/udrserv/UdrImplLmExtFunc.cpp @@ -45,12 +45,10 @@ void lmMakeTFDSCall(const char *msg, const char *file, UInt32 line) } -// LCOV_EXCL_START void lmPrintSignalHandlers() { printSignalHandlers(); } -// LCOV_EXCL_STOP NABoolean lmSetSignalHandlersToDefault() { http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/udrserv/UdrRSProcess.cpp ---------------------------------------------------------------------- diff --git a/core/sql/udrserv/UdrRSProcess.cpp b/core/sql/udrserv/UdrRSProcess.cpp index 11df6f6..1071120 100644 --- a/core/sql/udrserv/UdrRSProcess.cpp +++ b/core/sql/udrserv/UdrRSProcess.cpp @@ -50,7 +50,6 @@ void processAnRSLoadMessage(UdrGlobals *udrGlob, ComDiagsArea *diags = ComDiagsArea::allocate(udrGlob->getIpcHeap()); -// LCOV_EXCL_START doMessageBox(udrGlob, TRACE_SHOW_DIALOGS, udrGlob->showRSLoad_, moduleName); @@ -62,7 +61,6 @@ void processAnRSLoadMessage(UdrGlobals *udrGlob, { ServerDebug("[UdrServ (%s)] Receive RS Load Request", moduleName); } -// LCOV_EXCL_STOP // process RS Load request SPInfo *sp = udrGlob->getSPList()->spFind(request.getHandle()); @@ -160,7 +158,6 @@ void processAnRSFetchOrContinueMessage(UdrGlobals *udrGlob, { const char* moduleName = "processAnRSFetchOrContinueMessage"; -// LCOV_EXCL_START // This method should only be called for RS invoke or RS continue // message types. NABoolean show = FALSE; @@ -182,7 +179,6 @@ void processAnRSFetchOrContinueMessage(UdrGlobals *udrGlob, if (doTrace) ServerDebug("[UdrServ (%s)] Receive RS Invoke or Continue Request", moduleName); -// LCOV_EXCL_STOP // Free up any receive buffers no longer in use msgStream.cleanupBuffers(); @@ -415,7 +411,6 @@ void processAnRSCloseMessage(UdrGlobals *udrGlob, ComDiagsArea *diags = ComDiagsArea::allocate(udrGlob->getIpcHeap()); UDR_ASSERT(diags, "Unable to allocate memory for SQL diagnostics area"); -// LCOV_EXCL_START doMessageBox(udrGlob, TRACE_SHOW_DIALOGS, udrGlob->showRSClose_, moduleName); @@ -426,7 +421,6 @@ void processAnRSCloseMessage(UdrGlobals *udrGlob, { ServerDebug("[UdrServ (%s)] Receive RS Close Request", moduleName); } -// LCOV_EXCL_STOP // Find the SPInfo instance for this request SPInfo *sp = udrGlob->getSPList()->spFind(request.getHandle()); @@ -516,7 +510,6 @@ void processAnRSUnloadMessage(UdrGlobals *udrGlob, { const char* moduleName = "processAnRSUnloadMessage"; -// LCOV_EXCL_START doMessageBox(udrGlob, TRACE_SHOW_DIALOGS, udrGlob->showRSUnload_, moduleName); @@ -526,7 +519,6 @@ void processAnRSUnloadMessage(UdrGlobals *udrGlob, { ServerDebug("[UdrServ (%s)] Receive RS Unload Request", moduleName); } -// LCOV_EXCL_STOP // Find the SPInfo instance for this request SPInfo *sp = udrGlob->getSPList()->spFind(request.getHandle()); http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/udrserv/UdrResultSet.cpp ---------------------------------------------------------------------- diff --git a/core/sql/udrserv/UdrResultSet.cpp b/core/sql/udrserv/UdrResultSet.cpp index fdefad5..2c3388c 100644 --- a/core/sql/udrserv/UdrResultSet.cpp +++ b/core/sql/udrserv/UdrResultSet.cpp @@ -65,7 +65,6 @@ extern NABoolean allocateEODRow(UdrGlobals *UdrGlob, SqlBuffer &replyBuffer, queue_index parentIndex); -// LCOV_EXCL_START // Utility method to deallocate descriptor items created in // UdrResultSet::generateProxySyntax() static void @@ -89,7 +88,6 @@ deleteDescItems(ComUInt32 numCols, SQLDESC_ITEM *desc_items, NAMemory *heapPtr) return; } -// LCOV_EXCL_STOP ////////////////////////////////////////////////////////////////////////////// // @@ -159,7 +157,6 @@ char *TmpBuffer::getNextRow(ComDiagsArea* &rowDiags, // If errors occur, parameter 'd' will be populated with errors. Callers // need to check for diagnostics // This constructor is used on Windows Platform -// LCOV_EXCL_START UdrResultSet::UdrResultSet(SPInfo *spInfo, SQLSTMT_ID *stmt, ComDiagsArea &d) : spInfo_(spInfo), state_(RS_INITIATED), @@ -192,7 +189,6 @@ UdrResultSet::UdrResultSet(SPInfo *spInfo, SQLSTMT_ID *stmt, ComDiagsArea &d) UDR_DEBUG1(" Proxy syntax \"%s\"", (proxySyntax_ ? proxySyntax_->data() : "")); } -// LCOV_EXCL_STOP // If errors occur, parameter 'd' will be populated with errors. Callers // need to check for diagnostics @@ -323,7 +319,6 @@ UdrResultSet::deallocateExeGeneratedFields() } // UdrResultSet::deallocateExeGeneratedFields -// LCOV_EXCL_START const char * UdrResultSet::stateString() { @@ -340,7 +335,6 @@ UdrResultSet::stateString() default: return ComRtGetUnknownString((Int32) state_); } } -// LCOV_EXCL_STOP // Reinitiliazes the UdrResultSet object with the new LmResultSet object. // If lmRS param is NULL, the stmt_id param is used for initialization. http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/udrserv/spinfo.cpp ---------------------------------------------------------------------- diff --git a/core/sql/udrserv/spinfo.cpp b/core/sql/udrserv/spinfo.cpp index cdfa6de..224592e 100644 --- a/core/sql/udrserv/spinfo.cpp +++ b/core/sql/udrserv/spinfo.cpp @@ -607,7 +607,6 @@ void SPInfo::resetLastCallTs() numResultSets_ = 0; } -// LCOV_EXCL_START // displaySPInfo - Used when tracing objects void SPInfo::displaySPInfo(Lng32 indent) { @@ -763,7 +762,6 @@ void SPInfo::displaySPInfoId(Lng32 indent) ServerDebug("%sObject ID : " INT64_SPEC , ind, udrHandle_ ); } // SPInfo::displaySPInfoId -// LCOV_EXCL_STOP // createUniqueIdentifier Int64 SPInfo::createUniqueIdentifier() http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/udrserv/spinfoCallback.cpp ---------------------------------------------------------------------- diff --git a/core/sql/udrserv/spinfoCallback.cpp b/core/sql/udrserv/spinfoCallback.cpp index c733255..a8e42e8 100644 --- a/core/sql/udrserv/spinfoCallback.cpp +++ b/core/sql/udrserv/spinfoCallback.cpp @@ -131,10 +131,8 @@ void SpInfoGetNextRow(char *rowData, SPInfo *sp = udrGlobals->getCurrSP(); if(!sp) { -// LCOV_EXCL_START *queue_state = SQLUDR_Q_CANCEL; return; -// LCOV_EXCL_STOP } // Access SQL buffer that corresponds to table index @@ -245,7 +243,6 @@ Int32 sendEmitWaitedReply(UdrGlobals *udrGlobals, const char *moduleName = "sendEmitWaitedReply"; NABoolean traceInvokeDataAreas = false; -// LCOV_EXCL_START if (udrGlobals->verbose_ && udrGlobals->showInvoke_ && udrGlobals->traceLevel_ >= TRACE_DATA_AREAS) traceInvokeDataAreas = true; @@ -257,7 +254,6 @@ Int32 sendEmitWaitedReply(UdrGlobals *udrGlobals, displaySqlBuffer(emitSqlBuffer, sp->getReplyBufferSize()); } -// LCOV_EXCL_STOP //get datastream UdrServerDataStream *dataStream = sp->getDataStream(); @@ -339,12 +335,10 @@ Int32 SpInfoEmitRow (char *rowData, // UDR is used. SPInfo *sp = udrGlobals->getCurrSP(); if(!sp) -// LCOV_EXCL_START { *queue_state = SQLUDR_Q_CANCEL; return SQLUDR_ERROR; } -// LCOV_EXCL_STOP // Access emit SQL buffer that corresponds to table index http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/udrserv/udrglobals.cpp ---------------------------------------------------------------------- diff --git a/core/sql/udrserv/udrglobals.cpp b/core/sql/udrserv/udrglobals.cpp index 89f5689..991899c 100644 --- a/core/sql/udrserv/udrglobals.cpp +++ b/core/sql/udrserv/udrglobals.cpp @@ -189,7 +189,6 @@ UdrGlobals::UdrGlobals(NAHeap *udrheap, NAHeap *ipcheap) UDR_DEBUG1("Session User : %s", sessionUserName_); } -// LCOV_EXCL_START // we don't have any way of invoking these at this point. // we should provide a way for procedure bodies to set a java property // that the language manager can use to check to determine if it should @@ -261,7 +260,6 @@ void UdrGlobals::displayStats(ostream& out, Lng32 indent) ServerDebug("%sNum Total RSets : " INT64_SPEC , ind, numTotalRSets_ ); ServerDebug("%sNum Curr RSets : " INT64_SPEC , ind, numCurrRSets_ ); } -// LCOV_EXCL_STOP LmLanguageManager *UdrGlobals::getLM(ComRoutineLanguage language) const http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/udrserv/udrload.cpp ---------------------------------------------------------------------- diff --git a/core/sql/udrserv/udrload.cpp b/core/sql/udrserv/udrload.cpp index 09194db..fc9dc49 100644 --- a/core/sql/udrserv/udrload.cpp +++ b/core/sql/udrserv/udrload.cpp @@ -585,7 +585,6 @@ SPInfo *processLoadParameters(UdrGlobals *UdrGlob, return sp; } // processLoadParameters -// LCOV_EXCL_START void displayLoadParameters(UdrLoadMsg &request) { ServerDebug(""); @@ -713,7 +712,6 @@ void displayLoadParameters(UdrLoadMsg &request) ServerDebug(""); } // displayLoadParameters -// LCOV_EXCL_STOP void reportLoadResults(UdrGlobals *UdrGlob, SPInfo *sp, LmRoutine *lmr_) { http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/udrserv/udrserv.cpp ---------------------------------------------------------------------- diff --git a/core/sql/udrserv/udrserv.cpp b/core/sql/udrserv/udrserv.cpp index 3bc69ed..a118b1c 100644 --- a/core/sql/udrserv/udrserv.cpp +++ b/core/sql/udrserv/udrserv.cpp @@ -168,13 +168,11 @@ static Int32 invokeUdrMethod(const char *method, Int32 nTimesToInvoke, UdrGlobals &glob); -// LCOV_EXCL_START // Dead Code // These methods are not used, and the interface has not been tested for a long time. // We might want to retire them static Int32 processCommandsFromFile(const char *filename, UdrGlobals &glob); static Int32 processSingleCommandFromFile(FILE *f, UdrGlobals &glob); -// LCOV_EXCL_STOP static NAString initErrText(""); /************************************************************************* @@ -1077,7 +1075,6 @@ void sendDataReply(UdrGlobals *UdrGlob, } // sendDataReply() -// LCOV_EXCL_START static void displayUsageInfo() { fprintf(stdout, "Usage:\n"); @@ -1115,7 +1112,6 @@ static void displayUsageInfo() fprintf(stdout, "\n"); } -// LCOV_EXCL_STOP NABoolean processCmdLine(UdrGlobals *UdrGlob, Int32 argc, char **argv) { @@ -1149,7 +1145,6 @@ NABoolean processCmdLine(UdrGlobals *UdrGlob, Int32 argc, char **argv) UdrGlob->logFileProvided_ = FALSE; -// LCOV_EXCL_START // NSK or Linux can use environment variables... if (const char *logFileName = getenv("UDRSERV_TRACE_FILENAME")) { @@ -1196,7 +1191,6 @@ NABoolean processCmdLine(UdrGlobals *UdrGlob, Int32 argc, char **argv) if (UdrGlob->showUnload_) ServerDebug(" Trace Unload Module Active"); -// LCOV_EXCL_STOP // // Now we parse command-line arguments. We support the following @@ -1364,7 +1358,6 @@ NABoolean processCmdLine(UdrGlobals *UdrGlob, Int32 argc, char **argv) // See if the user wants us to obey commands from a text file else if (!stricmp(argv[i], "-obey")) { - // LCOV_EXCL_START // Dead Code // obey option is not tested, and Andy thinks it should be obsoleted. UdrGlob->setCommandLineMode(TRUE); @@ -1387,7 +1380,6 @@ NABoolean processCmdLine(UdrGlobals *UdrGlob, Int32 argc, char **argv) Int32 result = processCommandsFromFile(argv[i], *UdrGlob); exit(result); - // LCOV_EXCL_STOP } // -obey } // for each arg in argv @@ -2205,7 +2197,6 @@ static Int32 invokeUdrMethod(const char *method, } // invokeUdrMethod() -// LCOV_EXCL_START // Dead Code // Andy thinks we should retire this interface... @@ -2458,7 +2449,6 @@ void udrAbort(const char *f, Int32 l, const char *m) makeTFDSCall(m, f, l, FALSE); // should not reach here } -// LCOV_EXCL_STOP // Stubs #ifdef UDR_OSS_RELEASE http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/udrserv/udrunload.cpp ---------------------------------------------------------------------- diff --git a/core/sql/udrserv/udrunload.cpp b/core/sql/udrserv/udrunload.cpp index bfc2e01..fd982f1 100644 --- a/core/sql/udrserv/udrunload.cpp +++ b/core/sql/udrserv/udrunload.cpp @@ -79,7 +79,6 @@ void processAnUnLoadMessage(UdrGlobals *UdrGlob, if (sp == NULL) { -// LCOV_EXCL_START // // No SPInfo exists for this UDR handle. Could be because the // handle is invalid or because this is an out-of-sequence UNLOAD @@ -105,7 +104,6 @@ void processAnUnLoadMessage(UdrGlobals *UdrGlob, *diags << DgString0("Unload Message"); } } // if (sp == NULL) -// LCOV_EXCL_STOP if (sp) { @@ -132,7 +130,6 @@ void processAnUnLoadMessage(UdrGlobals *UdrGlob, sp = NULL; if (error != 0) -// LCOV_EXCL_START { sprintf(errorText, "(%.30s) UDR Unload Error: %d", @@ -143,7 +140,6 @@ void processAnUnLoadMessage(UdrGlobals *UdrGlob, UdrGlob->showLoad_, errorText); } -// LCOV_EXCL_STOP } // http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/udrserv/udrutil.cpp ---------------------------------------------------------------------- diff --git a/core/sql/udrserv/udrutil.cpp b/core/sql/udrserv/udrutil.cpp index e2262b3..69e392c 100644 --- a/core/sql/udrserv/udrutil.cpp +++ b/core/sql/udrserv/udrutil.cpp @@ -53,7 +53,6 @@ FILE *UdrTraceFile = stdout; #define TF_STRING(x) ( (x) ? ("TRUE") : ("FALSE") ) -// LCOV_EXCL_START void displaySqlBuffer(SqlBuffer *sbuf, Lng32 sbuflen, ostream &os) { os << "Display an SQL Buffer:" << endl; @@ -618,7 +617,6 @@ void doMessageBox(UdrGlobals *UdrGlob, Int32 trLevel, UdrGlob->serverName_, MB_OK|MB_ICONINFORMATION); } } -// LCOV_EXCL_STOP #ifdef _DEBUG void sleepIfPropertySet(LmLanguageManager &lm, http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/ustat/hs_cli.cpp ---------------------------------------------------------------------- diff --git a/core/sql/ustat/hs_cli.cpp b/core/sql/ustat/hs_cli.cpp index 8e207e9..bc0e8e6 100644 --- a/core/sql/ustat/hs_cli.cpp +++ b/core/sql/ustat/hs_cli.cpp @@ -655,7 +655,6 @@ Lng32 HSSample::create(NAString& tblName, NABoolean unpartitioned, NABoolean isP FALSE, STMTHEAP); } - // LCOV_EXCL_START :nsk else { ComMPLoc tempObj(tblName, ComMPLoc::FILE); @@ -713,7 +712,6 @@ Lng32 HSSample::create(NAString& tblName, NABoolean unpartitioned, NABoolean isP //entry-sequence tables, have a 2G limit ddl += HS_EXTENT_SIZE_MP_FMT1; } - // LCOV_EXCL_STOP HSSqTableDef sampleDef(*sampleName, tableType); @@ -2784,23 +2782,19 @@ Lng32 HSCursor::prepareRowsetInternal } while (col = col->next); } - // LCOV_EXCL_START :rfi else { LM->Log("***[ERROR] prepareRowset: GROUP PTR IS NULL\n"); return -1; } - // LCOV_EXCL_STOP LM->Log(cliStr); // Cannot reuse a cursor. This causes memory leak. if (stmtAllocated_) { - // LCOV_EXCL_START :rfi LM->Log("***[ERROR] REUSING ALLOCATED CURSOR\n"); return -1; - // LCOV_EXCL_STOP } @@ -2908,10 +2902,8 @@ Lng32 HSCursor::prepareRowsetInternal LM->StopTimer(); if (retcode_ < 0) { - // LCOV_EXCL_START :rfi LM->Log("***[FAILED] Unable to open rowset cursor.\n"); HSHandleError(retcode_); - // LCOV_EXCL_STOP } closeStmtNeeded_ = TRUE; @@ -3003,10 +2995,8 @@ Lng32 HSCursor::prepare( const char *clistr // Cannot reuse a cursor. This causes memory leak. if (stmtAllocated_) { - // LCOV_EXCL_START :rfi LM->Log("***[ERROR] REUSING ALLOCATED CURSOR\n"); return -1; - // LCOV_EXCL_STOP } retcode_ = SQL_EXEC_ClearDiagnostics(stmt_); @@ -3196,14 +3186,12 @@ Lng32 HSCursor::prepare( const char *clistr LM->StopTimer(); if (retcode_) { - // LCOV_EXCL_START :rfi if (LM->LogNeeded()) { snprintf(LM->msg, sizeof(LM->msg), "***[FAILED] OPEN CURSOR, retcode=%d", retcode_); LM->Log(LM->msg); } HSHandleError(retcode_); - // LCOV_EXCL_STOP } closeStmtNeeded_ = TRUE; @@ -3217,7 +3205,6 @@ Lng32 HSCursor::prepare( const char *clistr #define ALIGN4(addr) ((addr & 0x3) == 0) #define ALIGN8(addr) ((addr & 0x7) == 0) -// LCOV_EXCL_START :cnu template <class T> class HSBin : public SQLInt { public: @@ -3233,10 +3220,8 @@ private: Lng32 id_; }; -// LCOV_EXCL_STOP // ----------------------------------------------------------------------- -// LCOV_EXCL_START :cnu class HSLargeint : public SQLInt { public: @@ -3252,7 +3237,6 @@ private: Lng32 id_; }; -// LCOV_EXCL_STOP // ----------------------------------------------------------------------- class HSDate : public SQLDate { @@ -3270,7 +3254,6 @@ public: }; // ----------------------------------------------------------------------- -// LCOV_EXCL_START :cnu NAType* ConstructNumericType( Long addr , Lng32 id , Lng32 length @@ -3325,13 +3308,11 @@ NAType* ConstructNumericType( Long addr } return type; } -// LCOV_EXCL_STOP // ----------------------------------------------------------------------- // Construct a NA type from an SQL type so that NAtype.encode can be // called later. // ----------------------------------------------------------------------- -// LCOV_EXCL_START :cnu #pragma nowarn(770) // warning elimination Lng32 HSCursor::buildNAType() { @@ -3508,7 +3489,6 @@ Lng32 HSCursor::buildNAType() return 0; } #pragma warn(770) // warning elimination -// LCOV_EXCL_STOP /***********************************************/ /* METHOD: fetchRowset() */ @@ -3775,7 +3755,6 @@ Lng32 HSCursor::fetchNumColumn( const char *clistr // ----------------------------------------------------------------------- // Fetch char type and largeint type columns from a table. // ----------------------------------------------------------------------- -// LCOV_EXCL_START :cnu Lng32 HSCursor::fetchCharNumColumn(const char *clistr, NAString &value1, Int64 &value2, double &value3) { HSErrorCatcher errorCatcher(retcode_, - UERR_INTERNAL_ERROR, "fetchCharColumn", TRUE); @@ -3821,7 +3800,6 @@ Lng32 HSCursor::fetchCharNumColumn(const char *clistr, NAString &value1, Int64 & return 0; } -// LCOV_EXCL_STOP // Constructor used for static interface. HSinsertHist::HSinsertHist(const char *stmtID, http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/ustat/hs_cli.h ---------------------------------------------------------------------- diff --git a/core/sql/ustat/hs_cli.h b/core/sql/ustat/hs_cli.h index 58bc353..dc9dd3a 100644 --- a/core/sql/ustat/hs_cli.h +++ b/core/sql/ustat/hs_cli.h @@ -1055,7 +1055,6 @@ static double getValueAsDouble(myVarChar* valPtr) return ucsToDouble(valPtr); } -// LCOV_EXCL_START :ace // This won't be called, just needs to exist to avoid compilation error for // a template instantiation using ISFixedChar. static double getValueAsDouble(ISFixedChar* valPtr) @@ -1079,7 +1078,6 @@ static double getValueAsDouble(MCWrapper* valPtr) assert(FALSE); return 0; } -// LCOV_EXCL_STOP // NOTE: The following function has to be defined in the header file so the http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/ustat/hs_globals.cpp ---------------------------------------------------------------------- diff --git a/core/sql/ustat/hs_globals.cpp b/core/sql/ustat/hs_globals.cpp index afed2c6..bcb1c58 100644 --- a/core/sql/ustat/hs_globals.cpp +++ b/core/sql/ustat/hs_globals.cpp @@ -222,7 +222,6 @@ static short convFloat64ToAscii(char *target, // : new (STMTHEAP, FALSE) elemType[elemCount]) #endif -// LCOV_EXCL_START :rfi void ISFixedChar::fail(const char* opName, Lng32 line) { HSLogMan *LM = HSLogMan::Instance(); @@ -236,7 +235,6 @@ void ISFixedChar::fail(const char* opName, Lng32 line) throw CmpInternalException("failure in ISFixedChar", __FILE__, line); } -// LCOV_EXCL_STOP // Compare this object to rhs, returning negative value if less, 0 if equal, // and positive value if greater. @@ -1326,7 +1324,6 @@ void MCWrapper::fail(const char* opName, Lng32 line) } -// LCOV_EXCL_START :rfi void ISVarChar::fail(const char* opName, Lng32 line) { HSLogMan *LM = HSLogMan::Instance(); @@ -1340,7 +1337,6 @@ void ISVarChar::fail(const char* opName, Lng32 line) throw CmpInternalException("failure in ISVarChar", __FILE__, line); } -// LCOV_EXCL_STOP // Compare this object to rhs, returning negative value if less, 0 if equal, // and positive value if greater. @@ -2513,7 +2509,6 @@ Int64 HSHistogram::getTotalUec() } -// LCOV_EXCL_START :cnu /***********************************************/ /* METHOD: getTotalRowCount() */ /* PURPOSE: Determine the SUM(rowcount) */ @@ -2534,7 +2529,6 @@ Int64 HSHistogram::getTotalRowCount() } return rowCount; } -// LCOV_EXCL_STOP Lng32 HSHistogram::getParenthesizedIntBoundary(Lng32 intNum, HSDataBuffer &intBoundary) { @@ -2699,7 +2693,6 @@ static void sumFrequencies(FrequencyCounts& fc, Int32 maxInterval, FrequencyCoun } } -// LCOV_EXCL_START :cnu /**************************************************************************/ /* METHOD: compareFC() */ /* PURPOSE: Compare the two frequency counts to determine if for each */ @@ -2744,7 +2737,6 @@ NABoolean compareFC(FrequencyCounts& fc1, FrequencyCounts& fc2) return differenceFound; } -// LCOV_EXCL_STOP /**************************************************************************/ /* METHOD: removeLesserGapIntervals() */ @@ -3441,7 +3433,6 @@ Lng32 HSGlobalsClass::Initialize() for (retry = 0; retry <= retryLimit && groupStateOK; retry++) { retcode = AddNecessaryColumns(); - // LCOV_EXCL_START :rfi if (retcode < 0) { // An error occurred. @@ -3456,7 +3447,6 @@ Lng32 HSGlobalsClass::Initialize() } else break; // successful execution, exit retry loop - // LCOV_EXCL_STOP } // If we found errors, but retried successfully, rewind past the errors @@ -4997,7 +4987,6 @@ static void mapInternalSortTypes(HSColGroupStruct *groupList, NABoolean forHive break; default: - // LCOV_EXCL_START :rfi LM->Log("INTERNAL ERROR (mapInternalSortTypes):"); sprintf(LM->msg, "Undefined datetime type %d", col.precision); LM->Log(LM->msg); @@ -5007,7 +4996,6 @@ static void mapInternalSortTypes(HSColGroupStruct *groupList, NABoolean forHive << DgString2(LM->msg); throw CmpInternalException("failure in mapInternalSortTypes()", __FILE__, __LINE__); - // LCOV_EXCL_STOP } break; @@ -5312,7 +5300,6 @@ void HSGlobalsClass::getMemoryRequirementsForOneGroup(HSColGroupStruct* group, I default: // Check to see if the column's type is supposed to be handled // by internal sort. If so, this is a problem. - // LCOV_EXCL_START :rfi if (isInternalSortType(group->colSet[0])) { LM->Log("INTERNAL ERROR (getInternalSortMemoryRequirements):"); @@ -5327,7 +5314,6 @@ void HSGlobalsClass::getMemoryRequirementsForOneGroup(HSColGroupStruct* group, I } elementSize = 0; break; - // LCOV_EXCL_STOP } Int64 i64MemNeeded = rows * elementSize; @@ -8183,10 +8169,8 @@ Lng32 HSGlobalsClass::WriteStatistics() } else { - // LCOV_EXCL_START :nsk histRS.reset(new HSinsertHist("INSERT101_MP", hstogram_table->data())); histintRS.reset(new HSinsertHistint("INSERT201_MP", hsintval_table->data())); - // LCOV_EXCL_STOP } LM->StartTimer("initialize rowset for Histograms"); retcode = histRS->initialize(); //initialize ROWSET for HISTOGRAMS @@ -8503,7 +8487,7 @@ Lng32 HSGlobalsClass::groupListFromTable(HSColGroupStruct*& groupList, else stmt = HSCliStatement::CURSOR103_MX; else - stmt = HSCliStatement::CURSOR103_MP; // LCOV_EXCL_LINE :nsk + stmt = HSCliStatement::CURSOR103_MP; HSCliStatement cursor103( stmt, (char *)hstogram_table->data(), @@ -10009,8 +9993,8 @@ Lng32 HSGlobalsClass::ClearAllHistograms() LM->Log(LM->msg); } - if (tableFormat == SQLMP) // LCOV_EXCL_LINE :nsk - stmt = HSCliStatement::DELETE101_MP; // LCOV_EXCL_LINE :nsk + if (tableFormat == SQLMP) + stmt = HSCliStatement::DELETE101_MP; else if (HSGlobalsClass::schemaVersion >= COM_VERS_2300) stmt = HSCliStatement::DELETE101_MX_2300; @@ -10029,8 +10013,8 @@ Lng32 HSGlobalsClass::ClearAllHistograms() LM->Log(LM->msg); } - if (tableFormat == SQLMP) // LCOV_EXCL_LINE :nsk - stmt = HSCliStatement::DELETE201_MP; // LCOV_EXCL_LINE :nsk + if (tableFormat == SQLMP) + stmt = HSCliStatement::DELETE201_MP; else if (HSGlobalsClass::schemaVersion >= COM_VERS_2300) stmt = HSCliStatement::DELETE201_MX_2300; @@ -10151,7 +10135,6 @@ Lng32 HSGlobalsClass::ClearSelectHistograms() return retcode; } -// LCOV_EXCL_START :nsk /***********************************************/ /* METHOD: DeleteOrphanHistograms() */ /* PURPOSE: Deletes obsolete histograms that */ @@ -10208,7 +10191,6 @@ Lng32 HSGlobalsClass::DeleteOrphanHistograms() } return 0; } -// LCOV_EXCL_STOP /***********************************************/ /* METHOD: GetStatistics() */ @@ -10484,8 +10466,8 @@ Lng32 HSGlobalsClass::DisplayHistograms(NAString& displayData, Space& space, stmt = HSCliStatement::SHOWINT_MX_2300; else stmt = HSCliStatement::SHOWINT_MX; - else // LCOV_EXCL_LINE :nsk - stmt = HSCliStatement::SHOWINT_MP; // LCOV_EXCL_LINE :nsk + else + stmt = HSCliStatement::SHOWINT_MP; HSCliStatement intData( stmt, (char *)hsintval_table->data(), @@ -10909,7 +10891,6 @@ Lng32 HSGlobalsClass::processInternalSortNulls(Lng32 rowsRead, HSColGroupStruct } break; - // LCOV_EXCL_START :rfi default: sprintf(errtxt, "processInternalSortNulls(): unknown type %d", group->ISdatatype); @@ -10918,7 +10899,6 @@ Lng32 HSGlobalsClass::processInternalSortNulls(Lng32 rowsRead, HSColGroupStruct retcode=-1; HSHandleError(retcode); break; - // LCOV_EXCL_STOP } group = group->next; @@ -11019,7 +10999,6 @@ bool isInternalSortType(HSColumnStruct &col) case REC_DTCODE_TIME: case REC_DTCODE_TIMESTAMP: return true; - // LCOV_EXCL_START :rfi default: LM->Log("INTERNAL ERROR (isInternalSortType):"); sprintf(LM->msg, "Undefined datetime precision type %d", col.precision); @@ -11030,7 +11009,6 @@ bool isInternalSortType(HSColumnStruct &col) << DgString2(LM->msg); throw CmpInternalException("failure in isInternalSortType()", __FILE__, __LINE__); - // LCOV_EXCL_STOP } case REC_INT_YEAR: @@ -11969,7 +11947,6 @@ Lng32 doSort(HSColGroupStruct *group) (ISVarChar*)group->nextData - (ISVarChar*)group->data - 1); break; } - // LCOV_EXCL_START :rfi default: sprintf(errtxt, "doSort(): unknown type %d", group->ISdatatype); sprintf(LM->msg, "INTERNAL ERROR: %s", errtxt); @@ -11977,7 +11954,6 @@ Lng32 doSort(HSColGroupStruct *group) retcode = -1; HSHandleError(retcode); break; - // LCOV_EXCL_STOP } if (LM->LogNeeded()) @@ -11987,7 +11963,6 @@ Lng32 doSort(HSColGroupStruct *group) group->colSet[0].colname->data(), maxRecDepth); LM->Log(LM->msg); } - // LCOV_EXCL_START :rfi if (recDepth != 0) { sprintf(errtxt, "doSort(): Recursion depth should be 0."); @@ -11996,7 +11971,6 @@ Lng32 doSort(HSColGroupStruct *group) retcode = -1; HSHandleError(retcode); } - // LCOV_EXCL_STOP return retcode; } @@ -12448,7 +12422,6 @@ Lng32 HSGlobalsClass::createStatsForColumn(HSColGroupStruct *group, Int64 rowsAl createHistogram(group, intCount, sampleRowCount, samplingUsed, (double*)NULL); break; - // LCOV_EXCL_START :rfi default: sprintf(errtxt, "createStats(): unknown type %d", group->ISdatatype); sprintf(LM->msg, "INTERNAL ERROR: %s", errtxt); @@ -12456,7 +12429,6 @@ Lng32 HSGlobalsClass::createStatsForColumn(HSColGroupStruct *group, Int64 rowsAl retcode=-1; HSHandleError(retcode); break; - // LCOV_EXCL_STOP } if (LM->LogNeeded()) @@ -12505,7 +12477,6 @@ Lng32 HSGlobalsClass::createStatsForColumn(HSColGroupStruct *group, Int64 rowsAl return retcode; } -// LCOV_EXCL_START :rfi /************************************************/ /* METHOD: log() */ /* PURPOSE: Write selected information to the */ @@ -12562,7 +12533,6 @@ void HSGlobalsClass::log(HSLogMan* LM) group = group->next; } } -// LCOV_EXCL_STOP NABoolean HSGlobalsClass::wherePredicateSpecifiedForIUS() { @@ -14347,11 +14317,9 @@ Int32 copyValue(Int64 value, char *valueBuff, const HSColumnStruct &colDesc, sho } break; - // LCOV_EXCL_START :rfi default: retcode = -1; break; - // LCOV_EXCL_STOP } break; @@ -14486,11 +14454,9 @@ Int32 copyValue(Int64 value, char *valueBuff, const HSColumnStruct &colDesc, sho #pragma warning(default:4146) - // LCOV_EXCL_START :rfi default: retcode = -1; break; - // LCOV_EXCL_STOP } // switch } // else @@ -14527,7 +14493,6 @@ Lng32 setBufferValue(T& value, // Copy the value, with any required formatting, into the buffer. Int32 rc=0; - // LCOV_EXCL_START :rfi if ((rc = copyValue(value, valueBuff, colDesc, len)) < 0) { LM->Log("INTERNAL ERROR (copyValue):"); @@ -14542,7 +14507,6 @@ Lng32 setBufferValue(T& value, throw CmpInternalException("failure in copyValue()", __FILE__, __LINE__); } - // LCOV_EXCL_STOP // *len has already been set for char types due to possibility of embedded // nulls, but will have to be adjusted here to len in bytes instead of chars.
