You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by an...@apache.org on 2017/09/25 23:43:02 UTC
[08/14] incubator-trafodion git commit: lcov: commit #1
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/langman/LmComQueue.cpp
----------------------------------------------------------------------
diff --git a/core/sql/langman/LmComQueue.cpp b/core/sql/langman/LmComQueue.cpp
index 01ab28e..b3d3f4d 100644
--- a/core/sql/langman/LmComQueue.cpp
+++ b/core/sql/langman/LmComQueue.cpp
@@ -36,7 +36,6 @@
#include "ComPackDefs.h"
// Exclude the following functions for coverage as they are not used in LM.
-// LCOV_EXCL_START
template<>
Long Q_EntryPtr::pack(void *space, short isSpacePtr)
{
@@ -440,7 +439,6 @@ void Queue::packTailIntoBuffer(char * buffer,
currPos += tail->packedLength();
}
-// LCOV_EXCL_STOP
////////////////////////////////////////////////////////////////////////
@@ -600,7 +598,6 @@ void * HashQueue::getNext() {
};
// Exclude the following functions for coverage as they are not used in LM.
-// LCOV_EXCL_START
void * HashQueue::getCurr() {
if (current_)
@@ -693,7 +690,6 @@ void HashQueue::remove(void * entry) {
lastReturned_ = NULL;
hashValue_ = 0;
};
-// LCOV_EXCL_STOP
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/langman/LmContManager.cpp
----------------------------------------------------------------------
diff --git a/core/sql/langman/LmContManager.cpp b/core/sql/langman/LmContManager.cpp
index 2f7632b..8cf02bf 100644
--- a/core/sql/langman/LmContManager.cpp
+++ b/core/sql/langman/LmContManager.cpp
@@ -330,11 +330,9 @@ LmResult LmContainerManagerCache::getContainer(const char *containerName,
}
// Exclude the following lines for coverage as caching is not used.
-// LCOV_EXCL_START
// Check the cache as required.
if (updates_ % checkPeriod_ == 0)
checkCache();
-// LCOV_EXCL_STOP
return (*container != NULL)? LM_OK: LM_ERR;
}
@@ -450,7 +448,6 @@ LmMetaContainer *LmContainerManagerCache::getMetaContainer(const char *path)
}
// Exclude the following lines for coverage as caching is not used.
-// LCOV_EXCL_START
//////////////////////////////////////////////////////////////////////
// checkCache: Check if the cached needs cleaning or decaying.
//////////////////////////////////////////////////////////////////////
@@ -556,7 +553,6 @@ void LmContainerManagerCache::decayCache()
while ((mc = (LmMetaContainerCache*)metaContainers_->getNext()) != NULL)
mc->decay(d);
}
-// LCOV_EXCL_STOP
//////////////////////////////////////////////////////////////////////
//
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/langman/LmDebug.cpp
----------------------------------------------------------------------
diff --git a/core/sql/langman/LmDebug.cpp b/core/sql/langman/LmDebug.cpp
index 604e6f0..8ab560b 100644
--- a/core/sql/langman/LmDebug.cpp
+++ b/core/sql/langman/LmDebug.cpp
@@ -52,17 +52,15 @@ NABoolean doLmDebug()
// Note: the "LM_DEBUG" string is split into two adjacent strings so
// the preprocessor does not perform macro substitution on LM_DEBUG.
if (getenv("LM_""DEBUG"))
- doLmDebugFlag = TRUE; // LCOV_EXCL_LINE --exclude coverage, used for debugging
+ doLmDebugFlag = TRUE;
char *debug_log = getenv("LM_DEBUG_LOG");
if (debug_log != NULL)
{
// Exclude coverage, used for debugging
-// LCOV_EXCL_START
lmDebugFile = fopen(debug_log, "a");
if (!lmDebugFile)
lmDebugFile = stdout;
-// LCOV_EXCL_STOP
}
}
@@ -74,14 +72,12 @@ void lmDebug(const char *formatString, ...)
if (doLmDebug())
{
// Exclude coverage, used for debugging
-// LCOV_EXCL_START
va_list args;
va_start(args, formatString);
fprintf(lmDebugFile, "[LM DEBUG] ");
vfprintf(lmDebugFile, formatString, args);
fprintf(lmDebugFile, "\n");
fflush(lmDebugFile);
-// LCOV_EXCL_STOP
}
}
@@ -97,7 +93,7 @@ NABoolean doLmDebugSignalHandlers(){
//
if (getenv("LM_DEBUG_SIGNAL_HANDLERS"))
{
- doLmDebugSignalHandlersFlag = TRUE; // LCOV_EXCL_LINE --exclude coverage, used for debugging
+ doLmDebugSignalHandlersFlag = TRUE;
}
}
return doLmDebugSignalHandlersFlag;
@@ -106,11 +102,10 @@ NABoolean doLmDebugSignalHandlers(){
void debugLmSignalHandlers()
{
if(doLmDebugSignalHandlers())
- lmPrintSignalHandlers(); // LCOV_EXCL_LINE --exclude coverage, used for debugging
+ lmPrintSignalHandlers();
}
// Exclude the following function for coverage as this is used only for debugging signal handler
-// LCOV_EXCL_START
NABoolean doNotRestoreSignalHandlersAfterUDF(){
static NABoolean doNotRestoreSignalHandlersAfterUDFFlag = FALSE;
static NABoolean firstTime = TRUE;
@@ -124,7 +119,6 @@ NABoolean doNotRestoreSignalHandlersAfterUDF(){
}
return doNotRestoreSignalHandlersAfterUDFFlag;
}
-// LCOV_EXCL_STOP
#endif // LM_DEBUG
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/langman/LmJavaExceptionReporter.cpp
----------------------------------------------------------------------
diff --git a/core/sql/langman/LmJavaExceptionReporter.cpp b/core/sql/langman/LmJavaExceptionReporter.cpp
index fe61672..ec7c43e 100644
--- a/core/sql/langman/LmJavaExceptionReporter.cpp
+++ b/core/sql/langman/LmJavaExceptionReporter.cpp
@@ -307,7 +307,6 @@ LmJavaExceptionReporter::checkNewObjectExceptions(LmHandle jobj,
}
else
{
-// LCOV_EXCL_START
jstring jstr =
(jstring) jni->CallObjectMethod(jt, (jmethodID) throwableToStringId_);
if (jstr)
@@ -342,7 +341,6 @@ LmJavaExceptionReporter::checkNewObjectExceptions(LmHandle jobj,
jni->DeleteLocalRef(jt);
jni->ExceptionClear();
return LM_ERR;
-// LCOV_EXCL_STOP
}
}
@@ -487,7 +485,6 @@ LmJavaExceptionReporter::getNextChainedException(LmHandle throwable)
//
// Returns: LM_ERR unconditionally
//
-// LCOV_EXCL_START
LmResult
LmJavaExceptionReporter::insertDiags(ComDiagsArea *diags,
Int32 errCode,
@@ -588,7 +585,6 @@ LmJavaExceptionReporter::checkGetMethodExceptions(const char *routineName,
jni->ExceptionClear();
return LM_ERR;
}
-// LCOV_EXCL_STOP
//
// processUserException(): Processes possible uncaught Java exceptions.
@@ -737,7 +733,6 @@ LmJavaExceptionReporter::reportUserSQLException(LmHandle jt,
// MethodValidationException. This exception is thrown by
// the internal SPJ VALIDATEROUTINE.
//
-// LCOV_EXCL_START
void
LmJavaExceptionReporter::reportInternalSPJException(LmHandle jt,
char *errText,
@@ -794,7 +789,6 @@ LmJavaExceptionReporter::reportInternalSPJException(LmHandle jt,
}
}
-// LCOV_EXCL_STOP
//
// reportJavaObjException(): populates the diags for
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/langman/LmJavaHooks.cpp
----------------------------------------------------------------------
diff --git a/core/sql/langman/LmJavaHooks.cpp b/core/sql/langman/LmJavaHooks.cpp
index 0605a21..f82e667 100644
--- a/core/sql/langman/LmJavaHooks.cpp
+++ b/core/sql/langman/LmJavaHooks.cpp
@@ -44,7 +44,6 @@
char LmJavaHooks::textBuf_[LMJ_HOOK_TEXT_BUF_SIZE] = {'\0'};
// Exclude the following methods for coverage as they are called when JVM aborts
-// LCOV_EXCL_START
void JNICALL LmJavaHooks::abortHookJVM()
{
LM_DEBUG0("[HOOK] Invoking JVM abort hook");
@@ -127,7 +126,6 @@ jint JNICALL LmJavaHooks::vfprintfHookJVM(FILE *stream, const char *fmt,
LM_DEBUG0("[END vfprintf hook]");
return 0;
}
-// LCOV_EXCL_STOP
void LmJavaHooks::init_vfprintfHook()
{
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/langman/LmLangManager.cpp
----------------------------------------------------------------------
diff --git a/core/sql/langman/LmLangManager.cpp b/core/sql/langman/LmLangManager.cpp
index f5153ce..03303b0 100644
--- a/core/sql/langman/LmLangManager.cpp
+++ b/core/sql/langman/LmLangManager.cpp
@@ -50,7 +50,6 @@
// LM service: convertIn.
//////////////////////////////////////////////////////////////////////
// Exclude the following methods for coverage as they are not used in LM.
-// LCOV_EXCL_START
LmResult LmLanguageManager::convertIn(
NAType *src,
NAType **dst,
@@ -112,7 +111,6 @@ LmResult LmLanguageManager::convertOut(
return convertIn(src, dst, mem);
}
-// LCOV_EXCL_STOP
//////////////////////////////////////////////////////////////////////
// skipURLProtocol.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/langman/LmResultSetJava.cpp
----------------------------------------------------------------------
diff --git a/core/sql/langman/LmResultSetJava.cpp b/core/sql/langman/LmResultSetJava.cpp
index b9468c6..8651237 100644
--- a/core/sql/langman/LmResultSetJava.cpp
+++ b/core/sql/langman/LmResultSetJava.cpp
@@ -223,7 +223,6 @@ void LmResultSetJava::initType4ResultSet(Int32 paramPos,
}
// Exclude the following functions for coverage as Type 2 JDBC is not used any more
-// LCOV_EXCL_START
void
LmResultSetJava::initType2ResultSet(Int32 paramPos,
const char *routineName,
@@ -391,7 +390,6 @@ LmResultSetJava::initType2ResultSet(Int32 paramPos,
}
}
-// LCOV_EXCL_STOP
// Destructor:
LmResultSetJava::~LmResultSetJava()
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/langman/LmUtility.cpp
----------------------------------------------------------------------
diff --git a/core/sql/langman/LmUtility.cpp b/core/sql/langman/LmUtility.cpp
index e4db61c..3934199 100644
--- a/core/sql/langman/LmUtility.cpp
+++ b/core/sql/langman/LmUtility.cpp
@@ -144,7 +144,6 @@ void lmUtilityInitConnList( JNIEnv *jni, jmethodID connCloseId )
// Returns the 'connList' as a reference
NAList<jobject> &lmUtilityGetConnList() { return lmUtilityConnList; }
-// LCOV_EXCL_START
static void Throw(JNIEnv *env, const char *msg)
{
jclass c = env->FindClass("java/lang/Exception");
@@ -163,7 +162,6 @@ void SQL_ERROR_HANDLER(Lng32 sqlCode)
// This is a no-op for now. Might be useful in the future for logic
// that needs to be executed after any CLI error.
}
-// LCOV_EXCL_STOP
// The MXStatement class provides a simple interface into the SQL/MX
// CLI and can be used for SQL operations in a C++ program that is not
@@ -216,7 +214,6 @@ public:
numOutColumns_ = 0;
}
-// LCOV_EXCL_START
Lng32 init(const char *&status)
{
Lng32 result = 0;
@@ -286,7 +283,6 @@ public:
SQL_ERROR_HANDLER(result);
return result;
}
-// LCOV_EXCL_STOP
~MXStatement()
{
@@ -301,7 +297,6 @@ public:
delete [] stmtText_;
}
-// LCOV_EXCL_START
Lng32 prepare(const char *stmtText)
{
if (!initialized_)
@@ -525,7 +520,6 @@ public:
Lng32 getNumInColumns() { return numInColumns_; }
Lng32 getNumOutColumns() { return numOutColumns_; }
-// LCOV_EXCL_STOP
protected:
SQLSTMT_ID stmtId_;
@@ -572,7 +566,6 @@ JNIEXPORT void JNICALL Java_org_trafodion_sql_udr_LmUtility_nativeUtils
static MXStatement staticStmt;
-// LCOV_EXCL_START
if (action.compareTo("GetTxName", NAString::ignoreCase) == 0)
{
Int64 transid;
@@ -998,7 +991,6 @@ JNIEXPORT void JNICALL Java_org_trafodion_sql_udr_LmUtility_nativeUtils
result += action;
Throw(env, result);
}
-// LCOV_EXCL_STOP
//
// Create the Java output string
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/langman/vers_libtdm_sqllangman.cpp
----------------------------------------------------------------------
diff --git a/core/sql/langman/vers_libtdm_sqllangman.cpp b/core/sql/langman/vers_libtdm_sqllangman.cpp
index cd11217..fc98d33 100644
--- a/core/sql/langman/vers_libtdm_sqllangman.cpp
+++ b/core/sql/langman/vers_libtdm_sqllangman.cpp
@@ -26,6 +26,4 @@
#define VERS_CV_MIN 0
#define VERS_CV_UPD 1
-// LCOV_EXCL_START
VERS_LIB(libtdm_sqllangman)
-// LCOV_EXCL_STOP
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/optimizer/Analyzer.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/Analyzer.cpp b/core/sql/optimizer/Analyzer.cpp
index 1a2532e..57cbeac 100644
--- a/core/sql/optimizer/Analyzer.cpp
+++ b/core/sql/optimizer/Analyzer.cpp
@@ -58,7 +58,6 @@
void forceCQS1(RelExpr *, RelExpr *);
-// LCOV_EXCL_START :rfi
// tmp methods
void xxx()
{
@@ -69,7 +68,6 @@ void revisitLater()
{
CMPASSERT(FALSE);
}
-// LCOV_EXCL_STOP
// -----------------------------------------------------------------------
// Methods for class CANodeId
@@ -423,7 +421,6 @@ CANodeId CANodeIdSet::getJBBCwithMinConnectionsToThisJBBSubset() const
} // for loop to pick the jbbc with min connections, and collect if there are
// more than one with min connections.
-// LCOV_EXCL_START
// debugging code
#ifdef _DEBUG
if ( CmpCommon::getDefault( NSK_DBG ) == DF_ON &&
@@ -437,7 +434,6 @@ if ( CmpCommon::getDefault( NSK_DBG ) == DF_ON &&
<<endl;
}
#endif
-// LCOV_EXCL_STOP
if (jbbcsWithMinConnections.entries() > 1)
{
@@ -498,14 +494,14 @@ if ( CmpCommon::getDefault( NSK_DBG ) == DF_ON &&
CURRCONTEXT_OPTDEBUG->stream() << "Connections tried "\
<< id.getText() \
<< " with " << id2.getText() \
- << endl; // LCOV_EXCL_LINE :dpm
+ << endl;
CURRCONTEXT_OPTDEBUG->stream() << "Number of columns "\
<< istring(Lng32(idCols.entries()))\
- <<endl; // LCOV_EXCL_LINE :dpm
+ <<endl;
CURRCONTEXT_OPTDEBUG->stream() << "Equality factor "\
<< eqFactor.value() \
<< endl
- << endl; // LCOV_EXCL_LINE :dpm
+ << endl;
}
#endif
} // for loop to traverse all two way connections
@@ -519,17 +515,16 @@ if ( CmpCommon::getDefault( NSK_DBG ) == DF_ON &&
{
CURRCONTEXT_OPTDEBUG->stream() << "CANodeId picked up "\
<< childWithMinConnections.getText() \
- << endl; // LCOV_EXCL_LINE :dpm
+ << endl;
CURRCONTEXT_OPTDEBUG->stream() << "Max Equality factor "\
<< maxEqFactor.value() \
<< endl
- << endl; // LCOV_EXCL_LINE :dpm
+ << endl;
}
#endif
return childWithMinConnections;
}
-// LCOV_EXCL_START :cnu
// get minimum estimated row count of the group from amongst the nodeSet
CostScalar CANodeIdSet::getMinChildEstRowCount() const
{
@@ -546,7 +541,6 @@ CostScalar CANodeIdSet::getMinChildEstRowCount() const
}
return minEstCard;
}
-// LCOV_EXCL_STOP
// compute the JBBSubset structure for this CANodeIdSet
@@ -598,7 +592,6 @@ JBBSubset * CANodeIdSet::jbbcsToJBBSubset() const
return result;
}
-// LCOV_EXCL_START :dpm
const NAString CANodeIdSet::getText() const
{
NAString result("CANodeIdSet: {");
@@ -621,7 +614,6 @@ void CANodeIdSet::print (FILE *f,
{
fprintf (f, getText());
}
-// LCOV_EXCL_STOP
// -----------------------------------------------------------------------
// Methods for class CANodeIdSetMap
@@ -712,7 +704,6 @@ QueryAnalysis::QueryAnalysis(CollHeap *outHeap, NABoolean analysis):
}
// destruct a QueryAnalysis
-// LCOV_EXCL_START :dd
QueryAnalysis::~QueryAnalysis()
{
delete tCGraph_;
@@ -720,7 +711,6 @@ QueryAnalysis::~QueryAnalysis()
delete mvQueryRewriteHandler_;
// should loop over other collections and delete later
}
-// LCOV_EXCL_STOP
// This is a temporary placement of initialization. Later it shall be
@@ -1040,10 +1030,8 @@ JBBC * QueryAnalysis::newJBBC(Join* parent, RelExpr* expr,
jbbcsProducingOutput = outputToJBBCsMap_[jbbcOutput];
}
else{
-// LCOV_EXCL_START :rfi
jbbcsProducingOutput = new (STMTHEAP) CANodeIdSet();
outputToJBBCsMap_.insertAt(jbbcOutput, jbbcsProducingOutput);
-// LCOV_EXCL_STOP
}
(*jbbcsProducingOutput) += nodeAnalysis->getId();
@@ -1639,10 +1627,8 @@ void QueryAnalysis::analyzeJBBCDependencies(RelExpr* expr)
NABoolean QueryAnalysis::hasMandatoryXP()
{
-// LCOV_EXCL_START :rfi
if(hasMandatoryXPComputed_)
return hasMandatoryXP_;
-// LCOV_EXCL_STOP
hasMandatoryXP_ = FALSE;
@@ -1880,7 +1866,6 @@ void QueryAnalysis::graphDisplay() const
// Display graph is OFF. bye bye
return;
}
-// LCOV_EXCL_START :dpm
if(*fname && strcasecmp(fname,"ON") == 0)
{
// The default file name is used here
@@ -1912,11 +1897,9 @@ void QueryAnalysis::graphDisplay() const
result += "}\n";
fileout<<result;
-// LCOV_EXCL_STOP
return;
}
-// LCOV_EXCL_START :dpm
const NAString QueryAnalysis::getText() const
{
NAString result(heap_);
@@ -1963,7 +1946,6 @@ void QueryAnalysis::print (FILE *f,
{
fprintf (f, getText());
}
-// LCOV_EXCL_STOP
// -----------------------------------------------------------------------
// pilotAnalysis() and jbbAnalysis() and other RelExpr methods
@@ -2048,7 +2030,7 @@ NABoolean Scan::pilotAnalysis(QueryAnalysis* qa)
}
if (!qa->newTableAnalysis(this))
- return FALSE; // LCOV_EXCL_LINE :rfi
+ return FALSE;
return TRUE;
}
@@ -2518,7 +2500,6 @@ EstLogPropSharedPtr MultiJoin::setJBBInput(EstLogPropSharedPtr & inLP)
return QueryAnalysis::ASM()->getStatsForJBBSubset(jbbSubset_);
}
-// LCOV_EXCL_START :cnu
RelExpr* RelExpr::expandMultiJoinSubtree()
{
// pass it to children
@@ -2532,7 +2513,6 @@ RelExpr* RelExpr::expandMultiJoinSubtree()
return this;
}
-// LCOV_EXCL_STOP
// xxx move this to RelExpr.h and make inline
GroupAnalysis * RelExpr::getGroupAnalysis()
@@ -2729,7 +2709,6 @@ void ValueIdSet::accumulateReferencingExpressions(const ValueIdSet & referencing
// This method remove those expressions that are members of the
// referencingSet and not referencing any value in ReferencedSet.
// -----------------------------------------------------------------------
-// LCOV_EXCL_START :cnu
void ValueIdSet::removeNonReferencingExpressions(const ValueIdSet & otherSet,
NABoolean doNotDigInsideVegRefs,
NABoolean doNotDigInsideInstNulls)
@@ -2755,7 +2734,6 @@ void ValueIdSet::removeNonReferencingExpressions(const ValueIdSet & otherSet,
subtractElement(myExpr); // delete expression from set
} // myExpr loop
}
-// LCOV_EXCL_STOP
// -----------------------------------------------------------------------
// ValueIdSet::findAllReferencedBaseCols()
@@ -2796,7 +2774,6 @@ void ValueIdSet::findAllReferencedIndexCols(ValueIdSet & result) const
// This method finds all eqaulity columns referenced directly or indirectly
// via this ValueIdSet.
// -----------------------------------------------------------------------
-// LCOV_EXCL_START :cnu
void ValueIdSet::findAllEqualityCols(ValueIdSet & result) const
{
// Iterate through all the expressions in the set
@@ -2805,7 +2782,6 @@ void ValueIdSet::findAllEqualityCols(ValueIdSet & result) const
x.getItemExpr()->findEqualityCols(result);
}
}
-// LCOV_EXCL_STOP
// -----------------------------------------------------------------------
// Perform columnAnalysis on this set
@@ -3149,12 +3125,10 @@ GroupAnalysis::GroupAnalysis(const GroupAnalysis & other,
}
}
-// LCOV_EXCL_START :dd
GroupAnalysis::~GroupAnalysis()
{
delete localJBBView_;
}
-// LCOV_EXCL_STOP
// clear analysis results in GroupAnalysis.
// note: this should clear only analysis results and
@@ -3166,7 +3140,6 @@ void GroupAnalysis::clear()
allSubtreeTables_.clear();
}
-// LCOV_EXCL_START :dpm
const NAString GroupAnalysis::getText() const
{
NAString result("GroupAnalysis:\n");
@@ -3230,7 +3203,6 @@ NABoolean GroupAnalysis::operator == (const GroupAnalysis & other)
// the two groups are equivalent
return TRUE;
}
-// LCOV_EXCL_STOP
// The parent JBB view of the JBBSubset. If this group is a
// JBBC then a JBBSubset of this JBBC alone is returned. Otherwise
@@ -3366,7 +3338,6 @@ void GroupAnalysis::reconcile(GroupAnalysis * other)
// Methods for class NodeAnalysis
// -----------------------------------------------------------------------
-// LCOV_EXCL_START :cnu
EstLogPropSharedPtr NodeAnalysis::getStats()
{
@@ -3378,7 +3349,6 @@ EstLogPropSharedPtr NodeAnalysis::getStats()
return stats_;
}
-// LCOV_EXCL_STOP
CostScalar NodeAnalysis::getCardinality()
{
@@ -3451,7 +3421,6 @@ void NodeAnalysis::computeStats()
return;
}
-// LCOV_EXCL_START :dpm
const NAString NodeAnalysis::getText() const
{
NAString result("NodeAnalysis # ");
@@ -3481,7 +3450,6 @@ void NodeAnalysis::print (FILE *f,
{
fprintf (f, getText());
}
-// LCOV_EXCL_STOP
NABoolean NodeAnalysis::isExtraHub()
{
@@ -3498,7 +3466,6 @@ NABoolean NodeAnalysis::isExtraHub()
// Methods for class TableAnalysis
// -----------------------------------------------------------------------
-// LCOV_EXCL_START :cnu & dpm
// List access paths that are promising for predicate lookup
const LIST(AccessPathAnalysis*) &
TableAnalysis::promisingAccessPathsForLookup()
@@ -3648,7 +3615,6 @@ void TableAnalysis::print (FILE *f,
{
fprintf (f, getText());
}
-// LCOV_EXCL_STOP
void TableAnalysis::initAccessPaths()
{
@@ -3895,14 +3861,12 @@ void TableAnalysis::checkIfCompressedHistsViable()
qa->disableCompressedHistsViable();
}
-// LCOV_EXCL_START :cnu
ValueIdSet TableAnalysis::getConnectingVegPreds(ColAnalysis & col) const
{
ValueIdSet result = vegPreds_;
result.intersectSet(col.getVegPreds());
return result;
}
-// LCOV_EXCL_STOP
ValueIdSet TableAnalysis::getConnectingVegPreds(TableAnalysis & other) const
{
@@ -3913,7 +3877,6 @@ ValueIdSet TableAnalysis::getConnectingVegPreds(TableAnalysis & other) const
////////////////////////////////////////
-// LCOV_EXCL_START :cnu
// Get all JBBCs that are connected to this set of columns and the join preds
// This table must be JBBC
CANodeIdSet TableAnalysis::getJBBCsConnectedToCols(const CANodeIdSet & jbbcs,
@@ -3960,7 +3923,6 @@ CANodeIdSet TableAnalysis::getJBBCsConnectedToCols(const CANodeIdSet & jbbcs,
}
return result;
};
-// LCOV_EXCL_STOP
// Get the JBBCs that are connected to the maximum prefix size in the given column list
// This table must be JBBC
@@ -4150,7 +4112,6 @@ CostScalar TableAnalysis::getBaseUec(const ValueIdSet & columns)
}
-// LCOV_EXCL_START :cnu
// Compute the local predicates on this table that references any of these columns
// of the table
@@ -4185,7 +4146,6 @@ ValueIdSet TableAnalysis::getLocalPredsOnColumns(const ValueIdSet & cols,
return result;
};
-// LCOV_EXCL_STOP
// Compute the local predicates on this table that references a prefix of this
// column list. compute also the prefix size.
@@ -4279,7 +4239,6 @@ CostScalar TableAnalysis::getCardinalityOfBaseTable()
return getStatsOfBaseTable()->getResultCardinality();
}
-// LCOV_EXCL_START :cnu
CostScalar TableAnalysis::getMaxCardinalityOfBaseTable()
{
return getStatsOfBaseTable()->getMaxCardEst();
@@ -4363,7 +4322,6 @@ NABoolean TableAnalysis::predsOnUnique(ValueIdSet& vidSet,
return FALSE;
}
-// LCOV_EXCL_STOP
// get a rough estimate of cost for doing a nested join
// number of probes = dataFlowFromEdge
@@ -4464,7 +4422,6 @@ AccessPathAnalysis::AccessPathAnalysis
}
}
-// LCOV_EXCL_START :cnu
NABoolean AccessPathAnalysis::isIndexOnly()
{
// xxx May be I should cache the result of this method if turn out
@@ -4569,7 +4526,6 @@ ValueIdSet JBBItem::predecessorPredsOnOther(const JBBItem & other) const
result.intersectSet(other.getPredsWithSuccessors());
return result;
}
-// LCOV_EXCL_STOP
// -----------------------------------------------------------------------
// Methods for class JBBC
@@ -4593,7 +4549,6 @@ void JBBC::setJoinPreds(const ValueIdSet & joinPreds)
}
}
-// LCOV_EXCL_START
// Not used - we are using the JBBSubset version of this
ValueIdSet JBBC::joinPredsWithOther(const JBBC & other) const
{
@@ -4616,7 +4571,6 @@ ValueIdSet JBBC::joinPredsWithOther(const JBBC & other) const
return result;
}
-// LCOV_EXCL_STOP
void JBBC::setPredsWithDependencies(const ValueIdSet & predsWithDependencies,
const ValueIdSet & predsWithPredecessors)
@@ -4658,7 +4612,6 @@ void JBBC::setPredsWithDependencies(const ValueIdSet & predsWithDependencies,
jbbcCharOutput);
}
-// LCOV_EXCL_START :cnu
// Get all JBBCs that are have no join predicate with this JBBC.
CANodeIdSet JBBC::getJBBCsThatXProductWithMe() const
{
@@ -4669,7 +4622,6 @@ CANodeIdSet JBBC::getJBBCsThatXProductWithMe() const
result.subtractSet(predecessorJBBCs_);
return result;
}
-// LCOV_EXCL_STOP
CANodeIdSet JBBC::getJBBCsConnectedViaKeyJoins()
{
@@ -4715,7 +4667,6 @@ CANodeIdSet JBBC::getJBBCsConnectedViaKeyJoins()
return jbbcsJoinedViaTheirKey_;
}
-// LCOV_EXCL_START :cnu
/* Do not inspect this method */
// Returns a subset of getJoinedJBBCs that are joined with this JBBC
// on this particular column
@@ -4735,7 +4686,6 @@ CANodeIdSet JBBC::getJoinedJBBCsOnTheseColumns(const ValueIdSet & cols,
xxx();
return CANodeIdSet(heap_);
}
-// LCOV_EXCL_STOP
NABoolean JBBC::isGuaranteedEqualizer()
{
@@ -4767,7 +4717,6 @@ NABoolean JBBC::isGuaranteedEqualizer()
return isGuaranteedEqualizer_;
}
-// LCOV_EXCL_START :cnu
NABoolean JBBC::hasNonExpandingJoin()
{
@@ -4844,7 +4793,6 @@ void JBBC::print (FILE *f,
{
fprintf (f, getText());
}
-// LCOV_EXCL_STOP
// -----------------------------------------------------------------------
// Methods for class JBBSubset
@@ -4912,7 +4860,6 @@ CANodeIdSet JBBSubset::getJBBCsAndGB() const
return jbbcsAndGB;
}
-// LCOV_EXCL_START :cnu
// Get all JBBCs that are have no join predicate with this JBBSubset.
CANodeIdSet JBBSubset::getJBBCsThatXProductWithMe() const
{
@@ -4923,7 +4870,6 @@ CANodeIdSet JBBSubset::getJBBCsThatXProductWithMe() const
result.subtractSet(getPredecessorJBBCs());
return result;
}
-// LCOV_EXCL_STOP
// Copy the JBBCs and GB from other JBBSubset.
// This method copy the JBBSubset without copying its heap_ affiliation.
@@ -4938,7 +4884,6 @@ void JBBSubset::copySubsetMembers(const JBBSubset & other)
// Of course we should NOT copy heap_ here.
}
-// LCOV_EXCL_START :cnu
// Subtract the content (JBBCs and GB) of other JBBSubset from this
// JBBSubset. This method side-effect this JBBSubset.
void JBBSubset::subtractSubset(const JBBSubset & other)
@@ -4950,7 +4895,6 @@ void JBBSubset::subtractSubset(const JBBSubset & other)
}
clearAnalysis();
}
-// LCOV_EXCL_STOP
// add the content (JBBCs and GB) of other JBBSubset to this
// JBBSubset. This method side-effect this JBBSubset.
@@ -5138,7 +5082,6 @@ NAList<CANodeIdSet*>* JBBSubsetAnalysis::getConnectedSubgraphs(NABoolean followS
}
-// LCOV_EXCL_START :cnu
CANodeIdSet JBBSubsetAnalysis::getInputSubgraph(CANodeId node, NABoolean followSuccessors) const
{
@@ -5186,7 +5129,6 @@ CANodeIdSet JBBSubsetAnalysis::getInputSubgraph(CANodeId node, NABoolean followS
return inputSubgraph;
}
-// LCOV_EXCL_STOP
CANodeIdSet JBBSubset::getSubtreeTables() const
{
@@ -5337,7 +5279,6 @@ NABoolean JBBSubset::isGuaranteedNonExpandingJoin(JBBC jbbc)
return jbbcGA->isUnique(ColVegRefSet);
}
-// LCOV_EXCL_START :cnu
// verify integrity of the JBBSubset. That is
// jbbcs_ contains only jbbcs from same JBB
// gb_ belongs to a group by of the same JBB
@@ -5375,7 +5316,6 @@ void JBBSubset::print (FILE *f,
{
fprintf (f, getText());
}
-// LCOV_EXCL_STOP
// -----------------------------------------------------------------------
// Methods for class JBBSubsetAnalysis
@@ -5431,7 +5371,6 @@ JBBSubsetAnalysis::JBBSubsetAnalysis(const JBBSubset & subset,
init();
}
-// LCOV_EXCL_START :cnu
// which JBBCs can I add to this subset while reserving its self-dpendency
CANodeIdSet JBBSubsetAnalysis::legalJBBCAdditions() const
{
@@ -5442,7 +5381,6 @@ CANodeIdSet JBBSubsetAnalysis::legalJBBCAdditions() const
result.subtractSet(jbbcs_);
return result;
}
-// LCOV_EXCL_STOP
// initialize JBBSubsetAnalysis computable fields
void JBBSubsetAnalysis::init()
@@ -5739,7 +5677,6 @@ void JBBSubsetAnalysis::setSubsetMJ(MultiJoin * subsetMJ)
subsetMJ_ = subsetMJ;
}
-// LCOV_EXCL_START
// Used to be used by LargeScopeRules old topMatch method of MJStarJoinIRule,
// not used anymore this code is OFF by default
MJRulesWA * JBBSubsetAnalysis::getMJRulesWA()
@@ -6092,7 +6029,6 @@ CANodeId MJRulesWA::computeCenterTable()
return centerTable_;
}
-// LCOV_EXCL_STOP
CASortedList * JBBSubsetAnalysis::getNodesSortedByLocalPredsCard()
{
@@ -6119,7 +6055,6 @@ CASortedList * JBBSubsetAnalysis::getNodesSortedByLocalPredsCard()
return result;
}
-// LCOV_EXCL_START :cnu
CASortedList * JBBSubsetAnalysis::getNodesSortedByLocalKeyPrefixPredsCard()
{
// get CANodeIdSet representing this MultiJoin
@@ -6164,7 +6099,6 @@ CANodeId JBBSubsetAnalysis::getLargestNode()
return NULL_CA_ID;
}
-// LCOV_EXCL_STOP
CANodeId JBBSubsetAnalysis::getLargestIndependentNode()
{
@@ -6308,7 +6242,6 @@ void JBBSubsetAnalysis::analyzeInitialPlan()
(factTable != NULL_CA_ID ) &&
isAStarPattern(factTable, factTableCKPrefixCardinality))
{
-// LCOV_EXCL_START
// for debugging only
#ifdef _DEBUG
if ( CmpCommon::getDefault( NSK_DBG ) == DF_ON &&
@@ -6317,7 +6250,6 @@ void JBBSubsetAnalysis::analyzeInitialPlan()
CURRCONTEXT_OPTDEBUG->stream() << "JBBSubsetAnalysis StarJoinTypeI feasible" <<endl;
}
#endif //_DEBUG
-// LCOV_EXCL_STOP
factTable_ = factTable;
setStarJoinTypeIFeasible();
arrangeTablesAfterFactForStarJoinTypeI();
@@ -6564,13 +6496,11 @@ CANodeId JBBSubsetAnalysis::findFactTable(
if ( CmpCommon::getDefault( NSK_DBG ) == DF_ON &&
CmpCommon::getDefault( NSK_DBG_MJRULES_TRACKING ) == DF_ON )
{
-// LCOV_EXCL_START :dpm
CURRCONTEXT_OPTDEBUG->stream() << "Picked the fact Table specified by user" << endl;
CURRCONTEXT_OPTDEBUG->stream() << "fact Table: " << factTable.getText() << endl;
CURRCONTEXT_OPTDEBUG->stream() << "fact Table num rows scanned: ";
CURRCONTEXT_OPTDEBUG->stream() << istring(Lng32(factTableCKPrefixCardinality.value()))\
<< endl;
-// LCOV_EXCL_STOP
}
#endif
break;
@@ -6852,7 +6782,6 @@ CANodeId JBBSubsetAnalysis::findFactTable(
if ( CmpCommon::getDefault( NSK_DBG ) == DF_ON &&
CmpCommon::getDefault( NSK_DBG_MJRULES_TRACKING ) == DF_ON )
{
-// LCOV_EXCL_START :dpm
CURRCONTEXT_OPTDEBUG->stream() << "Largest Table: " << largestTable.getText() << endl;
CURRCONTEXT_OPTDEBUG->stream() << "Largest Table num rows scanned: ";
CURRCONTEXT_OPTDEBUG->stream() << istring(Lng32(largestTableCardinality.value()))\
@@ -6883,7 +6812,6 @@ CANodeId JBBSubsetAnalysis::findFactTable(
CURRCONTEXT_OPTDEBUG->stream() << istring(Lng32(secondLargestTableTotalDataVol.value()))\
<< endl;
CURRCONTEXT_OPTDEBUG->stream() << endl;
-// LCOV_EXCL_STOP
}
#endif //_DEBUG
@@ -7066,12 +6994,10 @@ CANodeId JBBSubsetAnalysis::computeCenterTable()
if ( CmpCommon::getDefault( NSK_DBG ) == DF_ON &&
CmpCommon::getDefault( NSK_DBG_MJRULES_TRACKING ) == DF_ON )
{
-// LCOV_EXCL_START :dpm
CURRCONTEXT_OPTDEBUG->stream() << "Pattern match parameters are: "<<endl;
CURRCONTEXT_OPTDEBUG->stream() << "Min center connectivity: "<<minimumCenterConnectivity<<endl;
CURRCONTEXT_OPTDEBUG->stream() << "Max dimension connectivity: "<<maximumDimensionConnectivity<<endl;
CURRCONTEXT_OPTDEBUG->stream() << endl;
-// LCOV_EXCL_STOP
}
#endif //_DEBUG
@@ -7137,11 +7063,9 @@ CANodeId JBBSubsetAnalysis::computeCenterTable()
if ( CmpCommon::getDefault( NSK_DBG ) == DF_ON &&
CmpCommon::getDefault( NSK_DBG_MJRULES_TRACKING ) == DF_ON )
{
-// LCOV_EXCL_START :dpm
CURRCONTEXT_OPTDEBUG->stream() << "JBBC: "<<currentTable.getText()<<endl;
CURRCONTEXT_OPTDEBUG->stream() << "connected jbbcs: "<<connectedChildren.getText()<<endl;
CURRCONTEXT_OPTDEBUG->stream() << endl;
-// LCOV_EXCL_STOP
}
#endif //_DEBUG
@@ -7210,7 +7134,6 @@ CANodeId JBBSubsetAnalysis::computeCenterTable()
if ( CmpCommon::getDefault( NSK_DBG ) == DF_ON &&
CmpCommon::getDefault( NSK_DBG_MJRULES_TRACKING ) == DF_ON )
{
-// LCOV_EXCL_START :dpm
if(center != NULL_CA_ID)
{
CURRCONTEXT_OPTDEBUG->stream() << "Center Table is: "<<center.getText()<<endl;
@@ -7221,7 +7144,6 @@ CANodeId JBBSubsetAnalysis::computeCenterTable()
else{
CURRCONTEXT_OPTDEBUG->stream() << "No center table found "<<center.getText()<<endl;
}
-// LCOV_EXCL_STOP
}
#endif //_DEBUG
@@ -7278,7 +7200,6 @@ CANodeId JBBSubsetAnalysis::computeCenterTable()
if ( CmpCommon::getDefault( NSK_DBG ) == DF_ON &&
CmpCommon::getDefault( NSK_DBG_MJRULES_TRACKING ) == DF_ON )
{
-// LCOV_EXCL_START :dpm
CURRCONTEXT_OPTDEBUG->stream() << "Center Table Rows Scanned: "\
<<centerTableRowsScanned_.getValue()<<endl;
CURRCONTEXT_OPTDEBUG->stream() << "Center Table Record Size: "\
@@ -7289,7 +7210,6 @@ CANodeId JBBSubsetAnalysis::computeCenterTable()
<<centerTablePartitions_.getValue()<<endl;
CURRCONTEXT_OPTDEBUG->stream() << "Center Table size per partition: "\
<<centerTableDataPerPartition_.getValue()<<endl;
-// LCOV_EXCL_STOP
}
#endif //_DEBUG
@@ -7403,10 +7323,8 @@ NABoolean JBBSubsetAnalysis::isAStarPattern(CANodeId factTable,
if ( CmpCommon::getDefault( NSK_DBG ) == DF_ON &&
CmpCommon::getDefault( NSK_DBG_MJRULES_TRACKING ) == DF_ON )
{
-// LCOV_EXCL_START :dpm
CURRCONTEXT_OPTDEBUG->stream() << "Pattern Not Matched, there is no join predicate on prefix of clustering key" <<endl;
CURRCONTEXT_OPTDEBUG->stream() << "MJStarJoinIRule_isAStarPattern_End" <<endl;
-// LCOV_EXCL_STOP
}
#endif //_DEBUG
// return FALSE, indicating this rule is not a good match for the current
@@ -7498,14 +7416,12 @@ NABoolean JBBSubsetAnalysis::isAStarPattern(CANodeId factTable,
if ( CmpCommon::getDefault( NSK_DBG ) == DF_ON &&
CmpCommon::getDefault( NSK_DBG_MJRULES_TRACKING ) == DF_ON )
{
-// LCOV_EXCL_START :dpm
CURRCONTEXT_OPTDEBUG->stream() << "Cost estimate of fact table access as outer most table: "\
<< istring(Lng32(factTableHashJoinCost.value()))\
<<endl;
CURRCONTEXT_OPTDEBUG->stream() << "Star Join will make sense if fact table nested join access is "\
<< istring(Lng32(factTableCostFactor))\
<< " times cheaper" << endl;
-// LCOV_EXCL_STOP
}
#endif //_DEBUG
@@ -7868,12 +7784,10 @@ NABoolean JBBSubsetAnalysis::isAStarPattern(CANodeId factTable,
if ( CmpCommon::getDefault( NSK_DBG ) == DF_ON &&
CmpCommon::getDefault( NSK_DBG_MJRULES_TRACKING ) == DF_ON )
{
-// LCOV_EXCL_START :dpm
CURRCONTEXT_OPTDEBUG->stream() << "Built an edge starting from table "\
<< tableToConsider.getText()<< endl;
CURRCONTEXT_OPTDEBUG->stream() << "The edge is " \
<< currentEdge.getText()<<endl;
-// LCOV_EXCL_STOP
}
#endif
@@ -7918,12 +7832,10 @@ NABoolean JBBSubsetAnalysis::isAStarPattern(CANodeId factTable,
if ( CmpCommon::getDefault( NSK_DBG ) == DF_ON &&
CmpCommon::getDefault( NSK_DBG_MJRULES_TRACKING ) == DF_ON )
{
-// LCOV_EXCL_START :dpm
CURRCONTEXT_OPTDEBUG->stream() << "Built an edge starting from table "\
<< connectedTable.getText()<< endl;
CURRCONTEXT_OPTDEBUG->stream() << "The edge is " \
<< currentEdge.getText()<<endl;
-// LCOV_EXCL_STOP
}
#endif
}
@@ -8073,7 +7985,6 @@ NABoolean JBBSubsetAnalysis::isAStarPattern(CANodeId factTable,
if ( CmpCommon::getDefault( NSK_DBG ) == DF_ON &&
CmpCommon::getDefault( NSK_DBG_MJRULES_TRACKING ) == DF_ON )
{
-// LCOV_EXCL_START :dpm
CURRCONTEXT_OPTDEBUG->stream() << "FactTable after edge " \
<< currentEdge.getText()<<endl;
CURRCONTEXT_OPTDEBUG->stream() << "The cummulative edge is "\
@@ -8090,7 +8001,6 @@ NABoolean JBBSubsetAnalysis::isAStarPattern(CANodeId factTable,
CURRCONTEXT_OPTDEBUG->stream() << "Our cost estimate of fact table nested join: "\
<< istring(Lng32(factTableCost.value()))\
<<endl;
-// LCOV_EXCL_STOP
}
#endif //_DEBUG
@@ -8232,12 +8142,10 @@ NABoolean JBBSubsetAnalysis::isAStarPattern(CANodeId factTable,
if ( CmpCommon::getDefault( NSK_DBG ) == DF_ON &&
CmpCommon::getDefault( NSK_DBG_MJRULES_TRACKING ) == DF_ON )
{
-// LCOV_EXCL_START :dpm
CURRCONTEXT_OPTDEBUG->stream() << "The tables below fact table"\
<< optimalEdgeSet.getText()<<endl;
CURRCONTEXT_OPTDEBUG->stream() << "The tables above fact table "\
<< availableNodes.getText()<<endl;
-// LCOV_EXCL_STOP
}
#endif //_DEBUG
@@ -8261,10 +8169,8 @@ NABoolean JBBSubsetAnalysis::isAStarPattern(CANodeId factTable,
if ( CmpCommon::getDefault( NSK_DBG ) == DF_ON &&
CmpCommon::getDefault( NSK_DBG_MJRULES_TRACKING ) == DF_ON )
{
-// LCOV_EXCL_START :dpm
CURRCONTEXT_OPTDEBUG->stream() << "Pattern Not Matched, there is no significant reduction on fact table" <<endl;
CURRCONTEXT_OPTDEBUG->stream() << "JBBSubsetAnalysis_isAStarPattern_End" <<endl;
-// LCOV_EXCL_STOP
}
#endif //_DEBUG
// return FALSE, indicating this rule is not a good match for the current
@@ -8276,10 +8182,8 @@ NABoolean JBBSubsetAnalysis::isAStarPattern(CANodeId factTable,
if ( CmpCommon::getDefault( NSK_DBG ) == DF_ON &&
CmpCommon::getDefault( NSK_DBG_MJRULES_TRACKING ) == DF_ON )
{
-// LCOV_EXCL_START :dpm
CURRCONTEXT_OPTDEBUG->stream() << "Pattern Matched" <<endl;
CURRCONTEXT_OPTDEBUG->stream() << "JBBSubsetAnalysis_isAStarPattern_End" <<endl;
-// LCOV_EXCL_STOP
}
#endif //_DEBUG
@@ -8550,7 +8454,6 @@ void JBBSubsetAnalysis::arrangeTablesAfterFactForStarJoinTypeI()
if ( CmpCommon::getDefault( NSK_DBG ) == DF_ON &&
CmpCommon::getDefault( NSK_DBG_MJRULES_TRACKING ) == DF_ON )
{
-// LCOV_EXCL_START :dpm
CURRCONTEXT_OPTDEBUG->stream() << "Table to be joined after fact table "\
<< availableNodes.getText() << endl;
@@ -8558,7 +8461,6 @@ void JBBSubsetAnalysis::arrangeTablesAfterFactForStarJoinTypeI()
<< factTable.getText() << endl;
CURRCONTEXT_OPTDEBUG->stream() << "Table to be joined before fact table "\
<< nodesJoinedBeforeFactTable_.getText() << endl;
-// LCOV_EXCL_STOP
}
#endif
@@ -9092,7 +8994,6 @@ const CASortedList * JBBWA::getNodesSortedByLocalKeyPrefixPredsCard()
return byLocalKeyPrefixPredsCard_;
}
-// LCOV_EXCL_START :cnu
const CASortedList * JBBWA::getNodesSortedByCard()
{
if(!byNodeCard_)
@@ -9108,7 +9009,6 @@ const CASortedList * JBBWA::getNodesSortedByData()
return byNodeData_;
}
-// LCOV_EXCL_STOP
const CASortedList * JBBWA::getNodesSortedByOutputData()
{
@@ -9138,7 +9038,6 @@ JBBWA::getCardinalityAfterLocalKeyPrefixPreds(CANodeId node,
return logProps->getResultCardinality();
}
-// LCOV_EXCL_START :cnu
// Given a node, return it's data-size (i.e. cardinality * rowsize)
// after application of local preds on the prefix of the clustering key
// If logProps is passed in is NULL, then ASM will be called to compute
@@ -9170,7 +9069,6 @@ JBBWA::getDataSizeAfterLocalKeyPrefixPreds(CANodeId node,
return (logProps->getResultCardinality() * nodeRecordSize);
}
-// LCOV_EXCL_STOP
// Given a node, return it's cardinality after application of local preds.
// If logProps is passed in is NULL, then ASM will be called to compute
@@ -9192,7 +9090,6 @@ JBBWA::getCardinalityAfterLocalPreds(CANodeId node,
return logProps->getResultCardinality();
}
-// LCOV_EXCL_START :cnu
// Given a node, return it's data-size (i.e. cardinality * rowsize)
// after application of local preds. If logProps is passed in is NULL,
// then ASM will be called to compute the logical properties
@@ -9315,7 +9212,6 @@ CostScalar JBBWA::getNodeDataSize(CANodeId node,
//return the datasize, datasize will be < 0 if this is not a table
return (logProps->getResultCardinality() * nodeRecordSize);
}
-// LCOV_EXCL_STOP
// Given a node, return it's output data size (i.e. rowcount * outputrowsize)
CostScalar JBBWA::getNodeOutputDataSize(CANodeId node,
@@ -9402,7 +9298,6 @@ void JBB::addJBBC(JBBC* jbbc)
jbbc->setJBB(this);
}
-// LCOV_EXCL_START
// Currently not used
// Set the GB in the JBB.
void JBB::setGB(CANodeId gb)
@@ -9412,7 +9307,6 @@ void JBB::setGB(CANodeId gb)
// gb id must belong to GBAnalysis node (no need to check for null)
gbAnalysis_->setJBB(this);
}
-// LCOV_EXCL_STOP
// Set the GB in the JBB using GBAnalysis
void JBB::setGB(GBAnalysis* gb)
@@ -9755,7 +9649,6 @@ NABoolean JBB::hasMandatoryXP() const
return FALSE;
}
-// LCOV_EXCL_START :dpm
const NAString JBB::graphDisplay(const QueryAnalysis* qa) const
{
NAString result = "";
@@ -9895,7 +9788,6 @@ const NAString ColAnalysis::getText() const
return result;
}
-// LCOV_EXCL_STOP
void ColAnalysis::finishAnalysis()
{
@@ -9924,7 +9816,6 @@ void ColAnalysis::finishAnalysis()
return;
}
-// LCOV_EXCL_START
// Currently not used
ValueIdSet ColAnalysis::getConnectingVegPreds(ValueId other)
{
@@ -9932,7 +9823,6 @@ ValueIdSet ColAnalysis::getConnectingVegPreds(ValueId other)
result.intersectSet(other.colAnalysis()->getVegPreds());
return result;
}
-// LCOV_EXCL_STOP
// find all local preds referencing this column
// I am considering caching this localPred xxx
@@ -9943,7 +9833,6 @@ const ValueIdSet ColAnalysis::getLocalPreds() const
return result;
}
-// LCOV_EXCL_START
// This code was being called from LargeScopeRule.cpp method
// MJStarJoinIRule::isAStarPattern but that code is no longer used
// Get all sibling JBBCs that are joined to this table on this column
@@ -9972,7 +9861,6 @@ CANodeIdSet ColAnalysis::getConnectedJBBCs()
return myJoinedJBBCs;
}
-// LCOV_EXCL_STOP
// Get all sibling JBBCs that are joined to this table on this column
// these include JBBCs joined via non_VEG preds like t1.a = t2.b + 7
@@ -10005,7 +9893,6 @@ CANodeIdSet ColAnalysis::getAllConnectedJBBCs()
return myJoinedJBBCs;
}
-// LCOV_EXCL_START
// This is no longer used. Seems to have been replaced by getAllConnectingPreds
// Get connecting Veg Preds between me and this JBBC.
ValueIdSet ColAnalysis::getConnectingPreds(JBBC* jbbc)
@@ -10016,7 +9903,6 @@ ValueIdSet ColAnalysis::getConnectingPreds(JBBC* jbbc)
commonPreds.intersectSet(vegPreds_);
return commonPreds;
}
-// LCOV_EXCL_STOP
// Get connecting Veg Preds between me and this JBBC.
ValueIdSet ColAnalysis::getAllConnectingPreds(JBBC* jbbc)
@@ -10044,7 +9930,6 @@ ValueIdSet ColAnalysis::getAllConnectingPreds(JBBC* jbbc)
// ****************************************************************
-// LCOV_EXCL_START :dpm
// this will be changed to a getText method for ValueIdSet
NAString valueIdSetGetText(const ValueIdSet & set)
{
@@ -10063,7 +9948,6 @@ NAString valueIdSetGetText(const ValueIdSet & set)
result += "}";
return result;
}
-// LCOV_EXCL_STOP
// FALSE does not mean column is not a constant. It means we did not verify
// that it is a constant.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/optimizer/Analyzer.h
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/Analyzer.h b/core/sql/optimizer/Analyzer.h
index 00a5ae5..03146a8 100644
--- a/core/sql/optimizer/Analyzer.h
+++ b/core/sql/optimizer/Analyzer.h
@@ -141,12 +141,10 @@ public:
// assumes the CANodeId represents a JBBC
EstLogPropSharedPtr getJBBInput();
- // LCOV_EXCL_START :dpm
const NAString getText() const
{
return NAString("CANodeId: ") + istring(id_);
}
- // LCOV_EXCL_STOP
inline ValueIdSet getUsedTableCols();
inline const UInt32 toUInt32() const { return id_; };
@@ -295,11 +293,9 @@ public:
CANodeIdSetMap(ULng32 init_size = Default_Size,
CollHeap *outHeap = CmpCommon::statementHeap());
- // LCOV_EXCL_START :dd
// Destructor
virtual ~CANodeIdSetMap()
{}
- // LCOV_EXCL_STOP
inline JBBSubsetAnalysis* get(const CANodeIdSet & key) const
{
@@ -595,7 +591,6 @@ public:
// Handle all the MV query rewrite stuff.
RelExpr* handleMvQueryRewrite(RelExpr* expr);
- // LCOV_EXCL_START :tt
/* Do not inspect monitor members and methods */
// Compile Time Monitors
inline TaskMonitor & pilotPhaseMonitor()
@@ -657,7 +652,6 @@ public:
{
return compilerPhase_;
}
- // LCOV_EXCL_STOP
inline void setCompilerPhase(CompilerPhaseEnum phase)
@@ -984,13 +978,11 @@ class NodeAnalysis : public NABasicObject
public:
- // LCOV_EXCL_START :dd
// destruct the NodeAnalysis
virtual ~NodeAnalysis()
{
// jbbc_, groupBy_, and table_ are deleted seperately
}
- // LCOV_EXCL_STOP
// get the CA Id for this node
inline CANodeId getId()
@@ -1061,12 +1053,10 @@ public:
CostScalar getCardinality();
- // LCOV_EXCL_START :cnu
inline RowSize getRecordSize() const
{
return recordSize_;
}
- // LCOV_EXCL_STOP
///////////////////////////////////
@@ -1177,13 +1167,11 @@ public:
PART_KEY
};
- // LCOV_EXCL_START :dd
// destruct a TableAnalysis
virtual ~TableAnalysis()
{
// loop over access path analysis and delete them
}
- // LCOV_EXCL_STOP
// Get NodeAnalysis for this table
inline NodeAnalysis * getNodeAnalysis() const
@@ -1322,12 +1310,10 @@ public:
}
}
- // LCOV_EXCL_START :cnu
inline const ValueIdSet & getEqualityConnectedCols() const
{
return equalityConnectedCols_;
}
- // LCOV_EXCL_STOP
inline const ValueIdSet & getEqualityConnectingPreds() const
{
@@ -1612,11 +1598,9 @@ public:
AccessPathAnalysis(CollHeap *outHeap = CmpCommon::statementHeap())
{}
- // LCOV_EXCL_START :dd
// destruct an AccessPathAnalysis
virtual ~AccessPathAnalysis()
{}
- // LCOV_EXCL_STOP
// return the IndexDesc
inline IndexDesc * getIndexDesc() const
@@ -1680,11 +1664,9 @@ class GBAnalysis : public NABasicObject
public:
- // LCOV_EXCL_START :dd
// destruct a GBAnalysis
virtual ~GBAnalysis()
{}
- // LCOV_EXCL_STOP
// This returns a copy of the original GB expression that the NodeAnalysis
// was computed for. Please use this method only if necessary. Our ultimate
@@ -1725,12 +1707,10 @@ public:
return jbb_;
}
- // LCOV_EXCL_START :dpm
const NAString getText() const
{
return "GBAnalysis";
}
- // LCOV_EXCL_STOP
private:
@@ -2180,7 +2160,6 @@ public:
JBBSubsetAnalysis(const JBBSubset & subset,
CollHeap *outHeap = CmpCommon::statementHeap());
- // LCOV_EXCL_START :dd
// destruct a JBBSubsetAnalysis
virtual ~JBBSubsetAnalysis()
{}
@@ -2190,7 +2169,6 @@ public:
{
return (allMembers_ == other.allMembers_);
}
- // LCOV_EXCL_STOP
// Get all JBBCs that are joined to this JBBSubset and do not have
// dependency relation with this JBBSubset. For definition of join dependency
@@ -2240,7 +2218,6 @@ public:
return localJoinPreds_;
}
- // LCOV_EXCL_START :cnu
// Get the inner join preds between my jbbcs
virtual const ValueIdSet & getLocalInnerNonSemiJoinPreds() const
{
@@ -2253,7 +2230,6 @@ public:
{
return localDependentJoinPreds_;
}
- // LCOV_EXCL_STOP
// which JBBCs can I add to this subset while reserving its self-dpendency
CANodeIdSet legalJBBCAdditions() const;
@@ -2330,7 +2306,6 @@ public:
return mjStarJoinRuleWA_;
}
- // LCOV_EXCL_START :cnu
void setMJStarJoinIRuleWA(MJStarJoinIRuleWA * mjStarJoinIRuleWA)
{
mjStarJoinIRuleWA_ = mjStarJoinIRuleWA;
@@ -2340,7 +2315,6 @@ public:
{
return mjStarJoinIRuleWA_;
}
- // LCOV_EXCL_STOP
void setMJStarBDRuleWA(MJStarBDRuleWA * mjStarBDRuleWA)
{
@@ -2661,7 +2635,6 @@ public:
return getJBBSubsetAnalysis()->getLocalJoinPreds();
}
- // LCOV_EXCL_START :cnu
// Get the innerNonSemi join preds between my jbbcs
virtual const ValueIdSet & getLocalInnerNonSemiJoinPreds() const
{
@@ -2674,7 +2647,6 @@ public:
{
return getJBBSubsetAnalysis()->getLocalDependentJoinPreds();
}
- // LCOV_EXCL_STOP
// check if this JBBSubset is legal i.e.
// predecessor of each node is found within
@@ -2812,12 +2784,10 @@ public:
return jbbSubsetAnalysis_;
}
- // LCOV_EXCL_START :cnu
inline NABoolean allJoinsInnerNonSemi() const
{
return getJBBSubsetAnalysis()->allJoinsInnerNonSemi();
}
- // LCOV_EXCL_STOP
// get the minimum row count from all JBBCs in the JBBSubset after applying
// local predicates to individual JBBCs
@@ -3064,11 +3034,9 @@ class JBB : public NABasicObject
public:
- // LCOV_EXCL_START :dd
// destruct a JBB
virtual ~JBB()
{}
- // LCOV_EXCL_STOP
// initialize and compute the JBB starting from the top join node
void analyze(Join* topJoinExpr);
@@ -3214,11 +3182,9 @@ public:
predicate_(predicate)
{}
- // LCOV_EXCL_START :dd
// Destructor
virtual ~PredAnalysis()
{}
- // LCOV_EXCL_STOP
// Get the predicate ValueId
inline ValueId getPredicate()
@@ -3381,11 +3347,9 @@ class ColAnalysis : public NABasicObject
public:
- // LCOV_EXCL_START :dd
// Destructor
virtual ~ColAnalysis()
{}
- // LCOV_EXCL_STOP
// Get the Column ValueId
inline ValueId getColumnId()
@@ -3604,11 +3568,9 @@ public:
TableConnectivityGraph(CollHeap *outHeap = CmpCommon::statementHeap())
{}
- // LCOV_EXCL_START :dd
// Destuctor
virtual ~TableConnectivityGraph()
{}
- // LCOV_EXCL_STOP
// get the set of all base columns in the query
inline const ValueIdSet & getColumns()
@@ -3665,10 +3627,8 @@ private:
public:
CANodeId populateReturnCANodeId(RelExpr *, CqsWA*);
- // LCOV_EXCL_START :ale
NABoolean operator == (CQSRelExprCANodeIdPair other)
{return forcedNode_ == other.forcedNode_;}
- // LCOV_EXCL_STOP
};
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/optimizer/AppliedStatMan.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/AppliedStatMan.cpp b/core/sql/optimizer/AppliedStatMan.cpp
index 1b90242..a7d0986 100644
--- a/core/sql/optimizer/AppliedStatMan.cpp
+++ b/core/sql/optimizer/AppliedStatMan.cpp
@@ -199,7 +199,6 @@ RelExpr * AppliedStatMan::getExprForCANodeId(
return jbbcExpr;
} // getExprForCANodeId
-// LCOV_EXCL_START :cnu
// AppliedStatMan::formJoinExprWithCANodeSet fakes a join expression,
// between the left and the right child. This method takes the left
// childId and the right childId, and forms a join expression.
@@ -487,7 +486,6 @@ Join * AppliedStatMan::formJoinExprWithEstLogProps(
return joinExpr;
} // AppliedStatMan::formJoinExprWithEstLogProps
-// LCOV_EXCL_STOP
// This method forms the join expression for join on JBBC specified by jbbcId
// inputEstLogProp should not be cacheable
@@ -667,7 +665,6 @@ EstLogPropSharedPtr AppliedStatMan::synthesizeLogProp(
return outputEstLogProp;
} // AppliedStatMan::synthesizeLogProp
-// LCOV_EXCL_START :cnu
EstLogPropSharedPtr AppliedStatMan::joinEstLogProps (
const EstLogPropSharedPtr& leftEstLogProp,
const EstLogPropSharedPtr& rightEstLogProp,
@@ -755,7 +752,6 @@ EstLogPropSharedPtr AppliedStatMan::joinEstLogProps (
outputEstLogProp = joinExpr->getGroupAttr()->outputLogProp(inLP);
return outputEstLogProp;
}
-// LCOV_EXCL_STOP
// AppliedStatMan::getPotentialOutputs. This method is called from
// formJoinExpr methods. It sets the characteristics output of the
@@ -1235,7 +1231,6 @@ EstLogPropSharedPtr AppliedStatMan::getStatsForLocalPredsOnPrefixOfColList(
} // AppliedStatMan::getStatsForLocalPredsOnPrefixOfColList
-// LCOV_EXCL_START :cnu
// get Stats after applying local predicates on the given columns of JBBC
EstLogPropSharedPtr AppliedStatMan::getStatsForLocalPredsOnGivenCols(
CANodeId jbbc,
@@ -1264,7 +1259,6 @@ EstLogPropSharedPtr AppliedStatMan::getStatsForLocalPredsOnGivenCols(
return getStatsForCANodeId(jbbc, inputLP, &localPredsOnCols);
} // AppliedStatMan::getStatsForLocalPredsOnGivenCols
-// LCOV_EXCL_STOP
// get Stats after doing a join on the Clustering key columns of JBBC
EstLogPropSharedPtr AppliedStatMan::getStatsForJoinPredsOnCKOfJBBC(
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/optimizer/AppliedStatMan.h
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/AppliedStatMan.h b/core/sql/optimizer/AppliedStatMan.h
index 95a99f4..a019096 100644
--- a/core/sql/optimizer/AppliedStatMan.h
+++ b/core/sql/optimizer/AppliedStatMan.h
@@ -69,9 +69,7 @@ class AppliedStatMan : public NABasicObject
public:
AppliedStatMan(CollHeap *outHeap = CmpCommon::statementHeap());
-// LCOV_EXCL_START :dd
~AppliedStatMan() {};
-// LCOV_EXCL_STOP
// Hash method for ASM cache
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/optimizer/BindItemExpr.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/BindItemExpr.cpp b/core/sql/optimizer/BindItemExpr.cpp
index de5cc78..b841c9f 100644
--- a/core/sql/optimizer/BindItemExpr.cpp
+++ b/core/sql/optimizer/BindItemExpr.cpp
@@ -1878,7 +1878,6 @@ ItemExpr *ItemExpr::bindNodeRoot(BindWA *bindWA)
} // ItemExpr::bindNodeRoot()
-// LCOV_EXCL_START :rfi
ItemExpr* ItemExpr::_bindNodeRoot(BindWA *bindWA)
{
return 0;
@@ -1892,7 +1891,6 @@ ItemExpr * ItemExpr::foldConstants(BindWA *bindWA)
bindWA->setErrStatus();
return result;
}
-// LCOV_EXCL_STOP
ItemExpr * ItemExpr::bindUDFsOrSubqueries(BindWA *bindWA)
{
@@ -3544,7 +3542,7 @@ ItemExpr *CharFunc::bindNode(BindWA *bindWA)
case CharInfo::KANJI_MP:
case CharInfo::KSC5601_MP:
- setOperatorType(ITM_NCHAR_MP_CHAR); //LCOV_EXCL_LINE - mp
+ setOperatorType(ITM_NCHAR_MP_CHAR);
break;
default:
@@ -3552,7 +3550,6 @@ ItemExpr *CharFunc::bindNode(BindWA *bindWA)
}
if (!CharInfo::isCharSetSupported(charSet_)) {
-// LCOV_EXCL_START - rfi
// 3010 Character set $0~string0 is not yet supported.
// 4062 The preceding error actually occurred in function $0~String0.
*CmpCommon::diags() << DgSqlCode(-3010)
@@ -3562,7 +3559,6 @@ ItemExpr *CharFunc::bindNode(BindWA *bindWA)
*CmpCommon::diags() << DgSqlCode(-4062) << DgString0(unparsed);
bindWA->setErrStatus();
return NULL;
-// LCOV_EXCL_STOP
}
// CharFunc inherits from BuiltinFunction .. Function .. ItemExpr.
@@ -12358,11 +12354,9 @@ ItemExpr *ItmSequenceFunction::bindNode(BindWA *bindWA)
olap->isFrameEndUnboundedFollowing()) || //olap->getframeEnd() == INT_MAX) ||
(olap->getframeStart() > olap->getframeEnd()))
{
-// LCOV_EXCL_START - rfi
//The specified window frame clause is not valid.
*CmpCommon::diags() << DgSqlCode(-4342);
bindWA->setErrStatus();
-// LCOV_EXCL_STOP
}
if (!olap->isFrameStartUnboundedPreceding() && //olap->getframeStart() != -INT_MAX &&
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/optimizer/BindRI.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/BindRI.cpp b/core/sql/optimizer/BindRI.cpp
index 9ff85b9..eeb1e20 100644
--- a/core/sql/optimizer/BindRI.cpp
+++ b/core/sql/optimizer/BindRI.cpp
@@ -91,7 +91,6 @@
#include "ItemConstr.h"
#include "NATable.h"
-// LCOV_EXCL_START :cnu
/*static*/ void Constraint::makeColSignature(const ValueIdSet &assigns,
ColSignature &outsig)
{
@@ -102,7 +101,6 @@
//## or (to save a little space) size <highest col position + 1>
//## depending on how the bitvec is implemented
} // Constraint::makeColSignature
-// LCOV_EXCL_STOP
AbstractRIConstraint::~AbstractRIConstraint()
{
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/optimizer/BindRelExpr.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/BindRelExpr.cpp b/core/sql/optimizer/BindRelExpr.cpp
index 266e23f..6085508 100644
--- a/core/sql/optimizer/BindRelExpr.cpp
+++ b/core/sql/optimizer/BindRelExpr.cpp
@@ -134,7 +134,6 @@ static void GU_DEBUG_Display(BindWA *bindWA, GenericUpdate *gu,
if (!GU_DEBUG)
return;
-// LCOV_EXCL_START - dpm
if (preEndl) cerr << endl;
cerr << "---" << endl;
@@ -159,7 +158,6 @@ static void GU_DEBUG_Display(BindWA *bindWA, GenericUpdate *gu,
cerr << gu->getUpdTableNameText() << " bwa>cs>grd(" << text << ") " <<flush;
bindWA->getCurrentScope()->getRETDesc()->display();
}
-// LCOV_EXCL_STOP
if (postEndl) cerr << endl;
#endif
@@ -707,7 +705,6 @@ static ItemExpr* bindCheckConstraint(
return constraintPred;
} // bindCheckConstraint()
-// LCOV_EXCL_START - cnu
static ItemExpr *intersectColumns(const RETDesc &leftTable,
const RETDesc &rightTable,
BindWA* bindWA)
@@ -726,7 +723,6 @@ static ItemExpr *intersectColumns(const RETDesc &leftTable,
// Binding this predicate must be done in caller's context/scope, not here...
return predicate;
} // intersectColumns()
-// LCOV_EXCL_STOP
static ItemExpr *joinCommonColumns(const RelExpr *const leftRelExpr,
const RelExpr *const rightRelExpr,
@@ -3134,7 +3130,6 @@ void Join::BuildLeftChildMapForRightJoin()
// member functions for class Intersect
// -----------------------------------------------------------------------
-// LCOV_EXCL_START - cnu
RelExpr *Intersect::bindNode(BindWA *bindWA)
{
if (nodeIsBound())
@@ -3220,13 +3215,11 @@ RelExpr *Intersect::bindNode(BindWA *bindWA)
return join;
} // Intersect::bindNode()
-// LCOV_EXCL_STOP
// -----------------------------------------------------------------------
// member functions for class Except
// -----------------------------------------------------------------------
-// LCOV_EXCL_START - cnu
RelExpr *Except::bindNode(BindWA *bindWA)
{
if (nodeIsBound())
@@ -3312,7 +3305,6 @@ RelExpr *Except::bindNode(BindWA *bindWA)
return join;
} // Excpet::bindNode()
-// LCOV_EXCL_STOP
// -----------------------------------------------------------------------
// member functions for class Union
@@ -6735,14 +6727,12 @@ ItemExpr *RelRoot::selectList()
// Returns current place that assignmentStTree_ points to and
// sets that pointer to NULL
-// LCOV_EXCL_START - cnu
ItemExpr * RelRoot::removeAssignmentStTree()
{
ItemExpr* tempTree = assignmentStTree_;
assignmentStTree_ = NULL;
return tempTree;
}
-// LCOV_EXCL_STOP
bool OptSqlTableOpenInfo::checkColPriv(const PrivType privType,
const PrivMgrUserPrivs *pPrivInfo)
@@ -9577,7 +9567,6 @@ RelExpr *BeforeTrigger::bindNode(BindWA *bindWA)
// -----------------------------------------------------------------------
// member functions for class Insert
// -----------------------------------------------------------------------
-// LCOV_EXCL_START - cnu
static void bindInsertRRKey(BindWA *bindWA, Insert *insert,
ValueIdList &sysColList, CollIndex i)
{
@@ -9636,7 +9625,6 @@ static void bindInsertRRKey(BindWA *bindWA, Insert *insert,
assign->bindNode(bindWA);
insert->rrKeyExpr() = assign->getValueId();
} // bindInsertRRKey
-// LCOV_EXCL_STOP
RelExpr *Insert::bindNode(BindWA *bindWA)
{
@@ -9908,10 +9896,8 @@ RelExpr *Insert::bindNode(BindWA *bindWA)
}
if (GU_DEBUG) {
-// LCOV_EXCL_START - dpm
cerr << "columnLkp " << flush;
columnLkp->display();
-// LCOV_EXCL_STOP
}
for (i = 0; i < columnLkp->getDegree(); i++) {
@@ -10568,12 +10554,10 @@ RelExpr *Insert::bindNode(BindWA *bindWA)
if (isRRTable) {
-// LCOV_EXCL_START -
const LIST(IndexDesc *) indexes = getTableDesc()->getIndexes();
for(i = 0; i < indexes.entries(); i++) {
indexes[i]->getPartitioningFunction()->setAssignPartition(TRUE);
}
-// LCOV_EXCL_STOP
}
// It is a system generated identity value if
@@ -12833,13 +12817,11 @@ RelExpr * GenericUpdate::bindNode(BindWA *bindWA)
}
if (naTable->isVerticalPartition()) {
-// LCOV_EXCL_START - cnu
// On attempt to update an individual VP, say: 4082 table not accessible
*CmpCommon::diags() << DgSqlCode(-4082) <<
DgTableName(naTable->getTableName().getQualifiedNameAsAnsiString());
bindWA->setErrStatus();
return this;
-// LCOV_EXCL_STOP
}
@@ -14074,7 +14056,6 @@ ItemExpr *execPred = NULL;
// -----------------------------------------------------------------------
// RelRoutine
// -----------------------------------------------------------------------
-// LCOV_EXCL_START - rfi
RelExpr *RelRoutine::bindNode(BindWA *bindWA)
{
CMPASSERT(0); // For the time being, all classes above implement their own.
@@ -14098,7 +14079,6 @@ RelExpr *RelRoutine::bindNode(BindWA *bindWA)
// getGroupAttr()->addCharacteristicOutputs(getTableDesc()->getColumnList());
return boundExpr;
} // RelRoutine::bindNode()
-// LCOV_EXCL_STOP
// -----------------------------------------------------------------------
// BuiltinTableValuedFunction
@@ -15965,7 +15945,6 @@ RelExpr * RowsetRowwise::bindNode(BindWA* bindWA)
return newSubTree->bindNode(bindWA);
} // RowsetRowwise::bindNode()
-// LCOV_EXCL_START - rfi
RelExpr * RowsetFor::bindNode(BindWA* bindWA)
{
// Binding of this node should not happen. It should have been eliminated
@@ -15975,7 +15954,6 @@ RelExpr * RowsetFor::bindNode(BindWA* bindWA)
CMPASSERT(0);
return NULL;
}
-// LCOV_EXCL_STOP
RelExpr * RowsetInto::bindNode(BindWA* bindWA)
{
@@ -16804,7 +16782,6 @@ void IsolatedNonTableUDR::populateAndBindItemExpr ( ItemExpr *param,
-// LCOV_EXCL_START - rfi
void
IsolatedNonTableUDR::setInOrOutParam (ItemExpr *expr,
ComColumnDirection paramMode,
@@ -16813,7 +16790,6 @@ IsolatedNonTableUDR::setInOrOutParam (ItemExpr *expr,
// Should not get here..
CMPASSERT(FALSE);
}
-// LCOV_EXCL_STOP
// This method separates the IN and OUT parameters Each IN/INOUT param
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/optimizer/BindWA.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/BindWA.cpp b/core/sql/optimizer/BindWA.cpp
index 83f2a48..8e8c89a 100644
--- a/core/sql/optimizer/BindWA.cpp
+++ b/core/sql/optimizer/BindWA.cpp
@@ -711,13 +711,11 @@ NABoolean BindWA::inMVDefinition() const
// ***********************************************************************
// Display/print, for debugging.
// ***********************************************************************
-// LCOV_EXCL_START :dpm
void BindWA::display() const { print(); }
void BindWA::print(FILE* ofd, const char* indent, const char* title) const
{
} // BindWA::print()
-// LCOV_EXCL_STOP
//============================================================================
//====================== class MvBindContext ===============================
@@ -773,7 +771,6 @@ ItemExpr *BindWA::getHVorDPFromSPDups (ItemExpr *h)
return NULL;
}
-// LCOV_EXCL_START :cnu
NABoolean BindWA::checkHVorDPinSPDups (ItemExpr *h)
{
if ( NULL == getHVorDPFromSPDups (h))
@@ -781,7 +778,6 @@ NABoolean BindWA::checkHVorDPinSPDups (ItemExpr *h)
return TRUE;
}
-// LCOV_EXCL_STOP
NABoolean BindWA::checkMultiOutSPParams (ItemExpr *h)
{
@@ -1034,7 +1030,6 @@ void HostArraysWA::collectHostVarsInPred(ItemExpr *parent, Int32 childNumber)
}
// Searches in list for a host variable whose name is in *inputVar.
// If it finds it, replaces *inputVar with the host variable found
-// LCOV_EXCL_START :cnu
NABoolean HostArraysWA::findHostVar(ItemExpr **inputVar, ItemExpr *list)
{
ItemExpr *ptr = list;
@@ -1068,7 +1063,6 @@ NABoolean HostArraysWA::findHostVar(ItemExpr **inputVar, ItemExpr *list)
*inputVar = NULL;
return FALSE;
}
-// LCOV_EXCL_STOP
// We have found an array host variable in the parse tree.
// We store it and replace it with a name that will be used in the rename node.
@@ -1179,11 +1173,9 @@ void HostArraysWA::processArrayHostVar(ItemExpr *parent, Int32 childNumber)
}
-// LCOV_EXCL_START :cnu
void HostArraysWA::processKeyVar(ItemExpr *parent, Int32 childNumber)
{
}
-// LCOV_EXCL_STOP
// Traverses listOfHostArrays_ and creates a list of mapping variable names
// that will be used in the Rename node. The list of names is pointed by newNames_
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/optimizer/ChangesTable.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/ChangesTable.cpp b/core/sql/optimizer/ChangesTable.cpp
index bb198a5..f6a9b29 100644
--- a/core/sql/optimizer/ChangesTable.cpp
+++ b/core/sql/optimizer/ChangesTable.cpp
@@ -268,12 +268,10 @@ RelExpr *ChangesTable::buildInsert(NABoolean useLeafInsert,
{
// This is the log SYSKEY column
// iud log no longer has a SYSKEY
- // LCOV_EXCL_START
if (needOld && useLeafInsert)
delColExpr = createSyskeyColExpr(colName, FALSE);
if (needNew && useLeafInsert)
insColExpr = createSyskeyColExpr(colName, TRUE);
- // LCOV_EXCL_STOP
}
else
{
@@ -777,14 +775,12 @@ ItemExpr *TriggersTempTable::createAtColExpr(const NAColumn *naColumn,
//////////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////
// iud log no longer has a SYSKEY
-// LCOV_EXCL_START
ItemExpr *TriggersTempTable::createSyskeyColExpr(const NAString& colName,
NABoolean isInsert) const
{
CMPASSERT(FALSE);
return NULL;
}
-// LCOV_EXCL_STOP
//////////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////
@@ -996,7 +992,6 @@ ItemExpr *MvIudLog::createAtColExpr(const NAColumn *naColumn,
case 'A' : // @ALIGNMENT
// ALIGNMENT is not used
- // LCOV_EXCL_START
CMPASSERT(!colName.compareTo(COMMV_ALIGNMENT_COL));
{
Int32 bitmapSize = naColumn->getType()->getNominalSize();
@@ -1004,10 +999,9 @@ ItemExpr *MvIudLog::createAtColExpr(const NAColumn *naColumn,
result = new(heap_) SystemLiteral(*bitmap);
}
break;
- // LCOV_EXCL_STOP
default : // Unknown column
- CMPASSERT(FALSE); // LCOV_EXCL_LINE
+ CMPASSERT(FALSE);
}
return result;
@@ -1104,12 +1098,10 @@ ItemExpr *MvIudLog::createColExprForRangeSize(NABoolean isInsert) const
if (needsRangeLogging_)
{
// range logging is not supported
- // LCOV_EXCL_START
CMPASSERT(isInsert);
result = new(heap_)
ColReference(new(heap_)
ColRefName(InliningInfo::getRowCountVirtualColName(),heap_));
- // LCOV_EXCL_STOP
}
else
{
@@ -1139,13 +1131,11 @@ ItemExpr *MvIudLog::createColExprForAtSyskey(NABoolean isInsert) const
// by DP2 as the timestamp of insertion.
//////////////////////////////////////////////////////////////////////////////
// iud log no longer have a syskey, we now enforce uniqueness using a @TS
-// LCOV_EXCL_START
ItemExpr *MvIudLog::createSyskeyColExpr(const NAString& colName,
NABoolean isInsert) const
{
return new(heap_) SystemLiteral(0);
}
-// LCOV_EXCL_STOP
//////////////////////////////////////////////////////////////////////////////
// build the expression to insert into the @TS column.
@@ -1544,7 +1534,6 @@ void MvIudLog::setTuplesUnionType(Union *unionNode) const
*****************************************************************************/
// MVLOG command is currently not supported
-// LCOV_EXCL_START
//////////////////////////////////////////////////////////////////////////////
// Ctor for building the Insert node.
//////////////////////////////////////////////////////////////////////////////
@@ -1650,7 +1639,6 @@ ItemExpr *MvIudLogForMvLog::createBaseColExpr(const NAString& colName,
ColReference(new(heap_) ColRefName(virtualColumnName, heap_));
}
-// LCOV_EXCL_STOP
/*****************************************************************************
******************************************************************************
@@ -1740,14 +1728,12 @@ ItemExpr *MvLogForContextRows::createAtColExpr(const NAColumn *naColumn,
// There is no log SYSKEY column for the context log!
//////////////////////////////////////////////////////////////////////////////
// should never get here
-// LCOV_EXCL_START
ItemExpr *MvLogForContextRows::createSyskeyColExpr(const NAString& colName,
NABoolean isInsert) const
{
CMPASSERT(FALSE);
return NULL;
}
-// LCOV_EXCL_STOP
//////////////////////////////////////////////////////////////////////////////
// Build the selection predicate for reading a context row from the log.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/optimizer/ChangesTable.h
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/ChangesTable.h b/core/sql/optimizer/ChangesTable.h
index c9a47e1..6531532 100644
--- a/core/sql/optimizer/ChangesTable.h
+++ b/core/sql/optimizer/ChangesTable.h
@@ -82,7 +82,7 @@ public:
// when computing the @TS column
enum RowTsCounter { ROW_TS_INCR = 3 };
- virtual ~ChangesTable() {} // LCOV_EXCL_LINE
+ virtual ~ChangesTable() {}
// Accessors
@@ -192,7 +192,7 @@ public:
RowsType scanType,
BindWA *bindWA);
- virtual ~TriggersTempTable() {} // LCOV_EXCL_LINE
+ virtual ~TriggersTempTable() {}
inline void setBeforeTriggersExist() { beforeTriggersExist_ = TRUE; }
inline NABoolean getBeforeTriggersExist() const { return beforeTriggersExist_; }
@@ -238,16 +238,14 @@ public:
MvIudLog(const GenericUpdate *baseNode,
BindWA *bindWA);
- virtual ~MvIudLog() {} // LCOV_EXCL_LINE
+ virtual ~MvIudLog() {}
MVInfoForDML *getMvInfo() const { return mvInfo_; }
// not used for this templog type
- // LCOV_EXCL_START
virtual NABoolean isEmptyDefaultTransitionName() const { return TRUE; }
virtual NABoolean supportsLateBinding() const { return TRUE; }
- // LCOV_EXCL_STOP
virtual ItemExpr *createAtColExpr(const NAColumn *naColumn,
NABoolean isInsert,
@@ -328,7 +326,7 @@ public:
MvIudLogForMvLog(CorrName& tableName,
BindWA *bindWA);
- virtual ~MvIudLogForMvLog() {} // LCOV_EXCL_LINE
+ virtual ~MvIudLogForMvLog() {}
virtual ItemExpr *createColExprForEpoch() const;
virtual ItemExpr *createColExprForOpType(NABoolean isInsert,
@@ -363,14 +361,12 @@ public:
ItemExpr *catchupNo,
BindWA *bindWA);
- virtual ~MvLogForContextRows() {} // LCOV_EXCL_LINE
+ virtual ~MvLogForContextRows() {}
// not used for this templog type
- // LCOV_EXCL_START
virtual NABoolean isEmptyDefaultTransitionName() const { return TRUE; }
virtual NABoolean supportsLateBinding() const { return FALSE; }
- // LCOV_EXCL_STOP
virtual ItemExpr *createAtColExpr(const NAColumn *naColumn,
NABoolean isInsert,
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/optimizer/ClusteredBitmap.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/ClusteredBitmap.cpp b/core/sql/optimizer/ClusteredBitmap.cpp
index 04f3aa8..e530246 100644
--- a/core/sql/optimizer/ClusteredBitmap.cpp
+++ b/core/sql/optimizer/ClusteredBitmap.cpp
@@ -239,10 +239,8 @@ ClusteredBitmap::increaseBitmapMapSize(UInt32 numNeeded)
for (UInt32 thisIdx = 0; thisIdx < numBitmaps_; thisIdx++)
{
- // LCOV_EXCL_START :cnu
newMap[thisIdx].significantBits_ = bitmapMap_[thisIdx].significantBits_;
newMap[thisIdx].bitmap_ = bitmapMap_[thisIdx].bitmap_;
- // LCOV_EXCL_STOP
}
// Delete old array and set current bitmapMap to the new one
@@ -359,7 +357,6 @@ ClusteredBitmap::ClusteredBitmap(const ClusteredBitmap &other,
}
}
-// LCOV_EXCL_START :cnu
// ClusteredBitmap constructor
ClusteredBitmap::ClusteredBitmap(const ClusteredBitmap &other)
: heap_(other.heap_),
@@ -379,7 +376,6 @@ ClusteredBitmap::ClusteredBitmap(const ClusteredBitmap &other)
copyBits(bitmapMap_[thisIdx].bitmap_, other.bitmapMap_[thisIdx].bitmap_);
}
}
-// LCOV_EXCL_STOP
// ClusteredBitmap destructor
ClusteredBitmap::~ClusteredBitmap()
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/optimizer/CmpProcess.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/CmpProcess.cpp b/core/sql/optimizer/CmpProcess.cpp
index b3e2eae..58b68d4 100644
--- a/core/sql/optimizer/CmpProcess.cpp
+++ b/core/sql/optimizer/CmpProcess.cpp
@@ -63,7 +63,6 @@ CmpProcess::CmpProcess()
processStartTime_ = CONVERTTIMESTAMP(processStartTime_,0,-1,0);
}
}
-// LCOV_EXCL_START :cnu
/************************************************************************
method CmpProcess::getProcessDuration
@@ -90,7 +89,6 @@ CmpProcess::getCurrentSystemHeapSize()
return currentSystemHeapSize;
}
-// LCOV_EXCL_STOP
/************************************************************************
method CmpProcess::getCompilerId
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/optimizer/ColStatDesc.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/ColStatDesc.cpp b/core/sql/optimizer/ColStatDesc.cpp
index cb95703..f5a6f65 100644
--- a/core/sql/optimizer/ColStatDesc.cpp
+++ b/core/sql/optimizer/ColStatDesc.cpp
@@ -347,10 +347,8 @@ ColStatDesc::applySel( const CostScalar & selectivity )
if ( baseUec.isZero() ) // avoid div-by-zero!
{
-// LCOV_EXCL_START - rfi
newTotalUec = csZero;
uecSelectivity = csZero;
-// LCOV_EXCL_STOP
}
else if ( colStats->isUnique() )
{
@@ -497,10 +495,8 @@ ColStatDesc::synchronizeStats( const CostScalar & baseRowcount,
if ( baseUec.isZero() ) // avoid div-by-zero
{
-// LCOV_EXCL_START - rfi
newTotalUec = csZero;
uecSelectivity = csZero;
-// LCOV_EXCL_STOP
}
else if ( specialFlag == DO_NOT_REDUCE_UEC )
{
@@ -3145,10 +3141,8 @@ ColStatDescList::estimateCardinality (const CostScalar & initialRowCount,
// The estimated cardinality should never go below zero
if (newRowCount.getValue() < 0)
{
-// LCOV_EXCL_START - rfi
CCMPASSERT( newRowCount.isGreaterOrEqualThanZero() );
newRowCount.minCsZero();
-// LCOV_EXCL_STOP
}
// This is the rowcount without using hints. Save it
@@ -4707,10 +4701,8 @@ ColStatDescList::applyBiLogicPred(CostScalar & tempRowcount,
// at the customer.
if (leftNumOuterColStats != rightNumOuterColStats )
{
-// LCOV_EXCL_START - rfi
CCMPASSERT( leftNumOuterColStats == rightNumOuterColStats );
return newRowCount;
-// LCOV_EXCL_STOP
}
numOuterColStats = leftNumOuterColStats;
@@ -4785,7 +4777,7 @@ ColStatDescList::applyBiLogicPred(CostScalar & tempRowcount,
// copyStatsList is a copy of THIS statsList, during
// the process of applying predicates to THIS and
// the copy, we should not have dropped any columns.
- Int32 stophere = 0; // LCOV_EXCL_LINE - rfi
+ Int32 stophere = 0;
}
#pragma warn(262) // warning elimination
@@ -4817,10 +4809,8 @@ ColStatDescList::applyBiLogicPred(CostScalar & tempRowcount,
// if could not find the histogram to be merged
// return for release mode. Side effect could be
// increased cardinality
-// LCOV_EXCL_START - rfi
CCMPASSERT( found == TRUE );
return newRowCount;
-// LCOV_EXCL_STOP
}
ColStatsSharedPtr leftColStats =
(*this)[currentL]->getColStatsToModify();
@@ -4881,11 +4871,9 @@ ColStatDescList::applyBiLogicPred(CostScalar & tempRowcount,
#pragma nowarn(262) // warning elimination
if( copyStatsList.entries() != 0 )
{
-// LCOV_EXCL_START - rfi
CCMPASSERT (copyStatsList.entries() == 0);
// The OR merge between THIS and the copy did not go properly
return newRowCount;
-// LCOV_EXCL_STOP
}
#pragma warn(262) // warning elimination
@@ -4981,10 +4969,8 @@ ColStatDescList::applyBiLogicPred(CostScalar & tempRowcount,
} // ITM_OR
else // error: It isn't ITM_AND or ITM_OR ... oops
{
-// LCOV_EXCL_START - rfi
CCMPASSERT("Unsupported binary logic operator" );
return newRowCount;
-// LCOV_EXCL_STOP
}
if(exprOpCode == REL_SCAN && !maxSelectivity && (CmpCommon::getDefault(COMP_BOOL_67) == DF_ON))
@@ -5820,7 +5806,6 @@ ColStatDescList::applyDefaultPred (ItemExpr *pred,
(*this, origPredValueId, globalPredicate);
}
}
-// LCOV_EXCL_START :cnu
else
{
//
@@ -6565,7 +6550,6 @@ ColStatDescList::applyDefaultPred (ItemExpr *pred,
}
}
}
-// LCOV_EXCL_STOP
// maxSelectivity computation is done
if (maxSelectivity) return;
@@ -6603,7 +6587,6 @@ ColStatDescList::applyDefaultPred (ItemExpr *pred,
if ( left == right )
{
-// LCOV_EXCL_START - cnu
OperatorTypeEnum op = pred->getOperatorType();
switch ( op )
{
@@ -6621,7 +6604,6 @@ ColStatDescList::applyDefaultPred (ItemExpr *pred,
default:
break;
}
-// LCOV_EXCL_STOP
}
}
} // $$$ end of stuff that should someday be removed ...
@@ -6723,7 +6705,7 @@ CostScalar ColStatDescList::getMaxOfMaxFreqOfCol(const ValueIdSet & baseColSet)
baseColSet.advance(col))
{
if (col == NULL_VALUE_ID)
- continue; // LCOV_EXCL_LINE - rfi
+ continue;
ColStatsSharedPtr colStat = this->getColStatsPtrForColumn (col);
ColAnalysis * colAnalysis = col.colAnalysis();
@@ -6785,7 +6767,7 @@ CostScalar ColStatDescList::getMinOfMaxFreqOfCol(const ValueIdSet & baseColSet)
baseColSet.advance(col))
{
if (col == NULL_VALUE_ID)
- continue; // LCOV_EXCL_LINE
+ continue;
ColStatsSharedPtr colStat = this->getColStatsPtrForColumn (col);
ColAnalysis * colAnalysis = col.colAnalysis();
@@ -6840,13 +6822,11 @@ ColStatDescList::getMaxFreqForCaseExpr(const ValueIdSet & leafValues)
{
if(leafValues.entries() == 0)
{
-// LCOV_EXCL_START - rfi
CCMPASSERT ( leafValues.entries() > 0 );
// In absence of leaf values, it is not possible to calculate max freq.
// Return zero to indicate uniform distribution.
return csZero;
-// LCOV_EXCL_STOP
}
CostScalar maxFreq = csZero;
@@ -7794,12 +7774,10 @@ ColStatDescList::mergeListPairwise ()
// sanity check
if ((entries() % 2) != 0)
{
-// LCOV_EXCL_START - rfi
CCMPASSERT( entries() % 2 == 0 ); // should be an even number!
//if not return without merging. Don't want to land up with an
// unreferenced object in the collections class
return newRowcount;
-// LCOV_EXCL_STOP
}
// NB: we avoid having the resulting rowcount blow up by making sure
@@ -8399,13 +8377,11 @@ ColStatDescList::getColStatsPtrForColumn (const ValueId& inputColumn) const
#pragma nowarn(270) // warning elimination
if ((index < 0) || (index >= entries()) )
{
-// LCOV_EXCL_START - rfi
// if the index is out side the range of histogram list, return
// NULL pointer indicating that the histogram is not found in the
// list
CCMPASSERT( (index >= 0) AND (index < entries() ));
return NULL;
-// LCOV_EXCL_STOP
}
#pragma warn(270) // warning elimination
@@ -8677,7 +8653,6 @@ ColStatDescList::getUecOfJoiningCols(ValueIdSet & joinedColSet) const
} // ColStatDescList::getUecOfJoiningCols
-// LCOV_EXCL_START - dpm
void
ColStatDescList::print (ValueIdList selectListCols,
@@ -8724,7 +8699,6 @@ ColStatDescList::print (ValueIdList selectListCols,
"**************************************************************\n");
PRINTIT(ofd, c, space, buf, mybuf);
}
-// LCOV_EXCL_STOP
void
ColStatDescList::display() const
@@ -8810,10 +8784,8 @@ ColStatDescList::enforceInternalConsistency(CollIndex start,
if (cs->getHistogram() == NULL)
{
-// LCOV_EXCL_START - rfi
CCMPASSERT("Histogram is NULL");
cs->insertZeroInterval();
-// LCOV_EXCL_STOP
}
if ( cs->getHistogram()->entries() == 0 )
@@ -8901,10 +8873,8 @@ ColStatDescList::enforceInternalConsistency(CollIndex start,
{
if (firstNonFakeRowcount < 0)
{
-// LCOV_EXCL_START - rfi
CCMPASSERT( firstNonFakeRowcount.isGreaterOrEqualThanZero() );
firstNonFakeRowcount = 0;
-// LCOV_EXCL_STOP
}
for ( i = start; i < end; i++ )
@@ -8933,7 +8903,6 @@ ColStatDescList::enforceInternalConsistency(CollIndex start,
// done, finally
}
-// LCOV_EXCL_START - cnu
ValueIdSet ColStatDescList::appliedPreds () const
{
ValueIdSet result;
@@ -8953,7 +8922,6 @@ ValueIdSet ColStatDescList::VEGColumns () const
}
return result;
}
-// LCOV_EXCL_STOP
// -----------------------------------------------------------------------
@@ -9309,10 +9277,8 @@ MultiColumnUecList::getListOfSubsetsContainsColumns(
#ifndef NDEBUG
if(getenv("MDAM_MCUEC"))
{
-// LCOV_EXCL_START - dpm
fprintf(stdout, " \n\n-----List to be considered----\n");
allValueIds.print();
-// LCOV_EXCL_STOP
}
#endif
@@ -9548,10 +9514,8 @@ MultiColumnUecList::useMCUecForCorrPreds (
if (iterDesc == NULL)
{
-// LCOV_EXCL_START - rfi
CCMPASSERT( iterDesc != NULL );
return FALSE;
-// LCOV_EXCL_STOP
}
// do a lookup in the hash dictionary we're currently populating
@@ -10000,12 +9964,10 @@ MultiColumnUecList::findMatchingColumns (
NABoolean inserted = FALSE ;
if ( joinPairs[i].entries() > 2 )
{
-// LCOV_EXCL_START - rfi
// we cannot handle a join between many (>2) columns -- do not
// use this join predicate
remainingPairs.insert( joinPairs[i] );
continue ;
-// LCOV_EXCL_STOP
}
const ValueId & firstId = joinPairs[i][0];
@@ -10204,10 +10166,8 @@ MultiColumnUecList::getUecForMCJoin (
TableDesc * iterDesc = iterExpr->getTableDesc();
if (iterDesc == NULL)
{
-// LCOV_EXCL_START - rfi
CCMPASSERT( iterDesc != NULL );
return FALSE;
-// LCOV_EXCL_STOP
}
// do a lookup in the hash dictionary we're currently populating
@@ -10504,10 +10464,8 @@ MultiColumnUecList::getUecForMCJoin (
const TableDesc * iterDesc = iterExpr->getTableDesc();
if (iterDesc == NULL)
{
-// LCOV_EXCL_START - rfi
CCMPASSERT( iterDesc != NULL );
return FALSE;
-// LCOV_EXCL_STOP
}
if ( iterDesc == tableOneDesc )
@@ -10563,10 +10521,8 @@ MultiColumnUecList::getUecForMCJoin (
// to 2, then that means we shall not be able to use MC UEC
if (joinList.entries() != 2 )
{
-// LCOV_EXCL_START - rfi
CCMPASSERT( joinList.entries() == 2 );
return FALSE;
-// LCOV_EXCL_STOP
}
for ( j = 0; j < joinList.entries(); j++ )
@@ -10580,10 +10536,8 @@ MultiColumnUecList::getUecForMCJoin (
const TableDesc * iterDesc = iterExpr->getTableDesc();
if (iterDesc == NULL)
{
-// LCOV_EXCL_START - rfi
CCMPASSERT( iterDesc != NULL );
return FALSE;
-// LCOV_EXCL_STOP
}
if ( iterDesc == tableOneDesc )
@@ -10598,7 +10552,6 @@ MultiColumnUecList::getUecForMCJoin (
}
else
{
-// LCOV_EXCL_START - rfi
// it's a table column not associated with either of
// the two tables we're joining -- however, we already
// tried to remove all of these references! abort!
@@ -10607,7 +10560,6 @@ MultiColumnUecList::getUecForMCJoin (
// it should not be a work stoppage
CCMPASSERT( FALSE );
return FALSE ;
-// LCOV_EXCL_STOP
}
} // j-loop
} // i-loop
@@ -10957,17 +10909,13 @@ MultiColumnUecList::getUecForMCJoin (
// There is no way, the reduction should go beyond 1
if (highestUecRedByLocalPreds1 > csOne)
{
-// LCOV_EXCL_START - rfi
CCMPASSERT ("Reduction from local predicates is greater than 1");
highestUecRedByLocalPreds1 = csOne;
-// LCOV_EXCL_STOP
}
if (highestUecRedByLocalPreds2 > csOne)
{
-// LCOV_EXCL_START - rfi
CCMPASSERT ("Reduction from local predicates is greater than 1");
highestUecRedByLocalPreds2 = csOne;
-// LCOV_EXCL_STOP
}
mcUEC1 = (mcUEC1 * highestUecRedByLocalPreds1).minCsOne();
mcUEC2 = (mcUEC2 * highestUecRedByLocalPreds2).minCsOne();
@@ -11437,7 +11385,6 @@ MultiColumnUecList * MultiColumnUecList::createMCListForRemainingCols(
// useful debugging routines
//
-// LCOV_EXCL_START - dpm
void
MultiColumnUecList::print (FILE *ofd,
const char * prefix,
@@ -11470,7 +11417,6 @@ MultiColumnUecList::display() const
{
print();
}
-// LCOV_EXCL_STOP
void
MultiColumnUecList::displayMissingStatsWarning(TableDesc * mostRefdTable,
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/optimizer/ColStatDesc.h
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/ColStatDesc.h b/core/sql/optimizer/ColStatDesc.h
index 87d2330..1f54595 100644
--- a/core/sql/optimizer/ColStatDesc.h
+++ b/core/sql/optimizer/ColStatDesc.h
@@ -88,9 +88,7 @@ public:
MultiColumnUecList (const StatsList & initStats,
const ValueIdList & tableColumns ) ;
-// LCOV_EXCL_START :dd
virtual ~MultiColumnUecList() {} ;
-// LCOV_EXCL_STOP
// given a ValueIdSet of table columns, returns the stored groupUec (if
// it exists), else returns csMinusOne
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/optimizer/ColumnDesc.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/ColumnDesc.cpp b/core/sql/optimizer/ColumnDesc.cpp
index e906ff0..ef5fee9 100644
--- a/core/sql/optimizer/ColumnDesc.cpp
+++ b/core/sql/optimizer/ColumnDesc.cpp
@@ -59,7 +59,6 @@ NAString ColumnDescList::getColumnDescListAsString() const
return list;
}
-// LCOV_EXCL_START :cnu
ColumnDesc *ColumnDescList::findColumn(const NAString& colName) const
{
for (CollIndex i=0; i<entries(); i++)
@@ -70,4 +69,3 @@ ColumnDesc *ColumnDescList::findColumn(const NAString& colName) const
}
return NULL;
}
-// LCOV_EXCL_STOP
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/optimizer/ColumnDesc.h
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/ColumnDesc.h b/core/sql/optimizer/ColumnDesc.h
index 6af19cb..8d32e0b 100644
--- a/core/sql/optimizer/ColumnDesc.h
+++ b/core/sql/optimizer/ColumnDesc.h
@@ -92,7 +92,6 @@ public:
const char * getViewFileName() const { return viewFileName_; }
void setViewFileName(const char * name) { viewFileName_ = name; }
- // LCOV_EXCL_START :dpm
// ---------------------------------------------------------------------
// Display/print, for debugging.
// ---------------------------------------------------------------------
@@ -110,7 +109,6 @@ public:
groupedFlag_? " grp " : "");
if (strcmp(title, "")) fprintf(ofd,"\n");
} // ColumnDesc::print()
- //LCOV_EXCL_STOP
void display() const { print(); }
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/optimizer/ColumnNameMap.h
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/ColumnNameMap.h b/core/sql/optimizer/ColumnNameMap.h
index 979266b..0f31955 100644
--- a/core/sql/optimizer/ColumnNameMap.h
+++ b/core/sql/optimizer/ColumnNameMap.h
@@ -136,7 +136,6 @@ public:
void setQualifiedColumnAmbiguousFlag()
{ qualColAmbiguousFlag_ = TRUE; }
- // LCOV_EXCL_START :dpm
// ---------------------------------------------------------------------
// Display/print, for debugging.
// ---------------------------------------------------------------------
@@ -162,7 +161,6 @@ public:
fprintf(ofd," (input value)");
if (strcmp(title, "")) fprintf(ofd,"\n");
} // print()
- // LCOV_EXCL_STOP
void display() { print(); }