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:12 UTC
[08/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/executor/ex_split_top.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ex_split_top.cpp b/core/sql/executor/ex_split_top.cpp
index 4d473b4..248b336 100644
--- a/core/sql/executor/ex_split_top.cpp
+++ b/core/sql/executor/ex_split_top.cpp
@@ -369,9 +369,7 @@ void ex_split_top_tcb::registerSubtasks()
// No tasks get registered here if the child TCBs aren't allocated yet
for (CollIndex i = 0; i < childTcbs_.entries(); i++)
{
-#pragma nowarn(1506) // warning elimination
registerChildQueueSubtask(i);
-#pragma warn(1506) // warning elimination
}
}
@@ -747,9 +745,7 @@ ExWorkProcRetcode ex_split_top_tcb::workDown()
// associated with that partition number, or for a
// child that can be associated with the partition
// number
-#pragma nowarn(1506) // warning elimination
childIndex = getAssociatedChildIndex(dp2PartNum);
-#pragma warn(1506) // warning elimination
// if no child that is already associated is found then
// wait for a child to free up, don't do anything now
@@ -846,9 +842,7 @@ ExWorkProcRetcode ex_split_top_tcb::workDown()
else
centry->getTupp(
splitTopTdb().partInputDataAtpIndex_) =
-#pragma nowarn(1506) // warning elimination
inputDataTupps_->getTuppDescriptor(childIndex+1);
-#pragma warn(1506) // warning elimination
}
// add a tupp with the partition number for a PA node
@@ -857,9 +851,7 @@ ExWorkProcRetcode ex_split_top_tcb::workDown()
{
centry->getTupp(
splitTopTdb().paPartNoAtpIndex_) =
-#pragma nowarn(1506) // warning elimination
paPartNumTupps_->getTuppDescriptor(dp2PartNum+1);
-#pragma warn(1506) // warning elimination
if(splitTopTdb().isSystemIdentity()){
// Copy the sidTuple in tempChildAtp_ to
@@ -934,9 +926,7 @@ ExWorkProcRetcode ex_split_top_tcb::workDown()
{
// Which TCB child does this request go to?
CollIndex childIndex;
-#pragma nowarn(1506) // warning elimination
childIndex = getAssociatedChildIndex(dp2PartNum);
-#pragma warn(1506) // warning elimination
// If no child that is already associated is found then
// wait for a child to free up, don't do anything now
@@ -986,9 +976,7 @@ ExWorkProcRetcode ex_split_top_tcb::workDown()
// add a tupp with the partition number for a PA node
centry->getTupp(splitTopTdb().paPartNoAtpIndex_) =
-#pragma nowarn(1506) // warning elimination
paPartNumTupps_->getTuppDescriptor(dp2PartNum+1);
-#pragma warn(1506) // warning elimination
// massage child queue entry
centry->downState = pentry->downState;
@@ -1079,9 +1067,7 @@ ExWorkProcRetcode ex_split_top_tcb::workDown()
}
// which TCB child does this request go to?
-#pragma nowarn(1506) // warning elimination
CollIndex childIndex = getAssociatedChildIndex(dp2PartNum);
-#pragma warn(1506) // warning elimination
if (childIndex == NULL_COLL_INDEX)
{
@@ -1135,9 +1121,7 @@ ExWorkProcRetcode ex_split_top_tcb::workDown()
// add a tupp with the partition number for a PA node
centry->getTupp(splitTopTdb().paPartNoAtpIndex_) =
-#pragma nowarn(1506) // warning elimination
paPartNumTupps_->getTuppDescriptor(dp2PartNum+1);
-#pragma warn(1506) // warning elimination
// massage child queue entry
centry->downState = pentry->downState;
@@ -1175,9 +1159,7 @@ ExWorkProcRetcode ex_split_top_tcb::workDown()
}
// which TCB child does this request go to?
-#pragma nowarn(1506) // warning elimination
CollIndex childIndex = getAssociatedChildIndex(dp2PartNum);
-#pragma warn(1506) // warning elimination
if (childIndex == NULL_COLL_INDEX)
{
@@ -1230,9 +1212,7 @@ ExWorkProcRetcode ex_split_top_tcb::workDown()
// add a tupp with the partition number for a PA node
centry->getTupp(splitTopTdb().paPartNoAtpIndex_) =
-#pragma nowarn(1506) // warning elimination
paPartNumTupps_->getTuppDescriptor(dp2PartNum+1);
-#pragma warn(1506) // warning elimination
// massage child queue entry
centry->downState = pentry->downState;
@@ -1977,7 +1957,6 @@ void ex_split_top_tcb::resetAssociatedChildIndex(Lng32 partNo)
}
}
-#pragma nowarn(262) // warning elimination
CollIndex ex_split_top_tcb::getAssociatedChildIndex(Lng32 partNo)
{
// ---------------------------------------------------------------------
@@ -2089,7 +2068,6 @@ CollIndex ex_split_top_tcb::getAssociatedChildIndex(Lng32 partNo)
// balancing.
return NULL_COLL_INDEX;
}
-#pragma warn(262) // warning elimination
@@ -2221,9 +2199,7 @@ CollIndex ex_split_top_tcb::findNextReadyChild(
// encode the merge key into the tupp reserved
// for this purpose
workAtp_->getTupp(mergeKeyAtpIndex()) =
-#pragma nowarn(1506) // warning elimination
mergeKeyTupps_->getTuppDescriptor(ch+1);
-#pragma warn(1506) // warning elimination
if (mergeKeyExpr()->eval(centry->getAtp(),workAtp_) ==
ex_expr::EXPR_ERROR)
@@ -2236,9 +2212,7 @@ CollIndex ex_split_top_tcb::findNextReadyChild(
}
char * newKey = mergeKeyTupps_->
-#pragma nowarn(1506) // warning elimination
getTuppDescriptor(ch+1)->getTupleAddress();
-#pragma warn(1506) // warning elimination
// do until we found the exact position
while (highIndex > lowIndex)
@@ -2251,9 +2225,7 @@ CollIndex ex_split_top_tcb::findNextReadyChild(
// must already have been encoded if it is
// a member of the merge sequence)
char *testKey = mergeKeyTupps_->
-#pragma nowarn(1506) // warning elimination
getTuppDescriptor(mergeSequence_[testIndex]+1)->
-#pragma warn(1506) // warning elimination
getTupleAddress();
// evaluate whether the new key to insert is less
@@ -2317,9 +2289,7 @@ CollIndex ex_split_top_tcb::findNextReadyChild(
}
} // we're merging
-#pragma nowarn(203) // warning elimination
ex_assert(0,"Should never reach here");
-#pragma warn(203) // warning elimination
return NULL_COLL_INDEX;
}
@@ -2364,9 +2334,7 @@ ex_tcb_private_state * ex_split_top_tcb::allocatePstates(
Int32 ex_split_top_tcb::numChildren() const
{
-#pragma nowarn(1506) // warning elimination
return childTcbs_.entries();
-#pragma warn(1506) // warning elimination
}
const ex_tcb* ex_split_top_tcb::getChild(Int32 pos) const
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/executor/ex_stored_proc.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ex_stored_proc.cpp b/core/sql/executor/ex_stored_proc.cpp
index b0bcf8f..982d5c1 100644
--- a/core/sql/executor/ex_stored_proc.cpp
+++ b/core/sql/executor/ex_stored_proc.cpp
@@ -73,11 +73,9 @@ ExStoredProcTcb::ExStoredProcTcb(const ExStoredProcTdb & sp_tdb,
Space * space = (glob ? glob->getSpace() : 0);
// Allocate the buffer pool
-#pragma nowarn(1506) // warning elimination
pool_ = new(space) sql_buffer_pool(sp_tdb.numBuffers_,
sp_tdb.bufferSize_,
space);
-#pragma warn(1506) // warning elimination
// Allocate the queue to communicate with parent
qparent_.down = new(space) ex_queue(ex_queue::DOWN_QUEUE,
@@ -712,9 +710,7 @@ short ExStoredProcTcb::work()
} // switch step_
} // while
-#pragma nowarn(203) // warning elimination
return WORK_OK;
-#pragma warn(203) // warning elimination
}
@@ -757,9 +753,7 @@ short ExSPInputOutput::inputValue(ULng32 fieldNum, char * inputRow,
// diagsArea must be present. And fieldNum must be within range.
if ((diagsArea == NULL) ||
-#pragma nowarn(270) // warning elimination
(fieldNum < 0) ||
-#pragma warn(270) // warning elimination
(fieldNum >= tupleDesc_->numAttrs()))
{
// return error
@@ -767,7 +761,6 @@ short ExSPInputOutput::inputValue(ULng32 fieldNum, char * inputRow,
}
if (casting == FALSE)
-#pragma nowarn(1506) // warning elimination
convDoIt(&inputRow[attr->getOffset()],
attr->getLength(&inputRow[attr->getVCLenIndOffset()]),
attr->getDatatype(),
@@ -788,7 +781,6 @@ short ExSPInputOutput::inputValue(ULng32 fieldNum, char * inputRow,
NULL, /*CollHeap *heap,*/
&diagsArea,
CONV_UNKNOWN_LEFTPAD);
-#pragma warn(1506) // warning elimination
else
{
// TBD:
@@ -800,7 +792,6 @@ short ExSPInputOutput::inputValue(ULng32 fieldNum, char * inputRow,
// target has to be formatted as a varchar. The first two bytes
// of target will contain the actual target length, followed
// by data bytes.
-#pragma nowarn(1506) // warning elimination
convDoIt(&inputRow[attr->getOffset()],
attr->getLength(&inputRow[attr->getVCLenIndOffset()]),
attr->getDatatype(),
@@ -816,7 +807,6 @@ short ExSPInputOutput::inputValue(ULng32 fieldNum, char * inputRow,
NULL, /*CollHeap *heap,*/
&diagsArea,
CONV_UNKNOWN);
-#pragma warn(1506) // warning elimination
}
return 0;
@@ -851,9 +841,7 @@ short ExSPInputOutput::outputValue(ULng32 fieldNum,
// diagsArea must be present. And fieldNum must be within range.
if ((diagsArea == NULL) ||
-#pragma nowarn(270) // warning elimination
(fieldNum < 0) ||
-#pragma warn(270) // warning elimination
(fieldNum >= tupleDesc_->numAttrs()))
{
// return error
@@ -882,7 +870,6 @@ short ExSPInputOutput::outputValue(ULng32 fieldNum,
} // null value
if (casting == FALSE)
-#pragma nowarn(1506) // warning elimination
status = convDoIt(
// Pass in pointer to real data.
// if varchar, then data points to varchar length and
@@ -902,9 +889,7 @@ short ExSPInputOutput::outputValue(ULng32 fieldNum,
heap,
&diagsArea,
CONV_UNKNOWN_LEFTPAD);
-#pragma warn(1506) // warning elimination
else
-#pragma nowarn(1506) // warning elimination
status = convDoIt(&data[0],
datalen,
REC_BYTE_F_ASCII,
@@ -922,7 +907,6 @@ short ExSPInputOutput::outputValue(ULng32 fieldNum,
&diagsArea,
(getCaseIndexArray() ? getCaseIndexArray()[fieldNum]
: CONV_UNKNOWN_LEFTPAD));
-#pragma warn(1506) // warning elimination
if ((status == ex_expr::EXPR_OK) && attr->getNullFlag())
{
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/executor/ex_tcb.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/ex_tcb.h b/core/sql/executor/ex_tcb.h
index c3ae5ba..e5817ec 100644
--- a/core/sql/executor/ex_tcb.h
+++ b/core/sql/executor/ex_tcb.h
@@ -98,7 +98,6 @@ public:
// default implementations that may be sufficient for most TCBs.
virtual ExWorkProcRetcode work() = 0;
// default static work proc for scheduler
-// warning elimination (removed "inline")
static ExWorkProcRetcode sWork(ex_tcb *tcb)
{ return tcb->work(); }
virtual ExWorkProcRetcode workCancel();
@@ -238,9 +237,7 @@ template <class T> class PstateAllocator
{
public:
-#pragma nowarn(1103) // warning elimination
ex_tcb_private_state *allocatePstates(
-#pragma warn(1103) // warning elimination
ex_tcb *tcb,
Lng32 &numElems, // inout, desired/actual elements
Lng32 &elementLength)
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/executor/ex_tcb_private.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/ex_tcb_private.h b/core/sql/executor/ex_tcb_private.h
index 6ab98ae..cea3558 100644
--- a/core/sql/executor/ex_tcb_private.h
+++ b/core/sql/executor/ex_tcb_private.h
@@ -56,9 +56,7 @@ class ex_tcb;
//
//////////////////////////////////////////////////////////////////////////
-#pragma nowarn(1103) // warning elimination
class ex_tcb_private_state : public ExGod
-#pragma warn(1103) // warning elimination
{
// Error related information. For now, make it a long.
// Later, make it the SQLDiagnosticStruct (or something similar).
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/executor/ex_timeout.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ex_timeout.cpp b/core/sql/executor/ex_timeout.cpp
index 2565450..480d39b 100644
--- a/core/sql/executor/ex_timeout.cpp
+++ b/core/sql/executor/ex_timeout.cpp
@@ -79,11 +79,9 @@ ExTimeoutTcb::ExTimeoutTcb(const ExTimeoutTdb & timeout_tdb,
CollHeap * heap = (glob ? glob->getDefaultHeap() : 0);
// Allocate the buffer pool
-#pragma nowarn(1506) // warning elimination
pool_ = new(space) sql_buffer_pool(timeout_tdb.numBuffers_,
timeout_tdb.bufferSize_,
space);
-#pragma warn(1506) // warning elimination
// Allocate the queue to communicate with parent
qparent_.down = new(space) ex_queue(ex_queue::DOWN_QUEUE,
@@ -136,7 +134,6 @@ ExTimeoutTcb::~ExTimeoutTcb()
//////////////////////////////////////////////////////
// work() for ExTimeoutTcb
//////////////////////////////////////////////////////
-#pragma nowarn(262) // warning elimination
short ExTimeoutTcb::work()
{
while (1) {
@@ -264,11 +261,8 @@ short ExTimeoutTcb::work()
qparent_.down->removeHead();
}
-#pragma nowarn(203) // warning elimination
return WORK_OK;
-#pragma warn(203) // warning elimination
}
-#pragma warn(262) // warning elimination
// if diagsArea is not NULL, then its error code is used.
// Otherwise, err is used to handle error.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/executor/ex_transaction.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ex_transaction.cpp b/core/sql/executor/ex_transaction.cpp
index 083b202..0f326db 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;
}
-#pragma nowarn(262) // warning elimination
short ExTransaction::getCurrentTxHandle(short * txHandle)
{
const short NULL_HANDLE[10] = {0,0,0,0,0,0,0,0,0,0};
@@ -183,9 +182,7 @@ short ExTransaction::getCurrentTxHandle(short * txHandle)
return retcode;
}
-#pragma warn(262) // warning elimination
-#pragma nowarn(262) // warning elimination
// Soln 10-050210-4624
short ExTransaction::waitForRollbackCompletion(Int64 transid)
@@ -226,9 +223,7 @@ short ExTransaction::waitForRollbackCompletion(Int64 transid)
return 0;
}
-#pragma warn(262) // warning elimination
-#pragma nowarn(262) // warning elimination
short ExTransaction::waitForCommitCompletion(Int64 transid)
{
@@ -263,7 +258,6 @@ short ExTransaction::waitForCommitCompletion(Int64 transid)
return 0;
}
-#pragma warn(262) // warning elimination
static void setSpecialAIValues(Lng32 &aivalue)
{
@@ -633,7 +627,6 @@ short ExTransaction::doomTransaction()
return 0;
}
-#pragma nowarn(770) // warning elimination
void ExTransaction::cleanupTransaction()
{
// commit the transaction but don't do anything with errors.
@@ -646,7 +639,6 @@ void ExTransaction::cleanupTransaction()
resetXnState();
}
-#pragma warn(770) // warning elimination
short ExTransaction::commitTransaction(NABoolean waited)
{
@@ -712,9 +704,7 @@ short ExTransaction::commitTransaction(NABoolean waited)
resetXnState();
-#pragma nowarn(1506) // warning elimination
return rc;
-#pragma warn(1506) // warning elimination
}
////////////////////////////////////////////////////////////
@@ -1067,11 +1057,9 @@ ExTransTcb::ExTransTcb(const ExTransTdb & trans_tdb,
CollHeap * heap = (glob ? glob->getDefaultHeap() : 0);
// Allocate the buffer pool
-#pragma nowarn(1506) // warning elimination
pool_ = new(space) sql_buffer_pool(trans_tdb.numBuffers_,
trans_tdb.bufferSize_,
space);
-#pragma warn(1506) // warning elimination
// Allocate the queue to communicate with parent
qparent_.down = new(space) ex_queue(ex_queue::DOWN_QUEUE,
@@ -1443,11 +1431,8 @@ short ExTransTcb::work()
qparent_.down->removeHead();
}
-#pragma nowarn(203) // warning elimination
return WORK_OK;
-#pragma warn(203) // warning elimination
}
-#pragma warn(262) // warning elimination
// if diagsArea is not NULL, then its error code is used.
// Otherwise, err is used to handle error.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/executor/ex_transaction.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/ex_transaction.h b/core/sql/executor/ex_transaction.h
index cadf57b..6fc1526 100644
--- a/core/sql/executor/ex_transaction.h
+++ b/core/sql/executor/ex_transaction.h
@@ -399,7 +399,6 @@ public:
~ExTransTcb();
virtual short work();
-// warning elimination (removed "inline")
ex_queue_pair getParentQueue() const{return qparent_;};
inline Int32 orderedQueueProtocol() const{return ((const ExTransTdb &)tdb).orderedQueueProtocol();}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/executor/ex_tuple.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ex_tuple.cpp b/core/sql/executor/ex_tuple.cpp
index a8a2e16..e63ef1c 100644
--- a/core/sql/executor/ex_tuple.cpp
+++ b/core/sql/executor/ex_tuple.cpp
@@ -92,11 +92,9 @@ ExTupleTcb::ExTupleTcb(const ComTdbTuple & tupleTdb,
CollHeap * heap = (glob ? glob->getDefaultHeap() : 0);
// Allocate the buffer pool
-#pragma nowarn(1506) // warning elimination
pool_ = new(space) sql_buffer_pool(tupleTdb.numBuffers_,
tupleTdb.bufferSize_,
space);
-#pragma warn(1506) // warning elimination
// Allocate the queue to communicate with parent
allocateParentQueues(qparent);
@@ -229,9 +227,7 @@ ExWorkProcRetcode ExTupleLeafTcb::work()
{
// allocate space to hold the tuple to be returned
tupp p;
-#pragma nowarn(1506) // warning elimination
if (pool_->get_free_tuple(p, tupleTdb().tupleLen_))
-#pragma warn(1506) // warning elimination
return WORK_POOL_BLOCKED; // couldn't allocate, try again later.
up_entry->getTupp(tupleTdb().tuppIndex_) = p;
@@ -344,9 +340,7 @@ ExWorkProcRetcode ExTupleLeafTcb::work()
} // switch
} // while
-#pragma nowarn(203) // warning elimination
return WORK_OK;
-#pragma warn(203) // warning elimination
}
///////////////////////////////////////////////
@@ -636,9 +630,7 @@ ExWorkProcRetcode ExTupleNonLeafTcb::work()
} // switch
} // while
-#pragma nowarn(203) // warning elimination
return WORK_OK;
-#pragma warn(203) // warning elimination
}
/////////////////////////////////////////////
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/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 53013d5..42965fa 100644
--- a/core/sql/executor/ex_tuple_flow.cpp
+++ b/core/sql/executor/ex_tuple_flow.cpp
@@ -85,11 +85,9 @@ ExTupleFlowTcb::ExTupleFlowTcb(const ExTupleFlowTdb & tuple_flow_tdb,
// Allocate the buffer pool, if tgtExpr_ is present
if (tuple_flow_tdb.tgtExpr_)
-#pragma nowarn(1506) // warning elimination
pool_ = new(glob->getSpace()) sql_buffer_pool(tuple_flow_tdb.numBuffers_,
tuple_flow_tdb.bufferSize_,
glob->getSpace());
-#pragma warn(1506) // warning elimination
tcbSrc_ = &src_tcb;
tcbTgt_ = &tgt_tcb;
@@ -793,9 +791,7 @@ short ExTupleFlowTcb::work()
} // switch pstate.step_
} // while
-#pragma nowarn(203) // warning elimination
return 0;
-#pragma warn(203) // warning elimination
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/executor/ex_union.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ex_union.cpp b/core/sql/executor/ex_union.cpp
index b171c9a..74a3f4d 100644
--- a/core/sql/executor/ex_union.cpp
+++ b/core/sql/executor/ex_union.cpp
@@ -100,7 +100,6 @@ ex_tcb * ex_union_tdb::build(ex_globals * glob)
//
// Constructor for union_tcb
//
-#pragma nowarn(770) // warning elimination
ex_union_tcb::ex_union_tcb(const ex_union_tdb & union_tdb, //
const ex_tcb * left_tcb, // left queue pair
const ex_tcb * right_tcb, // right queue pair
@@ -114,11 +113,9 @@ ex_union_tcb::ex_union_tcb(const ex_union_tdb & union_tdb, //
CollHeap * space = glob->getSpace();
// Allocate the buffer pool
-#pragma nowarn(1506) // warning elimination
pool_ = new(space) sql_buffer_pool(union_tdb.numBuffers_,
union_tdb.bufferSize_,
space);
-#pragma warn(1506) // warning elimination
// get the queues that left and right use to communicate with me
childQueues_[0] = left_tcb->getParentQueue();
@@ -179,7 +176,6 @@ ex_union_tcb::ex_union_tcb(const ex_union_tdb & union_tdb, //
(void) trigExceptExpr()->fixup(0, getExpressionMode(), this,
glob->getSpace(), glob->getDefaultHeap(), FALSE, glob);
};
-#pragma warn(770) // warning elimination
///////////////////////////////////////////////////////////////////////////////
// Destructor for union_tcb
@@ -439,9 +435,7 @@ ExWorkProcRetcode ex_union_tcb::workUp()
pentry->upState.status = ex_queue::Q_SQLERROR;
pentry->upState.parentIndex = pentry_down->downState.parentIndex;
pentry->upState.downIndex = qparent.down->getHeadIndex();
-#pragma nowarn(1506) // warning elimination
pentry->upState.setMatchNo(pstate.matchCount_);
-#pragma warn(1506) // warning elimination
qparent.up->insert();
continue;
}
@@ -537,9 +531,7 @@ ExWorkProcRetcode ex_union_tcb::workUp()
pentry->copyAtp(centry);
}
-#pragma nowarn(1506) // warning elimination
pentry->upState.setMatchNo(++pstate.matchCount_);
-#pragma warn(1506) // warning elimination
// insert into parent up queue
qparent.up->insert();
@@ -604,9 +596,7 @@ void ex_union_tcb::processError(ex_union_private_state &pstate, Int32 &endOfData
pentry->upState.status = ex_queue::Q_SQLERROR;
pentry->upState.parentIndex = pentry_down->downState.parentIndex;
pentry->upState.downIndex = qparent.down->getHeadIndex();
-#pragma nowarn(1506) // warning elimination
pentry->upState.setMatchNo(pstate.matchCount_);
-#pragma warn(1506) // warning elimination
qparent.up->insert();
// cancel this request and cancel all the children.
@@ -1392,9 +1382,7 @@ void ex_c_union_tcb::stop()
pentry->upState.status = ex_queue::Q_NO_DATA;
pentry->upState.parentIndex = pentry_down->downState.parentIndex;
pentry->upState.downIndex = qparent.down->getHeadIndex();
-#pragma nowarn(1506) // warning elimination
pentry->upState.setMatchNo(pstate.matchCount_);
-#pragma warn(1506) // warning elimination
qparent.up->insert();
@@ -1527,9 +1515,7 @@ void ex_c_union_tcb::processError(ex_union_private_state &pstate,
pentry->upState.status = ex_queue::Q_SQLERROR;
pentry->upState.parentIndex = pentry_down->downState.parentIndex;
pentry->upState.downIndex = qparent.down->getHeadIndex();
-#pragma nowarn(1506) // warning elimination
pentry->upState.setMatchNo(pstate.matchCount_);
-#pragma warn(1506) // warning elimination
qparent.up->insert();
qparent.down->cancelRequest(qparent.down->getHeadIndex());
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/executor/key_range.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/key_range.cpp b/core/sql/executor/key_range.cpp
index a457201..3c2e2e9 100644
--- a/core/sql/executor/key_range.cpp
+++ b/core/sql/executor/key_range.cpp
@@ -52,12 +52,8 @@ keyRangeEx::keyRangeEx(const keyRangeGen & tdb_key,
) :
tdbKey_(tdb_key),globals_(g),bkExcludeFlag_(0),ekExcludeFlag_(0)
{
-#pragma nowarn(1506) // warning elimination
pool->get_free_tuple(bkData_, tdb_key.getKeyLength());
-#pragma warn(1506) // warning elimination
-#pragma nowarn(1506) // warning elimination
pool->get_free_tuple(ekData_, tdb_key.getKeyLength());
-#pragma warn(1506) // warning elimination
workAtp_ = allocateAtp(tdbKey_.getWorkCriDesc(),g->getSpace());
pool->get_free_tuple(workAtp_->getTupp(tdbKey_.getKeyValuesAtpIndex()),
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/executor/key_single_subset.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/key_single_subset.cpp b/core/sql/executor/key_single_subset.cpp
index 2a72714..92ff833 100644
--- a/core/sql/executor/key_single_subset.cpp
+++ b/core/sql/executor/key_single_subset.cpp
@@ -80,7 +80,6 @@ ExeErrorCode keySingleSubsetEx::initNextKeyRange(sql_buffer_pool *,atp_struct *)
return (ExeErrorCode)0;
};
-#pragma nowarn(770) // warning elimination
keyRangeEx::getNextKeyRangeReturnType keySingleSubsetEx::getNextKeyRange(
atp_struct *atp0,NABoolean /* fetchRangeHadRows */,
NABoolean detectNullRange)
@@ -247,12 +246,8 @@ keyRangeEx::getNextKeyRangeReturnType keySingleSubsetEx::getNextKeyRange(
// flags was set.
//
// str_cmp returns -1, 0, 1 for <, =, >
-#pragma nowarn(1506) // warning elimination
Int32 cmpCode = str_cmp(bktarget, ektarget,
-#pragma warn(1506) // warning elimination
-#pragma nowarn(1506) // warning elimination
tdbBeginEndKey().getKeyLength());
-#pragma warn(1506) // warning elimination
if (((detectNullRange) &&
(cmpCode > 0)) || // begin key > end key
((cmpCode == 0) &&
@@ -281,7 +276,6 @@ keyRangeEx::getNextKeyRangeReturnType keySingleSubsetEx::getNextKeyRange(
return rc;
};
-#pragma warn(770) // warning elimination
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/executor/sql_buffer.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/sql_buffer.cpp b/core/sql/executor/sql_buffer.cpp
index 3a2509b..14d1f46 100644
--- a/core/sql/executor/sql_buffer.cpp
+++ b/core/sql/executor/sql_buffer.cpp
@@ -86,9 +86,7 @@ void SqlBufferBase::init(ULng32 in_size_in_bytes,
NABoolean clear)
{
baseFlags_ = 0;
-#pragma nowarn(1506) // warning elimination
sizeInBytes_ = in_size_in_bytes;
-#pragma warn(1506) // warning elimination
SqlBufferHeader::init();
}
@@ -366,14 +364,12 @@ void SqlBuffer::printInfo() {
<< " freeSpace: " << freeSpace_;
Lng32 refcount = 0;
Lng32 firstref = -1;
-#pragma warning (disable : 4018) //warning elimination
for (Int32 i = 0; (i < maxTuppDesc_); i++)
if (tupleDesc(i)->getReferenceCount()) {
if (firstref == -1)
firstref = i;
refcount++;
};
-#pragma warning (default : 4018) //warning elimination
cerr << " ref tupps: " << refcount << " first: " << firstref << endl;
};
@@ -505,9 +501,7 @@ SqlBuffer::moveStatus SqlBuffer::moveInSendOrReplyData(NABoolean isSend,
{
if (controlInfoLen > 0)
{
-#pragma nowarn(1506) // warning elimination
cdesc = add_tuple_desc(controlInfoLen);
-#pragma warn(1506) // warning elimination
if (!cdesc)
{
@@ -556,7 +550,6 @@ SqlBuffer::moveStatus SqlBuffer::moveInSendOrReplyData(NABoolean isSend,
#endif
if (doMoveData == TRUE)
{
-#pragma nowarn(1506) // warning elimination
#ifndef UDRSERV_BUILD
if (defragTd &&
projRowLen > 0 &&
@@ -594,7 +587,6 @@ SqlBuffer::moveStatus SqlBuffer::moveInSendOrReplyData(NABoolean isSend,
-#pragma warn(1506) // warning elimination
if (! tdesc)
{
// no space to move data. Release the control
@@ -793,9 +785,7 @@ SqlBuffer::moveStatus SqlBuffer::moveInSendOrReplyData(NABoolean isSend,
{
// allocate space for diags area.
tupp_descriptor * tempDiagsDesc = add_tuple_desc(
-#pragma nowarn(1506) // warning elimination
diagsArea->packedLength());
-#pragma warn(1506) // warning elimination
if (tempDiagsDesc == NULL)
{
// don't have enough space in this input buffer for diags.
@@ -828,9 +818,7 @@ SqlBuffer::moveStatus SqlBuffer::moveInSendOrReplyData(NABoolean isSend,
ex_assert((tdesc == NULL), "Cannot have data with stats");
// allocate space for stats area.
-#pragma nowarn(1506) // warning elimination
*statsDesc = add_tuple_desc(statsArea->packedLength());
-#pragma warn(1506) // warning elimination
if (*statsDesc == NULL)
{
// don't have enough space in this input buffer for stats.
@@ -990,9 +978,7 @@ NABoolean SqlBuffer::moveOutSendOrReplyData(NABoolean isSend,
{
case NORMAL_:
{
-#pragma nowarn(1506) // warning elimination
tuppDesc = tupleDesc(tuppDescIndex_);
-#pragma warn(1506) // warning elimination
if (tuppDesc->isControlTuple())
{
@@ -1372,9 +1358,7 @@ NABoolean SqlBuffer::findAndCancel( queue_index pindex, NABoolean startFromBegin
// if so, change downstate.request to GET_NOMORE & return TRUE,
// if not found, return FALSE.
// save and restore tuppDescIndex_, regardless of outcome.
-#pragma nowarn(1506) // warning elimination
Lng32 saveTuppDescIndex = tuppDescIndex_;
-#pragma warn(1506) // warning elimination
NABoolean wasFound = FALSE;
if (startFromBeginning)
@@ -1636,17 +1620,14 @@ void SqlBufferNormal::printInfo() {
<< " maxTuppDesc: " << maxTuppDesc_
<< " freeSpace: " << freeSpace_
<< " numInvalidTuplesUptoCurrentPosition: " << numInvalidTuplesUptoCurrentPosition_ ;
-#pragma warn(161) // warning elimination
Lng32 refcount = 0;
Lng32 firstref = -1;
-#pragma warning (disable : 4018) //warning elimination
for (Int32 i = 0; (i < maxTuppDesc_); i++)
if (tupleDesc(i)->getReferenceCount()) {
if (firstref == -1)
firstref = i;
refcount++;
};
-#pragma warning (default : 4018) //warning elimination
cerr << " ref tupps: " << refcount << " first: " << firstref << endl;
};
@@ -1655,9 +1636,7 @@ void SqlBufferNormal::printInfo() {
tupp_descriptor * SqlBufferNormal::getNext()
{
if (tuppDescIndex_ < maxTuppDesc_)
-#pragma nowarn(1506) // warning elimination
return tupleDesc(tuppDescIndex_++);
-#pragma warn(1506) // warning elimination
else
return 0;
}
@@ -1667,9 +1646,7 @@ tupp_descriptor * SqlBufferNormal::getNext()
tupp_descriptor * SqlBufferNormal::getPrev()
{
if (tuppDescIndex_ > 0)
-#pragma nowarn(1506) // warning elimination
return tupleDesc(tuppDescIndex_--);
-#pragma warn(1506) // warning elimination
else
return 0;
}
@@ -1680,9 +1657,7 @@ tupp_descriptor * SqlBufferNormal::getPrev()
// Returns NULL, if tupp_desc_num is greater than maxTuppDesc_.
tupp_descriptor * SqlBufferNormal::getTuppDescriptor(Lng32 tupp_desc_num)
{
-#pragma warning (disable : 4018) //warning elimination
if (tupp_desc_num > maxTuppDesc_)
-#pragma warning (default : 4018) //warning elimination
return 0;
else
return tupleDesc(tupp_desc_num-1);
@@ -1790,9 +1765,7 @@ SqlBufferDense::SqlBufferDense() : SqlBuffer(DENSE_)
{
currTupleDesc() = NULL;
lastTupleDesc() = NULL;
-#pragma nowarn(161) // warning elimination
numInvalidTuplesUptoCurrentPosition_ = (unsigned short) NO_INVALID_TUPLES;
-#pragma warn(161) // warning elimination
str_pad(filler_, 2, '\0');
}
@@ -1804,9 +1777,7 @@ void SqlBufferDense::init(ULng32 in_size_in_bytes,
lastTupleDesc_ = NULL;
currTupleDesc_ = NULL;
-#pragma nowarn(161) // warning elimination
numInvalidTuplesUptoCurrentPosition_ = (unsigned short) NO_INVALID_TUPLES;
-#pragma warn(161) // warning elimination
str_pad(filler_, 2, '\0');
}
@@ -1817,9 +1788,7 @@ void SqlBufferDense::init()
lastTupleDesc_ = NULL;
currTupleDesc_ = NULL;
-#pragma nowarn(161) // warning elimination
numInvalidTuplesUptoCurrentPosition_ = (unsigned short) NO_INVALID_TUPLES;
-#pragma warn(161) // warning elimination
str_pad(filler_, 2, '\0');
}
@@ -1829,9 +1798,7 @@ tupp_descriptor *SqlBufferDense::add_tuple_desc(Lng32 tup_data_size)
ULng32 rounded_size = ROUND8(tup_data_size);
short td_size = ROUND8(sizeof(TupleDescInfo));
-#pragma nowarn(1506) // warning elimination
Lng32 freeSpaceNeeded = td_size + rounded_size;
-#pragma warn(1506) // warning elimination
if (freeSpace_ < freeSpaceNeeded) // no free space to allocate this tuple
return NULL;
@@ -1926,11 +1893,9 @@ void SqlBufferDense::position()
void SqlBufferDense::position(Lng32 tupp_desc_num)
{
position();
-#pragma warning (disable : 4018) //warning elimination
while ((tuppDescIndex_ != tupp_desc_num) &&
(tuppDescIndex_ < maxTuppDesc_))
advanceDense();
-#pragma warning (default : 4018) //warning elimination
}
// returns the 'next' tuple descriptor. Increments the
@@ -1969,10 +1934,8 @@ tupp_descriptor * SqlBufferDense::getPrev()
// Returns NULL, if tupp_desc_num is greater than maxTuppDesc_.
tupp_descriptor * SqlBufferDense::getTuppDescriptor(Lng32 tupp_desc_num)
{
-#pragma warning (disable : 4018) //warning elimination
if (tupp_desc_num > maxTuppDesc_)
return 0;
-#pragma warning (default : 4018) //warning elimination
else
return tupleDesc(tupp_desc_num-1);
}
@@ -2391,9 +2354,7 @@ short sql_buffer_pool::get_free_tuple(tupp &tp, Lng32 tupDataSize,
if (tupDataSize <= 0)
tupDataSize = 8;
-#pragma nowarn(1506) // warning elimination
Lng32 neededSpace = SqlBufferGetTuppSize(tupDataSize,bufType_);
-#pragma warn(1506) // warning elimination
SqlBuffer *currBuffer;
if (!(currBuffer =getCurrentBuffer(neededSpace)))
@@ -2462,9 +2423,7 @@ tupp_descriptor * sql_buffer_pool::get_free_tupp_descriptor(Lng32 tupDataSize,
if(buf)
*buf = NULL;
-#pragma nowarn(1506) // warning elimination
Lng32 neededSpace = SqlBufferGetTuppSize(tupDataSize,bufType_);
-#pragma warn(1506) // warning elimination
// get a buffer which is not FULL and can allocate tup_data_size
//SqlBuffer *currBuffer = (SqlBuffer*)getBuffer(neededSpace);
@@ -2611,7 +2570,6 @@ SqlBufferBase * sql_buffer_pool::getBuffer(Lng32 freeSpace,
// (guess that there are 10)
Lng32 neededStaticBufferSize;
-#pragma warning (disable : 4018) //warning elimination
if (freeSpace > 0)
neededStaticBufferSize =
MINOF((Lng32) SqlBufferNeededSize(
@@ -2619,7 +2577,6 @@ SqlBufferBase * sql_buffer_pool::getBuffer(Lng32 freeSpace,
freeSpace,
bufType_),
defaultBufferSize_);
-#pragma warning (default : 4018) //warning elimination
else
neededStaticBufferSize = defaultBufferSize_;
@@ -2948,14 +2905,11 @@ SqlBufferBase::moveStatus
// since we are not allocating a tupp desc to indicate the input
// row length, set this value in the sizeInBytes_ field.
-#pragma nowarn(1506) // warning elimination
sizeInBytes_ = sizeof(SqlBufferOltSmall) + projRowLen;
-#pragma warn(1506) // warning elimination
return MOVE_SUCCESS;
}
-#pragma nowarn(770) // warning elimination
SqlBufferBase::moveStatus
SqlBufferOlt::moveInReplyData(NABoolean doMoveControl,
NABoolean doMoveData,
@@ -3090,7 +3044,6 @@ SqlBufferBase::moveStatus
return MOVE_SUCCESS;
}
-#pragma warn(770) // warning elimination
SqlBufferBase::moveStatus
SqlBufferOlt::moveInSendOrReplyData(NABoolean isSend,
@@ -3213,9 +3166,7 @@ SqlBufferBase::moveStatus
setContents(ERROR_);
// allocate space for error diags area.
-#pragma nowarn(1506) // warning elimination
tdesc = getNextTuppDesc(NULL, diagsArea->packedLength());
-#pragma warn(1506) // warning elimination
}
else
{
@@ -3253,9 +3204,7 @@ SqlBufferBase::moveStatus
}
// move diags area plus warning(s)
-#pragma nowarn(1506) // warning elimination
tdesc = getNextTuppDesc(tdesc, diagsArea->packedLength());
-#pragma warn(1506) // warning elimination
switch (getContents())
{
@@ -3282,9 +3231,7 @@ SqlBufferBase::moveStatus
if ((doMoveStats) && (statsArea != NULL))
{
// allocate space for stats area.
-#pragma nowarn(1506) // warning elimination
tdesc = getNextTuppDesc(tdesc, statsArea->packedLength());
-#pragma warn(1506) // warning elimination
if (statsDesc)
*statsDesc = tdesc;
@@ -3461,28 +3408,20 @@ NABoolean SqlBufferOltSmall::moveOutReplyData(void * currQState,
short statsAreaLen = 0;
if ((replyData()) || (replyStats()))
{
-#pragma nowarn(1506) // warning elimination
dataLoc = (Long)this + sizeof(SqlBufferOltSmall);
-#pragma warn(1506) // warning elimination
if (replyData())
{
replyDataLoc = dataLoc;
if (replyStats())
-#pragma nowarn(1506) // warning elimination
dataLoc = dataLoc + ROUND2(returnedRowLen);
-#pragma warn(1506) // warning elimination
else
-#pragma nowarn(1506) // warning elimination
dataLoc = dataLoc + ROUND4(returnedRowLen);
-#pragma warn(1506) // warning elimination
}
if (replyStats())
{
statsAreaLen = *(short*)dataLoc;
-#pragma nowarn(1506) // warning elimination
statsAreaLoc = dataLoc + sizeof(short);
-#pragma warn(1506) // warning elimination
// statsAreaLoc = ROUND8(statsAreaLoc);
dataLoc = statsAreaLoc + ROUND8(statsAreaLen);
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/executor/sql_buffer.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/sql_buffer.h b/core/sql/executor/sql_buffer.h
index 09f59f5..ddfa40f 100644
--- a/core/sql/executor/sql_buffer.h
+++ b/core/sql/executor/sql_buffer.h
@@ -235,7 +235,6 @@ private:
};
};
-#pragma nowarn(1506) // warning elimination
class SqlBufferBase : public SqlBufferHeader
{
public:
@@ -463,7 +462,6 @@ protected:
Lng32 sizeInBytes_; // total size of the buffer
};
-#pragma warn(1506) // warning elimination
/*
unsigned long SqlBufferNeededSize(long numTuples = 0,
@@ -475,7 +473,6 @@ unsigned long SqlBufferNeededSize(long numTuples = 0,
////////////////////////////////////////////////////////////////
// class SqlBuffer
////////////////////////////////////////////////////////////////
-#pragma nowarn(1506) // warning elimination
class SqlBuffer : public SqlBufferBase
{
public:
@@ -790,7 +787,6 @@ private:
Int32 setupSrControlInfo( NABoolean isSend, tupp_descriptor *tuppDesc );
};
-#pragma warn(1506) // warning elimination
/////////////////////////////////////////////////////////////////////
// class SqlBufferNormal
@@ -1120,10 +1116,8 @@ private:
virtual tupp_descriptor * tupleDesc(Int32 i)
{
-#pragma warning(disable : 4018) //warning elimination
if (i >= maxTuppDesc_)
return NULL;
-#pragma warning(default : 4018) //warning elimination
TupleDescInfo * tdi = firstTupleDesc();
for (Int32 j = 0; j < i; j++)
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/executor/timeout_data.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/timeout_data.cpp b/core/sql/executor/timeout_data.cpp
index 759b0e6..9f134e2 100644
--- a/core/sql/executor/timeout_data.cpp
+++ b/core/sql/executor/timeout_data.cpp
@@ -414,9 +414,7 @@ NABoolean TimeoutData::anyRelevantTimeoutData( ComTdbRoot * rootTdb )
// now check each individual table used by this statement
for (UInt32 ui = 0; ui < lnil->getNumEntries(); ui++) {
-#pragma nowarn(1506) // warning elimination
char * tableName = lnil->getLateNameInfo(ui).resolvedPhyName();
-#pragma warn(1506) // warning elimination
Lng32 dummyTimeoutValue;
if ( timeoutsHT_.getTimeout( tableName, dummyTimeoutValue ) ) return TRUE ;
}
@@ -449,9 +447,7 @@ void TimeoutData::copyData( TimeoutData ** anotherTD,
// check for each table (used by this stmt) in the global hash array
// if found -- make such an entry in the other TD's array
for (UInt32 ui = 0; ui < lnil->getNumEntries(); ui++) {
-#pragma nowarn(1506) // warning elimination
char * tableName = lnil->getLateNameInfo(ui).resolvedPhyName();
-#pragma warn(1506) // warning elimination
Lng32 timeoutValue;
if ( timeoutsHT_.getTimeout( tableName, timeoutValue ) )
(*anotherTD)->timeoutsHT_.insert( tableName, timeoutValue ) ;
@@ -486,9 +482,7 @@ NABoolean TimeoutData::isUpToDate( TimeoutData * anotherTD ,
// check timeout similarity for each table (used by this stmt)
for (UInt32 ui = 0; ui < lnil->getNumEntries(); ui++) {
-#pragma nowarn(1506) // warning elimination
char * tableName = lnil->getLateNameInfo(ui).resolvedPhyName();
-#pragma warn(1506) // warning elimination
Lng32 globalTimeoutValue = 0 , stmtTimeoutValue = 0 ;
NABoolean globalFound =
timeoutsHT_.getTimeout( tableName, globalTimeoutValue );
@@ -544,18 +538,14 @@ void TimeoutData::unpackObj(IpcConstMessageBufferPtr &buffer)
ULng32 flags = *(ULng32 *) buffer;
buffer += sizeof(ULng32);
-#pragma nowarn(1506) // warning elimination
streamTimeoutSet_ = flags & 0x01 ;
-#pragma warn(1506) // warning elimination
if ( streamTimeoutSet_ ) {
streamTimeoutValue_ = *(Lng32 *) buffer;
buffer += sizeof(Lng32);
}
noLockTimeoutsSet_ = ! ( flags & 0x02 );
-#pragma nowarn(1506) // warning elimination
forAll_ = flags & 0x04 ;
-#pragma warn(1506) // warning elimination
if ( ! noLockTimeoutsSet_ && forAll_ ) {
forAllTimeout_ = *(Lng32 *) buffer;
buffer += sizeof(Lng32);
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/exp/ExpAtp.cpp
----------------------------------------------------------------------
diff --git a/core/sql/exp/ExpAtp.cpp b/core/sql/exp/ExpAtp.cpp
index d183232..5de3263 100644
--- a/core/sql/exp/ExpAtp.cpp
+++ b/core/sql/exp/ExpAtp.cpp
@@ -48,9 +48,7 @@ atp_struct * allocateAtp(ex_cri_desc * criDesc, CollHeap * space)
// Allocate space for the atp_struct (which has room for one tupp in
// the tupp array) plus room for the remainder of the tupps.
//
-#pragma nowarn(1506) // warning elimination
Int32 atp_size = sizeof(atp_struct) + (criDesc->noTuples()-1) * sizeof(tupp);
-#pragma warn(1506) // warning elimination
atp_struct * atp;
atp = (atp_struct *) space->allocateMemory(atp_size);
@@ -106,9 +104,7 @@ atp_struct * allocateAtp(Lng32 numTuples, CollHeap * space)
// Allocate space for the atp_struct (which has room for one tupp in
// the tupp array) plus room for the remainder of the tupps.
//
-#pragma nowarn(1506) // warning elimination
Int32 atp_size = sizeof(atp_struct) + (numTuples-1) * sizeof(tupp);
-#pragma warn(1506) // warning elimination
atp_struct * atp;
atp = (atp_struct *) space->allocateMemory(atp_size);
@@ -147,11 +143,7 @@ atp_struct * allocateAtpArray(
// Alocate space for the atp_struct (which has room for one tupp in
// the tupp array) plus room for the remainder of the tupps,
// times the count requested.
-#pragma nowarn(1506) // warning elimination
*atpSize = sizeof(atp_struct) + numTuples * sizeof(tupp);
-#pragma warn(1506) // warning elimination
-#pragma nowarn(1506) // warning elimination
-#pragma warn(1506) // warning elimination
char *atpSpace = (char *) space->allocateMemory(*atpSize * cnt, failureIsFatal);
if (atpSpace == NULL)
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/exp/ExpAtp.h
----------------------------------------------------------------------
diff --git a/core/sql/exp/ExpAtp.h b/core/sql/exp/ExpAtp.h
index fed7a14..2e35ee4 100644
--- a/core/sql/exp/ExpAtp.h
+++ b/core/sql/exp/ExpAtp.h
@@ -67,7 +67,6 @@ class ExStatisticsArea;
// The first member of the array is actually a pointer to the composite row
// descriptor.
-#pragma warning ( disable : 4251 )
class atp_struct
{
@@ -133,7 +132,6 @@ class atp_struct
// are allocated, then the length is 3
};
-#pragma warning ( default : 4251 )
// Constructor of an Atp given a cri descriptor. Can't make it a simple
// constructor since we need to allocate a variable length array. In
@@ -289,9 +287,7 @@ inline void atp_struct::copyPartialAtp(atp_struct * from,
inline void atp_struct::copyPartialAtp(atp_struct * from)
{
-#pragma nowarn(1506) // warning elimination
copyPartialAtp(from, 0, from->numTuples()-1);
-#pragma warn(1506) // warning elimination
}
// De-initialize atp. deallocation is done elsewhere
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/exp/ExpBitMuxFunction.cpp
----------------------------------------------------------------------
diff --git a/core/sql/exp/ExpBitMuxFunction.cpp b/core/sql/exp/ExpBitMuxFunction.cpp
index 66b407e..4d1dafc 100644
--- a/core/sql/exp/ExpBitMuxFunction.cpp
+++ b/core/sql/exp/ExpBitMuxFunction.cpp
@@ -60,7 +60,6 @@
// : The space object is valid.
// PSTCOND: ExpBitMuxFunction is constructed.
//
-#pragma nowarn(1506) // warning elimination
ExpBitMuxFunction::ExpBitMuxFunction(OperatorTypeEnum oper_type, Int32 arity,
Attributes ** attr, Space * space)
: ex_function_clause(oper_type, arity, attr, space) {
@@ -77,7 +76,6 @@ ExpBitMuxFunction::ExpBitMuxFunction(OperatorTypeEnum oper_type, Int32 arity,
"ExpBitMuxFunction - NULL space pointer");
#endif
};
-#pragma warn(1506) // warning elimination
// ExpBitMuxFunction::~ExpBitMuxFunction
//
@@ -179,9 +177,7 @@ ex_expr::exp_return_type ExpBitMuxFunction::pCodeGenerate(Space *space, UInt32 f
// Load and store each input value.
//
-#pragma nowarn(1506) // warning elimination
Int32 offset = attrs[0]->getOffset();
-#pragma warn(1506) // warning elimination
AML aml(PCIT::MBIN8, PCIT::MBIN8, PCIT::IBIN32S);
for(i=1; i<numOperands; i++) {
if(attrs[i]->getNullFlag())
@@ -195,11 +191,9 @@ ex_expr::exp_return_type ExpBitMuxFunction::pCodeGenerate(Space *space, UInt32 f
offset += 2;
}
-#pragma nowarn(1506) // warning elimination
OL ol(attrs[0]->getAtp(), attrs[0]->getAtpIndex(), offset,
attrs[i]->getAtp(), attrs[i]->getAtpIndex(), attrs[i]->getOffset(),
attrs[i]->getLength());
-#pragma warn(1506) // warning elimination
PCI pci(PCIT::Op_MOVE, aml, ol);
code.append(pci);
offset += attrs[i]->getLength();
@@ -290,12 +284,8 @@ ex_expr::exp_return_type ExpBitMuxFunction::eval(char *op_data[],
dataLength--;
}
-#pragma nowarn(1506) // warning elimination
*((short*)dstData) = dataLength;
-#pragma warn(1506) // warning elimination
-#pragma nowarn(1506) // warning elimination
dstData += 2;
-#pragma warn(1506) // warning elimination
} // source is a VARCHAR
// If the attribute is NULL, then NULL out the data space.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/exp/ExpBitMuxFunction.h
----------------------------------------------------------------------
diff --git a/core/sql/exp/ExpBitMuxFunction.h b/core/sql/exp/ExpBitMuxFunction.h
index 71a415b..5542fab 100644
--- a/core/sql/exp/ExpBitMuxFunction.h
+++ b/core/sql/exp/ExpBitMuxFunction.h
@@ -79,7 +79,6 @@ class ExpBitMuxFunction;
// expression evaluation engine -- a large performance gain.
//
-#pragma warning ( disable : 4251 )
// ExpBitMuxFunction declaration
//
@@ -143,7 +142,6 @@ private:
};
-#pragma warning ( default : 4251 )
#endif
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/exp/ExpConvMxcs.cpp
----------------------------------------------------------------------
diff --git a/core/sql/exp/ExpConvMxcs.cpp b/core/sql/exp/ExpConvMxcs.cpp
index c116550..82be17a 100644
--- a/core/sql/exp/ExpConvMxcs.cpp
+++ b/core/sql/exp/ExpConvMxcs.cpp
@@ -401,9 +401,7 @@ static short convInt64ToDecMxcs(char *target, Lng32 targetLen, Int64 source)
return EXE_STRING_OVERFLOW;
};
-#pragma nowarn(1506) // warning elimination
target[currPos--] = '0' + (char)(source % 10);
-#pragma warn(1506) // warning elimination
source /= 10;
};
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/exp/ExpCriDesc.h
----------------------------------------------------------------------
diff --git a/core/sql/exp/ExpCriDesc.h b/core/sql/exp/ExpCriDesc.h
index ffb7859..bef6dda 100644
--- a/core/sql/exp/ExpCriDesc.h
+++ b/core/sql/exp/ExpCriDesc.h
@@ -62,7 +62,6 @@ typedef NAVersionedObjectPtrTempl<ex_cri_desc> ExCriDescPtr;
// pointers. The cri_desc describes the each of the tupps pointed to.
//
-#pragma warning( disable : 4251 )
class ex_cri_desc : public NAVersionedObject
{
@@ -115,7 +114,6 @@ public:
// ---------------------------------------------------------------------
}; // descriptor for cri
-#pragma warning( default : 4251 )
inline unsigned short ex_cri_desc::noTuples() const
{
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/exp/ExpPCode.h
----------------------------------------------------------------------
diff --git a/core/sql/exp/ExpPCode.h b/core/sql/exp/ExpPCode.h
index a39334d..97a853b 100644
--- a/core/sql/exp/ExpPCode.h
+++ b/core/sql/exp/ExpPCode.h
@@ -116,7 +116,6 @@ public:
//
// this class contains the actual byte code
-#pragma warning ( disable : 4251 )
class PCodeSegment : public NAVersionedObject {
public:
PCodeSegment(PCodeBinary* pcode = 0);
@@ -184,7 +183,6 @@ private:
};
-#pragma warning ( default : 4251 )
// PCode
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/exp/ExpPCodeClauseGen.cpp
----------------------------------------------------------------------
diff --git a/core/sql/exp/ExpPCodeClauseGen.cpp b/core/sql/exp/ExpPCodeClauseGen.cpp
index e181cff..92e7fb2 100644
--- a/core/sql/exp/ExpPCodeClauseGen.cpp
+++ b/core/sql/exp/ExpPCodeClauseGen.cpp
@@ -293,12 +293,10 @@ ex_expr::exp_return_type ex_aggr_min_max_clause::pCodeGenerate(Space *space, UIn
// Fourth operand is the length of first operand. Data for this length
// will be moved to result as the nee min/max value.
AML aml(PCIT::MBIN8,PCIT::MBIN8,PCIT::MBIN32S,PCIT::IBIN32S);
-#pragma nowarn(1506) // warning elimination
OL ol(attrs[0]->getAtp(), attrs[0]->getAtpIndex(), attrs[0]->getOffset(),
attrs[1]->getAtp(), attrs[1]->getAtpIndex(), attrs[1]->getOffset(),
attrs[2]->getAtp(), attrs[2]->getAtpIndex(), attrs[2]->getOffset(),
attrs[1]->getLength());
-#pragma warn(1506) // warning elimination
PCI pci(PCIT::Op_MINMAX, aml, ol);
code.append(pci);
@@ -497,12 +495,10 @@ ex_expr::exp_return_type ex_function_encode::pCodeGenerate(Space *space, UInt32
PCIT::getMemoryAddressingMode(attrs1Datatype),
PCIT::IBIN32S,
PCIT::IBIN32S);
-#pragma nowarn(1506) // warning elimination
OL ol(tgt->getAtp(), tgt->getAtpIndex(),tgt->getOffset(),
src->getAtp(), src->getAtpIndex(),src->getOffset(),
tgt->getLength(),
(isDesc()));
-#pragma warn(1506) // warning elimination
// Add the encode instruction.
//
@@ -527,11 +523,9 @@ ex_expr::exp_return_type ex_function_encode::pCodeGenerate(Space *space, UInt32
AML aml(PCIT::getMemoryAddressingMode(tgt->getDatatype()),
PCIT::getMemoryAddressingMode(src->getDatatype()),
PCIT::IBIN32S);
-#pragma nowarn(1506) // warning elimination
OL ol(tgt->getAtp(), tgt->getAtpIndex(),tgt->getOffset(),
src->getAtp(), src->getAtpIndex(),src->getOffset(),
(isDesc()));
-#pragma warn(1506) // warning elimination
// Add the encode instruction.
//
@@ -634,11 +628,9 @@ ex_expr::exp_return_type ex_bool_clause::pCodeGenerate(Space *space, UInt32 f) {
// The third operand is the memory location of the 2nd argument.
//
AML aml(PCIT::MBIN32S, PCIT::MBIN32S, PCIT::MBIN32S);
-#pragma nowarn(1506) // warning elimination
OL ol(attrs[0]->getAtp(), attrs[0]->getAtpIndex(), attrs[0]->getOffset(),
attrs[1]->getAtp(), attrs[1]->getAtpIndex(), attrs[1]->getOffset(),
attrs[2]->getAtp(), attrs[2]->getAtpIndex(), attrs[2]->getOffset());
-#pragma warn(1506) // warning elimination
// Generate the instruction
//
@@ -688,9 +680,7 @@ ex_expr::exp_return_type bool_result_clause::pCodeGenerate(Space *space, UInt32
// The first operand is the memory location of the boolean return value.
//
AML aml(PCIT::MBIN32S);
-#pragma nowarn(1506) // warning elimination
OL ol(attrs[0]->getAtp(), attrs[0]->getAtpIndex(), attrs[0]->getOffset());
-#pragma warn(1506) // warning elimination
// Add the return instruction.
//
@@ -1174,12 +1164,10 @@ ex_expr::exp_return_type ex_comp_clause::pCodeGenerate(Space *space, UInt32 f) {
PCIT::IBIN32S,
PCIT::IBIN32S);
-#pragma nowarn(1506) // warning elimination
OL ol(attrs[0]->getAtp(), attrs[0]->getAtpIndex(), attrs[0]->getOffset(),
attrs[1]->getAtp(), attrs[1]->getAtpIndex(), attrs[1]->getOffset(),
attrs[2]->getAtp(), attrs[2]->getAtpIndex(), attrs[2]->getOffset(),
attrs[2]->getLength(), (Int32)getOperType());
-#pragma nowarn(1506) // warning elimination
// Add the comparison instruction.
//
@@ -1494,10 +1482,8 @@ ex_expr::exp_return_type ex_function_bool::pCodeGenerate(Space *space, UInt32 f)
// Second operand is the immediate value to store in the result
//
AML aml(PCIT::MBIN32S, PCIT::IBIN32S);
-#pragma nowarn(1506) // warning elimination
OL ol(attrs[0]->getAtp(), attrs[0]->getAtpIndex(), attrs[0]->getOffset(),
returnValue);
-#pragma warn(1506) // warning elimination
// Add the move instruction.
//
@@ -1743,11 +1729,9 @@ ex_expr::exp_return_type ex_function_hash::pCodeGenerate(Space *space, UInt32 f)
UInt32 flags = ExHDPHash::NO_FLAGS;
AML aml(PCIT::MBIN32U, oper, PCIT::IBIN32S, PCIT::IBIN32S);
-#pragma nowarn(1506) // warning elimination
OL ol(attrs[0]->getAtp(), attrs[0]->getAtpIndex(), attrs[0]->getOffset(),
attrs[1]->getAtp(), attrs[1]->getAtpIndex(), attrs[1]->getOffset(),
flags, attrs[1]->getLength());
-#pragma warn(1506) // warning elimination
PCI pci(PCIT::Op_HASH, aml, ol);
code.append( pci);
}
@@ -1811,11 +1795,9 @@ ex_expr::exp_return_type ExHDPHashComb::pCodeGenerate(Space *space, UInt32 f) {
AML aml(PCIT::getMemoryAddressingMode(attrs[0]->getDatatype()),
PCIT::getMemoryAddressingMode(attrs[1]->getDatatype()),
PCIT::getMemoryAddressingMode(attrs[2]->getDatatype()));
-#pragma nowarn(1506) // warning elimination
OL ol(attrs[0]->getAtp(), attrs[0]->getAtpIndex(), attrs[0]->getOffset(),
attrs[1]->getAtp(), attrs[1]->getAtpIndex(), attrs[1]->getOffset(),
attrs[2]->getAtp(), attrs[2]->getAtpIndex(), attrs[2]->getOffset());
-#pragma warn(1506) // warning elimination
// Generate the operator
//
@@ -1875,11 +1857,9 @@ ex_expr::exp_return_type ExHashComb::pCodeGenerate(Space *space, UInt32 f) {
AML aml(PCIT::getMemoryAddressingMode(attrs[0]->getDatatype()),
PCIT::getMemoryAddressingMode(attrs[1]->getDatatype()),
PCIT::getMemoryAddressingMode(attrs[2]->getDatatype()));
-#pragma nowarn(1506) // warning elimination
OL ol(attrs[0]->getAtp(), attrs[0]->getAtpIndex(), attrs[0]->getOffset(),
attrs[1]->getAtp(), attrs[1]->getAtpIndex(), attrs[1]->getOffset(),
attrs[2]->getAtp(), attrs[2]->getAtpIndex(), attrs[2]->getOffset());
-#pragma warn(1506) // warning elimination
// Generate the operator
//
@@ -3134,11 +3114,9 @@ ex_expr::exp_return_type ex_conv_clause::pCodeGenerate(Space *space, UInt32 f) {
case CONV_BOOL_BOOL:
{
AML aml(PCIT::MBIN8, PCIT::MBIN8, PCIT::IBIN32S);
-#pragma nowarn(1506) // warning elimination
OL ol(dst->getAtp(), dst->getAtpIndex(), dst->getOffset(),
src->getAtp(), src->getAtpIndex(), src->getOffset(),
dst->getLength());
-#pragma warn(1506) // warning elimination
PCI pci(PCIT::Op_MOVE, aml, ol);
code.append(pci);
}
@@ -3158,15 +3136,11 @@ ex_expr::exp_return_type ex_conv_clause::pCodeGenerate(Space *space, UInt32 f) {
#ifdef NA_LITTLE_ENDIAN
Int32 srcOffset = src->getOffset();
#else
-#pragma nowarn(1506) // warning elimination
Int32 srcOffset = src->getOffset() + src->getLength() - dst->getLength();
-#pragma warn(1506) // warning elimination
#endif
-#pragma nowarn(1506) // warning elimination
OL ol(dst->getAtp(), dst->getAtpIndex(), dst->getOffset(),
src->getAtp(), src->getAtpIndex(), srcOffset,
dst->getLength());
-#pragma warn(1506) // warning elimination
PCI pci(PCIT::Op_MOVE, aml, ol);
code.append(pci);
}
@@ -3180,11 +3154,9 @@ ex_expr::exp_return_type ex_conv_clause::pCodeGenerate(Space *space, UInt32 f) {
AML aml(PCIT::getMemoryAddressingMode(dst->getDatatype()),
PCIT::getMemoryAddressingMode(src->getDatatype()),
PCIT::IBIN32S);
-#pragma nowarn(1506) // warning elimination
OL ol(dst->getAtp(), dst->getAtpIndex(), dst->getOffset(),
src->getAtp(), src->getAtpIndex(), src->getOffset(),
dst->getPrecision());
-#pragma warn(1506) // warning elimination
PCI pci(PCIT::Op_MOVE, aml, ol);
code.append(pci);
}
@@ -3199,11 +3171,9 @@ ex_expr::exp_return_type ex_conv_clause::pCodeGenerate(Space *space, UInt32 f) {
AML aml(PCIT::getMemoryAddressingMode(dst->getDatatype()),
PCIT::getMemoryAddressingMode(src->getDatatype()),
PCIT::IBIN32S);
-#pragma nowarn(1506) // warning elimination
OL ol(dst->getAtp(), dst->getAtpIndex(), dst->getOffset(),
src->getAtp(), src->getAtpIndex(), src->getOffset(),
dst->getPrecision());
-#pragma warn(1506) // warning elimination
PCI pci(PCIT::Op_MOVE, aml, ol);
code.append(pci);
}
@@ -3213,12 +3183,10 @@ ex_expr::exp_return_type ex_conv_clause::pCodeGenerate(Space *space, UInt32 f) {
PCIT::IBIN32S,
PCIT::getMemoryAddressingMode(src->getDatatype()),
PCIT::IBIN32S, PCIT::IBIN32S);
-#pragma nowarn(1506) // warning elimination
OL ol(dst->getAtp(), dst->getAtpIndex(), dst->getOffset(),
dst->getPrecision(),
src->getAtp(), src->getAtpIndex(), src->getOffset(),
src->getPrecision(), dst->getScale() - src->getScale());
-#pragma warn(1506) // warning elimination
PCI pci(PCIT::Op_MOVE, aml, ol);
code.append(pci);
}
@@ -3230,13 +3198,9 @@ ex_expr::exp_return_type ex_conv_clause::pCodeGenerate(Space *space, UInt32 f) {
AML aml(PCIT::getMemoryAddressingMode(dst->getDatatype()),
PCIT::getMemoryAddressingMode(src->getDatatype()),
PCIT::IBIN32S);
-#pragma nowarn(1506) // warning elimination
OL ol(dst->getAtp(), dst->getAtpIndex(), dst->getOffset(),
-#pragma warn(1506) // warning elimination
-#pragma nowarn(1506) // warning elimination
src->getAtp(), src->getAtpIndex(), src->getOffset(),
src->getLength());
-#pragma warn(1506) // warning elimination
PCI pci(PCIT::Op_MOVE, aml, ol);
code.append(pci);
}
@@ -3574,7 +3538,6 @@ ex_expr::exp_return_type ex_function_mod::pCodeGenerate(Space *space, UInt32 f)
AML aml(PCIT::getMemoryAddressingMode(attrs[0]->getDatatype()),
PCIT::getMemoryAddressingMode(attrs[1]->getDatatype()),
PCIT::getMemoryAddressingMode(attrs[2]->getDatatype()));
-#pragma nowarn(1506) // warning elimination
OL ol(attrs[0]->getAtp(), attrs[0]->getAtpIndex(), attrs[0]->getOffset(),
attrs[1]->getAtp(), attrs[1]->getAtpIndex(), attrs[1]->getOffset(),
attrs[2]->getAtp(), attrs[2]->getAtpIndex(), attrs[2]->getOffset());
@@ -3597,7 +3560,6 @@ ex_expr::exp_return_type ex_function_mod::pCodeGenerate(Space *space, UInt32 f)
return ex_expr::EXPR_OK;
}
-#pragma warn(1506) // warning elimination
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/exp/ExpPCodeExpGen.cpp
----------------------------------------------------------------------
diff --git a/core/sql/exp/ExpPCodeExpGen.cpp b/core/sql/exp/ExpPCodeExpGen.cpp
index e28030e..3914741 100644
--- a/core/sql/exp/ExpPCodeExpGen.cpp
+++ b/core/sql/exp/ExpPCodeExpGen.cpp
@@ -826,17 +826,13 @@ ex_expr::exp_return_type ex_expr::pCodeGenerate(Space * space,
//
for(i=0; i<numOps; i++) {
if(tuppMap[i] && (atpIndexMap[i] > 1)) {
-#pragma nowarn(1506) // warning elimination
tuppMap[i] = opNum + 4;
-#pragma warn(1506) // warning elimination
atpMap[opNum] = atpMap[i];
atpIndexMap[opNum] = atpIndexMap[i];
opNum++;
} else if(tuppMap[i]) {
if(atpMap[i] == 0)
-#pragma nowarn(1506) // warning elimination
tuppMap[i] = atpIndexMap[i] + 1;
-#pragma warn(1506) // warning elimination
else
tuppMap[i] = 3;
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/exp/ExpSequenceFunction.cpp
----------------------------------------------------------------------
diff --git a/core/sql/exp/ExpSequenceFunction.cpp b/core/sql/exp/ExpSequenceFunction.cpp
index b64e323..5e949a1 100644
--- a/core/sql/exp/ExpSequenceFunction.cpp
+++ b/core/sql/exp/ExpSequenceFunction.cpp
@@ -65,9 +65,7 @@
ExpSequenceFunction::ExpSequenceFunction
(OperatorTypeEnum oper_type, Int32 arity, Int32 index,
Attributes ** attr, Space * space)
-#pragma nowarn(1506) // warning elimination
: ex_function_clause(oper_type, arity, attr, space), offsetIndex_(index), flags_(0) {
-#pragma warn(1506) // warning elimination
};
// ExpSequenceFunction::ExpSequenceFunction
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/exp/ExpSqlTupp.h
----------------------------------------------------------------------
diff --git a/core/sql/exp/ExpSqlTupp.h b/core/sql/exp/ExpSqlTupp.h
index 9fe0dc7..3b97626 100644
--- a/core/sql/exp/ExpSqlTupp.h
+++ b/core/sql/exp/ExpSqlTupp.h
@@ -92,7 +92,6 @@ public:
};
-#pragma nowarn(1506) // warning elimination
class tupp_descriptor
{
@@ -269,7 +268,6 @@ void resetCommFlags()
};
-#pragma warn(1506) // warning elimination
//
@@ -388,9 +386,7 @@ inline char * tupp::getDataPointer() const
inline unsigned short tupp::getRefCount() const
{
-#pragma nowarn(1506) // warning elimination
return tuppDescPointer ? tuppDescPointer->getReferenceCount() : 0;
-#pragma warn(1506) // warning elimination
};
inline ULng32 tupp::getAllocatedSize() const
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/exp/exp_aggregate.cpp
----------------------------------------------------------------------
diff --git a/core/sql/exp/exp_aggregate.cpp b/core/sql/exp/exp_aggregate.cpp
index 60e5ea4..ba1addf 100644
--- a/core/sql/exp/exp_aggregate.cpp
+++ b/core/sql/exp/exp_aggregate.cpp
@@ -265,9 +265,7 @@ ex_expr::exp_return_type ex_aggr_min_max_clause::eval(char * op_data[],
{
// variable length operand. Note that first child (operand1)
// and result have the SAME attributes for min/max aggr.
-#pragma nowarn(1506) // warning elimination
Lng32 src_length = getOperand(1)->getLength(op_data[-MAX_OPERANDS + 1]);
-#pragma warn(1506) // warning elimination
Lng32 tgt_length = getOperand(0)->getLength(); // max varchar length
str_cpy_all(op_data[0], op_data[1], src_length);
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/exp/exp_arith.cpp
----------------------------------------------------------------------
diff --git a/core/sql/exp/exp_arith.cpp b/core/sql/exp/exp_arith.cpp
index b229d09..efe9b92 100644
--- a/core/sql/exp/exp_arith.cpp
+++ b/core/sql/exp/exp_arith.cpp
@@ -655,9 +655,7 @@ ex_expr::exp_return_type ex_arith_clause::eval(char *op_data[],
{
/* ADD operation */
case ADD_BIN16S_BIN16S_BIN16S:
-#pragma nowarn(1506) // warning elimination
*(short *)op_data[0] = *(short *)op_data[1] + *(short *)op_data[2];
-#pragma warn(1506) // warning elimination
break;
case ADD_BIN16S_BIN16S_BIN32S:
*(Lng32 *)op_data[0] = *(short *)op_data[1] + *(short *)op_data[2];
@@ -694,9 +692,7 @@ ex_expr::exp_return_type ex_arith_clause::eval(char *op_data[],
break;
case ADD_BIN16U_BIN16U_BIN16U:
-#pragma nowarn(1506) // warning elimination
*(unsigned short *)op_data[0] = *(unsigned short *)op_data[1] + *(unsigned short *)op_data[2];
-#pragma warn(1506) // warning elimination
break;
case ADD_BIN16U_BIN16U_BIN32U:
*(ULng32 *)op_data[0] = *(unsigned short *)op_data[1] + *(unsigned short *)op_data[2];
@@ -769,9 +765,7 @@ ex_expr::exp_return_type ex_arith_clause::eval(char *op_data[],
/* SUB operation */
case SUB_BIN16S_BIN16S_BIN16S:
-#pragma nowarn(1506) // warning elimination
*(short *)op_data[0] = *(short *)op_data[1] - *(short *)op_data[2];
-#pragma warn(1506) // warning elimination
break;
case SUB_BIN16S_BIN16S_BIN32S:
*(Lng32 *)op_data[0] = *(short *)op_data[1] - *(short *)op_data[2];
@@ -802,9 +796,7 @@ ex_expr::exp_return_type ex_arith_clause::eval(char *op_data[],
break;
case SUB_BIN16U_BIN16U_BIN16U:
-#pragma nowarn(1506) // warning elimination
*(unsigned short *)op_data[0] = *(unsigned short *)op_data[1] - *(unsigned short *)op_data[2];
-#pragma warn(1506) // warning elimination
break;
case SUB_BIN16U_BIN16U_BIN32U:
*(ULng32 *)op_data[0] = *(unsigned short *)op_data[1] - *(unsigned short *)op_data[2];
@@ -862,9 +854,7 @@ ex_expr::exp_return_type ex_arith_clause::eval(char *op_data[],
/* MUL operation */
case MUL_BIN16S_BIN16S_BIN16S:
-#pragma nowarn(1506) // warning elimination
*(short *)op_data[0] = *(short *)op_data[1] * *(short *)op_data[2];
-#pragma warn(1506) // warning elimination
break;
case MUL_BIN16S_BIN16S_BIN32S:
*(Lng32 *)op_data[0] = *(short *)op_data[1] * *(short *)op_data[2];
@@ -903,9 +893,7 @@ ex_expr::exp_return_type ex_arith_clause::eval(char *op_data[],
break;
case MUL_BIN16U_BIN16U_BIN16U:
-#pragma nowarn(1506) // warning elimination
*(unsigned short *)op_data[0] = *(unsigned short *)op_data[1] * *(unsigned short *)op_data[2];
-#pragma warn(1506) // warning elimination
break;
case MUL_BIN16U_BIN16U_BIN32U:
*(ULng32 *)op_data[0] = *(unsigned short *)op_data[1] * *(unsigned short *)op_data[2];
@@ -944,9 +932,7 @@ ex_expr::exp_return_type ex_arith_clause::eval(char *op_data[],
ExRaiseSqlError(heap, diagsArea, EXE_DIVISION_BY_ZERO);
return ex_expr::EXPR_ERROR;
}
-#pragma nowarn(1506) // warning elimination
*(short *)op_data[0] = *(short *)op_data[1] / *(short *)op_data[2];
-#pragma warn(1506) // warning elimination
break;
case DIV_BIN16S_BIN16S_BIN32S:
if (*(short *)op_data[2] == 0) {
@@ -1248,9 +1234,7 @@ ex_expr::exp_return_type ex_arith_clause::eval(char *op_data[],
ExRaiseSqlError(heap, diagsArea, EXE_DIVISION_BY_ZERO);
return ex_expr::EXPR_ERROR;
}
-#pragma nowarn(1506) // warning elimination
*(unsigned short *)op_data[0] = *(unsigned short *)op_data[1] / *(unsigned short *)op_data[2];
-#pragma warn(1506) // warning elimination
break;
case DIV_BIN16U_BIN16U_BIN32U:
if (*(unsigned short *)op_data[2] == 0) {
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/exp/exp_attrs.cpp
----------------------------------------------------------------------
diff --git a/core/sql/exp/exp_attrs.cpp b/core/sql/exp/exp_attrs.cpp
index 43e92d6..8ded216 100644
--- a/core/sql/exp/exp_attrs.cpp
+++ b/core/sql/exp/exp_attrs.cpp
@@ -82,14 +82,12 @@ Attributes::Attributes(short complex_type) :
vcIndicatorLength_ = 2; // for now
-#pragma nowarn(161) // warning elimination
offset_ = ExpOffsetMax;
atpindex_ = 0;
atp_ = 0;
nullIndOffset_ = ExpOffsetMax;
vcLenIndOffset_ = ExpOffsetMax;
-#pragma warn(161) // warning elimination
voaOffset_ = ExpOffsetMax;
relOffset_ = 0;
nextAttrIdx_ = ExpOffsetMax;
@@ -129,25 +127,17 @@ char *Attributes::findVTblPtr(short classID)
switch (classID)
{
case ShowplanID:
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblPtr, ShowplanAttributes);
-#pragma warn(1506) // warning elimination
break;
case SimpleTypeID:
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblPtr, SimpleType);
-#pragma warn(1506) // warning elimination
break;
case BigNumID:
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblPtr, BigNum);
-#pragma warn(1506) // warning elimination
break;
case ComplexTypeID:
default:
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblPtr, ComplexType);
-#pragma warn(1506) // warning elimination
break;
}
return vtblPtr;
@@ -191,17 +181,11 @@ void Attributes::fixup(Space * /*space*/,
assert( area == (char *)0 );
#else /* FOLLOWING CODE SHOULD NOT BE NEEDED */
-#pragma nowarn(1506) // warning elimination
offset_ = (uLong)(area + offset_);
-#pragma warn(1506) // warning elimination
if (getNullFlag()) // nullable
-#pragma nowarn(1506) // warning elimination
nullIndOffset_ = (ULng32)(area + nullIndOffset_);
-#pragma warn(1506) // warning elimination
if (getVCIndicatorLength() > 0)
-#pragma nowarn(1506) // warning elimination
vcLenIndOffset_ = (ULng32)(area + vcLenIndOffset_);
-#pragma warn(1506) // warning elimination
#endif
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/exp/exp_attrs.h
----------------------------------------------------------------------
diff --git a/core/sql/exp/exp_attrs.h b/core/sql/exp/exp_attrs.h
index 2f1c9df..32a818d 100644
--- a/core/sql/exp/exp_attrs.h
+++ b/core/sql/exp/exp_attrs.h
@@ -85,8 +85,6 @@ class ExpDatetime;
// static const UInt32 ExpVoaSize = sizeof(Int32);
-#pragma warning ( disable : 4251 )
-#pragma nowarn(1506) // warning elimination
class Attributes : public NAVersionedObject
{
public:
@@ -657,7 +655,6 @@ private:
// resolve an ambiguity with an LLVM class that is also named Attributes
typedef Attributes exp_Attributes;
-#pragma warn(1506) // warning elimination
inline void Attributes::needDataAlignment()
@@ -672,9 +669,7 @@ inline void Attributes::dontNeedDataAlignment()
inline Int32 Attributes::isNotAlwaysAligned()
{
-#pragma nowarn(1506) // warning elimination
return (flags_ & DATA_ALIGNMENT_FLAG);
-#pragma warn(1506) // warning elimination
}
///////////////////////////////////////////////////////////////
@@ -1051,5 +1046,4 @@ private:
char fillers_[4]; // 60-63
};
-#pragma warning ( default : 4251 )
#endif
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/exp/exp_bignum.cpp
----------------------------------------------------------------------
diff --git a/core/sql/exp/exp_bignum.cpp b/core/sql/exp/exp_bignum.cpp
index c22f317..8e5878b 100644
--- a/core/sql/exp/exp_bignum.cpp
+++ b/core/sql/exp/exp_bignum.cpp
@@ -49,7 +49,6 @@
#include <iostream>
#include <stdlib.h>
-#pragma warning (disable : 4273) //warning elimination
BigNum::BigNum(Lng32 length, Lng32 precision, short scale, short unSigned)
: length_(length),
precision_(precision),
@@ -59,48 +58,36 @@ BigNum::BigNum(Lng32 length, Lng32 precision, short scale, short unSigned)
{
setClassID(BigNumID);
}
-#pragma warning (default : 4273) //warning elimination
-#pragma warning (disable : 4273) //warning elimination
BigNum::BigNum()
{
setClassID(BigNumID);
}
-#pragma warning (default : 4273) //warning elimination
-#pragma warning (disable : 4273) //warning elimination
BigNum::~BigNum()
{
}
-#pragma warning (default : 4273) //warning elimination
-#pragma warning (disable : 4273) //warning elimination
Attributes * BigNum::newCopy()
{
BigNum * new_copy = new BigNum();
*new_copy = *this;
return new_copy;
};
-#pragma warning (default : 4273) //warning elimination
-#pragma warning (disable : 4273) //warning elimination
Attributes * BigNum::newCopy(NAMemory * heap)
{
BigNum * new_copy = new(heap) BigNum();
*new_copy = *this;
return new_copy;
};
-#pragma warning (default : 4273) //warning elimination
-#pragma warning (disable : 4273) //warning elimination
void BigNum::copyAttrs(Attributes *source)
{
*this = *((BigNum *) source);
return;
};
-#pragma warning (default : 4273) //warning elimination
-#pragma warning (disable : 4273) //warning elimination
Lng32 BigNum::setTempSpaceInfo(OperatorTypeEnum operType,
ULong offset, Lng32 length)
{
@@ -128,9 +115,7 @@ Lng32 BigNum::setTempSpaceInfo(OperatorTypeEnum operType,
return tempSpaceLength_;
}
-#pragma warning (default : 4273) //warning elimination
-#pragma warning (disable : 4273) //warning elimination
void BigNum::fixup(Space * space,
char * constantsArea,
char * tempsArea,
@@ -146,12 +131,10 @@ void BigNum::fixup(Space * space,
fixupConstsAndTemps, spaceCompOnly);
}
-#pragma warning (default : 4273) //warning elimination
// Convert (i.e. copy) the Big Num from op_data[1] ("source") to op_data[0] ("this").
-#pragma warning (disable : 4273) //warning elimination
short BigNum::conv(Attributes * source, char * op_data[])
{
return BigNumHelper::ConvBigNumWithSignToBigNumWithSignHelper(((BigNum *) source)->getLength(),
@@ -159,13 +142,11 @@ short BigNum::conv(Attributes * source, char * op_data[])
op_data[1],
op_data[0]);
}
-#pragma warning (default : 4273) //warning elimination
// Compare the Big Num in op_data[1] ("this") with op_data[2] ("other").
// Return 1, if "this <compOp> other" is true,0, otherwise.
-#pragma warning (disable : 4273) //warning elimination
short BigNum::comp (OperatorTypeEnum compOp,
Attributes * other,
char * op_data[])
@@ -227,9 +208,7 @@ short BigNum::comp (OperatorTypeEnum compOp,
if (thisSign) // both -ve, so if magnitudes
// are different, switch
// compCode
-#pragma nowarn(1506) // warning elimination
compCode = (compCode ? -compCode : 0);
-#pragma warn(1506) // warning elimination
}
}
@@ -270,13 +249,11 @@ short BigNum::comp (OperatorTypeEnum compOp,
return returnValue;
}
-#pragma warning (default : 4273) //warning elimination
// Add the Big Nums in op_data[1] ("left") and op_data[2] ("right")
// and store in op_data[0] ("this").
-#pragma warning (disable : 4273) //warning elimination
short BigNum::add(Attributes * left,
Attributes * right,
char * op_data[])
@@ -327,13 +304,11 @@ short BigNum::add(Attributes * left,
return 0;
};
-#pragma warning (default : 4273) //warning elimination
// Subtract the Big Num in op_data[2] ("right") from op_data[1] ("left")
// and store in op_data[0] ("this").
-#pragma warning (disable : 4273) //warning elimination
short BigNum::sub(Attributes * left,
Attributes * right,
char * op_data[])
@@ -382,13 +357,11 @@ short BigNum::sub(Attributes * left,
return 0;
}
-#pragma warning (default : 4273) //warning elimination
// Multiply the Big Nums in op_data[1] ("left") and op_data[2] ("right")
// and store in op_data[0] ("this").
-#pragma warning (disable : 4273) //warning elimination
short BigNum::mul(Attributes * left,
Attributes * right,
char * op_data[])
@@ -423,13 +396,11 @@ short BigNum::mul(Attributes * left,
return 0;
}
-#pragma warning (default : 4273) //warning elimination
// Divide the Big Num in op_data[1] ("left") by op_data[2] ("right")
// and store in op_data[0] ("this").
-#pragma warning (disable : 4273) //warning elimination
short BigNum::div(Attributes * left,
Attributes * right,
char * op_data[],
@@ -495,12 +466,10 @@ short BigNum::div(Attributes * left,
return 0;
}
-#pragma warning (default : 4273) //warning elimination
// This method converts from other simple types to Big Num
-#pragma warning (disable : 4273) //warning elimination
short BigNum::castFrom (Attributes * source,
char * op_data[],
NAMemory *heap,
@@ -532,9 +501,7 @@ short BigNum::castFrom (Attributes * source,
switch (sourceType) {
case REC_BIN16_SIGNED: {
if ( *((short *) op_data[1]) < 0) {
-#pragma nowarn(1506) // warning elimination
thisDataInShorts[0] = -*((short *) op_data[1]);
-#pragma warn(1506) // warning elimination
BIGN_SET_SIGN(op_data[0], getLength());
}
else {
@@ -606,9 +573,7 @@ short BigNum::castFrom (Attributes * source,
char temp = op_data[1][0];
// Temporarily suppress sign bit in source
-#pragma nowarn(1506) // warning elimination
op_data[1][0] = op_data[1][0] & 0177;
-#pragma warn(1506) // warning elimination
// Convert source from ASCII to Big Num without sign and store in this.
BigNumHelper::ConvAsciiToBigNumHelper(source1->getLength(),
@@ -863,10 +828,8 @@ short BigNum::castFrom (Attributes * source,
return 0;
};
-#pragma warning (default : 4273) //warning elimination
-#pragma warning (disable : 4273) //warning elimination
void BigNum::encode(const char * inBuf, char * outBuf, short desc)
{
char sign = BIGN_GET_SIGN(inBuf, getLength());
@@ -902,9 +865,7 @@ void BigNum::encode(const char * inBuf, char * outBuf, short desc)
else
outBuf[0] |= MSB_SET_MSK;
}
-#pragma warning (default : 4273) //warning elimination
-#pragma warning (disable : 4273) //warning elimination
void BigNum::decode(const char * inBuf, char * outBuf, short desc)
{
// If MSB set in key, then value is NOT negative.
@@ -932,9 +893,7 @@ void BigNum::decode(const char * inBuf, char * outBuf, short desc)
if (!neg)
BIGN_CLR_SIGN(outBuf, getLength());
}
-#pragma warning (default : 4273) //warning elimination
-#pragma warning (disable : 4273) //warning elimination
void BigNum::init(char * op_data, char * str)
{
@@ -953,5 +912,4 @@ void BigNum::init(char * op_data, char * str)
if (str[0] == '-')
BIGN_SET_SIGN(op_data, getLength());
}
-#pragma warning (default : 4273) //warning elimination
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/exp/exp_bignum.h
----------------------------------------------------------------------
diff --git a/core/sql/exp/exp_bignum.h b/core/sql/exp/exp_bignum.h
index 409f998..5ae29e0 100644
--- a/core/sql/exp/exp_bignum.h
+++ b/core/sql/exp/exp_bignum.h
@@ -41,7 +41,6 @@
#include "exp_attrs.h"
-#pragma warning ( disable : 4251 )
class BigNum : public ComplexType {
@@ -188,7 +187,6 @@ Int64 EXP_FIXED_BIGN_OV_MOD(Attributes * op1,
-#pragma warning ( default : 4251 )
#endif
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/exp/exp_clause.cpp
----------------------------------------------------------------------
diff --git a/core/sql/exp/exp_clause.cpp b/core/sql/exp/exp_clause.cpp
index 3bb2898..15b23f0 100644
--- a/core/sql/exp/exp_clause.cpp
+++ b/core/sql/exp/exp_clause.cpp
@@ -593,9 +593,7 @@ ex_clause::ex_clause(clause_type type,
and offset. */
if (op) {
-#pragma nowarn(1506) // warning elimination
short numOperands = (op[0]->showplan() ? num_operands*2 : num_operands);
-#pragma warn(1506) // warning elimination
if (space)
@@ -665,7 +663,6 @@ ex_clause::~ex_clause()
// This method returns the virtual function table pointer for an object
// with the given class ID; used by NAVersionedObject::driveUnpack().
// -----------------------------------------------------------------------
-#pragma nowarn(1506) // warning elimination
char *ex_clause::findVTblPtr(short classID)
{
char *vtblPtr;
@@ -1053,7 +1050,6 @@ char *ex_clause::findVTblPtr(short classID)
}
return vtblPtr;
}
-#pragma warn(1506) // warning elimination
ex_expr::exp_return_type ex_clause::processNulls(char *null_data[],
@@ -1599,7 +1595,6 @@ void ex_clause::displayContents(Space * space, const char * displayStr,
for (Int32 i = 0; i < numOperands_; i++)
{
-#pragma nowarn(1506) // warning elimination
getOperand(i)->displayContents(space, i,
constsArea,
(showplan
@@ -1607,7 +1602,6 @@ void ex_clause::displayContents(Space * space, const char * displayStr,
: NULL));
str_sprintf(buf, "\n");
space->allocateAndCopyToAlignedSpace(buf, str_len(buf), sizeof(short));
-#pragma warn(1506) // warning elimination
}
}
}
@@ -1620,7 +1614,6 @@ void ex_clause::displayContents(Space * space, const char * displayStr,
///////////////////////////////////////////////////////////
// class ex_arith_clause
///////////////////////////////////////////////////////////
-#pragma nowarn(1506) // warning elimination
ex_arith_clause::ex_arith_clause(OperatorTypeEnum oper_type,
Attributes ** attr,
Space * space,
@@ -1728,7 +1721,6 @@ ex_conv_clause::ex_conv_clause(OperatorTypeEnum oper_type,
setInstruction();
}
-#pragma warn(1506) // warning elimination
///////////////////////////////////////////////////////////
// class ex_inout_clause
@@ -1958,7 +1950,6 @@ void ex_branch_clause::displayContents(Space * space, const char * /*displayStr*
for (Int32 i = 0; i < getNumOperands(); i++)
{
-#pragma nowarn(1506) // warning elimination
getOperand(i)->displayContents(space, i,
constsArea,
(showplan
@@ -1966,7 +1957,6 @@ void ex_branch_clause::displayContents(Space * space, const char * /*displayStr*
: NULL));
str_sprintf(buf, "\n");
space->allocateAndCopyToAlignedSpace(buf, str_len(buf), sizeof(short));
-#pragma warn(1506) // warning elimination
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/exp/exp_clause.h
----------------------------------------------------------------------
diff --git a/core/sql/exp/exp_clause.h b/core/sql/exp/exp_clause.h
index 404dcb1..c5d8e79 100644
--- a/core/sql/exp/exp_clause.h
+++ b/core/sql/exp/exp_clause.h
@@ -65,12 +65,10 @@ typedef NABasicPtrTempl<ex_globals> ExGlobalsPtr;
// -----------------------------------------------------------------------
class ex_clause;
-#pragma warning ( disable : 4251 )
/////////////////////////////////////////////////
// Class ex_clause
/////////////////////////////////////////////////
-#pragma nowarn(1506) // warning elimination
class ex_clause : public NAVersionedObject {
public:
// Possible types of clauses
@@ -592,9 +590,7 @@ private:
// ---------------------------------------------------------------------
char fillers_[16]; // 52-63
};
-#pragma warn(1506) // warning elimination
-#pragma warning ( default : 4251 )
inline ex_clause::clause_type ex_clause::getType(){
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/exp/exp_clause_derived.h
----------------------------------------------------------------------
diff --git a/core/sql/exp/exp_clause_derived.h b/core/sql/exp/exp_clause_derived.h
index 45d577b..31dae0c 100644
--- a/core/sql/exp/exp_clause_derived.h
+++ b/core/sql/exp/exp_clause_derived.h
@@ -45,7 +45,6 @@
#include "exp_like.h"
#include <byteswap.h>
-#pragma warning ( disable : 4251 )
#define instrAndText(a) a, #a
@@ -2811,7 +2810,6 @@ private:
};
-#pragma warning ( default : 4251 )
#endif
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/exp/exp_comp.cpp
----------------------------------------------------------------------
diff --git a/core/sql/exp/exp_comp.cpp b/core/sql/exp/exp_comp.cpp
index 82a57ae..aec4efc 100644
--- a/core/sql/exp/exp_comp.cpp
+++ b/core/sql/exp/exp_comp.cpp
@@ -1144,7 +1144,6 @@ ex_expr::exp_return_type ex_comp_clause::eval(char *op_data[],
case LE_ASCII_COMP:
case NE_ASCII_COMP:
{
-#pragma nowarn(1506) // warning elimination
Lng32 length1 = getOperand(1)->getLength(op_data[-MAX_OPERANDS + 1]);
Lng32 length2 = getOperand(2)->getLength(op_data[-MAX_OPERANDS + 2]) ;
@@ -1159,7 +1158,6 @@ ex_expr::exp_return_type ex_comp_clause::eval(char *op_data[],
Int32 compare_code =
charStringCompareWithPad( op_data[1], length1, op_data[2], length2, padChar);
-#pragma warn(1506) // warning elimination
retcode = processResult(compare_code, (Lng32 *)op_data[0],
heap, diagsArea);
@@ -1168,7 +1166,6 @@ ex_expr::exp_return_type ex_comp_clause::eval(char *op_data[],
case UNICODE_COMP: // 11/3/95: Unicode
{
-#pragma nowarn(1506) // warning elimination
Lng32 length1 = getOperand(1)->getLength(op_data[-MAX_OPERANDS + 1]);
Lng32 length2 = getOperand(2)->getLength(op_data[-MAX_OPERANDS + 2]);
@@ -1177,7 +1174,6 @@ ex_expr::exp_return_type ex_comp_clause::eval(char *op_data[],
(NAWchar*)op_data[2], length2>>1,
unicode_char_set::space_char()
);
-#pragma warn(1506) // warning elimination
retcode = processResult(compare_code, (Lng32 *)op_data[0],
heap, diagsArea);