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:05 UTC
[11/14] incubator-trafodion git commit: lcov: commit #1
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/cli/Globals.cpp
----------------------------------------------------------------------
diff --git a/core/sql/cli/Globals.cpp b/core/sql/cli/Globals.cpp
index 211bd6c..8e42254 100644
--- a/core/sql/cli/Globals.cpp
+++ b/core/sql/cli/Globals.cpp
@@ -119,7 +119,6 @@ CliGlobals::CliGlobals(NABoolean espProcess)
init(espProcess, NULL);
globalsAreInitialized_ = TRUE;
}
-//LCOV_EXCL_STOP
void CliGlobals::init( NABoolean espProcess,
StatsGlobals *statsGlobals
@@ -215,14 +214,11 @@ void CliGlobals::init( NABoolean espProcess,
{
error = statsGlobals_->openStatsSemaphore(semId_);
// Behave like as if stats is not available
- //ss_cc_change - rare error case
- //LCOV_EXCL_START
if (error != 0)
{
statsGlobals_ = NULL;
statsHeap_ = getExecutorMemory();
}
- //LCOV_EXCL_STOP
else
{
error = statsGlobals_->getStatsSemaphore(semId_, myPin_);
@@ -307,8 +303,6 @@ void CliGlobals::init( NABoolean espProcess,
// could initialize the program file name here but ...
myProgName_[0] = '\0';
}
-//ss_cc_change
-//LCOV_EXCL_START
CliGlobals::~CliGlobals()
{
arkcmpInitFailed_ = arkcmpERROR_; // (it's corrupt after deleting, anyway...)
@@ -342,7 +336,6 @@ Lng32 CliGlobals::getNextUniqueContextHandle()
return contextHandle;
}
-//LCOV_EXCL_STOP
IpcPriority CliGlobals::myCurrentPriority()
{
IpcPriority myPriority;
@@ -354,7 +347,6 @@ IpcPriority CliGlobals::myCurrentPriority()
return myPriority;
}
-//LCOV_EXCL_STOP
// NOTE: Unlike REFPARAM_BOUNDSCHECK, this method does not verify that
// the pointer "startAddress" actually points to a valid address
@@ -494,7 +486,6 @@ CliGlobals * CliGlobals::createCliGlobals(NABoolean espProcess)
return result;
}
-//LCOV_EXCL_START
void * CliGlobals::getSegmentStartAddrOnNSK()
{
@@ -544,8 +535,6 @@ Lng32 CliGlobals::createContext(ContextCli* &newContext)
return 0;
}
-//ss_cc_change : This was relevant only when we supported nowait CLI
-//LCOV_EXCL_START
Lng32 CliGlobals::dropContext(ContextCli* context)
{
if (!context)
@@ -590,7 +579,6 @@ Lng32 CliGlobals::dropContext(ContextCli* context)
cliSemaphore_->release();
return 0;
}
-//LCOV_EXCL_STOP
ContextCli * CliGlobals::getContext(SQLCTX_HANDLE context_handle,
NABoolean calledFromDrop)
@@ -908,17 +896,12 @@ char * CliGlobals::getEnv(const char * name)
return (char*)ComRtGetEnvValueFromEnvvars((const char**)envvars_, name);
}
//
-//ss_cc_change : unused anywhere in our code base
-//LCOV_EXCL_START
Lng32 CliGlobals::resetContext(ContextCli *theContext, void *contextMsg)
{
theContext->reset(contextMsg);
return SUCCESS;
}
-//LCOV_EXCL_STOP
-//ss_cc_change POS featue no longer used
-//LCOV_EXCL_START
void CliGlobals::clearQualifiedDiskInfo()
{
CollHeap *heap = defaultContext_->exCollHeap();
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/cli/Globals.h
----------------------------------------------------------------------
diff --git a/core/sql/cli/Globals.h b/core/sql/cli/Globals.h
index 3afa185..776722b 100644
--- a/core/sql/cli/Globals.h
+++ b/core/sql/cli/Globals.h
@@ -162,7 +162,6 @@ public:
inline void setMemoryMonitor(MemoryMonitor *memMon) { memMonitor_ = memMon; }
inline QuasiFileManager * getQuasiFileManager() { return quasiFileManager_; }
- // ss_cc_change This is an unused feature on seaquest
inline NAHeap * getExecutorMemory() { return &executorMemory_; }
inline NAHeap * getNoWaitHeap() { return noWaitSQLHeap_; }
@@ -171,8 +170,6 @@ public:
inline const NASegGlobals * getSegGlobals() const
{ return &segGlobals_; }
- //ss_cc_change : these are unused methods in seaquest
- //LCOV_EXCL_START
inline UInt32 getDefaultVolSeed() { return defaultVolSeed_; }
inline void setDefaultVolSeed( UInt32 seed)
{ defaultVolSeed_ = seed; }
@@ -186,7 +183,6 @@ public:
{ return listOfVolNamesCacheTime_; }
inline void setListOfVolNamesCacheTime(Int64 cacheTime)
{ listOfVolNamesCacheTime_ = cacheTime; }
- //LCOV_EXCL_STOP
inline NABoolean isSysVolNameInitialized()
{ return sysVolNameInitialized_; }
inline void setSysVolNameIsInitialized()
@@ -196,8 +192,6 @@ public:
void clearQualifiedDiskInfo();
void addQualifiedDiskInfo(const char *volumeName, Lng32 primaryCpu,
Lng32 capacity, Lng32 freeSpace, Lng32 largestFragment);
- // ss_cc_change
- //LCOV_EXCL_START
inline void setNodeName(const char *nodeName)
{ strncpy(nodeName_, nodeName, sizeof(nodeName_)); }
inline char *getNodeName() { return nodeName_; }
@@ -208,7 +202,6 @@ public:
inline Lng32 getCapacityForVol(Lng32 i) { return capacities_[i]; }
inline Lng32 getFreespaceForVol(Lng32 i) { return freespaces_[i]; }
inline Lng32 getLargestFragmentForVol(Lng32 i) { return largestFragments_[i]; }
- //LCOV_EXCL_STOP
inline Lng32 incrNumOfCliCalls() { return ++numCliCalls_; }
inline Lng32 decrNumOfCliCalls()
@@ -223,7 +216,6 @@ public:
return ++totalCliCalls_;
}
- //LCOV_EXCL_STOP
inline UInt32 * getEventConsumed() { return &eventConsumed_; }
inline NABoolean processIsStopping() { return processIsStopping_; }
@@ -364,10 +356,8 @@ inline
IpcPriority myPriority() { return myPriority_; }
void setMyPriority(IpcPriority p) { myPriority_= p; }
- //LCOV_EXCL_START
NABoolean priorityChanged() { return priorityChanged_;}
void setPriorityChanged(NABoolean v) { priorityChanged_ = v; }
- //LCOV_EXCL_STOP
IpcPriority myCurrentPriority();
Int64 getNextUniqueNumber()
@@ -385,7 +375,7 @@ inline
Long &getSemId() { return semId_; };
void setSemId(Long semId) { semId_ = semId; }
- void setSavedVersionOfCompiler(short version) { savedCompilerVersion_ = version;} //LCOV_EXCL_LINE
+ void setSavedVersionOfCompiler(short version) { savedCompilerVersion_ = version;}
short getSavedVersionOfCompiler() { return savedCompilerVersion_;}
void setSavedSqlTerminateAction(short val) { savedSqlTerminateAction_ = val; }
short getSavedSqlTerminateAction() { return savedSqlTerminateAction_; }
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/comexe/ComKeyRange.cpp
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComKeyRange.cpp b/core/sql/comexe/ComKeyRange.cpp
index 2352925..712de27 100644
--- a/core/sql/comexe/ComKeyRange.cpp
+++ b/core/sql/comexe/ComKeyRange.cpp
@@ -92,7 +92,6 @@ char *keyRangeGen::findVTblPtr(short classID)
return vtblPtr;
}
-// LCOV_EXCL_START
void keyRangeGen::fixupVTblPtr()
{
switch (getType())
@@ -115,7 +114,6 @@ void keyRangeGen::fixupVTblPtr()
break;
}
}
-// LCOV_EXCL_STOP
Long keyRangeGen::pack(void * space)
{
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/comexe/ComPackDefs.h
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComPackDefs.h b/core/sql/comexe/ComPackDefs.h
index 47258db..d835e5b 100644
--- a/core/sql/comexe/ComPackDefs.h
+++ b/core/sql/comexe/ComPackDefs.h
@@ -180,9 +180,7 @@
#include <str.h>
-// LCOV_EXCL_START
inline void COPY_KEY_VTBL_PTR(char * from, char * to)
{ str_cpy_all (to, from, sizeof(char *)); }
-// LCOV_EXCL_STOP
#endif // COMPACKDEFS_H
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/comexe/ComTdb.cpp
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComTdb.cpp b/core/sql/comexe/ComTdb.cpp
index 5007e01..c50edfc 100644
--- a/core/sql/comexe/ComTdb.cpp
+++ b/core/sql/comexe/ComTdb.cpp
@@ -134,7 +134,6 @@ ComTdb::ComTdb(
// ---------------------------------------------------------------------
str_cpy_all((char *) &eyeCatcher_, eye, 4);
-// LCOV_EXCL_START
// This constructor is never called with params parameter
if (params)
{
@@ -143,7 +142,6 @@ ComTdb::ComTdb(
numBuffers_, bufferSize_,
firstNRows_);
}
-// LCOV_EXCL_STOP
collectStatsType_ = NO_STATS;
@@ -302,11 +300,9 @@ void ComTdb::displayChildren(Space *space,ULng32 flag)
// implemented in the executor project which fixes up a TDB object to the
// Executor version of the TDB.
// -----------------------------------------------------------------------
-// LCOV_EXCL_START
void ComTdb::fixupVTblPtrCom()
{
}
-// LCOV_EXCL_STOP
// -----------------------------------------------------------------------
// This method returns the virtual function table pointer for an object
@@ -838,7 +834,6 @@ char *ComTdb::findVTblPtrCom(short classID)
default:
break;
-// LCOV_EXCL_STOP
}
return vtblptr;
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/comexe/ComTdb.h
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComTdb.h b/core/sql/comexe/ComTdb.h
index fdae66a..8f561f8 100644
--- a/core/sql/comexe/ComTdb.h
+++ b/core/sql/comexe/ComTdb.h
@@ -366,9 +366,7 @@ public:
// ---------------------------------------------------------------------
// Whether the TDB supports out-of-order replies to its requests.
// ---------------------------------------------------------------------
-// LCOV_EXCL_START
virtual Int32 orderedQueueProtocol() const { return 1; }
-// LCOV_EXCL_STOP
// ---------------------------------------------------------------------
// Used by the internal SHOWPLAN command to get attributes of a TDB.
@@ -446,19 +444,19 @@ public:
// ---------------------------------------------------------------------
// numChildren() -- Returns the number of children for this TDB
// ---------------------------------------------------------------------
- virtual Int32 numChildren() const { return -1; } // LCOV_EXCL_LINE
+ virtual Int32 numChildren() const { return -1; }
// ---------------------------------------------------------------------
// getNodeName() -- Returns the name of this TDB.
// ---------------------------------------------------------------------
- virtual const char *getNodeName() const { return "ComTDB"; } // LCOV_EXCL_LINE
+ virtual const char *getNodeName() const { return "ComTDB"; }
// ---------------------------------------------------------------------
// getChild(int child) -- Returns a pointer to the nth child TDB of this
// TDB. This function cannot be used to get children which reside in
// other processes -- see getChildForGUI.
// ---------------------------------------------------------------------
- virtual const ComTdb *getChild(Int32) const { return NULL; } // LCOV_EXCL_LINE
+ virtual const ComTdb *getChild(Int32) const { return NULL; }
// ---------------------------------------------------------------------
// getChildForGUI() takes as additional arguments the fragment directory
@@ -470,14 +468,12 @@ public:
// to be looked up. See ComTdbPartnAccess.h_tdb::getChildForGUI() for an
// example of how this could be done.
// ---------------------------------------------------------------------
-// LCOV_EXCL_START
virtual const ComTdb *getChildForGUI(Int32 pos,
Lng32 /*base*/,
void * /*frag_dir*/) const
{
return getChild(pos);
}
-// LCOV_EXCL_STOP
// ---------------------------------------------------------------------
// numExpressions() -- Returns the number of expression for this TDB.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/comexe/ComTdbCompoundStmt.cpp
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComTdbCompoundStmt.cpp b/core/sql/comexe/ComTdbCompoundStmt.cpp
index 9ac2782..ce60997 100644
--- a/core/sql/comexe/ComTdbCompoundStmt.cpp
+++ b/core/sql/comexe/ComTdbCompoundStmt.cpp
@@ -98,7 +98,6 @@ Lng32 ComTdbCompoundStmt::unpack(void * base, void * reallocator)
} // ComTdbCompoundStmt::unpack
-// LCOV_EXCL_START
// exclude from code coverage analysis sind it is used only by GUI
inline const ComTdb* ComTdbCompoundStmt::getChild(Int32 pos) const
{
@@ -110,5 +109,4 @@ inline const ComTdb* ComTdbCompoundStmt::getChild(Int32 pos) const
return NULL;
} // ComTdbCompoundStmt::getChild
-// LCOV_EXCL_STOP
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/comexe/ComTdbCompoundStmt.h
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComTdbCompoundStmt.h b/core/sql/comexe/ComTdbCompoundStmt.h
index 68a7ce0..f894dba 100644
--- a/core/sql/comexe/ComTdbCompoundStmt.h
+++ b/core/sql/comexe/ComTdbCompoundStmt.h
@@ -68,10 +68,8 @@ public:
NABoolean AfterUpdate);
-// LCOV_EXCL_START
// exclude from code coverage analsysis since this method is not used
Int32 orderedQueueProtocol() const { return -1; }
-// LCOV_EXCL_STOP
Long pack(void *);
Lng32 unpack(void *, void * reallocator);
@@ -85,13 +83,11 @@ public:
virtual const char *getNodeName() const { return "EX_COMPOUND_STMT"; };
-// LCOV_EXCL_START
// exclude from code coverage analysys since there are no expressions for
// this operator
virtual ex_expr* getExpressionNode(Int32 pos) { return NULL; }
virtual const char * getExpressionName(Int32 pos) const { return NULL; }
-// LCOV_EXCL_STOP
// ---------------------------------------------------------------------
// Redefine virtual functions required for Versioning.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/comexe/ComTdbControl.h
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComTdbControl.h b/core/sql/comexe/ComTdbControl.h
index 47bf8b5..9fe6029 100644
--- a/core/sql/comexe/ComTdbControl.h
+++ b/core/sql/comexe/ComTdbControl.h
@@ -53,7 +53,6 @@ enum ControlQueryType
///////////////////////////////////////////////////////
// class ExControlTdb
///////////////////////////////////////////////////////
-// LCOV_EXCL_START
class ComTdbControl : public ComTdb
{
friend class ExControlTcb;
@@ -145,5 +144,4 @@ private:
char fillersComTdbControl_[30]; // 42-71
};
-// LCOV_EXCL_STOP
#endif
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/comexe/ComTdbExeUtil.cpp
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComTdbExeUtil.cpp b/core/sql/comexe/ComTdbExeUtil.cpp
index b295bc3..44f3cfd 100644
--- a/core/sql/comexe/ComTdbExeUtil.cpp
+++ b/core/sql/comexe/ComTdbExeUtil.cpp
@@ -983,7 +983,6 @@ void ComTdbExeUtilGetErrorInfo::displayContents(Space * space,ULng32 flag)
}
}
-//LCOV_EXCL_STOP
///////////////////////////////////////////////////////////////////////////
//
// Methods for class ComTdbExeUtilCreateTableAs
@@ -1573,7 +1572,6 @@ void ComTdbExeUtilGetProcessStatistics::displayContents(Space * space,ULng32 fla
}
}
-//LCOV_EXCL_START
///////////////////////////////////////////////////////////////////////////
//
// Methods for class ComTdbExeUtilGetUID
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/comexe/ComTdbExplain.cpp
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComTdbExplain.cpp b/core/sql/comexe/ComTdbExplain.cpp
index 5ef0cd5..5cd23c7 100644
--- a/core/sql/comexe/ComTdbExplain.cpp
+++ b/core/sql/comexe/ComTdbExplain.cpp
@@ -112,7 +112,6 @@ ComTdbExplain::ComTdbExplain(ex_cri_desc *criDescParentDown,
{
}
-// LCOV_EXCL_START
// Used by GUI, does nothing now.
void
ComTdbExplain::display() const
@@ -166,7 +165,6 @@ ComTdbExplain::getExpressionNode(Int32 expNum)
}
}
-// LCOV_EXCL_STOP
// Pack the explainTdb: Convert all pointers to offsets relative
// to the space object.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/comexe/ComTdbMj.cpp
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComTdbMj.cpp b/core/sql/comexe/ComTdbMj.cpp
index 81f93b8..d731658 100644
--- a/core/sql/comexe/ComTdbMj.cpp
+++ b/core/sql/comexe/ComTdbMj.cpp
@@ -146,7 +146,7 @@ ComTdbMj::ComTdbMj(ComTdb * left_tdb,
};
-void ComTdbMj::display() const {}; // LCOV_EXCL_LINE - ignore the next line, only used by GUI
+void ComTdbMj::display() const {};
Long ComTdbMj::pack(void * space)
{
@@ -201,9 +201,7 @@ void ComTdbMj::displayContents(Space * space,ULng32 flag)
}
}
-// LCOV_EXCL_START
Int32 ComTdbMj::orderedQueueProtocol() const
{
return -1; // TRUE
} // there 4 lines will not be covered, obsolete but not in the list yet
-// LCOV_EXCL_STOP
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/comexe/ComTdbSendBottom.cpp
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComTdbSendBottom.cpp b/core/sql/comexe/ComTdbSendBottom.cpp
index f63ef85..4c9527e 100644
--- a/core/sql/comexe/ComTdbSendBottom.cpp
+++ b/core/sql/comexe/ComTdbSendBottom.cpp
@@ -83,25 +83,19 @@ ComTdbSendBottom::ComTdbSendBottom(
smTag_ = 0;
}
-// LCOV_EXCL_START
Int32 ComTdbSendBottom::orderedQueueProtocol() const
{
return TRUE;
} // these 3 lines won't be covered, obsolete
-// LCOV_EXCL_STOP
-// LCOV_EXCL_START
void ComTdbSendBottom::display() const
{
} // ignore these lines, used by Windows GUI only
-// LCOV_EXCL_STOP
-// LCOV_EXCL_START
const ComTdb* ComTdbSendBottom::getChild(Int32 pos) const
{
return NULL;
} // these lines won't be covered, it's never called as it has no child opr
-// LCOV_EXCL_STOP
Int32 ComTdbSendBottom::numChildren() const
{
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/comexe/ComTdbSendBottom.h
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComTdbSendBottom.h b/core/sql/comexe/ComTdbSendBottom.h
index aab8585..fe79bcf 100644
--- a/core/sql/comexe/ComTdbSendBottom.h
+++ b/core/sql/comexe/ComTdbSendBottom.h
@@ -113,7 +113,6 @@ virtual const char *getNodeName() const { return "EX_SEND_BOTTOM"; };
virtual ex_expr* getExpressionNode(Int32 pos);
virtual const char * getExpressionName(Int32 pos) const ;
-// LCOV_EXCL_START
virtual ex_send_bottom_tcb * buildInstance(ExExeStmtGlobals * glob,
ExEspFragInstanceDir *espInstanceDir,
const ExFragKey &myKey,
@@ -122,7 +121,6 @@ virtual const char *getNodeName() const { return "EX_SEND_BOTTOM"; };
Lng32 parentInstanceNum,
NABoolean isLocal) { return NULL; }
// its executor twin is used, ignore
-// LCOV_EXCL_STOP
// For SHOWPLAN
virtual void displayContents(Space *space, ULng32 flag);
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/comexe/ComTdbSendTop.cpp
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComTdbSendTop.cpp b/core/sql/comexe/ComTdbSendTop.cpp
index 67f3b94..eaf6c8e 100644
--- a/core/sql/comexe/ComTdbSendTop.cpp
+++ b/core/sql/comexe/ComTdbSendTop.cpp
@@ -93,12 +93,10 @@ ComTdbSendTop::ComTdbSendTop(ExFragId childFragId,
smTag_ = 0;
}
-// LCOV_EXCL_START
Int32 ComTdbSendTop::orderedQueueProtocol() const
{
return TRUE;
} // these lines won't be covered, obsolete but not in the list yet
-// LCOV_EXCL_STOP
Lng32 ComTdbSendTop::minSendBufferSize(Lng32 downRecLen, Lng32 numRecs)
{
@@ -124,18 +122,14 @@ Lng32 ComTdbSendTop::minReceiveBufferSize(Lng32 upRecLen, Lng32 numRecs)
return minSendBufferSize(upRecLen,numRecs);
}
-// LCOV_EXCL_START
void ComTdbSendTop::display() const
{
} // these 3 lines won't be covered, used by Windows GUI only
-// LCOV_EXCL_STOP
-// LCOV_EXCL_START
const ComTdb* ComTdbSendTop::getChild(Int32 /*pos*/) const
{
return NULL;
} // these 4 lines won't be covered, used by Windows GUI only
-// LCOV_EXCL_STOP
const ComTdb * ComTdbSendTop::getChildForGUI(
Int32 /*pos*/,
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/comexe/ComTdbSendTop.h
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComTdbSendTop.h b/core/sql/comexe/ComTdbSendTop.h
index fdfe1b7..72710dc 100644
--- a/core/sql/comexe/ComTdbSendTop.h
+++ b/core/sql/comexe/ComTdbSendTop.h
@@ -173,7 +173,7 @@ virtual const char *getNodeName() const { return "EX_SEND_TOP"; };
NABoolean getUseOldStatsNoWaitDepth() const
{ return (sendTopFlags_ & STATS_NOWAIT_DEP) ? TRUE : FALSE; }
- void setUseOldStatsNoWaitDepth() { sendTopFlags_ |= STATS_NOWAIT_DEP; } // LCOV_EXCL_LINE - ignore, test code controlled by COMP_BOOL_118, see comments in generator/GenRelEnforcer.cpp
+ void setUseOldStatsNoWaitDepth() { sendTopFlags_ |= STATS_NOWAIT_DEP; }
protected:
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/comexe/ComTdbSequence.cpp
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComTdbSequence.cpp b/core/sql/comexe/ComTdbSequence.cpp
index 37b4d89..fd96f84 100644
--- a/core/sql/comexe/ComTdbSequence.cpp
+++ b/core/sql/comexe/ComTdbSequence.cpp
@@ -110,9 +110,7 @@ ComTdbSequence::ComTdbSequence
{
if ( noOverflow )
{
-// LCOV_EXCL_START
OLAPFlags_ |= NO_OVERFLOW ;
-// LCOV_EXCL_STOP
}
if ( unboundedFollowing )
@@ -121,9 +119,7 @@ ComTdbSequence::ComTdbSequence
}
if ( logDiagnostics )
{
-// LCOV_EXCL_START
OLAPFlags_ |= LOG_DIAGNOSTICS ;
-// LCOV_EXCL_STOP
}
if ( possibleMultipleCalls )
{
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/comexe/ComTdbSplitBottom.cpp
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComTdbSplitBottom.cpp b/core/sql/comexe/ComTdbSplitBottom.cpp
index a7ed2b1..52771ff 100644
--- a/core/sql/comexe/ComTdbSplitBottom.cpp
+++ b/core/sql/comexe/ComTdbSplitBottom.cpp
@@ -94,18 +94,14 @@ ComTdbSplitBottom::ComTdbSplitBottom(
// setPlanVersion(ComVersion_GetCurrentPlanVersion());
}
-// LCOV_EXCL_START
Int32 ComTdbSplitBottom::orderedQueueProtocol() const
{
return -1;
} // these lines won't be covered, obsolete but not in the list yet
-// LCOV_EXCL_STOP
-// LCOV_EXCL_START
void ComTdbSplitBottom::display() const
{
} // these lines won't be covered, used by Windows GUI only
-// LCOV_EXCL_STOP
const ComTdb * ComTdbSplitBottom::getChild(Int32 pos) const
{
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/comexe/ComTdbSplitBottom.h
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComTdbSplitBottom.h b/core/sql/comexe/ComTdbSplitBottom.h
index 6aca641..afcd947 100644
--- a/core/sql/comexe/ComTdbSplitBottom.h
+++ b/core/sql/comexe/ComTdbSplitBottom.h
@@ -227,12 +227,10 @@ public:
// These functions allow split bottom tcb initialization methods to read
// the hash values for the skewed partitioning key values.
-// LCOV_EXCL_START
SplitBottomSkewInfo *getSkewInfo() { return skewInfo_; }
const Int32 getNumSkewValues(void)
{ return getSkewInfo()->numSkewHashValues_; }
// those 3 lines won't be covered, code nowhere used
-// LCOV_EXCL_STOP
Int64 const * hashValueArray(void)
{ return getSkewInfo()->skewHashValues_; }
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/comexe/ComTdbSplitTop.cpp
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComTdbSplitTop.cpp b/core/sql/comexe/ComTdbSplitTop.cpp
index 730b67a..6609601 100644
--- a/core/sql/comexe/ComTdbSplitTop.cpp
+++ b/core/sql/comexe/ComTdbSplitTop.cpp
@@ -97,18 +97,14 @@ ComTdbSplitTop::ComTdbSplitTop(ComTdb *child,
streamTimeout_ = streamTimeout;
}
-// LCOV_EXCL_START
Int32 ComTdbSplitTop::orderedQueueProtocol() const
{
return TRUE;
} // these 3 lines won't be covered, obsolete but not in the list yet
-// LCOV_EXCL_STOP
-// LCOV_EXCL_START
void ComTdbSplitTop::display() const
{
} // these 3 lines won't be covered, used by Windows GUI only
-// LCOV_EXCL_STOP
const ComTdb* ComTdbSplitTop::getChild(Int32 pos) const
{
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/comexe/ComTdbSplitTop.h
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComTdbSplitTop.h b/core/sql/comexe/ComTdbSplitTop.h
index e3ae493..19cccb6 100644
--- a/core/sql/comexe/ComTdbSplitTop.h
+++ b/core/sql/comexe/ComTdbSplitTop.h
@@ -159,22 +159,18 @@ public:
{ return (splitTopFlags_ & STATIC_PA_AFFINATY) ? TRUE : FALSE; }
void setStaticPaAffinity() {splitTopFlags_ |= STATIC_PA_AFFINATY; }
-// LCOV_EXCL_START
NABoolean getSetupSharedPool() const
{ return (splitTopFlags_ & SETUP_SHARED_POOL) ? TRUE : FALSE; }
void setSetupSharedPool() {splitTopFlags_ |= SETUP_SHARED_POOL; }
// these 3 lines won't be covered, feature not yet activated.
-// LCOV_EXCL_STOP
NABoolean getUseExtendedPState() const
{ return (splitTopFlags_ & USE_EXTENDED_PSTATE) ? TRUE : FALSE; }
void setUseExtendedPState() {splitTopFlags_ |= USE_EXTENDED_PSTATE; }
-// LCOV_EXCL_START
Int32 getNumSharedBuffers() const { return numSharedBuffs_; }
void setNumSharedBuffers(Int32 n) {numSharedBuffs_ = n; }
// these 2 lines won't be covered, feature not yet activated.
-// LCOV_EXCL_STOP
// For SeaMonster
NABoolean getExchangeUsesSM() const
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/comexe/ComTdbTranspose.h
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComTdbTranspose.h b/core/sql/comexe/ComTdbTranspose.h
index 3a95583..52cff3c 100644
--- a/core/sql/comexe/ComTdbTranspose.h
+++ b/core/sql/comexe/ComTdbTranspose.h
@@ -207,9 +207,7 @@ public:
//
// Exclude this code from coverage analysis.
// This code could be deleted since it is the same as the base implementation.
- // LCOV_EXCL_START
Int32 orderedQueueProtocol() const { return -1; }
- // LCOV_EXCL_STOP
// return a pointer to the specifed (by position) child TDB.
// Transpose has only one child.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/comexe/ComTdbTuple.cpp
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComTdbTuple.cpp b/core/sql/comexe/ComTdbTuple.cpp
index 94bfebc..8548f0f 100644
--- a/core/sql/comexe/ComTdbTuple.cpp
+++ b/core/sql/comexe/ComTdbTuple.cpp
@@ -168,7 +168,6 @@ ComTdbTupleLeaf::ComTdbTupleLeaf(Queue * tupleExprList,
}
-// LCOV_EXCL_START
// This non-leaf tuple operator was not used so far on SQ, see GenRelMisc.cpp
///////////////////////////////////////
@@ -212,6 +211,5 @@ Lng32 ComTdbTupleNonLeaf::unpack(void * base, void * reallocator)
return ComTdbTuple::unpack(base, reallocator);
}
-// LCOV_EXCL_STOP
// end of excluding non-leaf operator from coverage checking
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/comexe/ComTdbTuple.h
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComTdbTuple.h b/core/sql/comexe/ComTdbTuple.h
index 1ecb285..c297b26 100644
--- a/core/sql/comexe/ComTdbTuple.h
+++ b/core/sql/comexe/ComTdbTuple.h
@@ -69,7 +69,6 @@ public:
~ComTdbTuple();
-// LCOV_EXCL_START
// only derived class is used, see GenRelMisc.cpp
Int32 orderedQueueProtocol() const
{
@@ -111,7 +110,6 @@ public:
virtual ex_expr* getExpressionNode(Int32 pos);
virtual const char * getExpressionName(Int32 pos) const;
-// LCOV_EXCL_STOP
// end of excluding the base tuple operator class from coverage checking
protected:
@@ -177,7 +175,6 @@ protected:
};
-// LCOV_EXCL_START
// This non-leaf tuple operator was not used so far on SQ, see GenRelMisc.cpp
////////////////////////////////////////////////
// class ComTdbTupleNonLeaf
@@ -240,7 +237,6 @@ protected:
char fillersComTdbNonLeaf_[40]; // 08-47 unused
};
-// LCOV_EXCL_STOP
// end of excluding non-leaf operator from coverage checking
#endif
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/comexe/ComTdbUnPackRows.cpp
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComTdbUnPackRows.cpp b/core/sql/comexe/ComTdbUnPackRows.cpp
index c2218fe..320451e 100644
--- a/core/sql/comexe/ComTdbUnPackRows.cpp
+++ b/core/sql/comexe/ComTdbUnPackRows.cpp
@@ -57,7 +57,6 @@ ComTdbUnPackRows::ComTdbUnPackRows()
// (This constructor does not seem to be used)
// Exclude this code from coverage analysis.
-// LCOV_EXCL_START
ComTdbUnPackRows::ComTdbUnPackRows(const ComTdbUnPackRows *unPackRowsTdb)
: ComTdb(ComTdb::ex_UNPACKROWS,
eye_UNPACKROWS,
@@ -78,7 +77,6 @@ ComTdbUnPackRows::ComTdbUnPackRows(const ComTdbUnPackRows *unPackRowsTdb)
flags_(unPackRowsTdb->flags_)
{
}
-// LCOV_EXCL_STOP
// Construct a new UnPackRows TDB.
// This constructor is call by the generator (PhysUnPackRows::codeGen() in
@@ -206,14 +204,12 @@ ComTdbUnPackRows::ComTdbUnPackRows(ComTdb *childTdb,
//
// Exclude this code from coverage analysis.
// This code could be deleted since it is not used.
-// LCOV_EXCL_START
void
ComTdbUnPackRows::display() const
{
// Do nothing for now.
//
}
-// LCOV_EXCL_STOP
// ComTdbUnPackRows::pack() ---------------------------------------------
// Pack the unPackRows TDB for transmission from the compiler to the
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/comexe/ComTdbUnPackRows.h
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComTdbUnPackRows.h b/core/sql/comexe/ComTdbUnPackRows.h
index 79d22dd..8de1492 100644
--- a/core/sql/comexe/ComTdbUnPackRows.h
+++ b/core/sql/comexe/ComTdbUnPackRows.h
@@ -235,9 +235,7 @@ public:
//
// Exclude this code from coverage analysis.
// This code could be deleted since it is the same as the base implementation.
- // LCOV_EXCL_START
Int32 orderedQueueProtocol() const { return -1; }
- // LCOV_EXCL_STOP
// return a pointer to the specifed (by position) child TDB.
// UnPackRows has only one child.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/comexe/ComTdbUnion.cpp
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComTdbUnion.cpp b/core/sql/comexe/ComTdbUnion.cpp
index 8b123c8..81207db 100644
--- a/core/sql/comexe/ComTdbUnion.cpp
+++ b/core/sql/comexe/ComTdbUnion.cpp
@@ -52,7 +52,6 @@ ComTdbUnion::ComTdbUnion() :
}
-// LCOV_EXCL_START
// not called, tested by removing the code and testing
ComTdbUnion::ComTdbUnion(const ComTdbUnion *union_tdb)
: ComTdb(ComTdb::ex_UNION,
@@ -77,7 +76,6 @@ ComTdbUnion::ComTdbUnion(const ComTdbUnion *union_tdb)
csErrFlags_(union_tdb->csErrFlags_)
{
}
-// LCOV_EXCL_STOP
ComTdbUnion::ComTdbUnion(ComTdb * left_tdb,
ComTdb * right_tdb,
@@ -164,10 +162,8 @@ Int32 ComTdbUnion::numChildren() const
return ( ( tdbRight_ == (ComTdbPtr) NULL ) ? 1 : 2 );
}
-// LCOV_EXCL_START
// exclude from code coverage since this is used only GUI
void ComTdbUnion::display() const {};
-// LCOV_EXCL_STOP
Long ComTdbUnion::pack(void * space)
{
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/comexe/ComTdbUnion.h
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComTdbUnion.h b/core/sql/comexe/ComTdbUnion.h
index 9dcbda8..078e987 100644
--- a/core/sql/comexe/ComTdbUnion.h
+++ b/core/sql/comexe/ComTdbUnion.h
@@ -107,10 +107,8 @@ public:
inline void setLeftTdb(ComTdb *left) { tdbLeft_ = left; }
inline void setRightTdb(ComTdb *right) { tdbRight_ = right; }
-// LCOV_EXCL_START
// exclude from code coverage since this code is obsolete
Int32 orderedQueueProtocol() const { return -1; }
-// LCOV_EXCL_STOP
virtual const ComTdb* getChild(Int32 pos) const;
virtual Int32 numChildren() const;
@@ -192,7 +190,6 @@ protected:
};
-// LCOV_EXCL_START
// exclude from code coverage analysis since this is used only by GUI
inline const ComTdb* ComTdbUnion::getChild(Int32 pos) const
{
@@ -203,7 +200,6 @@ inline const ComTdb* ComTdbUnion::getChild(Int32 pos) const
else
return NULL;
}
-// LCOV_EXCL_STOP
#endif
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/comexe/LateBindInfo.cpp
----------------------------------------------------------------------
diff --git a/core/sql/comexe/LateBindInfo.cpp b/core/sql/comexe/LateBindInfo.cpp
index c49f97e..f582eb5 100644
--- a/core/sql/comexe/LateBindInfo.cpp
+++ b/core/sql/comexe/LateBindInfo.cpp
@@ -83,7 +83,6 @@ void UninitializedMvName::setAnsiName( const char *ansiName )
}
-// LCOV_EXCL_START
// exclude from code coverage analysis since it is not called from anywhere
NABoolean LateNameInfo::makeSQLIdentifier(char * invalue,
char * outvalue)
@@ -114,7 +113,6 @@ NABoolean LateNameInfo::makeSQLIdentifier(char * invalue,
return TRUE;
}
-// LCOV_EXCL_STOP
// return code: TRUE, if error. FALSE, if all is ok.
// This method assumes that the parts array passed in has
@@ -160,7 +158,6 @@ NABoolean LateNameInfo::extractParts
return FALSE;
}
-// LCOV_EXCL_START
// exclude from code coverage analysis since it is not called from anywhere
static void extractPartsLocal(char * invalue, char *inVal[], short inValLen[])
{
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/common/BaseTypes.cpp
----------------------------------------------------------------------
diff --git a/core/sql/common/BaseTypes.cpp b/core/sql/common/BaseTypes.cpp
index 0689333..2dfe75b 100644
--- a/core/sql/common/BaseTypes.cpp
+++ b/core/sql/common/BaseTypes.cpp
@@ -66,7 +66,6 @@ extern void my_mpi_fclose();
extern void releaseRTSSemaphore(); // Functions implemented in SqlStats.cpp
-// LCOV_EXCL_START :dpm
void NADebug()
{
if (getenv("SQL_DEBUGLOOP") == NULL)
@@ -83,13 +82,11 @@ void NADebug()
}
}
-// LCOV_EXCL_STOP :dpm
// Called by NAAbort, NAAssert, CollHeap, EHExceptionHandler::throwException
// as the NAError.h #define ARKCMP_EXCEPTION_EPILOGUE().
//
-// LCOV_EXCL_START :dpm
void NAArkcmpExceptionEpilogue()
{
#ifdef SQLPARSERGLOBALS_FLAGS
@@ -97,7 +94,6 @@ void NAArkcmpExceptionEpilogue()
#endif
NAError_stub_for_breakpoints();
}
-// LCOV_EXCL_STOP :dpm
// wrapper for exit(), calling NAError_stub_for_breakpoints() first
void NAExit(Int32 status)
@@ -105,7 +101,7 @@ void NAExit(Int32 status)
NAAssertMutexLock(); // Serialize termination
releaseRTSSemaphore();
if (status)
- NAError_stub_for_breakpoints(); // LCOV_EXCL_LINE :dpm
+ NAError_stub_for_breakpoints();
if (status != 0)
{
#ifndef _DEBUG
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/common/CharType.cpp
----------------------------------------------------------------------
diff --git a/core/sql/common/CharType.cpp b/core/sql/common/CharType.cpp
index 2a56ecb..fff141d 100644
--- a/core/sql/common/CharType.cpp
+++ b/core/sql/common/CharType.cpp
@@ -98,11 +98,9 @@ CharType::CharType( NAMemory *h,
collation_ (co),
coercibility_ (ce)
{
-//LCOV_EXCL_START :rfi
ComASSERT(adtName == LiteralCHAR || adtName == LiteralVARCHAR
|| adtName == LiteralBYTE || adtName == LiteralVARBYTE
|| adtName == LiteralSchema || adtName == LiteralCatalog);
-//LCOV_EXCL_STOP
if ( encoding == CharInfo::UnknownCharSet )
encodingCharSet_ = charSet_;
@@ -147,11 +145,9 @@ CharType::CharType( NAMemory *h,
collation_ (co),
coercibility_ (ce)
{
-//LCOV_EXCL_START :rfi
ComASSERT(adtName == LiteralCHAR || adtName == LiteralVARCHAR
|| adtName == LiteralBYTE || adtName == LiteralVARBYTE
|| adtName == LiteralSchema || adtName == LiteralCatalog);
-//LCOV_EXCL_STOP
if ( encoding == CharInfo::UnknownCharSet )
encodingCharSet_ = charSet_;
@@ -187,12 +183,10 @@ NAString CharType::getCollateClause(CharInfo::Collation co)
return NAString("COLLATE ") + CharInfo::getCollationName(co);
}
-//LCOV_EXCL_START :rfi
NAString CharType::getCoercibilityText(CharInfo::Coercibility ce)
{
return NAString("(") + CharInfo::getCoercibilityText(ce) + " coercibility)";
}
-//LCOV_EXCL_STOP
// -----------------------------------------------------------------------
// Return the SQL name for this type.
@@ -733,10 +727,8 @@ Lng32 CharType::getMaxSingleCharacterValue() const
break;
} // switch (getCharSet())
-//LCOV_EXCL_START :rfi - unhandled charset&collation combination
ComASSERT(FALSE);
return INT_MIN;
-//LCOV_EXCL_STOP
}
NABoolean CharType::isCharSetAndCollationComboOK() const
@@ -1043,10 +1035,8 @@ short ANSIChar::getFSDatatype() const
#endif
return REC_BYTE_V_ANSI_DOUBLE;
default:
-//LCOV_EXCL_START :rfi - ANSIChar can be ISO88591 or UCS2 only
ComASSERT(FALSE);
return REC_BYTE_V_ANSI;
-//LCOV_EXCL_STOP
}
}
@@ -1068,10 +1058,8 @@ short SQLChar::getFSDatatype() const
return REC_BYTE_F_ASCII;
// fall through
default:
-//LCOV_EXCL_START :rfi - no values other than 1,2, & 4 are supported by the code.
ComASSERT(FALSE);
return REC_BYTE_F_ASCII;
-//LCOV_EXCL_STOP
}
}
@@ -1093,20 +1081,16 @@ short SQLVarChar::getFSDatatype() const
return REC_BYTE_V_ASCII;
// fall through
default:
-//LCOV_EXCL_START :rfi - - no values other than 1,2, & 4 are supported by the code.
ComASSERT(FALSE);
return REC_BYTE_V_ASCII;
-//LCOV_EXCL_STOP
}
}
-//LCOV_EXCL_START :rfi
short CharType::getFSDatatype() const
{
ComASSERT(FALSE);
return -1;
}
-//LCOV_EXCL_STOP
Lng32 CharType::getPrecisionOrMaxNumChars() const
{
@@ -1161,14 +1145,12 @@ void CharType::generateTextThenSetDisplayDataType ( CharInfo::CharSet cs // in
// -----------------------------------------------------------------------
// Print function for debugging
// -----------------------------------------------------------------------
-//LCOV_EXCL_START :rfi
void CharType::print(FILE *ofd, const char *indent)
{
#ifdef TRACING_ENABLED
fprintf(ofd,"%s%s\n",indent,getTypeSQLname());
#endif
} // CharType::print()
-//LCOV_EXCL_STOP
// -----------------------------------------------------------------------
// A method for generating the hash key.
@@ -1231,7 +1213,7 @@ void CharType::minMaxRepresentableValue(void* bufPtr,
break;
default:
- ComASSERT(FALSE); //LCOV_EXCL_LINE :rfi -- no other CharSets are supported yet.
+ ComASSERT(FALSE);
}
// copy the output value length into the varchar len header
@@ -1297,7 +1279,6 @@ double SQLChar::getMinValue() const
}
-//LCOV_EXCL_START : cnu -- As of 8/30/2011, needed to link successfully, but not actually called.
double SQLChar::encode (void *bufPtr) const
{
#if 1 /* Stub */
@@ -1311,7 +1292,6 @@ return 0;
return encodeString(charBufPtr,getNominalSize());
#endif
}
-//LCOV_EXCL_STOP : cnu -- As of 8/30/2011, needed to link successfully, but not actually called.
// -- Min and max permissible values for a VARCHAR string
// ## These too will need to be changed to handle different collating sequences
@@ -1331,7 +1311,6 @@ void SQLVarChar::maxRepresentableValue(void* bufPtr, Lng32* bufLen,
minMaxRepresentableValue(bufPtr, bufLen, stringLiteral, TRUE, h);
}
-//LCOV_EXCL_START : cnu -- As of 8/30/2011, needed to link successfully, but not actually called.
double SQLVarChar::encode (void *bufPtr) const
{
#if 1 /* Stub */
@@ -1350,7 +1329,6 @@ return 0;
return encodeString(&charBufPtr[getVarLenHdrSize()],actualLen);
#endif
}
-//LCOV_EXCL_STOP : cnu -- As of 8/30/2011, needed to link successfully, but not actually called.
THREAD_P NABoolean pushDownRequiredByODBC = TRUE;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/common/ComMvAttributeBitmap.cpp
----------------------------------------------------------------------
diff --git a/core/sql/common/ComMvAttributeBitmap.cpp b/core/sql/common/ComMvAttributeBitmap.cpp
index 692c348..0cbee94 100644
--- a/core/sql/common/ComMvAttributeBitmap.cpp
+++ b/core/sql/common/ComMvAttributeBitmap.cpp
@@ -53,7 +53,6 @@ ComSInt32 ComMvAttributeBitmap::getBitmap() const
//----------------------------------------------------------------------------
-// LCOV_EXCL_START
// exclude from coverage since this is a debugging method
void ComMvAttributeBitmap::trace()
{
@@ -220,10 +219,8 @@ void ComMvAttributeBitmap::trace()
#endif
} // trace
-// LCOV_EXCL_STOP
//----------------------------------------------------------------------------
-// LCOV_EXCL_START
// exclude from coverage - this code is not used for now
ComMvAttributeBitmap::Result
ComMvAttributeBitmap::setLogsCreatedOnMVCreation()
@@ -234,7 +231,6 @@ ComMvAttributeBitmap::setLogsCreatedOnMVCreation()
return (initialVal != bitmap_) ? ATTRIBUTE_SET : NO_CHAGE;
}
-// LCOV_EXCL_STOP
//----------------------------------------------------------------------------
ComMvAttributeBitmap::Result
@@ -356,7 +352,6 @@ ComMvAttributeBitmap::setRangeLogType(ComRangeLogType rangeLogType)
setToOtherThanManualRangeLog = TRUE;
break;
-// LCOV_EXCL_START
// exclude from coverage - range logging is not supported
// and default condition not reacheable
default:
@@ -370,7 +365,6 @@ ComMvAttributeBitmap::setRangeLogType(ComRangeLogType rangeLogType)
{
SetBit(LOGGING_REQUIRED);
}
-// LCOV_EXCL_STOP
return (initialVal != bitmap_) ? ATTRIBUTE_SET : NO_CHAGE;
}
@@ -464,7 +458,6 @@ ComMvAttributeBitmap::setMvsAllowed(ComMvsAllowed mvsAllowedType)
SetBit(RECOMPUTE_MVS_ALLOWED);
break;
-// LCOV_EXCL_START
// an exception code that we should not hit
case COM_MVS_ALLOWED_UNKNOWN:
bitmap_ = initialVal;
@@ -472,7 +465,6 @@ ComMvAttributeBitmap::setMvsAllowed(ComMvsAllowed mvsAllowedType)
default:
assert(0);
-// LCOV_EXCL_STOP
}
return (initialVal != bitmap_) ? ATTRIBUTE_SET : NO_CHAGE;
@@ -505,7 +497,6 @@ ComMvAttributeBitmap::setMvStatus(ComMVStatus value)
case COM_MVSTATUS_UNKNOWN:
default:
- // LCOV_EXCL_LINE
assert(0);
}
@@ -536,7 +527,6 @@ ComMvAttributeBitmap::setMvAudit(ComMvAuditType value)
case COM_MV_AUDIT_UNKNOWN:
default:
- // LCOV_EXCL_LINE
assert(0);
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/common/ComMvAttributeBitmap.h
----------------------------------------------------------------------
diff --git a/core/sql/common/ComMvAttributeBitmap.h b/core/sql/common/ComMvAttributeBitmap.h
index 95ebee8..45fd0ed 100644
--- a/core/sql/common/ComMvAttributeBitmap.h
+++ b/core/sql/common/ComMvAttributeBitmap.h
@@ -115,7 +115,6 @@ public:
inline NABoolean getAutomaticRangeLoggingRequired() const
{ return (IsBitSet(LOGGING_REQUIRED | AUTO_RANGELOG) ); }
- // LCOV_EXCL_START
// exclude from coverage since this method is used for similarity
// check and now we use AQR instead
inline NABoolean getInitOnStmtMvOnMe() const
@@ -127,7 +126,6 @@ public:
return (IsBitSet(MVS_ON_ME | MANUAL_RANGELOG) ||
IsBitSet(MVS_ON_ME | MIXED_RANGELOG) );
}
- // LCOV_EXCL_STOP
private:
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/common/ComSpace.cpp
----------------------------------------------------------------------
diff --git a/core/sql/common/ComSpace.cpp b/core/sql/common/ComSpace.cpp
index 33bbdd2..90ac005 100644
--- a/core/sql/common/ComSpace.cpp
+++ b/core/sql/common/ComSpace.cpp
@@ -474,7 +474,6 @@ void Space::outputBuffer(ComSpace * space, char * buf, char * newbuf)
}
}
-// LCOV_EXCL_START
void Space::display(char *buf,
size_t buflen,
size_t countPrefixSize, ostream &outstream)
@@ -509,7 +508,6 @@ void Space::display(char *buf,
outstream << flush;
ComASSERT(buf == bend);
}
-// LCOV_EXCL_STOP
@@ -565,7 +563,6 @@ void* Space::convertToPtr(Long offset) const
return NULL;
}
-// LCOV_EXCL_START
// The method is not called elsewhere
Lng32 Space::allocAndCopy(void * from, ULng32 size, NABoolean failureIsFatal)
{
@@ -573,7 +570,6 @@ Lng32 Space::allocAndCopy(void * from, ULng32 size, NABoolean failureIsFatal)
str_cpy_all(to, (char *)from, size);
return (convertToOffset(to));
}
-// LCOV_EXCL_STOP
#if 0 /* NOT CURRENTLY USED and does not compile for 64 bits */
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/common/DateTimeType.cpp
----------------------------------------------------------------------
diff --git a/core/sql/common/DateTimeType.cpp b/core/sql/common/DateTimeType.cpp
index fb4a719..95b9723 100644
--- a/core/sql/common/DateTimeType.cpp
+++ b/core/sql/common/DateTimeType.cpp
@@ -395,11 +395,9 @@ enum DatetimeType::Subtype DatetimeType::validate(rec_datetime_field startField,
case REC_DATE_DAY:
return SUBTYPE_ILLEGAL;
-//LCOV_EXCL_START : cnu -- SQ does not support old SQLMP stuff
case REC_DATE_HOUR:
case REC_DATE_MINUTE:
return SUBTYPE_SQLMPDatetime;
-//LCOV_EXCL_STOP : cnu
default:
assert (FALSE);
@@ -709,7 +707,6 @@ void DatetimeType::getRepresentableValue(const char* inValueString,
endOff--; // was at offset of next field, now at offset of the delimiter
i = endOff - startOff; // length (endOff is one past last char)
-//LCOV_EXCL_START : cnu -- SQ does not support old SQLMP stuff
if (getSubtype() == SUBTYPE_SQLMPDatetime)
{
fracPrec = getFractionPrecision();
@@ -722,7 +719,6 @@ void DatetimeType::getRepresentableValue(const char* inValueString,
i -= adjust;
}
}
-//LCOV_EXCL_STOP : cnu
char valueString[valueStringLen];
str_cpy_all(valueString, &inValueString[startOff], i /*length*/);
@@ -740,12 +736,10 @@ void DatetimeType::getRepresentableValue(const char* inValueString,
**stringLiteral += "\'";
**stringLiteral += valueString;
**stringLiteral += "\'";
-//LCOV_EXCL_START : cnu -- SQ does not support old SQLMP stuff
if (getSubtype() == SUBTYPE_SQLMPDatetime)
{
**stringLiteral += getDatetimeQualifierAsString(FALSE);
}
-//LCOV_EXCL_STOP : cnu
}
} // DatetimeType::getRepresentableValue
@@ -1299,7 +1293,6 @@ double SQLTimestamp::getMaxValue() const
}
-//LCOV_EXCL_START : cnu -- SQ does not support old SQLMP stuff
double SQLMPDatetime::encode(void *bufPtr) const
{
char * valPtr = (char *)bufPtr;
@@ -1320,7 +1313,6 @@ double SQLMPDatetime::encode(void *bufPtr) const
val += (double)w[6] / pow(10, getFractionPrecision());
return val;
}
-//LCOV_EXCL_STOP : cnu
// ***********************************************************************
@@ -1344,7 +1336,6 @@ NABoolean SQLMPDatetime::isSupportedType(void) const
//
// ***********************************************************************
-//LCOV_EXCL_START : cnu -- SQ does not support old SQLMP stuff
const NAType*SQLMPDatetime::synthesizeType(enum NATypeSynthRuleEnum synthRule,
const NAType& operand1,
const NAType& operand2,
@@ -1360,7 +1351,6 @@ const NAType*SQLMPDatetime::synthesizeType(enum NATypeSynthRuleEnum synthRule,
h,
flags);
}
-//LCOV_EXCL_STOP : cnu
// ***********************************************************************
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/common/ExprNode.cpp
----------------------------------------------------------------------
diff --git a/core/sql/common/ExprNode.cpp b/core/sql/common/ExprNode.cpp
index d8ba76f..80d91a1 100644
--- a/core/sql/common/ExprNode.cpp
+++ b/core/sql/common/ExprNode.cpp
@@ -806,7 +806,6 @@ ExprNode::ExprNode(const ExprNode& s)
ExprNode::~ExprNode() {}
-// LCOV_EXCL_START
ExprNode * ExprNode::getChild(Lng32 )
{
ABORT("virtual function ExprNode::getChild() must be redefined");
@@ -908,5 +907,4 @@ void ExprNode::addLocalExpr(LIST(ExprNode *) &,
{
// the default implementation is to do nothing
}
-// LCOV_EXCL_STOP
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/common/Ipc.cpp
----------------------------------------------------------------------
diff --git a/core/sql/common/Ipc.cpp b/core/sql/common/Ipc.cpp
index 2645d69..db077e1 100644
--- a/core/sql/common/Ipc.cpp
+++ b/core/sql/common/Ipc.cpp
@@ -83,7 +83,6 @@ NABoolean XAWAITIOX_MINUS_ONE = TRUE;
// Methods for class IpcNodeName
// -----------------------------------------------------------------------
-// LCOV_EXCL_START
IpcNodeName::IpcNodeName(IpcNetworkDomain dom,
const char *name)
{
@@ -125,7 +124,6 @@ IpcNodeName & IpcNodeName::operator = (const IpcNodeName &other)
return *this;
}
-// LCOV_EXCL_STOP
NABoolean IpcNodeName::operator == (const IpcNodeName &other)
{
@@ -198,7 +196,6 @@ IpcProcessId::IpcProcessId(
phandle_ = phandle;
}
-// LCOV_EXCL_START
IpcProcessId::IpcProcessId(
const SockIPAddress &ipAddr,
SockPortNumber port) : IpcMessageObj(IPC_PROCESS_ID,
@@ -209,7 +206,6 @@ IpcProcessId::IpcProcessId(
pid_.ipAddress_ = ipAddr.getRawAddress();
pid_.listnerPort_ = port;
}
-// LCOV_EXCL_STOP
IpcProcessId::IpcProcessId(const char *asciiRepresentation) :
IpcMessageObj(IPC_PROCESS_ID,
@@ -232,7 +228,6 @@ IpcProcessId::IpcProcessId(const char *asciiRepresentation) :
colonPos++;
if (asciiRepresentation[colonPos] == ':')
-// LCOV_EXCL_START
{
char asciiIpAddr[300];
SockIPAddress ipAddr;
@@ -257,7 +252,6 @@ IpcProcessId::IpcProcessId(const char *asciiRepresentation) :
domain_ = IPC_DOM_INTERNET;
}
}
-// LCOV_EXCL_STOP
}
}
@@ -270,7 +264,7 @@ IpcProcessId::IpcProcessId(
if (domain_ == IPC_DOM_GUA_PHANDLE)
phandle_ = other.phandle_;
else if (domain_ == IPC_DOM_INTERNET)
- pid_ = other.pid_; // LCOV_EXCL_LINE
+ pid_ = other.pid_;
}
IpcProcessId & IpcProcessId::operator = (const IpcProcessId &other)
@@ -280,7 +274,7 @@ IpcProcessId & IpcProcessId::operator = (const IpcProcessId &other)
if (domain_ == IPC_DOM_GUA_PHANDLE)
phandle_ = other.phandle_;
else if (domain_ == IPC_DOM_INTERNET)
- pid_ = other.pid_; // LCOV_EXCL_LINE
+ pid_ = other.pid_;
return *this;
}
@@ -307,7 +301,7 @@ NABoolean IpcProcessId::match(const IpcNodeName &name,
{
// IP addresses don't tell the CPU, just compare a normalized
// form of the IP addresses
- return (getNodeName() == name); // LCOV_EXCL_LINE
+ return (getNodeName() == name);
}
else if (domain_ == IPC_DOM_GUA_PHANDLE)
{
@@ -323,7 +317,6 @@ NABoolean IpcProcessId::match(const IpcNodeName &name,
return FALSE;
}
-// LCOV_EXCL_START
SockIPAddress IpcProcessId::getIPAddress() const
{
assert(domain_ == IPC_DOM_INTERNET);
@@ -337,7 +330,6 @@ SockPortNumber IpcProcessId::getPortNumber() const
return pid_.listnerPort_;
}
-// LCOV_EXCL_STOP
const GuaProcessHandle & IpcProcessId::getPhandle() const
{
@@ -351,7 +343,7 @@ IpcNodeName IpcProcessId::getNodeName() const
// getting to the node name is somewhat convoluted, sorry about that
if (domain_ == IPC_DOM_INTERNET)
{
- return IpcNodeName(SockIPAddress(pid_.ipAddress_)); // LCOV_EXCL_LINE
+ return IpcNodeName(SockIPAddress(pid_.ipAddress_));
}
#if (defined(NA_GUARDIAN_IPC))
else if (domain_ == IPC_DOM_GUA_PHANDLE)
@@ -404,7 +396,6 @@ Int32 IpcProcessId::toAscii(char *outBuf, Int32 outBufLen) const
if (domain_ == IPC_DOM_INTERNET)
{
-// LCOV_EXCL_START
sprintf(outb,"%d.%d.%d.%d:%d",
pid_.ipAddress_.ipAddress_[0],
pid_.ipAddress_.ipAddress_[1],
@@ -413,7 +404,6 @@ Int32 IpcProcessId::toAscii(char *outBuf, Int32 outBufLen) const
pid_.listnerPort_);
outLen = str_len(outb);
}
-// LCOV_EXCL_STOP
// copy the result and terminate it with a NUL character
str_cpy_all(outBuf,outb,MINOF(outLen,outBufLen-1));
@@ -465,10 +455,8 @@ IpcConnection * IpcProcessId::createConnectionToServer(
if (domain_ == IPC_DOM_INTERNET)
{
-// LCOV_EXCL_START
usesTransactions = usesTransactions; // make compiler happy
return new(env->getHeap()) SockConnection(env,*this,FALSE);
-// LCOV_EXCL_STOP
}
#if (defined(NA_GUARDIAN_IPC))
else if (domain_ == IPC_DOM_GUA_PHANDLE)
@@ -501,12 +489,10 @@ IpcMessageObjSize IpcProcessId::packedLength()
{
result += sizeof(phandle_);
}
-// LCOV_EXCL_START
else if (domain_ == IPC_DOM_INTERNET)
{
result += sizeof(pid_);
}
-// LCOV_EXCL_STOP
return result;
}
@@ -527,7 +513,6 @@ IpcMessageObjSize IpcProcessId::packObjIntoMessage(IpcMessageBufferPtr buffer)
// ---------------------------------------------------------------------
// pack the object of the right domain
-// LCOV_EXCL_START
if (domain_ == IPC_DOM_GUA_PHANDLE)
{
str_cpy_all(buffer,(const char *) &phandle_,sizeof(phandle_));
@@ -538,7 +523,6 @@ IpcMessageObjSize IpcProcessId::packObjIntoMessage(IpcMessageBufferPtr buffer)
str_cpy_all(buffer,(const char *) &pid_,sizeof(pid_));
result += sizeof(pid_);
}
-// LCOV_EXCL_STOP
return result;
}
@@ -567,11 +551,9 @@ void IpcProcessId::unpackObj(IpcMessageObjType objType,
str_cpy_all((char *) &phandle_, buffer, sizeof(phandle_));
}
else if (domain_ == IPC_DOM_INTERNET)
-// LCOV_EXCL_START
{
str_cpy_all((char *) &pid_, buffer, sizeof(pid_));
}
-// LCOV_EXCL_STOP
}
// -----------------------------------------------------------------------
@@ -631,7 +613,6 @@ void IpcServer::logEspRelease(const char * filename, int lineNum,
cc->getEnvironment() &&
cc->getEnvironment()->getLogReleaseEsp())
{
- // LCOV_EXCL_START
/*
Coverage notes: to test this code in a dev regression requires
changing $TRAF_HOME/etc/ms.env. However, it was tested in
@@ -704,7 +685,6 @@ void IpcServer::logEspRelease(const char * filename, int lineNum,
state);
SQLMXLoggingArea::logExecRtInfo(filename, lineNum, logMsg, 0);
- // LCOV_EXCL_STOP
}
}
@@ -857,12 +837,10 @@ NABoolean IpcConnection::moreWaitsAllowed()
return TRUE;
}
-// LCOV_EXCL_START
SockConnection *IpcConnection::castToSockConnection()
{
return NULL;
}
-// LCOV_EXCL_STOP
GuaConnectionToServer *IpcConnection::castToGuaConnectionToServer()
{
@@ -1652,7 +1630,6 @@ WaitReturnStatus IpcSetOfConnections::waitOnSet(IpcTimeout timeout,
{
if (env->getLogEspIdleTimeout())
{
- // LCOV_EXCL_START
/*
Coverage notes: to test this code in a dev
regression requires changing
@@ -1670,7 +1647,6 @@ WaitReturnStatus IpcSetOfConnections::waitOnSet(IpcTimeout timeout,
myName);
SQLMXLoggingArea::logExecRtInfo(__FILE__,
__LINE__, buf, 0);
- // LCOV_EXCL_STOP
}
// stop esp if it has become idle and timed out
NAExit(0);
@@ -2065,12 +2041,10 @@ void IpcSetOfConnections::checkLocalIntegrity(void)
IpcControlConnection::~IpcControlConnection() {}
-// LCOV_EXCL_START
SockControlConnection * IpcControlConnection::castToSockControlConnection()
{
return NULL;
}
-// LCOV_EXCL_STOP
GuaReceiveControlConnection *
IpcControlConnection::castToGuaReceiveControlConnection()
@@ -5131,19 +5105,19 @@ short getDefineShort( char * defineName )
const char *lre = getenv("LOG_ESP_RELEASE");
if (lre && *lre == '1')
- logReleaseEsp_ = true; // LCOV_EXCL_LINE
+ logReleaseEsp_ = true;
const char *liet = getenv("LOG_IDLE_ESP_TIMEOUT");
if (liet && *liet == '1')
- logEspIdleTimeout_ = true; // LCOV_EXCL_LINE
+ logEspIdleTimeout_ = true;
const char *legcm = getenv("LOG_ESP_GOT_CLOSE_MSG");
if (legcm && *legcm == '1')
- logEspGotCloseMsg_ = true; // LCOV_EXCL_LINE
+ logEspGotCloseMsg_ = true;
const char *etis = getenv("ESP_TIME_IPCCONNECTION_STATES");
if (etis && *etis == '1')
- logTimeIpcConnectionState_ = true; // LCOV_EXCL_LINE
+ logTimeIpcConnectionState_ = true;
const char *smEnv = getenv("SQ_SEAMONSTER");
if (smEnv && *smEnv == '1')
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/common/Ipc.h
----------------------------------------------------------------------
diff --git a/core/sql/common/Ipc.h b/core/sql/common/Ipc.h
index 329e386..325c334 100644
--- a/core/sql/common/Ipc.h
+++ b/core/sql/common/Ipc.h
@@ -180,7 +180,6 @@ public:
// make a node name from an Internet address or from a phandle
IpcNodeName(const SockIPAddress &iPNode);
#if (defined(NA_GUARDIAN_IPC))
-// LCOV_EXCL_START
IpcNodeName(const GuaProcessHandle &phandle);
// Return the Guardian node name as a character string, without trailing spaces.
inline void getNodeNameAsString (char * nodeName) const
@@ -192,7 +191,6 @@ public:
else
nodeName[i+1] = 0;
};
-// LCOV_EXCL_STOP
#endif
IpcNodeName & operator = (const IpcNodeName &other);
NABoolean operator == (const IpcNodeName &other);
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/common/IpcGuardian.cpp
----------------------------------------------------------------------
diff --git a/core/sql/common/IpcGuardian.cpp b/core/sql/common/IpcGuardian.cpp
index 89e968f..62e779d 100644
--- a/core/sql/common/IpcGuardian.cpp
+++ b/core/sql/common/IpcGuardian.cpp
@@ -159,7 +159,6 @@ inline static void openTraceFile()
#define ESP_TRACE2(s1,s2) if (sv_trace) { trace_printf(s1,s2);}
-// LCOV_EXCL_START
IpcStartupMsg::IpcStartupMsg()
{
// set the correct message code and blank out all other fields
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/common/NAMemory.h
----------------------------------------------------------------------
diff --git a/core/sql/common/NAMemory.h b/core/sql/common/NAMemory.h
index 69ca629..a58461f 100644
--- a/core/sql/common/NAMemory.h
+++ b/core/sql/common/NAMemory.h
@@ -156,13 +156,11 @@ public:
{ return addedSegCount_ >= maxSecSegCount_; }
Lng32 addSegId(short segId, void *start, size_t len);
void deleteSegId(short segId);
-// LCOV_EXCL_START
SEG_ID getFirstSegId() const { return firstSegId_; }
void * getFirstSegStart() const { return firstSegStart_; }
off_t getFirstSegOffset() const { return firstSegOffset_; }
size_t getFirstSegLen() const { return firstSegLen_; }
size_t getFirstSegMaxLen() const { return firstSegMaxLen_; }
-// LCOV_EXCL_STOP
void resizeSeg(short segId, void *start, size_t newLen);
// check whether a specified range of memory overlaps any of the segments
@@ -225,14 +223,12 @@ public:
NAHeapFragment* alignAsFragment();
#if (defined(_DEBUG) || defined(NSK_MEMDEBUG))
-// LCOV_EXCL_START
void dump(ostream* outstream,
Lng32 debugLevel,
MemoryStats& freeStats,
MemoryStats& allocStats,
NAHeapFragment *top,
Lng32 indent);
-// LCOV_EXCL_STOP
#endif
NABlock();
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/common/NAString.cpp
----------------------------------------------------------------------
diff --git a/core/sql/common/NAString.cpp b/core/sql/common/NAString.cpp
index 2eeaf1c..26fb9dc 100644
--- a/core/sql/common/NAString.cpp
+++ b/core/sql/common/NAString.cpp
@@ -166,9 +166,7 @@ char *convertNAString(const NAString& ns, CollHeap *heap, NABoolean wideNull)
else {
buf = new char[len + nullSpaceLen];
#ifndef NDEBUG
-//LCOV_EXCL_START :rfi
cerr << "Possible memory leak: convertNAString called with NULL heap\n";
-//LCOV_EXCL_STOP
#endif
}
#pragma nowarn(1506) // warning elimination
@@ -429,10 +427,8 @@ NAString ToAnsiIdentifier(const NAString &ns, NABoolean assertShort)
if ((Int32) internalFormatNameInUCS2.length() >
(Int32) (assertShort ? ComMAX_1_PART_INTERNAL_UCS2_NAME_LEN_IN_NAWCHARS : SMAX))
{
-//LCOV_EXCL_START :rfi
ComASSERT(0);
return NAString();
-//LCOV_EXCL_STOP
}
char buf[SMAX];
@@ -946,7 +942,7 @@ Lng32 ToInternalIdentifier( NAString &ansiIdent
i++;
break;
default:
- ComASSERT(FALSE); //LCOV_EXCL_LINE :rfi (Note: no-op in Release build)
+ ComASSERT(FALSE);
} // switch
} // while
@@ -1254,15 +1250,12 @@ static NABoolean tokIsFuncOrParenKeyword(const NAString &sqlText,
}
if (pic)
{
-//LCOV_EXCL_START : cnu - SeaQuest does not support COBOL
if (tok == " B " || tok == " X " ||
tok == " S9 " || tok == " S 9 " || tok == " SV9 " || tok == " V9 ")
return TRUE;
-//LCOV_EXCL_STOP
}
if (tok == " V9 ") // PICTURE S V9(nnn)
{
-//LCOV_EXCL_START : cnu - SeaQuest does not support COBOL
if (prevtok.length() > 3)
{
prevtok.remove(3);
@@ -1282,7 +1275,6 @@ static NABoolean tokIsFuncOrParenKeyword(const NAString &sqlText,
}
}
}
-//LCOV_EXCL_STOP
}
return FALSE;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/common/NAString2.cpp
----------------------------------------------------------------------
diff --git a/core/sql/common/NAString2.cpp b/core/sql/common/NAString2.cpp
index 32e9fbd..cc30bb5 100644
--- a/core/sql/common/NAString2.cpp
+++ b/core/sql/common/NAString2.cpp
@@ -212,11 +212,9 @@ void ToAnsiIdentifier3(const char * inputData, size_t inputLen,
// Verify that trailing blanks were excluded
sptr--;
if (isSpace8859_1((unsigned char)*sptr)) {
-//LCOV_EXCL_START :rfi
ComASSERT(0); // Note: no-op in Release build.
*outputLen = 0; // sorry, this is not supposed to happen
return;
-//LCOV_EXCL_STOP
}
}
else {
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/common/NAType.cpp
----------------------------------------------------------------------
diff --git a/core/sql/common/NAType.cpp b/core/sql/common/NAType.cpp
index b72cec2..4b8384f 100644
--- a/core/sql/common/NAType.cpp
+++ b/core/sql/common/NAType.cpp
@@ -335,7 +335,6 @@ NABoolean NAType::isNumeric() const
// Methods that return the binary form of the minimum and the maximum
// representable values.
// ---------------------------------------------------------------------
-//LCOV_EXCL_START : - Derived types MUST define the real routines
void NAType::minRepresentableValue(void*, Lng32*, NAString**,
NAMemory * h) const {}
@@ -395,9 +394,7 @@ NABoolean NAType::computeNextKeyValue(NAString &keyValue) const
ComASSERT(keyValue == temp);
return FALSE;
}
-//LCOV_EXCL_STOP : - Derived types MUST define the real routines
-//LCOV_EXCL_START :
void NAType::print(FILE* ofd, const char* indent)
{
#ifdef TRACING_ENABLED
@@ -405,7 +402,6 @@ void NAType::print(FILE* ofd, const char* indent)
indent,getNominalSize(),getTotalSize());
#endif
}
-//LCOV_EXCL_STOP :
// -- The external name for the type (text representation)
@@ -443,12 +439,10 @@ Lng32 NAType::getPrecision() const
return -1;
}
-//LCOV_EXCL_START : Routine must be defined, but used only by numeric types.
Lng32 NAType::getMagnitude() const
{
return -1;
}
-//LCOV_EXCL_STOP :
Lng32 NAType::getScale() const
{
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/common/Timer.h
----------------------------------------------------------------------
diff --git a/core/sql/common/Timer.h b/core/sql/common/Timer.h
index a6bd826..c9c7c77 100644
--- a/core/sql/common/Timer.h
+++ b/core/sql/common/Timer.h
@@ -39,7 +39,6 @@ private:
public:
-//LCOV_EXCL_START : dpm - Used only by Dp2 Tracing when cqd EID_TRACE_STATES > 0
// A timer needs to be explicitly started using 'start' or 'restart'
Timer()
: running_(false),
@@ -113,7 +112,6 @@ public:
return ( accumTime_ );
}
}
-//LCOV_EXCL_STOP : dpm - Used only by Dp2 Tracing when cqd EID_TRACE_STATES > 0
};
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/common/charinfo.cpp
----------------------------------------------------------------------
diff --git a/core/sql/common/charinfo.cpp b/core/sql/common/charinfo.cpp
index ff019f3..3891f98 100644
--- a/core/sql/common/charinfo.cpp
+++ b/core/sql/common/charinfo.cpp
@@ -215,7 +215,6 @@ NABoolean CharInfo::isMsgCharSetSupported(CharSet cs) {
return ( (cs == CharInfo::UTF8) || (cs == CharInfo::UNICODE) );
}
-//LCOV_EXCL_START :rfi
// see TESTCHARSET in CmpMain.cpp
void CharInfo::toggleCharSetSupport(CharSet cs)
{
@@ -235,7 +234,6 @@ void CharInfo::toggleCharSetSupport(CharSet cs)
}
#endif
}
-//LCOV_EXCL_STOP
// for R2 FCS.
CharInfo::CharSet CharInfo::getEncoding(const CharInfo::CharSet x)
@@ -346,7 +344,6 @@ CollationInfo::CollationInfo(CollHeap *h,
ComASSERT(name);
namelen_ = strlen(name); // allowed to be 0 if siz[] not passed in
if (siz) {
-//LCOV_EXCL_START :cnu -- As of 8/30/2011, no support in SQ for Collations
size_t cnt = siz[0];
#pragma nowarn(270) // warning elimination
ComASSERT(cnt >= 0 && cnt < MAX_NAME_PARTS);
@@ -355,7 +352,6 @@ CollationInfo::CollationInfo(CollHeap *h,
for (size_t off = 0; off < OFFSETARRAY_SIZE; off++) {
synonymOffset_[off] = (off < cnt) ? siz[off+2] : 0;
}
-//LCOV_EXCL_STOP
} else
synonymOffset_[0] = synonymOffset_[1] = synonymOffset_[2] = 0;
if (flags_ & NO_ALLOC_AND_COPY_IN_CTOR)
@@ -369,11 +365,9 @@ CollationInfo::CollationInfo(CollHeap *h,
-//LCOV_EXCL_START :cnu -- As of 8/30/2011, no support in SQ for Collations
void CollationInfo::display() const
{
}
-//LCOV_EXCL_STOP
//
CollationDB::CollationDB(CollHeap *h)
: CollationDBSupertype(h), heap_(h), refreshNeeded_(TRUE)
@@ -398,11 +392,9 @@ CollationDB::~CollationDB()
}
-//LCOV_EXCL_START :cnu -- As of 8/30/2011, no support in SQ for Collations
void CollationDB::display() const
{
}
-//LCOV_EXCL_STOP
void CollationDB::Display()
{
@@ -585,7 +577,6 @@ Int32 CharInfo::getCollationFlags(Collation co)
// COERCIBILITY stuff
//****************************************************************************
-//LCOV_EXCL_START :cnu -- As of 8/30/2011, no support in SQ for Collations
const char* CharInfo::getCoercibilityText(Coercibility ce)
{
// These are not keywords, not tokens, not part of Ansi syntax.
@@ -598,7 +589,6 @@ const char* CharInfo::getCoercibilityText(Coercibility ce)
default: return "unknown";
}
}
-//LCOV_EXCL_STOP
// "Which coercibility wins?"
// Returns 0 if they're equal, 1 if the first one wins, 2 if the second.
@@ -608,7 +598,6 @@ const char* CharInfo::getCoercibilityText(Coercibility ce)
// ## (As an aside, note that CharType::computeCoAndCo()
// ## could be pulled out into a static CharInfo:: method placed here.)
//
-//LCOV_EXCL_START :cnu -- As of 8/30/2011, no support in SQ for Collations
Int32 CharInfo::compareCoercibility(CharInfo::Coercibility ce1,
CharInfo::Coercibility ce2)
{
@@ -626,7 +615,6 @@ Int32 CharInfo::compareCoercibility(CharInfo::Coercibility ce1,
ComASSERT(FALSE); // ceN IMPLICIT already handled above!
return -1;
}
-//LCOV_EXCL_STOP
//****************************************************************************
@@ -642,7 +630,6 @@ Lng32 CharInfo::findLocaleCharSet()
}
-//LCOV_EXCL_START :cnu -- As of 8/30/2011, only caller is #if'd out
const char* CharInfo::getLocaleCharSetAsString()
{
if (!localeCharSet_) {
@@ -666,7 +653,6 @@ const char* CharInfo::getLocaleCharSetAsString()
return SQLCHARSETSTRING_UNKNOWN;
#pragma warn(203) // warning elimination
}
-//LCOV_EXCL_STOP
Int32 CharInfo::getTargetCharTypeFromLocale()
{
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/common/charinfo.h
----------------------------------------------------------------------
diff --git a/core/sql/common/charinfo.h b/core/sql/common/charinfo.h
index a210533..88aceb0 100644
--- a/core/sql/common/charinfo.h
+++ b/core/sql/common/charinfo.h
@@ -360,12 +360,10 @@ public:
return collationNPasses[getCollationParamsIndex( collation) ];
}
-//LCOV_EXCL_START :cnu -- SQ does not support any collations yet.
inline static unsigned char getCollationMaxChar(const CharInfo::Collation collation)
{
return collationMaxChar[getCollationParamsIndex( collation) ];
}
-//LCOV_EXCL_STOP
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/common/conversionSJIS.cpp
----------------------------------------------------------------------
diff --git a/core/sql/common/conversionSJIS.cpp b/core/sql/common/conversionSJIS.cpp
index 5aab462..c714e75 100644
--- a/core/sql/common/conversionSJIS.cpp
+++ b/core/sql/common/conversionSJIS.cpp
@@ -44,7 +44,6 @@
#include "NLSConversion.h"
#include "nawstring.h"
-//LCOV_EXCL_START :cnu -- SJIS not supported yet
#ifdef MODULE_DEBUG
#include "stringBuf.cpp"
@@ -638,4 +637,3 @@ Int32 main(Int32 argc, char** argv)
}
#endif
-//LCOV_EXCL_STOP :cnu -- SJIS not supported yet
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/common/dfs2rec.h
----------------------------------------------------------------------
diff --git a/core/sql/common/dfs2rec.h b/core/sql/common/dfs2rec.h
index 52d34dd..1558ed8 100644
--- a/core/sql/common/dfs2rec.h
+++ b/core/sql/common/dfs2rec.h
@@ -458,7 +458,6 @@ private:
}
public:
-//LCOV_EXCL_START : Reported by Code Coverage tool as unused, but actually not executable on SQ
Lng32 getLength()
{
if ((type >= REC_MIN_NUMERIC) && (type <= REC_MAX_NUMERIC))
@@ -472,7 +471,6 @@ public:
else
return len_etc.datetime_.len;
};
-//LCOV_EXCL_STOP
Lng32 getPrecision()
{
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/common/nawstring.cpp
----------------------------------------------------------------------
diff --git a/core/sql/common/nawstring.cpp b/core/sql/common/nawstring.cpp
index 33ca1a1..9b853ba 100644
--- a/core/sql/common/nawstring.cpp
+++ b/core/sql/common/nawstring.cpp
@@ -247,7 +247,6 @@ size_t NAWString::index(const NAWchar* pattern, size_t patLen, size_t startIndex
// Use the NADELETEBASIC(returned_NAWchar_star_pointer, heap_pointer)
// call (C macro expansion/invocation) to deallocate the buffer.
// -----------------------------------------------------------------------
-//LCOV_EXCL_START :cnu -- As of 8/30/2011, no callers in SQ SQL except copyNAWString() which has no callers
NAWchar * newNAWcharBuffer(const NAWString& naws, CollHeap *heap)
{
size_t len = naws.length();
@@ -263,7 +262,6 @@ NAWchar * newNAWcharBuffer(const NAWString& naws, CollHeap *heap)
buf[len] = NAWCHR('\0');
return buf;
}
-//LCOV_EXCL_STOP
// -----------------------------------------------------------------------
// newNAWcharBufferContainingAnEmptyNAWString()
@@ -282,7 +280,6 @@ NAWchar * newNAWcharBuffer(const NAWString& naws, CollHeap *heap)
// Use the NADELETEBASIC(returned_NAWchar_star_pointer, heap_pointer)
// call (C macro expansion/invocation) to deallocate the buffer.
// -----------------------------------------------------------------------
-//LCOV_EXCL_START :cnu -- As of 8/30/2011, no callers in SQ SQL except copyNAWString() which has no callers
NAWchar * newNAWcharBufferContainingAnEmptyString(CollHeap *heap)
{
NAWchar* buf = NULL;
@@ -298,7 +295,6 @@ NAWchar * newNAWcharBufferContainingAnEmptyString(CollHeap *heap)
return buf;
}
-//LCOV_EXCL_STOP
// -----------------------------------------------------------------------
// Remove whitespace (spaces and tabs) from front or back or both
@@ -317,12 +313,10 @@ void TrimNAWStringSpace(NAWString& ns, NAString::stripType eStripType) // defaul
}
if (eStripType == NAString::leading || eStripType == NAString::both) {
-//LCOV_EXCL_START :cnu -- As of 8/30/2011, no callers pass eStripType value other than "trailing".
for (i=0; i<ns.length(); i++)
if (!isSpace8859_1(ns[i]))
break;
if (i)
ns.remove(0, i);
-//LCOV_EXCL_STOP
}
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/common/nchar_mp.h
----------------------------------------------------------------------
diff --git a/core/sql/common/nchar_mp.h b/core/sql/common/nchar_mp.h
index 0008684..60e20da 100644
--- a/core/sql/common/nchar_mp.h
+++ b/core/sql/common/nchar_mp.h
@@ -53,7 +53,6 @@
// A simple class devoting to the concept of MP KANJI charset
////////////////////////////////////////////////////////////////////
-//LCOV_EXCL_START : cnu -- As of 8/30/2011, not used in SQ SQL.
class kanji_char_set
{
@@ -96,14 +95,12 @@ static short bytesPerChar() { return 2; };
private:
};
-//LCOV_EXCL_STOP : cnu
////////////////////////////////////////////////////////////////////
// A simple class devoting to the concept of MP KSC5601 charset
////////////////////////////////////////////////////////////////////
-//LCOV_EXCL_START : cnu -- As of 8/30/2011, not used in SQ SQL.
class ksc5601_char_set
{
@@ -146,7 +143,6 @@ static short bytesPerChar() { return 2; };
private:
};
-//LCOV_EXCL_STOP : cnu
#endif
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/common/str.cpp
----------------------------------------------------------------------
diff --git a/core/sql/common/str.cpp b/core/sql/common/str.cpp
index bcb9d36..bd11d5e 100644
--- a/core/sql/common/str.cpp
+++ b/core/sql/common/str.cpp
@@ -151,11 +151,9 @@ Int32 isCaseInsensitive8859_1(NAWchar c) // ISO 8859-1 char for which there is n
// the compiler is fixed to inline routines with calls to assert,
// Remove callAssert() in callers and replace with direct call to
// assert.
-//LCOV_EXCL_START :rfi
void callAssert(const char* tgt, const char* src, Lng32 length) {
assert((tgt && src) || !length);
}
-//LCOV_EXCL_STOP
Int32 str_cmp_ne(const char *left, const char *right)
{
@@ -792,10 +790,8 @@ Int32 str_sprintf(char * buffer, const char * format, ...)
case PERC_ERROR:
{
- //LCOV_EXCL_START :rfi
assert(0);
return -1;
- //LCOV_EXCL_STOP
}
break;
@@ -830,10 +826,8 @@ Lng32 str_encoded_len(Lng32 byteLen)
// with two extra bytes add three more characters (6+6+4 bits)
return threes*4+3;
}
-//LCOV_EXCL_START :rfi -- modulo 3 cannot produce values other than 0, 1, & 2
assert(0);
return 0; // should be hard to get here but compiler doesn't know that
-//LCOV_EXCL_STOP
}
// -----------------------------------------------------------------------
@@ -915,7 +909,7 @@ Lng32 str_decoded_len(Lng32 charLen)
return fours * 3;
case 1:
// this length cannot have been generated by str_encoded_len!!
- assert(0); //LCOV_EXCL_LINE :rfi
+ assert(0);
case 2:
// one extra byte in two extra characters
return fours*3+1;
@@ -923,10 +917,8 @@ Lng32 str_decoded_len(Lng32 charLen)
// two extra bytes in the three extra characters
return fours*3+2;
}
-//LCOV_EXCL_START :rfi -- modulo 4 cannot produce values other than 0, 1, 2, & 3
assert(0);
return 0;
-//LCOV_EXCL_STOP
}
// -----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/common/wstr.cpp
----------------------------------------------------------------------
diff --git a/core/sql/common/wstr.cpp b/core/sql/common/wstr.cpp
index 9c99a36..e8f33cd 100644
--- a/core/sql/common/wstr.cpp
+++ b/core/sql/common/wstr.cpp
@@ -360,13 +360,11 @@ Lng32 na_wcstol (const NAWchar * wstr)
return (Lng32)na_wcstoll(wstr);
}
-//LCOV_EXCL_START : cnu - used only by swscanf() (which is not used) and EncodedValue.cpp (in DEBUG code)
double na_wcstod(const NAWchar *, NAWchar **)
{
// not implemented!
return (double)0;
}
-//LCOV_EXCL_STOP
NAWchar *na_wmemchr(const NAWchar *ws, NAWchar wc, Int32 n)
{
@@ -402,7 +400,6 @@ size_t na_mbstowcs(NAWchar* wp, const char* p, size_t mx_wp)
return n;
}
-//LCOV_EXCL_START : cnu [ used only by CIEDelimDataFileDoubleByte::PositionFile() in the IMPORT utility ]
NAWchar* na_wcswcs(const NAWchar* wp1, const NAWchar* wp2)
{
if ( wp2 == NULL || *wp2 == (NAWchar)0 )
@@ -419,7 +416,6 @@ NAWchar* na_wcswcs(const NAWchar* wp1, const NAWchar* wp2)
return NULL;
}
-//LCOV_EXCL_STOP
#include "swscanf.cpp"
#include "swsprintf.cpp"
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/executor/Allocator.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/Allocator.h b/core/sql/executor/Allocator.h
index 5ad39c3..4fc23f6 100644
--- a/core/sql/executor/Allocator.h
+++ b/core/sql/executor/Allocator.h
@@ -130,7 +130,6 @@ namespace ExOverflow
{
return heap_;
}
-//LCOV_EXCL_START
inline
ByteCount64
Allocator::getMaxAllocation(void) const
@@ -149,7 +148,6 @@ namespace ExOverflow
return (UInt32) (quota_ / ONE_MEGABYTE);
#endif
}
-//LCOV_EXCL_STOP
inline
void
Allocator::reuse(char* buffer)
@@ -159,14 +157,12 @@ namespace ExOverflow
reuseList_.push_back(buffer);
}
}
-//LCOV_EXCL_START
inline
ByteCount64
Allocator::size(void) const
{
return memAllocated_;
}
-//LCOV_EXCL_STOP
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/executor/CliMsgObj.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/CliMsgObj.cpp b/core/sql/executor/CliMsgObj.cpp
index c7b5b13..863f05f 100644
--- a/core/sql/executor/CliMsgObj.cpp
+++ b/core/sql/executor/CliMsgObj.cpp
@@ -39,7 +39,6 @@
#include "ComplexObject.h"
#include "CliMsgObj.h"
#include "sqlcli.h"
-//LCOV_EXCL_START
// allocate memory from the heap and duplicate the string
static char * dupCharStar(NAMemory *heap, char *source){
char *target = NULL;
@@ -261,4 +260,3 @@ ComplexObject * CliComplexObjectFactory::manufacture(NAMemory *heap,
return NULL;
}
}
-//LCOV_EXCL_STOP
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/executor/ExComTdb.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExComTdb.cpp b/core/sql/executor/ExComTdb.cpp
index cd54970..428f54f 100644
--- a/core/sql/executor/ExComTdb.cpp
+++ b/core/sql/executor/ExComTdb.cpp
@@ -84,12 +84,10 @@
// defined in Generator.cpp. That code, however, fixes up the TDB's to
// the Compiler version.
// -----------------------------------------------------------------------
-// LCOV_EXCL_START
void ComTdb::fixupVTblPtr()
{
fixupVTblPtrExe();
}
-// LCOV_EXCL_STOP
char *ComTdb::findVTblPtr(short classID)
{
@@ -103,12 +101,10 @@ char *ComTdb::findVTblPtr(short classID)
// implemented in the comexe project which fixes up a TDB object to the
// Compiler version of the TDB.
// -----------------------------------------------------------------------
-// LCOV_EXCL_START
void ComTdb::fixupVTblPtrExe()
{
ex_assert(0,"fixupVTblPtrExe() shouldn't be called"); // method retired
}
-// LCOV_EXCL_STOP
// -----------------------------------------------------------------------
@@ -718,7 +714,7 @@ case ex_LOB_INFO:
}
default:
- ex_assert(0, "findVTblPtrExe(): Cannot find entry of this ClassId"); // LCOV_EXCL_LINE
+ ex_assert(0, "findVTblPtrExe(): Cannot find entry of this ClassId");
break;
}
return vtblptr;
@@ -801,7 +797,6 @@ Lng32 getTotalTcbSpace(char*inTdb, char * otherInfo, char * parentMemory)
switch (tdb->getNodeType())
{
-// LCOV_EXCL_START
// This method is called from an internal CLI call and the only palce
// where this internal CLI call is make is from generator for Generator.cpp
// for EID Root tdb and so this code is not called for other tdb's
@@ -813,7 +808,6 @@ Lng32 getTotalTcbSpace(char*inTdb, char * otherInfo, char * parentMemory)
g = new(&heap) ExEspStmtGlobals(10, NULL, 0, &space, &heap, NULL,
NullFragInstanceHandle, 0);
break;
-// LCOV_EXCL_STOP
case ComTdb::ex_EXPLAIN:
break;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/executor/ExExeUtilGet.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExExeUtilGet.cpp b/core/sql/executor/ExExeUtilGet.cpp
index b32a35a..25963d5 100644
--- a/core/sql/executor/ExExeUtilGet.cpp
+++ b/core/sql/executor/ExExeUtilGet.cpp
@@ -4513,7 +4513,6 @@ short ExExeUtilShowSetTcb::work()
return 0;
}
-//LCOV_EXCL_START
///////////////////////////////////////////////////////////////////
ex_tcb * ExExeUtilGetUIDTdb::build(ex_globals * glob)
@@ -7506,7 +7505,6 @@ short ExExeUtilLobInfoTcb::work()
return WORK_OK;
}
-//LCOV_EXCL_STOP
@@ -7803,4 +7801,3 @@ short ExExeUtilLobInfoTableTcb::work()
return WORK_OK;
}
-//LCOV_EXCL_STOP