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:14 UTC
[10/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/comexe/ComTdbControl.cpp
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComTdbControl.cpp b/core/sql/comexe/ComTdbControl.cpp
index 8b19708..0c45576 100644
--- a/core/sql/comexe/ComTdbControl.cpp
+++ b/core/sql/comexe/ComTdbControl.cpp
@@ -66,9 +66,7 @@ ComTdbControl::ComTdbControl(ControlQueryType cqt,
num_buffers,
buffer_size),
cqt_(cqt),
-#pragma nowarn(1506) // warning elimination
reset_(reset),
-#pragma warn(1506) // warning elimination
sqlText_(sqlText),
sqlTextCharSet_(sqlTextCharSet),
value1_(value1),
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/comexe/ComTdbDDL.h
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComTdbDDL.h b/core/sql/comexe/ComTdbDDL.h
index e9350ea..b1576b7 100644
--- a/core/sql/comexe/ComTdbDDL.h
+++ b/core/sql/comexe/ComTdbDDL.h
@@ -40,7 +40,6 @@
#include "ComTdb.h"
-#pragma nowarn(1506) // warning elimination
////////////////////////////////////////////////////////////////////
// class ComTdbGenericUtil
////////////////////////////////////////////////////////////////////
@@ -149,7 +148,6 @@ protected:
Int16 queryCharSet_; // 66-67
char fillersComTdbGenericUtil_[12]; // 68-79
};
-#pragma warn(1506) // warning elimination
////////////////////////////////////////////////////////////////////
// class ComTdbDDL
@@ -260,7 +258,6 @@ protected:
UInt16 flags_; // 00-01
char fillersComTdbDDL_[30]; // 02-31
};
-#pragma warn(1506) // warning elimination
class ComTdbDDLwithStatus : public ComTdbDDL
{
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/comexe/ComTdbDp2Oper.h
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComTdbDp2Oper.h b/core/sql/comexe/ComTdbDp2Oper.h
index c030f6f..44933d9 100644
--- a/core/sql/comexe/ComTdbDp2Oper.h
+++ b/core/sql/comexe/ComTdbDp2Oper.h
@@ -44,9 +44,6 @@
///////////////////////////////////////////////////////
// class ComTdbDp2Oper
///////////////////////////////////////////////////////
-#pragma nowarn(1506) // warning elimination
-#pragma nowarn(1103) // warning elimination
-#pragma nowarn(161) // warning elimination
class ComTdbDp2Oper : public ComTdb
{
@@ -56,10 +53,5 @@ public:
};
-
-#pragma warn(161) // warning elimination
-#pragma warn(1506) // warning elimination
-#pragma warn(1103) // warning elimination
-
#endif
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/comexe/ComTdbExeUtil.h
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComTdbExeUtil.h b/core/sql/comexe/ComTdbExeUtil.h
index 426622d..fd62fa5 100644
--- a/core/sql/comexe/ComTdbExeUtil.h
+++ b/core/sql/comexe/ComTdbExeUtil.h
@@ -217,7 +217,6 @@ protected:
char fillersComTdbExeUtil_[104]; // 40-135
};
-#pragma warn(1506) // warning elimination
static const ComTdbVirtTableColumnInfo exeUtilDisplayExplainVirtTableColumnInfo[] =
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/comexe/ComTdbExplain.h
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComTdbExplain.h b/core/sql/comexe/ComTdbExplain.h
index 09366df..fb8b9af 100644
--- a/core/sql/comexe/ComTdbExplain.h
+++ b/core/sql/comexe/ComTdbExplain.h
@@ -256,39 +256,33 @@ inline Lng32
ComTdbExplain::getOffsetModName()
{
// The moduleName is the first attribute in the tuple.
-#pragma nowarn(1506) // warning elimination
return
criDescParams_->
getTupleDescriptor(criDescParams_->noTuples() - 1)->
getAttr(0)->
getOffset();
-#pragma warn(1506) // warning elimination
};
inline Lng32
ComTdbExplain::getLengthModName()
{
// The moduleName is the first attribute in the tuple.
-#pragma nowarn(1506) // warning elimination
return
criDescParams_->
getTupleDescriptor(criDescParams_->noTuples() - 1)->
getAttr(0)->
getLength();
-#pragma warn(1506) // warning elimination
};
inline Lng32
ComTdbExplain::getOffsetStmtPattern()
{
// The statement Pattern is the second attribute in the tuple.
-#pragma nowarn(1506) // warning elimination
return
criDescParams_->
getTupleDescriptor(criDescParams_->noTuples() - 1)->
getAttr(1)->
getOffset();
-#pragma warn(1506) // warning elimination
};
inline Lng32
@@ -317,37 +311,31 @@ inline Lng32
ComTdbExplain::getLengthStmtPattern()
{
// The statement Pattern is the second attribute in the tuple.
-#pragma nowarn(1506) // warning elimination
return
criDescParams_->
getTupleDescriptor(criDescParams_->noTuples() - 1)->
getAttr(1)->
getLength();
-#pragma warn(1506) // warning elimination
};
inline Attributes *
ComTdbExplain::getAttrModName()
{
// The moduleName is the first attribute in the tuple.
-#pragma nowarn(1506) // warning elimination
return
criDescParams_->
getTupleDescriptor(criDescParams_->noTuples() - 1)->
getAttr(0);
-#pragma warn(1506) // warning elimination
};
inline Attributes *
ComTdbExplain::getAttrStmtPattern()
{
// The statement Pattern is the second attribute in the tuple.
-#pragma nowarn(1506) // warning elimination
return
criDescParams_->
getTupleDescriptor(criDescParams_->noTuples() - 1)->
getAttr(1);
-#pragma warn(1506) // warning elimination
};
inline ex_expr *
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/comexe/ComTdbRoot.h
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComTdbRoot.h b/core/sql/comexe/ComTdbRoot.h
index 008dd2e..f35ce54 100644
--- a/core/sql/comexe/ComTdbRoot.h
+++ b/core/sql/comexe/ComTdbRoot.h
@@ -292,7 +292,6 @@ typedef NAVersionedObjectPtrTempl<SecurityInvKeyInfo> SecurityInvKeyInfoPtr;
//
// Task Definition Block
//
-#pragma nowarn(1506) // warning elimination
class ComTdbRoot : public ComTdb
{
friend class ex_root_tcb;
@@ -1373,7 +1372,6 @@ public:
{ return (rtFlags4_ & EXPLAIN_IN_RMS_IN_TDB) ? TRUE : FALSE; }
void setExplainInRms() { rtFlags4_ |= EXPLAIN_IN_RMS_IN_TDB; }
};
-#pragma warn(1506) // warning elimination
/*****************************************************************************
Description : Return ComTdb* depending on the position argument.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/comexe/ComTdbSendTop.cpp
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComTdbSendTop.cpp b/core/sql/comexe/ComTdbSendTop.cpp
index e9c7ace..e7bc740 100644
--- a/core/sql/comexe/ComTdbSendTop.cpp
+++ b/core/sql/comexe/ComTdbSendTop.cpp
@@ -102,16 +102,12 @@ Lng32 ComTdbSendTop::minSendBufferSize(Lng32 downRecLen, Lng32 numRecs)
{
// start with the regular size it would take to pack the records
// into an SqlBuffer
-#pragma nowarn(1506) // warning elimination
Lng32 recSpace = SqlBufferNeededSize(numRecs, downRecLen);
-#pragma warn(1506) // warning elimination
// now add the needed space for the ExpControlInfo struct that goes
// along with each record
-#pragma nowarn(1506) // warning elimination
Lng32 delta = SqlBufferNeededSize(2, sizeof(ControlInfo)) -
SqlBufferNeededSize(1, sizeof(ControlInfo));
-#pragma warn(1506) // warning elimination
return recSpace + numRecs * delta;
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/comexe/ComTdbSort.cpp
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComTdbSort.cpp b/core/sql/comexe/ComTdbSort.cpp
index 72763b2..966dd06 100644
--- a/core/sql/comexe/ComTdbSort.cpp
+++ b/core/sql/comexe/ComTdbSort.cpp
@@ -76,18 +76,14 @@ ComTdbSort::ComTdbSort(ex_expr * sort_key_expr,
buffer_size),
sortKeyExpr_(sort_key_expr),
sortRecExpr_(sort_rec_expr),
-#pragma nowarn(1506) // warning elimination
sortRecLen_(sort_rec_len),
sortKeyLen_(sort_key_len),
sortPartialKeyLen_(sort_partial_key_len),
minimalSortRecs_(0),
-#pragma warn(1506) // warning elimination
tuppIndex_(tupp_index),
tdbChild_(child_tdb),
workCriDesc_(work_cri_desc),
-#pragma nowarn(1506) // warning elimination
maxNumBuffers_(maxNumBuffers),
-#pragma warn(1506) // warning elimination
sortOptions_(sort_options),
flags_(0),
sortMemEstInKBPerNode_(0),
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/comexe/ComTdbStats.cpp
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComTdbStats.cpp b/core/sql/comexe/ComTdbStats.cpp
index 90c0c4c..916e259 100644
--- a/core/sql/comexe/ComTdbStats.cpp
+++ b/core/sql/comexe/ComTdbStats.cpp
@@ -77,15 +77,9 @@ ComTdbStats::ComTdbStats(ULng32 tupleLen,
inputExpr_(inputExpr),
projExpr_(projExpr),
workCriDesc_(workCriDesc),
-#pragma nowarn(1506) // warning elimination
tupleLen_(tupleLen),
-#pragma warn(1506) // warning elimination
-#pragma nowarn(1506) // warning elimination
returnedTupleLen_(returnedTupleLen),
-#pragma warn(1506) // warning elimination
-#pragma nowarn(1506) // warning elimination
inputTupleLen_(inputTupleLen),
-#pragma warn(1506) // warning elimination
statsTupleAtpIndex_(stats_row_atp_index),
inputTupleAtpIndex_(input_row_atp_index)
{
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/comexe/ComTdbTupleFlow.cpp
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComTdbTupleFlow.cpp b/core/sql/comexe/ComTdbTupleFlow.cpp
index d0120f5..9c78168 100644
--- a/core/sql/comexe/ComTdbTupleFlow.cpp
+++ b/core/sql/comexe/ComTdbTupleFlow.cpp
@@ -129,26 +129,22 @@ const char * ComTdbTupleFlow::getExpressionName(Int32 pos) const
void ComTdbTupleFlow::displayContents(Space * space,ULng32 flag)
{
- ComTdb::displayContents(space,flag & 0xFFFFFFFE);
-
- if(flag & 0x00000008)
- {
- char buf[100];
-
-#pragma nowarn(1506) // warning elimination
- Lng32 lFlags = flags_%65536;
-#pragma warn(1506) // warning elimination
-#pragma nowarn(1506) // warning elimination
- Lng32 hFlags = (flags_- lFlags)/65536;
-#pragma warn(1506) // warning elimination
- str_sprintf(buf, "\nFor ComTdbTupleFlow :\nFlags = %x%x ",hFlags,lFlags );
- space->allocateAndCopyToAlignedSpace(buf, str_len(buf), sizeof(short));
- }
-
- if(flag & 0x00000001)
- {
- displayExpression(space,flag);
- displayChildren(space,flag);
- }
+ ComTdb::displayContents(space,flag & 0xFFFFFFFE);
+
+ if(flag & 0x00000008)
+ {
+ char buf[100];
+
+ Lng32 lFlags = flags_%65536;
+ Lng32 hFlags = (flags_- lFlags)/65536;
+ str_sprintf(buf, "\nFor ComTdbTupleFlow :\nFlags = %x%x ",hFlags,lFlags );
+ space->allocateAndCopyToAlignedSpace(buf, str_len(buf), sizeof(short));
+ }
+
+ if(flag & 0x00000001)
+ {
+ displayExpression(space,flag);
+ displayChildren(space,flag);
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/comexe/LateBindInfo.cpp
----------------------------------------------------------------------
diff --git a/core/sql/comexe/LateBindInfo.cpp b/core/sql/comexe/LateBindInfo.cpp
index f582eb5..b96e320 100644
--- a/core/sql/comexe/LateBindInfo.cpp
+++ b/core/sql/comexe/LateBindInfo.cpp
@@ -99,9 +99,7 @@ NABoolean LateNameInfo::makeSQLIdentifier(char * invalue,
if (dQuoteSeen)
outvalue[i] = invalue[i];
else
-#pragma nowarn(1506) // warning elimination
outvalue[i] = TOUPPER(invalue[i]);
-#pragma warn(1506) // warning elimination
}
// remove trailing blanks
@@ -163,9 +161,7 @@ static void extractPartsLocal(char * invalue, char *inVal[], short inValLen[])
{
// apply defaults to invalue
UInt32 invalueLen = str_len(invalue);
-#pragma nowarn(1506) // warning elimination
Int32 i = invalueLen-1;
-#pragma warn(1506) // warning elimination
Int32 j = 2;
Int32 k = 0;
for (; i >= 0; i--)
@@ -173,9 +169,7 @@ static void extractPartsLocal(char * invalue, char *inVal[], short inValLen[])
if (invalue[i] == '.')
{
inVal[j] = &invalue[i+1];
-#pragma nowarn(1506) // warning elimination
inValLen[j] = k;
-#pragma warn(1506) // warning elimination
k = 0;
j--;
}
@@ -183,25 +177,19 @@ static void extractPartsLocal(char * invalue, char *inVal[], short inValLen[])
k++;
}
inVal[j] = &invalue[i+1];
-#pragma nowarn(1506) // warning elimination
inValLen[j] = k;
-#pragma warn(1506) // warning elimination
}
Long LateNameInfoList::pack(void *space)
{
-#pragma nowarn(1506) // warning elimination
lateNameInfo_.pack(space,numEntries_);
-#pragma warn(1506) // warning elimination
return NAVersionedObject::pack(space);
}
Lng32 LateNameInfoList::unpack(void * base, void * reallocator)
{
-#pragma nowarn(1506) // warning elimination
if(lateNameInfo_.unpack(base,numEntries_,reallocator)) return -1;
-#pragma warn(1506) // warning elimination
return NAVersionedObject::unpack(base, reallocator);
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/comexe/PartInputDataDesc.cpp
----------------------------------------------------------------------
diff --git a/core/sql/comexe/PartInputDataDesc.cpp b/core/sql/comexe/PartInputDataDesc.cpp
index e48a1ae..367991b 100644
--- a/core/sql/comexe/PartInputDataDesc.cpp
+++ b/core/sql/comexe/PartInputDataDesc.cpp
@@ -449,34 +449,22 @@ char *ExPartInputDataDesc::findVTblPtr(short classID)
switch (classID)
{
case HASH_PARTITIONED:
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblPtr, ExHashPartInputData);
-#pragma warn(1506) // warning elimination
break;
case RANGE_PARTITIONED:
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblPtr, ExRangePartInputData);
-#pragma warn(1506) // warning elimination
break;
case ROUNDROBIN_PARTITIONED:
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblPtr, ExRoundRobinPartInputData);
-#pragma warn(1506) // warning elimination
break;
case HASH1_PARTITIONED:
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblPtr, ExHashDistPartInputData);
-#pragma warn(1506) // warning elimination
break;
case HASH2_PARTITIONED:
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblPtr, ExHash2PartInputData);
-#pragma warn(1506) // warning elimination
break;
default:
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblPtr, ExPartInputDataDesc);
-#pragma warn(1506) // warning elimination
break;
}
return vtblPtr;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/comexe/SqlTableOpenInfo.h
----------------------------------------------------------------------
diff --git a/core/sql/comexe/SqlTableOpenInfo.h b/core/sql/comexe/SqlTableOpenInfo.h
index 2377ae2..a6561d5 100644
--- a/core/sql/comexe/SqlTableOpenInfo.h
+++ b/core/sql/comexe/SqlTableOpenInfo.h
@@ -48,7 +48,6 @@
// --------------------------------------------------------------------------
// Class SqlTableOpenInfo
// --------------------------------------------------------------------------
-#pragma nowarn(1506) // warning elimination
class SqlTableOpenInfo : public NAVersionedObject
{
public:
@@ -508,7 +507,6 @@ private:
char fillersSqlTableOpenInfo_[16]; // 96-111
};
-#pragma warn(1506) // warning elimination
// --------------------------------------------------------------------------
// Template instantiation to produce a 64-bit pointer emulator class
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/common/BigNumHelper.cpp
----------------------------------------------------------------------
diff --git a/core/sql/common/BigNumHelper.cpp b/core/sql/common/BigNumHelper.cpp
index 7e3d143..bb46194 100644
--- a/core/sql/common/BigNumHelper.cpp
+++ b/core/sql/common/BigNumHelper.cpp
@@ -174,9 +174,7 @@ short BigNumHelper::SubHelper(Lng32 dataLength,
carry = ( temp < 0 ? -1 : 0);
}
-#pragma nowarn(1506) // warning elimination
return neg;
-#pragma warn(1506) // warning elimination
}
@@ -598,12 +596,8 @@ short BigNumHelper::ConvBigNumToBcdHelper(Lng32 sourceLength,
}
finalTargetData--;
finalTargetLength++;
-#pragma nowarn(1506) // warning elimination
finalTargetData[0] = remainder % 10;
-#pragma warn(1506) // warning elimination
-#pragma nowarn(1506) // warning elimination
remainder = remainder / 10;
-#pragma warn(1506) // warning elimination
}
}
@@ -618,12 +612,8 @@ short BigNumHelper::ConvBigNumToBcdHelper(Lng32 sourceLength,
}
finalTargetData--;
finalTargetLength++;
-#pragma nowarn(1506) // warning elimination
finalTargetData[0] = remainder % 10;
-#pragma warn(1506) // warning elimination
-#pragma nowarn(1506) // warning elimination
remainder = remainder / 10;
-#pragma warn(1506) // warning elimination
}
if (heap)
@@ -693,9 +683,7 @@ short BigNumHelper::ConvBcdToBigNumHelper(Lng32 sourceLength,
unsigned short temp1 = 0;
Int32 j = 0;
while ((j < 4) && (i+j < actualSourceLength)) {
-#pragma nowarn(1506) // warning elimination
temp1 = temp1*10 + actualSourceData[i+j];
-#pragma warn(1506) // warning elimination
j++;
}
unsigned short power = powersOfTen[j - 1];
@@ -927,9 +915,7 @@ short BigNumHelper::ConvPowersOfTenToBigNumHelper(Lng32 exponent,
unsigned short * targetDataInShorts = (unsigned short *) targetData;
*finalTargetLength = BigNumHelper::ConvPrecisionToStorageLengthHelper(exponent);
-#pragma nowarn(1506) // warning elimination
Lng32 diffExponent = exponent - sizeof(powersOfTenInBigNumForm)/8 + 1;
-#pragma warn(1506) // warning elimination
#ifdef NA_LITTLE_ENDIAN
union {
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/common/CharType.cpp
----------------------------------------------------------------------
diff --git a/core/sql/common/CharType.cpp b/core/sql/common/CharType.cpp
index fff141d..9b7566b 100644
--- a/core/sql/common/CharType.cpp
+++ b/core/sql/common/CharType.cpp
@@ -542,9 +542,7 @@ NABoolean CharType::computeNextKeyValue(NAString &keyValue) const
{
ComASSERT(getBytesPerChar() == 1);
-#pragma nowarn(259) // warning elimination
for (size_t i = keyValue.length(); i--; i)
-#pragma warn(259) // warning elimination
{
unsigned char c = keyValue[i];
if (c < UCHAR_MAX)
@@ -555,18 +553,14 @@ NABoolean CharType::computeNextKeyValue(NAString &keyValue) const
keyValue.remove(i);
}
-#pragma nowarn(1506) // warning elimination
return keyValue.length();
-#pragma warn(1506) // warning elimination
}
NABoolean CharType::computeNextKeyValue_UTF8(NAString &keyValue) const
{
ComASSERT(getBytesPerChar() == 4);
-#pragma nowarn(259) // warning elimination
for (size_t i = keyValue.length(); i--; i)
-#pragma warn(259) // warning elimination
{
unsigned char c = keyValue[i];
if ( (c & 0xC0) == 0x80 ) // If not first byte in a char,
@@ -590,9 +584,7 @@ NABoolean CharType::computeNextKeyValue_UTF8(NAString &keyValue) const
else keyValue.remove(i);
}
-#pragma nowarn(1506) // warning elimination
return keyValue.length();
-#pragma warn(1506) // warning elimination
}
NABoolean CharType::computeNextKeyValue(NAWString &keyValue) const
@@ -601,9 +593,7 @@ NABoolean CharType::computeNextKeyValue(NAWString &keyValue) const
NAWchar maxValue = (NAWchar)CharType::getMaxSingleCharacterValue();
-#pragma nowarn(259) // warning elimination
for (size_t i = keyValue.length(); i--; i)
-#pragma warn(259) // warning elimination
{
NAWchar c = keyValue[i];
@@ -629,9 +619,7 @@ NABoolean CharType::computeNextKeyValue(NAWString &keyValue) const
keyValue.remove(i);
}
-#pragma nowarn(1506) // warning elimination
return keyValue.length();
-#pragma warn(1506) // warning elimination
}
NABoolean CharType::isEncodingNeeded() const
@@ -887,7 +875,6 @@ NABoolean CharType::createSQLLiteral(const char * buf,
}
-#pragma nowarn(1506) // warning elimination
SQLChar::SQLChar(NAMemory *h,
Lng32 maxLen,
NABoolean allowSQLnull,
@@ -905,9 +892,7 @@ SQLChar::SQLChar(NAMemory *h,
varLenFlag, cs, co, ce,
encoding)
{}
-#pragma warn(1506) // warning elimination
-#pragma nowarn(1506) // warning elimination
SQLChar::SQLChar(NAMemory *h,
const CharLenInfo & maxLenInfo,
NABoolean allowSQLnull,
@@ -925,9 +910,7 @@ SQLChar::SQLChar(NAMemory *h,
varLenFlag, cs, co, ce,
encoding)
{}
-#pragma warn(1506) // warning elimination
-#pragma nowarn(1506) // warning elimination
SQLVarChar::SQLVarChar(NAMemory *h,
Lng32 maxLen,
NABoolean allowSQLnull,
@@ -947,9 +930,7 @@ SQLVarChar::SQLVarChar(NAMemory *h,
clientDataType_(collHeap()), // Get heap from NABasicObject. Can't allocate on stack.
wasHiveString_(FALSE)
{}
-#pragma warn(1506) // warning elimination
-#pragma nowarn(1506) // warning elimination
SQLVarChar::SQLVarChar(NAMemory *h,
const CharLenInfo & maxLenInfo,
NABoolean allowSQLnull,
@@ -999,7 +980,6 @@ NABoolean SQLVarChar::operator==(const NAType& other) const
// In fact, the varLenFlag param is unused: lots of things break
// in cli + rfork if a CharType is both nul-terminated and has a vc-header.
// -----------------------------------------------------------------------
-#pragma nowarn(1506) // warning elimination
ANSIChar::ANSIChar(NAMemory *h,
Lng32 maxLen,
NABoolean allowSQLnull,
@@ -1020,7 +1000,6 @@ ANSIChar::ANSIChar(NAMemory *h,
//## TRUE, allowSQLnull, isUpShifted, varLenFlag, cs, co, ce,
//## tokNCHARinParser)
{}
-#pragma warn(1506) // warning elimination
short ANSIChar::getFSDatatype() const
{
@@ -1415,9 +1394,7 @@ const CharType* CharType::desiredCharType(enum CharInfo::CharSet cs)
default:
return &latin1Char;
}
-#pragma nowarn(203) // warning elimination
return 0;
-#pragma warn(203) // warning elimination
}
// round length up to next bigger quantum step
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/common/Collections.cpp
----------------------------------------------------------------------
diff --git a/core/sql/common/Collections.cpp b/core/sql/common/Collections.cpp
index 2da7f98..50bbfec 100644
--- a/core/sql/common/Collections.cpp
+++ b/core/sql/common/Collections.cpp
@@ -40,7 +40,6 @@
#include "Collections.h"
-#pragma nowarn(1506) // warning elimination
template <class T> NACollection<T>::~NACollection()
{
@@ -514,7 +513,7 @@ NASubCollection<T> & NASubCollection<T>::addSet( const NASubCollection<T> & othe
else
{
Lng32 entryCount = 0;
- Lng32 trailingWords = (Lng32) (wordSize_ - maxWords); // warning elimination
+ Lng32 trailingWords = (Lng32) (wordSize_ - maxWords);
do
{
@@ -1531,14 +1530,12 @@ NAHashDictionaryIterator<K,V>::~NAHashDictionaryIterator()
template <class K, class V>
void NAHashDictionaryIterator<K,V>::getNext(K*& key, V*& value)
{
-#pragma warning (disable : 4018) //warning elimination
if (iteratorPosition_ < iterator_.entries())
{
key = iterator_[iteratorPosition_]->getKey();
value = iterator_[iteratorPosition_]->getValue();
iteratorPosition_++ ;
}
-#pragma warning (default : 4018) //warning elimination
else
{
// If the application has advanced the iterator beyond the number
@@ -1614,5 +1611,4 @@ Int32 NAHashDictionary<K,V>::printStatistics(char *buf)
return c;
} // NAHashDictionary<K,V>::printStatistics()
-#pragma warn(1506) // warning elimination
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/common/Collections.h
----------------------------------------------------------------------
diff --git a/core/sql/common/Collections.h b/core/sql/common/Collections.h
index a317cfb..3129bfd 100644
--- a/core/sql/common/Collections.h
+++ b/core/sql/common/Collections.h
@@ -56,7 +56,6 @@
// File contents
// -----------------------------------------------------------------------
-#pragma nowarn(1506) // warning elimination
template <class T> class NACollection;
template <class T> class NASubCollection;
@@ -310,11 +309,7 @@ const NAUnsigned MAX_COLL_INDEX = MINOF(100000000,LONG_MAX);
// syntax in other modules)
// -----------------------------------------------------------------------
#define SET(Type) NASet<Type>
-#pragma warning (disable : 4005) //warning elimination
-#pragma nowarn(140) // warning elimination
#define LIST(Type) NAList<Type>
-#pragma warn(140) // warning elimination
-#pragma warning (default : 4005) //warning elimination
#define ARRAY(Type) NAArray<Type>
#define SUBARRAY(Type) NASubArray<Type>
#define HASHDICTIONARY(Key,Value) NAHashDictionary<Key,Value>
@@ -1208,7 +1203,6 @@ public:
else
{
// NOTE: for performance reasons we return arbitrary numbers for TRUE
- // cast to NABoolean added for warning elimination
return( (NABoolean) (pBits_[ wn ] LAND SingleBitArray[ bitNo( b ) ]) );
}
}
@@ -3015,7 +3009,6 @@ private:
}; // NAKeyLookup
-#pragma warn(1506) // warning elimination
// -----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/common/ComDistribution.h
----------------------------------------------------------------------
diff --git a/core/sql/common/ComDistribution.h b/core/sql/common/ComDistribution.h
index a3a1e6f..be1c6c5 100644
--- a/core/sql/common/ComDistribution.h
+++ b/core/sql/common/ComDistribution.h
@@ -145,13 +145,11 @@ ComBuildANSIName ( const char * catalogName, // in, catalog name (internal for
// Convert between various enums and literals. Output literal must
// be at least 3 characters.
//
-#pragma nowarn(449) // Disregard warning 449: No constructor to
typedef struct // initialize const members
{
Int32 enum_;
const char * literal_;
} literalAndEnumStruct;
-#pragma warn(449)
// General enum to literal translation
void enumToLiteral ( const literalAndEnumStruct * conversionTable,
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/common/ComObjectName.cpp
----------------------------------------------------------------------
diff --git a/core/sql/common/ComObjectName.cpp b/core/sql/common/ComObjectName.cpp
index 9307d75..42e1117 100644
--- a/core/sql/common/ComObjectName.cpp
+++ b/core/sql/common/ComObjectName.cpp
@@ -814,9 +814,7 @@ ComObjectName::scan( const NAString &externalObjectName
// Scan the next ANSI SQL name part
// ---------------------------------------------------------------------
-#pragma nowarn(1506) // warning elimination
Int32 remainingLen = externalObjectNameLen - bytesScanned;
-#pragma warn(1506) // warning elimination
NAString remainingName = externalObjectName(bytesScanned, remainingLen);
count = trailingJunkIsOk;
ComAnsiNamePart part2(remainingName, count, 0,
@@ -845,9 +843,7 @@ ComObjectName::scan( const NAString &externalObjectName
// Scan the last ANSI SQL name part
// ---------------------------------------------------------------------
-#pragma nowarn(1506) // warning elimination
remainingLen = externalObjectNameLen - bytesScanned;
-#pragma warn(1506) // warning elimination
remainingName = externalObjectName(bytesScanned, remainingLen);
count = trailingJunkIsOk;
ComAnsiNamePart part3(remainingName, count, 0,
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/common/ComResWords.cpp
----------------------------------------------------------------------
diff --git a/core/sql/common/ComResWords.cpp b/core/sql/common/ComResWords.cpp
index 593a91a..64e7352 100644
--- a/core/sql/common/ComResWords.cpp
+++ b/core/sql/common/ComResWords.cpp
@@ -481,9 +481,7 @@ ComResWords::isSqlReservedWord(const char *word,NABoolean mp_context,
// Upper case all words since all the words in the resword table
// are also uppercase.
//
-#pragma nowarn(1506) // warning elimination
uword[i] = TOUPPER(word[i]);
-#pragma warn(1506) // warning elimination
i++;
}
uword[i] = '\0';
@@ -506,16 +504,12 @@ ComResWord * ComResWords::binarySearch(ComResWord *val)
Int32 lower = 0;
size_t numEntries = sizeof(resWords_)/sizeof(ComResWord);
-#pragma nowarn(1506) // warning elimination
Int32 upper = numEntries -1;
-#pragma warn(1506) // warning elimination
short result = 0;
while ( lower <= upper )
{
Int32 middle = (lower+upper) >> 1;
-#pragma nowarn(1506) // warning elimination
result = wordCompare(&(resWords_[middle]), val);
-#pragma warn(1506) // warning elimination
if ( result == 0 )
return (ComResWord*)(&(resWords_[middle]));
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/common/ComResWords.h
----------------------------------------------------------------------
diff --git a/core/sql/common/ComResWords.h b/core/sql/common/ComResWords.h
index a7a08d6..99c817b 100644
--- a/core/sql/common/ComResWords.h
+++ b/core/sql/common/ComResWords.h
@@ -40,7 +40,6 @@
// -----------------------------------------------------------------------
// contents of this file
// -----------------------------------------------------------------------
-#pragma nowarn(1506) // warning elimination
struct ComResWord;
class ComResWords;
@@ -184,6 +183,5 @@ private:
static const ComResWord resWords_[];
};
-#pragma warn(1506) // warning elimination
#endif /* COMRESWORDS_H */
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/common/ComRtUtils.cpp
----------------------------------------------------------------------
diff --git a/core/sql/common/ComRtUtils.cpp b/core/sql/common/ComRtUtils.cpp
index 217bf08..f2619f9 100644
--- a/core/sql/common/ComRtUtils.cpp
+++ b/core/sql/common/ComRtUtils.cpp
@@ -410,9 +410,7 @@ Lng32 ComRtGetMPSysCatName(
{
if (sysName[i] == ' ') break;
}
-#pragma nowarn(1506) // warning elimination
str_cpy_all(sysCatLoc, sysName, i);
-#pragma warn(1506) // warning elimination
if (i)
sysCatLoc[i++] = '.';
z = i;
@@ -424,26 +422,16 @@ Lng32 ComRtGetMPSysCatName(
}
//ComDEBUG(i > 2);
sysCatLoc[z++] = '$';
-#pragma nowarn(1506) // warning elimination
-#pragma nowarn(252) // warning elimination
str_cpy_all(sysCatLoc + z, tab->cat_volname + 2, i - 2);
-#pragma warn(252) // warning elimination
-#pragma warn(1506) // warning elimination
z += i - 2;
sysCatLoc[z++] = '.';
for (i = 0; i < 8; i++) //padded with blanks
{
if (tab->cat_subvolname[i] == ' ') break;
}
-#pragma nowarn(252) // warning elimination
-#pragma nowarn(1506) // warning elimination
str_cpy_all(sysCatLoc + z, tab->cat_subvolname, i);
-#pragma warn(252) // warning elimination
-#pragma warn(1506) // warning elimination
sysCatLoc[z+i] = '\0';
-#pragma nowarn(1506) // warning elimination
*sysCatLength = (Lng32)z+i;
-#pragma warn(1506) // warning elimination
}
@@ -475,9 +463,7 @@ void ComRt_Upshift (char * buf)
while (*pBuf)
{
-#pragma nowarn(1506) // warning elimination
*pBuf = TOUPPER(*pBuf);
-#pragma warn(1506) // warning elimination
++pBuf;
}
}
@@ -543,9 +529,7 @@ NABoolean ComRtGetEnvValue(const char * envvar, Lng32 * envvarValue)
// envvar not there or no value
return FALSE;
-#pragma nowarn(1506) // warning elimination
Int32 max = strlen(ptr);
-#pragma warn(1506) // warning elimination
Lng32 tempValue = 0;
for (Int32 i = 0;i < max;i++)
{
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/common/ComSchemaName.cpp
----------------------------------------------------------------------
diff --git a/core/sql/common/ComSchemaName.cpp b/core/sql/common/ComSchemaName.cpp
index 772aa64..f88bb26 100644
--- a/core/sql/common/ComSchemaName.cpp
+++ b/core/sql/common/ComSchemaName.cpp
@@ -246,9 +246,7 @@ ComSchemaName::scan(const NAString &externalSchemaName,
// Scan the last ANSI SQL name part
// ---------------------------------------------------------------------
-#pragma nowarn(1506) // warning elimination
Int32 remainingLen = externalSchemaNameLen - bytesScanned;
-#pragma warn(1506) // warning elimination
NAString remainingName = externalSchemaName(bytesScanned, remainingLen);
count = 0;
ComAnsiNamePart part2(remainingName, count);
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/common/ComSmallDefs.cpp
----------------------------------------------------------------------
diff --git a/core/sql/common/ComSmallDefs.cpp b/core/sql/common/ComSmallDefs.cpp
index 3257ca8..7067e7d 100644
--- a/core/sql/common/ComSmallDefs.cpp
+++ b/core/sql/common/ComSmallDefs.cpp
@@ -137,9 +137,7 @@ ostream & operator << (ostream &s, const ComUID &uid)
{
digit = (Int32) (num % 10);
num = num / 10;
-#pragma nowarn(1506) // warning elimination
buf[i--] = digit+'0';
-#pragma warn(1506) // warning elimination
}
i++;
while (buf[i] != 0)
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/common/ComTransInfo.h
----------------------------------------------------------------------
diff --git a/core/sql/common/ComTransInfo.h b/core/sql/common/ComTransInfo.h
index d2fc9aa..9498f39 100644
--- a/core/sql/common/ComTransInfo.h
+++ b/core/sql/common/ComTransInfo.h
@@ -304,7 +304,6 @@ private:
NABoolean scanLockForIM_;
};
-#pragma nowarn(1506) // warning elimination
class TransMode : public NAVersionedObject
{
public:
@@ -551,7 +550,6 @@ private:
UInt32 multiCommitSize_; // 20-23
};
-#pragma warn(1506) // warning elimination
// verify that statement-level access and session-level setting are OK.
// set errCodeA/errCodeB to 0/0 if all OK, else to -3140/-3141.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/common/DTICommonType.h
----------------------------------------------------------------------
diff --git a/core/sql/common/DTICommonType.h b/core/sql/common/DTICommonType.h
index dd7d8fb..a8c1980 100644
--- a/core/sql/common/DTICommonType.h
+++ b/core/sql/common/DTICommonType.h
@@ -49,7 +49,6 @@ class DatetimeIntervalCommonType;
// DatetimeIntervalCommonType : Ancestor class to DatetimeType & IntervalType
//
// ***********************************************************************
-#pragma nowarn(1506) // warning elimination
class DatetimeIntervalCommonType : public NAType
{
public:
@@ -155,6 +154,5 @@ private:
NABitVector DTIFlags_;
}; // class DatetimeIntervalCommonType
-#pragma warn(1506) // warning elimination
#endif /* DTICOMMONTYPE_H */
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/common/DateTimeType.cpp
----------------------------------------------------------------------
diff --git a/core/sql/common/DateTimeType.cpp b/core/sql/common/DateTimeType.cpp
index 95b9723..bef0044 100644
--- a/core/sql/common/DateTimeType.cpp
+++ b/core/sql/common/DateTimeType.cpp
@@ -240,9 +240,7 @@ void DatetimeType::datetimeToLong(void *bufPtr,
for (Int32 i = start; i <= end; i++)
{
ULng32 val;
-#pragma nowarn(1506) // warning elimination
size = storageLen[i - 1];
-#pragma warn(1506) // warning elimination
switch (size) {
case sizeof(char):
val = *str;
@@ -276,16 +274,12 @@ void DatetimeType::datetimeToLong(void *bufPtr,
Lng32 DatetimeType::gregorianDays(const ULng32 values[])
{
-#pragma nowarn(1506) // warning elimination
Lng32 year = values[0] - 1;
-#pragma warn(1506) // warning elimination
Lng32 leapDays = year/4 + year/400 - year/100;
Lng32 days = year * 365 + leapDays;
-#pragma nowarn(1506) // warning elimination
Lng32 month = values[1];
-#pragma warn(1506) // warning elimination
for (Int32 i = 1; i < month; i++)
days += daysInMonth[i];
@@ -344,14 +338,12 @@ Int64 DatetimeType::julianTimestampValue(const char * value, const short valueLe
//
// ***********************************************************************
-#pragma nowarn(1506) // warning elimination
Lng32 DatetimeType::secondsInTime(const ULng32 values[])
{
return (values[0] * 60 * 60 +
values[1] * 60 +
values[2]);
}
-#pragma warn(1506) // warning elimination
enum DatetimeType::Subtype DatetimeType::validate(rec_datetime_field startField,
rec_datetime_field endField,
@@ -695,10 +687,8 @@ void DatetimeType::getRepresentableValue(const char* inValueString,
Int32 endIndex = getEndField() - REC_DATE_YEAR;
Int32 startOff, endOff, i = 0;
UInt32 fracPrec = 0;
-#pragma nowarn(1506) // warning elimination
for (startOff = 0; i < startIndex; i++) startOff = startOff + maxFieldLen[i] + 1;
for (endOff = startOff; i <= endIndex; i++) endOff = endOff + maxFieldLen[i] + 1;
-#pragma warn(1506) // warning elimination
if (getFractionPrecision())
{
endOff += getFractionPrecision() + 1;
@@ -712,9 +702,7 @@ void DatetimeType::getRepresentableValue(const char* inValueString,
fracPrec = getFractionPrecision();
if (getStartField() == REC_DATE_FRACTION_MP)
{
-#pragma nowarn(1506) // warning elimination
Int32 adjust = (6-fracPrec) + 2; // move past "00." (seconds + decimal pt.)
-#pragma warn(1506) // warning elimination
startOff += adjust;
i -= adjust;
}
@@ -1892,37 +1880,17 @@ NAString DatetimeValue::getValueAsString(const DatetimeType& dt) const
}
value += storageLen[index];
if (index != FRACTION)
-#pragma nowarn(1506) // warning elimination
clen = maxFieldLen[index];
-#pragma warn(1506) // warning elimination
else
-#pragma nowarn(1506) // warning elimination
clen = dt.getFractionPrecision();
-#pragma warn(1506) // warning elimination
-#pragma nowarn(1506) // warning elimination
if (! result.isNull()) {
-#pragma warn(1506) // warning elimination
-#pragma nowarn(1506) // warning elimination
sprintf(cbuf, "%c", precedingPunc[index]);
-#pragma warn(1506) // warning elimination
-#pragma nowarn(1506) // warning elimination
result += cbuf;
-#pragma warn(1506) // warning elimination
-#pragma nowarn(1506) // warning elimination
}
-#pragma warn(1506) // warning elimination
-#pragma nowarn(203) // warning elimination
sprintf(cbuf, "%0*u", clen, ulbuf);
-#pragma warn(203) // warning elimination
-#pragma nowarn(1506) // warning elimination
result += cbuf;
-#pragma warn(1506) // warning elimination
-#pragma nowarn(1506) // warning elimination
}
-#pragma warn(1506) // warning elimination
-#pragma nowarn(1506) // warning elimination
return result;
-#pragma warn(1506) // warning elimination
} // DatetimeValue::getValueAsString
void DatetimeValue::print(const DatetimeType& dt,
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/common/DatetimeType.h
----------------------------------------------------------------------
diff --git a/core/sql/common/DatetimeType.h b/core/sql/common/DatetimeType.h
index 4655e76..e948fd5 100644
--- a/core/sql/common/DatetimeType.h
+++ b/core/sql/common/DatetimeType.h
@@ -64,7 +64,6 @@ extern NAString DEFAULT_DATE_DISPLAY_FORMAT;
// DatetimeType : The datetime data type
//
// ***********************************************************************
-#pragma nowarn(1506) // warning elimination
class DatetimeType : public DatetimeIntervalCommonType
{
public:
@@ -282,7 +281,6 @@ private:
NAString displayFormat_;
}; // class DatetimeType
-#pragma warn(1506) // warning elimination
// ***********************************************************************
//
@@ -342,7 +340,6 @@ private:
// SQLTime : SQL TIME
//
// ***********************************************************************
-#pragma nowarn(1506) // warning elimination
class SQLTime : public DatetimeType
{
public:
@@ -398,14 +395,12 @@ protected:
private:
}; // class SQLTime
-#pragma warn(1506) // warning elimination
// ***********************************************************************
//
// SQLTimestamp : SQL TIMESTAMP
//
// ***********************************************************************
-#pragma nowarn(1506) // warning elimination
class SQLTimestamp : public DatetimeType
{
public:
@@ -466,14 +461,12 @@ protected:
private:
}; // class SQLTimestamp
-#pragma warn(1506) // warning elimination
// ***********************************************************************
//
// SQLMPDatetime : A Datetype for non-ANSI SQL/MP Datetimes
//
// ***********************************************************************
-#pragma nowarn(1506) // warning elimination
class SQLMPDatetime : public DatetimeType
{
public:
@@ -517,7 +510,6 @@ public:
private:
};
-#pragma warn(1506) // warning elimination
// ***********************************************************************
//
// DatetimeValue : A datetime value
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/common/IntervalType.cpp
----------------------------------------------------------------------
diff --git a/core/sql/common/IntervalType.cpp b/core/sql/common/IntervalType.cpp
index bffcc49..e10bf08 100644
--- a/core/sql/common/IntervalType.cpp
+++ b/core/sql/common/IntervalType.cpp
@@ -493,7 +493,6 @@ const NAType* IntervalType::synthesizeType(enum NATypeSynthRuleEnum synthRule,
} // switch
} // synthesizeType()
-#pragma nowarn(1319) // warning elimination
Lng32 IntervalType::getDisplayLength() const
{
//
@@ -501,7 +500,6 @@ Lng32 IntervalType::getDisplayLength() const
//
return getStringSize() - 1;
}
-#pragma warn(1319) // warning elimination
// ***********************************************************************
// IntervalType : Min and max values, and encoding
@@ -523,9 +521,7 @@ void IntervalType::getRepresentableValue(char sign,
*v++ = sign;
digit = '9';
}
-#pragma nowarn(1506) // warning elimination
Int32 i = getLeadingPrecision();
-#pragma warn(1506) // warning elimination
for (; i > 0; i--) *v++ = digit;
if (getStartField() != REC_DATE_FRACTION_MP) {
for (Int32 field = getStartField() + 1; field <= getEndField(); field++) {
@@ -534,9 +530,7 @@ void IntervalType::getRepresentableValue(char sign,
digit == '0' ? 0 : maxITVal[index]);
v += IntervalFieldStringSize;
}
-#pragma nowarn(1506) // warning elimination
if (i = getFractionPrecision()) {
-#pragma warn(1506) // warning elimination
*v++ = '.';
for ( ; i > 0; i--) *v++ = digit;
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/common/IntervalType.h
----------------------------------------------------------------------
diff --git a/core/sql/common/IntervalType.h b/core/sql/common/IntervalType.h
index 2be60fb..378ff76 100644
--- a/core/sql/common/IntervalType.h
+++ b/core/sql/common/IntervalType.h
@@ -67,8 +67,6 @@ short getIntervalFields(Lng32 fsDatatype,
// IntervalType : The interval data type
//
// ***********************************************************************
-#pragma nowarn(1506) // warning elimination
-#pragma nowarn(1319) // warning elimination
class IntervalType : public DatetimeIntervalCommonType
{
public:
@@ -314,8 +312,6 @@ private:
unsigned short leadingPrecision_;
}; // class IntervalType
-#pragma warn(1506) // warning elimination
-#pragma warn(1319) // warning elimination
// ***********************************************************************
//
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/common/Ipc.cpp
----------------------------------------------------------------------
diff --git a/core/sql/common/Ipc.cpp b/core/sql/common/Ipc.cpp
index db077e1..2e3cc42 100644
--- a/core/sql/common/Ipc.cpp
+++ b/core/sql/common/Ipc.cpp
@@ -360,9 +360,7 @@ IpcNodeName IpcProcessId::getNodeName() const
// Perhaps we should set pid_.ipAddress_ = some meaningless ip address?;
return IpcNodeName(SockIPAddress(pid_.ipAddress_));
-#pragma nowarn(1252) // warning elimination
}
-#pragma warn(1252) // warning elimination
IpcCpuNum IpcProcessId::getCpuNum() const
{
@@ -4048,9 +4046,7 @@ void IpcBufferedMsgStream::cleanupBuffers()
}
if (inUseBufList_.entries() < (CollIndex) inUseBufferLimit_)
{ // optimize garbage collection limit until inuse limit reached
-#pragma nowarn(1506) // warning elimination
garbageCollectLimit_ = inUseBufList_.entries();
-#pragma warn(1506) // warning elimination
}
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/common/Ipc.h
----------------------------------------------------------------------
diff --git a/core/sql/common/Ipc.h b/core/sql/common/Ipc.h
index 325c334..04ea89e 100644
--- a/core/sql/common/Ipc.h
+++ b/core/sql/common/Ipc.h
@@ -2325,7 +2325,6 @@ private:
// -----------------------------------------------------------------------
// IpcBufferedMsgStream
// -----------------------------------------------------------------------
-#pragma nowarn(1506) // warning elimination
class IpcBufferedMsgStream : public IpcMessageStreamBase
{
friend class IpcClientMsgStream;
@@ -2517,7 +2516,6 @@ private:
NABoolean smContinueProtocol_;
};
-#pragma warn(1506) // warning elimination
// ----------------------------------------------------------------------------
// IpcClientMsgStream
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/common/IpcGuardian.cpp
----------------------------------------------------------------------
diff --git a/core/sql/common/IpcGuardian.cpp b/core/sql/common/IpcGuardian.cpp
index c46fe77..43b659f 100644
--- a/core/sql/common/IpcGuardian.cpp
+++ b/core/sql/common/IpcGuardian.cpp
@@ -346,9 +346,7 @@ GuaConnectionToServer::GuaConnectionToServer(
activeIOs_[i].ioTag_ = -1;
}
-#pragma nowarn(1506) // warning elimination
lastAllocatedEntry_ = nowaitDepth_-1;
-#pragma warn(1506) // warning elimination
numOutstandingIOs_ = 0;
partiallySentBuffer_ = NULL;
@@ -540,9 +538,7 @@ WaitReturnStatus GuaConnectionToServer::wait(IpcTimeout timeout, UInt32 *eventCo
Int32 retcode = BFILE_GETINFO_(openFile_,&guaErrorInfo_);
if (retcode != 0)
-#pragma nowarn(1506) // warning elimination
guaErrorInfo_ = retcode; // not even FILE_GETINFO_ worked
-#pragma warn(1506) // warning elimination
// timeout does not set the connection into an error state
// but it causes a return
@@ -902,9 +898,7 @@ WaitReturnStatus GuaConnectionToServer::wait(IpcTimeout timeout, UInt32 *eventCo
Int32 errcode2 = BFILE_GETINFO_(openFile_,&guaErrorInfo_);
if (errcode2 != 0)
-#pragma nowarn(1506) // warning elimination
guaErrorInfo_ = errcode2; // not even FILE_GETINFO_ worked
-#pragma warn(1506) // warning elimination
setErrorInfo(-1);
setState(ERROR_STATE);
return WAIT_OK;
@@ -918,9 +912,7 @@ WaitReturnStatus GuaConnectionToServer::wait(IpcTimeout timeout, UInt32 *eventCo
Int32 errcode2 = BFILE_GETINFO_(openFile_,&guaErrorInfo_);
if (errcode2 != 0)
-#pragma nowarn(1506) // warning elimination
guaErrorInfo_ = errcode2; // not even FILE_GETINFO_ worked
-#pragma warn(1506) // warning elimination
setErrorInfo(-1);
setState(ERROR_STATE);
return WAIT_OK;
@@ -936,9 +928,7 @@ WaitReturnStatus GuaConnectionToServer::wait(IpcTimeout timeout, UInt32 *eventCo
Int32 errcode2 = BFILE_GETINFO_(openFile_,&guaErrorInfo_);
if (errcode2 != 0)
-#pragma nowarn(1506) // warning elimination
guaErrorInfo_ = errcode2; // not even FILE_GETINFO_ worked
-#pragma warn(1506) // warning elimination
setErrorInfo(-1);
setState(ERROR_STATE);
return WAIT_OK;;
@@ -978,16 +968,12 @@ GuaConnectionToServer * GuaConnectionToServer::castToGuaConnectionToServer()
Int32 GuaConnectionToServer::numQueuedSendMessages()
{
-#pragma nowarn(1506) // warning elimination
return sendQueueEntries();
-#pragma warn(1506) // warning elimination
}
Int32 GuaConnectionToServer::numQueuedReceiveMessages()
{
-#pragma nowarn(1506) // warning elimination
return receiveQueueEntries();
-#pragma warn(1506) // warning elimination
}
void GuaConnectionToServer::populateDiagsArea(ComDiagsArea *&diags,
@@ -1463,7 +1449,6 @@ void GuaConnectionToServer::openPhandle(char * processName, NABoolean parallelOp
procFileNameLen = phandle.getPhandleStringLen();
strncpy(procFileName, phandle.getPhandleString(), procFileNameLen);
MXTRC_1("GCTS::openPhandle procFileName=%s\n", procFileName);
-#pragma nowarn(1506) // warning elimination
NABoolean isEsp = getEnvironment()->getAllConnections()->getPendingIOs().isEsp();
getEnvironment()->setLdoneConsumed(TRUE);
// multi fragment esp
@@ -1500,7 +1485,6 @@ void GuaConnectionToServer::openPhandle(char * processName, NABoolean parallelOp
// retcode = gettimeofday(&tv2, 0);
// elapsedTime = (tv2.tv_sec - tv1.tv_sec) * 1000000 + tv2.tv_usec - tv1.tv_usec;
}
-#pragma warn(1506) // warning elimination
if (guaErrorInfo_ != GuaOK)
{
setErrorInfo(-1);
@@ -1598,9 +1582,7 @@ MXTRC_2("connection=%x, filenum=%d\n", this, openFile_);
Int32 errcode2 = BFILE_GETINFO_(openFile_,&guaErrorInfo_);
if (errcode2 != 0)
-#pragma nowarn(1506) // warning elimination
guaErrorInfo_ = errcode2; // not even FILE_GETINFO_ worked
-#pragma warn(1506) // warning elimination
setErrorInfo(-1);
setState(ERROR_STATE);
return;
@@ -1614,9 +1596,7 @@ MXTRC_2("connection=%x, filenum=%d\n", this, openFile_);
Int32 errcode2 = BFILE_GETINFO_(openFile_,&guaErrorInfo_);
if (errcode2 != 0)
-#pragma nowarn(1506) // warning elimination
guaErrorInfo_ = errcode2; // not even FILE_GETINFO_ worked
-#pragma warn(1506) // warning elimination
setErrorInfo(-1);
setState(ERROR_STATE);
return;
@@ -1632,9 +1612,7 @@ MXTRC_2("connection=%x, filenum=%d\n", this, openFile_);
Int32 errcode2 = BFILE_GETINFO_(openFile_,&guaErrorInfo_);
if (errcode2 != 0)
-#pragma nowarn(1506) // warning elimination
guaErrorInfo_ = errcode2; // not even FILE_GETINFO_ worked
-#pragma warn(1506) // warning elimination
setErrorInfo(-1);
setState(ERROR_STATE);
return;
@@ -2042,16 +2020,12 @@ GuaConnectionToClient * GuaConnectionToClient::castToGuaConnectionToClient()
Int32 GuaConnectionToClient::numQueuedSendMessages()
{
-#pragma nowarn(1506) // warning elimination
return sendQueueEntries();
-#pragma warn(1506) // warning elimination
}
Int32 GuaConnectionToClient::numQueuedReceiveMessages()
{
-#pragma nowarn(1506) // warning elimination
return receiveQueueEntries();
-#pragma warn(1506) // warning elimination
}
void GuaConnectionToClient::populateDiagsArea(ComDiagsArea *&diags,
@@ -2322,9 +2296,7 @@ void GuaConnectionToClient::acceptBuffer(IpcMessageBuffer *buffer,
assert(chunkBytesReceived_ + receivedDataLength <= totalMessageLength);
str_cpy_all(partiallyReceivedBuffer_->data(chunkBytesReceived_),
buffer->data(0),
-#pragma nowarn(1506) // warning elimination
receivedDataLength);
-#pragma warn(1506) // warning elimination
chunkBytesReceived_ += receivedDataLength;
// must reply with an empty message to secondary request chunks
@@ -2491,9 +2463,7 @@ WaitReturnStatus GuaReceiveControlConnection::wait(IpcTimeout timeout, UInt32 *e
while (retry)
{
if(initialized_ || timeout != IpcInfiniteTimeout){
-#pragma nowarn(252) // warning elimination
_cc_status stat;
-#pragma nowarn(252) // warning elimination
if (ipcAwaitiox == NULL || !ipcAwaitiox->getCompleted())
{
stat = BAWAITIOX(&receiveFile_,
@@ -2509,9 +2479,7 @@ WaitReturnStatus GuaReceiveControlConnection::wait(IpcTimeout timeout, UInt32 *e
&countTransferred,
&ioTag);
}
- #pragma warn(252) // warning elimination
if (_status_ne(stat))
-#pragma warn(252) // warning elimination
retcode = BFILE_GETINFO_(receiveFile_,&guaErrorInfo_);
else
retcode = guaErrorInfo_ = GuaOK;
@@ -2520,9 +2488,7 @@ WaitReturnStatus GuaReceiveControlConnection::wait(IpcTimeout timeout, UInt32 *e
// Set the timeout to 1 min
Lng32 newTimeOut= 100*60*1;
NABoolean done = FALSE;
-#pragma nowarn(252) // warning elimination
while(!done){
-#pragma nowarn(252) // warning elimination
_cc_status stat;
if (guaReceiveFastStart_ != NULL && guaReceiveFastStart_->awaitiox_)
{
@@ -2550,7 +2516,6 @@ WaitReturnStatus GuaReceiveControlConnection::wait(IpcTimeout timeout, UInt32 *e
}
else
{
-#pragma warn(252) // warning elimination
if (_status_ne(stat))
retcode = BFILE_GETINFO_(receiveFile_,&guaErrorInfo_);
else
@@ -4137,7 +4102,6 @@ void IpcGuardianServer::launchProcess(ComDiagsArea **diags,
return;
}
-#pragma nowarn(770) // warning elimination
void IpcGuardianServer::spawnProcess(ComDiagsArea **diags,
CollHeap *diagsHeap)
{
@@ -4254,7 +4218,6 @@ void IpcGuardianServer::useProcess(ComDiagsArea **diags,
}
}
-#pragma warn(770) // warning elimination
short IpcGuardianServer::changePriority(IpcPriority priority, NABoolean isDelta)
{
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/common/IpcSockets.cpp
----------------------------------------------------------------------
diff --git a/core/sql/common/IpcSockets.cpp b/core/sql/common/IpcSockets.cpp
index d075236..e668a55 100644
--- a/core/sql/common/IpcSockets.cpp
+++ b/core/sql/common/IpcSockets.cpp
@@ -76,9 +76,7 @@ typedef size_t length_t;
// comment this out once NAHeap.h is in common
// #include "NAHeap.h"
// for now declare overloaded operator new here
-#pragma warning (disable : 4273) //warning elimination
void * operator new(size_t size, CollHeap* h);
-#pragma warning (default : 4273) //warning elimination
#ifdef DISABLE_SOCKET_IPC
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/common/NAAssert.cpp
----------------------------------------------------------------------
diff --git a/core/sql/common/NAAssert.cpp b/core/sql/common/NAAssert.cpp
index a015f38..adbaa8c 100644
--- a/core/sql/common/NAAssert.cpp
+++ b/core/sql/common/NAAssert.cpp
@@ -40,9 +40,7 @@
#include "NAAssert.h"
#include "SQLCLIdev.h"
- #pragma nowarn (1506) // warning elimination
#include <iostream>
- #pragma warn (1506) // warning elimination
// To debug an inline function:
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/common/NAError.cpp
----------------------------------------------------------------------
diff --git a/core/sql/common/NAError.cpp b/core/sql/common/NAError.cpp
index d154539..50503f9 100644
--- a/core/sql/common/NAError.cpp
+++ b/core/sql/common/NAError.cpp
@@ -90,9 +90,7 @@ NAError::NAError(const NAErrorCode errCode,
)
: errCode_(errCode), errType_(errType), subsysId_(subsys),
procName_(procName),
-#pragma nowarn(1506) // warning elimination
lineNumber_(lineNumber), offset_(offset), next_(0)
-#pragma warn(1506) // warning elimination
{
errParams_ = errParams;
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/common/NAMemory.cpp
----------------------------------------------------------------------
diff --git a/core/sql/common/NAMemory.cpp b/core/sql/common/NAMemory.cpp
index 05e42be..8b50a2e 100644
--- a/core/sql/common/NAMemory.cpp
+++ b/core/sql/common/NAMemory.cpp
@@ -1513,10 +1513,6 @@ NAHeap::computeTreeIndex(size_t size)
}
}
-#ifdef WIN32
-#pragma warning( disable : 4146 ) // no "unsigned" warnings
-#endif // WIN32
-
// Isolate the least set bit of a bitmap
inline NAHeap::binmap_t
NAHeap::leastBit(binmap_t bits)
@@ -2122,10 +2118,6 @@ NAHeap::tmallocSmall(size_t nb)
return NULL;
}
-#ifdef WIN32
-#pragma warning( default : 4146 ) // allow "unsigned" warnings
-#endif // WIN32
-
Lng32 NAMemory::getAllocatedSpaceSize()
{
assert(type_ != NO_MEMORY_TYPE);
@@ -4107,9 +4099,7 @@ void * DefaultIpcHeap::allocateIpcHeapMemory(size_t size, NABoolean failureIsFat
return NULL;
void * rc = ::operator new(size);
-#pragma nowarn(1506) // warning elimination
HEAPLOG_ADD_ENTRY(rc, size, heapID_.heapNum, getName())
-#pragma warn(1506) // warning elimination
if (rc) return rc;
if (failureIsFatal)
{
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/common/NAString.cpp
----------------------------------------------------------------------
diff --git a/core/sql/common/NAString.cpp b/core/sql/common/NAString.cpp
index 26fb9dc..21128fb 100644
--- a/core/sql/common/NAString.cpp
+++ b/core/sql/common/NAString.cpp
@@ -169,9 +169,7 @@ char *convertNAString(const NAString& ns, CollHeap *heap, NABoolean wideNull)
cerr << "Possible memory leak: convertNAString called with NULL heap\n";
#endif
}
-#pragma nowarn(1506) // warning elimination
str_cpy_all(buf, ns.data(), len);
-#pragma warn(1506) // warning elimination
if (wideNull == TRUE)
((NAWchar *)buf)[len / sizeof(NAWchar)] = L'\0';
else
@@ -454,9 +452,7 @@ NAString ToAnsiIdentifier(const NAString &ns, NABoolean assertShort)
static Lng32 illegalCharInIdentifier(NAString &ansiIdent,
size_t i, size_t countOfRemoved)
{
-#pragma nowarn(1506) // warning elimination
ansiIdent[(size_t)0] = i + countOfRemoved;
-#pragma warn(1506) // warning elimination
return -3127;
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/common/NAString2.cpp
----------------------------------------------------------------------
diff --git a/core/sql/common/NAString2.cpp b/core/sql/common/NAString2.cpp
index cc30bb5..c5dd222 100644
--- a/core/sql/common/NAString2.cpp
+++ b/core/sql/common/NAString2.cpp
@@ -113,9 +113,7 @@ char * ToAnsiIdentifier2(const char * nsData, size_t nsLen,
return NULL;
char * retBuf = new(heap) char[len + 1];
-#pragma nowarn(1506) // warning elimination
str_cpy_all(retBuf, buf, len);
-#pragma warn(1506) // warning elimination
retBuf[len] = 0;
return retBuf;
@@ -242,9 +240,7 @@ void ToAnsiIdentifier3(const char * inputData, size_t inputLen,
}
// copy the converted identifier to the output
-#pragma nowarn(1506) // warning elimination
str_cpy_all(outputData, bptr, len);
-#pragma warn(1506) // warning elimination
outputData[len] = 0;
*outputLen = len;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/common/NAStringDefGlobals.h
----------------------------------------------------------------------
diff --git a/core/sql/common/NAStringDefGlobals.h b/core/sql/common/NAStringDefGlobals.h
index edacbcd..4a99ec2 100644
--- a/core/sql/common/NAStringDefGlobals.h
+++ b/core/sql/common/NAStringDefGlobals.h
@@ -132,7 +132,6 @@ private: // not protected -- we don't expect anyone to ever inherit from NAStrin
// In order to use the above ctor with NAMemory the way we want, we need
// to make sure that we don't use the globally-defined new. So we write
// for NAStringRef.
-#pragma nowarn (1059) // warning elimination
static inline void* operator new (size_t, void* loc)
{
return loc ; // yes, it's really this simple!
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/common/NATestpoint.cpp
----------------------------------------------------------------------
diff --git a/core/sql/common/NATestpoint.cpp b/core/sql/common/NATestpoint.cpp
index 323adef..72405d5 100644
--- a/core/sql/common/NATestpoint.cpp
+++ b/core/sql/common/NATestpoint.cpp
@@ -290,14 +290,12 @@ CNATestPoint::SetTrapError ( const Int32 trapError )
// A function that keeps calling itself, used to create a stack
// overflow trap.
// -------------------------------------------------------------------
-#pragma warning ( disable : 4717 ) // disable the recursive call / stack overflow warning for this method
void
CNATestPoint::RecursiveCall( char buffer[100000] )
{
char a[100000];
RecursiveCall(a);
}
-#pragma warning ( default : 4717 ) // enable the recursive call / stack overflow warning
// -------------------------------------------------------------------
// Method: Wait
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/common/NAType.cpp
----------------------------------------------------------------------
diff --git a/core/sql/common/NAType.cpp b/core/sql/common/NAType.cpp
index 4b8384f..8ace6f7 100644
--- a/core/sql/common/NAType.cpp
+++ b/core/sql/common/NAType.cpp
@@ -621,9 +621,7 @@ Lng32 NAType::getDisplayLength(Lng32 datatype,
(UInt32) precision,
endField,
(UInt32) scale);
-#pragma nowarn(1506) // warning elimination
d_len = interval.getDisplayLength();
-#pragma warn(1506) // warning elimination
}
break;
@@ -820,12 +818,8 @@ short NAType::getMyTypeAsText(NAString * outputStr, // output
dtStartField = (ComDateTimeStartEnd)dtiCommonType.getStartField();
dtEndField = (ComDateTimeStartEnd)dtiCommonType.getEndField();
-#pragma nowarn(1506) // warning elimination
dtTrailingPrecision = dtiCommonType.getFractionPrecision();
-#pragma warn(1506) // warning elimination
-#pragma nowarn(1506) // warning elimination
dtLeadingPrecision = dtiCommonType.getLeadingPrecision();
-#pragma warn(1506) // warning elimination
}
// Prepare parameters in case of a CHARACTER type
@@ -882,16 +876,12 @@ short NAType::getMyTypeAsText(NAString * outputStr, // output
Lng32 NAType::getSize() const
{
-#pragma nowarn(1506) // warning elimination
return sizeof(*this) + typeName_.length();
-#pragma warn(1506) // warning elimination
}
Lng32 NAType::hashKey() const
{
-#pragma nowarn(1506) // warning elimination
return typeName_.hash();
-#pragma warn(1506) // warning elimination
}
// return true iff it is safe to call NAType::hashKey on me
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/common/NAWinNT.h
----------------------------------------------------------------------
diff --git a/core/sql/common/NAWinNT.h b/core/sql/common/NAWinNT.h
index 08f4d33..2edcd1e 100644
--- a/core/sql/common/NAWinNT.h
+++ b/core/sql/common/NAWinNT.h
@@ -164,9 +164,7 @@ inline
NAWchar na_towupper (NAWchar wc)
{
if ( NAWCHR('a') <= wc && wc <= NAWCHR('z') )
-#pragma nowarn(1506) // warning elimination
return wc - NAWCHR('a') + NAWCHR('A');
-#pragma warn(1506) // warning elimination
else
return wc;
}
@@ -175,9 +173,7 @@ inline
NAWchar na_towlower (NAWchar wc)
{
if ( NAWCHR('A') <= wc && wc <= NAWCHR('Z') )
-#pragma nowarn(1506) // warning elimination
return wc - NAWCHR('A') + NAWCHR('a');
-#pragma warn(1506) // warning elimination
else
return wc;
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/common/NumericType.cpp
----------------------------------------------------------------------
diff --git a/core/sql/common/NumericType.cpp b/core/sql/common/NumericType.cpp
index e16cf57..130598e 100644
--- a/core/sql/common/NumericType.cpp
+++ b/core/sql/common/NumericType.cpp
@@ -77,9 +77,7 @@ static void unsignedLongToAscii(ULng32 number, char * asciiString,
char temp;
Int32 i,j;
-#pragma nowarn(1506) // warning elimination
for (i = 0, j = strlen(asciiString)-1; i < j; i++, j--)
-#pragma warn(1506) // warning elimination
{
temp = asciiString[i];
asciiString[i] = asciiString[j];
@@ -1078,7 +1076,6 @@ NAString* SQLSmall::convertToString(double v, CollHeap* h) const
// Methods for SQLBPInt
// -----------------------------------------------------------------------
-#pragma nowarn(1506) // warning elimination
SQLBPInt::SQLBPInt(NAMemory *heap, UInt32 declared,
NABoolean allowSQLnull,
NABoolean allowNegValues)
@@ -1096,7 +1093,6 @@ SQLBPInt::SQLBPInt(NAMemory *heap, UInt32 declared,
assert (allowNegValues == FALSE);
declaredSize_ = declared;
} // SQLBPInt()
-#pragma warn(1506) // warning elimination
// Are two BPInt types equal if they have different storage sizes??
NABoolean SQLBPInt::operator==(const NAType& other) const
@@ -1718,9 +1714,7 @@ void SQLNumeric::maxRepresentableValue(void* bufPtr, Lng32* bufLen,
Lng32 i=0;
for (; i<getPrecision(); i++)
{
-#pragma nowarn(1506) // warning elimination
temp = temp * 10 + 9;
-#pragma warn(1506) // warning elimination
}
for (i = 0; i < getNominalSize(); i++)
@@ -1885,13 +1879,9 @@ double SQLNumeric::getMinValue() const
Lng32 i=0;
for (; i<getPrecision(); i++)
{
-#pragma nowarn(1506) // warning elimination
temp = temp * 10 + 9;
-#pragma warn(1506) // warning elimination
}
-#pragma nowarn(1506) // warning elimination
temp = -temp;
-#pragma warn(1506) // warning elimination
temp *= pow(10.0, -1 * getScale());
return double(temp);
@@ -1945,9 +1935,7 @@ double SQLNumeric::getMaxValue() const
Lng32 i=0;
for (; i<getPrecision(); i++)
{
-#pragma nowarn(1506) // warning elimination
temp = temp * 10 + 9;
-#pragma warn(1506) // warning elimination
}
temp *= pow(10.0, -1 * getScale());
@@ -1999,9 +1987,7 @@ double SQLDecimal::encode(void * input) const
// Reset the bit before converting to double.
if (temp_dec[0] & 0200)
{
-#pragma nowarn(1506) // warning elimination
temp_dec[0] = temp_dec[0] & 0177;
-#pragma warn(1506) // warning elimination
temp = - atof(temp_dec);
}
else
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/common/NumericType.h
----------------------------------------------------------------------
diff --git a/core/sql/common/NumericType.h b/core/sql/common/NumericType.h
index 09c4bd8..381ff88 100644
--- a/core/sql/common/NumericType.h
+++ b/core/sql/common/NumericType.h
@@ -1058,7 +1058,6 @@ private:
// this values (ex. precision > 18).
//
// ***********************************************************************
-#pragma nowarn(1319) // warning elimination
class SQLBigNum : public NumericType
{
public:
@@ -1163,8 +1162,6 @@ private:
// are non-bignums)
NABoolean isARealBigNum_;
}; // class SQLBigNum
-#pragma warn(1319) // warning elimination
-
// ***********************************************************************
//
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/common/QueryText.h
----------------------------------------------------------------------
diff --git a/core/sql/common/QueryText.h b/core/sql/common/QueryText.h
index 302e31d..32e63f5 100644
--- a/core/sql/common/QueryText.h
+++ b/core/sql/common/QueryText.h
@@ -89,11 +89,9 @@ inline Int32 QueryText::canBeUsedBySqlcompTest(char** text)
inline Int32 QueryText::octetLength()
{
-#pragma nowarn(1506) // warning elimination
return charset_==SQLCHARSETCODE_UCS2 ?
na_wcslen((const NAWchar*)wText()) *
CharInfo::maxBytesPerChar((CharInfo::CharSet)charset_) : str_len(text());
-#pragma warn(1506) // warning elimination
}
inline Int32 QueryText::octetLenPlusOne()
@@ -103,9 +101,7 @@ inline Int32 QueryText::octetLenPlusOne()
inline Int32 QueryText::length()
{
-#pragma nowarn(1506) // warning elimination
return charset_==SQLCHARSETCODE_UCS2 ? na_wcslen(wText()) : str_len(text());
-#pragma warn(1506) // warning elimination
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/common/SequenceGeneratorAttributes.h
----------------------------------------------------------------------
diff --git a/core/sql/common/SequenceGeneratorAttributes.h b/core/sql/common/SequenceGeneratorAttributes.h
index dc2b9b5..2220781 100644
--- a/core/sql/common/SequenceGeneratorAttributes.h
+++ b/core/sql/common/SequenceGeneratorAttributes.h
@@ -46,7 +46,6 @@ class SequenceGeneratorAttributes;
// SequenceGeneratorAttributes contains all the attributes of a
// sequence generator
// ***********************************************************************
-#pragma nowarn(1506) // warning elimination
class SequenceGeneratorAttributes : public NABasicObject
{
public:
@@ -207,6 +206,5 @@ private:
Int64 sgEndValue_;
Int64 sgRedefTime_;
}; // class SequenceGeneratorAttributes
-#pragma warn(1506) // warning elimination
#endif /* SEQUENCEGENERATORATTRIBUTES_H */
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/common/charinfo.cpp
----------------------------------------------------------------------
diff --git a/core/sql/common/charinfo.cpp b/core/sql/common/charinfo.cpp
index 3891f98..d10e888 100644
--- a/core/sql/common/charinfo.cpp
+++ b/core/sql/common/charinfo.cpp
@@ -345,9 +345,7 @@ CollationInfo::CollationInfo(CollHeap *h,
namelen_ = strlen(name); // allowed to be 0 if siz[] not passed in
if (siz) {
size_t cnt = siz[0];
-#pragma nowarn(270) // warning elimination
ComASSERT(cnt >= 0 && cnt < MAX_NAME_PARTS);
-#pragma warn(270) // warning elimination
ComASSERT(namelen_ > 0 && namelen_ == siz[1]);
for (size_t off = 0; off < OFFSETARRAY_SIZE; off++) {
synonymOffset_[off] = (off < cnt) ? siz[off+2] : 0;
@@ -649,9 +647,7 @@ const char* CharInfo::getLocaleCharSetAsString()
} else
return localeCharSet_;
-#pragma nowarn(203) // warning elimination
return SQLCHARSETSTRING_UNKNOWN;
-#pragma warn(203) // warning elimination
}
Int32 CharInfo::getTargetCharTypeFromLocale()
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/common/conversionHex.cpp
----------------------------------------------------------------------
diff --git a/core/sql/common/conversionHex.cpp b/core/sql/common/conversionHex.cpp
index 2eb337f..f1d2564 100644
--- a/core/sql/common/conversionHex.cpp
+++ b/core/sql/common/conversionHex.cpp
@@ -47,18 +47,12 @@ static
unsigned short getHexDigitValue(NAWchar wc)
{
if ( isDigit8859_1(wc) )
-#pragma nowarn(1506) // warning elimination
return (unsigned short)wc - '0';
-#pragma warn(1506) // warning elimination
else {
if ( 'A' <= wc AND wc <= 'F' )
-#pragma nowarn(1506) // warning elimination
return (unsigned short)wc - 'A' + 10;
-#pragma warn(1506) // warning elimination
else
-#pragma nowarn(1506) // warning elimination
return (unsigned short)wc - 'a' + 10;
-#pragma warn(1506) // warning elimination
}
}
@@ -102,18 +96,10 @@ convHexToChar(const NAWchar *s, Int32 inputLen, CharInfo::CharSet cs, CollHeap*
for (Int32 i = 0; i < inputLen; i=i+2) {
if (isHexDigit8859_1(s[i]) AND isHexDigit8859_1(s[i+1])) {
-#pragma warning (disable : 4244) //warning elimination
-#pragma nowarn(1506) // warning elimination
upper4Bits = getHexDigitValue(s[i]);
-#pragma warn(1506) // warning elimination
-#pragma nowarn(1506) // warning elimination
lower4Bits = getHexDigitValue(s[i+1]);
-#pragma warn(1506) // warning elimination
-#pragma warning (default : 4244) //warning elimination
-#pragma nowarn(1506) // warning elimination
char c = (upper4Bits << 4) | lower4Bits;
-#pragma warn(1506) // warning elimination
r->append(c);
} else {
NADELETE(r, NAString, heap);
@@ -143,9 +129,7 @@ convHexToWChar(const NAWchar *s, Int32 inputLen, CharInfo::CharSet cs, CollHeap*
unsigned short third4Bits = getHexDigitValue(s[i+2]);
unsigned short fourth4Bits = getHexDigitValue(s[i+3]);
-#pragma nowarn(1506) // warning elimination
NAWchar wc = (first4Bits << 12) | (second4Bits << 8) | (third4Bits << 4) | fourth4Bits;
-#pragma warn(1506) // warning elimination
r->append(wc);
}
else {
@@ -154,9 +138,7 @@ convHexToWChar(const NAWchar *s, Int32 inputLen, CharInfo::CharSet cs, CollHeap*
}
}
-#pragma nowarn(1506) // warning elimination
if (! CharInfo::checkCodePoint(r->data(), r->length(), cs) ) {
-#pragma warn(1506) // warning elimination
NADELETE(r, NAWString, heap);
return NULL;
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/common/conversionSJIS.cpp
----------------------------------------------------------------------
diff --git a/core/sql/common/conversionSJIS.cpp b/core/sql/common/conversionSJIS.cpp
index c714e75..f4f7ba2 100644
--- a/core/sql/common/conversionSJIS.cpp
+++ b/core/sql/common/conversionSJIS.cpp
@@ -181,9 +181,7 @@ sjisToUnicode(const charBuf& sjisString, CollHeap *heap,
u = (NAWchar)c; // found in the first single-byte block
else
if ( isSingleByteSJIS2ndBlock(c) )
-#pragma nowarn(1506) // warning elimination
u = (NAWchar)c - 0xA1 + 0xFF61; // found in the 2nd single-byte block
-#pragma warn(1506) // warning elimination
else {
// the second byte does not exist!
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/common/csconvert.cpp
----------------------------------------------------------------------
diff --git a/core/sql/common/csconvert.cpp b/core/sql/common/csconvert.cpp
index b4bdaac..5cdf9ca 100644
--- a/core/sql/common/csconvert.cpp
+++ b/core/sql/common/csconvert.cpp
@@ -38,7 +38,6 @@
#include "fcconv.h"
#include "csconvert.h"
-#pragma nowarn(161) // warning elimination
#include "from_GB18030.c"
#include "from_GB2312.c"
#include "from_GBK.c"
@@ -51,7 +50,6 @@
#include "mb_iconv.c"
#include "iconv_gen.c"
-#pragma warn(161) // warning elimination
#include "mb_lconv.c"
#undef USE_OUR_MB_WC_DATA_TABLES
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/common/dfs2rec.h
----------------------------------------------------------------------
diff --git a/core/sql/common/dfs2rec.h b/core/sql/common/dfs2rec.h
index 1558ed8..910cda3 100644
--- a/core/sql/common/dfs2rec.h
+++ b/core/sql/common/dfs2rec.h
@@ -373,8 +373,6 @@ struct rec_project_struct
#ifndef FS2_RECORD_DEFINED
-#pragma nowarn(1506) // warning elimination
-#pragma nowarn(270) // warning elimination
class rec_field_struct
{
private:
@@ -594,8 +592,6 @@ public:
short offset_ix; // not used
short default_offset; // not used
};
-#pragma warn(1506) // warning elimination
-#pragma warn(270) // warning elimination
// this struct is same as REC^RECORD^STRUCT from sql/mp DFS2REC.
// DO NOT CHANGE IT IN ANY WAY.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/common/ipcmsg.cpp
----------------------------------------------------------------------
diff --git a/core/sql/common/ipcmsg.cpp b/core/sql/common/ipcmsg.cpp
index 1daa976..f6c8f92 100644
--- a/core/sql/common/ipcmsg.cpp
+++ b/core/sql/common/ipcmsg.cpp
@@ -135,9 +135,7 @@ GuaMsgConnectionToServer::GuaMsgConnectionToServer(
activeIOs_[i].transid_ = -1;
activeIOs_[i].buffer_ = activeIOs_[i].readBuffer_ = NULL;
}
-#pragma nowarn(1506) // warning elimination
lastAllocatedEntry_ = nowaitDepth_-1;
-#pragma warn(1506) // warning elimination
numOutstandingIOs_ = 0;
partiallySentBuffer_ = NULL;
@@ -228,9 +226,7 @@ WaitReturnStatus GuaMsgConnectionToServer::wait(IpcTimeout timeout, UInt32 *even
short waitField = LDONE | LSIG;
short status = 0;
direct_globals_template * pfsptr;
-#pragma nowarn(252) // warning elimination
fs2_get_pfsaddr((Long*)&pfsptr);
-#pragma warn(252) // warning elimination
if ((ULng32)(openFile_) >= (ULng32)(pfsptr->numftentries))
{
@@ -357,9 +353,7 @@ WaitReturnStatus GuaMsgConnectionToServer::wait(IpcTimeout timeout, UInt32 *even
{
getEnvironment()->setLsigConsumed(FALSE);
short oldsigmod = PK_SUSPEND_DISALLOW_SET_(1);
-#pragma nowarn(1506) // warning elimination
error = PK_SIG_SYSTEMCALL_ABORTINQUIRE_();
-#pragma warn(1506) // warning elimination
PK_SUSPEND_DISALLOW_SET_(oldsigmod);
if (error > 0)
{
@@ -673,16 +667,12 @@ GuaMsgConnectionToServer * GuaMsgConnectionToServer::castToGuaMsgConnectionToSer
Int32 GuaMsgConnectionToServer::numQueuedSendMessages()
{
-#pragma nowarn(1506) // warning elimination
return sendQueueEntries();
-#pragma warn(1506) // warning elimination
}
Int32 GuaMsgConnectionToServer::numQueuedReceiveMessages()
{
-#pragma nowarn(1506) // warning elimination
return receiveQueueEntries();
-#pragma warn(1506) // warning elimination
}
void GuaMsgConnectionToServer::populateDiagsArea(ComDiagsArea *&diags,
@@ -971,9 +961,7 @@ NABoolean GuaMsgConnectionToServer::tryToStartNewIO()
// Get the pointer to the acb - needed in order to decrement the count
// of outstanding requests in the ACB on errors.
-#pragma nowarn(252) // warning elimination
fs2_get_pfsaddr((Long*)&pfsptr);
-#pragma warn(252) // warning elimination
// check that the file is actually open, i.e., that this is a valid
// filenum.
@@ -990,10 +978,8 @@ NABoolean GuaMsgConnectionToServer::tryToStartNewIO()
if (NOT GuardianError)
{
// lock memory used for the control info buffer
-#pragma nowarn(1506) // warning elimination
GuardianError = ADDRESS_WIRE_((unsigned char *)entry.controlBuf_,
sizeof(fs_fs_writeread), wireOptions);
-#pragma warn(1506) // warning elimination
}
if (NOT GuardianError)
@@ -1204,7 +1190,6 @@ void GuaMsgConnectionToServer::openPhandle(char * processName)
_cc_status stat;
while (1)
{
-#pragma nowarn(1506) // warning elimination
guaErrorInfo_ = FILE_OPEN_(procFileName,
procFileNameLen,
&openFile_,
@@ -1213,7 +1198,6 @@ void GuaMsgConnectionToServer::openPhandle(char * processName)
nowaitDepth_,
0, // sync depth 0 (target proc is not NonStop)
openFlags); // options
-#pragma warn(1506) // warning elimination
if (guaErrorInfo_ != GuaOK)
break;
@@ -1269,9 +1253,7 @@ void GuaMsgConnectionToServer::openPhandle(char * processName)
Int32 errcode2 = FILE_GETINFO_(openFile_,&guaErrorInfo_);
if (errcode2 != 0)
-#pragma nowarn(1506) // warning elimination
guaErrorInfo_ = errcode2; // not even FILE_GETINFO_ worked
-#pragma warn(1506) // warning elimination
setErrorInfo(-1);
setState(ERROR_STATE);
return;
@@ -1285,9 +1267,7 @@ void GuaMsgConnectionToServer::openPhandle(char * processName)
Int32 errcode2 = FILE_GETINFO_(openFile_,&guaErrorInfo_);
if (errcode2 != 0)
-#pragma nowarn(1506) // warning elimination
guaErrorInfo_ = errcode2; // not even FILE_GETINFO_ worked
-#pragma warn(1506) // warning elimination
setErrorInfo(-1);
setState(ERROR_STATE);
return;
@@ -1303,9 +1283,7 @@ void GuaMsgConnectionToServer::openPhandle(char * processName)
Int32 errcode2 = FILE_GETINFO_(openFile_,&guaErrorInfo_);
if (errcode2 != 0)
-#pragma nowarn(1506) // warning elimination
guaErrorInfo_ = errcode2; // not even FILE_GETINFO_ worked
-#pragma warn(1506) // warning elimination
setErrorInfo(-1);
setState(ERROR_STATE);
return;
@@ -1392,9 +1370,7 @@ short GuaMsgConnectionToServer::setupRequestInfo(void * control, Int64 transid){
short error = FEOK; //variable to catch errors
//first get pointer to the PFS
-#pragma nowarn(252) // warning elimination
fs2_get_pfsaddr((Long*)&pfsptr);
-#pragma warn(252) // warning elimination
//then get pointer to the acb in the
//PFS Filetable at the index openFile_
@@ -1500,18 +1476,14 @@ void GuaMsgConnectionToServer::putMsgIdinACB(UInt32 msgid){
acb_standard_template * acb;//pointer to the acb for openFile_
//first get pointer to the PFS
-#pragma nowarn(252) // warning elimination
fs2_get_pfsaddr((Long*)&pfsptr);
-#pragma warn(252) // warning elimination
//then get pointer to the acb in the PFS
//Filetable at the index openFile_
acb = (acb_standard_template *) pfsptr->file_table[openFile_];
//get the index into the array of acb requests
-#pragma nowarn(1506) // warning elimination
int_16 next = acb->acb_numreqs - 1;
-#pragma warn(1506) // warning elimination
void ** acb_reqaddrs = (void **)((char *)&(acb->req.acb_requestbase_addr) +
sizeof(acb->req.acb_requestbase_addr) );
@@ -1524,9 +1496,7 @@ void GuaMsgConnectionToServer::putMsgIdinACB(UInt32 msgid){
acb_reqptr->mid.acb_mid = msgid;
if (acb_reqptr->tub.acb_tubaddr != 0)
acb_reqptr->tub.acb_tub->pending_count =
-#pragma nowarn(1506) // warning elimination
(ULng32)(acb_reqptr->tub.acb_tub->pending_count) + 1u;
-#pragma warn(1506) // warning elimination
#endif
}
@@ -1545,9 +1515,7 @@ void GuaMsgConnectionToServer::resetAfterReply(UInt32 msgid, short error,
short i;
//first get pointer to the PFS
-#pragma nowarn(252) // warning elimination
fs2_get_pfsaddr((Long*)&pfsptr);
-#pragma warn(252) // warning elimination
//then get pointer to the acb in the
//PFS Filetable at the index openFile_
@@ -1581,9 +1549,7 @@ void GuaMsgConnectionToServer::resetAfterReply(UInt32 msgid, short error,
if (acb_reqptr->tub.acb_tubaddr != 0)
acb_reqptr->tub.acb_tub->pending_count =
-#pragma nowarn(1506) // warning elimination
(ULng32)(acb_reqptr->tub.acb_tub->pending_count) - 1u;
-#pragma warn(1506) // warning elimination
//decrement the numreqs
acb->acb_numreqs = acb->acb_numreqs - 1;
@@ -1597,9 +1563,7 @@ void GuaMsgConnectionToServer::resetAfterReply(UInt32 msgid, short error,
while (i != acb->acb_numreqs)
{
acb_reqaddrs[i] = acb_reqaddrs[i + 1];
-#pragma nowarn(1506) // warning elimination
i = i + 1;
-#pragma warn(1506) // warning elimination
}
acb_reqaddrs[acb->acb_numreqs] = (void *)acb_reqptr;
}
@@ -1827,11 +1791,9 @@ short GuaMsgConnectionToServer::addressWire(ActiveIOQueueEntry &entry,
if (entry.buffer_->getLockCount(entry.offset_) == 0)
{
// if the write buffer chunk is not locked, lock it
-#pragma nowarn(1506) // warning elimination
GuardianError = ADDRESS_WIRE_
((unsigned char *)entry.buffer_->data(entry.offset_),
entry.bytesSent_, wireOptions);
-#pragma warn(1506) // warning elimination
if (GuardianError)
return GuardianError;
}
@@ -1843,13 +1805,11 @@ short GuaMsgConnectionToServer::addressWire(ActiveIOQueueEntry &entry,
{
// write buffer is only used by a single connection
// entry.buffer_ = entry.readBuffer_ = send buffer
-#pragma nowarn(1506) // warning elimination
ULng32 maxDataBufferLength =
MAXOF(entry.receiveBufferSizeLeft_, entry.bytesSent_);
GuardianError= ADDRESS_WIRE_
((unsigned char *)entry.buffer_->data(entry.offset_),
maxDataBufferLength, wireOptions);
-#pragma warn(1506) // warning elimination
if (GuardianError)
return GuardianError;
}
@@ -1862,11 +1822,9 @@ short GuaMsgConnectionToServer::addressWire(ActiveIOQueueEntry &entry,
// entry.buffer_ = send buffer (shared)
// entry.readBuffer_ = reply buffer
assert(entry.buffer_->isShared());
-#pragma nowarn(1506) // warning elimination
GuardianError = ADDRESS_WIRE_
((unsigned char *)entry.readBuffer_->data(0),
entry.receiveBufferSizeLeft_, wireOptions);
-#pragma warn(1506) // warning elimination
if (GuardianError)
{
// if error, unlock write buffer that must be shared
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/common/nawstring.cpp
----------------------------------------------------------------------
diff --git a/core/sql/common/nawstring.cpp b/core/sql/common/nawstring.cpp
index 9b853ba..4a4048b 100644
--- a/core/sql/common/nawstring.cpp
+++ b/core/sql/common/nawstring.cpp
@@ -48,9 +48,7 @@ void NAWString::initFromSingleByteString(Lng32 charset, const char* str, size_t
{
assert(str!=nanil);
NAWchar buf[N+1];
-#pragma nowarn(1506) // warning elimination
Lng32 wcs = LocaleStringToUnicode(charset, (char*)str, N, buf, N, FALSE);
-#pragma warn(1506) // warning elimination
buf[wcs] = 0;
append(buf, wcs);
}