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/10/02 00:14:07 UTC
[03/12] incubator-trafodion git commit: TRAFODION-2731 CodeCleanup:
Phase 4. Remove legacy/obsolete pragmas
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/RelExpr.h
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/RelExpr.h b/core/sql/optimizer/RelExpr.h
index e8ffb5d..90be900 100644
--- a/core/sql/optimizer/RelExpr.h
+++ b/core/sql/optimizer/RelExpr.h
@@ -353,14 +353,12 @@ public:
// ---------------------------------------------------------------------
// operator [] is used to access the children of a tree
-// warning elimination (removed "inline")
virtual ExprGroupId & operator[] (Lng32 index)
{
CMPASSERT(index >= 0 AND index < MAX_REL_ARITY);
return child_[index];
}
-// warning elimination (removed "inline")
virtual const ExprGroupId & operator[] (Lng32 index) const
{
CMPASSERT(index >= 0 AND index < MAX_REL_ARITY);
@@ -1175,7 +1173,6 @@ public:
const PartitioningFunction* partFunc,
NABoolean rewriteForChild0) ;
-// warning elimination (removed "inline")
virtual void addPartKeyPredsToSelectionPreds(
const ValueIdSet& partKeyPreds,
const ValueIdSet& pivs)
@@ -1681,7 +1678,6 @@ class CutOp : public RelExpr
public:
-// warning elimination (removed "inline")
CutOp (Int32 index,
CollHeap *oHeap = CmpCommon::statementHeap()) :
RelExpr(REL_CUT_OP, NULL, NULL, oHeap)
@@ -1753,7 +1749,6 @@ class WildCardOp: public RelExpr
public:
-// warning elimination (remove "inline")
WildCardOp(OperatorType otype,
Int32 designator = 0,
RelExpr *child0 = NULL,
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/RelGrby.h
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/RelGrby.h b/core/sql/optimizer/RelGrby.h
index f6089b9..28d0fbc 100644
--- a/core/sql/optimizer/RelGrby.h
+++ b/core/sql/optimizer/RelGrby.h
@@ -93,7 +93,6 @@ class GroupByAgg : public RelExpr
public:
// constructor
-// warning elimination (removed "inline")
GroupByAgg(RelExpr *child,
OperatorTypeEnum otype = REL_GROUPBY,
ItemExpr *groupExpr = NULL,
@@ -660,7 +659,6 @@ class SortGroupBy : public GroupByAgg
public:
// constructor
-// warning elimination (removed "inline")
SortGroupBy(RelExpr *child,
OperatorTypeEnum otype = REL_ORDERED_GROUPBY,
ItemExpr *groupExpr = NULL,
@@ -702,7 +700,6 @@ class ShortCutGroupBy : public GroupByAgg
public:
// constructor
-// warning elimination (removed "inline")
ShortCutGroupBy(RelExpr *child,
OperatorTypeEnum otype = REL_SHORTCUT_GROUPBY,
ItemExpr *groupExpr = NULL,
@@ -756,7 +753,6 @@ class PhysShortCutGroupBy : public ShortCutGroupBy
public:
// constructor
-// warning elimination (removed "inline")
PhysShortCutGroupBy(RelExpr *child,
OperatorTypeEnum otype = REL_SHORTCUT_GROUPBY,
ItemExpr *groupExpr = NULL,
@@ -789,7 +785,6 @@ class HashGroupBy : public GroupByAgg
public:
// constructor
-// warning elimination (removed "inline")
HashGroupBy(RelExpr *child,
OperatorTypeEnum otype = REL_HASHED_GROUPBY,
ItemExpr *groupExpr = NULL,
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/RelJoin.h
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/RelJoin.h b/core/sql/optimizer/RelJoin.h
index 5495960..3643210 100644
--- a/core/sql/optimizer/RelJoin.h
+++ b/core/sql/optimizer/RelJoin.h
@@ -110,7 +110,6 @@ class Join : public RelExpr
public:
// constructor
-// warning elimination (removed "inline")
Join(RelExpr *leftChild,
RelExpr *rightChild,
OperatorTypeEnum otype = REL_JOIN,
@@ -164,7 +163,6 @@ public:
Join (const Join &) ; // not written
// virtual destructor
-// warning elimination (removed "inline")
virtual ~Join() {}
// get the degree of this node (it is a binary op).
@@ -1203,7 +1201,6 @@ class NestedJoin : public Join
public:
// constructor
-// warning elimination (removed "inline")
NestedJoin(RelExpr *leftChild,
RelExpr *rightChild,
OperatorTypeEnum otype = REL_NESTED_JOIN,
@@ -1218,7 +1215,6 @@ public:
NestedJoin (const NestedJoin &) ; // not written
// virtual destructor
-// warning elimination (removed "inline")
virtual ~NestedJoin() {}
// get a printable string that identifies the operator
@@ -1359,7 +1355,6 @@ class NestedJoinFlow : public NestedJoin
public:
// constructor
-// warning elimination (removed "inline")
NestedJoinFlow(RelExpr *leftChild,
RelExpr *rightChild,
TableDesc *updTableDesc,
@@ -1402,7 +1397,6 @@ class MergeJoin : public Join
public:
// constructor
-// warning elimination (removed "inline")
MergeJoin(RelExpr *leftChild,
RelExpr *rightChild,
OperatorTypeEnum otype = REL_MERGE_JOIN,
@@ -1415,7 +1409,6 @@ public:
MergeJoin (const MergeJoin &) ; // not written
// virtual destructor
-// warning elimination (removed "inline")
virtual ~MergeJoin() { }
virtual NABoolean isLogical () const;
@@ -1558,7 +1551,6 @@ class HashJoin : public Join
public:
// constructor
-// warning elimination (removed "inline")
HashJoin(RelExpr *leftChild,
RelExpr *rightChild,
OperatorTypeEnum otype = REL_HASH_JOIN,
@@ -1572,7 +1564,6 @@ public:
innerAccessOnePartition_(FALSE)
{}
-// warning elimination (removed "inline")
HashJoin(RelExpr *leftChild,
RelExpr *rightChild,
CollHeap *oHeap = CmpCommon::statementHeap())
@@ -1586,7 +1577,6 @@ public:
// virtual destructor
-// warning elimination (removed "inline")
virtual ~HashJoin() { }
// Special method added to check for ordered cross product called by
@@ -1870,8 +1860,5 @@ private:
}; // class HashJoin
-#pragma warn(1319) // warning elimination
-#pragma warn(1506) // warning elimination
-
#endif /* RELJOIN_H */
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/RelMisc.h
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/RelMisc.h b/core/sql/optimizer/RelMisc.h
index fef9038..99513c6 100644
--- a/core/sql/optimizer/RelMisc.h
+++ b/core/sql/optimizer/RelMisc.h
@@ -1928,7 +1928,6 @@ public:
// The constructor
//
-// warning elimination (removed "inline")
PhysTranspose(RelExpr *child = NULL,
CollHeap *oHeap = CmpCommon::statementHeap())
: Transpose(NULL,NULL,child,oHeap) {};
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/RelPackedRows.h
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/RelPackedRows.h b/core/sql/optimizer/RelPackedRows.h
index c5d7de5..c65f15e 100644
--- a/core/sql/optimizer/RelPackedRows.h
+++ b/core/sql/optimizer/RelPackedRows.h
@@ -390,7 +390,6 @@ public:
// The constructor
//
- // warning elimination (removed "inline")
PhysUnPackRows(RelExpr *child = NULL,
CollHeap *oHeap = CmpCommon::statementHeap())
: UnPackRows(0, NULL,NULL,NULL,child, NULL_VALUE_ID, oHeap)
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/RelSample.h
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/RelSample.h b/core/sql/optimizer/RelSample.h
index 2a595d4..127d545 100644
--- a/core/sql/optimizer/RelSample.h
+++ b/core/sql/optimizer/RelSample.h
@@ -71,7 +71,6 @@ public:
virtual ~RelSample ();
// RelSample operator has only one child
-// warning elimination (removed "inline")
virtual Int32 getArity () const { return 1; };
virtual const NAString getText() const {return "Sample";};
@@ -206,7 +205,6 @@ public:
// The constructor
//
-// warning elimination (removed "inline")
PhysSample(RelExpr *child = NULL,
RelSample::SampleTypeEnum type = ANY,
CollHeap *oHeap = CmpCommon::statementHeap())
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/RelScan.h
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/RelScan.h b/core/sql/optimizer/RelScan.h
index 14068e0..1a46119 100644
--- a/core/sql/optimizer/RelScan.h
+++ b/core/sql/optimizer/RelScan.h
@@ -1607,7 +1607,6 @@ public:
// The Describe class represents scan on a 'virtual' table that contains
// the output of the DESCRIBE(SHOWDDL) command.
// -----------------------------------------------------------------------
-#pragma nowarn(1506) // warning elimination
class Describe : public Scan
{
public:
@@ -2044,6 +2043,5 @@ private:
// copy ctor
Describe (const Describe & des) ; // not defined - DO NOT USE
}; // class Describe
-#pragma warn(1506) // warning elimination
#endif /* RELSCAN_H */
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/RelSequence.h
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/RelSequence.h b/core/sql/optimizer/RelSequence.h
index 8fc09b5..b5069d1 100644
--- a/core/sql/optimizer/RelSequence.h
+++ b/core/sql/optimizer/RelSequence.h
@@ -70,7 +70,6 @@ public:
// The constructor
//
-// warning elimination (removed "inline")
RelSequence(RelExpr *child = NULL,
ItemExpr *requiredOrder = NULL,
CollHeap *oHeap = CmpCommon::statementHeap());
@@ -380,16 +379,13 @@ private:
// that is both a logical and physical node. The PhysSequence node
// does not add any data members. It adds a few virtual methods.
// -----------------------------------------------------------------------
-#pragma nowarn(1506) // warning elimination
class PhysSequence : public RelSequence
{
public:
// The constructor
//
-#pragma nowarn(734) // warning elimination
PhysSequence(RelExpr *child = NULL,
-#pragma warn(734) // warning elimination
CollHeap *oHeap = CmpCommon::statementHeap())
: RelSequence(child, NULL, oHeap)
{
@@ -572,6 +568,5 @@ private:
Lng32 estHistoryRowLength_;
}; // class PhysSequence
-#pragma warn(1506) // warning elimination
#endif
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/RelSet.h
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/RelSet.h b/core/sql/optimizer/RelSet.h
index 434b91a..3425379 100644
--- a/core/sql/optimizer/RelSet.h
+++ b/core/sql/optimizer/RelSet.h
@@ -199,7 +199,6 @@ public:
inline ValueIdMap & getLeftMap() const { return unionMap_->leftColMap_; }
inline ValueIdMap & getRightMap() { return unionMap_->rightColMap_; }
inline ValueIdMap & getRightMap() const { return unionMap_->rightColMap_; }
-// warning elimination (removed "inline")
ValueIdMap & getMap(Lng32 i)
{
CMPASSERT(i == 0 OR i == 1);
@@ -531,7 +530,6 @@ class MergeUnion : public Union
public:
// constructor
-// warning elimination (removed "inline")
MergeUnion(RelExpr *leftChild,
RelExpr *rightChild,
UnionMap *unionMap = NULL,
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/RelStoredProc.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/RelStoredProc.cpp b/core/sql/optimizer/RelStoredProc.cpp
index 79e23c8..84758e1 100644
--- a/core/sql/optimizer/RelStoredProc.cpp
+++ b/core/sql/optimizer/RelStoredProc.cpp
@@ -221,9 +221,7 @@ RelExpr* RelInternalSP::bindNode(BindWA *bindWA)
convertToValueIdList(getProcAllParamsVids(),bindWA,ITM_ITEM_LIST);
if (bindWA->errStatus()) return NULL;
-#pragma nowarn(1506) // warning elimination
Lng32 nParams = getProcAllParamsVids().entries();
-#pragma warn(1506) // warning elimination
CmpSPInputFormat inputFormat(bindWA->currentCmpContext());
if ( !cmpInternalSP->InputFormat(nParams, inputFormat) )
// error, the info should be put into currentCmpContext()->diags()
@@ -331,12 +329,8 @@ RelExpr* RelInternalSP::bindNode(BindWA *bindWA)
c = getProcAllParamsVids()[0].getItemExpr()->castToConstValue(b);
if (c)
{
-#pragma nowarn(1506) // warning elimination
inputSize = c->getRawText()->length();
-#pragma warn(1506) // warning elimination
-#pragma nowarn(1506) // warning elimination
newInputSize = inputSize + defaultSchema.length() + 2;
-#pragma warn(1506) // warning elimination
};
if (newInputSize)
{
@@ -346,9 +340,7 @@ RelExpr* RelInternalSP::bindNode(BindWA *bindWA)
str_cpy (newInput, c->getRawText()->data(), inputSize);
newInput[inputSize] = '$';
-#pragma nowarn(1506) // warning elimination
str_cpy (&newInput[inputSize+1], defaultSchema.data(), defaultSchema.length());
-#pragma warn(1506) // warning elimination
NAType *newType = new (bindWA->wHeap()) SQLChar (bindWA->wHeap(), newInputSize, FALSE);
ItemExpr *newItem = new (bindWA->wHeap()) ConstValue(newType, newInput, newInputSize );
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/ReqGen.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/ReqGen.cpp b/core/sql/optimizer/ReqGen.cpp
index 40fc31c..2d392fc 100644
--- a/core/sql/optimizer/ReqGen.cpp
+++ b/core/sql/optimizer/ReqGen.cpp
@@ -1226,15 +1226,9 @@ void RequirementGenerator::producePartitioningRequirements()
if ((addedNumberOfPartitions_ != ANY_NUMBER_OF_PARTITIONS) AND
((addedPartitioningRequirement_->getCountOfPartitions() >
addedNumberOfPartitions_) OR
-#pragma nowarn(1506) // warning elimination
(addedPartitioningRequirement_->getCountOfPartitions() <
-#pragma warn(1506) // warning elimination
-#pragma nowarn(1506) // warning elimination
(addedNumberOfPartitions_ -
-#pragma warn(1506) // warning elimination
-#pragma nowarn(1506) // warning elimination
(addedNumberOfPartitions_ * addedNumOfPartsAllowedDeviation_)))
-#pragma warn(1506) // warning elimination
)
)
{
@@ -1276,12 +1270,8 @@ void RequirementGenerator::producePartitioningRequirements()
// if there was a required number of partitions, then 1 partition
// must satisfy this requirement
if ((addedNumberOfPartitions_ != ANY_NUMBER_OF_PARTITIONS) AND
-#pragma nowarn(1506) // warning elimination
((addedNumberOfPartitions_ -
-#pragma warn(1506) // warning elimination
-#pragma nowarn(1506) // warning elimination
(addedNumberOfPartitions_ * addedNumOfPartsAllowedDeviation_)) >
-#pragma warn(1506) // warning elimination
EXACTLY_ONE_PARTITION))
stillFeasible_ = FALSE;
else
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/RoutineDesc.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/RoutineDesc.cpp b/core/sql/optimizer/RoutineDesc.cpp
index d71fa08..6a1b178 100644
--- a/core/sql/optimizer/RoutineDesc.cpp
+++ b/core/sql/optimizer/RoutineDesc.cpp
@@ -171,8 +171,6 @@ RoutineDesc::RoutineDesc(const RoutineDesc &rdesc, CollHeap *h)
// -----------------------------------------------------------------------
// ! Print function for RoutineDesc
// -----------------------------------------------------------------------
-#pragma nowarn(1506) // warning elimination
-#pragma nowarn(770) // warning elimination
void RoutineDesc::print(FILE* ofd, const char* indent, const char* title)
{
#ifndef NDEBUG
@@ -273,11 +271,9 @@ NABoolean RoutineDesc::createRoutineParam(BindWA *bindWA, CollIndex i,
const NAColumnArray & params = routine->getParams();
ColStatDescList &colStsDescList = getEffOutParamColStatDescList();
-#pragma nowarn(1506) // warning elimination
RoutineParam *routineParam = new (bindWA->wHeap()) RoutineParam(params[i],
i,
this);
-#pragma warn(1506) // warning elimination
if ( routineParam == NULL ) return FALSE;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/Rule.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/Rule.cpp b/core/sql/optimizer/Rule.cpp
index 9e1e066..d418fd3 100644
--- a/core/sql/optimizer/Rule.cpp
+++ b/core/sql/optimizer/Rule.cpp
@@ -398,9 +398,7 @@ RuleSet::~RuleSet()
void RuleSet::insert(Rule * r)
{
-#pragma nowarn(1506) // warning elimination
Lng32 num = r->ruleNumber_ = allRules_.entries();
-#pragma warn(1506) // warning elimination
allRules_.insertAt(num,r);
if (num >= MAX_RULE_COUNT)
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/Rule.h
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/Rule.h b/core/sql/optimizer/Rule.h
index 8337a6a..eb0ee55 100644
--- a/core/sql/optimizer/Rule.h
+++ b/core/sql/optimizer/Rule.h
@@ -294,7 +294,6 @@ public:
// copy ctor
RuleSubset (const RuleSubset & orig, CollHeap * h=0) ; // not written
- // warning elimination (removed "inline")
virtual ~RuleSubset() {}
inline RuleSubset & operator = (const RuleSubset &other)
@@ -304,7 +303,6 @@ public:
// -----------------------------------------------------------------------
// The set of rules used in Cascades
// -----------------------------------------------------------------------
-#pragma nowarn(1506) // warning elimination
class RuleSet : public NABasicObject
{
friend class RuleSubset;
@@ -366,7 +364,6 @@ public:
// return a (sub) set of currently applicable rules
// (see also Guidance::applicableRules())
-// warning elimination (remove "inline")
const RuleSubset * applicableRules()
{
CMPASSERT( (currentPass_ >= getFirstPassNumber()) AND
@@ -376,7 +373,6 @@ public:
// used to recognize first pass rules for the use
// in optimization Level 1
-// warning elimination (removed "inline")
const RuleSubset * getPassNRules(Lng32 passNum)
{
CMPASSERT( (passNum >= getFirstPassNumber()) AND
@@ -450,7 +446,6 @@ private:
RuleSubset passSensitiveRules_; // all rules that look at the pass #
RuleSubset patternSensitiveRules_; // rules using the expl. pattern
};
-#pragma warn(1506) // warning elimination
// -----------------------------------------------------------------------
// Rule substitute memory
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/ScanOptimizer.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/ScanOptimizer.cpp b/core/sql/optimizer/ScanOptimizer.cpp
index 23caa79..23f7e61 100644
--- a/core/sql/optimizer/ScanOptimizer.cpp
+++ b/core/sql/optimizer/ScanOptimizer.cpp
@@ -3579,9 +3579,7 @@ ScanOptimizer::computeCostObject(
MINOF((Lng32)activePartitions.getValue(),countOfPAs);
Lng32 numOfDP2Volumes =
-#pragma nowarn(1506) // warning elimination
MIN_ONE( ((NodeMap *)(lppf->getNodeMap()))->getNumActiveDP2Volumes() );
-#pragma warn(1506) // warning elimination
// Limit the number of PAs by the number of DP2 volumes.
// This won't need to be done here when we start doing it when
// we synthesize the physical properties. It is not being done
@@ -5666,7 +5664,6 @@ FileScanOptimizer::computeCostForMultipleSubset
// and sparceCoilum information for this mdamKey later
// -----------------------------------------------------------------------
-#pragma nowarn(262) // warning elimination
Cost*
FileScanOptimizer::oldComputeCostForMultipleSubset
( MdamKey* mdamKeyPtr,
@@ -6112,9 +6109,7 @@ FileScanOptimizer::oldComputeCostForMultipleSubset
NABoolean foundLastColumn = FALSE;
CollIndex lastColumnPosition = keyPredsByCol.entries() - CollIndex(1);
for (;
-#pragma nowarn(270) // warning elimination
lastColumnPosition >= 0;
-#pragma warn(270) // warning elimination
lastColumnPosition--)
{
@@ -7193,7 +7188,6 @@ FileScanOptimizer::oldComputeCostForMultipleSubset
return costPtr;
} // oldComputeCostForMultipleSubset(...)
-#pragma warn(262) // warning elimination
// -----------------------------------------------------------------------
// This function will check if current context has the same basic physical
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/ScmCostMethod.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/ScmCostMethod.cpp b/core/sql/optimizer/ScmCostMethod.cpp
index d8ee81e..cc38001 100644
--- a/core/sql/optimizer/ScmCostMethod.cpp
+++ b/core/sql/optimizer/ScmCostMethod.cpp
@@ -3688,7 +3688,6 @@ NABoolean CostMethodHbaseUpdateOrDelete::allKeyColumnsHaveHistogramStatistics(
// result of applying key predicates. Assumes that histograms exist for
// all key columns.
// -----------------------------------------------------------------------
-#pragma nowarn(262) // warning elimination
CostScalar
CostMethodHbaseUpdateOrDelete::numRowsToScanWhenAllKeyColumnsHaveHistograms(
IndexDescHistograms & histograms,
@@ -3769,7 +3768,6 @@ CostMethodHbaseUpdateOrDelete::numRowsToScanWhenAllKeyColumnsHaveHistograms(
return numRowsToScan;
} // CostMethodHbaseUpdateOrDelete::numRowsToScanWhenAllKeyColumnsHaveHistograms()
-#pragma warn(262) // warning elimination
// -----------------------------------------------------------------------
// CostMethodHbaseUpdateOrDelete::computeIOCostsForCursorOperation().
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/SearchKey.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/SearchKey.cpp b/core/sql/optimizer/SearchKey.cpp
index 31477b7..a5e40df 100644
--- a/core/sql/optimizer/SearchKey.cpp
+++ b/core/sql/optimizer/SearchKey.cpp
@@ -323,12 +323,8 @@ SearchKey::SearchKey(const ValueIdList & keyColumns,
*(new (CmpCommon::statementHeap()) MaterialDisjuncts(
setOfPredicates)),
nonKeyColumnSet, indexDesc, UDindexDesc),
-#pragma nowarn(1506) // warning elimination
beginKeyValues_(keyColumns.entries()),
-#pragma warn(1506) // warning elimination
-#pragma nowarn(1506) // warning elimination
endKeyValues_(keyColumns.entries()),
-#pragma warn(1506) // warning elimination
valuesArePartitionRange_(FALSE),
_countTimesBoundaryValReq(0)
{
@@ -357,12 +353,8 @@ SearchKey::SearchKey(const ValueIdList & keyColumns,
indexDesc,
UDindexDesc
),
-#pragma nowarn(1506) // warning elimination
beginKeyValues_(keyColumns.entries()),
-#pragma warn(1506) // warning elimination
-#pragma nowarn(1506) // warning elimination
endKeyValues_(keyColumns.entries()),
-#pragma warn(1506) // warning elimination
valuesArePartitionRange_(FALSE),
_countTimesBoundaryValReq(0)
{
@@ -804,9 +796,7 @@ ValueId SearchKey::computeMissingKeyValue(ValueId keyColumn,
// -----------------------------------------------------------------------
void SearchKey::print(FILE* ofd, const char* indent, const char* title) const
{
-#pragma nowarn(1506) // warning elimination
BUMP_INDENT(indent);
-#pragma warn(1506) // warning elimination
fprintf(ofd,"%s %s \n%s",NEW_INDENT,title,NEW_INDENT);
getKeyColumns().print(ofd,indent,"Key Columns:");
getBeginKeyValues().print(ofd,indent,"Begin Key Values:");
@@ -856,7 +846,6 @@ NABoolean SearchKeyBounds::operator == (const SearchKeyBounds & other) const
// data from the access path.
//
// -----------------------------------------------------------------------
-#pragma nowarn(770) // warning elimination
void SearchKeyBounds::analyzeSearchPredicates(const ValueIdSet & setOfPredicates,
const ValueIdSet & externalInputs)
{
@@ -936,7 +925,6 @@ void SearchKeyBounds::analyzeSearchPredicates(const ValueIdSet & setOfPredicates
} // loop over predicates
} // SearchKeyBounds::analyzeSearchPredicate()
-#pragma warn(770) // warning elimination
// -----------------------------------------------------------------------
@@ -1403,9 +1391,7 @@ ValueId SearchKeyBounds::computeMissingKeyValue(NABoolean wantMinValue)
// -----------------------------------------------------------------------
void SearchKeyBounds::print(FILE* ofd, const char* indent, const char* title) const
{
-#pragma nowarn(1506) // warning elimination
BUMP_INDENT(indent);
-#pragma warn(1506) // warning elimination
fprintf(ofd,"%s %s\n%s",NEW_INDENT,title,NEW_INDENT);
if (isAscendingOrder())
fprintf(ofd,"ascending , ");
@@ -1468,9 +1454,7 @@ SearchKeyWorkSpace::SearchKeyWorkSpace(const ValueIdList & keyColumns,
const ValueIdList & indexOrder,
const NABoolean forwardSearch,
const SearchKey& searchKey)
-#pragma nowarn(1506) // warning elimination
: keyCount_(keyColumns.entries()),
-#pragma warn(1506) // warning elimination
keyBounds_(CmpCommon::statementHeap()),
searchKey_(searchKey)
{
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/Stats.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/Stats.cpp b/core/sql/optimizer/Stats.cpp
index f607a3a..231250b 100644
--- a/core/sql/optimizer/Stats.cpp
+++ b/core/sql/optimizer/Stats.cpp
@@ -710,7 +710,6 @@ void ColStats::setSumOfMaxUec (CostScalar value)
// because they can legitimately become very close to zero but not equal
// to zero (e.g., join between 2 1-billion row tables returns 1 row ==>
// redfactor == 1e-18)
-// warning elimination (remove "inline")
void ColStats::setRedFactor (CostScalar rowred)
{
if (rowred < 0)
@@ -1081,7 +1080,6 @@ Histogram::isNullInstantiated() const
}
// removing that NULL interval (assuming it exists)
-// warning elimination (removed "inline")
void
Histogram::removeNullInterval()
{
@@ -1097,7 +1095,6 @@ Histogram::removeNullInterval()
}
// inserting a NULL interval (assuming it doesn't already exist)
-// warning elimination (removed "inline")
void
Histogram::insertNullInterval()
{
@@ -4594,9 +4591,7 @@ Criterion ColStats::decideReductionCriterion(Source invokedFrom,
}
}
-#pragma nowarn(203) // warning elimination
return NONE;
-#pragma warn(203) // warning elimination
};
//reduce the number of histogram intervals in the histogram
@@ -7634,9 +7629,7 @@ void StatsList::reduceNumHistIntsAfterFetch(NATable& table)
void StatsList::deepDelete()
{
-#pragma nowarn(1506) // warning elimination
unsigned short members = (UInt32)this->entries();
-#pragma warn(1506) // warning elimination
for( unsigned short i=0;i<members;i++)
{
(*this)[i]->deepDelete();
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/Stats.h
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/Stats.h b/core/sql/optimizer/Stats.h
index aa424b3..da7ff8d 100644
--- a/core/sql/optimizer/Stats.h
+++ b/core/sql/optimizer/Stats.h
@@ -661,9 +661,7 @@ private:
// NB: the values for these should always be >= 0 !
// --> and if the value is extremely low (e.g., 1e-16), round it to zero
-// warning elimination (removed "inline")
void setCardinality (CostScalar card);
-// warning elimination (removed "inline")
void setUec (CostScalar uec);
EncodedValue boundary_; // histint boundary (upper bound)
@@ -749,7 +747,6 @@ public:
// returns the # of intervals in the Histogram
// this number will be somewhere in between 0 and entries()
-// warning elimination (removed "inline")
CollIndex numIntervals() const
{
DCMPASSERT( entries() != 1 ) ; // generic Histogram sanity check
@@ -862,9 +859,7 @@ public:
inline Interval getFirstInterval() const ;
inline Interval getLastInterval() const ;
inline Interval getLastNonNullInterval () const ;
-// warning elimination (removed "inline")
Interval getNextInterval(const Interval & current) const ;
-// warning elimination (removed "inline")
Interval getPrevInterval(const Interval & current) const ;
// returns the interval #'d by index
@@ -952,7 +947,6 @@ private:
// developer needs to call refreshHiInt()
// -----------------------------------------------------------------------
-#pragma nowarn(270) // warning elimination
class Interval : public NABasicObject
{
public:
@@ -1001,7 +995,6 @@ public:
inline NABoolean isLast() const ;
// gets/sets the uec & rowcount values
-// warning elimination (removed "inline")
CostScalar getUec() const
{
OK() ;
@@ -1009,7 +1002,6 @@ public:
return hiInt_.getUec() ;
}
-// warning elimination (removed "inline")
CostScalar getRowcount() const
{
OK() ;
@@ -1106,7 +1098,6 @@ public:
return hiInt_.getMCBoundary() ;
}
-// warning elimination (removed "inline")
const EncodedValue& hiBound() const
{
DCMPASSERT(hiInt_ == ((*hist_)[loIndex_+1]));
@@ -1118,7 +1109,6 @@ public:
// gets/sets the bounds incl values
inline NABoolean isLoBoundInclusive() const ;
-// warning elimination (removed "inline")
NABoolean isHiBoundInclusive() const
{
DCMPASSERT(hiInt_ == ((*hist_)[loIndex_+1]));
@@ -1231,8 +1221,6 @@ private:
HistogramSharedPtr hist_ ;
HistInt hiInt_; // the histogram we're interfacing with
} ;
-#pragma warn(270) // warning elimination
-
// get the next/prev Interval
@@ -1660,10 +1648,8 @@ public:
private:
// these two are private because we never want them used individually
// ==> use the ::setRowsAndUec() routine instead
-// warning elimination (removed "inline")
void setRowcount (CostScalar row);
-// warning elimination (removed "inline")
// We have added the allowMinusOne flag to allow uecs to be
// initialized to minusOne. This is only used for UDFs, and the minusOne
// is used to indicate that we do not have valid UEC information for a
@@ -1677,7 +1663,6 @@ public:
// See comment above as to the use of the allowMinusOne flag.
void setRowsAndUec (CostScalar rows, CostScalar uec, NABoolean allowMinusOne=FALSE) ;
-// warning elimination (removed "inline")
void setBaseRowCount (CostScalar row);
void setBaseUec(CostScalar uec);
@@ -1695,10 +1680,8 @@ public:
// because they can legitimately become very close to zero but not equal
// to zero (e.g., join between 2 1-billion row tables returns 1 row ==>
// redfactor == 1e-18)
-// warning elimination (remove "inline")
void setRedFactor (CostScalar rowred);
-// warning elimination (removed "inline")
void setUecRedFactor (CostScalar uecred);
// setting the flags
@@ -1737,25 +1720,19 @@ public:
// ---------------------------------------------------------------------
// is there a NULL interval in the Histogram?
-// warning elimination (removed "inline")
NABoolean isNullInstantiated () const ;
// removing that NULL interval, if it exists
-// warning elimination (removed "inline")
void removeNullInterval () ;
// inserting a NULL interval, if it doesn't already exist
-// warning elimination (removed "inline")
void insertNullInterval () ;
// reporting the number of NULLs / NULL-uecs in that interval
-// warning elimination (removed "inline")
CostScalar getNullCount () const ;
-// warning elimination (removed "inline")
CostScalar getNullUec () const ;
// setting the number of NULLs and NULL-uecs in that interval
- // warning elimination (removed "inline")
void setNullRowsAndUec (CostScalar nulls, CostScalar nullUec) ;
// ---------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/SynthType.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/SynthType.cpp b/core/sql/optimizer/SynthType.cpp
index 73096cc..ceab243 100644
--- a/core/sql/optimizer/SynthType.cpp
+++ b/core/sql/optimizer/SynthType.cpp
@@ -927,8 +927,6 @@ const NAType *ItemExpr::synthesizeType()
// does nothing. Currently is only redefined by ValueIdUnion
// to propagate the desired type to the sources of the ValueIdUnion.
//
-#pragma nowarn(1506) // warning elimination
-#pragma warning (disable : 4018) //warning elimination
const NAType *
ItemExpr::pushDownType(NAType& desiredType,
enum NABuiltInTypeEnum defaultQualifier)
@@ -965,8 +963,6 @@ void ItemExpr::coerceChildType(NAType& desiredType,
child(i) -> getValueId().coerceType(desiredType, defaultQualifier);
}
}
-#pragma warning (default : 4018) //warning elimination
-#pragma warn(1506) // warning elimination
// -----------------------------------------------------------------------
// member functions for class BuiltinFunction.
@@ -4366,7 +4362,6 @@ const NAType *CompDecode::synthesizeType()
// member functions for class Extract
// -----------------------------------------------------------------------
-#pragma nowarn(1506) // warning elimination
const NAType *Extract::synthesizeType()
{
// Assert that we are bound, or created by Generator, so we have type info.
@@ -4448,7 +4443,6 @@ const NAType *Extract::synthesizeType()
disAmbiguate,
dti.supportsSQLnull());
}
-#pragma warn(1506) // warning elimination
// -----------------------------------------------------------------------
// member functions for class Increment
@@ -5504,7 +5498,6 @@ const NAType *Translate::synthesizeType()
// member functions for class ValueIdUnion
// -----------------------------------------------------------------------
-#pragma nowarn(1506) // warning elimination
const NAType *ValueIdUnion::synthesizeType()
{
const NAType *result = NULL;
@@ -5591,7 +5584,6 @@ const NAType *ValueIdUnion::synthesizeType()
return result;
}
-#pragma warn(1506) // warning elimination
// ValueIdUnion::pushDownType() -----------------------------------
// Propagate type information down the ItemExpr tree. This method
@@ -5616,7 +5608,6 @@ const NAType *ValueIdUnion::synthesizeType()
// and re-synthesize the Type of the inner ValueIdUnion node.
//
//
-#pragma nowarn(1506) // warning elimination
const NAType *
ValueIdUnion::pushDownType(NAType& desiredType,
enum NABuiltInTypeEnum defaultQualifier)
@@ -5628,7 +5619,6 @@ ValueIdUnion::pushDownType(NAType& desiredType,
return (NAType *)synthesizeType();
}
-#pragma warn(1506) // warning elimination
const NAType *
@@ -5679,8 +5669,6 @@ const NAType *ValueIdProxy::synthesizeType()
// Propagate type information down the node we are Proxy for.
// Called by coerceType().
//
-#pragma nowarn(1506) // warning elimination
-#pragma warning (disable : 4018) //warning elimination
const NAType *
ValueIdProxy::pushDownType(NAType& desiredType,
enum NABuiltInTypeEnum defaultQualifier)
@@ -5983,8 +5971,6 @@ const NAType *RowSubquery::synthesizeType()
// the RowSubquery is of degree 1 and the returned value in the select
// list is of unknown or character type.
//
-#pragma nowarn(1506) // warning elimination
-#pragma warning (disable : 4018) //warning elimination
const NAType *
RowSubquery::pushDownType(NAType& desiredType,
enum NABuiltInTypeEnum defaultQualifier)
@@ -6478,7 +6464,6 @@ const NAType *ItmSeqRowsSince::synthesizeType()
// member functions for class ItmSeqMovingFunction
// -----------------------------------------------------------------------
-#pragma nowarn(262) // warning elimination
const NAType *ItmSeqMovingFunction::synthesizeType()
{
const NAType *result=NULL;
@@ -6551,7 +6536,6 @@ const NAType *ItmSeqMovingFunction::synthesizeType()
return result;
}
-#pragma warn(262) // warning elimination
// -----------------------------------------------------------------------
// member functions for class ItmSeqThisFunction
// -----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/TableDesc.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/TableDesc.cpp b/core/sql/optimizer/TableDesc.cpp
index 245b720..14db124 100644
--- a/core/sql/optimizer/TableDesc.cpp
+++ b/core/sql/optimizer/TableDesc.cpp
@@ -562,8 +562,6 @@ TableDesc::setBaseSelectivityHintForScan(SelectivityHint *selHint,
// -----------------------------------------------------------------------
// Print function for TableDesc
// -----------------------------------------------------------------------
-#pragma nowarn(1506) // warning elimination
-#pragma nowarn(770) // warning elimination
void TableDesc::print(FILE* ofd, const char* indent, const char* title)
{
#ifndef NDEBUG
@@ -581,8 +579,6 @@ void TableDesc::print(FILE* ofd, const char* indent, const char* title)
#endif
} // TableDesc::print()
-#pragma warn(1506) // warning elimination
-#pragma warn(770) // warning elimination
// -----------------------------------------------------------------------
// Print function for TableDescList
@@ -590,9 +586,7 @@ void TableDesc::print(FILE* ofd, const char* indent, const char* title)
void TableDescList::print(FILE* ofd, const char* indent, const char* title)
{
#ifndef NDEBUG
-#pragma nowarn(1506) // warning elimination
BUMP_INDENT(indent);
-#pragma warn(1506) // warning elimination
for (CollIndex i = 0; i < entries(); i++)
{
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/TransRule.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/TransRule.cpp b/core/sql/optimizer/TransRule.cpp
index 89881ed..481eadb 100644
--- a/core/sql/optimizer/TransRule.cpp
+++ b/core/sql/optimizer/TransRule.cpp
@@ -1631,9 +1631,7 @@ NABoolean IndexJoinRule2::topMatch (RelExpr * expr,
// for now, return FALSE for this rule (failures in TEST005)
return FALSE;
-#pragma nowarn(203) // warning elimination
if (NOT Rule::topMatch(expr, context))
-#pragma warn(203) // warning elimination
return FALSE;
Scan * s = (Scan *) expr;
@@ -1717,7 +1715,6 @@ struct IndexToDisjuncts
private:
// private constructor, object should be created by a friend only
-// warning elimination (removed "inline")
IndexToDisjuncts() : maxPoints_(0.0)
{}
};
@@ -1747,7 +1744,6 @@ NABoolean doesValueIdEvaluateToFalse( ValueId predId )
return FALSE;
}
-#pragma nowarn(262) // warning elimination
RelExpr * OrOptimizationRule::nextSubstitute(
RelExpr * before,
Context * /*context*/,
@@ -2017,9 +2013,7 @@ RelExpr * OrOptimizationRule::nextSubstitute(
DCMPASSERT(bc->getOperatorType() == ITM_BASECOLUMN);
if (colNum == (CollIndex) bc->getColNumber())
{
-#pragma nowarn(1506) // warning elimination
colNumInIndex = ixcolnum;
-#pragma warn(1506) // warning elimination
break;
}
}
@@ -2187,7 +2181,6 @@ RelExpr * OrOptimizationRule::nextSubstitute(
return result;
}
-#pragma warn(262) // warning elimination
CostScalar OrOptimizationRule::rateIndexForColumn(
Int32 colNumInIndex,
@@ -2394,9 +2387,7 @@ RelExpr * OrOptimizationRule::makeSubstituteScan(
ValueIdUnion(resultCharOutputs[i],
newValId,
NULL_VALUE_ID,
-#pragma nowarn(1506) // warning elimination
unionNode->getUnionFlags());
-#pragma warn(1506) // warning elimination
vidUnion->synthTypeAndValueId();
unionNode->addValueIdUnion(vidUnion->getValueId(),
CmpCommon::statementHeap());
@@ -4225,9 +4216,7 @@ NABoolean GroupByTernarySplitRule::topMatch(RelExpr * expr,
// Old Code End
-#pragma nowarn(203) // warning elimination
if (NOT Rule::topMatch(expr,context)) // MUST be a GroupByAgg
-#pragma warn(203) // warning elimination
return FALSE;
if (expr->getOperatorType() == REL_SHORTCUT_GROUPBY)
@@ -4769,9 +4758,7 @@ NABoolean GroupBySplitRule::topMatch(RelExpr * expr,
}
}
-#pragma nowarn(1506) // warning elimination
Lng32 dc = distinctColumns.entries();
-#pragma warn(1506) // warning elimination
if (dc > 0)
{
@@ -5601,7 +5588,6 @@ NABoolean PartialGroupByOnTSJRule::topMatch (RelExpr * expr,
// produced from either Cut#0 or Cut#1 above.
//
// -----------------------------------------------------------------------
-#pragma nowarn(770) // warning elimination
RelExpr * PartialGroupByOnTSJRule::nextSubstitute(RelExpr * before,
Context * /*context*/,
RuleSubstituteMemory * & /*memory*/)
@@ -5711,7 +5697,6 @@ RelExpr * PartialGroupByOnTSJRule::nextSubstitute(RelExpr * before,
return newJoin;
} // PartialGroupByOnTSJRule::nextSubstitute()
-#pragma warn(770) // warning elimination
// -----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/TransRule.h
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/TransRule.h b/core/sql/optimizer/TransRule.h
index a037d85..20d2dac 100644
--- a/core/sql/optimizer/TransRule.h
+++ b/core/sql/optimizer/TransRule.h
@@ -476,7 +476,6 @@ public:
// copy ctor
JoinCommutativityRule (const JoinCommutativityRule &) ; // not written
-// warning elimination (removed "inline")
virtual ~JoinCommutativityRule() {}
virtual NABoolean topMatch (RelExpr * expr,
@@ -499,7 +498,6 @@ public:
// copy ctor
JoinLeftShiftRule (const JoinLeftShiftRule &) ; // not written
-// warning elimination (removed "inline")
virtual ~JoinLeftShiftRule() {}
virtual NABoolean topMatch (RelExpr * expr,
@@ -528,7 +526,6 @@ public:
// copy ctor
IndexJoinRule1 (const IndexJoinRule1 &) ; // not written
-// warning elimination (removed "inline")
virtual ~IndexJoinRule1() {}
virtual NABoolean topMatch (RelExpr * expr,
Context * context);
@@ -555,7 +552,6 @@ public:
// copy ctor
IndexJoinRule2 (const IndexJoinRule2 &) ; // not written
-// warning elimination (removed "inline")
virtual ~IndexJoinRule2() {}
virtual NABoolean topMatch (RelExpr * expr,
Context * context);
@@ -575,7 +571,6 @@ public:
// copy ctor
OrOptimizationRule (const OrOptimizationRule &) ; // not written
-// warning elimination (removed "inline")
virtual ~OrOptimizationRule() {}
virtual NABoolean topMatch (RelExpr * expr,
Context * context);
@@ -610,7 +605,6 @@ public:
// copy ctor
TSJRule (const TSJRule &) ; // not written
-// warning elimination (removed "inline")
virtual ~TSJRule() {}
virtual NABoolean topMatch (RelExpr * expr,
@@ -657,7 +651,6 @@ public:
// copy ctor
JoinToTSJRule (const JoinToTSJRule &) ; // not written
-// warning elimination (removed "inline")
virtual ~JoinToTSJRule() {}
virtual NABoolean topMatch (RelExpr * expr,
@@ -683,7 +676,6 @@ public:
// copy ctor
TSJFlowRule (const TSJFlowRule &) ; // not written
-// warning elimination (removed "inline")
virtual ~TSJFlowRule() {}
virtual NABoolean topMatch (RelExpr * expr,
@@ -704,7 +696,6 @@ public:
RelExpr * substitute) :
Rule(name,pattern,substitute) {}
-// warning elimination (removed "inline")
virtual ~TSJUDRRule() {}
virtual NABoolean topMatch (RelExpr * expr,
@@ -736,7 +727,6 @@ public:
// copy ctor
FilterRule (const FilterRule &) ; // not written
- // warning elimination (removed "inline")
virtual ~FilterRule() {}
virtual Guidance * guidanceForExploringChild(Guidance * guidance,
Context * context,
@@ -973,7 +963,6 @@ public:
// copy ctor
SampleScanRule (const SampleScanRule &) ; // not written
-// warning elimination (removed "inline")
virtual ~SampleScanRule() {}
virtual NABoolean topMatch (RelExpr * expr,
Context * context);
@@ -991,12 +980,10 @@ public:
class JoinToBushyTreeRule : public Rule
{
public:
-// warning elimination (removed "inline")
JoinToBushyTreeRule(const char * name,
RelExpr * pattern,
RelExpr * substitute) :
Rule(name,pattern,substitute) {}
-// warning elimination (removed "inline")
virtual ~JoinToBushyTreeRule() {}
virtual NABoolean topMatch (RelExpr * expr,
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/TriggerDB.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/TriggerDB.cpp b/core/sql/optimizer/TriggerDB.cpp
index 9bf4ebb..a487841 100644
--- a/core/sql/optimizer/TriggerDB.cpp
+++ b/core/sql/optimizer/TriggerDB.cpp
@@ -180,9 +180,7 @@ TriggerDB::clearAndDestroy()
TableOp * key = NULL;
BeforeAndAfterTriggers* value = NULL;
// iterate over all entries and destroy them
-#pragma warning (disable : 4018) //warning elimination
for (Int32 i=0; i < iter.entries(); i++)
-#pragma warning (default : 4018) //warning elimination
{
iter.getNext(key, value);
CMPASSERT(key != NULL);
@@ -253,9 +251,7 @@ TriggerDB::cleanupPerStatement()
BeforeAndAfterTriggers* curr = NULL;
// iterate over all entries
-#pragma warning (disable : 4018) //warning elimination
for (Int32 i=0; i < iter.entries(); i++)
-#pragma warning (default : 4018) //warning elimination
{
iter.getNext(key, curr);
CMPASSERT(curr != NULL);
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/TriggerDB.h
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/TriggerDB.h b/core/sql/optimizer/TriggerDB.h
index 15e2e68..ccc314b 100644
--- a/core/sql/optimizer/TriggerDB.h
+++ b/core/sql/optimizer/TriggerDB.h
@@ -60,7 +60,6 @@ class TableOp : public NABasicObject
public:
// explicit ctor
-// warning elimination (removed "inline")
TableOp(QualifiedName &subjectTable, ComOperation operation)
: subjectTable_(subjectTable),
operation_(operation)
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/Triggers.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/Triggers.cpp b/core/sql/optimizer/Triggers.cpp
index 0b18d9d..4bed042 100644
--- a/core/sql/optimizer/Triggers.cpp
+++ b/core/sql/optimizer/Triggers.cpp
@@ -265,9 +265,7 @@ Trigger::parseTriggerText() const
// Parse the SQL text.
Parser parser(CmpCommon::context());
-#pragma nowarn(1506) // warning elimination
if (parser.parseDML(sqlText_->data(), sqlText_->length(), sqlTextCharSet_, &parsedNode))
-#pragma warn(1506) // warning elimination
return NULL;
// Extract the trigger body without the DDL nodes on top
@@ -381,8 +379,6 @@ Trigger::getParsedTrigger(BindWA *bindWA)
//
// Debugging aid.
//
-#pragma nowarn(770) // warning elimination
-#pragma nowarn(1506) // warning elimination
// used for debugging only
void
Trigger::print(ostream &os, const char* indent, const char* title) const
@@ -413,8 +409,6 @@ Trigger::print(ostream &os, const char* indent, const char* title) const
os << "TimeStamp: " << convertInt64ToDouble(timeStamp_) << endl;
os << "Recursion Counter: " << recursionCounter_ << endl;
}
-#pragma warn(1506) // warning elimination
-#pragma warn(770) // warning elimination
//------------------------------------------------------------------------------
@@ -518,8 +512,6 @@ TriggerList::sortByTimeStamp()
//
// Debugging aid.
//
-#pragma nowarn(1506) // warning elimination
-#pragma nowarn(770) // warning elimination
// used for debugging only
void
TriggerList::print(ostream & os, const char* indent, const char* title) const
@@ -532,8 +524,6 @@ TriggerList::print(ostream & os, const char* indent, const char* title) const
os << ". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ";
}
}
-#pragma warn(770) // warning elimination
-#pragma warn(1506) // warning elimination
//
// -- TriggerList::clearAndDestroy()
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/Triggers.h
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/Triggers.h b/core/sql/optimizer/Triggers.h
index 8e5ec11..b787c50 100644
--- a/core/sql/optimizer/Triggers.h
+++ b/core/sql/optimizer/Triggers.h
@@ -107,7 +107,6 @@ class Trigger : public NABasicObject
public:
// Explicit ctor
-// warning elimination (removed "inline")
Trigger(const QualifiedName &name,
const QualifiedName &subjectTable,
ComOperation operation,
@@ -178,7 +177,6 @@ public:
{ return (granularity_== COM_ROW); }
// MV
-// warning elimination (removed "inline")
virtual NABoolean isMVImmediate() const
{ return false; } // this is a regular trigger
@@ -311,7 +309,6 @@ public:
{};
virtual RelExpr *getParsedTrigger(BindWA *bindWA);
-// warning elimination (removed "inline")
virtual NABoolean isMVImmediate() const
{ return true; } // this is a special trigger (ON STATEMENT MV)
@@ -339,7 +336,6 @@ class UpdateColumns : public NABasicObject
{
public:
-// warning elimination (removed "inline")
UpdateColumns(NABoolean allColumns)
: allColumns_(allColumns)
{
@@ -450,7 +446,6 @@ public:
// Should never be called. Needed for compilation. We rely on
// NAHashBucket::contains() being called with a default NULL argument for
// Values in the triggerDB hash where BeforeAndAfterTriggers are Values.
- // warning elimination (removed "inline")
NABoolean operator == (const BeforeAndAfterTriggers &other) const
{ CMPASSERT(FALSE); return FALSE; }
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/VEGTable.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/VEGTable.cpp b/core/sql/optimizer/VEGTable.cpp
index 7b07531..57e71bb 100644
--- a/core/sql/optimizer/VEGTable.cpp
+++ b/core/sql/optimizer/VEGTable.cpp
@@ -146,9 +146,7 @@ NABoolean VEGMember::operator==(const VEGMember & other) const
// -----------------------------------------------------------------------
void VEGMember::print(FILE* ofd, const char* indent, const char* title)
{
-#pragma nowarn(1506) // warning elimination
BUMP_INDENT(indent);
-#pragma warn(1506) // warning elimination
fprintf(ofd,"%s %s %s",NEW_INDENT,title,NEW_INDENT);
fprintf(ofd,"Member (0x%x) VEG (0x%x) VEGRef (0x%x) VEGPred (0x%x) {%s} {%s}\n",
CollIndex(memberM_), CollIndex(groupG_),
@@ -175,9 +173,7 @@ void VEGMember::display()
VEGMember * VEGRegion::findVEGMember(VEGReference *vegReference)
{
-#pragma nowarn(1506) // warning elimination
Lng32 ne = members_.entries();
-#pragma warn(1506) // warning elimination
Lng32 i = 0;
NABoolean found = FALSE;
ValueId memberValueId;
@@ -202,9 +198,7 @@ VEGMember * VEGRegion::findVEGMember(VEGReference *vegReference)
// -----------------------------------------------------------------------
VEGMember * VEGRegion::findVEGMember(const ValueId & vid) const
{
-#pragma nowarn(1506) // warning elimination
Lng32 ne = members_.entries();
-#pragma warn(1506) // warning elimination
Lng32 i = 0;
NABoolean found = FALSE;
ValueId memberValueId;
@@ -624,9 +618,7 @@ VEGReference * VEGRegion::getVEGReferenceFromCurrentVEGRegion
VEGMember * memberPtr = findVEGMember(exprId);
-#pragma nowarn(1506) // warning elimination
Lng32 count = zones_.entries();
-#pragma warn(1506) // warning elimination
if (memberPtr == NULL &&
searchThisVegRegionFirst &&
@@ -737,9 +729,7 @@ void VEGRegion::importVEGsForUnionChildVEGRegion()
while (parentRegion)
{
parentZone = parentRegion; // initialize per iteration
-#pragma nowarn(1506) // warning elimination
parentZoneCount = getParentVEGRegion()->zones_.entries();
-#pragma warn(1506) // warning elimination
parentZoneCountPlusOne = 1 + parentZoneCount;
iterations = 0;
@@ -877,9 +867,7 @@ void VEGRegion::importVEGsForUnionChildVEGRegion()
// -----------------------------------------------------------------------
void VEGRegion::gatherInstantiateNullMembers(ValueIdSet & vidset)
{
-#pragma nowarn(1506) // warning elimination
Lng32 ne = members_.entries();
-#pragma warn(1506) // warning elimination
Lng32 index;
for (index = 0; index < ne; index ++)
{
@@ -896,9 +884,7 @@ void VEGRegion::gatherInstantiateNullMembers(ValueIdSet & vidset)
// -----------------------------------------------------------------------
void VEGRegion::replaceInstantiateNullMembers()
{
-#pragma nowarn(1506) // warning elimination
Lng32 ne = members_.entries(); // number of entries in the VEGRegion
-#pragma warn(1506) // warning elimination
Lng32 index; // loop index
InstantiateNull * instNullPtr; // -> an InstantiateNull
VEGMember * memberPtr; // -> a VEGMember
@@ -958,9 +944,7 @@ void VEGRegion::replaceInstantiateNullMembers()
// Iterate over entries in deleteStack.
// Each entry of deleteStack is for a member that is an InstantiateNull.
// ---------------------------------------------------------------------
-#pragma nowarn(1506) // warning elimination
ne = deleteStack.entries();
-#pragma warn(1506) // warning elimination
ValueId vegId;
for (index = 0; index < ne; index++)
{
@@ -1179,9 +1163,7 @@ void VEGRegion::mergeZonesFromSameVEGRegion(VEGRegion * fromRegion,
replaceInstantiateNullMembers();
// Process all the descendant VEGRegions
-#pragma nowarn(1506) // warning elimination
Lng32 ne = zones_.entries();
-#pragma warn(1506) // warning elimination
// this call is not needed as the above call to
// replaceInstantiateNullMembers() already does this
@@ -1213,9 +1195,7 @@ void VEGRegion::mergeZonesFromSameVEGRegion(VEGRegion * fromRegion,
void VEGRegion::processZones()
{
Lng32 index;
-#pragma nowarn(1506) // warning elimination
Lng32 ne = members_.entries();
-#pragma warn(1506) // warning elimination
LIST(VEGMember *) deleteStack(STMTHEAP);
// Walk through the members of this VEGRegion to check if any member
@@ -1227,17 +1207,13 @@ void VEGRegion::processZones()
// Delete all the unwanted members.
if (deleteStack.entries() > 0)
{
-#pragma nowarn(1506) // warning elimination
ne = deleteStack.entries();
-#pragma warn(1506) // warning elimination
for (index = 0; index < ne; index ++)
deleteVEGMember(deleteStack[index]->getMemberValueId());
}
// Process all the descendant VEGRegions
-#pragma nowarn(1506) // warning elimination
ne = zones_.entries();
-#pragma warn(1506) // warning elimination
for (index = 0; index < ne; index++)
zones_[index]->processZones();
@@ -1263,9 +1239,7 @@ void VEGRegion::processZones()
void VEGRegion::fixupZonesAfterFullToLeftConversion()
{
Lng32 index;
-#pragma nowarn(1506) // warning elimination
Lng32 ne = zones_.entries();
-#pragma warn(1506) // warning elimination
// And that this method is invoked right after conversion
// of full outer Join to left outer join.
@@ -1299,9 +1273,7 @@ void VEGRegion::fixupActiveZones(VEGRegion * activeParentRegion,
CMPASSERT(isActive());
Lng32 index;
-#pragma nowarn(1506) // warning elimination
Lng32 ne = zones_.entries();
-#pragma warn(1506) // warning elimination
ValueIdSet newOuterReferences(outerReferences);
ValueIdSet setOfMembers;
@@ -1462,9 +1434,7 @@ void VEGRegion::fixupZonesAndParentPointers()
parentRegion->zones_.remove(candidateRegion);
-#pragma nowarn(1506) // warning elimination
Lng32 ne = candidateRegion->zones_.entries();
-#pragma warn(1506) // warning elimination
// loop throught the zones of this region and add them to the
// parent region zones
@@ -1549,9 +1519,7 @@ void VEGRegion::print(FILE* ofd, const char* indent, const char* title)
{
Lng32 ne;
-#pragma nowarn(1506) // warning elimination
BUMP_INDENT(indent);
-#pragma warn(1506) // warning elimination
fprintf(ofd,"************\n");
fprintf(ofd,"%s %s[%d] %s",NEW_INDENT,title,getRegionId(),NEW_INDENT);
if (isActive())
@@ -1955,18 +1923,14 @@ void VEGTable::processVEGRegions()
// -----------------------------------------------------------------------
void VEGTable::print(FILE* ofd, const char* indent, const char* title)
{
-#pragma nowarn(1506) // warning elimination
BUMP_INDENT(indent);
-#pragma warn(1506) // warning elimination
fprintf(ofd,"%s %s %s",NEW_INDENT,title,NEW_INDENT);
if (getCurrentVEGRegion())
{
fprintf(ofd,"nextInSequence = %d\n>>>> Current Region is Region[%d] <<<<\n",
nextInSequence_,getCurrentVEGRegion()->getRegionId());
-#pragma nowarn(1506) // warning elimination
Lng32 ne = arrayEntry_.entries();
-#pragma warn(1506) // warning elimination
// Print all the regions
for (RegionId index = FIRST_VEG_REGION;
index < (RegionId)arrayEntry_.entries();
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/ValueDesc.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/ValueDesc.cpp b/core/sql/optimizer/ValueDesc.cpp
index cf82e2f..605118b 100644
--- a/core/sql/optimizer/ValueDesc.cpp
+++ b/core/sql/optimizer/ValueDesc.cpp
@@ -251,11 +251,7 @@ void ValueId::coerceType(enum NABuiltInTypeEnum desiredQualifier,
break;
case NA_CHARACTER_TYPE:
{
-#pragma warning (disable : 4244) // warning elimination
-#pragma nowarn(1506) // warning elimination
Lng32 len = CmpCommon::getDefaultNumeric(VARCHAR_PARAM_DEFAULT_SIZE);
-#pragma warn(1506) // warning elimination
-#pragma warning (default : 4244) // warning elimination
desiredType = new STMTHEAP
SQLVarChar(STMTHEAP, len, //DEFAULT_CHARACTER_LENGTH,
@@ -1736,9 +1732,7 @@ void ValueIdList::replaceOperandsOfInstantiateNull
void ValueIdList::print(FILE* ofd, const char* indent, const char* title,
CollHeap *c, char *buf) const
{
-#pragma nowarn(1506) // warning elimination
BUMP_INDENT(indent);
-#pragma warn(1506) // warning elimination
Space * space = (Space *)c;
char mybuf[1000];
@@ -2157,7 +2151,6 @@ NABoolean ValueIdSet::hasRandom() const
// Check whether any of the members of this ValueIdSet are contained
// in the provided ValueIdSet. Return the number of members found.
// -----------------------------------------------------------------------
-#pragma nowarn(262) // warning elimination
Int32 ValueIdSet::membersCoveredInSet (const ValueIdSet& vidSet, NABoolean lookBelowInstantiateNull) const
{
NABoolean coverFlag = FALSE;
@@ -2184,7 +2177,6 @@ Int32 ValueIdSet::membersCoveredInSet (const ValueIdSet& vidSet, NABoolean lookB
return (membersFound);
}
-#pragma warn(262) // warning elimination
//-------------------------------------------------------
//removeCoveredVidSet()
@@ -4598,7 +4590,6 @@ void ValueIdSet::unparse(NAString &result,
result += ")";
} // ValueIdSet::unparse
-#pragma nowarn(1506) // warning elimination
void ValueIdSet::print(FILE* ofd, const char* indent, const char* title,
CollHeap *c, char *buf) const
{
@@ -4621,14 +4612,12 @@ void ValueIdSet::print(FILE* ofd, const char* indent, const char* title,
PRINTIT(ofd, c, space, buf, mybuf);
}
} // ValueIdSet::print()
-#pragma warn(1506) // warning elimination
void ValueIdSet::display() const // To be called from the debugger
{
print();
}
-#pragma nowarn(1506) // warning elimination
ex_expr::exp_return_type ValueIdList::evalAtCompileTime
(short addConvNodes, // (IN) : 1 to add conv nodes, 0 otherwise
ExpTupleDesc::TupleDataFormat tf, // (IN) : tuple format of resulting expr(s)
@@ -4731,7 +4720,6 @@ ex_expr::exp_return_type ValueIdList::evalAtCompileTime
return rc;
}
-#pragma warn(1506) // warning elimination
// Used by constant folding. Calls the executor evaluator. The parameters are:
// 1.- The root of the expression tree to evaluate. It is assumed that it
@@ -4762,7 +4750,6 @@ short ValueIdList::evaluateTree( const ItemExpr * root,
// Parent is the parent of ch and childNumber is the number of ch. The function
// computes the value represented by the subtree rooted at ch and puts
// the new value in the position of ch. Used by constant folding.
-#pragma nowarn(262) // warning elimination
Lng32 ValueIdList::evaluateConstantTree( const ValueId &parent,
const ValueId & ch,
Int32 childNumber,
@@ -4884,7 +4871,6 @@ Lng32 ValueIdList::evaluateConstantTree( const ValueId &parent,
return error;
}
-#pragma warn(262) // warning elimination
////////////////////////////////////////////////////////////////////////////
// Tells us if some sort of algebraic simplification can be done in a tree.
@@ -5965,7 +5951,6 @@ ValueId ValueDesc::create(ItemExpr *expr, const NAType *type, CollHeap *h)
// ***********************************************************************
// Methods for class ValueDescArray
// ***********************************************************************
-#pragma nowarn(1506) // warning elimination
void ValueDescArray::print(FILE* ofd, const char* indent, const char* title,
NABoolean dontDisplayErrors) const
{
@@ -6005,7 +5990,6 @@ void ValueDescArray::print(FILE* ofd, const char* indent, const char* title,
}
#endif
} // ValueDescArray::print()
-#pragma warn(1506) // warning elimination
void ValueDescArray::display(NABoolean dontDisplayErrors) const
{
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/costmethod.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/costmethod.cpp b/core/sql/optimizer/costmethod.cpp
index c063f1d..ec0fc4f 100644
--- a/core/sql/optimizer/costmethod.cpp
+++ b/core/sql/optimizer/costmethod.cpp
@@ -295,9 +295,7 @@ CostMethod::print( FILE* ofd
, const char* title
) const
{
-#pragma nowarn(1506) // warning elimination
BUMP_INDENT(indent);
-#pragma warn(1506) // warning elimination
fprintf(ofd,"%s ",NEW_INDENT);
if (title)
fprintf(ofd,"%s ",title);
@@ -1415,9 +1413,7 @@ CostMethodExchange::computeOperatorCostInternal(RelExpr* op,
getNumActivePartitions();
const CostScalar& numOfPartitions = ((NodeMap *)(childPartFunc->getNodeMap()))->
getEstNumActivePartitionsAtRuntime();
-#pragma warning (disable : 4018) //warning elimination
const CostScalar& numOfProducers = MINOF( numOfPartitions ,sppForChild->getCurrentCountOfCPUs() );
-#pragma warning (default : 4018) //warning elimination
//---------------------------------------------------------------
// Exchange operator's number of streams is parent's degree of
@@ -4850,9 +4846,7 @@ void CostMethodFixedCostPerRow::print(FILE* ofd,
const char* indent,
const char* title) const
{
-#pragma nowarn(1506) // warning elimination
BUMP_INDENT(indent);
-#pragma warn(1506) // warning elimination
CostMethod::print(ofd,indent,title);
fprintf(ofd,"%s ",NEW_INDENT);
fprintf(ofd,
@@ -8663,9 +8657,7 @@ NABoolean CostMethodJoin::computeRepresentativeStream()
GroupAttributes * child1GA = jn_->child(1).getGroupAttr();
// This is essentially an implementation shared by MJ and HJ but not NJ.
-#pragma nowarn(203) // warning elimination
if(jn_->isTSJ()) return FALSE;
-#pragma warn(203) // warning elimination
// Cannot do better if no colstats are available for analysis.
if(NOT isColStatsMeaningful_) return FALSE;
@@ -9277,16 +9269,12 @@ void CostMethodHashJoin::cacheParameters(RelExpr* op,
// Length of a row from the left table.
GroupAttributes* child0GA = hj_->child(0).getGroupAttr();
-#pragma nowarn(1506) // warning elimination
child0RowLength_ = child0GA->getRecordLength();
-#pragma warn(1506) // warning elimination
extChild0RowLength_ = child0RowLength_ + hashedRowOverhead_;
// Length of a row from the right table.
GroupAttributes* child1GA = hj_->child(1).getGroupAttr();
-#pragma nowarn(1506) // warning elimination
child1RowLength_ = child1GA->getRecordLength();
-#pragma warn(1506) // warning elimination
extChild1RowLength_ = child1RowLength_ + hashedRowOverhead_;
// Cost for making a copy of those rows to the local buffer.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/mdam.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/mdam.cpp b/core/sql/optimizer/mdam.cpp
index faa9ffb..6e05724 100644
--- a/core/sql/optimizer/mdam.cpp
+++ b/core/sql/optimizer/mdam.cpp
@@ -1455,39 +1455,29 @@ void MdamKey::setAllColumnsToSparse()
void MdamKey::setStopColumn(CollIndex disjunctNumber,
CollIndex columnOrder)
{
-#pragma nowarn(270) // warning elimination
DCMPASSERT(disjunctNumber >= 0 AND disjunctNumber < getDisjuncts().entries());
-#pragma warn(270) // warning elimination
-#pragma nowarn(270) // warning elimination
DCMPASSERT(columnOrder >= 0 AND columnOrder < getKeyColumns().entries());
-#pragma warn(270) // warning elimination
DCMPASSERT(stopColumnArray_ != NULL);
stopColumnArray_[disjunctNumber] = columnOrder;
}
CollIndex MdamKey::getStopColumn(CollIndex disjunctNumber) const
{
-#pragma nowarn(270) // warning elimination
DCMPASSERT(disjunctNumber >= 0 AND disjunctNumber < getDisjuncts().entries());
-#pragma warn(270) // warning elimination
DCMPASSERT(stopColumnArray_ != NULL);
return stopColumnArray_[disjunctNumber];
}
NABoolean MdamKey::getSparseFlag(CollIndex columnOrder) const
{
-#pragma nowarn(270) // warning elimination
DCMPASSERT(columnOrder >= 0 AND columnOrder < getKeyColumns().entries());
-#pragma warn(270) // warning elimination
DCMPASSERT(sparseFlagArray_ != NULL);
return sparseFlagArray_[columnOrder];
}
void MdamKey::setSparseFlag(CollIndex columnOrder, NABoolean isSparse)
{
-#pragma nowarn(270) // warning elimination
DCMPASSERT(columnOrder >= 0 AND columnOrder < getKeyColumns().entries());
-#pragma warn(270) // warning elimination
DCMPASSERT(sparseFlagArray_ != NULL);
sparseFlagArray_[columnOrder] = isSparse;
}
@@ -2527,7 +2517,6 @@ void KeyColumns::KeyColumn::clearPredicates()
// are conflicting predicates. Resolve conflict will pick any
// one of them (in this case we may like to get A < 2, but
// this is difficult to do in the optimizer)
-#pragma nowarn(262) // warning elimination
void KeyColumns::KeyColumn::resolveConflict()
{
@@ -2603,7 +2592,6 @@ void KeyColumns::KeyColumn::resolveConflict()
}
} // resolveConflict(...)
-#pragma warn(262) // warning elimination
//---------------------------------------------------------
@@ -2648,7 +2636,6 @@ void KeyColumns::insertColumn(const ValueId& column)
} // KeyColumns::insertColumn(..)
-#pragma nowarn(262) // warning elimination
void KeyColumns::append(const ValueIdSet& andPredicateExpression)
{
@@ -2667,7 +2654,6 @@ void KeyColumns::append(const ValueIdSet& andPredicateExpression)
} // for every predicate
} // KeyColumns::fill(..)
-#pragma warn(262) // warning elimination
KeyColumns::~KeyColumns()
@@ -2749,7 +2735,6 @@ void KeyColumns::insertPredicate(const ValueId& predicate)
insertPredicate(predicate,NULL);
}
-#pragma nowarn(262) // warning elimination
void KeyColumns::insertPredicate(const ValueId& predicate,
const ValueId* columnPtr)
{
@@ -2881,7 +2866,6 @@ void KeyColumns::insertPredicate(const ValueId& predicate,
// and T1.A is a key col. but T1.D is not a key col.
} // KeyColumns::insertPredicate(..)
-#pragma warn(262) // warning elimination
void KeyColumns::clear()
@@ -3024,17 +3008,13 @@ ColumnOrderList::ColumnOrderList(const ValueIdList& listOfColumns):
void ColumnOrderList::validateOrder(CollIndex order)
{
-#pragma nowarn(270) // warning elimination
DCMPASSERT(order >= 0 && order < columnList_.entries());
-#pragma warn(270) // warning elimination
orderKeyColumnPtrList_[order] = getKeyColumnPtr(columnList_[order]);
}
void ColumnOrderList::invalidateOrder(CollIndex order)
{
-#pragma nowarn(270) // warning elimination
DCMPASSERT(order >= 0 && order < columnList_.entries());
-#pragma warn(270) // warning elimination
orderKeyColumnPtrList_[order] = NULL;
}
@@ -3051,9 +3031,7 @@ void ColumnOrderList::invalidateAllColumns()
const ColumnOrderList::KeyColumn* ColumnOrderList::
getPredicateExpressionPtr(CollIndex order) const
{
-#pragma nowarn(270) // warning elimination
DCMPASSERT(order >= 0 && order < orderKeyColumnPtrList_.entries());
-#pragma warn(270) // warning elimination
if (orderKeyColumnPtrList_[order] == NULL)
return NULL;
else
@@ -3082,9 +3060,7 @@ void ColumnOrderList::setStopColumn(CollIndex stopColumn)
void ColumnOrderList::resolveConflict(CollIndex order)
{
-#pragma nowarn(270) // warning elimination
DCMPASSERT(order >= 0 && order < orderKeyColumnPtrList_.entries());
-#pragma warn(270) // warning elimination
if (orderKeyColumnPtrList_[order] != NULL)
{
orderKeyColumnPtrList_[order]->resolveConflict();
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/memo.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/memo.cpp b/core/sql/optimizer/memo.cpp
index 0298e1b..8363b33 100644
--- a/core/sql/optimizer/memo.cpp
+++ b/core/sql/optimizer/memo.cpp
@@ -106,9 +106,7 @@ CascadesGroup::~CascadesGroup()
groupAttr_->decrementReferenceCount();
// delete associated contexts
-#pragma nowarn(1506) // warning elimination
Lng32 maxc = goals_.entries();
-#pragma warn(1506) // warning elimination
for (Lng32 i = 0; i < maxc; i++)
delete goals_[i];
@@ -245,9 +243,7 @@ void CascadesGroup::addPlan (CascadesPlan * plan)
{
CURRSTMT_OPTGLOBALS->plans_count++; // increment global counter for # of plans
-#pragma nowarn(1506) // warning elimination
Lng32 index = plans_.entries();
-#pragma warn(1506) // warning elimination
plans_.insertAt(index,plan); // insert plan at end of list
}
@@ -436,14 +432,10 @@ void CascadesGroup::merge(CascadesGroup * other)
// -----------------------------------------------------------------
// move all contexts from the other group into this group
// -----------------------------------------------------------------
-#pragma nowarn(1506) // warning elimination
Lng32 maxg = other->goals_.entries();
-#pragma warn(1506) // warning elimination
for (Lng32 i = 0; i < maxg; i++)
{
-#pragma nowarn(1506) // warning elimination
Lng32 maxc = goals_.entries();
-#pragma warn(1506) // warning elimination
NABoolean found = FALSE;
// change the context to the new group number
@@ -553,9 +545,7 @@ Context * CascadesGroup::shareContext(
Context *newContext = new (CmpCommon::statementHeap())
Context(groupId_, reqdPhys, inputPhys, inputLogProp) ;
Context* result = newContext;
-#pragma nowarn(1506) // warning elimination
Lng32 maxc = goals_.entries();
-#pragma warn(1506) // warning elimination
NABoolean found = FALSE;
// The "setCostLimitInContext" below is used to indicate whether the
@@ -778,28 +768,18 @@ CascadesMemo::~CascadesMemo()
e = e->getNextInBucket())
++ count;
}
-#pragma nowarn(1506) // warning elimination
m1 += count;
-#pragma warn(1506) // warning elimination
-#pragma nowarn(1506) // warning elimination
m2 += count * count;
-#pragma warn(1506) // warning elimination
}
-#pragma nowarn(1506) // warning elimination
m1 /= hashSize_; m2 /= hashSize_;
-#pragma warn(1506) // warning elimination
printf("%.0lf entries / %d buckets = %.6lf, var %.6lf\n",
-#pragma nowarn(1506) // warning elimination
m1 * hashSize_, hashSize_, m1, m2 - m1 * m1);
-#pragma warn(1506) // warning elimination
}
// weed out those groups that have been merged, to avoid deleting
// some groups twice
-#pragma nowarn(1506) // warning elimination
Lng32 groupEntries = group_.entries();
-#pragma warn(1506) // warning elimination
CascadesGroupId groupId = 0;
for (groupId = 0; (Lng32)groupId < groupEntries; groupId++)
@@ -1270,9 +1250,7 @@ Int32 CascadesMemo::garbageCollection()
}
// return the number of changed expressions
-#pragma nowarn(1506) // warning elimination
return changed.entries();
-#pragma warn(1506) // warning elimination
} // CascadesMemo::garbageCollection()
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/opt.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/opt.cpp b/core/sql/optimizer/opt.cpp
index 4fe847f..26c456a 100644
--- a/core/sql/optimizer/opt.cpp
+++ b/core/sql/optimizer/opt.cpp
@@ -212,9 +212,6 @@ void clearFailedPlanWarningsForStream()
}
}
-#pragma warning (disable : 4101) //warning elimination
-#pragma nowarn(262) // warning elimination
-
// This method is for the old driver and not used unless CQD NEW_OPT_DRIVER
// is OFF. We use the new driver by default.
RelExpr * RelExpr::optimize(NABoolean exceptionMode,
@@ -364,9 +361,7 @@ if (CURRSTMT_OPTDEFAULTS->optimizerHeuristic2()) {//#ifdef _DEBUG
// maximum parallelism can be forced by setting CDQ COMP_BOOL_69 to ON
CURRSTMT_OPTGLOBALS->maxParIsFeasible = TRUE;
-#pragma nowarn(1506) // warning elimination
Lng32 t0 = clock();
-#pragma warn(1506) // warning elimination
// ---------------------------------------------------------------------
// -- Triggers.
@@ -927,8 +922,6 @@ if (plan && context->getGroupAttr()->isStream())
return ( plan );
} // optimize
-#pragma warn(262) // warning elimination
-#pragma warning (default : 4101) //warning elimination
//<pb>
/* ============================================================ */
@@ -1218,7 +1211,6 @@ NAString Context::getRPPString() const
}
//GTOOL
-#pragma nowarn(262) // warning elimination
NAString Context::getIPPString() const
{
// Return a one-line description of the input physical properties.
@@ -1273,7 +1265,6 @@ NAString Context::getIPPString() const
return propString;
}
-#pragma warn(262) // warning elimination
//GTOOL
NAString Context::getILPString() const
@@ -2603,7 +2594,6 @@ void PlanWorkSpace::setPartialPlanCostToOperatorCost()
// Operator's cost independent of its children.
//
//==============================================================================
-#pragma nowarn(770) // warning elimination
Cost*
PlanWorkSpace::getFinalOperatorCost(Lng32 planNumber)
{
@@ -2758,7 +2748,6 @@ PlanWorkSpace::getFinalOperatorCost(Lng32 planNumber)
return operatorCost;
} // PlanWorkSpace::getFinalOperatorCost()
-#pragma warn(770) // warning elimination
//<pb>
//==============================================================================
// Set partialPlan cost to a newly specified cost.
@@ -3589,9 +3578,7 @@ NABoolean CascadesBinding::advance()
// used for that since they are used to represent cascades group).
CutOp* newPattern = new (CmpCommon::statementHeap())
-#pragma nowarn(1506) // warning elimination
CutOp((*curExpr_)[childIndex].getGroupId(), CmpCommon::statementHeap());
-#pragma warn(1506) // warning elimination
newPattern->setGroupIdAndAttr((*curExpr_)[childIndex].getGroupId());
childBinding = new(CmpCommon::statementHeap())
CascadesBinding(
@@ -3700,9 +3687,7 @@ NABoolean CascadesBinding::advance()
if (children_.entries() > 0)
{
// existing log expr is finished; dealloc children
-#pragma nowarn(1506) // warning elimination
for (Lng32 childIndex = children_.entries(); -- childIndex >= 0; )
-#pragma warn(1506) // warning elimination
{
childBinding = children_[childIndex];
delete childBinding;
@@ -3749,9 +3734,7 @@ NABoolean CascadesBinding::advance()
} // state analysis and transitions
} // loop until either failure or success
-#pragma nowarn(203) // warning elimination
ABORT("should never terminate this loop");
-#pragma warn(203) // warning elimination
return( FALSE );
} // CascadesBinding::advance
@@ -5409,7 +5392,6 @@ NABoolean OptDefaults::cacheHistograms()
ActiveSchemaDB()->getDefaults().getAsLong(CACHE_HISTOGRAMS_IN_KB)>0);
}
-#pragma warn(262) // warning elimination
// ---------------------------------------------------------------------
// OptDebug class methods
@@ -5561,16 +5543,10 @@ void OptDebug::showTree( const ExprNode *tree,
if ( plan != NULL )
{
CollIndex index = 0;
-#pragma nowarn(1506) // warning elimination
while ( plan->getSolutionForChild(index) )
-#pragma warn(1506) // warning elimination
{
-#pragma nowarn(1506) // warning elimination
showTree( plan->getSolutionForChild(index)->getPhysicalExpr(),
-#pragma warn(1506) // warning elimination
-#pragma nowarn(1506) // warning elimination
plan->getSolutionForChild(index),
-#pragma warn(1506) // warning elimination
indent,
showDetail );
index++;
@@ -6542,9 +6518,7 @@ void OptDebug::showMemoStats(CascadesMemo *memo,
if (detailedStat)
{
const CascadesPlanList& grPlanList = groupPtr->getPlans();
-#pragma nowarn(1506) // warning elimination
grPlanCnt = grPlanList.entries();
-#pragma warn(1506) // warning elimination
grFailedPlanCnt=0;
for (Lng32 j=0; j<grPlanCnt; j++)
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/opt.h
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/opt.h b/core/sql/optimizer/opt.h
index 80d61ed..de3995e 100644
--- a/core/sql/optimizer/opt.h
+++ b/core/sql/optimizer/opt.h
@@ -1221,7 +1221,6 @@ public:
// ---------------------------------------------------------------------
// Constructor and Destructor.
// ---------------------------------------------------------------------
-// warning elimination (removed "inline")
CascadesPlan(RelExpr * physExpr, Context * context = NULL);
virtual ~CascadesPlan();
@@ -1418,7 +1417,6 @@ public:
// applying transformation rules
// -----------------------------------------------------------------------
-#pragma nowarn(1506) // warning elimination
class Context : public NABasicObject
{
@@ -1749,7 +1747,6 @@ private:
PlanWorkSpace* myPws_; // my PlanWorkSpace
}; // Context
-#pragma warn(1506) // warning elimination
// -----------------------------------------------------------------------
// A list and an array of context pointers
@@ -2159,7 +2156,6 @@ private:
// (d) a list of pattern for which this group has been expanded
// -----------------------------------------------------------------------
-#pragma nowarn(1506) // warning elimination
class CascadesGroup : public NABasicObject
{
@@ -2246,7 +2242,6 @@ private:
// top parallelism heristic and nice contrext for top groupBy
NABoolean isBelowRoot_;
}; // CascadesGroup
-#pragma warn(1506) // warning elimination
//<pb>
// -----------------------------------------------------------------------
// Search space memory
@@ -2257,7 +2252,6 @@ private:
// duplicate expressions.
// -----------------------------------------------------------------------
-#pragma nowarn(1506) // warning elimination
class CascadesMemo : public NABasicObject
{
@@ -2310,7 +2304,6 @@ private:
Lng32 hashSize_; // size of hash table
}; // CascadesMemo
-#pragma warn(1506) // warning elimination
//<pb>
// -----------------------------------------------------------------------
// Tasks
@@ -2738,7 +2731,6 @@ public:
EXPR_FINISHED // current expr is finished; in advance() only
};
-// warning elimination (removed "inline")
static const char * binding_state_name (CascadesBindingStateEnum state)
{
return state == START_GROUP ? "start a group" :
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/parser/ElemDDLFileAttr.cpp
----------------------------------------------------------------------
diff --git a/core/sql/parser/ElemDDLFileAttr.cpp b/core/sql/parser/ElemDDLFileAttr.cpp
index b8bf860..b3511a9 100644
--- a/core/sql/parser/ElemDDLFileAttr.cpp
+++ b/core/sql/parser/ElemDDLFileAttr.cpp
@@ -347,9 +347,7 @@ NAString ElemDDLFileAttrBlockSize::getSyntax() const
{
NAString syntax = "BLOCKSIZE ";
-#pragma nowarn(1506) // warning elimination
syntax += LongToNAString(blockSizeInBytes_);
-#pragma warn(1506) // warning elimination
return syntax;
} // getSyntax()
@@ -1112,9 +1110,7 @@ ElemDDLFileAttrMVCommitEach::displayLabel1() const
NAString ElemDDLFileAttrMVCommitEach::getSyntax() const
{
NAString syntax = "COMMIT REFRESH EACH ";
-#pragma nowarn(1506) // warning elimination
syntax += LongToNAString(nrows_);
-#pragma warn(1506) // warning elimination
return syntax;
@@ -1193,9 +1189,7 @@ NAString ElemDDLFileAttrMaxSize::getSyntax() const
}
else
{
-#pragma nowarn(1506) // warning elimination
syntax += LongToNAString(maxSize_);
-#pragma warn(1506) // warning elimination
syntax += " ";
switch(maxSizeUnit_)
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/parser/ElemDDLList.h
----------------------------------------------------------------------
diff --git a/core/sql/parser/ElemDDLList.h b/core/sql/parser/ElemDDLList.h
index fbe1281..963f234 100644
--- a/core/sql/parser/ElemDDLList.h
+++ b/core/sql/parser/ElemDDLList.h
@@ -77,7 +77,6 @@ class ElemDDLList;
// -----------------------------------------------------------------------
// A list of elements in DDL statement.
// -----------------------------------------------------------------------
-#pragma nowarn(1319) // warning elimination
class ElemDDLList : public ElemDDLNode
{
@@ -185,7 +184,6 @@ private:
ElemDDLNode * children_[MAX_ELEM_DDL_LIST_ARITY];
}; // class ElemDDLList
-#pragma warn(1319) // warning elimination
// -----------------------------------------------------------------------
// definitions of inline methods for class ElemDDLList
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/parser/ElemDDLPartition.cpp
----------------------------------------------------------------------
diff --git a/core/sql/parser/ElemDDLPartition.cpp b/core/sql/parser/ElemDDLPartition.cpp
index 42f8f14..93d3544 100644
--- a/core/sql/parser/ElemDDLPartition.cpp
+++ b/core/sql/parser/ElemDDLPartition.cpp
@@ -444,9 +444,7 @@ ElemDDLPartitionSystem::setPartitionAttr(ElemDDLNode * pPartitionAttr)
ElemDDLFileAttrMaxExtents * pMaxExtents =
pPartitionAttr->castToElemDDLFileAttrMaxExtents();
// error checking for limits when we specify the MAXEXTENTS clause
-#pragma nowarn(1506) // warning elimination
Lng32 maxext = pMaxExtents->getMaxExtents();
-#pragma warn(1506) // warning elimination
if ((maxext <= 0) || (maxext > COM_MAX_MAXEXTENTS))
{
*SqlParser_Diags << DgSqlCode(-3191);
@@ -618,10 +616,8 @@ ElemDDLPartitionSystem::getDetailInfo() const
detailText += LongToNAString((Lng32)getMaxSize());
detailTextList.append(detailText);
-#pragma nowarn(1506) // warning elimination
ElemDDLFileAttrMaxSize maxSizeFileAttr(getMaxSize(),
getMaxSizeUnit());
-#pragma warn(1506) // warning elimination
detailText = " max size unit: ";
detailText += maxSizeFileAttr.getMaxSizeUnitAsNAString();;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/parser/ElemDDLUdr.cpp
----------------------------------------------------------------------
diff --git a/core/sql/parser/ElemDDLUdr.cpp b/core/sql/parser/ElemDDLUdr.cpp
index 11672e4..58307b0 100644
--- a/core/sql/parser/ElemDDLUdr.cpp
+++ b/core/sql/parser/ElemDDLUdr.cpp
@@ -387,9 +387,7 @@ ElemDDLUdrMaxResults::getDetailInfo() const
NATraceList detailTextList;
detailText = "MaxResults: ";
-#pragma nowarn(1506) // warning elimination
detailText += LongToNAString(getMaxResults());
-#pragma warn(1506) // warning elimination
detailTextList.append(detailText);
return detailTextList;
@@ -918,9 +916,7 @@ ElemDDLUdfStateAreaSize::getDetailInfo() const
NATraceList detailTextList;
detailText = "StateAreaSize: ";
-#pragma nowarn(1506) // warning elimination
detailText += LongToNAString(getStateAreaSize());
-#pragma warn(1506) // warning elimination
detailTextList.append(detailText);
return detailTextList;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/parser/ParDDLFileAttrs.cpp
----------------------------------------------------------------------
diff --git a/core/sql/parser/ParDDLFileAttrs.cpp b/core/sql/parser/ParDDLFileAttrs.cpp
index 74a4b99..c8ba867 100644
--- a/core/sql/parser/ParDDLFileAttrs.cpp
+++ b/core/sql/parser/ParDDLFileAttrs.cpp
@@ -120,9 +120,7 @@ ParDDLFileAttrsAlterIndex::operator = (
NAString
ParDDLFileAttrsAlterIndex::getMaxSizeUnitAsNAString() const
{
-#pragma nowarn(1506) // warning elimination
ElemDDLFileAttrMaxSize maxSizeFileAttr(getMaxSize(), getMaxSizeUnit());
-#pragma warn(1506) // warning elimination
return maxSizeFileAttr.getMaxSizeUnitAsNAString();
}
@@ -443,9 +441,7 @@ ParDDLFileAttrsAlterIndex::setFileAttr(ElemDDLFileAttr * pFileAttr)
/////////////////////////////////////////////////////////////////
//error checking while specifying the MAXEXTENTS attribute clause
/////////////////////////////////////////////////////////////////
-#pragma nowarn(1506) // warning elimination
Lng32 maxext = pMaxExtents->getMaxExtents();
-#pragma warn(1506) // warning elimination
if ((maxext <= 0) || (maxext > COM_MAX_MAXEXTENTS))
{
*SqlParser_Diags << DgSqlCode(-3191);
@@ -672,12 +668,8 @@ ParDDLFileAttrsAlterTable::operator = (
NAString
ParDDLFileAttrsAlterTable::getMaxSizeUnitAsNAString() const
{
-#pragma nowarn(1506) // warning elimination
ElemDDLFileAttrMaxSize maxSizeFileAttr(getMaxSize(), getMaxSizeUnit());
-#pragma warn(1506) // warning elimination
-#pragma nowarn(1506) // warning elimination
return maxSizeFileAttr.getMaxSizeUnitAsNAString();
-#pragma warn(1506) // warning elimination
}
//
@@ -1050,9 +1042,7 @@ ParDDLFileAttrsAlterTable::setFileAttr(ElemDDLFileAttr * pFileAttr)
ElemDDLFileAttrMaxExtents * pMaxExtents =
pFileAttr->castToElemDDLFileAttrMaxExtents();
// error checking for limits when we specify the MAXEXTENTS clause
-#pragma nowarn(1506) // warning elimination
Lng32 maxext = pMaxExtents->getMaxExtents();
-#pragma warn(1506) // warning elimination
if ((maxext <= 0) || (maxext > COM_MAX_MAXEXTENTS))
{
*SqlParser_Diags << DgSqlCode(-3191);
@@ -1316,9 +1306,7 @@ ParDDLFileAttrsCreateIndex::operator = (
NAString
ParDDLFileAttrsCreateIndex::getMaxSizeUnitAsNAString() const
{
-#pragma nowarn(1506) // warning elimination
ElemDDLFileAttrMaxSize maxSizeFileAttr(getMaxSize(), getMaxSizeUnit());
-#pragma warn(1506) // warning elimination
return maxSizeFileAttr.getMaxSizeUnitAsNAString();
}
@@ -1693,9 +1681,7 @@ ParDDLFileAttrsCreateIndex::setFileAttr(ElemDDLFileAttr * pFileAttr)
//////////////////////////////////////////////////////
// error checking when we define the MAXEXTENTS clause
//////////////////////////////////////////////////////
-#pragma nowarn(1506) // warning elimination
Lng32 maxext = pMaxExtents->getMaxExtents();
-#pragma warn(1506) // warning elimination
if ((maxext <= 0) || (maxext > COM_MAX_MAXEXTENTS))
{
*SqlParser_Diags << DgSqlCode(-3191);