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:42:55 UTC
[01/14] incubator-trafodion git commit: lcov: commit #1
Repository: incubator-trafodion
Updated Branches:
refs/heads/master 4e316c05d -> 0ff0d92a1
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/ustat/hs_la.cpp
----------------------------------------------------------------------
diff --git a/core/sql/ustat/hs_la.cpp b/core/sql/ustat/hs_la.cpp
index c5fceac..3e1b2d8 100644
--- a/core/sql/ustat/hs_la.cpp
+++ b/core/sql/ustat/hs_la.cpp
@@ -519,7 +519,6 @@ Int64 HSSqTableDef::getRowCount(NABoolean &isEstimate,
return 1000000;
}
-// LCOV_EXCL_START :nt
/***************************************************************************/
/* METHOD: getRowCountUsingSelect() */
/* PURPOSE: Get row count of a table using 'select count(*)'. */
@@ -545,7 +544,6 @@ Int64 HSTableDef::getRowCountUsingSelect()
return rows;
}
-// LCOV_EXCL_STOP
//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
// 10-060424-6040
@@ -560,7 +558,6 @@ NABoolean HSSqTableDef::publicSchemaExists()
{
return FALSE;
}
-// LCOV_EXCL_STOP
// Check to see if a system defined SYSKEY exists and set hasSyskey_ flag.
Lng32 HSSqTableDef::setHasSyskeyFlag()
@@ -591,7 +588,7 @@ Lng32 HSSqTableDef::setHasSyskeyFlag()
query = "SELECT SYSKEY, * FROM ";
if(objActualFormat_ == SQLMP)
- query += getTableName(tableName_->data(), nameSpace_); // LCOV_EXCL_LINE :nsk
+ query += getTableName(tableName_->data(), nameSpace_);
else
query += getTableName(ansiName_->data(), nameSpace_);
@@ -742,22 +739,18 @@ NAString HSSqTableDef::getNodeName() const
NAString HSTableDef::getObjectFullName() const
{
- // LCOV_EXCL_START :nsk
if(objActualFormat_ == SQLMP)
return tableName_->data();
else
- // LCOV_EXCL_STOP
return ansiName_->data();
}
-// LCOV_EXCL_START :nsk
NAString HSSqTableDef::getCatalogLoc(formatType format) const
{
NAString catalogName;
return catalogName;
}
-// LCOV_EXCL_STOP
NAString HSTableDef::getPrimaryLoc(formatType format) const
@@ -772,7 +765,6 @@ NAString HSTableDef::getPrimaryLoc(formatType format) const
}
else
{
- // LCOV_EXCL_START :nsk
if (objActualFormat_ == SQLMP)
{
loc.append(catalog_->data());
@@ -780,7 +772,6 @@ NAString HSTableDef::getPrimaryLoc(formatType format) const
loc.append(ToAnsiIdentifier(schema_->data()));
}
else
- // LCOV_EXCL_STOP
{
loc.append(ToAnsiIdentifier(catalog_->data()));
loc.append(".");
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/ustat/hs_log.cpp
----------------------------------------------------------------------
diff --git a/core/sql/ustat/hs_log.cpp b/core/sql/ustat/hs_log.cpp
index f7584d0..988b7c2 100644
--- a/core/sql/ustat/hs_log.cpp
+++ b/core/sql/ustat/hs_log.cpp
@@ -124,7 +124,6 @@ void HSFuncMergeDiags( Lng32 sqlcode
// If an internal error was triggered by some other error, add a parameter
// that specifies that error number. The format of the message is such that
// it will read correctly with or without this parameter.
- // LCOV_EXCL_START :rfi
if (sqlcode == -UERR_INTERNAL_ERROR)
{
if (sqlcode2 < 0)
@@ -136,7 +135,6 @@ void HSFuncMergeDiags( Lng32 sqlcode
else
diagsArea << DgString2("");
}
- // LCOV_EXCL_STOP
if (fsError)
diagsArea << DgInt0(fsError);
@@ -573,7 +571,7 @@ void HSLogMan::LogTimeDiff(const char *text, NABoolean reset)
timeval curTime;
if (gettimeofday(&curTime, 0) != 0)
- Log("ERROR: gettimeofday failed.\n"); // LCOV_EXCL_LINE :rfi
+ Log("ERROR: gettimeofday failed.\n");
else
// calcualte time difference only when this is not a reset and prevtime has been set
if (!reset && (prevTime_.tv_sec != 0 || prevTime_.tv_usec != 0))
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/ustat/hs_parser.cpp
----------------------------------------------------------------------
diff --git a/core/sql/ustat/hs_parser.cpp b/core/sql/ustat/hs_parser.cpp
index bbfe978..c01a6d9 100644
--- a/core/sql/ustat/hs_parser.cpp
+++ b/core/sql/ustat/hs_parser.cpp
@@ -374,13 +374,11 @@ Lng32 AddTableName( const hs_table_type type
LM->Log(LM->msg);
}
HSGlobalsClass::schemaVersion = getTableSchemaVersion(hs_globals->user_table->data());
- // LCOV_EXCL_START :rfi
if (HSGlobalsClass::schemaVersion == COM_VERS_UNKNOWN)
{
HSFuncMergeDiags(-UERR_INTERNAL_ERROR, "GET_SCHEMA_VERSION");
return -1;
}
- // LCOV_EXCL_STOP
if (HSGlobalsClass::schemaVersion >= COM_VERS_2300)
@@ -416,7 +414,6 @@ Lng32 AddTableName( const hs_table_type type
}
else
{
- // LCOV_EXCL_START :nsk
*hs_globals->hstogram_table = hs_globals->objDef->getCatalogLoc(HSTableDef::EXTERNAL_FORMAT);
hs_globals->hstogram_table->append(".HISTOGRM");
@@ -426,7 +423,6 @@ Lng32 AddTableName( const hs_table_type type
// RESET CQDS:
HSFuncExecQuery("CONTROL QUERY DEFAULT POS RESET");
HSFuncExecQuery("CONTROL QUERY DEFAULT POS_NUM_OF_PARTNS RESET");
- // LCOV_EXCL_STOP
}
return 0;
@@ -1034,21 +1030,17 @@ Lng32 AddEveryColumn(const char *startColumn, const char *endColumn)
else
{
start = hs_globals->objDef->getColNum(startColumn);
- // LCOV_EXCL_START :rfi
if (start < 0)
{
retcode = -1;
HSHandleError(retcode);
}
- // LCOV_EXCL_STOP
upto = hs_globals->objDef->getColNum(endColumn);
- // LCOV_EXCL_START :rfi
if (upto < 0)
{
retcode = -1;
HSHandleError(retcode);
}
- // LCOV_EXCL_STOP
if (start > upto)
{
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/ustat/hs_read.cpp
----------------------------------------------------------------------
diff --git a/core/sql/ustat/hs_read.cpp b/core/sql/ustat/hs_read.cpp
index f8f9114..638c80a 100644
--- a/core/sql/ustat/hs_read.cpp
+++ b/core/sql/ustat/hs_read.cpp
@@ -222,7 +222,7 @@ Lng32 HSStatsTimeCursor::open(NABoolean updateReadTime)
stmt = "CURSOR102_MX_2300";
}
else
- stmt = "CURSOR102_MX"; // LCOV_EXCL_LINE :cnu
+ stmt = "CURSOR102_MX";
return OpenCursor( stmt,
(void *)histogramTableName_,
@@ -366,7 +366,7 @@ Lng32 HSStatsTimeCursor::get(Int64 &maxStatTime, const NAColumnArray &colArray,
(void *)(&readCount), NULL);
else
retcode_ = SQL_EXEC_Fetch(desc_, NULL, 2,(void *)(&statTime), NULL,
- (void *)(&colNumber), NULL); // LCOV_EXCL_LINE :cnu
+ (void *)(&colNumber), NULL);
if (retcode_ == HS_EOF || retcode_ < 0) break;
LM->Log("While Fetching StatsTime: Check for update of READ_TIME/READ_COUNT.");
@@ -885,7 +885,6 @@ Lng32 FetchHistograms( const QualifiedName & qualifiedName
}
else
{
- // LCOV_EXCL_START :nsk
ComMPLoc tempObj (actualQualifiedName.getQualifiedNameAsString().data(),
ComMPLoc::FILE);
objectName = new(STMTHEAP) ComObjectName(tempObj.getSysDotVol(),
@@ -898,7 +897,6 @@ Lng32 FetchHistograms( const QualifiedName & qualifiedName
*objectName,
GUARDIAN_TABLE,
ExtendedQualName::convSpecialTableTypeToAnsiNameSpace(actualType));
- // LCOV_EXCL_STOP
}
if ((actualType == ExtendedQualName::NORMAL_TABLE ||
@@ -936,10 +934,8 @@ Lng32 FetchHistograms( const QualifiedName & qualifiedName
}
else
{
- // LCOV_EXCL_START :nsk
histogramTableName = tabDef->getCatalogLoc(HSTableDef::EXTERNAL_FORMAT) + ".HISTOGRM";
histintsTableName = tabDef->getCatalogLoc(HSTableDef::EXTERNAL_FORMAT) + ".HISTINTS";
- // LCOV_EXCL_STOP
}
fullQualName = tabDef->getObjectFullName();
@@ -1572,14 +1568,12 @@ Lng32 HSHistogrmCursor::fetch( HSColStats &cs
// histograms. So, this code could be removed.
// if it is an empty histogram for automation (it has been needed before),
// flag it, so it will not be added again
- // LCOV_EXCL_START :cnu
if ( reason_ == HS_REASON_EMPTY )
{
if (colCount_ == 1) // an empty histogram exists for this single column histogram
emptyHistogram[tableColNum_] = TRUE;
continue;
}
- // LCOV_EXCL_STOP
// update the latest statsTime only when it is not an empty histogram
if (statsTime < statsTime_) statsTime = statsTime_;
@@ -1707,7 +1701,6 @@ Lng32 HSHistogrmCursor::fetch( HSColStats &cs
numHistograms++;
}
- // LCOV_EXCL_START :rfi
catch (CmpInternalException&)
{
//No need to handle exception because default histograms will be
@@ -1724,7 +1717,6 @@ Lng32 HSHistogrmCursor::fetch( HSColStats &cs
<< DgString2(LM->msg);
throw;
}
- // LCOV_EXCL_STOP
}
while ((retcode_ = get()) == 0);
@@ -1792,7 +1784,6 @@ Lng32 HSHistogrmCursor::get()
//(void *)buf3_, NULL,
//(void *)buf4_, NULL
);
- // LCOV_EXCL_START :cnu
else
retcode_ = SQL_EXEC_Fetch(desc_, NULL, 9,
(void *)&histid_, NULL,
@@ -1804,7 +1795,6 @@ Lng32 HSHistogrmCursor::get()
(void *)&statsTime_, NULL,
(void *)buf1_, NULL,
(void *)buf2_, NULL);
- // LCOV_EXCL_STOP
if (retcode_ < 0)
{
@@ -1874,11 +1864,11 @@ Lng32 HSHistogrmCursor::open()
}
else
{
- if (fileType_ == SQLMP) stmt = "CURSOR101_NOMC_MP"; // LCOV_EXCL_LINE :nsk
+ if (fileType_ == SQLMP) stmt = "CURSOR101_NOMC_MP";
else
if (HSGlobalsClass::schemaVersion >= COM_VERS_2300)
stmt = "CURSOR101_NOMC_MX_2300";
- else stmt = "CURSOR101_NOMC_MX"; // LCOV_EXCL_LINE :cnu
+ else stmt = "CURSOR101_NOMC_MX";
}
return OpenCursor( stmt
@@ -2126,7 +2116,7 @@ Lng32 HSHistintsCursor::open()
NAString stmt;
if (fileType_ == SQLMP)
- stmt = "CURSOR201_MP"; // LCOV_EXCL_LINE :nsk
+ stmt = "CURSOR201_MP";
else
// histogram versioning
if (HSGlobalsClass::schemaVersion >= COM_VERS_2300)
@@ -2289,7 +2279,6 @@ Lng32 HSHistintsCursor::get( const ULng32 histid
(void *)buf_mfv_, NULL
//(void *)buf_v6_, NULL
);
- // LCOV_EXCL_START :cnu
else
retcode_ = SQL_EXEC_Fetch(desc_, NULL, 5,
(void *)&histid_, NULL,
@@ -2297,7 +2286,6 @@ Lng32 HSHistintsCursor::get( const ULng32 histid
(void *)&tempIntRowCount, NULL,
(void *)&tempIntUec, NULL,
(void *)buf_, NULL);
- // LCOV_EXCL_STOP
if (retcode_ && retcode_ != HS_EOF)
HSLogError(retcode_);
if (retcode_)
@@ -2399,13 +2387,11 @@ Lng32 OpenCursor( const char *descID
param2Addr, NULL);
if (retcode)
HSFuncMergeDiags(-UERR_INTERNAL_ERROR, "OpenCursor", NULL, TRUE);
- // LCOV_EXCL_START :rfi
if (retcode < 0 && LM->LogNeeded())
{
sprintf(LM->msg, "HSREAD: ***[FAIL=%d]Unable to load module %s", retcode, descID);
LM->Log(LM->msg);
}
- // LCOV_EXCL_STOP
return ((retcode < 0) ? -1 : retcode);
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/ustat/hs_update.cpp
----------------------------------------------------------------------
diff --git a/core/sql/ustat/hs_update.cpp b/core/sql/ustat/hs_update.cpp
index bc8492a..b4631ea 100644
--- a/core/sql/ustat/hs_update.cpp
+++ b/core/sql/ustat/hs_update.cpp
@@ -118,14 +118,12 @@ Lng32 ShowStats(const char* input, char* &outBuf,
if (hs_globals_obj.tableFormat == SQLMX)
{
HSGlobalsClass::schemaVersion = getTableSchemaVersion(*(hs_globals_obj.user_table));
- // LCOV_EXCL_START :rfi
if (HSGlobalsClass::schemaVersion == COM_VERS_UNKNOWN)
{
HSFuncMergeDiags(-UERR_INTERNAL_ERROR, "GET_SCHEMA_VERSION");
retcode = -1;
HSExitIfError(retcode);
}
- // LCOV_EXCL_STOP
}
if (LM->LogNeeded())
{
@@ -332,14 +330,12 @@ Lng32 UpdateStats(char *input, NABoolean requestedByCompiler)
/*==============================*/
// Also checked in AddTableName() during parse. Check again, just in case we don't
// reach that code. HISTOGRAM corruption can occur if this is not set.
- // LCOV_EXCL_START :rfi
if (hs_globals_obj.tableFormat == SQLMX && HSGlobalsClass::schemaVersion == COM_VERS_UNKNOWN)
{
HSFuncMergeDiags(-UERR_INTERNAL_ERROR, "GET_SCHEMA_VERSION");
retcode = -1;
HSExitIfError(retcode);
}
- // LCOV_EXCL_STOP
/*==============================*/
/* HANDLE OPTIONS WHICH DO NOT */
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/ustat/hs_util.cpp
----------------------------------------------------------------------
diff --git a/core/sql/ustat/hs_util.cpp b/core/sql/ustat/hs_util.cpp
index c19a1ac..bc2f0de 100644
--- a/core/sql/ustat/hs_util.cpp
+++ b/core/sql/ustat/hs_util.cpp
@@ -503,7 +503,6 @@ Lng32 FormatRow(const HSColumnStruct *srcDesc,
}
// Here begin a number of cases that are only possible with MP datetime types.
-// LCOV_EXCL_START :mp
case REC_DTCODE_YEAR:
{
wStr = WIDE_("DATETIME '");
@@ -671,15 +670,12 @@ Lng32 FormatRow(const HSColumnStruct *srcDesc,
}
break;
}
-// LCOV_EXCL_STOP
- // LCOV_EXCL_START :rfi
default:
{
HS_ASSERT(FALSE);
break;
}
- // LCOV_EXCL_STOP
}
target = wStr.data();
@@ -774,13 +770,11 @@ Lng32 FormatRow(const HSColumnStruct *srcDesc,
na_wsprintf(workBuf, WIDE_("%s SECOND(%d, %d)"), wStr.data(), srcDesc->precision, srcDesc->scale);
break;
}
- // LCOV_EXCL_START :rfi
default:
{
HS_ASSERT(FALSE);
break;
}
- // LCOV_EXCL_STOP
}
target = workBuf;
@@ -865,7 +859,6 @@ NAString getTableName(const NAString name, const ComAnsiNameSpace nameSpace)
}
-// LCOV_EXCL_START :mp Called only for MP datetime types.
static NAWString appendFraction (Lng32 scale)
{
NAWString wStr;
@@ -886,7 +879,6 @@ static NAWString appendFraction (Lng32 scale)
return wStr;
}
-// LCOV_EXCL_STOP
// Calculate default sample size for table.
Int64 getDefaultSampleSize(Int64 tblRowCount)
@@ -960,7 +952,6 @@ Int64 hs_getBaseTime()
short baseTsStr[] = {1970, 1, 1, 0, 0, 0, 0, 0};
short error;
baseTs = COMPUTETIMESTAMP(baseTsStr, &error);
- // LCOV_EXCL_START :rfi
if (error)
{
sprintf(LM->msg,
@@ -983,7 +974,6 @@ Int64 hs_getBaseTime()
throw CmpInternalException("failure in getEpochTime()",
__FILE__, __LINE__);
}
- // LCOV_EXCL_STOP
// baseTs == HS_EPOCH_TIMESTAMP;
return baseTs / 1000000;
@@ -1016,7 +1006,6 @@ Int64 hs_getEpochTime()
short baseTsStr[] = {1970, 1, 1, 0, 0, 0, 0, 0};
short error;
baseTs = COMPUTETIMESTAMP(baseTsStr, &error);
- // LCOV_EXCL_START :rfi
if (error)
{
sprintf(LM->msg,
@@ -1039,7 +1028,6 @@ Int64 hs_getEpochTime()
throw CmpInternalException("failure in getEpochTime()",
__FILE__, __LINE__);
}
- // LCOV_EXCL_STOP
// baseTs == HS_EPOCH_TIMESTAMP;
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/ustat/hs_util.h
----------------------------------------------------------------------
diff --git a/core/sql/ustat/hs_util.h b/core/sql/ustat/hs_util.h
index f315a68..ef921de 100644
--- a/core/sql/ustat/hs_util.h
+++ b/core/sql/ustat/hs_util.h
@@ -134,14 +134,12 @@ inline ULng32 roundup4(ULng32 value)
return((value != floor) ? (floor + 4) : value);
}
-// LCOV_EXCL_START :cnu
inline ULng32 roundup8(ULng32 value)
{
ULng32 floor = value & 0xFFFFFFF8;
return((value != floor) ? (floor + 8) : value);
}
-// LCOV_EXCL_STOP
// -----------------------------------------------------------------------
@@ -150,7 +148,6 @@ inline ULng32 roundup8(ULng32 value)
// HSPtrObj<T> *t = new HSPtrObj<T>[100];
// delete [] t will delete each individual element which pt_ points to.
// -----------------------------------------------------------------------
-// LCOV_EXCL_START :cnu Used only by HSCursor::buildNAType(), which is cnu
template <class T> class HSPtrObj {
public:
@@ -170,7 +167,6 @@ public:
// pt points to a single object.
T *pt_;
};
-// LCOV_EXCL_STOP
template <class T> class HSPtrArray {
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/ustat/vers_libustat.cpp
----------------------------------------------------------------------
diff --git a/core/sql/ustat/vers_libustat.cpp b/core/sql/ustat/vers_libustat.cpp
index 2b41098..c4499b4 100644
--- a/core/sql/ustat/vers_libustat.cpp
+++ b/core/sql/ustat/vers_libustat.cpp
@@ -26,6 +26,4 @@
#define VERS_CV_MIN 0
#define VERS_CV_UPD 1
-// LCOV_EXCL_START
VERS_LIB(libustat)
-// LCOV_EXCL_STOP
[05/14] incubator-trafodion git commit: lcov: commit #1
Posted by an...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/optimizer/ScanOptimizer.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/ScanOptimizer.cpp b/core/sql/optimizer/ScanOptimizer.cpp
index 6528913..23caa79 100644
--- a/core/sql/optimizer/ScanOptimizer.cpp
+++ b/core/sql/optimizer/ScanOptimizer.cpp
@@ -75,7 +75,6 @@
#define FSOWARNING(x)
#endif
-// LCOV_EXCL_START :dpm
#ifdef MDAM_TRACE
THREAD_P FILE *MdamTrace::outputFile_ = NULL;
@@ -315,7 +314,6 @@ void MdamTrace::setLevel(enum MdamTraceLevel l)
}
#endif // if MDAM_TRACE
-// LCOV_EXCL_STOP
enum restrictCheckStrategy { MAJORITY_WITH_PREDICATES=1, TOTAL_UECS=2, BOTH=3 };
@@ -688,7 +686,6 @@ private:
CostScalar rcAfterApplyFirstKeyPreds_;
};
-// LCOV_EXCL_START :dpm
#ifndef NDEBUG
static Int32
@@ -1211,7 +1208,6 @@ ScanOptimizerAllTests(const FileScan& associatedFileScan
}
#endif
-// LCOV_EXCL_STOP
// -----------------------------------------------------------------------
// getDp2CacheSizeInBlocks
@@ -1229,7 +1225,6 @@ getDP2CacheSizeInBlocks(const CostScalar& blockSizeInKb)
else if (blockSizeInKb == 32.)
cacheSizeInBlocks =
CostPrimitives::getBasicCostFactor(DP2_CACHE_32K_BLOCKS);
-// LCOV_EXCL_START :cnu
else if (blockSizeInKb == 16.)
cacheSizeInBlocks =
CostPrimitives::getBasicCostFactor(DP2_CACHE_16K_BLOCKS);
@@ -1251,7 +1246,6 @@ getDP2CacheSizeInBlocks(const CostScalar& blockSizeInKb)
else
cacheSizeInBlocks =
CostPrimitives::getBasicCostFactor(NCM_CACHE_SIZE_IN_BLOCKS);
-// LCOV_EXCL_STOP
return cacheSizeInBlocks;
@@ -1428,7 +1422,6 @@ ordersMatch(const InputPhysicalProperty* ipp,
if ((ipp != NULL) AND (!(ipp->getAssumeSortedForCosting())) AND
(!(ipp->getExplodedOcbJoinForCosting())))
{
- // LCOV_EXCL_START :rfi
// Shouldn't have an ipp if there are no outer order columns!
if ((ipp->getNjOuterOrder() == NULL) OR
ipp->getNjOuterOrder()->isEmpty())
@@ -1452,7 +1445,6 @@ ordersMatch(const InputPhysicalProperty* ipp,
CCMPASSERT(FALSE);
return FALSE;
}
- // LCOV_EXCL_STOP
// Get the physical partitioning function for the access path
const PartitioningFunction* physicalPartFunc =
@@ -1513,14 +1505,12 @@ ordersMatch(const InputPhysicalProperty* ipp,
// There MUST be some probe columns, otherwise there should not
// have been an ipp!
- // LCOV_EXCL_START :rfi
if (innerOrderProbeCols.isEmpty())
{
if (NOT noCmpAssert)
CCMPASSERT(FALSE);
return FALSE;
}
- // LCOV_EXCL_STOP
ValueIdList njOuterOrder = *(ipp->getNjOuterOrder());
// Sol 10-040303-3781. The number of entries of innerOrderProbCols(5)
@@ -1593,7 +1583,7 @@ ordersMatch(const InputPhysicalProperty* ipp,
if (NOT partiallyInOrder)
{
if (NOT noCmpAssert)
- CCMPASSERT(FALSE); // LCOV_EXCL_LINE :rfi
+ CCMPASSERT(FALSE);
return FALSE;
}
} // end if ipp exists
@@ -1646,11 +1636,9 @@ ordersMatch(const InputPhysicalProperty* ipp,
baseTableColIndex, innerOrderProbeColsNoInv[keyColIndex])
)
{
- // LCOV_EXCL_START :rfi
if (NOT noCmpAssert)
CCMPASSERT(FALSE);
return FALSE;
- // LCOV_EXCL_STOP
}
currentColUec = csdl[baseTableColIndex]->getColStats()->getTotalUec();
totalInOrderColsUec = totalInOrderColsUec * currentColUec;
@@ -1699,7 +1687,6 @@ ordersMatch(const InputPhysicalProperty* ipp,
// columnId in any of its operands.
//
// -----------------------------------------------------------------------
-// LCOV_EXCL_START :cnu
static NABoolean
predReferencesColumn(const ItemExpr *predIEPtr
,const ValueId& columnId)
@@ -1749,7 +1736,6 @@ predReferencesColumn(const ItemExpr *predIEPtr
return itDoes;
}
-// LCOV_EXCL_STOP
// -----------------------------------------------------------------------
@@ -1816,7 +1802,6 @@ computeTotalBlocksLowerBound(
innerBlocksUpperBound );
}
-// LCOV_EXCL_START :dpm
#ifndef NDEBUG
@@ -1848,7 +1833,6 @@ ScanOptimizer::printCostObject(const Cost * costPtr) const
}
printf("\n");
}
-// LCOV_EXCL_STOP
#endif
@@ -1916,14 +1900,12 @@ Histograms::containsAtLeastOneFake() const
} // containsAtLeastOneFake()
-// LCOV_EXCL_START :cnu
NABoolean
Histograms::getColStatDescForColumn(CollIndex index,
const ValueId& column) const
{
return getColStatDescList().getColStatDescIndexForColumn(index,column);
}
-// LCOV_EXCL_STOP
const ColStats&
@@ -1968,14 +1950,12 @@ Histograms::getColStatsPtrForColumn(const ValueId& column) const
}// getColStatsForColumn(...)
-// LCOV_EXCL_START :cnu
void
Histograms::displayHistogramForColumn(const ValueId& column) const
{
getColStatsForColumn(column).display();
}// getColStatsForColumn(...)
-// LCOV_EXCL_STOP
void
Histograms::applyPredicates(const ValueIdSet& predicates,
@@ -2160,7 +2140,6 @@ Histograms::applyPredicatesWhenMultipleProbes(
} // Histograms::applyPredicatesWhenMultipleProbes(...)
-// LCOV_EXCL_START :cnu
void
Histograms::applyPredicate(const ValueId& predicate,
const RelExpr & scan,
@@ -2173,7 +2152,6 @@ Histograms::applyPredicate(const ValueId& predicate,
vis.insert(predicate);
applyPredicates(vis, scan, selHint, cardHint, opType);
} // applyPredicate(...)
-// LCOV_EXCL_STOP
NABoolean
Histograms::isAnIndexJoin(const EstLogProp& inputEstLogProp
@@ -2241,7 +2219,6 @@ Histograms::isAnIndexJoin(const EstLogProp& inputEstLogProp
} // Histograms::isAnIndexJoin() const
-// LCOV_EXCL_START :dpm
void
Histograms::display() const
{
@@ -2258,7 +2235,6 @@ Histograms::print (FILE *ofd,
getColStatDescList().print(emptySelectList) ;
#endif
}// print()
-// LCOV_EXCL_STOP
//-------------------------------------------------------
// Methods for IndexDescHistograms
@@ -2347,7 +2323,7 @@ IndexDescHistograms::appendHistogramForColumnPosition(
else
{
// There must be a ColStatDesc for every key column!
- CMPABORT; // LCOV_EXCL_LINE :rfi
+ CMPABORT;
}
// propagate all base-table multi-col uec info : easiest way
@@ -2393,7 +2369,6 @@ IndexDescHistograms::estimateUecUsingMultiColUec(
CostScalar& estimatedUec/*out*/)
{
ValueIdList columnList= keyPredsByCol.getColumnList();
-// LCOV_EXCL_START :dpm
#ifndef NDEBUG
if(getenv("MDAM_MCUEC")){
fprintf(stdout,"\n\n---columnList before reduction \n\n----");
@@ -2401,7 +2376,6 @@ IndexDescHistograms::estimateUecUsingMultiColUec(
}
#endif
-// LCOV_EXCL_STOP
//remove everything beyond the column under consideration
for ( CollIndex i = keyPredsByCol.entries()-1; i>indexOfColumn; i--){
columnList.removeAt(i);
@@ -2412,7 +2386,6 @@ IndexDescHistograms::estimateUecUsingMultiColUec(
const MultiColumnUecList * MCUL =
getIndexDesc().getPrimaryTableDesc()->getTableColStats().getUecList();
-// LCOV_EXCL_START :dpm
#ifndef NDEBUG
if(getenv("MDAM_MCUEC")){
fprintf(stdout,"\n\n---columnList for Index[%d]: \n", indexOfColumn);
@@ -2421,14 +2394,12 @@ IndexDescHistograms::estimateUecUsingMultiColUec(
MCUL->print();
}
#endif
-// LCOV_EXCL_STOP
//get all the valueIdSets that contains the column and columns from the
//columnList only
LIST(ValueIdSet) * listOfSubsets=
MCUL->getListOfSubsetsContainsColumns(columnList,uecCount);
if(listOfSubsets->entries()==0) return FALSE;
-// LCOV_EXCL_START :dpm
#ifndef NDEBUG
if(getenv("MDAM_MCUEC")){
fprintf(stdout,"\n\n---Got my value ID list-----\n\n");
@@ -2438,7 +2409,6 @@ IndexDescHistograms::estimateUecUsingMultiColUec(
}
}
#endif
-// LCOV_EXCL_STOP
//Trying to find the matching denominator for the numerator
CostScalar uecWithoutColumn=0;
CollIndex entriesInSubset=0;
@@ -2497,7 +2467,6 @@ IndexDescHistograms::estimateUecUsingMultiColUec(
vidSet.remove(idInBaseCol);
//Do we have a matching denominator
perfectDenom = MCUL->findDenom(vidSet);
-// LCOV_EXCL_START :dpm
#ifndef NDEBUG
if(getenv("MDAM_MCUEC"))
{
@@ -2505,7 +2474,6 @@ IndexDescHistograms::estimateUecUsingMultiColUec(
vidSet.print();
}
#endif
-// LCOV_EXCL_STOP
//choose the MC uecs with the most entries so for col d , best would
// be abcd/abc even if you have abd/ab. But if there are two of same
// entries select the one with higher uec count for the denominator.
@@ -3485,7 +3453,6 @@ ScanOptimizer::isMdamEnabled() const
return mdamIsEnabled;
} // isMdamEnabled()
-// LCOV_EXCL_START :cnu
const CostScalar
ScanOptimizer::getIndexLevelsSeeks() const
{
@@ -3499,7 +3466,6 @@ ScanOptimizer::getIndexLevelsSeeks() const
else
return csZero;
}
-// LCOV_EXCL_STOP
// -----------------------------------------------------------------------
// INPUT:
@@ -3698,14 +3664,12 @@ ScanOptimizer::computeCostObject(
CostScalar frIOTime = tempFirst.getIOTime();
-// LCOV_EXCL_START :dpm
#ifndef NDEBUG
Lng32 planFragmentsPerCPU = (Lng32)partitionsPerCPU.getValue();
if ( planFragmentsPerCPU > 1 AND CURRSTMT_OPTGLOBALS->synCheckFlag )
(*CURRSTMT_OPTGLOBALS->asynchrMonitor).enter();
#endif //NDEBUG
-// LCOV_EXCL_STOP
tempLast.setIdleTime(0.);
tempFirst.setIdleTime(0.);
@@ -3723,12 +3687,10 @@ ScanOptimizer::computeCostObject(
costPtr->cplr().setIOTime(lrIOTime);
costPtr->totalCost().setIOTime(lrIOTime);
-// LCOV_EXCL_START :dpm
#ifndef NDEBUG
if ( planFragmentsPerCPU > 1 AND CURRSTMT_OPTGLOBALS->synCheckFlag)
(*CURRSTMT_OPTGLOBALS->asynchrMonitor).exit();
#endif //NDEBUG
-// LCOV_EXCL_STOP
DCMPASSERT(costPtr != NULL);
@@ -4416,14 +4378,12 @@ FileScanOptimizer::optimize(SearchKey*& searchKeyPtr /* out */
// compute blocks read per access
computeNumberOfBlocksToReadPerAccess(*winnerCostPtr
,mdamIsWinner, winnerCostPtrNumKBytes);
-// LCOV_EXCL_START :dpm
#ifndef NDEBUG
if (CURRSTMT_OPTDEFAULTS->optimizerHeuristic2()) {
if ( isIndexJoin )
(*CURRSTMT_OPTGLOBALS->indexJoinMonitor).exit();
}
#endif //NDEBUG
-// LCOV_EXCL_STOP
MDAM_DEBUG0(MTL2, "END Scan Costing ********************************\n\n");
return winnerCostPtr;
@@ -4599,7 +4559,6 @@ FileScanOptimizer::computeCostForSingleSubset(
return scmComputeCostForSingleSubset();
}
- // LCOV_EXCL_START :cnu -- OCM code
MDAM_DEBUG0(MTL2, "BEGIN Single Subset Costing --------");
// This was added as part of the project
@@ -5375,11 +5334,9 @@ FileScanOptimizer::computeCostForSingleSubset(
MDAM_DEBUG0(MTL2, "END Single Subset Costing --------\n");
return costPtr;
- // LCOV_EXCL_STOP
}// computeCostForSingleSubset(...)
-// LCOV_EXCL_START :dpm
#ifndef NDEBUG
void
FileScanOptimizer::runMdamTests
@@ -5479,7 +5436,6 @@ FileScanOptimizer::runMdamTests
MdamTrace::setLevel(origLevel);
}
#endif
-// LCOV_EXCL_STOP
NABoolean FileScanOptimizer::isMDAMFeasibleForHBase(const IndexDesc* idesc, ValueIdSet& preds)
{
@@ -5648,7 +5604,6 @@ FileScanOptimizer::computeCostForMultipleSubset
sharedMdamKeyPtr);
}
-// LCOV_EXCL_START :cnu OCM code
#ifndef NDEBUG
if(getenv("MDAM_TEST"))
{
@@ -5682,11 +5637,9 @@ FileScanOptimizer::computeCostForMultipleSubset
mdamTypeIsCommon,
sharedMdamKeyPtr);
}
-// LCOV_EXCL_STOP
}
-// LCOV_EXCL_START :cnu OCM code
// -----------------------------------------------------------------------
// Use this routine to compute the cost of a given MdamKey
// INPUT:
@@ -7241,7 +7194,6 @@ FileScanOptimizer::oldComputeCostForMultipleSubset
} // oldComputeCostForMultipleSubset(...)
#pragma warn(262) // warning elimination
-// LCOV_EXCL_STOP
// -----------------------------------------------------------------------
// This function will check if current context has the same basic physical
@@ -7320,7 +7272,6 @@ FileScanBasicCost::hasSameBasicProperties(const Context & currentContext) const
*(currentIPP->getNjOuterOrder()) == *(existingIPP->getNjOuterOrder()) );
}
-// LCOV_EXCL_START :cnu
// -----------------------------------------------------------------------
// Use this routine to compare the current cost with a given bound.
// INPUT:
@@ -7372,9 +7323,7 @@ FileScanOptimizer::exceedsBound(const Cost *costBoundPtr,
return FALSE;
} // FileScanOptimizer::exceedsBound(...)
-// LCOV_EXCL_STOP
-// LCOV_EXCL_START : OCM code
/////////////////////////////////////////////////////////////////////
// fix the estimation
// for seeks beginBlocksLowerBound = no. of unique entries WHICH ARE
@@ -7461,7 +7410,6 @@ FileScanOptimizer::computeSeekForDp2ReadAheadAndProbeOrder(
}
}
}
-// LCOV_EXCL_STOP
void
FileScanOptimizer::computeIOForFullCacheBenefit(
@@ -7564,7 +7512,6 @@ FileScanOptimizer::computeIOForRandomCase(
}
-// LCOV_EXCL_START :cnu
void
FileScanOptimizer::computeIOForFullTableScan(
CostScalar& dataRows /* out */
@@ -7593,7 +7540,6 @@ FileScanOptimizer::computeIOForFullTableScan(
indexBlocksLowerBound; // index seeks
} // FileScanOptimizer::computeIOForFullTableScan(...)
-// LCOV_EXCL_STOP
void
FileScanOptimizer::computeCostVectorsForMultipleSubset(
@@ -8653,7 +8599,6 @@ void MDAMCostWA::compute()
return;
}
}
- // LCOV_EXCL_START :cnu -- OCM code
else
{
disjunctsFR_.reset();
@@ -8692,7 +8637,6 @@ void MDAMCostWA::compute()
return;
}
}
- // LCOV_EXCL_STOP
} // for every disjunct
// update rows accessed
@@ -8940,7 +8884,6 @@ MDAMOptimalDisjunctPrefixWA::~MDAMOptimalDisjunctPrefixWA()
delete pMinCost_;
}
-// LCOV_EXCL_START :cnu
// This method find if there are any intervenning missing key column present
NABoolean MDAMOptimalDisjunctPrefixWA::missingKeyColumnExists() const
{
@@ -8961,7 +8904,6 @@ NABoolean MDAMOptimalDisjunctPrefixWA::missingKeyColumnExists() const
}
return FALSE;
}
-// LCOV_EXCL_STOP
// This function computes the optimal prefix of the disjunct
void MDAMOptimalDisjunctPrefixWA::compute()
@@ -9884,7 +9826,6 @@ const CostScalar & MDAMOptimalDisjunctPrefixWA::getOptSeqKBRead() const
const ValueIdSet & MDAMOptimalDisjunctPrefixWA::getOptKeyPreds() const
{ return optKeyPreds_; }
-// LCOV_EXCL_START :cnu
// return true if has resuable shared basic cost for this mdam
NABoolean
FileScanOptimizer::getSharedCost(FileScanBasicCost * &fileScanBasicCostPtr /*out, never NULL*/
@@ -9921,10 +9862,8 @@ FileScanOptimizer::getSharedCost(FileScanBasicCost * &fileScanBasicCostPtr /*out
// disjunctsLRPtr->getCPUTime() > csZero AND
CURRSTMT_OPTDEFAULTS->reuseBasicCost() );
}
-// LCOV_EXCL_STOP
-// LCOV_EXCL_START :cnu
Cost* FileScanOptimizer::newComputeCostForMultipleSubset
( MdamKey* mdamKeyPtr,
@@ -10043,7 +9982,6 @@ Cost* FileScanOptimizer::newComputeCostForMultipleSubset
MDAM_DEBUG0(MTL2, "END MDAM Costing --------\n");
return costPtr;
} // newComputeCostForMultipleSubset(...)
-// LCOV_EXCL_STOP
Cost*
FileScanOptimizer::scmComputeCostForMultipleSubset(MdamKey* mdamKeyPtr,
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/optimizer/SearchKey.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/SearchKey.cpp b/core/sql/optimizer/SearchKey.cpp
index 5f0d915..31477b7 100644
--- a/core/sql/optimizer/SearchKey.cpp
+++ b/core/sql/optimizer/SearchKey.cpp
@@ -673,7 +673,6 @@ SearchKey::SearchKey(const ValueIdList & keyColumns,
}
} // SearchKey::SearchKey()
-// LCOV_EXCL_START :cnu RR part func table not supported
// -----------------------------------------------------------------------
// Constructor to set up partition search keys for a RR partitioned table
// -----------------------------------------------------------------------
@@ -764,7 +763,6 @@ SearchKey::SearchKey(const ValueIdList & keyColumns,
setOfPredicates);
}
} // SearchKey::SearchKey()
-// LCOV_EXCL_STOP
ItemExpr *SearchKey::getBeginKeyExclusionExpr() const
{
@@ -801,7 +799,6 @@ ValueId SearchKey::computeMissingKeyValue(ValueId keyColumn,
return minMaxConstant->getValueId();
} // SearchKey::computeMissingKeyValue()
-// LCOV_EXCL_START :dpm
// -----------------------------------------------------------------------
// Methods for debugging
// -----------------------------------------------------------------------
@@ -822,7 +819,6 @@ void SearchKey::display() const
{
SearchKey::print();
} // SearchKey::display()
-// LCOV_EXCL_STOP
// ***********************************************************************
// $$$ SearchKeyBounds
@@ -897,7 +893,7 @@ void SearchKeyBounds::analyzeSearchPredicates(const ValueIdSet & setOfPredicates
// All value id's in SearchKeyBounds *must* be either
// an index column or a base table column,
// if we reach here it is an internal error:
- CMPASSERT(FALSE); // LCOV_EXCL_LINE :rfi
+ CMPASSERT(FALSE);
} // switch on type of input column
@@ -1402,7 +1398,6 @@ ValueId SearchKeyBounds::computeMissingKeyValue(NABoolean wantMinValue)
} // SearchKeyBounds::computeMissingKeyValue()
-// LCOV_EXCL_START :dpm
// -----------------------------------------------------------------------
// Method for allocating the work space.
// -----------------------------------------------------------------------
@@ -1461,7 +1456,6 @@ void SearchKeyBounds::display() const
{
SearchKeyBounds::print();
} // SearchKeyBounds::display()
-// LCOV_EXCL_STOP
// ***********************************************************************
// $$$ SearchKeyWorkSpace
@@ -1931,7 +1925,6 @@ void SearchKey::getKeyPredicates(ValueIdSet &keyPredicates, /* out */
} // getKeyPredicates(...)
-// LCOV_EXCL_START :cnu
// Generate the data structures needed by the generator and
// rewrite VEG preds and predicates:
void SearchKey::preCodeGen(ValueIdSet& executorPredicates,
@@ -1994,7 +1987,6 @@ void SearchKey::replaceBegEndPivs(ValueIdSet & oldPivs,
}
}
}
-// LCOV_EXCL_STOP
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/optimizer/Stats.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/Stats.cpp b/core/sql/optimizer/Stats.cpp
index fc85025..f607a3a 100644
--- a/core/sql/optimizer/Stats.cpp
+++ b/core/sql/optimizer/Stats.cpp
@@ -136,17 +136,14 @@ void HistInt::setCardinality (CostScalar card)
{
if (card < csZero)
{
-// LCOV_EXCL_START - rfi
// min cardinality of an interval is zero
CCMPASSERT (card >= csZero) ;
card = csZero;
-// LCOV_EXCL_STOP
}
card.roundIfZero();
rows_ = card ;
}
-// LCOV_EXCL_START - cnu
void HistInt::setCardinality2mfv (CostScalar card)
{
if (card < csZero)
@@ -158,17 +155,14 @@ void HistInt::setCardinality2mfv (CostScalar card)
card.roundIfZero();
rows2mfv_ = card ;
}
-// LCOV_EXCL_STOP
void HistInt::setUec (CostScalar uec)
{
if (uec < csZero)
{
-// LCOV_EXCL_START - rfi
// min UEC of an interval is zero
CCMPASSERT (uec >= csZero) ;
uec = csZero;
-// LCOV_EXCL_STOP
}
uec.roundIfZero();
uec_ = uec ;
@@ -289,7 +283,6 @@ HistInt::mergeInterval(const HistInt & left,
return maxUEC;
} // mergeInterval
-// LCOV_EXCL_START - dpm
void
HistInt::display (FILE *f, const char * prefix, const char * suffix,
CollHeap *c, char *buf) const
@@ -314,7 +307,6 @@ HistInt::display (FILE *f, const char * prefix, const char * suffix,
rows_.value(), uec_.value(), suffix);
PRINTIT(f, c, space, buf, mybuf);
}
-// LCOV_EXCL_STOP
// -----------------------------------------------------------------------
// methods on Interval "wrapper class"
@@ -382,10 +374,8 @@ Interval::merge (Interval & other)
// for simplicity, we only merge low-to-high
if (loIndex_+1 != other.loIndex_ )
{
-// LCOV_EXCL_START - rfi
CCMPASSERT ( loIndex_+1 == other.loIndex_ ) ;
return FALSE;
-// LCOV_EXCL_STOP
}
CostScalar newUec = getUec() + other.getUec() ;
@@ -462,26 +452,20 @@ Interval::OK () const
{
if (!isValid() )
{
-// LCOV_EXCL_START - rfi
CCMPASSERT( isValid() ) ;
return FALSE;
-// LCOV_EXCL_STOP
}
if (hist_->entries() == 1 )
{
-// LCOV_EXCL_START - rfi
CCMPASSERT( hist_->entries() != 1 ) ;
return FALSE;
-// LCOV_EXCL_STOP
}
if ((*hist_)[loIndex_+1].getUec().isLessThanZero() )
{
-// LCOV_EXCL_START - rfi
CCMPASSERT( (*hist_)[loIndex_+1].getUec().isGreaterOrEqualThanZero() ) ; // getUec() >= 0
(*hist_)[loIndex_+1].setCardAndUec(0,0);
-// LCOV_EXCL_STOP
}
if ((*hist_)[loIndex_+1].getCardinality().isLessThanZero() )
@@ -607,11 +591,9 @@ ColStats::setNullRowsAndUec (CostScalar nulls, CostScalar nullUec)
{
if (!isNullInstantiated() )
{
-// LCOV_EXCL_START - rfi
// if the histogram does not contain a NULL Interval, nothing to do
CCMPASSERT ( isNullInstantiated() ) ;
return;
-// LCOV_EXCL_STOP
}
Interval null = histogram_->getLastInterval() ;
null.setRowsAndUec (nulls, nullUec) ;
@@ -658,11 +640,9 @@ void ColStats::setRowcount (CostScalar row)
{
if (row < csZero)
{
-// LCOV_EXCL_START - rfi
// min rowcount is zero
CCMPASSERT (row >= csZero) ;
row = csZero;
-// LCOV_EXCL_STOP
}
else
row.roundIfZero();
@@ -677,11 +657,9 @@ void ColStats::setTotalUec (CostScalar uec, NABoolean allowMinusOne)
uec = csMinusOne;
else
{
-// LCOV_EXCL_START - rfi
// min UEC is zero
CCMPASSERT (uec >= csZero) ;
uec = csZero;
-// LCOV_EXCL_STOP
}
}
else
@@ -693,11 +671,9 @@ void ColStats::setBaseUec (CostScalar uec)
{
if (uec < csZero)
{
-// LCOV_EXCL_START - rfi
// min UEC is zero
CCMPASSERT (uec >= csZero) ;
uec = csZero;
-// LCOV_EXCL_STOP
}
else
uec.roundIfZero();
@@ -708,11 +684,9 @@ void ColStats::setBaseRowCount (CostScalar row)
{
if (row < -1)
{
-// LCOV_EXCL_START - rfi
// reset baserowcount to -1
CCMPASSERT (row >= -1) ;
return;
-// LCOV_EXCL_STOP
}
row.roundIfZero() ;
@@ -725,11 +699,9 @@ void ColStats::setSumOfMaxUec (CostScalar value)
{
if (value < 0)
{
-// LCOV_EXCL_START - rfi
// min sum of max UEC is zero
CCMPASSERT (value >= 0) ;
value = 0;
-// LCOV_EXCL_STOP
}
sumOfMaxUec_ = value;
}
@@ -743,11 +715,9 @@ void ColStats::setRedFactor (CostScalar rowred)
{
if (rowred < 0)
{
-// LCOV_EXCL_START - rfi
// min row reduction is 0, resulting in 0 rows
CCMPASSERT (rowred >= 0) ;
rowred = 0;
-// LCOV_EXCL_STOP
}
else
rowred.roundIfExactlyZero() ;
@@ -758,11 +728,9 @@ void ColStats::setUecRedFactor (CostScalar uecred)
{
if (uecred < 0)
{
-// LCOV_EXCL_START - rfi
// min uec reduction is zero, resulting in 0 uec
CCMPASSERT (uecred >= 0) ;
uecred = 0;
-// LCOV_EXCL_STOP
}
else
uecred.roundIfExactlyZero() ;
@@ -961,7 +929,6 @@ Histogram::insertZeroInterval (const EncodedValue & loBound,
{
// if the histogram is not valid, clear the histogram
// and insert an interval with given boundaries
-// LCOV_EXCL_START - rfi
CCMPASSERT ( last.isValid() ) ;
this->clear();
HistInt newLo (loBound, FALSE) ;
@@ -969,7 +936,6 @@ Histogram::insertZeroInterval (const EncodedValue & loBound,
insert (newLo) ;
insert (newHi) ;
return ;
-// LCOV_EXCL_STOP
}
// otherwise, this function shouldn't have been called!
@@ -983,7 +949,6 @@ Histogram::insertZeroInterval (const EncodedValue & loBound,
}
// CASE 3: hiBound == the first Interval's boundary value
-// LCOV_EXCL_START - rfi
Interval first = getFirstInterval() ;
if (first.isNull())
@@ -1002,7 +967,6 @@ Histogram::insertZeroInterval (const EncodedValue & loBound,
// the HistInt flag
insertAt (0, newLo) ;
return ;
-// LCOV_EXCL_STOP
}
CCMPASSERT(FALSE) ; // misuse of this function!
@@ -1041,11 +1005,9 @@ Histogram::condenseToSingleInterval()
{
if (numIntervals() == 0)
{
-// LCOV_EXCL_START - rfi
CCMPASSERT (numIntervals() > 0) ; // makes no sense for an empty histogram
insertZeroInterval (UNINIT_ENCODEDVALUE, UNINIT_ENCODEDVALUE, TRUE) ;
return;
-// LCOV_EXCL_STOP
}
if ( numIntervals() == 1 ) return ; // already a single interval
@@ -1105,10 +1067,8 @@ Histogram::isNullInstantiated() const
// HistInts besides the NULL interval
if (entries() == 3)
{
-// LCOV_EXCL_START - rfi
CCMPASSERT ("Illegal number of intervals in the histogram");
return FALSE;
-// LCOV_EXCL_STOP
}
return TRUE ;
@@ -2426,7 +2386,6 @@ NABoolean Interval::satisfiesCriterion2(Source invokedFrom, Interval & other)
return TRUE;
}
-// LCOV_EXCL_START - dpm
void
Interval::display (FILE *f, const char * prefix, const char * suffix) const
{
@@ -2446,7 +2405,6 @@ Interval::display (FILE *f, const char * prefix, const char * suffix) const
fprintf (f, "< ");
hiBound().display(f);
}
-// LCOV_EXCL_STOP
// -----------------------------------------------------------------------
// methods on Histogram class
@@ -2522,7 +2480,6 @@ Histogram::createMergeTemplate (const HistogramSharedPtr& otherHistogram,
// -----------------------------------------------------------------------------
if ( this->entries() < 2 || otherHistogram->entries() < 2 )
{
-// LCOV_EXCL_START - rfi
if ( equiMerge )
return histTemplate ; // no qualifying intervals
else
@@ -2546,7 +2503,6 @@ Histogram::createMergeTemplate (const HistogramSharedPtr& otherHistogram,
return histTemplate ;
}
-// LCOV_EXCL_STOP
}
// OK, at this point we know both histograms have Intervals
@@ -2756,14 +2712,12 @@ Histogram::createMergeTemplate (const HistogramSharedPtr& otherHistogram,
if ( (histTemplate->entries() == 1) ||
!validHistTemp)
{
-// LCOV_EXCL_START - rfi
// sanity check
CCMPASSERT(histTemplate->entries() != 1);
// clear whatever has been done till now
histTemplate->clear();
// insert an interval with boundaries equal to overlapMin and overlapMax
histTemplate->insertZeroInterval(minVal, maxVal, TRUE);
-// LCOV_EXCL_STOP
}
return histTemplate;
@@ -2983,7 +2937,6 @@ ColStats::populateTemplate (const ColStatsSharedPtr& otherStats)
}
else if ( newRowcount.isZero() AND requiredMinimum.isGreaterThanZero() )
{
-// LCOV_EXCL_START - rfi
// create a 1-interval histogram, no fuss
CostScalar calculatedUec =
ColStatDesc::calculateCorrectResultUec (otherStats->getRowcount(),
@@ -2999,7 +2952,6 @@ ColStats::populateTemplate (const ColStatsSharedPtr& otherStats)
// populate that first interval with rc/uec
Interval first = histogram_->getFirstInterval() ;
first.setRowsAndUec (requiredMinimum, calculatedUec) ;
-// LCOV_EXCL_STOP
}
}
@@ -3124,7 +3076,7 @@ void
ColStats::insertZeroInterval()
{
if (histogram_ == NULL)
- histogram_ = HistogramSharedPtr(new (HISTHEAP) Histogram(HISTHEAP)); // LCOV_EXCL_LINE - rfi
+ histogram_ = HistogramSharedPtr(new (HISTHEAP) Histogram(HISTHEAP));
histogram_->insertZeroInterval(getMinValue(), getMaxValue(), TRUE);
Interval first = histogram_->getFirstInterval();
@@ -3243,7 +3195,6 @@ ColStats::removeRedundantEmpties()
// -----------------------------------------------------------------------
// to be called from the debugger
-// LCOV_EXCL_START - dpm
void
Histogram::display() const
{
@@ -3264,7 +3215,6 @@ Histogram::print (FILE *f, const char * prefix, const char * suffix,
(*this)[i].display(f, " ", "", c, buf);
}
}
-// LCOV_EXCL_STOP
THREAD_P Int64 ColStats::fakeHistogramIDCounter_=ColStats::USTAT_HISTOGRAM_ID_THRESHOLD;
@@ -3495,7 +3445,6 @@ ColStats::createFakeHist()
// This method calls Histogram::condenseToSingleInterval, and also sets
// the isCompressed flag to TRUE
// --------------------------------------------------------------------
-// LCOV_EXCL_START - rfi
void
ColStats::compressToSingleInt()
{
@@ -3523,7 +3472,6 @@ ColStats::compressToSingleInt()
this->setIsCompressed(TRUE);
}
-// LCOV_EXCL_STOP
// -----------------------------------------------------------------------
// After we've mangled the heck out of the histogram, we've often lost
@@ -3661,7 +3609,6 @@ ColStats::modifyStats (ItemExpr * pred, CostScalar *maxSelectivity)
if ( histogram_ == NULL || histogram_->numIntervals() == 0 )
{
-// LCOV_EXCL_START - rfi
CCMPASSERT (histogram_ != NULL) ;
// $$$ synthesize the effect on just the MIN and MAX values??
// $$$ Weird special case: Can we have a non-NULL min/max if the
@@ -3669,7 +3616,6 @@ ColStats::modifyStats (ItemExpr * pred, CostScalar *maxSelectivity)
// If there is no histogram_, create an empty histogram and return.
insertZeroInterval();
return;
-// LCOV_EXCL_STOP
}
// Begin Set-Up to perform the given Predicate........
@@ -4228,18 +4174,14 @@ void ColStats::recoverFromMergeColStats(const ColStatsSharedPtr& otherStats,
{
if (histogram_ == NULL)
{
-// LCOV_EXCL_START - rfi
CCMPASSERT (histogram_ != NULL) ;
insertZeroInterval();
-// LCOV_EXCL_STOP
}
if (otherStats->histogram_ == NULL)
{
-// LCOV_EXCL_START - rfi
CCMPASSERT (otherStats->getHistogram() != NULL );
otherStats->insertZeroInterval();
-// LCOV_EXCL_STOP
}
// Can't always construct a precise result histogram, but when one
// can't one sometimes *can* produce a meaningful single-interval
@@ -4569,7 +4511,7 @@ Criterion ColStats::decideReductionCriterion(Source invokedFrom,
{
//cannot reduce multicolumn stats
if(getStatColumns().entries() > 1)
- return NONE; // LCOV_EXCL_LINE - rfi
+ return NONE;
//if invoked histograms for base tables
//have been obtained using FetchHistograms
@@ -4663,7 +4605,7 @@ void ColStats::reduceNumHistInts(Source invokedFrom, Criterion reductionCriterio
{
//if there is no histogram return
if(!histogram_)
- return; // LCOV_EXCL_LINE - rfi
+ return;
//dont do anything for fake histograms
if(isFakeHistogram())
@@ -4820,7 +4762,7 @@ void
ColStats::copyAndScaleHistogram (CostScalar scale)
{
if ( getHistogram() == NULL )
- return ; // LCOV_EXCL_LINE - rfi
+ return ;
histogram_ = HistogramSharedPtr(new (heap_) Histogram(*histogram_, heap_));
@@ -4839,7 +4781,7 @@ ColStats::scaleHistogram (CostScalar scale,
NABoolean scaleFreqValList)
{
if ( getHistogram() == NULL )
- return; // LCOV_EXCL_LINE - rfi
+ return;
// set the scale factor of the histogram with what ever the histogram
// is being scaled by. The method is called for making deep copies. We
@@ -4905,10 +4847,8 @@ ColStats::scaleHistogram (CostScalar scale,
{
if (uecScale > csOne)
{
-// LCOV_EXCL_START - rfi
CCMPASSERT ("UEC can never increase");
uecScale = csOne;
-// LCOV_EXCL_STOP
}
for ( iter = hist->getFirstInterval() ;
@@ -5078,7 +5018,6 @@ ColStats::scaleHistogram (CostScalar scale,
// This method returns the total row count and total UEC of intervals
// whose frequency is greater than or equal to the threshold value
// --------------------------------------------------------------------
-// LCOV_EXCL_START - cnu
void
ColStats::getAccRowCountAboveOrEqThreshold ( CostScalar & accRowCnt, /* out */
CostScalar & accUec, /* out */
@@ -5128,7 +5067,6 @@ ColStats::getAccRowCountAboveOrEqThreshold ( CostScalar & accRowCnt, /* out */
return;
} // ColStats::getAccRowCountAboveOrEqThreshold
-// LCOV_EXCL_STOP
void
ColStats::setMaxFreq(CostScalar val)
@@ -5245,7 +5183,6 @@ ColStats::reduceToMaxIntervalCount()
if ( intervalCount < 4 || maxIntervalCount < 4 || maxIntervalCount >= intervalCount )
return ;
-// LCOV_EXCL_START - cnu
// otherwise, we're definitely going to be modifying this histogram
getHistogramToModify() ;
HistogramSharedPtr hist = histogram_ ; // convenience
@@ -5301,7 +5238,6 @@ ColStats::reduceToMaxIntervalCount()
numMerged = 0 ;
}
}
-// LCOV_EXCL_STOP
} // ColStats::reduceToMaxIntervalCount()
//
@@ -5994,7 +5930,6 @@ ColStats::makeGrouped()
// -----------------------------------------------------------------------
// To be called from the debugger
-// LCOV_EXCL_START - dpm
void
ColStats::display() const
{
@@ -6134,7 +6069,6 @@ void ColStats::trace(FILE* f, NATable* table)
fprintf (f, "rowcount:" PF64 " ", templl);
fprintf (f, "intervals:%d \n", (*histogram_).entries());
}
-// LCOV_EXCL_STOP
// -----------------------------------------------------------------------
// When one, or both, of the two to-be-combined column statistics has no
@@ -7347,14 +7281,12 @@ ColStats::setToSingleValue (const EncodedValue & newValue, ConstValue* constExpr
setMaxSetByPred (TRUE) ;
if (histogram_->entries() < 2)
{
-// LCOV_EXCL_START - rfi
// we messed up somewhere. recover by clearing the histogram and
// inserting an interval with boundary equal to the new value
// since we messed up somewhere, lets set the fake histogram flag to true
CCMPASSERT (histogram_->entries() == 2) ;
insertZeroInterval();
setFakeHistogram(TRUE);
-// LCOV_EXCL_STOP
}
// check to make sure the results are what we wanted
@@ -7717,7 +7649,6 @@ void StatsList::deepDelete()
// groupUecValues_ and groupUecColumns_ do not need to be deep copied
// because FetchHistograms does not return/load these two members
//------------------------------------------------------------------------
-// LCOV_EXCL_START - cnu
void StatsList::deepCopy(const StatsList& other, NAMemory * heap)
{
unsigned short members = (short)other.entries();
@@ -7729,7 +7660,6 @@ void StatsList::deepCopy(const StatsList& other, NAMemory * heap)
DCMPASSERT(NOT this->groupUecColumns_.entries())
DCMPASSERT(NOT this->groupMCSkewedValueLists_.entries())
}
-// LCOV_EXCL_STOP
//-------------------------------------------------------------------------
// StatsList::insertByPosition()
@@ -7907,7 +7837,6 @@ StatsList& StatsList::operator=(const StatsList& list)
return *this;
}
-// LCOV_EXCL_START - dpm
void
StatsList::display() const
{
@@ -7977,7 +7906,6 @@ void StatsList::trace (FILE *f, NATable* table) const
(*this)[i]->trace(f, table);
}
}
-// LCOV_EXCL_STOP
// return true iff all fake histograms
NABoolean StatsList::allFakeStats() const
@@ -8025,7 +7953,6 @@ ColumnSet::ColumnSet(const NAColumnArray& colArray, NAMemory *heap)
}
}
-// LCOV_EXCL_START - dpm
void
ColumnSet::display() const
{
@@ -8046,7 +7973,6 @@ void ColumnSet::print() const
}
printf("}");
}
-// LCOV_EXCL_STOP
// define "<" ordering of NAColumn names
bool operator< (const NAColumn& col1, const NAColumn& col2)
@@ -8095,7 +8021,6 @@ void ColumnSet::printColsFromTable(FILE *ofd, NATable *table) const
fprintf(ofd," ");
}
-// LCOV_EXCL_START - dpm
void MultiColumnHistogram::display() const
{
MultiColumnHistogram::print();
@@ -8111,7 +8036,6 @@ void MultiColumnHistogram::print(FILE *ofd, NATable* table) const
fprintf(ofd, "rowcount:" PF64 " ", templl);
fprintf(ofd, "intervals:2 \n");
}
-// LCOV_EXCL_STOP
MultiColumnHistogramList::~MultiColumnHistogramList()
{
@@ -8217,7 +8141,7 @@ void ColStats::compressColStatsForQueryPreds(ItemExpr * lowerBound,
{
//if there is no histogram return
if(!histogram_)
- return; // LCOV_EXCL_LINE - rfi
+ return;
//dont do anything for fake histograms
if(isFakeHistogram())
@@ -8225,7 +8149,7 @@ void ColStats::compressColStatsForQueryPreds(ItemExpr * lowerBound,
//multicolumn stats, dont reduce
if(columns_.entries() > 1)
- return; // LCOV_EXCL_LINE - rfi
+ return;
//if there are only two histints or less
//we dont need to reduce
@@ -8921,7 +8845,6 @@ void ColStats::addMCSkewedValue(const NAWchar * boundary, CostScalar frequency)
}
// to be called from the debugger
-// LCOV_EXCL_START - dpm
void
FrequentValueList::display() const
{
@@ -8960,7 +8883,6 @@ void FrequentValue::print (FILE *f,
snprintf(mybuf, sizeof(mybuf), "%s Probab. = %f \n", prefix, getProbability().value());
PRINTIT(f, c, space, buf, mybuf);
}
-// LCOV_EXCL_STOP
FrequentValue::FrequentValue(UInt32 hashValue,
CostScalar frequency,
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/optimizer/Stats.h
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/Stats.h b/core/sql/optimizer/Stats.h
index 4d3d5bd..aa424b3 100644
--- a/core/sql/optimizer/Stats.h
+++ b/core/sql/optimizer/Stats.h
@@ -759,10 +759,8 @@ public:
// log the message to the event log
// SQLMXLoggingArea::logSQLMXAssertionFailureEvent(__FILE__, __LINE__, "Histogram has just one HistInt");
-// LCOV_EXCL_START :rfi
Histogram* tempHist = (Histogram *)this;
tempHist->clear();
-// LCOV_EXCL_STOP
}
if ( entries() == 0 )
@@ -2353,9 +2351,7 @@ public:
LIST(EncodedValue)(h,initLen),
finalHashComputed_(TRUE) {};
-// LCOV_EXCL_START :dd
~SkewedValueList() {};
-// LCOV_EXCL_STOP
// insert a skewed value in decending order.
void insertInOrder(const EncodedValue&);
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/optimizer/SynthType.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/SynthType.cpp b/core/sql/optimizer/SynthType.cpp
index 44d6d99..73096cc 100644
--- a/core/sql/optimizer/SynthType.cpp
+++ b/core/sql/optimizer/SynthType.cpp
@@ -267,7 +267,6 @@ static void propagateCoAndCoToChildren(ItemExpr *parentOp,
}
}
-// LCOV_EXCL_START - cnu
static Int32 getNumCHARACTERArgs(ItemExpr *parentOp)
{
Int32 n = 0;
@@ -279,7 +278,6 @@ static Int32 getNumCHARACTERArgs(ItemExpr *parentOp)
}
return n;
}
-// LCOV_EXCL_STOP
// -----------------------------------------------------------------------
// The virtual NAType::isComparable() methods -- implemented here rather than
@@ -399,7 +397,6 @@ NABoolean CharType::isComparable(const NAType &otherNA,
#ifndef NDEBUG
if (NCHAR_DEBUG < 0) NCHAR_DEBUG = getenv("NCHAR_DEBUG") ? +1 : 0;
if (NCHAR_DEBUG > 0) {
-// LCOV_EXCL_START - dpm
NAString p(CmpCommon::statementHeap());
parentOp->unparse(p);
NAString s(getTypeSQLname(TRUE /*terse*/));
@@ -420,7 +417,6 @@ NABoolean CharType::isComparable(const NAType &otherNA,
<< endl;
if (!cmpOK)
cerr << endl;
-// LCOV_EXCL_STOP
}
#endif
@@ -549,7 +545,7 @@ static NABoolean synthItemExprLists(ItemExprList &exprList1,
if ( DoCompatibilityTest && NOT operand1->isCompatible(*operand2) ) {
// 4041 comparison between these two types is not allowed
- emitDyadicTypeSQLnameMsg(-4041, *operand1, *operand2); // LCOV_EXCL_LINE - cnu
+ emitDyadicTypeSQLnameMsg(-4041, *operand1, *operand2);
return FALSE;
}
}
@@ -962,7 +958,6 @@ Cast::pushDownType(NAType& desiredType,
return (NAType *)synthesizeType();
}
-// LCOV_EXCL_START - cnu
void ItemExpr::coerceChildType(NAType& desiredType,
enum NABuiltInTypeEnum defaultQualifier)
{
@@ -970,7 +965,6 @@ void ItemExpr::coerceChildType(NAType& desiredType,
child(i) -> getValueId().coerceType(desiredType, defaultQualifier);
}
}
-// LCOV_EXCL_STOP
#pragma warning (default : 4018) //warning elimination
#pragma warn(1506) // warning elimination
@@ -1280,21 +1274,17 @@ const NAType *BuiltinFunction::synthesizeType()
const CharType &typ1 = (CharType&)child(0)->getValueId().getType();
if (typ1.getTypeQualifier() != NA_CHARACTER_TYPE)
{
-// LCOV_EXCL_START - cnu
// 4043 The operand of a $0~String0 function must be character.
*CmpCommon::diags() << DgSqlCode(-4043) << DgString0(getTextUpper());
return NULL;
-// LCOV_EXCL_STOP
}
const CharType &typ2 = (CharType&)child(1)->getValueId().getType();
if (typ2.getTypeQualifier() != NA_CHARACTER_TYPE)
{
-// LCOV_EXCL_START - cnu
// 4043 The operand of a $0~String0 function must be character.
*CmpCommon::diags() << DgSqlCode(-4043) << DgString0(getTextUpper());
return NULL;
-// LCOV_EXCL_STOP
}
retType = new HEAP
@@ -1555,7 +1545,6 @@ const NAType *CodeVal::synthesizeType()
switch (getOperatorType())
{
-// LCOV_EXCL_START - rfi
case ITM_NCHAR_MP_CODE_VALUE:
if ( CharInfo::is_NCHAR_MP(typ1.getCharSet()) != TRUE )
{
@@ -1578,7 +1567,6 @@ const NAType *CodeVal::synthesizeType()
return NULL;
}
break;
-// LCOV_EXCL_STOP
case ITM_ASCII:
{
@@ -1609,12 +1597,10 @@ const NAType *CodeVal::synthesizeType()
{
switch ( typ1.getCharSet() )
{
-// LCOV_EXCL_START - mp
case CharInfo::KANJI_MP:
case CharInfo::KSC5601_MP:
setOperatorType(ITM_NCHAR_MP_CODE_VALUE);
break;
-// LCOV_EXCL_STOP
case CharInfo::UNICODE:
setOperatorType(ITM_UNICODE_CODE_VALUE);
@@ -1704,10 +1690,8 @@ const NAType *Aggregate::synthesizeType()
if (!operand.isSupportedType())
{
-// LCOV_EXCL_START - mp
emitDyadicTypeSQLnameMsg(-4041, operand, operand);
return NULL;
-// LCOV_EXCL_STOP
}
if (inScalarGroupBy())
@@ -3228,12 +3212,10 @@ const NAType *DynamicParam::synthesizeType()
}
-// LCOV_EXCL_START - cnu
const NAType *ExplodeVarchar::synthesizeType()
{
return getType();
}
-// LCOV_EXCL_STOP
const NAType *Format::synthesizeType()
{
@@ -3651,11 +3633,9 @@ const NAType *BitOperFunc::synthesizeType()
default:
{
-// LCOV_EXCL_START - rfi
// 4000 Internal Error. This function not supported.
*CmpCommon::diags() << DgSqlCode(-4000);
result = NULL;
-// LCOV_EXCL_STOP
}
break;
}
@@ -3801,11 +3781,9 @@ const NAType *MathFunc::synthesizeType()
default:
{
-// LCOV_EXCL_START - rfi
// 4000 Internal Error. This function not supported.
*CmpCommon::diags() << DgSqlCode(-4000);
result = NULL;
-// LCOV_EXCL_STOP
}
break;
}
@@ -4702,12 +4680,10 @@ const NAType *Lower::synthesizeType()
CharType *ct = (CharType *)&operand;
if ( CharInfo::is_NCHAR_MP(ct->getCharSet()) ) {
-// LCOV_EXCL_START - mp
// 3217: Character set KANJI/KSC5601 is not allowed in the LOWER function.
*CmpCommon::diags() << DgSqlCode(-3217)
<< DgString0(CharInfo::getCharSetName(ct->getCharSet()))
<< DgString1("LOWER");
-// LCOV_EXCL_STOP
}
if ((ct->isUpshifted()) ||
@@ -4759,11 +4735,9 @@ const NAType *Upper::synthesizeType()
CharType *ct = (CharType *)&operand;
if ( CharInfo::is_NCHAR_MP(ct->getCharSet()) ) {
-// LCOV_EXCL_START - mp
*CmpCommon::diags() << DgSqlCode(-3217)
<< DgString0(CharInfo::getCharSetName(ct->getCharSet()))
<< DgString1("UPPER");
-// LCOV_EXCL_STOP
}
if (NOT ct->isUpshifted()) {
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/optimizer/TableDesc.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/TableDesc.cpp b/core/sql/optimizer/TableDesc.cpp
index dc9a5b3..245b720 100644
--- a/core/sql/optimizer/TableDesc.cpp
+++ b/core/sql/optimizer/TableDesc.cpp
@@ -564,7 +564,6 @@ TableDesc::setBaseSelectivityHintForScan(SelectivityHint *selHint,
// -----------------------------------------------------------------------
#pragma nowarn(1506) // warning elimination
#pragma nowarn(770) // warning elimination
-// LCOV_EXCL_START - dpm
void TableDesc::print(FILE* ofd, const char* indent, const char* title)
{
#ifndef NDEBUG
@@ -602,7 +601,6 @@ void TableDescList::print(FILE* ofd, const char* indent, const char* title)
}
#endif
} // TableDescList::print()
-// LCOV_EXCL_STOP
CardinalityHint::CardinalityHint(CostScalar scanCardinality)
{
scanCardinality_ = scanCardinality;
@@ -611,7 +609,6 @@ CardinalityHint::CardinalityHint(CostScalar scanCardinality)
baseSelectivity_ = -1.0;
}
-// LCOV_EXCL_START - cnu
// constructor defined with local predicates
CardinalityHint::CardinalityHint(CostScalar scanCardinality,
const ValueIdSet & localPreds)
@@ -621,7 +618,6 @@ CardinalityHint::CardinalityHint(CostScalar scanCardinality,
localPreds_ = localPreds;
baseSelectivity_ = -1.0;
}
-// LCOV_EXCL_STOP
SelectivityHint::SelectivityHint(double selectivityFactor)
{
selectivityFactor_ = selectivityFactor;
@@ -634,12 +630,11 @@ void SelectivityHint::setScanSelectivityFactor (double selectivityFactor)
// This method is called only for selectivityFactor >= 0.0
if (selectivityFactor > 1.0)
- selectivityFactor_ = 1.0; // LCOV_EXCL_LINE - rfi
+ selectivityFactor_ = 1.0;
else
selectivityFactor_ = selectivityFactor ;
}
-// LCOV_EXCL_START - cnu
CostScalar
TableDesc::getBaseRowCntIfUniqueJoinCol(const ValueIdSet &joinedCols)
@@ -666,7 +661,6 @@ TableDesc::getBaseRowCntIfUniqueJoinCol(const ValueIdSet &joinedCols)
return baseRowCount;
} // TableDesc::getBaseRowCntIfUniqueJoinCol
-// LCOV_EXCL_STOP
ValueIdSet TableDesc::getComputedColumns(NAColumnBooleanFuncPtrT fptr)
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/optimizer/TableDesc.h
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/TableDesc.h b/core/sql/optimizer/TableDesc.h
index 321be1b..cd20a45 100644
--- a/core/sql/optimizer/TableDesc.h
+++ b/core/sql/optimizer/TableDesc.h
@@ -369,10 +369,8 @@ public:
SelectivityHint(double selectivityFactor = -1.0);
// Destructor
-// LCOV_EXCL_START :dd
virtual ~SelectivityHint()
{}
-// LCOV_EXCL_STOP
inline double getScanSelectivityFactor () const { return selectivityFactor_ ; }
void setScanSelectivityFactor (double selectivityFactor);
@@ -404,10 +402,8 @@ public:
const ValueIdSet & localPreds);
// Destructor
-// LCOV_EXCL_START :dd
virtual ~CardinalityHint()
{}
-// LCOV_EXCL_STOP
inline CostScalar getScanCardinality () const { return scanCardinality_ ; }
void setScanCardinality (CostScalar scanCardinality) { scanCardinality_ = MIN_ONE_CS(scanCardinality); }
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/optimizer/TransRule.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/TransRule.cpp b/core/sql/optimizer/TransRule.cpp
index 9b55366..89881ed 100644
--- a/core/sql/optimizer/TransRule.cpp
+++ b/core/sql/optimizer/TransRule.cpp
@@ -1922,7 +1922,6 @@ RelExpr * OrOptimizationRule::nextSubstitute(
// If a predicate contains 1=1, it is constant folded and removed
// from the OR predicate.
//
- // LCOV_EXCL_START
if( doesValueIdEvaluateToFalse(d) )
{
disjunctsEvaluatingToFalse += d;
@@ -1932,7 +1931,6 @@ RelExpr * OrOptimizationRule::nextSubstitute(
return NULL;
}
break;
- // LCOV_EXCL_STOP
default:
// leave col set to NULL
@@ -6472,7 +6470,7 @@ NABoolean TSJUDRRule::isContextSensitive () const
// methods for class HbaseAccessRule
// -----------------------------------------------------------------------
-//HbaseScanRule::~HbaseScanRule() {} // LCOV_EXCL_LINE
+//HbaseScanRule::~HbaseScanRule() {}
//
//NABoolean HbaseScanRule::topMatch(RelExpr * relExpr, Context *context)
//{
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/optimizer/TransRule.h
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/TransRule.h b/core/sql/optimizer/TransRule.h
index 1a91069..a037d85 100644
--- a/core/sql/optimizer/TransRule.h
+++ b/core/sql/optimizer/TransRule.h
@@ -130,7 +130,7 @@ public:
// copy ctor
MJExpandRule (const MJExpandRule &) ; // not written
- virtual ~MJExpandRule() {} // LCOV_EXCL_LINE
+ virtual ~MJExpandRule() {}
virtual NABoolean topMatch (RelExpr * expr,
Context * context);
@@ -161,7 +161,7 @@ public:
// copy ctor
MVQRRule (const MVQRRule &) ;
- virtual ~MVQRRule() {} // LCOV_EXCL_LINE
+ virtual ~MVQRRule() {}
virtual NABoolean topMatch (RelExpr * expr,
Context * context);
@@ -184,7 +184,7 @@ public:
// copy ctor
MVQRScanRule (const MVQRScanRule &) ;
- virtual ~MVQRScanRule() {} // LCOV_EXCL_LINE
+ virtual ~MVQRScanRule() {}
virtual NABoolean topMatch (RelExpr * expr,
Context * context);
@@ -207,7 +207,7 @@ public:
// copy ctor
GroupByMVQRRule (const GroupByMVQRRule &) ;
- virtual ~GroupByMVQRRule() {} // LCOV_EXCL_LINE
+ virtual ~GroupByMVQRRule() {}
virtual NABoolean topMatch (RelExpr * expr,
Context * context);
@@ -230,7 +230,7 @@ public:
// copy ctor
MJEnumRule (const MJEnumRule &) ; // not written
- virtual ~MJEnumRule() {} // LCOV_EXCL_LINE
+ virtual ~MJEnumRule() {}
virtual NABoolean topMatch (RelExpr * expr,
Context * context);
@@ -250,7 +250,6 @@ class MJStarJoinIRuleWA : public NABasicObject
friend class MJStarJoinIRule;
public:
- // LCOV_EXCL_START
// listOfEdges_ is allocated from the statement heap. It is safe to
// ignore this dstr is not code coveraged.
~MJStarJoinIRuleWA()
@@ -258,7 +257,6 @@ public:
if(listOfEdges_)
delete listOfEdges_;
}
- // LCOV_EXCL_STOP
private:
@@ -318,7 +316,7 @@ public:
// copy ctor
MJStarJoinRules (const MJExpandRule &) ; // not written
- virtual ~MJStarJoinRules() {} // LCOV_EXCL_LINE
+ virtual ~MJStarJoinRules() {}
/*virtual NABoolean topMatch (RelExpr * expr,
Context * context);
@@ -359,7 +357,7 @@ public:
// copy ctor
MJStarJoinIRule (const MJStarJoinIRule &) ; // not written
- virtual ~MJStarJoinIRule() {} // LCOV_EXCL_LINE
+ virtual ~MJStarJoinIRule() {}
virtual NABoolean topMatch (RelExpr * expr,
Context * context);
@@ -449,7 +447,7 @@ public:
// copy ctor
MJStarJoinIIRule (const MJExpandRule &) ; // not written
- virtual ~MJStarJoinIIRule() {} // LCOV_EXCL_LINE
+ virtual ~MJStarJoinIIRule() {}
virtual NABoolean topMatch (RelExpr * expr,
Context * context);
@@ -479,7 +477,7 @@ public:
JoinCommutativityRule (const JoinCommutativityRule &) ; // not written
// warning elimination (removed "inline")
- virtual ~JoinCommutativityRule() {} // LCOV_EXCL_LINE
+ virtual ~JoinCommutativityRule() {}
virtual NABoolean topMatch (RelExpr * expr,
Context * context);
@@ -502,7 +500,7 @@ public:
JoinLeftShiftRule (const JoinLeftShiftRule &) ; // not written
// warning elimination (removed "inline")
- virtual ~JoinLeftShiftRule() {} // LCOV_EXCL_LINE
+ virtual ~JoinLeftShiftRule() {}
virtual NABoolean topMatch (RelExpr * expr,
Context * context);
@@ -531,7 +529,7 @@ public:
IndexJoinRule1 (const IndexJoinRule1 &) ; // not written
// warning elimination (removed "inline")
- virtual ~IndexJoinRule1() {} // LCOV_EXCL_LINE
+ virtual ~IndexJoinRule1() {}
virtual NABoolean topMatch (RelExpr * expr,
Context * context);
virtual RelExpr * nextSubstitute(RelExpr * before,
@@ -558,7 +556,7 @@ public:
IndexJoinRule2 (const IndexJoinRule2 &) ; // not written
// warning elimination (removed "inline")
- virtual ~IndexJoinRule2() {} // LCOV_EXCL_LINE
+ virtual ~IndexJoinRule2() {}
virtual NABoolean topMatch (RelExpr * expr,
Context * context);
virtual RelExpr * nextSubstitute(RelExpr * before,
@@ -578,7 +576,7 @@ public:
OrOptimizationRule (const OrOptimizationRule &) ; // not written
// warning elimination (removed "inline")
- virtual ~OrOptimizationRule() {} // LCOV_EXCL_LINE
+ virtual ~OrOptimizationRule() {}
virtual NABoolean topMatch (RelExpr * expr,
Context * context);
@@ -613,7 +611,7 @@ public:
TSJRule (const TSJRule &) ; // not written
// warning elimination (removed "inline")
- virtual ~TSJRule() {} // LCOV_EXCL_LINE
+ virtual ~TSJRule() {}
virtual NABoolean topMatch (RelExpr * expr,
Context * context);
@@ -660,7 +658,7 @@ public:
JoinToTSJRule (const JoinToTSJRule &) ; // not written
// warning elimination (removed "inline")
- virtual ~JoinToTSJRule() {} // LCOV_EXCL_LINE
+ virtual ~JoinToTSJRule() {}
virtual NABoolean topMatch (RelExpr * expr,
Context * context);
@@ -686,7 +684,7 @@ public:
TSJFlowRule (const TSJFlowRule &) ; // not written
// warning elimination (removed "inline")
- virtual ~TSJFlowRule() {} // LCOV_EXCL_LINE
+ virtual ~TSJFlowRule() {}
virtual NABoolean topMatch (RelExpr * expr,
Context * context);
@@ -707,7 +705,7 @@ public:
Rule(name,pattern,substitute) {}
// warning elimination (removed "inline")
- virtual ~TSJUDRRule() {} // LCOV_EXCL_LINE
+ virtual ~TSJUDRRule() {}
virtual NABoolean topMatch (RelExpr * expr,
Context * context);
@@ -739,7 +737,7 @@ public:
FilterRule (const FilterRule &) ; // not written
// warning elimination (removed "inline")
- virtual ~FilterRule() {} // LCOV_EXCL_LINE
+ virtual ~FilterRule() {}
virtual Guidance * guidanceForExploringChild(Guidance * guidance,
Context * context,
Lng32 childIndex);
@@ -976,7 +974,7 @@ public:
SampleScanRule (const SampleScanRule &) ; // not written
// warning elimination (removed "inline")
- virtual ~SampleScanRule() {} // LCOV_EXCL_LINE
+ virtual ~SampleScanRule() {}
virtual NABoolean topMatch (RelExpr * expr,
Context * context);
virtual RelExpr * nextSubstitute(RelExpr * before,
@@ -999,7 +997,7 @@ public:
RelExpr * substitute) :
Rule(name,pattern,substitute) {}
// warning elimination (removed "inline")
- virtual ~JoinToBushyTreeRule() {} // LCOV_EXCL_LINE
+ virtual ~JoinToBushyTreeRule() {}
virtual NABoolean topMatch (RelExpr * expr,
Context * context);
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/optimizer/TriggerDB.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/TriggerDB.cpp b/core/sql/optimizer/TriggerDB.cpp
index f335829..9bf4ebb 100644
--- a/core/sql/optimizer/TriggerDB.cpp
+++ b/core/sql/optimizer/TriggerDB.cpp
@@ -47,7 +47,6 @@
// Debugging aid.
//
// For debugging only
-// LCOV_EXCL_START
void
TableOp::print(ostream& os) const
{
@@ -64,7 +63,6 @@ TableOp::print(ostream& os) const
os << "of Table " << subjectTable_.getQualifiedNameAsAnsiString() << " : "
<< endl;
}
-// LCOV_EXCL_STOP
//-----------------------------------------------------------------------------
//
@@ -88,10 +86,8 @@ TriggerDB::HashFunction(const TableOp & key)
return hval+2;
else
{
- // LCOV_EXCL_START
CMPASSERT(FALSE);
return 0;
- // LCOV_EXCL_STOP
}
}
@@ -123,7 +119,6 @@ TriggerDB::getValidEntry(const TableOp * key, BindWA * bindWA)
// only used when triggers are allocated from the cntext heap.
// Currently triggers are allocated from the statement heap.
// See method Trigger::Heap() in file Triggers.h for more details
- // LCOV_EXCL_START
// entry exist in TriggerDB and we work ACROSS statements =>
// validate the entry: compare the entry's subject table timestamp
@@ -151,7 +146,6 @@ TriggerDB::getValidEntry(const TableOp * key, BindWA * bindWA)
delete result; // destroy the entry
return NULL;
}
- // LCOV_EXCL_STOP
} // end of validation
// at this point, if result != NULL, then it is valid. Otherwise it is
@@ -178,7 +172,6 @@ TriggerDB::getTriggers(QualifiedName &subjectTable,
// only used when triggers are allocated from the cntext heap.
// Currently triggers are allocated from the statement heap.
// See method Trigger::Heap() in file Triggers.h for more details
-// LCOV_EXCL_START
void
TriggerDB::clearAndDestroy()
{
@@ -205,7 +198,6 @@ TriggerDB::clearAndDestroy()
// now, TriggerDB should be empty
CMPASSERT(this->entries() == 0);
}
-// LCOV_EXCL_STOP
//
// -- ResetRecursionCounter()
@@ -217,7 +209,6 @@ TriggerDB::clearAndDestroy()
// only used when triggers are allocated from the cntext heap.
// Currently triggers are allocated from the statement heap.
// See method Trigger::Heap() in file Triggers.h for more details
-// LCOV_EXCL_START
static void
ResetRecursionCounter(TriggerList* triggerList)
{
@@ -230,7 +221,6 @@ ResetRecursionCounter(TriggerList* triggerList)
trg->resetRecursionCounter();
}
}
-// LCOV_EXCL_STOP
//
// -- TriggerDB::cleanupPerStatement()
@@ -244,7 +234,6 @@ ResetRecursionCounter(TriggerList* triggerList)
// only used when triggers are allocated from the cntext heap.
// Currently triggers are allocated from the statement heap.
// See method Trigger::Heap() in file Triggers.h for more details
-// LCOV_EXCL_START
NABoolean
TriggerDB::cleanupPerStatement()
{
@@ -282,7 +271,6 @@ TriggerDB::cleanupPerStatement()
return FALSE;
}
}
-// LCOV_EXCL_STOP
//
// -- TriggerDB::print
@@ -290,7 +278,6 @@ TriggerDB::cleanupPerStatement()
// Debugging aid.
//
// For debugging only
-// LCOV_EXCL_START
void TriggerDB::print(ostream& os) const
{
NAHashDictionaryIterator<TableOp, BeforeAndAfterTriggers> iter (*this) ;
@@ -312,7 +299,6 @@ void TriggerDB::print(ostream& os) const
iter.getNext(top, triggers);
}
}
-// LCOV_EXCL_STOP
NABoolean TriggerDB::isHiveTable(QualifiedName& name)
{
@@ -331,12 +317,10 @@ NABoolean TriggerDB::isHiveTable(QualifiedName& name)
// TBD
//
// not implemented
-// LCOV_EXCL_START
RefConstraintList *
SchemaDB::getRIs(QualifiedName &subjectTable,
ComOperation operation)
{
return NULL;
}
-// LCOV_EXCL_STOP
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/optimizer/Triggers.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/Triggers.cpp b/core/sql/optimizer/Triggers.cpp
index 270aa76..0b18d9d 100644
--- a/core/sql/optimizer/Triggers.cpp
+++ b/core/sql/optimizer/Triggers.cpp
@@ -64,7 +64,6 @@ subjectNameToTrigTemp( const NAString & subjectTableName )
// by subjectNameToTrigTemp() ) )
//
// no longer used -buggy
-// LCOV_EXCL_START
NAString
trigTempToSubjectName( const NAString & trigTempTableName )
{
@@ -86,7 +85,6 @@ trigTempToSubjectName( const NAString & trigTempTableName )
return subjectTableName;
}
-// LCOV_EXCL_STOP
//-----------------------------------------------------------------------------
//
@@ -181,7 +179,6 @@ UpdateColumns::markColumnsOnBitmap(unsigned char *bitmap, CollIndex numBytes) co
// Debugging aid
//
// used for debugging only
-// LCOV_EXCL_START
void
UpdateColumns::print(ostream & os, const char* indent, const char* title) const
{
@@ -199,7 +196,6 @@ UpdateColumns::print(ostream & os, const char* indent, const char* title) const
os << endl;
}
-// LCOV_EXCL_STOP
//-----------------------------------------------------------------------------
//
@@ -212,7 +208,6 @@ UpdateColumns::print(ostream & os, const char* indent, const char* title) const
// are trigger object's get desructed explicitly
// Currently triggers are allocated from the statement heap.
// See method Trigger::Heap() in file Triggers.h for more details
-// LCOV_EXCL_START
Trigger::~Trigger()
{
// only when persistence is active, trigger object's get desructed
@@ -235,7 +230,6 @@ Trigger::~Trigger()
if (sqlText_)
delete sqlText_;
}
-// LCOV_EXCL_STOP
//
// -- Trigger:: equality
@@ -390,7 +384,6 @@ Trigger::getParsedTrigger(BindWA *bindWA)
#pragma nowarn(770) // warning elimination
#pragma nowarn(1506) // warning elimination
// used for debugging only
-// LCOV_EXCL_START
void
Trigger::print(ostream &os, const char* indent, const char* title) const
{
@@ -420,7 +413,6 @@ Trigger::print(ostream &os, const char* indent, const char* title) const
os << "TimeStamp: " << convertInt64ToDouble(timeStamp_) << endl;
os << "Recursion Counter: " << recursionCounter_ << endl;
}
-// LCOV_EXCL_STOP
#pragma warn(1506) // warning elimination
#pragma warn(770) // warning elimination
@@ -529,7 +521,6 @@ TriggerList::sortByTimeStamp()
#pragma nowarn(1506) // warning elimination
#pragma nowarn(770) // warning elimination
// used for debugging only
-// LCOV_EXCL_START
void
TriggerList::print(ostream & os, const char* indent, const char* title) const
{
@@ -541,7 +532,6 @@ TriggerList::print(ostream & os, const char* indent, const char* title) const
os << ". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ";
}
}
-// LCOV_EXCL_STOP
#pragma warn(770) // warning elimination
#pragma warn(1506) // warning elimination
@@ -555,7 +545,6 @@ TriggerList::print(ostream & os, const char* indent, const char* title) const
// only used when triggers are allocated from the cntext heap.
// Currently triggers are allocated from the statement heap.
// See method Trigger::Heap() in file Triggers.h
-// LCOV_EXCL_START
void
TriggerList::clearAndDestroy()
{
@@ -568,7 +557,6 @@ TriggerList::clearAndDestroy()
}
this->clear();
}
-// LCOV_EXCL_STOP
//------------------------------------------------------------------------------
@@ -583,7 +571,6 @@ TriggerList::clearAndDestroy()
// Debugging aid.
//
// used for debugging only
-// LCOV_EXCL_START
void
BeforeAndAfterTriggers::print(ostream& os,
const char *indent,
@@ -596,7 +583,6 @@ BeforeAndAfterTriggers::print(ostream& os,
if (getAfterRowTriggers())
getAfterRowTriggers()->print(os, indent, "After Row Triggers: ");
}
-// LCOV_EXCL_STOP
//
@@ -608,7 +594,6 @@ BeforeAndAfterTriggers::print(ostream& os,
// are trigger object's get desructed explicitly
// Currently triggers are allocated from the statement heap.
// See method Trigger::Heap() in file Triggers.h for more details
-// LCOV_EXCL_START
void
BeforeAndAfterTriggers::clearAndDestroy()
{
@@ -630,7 +615,6 @@ BeforeAndAfterTriggers::clearAndDestroy()
delete beforeTriggers_;
}
}
-// LCOV_EXCL_STOP
//
@@ -641,13 +625,11 @@ BeforeAndAfterTriggers::clearAndDestroy()
// are trigger object's get desructed explicitly
// Currently triggers are allocated from the statement heap.
// See method Trigger::Heap() in file Triggers.h for more details
-// LCOV_EXCL_START
BeforeAndAfterTriggers::~BeforeAndAfterTriggers()
{
// NOTE: if deep-destruction is required then
// call this->clearAndDestroyAllEntries() here
}
-// LCOV_EXCL_STOP
//
// -- BeforeAndAfterTriggers::entries
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/optimizer/Triggers.h
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/Triggers.h b/core/sql/optimizer/Triggers.h
index 832d7bc..8e5ec11 100644
--- a/core/sql/optimizer/Triggers.h
+++ b/core/sql/optimizer/Triggers.h
@@ -134,7 +134,6 @@ public:
// copy ctor
// should not use
- // LCOV_EXCL_START
Trigger (const Trigger &other)
: name_(other.name_),
subjectTable_(other.subjectTable_),
@@ -145,18 +144,15 @@ public:
updateCols_(other.updateCols_)
// Should never be called. Supplied only for collections.
{ CMPASSERT(FALSE); }
- // LCOV_EXCL_STOP
// dtor
- virtual ~Trigger(); // LCOV_EXCL_LINE
+ virtual ~Trigger();
// assignment operator
// should not use
- // LCOV_EXCL_START
Trigger& operator = (const Trigger& other)
// Should never be called. Supplied only because of collections.
{ CMPASSERT(FALSE); return *this; }
- // LCOV_EXCL_STOP
// equality operator
NABoolean operator ==(const Trigger &other) const;
@@ -169,14 +165,12 @@ public:
{ return subjectTable_.getQualifiedNameAsAnsiString(); }
// used for debugging only - print methods
- // LCOV_EXCL_START
inline ComOperation getOperation() const
{ return operation_; }
inline NABoolean isBeforeTrigger() const
{ return (activation_ == COM_BEFORE); }
inline NABoolean isStatementTrigger() const
{ return (granularity_== COM_STATEMENT); }
- // LCOV_EXCL_STOP
inline NABoolean isAfterTrigger() const
{ return (activation_ == COM_AFTER); }
@@ -211,9 +205,7 @@ public:
inline void decRecursionCounter() { recursionCounter_--; }
// no longer used
- // LCOV_EXCL_START
inline void resetRecursionCounter() { recursionCounter_=0; }
- // LCOV_EXCL_STOP
//-------------------------------------------------------------------------
// Memory Management and Trigger Persistence
@@ -407,9 +399,6 @@ public:
void print(ostream& os, const char* indent, const char* title) const;
-
- // LCOV_EXCL_STOP
-
};
//-----------------------------------------------------------------------------
@@ -462,10 +451,8 @@ public:
// NAHashBucket::contains() being called with a default NULL argument for
// Values in the triggerDB hash where BeforeAndAfterTriggers are Values.
// warning elimination (removed "inline")
- // LCOV_EXCL_START
NABoolean operator == (const BeforeAndAfterTriggers &other) const
{ CMPASSERT(FALSE); return FALSE; }
- // LCOV_EXCL_STOP
void print(ostream& os, const char* indent, const char* title) const;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/optimizer/ValueDesc.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/ValueDesc.cpp b/core/sql/optimizer/ValueDesc.cpp
index 74e2db7..cf82e2f 100644
--- a/core/sql/optimizer/ValueDesc.cpp
+++ b/core/sql/optimizer/ValueDesc.cpp
@@ -3116,7 +3116,7 @@ ValueIdSet ValueIdSet::createMirrorPreds(ValueId &computedCol,
case ITM_ASSIGN:
default:
// XXX Don't expect this case to ever happen
- CMPASSERT(0); // LCOV_EXCL_LINE
+ CMPASSERT(0);
break;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/optimizer/costmethod.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/costmethod.cpp b/core/sql/optimizer/costmethod.cpp
index 83683e5..c063f1d 100644
--- a/core/sql/optimizer/costmethod.cpp
+++ b/core/sql/optimizer/costmethod.cpp
@@ -70,7 +70,6 @@ static THREAD_P FILE* pfp = NULL;
// be called. This is a workaround for bugs/missing
// functionality in ObjectCenter that cause display() to become
// an undefined symbol.
-// LCOV_EXCL_START :dpm
void displayCostMethod(const CostMethod& pf)
{
pf.display();
@@ -81,7 +80,6 @@ void displayCostMethod(const CostMethod* pf)
if (pf)
pf->display();
}
-// LCOV_EXCL_STOP
//<pb>
//************************************************
@@ -106,7 +104,6 @@ void displayCostMethod(const CostMethod* pf)
// Rolled up cost.
//
//==============================================================================
-// LCOV_EXCL_START :cnu -- OCM code
Cost*
rollUpUnaryNonBlocking(const Cost& parentOnly,
const Cost& childRollUp,
@@ -311,7 +308,6 @@ CostMethod::print( FILE* ofd
void
CostMethod::display() const { print(); }
-// LCOV_EXCL_STOP
// -----------------------------------------------------------------------
// CostMethod::cleanUpAllCostMethods() is used to reset the SharedPtrs in
@@ -322,7 +318,6 @@ CostMethod::display() const { print(); }
// function may also clean up other problems that may exist in the
// CostMethod objects when a longjmp occurs.
// -----------------------------------------------------------------------
-// LCOV_EXCL_START :rfi
void
CostMethod::cleanUpAllCostMethods()
{
@@ -333,13 +328,11 @@ CostMethod::cleanUpAllCostMethods()
cm != NULL; cm = cm->nextCostMethod_)
cm->cleanUp();
}
-// LCOV_EXCL_STOP
// -----------------------------------------------------------------------
// CostMethod::generateZeroCostObject()
// Generate a zero cost object out of the information already cached.
// -----------------------------------------------------------------------
-// LCOV_EXCL_START :cnu -- OCM code
Cost* CostMethod::generateZeroCostObject()
{
// A zero cost vector.
@@ -359,7 +352,6 @@ Cost* CostMethod::generateZeroCostObject()
return new STMTHEAP Cost( &cv, &cv, NULL, cpuCount, fragmentsPerCPU );
}
-// LCOV_EXCL_STOP
// return true iff we are under a nested join
NABoolean
@@ -627,15 +619,13 @@ CostMethod::computeOperatorCost(RelExpr* op,
Cost* cost;
try {
cost = computeOperatorCostInternal(op, myContext, countOfStreams);
- } catch(...) { // LCOV_EXCL_LINE :rfi
+ } catch(...) {
// cleanUp() must be called before this function is called again
// because wrong results may occur the next time computeOperatorCost()
// is called and because the SharedPtr objects must be set to zero.
// Failure to call cleanUp() will very likely cause problems.
- // LCOV_EXCL_START :rfi
cleanUp();
throw; // rethrow the exception
- // LCOV_EXCL_STOP
}
cleanUp();
@@ -807,7 +797,7 @@ CostMethod::computePlanCost( RelExpr* op,
//------------------------------------------------------------------
if ( childContext == NULL )
{
- ABORT("CostMethod::computePlanCost(): A child has a NULL context"); // LCOV_EXCL_LINE :rfi
+ ABORT("CostMethod::computePlanCost(): A child has a NULL context");
}
// Coverity flags this dereferencing null pointer childContext.
@@ -815,7 +805,7 @@ CostMethod::computePlanCost( RelExpr* op,
// coverity[var_deref_model]
if ( NOT childContext->hasOptimalSolution() )
{
- ABORT("CostMethod::computePlanCost(): A child has no solution"); // LCOV_EXCL_LINE :rfi
+ ABORT("CostMethod::computePlanCost(): A child has no solution");
}
//---------------------------------------------
@@ -865,7 +855,6 @@ CostMethod::computePlanCost( RelExpr* op,
// none.
//
//==============================================================================
-// LCOV_EXCL_START :cnu -- OCM code
void
CostMethod::getChildCostsForBinaryOp( RelExpr* op
, const Context* myContext
@@ -1284,7 +1273,6 @@ CostMethod::mergeBothLegsBlocking( const CostPtr leftChildCost,
} // CostMethod::mergeBothLegsBlocking
//<pb>
-// LCOV_EXCL_STOP
/**********************************************************************/
/* */
@@ -1309,7 +1297,6 @@ CostMethod::mergeBothLegsBlocking( const CostPtr leftChildCost,
// Pointer to computed cost object for this exchange operator.
//
//==============================================================================
-// LCOV_EXCL_START :cnu -- OCM code
Cost*
CostMethodExchange::computeOperatorCostInternal(RelExpr* op,
const Context* myContext,
@@ -1796,7 +1783,6 @@ CostMethodExchange::computeExchangeCostGoingDown( const ReqdPhysicalProperty* rp
);
} // CostMethodExchange::computeExchangeCostGoingDown
-// LCOV_EXCL_STOP
//<pb>
//==============================================================================
// Compute default values needed for costing a specified exchange operator.
@@ -1921,7 +1907,6 @@ CostMethodExchange::getDefaultValues(
// Number of messages sent down to child.
//
//==============================================================================
-// LCOV_EXCL_START :cnu -- OCM code
CostScalar
CostMethodExchange::computeDownMessages(
const CostScalar& numOfProbes,
@@ -4481,7 +4466,6 @@ CostMethodExchange::computeExchangeCost( const CostVecPtr parentFR,
return exchangeCost;
} // CostMethodExchange::computeExchangeCost()
-// LCOV_EXCL_STOP
//<pb>
/**********************************************************************/
/* */
@@ -4594,24 +4578,20 @@ CostMethodFileScan::computeOperatorCostInternal(RelExpr* op,
NABoolean
isNestedJoin = ( myContext->getInputLogProp()->getColStats().entries() > 0 );
-// LCOV_EXCL_START
// excluded for coverage because DEBUG only code
if (CURRSTMT_OPTDEFAULTS->optimizerHeuristic2()) {//#ifndef NDEBUG
if (isNestedJoin)
(*CURRSTMT_OPTGLOBALS->nestedJoinMonitor).enter();
(*CURRSTMT_OPTGLOBALS->fileScanMonitor).enter();
}//#endif
-// LCOV_EXCL_STOP
costPtr = scanOptimizer->optimize(searchKeyPtr, /* out */
mdamKeyPtr /* out */);
-// LCOV_EXCL_START
// excluded for coverage because DEBUG only code
if (CURRSTMT_OPTDEFAULTS->optimizerHeuristic2()) {//#ifndef NDEBUG
(*CURRSTMT_OPTGLOBALS->fileScanMonitor).exit();
if (isNestedJoin)
(*CURRSTMT_OPTGLOBALS->nestedJoinMonitor).exit();
-// LCOV_EXCL_STOP
}//#endif
// Set blocks per access estimate. Use value from the defaults
@@ -4703,7 +4683,6 @@ if (CURRSTMT_OPTDEFAULTS->optimizerHeuristic2()) {//#ifndef NDEBUG
// ---------------------------------------------------------------------
// For debugging.
// ---------------------------------------------------------------------
-// LCOV_EXCL_START :dpm
// excluded for coverage because DEBUG only code
#ifndef NDEBUG
if ( CmpCommon::getDefault( OPTIMIZER_PRINT_COST ) == DF_ON )
@@ -4719,7 +4698,6 @@ if (CURRSTMT_OPTDEFAULTS->optimizerHeuristic2()) {//#ifndef NDEBUG
fprintf(pfp,"\n");
}
#endif
-// LCOV_EXCL_STOP
// transfer probe counters to p (the FileScan)
p->setProbes(scanOptimizer->getProbes());
@@ -4770,7 +4748,6 @@ CostMethodDP2Scan::computeOperatorCostInternal(RelExpr* op,
// -----------------------------------------------------------------------
// CostMethodFixedCostPerRow::computeOperatorCostInternal().
// -----------------------------------------------------------------------
-// LCOV_EXCL_START :cnu -- OCM code
Cost*
CostMethodFixedCostPerRow::computeOperatorCostInternal(RelExpr* op,
const Context* myContext,
@@ -4887,7 +4864,6 @@ void CostMethodFixedCostPerRow::print(FILE* ofd,
fprintf(ofd,"\n ");
} // CostMethodFixedCostPerRow::print()
-// LCOV_EXCL_STOP
//<pb>
// ----QUICKSEARCH FOR SORT...............................................
@@ -5000,7 +4976,6 @@ void CostMethodSort::cacheParameters(RelExpr* op,
// -----------------------------------------------------------------------
// CostMethodSort computeOperatorCost().
// -----------------------------------------------------------------------
-// LCOV_EXCL_START :cnu -- OCM code
Cost*
CostMethodSort::computeOperatorCostInternal(RelExpr* op,
const Context* myContext,
@@ -5318,7 +5293,6 @@ CostMethodSort::computeOperatorCostInternal(RelExpr* op,
return costPtr;
} // CostMethodSort::computeOperatorCostInternal()
-// LCOV_EXCL_STOP
//<pb>
// ----QUICKSEARCH FOR GROUPBY............................................
@@ -6244,7 +6218,6 @@ void CostMethodGroupByAgg::cleanUp()
// -----------------------------------------------------------------------
// CostMethodSortGroupBy::computeOperatorCostInternal().
// -----------------------------------------------------------------------
-// LCOV_EXCL_START :cnu -- OCM code
Cost*
CostMethodSortGroupBy::computeOperatorCostInternal(RelExpr* op,
const Context* myContext,
@@ -6445,7 +6418,6 @@ CostMethodSortGroupBy::computeOperatorCostInternal(RelExpr* op,
return costPtr;
} // CostMethodSortGroupBy::computeOperatorCostInternal().
-// LCOV_EXCL_STOP
//<pb>
// ----QUICKSEARCH FOR HGB................................................
@@ -6550,7 +6522,6 @@ void CostMethodHashGroupBy::cacheParameters(RelExpr* op,
// noOfClusters_, which together forms an initial working set of
// parameters for computePassCost().
// -----------------------------------------------------------------------
-// LCOV_EXCL_START :cnu -- OCM code
void CostMethodHashGroupBy::deriveParameters()
{
// ---------------------------------------------------------------------
@@ -7992,7 +7963,6 @@ CostMethodShortCutGroupBy::computePlanCost( RelExpr* op,
return planCost;
} // CostMethodShortCutGroupBy::computePlanCost()
-// LCOV_EXCL_STOP
//<pb>
// ----QUICKSEARCH FOR JOIN...............................................
@@ -8496,7 +8466,6 @@ void CostMethodJoin::estimateDegreeOfParallelism()
// Try to use colstats to estimate row counts for a representative
// stream. If that fails, just assume even distribution.
// ---------------------------------------------------------------
- // LCOV_EXCL_START :cnu
// excluded for coverage because below code is disabled
if(isColStatsMeaningful_)
{
@@ -8585,7 +8554,6 @@ void CostMethodJoin::estimateDegreeOfParallelism()
// -----------------------------------------------------------
}
}
- // LCOV_EXCL_STOP
else
// ---------------------------------------------------------------
// $$$ This is always the code path taken right now, since the
@@ -8685,7 +8653,6 @@ void CostMethodJoin::estimateDegreeOfParallelism()
// actual stream cost of the operation in the cases where there maybe an
// inherent uneven distribution of workload across different streams.
// -----------------------------------------------------------------------
-// LCOV_EXCL_START :cnu
NABoolean CostMethodJoin::computeRepresentativeStream()
{
// This method needs more refinement and thoughts...
@@ -9042,7 +9009,6 @@ NABoolean CostMethodJoin::mergeHistogramsOnEquiJoinPred()
return TRUE;
}
-// LCOV_EXCL_STOP
//<pb>
// -----------------------------------------------------------------------
// CostMethodJoin::classifyPredicates().
@@ -9350,7 +9316,6 @@ void CostMethodHashJoin::cacheParameters(RelExpr* op,
// stages of operation. It assumes both cacheParameters() as well as
// estimateDegreeOfParallelism() have been called.
// -----------------------------------------------------------------------
-// LCOV_EXCL_START :cnu -- OCM code
void CostMethodHashJoin::deriveParameters()
{
// ---------------------------------------------------------------------
@@ -10600,7 +10565,6 @@ CostMethodHashJoin::computeOperatorCostInternal(RelExpr* op,
return costPtr;
} // CostMethodHashJoin::computeOperatorCostInternal().
-// LCOV_EXCL_STOP
// -----------------------------------------------------------------------
// Clean up the cost vectors at various stages.
@@ -10674,7 +10638,6 @@ void CostMethodHashJoin::cleanUp()
// Pointer to cumulative final cost.
//
//==============================================================================
-// LCOV_EXCL_START :cnu -- OCM code
Cost*
CostMethodHashJoin::computePlanCost( RelExpr* hashJoinOp,
const Context* myContext,
@@ -11109,7 +11072,6 @@ SimpleCostVector CostMethodHashJoin::computeNewBlockingCost(
E.setNumProbes(parentNumProbes);
return E;
} // CostMethodHashJoin::computeNewBlockingCost()
-// LCOV_EXCL_STOP
//<pb>
// ----QUICKSEARCH FOR MJ.................................................
@@ -11167,7 +11129,6 @@ void CostMethodMergeJoin::cacheParameters(RelExpr* op,
// of possible uec's (which is the smaller of the left and right uec's).
//
// -----------------------------------------------------------------------
-// LCOV_EXCL_START :cnu -- OCM code
CostScalar CostMethodMergeJoin::computeIntervalMergingCost(
CostScalar child0RowCount,
CostScalar child0Uec,
@@ -12282,7 +12243,6 @@ CostMethodNestedJoin::mergeBothLegsBlocking(
return mergedCost;
} //CostMethodNestedJoin::mergeBothLegsBlocking
-// LCOV_EXCL_STOP
//<pb>
// -----------------------------------------------------------------------
// CostMethodNestedJoin::cacheParameters()
@@ -12332,7 +12292,6 @@ void CostMethodNestedJoin::cacheParameters(RelExpr* op,
// -----------------------------------------------------------------------
// CostMethodNestedJoin::computeOperatorCostInternal()
// -----------------------------------------------------------------------
-// LCOV_EXCL_START :cnu -- OCM code
Cost*
CostMethodNestedJoin::computeOperatorCostInternal(RelExpr* op,
const Context* myContext,
@@ -12770,7 +12729,6 @@ CostMethodNestedJoinFlow::computeOperatorCostInternal(RelExpr* op,
return costPtr;
} // CostMethodNestedJoinFlow::computeOperatorCostInternal().
-// LCOV_EXCL_STOP
//<pb>
// ----QUICKSEARCH FOR MU.................................................
@@ -12802,7 +12760,6 @@ void CostMethodMergeUnion::cacheParameters(
// -----------------------------------------------------------------------
// CostMethodMergeUnion::computeOperatorCostInternal().
// -----------------------------------------------------------------------
-// LCOV_EXCL_START :cnu -- OCM code
Cost*
CostMethodMergeUnion::computeOperatorCostInternal(RelExpr* op,
const Context* myContext,
@@ -13517,7 +13474,6 @@ CostMethodTuple::computeOperatorCostInternal(RelExpr* op,
return costPtr;
} // CostMethodTuple::computeOperatorCostInternal().
-// LCOV_EXCL_STOP
//<pb>
/**********************************************************************/
@@ -13586,7 +13542,6 @@ CostMethodTranspose::cacheParameters(RelExpr *op,
// long& countOfStreams
// OUT - Estimated degree of parallelism for returned preliminary cost.
//
-// LCOV_EXCL_START :cnu -- OCM code
Cost *
CostMethodTranspose::computeOperatorCostInternal(RelExpr *op,
const Context *myContext,
@@ -13645,7 +13600,6 @@ CostMethodTranspose::computeOperatorCostInternal(RelExpr *op,
} // CostMethodTranspose::computeOperatorCostInternal()
-// LCOV_EXCL_STOP
/**********************************************************************/
/* */
@@ -13685,7 +13639,6 @@ CostMethodCompoundStmt::cacheParameters(RelExpr *op,
// Context *myContext
// IN - The optimization context within which to cost this node.
//-------------------------------------------------------------------------
-// LCOV_EXCL_START :cnu -- OCM code
Cost *
CostMethodCompoundStmt::computeOperatorCostInternal(RelExpr *op,
const Context *myContext,
@@ -13903,7 +13856,6 @@ CostMethodTableMappingUDF::computeOperatorCostInternal(RelExpr* op,
fragmentsPerCPU
);
}
-// LCOV_EXCL_STOP
/**********************************************************************/
/* */
@@ -14239,7 +14191,6 @@ CostMethodUnPackRows::cacheParameters(RelExpr *op,
// long& countOfStreams
// OUT - Estimated degree of parallelism for returned preliminary cost.
//
-// LCOV_EXCL_START :cnu -- OCM code
Cost *
CostMethodUnPackRows::computeOperatorCostInternal(RelExpr *op,
const Context *myContext,
@@ -14297,7 +14248,6 @@ CostMethodUnPackRows::computeOperatorCostInternal(RelExpr *op,
Cost(&cvFirstRow, &cvLastRow, NULL, cpuCount, fragmentsPerCPU);
} // CostMethodUnPackRows::computeOperatorCostInternal()
-// LCOV_EXCL_STOP
/**********************************************************************/
/* */
@@ -14363,7 +14313,6 @@ CostMethodRelSequence::cacheParameters(RelExpr *op,
// long& countOfStreams
// OUT - Estimated degree of parallelism for returned preliminary cost.
//
-// LCOV_EXCL_START :cnu -- OCM code
Cost *
CostMethodRelSequence::computeOperatorCostInternal(RelExpr *op,
const Context *myContext,
@@ -14758,7 +14707,6 @@ CostMethodIsolatedScalarUDF::computeOperatorCostInternal(RelExpr* op,
return costPtr;
} // CostMethodIsolatedScalarUDF::computeOperatorCostInternal().
-// LCOV_EXCL_STOP
//<pb>
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/optimizer/disjunct.h
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/disjunct.h b/core/sql/optimizer/disjunct.h
index 48b8d8f..5df2271 100644
--- a/core/sql/optimizer/disjunct.h
+++ b/core/sql/optimizer/disjunct.h
@@ -69,12 +69,10 @@ public:
// const functions:
NABoolean isEmpty() const {return disjunct_.isEmpty(); }
- // LCOV_EXCL_START :dpm
virtual void print( FILE* ofd = stdout,
const char* indent = DEFAULT_INDENT,
const char* title = "disjunct") const
{ disjunct_.print(ofd,indent,title); }
- // LCOV_EXCL_STOP
const ValueIdSet& getAsValueIdSet() const
{ return disjunct_; }
[02/14] incubator-trafodion git commit: lcov: commit #1
Posted by an...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/refresh/RuMultiTxnRefreshTaskExecutor.cpp
----------------------------------------------------------------------
diff --git a/core/sql/refresh/RuMultiTxnRefreshTaskExecutor.cpp b/core/sql/refresh/RuMultiTxnRefreshTaskExecutor.cpp
index bfd47d3..55e3baf 100644
--- a/core/sql/refresh/RuMultiTxnRefreshTaskExecutor.cpp
+++ b/core/sql/refresh/RuMultiTxnRefreshTaskExecutor.cpp
@@ -190,7 +190,6 @@ void CRUMultiTxnRefreshTaskExecutor::UpdateTargetEpoch(TInt32 epoch)
// In reality, it is retryable, but we have to handle that ourselves.
pStat->ExecuteUpdate(TRUE);
}
- // LCOV_EXCL_START :rfi
catch (CDMException &eDm)
{
if (eDm.GetErrorCode (0) == -VERSION_PLAN_VERSION_ERROR_NON_RETRYABLE_STATEMENT)
@@ -199,7 +198,6 @@ void CRUMultiTxnRefreshTaskExecutor::UpdateTargetEpoch(TInt32 epoch)
else
throw;
}
- // LCOV_EXCL_STOP
pStat->Close();
}
@@ -610,7 +608,6 @@ void CRUMultiTxnRefreshTaskExecutor::
CommitTransaction();
}
- // LCOV_EXCL_START :rfi
catch (CDSException &ex)
{
pStat->Close();
@@ -626,7 +623,6 @@ void CRUMultiTxnRefreshTaskExecutor::
return;
}
- // LCOV_EXCL_STOP
#ifdef _DEBUG
// This section is only for the regression test
@@ -708,7 +704,6 @@ CDMPreparedStatement * CRUMultiTxnRefreshTaskExecutor::
// Simulate a system error at this point!
TESTPOINT_SEVERE2(CRUGlobals::SEVERE_PREPARE_CRASH, GetRootMVName());
}
- // LCOV_EXCL_START :rfi
catch (CDSException &ex)
{
ex.SetError(IDS_RU_IREFRESH_FAILED);
@@ -725,7 +720,6 @@ CDMPreparedStatement * CRUMultiTxnRefreshTaskExecutor::
GetLastSQL(type));
throw ex; // Re-throw
}
- // LCOV_EXCL_STOP
return pStat;
}
@@ -793,7 +787,6 @@ void CRUMultiTxnRefreshTaskExecutor::LogClosureMessage()
//--------------------------------------------------------------------------//
// CRUMultiTxnRefreshTaskExecutor::StoreRequest()
//--------------------------------------------------------------------------//
-// LCOV_EXCL_START :cnu
void CRUMultiTxnRefreshTaskExecutor::
StoreRequest(CUOFsIpcMessageTranslator &translator)
{
@@ -812,12 +805,10 @@ void CRUMultiTxnRefreshTaskExecutor::
translator.SetMessageType(CUOFsIpcMessageTranslator::
RU_MULTI_TXN_REFRESH_EXECUTOR);
}
-// LCOV_EXCL_STOP
//--------------------------------------------------------------------------//
// CRUMultiTxnRefreshTaskExecutor::StoreReply()
//--------------------------------------------------------------------------//
-// LCOV_EXCL_START :cnu
void CRUMultiTxnRefreshTaskExecutor::
StoreReply(CUOFsIpcMessageTranslator &translator)
{
@@ -831,12 +822,10 @@ void CRUMultiTxnRefreshTaskExecutor::
translator.WriteBlock(&txnCounter_, sizeof(short));
}
-// LCOV_EXCL_STOP
//--------------------------------------------------------------------------//
// CRUAuditRefreshTaskExecutor::LoadRequest()
//--------------------------------------------------------------------------//
-// LCOV_EXCL_START :cnu
void CRUMultiTxnRefreshTaskExecutor::
LoadRequest(CUOFsIpcMessageTranslator &translator)
{
@@ -852,12 +841,10 @@ void CRUMultiTxnRefreshTaskExecutor::
translator.ReadBlock(&multiTxnTargetEpoch_, sizeof(TInt32));
translator.ReadBlock(&txnCounter_, sizeof(short));
}
-// LCOV_EXCL_STOP
//--------------------------------------------------------------------------//
// CRUAuditRefreshTaskExecutor::LoadReply()
//--------------------------------------------------------------------------//
-// LCOV_EXCL_START :cnu
void CRUMultiTxnRefreshTaskExecutor::
LoadReply(CUOFsIpcMessageTranslator &translator)
{
@@ -870,5 +857,4 @@ void CRUMultiTxnRefreshTaskExecutor::
translator.ReadBlock(&multiTxnTargetEpoch_, sizeof(TInt32));
translator.ReadBlock(&txnCounter_, sizeof(short));
}
-// LCOV_EXCL_STOP
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/refresh/RuOptions.cpp
----------------------------------------------------------------------
diff --git a/core/sql/refresh/RuOptions.cpp b/core/sql/refresh/RuOptions.cpp
index bb1f0a7..e3991b3 100644
--- a/core/sql/refresh/RuOptions.cpp
+++ b/core/sql/refresh/RuOptions.cpp
@@ -134,7 +134,6 @@ void CRUOptions::AddDebugOption(Int32 testpoint, const CDSString &objName)
//--------------------------------------------------------------------------//
// CRUOptions::Dump()
//--------------------------------------------------------------------------//
-// LCOV_EXCL_START :dpm
void CRUOptions::Dump(CDSString &to)
{
to += "\n\t\tCOMMAND OPTIONS DUMP\n\n";
@@ -195,7 +194,6 @@ void CRUOptions::Dump(CDSString &to)
to += CDSString(buf);
}
}
-// LCOV_EXCL_STOP
#endif
//--------------------------------------------------------------------------//
@@ -217,7 +215,6 @@ operator = (const CRUOptions::DebugOption &other)
// The LoadData/StoreData methods move only the output
// file's name and the debug options between the processes.
//--------------------------------------------------------------------------//
-// LCOV_EXCL_START :cnu
void CRUOptions::StoreData(CUOFsIpcMessageTranslator &translator)
{
Int32 stringSize;
@@ -254,12 +251,10 @@ void CRUOptions::StoreData(CUOFsIpcMessageTranslator &translator)
#pragma warn(1506) // warning elimination
}
}
-// LCOV_EXCL_STOP
//--------------------------------------------------------------------------//
// CRUOptions::LoadData()
//--------------------------------------------------------------------------//
-// LCOV_EXCL_START :cnu
void CRUOptions::LoadData(CUOFsIpcMessageTranslator &translator)
{
char buf[PACK_BUFFER_SIZE];
@@ -305,4 +300,3 @@ void CRUOptions::LoadData(CUOFsIpcMessageTranslator &translator)
AddDebugOption(testpoint, objName);
}
}
-// LCOV_EXCL_STOP
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/refresh/RuRcReleaseTaskExecutor.h
----------------------------------------------------------------------
diff --git a/core/sql/refresh/RuRcReleaseTaskExecutor.h b/core/sql/refresh/RuRcReleaseTaskExecutor.h
index 5aa7792..79a72a6 100644
--- a/core/sql/refresh/RuRcReleaseTaskExecutor.h
+++ b/core/sql/refresh/RuRcReleaseTaskExecutor.h
@@ -58,7 +58,6 @@ public:
public:
// These functions serialize/de-serialize the executor's context
// for the message communication with the remote server process
- // LCOV_EXCL_START :cnu
// Used in the main process side
virtual void StoreRequest(CUOFsIpcMessageTranslator &translator) {};
@@ -67,7 +66,6 @@ public:
// Used in the remote process side
virtual void LoadRequest(CUOFsIpcMessageTranslator &translator) {};
virtual void StoreReply(CUOFsIpcMessageTranslator &translator) {};
- // LCOV_EXCL_STOP
protected:
//-- Implementation of pure virtual
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/refresh/RuRefreshSQLComposer.cpp
----------------------------------------------------------------------
diff --git a/core/sql/refresh/RuRefreshSQLComposer.cpp b/core/sql/refresh/RuRefreshSQLComposer.cpp
index 23ed465..61629a9 100644
--- a/core/sql/refresh/RuRefreshSQLComposer.cpp
+++ b/core/sql/refresh/RuRefreshSQLComposer.cpp
@@ -66,9 +66,7 @@ void CRURefreshSQLComposer::StartInternalRefresh()
}
else
{
- // LCOV_EXCL_START :dpm
sql_ = "DISPLAY INTERNAL REFRESH ";
- // LCOV_EXCL_STOP
}
sql_ += GetRootMV().GetFullName();
@@ -293,7 +291,6 @@ void CRURefreshSQLComposer::AddPipeLineClause()
//
//
//--------------------------------------------------------------------------//
-// LCOV_EXCL_START :rfi
void CRURefreshSQLComposer::ComposeCntrlTableMDAMText(
CRUForceOptions::MdamOptions mdamOption,
const CDSString* pName)
@@ -326,7 +323,6 @@ void CRURefreshSQLComposer::ComposeCntrlTableMDAMText(
ASSERT(FALSE);
}
}
-// LCOV_EXCL_STOP
//--------------------------------------------------------------------------//
// CRURefreshSQLComposer::ComposeResetCntrlTableText()
@@ -337,7 +333,6 @@ void CRURefreshSQLComposer::ComposeCntrlTableMDAMText(
//
//
//--------------------------------------------------------------------------//
-// LCOV_EXCL_START :rfi
void CRURefreshSQLComposer::ComposeResetCntrlTableMDAMText(const CDSString* pName)
{
sql_ = "CONTROL TABLE ";
@@ -353,7 +348,6 @@ void CRURefreshSQLComposer::ComposeResetCntrlTableMDAMText(const CDSString* pNam
sql_ += " RESET; ";
}
-// LCOV_EXCL_STOP
//--------------------------------------------------------------------------//
// CRURefreshSQLComposer::GetContextLogName()
@@ -378,7 +372,6 @@ void CRURefreshSQLComposer::ComposeDeleteContextLogTable()
//
//
//--------------------------------------------------------------------------//
-// LCOV_EXCL_START :rfi
void CRURefreshSQLComposer::ComposeControlQueryShape()
{
RUASSERT(NULL != GetRootMV().GetMVForceOption());
@@ -389,7 +382,6 @@ void CRURefreshSQLComposer::ComposeControlQueryShape()
sql_ += ";";
}
-// LCOV_EXCL_STOP
//--------------------------------------------------------------------------//
// CRURefreshSQLComposer::ComposeQueryShape()
@@ -408,7 +400,6 @@ void CRURefreshSQLComposer::ComposeControlQueryShape()
// We allow the user to force the join between the MV and the GROUP BY
// block and the GROUP BY node above the DELTA CALCULATION sub-tree
//--------------------------------------------------------------------------//
-// LCOV_EXCL_START :rfi
void CRURefreshSQLComposer::ComposeQueryShape()
{
CDSString grbyStr,joinStr;
@@ -451,23 +442,19 @@ void CRURefreshSQLComposer::ComposeQueryShape()
sql_ += " JOIN( " + joinStr + grbyStr + ",CUT),CUT)";
}
-// LCOV_EXCL_STOP
//--------------------------------------------------------------------------//
// CRURefreshSQLComposer::ComposeControlQueryShapeCut()
//--------------------------------------------------------------------------//
-// LCOV_EXCL_START :rfi
void CRURefreshSQLComposer::ComposeControlQueryShapeCut()
{
sql_ = "CONTROL QUERY SHAPE CUT;";
}
-// LCOV_EXCL_STOP
//--------------------------------------------------------------------------//
// CRURefreshSQLComposer::ComposeControlQueryShapeCut()
//
//--------------------------------------------------------------------------//
-// LCOV_EXCL_START :rfi
void CRURefreshSQLComposer::ComposeShowExplain()
{
sql_ = "INSERT INTO ";
@@ -487,7 +474,6 @@ void CRURefreshSQLComposer::ComposeShowExplain()
sql_ += "SUBSTRING(DESCRIPTION,1,2024)";
sql_ += " FROM TABLE(EXPLAIN(NULL,'DESCRIPTOR_FOR_SQLSTMT'));";
}
-// LCOV_EXCL_STOP
/*
// This is the definition of the table in which the explain data is inserted
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/refresh/RuRefreshTaskExecutor.cpp
----------------------------------------------------------------------
diff --git a/core/sql/refresh/RuRefreshTaskExecutor.cpp b/core/sql/refresh/RuRefreshTaskExecutor.cpp
index 343d8d2..aca1c64 100644
--- a/core/sql/refresh/RuRefreshTaskExecutor.cpp
+++ b/core/sql/refresh/RuRefreshTaskExecutor.cpp
@@ -78,7 +78,6 @@ CRURefreshTaskExecutor::~CRURefreshTaskExecutor()
//--------------------------------------------------------------------------//
// CRURefreshTaskExecutor::StoreRequest()
//--------------------------------------------------------------------------//
-// LCOV_EXCL_START :cnu
void CRURefreshTaskExecutor::
StoreRequest(CUOFsIpcMessageTranslator &translator)
{
@@ -134,12 +133,10 @@ void CRURefreshTaskExecutor::
}
}
-// LCOV_EXCL_STOP
//--------------------------------------------------------------------------//
// CRURefreshTaskExecutor::StoreReply()
//--------------------------------------------------------------------------//
-// LCOV_EXCL_START :cnu
void CRURefreshTaskExecutor::
StoreReply(CUOFsIpcMessageTranslator &translator)
{
@@ -147,12 +144,10 @@ void CRURefreshTaskExecutor::
translator.WriteBlock(&isRecompute_,sizeof(BOOL));
}
-// LCOV_EXCL_STOP
//--------------------------------------------------------------------------//
// CRURefreshTaskExecutor::LoadRequest()
//--------------------------------------------------------------------------//
-// LCOV_EXCL_START :cnu
void CRURefreshTaskExecutor::
LoadRequest(CUOFsIpcMessageTranslator &translator)
{
@@ -212,12 +207,10 @@ void CRURefreshTaskExecutor::
tableLockProtocol_->LoadData(translator);
}
}
-// LCOV_EXCL_STOP
//--------------------------------------------------------------------------//
// CRURefreshTaskExecutor::LoadReply()
//--------------------------------------------------------------------------//
-// LCOV_EXCL_START :cnu
void CRURefreshTaskExecutor::
LoadReply(CUOFsIpcMessageTranslator &translator)
{
@@ -225,7 +218,6 @@ void CRURefreshTaskExecutor::
translator.ReadBlock(&isRecompute_,sizeof(BOOL));
}
-// LCOV_EXCL_STOP
//--------------------------------------------------------------------------//
// CRURefreshTaskExecutor::Init()
@@ -291,7 +283,6 @@ void CRURefreshTaskExecutor::ComposeForceStatements()
CRURefreshSQLComposer myComposer(GetRefreshTask());
// Deal with explain data
- // LCOV_EXCL_START :rfi
if (NULL != pForceOption &&
CRUForceOptions::EXPLAIN_ON == pForceOption->GetExplainOption())
{
@@ -299,7 +290,6 @@ void CRURefreshTaskExecutor::ComposeForceStatements()
myComposer.ComposeShowExplain();
pRefreshTEDynamicContainer_->SetStatementText(SHOW_EXPLAIN, myComposer.GetSQL());
}
- // LCOV_EXCL_STOP
ComposeCQSStatements();
@@ -324,7 +314,6 @@ void CRURefreshTaskExecutor::ComposeMDAMStatements()
ComposeControlTableStmtForUsedTables();
// MV base tables force options
- // LCOV_EXCL_START :rfi
if (NULL != pForceOption &&
CRUForceOptions::MDAM_NO_FORCE != pForceOption->GetMDAMoption())
{
@@ -343,7 +332,6 @@ void CRURefreshTaskExecutor::ComposeMDAMStatements()
myComposer.ComposeResetCntrlTableMDAMText();
pRefreshTEDynamicContainer_->SetStatementText(RESET_MDAM_STAT, myComposer.GetSQL());
}
- // LCOV_EXCL_STOP
}
//--------------------------------------------------------------------------//
@@ -365,7 +353,6 @@ void CRURefreshTaskExecutor::ComposeCQSStatements()
}
// MV force options
- // LCOV_EXCL_START :rfi
if ((CRUForceOptions::GB_NO_FORCE != pForceOption->GetGroupByoption() ||
CRUForceOptions::JOIN_NO_FORCE != pForceOption->GetJoinoption()))
{
@@ -390,7 +377,6 @@ void CRURefreshTaskExecutor::ComposeCQSStatements()
myComposer.ComposeControlQueryShapeCut();
pRefreshTEDynamicContainer_->SetStatementText(CQS_CUT_STAT, myComposer.GetSQL());
}
- // LCOV_EXCL_STOP
}
//--------------------------------------------------------------------------//
@@ -398,7 +384,6 @@ void CRURefreshTaskExecutor::ComposeCQSStatements()
//
// Compose the Control MDAM option for all base tables for forced tables
//--------------------------------------------------------------------------//
-// LCOV_EXCL_START :rfi
void CRURefreshTaskExecutor::ComposeControlTableStmtForUsedTables()
{
CRUMV &rootMV = GetRefreshTask()->GetRootMV();
@@ -430,7 +415,6 @@ void CRURefreshTaskExecutor::ComposeControlTableStmtForUsedTables()
ComposeControlTableStmtForUsedTable(*pTbl,stmtIndex,mdamOpt);
}
}
-// LCOV_EXCL_STOP
//--------------------------------------------------------------------------//
// CRURefreshTaskExecutor::ComposeControlTableStmtForUsedTables()
@@ -1039,7 +1023,6 @@ void CRURefreshTaskExecutor::ApplyIRCompilerDefaults()
return;
}
- // LCOV_EXCL_START :rfi
RUASSERT(NULL != pRefreshTEDynamicContainer_);
@@ -1091,7 +1074,6 @@ void CRURefreshTaskExecutor::ApplyIRCompilerDefaults()
#pragma warn(1506) // warning elimination
}
}
- // LCOV_EXCL_STOP
}
//--------------------------------------------------------------------------//
@@ -1137,7 +1119,6 @@ void CRURefreshTaskExecutor::SetAllowOfflineAccess()
void CRURefreshTaskExecutor::ResetIRCompilerDefaults()
{
- // LCOV_EXCL_START :rfi
if ((FORCE_CQS & forceFlags_) || (FORCE_USER_CQS & forceFlags_))
{
CDMPreparedStatement *pStat = pRefreshTEDynamicContainer_->
@@ -1154,7 +1135,6 @@ void CRURefreshTaskExecutor::ResetIRCompilerDefaults()
ExecuteStatement(*pStat,RESET_MDAM_STAT);
}
- // LCOV_EXCL_STOP
}
//--------------------------------------------------------------------------//
@@ -1314,7 +1294,6 @@ void CRUTableLockProtocol::Init(CRUTblList &tblList,
// CRUTableLockProtocol::StoreData()
//
//--------------------------------------------------------------------------//
-// LCOV_EXCL_START :cnu
void CRUTableLockProtocol::StoreData(CUOFsIpcMessageTranslator &translator)
{
// Store the NothingToLock_ flag
@@ -1336,13 +1315,11 @@ void CRUTableLockProtocol::StoreData(CUOFsIpcMessageTranslator &translator)
}
}
-// LCOV_EXCL_STOP
//--------------------------------------------------------------------------//
// CRUTableLockProtocol::LoadData()
//
//--------------------------------------------------------------------------//
-// LCOV_EXCL_START :cnu
void CRUTableLockProtocol::LoadData(CUOFsIpcMessageTranslator &translator)
{
// Load the NothingToLock_ flag
@@ -1366,7 +1343,6 @@ void CRUTableLockProtocol::LoadData(CUOFsIpcMessageTranslator &translator)
}
}
-// LCOV_EXCL_STOP
//--------------------------------------------------------------------------//
// CRUTableLockProtocol::IsEnsureUsedTableLockContinuityNeeded()
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/refresh/RuSQLStatementContainer.cpp
----------------------------------------------------------------------
diff --git a/core/sql/refresh/RuSQLStatementContainer.cpp b/core/sql/refresh/RuSQLStatementContainer.cpp
index cbd6058..e36abd5 100644
--- a/core/sql/refresh/RuSQLStatementContainer.cpp
+++ b/core/sql/refresh/RuSQLStatementContainer.cpp
@@ -47,7 +47,6 @@
//--------------------------------------------------------------------------//
// CRUSQLStatementContainer::StoreData()
//--------------------------------------------------------------------------//
-// LCOV_EXCL_START :cnu
void CRUSQLStatementContainer::
StoreData(CUOFsIpcMessageTranslator &translator)
{
@@ -62,12 +61,10 @@ StoreData(CUOFsIpcMessageTranslator &translator)
#pragma warn(1506) // warning elimination
}
}
-// LCOV_EXCL_STOP
//--------------------------------------------------------------------------//
// CRUSQLStatementContainer::LoadData()
//--------------------------------------------------------------------------//
-// LCOV_EXCL_START :cnu
void CRUSQLStatementContainer::
LoadData(CUOFsIpcMessageTranslator &translator)
{
@@ -84,29 +81,24 @@ void CRUSQLStatementContainer::
#pragma warn(1506) // warning elimination
}
}
-// LCOV_EXCL_STOP
//--------------------------------------------------------------------------//
// CRUSQLStatementContainer::Stmt::StoreData()
//--------------------------------------------------------------------------//
-// LCOV_EXCL_START :cnu
void CRUSQLStatementContainer::Stmt::
StoreData(CUOFsIpcMessageTranslator &translator)
{
translator.WriteBlock(&executionCounter_,sizeof(Lng32));
}
-// LCOV_EXCL_STOP
//--------------------------------------------------------------------------//
// CRUSQLStatementContainer::Stmt::LoadData()
//--------------------------------------------------------------------------//
-// LCOV_EXCL_START :cnu
void CRUSQLStatementContainer::Stmt::
LoadData(CUOFsIpcMessageTranslator &translator)
{
translator.ReadBlock(&executionCounter_,sizeof(Lng32));
}
-// LCOV_EXCL_STOP
//--------------------------------------------------------------------------//
// CRUSQLStatementContainer::Stmt::ExecuteQuery()
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/refresh/RuSimpleRefreshTaskExecutor.cpp
----------------------------------------------------------------------
diff --git a/core/sql/refresh/RuSimpleRefreshTaskExecutor.cpp b/core/sql/refresh/RuSimpleRefreshTaskExecutor.cpp
index 70f041c..f369ef6 100644
--- a/core/sql/refresh/RuSimpleRefreshTaskExecutor.cpp
+++ b/core/sql/refresh/RuSimpleRefreshTaskExecutor.cpp
@@ -60,7 +60,6 @@ CRUSimpleRefreshTaskExecutor(CRURefreshTask *pParentTask) :
//--------------------------------------------------------------------------//
// CRUSimpleRefreshTaskExecutor::StoreRequest()
//--------------------------------------------------------------------------//
-// LCOV_EXCL_START :cnu
void CRUSimpleRefreshTaskExecutor::
StoreRequest(CUOFsIpcMessageTranslator &translator)
{
@@ -72,12 +71,10 @@ void CRUSimpleRefreshTaskExecutor::
// Handle refresh executor sql dynamic container
simpleRefreshTEDynamicContainer_.StoreData(translator);
}
-// LCOV_EXCL_STOP
//--------------------------------------------------------------------------//
// CRUSimpleRefreshTaskExecutor::StoreReply()
//--------------------------------------------------------------------------//
-// LCOV_EXCL_START :cnu
void CRUSimpleRefreshTaskExecutor::
StoreReply(CUOFsIpcMessageTranslator &translator)
{
@@ -86,12 +83,10 @@ void CRUSimpleRefreshTaskExecutor::
// Handle numOfPhases_ data member
translator.WriteBlock(&numOfPhases_,sizeof(short));
}
-// LCOV_EXCL_STOP
//--------------------------------------------------------------------------//
// CRUSimpleRefreshTaskExecutor::LoadRequest()
//--------------------------------------------------------------------------//
-// LCOV_EXCL_START :cnu
void CRUSimpleRefreshTaskExecutor::
LoadRequest(CUOFsIpcMessageTranslator &translator)
{
@@ -103,12 +98,10 @@ void CRUSimpleRefreshTaskExecutor::
// Handle refresh executor sql dynamic container
simpleRefreshTEDynamicContainer_.LoadData(translator);
}
-// LCOV_EXCL_STOP
//--------------------------------------------------------------------------//
// CRUSimpleRefreshTaskExecutor::LoadReply()
//--------------------------------------------------------------------------//
-// LCOV_EXCL_START :cnu
void CRUSimpleRefreshTaskExecutor::
LoadReply(CUOFsIpcMessageTranslator &translator)
{
@@ -117,7 +110,6 @@ void CRUSimpleRefreshTaskExecutor::
// Handle numOfPhases_ data member
translator.ReadBlock(&numOfPhases_,sizeof(short));
}
-// LCOV_EXCL_STOP
//--------------------------------------------------------------------------//
// CRUSimpleRefreshTaskExecutor::Init()
@@ -197,7 +189,6 @@ void CRUSimpleRefreshTaskExecutor::ComposeMySql()
// (an MV with min/max on non insert only tables may require this method).
//
//--------------------------------------------------------------------------//
-// LCOV_EXCL_START :rfi
void CRUSimpleRefreshTaskExecutor::HandleSqlError(CDSException &ex,
Lng32 errorCode,
const char *errorArgument)
@@ -209,7 +200,6 @@ void CRUSimpleRefreshTaskExecutor::HandleSqlError(CDSException &ex,
inherited::HandleSqlError(ex,errorCode,errorArgument);
}
-// LCOV_EXCL_STOP
//--------------------------------------------------------------------------//
// CRUSimpleRefreshTaskExecutor::PrepareRecomputeMV()
@@ -392,7 +382,6 @@ BOOL CRUSimpleRefreshTaskExecutor::
pStat = simpleRefreshTEDynamicContainer_.
GetPreparedStatement(INTERNAL_REFRESH, FALSE);
}
- // LCOV_EXCL_START :rfi
catch (CDSException &ex)
{
if (ex.GetErrorCode(0) == MIN_MAX_RECOMPUTATION_NEEDED ||
@@ -408,7 +397,6 @@ BOOL CRUSimpleRefreshTaskExecutor::
GetLastSQL(INTERNAL_REFRESH));
throw ex; // Re-throw
}
- // LCOV_EXCL_STOP
if (TRUE == pStat->HasWarning() )
{
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/refresh/RuTableSyncTaskExecutor.h
----------------------------------------------------------------------
diff --git a/core/sql/refresh/RuTableSyncTaskExecutor.h b/core/sql/refresh/RuTableSyncTaskExecutor.h
index f609d50..ddde509 100644
--- a/core/sql/refresh/RuTableSyncTaskExecutor.h
+++ b/core/sql/refresh/RuTableSyncTaskExecutor.h
@@ -78,7 +78,6 @@ public:
public:
// These functions serialize/de-serialize the executor's context
// for the message communication with the remote server process
- // LCOV_EXCL_START :cnu
// Used in the main process side
virtual void StoreRequest(CUOFsIpcMessageTranslator &translator);
@@ -93,7 +92,6 @@ public:
{
inherited::StoreReply(translator);
}
- // LCOV_EXCL_STOP
public:
//-- Implementation of pure virtual functions
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/refresh/RuTask.cpp
----------------------------------------------------------------------
diff --git a/core/sql/refresh/RuTask.cpp b/core/sql/refresh/RuTask.cpp
index bbfc863..4fc5bf3 100644
--- a/core/sql/refresh/RuTask.cpp
+++ b/core/sql/refresh/RuTask.cpp
@@ -89,7 +89,6 @@ CRUTask::~CRUTask()
//
// Prints the "standard" task's dump
//--------------------------------------------------------------------------//
-// LCOV_EXCL_START :dpm
void CRUTask::Dump(CDSString &to)
{
char idStr[10];
@@ -115,7 +114,6 @@ void CRUTask::Dump(CDSString &to)
}
}
}
-// LCOV_EXCL_STOP
//--------------------------------------------------------------------------//
// CRUTask::DumpGraphNode()
@@ -125,7 +123,6 @@ void CRUTask::Dump(CDSString &to)
// Prints the task's node dump acceptable for the Dotty GUI
//--------------------------------------------------------------------------//
-// LCOV_EXCL_START :dpm
void CRUTask::DumpGraphNode(CDSString &to)
{
char fromChr[10];
@@ -178,7 +175,6 @@ void CRUTask::DumpGraphNode(CDSString &to)
}
to += "];\n";
}
-// LCOV_EXCL_STOP
//--------------------------------------------------------------------------//
// CRUTask::DumpGraphNode()
@@ -188,7 +184,6 @@ void CRUTask::DumpGraphNode(CDSString &to)
// Prints the task's edges dump acceptable for the Dotty GUI
//
//--------------------------------------------------------------------------//
-// LCOV_EXCL_START :dpm
void CRUTask::DumpGraphEdges(CDSString &to)
{
if (0 == pSuccList_->GetCount())
@@ -211,7 +206,6 @@ void CRUTask::DumpGraphEdges(CDSString &to)
}
}
#endif
-// LCOV_EXCL_STOP
//--------------------------------------------------------------------------//
// MUTATORS
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/refresh/RuTaskExecutor.cpp
----------------------------------------------------------------------
diff --git a/core/sql/refresh/RuTaskExecutor.cpp b/core/sql/refresh/RuTaskExecutor.cpp
index a47d6da..e039cc5 100644
--- a/core/sql/refresh/RuTaskExecutor.cpp
+++ b/core/sql/refresh/RuTaskExecutor.cpp
@@ -170,14 +170,12 @@ void CRUTaskExecutor::RollbackTransaction()
SetTransIdx(-1);
}
- // LCOV_EXCL_START :rfi
catch(...)
{
SetTransIdx(-1);
// If the system has already aborted the transaction
// by itself - do nothing
}
- // LCOV_EXCL_STOP
}
//--------------------------------------------------------------------------//
@@ -211,26 +209,22 @@ void CRUTaskExecutor::LeaveTransaction()
//--------------------------------------------------------------------------//
// CRUTaskExecutor::StoreData()
//--------------------------------------------------------------------------//
-// LCOV_EXCL_START :cnu
void CRUTaskExecutor::
StoreData(CUOFsIpcMessageTranslator &translator)
{
translator.WriteBlock(&state_,sizeof(Lng32));
translator.WriteBlock(&processId_,sizeof(Lng32));
}
-// LCOV_EXCL_STOP
//--------------------------------------------------------------------------//
// CRUTaskExecutor::LoadData()
//--------------------------------------------------------------------------//
-// LCOV_EXCL_START :cnu
void CRUTaskExecutor::
LoadData(CUOFsIpcMessageTranslator &translator)
{
translator.ReadBlock(&state_,sizeof(Lng32));
translator.ReadBlock(&processId_,sizeof(Lng32));
}
-// LCOV_EXCL_STOP
//--------------------------------------------------------------------------//
// CRUTaskExecutor::AllocateBuffer()
@@ -247,7 +241,6 @@ void CRUTaskExecutor::AllocateBuffer()
Lng32 bufsize = GetIpcBufferSize();
#ifdef _DEBUG
- // LCOV_EXCL_START :dpm
// Force here an artificially small buffer size for testing purposes
enum { MIN_BUFFER_SIZE = 50 };
@@ -260,7 +253,6 @@ void CRUTaskExecutor::AllocateBuffer()
{
bufsize = MIN_BUFFER_SIZE;
}
- // LCOV_EXCL_STOP
#endif
CreateBufferAndTranslator(bufsize);
@@ -378,7 +370,6 @@ ExecuteStatement(CDMPreparedStatement &stmt,
// error code and (optionally) a string argument.
//
//--------------------------------------------------------------------------//
-// LCOV_EXCL_START :rfi
void CRUTaskExecutor::HandleSqlError(CDSException &ex,
Lng32 errorCode,
const char *errorArgument)
@@ -392,7 +383,6 @@ void CRUTaskExecutor::HandleSqlError(CDSException &ex,
throw ex; // Re-throw
}
-// LCOV_EXCL_STOP
//--------------------------------------------------------------------------//
// CRUTaskExecutor::CreateBufferAndTranslator()
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/refresh/RuTaskExecutor.h
----------------------------------------------------------------------
diff --git a/core/sql/refresh/RuTaskExecutor.h b/core/sql/refresh/RuTaskExecutor.h
index bf2d227..a087b41 100644
--- a/core/sql/refresh/RuTaskExecutor.h
+++ b/core/sql/refresh/RuTaskExecutor.h
@@ -305,7 +305,6 @@ private:
Lng32 processId_;
};
-// LCOV_EXCL_START :cnu
void CRUTaskExecutor::StoreRequest(CUOFsIpcMessageTranslator &translator)
{
StoreData(translator);
@@ -326,6 +325,5 @@ void CRUTaskExecutor::StoreReply(CUOFsIpcMessageTranslator &translator)
{
StoreData(translator);
}
-// LCOV_EXCL_STOP
#endif
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/refresh/RuTaskServerExecControler.cpp
----------------------------------------------------------------------
diff --git a/core/sql/refresh/RuTaskServerExecControler.cpp b/core/sql/refresh/RuTaskServerExecControler.cpp
index 98fb89d..1bf898c 100644
--- a/core/sql/refresh/RuTaskServerExecControler.cpp
+++ b/core/sql/refresh/RuTaskServerExecControler.cpp
@@ -73,7 +73,6 @@ static void DisplayDebugBox(Int32 num)
#endif
// This class is not used at all.
-// LCOV_EXCL_START :cnu
//--------------------------------------------------------------------------//
// CRUTaskServerExecController constructors & destructors
@@ -433,4 +432,3 @@ void CRUTaskServerExecController::logError(CDSException &ex)
#endif
-// LCOV_EXCL_STOP
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/refresh/RuTbl.cpp
----------------------------------------------------------------------
diff --git a/core/sql/refresh/RuTbl.cpp b/core/sql/refresh/RuTbl.cpp
index 8ff9ac6..af056d0 100644
--- a/core/sql/refresh/RuTbl.cpp
+++ b/core/sql/refresh/RuTbl.cpp
@@ -272,7 +272,6 @@ BOOL CRUTbl::IsUsedOnlyByMultiTxnMvs() const
//------------------------------------------------------------------------//
// CRUTbl::Dump()
//------------------------------------------------------------------------//
-// LCOV_EXCL_START :dpb
void CRUTbl::Dump(CDSString &to, BOOL isExtended)
{
char statusStr[10];
@@ -301,7 +300,6 @@ void CRUTbl::Dump(CDSString &to, BOOL isExtended)
to += "\t" + (pMV->GetFullName()) + "\n";
}
}
-// LCOV_EXCL_STOP
#endif
//------------------------------------------------------------------------//
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/refresh/RuTestTaskExecutor.cpp
----------------------------------------------------------------------
diff --git a/core/sql/refresh/RuTestTaskExecutor.cpp b/core/sql/refresh/RuTestTaskExecutor.cpp
index a978209..010e1d7 100644
--- a/core/sql/refresh/RuTestTaskExecutor.cpp
+++ b/core/sql/refresh/RuTestTaskExecutor.cpp
@@ -43,7 +43,6 @@
#include "RuSQLComposer.h"
#include "uofsIpcMessageTranslator.h"
-// LCOV_EXCL_START :rfi
//--------------------------------------------------------------------------//
// CRUTestTaskExecutor::Work()
@@ -363,4 +362,3 @@ void CRUTestTaskExecutor::
translator.ReadBlock(&groupId_,sizeof(Int32));
}
-// LCOV_EXCL_STOP
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/refresh/RuTestTaskExecutor.h
----------------------------------------------------------------------
diff --git a/core/sql/refresh/RuTestTaskExecutor.h b/core/sql/refresh/RuTestTaskExecutor.h
index 8e79a0e..368b078 100644
--- a/core/sql/refresh/RuTestTaskExecutor.h
+++ b/core/sql/refresh/RuTestTaskExecutor.h
@@ -42,7 +42,6 @@
#include "RuTaskExecutor.h"
#include "RuSQLDynamicStatementContainer.h"
-// LCOV_EXCL_START :rfi
class REFRESH_LIB_CLASS CRUTestTaskExecutor : public CRUTaskExecutor
{
@@ -171,6 +170,5 @@ private:
CRUSQLDynamicStatementContainer errorDynamicSQLContainer_;
};
-// LCOV_EXCL_STOP
#endif
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/refresh/RuUnAuditRefreshTaskExecutor.h
----------------------------------------------------------------------
diff --git a/core/sql/refresh/RuUnAuditRefreshTaskExecutor.h b/core/sql/refresh/RuUnAuditRefreshTaskExecutor.h
index 02fe174..68d6d73 100644
--- a/core/sql/refresh/RuUnAuditRefreshTaskExecutor.h
+++ b/core/sql/refresh/RuUnAuditRefreshTaskExecutor.h
@@ -96,7 +96,6 @@ public:
public:
// These functions serialize/de-serialize the executor's context
// for the message communication with the remote server process
- // LCOV_EXCL_START :cnu
// Used at the main process side
virtual void StoreRequest(CUOFsIpcMessageTranslator &translator);
@@ -111,7 +110,6 @@ public:
{
inherited::StoreReply(translator);
}
- // LCOV_EXCL_STOP
//----------------------------------//
// Private Members
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/runtimestats/RtsStubs.cpp
----------------------------------------------------------------------
diff --git a/core/sql/runtimestats/RtsStubs.cpp b/core/sql/runtimestats/RtsStubs.cpp
index 143299e..e5e33e4 100644
--- a/core/sql/runtimestats/RtsStubs.cpp
+++ b/core/sql/runtimestats/RtsStubs.cpp
@@ -36,7 +36,6 @@
#include "ex_ex.h"
// Turn off code coverage collection for these stubs.
-// LCOV_EXCL_START
extern "C" {
void unpackObj__13UdrMessageObjFlT1iUlPCc() {
ex_assert(0, "Entering stub unpackObj__13UdrMessageObjFlT1iUlPCc");
@@ -686,7 +685,6 @@ void CmpAssertInternal(const char*, const char*, Int32) {
ex_assert(0, "Entering stub CmpAssertInternal(const char*, const char*, int)");
}
-// LCOV_EXCL_STOP
void NA_MM_FreeMemory_(char *startAddr, Int32 byteCount) {
// do nothing and do not assert here.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/runtimestats/sscpipc.cpp
----------------------------------------------------------------------
diff --git a/core/sql/runtimestats/sscpipc.cpp b/core/sql/runtimestats/sscpipc.cpp
index 7c678c5..16d5d60 100755
--- a/core/sql/runtimestats/sscpipc.cpp
+++ b/core/sql/runtimestats/sscpipc.cpp
@@ -107,12 +107,10 @@ SscpGlobals::SscpGlobals(NAHeap *sscpheap, StatsGlobals *statsGlobals)
doLogCancelKillServers_ = true;
}
-// LCOV_EXCL_START
SscpGlobals::~SscpGlobals()
{
sem_close((sem_t *)semId_);
}
-// LCOV_EXCL_STOP
void SscpGuaReceiveControlConnection::actOnSystemMessage(
short messageNum,
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/smdio/vers_libsmdio.cpp
----------------------------------------------------------------------
diff --git a/core/sql/smdio/vers_libsmdio.cpp b/core/sql/smdio/vers_libsmdio.cpp
index b547d0c..a813580 100644
--- a/core/sql/smdio/vers_libsmdio.cpp
+++ b/core/sql/smdio/vers_libsmdio.cpp
@@ -26,6 +26,4 @@
#define VERS_CV_MIN 0
#define VERS_CV_UPD 1
-// LCOV_EXCL_START
VERS_LIB(libsmdio)
-// LCOV_EXCL_STOP
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/sort/DiskPool_sq.h
----------------------------------------------------------------------
diff --git a/core/sql/sort/DiskPool_sq.h b/core/sql/sort/DiskPool_sq.h
index ce4cc73..588348c 100644
--- a/core/sql/sort/DiskPool_sq.h
+++ b/core/sql/sort/DiskPool_sq.h
@@ -49,7 +49,6 @@ public:
unsigned short threshold
);
-// LCOV_EXCL_START
#ifdef FORDEBUG
virtual NABoolean printDiskTable(){return TRUE;};
@@ -61,7 +60,6 @@ private:
virtual NABoolean refreshDisk(DiskDetails *diskPtr){ return TRUE;};
virtual NABoolean computeNumScratchFiles(DiskDetails *diskptr ){return TRUE;};
-// LCOV_EXCL_STOP
short factorImportanceTotalFreeSpace_;
short factorImportanceNumScrFiles_;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/sort/ScratchFileConnection.h
----------------------------------------------------------------------
diff --git a/core/sql/sort/ScratchFileConnection.h b/core/sql/sort/ScratchFileConnection.h
index d413f1f..9c74004 100644
--- a/core/sql/sort/ScratchFileConnection.h
+++ b/core/sql/sort/ScratchFileConnection.h
@@ -44,7 +44,6 @@ class ex_queue;
#include "ExScheduler.h"
class ScratchFile;
-// LCOV_EXCL_START
class ScratchFileConnection: public IpcConnection
{
public :
@@ -78,5 +77,4 @@ private:
NABoolean isWriteIO_; // Indicates if read or write IO
Int32 fileIndex_; //Corresponds to a perticular open on the scratch file among multiple opens.
};
-// LCOV_EXCL_STOP
#endif
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/sort/SortUtil.cpp
----------------------------------------------------------------------
diff --git a/core/sql/sort/SortUtil.cpp b/core/sql/sort/SortUtil.cpp
index 722c60b..97a7141 100644
--- a/core/sql/sort/SortUtil.cpp
+++ b/core/sql/sort/SortUtil.cpp
@@ -928,7 +928,6 @@ NABoolean SortUtil::consumeMemoryQuota(UInt32 bufferSizeBytes)
{
return FALSE;
}
-// LCOV_EXCL_START
//artificially increase the quota before pressure check.
//if pressure is detected, decrement the quota back.
config_->memoryQuotaMB_ += (short)memNeededMB;
@@ -951,7 +950,6 @@ NABoolean SortUtil::consumeMemoryQuota(UInt32 bufferSizeBytes)
config_->memoryQuotaMB_ -= (short)memNeededMB;
}
}
-// LCOV_EXCL_STOP
return FALSE;//memory grab failed or reached limit.
}
@@ -1051,7 +1049,6 @@ NABoolean SortUtil::withinMemoryLimitsAndPressure(Int64 reqMembytes)
size_t lastSegSize, freeSize, totalSize;
if((config_->heapAddr_)->getUsage(&lastSegSize, &freeSize, &totalSize)) {
-// LCOV_EXCL_START
if(config_->logInfoEvent())
{
char msg[500];
@@ -1062,16 +1059,13 @@ NABoolean SortUtil::withinMemoryLimitsAndPressure(Int64 reqMembytes)
SQLMXLoggingArea::logExecRtInfo(NULL, 0,msg, explainNodeId_);
}
return FALSE;
-// LCOV_EXCL_STOP
}
*/
if(!memMonitor_)
{
-// LCOV_EXCL_START
memMonitor_ =
config_->callingTcb_->getGlobals()->castToExExeStmtGlobals()->getMemoryMonitor();
ex_assert(memMonitor_ != NULL, "SortUtil::withinMemoryLimitsAndPressure, memMonitor_ is NULL");
-// LCOV_EXCL_STOP
}
@@ -1149,7 +1143,6 @@ if(!config_->getDisableCmpHintsOverflow())
//check extreme case first. Expected cannot be more than
//available quota.
if( E > config_->memoryQuotaMB_)
-// LCOV_EXCL_LINE
return FALSE;
#endif
@@ -1162,10 +1155,8 @@ if(!config_->getDisableCmpHintsOverflow())
//large delta memory requirement for sort, which in essence may trigger overflow.
if(C > E) //already
{
-// LCOV_EXCL_START
E = MAXOF( E, C *( 1 + estimateErrorPenalty));
config_->setSortMemEstInKBPerNode(E * 1024);
-// LCOV_EXCL_STOP
}
Float32 m = E - C; //delta memory required to avoid overflow.
@@ -1174,7 +1165,6 @@ if(!config_->getDisableCmpHintsOverflow())
//overflow.
if( m > ( Z * (M -U)))
{
-// LCOV_EXCL_START
if(config_->logInfoEvent())
{
char msg[500];
@@ -1185,7 +1175,6 @@ if(!config_->getDisableCmpHintsOverflow())
SQLMXLoggingArea::logExecRtInfo(NULL, 0,msg, explainNodeId_);
}
return FALSE;
-// LCOV_EXCL_STOP
}
}
else
@@ -1197,7 +1186,6 @@ if(!config_->getDisableCmpHintsOverflow())
if( m > ( Z * (M - U)))
{
-// LCOV_EXCL_START
if(config_->logInfoEvent())
{
char msg[500];
@@ -1208,14 +1196,12 @@ if(!config_->getDisableCmpHintsOverflow())
SQLMXLoggingArea::logExecRtInfo(NULL, 0,msg, explainNodeId_);
}
return FALSE;
-// LCOV_EXCL_STOP
}
}
}
if(memMonitor_->memoryPressure() > config_->pressureThreshold_)
{
-// LCOV_EXCL_START
if(config_->logInfoEvent())
{
char msg[500];
@@ -1226,7 +1212,6 @@ if(!config_->getDisableCmpHintsOverflow())
SQLMXLoggingArea::logExecRtInfo(NULL, 0,msg, explainNodeId_);
}
return FALSE;
-// LCOV_EXCL_STOP
}
//The following checks any threshold limits set by the user. This
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/sort/Statistics.cpp
----------------------------------------------------------------------
diff --git a/core/sql/sort/Statistics.cpp b/core/sql/sort/Statistics.cpp
index d429f24..b0e7a25 100644
--- a/core/sql/sort/Statistics.cpp
+++ b/core/sql/sort/Statistics.cpp
@@ -79,7 +79,6 @@ Lng32 SortStatistics::getStatNumRuns() const
}
-// LCOV_EXCL_START
Lng32 SortStatistics::getStatMemSizeB() const
{
@@ -173,7 +172,6 @@ Lng32 SortStatistics::getStatScrAwaitIo() const
return scrNumAwaitio_;
}
-// LCOV_EXCL_STOP
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/sort/TourTree.cpp
----------------------------------------------------------------------
diff --git a/core/sql/sort/TourTree.cpp b/core/sql/sort/TourTree.cpp
index 04e4674..6f284ad 100644
--- a/core/sql/sort/TourTree.cpp
+++ b/core/sql/sort/TourTree.cpp
@@ -418,7 +418,6 @@ Lng32 Tree::generateInterRuns()
}
// **********************UNUSED METHODS ********************************
-// LCOV_EXCL_START
Lng32 Tree::sortClientOutOfMem(void)
{
@@ -507,7 +506,6 @@ UInt32 Tree::getOverheadPerRecord(void)
return(2 * (sizeof(TreeNode) + sizeof(Record)));
}
-// LCOV_EXCL_STOP
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/sort/scratchfileconnection.cpp
----------------------------------------------------------------------
diff --git a/core/sql/sort/scratchfileconnection.cpp b/core/sql/sort/scratchfileconnection.cpp
index 99003c2..de9dfc6 100644
--- a/core/sql/sort/scratchfileconnection.cpp
+++ b/core/sql/sort/scratchfileconnection.cpp
@@ -45,7 +45,6 @@ $
#include "ScratchFileConnection.h"
#include "ex_ex.h"
-// LCOV_EXCL_START
ScratchFileConnection::ScratchFileConnection(Int32 index, ScratchFile *sf,
ExSubtask *eventHandler,
IpcEnvironment *env,
@@ -151,4 +150,3 @@ void ScratchFileConnection::populateDiagsArea(ComDiagsArea *&, CollHeap *)
ex_assert(0,"Should never call SqlTableConnection::populateDiagsArea()");
}
-// LCOV_EXCL_STOP
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/sort/vers_libsort.cpp
----------------------------------------------------------------------
diff --git a/core/sql/sort/vers_libsort.cpp b/core/sql/sort/vers_libsort.cpp
index 1c8a77e..1d3d8f0 100644
--- a/core/sql/sort/vers_libsort.cpp
+++ b/core/sql/sort/vers_libsort.cpp
@@ -26,6 +26,4 @@
#define VERS_CV_MIN 0
#define VERS_CV_UPD 1
-// LCOV_EXCL_START
VERS_LIB(libsort)
-// LCOV_EXCL_STOP
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/sqlcomp/CmpDescribe.cpp
----------------------------------------------------------------------
diff --git a/core/sql/sqlcomp/CmpDescribe.cpp b/core/sql/sqlcomp/CmpDescribe.cpp
index cccdf6c..f6d82cf 100644
--- a/core/sql/sqlcomp/CmpDescribe.cpp
+++ b/core/sql/sqlcomp/CmpDescribe.cpp
@@ -1096,7 +1096,6 @@ short CmpDescribe(const char *query, const RelExpr *queryExpr,
} // end of try block
- // LCOV_EXCL_START
// exception handling
catch(...)
{
@@ -1111,7 +1110,6 @@ short CmpDescribe(const char *query, const RelExpr *queryExpr,
}
rc = -1;
}
- // LCOV_EXCL_STOP
finally:
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/sqlcomp/CmpMain.cpp
----------------------------------------------------------------------
diff --git a/core/sql/sqlcomp/CmpMain.cpp b/core/sql/sqlcomp/CmpMain.cpp
index 64cf37b..b7b8851 100644
--- a/core/sql/sqlcomp/CmpMain.cpp
+++ b/core/sql/sqlcomp/CmpMain.cpp
@@ -269,7 +269,6 @@ void CmpMain::initGuiDisplay(RelExpr *queryExpr)
const char *txt,
RelExpr *queryExpr )
{
- // LCOV_EXCL_START
// for NSK only
if (( CmpCommon::getDefault(NSK_DBG) == DF_ON ) &&
( CmpCommon::getDefault(nadef) == DF_ON ))
@@ -278,7 +277,6 @@ void CmpMain::initGuiDisplay(RelExpr *queryExpr)
CURRCONTEXT_OPTDEBUG->showTree( queryExpr, NULL, " " );
CURRCONTEXT_OPTDEBUG->stream() << endl;
}
- // LCOV_EXCL_STOP
}
#ifdef NA_DEBUG_GUI
@@ -1813,7 +1811,7 @@ CmpMain::ReturnStatus CmpMain::compile(const char *input_str, //IN
if (useQueryCache != NOCACHE && CmpCommon::getDefault(NSK_DBG) == DF_ON) {
- useQueryCache = NOCACHE; // LCOV_EXCL_LINE
+ useQueryCache = NOCACHE;
}
// Every compile goes through here so we are guranteed that the
@@ -1958,7 +1956,6 @@ CmpMain::ReturnStatus CmpMain::compile(const char *input_str, //IN
}
#endif
- // LCOV_EXCL_START
// for NSK only
if ( CmpCommon::getDefault(NSK_DBG) == DF_ON )
{
@@ -1993,7 +1990,6 @@ CmpMain::ReturnStatus CmpMain::compile(const char *input_str, //IN
CURRCONTEXT_OPTDEBUG->stream() << endl << endl;
}
}
- // LCOV_EXCL_STOP
#ifdef NA_DEBUG
#ifdef NA_DEBUG_GUI
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/sqlcomp/CmpMain.h
----------------------------------------------------------------------
diff --git a/core/sql/sqlcomp/CmpMain.h b/core/sql/sqlcomp/CmpMain.h
index 52602cd..3e158e6 100644
--- a/core/sql/sqlcomp/CmpMain.h
+++ b/core/sql/sqlcomp/CmpMain.h
@@ -88,7 +88,7 @@ class QryStmtAttribute : public NABasicObject {
QryStmtAttribute(const QryStmtAttribute& s) : attr(s.attr), value(s.value) {}
// destructor
- virtual ~QryStmtAttribute() {} // LCOV_EXCL_LINE
+ virtual ~QryStmtAttribute() {}
// equality comparison used by CompilerEnv::isEqual
NABoolean isEqual(const QryStmtAttribute &o) const
@@ -112,7 +112,7 @@ class QryStmtAttributeSet : public NABasicObject {
QryStmtAttributeSet(const QryStmtAttributeSet& s);
// destructor frees all query statement attribute settings
- virtual ~QryStmtAttributeSet() {} // LCOV_EXCL_LINE
+ virtual ~QryStmtAttributeSet() {}
// add a query statement attribute to attrs
void addStmtAttribute(SQLATTR_TYPE a, ULng32 v);
@@ -156,7 +156,7 @@ public:
};
CmpMain();
- virtual ~CmpMain() {} // LCOV_EXCL_LINE
+ virtual ~CmpMain() {}
#ifdef NA_DEBUG_GUI
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/sqlcomp/DefaultValidator.cpp
----------------------------------------------------------------------
diff --git a/core/sql/sqlcomp/DefaultValidator.cpp b/core/sql/sqlcomp/DefaultValidator.cpp
index 70e1124..cd16e50 100644
--- a/core/sql/sqlcomp/DefaultValidator.cpp
+++ b/core/sql/sqlcomp/DefaultValidator.cpp
@@ -127,7 +127,6 @@ Int32 ValidateTraceStr::validate( const char *value,
return TRUE;
}
-// LCOV_EXCL_START :cnu
Int32 ValidateAnsiList::validate( const char *value,
const NADefaults *nad,
Int32 attrEnum,
@@ -220,7 +219,6 @@ Int32 ValidateRoleNameList::validate( const char *value,
return TRUE;
}
-// LCOV_EXCL_STOP
Int32 ValidatePOSTableSizes::validate(const char *value,
const NADefaults *nad,
@@ -477,7 +475,6 @@ Int32 ValidateCollationList::validate(const char *value,
// Set collStr to be the fragment up to (excluding) the semicolon or zero;
// set collList to be the rest of itself (after the semicolon).
//
-// LCOV_EXCL_START :mp
char *s = collList;
for (NABoolean quoted = FALSE; *s; s++) {
if (*s == '"')
@@ -546,7 +543,6 @@ Int32 ValidateCollationList::validate(const char *value,
<< DgString0(collStr)
<< DgString1(nad->lookupAttrName(attrEnum, errOrWarn));
-// LCOV_EXCL_STOP
} // !collStr.isNull()
} // while
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/sqlcomp/NADefaults.h
----------------------------------------------------------------------
diff --git a/core/sql/sqlcomp/NADefaults.h b/core/sql/sqlcomp/NADefaults.h
index 032c91c..f71c23c 100644
--- a/core/sql/sqlcomp/NADefaults.h
+++ b/core/sql/sqlcomp/NADefaults.h
@@ -256,13 +256,11 @@ public:
Int32 errOrWarn = -1,
NABoolean overwrite = TRUE,
NABoolean alreadyCanonical = FALSE);
- // LCOV_EXCL_START
// code not used
NABoolean setCatalogTrustedFast(NAString &value)
{ return setCatalog(value, -1, TRUE, TRUE); }
NABoolean setSchemaTrustedFast (NAString &value)
{ return setSchema(value, -1, TRUE, TRUE); }
- // LCOV_EXCL_STOP
void getCatalogAndSchema (NAString &cat, NAString &sch);
void setState (Provenance s) { currentState_ = s; }
@@ -290,7 +288,6 @@ public:
const char* &value,
NABoolean userDefaultsOnly);
- // LCOV_EXCL_START
void readFromFlatFile (const char *fname,
Provenance overwriteIf = SET_BY_CQD,
Int32 errOrWarn = +1/*warning*/)
@@ -298,7 +295,6 @@ public:
spName.prepend(" "); // space signals FLAT FILE not SQL TABLE
readFromSQLTable(spName, overwriteIf, errOrWarn);
}
- // LCOV_EXCL_STOP
void readFromSQLTables(Provenance overwriteIfNotYet = SET_BY_CQD,
Int32 errOrWarn = +1/*warning*/);
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/sqlcomp/NewDel.cpp
----------------------------------------------------------------------
diff --git a/core/sql/sqlcomp/NewDel.cpp b/core/sql/sqlcomp/NewDel.cpp
index 0113286..19d58c8 100644
--- a/core/sql/sqlcomp/NewDel.cpp
+++ b/core/sql/sqlcomp/NewDel.cpp
@@ -162,10 +162,8 @@ PNH CmpSetNewHandler(PNH handler)
return old;
}
-// LCOV_EXCL_START
// Code not used
PNH CmpGetNewHandler()
{
return globalCmpNewHandler;
}
-// LCOV_EXCL_STOP
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/sqlcomp/QCache.cpp
----------------------------------------------------------------------
diff --git a/core/sql/sqlcomp/QCache.cpp b/core/sql/sqlcomp/QCache.cpp
index fd96627..21af778 100644
--- a/core/sql/sqlcomp/QCache.cpp
+++ b/core/sql/sqlcomp/QCache.cpp
@@ -1989,7 +1989,6 @@ ULng32 QCache::getSizeOfPostParserEntry(KeyDataPair& entry)
+ sizeof(CacheEntry) + CacheHashTbl::getBucketEntrySize();
}
-// LCOV_EXCL_START
// this routine is used for debugging qcache bugs only
void QCache::sanityCheck(Int32 mark)
{
@@ -2000,7 +1999,6 @@ void QCache::sanityCheck(Int32 mark)
getSizeOfPostParserEntry(entry);
}
}
-// LCOV_EXCL_STOP
// return TRUE iff cache can accommodate a new entry of this size
NABoolean QCache::canFit(ULng32 size)
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/sqlcomp/nadefaults.cpp
----------------------------------------------------------------------
diff --git a/core/sql/sqlcomp/nadefaults.cpp b/core/sql/sqlcomp/nadefaults.cpp
index 382d430..dba86b6 100644
--- a/core/sql/sqlcomp/nadefaults.cpp
+++ b/core/sql/sqlcomp/nadefaults.cpp
@@ -3942,7 +3942,6 @@ void NADefaults::initCurrentDefaultsWithDefaultDefaults()
return;
}
- // LCOV_EXCL_START
// for debugging only
#ifndef NDEBUG
if (nadval) { // additional sanity checking we want to do occasionally
@@ -4008,7 +4007,6 @@ void NADefaults::initCurrentDefaultsWithDefaultDefaults()
}
} // if env-var
#endif // NDEBUG
- // LCOV_EXCL_STOP
} // for i
@@ -5048,7 +5046,6 @@ NABoolean NADefaults::domainMatch(Int32 attrEnum,
// and calling getAsULong, instead of using 'long' fields to retrieve
// unsigned(DDui*) attr values via getAsLong ...
//
- // LCOV_EXCL_START
// if we get here the compiler will crash
if (flt) {
DefaultValidator *validator = NULL;
@@ -5077,7 +5074,6 @@ NABoolean NADefaults::domainMatch(Int32 attrEnum,
DefaultValidatorType(expectedType))
<< " " << (flt ? *flt : 123.45) << endl;
#endif
- // LCOV_EXCL_STOP
return FALSE;
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/sqlcomp/vers_libsqlcomp.cpp
----------------------------------------------------------------------
diff --git a/core/sql/sqlcomp/vers_libsqlcomp.cpp b/core/sql/sqlcomp/vers_libsqlcomp.cpp
index 892c538..5501028 100644
--- a/core/sql/sqlcomp/vers_libsqlcomp.cpp
+++ b/core/sql/sqlcomp/vers_libsqlcomp.cpp
@@ -26,6 +26,4 @@
#define VERS_CV_MIN 0
#define VERS_CV_UPD 1
-// LCOV_EXCL_START
VERS_LIB(libsqlcomp)
-// LCOV_EXCL_STOP
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/sqlmxevents/logmxevent_sq.cpp
----------------------------------------------------------------------
diff --git a/core/sql/sqlmxevents/logmxevent_sq.cpp b/core/sql/sqlmxevents/logmxevent_sq.cpp
index a1ab58b..1e0d57d 100644
--- a/core/sql/sqlmxevents/logmxevent_sq.cpp
+++ b/core/sql/sqlmxevents/logmxevent_sq.cpp
@@ -252,12 +252,10 @@ void SQLMXLoggingArea::resetSqlText()
sql_error_event.set_string3(String3);
if (String4)
sql_error_event.set_string4(String4);
- //LCOV_EXCL_START - unused members of diags are
if (serverName)
sql_error_event.set_server_name(serverName);
if (connectionName)
sql_error_event.set_connection_name(connectionName);
- //LCOV_EXCL_STOP
if (constraintCatalog)
sql_error_event.set_constraint_catalog(constraintCatalog);
if (constraintSchema)
@@ -930,10 +928,6 @@ void SQLMXLoggingArea::logSortDiskInfo(char *diskname, short percentfree, short
//** use event id SQEV_SQL_SRT_INFO **
}
-//LCOV_EXCL_START
-// ss_cc_changes: these are stubs that need to be removed by components.
-// Excluding these from code coverage
-
static void check_assert_bug_catcher()
{
@@ -1176,4 +1170,3 @@ void SQLMXLoggingArea::logPMAudDoneEvent(ULng32 eventId,
}
#endif // #if 0
-// LCOV_EXCL_STOP
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/udrserv/UdrAbortCallBack.cpp
----------------------------------------------------------------------
diff --git a/core/sql/udrserv/UdrAbortCallBack.cpp b/core/sql/udrserv/UdrAbortCallBack.cpp
index 6abfdef..45a5805 100644
--- a/core/sql/udrserv/UdrAbortCallBack.cpp
+++ b/core/sql/udrserv/UdrAbortCallBack.cpp
@@ -39,7 +39,6 @@
#include "UdrFFDC.h"
#include "string.h"
-// LCOV_EXCL_START
void UdrAbortCallBack::doCallBack(const char *msg, const char *file, UInt32 line){
#define TEXT_SIZE 1024
char extMsg[TEXT_SIZE];
@@ -47,4 +46,3 @@ void UdrAbortCallBack::doCallBack(const char *msg, const char *file, UInt32 line
strncat(extMsg, msg, sizeof(extMsg)-strlen(extMsg));
makeTFDSCall(extMsg,(char *)file,line);
}
-// LCOV_EXCL_STOP
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/udrserv/UdrDebug.cpp
----------------------------------------------------------------------
diff --git a/core/sql/udrserv/UdrDebug.cpp b/core/sql/udrserv/UdrDebug.cpp
index 089fd76..5ee4e8e 100644
--- a/core/sql/udrserv/UdrDebug.cpp
+++ b/core/sql/udrserv/UdrDebug.cpp
@@ -64,7 +64,6 @@ NABoolean doUdrDebug(){
return doUdrDebugFlag;
}
-// LCOV_EXCL_START
void udrDebug(const char *formatString, ...)
{
if (doUdrDebug())
@@ -77,7 +76,6 @@ void udrDebug(const char *formatString, ...)
fflush(udrDebugFile);
}
}
-// LCOV_EXCL_STOP
#endif // UDR_DEBUG
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/udrserv/UdrFFDC.cpp
----------------------------------------------------------------------
diff --git a/core/sql/udrserv/UdrFFDC.cpp b/core/sql/udrserv/UdrFFDC.cpp
index afe3a53..2ffbd99 100644
--- a/core/sql/udrserv/UdrFFDC.cpp
+++ b/core/sql/udrserv/UdrFFDC.cpp
@@ -343,7 +343,6 @@ void setUdrSignalHandlers()
}
}
-// LCOV_EXCL_START
void printSignalHandlers()
{
struct sigaction oldAction;
@@ -365,7 +364,6 @@ void printSignalHandlers()
}
}
}
-// LCOV_EXCL_STOP
// Saves the UDR trap signal handlers
NABoolean saveUdrTrapSignalHandlers()
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/udrserv/UdrImplLmExtFunc.cpp
----------------------------------------------------------------------
diff --git a/core/sql/udrserv/UdrImplLmExtFunc.cpp b/core/sql/udrserv/UdrImplLmExtFunc.cpp
index b76d63e..e0eb33e 100644
--- a/core/sql/udrserv/UdrImplLmExtFunc.cpp
+++ b/core/sql/udrserv/UdrImplLmExtFunc.cpp
@@ -45,12 +45,10 @@ void lmMakeTFDSCall(const char *msg, const char *file, UInt32 line)
}
-// LCOV_EXCL_START
void lmPrintSignalHandlers()
{
printSignalHandlers();
}
-// LCOV_EXCL_STOP
NABoolean lmSetSignalHandlersToDefault()
{
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/udrserv/UdrRSProcess.cpp
----------------------------------------------------------------------
diff --git a/core/sql/udrserv/UdrRSProcess.cpp b/core/sql/udrserv/UdrRSProcess.cpp
index 11df6f6..1071120 100644
--- a/core/sql/udrserv/UdrRSProcess.cpp
+++ b/core/sql/udrserv/UdrRSProcess.cpp
@@ -50,7 +50,6 @@ void processAnRSLoadMessage(UdrGlobals *udrGlob,
ComDiagsArea *diags = ComDiagsArea::allocate(udrGlob->getIpcHeap());
-// LCOV_EXCL_START
doMessageBox(udrGlob, TRACE_SHOW_DIALOGS,
udrGlob->showRSLoad_, moduleName);
@@ -62,7 +61,6 @@ void processAnRSLoadMessage(UdrGlobals *udrGlob,
{
ServerDebug("[UdrServ (%s)] Receive RS Load Request", moduleName);
}
-// LCOV_EXCL_STOP
// process RS Load request
SPInfo *sp = udrGlob->getSPList()->spFind(request.getHandle());
@@ -160,7 +158,6 @@ void processAnRSFetchOrContinueMessage(UdrGlobals *udrGlob,
{
const char* moduleName = "processAnRSFetchOrContinueMessage";
-// LCOV_EXCL_START
// This method should only be called for RS invoke or RS continue
// message types.
NABoolean show = FALSE;
@@ -182,7 +179,6 @@ void processAnRSFetchOrContinueMessage(UdrGlobals *udrGlob,
if (doTrace)
ServerDebug("[UdrServ (%s)] Receive RS Invoke or Continue Request",
moduleName);
-// LCOV_EXCL_STOP
// Free up any receive buffers no longer in use
msgStream.cleanupBuffers();
@@ -415,7 +411,6 @@ void processAnRSCloseMessage(UdrGlobals *udrGlob,
ComDiagsArea *diags = ComDiagsArea::allocate(udrGlob->getIpcHeap());
UDR_ASSERT(diags, "Unable to allocate memory for SQL diagnostics area");
-// LCOV_EXCL_START
doMessageBox(udrGlob, TRACE_SHOW_DIALOGS,
udrGlob->showRSClose_, moduleName);
@@ -426,7 +421,6 @@ void processAnRSCloseMessage(UdrGlobals *udrGlob,
{
ServerDebug("[UdrServ (%s)] Receive RS Close Request", moduleName);
}
-// LCOV_EXCL_STOP
// Find the SPInfo instance for this request
SPInfo *sp = udrGlob->getSPList()->spFind(request.getHandle());
@@ -516,7 +510,6 @@ void processAnRSUnloadMessage(UdrGlobals *udrGlob,
{
const char* moduleName = "processAnRSUnloadMessage";
-// LCOV_EXCL_START
doMessageBox(udrGlob, TRACE_SHOW_DIALOGS,
udrGlob->showRSUnload_, moduleName);
@@ -526,7 +519,6 @@ void processAnRSUnloadMessage(UdrGlobals *udrGlob,
{
ServerDebug("[UdrServ (%s)] Receive RS Unload Request", moduleName);
}
-// LCOV_EXCL_STOP
// Find the SPInfo instance for this request
SPInfo *sp = udrGlob->getSPList()->spFind(request.getHandle());
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/udrserv/UdrResultSet.cpp
----------------------------------------------------------------------
diff --git a/core/sql/udrserv/UdrResultSet.cpp b/core/sql/udrserv/UdrResultSet.cpp
index fdefad5..2c3388c 100644
--- a/core/sql/udrserv/UdrResultSet.cpp
+++ b/core/sql/udrserv/UdrResultSet.cpp
@@ -65,7 +65,6 @@ extern NABoolean allocateEODRow(UdrGlobals *UdrGlob,
SqlBuffer &replyBuffer,
queue_index parentIndex);
-// LCOV_EXCL_START
// Utility method to deallocate descriptor items created in
// UdrResultSet::generateProxySyntax()
static void
@@ -89,7 +88,6 @@ deleteDescItems(ComUInt32 numCols, SQLDESC_ITEM *desc_items, NAMemory *heapPtr)
return;
}
-// LCOV_EXCL_STOP
//////////////////////////////////////////////////////////////////////////////
//
@@ -159,7 +157,6 @@ char *TmpBuffer::getNextRow(ComDiagsArea* &rowDiags,
// If errors occur, parameter 'd' will be populated with errors. Callers
// need to check for diagnostics
// This constructor is used on Windows Platform
-// LCOV_EXCL_START
UdrResultSet::UdrResultSet(SPInfo *spInfo, SQLSTMT_ID *stmt, ComDiagsArea &d)
: spInfo_(spInfo),
state_(RS_INITIATED),
@@ -192,7 +189,6 @@ UdrResultSet::UdrResultSet(SPInfo *spInfo, SQLSTMT_ID *stmt, ComDiagsArea &d)
UDR_DEBUG1(" Proxy syntax \"%s\"",
(proxySyntax_ ? proxySyntax_->data() : ""));
}
-// LCOV_EXCL_STOP
// If errors occur, parameter 'd' will be populated with errors. Callers
// need to check for diagnostics
@@ -323,7 +319,6 @@ UdrResultSet::deallocateExeGeneratedFields()
} // UdrResultSet::deallocateExeGeneratedFields
-// LCOV_EXCL_START
const char *
UdrResultSet::stateString()
{
@@ -340,7 +335,6 @@ UdrResultSet::stateString()
default: return ComRtGetUnknownString((Int32) state_);
}
}
-// LCOV_EXCL_STOP
// Reinitiliazes the UdrResultSet object with the new LmResultSet object.
// If lmRS param is NULL, the stmt_id param is used for initialization.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/udrserv/spinfo.cpp
----------------------------------------------------------------------
diff --git a/core/sql/udrserv/spinfo.cpp b/core/sql/udrserv/spinfo.cpp
index cdfa6de..224592e 100644
--- a/core/sql/udrserv/spinfo.cpp
+++ b/core/sql/udrserv/spinfo.cpp
@@ -607,7 +607,6 @@ void SPInfo::resetLastCallTs()
numResultSets_ = 0;
}
-// LCOV_EXCL_START
// displaySPInfo - Used when tracing objects
void SPInfo::displaySPInfo(Lng32 indent)
{
@@ -763,7 +762,6 @@ void SPInfo::displaySPInfoId(Lng32 indent)
ServerDebug("%sObject ID : " INT64_SPEC , ind, udrHandle_ );
} // SPInfo::displaySPInfoId
-// LCOV_EXCL_STOP
// createUniqueIdentifier
Int64 SPInfo::createUniqueIdentifier()
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/udrserv/spinfoCallback.cpp
----------------------------------------------------------------------
diff --git a/core/sql/udrserv/spinfoCallback.cpp b/core/sql/udrserv/spinfoCallback.cpp
index c733255..a8e42e8 100644
--- a/core/sql/udrserv/spinfoCallback.cpp
+++ b/core/sql/udrserv/spinfoCallback.cpp
@@ -131,10 +131,8 @@ void SpInfoGetNextRow(char *rowData,
SPInfo *sp = udrGlobals->getCurrSP();
if(!sp)
{
-// LCOV_EXCL_START
*queue_state = SQLUDR_Q_CANCEL;
return;
-// LCOV_EXCL_STOP
}
// Access SQL buffer that corresponds to table index
@@ -245,7 +243,6 @@ Int32 sendEmitWaitedReply(UdrGlobals *udrGlobals,
const char *moduleName = "sendEmitWaitedReply";
NABoolean traceInvokeDataAreas = false;
-// LCOV_EXCL_START
if (udrGlobals->verbose_ && udrGlobals->showInvoke_ &&
udrGlobals->traceLevel_ >= TRACE_DATA_AREAS)
traceInvokeDataAreas = true;
@@ -257,7 +254,6 @@ Int32 sendEmitWaitedReply(UdrGlobals *udrGlobals,
displaySqlBuffer(emitSqlBuffer, sp->getReplyBufferSize());
}
-// LCOV_EXCL_STOP
//get datastream
UdrServerDataStream *dataStream = sp->getDataStream();
@@ -339,12 +335,10 @@ Int32 SpInfoEmitRow (char *rowData,
// UDR is used.
SPInfo *sp = udrGlobals->getCurrSP();
if(!sp)
-// LCOV_EXCL_START
{
*queue_state = SQLUDR_Q_CANCEL;
return SQLUDR_ERROR;
}
-// LCOV_EXCL_STOP
// Access emit SQL buffer that corresponds to table index
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/udrserv/udrglobals.cpp
----------------------------------------------------------------------
diff --git a/core/sql/udrserv/udrglobals.cpp b/core/sql/udrserv/udrglobals.cpp
index 89f5689..991899c 100644
--- a/core/sql/udrserv/udrglobals.cpp
+++ b/core/sql/udrserv/udrglobals.cpp
@@ -189,7 +189,6 @@ UdrGlobals::UdrGlobals(NAHeap *udrheap, NAHeap *ipcheap)
UDR_DEBUG1("Session User : %s", sessionUserName_);
}
-// LCOV_EXCL_START
// we don't have any way of invoking these at this point.
// we should provide a way for procedure bodies to set a java property
// that the language manager can use to check to determine if it should
@@ -261,7 +260,6 @@ void UdrGlobals::displayStats(ostream& out, Lng32 indent)
ServerDebug("%sNum Total RSets : " INT64_SPEC , ind, numTotalRSets_ );
ServerDebug("%sNum Curr RSets : " INT64_SPEC , ind, numCurrRSets_ );
}
-// LCOV_EXCL_STOP
LmLanguageManager *UdrGlobals::getLM(ComRoutineLanguage language) const
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/udrserv/udrload.cpp
----------------------------------------------------------------------
diff --git a/core/sql/udrserv/udrload.cpp b/core/sql/udrserv/udrload.cpp
index 09194db..fc9dc49 100644
--- a/core/sql/udrserv/udrload.cpp
+++ b/core/sql/udrserv/udrload.cpp
@@ -585,7 +585,6 @@ SPInfo *processLoadParameters(UdrGlobals *UdrGlob,
return sp;
} // processLoadParameters
-// LCOV_EXCL_START
void displayLoadParameters(UdrLoadMsg &request)
{
ServerDebug("");
@@ -713,7 +712,6 @@ void displayLoadParameters(UdrLoadMsg &request)
ServerDebug("");
} // displayLoadParameters
-// LCOV_EXCL_STOP
void reportLoadResults(UdrGlobals *UdrGlob, SPInfo *sp, LmRoutine *lmr_)
{
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/udrserv/udrserv.cpp
----------------------------------------------------------------------
diff --git a/core/sql/udrserv/udrserv.cpp b/core/sql/udrserv/udrserv.cpp
index 3bc69ed..a118b1c 100644
--- a/core/sql/udrserv/udrserv.cpp
+++ b/core/sql/udrserv/udrserv.cpp
@@ -168,13 +168,11 @@ static Int32 invokeUdrMethod(const char *method,
Int32 nTimesToInvoke,
UdrGlobals &glob);
-// LCOV_EXCL_START
// Dead Code
// These methods are not used, and the interface has not been tested for a long time.
// We might want to retire them
static Int32 processCommandsFromFile(const char *filename, UdrGlobals &glob);
static Int32 processSingleCommandFromFile(FILE *f, UdrGlobals &glob);
-// LCOV_EXCL_STOP
static NAString initErrText("");
/*************************************************************************
@@ -1077,7 +1075,6 @@ void sendDataReply(UdrGlobals *UdrGlob,
} // sendDataReply()
-// LCOV_EXCL_START
static void displayUsageInfo()
{
fprintf(stdout, "Usage:\n");
@@ -1115,7 +1112,6 @@ static void displayUsageInfo()
fprintf(stdout, "\n");
}
-// LCOV_EXCL_STOP
NABoolean processCmdLine(UdrGlobals *UdrGlob, Int32 argc, char **argv)
{
@@ -1149,7 +1145,6 @@ NABoolean processCmdLine(UdrGlobals *UdrGlob, Int32 argc, char **argv)
UdrGlob->logFileProvided_ = FALSE;
-// LCOV_EXCL_START
// NSK or Linux can use environment variables...
if (const char *logFileName = getenv("UDRSERV_TRACE_FILENAME"))
{
@@ -1196,7 +1191,6 @@ NABoolean processCmdLine(UdrGlobals *UdrGlob, Int32 argc, char **argv)
if (UdrGlob->showUnload_)
ServerDebug(" Trace Unload Module Active");
-// LCOV_EXCL_STOP
//
// Now we parse command-line arguments. We support the following
@@ -1364,7 +1358,6 @@ NABoolean processCmdLine(UdrGlobals *UdrGlob, Int32 argc, char **argv)
// See if the user wants us to obey commands from a text file
else if (!stricmp(argv[i], "-obey"))
{
- // LCOV_EXCL_START
// Dead Code
// obey option is not tested, and Andy thinks it should be obsoleted.
UdrGlob->setCommandLineMode(TRUE);
@@ -1387,7 +1380,6 @@ NABoolean processCmdLine(UdrGlobals *UdrGlob, Int32 argc, char **argv)
Int32 result = processCommandsFromFile(argv[i], *UdrGlob);
exit(result);
- // LCOV_EXCL_STOP
} // -obey
} // for each arg in argv
@@ -2205,7 +2197,6 @@ static Int32 invokeUdrMethod(const char *method,
} // invokeUdrMethod()
-// LCOV_EXCL_START
// Dead Code
// Andy thinks we should retire this interface...
@@ -2458,7 +2449,6 @@ void udrAbort(const char *f, Int32 l, const char *m)
makeTFDSCall(m, f, l, FALSE);
// should not reach here
}
-// LCOV_EXCL_STOP
// Stubs
#ifdef UDR_OSS_RELEASE
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/udrserv/udrunload.cpp
----------------------------------------------------------------------
diff --git a/core/sql/udrserv/udrunload.cpp b/core/sql/udrserv/udrunload.cpp
index bfc2e01..fd982f1 100644
--- a/core/sql/udrserv/udrunload.cpp
+++ b/core/sql/udrserv/udrunload.cpp
@@ -79,7 +79,6 @@ void processAnUnLoadMessage(UdrGlobals *UdrGlob,
if (sp == NULL)
{
-// LCOV_EXCL_START
//
// No SPInfo exists for this UDR handle. Could be because the
// handle is invalid or because this is an out-of-sequence UNLOAD
@@ -105,7 +104,6 @@ void processAnUnLoadMessage(UdrGlobals *UdrGlob,
*diags << DgString0("Unload Message");
}
} // if (sp == NULL)
-// LCOV_EXCL_STOP
if (sp)
{
@@ -132,7 +130,6 @@ void processAnUnLoadMessage(UdrGlobals *UdrGlob,
sp = NULL;
if (error != 0)
-// LCOV_EXCL_START
{
sprintf(errorText,
"(%.30s) UDR Unload Error: %d",
@@ -143,7 +140,6 @@ void processAnUnLoadMessage(UdrGlobals *UdrGlob,
UdrGlob->showLoad_,
errorText);
}
-// LCOV_EXCL_STOP
}
//
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/udrserv/udrutil.cpp
----------------------------------------------------------------------
diff --git a/core/sql/udrserv/udrutil.cpp b/core/sql/udrserv/udrutil.cpp
index e2262b3..69e392c 100644
--- a/core/sql/udrserv/udrutil.cpp
+++ b/core/sql/udrserv/udrutil.cpp
@@ -53,7 +53,6 @@ FILE *UdrTraceFile = stdout;
#define TF_STRING(x) ( (x) ? ("TRUE") : ("FALSE") )
-// LCOV_EXCL_START
void displaySqlBuffer(SqlBuffer *sbuf, Lng32 sbuflen, ostream &os)
{
os << "Display an SQL Buffer:" << endl;
@@ -618,7 +617,6 @@ void doMessageBox(UdrGlobals *UdrGlob, Int32 trLevel,
UdrGlob->serverName_, MB_OK|MB_ICONINFORMATION);
}
}
-// LCOV_EXCL_STOP
#ifdef _DEBUG
void sleepIfPropertySet(LmLanguageManager &lm,
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/ustat/hs_cli.cpp
----------------------------------------------------------------------
diff --git a/core/sql/ustat/hs_cli.cpp b/core/sql/ustat/hs_cli.cpp
index 8e207e9..bc0e8e6 100644
--- a/core/sql/ustat/hs_cli.cpp
+++ b/core/sql/ustat/hs_cli.cpp
@@ -655,7 +655,6 @@ Lng32 HSSample::create(NAString& tblName, NABoolean unpartitioned, NABoolean isP
FALSE,
STMTHEAP);
}
- // LCOV_EXCL_START :nsk
else
{
ComMPLoc tempObj(tblName, ComMPLoc::FILE);
@@ -713,7 +712,6 @@ Lng32 HSSample::create(NAString& tblName, NABoolean unpartitioned, NABoolean isP
//entry-sequence tables, have a 2G limit
ddl += HS_EXTENT_SIZE_MP_FMT1;
}
- // LCOV_EXCL_STOP
HSSqTableDef sampleDef(*sampleName, tableType);
@@ -2784,23 +2782,19 @@ Lng32 HSCursor::prepareRowsetInternal
}
while (col = col->next);
}
- // LCOV_EXCL_START :rfi
else
{
LM->Log("***[ERROR] prepareRowset: GROUP PTR IS NULL\n");
return -1;
}
- // LCOV_EXCL_STOP
LM->Log(cliStr);
// Cannot reuse a cursor. This causes memory leak.
if (stmtAllocated_)
{
- // LCOV_EXCL_START :rfi
LM->Log("***[ERROR] REUSING ALLOCATED CURSOR\n");
return -1;
- // LCOV_EXCL_STOP
}
@@ -2908,10 +2902,8 @@ Lng32 HSCursor::prepareRowsetInternal
LM->StopTimer();
if (retcode_ < 0)
{
- // LCOV_EXCL_START :rfi
LM->Log("***[FAILED] Unable to open rowset cursor.\n");
HSHandleError(retcode_);
- // LCOV_EXCL_STOP
}
closeStmtNeeded_ = TRUE;
@@ -3003,10 +2995,8 @@ Lng32 HSCursor::prepare( const char *clistr
// Cannot reuse a cursor. This causes memory leak.
if (stmtAllocated_)
{
- // LCOV_EXCL_START :rfi
LM->Log("***[ERROR] REUSING ALLOCATED CURSOR\n");
return -1;
- // LCOV_EXCL_STOP
}
retcode_ = SQL_EXEC_ClearDiagnostics(stmt_);
@@ -3196,14 +3186,12 @@ Lng32 HSCursor::prepare( const char *clistr
LM->StopTimer();
if (retcode_)
{
- // LCOV_EXCL_START :rfi
if (LM->LogNeeded())
{
snprintf(LM->msg, sizeof(LM->msg), "***[FAILED] OPEN CURSOR, retcode=%d", retcode_);
LM->Log(LM->msg);
}
HSHandleError(retcode_);
- // LCOV_EXCL_STOP
}
closeStmtNeeded_ = TRUE;
@@ -3217,7 +3205,6 @@ Lng32 HSCursor::prepare( const char *clistr
#define ALIGN4(addr) ((addr & 0x3) == 0)
#define ALIGN8(addr) ((addr & 0x7) == 0)
-// LCOV_EXCL_START :cnu
template <class T> class HSBin : public SQLInt {
public:
@@ -3233,10 +3220,8 @@ private:
Lng32 id_;
};
-// LCOV_EXCL_STOP
// -----------------------------------------------------------------------
-// LCOV_EXCL_START :cnu
class HSLargeint : public SQLInt {
public:
@@ -3252,7 +3237,6 @@ private:
Lng32 id_;
};
-// LCOV_EXCL_STOP
// -----------------------------------------------------------------------
class HSDate : public SQLDate {
@@ -3270,7 +3254,6 @@ public:
};
// -----------------------------------------------------------------------
-// LCOV_EXCL_START :cnu
NAType* ConstructNumericType( Long addr
, Lng32 id
, Lng32 length
@@ -3325,13 +3308,11 @@ NAType* ConstructNumericType( Long addr
}
return type;
}
-// LCOV_EXCL_STOP
// -----------------------------------------------------------------------
// Construct a NA type from an SQL type so that NAtype.encode can be
// called later.
// -----------------------------------------------------------------------
-// LCOV_EXCL_START :cnu
#pragma nowarn(770) // warning elimination
Lng32 HSCursor::buildNAType()
{
@@ -3508,7 +3489,6 @@ Lng32 HSCursor::buildNAType()
return 0;
}
#pragma warn(770) // warning elimination
-// LCOV_EXCL_STOP
/***********************************************/
/* METHOD: fetchRowset() */
@@ -3775,7 +3755,6 @@ Lng32 HSCursor::fetchNumColumn( const char *clistr
// -----------------------------------------------------------------------
// Fetch char type and largeint type columns from a table.
// -----------------------------------------------------------------------
-// LCOV_EXCL_START :cnu
Lng32 HSCursor::fetchCharNumColumn(const char *clistr, NAString &value1, Int64 &value2, double &value3)
{
HSErrorCatcher errorCatcher(retcode_, - UERR_INTERNAL_ERROR, "fetchCharColumn", TRUE);
@@ -3821,7 +3800,6 @@ Lng32 HSCursor::fetchCharNumColumn(const char *clistr, NAString &value1, Int64 &
return 0;
}
-// LCOV_EXCL_STOP
// Constructor used for static interface.
HSinsertHist::HSinsertHist(const char *stmtID,
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/ustat/hs_cli.h
----------------------------------------------------------------------
diff --git a/core/sql/ustat/hs_cli.h b/core/sql/ustat/hs_cli.h
index 58bc353..dc9dd3a 100644
--- a/core/sql/ustat/hs_cli.h
+++ b/core/sql/ustat/hs_cli.h
@@ -1055,7 +1055,6 @@ static double getValueAsDouble(myVarChar* valPtr)
return ucsToDouble(valPtr);
}
-// LCOV_EXCL_START :ace
// This won't be called, just needs to exist to avoid compilation error for
// a template instantiation using ISFixedChar.
static double getValueAsDouble(ISFixedChar* valPtr)
@@ -1079,7 +1078,6 @@ static double getValueAsDouble(MCWrapper* valPtr)
assert(FALSE);
return 0;
}
-// LCOV_EXCL_STOP
// NOTE: The following function has to be defined in the header file so the
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/ustat/hs_globals.cpp
----------------------------------------------------------------------
diff --git a/core/sql/ustat/hs_globals.cpp b/core/sql/ustat/hs_globals.cpp
index afed2c6..bcb1c58 100644
--- a/core/sql/ustat/hs_globals.cpp
+++ b/core/sql/ustat/hs_globals.cpp
@@ -222,7 +222,6 @@ static short convFloat64ToAscii(char *target,
// : new (STMTHEAP, FALSE) elemType[elemCount])
#endif
-// LCOV_EXCL_START :rfi
void ISFixedChar::fail(const char* opName, Lng32 line)
{
HSLogMan *LM = HSLogMan::Instance();
@@ -236,7 +235,6 @@ void ISFixedChar::fail(const char* opName, Lng32 line)
throw CmpInternalException("failure in ISFixedChar",
__FILE__, line);
}
-// LCOV_EXCL_STOP
// Compare this object to rhs, returning negative value if less, 0 if equal,
// and positive value if greater.
@@ -1326,7 +1324,6 @@ void MCWrapper::fail(const char* opName, Lng32 line)
}
-// LCOV_EXCL_START :rfi
void ISVarChar::fail(const char* opName, Lng32 line)
{
HSLogMan *LM = HSLogMan::Instance();
@@ -1340,7 +1337,6 @@ void ISVarChar::fail(const char* opName, Lng32 line)
throw CmpInternalException("failure in ISVarChar",
__FILE__, line);
}
-// LCOV_EXCL_STOP
// Compare this object to rhs, returning negative value if less, 0 if equal,
// and positive value if greater.
@@ -2513,7 +2509,6 @@ Int64 HSHistogram::getTotalUec()
}
-// LCOV_EXCL_START :cnu
/***********************************************/
/* METHOD: getTotalRowCount() */
/* PURPOSE: Determine the SUM(rowcount) */
@@ -2534,7 +2529,6 @@ Int64 HSHistogram::getTotalRowCount()
}
return rowCount;
}
-// LCOV_EXCL_STOP
Lng32 HSHistogram::getParenthesizedIntBoundary(Lng32 intNum, HSDataBuffer &intBoundary)
{
@@ -2699,7 +2693,6 @@ static void sumFrequencies(FrequencyCounts& fc, Int32 maxInterval, FrequencyCoun
}
}
-// LCOV_EXCL_START :cnu
/**************************************************************************/
/* METHOD: compareFC() */
/* PURPOSE: Compare the two frequency counts to determine if for each */
@@ -2744,7 +2737,6 @@ NABoolean compareFC(FrequencyCounts& fc1, FrequencyCounts& fc2)
return differenceFound;
}
-// LCOV_EXCL_STOP
/**************************************************************************/
/* METHOD: removeLesserGapIntervals() */
@@ -3441,7 +3433,6 @@ Lng32 HSGlobalsClass::Initialize()
for (retry = 0; retry <= retryLimit && groupStateOK; retry++)
{
retcode = AddNecessaryColumns();
- // LCOV_EXCL_START :rfi
if (retcode < 0)
{
// An error occurred.
@@ -3456,7 +3447,6 @@ Lng32 HSGlobalsClass::Initialize()
}
else
break; // successful execution, exit retry loop
- // LCOV_EXCL_STOP
}
// If we found errors, but retried successfully, rewind past the errors
@@ -4997,7 +4987,6 @@ static void mapInternalSortTypes(HSColGroupStruct *groupList, NABoolean forHive
break;
default:
- // LCOV_EXCL_START :rfi
LM->Log("INTERNAL ERROR (mapInternalSortTypes):");
sprintf(LM->msg, "Undefined datetime type %d", col.precision);
LM->Log(LM->msg);
@@ -5007,7 +4996,6 @@ static void mapInternalSortTypes(HSColGroupStruct *groupList, NABoolean forHive
<< DgString2(LM->msg);
throw CmpInternalException("failure in mapInternalSortTypes()",
__FILE__, __LINE__);
- // LCOV_EXCL_STOP
}
break;
@@ -5312,7 +5300,6 @@ void HSGlobalsClass::getMemoryRequirementsForOneGroup(HSColGroupStruct* group, I
default:
// Check to see if the column's type is supposed to be handled
// by internal sort. If so, this is a problem.
- // LCOV_EXCL_START :rfi
if (isInternalSortType(group->colSet[0]))
{
LM->Log("INTERNAL ERROR (getInternalSortMemoryRequirements):");
@@ -5327,7 +5314,6 @@ void HSGlobalsClass::getMemoryRequirementsForOneGroup(HSColGroupStruct* group, I
}
elementSize = 0;
break;
- // LCOV_EXCL_STOP
}
Int64 i64MemNeeded = rows * elementSize;
@@ -8183,10 +8169,8 @@ Lng32 HSGlobalsClass::WriteStatistics()
}
else
{
- // LCOV_EXCL_START :nsk
histRS.reset(new HSinsertHist("INSERT101_MP", hstogram_table->data()));
histintRS.reset(new HSinsertHistint("INSERT201_MP", hsintval_table->data()));
- // LCOV_EXCL_STOP
}
LM->StartTimer("initialize rowset for Histograms");
retcode = histRS->initialize(); //initialize ROWSET for HISTOGRAMS
@@ -8503,7 +8487,7 @@ Lng32 HSGlobalsClass::groupListFromTable(HSColGroupStruct*& groupList,
else
stmt = HSCliStatement::CURSOR103_MX;
else
- stmt = HSCliStatement::CURSOR103_MP; // LCOV_EXCL_LINE :nsk
+ stmt = HSCliStatement::CURSOR103_MP;
HSCliStatement cursor103( stmt,
(char *)hstogram_table->data(),
@@ -10009,8 +9993,8 @@ Lng32 HSGlobalsClass::ClearAllHistograms()
LM->Log(LM->msg);
}
- if (tableFormat == SQLMP) // LCOV_EXCL_LINE :nsk
- stmt = HSCliStatement::DELETE101_MP; // LCOV_EXCL_LINE :nsk
+ if (tableFormat == SQLMP)
+ stmt = HSCliStatement::DELETE101_MP;
else
if (HSGlobalsClass::schemaVersion >= COM_VERS_2300)
stmt = HSCliStatement::DELETE101_MX_2300;
@@ -10029,8 +10013,8 @@ Lng32 HSGlobalsClass::ClearAllHistograms()
LM->Log(LM->msg);
}
- if (tableFormat == SQLMP) // LCOV_EXCL_LINE :nsk
- stmt = HSCliStatement::DELETE201_MP; // LCOV_EXCL_LINE :nsk
+ if (tableFormat == SQLMP)
+ stmt = HSCliStatement::DELETE201_MP;
else
if (HSGlobalsClass::schemaVersion >= COM_VERS_2300)
stmt = HSCliStatement::DELETE201_MX_2300;
@@ -10151,7 +10135,6 @@ Lng32 HSGlobalsClass::ClearSelectHistograms()
return retcode;
}
-// LCOV_EXCL_START :nsk
/***********************************************/
/* METHOD: DeleteOrphanHistograms() */
/* PURPOSE: Deletes obsolete histograms that */
@@ -10208,7 +10191,6 @@ Lng32 HSGlobalsClass::DeleteOrphanHistograms()
}
return 0;
}
-// LCOV_EXCL_STOP
/***********************************************/
/* METHOD: GetStatistics() */
@@ -10484,8 +10466,8 @@ Lng32 HSGlobalsClass::DisplayHistograms(NAString& displayData, Space& space,
stmt = HSCliStatement::SHOWINT_MX_2300;
else
stmt = HSCliStatement::SHOWINT_MX;
- else // LCOV_EXCL_LINE :nsk
- stmt = HSCliStatement::SHOWINT_MP; // LCOV_EXCL_LINE :nsk
+ else
+ stmt = HSCliStatement::SHOWINT_MP;
HSCliStatement intData( stmt,
(char *)hsintval_table->data(),
@@ -10909,7 +10891,6 @@ Lng32 HSGlobalsClass::processInternalSortNulls(Lng32 rowsRead, HSColGroupStruct
}
break;
- // LCOV_EXCL_START :rfi
default:
sprintf(errtxt, "processInternalSortNulls(): unknown type %d",
group->ISdatatype);
@@ -10918,7 +10899,6 @@ Lng32 HSGlobalsClass::processInternalSortNulls(Lng32 rowsRead, HSColGroupStruct
retcode=-1;
HSHandleError(retcode);
break;
- // LCOV_EXCL_STOP
}
group = group->next;
@@ -11019,7 +10999,6 @@ bool isInternalSortType(HSColumnStruct &col)
case REC_DTCODE_TIME:
case REC_DTCODE_TIMESTAMP:
return true;
- // LCOV_EXCL_START :rfi
default:
LM->Log("INTERNAL ERROR (isInternalSortType):");
sprintf(LM->msg, "Undefined datetime precision type %d", col.precision);
@@ -11030,7 +11009,6 @@ bool isInternalSortType(HSColumnStruct &col)
<< DgString2(LM->msg);
throw CmpInternalException("failure in isInternalSortType()",
__FILE__, __LINE__);
- // LCOV_EXCL_STOP
}
case REC_INT_YEAR:
@@ -11969,7 +11947,6 @@ Lng32 doSort(HSColGroupStruct *group)
(ISVarChar*)group->nextData - (ISVarChar*)group->data - 1);
break;
}
- // LCOV_EXCL_START :rfi
default:
sprintf(errtxt, "doSort(): unknown type %d", group->ISdatatype);
sprintf(LM->msg, "INTERNAL ERROR: %s", errtxt);
@@ -11977,7 +11954,6 @@ Lng32 doSort(HSColGroupStruct *group)
retcode = -1;
HSHandleError(retcode);
break;
- // LCOV_EXCL_STOP
}
if (LM->LogNeeded())
@@ -11987,7 +11963,6 @@ Lng32 doSort(HSColGroupStruct *group)
group->colSet[0].colname->data(), maxRecDepth);
LM->Log(LM->msg);
}
- // LCOV_EXCL_START :rfi
if (recDepth != 0)
{
sprintf(errtxt, "doSort(): Recursion depth should be 0.");
@@ -11996,7 +11971,6 @@ Lng32 doSort(HSColGroupStruct *group)
retcode = -1;
HSHandleError(retcode);
}
- // LCOV_EXCL_STOP
return retcode;
}
@@ -12448,7 +12422,6 @@ Lng32 HSGlobalsClass::createStatsForColumn(HSColGroupStruct *group, Int64 rowsAl
createHistogram(group, intCount, sampleRowCount, samplingUsed, (double*)NULL);
break;
- // LCOV_EXCL_START :rfi
default:
sprintf(errtxt, "createStats(): unknown type %d", group->ISdatatype);
sprintf(LM->msg, "INTERNAL ERROR: %s", errtxt);
@@ -12456,7 +12429,6 @@ Lng32 HSGlobalsClass::createStatsForColumn(HSColGroupStruct *group, Int64 rowsAl
retcode=-1;
HSHandleError(retcode);
break;
- // LCOV_EXCL_STOP
}
if (LM->LogNeeded())
@@ -12505,7 +12477,6 @@ Lng32 HSGlobalsClass::createStatsForColumn(HSColGroupStruct *group, Int64 rowsAl
return retcode;
}
-// LCOV_EXCL_START :rfi
/************************************************/
/* METHOD: log() */
/* PURPOSE: Write selected information to the */
@@ -12562,7 +12533,6 @@ void HSGlobalsClass::log(HSLogMan* LM)
group = group->next;
}
}
-// LCOV_EXCL_STOP
NABoolean HSGlobalsClass::wherePredicateSpecifiedForIUS()
{
@@ -14347,11 +14317,9 @@ Int32 copyValue(Int64 value, char *valueBuff, const HSColumnStruct &colDesc, sho
}
break;
- // LCOV_EXCL_START :rfi
default:
retcode = -1;
break;
- // LCOV_EXCL_STOP
}
break;
@@ -14486,11 +14454,9 @@ Int32 copyValue(Int64 value, char *valueBuff, const HSColumnStruct &colDesc, sho
#pragma warning(default:4146)
- // LCOV_EXCL_START :rfi
default:
retcode = -1;
break;
- // LCOV_EXCL_STOP
} // switch
} // else
@@ -14527,7 +14493,6 @@ Lng32 setBufferValue(T& value,
// Copy the value, with any required formatting, into the buffer.
Int32 rc=0;
- // LCOV_EXCL_START :rfi
if ((rc = copyValue(value, valueBuff, colDesc, len)) < 0)
{
LM->Log("INTERNAL ERROR (copyValue):");
@@ -14542,7 +14507,6 @@ Lng32 setBufferValue(T& value,
throw CmpInternalException("failure in copyValue()",
__FILE__, __LINE__);
}
- // LCOV_EXCL_STOP
// *len has already been set for char types due to possibility of embedded
// nulls, but will have to be adjusted here to len in bytes instead of chars.
[13/14] incubator-trafodion git commit: Merge remote branch
'origin/master' into ansharma_t23cc_br
Posted by an...@apache.org.
Merge remote branch 'origin/master' into ansharma_t23cc_br
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/4fc2f0f0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/4fc2f0f0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/4fc2f0f0
Branch: refs/heads/master
Commit: 4fc2f0f0d880ff64283b612c0a7140bae4cf204a
Parents: 7a95e1d 4e316c0
Author: Anoop Sharma <an...@esgyn.com>
Authored: Mon Sep 25 17:40:12 2017 +0000
Committer: Anoop Sharma <an...@esgyn.com>
Committed: Mon Sep 25 17:40:12 2017 +0000
----------------------------------------------------------------------
core/sql/executor/ExSequence.cpp | 16 +-
core/sql/exp/ExpAtp.h | 17 +
core/sql/generator/GenExplain.cpp | 7 +-
core/sql/generator/GenPreCode.cpp | 6 +
core/sql/regress/executor/EXPECTED131 | 4 +
core/sql/regress/executor/EXPECTED140 | 29 +-
core/sql/regress/seabase/EXPECTED010 | 448 +++++++++++++----------
core/sql/regress/seabase/EXPECTED011 | 13 +-
core/sql/sqlcomp/QCache.cpp | 9 +-
core/sql/ustat/hs_globals.cpp | 6 +-
win-odbc64/odbcclient/drvr35/drvrglobal.cpp | 109 ++----
win-odbc64/odbcclient/drvr35/drvrglobal.h | 2 +
win-odbc64/odbcclient/drvr35/sqltocconv.cpp | 14 +-
13 files changed, 384 insertions(+), 296 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/4fc2f0f0/core/sql/executor/ExSequence.cpp
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/4fc2f0f0/core/sql/generator/GenPreCode.cpp
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/4fc2f0f0/core/sql/sqlcomp/QCache.cpp
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/4fc2f0f0/core/sql/ustat/hs_globals.cpp
----------------------------------------------------------------------
[10/14] incubator-trafodion git commit: lcov: commit #1
Posted by an...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/executor/ExSequence.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExSequence.cpp b/core/sql/executor/ExSequence.cpp
index 6377b6e..8eed5ce 100644
--- a/core/sql/executor/ExSequence.cpp
+++ b/core/sql/executor/ExSequence.cpp
@@ -71,18 +71,14 @@ char *GetHistoryRowOLAP(void *data, Int32 n,
// in this case.
//
if (n < 0) {
-// LCOV_EXCL_START
// this path in the code is a safe garde and may not be hit
// maybe we can chage to assert or may be we can remove in the future
retcode = -1; // ERROR condition
return NULL;
-// LCOV_EXCL_STOP
} else if (n >= tcb->maxNumberHistoryRows_ &&
tcb->numberHistoryRows_ == tcb->maxNumberHistoryRows_) {
-// LCOV_EXCL_START
retcode = -1; // ERROR condition
return NULL;
-// LCOV_EXCL_STOP
} else if (n >= tcb->numberHistoryRows_) {
if(leading || (n - tcb->numberHistoryRows_) >= winSize)
retcode = 0;
@@ -186,7 +182,6 @@ char *GetHistoryRow(void *data, Int32 n,
{
return tcb->currentHistRowPtr_ - n * tcb->recLen() ; // offset back from first
}
-// LCOV_EXCL_START
// this code is used for the legacy sequence functions-- Not sure whether to add a test
// for this as the sequence functions are supposed to be replaced by OLAP functions
// I am hiding this code from code coverage tool for now.
@@ -205,7 +200,6 @@ char *GetHistoryRow(void *data, Int32 n,
{
tmpBuf = tcb->lastOLAPBuffer_;
}
-// LCOV_EXCL_STOP
}
return tmpBuf->getFirstRow() + ( tcb->maxRowsInOLAPBuffer_ - n ) * tcb->recLen();
@@ -439,9 +433,7 @@ short ExSequenceTcb::work()
//
if (request == ex_queue::GET_NOMORE)
{
- // LCOV_EXCL_START
pstate->step_ = ExSeq_DONE;
- // LCOV_EXCL_STOP
}
else
{
@@ -542,9 +534,7 @@ short ExSequenceTcb::work()
// try again later.
//
if (qparent_.up->isFull())
- // LCOV_EXCL_START
return WORK_OK;
- // LCOV_EXCL_STOP
ex_queue_entry *pentry_up = qparent_.up->getTailEntry();
@@ -625,11 +615,9 @@ short ExSequenceTcb::work()
if (retCode == ex_expr::EXPR_ERROR)
{
- // LCOV_EXCL_START
updateDiagsArea(centry);
pstate->step_ = ExSeq_ERROR;
break;
- // LCOV_EXCL_STOP
}
if ( retCode == ex_expr::EXPR_FALSE)
{
@@ -791,9 +779,7 @@ short ExSequenceTcb::work()
//
if (pool_->get_free_tuple(pentry_up->getTupp(myTdb().tuppIndex_),
recLen()))
- // LCOV_EXCL_START
return WORK_POOL_BLOCKED;
- // LCOV_EXCL_STOP
char *tuppData = pentry_up->getTupp
(myTdb().tuppIndex_).getDataPointer();
@@ -811,10 +797,8 @@ short ExSequenceTcb::work()
retCode = returnExpr()->eval(pentry_up->getAtp(),workAtp_);
if (retCode == ex_expr::EXPR_ERROR)
{
- // LCOV_EXCL_START
pstate->step_ = ExSeq_ERROR;
break;
- // LCOV_EXCL_STOP
}
}
@@ -825,10 +809,8 @@ short ExSequenceTcb::work()
retCode = postPred()->eval(pentry_up->getAtp(),pentry_up->getAtp());
if (retCode == ex_expr::EXPR_ERROR)
{
- // LCOV_EXCL_START
pstate->step_ = ExSeq_ERROR;
break;
- // LCOV_EXCL_STOP
}
}
@@ -876,9 +858,7 @@ short ExSequenceTcb::work()
// go to the error processing state.
//
case ex_expr::EXPR_ERROR:
- // LCOV_EXCL_START
pstate->step_ = ExSeq_ERROR;
- // LCOV_EXCL_STOP
break;
}
@@ -1004,17 +984,14 @@ short ExSequenceTcb::work()
{
if (!overflowEnabled_)
{
- // LCOV_EXCL_START
// used for debugging when CmpCommon::getDefault(EXE_BMO_DISABLE_OVERFLOW)is set to off ;
updateDiagsArea(EXE_OLAP_OVERFLOW_NOT_SUPPORTED);
pstate->step_ = ExSeq_ERROR;
break;
- // LCOV_EXCL_STOP
}
ex_assert(isUnboundedFollowing(),"");
if ( ! cluster_->flush(&rc_) ) { // flush the buffers
- // LCOV_EXCL_START
// if no errors this code path is not visited
if ( rc_ )
{ // some error
@@ -1022,12 +999,9 @@ short ExSequenceTcb::work()
pstate->step_ = ExSeq_ERROR;
break;
}
- // LCOV_EXCL_STOP
// not all the buffers are completely flushed. An I/O is pending
- // LCOV_EXCL_START
// maybe we cane remove in the future
return WORK_OK;
- // LCOV_EXCL_STOP
}
// At this point -- all the buffers were completely flushed
@@ -1070,17 +1044,13 @@ short ExSequenceTcb::work()
isUnboundedFollowing() );
if ( ! cluster_->read(&rc_) ) {
- // LCOV_EXCL_START
if ( rc_ ) { // some error
updateDiagsArea( rc_);
pstate->step_ = ExSeq_ERROR;
break;
}
- // LCOV_EXCL_STOP
// not all the buffers are completely read. An I/O is pending
- // LCOV_EXCL_START
return WORK_OK;
- // LCOV_EXCL_STOP
}
numberOfRowsReturnedBeforeReadOF_ = 0;
@@ -1107,9 +1077,7 @@ short ExSequenceTcb::work()
// try again later.
//
if (qparent_.up->isFull())
- // LCOV_EXCL_START
return WORK_OK;
- // LCOV_EXCL_STOP
ex_queue_entry * pentry_up = qparent_.up->getTailEntry();
pentry_up->upState.status = ex_queue::Q_NO_DATA;
@@ -1137,7 +1105,6 @@ short ExSequenceTcb::work()
if (qparent_.down->isEmpty())
return WORK_OK;
- // LCOV_EXCL_START
// If we haven't given to our child the new head
// index return and ask to be called again.
//
@@ -1149,7 +1116,6 @@ short ExSequenceTcb::work()
pentry_down = qparent_.down->getHeadEntry();
pstate = (ExSequencePrivateState*) pentry_down->pstate;
request = pentry_down->downState.request;
- // LCOV_EXCL_STOP
}
break;
} // switch pstate->step_
@@ -1252,14 +1218,11 @@ NABoolean ExSequenceTcb::removeOLAPBuffer()
if (lastOLAPBuffer_ == NULL || firstOLAPBuffer_ == NULL)
{
- // LCOV_EXCL_START
return FALSE;
- // LCOV_EXCL_STOP
}
if (lastOLAPBuffer_ == firstOLAPBuffer_)
{
- // LCOV_EXCL_START
// since we keep a minimum number of buffers this code won't be visited
// this code should not be removed. if we decide to not keep a min number
// of buffers in the list it will be used
@@ -1269,7 +1232,6 @@ NABoolean ExSequenceTcb::removeOLAPBuffer()
lastOLAPBuffer_ = NULL;
firstOLAPBuffer_ = NULL;
return TRUE;
- // LCOV_EXCL_STOP
}
HashBuffer * tmpBuf = lastOLAPBuffer_;
@@ -1287,9 +1249,7 @@ NABoolean ExSequenceTcb::shrinkOLAPBufferList()
{
if (! removeOLAPBuffer())
{
- // LCOV_EXCL_START
return FALSE;// error
- // LCOV_EXCL_STOP
}
};
return TRUE;
@@ -1314,9 +1274,7 @@ NABoolean ExSequenceTcb::addNewOLAPBuffer(NABoolean checkMemoryPressure)
if ( tmpBuf == NULL ||
tmpBuf->getDataPointer() == NULL )
{
- // LCOV_EXCL_START
return FALSE; // no memory
- // LCOV_EXCL_STOP
}
if (firstOLAPBuffer_== NULL)
@@ -1360,17 +1318,13 @@ void ExSequenceTcb::initializeHistory()
for (Int32 i = 0 ; i < minNumberOfOLAPBuffers_; i++)
{
if ( ! addNewOLAPBuffer( FALSE /* No Memory Pressure Check */ ) )
- // LCOV_EXCL_START
ex_assert(0, "No memory for minimal OLAP window!");
- // LCOV_EXCL_STOP
}
}
else
{
if (!shrinkOLAPBufferList())
- // LCOV_EXCL_START
ex_assert(0,"initializeHistory-- can not shrink buffer list");
- // LCOV_EXCL_STOP
}
// Initialize all the settings needed for unbounded following (and overflow)
@@ -1413,9 +1367,7 @@ void ExSequenceTcb::createCluster()
// if quota, and it's less than avail memory, then use that lower figure
if ( myTdb().memoryQuotaMB() > 0 &&
myTdb().memoryQuotaMB() * ONE_MEG < availableMemory )
- // LCOV_EXCL_START
availableMemory = myTdb().memoryQuotaMB() * ONE_MEG ;
- // LCOV_EXCL_STOP
ULng32 minMemQuotaMB = myTdb().isPossibleMultipleCalls() ?
myTdb().memoryQuotaMB() : 0 ;
@@ -1477,14 +1429,12 @@ void ExSequenceTcb::createCluster()
clusterDb_->setScratchIOVectorSize(myTdb().scratchIOVectorSize());
switch(myTdb().getOverFlowMode())
{
- // LCOV_EXCL_START
case SQLCLI_OFM_SSD_TYPE:
clusterDb_->setScratchOverflowMode(SCRATCH_SSD);
break;
case SQLCLI_OFM_MMAP_TYPE:
clusterDb_->setScratchOverflowMode(SCRATCH_MMAP);
break;
- // LCOV_EXCL_STOP
default:
case SQLCLI_OFM_DISK_TYPE:
clusterDb_->setScratchOverflowMode(SCRATCH_DISK);
@@ -1514,9 +1464,7 @@ void ExSequenceTcb::updateDiagsArea(ex_queue_entry * centry)
{
if (workAtp_->getDiagsArea())
{
- // LCOV_EXCL_START
workAtp_->getDiagsArea()->mergeAfter(*centry->getDiagsArea());
- // LCOV_EXCL_STOP
}
else
{
@@ -1527,7 +1475,6 @@ void ExSequenceTcb::updateDiagsArea(ex_queue_entry * centry)
}
}
}
-// LCOV_EXCL_START
void ExSequenceTcb::updateDiagsArea( ExeErrorCode rc_)
{
ComDiagsArea *da = workAtp_->getDiagsArea();
@@ -1541,7 +1488,6 @@ void ExSequenceTcb::updateDiagsArea( ExeErrorCode rc_)
*da << DgSqlCode(-rc_);
}
}
-// LCOV_EXCL_STOP
//
// Constructor and destructor private state
//
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/executor/ExVPJoin.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExVPJoin.cpp b/core/sql/executor/ExVPJoin.cpp
index ff9caa6..201d4b1 100644
--- a/core/sql/executor/ExVPJoin.cpp
+++ b/core/sql/executor/ExVPJoin.cpp
@@ -41,7 +41,6 @@
// Exclude this code from coverage analysis since this feature is
// obsolete and not used.
-// LCOV_EXCL_START
ex_tcb * ExVPJoinTdb::build(ex_globals * glob)
{
@@ -482,4 +481,3 @@ ex_tcb_private_state * ExVPJoinPrivateState::allocate_new(const ex_tcb * tcb)
ExVPJoinPrivateState::~ExVPJoinPrivateState()
{}
-// LCOV_EXCL_STOP
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/executor/ExVPJoin.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExVPJoin.h b/core/sql/executor/ExVPJoin.h
index bbc7c80..334ded6 100644
--- a/core/sql/executor/ExVPJoin.h
+++ b/core/sql/executor/ExVPJoin.h
@@ -64,7 +64,6 @@ class ExVPJoinTcbPrivateState;
// Exclude this code from coverage analysis since this feature is
// obsolete and not used.
-// LCOV_EXCL_START
// -----------------------------------------------------------------------
// Classes defined in this file
@@ -232,7 +231,6 @@ inline ex_expr * ExVPJoinTcb::filterPred()
return vpJoinTdb().filterExpr_;
}
-// LCOV_EXCL_STOP
#endif
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/executor/HdfsLogger.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/HdfsLogger.h b/core/sql/executor/HdfsLogger.h
index 760289f..a6652bc 100644
--- a/core/sql/executor/HdfsLogger.h
+++ b/core/sql/executor/HdfsLogger.h
@@ -100,7 +100,6 @@ private:
/**
* Exception thrown when an error in the program logic is found.
*/
-// LCOV_EXCL_START :rfi
class QRLogicException : public QRException
{
public:
@@ -124,6 +123,5 @@ class QRLogicException : public QRException
{}
}; //QRLogicException
-// LCOV_EXCL_STOP
#endif /* _QRLOGGER_H_ */
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/executor/MdamRefList.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/MdamRefList.cpp b/core/sql/executor/MdamRefList.cpp
index 60d8175..eee476c 100644
--- a/core/sql/executor/MdamRefList.cpp
+++ b/core/sql/executor/MdamRefList.cpp
@@ -58,7 +58,6 @@ enum {disjunctNumInitialValue = -1};
// Member functions for class MdamRefList
// *****************************************************************************
-// LCOV_EXCL_START
// this desctor is not called as the instance is part of MdamColumn class and
// would be constructed and destructed together.
//Destructor.
@@ -71,10 +70,8 @@ MdamRefList::~MdamRefList()
"MdamRefList::~MdamRefList() called for a non-empty reference list.");
}
-// LCOV_EXCL_STOP
// end of excluding the destructor from coverage checking.
-// LCOV_EXCL_START
// this operator was designed for completeness but is not currently used
// Compare two reference lists. If they are equal, return true.
// Otherwise, return false. Comparision stops at first non-match.
@@ -108,7 +105,6 @@ NABoolean MdamRefList::operator==(const MdamRefList & otherList) const
return TRUE;
}
-// LCOV_EXCL_STOP
// end of excluding this equal operator from coverage checking
// Copy the entries from one reference list to another.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/executor/MdamRefList.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/MdamRefList.h b/core/sql/executor/MdamRefList.h
index cb2028c..3892549 100644
--- a/core/sql/executor/MdamRefList.h
+++ b/core/sql/executor/MdamRefList.h
@@ -79,11 +79,9 @@ class MdamRefList
// Assignment operator is not supported.
-// LCOV_EXCL_START
// this operator was defined for completeness but is not currently used
// Test for equality.
NABoolean operator==(const MdamRefList & otherList) const;
-// LCOV_EXCL_STOP
// end of excluding this equal operator from coverage checking
// Copy the entries from one reference list to another.
@@ -150,7 +148,6 @@ inline MdamRefList::MdamRefList(const Int32 disjunctNum,
insert(disjunctNum, mdamRefListEntryHeap);
}
-// LCOV_EXCL_START
// this method is only called in the destruct, see MdamRefList.cpp for reason
// Determine if the list is empty.
inline NABoolean MdamRefList::isEmpty() const
@@ -158,6 +155,5 @@ inline NABoolean MdamRefList::isEmpty() const
return lastEntryPtr_ == 0;
}
-// LCOV_EXCL_STOP
// end of excluding isEmpty from coverage checking
#endif /* MDAMREFLIST_H */
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/executor/cluster.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/cluster.cpp b/core/sql/executor/cluster.cpp
index 0875a32..a8610c6 100644
--- a/core/sql/executor/cluster.cpp
+++ b/core/sql/executor/cluster.cpp
@@ -211,7 +211,7 @@ void HashBuffer::init(Cluster * cluster) {
HashBuffer::~HashBuffer() {
if (data_) {
if ( ! cluster_ ) {
- heap_->deallocateMemory(data_); // LCOV_EXCL_LINE
+ heap_->deallocateMemory(data_);
return;
}
// NOTE: we do NOT ajust the memory usage statistics for the cluster,
@@ -258,13 +258,11 @@ HashBuffer::~HashBuffer() {
/////////////////////////////////////////////////////////////////////////////
-// LCOV_EXCL_START
Bucket::Bucket() {
init();
};
-// LCOV_EXCL_STOP
void Bucket::init() {
innerCluster_ = NULL;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/executor/cluster.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/cluster.h b/core/sql/executor/cluster.h
index e3b7b1b..c987002 100644
--- a/core/sql/executor/cluster.h
+++ b/core/sql/executor/cluster.h
@@ -508,7 +508,7 @@ inline void HashBufferSerial::setRowLength(HashRow *row, UInt32 len) {
class Bucket {
public:
Bucket();
- ~Bucket() {}; // LCOV_EXCL_LINE
+ ~Bucket() {};
void init();
inline ULng32 getRowCount() const;
inline Cluster * getInnerCluster () const;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/executor/ex_ex.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/ex_ex.h b/core/sql/executor/ex_ex.h
index eb3b164..421cb3c 100644
--- a/core/sql/executor/ex_ex.h
+++ b/core/sql/executor/ex_ex.h
@@ -52,7 +52,7 @@ void ex_log_ems( const char *f, Int32 l, const char * m);
void assert_botch_longjmp( const char *f, int l, const char * m);
-#define ex_assert(p, msg) if (!(p)) { assert_botch_abend( __FILE__ , __LINE__ , msg); }; // LCOV_EXCL_LINE
+#define ex_assert(p, msg) if (!(p)) { assert_botch_abend( __FILE__ , __LINE__ , msg); };
class ex_expr; // to be defined
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/executor/ex_hash_grby.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ex_hash_grby.cpp b/core/sql/executor/ex_hash_grby.cpp
index 8ce966c..4c07b60 100644
--- a/core/sql/executor/ex_hash_grby.cpp
+++ b/core/sql/executor/ex_hash_grby.cpp
@@ -217,7 +217,6 @@ ex_hash_grby_tcb::ex_hash_grby_tcb(const ex_hash_grby_tdb & hash_grby_tdb,
}
// Allocate an ExTrieTable for rows that map directly to groups using
// bitMux fast mapping.
- // LCOV_EXCL_START
if (bitMuxExpr_) {
// Try to get about 1Mb of memory for the Trie table.
@@ -268,7 +267,6 @@ ex_hash_grby_tcb::ex_hash_grby_tcb(const ex_hash_grby_tdb & hash_grby_tdb,
//
if(bitMuxExpr_ && !hbAggrExpr_ && !hashExpr_)
bitMuxExpr_ = NULL;
- // LCOV_EXCL_STOP
// get the queue that child use to communicate with me
childQueue_ = childTcb_->getParentQueue();
@@ -276,7 +274,7 @@ ex_hash_grby_tcb::ex_hash_grby_tcb(const ex_hash_grby_tdb & hash_grby_tdb,
// Allocate the queues to communicate with parent (no pstate needed)
allocateParentQueues(parentQueue_,FALSE);
- // Now, fixup the expressions // LCOV_EXCL_START
+ // Now, fixup the expressions
//
if (hashExpr_)
(void) hashExpr_->fixup(0, getExpressionMode(), this,
@@ -318,7 +316,6 @@ ex_hash_grby_tcb::ex_hash_grby_tcb(const ex_hash_grby_tdb & hash_grby_tdb,
if (ofSearchExpr_)
(void) ofSearchExpr_->fixup(0, getExpressionMode(), this,
space_, heap_, glob->computeSpace(), glob);
- // LCOV_EXCL_STOP
// Allocate the ATP's that are used internally in the work
// methods.
//
@@ -351,7 +348,6 @@ ex_hash_grby_tcb::ex_hash_grby_tcb(const ex_hash_grby_tdb & hash_grby_tdb,
///////////////////////////////////////////////////////////////////////////////
// Destructor for hash_grby_tcb
-// // LCOV_EXCL_START
ex_hash_grby_tcb::~ex_hash_grby_tcb() {
delete parentQueue_.up;
@@ -400,7 +396,6 @@ void ex_hash_grby_tcb::freeResources() {
if(bitMuxBuffer_) NADELETEBASIC(bitMuxBuffer_, space_);
bitMuxBuffer_ = NULL;
};
-// LCOV_EXCL_STOP
void ex_hash_grby_tcb::registerSubtasks()
{
@@ -636,7 +631,7 @@ short ex_hash_grby_tcb::work() {
}
} break;
- case HASH_GRBY_ERROR: { // LCOV_EXCL_START
+ case HASH_GRBY_ERROR: {
// make sure that we have a free slot in the parent's up queue
if (parentQueue_.up->isFull()) {
return WORK_OK;
@@ -674,7 +669,7 @@ short ex_hash_grby_tcb::work() {
downParentEntry->setDiagsArea(diags);
workHandleError(downParentEntry->getAtp());
} break;
- }; // LCOV_EXCL_STOP
+ };
};
};
@@ -784,11 +779,11 @@ void ex_hash_grby_tcb::workInitialize() {
// Default to 100 MB, minimum setting 10 MB
//
availableMemory = hashGrbyTdb().partialGrbyMemoryMB() * ONE_MEG ;
- if(availableMemory == 0) { // LCOV_EXCL_START
+ if(availableMemory == 0) {
availableMemory = 100 * ONE_MEG;
} else if(availableMemory < 10 * ONE_MEG) {
availableMemory = 10 * ONE_MEG;
- } // LCOV_EXCL_STOP
+ }
// reset the counter for every run.
partialGroupbyMissCounter_ = 0;
@@ -853,12 +848,12 @@ void ex_hash_grby_tcb::workInitialize() {
getStatsEntry()
);
- if ( !clusterDb_ || rc_ != EXE_OK ) { // LCOV_EXCL_START
+ if ( !clusterDb_ || rc_ != EXE_OK ) {
if ( !clusterDb_ ) rc_ = EXE_NO_MEM_TO_EXEC; // new() couldn't allocate
else delete clusterDb_;
setState(HASH_GRBY_ERROR);
return;
- }; // LCOV_EXCL_STOP
+ };
clusterDb_->setScratchIOVectorSize(hashGrbyTdb().scratchIOVectorSize());
switch(hashGrbyTdb().getOverFlowMode())
@@ -895,13 +890,13 @@ void ex_hash_grby_tcb::workInitialize() {
cluster,
&rc_);
- if ( !cluster || rc_ != EXE_OK ) { // LCOV_EXCL_START
+ if ( !cluster || rc_ != EXE_OK ) {
// we could not allocate the Cluster
if ( !cluster ) rc_ = EXE_NO_MEM_TO_EXEC;
else delete cluster;
setState(HASH_GRBY_ERROR);
return;
- }; // LCOV_EXCL_STOP
+ };
bucketIdx += bucketsPerCluster;
};
@@ -1154,10 +1149,10 @@ void ex_hash_grby_tcb::workReadChild() {
else {
// we couldn't insert the row. If we got an error, handle it.
// EXE_NO_MEM_TO_EXEC is not an error
- if (rc_ && !(rc_ == EXE_NO_MEM_TO_EXEC)) { // LCOV_EXCL_START
+ if (rc_ && !(rc_ == EXE_NO_MEM_TO_EXEC)) {
setState(HASH_GRBY_ERROR);
return;
- }; // LCOV_EXCL_STOP
+ };
// we ran out of memory. Handle this situation. In case of a
// partial grouping we return the row as a new group to the parent.
@@ -1300,7 +1295,6 @@ void ex_hash_grby_tcb::workReadChild() {
// workReadChildBitMux
//
-// LCOV_EXCL_START
Int32 ex_hash_grby_tcb::workReadChildBitMux() {
ex_queue_entry * childEntry;
ex_queue_entry * upParentEntry = parentQueue_.up->getTailEntry();
@@ -1415,7 +1409,6 @@ Int32 ex_hash_grby_tcb::workReadChildBitMux() {
//
return 0;
}
-// LCOV_EXCL_STOP
/////////////////////////////////////////////////////////////////////////////
// read rows from the overflow buffer and aggregate them into the
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/executor/ex_hash_grby.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/ex_hash_grby.h b/core/sql/executor/ex_hash_grby.h
index ace7ca5..ce486ed 100644
--- a/core/sql/executor/ex_hash_grby.h
+++ b/core/sql/executor/ex_hash_grby.h
@@ -82,7 +82,7 @@ public:
{}
virtual ~ex_hash_grby_tdb()
- {} // LCOV_EXCL_LINE
+ {}
// ---------------------------------------------------------------------
// Build a TCB for this TDB. Redefined in the Executor project.
@@ -330,12 +330,12 @@ public:
Initial Revision.
*****************************************************************************/
inline const ex_tcb* ex_hash_grby_tcb::getChild(Int32 pos) const {
- ex_assert((pos >= 0), ""); // LCOV_EXCL_START
+ ex_assert((pos >= 0), "");
if (pos == 0)
return childTcb_;
else
return NULL;
-} // LCOV_EXCL_STOP
+}
///////////////////////////////////////////////////////////////////////////
//
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/executor/ex_mdam.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ex_mdam.cpp b/core/sql/executor/ex_mdam.cpp
index 9f6e35a..770a09e 100644
--- a/core/sql/executor/ex_mdam.cpp
+++ b/core/sql/executor/ex_mdam.cpp
@@ -213,12 +213,10 @@ void MdamColumn::setNextColumn(MdamColumn *next)
next_ = next;
}
-// LCOV_EXCL_START
MdamIntervalList & MdamColumn::getIntervalList()
{
return intervals_;
}
-// LCOV_EXCL_STOP
NABoolean MdamColumn::initNextValue()
{
@@ -734,7 +732,7 @@ while ((predIterator.positionToNextOr(¤tPred_)) &&
}
default:
{
- ex_assert(0,"Invalid predicate type"); //LCOV_EXCL_LINE
+ ex_assert(0,"Invalid predicate type");
break;
}
}
@@ -1068,7 +1066,6 @@ keyRangeEx::getNextKeyRangeReturnType keyMdamEx::getNextKeyRange
char *ektarget = ekData_.getDataPointer();
ULng32 keyLength = getGenInfo().getKeyLength();
- // LCOV_EXCL_START
if (getGenInfo().getKeytag() > 0)
{
unsigned short keytag = getGenInfo().getKeytag();
@@ -1078,7 +1075,6 @@ keyRangeEx::getNextKeyRangeReturnType keyMdamEx::getNextKeyRange
ektarget += sizeof(short);
keyLength -= sizeof(short);
}
- // LCOV_EXCL_STOP
if (complementKeysBeforeReturning_)
{
@@ -1189,7 +1185,7 @@ keyRangeEx::getNextKeyRangeReturnType keyMdamEx::getNextKeyRange
}
default:
{
- ex_assert(0,"keyMdamEx::getNextKeyRange() invalid getNextValue rc"); // LCOV_EXCL_LINE
+ ex_assert(0,"keyMdamEx::getNextKeyRange() invalid getNextValue rc");
break;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/executor/ex_queue.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ex_queue.cpp b/core/sql/executor/ex_queue.cpp
index 3bd10d3..1ac4cb0 100644
--- a/core/sql/executor/ex_queue.cpp
+++ b/core/sql/executor/ex_queue.cpp
@@ -212,7 +212,6 @@ void ex_queue::removeHead()
} // ex_queue::removeHead()
#endif
-// LCOV_EXCL_START
//soln 10-040111-2308 start
void ex_queue::deleteHeadEntry()
{
@@ -256,7 +255,6 @@ void ex_queue::deleteHeadEntry()
} // ex_queue::deleteHeadEntry()
//soln 10-040111-2308 end
-// LCOV_EXCL_STOP
void ex_queue_entry::passAtp(const ex_queue_entry *from)
{
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/executor/ex_root.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ex_root.cpp b/core/sql/executor/ex_root.cpp
index 145f220..1f8b2b4 100644
--- a/core/sql/executor/ex_root.cpp
+++ b/core/sql/executor/ex_root.cpp
@@ -724,7 +724,6 @@ Int32 ex_root_tcb::execute(CliGlobals *cliGlobals,
}
#ifdef _DEBUG
-// LCOV_EXCL_START
// Do not need to cover debug code since customers and QA do no receive it.
char *testCancelFreq = getenv("TEST_ERROR_AT_QUEUE");
if (testCancelFreq)
@@ -741,7 +740,6 @@ Int32 ex_root_tcb::execute(CliGlobals *cliGlobals,
}
getGlobals()->setInjectErrorAtQueue(freq);
}
-// LCOV_EXCL_STOP
else
getGlobals()->setInjectErrorAtQueue(0);
#endif
@@ -913,7 +911,6 @@ Int32 ex_root_tcb::execute(CliGlobals *cliGlobals,
// This code block must be placed right before insert().
// ------------------------------------------------------------
CancelState old = master_glob->setCancelState(CLI_CANCEL_TCB_READY);
-// LCOV_EXCL_START
if (old == CLI_CANCEL_REQUESTED)
{
// Don't bother to continue if async cancel has been requested.
@@ -925,7 +922,6 @@ Int32 ex_root_tcb::execute(CliGlobals *cliGlobals,
populateCancelDiags(*diagsArea);
return -1;
}
-// LCOV_EXCL_STOP
// ++Trigger,
//
@@ -1862,7 +1858,6 @@ Int32 ex_root_tcb::fetch(CliGlobals *cliGlobals,
}
// $$$ no-wait CLI prototype VV
-// LCOV_EXCL_START
// Obsolete in SQ.
if (timeLimit == 0)
{
@@ -1872,7 +1867,6 @@ Int32 ex_root_tcb::fetch(CliGlobals *cliGlobals,
// diagnostics in this way...
return NOT_FINISHED;
}
-// LCOV_EXCL_STOP
// $$$ no-wait CLI prototype ^^
@@ -1889,7 +1883,6 @@ Int32 ex_root_tcb::fetch(CliGlobals *cliGlobals,
schedRetcode = glob->getScheduler()->work(prevWaitTime);
#ifdef _DEBUG
-// LCOV_EXCL_START
// We do not need coverage for DEBUG builds since QA or customers do no recieve.
if (earliestTimeToCancel && getenv("TEST_CANCEL_ABORT"))
{
@@ -1901,7 +1894,6 @@ Int32 ex_root_tcb::fetch(CliGlobals *cliGlobals,
return -1;
}
#endif
-// LCOV_EXCL_STOP
if (schedRetcode == WORK_BAD_ERROR)
{
@@ -2906,14 +2898,12 @@ void ex_root_tcb::deregisterCB()
// See comments around allowUnitTestSuspend above. This code has
// been manually unit tested, and it too difficult and costly to
// test in an automated script.
- // LCOV_EXCL_START
statsGlobals->releaseStatsSemaphore(cliGlobals->getSemId(),
cliGlobals->myPin());
DELAY(300);
int error = statsGlobals->getStatsSemaphore(cliGlobals->getSemId(),
cliGlobals->myPin());
- // LCOV_EXCL_STOP
}
// Now we have the semaphore, and the query is not suspended. Quick
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/executor/ex_sort.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ex_sort.cpp b/core/sql/executor/ex_sort.cpp
index a6bac14..5280d0f 100644
--- a/core/sql/executor/ex_sort.cpp
+++ b/core/sql/executor/ex_sort.cpp
@@ -585,7 +585,6 @@ ex_tcb_private_state * ExSortTcb::allocatePstates(
// the sort subsystem.
////////////////////////////////////////////////////////////////////////
-// LCOV_EXCL_START
void ExSortTcb::createSortDiags()
{
ExExeStmtGlobals* exe_glob = getGlobals()->castToExExeStmtGlobals();
@@ -623,12 +622,10 @@ void ExSortTcb::createSortDiags()
sortDiag_->incrRefCount();
}
-// LCOV_EXCL_STOP
////////////////////////////////////////////////////////////////////////
// processSortError()
//
#pragma nowarn(262) // warning elimination
-// LCOV_EXCL_START
NABoolean ExSortTcb::processSortError(ex_queue_entry *pentry_down,
queue_index parentIndex,
queue_index downIndex)
@@ -656,7 +653,6 @@ NABoolean ExSortTcb::processSortError(ex_queue_entry *pentry_down,
return TRUE;
}
-// LCOV_EXCL_STOP
#pragma warn(262) // warning elimination
short ExSortTcb::workStatus(short workRC)
@@ -673,20 +669,16 @@ short ExSortTcb::workStatus(short workRC)
// -----------------------------------------------------------------------
// Generic work procedure should never be called
// -----------------------------------------------------------------------
-// LCOV_EXCL_START
short ExSortTcb::work()
{
ex_assert(0,"Should never reach ExSortTcb::work()");
return WORK_BAD_ERROR;
}
-// LCOV_EXCL_STOP
short ExSortTcb::workDown()
{
// if no parent request, return
if (qparent_.down->isEmpty())
-// LCOV_EXCL_START
return WORK_OK;
-// LCOV_EXCL_STOP
queue_index tail = qparent_.down->getTailIndex();
@@ -778,18 +770,14 @@ short ExSortTcb::workUp()
switch (pstate.step_)
{
case ExSortTcb::SORT_EMPTY:
- // LCOV_EXCL_START
ex_assert(0,"Should never reach workUp with this state");
return WORK_OK;
- // LCOV_EXCL_STOP
case ExSortTcb::SORT_PREP:
{
if ( sortDiag_ != NULL )
{
- // LCOV_EXCL_START
sortDiag_->decrRefCount();
sortDiag_ = NULL; // reset
- // LCOV_EXCL_STOP
}
if (bmoStats_)
bmoStats_->setBmoPhase(SORT_PHASE_END-SORT_PREP_PHASE);
@@ -801,11 +789,9 @@ short ExSortTcb::workUp()
if (sortUtil_->sortInitialize(*sortCfg_, topNCount) != SORT_SUCCESS)
{
- // LCOV_EXCL_START
createSortDiags();
pstate.step_ = ExSortTcb::SORT_ERROR;
break;
- // LCOV_EXCL_STOP
}
pstate.step_ = ExSortTcb::SORT_SEND;
@@ -814,12 +800,10 @@ short ExSortTcb::workUp()
case ExSortTcb::RESTART_PARTIAL_SORT:
{
- // LCOV_EXCL_START
pstate.noOverflow_ = TRUE;
sortPartiallyComplete_ = FALSE;
sortUtil_->sortEnd();
pstate.step_ = ExSortTcb::SORT_PREP;
- // LCOV_EXCL_STOP
}
break;
@@ -827,13 +811,11 @@ short ExSortTcb::workUp()
{
if (request == ex_queue::GET_NOMORE)
{
- // LCOV_EXCL_START
// Parent canceled, inform child and consume input rows
qchild_.down->cancelRequestWithParentIndex(
qparent_.down->getHeadIndex());
pstate.step_ = ExSortTcb::SORT_CANCELED;
break;
- // LCOV_EXCL_STOP
}
// if nothing returned from child. Get outta here.
@@ -853,9 +835,7 @@ short ExSortTcb::workUp()
pstate.allocatedTuppDesc_, pstate.noOverflow_,
workRC);
if (rc == 1)
- // LCOV_EXCL_START
return workRC;
- // LCOV_EXCL_STOP
// consume the child row in all cases except when
// sort is partially complete. sortPartiallyComplete is TRUE
@@ -881,12 +861,10 @@ short ExSortTcb::workUp()
{
case ex_queue::Q_OK_MMORE:
case ex_queue::Q_SQLERROR:
- // LCOV_EXCL_START
{
qchild_.up->removeHead();
}
break;
- // LCOV_EXCL_STOP
case ex_queue::Q_NO_DATA:
{
qchild_.up->removeHead();
@@ -897,9 +875,7 @@ short ExSortTcb::workUp()
case ex_queue::Q_INVALID:
{
- // LCOV_EXCL_START
ex_assert(0, "ExSortTcb::work() invalid state returned by child");
- // LCOV_EXCL_STOP
}; break;
}
}
@@ -912,15 +888,12 @@ short ExSortTcb::workUp()
// Inform child to cancel immediately. This may be called
// several times if the parent up queue remains full,
// but it has no unwanted side effect.
- // LCOV_EXCL_START
qchild_.down->cancelRequestWithParentIndex(
qparent_.down->getHeadIndex());
- // LCOV_EXCL_STOP
// continue
}
case ExSortTcb::SORT_ERROR_ON_RECEIVE:
{
- // LCOV_EXCL_START
if (qparent_.up->isFull()){
return workStatus(WORK_OK); // parent queue is full. Just return
}
@@ -948,7 +921,6 @@ short ExSortTcb::workUp()
pstate.step_ = ExSortTcb::SORT_DONE;
}
break;
- // LCOV_EXCL_STOP
case ExSortTcb::SORT_RECEIVE:
{
// check if we've got room in the up queue
@@ -980,9 +952,7 @@ short ExSortTcb::workUp()
pstate.allocatedTuppDesc_, pstate.noOverflow_,
workRC);
if (rc == 1)
- // LCOV_EXCL_START
return workRC;
- // LCOV_EXCL_STOP
}
break;
@@ -991,9 +961,7 @@ short ExSortTcb::workUp()
{
// check if we've got room in the parent up queue
if (qparent_.up->isFull()){
- // LCOV_EXCL_START
return workStatus(WORK_OK); // parent queue is full. Just return
- // LCOV_EXCL_STOP
}
rc = done(TRUE, // send Q_NO_DATA
@@ -1121,9 +1089,7 @@ short ExSortTcb::sortSend(ex_queue_entry * srcEntry,
{
if (sortTdb().sortOptions_->dontOverflow())
{
- // LCOV_EXCL_START
sortSendPool_->addBuffer(sortTdb().bufferSize_);
- // LCOV_EXCL_STOP
}
// add more buffers if there is more space
//available in the pool.
@@ -1143,7 +1109,6 @@ short ExSortTcb::sortSend(ex_queue_entry * srcEntry,
}
else
{
- // LCOV_EXCL_START
// Ask sort to overflow.
rc = sortUtil_->sortClientOutOfMem() ;
if (rc == SORT_IO_IN_PROGRESS)
@@ -1158,7 +1123,6 @@ short ExSortTcb::sortSend(ex_queue_entry * srcEntry,
{
createSortDiags();
step = ExSortTcb::SORT_ERROR;
- // LCOV_EXCL_STOP
break;
}
}
@@ -1195,7 +1159,6 @@ short ExSortTcb::sortSend(ex_queue_entry * srcEntry,
ex_assert(0,"Must get a tuple from pool as they must be available");
step = ExSortTcb::SORT_ERROR;
break;
- // LCOV_EXCL_STOP
}
}
@@ -1203,11 +1166,9 @@ short ExSortTcb::sortSend(ex_queue_entry * srcEntry,
}
else
{
- // LCOV_EXCL_START
// If the tuple was already allocated
td = allocatedTuppDesc;
allocatedTuppDesc = NULL;
- // LCOV_EXCL_STOP
}
//reaching here td is not NULL.
ex_expr::exp_return_type retCode = ex_expr::EXPR_OK;
@@ -1296,7 +1257,6 @@ short ExSortTcb::sortSend(ex_queue_entry * srcEntry,
if (qparent_.up->isFull()){
return WORK_OK;
- // LCOV_EXCL_STOP
}
ex_queue_entry *upEntry = qparent_.up->getTailEntry();
@@ -1304,9 +1264,7 @@ short ExSortTcb::sortSend(ex_queue_entry * srcEntry,
upEntry->copyAtp(srcEntry);
if (sortFromTop && (sortTdb().isNonFatalErrorTolerated()))
- // LCOV_EXCL_START
upEntry->upState.status = ex_queue::Q_OK_MMORE; // denotes nonfatal error
- // LCOV_EXCL_STOP
else
upEntry->upState.status = ex_queue::Q_SQLERROR;
@@ -1334,7 +1292,6 @@ short ExSortTcb::sortSend(ex_queue_entry * srcEntry,
// this rec for partialKey comparison.
if(sortTdb().partialSort())
- // LCOV_EXCL_START
// Partial sort is disabled and not active because it has issues
{
if(!setCompareTd_)
@@ -1385,14 +1342,12 @@ short ExSortTcb::sortSend(ex_queue_entry * srcEntry,
}
if (bmoStats_)
bmoStats_->incInterimRowCount();
- // LCOV_EXCL_STOP
rc = sortUtil_->sortSend(dataPointer,
newRecLen,
td) ;
if (rc == SORT_IO_IN_PROGRESS)
{
- // LCOV_EXCL_START
// Don't consume the child row - just return
// save the tuple descriptor that we used
allocatedTuppDesc = td;
@@ -1401,19 +1356,16 @@ short ExSortTcb::sortSend(ex_queue_entry * srcEntry,
// IPC and will schedule this operator again for next round
workRC = WORK_CALL_AGAIN;
return workStatus(1);
- // LCOV_EXCL_STOP
}
if (rc != SORT_SUCCESS)
{
// The tupp_descriptors already sent to sortUtil_
// will be cleaned up via sortUtil_->sortEnd(), but
// this one must be freed now.
- // LCOV_EXCL_START
td->setReferenceCount(0);
createSortDiags();
step = ExSortTcb::SORT_ERROR;
break;
- // LCOV_EXCL_STOP
}
}
break;
@@ -1423,20 +1375,16 @@ short ExSortTcb::sortSend(ex_queue_entry * srcEntry,
if(setCompareTd_)
{
// dereference setCompareTd_
- // LCOV_EXCL_START
ReleaseTupp(setCompareTd_);
setCompareTd_ = NULL;
- // LCOV_EXCL_STOP
}
sortPartiallyComplete_ = FALSE;
if (sortUtil_->sortSendEnd(noOverflow) != SORT_SUCCESS)
{
- // LCOV_EXCL_START
createSortDiags();
step = ExSortTcb::SORT_ERROR_ON_RECEIVE;
break;
- // LCOV_EXCL_STOP
}
// ensure that the rows affected are returned
@@ -1445,9 +1393,7 @@ short ExSortTcb::sortSend(ex_queue_entry * srcEntry,
{
if (sortDiag_)
{
- // LCOV_EXCL_START
sortDiag_->mergeAfter(*da);
- // LCOV_EXCL_STOP
}
else
{
@@ -1464,10 +1410,8 @@ short ExSortTcb::sortSend(ex_queue_entry * srcEntry,
case ex_queue::Q_SQLERROR:
{
if (qparent_.up->isFull()){
- // LCOV_EXCL_START
workRC = WORK_OK;
return workStatus(1);
- // LCOV_EXCL_STOP
}
ex_queue_entry *upEntry = qparent_.up->getTailEntry();
@@ -1491,10 +1435,8 @@ short ExSortTcb::sortSend(ex_queue_entry * srcEntry,
break;
case ex_queue::Q_INVALID:
- // LCOV_EXCL_START
ex_assert(0,"ExSortTcb::work() Invalid state returned by child");
break;
- // LCOV_EXCL_STOP
} // switch srcStatus
@@ -1555,11 +1497,9 @@ short ExSortTcb::sortReceive(ex_queue_entry * pentry_down,
{
// no more space in the pool to allocate sorted rows from.
//Return and come back later when some space gets freed up.
- // LCOV_EXCL_START
workRC = WORK_POOL_BLOCKED;
return workStatus(1);
}
- // LCOV_EXCL_STOP
}
tgtEntry->getAtp()->getTupp(sortTdb().tuppIndex_) = td;
ReleaseTupp(td);
@@ -1568,10 +1508,8 @@ short ExSortTcb::sortReceive(ex_queue_entry * pentry_down,
}
else
{
- // LCOV_EXCL_START
td = allocatedTuppDesc;
allocatedTuppDesc = NULL;
- // LCOV_EXCL_STOP
}
char *dataPointer = td->getTupleAddress();
@@ -1586,7 +1524,6 @@ short ExSortTcb::sortReceive(ex_queue_entry * pentry_down,
// partialSortPool_.
if(sortTdb().partialSort())
{
- // LCOV_EXCL_START
if (!allocatedTuppDesc)
{
if (pentry_down)
@@ -1609,7 +1546,6 @@ short ExSortTcb::sortReceive(ex_queue_entry * pentry_down,
receiveTd = allocatedTuppDesc;
allocatedTuppDesc = NULL;
}
- // LCOV_EXCL_STOP
}
else if (pentry_down)
tgtEntry->copyAtp(pentry_down);
@@ -1624,11 +1560,9 @@ short ExSortTcb::sortReceive(ex_queue_entry * pentry_down,
td->setReferenceCount(0);
if(sortTdb().partialSort())
{
- // LCOV_EXCL_START
// In the case of partial sort, we need to copy
// the record into sortPool directly.
memcpy(receiveTd->getTupleAddress(), td->getTupleAddress(), reclen);
- // LCOV_EXCL_STOP
}
else
tgtEntry->getAtp()->getTupp(sortTdb().tuppIndex_) = td;
@@ -1637,7 +1571,6 @@ short ExSortTcb::sortReceive(ex_queue_entry * pentry_down,
if (rc == SORT_IO_IN_PROGRESS)
{
- // LCOV_EXCL_START
if (noOverflow == FALSE)
// Tupp descriptor allocated, remember it
allocatedTuppDesc = td;
@@ -1647,7 +1580,6 @@ short ExSortTcb::sortReceive(ex_queue_entry * pentry_down,
allocatedTuppDesc = receiveTd;
receiveTd = NULL;
}
- // LCOV_EXCL_STOP
// Don't consume the child row - just return
// By returing work_call_again, scheduler will not give control back to
// IPC and will schedule this operator again for next round
@@ -1657,7 +1589,6 @@ short ExSortTcb::sortReceive(ex_queue_entry * pentry_down,
}
if (rc != SORT_SUCCESS)
{
- // LCOV_EXCL_START
// error returned
createSortDiags();
if(sortPartiallyComplete_)
@@ -1670,7 +1601,6 @@ short ExSortTcb::sortReceive(ex_queue_entry * pentry_down,
receiveTd = NULL;
}
return 0;
- // LCOV_EXCL_STOP
}
else
{
@@ -1749,11 +1679,9 @@ short ExSortTcb::sortReceive(ex_queue_entry * pentry_down,
// of the child row reads.
if(sortPartiallyComplete_)
{
- // LCOV_EXCL_START
qchild_.down->cancelRequestWithParentIndex(
qparent_.down->getHeadIndex());
step = ExSortTcb::SORT_CANCELED;
- // LCOV_EXCL_STOP
}
else
step = ExSortTcb::SORT_DONE;
@@ -1776,17 +1704,13 @@ short ExSortTcb::sortReceive(ex_queue_entry * pentry_down,
// EOF
if(receiveTd)
{
- // LCOV_EXCL_START
tgtEntry->getAtp()->getTupp(sortTdb().tuppIndex_).release();
receiveTd = NULL;
- // LCOV_EXCL_STOP
}
if(sortPartiallyComplete_)
{
- // LCOV_EXCL_START
step = ExSortTcb::RESTART_PARTIAL_SORT;
- // LCOV_EXCL_STOP
}
else
{
@@ -1815,13 +1739,11 @@ short ExSortTcb::sortReceive(ex_queue_entry * pentry_down,
if (bmoStats_ == NULL && getStatsEntry()->castToExMeasStats())
{
- // LCOV_EXCL_START
getStatsEntry()->castToExMeasStats()->incNumSorts(1);
Int64 elapsedTime;
elapsedTime = s.getStatElapsedTime();
getStatsEntry()->castToExMeasStats()->incSortElapsedTime(elapsedTime);
- // LCOV_EXCL_STOP
}
}
@@ -1855,9 +1777,7 @@ short ExSortTcb::done(
if (pUPda == NULL)
pUPda = ComDiagsArea::allocate(this->getGlobals()->getDefaultHeap());
else
- // LCOV_EXCL_START
pUPda->incrRefCount();
- // LCOV_EXCL_STOP
pUPda->mergeAfter(*sortDiag_);
pentry->setDiagsArea (pUPda);
@@ -1873,11 +1793,9 @@ short ExSortTcb::done(
sortUtil_->sortEnd();
if(setCompareTd_)
{
- // LCOV_EXCL_START
// dereference setCompareTd_
ReleaseTupp(setCompareTd_);
setCompareTd_ = NULL;
- // LCOV_EXCL_STOP
}
sortPartiallyComplete_ = FALSE;
@@ -1900,10 +1818,8 @@ short ExSortTcb::cancel()
= *((ExSortPrivateState *) pentry->pstate);
if (pstate.allocatedTuppDesc_)
{
- // LCOV_EXCL_START
ReleaseTupp(pstate.allocatedTuppDesc_);
pstate.allocatedTuppDesc_ = NULL;
- // LCOV_EXCL_STOP
}
switch (pstate.step_)
@@ -1912,11 +1828,9 @@ short ExSortTcb::cancel()
// Nothing is in the down queue yet for this request, but parent
// does expect a Q_NO_DATA so just change pstate.step_ to
// SORT_DONE;
- // LCOV_EXCL_START
pstate.step_ = SORT_DONE;
ioEventHandler_->schedule(); //schedule workUp to reply
break;
- // LCOV_EXCL_STOP
case SORT_PREP:
case SORT_SEND:
// Request has been sent to child, so cancel and discard child
@@ -1927,26 +1841,20 @@ short ExSortTcb::cancel()
case SORT_ERROR:
// Request-to-child still pending, so cancel and discard child
// responses.
- // LCOV_EXCL_START
qchild_.down->cancelRequestWithParentIndex(pindex);
// The parent is not interested to process error, go to cancel.
pstate.step_ = ExSortTcb::SORT_CANCELED;
break;
- // LCOV_EXCL_STOP
case SORT_RECEIVE:
if(sortPartiallyComplete_)
{
- // LCOV_EXCL_START
qchild_.down->cancelRequestWithParentIndex(pindex);
pstate.step_ = ExSortTcb::SORT_CANCELED;
- // LCOV_EXCL_STOP
}
else
// Child has returned Q_NO_DATA and entry pop'd from child up queue.
- // LCOV_EXCL_START
pstate.step_ = SORT_DONE;
break;
- // LCOV_EXCL_STOP
case SORT_ERROR_ON_RECEIVE:
// Child has returned Q_NO_DATA and entry pop'd from child up queue.
// The parent is not interested to process error, go to done.
@@ -1976,27 +1884,23 @@ ExSortPrivateState::ExSortPrivateState()
step_ = ExSortTcb::SORT_EMPTY;
noOverflow_ = TRUE;
}
-// LCOV_EXCL_START
ExSortPrivateState::~ExSortPrivateState()
{
if (allocatedTuppDesc_)
ReleaseTupp(allocatedTuppDesc_);
};
-// LCOV_EXCL_STOP
void ReleaseTupp(void * td)
{
#pragma nowarn(1506) // warning elimination
((tupp_descriptor *)td)->setReferenceCount(((tupp_descriptor *)td)->getReferenceCount() - 1);
#pragma warn(1506) // warning elimination
}
-// LCOV_EXCL_START
void CaptureTupp(void * td)
{
#pragma nowarn(1506) // warning elimination
((tupp_descriptor *)td)->setReferenceCount(((tupp_descriptor *)td)->getReferenceCount() + 1);
#pragma warn(1506) // warning elimination
}
-// LCOV_EXCL_STOP
////////////////////////////////////////////////////////////////////////////
// ExSortFromTopTcb: input is from parent, output is to child
////////////////////////////////////////////////////////////////////////////
@@ -2071,9 +1975,7 @@ short ExSortFromTopTcb::work()
{
if (qparent_.down->isEmpty())
{
- // LCOV_EXCL_START
return workStatus(WORK_OK);
- // LCOV_EXCL_STOP
}
pentry_down = qparent_.down->getHeadEntry();
@@ -2088,9 +1990,7 @@ short ExSortFromTopTcb::work()
eodToChild_ = FALSE;
if (pentry_down->downState.request == ex_queue::GET_EOD)
- // LCOV_EXCL_START
step_ = ExSortTcb::SORT_DONE_WITH_QND;
- // LCOV_EXCL_STOP
else
step_ = ExSortTcb::SORT_PREP;
}
@@ -2100,19 +2000,15 @@ short ExSortFromTopTcb::work()
{
if ( sortDiag_ != NULL )
{
- // LCOV_EXCL_START
sortDiag_->decrRefCount();
sortDiag_ = NULL; // reset
- // LCOV_EXCL_STOP
}
if (sortUtil_->sortInitialize(*sortCfg_, 0) != SORT_SUCCESS)
{
- // LCOV_EXCL_START
createSortDiags();
step_ = ExSortTcb::SORT_ERROR;
break;
- // LCOV_EXCL_STOP
}
step_ = ExSortTcb::SORT_SEND;
@@ -2212,9 +2108,7 @@ short ExSortFromTopTcb::work()
allocatedTuppDesc_, noOverflow_,
workRC);
if (rc == 1)
- // LCOV_EXCL_START
return workStatus(workRC);
- // LCOV_EXCL_STOP
if (step_ == ExSortTcb::SORT_DONE)
{
// All sorted rows have been sent to the child.
@@ -2298,7 +2192,6 @@ short ExSortFromTopTcb::work()
case ex_queue::Q_SQLERROR:
{
- // LCOV_EXCL_START
ex_queue_entry *pentry = qparent_.up->getTailEntry();
pentry->copyAtp(centry);
@@ -2313,7 +2206,6 @@ short ExSortFromTopTcb::work()
step_ = ExSortTcb::SORT_CANCEL_CHILD;
}
break;
- // LCOV_EXCL_STOP
case ex_queue::Q_OK_MMORE:
{
@@ -2332,9 +2224,7 @@ short ExSortFromTopTcb::work()
default:
{
- // LCOV_EXCL_START
ex_assert(0, "ExSortFromTopTcb::work() Error state Q_OK_MMORE from child");
- // LCOV_EXCL_STOP
}
break;
@@ -2347,7 +2237,6 @@ short ExSortFromTopTcb::work()
//SORT_ERROR can occur when processing rows before sending
//any row to child. In other words,pentry_down->downState.request
//is not received ex_queue::GET_EOD yet.
- // LCOV_EXCL_START
ex_assert(numSortedRows_ == 0, "ExSortFromTopTcb::work() Sort Error when row to child");
if (qparent_.up->isFull())
@@ -2366,14 +2255,12 @@ short ExSortFromTopTcb::work()
}
break;
- // LCOV_EXCL_STOP
case ExSortTcb::SORT_ERROR_ON_RECEIVE:
{
// this error is returned during sortReceive phase
// or at the end of sortSend when all rows have been sent
// to child.
- // LCOV_EXCL_START
if (qparent_.up->isFull())
{
return workStatus(WORK_OK); // parent queue is full.
@@ -2387,7 +2274,6 @@ short ExSortFromTopTcb::work()
step_ = ExSortTcb::SORT_CANCEL_CHILD;
}
break;
- // LCOV_EXCL_STOP
case ExSortTcb::SORT_CANCEL_CHILD:
{
// this state is reached when child returns an error
@@ -2404,7 +2290,6 @@ short ExSortFromTopTcb::work()
//In this case, just send a QND. This is achived by stepping
//to ExSortTcb::SORT_DONE_WITH_QND state. Cleanup is done in
//ExSortTcb::SORT_DONE_WITH_QND state.
- // LCOV_EXCL_START
if(numSortedRows_ == 0)
{
step_ = ExSortTcb::SORT_DONE_WITH_QND;
@@ -2453,7 +2338,6 @@ short ExSortFromTopTcb::work()
}
}
break;
- // LCOV_EXCL_STOP
case ExSortTcb::SORT_DONE_WITH_QND:
{
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/executor/ex_split_bottom.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ex_split_bottom.cpp b/core/sql/executor/ex_split_bottom.cpp
index b53b91c..77324f3 100644
--- a/core/sql/executor/ex_split_bottom.cpp
+++ b/core/sql/executor/ex_split_bottom.cpp
@@ -804,7 +804,6 @@ ExWorkProcRetcode ex_split_bottom_tcb::work()
// should be logged. On other platforms we skip the
// the core-file and Seapilot event. The Seaquest
// logic is encapsulated in ComDiags.cpp and ComRtUtils.cpp.
- // LCOV_EXCL_START
// I tested this code with regress/executor/TEST082.
// However, that test is disabled.
for (CollIndex i = 0; i < sendNodes_.entries(); i++)
@@ -835,7 +834,6 @@ ExWorkProcRetcode ex_split_bottom_tcb::work()
}
}
break;
- // LCOV_EXCL_STOP
}
case ComTdbSplitBottom::TEST_LOG4CXX:
{
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/executor/ex_tcb_private.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ex_tcb_private.cpp b/core/sql/executor/ex_tcb_private.cpp
index 388c874..fcdbaa7 100644
--- a/core/sql/executor/ex_tcb_private.cpp
+++ b/core/sql/executor/ex_tcb_private.cpp
@@ -50,7 +50,6 @@
ex_tcb_private_state::ex_tcb_private_state():errorCode_(0){}
-// LCOV_EXCL_START
ex_tcb_private_state::~ex_tcb_private_state(){}
ex_tcb_private_state * ex_tcb_private_state::allocate_new(const ex_tcb * /*tcb*/)
@@ -58,4 +57,3 @@ ex_tcb_private_state * ex_tcb_private_state::allocate_new(const ex_tcb * /*tcb*/
ex_assert(0, "Can't have private state for base tcb");
return (ex_tcb_private_state *) 0;
}
-// LCOV_EXCL_STOP
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/executor/ex_timeout.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ex_timeout.cpp b/core/sql/executor/ex_timeout.cpp
index 7df0f4c..2565450 100644
--- a/core/sql/executor/ex_timeout.cpp
+++ b/core/sql/executor/ex_timeout.cpp
@@ -181,7 +181,6 @@ short ExTimeoutTcb::work()
#if _DEBUG // For debugging only !!!!!
if ( getenv("DEBUG_TIMEOUT") ) {
- // LCOV_EXCL_START
ComDiagsArea* diagsArea =
ComDiagsArea::allocate (getGlobals()->getDefaultHeap());
char errmsg[120];
@@ -214,7 +213,6 @@ short ExTimeoutTcb::work()
diagsArea, (ExeErrorCode) -3066 );
} // end of debugging section
else
- // LCOV_EXCL_STOP
#endif
if ( goodTimeoutValue ) {
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/executor/ex_timeout.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/ex_timeout.h b/core/sql/executor/ex_timeout.h
index 8c5d95c..a4d867e 100644
--- a/core/sql/executor/ex_timeout.h
+++ b/core/sql/executor/ex_timeout.h
@@ -133,10 +133,10 @@ public:
inline Int32 orderedQueueProtocol()
const{return ((const ExTimeoutTdb &)tdb).orderedQueueProtocol();}
- void freeResources(){}; // LCOV_EXCL_LINE
+ void freeResources(){};
Int32 numChildren() const { return 0; }
- const ex_tcb* getChild(Int32 /*pos*/) const { return 0; } // LCOV_EXCL_LINE
+ const ex_tcb* getChild(Int32 /*pos*/) const { return 0; }
private:
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/executor/ex_transaction.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ex_transaction.cpp b/core/sql/executor/ex_transaction.cpp
index 437170b..083b202 100644
--- a/core/sql/executor/ex_transaction.cpp
+++ b/core/sql/executor/ex_transaction.cpp
@@ -172,7 +172,6 @@ short ExTransaction::getCurrentXnId(Int64 * tcbref, Int64 *transId,
return retcode;
}
-// LCOV_EXCL_START : code not used
#pragma nowarn(262) // warning elimination
short ExTransaction::getCurrentTxHandle(short * txHandle)
{
@@ -185,7 +184,6 @@ short ExTransaction::getCurrentTxHandle(short * txHandle)
return retcode;
}
#pragma warn(262) // warning elimination
-// LCOV_EXCL_STOP
#pragma nowarn(262) // warning elimination
@@ -202,7 +200,7 @@ short ExTransaction::waitForRollbackCompletion(Int64 transid)
if (transid)
rc = STATUSTRANSACTION(&status, transid); // using param transid
else
- rc = STATUSTRANSACTION(&status); // LCOV_EXCL_LINE using current transid
+ rc = STATUSTRANSACTION(&status);
if ((rc == 0) && (status != 5))
{
@@ -219,7 +217,7 @@ short ExTransaction::waitForRollbackCompletion(Int64 transid)
if (transid)
rc = STATUSTRANSACTION(&status, transid); // using param transid.
else
- rc = STATUSTRANSACTION(&status); // LCOV_EXCL_LINE using current transid
+ rc = STATUSTRANSACTION(&status);
if (! ((rc == 0) && (status != 5)))
done = TRUE;
@@ -243,7 +241,7 @@ short ExTransaction::waitForCommitCompletion(Int64 transid)
if (transid)
rc = STATUSTRANSACTION(&status, transid); // using param transid
else
- rc = STATUSTRANSACTION(&status); // LCOV_EXCL_LINE using current transid
+ rc = STATUSTRANSACTION(&status); // using current transid
if ((rc == 0) && (status != 3))
{
// check for return status in a loop until the transaction
@@ -257,7 +255,7 @@ short ExTransaction::waitForCommitCompletion(Int64 transid)
if (transid)
rc = STATUSTRANSACTION(&status, transid); // using param transid.
else
- rc = STATUSTRANSACTION(&status); // LCOV_EXCL_LINE using current transid
+ rc = STATUSTRANSACTION(&status); // using current transid
if (! ((rc == 0) && (status != 3)))
done = TRUE;
}
@@ -971,7 +969,6 @@ short ExTransaction::setProcessTransToContextTrans
// data integrity problems would be a likely result of any
// failure.
////////////////////////////////////////////////////////////
-// LCOV_EXCL_START : code not used
short ExTransaction::resetProcessTrans
(TmfPhandle_Struct * oldProcessTxHandle)
{
@@ -979,7 +976,6 @@ short ExTransaction::resetProcessTrans
return retcode;
}
-// LCOV_EXCL_STOP
void ExTransaction::setTransId(Int64 transid)
{
@@ -1147,7 +1143,6 @@ short ExTransTcb::work()
CliGlobals *cliGlobals =
stmtGlob->castToExMasterStmtGlobals()->getCliGlobals();
- // LCOV_EXCL_START code used only in Nonstop
// if inside of a UDR, let a SET XN stmt get through if it
// was compiled with setAllowedInXn option. This is allowed
// for jdbc/odbc/sqlj sql statements.
@@ -1175,7 +1170,6 @@ short ExTransTcb::work()
qparent_.up->insert();
}
- // LCOV_EXCL_STOP
else{
short rc;
@@ -1293,7 +1287,6 @@ short ExTransTcb::work()
}
break;
- // LCOV_EXCL_START : code not used
case ROLLBACK_: {
if (ta->userEndedExeXn()) {
ta->cleanupTransaction();
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/executor/ex_transaction.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/ex_transaction.h b/core/sql/executor/ex_transaction.h
index 8c5ed61..cadf57b 100644
--- a/core/sql/executor/ex_transaction.h
+++ b/core/sql/executor/ex_transaction.h
@@ -403,11 +403,11 @@ public:
ex_queue_pair getParentQueue() const{return qparent_;};
inline Int32 orderedQueueProtocol() const{return ((const ExTransTdb &)tdb).orderedQueueProtocol();}
- void freeResources(){}; // LCOV_EXCL_LINE Code not used
+ void freeResources(){};
Int32 numChildren() const { return 0; }
- const ex_tcb* getChild(Int32 /*pos*/) const { return 0; } // LCOV_EXCL_LINE Code not used
+ const ex_tcb* getChild(Int32 /*pos*/) const { return 0; }
private:
ex_queue_pair qparent_;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/executor/ex_tuple.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ex_tuple.cpp b/core/sql/executor/ex_tuple.cpp
index 3f8b9b2..a8a2e16 100644
--- a/core/sql/executor/ex_tuple.cpp
+++ b/core/sql/executor/ex_tuple.cpp
@@ -65,7 +65,6 @@ ex_tcb * ExTupleLeafTdb::build(ex_globals * glob)
return tcb;
}
-// LCOV_EXCL_START
///////////////////////////////////////
// class ExTupleNonLeafTdb
///////////////////////////////////////
@@ -81,7 +80,6 @@ ex_tcb * ExTupleNonLeafTdb::build(ex_globals * glob)
return tcb;
}
-// LCOV_EXCL_STOP
//////////////////////////////////////////
// class ExTupleTcb
@@ -131,14 +129,12 @@ ExTupleTcb::~ExTupleTcb()
freeResources();
}
-// LCOV_EXCL_START
short ExTupleTcb::work()
{
// should not reach here
ex_assert(0, "ExTupleTcb::work() must be redefined");
return WORK_OK;
}
-// LCOV_EXCL_STOP
void ExTupleTcb::freeResources()
{
@@ -353,7 +349,6 @@ ExWorkProcRetcode ExTupleLeafTcb::work()
#pragma warn(203) // warning elimination
}
-// LCOV_EXCL_START
///////////////////////////////////////////////
// class ExTupleNonLeafTcb
///////////////////////////////////////////////
@@ -645,7 +640,6 @@ ExWorkProcRetcode ExTupleNonLeafTcb::work()
return WORK_OK;
#pragma warn(203) // warning elimination
}
-// LCOV_EXCL_STOP
/////////////////////////////////////////////
// class ExTuplePrivateState
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/executor/ex_tuple.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/ex_tuple.h b/core/sql/executor/ex_tuple.h
index 3a64db6..c06de28 100644
--- a/core/sql/executor/ex_tuple.h
+++ b/core/sql/executor/ex_tuple.h
@@ -104,7 +104,6 @@ private:
// ---------------------------------------------------------------------
};
-// LCOV_EXCL_START
// -----------------------------------------------------------------------
// ExTupleNonLeafTdb
// -----------------------------------------------------------------------
@@ -155,10 +154,6 @@ private:
// the classes to the comexe project.
// ---------------------------------------------------------------------
};
- // LCOV_EXCL_STOP
-
-
-
////////////////////////////////////////
// class ExTupleTcb
@@ -203,7 +198,7 @@ public:
};
virtual Int32 numChildren() const { return 0;};
- virtual const ex_tcb* getChild(Int32 pos) const { return NULL;}; //LCOV_EXCL_LINE
+ virtual const ex_tcb* getChild(Int32 pos) const { return NULL;};
protected:
ex_queue_pair qparent;
@@ -235,7 +230,6 @@ public:
-// LCOV_EXCL_START
////////////////////////////////////////////////
// class ExTupleNonLeafTcb
////////////////////////////////////////////////
@@ -264,8 +258,6 @@ private:
queue_index nextToSendDown_; // next down queue index to send to server
};
-// LCOV_EXCL_STOP
-
class ExTuplePrivateState : public ex_tcb_private_state
{
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/executor/ex_tuple_flow.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ex_tuple_flow.cpp b/core/sql/executor/ex_tuple_flow.cpp
index a568a5c..53013d5 100644
--- a/core/sql/executor/ex_tuple_flow.cpp
+++ b/core/sql/executor/ex_tuple_flow.cpp
@@ -83,7 +83,6 @@ ExTupleFlowTcb::ExTupleFlowTcb(const ExTupleFlowTdb & tuple_flow_tdb,
{
CollHeap * space = glob->getSpace();
- // LCOV_EXCL_START
// Allocate the buffer pool, if tgtExpr_ is present
if (tuple_flow_tdb.tgtExpr_)
#pragma nowarn(1506) // warning elimination
@@ -91,7 +90,6 @@ ExTupleFlowTcb::ExTupleFlowTcb(const ExTupleFlowTdb & tuple_flow_tdb,
tuple_flow_tdb.bufferSize_,
glob->getSpace());
#pragma warn(1506) // warning elimination
- // LCOV_EXCL_STOP
tcbSrc_ = &src_tcb;
tcbTgt_ = &tgt_tcb;
@@ -124,12 +122,10 @@ ExTupleFlowTcb::ExTupleFlowTcb(const ExTupleFlowTdb & tuple_flow_tdb,
to_parent_cri,
space);
- // LCOV_EXCL_START
// fixup expressions
if (tflowTdb().tgtExpr_)
(void) tflowTdb().tgtExpr_->fixup(0, getExpressionMode(), this,
glob->getSpace(), glob->getDefaultHeap(), FALSE, glob);
- // LCOV_EXCL_STOP
}
@@ -256,7 +252,6 @@ short ExTupleFlowTcb::work()
{
// move this source row to target.
- // LCOV_EXCL_START
// BEGIN: - Read note at beginning of work().
//
if (tcbSrc_->getNodeType() == ComTdb::ex_PACKROWS)
@@ -270,7 +265,6 @@ short ExTupleFlowTcb::work()
}
//
// END:- Read note at beginning of work().
- // LCOV_EXCL_STOP
pstate.srcRequestCount_++;
tgt_entry->downState.request =
@@ -313,7 +307,6 @@ short ExTupleFlowTcb::work()
pstate.tgtRequests_++;
}
- // LCOV_EXCL_START
if ((pstate.tgtRowsSent_ == FALSE) &&
(src_entry->getDiagsArea()))
{
@@ -327,16 +320,13 @@ short ExTupleFlowTcb::work()
qParent_.up->getTailEntry();
up_entry->setDiagsArea(src_entry->getDiagsArea());
}
- // LCOV_EXCL_STOP
qSrc_.up->removeHead();
pstate.srcEOD_ = TRUE;
- // LCOV_EXCL_START
if (tflowTdb().sendEODtoTgt())
pstate.step_ = MOVE_EOD_TO_TGT_;
- // LCOV_EXCL_STOP
}
break;
@@ -409,7 +399,7 @@ short ExTupleFlowTcb::work()
default:
{
- ex_assert(0, "ExTupleFlowTcb::work() Error returned from src"); // LCOV_EXCL_LINE
+ ex_assert(0, "ExTupleFlowTcb::work() Error returned from src");
}
break;
} // switch
@@ -443,10 +433,8 @@ short ExTupleFlowTcb::work()
pstate.tgtRequests_++;
- // LCOV_EXCL_START
if (tflowTdb().sendEODtoTgt())
pstate.srcEOD_ = TRUE;
- // LCOV_EXCL_STOP
else
pstate.srcEOD_ = FALSE;
@@ -578,7 +566,7 @@ short ExTupleFlowTcb::work()
default:
{
- ex_assert(0, "ExTupleFlowTcb::work() Error returned from tgt"); // LCOV_EXCL_LINE
+ ex_assert(0, "ExTupleFlowTcb::work() Error returned from tgt");
}
break;
@@ -667,7 +655,7 @@ short ExTupleFlowTcb::work()
default:
{
- ex_assert(0, "ExTupleFlowTcb::work() Error returned from src"); // LCOV_EXCL_LINE
+ ex_assert(0, "ExTupleFlowTcb::work() Error returned from src");
}
break;
}
@@ -695,7 +683,7 @@ short ExTupleFlowTcb::work()
default:
{
- ex_assert(0, "ExTupleFlowTcb::work() Error returned from tgt"); // LCOV_EXCL_LINE
+ ex_assert(0, "ExTupleFlowTcb::work() Error returned from tgt");
}
break;
}
@@ -767,7 +755,6 @@ short ExTupleFlowTcb::work()
pentry->upState.parentIndex = pentry_down->downState.parentIndex;
pentry->upState.setMatchNo(pstate.matchCount_);
- // LCOV_EXCL_START
// BEGIN: Read note at beginning of work().
//
if(pstate.noOfUnPackedRows_ != 0)
@@ -783,7 +770,6 @@ short ExTupleFlowTcb::work()
}
//
// END: - Read note at beginning of work().
- // LCOV_EXCL_STOP
// if stats are to be collected, collect them.
if (getStatsEntry())
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/executor/key_range.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/key_range.h b/core/sql/executor/key_range.h
index e493d58..29da34d 100644
--- a/core/sql/executor/key_range.h
+++ b/core/sql/executor/key_range.h
@@ -106,7 +106,7 @@ public:
virtual void release(); // release
- virtual void display() const {}; // LCOV_EXCL_LINE
+ virtual void display() const {};
// key range iterator methods
virtual ExeErrorCode initNextKeyRange(sql_buffer_pool *pool,
@@ -123,12 +123,10 @@ public:
// on the next method, we pass in NULL if a probe resulted in no
// data; we pass in the encoded key value if data was obtained
-// LCOV_EXCL_START
virtual void reportProbeResult(char *)
{
ex_assert(0,"reportProbeResult() was called when it shouldn't have been");
};
-// LCOV_EXCL_STOP
// when getNextKeyRange() returns FETCH_RANGE or PROBE_RANGE, the
// caller should call the next four methods to get its hands on the
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/executor/timeout_data.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/timeout_data.h b/core/sql/executor/timeout_data.h
index 82afc6b..8eefea7 100644
--- a/core/sql/executor/timeout_data.h
+++ b/core/sql/executor/timeout_data.h
@@ -157,7 +157,7 @@ public:
TimeoutData(CollHeap *heap, ULng32 estimatedMaxEntries = 16); // ctor
- ~TimeoutData() {} ; // do nothing dtor // LCOV_EXCL_LINE
+ ~TimeoutData() {} ; // do nothing dtor
// for lock timeout
void setAllLockTimeout( Lng32 lockTimeoutValue );
@@ -171,7 +171,7 @@ public:
void setStreamTimeout( Lng32 streamTimeoutValue );
void resetStreamTimeout();
NABoolean isStreamTimeoutSet() { return streamTimeoutSet_;} ;
- Lng32 getStreamTimeout() { return streamTimeoutValue_;} ; // LCOV_EXCL_LINE
+ Lng32 getStreamTimeout() { return streamTimeoutValue_;} ;
// copy relevant data from this TimeoutData object into another object,
// The "anotherTD" may need to be allocated (if there's relevant data)
@@ -192,7 +192,7 @@ public:
void unpackObj(IpcConstMessageBufferPtr &buffer);
#if _DEBUG // for debugging only
- ULng32 entries() { return timeoutsHT_.entries() ; } ; // LCOV_EXCL_LINE
+ ULng32 entries() { return timeoutsHT_.entries() ; } ;
#endif
private:
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/exp/ExpLOBprocess.cpp
----------------------------------------------------------------------
diff --git a/core/sql/exp/ExpLOBprocess.cpp b/core/sql/exp/ExpLOBprocess.cpp
index af4569b..9177902 100644
--- a/core/sql/exp/ExpLOBprocess.cpp
+++ b/core/sql/exp/ExpLOBprocess.cpp
@@ -209,12 +209,10 @@ ExLobGlobals *lobGlobals = NULL;
//*****************************************************************************
//*****************************************************************************
-// LCOV_EXCL_START
static void sigterm_handler(Lng32 signo)
{
printf("sigterm received\n");
}
-// LCOV_EXCL_STOP
void LOB_process_stop(short flag)
{
@@ -553,10 +551,8 @@ Lng32 main(Lng32 argc, char *argv[])
// Register sigterm_handler as our signal handler for SIGTERM.
if (signal(SIGTERM, sigterm_handler) == SIG_ERR)
{
- // LCOV_EXCL_START
cout << "*** Cannot handle SIGTERM ***" << endl;
exit(1);
- // LCOV_EXCL_STOP
}
retval = pthread_mutex_init(&cnfg_mutex, NULL);
@@ -565,7 +561,7 @@ Lng32 main(Lng32 argc, char *argv[])
// seaquest related stuff
retval = msg_init_attach(&argc, &argv, true, (char *)"");
if (retval)
- printf("msg_init_attach returned: %d\n", retval); // LCOV_EXCL_LINE
+ printf("msg_init_attach returned: %d\n", retval);
// sq_fs_dllmain();
msg_mon_process_startup(true);
msg_mon_enable_mon_messages(1);
@@ -573,10 +569,8 @@ Lng32 main(Lng32 argc, char *argv[])
retval = atexit((void(*)(void))msg_mon_process_shutdown);
if (retval != 0)
{
- // LCOV_EXCL_START
cout << "*** atexit failed with error " << retval << " ***" << endl;
exit(1);
- // LCOV_EXCL_STOP
}
// setup log4cxx
QRLogger::initLog4cxx(QRLogger::QRL_LOB);
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/exp/ExpPCode.cpp
----------------------------------------------------------------------
diff --git a/core/sql/exp/ExpPCode.cpp b/core/sql/exp/ExpPCode.cpp
index f3f2096..540136f 100644
--- a/core/sql/exp/ExpPCode.cpp
+++ b/core/sql/exp/ExpPCode.cpp
@@ -1293,7 +1293,6 @@ Int32 PCode::isInstructionRangeType( PCIT::Instruction instruction)
};
}
-// LCOV_EXCL_START
Int32 PCode::profileInit() {
if(profileCounts_) delete [] profileCounts_;
if(profileTimes_) delete [] profileTimes_;
@@ -1307,12 +1306,10 @@ Int32 PCode::profileInit() {
return 0;
}
-// LCOV_EXCL_STOP
Int32 PCode::profilePrint() {
PCIListIter iter(pciList_);
if(!profileCounts_) return 0;
- // LCOV_EXCL_START
Int32 pciNum = 0;
for(PCI *pci = iter.first(); pci; pci = iter.next()) {
if(pci->getOperation() == PCIT::Op_PROFILE) {
@@ -1321,10 +1318,8 @@ Int32 PCode::profilePrint() {
}
pciNum++;
}
- // LCOV_EXCL_STOP
return 0;
}
-// LCOV_EXCL_START
//buffer should be 32 bytes
void PCIT::operandString(Int32 operand, char* buffer) {
// str_sprintf(buffer, "%8.8X", operand);
@@ -1557,7 +1552,6 @@ void PCode::dumpContents(PCodeBinary* pCode, char* buf, Int32 bufLen) {
buf[len+1] = 0;
}
-// LCOV_EXCL_STOP
PCodeBinary * PCode::generateCodeSegment(Int32 length,
Int32 *atpCode,
Int32 *atpIndexCode,
@@ -1788,7 +1782,6 @@ const char *PCIT::operationString(PCIT::Operation op) {
case PCIT::Op_LD_ATP: return("LD_ATP");
case PCIT::Op_LD_UNALIGNED_ATP: return("LD_UNALIGNED_ATP");
case PCIT::Op_MV_ATP_N: return("MV_N");*/
- // LCOV_EXCL_START
case PCIT::Op_OPDATA: return("OPDATA");
case PCIT::Op_MOVE: return("MOVE");
@@ -1816,7 +1809,6 @@ const char *PCIT::operationString(PCIT::Operation op) {
case PCIT::Op_AND: return("AND");
case PCIT::Op_OR: return("OR");
- // LCOV_EXCL_STOP
case PCIT::Op_SUM: return("SUM");
case PCIT::Op_MINMAX: return("MINMAX");
case PCIT::Op_ADD: return("ADD");
@@ -1834,7 +1826,6 @@ const char *PCIT::operationString(PCIT::Operation op) {
case PCIT::Op_DECODE: return("DECODE");
case PCIT::Op_GENFUNC: return("GENFUNC");
- // LCOV_EXCL_START
case PCIT::Op_HASH: return("HASH");
case PCIT::Op_FILL_MEM_BYTES: return("FILL_MEM_BYTES");
case PCIT::Op_RETURN: return("RETURN");
@@ -1843,10 +1834,8 @@ const char *PCIT::operationString(PCIT::Operation op) {
case PCIT::Op_BRANCH_AND: return("BRANCH_AND");
case PCIT::Op_BRANCH_OR: return("BRANCH_OR");
case PCIT::Op_TARGET: return("TARGET");
- // LCOV_EXCL_STOP
case PCIT::Op_RANGE_LOW: return("RANGE_LOW");
case PCIT::Op_RANGE_HIGH: return("RANGE_HIGH");
- // LCOV_EXCL_START
case PCIT::Op_REPLACE_NULL: return("REPLACE_NULL");
case PCIT::Op_CLAUSE: return("CLAUSE");
@@ -1868,7 +1857,6 @@ const char *PCIT::operationString(PCIT::Operation op) {
case PCIT::Op_CONV_VC_PTR: return("CONV_VC_PTR");
case PCIT::Op_END: return("END");
- // LCOV_EXCL_STOP
default: return("UNKNOWN OPERATION");
}
}
@@ -1896,7 +1884,6 @@ const char *PCIT::addressingModeString(PCIT::AddressingMode am) {
case PCIT::IBIN8U: return("IBIN8U");
case PCIT::IBIN16U: return("IBIN16U");
case PCIT::IBIN64S: return("IBIN64S");
- // LCOV_EXCL_START
case PCIT::IBIN32S: return("IBIN32S");
case PCIT::IATTR4: return("IATTR4");
case PCIT::IATTR3: return("IATTR3");
@@ -1904,14 +1891,11 @@ const char *PCIT::addressingModeString(PCIT::AddressingMode am) {
case PCIT::MATTR3: return("MATTR3");
case PCIT::MATTR4: return("MATTR4");
- // LCOV_EXCL_STOP
case PCIT::MATTR5: return("MATTR5");
- // LCOV_EXCL_START
case PCIT::MATTR6: return("MATTR6");
case PCIT::MUNI: return("MUNI");
case PCIT::MUNIV: return("MUNIV");
- // LCOV_EXCL_STOP
case PCIT::IPTR: return("IPTR");
@@ -2651,7 +2635,6 @@ PCIID PCode::nullBranchHelper(AttributesPtr *attrs,
//
else
{
- // LCOV_EXCL_START
if( attrA->isSQLMXAlignedFormat() || attrB->isSQLMXAlignedFormat() )
{
AML aml(PCIT::MPTR32,PCIT::MPTR32,PCIT::IPTR,PCIT::IPTR);
@@ -2672,7 +2655,6 @@ PCIID PCode::nullBranchHelper(AttributesPtr *attrs,
attrB->getAtp(), attrB->getAtpIndex(),
attrB->getNullIndOffset());
PCI pci(PCIT::Op_NULL_VIOLATION, aml, ol);
- // LCOV_EXCL_STOP
code.append(pci);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/exp/ExpPCodeOptimizations.cpp
----------------------------------------------------------------------
diff --git a/core/sql/exp/ExpPCodeOptimizations.cpp b/core/sql/exp/ExpPCodeOptimizations.cpp
index fff0647..326c614 100644
--- a/core/sql/exp/ExpPCodeOptimizations.cpp
+++ b/core/sql/exp/ExpPCodeOptimizations.cpp
@@ -9734,7 +9734,6 @@ OptPCodeCache::logPCCEvent( Int32 eventType
}
#endif // OPT_PCC_DEBUG==1
-// LCOV_EXCL_START
//
// printPCodeExprCacheStats() -- intended to be called by gdb to give the
// developer a formatted view of the cache's statistics.
@@ -9748,4 +9747,3 @@ OptPCodeCache::printPCodeExprCacheStats()
printf("MaxOptPCodeSize = %d, MaxHitsForAnyOneEntry = %ld, MaxHitsForAnyDeletedEntry = %ld\n",
maxOptPCodeSize_ , maxHits_ , maxHitsDel_ );
}
-// LCOV_EXCL_STOP
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/exp/ExpSequenceFunction.cpp
----------------------------------------------------------------------
diff --git a/core/sql/exp/ExpSequenceFunction.cpp b/core/sql/exp/ExpSequenceFunction.cpp
index 8c94be0..b64e323 100644
--- a/core/sql/exp/ExpSequenceFunction.cpp
+++ b/core/sql/exp/ExpSequenceFunction.cpp
@@ -101,19 +101,13 @@ ex_expr::exp_return_type ExpSequenceFunction::pCodeGenerate(Space *space, UInt32
return ex_clause::pCodeGenerate(space, f);
if(getNumOperands() != 2 && getNumOperands() != 3)
- // LCOV_EXCL_START
return ex_clause::pCodeGenerate(space, f);
- // LCOV_EXCL_STOP
if(!nullRowIsZero())
- // LCOV_EXCL_START
return ex_clause::pCodeGenerate(space, f);
- // LCOV_EXCL_STOP
if(!isLeading() || (winSize() != 0))
- // LCOV_EXCL_START
return ex_clause::pCodeGenerate(space, f);
- // LCOV_EXCL_STOP
AttributesPtr *attrs = getOperand();
Lng32 fsDataType = attrs[1]->getDatatype();
@@ -127,9 +121,7 @@ ex_expr::exp_return_type ExpSequenceFunction::pCodeGenerate(Space *space, UInt32
length = attrs[2]->getLength();
if(fsDataType != REC_BIN32_SIGNED || length != 4)
- // LCOV_EXCL_START
return ex_clause::pCodeGenerate(space, f);
- // LCOV_EXCL_STOP
}
// If we get to this point, we have decided to generate PCode for this
@@ -223,9 +215,7 @@ ex_expr::exp_return_type ExpSequenceFunction::eval(char *op_data[],
Int32 index;
if(getNumOperands() >= 3) {
if(attrs[2]->getNullFlag() && !op_data[-2 * MAX_OPERANDS + 2])
- // LCOV_EXCL_START
index = -1;
- // LCOV_EXCL_STOP
else
index = *((Int32 *)op_data[2]);
}
@@ -246,10 +236,8 @@ ex_expr::exp_return_type ExpSequenceFunction::eval(char *op_data[],
if(rc == -1)
{
- // LCOV_EXCL_START
ExRaiseSqlError(heap, diagsArea, EXE_HISTORY_BUFFER_TOO_SMALL);
return ex_expr::EXPR_ERROR;
- // LCOV_EXCL_STOP
}
if(row)
{
@@ -298,21 +286,17 @@ ex_expr::exp_return_type ExpSequenceFunction::eval(char *op_data[],
case REC_BIN16_UNSIGNED:
case REC_BIN16_SIGNED:
{
- // LCOV_EXCL_START
// hiding code from code coverag tool--
short value = 0;
str_cpy_all(dstData, (char *) &value, sizeof(value));
break;
- // LCOV_EXCL_STOP
}
case REC_BIN32_SIGNED:
case REC_BIN32_UNSIGNED:
{
- // LCOV_EXCL_START
Lng32 value = 0;
str_cpy_all(dstData, (char *) &value, sizeof(value));
break;
- // LCOV_EXCL_STOP
}
case REC_BIN64_SIGNED:
{
@@ -322,11 +306,9 @@ ex_expr::exp_return_type ExpSequenceFunction::eval(char *op_data[],
}
case REC_IEEE_FLOAT32:
{
- // LCOV_EXCL_START
float value = 0;
str_cpy_all(dstData, (char *) &value, sizeof(value));
break;
- // LCOV_EXCL_STOP
}
case REC_IEEE_FLOAT64:
{
@@ -349,9 +331,7 @@ ex_expr::exp_return_type ExpSequenceFunction::eval(char *op_data[],
getOperand(1)->getScale(),
NULL, 0, heap, diagsArea,
CONV_UNKNOWN) != ex_expr::EXPR_OK) {
- // LCOV_EXCL_START
return ex_expr::EXPR_ERROR;
- // LCOV_EXCL_STOP
}
break;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/exp/ExpSqlTupp.cpp
----------------------------------------------------------------------
diff --git a/core/sql/exp/ExpSqlTupp.cpp b/core/sql/exp/ExpSqlTupp.cpp
index 26d8db0..831b3ce 100644
--- a/core/sql/exp/ExpSqlTupp.cpp
+++ b/core/sql/exp/ExpSqlTupp.cpp
@@ -63,7 +63,6 @@ tupp::~tupp() // destructor
// release the pointer before deallocating the space for it
release();
}
-// LCOV_EXCL_START
Long tupp::pack(void * space)
{
if (tuppDescPointer)
@@ -82,7 +81,6 @@ Lng32 tupp::unpack(Lng32 base)
return 0;
}
-// LCOV_EXCL_STOP
tupp_descriptor::tupp_descriptor()
{
init();
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/exp/exp_aggregate.cpp
----------------------------------------------------------------------
diff --git a/core/sql/exp/exp_aggregate.cpp b/core/sql/exp/exp_aggregate.cpp
index ab06402..60e5ea4 100644
--- a/core/sql/exp/exp_aggregate.cpp
+++ b/core/sql/exp/exp_aggregate.cpp
@@ -133,7 +133,6 @@ ex_expr::exp_return_type ex_aggregate_clause::init()
{
return ex_expr::EXPR_OK;
}
-// LCOV_EXCL_START
ex_expr::exp_return_type ex_aggregate_clause::eval(char * /*op_data*/[],
CollHeap *heap,
ComDiagsArea** diagsArea)
@@ -141,7 +140,6 @@ ex_expr::exp_return_type ex_aggregate_clause::eval(char * /*op_data*/[],
ExRaiseSqlError(heap, diagsArea, EXE_INTERNAL_ERROR);
return ex_expr::EXPR_ERROR;
}
-// LCOV_EXCL_STOP
/////////////////////////////////////////////////
// class ex_aggr_one_row_clause
/////////////////////////////////////////////////
@@ -199,7 +197,6 @@ ex_expr::exp_return_type ex_aggr_any_true_max_clause::eval(char *op_data[],
case -1: // operand is NULL
{
// remember that a null was seen.
- // LCOV_EXCL_START
nullSeen_ = 1;
// Genesis 10-040203-2921
@@ -225,7 +222,6 @@ ex_expr::exp_return_type ex_aggr_any_true_max_clause::eval(char *op_data[],
{
ExRaiseSqlError(heap, diagsArea, EXE_INTERNAL_ERROR);
retcode = ex_expr::EXPR_ERROR;
- // LCOV_EXCL_STOP
}
break;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/exp/exp_arith.cpp
----------------------------------------------------------------------
diff --git a/core/sql/exp/exp_arith.cpp b/core/sql/exp/exp_arith.cpp
index c5d5ce5..b229d09 100644
--- a/core/sql/exp/exp_arith.cpp
+++ b/core/sql/exp/exp_arith.cpp
@@ -393,14 +393,12 @@ short EXP_FIXED_BIGN_OV_DIV(Attributes * op1,
if(op1->isSimpleType())
{
char * op1_data[2];
- // LCOV_EXCL_START
op1_data[0] = op1BNdata;
op1_data[1] = op_data[1];
rc = op1BN.castFrom(op1, op1_data, NULL, NULL);
if(rc)
return -1;
div_data[1] = op1BNdata;
- // LCOV_EXCL_STOP
}
else
div_data[1] = op_data[1];
@@ -447,7 +445,6 @@ Int64 EXP_FIXED_BIGN_OV_MOD(Attributes * op1,
//convert op1 & op2 to bignum if not already bignum
if(op1->isSimpleType())
{
- // LCOV_EXCL_START
char * op1_data[2];
op1_data[0] = op1BNdata;
op1_data[1] = op_data[0];
@@ -458,7 +455,6 @@ Int64 EXP_FIXED_BIGN_OV_MOD(Attributes * op1,
return -1;
}
mod_data[1] = op1BNdata;
- // LCOV_EXCL_STOP
}
else
mod_data[1] = op_data[0];
@@ -471,10 +467,8 @@ Int64 EXP_FIXED_BIGN_OV_MOD(Attributes * op1,
rc = op2BN.castFrom(op2, op2_data, NULL, NULL);
if(rc)
{
- // LCOV_EXCL_START
*ov = 1;
return -1;
- // LCOV_EXCL_STOP
}
mod_data[2] = op2BNdata;
}
@@ -498,10 +492,8 @@ Int64 EXP_FIXED_BIGN_OV_MOD(Attributes * op1,
rc = modBN.div(&op1BN, &op2BN, temp_data, NULL, NULL);
if(rc)
{
- // LCOV_EXCL_START
*ov = 1;
return -1;
- // LCOV_EXCL_STOP
}
//calculate (x/y) * y
@@ -512,10 +504,8 @@ Int64 EXP_FIXED_BIGN_OV_MOD(Attributes * op1,
rc = modBN.mul(&op1BN, &op2BN, temp_data);
if(rc)
{
- // LCOV_EXCL_START
*ov = 1;
return -1;
- // LCOV_EXCL_STOP
}
//Calculate final result z = x - xByYTimesY
@@ -631,7 +621,6 @@ ex_arith_sum_clause::processNulls(char *null_data[],
// N y set a to nonnull and zero and call eval to compute A=1+0
// N N do nothing (A=N)
//
-// LCOV_EXCL_START
ex_expr::exp_return_type
ex_arith_count_clause::processNulls(char *null_data[],
CollHeap *heap,
@@ -657,7 +646,6 @@ ex_arith_count_clause::processNulls(char *null_data[],
return ex_expr::EXPR_OK;
}
-// LCOV_EXCL_STOP
ex_expr::exp_return_type ex_arith_clause::eval(char *op_data[],
CollHeap *heap,
ComDiagsArea** diagsArea)
@@ -671,14 +659,12 @@ ex_expr::exp_return_type ex_arith_clause::eval(char *op_data[],
*(short *)op_data[0] = *(short *)op_data[1] + *(short *)op_data[2];
#pragma warn(1506) // warning elimination
break;
- // LCOV_EXCL_START
case ADD_BIN16S_BIN16S_BIN32S:
*(Lng32 *)op_data[0] = *(short *)op_data[1] + *(short *)op_data[2];
break;
case ADD_BIN16S_BIN32S_BIN32S:
*(Lng32 *)op_data[0] = *(short *)op_data[1] + *(Lng32 *)op_data[2];
break;
- // LCOV_EXCL_STOP
case ADD_BIN32S_BIN16S_BIN32S:
*(Lng32 *)op_data[0] = *(Lng32 *)op_data[1] + *(short *)op_data[2];
break;
@@ -686,10 +672,8 @@ ex_expr::exp_return_type ex_arith_clause::eval(char *op_data[],
*(Lng32 *)op_data[0] = *(Lng32 *)op_data[1] + *(Lng32 *)op_data[2];
break;
case ADD_BIN32S_BIN64S_BIN64S:
- // LCOV_EXCL_START
*(Int64 *)op_data[0] = *(Int64 *)op_data[2] + *(Lng32 *)op_data[1];
break;
- // LCOV_EXCL_STOP
case ADD_BIN64S_BIN32S_BIN64S:
*(Int64 *)op_data[0] = *(Int64 *)op_data[1] + *(Lng32 *)op_data[2];
break;
@@ -702,10 +686,8 @@ ex_expr::exp_return_type ex_arith_clause::eval(char *op_data[],
&ov);
if (ov)
{
- // LCOV_EXCL_START
ExRaiseSqlError(heap, diagsArea, EXE_NUMERIC_OVERFLOW);
return ex_expr::EXPR_ERROR;
- // LCOV_EXCL_STOP
}
}
@@ -720,10 +702,8 @@ ex_expr::exp_return_type ex_arith_clause::eval(char *op_data[],
*(ULng32 *)op_data[0] = *(unsigned short *)op_data[1] + *(unsigned short *)op_data[2];
break;
case ADD_BIN16U_BIN32U_BIN32U:
- // LCOV_EXCL_START
*(ULng32 *)op_data[0] = *(unsigned short *)op_data[1] + *(ULng32 *)op_data[2];
break;
- // LCOV_EXCL_STOP
case ADD_BIN32U_BIN16U_BIN32U:
*(ULng32 *)op_data[0] = *(ULng32 *)op_data[1] + *(unsigned short *)op_data[2];
break;
@@ -734,13 +714,11 @@ ex_expr::exp_return_type ex_arith_clause::eval(char *op_data[],
*(Int64 *)op_data[0] = *(Int64 *)op_data[2] + *(unsigned short *)op_data[1];
break;
case ADD_BIN64S_BPINTU_BIN64S:
- // LCOV_EXCL_START
*(Int64 *)op_data[0] = *(Int64 *)op_data[1] + *(unsigned short *)op_data[2];
break;
case ADD_BIN32U_BIN64S_BIN64S:
*(Int64 *)op_data[0] = *(Int64 *)op_data[2] + *(ULng32 *)op_data[1];
break;
- // LCOV_EXCL_STOP
case ADD_BIN64S_BIN32U_BIN64S:
*(Int64 *)op_data[0] = *(Int64 *)op_data[1] + *(ULng32 *)op_data[2];
break;
@@ -792,7 +770,6 @@ ex_expr::exp_return_type ex_arith_clause::eval(char *op_data[],
/* SUB operation */
case SUB_BIN16S_BIN16S_BIN16S:
#pragma nowarn(1506) // warning elimination
- // LCOV_EXCL_START
*(short *)op_data[0] = *(short *)op_data[1] - *(short *)op_data[2];
#pragma warn(1506) // warning elimination
break;
@@ -808,7 +785,6 @@ ex_expr::exp_return_type ex_arith_clause::eval(char *op_data[],
case SUB_BIN32S_BIN32S_BIN32S:
*(Lng32 *)op_data[0] = *(Lng32 *)op_data[1] - *(Lng32 *)op_data[2];
break;
- // LCOV_EXCL_STOP
case SUB_BIN64S_BIN64S_BIN64S:
{
short ov;
@@ -817,10 +793,8 @@ ex_expr::exp_return_type ex_arith_clause::eval(char *op_data[],
&ov);
if (ov)
{
- // LCOV_EXCL_START
ExRaiseSqlError(heap, diagsArea, EXE_NUMERIC_OVERFLOW);
return ex_expr::EXPR_ERROR;
- // LCOV_EXCL_STOP
}
//*(Int64 *)op_data[0] = *(Int64 *)op_data[1] - *(Int64 *)op_data[2];
[06/14] incubator-trafodion git commit: lcov: commit #1
Posted by an...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/optimizer/MultiJoin.h
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/MultiJoin.h b/core/sql/optimizer/MultiJoin.h
index 9e9f6df..1e539b2 100644
--- a/core/sql/optimizer/MultiJoin.h
+++ b/core/sql/optimizer/MultiJoin.h
@@ -62,11 +62,9 @@ public:
heap_(outHeap)
{}
-// LCOV_EXCL_START :dd
// Destructor
~JBBCExprGroupEntry()
{}
-// LCOV_EXCL_STOP
ExprGroupId & getExprGroupId()
{
@@ -305,14 +303,12 @@ public:
return jbbSubset_;
}
- // LCOV_EXCL_START
// code no longer used. Used to be called from LargeScopeRules.cpp method
// MJStarJoinIRule::computeCostForFactTable but this code is no longer used
ExprGroupId getChildFromJBBCId(CANodeId jbbc) const
{
return childrenMap_.getExprGroupIdOfJBBC(jbbc);
}
- // LCOV_EXCL_STOP
Join * getPreferredJoin();
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/optimizer/MvLog.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/MvLog.cpp b/core/sql/optimizer/MvLog.cpp
index c648853..bc99cad 100644
--- a/core/sql/optimizer/MvLog.cpp
+++ b/core/sql/optimizer/MvLog.cpp
@@ -48,7 +48,6 @@
#include "ComMvAttributeBitmap.h"
// MVLOG command is not supported
-// LCOV_EXCL_START
#pragma nowarn(1000) // warning elimination
const MvLogInternalNames MvLog::internalNames_;
@@ -1409,4 +1408,3 @@ void MvLog::appendToExprList(ItemExprList& toAddto,
emptyCorrName_);
}
-// LCOV_EXCL_STOP
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/optimizer/MvLog.h
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/MvLog.h b/core/sql/optimizer/MvLog.h
index 3054d28..ed9314c 100644
--- a/core/sql/optimizer/MvLog.h
+++ b/core/sql/optimizer/MvLog.h
@@ -39,7 +39,6 @@
#include "RelMisc.h"
// MVLOG command is not supported
-// LCOV_EXCL_START
class MvLogInternalNames;
@@ -248,6 +247,5 @@ private:
static const char simpleRangeTuple_[];
}; // class MvLogInternalNames
-// LCOV_EXCL_STOP
#endif // MVLOG_H
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/optimizer/MvMultiTxnMavBuilder.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/MvMultiTxnMavBuilder.cpp b/core/sql/optimizer/MvMultiTxnMavBuilder.cpp
index 20bd4c4..0ae276f 100644
--- a/core/sql/optimizer/MvMultiTxnMavBuilder.cpp
+++ b/core/sql/optimizer/MvMultiTxnMavBuilder.cpp
@@ -315,7 +315,6 @@ RelExpr *MvMultiTxnMavBuilder::buildReadIudLogBlock()
// Ofcourse that sorting the range log records is must cheaper then sorting
// the table records after the join.
// Excluded from coverage test - used only with range logging.
-// LCOV_EXCL_START
Union *MvMultiTxnMavBuilder::buildUnionBetweenRangeAndIudBlocks(RelExpr *scanIUDLogBlock,
RelExpr *scanRangeLogBlock) const
{
@@ -324,16 +323,13 @@ Union *MvMultiTxnMavBuilder::buildUnionBetweenRangeAndIudBlocks(RelExpr *scanIUD
return unionNode;
} // MvMultiTxnMavBuilder::buildUnionBetweenRangeAndIudBlocks()
-// LCOV_EXCL_STOP
//----------------------------------------------------------------------------
// Excluded from coverage test - used only with range logging.
-// LCOV_EXCL_START
NABoolean MvMultiTxnMavBuilder::needAlternateCIorder() const
{
return TRUE;
}
-// LCOV_EXCL_STOP
//----------------------------------------------------------------------------
ItemExpr *MvMultiTxnMavBuilder::buildSelectionListForScanOnIudLog() const
@@ -688,7 +684,6 @@ RelExpr *MvMultiTxnMavBuilder::buildInsertContextNode()
// b) Catchup predicates
// c) Phase1 predicates
// Excluded from coverage test - used only with range logging.
-// LCOV_EXCL_START
ItemExpr *MvMultiTxnMavBuilder::buildSelectionPredicateForScanOnRangeLog() const
{
// a)
@@ -728,7 +723,6 @@ ItemExpr *MvMultiTxnMavBuilder::buildSelectionPredicateForScanOnRangeLog() const
return result;
}
-// LCOV_EXCL_STOP
//////////////////////////////////////////////////////////////////////////////
// Add the following selection predicate to the Scan of the range log for
@@ -737,7 +731,6 @@ ItemExpr *MvMultiTxnMavBuilder::buildSelectionPredicateForScanOnRangeLog() const
//
// Predicate a) is only added for Catchup activations.
// Excluded from coverage test - used only with range logging.
-// LCOV_EXCL_START
ItemExpr *MvMultiTxnMavBuilder::buildCatchupSelectionPredicateForScanOnRangeLog() const
{
// a)
@@ -757,7 +750,6 @@ ItemExpr *MvMultiTxnMavBuilder::buildCatchupSelectionPredicateForScanOnRangeLog(
return predA;
} // MvMultiTxnMavBuilder::buildCatchupSelectionPredicateForScanOnRangeLog()
-// LCOV_EXCL_STOP
//////////////////////////////////////////////////////////////////////////////
// Add the following selection predicate to the Scan of the range log for
@@ -773,7 +765,6 @@ ItemExpr *MvMultiTxnMavBuilder::buildCatchupSelectionPredicateForScanOnRangeLog(
// range type. When the upper boundary of the range is closed, the condition
// is >=, otherwise it is >.
// Excluded from coverage test - used only with range logging.
-// LCOV_EXCL_START
ItemExpr *MvMultiTxnMavBuilder::buildPhase1SelectionPredicateForScanOnRangeLog() const
{
// a)
@@ -813,7 +804,6 @@ ItemExpr *MvMultiTxnMavBuilder::buildPhase1SelectionPredicateForScanOnRangeLog()
return new(heap_) BiLogic(ITM_AND, predB, predC);
} // MvMultiTxnMavBuilder::buildPhase1SelectionPredicateForScanOnRangeLog()
-// LCOV_EXCL_STOP
//----------------------------------------------------------------------------
// For multi transactional refresh, there are two additional predicates to
@@ -824,7 +814,6 @@ ItemExpr *MvMultiTxnMavBuilder::buildPhase1SelectionPredicateForScanOnRangeLog()
// When Catchup
// EndCtx.CI > BASE_TABLE.CI DIRECTEDBY <direction-vector>
// Excluded from coverage test - used only with range logging.
-// LCOV_EXCL_START
ItemExpr *MvMultiTxnMavBuilder::buildRangeLogJoinPredicate() const
{
// Call the base class for the normal predicate.
@@ -880,7 +869,6 @@ ItemExpr *MvMultiTxnMavBuilder::buildRangeLogJoinPredicate() const
return predicate;
} // MvMultiTxnMavBuilder::buildRangeLogJoinPredicate()
-// LCOV_EXCL_STOP
//----------------------------------------------------------------------------
// Do not use unions when their are too many epochs because it will blow the
@@ -909,7 +897,6 @@ NABoolean MvMultiTxnMavBuilder::useUnionBakeboneToMergeEpochs() const
// ===========================================================================
// Exclude from coverage testing - used only with range loggiing
-// LCOV_EXCL_START
// This class performs a single rows vs. ranges duplicate elimination algorithm
// in the internal refresh delta computation block.
@@ -1626,4 +1613,3 @@ RelExpr *MultiTxnDEMavBuilder::buildReadRangeLogBlock() const
return topNode;
} // MultiTxnDEMavBuilder::buildReadRangeLogBlock()
-// LCOV_EXCL_STOP
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/optimizer/MvRefreshBuilder.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/MvRefreshBuilder.cpp b/core/sql/optimizer/MvRefreshBuilder.cpp
index d70d9eb..d1f508f 100644
--- a/core/sql/optimizer/MvRefreshBuilder.cpp
+++ b/core/sql/optimizer/MvRefreshBuilder.cpp
@@ -390,7 +390,6 @@ RelExpr *MvRefreshBuilder::buildLogsScanningBlock(const QualifiedName& baseTable
//----------------------------------------------------------------------------
// Excluded from coverage test - used only with range logging.
-// LCOV_EXCL_START
Union *MvRefreshBuilder::buildUnionBetweenRangeAndIudBlocks(RelExpr *scanIUDLogBlock,
RelExpr *scanRangeLogBlock) const
{
@@ -415,20 +414,16 @@ Union *MvRefreshBuilder::buildUnionBetweenRangeAndIudBlocks(RelExpr *scanIUDLogB
return unionNode;
}
-// LCOV_EXCL_STOP
//----------------------------------------------------------------------------
// Excluded from coverage test - used only with range logging.
-// LCOV_EXCL_START
NABoolean MvRefreshBuilder::needAlternateCIorder() const
{
return isGroupByAprefixOfTableCKeyColumns();
}
-// LCOV_EXCL_STOP
//----------------------------------------------------------------------------
// Excluded from coverage test - used only with range logging.
-// LCOV_EXCL_START
ItemExpr *MvRefreshBuilder::buildAlternateCIorder(ItemExpr *ciColumns, const CorrName &tableNameCorr) const
{
const NAString endRangePrefix(COMMV_ENDRANGE_PREFIX);
@@ -452,7 +447,6 @@ ItemExpr *MvRefreshBuilder::buildAlternateCIorder(ItemExpr *ciColumns, const Cor
return alternateOrderVector.convertToItemExpr();
}
-// LCOV_EXCL_STOP
//////////////////////////////////////////////////////////////////////////////
// Construct the expression for @Op, according to the value of the ROW_TYPE
@@ -493,7 +487,6 @@ ItemExpr *MvRefreshBuilder::constructOpExpression() const
//----------------------------------------------------------------------------
// Build a vector of clustering index columns with @BR_ prefix
// Excluded from coverage test - used only with range logging.
-// LCOV_EXCL_START
ItemExpr *MvRefreshBuilder::buildBeginRangeVector() const
{
const NAString beginRangePrefix(COMMV_BEGINRANGE_PREFIX);
@@ -506,12 +499,10 @@ ItemExpr *MvRefreshBuilder::buildBeginRangeVector() const
getLogsInfo().getBaseTableDirectionVector(),
&beginRangePrefix);
}
-// LCOV_EXCL_STOP
//----------------------------------------------------------------------------
// Build a vector of clustering index columns with @ER_ prefix
// Excluded from coverage test - used only with range logging.
-// LCOV_EXCL_START
ItemExpr *MvRefreshBuilder::buildEndRangeVector() const
{
const NAString endRangePrefix(COMMV_ENDRANGE_PREFIX);
@@ -524,7 +515,6 @@ ItemExpr *MvRefreshBuilder::buildEndRangeVector() const
getLogsInfo().getBaseTableDirectionVector(),
&endRangePrefix);
}
-// LCOV_EXCL_STOP
//----------------------------------------------------------------------------
// The Join predicate between the Range log and the base table on the
@@ -535,7 +525,6 @@ ItemExpr *MvRefreshBuilder::buildEndRangeVector() const
// For multi transactional refresh, this method is overridden and two
// additional predicates are added.
// Excluded from coverage test - used only with range logging.
-// LCOV_EXCL_START
ItemExpr *MvRefreshBuilder::buildRangeLogJoinPredicate() const
{
@@ -558,7 +547,6 @@ ItemExpr *MvRefreshBuilder::buildRangeLogJoinPredicate() const
return buildRangeLogJoinPredicateWithCols(rangeType, baseCI, beginCI, endCI);
}
-// LCOV_EXCL_STOP
//----------------------------------------------------------------------------
// a) BASE_TABLE.CI >= RANGE_LOG.BEGIN_CI DIRECTEDBY <direction-vector>
@@ -572,7 +560,6 @@ ItemExpr *MvRefreshBuilder::buildRangeLogJoinPredicate() const
// c0) WHEN 0 CI<> RANGE_LOG.BEGIN_CI AND CI<> RANGE_LOG.END_CI
// END
// Excluded from coverage test - used only with range logging.
-// LCOV_EXCL_START
ItemExpr *MvRefreshBuilder::buildRangeLogJoinPredicateWithCols(
ItemExpr *rangeType,
ItemExpr *baseCI,
@@ -628,7 +615,6 @@ ItemExpr *MvRefreshBuilder::buildRangeLogJoinPredicateWithCols(
return predicate;
}
-// LCOV_EXCL_STOP
//----------------------------------------------------------------------------
// This virtual method is overridden by MvMultiTxnMavBuilder for some specific
@@ -636,7 +622,6 @@ ItemExpr *MvRefreshBuilder::buildRangeLogJoinPredicateWithCols(
// the one in the Scan node on the range log itself - not to confuse with the
// range log join predicate in the method above.
// Excluded from coverage test - used only with range logging.
-// LCOV_EXCL_START
ItemExpr *MvRefreshBuilder::buildSelectionPredicateForScanOnRangeLog() const
{
if (!useUnionBakeboneToMergeEpochs())
@@ -647,7 +632,6 @@ ItemExpr *MvRefreshBuilder::buildSelectionPredicateForScanOnRangeLog() const
}
return NULL;
}
-// LCOV_EXCL_STOP
//----------------------------------------------------------------------------
// Have a uniform select list over the IUD log.
@@ -677,7 +661,6 @@ RelRoot *MvRefreshBuilder::buildRootOverIUDLog(RelExpr *topNode) const
return root;
// Excluded from coverage test - used only with range logging.
-// LCOV_EXCL_START
const NAString beginRangePrefix(COMMV_BEGINRANGE_PREFIX);
const NAString endRangePrefix(COMMV_ENDRANGE_PREFIX);
@@ -707,7 +690,6 @@ RelRoot *MvRefreshBuilder::buildRootOverIUDLog(RelExpr *topNode) const
root->addCompExprTree(rangeIdCol);
return root;
-// LCOV_EXCL_STOP
} // MvRefreshBuilder::buildRootOverIUDLog()
//----------------------------------------------------------------------------
@@ -720,7 +702,6 @@ RelRoot *MvRefreshBuilder::buildRootOverIUDLog(RelExpr *topNode) const
// 5. Range ID
//----------------------------------------------------------------------------
// Excluded from coverage test - used only with range logging.
-// LCOV_EXCL_START
RelRoot *MvRefreshBuilder::buildRootOverRangeBlock(RelExpr *topNode) const
{
ItemExpr *opExpr = new(heap_) SystemLiteral(1); // Range log has only inserts.
@@ -762,7 +743,6 @@ RelRoot *MvRefreshBuilder::buildRootOverRangeBlock(RelExpr *topNode) const
return root;
} // MvRefreshBuilder::buildRootOverRangeBlock()
-// LCOV_EXCL_STOP
//////////////////////////////////////////////////////////////////////////////
@@ -803,7 +783,6 @@ RelRoot *MvRefreshBuilder::buildRootWithUniformSelectList(RelExpr *topNode,
// (Range Log) (Base table)
//
// Excluded from coverage test - used only with range logging.
-// LCOV_EXCL_START
RelExpr *MvRefreshBuilder::buildReadRangesBlock() const
{
CMPASSERT(getLogsInfo().getDeltaDefinition().useRangeLog());
@@ -835,13 +814,11 @@ RelExpr *MvRefreshBuilder::buildReadRangesBlock() const
return root;
}
-// LCOV_EXCL_STOP
//----------------------------------------------------------------------------
// Build the scan on the table and rename the table syskey column if exists
// to @SYSKEY
// Excluded from coverage test - used only with range logging.
-// LCOV_EXCL_START
#pragma nowarn(1506) // warning elimination
RelExpr *MvRefreshBuilder::buildReadBaseTable() const
{
@@ -879,11 +856,9 @@ RelExpr *MvRefreshBuilder::buildReadBaseTable() const
return rootNode;
}
#pragma warn(1506) // warning elimination
-// LCOV_EXCL_STOP
//----------------------------------------------------------------------------
// Excluded from coverage test - used only with range logging.
-// LCOV_EXCL_START
RelExpr *MvRefreshBuilder::buildJoinBaseTableWithRangeLog(RelExpr *scanRangeLog,
RelExpr *scanBaseTable) const
{
@@ -902,14 +877,12 @@ RelExpr *MvRefreshBuilder::buildJoinBaseTableWithRangeLog(RelExpr *scanRangeLog,
return joinNode;
}
-// LCOV_EXCL_STOP
//----------------------------------------------------------------------------
// This function builds a sub-tree that will read the range log records.
// For optimization reasons, in some cases , we prefer to use a merge union
// sub-tree instead of using a simple scan and a sort node on top.
// Excluded from coverage test - used only with range logging.
-// LCOV_EXCL_START
RelExpr *MvRefreshBuilder::buildReadRangeLogBlock() const
{
// This is the Scan on the range log table.
@@ -941,7 +914,6 @@ RelExpr *MvRefreshBuilder::buildReadRangeLogBlock() const
return topNode;
}
-// LCOV_EXCL_STOP
//----------------------------------------------------------------------------
// Set the ForceCardinalityInfo for this node in order to fix the estimated
@@ -2767,7 +2739,6 @@ void MultiDeltaRefreshMatrixRow::addColumn(scanType type)
#ifndef NDEBUG
// Exclude from coverage testing - Debugging code
-// LCOV_EXCL_START
void MultiDeltaRefreshMatrixRow::print(FILE* ofd,
const char* indent,
const char* title) const
@@ -2787,7 +2758,6 @@ void MultiDeltaRefreshMatrixRow::display() const
{
print();
}
-// LCOV_EXCL_STOP
#endif
// ===========================================================================
@@ -2971,7 +2941,6 @@ const MultiDeltaRefreshMatrixRow *MultiDeltaRefreshMatrix::getRow(Int32 i) const
#ifndef NDEBUG
// Exclude from coverage testing - Debugging code
-// LCOV_EXCL_START
void MultiDeltaRefreshMatrix::print(FILE* ofd,
const char* indent,
const char* title) const
@@ -2996,7 +2965,6 @@ void MultiDeltaRefreshMatrix::display() const
{
print();
}
-// LCOV_EXCL_STOP
#endif
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/optimizer/MvRefreshBuilder.h
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/MvRefreshBuilder.h b/core/sql/optimizer/MvRefreshBuilder.h
index bd8bb22..b86102c 100644
--- a/core/sql/optimizer/MvRefreshBuilder.h
+++ b/core/sql/optimizer/MvRefreshBuilder.h
@@ -612,7 +612,6 @@ protected:
//----------------------------------------------------------------------------
//----------------------------------------------------------------------------
// Exclude from coverage testing - used only with range loggiing
-// LCOV_EXCL_START
class MultiTxnDEMavBuilder : public MvMultiTxnMavBuilder
{
public:
@@ -693,7 +692,6 @@ private:
static const char lastNotNullPrefixColName_[];
}; // MultiTxnDEMavBuilder
-// LCOV_EXCL_STOP
//----------------------------------------------------------------------------
// Builds the refresh tree of a single-delta pipelined MAV.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/optimizer/NAClusterInfo.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/NAClusterInfo.cpp b/core/sql/optimizer/NAClusterInfo.cpp
index 4dc0985..fa681ad 100644
--- a/core/sql/optimizer/NAClusterInfo.cpp
+++ b/core/sql/optimizer/NAClusterInfo.cpp
@@ -92,12 +92,10 @@ void SetStaticCompiler(NABoolean isStaticCompiler)
gIsStaticCompiler = isStaticCompiler;
}
-// LCOV_EXCL_START
NABoolean IsStaticCompiler()
{
return gIsStaticCompiler;
}
-// LCOV_EXCL_STOP
//------------------------------------------------------------------------
// Global pointer to cluster information is initially null and remains so
@@ -122,10 +120,8 @@ THREAD_P NAClusterInfo* gpClusterInfo = NULL;
void setUpClusterInfo(CollHeap* heap)
{
#ifndef NDEBUG
- // LCOV_EXCL_START
if (getenv("NO_SERVICES")) // KSKSKS
return; // KSKSKS
- // LCOV_EXCL_STOP
#endif
@@ -378,12 +374,10 @@ Lng32 NAClusterInfo::getTotalNumberOfCPUs()
Lng32 cpuCount = cpuArray_.entries();
#ifndef NDEBUG
-// LCOV_EXCL_START
if ( inTestMode() ) {
NADefaults & defs = ActiveSchemaDB()->getDefaults();
cpuCount = (Int32)(defs.getAsLong(POS_TEST_NUM_NODES));
}
-// LCOV_EXCL_STOP
#endif
//
return cpuCount;
@@ -420,12 +414,10 @@ NAClusterInfoLinux::NAClusterInfoLinux(CollHeap * heap) : NAClusterInfo(heap),
// Simulate the NAClusterInfo.
simulateNAClusterInfoLinux();
break;
- // LCOV_EXCL_START
default:
// The OSIM must run under OFF (normal), CAPTURE or SIMULATE mode.
OSIM_errorMessage("Invalid OSIM mode - It must be OFF or CAPTURE or SIMULATE.");
break;
- // LCOV_EXCL_STOP
}
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/optimizer/NAClusterInfo.h
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/NAClusterInfo.h b/core/sql/optimizer/NAClusterInfo.h
index fbcfc66..c980ab9 100644
--- a/core/sql/optimizer/NAClusterInfo.h
+++ b/core/sql/optimizer/NAClusterInfo.h
@@ -122,11 +122,9 @@ public:
// three methods to enter, leave and test the test mode. The test
// mode is for testing POS.
-// LCOV_EXCL_START
NABoolean inTestMode() const { return inTestMode_; };
void setTestMode() { inTestMode_ = TRUE; };
void resetTestMode() { inTestMode_ = FALSE; };
-// LCOV_EXCL_STOP
protected :
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/optimizer/NAColumn.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/NAColumn.cpp b/core/sql/optimizer/NAColumn.cpp
index 430343d..a7b0a68 100644
--- a/core/sql/optimizer/NAColumn.cpp
+++ b/core/sql/optimizer/NAColumn.cpp
@@ -124,7 +124,6 @@ NAColumn *NAColumn::deepCopy(const NAColumn & nac, NAMemory * heap)
return column;
}
-// LCOV_EXCL_START :cnu
// -----------------------------------------------------------------------
// See NAColumn.h and BindRelExpr.C (bindCheckConstraint function)
// for the reason for these two methods.
@@ -151,7 +150,6 @@ const QualifiedName& NAColumn::getNotNullConstraintName() const
CMPASSERT(isNotNullNondroppable_);
return isNotNullNondroppable_->getConstraintName();
}
-// LCOV_EXCL_STOP
// warning elimination (removed "inline")
static NAString makeTableName(const NATable *table,
@@ -621,7 +619,6 @@ NABoolean NAColumn::createNAType(TrafColumnsDesc *column_desc /*IN*/,
} // createNAType()
-// LCOV_EXCL_START :dpm
// -----------------------------------------------------------------------
// Print function for debugging
// -----------------------------------------------------------------------
@@ -689,7 +686,6 @@ void NAColumnArray::trace(FILE* ofd) const
}
}
}
-// LCOV_EXCL_STOP
// ***********************************************************************
// functions for NAColumnArray
@@ -753,7 +749,6 @@ NAColumn * NAColumnArray::getColumnByPos(Lng32 position) const
return NULL;
}
-// LCOV_EXCL_START :cnu
// removes the column that has the same position
void NAColumnArray::removeByPosition(Lng32 position)
{
@@ -802,7 +797,6 @@ ULng32 NAColumnArray::getMaxTrafHbaseColQualifier() const
return maxVal;
}
-// LCOV_EXCL_STOP
//method to reset an NAColumn object after a statement
//In the ideal world NAColumn objects should not be having any state
@@ -832,7 +826,6 @@ void NAColumn::resetAfterStatement()
return;
}
-// LCOV_EXCL_START :dd
NABoolean NAColumnArray::operator==(const NAColumnArray &other) const
{
if (entries() != other.entries())
@@ -847,7 +840,6 @@ NABoolean NAColumnArray::operator==(const NAColumnArray &other) const
}
return TRUE;
}
-// LCOV_EXCL_STOP
Int32 NAColumnArray::getTotalStorageSize() const
{
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/optimizer/NATable.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/NATable.cpp b/core/sql/optimizer/NATable.cpp
index dbcc323..1fcd1f2 100644
--- a/core/sql/optimizer/NATable.cpp
+++ b/core/sql/optimizer/NATable.cpp
@@ -2023,7 +2023,6 @@ static PartitioningFunction * createRangePartitioningFunction
// createRoundRobinPartitioningFunction()
// This method is used for creating a RoundRobinPartitioningFunction.
// -----------------------------------------------------------------------
-// LCOV_EXCL_START :cnu
static PartitioningFunction * createRoundRobinPartitioningFunction
(TrafDesc * part_desc_list,
NodeMap* nodeMap,
@@ -2055,7 +2054,6 @@ static PartitioningFunction * createRoundRobinPartitioningFunction
return new (heap) RoundRobinPartitioningFunction(numberOfPartitions, nodeMap, heap);
} // static createRoundRobinPartitioningFunction()
-// LCOV_EXCL_STOP
// -----------------------------------------------------------------------
// createHashDistPartitioningFunction()
@@ -3610,7 +3608,6 @@ ULng32 naStringHashFunc(const NAString& indexName)
// The method processDuplicateNames() is called by createNAFileSet() for
// tables having duplicate remote indexes.
//*************************************************************************
-// LCOV_EXCL_START :nsk
void processDuplicateNames(NAHashDictionaryIterator<NAString, Int32> &Iter,
NAFileSetList & indexes,
char *localNodeName)
@@ -3618,7 +3615,6 @@ void processDuplicateNames(NAHashDictionaryIterator<NAString, Int32> &Iter,
{
return;
} // processDuplicateNames()
-// LCOV_EXCL_STOP
// -----------------------------------------------------------------------
// Method for:
@@ -5642,7 +5638,6 @@ NABoolean NATable::fetchObjectUIDForNativeTable(const CorrName& corrName,
} // if
} // if
- // LCOV_EXCL_STOP
initialSize_ = heap_->getAllocSize();
MonitorMemoryUsage_Exit((char*)mmPhase.data(), heap_, NULL, TRUE);
} // NATable()
@@ -5936,7 +5931,6 @@ NATable::NATable(BindWA *bindWA,
hiveDefaultStringLen_ = CmpCommon::getDefaultLong(HIVE_MAX_STRING_LENGTH_IN_BYTES);
- // LCOV_EXCL_STOP
initialSize_ = heap_->getAllocSize();
MonitorMemoryUsage_Exit((char*)mmPhase.data(), heap_, NULL, TRUE);
} // NATable()
@@ -8763,7 +8757,6 @@ void NATableDB::removeNATable2(CorrName &corrName, ComQiScope qiScope,
//remove from list of cached NATables
if (cachedTableList_.remove(cachedNATable) > 0)
{
- // LCOV_EXCL_START - caching is off by default for now
//if metadata caching is ON, then adjust cache size
//since we are deleting a caching entry
if(cacheMetaData_)
@@ -8771,7 +8764,6 @@ void NATableDB::removeNATable2(CorrName &corrName, ComQiScope qiScope,
if (cachedNATable->heap_ &&
cachedNATable->heap_ != CmpCommon::statementHeap())
tablesToDeleteAfterStatement_.insert(cachedNATable);
- // LCOV_EXCL_STOP
}
else
{
@@ -9123,7 +9115,6 @@ NABoolean NATableDB::enforceMemorySpaceConstraints()
//the current statement.
//This is used when a binder error occurs. In rare cases the binder
//error might be due to a stale metadata cache entry.
-// LCOV_EXCL_START :cnu
void NATableDB::flushCacheEntriesUsedInCurrentStatement(){
//do this only if metadata caching is 'ON'
@@ -9147,7 +9138,6 @@ void NATableDB::flushCacheEntriesUsedInCurrentStatement(){
statementCachedTableList_.clear();
}
}
-// LCOV_EXCL_STOP
//Turn metadata caching ON
void NATableDB::setCachingON()
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/optimizer/NATable.h
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/NATable.h b/core/sql/optimizer/NATable.h
index 111f99f..edf338f 100644
--- a/core/sql/optimizer/NATable.h
+++ b/core/sql/optimizer/NATable.h
@@ -623,21 +623,17 @@ public:
return isAlignedFormat;
}
-// LCOV_EXCL_START :cnu
void setVerticalPartitions( NABoolean value )
{ value ? flags_ |= IS_VERTICAL_PARTITION : flags_ &= ~IS_VERTICAL_PARTITION;}
-// LCOV_EXCL_STOP
NABoolean isVerticalPartition() const
{ return (flags_ & IS_VERTICAL_PARTITION) != 0; }
-// LCOV_EXCL_START :cnu
void setHasVerticalPartitions( NABoolean value )
{
value ?
flags_ |= HAS_VERTICAL_PARTITIONS : flags_ &= ~HAS_VERTICAL_PARTITIONS;
}
-// LCOV_EXCL_STOP
NABoolean hasVerticalPartitions() const
{ return (flags_ & HAS_VERTICAL_PARTITIONS) != 0; }
@@ -1356,10 +1352,8 @@ public:
void getCacheStats(NATableCacheStats & stats);
-// LCOV_EXCL_START :cnu
inline ULng32 currentCacheSize() { return currentCacheSize_; }
inline ULng32 intervalWaterMark() { return intervalWaterMark_; }
-// LCOV_EXCL_STOP
inline ULng32 hits() { return totalCacheHits_; }
inline ULng32 lookups() { return totalLookupsCount_; }
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/optimizer/NodeMap.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/NodeMap.cpp b/core/sql/optimizer/NodeMap.cpp
index 432200f..86913dc 100644
--- a/core/sql/optimizer/NodeMap.cpp
+++ b/core/sql/optimizer/NodeMap.cpp
@@ -261,7 +261,6 @@ NodeMapEntry::NodeMapEntry(const NodeMapEntry& other, CollHeap* heap )
//
//==============================================================================
// The function is not called anywhere
-// LCOV_EXCL_START
void
NodeMapEntry::setDp2Name(char* dp2Name)
{
@@ -279,7 +278,6 @@ NodeMapEntry::setDp2Name(char* dp2Name)
strcpy(dp2Name_,dp2Name);
} //NodeMapEntry::setDp2Name()
-// LCOV_EXCL_STOP
//<pb>
//==============================================================================
@@ -446,7 +444,6 @@ NodeMapEntry::getText() const
// none
//
//==============================================================================
-// LCOV_EXCL_START
void
NodeMapEntry::print(FILE* ofd, const char* indent, const char* title) const
{
@@ -463,7 +460,6 @@ NodeMapEntry::print(FILE* ofd, const char* indent, const char* title) const
"State: ",partitionState_);
} // NodeMapEntry::print()
-// LCOV_EXCL_STOP
//<pb>
//============================================================================
@@ -615,7 +611,6 @@ NodeMap::NodeMap(const NodeMap& other, CollHeap* heap)
//
//==============================================================================
// NodeMaps are deleted with the statement heap.
-// LCOV_EXCL_START
NodeMap::~NodeMap()
{
@@ -645,7 +640,6 @@ NodeMap::~NodeMap()
QueryAnalysis::Instance()->tempMonitor().exit();
} // NodeMap destructor.
-// LCOV_EXCL_STOP
//<pb>
//==============================================================================
// Make a copy of this NodeMap object in a specified heap.
@@ -708,7 +702,6 @@ NodeMap::synthesizeLogicalMap(const CollIndex logicalNumEntries,
// number of CPUs in cluster.
//-----------------------------------------------------------------------
#ifdef _DEBUG
-// LCOV_EXCL_START
if ((CmpCommon::getDefault( NSK_DBG ) == DF_ON) &&
(CmpCommon::getDefault( NSK_DBG_GENERIC ) == DF_ON )) {
CURRCONTEXT_OPTDEBUG->stream()
@@ -716,7 +709,6 @@ NodeMap::synthesizeLogicalMap(const CollIndex logicalNumEntries,
<< "logicalNumEntries = " << logicalNumEntries << endl
<< "totalESPs= " << totalESPs << endl;
}
-// LCOV_EXCL_STOP
#endif
Lng32 requiredESPs = CURRSTMT_OPTDEFAULTS->getRequiredESPs();
@@ -877,7 +869,6 @@ NodeMap::synthesizeLogicalMap(const CollIndex logicalNumEntries,
//
//==============================================================================
// the method is not used under SQ, except in OSM mode simulating NSK
-// LCOV_EXCL_START
void
NodeMap::deriveGrouping(const CollIndex numGroups,
CollIndexPointer& groupStart,
@@ -1095,7 +1086,6 @@ NodeMap::deriveGrouping(const CollIndex numGroups,
}
}
} // NodeMap::deriveGrouping()
-// LCOV_EXCL_STOP
//<pb>
//==============================================================================
// Determine if node map has a node specification for all entries.
@@ -2386,7 +2376,6 @@ void NodeMap::balanceScanInfos(HivePartitionAndBucketKey *hiveSearchKey,
} // NodeMap::balanceScanInfos
// to be called from the debugger
-// LCOV_EXCL_START
void
NodeMap::display() const
{
@@ -2493,7 +2482,6 @@ NodeMap::print(FILE* ofd, const char* indent, const char* title) const
);
} // NodeMap::print()
-// LCOV_EXCL_STOP
#pragma warn(1506) // warning elimination
//=======================================================
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/optimizer/NormRelExpr.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/NormRelExpr.cpp b/core/sql/optimizer/NormRelExpr.cpp
index 2c8eeab..5a33084 100644
--- a/core/sql/optimizer/NormRelExpr.cpp
+++ b/core/sql/optimizer/NormRelExpr.cpp
@@ -9692,7 +9692,6 @@ NABoolean CommonSubExprRef::createTempTable(CSEInfo &info)
// ------------------------------
// we create a name of this form:
- // CSE_TEMP_ppppp_MXIDiiiii_Ssss_ccc
// where
// ppp... is a prefix of the CTE name or an internal name
// (just to make it easier to identify, not really needed,
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/optimizer/ObjectNames.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/ObjectNames.cpp b/core/sql/optimizer/ObjectNames.cpp
index c58fef1..e36b34a 100644
--- a/core/sql/optimizer/ObjectNames.cpp
+++ b/core/sql/optimizer/ObjectNames.cpp
@@ -174,7 +174,6 @@ NAString QualifiedName::getQualifiedNameAsString(NABoolean formatForDisplay,
return result;
}
-//LCOV_EXCL_START /* : cnu -- not used on Linux */
// -----------------------------------------------------------------------
// makeSafeFilenamePart() and
// QualifiedName::getQualifiedNameAsAnsiNTFilenameString()
@@ -303,7 +302,6 @@ const NAString QualifiedName::getQualifiedNameAsAnsiNTFilenameString() const
return result;
}
-//LCOV_EXCL_STOP /* : cnu -- not used on Linux */
const NAString QualifiedName::getQualifiedNameAsAnsiString(NABoolean formatForDisplay,
NABoolean externalDisplay) const
@@ -1390,7 +1388,6 @@ const TableRefName *TableRefList::findTable(const CorrName& tableCorr) const
// Additional non-inline functions for all ``ObjectNames'' classes
// -----------------------------------------------------------------------
-//LCOV_EXCL_START : dpm
// Display/print, for debugging.
void CatalogName::display() const { print(); }
@@ -1476,7 +1473,6 @@ void ColRefName::print(FILE* ofd, const char* indent, const char* title,
if (strcmp(title,"")) fprintf(ofd,"\n");
#endif
}
-//LCOV_EXCL_STOP : dpm
// ++MV
ComAnsiNameSpace ExtendedQualName::convSpecialTableTypeToAnsiNameSpace( const SpecialTableType type )
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/optimizer/OptRange.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/OptRange.cpp b/core/sql/optimizer/OptRange.cpp
index 0aacab3..8a6ef24 100644
--- a/core/sql/optimizer/OptRange.cpp
+++ b/core/sql/optimizer/OptRange.cpp
@@ -691,7 +691,7 @@ void OptRangeSpec::addSubrange(ConstValue* start, ConstValue* end,
break;
default:
- assertLogAndThrow1(CAT_SQL_COMP_RANGE, logLevel_, // LCOV_EXCL_LINE :rfi
+ assertLogAndThrow1(CAT_SQL_COMP_RANGE, logLevel_,
FALSE, QRDescriptorException,
"Unhandled data type: %d", typeQual);
break;
@@ -701,7 +701,6 @@ void OptRangeSpec::addSubrange(ConstValue* start, ConstValue* end,
ItemExpr* OptRangeSpec::getCheckConstraintPred(ItemExpr* checkConstraint)
{
- // LCOV_EXCL_START :rfi
if (checkConstraint->getOperatorType() != ITM_CASE)
{
QRLogger::log(CAT_SQL_COMP_RANGE, logLevel_,
@@ -709,9 +708,7 @@ ItemExpr* OptRangeSpec::getCheckConstraintPred(ItemExpr* checkConstraint)
checkConstraint->getOperatorType());
return NULL;
}
- // LCOV_EXCL_STOP
- // LCOV_EXCL_START :rfi
ItemExpr* itemExpr = checkConstraint->child(0);
if (itemExpr->getOperatorType() != ITM_IF_THEN_ELSE)
{
@@ -720,7 +717,6 @@ ItemExpr* OptRangeSpec::getCheckConstraintPred(ItemExpr* checkConstraint)
itemExpr->getOperatorType());
return NULL;
}
- // LCOV_EXCL_STOP
// Child of the if-then-else is either is_false, which is the parent of the
// predicate (for most check constraints), or the predicate itself (for
@@ -752,7 +748,6 @@ void OptRangeSpec::intersectCheckConstraints(QRDescGenerator* descGen,
}
return;
}
- // LCOV_EXCL_START :rfi
else if (itemExpr->getOperatorType() != ITM_BASECOLUMN)
{
QRLogger::log(CAT_SQL_COMP_RANGE, logLevel_,
@@ -760,7 +755,6 @@ void OptRangeSpec::intersectCheckConstraints(QRDescGenerator* descGen,
"%d instead of ITM_BASECOLUMN.", itemExpr->getOperatorType());
return;
}
- // LCOV_EXCL_STOP
#ifdef _DEBUG
const NATable* tbl = colValId.getNAColumn()->getNATable();
@@ -872,7 +866,7 @@ void OptRangeSpec::intersectTypeConstraint(QRDescGenerator* descGen,
break;
default:
- QRLogger::log(CAT_SQL_COMP_RANGE, logLevel_, // LCOV_EXCL_LINE :rfi
+ QRLogger::log(CAT_SQL_COMP_RANGE, logLevel_,
"No case in intersectTypeConstraint() for "
"approximate numeric of type %d",
colType.getFSDatatype());
@@ -1123,7 +1117,6 @@ NABoolean OptRangeSpec::buildRange(ItemExpr* origPredExpr)
isRange = FALSE;
break;
- // LCOV_EXCL_START :cnu -- Transformation phase rewrites between op
case ITM_BETWEEN:
startValue = getConstOperand(predExpr);
if (startValue)
@@ -1140,7 +1133,6 @@ NABoolean OptRangeSpec::buildRange(ItemExpr* origPredExpr)
else
isRange = FALSE;
break;
- // LCOV_EXCL_STOP
case ITM_IS_NULL:
case ITM_IS_NOT_NULL:
@@ -1394,7 +1386,7 @@ ConstValue* OptRangeSpec::reconstituteInt64Value(NAType* type, Int64 val) const
break;
default:
- assertLogAndThrow1(CAT_SQL_COMP_RANGE, logLevel_, // LCOV_EXCL_LINE :rfi
+ assertLogAndThrow1(CAT_SQL_COMP_RANGE, logLevel_,
FALSE, QRLogicException,
"Unknown datetime subtype -- %d",
dtType->getSubtype());
@@ -1448,7 +1440,7 @@ ConstValue* OptRangeSpec::reconstituteInt64Value(NAType* type, Int64 val) const
break;
default:
- assertLogAndThrow1(CAT_SQL_COMP_RANGE, logLevel_, // LCOV_EXCL_LINE :rfi
+ assertLogAndThrow1(CAT_SQL_COMP_RANGE, logLevel_,
FALSE, QRLogicException,
"Invalid end field for interval type -- %d",
intvlType->getEndField());
@@ -1519,7 +1511,7 @@ ConstValue* OptRangeSpec::reconstituteInt64Value(NAType* type, Int64 val) const
break;
default:
- assertLogAndThrow1(CAT_SQL_COMP_RANGE, logLevel_, FALSE, QRLogicException, // LCOV_EXCL_LINE :rfi
+ assertLogAndThrow1(CAT_SQL_COMP_RANGE, logLevel_, FALSE, QRLogicException,
"Type not handled by reconstituteInt64Value() -- %d",
typeQual);
return NULL;
@@ -1533,7 +1525,6 @@ ConstValue* OptRangeSpec::reconstituteInt64Value(NAType* type, Int64 val) const
ConstValue* OptRangeSpec::reconstituteDoubleValue(NAType* type, Float64 val) const
{
NABuiltInTypeEnum typeQual = type->getTypeQualifier();
- // LCOV_EXCL_START :rfi
if (typeQual != NA_NUMERIC_TYPE)
{
assertLogAndThrow1(CAT_SQL_COMP_RANGE, logLevel_, FALSE, QRLogicException,
@@ -1541,7 +1532,6 @@ ConstValue* OptRangeSpec::reconstituteDoubleValue(NAType* type, Float64 val) con
typeQual);
return NULL;
}
- // LCOV_EXCL_STOP
// Use these for the textual representation of a constant value, which is
// passed to the ConstValue ctor.
@@ -1743,7 +1733,7 @@ ItemExpr* OptRangeSpec::makeSubrangeItemExpr(SubrangeBase* subrange,
break;
default:
- assertLogAndThrow1(CAT_SQL_COMP_RANGE, logLevel_, // LCOV_EXCL_LINE :rfi
+ assertLogAndThrow1(CAT_SQL_COMP_RANGE, logLevel_,
FALSE, QRDescriptorException,
"Unhandled data type in "
"OptRangeSpec::makeSubrangeItemExpr: %d",
@@ -2045,7 +2035,7 @@ static Int64 getInt64ValueFromDateTime(ConstValue* val,
break;
default:
- assertLogAndThrow1(CAT_SQL_COMP_RANGE, level, // LCOV_EXCL_LINE :rfi
+ assertLogAndThrow1(CAT_SQL_COMP_RANGE, level,
FALSE, QRDescriptorException,
"Invalid datetime subtype -- %d", constType->getSubtype());
}
@@ -2118,7 +2108,7 @@ static Int64 getInt64ValueFromInterval(ConstValue* constVal,
valWasNegative = (i64val < 0);
break;
default:
- assertLogAndThrow1(CAT_SQL_COMP_RANGE, level, // LCOV_EXCL_LINE :rfi
+ assertLogAndThrow1(CAT_SQL_COMP_RANGE, level,
FALSE, QRDescriptorException,
"Invalid interval storage length -- %d",
storageSize);
@@ -2157,7 +2147,7 @@ static Int64 getInt64ValueFromInterval(ConstValue* constVal,
i64val *= (Int64)pow(10, 6 - constIntvlType->getFractionPrecision());
break;
default:
- assertLogAndThrow1(CAT_SQL_COMP_RANGE, level, // LCOV_EXCL_LINE :rfi
+ assertLogAndThrow1(CAT_SQL_COMP_RANGE, level,
FALSE, QRDescriptorException,
"Invalid end field for interval -- %d",
constIntvlType->getEndField());
@@ -2201,7 +2191,7 @@ static Int64 getInt64ValueFromInterval(ConstValue* constVal,
i64val = i64val / scaleFactor * scaleFactor;
break;
default:
- assertLogAndThrow1(CAT_SQL_COMP_RANGE, level, // LCOV_EXCL_LINE :rfi
+ assertLogAndThrow1(CAT_SQL_COMP_RANGE, level,
FALSE, QRDescriptorException,
"Invalid end field for interval -- %d",
colIntvlType->getEndField());
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/optimizer/OptTrigger.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/OptTrigger.cpp b/core/sql/optimizer/OptTrigger.cpp
index 0679e2c..a00a781 100644
--- a/core/sql/optimizer/OptTrigger.cpp
+++ b/core/sql/optimizer/OptTrigger.cpp
@@ -527,9 +527,9 @@ OptTriggersBackbone::~OptTriggersBackbone()
{
OptTriggerPtr optTrigger = (*triggerList_)[i];
// exclude coverage - we don't seem to handle macro expansion very well
- NADELETEBASIC(optTrigger, CmpCommon::statementHeap()); // LCOV_EXCL_LINE
+ NADELETEBASIC(optTrigger, CmpCommon::statementHeap());
}
- NADELETEBASIC(triggerList_, CmpCommon::statementHeap()); // LCOV_EXCL_LINE
+ NADELETEBASIC(triggerList_, CmpCommon::statementHeap());
}
if (triggerGroups_)
@@ -537,9 +537,9 @@ OptTriggersBackbone::~OptTriggersBackbone()
for (CollIndex i = 1; i < triggerGroups_->entries(); i++)
{
OptTriggerGroup *optGroup = (*triggerGroups_)[i];
- NADELETE(optGroup, OptTriggerGroup, (CmpCommon::statementHeap())); // LCOV_EXCL_LINE
+ NADELETE(optGroup, OptTriggerGroup, (CmpCommon::statementHeap()));
}
- NADELETEBASIC(triggerGroups_, CmpCommon::statementHeap()); // LCOV_EXCL_LINE
+ NADELETEBASIC(triggerGroups_, CmpCommon::statementHeap());
}
}
@@ -921,7 +921,7 @@ OptTriggersBackbone::reorder()
// free the temporary array
// exclude coverage - we don't seem to handle macro expansion very well
- NADELETEBASIC(optTriggerPtrArray, (CmpCommon::statementHeap())); // LCOV_EXCL_LINE
+ NADELETEBASIC(optTriggerPtrArray, (CmpCommon::statementHeap()));
}
//-----------------------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/optimizer/OptTrigger.h
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/OptTrigger.h b/core/sql/optimizer/OptTrigger.h
index a70f88b..3714558 100644
--- a/core/sql/optimizer/OptTrigger.h
+++ b/core/sql/optimizer/OptTrigger.h
@@ -74,7 +74,7 @@ public:
RelExpr *parentSubTree);
// Dummy copy constructor - method body does not exist
- OptTrigger(const OptTrigger &orig, NAMemory *h=0); // LCOV_EXCL_LINE
+ OptTrigger(const OptTrigger &orig, NAMemory *h=0);
// ---------------------------------------------------------------------
// Accessor functions
// ---------------------------------------------------------------------
@@ -103,7 +103,7 @@ public:
OptTriggerList(): LIST(OptTriggerPtr)(CmpCommon::statementHeap()) { }
// Dummy copy constructor - method body does not exist
- OptTriggerList(const OptTriggerList &orig, NAMemory *h=0); // LCOV_EXCL_LINE
+ OptTriggerList(const OptTriggerList &orig, NAMemory *h=0);
RelExpr *createUnionSubTree() const;
};
@@ -138,7 +138,7 @@ public:
// Dummy copy constructor - method body does not exist
OptTriggerGroup(const OptTriggerGroup &orig);
- virtual ~OptTriggerGroup() {} // LCOV_EXCL_LINE
+ virtual ~OptTriggerGroup() {}
inline CollIndex entries() const
{ return (rowTriggerGroup_.entries()+statmentTriggerGroup_.entries());}
@@ -199,7 +199,7 @@ public:
OptTriggerGroupList(): LIST(OptTriggerGroup *)(CmpCommon::statementHeap()) { }
// Dummy copy constructor - method body does not exist
- OptTriggerGroupList(const OptTriggerGroupList &orig, NAMemory *h=0); // LCOV_EXCL_LINE
+ OptTriggerGroupList(const OptTriggerGroupList &orig, NAMemory *h=0);
};
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/optimizer/PackedColDesc.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/PackedColDesc.cpp b/core/sql/optimizer/PackedColDesc.cpp
index d8967cd..52def3e 100644
--- a/core/sql/optimizer/PackedColDesc.cpp
+++ b/core/sql/optimizer/PackedColDesc.cpp
@@ -33,7 +33,6 @@
******************************************************************************
*/
-// LCOV_EXCL_START
// exclude this whole file from coverage since this code is related to vertical
// partitioning and that feature is not active anymore
@@ -585,4 +584,3 @@ PackedTableDesc::getPackingInfoForColumn(Lng32 position)
return (PackedColDesc *)packingInfo;
}
-// LCOV_EXCL_STOP
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/optimizer/PackedColDesc.h
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/PackedColDesc.h b/core/sql/optimizer/PackedColDesc.h
index acb7ff2..2a96991 100644
--- a/core/sql/optimizer/PackedColDesc.h
+++ b/core/sql/optimizer/PackedColDesc.h
@@ -37,7 +37,6 @@
*
******************************************************************************
*/
-// LCOV_EXCL_START
// exclude this whole file from coverage since this code is related to vertical
// partitioning and that feature is not active anymore
#include "Collections.h"
@@ -445,6 +444,5 @@ private:
//
NABoolean callFromCatMan_;
};
-// LCOV_EXCL_STOP
#endif
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/optimizer/PartFunc.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/PartFunc.cpp b/core/sql/optimizer/PartFunc.cpp
index 706c308..7e46e94 100644
--- a/core/sql/optimizer/PartFunc.cpp
+++ b/core/sql/optimizer/PartFunc.cpp
@@ -67,7 +67,6 @@
// an undefined symbol.
// ***********************************************************************
-// LCOV_EXCL_START
void displayPartitioningFunction(const PartitioningFunction& pf)
{
pf.display();
@@ -89,7 +88,6 @@ void displayPartitionBoundaries(const RangePartitionBoundaries* pb)
if (pb)
pb->display();
}
-// LCOV_EXCL_STOP
// ***********************************************************************
@@ -276,14 +274,12 @@ PartitioningFunction::replaceNodeMap(NodeMap* nodeMap)
// PartitioningFunction::copy()
// Virtual copy constructor returns a copy of myself.
// -----------------------------------------------------------------------
-// LCOV_EXCL_START
PartitioningFunction* PartitioningFunction::copy() const
{
// illegal to call copy() of the base class
CMPABORT;
return NULL;
}
-// LCOV_EXCL_STOP
// -----------------------------------------------------------------------
// PartitioningFunction::normalizePartitioningKeys()
@@ -384,14 +380,12 @@ NABoolean PartitioningFunction::isAGroupingOf(
return (comparePartFuncToFunc(other) == SAME);
}
-// LCOV_EXCL_START
PartitioningRequirement* PartitioningFunction::makePartitioningRequirement()
{
// Redefine PartitioningFunction::makePartitioningRequirement()
CMPABORT;
return NULL;
}
-// LCOV_EXCL_STOP
// -----------------------------------------------------------------------
// PartitioningFunction::scaleNumberOfPartitions
@@ -538,14 +532,12 @@ NABoolean PartitioningFunction::shouldUseSynchronousAccess(
// -----------------------------------------------------------------------
// Virtual functions that must be redefined for derived classes.
// -----------------------------------------------------------------------
-// LCOV_EXCL_START
Lng32 PartitioningFunction::getCountOfPartitions() const
{
// Redefine PartitioningFunction::getCountOfPartitions()
CMPABORT;
return 1;
}
-// LCOV_EXCL_STOP
NABoolean PartitioningFunction::canProducePartitioningKeyPredicates() const
{
@@ -570,7 +562,6 @@ const ValueIdList& PartitioningFunction::getPartitionInputValuesLayout() const
return partitionInputValuesLayout_;
}
-// LCOV_EXCL_START
void PartitioningFunction::createPartitioningKeyPredicates()
{
// Redefine PartitioningFunction::createPartitioningKeyPredicates()
@@ -600,7 +591,6 @@ ItemExpr* PartitioningFunction::createPartitioningExpression()
CMPABORT;
return NULL;
}
-// LCOV_EXCL_STOP
void PartitioningFunction::createPartSelectionExprFromSearchKey(
const ValueId beginPartSelId,
@@ -636,14 +626,12 @@ void PartitioningFunction::preCodeGen(const ValueIdSet& availableValues)
} // PartitioningFunction::preCodeGen()
-// LCOV_EXCL_START
const NAString PartitioningFunction::getText() const
{
CMPABORT;
return NAString("some type of partitioning function",
CmpCommon::statementHeap());
}
-// LCOV_EXCL_STOP
void PartitioningFunction::setupForStatement()
{
@@ -675,7 +663,6 @@ void PartitioningFunction::resetAfterStatement()
// -----------------------------------------------------------------------
// Method for debugging
// -----------------------------------------------------------------------
-// LCOV_EXCL_START
void PartitioningFunction::print(FILE* ofd, const char* indent,
const char* title) const
{
@@ -725,7 +712,6 @@ void PartitioningFunction::print(FILE* ofd, const char* indent,
} // PartitioningFunction::print()
void PartitioningFunction::display() const { print(); }
-// LCOV_EXCL_STOP
// ***********************************************************************
// SinglePartitionPartitioningFunction
@@ -766,7 +752,6 @@ void SinglePartitionPartitioningFunction::createPartitioningKeyPredicates()
storePartitioningKeyPredicates(ValueIdSet());
}
-// LCOV_EXCL_START
void SinglePartitionPartitioningFunction::replacePivs(
const ValueIdList& newPivs,
const ValueIdSet& newPartKeyPreds)
@@ -774,7 +759,6 @@ void SinglePartitionPartitioningFunction::replacePivs(
// do nothing, there aren't any pivs for a single
// partition
}
-// LCOV_EXCL_STOP
// -----------------------------------------------------------------------
// SinglePartitionPartitioningFunction::createPartitioningExpression()
@@ -849,14 +833,12 @@ const NAString SinglePartitionPartitioningFunction::getText() const
return "exactly 1 partition";
}
-// LCOV_EXCL_START
void SinglePartitionPartitioningFunction::print(FILE* ofd, const char* indent,
const char* title) const
{
PartitioningFunction::print(ofd, indent,
"SinglePartitionPartitioningFunction");
}
-// LCOV_EXCL_STOP
// ***********************************************************************
// ReplicateViaBroadcastPartitioningFunction
@@ -1440,13 +1422,11 @@ const NAString HashPartitioningFunction::getText() const
return getTextImp("hash");
}
-// LCOV_EXCL_START
void HashPartitioningFunction::print(FILE* ofd, const char* indent,
const char* title) const
{
PartitioningFunction::print(ofd, indent, "HashPartitioningFunction");
} // HashPartitioningFunction::print()
-// LCOV_EXCL_STOP
// Return an expression casting an encoded skew value to oType.
static
@@ -2056,13 +2036,11 @@ const NAString HashDistPartitioningFunction::getText() const
return result;
}
-// LCOV_EXCL_START
void HashDistPartitioningFunction::print(FILE* ofd, const char* indent,
const char* title) const
{
PartitioningFunction::print(ofd, indent, "HashDistPartitioningFunction");
} // TableHashPartitioningFunction::print()
-// LCOV_EXCL_STOP
// -----------------------------------------------------------------------
// HashDistPartitioningFunction::createPartitioningFunctionForIndexDesc()
@@ -2464,13 +2442,11 @@ const NAString Hash2PartitioningFunction::getText() const
return result;
}
-// LCOV_EXCL_START
void Hash2PartitioningFunction::print(FILE* ofd, const char* indent,
const char* title) const
{
PartitioningFunction::print(ofd, indent, "Hash2PartitioningFunction");
} // TableHashPartitioningFunction::print()
-// LCOV_EXCL_STOP
// -----------------------------------------------------------------------
@@ -2933,13 +2909,11 @@ const NAString SkewedDataPartitioningFunction::getText() const
return result;
}
-// LCOV_EXCL_START
void SkewedDataPartitioningFunction::print(FILE* ofd, const char* indent,
const char* title) const
{
PartitioningFunction::print(ofd, indent, "SkewedDataPartitioningFunction");
}
-// LCOV_EXCL_STOP
// -----------------------------------------------------------------------
// SkewedDataPartitioningFunction::comparePartFuncToFunc(): Compare this
@@ -2977,7 +2951,6 @@ comparePartFuncToFunc(const PartitioningFunction &other) const
// SkewedDataPartitioningFunction::scaleNumberOfPartitions()
// -----------------------------------------------------------------------
-// LCOV_EXCL_START
//::scaleNUmberOfPartitions() are called in following locations
//
@@ -3006,7 +2979,6 @@ scaleNumberOfPartitions(Lng32 &suggestedNewNumberOfPartitions,
return this;
} // SkewedDataPartitioningFunction::scaleNumberOfPartitions()
-// LCOV_EXCL_STOP
// -----------------------------------------------------------------------
// SkewedDataPartitioningFunction::isAGroupingOf()
@@ -3973,7 +3945,6 @@ void RangePartitionBoundaries::resetAfterStatement()
// -----------------------------------------------------------------------
// Method for debugging.
// -----------------------------------------------------------------------
-// LCOV_EXCL_START
void RangePartitionBoundaries::print(FILE* ofd, const char* indent,
const char* title) const
{
@@ -4006,7 +3977,6 @@ void RangePartitionBoundaries::print(FILE* ofd, const char* indent,
}
} // RangePartitionBoundaries::print()
-// LCOV_EXCL_STOP
// ***********************************************************************
// RangePartitioningFunction
@@ -4995,7 +4965,6 @@ const NAString RangePartitioningFunction::getText() const
return result;
}
-// LCOV_EXCL_START
void RangePartitioningFunction::print(FILE* ofd, const char* indent,
const char* title) const
{
@@ -5135,7 +5104,6 @@ RangePartitioningFunction::computeNumOfActivePartitions(SearchKey* skey, const T
}
-// LCOV_EXCL_STOP
// ***********************************************************************
// LogPhysPartitioningFunction
@@ -5664,7 +5632,6 @@ const NAString LogPhysPartitioningFunction::getPhysForSplitTop() const
return physPartFunc_->getText();
}
-// LCOV_EXCL_START
void LogPhysPartitioningFunction::print(
FILE* ofd,
const char* indent,
@@ -5674,13 +5641,11 @@ void LogPhysPartitioningFunction::print(
logPartFunc_->print(ofd,"logical: ");
physPartFunc_->print(ofd,"physical: ");
}
-// LCOV_EXCL_STOP
// ***********************************************************************
// RoundRobinPartitioningFunction
// ***********************************************************************
-// LCOV_EXCL_START
PartitioningRequirement*
RoundRobinPartitioningFunction::makePartitioningRequirement()
{
@@ -6323,7 +6288,6 @@ void RoundRobinPartitioningFunction::print(
PartitioningFunction::print(ofd,indent,"RoundRobinPartitioningFunction");
}
-// LCOV_EXCL_STOP
const skewProperty ANY_SKEW_PROPERTY(skewProperty::ANY, NULL);
@@ -6546,13 +6510,11 @@ const NAString HivePartitioningFunction::getText() const
return getTextImp("hive");
}
-// LCOV_EXCL_START
void HivePartitioningFunction::print(FILE* ofd, const char* indent,
const char* title) const
{
PartitioningFunction::print(ofd, indent, "HivePartitioningFunction");
} // HivePartitioningFunction::print()
-// LCOV_EXCL_STOP
PartitioningFunction*
HivePartitioningFunction::
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/optimizer/PartFunc.h
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/PartFunc.h b/core/sql/optimizer/PartFunc.h
index b179b21..92f577d 100644
--- a/core/sql/optimizer/PartFunc.h
+++ b/core/sql/optimizer/PartFunc.h
@@ -2558,7 +2558,6 @@ private:
// partitions in a random fashion so as to balance the number of records
// in each partition.
// -----------------------------------------------------------------------
-// LCOV_EXCL_START
class RoundRobinPartitioningFunction : public PartitioningFunction
{
public:
@@ -2704,7 +2703,6 @@ private:
NABoolean resetAfterStatement_;
}; // class RoundRobinPartitioningFunction
-// LCOV_EXCL_STOP
//
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/optimizer/PartReq.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/PartReq.cpp b/core/sql/optimizer/PartReq.cpp
index 08ae4dc..e19c609 100644
--- a/core/sql/optimizer/PartReq.cpp
+++ b/core/sql/optimizer/PartReq.cpp
@@ -209,7 +209,6 @@ PartitioningRequirement::copy() const
return NULL;
}
-// LCOV_EXCL_START
void PartitioningRequirement::print(FILE* ofd, const char* indent,
const char* title) const
{
@@ -245,7 +244,6 @@ COMPARE_RESULT PartitioningRequirement::comparePartReqToReq
ABORT("Redefine PartitioningRequirement::comparePartReqToReq()");
return INCOMPATIBLE;
}
-// LCOV_EXCL_STOP
// ***********************************************************************
// FuzzyPartitioningRequirement
@@ -302,7 +300,6 @@ FuzzyPartitioningRequirement::copy() const
return NULL;
}
-// LCOV_EXCL_START
void FuzzyPartitioningRequirement::print(FILE* ofd, const char* indent,
const char* title) const
{
@@ -310,7 +307,6 @@ void FuzzyPartitioningRequirement::print(FILE* ofd, const char* indent,
}
void FuzzyPartitioningRequirement::display() const { print(); }
-// LCOV_EXCL_STOP
// ***********************************************************************
// FullySpecifiedPartitioningRequirement
@@ -486,7 +482,6 @@ FullySpecifiedPartitioningRequirement::copy() const
return NULL;
}
-// LCOV_EXCL_START
void FullySpecifiedPartitioningRequirement::print
(FILE* ofd, const char* indent, const char* title) const
{
@@ -494,7 +489,6 @@ void FullySpecifiedPartitioningRequirement::print
}
void FullySpecifiedPartitioningRequirement::display() const { print(); }
-// LCOV_EXCL_STOP
// -----------------------------------------------------------------------
// RequireApproximatelyNPartitions
@@ -1260,7 +1254,6 @@ RequireApproximatelyNPartitions::copy() const
new (CmpCommon::statementHeap()) RequireApproximatelyNPartitions(*this);
}
-// LCOV_EXCL_START
void RequireApproximatelyNPartitions::print(FILE* ofd, const char* indent,
const char* title) const
{
@@ -1268,7 +1261,6 @@ void RequireApproximatelyNPartitions::print(FILE* ofd, const char* indent,
}
void RequireApproximatelyNPartitions::display() const { print(); }
-// LCOV_EXCL_STOP
// -----------------------------------------------------------------------
@@ -1299,7 +1291,6 @@ RequireExactlyOnePartition::copy() const
new (CmpCommon::statementHeap()) RequireExactlyOnePartition(*this);
}
-// LCOV_EXCL_START
void RequireExactlyOnePartition::print(FILE* ofd, const char* indent,
const char* title) const
{
@@ -1307,7 +1298,6 @@ void RequireExactlyOnePartition::print(FILE* ofd, const char* indent,
}
void RequireExactlyOnePartition::display() const { print(); }
-// LCOV_EXCL_STOP
// -----------------------------------------------------------------------
// RequireReplicateViaBroadcast
// -----------------------------------------------------------------------
@@ -1370,7 +1360,6 @@ RequireReplicateViaBroadcast::copy() const
new (CmpCommon::statementHeap()) RequireReplicateViaBroadcast(*this);
}
-// LCOV_EXCL_START
void RequireReplicateViaBroadcast::print(FILE* ofd, const char* indent,
const char* title) const
{
@@ -1378,7 +1367,6 @@ void RequireReplicateViaBroadcast::print(FILE* ofd, const char* indent,
}
void RequireReplicateViaBroadcast::display() const { print(); }
-// LCOV_EXCL_STOP
// -----------------------------------------------------------------------
// RequireReplicateNoBroadcast
@@ -1438,7 +1426,6 @@ RequireReplicateNoBroadcast::copy() const
new (CmpCommon::statementHeap()) RequireReplicateNoBroadcast(*this);
}
-// LCOV_EXCL_START
void RequireReplicateNoBroadcast::print(FILE* ofd, const char* indent,
const char* title) const
{
@@ -1446,7 +1433,6 @@ void RequireReplicateNoBroadcast::print(FILE* ofd, const char* indent,
}
void RequireReplicateNoBroadcast::display() const { print(); }
-// LCOV_EXCL_STOP
// -----------------------------------------------------------------------
// RequireHash
@@ -1455,7 +1441,6 @@ void RequireReplicateNoBroadcast::display() const { print(); }
// -----------------------------------------------------------------------
// Method for performing a pointer type cast
// -----------------------------------------------------------------------
-// LCOV_EXCL_START
const RequireHash*
RequireHash::castToRequireHash() const
{ return this; }
@@ -1474,7 +1459,6 @@ void RequireHash::print(FILE* ofd, const char* indent,
}
void RequireHash::display() const { print(); }
-// LCOV_EXCL_STOP
// -----------------------------------------------------------------------
// RequireHashDist
@@ -1510,7 +1494,6 @@ RequireHashDist::copy() const
new (CmpCommon::statementHeap()) RequireHashDist(*this);
}
-// LCOV_EXCL_START
void RequireHashDist::print(FILE* ofd, const char* indent,
const char* title) const
{
@@ -1518,7 +1501,6 @@ void RequireHashDist::print(FILE* ofd, const char* indent,
}
void RequireHashDist::display() const { print(); }
-// LCOV_EXCL_STOP
// -----------------------------------------------------------------------
// RequireHash2
@@ -1563,7 +1545,6 @@ RequireHash2::copy() const
new (CmpCommon::statementHeap()) RequireHash2(*this);
}
-// LCOV_EXCL_START
void RequireHash2::print(FILE* ofd, const char* indent,
const char* title) const
{
@@ -1571,7 +1552,6 @@ void RequireHash2::print(FILE* ofd, const char* indent,
}
void RequireHash2::display() const { print(); }
-// LCOV_EXCL_STOP
//===========
// -----------------------------------------------------------------------
@@ -1633,7 +1613,6 @@ RequireSkewed::copy() const
return new (CmpCommon::statementHeap()) RequireSkewed(*this);
}
-// LCOV_EXCL_START
void RequireSkewed::print(FILE* ofd, const char* indent,
const char* title) const
{
@@ -1641,7 +1620,6 @@ void RequireSkewed::print(FILE* ofd, const char* indent,
}
void RequireSkewed::display() const { print(); }
-// LCOV_EXCL_STOP
// -----------------------------------------------------------------------
@@ -1662,7 +1640,6 @@ RequireRange::copy() const
new (CmpCommon::statementHeap()) RequireRange(*this);
}
-// LCOV_EXCL_START
void RequireRange::print(FILE* ofd, const char* indent,
const char* title) const
{
@@ -1670,13 +1647,11 @@ void RequireRange::print(FILE* ofd, const char* indent,
}
void RequireRange::display() const { print(); }
-// LCOV_EXCL_STOP
// -----------------------------------------------------------------------
// RequireRoundRobin
// -----------------------------------------------------------------------
-// LCOV_EXCL_START
NABoolean
RequireRoundRobin::
partReqAndFuncCompatible(const PartitioningFunction* other) const
@@ -1715,7 +1690,6 @@ void RequireRoundRobin::print(FILE* ofd, const char* indent,
void RequireRoundRobin::display() const { print(); }
-// LCOV_EXCL_STOP
// -----------------------------------------------------------------------
// Methods for class LogicalPartitioningRequirement
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/optimizer/PartReq.h
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/PartReq.h b/core/sql/optimizer/PartReq.h
index 8721666..7ad893e 100644
--- a/core/sql/optimizer/PartReq.h
+++ b/core/sql/optimizer/PartReq.h
@@ -199,10 +199,8 @@ public:
virtual NABoolean isRequirementRange() const
{ return FALSE; }
- // LCOV_EXCL_START
virtual NABoolean isRequirementRoundRobin() const
{ return FALSE; }
- // LCOV_EXCL_STOP
virtual NABoolean isRequirementSkewBusterBroadcast() const
{ return FALSE; };
@@ -458,12 +456,10 @@ public:
getPartitioningFunction()->isARangePartitioningFunction();
}
- // LCOV_EXCL_START
virtual NABoolean isRequirementRoundRobin() const
{ return
getPartitioningFunction()->isARoundRobinPartitioningFunction();
}
- // LCOV_EXCL_STOP
virtual NABoolean isRequirementSkewBusterBroadcast() const;
@@ -996,7 +992,6 @@ public:
}; // class RequireRange
-// LCOV_EXCL_START
class RequireRoundRobin : public FullySpecifiedPartitioningRequirement
{
public:
@@ -1037,7 +1032,6 @@ public:
virtual void display() const;
}; // class RequireRoundRobin
-// LCOV_EXCL_STOP
class RequireHive : public FullySpecifiedPartitioningRequirement
{
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/optimizer/PhyProp.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/PhyProp.cpp b/core/sql/optimizer/PhyProp.cpp
index c6aedc3..7849e47 100644
--- a/core/sql/optimizer/PhyProp.cpp
+++ b/core/sql/optimizer/PhyProp.cpp
@@ -52,7 +52,6 @@
PhysicalProperty::~PhysicalProperty() {}
-// LCOV_EXCL_START
void PhysicalProperty::print(FILE* ofd,
const char * /* prefix */,
const char * /* suffix */) const
@@ -93,7 +92,6 @@ NABoolean PhysicalProperty::isPartKeyPrefixOfSortKey() const
return TRUE;
} // PhysicalProperty::isPartKeyPrefixOfSortKey()
-// LCOV_EXCL_STOP
// The following method is used by the overloaded implementations of
// '<', '>', '==' for physical properties.
@@ -306,7 +304,6 @@ ReqdPhysicalProperty::~ReqdPhysicalProperty()
}
-// LCOV_EXCL_START
void ReqdPhysicalProperty::print(FILE* ofd,
const char * /* prefix */,
const char * /* suffix */) const
@@ -315,7 +312,6 @@ void ReqdPhysicalProperty::print(FILE* ofd,
availableCPUs_, pipelinesPerCPU_);
}
-// LCOV_EXCL_STOP
// --------------------------------------------------------------------
// does a given plan satisfy the required property
@@ -885,7 +881,6 @@ ReqdPhysicalProperty::compareRequirements(const ReqdPhysicalProperty &other) con
} // ReqdPhysicalProperty::compareRequirements
-// LCOV_EXCL_START
// Checked in M5. This function is never called
RelExpr * ReqdPhysicalProperty::getInputMustMatch(Lng32 childIndex) const
{
@@ -902,7 +897,6 @@ RelExpr * ReqdPhysicalProperty::getInputMustMatch(Lng32 childIndex) const
else
return NULL; // pattern has fewer children, no need for a match
}
-// LCOV_EXCL_STOP
// ||opt this method should never be called because we always
// have a location requirement???
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/optimizer/PhyProp.h
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/PhyProp.h b/core/sql/optimizer/PhyProp.h
index 6207c28..79ccd23 100644
--- a/core/sql/optimizer/PhyProp.h
+++ b/core/sql/optimizer/PhyProp.h
@@ -266,7 +266,7 @@ public:
// For determining if the partitioning key is a prefix of the
// sort key (i.e. the clustering key)
- NABoolean isPartKeyPrefixOfSortKey() const; // LCOV_EXCL_LINE
+ NABoolean isPartKeyPrefixOfSortKey() const;
// --- For sort key
inline NABoolean isSorted() const { return (sortKey_.entries() > 0); }
@@ -549,7 +549,6 @@ private:
}; // class OptimizeForNRows
// -- Optimize for first row - not used in SQ
-// LCOV_EXCL_START
class OptimizeForFirstRow : public OptimizeForNRows
{
public:
@@ -558,7 +557,6 @@ public:
virtual ~OptimizeForFirstRow() {}
}; // class OptimizeForFirstRow
-// LCOV_EXCL_STOP
// -- Optimize for last row
class OptimizeForLastRow : public OptimizeForNRows
@@ -574,7 +572,6 @@ public:
}; // class OptimizeForLastRow
// -- Optimize for resource consumption - not used in SQ
-// LCOV_EXCL_START
class OptimizeForResourceConsumption : public PerformanceGoal
{
public:
@@ -583,7 +580,6 @@ public:
virtual NABoolean isOptimizeForResourceConsumption() const;
}; // class OptimizeForResourceConsumption
-// LCOV_EXCL_STOP
// -----------------------------------------------------------------------
@@ -991,7 +987,7 @@ public:
// ---------------------------------------------------------------------
inline const RelExpr * getMustMatch() const { return mustMatch_; }
- RelExpr* getInputMustMatch(Lng32 childIndex) const; // LCOV_EXCL_LINE
+ RelExpr* getInputMustMatch(Lng32 childIndex) const;
void setPushDownRequirement(const PushDownRequirement* pdp)
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/optimizer/QRDescGenerator.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/QRDescGenerator.cpp b/core/sql/optimizer/QRDescGenerator.cpp
index 9ea571c..9071018 100644
--- a/core/sql/optimizer/QRDescGenerator.cpp
+++ b/core/sql/optimizer/QRDescGenerator.cpp
@@ -103,11 +103,9 @@ void EqualitySet::determineType()
if (isEmpty())
{
// I don't think this should happen.
- // LCOV_EXCL_START :rfi
QRLogger::log(CAT_SQL_COMP_QR_DESC_GEN, LL_MVQR_FAIL,
"determineType() called for empty EqualitySet.");
return;
- // LCOV_EXCL_STOP
}
NABoolean isExact = FALSE, wasExact, isSigned = FALSE, isNullable = FALSE;
@@ -781,7 +779,6 @@ QRExplicitExprPtr QRDescGenerator::getExprTree(ItemExpr* itemExpr)
}
break;
- // LCOV_EXCL_START :rfi
case QR::QRNoElem:
default:
assertLogAndThrow1(CAT_SQL_COMP_QR_DESC_GEN, LL_MVQR_FAIL,
@@ -789,7 +786,6 @@ QRExplicitExprPtr QRDescGenerator::getExprTree(ItemExpr* itemExpr)
"Unhandled ExprElement enum value: %d",
itemExpr->getQRExprElem());
return NULL;
- // LCOV_EXCL_STOP
}
// make the compiler happy
return NULL;
@@ -895,7 +891,6 @@ QRDescGenerator::genQRExpr(ItemExpr* pExpr,
} // genQRExpr()
// -----------------------------------------------------------------------
-// LCOV_EXCL_START :cnu
NABoolean
QRDescGenerator::normalizeColumnInExpression(NAString& pExprText,
ValueId colvid,
@@ -936,7 +931,6 @@ QRDescGenerator::normalizeColumnInExpression(NAString& pExprText,
return bColFound;
} // normalizeColumnInExpression()
-// LCOV_EXCL_STOP
void QRDescGenerator::markColumnsAsResidual(ValueIdSet& vegrefsInExpr)
{
@@ -1328,14 +1322,12 @@ void QRDescGenerator::processJBBCList(CANodeIdSet* jbbcNodeIds,
}
else
{
- // LCOV_EXCL_START :rfi
deletePtr(groupJbb);
Int32 nodeIdVal = nodeId;
assertLogAndThrow1(CAT_SQL_COMP_QR_DESC_GEN, LL_MVQR_FAIL,
FALSE, QRDescriptorException,
"Unsupported operator: %s",
nodeAnalysis->getOriginalExpr()->getText().data());
- // LCOV_EXCL_STOP
}
}
}
@@ -1818,7 +1810,6 @@ NABoolean QRDescGenerator::processJBBs(QRDescriptorPtr descPtr,
return jbbElemsWereCreated;
}
-// LCOV_EXCL_START :cnu
void QRDescGenerator::logColumnBitmap(QRTablePtr table,
const XMLBitmap& bitmap,
ElementType predType)
@@ -1876,7 +1867,6 @@ void QRDescGenerator::logColumnBitmap(QRTablePtr table,
}
} // logColumnBitmap()
-// LCOV_EXCL_STOP
QRQueryDescriptorPtr QRDescGenerator::createQueryDescriptor(QueryAnalysis* qa,
RelExpr* expr)
@@ -1924,10 +1914,8 @@ QRMVDescriptorPtr QRDescGenerator::createMvDescriptor(QueryAnalysis* qa,
}
else
{
- // LCOV_EXCL_START :rfi processJBBs should not return false for mv
deletePtr(mvDesc);
return NULL;
- // LCOV_EXCL_STOP
}
} // createMvDescriptor()
@@ -3033,13 +3021,11 @@ void QRDescGenerator::setPredBitmap(QRValueId colVid, ElementType elemType)
}
else
{
- // LCOV_EXCL_START :rfi
Int32 vidInt = vid;
assertLogAndThrow2(CAT_SQL_COMP_QR_DESC_GEN, LL_MVQR_FAIL,
FALSE, QRDescriptorException,
"ValueId %d is not a base col or veg ref -- op type = %d",
vidInt, opType);
- // LCOV_EXCL_STOP
}
}
assertLogAndThrow1(CAT_SQL_COMP_QR_DESC_GEN, LL_MVQR_FAIL,
@@ -3063,7 +3049,7 @@ void QRDescGenerator::setPredBitmap(QRValueId colVid, ElementType elemType)
else if (elemType == ET_ResidualPred)
elem->downCastToQRTable()->setResidualBit(col->getColIndex());
else
- assertLogAndThrow1(CAT_SQL_COMP_QR_DESC_GEN, LL_MVQR_FAIL, // LCOV_EXCL_LINE :rfi
+ assertLogAndThrow1(CAT_SQL_COMP_QR_DESC_GEN, LL_MVQR_FAIL,
FALSE, QRDescriptorException,
"Wrong element type sent to setPredBitmap() -- %d",
elemType);
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/optimizer/QueryGraph.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/QueryGraph.cpp b/core/sql/optimizer/QueryGraph.cpp
index d75c900..ab64527 100644
--- a/core/sql/optimizer/QueryGraph.cpp
+++ b/core/sql/optimizer/QueryGraph.cpp
@@ -20,7 +20,6 @@
//
// @@@ END COPYRIGHT @@@
**********************************************************************/
-// LCOV_EXCL_START
// code that is not compiled, but for some reason is reported
// just excluding the entire file
#include "AppliedStatMan.h"
@@ -725,4 +724,3 @@ const CANodeIdSet * QueryGraphConnection::getBestIncomingReductionPath()
return bestIncomingReductionPath_;
}
//QueryGraphConnection::getBestIncomingReductionPath
-// LCOV_EXCL_STOP
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/optimizer/QueryRewriteHandler.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/QueryRewriteHandler.cpp b/core/sql/optimizer/QueryRewriteHandler.cpp
index b097a14..28bc812 100644
--- a/core/sql/optimizer/QueryRewriteHandler.cpp
+++ b/core/sql/optimizer/QueryRewriteHandler.cpp
@@ -52,7 +52,6 @@ void MvQueryRewriteHandler::createMvDescriptor(QueryAnalysis* qa, RelExpr* expr,
{
mvDescriptor_ = descGenerator.createMvDescriptor(qa, expr);
}
- // LCOV_EXCL_START :rfi
catch (QRDescriptorException& ex)
{
QRLogger::log(CAT_SQL_COMP_QR_HANDLER, LL_MVQR_FAIL,
@@ -65,7 +64,6 @@ void MvQueryRewriteHandler::createMvDescriptor(QueryAnalysis* qa, RelExpr* expr,
"An Unknown exception occurred while generating MV descriptor.");
warningMessage = "Unknown internal error.";
}
- // LCOV_EXCL_STOP
}
// -----------------------------------------------------------------------
@@ -115,16 +113,13 @@ static QRRequestResult parseXML(char* xmlText, Int32 xmlLen,
if (!descriptor)
{
- // LCOV_EXCL_START :rfi
QRLogger::log(CAT_SQL_COMP_QR_HANDLER, LL_MVQR_FAIL,
"XMLDocument.parse() returned NULL.");
return XMLParseError;
- // LCOV_EXCL_STOP
}
else
;//debugMessage("Parsed XML document successfully.");
}
- // LCOV_EXCL_START :rfi
catch (XMLException& ex)
{
QRLogger::log(CAT_SQL_COMP_QR_HANDLER, LL_MVQR_FAIL,
@@ -143,7 +138,6 @@ static QRRequestResult parseXML(char* xmlText, Int32 xmlLen,
"An Unknown exception occurred");
return InternalError;
}
- // LCOV_EXCL_STOP
return Success;
}
@@ -250,7 +244,6 @@ RelExpr* MvQueryRewriteHandler::handleMvQueryRewrite(QueryAnalysis* qa,
? descGenerator.createXmlText(requestDescriptor)
: NULL);
}
- // LCOV_EXCL_START :rfi
catch(QRDescriptorException e)
{
// Just ignore it and leave xmlText_ as NULL to skip the rest of this method.
@@ -272,7 +265,6 @@ RelExpr* MvQueryRewriteHandler::handleMvQueryRewrite(QueryAnalysis* qa,
warningMessage = "Internal error";
return rootExpr;
}
- // LCOV_EXCL_STOP
if (xmlText_ == NULL)
{
@@ -313,13 +305,11 @@ RelExpr* MvQueryRewriteHandler::handleMvQueryRewrite(QueryAnalysis* qa,
IpcServer* qms = MvQueryRewriteServer::getQmsServer(publishDest);
if (!qms)
{
- // LCOV_EXCL_START :rfi
QRLogger::log(CAT_SQL_COMP_QR_IPC, LL_MVQR_FAIL,
"Match failed due to inability to connect to QMS.");
if (rootExpr->isAnalyzeOnly())
rootExpr = handleAnalyzeOnlyQuery(rootExpr, "Can't connect to QMS");
return rootExpr; // Can't get a QMS
- // LCOV_EXCL_STOP
}
// Do QMS MATCH protocol here.
@@ -345,19 +335,17 @@ RelExpr* MvQueryRewriteHandler::handleMvQueryRewrite(QueryAnalysis* qa,
xmlResponse->decrRefCount();
}
else
- result = ProtocolError; // LCOV_EXCL_LINE :rfi
+ result = ProtocolError;
if (result == Success)
{
// Make sure the parsed document was a result descriptor.
if (responseDescriptor->getElementType() != ET_ResultDescriptor)
{
- // LCOV_EXCL_START :rfi
QRLogger::log(CAT_SQL_COMP_QR_HANDLER, LL_MVQR_FAIL,
"Response to MATCH request was an XML document with "
"document element <%s> instead of <%s>",
responseDescriptor->getElementName(), QRResultDescriptor::elemName);
- // LCOV_EXCL_STOP
}
else
{
@@ -369,7 +357,6 @@ RelExpr* MvQueryRewriteHandler::handleMvQueryRewrite(QueryAnalysis* qa,
}
}
}
- // LCOV_EXCL_START :rfi
catch(QRDescriptorException e)
{
// Exception has generated mx event, but not mvqr-logged.
@@ -398,7 +385,6 @@ RelExpr* MvQueryRewriteHandler::handleMvQueryRewrite(QueryAnalysis* qa,
rootExpr = handleAnalyzeOnlyQuery(rootExpr, "Unknown exception thrown");
return rootExpr;
}
- // LCOV_EXCL_STOP
}
delete xmlText_;
@@ -409,7 +395,6 @@ RelExpr* MvQueryRewriteHandler::handleMvQueryRewrite(QueryAnalysis* qa,
} // handleMvQueryRewrite()
// -----------------------------------------------------------------------
-// LCOV_EXCL_START :dpm
void MvQueryRewriteHandler::dumpToFile(const char* fileName, const char* data)
{
FILE *mvqr_fd = fopen(fileName, "w+");
@@ -421,7 +406,6 @@ void MvQueryRewriteHandler::dumpToFile(const char* fileName, const char* data)
fclose(mvqr_fd);
}
} // dumpToFile()
-// LCOV_EXCL_STOP
// -----------------------------------------------------------------------
#if 0
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/optimizer/QueryRewriteHandler.h
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/QueryRewriteHandler.h b/core/sql/optimizer/QueryRewriteHandler.h
index 48121d7..4dbe77f 100644
--- a/core/sql/optimizer/QueryRewriteHandler.h
+++ b/core/sql/optimizer/QueryRewriteHandler.h
@@ -41,7 +41,7 @@ class QRXmlMessageObj;
//============================================================================
class MvQueryRewriteHandler : public NABasicObject
-{ // LCOV_EXCL_LINE -- for some reason, LCOV marks this brace as "not covered"
+{
public:
MvQueryRewriteHandler(CollHeap* heap)
: mvName_(heap),
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/optimizer/Refresh.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/Refresh.cpp b/core/sql/optimizer/Refresh.cpp
index aef4a04..ed575dd 100644
--- a/core/sql/optimizer/Refresh.cpp
+++ b/core/sql/optimizer/Refresh.cpp
@@ -687,7 +687,6 @@ const NAString Refresh::getText() const
//////////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////
// Exclude from coverage testing - Must be implemented as a RelExpr subclass, but not used.
-// LCOV_EXCL_START
RelExpr *Refresh::copyTopNode(RelExpr *derivedNode, CollHeap* outHeap)
{
Refresh *result = NULL;
@@ -726,7 +725,6 @@ RelExpr *Refresh::copyTopNode(RelExpr *derivedNode, CollHeap* outHeap)
return BinderOnlyNode::copyTopNode(result, outHeap);
} // Refresh::copyTopNode()
-// LCOV_EXCL_STOP
//////////////////////////////////////////////////////////////////////////////
// Return the DeltaDefinition for the table named 'name'.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/optimizer/Rule.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/Rule.cpp b/core/sql/optimizer/Rule.cpp
index 212a484..9e1e066 100644
--- a/core/sql/optimizer/Rule.cpp
+++ b/core/sql/optimizer/Rule.cpp
@@ -79,10 +79,8 @@ void ReinitRuleSet(RuleSet* rules)
Rule::Rule (const char * name, RelExpr * pattern, RelExpr * substitute)
{
if (name == NULL)
-// LCOV_EXCL_START
// all current rules have name, which is a good practice
name_ = "no user name";
-// LCOV_EXCL_STOP
else
name_ = name;
@@ -97,16 +95,13 @@ Rule::Rule (const char * name, RelExpr * pattern, RelExpr * substitute)
} // Rule::Rule
-// LCOV_EXCL_START
// Rules are created once and never deleted
Rule::~Rule ()
{
delete pattern_;
delete substitute_;
} // Rule::~Rule
-// LCOV_EXCL_STOP
-// LCOV_EXCL_START
// print methods are for debugging
void Rule::print (FILE * f, const char * prefix, const char * suffix)
{
@@ -116,7 +111,6 @@ void Rule::print (FILE * f, const char * prefix, const char * suffix)
substitute_ -> print (f, " Substitute = ", "");
fprintf (f, "%s\n", suffix);
} // Rule::print
-// LCOV_EXCL_STOP
NABoolean Rule::isImplementationRule() const
{
@@ -395,14 +389,12 @@ RuleSet::RuleSet(Int32 approxNumRules, CollHeap* h) :
initializeAllPasses();
}
-// LCOV_EXCL_START
// Rules are created once and never deleted
RuleSet::~RuleSet()
{
for (Lng32 i = 0; i < (Lng32)allRules_.entries(); i++)
delete allRules_[i];
}
-// LCOV_EXCL_STOP
void RuleSet::insert(Rule * r)
{
@@ -513,7 +505,6 @@ void RuleSet::initializeFirstPass()
setTotalPasses();
}
-// LCOV_EXCL_START
// this is called by the old optimization driver i.e. RelExpr::optimize
// the new optimization driver is method RelExpr::optimize2
NABoolean RuleSet::nextPass()
@@ -527,7 +518,6 @@ NABoolean RuleSet::nextPass()
else
return FALSE;
}
-// LCOV_EXCL_STOP
void RuleSet::setCurrentPassNumber(Lng32 passNumber)
{
@@ -594,7 +584,6 @@ NABoolean RulesPerContextList::applied (const Context * const context,
return FALSE;
}
-// LCOV_EXCL_START
// not called anywhere in the code
//
// Has the provided rule been applied in any prior context which has the
@@ -613,7 +602,6 @@ NABoolean RulesPerContextList::applied (const EstLogPropSharedPtr& inputLogProp,
}
return FALSE;
}
-// LCOV_EXCL_STOP
void RulesPerContextList::addRule (const Context* const context,
NAUnsigned ruleNumber)
@@ -641,7 +629,6 @@ void RulesPerContextList::addRule (const Context* const context,
insertAt (0, newEntry);
}
-// LCOV_EXCL_START
// method is not called anywhere
void RulesPerContextList::removeRule (const Context* const context,
NAUnsigned ruleNumber)
@@ -659,7 +646,6 @@ void RulesPerContextList::removeRule (const Context* const context,
i++;
}
}
-// LCOV_EXCL_STOP
// -----------------------------------------------------------------------
// methods for class Guidance
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/optimizer/Rule.h
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/Rule.h b/core/sql/optimizer/Rule.h
index 452d75d..8337a6a 100644
--- a/core/sql/optimizer/Rule.h
+++ b/core/sql/optimizer/Rule.h
@@ -182,10 +182,8 @@ public:
const char * suffix = "");
// methods to get instance variables / data members
-// LCOV_EXCL_START
// method is used by debug code and therefore not exercised in mainline code
inline const char * getName () const { return name_; }
-// LCOV_EXCL_STOP
inline RelExpr * getPattern () const { return pattern_; }
inline NAUnsigned getNumber() const { return ruleNumber_; }
inline RelExpr * getSubstitute () const { return substitute_; }
@@ -344,12 +342,10 @@ public:
// Methods dealing with the current pass number.
inline void initializeCurrentPassNumber() { currentPass_ = 0; }
-// LCOV_EXCL_START
// method is called in an old code path not exercised any more
// this gets called when RelExpr::optimize was used as the optimization
// driver. The new driver (for quite some time now) is RelExpr::optimize2
inline void incrementCurrentPassNumber() { currentPass_++; }
-// LCOV_EXCL_STOP
inline Lng32 getCurrentPassNumber() const { return currentPass_; }
@@ -420,10 +416,8 @@ public:
// accessor functions
inline Lng32 getCountOfRules() const { return allRules_.entries(); }
-// LCOV_EXCL_START
// method is used in debugging and therefore not exercised in mainline code
inline Int32 getRuleApplCount() const { return ruleApplCount_; }
-// LCOV_EXCL_STOP
inline void bumpRuleApplCount() { ruleApplCount_++; }
inline const RuleSubset & oldRules() { return oldRules_; }
@@ -509,13 +503,11 @@ public:
// copy ctor
RulesPerContext (const RulesPerContext &) ; // not written
-// LCOV_EXCL_START
// destructors a generally not called for objects involved in
// optimization (unless the class is heavy weight). This is
// because the entire statement heap is discarded at the end
// of compilation.
~RulesPerContext() {}
-// LCOV_EXCL_STOP
// Accessor methods
inline const Context* getContext() const { return context_; }
[09/14] incubator-trafodion git commit: lcov: commit #1
Posted by an...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/exp/exp_bignum.cpp
----------------------------------------------------------------------
diff --git a/core/sql/exp/exp_bignum.cpp b/core/sql/exp/exp_bignum.cpp
index 14187e5..c22f317 100644
--- a/core/sql/exp/exp_bignum.cpp
+++ b/core/sql/exp/exp_bignum.cpp
@@ -75,13 +75,11 @@ BigNum::~BigNum()
#pragma warning (default : 4273) //warning elimination
#pragma warning (disable : 4273) //warning elimination
-// LCOV_EXCL_START
Attributes * BigNum::newCopy()
{
BigNum * new_copy = new BigNum();
*new_copy = *this;
return new_copy;
-// LCOV_EXCL_STOP
};
#pragma warning (default : 4273) //warning elimination
@@ -95,11 +93,9 @@ Attributes * BigNum::newCopy(NAMemory * heap)
#pragma warning (default : 4273) //warning elimination
#pragma warning (disable : 4273) //warning elimination
-// LCOV_EXCL_START
void BigNum::copyAttrs(Attributes *source)
{
*this = *((BigNum *) source);
- // LCOV_EXCL_STOP
return;
};
#pragma warning (default : 4273) //warning elimination
@@ -156,7 +152,6 @@ void BigNum::fixup(Space * space,
// Convert (i.e. copy) the Big Num from op_data[1] ("source") to op_data[0] ("this").
#pragma warning (disable : 4273) //warning elimination
-// LCOV_EXCL_START
short BigNum::conv(Attributes * source, char * op_data[])
{
return BigNumHelper::ConvBigNumWithSignToBigNumWithSignHelper(((BigNum *) source)->getLength(),
@@ -164,7 +159,6 @@ short BigNum::conv(Attributes * source, char * op_data[])
op_data[1],
op_data[0]);
}
-// LCOV_EXCL_STOP
#pragma warning (default : 4273) //warning elimination
@@ -518,7 +512,6 @@ short BigNum::castFrom (Attributes * source,
unsigned short * thisDataInShorts = (unsigned short *) op_data[0];
if ((sourceType >= REC_MIN_INTERVAL) && (sourceType <= REC_MAX_INTERVAL)) {
- // LCOV_EXCL_START
switch (source1->getLength()) {
case SQL_SMALL_SIZE:
sourceType = REC_BIN16_SIGNED;
@@ -528,7 +521,6 @@ short BigNum::castFrom (Attributes * source,
break;
case SQL_LARGE_SIZE:
sourceType = REC_BIN64_SIGNED;
- // LCOV_EXCL_STOP
break;
}
}
@@ -539,7 +531,6 @@ short BigNum::castFrom (Attributes * source,
switch (sourceType) {
case REC_BIN16_SIGNED: {
- // LCOV_EXCL_START
if ( *((short *) op_data[1]) < 0) {
#pragma nowarn(1506) // warning elimination
thisDataInShorts[0] = -*((short *) op_data[1]);
@@ -549,13 +540,11 @@ short BigNum::castFrom (Attributes * source,
else {
thisDataInShorts[0] = *((short *) op_data[1]);
}
- // LCOV_EXCL_STOP
}
break;
case REC_BPINT_UNSIGNED:
case REC_BIN16_UNSIGNED: {
- // LCOV_EXCL_START
thisDataInShorts[0] = *((unsigned short *) op_data[1]);
}
break;
@@ -567,7 +556,6 @@ short BigNum::castFrom (Attributes * source,
}
else {
*((ULng32 *) op_data[0]) = *((Lng32 *) op_data[1]);
- // LCOV_EXCL_STOP
}
#ifdef NA_LITTLE_ENDIAN
@@ -615,7 +603,6 @@ short BigNum::castFrom (Attributes * source,
case REC_DECIMAL_LSE: {
// Remember first char of source in temp
- // LCOV_EXCL_START
char temp = op_data[1][0];
// Temporarily suppress sign bit in source
@@ -750,7 +737,6 @@ short BigNum::castFrom (Attributes * source,
}
break;
- // LCOV_EXCL_STOP
case REC_FLOAT64: {
// The code below is modeled on the corresponding code in large decimals.
@@ -881,7 +867,6 @@ short BigNum::castFrom (Attributes * source,
#pragma warning (disable : 4273) //warning elimination
-// LCOV_EXCL_START
void BigNum::encode(const char * inBuf, char * outBuf, short desc)
{
char sign = BIGN_GET_SIGN(inBuf, getLength());
@@ -967,7 +952,6 @@ void BigNum::init(char * op_data, char * str)
// Set sign bit
if (str[0] == '-')
BIGN_SET_SIGN(op_data, getLength());
- // LCOV_EXCL_STOP
}
#pragma warning (default : 4273) //warning elimination
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/exp/exp_clause.cpp
----------------------------------------------------------------------
diff --git a/core/sql/exp/exp_clause.cpp b/core/sql/exp/exp_clause.cpp
index 8050450..af0d36d 100644
--- a/core/sql/exp/exp_clause.cpp
+++ b/core/sql/exp/exp_clause.cpp
@@ -1150,23 +1150,18 @@ const char * getOperTypeEnumAsString(Int16 /*OperatorTypeEnum*/ ote)
case ITM_OR: return "ITM_OR";
// unary logic operators
- // LCOV_EXCL_START
case ITM_NOT: return "ITM_NOT";
case ITM_IS_TRUE: return "ITM_IS_TRUE";
case ITM_IS_FALSE: return "ITM_IS_FALSE";
- // LCOV_EXCL_STOP
case ITM_IS_NULL: return "ITM_IS_NULL";
case ITM_IS_NOT_NULL: return "ITM_IS_NOT_NULL";
- // LCOV_EXCL_START
case ITM_IS_UNKNOWN: return "ITM_IS_UNKNOWN";
case ITM_IS_NOT_UNKNOWN: return "ITM_IS_NOT_UNKNOWN";
- // LCOV_EXCL_STOP
// binary comparison operators
case ITM_EQUAL: return "ITM_EQUAL";
case ITM_NOT_EQUAL: return "ITM_NOT_EQUAL";
case ITM_LESS: return "ITM_LESS";
- // LCOV_EXCL_START
case ITM_LESS_EQ: return "ITM_LESS_EQ";
case ITM_GREATER: return "ITM_GREATER";
case ITM_GREATER_EQ: return "ITM_GREATER_EQ";
@@ -1174,12 +1169,10 @@ const char * getOperTypeEnumAsString(Int16 /*OperatorTypeEnum*/ ote)
// unary arithmetic operators
case ITM_NEGATE: return "ITM_NEGATE";
case ITM_INVERSE: return "ITM_INVERSE";
- // LCOV_EXCL_STOP
// binary arithmetic operators
case ITM_PLUS: return "ITM_PLUS";
case ITM_MINUS: return "ITM_MINUS";
case ITM_TIMES: return "ITM_TIMES";
- // LCOV_EXCL_START
case ITM_DIVIDE: return "ITM_DIVIDE";
case ITM_EXPONENT: return "ITM_EXPONENT";
@@ -1205,23 +1198,18 @@ const char * getOperTypeEnumAsString(Int16 /*OperatorTypeEnum*/ ote)
case ITM_PIVOT_GROUP: return "ITM_PIVOT_GROUP";
- // LCOV_EXCL_STOP
case ITM_AGGR_MIN_MAX: return "ITM_AGGR_MIN_MAX";
case ITM_AGGR_GROUPING_FUNC: return "ITM_AGGR_GROUPING_FUNC";
// custom functions
- // LCOV_EXCL_START
case ITM_USER_DEF_FUNCTION: return "ITM_USER_DEF_FUNCTION";
case ITM_BETWEEN: return "ITM_BETWEEN";
- // LCOV_EXCL_STOP
case ITM_LIKE: return "ITM_LIKE";
case ITM_REGEXP: return "ITM_REGEXP";
- // LCOV_EXCL_START
case ITM_CURRENT_TIMESTAMP: return "ITM_CURRENT_TIMESTAMP";
case ITM_CURRENT_USER: return "ITM_CURRENT_USER";
case ITM_SESSION_USER: return "ITM_SESSION_USER";
case ITM_USER: return "ITM_USER";
- // LCOV_EXCL_STOP
case ITM_AUTHNAME: return "ITM_AUTHNAME";
case ITM_AUTHTYPE: return "ITM_AUTHTYPE";
@@ -1231,14 +1219,11 @@ const char * getOperTypeEnumAsString(Int16 /*OperatorTypeEnum*/ ote)
case ITM_CASE: return "ITM_CASE";
case ITM_IF_THEN_ELSE: return "ITM_IF_THEN_ELSE";
case ITM_RETURN_TRUE: return "ITM_RETURN_TRUE";
- // LCOV_EXCL_START
case ITM_RETURN_FALSE: return "ITM_RETURN_FALSE";
case ITM_RETURN_NULL: return "ITM_RETURN_NULL";
- // LCOV_EXCL_STOP
case ITM_COMP_ENCODE: return "ITM_COMP_ENCODE";
case ITM_COMP_DECODE: return "ITM_COMP_DECODE";
case ITM_HASH: return "ITM_HASH";
- // LCOV_EXCL_START
case ITM_REPLACE_NULL: return "ITM_REPLACE_NULL";
case ITM_PACK_FUNC: return "ITM_PACK_FUNC";
case ITM_BITMUX: return "ITM_BITMUX";
@@ -1258,9 +1243,7 @@ const char * getOperTypeEnumAsString(Int16 /*OperatorTypeEnum*/ ote)
case ITM_MOVING_MIN : return "ITM_MOVING_MIN";
case ITM_MOVING_SDEV : return "ITM_MOVING_SDEV";
case ITM_MOVING_VARIANCE : return "ITM_MOVING_VARIANCE";
- // LCOV_EXCL_STOP
case ITM_OFFSET : return "ITM_OFFSET";
- // LCOV_EXCL_START
case ITM_RUNNING_COUNT : return "ITM_RUNNING_COUNT";
case ITM_ROWS_SINCE : return "ITM_ROWS_SINCE";
case ITM_RUNNING_SUM : return "ITM_RUNNING_SUM";
@@ -1274,9 +1257,7 @@ const char * getOperTypeEnumAsString(Int16 /*OperatorTypeEnum*/ ote)
// flow control
case ITM_DO_WHILE : return "ITM_DO_WHILE";
- // LCOV_EXCL_STOP
case ITM_BLOCK : return "ITM_BLOCK";
- // LCOV_EXCL_START
case ITM_WHILE : return "ITM_WHILE";
// scalar min/max
@@ -1366,7 +1347,6 @@ const char * getOperTypeEnumAsString(Int16 /*OperatorTypeEnum*/ ote)
case ITM_REPLACE_UNICODE: return "ITM_REPLACE_UNICODE";
case ITM_UNICODE_CODE_VALUE: return "ITM_UNICODE_CODE_VALUE";
case ITM_NCHAR_MP_CODE_VALUE: return "ITM_NCHAR_MP_CODE_VALUE";
- // LCOV_EXCL_STOP
// translate function
case ITM_TRANSLATE: return "ITM_TRANSLATE";
@@ -1375,7 +1355,6 @@ const char * getOperTypeEnumAsString(Int16 /*OperatorTypeEnum*/ ote)
// RowSet expression functions
case ITM_ROWSETARRAY_SCAN: return "ITM_ROWSETARRAY_SCAN";
- // LCOV_EXCL_START
case ITM_ROWSETARRAY_ROWID: return "ITM_ROWSETARRAY_ROWID";
case ITM_ROWSETARRAY_INTO : return "ITM_ROWSETARRAY_INTO";
@@ -1398,10 +1377,8 @@ const char * getOperTypeEnumAsString(Int16 /*OperatorTypeEnum*/ ote)
case ITM_DAYOFYEAR: return "ITM_DAYOFYEAR";
case ITM_FIRSTDAYOFYEAR: return "ITM_FIRSTDAYOFYEAR";
case ITM_INTERNALTIMESTAMP: return "ITM_INTERNALTIMESTAMP";
- // LCOV_EXCL_STOP
// misc. functions
case ITM_NARROW: return "ITM_NARROW";
- // LCOV_EXCL_START
case ITM_INTERVAL: return "ITM_INTERVAL";
case ITM_INSTANTIATE_NULL: return "ITM_INSTANTIATE_NULL";
case ITM_INCREMENT: return "ITM_INCREMENT";
@@ -1410,23 +1387,18 @@ const char * getOperTypeEnumAsString(Int16 /*OperatorTypeEnum*/ ote)
case ITM_LESS_OR_LE: return "ITM_LESS_OR_LE";
case ITM_RANGE_LOOKUP: return "ITM_RANGE_LOOKUP";
case ITM_DECODE: return "ITM_DECODE";
- // LCOV_EXCL_STOP
case ITM_HDPHASHCOMB: return "ITM_HDPHASHCOMB";
- // LCOV_EXCL_START
case ITM_RANDOMNUM: return "ITM_RANDOMNUM";
case ITM_PROGDISTRIB: return "ITM_PROGDISTRIB";
- // LCOV_EXCL_STOP
case ITM_HASHCOMB: return "ITM_HASHCOMB";
case ITM_HDPHASH: return "ITM_HDPHASH";
case ITM_EXEC_COUNT: return "ITM_EXEC_COUNT";
- // LCOV_EXCL_START
case ITM_CURR_TRANSID: return "ITM_CURR_TRANSID";
case ITM_NOTCOVERED: return "ITM_NOTCOVERED";
case ITM_BALANCE: return "ITM_BALANCE";
case ITM_RAND_SELECTION: return "ITM_RAND_SELECTION";
case ITM_PROGDISTRIBKEY: return "ITM_PROGDISTRIBKEY";
case ITM_PAGROUP: return "ITM_PAGROUP";
- // LCOV_EXCL_STOP
case ITM_HASH2_DISTRIB: return "ITM_HASH2_DISTRIB";
case ITM_HEADER: return "ITM_HEADER";
@@ -1475,7 +1447,6 @@ const char * getOperTypeEnumAsString(Int16 /*OperatorTypeEnum*/ ote)
// renaming, conversion, assignment
case ITM_RENAME_COL: return "ITM_RENAME_COL";
- // LCOV_EXCL_STOP
case ITM_CONVERT: return "ITM_CONVERT";
case ITM_CAST: return "ITM_CAST";
case ITM_ASSIGN: return "ITM_ASSIGN";
@@ -1485,7 +1456,6 @@ const char * getOperTypeEnumAsString(Int16 /*OperatorTypeEnum*/ ote)
// do a cast but adjust target length based
// on operand (used by ODBC)
- // LCOV_EXCL_START
case ITM_CAST_CONVERT: return "ITM_CAST_CONVERT";
case ITM_CAST_TYPE: return "ITM_CAST_TYPE";
@@ -1543,7 +1513,6 @@ const char * getOperTypeEnumAsString(Int16 /*OperatorTypeEnum*/ ote)
case ITM_SEQUENCE_VALUE: return "ITM_SEQUENCE_VALUE";
- // LCOV_EXCL_STOP
// Note, this list is arranged in the same order as the types
// appear in common/OperTypeEnum.h, please keep the same order
// when adding new types
@@ -1878,7 +1847,6 @@ ex_like_clause_doublebyte::ex_like_clause_doublebyte(OperatorTypeEnum oper_type,
/////////////////////////////////////////////////////////////
// Methods to display Contents
/////////////////////////////////////////////////////////////
-// LCOV_EXCL_START
void ex_aggr_one_row_clause::displayContents(Space * space, const char * /*displayStr*/, Int32 clauseNum, char * constsArea)
{
ex_clause::displayContents(space, "ex_aggr_one_row_clause", clauseNum, constsArea);
@@ -1888,7 +1856,6 @@ void ex_aggr_any_true_max_clause::displayContents(Space * space, const char * /*
{
ex_clause::displayContents(space, "ex_aggr_any_true_max_clause", clauseNum, constsArea);
}
-// LCOV_EXCL_STOP
void ex_aggr_min_max_clause::displayContents(Space * space, const char * /*displayStr*/, Int32 clauseNum, char * constsArea)
{
ex_clause::displayContents(space, "ex_aggr_min_max_clause", clauseNum, constsArea);
@@ -2038,7 +2005,6 @@ void ex_function_clause::displayContents(Space * space, const char * /*displaySt
{
ex_clause::displayContents(space, "ex_function_clause", clauseNum, constsArea);
}
-// LCOV_EXCL_START
void ex_function_abs::displayContents(Space * space, const char * /*displayStr*/, Int32 clauseNum, char * constsArea)
{
ex_clause::displayContents(space, "ex_function_abs", clauseNum, constsArea);
@@ -2053,7 +2019,6 @@ void ExFunctionBitOper::displayContents(Space * space, const char * /*displayStr
{
ex_clause::displayContents(space, "ExFunctionBitOper", clauseNum, constsArea);
}
-// LCOV_EXCL_STOP
void ex_inout_clause::displayContents(Space * space, const char * /*displayStr*/, Int32 clauseNum, char * constsArea)
{
ex_clause::displayContents(space, "ex_inout_clause", clauseNum, constsArea);
@@ -2080,7 +2045,6 @@ void ExRegexpClauseChar::displayContents(Space * space, const char * /*displaySt
ex_clause::displayContents(space, "ExRegexpClauseChar", clauseNum, constsArea);
}
-// LCOV_EXCL_START
void ex_like_clause_doublebyte::displayContents(Space * space, const char * /*displayStr*/, Int32 clauseNum, char * constsArea)
{
ex_clause::displayContents(space, "ex_like_clause_doublebyte", clauseNum, constsArea);
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/exp/exp_comp.cpp
----------------------------------------------------------------------
diff --git a/core/sql/exp/exp_comp.cpp b/core/sql/exp/exp_comp.cpp
index 90fc7f8..82a57ae 100644
--- a/core/sql/exp/exp_comp.cpp
+++ b/core/sql/exp/exp_comp.cpp
@@ -164,10 +164,8 @@ ex_comp_clause::processResult(Int32 compare_code, Lng32* result,
break;
default:
- // LCOV_EXCL_START
ExRaiseSqlError(heap, diagsArea, EXE_INTERNAL_ERROR);
return ex_expr::EXPR_ERROR;
- // LCOV_EXCL_STOP
break;
}
return ex_expr::EXPR_OK;
@@ -209,7 +207,6 @@ ex_expr::exp_return_type ex_comp_clause::eval(char *op_data[],
case EQ_BIN16S_BIN16U:
*(Lng32 *)op_data[0] = (*(short *)op_data[1] == *(unsigned short *)op_data[2]);
break;
- // LCOV_EXCL_START
case EQ_BIN16S_BIN32U:
*(Lng32 *)op_data[0] = ((ULng32)*(short *)op_data[1] == *(ULng32 *)op_data[2]);
break;
@@ -219,7 +216,6 @@ ex_expr::exp_return_type ex_comp_clause::eval(char *op_data[],
case EQ_BIN16U_BIN16S:
*(Lng32 *)op_data[0] = (*(unsigned short *)op_data[1] == *(short *)op_data[2]);
break;
- // LCOV_EXCL_STOP
case EQ_BIN16U_BIN32S:
*(Lng32 *)op_data[0] = (*(unsigned short *)op_data[1] == *(Lng32 *)op_data[2]);
break;
@@ -229,10 +225,8 @@ ex_expr::exp_return_type ex_comp_clause::eval(char *op_data[],
break;
case EQ_BIN16U_BIN32U:
- // LCOV_EXCL_START
*(Lng32 *)op_data[0] = (*(unsigned short *)op_data[1] == *(ULng32 *)op_data[2]);
break;
- // LCOV_EXCL_STOP
case EQ_BIN32S_BIN16S:
@@ -262,10 +256,8 @@ ex_expr::exp_return_type ex_comp_clause::eval(char *op_data[],
break;
case EQ_BIN32U_BIN16U:
- // LCOV_EXCL_START
*(Lng32 *)op_data[0] = (*(ULng32 *)op_data[1] == *(unsigned short *)op_data[2]);
break;
- // LCOV_EXCL_STOP
case EQ_BIN32U_BIN32U:
*(Lng32 *)op_data[0] = (*(ULng32 *)op_data[1] == *(ULng32 *)op_data[2]);
@@ -330,17 +322,14 @@ ex_expr::exp_return_type ex_comp_clause::eval(char *op_data[],
break;
case NE_BIN16S_BIN16S:
- // LCOV_EXCL_START
*(Lng32 *)op_data[0] = (*(short *)op_data[1] != *(short *)op_data[2]);
break;
- // LCOV_EXCL_STOP
case NE_BIN16S_BIN32S:
*(Lng32 *)op_data[0] = (*(short *)op_data[1] != *(Lng32 *)op_data[2]);
break;
case NE_BIN16S_BIN16U:
- // LCOV_EXCL_START
*(Lng32 *)op_data[0] = (*(short *)op_data[1] != *(unsigned short *)op_data[2]);
break;
@@ -357,16 +346,13 @@ ex_expr::exp_return_type ex_comp_clause::eval(char *op_data[],
case NE_BIN16U_BIN32S:
*(Lng32 *)op_data[0] = (*(unsigned short *)op_data[1] != *(Lng32 *)op_data[2]);
break;
- // LCOV_EXCL_STOP
case NE_BIN16U_BIN16U:
*(Lng32 *)op_data[0] = (*(unsigned short *)op_data[1] != *(unsigned short *)op_data[2]);
break;
case NE_BIN16U_BIN32U:
- // LCOV_EXCL_START
*(Lng32 *)op_data[0] = (*(unsigned short *)op_data[1] != *(ULng32 *)op_data[2]);
break;
- // LCOV_EXCL_STOP
case NE_BIN32S_BIN16S:
@@ -396,10 +382,8 @@ ex_expr::exp_return_type ex_comp_clause::eval(char *op_data[],
break;
case NE_BIN32U_BIN16U:
- // LCOV_EXCL_START
*(Lng32 *)op_data[0] = (*(ULng32 *)op_data[1] != *(unsigned short *)op_data[2]);
break;
- // LCOV_EXCL_STOP
case NE_BIN32U_BIN32U:
*(Lng32 *)op_data[0] = (*(ULng32 *)op_data[1] != *(ULng32 *)op_data[2]);
break;
@@ -430,14 +414,12 @@ ex_expr::exp_return_type ex_comp_clause::eval(char *op_data[],
break;
case NE_UNICODE_F_F: // 11/3/97: Added for Unicode support
- // LCOV_EXCL_START
if (wc_str_cmp((NAWchar*)op_data[1], (NAWchar*)op_data[2],
(Int32)getOperand(1)->getLength() >> 1) != 0)
*(Lng32 *)op_data[0] = 1;
else
*(Lng32 *)op_data[0] = 0;
break;
- // LCOV_EXCL_STOP
case NE_FLOAT32_FLOAT32:
*(Lng32 *)op_data[0] = (*(float *)op_data[1] != *(float *)op_data[2]);
break;
@@ -486,14 +468,11 @@ ex_expr::exp_return_type ex_comp_clause::eval(char *op_data[],
case LT_BIN16U_BIN16S:
- // LCOV_EXCL_START
*(Lng32 *)op_data[0] = (*(unsigned short *)op_data[1] < *(short *)op_data[2]);
break;
- // LCOV_EXCL_STOP
case LT_BIN16U_BIN32S:
*(Lng32 *)op_data[0] = (*(unsigned short *)op_data[1] < *(Lng32 *)op_data[2]);
break;
- // LCOV_EXCL_START
case LT_BIN16U_BIN16U:
*(Lng32 *)op_data[0] = (*(unsigned short *)op_data[1] < *(unsigned short *)op_data[2]);
break;
@@ -501,7 +480,6 @@ ex_expr::exp_return_type ex_comp_clause::eval(char *op_data[],
case LT_BIN16U_BIN32U:
*(Lng32 *)op_data[0] = (*(unsigned short *)op_data[1] < *(ULng32 *)op_data[2]);
break;
- // LCOV_EXCL_STOP
case LT_BIN32S_BIN16S:
@@ -513,14 +491,12 @@ ex_expr::exp_return_type ex_comp_clause::eval(char *op_data[],
break;
case LT_BIN32S_BIN16U:
- // LCOV_EXCL_START
*(Lng32 *)op_data[0] = (*(Lng32 *)op_data[1] < *(unsigned short *)op_data[2]);
break;
case LT_BIN32S_BIN32U:
*(Lng32 *)op_data[0] = ((Int64)*(Lng32 *)op_data[1] < (Int64)*(ULng32 *)op_data[2]);
break;
- // LCOV_EXCL_STOP
case LT_BIN32U_BIN16S:
@@ -665,24 +641,20 @@ ex_expr::exp_return_type ex_comp_clause::eval(char *op_data[],
case LE_BIN16U_BIN16S:
- // LCOV_EXCL_START
*(Lng32 *)op_data[0] = (*(unsigned short *)op_data[1] <= *(short *)op_data[2]);
break;
- // LCOV_EXCL_STOP
case LE_BIN16U_BIN32S:
*(Lng32 *)op_data[0] = (*(unsigned short *)op_data[1] <= *(Lng32 *)op_data[2]);
break;
case LE_BIN16U_BIN16U:
- // LCOV_EXCL_START
*(Lng32 *)op_data[0] = (*(unsigned short *)op_data[1] <= *(unsigned short *)op_data[2]);
break;
case LE_BIN16U_BIN32U:
*(Lng32 *)op_data[0] = (*(unsigned short *)op_data[1] <= *(ULng32 *)op_data[2]);
break;
- // LCOV_EXCL_STOP
case LE_BIN32S_BIN16S:
@@ -694,14 +666,12 @@ ex_expr::exp_return_type ex_comp_clause::eval(char *op_data[],
break;
case LE_BIN32S_BIN16U:
- // LCOV_EXCL_START
*(Lng32 *)op_data[0] = (*(Lng32 *)op_data[1] <= *(unsigned short *)op_data[2]);
break;
case LE_BIN32S_BIN32U:
*(Lng32 *)op_data[0] = ((Int64)*(Lng32 *)op_data[1] <= (Int64)*(ULng32 *)op_data[2]);
break;
- // LCOV_EXCL_STOP
case LE_BIN32U_BIN16S:
@@ -765,7 +735,6 @@ ex_expr::exp_return_type ex_comp_clause::eval(char *op_data[],
else
{
// first operand is negative
- // LCOV_EXCL_START
if ((op_data[2][0] & 0200) == 0)
{
// second operand is positive
@@ -780,7 +749,6 @@ ex_expr::exp_return_type ex_comp_clause::eval(char *op_data[],
else
*(Lng32 *)op_data[0] = 1;
}
- // LCOV_EXCL_STOP
} // first operand is negative
}
break;
@@ -858,14 +826,12 @@ ex_expr::exp_return_type ex_comp_clause::eval(char *op_data[],
break;
case GT_BIN16U_BIN16U:
- // LCOV_EXCL_START
*(Lng32 *)op_data[0] = (*(unsigned short *)op_data[1] > *(unsigned short *)op_data[2]);
break;
case GT_BIN16U_BIN32U:
*(Lng32 *)op_data[0] = (*(unsigned short *)op_data[1] > *(ULng32 *)op_data[2]);
break;
- // LCOV_EXCL_STOP
case GT_BIN32S_BIN16S:
@@ -877,14 +843,12 @@ ex_expr::exp_return_type ex_comp_clause::eval(char *op_data[],
break;
case GT_BIN32S_BIN16U:
- // LCOV_EXCL_START
*(Lng32 *)op_data[0] = (*(Lng32 *)op_data[1] > *(unsigned short *)op_data[2]);
break;
case GT_BIN32S_BIN32U:
*(Lng32 *)op_data[0] = ((Int64)*(Lng32 *)op_data[1] > (Int64)*(ULng32 *)op_data[2]);
break;
- // LCOV_EXCL_STOP
case GT_BIN32U_BIN16S:
@@ -974,14 +938,12 @@ ex_expr::exp_return_type ex_comp_clause::eval(char *op_data[],
case GT_UNICODE_F_F:
// 11/3/97: added for Unicode
- // LCOV_EXCL_START
if (wc_str_cmp((NAWchar*)op_data[1], (NAWchar*)op_data[2],
(Int32)(getOperand(1)->getLength()) >>1) > 0)
*(Lng32 *)op_data[0] = 1;
else
*(Lng32 *)op_data[0] = 0;
break;
- // LCOV_EXCL_STOP
case GT_FLOAT32_FLOAT32:
*(Lng32 *)op_data[0] = (*(float *)op_data[1] > *(float *)op_data[2]);
@@ -1017,7 +979,6 @@ ex_expr::exp_return_type ex_comp_clause::eval(char *op_data[],
break;
case GE_BIN16S_BIN32S:
- // LCOV_EXCL_START
*(Lng32 *)op_data[0] = (*(short *)op_data[1] >= *(Lng32 *)op_data[2]);
break;
@@ -1025,29 +986,24 @@ ex_expr::exp_return_type ex_comp_clause::eval(char *op_data[],
*(Lng32 *)op_data[0] = (*(short *)op_data[1] >= *(unsigned short *)op_data[2]);
break;
- // LCOV_EXCL_STOP
case GE_BIN16S_BIN32U:
*(Lng32 *)op_data[0] = (*(short *)op_data[1] >= (Int64)*(ULng32 *)op_data[2]);
break;
case GE_BIN16U_BIN16S:
- // LCOV_EXCL_START
*(Lng32 *)op_data[0] = (*(unsigned short *)op_data[1] >= *(short *)op_data[2]);
break;
- // LCOV_EXCL_STOP
case GE_BIN16U_BIN32S:
*(Lng32 *)op_data[0] = (*(unsigned short *)op_data[1] >= *(Lng32 *)op_data[2]);
break;
case GE_BIN16U_BIN16U:
- // LCOV_EXCL_START
*(Lng32 *)op_data[0] = (*(unsigned short *)op_data[1] >= *(unsigned short *)op_data[2]);
break;
case GE_BIN16U_BIN32U:
*(Lng32 *)op_data[0] = (*(unsigned short *)op_data[1] >= *(ULng32 *)op_data[2]);
break;
- // LCOV_EXCL_STOP
case GE_BIN32S_BIN16S:
@@ -1252,7 +1208,6 @@ ex_expr::exp_return_type ex_comp_clause::eval(char *op_data[],
// this comparison operation not supported.
// See if it could still be evaluated by doing some intermediate
// operations.
- // LCOV_EXCL_START
if (evalUnsupportedOperations(op_data, heap, diagsArea) !=
ex_expr::EXPR_OK)
return ex_expr::EXPR_ERROR;
@@ -1263,7 +1218,6 @@ ex_expr::exp_return_type ex_comp_clause::eval(char *op_data[],
ExRaiseSqlError(heap, diagsArea, EXE_INTERNAL_ERROR);
retcode = ex_expr::EXPR_ERROR;
break;
- // LCOV_EXCL_STOP
}
if ((getRollupColumnNum() >= 0) &&
@@ -1276,7 +1230,6 @@ ex_expr::exp_return_type ex_comp_clause::eval(char *op_data[],
return retcode;
}
-// LCOV_EXCL_START
ex_expr::exp_return_type ex_comp_clause::evalUnsupportedOperations(
char *op_data[],
CollHeap *heap,
@@ -1290,7 +1243,6 @@ ex_expr::exp_return_type ex_comp_clause::evalUnsupportedOperations(
ExRaiseSqlError(heap, diagsArea, EXE_INTERNAL_ERROR);
return ex_expr::EXPR_ERROR;
}
-// LCOV_EXCL_STOP
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/exp/exp_conv.cpp
----------------------------------------------------------------------
diff --git a/core/sql/exp/exp_conv.cpp b/core/sql/exp/exp_conv.cpp
index d1f131b..ecda9c2 100644
--- a/core/sql/exp/exp_conv.cpp
+++ b/core/sql/exp/exp_conv.cpp
@@ -102,11 +102,9 @@ void double_varchar_length(
{
if (varCharLenSize == sizeof(Lng32)) {
Lng32 x;
- // LCOV_EXCL_START
str_cpy_all((char*)&x, varCharLen, sizeof(Lng32));
x *= BYTES_PER_NAWCHAR;
str_cpy_all(varCharLen, (char *)&x, sizeof(Lng32));
- // LCOV_EXCL_STOP
} else {
short x;
str_cpy_all((char*)&x, varCharLen, sizeof(short));
@@ -248,7 +246,6 @@ if ((intermediate < LLONG_MAX/scaleFactor) &&
{
intermediate = intermediate * scaleFactor;
}
-// LCOV_EXCL_START
else if (dataConversionErrorFlag)
{
if (intermediate > 0)
@@ -270,7 +267,6 @@ else
sourceLen, sourceType, 0, targetType, flags);
return ex_expr::EXPR_ERROR;
}
-// LCOV_EXCL_STOP
// now move converted intermediate to target
@@ -1063,7 +1059,6 @@ ex_expr::exp_return_type convLargeDecToAscii(char *target,
if(source[0] < 2)
{
unsigned short realSource[256];
- // LCOV_EXCL_START
str_cpy_all((char *)realSource, source, sourceLen);
if(realSource[0]) source[0] = '-';
@@ -1081,7 +1076,6 @@ ex_expr::exp_return_type convLargeDecToAscii(char *target,
r <<= 16;
}
source[srcPos] = (char)(r >>= 16);
- // LCOV_EXCL_STOP
}
}
@@ -1376,7 +1370,6 @@ ex_expr::exp_return_type convAsciiToDatetime(char *target,
}
-// LCOV_EXCL_START
ex_expr::exp_return_type convUnicodeToDatetime(char *target,
Lng32 targetLen,
REC_DATETIME_CODE code,
@@ -1421,7 +1414,6 @@ ex_expr::exp_return_type convUnicodeToDatetime(char *target,
return ex_expr::EXPR_ERROR;
}
-// LCOV_EXCL_STOP
// convDatetimeDatetime() ============================================
// This function supports any datetime to datetime conversions with
@@ -1720,31 +1712,25 @@ ex_expr::exp_return_type convAsciiToFloat64(char * target,
if (NOT validNum)
{
- // LCOV_EXCL_START
char hexstr[MAX_OFFENDING_SOURCE_DATA_DISPLAY_LEN];
ExRaiseSqlError(heap, diagsArea, EXE_CONVERT_STRING_ERROR,NULL,NULL,NULL,NULL,stringToHex(hexstr, sizeof(hexstr), source, sourceLen ));
return ex_expr::EXPR_ERROR;
- // LCOV_EXCL_STOP
};
double scale = MathPow(10.0, (double)numScale, err);
if (isinf(scale))
{
- // LCOV_EXCL_START
ExRaiseDetailSqlError(heap, diagsArea, EXE_NUMERIC_OVERFLOW, source,
sourceLen, REC_BYTE_F_ASCII,
SQLCHARSETCODE_ISO88591, REC_FLOAT64, flags);
return ex_expr::EXPR_ERROR;
- // LCOV_EXCL_STOP
}
if (err)
{
- // LCOV_EXCL_START
ExRaiseDetailSqlError(heap, diagsArea, EXE_NUMERIC_OVERFLOW, source,
sourceLen, REC_BYTE_F_ASCII,
SQLCHARSETCODE_ISO88591,REC_FLOAT64, flags);
return ex_expr::EXPR_ERROR;
- // LCOV_EXCL_STOP
}
if (negMantissa)
@@ -2175,7 +2161,6 @@ ex_expr::exp_return_type convAsciiToDec(char *target,
// only blanks found, error
if (sourceStart == sourceLen) {
- // LCOV_EXCL_START
if (flags & CONV_TREAT_ALL_SPACES_AS_ZERO)
{
// pad the target with zeros
@@ -2192,7 +2177,6 @@ ex_expr::exp_return_type convAsciiToDec(char *target,
return ex_expr::EXPR_ERROR;
};
- // LCOV_EXCL_STOP
// skip trailing blanks. We know that we found already some
// non-blank character, thus sourceLen is always > sourceStart
@@ -2221,7 +2205,6 @@ ex_expr::exp_return_type convAsciiToDec(char *target,
// scale the intermediate
for (Lng32 j = 0; j < targetScale; j++) {
- // LCOV_EXCL_START
intermediate *= 10.0;
if ((intermediate < LLONG_MIN) || (intermediate > LLONG_MAX)) {
@@ -2230,7 +2213,6 @@ ex_expr::exp_return_type convAsciiToDec(char *target,
SQLCHARSETCODE_ISO88591,
REC_DECIMAL_UNSIGNED, flags);
return ex_expr::EXPR_ERROR;
- // LCOV_EXCL_STOP
};
}
@@ -3405,11 +3387,9 @@ ex_expr::exp_return_type convBigNumToBigNum(char *target,
if (sign)
{
- // LCOV_EXCL_START
ExRaiseSqlError(heap, diagsArea, EXE_UNSIGNED_OVERFLOW);
return ex_expr::EXPR_ERROR;
- // LCOV_EXCL_STOP
}
}
@@ -3419,12 +3399,10 @@ ex_expr::exp_return_type convBigNumToBigNum(char *target,
target);
if (retCode== -1) {
// target is not long enough - overflow
- // LCOV_EXCL_START
ExRaiseDetailSqlError(heap, diagsArea, EXE_NUMERIC_OVERFLOW, source,
sourceLen, REC_NUM_BIG_SIGNED, 0, REC_NUM_BIG_SIGNED,
flags);
return ex_expr::EXPR_ERROR;
- // LCOV_EXCL_STOP
};
return ex_expr::EXPR_OK;
@@ -3492,7 +3470,6 @@ ex_expr::exp_return_type convDecToInt64(Int64 &target,
//////////////////////////////////////////////////////////////////
// function to convert Decimal to Decimal
///////////////////////////////////////////////////////////////////
-// LCOV_EXCL_START
ex_expr::exp_return_type convDecToDec(char *target,
Lng32 targetLen,
char *source,
@@ -3652,7 +3629,6 @@ ex_expr::exp_return_type convDecLStoAscii(char *target,
return ex_expr::EXPR_OK;
};
-// LCOV_EXCL_STOP
//////////////////////////////////////////////////////////////////
// This function returns an int64 with the minimum value that
@@ -4336,14 +4312,12 @@ NAWchar * wc_str_find_first_nonblank(NAWchar *s, Lng32 len) {
////////////////////////////////////////////////
// find the first non zero(character 0) character
////////////////////////////////////////////////
-// LCOV_EXCL_START
char* str_find_first_nonzero(char* s, Lng32 len) {
for (Lng32 i = 0; i< len; i++)
if (s[i] != '0')
return &s[i];
return 0;
}
-// LCOV_EXCL_STOP
void setVCLength(char * VCLen, Lng32 VCLenSize, ULng32 value) {
if (VCLenSize == sizeof(short)) {
@@ -4422,7 +4396,6 @@ unicodeToSByteTarget(
if (first_nonblank) // if truncated portion isn't all blanks
{
- // LCOV_EXCL_START
if (dataConversionErrorFlag) // want conversion flag instead of warning?
{
// yes - determine whether target is greater than or less than source
@@ -4431,7 +4404,6 @@ unicodeToSByteTarget(
*dataConversionErrorFlag = ex_conv_clause::CONV_RESULT_ROUNDED_UP;
else
*dataConversionErrorFlag = ex_conv_clause::CONV_RESULT_ROUNDED_DOWN;
- // LCOV_EXCL_STOP
}
else
// no - raise a warning
@@ -4494,7 +4466,6 @@ unicodeToMByteTarget(
NADELETE(cBuf, charBuf, heap);
} else {
- // LCOV_EXCL_START
convertedLen = 0;
copyLen = 0;
@@ -4509,7 +4480,6 @@ unicodeToMByteTarget(
*(*diagsArea) << DgString0("UNICODE") << DgString1("SJIS") << DgString2(stringToHex(hexstr,sizeof(hexstr),source,sourceLen));
}
retcode = ex_expr::EXPR_ERROR;
- // LCOV_EXCL_STOP
}
}
@@ -4524,12 +4494,10 @@ unicodeToMByteTarget(
// TBD - if needed some day: If only blanks are truncated, don't
// generate an error.
- // LCOV_EXCL_START
if (dataConversionErrorFlag)
*dataConversionErrorFlag = ex_conv_clause::CONV_RESULT_ROUNDED;
else
ExRaiseSqlWarning(heap, diagsArea, EXE_STRING_OVERFLOW);
- // LCOV_EXCL_STOP
}
// If requested, blank pad so we don't leave garbage at end of target buf
if ( padSpace == TRUE && targetLen > copyLen )
@@ -4630,7 +4598,6 @@ ex_expr::exp_return_type convCharToChar(
if (rc && rc != CNV_ERR_BUFFER_OVERRUN)
{
- // LCOV_EXCL_START
ExeErrorCode errCode = EXE_INVALID_CHAR_IN_TRANSLATE_FUNC;
if (rc != CNV_ERR_INVALID_CHAR)
@@ -4645,7 +4612,6 @@ ex_expr::exp_return_type convCharToChar(
if (intermediateStr && intermediateStr != stackBuffer)
NADELETEBASIC(intermediateStr, heap);
return ex_expr::EXPR_ERROR;
- // LCOV_EXCL_STOP
}
if (rc || (targetPrecision && targetPrecision < (Lng32) translatedCharCnt))
@@ -4663,7 +4629,7 @@ ex_expr::exp_return_type convCharToChar(
(Int32)outputDataLen,
(Int32)targetPrecision,
ignoreTrailingBlanksInSource);
- assert((Int32)outputDataLen >= 0); //LCOV_EXCL_LINE : rfi
+ assert((Int32)outputDataLen >= 0);
firstUntranslatedChar = &utf8Tgt[outputDataLen];
}
else
@@ -4674,11 +4640,9 @@ ex_expr::exp_return_type convCharToChar(
if (ignoreTrailingBlanksInSource)
{
// check whether the characters from firstUntranslatedChar onwards are all blanks
- // LCOV_EXCL_START
remainingScanStringLen = input_length - (firstUntranslatedChar - input_to_scan);
canIgnoreOverflowChars =
!(str_find_first_nonblank(firstUntranslatedChar, remainingScanStringLen));
- // LCOV_EXCL_STOP
}
if (!canIgnoreOverflowChars)
@@ -5769,7 +5733,6 @@ convDoIt(char * source,
{
if (*(unsigned short *)source > limits[targetPrecision-1])
{
- // LCOV_EXCL_START
if (dataConversionErrorFlag != 0)
{
*(unsigned short *)target = limits[targetPrecision-1];
@@ -5781,7 +5744,6 @@ convDoIt(char * source,
sourceLen, sourceType, sourceScale,
targetType, tempFlags);
return ex_expr::EXPR_ERROR;
- // LCOV_EXCL_STOP
}
}
else
@@ -5797,10 +5759,8 @@ convDoIt(char * source,
{
if (dataConversionErrorFlag != 0) // Capture error in variable?
{
- // LCOV_EXCL_START
*(short *)target = SHRT_MAX;
*dataConversionErrorFlag = ex_conv_clause::CONV_RESULT_ROUNDED_DOWN_TO_MAX;
- // LCOV_EXCL_STOP
}
else
{
@@ -5881,11 +5841,9 @@ convDoIt(char * source,
break;
case CONV_BIN16U_BIN32U: {
- // LCOV_EXCL_START
*(ULng32 *)target = *(unsigned short *)source;
};
break;
- // LCOV_EXCL_STOP
case CONV_BIN16U_BIN64S: {
*(Int64 *)target = *(unsigned short *)source;
@@ -6017,7 +5975,6 @@ convDoIt(char * source,
{
if (*(Lng32 *)source < 0)
{
- // LCOV_EXCL_START
if (dataConversionErrorFlag != 0)
{
*(unsigned short *)target = 0;
@@ -6028,11 +5985,9 @@ convDoIt(char * source,
ExRaiseSqlError(heap, diagsArea, EXE_UNSIGNED_OVERFLOW);
return ex_expr::EXPR_ERROR;
}
- // LCOV_EXCL_STOP
}
else if (*(Lng32 *)source > (Lng32)limits[targetPrecision-1])
{
- // LCOV_EXCL_START
if (dataConversionErrorFlag != 0)
{
*(unsigned short *)target = limits[targetPrecision-1];
@@ -6044,7 +5999,6 @@ convDoIt(char * source,
sourceLen, sourceType, sourceScale,
targetType, tempFlags);
return ex_expr::EXPR_ERROR;
- // LCOV_EXCL_STOP
}
}
else
@@ -6264,7 +6218,6 @@ convDoIt(char * source,
case CONV_BIN32U_BPINTU:
{
- // LCOV_EXCL_START
if (*(ULng32 *)source > (ULng32)limits[targetPrecision-1])
{
if (dataConversionErrorFlag != 0)
@@ -6286,7 +6239,6 @@ convDoIt(char * source,
}
}
break;
- // LCOV_EXCL_STOP
case CONV_BIN32U_BIN16S:
{
if (*(ULng32 *)source > SHRT_MAX)
@@ -6534,7 +6486,6 @@ convDoIt(char * source,
{
if (*(Int64 *)source < 0)
{
- // LCOV_EXCL_START
if (dataConversionErrorFlag != 0)
{
*(unsigned short *)target = 0;
@@ -6546,10 +6497,8 @@ convDoIt(char * source,
return ex_expr::EXPR_ERROR;
}
}
- // LCOV_EXCL_STOP
else if (*(Int64 *)source > (Int64)limits[targetPrecision-1])
{
- // LCOV_EXCL_START
if (dataConversionErrorFlag != 0)
{
*(unsigned short *)target = limits[targetPrecision-1];
@@ -6561,7 +6510,6 @@ convDoIt(char * source,
sourceLen, sourceType, sourceScale,
targetType, tempFlags);
return ex_expr::EXPR_ERROR;
- // LCOV_EXCL_STOP
}
}
else
@@ -7258,7 +7206,6 @@ convDoIt(char * source,
case CONV_FLOAT32_BPINTU:
{
- // LCOV_EXCL_START
float floatsource = *floatSrcPtr;
if (floatsource < 0)
{
@@ -7311,7 +7258,6 @@ convDoIt(char * source,
}
}
break;
- // LCOV_EXCL_STOP
case CONV_FLOAT32_BIN16S:
{
float floatsource = *floatSrcPtr;
@@ -7319,10 +7265,8 @@ convDoIt(char * source,
{
if (dataConversionErrorFlag != 0) // Capture error in variable?
{
- // LCOV_EXCL_START
*(short *)target = SHRT_MIN;
*dataConversionErrorFlag = ex_conv_clause::CONV_RESULT_ROUNDED_UP_TO_MIN;
- // LCOV_EXCL_STOP
}
else
{
@@ -7336,10 +7280,8 @@ convDoIt(char * source,
{
if (dataConversionErrorFlag != 0) // Capture error in variable?
{
- // LCOV_EXCL_START
*(short *)target = SHRT_MAX;
*dataConversionErrorFlag = ex_conv_clause::CONV_RESULT_ROUNDED_DOWN_TO_MAX;
- // LCOV_EXCL_STOP
}
else
{
@@ -7362,9 +7304,7 @@ convDoIt(char * source,
#pragma warning (default : 4244) //warning elimination
if (floatsource2 > floatsource)
{
- // LCOV_EXCL_START
*dataConversionErrorFlag = ex_conv_clause::CONV_RESULT_ROUNDED_UP;
- // LCOV_EXCL_STOP
}
else
{
@@ -7404,10 +7344,8 @@ convDoIt(char * source,
{
if (dataConversionErrorFlag != 0) // Capture error in variable?
{
- // LCOV_EXCL_START
*(unsigned short *)target = 0;
*dataConversionErrorFlag = ex_conv_clause::CONV_RESULT_ROUNDED_UP_TO_MIN;
- // LCOV_EXCL_STOP
}
else
{
@@ -7419,10 +7357,8 @@ convDoIt(char * source,
{
if (dataConversionErrorFlag != 0) // Capture error in variable?
{
- // LCOV_EXCL_START
*(unsigned short *)target = USHRT_MAX;
*dataConversionErrorFlag = ex_conv_clause::CONV_RESULT_ROUNDED_DOWN_TO_MAX;
- // LCOV_EXCL_STOP
}
else
{
@@ -7440,7 +7376,6 @@ convDoIt(char * source,
// Convert back and check for a value change.
#pragma warning (disable : 4244) //warning elimination
#pragma nowarn(1506) // warning elimination
- // LCOV_EXCL_START
float floatsource2 = int64source;
#pragma warn(1506) // warning elimination
#pragma warning (default : 4244) //warning elimination
@@ -7453,7 +7388,6 @@ convDoIt(char * source,
if (floatsource2 < floatsource)
{
*dataConversionErrorFlag = ex_conv_clause::CONV_RESULT_ROUNDED_DOWN;
- // LCOV_EXCL_STOP
}
}
}
@@ -7487,10 +7421,8 @@ convDoIt(char * source,
{
if (dataConversionErrorFlag != 0) // Capture error in variable?
{
- // LCOV_EXCL_START
*(Lng32 *)target = INT_MIN;
*dataConversionErrorFlag = ex_conv_clause::CONV_RESULT_ROUNDED_UP_TO_MIN;
- // LCOV_EXCL_STOP
}
else
{
@@ -7504,10 +7436,8 @@ convDoIt(char * source,
{
if (dataConversionErrorFlag != 0) // Capture error in variable?
{
- // LCOV_EXCL_START
*(Lng32 *)target = INT_MAX;
*dataConversionErrorFlag = ex_conv_clause::CONV_RESULT_ROUNDED_DOWN_TO_MAX;
- // LCOV_EXCL_STOP
}
else
{
@@ -7581,7 +7511,6 @@ convDoIt(char * source,
}
else if (floatsource > UINT_MAX)
{
- // LCOV_EXCL_START
if (dataConversionErrorFlag != 0) // Capture error in variable?
{
*(ULng32 *)target = UINT_MAX;
@@ -7593,7 +7522,6 @@ convDoIt(char * source,
source, sourceLen, sourceType, sourceScale,
targetType, tempFlags);
return ex_expr::EXPR_ERROR;
- // LCOV_EXCL_STOP
}
}
else
@@ -7647,7 +7575,6 @@ convDoIt(char * source,
float floatsource = *floatSrcPtr;
if (floatsource < LLONG_MIN)
{
- // LCOV_EXCL_START
if (dataConversionErrorFlag != 0) // Capture error in variable?
{
*(Int64 *)target = LLONG_MIN;
@@ -7659,12 +7586,10 @@ convDoIt(char * source,
source, sourceLen, sourceType, sourceScale,
targetType, tempFlags);
return ex_expr::EXPR_ERROR;
- // LCOV_EXCL_STOP
}
}
else if (floatsource > LLONG_MAX)
{
- // LCOV_EXCL_START
if (dataConversionErrorFlag != 0) // Capture error in variable?
{
*(Int64 *)target = LLONG_MAX;
@@ -7677,7 +7602,6 @@ convDoIt(char * source,
targetType, tempFlags);
return ex_expr::EXPR_ERROR;
}
- // LCOV_EXCL_STOP
}
else
{
@@ -7687,7 +7611,6 @@ convDoIt(char * source,
// Convert back and check for a value change.
#pragma warning (disable : 4244) //warning elimination
#pragma nowarn(1506) // warning elimination
- // LCOV_EXCL_START
float floatsource2 = int64source;
#pragma warn(1506) // warning elimination
#pragma warning (default : 4244) //warning elimination
@@ -7701,7 +7624,6 @@ convDoIt(char * source,
{
*dataConversionErrorFlag = ex_conv_clause::CONV_RESULT_ROUNDED_DOWN;
}
- // LCOV_EXCL_STOP
}
}
if ((dataConversionErrorFlag != 0) ||
@@ -7810,10 +7732,8 @@ convDoIt(char * source,
{
if (dataConversionErrorFlag != 0)
{
- // LCOV_EXCL_START
setMinDecValue(target, targetLen, targetType);
*dataConversionErrorFlag = ex_conv_clause::CONV_RESULT_ROUNDED_UP_TO_MIN;
- // LCOV_EXCL_STOP
}
else
{
@@ -7842,7 +7762,6 @@ convDoIt(char * source,
}
else
{
- // LCOV_EXCL_START
Int64 int64source = (Int64) floatsource;
if (dataConversionErrorFlag != 0)
{
@@ -7875,7 +7794,6 @@ convDoIt(char * source,
}
}
break;
- // LCOV_EXCL_STOP
case CONV_FLOAT32_FLOAT32: {
*floatTgtPtr = *floatSrcPtr;
};
@@ -7888,11 +7806,9 @@ convDoIt(char * source,
case CONV_FLOAT32_ASCII: {
if (targetLen < SQL_REAL_MIN_DISPLAY_SIZE) {
- // LCOV_EXCL_START
ExRaiseDetailSqlError(heap, diagsArea, EXE_STRING_OVERFLOW,
source, sourceLen, sourceType, sourceScale, targetType, tempFlags);
return ex_expr::EXPR_ERROR;
- // LCOV_EXCL_STOP
};
// double intermediate = (double) *(float *) source;
@@ -7907,11 +7823,9 @@ convDoIt(char * source,
varCharLen,
varCharLenSize,
leftPad) != 0) {
- // LCOV_EXCL_START
ExRaiseDetailSqlError(heap, diagsArea, EXE_STRING_OVERFLOW,
source, sourceLen, sourceType, sourceScale, targetType, tempFlags);
return ex_expr::EXPR_ERROR;
- // LCOV_EXCL_STOP
}
};
break;
@@ -7921,7 +7835,6 @@ convDoIt(char * source,
double doublesource = *doubleSrcPtr;
if (doublesource < 0)
{
- // LCOV_EXCL_START
if (dataConversionErrorFlag != 0)
{
*(unsigned short *)target = 0;
@@ -7931,17 +7844,14 @@ convDoIt(char * source,
{
ExRaiseSqlError(heap, diagsArea, EXE_UNSIGNED_OVERFLOW);
return ex_expr::EXPR_ERROR;
- // LCOV_EXCL_STOP
}
}
else if (doublesource > limits[targetPrecision-1])
{
if (dataConversionErrorFlag != 0)
{
- // LCOV_EXCL_START
*(unsigned short *)target = limits[targetPrecision-1];
*dataConversionErrorFlag = ex_conv_clause::CONV_RESULT_ROUNDED_DOWN_TO_MAX;
- // LCOV_EXCL_STOP
}
else
{
@@ -7982,10 +7892,8 @@ convDoIt(char * source,
{
if (dataConversionErrorFlag != 0) // Capture error in variable?
{
- // LCOV_EXCL_START
*(short *)target = SHRT_MIN;
*dataConversionErrorFlag = ex_conv_clause::CONV_RESULT_ROUNDED_UP_TO_MIN;
- // LCOV_EXCL_STOP
}
else
{
@@ -8023,9 +7931,7 @@ convDoIt(char * source,
#pragma warning (default : 4244) //warning elimination
if (doublesource2 > doublesource)
{
- // LCOV_EXCL_START
*dataConversionErrorFlag = ex_conv_clause::CONV_RESULT_ROUNDED_UP;
- // LCOV_EXCL_STOP
}
else
{
@@ -8065,10 +7971,8 @@ convDoIt(char * source,
{
if (dataConversionErrorFlag != 0) // Capture error in variable?
{
- // LCOV_EXCL_START
*(unsigned short *)target = 0;
*dataConversionErrorFlag = ex_conv_clause::CONV_RESULT_ROUNDED_UP_TO_MIN;
- // LCOV_EXCL_STOP
}
else
{
@@ -8080,10 +7984,8 @@ convDoIt(char * source,
{
if (dataConversionErrorFlag != 0) // Capture error in variable?
{
- // LCOV_EXCL_START
*(unsigned short *)target = USHRT_MAX;
*dataConversionErrorFlag = ex_conv_clause::CONV_RESULT_ROUNDED_DOWN_TO_MAX;
- // LCOV_EXCL_STOP
}
else
{
@@ -8101,7 +8003,6 @@ convDoIt(char * source,
#pragma warning (disable : 4244) //warning elimination
// Convert back and check for a value change.
#pragma nowarn(1506) // warning elimination
- // LCOV_EXCL_START
double doublesource2 = int64source;
#pragma warn(1506) // warning elimination
#pragma warning (default : 4244) //warning elimination
@@ -8115,7 +8016,6 @@ convDoIt(char * source,
{
*dataConversionErrorFlag = ex_conv_clause::CONV_RESULT_ROUNDED_DOWN;
}
- // LCOV_EXCL_STOP
}
}
if ((dataConversionErrorFlag != 0) ||
@@ -8303,7 +8203,6 @@ convDoIt(char * source,
double doublesource = *doubleSrcPtr;
if (doublesource < LLONG_MIN)
{
- // LCOV_EXCL_START
if (dataConversionErrorFlag != 0) // Capture error in variable?
{
*(Int64 *)target = LLONG_MIN;
@@ -8315,17 +8214,14 @@ convDoIt(char * source,
source, sourceLen, sourceType, sourceScale,
targetType, tempFlags);
return ex_expr::EXPR_ERROR;
- // LCOV_EXCL_STOP
}
}
else if (doublesource > LLONG_MAX)
{
if (dataConversionErrorFlag != 0) // Capture error in variable?
{
- // LCOV_EXCL_START
*(Int64 *)target = LLONG_MAX;
*dataConversionErrorFlag = ex_conv_clause::CONV_RESULT_ROUNDED_DOWN_TO_MAX;
- // LCOV_EXCL_STOP
}
else
{
@@ -8343,7 +8239,6 @@ convDoIt(char * source,
// Convert back and check for a value change.
#pragma warning (disable : 4244) //warning elimination
#pragma nowarn(1506) // warning elimination
- // LCOV_EXCL_START
double doublesource2 = int64source;
#pragma warn(1506) // warning elimination
#pragma nowarn(1506) // warning elimination
@@ -8359,7 +8254,6 @@ convDoIt(char * source,
{
*dataConversionErrorFlag = ex_conv_clause::CONV_RESULT_ROUNDED_DOWN;
}
- // LCOV_EXCL_STOP
}
}
if ((dataConversionErrorFlag != 0) ||
@@ -8468,10 +8362,8 @@ convDoIt(char * source,
{
if (dataConversionErrorFlag != 0)
{
- // LCOV_EXCL_START
setMinDecValue(target, targetLen, targetType);
*dataConversionErrorFlag = ex_conv_clause::CONV_RESULT_ROUNDED_UP_TO_MIN;
- // LCOV_EXCL_STOP
}
else
{
@@ -8487,10 +8379,8 @@ convDoIt(char * source,
{
if (dataConversionErrorFlag != 0)
{
- // LCOV_EXCL_START
setMaxDecValue(target, targetLen);
*dataConversionErrorFlag = ex_conv_clause::CONV_RESULT_ROUNDED_DOWN_TO_MAX;
- // LCOV_EXCL_STOP
}
else
{
@@ -8508,7 +8398,6 @@ convDoIt(char * source,
// Convert back and check for a value change.
#pragma warning (disable : 4244) //warning elimination
#pragma nowarn(1506) // warning elimination
- // LCOV_EXCL_START
double doublesource2 = int64source;
#pragma warn(1506) // warning elimination
#pragma warning (default : 4244) //warning elimination
@@ -8522,7 +8411,6 @@ convDoIt(char * source,
{
*dataConversionErrorFlag = ex_conv_clause::CONV_RESULT_ROUNDED_DOWN;
}
- // LCOV_EXCL_STOP
}
}
if (convInt64ToDec(target,
@@ -8599,11 +8487,9 @@ convDoIt(char * source,
{
if (ov)
{
- // LCOV_EXCL_START
ExRaiseDetailSqlError(heap, diagsArea, EXE_NUMERIC_OVERFLOW,
source, sourceLen, sourceType, sourceScale,
targetType, tempFlags);
- // LCOV_EXCL_STOP
return ex_expr::EXPR_ERROR;
}
}
@@ -8613,7 +8499,6 @@ convDoIt(char * source,
if (ov == 1) // overflow
{
- // LCOV_EXCL_START
if (doubleTarget < 0) // < -DBL_MAX
{
*doubleTgtPtr = -DBL_MAX;
@@ -8626,11 +8511,9 @@ convDoIt(char * source,
*dataConversionErrorFlag =
ex_conv_clause::CONV_RESULT_ROUNDED_DOWN_TO_MAX;
}
- // LCOV_EXCL_STOP
} // overflow
else if (ov == -1) // underflow
{
- // LCOV_EXCL_START
if (doubleTarget < 0) // > -DBL_MIN
{
*doubleTgtPtr = 0;
@@ -8642,7 +8525,6 @@ convDoIt(char * source,
*doubleTgtPtr = 0;
*dataConversionErrorFlag =
ex_conv_clause::CONV_RESULT_ROUNDED_DOWN;
- // LCOV_EXCL_STOP
}
} // underflow
} // data conversion flag
@@ -8943,7 +8825,6 @@ convDoIt(char * source,
tempFlags | CONV_INTERMEDIATE_CONVERSION) != ex_expr::EXPR_OK) {
//if a EXE_NUMERIC OVERFLOW error was generated during the conversion,
//change it to a warning.
- // LCOV_EXCL_START
if (*diagsArea) {
Lng32 errorMark2 = (*diagsArea)->getNumber(DgSqlCode::ERROR_);
Int32 counter = errorMark2 - errorMark;
@@ -8960,7 +8841,6 @@ convDoIt(char * source,
heap->deallocateMemory((void *)intermediate);
return ex_expr::EXPR_ERROR;
}
- // LCOV_EXCL_STOP
}
@@ -9021,7 +8901,6 @@ convDoIt(char * source,
break;
case CONV_DECLS_DECLS: {
- // LCOV_EXCL_START
if (targetLen < sourceLen) {
// overflow
ExRaiseDetailSqlError(heap, diagsArea, EXE_NUMERIC_OVERFLOW, source,
@@ -9119,7 +8998,6 @@ convDoIt(char * source,
return ex_expr::EXPR_OK;
};
break;
- // LCOV_EXCL_STOP
case CONV_INTERVALY_INTERVALMO: // convert years to months
{
if (convBinToBinScaleMult(target,
@@ -10502,7 +10380,6 @@ convDoIt(char * source,
ExRaiseSqlError(heap, diagsArea, EXE_STRING_OVERFLOW);
}
else {
- // LCOV_EXCL_START
convLen = 0;
copyLen = 0;
if ( varCharLen )
@@ -10511,7 +10388,6 @@ convDoIt(char * source,
ExRaiseSqlError(heap, diagsArea, EXE_CONVERT_STRING_ERROR,NULL, NULL, NULL, NULL, stringToHex(hexstr, sizeof(hexstr), source, sourceLen ));
return ex_expr::EXPR_ERROR;
- // LCOV_EXCL_STOP
}
};
break;
@@ -10522,7 +10398,6 @@ convDoIt(char * source,
case CONV_SJIS_V_UNICODE_V:
{
Lng32 copyLen, convertedLen;
- // LCOV_EXCL_START
const charBuf cBuf((unsigned char*)source, sourceLen, heap);
NAWcharBuf *wBuf = NULL;
@@ -10547,12 +10422,10 @@ convDoIt(char * source,
{
// yes - determine whether target is greater than or less than source
// note assumption: UNICODE character set
- // LCOV_EXCL_START
if (*first_nonblank < unicode_char_set::space_char())
*dataConversionErrorFlag = ex_conv_clause::CONV_RESULT_ROUNDED_UP;
else
*dataConversionErrorFlag = ex_conv_clause::CONV_RESULT_ROUNDED_DOWN;
- // LCOV_EXCL_STOP
}
else
// no - raise a warning
@@ -10563,12 +10436,9 @@ convDoIt(char * source,
NADELETE(wBuf, NAWcharBuf, heap);
} else {
- // LCOV_EXCL_START
convertedLen = 0;
copyLen = 0;
- // LCOV_EXCL_STOP
}
- // LCOV_EXCL_STOP
// There is no need to change the char string storage format
// for Unicode string.
@@ -10776,7 +10646,6 @@ convDoIt(char * source,
case CONV_ANSI_V_UNICODE_TO_ASCII_V: // ansi unicode (null terminalted)-> ascii
{
- // LCOV_EXCL_START
NAWchar* w_source = (NAWchar*)source;
Lng32 w_sourceLen = sourceLen/BYTES_PER_NAWCHAR;
@@ -10791,7 +10660,6 @@ convDoIt(char * source,
sourceLen = i*BYTES_PER_NAWCHAR;
}
- // LCOV_EXCL_STOP
//fall through
@@ -11975,7 +11843,6 @@ ex_expr::exp_return_type scaleDoIt(char *operand,
break;
default:
return ex_expr::EXPR_ERROR;
- // LCOV_EXCL_STOP
};
Lng32 scale = operandCurrScale - newScale;
@@ -12006,7 +11873,6 @@ ex_expr::exp_return_type scaleDoIt(char *operand,
// Check for overflow. TBD.
while (scale--) intermediateDouble /= 10;
}
- // LCOV_EXCL_START
else if (intermediateString != 0) {
if (DFS2REC::isBigNum(operandType))
{
@@ -12044,13 +11910,11 @@ ex_expr::exp_return_type scaleDoIt(char *operand,
NADELETEBASIC(intermediateString, heap);
return ex_expr::EXPR_ERROR;
}
- // LCOV_EXCL_STOP
}
} // decimal
} // intermediateString != 0
else
if (decimalString != 0) {
- // LCOV_EXCL_START
decimalString = new (heap) char[operandLen];
memset(decimalString, '0', operandLen);
if (scale > 0) { //downscale
@@ -12076,7 +11940,6 @@ ex_expr::exp_return_type scaleDoIt(char *operand,
else {
NADELETEBASIC(decimalString, heap);
return ex_expr::EXPR_ERROR;
- // LCOV_EXCL_STOP
}
}
}
@@ -12103,10 +11966,8 @@ ex_expr::exp_return_type scaleDoIt(char *operand,
}
break;
case REC_FLOAT32: {
- // LCOV_EXCL_START
floatOperandPtr = (float *)operand;
*floatOperandPtr = (float)intermediateDouble;
- // LCOV_EXCL_STOP
}
break;
case REC_FLOAT64: {
@@ -12128,13 +11989,11 @@ ex_expr::exp_return_type scaleDoIt(char *operand,
operand[0] |= 0x80;
break;
};
- // LCOV_EXCL_STOP
return ex_expr::EXPR_OK;
};
-// LCOV_EXCL_START
ex_expr::exp_return_type swapBytes(Attributes *attr,
void *ptr)
{
@@ -12189,4 +12048,3 @@ ex_expr::exp_return_type swapBytes(Attributes *attr,
}
return ex_expr::EXPR_OK;
}
-// LCOV_EXCL_STOP
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/exp/exp_datetime.cpp
----------------------------------------------------------------------
diff --git a/core/sql/exp/exp_datetime.cpp b/core/sql/exp/exp_datetime.cpp
index 0d3f55e..57fb8ff 100644
--- a/core/sql/exp/exp_datetime.cpp
+++ b/core/sql/exp/exp_datetime.cpp
@@ -172,27 +172,23 @@ ExpDatetime::ExpDatetime()
ExpDatetime::~ExpDatetime()
{
}
-// LCOV_EXCL_START
Attributes * ExpDatetime::newCopy()
{
ExpDatetime * new_copy = new ExpDatetime();
*new_copy = *this;
return new_copy;
};
-// LCOV_EXCL_STOP
Attributes * ExpDatetime::newCopy(CollHeap * heap)
{
ExpDatetime * new_copy = new(heap) ExpDatetime();
*new_copy = *this;
return new_copy;
};
-// LCOV_EXCL_START
void ExpDatetime::copyAttrs(Attributes *source_) // copy source attrs to this.
{
*this = *((ExpDatetime *)source_);
return;
};
-// LCOV_EXCL_STOP
ExpDatetime *
ExpDatetime::castToExpDatetime()
{
@@ -255,7 +251,6 @@ short ExpDatetime::getDatetimeFields(Lng32 datetimeCode,
case REC_DTCODE_YEAR_SECOND:
startField = REC_DATE_YEAR;
break;
- // LCOV_EXCL_START
case REC_DTCODE_MONTH:
case REC_DTCODE_MONTH_DAY:
case REC_DTCODE_MONTH_HOUR:
@@ -269,14 +264,12 @@ short ExpDatetime::getDatetimeFields(Lng32 datetimeCode,
case REC_DTCODE_DAY_SECOND:
startField = REC_DATE_DAY;
break;
- // LCOV_EXCL_STOP
case REC_DTCODE_TIME:
case REC_DTCODE_HOUR:
case REC_DTCODE_HOUR_MINUTE:
case REC_DTCODE_HOUR_SECOND:
startField = REC_DATE_HOUR;
break;
- // LCOV_EXCL_START
case REC_DTCODE_MINUTE:
case REC_DTCODE_MINUTE_SECOND:
startField = REC_DATE_MINUTE;
@@ -287,17 +280,14 @@ short ExpDatetime::getDatetimeFields(Lng32 datetimeCode,
default:
return -1;
}
- // LCOV_EXCL_STOP
switch (datetimeCode) {
case REC_DTCODE_YEAR:
endField = REC_DATE_YEAR;
break;
- // LCOV_EXCL_START
case REC_DTCODE_YEAR_MONTH:
case REC_DTCODE_MONTH:
endField = REC_DATE_MONTH;
- // LCOV_EXCL_STOP
break;
case REC_DTCODE_DATE:
case REC_DTCODE_YEAR_DAY:
@@ -305,7 +295,6 @@ short ExpDatetime::getDatetimeFields(Lng32 datetimeCode,
case REC_DTCODE_DAY:
endField = REC_DATE_DAY;
break;
- // LCOV_EXCL_START
case REC_DTCODE_YEAR_HOUR:
case REC_DTCODE_MONTH_HOUR:
case REC_DTCODE_DAY_HOUR:
@@ -319,7 +308,6 @@ short ExpDatetime::getDatetimeFields(Lng32 datetimeCode,
case REC_DTCODE_MINUTE:
endField = REC_DATE_MINUTE;
break;
- // LCOV_EXCL_STOP
case REC_DTCODE_TIMESTAMP:
case REC_DTCODE_YEAR_SECOND:
case REC_DTCODE_MONTH_SECOND:
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/exp/exp_expr.cpp
----------------------------------------------------------------------
diff --git a/core/sql/exp/exp_expr.cpp b/core/sql/exp/exp_expr.cpp
index 97d7ce0..c8d6340 100644
--- a/core/sql/exp/exp_expr.cpp
+++ b/core/sql/exp/exp_expr.cpp
@@ -101,7 +101,6 @@ Lng32 ex_expr::initExpr()
return rc;
}
-// LCOV_EXCL_START
// lean expressions are not used not tested
void ex_expr_lean::displayContents(Space * space, short mode,
const char * displayStr,
@@ -163,7 +162,6 @@ void ex_expr_lean::displayContents(Space * space, short mode,
}
}
}
-// LCOV_EXCL_STOP
// make a 'lean' copy of 'this' and point it back to itself. Supports all
// expressions. Do not copy clauses_ or pCodeObject_. Caller is responsible
// for proper deallocation of memory.
@@ -211,7 +209,6 @@ void ex_expr::makeLeanCopyAll(Space * space)
// make a 'lean' copy of 'this' to 'other'.
// Do not copy clauses_ or pCodeObject_.
-// LCOV_EXCL_START
void ex_expr::makeLeanCopy(ex_expr_lean * other, Space * space)
{
// *((ex_expr_base*)other) = *((ex_expr_base*)this);
@@ -246,7 +243,6 @@ void ex_expr::makeLeanCopy(ex_expr_lean * other, Space * space)
other->persistentArea_ = space->allocateAlignedSpace(persistentLength_);
}
}
-// LCOV_EXCL_STOP
void ex_expr::displayContents(Space * space, short mode, const char * displayStr,ULng32 flag)
{
char buf[100] = {0}; // Soln 10-041117-1848
@@ -316,14 +312,12 @@ void ex_expr::displayContents(Space * space, short mode, const char * displayStr
if(getPCodeObject())
{
- // LCOV_EXCL_START
str_sprintf(buf, " PCode:\n");
space->allocateAndCopyToAlignedSpace(buf, str_len(buf), sizeof(short));
str_sprintf(buf, "PCode Expr Length: %d", getPCodeSize());
space->allocateAndCopyToAlignedSpace(buf, str_len(buf), sizeof(short));
PCode::displayContents(getPCodeObject()->getPCIList(), space);
- // LCOV_EXCL_STOP
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/exp/exp_function.cpp
----------------------------------------------------------------------
diff --git a/core/sql/exp/exp_function.cpp b/core/sql/exp/exp_function.cpp
index 782131e..64f2c3b 100644
--- a/core/sql/exp/exp_function.cpp
+++ b/core/sql/exp/exp_function.cpp
@@ -1080,7 +1080,6 @@ ex_expr::exp_return_type ExFunctionReplace::eval(char *op_data[],
if (CollationInfo::isSystemCollation(getCollation()))
{
- // LCOV_EXCL_START
nPasses= CollationInfo::getCollationNPasses(getCollation());
lenSourceStr = getArgEncodedLen(0);
lenSearchStr = getArgEncodedLen(1);
@@ -1110,7 +1109,6 @@ ex_expr::exp_return_type ExFunctionReplace::eval(char *op_data[],
nPasses,
getCollation(),
TRUE);
- // LCOV_EXCL_START
}
@@ -1404,7 +1402,6 @@ ex_expr::exp_return_type ex_function_trim_char::eval(char *op_data[],
// case of collation --
if (CollationInfo::isSystemCollation(getCollation()))
{
- // LCOV_EXCL_START
nPasses = CollationInfo::getCollationNPasses(getCollation());
//get the length of the encoded source string
@@ -1455,7 +1452,6 @@ ex_expr::exp_return_type ex_function_trim_char::eval(char *op_data[],
getCollation(),
FALSE);
- // LCOV_EXCL_STOP
}
// Find how many leading characters in operand 2 correspond to the trim
// character.
@@ -2179,14 +2175,11 @@ Lng32 ex_function_position::findPosition
// sourceStr.
if (searchLen <= 0)
- // LCOV_EXCL_START
return 0;
- // LCOV_EXCL_STOP
Int32 position = 1;
Int32 collPosition = 1;
Int32 char_count = 1;
Int32 number_bytes;
- // LCOV_EXCL_START
while (position + searchLen -1 <= sourceLen)
{
if (str_cmp(searchStr, &sourceStr[position-1], (Int32)searchLen) != 0)
@@ -2222,7 +2215,6 @@ Lng32 ex_function_position::findPosition
}
}
return 0;
- // LCOV_EXCL_STOP
}
@@ -2345,7 +2337,6 @@ ex_expr::exp_return_type ex_function_position_doublebyte::eval(char *op_data[],
return ex_expr::EXPR_OK;
};
-// LCOV_EXCL_START
static Lng32 findTokenPosition(char * sourceStr, Lng32 sourceLen,
char * searchStr, Lng32 searchLen,
short bytesPerChar)
@@ -2550,7 +2541,6 @@ ex_expr::exp_return_type ExFunctionReverseStr::eval(char *op_data[],
return ex_expr::EXPR_OK;
};
-// LCOV_EXCL_STOP
ex_expr::exp_return_type ex_function_current::eval(char *op_data[],
CollHeap*,
ComDiagsArea**)
@@ -3627,7 +3617,6 @@ void ex_function_encode::encodeKeyValue(Attributes * attr,
break;
}
- // LCOV_EXCL_START
case REC_BYTE_F_ASCII: {
if (CollationInfo::isSystemCollation(collation ))
{
@@ -3645,7 +3634,6 @@ void ex_function_encode::encodeKeyValue(Attributes * attr,
collation,
TRUE);
}
- // LCOV_EXCL_STOP
else //search
{
Int32 effEncodedKeyLength = 0;
@@ -3690,7 +3678,6 @@ void ex_function_encode::encodeKeyValue(Attributes * attr,
if (CollationInfo::isSystemCollation(collation))
{
- // LCOV_EXCL_START
Int16 nPasses = CollationInfo::getCollationNPasses(collation);
NABoolean rmTspaces = getRmTSpaces(collation);
@@ -3724,7 +3711,6 @@ void ex_function_encode::encodeKeyValue(Attributes * attr,
}
}
else
- // LCOV_EXCL_STOP
{
//
@@ -3821,7 +3807,6 @@ void ex_function_encode::encodeKeyValue(Attributes * attr,
// class ex_function_encode
////////////////////////////////////////////////////////////////////
ex_function_encode::ex_function_encode(){};
-// LCOV_EXCL_START
ex_function_encode::ex_function_encode(OperatorTypeEnum oper_type,
Attributes ** attr,
Space * space,
@@ -3837,7 +3822,6 @@ ex_function_encode::ex_function_encode(OperatorTypeEnum oper_type,
setCollEncodingType(CollationInfo::Sort);
};
-// LCOV_EXCL_STOP
ex_function_encode::ex_function_encode(OperatorTypeEnum oper_type,
Attributes ** attr,
Space * space,
@@ -4040,7 +4024,6 @@ void ex_function_encode::getCollationWeight(
}
}
}
-// LCOV_EXCL_START
unsigned char ex_function_encode::getCollationWeight(
CharInfo::Collation collation,
Int16 pass,
@@ -4284,7 +4267,6 @@ void ex_function_encode::encodeCollationSearchKey(const UInt8 * src,
str_pad( (char *) ptr,(encodeKey - ptr) + encodedKeyLength, '\0');
} // ex_function_encode::encodeCollationSearchKey
-// LCOV_EXCL_STOP
////////////////////////////////////////////////////////////////////////
// class ex_function_explode_varchar
@@ -5054,7 +5036,6 @@ ex_expr::exp_return_type ex_function_mod::eval(char *op_data[],
////////////////////////////////////////////////////////////////////
// class ex_function_mask
////////////////////////////////////////////////////////////////////
-// LCOV_EXCL_START
ex_expr::exp_return_type ex_function_mask::eval(char *op_data[],
CollHeap* heap,
ComDiagsArea** diagsArea)
@@ -5181,7 +5162,6 @@ ex_expr::exp_return_type ExFunctionShift::eval(char *op_data[],
return ex_expr::EXPR_OK;
}
-// LCOV_EXCL_STOP
static
ex_expr::exp_return_type getDoubleValue(double *dest,
char *source,
@@ -5401,7 +5381,6 @@ ex_expr::exp_return_type ExpRaiseErrorFunction::eval(char *op_data[],
// -----------------------------------------------------------------------
// methods for ExFunctionPack
// -----------------------------------------------------------------------
-// LCOV_EXCL_START
// Constructor.
ExFunctionPack::ExFunctionPack(Attributes** attr,
Space* space,
@@ -5865,7 +5844,6 @@ ExUnPackCol::eval(char *op_data[], CollHeap *heap, ComDiagsArea **diagsArea)
return ex_expr::EXPR_OK;
}
-// LCOV_EXCL_STOP
ex_expr::exp_return_type ex_function_translate::eval(char *op_data[],
CollHeap* heap,
ComDiagsArea** diagsArea)
@@ -6109,7 +6087,6 @@ ex_expr::exp_return_type ExProgDistrib::eval(char *op_data[],
*((ULng32 *)op_data[0]) = resultValue - 1;
return ex_expr::EXPR_OK;
}
-// LCOV_EXCL_START
ex_expr::exp_return_type ExProgDistribKey::eval(char *op_data[],
CollHeap*,
ComDiagsArea**)
@@ -6145,7 +6122,6 @@ ex_expr::exp_return_type ExProgDistribKey::eval(char *op_data[],
return ex_expr::EXPR_OK;
}
-// LCOV_EXCL_STOP
ex_expr::exp_return_type ExPAGroup::eval(char *op_data[],
CollHeap*,
ComDiagsArea**)
@@ -6469,7 +6445,6 @@ ExRowsetArrayInto::eval(char *op_data[], CollHeap *heap,
return ex_expr::EXPR_OK;
}
-// LCOV_EXCL_START
ex_expr::exp_return_type ex_function_nullifzero::eval(char *op_data[],
CollHeap *heap,
ComDiagsArea** diagsArea)
@@ -6504,7 +6479,6 @@ ex_expr::exp_return_type ex_function_nullifzero::eval(char *op_data[],
return ex_expr::EXPR_OK;
}
-// LCOV_EXCL_STOP
//
// NVL(e1, e2) returns e2 if e1 is NULL otherwise e1. NVL(e1, e2) is
// equivalent to ANSI/ISO
@@ -8632,5 +8606,4 @@ aes_decrypt_error:
return ex_expr::EXPR_ERROR;
}
-// LCOV_EXCL_STOP
#pragma warn(1506) // warning elimination
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/exp/exp_like.cpp
----------------------------------------------------------------------
diff --git a/core/sql/exp/exp_like.cpp b/core/sql/exp/exp_like.cpp
index 1ebd588..e08aa53 100644
--- a/core/sql/exp/exp_like.cpp
+++ b/core/sql/exp/exp_like.cpp
@@ -129,7 +129,7 @@ LikePattern::LikePattern
patternBuf += lastHeader->getLength();
if(systemCollationFlag)
- {// LCOV_EXCL_START
+ {
headerLength = lastHeader->getLength();
if(headerLength >0)
{
@@ -152,7 +152,6 @@ LikePattern::LikePattern
lastHeader->setEncodedHeader(headerPattern);
}
lastHeader->setCollation(co);
- // LCOV_EXCL_STOP
}
lastHeader->append(new(exHeap)LikePatternHeader(i, patternBuf, exHeap));
prevHeader = lastHeader;
@@ -172,7 +171,7 @@ LikePattern::LikePattern
lastHeader->endClauses();
if(systemCollationFlag)
- {// LCOV_EXCL_START
+ {
headerLength = lastHeader->getLength();
if(headerLength > 0)
{
@@ -194,7 +193,6 @@ LikePattern::LikePattern
lastHeader->setEncodedHeader(headerPattern);
}
lastHeader->setCollation(co);
- // LCOV_EXCL_STOP
}
//
// If there are more than two headers in the chain, move the last header to
@@ -263,9 +261,7 @@ NABoolean LikePattern::matches
UInt16 nPasses;
if (systemCollationFlag)
- // LCOV_EXCL_START
nPasses = CollationInfo::getCollationNPasses(co);
- // LCOV_EXCL_STOP
else
nPasses = 1;
@@ -277,11 +273,9 @@ NABoolean LikePattern::matches
{
if (systemCollationFlag)
{
- // LCOV_EXCL_START
headerPattern = header->getEncodedPattern();
if ((header->getLength()*nPasses) > (endOfText - text))
return FALSE;
- // LCOV_EXCL_STOP
}
else
{
@@ -341,11 +335,10 @@ NABoolean LikePattern::matches
{
headerLength = header->getLength();
if (systemCollationFlag)
- {// LCOV_EXCL_START
+ {
headerPattern = header->getEncodedPattern();
if (header->getLength() > (endOfText - text))
return FALSE;
- // LCOV_EXCL_STOP
}
else
{
@@ -378,9 +371,7 @@ NABoolean LikePattern::matches
if(systemCollationFlag)
{
- // LCOV_EXCL_START
text += nPasses;
- // LCOV_EXCL_STOP
}
else
{
@@ -402,7 +393,6 @@ NABoolean LikePattern::matches
{
if(systemCollationFlag)
{
- // LCOV_EXCL_START
equalFlag = TRUE;
for(short i = 0; i < nPasses; i++)
@@ -416,7 +406,6 @@ NABoolean LikePattern::matches
if(equalFlag) break;
else
text += nPasses;
- // LCOV_EXCL_STOP
}
else
{
@@ -628,7 +617,6 @@ ex_expr::exp_return_type ex_like_clause_char::eval(char *op_data[],
if (systemCollationFlag)
{
- // LCOV_EXCL_START
pattern.setCollation (co);
short nPasses = CollationInfo::getCollationNPasses(co);
Int32 effEncodedKeyLength;
@@ -658,7 +646,6 @@ ex_expr::exp_return_type ex_like_clause_char::eval(char *op_data[],
textStr = encodedText;
// len1 = effEncodedKeyLength; the length without trading space.
len1 *= nPasses;
- // LCOV_EXCL_STOP
}
if (cs == CharInfo::UTF8)
@@ -787,19 +774,15 @@ NABoolean LikePatternHeader::matches(const char* text,
if (systemCollationFlag)
{
- // LCOV_EXCL_START
nPasses = CollationInfo::getCollationNPasses(co);
encodedPattern = getEncodedPattern();
- // LCOV_EXCL_STOP
}
do {
if (systemCollationFlag)
{
- // LCOV_EXCL_START
clause->setEncodedPattern(encodedPattern);
clause->setCollation(this->getCollation());
- // LCOV_EXCL_STOP
}
if (NOT clause->matches(text))
return FALSE;
@@ -810,12 +793,10 @@ NABoolean LikePatternHeader::matches(const char* text,
if (systemCollationFlag)
{
- // LCOV_EXCL_START
Int32 len = clause->getLength()*nPasses;
text += len;
encodedPattern += len;
headerMatchLen += len;
- // LCOV_EXCL_STOP
}
else
{
@@ -838,12 +819,10 @@ NABoolean LikePatternHeader::matches(const char* text,
{
if (systemCollationFlag)
{
- // LCOV_EXCL_START
Int32 len = clauseLen*nPasses;
text += len;
encodedPattern += len;
headerMatchLen += len;
- // LCOV_EXCL_STOP
}
else
{
@@ -885,11 +864,9 @@ NABoolean LikePatternHeader::matchesR(const char * text,
if (systemCollationFlag)
{
- // LCOV_EXCL_START
headerPattern = getEncodedPattern();
nPasses = CollationInfo::getCollationNPasses(co);
headerLength *= nPasses;
- // LCOV_EXCL_STOP
}
else
{
@@ -919,7 +896,6 @@ NABoolean LikePatternHeader::matchesR(const char * text,
Int32 numOfUnderscore = clauseR->getLength();
if(systemCollationFlag)
{
- // LCOV_EXCL_START
endText -= (numOfUnderscore * nPasses);
headerLength -= (clauseR->getLength() * nPasses);
if(endText < text) // String left is shorter than the pattern
@@ -928,7 +904,6 @@ NABoolean LikePatternHeader::matchesR(const char * text,
NADELETEBASIC(charLengthInBuf, heap);
return FALSE;
}
- // LCOV_EXCL_STOP
}
else
{
@@ -955,7 +930,6 @@ NABoolean LikePatternHeader::matchesR(const char * text,
// p1 point to the beginning of each character
if(systemCollationFlag)
{
- // LCOV_EXCL_START
if(p < p1) // String left is shorter than the pattern
{
if(deallocateNeeded)
@@ -968,7 +942,6 @@ NABoolean LikePatternHeader::matchesR(const char * text,
clauseR->setEncodedPattern
(getEncodedPattern()+(headerLength - (clauseR->getLength()*nPasses)));
}
- // LCOV_EXCL_STOP
}
else
{
@@ -1015,11 +988,9 @@ NABoolean LikePatternClause::matches(const char* text)
if (CollationInfo::isSystemCollation(co))
{
- // LCOV_EXCL_START
pattern = encodedPattern_;
nPasses = CollationInfo::getCollationNPasses(co);
clauseLength *= nPasses;
- // LCOV_EXCL_STOP
}
else
pattern = (unsigned char *)pattern_;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/exp/exp_math_func.cpp
----------------------------------------------------------------------
diff --git a/core/sql/exp/exp_math_func.cpp b/core/sql/exp/exp_math_func.cpp
index 3ef09ca..b182bf8 100644
--- a/core/sql/exp/exp_math_func.cpp
+++ b/core/sql/exp/exp_math_func.cpp
@@ -128,7 +128,6 @@ ex_expr::exp_return_type ex_function_abs::eval(char *op_data[],
ExRaiseSqlError(heap, diagsArea, EXE_INTERNAL_ERROR);
retcode = ex_expr::EXPR_ERROR;
break;
- // LCOV_EXCL_STOP
}
return retcode;
@@ -136,7 +135,6 @@ ex_expr::exp_return_type ex_function_abs::eval(char *op_data[],
;
#define PIVALUE 3.1415926E0;
-// LCOV_EXCL_START
ex_expr::exp_return_type ExFunctionMath::evalUnsupportedOperations(
char *op_data[],
CollHeap *heap,
@@ -145,7 +143,6 @@ ex_expr::exp_return_type ExFunctionMath::evalUnsupportedOperations(
ExRaiseSqlError(heap, diagsArea, EXE_INTERNAL_ERROR);
return ex_expr::EXPR_ERROR;
}
-// LCOV_EXCL_STOP
ex_expr::exp_return_type ExFunctionMath::eval(char *op_data[],
CollHeap *heap,
ComDiagsArea** diagsArea)
@@ -201,11 +198,9 @@ ex_expr::exp_return_type ExFunctionMath::eval(char *op_data[],
op = *((double*)op_data[1]);
break;
default:
- // LCOV_EXCL_START
ExRaiseSqlError(heap, diagsArea, EXE_BAD_ARG_TO_MATH_FUNC);
**diagsArea << DgString0("ROUND");
return ex_expr::EXPR_ERROR;
- // LCOV_EXCL_STOP
}
//
@@ -261,7 +256,6 @@ ex_expr::exp_return_type ExFunctionMath::eval(char *op_data[],
case ITM_SCALE_TRUNC:
{
- // LCOV_EXCL_START
ExRaiseSqlError(heap, diagsArea, EXE_MATH_FUNC_NOT_SUPPORTED);
if (getOperType() == ITM_ROUND)
**diagsArea << DgString0("ROUND");
@@ -271,7 +265,6 @@ ex_expr::exp_return_type ExFunctionMath::eval(char *op_data[],
retcode = ex_expr::EXPR_ERROR;
}
break;
- // LCOV_EXCL_STOP
case ITM_ACOS:
if ((*(double *)op_data[1] < -1) ||
@@ -669,7 +662,6 @@ ex_expr::exp_return_type ExFunctionBitOper::eval(char *op_data[],
{
case ITM_BITAND:
{
- // LCOV_EXCL_START
if (getOperand(0)->getDatatype() == REC_BIN32_UNSIGNED)
*(UInt32 *)op_data[0] =
*(UInt32 *)op_data[1] & *(UInt32 *)op_data[2];
@@ -728,7 +720,6 @@ ex_expr::exp_return_type ExFunctionBitOper::eval(char *op_data[],
}
}
break;
- // LCOV_EXCL_STOP
case ITM_BITEXTRACT:
{
UInt32 startBit = *(UInt32 *)op_data[2];
@@ -774,7 +765,6 @@ ex_expr::exp_return_type ExFunctionBitOper::eval(char *op_data[],
case REC_IEEE_FLOAT32:
{
UInt32 temp;
- // LCOV_EXCL_START
temp = *(UInt32*)op_data[1] << startBit;
temp = temp >> (32 - numBits);
result = temp;
@@ -798,7 +788,6 @@ ex_expr::exp_return_type ExFunctionBitOper::eval(char *op_data[],
**diagsArea << DgString0("BITEXTRACT");
return ex_expr::EXPR_ERROR;
}
- // LCOV_EXCL_STOP
break;
} // switch
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/exp/exp_misc.cpp
----------------------------------------------------------------------
diff --git a/core/sql/exp/exp_misc.cpp b/core/sql/exp/exp_misc.cpp
index 67d0909..58f2412 100644
--- a/core/sql/exp/exp_misc.cpp
+++ b/core/sql/exp/exp_misc.cpp
@@ -39,11 +39,9 @@
#include "exp_stdh.h"
#include "exp_clause_derived.h"
-// LCOV_EXCL_START
ex_expr::exp_return_type ex_noop_clause::eval(char * /*op_data*/[],
CollHeap*,
ComDiagsArea**)
{
return ex_expr::EXPR_OK;
}
-// LCOV_EXCL_STOP
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/export/ComDiags.cpp
----------------------------------------------------------------------
diff --git a/core/sql/export/ComDiags.cpp b/core/sql/export/ComDiags.cpp
index f99bacd..65595c4 100644
--- a/core/sql/export/ComDiags.cpp
+++ b/core/sql/export/ComDiags.cpp
@@ -1408,7 +1408,6 @@ void ComCondition::setSQLCODE (Lng32 newSQLCODE)
}
}
-// LCOV_EXCL_START
// This code has been unit tested and most is also tested by
// executor/TEST082
if ((theError == CLI_TCB_EXECUTE_ERROR) || // 8816
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/generator/GenPreCode.cpp
----------------------------------------------------------------------
diff --git a/core/sql/generator/GenPreCode.cpp b/core/sql/generator/GenPreCode.cpp
index 95fff08..f94cb13 100644
--- a/core/sql/generator/GenPreCode.cpp
+++ b/core/sql/generator/GenPreCode.cpp
@@ -8355,7 +8355,6 @@ ItemExpr * BiRelat::preCodeGen(Generator * generator)
CMPASSERT(coll1==coll2);
-//LCOV_EXCL_START : cnu - Should not count in Code Coverage until we support non-binary collation in SQ
if (CollationInfo::isSystemCollation(coll1))
{
setCollationEncodeComp(TRUE);
@@ -8460,7 +8459,6 @@ ItemExpr * BiRelat::preCodeGen(Generator * generator)
}
}
-//LCOV_EXCL_STOP : cnu - Should not count in Code Coverage until we support non-binary collation in SQ
else
{
// update both operands if case insensitive comparions
@@ -9446,14 +9444,12 @@ ItemExpr * Hash::preCodeGen(Generator * generator)
const CharType &chType = (CharType&)childType;
CharInfo::Collation coll = chType.getCollation();
-//LCOV_EXCL_START : cnu - Should not count in Code Coverage until we support non-binary collation in SQ
if (CollationInfo::isSystemCollation(coll))
{
child(0) = new(generator->wHeap())
CompEncode(child(0),FALSE, -1, CollationInfo::Compare);
child(0) = child(0)->bindNode(generator->getBindWA());
}
-//LCOV_EXCL_STOP : cnu - Should not count in Code Coverage until we support non-binary collation in SQ
else
{
//--------------------------
@@ -9480,7 +9476,6 @@ ItemExpr * Hash::preCodeGen(Generator * generator)
const CharType &chType = (CharType&)childType;
CharInfo::Collation coll = chType.getCollation();
-//LCOV_EXCL_START : cnu - Should not count in Code Coverage until we support non-binary collation in SQ
if (CollationInfo::isSystemCollation(coll))
{
hi = new(generator->wHeap())
@@ -9488,7 +9483,6 @@ ItemExpr * Hash::preCodeGen(Generator * generator)
hi = hi->bindNode(generator->getBindWA());
}
-//LCOV_EXCL_STOP : cnu - Should not count in Code Coverage until we support non-binary collation in SQ
else
{
//-----------------------------
@@ -9515,7 +9509,6 @@ ItemExpr * Hash::preCodeGen(Generator * generator)
const CharType &chType = (CharType&)childType;
CharInfo::Collation coll = chType.getCollation();
-//LCOV_EXCL_START : cnu - Should not count in Code Coverage until we support non-binary collation in SQ
if (CollationInfo::isSystemCollation(coll))
{
child(0) = new (generator->wHeap())
@@ -9523,7 +9516,6 @@ ItemExpr * Hash::preCodeGen(Generator * generator)
child(0) = child(0)->bindNode(generator->getBindWA());
}
-//LCOV_EXCL_STOP : cnu - Should not count in Code Coverage until we support non-binary collation in SQ
else
{
if ((chType.isCaseinsensitive()) &&
@@ -9578,14 +9570,12 @@ ItemExpr * HiveHash::preCodeGen(Generator * generator)
const CharType &chType = (CharType&)childType;
CharInfo::Collation coll = chType.getCollation();
-//LCOV_EXCL_START : cnu - Should not count in Code Coverage until we support non-binary collation in SQ
if (CollationInfo::isSystemCollation(coll))
{
child(0) = new(generator->wHeap())
CompEncode(child(0),FALSE, -1, CollationInfo::Compare);
child(0) = child(0)->bindNode(generator->getBindWA());
}
-//LCOV_EXCL_STOP : cnu - Should not count in Code Coverage until we support non-binary collation in SQ
else
{
//--------------------------
@@ -9612,7 +9602,6 @@ ItemExpr * HiveHash::preCodeGen(Generator * generator)
const CharType &chType = (CharType&)childType;
CharInfo::Collation coll = chType.getCollation();
-//LCOV_EXCL_START : cnu - Should not count in Code Coverage until we support non-binary collation in SQ
if (CollationInfo::isSystemCollation(coll))
{
hi = new(generator->wHeap())
@@ -9620,7 +9609,6 @@ ItemExpr * HiveHash::preCodeGen(Generator * generator)
hi = hi->bindNode(generator->getBindWA());
}
-//LCOV_EXCL_STOP : cnu - Should not count in Code Coverage until we support non-binary collation in SQ
else
{
//-----------------------------
@@ -9647,7 +9635,6 @@ ItemExpr * HiveHash::preCodeGen(Generator * generator)
const CharType &chType = (CharType&)childType;
CharInfo::Collation coll = chType.getCollation();
-//LCOV_EXCL_START : cnu - Should not count in Code Coverage until we support non-binary collation in SQ
if (CollationInfo::isSystemCollation(coll))
{
child(0) = new (generator->wHeap())
@@ -9655,7 +9642,6 @@ ItemExpr * HiveHash::preCodeGen(Generator * generator)
child(0) = child(0)->bindNode(generator->getBindWA());
}
-//LCOV_EXCL_STOP : cnu - Should not count in Code Coverage until we support non-binary collation in SQ
else
{
if ((chType.isCaseinsensitive()) &&
@@ -9717,7 +9703,6 @@ ItemExpr * HashDistPartHash::preCodeGen(Generator * generator)
CharInfo::Collation coll = chType.getCollation();
-//LCOV_EXCL_START : cnu - Should not count in Code Coverage until we support non-binary collation in SQ
if (CollationInfo::isSystemCollation(coll))
{
if (child(0)->getOperatorType() == ITM_NARROW)
@@ -9738,7 +9723,6 @@ ItemExpr * HashDistPartHash::preCodeGen(Generator * generator)
child(0) = child(0)->bindNode(generator->getBindWA());
}
-//LCOV_EXCL_STOP : cnu - Should not count in Code Coverage until we support non-binary collation in SQ
else
{
if ((chType.isCaseinsensitive()) &&
@@ -9764,7 +9748,6 @@ ItemExpr * HashDistPartHash::preCodeGen(Generator * generator)
CharInfo::Collation coll = chType.getCollation();
-//LCOV_EXCL_START : cnu - Should not count in Code Coverage until we support non-binary collation in SQ
if (CollationInfo::isSystemCollation(coll))
{
//Solution 10-081216-8006
@@ -9786,7 +9769,6 @@ ItemExpr * HashDistPartHash::preCodeGen(Generator * generator)
hi = hi->bindNode(generator->getBindWA());
}
-//LCOV_EXCL_STOP : cnu - Should not count in Code Coverage until we support non-binary collation in SQ
else
{
if ((chType.isCaseinsensitive()) &&
@@ -9813,7 +9795,6 @@ ItemExpr * HashDistPartHash::preCodeGen(Generator * generator)
CharInfo::Collation coll = chType.getCollation();
-//LCOV_EXCL_START : cnu - Should not count in Code Coverage until we support non-binary collation in SQ
if (CollationInfo::isSystemCollation(coll))
{
//Solution 10-081216-8006
@@ -9835,7 +9816,6 @@ ItemExpr * HashDistPartHash::preCodeGen(Generator * generator)
child(0) = child(0)->bindNode(generator->getBindWA());
}
-//LCOV_EXCL_STOP : cnu - Should not count in Code Coverage until we support non-binary collation in SQ
else
{
if ((chType.isCaseinsensitive()) &&
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/generator/vers_libgenerator.cpp
----------------------------------------------------------------------
diff --git a/core/sql/generator/vers_libgenerator.cpp b/core/sql/generator/vers_libgenerator.cpp
index 6128e9b..e4bce18 100644
--- a/core/sql/generator/vers_libgenerator.cpp
+++ b/core/sql/generator/vers_libgenerator.cpp
@@ -26,6 +26,4 @@
#define VERS_CV_MIN 0
#define VERS_CV_UPD 1
-// LCOV_EXCL_START
VERS_LIB(libgenerator)
-// LCOV_EXCL_STOP
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/langman/LmAssert.cpp
----------------------------------------------------------------------
diff --git a/core/sql/langman/LmAssert.cpp b/core/sql/langman/LmAssert.cpp
index 94e6553..3d8b441 100644
--- a/core/sql/langman/LmAssert.cpp
+++ b/core/sql/langman/LmAssert.cpp
@@ -41,7 +41,6 @@
// Exclude this function from coverage as it is called only when there is an assertion in LM
// which results in UDR server abend, so no coverage info can be generated.
-// LCOV_EXCL_START
void lmAssert(const char *file, Int32 linenum, const char *msg)
{
if (!file)
@@ -59,7 +58,6 @@ void lmAssert(const char *file, Int32 linenum, const char *msg)
lmMakeTFDSCall(message, file, linenum);
// should not reach here
}
-// LCOV_EXCL_STOP
[14/14] incubator-trafodion git commit: PR-1244 [TRAFOFION-2731]
CodeCleanup: Phase3: Remove LCOV directives
Posted by an...@apache.org.
PR-1244 [TRAFOFION-2731] CodeCleanup: Phase3: Remove LCOV directives
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/0ff0d92a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/0ff0d92a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/0ff0d92a
Branch: refs/heads/master
Commit: 0ff0d92a148a7ae871ae67b9b7c35a488de93479
Parents: 4e316c0 4fc2f0f
Author: Anoop Sharma <an...@esgyn.com>
Authored: Mon Sep 25 23:42:27 2017 +0000
Committer: Anoop Sharma <an...@esgyn.com>
Committed: Mon Sep 25 23:42:27 2017 +0000
----------------------------------------------------------------------
core/sql/arkcmp/vers_libarkcmp.cpp | 2 -
core/sql/bin/ex_esp_main.cpp | 4 -
core/sql/bin/ex_ssmp_main.cpp | 2 -
core/sql/cli/Cli.cpp | 145 +------------------
core/sql/cli/Cli.h | 2 -
core/sql/cli/CliExpExchange.cpp | 10 --
core/sql/cli/CliExtern.cpp | 85 -----------
core/sql/cli/CliImplLmExtFunc.cpp | 2 -
core/sql/cli/ExSqlComp.cpp | 24 +--
core/sql/cli/Globals.cpp | 17 ---
core/sql/cli/Globals.h | 12 +-
core/sql/comexe/ComKeyRange.cpp | 2 -
core/sql/comexe/ComPackDefs.h | 2 -
core/sql/comexe/ComTdb.cpp | 5 -
core/sql/comexe/ComTdb.h | 10 +-
core/sql/comexe/ComTdbCompoundStmt.cpp | 2 -
core/sql/comexe/ComTdbCompoundStmt.h | 4 -
core/sql/comexe/ComTdbControl.h | 2 -
core/sql/comexe/ComTdbExeUtil.cpp | 2 -
core/sql/comexe/ComTdbExplain.cpp | 2 -
core/sql/comexe/ComTdbMj.cpp | 4 +-
core/sql/comexe/ComTdbSendBottom.cpp | 6 -
core/sql/comexe/ComTdbSendBottom.h | 2 -
core/sql/comexe/ComTdbSendTop.cpp | 6 -
core/sql/comexe/ComTdbSendTop.h | 2 +-
core/sql/comexe/ComTdbSequence.cpp | 4 -
core/sql/comexe/ComTdbSplitBottom.cpp | 4 -
core/sql/comexe/ComTdbSplitBottom.h | 2 -
core/sql/comexe/ComTdbSplitTop.cpp | 4 -
core/sql/comexe/ComTdbSplitTop.h | 4 -
core/sql/comexe/ComTdbTranspose.h | 2 -
core/sql/comexe/ComTdbTuple.cpp | 2 -
core/sql/comexe/ComTdbTuple.h | 4 -
core/sql/comexe/ComTdbUnPackRows.cpp | 4 -
core/sql/comexe/ComTdbUnPackRows.h | 2 -
core/sql/comexe/ComTdbUnion.cpp | 4 -
core/sql/comexe/ComTdbUnion.h | 4 -
core/sql/comexe/LateBindInfo.cpp | 3 -
core/sql/common/BaseTypes.cpp | 6 +-
core/sql/common/CharType.cpp | 24 +--
core/sql/common/ComMvAttributeBitmap.cpp | 10 --
core/sql/common/ComMvAttributeBitmap.h | 2 -
core/sql/common/ComSpace.cpp | 4 -
core/sql/common/DateTimeType.cpp | 10 --
core/sql/common/ExprNode.cpp | 2 -
core/sql/common/Ipc.cpp | 42 +-----
core/sql/common/Ipc.h | 2 -
core/sql/common/IpcGuardian.cpp | 1 -
core/sql/common/NAMemory.h | 4 -
core/sql/common/NAString.cpp | 10 +-
core/sql/common/NAString2.cpp | 2 -
core/sql/common/NAType.cpp | 6 -
core/sql/common/Timer.h | 2 -
core/sql/common/charinfo.cpp | 14 --
core/sql/common/charinfo.h | 2 -
core/sql/common/conversionSJIS.cpp | 2 -
core/sql/common/dfs2rec.h | 2 -
core/sql/common/nawstring.cpp | 6 -
core/sql/common/nchar_mp.h | 4 -
core/sql/common/str.cpp | 10 +-
core/sql/common/wstr.cpp | 4 -
core/sql/executor/Allocator.h | 4 -
core/sql/executor/CliMsgObj.cpp | 2 -
core/sql/executor/ExComTdb.cpp | 8 +-
core/sql/executor/ExExeUtilGet.cpp | 3 -
core/sql/executor/ExSequence.cpp | 54 -------
core/sql/executor/ExVPJoin.cpp | 2 -
core/sql/executor/ExVPJoin.h | 2 -
core/sql/executor/HdfsLogger.h | 2 -
core/sql/executor/MdamRefList.cpp | 4 -
core/sql/executor/MdamRefList.h | 4 -
core/sql/executor/cluster.cpp | 4 +-
core/sql/executor/cluster.h | 2 +-
core/sql/executor/ex_ex.h | 2 +-
core/sql/executor/ex_hash_grby.cpp | 29 ++--
core/sql/executor/ex_hash_grby.h | 6 +-
core/sql/executor/ex_mdam.cpp | 8 +-
core/sql/executor/ex_queue.cpp | 2 -
core/sql/executor/ex_root.cpp | 10 --
core/sql/executor/ex_sort.cpp | 116 ---------------
core/sql/executor/ex_split_bottom.cpp | 2 -
core/sql/executor/ex_tcb_private.cpp | 2 -
core/sql/executor/ex_timeout.cpp | 2 -
core/sql/executor/ex_timeout.h | 4 +-
core/sql/executor/ex_transaction.cpp | 15 +-
core/sql/executor/ex_transaction.h | 4 +-
core/sql/executor/ex_tuple.cpp | 6 -
core/sql/executor/ex_tuple.h | 10 +-
core/sql/executor/ex_tuple_flow.cpp | 22 +--
core/sql/executor/key_range.h | 4 +-
core/sql/executor/timeout_data.h | 6 +-
core/sql/exp/ExpLOBprocess.cpp | 8 +-
core/sql/exp/ExpPCode.cpp | 18 ---
core/sql/exp/ExpPCodeOptimizations.cpp | 2 -
core/sql/exp/ExpSequenceFunction.cpp | 20 ---
core/sql/exp/ExpSqlTupp.cpp | 2 -
core/sql/exp/exp_aggregate.cpp | 4 -
core/sql/exp/exp_arith.cpp | 26 ----
core/sql/exp/exp_bignum.cpp | 16 --
core/sql/exp/exp_clause.cpp | 36 -----
core/sql/exp/exp_comp.cpp | 48 ------
core/sql/exp/exp_conv.cpp | 144 +-----------------
core/sql/exp/exp_datetime.cpp | 12 --
core/sql/exp/exp_expr.cpp | 6 -
core/sql/exp/exp_function.cpp | 27 ----
core/sql/exp/exp_like.cpp | 35 +----
core/sql/exp/exp_math_func.cpp | 11 --
core/sql/exp/exp_misc.cpp | 2 -
core/sql/export/ComDiags.cpp | 1 -
core/sql/generator/GenPreCode.cpp | 20 ---
core/sql/generator/vers_libgenerator.cpp | 2 -
core/sql/langman/LmAssert.cpp | 2 -
core/sql/langman/LmComQueue.cpp | 4 -
core/sql/langman/LmContManager.cpp | 4 -
core/sql/langman/LmDebug.cpp | 12 +-
core/sql/langman/LmJavaExceptionReporter.cpp | 6 -
core/sql/langman/LmJavaHooks.cpp | 2 -
core/sql/langman/LmLangManager.cpp | 2 -
core/sql/langman/LmResultSetJava.cpp | 2 -
core/sql/langman/LmUtility.cpp | 8 -
core/sql/langman/vers_libtdm_sqllangman.cpp | 2 -
core/sql/optimizer/Analyzer.cpp | 128 +---------------
core/sql/optimizer/Analyzer.h | 40 -----
core/sql/optimizer/AppliedStatMan.cpp | 6 -
core/sql/optimizer/AppliedStatMan.h | 2 -
core/sql/optimizer/BindItemExpr.cpp | 8 +-
core/sql/optimizer/BindRI.cpp | 2 -
core/sql/optimizer/BindRelExpr.cpp | 24 ---
core/sql/optimizer/BindWA.cpp | 8 -
core/sql/optimizer/ChangesTable.cpp | 16 +-
core/sql/optimizer/ChangesTable.h | 14 +-
core/sql/optimizer/ClusteredBitmap.cpp | 4 -
core/sql/optimizer/CmpProcess.cpp | 2 -
core/sql/optimizer/ColStatDesc.cpp | 60 +-------
core/sql/optimizer/ColStatDesc.h | 2 -
core/sql/optimizer/ColumnDesc.cpp | 2 -
core/sql/optimizer/ColumnDesc.h | 2 -
core/sql/optimizer/ColumnNameMap.h | 2 -
core/sql/optimizer/ControlDB.cpp | 2 -
core/sql/optimizer/Cost.cpp | 30 ----
core/sql/optimizer/EncodedValue.cpp | 4 -
core/sql/optimizer/EstLogProp.cpp | 4 -
core/sql/optimizer/EstLogProp.h | 4 +-
core/sql/optimizer/GroupAttr.cpp | 10 +-
core/sql/optimizer/ImplRule.cpp | 74 +++++-----
core/sql/optimizer/Inlining.cpp | 8 -
core/sql/optimizer/Inlining.h | 6 +-
core/sql/optimizer/ItemArith.h | 2 +-
core/sql/optimizer/ItemColRef.h | 14 +-
core/sql/optimizer/ItemConstr.h | 2 +-
core/sql/optimizer/ItemExpr.cpp | 26 +---
core/sql/optimizer/ItemExpr.h | 8 +-
core/sql/optimizer/ItmBitMuxFunction.cpp | 2 -
core/sql/optimizer/ItmBitMuxFunction.h | 2 -
core/sql/optimizer/ItmFlowControlFunction.cpp | 6 -
core/sql/optimizer/LargeScopeRules.cpp | 38 -----
core/sql/optimizer/MVCandidates.cpp | 38 ++---
core/sql/optimizer/MVCandidates.h | 2 -
core/sql/optimizer/MVInfo.cpp | 18 ---
core/sql/optimizer/MjvBuilder.cpp | 6 -
core/sql/optimizer/MultiJoin.cpp | 18 +--
core/sql/optimizer/MultiJoin.h | 4 -
core/sql/optimizer/MvLog.cpp | 2 -
core/sql/optimizer/MvLog.h | 2 -
core/sql/optimizer/MvMultiTxnMavBuilder.cpp | 14 --
core/sql/optimizer/MvRefreshBuilder.cpp | 32 ----
core/sql/optimizer/MvRefreshBuilder.h | 2 -
core/sql/optimizer/NAClusterInfo.cpp | 8 -
core/sql/optimizer/NAClusterInfo.h | 2 -
core/sql/optimizer/NAColumn.cpp | 8 -
core/sql/optimizer/NATable.cpp | 10 --
core/sql/optimizer/NATable.h | 6 -
core/sql/optimizer/NodeMap.cpp | 12 --
core/sql/optimizer/NormRelExpr.cpp | 1 -
core/sql/optimizer/ObjectNames.cpp | 4 -
core/sql/optimizer/OptRange.cpp | 30 ++--
core/sql/optimizer/OptTrigger.cpp | 10 +-
core/sql/optimizer/OptTrigger.h | 8 +-
core/sql/optimizer/PackedColDesc.cpp | 2 -
core/sql/optimizer/PackedColDesc.h | 2 -
core/sql/optimizer/PartFunc.cpp | 38 -----
core/sql/optimizer/PartFunc.h | 2 -
core/sql/optimizer/PartReq.cpp | 26 ----
core/sql/optimizer/PartReq.h | 6 -
core/sql/optimizer/PhyProp.cpp | 6 -
core/sql/optimizer/PhyProp.h | 8 +-
core/sql/optimizer/QRDescGenerator.cpp | 16 +-
core/sql/optimizer/QueryGraph.cpp | 2 -
core/sql/optimizer/QueryRewriteHandler.cpp | 18 +--
core/sql/optimizer/QueryRewriteHandler.h | 2 +-
core/sql/optimizer/Refresh.cpp | 2 -
core/sql/optimizer/Rule.cpp | 14 --
core/sql/optimizer/Rule.h | 8 -
core/sql/optimizer/ScanOptimizer.cpp | 66 +--------
core/sql/optimizer/SearchKey.cpp | 10 +-
core/sql/optimizer/Stats.cpp | 92 +-----------
core/sql/optimizer/Stats.h | 4 -
core/sql/optimizer/SynthType.cpp | 28 +---
core/sql/optimizer/TableDesc.cpp | 8 +-
core/sql/optimizer/TableDesc.h | 4 -
core/sql/optimizer/TransRule.cpp | 4 +-
core/sql/optimizer/TransRule.h | 42 +++---
core/sql/optimizer/TriggerDB.cpp | 16 --
core/sql/optimizer/Triggers.cpp | 18 ---
core/sql/optimizer/Triggers.h | 15 +-
core/sql/optimizer/ValueDesc.cpp | 2 +-
core/sql/optimizer/costmethod.cpp | 58 +-------
core/sql/optimizer/disjunct.h | 2 -
core/sql/optimizer/mdam.cpp | 28 +---
core/sql/optimizer/memo.cpp | 12 +-
core/sql/optimizer/opt.cpp | 16 --
core/sql/optimizer/tasks.cpp | 22 ---
core/sql/optimizer/vers_liboptimizer.cpp | 2 -
core/sql/parser/BindStmtDDL.cpp | 4 -
.../ElemDDLCreateMVOneAttributeTableList.cpp | 2 -
.../ElemDDLCreateMVOneAttributeTableList.h | 2 -
core/sql/parser/ElemDDLLobAttrs.h | 2 -
core/sql/parser/ElemDDLLoggable.h | 1 -
core/sql/parser/ElemDDLTableFeature.h | 1 -
core/sql/parser/StmtDDLAlterMV.h | 4 -
core/sql/parser/StmtDDLCreate.cpp | 2 -
.../parser/StmtDDLCreateComponentPrivilege.h | 2 -
core/sql/parser/StmtDDLCreateMV.h | 8 -
core/sql/parser/StmtDDLCreateTrigger.h | 2 -
core/sql/parser/StmtDDLDrop.cpp | 2 -
core/sql/parser/StmtDDLDropComponentPrivilege.h | 2 -
core/sql/parser/StmtDDLDropMV.h | 2 -
.../sql/parser/StmtDDLGrantComponentPrivilege.h | 2 -
core/sql/parser/StmtDDLNode.cpp | 8 -
.../parser/StmtDDLRevokeComponentPrivilege.h | 2 -
core/sql/parser/sqlparser.y | 6 +-
core/sql/parser/vers_libparser.cpp | 2 -
core/sql/qms/QRDescriptorStubs.cpp | 2 -
core/sql/qms/QmpMain.cpp | 10 --
core/sql/qms/QmpPublish.cpp | 8 +-
core/sql/qms/QmsGroupLattice.cpp | 4 -
core/sql/qms/QmsInitializer.cpp | 10 --
core/sql/qms/QmsJoinGraph.cpp | 22 +--
core/sql/qms/QmsLatticeIndex.cpp | 14 --
core/sql/qms/QmsMVMemo.cpp | 10 --
core/sql/qms/QmsMain.cpp | 2 -
core/sql/qms/QmsQms.cpp | 14 --
core/sql/qms/QmsRequest.cpp | 22 +--
core/sql/qms/QmsRequest.h | 4 +-
core/sql/qms/QmsSelfJoinHandler.cpp | 6 -
core/sql/qms/QmsStubs.cpp | 2 -
core/sql/qmscommon/QRDescriptor.cpp | 118 +++++++--------
core/sql/qmscommon/QRDescriptor.h | 52 +------
core/sql/qmscommon/QRLogger.cpp | 8 +-
core/sql/qmscommon/QRLogger.h | 2 -
core/sql/qmscommon/QRQueries.h | 2 -
core/sql/qmscommon/QRQueriesImpl.cpp | 16 +-
core/sql/qmscommon/QueryRewriteServer.cpp | 44 +-----
core/sql/qmscommon/Range.cpp | 20 ---
core/sql/qmscommon/XMLUtil.h | 14 +-
core/sql/qmscommon/vers_libqmscommon.cpp | 2 -
core/sql/refresh/RuAuditRefreshTaskExecutor.h | 2 -
core/sql/refresh/RuDeltaDef.cpp | 10 --
core/sql/refresh/RuDupElimGlobals.cpp | 4 -
core/sql/refresh/RuDupElimLogScanner.h | 2 -
core/sql/refresh/RuDupElimTaskExecutor.cpp | 10 --
core/sql/refresh/RuEmpCheckTaskExecutor.cpp | 8 -
core/sql/refresh/RuEmpCheckTaskExecutor.h | 2 -
core/sql/refresh/RuException.cpp | 8 -
core/sql/refresh/RuExecController.cpp | 8 -
core/sql/refresh/RuForceOptions.cpp | 2 -
core/sql/refresh/RuForceOptions.h | 4 -
core/sql/refresh/RuForceOptionsParser.cpp | 2 -
core/sql/refresh/RuForceOptionsParser.h | 2 -
core/sql/refresh/RuLockEquivSetTaskExecutor.h | 4 -
core/sql/refresh/RuLogCleanupTaskExecutor.cpp | 6 -
core/sql/refresh/RuLogCleanupTaskExecutor.h | 4 -
core/sql/refresh/RuMVEquivSetBuilder.cpp | 2 -
core/sql/refresh/RuMVEquivSetBuilder.h | 2 -
.../refresh/RuMultiTxnRefreshTaskExecutor.cpp | 14 --
core/sql/refresh/RuOptions.cpp | 6 -
core/sql/refresh/RuRcReleaseTaskExecutor.h | 2 -
core/sql/refresh/RuRefreshSQLComposer.cpp | 14 --
core/sql/refresh/RuRefreshTaskExecutor.cpp | 24 ---
core/sql/refresh/RuSQLStatementContainer.cpp | 8 -
.../sql/refresh/RuSimpleRefreshTaskExecutor.cpp | 12 --
core/sql/refresh/RuTableSyncTaskExecutor.h | 2 -
core/sql/refresh/RuTask.cpp | 6 -
core/sql/refresh/RuTaskExecutor.cpp | 10 --
core/sql/refresh/RuTaskExecutor.h | 2 -
core/sql/refresh/RuTaskServerExecControler.cpp | 2 -
core/sql/refresh/RuTbl.cpp | 2 -
core/sql/refresh/RuTestTaskExecutor.cpp | 2 -
core/sql/refresh/RuTestTaskExecutor.h | 2 -
core/sql/refresh/RuUnAuditRefreshTaskExecutor.h | 2 -
core/sql/runtimestats/RtsStubs.cpp | 2 -
core/sql/runtimestats/sscpipc.cpp | 2 -
core/sql/smdio/vers_libsmdio.cpp | 2 -
core/sql/sort/DiskPool_sq.h | 2 -
core/sql/sort/ScratchFileConnection.h | 2 -
core/sql/sort/SortUtil.cpp | 15 --
core/sql/sort/Statistics.cpp | 2 -
core/sql/sort/TourTree.cpp | 2 -
core/sql/sort/scratchfileconnection.cpp | 2 -
core/sql/sort/vers_libsort.cpp | 2 -
core/sql/sqlcomp/CmpDescribe.cpp | 2 -
core/sql/sqlcomp/CmpMain.cpp | 6 +-
core/sql/sqlcomp/CmpMain.h | 6 +-
core/sql/sqlcomp/DefaultValidator.cpp | 4 -
core/sql/sqlcomp/NADefaults.h | 4 -
core/sql/sqlcomp/NewDel.cpp | 2 -
core/sql/sqlcomp/QCache.cpp | 2 -
core/sql/sqlcomp/nadefaults.cpp | 4 -
core/sql/sqlcomp/vers_libsqlcomp.cpp | 2 -
core/sql/sqlmxevents/logmxevent_sq.cpp | 7 -
core/sql/udrserv/UdrAbortCallBack.cpp | 2 -
core/sql/udrserv/UdrDebug.cpp | 2 -
core/sql/udrserv/UdrFFDC.cpp | 2 -
core/sql/udrserv/UdrImplLmExtFunc.cpp | 2 -
core/sql/udrserv/UdrRSProcess.cpp | 8 -
core/sql/udrserv/UdrResultSet.cpp | 6 -
core/sql/udrserv/spinfo.cpp | 2 -
core/sql/udrserv/spinfoCallback.cpp | 6 -
core/sql/udrserv/udrglobals.cpp | 2 -
core/sql/udrserv/udrload.cpp | 2 -
core/sql/udrserv/udrserv.cpp | 10 --
core/sql/udrserv/udrunload.cpp | 4 -
core/sql/udrserv/udrutil.cpp | 2 -
core/sql/ustat/hs_cli.cpp | 22 ---
core/sql/ustat/hs_cli.h | 2 -
core/sql/ustat/hs_globals.cpp | 50 +------
core/sql/ustat/hs_la.cpp | 11 +-
core/sql/ustat/hs_log.cpp | 4 +-
core/sql/ustat/hs_parser.cpp | 8 -
core/sql/ustat/hs_read.cpp | 24 +--
core/sql/ustat/hs_update.cpp | 4 -
core/sql/ustat/hs_util.cpp | 12 --
core/sql/ustat/hs_util.h | 4 -
core/sql/ustat/vers_libustat.cpp | 2 -
334 files changed, 316 insertions(+), 3402 deletions(-)
----------------------------------------------------------------------
[12/14] incubator-trafodion git commit: lcov: commit #1
Posted by an...@apache.org.
lcov: commit #1
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/7a95e1da
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/7a95e1da
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/7a95e1da
Branch: refs/heads/master
Commit: 7a95e1da4f70eb3e29478e1126b7ebfcfb60b91a
Parents: dc0d204
Author: Anoop Sharma <an...@esgyn.com>
Authored: Wed Sep 20 14:41:28 2017 +0000
Committer: Anoop Sharma <an...@esgyn.com>
Committed: Wed Sep 20 14:41:28 2017 +0000
----------------------------------------------------------------------
core/sql/arkcmp/vers_libarkcmp.cpp | 2 -
core/sql/bin/ex_esp_main.cpp | 4 -
core/sql/bin/ex_ssmp_main.cpp | 2 -
core/sql/cli/Cli.cpp | 145 +------------------
core/sql/cli/Cli.h | 2 -
core/sql/cli/CliExpExchange.cpp | 10 --
core/sql/cli/CliExtern.cpp | 85 -----------
core/sql/cli/CliImplLmExtFunc.cpp | 2 -
core/sql/cli/ExSqlComp.cpp | 24 +--
core/sql/cli/Globals.cpp | 17 ---
core/sql/cli/Globals.h | 12 +-
core/sql/comexe/ComKeyRange.cpp | 2 -
core/sql/comexe/ComPackDefs.h | 2 -
core/sql/comexe/ComTdb.cpp | 5 -
core/sql/comexe/ComTdb.h | 10 +-
core/sql/comexe/ComTdbCompoundStmt.cpp | 2 -
core/sql/comexe/ComTdbCompoundStmt.h | 4 -
core/sql/comexe/ComTdbControl.h | 2 -
core/sql/comexe/ComTdbExeUtil.cpp | 2 -
core/sql/comexe/ComTdbExplain.cpp | 2 -
core/sql/comexe/ComTdbMj.cpp | 4 +-
core/sql/comexe/ComTdbSendBottom.cpp | 6 -
core/sql/comexe/ComTdbSendBottom.h | 2 -
core/sql/comexe/ComTdbSendTop.cpp | 6 -
core/sql/comexe/ComTdbSendTop.h | 2 +-
core/sql/comexe/ComTdbSequence.cpp | 4 -
core/sql/comexe/ComTdbSplitBottom.cpp | 4 -
core/sql/comexe/ComTdbSplitBottom.h | 2 -
core/sql/comexe/ComTdbSplitTop.cpp | 4 -
core/sql/comexe/ComTdbSplitTop.h | 4 -
core/sql/comexe/ComTdbTranspose.h | 2 -
core/sql/comexe/ComTdbTuple.cpp | 2 -
core/sql/comexe/ComTdbTuple.h | 4 -
core/sql/comexe/ComTdbUnPackRows.cpp | 4 -
core/sql/comexe/ComTdbUnPackRows.h | 2 -
core/sql/comexe/ComTdbUnion.cpp | 4 -
core/sql/comexe/ComTdbUnion.h | 4 -
core/sql/comexe/LateBindInfo.cpp | 3 -
core/sql/common/BaseTypes.cpp | 6 +-
core/sql/common/CharType.cpp | 24 +--
core/sql/common/ComMvAttributeBitmap.cpp | 10 --
core/sql/common/ComMvAttributeBitmap.h | 2 -
core/sql/common/ComSpace.cpp | 4 -
core/sql/common/DateTimeType.cpp | 10 --
core/sql/common/ExprNode.cpp | 2 -
core/sql/common/Ipc.cpp | 42 +-----
core/sql/common/Ipc.h | 2 -
core/sql/common/IpcGuardian.cpp | 1 -
core/sql/common/NAMemory.h | 4 -
core/sql/common/NAString.cpp | 10 +-
core/sql/common/NAString2.cpp | 2 -
core/sql/common/NAType.cpp | 6 -
core/sql/common/Timer.h | 2 -
core/sql/common/charinfo.cpp | 14 --
core/sql/common/charinfo.h | 2 -
core/sql/common/conversionSJIS.cpp | 2 -
core/sql/common/dfs2rec.h | 2 -
core/sql/common/nawstring.cpp | 6 -
core/sql/common/nchar_mp.h | 4 -
core/sql/common/str.cpp | 10 +-
core/sql/common/wstr.cpp | 4 -
core/sql/executor/Allocator.h | 4 -
core/sql/executor/CliMsgObj.cpp | 2 -
core/sql/executor/ExComTdb.cpp | 8 +-
core/sql/executor/ExExeUtilGet.cpp | 3 -
core/sql/executor/ExSequence.cpp | 54 -------
core/sql/executor/ExVPJoin.cpp | 2 -
core/sql/executor/ExVPJoin.h | 2 -
core/sql/executor/HdfsLogger.h | 2 -
core/sql/executor/MdamRefList.cpp | 4 -
core/sql/executor/MdamRefList.h | 4 -
core/sql/executor/cluster.cpp | 4 +-
core/sql/executor/cluster.h | 2 +-
core/sql/executor/ex_ex.h | 2 +-
core/sql/executor/ex_hash_grby.cpp | 29 ++--
core/sql/executor/ex_hash_grby.h | 6 +-
core/sql/executor/ex_mdam.cpp | 8 +-
core/sql/executor/ex_queue.cpp | 2 -
core/sql/executor/ex_root.cpp | 10 --
core/sql/executor/ex_sort.cpp | 116 ---------------
core/sql/executor/ex_split_bottom.cpp | 2 -
core/sql/executor/ex_tcb_private.cpp | 2 -
core/sql/executor/ex_timeout.cpp | 2 -
core/sql/executor/ex_timeout.h | 4 +-
core/sql/executor/ex_transaction.cpp | 15 +-
core/sql/executor/ex_transaction.h | 4 +-
core/sql/executor/ex_tuple.cpp | 6 -
core/sql/executor/ex_tuple.h | 10 +-
core/sql/executor/ex_tuple_flow.cpp | 22 +--
core/sql/executor/key_range.h | 4 +-
core/sql/executor/timeout_data.h | 6 +-
core/sql/exp/ExpLOBprocess.cpp | 8 +-
core/sql/exp/ExpPCode.cpp | 18 ---
core/sql/exp/ExpPCodeOptimizations.cpp | 2 -
core/sql/exp/ExpSequenceFunction.cpp | 20 ---
core/sql/exp/ExpSqlTupp.cpp | 2 -
core/sql/exp/exp_aggregate.cpp | 4 -
core/sql/exp/exp_arith.cpp | 26 ----
core/sql/exp/exp_bignum.cpp | 16 --
core/sql/exp/exp_clause.cpp | 36 -----
core/sql/exp/exp_comp.cpp | 48 ------
core/sql/exp/exp_conv.cpp | 144 +-----------------
core/sql/exp/exp_datetime.cpp | 12 --
core/sql/exp/exp_expr.cpp | 6 -
core/sql/exp/exp_function.cpp | 27 ----
core/sql/exp/exp_like.cpp | 35 +----
core/sql/exp/exp_math_func.cpp | 11 --
core/sql/exp/exp_misc.cpp | 2 -
core/sql/export/ComDiags.cpp | 1 -
core/sql/generator/GenPreCode.cpp | 20 ---
core/sql/generator/vers_libgenerator.cpp | 2 -
core/sql/langman/LmAssert.cpp | 2 -
core/sql/langman/LmComQueue.cpp | 4 -
core/sql/langman/LmContManager.cpp | 4 -
core/sql/langman/LmDebug.cpp | 12 +-
core/sql/langman/LmJavaExceptionReporter.cpp | 6 -
core/sql/langman/LmJavaHooks.cpp | 2 -
core/sql/langman/LmLangManager.cpp | 2 -
core/sql/langman/LmResultSetJava.cpp | 2 -
core/sql/langman/LmUtility.cpp | 8 -
core/sql/langman/vers_libtdm_sqllangman.cpp | 2 -
core/sql/optimizer/Analyzer.cpp | 128 +---------------
core/sql/optimizer/Analyzer.h | 40 -----
core/sql/optimizer/AppliedStatMan.cpp | 6 -
core/sql/optimizer/AppliedStatMan.h | 2 -
core/sql/optimizer/BindItemExpr.cpp | 8 +-
core/sql/optimizer/BindRI.cpp | 2 -
core/sql/optimizer/BindRelExpr.cpp | 24 ---
core/sql/optimizer/BindWA.cpp | 8 -
core/sql/optimizer/ChangesTable.cpp | 16 +-
core/sql/optimizer/ChangesTable.h | 14 +-
core/sql/optimizer/ClusteredBitmap.cpp | 4 -
core/sql/optimizer/CmpProcess.cpp | 2 -
core/sql/optimizer/ColStatDesc.cpp | 60 +-------
core/sql/optimizer/ColStatDesc.h | 2 -
core/sql/optimizer/ColumnDesc.cpp | 2 -
core/sql/optimizer/ColumnDesc.h | 2 -
core/sql/optimizer/ColumnNameMap.h | 2 -
core/sql/optimizer/ControlDB.cpp | 2 -
core/sql/optimizer/Cost.cpp | 30 ----
core/sql/optimizer/EncodedValue.cpp | 4 -
core/sql/optimizer/EstLogProp.cpp | 4 -
core/sql/optimizer/EstLogProp.h | 4 +-
core/sql/optimizer/GroupAttr.cpp | 10 +-
core/sql/optimizer/ImplRule.cpp | 74 +++++-----
core/sql/optimizer/Inlining.cpp | 8 -
core/sql/optimizer/Inlining.h | 6 +-
core/sql/optimizer/ItemArith.h | 2 +-
core/sql/optimizer/ItemColRef.h | 14 +-
core/sql/optimizer/ItemConstr.h | 2 +-
core/sql/optimizer/ItemExpr.cpp | 26 +---
core/sql/optimizer/ItemExpr.h | 8 +-
core/sql/optimizer/ItmBitMuxFunction.cpp | 2 -
core/sql/optimizer/ItmBitMuxFunction.h | 2 -
core/sql/optimizer/ItmFlowControlFunction.cpp | 6 -
core/sql/optimizer/LargeScopeRules.cpp | 38 -----
core/sql/optimizer/MVCandidates.cpp | 38 ++---
core/sql/optimizer/MVCandidates.h | 2 -
core/sql/optimizer/MVInfo.cpp | 18 ---
core/sql/optimizer/MjvBuilder.cpp | 6 -
core/sql/optimizer/MultiJoin.cpp | 18 +--
core/sql/optimizer/MultiJoin.h | 4 -
core/sql/optimizer/MvLog.cpp | 2 -
core/sql/optimizer/MvLog.h | 2 -
core/sql/optimizer/MvMultiTxnMavBuilder.cpp | 14 --
core/sql/optimizer/MvRefreshBuilder.cpp | 32 ----
core/sql/optimizer/MvRefreshBuilder.h | 2 -
core/sql/optimizer/NAClusterInfo.cpp | 8 -
core/sql/optimizer/NAClusterInfo.h | 2 -
core/sql/optimizer/NAColumn.cpp | 8 -
core/sql/optimizer/NATable.cpp | 10 --
core/sql/optimizer/NATable.h | 6 -
core/sql/optimizer/NodeMap.cpp | 12 --
core/sql/optimizer/NormRelExpr.cpp | 1 -
core/sql/optimizer/ObjectNames.cpp | 4 -
core/sql/optimizer/OptRange.cpp | 30 ++--
core/sql/optimizer/OptTrigger.cpp | 10 +-
core/sql/optimizer/OptTrigger.h | 8 +-
core/sql/optimizer/PackedColDesc.cpp | 2 -
core/sql/optimizer/PackedColDesc.h | 2 -
core/sql/optimizer/PartFunc.cpp | 38 -----
core/sql/optimizer/PartFunc.h | 2 -
core/sql/optimizer/PartReq.cpp | 26 ----
core/sql/optimizer/PartReq.h | 6 -
core/sql/optimizer/PhyProp.cpp | 6 -
core/sql/optimizer/PhyProp.h | 8 +-
core/sql/optimizer/QRDescGenerator.cpp | 16 +-
core/sql/optimizer/QueryGraph.cpp | 2 -
core/sql/optimizer/QueryRewriteHandler.cpp | 18 +--
core/sql/optimizer/QueryRewriteHandler.h | 2 +-
core/sql/optimizer/Refresh.cpp | 2 -
core/sql/optimizer/Rule.cpp | 14 --
core/sql/optimizer/Rule.h | 8 -
core/sql/optimizer/ScanOptimizer.cpp | 66 +--------
core/sql/optimizer/SearchKey.cpp | 10 +-
core/sql/optimizer/Stats.cpp | 92 +-----------
core/sql/optimizer/Stats.h | 4 -
core/sql/optimizer/SynthType.cpp | 28 +---
core/sql/optimizer/TableDesc.cpp | 8 +-
core/sql/optimizer/TableDesc.h | 4 -
core/sql/optimizer/TransRule.cpp | 4 +-
core/sql/optimizer/TransRule.h | 42 +++---
core/sql/optimizer/TriggerDB.cpp | 16 --
core/sql/optimizer/Triggers.cpp | 18 ---
core/sql/optimizer/Triggers.h | 15 +-
core/sql/optimizer/ValueDesc.cpp | 2 +-
core/sql/optimizer/costmethod.cpp | 58 +-------
core/sql/optimizer/disjunct.h | 2 -
core/sql/optimizer/mdam.cpp | 28 +---
core/sql/optimizer/memo.cpp | 12 +-
core/sql/optimizer/opt.cpp | 16 --
core/sql/optimizer/tasks.cpp | 22 ---
core/sql/optimizer/vers_liboptimizer.cpp | 2 -
core/sql/parser/BindStmtDDL.cpp | 4 -
.../ElemDDLCreateMVOneAttributeTableList.cpp | 2 -
.../ElemDDLCreateMVOneAttributeTableList.h | 2 -
core/sql/parser/ElemDDLLobAttrs.h | 2 -
core/sql/parser/ElemDDLLoggable.h | 1 -
core/sql/parser/ElemDDLTableFeature.h | 1 -
core/sql/parser/StmtDDLAlterMV.h | 4 -
core/sql/parser/StmtDDLCreate.cpp | 2 -
.../parser/StmtDDLCreateComponentPrivilege.h | 2 -
core/sql/parser/StmtDDLCreateMV.h | 8 -
core/sql/parser/StmtDDLCreateTrigger.h | 2 -
core/sql/parser/StmtDDLDrop.cpp | 2 -
core/sql/parser/StmtDDLDropComponentPrivilege.h | 2 -
core/sql/parser/StmtDDLDropMV.h | 2 -
.../sql/parser/StmtDDLGrantComponentPrivilege.h | 2 -
core/sql/parser/StmtDDLNode.cpp | 8 -
.../parser/StmtDDLRevokeComponentPrivilege.h | 2 -
core/sql/parser/sqlparser.y | 6 +-
core/sql/parser/vers_libparser.cpp | 2 -
core/sql/qms/QRDescriptorStubs.cpp | 2 -
core/sql/qms/QmpMain.cpp | 10 --
core/sql/qms/QmpPublish.cpp | 8 +-
core/sql/qms/QmsGroupLattice.cpp | 4 -
core/sql/qms/QmsInitializer.cpp | 10 --
core/sql/qms/QmsJoinGraph.cpp | 22 +--
core/sql/qms/QmsLatticeIndex.cpp | 14 --
core/sql/qms/QmsMVMemo.cpp | 10 --
core/sql/qms/QmsMain.cpp | 2 -
core/sql/qms/QmsQms.cpp | 14 --
core/sql/qms/QmsRequest.cpp | 22 +--
core/sql/qms/QmsRequest.h | 4 +-
core/sql/qms/QmsSelfJoinHandler.cpp | 6 -
core/sql/qms/QmsStubs.cpp | 2 -
core/sql/qmscommon/QRDescriptor.cpp | 118 +++++++--------
core/sql/qmscommon/QRDescriptor.h | 52 +------
core/sql/qmscommon/QRLogger.cpp | 8 +-
core/sql/qmscommon/QRLogger.h | 2 -
core/sql/qmscommon/QRQueries.h | 2 -
core/sql/qmscommon/QRQueriesImpl.cpp | 16 +-
core/sql/qmscommon/QueryRewriteServer.cpp | 44 +-----
core/sql/qmscommon/Range.cpp | 20 ---
core/sql/qmscommon/XMLUtil.h | 14 +-
core/sql/qmscommon/vers_libqmscommon.cpp | 2 -
core/sql/refresh/RuAuditRefreshTaskExecutor.h | 2 -
core/sql/refresh/RuDeltaDef.cpp | 10 --
core/sql/refresh/RuDupElimGlobals.cpp | 4 -
core/sql/refresh/RuDupElimLogScanner.h | 2 -
core/sql/refresh/RuDupElimTaskExecutor.cpp | 10 --
core/sql/refresh/RuEmpCheckTaskExecutor.cpp | 8 -
core/sql/refresh/RuEmpCheckTaskExecutor.h | 2 -
core/sql/refresh/RuException.cpp | 8 -
core/sql/refresh/RuExecController.cpp | 8 -
core/sql/refresh/RuForceOptions.cpp | 2 -
core/sql/refresh/RuForceOptions.h | 4 -
core/sql/refresh/RuForceOptionsParser.cpp | 2 -
core/sql/refresh/RuForceOptionsParser.h | 2 -
core/sql/refresh/RuLockEquivSetTaskExecutor.h | 4 -
core/sql/refresh/RuLogCleanupTaskExecutor.cpp | 6 -
core/sql/refresh/RuLogCleanupTaskExecutor.h | 4 -
core/sql/refresh/RuMVEquivSetBuilder.cpp | 2 -
core/sql/refresh/RuMVEquivSetBuilder.h | 2 -
.../refresh/RuMultiTxnRefreshTaskExecutor.cpp | 14 --
core/sql/refresh/RuOptions.cpp | 6 -
core/sql/refresh/RuRcReleaseTaskExecutor.h | 2 -
core/sql/refresh/RuRefreshSQLComposer.cpp | 14 --
core/sql/refresh/RuRefreshTaskExecutor.cpp | 24 ---
core/sql/refresh/RuSQLStatementContainer.cpp | 8 -
.../sql/refresh/RuSimpleRefreshTaskExecutor.cpp | 12 --
core/sql/refresh/RuTableSyncTaskExecutor.h | 2 -
core/sql/refresh/RuTask.cpp | 6 -
core/sql/refresh/RuTaskExecutor.cpp | 10 --
core/sql/refresh/RuTaskExecutor.h | 2 -
core/sql/refresh/RuTaskServerExecControler.cpp | 2 -
core/sql/refresh/RuTbl.cpp | 2 -
core/sql/refresh/RuTestTaskExecutor.cpp | 2 -
core/sql/refresh/RuTestTaskExecutor.h | 2 -
core/sql/refresh/RuUnAuditRefreshTaskExecutor.h | 2 -
core/sql/runtimestats/RtsStubs.cpp | 2 -
core/sql/runtimestats/sscpipc.cpp | 2 -
core/sql/smdio/vers_libsmdio.cpp | 2 -
core/sql/sort/DiskPool_sq.h | 2 -
core/sql/sort/ScratchFileConnection.h | 2 -
core/sql/sort/SortUtil.cpp | 15 --
core/sql/sort/Statistics.cpp | 2 -
core/sql/sort/TourTree.cpp | 2 -
core/sql/sort/scratchfileconnection.cpp | 2 -
core/sql/sort/vers_libsort.cpp | 2 -
core/sql/sqlcomp/CmpDescribe.cpp | 2 -
core/sql/sqlcomp/CmpMain.cpp | 6 +-
core/sql/sqlcomp/CmpMain.h | 6 +-
core/sql/sqlcomp/DefaultValidator.cpp | 4 -
core/sql/sqlcomp/NADefaults.h | 4 -
core/sql/sqlcomp/NewDel.cpp | 2 -
core/sql/sqlcomp/QCache.cpp | 2 -
core/sql/sqlcomp/nadefaults.cpp | 4 -
core/sql/sqlcomp/vers_libsqlcomp.cpp | 2 -
core/sql/sqlmxevents/logmxevent_sq.cpp | 7 -
core/sql/udrserv/UdrAbortCallBack.cpp | 2 -
core/sql/udrserv/UdrDebug.cpp | 2 -
core/sql/udrserv/UdrFFDC.cpp | 2 -
core/sql/udrserv/UdrImplLmExtFunc.cpp | 2 -
core/sql/udrserv/UdrRSProcess.cpp | 8 -
core/sql/udrserv/UdrResultSet.cpp | 6 -
core/sql/udrserv/spinfo.cpp | 2 -
core/sql/udrserv/spinfoCallback.cpp | 6 -
core/sql/udrserv/udrglobals.cpp | 2 -
core/sql/udrserv/udrload.cpp | 2 -
core/sql/udrserv/udrserv.cpp | 10 --
core/sql/udrserv/udrunload.cpp | 4 -
core/sql/udrserv/udrutil.cpp | 2 -
core/sql/ustat/hs_cli.cpp | 22 ---
core/sql/ustat/hs_cli.h | 2 -
core/sql/ustat/hs_globals.cpp | 50 +------
core/sql/ustat/hs_la.cpp | 11 +-
core/sql/ustat/hs_log.cpp | 4 +-
core/sql/ustat/hs_parser.cpp | 8 -
core/sql/ustat/hs_read.cpp | 24 +--
core/sql/ustat/hs_update.cpp | 4 -
core/sql/ustat/hs_util.cpp | 12 --
core/sql/ustat/hs_util.h | 4 -
core/sql/ustat/vers_libustat.cpp | 2 -
334 files changed, 316 insertions(+), 3402 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/arkcmp/vers_libarkcmp.cpp
----------------------------------------------------------------------
diff --git a/core/sql/arkcmp/vers_libarkcmp.cpp b/core/sql/arkcmp/vers_libarkcmp.cpp
index 33a30a3..0eeff4d 100644
--- a/core/sql/arkcmp/vers_libarkcmp.cpp
+++ b/core/sql/arkcmp/vers_libarkcmp.cpp
@@ -26,6 +26,4 @@
#define VERS_CV_MIN 0
#define VERS_CV_UPD 1
-// LCOV_EXCL_START
VERS_LIB(libarkcmp)
-// LCOV_EXCL_STOP
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/bin/ex_esp_main.cpp
----------------------------------------------------------------------
diff --git a/core/sql/bin/ex_esp_main.cpp b/core/sql/bin/ex_esp_main.cpp
index ae27eec..0a54fb6 100644
--- a/core/sql/bin/ex_esp_main.cpp
+++ b/core/sql/bin/ex_esp_main.cpp
@@ -563,7 +563,6 @@ void EspGuaControlConnection::actOnSystemMessage(
// Master is gone, stop this process and let the OS cleanup.
if (getEnv()->getLogEspGotCloseMsg())
{
- // LCOV_EXCL_START
/*
Coverage notes: to test this code in a dev regression requires
changing $TRAF_HOME/etc/ms.env, so I made a manual test on
@@ -577,14 +576,12 @@ void EspGuaControlConnection::actOnSystemMessage(
char *sysMsgName = NULL;
switch (messageNum)
{
- // LCOV_EXCL_STOP
case ZSYS_VAL_SMSG_CPUDOWN:
sysMsgName = (char *) "CPUDOWN";
break;
case ZSYS_VAL_SMSG_REMOTECPUDOWN:
sysMsgName = (char *) "REMOTECPUDOWN";
break;
- // LCOV_EXCL_START
case ZSYS_VAL_SMSG_CLOSE:
sysMsgName = (char *) "CLOSE";
break;
@@ -597,7 +594,6 @@ void EspGuaControlConnection::actOnSystemMessage(
sysMsgName, myName);
SQLMXLoggingArea::logExecRtInfo(__FILE__,
__LINE__, buf, 0);
- // LCOV_EXCL_STOP
}
getEnv()->stopIpcEnvironment();
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/bin/ex_ssmp_main.cpp
----------------------------------------------------------------------
diff --git a/core/sql/bin/ex_ssmp_main.cpp b/core/sql/bin/ex_ssmp_main.cpp
index 88f876c..2f17b95 100755
--- a/core/sql/bin/ex_ssmp_main.cpp
+++ b/core/sql/bin/ex_ssmp_main.cpp
@@ -182,7 +182,6 @@ void runServer(Int32 argc, char **argv)
// while holding the stats semaphore. This code has been covered in
// a manual unit test, but it is not possible to cover this easily in
// an automated test.
- // LCOV_EXCL_START
if (statsGlobals->getSemPid() != -1)
{
NAProcessHandle prevSsmpPhandle((SB_Phandle_Type *)
@@ -206,7 +205,6 @@ void runServer(Int32 argc, char **argv)
(pid_t) myPhandle.getPin());
}
}
- // LCOV_EXCL_STOP
XPROCESSHANDLE_GETMINE_(statsGlobals->getSsmpProcHandle());
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/cli/Cli.cpp
----------------------------------------------------------------------
diff --git a/core/sql/cli/Cli.cpp b/core/sql/cli/Cli.cpp
index 1fdc61c..fd6935b 100644
--- a/core/sql/cli/Cli.cpp
+++ b/core/sql/cli/Cli.cpp
@@ -109,7 +109,6 @@ StrTarget::StrTarget() :
cnvExternalCharset_(cnv_UnknownCharSet),
cnvInternalCharset_(cnv_UnknownCharSet)
{}
-//LCOV_EXCL_START
StrTarget::StrTarget(Descriptor *desc, Lng32 entry) :
heap_(NULL),
str_(NULL),
@@ -120,7 +119,6 @@ StrTarget::StrTarget(Descriptor *desc, Lng32 entry) :
{
init(desc, entry);
}
-//LCOV_EXCL_STOP
void StrTarget::init(Descriptor *desc, Lng32 entry)
{
Lng32 sourceLen, sourceType, externalCharset, internalCharset;
@@ -389,7 +387,6 @@ static Lng32 SQLCLI_Prepare_Setup_Post(
static Lng32 CheckNOSQLAccessMode(CliGlobals &cliGlobals)
{
// rare error condition
- //LCOV_EXCL_START
if (!cliGlobals.sqlAccessAllowed())
{
cliGlobals.setUdrAccessModeViolation(TRUE);
@@ -401,7 +398,6 @@ static Lng32 CheckNOSQLAccessMode(CliGlobals &cliGlobals)
}
return - CLI_NO_SQL_ACCESS_MODE_VIOLATION;
}
- //LCOV_EXCL_STOP
return SUCCESS;
}
@@ -428,24 +424,20 @@ static Lng32 CliPrologue(CliGlobals * cliGlobals,
if (exTransaction != NULL)
{
retcode = exTransaction->inheritTransaction();
- //LCOV_EXCL_START
if (isERROR(retcode))
{
diags << DgSqlCode(- CLI_BEGIN_TRANSACTION_ERROR);
return ERROR;
}
- //LCOV_EXCL_STOP
}
}
- //LCOV_EXCL_START - versioning obsolete
if ((context->getVersionOfCompiler() != COM_VERS_COMPILER_VERSION) && (numOfCliCalls >1 ))
{
short index = 0;
cliGlobals->setSavedVersionOfCompiler(context->getVersionOfCompiler());
context->setOrStartCompiler(COM_VERS_COMPILER_VERSION,NULL, index);
}
- //LCOV_EXCL_STOP
// Initialize session defaults.
// if session defaults have not been read from the default table,
@@ -479,10 +471,8 @@ static Lng32 CliEpilogue(CliGlobals * cliGlobals,
if (isERROR(retcode))
{
- //LCOV_EXCL_START
ComDiagsArea & diags = context->diags();
return diags.mainSQLCODE();
- //LCOV_EXCL_STOP
}
}
#if 0
@@ -536,12 +526,10 @@ Lng32 local_SetDescPointers(/*IN*/ Descriptor * desc,
(starting_entry <= 0) ||
((num_ptr_pairs + starting_entry - 1) > desc->getUsedEntryCount()))
{
- //LCOV_EXCL_START
ComDiagsArea & diags = context->diags();
diags << DgSqlCode(-CLI_INTERNAL_ERROR);
return SQLCLI_ReturnCode(context, -CLI_INTERNAL_ERROR);
- //LCOV_EXCL_STOP
}
for (Lng32 entry=starting_entry, i = 0; entry < starting_entry+num_ptr_pairs;
@@ -561,7 +549,7 @@ Lng32 local_SetDescPointers(/*IN*/ Descriptor * desc,
if(ip && (context->boundsCheckMemory(ip, desc->getIndLength(entry))) ||
(context->boundsCheckMemory(vp, desc->getVarDataLength(entry))))
- return SQLCLI_ReturnCode(context,-CLI_USER_MEMORY_IN_EXECUTOR_SEGMENT); //LCOV_EXCL_LINE
+ return SQLCLI_ReturnCode(context,-CLI_USER_MEMORY_IN_EXECUTOR_SEGMENT);
desc->setDescItem(entry, SQLDESC_IND_PTR, (Long)ip, 0);
desc->setDescItem(entry, SQLDESC_VAR_PTR, (Long)vp, 0);
@@ -635,7 +623,6 @@ static Lng32 getNumericHostVarInfo(Descriptor *desc,
SQLDESC_IND_TYPE,
(Lng32*) &ind_type,
NULL, 0, NULL, 0);
- //LCOV_EXCL_START
if (retcode != 0)
return SQLCLI_ReturnCode(desc->getContext(),retcode);
@@ -656,7 +643,6 @@ static Lng32 getNumericHostVarInfo(Descriptor *desc,
default:
retcode = -1;
}
- //LCOV_EXCL_STOP
}
return SQLCLI_ReturnCode(desc->getContext(),retcode);
@@ -720,7 +706,6 @@ static Lng32 InputValueFromNumericHostvar(Descriptor *desc,
&diagsArea);
if (expRetcode != ex_expr::EXPR_OK)
return ERROR;
- //LCOV_EXCL_START - rare error check
if (indPtr)
{
// values coming in should not be NULL, just make
@@ -747,7 +732,6 @@ static Lng32 InputValueFromNumericHostvar(Descriptor *desc,
if (userIndicatorVal)
return ERROR; // user specified NULL or junk
}
- //LCOV_EXCL_STOP
return (SUCCESS);
}
@@ -804,14 +788,11 @@ static Lng32 OutputValueIntoNumericHostvar(Descriptor *desc,
}
else
{
- //LCOV_EXCL_START
ComDiagsArea & diags = context->diags();
diags << DgSqlCode(-3164);
return ERROR;
- //LCOV_EXCL_STOP
}
- //LCOV_EXCL_START
if (indPtr)
{
// move a zero into the indicator host variable
@@ -833,7 +814,6 @@ static Lng32 OutputValueIntoNumericHostvar(Descriptor *desc,
if (expRetcode != ex_expr::EXPR_OK)
return ERROR;
}
- //LCOV_EXCL_STOP
return SUCCESS;
}
@@ -975,7 +955,6 @@ Lng32 SQLCLI_AllocDesc(/*IN*/ CliGlobals * cliGlobals,
// max entries allowed.
maxEntries = 500;
}
- //LCOV_EXCL_START
if (maxEntries < 1)
{
diags << DgSqlCode(- CLI_DATA_OUTOFRANGE)
@@ -983,7 +962,6 @@ Lng32 SQLCLI_AllocDesc(/*IN*/ CliGlobals * cliGlobals,
return SQLCLI_ReturnCode(&currContext,-CLI_DATA_OUTOFRANGE);
}
- //LCOV_EXCL_STOP
/* allocate a new descriptor in the current context. */
/* return the descriptor handle in desc_id, if name mode */
@@ -1039,11 +1017,9 @@ Lng32 SQLCLI_AllocStmt(/*IN*/ CliGlobals * cliGlobals,
(statement_id->name_mode == stmt_name) ||
(statement_id->name_mode == stmt_via_desc))
{
- //LCOV_EXCL_START
diags << DgSqlCode(-CLI_INTERNAL_ERROR);
return SQLCLI_ReturnCode(cliGlobals->currContext(),
-CLI_INTERNAL_ERROR);
- //LCOV_EXCL_STOP
}
#if defined(MULTIPLE_CURSORS_PER_STATEMENT)
@@ -1061,10 +1037,8 @@ Lng32 SQLCLI_AllocStmt(/*IN*/ CliGlobals * cliGlobals,
retcode = SQLCLI_SetCursorName(cliGlobals, cloned_statement, &desc);
#endif
- //LCOV_EXCL_START
if (isERROR(retcode))
return SQLCLI_ReturnCode(cliGlobals->currContext(),retcode);
- //LCOV_EXCL_STOP
}
return CliEpilogue(cliGlobals, NULL);
@@ -1088,13 +1062,11 @@ Lng32 SQLCLI_AllocStmtForRS(/*IN*/ CliGlobals *cliGlobals,
// The CALL statement must exist
Statement *callStmt = currContext.getStatement(callStmtId);
- //LCOV_EXCL_START
if (!callStmt)
{
diags << DgSqlCode(-CLI_STMT_NOT_EXISTS);
return SQLCLI_ReturnCode(&currContext, -CLI_STMT_NOT_EXISTS);
}
- //LCOV_EXCL_STOP
// The parent statement must be a CALL. This can be determine
// from the root TDB's query type
@@ -1168,7 +1140,6 @@ Lng32 SQLCLI_AllocStmtForRS(/*IN*/ CliGlobals *cliGlobals,
} // SQLCLI_AllocStmtForRS
-//LCOV_EXCL_START
Lng32 SQLCLI_AssocFileNumber(/*IN*/ CliGlobals * cliGlobals,
/*IN*/ SQLSTMT_ID * statement_id,
/*IN*/ short file_num)
@@ -1176,7 +1147,6 @@ Lng32 SQLCLI_AssocFileNumber(/*IN*/ CliGlobals * cliGlobals,
return 0;
}
-//LCOV_EXCL_STOP
Lng32 SQLCLI_BreakEnabled(/*IN*/ CliGlobals * cliGlobals,
/*IN*/ UInt32 enabled )
{
@@ -1191,7 +1161,6 @@ Lng32 SQLCLI_BreakEnabled(/*IN*/ CliGlobals * cliGlobals,
#pragma warn(1506) // warning elimination
return 0;
}
-//LCOV_EXCL_START
Lng32 SQLCLI_SPBreakRecvd(/*IN*/ CliGlobals * cliGlobals,
/*OUT*/ UInt32 *breakRecvd)
{
@@ -1207,7 +1176,6 @@ Lng32 SQLCLI_SPBreakRecvd(/*IN*/ CliGlobals * cliGlobals,
#pragma warn(1506) // warning elimination
return 0;
}
-//LCOV_EXCL_STOP
#pragma nowarn(770) // warning elimination
Lng32 SQLCLI_CreateContext(/*IN*/ CliGlobals * cliGlobals,
@@ -1220,7 +1188,6 @@ Lng32 SQLCLI_CreateContext(/*IN*/ CliGlobals * cliGlobals,
ContextCli & currContext = *(cliGlobals->currContext());
ComDiagsArea & diags = currContext.diags();
- //LCOV_EXCL_START
if (mustBeZero != 0)
{
//
@@ -1235,7 +1202,6 @@ Lng32 SQLCLI_CreateContext(/*IN*/ CliGlobals * cliGlobals,
<< DgString2("0");
return SQLCLI_ReturnCode(&currContext, -CLI_RESERVED_ARGUMENT);
}
- //LCOV_EXCL_STOP
ContextCli * newContext = NULL;
retcode = cliGlobals->createContext(newContext);
if (! newContext)
@@ -1281,7 +1247,6 @@ Lng32 SQLCLI_DeleteContext(/*IN*/ CliGlobals * cliGlobals,
return SQLCLI_DropContext(cliGlobals, context_handle);
}
-//LCOV_EXCL_START - obsolete
Lng32 SQLCLI_DropModule(/*IN*/ CliGlobals * cliGlobals,
/*IN*/ const SQLMODULE_ID * module_id)
{
@@ -1394,7 +1359,6 @@ Lng32 SQLCLI_ResetUdrErrorFlags_Internal(/*IN*/ CliGlobals * cliGlobals){
return SUCCESS;
}
-//LCOV_EXCL_STOP
// A CLI wrapper around a ContextCli method to dynamically set JVM
// startup options in the UDR server
Lng32 SQLCLI_SetUdrRuntimeOptions_Internal(/*IN*/ CliGlobals *cliGlobals,
@@ -1403,12 +1367,10 @@ Lng32 SQLCLI_SetUdrRuntimeOptions_Internal(/*IN*/ CliGlobals *cliGlobals,
/*IN*/ const char *delimiters,
/*IN*/ ULng32 delimsLen)
{
- //LCOV_EXCL_START
if (!cliGlobals)
{
return -CLI_NO_CURRENT_CONTEXT;
}
- //LCOV_EXCL_STOP
ContextCli &currContext = *(cliGlobals->currContext());
@@ -1418,18 +1380,15 @@ Lng32 SQLCLI_SetUdrRuntimeOptions_Internal(/*IN*/ CliGlobals *cliGlobals,
return SQLCLI_ReturnCode(&currContext, retcode);
}
-//LCOV_EXCL_STOP
Lng32 SQLCLI_DeallocDesc(/*IN*/ CliGlobals * cliGlobals,
/*IN*/ SQLDESC_ID * desc_id)
{
Lng32 retcode;
- //LCOV_EXCL_START
if (!cliGlobals)
{
return -CLI_NO_CURRENT_CONTEXT;
}
- //LCOV_EXCL_STOP
ContextCli & currContext = *(cliGlobals->currContext());
@@ -1468,7 +1427,6 @@ Lng32 SQLCLI_DeallocStmt(/*IN*/ CliGlobals * cliGlobals,
return SQLCLI_ReturnCode(&currContext,retcode);
}
-//LCOV_EXCL_START
Lng32 SQLCLI_DefineDesc(/*IN*/ CliGlobals * cliGlobals,
/*IN*/ SQLSTMT_ID * statement_id,
/* (SQLWHAT_DESC) *IN*/ Lng32 what_descriptor,
@@ -1507,18 +1465,15 @@ Lng32 SQLCLI_DefineDesc(/*IN*/ CliGlobals * cliGlobals,
return SUCCESS;
}
-//LCOV_EXCL_STOP
Lng32 SQLCLI_DescribeStmt(/*IN*/ CliGlobals * cliGlobals,
/*IN*/ SQLSTMT_ID * statement_id,
/*IN OPTIONAL*/ SQLDESC_ID * input_descriptor,
/*IN OPTIONAL*/ SQLDESC_ID * output_descriptor)
{
- //LCOV_EXCL_START
if (!cliGlobals)
{
return -CLI_NO_CURRENT_CONTEXT;
}
- //LCOV_EXCL_STOP
Lng32 retcode;
@@ -1530,13 +1485,11 @@ Lng32 SQLCLI_DescribeStmt(/*IN*/ CliGlobals * cliGlobals,
Statement * stmt = currContext.getStatement(statement_id);
/* stmt must exist */
- //LCOV_EXCL_START
if (!stmt)
{
diags << DgSqlCode(-CLI_STMT_NOT_EXISTS);
return SQLCLI_ReturnCode(&currContext,-CLI_STMT_NOT_EXISTS);
}
- //LCOV_EXCL_STOP
/* stmt should be a dynamic statement and must not be in INITIAL state */
/* if it is in INITIAL state then the statement did not get prepared. */
@@ -1566,13 +1519,11 @@ Lng32 SQLCLI_DescribeStmt(/*IN*/ CliGlobals * cliGlobals,
if (input_descriptor)
{
Descriptor * input_desc = currContext.getDescriptor(input_descriptor);
- //LCOV_EXCL_START
if (!input_desc)
{
diags << DgSqlCode(-CLI_DESC_NOT_EXISTS);
return SQLCLI_ReturnCode(&currContext,-CLI_DESC_NOT_EXISTS);
}
- //LCOV_EXCL_STOP
retcode = stmt->describe(input_desc,
SQLWHAT_INPUT_DESC,
@@ -1600,7 +1551,6 @@ Lng32 SQLCLI_DescribeStmt(/*IN*/ CliGlobals * cliGlobals,
return CliEpilogue(cliGlobals, statement_id);
}
-//LCOV_EXCL_START
Lng32 SQLCLI_DisassocFileNumber(/*IN*/ CliGlobals * cliGlobals,
/*IN*/ SQLSTMT_ID * statement_id)
{
@@ -1647,7 +1597,6 @@ Lng32 SQLCLI_DropContext(/*IN*/ CliGlobals * cliGlobals,
return SQLCLI_ReturnCode(defaultContext,retcode);
}
-//LCOV_EXCL_STOP
Lng32 SQLCLI_SetRowsetDescPointers(CliGlobals * cliGlobals,
SQLDESC_ID * desc_id,
Lng32 rowset_size,
@@ -1657,12 +1606,10 @@ Lng32 SQLCLI_SetRowsetDescPointers(CliGlobals * cliGlobals,
va_list ap,
SQLCLI_QUAD_FIELDS quad_fields[])
{
- //LCOV_EXCL_START
if (!desc_id)
{
return -CLI_INTERNAL_ERROR;
}
- //LCOV_EXCL_STOP
ContextCli & currContext = *(cliGlobals->currContext());
@@ -1685,12 +1632,10 @@ Lng32 SQLCLI_SetRowsetDescPointers(CliGlobals * cliGlobals,
entry < starting_entry+num_quadruple_fields;
entry++, i++)
{
- //LCOV_EXCL_START
if (desc->getUsedEntryCount() < entry) {
diags << DgSqlCode(-CLI_INVALID_DESC_ENTRY);
return SQLCLI_ReturnCode(&currContext,-CLI_INVALID_DESC_ENTRY);
}
- //LCOV_EXCL_STOP
// need to re-order this to avoid possible problems with not setting
// the data area (i.e. VAR_PTR) last.
@@ -1723,7 +1668,6 @@ Lng32 SQLCLI_SetRowsetDescPointers(CliGlobals * cliGlobals,
return SUCCESS;
}
- //LCOV_EXCL_START - unused method
Lng32 SQLCLI_GetRowsetNumprocessed(CliGlobals * cliGlobals,
SQLDESC_ID * desc_id,
Lng32 &rowset_nprocessed)
@@ -1756,7 +1700,6 @@ Lng32 SQLCLI_GetRowsetNumprocessed(CliGlobals * cliGlobals,
retcode = CliEpilogue(cliGlobals, NULL);
return SQLCLI_ReturnCode(&currContext,retcode);
}
-//LCOV_EXCL_STOP
static NABoolean SQLCLI_GetRetryInfo(CliGlobals * cliGlobals,
Lng32 retcode,
AQRStatementInfo * aqrSI,
@@ -1843,11 +1786,9 @@ static Lng32 SQLCLI_RetryDeallocStmt(
init_SQLDESC_ID(temp_input_desc_id, SQLCLI_CURRENT_VERSION, desc_handle, module);
retcode = SQLCLI_AllocDescInt(cliGlobals, temp_input_desc_id, 1);
- //LCOV_EXCL_START
if (isERROR(retcode))
return retcode;
}
- //LCOV_EXCL_STOP
if (! aqrSI->getRetryOutputDesc())
{
@@ -1858,20 +1799,16 @@ static Lng32 SQLCLI_RetryDeallocStmt(
init_SQLDESC_ID(temp_output_desc_id, SQLCLI_CURRENT_VERSION, desc_handle, module);
retcode = SQLCLI_AllocDescInt(cliGlobals, temp_output_desc_id, 1);
- //LCOV_EXCL_START
if (isERROR(retcode))
return retcode;
- //LCOV_EXCL_STOP
}
retcode = SQLCLI_DescribeStmt(cliGlobals,
aqrSI->getRetryStatementId(),
temp_input_desc_id,
temp_output_desc_id);
- //LCOV_EXCL_START
if (isERROR(retcode) && (retcode != -CLI_STMT_NOT_PREPARED))
return retcode;
- //LCOV_EXCL_STOP
if (retcode == -CLI_STMT_NOT_PREPARED)
diags.clear();
@@ -1881,10 +1818,8 @@ static Lng32 SQLCLI_RetryDeallocStmt(
retcode = SQLCLI_DeallocStmt(cliGlobals,
aqrSI->getRetryStatementId());
- //LCOV_EXCL_START
if (isERROR(retcode))
return retcode;
- //LCOV_EXCL_STOP
return retcode;
}
@@ -1941,39 +1876,31 @@ static Lng32 SQLCLI_RetryValidateDescs
Descriptor * currInputDesc = currContext.getDescriptor(curr_input_desc_id);
- //LCOV_EXCL_START
if (!currInputDesc)
{
diags << DgSqlCode(-CLI_DESC_NOT_EXISTS);
return -CLI_DESC_NOT_EXISTS;
}
- //LCOV_EXCL_STOP
Descriptor * currOutputDesc = currContext.getDescriptor(curr_output_desc_id);
- //LCOV_EXCL_START
if (!currOutputDesc)
{
diags << DgSqlCode(-CLI_DESC_NOT_EXISTS);
return -CLI_DESC_NOT_EXISTS;
}
- //LCOV_EXCL_STOP
Descriptor * newInputDesc = currContext.getDescriptor(&new_input_desc_id);
- //LCOV_EXCL_START
if (!newInputDesc)
{
diags << DgSqlCode(-CLI_DESC_NOT_EXISTS);
return -CLI_DESC_NOT_EXISTS;
}
- //LCOV_EXCL_STOP
Descriptor * newOutputDesc = currContext.getDescriptor(&new_output_desc_id);
- //LCOV_EXCL_START
if (!newOutputDesc)
{
diags << DgSqlCode(-CLI_DESC_NOT_EXISTS);
return -CLI_DESC_NOT_EXISTS;
}
- //LCOV_EXCL_STOP
// Before describing , save the flags from the old descriptors that the user
// may have set using a setDescItem call
newOutputDesc->setDescFlags( currOutputDesc->getDescFlags());
@@ -1982,26 +1909,20 @@ static Lng32 SQLCLI_RetryValidateDescs
statement_id,
&new_input_desc_id,
&new_output_desc_id);
- //LCOV_EXCL_START
if (isERROR(retcode))
return retcode;
- //LCOV_EXCL_STOP
newInputDesc = currContext.getDescriptor(&new_input_desc_id);
- //LCOV_EXCL_START
if (!newInputDesc)
{
diags << DgSqlCode(-CLI_DESC_NOT_EXISTS);
return -CLI_DESC_NOT_EXISTS;
}
- //LCOV_EXCL_STOP
newOutputDesc = currContext.getDescriptor(&new_output_desc_id);
-//LCOV_EXCL_START
if (!newOutputDesc)
{
diags << DgSqlCode(-CLI_DESC_NOT_EXISTS);
return -CLI_DESC_NOT_EXISTS;
}
-//LCOV_EXCL_STOP
if (NOT (*currInputDesc == *newInputDesc))
{
retcode = -EXE_USER_PREPARE_NEEDED;
@@ -2529,7 +2450,6 @@ Lng32 SQLCLI_ProcessRetryQuery(
if (type == AQRInfo::RETRY_WITH_DECACHE)
flags |= PREPARE_WITH_DECACHE;
- //LCOV_EXCL_START
// log an ems event, unless disabled or if regressions
// are running.
char *sqlmxRegr = NULL;
@@ -2563,7 +2483,6 @@ Lng32 SQLCLI_ProcessRetryQuery(
SQLMXLoggingArea::logExecRtInfo(NULL, 0, emsText, 0);
}
- //LCOV_EXCL_STOP
retcode =
SQLCLI_RetryQuery(
@@ -3270,14 +3189,12 @@ Lng32 SQLCLI_ExecDirect(/*IN*/ CliGlobals * cliGlobals,
/* prepare the statement */
Statement * stmt = currContext.getStatement(statement_id);
- //LCOV_EXCL_START
/* stmt must exist */
if (!stmt)
{
diags << DgSqlCode(-CLI_STMT_NOT_EXISTS);
return SQLCLI_ReturnCode(&currContext,-CLI_STMT_NOT_EXISTS);
}
- //LCOV_EXCL_STOP
stmt->getGlobals()->clearCancelState();
StrTarget strTarget;
@@ -3286,13 +3203,11 @@ Lng32 SQLCLI_ExecDirect(/*IN*/ CliGlobals * cliGlobals,
return SQLCLI_ReturnCode(&currContext,retcode);
// CLI callers are not allowed to request PREPARE or EXEC DIRECT
// operations on stored procedure result sets.
- //LCOV_EXCL_START
if (stmt->getParentCall())
{
diags << DgSqlCode(-EXE_UDR_RS_PREPARE_NOT_ALLOWED);
return SQLCLI_ReturnCode(&currContext, -EXE_UDR_RS_PREPARE_NOT_ALLOWED);
}
- //LCOV_EXCL_STOP
// For ExecDirect, MXOSRVR calls SQL_EXEC_SetStmtAttr(NULL) to set the unique id
// before calling SQL_EXEC_EXECDirect. So, we need to use them
@@ -3354,14 +3269,12 @@ Lng32 SQLCLI_ExecDirect2(/*IN*/ CliGlobals * cliGlobals,
/* prepare the statement */
Statement * stmt = currContext.getStatement(statement_id);
- //LCOV_EXCL_START
/* stmt must exist */
if (!stmt)
{
diags << DgSqlCode(-CLI_STMT_NOT_EXISTS);
return SQLCLI_ReturnCode(&currContext,-CLI_STMT_NOT_EXISTS);
}
- //LCOV_EXCL_STOP
stmt->getGlobals()->clearCancelState();
StrTarget strTarget;
@@ -3370,13 +3283,11 @@ Lng32 SQLCLI_ExecDirect2(/*IN*/ CliGlobals * cliGlobals,
return SQLCLI_ReturnCode(&currContext,retcode);
// CLI callers are not allowed to request PREPARE or EXEC DIRECT
// operations on stored procedure result sets.
- //LCOV_EXCL_START
if (stmt->getParentCall())
{
diags << DgSqlCode(-EXE_UDR_RS_PREPARE_NOT_ALLOWED);
return SQLCLI_ReturnCode(&currContext, -EXE_UDR_RS_PREPARE_NOT_ALLOWED);
}
- //LCOV_EXCL_STOP
// For ExecDirect, MXOSRVR calls SQL_EXEC_SetStmtAttr(NULL) to set the unique id
// before calling SQL_EXEC_EXECDirect. So, we need to use them
@@ -3567,7 +3478,6 @@ if (!cliGlobals)
return retcode;
}
-//LCOV_EXCL_START
/////////////////////////////////////////////////////////////////////
@@ -3630,7 +3540,6 @@ Lng32 SQLCLI_Cancel(/*IN*/ CliGlobals * cliGlobals,
return retcode;
}
-//LCOV_EXCL_STOP
Lng32 SQLCLI_GetDescEntryCount(/*IN*/ CliGlobals * cliGlobals,
/*IN*/ SQLDESC_ID * desc_id,
@@ -3653,23 +3562,19 @@ Lng32 SQLCLI_GetDescEntryCount(/*IN*/ CliGlobals * cliGlobals,
Descriptor * desc = currContext.getDescriptor(desc_id);
/* descriptor must exist */
- //LCOV_EXCL_START
if (!desc)
{
diags << DgSqlCode(-CLI_DESC_NOT_EXISTS);
return SQLCLI_ReturnCode(&currContext,-CLI_DESC_NOT_EXISTS);
}
- //LCOV_EXCL_STOP
Descriptor * output_desc = currContext.getDescriptor(output_descriptor);
/* descriptor must exist */
- //LCOV_EXCL_START
if (!output_desc)
{
diags << DgSqlCode(-CLI_DESC_NOT_EXISTS);
return SQLCLI_ReturnCode(&currContext,-CLI_DESC_NOT_EXISTS);
}
- //LCOV_EXCL_STOP
Lng32 retcode = OutputValueIntoNumericHostvar(
output_desc,
@@ -4425,7 +4330,6 @@ static Lng32 getStmtInfo(
case SQLDIAG_AVERAGE_STREAM_WAIT:
*(ComDiagBigInt *)numeric_value = diags.getAvgStreamWaitTime();// returns ComDiagBigInt
break;
- //LCOV_EXCL_START
// The SQL/MP extension statement info items that are supported.
case SQLDIAG_COST:
{
@@ -4439,7 +4343,6 @@ static Lng32 getStmtInfo(
*(Lng32 *)numeric_value = (Lng32) temp_double;
};
}
- //LCOV_EXCL_STOP
break;
// The SQL/MP extension statement info items aren't currently unsupported.
@@ -4569,7 +4472,6 @@ Lng32 SQLCLI_GetDiagnosticsStmtInfo(/*IN*/ CliGlobals * cliGlobals,
value = number;
}
- //LCOV_EXCL_START
else // SQLDIAG_ROWSET_ROW_COUNT
{
// retrieve user provided rowset size into targetRowsetSize
@@ -4602,7 +4504,6 @@ Lng32 SQLCLI_GetDiagnosticsStmtInfo(/*IN*/ CliGlobals * cliGlobals,
targetRowsetSize = diags.numEntriesInRowsetRowCountArray();
}
}
- //LCOV_EXCL_STOP
CollHeap * heap = output_desc->getContext()->exCollHeap();
ComDiagsArea * diagsArea = output_desc->getContext()->getDiagsArea();
Lng32 oldDiagsAreaMark = diagsArea->mark();
@@ -5082,7 +4983,6 @@ Lng32 SQLCLI_GetDiagnosticsCondInfo(/*IN*/ CliGlobals * cliGlobals,
return retcode;
}
-//LCOV_EXCL_START
Lng32 SQLCLI_GetPackedDiagnostics(
/*IN*/ CliGlobals * cliGlobals,
/*OUT*/ IpcMessageBufferPtr message_buffer_ptr,
@@ -5111,7 +5011,6 @@ Lng32 SQLCLI_GetPackedDiagnostics(
return retcode;
}
-//LCOV_EXCL_STOP
Lng32 GetDiagnosticsCondInfoSwitchStatement(
/*IN*/ CliGlobals * cliGlobals,
/*IN* (SQLDIAG_COND_INFO_ITEM_ID) */ Lng32 what_to_get,
@@ -5131,7 +5030,6 @@ Lng32 GetDiagnosticsCondInfoSwitchStatement(
case SQLDIAG_SQLCODE: /* (numeric) the SQLCODE */
*numeric_value = condition.getSQLCODE();
break;
- //LCOV_EXCL_START
case SQLDIAG_COND_NUMBER: /* (numeric) condition number */
*numeric_value = condition.getConditionNumber();
break;
@@ -5240,7 +5138,6 @@ Lng32 GetDiagnosticsCondInfoSwitchStatement(
// do nothing -- no way to report error, so, okay.
break;
}
- //LCOV_EXCL_STOP
return 0;
}
@@ -5383,7 +5280,6 @@ Lng32 SQLCLI_GetSQLCODE(/*IN*/ CliGlobals * cliGlobals,
return SUCCESS; // this call always succeeds, no need to check errors!
}
-//LCOV_EXCL_START
Lng32 SQLCLI_GetMainSQLSTATE(/*IN*/ CliGlobals * cliGlobals,
/*IN*/ SQLSTMT_ID * statement_id,
/*IN*/ Lng32 sqlcode,
@@ -5810,7 +5706,6 @@ Lng32 SQLCLI_StoreExplainData(
return retcode;
}
-//LCOV_EXCL_START
Lng32 SQLCLI_ResDescName(/*IN*/ CliGlobals * cliGlobals,
/*INOUT*/ SQLDESC_ID * descriptor_id,
/*IN OPTIONAL*/ SQLSTMT_ID * from_statement,
@@ -5913,7 +5808,6 @@ Lng32 SQLCLI_ResStmtName(/*IN*/ CliGlobals * cliGlobals,
return SUCCESS;
}
-//LCOV_EXCL_STOP
// statement_id must point to an existing statement
// The Descriptor Id cursor_name must be of name_mode
// cursor_name or cursor_via_desc **exception ODBC/JDBC
@@ -5931,17 +5825,14 @@ Lng32 SQLCLI_SetCursorName(/*IN*/ CliGlobals * cliGlobals,
// create initial context, if first call, and add module, if any.
retcode = CliPrologue(cliGlobals,statement_id->module);
- //LCOV_EXCL_START
if (isERROR(retcode))
return retcode;
- //LCOV_EXCL_STOP
ContextCli & currContext = *(cliGlobals->currContext());
ComDiagsArea & diags = currContext.diags();
Statement * stmt = currContext.getStatement(statement_id);
- //LCOV_EXCL_START
/* stmt must exist */
if (!stmt)
{
@@ -5969,7 +5860,6 @@ Lng32 SQLCLI_SetCursorName(/*IN*/ CliGlobals * cliGlobals,
diags << DgSqlCode(-CLI_DESC_NOT_EXISTS);
return SQLCLI_ReturnCode(&currContext,-CLI_DESC_NOT_EXISTS);
}
- //LCOV_EXCL_STOP
stmt->setCursorName(desc->getVarData(1));
return SUCCESS;
@@ -5983,7 +5873,6 @@ Lng32 SQLCLI_SetCursorName(/*IN*/ CliGlobals * cliGlobals,
stmt->setCursorName(cursor_id->identifier);
break;
case curs_via_desc:
- //LCOV_EXCL_START
// This is the extended dynamic case. In this case the CLI will
// convert/check the input to valid ansi format
curs_id = Descriptor::GetNameViaDesc((SQLDESC_ID *)cursor_id,&currContext,heap);
@@ -5994,7 +5883,6 @@ Lng32 SQLCLI_SetCursorName(/*IN*/ CliGlobals * cliGlobals,
diags << DgSqlCode(-CLI_INVALID_ATTR_VALUE);
return SQLCLI_ReturnCode(&currContext,-CLI_INVALID_ATTR_VALUE);
break;
- //LCOV_EXCL_STOP
}
return SUCCESS;
}
@@ -6029,19 +5917,15 @@ Lng32 SQLCLI_SetStmtAttr( /*IN*/ CliGlobals *cliGlobals,
{
switch (numeric_value)
{
- //LCOV_EXCL_START
case SQL_NONHOLDABLE:
retcode = stmt->setHoldable(diags, FALSE);
break;
- //LCOV_EXCL_STOP
case SQL_HOLDABLE:
retcode = stmt->setHoldable(diags, TRUE);
break;
- //LCOV_EXCL_START
default:
diags << DgSqlCode(-CLI_INVALID_ATTR_VALUE);
return SQLCLI_ReturnCode(&currContext,-CLI_INVALID_ATTR_VALUE);
- //LCOV_EXCL_STOP
}
}
else if (attrName == SQL_ATTR_INPUT_ARRAY_MAXSIZE)
@@ -6078,7 +5962,6 @@ Lng32 SQLCLI_SetStmtAttr( /*IN*/ CliGlobals *cliGlobals,
}
else if (attrName == SQL_ATTR_NOT_ATOMIC_FAILURE_LIMIT)
{
- //LCOV_EXCL_START
if ((numeric_value >= 30)||
(numeric_value == ComCondition::NO_LIMIT_ON_ERROR_CONDITIONS)) {
retcode = stmt->setNotAtomicFailureLimit(diags, numeric_value);
@@ -6087,7 +5970,6 @@ Lng32 SQLCLI_SetStmtAttr( /*IN*/ CliGlobals *cliGlobals,
diags << DgSqlCode(-CLI_INVALID_ATTR_VALUE);
return SQLCLI_ReturnCode(&currContext,-CLI_INVALID_ATTR_VALUE);
}
- //LCOV_EXCL_STOP
}
else if (attrName == SQL_ATTR_UNIQUE_STMT_ID)
{
@@ -6105,13 +5987,11 @@ Lng32 SQLCLI_SetStmtAttr( /*IN*/ CliGlobals *cliGlobals,
diags << DgSqlCode(retcode);
}
}
- //LCOV_EXCL_START
else {
diags << DgSqlCode(-CLI_INVALID_ATTR_NAME);
return SQLCLI_ReturnCode(&currContext,-CLI_INVALID_ATTR_NAME);
}
- //LCOV_EXCL_STOP
if (retcode)
return diags.mainSQLCODE();
@@ -6450,7 +6330,6 @@ Lng32 SQLCLI_SetSessionAttr(/*IN*/ CliGlobals *cliGlobals,
}
break;
- //LCOV_EXCL_START
case SESSION_PARENT_QID:
{
SessionDefaults *sd = currContext.getSessionDefaults();
@@ -6458,7 +6337,6 @@ Lng32 SQLCLI_SetSessionAttr(/*IN*/ CliGlobals *cliGlobals,
sd->setParentQid(string_value, strlen(string_value));
}
break;
- //LCOV_EXCL_STOP
default:
{
// Other attributes can be supported in time
@@ -6638,7 +6516,6 @@ Lng32 CopyOneStmtAttr (/*IN*/ Statement &stmt,
{
*numeric_value = stmt.getConsumerCpu(index - 1);
}
- //LCOV_EXCL_START
else if (attrName == SQL_ATTR_PARENT_QID)
{
@@ -6679,7 +6556,6 @@ Lng32 CopyOneStmtAttr (/*IN*/ Statement &stmt,
diags << DgSqlCode(-CLI_INVALID_ATTR_NAME);
return SQLCLI_ReturnCode(&context,-CLI_INVALID_ATTR_NAME);
}
- //LCOV_EXCL_STOP
return retcode;
}
@@ -6758,7 +6634,6 @@ Lng32 SQLCLI_GetStmtAttrs( /*IN*/ CliGlobals *cliGlobals,
return retcode;
}
-//LCOV_EXCL_START
Lng32 SQLCLI_SetDescEntryCount(/*IN*/ CliGlobals * cliGlobals,
/*IN*/ SQLDESC_ID * desc_id,
/*IN*/ SQLDESC_ID * input_descriptor)
@@ -6813,7 +6688,6 @@ Lng32 SQLCLI_SetDescEntryCount(/*IN*/ CliGlobals * cliGlobals,
return SUCCESS;
}
-//LCOV_EXCL_STOP
Lng32 SQLCLI_SetDescItems(/*IN*/ CliGlobals * cliGlobals,
/*IN*/ SQLDESC_ID * desc_id,
/*IN*/ SQLDESC_ITEM desc_items[],
@@ -7006,13 +6880,11 @@ Lng32 SQLCLI_SetDescItems2(/*IN*/ CliGlobals * cliGlobals,
if (entry > desc->getUsedEntryCount())
{
retcode = desc->addEntry(entry);
- //LCOV_EXCL_START
if (isERROR(retcode))
{
diags << DgSqlCode(-CLI_INTERNAL_ERROR);
return SQLCLI_ReturnCode(&currContext,-CLI_INTERNAL_ERROR);
}
- //LCOV_EXCL_STOP
}
// if item to be set is vardata, get input data length.
@@ -7207,7 +7079,6 @@ Lng32 SQLCLI_Xact(/*IN*/ CliGlobals * cliGlobals,
}
}
break;
- //LCOV_EXCL_START
case SQLTRANS_ROLLBACK_IMPLICIT_XN:
{
if ((currContext.getTransaction()->xnInProgress()) &&
@@ -7222,10 +7093,8 @@ Lng32 SQLCLI_Xact(/*IN*/ CliGlobals * cliGlobals,
}
}
}
- //LCOV_EXCL_STOP
break;
- //LCOV_EXCL_START
case SQLTRANS_COMMIT:
{
if ((currContext.getTransaction()->xnInProgress()) &&
@@ -7242,10 +7111,8 @@ Lng32 SQLCLI_Xact(/*IN*/ CliGlobals * cliGlobals,
}
}
- //LCOV_EXCL_STOP
break;
- //LCOV_EXCL_START
case SQLTRANS_ROLLBACK:
{
if ((currContext.getTransaction()->xnInProgress()) &&
@@ -7259,10 +7126,8 @@ Lng32 SQLCLI_Xact(/*IN*/ CliGlobals * cliGlobals,
}
}
}
- //LCOV_EXCL_STOP
break;
- //LCOV_EXCL_START
case SQLTRANS_BEGIN:
{
if (! (currContext.getTransaction()->xnInProgress()))
@@ -7275,7 +7140,6 @@ Lng32 SQLCLI_Xact(/*IN*/ CliGlobals * cliGlobals,
}
}
}
- //LCOV_EXCL_STOP
break;
case SQLTRANS_INHERIT:
@@ -7285,7 +7149,6 @@ Lng32 SQLCLI_Xact(/*IN*/ CliGlobals * cliGlobals,
}
break;
- //LCOV_EXCL_START
case SQLTRANS_BEGIN_WITH_DP2_XNS:
{
if (! (currContext.getTransaction()->xnInProgress()))
@@ -7294,7 +7157,6 @@ Lng32 SQLCLI_Xact(/*IN*/ CliGlobals * cliGlobals,
currContext.getTransaction()->setDp2Xns(TRUE);
}
}
- //LCOV_EXCL_STOP
break;
default:
@@ -7630,7 +7492,6 @@ Lng32 SQLCLI_SetDescItem(
return SUCCESS;
}
-//LCOV_EXCLSTART
// -----------------------------------------------------------------------
// NOTE: this procedure will go away, please use GetDiagnosticsStmtInfo()
// instead!!!
@@ -7662,7 +7523,6 @@ Lng32 SQLCLI_GetRowsAffected(/*IN*/ CliGlobals * cliGlobals,
return SUCCESS;
}
-//LCOV_EXCL_STOP
Lng32 SQLCLI_MergeDiagnostics(/*IN*/ CliGlobals * cliGlobals,
/*INOUT*/ ComDiagsArea & newDiags)
{
@@ -7865,7 +7725,6 @@ Lng32 SQLCLI_GetCollectStatsType_Internal(/*IN*/ CliGlobals * cliGlobals,
return retcode;
#pragma warn(769) // warning elimination
}
-//LCOV_EXCL_STOP
// For internal use only -- do not document!
Lng32 SQLCLI_GetTotalTcbSpace(/*IN*/ CliGlobals * cliGlobals,
@@ -8048,7 +7907,6 @@ Lng32 SQLCLI_LocaleToUTF8 (
return error;
}
-//LCOV_EXCL_START
Lng32 SQLCLI_LocaleToUTF16 (
CliGlobals *cliGlobals,
Int32 conv_charset,
@@ -10883,7 +10741,6 @@ Lng32 SQLCLI_SeqGenCliInterface
return 0;
}
-//LCOV_EXCL_STOP
Int32 SQLCLI_GetRoutine
(
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/cli/Cli.h
----------------------------------------------------------------------
diff --git a/core/sql/cli/Cli.h b/core/sql/cli/Cli.h
index 4784af1..35cee3c 100644
--- a/core/sql/cli/Cli.h
+++ b/core/sql/cli/Cli.h
@@ -115,13 +115,11 @@ extern "C"
/*IN*/ SQLSTMT_ID *callStmtId,
/*IN*/ Lng32 resultSetIndex,
/*INOUT*/ SQLSTMT_ID *resultSetStmtId);
-//LCOV_EXCL_START
Lng32 SQLCLI_AssocFileNumber(/*IN*/ CliGlobals * cliGlobals,
/*IN*/ SQLSTMT_ID * statement_id,
/*IN*/ short file_number);
-//LCOV_EXCL_STOP
Int32 SQLCLI_GetDiskMaxSize (
/*IN*/ CliGlobals *cliGlobals,
/*IN*/ char *volname,
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/cli/CliExpExchange.cpp
----------------------------------------------------------------------
diff --git a/core/sql/cli/CliExpExchange.cpp b/core/sql/cli/CliExpExchange.cpp
index 1713409..15e3e7b 100644
--- a/core/sql/cli/CliExpExchange.cpp
+++ b/core/sql/cli/CliExpExchange.cpp
@@ -944,7 +944,6 @@ next_clause:
desc->setBulkMoveSetup(TRUE);
- //LCOV_EXCL_START
if (getenv("BULKMOVE") && getenv("BULKMOVEINFO") &&
desc->bulkMoveInfo())
{
@@ -971,7 +970,6 @@ next_clause:
cout << endl;
}
}
- //LCOV_EXCL_STOP
}
#pragma warning (default : 4273) //warning elimination
@@ -2518,7 +2516,6 @@ then place the following four lines of code after the call to setRowNumberInCli.
return ex_expr::EXPR_ERROR;
*/
// error path not taken . This is only if something bad happens in NVT
-//LCOV_EXCL_START
#pragma warning (disable : 4273) //warning elimination
ex_expr::exp_return_type
InputOutputExpr::inputSingleRowValue(atp_struct *atp,
@@ -3091,7 +3088,6 @@ error_return:
return ex_expr::EXPR_ERROR;
}
-//LCOV_EXCL_STOP
ex_expr::exp_return_type
InputOutputExpr::inputRowwiseRowsetValues(atp_struct *atp,
void * inputDesc_,
@@ -3340,7 +3336,6 @@ InputOutputExpr::inputRowwiseRowsetValues(atp_struct *atp,
else
{
// error path not taken . This is only if something bad happens in NVT
- //LCOV_EXCL_START
if (isDbtr)
{
// rowwise rowsets from dbtr *must* use the optimized input
@@ -3402,7 +3397,6 @@ error_return:
(intParam3 != 0 ? &intParam3 : NULL));
if (diagsArea != atp->getDiagsArea())
atp->setDiagsArea(diagsArea);
- //LCOV_EXCL_STOP
return ex_expr::EXPR_ERROR;
}
@@ -3482,12 +3476,10 @@ InputOutputExpr::inputValues(atp_struct *atp,
if (inputDesc && inputDesc->rowwiseRowset())
{
- //LCOV_EXCL_START
ExRaiseSqlError(heap, &diagsArea, CLI_ROWWISE_ROWSETS_NOT_SUPPORTED);
if (diagsArea != atp->getDiagsArea())
atp->setDiagsArea(diagsArea);
return ex_expr::EXPR_ERROR;
- //LCOV_EXCL_STOP
}
// If bulk move has not been disabled before, then check to see if bulk
@@ -3970,7 +3962,6 @@ InputOutputExpr::inputValues(atp_struct *atp,
if ( CharInfo::checkCodePoint((NAWchar*)source, realSourceLen,
CharInfo::UNICODE ) == FALSE )
{
- //LCOV_EXCL_START
// Error code 3400 falls in CLI error code area, but it is
// a perfect fit to use here (as an exeutor error).
ExRaiseSqlError(heap, &diagsArea, (ExeErrorCode)3400);
@@ -3985,7 +3976,6 @@ InputOutputExpr::inputValues(atp_struct *atp,
continue;
else
return ex_expr::EXPR_ERROR;
- //LCOV_EXCL_STOP
}
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/cli/CliExtern.cpp
----------------------------------------------------------------------
diff --git a/core/sql/cli/CliExtern.cpp b/core/sql/cli/CliExtern.cpp
index d04602b..f943c26 100644
--- a/core/sql/cli/CliExtern.cpp
+++ b/core/sql/cli/CliExtern.cpp
@@ -979,7 +979,6 @@ Lng32 SQL_EXEC_ALLOCDESC (
return SQL_EXEC_AllocDesc(desc_id, input_descriptor);
};
-//LCOV_EXCL_STOP
Lng32 SQL_EXEC_AllocDescBasic(/*INOUT*/ SQLDESC_ID * desc_id,
@@ -1058,7 +1057,6 @@ Lng32 SQL_EXEC_AllocStmt(/*INOUT*/ SQLSTMT_ID * new_statement_id,
}
-//LCOV_EXCL_START
Lng32 SQL_EXEC_ALLOCSTMT (
/*INOUT*/ SQLSTMT_ID * new_statement_id,
/*IN OPTIONAL*/ SQLSTMT_ID * cloned_statement)
@@ -1069,7 +1067,6 @@ Lng32 SQL_EXEC_ALLOCSTMT (
return SQL_EXEC_AllocStmt(new_statement_id, cloned_statement);
};
-//LCOV_EXCL_STOP
Lng32 SQL_EXEC_AllocStmtForRS(/*IN*/ SQLSTMT_ID *callStmtId,
/*IN*/ Lng32 resultSetIndex,
@@ -1109,7 +1106,6 @@ Lng32 SQL_EXEC_AllocStmtForRS(/*IN*/ SQLSTMT_ID *callStmtId,
tmpSemaphore->release();
return retcode;
}
-//LCOV_EXCL_START
Lng32 SQL_EXEC_ALLOCSTMTFORRS (
/*IN*/ SQLSTMT_ID *callStmtId,
/*IN*/ Lng32 resultSetIndex,
@@ -1118,10 +1114,8 @@ Lng32 SQL_EXEC_ALLOCSTMTFORRS (
return SQL_EXEC_AllocStmtForRS(callStmtId, resultSetIndex, resultSetStmtId);
}
-//LCOV_EXCL_STOP
//nowait CLI
-//LCOV_EXCL_START
Lng32 SQL_EXEC_AssocFileNumber(/*IN*/ SQLSTMT_ID * statement_id,
/*IN*/ short file_number)
{
@@ -1163,7 +1157,6 @@ Lng32 SQL_EXEC_ASSOCFILENUMBER (/*IN*/ SQLSTMT_ID * statement_id,
{
return SQL_EXEC_AssocFileNumber(statement_id, file_number);
};
-//LCOV_EXCL_STOP
Lng32 SQL_EXEC_ClearDiagnostics(/*IN*/ SQLSTMT_ID *statement_id)
{
@@ -1200,7 +1193,6 @@ Lng32 SQL_EXEC_ClearDiagnostics(/*IN*/ SQLSTMT_ID *statement_id)
retcode = RecordError(statement_id, retcode);
return retcode;
}
-//LCOV_EXCL_START
Lng32 SQL_EXEC_CLEARDIAGNOSTICS (/*IN*/ SQLSTMT_ID *statement_id){
return SQL_EXEC_ClearDiagnostics(statement_id);
};
@@ -1213,7 +1205,6 @@ Lng32 SQL_EXEC_CLI_VERSION()
return CLI_VERSION;
}
-//LCOV_EXCL_STOP
Lng32 SQL_EXEC_CloseStmt(/*IN*/ SQLSTMT_ID * statement_id)
{
@@ -1251,7 +1242,6 @@ Lng32 SQL_EXEC_CloseStmt(/*IN*/ SQLSTMT_ID * statement_id)
return retcode;
}
-//LCOV_EXCL_START
Lng32 SQL_EXEC_CLOSESTMT (
/*IN*/ SQLSTMT_ID * statement_id){
return SQL_EXEC_CloseStmt(statement_id);
@@ -1297,7 +1287,6 @@ Lng32 SQL_EXEC_CREATECONTEXT(/*OUT*/ SQLCTX_HANDLE * context_handle,
{
return SQL_EXEC_CreateContext(context_handle, sqlAuthId, forFutureUse);
}
-//LCOV_EXCL_STOP
Lng32 SQL_EXEC_CurrentContext(/*OUT*/ SQLCTX_HANDLE * contextHandle)
{
@@ -1324,7 +1313,6 @@ Lng32 SQL_EXEC_CurrentContext(/*OUT*/ SQLCTX_HANDLE * contextHandle)
retcode = RecordError(NULL, retcode);
return retcode;
}
-//LCOV_EXCL_START
Lng32 SQL_EXEC_CURRENTCONTEXT(/*OUT*/ SQLCTX_HANDLE * contextHandle){
return SQL_EXEC_CurrentContext(contextHandle);
@@ -1465,7 +1453,6 @@ Lng32 SQL_EXEC_GetUdrErrorFlags_Internal(/*OUT*/ Lng32 *udrErrorFlags)
return retcode;
}
-//LCOV_EXCL_STOP
Lng32 SQL_EXEC_SetUdrAttributes_Internal(/*IN*/ Lng32 sqlAccessMode,
/*IN*/ Lng32 forFutureUse)
{
@@ -1609,12 +1596,10 @@ Lng32 SQL_EXEC_DeallocDesc(/*IN*/ SQLDESC_ID * desc_id)
tmpSemaphore->release();
return retcode;
}
-//LCOV_EXCL_START
Lng32 SQL_EXEC_DEALLOCDESC (
/*IN*/ SQLDESC_ID * desc_id ){
return SQL_EXEC_DeallocDesc(desc_id);
};
-//LCOV_EXCL_STOP
Lng32 SQL_EXEC_DeallocStmt(/*IN*/ SQLSTMT_ID * statement_id)
{
Lng32 retcode;
@@ -1660,12 +1645,10 @@ Lng32 SQL_EXEC_DeallocStmt(/*IN*/ SQLSTMT_ID * statement_id)
}
return retcode;
}
-//LCOV_EXCL_START
Lng32 SQL_EXEC_DEALLOCSTMT (
/*IN*/ SQLSTMT_ID * statement_id){
return SQL_EXEC_DeallocStmt(statement_id);
};
-//LCOV_EXCL_STOP
Lng32 SQL_EXEC_DefineDesc(/*IN*/ SQLSTMT_ID * statement_id,
/* (SQLWHAT_DESC) *IN*/ Lng32 what_descriptor,
@@ -1704,14 +1687,12 @@ Lng32 SQL_EXEC_DefineDesc(/*IN*/ SQLSTMT_ID * statement_id,
retcode = RecordError(statement_id, retcode);
return retcode;
}
-//LCOV_EXCL_START
Lng32 SQL_EXEC_DEFINEDESC (
/*IN*/ SQLSTMT_ID * statement_id,
/*IN* (SQLWHAT_DESC) */ Lng32 what_descriptor,
/*IN*/ SQLDESC_ID * sql_descriptor){
return SQL_EXEC_DefineDesc(statement_id, what_descriptor, sql_descriptor);
};
-//LCOV_EXCL_STOP
Lng32 SQL_EXEC_DescribeStmt(/*IN*/ SQLSTMT_ID * statement_id,
/*IN OPTIONAL*/ SQLDESC_ID * input_descriptor,
/*IN OPTIONAL*/ SQLDESC_ID * output_descriptor)
@@ -1751,7 +1732,6 @@ Lng32 SQL_EXEC_DescribeStmt(/*IN*/ SQLSTMT_ID * statement_id,
retcode = RecordError(statement_id, retcode);
return retcode;
}
-//LCOV_EXCL_START
Lng32 SQL_EXEC_DESCRIBESTMT (
/*IN*/ SQLSTMT_ID * statement_id,
/*IN OPTIONAL*/ SQLDESC_ID * input_descriptor,
@@ -1838,7 +1818,6 @@ Lng32 SQL_EXEC_DROPCONTEXT (
return SQL_EXEC_DropContext(context_handle);
};
-//LCOV_EXCL_STOP
Lng32 SQL_EXEC_Exec(/*IN*/ SQLSTMT_ID * statement_id,
/*IN OPTIONAL*/ SQLDESC_ID * input_descriptor,
@@ -1896,7 +1875,6 @@ Lng32 SQL_EXEC_Exec(/*IN*/ SQLSTMT_ID * statement_id,
return retcode;
}
-//LCOV_EXCL_START
Lng32 SQL_EXEC_EXEC (
/*IN*/ SQLSTMT_ID * statement_id,
/*IN OPTIONAL*/ SQLDESC_ID * input_descriptor,
@@ -1940,7 +1918,6 @@ Lng32 SQL_EXEC_EXEC (
return retcode;
};
-//LCOV_EXCL_STOP
Lng32 SQL_EXEC_ExecClose(/*IN*/ SQLSTMT_ID * statement_id,
/*IN OPTIONAL*/ SQLDESC_ID * input_descriptor,
/*IN*/ Lng32 num_ptr_pairs,
@@ -1990,7 +1967,6 @@ Lng32 SQL_EXEC_ExecClose(/*IN*/ SQLSTMT_ID * statement_id,
}
-//LCOV_EXCL_START
Lng32 SQL_EXEC_EXECCLOSE (
/*IN*/ SQLSTMT_ID * statement_id,
/*IN OPTIONAL*/ SQLDESC_ID * input_descriptor,
@@ -2034,7 +2010,6 @@ Lng32 SQL_EXEC_EXECCLOSE (
retcode = RecordError(statement_id, retcode);
return retcode;
};
-//LCOV_EXCL_STOP
Lng32 SQL_EXEC_ExecDirect(/*IN*/ SQLSTMT_ID * statement_id,
/*IN*/ SQLDESC_ID * sql_source,
@@ -2136,7 +2111,6 @@ Lng32 SQL_EXEC_ExecDirect2(/*IN*/ SQLSTMT_ID * statement_id,
retcode = RecordError(statement_id, retcode);
return retcode;
}
-//LCOV_EXCL_START
Lng32 SQL_EXEC_EXECDIRECT (
/*IN*/ SQLSTMT_ID * statement_id,
/*IN*/ SQLDESC_ID * sql_source,
@@ -2181,7 +2155,6 @@ Lng32 SQL_EXEC_EXECDIRECT (
retcode = RecordError(statement_id, retcode);
return retcode;
};
-//LCOV_EXCL_STOP
Lng32 SQL_EXEC_ExecDirectDealloc(/*IN*/ SQLSTMT_ID * statement_id,
/*IN*/ SQLDESC_ID * sql_source,
/*IN OPTIONAL*/ SQLDESC_ID * input_descriptor,
@@ -2231,7 +2204,6 @@ Lng32 SQL_EXEC_ExecDirectDealloc(/*IN*/ SQLSTMT_ID * statement_id,
retcode);
return retcode;
}
-//LCOV_EXCL_START
Lng32 SQL_EXEC_EXECDIRECTDEALLOC(/*IN*/ SQLSTMT_ID * statement_id,
/*IN*/ SQLDESC_ID * sql_source,
/*IN OPTIONAL*/ SQLDESC_ID * input_descriptor,
@@ -2277,7 +2249,6 @@ Lng32 SQL_EXEC_EXECDIRECTDEALLOC(/*IN*/ SQLSTMT_ID * statement_id,
retcode);
return retcode;
}
-//LCOV_EXCL_STOP
Lng32 SQL_EXEC_ExecFetch(/*IN*/ SQLSTMT_ID * statement_id,
/*IN OPTIONAL*/ SQLDESC_ID * input_descriptor,
@@ -2334,7 +2305,6 @@ Lng32 SQL_EXEC_ExecFetch(/*IN*/ SQLSTMT_ID * statement_id,
retcode = RecordError(statement_id, retcode);
return retcode;
}
-//LCOV_EXCL_START
Lng32 SQL_EXEC_EXECFETCH(/*IN*/ SQLSTMT_ID * statement_id,
/*IN OPTIONAL*/ SQLDESC_ID * input_descriptor,
/*IN*/ Lng32 num_ptr_pairs,
@@ -2377,7 +2347,6 @@ Lng32 SQL_EXEC_EXECFETCH(/*IN*/ SQLSTMT_ID * statement_id,
retcode = RecordError(statement_id, retcode);
return retcode;
}
-//LCOV_EXCL_STOP
Lng32 SQL_EXEC_ClearExecFetchClose(/*IN*/ SQLSTMT_ID * statement_id,
/*IN OPTIONAL*/ SQLDESC_ID * input_descriptor,
/*IN OPTIONAL*/ SQLDESC_ID * output_descriptor,
@@ -2440,7 +2409,6 @@ Lng32 SQL_EXEC_ClearExecFetchClose(/*IN*/ SQLSTMT_ID * statement_id,
retcode = RecordError(statement_id, retcode);
return retcode;
}
-//LCOV_EXCL_START
Lng32 SQL_EXEC_CLEAREXECFETCHCLOSE(/*IN*/ SQLSTMT_ID * statement_id,
/*IN OPTIONAL*/ SQLDESC_ID * input_descriptor,
/*IN OPTIONAL*/ SQLDESC_ID * output_descriptor,
@@ -2491,7 +2459,6 @@ Lng32 SQL_EXEC_CLEAREXECFETCHCLOSE(/*IN*/ SQLSTMT_ID * statement_id,
retcode = RecordError(statement_id, retcode);
return retcode;
}
-//LCOV_EXCL_STOP
Lng32 SQL_EXEC_Fetch(/*IN*/ SQLSTMT_ID * statement_id,
/*IN OPTIONAL*/ SQLDESC_ID * output_descriptor,
@@ -2547,7 +2514,6 @@ Lng32 SQL_EXEC_Fetch(/*IN*/ SQLSTMT_ID * statement_id,
retcode = RecordError(statement_id, retcode);
return retcode;
}
-//LCOV_EXCL_START
Lng32 SQL_EXEC_FETCH(/*IN*/ SQLSTMT_ID * statement_id,
/*IN OPTIONAL*/ SQLDESC_ID * output_descriptor,
/*IN*/ Lng32 num_ptr_pairs,
@@ -2592,7 +2558,6 @@ Lng32 SQL_EXEC_FETCH(/*IN*/ SQLSTMT_ID * statement_id,
return retcode;
}
-//LCOV_EXCL_STOP
Lng32 SQL_EXEC_FetchClose(/*IN*/ SQLSTMT_ID * statement_id,
/*IN OPTIONAL*/ SQLDESC_ID * output_descriptor,
@@ -2640,7 +2605,6 @@ Lng32 SQL_EXEC_FetchClose(/*IN*/ SQLSTMT_ID * statement_id,
retcode = RecordError(statement_id, retcode);
return retcode;
}
-//LCOV_EXCL_START
Lng32 SQL_EXEC_FETCHCLOSE(/*IN*/ SQLSTMT_ID * statement_id,
/*IN OPTIONAL*/ SQLDESC_ID * output_descriptor,
/*IN*/ Lng32 num_ptr_pairs,
@@ -2683,7 +2647,6 @@ Lng32 SQL_EXEC_FETCHCLOSE(/*IN*/ SQLSTMT_ID * statement_id,
retcode = RecordError(statement_id, retcode);
return retcode;
}
-//LCOV_EXCL_STOP
Lng32 SQL_EXEC_FetchMultiple(/*IN*/ SQLSTMT_ID * statement_id,
/*IN OPTIONAL*/ SQLDESC_ID * output_descriptor,
@@ -2737,7 +2700,6 @@ Lng32 SQL_EXEC_FetchMultiple(/*IN*/ SQLSTMT_ID * statement_id,
retcode = RecordError(statement_id, retcode);
return retcode;
}
-//LCOV_EXCL_START
Lng32 SQL_EXEC_FETCHMULTIPLE(/*IN*/ SQLSTMT_ID * statement_id,
/*IN OPTIONAL*/ SQLDESC_ID * output_descriptor,
/*IN*/ Lng32 rowset_size,
@@ -2786,7 +2748,6 @@ Lng32 SQL_EXEC_FETCHMULTIPLE(/*IN*/ SQLSTMT_ID * statement_id,
retcode = RecordError(statement_id, retcode);
return retcode;
}
-//LCOV_EXCL_STOP
// Called by the cancel thread.
// Don't use getCliSemaphore(currContext)->to acquire a critical section.
@@ -2865,13 +2826,11 @@ Lng32 SQL_EXEC_GetDescEntryCount(/*IN*/ SQLDESC_ID * sql_descriptor,
retcode = RecordError(NULL, retcode);
return retcode;
}
-//LCOV_EXCL_START
Lng32 SQL_EXEC_GETDESCENTRYCOUNT(
/*IN*/ SQLDESC_ID * sql_descriptor,
/*IN*/ SQLDESC_ID * output_descriptor){
return SQL_EXEC_GetDescEntryCount(sql_descriptor, output_descriptor);
};
-//LCOV_EXCL_STOP
Lng32 SQL_EXEC_GetDescEntryCountBasic(/*IN*/ SQLDESC_ID * sql_descriptor,
/*OUT*/ Lng32 * num_entries)
@@ -2957,7 +2916,6 @@ Lng32 SQL_EXEC_GetDescItem(/*IN*/ SQLDESC_ID * sql_descriptor,
retcode = RecordError(NULL, retcode);
return retcode;
}
-//LCOV_EXCL_START
Lng32 SQL_EXEC_GETDESCITEM(
/*IN*/ SQLDESC_ID * sql_descriptor,
/*IN*/ Lng32 entry,
@@ -2978,7 +2936,6 @@ Lng32 SQL_EXEC_GETDESCITEM(
len_of_item,
start_from_offset);
};
-//LCOV_EXCL_STOP
Lng32 SQL_EXEC_GetDescItems(/*IN*/ SQLDESC_ID * sql_descriptor,
/*IN*/ SQLDESC_ITEM desc_items[],
/*IN*/ SQLDESC_ID * value_num_descriptor,
@@ -3020,7 +2977,6 @@ Lng32 SQL_EXEC_GetDescItems(/*IN*/ SQLDESC_ID * sql_descriptor,
retcode = RecordError(NULL, retcode);
return retcode;
}
-//LCOV_EXCL_START
Lng32 SQL_EXEC_GETDESCITEMS(
/*IN*/ SQLDESC_ID * sql_descriptor,
/*IN*/ SQLDESC_ITEM desc_items[],
@@ -3031,7 +2987,6 @@ Lng32 SQL_EXEC_GETDESCITEMS(
value_num_descriptor,
output_descriptor);
};
-//LCOV_EXCL_STOP
Lng32 SQL_EXEC_GetDescItems2(/*IN*/ SQLDESC_ID * sql_descriptor,
/*IN*/ Lng32 no_of_desc_items,
/*IN*/ SQLDESC_ITEM desc_items[])
@@ -3069,7 +3024,6 @@ Lng32 SQL_EXEC_GetDescItems2(/*IN*/ SQLDESC_ID * sql_descriptor,
retcode = RecordError(NULL, retcode);
return retcode;
}
-//LCOV_EXCL_START
Lng32 SQL_EXEC_GETDESCITEMS2(
/*IN*/ SQLDESC_ID * sql_descriptor,
/*IN*/ Lng32 no_of_desc_items,
@@ -3078,7 +3032,6 @@ Lng32 SQL_EXEC_GETDESCITEMS2(
no_of_desc_items,
desc_items);
};
-//LCOV_EXCL_STOP
Lng32 SQL_EXEC_GetDiagnosticsStmtInfo(/*IN*/ Lng32 * stmt_info_items,
/*IN*/ SQLDESC_ID * output_descriptor)
{
@@ -3160,7 +3113,6 @@ Lng32 SQL_EXEC_GetDiagnosticsStmtInfo2(
retcode = RecordError(statement_id, retcode);
return retcode;
}
-//LCOV_EXCL_START
Lng32 SQL_EXEC_GETDIAGNOSTICSSTMTINFO(
/*IN*/ Lng32 *stmt_info_items,
/*IN*/ SQLDESC_ID * output_descriptor){
@@ -3201,7 +3153,6 @@ static void copyResultString(char * dest, const char * src, Lng32 destLen,
else
*dest = '\0';
}
-//LCOV_EXCL_STOP
//
// GetAutoSizedCondInfo
@@ -3798,7 +3749,6 @@ Lng32 SQL_EXEC_GetDiagnosticsCondInfo3(
tmpSemaphore->release();
retcode = RecordError(NULL, retcode);
- //LCOV_EXCL_START
if (retcode < 0)
{
delete [] message_buffer_ptr;
@@ -3806,7 +3756,6 @@ Lng32 SQL_EXEC_GetDiagnosticsCondInfo3(
diagsArea->deAllocate();
return retcode;
}
- //LCOV_EXCL_STOP
// The actual diags area resides in the context heap and is inaccessible
// here in non-priv code. We must unpack the copy which has been
@@ -3821,7 +3770,6 @@ Lng32 SQL_EXEC_GetDiagnosticsCondInfo3(
for(Int32 i=0; i<no_of_condition_items && retcode == 0; i++)
{
diagItemValues = diag_cond_info_item_values[i];
- //LCOV_EXCL_START
if (diagItemValues.num_val_or_len == NULL)
{
delete [] message_buffer_ptr;
@@ -3829,7 +3777,6 @@ Lng32 SQL_EXEC_GetDiagnosticsCondInfo3(
diagsArea->deAllocate();
return -CLI_INVALID_ATTR_VALUE;
}
- //LCOV_EXCL_STOP
string_value = diagItemValues.string_val;
max_string_len = string_value ? *(diagItemValues.num_val_or_len) : 0;
conditionNum = diagItemValues.item_id_and_cond_number.cond_number_desc_entry;
@@ -3851,14 +3798,12 @@ Lng32 SQL_EXEC_GetDiagnosticsCondInfo3(
{
if(condition.getCustomSQLState() == NULL)
{
- //LCOV_EXCL_START
if (max_string_len < 6) {
delete [] message_buffer_ptr;
diagsArea->clear();
diagsArea->deAllocate();
return -CLI_INVALID_ATTR_VALUE;
}
- //LCOV_EXCL_STOP
ComSQLSTATE(condition.getSQLCODE(), string_value);
if (len_of_item)
*len_of_item = 6;
@@ -3947,7 +3892,6 @@ Lng32 SQL_EXEC_GetDiagnosticsCondInfo3(
break;
} // switch
}
- //LCOV_EXCL_START
if (msgInLocaleLen == 0 && wMsgLen > 0 && max_string_len > 80)
{ // UTF8
char * pMsg = string_value; // SJIS
@@ -3960,7 +3904,6 @@ Lng32 SQL_EXEC_GetDiagnosticsCondInfo3(
str_cat(pMsg, SQLCHARSETSTRING_UTF8, pMsg);
msgInLocaleLen = str_len(pMsg);
} // if (msgInLocaleLen == 0 && wMsgLen > 0 && max_string_len > 80)
- //LCOV_EXCL_STOP
}
if(msgInLocaleLen == 0)
@@ -3991,7 +3934,6 @@ Lng32 SQL_EXEC_GetDiagnosticsCondInfo3(
return retcode;
}
-//LCOV_EXCL_START
Lng32 SQL_EXEC_GETDIAGNOSTICSCONDINFO3(
/*IN*/ Lng32 no_of_condition_items,
/*IN*/ SQLDIAG_COND_INFO_ITEM_VALUE
@@ -4570,7 +4512,6 @@ Lng32 SQL_EXEC_GetStmtAttr(/*IN*/ SQLSTMT_ID * statement_id,
tmpSemaphore->release();
return retcode;
}
-//LCOV_EXCL_START
Lng32 SQL_EXEC_GETSTMTATTR(/*IN*/ SQLSTMT_ID * statement_id,
/*IN* (SQLATTR_TYPE) */ Lng32 attrName,
/*OUT OPTIONAL*/ Lng32 * numeric_value,
@@ -4582,7 +4523,6 @@ Lng32 SQL_EXEC_GETSTMTATTR(/*IN*/ SQLSTMT_ID * statement_id,
numeric_value, string_value,
max_string_len, len_of_item);
}
-//LCOV_EXCL_STOP
Lng32 SQL_EXEC_GetStmtAttrs(/*IN*/ SQLSTMT_ID * statement_id,
/*IN*/ Lng32 number_of_attrs,
/*INOUT*/ SQLSTMT_ATTR attrs[],
@@ -4622,7 +4562,6 @@ Lng32 SQL_EXEC_GetStmtAttrs(/*IN*/ SQLSTMT_ID * statement_id,
tmpSemaphore->release();
return retcode;
}
-//LCOV_EXCL_START
Lng32 SQL_EXEC_GETSTMTATTRS(/*IN*/ SQLSTMT_ID * statement_id,
/*IN*/ Lng32 number_of_attrs,
/*INOUT*/ SQLSTMT_ATTR attrs[],
@@ -4631,7 +4570,6 @@ Lng32 SQL_EXEC_GETSTMTATTRS(/*IN*/ SQLSTMT_ID * statement_id,
return SQL_EXEC_GetStmtAttrs(statement_id, number_of_attrs,
attrs, num_returned);
}
-//LCOV_EXCL_STOP
#ifdef __cplusplus
extern "C"
{
@@ -4641,7 +4579,6 @@ Lng32 SQL_EXEC_GetStatistics(/*IN OPTIONAL*/ SQLSTMT_ID * statement_id,
{
return -CLI_INTERNAL_ERROR;
}
-//LCOV_EXCL_START
Lng32 SQL_EXEC_GETSTATISTICS(
/*IN OPTIONAL*/ SQLSTMT_ID * statement_id)
{
@@ -4755,7 +4692,6 @@ Lng32 SQL_EXEC_Prepare2(/*IN*/ SQLSTMT_ID * statement_id,
return retcode;
}
-//LCOV_EXCL_START
Lng32 SQL_EXEC_PREPARE(
/*IN*/ SQLSTMT_ID * statement_id,
/*IN*/ SQLDESC_ID * sql_source){
@@ -4938,7 +4874,6 @@ Lng32 SQL_EXEC_RESSTMTNAME(
return SQL_EXEC_ResStmtName(statement_id);
};
-//LCOV_EXCL_STOP
Lng32 SQL_EXEC_SetCursorName(/*IN*/ SQLSTMT_ID * statement_id,
/*IN*/ SQLSTMT_ID * cursor_name)
{
@@ -4976,14 +4911,12 @@ Lng32 SQL_EXEC_SetCursorName(/*IN*/ SQLSTMT_ID * statement_id,
retcode = RecordError(statement_id, retcode);
return retcode;
}
-//LCOV_EXCL_START
Lng32 SQL_EXEC_SETCURSORNAME(
/*IN*/ SQLSTMT_ID * statement_id,
/*IN*/ SQLSTMT_ID * cursor_name){
return SQL_EXEC_SetCursorName(statement_id, cursor_name);
};
-//LCOV_EXCL_STOP
Lng32 SQL_EXEC_SetStmtAttr(/*IN*/ SQLSTMT_ID * statement_id,
/*IN* (SQLATTR_TYPE) */ Lng32 attrName,
/*IN OPTIONAL*/ Lng32 numeric_value,
@@ -5027,7 +4960,6 @@ Lng32 SQL_EXEC_SetStmtAttr(/*IN*/ SQLSTMT_ID * statement_id,
RecordError( statement_id, retcode );
return retcode;
}
-//LCOV_EXCL_START
Lng32 SQL_EXEC_SETSTMTATTR(/*IN*/ SQLSTMT_ID * statement_id,
/*IN* (SQLATTR_TYPE) */ Lng32 attrName,
/*IN OPTIONAL*/ Lng32 numeric_value,
@@ -5118,7 +5050,6 @@ Lng32 SQL_EXEC_SetDescEntryCountBasic(/*IN*/ SQLDESC_ID * sql_descriptor,
RecordError(NULL, retcode);
return retcode;
}
-//LCOV_EXCL_STOP
Lng32 SQL_EXEC_SetDescItem(/*IN*/ SQLDESC_ID * sql_descriptor,
/*IN*/ Lng32 entry,
/* (SQLDESC_ITEM_ID) *IN*/ Lng32 what_to_set,
@@ -5161,7 +5092,6 @@ Lng32 SQL_EXEC_SetDescItem(/*IN*/ SQLDESC_ID * sql_descriptor,
tmpSemaphore->release();
return retcode;
}
-//LCOV_EXCL_START
Lng32 SQL_EXEC_SETDESCITEM(
/*IN*/ SQLDESC_ID * sql_descriptor,
/*IN*/ Lng32 entry,
@@ -5171,7 +5101,6 @@ Lng32 SQL_EXEC_SETDESCITEM(
return SQL_EXEC_SetDescItem(sql_descriptor, entry, what_to_set, numeric_value, string_value);
};
-//LCOV_EXCL_STOP
Lng32 SQL_EXEC_SetDescItems(/*IN*/ SQLDESC_ID * sql_descriptor,
/*IN*/ SQLDESC_ITEM desc_items[],
/*IN*/ SQLDESC_ID * value_num_descriptor,
@@ -5213,7 +5142,6 @@ Lng32 SQL_EXEC_SetDescItems(/*IN*/ SQLDESC_ID * sql_descriptor,
RecordError(NULL, retcode);
return retcode;
}
-//LCOV_EXCL_START
Lng32 SQL_EXEC_SETDESCITEMS(
/*IN*/ SQLDESC_ID * sql_descriptor,
/*IN*/ SQLDESC_ITEM desc_items[],
@@ -5224,7 +5152,6 @@ Lng32 SQL_EXEC_SETDESCITEMS(
return SQL_EXEC_SetDescItems(sql_descriptor, desc_items, value_num_descriptor, input_descriptor);
};
-//LCOV_EXCL_STOP
Lng32 SQL_EXEC_SetDescItems2(
/*IN*/ SQLDESC_ID * sql_descriptor,
/*IN*/ Lng32 no_of_desc_items,
@@ -5263,7 +5190,6 @@ Lng32 SQL_EXEC_SetDescItems2(
RecordError(NULL, retcode);
return retcode;
}
-//LCOV_EXCL_START
Lng32 SQL_EXEC_SETDESCITEMS2(
/*IN*/ SQLDESC_ID * sql_descriptor,
/*IN*/ Lng32 no_of_desc_items,
@@ -5272,7 +5198,6 @@ Lng32 SQL_EXEC_SETDESCITEMS2(
{
return SQL_EXEC_SetDescItems2(sql_descriptor, no_of_desc_items, desc_items);
};
-//LCOV_EXCL_STOP
Lng32 SQL_EXEC_SetDescPointers(/*IN*/ SQLDESC_ID * sql_descriptor,
/*IN*/ Lng32 starting_entry,
/*IN*/ Lng32 num_ptr_pairs,
@@ -5319,7 +5244,6 @@ Lng32 SQL_EXEC_SetDescPointers(/*IN*/ SQLDESC_ID * sql_descriptor,
RecordError(NULL, retcode);
return retcode;
}
-//LCOV_EXCL_START
Lng32 SQL_EXEC_SETDESCPOINTERS(/*IN*/ SQLDESC_ID * sql_descriptor,
/*IN*/ Lng32 starting_entry,
/*IN*/ Lng32 num_ptr_pairs,
@@ -5362,7 +5286,6 @@ Lng32 SQL_EXEC_SETDESCPOINTERS(/*IN*/ SQLDESC_ID * sql_descriptor,
RecordError(NULL, retcode);
return retcode;
}
-//LCOV_EXCL_STOP
Lng32 SQL_EXEC_SetRowsetDescPointers(SQLDESC_ID * sql_descriptor,
Lng32 rowset_size,
Lng32 *rowset_status_ptr,
@@ -5488,13 +5411,11 @@ Lng32 SQL_EXEC_SwitchContext(/*IN*/ SQLCTX_HANDLE ctxt_handle,
RecordError(NULL, retcode);
return retcode;
}
-//LCOV_EXCL_START
Lng32 SQL_EXEC_SWITCHCONTEXT(
/*IN*/ SQLCTX_HANDLE context_handle,
/*OUT OPTIONAL*/ SQLCTX_HANDLE * prev_context_handle){
return SQL_EXEC_SwitchContext(context_handle, prev_context_handle);
};
-//LCOV_EXCL_STOP
Lng32 SQL_EXEC_Xact(/*IN* (SQLTRANS_COMMAND) */ Lng32 command,
/*OUT OPTIONAL*/ SQLDESC_ID * transid_descriptor)
{
@@ -5531,14 +5452,12 @@ Lng32 SQL_EXEC_Xact(/*IN* (SQLTRANS_COMMAND) */ Lng32 command,
tmpSemaphore->release();
return retcode;
}
-//LCOV_EXCL_START
Lng32 SQL_EXEC_XACT(
/*IN* (SQLTRANS_COMMAND) */ Lng32 command,
/*OUT OPTIONAL*/ SQLDESC_ID * transid_descriptor){
return SQL_EXEC_Xact(command, transid_descriptor);
};
-//LCOV_EXCL_STOP
Lng32 SQL_EXEC_SetAuthID(
const char * externalUsername,
@@ -5964,7 +5883,6 @@ Lng32 SQL_EXEC_GetCollectStatsType_Internal (
statement_id);
return retcode;
}
-//LCOV_EXCL_STOP
Lng32 SQL_EXEC_BreakEnabled_Internal (
/*IN*/ UInt32 enabled)
{
@@ -5974,7 +5892,6 @@ Lng32 SQL_EXEC_BreakEnabled_Internal (
enabled);
return retcode;
}
-//LCOV_EXCL_START
Lng32 SQL_EXEC_SPBreakReceived_Internal (
/*OUT*/ UInt32 *breakRecvd)
{
@@ -5983,7 +5900,6 @@ Lng32 SQL_EXEC_SPBreakReceived_Internal (
*breakRecvd = 0;
return retcode;
}
-//LCOV_EXCL_STOP
// For internal use only -- do not document!
Lng32 SQL_EXEC_SetEnviron_Internal(Lng32 propagate)
@@ -6021,7 +5937,6 @@ Lng32 SQL_EXEC_SetEnviron_Internal(Lng32 propagate)
extern "C"
{
#endif
- //LCOV_EXCL_START
// For internal use only -- do not document!
Lng32 SQL_EXEC_SETENVIRON_INTERNAL(Lng32 propagate)
{
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/cli/CliImplLmExtFunc.cpp
----------------------------------------------------------------------
diff --git a/core/sql/cli/CliImplLmExtFunc.cpp b/core/sql/cli/CliImplLmExtFunc.cpp
index 0ad7d38..6263b37 100644
--- a/core/sql/cli/CliImplLmExtFunc.cpp
+++ b/core/sql/cli/CliImplLmExtFunc.cpp
@@ -45,12 +45,10 @@ void lmMakeTFDSCall(const char *msg, const char *file, UInt32 line)
}
-// LCOV_EXCL_START
void lmPrintSignalHandlers()
{
// printSignalHandlers();
}
-// LCOV_EXCL_STOP
NABoolean lmSetSignalHandlersToDefault()
{
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/cli/ExSqlComp.cpp
----------------------------------------------------------------------
diff --git a/core/sql/cli/ExSqlComp.cpp b/core/sql/cli/ExSqlComp.cpp
index dd4a576..9d57157 100644
--- a/core/sql/cli/ExSqlComp.cpp
+++ b/core/sql/cli/ExSqlComp.cpp
@@ -128,7 +128,6 @@ ExSqlComp::ReturnStatus ExSqlComp::createServer()
if (!(sc_=new(h_) IpcServerClass(env_, IPC_SQLCOMP_SERVER, allocMethod_,
compilerVersion_,nodeName_)))
{
- //ss_cc_change : Rare error condition
//
*diagArea_ << DgSqlCode(- CLI_OUT_OF_MEMORY)
<< DgString0("IpcServerClass");
@@ -151,7 +150,6 @@ ExSqlComp::ReturnStatus ExSqlComp::createServer()
getMxcmpPriorityDelta();
if ((priority > 200) ||
(priority < 1))
- //ss_cc_change - rare occurence
priority = IPC_PRIORITY_DONT_CARE;
@@ -171,7 +169,6 @@ ExSqlComp::ReturnStatus ExSqlComp::createServer()
//Server process allocations may have changed the define context
cliGlobals_->currContext()->checkAndSetCurrentDefineContext();
}
- //ss_cc_change : rare error condition
//
if (ret == ERROR)
{
@@ -212,7 +209,6 @@ ExSqlComp::ReturnStatus ExSqlComp::establishConnection()
if (badConnection_)
ret = ERROR;
}
- //ss_cc_change : rare error path
//
if (ret == ERROR)
error(arkcmpErrorConnection);
@@ -229,12 +225,12 @@ ExSqlComp::ReturnStatus ExSqlComp::startSqlcomp(void)
// all the connection and control processing are done in waited mode.
if ( (ret=createServer()) == ERROR )
- return ret; //LCOV_EXCL_LINE
+ return ret;
if ( (ret=establishConnection()) == ERROR )
- return ret; //LCOV_EXCL_LINE
+ return ret;
if ( (ret=resendControls()) == ERROR )
- return ret; //LCOV_EXCL_LINE
+ return ret;
// on NT, the environment is not shipped to mxcmp when the process
// is created as an NSK lite process.
@@ -262,7 +258,6 @@ ExSqlComp::ReturnStatus ExSqlComp::resendRequest()
/* long sqlCode = (ta->xnInProgress() && !ta->implicitXn()) ?
arkcmpErrorUserTxnAndArkcmpGone : 0;*/
Lng32 sqlCode=0;
- //ss_cc_change : debug error path
//
if (
#ifdef _DEBUG
@@ -357,7 +352,6 @@ ExSqlComp::ReturnStatus ExSqlComp::sendR(CmpMessageObj* c, NABoolean w)
short indexIntoCliCompilerArray = 0;
indexIntoCliCompilerArray = cliGlobals_->currContext()->getIndexToCompilerArray();
- //ss_cc_change : rare error condition
//
if (badConnection_)
{
@@ -372,7 +366,6 @@ ExSqlComp::ReturnStatus ExSqlComp::sendR(CmpMessageObj* c, NABoolean w)
if (ret == ERROR)
return ret;
}
- //ss_cc_change : can only happen through nowait CLI
//
if(this->isShared() && (cliGlobals_->currContext() != lastContext_))
@@ -449,7 +442,6 @@ ExSqlComp::OperationStatus ExSqlComp::status(Int64 reqId)
// --------------------------------------------------------------------------
// Parse the info fetched from Describe::bindNode(). Genesis 10-981211-5986.
-//ss_cc_change : This is unused dead code
//
static NABoolean pairLenTxt(Int32 &len, const char *&txt, const char *&cqd)
{
@@ -485,7 +477,6 @@ void ExSqlComp::appendControls(ExControlArea *dest, ExControlArea *src){
ctl->isNonResettable());
}
}
-//ss_cc_change : This was used only for versioning - obsolete on SQ
//
static ExSqlComp::ReturnStatus saveControls(ExControlArea *ca, const char *cqd)
{
@@ -601,7 +592,6 @@ ExSqlComp::ReturnStatus ExSqlComp::resendControls(NABoolean ctxSw) // Genesis
ContextCli *ctxt = cliGlobals_->currContext();
short indexIntoCliCompilerArray = ctxt->getIndexToCompilerArray();
- //ss_cc_change: rare error condition
//
if (ctxt->arkcmpInitFailed(indexIntoCliCompilerArray))
{
@@ -653,7 +643,6 @@ ExSqlComp::ReturnStatus ExSqlComp::resendControls(NABoolean ctxSw) // Genesis
if (q->isEmpty())
{
ret=resetAllDefaults();
- //ss_cc_change : rare error condition
//
if (ret == ERROR)
{
@@ -797,7 +786,6 @@ ExSqlComp::ReturnStatus ExSqlComp::resendControls(NABoolean ctxSw) // Genesis
if (ret != ERROR)
{
- // ss_cc_change : only applicable to downrev compiler
//
if (
((*diagArea_).contains(-2050) ||
@@ -845,7 +833,6 @@ ExSqlComp::ReturnStatus ExSqlComp::resendControls(NABoolean ctxSw) // Genesis
} // control list is NOT empty
} // if (ret != ERROR)
- //ss_cc_change : rare error case
//
if (ret != SUCCESS || diagArea_->getNumber() || loopDiags.getNumber())
{
@@ -982,7 +969,6 @@ ExSqlComp::~ExSqlComp()
if (diagArea_)
diagArea_->deAllocate();
}
-//ss_cc_change : this is applicable to nowait cli
//
void ExSqlComp::endConnection()
{
@@ -1080,7 +1066,6 @@ ExSqlComp::ReturnStatus ExSqlComp::sendRequest (Operator op,
// When we move to v2400 and beyond, this code need to correctly
// figure out which charsets are not understood by the downrev
// compiler where this msg is being sent to.
- // ss_cc_change : down rev compiler is obsolete on SQ
//
if (getVersion() < COM_VERS_2300)
{
@@ -1177,7 +1162,6 @@ ExSqlComp::ReturnStatus ExSqlComp::sendRequest (Operator op,
request->setFlags(cliGlobals_->currContext()->getSqlParserFlags());
// If we are talking to a downrev compiler take care of the following.
- //ss_cc_change
//
if ( compilerVersion_ < COM_VERS_COMPILER_VERSION)
{
@@ -1213,7 +1197,6 @@ ExSqlComp::ReturnStatus ExSqlComp::sendRequest (Operator op,
}
else
{
- //ss_cc_change : rare error condition
//
// The second retry failed. Reset outstandingSendBuffers.
outstandingSendBuffers_.ioStatus_ = ExSqlComp::FINISHED;
@@ -1386,7 +1369,6 @@ ComDiagsArea* ExSqlComp::getDiags(Int64 )
{
return diagArea_;
}
-//ss_cc_change : dead code
//
ComDiagsArea* ExSqlComp::takeDiags(Int64)
{
[03/14] incubator-trafodion git commit: lcov: commit #1
Posted by an...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/qmscommon/QRDescriptor.cpp
----------------------------------------------------------------------
diff --git a/core/sql/qmscommon/QRDescriptor.cpp b/core/sql/qmscommon/QRDescriptor.cpp
index 1d2830f..eb51cea 100644
--- a/core/sql/qmscommon/QRDescriptor.cpp
+++ b/core/sql/qmscommon/QRDescriptor.cpp
@@ -136,7 +136,7 @@ QRElement::ExprResult QRElement::encodeResult(const char* resultString)
if (!strcmp(resultString, ExprResultNames[i]))
return (ExprResult)i;
}
- throw QRDescriptorException("Invalid value for 'result' attribute -- %s", // LCOV_EXCL_LINE :rfi
+ throw QRDescriptorException("Invalid value for 'result' attribute -- %s",
resultString);
}
@@ -217,7 +217,7 @@ void QRElement::deserializeBoolAttr(const char* attrName,
else if (!strcmp(attrVal, "1"))
attr = TRUE;
else
- throw QRDescriptorException("Value of %s attribute must be either 0 or 1", // LCOV_EXCL_LINE :rfi
+ throw QRDescriptorException("Value of %s attribute must be either 0 or 1",
attrName);
}
@@ -289,7 +289,7 @@ void QRElementList::startItemExprElement(void *parser, const char *elementName,
else if (!strcmp(elementName, QRExpr::elemName))
elem = new (XMLPARSEHEAP) QRExpr(this, atts, FALSE, ADD_MEMCHECK_ARGS(XMLPARSEHEAP));
else
- throw QRDescriptorException("<%s> cannot contain <%s>", // LCOV_EXCL_LINE :rfi
+ throw QRDescriptorException("<%s> cannot contain <%s>",
getElementName(), elementName);
addElement(elem);
@@ -374,16 +374,14 @@ NABoolean QRQueryMisc::treeWalk(VisitorPtr visitor)
void QRQueryMisc::startElement(void *parser, const char *elementName, const char **atts)
{
- // LCOV_EXCL_START :cnu
if (!strcmp(elementName, QRForcedMVs::elemName))
{
forcedMVs_ = new (XMLPARSEHEAP) QRForcedMVs(CHILD_ELEM_ARGS(XMLPARSEHEAP));
XMLDocument::setCurrentElement(parser, forcedMVs_);
}
- // LCOV_EXCL_STOP
else
{
- throw QRDescriptorException("Element %s cannot contain element %s", // LCOV_EXCL_LINE :rfi
+ throw QRDescriptorException("Element %s cannot contain element %s",
elemName, elementName);
}
}
@@ -484,7 +482,7 @@ void QRQueryDescriptor::startElement(void *parser, const char *elementName, cons
}
else
{
- throw QRDescriptorException("Element %s cannot contain element %s", // LCOV_EXCL_LINE :rfi
+ throw QRDescriptorException("Element %s cannot contain element %s",
elemName, elementName);
}
}
@@ -571,7 +569,7 @@ QRJBB::QRJBB(XMLElementPtr parent, AttributeList atts,
else if (!strcmp(attrName, "ref"))
ref_ = iter.getValue();
else
- throw QRDescriptorException("Invalid attribute specified for element %s: %s", // LCOV_EXCL_LINE :rfi
+ throw QRDescriptorException("Invalid attribute specified for element %s: %s",
elemName, attrName);
}
}
@@ -640,12 +638,11 @@ void QRJBB::startElement(void *parser, const char *elementName, const char **att
}
else
{
- throw QRDescriptorException("Element %s cannot contain element %s", // LCOV_EXCL_LINE :rfi
+ throw QRDescriptorException("Element %s cannot contain element %s",
elemName, elementName);
}
}
-// LCOV_EXCL_START :cnu
void QRJBB::createTableArray(CollIndex maxEntries)
{
assertLogAndThrow1(CAT_SQL_COMP_QR_DESC_GEN, LL_MVQR_FAIL,
@@ -654,7 +651,6 @@ void QRJBB::createTableArray(CollIndex maxEntries)
maxTableEntries_ = maxEntries;
tableArray_ = new QRTablePtr[maxEntries];
}
-// LCOV_EXCL_STOP
void QRJBB::addTable(QRTablePtr table)
{
@@ -699,7 +695,7 @@ void QRList<T>::startElement(void *parser, const char *elementName, const char *
}
else
{
- throw QRDescriptorException("Element %s cannot contain element %s", // LCOV_EXCL_LINE :rfi
+ throw QRDescriptorException("Element %s cannot contain element %s",
elemName, elementName);
}
}
@@ -719,7 +715,7 @@ template<> void QRList<QRExpr>::startElement(void *parser, const char *elementNa
}
else
{
- throw QRDescriptorException("Element %s cannot contain element %s", // LCOV_EXCL_LINE :rfi
+ throw QRDescriptorException("Element %s cannot contain element %s",
elemName, elementName);
}
}
@@ -766,7 +762,7 @@ QRHub::QRHub(XMLElementPtr parent, AttributeList atts,
residualPredList_(NULL)
{
if (*atts)
- throw QRDescriptorException("Invalid attribute specified for element %s: %s", // LCOV_EXCL_LINE :rfi
+ throw QRDescriptorException("Invalid attribute specified for element %s: %s",
elemName, *atts);
}
@@ -830,7 +826,7 @@ void QRHub::startElement(void *parser, const char *elementName, const char **att
}
else
{
- throw QRDescriptorException("<%s> cannot contain <%s>", // LCOV_EXCL_LINE :rfi
+ throw QRDescriptorException("<%s> cannot contain <%s>",
elemName, elementName);
}
}
@@ -843,7 +839,7 @@ QRJBBCList::QRJBBCList(XMLElementPtr parent, AttributeList atts,
: QRElementList(ET_JBBCList, parent, NULL, ADD_MEMCHECK_ARGS_PASS(heap))
{
if (*atts)
- throw QRDescriptorException("Invalid attribute specified for element %s: %s", // LCOV_EXCL_LINE :rfi
+ throw QRDescriptorException("Invalid attribute specified for element %s: %s",
elemName, *atts);
}
@@ -858,7 +854,7 @@ void QRJBBCList::startElement(void *parser, const char *elementName, const char
else if (!strcmp(elementName, QROperator::elemName))
elem = new (XMLPARSEHEAP) QROperator(CHILD_ELEM_ARGS(XMLPARSEHEAP));
else
- throw QRDescriptorException("<%s> cannot contain <%s>", // LCOV_EXCL_LINE :rfi
+ throw QRDescriptorException("<%s> cannot contain <%s>",
elemName, elementName);
addElement(elem);
@@ -1012,7 +1008,7 @@ void QRTable::startElement(void *parser, const char *elementName, const char **a
elem = key;
}
else
- throw QRDescriptorException("<%s> cannot contain <%s>", // LCOV_EXCL_LINE :rfi
+ throw QRDescriptorException("<%s> cannot contain <%s>",
elemName, elementName);
XMLDocument::setCurrentElement(parser, elem);
@@ -1036,7 +1032,7 @@ QRKey::QRKey(XMLElementPtr parent, AttributeList atts,
: QRElementList(ET_Key, parent, NULL, ADD_MEMCHECK_ARGS_PASS(heap))
{
if (*atts)
- throw QRDescriptorException("Invalid attribute specified for element %s: %s", // LCOV_EXCL_LINE :rfi
+ throw QRDescriptorException("Invalid attribute specified for element %s: %s",
elemName, *atts);
}
@@ -1047,7 +1043,7 @@ void QRKey::startElement(void *parser, const char *elementName, const char **att
if (!strcmp(elementName, QRColumn::elemName))
elem = new (XMLPARSEHEAP) QRColumn(CHILD_ELEM_ARGS(XMLPARSEHEAP));
else
- throw QRDescriptorException("<%s> cannot contain <%s>", // LCOV_EXCL_LINE :rfi
+ throw QRDescriptorException("<%s> cannot contain <%s>",
elemName, elementName);
addElement(elem);
@@ -1058,7 +1054,6 @@ void QRKey::startElement(void *parser, const char *elementName, const char **att
// QRForcedMVs
//
-// LCOV_EXCL_START :cnu Entire QRForcedMVs is currently not used.
QRForcedMVs::~QRForcedMVs()
{
CollIndex i;
@@ -1099,7 +1094,6 @@ void QRForcedMVs::serializeBody(XMLString& xml)
for (i = 0; i < tableList_.entries(); i++)
tableList_[i]->toXML(xml);
}
-// LCOV_EXCL_STOP
//
@@ -1145,7 +1139,7 @@ QRJoinPred::QRJoinPred(XMLElementPtr parent, AttributeList atts,
else if (!strcmp(attrName, "result"))
result_ = encodeResult(iter.getValue());
else
- throw QRDescriptorException("Invalid attribute specified for element %s: %s", // LCOV_EXCL_LINE :rfi
+ throw QRDescriptorException("Invalid attribute specified for element %s: %s",
elemName, attrName);
}
}
@@ -1236,7 +1230,7 @@ QRRangePred::QRRangePred(XMLElementPtr parent, AttributeList atts,
else if (!strcmp(attrName, "mustMatch"))
deserializeBoolAttr(attrName, iter.getValue(), mustMatch_);
else
- throw QRDescriptorException("Invalid attribute specified for element %s: %s", // LCOV_EXCL_LINE :rfi
+ throw QRDescriptorException("Invalid attribute specified for element %s: %s",
elemName, attrName);
}
}
@@ -1356,7 +1350,7 @@ void QRRangePred::startElement(void *parser, const char *elementName, const char
XMLDocument::setCurrentElement(parser, op);
}
else
- throw QRDescriptorException("Element %s cannot contain element %s", // LCOV_EXCL_LINE :rfi
+ throw QRDescriptorException("Element %s cannot contain element %s",
elemName, elementName);
} // QRRangePred::startElement
@@ -1446,7 +1440,7 @@ void QROpEQ::startElement(void *parser, const char *elementName, const char **at
return;
}
else
- throw QRDescriptorException("Element %s cannot contain element %s", // LCOV_EXCL_LINE :rfi
+ throw QRDescriptorException("Element %s cannot contain element %s",
elemName, elementName);
if (valElem)
{
@@ -1512,7 +1506,7 @@ QROpInequality::QROpInequality(ElementType eType, QRElement *parent,
if (!strcmp(attrName, "isNormalized"))
deserializeBoolAttr(attrName, attrVal, isNormalized_);
else
- throw QRDescriptorException("Invalid attribute specified for element %s: %s", // LCOV_EXCL_LINE :rfi
+ throw QRDescriptorException("Invalid attribute specified for element %s: %s",
elemName, attrName);
}
}
@@ -1556,7 +1550,7 @@ void QROpInequality::startElement(void *parser, const char *elementName, const c
else if (!strcmp(elementName, QRFloatVal::elemName))
value_ = new (XMLPARSEHEAP) QRFloatVal(CHILD_ELEM_ARGS(XMLPARSEHEAP));
else
- throw QRDescriptorException("Element %s cannot contain element %s", // LCOV_EXCL_LINE :rfi
+ throw QRDescriptorException("Element %s cannot contain element %s",
getElementName(), elementName);
XMLDocument::setCurrentElement(parser, value_);
}
@@ -1592,7 +1586,7 @@ QROpBT::QROpBT(QRElement *parent, AttributeList atts,
else if (!strcmp(attrName, "endIsIncluded"))
deserializeBoolAttr(attrName, attrVal, endIsIncluded_);
else
- throw QRDescriptorException("Invalid attribute specified for element %s: %s", // LCOV_EXCL_LINE :rfi
+ throw QRDescriptorException("Invalid attribute specified for element %s: %s",
elemName, attrName);
}
}
@@ -1635,7 +1629,7 @@ void QROpBT::startElement(void *parser, const char *elementName, const char **at
{
valueCount_++;
if (valueCount_ > 2)
- throw QRDescriptorException("Only 2 values can be contained in %s", elemName); // LCOV_EXCL_LINE :rfi
+ throw QRDescriptorException("Only 2 values can be contained in %s", elemName);
//QRElementPtr& val = (valueCount_ == 1 ? startValue_ : endValue_);
QRScalarValuePtr& val = (valueCount_ == 1 ? startValue_ : endValue_);
@@ -1931,7 +1925,7 @@ QRGroupBy::QRGroupBy(XMLElementPtr parent, AttributeList atts,
else if (!strcmp(attrName, "result"))
result_ = encodeResult(iter.getValue());
else
- throw QRDescriptorException("Invalid attribute specified for element %s: %s", // LCOV_EXCL_LINE :rfi
+ throw QRDescriptorException("Invalid attribute specified for element %s: %s",
elemName, attrName);
}
}
@@ -1994,7 +1988,6 @@ void QRGroupBy::startElement(void *parser, const char *elementName, const char *
primary_ = new (XMLPARSEHEAP) QRPrimaryGroupBy(CHILD_ELEM_ARGS(XMLPARSEHEAP));
elem = primary_;
}
- // LCOV_EXCL_START :cnu Dependent/Minimal GB not implemented yet.
else if (!strcmp(elementName, QRDependentGroupBy::elemName))
{
dependent_ = new (XMLPARSEHEAP) QRDependentGroupBy(CHILD_ELEM_ARGS(XMLPARSEHEAP));
@@ -2005,7 +1998,6 @@ void QRGroupBy::startElement(void *parser, const char *elementName, const char *
minimal_ = new (XMLPARSEHEAP) QRMinimalGroupBy(CHILD_ELEM_ARGS(XMLPARSEHEAP));
elem = minimal_;
}
- // LCOV_EXCL_STOP
else if (!strcmp(elementName, QRList<QRTable>::elemName))
{
tableList_ = new (XMLPARSEHEAP) QRList<QRTable>(CHILD_ELEM_ARGS(XMLPARSEHEAP));
@@ -2013,7 +2005,7 @@ void QRGroupBy::startElement(void *parser, const char *elementName, const char *
}
else
{
- throw QRDescriptorException("Element %s cannot contain element %s", // LCOV_EXCL_LINE :rfi
+ throw QRDescriptorException("Element %s cannot contain element %s",
elemName, elementName);
}
@@ -2029,7 +2021,7 @@ QRPrimaryGroupBy::QRPrimaryGroupBy(XMLElementPtr parent, AttributeList atts,
: QRElementList(ET_PrimaryGroupBy, parent, NULL, ADD_MEMCHECK_ARGS_PASS(heap))
{
if (*atts)
- throw QRDescriptorException("Invalid attribute specified for element %s: %s", // LCOV_EXCL_LINE :rfi
+ throw QRDescriptorException("Invalid attribute specified for element %s: %s",
elemName, *atts);
}
@@ -2038,7 +2030,6 @@ void QRPrimaryGroupBy::startElement(void *parser, const char *elementName, const
QRElementList::startItemExprElement(parser, elementName, atts);
}
-// LCOV_EXCL_START :cnu Dependent GB not implemented yet.
//
// QRDependentGroupBy
//
@@ -2055,9 +2046,7 @@ void QRDependentGroupBy::startElement(void *parser, const char *elementName, con
{
QRElementList::startItemExprElement(parser, elementName, atts);
}
-// LCOV_EXCL_STOP
-// LCOV_EXCL_START :cnu Minimal GB not implemented yet.
//
// QRMinimalGroupBy
//
@@ -2074,7 +2063,6 @@ void QRMinimalGroupBy::startElement(void *parser, const char *elementName, const
{
QRElementList::startItemExprElement(parser, elementName, atts);
}
-// LCOV_EXCL_STOP
@@ -2112,7 +2100,7 @@ QRColumn::QRColumn(XMLElementPtr parent, AttributeList atts,
else if (!strcmp(attrName, "isNullable"))
deserializeBoolAttr(attrName, attrValue, isNullable_);
else
- throw QRDescriptorException("Invalid attribute specified for element %s: %s", // LCOV_EXCL_LINE :rfi
+ throw QRDescriptorException("Invalid attribute specified for element %s: %s",
elemName, attrName);
}
}
@@ -2208,7 +2196,7 @@ QRExpr::QRExpr(XMLElementPtr parent, AttributeList atts, NABoolean isResidual,
result_ = encodeResult(iter.getValue());
}
else
- throw QRDescriptorException("Invalid attribute specified for element %s: %s", // LCOV_EXCL_LINE :rfi
+ throw QRDescriptorException("Invalid attribute specified for element %s: %s",
getElementName(), //@ZXresid -- virtual fn in ctor
attrName);
}
@@ -2276,7 +2264,7 @@ void QRExpr::startElement(void *parser, const char *elementName, const char **at
}
else
{
- throw QRDescriptorException("Element %s cannot contain element %s", // LCOV_EXCL_LINE :rfi
+ throw QRDescriptorException("Element %s cannot contain element %s",
getElementName(), elementName);
}
}
@@ -2386,7 +2374,7 @@ QRExplicitExprPtr QRExplicitExpr::constructSubElement(void *parser,
elem = new (XMLPARSEHEAP) QRNullVal(CHILD_ELEM_ARGS(XMLPARSEHEAP));
else
{
- throw QRDescriptorException("Element %s cannot contain element %s", // LCOV_EXCL_LINE :rfi
+ throw QRDescriptorException("Element %s cannot contain element %s",
getElementName(), elementName);
}
@@ -2431,7 +2419,7 @@ QRBinaryOper::QRBinaryOper(XMLElementPtr parent, AttributeList atts,
else if (!strcmp(attrName, "op"))
operator_ = iter.getValue();
else
- throw QRDescriptorException("Invalid attribute specified for element %s: %s", // LCOV_EXCL_LINE :rfi
+ throw QRDescriptorException("Invalid attribute specified for element %s: %s",
elemName, attrName);
}
}
@@ -2482,7 +2470,7 @@ void QRBinaryOper::startElement(void* parser, const char* elementName, const cha
else if (!secondOperand_)
secondOperand_ = elem;
else
- throw QRDescriptorException("More than two operands given for binary operator " // LCOV_EXCL_LINE :rfi
+ throw QRDescriptorException("More than two operands given for binary operator "
"with id=%s", id_.data());
XMLDocument::setCurrentElement(parser, elem);
@@ -2512,7 +2500,7 @@ QRUnaryOper::QRUnaryOper(XMLElementPtr parent, AttributeList atts,
else if (!strcmp(attrName, "op"))
operator_ = iter.getValue();
else
- throw QRDescriptorException("Invalid attribute specified for element %s: %s", // LCOV_EXCL_LINE :rfi
+ throw QRDescriptorException("Invalid attribute specified for element %s: %s",
elemName, attrName);
}
}
@@ -2547,7 +2535,7 @@ void QRUnaryOper::startElement(void *parser, const char *elementName, const char
if (!operand_)
operand_ = elem;
else
- throw QRDescriptorException("More than one operand given for unary operator " // LCOV_EXCL_LINE :rfi
+ throw QRDescriptorException("More than one operand given for unary operator "
"with id=%s", id_.data());
XMLDocument::setCurrentElement(parser, elem);
@@ -2573,7 +2561,7 @@ QRParameter::QRParameter(XMLElementPtr parent, AttributeList atts,
else if (!strcmp(attrName, "value"))
paramValue_ = iter.getValue();
else
- throw QRDescriptorException("Invalid attribute specified for element %s: %s", // LCOV_EXCL_LINE :rfi
+ throw QRDescriptorException("Invalid attribute specified for element %s: %s",
elemName, attrName);
}
}
@@ -2619,7 +2607,7 @@ QRFunction::QRFunction(XMLElementPtr parent, AttributeList atts,
else if (!strcmp(attrName, "aggregateFunc"))
aggregateFunc_ = (AggregateFunctionType)atoi(iter.getValue());
else
- throw QRDescriptorException("Invalid attribute specified for element %s: %s", // LCOV_EXCL_LINE :rfi
+ throw QRDescriptorException("Invalid attribute specified for element %s: %s",
getElementName(), attrName);
}
}
@@ -2929,7 +2917,7 @@ QROutput::QROutput(XMLElementPtr parent, AttributeList atts,
else if (!strcmp(attrName, "result"))
result_ = encodeResult(iter.getValue());
else
- throw QRDescriptorException("Invalid attribute specified for element %s: %s", // LCOV_EXCL_LINE :rfi
+ throw QRDescriptorException("Invalid attribute specified for element %s: %s",
elemName, attrName);
}
}
@@ -2988,7 +2976,7 @@ void QRExtraHub::startElement(void *parser, const char *elementName, const char
}
else
{
- throw QRDescriptorException("Element %s cannot contain element %s", // LCOV_EXCL_LINE :rfi
+ throw QRDescriptorException("Element %s cannot contain element %s",
elemName, elementName);
}
}
@@ -3024,7 +3012,7 @@ QRMVMisc::QRMVMisc(XMLElementPtr parent, AttributeList atts,
else if (!strcmp(attrName, "isUMV"))
deserializeBoolAttr(attrName, iter.getValue(), isUMV_);
else
- throw QRDescriptorException("Invalid attribute specified for element %s: %s", // LCOV_EXCL_LINE :rfi
+ throw QRDescriptorException("Invalid attribute specified for element %s: %s",
elemName, attrName);
}
}
@@ -3062,7 +3050,7 @@ QRMVDescriptor::QRMVDescriptor(AttributeList atts,
// Set parent here so we don't have to use 'this' in initializer
setParent(this);
if (*atts)
- throw QRDescriptorException("<%s> should have no attributes; attribute %s specified", // LCOV_EXCL_LINE :rfi
+ throw QRDescriptorException("<%s> should have no attributes; attribute %s specified",
getElementName(), *atts);
}
@@ -3136,7 +3124,7 @@ void QRMVDescriptor::startElement(void *parser, const char *elementName, const c
}
else
{
- throw QRDescriptorException("Element %s cannot contain element %s", // LCOV_EXCL_LINE :rfi
+ throw QRDescriptorException("Element %s cannot contain element %s",
elemName, elementName);
}
}
@@ -3163,7 +3151,7 @@ QRMVName::QRMVName(XMLElementPtr parent, AttributeList atts,
else if (!strcmp(attrName, "TS"))
timestamp_ = iter.getValue();
else
- throw QRDescriptorException("Invalid attribute specified for element %s: %s", // LCOV_EXCL_LINE :rfi
+ throw QRDescriptorException("Invalid attribute specified for element %s: %s",
elemName, attrName);
}
}
@@ -3210,7 +3198,7 @@ QRCandidate::QRCandidate(XMLElementPtr parent, AttributeList atts,
else if (!strcmp(attrName, "isIndirectGroupBy"))
deserializeBoolAttr(attrName, attrVal, isIndirectGroupBy_);
else
- throw QRDescriptorException("Invalid attribute specified for element %s: %s", // LCOV_EXCL_LINE :rfi
+ throw QRDescriptorException("Invalid attribute specified for element %s: %s",
elemName, attrName);
}
}
@@ -3315,7 +3303,7 @@ void QRCandidate::startElement(void *parser, const char *elementName, const char
}
else
{
- throw QRDescriptorException("Element %s cannot contain element %s", // LCOV_EXCL_LINE :rfi
+ throw QRDescriptorException("Element %s cannot contain element %s",
elemName, elementName);
}
} // QRCandidate::startElement
@@ -3345,7 +3333,7 @@ QRJbbSubset::QRJbbSubset(XMLElementPtr parent, AttributeList atts,
else if (!strcmp(attrName, "ref"))
ref_ = iter.getValue();
else
- throw QRDescriptorException("Invalid attribute specified for element %s: %s", // LCOV_EXCL_LINE :rfi
+ throw QRDescriptorException("Invalid attribute specified for element %s: %s",
elemName, attrName);
}
}
@@ -3391,7 +3379,7 @@ void QRJbbSubset::startElement(void *parser, const char *elementName, const char
}
else
{
- throw QRDescriptorException("Element %s cannot contain element %s", // LCOV_EXCL_LINE :rfi
+ throw QRDescriptorException("Element %s cannot contain element %s",
elemName, elementName);
}
}
@@ -3416,7 +3404,7 @@ QRJbbResult::QRJbbResult(XMLElementPtr parent, AttributeList atts,
if (!strcmp(attrName, "ref"))
ref_ = iter.getValue();
else
- throw QRDescriptorException("Invalid attribute specified for element %s: %s", // LCOV_EXCL_LINE :rfi
+ throw QRDescriptorException("Invalid attribute specified for element %s: %s",
elemName, attrName);
}
}
@@ -3469,7 +3457,7 @@ void QRJbbResult::startElement(void *parser, const char *elementName, const char
XMLDocument::setCurrentElement(parser, info);
}
else
- throw QRDescriptorException("Element %s cannot contain element %s", // LCOV_EXCL_LINE :rfi
+ throw QRDescriptorException("Element %s cannot contain element %s",
elemName, elementName);
}
@@ -3521,7 +3509,7 @@ void QRResultDescriptor::startElement(void *parser, const char *elementName, con
}
else
{
- throw QRDescriptorException("Element %s cannot contain element %s", // LCOV_EXCL_LINE :rfi
+ throw QRDescriptorException("Element %s cannot contain element %s",
elemName, elementName);
}
}
@@ -3553,7 +3541,7 @@ QRPublishDescriptor::QRPublishDescriptor(AttributeList atts,
if (!strcmp(attrName, "TS"))
redefTimestamp_ = iter.getValue();
else
- throw QRDescriptorException("Invalid attribute specified for element %s: %s", // LCOV_EXCL_LINE :rfi
+ throw QRDescriptorException("Invalid attribute specified for element %s: %s",
elemName, attrName);
}
}
@@ -3618,7 +3606,7 @@ void QRPublishDescriptor::startElement(void *parser,
}
else
{
- throw QRDescriptorException("Element %s cannot contain element %s", // LCOV_EXCL_LINE :rfi
+ throw QRDescriptorException("Element %s cannot contain element %s",
elemName, elementName);
}
}
@@ -3713,7 +3701,7 @@ void QRPublishDescriptor::initialize(ComPublishMVOperationType opType,
case COM_PUBLISH_MV_UNKNOWN:
default:
- assertLogAndThrow(CAT_SQL_COMP_QR_DESC_GEN, LL_MVQR_FAIL, // LCOV_EXCL_LINE :rfi
+ assertLogAndThrow(CAT_SQL_COMP_QR_DESC_GEN, LL_MVQR_FAIL,
FALSE, QRDescriptorException,
"Unhandled MV operation type");
break;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/qmscommon/QRDescriptor.h
----------------------------------------------------------------------
diff --git a/core/sql/qmscommon/QRDescriptor.h b/core/sql/qmscommon/QRDescriptor.h
index 0c8469e..b95bc1d 100644
--- a/core/sql/qmscommon/QRDescriptor.h
+++ b/core/sql/qmscommon/QRDescriptor.h
@@ -511,7 +511,6 @@ class QRElement : public XMLElement
return this == &other;
}
- // LCOV_EXCL_START :rfi -- assertion failure if FALSE returned
/**
* Indicates whether this class can be a member of a JBBCList.
*
@@ -522,9 +521,7 @@ class QRElement : public XMLElement
{
return FALSE; // overridden to be TRUE for Table, JBB, Operator
}
- // LCOV_EXCL_STOP
- // LCOV_EXCL_START :rfi -- assertion failure if FALSE returned
/**
* Indicates whether this class can be contained in a <JoinPred> element.
*
@@ -535,9 +532,7 @@ class QRElement : public XMLElement
{
return FALSE; // overridden to be TRUE for Column, MVColumn, Expr, JoinPred
}
- // LCOV_EXCL_STOP
- // LCOV_EXCL_START :rfi -- assertion failure if FALSE returned
/**
* Indicates whether this class represents one of the elements that can be
* the root element of a \c QRExpr.
@@ -550,9 +545,7 @@ class QRElement : public XMLElement
return FALSE; // overridden to be TRUE for Function, BinaryOper,
// and UnaryOper
}
- // LCOV_EXCL_STOP
- // LCOV_EXCL_START :rfi -- assertion failure if FALSE returned
/**
* Indicates whether this class represents one of the elements that can be
* an output item.
@@ -564,9 +557,7 @@ class QRElement : public XMLElement
{
return FALSE; // overridden to be TRUE for Column, Expr, MVColumn
}
- // LCOV_EXCL_STOP
- // LCOV_EXCL_START :rfi -- assertion failure if FALSE returned
/**
* Indicates whether this class represents one of the elements that can be
* a <code>Group By</code> item.
@@ -578,7 +569,6 @@ class QRElement : public XMLElement
{
return FALSE; // overridden to be TRUE for Column, Expr, MVColumn
}
- // LCOV_EXCL_STOP
/**
* Indicates whether an element belongs to the extra-hub as opposed to the
@@ -594,7 +584,6 @@ class QRElement : public XMLElement
return FALSE;
}
- // LCOV_EXCL_START :rfi
/**
* Returns the string value used as the basis for comparing this element
* with other elements when creating a sorted list; for example, when
@@ -608,7 +597,6 @@ class QRElement : public XMLElement
throw QRDescriptorException("getSortName() is not defined for Element %s",
getElementName());
}
- // LCOV_EXCL_STOP
void serializeBoolAttr(const char* attrName,
NABoolean attrVal,
@@ -639,7 +627,6 @@ class QRElement : public XMLElement
return (id_.length() < 2 ? 0 : atoi(id_.data()+1));
}
- // LCOV_EXCL_START :rfi
/**
* Return the first character of ID strings used by an element.
* @return the first char of the ID for subclass elements.
@@ -652,7 +639,6 @@ class QRElement : public XMLElement
"to use the id attribute.");
return ' ';
}
- // LCOV_EXCL_STOP
/**
* Returns the id of the element referenced by this element.
@@ -777,7 +763,6 @@ class QRElement : public XMLElement
#define THROW_DOWNCAST_EXCEPTION assertLogAndThrow(CAT_SQL_COMP_QR_DESC_GEN, LL_MVQR_FAIL, FALSE, QRLogicException, "Down cast to wrong element type.");
- // LCOV_EXCL_START :rfi
// Methods for easy downcasting to specific classes.
// Each method is overridden by its specific class, to return 'this'.
virtual QRColumnPtr downCastToQRColumn() { THROW_DOWNCAST_EXCEPTION }
@@ -790,7 +775,6 @@ class QRElement : public XMLElement
virtual QRFunctionPtr downCastToQRFunction() { THROW_DOWNCAST_EXCEPTION }
virtual QRColumnPtr getFirstColumn() { return NULL; }
- // LCOV_EXCL_STOP
const QRElementPtr getParentElement() const
{
@@ -822,7 +806,6 @@ class QRElement : public XMLElement
referencedElement_ = this;
}
- // LCOV_EXCL_START :rfi
// This method must be redefined for element types that have element content.
virtual void startElement(void *parser,
const char *elementName,
@@ -831,7 +814,6 @@ class QRElement : public XMLElement
throw QRDescriptorException("Element %s cannot contain element content",
getElementName());
}
- // LCOV_EXCL_STOP
virtual void serializeAttrs(XMLString& xml);
@@ -1025,7 +1007,7 @@ public:
void addElement(QRElementPtr elem)
{
if (!isAllowed(elem))
- throw QRDescriptorException("<%s> is not allowed in <%s>", // LCOV_EXCL_LINE :rfi
+ throw QRDescriptorException("<%s> is not allowed in <%s>",
elem->getElementName(), getElementName());
list_.insert(elem);
}
@@ -1914,7 +1896,6 @@ class QRTable : public QRElement
return 'T';
}
- // LCOV_EXCL_START :rfi
/**
* Overrides the standard definition of this function to throw an exception.
* This ensures that #setAndRegisterID() is not bypassed as the way to set
@@ -1930,7 +1911,6 @@ class QRTable : public QRElement
"setAndRegisterID() must be used instead of setID() "
"for element QRTable");
}
- // LCOV_EXCL_STOP
/**
* Sets the id for this table element, and creates an entry in the hash
@@ -2264,7 +2244,6 @@ class QRKey : public QRElementList
}; // QRKey
-// LCOV_EXCL_START :cnu Entire QRForcedMVs currently not used.
/**
* Class representing a list of forced MVs, defined in an XML document by the
* <ForcedMVs> element. Forced MVs are those that QMS is instructed not to
@@ -2334,7 +2313,6 @@ class QRForcedMVs : public QRElement
// Attributes and contained elements.
}; // QRForcedMVs
-// LCOV_EXCL_STOP
/**
* Abstract class that is parent of any element that can be part of an explicit
@@ -2549,7 +2527,6 @@ class QRColumn : public QRExplicitExpr
return 'C';
}
- // LCOV_EXCL_START :rfi
/**
* Overrides the standard definition of this function to throw an exception.
* This ensures that #setAndRegisterID() is not bypassed as the way to set
@@ -2565,7 +2542,6 @@ class QRColumn : public QRExplicitExpr
"setAndRegisterID() must be used instead of setID() "
"for element QRColumn");
}
- // LCOV_EXCL_STOP
/**
* Sets the id for this column element, and creates an entry in the hash
@@ -3088,7 +3064,6 @@ class QRJoinPred : public QRElementList
return 'J';
}
- // LCOV_EXCL_START :rfi
/**
* Overrides the standard definition of this function to throw an exception.
* This ensures that #setAndRegisterID() is not bypassed as the way to set
@@ -3104,7 +3079,6 @@ class QRJoinPred : public QRElementList
"setAndRegisterID() must be used instead of setID() "
"for element QRJoinPred");
}
- // LCOV_EXCL_STOP
/**
* We get here only when, in a multi-JBB query, one join pred includes
@@ -3475,7 +3449,7 @@ class QROpEQ : public QRRangeOperator
nullVal_(NULL)
{
if (*atts)
- throw QRDescriptorException("Invalid attribute specified for element %s: %s", // LCOV_EXCL_LINE :rfi
+ throw QRDescriptorException("Invalid attribute specified for element %s: %s",
elemName, *atts);
}
@@ -4008,7 +3982,7 @@ class QROpBT : public QRRangeOperator
virtual void endElement(void *parser, const char *elementName)
{
if (valueCount_ != 2)
- throw QRDescriptorException("Two values must be contained in %s", // LCOV_EXCL_LINE :rfi
+ throw QRDescriptorException("Two values must be contained in %s",
elementName);
QRRangeOperator::endElement(parser, elementName);
}
@@ -4422,7 +4396,6 @@ class QRWStringVal : public QRScalarValue
return elemName;
}
- // LCOV_EXCL_START :rfi
/**
* Overrides the standard definition of this function to throw an exception.
* This ensures that #setWideValue() is called instead.
@@ -4437,7 +4410,6 @@ class QRWStringVal : public QRScalarValue
"setWideValue() must be used instead of setValue() "
"for element QRWStringVal");
}
- // LCOV_EXCL_STOP
void setWideValue(const NAWString& value)
{
@@ -4479,7 +4451,6 @@ class QRWStringVal : public QRScalarValue
*/
virtual void serializeBody(XMLString& xml);
- // LCOV_EXCL_START :rfi
/**
* Overrides the standard definition of this function to throw an exception.
* This ensures that #getWideValue() is called instead.
@@ -4494,14 +4465,12 @@ class QRWStringVal : public QRScalarValue
"getWideValue() must be used instead of getValue() "
"for element QRWStringVal");
}
- // LCOV_EXCL_STOP
const NAWString& getWideValue() const
{
return wideStringRep_;
}
- // LCOV_EXCL_START :rfi
/**
* Overrides the standard definition of this function to throw an exception.
* This ensures that #setWStringRep() is called instead.
@@ -4516,7 +4485,6 @@ class QRWStringVal : public QRScalarValue
"setWStringRep() must be used instead of setStringRep() "
"for element QRWStringVal");
}
- // LCOV_EXCL_STOP
/**
* Sets the string representation of the value represented by this object.
@@ -4667,7 +4635,7 @@ class QRNullVal : public QRExplicitExpr
: QRExplicitExpr(ET_NullVal, parent, ADD_MEMCHECK_ARGS_PASS(heap))
{
if (*atts)
- throw QRDescriptorException("Invalid attribute specified for element %s: %s", // LCOV_EXCL_LINE :rfi
+ throw QRDescriptorException("Invalid attribute specified for element %s: %s",
elemName, *atts);
}
@@ -5251,7 +5219,7 @@ class QRExtraHub : public QRElement
joinPredList_(NULL)
{
if (*atts)
- throw QRDescriptorException("Invalid attribute specified for element %s: %s", // LCOV_EXCL_LINE :rfi
+ throw QRDescriptorException("Invalid attribute specified for element %s: %s",
elemName, *atts);
}
@@ -6055,7 +6023,6 @@ class QRExpr : public QRElement
return (isResidual_ ? 'D' : 'X');
}
- // LCOV_EXCL_START :rfi
/**
* Overrides the standard definition of this function to throw an exception.
* This ensures that #setAndRegisterID() is not bypassed as the way to set
@@ -6071,7 +6038,6 @@ class QRExpr : public QRElement
"setAndRegisterID() must be used instead of setID() "
"for element QRExpr");
}
- // LCOV_EXCL_STOP
/**
* Sets the id for this expression element, and creates an entry in the hash
@@ -6409,7 +6375,7 @@ class QRVersion : public QRElement
versionString_(charData_)
{
if (*atts)
- throw QRDescriptorException("Invalid attribute specified for element %s: %s", // LCOV_EXCL_LINE :rfi
+ throw QRDescriptorException("Invalid attribute specified for element %s: %s",
elemName, *atts);
}
@@ -6485,7 +6451,7 @@ class QRMVDescriptor : public QRDescriptor
misc_(NULL)
{
if (*atts)
- throw QRDescriptorException("<%s> should have no attributes; attribute %s specified", // LCOV_EXCL_LINE :rfi
+ throw QRDescriptorException("<%s> should have no attributes; attribute %s specified",
getElementName(), *atts);
}
@@ -7138,7 +7104,7 @@ class QRResultDescriptor : public QRElement
// Set parent here so we don't have to use 'this' in initializer
setParent(this);
if (*atts)
- throw QRDescriptorException("<%s> should have no attributes; attribute %s specified", // LCOV_EXCL_LINE :rfi
+ throw QRDescriptorException("<%s> should have no attributes; attribute %s specified",
getElementName(), *atts);
}
@@ -7521,7 +7487,6 @@ class QRUpdate : public QRElement
newName_ = name;
}
- // LCOV_EXCL_START :cnu
const NABoolean getIgnoreChanges()
{
assertLogAndThrow(CAT_SQL_COMP_QR_DESC_GEN, LL_MVQR_FAIL,
@@ -7529,7 +7494,6 @@ class QRUpdate : public QRElement
"Ignore changes flag can only be used in Alter Update elements.");
return hasIgnoreChanges_;
}
- // LCOV_EXCL_STOP
void setIgnoreChanges(NABoolean ic)
{
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/qmscommon/QRLogger.cpp
----------------------------------------------------------------------
diff --git a/core/sql/qmscommon/QRLogger.cpp b/core/sql/qmscommon/QRLogger.cpp
index be1e974..f4fb75d 100644
--- a/core/sql/qmscommon/QRLogger.cpp
+++ b/core/sql/qmscommon/QRLogger.cpp
@@ -332,7 +332,6 @@ void QRLogger::introduceSelf ()
// form of the query, cause an informational rather than an error notification
// to be entered in the system log.
// **************************************************************************
-// LCOV_EXCL_START :rfi
void QRLogger::logError(const char* file,
Int32 line,
std::string &cat,
@@ -380,7 +379,6 @@ void QRLogger::logError(const char* file,
va_end(args);
}
-// LCOV_EXCL_STOP
// This temporary function is used for logging QVP messages only. More extensive
// changes to the CommonLogger hierarchy will be made when the QI integration
@@ -471,7 +469,6 @@ CommonTracer::CommonTracer(const char* fnName,
{
if (level_ == TL_all)
{
- // LCOV_EXCL_START :cnu
if (file_.length() == 0)
logger_.log(category_, LL_DEBUG,
"Entering %s", fnName_.data());
@@ -479,7 +476,6 @@ CommonTracer::CommonTracer(const char* fnName,
logger_.log(category_, LL_DEBUG,
"Entering %s (file %s, line %d)",
fnName_.data(), file_.data(), line_);
- // LCOV_EXCL_STOP
}
}
@@ -492,17 +488,15 @@ CommonTracer::~CommonTracer()
if (level_ >= TL_exceptionOnly && std::uncaught_exception())
logMsg.append("Exiting %s with uncaught exception");
else if (level_ == TL_all)
- logMsg.append("Exiting %s"); // LCOV_EXCL_LINE :cnu
+ logMsg.append("Exiting %s");
else
return;
if (file_.length() > 0)
{
- // LCOV_EXCL_START :cnu
logMsg.append("(file %s, line %d)");
logger_.log(category_, LL_DEBUG,
logMsg, fnName_.data(), file_.data(), line_);
- // LCOV_EXCL_STOP
}
else
{
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/qmscommon/QRLogger.h
----------------------------------------------------------------------
diff --git a/core/sql/qmscommon/QRLogger.h b/core/sql/qmscommon/QRLogger.h
index 59384d6..5cabac4 100644
--- a/core/sql/qmscommon/QRLogger.h
+++ b/core/sql/qmscommon/QRLogger.h
@@ -434,7 +434,6 @@ class QRException
/**
* Exception thrown when an error in the program logic is found.
*/
-// LCOV_EXCL_START :rfi
class QRLogicException : public QRException
{
public:
@@ -458,6 +457,5 @@ class QRLogicException : public QRException
{}
}; //QRLogicException
-// LCOV_EXCL_STOP
#endif /* _QRLOGGER_H_ */
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/qmscommon/QRQueries.h
----------------------------------------------------------------------
diff --git a/core/sql/qmscommon/QRQueries.h b/core/sql/qmscommon/QRQueries.h
index 277e5bc..6ba5d77 100644
--- a/core/sql/qmscommon/QRQueries.h
+++ b/core/sql/qmscommon/QRQueries.h
@@ -69,7 +69,6 @@ class QRQueries;
#define MAX_DEFAULTS_VALUE 1000
#define MAX_DEFAULTS_UTF8_VALUE_IN_BYTES 4001
-// LCOV_EXCL_START :rfi
/**
* Exception thrown when an error in a database operation is found.
*/
@@ -96,7 +95,6 @@ class QRDatabaseException : public QRException
{}
}; // QRDatabaseException
-// LCOV_EXCL_STOP
/**
* QRMVData is the structure used to pass information between
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/qmscommon/QRQueriesImpl.cpp
----------------------------------------------------------------------
diff --git a/core/sql/qmscommon/QRQueriesImpl.cpp b/core/sql/qmscommon/QRQueriesImpl.cpp
index 5911ac7..7432e32 100644
--- a/core/sql/qmscommon/QRQueriesImpl.cpp
+++ b/core/sql/qmscommon/QRQueriesImpl.cpp
@@ -135,7 +135,6 @@ void QRQueriesImpl::commitTransaction()
return;
} // End of commitTransaction
-// LCOV_EXCL_START :rfi
// ***************************************************************
// * Rollback the transaction
// * This routine calls a static SQL routine to execute "ROLLBACK WORK;"
@@ -149,7 +148,6 @@ void QRQueriesImpl::rollbackTransaction()
return;
} // End of rollbackTransaction
-// LCOV_EXCL_STOP
// ***************************************************************
// ***************************************************************
@@ -171,13 +169,11 @@ NABoolean QRQueriesImpl::getSystemDefault(const char* attribute, char* defValue)
// Always close to free up resources
queries_->closeSystemDefault();
}
- // LCOV_EXCL_START :rfi
catch(...)
{
// If we get an error here, just go with the defaults.
return FALSE;
}
- // LCOV_EXCL_STOP
if (sqlCode == SQL_Success)
return TRUE;
@@ -242,19 +238,16 @@ NABoolean QRQueriesImpl::getCollectQMSStatsEnabled()
if (getSystemDefault(collectQMSStatsdEnabled, defValue) == FALSE)
return FALSE; // The default value.
- // LCOV_EXCL_START :cnu CQD does not exist.
else if (!strcmp(defValue, "OFF"))
return FALSE;
else if (!strcmp(defValue, "ON"))
return TRUE;
- // LCOV_EXCL_STOP
else
- assertLogAndThrow1(CAT_SQL_COMP_QR_COMMON, LL_ERROR, // LCOV_EXCL_LINE :rfi
+ assertLogAndThrow1(CAT_SQL_COMP_QR_COMMON, LL_ERROR,
FALSE, QRDatabaseException,
"Invalid value for MVQR_COLLECT_QMS_STATS system default: %s.", defValue);
}
-// LCOV_EXCL_START :cnu
// ***************************************************************
// * Get the ISO_MAPPING setting from the SYSTEM DEFAULTS TABLE
// * for National character set support.
@@ -282,9 +275,7 @@ CharInfo::CharSet QRQueriesImpl::getIsoMapping()
return CharInfo::getCharSetEnum((const char *)"ISO88591");
}
} // End of getIsoMapping
-// LCOV_EXCL_STOP
-// LCOV_EXCL_START :cnu
// ***************************************************************
// * Get the DEFAULT_CHARSET setting from the SYSTEM DEFAULTS TABLE
// * for National character set support.
@@ -311,11 +302,9 @@ CharInfo::CharSet QRQueriesImpl::getDefaultCharset()
return CharInfo::getCharSetEnum((const char *)"ISO88591");
}
} // End of getDefaultCharset
-// LCOV_EXCL_STOP
// ***************************************************************
// ***************************************************************
-// LCOV_EXCL_START :cnu
Int32 QRQueriesImpl::getMvqrCpusPerQMS()
{
static const char cpusPerQms[] = "MVQR_CPUS_PER_QMS";
@@ -330,11 +319,9 @@ Int32 QRQueriesImpl::getMvqrCpusPerQMS()
return result;
}
} // End of getMvqrCpusPerQMS
-// LCOV_EXCL_STOP
// ***************************************************************
// ***************************************************************
-// LCOV_EXCL_START :cnu
Int32 QRQueriesImpl::getMvqrQMSCpuOffset()
{
static const char qmsCpusOffset[] = "MVQR_QMS_CPU_OFFSET";
@@ -349,7 +336,6 @@ Int32 QRQueriesImpl::getMvqrQMSCpuOffset()
return result;
}
} // End of getMvqrQMSCpuOffset
-// LCOV_EXCL_STOP
// ***************************************************************
// * Obtain the CAT_UID for a specific catalog
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/qmscommon/QueryRewriteServer.cpp
----------------------------------------------------------------------
diff --git a/core/sql/qmscommon/QueryRewriteServer.cpp b/core/sql/qmscommon/QueryRewriteServer.cpp
index b3f0921..84572cf 100644
--- a/core/sql/qmscommon/QueryRewriteServer.cpp
+++ b/core/sql/qmscommon/QueryRewriteServer.cpp
@@ -263,11 +263,9 @@ IpcServer* MvQueryRewriteServer::getQmsServer(DefaultToken publishDest,
}
else
{
- // LCOV_EXCL_START :rfi
QRLogger::log(CAT_SQL_COMP_QR_IPC, LL_ERROR,
"Failed to allocate server process for QMS");
QRLogger::logDiags(diagsArea, CAT_SQL_COMP_QR_IPC);
- // LCOV_EXCL_STOP
}
}
else
@@ -276,14 +274,12 @@ IpcServer* MvQueryRewriteServer::getQmsServer(DefaultToken publishDest,
"Could not find local QMS.");
}
}
- // LCOV_EXCL_START :rfi
catch(...)
{
QRLogger::log(CAT_SQL_COMP_QR_IPC, LL_ERROR,
"Exception when allocating server process for QMS");
return NULL;
}
- // LCOV_EXCL_STOP
}
return qmsServer_;
} // End of getQmsServer
@@ -438,30 +434,24 @@ QRXmlMessageObj* MvQueryRewriteServer::sendMatchMessage(IpcServer* qms,
}
break;
- // LCOV_EXCL_START :rfi
default:
- QRLogger::log(CAT_SQL_COMP_QR_IPC, LL_ERROR, "Unexpected response type: %d.", t); // LCOV_EXCL_LINE :rfi
+ QRLogger::log(CAT_SQL_COMP_QR_IPC, LL_ERROR, "Unexpected response type: %d.", t);
break;
- // LCOV_EXCL_STOP
}
if (msgStream.moreObjects())
{
- // LCOV_EXCL_START :rfi
QRLogger::log(CAT_SQL_COMP_QR_IPC, LL_WARN,
"Match request received one or more extraneous response "
"objects, which were discarded");
msgStream.clearAllObjects();
- // LCOV_EXCL_STOP
}
}
else
{
- // LCOV_EXCL_START :rfi
QRLogger::log(CAT_SQL_COMP_QR_IPC, LL_WARN,
"No response object in message stream from QMS");
checkQmsServer();
- // LCOV_EXCL_STOP
}
return xmlResponse;
@@ -476,7 +466,7 @@ QRRequestResult MvQueryRewriteServer::initQms(IpcServer* qmsServer,
QRLogger::log(CAT_SQL_COMP_QR_IPC, LL_DEBUG, "...Initialization succeeded");
else
QRLogger::log(CAT_SQL_COMP_QR_IPC, LL_ERROR, "INITIALIZATION FAILED, result = %d",
- response); // LCOV_EXCL_LINE :rfi
+ response);
return response;
}
@@ -521,29 +511,23 @@ QRRequestResult MvQueryRewriteServer::sendInitializeMessage(IpcServer* qms,
statusResponse->decrRefCount();
}
else
- // LCOV_EXCL_START :rfi
QRLogger::log(CAT_SQL_COMP_QR_IPC, LL_ERROR, "Unexpected response type: %d.", t);
- // LCOV_EXCL_STOP
if (msgStream.moreObjects())
{
- // LCOV_EXCL_START :rfi
QRLogger::log(CAT_SQL_COMP_QR_IPC, LL_WARN,
"Initialize request received one or more extraneous response "
"objects, which were discarded");
msgStream.clearAllObjects();
- // LCOV_EXCL_STOP
}
}
else
{
- // LCOV_EXCL_START :rfi
QRLogger::log(CAT_SQL_COMP_QR_IPC, LL_WARN,
"No response object in message stream from QMS");
if (qmsServer_)
checkQmsServer();
- // LCOV_EXCL_STOP
}
return status;
@@ -569,8 +553,8 @@ void MvQueryRewriteServer::formatTimestamp(
{
if (GMT_Time == 0)
{
- buffer[0] = '\0'; // LCOV_EXCL_LINE :rfi
- return; // LCOV_EXCL_LINE :rfi
+ buffer[0] = '\0';
+ return;
}
short Date_and_Time[8];
@@ -591,8 +575,8 @@ void MvQueryRewriteServer::formatTimestamp(
if (GMT_Time > 274958971199999999LL || // The year 4000
GMT_Time < 146728398400000000LL) // The year 1
{
- *buffer = 0; // LCOV_EXCL_LINE :rfi
- return; // LCOV_EXCL_LINE :rfi
+ *buffer = 0;
+ return;
}
//#endif
@@ -601,7 +585,7 @@ void MvQueryRewriteServer::formatTimestamp(
// If we can't convert, just show GMT
if (errorNumber)
- isGMT = true; // LCOV_EXCL_LINE :rfi
+ isGMT = true;
// Decompose timestamp
INTERPRETTIMESTAMP(julianTime,Date_and_Time);
@@ -627,13 +611,11 @@ void MvQueryRewriteServer::formatTimestamp(
if (isGMT)
{
- // LCOV_EXCL_START :rfi
buffer[27] = ' ';
buffer[28] = 'G';
buffer[29] = 'M';
buffer[30] = 'T';
buffer[31] = 0;
- // LCOV_EXCL_STOP
}
else
buffer[27] = 0;
@@ -655,7 +637,6 @@ MvQueryRewriteServer::sendPublishMessage(const NAString* descriptorText,
// String constant used in logging entries.
const static char PUBLISH[] = "PUBLISH";
- // LCOV_EXCL_START :rfi
if (!descriptorText)
{
QRLogger::log(CAT_SQL_COMP_QR_IPC, LL_ERROR,
@@ -663,16 +644,13 @@ MvQueryRewriteServer::sendPublishMessage(const NAString* descriptorText,
"MvQueryRewriteServer::sendPublishMessage()");
return InternalError;
}
- // LCOV_EXCL_STOP
- // LCOV_EXCL_START :rfi
if (!server)
{
QRLogger::log(CAT_SQL_COMP_QR_IPC, LL_ERROR,
"null server passed to MvQueryRewriteServer::sendPublishMessage()");
return InternalError;
}
- // LCOV_EXCL_STOP
// Only messages we deal with here are publish.
const char* requestName = PUBLISH;
@@ -742,11 +720,9 @@ MvQueryRewriteServer::sendPublishMessage(const NAString* descriptorText,
}
else if (msgStream.getNextObjType() != QR::STATUS_RESPONSE)
{
- // LCOV_EXCL_START :rfi
QRLogger::log(CAT_SQL_COMP_QR_IPC, LL_ERROR,
"Wrong response object returned from %s request", requestName);
return ProtocolError;
- // LCOV_EXCL_STOP
}
else
{
@@ -757,26 +733,20 @@ MvQueryRewriteServer::sendPublishMessage(const NAString* descriptorText,
QRLogger::log(CAT_SQL_COMP_QR_IPC, LL_INFO,
"%s request succeeded", requestName);
else
- // LCOV_EXCL_START :rfi
QRLogger::log(CAT_SQL_COMP_QR_IPC, LL_ERROR,
"%s request failed with status %d", requestName, result);
- // LCOV_EXCL_STOP
if (msgStream.moreObjects())
{
- // LCOV_EXCL_START :rfi
QRLogger::log(CAT_SQL_COMP_QR_IPC, LL_WARN,
"%s request received one or more extraneous response "
"objects, which were discarded", requestName);
msgStream.clearAllObjects();
- // LCOV_EXCL_STOP
}
return result;
}
} // sendPublishMessage
-// LCOV_EXCL_START :nsk
void extractDefineAndThenPutEnvIfFound(char *defineName)
{
} // static void extractDefineAndThenPutEnvIfFound()
-// LCOV_EXCL_STOP
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/qmscommon/Range.cpp
----------------------------------------------------------------------
diff --git a/core/sql/qmscommon/Range.cpp b/core/sql/qmscommon/Range.cpp
index e09a72b..e92732c 100644
--- a/core/sql/qmscommon/Range.cpp
+++ b/core/sql/qmscommon/Range.cpp
@@ -523,7 +523,6 @@ void RangeSpec::addSubrange(QRScalarValuePtr startVal, QRScalarValuePtr endVal,
}
break;
- // LCOV_EXCL_START :rfi
default:
{
// Need this to avoid link errors.
@@ -535,7 +534,6 @@ void RangeSpec::addSubrange(QRScalarValuePtr startVal, QRScalarValuePtr endVal,
valueElemType);
}
break;
- // LCOV_EXCL_STOP
}
} // addSubrange(QRScalarValuePtr...
@@ -690,13 +688,11 @@ void RangeSpec::addDenormalizedSubrange(const char* typeText,
}
else if (!strncmp(typeText, "INTERVAL", typeNameLen))
intvlType = parseIntervalTypeText(typeText + typeNameLen);
- // LCOV_EXCL_START :rfi
else
assertLogAndThrow1(CAT_SQL_COMP_RANGE, logLevel_,
FALSE, QRLogicException,
"Invalid data type for normalized range pred item -- %s",
typeText);
- // LCOV_EXCL_STOP
// Fill in the missing value based on the type to turn the open interval into
// a closed one. This restricts the range to the values allowable for the type.
@@ -1097,13 +1093,11 @@ static Int64 intervalMaxIntegerValue(const NAType& naType, logLevel level)
maxVal += maxStartFieldUnits * 12;
break;
- // LCOV_EXCL_START :rfi
default:
assertLogAndThrow1(CAT_SQL_COMP_RANGE, level,
FALSE, QRLogicException,
"Invalid end field for interval type -- %d",
type.getEndField());
- // LCOV_EXCL_STOP
break;
}
@@ -1133,14 +1127,12 @@ void SubrangeBase::getExactNumericMinMax(const NAType& type,
typeMin = (numType.isSigned() ? (-typeMax - 1) : 0);
break;
- // LCOV_EXCL_START :rfi
default:
assertLogAndThrow1(CAT_SQL_COMP_RANGE, level,
FALSE, QRLogicException,
"No case in getExactNumericMinMax() for "
"binary exact numeric of type %d",
numType.getFSDatatype());
- // LCOV_EXCL_STOP
break;
}
}
@@ -1186,12 +1178,10 @@ void SubrangeBase::getExactNumericMinMax(const NAType& type,
typeMax = intervalMaxIntegerValue(type, level);
typeMin = -typeMax;
}
- // LCOV_EXCL_START :rfi
else
assertLogAndThrow1(CAT_SQL_COMP_RANGE, level,
FALSE, QRLogicException,
"Type not handled by getExactNumericMinMax() -- %d", type.getTypeQualifier());
- // LCOV_EXCL_STOP
} // getExactNumericMinMax()
QRScalarValuePtr SubrangeBase::createScalarValElem(CollHeap* heap,
@@ -1278,13 +1268,11 @@ Int64 SubrangeBase::getStepSize(const NAType* type, logLevel level)
case REC_DATE_SECOND:
stepSize = (Int64)pow(10, 6 - dtiType->getFractionPrecision());
break;
- // LCOV_EXCL_START :rfi
default:
assertLogAndThrow1(CAT_SQL_COMP_RANGE, level,
FALSE, QRDescriptorException,
"unexpected end field for datetime type -- %d",
dtiType->getEndField());
- // LCOV_EXCL_STOP
}
break;
@@ -1310,23 +1298,19 @@ Int64 SubrangeBase::getStepSize(const NAType* type, logLevel level)
case REC_DATE_SECOND:
stepSize = (Int64)pow(10, 6 - dtiType->getFractionPrecision());
break;
- // LCOV_EXCL_START :rfi
default:
assertLogAndThrow1(CAT_SQL_COMP_RANGE, level,
FALSE, QRDescriptorException,
"unexpected end field for datetime type -- %d",
dtiType->getEndField());
- // LCOV_EXCL_STOP
}
break;
- // LCOV_EXCL_START :rfi
default:
assertLogAndThrow1(CAT_SQL_COMP_RANGE, level,
FALSE, QRDescriptorException,
"getStepSize() called for incorrect type -- %d",
typeQual);
- // LCOV_EXCL_STOP
}
return stepSize;
@@ -1819,7 +1803,6 @@ void Subrange<Int64>::initSpecifiedValueCount()
specifiedValueCount_ = 1;
}
-// LCOV_EXCL_START :rfi
// This template throws an exception if the function is called for any type other
// than Int64. The work for Int64 is done by a specialization of the template.
template <class T> inline
@@ -1828,7 +1811,6 @@ void Subrange<T>::makeStartInclusive(const NAType* type, NABoolean& overflowed)
assertLogAndThrow(CAT_SQL_COMP_RANGE, logLevel_, FALSE, QRLogicException,
"makeStartInclusive() called for non-Int64-based type");
}
-// LCOV_EXCL_STOP
// This is the specialization of the above template that makes the start of a
// subrange inclusive, by adjusting it up to the next allowable value (in its
@@ -1861,7 +1843,6 @@ void Subrange<Int64>::makeStartInclusive(const NAType* type,
}
}
-// LCOV_EXCL_START :rfi
// This template throws an exception if the function is called for any type other
// than Int64. The work for Int64 is done by a specialization of the template.
template <class T> inline
@@ -1870,7 +1851,6 @@ void Subrange<T>::makeEndInclusive(const NAType* type, NABoolean& overflowed)
assertLogAndThrow(CAT_SQL_COMP_RANGE, logLevel_, FALSE, QRLogicException,
"makeEndInclusive() called for non-Int64-based type");
}
-// LCOV_EXCL_STOP
// This is the specialization of the above template that makes the end of a
// subrange inclusive, by adjusting it down to the previous allowable value (in
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/qmscommon/XMLUtil.h
----------------------------------------------------------------------
diff --git a/core/sql/qmscommon/XMLUtil.h b/core/sql/qmscommon/XMLUtil.h
index 926d19a..ad9919d 100644
--- a/core/sql/qmscommon/XMLUtil.h
+++ b/core/sql/qmscommon/XMLUtil.h
@@ -120,7 +120,6 @@ typedef UInt32 NumericID;
#define WHITESPACE " \t\n\r\v\f"
#define XMLPARSEHEAP XML_GetNAHeap((XML_Parser)parser)
-// LCOV_EXCL_START :rfi
/**
* Exception thrown when an error occurs in processing or generating an XML
* message.
@@ -163,7 +162,6 @@ class XMLException
/** Buffer used to construct the message in. */
char msgBuffer_[200];
}; //XMLException
-// LCOV_EXCL_STOP
/**
* An \c NAString subclass with special formatting capabilities for XML. This
@@ -190,7 +188,6 @@ class XMLString : public NAString
virtual ~XMLString()
{}
- // LCOV_EXCL_START :cnu
/**
* This function is effectively a no-op; it is redefined in the subclass
* used for writing formatted XML.
@@ -270,7 +267,6 @@ class XMLString : public NAString
append(charData);
return *this;
}
- // LCOV_EXCL_STOP
}; // XMLString
/**
@@ -335,7 +331,6 @@ class XMLFormattedString : public XMLString
virtual ~XMLFormattedString()
{}
- // LCOV_EXCL_START :cnu
/**
* Returns the nesting level for this string. The level starts at 0. It goes
* up by one each time #incrementLevel is called, and down by one when
@@ -348,7 +343,6 @@ class XMLFormattedString : public XMLString
{
return level_;
}
- // LCOV_EXCL_STOP
/**
* Adds one to the current nesting level of the XML content being written
@@ -478,10 +472,8 @@ class XMLAttributeIterator
inx_ += 2;
inRange_ = TRUE;
}
- // LCOV_EXCL_START :rfi
else
throw XMLException("Attribute index out of range");
- // LCOV_EXCL_STOP
}
/**
@@ -492,10 +484,8 @@ class XMLAttributeIterator
*/
const char* getName() const
{
- // LCOV_EXCL_START :rfi
if (!inRange_)
throw XMLException("Attribute index out of range");
- // LCOV_EXCL_STOP
return *(atts_+inx_);
}
@@ -507,10 +497,8 @@ class XMLAttributeIterator
*/
const char* getValue() const
{
- // LCOV_EXCL_START :rfi
if (!inRange_)
throw XMLException("Attribute index out of range");
- // LCOV_EXCL_STOP
return *(atts_+inx_+1);
}
@@ -869,7 +857,7 @@ class XMLElement : public NAIntrusiveSharedPtrObject
// content.
if (strspn(data, WHITESPACE) < (size_t)len)
throw XMLException("Character content not allowed for element %s",
- getElementName()); // LCOV_EXCL_LINE :rfi
+ getElementName());
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/qmscommon/vers_libqmscommon.cpp
----------------------------------------------------------------------
diff --git a/core/sql/qmscommon/vers_libqmscommon.cpp b/core/sql/qmscommon/vers_libqmscommon.cpp
index 6b60617..cf1e92e 100644
--- a/core/sql/qmscommon/vers_libqmscommon.cpp
+++ b/core/sql/qmscommon/vers_libqmscommon.cpp
@@ -26,6 +26,4 @@
#define VERS_CV_MIN 0
#define VERS_CV_UPD 1
-// LCOV_EXCL_START
VERS_LIB(libqmscommon)
-// LCOV_EXCL_STOP
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/refresh/RuAuditRefreshTaskExecutor.h
----------------------------------------------------------------------
diff --git a/core/sql/refresh/RuAuditRefreshTaskExecutor.h b/core/sql/refresh/RuAuditRefreshTaskExecutor.h
index f715b5a..01ae5f4 100644
--- a/core/sql/refresh/RuAuditRefreshTaskExecutor.h
+++ b/core/sql/refresh/RuAuditRefreshTaskExecutor.h
@@ -93,7 +93,6 @@ public:
// These functions serialize/de-serialize the executor's context
// for the message communication with the remote server process
- // LCOV_EXCL_START :cnu
// Used in the main process side
virtual void StoreRequest(CUOFsIpcMessageTranslator &translator);
virtual void LoadReply(CUOFsIpcMessageTranslator &translator)
@@ -107,7 +106,6 @@ public:
{
inherited::StoreReply(translator);
}
- // LCOV_EXCL_STOP
//----------------------------------//
// Private Members
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/refresh/RuDeltaDef.cpp
----------------------------------------------------------------------
diff --git a/core/sql/refresh/RuDeltaDef.cpp b/core/sql/refresh/RuDeltaDef.cpp
index 7ffef05..c1158a7 100644
--- a/core/sql/refresh/RuDeltaDef.cpp
+++ b/core/sql/refresh/RuDeltaDef.cpp
@@ -176,7 +176,6 @@ CreateInstance(CUOFsIpcMessageTranslator &translator)
//
// Serialize the context
//--------------------------------------------------------------------------//
-// LCOV_EXCL_START :cnu
void CRUUpdateBitmap::StoreData(CUOFsIpcMessageTranslator &translator)
{
RUASSERT(size_ > 0);
@@ -186,7 +185,6 @@ void CRUUpdateBitmap::StoreData(CUOFsIpcMessageTranslator &translator)
translator.WriteBlock(buffer_, size_);
#pragma warn(1506) // warning elimination
}
-// LCOV_EXCL_STOP
//--------------------------------------------------------------------------//
// CRUDeltaDef
@@ -362,7 +360,6 @@ TInt32 CRUDeltaStatistics::GetDeltaSize()
//
// De-serialize the context
//--------------------------------------------------------------------------//
-// LCOV_EXCL_START :cnu
void CRUDeltaStatistics::LoadData(CUOFsIpcMessageTranslator &translator)
{
translator.ReadBlock(&nRanges_, sizeof(TInt32));
@@ -387,14 +384,12 @@ void CRUDeltaStatistics::LoadData(CUOFsIpcMessageTranslator &translator)
pUpdateBitmap_ = CRUUpdateBitmap::CreateInstance(translator);
}
}
-// LCOV_EXCL_STOP
//--------------------------------------------------------------------------//
// CRUDeltaStatistics::StoreData()
//
// Serialize the context
//--------------------------------------------------------------------------//
-// LCOV_EXCL_START :cnu
void CRUDeltaStatistics::StoreData(CUOFsIpcMessageTranslator &translator)
{
@@ -418,7 +413,6 @@ void CRUDeltaStatistics::StoreData(CUOFsIpcMessageTranslator &translator)
pUpdateBitmap_->StoreData(translator);
}
}
-// LCOV_EXCL_STOP
//--------------------------------------------------------------------------//
// CRUDeltaStatistics::GetPackedBufferSize()
@@ -471,7 +465,6 @@ CRUDeltaStatisticsMap::operator = (const CRUDeltaStatisticsMap& other)
//
// De-serialize the context
//--------------------------------------------------------------------------//
-// LCOV_EXCL_START :cnu
void CRUDeltaStatisticsMap::LoadData(CUOFsIpcMessageTranslator &translator)
{
CRUDeltaStatistics deStat;
@@ -487,14 +480,12 @@ void CRUDeltaStatisticsMap::LoadData(CUOFsIpcMessageTranslator &translator)
(*this)[epoch] = deStat;
}
}
-// LCOV_EXCL_STOP
//--------------------------------------------------------------------------//
// CRUDeltaStatisticsMap::StoreData()
//
// Serialize the context
//--------------------------------------------------------------------------//
-// LCOV_EXCL_START :cnu
void CRUDeltaStatisticsMap::StoreData(CUOFsIpcMessageTranslator &translator)
{
CRUDeltaStatistics deStat;
@@ -516,4 +507,3 @@ void CRUDeltaStatisticsMap::StoreData(CUOFsIpcMessageTranslator &translator)
deStat.StoreData(translator);
}
}
-// LCOV_EXCL_STOP
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/refresh/RuDupElimGlobals.cpp
----------------------------------------------------------------------
diff --git a/core/sql/refresh/RuDupElimGlobals.cpp b/core/sql/refresh/RuDupElimGlobals.cpp
index 7e9c655..cf78709 100644
--- a/core/sql/refresh/RuDupElimGlobals.cpp
+++ b/core/sql/refresh/RuDupElimGlobals.cpp
@@ -92,7 +92,6 @@ void CRUDupElimGlobals::Init(
//
// Singletone initialization from the IPC buffer
//--------------------------------------------------------------------------//
-// LCOV_EXCL_START :cnu
void CRUDupElimGlobals::LoadData(CUOFsIpcMessageTranslator &translator)
{
translator.ReadBlock(&isRangeResolv_, sizeof(BOOL));
@@ -107,14 +106,12 @@ void CRUDupElimGlobals::LoadData(CUOFsIpcMessageTranslator &translator)
translator.ReadBlock(&wasPrevDEInvocationCompleted_, sizeof(BOOL));
translator.ReadBlock(&isSkipCrossTypeResoultion_, sizeof(BOOL));
}
-// LCOV_EXCL_STOP
//--------------------------------------------------------------------------//
// CRUDupElimGlobals::StoreData()
//
// Serialization to the IPC buffer
//--------------------------------------------------------------------------//
-// LCOV_EXCL_START :cnu
void CRUDupElimGlobals::StoreData(CUOFsIpcMessageTranslator &translator)
{
translator.WriteBlock(&isRangeResolv_, sizeof(BOOL));
@@ -129,4 +126,3 @@ void CRUDupElimGlobals::StoreData(CUOFsIpcMessageTranslator &translator)
translator.WriteBlock(&wasPrevDEInvocationCompleted_, sizeof(BOOL));
translator.WriteBlock(&isSkipCrossTypeResoultion_, sizeof(BOOL));
}
-// LCOV_EXCL_STOP
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/refresh/RuDupElimLogScanner.h
----------------------------------------------------------------------
diff --git a/core/sql/refresh/RuDupElimLogScanner.h b/core/sql/refresh/RuDupElimLogScanner.h
index 65472ad..726d35c 100644
--- a/core/sql/refresh/RuDupElimLogScanner.h
+++ b/core/sql/refresh/RuDupElimLogScanner.h
@@ -129,7 +129,6 @@ public:
public:
// Pack/unpack for IPC - refinements & implementation of pure virtuals
- // LCOV_EXCL_START :cnu
// Used in the main process side
virtual void StoreRequest(CUOFsIpcMessageTranslator &translator)
@@ -154,7 +153,6 @@ public:
{
statMap_.StoreData(translator);
}
- // LCOV_EXCL_STOP
//-----------------------------------------//
// Private area
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/refresh/RuDupElimTaskExecutor.cpp
----------------------------------------------------------------------
diff --git a/core/sql/refresh/RuDupElimTaskExecutor.cpp b/core/sql/refresh/RuDupElimTaskExecutor.cpp
index de490a7..3a476e3 100644
--- a/core/sql/refresh/RuDupElimTaskExecutor.cpp
+++ b/core/sql/refresh/RuDupElimTaskExecutor.cpp
@@ -209,7 +209,6 @@ Lng32 CRUDupElimTaskExecutor::GetIpcBufferSize() const
// build the units and load their SQL text.
//
//--------------------------------------------------------------------------//
-// LCOV_EXCL_START :cnu
void CRUDupElimTaskExecutor::
LoadRequest(CUOFsIpcMessageTranslator &translator)
{
@@ -246,14 +245,12 @@ LoadRequest(CUOFsIpcMessageTranslator &translator)
pRangeResolver_->LoadRequest(translator);
}
}
-// LCOV_EXCL_STOP
//--------------------------------------------------------------------------//
// CRUDupElimTaskExecutor::StoreReply()
//
// REMOTE before sending to MAIN, pack the statistics
//--------------------------------------------------------------------------//
-// LCOV_EXCL_START :cnu
void CRUDupElimTaskExecutor::
StoreReply(CUOFsIpcMessageTranslator &translator)
{
@@ -289,14 +286,12 @@ StoreReply(CUOFsIpcMessageTranslator &translator)
translator.WriteBlock(&flag, sizeof(BOOL));
}
}
-// LCOV_EXCL_STOP
//--------------------------------------------------------------------------//
// CRUDupElimTaskExecutor::LoadReply()
//
// MAIN after receiving from REMOTE, unpack the statistics
//--------------------------------------------------------------------------//
-// LCOV_EXCL_START :cnu
void CRUDupElimTaskExecutor::
LoadReply(CUOFsIpcMessageTranslator &translator)
{
@@ -321,7 +316,6 @@ LoadReply(CUOFsIpcMessageTranslator &translator)
pRangeResolver_->LoadReply(translator);
}
}
-// LCOV_EXCL_STOP
//--------------------------------------------------------------------------//
// CRUDupElimTaskExecutor::StoreRequest()
@@ -329,7 +323,6 @@ LoadReply(CUOFsIpcMessageTranslator &translator)
// MAIN before sending to REMOTE, pack the DE globals and the SQL text.
//
//--------------------------------------------------------------------------//
-// LCOV_EXCL_START :cnu
void CRUDupElimTaskExecutor::
StoreRequest(CUOFsIpcMessageTranslator &translator)
{
@@ -370,7 +363,6 @@ StoreRequest(CUOFsIpcMessageTranslator &translator)
translator.SetMessageType(CUOFsIpcMessageTranslator::RU_DE_EXECUTOR);
}
-// LCOV_EXCL_STOP
//--------------------------------------------------------------------------//
// PRIVATE AREA
@@ -868,7 +860,6 @@ BOOL CRUDupElimTaskExecutor::CanCompletePhase()
//--------------------------------------------------------------------------//
#ifdef _DEBUG
-// LCOV_EXCL_START :dpm
void CRUDupElimTaskExecutor::DumpPerformanceStatistics()
{
CRUOptions &options = CRUGlobals::GetInstance()->GetOptions();
@@ -896,5 +887,4 @@ void CRUDupElimTaskExecutor::DumpPerformanceStatistics()
journal.LogMessage(str);
}
}
-// LCOV_EXCL_STOP
#endif
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/refresh/RuEmpCheckTaskExecutor.cpp
----------------------------------------------------------------------
diff --git a/core/sql/refresh/RuEmpCheckTaskExecutor.cpp b/core/sql/refresh/RuEmpCheckTaskExecutor.cpp
index bbe380b..b55058d 100644
--- a/core/sql/refresh/RuEmpCheckTaskExecutor.cpp
+++ b/core/sql/refresh/RuEmpCheckTaskExecutor.cpp
@@ -111,7 +111,6 @@ void CRUEmpCheckTaskExecutor::Init()
//--------------------------------------------------------------------------//
// CRUEmpCheckTaskExecutor::LoadRequest()
//--------------------------------------------------------------------------//
-// LCOV_EXCL_START :cnu
void CRUEmpCheckTaskExecutor::
LoadRequest(CUOFsIpcMessageTranslator &translator)
{
@@ -123,12 +122,10 @@ LoadRequest(CUOFsIpcMessageTranslator &translator)
pEmpCheck_->LoadData(translator);
}
-// LCOV_EXCL_STOP
//--------------------------------------------------------------------------//
// CRUEmpCheckTaskExecutor::LoadReply()
//--------------------------------------------------------------------------//
-// LCOV_EXCL_START :cnu
void CRUEmpCheckTaskExecutor::
LoadReply(CUOFsIpcMessageTranslator &translator)
{
@@ -138,12 +135,10 @@ LoadReply(CUOFsIpcMessageTranslator &translator)
pEmpCheck_->LoadData(translator);
}
-// LCOV_EXCL_STOP
//--------------------------------------------------------------------------//
// CRUEmpCheckTaskExecutor::StoreRequest()
//--------------------------------------------------------------------------//
-// LCOV_EXCL_START :cnu
void CRUEmpCheckTaskExecutor::
StoreRequest(CUOFsIpcMessageTranslator &translator)
{
@@ -154,12 +149,10 @@ StoreRequest(CUOFsIpcMessageTranslator &translator)
translator.SetMessageType(CUOFsIpcMessageTranslator::
RU_EMP_CHECK_EXECUTOR);
}
-// LCOV_EXCL_STOP
//--------------------------------------------------------------------------//
// CRUEmpCheckTaskExecutor::StoreReply()
//--------------------------------------------------------------------------//
-// LCOV_EXCL_START :cnu
void CRUEmpCheckTaskExecutor::
StoreReply(CUOFsIpcMessageTranslator &translator)
{
@@ -167,7 +160,6 @@ StoreReply(CUOFsIpcMessageTranslator &translator)
pEmpCheck_->StoreData(translator);
}
-// LCOV_EXCL_STOP
//--------------------------------------------------------------------------//
// CRUEmpCheckTaskExecutor::Work()
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/refresh/RuEmpCheckTaskExecutor.h
----------------------------------------------------------------------
diff --git a/core/sql/refresh/RuEmpCheckTaskExecutor.h b/core/sql/refresh/RuEmpCheckTaskExecutor.h
index 10b3175..146129b 100644
--- a/core/sql/refresh/RuEmpCheckTaskExecutor.h
+++ b/core/sql/refresh/RuEmpCheckTaskExecutor.h
@@ -98,12 +98,10 @@ protected:
enum { SIZE_OF_PACK_BUFFER = 1000 };
//-- Implementation of pure virtual
- // LCOV_EXCL_START :cnu
virtual Lng32 GetIpcBufferSize() const
{
return SIZE_OF_PACK_BUFFER; // Initial size
}
- // LCOV_EXCL_STOP
private:
enum STATES { EX_CHECK = REMOTE_STATES_START };
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/refresh/RuException.cpp
----------------------------------------------------------------------
diff --git a/core/sql/refresh/RuException.cpp b/core/sql/refresh/RuException.cpp
index fe96bad..39b4dd2 100644
--- a/core/sql/refresh/RuException.cpp
+++ b/core/sql/refresh/RuException.cpp
@@ -40,7 +40,6 @@
//--------------------------------------------------------------------------//
// CRUException::StoreData()
//--------------------------------------------------------------------------//
-// LCOV_EXCL_START :cnu
void CRUException::StoreData(CUOFsIpcMessageTranslator &translator)
{
Int32 i;
@@ -74,12 +73,10 @@ void CRUException::StoreData(CUOFsIpcMessageTranslator &translator)
// StoreErrorParams(translator,i);
}
}
-// LCOV_EXCL_STOP
//--------------------------------------------------------------------------//
// CRUException::StoreErrorParams()
//--------------------------------------------------------------------------//
-// LCOV_EXCL_START :rfi
void CRUException::StoreErrorParams(CUOFsIpcMessageTranslator &translator,
Int32 index)
{
@@ -107,12 +104,10 @@ void CRUException::StoreErrorParams(CUOFsIpcMessageTranslator &translator,
#pragma warn(1506) // warning elimination
}
}
-// LCOV_EXCL_STOP
//--------------------------------------------------------------------------//
// CRUException::LoadData()
//--------------------------------------------------------------------------//
-// LCOV_EXCL_START :cnu
void CRUException::LoadData(CUOFsIpcMessageTranslator &translator)
{
Int32 i;
@@ -138,12 +133,10 @@ void CRUException::LoadData(CUOFsIpcMessageTranslator &translator)
// LoadErrorParams(translator,i);
}
}
-// LCOV_EXCL_STOP
//--------------------------------------------------------------------------//
// CRUException::LoadErrorParams()
//--------------------------------------------------------------------------//
-// LCOV_EXCL_START :rfi
void CRUException::
LoadErrorParams(CUOFsIpcMessageTranslator &translator,
Int32 index)
@@ -175,4 +168,3 @@ LoadErrorParams(CUOFsIpcMessageTranslator &translator,
delete [] buffer;
}
}
-// LCOV_EXCL_STOP
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/refresh/RuExecController.cpp
----------------------------------------------------------------------
diff --git a/core/sql/refresh/RuExecController.cpp b/core/sql/refresh/RuExecController.cpp
index 0d90ddb..2322618 100644
--- a/core/sql/refresh/RuExecController.cpp
+++ b/core/sql/refresh/RuExecController.cpp
@@ -108,7 +108,6 @@ void CRUExecController::HandleRequest(CRURuntimeControllerRqst *pRqst)
HandleRequestFailure(pRqst, ex);
return;
}
- // LCOV_EXCL_START :rfi
catch (...)
{
// Unknown error happened
@@ -116,7 +115,6 @@ void CRUExecController::HandleRequest(CRURuntimeControllerRqst *pRqst)
HandleRequestFailure(pRqst, ex);
return;
}
- // LCOV_EXCL_STOP
}
//--------------------------------------------------------------------------//
@@ -228,7 +226,6 @@ void CRUExecController::HandleAwaitEventRqst()
return;
}
- // LCOV_EXCL_START :rfi
catch (CUOFsTaskProcessPool::CUOFsUnknownProcessException &e)
{
// If it's the TMF completion message, then try to listen again
@@ -240,7 +237,6 @@ void CRUExecController::HandleAwaitEventRqst()
throw e;
}
}
- // LCOV_EXCL_STOP
}
}
@@ -442,7 +438,6 @@ void CRUExecController::SerializeTaskExecutor(CRUTaskExecutor &executor)
break;
}
- // LCOV_EXCL_START :rfi
catch (CUOFsBufferOverFlowException &ex)
{
if (pTranslator->GetBufferSize()
@@ -458,7 +453,6 @@ void CRUExecController::SerializeTaskExecutor(CRUTaskExecutor &executor)
// The buffer can be resized up to the maximum
executor.ReAllocateBuffer(2 /*factor*/);
}
- // LCOV_EXCL_STOP
}
}
@@ -524,7 +518,6 @@ HandleRemoteExecutorSuccess(CRUTask *pTask,
//--------------------------------------------------------------------------//
// CRUExecController::HandleRemoteExecutorFailure()
//--------------------------------------------------------------------------//
-// LCOV_EXCL_START :rfi
void CRUExecController::
HandleRemoteExecutorFailure(CRUTask *pTask,
Lng32 pid,
@@ -549,7 +542,6 @@ HandleRemoteExecutorFailure(CRUTask *pTask,
ex.SetError(IDS_RU_REMOTE_EXECUTION_FAILURE);
HandleTaskFailure(*pTask, ex);
}
-// LCOV_EXCL_STOP
//--------------------------------------------------------------------------//
// GENERAL-PURPOSE METHODS
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/refresh/RuForceOptions.cpp
----------------------------------------------------------------------
diff --git a/core/sql/refresh/RuForceOptions.cpp b/core/sql/refresh/RuForceOptions.cpp
index ef637fb..24b9711 100644
--- a/core/sql/refresh/RuForceOptions.cpp
+++ b/core/sql/refresh/RuForceOptions.cpp
@@ -38,7 +38,6 @@
#include "dsstring.h"
#include"RuForceOptions.h"
-// LCOV_EXCL_START :cnu
CRUForceOptions::~CRUForceOptions()
{
@@ -165,6 +164,5 @@ CRUForceOptions::MdamOptions CRUMVForceOptions::GetForceMdamOptionForTable(const
return CRUForceOptions::MDAM_NO_FORCE;
}
-// LCOV_EXCL_STOP
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/refresh/RuForceOptions.h
----------------------------------------------------------------------
diff --git a/core/sql/refresh/RuForceOptions.h b/core/sql/refresh/RuForceOptions.h
index 1bb317a..4a0298b 100644
--- a/core/sql/refresh/RuForceOptions.h
+++ b/core/sql/refresh/RuForceOptions.h
@@ -52,16 +52,13 @@ class CRUMVForceOptionsList;
//----------------------------------------------------------------------------
// used by Range logging
-// LCOV_EXCL_START
DECLARE_PTRLIST(REFRESH_LIB_CLASS, CRUMVForceOptions);
-// LCOV_EXCL_STOP
//----------------------------------------------------------------------------
// CRUForceOptions
// Store data about the force options for a group of MVs
//----------------------------------------------------------------------------
-// LCOV_EXCL_START :cnu
class REFRESH_LIB_CLASS CRUForceOptions {
public:
@@ -317,6 +314,5 @@ private:
inline CRUMVForceOptionsList::~CRUMVForceOptionsList() {}
inline CRUTableForceOptionsList::~CRUTableForceOptionsList() {}
-// LCOV_EXCL_STOP
#endif
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/refresh/RuForceOptionsParser.cpp
----------------------------------------------------------------------
diff --git a/core/sql/refresh/RuForceOptionsParser.cpp b/core/sql/refresh/RuForceOptionsParser.cpp
index 6d307c4..4e184b4 100644
--- a/core/sql/refresh/RuForceOptionsParser.cpp
+++ b/core/sql/refresh/RuForceOptionsParser.cpp
@@ -43,7 +43,6 @@
#include "RuGlobals.h"
#include "RuOptions.h"
-// LCOV_EXCL_START :cnu
//----------------------------------------------------------------------------
//Destructor
@@ -739,4 +738,3 @@ CDSString CRUForceOptionsParser::GetQualifiedName() const
ansiName.GetObjectName();
}
-// LCOV_EXCL_STOP
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/refresh/RuForceOptionsParser.h
----------------------------------------------------------------------
diff --git a/core/sql/refresh/RuForceOptionsParser.h b/core/sql/refresh/RuForceOptionsParser.h
index b5cd4aa..c59a189 100644
--- a/core/sql/refresh/RuForceOptionsParser.h
+++ b/core/sql/refresh/RuForceOptionsParser.h
@@ -94,7 +94,6 @@ class CRUMVForceOptionsList;
// line --> FORCE_CQS = sql_stmt
// sql_stmt --> (one line statement that ends with ;)
-// LCOV_EXCL_START :cnu
class REFRESH_LIB_CLASS CRUForceOptionsParser
{
@@ -205,6 +204,5 @@ private:
Int32 lineNumber_;
};
-// LCOV_EXCL_STOP
#endif
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/refresh/RuLockEquivSetTaskExecutor.h
----------------------------------------------------------------------
diff --git a/core/sql/refresh/RuLockEquivSetTaskExecutor.h b/core/sql/refresh/RuLockEquivSetTaskExecutor.h
index 63dd794..d103d5e 100644
--- a/core/sql/refresh/RuLockEquivSetTaskExecutor.h
+++ b/core/sql/refresh/RuLockEquivSetTaskExecutor.h
@@ -87,19 +87,16 @@ public:
//----------------------------------//
protected:
//-- Implementation of pure virtual
- // LCOV_EXCL_START :cnu
virtual Lng32 GetIpcBufferSize() const
{
return 0; // The task is always performed locally
}
- // LCOV_EXCL_STOP
//----------------------------------//
// Private Members
//----------------------------------//
private:
// Not implemented because this executor always runs in the main process
- // LCOV_EXCL_START :cnu
// These functions serialize/de-serialize the executor's context
// for the message communication with the remote server process
@@ -123,7 +120,6 @@ private:
{
RUASSERT(FALSE);
}
- // LCOV_EXCL_STOP
private:
//-- Prevent copying
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/refresh/RuLogCleanupTaskExecutor.cpp
----------------------------------------------------------------------
diff --git a/core/sql/refresh/RuLogCleanupTaskExecutor.cpp b/core/sql/refresh/RuLogCleanupTaskExecutor.cpp
index fb956cd..4ca6a97 100644
--- a/core/sql/refresh/RuLogCleanupTaskExecutor.cpp
+++ b/core/sql/refresh/RuLogCleanupTaskExecutor.cpp
@@ -78,7 +78,6 @@ void CRULogCleanupTaskExecutor::Init()
//--------------------------------------------------------------------------//
// CRULogCleanupTaskExecutor::StoreRequest()
//--------------------------------------------------------------------------//
-// LCOV_EXCL_START :cnu
void CRULogCleanupTaskExecutor::
StoreRequest(CUOFsIpcMessageTranslator &translator)
{
@@ -91,12 +90,10 @@ void CRULogCleanupTaskExecutor::
translator.SetMessageType(
CUOFsIpcMessageTranslator::RU_LOG_CLEANUP_EXECUTOR);
}
-// LCOV_EXCL_STOP
//--------------------------------------------------------------------------//
// CRULogCleanupTaskExecutor::LoadRequest()
//--------------------------------------------------------------------------//
-// LCOV_EXCL_START :cnu
void CRULogCleanupTaskExecutor::
LoadRequest(CUOFsIpcMessageTranslator &translator)
{
@@ -106,7 +103,6 @@ void CRULogCleanupTaskExecutor::
translator.ReadBlock(&hasRangeLog_,sizeof(BOOL));
translator.ReadBlock(&noOfPartitions_,sizeof(Int32));
}
-// LCOV_EXCL_STOP
//--------------------------------------------------------------------------//
// CRULogCleanupTaskExecutor::ComposeMySql()
@@ -262,11 +258,9 @@ CRULogCleanupTaskExecutor::SQL_STATEMENT CRULogCleanupTaskExecutor::decideOnDele
deleteMethod = CLEAN_IUD_BASIC;
#ifdef _DEBUG
- // LCOV_EXCL_START :dpb
CDSString msg("Safety factor set to 100 or less - using simple delete.");
CRUGlobals::GetInstance()->
LogDebugMessage(CRUGlobals::DUMP_COMPILED_DYNAMIC_SQL, "", msg, FALSE);
- // LCOV_EXCL_STOP
#endif
}
else
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/refresh/RuLogCleanupTaskExecutor.h
----------------------------------------------------------------------
diff --git a/core/sql/refresh/RuLogCleanupTaskExecutor.h b/core/sql/refresh/RuLogCleanupTaskExecutor.h
index 131a919..97933cf 100644
--- a/core/sql/refresh/RuLogCleanupTaskExecutor.h
+++ b/core/sql/refresh/RuLogCleanupTaskExecutor.h
@@ -92,7 +92,6 @@ public:
// These functions serialize/de-serialize the executor's context
// for the message communication with the remote server process
- // LCOV_EXCL_START :cnu
// Used in the main process side
virtual void StoreRequest(CUOFsIpcMessageTranslator &translator);
@@ -107,18 +106,15 @@ public:
{
inherited::StoreReply(translator);
}
- // LCOV_EXCL_STOP
protected:
enum { SIZE_OF_PACK_BUFFER = 2000 };
//-- Implementation of pure virtual
- // LCOV_EXCL_START :cnu
virtual Lng32 GetIpcBufferSize() const
{
return SIZE_OF_PACK_BUFFER; // Initial size
}
- // LCOV_EXCL_STOP
private:
//-- Prevent copying
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/refresh/RuMVEquivSetBuilder.cpp
----------------------------------------------------------------------
diff --git a/core/sql/refresh/RuMVEquivSetBuilder.cpp b/core/sql/refresh/RuMVEquivSetBuilder.cpp
index 6c25e2e..f54ac54 100644
--- a/core/sql/refresh/RuMVEquivSetBuilder.cpp
+++ b/core/sql/refresh/RuMVEquivSetBuilder.cpp
@@ -221,7 +221,6 @@ CRUMVList& CRUMVEquivSetBuilder::GetEquivSetsRootsByMVUID(TInt64 uid)
}
#ifdef _DEBUG
-// LCOV_EXCL_START :dpm
//--------------------------------------------------------------------------//
// CRUMVEquivSetBuilder::DumpSets()
//--------------------------------------------------------------------------//
@@ -252,5 +251,4 @@ void CRUMVEquivSetBuilder::DumpSets()
}
}
}
-// LCOV_EXCL_STOP
#endif
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/refresh/RuMVEquivSetBuilder.h
----------------------------------------------------------------------
diff --git a/core/sql/refresh/RuMVEquivSetBuilder.h b/core/sql/refresh/RuMVEquivSetBuilder.h
index 904458d..9d99a04 100644
--- a/core/sql/refresh/RuMVEquivSetBuilder.h
+++ b/core/sql/refresh/RuMVEquivSetBuilder.h
@@ -80,12 +80,10 @@ public:
virtual void Run();
// These functions are used for retrieving the results
- // LCOV_EXCL_START :cnu
virtual Int32 GetNumOfSets()
{
return equivSetsRootsList_.GetCount();
}
- // LCOV_EXCL_STOP
CRUMVList& GetEquivSetsRootsByMVUID(TInt64 uid);
[04/14] incubator-trafodion git commit: lcov: commit #1
Posted by an...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/optimizer/mdam.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/mdam.cpp b/core/sql/optimizer/mdam.cpp
index 05db172..faa9ffb 100644
--- a/core/sql/optimizer/mdam.cpp
+++ b/core/sql/optimizer/mdam.cpp
@@ -334,14 +334,11 @@ void DisjunctArray::orDisjunctArray
-// LCOV_EXCL_START :dpm
void DisjunctArray::display() const
{
print();
}
-// LCOV_EXCL_STOP
-// LCOV_EXCL_START :dpm
void DisjunctArray::print( FILE* ofd,
const char* indent,
const char* title) const
@@ -364,7 +361,6 @@ void DisjunctArray::print( FILE* ofd,
} // for every disjunct
} // display()
-// LCOV_EXCL_STOP
//---------------------------------------------------------
@@ -950,10 +946,8 @@ ScanKey::isAKeyPredicateForColumn(
}
else
{
- // LCOV_EXCL_START :rfi
DCMPASSERT(FALSE);
return FALSE; // internal error case
- // LCOV_EXCL_STOP
}
}
@@ -1893,7 +1887,6 @@ MdamKey::isAPartKeyPredicateForMdam(const ValueId& predId, const ValueIdSet& inp
-// LCOV_EXCL_START :dpm
void MdamKey::print( FILE* ofd,
const char* indent,
const char* title) const
@@ -1956,7 +1949,6 @@ void MdamKey::print( FILE* ofd,
} // is printing enabled?
} // MdamKey::print()
-// LCOV_EXCL_STOP
@@ -2052,7 +2044,6 @@ void Disjuncts::computeCommonPredicates()
}
} // Disjuncts::computeCommonPredicates(..)
-// LCOV_EXCL_START :dpm
void Disjuncts::print( FILE* ofd,
const char* indent,
const char* title) const
@@ -2085,7 +2076,6 @@ void Disjuncts::print() const
{
print(stdout);
}
-// LCOV_EXCL_STOP
NABoolean Disjuncts::
get(Disjunct& disjunct, CollIndex i) const
@@ -2438,7 +2428,7 @@ void KeyColumns::KeyColumn::insert(const ValueId &predicate)
break;
default:
// The column MUST be EMPTY, EQUAL, INLIST, IS_NULL, RANGE, etc
- DCMPASSERT(FALSE); // LCOV_EXCL_LINE :rfi
+ DCMPASSERT(FALSE);
} // switch getType(predicate)
// Now insert the new predicate:
@@ -2469,13 +2459,12 @@ KeyColumns::KeyColumn::getType(const ValueId& predId) const
case ITM_ASSIGN:
return ASSIGN;
default:
- CMPABORT; // LCOV_EXCL_LINE :rfi // unsupported predicate!
+ CMPABORT; // unsupported predicate
break;
}
return INLIST; // to keep the compiler happy, fix this!
} // getType(predId)
-// LCOV_EXCL_START :dpm
void KeyColumns::KeyColumn::print( FILE* ofd,
const char* indent,
const char* /*title*/ ) const
@@ -2517,7 +2506,6 @@ void KeyColumns::KeyColumn::print( FILE* ofd,
getPredicates().print(ofd,indent,"");
fprintf(ofd,"\n");
}
-// LCOV_EXCL_STOP
void KeyColumns::KeyColumn::clearPredicates()
@@ -2704,7 +2692,7 @@ KeyColumns::getKeyColumn(const ValueId& column) const
}
}
if (result == NULL)
- DCMPASSERT(FALSE); // LCOV_EXCL_LINE :rfi
+ DCMPASSERT(FALSE);
return *result;
}
@@ -2813,7 +2801,7 @@ void KeyColumns::insertPredicate(const ValueId& predicate,
// continue processing
break;
default:
- DCMPASSERT(FALSE); // LCOV_EXCL_LINE :rfi // invalid predicate
+ DCMPASSERT(FALSE); // invalid predicate
}
// Some veggies can be rewritted to preds like 2 = 7
@@ -2828,7 +2816,7 @@ void KeyColumns::insertPredicate(const ValueId& predicate,
AND
(predicate.getItemExpr()->getConstChild(1)->
castToItemExpr()->getOperatorType() == ITM_CONSTANT) )
- DCMPASSERT(FALSE); // LCOV_EXCL_LINE :rfi // $$$ How do we handle CONST OPERATOR CONST???
+ DCMPASSERT(FALSE); // $$$ How do we handle CONST OPERATOR CONST???
// Because of VEG rewriting, the predicate may look like:
// A=2 AND B=2, parse it if so:
@@ -2921,7 +2909,6 @@ void KeyColumns::clearPredicates()
}
}
-// LCOV_EXCL_START :dpm
void KeyColumns::print( FILE* ofd,
const char* indent,
const char* title) const
@@ -2953,7 +2940,6 @@ void KeyColumns::print( FILE* ofd,
} // for every column
} // KeyColumns::print
-// LCOV_EXCL_STOP
// -----------------------------------------------------------------------
@@ -2990,7 +2976,6 @@ NABoolean ColumnOrderList::containsPredicates() const
return containsPreds;
} // containsPredicates()
-// LCOV_EXCL_START :dpm
void ColumnOrderList::print( FILE* ofd,
const char* indent,
const char* /*title*/) const
@@ -3021,7 +3006,6 @@ void ColumnOrderList::print( FILE* ofd,
}
}
} // ColumnOrderList::print(...)
-// LCOV_EXCL_STOP
@@ -3325,7 +3309,6 @@ computeCommonKeyPredicates(ValueIdSet& commonKeyPredicates) const
-// LCOV_EXCL_START :dpm
void ColumnOrderListPtrArray::print( FILE* ofd,
const char* indent,
const char* /*title*/) const
@@ -3339,7 +3322,6 @@ void ColumnOrderListPtrArray::print( FILE* ofd,
}
}
-// LCOV_EXCL_STOP
const ValueIdSet ScanKey::getAllColumnsReferenced() const
{
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/optimizer/memo.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/memo.cpp b/core/sql/optimizer/memo.cpp
index 181c805..0298e1b 100644
--- a/core/sql/optimizer/memo.cpp
+++ b/core/sql/optimizer/memo.cpp
@@ -116,12 +116,10 @@ CascadesGroup::~CascadesGroup()
//<pb>
-// LCOV_EXCL_START
void CascadesGroup::print(FILE * f, const char * prefix, const char *) const
{
} // CascadesGroup::print
-// LCOV_EXCL_STOP
//<pb>
void CascadesGroup::addLogExpr(RelExpr * expr, RelExpr *src)
{
@@ -158,7 +156,7 @@ void CascadesGroup::addLogExpr(RelExpr * expr, RelExpr *src)
// improve log prop's/group attributes; recost all plans if required
if (expr->reconcileGroupAttr(getGroupAttr()))
// XXX recost all plans in this group
- ABORT("reoptimizing after improveLogProp() not implemented"); // LCOV_EXCL_LINE
+ ABORT("reoptimizing after improveLogProp() not implemented");
}
// remember that expr came from src
@@ -290,7 +288,6 @@ RelExpr * CascadesGroup::unlinkLogExpr(RelExpr *expr)
}
//<pb>
// A dangling method
-// LCOV_EXCL_START
RelExpr * CascadesGroup::unlinkPhysExpr(RelExpr *expr)
{
// -------------------------------------------------------------
@@ -326,7 +323,6 @@ RelExpr * CascadesGroup::unlinkPhysExpr(RelExpr *expr)
// to remind the calling procedure that it owns that expression now)
return expr;
}
-// LCOV_EXCL_STOP
//<pb>
CascadesPlan * CascadesGroup::getFirstPlan() const
@@ -351,7 +347,6 @@ RelExpr * CascadesGroup::getLastLogExpr() const
}
// use by OptDebug::showMemoStats(). Mask it out from code coverage
-// // LCOV_EXCL_START
Lng32 CascadesGroup::getCountOfLogicalExpr() const
{
RelExpr * expr = logExprs_;
@@ -392,7 +387,6 @@ double CascadesGroup::calculateNoOfLogPlans() const
result = result + (result*numOfMergedExprs);
return result;
}
-// LCOV_EXCL_STOP
HashValue CascadesGroup::hash()
{
@@ -767,7 +761,6 @@ CascadesMemo::CascadesMemo(CascadesGroupId groups, Lng32 buckets)
// RelExpr::optimizeNode() by setting memo = NULL. This is a speeding
// deletion.
-// LCOV_EXCL_START
CascadesMemo::~CascadesMemo()
{
if (NOT (CURRSTMT_OPTGLOBALS->BeSilent))
@@ -820,10 +813,8 @@ CascadesMemo::~CascadesMemo()
delete group_[groupId];
} // CascadesMemo::~CascadesMemo
-// LCOV_EXCL_STOP
//<pb>
-// LCOV_EXCL_START
void CascadesMemo::print(FILE * f, const char *, const char *) const
{
} // CascadesMemo::print
@@ -841,7 +832,6 @@ void CascadesMemo::print_all_trees(CascadesGroupId root,
// entire body of this method is essentially dead code until someone
// resurrects the MOTIF/X11 based mxcmp "display" GUI too.
} // CascadesMemo::print_all_trees
-// LCOV_EXCL_STOP
//<pb>
RelExpr * CascadesMemo::include(RelExpr * expr,
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/optimizer/opt.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/opt.cpp b/core/sql/optimizer/opt.cpp
index 2ab3de9..4fe847f 100644
--- a/core/sql/optimizer/opt.cpp
+++ b/core/sql/optimizer/opt.cpp
@@ -88,26 +88,22 @@ extern const WordAsBits SingleBitArray[];
// global display methods for purposes of debugging
// -----------------------------------------------------------------------
-// LCOV_EXCL_START
void displayContext (const Context & context)
{
context.print();
}
-// LCOV_EXCL_STOP
// -----------------------------------------------------------------------
// local helper functions
// -----------------------------------------------------------------------
#ifdef _DEBUG
-// LCOV_EXCL_START
static const char *getCOMPILE_TIME_MONITOR_OUTPUT_FILEname()
{
const char * fname = ActiveSchemaDB()->getDefaults().
getValue(COMPILE_TIME_MONITOR_OUTPUT_FILE);
return (*fname && stricmp(fname,"NONE") != 0) ? fname : NULL;
}
-// LCOV_EXCL_STOP
#endif //_DEBUG
@@ -221,7 +217,6 @@ void clearFailedPlanWarningsForStream()
// This method is for the old driver and not used unless CQD NEW_OPT_DRIVER
// is OFF. We use the new driver by default.
-// LCOV_EXCL_START
RelExpr * RelExpr::optimize(NABoolean exceptionMode,
Guidance * guidance,
ReqdPhysicalProperty * rpp,
@@ -931,7 +926,6 @@ if (plan && context->getGroupAttr()->isStream())
return ( plan );
} // optimize
-// LCOV_EXCL_STOP
#pragma warn(262) // warning elimination
#pragma warning (default : 4101) //warning elimination
@@ -976,7 +970,6 @@ Context::~Context()
} // Context::~Context
//<pb>
-// LCOV_EXCL_START
void Context::print(FILE * f, const char * prefix, const char * suffix) const
{
#ifdef _DEBUG
@@ -1342,7 +1335,6 @@ NAString Context::getStatusString() const
return result;
}
-// LCOV_EXCL_STOP
//<pb>
// ----------------------------------------------------------------------
@@ -4233,7 +4225,6 @@ void OptDefaults::initializeCostInfo()
// Ideally this values shl'd be placed in nadefaults.cpp once regressions are resolved.
// on SQ, CB_155 is off and we mask the following code from code coverage.
- // LCOV_EXCL_START
if(CmpCommon::getDefault(COMP_BOOL_155) == DF_ON )
{
NAString v="1600.0";
@@ -4328,7 +4319,6 @@ void OptDefaults::initializeCostInfo()
defs_->validateAndInsert("CPUCOST_SCAN_OVH_PER_KB", v, FALSE);
defs_->validateAndInsert("CPUCOST_SCAN_OVH_PER_ROW", v, FALSE);
}
- // LCOV_EXCL_STOP
// -----------------------------------------------------------------------
// All resource-to-time multipliers need to be re-calibrated in
// a per statement basis since they may have been changed by the
@@ -5098,7 +5088,6 @@ NABoolean OptDefaults::InitCostVariables()
{
defaultPerformanceGoal_ = new (heap_) OptimizeForLastRow();
}
-// LCOV_EXCL_START
else if (goalTok == DF_FIRSTROW)
{
defaultPerformanceGoal_ = new (heap_) OptimizeForFirstRow();
@@ -5117,7 +5106,6 @@ NABoolean OptDefaults::InitCostVariables()
<< DgString0(goalText)
<< DgString1("OPTIMIZATION_GOAL");
}
-// LCOV_EXCL_STOP
if (resourcePerformanceGoal_ == NULL)
{
@@ -5453,7 +5441,6 @@ OptDebug::~OptDebug()
// OptDebug::openLog() is called only when CQD NSK_DBG_LOG_FILE is ON
// in ControlDB.cpp.
-// LCOV_EXCL_START
NABoolean OptDebug::openLog( const char* filename )
{
if (fileIsGood_)
@@ -5498,7 +5485,6 @@ void OptDebug::closeLog()
logFileName_[0] = '\0';
fileIsGood_ = FALSE;
}
-// LCOV_EXCL_STOP
// ---------------------------------------------------------------------
// Accessor functions
@@ -5554,7 +5540,6 @@ void OptDebug::setCompileInstanceClass(const char* str)
// For a SQL query, either show the query tree or query execution plan tree.
// Equivalent to the main window in GUI display.
// ---------------------------------------------------------------------
-// LCOV_EXCL_START
void OptDebug::showTree( const ExprNode *tree,
const CascadesPlan *plan,
const char *prefix,
@@ -6610,7 +6595,6 @@ void OptDebug::showMemoStats(CascadesMemo *memo,
out << "\n\tMemo Contexts: \t" << contextCnt << endl;
}
-// LCOV_EXCL_STOP
// New optimization driver
RelExpr *RelExpr::optimize2()
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/optimizer/tasks.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/tasks.cpp b/core/sql/optimizer/tasks.cpp
index 065a370..1fa57eb 100644
--- a/core/sql/optimizer/tasks.cpp
+++ b/core/sql/optimizer/tasks.cpp
@@ -79,7 +79,6 @@ CascadesTask::~CascadesTask()
} // CascadesTask::~CascadesTask
-// LCOV_EXCL_START
void CascadesTask::print(FILE *, const char *, const char *) const
{
ABORT("CascadesTask::print() needs to be redefined");
@@ -89,7 +88,6 @@ NAString CascadesTask::taskText() const
{
return "Shouldn't ever see a generic task";
}
-// LCOV_EXCL_STOP
CascadesGroupId CascadesTask::getGroupId() const
{
@@ -173,7 +171,6 @@ OptimizeGroupTask::OptimizeGroupTask(Context * context,
{
} // OptimizeGroupTask::OptimizeGroupTask
-// LCOV_EXCL_START
void OptimizeGroupTask::print(FILE * f, const char * prefix,
const char * suffix) const
{
@@ -192,7 +189,6 @@ NAString OptimizeGroupTask::taskText() const
getParentTaskId(), getSubTaskId(), groupId_);
return NAString(returnText) + context_->getRequirementsString();
}
-// LCOV_EXCL_STOP
CascadesGroupId OptimizeGroupTask::getGroupId() const
{
@@ -475,7 +471,6 @@ OptimizeExprTask::OptimizeExprTask(RelExpr * expr,
context_->incrOutstanding();
} // OptimizeExprTask::OptimizeExprTask
-// LCOV_EXCL_START
void OptimizeExprTask::print(FILE * f, const char *, const char * suffix) const
{
#ifndef NDEBUG
@@ -511,7 +506,6 @@ NAString OptimizeExprTask::taskText() const
#endif
returnText + context_->getRequirementsString();
}
-// LCOV_EXCL_STOP
CascadesGroupId OptimizeExprTask::getGroupId() const
{
@@ -776,7 +770,6 @@ ExploreGroupTask::ExploreGroupTask(CascadesGroupId group_no,
{
} // ExploreGroupTask::ExploreGroupTask
-// LCOV_EXCL_START
void ExploreGroupTask::print(FILE * f, const char * prefix, const char * suffix) const
{
#ifndef NDEBUG
@@ -794,7 +787,6 @@ NAString ExploreGroupTask::taskText() const
getParentTaskId(), getSubTaskId(), groupId_);
return returnText;
}
-// LCOV_EXCL_STOP
CascadesGroupId ExploreGroupTask::getGroupId() const
{
@@ -860,7 +852,6 @@ ExploreExprTask::ExploreExprTask(RelExpr * expr,
{
} // ExploreExprTask::ExploreExprTask
-// LCOV_EXCL_START
void ExploreExprTask::print(FILE * f, const char *, const char * suffix) const
{
#ifndef NDEBUG
@@ -885,7 +876,6 @@ NAString ExploreExprTask::taskText() const
else
return NAString(prefix) + expr_->getText() + returnText;
}
-// LCOV_EXCL_STOP
//<pb>
CascadesGroupId ExploreExprTask::getGroupId() const
@@ -1055,7 +1045,6 @@ ApplyRuleTask::ApplyRuleTask(Rule * rule,
context_->incrOutstanding();
} // ApplyRuleTask::ApplyRuleTask
-// LCOV_EXCL_START
void ApplyRuleTask::print(FILE * f, const char * prefix, const char *) const
{
#ifndef NDEBUG
@@ -1083,7 +1072,6 @@ NAString ApplyRuleTask::taskText() const
return NAString(prefix) + "Enforcer Rule \"" +
rule_->getName() + returnText;
}
-// LCOV_EXCL_STOP
CascadesGroupId ApplyRuleTask::getGroupId() const
{
@@ -1519,14 +1507,12 @@ void CreatePlanTask::perform(Lng32 taskId)
FALSE,
taskId, ++stride));
-// LCOV_EXCL_START
if ( showThisPlan )
{
out << endl << prefix << "*** Incomplete plan ***" << endl;
CURRCONTEXT_OPTDEBUG->showTree( getExpr(), getPlan(), prefix, showPlanCost );
out << endl;
}
-// LCOV_EXCL_STOP
}
else
{
@@ -1564,13 +1550,11 @@ void CreatePlanTask::perform(Lng32 taskId)
// that is never re-optimized in this pass:
plan_->setSuccessInCurrentPass();
-// LCOV_EXCL_START
if ( showThisPlan )
{
out << endl << prefix << "*** Qualified plan ***" << endl;
CURRCONTEXT_OPTDEBUG->showTree( getExpr(), getPlan(), prefix, showPlanCost );
}
-// LCOV_EXCL_STOP
// This is a solution for the optimization goal represented
// by the context; now check whether it's the optimal one so far
@@ -1641,11 +1625,9 @@ void CreatePlanTask::perform(Lng32 taskId)
// This is the first solution for this pass and therefore
// it is the optimal one so far.
context_->setSolution(plan_);
-// LCOV_EXCL_START
if ( showThisPlan )
out << prefix << "*** Chosen plan ***" << endl << endl;
-// LCOV_EXCL_STOP
// if because of nice context we have an enforcer above
// partial plan that already satisfies requirement -
// replace solution with that partial plan because
@@ -1758,7 +1740,6 @@ void CreatePlanTask::garbageCollection(RelExpr * /* oldx */,
} // CreatePlanTask::garbageCollection
-// LCOV_EXCL_START
void CreatePlanTask::print(FILE * f, const char * prefix, const char * suffix) const
{
fprintf(f, "%screate plan -- incarnation %d (%d) of %d\n",
@@ -1796,7 +1777,6 @@ NAString CreatePlanTask::taskText() const
return returnString + context_->getRequirementsString();
}
-// LCOV_EXCL_STOP
//<pb>
@@ -1810,7 +1790,6 @@ GarbageCollectionTask::~GarbageCollectionTask ()
{}
-// LCOV_EXCL_START
void GarbageCollectionTask::print (FILE * f,
const char * prefix,
const char * /*suffix*/) const
@@ -1823,7 +1802,6 @@ NAString GarbageCollectionTask::taskText() const
return "Garbage Collection";
}
-// LCOV_EXCL_STOP
void GarbageCollectionTask::perform (Lng32 /*taskId*/)
{
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/optimizer/vers_liboptimizer.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/vers_liboptimizer.cpp b/core/sql/optimizer/vers_liboptimizer.cpp
index 3ea35ed..1c8e3cc 100644
--- a/core/sql/optimizer/vers_liboptimizer.cpp
+++ b/core/sql/optimizer/vers_liboptimizer.cpp
@@ -26,6 +26,4 @@
#define VERS_CV_MIN 0
#define VERS_CV_UPD 1
-// LCOV_EXCL_START
VERS_LIB(liboptimizer)
-// LCOV_EXCL_STOP
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/parser/BindStmtDDL.cpp
----------------------------------------------------------------------
diff --git a/core/sql/parser/BindStmtDDL.cpp b/core/sql/parser/BindStmtDDL.cpp
index 10003a8..d564d41 100644
--- a/core/sql/parser/BindStmtDDL.cpp
+++ b/core/sql/parser/BindStmtDDL.cpp
@@ -868,7 +868,6 @@ NABoolean StmtDDLCreateTrigger::isTransitionName(const NAString& tableName)
// to the select list of the root. This will make sure the system added
// columns are analyzed correctly.
// -----------------------------------------------------------------------
-// LCOV_EXCL_START :cnu Expanded pass not used anymore.
void addSystemColumnsToRootSelectList(RelRoot *queryRoot,
MVInfoForDDL *mvInfo,
BindWA *bindWA)
@@ -894,7 +893,6 @@ void addSystemColumnsToRootSelectList(RelRoot *queryRoot,
// Add the system added column expressions to the root select list.
queryRoot->addCompExprTree(systemAddedColsExpr);
}
-// LCOV_EXCL_STOP
// -----------------------------------------------------------------------
// definition of method bindNode() for class StmtDDLCreateMV
@@ -956,12 +954,10 @@ StmtDDLCreateMV::bindNode(BindWA * pBindWA )
((COM_RECOMPUTE != mvInfo->getRefreshType()) && (COM_BY_USER !=mvInfo->getRefreshType()))
)
{
- // LCOV_EXCL_START :cnu (MV on View not supported)
*CmpCommon::diags() << DgSqlCode(-4222)
<< DgString0("Non-recompute MVs on views");
pBindWA->setErrStatus();
return this;
- // LCOV_EXCL_STOP
}
// Transform the direct tree.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/parser/ElemDDLCreateMVOneAttributeTableList.cpp
----------------------------------------------------------------------
diff --git a/core/sql/parser/ElemDDLCreateMVOneAttributeTableList.cpp b/core/sql/parser/ElemDDLCreateMVOneAttributeTableList.cpp
index 32b6348..7600531 100644
--- a/core/sql/parser/ElemDDLCreateMVOneAttributeTableList.cpp
+++ b/core/sql/parser/ElemDDLCreateMVOneAttributeTableList.cpp
@@ -76,7 +76,6 @@ ElemDDLCreateMVOneAttributeTableList::getType() const
// methods for tracing
-// LCOV_EXCL_START :dpm
const NAString
ElemDDLCreateMVOneAttributeTableList::displayLabel1() const
{
@@ -96,7 +95,6 @@ ElemDDLCreateMVOneAttributeTableList::getText() const
{
return "ElemDDLCreateMVOneAttributeTableList";
}
-// LCOV_EXCL_STOP
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/parser/ElemDDLCreateMVOneAttributeTableList.h
----------------------------------------------------------------------
diff --git a/core/sql/parser/ElemDDLCreateMVOneAttributeTableList.h b/core/sql/parser/ElemDDLCreateMVOneAttributeTableList.h
index dd8172a..cff1255 100644
--- a/core/sql/parser/ElemDDLCreateMVOneAttributeTableList.h
+++ b/core/sql/parser/ElemDDLCreateMVOneAttributeTableList.h
@@ -63,9 +63,7 @@ public:
ElemDDLCreateMVOneAttributeTableList( ComMVSUsedTableAttribute type,
ElemDDLNode *pTableList);
-// LCOV_EXCL_START :dd
virtual ~ElemDDLCreateMVOneAttributeTableList(){}
-// LCOV_EXCL_STOP
virtual ElemDDLCreateMVOneAttributeTableList*
castToElemDDLCreateMVOneAttributeTableList()
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/parser/ElemDDLLobAttrs.h
----------------------------------------------------------------------
diff --git a/core/sql/parser/ElemDDLLobAttrs.h b/core/sql/parser/ElemDDLLobAttrs.h
index b11e73b..cc999bd 100644
--- a/core/sql/parser/ElemDDLLobAttrs.h
+++ b/core/sql/parser/ElemDDLLobAttrs.h
@@ -54,7 +54,6 @@ public:
// virtual destructor
- // LCOV_EXCL_LINE
virtual ~ElemDDLLobAttrs(){}
// cast
@@ -88,7 +87,6 @@ public:
}
// virtual destructor
- // LCOV_EXCL_LINE
virtual ~ElemDDLSeabaseSerialized(){}
// cast
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/parser/ElemDDLLoggable.h
----------------------------------------------------------------------
diff --git a/core/sql/parser/ElemDDLLoggable.h b/core/sql/parser/ElemDDLLoggable.h
index 1a69e3a..9d57239 100644
--- a/core/sql/parser/ElemDDLLoggable.h
+++ b/core/sql/parser/ElemDDLLoggable.h
@@ -56,7 +56,6 @@ public:
// virtual destructor
- // LCOV_EXCL_LINE
virtual ~ElemDDLLoggable(){}
// cast
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/parser/ElemDDLTableFeature.h
----------------------------------------------------------------------
diff --git a/core/sql/parser/ElemDDLTableFeature.h b/core/sql/parser/ElemDDLTableFeature.h
index 886f754..d3abc85 100644
--- a/core/sql/parser/ElemDDLTableFeature.h
+++ b/core/sql/parser/ElemDDLTableFeature.h
@@ -56,7 +56,6 @@ public:
// virtual destructor
- // LCOV_EXCL_LINE
virtual ~ElemDDLTableFeature(){}
// cast
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/parser/StmtDDLAlterMV.h
----------------------------------------------------------------------
diff --git a/core/sql/parser/StmtDDLAlterMV.h b/core/sql/parser/StmtDDLAlterMV.h
index 400d681..06d413b 100644
--- a/core/sql/parser/StmtDDLAlterMV.h
+++ b/core/sql/parser/StmtDDLAlterMV.h
@@ -76,9 +76,7 @@ public:
AlterType alterType);
-// LCOV_EXCL_START :dd
virtual ~StmtDDLAlterMV() {}
-// LCOV_EXCL_STOP
void synthesize();
@@ -179,7 +177,6 @@ private:
// definitions of inline methods for class StmtDDLAlterMV
// -----------------------------------------------------------------------
-// LCOV_EXCL_START :cnu
inline const NAString StmtDDLAlterMV::displayLabel1() const
{
return NAString("Materialized View name: ") + getMVName();
@@ -189,7 +186,6 @@ inline const NAString StmtDDLAlterMV::getText() const
{
return "StmtDDLAlterMV";
}
-// LCOV_EXCL_STOP
inline const NAString StmtDDLAlterMV::getMVName() const
{
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/parser/StmtDDLCreate.cpp
----------------------------------------------------------------------
diff --git a/core/sql/parser/StmtDDLCreate.cpp b/core/sql/parser/StmtDDLCreate.cpp
index 56cf307..8aae850 100644
--- a/core/sql/parser/StmtDDLCreate.cpp
+++ b/core/sql/parser/StmtDDLCreate.cpp
@@ -1027,7 +1027,6 @@ StmtDDLCreateComponentPrivilege::castToStmtDDLCreateComponentPrivilege()
// methods for tracing
//
-// LCOV_EXCL_START
const NAString
StmtDDLCreateComponentPrivilege::displayLabel1() const
@@ -1059,7 +1058,6 @@ StmtDDLCreateComponentPrivilege::getText() const
return "StmtDDLCreateComponentPrivilege";
}
-// LCOV_EXCL_STOP
//----------------------------------------------------------------------------
// MV - RG (refresh groups)
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/parser/StmtDDLCreateComponentPrivilege.h
----------------------------------------------------------------------
diff --git a/core/sql/parser/StmtDDLCreateComponentPrivilege.h b/core/sql/parser/StmtDDLCreateComponentPrivilege.h
index 2bf7a9d..3283068 100644
--- a/core/sql/parser/StmtDDLCreateComponentPrivilege.h
+++ b/core/sql/parser/StmtDDLCreateComponentPrivilege.h
@@ -71,11 +71,9 @@ public:
inline NABoolean isSystem() const { return isSystem_; }
// for tracing
- // LCOV_EXCL_START
virtual const NAString displayLabel1() const;
virtual const NAString displayLabel2() const;
virtual const NAString getText() const;
- // LCOV_EXCL_STOP
private:
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/parser/StmtDDLCreateMV.h
----------------------------------------------------------------------
diff --git a/core/sql/parser/StmtDDLCreateMV.h b/core/sql/parser/StmtDDLCreateMV.h
index 9e3f8ae..a6442c1 100644
--- a/core/sql/parser/StmtDDLCreateMV.h
+++ b/core/sql/parser/StmtDDLCreateMV.h
@@ -460,13 +460,11 @@ StmtDDLCreateMV::getMVNameAsQualifiedName() const
return MVQualName_;
}
-// LCOV_EXCL_START :cnu (MV on View not supported)
inline CollIndex
StmtDDLCreateMV::getCurViewColNum() const
{
return getViewUsages().getCurViewColNum();
}
-// LCOV_EXCL_STOP
inline const StringPos
StmtDDLCreateMV::getEndPosition() const
@@ -542,7 +540,6 @@ StmtDDLCreateMV::getMVName() const
return MVQualName_.getQualifiedNameAsAnsiString();
}
-// LCOV_EXCL_START :cnu (MV on View not supported)
inline const ParViewUsages &
StmtDDLCreateMV::getViewUsages() const
{
@@ -554,7 +551,6 @@ StmtDDLCreateMV::getViewUsages()
{
return viewUsages_;
}
-// LCOV_EXCL_STOP
inline const LIST(OptUDFInfo *) &
StmtDDLCreateMV::getUDFList() const
@@ -574,13 +570,11 @@ StmtDDLCreateMV::isItmColRefInColInRowVals() const
return getViewUsages().isItmColRefInColInRowVals();
}
-// LCOV_EXCL_START :cnu (MV on View not supported)
inline NABoolean
StmtDDLCreateMV::isProcessingViewColList() const
{
return getCurViewColNum() NEQ NULL_COLL_INDEX;
}
-// LCOV_EXCL_STOP
//
// mutators
@@ -592,13 +586,11 @@ StmtDDLCreateMV::resetCurViewColNum()
getViewUsages().setCurViewColNum(NULL_COLL_INDEX);
}
-// LCOV_EXCL_START :cnu (MV on View not supported)
inline void
StmtDDLCreateMV::setCurViewColNum(const CollIndex curVwCol)
{
getViewUsages().setCurViewColNum(curVwCol);
}
-// LCOV_EXCL_STOP
inline void
StmtDDLCreateMV::setEndPosition(const StringPos endPos)
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/parser/StmtDDLCreateTrigger.h
----------------------------------------------------------------------
diff --git a/core/sql/parser/StmtDDLCreateTrigger.h b/core/sql/parser/StmtDDLCreateTrigger.h
index 446b7a9..b7b66c1 100644
--- a/core/sql/parser/StmtDDLCreateTrigger.h
+++ b/core/sql/parser/StmtDDLCreateTrigger.h
@@ -475,14 +475,12 @@ StmtDDLCreateTrigger::isOwnerSpecified() const
return pOwner_ ? TRUE : FALSE;
}
-// LCOV_EXCL_START
// Not used by Triggers
inline const ElemDDLGrantee *
StmtDDLCreateTrigger::getOwner() const
{
return pOwner_;
}
-// LCOV_EXCL_STOP
#endif // STMTDDLCREATETRIGGER_H
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/parser/StmtDDLDrop.cpp
----------------------------------------------------------------------
diff --git a/core/sql/parser/StmtDDLDrop.cpp b/core/sql/parser/StmtDDLDrop.cpp
index 938831b..02e564e 100644
--- a/core/sql/parser/StmtDDLDrop.cpp
+++ b/core/sql/parser/StmtDDLDrop.cpp
@@ -132,7 +132,6 @@ StmtDDLDropComponentPrivilege::castToStmtDDLDropComponentPrivilege()
// methods for tracing
//
-// LCOV_EXCL_START
const NAString
StmtDDLDropComponentPrivilege::displayLabel1() const
@@ -162,7 +161,6 @@ StmtDDLDropComponentPrivilege::getText() const
return "StmtDDLDropComponentPrivilege";
}
-// LCOV_EXCL_STOP
//----------------------------------------------------------------------------
// MV - RG
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/parser/StmtDDLDropComponentPrivilege.h
----------------------------------------------------------------------
diff --git a/core/sql/parser/StmtDDLDropComponentPrivilege.h b/core/sql/parser/StmtDDLDropComponentPrivilege.h
index 0e9ac3f..9616b97 100644
--- a/core/sql/parser/StmtDDLDropComponentPrivilege.h
+++ b/core/sql/parser/StmtDDLDropComponentPrivilege.h
@@ -67,11 +67,9 @@ public:
inline const ComDropBehavior getDropBehavior() const { return dropBehavior_; }
// for tracing
- // LCOV_EXCL_START
virtual const NAString displayLabel1() const;
virtual const NAString displayLabel2() const;
virtual const NAString getText() const;
- // LCOV_EXCL_STOP
private:
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/parser/StmtDDLDropMV.h
----------------------------------------------------------------------
diff --git a/core/sql/parser/StmtDDLDropMV.h b/core/sql/parser/StmtDDLDropMV.h
index 5dc957a..6aa90c5 100644
--- a/core/sql/parser/StmtDDLDropMV.h
+++ b/core/sql/parser/StmtDDLDropMV.h
@@ -146,7 +146,6 @@ StmtDDLDropMV::isValidateSpecified()const
return isValidateSpec_;
}
-// LCOV_EXCL_START :dpm
inline const NABoolean
StmtDDLDropMV::isLogFileSpecified() const
{
@@ -161,6 +160,5 @@ StmtDDLDropMV::getLogFile() const
ComASSERT(pLogFile_ NEQ NULL);
return *pLogFile_;
}
-// LCOV_EXCL_STOP
#endif // STMTDDLDROPMV_H
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/parser/StmtDDLGrantComponentPrivilege.h
----------------------------------------------------------------------
diff --git a/core/sql/parser/StmtDDLGrantComponentPrivilege.h b/core/sql/parser/StmtDDLGrantComponentPrivilege.h
index 300f513..c46a158 100644
--- a/core/sql/parser/StmtDDLGrantComponentPrivilege.h
+++ b/core/sql/parser/StmtDDLGrantComponentPrivilege.h
@@ -70,12 +70,10 @@ public:
inline ElemDDLGrantee * getGrantedBy() const { return grantedBy_; };
// for tracing
- // LCOV_EXCL_START
virtual const NAString displayLabel1() const;
virtual const NAString displayLabel2() const;
virtual NATraceList getDetailInfo() const;
virtual const NAString getText();
- // LCOV_EXCL_STOP
private:
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/parser/StmtDDLNode.cpp
----------------------------------------------------------------------
diff --git a/core/sql/parser/StmtDDLNode.cpp b/core/sql/parser/StmtDDLNode.cpp
index 1946735..ea3fd15 100644
--- a/core/sql/parser/StmtDDLNode.cpp
+++ b/core/sql/parser/StmtDDLNode.cpp
@@ -660,7 +660,6 @@ StmtDDLGrantComponentPrivilege::castToStmtDDLGrantComponentPrivilege()
// methods for tracing
//
-// LCOV_EXCL_START
const NAString StmtDDLGrantComponentPrivilege::displayLabel1() const
{
@@ -730,7 +729,6 @@ const NAString StmtDDLGrantComponentPrivilege::getText()
return "StmtDDLGrantComponentPrivilege";
}
-// LCOV_EXCL_STOP
// -----------------------------------------------------------------------
// methods for class StmtDDLRevokeComponentPrivilege
@@ -780,7 +778,6 @@ StmtDDLRevokeComponentPrivilege::castToStmtDDLRevokeComponentPrivilege()
// methods for tracing
//
-// LCOV_EXCL_START
const NAString StmtDDLRevokeComponentPrivilege::displayLabel1() const
{
@@ -850,7 +847,6 @@ const NAString StmtDDLRevokeComponentPrivilege::getText()
return "StmtDDLRevokeComponentPrivilege";
}
-// LCOV_EXCL_STOP
// -----------------------------------------------------------------------
// methodsn for class StmtDDLReInitializeSQL
@@ -1418,7 +1414,6 @@ StmtDDLSchRevoke::setChild(Lng32 index, ExprNode * pChildNode)
// methods for tracing
//
-// LCOV_EXCL_START
const NAString
StmtDDLSchRevoke::displayLabel1() const
@@ -1516,7 +1511,6 @@ StmtDDLSchRevoke::getText() const
return "StmtDDLSchRevoke";
}
-// LCOV_EXCL_STOP
// -----------------------------------------------------------------------
// methods for class StmtDDLRegisterComponent
@@ -1570,7 +1564,6 @@ StmtDDLRegisterComponent::castToStmtDDLRegisterComponent()
// methods for tracing
//
-// LCOV_EXCL_START
const NAString
StmtDDLRegisterComponent::displayLabel1() const
@@ -1614,7 +1607,6 @@ StmtDDLRegisterComponent::getText() const
return "StmtDDLRegisterComponent";
}
-// LCOV_EXCL_STOP
//
// End of File
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/parser/StmtDDLRevokeComponentPrivilege.h
----------------------------------------------------------------------
diff --git a/core/sql/parser/StmtDDLRevokeComponentPrivilege.h b/core/sql/parser/StmtDDLRevokeComponentPrivilege.h
index 36b09c9..be61ccf 100644
--- a/core/sql/parser/StmtDDLRevokeComponentPrivilege.h
+++ b/core/sql/parser/StmtDDLRevokeComponentPrivilege.h
@@ -70,12 +70,10 @@ public:
inline ElemDDLGrantee * getGrantedBy() const { return grantedBy_; };
// for tracing
- // LCOV_EXCL_START
virtual const NAString displayLabel1() const;
virtual const NAString displayLabel2() const;
virtual NATraceList getDetailInfo() const;
virtual const NAString getText();
- // LCOV_EXCL_STOP
private:
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/parser/sqlparser.y
----------------------------------------------------------------------
diff --git a/core/sql/parser/sqlparser.y b/core/sql/parser/sqlparser.y
index 076c9e7..2d3265d 100755
--- a/core/sql/parser/sqlparser.y
+++ b/core/sql/parser/sqlparser.y
@@ -11337,10 +11337,8 @@ string_type : tok_char_or_character_or_byte new_optional_left_charlen_right char
if ( $3/*toggled_optional_left_charlen_right*/->isCharLenUnitSpecified() AND
$1/*tok_char_or_character_or_byte*/ EQU TOK_BYTE )
{
- //LCOV_EXCL_START : cnu - Used only in ModeSpecial1
emitError3435( $1, eCharSet, parCLU ); // BYTES/CHARS not allowed with BYTE VARYING
YYERROR;
- //LCOV_EXCL_STOP : cnu - Used only in ModeSpecial1
}
if ( eCharSet EQU CharInfo::UCS2 AND parCLU EQU ParAuxCharLenSpec::eBYTES )
{
@@ -26840,8 +26838,8 @@ file_attribute_uid_clause : TOK_UID NUMERIC_LITERAL_EXACT_NO_SCALE
// This syntax to be used by Backup/Restore only.
// If Backup/Restore is ever implemented then add a parserflag for it
// and report the 3001 error only if flag is not set.
- *SqlParser_Diags << DgSqlCode(-3001) << DgString0("UID"); // LCOV_EXCL_LINE
- YYERROR; // LCOV_EXCL_LINE
+ *SqlParser_Diags << DgSqlCode(-3001) << DgString0("UID");
+
// Uncomment the next 2 lines if Backup/Restore is ever implemented.
//$$ = new (PARSERHEAP()) ElemDDLFileAttrUID(atoInt64($2->data()));
//delete $2;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/parser/vers_libparser.cpp
----------------------------------------------------------------------
diff --git a/core/sql/parser/vers_libparser.cpp b/core/sql/parser/vers_libparser.cpp
index 51fb4ab..e1d10d6 100644
--- a/core/sql/parser/vers_libparser.cpp
+++ b/core/sql/parser/vers_libparser.cpp
@@ -26,6 +26,4 @@
#define VERS_CV_MIN 0
#define VERS_CV_UPD 1
-// LCOV_EXCL_START
VERS_LIB(libparser)
-// LCOV_EXCL_STOP
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/qms/QRDescriptorStubs.cpp
----------------------------------------------------------------------
diff --git a/core/sql/qms/QRDescriptorStubs.cpp b/core/sql/qms/QRDescriptorStubs.cpp
index b2a5afa..97c7856 100644
--- a/core/sql/qms/QRDescriptorStubs.cpp
+++ b/core/sql/qms/QRDescriptorStubs.cpp
@@ -36,7 +36,6 @@
#define THROW_EXCEPTION assertLogAndThrow(CAT_QR_DESC_GEN, LL_ERROR, FALSE, QRLogicException, "Method toItemExpr() called from server process.");
-// LCOV_EXCL_START :rfi
ItemExpr* QRColumn::toItemExpr(const NAString& mvName, CollHeap* heap, TableNameScanHash* scanhash) { THROW_EXCEPTION; return NULL; }
ItemExpr* QRMVColumn::toItemExpr(const NAString& mvName, CollHeap* heap, TableNameScanHash* scanhash) { THROW_EXCEPTION; return NULL; }
ItemExpr* QRScalarValue::toItemExpr(const NAString& mvName, CollHeap* heap, TableNameScanHash* scanhash){ THROW_EXCEPTION; return NULL; }
@@ -44,4 +43,3 @@ ItemExpr* QRNullVal::toItemExpr(const NAString& mvName, CollHeap* heap, TableNam
ItemExpr* QRBinaryOper::toItemExpr(const NAString& mvName, CollHeap* heap, TableNameScanHash* scanhash) { THROW_EXCEPTION; return NULL; }
ItemExpr* QRUnaryOper::toItemExpr(const NAString& mvName, CollHeap* heap, TableNameScanHash* scanhash) { THROW_EXCEPTION; return NULL; }
ItemExpr* QRFunction::toItemExpr(const NAString& mvName, CollHeap* heap, TableNameScanHash* scanhash) { THROW_EXCEPTION; return NULL; }
-// LCOV_EXCL_STOP
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/qms/QmpMain.cpp
----------------------------------------------------------------------
diff --git a/core/sql/qms/QmpMain.cpp b/core/sql/qms/QmpMain.cpp
index e0944d3..4c2a784 100644
--- a/core/sql/qms/QmpMain.cpp
+++ b/core/sql/qms/QmpMain.cpp
@@ -59,12 +59,10 @@ PublishTarget publishTarget = PUBLISH_TO_QMM;
const char* targetFilename = NULL;
// This is needed to avoid a link error.
-// LCOV_EXCL_START :ale
NABoolean NAType::isComparable(const NAType &other,
ItemExpr *parentOp,
Int32 emitErr) const
{ return FALSE; }
-// LCOV_EXCL_STOP
void usage(char *progName)
{
@@ -130,13 +128,11 @@ Int32 main(Int32 argc, char *argv[])
file_mon_process_startup(true);
atexit(my_mpi_fclose);
}
- // LCOV_EXCL_START :rfi
catch (...)
{
cerr << "Error while initializing messaging system. Exiting..." << endl;
exit(1);
}
- // LCOV_EXCL_STOP
NAHeap qmpHeap("QMP Heap", NAMemory::DERIVED_FROM_SYS_HEAP, (Lng32)131072);
@@ -172,20 +168,16 @@ Int32 main(Int32 argc, char *argv[])
// Process any command-line arguments.
if (processCommandLine(argc, argv) == FALSE)
{
- // LCOV_EXCL_START :rfi
QRLogger::log(CAT_QMP, LL_ERROR,
"QMP processing of command-line arguments failed.");
return -1;
- // LCOV_EXCL_STOP
}
if (qmpPublisher.setTarget(publishTarget, targetFilename) == FALSE)
{
- // LCOV_EXCL_START :rfi
QRLogger::log(CAT_QMP, LL_ERROR,
"QMP opening publish target failed.");
return -1;
- // LCOV_EXCL_STOP
}
// Process the REWRITE_PUBLISH table reading from the stream
@@ -198,14 +190,12 @@ Int32 main(Int32 argc, char *argv[])
QRLogger::log(CAT_QMP, LL_DEBUG,
"QMP REWRITE_TABLE reading completed with result code - %d", result);
}
- // LCOV_EXCL_START :rfi
catch(...)
{
// Handle database errors here.
QRLogger::log(CAT_QMP, LL_ERROR, "Unknown exception - exiting.");
exit(0);
}
- // LCOV_EXCL_STOP
// Delay waiting to try again for a successful SQL table read
// Wait 3 minutes
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/qms/QmpPublish.cpp
----------------------------------------------------------------------
diff --git a/core/sql/qms/QmpPublish.cpp b/core/sql/qms/QmpPublish.cpp
index 278ccad..74d5045 100644
--- a/core/sql/qms/QmpPublish.cpp
+++ b/core/sql/qms/QmpPublish.cpp
@@ -124,7 +124,6 @@ void QmpPublish::performRewritePublishReading()
// commit the last transaction.
sqlInterface_.commitTransaction();
}
- // LCOV_EXCL_START :rfi
catch(QRDatabaseException ex)
{
// Handle database errors here.
@@ -133,7 +132,6 @@ void QmpPublish::performRewritePublishReading()
"Error reading PUBLISH table from database - exiting.");
exit(0);
}
- // LCOV_EXCL_STOP
} // End of performRewritePublishReading
// ***************************************************************
@@ -151,7 +149,7 @@ void QmpPublish::preparePublishRewritePublishRowToSend(MVQR_Publish* publishData
sqlInterface_.getSchemaVersion(publishData->catalogUID_);
if (version == NULL)
{
- QRLogger::log(CAT_QMP, LL_ERROR, // LCOV_EXCL_LINE :rfi
+ QRLogger::log(CAT_QMP, LL_ERROR,
"Not expecting an empty catalog.");
return;
}
@@ -241,7 +239,7 @@ QRPublishDescriptorPtr QmpPublish::createPublishDescriptor(MVQR_Publish* publish
ComPublishMVOperationType QmpPublish::convertOperationType(char * operation)
{
if (operation == NULL)
- return COM_PUBLISH_MV_UNKNOWN; // LCOV_EXCL_LINE :rfi
+ return COM_PUBLISH_MV_UNKNOWN;
if (strncmp(operation,COM_PUBLISH_MV_CREATE_LIT,2) == 0)
return COM_PUBLISH_MV_CREATE;
@@ -261,12 +259,10 @@ ComPublishMVOperationType QmpPublish::convertOperationType(char * operation)
return COM_PUBLISH_MV_TOUCH;
else if (strncmp(operation,COM_PUBLISH_MV_REPUBLISH_LIT,2) == 0)
return COM_PUBLISH_MV_REPUBLISH;
- // LCOV_EXCL_START :rfi
else if (strncmp(operation,COM_PUBLISH_MV_UNKNOWN_LIT,2) == 0)
return COM_PUBLISH_MV_UNKNOWN;
else
return COM_PUBLISH_MV_UNKNOWN;
- // LCOV_EXCL_STOP
} // End of convertOperationType
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/qms/QmsGroupLattice.cpp
----------------------------------------------------------------------
diff --git a/core/sql/qms/QmsGroupLattice.cpp b/core/sql/qms/QmsGroupLattice.cpp
index d5ca2e6..80fada4 100644
--- a/core/sql/qms/QmsGroupLattice.cpp
+++ b/core/sql/qms/QmsGroupLattice.cpp
@@ -43,7 +43,6 @@ QRGroupLattice::~QRGroupLattice()
deletePtr(lattice_);
}
-// LCOV_EXCL_START :cnu
void QRGroupLattice::dumpLattice(const char* tag)
{
QRTRACER("QRGroupLattice::dumpLattice()");
@@ -54,7 +53,6 @@ void QRGroupLattice::dumpLattice(const char* tag)
QRLogger::log(CAT_GRP_LATTCE_INDX, LL_DEBUG, graph.data());
}
}
-// LCOV_EXCL_STOP
/**
* This method can be used to dump detailed usage stats to the log file,
@@ -62,14 +60,12 @@ void QRGroupLattice::dumpLattice(const char* tag)
* Currently not used.
*****************************************************************************
*/
-// LCOV_EXCL_START :cnu
void QRGroupLattice::reportStats(NAString& text)
{
QRTRACER("QRGroupLattice::reportStats()");
text += "\nLatticeIndex Graph:\n";
lattice_->dumpLattice(text, "stats");
}
-// LCOV_EXCL_STOP
void QRGroupLattice::collectMVGroups(WorkloadAnalysisPtr workload, Int32 minQueriesPerMV, CollHeap* heap)
{
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/qms/QmsInitializer.cpp
----------------------------------------------------------------------
diff --git a/core/sql/qms/QmsInitializer.cpp b/core/sql/qms/QmsInitializer.cpp
index 84398c2..4ee59d6 100644
--- a/core/sql/qms/QmsInitializer.cpp
+++ b/core/sql/qms/QmsInitializer.cpp
@@ -77,12 +77,10 @@ Lng32 QmsInitializer::performInitialization()
NABoolean collectQMSStats = sqlInterface_.getCollectQMSStatsEnabled();
if (collectQMSStats)
{
- // LCOV_EXCL_START :cnu CQD that controls this is not defined.
collectQMSStats_ = TRUE;
// report initial heap size of QMS
logQMSStats ();
- // LCOV_EXCL_STOP
}
// Obtain all the MV descriptor text for all the MVs known for
@@ -108,7 +106,6 @@ Lng32 QmsInitializer::performInitialization()
} // End of performInitialization
-// LCOV_EXCL_START :cnu The cqd does not exist.
/**
* dump QMS statistics to the log
* statistics collection and logging is controlled
@@ -127,7 +124,6 @@ void QmsInitializer::logQMSStats ()
QRLogger::log(CAT_MEMORY, LL_DEBUG, "QMS total memory size: (%Ld)", totalSize);
QRLogger::log(CAT_MEMORY, LL_DEBUG, "QMS allocated memory size: (%Ld)", allocatedSize);
}
-// LCOV_EXCL_STOP
// ***************************************************************
// * processCharset
@@ -138,7 +134,6 @@ void QmsInitializer::logQMSStats ()
// * to read the ISO_MAPPING and DEFAULT_CHARSET attribute values
// * from the system defaults table.
// ***************************************************************
-// LCOV_EXCL_START :cnu
void QmsInitializer::processCharset()
{
isoMapping_ = sqlInterface_.getIsoMapping();
@@ -147,7 +142,6 @@ void QmsInitializer::processCharset()
return;
} // End of processCharset
-// LCOV_EXCL_STOP
// ***************************************************************
// * Process the results of the catalog and MV searches
@@ -249,12 +243,10 @@ void QmsInitializer::processMvDescriptor(const QRMVDefinition* mvDef,
// something else.
if (mvDescriptor->getElementType() != ET_MVDescriptor)
{
- // LCOV_EXCL_START :rfi
QRLogger::log(CAT_QMS_INIT, LL_WARN,
"XML document parsed ok, but had wrong document element -- %s",
mvDescriptor->getElementName());
return;
- // LCOV_EXCL_STOP
}
QRMVDescriptorPtr mvDesc = static_cast<QRMVDescriptorPtr>(mvDescriptor);
@@ -280,7 +272,6 @@ void QmsInitializer::processMvDescriptor(const QRMVDefinition* mvDef,
qms_->insert(mvDesc, mvDef);
}
- // LCOV_EXCL_START :rfi
catch (QRException ex)
{
QRLogger::log(CAT_QMS_INIT, LL_MVQR_FAIL,
@@ -291,7 +282,6 @@ void QmsInitializer::processMvDescriptor(const QRMVDefinition* mvDef,
QRLogger::log(CAT_QMS_INIT, LL_MVQR_FAIL,
"Unknown exception thrown processing MV Descriptor. Skipping.");
}
- // LCOV_EXCL_STOP
return;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/qms/QmsJoinGraph.cpp
----------------------------------------------------------------------
diff --git a/core/sql/qms/QmsJoinGraph.cpp b/core/sql/qms/QmsJoinGraph.cpp
index 49d6cbb..3fbc757 100644
--- a/core/sql/qms/QmsJoinGraph.cpp
+++ b/core/sql/qms/QmsJoinGraph.cpp
@@ -96,7 +96,6 @@ JoinGraphEqualitySetPtr JoinGraphTable::getEqSetUsing(JoinGraphHalfPredicatePtr
}
-// LCOV_EXCL_START :dpm
/**
* Prepare the input text for the Dotty graphical graph viewer, for this table.
* @param[out] to Output string.
@@ -115,7 +114,6 @@ void JoinGraphTable::dumpGraph(NAString& to)
id.data(), id.data(), getName().data(), color);
to += text;
}
-// LCOV_EXCL_STOP
//*****************************************************************************
//*****************************************************************************
@@ -390,7 +388,6 @@ void JoinGraphEqualitySet::setOnKeyTo(const JoinGraphTablePtr targetTable)
//*****************************************************************************
//*****************************************************************************
-// LCOV_EXCL_START :cnu Not called from anywhere.
NABoolean JoinGraphEqualitySet::isOnKeyTo(const JoinGraphTablePtr targetTable)
{
if (isOnKey_ == FALSE)
@@ -408,7 +405,6 @@ NABoolean JoinGraphEqualitySet::isOnKeyTo(const JoinGraphTablePtr targetTable)
return FALSE; // Should not get here!
}
-// LCOV_EXCL_STOP
//*****************************************************************************
//*****************************************************************************
@@ -422,12 +418,10 @@ JoinGraphTablePtr JoinGraphEqualitySet::getOtherTable(JoinGraphHalfPredicatePtr
return halfPred->getTable();
}
- // LCOV_EXCL_START :rfi
assertLogAndThrow(CAT_MVMEMO_JOINGRAPH, LL_MVQR_FAIL,
FALSE, QRLogicException,
"getOtherTable() called with a bad half pred pointer.");
return NULL;
- // LCOV_EXCL_STOP
}
//*****************************************************************************
@@ -467,7 +461,6 @@ JoinGraphHalfPredicatePtr JoinGraphEqualitySet::getForeignKeySide()
// to += text;
// }
//} // JoinGraphEqualitySet::dumpGraph()
-// LCOV_EXCL_START :dpm
void JoinGraphEqualitySet::dumpGraph(NAString& to)
{
char text[256];
@@ -517,7 +510,6 @@ void JoinGraphEqualitySet::dumpGraph(NAString& to)
}
}
} // JoinGraphEqualitySet::dumpGraph()
-// LCOV_EXCL_STOP
//========================================================================
@@ -584,7 +576,6 @@ void QRJoinGraph::addTable(const QRTablePtr tableElement,
Int32 compareResult = thisName.compareTo(lastName);
if (compareResult < 0)
{
- // LCOV_EXCL_START :cnu Table names should always be sorted.
// If not - it means the table names are not sorted.
// Looks like we will have to sort them here...
QRLogger::log(CAT_MVMEMO_JOINGRAPH, LL_INFO,
@@ -595,7 +586,6 @@ void QRJoinGraph::addTable(const QRTablePtr tableElement,
// Correct the ordinal number of the new entry.
newTablePtr->setOrdinalNumber(insertPos);
- // LCOV_EXCL_STOP
}
else if (compareResult == 0)
{
@@ -618,7 +608,6 @@ void QRJoinGraph::addTable(const QRTablePtr tableElement,
tableHashByID_.insert(&id, newTablePtr);
} // QRJoinGraph::addTable()
-// LCOV_EXCL_START :cnu Table names should always be sorted, which avoids call of this fn.
/**
* Find the spot in the table array where to insert the new table, and shift
* the tables in the array beyond it to create an open entry for it.
@@ -662,9 +651,7 @@ CollIndex QRJoinGraph::shiftArray(const NAString thisName)
return insertPos;
} // QRJoinGraph::shiftArray()
-// LCOV_EXCL_STOP
-// LCOV_EXCL_START :cnu Table names should always be sorted, which avoids call of this fn.
/**
* Shift the table in position insertPos-1 to position insertPos, and
* fix its ordinal number.
@@ -677,7 +664,6 @@ void QRJoinGraph::shiftTable(CollIndex insertPos)
shiftedTable->setOrdinalNumber(insertPos);
tableArray_.insertAt(insertPos, shiftedTable);
}
-// LCOV_EXCL_STOP
/**
* Create a new JoinGraphHalfPredicate object, and add it to the equality
@@ -771,14 +757,12 @@ void QRJoinGraph::addEqualitySet(const QRJoinPredPtr predElement)
break;
}
- // LCOV_EXCL_START :rfi
default:
{
assertLogAndThrow1(CAT_MVMEMO_JOINGRAPH, LL_MVQR_FAIL,
FALSE, QRLogicException,
"Not expecting Equi-join predicate of type: %s", equalityElement->getElementName());
}
- // LCOV_EXCL_STOP
} // case on element type
}
@@ -907,7 +891,7 @@ void QRJoinGraph::initFromJBB(const QRJBBPtr jbb, MVDetailsPtr mv)
// Now dump the graph if priority of MvMemo category is set DEBUG.
if (QRLogger::isCategoryInDebug(CAT_MVMEMO_JOINGRAPH))
- dumpGraph(mv); // LCOV_EXCL_LINE :dpm
+ dumpGraph(mv);
} // QRJoinGraph::initFromJBB()
@@ -1031,7 +1015,6 @@ JoinGraphTablePtr QRJoinGraph::getNextTable(QRJoinSubGraphPtr subGraph)
return table;
}
-// LCOV_EXCL_START :dpm
/**
* Prepare the input text for the Dotty graphical graph viewer.
* @param[out] to Output string.
@@ -1068,7 +1051,6 @@ void QRJoinGraph::dumpGraph(MVDetailsPtr mv)
QRLogger::log(CAT_MVMEMO_JOINGRAPH, LL_DEBUG, dotGraph);
} // QRJoinGraph::dumpGraph()
-// LCOV_EXCL_STOP
//========================================================================
@@ -1443,7 +1425,6 @@ QRJoinSubGraphMapPtr QRJoinSubGraphMap::nextEquivalentMap() const
Int32* shiftRow = new(heap) Int32[numberOfTables];
selfJoinHandler->getNextShiftVector(shiftRow);
- // LCOV_EXCL_START :dpm
if (QRLogger::isCategoryInDebug(CAT_MVMEMO_JOINGRAPH))
{
NAString text("shiftRow is: ");
@@ -1457,7 +1438,6 @@ QRJoinSubGraphMapPtr QRJoinSubGraphMap::nextEquivalentMap() const
newMap->shiftVector_ = text; // For debugging.
}
- // LCOV_EXCL_STOP
for (CollIndex table=0; table<numberOfTables; table++)
{
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/qms/QmsLatticeIndex.cpp
----------------------------------------------------------------------
diff --git a/core/sql/qms/QmsLatticeIndex.cpp b/core/sql/qms/QmsLatticeIndex.cpp
index f42a823..326b5fb 100644
--- a/core/sql/qms/QmsLatticeIndex.cpp
+++ b/core/sql/qms/QmsLatticeIndex.cpp
@@ -54,7 +54,6 @@ QRLatticeIndexNode::QRLatticeIndexNode(const LatticeKeyList& keys,
isValid_ = lattice->addKeysToBitmap(keys, noNewEntry, keyBitmap_);
}
-// LCOV_EXCL_START :cnu Supports currently unused feature of QRLatticeIndexSearchNode
QRLatticeIndexNode::QRLatticeIndexNode(QRLatticeIndexPtr lattice,
NABoolean noNewEntry,
ADD_MEMCHECK_ARGS_DEF(CollHeap* heap))
@@ -74,7 +73,6 @@ QRLatticeIndexNode::QRLatticeIndexNode(QRLatticeIndexPtr lattice,
QRTRACER("QRLatticeIndexNode::QRLatticeIndexNode()");
*nodeName_ = '\0';
}
-// LCOV_EXCL_STOP
QRLatticeIndexNode::QRLatticeIndexNode(const char* const name,
QRLatticeIndexPtr lattice,
@@ -193,14 +191,12 @@ void QRLatticeIndexNode::dumpNode(NAString& nodeContents,
for (CollIndex i=0; i<mapList_.entries(); i++)
{
- // LCOV_EXCL_START :dpm
if (first)
first = FALSE;
else
nodeContents.append(", ");
nodeContents.append(mapList_[i]->getMVDetails()->getMVName().data());
- // LCOV_EXCL_STOP
}
char gbText[50];
@@ -229,7 +225,6 @@ void QRLatticeIndexNode::dumpNode(NAString& nodeContents,
* Currently not used.
*****************************************************************************
*/
-// LCOV_EXCL_START :cnu
void QRLatticeIndexNode::dumpLattice(NAString& graphText,
NAString& graphLabel)
{
@@ -256,7 +251,6 @@ void QRLatticeIndexNode::dumpLattice(NAString& graphText,
child->dumpLattice(graphText, graphLabel);
}
}
-// LCOV_EXCL_STOP
void QRLatticeIndexNode::collectMVGroups(WorkloadAnalysisPtr workload, Int32 minQueriesPerMV, CollHeap* heap)
{
@@ -489,7 +483,6 @@ NABoolean QRLatticeIndex::addKeysToBitmap(const LatticeKeyList& keys,
return isOK;
}
-// LCOV_EXCL_START :cnu
void QRLatticeIndex::findSubsets(QRLatticeIndexNode& supersetNode,
NAPtrList<QRLatticeIndexNodePtr>& subsets)
{
@@ -502,9 +495,7 @@ void QRLatticeIndex::findSubsets(QRLatticeIndexNode& supersetNode,
else
getSubsets(exactNode, subsets);
}
-// LCOV_EXCL_STOP
-// LCOV_EXCL_START :cnu
void QRLatticeIndex::findSubsets_(QRLatticeIndexNode& supersetNode,
QRLatticeIndexNodePtr childNode,
NAPtrList<QRLatticeIndexNodePtr>& subsets)
@@ -527,9 +518,7 @@ void QRLatticeIndex::findSubsets_(QRLatticeIndexNode& supersetNode,
}
}
}
-// LCOV_EXCL_STOP
-// LCOV_EXCL_START :cnu
void QRLatticeIndex::getSubsets(QRLatticeIndexNodePtr node,
NAPtrList<QRLatticeIndexNodePtr>& subsets)
{
@@ -547,7 +536,6 @@ void QRLatticeIndex::getSubsets(QRLatticeIndexNodePtr node,
getSubsets(subsetNode, subsets);
}
}
-// LCOV_EXCL_STOP
void QRLatticeIndex::findSupersets(QRLatticeIndexNode& subsetNode,
NAPtrList<QRLatticeIndexNodePtr>& supersets)
@@ -807,7 +795,6 @@ NABoolean QRLatticeIndex::contains(LatticeIndexablePtr key)
* Currently not used.
*****************************************************************************
*/
-// LCOV_EXCL_START :dpm
void QRLatticeIndex::dumpLattice(NAString& graphText, const char* tag)
{
QRTRACER("QRLatticeIndex::dumpLattice()");
@@ -829,7 +816,6 @@ void QRLatticeIndex::dumpLattice(NAString& graphText, const char* tag)
(graphText += "}\n#ENDLATTICE ") += tag;
graphText += '\n';
}
-// LCOV_EXCL_STOP
void QRLatticeIndex::collectMVGroups(WorkloadAnalysisPtr workload, Int32 minQueriesPerMV, CollHeap* heap)
{
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/qms/QmsMVMemo.cpp
----------------------------------------------------------------------
diff --git a/core/sql/qms/QmsMVMemo.cpp b/core/sql/qms/QmsMVMemo.cpp
index e2b2c2c..1c9461e 100644
--- a/core/sql/qms/QmsMVMemo.cpp
+++ b/core/sql/qms/QmsMVMemo.cpp
@@ -133,14 +133,12 @@ NABoolean MVMemoGroup::addPhysicalExpression(const QRJoinSubGraphMapPtr map,
map->setMVDetails(mv);
groupLattice_->insert(map, jbb);
}
- // LCOV_EXCL_START :rfi
catch (...)
{
QRLogger::log(CAT_GRP_LATTCE_INDX, LL_MVQR_FAIL,
"Caught exception creating group lattice or inserting mv");
throw;
}
- // LCOV_EXCL_STOP
}
return TRUE;
@@ -187,14 +185,12 @@ void MVMemoGroup::getPhysicalExpressions(MVCandidatesForJBBPtr mvCandidates,
mvCandidates->insert(jbbSubset);
}
}
- // LCOV_EXCL_START :rfi
catch (...)
{
QRLogger::log(CAT_GRP_LATTCE_INDX, LL_MVQR_FAIL,
"Caught exception searching group lattice or setting subgraph maps");
throw;
}
- // LCOV_EXCL_STOP
}
else
{
@@ -226,7 +222,6 @@ void MVMemoGroup::getPhysicalExpressions(MVCandidatesForJBBPtr mvCandidates,
}
} // MVMemoGroup::getPhysicalExpressions()
-// LCOV_EXCL_START :cnu
/**
* Remove a physical expression for an MV that has been dropped.
* @param key The hash key for the MV to remove.
@@ -251,7 +246,6 @@ void MVMemoGroup::removePhysicalExpression(MVMemoPhysicalExpressionPtr expr)
}
}
}
-// LCOV_EXCL_STOP
/**
*
@@ -324,7 +318,6 @@ Int32 MVMemoGroup::getNumOfMVs()
* Currently not used.
*****************************************************************************
*/
-// LCOV_EXCL_START :cnu
void MVMemoGroup::reportStats(NAString& text)
{
text += "\n== These MVs:";
@@ -349,7 +342,6 @@ void MVMemoGroup::reportStats(NAString& text)
groupLattice_->reportStats(text);
}
}
-// LCOV_EXCL_STOP
/**
* Create a ProposedMV object and add to it all the MVs that are in physical
@@ -740,7 +732,6 @@ MVMemoGroupPtr MVMemo::probeForSubGraph(HubIteratorPtr hubIterator, const QRJoin
* Currently not used.
*****************************************************************************
*/
-// LCOV_EXCL_START :cnu
void MVMemo::reportStats(Int32 numOfMVs)
{
typedef NAPtrList<MVMemoGroupPtr> GroupList;
@@ -805,7 +796,6 @@ void MVMemo::reportStats(Int32 numOfMVs)
groupsProcessed++;
}
}
-// LCOV_EXCL_STOP
/**
* Iterate over all the MVMemo groups to collect proposed MVs.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/qms/QmsMain.cpp
----------------------------------------------------------------------
diff --git a/core/sql/qms/QmsMain.cpp b/core/sql/qms/QmsMain.cpp
index 1d438b9..0941ceb 100644
--- a/core/sql/qms/QmsMain.cpp
+++ b/core/sql/qms/QmsMain.cpp
@@ -81,13 +81,11 @@ Int32 main(Int32 argc, char *argv[])
file_mon_process_startup(true);
atexit(my_mpi_fclose);
}
- // LCOV_EXCL_START :rfi
catch (...)
{
cerr << "Error while initializing messaging system. Exiting..." << endl;
exit(1);
}
- // LCOV_EXCL_STOP
NABoolean performSMDInit = FALSE;
NABoolean performXMLInit = FALSE;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/qms/QmsQms.cpp
----------------------------------------------------------------------
diff --git a/core/sql/qms/QmsQms.cpp b/core/sql/qms/QmsQms.cpp
index 4739a0f..7b2209b 100644
--- a/core/sql/qms/QmsQms.cpp
+++ b/core/sql/qms/QmsQms.cpp
@@ -43,13 +43,11 @@
* MATCH request.
*/
-// LCOV_EXCL_START :ale
// This is needed to avoid a link error.
NABoolean NAType::isComparable(const NAType &other,
ItemExpr *parentOp,
Int32 emitErr) const
{ return FALSE; }
-// LCOV_EXCL_STOP
Qms* Qms::instance_ = NULL;
@@ -111,7 +109,6 @@ QRResultDescriptorPtr Qms::match(QRQueryDescriptorPtr qryDescPtr, NAMemory* requ
{
mvMemo_.search(jbb, jbbCandidates, requestHeap);
}
- // LCOV_EXCL_START :rfi
catch (...)
{
// Exception occurred, skip this JBB and keep going.
@@ -120,7 +117,6 @@ QRResultDescriptorPtr Qms::match(QRQueryDescriptorPtr qryDescPtr, NAMemory* requ
deletePtr(jbbCandidates);
continue;
}
- // LCOV_EXCL_STOP
mvCandidates->insert(jbbCandidates);
}
@@ -135,7 +131,6 @@ QRResultDescriptorPtr Qms::match(QRQueryDescriptorPtr qryDescPtr, NAMemory* requ
//dumpInventoryHash();
return resultDesc;
}
- // LCOV_EXCL_START :rfi
catch (QRException e)
{
QRLogger::instance().log(CAT_QMS_MAIN, LL_MVQR_FAIL, "MATCH operation aborted.");
@@ -151,7 +146,6 @@ QRResultDescriptorPtr Qms::match(QRQueryDescriptorPtr qryDescPtr, NAMemory* requ
QRResultDescriptorPtr resultDesc = MVCandidateCollection::generateEmptyResultDescriptor(requestHeap);
return resultDesc;
}
- // LCOV_EXCL_STOP
}
/**
@@ -198,7 +192,6 @@ void Qms::insert(QRMVDescriptorPtr mvDescPtr, const QRMVDefinition* mvDefPtr)
MVInventoryHash_.insert(&mvDetails->getMVName(), mvDetails);
//dumpInventoryHash();
}
- // LCOV_EXCL_START :rfi
catch (QRException e)
{
// Ignore exceptions for now.
@@ -211,7 +204,6 @@ void Qms::insert(QRMVDescriptorPtr mvDescPtr, const QRMVDefinition* mvDefPtr)
QRLogger::instance().log(CAT_QMS_MAIN, LL_MVQR_FAIL,
"PUBLISH operation aborted, An unknown exception occurred.");
}
- // LCOV_EXCL_STOP
}
/**
@@ -237,7 +229,6 @@ void Qms::drop(const NAString& mvName)
}
//dumpInventoryHash();
}
- // LCOV_EXCL_START :rfi
catch (QRException e)
{
// Ignore exceptions for now.
@@ -250,7 +241,6 @@ void Qms::drop(const NAString& mvName)
QRLogger::instance().log(CAT_QMS_MAIN, LL_MVQR_FAIL,
"DROP operation aborted because of unknown exception.");
}
- // LCOV_EXCL_STOP
}
/**
@@ -335,7 +325,6 @@ void Qms::rename(const NAString& oldName, const NAString& newName)
QRLogger::instance().log(CAT_QMS_MAIN, LL_INFO,
"Unable to rename MV %s - not found in QMS.", oldName.data());
}
- // LCOV_EXCL_START :rfi
catch (QRException e)
{
// Ignore exceptions for now.
@@ -347,7 +336,6 @@ void Qms::rename(const NAString& oldName, const NAString& newName)
QRLogger::instance().log(CAT_QMS_MAIN, LL_MVQR_FAIL,
"Rename operation aborted because of unknown exception.");
}
- // LCOV_EXCL_STOP
}
/**
@@ -374,7 +362,6 @@ const Int64 *Qms::getMVTimestamp(const NAString& mvName)
return &mvDetails->getRedefTimestamp();
}
-// LCOV_EXCL_START :cnu
void Qms::dumpInventoryHash()
{
QRLogger::instance().log(CAT_QMS_MAIN, LL_DEBUG, "Dumping MV Inventory:");
@@ -387,7 +374,6 @@ void Qms::dumpInventoryHash()
QRLogger::instance().log(CAT_QMS_MAIN, LL_DEBUG, key->data());
}
}
-// LCOV_EXCL_STOP
/**
* Perform workload analysis.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/qms/QmsRequest.cpp
----------------------------------------------------------------------
diff --git a/core/sql/qms/QmsRequest.cpp b/core/sql/qms/QmsRequest.cpp
index f074b9b..dc6dee3 100644
--- a/core/sql/qms/QmsRequest.cpp
+++ b/core/sql/qms/QmsRequest.cpp
@@ -279,21 +279,17 @@ void QmsMessageStream::actOnReceive(IpcConnection* connection)
respond(responseObj);
}
-// LCOV_EXCL_START :rfi
static void error(const char* text)
{
cerr << text << endl;
}
-// LCOV_EXCL_STOP
-// LCOV_EXCL_START :rfi
static void usage(char *progName)
{
cerr << "Usage: " << progName << " infile outfile" << endl;
QRLogger::log(CAT_QR_IPC, LL_ERROR,
"Usage: %s infile outfile", progName);
}
-// LCOV_EXCL_STOP
// These static member functions are called from QmsMain.cpp.
@@ -325,11 +321,9 @@ QRRequestResult QRRequest::parseXMLDoc(QRRequest& request,
if (!descriptor)
{
- // LCOV_EXCL_START :rfi
QRLogger::log(CAT_QMS_MAIN, LL_WARN,
"XMLDocument.parse() returned NULL.");
return XMLParseError;
- // LCOV_EXCL_STOP
}
else
{
@@ -337,7 +331,6 @@ QRRequestResult QRRequest::parseXMLDoc(QRRequest& request,
"Parsed XML document successfully.");
}
}
- // LCOV_EXCL_START :rfi
catch (XMLException& ex)
{
QRLogger::log(CAT_QMS_MAIN, LL_MVQR_FAIL,
@@ -356,7 +349,6 @@ QRRequestResult QRRequest::parseXMLDoc(QRRequest& request,
"An Unknown exception occurred");
return InternalError;
}
- // LCOV_EXCL_STOP
return Success;
} // End of parseXmlDoc
@@ -478,12 +470,10 @@ QRRequestResult QRRequest::handleMatchRequest(QRRequest& request,
// something else.
if (descriptor->getElementType() != ET_QueryDescriptor)
{
- // LCOV_EXCL_START :rfi
result = WrongDescriptor;
QRLogger::log(CAT_QMS_MAIN, LL_ERROR,
"XML document parsed ok, but had wrong document element -- %s",
descriptor->getElementName());
- // LCOV_EXCL_STOP
}
// If it is Success, perform "match" and add the resulting Result
@@ -570,7 +560,7 @@ QRMessageObj* QRMessageRequest::processRequestMessage(QRMessageStream* msgStream
// collect and log qms stats
if (qmsInitializer.doCollectQMSStats())
{
- qmsInitializer.logQMSStats(); // LCOV_EXCL_LINE :cnu cqd that drives this does not exist
+ qmsInitializer.logQMSStats();
}
if (result == QR::Success)
@@ -596,7 +586,7 @@ QRMessageObj* QRMessageRequest::processRequestMessage(QRMessageStream* msgStream
// collect and log qms stats
if (qmsInitializer.doCollectQMSStats())
{
- qmsInitializer.logQMSStats(); // LCOV_EXCL_LINE :cnu CQD that controls this is not defined.
+ qmsInitializer.logQMSStats();
}
if (result == QR::Success)
@@ -641,14 +631,12 @@ QRMessageObj* QRMessageRequest::processRequestMessage(QRMessageStream* msgStream
responseMsgPtr = new QRStatusMessageObj(QR::InvalidRequest);
break;
- // LCOV_EXCL_START :rfi
default:
QRLogger::log(CAT_QMS_MAIN, LL_ERROR,
"Unhandled message: %d", msgStream->getNextObjType());
noBadRequest = FALSE;
responseMsgPtr = new QRStatusMessageObj(QR::InvalidRequest);
break;
- // LCOV_EXCL_STOP
} // switch
} // while
@@ -695,22 +683,18 @@ Int32 QRCommandLineRequest::processCommandLine(Int32 argc, char *argv[])
if (!inFile.rdbuf()->is_open())
{
- // LCOV_EXCL_START :rfi
QRLogger::log(CAT_QMS_MAIN, LL_ERROR, "Can't open input file. %s", argv[1]);
error("Can't open input file.");
usage(argv[0]);
return -1;
- // LCOV_EXCL_STOP
}
if (!outFile.rdbuf()->is_open())
{
- // LCOV_EXCL_START :rfi
QRLogger::log(CAT_QMS_MAIN, LL_ERROR, "Can't open output file. %s", argv[2]);
error("Can't open output file.");
usage(argv[0]);
return -1;
- // LCOV_EXCL_STOP
}
QRCommandLineRequest request(inFile);
@@ -795,7 +779,7 @@ Int32 QRCommandLineRequest::processCommandLine(Int32 argc, char *argv[])
// collect and log qms stats
if (qmsInitializer.doCollectQMSStats())
{
- qmsInitializer.logQMSStats(); // LCOV_EXCL_LINE :cnu CQD that controls this is not defined.
+ qmsInitializer.logQMSStats();
}
moreInput = request.readRequestType(requestType);
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/qms/QmsRequest.h
----------------------------------------------------------------------
diff --git a/core/sql/qms/QmsRequest.h b/core/sql/qms/QmsRequest.h
index bca9d03..137776d 100644
--- a/core/sql/qms/QmsRequest.h
+++ b/core/sql/qms/QmsRequest.h
@@ -349,7 +349,7 @@ class QRCommandLineRequest : public QRRequest
virtual size_t readXml(char *buffer, size_t bufferSize)
{
if (isInlined_)
- return readXmlInlined(buffer, bufferSize); // LCOV_EXCL_LINE :cnu
+ return readXmlInlined(buffer, bufferSize);
else
return readXmlFile(buffer, bufferSize);
}
@@ -371,7 +371,6 @@ protected:
return xmlFile_.gcount();
}
- // LCOV_EXCL_START :cnu
size_t readXmlInlined(char *buffer, size_t bufferSize)
{
if (!inFile_.rdbuf()->is_open() || inlinedLineRead_)
@@ -382,7 +381,6 @@ protected:
inFile_.getline(buffer, bufferSize);
return strlen(buffer);
}
- // LCOV_EXCL_STOP
private:
// Copy construction/assignment not defined.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/qms/QmsSelfJoinHandler.cpp
----------------------------------------------------------------------
diff --git a/core/sql/qms/QmsSelfJoinHandler.cpp b/core/sql/qms/QmsSelfJoinHandler.cpp
index dfd8c11..9c830f9 100644
--- a/core/sql/qms/QmsSelfJoinHandler.cpp
+++ b/core/sql/qms/QmsSelfJoinHandler.cpp
@@ -95,7 +95,6 @@ void Array2D::setElement(UInt32 row, UInt32 col, Int32 value)
//*****************************************************************************
//*****************************************************************************
-// LCOV_EXCL_START :dpm
void Array2D::dump(NAString& text)
{
char buffer[100];
@@ -113,7 +112,6 @@ void Array2D::dump(NAString& text)
}
}
}
-// LCOV_EXCL_STOP
//========================================================================
// Class ShiftMatrix
@@ -241,7 +239,6 @@ void ShiftMatrix::initNext(NABitVector& usedValuesV, // Which values were alread
//*****************************************************************************
//*****************************************************************************
-// LCOV_EXCL_START :dpm
void ShiftMatrix::dump(NAString& text)
{
char buffer[100];
@@ -249,7 +246,6 @@ void ShiftMatrix::dump(NAString& text)
text += buffer;
theMatrix_->dump(text);
}
-// LCOV_EXCL_STOP
//========================================================================
// Class ShiftMatrixFactory
@@ -584,7 +580,6 @@ Int32 SelfJoinHandler::howmanyPermutations()
//*****************************************************************************
//*****************************************************************************
-// LCOV_EXCL_START :dpm
void SelfJoinHandler::dump(NAString& text)
{
char buffer[100];
@@ -605,4 +600,3 @@ void SelfJoinHandler::dump(NAString& text)
text += "\nPermutationMatrix:\n";
permMatrix_->dump(text);
}
-// LCOV_EXCL_STOP
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/qms/QmsStubs.cpp
----------------------------------------------------------------------
diff --git a/core/sql/qms/QmsStubs.cpp b/core/sql/qms/QmsStubs.cpp
index e50e9f0..1957b55 100644
--- a/core/sql/qms/QmsStubs.cpp
+++ b/core/sql/qms/QmsStubs.cpp
@@ -24,7 +24,6 @@
//#include "Platform.h"
-// LCOV_EXCL_START :ale
extern "C"
void CmpAssertInternal__FPcT1i(void){};
@@ -48,6 +47,5 @@ void __eq__16ExtendedQualNameCFRC16ExtendedQualName(void) {};
extern "C"
void __eq__13QualifiedNameCFRC8NAString(void) {};
-// LCOV_EXCL_STOP
[07/14] incubator-trafodion git commit: lcov: commit #1
Posted by an...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/optimizer/ControlDB.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/ControlDB.cpp b/core/sql/optimizer/ControlDB.cpp
index f8e2f1b..4af0d81 100644
--- a/core/sql/optimizer/ControlDB.cpp
+++ b/core/sql/optimizer/ControlDB.cpp
@@ -272,7 +272,6 @@ void ControlDB::setControlDefault(ControlQueryDefault *def)
if (def->getAttrEnum() == NSK_DBG_LOG_FILE)
{
- // LCOV_EXCL_START
DefaultConstants attrEnum = def->getAttrEnum();
const char * optDbgLog =
ActiveSchemaDB()->getDefaults().getValue(attrEnum);
@@ -293,7 +292,6 @@ void ControlDB::setControlDefault(ControlQueryDefault *def)
CURRCONTEXT_OPTDEBUG->openLog(logFileName);
- // LCOV_EXCL_STOP
}
if (def->getAttrEnum() == NSK_DBG_COMPILE_INSTANCE)
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/optimizer/Cost.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/Cost.cpp b/core/sql/optimizer/Cost.cpp
index dc6d701..35c51eb 100644
--- a/core/sql/optimizer/Cost.cpp
+++ b/core/sql/optimizer/Cost.cpp
@@ -60,13 +60,11 @@ extern Cost* rollUpUnaryNonBlocking(const Cost& ,
// -----------------------------------------------------------------------
// global display methods (to be invoked from Objectcenter)
// -----------------------------------------------------------------------
-// LCOV_EXCL_START
// excluded for coverage because it's a debug code
void displayCost (const Cost & cost)
{
cost.print();
}
-// LCOV_EXCL_STOP
//<pb>
@@ -300,7 +298,6 @@ operator/(const SimpleCostVector &vector, const CostScalar &scalar)
// Sum of v1 and v2 using blocking vector addition.
//
//==============================================================================
-// LCOV_EXCL_START :cnu -- OCM code
SimpleCostVector
blockingAdd(const SimpleCostVector &v1,
const SimpleCostVector &v2,
@@ -753,7 +750,6 @@ isLowerBound(const SimpleCostVector &v1, const SimpleCostVector &v2)
} // isLowerBound()
//<pb>
-// LCOV_EXCL_STOP
// -----------------------------------------------------------------------
// methods for class SimpleCostVector used in SCM.
@@ -893,7 +889,6 @@ void SimpleCostVector::print(FILE* ofd) const
}
*/
-// LCOV_EXCL_START
// excluded for coverage because it's a debug code
void SimpleCostVector::print(FILE* pfp) const
{
@@ -914,7 +909,6 @@ void SimpleCostVector::print(FILE* pfp) const
fprintf(pfp,"\n");
}
-// LCOV_EXCL_STOP
//<pb>
//<pb>
@@ -923,7 +917,6 @@ void SimpleCostVector::print(FILE* pfp) const
// The argument ownline indicates if the cost components need to be in their
// own lines.
// The argument prefix optionally gives a prefix string to be printed
-// LCOV_EXCL_START
// This gets called only when internal CQD EXPLAIN_DETAIL_COST_FOR_CALIBRATION
// is ON for debugging purpose. So, exclude for coverage
const NAString SimpleCostVector::getDetailDesc(const DefaultToken ownline,
@@ -971,7 +964,6 @@ const NAString SimpleCostVector::getDetailDesc(const DefaultToken ownline,
dtlDesc = detail;
return dtlDesc;
} // SimpleCostVector::getDetailDesc()
-// LCOV_EXCL_STOP
//<pb>
// NCM specific method.
@@ -1157,7 +1149,6 @@ SimpleCostVector::getNormalizedVersion(const CostScalar & factor) const
// Accumulated vector using overlapped addition.
//
//==============================================================================
-// LCOV_EXCL_START :cnu -- OCM code
const SimpleCostVector&
SimpleCostVector::overlappedAdd(const SimpleCostVector& other)
{
@@ -1255,7 +1246,6 @@ SimpleCostVector::repeatedOverlappedAdd(const Lng32 times)
return *this;
} //SimpleCostVector::repeatedOverlappedAdd()
-// LCOV_EXCL_STOP
//<pb>
// -----------------------------------------------------------------------
// scaleUpByNumProbes() scales up a simple cost vector by its number of
@@ -1417,7 +1407,6 @@ const SimpleCostVector& SimpleCostVector::reset()
// TRUE if this is a zero vector; FALSE otherwise.
//
//==============================================================================
-// LCOV_EXCL_START
// This method is no longer used, isZeroVectorWithProbes is used instead.
// So hide it from coverage
NABoolean
@@ -1442,7 +1431,6 @@ SimpleCostVector::isZeroVector() const
return TRUE;
} // SimpleCostVector::isZero
-// LCOV_EXCL_STOP
// This method needs to be used instead of isZeroVector for checking
// blocking components of Cost Object: cpbcTotal and cpbc1.
@@ -1954,7 +1942,6 @@ ElapsedTime Cost::convertToElapsedTime(
ElapsedTime et ( csZero );
CostScalar etBlock = cpbcTotal_.getElapsedTime(*pfg);
- // LCOV_EXCL_START
// FirstRow optimization is a disabled feature, hide from coverage
if(pfg->isOptimizeForFirstRow())
{
@@ -1962,7 +1949,6 @@ ElapsedTime Cost::convertToElapsedTime(
const CostScalar etFR = cpfr_.getElapsedTime(*pfg) + etBlock;
et = ElapsedTime( etFR );
}
- // LCOV_EXCL_STOP
else if(pfg->isOptimizeForLastRow())
{
// cpbcTotal_ is a per-probe average cost.
@@ -1973,7 +1959,6 @@ ElapsedTime Cost::convertToElapsedTime(
etLRPlusBlk = etLR + etBlock * cpbcTotal_.getNumProbes();
et = ElapsedTime( etLRPlusBlk );
}
- // LCOV_EXCL_START
// total resource consumption is a disabled feature, hide from coverage
else if (pfg->isOptimizeForResourceConsumption())
{
@@ -1988,7 +1973,6 @@ ElapsedTime Cost::convertToElapsedTime(
etLRPlusBlk = etLR + etBlock * cpbcTotal_.getNumProbes();
et = ElapsedTime( etLRPlusBlk );
}
- // LCOV_EXCL_STOP
return et;
} // Cost::convertToElapsedTime()
@@ -2055,7 +2039,6 @@ const NAString Cost::getDetailDesc() const
"TC_PROC: %g TC_PROD: %g TC_SENT: %g IO_SEQ: %g IO_RAND: %g ",
tcProc, tcProd, tcSent, ioSeq, ioRand);
- // LCOV_EXCL_START :dpm
NABoolean scmDebugOn = (CmpCommon::getDefault(NCM_PRINT_ROWSIZE) == DF_ON);
if (scmDebugOn == TRUE)
{
@@ -2069,7 +2052,6 @@ const NAString Cost::getDetailDesc() const
// Does strcat truncate??
strcat(line, rowsizeInfo);
}
- // LCOV_EXCL_STOP
}
}
dtlDesc = line;
@@ -2148,7 +2130,6 @@ void Cost::getExternalCostAttr(double &cpuTime, double &ioTime,
// simple cost vector depending on the cost model in effect. This is expected
// to be used by callers like Explain etc. to display the cost details.
// -----------------------------------------------------------------------
-// LCOV_EXCL_START :cnu -- OCM code
void Cost::getOcmCostAttr(double &cpu, double &io,
double &msg, double &idleTime,
Lng32 &probes) const
@@ -2168,14 +2149,12 @@ void Cost::getOcmCostAttr(double &cpu, double &io,
CostScalar tmpProbe = cplr_.getNumProbes();
probes = Lng32(tmpProbe.getValue());
}
-// LCOV_EXCL_STOP
// -----------------------------------------------------------------------
// The cost detail description consists of the individual components of the
// simple cost vector depending on the cost model in effect. This is expected
// to be used by callers like Explain etc. to display the cost details.
// -----------------------------------------------------------------------
-// LCOV_EXCL_START
// called only when internal debugging CQD NCM_PRINT_ROWSIZE is ON.
// So hide from coverage
void Cost::getScmCostAttr(double &tcProc, double &tcProd,
@@ -2195,7 +2174,6 @@ void Cost::getScmCostAttr(double &tcProc, double &tcProd,
CostScalar tmpProbe = cpScmlr_.getNumProbes();
probes = Lng32(tmpProbe.getValue());
}
-// LCOV_EXCL_STOP
// -----------------------------------------------------------------------
// The cost detail description consists of the individual components of the
@@ -2441,7 +2419,6 @@ Cost::computePlanPriority( RelExpr* op,
}
-// LCOV_EXCL_START
// excluded for coverage because it's a debug code
void Cost::print(FILE * pfp, const char * , const char *) const
{
@@ -2468,7 +2445,6 @@ void Cost::display() const
print();
}
-// LCOV_EXCL_STOP
//<pb>
//==============================================================================
@@ -2505,7 +2481,6 @@ void Cost::display() const
// none.
//
//==============================================================================
-// LCOV_EXCL_START :cnu -- OCM code
HashJoinCost::HashJoinCost(const SimpleCostVector* currentProcessFirstRowCost,
const SimpleCostVector* currentProcessLastRowCost,
const SimpleCostVector* currentProcessBlockingCost,
@@ -2574,7 +2549,6 @@ HashJoinCost::HashJoinCost(const SimpleCostVector* currentProcessFirstRowCost,
}
} // HashJoinCost constructor.
-// LCOV_EXCL_STOP
//<pb>
//==============================================================================
// Effectively a virtual constructor for a hash join cost object.
@@ -2899,7 +2873,6 @@ CostScalar ResourceConsumptionWeight::operator[] (Lng32 ix) const
// -----------------------------------------------------------------------
// methods for class CostLimit
// -----------------------------------------------------------------------
-// LCOV_EXCL_START :cnu -- OCM code
ElapsedTimeCostLimit* CostLimit::castToElapsedTimeCostLimit() const
{
return NULL; // sorry, wrong number
@@ -3523,7 +3496,6 @@ ElapsedTimeCostLimit::unilaterallyReduce(const ElapsedTime & timeReduction)
cachedValue_ = 0.0;
} //ElapsedTimeCostLimit::unilaterallyReduce()
-// LCOV_EXCL_STOP
//<pb>
// ***********************************************************************
@@ -3884,7 +3856,6 @@ ScmElapsedTimeCostLimit::unilaterallyReduce(const ElapsedTime & timeReduction)
// ---------------------------------------------------------------------------
// methods for class CostPrimitives
// ---------------------------------------------------------------------------
-// LCOV_EXCL_START :cnu -- OCM code
double CostPrimitives::cpuCostForCopySet(const ValueIdSet & vidset)
{
@@ -3981,5 +3952,4 @@ double CostPrimitives::getBasicCostFactor(Lng32 id)
return 1.0;
return CmpCommon::getDefaultNumeric((DefaultConstants)id);
}
-// LCOV_EXCL_STOP
// eof
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/optimizer/EncodedValue.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/EncodedValue.cpp b/core/sql/optimizer/EncodedValue.cpp
index 98ca526..0e769ef 100644
--- a/core/sql/optimizer/EncodedValue.cpp
+++ b/core/sql/optimizer/EncodedValue.cpp
@@ -250,7 +250,6 @@ NormValue::NormValue(const ConstValue * constant, NABoolean negate)
isNullFlag_ = FALSE;
}
-// LCOV_EXCL_START :dpm
void NormValue::display (FILE *f, const char * prefix, const char * suffix,
CollHeap *c, char *buf) const
{
@@ -273,7 +272,6 @@ void NormValue::display (FILE *f, const char * prefix, const char * suffix,
PRINTIT(f, c, space, buf, mybuf);
}
}
-// LCOV_EXCL_STOP
NormValueList::NormValueList(const NormValueList & nvl, NAMemory *h)
:NAArray<NormValue>(h ? h : CmpCommon::statementHeap(),nvl.entries()),
@@ -1034,7 +1032,6 @@ COMPARE_RESULT EncodedValue::compare (const EncodedValue &other) const
return result;
}
-// LCOV_EXCL_START :dpm
void EncodedValue::display (FILE *f, const char * prefix, const char * suffix,
CollHeap *c, char *buf) const
{
@@ -1061,7 +1058,6 @@ void EncodedValue::display (FILE *f, const char * prefix, const char * suffix,
snprintf(mybuf, sizeof(mybuf), " )%s", suffix);
PRINTIT(f, c, space, buf, mybuf);
}
-// LCOV_EXCL_STOP
const NAString EncodedValue::getText(NABoolean parenthesized, NABoolean showFractionalPart) const
{
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/optimizer/EstLogProp.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/EstLogProp.cpp b/core/sql/optimizer/EstLogProp.cpp
index c30631d..58199cf 100644
--- a/core/sql/optimizer/EstLogProp.cpp
+++ b/core/sql/optimizer/EstLogProp.cpp
@@ -129,7 +129,6 @@ EstLogProp::~EstLogProp()
(*counter_).decrementCounter();
}
-// LCOV_EXCL_START :cnu
NABoolean EstLogProp::reconcile(const EstLogProp &other)
{
// simple logic for now: merge unresolved preds lists,
@@ -142,7 +141,6 @@ NABoolean EstLogProp::reconcile(const EstLogProp &other)
resultCardinality_ = (resultCardinality_ + other.resultCardinality_) / 2;
} // EstLogProp::reconcile
-// LCOV_EXCL_STOP
COMPARE_RESULT EstLogProp::compareEstLogProp (const EstLogPropSharedPtr &other) const
{
@@ -437,11 +435,9 @@ EstLogProp::getCardOfBusiestStream(const PartitioningFunction* partFunc,
} // EstLogProp::getCardOfBusiestStream
-// LCOV_EXCL_START :dpm
void EstLogProp::print(FILE* ofd, const char* prefix, const char *suffix) const
{
} // EstLogProp::print()
-// LCOV_EXCL_STOP
NABoolean EstLogProp::operator == (const EstLogProp & other) const
{
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/optimizer/EstLogProp.h
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/EstLogProp.h b/core/sql/optimizer/EstLogProp.h
index 775ac0d..959a3fa 100644
--- a/core/sql/optimizer/EstLogProp.h
+++ b/core/sql/optimizer/EstLogProp.h
@@ -105,7 +105,7 @@ public:
v.round();
v.minCsOne();
if ( v.getValue() > COSTSCALAR_MAX )
- resultCardinality_ = COSTSCALAR_MAX; // LCOV_EXCL_LINE :rfi
+ resultCardinality_ = COSTSCALAR_MAX;
else
resultCardinality_ = v;
}
@@ -124,7 +124,7 @@ public:
void setMaxCardEst(CostScalar v)
{ //CCMPASSERT (v >= 0) ;
if ( v.getValue() > COSTSCALAR_MAX )
- maxCardinality_ = COSTSCALAR_MAX; // LCOV_EXCL_LINE :rfi
+ maxCardinality_ = COSTSCALAR_MAX;
else
maxCardinality_ = v;
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/optimizer/GroupAttr.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/GroupAttr.cpp b/core/sql/optimizer/GroupAttr.cpp
index 6007a4e..7e87bb6 100644
--- a/core/sql/optimizer/GroupAttr.cpp
+++ b/core/sql/optimizer/GroupAttr.cpp
@@ -367,7 +367,7 @@ void GroupAttributes::addConstraint(ItemExpr *c)
break;
case ITM_UNIQUE_CONSTRAINT:
- DCMPASSERT("Wrong constraint type used in GA" == 0); // LCOV_EXCL_LINE
+ DCMPASSERT("Wrong constraint type used in GA" == 0);
break;
default:
@@ -502,7 +502,6 @@ NABoolean GroupAttributes::hasCardConstraint(Cardinality &minNumOfRows,
return found;
}
-// LCOV_EXCL_START
NABoolean GroupAttributes::hasConstraintOfType(OperatorTypeEnum constraintType) const
{
for (ValueId x= constraints_.init();
@@ -527,7 +526,6 @@ void GroupAttributes::getConstraintsOfType(OperatorTypeEnum constraintType,
vidSet.insert(x);
}
}
-// LCOV_EXCL_STOP
// This method is used flow RefOpt constraints (optimizer version of foreign key
// side of a RI constraint) up the query tree. The input argument is typically
@@ -782,7 +780,7 @@ void GroupAttributes::lomerge (GroupAttributes &other, NABoolean mergeCIO)
{
if (NOT (requiredInputs_ == other.requiredInputs_) OR
NOT (requiredOutputs_ == other.requiredOutputs_))
- ABORT("Internal error, merging incompatible group attributes"); // LCOV_EXCL_LINE
+ ABORT("Internal error, merging incompatible group attributes");
}
// To add the constraints from the other group to this one, we
@@ -2496,7 +2494,6 @@ NABoolean GroupAttributes::addInputOutputLogProp (const EstLogPropSharedPtr& inp
} //GroupAttributes::addInputOutputLogProp
-// LCOV_EXCL_START
// this method is used by the GUI debugger for displaying the
// estimated logical properties which are cached by the ASM
@@ -2561,7 +2558,6 @@ SHPTR_LIST(EstLogPropSharedPtr) * GroupAttributes::getCachedStatsList()
}
return statsList;
}
-// LCOV_EXCL_STOP
ColStatsSharedPtr GroupAttributes::getColStatsForSkewDetection(
const ValueId vId,
@@ -2623,7 +2619,6 @@ CostScalar GroupAttributes::getSkewnessFactor(const ValueId vId,
} // GroupAttributes::getSkewnessFactor
-// LCOV_EXCL_START
SkewedValueList* GroupAttributes::getSkewedValues(const ValueId& vId,
double threshold,
@@ -2884,7 +2879,6 @@ GroupAttributes::setEssentialCharacteristicOutputs(const ValueIdSet & vset)
CMPASSERT(NOT misMatchFound);
requiredEssentialOutputs_ = vset;
}
-// LCOV_EXCL_STOP
void
GroupAttributes::addEssentialCharacteristicOutputs(const ValueIdSet & vset)
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/optimizer/ImplRule.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/ImplRule.cpp b/core/sql/optimizer/ImplRule.cpp
index 1fb854c..38c9ff0 100644
--- a/core/sql/optimizer/ImplRule.cpp
+++ b/core/sql/optimizer/ImplRule.cpp
@@ -730,7 +730,7 @@ void copyCommonDeleteFields(Delete *result,
// methods for class FileScanRule
// -----------------------------------------------------------------------
-FileScanRule::~FileScanRule() {} // LCOV_EXCL_LINE
+FileScanRule::~FileScanRule() {}
/**************************************************************************
* Input : list of indexes of the same table
@@ -875,7 +875,6 @@ IndexDesc * findMostPartitionedIndex(const LIST(IndexProperty *)& indexes,CollIn
* plan.
***************************************************************************/
// This function is never code in the code base (checked in M5):1064
-// LCOV_EXCL_START
NABoolean oneViableIndexJoin(const LIST(IndexProperty *) & indexes)
{
CollIndex ixCount = indexes.entries();
@@ -888,7 +887,6 @@ NABoolean oneViableIndexJoin(const LIST(IndexProperty *) & indexes)
}
return FALSE;
}
-// LCOV_EXCL_STOP
/**************************************************************************
@@ -1629,7 +1627,7 @@ RelExpr * FileScanRule::nextSubstitute(RelExpr * before,
// methods for class HbaseScanRule
// -----------------------------------------------------------------------
-HbaseScanRule::~HbaseScanRule() {} // LCOV_EXCL_LINE
+HbaseScanRule::~HbaseScanRule() {}
NABoolean HbaseScanRule::topMatch(RelExpr * relExpr, Context *context)
{
@@ -1667,7 +1665,7 @@ RelExpr * HbaseScanRule::nextSubstitute(RelExpr * before,
// methods for class UnionRule
// -----------------------------------------------------------------------
-UnionRule::~UnionRule() {} // LCOV_EXCL_LINE
+UnionRule::~UnionRule() {}
NABoolean UnionRule::topMatch(RelExpr * relExpr, Context * context)
{
@@ -1736,7 +1734,7 @@ RelExpr * UnionRule::nextSubstitute(RelExpr * before,
// methods for class SortGroupByRule
// -----------------------------------------------------------------------
-SortGroupByRule::~SortGroupByRule() {} // LCOV_EXCL_LINE
+SortGroupByRule::~SortGroupByRule() {}
NABoolean SortGroupByRule::topMatch (RelExpr *relExpr,
Context *context)
@@ -1859,7 +1857,7 @@ RelExpr * SortGroupByRule::nextSubstitute(RelExpr * before,
// -----------------------------------------------------------------------
// methods for class AggregateRule
// -----------------------------------------------------------------------
-AggregateRule::~AggregateRule() {} // LCOV_EXCL_LINE
+AggregateRule::~AggregateRule() {}
NABoolean AggregateRule::topMatch (RelExpr *relExpr,
Context *context)
@@ -1921,7 +1919,7 @@ NABoolean AggregateRule::topMatch (RelExpr *relExpr,
// methods for class PhysShortCutGroupByRule
// -----------------------------------------------------------------------
-PhysShortCutGroupByRule::~PhysShortCutGroupByRule() {} // LCOV_EXCL_LINE
+PhysShortCutGroupByRule::~PhysShortCutGroupByRule() {}
NABoolean PhysShortCutGroupByRule::topMatch (RelExpr *relExpr,
Context *context)
@@ -1997,7 +1995,7 @@ RelExpr * PhysShortCutGroupByRule::nextSubstitute(RelExpr * before,
// methods for class HashGroupByRule
// -----------------------------------------------------------------------
-HashGroupByRule::~HashGroupByRule() {} // LCOV_EXCL_LINE
+HashGroupByRule::~HashGroupByRule() {}
NABoolean HashGroupByRule::topMatch (RelExpr *relExpr,
Context *context)
@@ -2139,7 +2137,7 @@ NABoolean Insert::isDataSorted(Insert *bef, const Context *context)
// methods for class HbaseDeleteRule
// -----------------------------------------------------------------------
-HbaseDeleteRule::~HbaseDeleteRule() {} // LCOV_EXCL_LINE
+HbaseDeleteRule::~HbaseDeleteRule() {}
NABoolean HbaseDeleteRule::topMatch(RelExpr * relExpr, Context *context)
{
@@ -2244,7 +2242,7 @@ RelExpr * HbaseDeleteRule::nextSubstitute(RelExpr * before,
// methods for class HbaseDeleteCursorRule
// -----------------------------------------------------------------------
-HbaseDeleteCursorRule::~HbaseDeleteCursorRule() {} // LCOV_EXCL_LINE
+HbaseDeleteCursorRule::~HbaseDeleteCursorRule() {}
NABoolean HbaseDeleteCursorRule::topMatch(RelExpr * relExpr, Context *context)
{
@@ -2322,7 +2320,7 @@ RelExpr * HbaseDeleteCursorRule::nextSubstitute(RelExpr * before,
// methods for class HbaseUpdateRule
// -----------------------------------------------------------------------
-HbaseUpdateRule::~HbaseUpdateRule() {} // LCOV_EXCL_LINE
+HbaseUpdateRule::~HbaseUpdateRule() {}
NABoolean HbaseUpdateRule::topMatch(RelExpr * relExpr, Context *context)
{
@@ -2429,7 +2427,7 @@ RelExpr * HbaseUpdateRule::nextSubstitute(RelExpr * before,
// methods for class HbaseUpdateCursorRule
// -----------------------------------------------------------------------
-HbaseUpdateCursorRule::~HbaseUpdateCursorRule() {} // LCOV_EXCL_LINE
+HbaseUpdateCursorRule::~HbaseUpdateCursorRule() {}
NABoolean HbaseUpdateCursorRule::topMatch(RelExpr * relExpr, Context *context)
{
@@ -2506,7 +2504,7 @@ RelExpr * HbaseUpdateCursorRule::nextSubstitute(RelExpr * before,
// -----------------------------------------------------------------------
// methods for class HiveInsertRule
// -----------------------------------------------------------------------
-HiveInsertRule::~HiveInsertRule() {} // LCOV_EXCL_LINE
+HiveInsertRule::~HiveInsertRule() {}
NABoolean HiveInsertRule::topMatch(RelExpr * relExpr, Context *context)
{
@@ -2598,7 +2596,7 @@ RelExpr * HiveInsertRule::nextSubstitute(RelExpr * before,
// -----------------------------------------------------------------------
// methods for class HbaseInsertRule
// -----------------------------------------------------------------------
-HbaseInsertRule::~HbaseInsertRule() {} // LCOV_EXCL_LINE
+HbaseInsertRule::~HbaseInsertRule() {}
NABoolean HbaseInsertRule::topMatch(RelExpr * relExpr, Context *context)
{
@@ -2704,7 +2702,7 @@ RelExpr * HbaseInsertRule::nextSubstitute(RelExpr * before,
// methods for class NestedJoinRule
// -----------------------------------------------------------------------
-NestedJoinRule::~NestedJoinRule() {} // LCOV_EXCL_LINE
+NestedJoinRule::~NestedJoinRule() {}
NABoolean NestedJoinRule::topMatch(RelExpr * relExpr,
Context * context)
@@ -3000,7 +2998,7 @@ NABoolean NestedJoinRule::canBePruned(RelExpr * relExpr) const
// methods for class NestedJoinFlowRule
// -----------------------------------------------------------------------
-NestedJoinFlowRule::~NestedJoinFlowRule() {} // LCOV_EXCL_LINE
+NestedJoinFlowRule::~NestedJoinFlowRule() {}
NABoolean NestedJoinFlowRule::topMatch (RelExpr *relExpr,
Context *context)
@@ -3097,7 +3095,7 @@ RelExpr * NestedJoinFlowRule::nextSubstitute(RelExpr * before,
// methods for class HashJoinRule
// -----------------------------------------------------------------------
-HashJoinRule::~HashJoinRule() {} // LCOV_EXCL_LINE
+HashJoinRule::~HashJoinRule() {}
NABoolean HashJoinRule::topMatch (RelExpr * relExpr,
Context * context)
@@ -3530,7 +3528,6 @@ RelExpr * HashJoinRule::nextSubstitute(RelExpr * before,
// The following block of code is old and contains bugs.
// Mask the block out for code coverage.
- // LCOV_EXCL_START
// Check if this is a BMO
NABoolean isBMO = result->isBigMemoryOperatorSetRatio(context, 0, bmoFactor);
@@ -3606,7 +3603,6 @@ RelExpr * HashJoinRule::nextSubstitute(RelExpr * before,
return setResult(result,bef,useOrderedHashJoin, FALSE);
//end Heuristics
- // LCOV_EXCL_STOP
} // HashJoinRule::nextSubstitute()
@@ -3614,7 +3610,7 @@ RelExpr * HashJoinRule::nextSubstitute(RelExpr * before,
// methods for class MergeJoinRule
// -----------------------------------------------------------------------
-MergeJoinRule::~MergeJoinRule() {} // LCOV_EXCL_LINE
+MergeJoinRule::~MergeJoinRule() {}
NABoolean MergeJoinRule::topMatch (RelExpr *relExpr,
Context * context)
@@ -3860,7 +3856,7 @@ RelExpr *PhysCompoundStmtRule::nextSubstitute(
// methods for class PhysicalMapValueIdsRule
// -----------------------------------------------------------------------
-PhysicalMapValueIdsRule::~PhysicalMapValueIdsRule() {} // LCOV_EXCL_LINE
+PhysicalMapValueIdsRule::~PhysicalMapValueIdsRule() {}
// This rule is context sensitive
NABoolean PhysicalMapValueIdsRule::isContextSensitive() const
@@ -3913,7 +3909,7 @@ NABoolean PhysicalMapValueIdsRule::canMatchPattern (const RelExpr *) const
// methods for class PhysicalRelRootRule
// -----------------------------------------------------------------------
-PhysicalRelRootRule::~PhysicalRelRootRule() {} // LCOV_EXCL_LINE
+PhysicalRelRootRule::~PhysicalRelRootRule() {}
RelExpr * PhysicalRelRootRule::nextSubstitute(RelExpr * before,
Context * /*context*/,
@@ -3938,7 +3934,7 @@ RelExpr * PhysicalRelRootRule::nextSubstitute(RelExpr * before,
// methods for class PhysicalTupleRule
// -----------------------------------------------------------------------
-PhysicalTupleRule::~PhysicalTupleRule() {} // LCOV_EXCL_LINE
+PhysicalTupleRule::~PhysicalTupleRule() {}
NABoolean PhysicalTupleRule::topMatch (RelExpr *relExpr,
Context *context)
@@ -3986,7 +3982,7 @@ RelExpr * PhysicalTupleRule::nextSubstitute(RelExpr * before,
// -----------------------------------------------------------------------
// methods for class PhysicalTupleListRule
// -----------------------------------------------------------------------
-PhysicalTupleListRule::~PhysicalTupleListRule() {} // LCOV_EXCL_LINE
+PhysicalTupleListRule::~PhysicalTupleListRule() {}
NABoolean PhysicalTupleListRule::topMatch (RelExpr *relExpr,
Context *context)
@@ -4032,7 +4028,7 @@ RelExpr * PhysicalTupleListRule::nextSubstitute(RelExpr * before,
// methods for class PhysicalExplainRule
// -----------------------------------------------------------------------
-PhysicalExplainRule::~PhysicalExplainRule() {} // LCOV_EXCL_LINE
+PhysicalExplainRule::~PhysicalExplainRule() {}
RelExpr * PhysicalExplainRule::nextSubstitute(RelExpr * before,
Context * /*context*/,
@@ -4057,7 +4053,7 @@ RelExpr * PhysicalExplainRule::nextSubstitute(RelExpr * before,
// methods for class PhysicalHiveMDRule
// -----------------------------------------------------------------------
-PhysicalHiveMDRule::~PhysicalHiveMDRule() {} // LCOV_EXCL_LINE
+PhysicalHiveMDRule::~PhysicalHiveMDRule() {}
RelExpr * PhysicalHiveMDRule::nextSubstitute(RelExpr * before,
Context * /*context*/,
@@ -4083,7 +4079,7 @@ RelExpr * PhysicalHiveMDRule::nextSubstitute(RelExpr * before,
// -----------------------------------------------------------------------
// Destructor.
-PhysicalPackRule::~PhysicalPackRule() // LCOV_EXCL_LINE
+PhysicalPackRule::~PhysicalPackRule()
{
}
@@ -4247,7 +4243,7 @@ NABoolean PhysicalPackRule::canMatchPattern (const RelExpr *) const
// Destructor for the PhysicalTransposeRule
//
-PhysicalTransposeRule::~PhysicalTransposeRule() {} // LCOV_EXCL_LINE
+PhysicalTransposeRule::~PhysicalTransposeRule() {}
// PhysicalTransposeRule::topMatch() -------------------------------------
// The method is used to determine if a rule should fire. If
@@ -4413,7 +4409,7 @@ RelExpr * PhysicalTransposeRule::nextSubstitute(RelExpr * before,
// Destructor for the PhysicalUnPackRowsRule
//
-PhysicalUnPackRowsRule::~PhysicalUnPackRowsRule() {} // LCOV_EXCL_LINE
+PhysicalUnPackRowsRule::~PhysicalUnPackRowsRule() {}
// PhysicalUnPackRowsRule::topMatch() -------------------------------------
// The method is used to determine if a rule should fire. If
@@ -4633,7 +4629,7 @@ NABoolean PhysicalUnPackRowsRule::canMatchPattern (const RelExpr *) const
// methods for class SortEnforcerRule
// -----------------------------------------------------------------------
-SortEnforcerRule::~SortEnforcerRule() {} // LCOV_EXCL_LINE
+SortEnforcerRule::~SortEnforcerRule() {}
NABoolean SortEnforcerRule::topMatch (RelExpr * /* relExpr */,
Context *context)
@@ -4728,7 +4724,7 @@ Int32 SortEnforcerRule::promiseForOptimization(RelExpr *,
// methods for class ExchangeEnforcerRule
// -----------------------------------------------------------------------
-ExchangeEnforcerRule::~ExchangeEnforcerRule() {} // LCOV_EXCL_LINE
+ExchangeEnforcerRule::~ExchangeEnforcerRule() {}
NABoolean ExchangeEnforcerRule::topMatch(RelExpr * /* relExpr */,
Context *context)
@@ -4777,7 +4773,7 @@ Int32 ExchangeEnforcerRule::promiseForOptimization(RelExpr *,
// -----------------------------------------------------------------------
// Destructor for the PhysicalSequenceRule
//
-PhysicalSequenceRule::~PhysicalSequenceRule() {} // LCOV_EXCL_LINE
+PhysicalSequenceRule::~PhysicalSequenceRule() {}
// PhysicalSequenceRule::topMatch() ----------------------------------
// The method is used to determine if a rule should fire. If
@@ -4937,7 +4933,7 @@ RelExpr * PhysicalSequenceRule::nextSubstitute(RelExpr * before,
// Destructor for the PhysicalSampleRule
//
-PhysicalSampleRule::~PhysicalSampleRule() {} // LCOV_EXCL_LINE
+PhysicalSampleRule::~PhysicalSampleRule() {}
// PhysicalSampleRule::topMatch() -------------------------------------
// The method is used to determine if a rule should fire. If
@@ -5108,7 +5104,7 @@ RelExpr * PhysicalSampleRule::nextSubstitute(RelExpr * before,
// -----------------------------------------------------------------------
// methods for class PhysicalSPProxyFuncRule
// -----------------------------------------------------------------------
-PhysicalSPProxyFuncRule::~PhysicalSPProxyFuncRule() // LCOV_EXCL_LINE
+PhysicalSPProxyFuncRule::~PhysicalSPProxyFuncRule()
{}
NABoolean PhysicalSPProxyFuncRule::topMatch(RelExpr *relExpr,
@@ -5141,7 +5137,7 @@ RelExpr *PhysicalSPProxyFuncRule::nextSubstitute(RelExpr *before,
// -----------------------------------------------------------------------
// methods for class PhysicalExtractSourceRule
// -----------------------------------------------------------------------
-PhysicalExtractSourceRule::~PhysicalExtractSourceRule() {} // LCOV_EXCL_LINE
+PhysicalExtractSourceRule::~PhysicalExtractSourceRule() {}
NABoolean PhysicalExtractSourceRule::topMatch(RelExpr *relExpr,
Context *context)
@@ -5168,7 +5164,7 @@ RelExpr *PhysicalExtractSourceRule::nextSubstitute(RelExpr *before,
return (RelExpr *) result;
}
-PhysicalIsolatedScalarUDFRule::~PhysicalIsolatedScalarUDFRule() {} // LCOV_EXCL_LINE
+PhysicalIsolatedScalarUDFRule::~PhysicalIsolatedScalarUDFRule() {}
NABoolean PhysicalIsolatedScalarUDFRule::topMatch (RelExpr *relExpr,
Context *context)
@@ -5217,7 +5213,7 @@ RelExpr * PhysicalIsolatedScalarUDFRule::nextSubstitute(RelExpr * before,
return result;
}
-PhysicalTMUDFRule::~PhysicalTMUDFRule() {} // LCOV_EXCL_LINE
+PhysicalTMUDFRule::~PhysicalTMUDFRule() {}
NABoolean PhysicalTMUDFRule::topMatch (RelExpr *relExpr,
Context *context)
@@ -5279,7 +5275,7 @@ NABoolean PhysicalTMUDFRule::canMatchPattern (const RelExpr *pattern) const
}
}
-PhysicalFastExtractRule::~PhysicalFastExtractRule() {} // LCOV_EXCL_LINE
+PhysicalFastExtractRule::~PhysicalFastExtractRule() {}
NABoolean PhysicalFastExtractRule::topMatch (RelExpr *relExpr,
Context *context)
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/optimizer/Inlining.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/Inlining.cpp b/core/sql/optimizer/Inlining.cpp
index f90a560..6b7ebd2 100644
--- a/core/sql/optimizer/Inlining.cpp
+++ b/core/sql/optimizer/Inlining.cpp
@@ -1563,7 +1563,6 @@ RelExpr *GenericUpdate::createTentativeSubTree(BindWA *bindWA,
// child classes only.
//////////////////////////////////////////////////////////////////////////////
// we are not supposed to get here
-// LCOV_EXCL_START
RelExpr *GenericUpdate::createEffectiveGU(BindWA *bindWA,
CollHeap *heap,
TriggersTempTable& tempTableObj,
@@ -1573,7 +1572,6 @@ RelExpr *GenericUpdate::createEffectiveGU(BindWA *bindWA,
CMPASSERT(FALSE); // Not supposed to get here !!!
return NULL;
}
-// LCOV_EXCL_STOP
//////////////////////////////////////////////////////////////////////////////
// Create an Insert node that inserts the NEW@ values into the subject table.
@@ -2829,7 +2827,6 @@ void GenericUpdate::prepareForMvLogging(BindWA *bindWA,
if (getOperatorType() == REL_UNARY_INSERT &&
getTableDesc()->getNATable()->getMvAttributeBitmap().getAutomaticRangeLoggingRequired())
{
- // LCOV_EXCL_START
// dead code, range logging is not supported
ItemExpr *rowType = new(heap) GenericUpdateOutputFunction(ITM_VSBBROWTYPE);
ItemExpr *rowCount = new(heap) GenericUpdateOutputFunction(ITM_VSBBROWCOUNT);
@@ -2837,7 +2834,6 @@ void GenericUpdate::prepareForMvLogging(BindWA *bindWA,
addVirtualColumn(bindWA, rowType, InliningInfo::getRowTypeVirtualColName(), heap);
rowCountId =
addVirtualColumn(bindWA, rowCount, InliningInfo::getRowCountVirtualColName(), heap);
- // LCOV_EXCL_STOP
}
ItemExpr *tsOutExpr = new (heap)
@@ -2895,7 +2891,6 @@ RelExpr *GenericUpdate::createMvLogInsert(BindWA *bindWA,
RelExpr *topNode = insertNode;
if (logTableObj.needsRangeLogging() && projectMidRangeRows)
{
- // LCOV_EXCL_START
// dead code, range logging is not supported
RelRoot *rootNode = new (heap) RelRoot(insertNode);
rootNode->setEmptySelectList();
@@ -2918,7 +2913,6 @@ RelExpr *GenericUpdate::createMvLogInsert(BindWA *bindWA,
ifNode->setCondUnary();
topNode = ifNode;
- // LCOV_EXCL_STOP
}
RelRoot *rootNode = new (heap) RelRoot(topNode);
@@ -3115,7 +3109,6 @@ GenericUpdate::getTriggeredMvs(BindWA *bindWA,
//////////////////////////////////////////////////////////////////////////////
// we are not supposed to get here
-// LCOV_EXCL_START
void GenericUpdate::insertMvToTriggerList(BeforeAndAfterTriggers *list,
BindWA *bindWA,
CollHeap *heap,
@@ -3126,7 +3119,6 @@ void GenericUpdate::insertMvToTriggerList(BeforeAndAfterTriggers *list,
{
CMPASSERT(false); // not implemented in GenericUpdate
}
-// LCOV_EXCL_STOP
//////////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/optimizer/Inlining.h
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/Inlining.h b/core/sql/optimizer/Inlining.h
index 2a84175..d3e56ba 100644
--- a/core/sql/optimizer/Inlining.h
+++ b/core/sql/optimizer/Inlining.h
@@ -244,11 +244,9 @@ public:
static const char *getEpochVirtualColName() { return epochVirtualColName_; }
static const char *getMvLogTsColName() { return mvLogTsColName_; }
- // LCOV_EXCL_START
// only used for range logging which is a not supported feature
static const char *getRowTypeVirtualColName() { return rowtypeVirtualColName_; }
static const char *getRowCountVirtualColName() { return rowcountVirtualColName_; }
- // LCOV_EXCL_STOP
// Mutators
inline void setFlags(Int64 flags) {flags_ |= flags;}
@@ -301,7 +299,7 @@ public:
// copy Ctor
ForceCardinalityInfo(const ForceCardinalityInfo &other);
- virtual ~ForceCardinalityInfo() {}; // LCOV_EXCL_LINE
+ virtual ~ForceCardinalityInfo() {};
// This value is used to force the cardinality.
// It will be set to 0 when it should be ignored
@@ -331,7 +329,7 @@ public:
// copy Ctor
TriggerBindInfo(const TriggerBindInfo &other);
- virtual ~TriggerBindInfo() {}; // LCOV_EXCL_LINE
+ virtual ~TriggerBindInfo() {};
// forwards definition
typedef UniqueExecuteId *UniqueExecuteIdPtr ;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/optimizer/ItemArith.h
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/ItemArith.h b/core/sql/optimizer/ItemArith.h
index e0f0591..5278f51 100644
--- a/core/sql/optimizer/ItemArith.h
+++ b/core/sql/optimizer/ItemArith.h
@@ -82,7 +82,7 @@ public:
void setStandardNormalization() { normalizeFlags_ = LAST_DAY_ON_ERR; }
NABoolean isKeepLastDay() const { return normalizeFlags_ == LAST_DAY_OF_MONTH_FLAG; }
- void setKeepLastDay() { normalizeFlags_ = LAST_DAY_OF_MONTH_FLAG; } // LCOV_EXCL_LINE
+ void setKeepLastDay() { normalizeFlags_ = LAST_DAY_OF_MONTH_FLAG; }
NABoolean isDateMathFunction() const { return (isStandardNormalization() || isKeepLastDay()); }
const NAType* getIntervalQualifier() const { return intervalQualifier_; }
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/optimizer/ItemColRef.h
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/ItemColRef.h b/core/sql/optimizer/ItemColRef.h
index 9b0c403..6a96370 100644
--- a/core/sql/optimizer/ItemColRef.h
+++ b/core/sql/optimizer/ItemColRef.h
@@ -564,7 +564,7 @@ public:
// provide an interface to the SB and MB strings prepared by the parser.
// Use with caution! At least need to check the null-ness.
- NAString* getLocaleString() { return locale_strval; }; // LCOV_EXCL_LINE
+ NAString* getLocaleString() { return locale_strval; };
NAWString* getLocaleWString() { return locale_wstrval; };
virtual NABoolean hasEquivalentProperties(ItemExpr * other) { return TRUE;}
@@ -723,12 +723,10 @@ public:
virtual ItemExpr * copyTopNode(ItemExpr *derivedNode = NULL,
CollHeap* outHeap = 0);
- // LCOV_EXCL_START
// Safety net -- these methods should never be called because we should
// never get so far as to use them.
virtual const NAType * synthesizeType() { CMPASSERT(FALSE); return NULL; }
short codeGen(Generator*) { CMPASSERT(FALSE); return -1; }
- // LCOV_EXCL_STOP
const NAString getText() const { return "DEFAULT"; }
@@ -830,7 +828,7 @@ public:
void setIsEnvVar(NABoolean isEV = TRUE) { isEnvVar_ = isEV; }
NABoolean isDefine() const { return isDefine_; }
- void setIsDefine(NABoolean isDef = TRUE) { isDefine_ = isDef; } // LCOV_EXCL_LINE
+ void setIsDefine(NABoolean isDef = TRUE) { isDefine_ = isDef; }
NABoolean isParam() const { return isParam_; }
void setIsParam(NABoolean isParam = TRUE) { isParam_ = isParam; }
@@ -842,7 +840,7 @@ public:
NABoolean isSystemGeneratedOutputHV() const;
NAString& getPrototypeValue() { return prototypeValue_; }
- const NAString& getPrototypeValue() const { return prototypeValue_; } // LCOV_EXCL_LINE
+ const NAString& getPrototypeValue() const { return prototypeValue_; }
NABoolean hasPrototypeValue() const { return !prototypeValue_.isNull(); }
void setPrototypeValue(const NAString &s){ prototypeValue_ = s; }
@@ -966,7 +964,6 @@ public:
Int32 ordinalPosition,
Int32 index);
- // LCOV_EXCL_START
// Param heading and tablename needed here for JDBC/WLI, when dynamic rowsets are used.
const NAString &getParamHeading() const { return heading_; }
@@ -981,7 +978,6 @@ public:
{
tablename_ = tablename;
}
- // LCOV_EXCL_STOP
private:
@@ -1112,7 +1108,7 @@ class ConstantParameter : public Parameter
virtual ItemExpr * copyTopNode(ItemExpr *derivedNode = NULL,
CollHeap* outHeap = 0);
- virtual ConstantParameter *castToConstantParameter() { return this; } // LCOV_EXCL_LINE
+ virtual ConstantParameter *castToConstantParameter() { return this; }
NABoolean matches(ConstValue *val) const;
@@ -1446,7 +1442,6 @@ private:
// A fake parameter used to represent the routines formal intputs and
// actual output
// -----------------------------------------------------------------------
-// LCOV_EXCL_START
class RoutineParam : public Parameter
{
@@ -1477,7 +1472,6 @@ public:
memset(argumentType_, 0, sizeof(argumentType_));
}
- // LCOV_EXCL_STOP
RoutineParam(const NAString & paramName, const NAType *type, Lng32 pos,
ComColumnDirection direction, RoutineDesc *rdesc, CollHeap * h=0)
: Parameter(ITM_ROUTINE_PARAM), paramName_(paramName, h),
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/optimizer/ItemConstr.h
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/ItemConstr.h b/core/sql/optimizer/ItemConstr.h
index 25ee914..9d21aa8 100644
--- a/core/sql/optimizer/ItemConstr.h
+++ b/core/sql/optimizer/ItemConstr.h
@@ -205,7 +205,7 @@ public:
const NAString &getConstraintText() const { return constraintText_; }
NABoolean isViewWithCheckOption() const { return isViewWithCheckOption_; }
- void setViewWithCheckOption(NABoolean t) { isViewWithCheckOption_ = t; } // LCOV_EXCL_LINE
+ void setViewWithCheckOption(NABoolean t) { isViewWithCheckOption_ = t; }
const QualifiedName &getCascadingViewName() const { return cascadingView_; }
NABoolean isTheCascadingView() const { return isViewWithCheckOption_ &&
getConstraintName() ==
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/optimizer/ItemExpr.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/ItemExpr.cpp b/core/sql/optimizer/ItemExpr.cpp
index 565f6bf..31b8e58 100644
--- a/core/sql/optimizer/ItemExpr.cpp
+++ b/core/sql/optimizer/ItemExpr.cpp
@@ -165,12 +165,10 @@ NABoolean ExprValueId::operator== (const ItemExpr *other) const
{
return getPtr() == other;
}
- // LCOV_EXCL_START
NABoolean ExprValueId::operator== (const ValueId &other) const
{
return (getValueId() == other);
}
- // LCOV_EXCL_STOP
ValueId ExprValueId::getValueId() const
{
@@ -182,7 +180,6 @@ ValueId ExprValueId::getValueId() const
else
return exprId_;
}
- // LCOV_EXCL_START
void ExprValueId::convertToMemoized()
{
// set this mode to prevent updates to it: a MEMOIZED object cannot
@@ -194,7 +191,6 @@ void ExprValueId::convertToStandalone()
{
exprMode_ = STANDALONE;
}
- // LCOV_EXCL_STOP
ItemExpr * ExprValueId::getPtr() const
{
@@ -274,7 +270,6 @@ ItemExpr::~ItemExpr()
(*counter_).decrementCounter();
}
- // LCOV_EXCL_START
void ItemExpr::transformToRelExpr(NormWA & normWARef,
ExprValueId & locationOfPointerToMe,
ExprGroupId & introduceSemiJoinHere,
@@ -284,7 +279,6 @@ void ItemExpr::transformToRelExpr(NormWA & normWARef,
locationOfPointerToMe = this;
}
- // LCOV_EXCL_STOP
// operator[] is used to access the children of a tree
ExprValueId & ItemExpr::operator[] (Lng32 index)
@@ -303,7 +297,6 @@ NABoolean ItemExpr::operator== (const ItemExpr& other) const // virtual meth
{
return (getValueId() == other.getValueId());
}
- // LCOV_EXCL_START
void ItemExpr::deleteInstance()
{
Int32 nc = getArity();
@@ -311,7 +304,6 @@ void ItemExpr::deleteInstance()
inputs_[i] = NULL;
delete this;
} // ItemExpr::deleteInstance()
- // LCOV_EXCL_STOP
void ItemExpr::setChild(Lng32 index, ExprNode * newChild)
@@ -425,7 +417,7 @@ NABoolean ItemExpr::referencesTheGivenValue(const ValueId & vid,
InstantiateNull *inst = (InstantiateNull *)nie->castToItemExpr();
if (doNotDigInsideInstNulls)
- return FALSE; // LCOV_EXCL_LINE
+ return FALSE;
else
{
// Need to dig underneath the instantiate null to check if
@@ -808,12 +800,10 @@ ItemExpr * ItemExpr::createMirrorPred(ItemExpr *compColPtr,
}
else
{ // XXX print warning for now.
- // LCOV_EXCL_START
#ifdef DEBUG
fprintf(stderr, "ItemExpr::createMirrorPred(): Didn't find any references to valueId: %d\n", tempV);
#endif
return NULL;
- // LCOV_EXCL_STOP
}
// now we want to replace the reference to the key column in the compExpr with the keyColExpr
@@ -1269,7 +1259,7 @@ ItemExpr * ItemExpr::copyTopNode(ItemExpr *derivedNode,
if (derivedNode == NULL)
{
- ABORT("encountered an instantiation of an ItemExpr object"); // LCOV_EXCL_LINE
+ ABORT("encountered an instantiation of an ItemExpr object");
}
else
result = derivedNode;
@@ -1557,7 +1547,6 @@ Lng32 ItemExpr::getTreeSize(Lng32& maxDepth, NABoolean giveUpThreshold)
return currentSize;
}
-// LCOV_EXCL_START : cnu
// Find all eqaulity columns in an item expression tree.
void ItemExpr::findEqualityCols(ValueIdSet& result)
{
@@ -1594,7 +1583,6 @@ void ItemExpr::findEqualityCols(ValueIdSet& result)
child(1)->findEqualityCols(result);
}
}
-// LCOV_EXCL_STOP
ItemExpr * ItemExpr::treeWalk(ItemTreeWalkFunc f,
CollHeap *outHeap,
@@ -1742,7 +1730,6 @@ ValueId ItemExpr::mapAndRewriteCommon(ValueIdMap &map, NABoolean mapDownwards)
return result;
} // ItemExpr::mapAndRewriteCommon
-// LCOV_EXCL_START : cnu
ItemExpr * ItemExpr::foldConstants(ComDiagsArea *diagsArea,
NABoolean newTypeSynthesis)
{
@@ -1779,7 +1766,6 @@ ItemExpr * ItemExpr::foldConstants(ComDiagsArea *diagsArea,
return result;
}
- // LCOV_EXCL_STOP
ItemExpr * ItemExpr::applyInverseDistributivityLaw(
OperatorTypeEnum backboneType,
@@ -1915,11 +1901,9 @@ ItemExpr * ItemExpr::connect2(OperatorTypeEnum op,
case ITM_AND:
case ITM_OR:
return new(CmpCommon::statementHeap()) BiLogic(op, op1, op2);
-// LCOV_EXCL_START : cnu
default:
CMPASSERT("Operator type not supported by connect2" == 0);
return NULL;
-// LCOV_EXCL_STOP
}
}
@@ -2248,7 +2232,6 @@ NABoolean ItemExpr::maxSelectivitySameAsSelectivity() const
}
return FALSE;
}
-// LCOV_EXCL_START
void ItemExpr::print(FILE * f,
const char * prefix,
const char * suffix) const
@@ -2286,7 +2269,6 @@ void ItemExpr::display()
unparse(result, PARSER_PHASE, USER_FORMAT_DELUXE);
fprintf(stdout, "%s\n", result.data());
}
-// LCOV_EXCL_STOP
//
@@ -2661,7 +2643,7 @@ void ItemExpr::unparse(NAString &result,
if (child(0))
child(0)->unparse(result, phase,form, tabId);
else
- result += "NULL"; // LCOV_EXCL_LINE
+ result += "NULL";
if (operatorType == ITM_POSITION)
result += " IN ";
@@ -2671,7 +2653,7 @@ void ItemExpr::unparse(NAString &result,
if (child(1))
child(1)->unparse(result, phase, form, tabId);
else
- result += "NULL"; // LCOV_EXCL_LINE
+ result += "NULL";
result += ")";
break;
} // STDDEV, MOD, VARIANCE
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/optimizer/ItemExpr.h
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/ItemExpr.h b/core/sql/optimizer/ItemExpr.h
index 6e5e57a..992a12a 100644
--- a/core/sql/optimizer/ItemExpr.h
+++ b/core/sql/optimizer/ItemExpr.h
@@ -106,10 +106,8 @@ public:
// compare an ExprValueId with another ExprValueId or ItemExpr * or ValueId
NABoolean operator == (const ExprValueId &other) const;
- // LCOV_EXCL_START
inline NABoolean operator != (const ExprValueId &other) const
{ return NOT operator == (other); }
- //LCOV_EXCL_STOP
NABoolean operator == (const ItemExpr *other) const;
inline NABoolean operator != (const ItemExpr *other) const
@@ -411,10 +409,8 @@ public:
// sure the expression is not used elsewhere.
void unBind() { markAsUnBound(); setValueId(NULL_VALUE_ID); }
- // LCOV_EXCL_START
virtual NABoolean isTypeComplete(const NAType*) { return TRUE; };
virtual void reportTypeIsIncomplete() {};
- // LCOV_EXCL_STOP
void bindChildren(BindWA *bindWA); // a method for binding the children
void bindSelf(BindWA *bindWA); // a method for binding the children and self
@@ -1123,12 +1119,10 @@ public:
virtual ConstantParameter *castToConstantParameter() { return NULL; }
- // LCOV_EXCL_START
// perform a safe type cast to RandomNum (return NULL ptr for illegal casts)
virtual RandomNum *castToRandomNum() { return NULL; }
virtual const SelParameter *castToSelParameter() const { return NULL; }
- // LCOV_EXCL_STOP
// does this entire ItemExpr qualify query to be cacheable after this phase?
virtual NABoolean isCacheableExpr(CacheWA& cwa);
@@ -1173,7 +1167,7 @@ public:
// warning elimination (removed "inline")
virtual void setPMOrdPosAndIndex( ComColumnDirection paramMode,
Int32 ordinalPosition,
- Int32 index) { CMPASSERT (0);} // LCOV_EXCL_LINE
+ Int32 index) { CMPASSERT (0);}
NABoolean isARangePredicate() const;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/optimizer/ItmBitMuxFunction.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/ItmBitMuxFunction.cpp b/core/sql/optimizer/ItmBitMuxFunction.cpp
index d51bcee..6a77ec8 100644
--- a/core/sql/optimizer/ItmBitMuxFunction.cpp
+++ b/core/sql/optimizer/ItmBitMuxFunction.cpp
@@ -21,7 +21,6 @@
// @@@ END COPYRIGHT @@@
**********************************************************************/
-// LCOV_EXCL_START
// This class is obsolete in the sense
// that it had been added long time ago during the data
// mining days (late 90s) but is not used anymore
@@ -63,4 +62,3 @@ ItemExpr *ItmBitMuxFunction::copyTopNode(ItemExpr *derivedNode,
return BuiltinFunction::copyTopNode(result, outHeap);
};
#pragma warn(770) // warning elimination
-// LCOV_EXCL_STOP
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/optimizer/ItmBitMuxFunction.h
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/ItmBitMuxFunction.h b/core/sql/optimizer/ItmBitMuxFunction.h
index 28d8548..d2e5617 100644
--- a/core/sql/optimizer/ItmBitMuxFunction.h
+++ b/core/sql/optimizer/ItmBitMuxFunction.h
@@ -21,7 +21,6 @@
#ifndef BitMuxFunction_h
#define BitMuxFunction_h
-// LCOV_EXCL_START
// This class is obsolete in the sense
// that it had been added long time ago during the data
// mining days (late 90s) but is not used anymore
@@ -54,7 +53,6 @@ public:
ItemExpr *copyTopNode(ItemExpr *derivedNode =NULL,
NAMemory *outHeap =0);
};
-// LCOV_EXCL_STOP
#endif
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/optimizer/ItmFlowControlFunction.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/ItmFlowControlFunction.cpp b/core/sql/optimizer/ItmFlowControlFunction.cpp
index 09e4fa2..fc9a974 100644
--- a/core/sql/optimizer/ItmFlowControlFunction.cpp
+++ b/core/sql/optimizer/ItmFlowControlFunction.cpp
@@ -36,7 +36,6 @@ const NAType *ItmDoWhileFunction::synthesizeType() {
return &child(0)->castToItemExpr()->getValueId().getType();
};
-// LCOV_EXCL_START :dd
// copyTopNode
//
#pragma nowarn(770) // warning elimination
@@ -53,7 +52,6 @@ ItemExpr *ItmDoWhileFunction::copyTopNode(ItemExpr *derivedNode,
return BuiltinFunction::copyTopNode(result, outHeap);
};
#pragma warn(770) // warning elimination
-// LCOV_EXCL_STOP
//
@@ -68,7 +66,6 @@ const NAType *ItmBlockFunction::synthesizeType() {
return &child(1)->castToItemExpr()->getValueId().getType();
};
-// LCOV_EXCL_START :dd
// copyTopNode
//
#pragma nowarn(770) // warning elimination
@@ -85,7 +82,6 @@ ItemExpr *ItmBlockFunction::copyTopNode(ItemExpr *derivedNode,
return BuiltinFunction::copyTopNode(result, outHeap);
};
#pragma warn(770) // warning elimination
-// LCOV_EXCL_STOP
//
// ItmWhile
@@ -97,7 +93,6 @@ const NAType *ItmWhileFunction::synthesizeType() {
return &child(0)->castToItemExpr()->getValueId().getType();
};
-// LCOV_EXCL_START :dd
// copyTopNode
//
#pragma nowarn(770) // warning elimination
@@ -114,7 +109,6 @@ ItemExpr *ItmWhileFunction::copyTopNode(ItemExpr *derivedNode,
return BuiltinFunction::copyTopNode(derivedNode, outHeap);
};
#pragma warn(770) // warning elimination
-// LCOV_EXCL_STOP
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/optimizer/LargeScopeRules.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/LargeScopeRules.cpp b/core/sql/optimizer/LargeScopeRules.cpp
index 0e1c0e3..30cf4d2 100644
--- a/core/sql/optimizer/LargeScopeRules.cpp
+++ b/core/sql/optimizer/LargeScopeRules.cpp
@@ -48,7 +48,6 @@ extern THREAD_P NAUnsigned MJStarJoinIRuleNumber;
extern THREAD_P NAUnsigned MJStarJoinIIRuleNumber;
extern THREAD_P NAUnsigned RoutineJoinToTSJRuleNumber;
-// LCOV_EXCL_START
// Excluding MJExpandRule related code since it is there for testing purposes
// MJExpandRule is not exercised during normal execution
// -----------------------------------------------------------------------
@@ -113,7 +112,6 @@ Int32 MJExpandRule::promiseForOptimization (RelExpr * expr,
// should be higher than the promise for MJEnumRule
return DefaultTransRulePromise + 1;
}
-// LCOV_EXCL_STOP
// -----------------------------------------------------------------------
// methods for MVQRRule
@@ -435,7 +433,6 @@ RelExpr * MJEnumRule::nextSubstitute(RelExpr * before,
// is there are jbbc that provides an equalizing join
NABoolean guaranteedEqualizerPresent = FALSE;
-// LCOV_EXCL_START
#ifdef _DEBUG
if ( CmpCommon::getDefault( NSK_DBG ) == DF_ON &&
CmpCommon::getDefault( NSK_DBG_MJRULES_TRACKING ) == DF_ON )
@@ -444,7 +441,6 @@ RelExpr * MJEnumRule::nextSubstitute(RelExpr * before,
CURRCONTEXT_OPTDEBUG->stream() << "Level " << mjoin->getArity() << ": " << childrenFlow.value() << endl;
}
#endif
-// LCOV_EXCL_STOP
// allow cross product control if:
// 1) cross_product_control is active AND
@@ -546,7 +542,6 @@ RelExpr * MJEnumRule::nextSubstitute(RelExpr * before,
if ((newSubgraphs > mySubgraphs) && allowCrossProductControl)
{
-// LCOV_EXCL_START
#ifdef _DEBUG
if ( CmpCommon::getDefault( NSK_DBG ) == DF_ON &&
CmpCommon::getDefault( NSK_DBG_MJRULES_TRACKING ) == DF_ON )
@@ -554,7 +549,6 @@ RelExpr * MJEnumRule::nextSubstitute(RelExpr * before,
CURRCONTEXT_OPTDEBUG->stream() << " Unnecessary Cross Product when joining right child" << (CollIndex) i << endl;
}
#endif
-// LCOV_EXCL_STOP
continue;
}
@@ -600,7 +594,6 @@ RelExpr * MJEnumRule::nextSubstitute(RelExpr * before,
substituteRightChild[numSubstitutes] = i;
-// LCOV_EXCL_START
#ifdef _DEBUG
if ( CmpCommon::getDefault( NSK_DBG ) == DF_ON &&
CmpCommon::getDefault( NSK_DBG_MJRULES_TRACKING ) == DF_ON )
@@ -611,7 +604,6 @@ RelExpr * MJEnumRule::nextSubstitute(RelExpr * before,
" is "<< substituteMetric2[numSubstitutes].value() << endl;
}
#endif
-// LCOV_EXCL_STOP
// Remembering the substitutes with min metric
if ((substituteMetric[numSubstitutes] < minSubstituteMetric) ||
@@ -781,7 +773,6 @@ RelExpr * MJEnumRule::nextSubstitute(RelExpr * before,
(CURRSTMT_OPTDEFAULTS->optimizerHeuristic5()) && // Data Flow Optimization
(substituteMetric[childIter] > DATA_FLOW_FACTOR_1 * minSubstituteMetric + DATA_FLOW_FACTOR_2))
{
-// LCOV_EXCL_START
#ifdef _DEBUG
if ( CmpCommon::getDefault( NSK_DBG ) == DF_ON &&
CmpCommon::getDefault( NSK_DBG_MJRULES_TRACKING ) == DF_ON )
@@ -792,7 +783,6 @@ RelExpr * MJEnumRule::nextSubstitute(RelExpr * before,
<< " >> "<< minSubstituteMetric.value() << endl;
}
#endif
-// LCOV_EXCL_STOP
potentialSubstitutes[childIter] = NULL;
numPrunedSubstitutes++;
continue;
@@ -808,7 +798,6 @@ RelExpr * MJEnumRule::nextSubstitute(RelExpr * before,
if (mjoin->getArity() > 2)
{
-// LCOV_EXCL_START
#ifdef _DEBUG
if ( CmpCommon::getDefault( NSK_DBG ) == DF_ON &&
CmpCommon::getDefault( NSK_DBG_MJRULES_TRACKING ) == DF_ON )
@@ -820,7 +809,6 @@ RelExpr * MJEnumRule::nextSubstitute(RelExpr * before,
<< " ---- "<< minSubstituteMetric2.value() << endl;
}
#endif
-// LCOV_EXCL_STOP
potentialSubstitutes[childIter] = NULL;
numPrunedSubstitutes++;
continue;
@@ -958,7 +946,6 @@ RelExpr * MJEnumRule::nextSubstitute(RelExpr * before,
{
RelExpr* substitute = resultPotentialSubstitutes[childIter];
-// LCOV_EXCL_START
#ifdef _DEBUG
if ( CmpCommon::getDefault( NSK_DBG ) == DF_ON &&
CmpCommon::getDefault( NSK_DBG_MJRULES_TRACKING ) == DF_ON )
@@ -969,7 +956,6 @@ RelExpr * MJEnumRule::nextSubstitute(RelExpr * before,
<< " ~~ "<< minSubstituteMetric.value() << endl;
}
#endif
-// LCOV_EXCL_STOP
Int32 combinedPotential = groupPotential + potential;
substitute->updatePotential(potential);
@@ -1064,7 +1050,6 @@ NABoolean MJStarJoinIRule::topMatch (RelExpr * expr,
(!mjoin->scheduledLSRs().contains(MJStarJoinIRuleNumber)))
return FALSE;
-// LCOV_EXCL_START
#ifdef _DEBUG
if ( CmpCommon::getDefault( NSK_DBG ) == DF_ON &&
CmpCommon::getDefault( NSK_DBG_MJRULES_TRACKING ) == DF_ON )
@@ -1074,7 +1059,6 @@ NABoolean MJStarJoinIRule::topMatch (RelExpr * expr,
CURRCONTEXT_OPTDEBUG->stream() << "Superset is : " << mjoin->getJBBSubset().getJBB()->getMainJBBSubset().getText() << endl;
}
#endif //_DEBUG
-// LCOV_EXCL_STOP
// get a handle to the JBBSubset Analysis for the JBBSubset
// represented by this MultiJoin (i.e. mjoin)
@@ -1086,7 +1070,6 @@ NABoolean MJStarJoinIRule::topMatch (RelExpr * expr,
if (mjoinAnalysis->starJoinTypeIFeasible())
{
-// LCOV_EXCL_START
#ifdef _DEBUG
if ( CmpCommon::getDefault( NSK_DBG ) == DF_ON &&
CmpCommon::getDefault( NSK_DBG_MJRULES_TRACKING ) == DF_ON )
@@ -1095,12 +1078,10 @@ NABoolean MJStarJoinIRule::topMatch (RelExpr * expr,
CURRCONTEXT_OPTDEBUG->stream() << "MJStarJoinIRule_TopMatch_End" <<endl;
}
#endif //_DEBUG
-// LCOV_EXCL_STOP
return TRUE;
}
else {
mjoin->scheduledLSRs() += MJStarJoinIIRuleNumber;
-// LCOV_EXCL_START
#ifdef _DEBUG
if ( CmpCommon::getDefault( NSK_DBG ) == DF_ON &&
CmpCommon::getDefault( NSK_DBG_MJRULES_TRACKING ) == DF_ON )
@@ -1110,12 +1091,10 @@ NABoolean MJStarJoinIRule::topMatch (RelExpr * expr,
CURRCONTEXT_OPTDEBUG->stream() << "MJStarJoinIRule_TopMatch_End" <<endl;
}
#endif //_DEBUG
-// LCOV_EXCL_STOP
}
return FALSE;
}
-// LCOV_EXCL_START
// the old topMatch method of MJStarJoinIRule,
// not used anymore this code is OFF by default
NABoolean MJStarJoinIRule::topMatch_Old (RelExpr * expr,
@@ -1286,7 +1265,6 @@ NABoolean MJStarJoinIRule::topMatch_Old (RelExpr * expr,
return TRUE;
}
-// LCOV_EXCL_STOP
RelExpr * MJStarJoinIRule::nextSubstitute(RelExpr * before,
Context * context,
@@ -1295,7 +1273,6 @@ RelExpr * MJStarJoinIRule::nextSubstitute(RelExpr * before,
if (CmpCommon::getDefault(COMP_BOOL_115) == DF_ON)
return nextSubstitute_Old(before, context, memory);
-// LCOV_EXCL_START
#ifdef _DEBUG
if ( CmpCommon::getDefault( NSK_DBG ) == DF_ON &&
CmpCommon::getDefault( NSK_DBG_MJRULES_TRACKING ) == DF_ON )
@@ -1303,7 +1280,6 @@ RelExpr * MJStarJoinIRule::nextSubstitute(RelExpr * before,
CURRCONTEXT_OPTDEBUG->stream() << "MJStarJoinIRule_nextSubstitute_Begin" <<endl;
}
#endif //_DEBUG
-// LCOV_EXCL_STOP
MultiJoin * mjoin = (MultiJoin *) before;
@@ -1411,7 +1387,6 @@ RelExpr * MJStarJoinIRule::nextSubstitute(RelExpr * before,
RelExpr * result = mjoin->createLeftLinearJoinTree(leftDeepJoinSequence,
&joinDirectives);
-// LCOV_EXCL_START
#ifdef _DEBUG
if ( CmpCommon::getDefault( NSK_DBG ) == DF_ON &&
CmpCommon::getDefault( NSK_DBG_MJRULES_TRACKING ) == DF_ON )
@@ -1419,12 +1394,10 @@ RelExpr * MJStarJoinIRule::nextSubstitute(RelExpr * before,
CURRCONTEXT_OPTDEBUG->stream() << "MJStarJoinIRule_nextSubstitute_End" <<endl;
}
#endif //_DEBUG
-// LCOV_EXCL_STOP
return result;
}
-// LCOV_EXCL_START
// This is old code, most of this work in now done during
// analysis. This functionality was moved to the analysis
// phase as part of Adaptive Segmentation. Since we need
@@ -2870,7 +2843,6 @@ void MJStarJoinIRule::sortMJJBBCs(NAList<CANodeId> &sortedJBBCs,const MultiJoin
}
};//MJStarJoinIRule::sortMJJBBCs
-// LCOV_EXCL_STOP
// -----------------------------------------------------------------------
// methods for MJStarJoinIIRule
@@ -2896,7 +2868,6 @@ NABoolean MJStarJoinIIRule::topMatch (RelExpr * expr,
if(!mjoin->scheduledLSRs().contains(MJStarJoinIIRuleNumber))
return FALSE;
-// LCOV_EXCL_START
#ifdef _DEBUG
if ( CmpCommon::getDefault( NSK_DBG ) == DF_ON &&
CmpCommon::getDefault( NSK_DBG_MJRULES_TRACKING ) == DF_ON )
@@ -2906,7 +2877,6 @@ NABoolean MJStarJoinIIRule::topMatch (RelExpr * expr,
CURRCONTEXT_OPTDEBUG->stream() << "Superset is : " << mjoin->getJBBSubset().getJBB()->getMainJBBSubset().getText() << endl;
}
#endif //_DEBUG
-// LCOV_EXCL_STOP
// get a handle to the JBBSubset Analysis for the JBBSubset
// represented by this MultiJoin (i.e. mjoin)
@@ -2916,7 +2886,6 @@ NABoolean MJStarJoinIIRule::topMatch (RelExpr * expr,
mjoinAnalysis->analyzeInitialPlan();
-// LCOV_EXCL_START
#ifdef _DEBUG
if ( CmpCommon::getDefault( NSK_DBG ) == DF_ON &&
CmpCommon::getDefault( NSK_DBG_MJRULES_TRACKING ) == DF_ON )
@@ -2924,7 +2893,6 @@ NABoolean MJStarJoinIIRule::topMatch (RelExpr * expr,
CURRCONTEXT_OPTDEBUG->stream() << "MJStarJoinIIRule_TopMatch_End" <<endl;
}
#endif //_DEBUG
-// LCOV_EXCL_STOP
return TRUE;
}
@@ -2936,7 +2904,6 @@ RelExpr * MJStarJoinIIRule::nextSubstitute(RelExpr * before,
if (CmpCommon::getDefault(COMP_BOOL_115) == DF_ON)
return nextSubstitute_Old(before, context, memory);
-// LCOV_EXCL_START
#ifdef _DEBUG
if ( CmpCommon::getDefault( NSK_DBG ) == DF_ON &&
CmpCommon::getDefault( NSK_DBG_MJRULES_TRACKING ) == DF_ON )
@@ -2944,7 +2911,6 @@ RelExpr * MJStarJoinIIRule::nextSubstitute(RelExpr * before,
CURRCONTEXT_OPTDEBUG->stream() << "MJStarJoinIIRule_nextSubstitute_Begin" <<endl;
}
#endif //_DEBUG
-// LCOV_EXCL_STOP
MultiJoin * mjoin = (MultiJoin *) before;
@@ -3031,7 +2997,6 @@ RelExpr * MJStarJoinIIRule::nextSubstitute(RelExpr * before,
&joinDirectives);
}
-// LCOV_EXCL_START
// Below is the old nextSubstitute. The code is not exercised any more
RelExpr * MJStarJoinIIRule::nextSubstitute_Old(RelExpr * before,
Context * context,
@@ -3321,9 +3286,7 @@ RelExpr * MJStarJoinIIRule::nextSubstitute_Old(RelExpr * before,
return mjoin->createLeftLinearJoinTree(&leftDeepJoinSequence,
&joinDirectives);
}
-// LCOV_EXCL_STOP
-// LCOV_EXCL_START
// This class was used by old code, that is not exercised anymore
MJRulesWA::MJRulesWA(JBBSubsetAnalysis * analysis)
{
@@ -3344,4 +3307,3 @@ MJRulesWA::MJRulesWA(JBBSubsetAnalysis * analysis)
largestTable_ = NULL_CA_ID;
largestNode_ = NULL_CA_ID;
}
-// LCOV_EXCL_STOP
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/optimizer/MVCandidates.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/MVCandidates.cpp b/core/sql/optimizer/MVCandidates.cpp
index c11f4de..64e224b 100644
--- a/core/sql/optimizer/MVCandidates.cpp
+++ b/core/sql/optimizer/MVCandidates.cpp
@@ -55,7 +55,6 @@ MVCandidates::MVCandidates(RelRoot* root,
bjScanHash_(bjScanHashFn, 17, TRUE, QueryAnalysis::Instance()->outHeap())
{}
-// LCOV_EXCL_START :cnu
Int32 MVCandidates::nodeCount(ExprNode* node)
{
// Recurse for each child, and add one for the current node.
@@ -67,7 +66,6 @@ Int32 MVCandidates::nodeCount(ExprNode* node)
return nodes + 1;
}
-// LCOV_EXCL_STOP
// extract the list of candidate MVs from the value of the MVQR_REWRITE_CANDIDATES CQD
void MVCandidates::buildFavoritesList (CollHeap* heap)
@@ -135,7 +133,7 @@ GroupByAgg* MVCandidates::getGroupByAggNode(RelExpr* childNode,
candidate->getMVName()->getMVName(),
heap));
else
- assertLogAndThrow1(CAT_SQL_COMP_MVCAND, LL_MVQR_FAIL, // LCOV_EXCL_LINE :rfi
+ assertLogAndThrow1(CAT_SQL_COMP_MVCAND, LL_MVQR_FAIL,
FALSE, MVCandidateException,
"Unexpected element type for grouping item -- %d",
elemType)
@@ -326,7 +324,7 @@ ItemExpr* MVCandidates::rewriteItemExpr(const ElementPtrList& mvColumns,
break;
default:
- assertLogAndThrow1(CAT_SQL_COMP_MVCAND, LL_MVQR_FAIL, // LCOV_EXCL_LINE :rfi
+ assertLogAndThrow1(CAT_SQL_COMP_MVCAND, LL_MVQR_FAIL,
FALSE, MVCandidateException,
"rewriteItemExpr() not ready for element of type %d",
mvColumns[i]->getElementType());
@@ -444,7 +442,7 @@ static OperatorTypeEnum determineAggForRollup(QRMVColumnPtr mvCol)
break;
default:
- assertLogAndThrow1(CAT_SQL_COMP_MVCAND, LL_MVQR_FAIL, // LCOV_EXCL_LINE :rfi
+ assertLogAndThrow1(CAT_SQL_COMP_MVCAND, LL_MVQR_FAIL,
FALSE, MVCandidateException,
"Can't rewrite this agg func for rollup: %d",
itemExpr->getOperatorType());
@@ -548,7 +546,7 @@ void MVCandidates::rewriteRangePreds(QRCandidatePtr candidate,
heap);
}
else
- assertLogAndThrow1(CAT_SQL_COMP_MVCAND, LL_MVQR_FAIL, // LCOV_EXCL_LINE :rfi
+ assertLogAndThrow1(CAT_SQL_COMP_MVCAND, LL_MVQR_FAIL,
FALSE, MVCandidateException,
"Not ready for range item with element type %d",
rangeItem->getElementType())
@@ -567,7 +565,7 @@ void MVCandidates::rewriteRangePreds(QRCandidatePtr candidate,
break;
default:
- assertLogAndThrow1(CAT_SQL_COMP_MVCAND, LL_MVQR_FAIL, // LCOV_EXCL_LINE :rfi
+ assertLogAndThrow1(CAT_SQL_COMP_MVCAND, LL_MVQR_FAIL,
FALSE, MVCandidateException,
"Unknown value for result attribute -- %d",
rangePred->getResult());
@@ -685,7 +683,7 @@ void MVCandidates::rewriteResidPreds(QRCandidatePtr candidate,
break;
default:
- assertLogAndThrow1(CAT_SQL_COMP_MVCAND, LL_MVQR_FAIL, // LCOV_EXCL_LINE :rfi
+ assertLogAndThrow1(CAT_SQL_COMP_MVCAND, LL_MVQR_FAIL,
FALSE, MVCandidateException,
"Unknown value for result attribute -- %d",
residPred->getResult());
@@ -733,7 +731,7 @@ ColRefName* MVCandidates::getColRefName(QRCandidatePtr candidate,
}
else
throw QRDescriptorException("getColRefName() cannot be called for element %s",
- elem->getElementName()); // LCOV_EXCL_LINE :rfi
+ elem->getElementName());
return returnVal;
} // getColRefName()
@@ -871,7 +869,7 @@ void MVCandidates::buildOutputExprs(QRCandidatePtr candidate,
break;
default:
- assertLogAndThrow1(CAT_SQL_COMP_MVCAND, LL_MVQR_FAIL, // LCOV_EXCL_LINE :rfi
+ assertLogAndThrow1(CAT_SQL_COMP_MVCAND, LL_MVQR_FAIL,
FALSE, MVCandidateException,
"Unknown value for result attribute -- %d",
output->getResult());
@@ -947,7 +945,6 @@ void MVCandidates::analyzeCandidateMVs(QRJbbSubsetPtr qrJbbSubset)
rewriteSingleNode,
jbbNodeSet, heap);
}
- // LCOV_EXCL_START :rfi
catch (MVCandidateException&)
{
// Throwers of this exception should use one of the macros that logs the
@@ -957,7 +954,6 @@ void MVCandidates::analyzeCandidateMVs(QRJbbSubsetPtr qrJbbSubset)
"Skipping candidate MV %s due to exception",
candidate->getMVName()->getMVName().data());
}
- // LCOV_EXCL_STOP
}
delete actualJbbSubset;
@@ -977,7 +973,7 @@ ValueId MVCandidates::getRewriteVid(RETDesc* retDesc,
return retDesc->getValueId(i);
}
- assertLogAndThrow(CAT_SQL_COMP_MVCAND, LL_MVQR_FAIL, // LCOV_EXCL_LINE :rfi
+ assertLogAndThrow(CAT_SQL_COMP_MVCAND, LL_MVQR_FAIL,
FALSE, MVCandidateException,
"Column in <Output> element of result descriptor not found "
"in column descriptor list");
@@ -1020,7 +1016,7 @@ ValueId MVCandidates::getBaseColValueId(QRElementPtr referencingElem)
someMemberId.getItemExpr()->getOperatorType() == ITM_BASECOLUMN)
return someMemberId;
- assertLogAndThrow1(CAT_SQL_COMP_MVCAND, LL_MVQR_FAIL, // LCOV_EXCL_LINE :rfi
+ assertLogAndThrow1(CAT_SQL_COMP_MVCAND, LL_MVQR_FAIL,
FALSE, MVCandidateException,
"No base column found in vegref referenced by %s",
ref.data());
@@ -1109,7 +1105,7 @@ void MVCandidates::populateOneVidMap(RelExpr* root,
vidMap.addMapEntry(vegrefVid, ie->getValueId());
}
else
- assertLogAndThrow(CAT_SQL_COMP_MVCAND, LL_MVQR_FAIL, // LCOV_EXCL_LINE :rfi
+ assertLogAndThrow(CAT_SQL_COMP_MVCAND, LL_MVQR_FAIL,
FALSE, MVCandidateException,
"Unable to get vegref for map value id lower value")
baseColVid = getBaseColValueId(elem);
@@ -1119,7 +1115,7 @@ void MVCandidates::populateOneVidMap(RelExpr* root,
}
else
{
- assertLogAndThrow(CAT_SQL_COMP_MVCAND, LL_MVQR_FAIL, // LCOV_EXCL_LINE :rfi
+ assertLogAndThrow(CAT_SQL_COMP_MVCAND, LL_MVQR_FAIL,
FALSE, MVCandidateException,
"Expecting a base column while constructing map value id lower value")
}
@@ -1151,7 +1147,6 @@ void MVCandidates::populateVidMap(RelExpr* root,
else if (elemType == ET_Expr)
{
expr = elem->downCastToQRExpr();
- // LCOV_EXCL_START :rfi
if (expr->getExprRoot()->isAnAggregate())
{
// These have already been taken care of and shouldn't be in the
@@ -1160,7 +1155,6 @@ void MVCandidates::populateVidMap(RelExpr* root,
FALSE, MVCandidateException,
"Aggregate function found in top value list");
}
- // LCOV_EXCL_STOP
else
{
const ElementPtrList& colsUsed = expr->getInputColumns(heap, FALSE);
@@ -1172,7 +1166,7 @@ void MVCandidates::populateVidMap(RelExpr* root,
}
}
else
- assertLogAndThrow(CAT_SQL_COMP_MVCAND, LL_MVQR_FAIL, // LCOV_EXCL_LINE :rfi
+ assertLogAndThrow(CAT_SQL_COMP_MVCAND, LL_MVQR_FAIL,
FALSE, MVCandidateException,
"Output item is neither Column, MVColumn nor expression")
}
@@ -1327,13 +1321,11 @@ ItemExpr* MVCandidates::getIGBJoinCondOp(QRElementPtr elem,
NABoolean& fromFactTable,
CollHeap* heap)
{
- // LCOV_EXCL_START :rfi
if (elem->getElementType() != ET_Column)
assertLogAndThrow1(CAT_SQL_COMP_MVCAND, LL_MVQR_FAIL,
FALSE, MVCandidateException,
"Can only handle column join condition operands, not %d",
elem->getElementType());
- // LCOV_EXCL_STOP
QRElementPtr outputItem;
QRColumnPtr col = elem->getReferencedElement()->downCastToQRColumn();
@@ -1358,7 +1350,7 @@ ItemExpr* MVCandidates::getIGBJoinCondOp(QRElementPtr elem,
mvCol, heap));
}
}
- assertLogAndThrow(CAT_SQL_COMP_MVCAND, LL_MVQR_FAIL, // LCOV_EXCL_LINE :rfi
+ assertLogAndThrow(CAT_SQL_COMP_MVCAND, LL_MVQR_FAIL,
FALSE, MVCandidateException,
"Could not find join operand from fact table for "
"indirect Group By query");
@@ -1701,7 +1693,6 @@ void MVCandidates::analyzeCandidate(QRCandidatePtr candidate,
// Bind the replacement tree.
marker = CmpCommon::diags()->mark();
RelExpr* boundRoot = root->bindNode(bindWA_);
- // LCOV_EXCL_START :rfi
if (bindWA_->errStatus())
{
QRLogger::log(CAT_SQL_COMP_MVCAND, LL_MVQR_FAIL,
@@ -1720,7 +1711,6 @@ void MVCandidates::analyzeCandidate(QRCandidatePtr candidate,
deletePtr(match);
return;
}
- // LCOV_EXCL_STOP
// queryRoot_->getStoiList().insert(scan->getOptStoi());
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/optimizer/MVCandidates.h
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/MVCandidates.h b/core/sql/optimizer/MVCandidates.h
index c1d793e..9b8b0ad 100644
--- a/core/sql/optimizer/MVCandidates.h
+++ b/core/sql/optimizer/MVCandidates.h
@@ -64,7 +64,6 @@ typedef NAHashDictionary<CollIndex, Scan> NodeIdScanHash;
* file.
*/
-// LCOV_EXCL_START :rfi
/**
* Exception thrown when a candidate in the result descriptor must be discarded
* because an internal error occurred when processing it, or it requires a
@@ -95,7 +94,6 @@ class MVCandidateException : public QRException
{}
}; //MVCandidateException
-// LCOV_EXCL_STOP
/**
* Class used to analyze the result descriptor corresponding to a match
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/optimizer/MVInfo.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/MVInfo.cpp b/core/sql/optimizer/MVInfo.cpp
index 4cc3e70..515a70f 100644
--- a/core/sql/optimizer/MVInfo.cpp
+++ b/core/sql/optimizer/MVInfo.cpp
@@ -346,7 +346,6 @@ NABoolean ViewColumnConnection::operator==(const ViewColumnConnection &other) co
//============================================================================
// ViewColumnConnection and ViewTableConnection classes ignored from coverage
// testing until MV on view is supported.
-// LCOV_EXCL_START
//----------------------------------------------------------------------------
ViewTableConnection::~ViewTableConnection()
@@ -637,7 +636,6 @@ void ViewColumnGraph::display() const
#endif
-// LCOV_EXCL_STOP
//============================================================================
//======================= class MVVegPredicateColumn ========================
@@ -673,7 +671,6 @@ MVVegPredicateColumn::MVVegPredicateColumn(const BaseColumn *baseCol,
//////////////////////////////////////////////////////////////////////////////
#ifndef NDEBUG
// Exclude from coverage testing - Debugging code
-// LCOV_EXCL_START
void MVVegPredicateColumn::print(FILE* ofd, const char* indent, const char* title) const
{
NAString tableText = getTableName().getQualifiedNameAsString();
@@ -700,7 +697,6 @@ void MVVegPredicateColumn::display() const
{
print();
}
-// LCOV_EXCL_STOP
#endif
//============================================================================
@@ -1000,7 +996,6 @@ void MVVegPredicate::insert(const MVVegPredicateColumn *newCol)
//////////////////////////////////////////////////////////////////////////////
#ifndef NDEBUG
// Exclude from coverage testing - Debugging code
-// LCOV_EXCL_START
void MVVegPredicate::print(FILE* ofd, const char* indent, const char* title) const
{
fprintf(ofd, "\tVegPredicate:");
@@ -1017,7 +1012,6 @@ void MVVegPredicate::display() const
{
print();
}
-// LCOV_EXCL_STOP
#endif
//============================================================================
@@ -1217,7 +1211,6 @@ NABoolean MVUsedObjectInfo::processSelectionPredicates(ValueIdSet& expr,
// ---------------------------------------------------------------------
#ifndef NDEBUG
// Exclude from coverage testing - Debugging code
-// LCOV_EXCL_START
void MVUsedObjectInfo::print( FILE* ofd, // = stdout,
const char* indent, // = DEFAULT_INDENT,
const char* title // = "MVInfo"
@@ -1266,7 +1259,6 @@ void MVUsedObjectInfo::display() const
{
print();
}
-// LCOV_EXCL_STOP
#endif
//============================================================================
@@ -2220,7 +2212,6 @@ NABoolean MVColumnInfo::isNonRepeatableExpressionUsed(BindWA *bindWA)
// ---------------------------------------------------------------------
#ifndef NDEBUG
// Exclude from coverage testing - Debugging code
-// LCOV_EXCL_START
void MVColumnInfo::print( FILE* ofd, // = stdout,
const char* indent, // = DEFAULT_INDENT,
const char* title
@@ -2280,7 +2271,6 @@ void MVColumnInfo::display() const
{
print();
}
-// LCOV_EXCL_STOP
#endif
//============================================================================
@@ -2524,7 +2514,6 @@ void MVColumns::setNewColumnName(MVColumnInfo *colInfo, const NAString& newName)
//////////////////////////////////////////////////////////////////////////////
#ifndef NDEBUG
// Exclude from coverage testing - Debugging code
-// LCOV_EXCL_START
void MVColumns::print( FILE* ofd, // = stdout,
const char* indent, // = DEFAULT_INDENT,
const char* title
@@ -2547,7 +2536,6 @@ void MVColumns::display() const
{
print();
}
-// LCOV_EXCL_STOP
#endif
//============================================================================
@@ -2960,7 +2948,6 @@ NABoolean MVInfo::addTableNamesToList(BindWA *bindWA,
//////////////////////////////////////////////////////////////////////////////
#ifndef NDEBUG
// Exclude from coverage testing - Debugging code
-// LCOV_EXCL_START
void MVInfo::print( FILE* ofd, // = stdout,
const char* indent, // = DEFAULT_INDENT,
const char* title // = "MVInfo"
@@ -3020,7 +3007,6 @@ void MVInfo::display() const
{
print();
}
-// LCOV_EXCL_STOP
#endif
// - functions used in showddl
@@ -4750,7 +4736,6 @@ void MVInfoForDDL::setColAsIndirectUpdate(MVColumnInfo *colInfo)
//////////////////////////////////////////////////////////////////////////////
#ifndef NDEBUG
// Exclude from coverage testing - Debugging code
-// LCOV_EXCL_START
void MVInfoForDDL::print( FILE* ofd, // = stdout,
const char* indent, // = DEFAULT_INDENT,
const char* title // = "MVInfo"
@@ -4773,7 +4758,6 @@ void MVInfoForDDL::print( FILE* ofd, // = stdout,
}
fprintf(ofd,"\n");
} // MVInfoForDDL::print()
-// LCOV_EXCL_STOP
#endif
//============================================================================
@@ -4981,7 +4965,6 @@ const MVUsedObjectInfo *MVInfoForDML::findUsedInfoForTable(const QualifiedName&
//////////////////////////////////////////////////////////////////////////////
#ifndef NDEBUG
// Exclude from coverage testing - Debugging code
-// LCOV_EXCL_START
void MVInfoForDML::print( FILE* ofd, // = stdout,
const char* indent, // = DEFAULT_INDENT,
const char* title // = "MVInfo"
@@ -4992,7 +4975,6 @@ void MVInfoForDML::print( FILE* ofd, // = stdout,
if (strcmp(title, "")) fprintf(ofd,"\n");
} // MVInfoForDDL::print()
-// LCOV_EXCL_STOP
#endif
//----------------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/optimizer/MjvBuilder.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/MjvBuilder.cpp b/core/sql/optimizer/MjvBuilder.cpp
index 96c394c..f3bd522 100644
--- a/core/sql/optimizer/MjvBuilder.cpp
+++ b/core/sql/optimizer/MjvBuilder.cpp
@@ -1223,7 +1223,6 @@ ItemExpr *MjvOnRequestBuilder::buildSelectionListForScanOnIudLog() const
// by the INDIRECT predicate.
//----------------------------------------------------------------------------
// Exclude from coverge testing - used only for range logging
-// LCOV_EXCL_START
RelRoot *MjvOnRequestBuilder::buildRootOverIUDLog(RelExpr *topNode) const
{
ItemExpr *OperationTypeCol = new(heap_)
@@ -1239,7 +1238,6 @@ RelRoot *MjvOnRequestBuilder::buildRootOverIUDLog(RelExpr *topNode) const
result->addCompExprTree(IndirectCol);
return result;
}
-// LCOV_EXCL_STOP
//----------------------------------------------------------------------------
// We get here when we need to read from the Range log.
@@ -1248,7 +1246,6 @@ RelRoot *MjvOnRequestBuilder::buildRootOverIUDLog(RelExpr *topNode) const
// by the INDIRECT predicate.
//----------------------------------------------------------------------------
// Exclude from coverge testing - used only for range logging
-// LCOV_EXCL_START
RelRoot *MjvOnRequestBuilder::buildRootOverRangeBlock(RelExpr *topNode) const
{
ItemExpr *OperationTypeCol = new(heap_)
@@ -1264,7 +1261,6 @@ RelRoot *MjvOnRequestBuilder::buildRootOverRangeBlock(RelExpr *topNode) const
result->addCompExprTree(IndirectCol);
return result;
}
-// LCOV_EXCL_STOP
//----------------------------------------------------------------------------
// Have a uniform select list over the logs
@@ -1274,7 +1270,6 @@ RelRoot *MjvOnRequestBuilder::buildRootOverRangeBlock(RelExpr *topNode) const
// We do get here for the insertion part, where we must not have @OP.
//----------------------------------------------------------------------------
// Exclude from coverge testing - used only for range logging
-// LCOV_EXCL_START
RelRoot *MjvOnRequestBuilder::buildRootWithUniformSelectList(RelExpr *topNode,
ItemExpr *opExpr,
const CorrName *nameOverride) const
@@ -1288,7 +1283,6 @@ RelRoot *MjvOnRequestBuilder::buildRootWithUniformSelectList(RelExpr *topNode,
return new(heap_) RelRoot(topNode, REL_ROOT, rootSelectList);
}
-// LCOV_EXCL_STOP
// ===========================================================================
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7a95e1da/core/sql/optimizer/MultiJoin.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/MultiJoin.cpp b/core/sql/optimizer/MultiJoin.cpp
index dc8bbce..7eae8f3 100644
--- a/core/sql/optimizer/MultiJoin.cpp
+++ b/core/sql/optimizer/MultiJoin.cpp
@@ -73,7 +73,6 @@ MultiJoin::MultiJoin(const JBBSubset & jbbSubset,
#pragma warning (default : 4018) //warning elimination
}
-// LCOV_EXCL_START - cnu
NABoolean MultiJoin::isSymmetricMultiJoin() const
{
// now all are inners non semi
@@ -89,7 +88,6 @@ void MultiJoin::pushdownCoveredExpr(const ValueIdSet & outputExpr,
{
CMPASSERT(0);
} // MultiJoin::pushdownCoveredExpr
-// LCOV_EXCL_STOP
void MultiJoin::getPotentialOutputValues(ValueIdSet & outputValues) const
{
@@ -112,12 +110,10 @@ void MultiJoin::getPotentialOutputValues(ValueIdSet & outputValues) const
}
} // MultiJoin::getPotentialOutputValues()
-// LCOV_EXCL_START - dpm
const NAString MultiJoin::getText() const
{
return NAString("multi_join");
} // MultiJoin::getText()
-// LCOV_EXCL_STOP
HashValue MultiJoin::topHash()
{
@@ -638,10 +634,8 @@ Join* MultiJoin::createLeftLinearJoinTree
if ( CmpCommon::getDefault( NSK_DBG ) == DF_ON &&
CmpCommon::getDefault( NSK_DBG_MJRULES_TRACKING ) == DF_ON )
{
-// LCOV_EXCL_START - dpm
CURRCONTEXT_OPTDEBUG->stream() << "Following is left deep join sequence: " << endl;
CURRCONTEXT_OPTDEBUG->stream() << endl;
-// LCOV_EXCL_STOP
}
#endif
@@ -665,7 +659,7 @@ Join* MultiJoin::createLeftLinearJoinTree
if ( CmpCommon::getDefault( NSK_DBG ) == DF_ON &&
CmpCommon::getDefault( NSK_DBG_MJRULES_TRACKING ) == DF_ON )
{
- CURRCONTEXT_OPTDEBUG->stream() << ((*leftDeepJoinSequence)[i]).getText() << endl; // LCOV_EXCL_LINE - dpm
+ CURRCONTEXT_OPTDEBUG->stream() << ((*leftDeepJoinSequence)[i]).getText() << endl;
}
#endif
//Get JBBSubset for left side of join
@@ -704,10 +698,8 @@ Join* MultiJoin::createLeftLinearJoinTree
if ( CmpCommon::getDefault( NSK_DBG ) == DF_ON &&
CmpCommon::getDefault( NSK_DBG_MJRULES_TRACKING ) == DF_ON )
{
-// LCOV_EXCL_START - dpm
CURRCONTEXT_OPTDEBUG->stream() << ((*leftDeepJoinSequence)[(numJoinChildren-1)]).getText() << endl;
CURRCONTEXT_OPTDEBUG->stream() << endl;
-// LCOV_EXCL_STOP
}
#endif
@@ -734,7 +726,6 @@ Join* MultiJoin::createLeftLinearJoinTree
// method for testing purpose right now.
// Uses left linearize for expanding
// ----------------------------------------------------------------
-// LCOV_EXCL_START - cnu
RelExpr* MultiJoin::expandMultiJoinSubtree()
{
// Use default implementation to invoke call on children
@@ -744,7 +735,6 @@ RelExpr* MultiJoin::expandMultiJoinSubtree()
Join* result = leftLinearize();
return result;
}
-// LCOV_EXCL_STOP
// Methods for class MJJoinDirective
MJJoinDirective::MJJoinDirective(CollHeap *outHeap):
@@ -807,12 +797,10 @@ const ExprGroupId &
return array_[i]->getExprGroupId();
}
}
- // LCOV_EXCL_START
// Assert on invalid request
CMPASSERT(FALSE);
ExprGroupId* dummyResult = new(CmpCommon::statementHeap()) ExprGroupId;
return *dummyResult;
- // LCOV_EXCL_STOP
}
// ---------------------------------------------------------------
@@ -1015,7 +1003,6 @@ void MultiJoin::synthLogPropWithMJReuse(NormWA * normWAPtr)
// synthEstLogProp
// -----------------------------------------------------------------------
-// LCOV_EXCL_START
// Used for other RelExpr but not MultiJoin
void MultiJoin::synthEstLogProp(const EstLogPropSharedPtr& inputEstLogProp)
{
@@ -1030,7 +1017,6 @@ void MultiJoin::synthEstLogProp(const EstLogPropSharedPtr& inputEstLogProp)
getGroupAttr()->addInputOutputLogProp (inputEstLogProp, myEstLogProp, NULL);
} // MultiJoin::synthEstLogProp
-// LCOV_EXCL_STOP
void MultiJoin::addLocalExpr(LIST(ExprNode *) &xlist,
@@ -1124,7 +1110,6 @@ void MultiJoin::analyzeInitialPlan()
// ---------------------------------------------------------------------
// MultiJoinTester methods
// ---------------------------------------------------------------------
-// LCOV_EXCL_START - cnu
NABoolean MultiJoinTester::Test1(RelExpr* originalNonMultiJoinTree, RelExpr* treeConvertedToMultiJoin)
{
RelExpr* treeCopy = treeConvertedToMultiJoin->copyRelExprTree(CmpCommon::statementHeap());
@@ -1135,4 +1120,3 @@ NABoolean MultiJoinTester::Test1(RelExpr* originalNonMultiJoinTree, RelExpr* tre
CMPASSERT(originalNonMultiJoinTree->duplicateMatch(*treeCopy));
return TRUE;
}
-// LCOV_EXCL_STOP
[08/14] incubator-trafodion git commit: lcov: commit #1
Posted by an...@apache.org.
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(); }
[11/14] incubator-trafodion git commit: lcov: commit #1
Posted by an...@apache.org.
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