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:05 UTC
[01/12] incubator-trafodion git commit: TRAFODION-2731 CodeCleanup:
Phase 4. Remove legacy/obsolete pragmas
Repository: incubator-trafodion
Updated Branches:
refs/heads/master bd2932b6f -> 2eaef5d7a
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/sqlmsg/ComDiagsMsg.cpp
----------------------------------------------------------------------
diff --git a/core/sql/sqlmsg/ComDiagsMsg.cpp b/core/sql/sqlmsg/ComDiagsMsg.cpp
index 62a8b2f..e9ecaa5 100644
--- a/core/sql/sqlmsg/ComDiagsMsg.cpp
+++ b/core/sql/sqlmsg/ComDiagsMsg.cpp
@@ -155,16 +155,13 @@ static const UInt32 DEST_BUF_SIZE = 2 * ErrorMessage::MSG_BUF_SIZE;
static inline void Encode36(char &dst, Int32 src)
{
char tc = (char) src;
-#pragma nowarn(1506) // warning elimination
dst = (tc < 10 ? '0' + tc : 'A' + tc - 10);
-#pragma warn(1506) // warning elimination
}
NABoolean GetSqlstateInfo(Lng32 sqlcode, char * sqlstate,
NABoolean &fabricatedSqlstate);
void AddSqlstateInfo(Lng32 sqlcode, char * sqlstate,
NABoolean fabricatedSqlstate);
-#pragma nowarn(770) // warning elimination
NABoolean ComSQLSTATE(Lng32 theSQLCODE, char *theSQLSTATE)
{
// ---------------------------------------------------------------------
@@ -360,9 +357,7 @@ NABoolean ComSQLSTATE(Lng32 theSQLCODE, char *theSQLSTATE)
case 3: // 7
case 4: // 8
case 5: // 9 - not really used
-#pragma nowarn(1506) // warning elimination
state2 = '4' + (char) codeLeft;
-#pragma warn(1506) // warning elimination
break;
case 6: // I
case 7: // J
@@ -374,9 +369,7 @@ NABoolean ComSQLSTATE(Lng32 theSQLCODE, char *theSQLSTATE)
case 13: // P
case 14: // Q - not used so far (Nov 2001)
case 15: // R
-#pragma nowarn(1506) // warning elimination
state2 = 'I' + (char) (codeLeft - 6);
-#pragma warn(1506) // warning elimination
break;
case 19: // S
state2 = 'S';
@@ -392,9 +385,7 @@ NABoolean ComSQLSTATE(Lng32 theSQLCODE, char *theSQLSTATE)
// are also not yet used
default:
-#pragma nowarn(1506) // warning elimination
state2 = 'Y' + (char) (codeLeft % 2);
-#pragma warn(1506) // warning elimination
break;
}
theSQLSTATE[2] = state2;
@@ -415,7 +406,6 @@ saveAndReturnSqlstate:
}
-#pragma warn(770) // warning elimination
static const char *returnClassOrigin(Lng32 theSQLCODE, size_t offset)
{
@@ -1245,16 +1235,12 @@ void emitError( Lng32 ErrNum, char *stringType, Lng32 numArgs, ... )
for( UInt32 argNum = 0; argNum < (UInt32)numArgs; argNum++ )
if ( stringType[ argNum ] == 'T' ) {
assert( strIdx < 5 );
-#pragma nowarn(1506) // warning elimination
currentErr.setOptionalString( strIdx, va_arg( ap, const char * ) );
-#pragma warn(1506) // warning elimination
strIdx++;
}
else {
assert( intIdx < 5 );
-#pragma nowarn(1506) // warning elimination
currentErr.setOptionalInteger( intIdx,
-#pragma warn(1506) // warning elimination
* (Lng32 *) va_arg(ap, UInt32 *) );
intIdx++;
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/sqlmsg/ErrorMessage.cpp
----------------------------------------------------------------------
diff --git a/core/sql/sqlmsg/ErrorMessage.cpp b/core/sql/sqlmsg/ErrorMessage.cpp
index 640bab2..291b3a2 100644
--- a/core/sql/sqlmsg/ErrorMessage.cpp
+++ b/core/sql/sqlmsg/ErrorMessage.cpp
@@ -51,9 +51,7 @@ void ErrorMessage::insertParams(NAError * errcb)
Int32 tmpLen = 0;
Int32 truncation = FALSE;
-#pragma nowarn(1506) // warning elimination
Int32 msgBufOrigLen = NAWstrlen(msgBuf_);
-#pragma warn(1506) // warning elimination
for (Int32 i = 0; i < msgBufOrigLen; i++)
{
@@ -81,9 +79,7 @@ void ErrorMessage::insertParams(NAError * errcb)
NAWsprintf(paramVal,WIDE_("%s"),param->getStringNAErrorParam());
break;
}
-#pragma nowarn(1506) // warning elimination
paramLen = NAWstrlen(paramVal);
-#pragma warn(1506) // warning elimination
NAWstrncpy(&tmp[tmpLen], paramVal, paramLen);
}
@@ -91,9 +87,7 @@ void ErrorMessage::insertParams(NAError * errcb)
{
tmp[tmpLen++] = ERRORPARAM_BEGINMARK;
-#pragma nowarn(1506) // warning elimination
paramLen = NAWstrlen(paramName);
-#pragma warn(1506) // warning elimination
NAWstrncpy(&tmp[tmpLen], paramName, paramLen);
}
tmpLen += paramLen;
@@ -169,9 +163,7 @@ void ErrorMessage::printErrorMessage(NAError * errcb)
if (forceParamSubst)
{
// remove trailing blanks and unsubstituted substitution marks
-#pragma nowarn(1506) // warning elimination
Int32 tmpLen = NAWstrlen(msgBuf_);
-#pragma warn(1506) // warning elimination
while (--tmpLen >= 0 &&
(msgBuf_[tmpLen] == NAWchar(' ') ||
msgBuf_[tmpLen] == NAWchar('\t') ||
@@ -347,10 +339,8 @@ void NADumpDiags(ostream& outStream, ComDiagsArea* diags,
if (fp) // if a logfile is open, mirror messages to it
{
char mbstr[DEST_BUF_SIZE + 16];
-#pragma nowarn(1506) // warning elimination
UnicodeStringToLocale(terminal_cs, msg, NAWstrlen(msg),
mbstr, DEST_BUF_SIZE);
-#pragma warn(1506) // warning elimination
FixCarriageReturn(mbstr);
fprintf(fp, "%s\n", mbstr);
@@ -383,9 +373,7 @@ void NAWriteConsole(const NAWchar *str, ostream& outStream,
if (!str) return;
char mbstr[DEST_BUF_SIZE + 16];
-#pragma nowarn(1506) // warning elimination
UnicodeStringToLocale(terminal_cs, str, NAWstrlen(str), mbstr, DEST_BUF_SIZE+16);
-#pragma warn(1506) // warning elimination
NAWriteConsole(mbstr, outStream, newline, comment);
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/sqlmsg/GetErrorMessage.cpp
----------------------------------------------------------------------
diff --git a/core/sql/sqlmsg/GetErrorMessage.cpp b/core/sql/sqlmsg/GetErrorMessage.cpp
index e5ec226..781a62b 100644
--- a/core/sql/sqlmsg/GetErrorMessage.cpp
+++ b/core/sql/sqlmsg/GetErrorMessage.cpp
@@ -343,9 +343,7 @@ NABoolean getErrorMessageFromCatalog(NAErrorCode error_code_abs,
// convert to Unicode
Lng32 wMsgLen = LocaleStringToUnicode(CharInfo::ISO88591,
-#pragma nowarn(1506) // warning elimination
msg, strlen(msg), msgBuf, msgBufLen);
-#pragma warn(1506) // warning elimination
if ( wMsgLen == 0 )
@@ -639,9 +637,7 @@ static short kludgeReadStraightFromMessageFile
if (!msg) { *msgBuf = -1; return FALSE; } // nonzero: msgfile fnd
msg += strlen(numAscii);
UInt32 i = 0;
-#pragma warning (disable : 4018) //warning elimination
for (; i < bufSize; i++) { // cvt char* to WCHAR*
-#pragma warning (default : 4018) //warning elimination
char c = msg[i];
if (c == '\n' || c == '\r') break;
msgBuf[i] = c;
@@ -677,16 +673,10 @@ void ErrorMessageOverflowCheckW (NAWchar *buf, size_t max)
cerr << endl << "ERROR: msg overflow " << len << " " << max-1 << endl;
char* buf8bit = new char[len+1];
-#pragma nowarn(1506) // warning elimination
Lng32 l = UnicodeStringToLocale(CharInfo::ISO88591, buf, len,
-#pragma warn(1506) // warning elimination
-#pragma nowarn(1506) // warning elimination
buf8bit, len+1);
-#pragma warn(1506) // warning elimination
-#pragma warning (disable : 4018) //warning elimination
if ( l != len )
ABORT("Unicode To Locale Translation");
-#pragma warning (default : 4018) //warning elimination
printf("%s\n", buf8bit);
ABORT("ErrorMessageOverflowCheck"); // memory overrun/corruption, unsafe to continue
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/sqlmsg/ParserMsg.cpp
----------------------------------------------------------------------
diff --git a/core/sql/sqlmsg/ParserMsg.cpp b/core/sql/sqlmsg/ParserMsg.cpp
index b11f9f2..4d03bf0 100644
--- a/core/sql/sqlmsg/ParserMsg.cpp
+++ b/core/sql/sqlmsg/ParserMsg.cpp
@@ -98,9 +98,7 @@ void StoreSyntaxError(const char *input_str, Int32 input_pos,
if (!input_str) return;
NAWchar wCharBuffer[ErrorMessage::MSG_BUF_SIZE+1]; // extra space for NULL
-#pragma nowarn(1506) // warning elimination
Int32 slen = strlen(input_str);
-#pragma warn(1506) // warning elimination
Int32 input_pos_in_numOfNAWchars = input_pos;
if (input_str_cs != CharInfo::ISO88591)
@@ -142,7 +140,6 @@ static const size_t MAX_FORMAT_LINE = 79;
static const size_t MAX_DGSTRING_SIZE =
MINOF(ErrorMessage::MSG_BUF_SIZE,1024) - MAX_FORMAT_LINE;
-#pragma nowarn(1506) // warning elimination
void StoreSyntaxError(const NAWchar *input_str, Int32 input_pos,
ComDiagsArea& diags, Int32 dgStrNum,
CharInfo::CharSet charset)
@@ -294,5 +291,4 @@ void StoreSyntaxError(const NAWchar *input_str, Int32 input_pos,
}
} // StoreSyntaxError, Unicode version
-#pragma warn(1506) // warning elimination
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/sqlmxevents/logmxevent_sq.h
----------------------------------------------------------------------
diff --git a/core/sql/sqlmxevents/logmxevent_sq.h b/core/sql/sqlmxevents/logmxevent_sq.h
index 712e436..48e969c 100644
--- a/core/sql/sqlmxevents/logmxevent_sq.h
+++ b/core/sql/sqlmxevents/logmxevent_sq.h
@@ -99,9 +99,7 @@ class SQLMXLoggingArea
SQLEVENTS_LIB_FUNC static void init() ;
-#pragma nowarn (728) // warning elimination
#pragma SRLExportClassMembers ZEVNTSRL *
-#pragma warn (728) // warning elimination
enum Category // For NT this needs to correspong to
// theLogEvent::Categories enum
// in the file tdm_logevent/tdm_logevent.h.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/sqlshare/CatSQLShare.cpp
----------------------------------------------------------------------
diff --git a/core/sql/sqlshare/CatSQLShare.cpp b/core/sql/sqlshare/CatSQLShare.cpp
index 453778f..59d6820 100644
--- a/core/sql/sqlshare/CatSQLShare.cpp
+++ b/core/sql/sqlshare/CatSQLShare.cpp
@@ -76,7 +76,6 @@
// On LINUX, use 49 bits, for other platforms, use 51 bits
#define MASK 0x1ffffffffffffLL
-#pragma nowarn(770) // warning elimination
SQLShareInt64 CATSQLSHARE_LIB_FUNC
generateUniqueValue (void)
{
@@ -161,7 +160,6 @@ generateUniqueValue (void)
return tempLastGeneratedUID;
}
-#pragma warn(770) // warning elimination
//similar to generateUniqueValue
//except that it is faster since it does not use
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/udrserv/UdrStreams.cpp
----------------------------------------------------------------------
diff --git a/core/sql/udrserv/UdrStreams.cpp b/core/sql/udrserv/UdrStreams.cpp
index 661c63e..fec0bc3 100644
--- a/core/sql/udrserv/UdrStreams.cpp
+++ b/core/sql/udrserv/UdrStreams.cpp
@@ -42,9 +42,7 @@
#include "udrdecs.h"
#include "rosetta/rosgen.h"
-#pragma warning (disable : 4005) // warning elimination
#include "nsk/nskprocess.h"
-#pragma warning (default : 4005) // warning elimination
#include "zsysc.h"
extern void processAnInvokeMessage(UdrGlobals *UdrGlob,
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/udrserv/udrutil.cpp
----------------------------------------------------------------------
diff --git a/core/sql/udrserv/udrutil.cpp b/core/sql/udrserv/udrutil.cpp
index 69e392c..b8aa86a 100644
--- a/core/sql/udrserv/udrutil.cpp
+++ b/core/sql/udrserv/udrutil.cpp
@@ -566,9 +566,7 @@ void dumpDiagnostics (ComDiagsArea *diags, Lng32 indent)
return;
// errors and warnings in order added
-#pragma nowarn(220) // warning elimination
for (ii=1; ii <= nbrA; ii++)
-#pragma warn(220) // warning elimination
{
ServerDebug("%sErrors/Warnings(%ld) :", ind, (Lng32) ii);
dumpComCondition(cc, ind);
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/ustat/hs_cli.cpp
----------------------------------------------------------------------
diff --git a/core/sql/ustat/hs_cli.cpp b/core/sql/ustat/hs_cli.cpp
index bc0e8e6..22fce96 100644
--- a/core/sql/ustat/hs_cli.cpp
+++ b/core/sql/ustat/hs_cli.cpp
@@ -75,7 +75,6 @@
// -----------------------------------------------------------------------
// Class to deallocate statement and descriptor.
// -----------------------------------------------------------------------
-#pragma nowarn(770) // warning elimination
class HSRefDesc {
public:
@@ -111,7 +110,6 @@ private:
SQLSTMT_ID *ps_;
SQLDESC_ID *pd_;
};
-#pragma warn(770) // warning elimination
// -----------------------------------------------------------------------
// DESCRIPTION: Call SQL CLI to execute a SQL statement. The caller is
@@ -279,16 +277,9 @@ Lng32 HSFuncExecQueryBody( const char *dml
(Long)dml, 0);
HSHandleError(retcode);
retcode = SQL_EXEC_SetDescItem(&srcDesc, 1, SQLDESC_LENGTH,
-#pragma nowarn(1506) // warning elimination
strlen(dml) + 1, 0);
-#pragma warn(1506) // warning elimination
-#pragma nowarn(734) // warning elimination
HSHandleError(retcode);
-#pragma warn(734) // warning elimination
-#pragma nowarn(734) // warning elimination
-#pragma warn(734) // warning elimination
-#pragma nowarn(770) // warning elimination
// SQLDESC_CHAR_SET must be the last descriptor item set, otherwise
// it may get reset by other calls to SQL_EXEC_SetDescItem().
NAString charSet = ActiveSchemaDB()->getDefaults().getValue(ISO_MAPPING);
@@ -2390,9 +2381,7 @@ HSCliStatement::HSCliStatement( statementIndex ix,
strncpy(moduleName, HS_MODULE, HS_MODULE_LENGTH);
module.module_name = (char *)moduleName;
-#pragma nowarn(1506) // warning elimination
module.module_name_len = strlen((char*)moduleName);
-#pragma warn(1506) // warning elimination
module.creation_timestamp = 1234567890;
moduleSet = TRUE;
}
@@ -2405,9 +2394,7 @@ HSCliStatement::HSCliStatement( statementIndex ix,
strncpy(stmtID_, StatementNames[ix & 0xFFFF], HS_STMTID_LENGTH);
stmt_.identifier = (char *)stmtID_;
-#pragma nowarn(1506) // warning elimination
stmt_.identifier_len = strlen((char *)stmtID_);
-#pragma warn(1506) // warning elimination
stmt_.handle = 0;
@@ -2430,9 +2417,7 @@ HSCliStatement::HSCliStatement( statementIndex ix,
strncat(descID_, "_IVAR", HS_STMTID_LENGTH);
desc_.identifier = (char *)descID_;
-#pragma nowarn(1506) // warning elimination
desc_.identifier_len = strlen((char *)descID_);
-#pragma warn(1506) // warning elimination
stmt_.handle = 0;
retcode_ = SQL_EXEC_SetDescPointers(pInputDesc_, PRESET_VARS_NUM, (numVars_ - PRESET_VARS_NUM + 1),
@@ -3021,9 +3006,7 @@ Lng32 HSCursor::prepare( const char *clistr
(Long)clistr, 0);
HSHandleError(retcode_);
retcode_ = SQL_EXEC_SetDescItem(srcDesc_, 1, SQLDESC_LENGTH,
-#pragma nowarn(1506) // warning elimination
strlen(clistr) + 1, 0);
-#pragma warn(1506) // warning elimination
HSHandleError(retcode_);
// SQLDESC_CHAR_SET must be the last descriptor item set, otherwise
@@ -3144,9 +3127,7 @@ Lng32 HSCursor::prepare( const char *clistr
} // for loop
// aligned on 4-byte boundary
-#pragma nowarn(1506) // warning elimination
outputDataLen_ = roundup4(outputDataLen_);
-#pragma warn(1506) // warning elimination
// Make sure dataBuf_ starts at a 4-byte boundary.
dataBuf_ = (char *)(new(heap_) Lng32[(outputDataLen_ >> 2) + 1]);
@@ -3313,7 +3294,6 @@ NAType* ConstructNumericType( Long addr
// Construct a NA type from an SQL type so that NAtype.encode can be
// called later.
// -----------------------------------------------------------------------
-#pragma nowarn(770) // warning elimination
Lng32 HSCursor::buildNAType()
{
#define REC_INTERVAL REC_MIN_INTERVAL
@@ -3361,19 +3341,15 @@ Lng32 HSCursor::buildNAType()
case REC_BIN16_SIGNED:
if (precision <= 0)
length = 2;
-#pragma nowarn(1506) // warning elimination
type = ConstructNumericType(addr, i, length, precision, scale,
TRUE, nullflag, heap_);
-#pragma warn(1506) // warning elimination
break;
case REC_BPINT_UNSIGNED:
case REC_BIN16_UNSIGNED:
if (precision <= 0)
length = 2;
-#pragma nowarn(1506) // warning elimination
type = ConstructNumericType(addr, i, length, precision, scale,
FALSE, nullflag, heap_);
-#pragma warn(1506) // warning elimination
break;
//
@@ -3381,28 +3357,22 @@ Lng32 HSCursor::buildNAType()
case REC_BIN32_SIGNED:
if (precision <= 0)
length = 4;
-#pragma nowarn(1506) // warning elimination
type = ConstructNumericType(addr, i, length, precision, scale,
TRUE, nullflag, heap_);
-#pragma warn(1506) // warning elimination
break;
case REC_BIN32_UNSIGNED:
if (precision <= 0)
length = 4;
-#pragma nowarn(1506) // warning elimination
type = ConstructNumericType(addr, i, length, precision, scale,
FALSE, nullflag, heap_);
-#pragma warn(1506) // warning elimination
break;
//
//
case REC_BIN64_SIGNED:
if (precision <= 0)
length = 8;
-#pragma nowarn(1506) // warning elimination
type = ConstructNumericType(addr, i, length, precision, scale,
TRUE, nullflag, heap_);
-#pragma warn(1506) // warning elimination
break;
case REC_BIN64_UNSIGNED:
if (precision <= 0)
@@ -3488,7 +3458,6 @@ Lng32 HSCursor::buildNAType()
return 0;
}
-#pragma warn(770) // warning elimination
/***********************************************/
/* METHOD: fetchRowset() */
@@ -3823,9 +3792,7 @@ HSinsertHist::HSinsertHist(const char *stmtID,
strncpy(moduleName, HS_MODULE, HS_MODULE_LENGTH);
module.module_name = (char *)moduleName;
-#pragma nowarn(1506) // warning elimination
module.module_name_len = strlen((char*)moduleName);
-#pragma warn(1506) // warning elimination
module.creation_timestamp = 1234567890;
moduleSet = TRUE;
}
@@ -3835,9 +3802,7 @@ HSinsertHist::HSinsertHist(const char *stmtID,
stmt_.module = &module;
strncpy(stmtID_, stmtID, HS_STMTID_LENGTH);
stmt_.identifier = (char *)stmtID_;
-#pragma nowarn(1506) // warning elimination
stmt_.identifier_len = strlen((char *)stmtID_);
-#pragma warn(1506) // warning elimination
stmt_.handle = 0;
@@ -3847,9 +3812,7 @@ HSinsertHist::HSinsertHist(const char *stmtID,
strncpy(descID_, stmtID_, HS_STMTID_LENGTH);
strncat(descID_, "_IVAR", HS_STMTID_LENGTH);
desc_.identifier = (char *)descID_;
-#pragma nowarn(1506) // warning elimination
desc_.identifier_len = strlen((char *)descID_);
-#pragma warn(1506) // warning elimination
stmt_.handle = 0;
}
@@ -4317,9 +4280,7 @@ HSinsertHistint::HSinsertHistint(const char *stmtID,
strncpy(moduleName, HS_MODULE, HS_MODULE_LENGTH);
module.module_name = (char *)moduleName;
-#pragma nowarn(1506) // warning elimination
module.module_name_len = strlen((char*)moduleName);
-#pragma warn(1506) // warning elimination
module.creation_timestamp = 1234567890;
moduleSet = TRUE;
}
@@ -4329,9 +4290,7 @@ HSinsertHistint::HSinsertHistint(const char *stmtID,
stmt_.module = &module;
strncpy(stmtID_, stmtID, HS_STMTID_LENGTH);
stmt_.identifier = (char *)stmtID_;
-#pragma nowarn(1506) // warning elimination
stmt_.identifier_len = strlen((char *)stmtID_);
-#pragma warn(1506) // warning elimination
stmt_.handle = 0;
@@ -4341,9 +4300,7 @@ HSinsertHistint::HSinsertHistint(const char *stmtID,
strncpy(descID_, stmtID_, HS_STMTID_LENGTH);
strncat(descID_, "_IVAR", HS_STMTID_LENGTH);
desc_.identifier = (char *)descID_;
-#pragma nowarn(1506) // warning elimination
desc_.identifier_len = strlen((char *)descID_);
-#pragma warn(1506) // warning elimination
stmt_.handle = 0;
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/ustat/hs_cli.h
----------------------------------------------------------------------
diff --git a/core/sql/ustat/hs_cli.h b/core/sql/ustat/hs_cli.h
index dc9dd3a..5b5a454 100644
--- a/core/sql/ustat/hs_cli.h
+++ b/core/sql/ustat/hs_cli.h
@@ -266,7 +266,6 @@ class HSSample
/* | LEN | DATA | */
/* |------------------ */
/*****************************************************************************/
-#pragma nowarn(1506) // warning elimination
class HSDataBuffer
{
public:
@@ -340,7 +339,6 @@ class HSDataBuffer
short len;
char *val;
};
-#pragma warn(1506) // warning elimination
/*****************************************************************************/
/* CLASS: HSTranMan */
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/ustat/hs_globals.cpp
----------------------------------------------------------------------
diff --git a/core/sql/ustat/hs_globals.cpp b/core/sql/ustat/hs_globals.cpp
index 0bdd05a..ff1dede 100644
--- a/core/sql/ustat/hs_globals.cpp
+++ b/core/sql/ustat/hs_globals.cpp
@@ -3534,12 +3534,10 @@ Lng32 HSGlobalsClass::Initialize()
else
{
xSampleSet = MINOF(sampleValue1, actualRowCount);
-#pragma nowarn(1506) // warning elimination
// multiply by 100.0001 instead of 100 so that rounding
// errors are limited.
sampleTblPercent = convertInt64ToDouble(xSampleSet) /
actualRowCount * 100.0001;
-#pragma warn(1506) // warning elimination
if (sampleTblPercent < 100)
{
@@ -9512,9 +9510,7 @@ Lng32 HSGlobalsClass::FixSamplingCounts(HSColGroupStruct *group)
double lower = 0;
const double UEC_FRACTION_UPPER = 0.975;
const double FRACTION_HIGH = 0.981;
-#pragma nowarn(1506) // warning elimination
const double UPSCALE_FOR_ROWS = convertInt64ToDouble(actualRowCount) / sampleRowCount;
-#pragma warn(1506) // warning elimination
const Lng32 MAX_INTERVAL_JOIN = 4;
NABoolean processMultiGroups = TRUE;
@@ -10148,7 +10144,6 @@ Lng32 HSGlobalsClass::ClearSelectHistograms()
/* ASSUMPTIONS: A transaction has already been */
/* started. */
/***********************************************/
-#pragma nowarn(770) // warning elimination
Lng32 HSGlobalsClass::DeleteOrphanHistograms()
{
Lng32 retcode = 0;
@@ -10602,7 +10597,6 @@ HSColGroupStruct* HSGlobalsClass::ReverseList(HSColGroupStruct* list)
return saveGroup;
}
-#pragma warn(770) // warning elimination
/***********************************************/
/* METHOD: print() */
@@ -14047,9 +14041,7 @@ void formatFixedNumeric(Int64 value, Lng32 scale, char* buffer)
char digits[] = "0123456789";
char temp;
char *p1 = buffer, *p2 = buffer;
-#pragma warning(disable:4146)
Int64 xval = (Int64)(value >=0 ? value : -value); // no template for abs()
-#pragma warning(default:4146)
Int32 numDigits = 0;
// Write the digits out in reverse order, adding the decimal point at the
@@ -14326,7 +14318,6 @@ Int32 copyValue(Int64 value, char *valueBuff, const HSColumnStruct &colDesc, sho
// Unary minus used in several places in the following code for intervals,
// which are always encoded as signed integers. The template instantiations for
// unsigned types will complain about the attempted negation.
-#pragma warning(disable:4146)
// For single-field intervals, all we have to do is right-justify the
// value in a field with width equal to the interval's precision.
@@ -14452,7 +14443,6 @@ Int32 copyValue(Int64 value, char *valueBuff, const HSColumnStruct &colDesc, sho
}
break;
-#pragma warning(default:4146)
default:
retcode = -1;
@@ -15004,9 +14994,7 @@ static short convInt64ToAscii(char *target,
if (scale) {
Lng32 low = (currPos - scale);
for (; currPos > low; currPos--) {
-#pragma nowarn(1506) // warning elimination
target[currPos] = (char)(Int32)(newSource % 10) + '0';
-#pragma warn(1506) // warning elimination
newSource /= 10;
}
target[currPos--] = '.';
@@ -15014,9 +15002,7 @@ static short convInt64ToAscii(char *target,
// Convert the integer part.
for (; currPos >= leftMost; currPos--) {
-#pragma nowarn(1506) // warning elimination
target[currPos] = (char)(Int32)(newSource % 10) + '0';
-#pragma warn(1506) // warning elimination
newSource /= 10;
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/ustat/hs_la.cpp
----------------------------------------------------------------------
diff --git a/core/sql/ustat/hs_la.cpp b/core/sql/ustat/hs_la.cpp
index 3e1b2d8..b95f3b6 100644
--- a/core/sql/ustat/hs_la.cpp
+++ b/core/sql/ustat/hs_la.cpp
@@ -264,9 +264,7 @@ Lng32 HSSqTableDef::DescribeColumnNames()
(Long)query.data(), 0);
HSHandleError(retcode_);
retcode_ = SQL_EXEC_SetDescItem(srcDesc, 1, SQLDESC_LENGTH,
-#pragma nowarn(1506) // warning elimination
query.length() + 1, 0);
-#pragma warn(1506) // warning elimination
HSHandleError(retcode_);
// SQLDESC_CHAR_SET must be the last descriptor item set, otherwise
// it may get reset by other calls to SQL_EXEC_SetDescItem().
@@ -611,9 +609,7 @@ Lng32 HSSqTableDef::setHasSyskeyFlag()
(Long)query.data(), 0);
HSHandleError(retcode_);
retcode_ = SQL_EXEC_SetDescItem(srcDesc, 1, SQLDESC_LENGTH,
-#pragma nowarn(1506) // warning elimination
query.length() + 1, 0);
-#pragma warn(1506) // warning elimination
HSHandleError(retcode_);
// SQLDESC_CHAR_SET must be the last descriptor item set, otherwise
// it may get reset by other calls to SQL_EXEC_SetDescItem().
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/ustat/hs_lex.ll
----------------------------------------------------------------------
diff --git a/core/sql/ustat/hs_lex.ll b/core/sql/ustat/hs_lex.ll
index c377bfe..89cd265 100644
--- a/core/sql/ustat/hs_lex.ll
+++ b/core/sql/ustat/hs_lex.ll
@@ -51,7 +51,6 @@
#define YYPARSE_PARAM yyscan_t scanner
#define YYLEX_PARAM scanner
#include <errno.h>
-#pragma nowarn(1506) //warning elimination
extern "C" int isatty(int);
@@ -448,7 +447,5 @@ void destroy_scanner(void* &scanner)
// LCOV_EXCL_START
-#pragma warn(1506) //warning elimination
// LCOV_EXCL_STOP
-#pragma nowarn(262) //warning elimination
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/ustat/hs_read.cpp
----------------------------------------------------------------------
diff --git a/core/sql/ustat/hs_read.cpp b/core/sql/ustat/hs_read.cpp
index 638c80a..03160f1 100644
--- a/core/sql/ustat/hs_read.cpp
+++ b/core/sql/ustat/hs_read.cpp
@@ -781,7 +781,6 @@ private:
THREAD_P Lng32 HSHistogrmCursor::fetchCount_ = 0;
THREAD_P Lng32 HSHistintsCursor::fetchCount_ = 0;
-#pragma nowarn(770) // warning elimination
Lng32 FetchHistograms( const QualifiedName & qualifiedName
, const ExtendedQualName::SpecialTableType type
, const NAColumnArray & colArray
@@ -970,12 +969,10 @@ Lng32 FetchHistograms( const QualifiedName & qualifiedName
NABoolean *emptyHistogram;
NABoolean *smallSampleHistogram;
double *smallSampleSize;
-#pragma nowarn(1506) // warning elimination
NANewArray<NABoolean> tmpfh(fakeHistogram, numCols);
NANewArray<NABoolean> tmpeh(emptyHistogram, numCols);
NANewArray<NABoolean> tmpsh(smallSampleHistogram, numCols);
NANewArray<double> tmpzh(smallSampleSize, numCols);
-#pragma warn(1506) // warning elimination
CollIndex k = 0;
for (k = 0; k < numCols; k++)
{
@@ -990,9 +987,7 @@ Lng32 FetchHistograms( const QualifiedName & qualifiedName
// -----------------------------------------------------------------------
HSColStats cs(colArray, colStatsList, heap);
Lng32 *colmap; // Lng32 = column position in tbl
-#pragma nowarn(1506) // warning elimination
NANewArray< Lng32 > tmpcm(colmap, numCols); // no need to initialize
-#pragma warn(1506) // warning elimination
// -----------------------------------------------------------------------
// For packed tables (which must be a VP table as well), code is already
@@ -1250,7 +1245,6 @@ Lng32 FetchHistograms( const QualifiedName & qualifiedName
return 0;
}
-#pragma warn(770) // warning elimination
// *****************************************************************************
// FUNCTION readHistograms()
// PURPOSE Bundles the read of histograms from UMD tables and assignment of
@@ -2351,9 +2345,7 @@ Lng32 OpenCursor( const char *descID
strncpy(moduleName, HS_MODULE, HS_MODULE_LENGTH);
module.module_name = (char*)moduleName;
-#pragma nowarn(1506) // warning elimination
module.module_name_len = strlen((char*)moduleName);
-#pragma warn(1506) // warning elimination
module.creation_timestamp = 1234567890;
if (desc)
@@ -2378,9 +2370,7 @@ Lng32 OpenCursor( const char *descID
desc->handle = 0;
sprintf((char*)desc->identifier, descID);
-#pragma nowarn(1506) // warning elimination
desc->identifier_len = strlen(descID);
-#pragma warn(1506) // warning elimination
SQL_EXEC_ClearDiagnostics(desc);
retcode = SQL_EXEC_Exec(desc, NULL, 2, param1Addr, NULL,
@@ -2491,12 +2481,8 @@ void HSColStats::addHistogram
if (LM->LogNeeded())
{
-#pragma nowarn(1506) // warning elimination
NAWcharBuf wLowBuf((wchar_t *)lowval,na_wcslen(lowval));
-#pragma warn(1506) // warning elimination
-#pragma nowarn(1506) // warning elimination
NAWcharBuf wHiBuf((wchar_t *)highval,na_wcslen(highval));
-#pragma warn(1506) // warning elimination
charBuf* isoLowVal = NULL;
charBuf* isoHiVal = NULL;
isoLowVal = unicodeToISO88591(wLowBuf, heap_, isoLowVal);
@@ -2605,10 +2591,8 @@ void HSColStats::addHistint( NABoolean needHistints
if (LM->LogNeeded())
{
-#pragma nowarn(1506) // warning elimination
NAWcharBuf wBoundBuf((wchar_t *)boundary,na_wcslen(boundary));
NAWcharBuf wMfvBuf((wchar_t *)mfv, na_wcslen(mfv));
-#pragma warn(1506) // warning elimination
charBuf* isoBoundVal = NULL;
charBuf* isoMfvVal = NULL;
isoBoundVal = unicodeToISO88591(wBoundBuf, heap_, isoBoundVal);
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/ustat/hs_util.cpp
----------------------------------------------------------------------
diff --git a/core/sql/ustat/hs_util.cpp b/core/sql/ustat/hs_util.cpp
index bc2f0de..1d53855 100644
--- a/core/sql/ustat/hs_util.cpp
+++ b/core/sql/ustat/hs_util.cpp
@@ -58,12 +58,10 @@
#include "SqlParserGlobals.h" // must be last #include
static NAWString appendFraction (Lng32 scale);
-#pragma nowarn(1506) // warning elimination
static unsigned char toHexDecimalDigit(unsigned char c)
{
return ( c <= 9 ) ? c + '0' : c - 10 + 'A';
}
-#pragma warn(1506) // warning elimination
NABoolean isSpecialObject(const NAString &tableName)
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/ustat/hs_yacc.y
----------------------------------------------------------------------
diff --git a/core/sql/ustat/hs_yacc.y b/core/sql/ustat/hs_yacc.y
index 6b86a4d..cfdaa56 100644
--- a/core/sql/ustat/hs_yacc.y
+++ b/core/sql/ustat/hs_yacc.y
@@ -47,10 +47,6 @@
#include "hs_parser.h"
-#pragma nowarn(1506) // warning elimination
-#pragma warning (disable : 4065)//don't complain about empty switch statements.
-
-
extern "C" { void yyerror(void* scanner, const char *sb); };
union YYSTYPE;
@@ -132,7 +128,6 @@ statement : UPDATE STATISTICS { hs_globals_y->isUpdatestatsStmt = TRUE; } FOR
column_name : identifier
{
-#pragma warn(1506) // warning elimination
HSColumnStruct *hist_pt = new(STMTHEAP) HSColumnStruct;
[09/12] incubator-trafodion git commit: TRAFODION-2731 CodeCleanup:
Phase 4. Remove legacy/obsolete pragmas
Posted by an...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/common/str.cpp
----------------------------------------------------------------------
diff --git a/core/sql/common/str.cpp b/core/sql/common/str.cpp
index 35d713c..4c87abe 100644
--- a/core/sql/common/str.cpp
+++ b/core/sql/common/str.cpp
@@ -246,9 +246,7 @@ char *str_itoa(ULng32 i, char *outstr)
temp = i;
while (temp > 0)
{
-#pragma nowarn(1506) // warning elimination
outstr[j--] = '0' + (char) (temp%10);
-#pragma warn(1506) // warning elimination
temp = temp / 10;
}
}
@@ -295,9 +293,7 @@ char *str_ltoa(Int64 i, char *outstr)
temp = ii;
while (temp > 0)
{
-#pragma nowarn(1506) // warning elimination
outstr[j--] = '0' + (char) (temp%10);
-#pragma warn(1506) // warning elimination
temp = temp / 10;
}
if (neg)
@@ -459,14 +455,10 @@ Int32 str_cpy_convert(char * tgt, char * src,
for (Lng32 i = 0; i < length; i++)
{
if (upshift)
-#pragma nowarn(1506) // warning elimination
tgt[i] = TOUPPER(src[i]);
-#pragma warn(1506) // warning elimination
if (!upshift)
-#pragma nowarn(1506) // warning elimination
tgt[i] = TOLOWER(src[i]);
-#pragma warn(1506) // warning elimination
}
return 0;
@@ -510,9 +502,7 @@ Int32 str_inc(const ULng32 length, char * s)
void str_complement(const ULng32 length, char * s)
{
for (ULng32 i = 0; i < length; i++)
-#pragma nowarn(1506) // warning elimination
s[i] = ~(s[i]);
-#pragma warn(1506) // warning elimination
}
// ----------------------------------------------------------------------
@@ -570,22 +560,16 @@ Lng32 str_encode(char *tgt, Lng32 tgtMaxLen, void *src, Lng32 srcLen)
while (srcix < srcLen)
{
// high-order 6 bits of input byte 0 go into output char 0
-#pragma nowarn(1506) // warning elimination
key_out[tgtix] = (key_in[srcix] >> 2) + minChar;
-#pragma warn(1506) // warning elimination
// low-order 2 bits of input byte 0 go into output char 1
-#pragma nowarn(1506) // warning elimination
key_out[tgtix+1] = ((key_in[srcix] & 0x3) << 4) + minChar;
-#pragma warn(1506) // warning elimination
if (srcix+1 < srcLen)
{
// add high-order 4 bits of input byte 1 to output char 1
key_out[tgtix+1] += key_in[srcix+1] >> 4;
// low-order 4 bits of input byte 1 go to output char 2
-#pragma nowarn(1506) // warning elimination
key_out[tgtix+2] = ((key_in[srcix+1] & 0xf) << 2) + minChar;
-#pragma warn(1506) // warning elimination
}
if (srcix+2 < srcLen)
@@ -593,9 +577,7 @@ Lng32 str_encode(char *tgt, Lng32 tgtMaxLen, void *src, Lng32 srcLen)
// add high-order 2 bits of input byte 2 to output char 2
key_out[tgtix+2] += key_in[srcix+2] >> 6;
// low-order 6 bits of input byte 2 go to output char 3
-#pragma nowarn(1506) // warning elimination
key_out[tgtix+3] = (key_in[srcix+2] & 0x3f) + minChar;
-#pragma warn(1506) // warning elimination
}
srcix += 3;
@@ -764,9 +746,7 @@ Lng32 str_to_ansi_id(char *src, char *tgt,Lng32 &tgtLen, short mustValidate, cha
NABoolean empty = TRUE;
if (dQuoteSeen)
{
-#pragma warning (disable : 4018) //warning elimination
for (i = 0; i < tgtLen;i++)
-#pragma warning (default : 4018) //warning elimination
{
if (isSpace8859_1(tgt[i])) // Convert all tabs to spaces
tgt[i] = ' ';
@@ -786,9 +766,7 @@ Lng32 str_to_ansi_id(char *src, char *tgt,Lng32 &tgtLen, short mustValidate, cha
UInt32 j = 0;
i = 0;
-#pragma warning (disable : 4018) //warning elimination
for (i = 0; i < tgtLen; i++)
-#pragma warning (default : 4018) //warning elimination
{
if (dQuoteSeen)
{
@@ -802,10 +780,8 @@ Lng32 str_to_ansi_id(char *src, char *tgt,Lng32 &tgtLen, short mustValidate, cha
// a double quote has been seen inside the string
// remove the second double quote by shifting all
// the chars to the right of it by
-#pragma warning (disable : 4018) //warning elimination
for (j = i; j < tgtLen; j++)
tgt[j] = tgt[j+1];
-#pragma warning (default : 4018) //warning elimination
tgtLen--;
}
@@ -820,9 +796,7 @@ Lng32 str_to_ansi_id(char *src, char *tgt,Lng32 &tgtLen, short mustValidate, cha
if (allowedChars)
{
short found = 0;
-#pragma warning (disable : 4018) //warning elimination
for (UInt32 j = 0; j <str_len(allowedChars); j++)
-#pragma warning (default : 4018) //warning elimination
{
if (tgt[i] == allowedChars[j])
found = 1;
@@ -834,9 +808,7 @@ Lng32 str_to_ansi_id(char *src, char *tgt,Lng32 &tgtLen, short mustValidate, cha
else
return -1;
}
-#pragma nowarn(1506) // warning elimination
tgt[i] = TOUPPER(tgt[i]);
-#pragma warn(1506) // warning elimination
}
} // end for
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/common/swscanf.cpp
----------------------------------------------------------------------
diff --git a/core/sql/common/swscanf.cpp b/core/sql/common/swscanf.cpp
index 241fc64..58a0b56 100644
--- a/core/sql/common/swscanf.cpp
+++ b/core/sql/common/swscanf.cpp
@@ -147,9 +147,7 @@ __sccl(NAWchar* tab, NAWchar* fmt)
v = 0; /* default => reject */
/* should probably use memset here */
for (n = 0; n < 256; n++)
-#pragma nowarn(1506) // warning elimination
tab[n] = v;
-#pragma warn(1506) // warning elimination
if (c == 0)
return (fmt - 1);/* format ended before closing ] */
@@ -162,9 +160,7 @@ __sccl(NAWchar* tab, NAWchar* fmt)
*/
v = 1 - v;
for (;;) {
-#pragma nowarn(1506) // warning elimination
tab[c] = v; /* take character c */
-#pragma warn(1506) // warning elimination
doswitch:
n = *fmt++; /* and examine the next */
switch (n) {
@@ -198,9 +194,7 @@ doswitch:
}
fmt++;
do { /* fill in the range */
-#pragma nowarn(1506) // warning elimination
tab[++c] = v;
-#pragma warn(1506) // warning elimination
} while (c < n);
#if 1 /* XXX another disgusting compatibility hack */
/*
@@ -265,9 +259,7 @@ __svfscanf(SCANBUF* fp, NAWchar const* fmt0, va_list ap)
c = *fmt++;
if (c == 0)
return (nassigned);
-#pragma nowarn(1506) // warning elimination
if (na_iswspace(c)) {
-#pragma warn(1506) // warning elimination
for (;;) {
if (fp->_r <= 0 && __srefill(fp))
return (nassigned);
@@ -407,9 +399,7 @@ literal:
if (flags & SUPPRESS) /* ??? */
continue;
if (flags & SHORT)
-#pragma nowarn(1506) // warning elimination
*va_arg(ap, short *) = nread;
-#pragma warn(1506) // warning elimination
else if (flags & LONG)
*va_arg(ap, Lng32 *) = nread;
else
@@ -670,9 +660,7 @@ literal:
/*
* c is legal: store it and look at the next.
*/
-#pragma nowarn(1506) // warning elimination
*p++ = c;
-#pragma warn(1506) // warning elimination
if (--fp->_r > 0)
fp->_p++;
else if (__srefill(fp))
@@ -692,9 +680,7 @@ literal:
c = ((NAWchar *)p)[-1];
if (c == L'x' || c == L'X') {
--p;
-#pragma nowarn(1506) // warning elimination
(void) ungetc(c, fp);
-#pragma warn(1506) // warning elimination
}
if ((flags & SUPPRESS) == 0) {
@@ -708,19 +694,13 @@ literal:
*va_arg(ap, void **) =
(void *)(Lng32)res;
else if (flags & QUAD)
-#pragma nowarn(1506) // warning elimination
*va_arg(ap, quad_t *) = res;
-#pragma warn(1506) // warning elimination
else if (flags & LONG)
-#pragma nowarn(1506) // warning elimination
*va_arg(ap, Lng32 *) = (Lng32) res;
-#pragma warn(1506) // warning elimination
else if (flags & SHORT)
*va_arg(ap, Int16 *) = (Int16) res;
else
-#pragma nowarn(1506) // warning elimination
*va_arg(ap, Int32 *) = (Int32) res;
-#pragma warn(1506) // warning elimination
nassigned++;
}
nread += p - buf;
@@ -780,10 +760,8 @@ literal:
}
break;
fok:
-#pragma nowarn(1506) // warning elimination
*p++ = c;
*q++ = (char)c;
-#pragma warn(1506) // warning elimination
if (--fp->_r > 0)
fp->_p++;
else if (__srefill(fp))
@@ -804,14 +782,10 @@ literal:
/* just a bad exponent (e and maybe sign) */
c = *(NAWchar *)--p;
if (c != L'e' && c != L'E') {
-#pragma nowarn(1506) // warning elimination
(void) ungetc(c, fp);/* sign */
-#pragma warn(1506) // warning elimination
c = *(NAWchar *)--p;
}
-#pragma nowarn(1506) // warning elimination
(void) ungetc(c, fp);
-#pragma warn(1506) // warning elimination
}
if ((flags & SUPPRESS) == 0) {
double res;
@@ -820,9 +794,7 @@ literal:
//res = na_wcstod(buf, (NAWchar **) NULL);
res = strtod(sb_buf, NULL);
if (flags & LONGDBL)
-#pragma nowarn(1255) // warning elimination
*va_arg(ap, long double *) = res;
-#pragma warn(1255) // warning elimination
else if (flags & LONG)
*va_arg(ap, double *) = res;
else
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/common/swsprintf.cpp
----------------------------------------------------------------------
diff --git a/core/sql/common/swsprintf.cpp b/core/sql/common/swsprintf.cpp
index fbcc1e8..d8e38d3 100644
--- a/core/sql/common/swsprintf.cpp
+++ b/core/sql/common/swsprintf.cpp
@@ -115,12 +115,8 @@ static char *cvt __P((double, Int32, Int32, char *, Int32 *, Int32, Int32 *));
static Int32 exponent __P((char *, Int32, Int32));
#else /* no FLOATING_POINT */
-#pragma warning (disable : 4005) //warning elimination
-#pragma nowarn(140) // warning elimination
#undef BUF
#define BUF 40
-#pragma warn(140) // warning elimination
-#pragma warning (default : 4005) //warning elimination
#endif /* FLOATING_POINT */
@@ -140,12 +136,8 @@ static Int32 exponent __P((char *, Int32, Int32));
#define ALT 0x001 /* alternate form */
#define HEXPREFIX 0x002 /* add 0x or 0X prefix */
#define LADJUST 0x004 /* left adjustment */
-#pragma warning (disable : 4005) //warning elimination
-#pragma nowarn(140) // warning elimination
#undef LONGDBL
#define LONGDBL 0x008 /* long double; unimplemented */
-#pragma warn(140) // warning elimination
-#pragma warning (default : 4005) //warning elimination
#define LONGINT 0x010 /* long integer */
#define QUADINT 0x020 /* quad integer */
#define SHORTINT 0x040 /* short integer */
@@ -368,9 +360,7 @@ reswitch: switch (ch) {
flags |= QUADINT;
goto rflag;
case L'c':
-#pragma nowarn(1506) // warning elimination
*(cp = buf) = va_arg(ap, Int32);
-#pragma warn(1506) // warning elimination
size = 1;
sign = L'\0';
break;
@@ -381,9 +371,7 @@ reswitch: switch (ch) {
case L'i':
_uquad = SARG();
if ((quad_t)_uquad < 0) {
-#pragma warning (disable : 4146) //warning elimination
_uquad = -_uquad;
-#pragma warning (default : 4146) //warning elimination
sign = L'-';
}
base = DEC;
@@ -460,9 +448,7 @@ reswitch: switch (ch) {
else if (flags & LONGINT)
*va_arg(ap, Lng32 *) = ret;
else if (flags & SHORTINT)
-#pragma nowarn(1506) // warning elimination
*va_arg(ap, short *) = ret;
-#pragma warn(1506) // warning elimination
else
*va_arg(ap, Int32 *) = ret;
continue; /* no output */
@@ -506,9 +492,7 @@ reswitch: switch (ch) {
} else
size = prec;
} else
-#pragma nowarn(1506) // warning elimination
size = na_wcslen(cp);
-#pragma warn(1506) // warning elimination
sign = L'\0';
break;
case L'U':
@@ -554,11 +538,7 @@ number: if ((dprec = prec) >= 0)
switch (base) {
case OCT:
do {
-#pragma warning (disable : 4244) //warning elimination
-#pragma nowarn(1506) // warning elimination
*--cp = to_char(_uquad & 7);
-#pragma warn(1506) // warning elimination
-#pragma warning (default : 4244) //warning elimination
_uquad >>= 3;
} while (_uquad);
/* handle octal leading 0 */
@@ -569,16 +549,10 @@ number: if ((dprec = prec) >= 0)
case DEC:
/* many numbers are 1 digit */
while (_uquad >= 10) {
-#pragma warning (disable : 4244) //warning elimination
-#pragma nowarn(1506) // warning elimination
*--cp = to_char(_uquad % 10);
-#pragma warn(1506) // warning elimination
_uquad /= 10;
}
-#pragma nowarn(1506) // warning elimination
*--cp = to_char(_uquad);
-#pragma warn(1506) // warning elimination
-#pragma warning (default : 4244) //warning elimination
break;
case HEX:
@@ -590,9 +564,7 @@ number: if ((dprec = prec) >= 0)
default:
cp = (NAWchar *) WIDE_("bug in vfprintf: bad base");
-#pragma nowarn(1506) // warning elimination
size = na_wcslen(cp);
-#pragma warn(1506) // warning elimination
goto skipsize;
}
}
@@ -604,9 +576,7 @@ number: if ((dprec = prec) >= 0)
goto done;
/* pretend it was %c with argument ch */
cp = buf;
-#pragma nowarn(1506) // warning elimination
*cp = ch;
-#pragma warn(1506) // warning elimination
size = 1;
sign = L'\0';
break;
@@ -641,9 +611,7 @@ number: if ((dprec = prec) >= 0)
PRINT(&sign, 1);
} else if (flags & HEXPREFIX) {
ox[0] = L'0';
-#pragma nowarn(1506) // warning elimination
ox[1] = ch;
-#pragma warn(1506) // warning elimination
PRINT(ox, 2);
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/common/unicode_char_set.cpp
----------------------------------------------------------------------
diff --git a/core/sql/common/unicode_char_set.cpp b/core/sql/common/unicode_char_set.cpp
index e469da8..8ecba4e 100644
--- a/core/sql/common/unicode_char_set.cpp
+++ b/core/sql/common/unicode_char_set.cpp
@@ -119,15 +119,11 @@ binary_search(NAWchar wc, Int32 lower, Int32 upper,
NAWchar unicode_char_set::to_upper(const NAWchar x)
{
if ( IN_RANGE(x, 0x61, 0x7a) ) { // frequently used chars checked first
-#pragma nowarn(1506) // warning elimination
return x - 0x61 + 0x41;
-#pragma warn(1506) // warning elimination
}
if ( IN_RANGE(x, 0xe0, 0xf6) ) { // frequently used chars checked first
-#pragma nowarn(1506) // warning elimination
return x - 0xe0 + 0xc0;
-#pragma warn(1506) // warning elimination
}
return binary_search(x, 0,
@@ -214,15 +210,11 @@ long unicode_char_set::to_upper(NAWchar *str, long srcLen,
NAWchar unicode_char_set::to_lower(const NAWchar x)
{
if ( IN_RANGE(x, 0x41, 0x5a) ) { // frequently used chars checked first
-#pragma nowarn(1506) // warning elimination
return x + 0x61 - 0x41;
-#pragma warn(1506) // warning elimination
}
if ( IN_RANGE(x, 0xc0, 0xd6) ) { // frequently used chars checked first
-#pragma nowarn(1506) // warning elimination
return x + 0xe0 - 0xc0;
-#pragma warn(1506) // warning elimination
}
return binary_search(x, 0, sizeof(unicode_upper2lower_mapping_table)/sizeof(unicode_mapping_t)-1,
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/common/wstr.cpp
----------------------------------------------------------------------
diff --git a/core/sql/common/wstr.cpp b/core/sql/common/wstr.cpp
index e8f33cd..4480998 100644
--- a/core/sql/common/wstr.cpp
+++ b/core/sql/common/wstr.cpp
@@ -134,24 +134,18 @@ Int32 na_wcsnncmp (const NAWchar *wstr1, UInt32 len1,
return 0;
}
else
-#pragma nowarn(1506) // warning elimination
return *--wstr1 - *--wstr2;
// return (*(const UInt16*)--wstr1 - *(const UInt16*)--wstr2);
-#pragma warn(1506) // warning elimination
}
Int32 na_wcsncmp (const NAWchar * wstr1, const NAWchar * wstr2, UInt32 len)
{
if ( len == 0 ) return 0;
-#pragma warning (disable : 4018) //warning elimination
for (Int32 i=0; i<len; i++ )
-#pragma warning (default : 4018) //warning elimination
{
if ( *wstr1 != *wstr2 )
-#pragma nowarn(1506) // warning elimination
return ( *wstr1 - *wstr2 );
-#pragma warn(1506) // warning elimination
if ( *wstr1 == 0 ) break;
@@ -166,9 +160,7 @@ Int32 na_wcscmp (const NAWchar * wstr1, const NAWchar * wstr2)
while (*wstr1 == *wstr2++)
if (*wstr1++ == 0)
return (0);
-#pragma nowarn(1506) // warning elimination
return (*wstr1 - *--wstr2);
-#pragma warn(1506) // warning elimination
}
#if 0 /* As of 8/30/2011, there are no callers in SQ SQL. */
@@ -177,9 +169,7 @@ Int32 na_wcsicmp (const NAWchar * wstr1, const NAWchar * wstr2)
while (na_towlower(*wstr1) == na_towlower(*wstr2++))
if (*wstr1++ == 0)
return (0);
-#pragma nowarn(1506) // warning elimination
return (*wstr1 - *--wstr2);
-#pragma warn(1506) // warning elimination
}
#endif /* As of 8/30/2011, there are no callers in SQ SQL. */
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/executor/ExBitMapTable.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExBitMapTable.cpp b/core/sql/executor/ExBitMapTable.cpp
index 375007f..186c097 100644
--- a/core/sql/executor/ExBitMapTable.cpp
+++ b/core/sql/executor/ExBitMapTable.cpp
@@ -90,9 +90,7 @@ ExBitMapTable::ExBitMapTable(Int32 keySize, Int32 dataSize, Int32 countOffset,
// [rowSize] - data, key, and next for group 1
// [rowSize] - data, key, and next for group NumberGroups-1
//
-#pragma nowarn(1506) // warning elimination
const Int32 minimumMemorySize = 32 * (sizeof(char*) + rowSize_);
-#pragma warn(1506) // warning elimination
memSize_ *= 2;
while(!memory_ && (memSize_ >= 2 * minimumMemorySize)) {
memSize_ /= 2;
@@ -110,10 +108,8 @@ ExBitMapTable::ExBitMapTable(Int32 keySize, Int32 dataSize, Int32 countOffset,
// Compute the maximum number of groups that can be stored in the table.
//
-#pragma nowarn(1506) // warning elimination
maximumNumberGroups_ = (memSize_ - sizeof(char*) * numberHashBuckets_)
/ rowSize_;
-#pragma warn(1506) // warning elimination
// The buckets
// BitMap at memory_. To start there is only one BitMap.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/executor/ExBitMapTable.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExBitMapTable.h b/core/sql/executor/ExBitMapTable.h
index 670b903..1179bbf 100644
--- a/core/sql/executor/ExBitMapTable.h
+++ b/core/sql/executor/ExBitMapTable.h
@@ -45,9 +45,6 @@
#include "Int64.h"
#include "ComDefs.h"
-#pragma warning (disable : 4005) //warning elimination
-#pragma warning (default : 4005) //warning elimination
-
// External forward declarations
//
class NAMemory;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/executor/ExCancel.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExCancel.cpp b/core/sql/executor/ExCancel.cpp
index 12bafbb..32b5c53 100755
--- a/core/sql/executor/ExCancel.cpp
+++ b/core/sql/executor/ExCancel.cpp
@@ -285,7 +285,6 @@ ExWorkProcRetcode ExCancelTcb::work()
break;
} // end case NOT_STARTED
-#pragma warning (disable : 4291)
case SEND_MESSAGE:
{
@@ -320,7 +319,6 @@ ExWorkProcRetcode ExCancelTcb::work()
pid_,
cancelTdb().getCancelPidBlockThreshold());
-#pragma warning (default : 4291)
*cancelStream_ << *cancelMsg;
@@ -332,13 +330,11 @@ ExWorkProcRetcode ExCancelTcb::work()
bool suspendLogging = (TRUE == cliGlobals->currContext()->
getSessionDefaults()->getSuspendLogging());
-#pragma warning (disable : 4291)
SuspendQueryRequest * suspendMsg = new (cliGlobals->getIpcHeap())
SuspendQueryRequest(rtsHandle, cliGlobals->getIpcHeap(),
ComTdbCancel::Force ==
cancelTdb().forced_,
suspendLogging);
-#pragma warning (default : 4291)
*cancelStream_ << *suspendMsg;
@@ -353,11 +349,9 @@ ExWorkProcRetcode ExCancelTcb::work()
bool suspendLogging = (TRUE == cliGlobals->currContext()->
getSessionDefaults()->getSuspendLogging());
-#pragma warning (disable : 4291)
ActivateQueryRequest * activateMsg = new (cliGlobals->getIpcHeap())
ActivateQueryRequest(rtsHandle, cliGlobals->getIpcHeap(),
suspendLogging);
-#pragma warning (default : 4291)
*cancelStream_ << *activateMsg;
@@ -370,10 +364,8 @@ ExWorkProcRetcode ExCancelTcb::work()
char * qid = cancelTdb().qid_;
Lng32 qid_len = str_len(qid);
-#pragma warning (disable : 4291)
RtsQueryId *rtsQueryId = new (cliGlobals->getIpcHeap())
RtsQueryId( cliGlobals->getIpcHeap(), qid, qid_len);
-#pragma warning (default : 4291)
*cancelStream_ << *rtsQueryId;
rtsQueryId->decrRefCount();
@@ -430,12 +422,10 @@ ExWorkProcRetcode ExCancelTcb::work()
if (!cancelStream_->moreObjects())
return WORK_OK;
-#pragma warning (disable : 4291)
ControlQueryReply *reply = new (cliGlobals->getIpcHeap())
ControlQueryReply(INVALID_RTS_HANDLE, cliGlobals->getIpcHeap());
-#pragma warning (default : 4291)
*cancelStream_ >> *reply;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/executor/ExComTdb.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExComTdb.cpp b/core/sql/executor/ExComTdb.cpp
index 428f54f..3766b3d 100644
--- a/core/sql/executor/ExComTdb.cpp
+++ b/core/sql/executor/ExComTdb.cpp
@@ -122,56 +122,42 @@ char *ComTdb::findVTblPtrExe(short classID)
case ex_HASH_GRBY:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ex_hash_grby_tdb);
-#pragma warn(1506) // warning elimination
break;
}
case ex_SORT_GRBY:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ex_sort_grby_tdb);
-#pragma warn(1506) // warning elimination
break;
}
case ex_FIRST_N:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ExFirstNTdb);
-#pragma warn(1506) // warning elimination
break;
}
case ex_TRANSPOSE:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ExTransposeTdb);
-#pragma warn(1506) // warning elimination
break;
}
case ex_UNPACKROWS:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ExUnPackRowsTdb);
-#pragma warn(1506) // warning elimination
break;
}
case ex_PACKROWS:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ExPackRowsTdb);
-#pragma warn(1506) // warning elimination
break;
}
case ex_SAMPLE:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ExSampleTdb);
-#pragma warn(1506) // warning elimination
break;
}
@@ -179,282 +165,212 @@ char *ComTdb::findVTblPtrExe(short classID)
// unused feature, done as part of SQ SQL code cleanup effort
case ex_SIMPLE_SAMPLE:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ExSimpleSampleTdb);
-#pragma warn(1506) // warning elimination
break;
}
#endif // if 0
case ex_LEAF_TUPLE:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ExTupleLeafTdb);
-#pragma warn(1506) // warning elimination
break;
}
case ex_COMPOUND_STMT:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr, ExCatpoundStmtTdb);
-#pragma warn(1506) // warning elimination
break;
}
case ex_NON_LEAF_TUPLE:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ExTupleNonLeafTdb);
-#pragma warn(1506) // warning elimination
break;
}
case ex_CONTROL_QUERY:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ExControlTdb);
-#pragma warn(1506) // warning elimination
break;
}
case ex_ROOT:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ex_root_tdb);
-#pragma warn(1506) // warning elimination
break;
}
case ex_ONLJ:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ExOnljTdb);
-#pragma warn(1506) // warning elimination
break;
}
case ex_HASHJ:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ex_hashj_tdb);
-#pragma warn(1506) // warning elimination
break;
}
case ex_MJ:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ex_mj_tdb);
-#pragma warn(1506) // warning elimination
break;
}
case ex_UNION:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ex_union_tdb);
-#pragma warn(1506) // warning elimination
break;
}
case ex_FAST_EXTRACT:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ExFastExtractTdb);
-#pragma warn(1506) // warning elimination
break;
}
case ex_UDR:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ExUdrTdb);
-#pragma warn(1506) // warning elimination
break;
}
case ex_EXPLAIN:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ExExplainTdb);
-#pragma warn(1506) // warning elimination
break;
}
case ex_SEQUENCE_FUNCTION:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ExSequenceTdb);
-#pragma warn(1506) // warning elimination
break;
}
case ex_SORT:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ExSortTdb);
-#pragma warn(1506) // warning elimination
break;
}
case ex_SPLIT_TOP:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ex_split_top_tdb);
-#pragma warn(1506) // warning elimination
break;
}
case ex_SPLIT_BOTTOM:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ex_split_bottom_tdb);
-#pragma warn(1506) // warning elimination
break;
}
case ex_SEND_TOP:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ex_send_top_tdb);
-#pragma warn(1506) // warning elimination
break;
}
case ex_SEND_BOTTOM:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ex_send_bottom_tdb);
-#pragma warn(1506) // warning elimination
break;
}
case ex_STATS:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ExStatsTdb);
-#pragma warn(1506) // warning elimination
break;
}
case ex_STORED_PROC:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ExStoredProcTdb);
-#pragma warn(1506) // warning elimination
break;
}
case ex_TUPLE_FLOW:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ExTupleFlowTdb);
-#pragma warn(1506) // warning elimination
break;
}
case ex_SET_TIMEOUT:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ExTimeoutTdb);
-#pragma warn(1506) // warning elimination
break;
}
case ex_TRANSACTION:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ExTransTdb);
-#pragma warn(1506) // warning elimination
break;
}
case ex_DDL:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ExDDLTdb);
-#pragma warn(1506) // warning elimination
break;
}
case ex_DDL_WITH_STATUS:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ExDDLwithStatusTdb);
-#pragma warn(1506) // warning elimination
break;
}
case ex_DESCRIBE:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ExDescribeTdb);
-#pragma warn(1506) // warning elimination
break;
}
case ex_EXE_UTIL:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ExExeUtilTdb);
-#pragma warn(1506) // warning elimination
break;
}
case ex_FAST_DELETE:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ExExeUtilFastDeleteTdb);
-#pragma warn(1506) // warning elimination
break;
}
case ex_HIVE_TRUNCATE:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ExExeUtilHiveTruncateTdb);
-#pragma warn(1506) // warning elimination
break;
}
case ex_HIVE_QUERY:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ExExeUtilHiveQueryTdb);
-#pragma warn(1506) // warning elimination
break;
}
case ex_PROCESS_VOLATILE_TABLE:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ExProcessVolatileTableTdb);
-#pragma warn(1506) // warning elimination
break;
}
case ex_LOAD_VOLATILE_TABLE:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ExExeUtilLoadVolatileTableTdb);
-#pragma warn(1506) // warning elimination
break;
}
case ex_CLEANUP_VOLATILE_TABLES:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ExExeUtilCleanupVolatileTablesTdb);
-#pragma warn(1506) // warning elimination
break;
}
case ex_GET_VOLATILE_INFO:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ExExeUtilGetVolatileInfoTdb);
-#pragma warn(1506) // warning elimination
break;
}
@@ -462,59 +378,45 @@ char *ComTdb::findVTblPtrExe(short classID)
case ex_PROCESS_INMEMORY_TABLE:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ExProcessInMemoryTableTdb);
-#pragma warn(1506) // warning elimination
break;
}
case ex_CREATE_TABLE_AS:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ExExeUtilCreateTableAsTdb);
-#pragma warn(1506) // warning elimination
break;
}
case ex_GET_STATISTICS:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ExExeUtilGetStatisticsTdb);
-#pragma warn(1506) // warning elimination
break;
}
case ex_LOB_INFO:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ExExeUtilLobInfoTdb);
-#pragma warn(1506) // warning elimination
break;
}
case ex_GET_METADATA_INFO:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ExExeUtilGetMetadataInfoTdb);
-#pragma warn(1506) // warning elimination
break;
}
case ex_GET_HIVE_METADATA_INFO:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ExExeUtilGetHiveMetadataInfoTdb);
-#pragma warn(1506) // warning elimination
break;
}
case ex_GET_UID:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ExExeUtilGetUIDTdb);
-#pragma warn(1506) // warning elimination
break;
}
@@ -528,43 +430,33 @@ case ex_LOB_INFO:
case ex_POP_IN_MEM_STATS:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ExExeUtilPopulateInMemStatsTdb);
-#pragma warn(1506) // warning elimination
break;
}
case ex_DISPLAY_EXPLAIN:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ExExeUtilDisplayExplainTdb);
-#pragma warn(1506) // warning elimination
break;
}
case ex_DISPLAY_EXPLAIN_COMPLEX:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ExExeUtilDisplayExplainComplexTdb);
-#pragma warn(1506) // warning elimination
break;
}
case ex_PROBE_CACHE:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ExProbeCacheTdb);
-#pragma warn(1506) // warning elimination
break;
}
case ex_LONG_RUNNING:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ExExeUtilLongRunningTdb);
-#pragma warn(1506) // warning elimination
break;
}
@@ -572,136 +464,104 @@ case ex_LOB_INFO:
case ex_SHOW_SET:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ExExeUtilShowSetTdb);
-#pragma warn(1506) // warning elimination
break;
}
case ex_AQR:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ExExeUtilAQRTdb);
-#pragma warn(1506) // warning elimination
break;
}
case ex_GET_ERROR_INFO:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ExExeUtilGetErrorInfoTdb);
-#pragma warn(1506) // warning elimination
break;
}
case ex_PROCESS_STATISTICS:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ExExeUtilGetProcessStatisticsTdb);
-#pragma warn(1506) // warning elimination
break;
}
case ex_ARQ_WNR_INSERT:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ExExeUtilAqrWnrInsertTdb);
break;
-#pragma warn(1506) // warning elimination
}
case ex_HDFS_SCAN:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ExHdfsScanTdb);
-#pragma warn(1506) // warning elimination
break;
}
case ex_LOB_EXTRACT:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ExExeUtilLobExtractTdb);
-#pragma warn(1506) // warning elimination
break;
}
case ex_LOB_UPDATE_UTIL:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ExExeUtilLobUpdateTdb);
-#pragma warn(1506) // warning elimination
break;
}
case ex_LOB_SHOWDDL:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ExExeUtilLobShowddlTdb);
-#pragma warn(1506) // warning elimination
break;
}
case ex_HIVE_MD_ACCESS:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ExExeUtilHiveMDaccessTdb);
-#pragma warn(1506) // warning elimination
break;
}
case ex_HBASE_ACCESS:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ExHbaseAccessTdb);
-#pragma warn(1506) // warning elimination
break;
}
case ex_HBASE_COPROC_AGGR:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ExHbaseCoProcAggrTdb);
-#pragma warn(1506) // warning elimination
break;
}
case ex_HBASE_LOAD:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ExExeUtilHBaseBulkLoadTdb);
-#pragma warn(1506) // warning elimination
break;
}
case ex_HBASE_UNLOAD:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ExExeUtilHBaseBulkUnLoadTdb);
-#pragma warn(1506) // warning elimination
break;
}
case ex_ORC_AGGR:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ExOrcFastAggrTdb);
-#pragma warn(1506) // warning elimination
break;
}
case ex_CANCEL:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ExCancelTdb);
-#pragma warn(1506) // warning elimination
break;
}
@@ -764,14 +624,12 @@ void resetBufSize(ex_tcb * tcb, Lng32 &tcbSpaceNeeded, Lng32 &poolSpaceNeeded)
tcb->computeNeededPoolInfo(numBuffs,
staticPoolSpaceSize, dynPoolSpaceSize);
-#pragma nowarn(1506) // warning elimination
// size of pool space that was allocated during the build
// phase. This value is included in tcbSpaceNeeded.
// compute tcb space needed by subtracting staticPoolSize
tcbSpaceNeeded -= staticPoolSpaceSize;
poolSpaceNeeded += dynPoolSpaceSize;
-#pragma warn(1506) // warning elimination
if ((tcb->resizePoolInfo()) &&
(numBuffs >= 0))
@@ -780,7 +638,6 @@ void resetBufSize(ex_tcb * tcb, Lng32 &tcbSpaceNeeded, Lng32 &poolSpaceNeeded)
}
}
-#pragma nowarn(262) // warning elimination
Lng32 getTotalTcbSpace(char*inTdb, char * otherInfo, char * parentMemory)
{
ComTdb * tdb = (ComTdb*)inTdb;
@@ -836,4 +693,3 @@ Lng32 getTotalTcbSpace(char*inTdb, char * otherInfo, char * parentMemory)
return totalSpaceNeeded;
}
-#pragma warn(262) // warning elimination
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/executor/ExExeUtilCommon.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExExeUtilCommon.cpp b/core/sql/executor/ExExeUtilCommon.cpp
index 0bd991d..19d11fd 100644
--- a/core/sql/executor/ExExeUtilCommon.cpp
+++ b/core/sql/executor/ExExeUtilCommon.cpp
@@ -135,11 +135,9 @@ ExExeUtilTcb::ExExeUtilTcb(const ComTdbExeUtil & exe_util_tdb,
CollHeap * heap = (glob ? glob->getDefaultHeap() : 0);
// Allocate the buffer pool
-#pragma nowarn(1506) // warning elimination
pool_ = new(space) sql_buffer_pool(exe_util_tdb.numBuffers_,
exe_util_tdb.bufferSize_,
space);
-#pragma warn(1506) // warning elimination
childTcb_ = child_tcb;
if (childTcb_)
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/executor/ExExeUtilExplain.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExExeUtilExplain.cpp b/core/sql/executor/ExExeUtilExplain.cpp
index 12107e5..43f284b 100644
--- a/core/sql/executor/ExExeUtilExplain.cpp
+++ b/core/sql/executor/ExExeUtilExplain.cpp
@@ -143,7 +143,6 @@ ex_tcb_private_state * ExExeUtilDisplayExplainTcb::allocatePstates(
return pa.allocatePstates(this, numElems, pstateLength);
}
-#pragma nowarn(1313) // warning elimination
static const QueryString displayExplainQuery[] =
{
{" select translate(case when module_name is null then cast(_ucs2'?' as char(60) character set ucs2 not null) "},
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/executor/ExExplain.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExExplain.cpp b/core/sql/executor/ExExplain.cpp
index 51c3002..0cf537b 100644
--- a/core/sql/executor/ExExplain.cpp
+++ b/core/sql/executor/ExExplain.cpp
@@ -136,11 +136,9 @@ ExExplainTcb::ExExplainTcb(const ExExplainTdb &explainTdb, ex_globals *glob)
// Allocate the buffer pool
// Allocate the specified number of buffers each can hold 5 tuples.
-#pragma nowarn(1506) // warning elimination
pool_ = new(space) sql_buffer_pool(explainTdb.numBuffers_,
explainTdb.bufferSize_,
space);
-#pragma warn(1506) // warning elimination
// Allocate the queues used to communicate with parent
qParent_.down = new(space) ex_queue(ex_queue::DOWN_QUEUE,
@@ -256,13 +254,11 @@ ExExplainTcb::loadModule()
SQLMODULE_ID moduleId;
// Added for multi charset module names
-#pragma nowarn(1506) // warning elimination
init_SQLMODULE_ID(&moduleId,
SQLCLI_CURRENT_VERSION,
modName_,
0, SQLCHARSETSTRING_ISO88591, strlen(modName_)
);
-#pragma warn(1506) // warning elimination
//moduleId.module_name = modName_;
}
@@ -1057,13 +1053,11 @@ ExExplainTcb::getNextExplainTree()
{
// Define the pattern string
// The Wild Card character is '\'
-#pragma nowarn(1506) // warning elimination
LikePatternString
patternString(stmtPattern_,
(stmtPattern_ ? str_len(stmtPattern_) : 0),
CharInfo::ISO88591,
"\\", 1 );
-#pragma warn(1506) // warning elimination
// Define a pattern for the pattern string
LikePattern pattern(patternString, getHeap());
@@ -1129,9 +1123,7 @@ ExExplainTcb::getNextExplainTree()
(str_cmp(modName_, moduleName, length) == 0)));
if(modNameMatches &&
-#pragma nowarn(1506) // warning elimination
(pattern.matches(ident, (ident ? str_len(ident) : 0), CharInfo::UTF8) == TRUE) &&
-#pragma warn(1506) // warning elimination
stmt->getRootTdb())
{
// Remember the current statement, so that the position
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/executor/ExFirstN.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExFirstN.cpp b/core/sql/executor/ExFirstN.cpp
index c6093ab..0937eea 100644
--- a/core/sql/executor/ExFirstN.cpp
+++ b/core/sql/executor/ExFirstN.cpp
@@ -74,11 +74,9 @@ ExFirstNTcb::ExFirstNTcb(const ExFirstNTdb & firstn_tdb,
CollHeap * heap = (glob ? glob->getDefaultHeap() : NULL);
// Allocate the buffer pool
-#pragma nowarn(1506) // warning elimination
pool_ = new(space) sql_buffer_pool(firstn_tdb.numBuffers_,
firstn_tdb.bufferSize_,
space);
-#pragma warn(1506) // warning elimination
// get the queue that child use to communicate with me
qchild_ = child_tcb.getParentQueue();
@@ -177,7 +175,6 @@ short ExFirstNTcb::moveChildDataToParent()
////////////////////////////////////////////////////////////////////////////
// This is where the action is.
////////////////////////////////////////////////////////////////////////////
-#pragma nowarn(262) // warning elimination
short ExFirstNTcb::work()
{
// if no parent request, return
@@ -475,7 +472,6 @@ short ExFirstNTcb::work()
return 0;
}
-#pragma warn(262) // warning elimination
short ExFirstNTcb::cancel()
{
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/executor/ExPack.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExPack.h b/core/sql/executor/ExPack.h
index 9b4ea93..953396c 100644
--- a/core/sql/executor/ExPack.h
+++ b/core/sql/executor/ExPack.h
@@ -172,28 +172,24 @@ public:
ExWorkProcRetcode workReturnRow();
// Stub to workUp() used by scheduler.
-// warning elimination (removed "inline")
static ExWorkProcRetcode sWorkUp(ex_tcb *tcb)
{
return ((ExPackRowsTcb *) tcb)->workUp();
}
// Stub to workDown() used by scheduler.
-// warning elimination (removed "inline")
static ExWorkProcRetcode sWorkDown(ex_tcb *tcb)
{
return ((ExPackRowsTcb *) tcb)->workDown();
}
// Stub to processCancel() used by scheduler.
-// warning elimination (removed "inline")
static ExWorkProcRetcode sCancel(ex_tcb *tcb)
{
return ((ExPackRowsTcb *) tcb)->processCancel();
}
// Return the parent queue pair.
-// warning elimination (removed "inline")
ex_queue_pair getParentQueue() const { return qParent_; }
// Return a reference to the Pack TDB associated with this Pack TCB.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/executor/ExPackedRows.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExPackedRows.cpp b/core/sql/executor/ExPackedRows.cpp
index bbc82f5..49d5bb1 100644
--- a/core/sql/executor/ExPackedRows.cpp
+++ b/core/sql/executor/ExPackedRows.cpp
@@ -116,11 +116,9 @@ ExUnPackRowsTcb::ExUnPackRowsTcb(const ExUnPackRowsTdb &unPackRowsTdbLocal,
// Allocate the buffer pool. Allocate a buffer big enough to hold
// twice the size of my upqueue.
//
-#pragma nowarn(1506) // warning elimination
pool_ = new(space) ExSimpleSQLBuffer(unPackRowsTdb().queueSizeUp_ * 2,
unPackRowsTdb().unPackColsTupleLen_,
space);
-#pragma warn(1506) // warning elimination
// get the queue used by my child to communicate with me
//
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/executor/ExPackedRows.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExPackedRows.h b/core/sql/executor/ExPackedRows.h
index e80a609..cfd2253 100644
--- a/core/sql/executor/ExPackedRows.h
+++ b/core/sql/executor/ExPackedRows.h
@@ -219,7 +219,6 @@ public:
// Stub to workUp() used by scheduler.
//
- // warning elimination (removed "inline")
static ExWorkProcRetcode sWorkUp(ex_tcb *tcb)
{
return ((ExUnPackRowsTcb *)tcb)->workUp();
@@ -227,7 +226,6 @@ public:
// Stub to workDown() used by scheduler.
//
- // warning elimination (removed "inline")
static ExWorkProcRetcode sWorkDown(ex_tcb *tcb)
{
return ((ExUnPackRowsTcb *)tcb)->workDown();
@@ -235,7 +233,6 @@ public:
// Stub to processCancel() used by scheduler.
//
-// warning elimination (removed "inline")
static ExWorkProcRetcode sCancel(ex_tcb *tcb)
{
return ((ExUnPackRowsTcb *)tcb)->processCancel();
@@ -243,7 +240,6 @@ public:
// Return the parent queue pair.
//
-// warning elimination (removed "inline")
ex_queue_pair getParentQueue() const { return qParent_; }
// Return a reference to the UnPackRows TDB associated with this
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/executor/ExRsInfo.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExRsInfo.h b/core/sql/executor/ExRsInfo.h
index f837af3..2cd6485 100644
--- a/core/sql/executor/ExRsInfo.h
+++ b/core/sql/executor/ExRsInfo.h
@@ -55,7 +55,6 @@ class UdrClientControlStream;
// DLL. The Windows compiler generates a warning about them requiring
// a DLL interface in order to be used by ExRsInfo clients. We
// will suppress such warnings.
-#pragma warning ( disable : 4251 )
//------------------------------------------------------------------------
// class RsInfo
@@ -244,6 +243,4 @@ private:
#endif
}; // class ExRsInfo
-#pragma warning ( default : 4251 )
-
#endif // EX_RS_INFO_H
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/executor/ExScheduler.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExScheduler.cpp b/core/sql/executor/ExScheduler.cpp
index 544eba8..76cb9be 100644
--- a/core/sql/executor/ExScheduler.cpp
+++ b/core/sql/executor/ExScheduler.cpp
@@ -328,7 +328,6 @@ ExWorkProcRetcode ExScheduler::work(Int64 prevWaitTime)
ex_queue_pair pq = subtask->tcb_->getParentQueue();
if (pq.down != NULL)
{
-#pragma warning (disable : 4244) //warning elimination
stats->getDownQueueStats().addEntry(
(double)pq.down->getLength());
stats->setDownQueueSize(pq.down->getSize());
@@ -337,7 +336,6 @@ ExWorkProcRetcode ExScheduler::work(Int64 prevWaitTime)
{
stats->getUpQueueStats().addEntry(
(double)pq.up->getLength());
-#pragma warning (default : 4244) //warning elimination
stats->setUpQueueSize(pq.up->getSize());
}
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/executor/ExSequence.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExSequence.cpp b/core/sql/executor/ExSequence.cpp
index 272a3a8..9458c19 100644
--- a/core/sql/executor/ExSequence.cpp
+++ b/core/sql/executor/ExSequence.cpp
@@ -257,14 +257,12 @@ ExSequenceTcb::ExSequenceTcb (const ExSequenceTdb & myTdb,
childTcb_ = &child_tcb;
// Allocate the buffer pool
-#pragma nowarn(1506) // warning elimination
pool_ = new(space) sql_buffer_pool(myTdb.numBuffers_,
myTdb.bufferSize_,
space);
allocRowLength_ = ROUND8(myTdb.recLen_);
-#pragma warn(1506) // warning elimination
// Initialize the machinery for maintaining the row history for
// computing sequence functions.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/executor/ExSimpleSample.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExSimpleSample.h b/core/sql/executor/ExSimpleSample.h
index 4d19302..14095b9 100644
--- a/core/sql/executor/ExSimpleSample.h
+++ b/core/sql/executor/ExSimpleSample.h
@@ -148,14 +148,12 @@ public:
ExWorkProcRetcode workUp();
// Stub to workUp() used by scheduler.
-// warning elimination (removed "inline")
static ExWorkProcRetcode sWorkUp(ex_tcb *tcb)
{
return ((ExSimpleSampleTcb *) tcb)->workUp();
}
// Stub to workDown() used by scheduler.
-// warning elimination (removed "inline")
static ExWorkProcRetcode sWorkDown(ex_tcb *tcb)
{
return ((ExSimpleSampleTcb *) tcb)->workDown();
@@ -168,7 +166,6 @@ public:
// }
// Return the parent queue pair.
-// warning elimination (removed "inline")
ex_queue_pair getParentQueue() const { return qParent_; }
// Return a reference to the TDB associated with this TCB.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/executor/ExStats.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExStats.h b/core/sql/executor/ExStats.h
index 51c78f6..f6b074a 100644
--- a/core/sql/executor/ExStats.h
+++ b/core/sql/executor/ExStats.h
@@ -220,7 +220,6 @@ private:
// Statistics for operators which use clusters (HJ, HGB,
// materialize)
//////////////////////////////////////////////////////////////////
-#pragma nowarn(1103) // warning elimination
class ExClusterStats : public ExStatsBase {
public:
ExClusterStats();
@@ -285,16 +284,12 @@ private:
ExClusterStats * next_;
};
-
-#pragma warn(1103) // warning elimination
-
//////////////////////////////////////////////////////////////////
// class ExTimeStats
//
// ExTimeStats collects time information. Real-time, process or
// thread CPU time.
//////////////////////////////////////////////////////////////////
-#pragma nowarn(1103) // warning elimination
class ExTimeStats : public ExStatsBase {
friend class ExOperStats;
friend class ExHashJoinStats;
@@ -317,7 +312,6 @@ public:
{
sumTime_ += time;
}
-#pragma warn(1103) // warning elimination
// start an active period (record the starting time)
void start();
@@ -358,9 +352,6 @@ private:
// Data members that identify an ExOperStats uniquely within
// a given statement
//////////////////////////////////////////////////////////////////
-#pragma nowarn(1103) // warning elimination
-#pragma nowarn(161) // warning elimination
-#pragma nowarn(1026) // warning elimination
struct ExOperStatsId
{
ExFragId fragId_;
@@ -386,11 +377,6 @@ struct ExOperStatsId
};
-#pragma warn(1103) // warning elimination
-#pragma warn(161) // warning elimination
-#pragma warn(1026) // warning elimination
-
-
// Define the number of retcodes here instead of taking the enum
// value WORK_LAST_RETCODE from file ExScheduler.h. The reason is
// that otherwise we couldn't change WORK_LAST_RETCODE without
@@ -478,7 +464,6 @@ private:
// (this number is included in Total number of bytes sent/recvd
// -- sent/recvd counters (See ExStatsCounter)
/////////////////////////////////////////////////////////////////////
-#pragma nowarn(1103) // warning elimination
class ExBufferStats : public ExStatsBase
{
public:
@@ -545,8 +530,6 @@ private:
};
-#pragma warn(1103) // warning elimination
-
//////////////////////////////////////////////////////////////////
// class ExOperStats
//
@@ -695,7 +678,6 @@ public:
inline void setCollectStatsType(ComTdb::CollectStatsType s)
{collectStatsType_ = s;}
-// warning elimination (removed "inline")
virtual const char * getStatTypeAsString() const {return "EX_OPER_STATS";};
inline Int64 getActualRowsReturned() const { return actualRowsReturned_; }
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/executor/ExTranspose.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExTranspose.cpp b/core/sql/executor/ExTranspose.cpp
index 30d6ec3..ae2d2ff 100644
--- a/core/sql/executor/ExTranspose.cpp
+++ b/core/sql/executor/ExTranspose.cpp
@@ -109,12 +109,10 @@ ExTransposeTcb::ExTransposeTcb(const ExTransposeTdb &transTdbLocal,
//transTdb().bufferSize_,
//space);
//
-#pragma nowarn(1506) // warning elimination
pool_ = new(space) ExSimpleSQLBuffer(transTdb().numBuffers_,
transTdb().bufferSize_,
transTdb().transRowLen_,
space);
-#pragma warn(1506) // warning elimination
// get the queue used by my child to communicate with me
//
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/executor/ExTranspose.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExTranspose.h b/core/sql/executor/ExTranspose.h
index 992749c..a2a537a 100644
--- a/core/sql/executor/ExTranspose.h
+++ b/core/sql/executor/ExTranspose.h
@@ -221,7 +221,6 @@ public:
// Stub to workUp() used by scheduler.
//
-// warning elimination (removed "inline")
static ExWorkProcRetcode sWorkUp(ex_tcb *tcb)
{
return ((ExTransposeTcb *) tcb)->workUp();
@@ -229,7 +228,6 @@ public:
// Stub to workDown() used by scheduler.
//
-// warning elimination (removed "inline")
static ExWorkProcRetcode sWorkDown(ex_tcb *tcb)
{
return ((ExTransposeTcb *) tcb)->workDown();
@@ -237,7 +235,6 @@ public:
// Stub to processCancel() used by scheduler.
//
-// warning elimination (removed "inline")
static ExWorkProcRetcode sCancel(ex_tcb *tcb)
{
return ((ExTransposeTcb *) tcb)->processCancel();
@@ -245,7 +242,6 @@ public:
// Return the parent queue pair.
//
-// warning elimination (removed "inline")
ex_queue_pair getParentQueue() const { return qParent_; }
// Return a reference to the Transpose TDB associated with this
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/executor/ExUdr.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExUdr.cpp b/core/sql/executor/ExUdr.cpp
index cacf484..24b6aaf 100644
--- a/core/sql/executor/ExUdr.cpp
+++ b/core/sql/executor/ExUdr.cpp
@@ -47,7 +47,6 @@
// method would decide to initiate the restart.
//
-#pragma nowarn(262) // warning elimination
#include "ex_stdh.h"
#include "ExUdr.h"
#include "ExUdrServer.h"
@@ -4771,5 +4770,4 @@ ExUdrPrivateState::~ExUdrPrivateState()
{
}
-#pragma warn(262) // warning elimination
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/executor/ExUdrClientIpc.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExUdrClientIpc.cpp b/core/sql/executor/ExUdrClientIpc.cpp
index ac531e7..6925a1a 100644
--- a/core/sql/executor/ExUdrClientIpc.cpp
+++ b/core/sql/executor/ExUdrClientIpc.cpp
@@ -45,7 +45,6 @@
#ifdef UDR_DEBUG
#include "ErrorMessage.h"
-#pragma nowarn(140) //warning elimination
#define UdrDebug0(s) \
( UdrPrintf(traceFile_,(s)) )
#define UdrDebug1(s,a1) \
@@ -58,7 +57,6 @@
( UdrPrintf(traceFile_,(s),(a1),(a2),(a3),(a4)) )
#define UdrDebug5(s,a1,a2,a3,a4,a5) \
( UdrPrintf(traceFile_,(s),(a1),(a2),(a3),(a4),(a5)) )
-#pragma warn(140) //warning elimination
#else
//
@@ -90,8 +88,6 @@
//---------------------------------------------------------------------------
// class UdrClientControlStream
//---------------------------------------------------------------------------
-#pragma nowarn(109) // warning elimination
-#pragma nowarn(1252) // warning elimination
UdrClientControlStream::UdrClientControlStream(IpcEnvironment *env,
ExUdrTcb *tcb,
ExExeStmtGlobals *stmtGlobals,
@@ -109,8 +105,6 @@ UdrClientControlStream::UdrClientControlStream(IpcEnvironment *env,
#endif
{
}
-#pragma warn(109) // warning elimination
-#pragma warn(1252) // warning elimination
UdrClientControlStream::~UdrClientControlStream()
{
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/executor/ExUdrServer.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExUdrServer.cpp b/core/sql/executor/ExUdrServer.cpp
index 7a7b20a..bcd01be 100644
--- a/core/sql/executor/ExUdrServer.cpp
+++ b/core/sql/executor/ExUdrServer.cpp
@@ -64,7 +64,6 @@ static const char *GetStatusString(ExUdrServer::ExUdrServerStatus s)
return "***UNKNOWN***";
} */
-#pragma nowarn(140) // warning elimination
#define UdrDebug0(s) \
( UdrPrintf(traceFile_,(s)) )
#define UdrDebug1(s,a1) \
@@ -77,7 +76,6 @@ static const char *GetStatusString(ExUdrServer::ExUdrServerStatus s)
( UdrPrintf(traceFile_,(s),(a1),(a2),(a3),(a4)) )
#define UdrDebug5(s,a1,a2,a3,a4,a5) \
( UdrPrintf(traceFile_,(s),(a1),(a2),(a3),(a4),(a5)) )
-#pragma warn(140) // warning elimination
#else
//
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/executor/ExVPJoin.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExVPJoin.cpp b/core/sql/executor/ExVPJoin.cpp
index 201d4b1..30eb1ae 100644
--- a/core/sql/executor/ExVPJoin.cpp
+++ b/core/sql/executor/ExVPJoin.cpp
@@ -350,14 +350,10 @@ ExWorkProcRetcode ExVPJoinTcb::workUp()
// Append this child's output to result ATP.
//
-#pragma nowarn(1506) // warning elimination
short numResTups = reply->numTuples()-vpJoinTdb().firstReplyAtpIx_;
-#pragma warn(1506) // warning elimination
short dest_start_tupp = outIx;
short src_start_tupp = vpJoinTdb().firstReplyAtpIx_;
-#pragma nowarn(1506) // warning elimination
short src_end_tupp = numResTups + vpJoinTdb().firstReplyAtpIx_ - 1;
-#pragma warn(1506) // warning elimination
resAtp->copyPartialAtp(reply->getAtp(), // source atp
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/executor/MdamPoint.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/MdamPoint.cpp b/core/sql/executor/MdamPoint.cpp
index 1ecc00c..762940b 100644
--- a/core/sql/executor/MdamPoint.cpp
+++ b/core/sql/executor/MdamPoint.cpp
@@ -83,9 +83,7 @@ NABoolean MdamPoint::beginContains(const ULng32 keyLen, const char * v)
{
return FALSE;
};
-#pragma nowarn(203) // warning elimination
return TRUE; // To get rid of compiler warning.
-#pragma warn(203) // warning elimination
}
@@ -113,9 +111,7 @@ NABoolean MdamPoint::endContains(const ULng32 keyLen, const char * v) const
{
return FALSE;
};
-#pragma nowarn(203) // warning elimination
return TRUE; // To get rid of compiler warning.
-#pragma warn(203) // warning elimination
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/executor/MdamPoint.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/MdamPoint.h b/core/sql/executor/MdamPoint.h
index 815cd06..40315f8 100644
--- a/core/sql/executor/MdamPoint.h
+++ b/core/sql/executor/MdamPoint.h
@@ -55,7 +55,6 @@
class MdamEndPoint;
// End of forward declarations.
-#pragma nowarn(1103) // warning elimination
class MdamPoint
{
@@ -114,8 +113,6 @@ private:
}; // class MdamPoint
-#pragma warn(1103) // warning elimination
-
// *****************************************************************************
// Inline member functions for class MdamPoint
// *****************************************************************************
@@ -133,11 +130,9 @@ inline MdamPoint::MdamPoint(const tupp & tupp,
inline MdamEnums::MdamOrder MdamPoint::compare
(const MdamPoint * other, const ULng32 keyLen) const
{
-#pragma nowarn(1506) // warning elimination
short retVal = str_cmp(tupp_.getDataPointer(),
other->tupp_.getDataPointer(),
Int32(keyLen));
-#pragma warn(1506) // warning elimination
if (retVal < 0)
return MdamEnums::MDAM_LESS;
else
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/executor/TriggerEnable.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/TriggerEnable.h b/core/sql/executor/TriggerEnable.h
index a1e5430..4530369 100644
--- a/core/sql/executor/TriggerEnable.h
+++ b/core/sql/executor/TriggerEnable.h
@@ -121,7 +121,6 @@ private:
//
-#pragma nowarn(1506) // warning elimination
class TriggerStatusWA : public NABasicObject
{
@@ -193,7 +192,6 @@ private:
ex_root_tcb* rootTcb_;
};
-#pragma warn(1506) // warning elimination
#endif
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/executor/ex_ddl.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ex_ddl.cpp b/core/sql/executor/ex_ddl.cpp
index b370a16..36772a2 100644
--- a/core/sql/executor/ex_ddl.cpp
+++ b/core/sql/executor/ex_ddl.cpp
@@ -93,11 +93,9 @@ ExDDLTcb::ExDDLTcb(const ComTdbDDL & ddl_tdb,
CollHeap * heap = (glob ? glob->getDefaultHeap() : 0);
// Allocate the buffer pool
-#pragma nowarn(1506) // warning elimination
pool_ = new(space) sql_buffer_pool(ddl_tdb.numBuffers_,
ddl_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,
@@ -1268,12 +1266,8 @@ Lng32 ExDescribeTcb::returnLeaks(short &error)
ex_queue_entry * up_entry = qparent_.up->getTailEntry();
// allocate space
-#pragma nowarn(1506) // warning elimination
if (pool_->get_free_tuple(up_entry->getTupp(describeTdb().tuppIndex_),
-#pragma warn(1506) // warning elimination
-#pragma nowarn(1506) // warning elimination
describeTdb().outputRowlen_))
-#pragma warn(1506) // warning elimination
{
// no more space in the pool.
@@ -1283,17 +1277,13 @@ Lng32 ExDescribeTcb::returnLeaks(short &error)
}
char *entry = up_entry->
-#pragma nowarn(1506) // warning elimination
getTupp(describeTdb().tuppIndex_).getDataPointer();
-#pragma warn(1506) // warning elimination
// For ARKCMP and/or SQLCI
if (HeapLogRoot::fetchLine(entry,
describeTdb().flags_,
pstate.dataPtr_,
-#pragma nowarn(1506) // warning elimination
pstate.dataLen_) == 1)
-#pragma warn(1506) // warning elimination
{ // eof
pstate.currLen_ = pstate.dataLen_;
pstate.step_ = DONE_;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/executor/ex_esp_frag_dir.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ex_esp_frag_dir.cpp b/core/sql/executor/ex_esp_frag_dir.cpp
index fa4c9c9..ae7a6b5 100644
--- a/core/sql/executor/ex_esp_frag_dir.cpp
+++ b/core/sql/executor/ex_esp_frag_dir.cpp
@@ -234,7 +234,6 @@ ExFragInstanceHandle ExEspFragInstanceDir::addEntry(ExMsgFragment *msgFragment,
// allocate the globals in their own heap, like the master
// executor does it
-#pragma nowarn(1506) // warning elimination
inst->globals_ = new(stmtHeap) ExEspStmtGlobals(
(short) msgFragment->getNumTemps(),
cliGlobals_,
@@ -246,7 +245,6 @@ ExFragInstanceHandle ExEspFragInstanceDir::addEntry(ExMsgFragment *msgFragment,
msgFragment->getInjectErrorAtExpr(),
inst->queryId_,
inst->queryIdLen_);
-#pragma warn(1506) // warning elimination
}
else
inst->globals_ = NULL; // no globals needed for DP2 fragments
@@ -547,7 +545,6 @@ void ExEspFragInstanceDir::releaseOrphanEntries()
}
}
-#pragma nowarn(770) // warning elimination
void ExEspFragInstanceDir::hasTransidReleaseRequest(
ExFragInstanceHandle handle)
{
@@ -629,7 +626,6 @@ void ExEspFragInstanceDir::hasReleaseRequest(
}
-#pragma warn(770) // warning elimination
void ExEspFragInstanceDir::work(Int64 prevWaitTime)
{
@@ -1305,7 +1301,6 @@ void ExEspControlMessage::actOnReceive(IpcConnection *connection)
send(FALSE);
}
-#pragma nowarn(262) // warning elimination
void ExEspControlMessage::actOnLoadFragmentReq(
IpcConnection *connection,
ComDiagsArea & /*da*/)
@@ -1359,7 +1354,6 @@ void ExEspControlMessage::actOnLoadFragmentReq(
// the reply is handled by the caller
}
-#pragma warn(262) // warning elimination
void ExEspControlMessage::actOnFixupFragmentReq(ComDiagsArea &da)
{
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/executor/ex_esp_msg.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ex_esp_msg.cpp b/core/sql/executor/ex_esp_msg.cpp
index 51e1b0e..029a186 100644
--- a/core/sql/executor/ex_esp_msg.cpp
+++ b/core/sql/executor/ex_esp_msg.cpp
@@ -616,9 +616,7 @@ IpcMessageObjSize TupMsgBuffer::packObjIntoMessage(IpcMessageBufferPtr buffer)
theBuffer_->drivePack();
// now move the SqlBuffer
-#pragma nowarn(1506) // warning elimination
str_cpy_all(buffer,(char *) theBuffer_, theBuffer_->get_buffer_size());
-#pragma warn(1506) // warning elimination
result += theBuffer_->get_buffer_size();
@@ -645,9 +643,7 @@ void TupMsgBuffer::unpackObj(IpcMessageObjType objType,
ex_assert(allocSize_ >= (Lng32) sqlBufferSize,
"TupMsgBuffer too small for unpack");
-#pragma nowarn(1506) // warning elimination
str_cpy_all((char *) theBuffer_, buffer, sqlBufferSize);
-#pragma warn(1506) // warning elimination
// convert offsets in buffer to pointers
theBuffer_->driveUnpack();
@@ -689,9 +685,7 @@ IpcMessageObjSize ExProcessIdsOfFrag::packObjIntoMessage(
IpcMessageBufferPtr buffer)
{
IpcMessageObjSize result = packBaseClassIntoMessage(buffer);
-#pragma nowarn(1506) // warning elimination
Int32 np = processIds_.entries();
-#pragma warn(1506) // warning elimination
// pack fragment id and number of entries
str_cpy_all(buffer, (const char *) &spare_, sizeof(spare_));
@@ -953,9 +947,7 @@ IpcMessageObjSize ExMsgFragment::packObjIntoMessage(IpcMessageBufferPtr buffer)
}
else
{
-#pragma nowarn(1506) // warning elimination
str_cpy_all(buffer,fragment_,f_.fragmentLength_);
-#pragma warn(1506) // warning elimination
buffer += f_.fragmentLength_;
}
@@ -1035,9 +1027,7 @@ void ExMsgFragment::unpackObj(IpcMessageObjType objType,
}
else
{
-#pragma nowarn(1506) // warning elimination
str_cpy_all(fragment_, buffer,f_.fragmentLength_);
-#pragma warn(1506) // warning elimination
buffer += f_.fragmentLength_;
}
@@ -1106,7 +1096,6 @@ ExMsgTimeoutData::packObjIntoMessage(IpcMessageBufferPtr buffer)
return (IpcMessageObjSize) (buffer - start);
}
-#pragma nowarn(262) // warning elimination
void ExMsgTimeoutData::unpackObj(IpcMessageObjType objType,
IpcMessageObjVersion objVersion,
NABoolean sameEndianness,
@@ -1129,7 +1118,6 @@ void ExMsgTimeoutData::unpackObj(IpcMessageObjType objType,
iOwnTD_ = TRUE; // on the ESP side; I own the newly allocated timeoutData_
}
-#pragma warn(262) // warning elimination
@@ -1289,9 +1277,7 @@ void ExMsgResourceInfo::unpackObj(IpcMessageObjType objType,
// sfo_ is const
sfo_ = sfo;
-#pragma nowarn(1506) // warning elimination
sfo->ipcUnpackObj(objSize - (buffer-start),
-#pragma warn(1506) // warning elimination
buffer,
getHeap(),
totalNameLength_,
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/executor/ex_ex.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ex_ex.cpp b/core/sql/executor/ex_ex.cpp
index 96214e5..da1a411 100644
--- a/core/sql/executor/ex_ex.cpp
+++ b/core/sql/executor/ex_ex.cpp
@@ -208,9 +208,7 @@ Int32 ex_tcb::fixup()
Int32 nc = numChildren();
for (Int32 i=0; i<nc; i++)
{
-#pragma nowarn(1506) // warning elimination
error = ((ex_tcb *)getChild(i))->fixup();
-#pragma warn(1506) // warning elimination
if (error)
break;
}
@@ -226,9 +224,7 @@ Int32 ex_tcb::rollbackSavepoint()
Int32 nc = numChildren();
for (Int32 i=0; i<nc; i++)
{
-#pragma nowarn(1506) // warning elimination
error = ((ex_tcb *)getChild(i))->rollbackSavepoint();
-#pragma warn(1506) // warning elimination
if (error)
break;
}
@@ -261,9 +257,7 @@ NABoolean ex_tcb::closeTables()
unsigned short ex_tcb::getExpressionMode() const
{
if (globals_->getInjectErrorAtExpr())
-#pragma nowarn(1506) // warning elimination
return tdb.expressionMode_ | ex_expr::INJECT_ERROR;
-#pragma warn(1506) // warning elimination
else
return tdb.expressionMode_;
};
@@ -656,9 +650,7 @@ NABoolean ExExprComputeSpace(ex_tcb * tcb)
void ex_log_ems( const char *f, Int32 l, const char * m)
{
}
-#pragma nowarn(770) // warning elimination
void assert_botch_longjmp( const char *f, Int32 l, const char * m)
{
}
-#pragma warn(770) // warning elimination
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/executor/ex_god.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/ex_god.h b/core/sql/executor/ex_god.h
index 9bbe887..3655945 100644
--- a/core/sql/executor/ex_god.h
+++ b/core/sql/executor/ex_god.h
@@ -44,14 +44,11 @@
#include <stdlib.h>
#include "NAHeap.h"
-#pragma nowarn(1103) // warning elimination
class ExGod : public NABasicObject
{
protected:
virtual ~ExGod();
};
-#pragma warn(1103) // warning elimination
-
// the next two methods will eventually be removed after all
// executor objects have been derived from ExGod(or something
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/executor/ex_io_control.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/ex_io_control.h b/core/sql/executor/ex_io_control.h
index 8678e57..d8830cd 100644
--- a/core/sql/executor/ex_io_control.h
+++ b/core/sql/executor/ex_io_control.h
@@ -116,9 +116,7 @@ inline void ControlInfo::setBufferSequenceNumber(ULng32 snum)
inline NABoolean ControlInfo::getIsDiagsAreaPresent() const
{
-#pragma nowarn(1506) // warning elimination
return (ciFlags_ & HAS_DIAGSAREA);
-#pragma warn(1506) // warning elimination
}
inline void ControlInfo::setIsDiagsAreaPresent(NABoolean val)
@@ -144,9 +142,7 @@ inline void ControlInfo::setIsDiagsAreaUnpacked(NABoolean val)
inline NABoolean ControlInfo::getIsExtDiagsAreaPresent() const
{
-#pragma nowarn(1506) // warning elimination
return (ciFlags_ & HAS_EXT_DIAGSAREA);
-#pragma warn(1506) // warning elimination
}
inline void ControlInfo::setIsExtDiagsAreaPresent(NABoolean val)
@@ -159,9 +155,7 @@ inline void ControlInfo::setIsExtDiagsAreaPresent(NABoolean val)
inline NABoolean ControlInfo::getIsDataRowPresent() const
{
-#pragma nowarn(1506) // warning elimination
return (ciFlags_ & HAS_DATA);
-#pragma warn(1506) // warning elimination
}
inline void ControlInfo::setIsDataRowPresent(NABoolean val)
@@ -174,9 +168,7 @@ inline void ControlInfo::setIsDataRowPresent(NABoolean val)
inline NABoolean ControlInfo::getIsStatsAreaPresent() const
{
-#pragma nowarn(1506) // warning elimination
return (ciFlags_ & HAS_STATSAREA);
-#pragma warn(1506) // warning elimination
}
inline void ControlInfo::setIsStatsAreaPresent(NABoolean val)
@@ -189,9 +181,7 @@ inline void ControlInfo::setIsStatsAreaPresent(NABoolean val)
inline NABoolean ControlInfo::getIsExtStatsAreaPresent() const
{
-#pragma nowarn(1506) // warning elimination
return (ciFlags_ & HAS_EXT_STATSAREA);
-#pragma warn(1506) // warning elimination
}
inline void ControlInfo::setIsExtStatsAreaPresent(NABoolean val)
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/executor/ex_mdam.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ex_mdam.cpp b/core/sql/executor/ex_mdam.cpp
index 770a09e..fda177e 100644
--- a/core/sql/executor/ex_mdam.cpp
+++ b/core/sql/executor/ex_mdam.cpp
@@ -166,21 +166,11 @@ MdamColumn::MdamColumn(MdamColumn * previous,
}
// allocate storage to hold current, hi, lo, nonNullHi, nonNullLo values
-#pragma nowarn(1506) // warning elimination
pool->get_free_tuple(currentValue_,columnGenInfo_->getLength());
-#pragma warn(1506) // warning elimination
-#pragma nowarn(1506) // warning elimination
pool->get_free_tuple(hi_,columnGenInfo_->getLength());
-#pragma warn(1506) // warning elimination
-#pragma nowarn(1506) // warning elimination
pool->get_free_tuple(lo_,columnGenInfo_->getLength());
-#pragma warn(1506) // warning elimination
-#pragma nowarn(1506) // warning elimination
pool->get_free_tuple(nonNullHi_,columnGenInfo_->getLength());
-#pragma warn(1506) // warning elimination
-#pragma nowarn(1506) // warning elimination
pool->get_free_tuple(nonNullLo_,columnGenInfo_->getLength());
-#pragma warn(1506) // warning elimination
// go tell MdamColumnGen to fix up its expressions
// (aside: too bad we have to do it here -- if there were fixup
@@ -482,9 +472,7 @@ if (keyData)
{
// the sparse probe was successful -- save the key value
Int32 len = Int32(columnGenInfo_->getLength());
-#pragma nowarn(1506) // warning elimination
Lng32 offset = columnGenInfo_->getOffset();
-#pragma warn(1506) // warning elimination
char * cv = currentValue_.getDataPointer();
str_cpy_all(cv,keyData + offset,len);
@@ -586,11 +574,9 @@ while ((predIterator.positionToNextOr(¤tPred_)) &&
tupp & pv = workAtp->getTupp(valueAtpIndex);
tupp & pv2 = workAtp->getTupp(valueAtpIndex+1);
-#pragma nowarn(1506) // warning elimination
pool->get_free_tuple(pv,columnGenInfo_->getLength());
if (predPtr->getPredType() == MdamPred::MDAM_BETWEEN)
pool->get_free_tuple(pv2,columnGenInfo_->getLength());
-#pragma warn(1506) // warning elimination
got_a_predicate = TRUE;
dataConvErrorFlag = 0; // The zero hard-coded here should be
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/executor/ex_mj.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ex_mj.cpp b/core/sql/executor/ex_mj.cpp
index 55a589b..fcabf19 100644
--- a/core/sql/executor/ex_mj.cpp
+++ b/core/sql/executor/ex_mj.cpp
@@ -2072,9 +2072,7 @@ short ex_mj_unique_tcb::work()
} // switch pstate.step
} // 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_onlj.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ex_onlj.cpp b/core/sql/executor/ex_onlj.cpp
index 5c5f4b6..12ec582 100644
--- a/core/sql/executor/ex_onlj.cpp
+++ b/core/sql/executor/ex_onlj.cpp
@@ -96,7 +96,6 @@ ExOnljTcb::ExOnljTcb(const ExOnljTdb & nljTdb, //
// Allocate the buffer pool, if 'special' left join
if ((isLeftJoin()) && (nljTdb.ljExpr_)) {
-#pragma nowarn(1506) // warning elimination
pool_ = new(glob->getSpace()) sql_buffer_pool(nljTdb.numBuffers_,
nljTdb.bufferSize_,
glob->getSpace());
@@ -115,7 +114,6 @@ ExOnljTcb::ExOnljTcb(const ExOnljTdb & nljTdb, //
}
}
-#pragma warn(1506) // warning elimination
// Copy predicate pointers
beforePred_ = nljTdb.preJoinPred_;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/executor/ex_queue.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ex_queue.cpp b/core/sql/executor/ex_queue.cpp
index 1ac4cb0..2d746da 100644
--- a/core/sql/executor/ex_queue.cpp
+++ b/core/sql/executor/ex_queue.cpp
@@ -290,9 +290,7 @@ NABoolean ex_queue::allocateAtps(CollHeap * space,
// at a time We are sent back the size of the atp struct since
// it also allocates space for number of tuples per criDesc.
numNewAtps = size_;
-#pragma nowarn(1506) // warning elimination
atps = allocateAtpArray( criDesc_, numNewAtps, &atpSize, space, failureIsFatal);
-#pragma warn(1506) // warning elimination
}
// check whether the caller provided the ATPs or whether we were
@@ -354,16 +352,12 @@ NABoolean ex_queue::allocatePstate(ex_tcb * tcb,
{
queue_index i;
ex_tcb_private_state *actualPstates = pstates;
-#pragma nowarn(1506) // warning elimination
Lng32 actualNumPstates = numNewPstates;
-#pragma warn(1506) // warning elimination
Lng32 actualPstateLength = pstateLength;
if (actualPstates == NULL)
{
-#pragma nowarn(1506) // warning elimination
actualNumPstates = size_;
-#pragma warn(1506) // warning elimination
// NOTE: actualNumPstates may be changed (reduced) by this call
actualPstates = tcb->allocatePstates(actualNumPstates,
actualPstateLength);
@@ -485,9 +479,7 @@ queue_index ex_queue::resize(ex_tcb * tcb,
// allocate array of ATPs if needed
if (needAtps)
{
-#pragma nowarn(1506) // warning elimination
atps = allocateAtpArray(criDesc_, sizeDelta, &atpSize, space, FALSE);
-#pragma warn(1506) // warning elimination
// for now, give up if it wasn't possible to allocate the ATPs in
// one piece (one could try to allocate them one by one)
@@ -500,9 +492,7 @@ queue_index ex_queue::resize(ex_tcb * tcb,
// allocate an array of pstate objects if needed
if (needsPstates_)
{
-#pragma nowarn(1506) // warning elimination
numAllocatedPstates = sizeDelta;
-#pragma warn(1506) // warning elimination
pstates = tcb->allocatePstates(numAllocatedPstates,pstateLength);
if (pstates == NULL)
{
@@ -801,9 +791,7 @@ void ex_queue::injectErrorOrCancel()
{
if ((rand() & (freq-1)) != 0)
return;
-#pragma nowarn(269) // warning elimination
NABoolean needsError = FALSE;
-#pragma warn(269) // warning elimination
switch (qe->upState.status)
{
case Q_OK_MMORE:
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/executor/ex_queue.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/ex_queue.h b/core/sql/executor/ex_queue.h
index 2b51c52..cd586da 100644
--- a/core/sql/executor/ex_queue.h
+++ b/core/sql/executor/ex_queue.h
@@ -285,9 +285,7 @@ public:
#ifndef _DEBUG
inline
#endif
- //#pragma nowarn(734)
void removeHead();
- //#pragma warn(734)
// soln 10-040111-2308 start
// removes the head entry. Same as removeHead except that it doesn't
@@ -312,17 +310,13 @@ inline
{ insertSubtask_ = insertSubtask; }
inline void setUnblockSubtask(ExSubtask *unblockSubtask)
{ unblockSubtask_ = unblockSubtask; }
-// warning elimination (removed "inline")
void setCancelSubtask(ExSubtask *cancelSubtask)
{ ExQueueAssert(upDown_ == DOWN_QUEUE,""); cancelSubtask_ = cancelSubtask; }
inline void setResizeSubtask(ExSubtask *resizeSubtask)
{ resizeSubtask_ = resizeSubtask; }
-//?johannes?
- // warning elimination (removed "inline")
void setNextSubtask(ExSubtask *nextSubtask)
{ ExQueueAssert(upDown_ == DOWN_QUEUE,""); nextSubtask_ = nextSubtask; }
-//?johannes??
static queue_index roundUp2Power(queue_index i);
@@ -711,7 +705,6 @@ inline Int32 ex_queue::isVacant(const queue_index i) const
return !((head_ <= i) || (i < tail_));
}
-//#pragma nowarn(734)
#ifndef _DEBUG
inline void ex_queue::removeHead()
{
@@ -741,7 +734,6 @@ inline void ex_queue::removeHead()
}
} // ex_queue::removeHead()
#endif
-//#pragma warn(734)
inline void ex_queue::cancelRequest(const queue_index i)
{
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/executor/ex_root.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ex_root.cpp b/core/sql/executor/ex_root.cpp
index 1f8b2b4..e8b264f 100644
--- a/core/sql/executor/ex_root.cpp
+++ b/core/sql/executor/ex_root.cpp
@@ -77,7 +77,6 @@ jmp_buf ExeBuf;
//
// Build a root tcb
//
-#pragma nowarn(262) // warning elimination
ex_tcb * ex_root_tdb::build(CliGlobals *cliGlobals, ex_globals * glob)
{
ExExeStmtGlobals * exe_glob = glob->castToExExeStmtGlobals();
@@ -337,7 +336,6 @@ ex_tcb * ex_root_tdb::build(CliGlobals *cliGlobals, ex_globals * glob)
} // ex_root_tdb::build
-#pragma warn(262) // warning elimination
///////////////////////////////////////////////////////////////////////////
@@ -624,9 +622,7 @@ void ex_root_tcb::inputPkeyRow(char * pkey_row)
{
char * dataPtr =
workAtp_->getTupp(root_tdb().criDesc_->noTuples()-1).getDataPointer();
-#pragma nowarn(1506) // warning elimination
str_cpy_all(dataPtr, pkey_row, root_tdb().pkeyLen_);
-#pragma warn(1506) // warning elimination
}
///////////////////////////////////////////////////////////////////////////
@@ -1112,7 +1108,6 @@ void ex_root_tcb::snapshotScanCleanup(ComDiagsArea* & diagsArea)
////////////////////////////////////////////////////////
// RETURNS: 0, success. 100, EOF. -1, error. 1, warning
////////////////////////////////////////////////////////
-#pragma nowarn(262) // warning elimination
Int32 ex_root_tcb::fetch(CliGlobals *cliGlobals,
ExExeStmtGlobals * glob,
Descriptor * output_desc,
@@ -1568,9 +1563,7 @@ Int32 ex_root_tcb::fetch(CliGlobals *cliGlobals,
da->negateCondition(da->returnIndex(-EXE_CS_EOD));
CollIndex index;
while ((index = da->returnIndex(-EXE_CS_EOD)) != NULL_COLL_INDEX ) {
-#pragma nowarn(1506) // warning elimination
da->deleteError(index);
-#pragma warn(1506) // warning elimination
}
if (da->getNumber(DgSqlCode::ERROR_) == 0) {
retcode = 0;
@@ -1915,12 +1908,10 @@ Int32 ex_root_tcb::fetch(CliGlobals *cliGlobals,
} // while
}
-#pragma warn(262) // warning elimination
////////////////////////////////////////////////////////
// RETURNS: 0, success. 100, EOF. -1, error. 1, warning
////////////////////////////////////////////////////////
-#pragma nowarn(262) // warning elimination
Int32 ex_root_tcb::fetchMultiple(CliGlobals *cliGlobals,
ExExeStmtGlobals * glob,
Descriptor * output_desc,
@@ -2008,7 +1999,6 @@ Int32 ex_root_tcb::fetchMultiple(CliGlobals *cliGlobals,
return retcode;
}
-#pragma warn(262) // warning elimination
//////////////////////////////////////////////////////
// OLT execute. Does execute/fetch in one shot. Used
@@ -2196,9 +2186,7 @@ Int32 ex_root_tcb::oltExecute(ExExeStmtGlobals * glob,
da->negateCondition(da->returnIndex(-EXE_CS_EOD));
CollIndex index ;
while ((index = da->returnIndex(-EXE_CS_EOD)) != NULL_COLL_INDEX ) {
-#pragma nowarn(1506) // warning elimination
da->deleteError(index); }
-#pragma warn(1506) // warning elimination
if (da->getNumber(DgSqlCode::ERROR_) == 0) {
if (setRetcode) {
retcode = 0;
@@ -2923,7 +2911,6 @@ void ex_root_tcb::deregisterCB()
if (isCbFinishedMessageSent())
return;
-#pragma warning (disable : 4291)
// The stream's actOnSend method will delete (or call decrRefCount())
// for this object.
@@ -2939,7 +2926,6 @@ void ex_root_tcb::deregisterCB()
QueryFinished *queryFinished =
new (context->getIpcHeap()) QueryFinished( rtsHandle,
context->getIpcHeap());
-#pragma warning (default : 4291)
//Create the stream on the IpcHeap, since we don't dispose of it immediately.
//We just add it to the list of completed messages in the IpcEnv, and it is disposed of later.
@@ -3050,12 +3036,10 @@ void QueryStartedMsgStream::actOnReceive(IpcConnection *connection)
{
CollHeap *ipcHeap = connection->getEnvironment()->getHeap();
- #pragma warning (disable : 4291)
QueryStartedReply *reply = new (ipcHeap)
QueryStartedReply(INVALID_RTS_HANDLE, ipcHeap);
- #pragma warning (default : 4291)
*this >> *reply;
@@ -3136,12 +3120,10 @@ void QueryFinishedMsgStream::actOnReceive(IpcConnection *connection)
CollHeap *ipcHeap = connection->getEnvironment()->getHeap();
- #pragma warning (disable : 4291)
RmsGenericReply *reply = new (ipcHeap)
RmsGenericReply(ipcHeap);
- #pragma warning (default : 4291)
*this >> *reply;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/executor/ex_root.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/ex_root.h b/core/sql/executor/ex_root.h
index 9797c9e..61e04fd 100644
--- a/core/sql/executor/ex_root.h
+++ b/core/sql/executor/ex_root.h
@@ -77,7 +77,6 @@ class ExMasterStats;
// -----------------------------------------------------------------------
// ex_root_tdb
// -----------------------------------------------------------------------
-#pragma nowarn(1319) // warning elimination
class ex_root_tdb : public ComTdbRoot
{
public:
@@ -126,15 +125,10 @@ private:
// the classes to the comexe project.
// ---------------------------------------------------------------------
};
-#pragma warn(1319) // warning elimination
-
-
-
/////////////////////////////////////
// Task control block
/////////////////////////////////////
-#pragma nowarn(1319) // warning elimination
class ex_root_tcb : public ex_tcb
{
@@ -211,7 +205,6 @@ public:
return (ex_root_tdb &) tdb;
};
-// warning elimination (removed "inline")
ex_queue_pair getParentQueue() const
{
ex_queue_pair temp;
@@ -367,7 +360,6 @@ private:
// or triggered by fragDirEventHandler_
ExWorkProcRetcode workOnFragDir();
// static version
-// warning elimination (removed "inline")
static ExWorkProcRetcode sWorkOnFragDir(ex_tcb *tcb)
{ return ((ex_root_tcb *) tcb)->workOnFragDir(); }
@@ -390,7 +382,6 @@ private:
void populateCancelDiags( ComDiagsArea &diags);
};
-#pragma warn(1319) // warning elimination
inline const ex_tcb* ex_root_tcb::getChild(Int32 pos) const
{
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/executor/ex_sort.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ex_sort.cpp b/core/sql/executor/ex_sort.cpp
index 5280d0f..7ea6650 100644
--- a/core/sql/executor/ex_sort.cpp
+++ b/core/sql/executor/ex_sort.cpp
@@ -625,7 +625,6 @@ void ExSortTcb::createSortDiags()
////////////////////////////////////////////////////////////////////////
// processSortError()
//
-#pragma nowarn(262) // warning elimination
NABoolean ExSortTcb::processSortError(ex_queue_entry *pentry_down,
queue_index parentIndex,
queue_index downIndex)
@@ -653,7 +652,6 @@ NABoolean ExSortTcb::processSortError(ex_queue_entry *pentry_down,
return TRUE;
}
-#pragma warn(262) // warning elimination
short ExSortTcb::workStatus(short workRC)
{
@@ -1891,15 +1889,11 @@ ExSortPrivateState::~ExSortPrivateState()
};
void ReleaseTupp(void * td)
{
-#pragma nowarn(1506) // warning elimination
((tupp_descriptor *)td)->setReferenceCount(((tupp_descriptor *)td)->getReferenceCount() - 1);
-#pragma warn(1506) // warning elimination
}
void CaptureTupp(void * td)
{
-#pragma nowarn(1506) // warning elimination
((tupp_descriptor *)td)->setReferenceCount(((tupp_descriptor *)td)->getReferenceCount() + 1);
-#pragma warn(1506) // warning elimination
}
////////////////////////////////////////////////////////////////////////////
// ExSortFromTopTcb: input is from parent, output is to child
[03/12] incubator-trafodion git commit: TRAFODION-2731 CodeCleanup:
Phase 4. Remove legacy/obsolete pragmas
Posted by an...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/RelExpr.h
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/RelExpr.h b/core/sql/optimizer/RelExpr.h
index e8ffb5d..90be900 100644
--- a/core/sql/optimizer/RelExpr.h
+++ b/core/sql/optimizer/RelExpr.h
@@ -353,14 +353,12 @@ public:
// ---------------------------------------------------------------------
// operator [] is used to access the children of a tree
-// warning elimination (removed "inline")
virtual ExprGroupId & operator[] (Lng32 index)
{
CMPASSERT(index >= 0 AND index < MAX_REL_ARITY);
return child_[index];
}
-// warning elimination (removed "inline")
virtual const ExprGroupId & operator[] (Lng32 index) const
{
CMPASSERT(index >= 0 AND index < MAX_REL_ARITY);
@@ -1175,7 +1173,6 @@ public:
const PartitioningFunction* partFunc,
NABoolean rewriteForChild0) ;
-// warning elimination (removed "inline")
virtual void addPartKeyPredsToSelectionPreds(
const ValueIdSet& partKeyPreds,
const ValueIdSet& pivs)
@@ -1681,7 +1678,6 @@ class CutOp : public RelExpr
public:
-// warning elimination (removed "inline")
CutOp (Int32 index,
CollHeap *oHeap = CmpCommon::statementHeap()) :
RelExpr(REL_CUT_OP, NULL, NULL, oHeap)
@@ -1753,7 +1749,6 @@ class WildCardOp: public RelExpr
public:
-// warning elimination (remove "inline")
WildCardOp(OperatorType otype,
Int32 designator = 0,
RelExpr *child0 = NULL,
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/RelGrby.h
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/RelGrby.h b/core/sql/optimizer/RelGrby.h
index f6089b9..28d0fbc 100644
--- a/core/sql/optimizer/RelGrby.h
+++ b/core/sql/optimizer/RelGrby.h
@@ -93,7 +93,6 @@ class GroupByAgg : public RelExpr
public:
// constructor
-// warning elimination (removed "inline")
GroupByAgg(RelExpr *child,
OperatorTypeEnum otype = REL_GROUPBY,
ItemExpr *groupExpr = NULL,
@@ -660,7 +659,6 @@ class SortGroupBy : public GroupByAgg
public:
// constructor
-// warning elimination (removed "inline")
SortGroupBy(RelExpr *child,
OperatorTypeEnum otype = REL_ORDERED_GROUPBY,
ItemExpr *groupExpr = NULL,
@@ -702,7 +700,6 @@ class ShortCutGroupBy : public GroupByAgg
public:
// constructor
-// warning elimination (removed "inline")
ShortCutGroupBy(RelExpr *child,
OperatorTypeEnum otype = REL_SHORTCUT_GROUPBY,
ItemExpr *groupExpr = NULL,
@@ -756,7 +753,6 @@ class PhysShortCutGroupBy : public ShortCutGroupBy
public:
// constructor
-// warning elimination (removed "inline")
PhysShortCutGroupBy(RelExpr *child,
OperatorTypeEnum otype = REL_SHORTCUT_GROUPBY,
ItemExpr *groupExpr = NULL,
@@ -789,7 +785,6 @@ class HashGroupBy : public GroupByAgg
public:
// constructor
-// warning elimination (removed "inline")
HashGroupBy(RelExpr *child,
OperatorTypeEnum otype = REL_HASHED_GROUPBY,
ItemExpr *groupExpr = NULL,
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/RelJoin.h
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/RelJoin.h b/core/sql/optimizer/RelJoin.h
index 5495960..3643210 100644
--- a/core/sql/optimizer/RelJoin.h
+++ b/core/sql/optimizer/RelJoin.h
@@ -110,7 +110,6 @@ class Join : public RelExpr
public:
// constructor
-// warning elimination (removed "inline")
Join(RelExpr *leftChild,
RelExpr *rightChild,
OperatorTypeEnum otype = REL_JOIN,
@@ -164,7 +163,6 @@ public:
Join (const Join &) ; // not written
// virtual destructor
-// warning elimination (removed "inline")
virtual ~Join() {}
// get the degree of this node (it is a binary op).
@@ -1203,7 +1201,6 @@ class NestedJoin : public Join
public:
// constructor
-// warning elimination (removed "inline")
NestedJoin(RelExpr *leftChild,
RelExpr *rightChild,
OperatorTypeEnum otype = REL_NESTED_JOIN,
@@ -1218,7 +1215,6 @@ public:
NestedJoin (const NestedJoin &) ; // not written
// virtual destructor
-// warning elimination (removed "inline")
virtual ~NestedJoin() {}
// get a printable string that identifies the operator
@@ -1359,7 +1355,6 @@ class NestedJoinFlow : public NestedJoin
public:
// constructor
-// warning elimination (removed "inline")
NestedJoinFlow(RelExpr *leftChild,
RelExpr *rightChild,
TableDesc *updTableDesc,
@@ -1402,7 +1397,6 @@ class MergeJoin : public Join
public:
// constructor
-// warning elimination (removed "inline")
MergeJoin(RelExpr *leftChild,
RelExpr *rightChild,
OperatorTypeEnum otype = REL_MERGE_JOIN,
@@ -1415,7 +1409,6 @@ public:
MergeJoin (const MergeJoin &) ; // not written
// virtual destructor
-// warning elimination (removed "inline")
virtual ~MergeJoin() { }
virtual NABoolean isLogical () const;
@@ -1558,7 +1551,6 @@ class HashJoin : public Join
public:
// constructor
-// warning elimination (removed "inline")
HashJoin(RelExpr *leftChild,
RelExpr *rightChild,
OperatorTypeEnum otype = REL_HASH_JOIN,
@@ -1572,7 +1564,6 @@ public:
innerAccessOnePartition_(FALSE)
{}
-// warning elimination (removed "inline")
HashJoin(RelExpr *leftChild,
RelExpr *rightChild,
CollHeap *oHeap = CmpCommon::statementHeap())
@@ -1586,7 +1577,6 @@ public:
// virtual destructor
-// warning elimination (removed "inline")
virtual ~HashJoin() { }
// Special method added to check for ordered cross product called by
@@ -1870,8 +1860,5 @@ private:
}; // class HashJoin
-#pragma warn(1319) // warning elimination
-#pragma warn(1506) // warning elimination
-
#endif /* RELJOIN_H */
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/RelMisc.h
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/RelMisc.h b/core/sql/optimizer/RelMisc.h
index fef9038..99513c6 100644
--- a/core/sql/optimizer/RelMisc.h
+++ b/core/sql/optimizer/RelMisc.h
@@ -1928,7 +1928,6 @@ public:
// The constructor
//
-// warning elimination (removed "inline")
PhysTranspose(RelExpr *child = NULL,
CollHeap *oHeap = CmpCommon::statementHeap())
: Transpose(NULL,NULL,child,oHeap) {};
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/RelPackedRows.h
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/RelPackedRows.h b/core/sql/optimizer/RelPackedRows.h
index c5d7de5..c65f15e 100644
--- a/core/sql/optimizer/RelPackedRows.h
+++ b/core/sql/optimizer/RelPackedRows.h
@@ -390,7 +390,6 @@ public:
// The constructor
//
- // warning elimination (removed "inline")
PhysUnPackRows(RelExpr *child = NULL,
CollHeap *oHeap = CmpCommon::statementHeap())
: UnPackRows(0, NULL,NULL,NULL,child, NULL_VALUE_ID, oHeap)
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/RelSample.h
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/RelSample.h b/core/sql/optimizer/RelSample.h
index 2a595d4..127d545 100644
--- a/core/sql/optimizer/RelSample.h
+++ b/core/sql/optimizer/RelSample.h
@@ -71,7 +71,6 @@ public:
virtual ~RelSample ();
// RelSample operator has only one child
-// warning elimination (removed "inline")
virtual Int32 getArity () const { return 1; };
virtual const NAString getText() const {return "Sample";};
@@ -206,7 +205,6 @@ public:
// The constructor
//
-// warning elimination (removed "inline")
PhysSample(RelExpr *child = NULL,
RelSample::SampleTypeEnum type = ANY,
CollHeap *oHeap = CmpCommon::statementHeap())
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/RelScan.h
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/RelScan.h b/core/sql/optimizer/RelScan.h
index 14068e0..1a46119 100644
--- a/core/sql/optimizer/RelScan.h
+++ b/core/sql/optimizer/RelScan.h
@@ -1607,7 +1607,6 @@ public:
// The Describe class represents scan on a 'virtual' table that contains
// the output of the DESCRIBE(SHOWDDL) command.
// -----------------------------------------------------------------------
-#pragma nowarn(1506) // warning elimination
class Describe : public Scan
{
public:
@@ -2044,6 +2043,5 @@ private:
// copy ctor
Describe (const Describe & des) ; // not defined - DO NOT USE
}; // class Describe
-#pragma warn(1506) // warning elimination
#endif /* RELSCAN_H */
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/RelSequence.h
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/RelSequence.h b/core/sql/optimizer/RelSequence.h
index 8fc09b5..b5069d1 100644
--- a/core/sql/optimizer/RelSequence.h
+++ b/core/sql/optimizer/RelSequence.h
@@ -70,7 +70,6 @@ public:
// The constructor
//
-// warning elimination (removed "inline")
RelSequence(RelExpr *child = NULL,
ItemExpr *requiredOrder = NULL,
CollHeap *oHeap = CmpCommon::statementHeap());
@@ -380,16 +379,13 @@ private:
// that is both a logical and physical node. The PhysSequence node
// does not add any data members. It adds a few virtual methods.
// -----------------------------------------------------------------------
-#pragma nowarn(1506) // warning elimination
class PhysSequence : public RelSequence
{
public:
// The constructor
//
-#pragma nowarn(734) // warning elimination
PhysSequence(RelExpr *child = NULL,
-#pragma warn(734) // warning elimination
CollHeap *oHeap = CmpCommon::statementHeap())
: RelSequence(child, NULL, oHeap)
{
@@ -572,6 +568,5 @@ private:
Lng32 estHistoryRowLength_;
}; // class PhysSequence
-#pragma warn(1506) // warning elimination
#endif
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/RelSet.h
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/RelSet.h b/core/sql/optimizer/RelSet.h
index 434b91a..3425379 100644
--- a/core/sql/optimizer/RelSet.h
+++ b/core/sql/optimizer/RelSet.h
@@ -199,7 +199,6 @@ public:
inline ValueIdMap & getLeftMap() const { return unionMap_->leftColMap_; }
inline ValueIdMap & getRightMap() { return unionMap_->rightColMap_; }
inline ValueIdMap & getRightMap() const { return unionMap_->rightColMap_; }
-// warning elimination (removed "inline")
ValueIdMap & getMap(Lng32 i)
{
CMPASSERT(i == 0 OR i == 1);
@@ -531,7 +530,6 @@ class MergeUnion : public Union
public:
// constructor
-// warning elimination (removed "inline")
MergeUnion(RelExpr *leftChild,
RelExpr *rightChild,
UnionMap *unionMap = NULL,
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/RelStoredProc.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/RelStoredProc.cpp b/core/sql/optimizer/RelStoredProc.cpp
index 79e23c8..84758e1 100644
--- a/core/sql/optimizer/RelStoredProc.cpp
+++ b/core/sql/optimizer/RelStoredProc.cpp
@@ -221,9 +221,7 @@ RelExpr* RelInternalSP::bindNode(BindWA *bindWA)
convertToValueIdList(getProcAllParamsVids(),bindWA,ITM_ITEM_LIST);
if (bindWA->errStatus()) return NULL;
-#pragma nowarn(1506) // warning elimination
Lng32 nParams = getProcAllParamsVids().entries();
-#pragma warn(1506) // warning elimination
CmpSPInputFormat inputFormat(bindWA->currentCmpContext());
if ( !cmpInternalSP->InputFormat(nParams, inputFormat) )
// error, the info should be put into currentCmpContext()->diags()
@@ -331,12 +329,8 @@ RelExpr* RelInternalSP::bindNode(BindWA *bindWA)
c = getProcAllParamsVids()[0].getItemExpr()->castToConstValue(b);
if (c)
{
-#pragma nowarn(1506) // warning elimination
inputSize = c->getRawText()->length();
-#pragma warn(1506) // warning elimination
-#pragma nowarn(1506) // warning elimination
newInputSize = inputSize + defaultSchema.length() + 2;
-#pragma warn(1506) // warning elimination
};
if (newInputSize)
{
@@ -346,9 +340,7 @@ RelExpr* RelInternalSP::bindNode(BindWA *bindWA)
str_cpy (newInput, c->getRawText()->data(), inputSize);
newInput[inputSize] = '$';
-#pragma nowarn(1506) // warning elimination
str_cpy (&newInput[inputSize+1], defaultSchema.data(), defaultSchema.length());
-#pragma warn(1506) // warning elimination
NAType *newType = new (bindWA->wHeap()) SQLChar (bindWA->wHeap(), newInputSize, FALSE);
ItemExpr *newItem = new (bindWA->wHeap()) ConstValue(newType, newInput, newInputSize );
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/ReqGen.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/ReqGen.cpp b/core/sql/optimizer/ReqGen.cpp
index 40fc31c..2d392fc 100644
--- a/core/sql/optimizer/ReqGen.cpp
+++ b/core/sql/optimizer/ReqGen.cpp
@@ -1226,15 +1226,9 @@ void RequirementGenerator::producePartitioningRequirements()
if ((addedNumberOfPartitions_ != ANY_NUMBER_OF_PARTITIONS) AND
((addedPartitioningRequirement_->getCountOfPartitions() >
addedNumberOfPartitions_) OR
-#pragma nowarn(1506) // warning elimination
(addedPartitioningRequirement_->getCountOfPartitions() <
-#pragma warn(1506) // warning elimination
-#pragma nowarn(1506) // warning elimination
(addedNumberOfPartitions_ -
-#pragma warn(1506) // warning elimination
-#pragma nowarn(1506) // warning elimination
(addedNumberOfPartitions_ * addedNumOfPartsAllowedDeviation_)))
-#pragma warn(1506) // warning elimination
)
)
{
@@ -1276,12 +1270,8 @@ void RequirementGenerator::producePartitioningRequirements()
// if there was a required number of partitions, then 1 partition
// must satisfy this requirement
if ((addedNumberOfPartitions_ != ANY_NUMBER_OF_PARTITIONS) AND
-#pragma nowarn(1506) // warning elimination
((addedNumberOfPartitions_ -
-#pragma warn(1506) // warning elimination
-#pragma nowarn(1506) // warning elimination
(addedNumberOfPartitions_ * addedNumOfPartsAllowedDeviation_)) >
-#pragma warn(1506) // warning elimination
EXACTLY_ONE_PARTITION))
stillFeasible_ = FALSE;
else
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/RoutineDesc.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/RoutineDesc.cpp b/core/sql/optimizer/RoutineDesc.cpp
index d71fa08..6a1b178 100644
--- a/core/sql/optimizer/RoutineDesc.cpp
+++ b/core/sql/optimizer/RoutineDesc.cpp
@@ -171,8 +171,6 @@ RoutineDesc::RoutineDesc(const RoutineDesc &rdesc, CollHeap *h)
// -----------------------------------------------------------------------
// ! Print function for RoutineDesc
// -----------------------------------------------------------------------
-#pragma nowarn(1506) // warning elimination
-#pragma nowarn(770) // warning elimination
void RoutineDesc::print(FILE* ofd, const char* indent, const char* title)
{
#ifndef NDEBUG
@@ -273,11 +271,9 @@ NABoolean RoutineDesc::createRoutineParam(BindWA *bindWA, CollIndex i,
const NAColumnArray & params = routine->getParams();
ColStatDescList &colStsDescList = getEffOutParamColStatDescList();
-#pragma nowarn(1506) // warning elimination
RoutineParam *routineParam = new (bindWA->wHeap()) RoutineParam(params[i],
i,
this);
-#pragma warn(1506) // warning elimination
if ( routineParam == NULL ) return FALSE;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/Rule.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/Rule.cpp b/core/sql/optimizer/Rule.cpp
index 9e1e066..d418fd3 100644
--- a/core/sql/optimizer/Rule.cpp
+++ b/core/sql/optimizer/Rule.cpp
@@ -398,9 +398,7 @@ RuleSet::~RuleSet()
void RuleSet::insert(Rule * r)
{
-#pragma nowarn(1506) // warning elimination
Lng32 num = r->ruleNumber_ = allRules_.entries();
-#pragma warn(1506) // warning elimination
allRules_.insertAt(num,r);
if (num >= MAX_RULE_COUNT)
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/Rule.h
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/Rule.h b/core/sql/optimizer/Rule.h
index 8337a6a..eb0ee55 100644
--- a/core/sql/optimizer/Rule.h
+++ b/core/sql/optimizer/Rule.h
@@ -294,7 +294,6 @@ public:
// copy ctor
RuleSubset (const RuleSubset & orig, CollHeap * h=0) ; // not written
- // warning elimination (removed "inline")
virtual ~RuleSubset() {}
inline RuleSubset & operator = (const RuleSubset &other)
@@ -304,7 +303,6 @@ public:
// -----------------------------------------------------------------------
// The set of rules used in Cascades
// -----------------------------------------------------------------------
-#pragma nowarn(1506) // warning elimination
class RuleSet : public NABasicObject
{
friend class RuleSubset;
@@ -366,7 +364,6 @@ public:
// return a (sub) set of currently applicable rules
// (see also Guidance::applicableRules())
-// warning elimination (remove "inline")
const RuleSubset * applicableRules()
{
CMPASSERT( (currentPass_ >= getFirstPassNumber()) AND
@@ -376,7 +373,6 @@ public:
// used to recognize first pass rules for the use
// in optimization Level 1
-// warning elimination (removed "inline")
const RuleSubset * getPassNRules(Lng32 passNum)
{
CMPASSERT( (passNum >= getFirstPassNumber()) AND
@@ -450,7 +446,6 @@ private:
RuleSubset passSensitiveRules_; // all rules that look at the pass #
RuleSubset patternSensitiveRules_; // rules using the expl. pattern
};
-#pragma warn(1506) // warning elimination
// -----------------------------------------------------------------------
// Rule substitute memory
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/ScanOptimizer.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/ScanOptimizer.cpp b/core/sql/optimizer/ScanOptimizer.cpp
index 23caa79..23f7e61 100644
--- a/core/sql/optimizer/ScanOptimizer.cpp
+++ b/core/sql/optimizer/ScanOptimizer.cpp
@@ -3579,9 +3579,7 @@ ScanOptimizer::computeCostObject(
MINOF((Lng32)activePartitions.getValue(),countOfPAs);
Lng32 numOfDP2Volumes =
-#pragma nowarn(1506) // warning elimination
MIN_ONE( ((NodeMap *)(lppf->getNodeMap()))->getNumActiveDP2Volumes() );
-#pragma warn(1506) // warning elimination
// Limit the number of PAs by the number of DP2 volumes.
// This won't need to be done here when we start doing it when
// we synthesize the physical properties. It is not being done
@@ -5666,7 +5664,6 @@ FileScanOptimizer::computeCostForMultipleSubset
// and sparceCoilum information for this mdamKey later
// -----------------------------------------------------------------------
-#pragma nowarn(262) // warning elimination
Cost*
FileScanOptimizer::oldComputeCostForMultipleSubset
( MdamKey* mdamKeyPtr,
@@ -6112,9 +6109,7 @@ FileScanOptimizer::oldComputeCostForMultipleSubset
NABoolean foundLastColumn = FALSE;
CollIndex lastColumnPosition = keyPredsByCol.entries() - CollIndex(1);
for (;
-#pragma nowarn(270) // warning elimination
lastColumnPosition >= 0;
-#pragma warn(270) // warning elimination
lastColumnPosition--)
{
@@ -7193,7 +7188,6 @@ FileScanOptimizer::oldComputeCostForMultipleSubset
return costPtr;
} // oldComputeCostForMultipleSubset(...)
-#pragma warn(262) // warning elimination
// -----------------------------------------------------------------------
// This function will check if current context has the same basic physical
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/ScmCostMethod.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/ScmCostMethod.cpp b/core/sql/optimizer/ScmCostMethod.cpp
index d8ee81e..cc38001 100644
--- a/core/sql/optimizer/ScmCostMethod.cpp
+++ b/core/sql/optimizer/ScmCostMethod.cpp
@@ -3688,7 +3688,6 @@ NABoolean CostMethodHbaseUpdateOrDelete::allKeyColumnsHaveHistogramStatistics(
// result of applying key predicates. Assumes that histograms exist for
// all key columns.
// -----------------------------------------------------------------------
-#pragma nowarn(262) // warning elimination
CostScalar
CostMethodHbaseUpdateOrDelete::numRowsToScanWhenAllKeyColumnsHaveHistograms(
IndexDescHistograms & histograms,
@@ -3769,7 +3768,6 @@ CostMethodHbaseUpdateOrDelete::numRowsToScanWhenAllKeyColumnsHaveHistograms(
return numRowsToScan;
} // CostMethodHbaseUpdateOrDelete::numRowsToScanWhenAllKeyColumnsHaveHistograms()
-#pragma warn(262) // warning elimination
// -----------------------------------------------------------------------
// CostMethodHbaseUpdateOrDelete::computeIOCostsForCursorOperation().
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/SearchKey.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/SearchKey.cpp b/core/sql/optimizer/SearchKey.cpp
index 31477b7..a5e40df 100644
--- a/core/sql/optimizer/SearchKey.cpp
+++ b/core/sql/optimizer/SearchKey.cpp
@@ -323,12 +323,8 @@ SearchKey::SearchKey(const ValueIdList & keyColumns,
*(new (CmpCommon::statementHeap()) MaterialDisjuncts(
setOfPredicates)),
nonKeyColumnSet, indexDesc, UDindexDesc),
-#pragma nowarn(1506) // warning elimination
beginKeyValues_(keyColumns.entries()),
-#pragma warn(1506) // warning elimination
-#pragma nowarn(1506) // warning elimination
endKeyValues_(keyColumns.entries()),
-#pragma warn(1506) // warning elimination
valuesArePartitionRange_(FALSE),
_countTimesBoundaryValReq(0)
{
@@ -357,12 +353,8 @@ SearchKey::SearchKey(const ValueIdList & keyColumns,
indexDesc,
UDindexDesc
),
-#pragma nowarn(1506) // warning elimination
beginKeyValues_(keyColumns.entries()),
-#pragma warn(1506) // warning elimination
-#pragma nowarn(1506) // warning elimination
endKeyValues_(keyColumns.entries()),
-#pragma warn(1506) // warning elimination
valuesArePartitionRange_(FALSE),
_countTimesBoundaryValReq(0)
{
@@ -804,9 +796,7 @@ ValueId SearchKey::computeMissingKeyValue(ValueId keyColumn,
// -----------------------------------------------------------------------
void SearchKey::print(FILE* ofd, const char* indent, const char* title) const
{
-#pragma nowarn(1506) // warning elimination
BUMP_INDENT(indent);
-#pragma warn(1506) // warning elimination
fprintf(ofd,"%s %s \n%s",NEW_INDENT,title,NEW_INDENT);
getKeyColumns().print(ofd,indent,"Key Columns:");
getBeginKeyValues().print(ofd,indent,"Begin Key Values:");
@@ -856,7 +846,6 @@ NABoolean SearchKeyBounds::operator == (const SearchKeyBounds & other) const
// data from the access path.
//
// -----------------------------------------------------------------------
-#pragma nowarn(770) // warning elimination
void SearchKeyBounds::analyzeSearchPredicates(const ValueIdSet & setOfPredicates,
const ValueIdSet & externalInputs)
{
@@ -936,7 +925,6 @@ void SearchKeyBounds::analyzeSearchPredicates(const ValueIdSet & setOfPredicates
} // loop over predicates
} // SearchKeyBounds::analyzeSearchPredicate()
-#pragma warn(770) // warning elimination
// -----------------------------------------------------------------------
@@ -1403,9 +1391,7 @@ ValueId SearchKeyBounds::computeMissingKeyValue(NABoolean wantMinValue)
// -----------------------------------------------------------------------
void SearchKeyBounds::print(FILE* ofd, const char* indent, const char* title) const
{
-#pragma nowarn(1506) // warning elimination
BUMP_INDENT(indent);
-#pragma warn(1506) // warning elimination
fprintf(ofd,"%s %s\n%s",NEW_INDENT,title,NEW_INDENT);
if (isAscendingOrder())
fprintf(ofd,"ascending , ");
@@ -1468,9 +1454,7 @@ SearchKeyWorkSpace::SearchKeyWorkSpace(const ValueIdList & keyColumns,
const ValueIdList & indexOrder,
const NABoolean forwardSearch,
const SearchKey& searchKey)
-#pragma nowarn(1506) // warning elimination
: keyCount_(keyColumns.entries()),
-#pragma warn(1506) // warning elimination
keyBounds_(CmpCommon::statementHeap()),
searchKey_(searchKey)
{
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/Stats.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/Stats.cpp b/core/sql/optimizer/Stats.cpp
index f607a3a..231250b 100644
--- a/core/sql/optimizer/Stats.cpp
+++ b/core/sql/optimizer/Stats.cpp
@@ -710,7 +710,6 @@ void ColStats::setSumOfMaxUec (CostScalar value)
// because they can legitimately become very close to zero but not equal
// to zero (e.g., join between 2 1-billion row tables returns 1 row ==>
// redfactor == 1e-18)
-// warning elimination (remove "inline")
void ColStats::setRedFactor (CostScalar rowred)
{
if (rowred < 0)
@@ -1081,7 +1080,6 @@ Histogram::isNullInstantiated() const
}
// removing that NULL interval (assuming it exists)
-// warning elimination (removed "inline")
void
Histogram::removeNullInterval()
{
@@ -1097,7 +1095,6 @@ Histogram::removeNullInterval()
}
// inserting a NULL interval (assuming it doesn't already exist)
-// warning elimination (removed "inline")
void
Histogram::insertNullInterval()
{
@@ -4594,9 +4591,7 @@ Criterion ColStats::decideReductionCriterion(Source invokedFrom,
}
}
-#pragma nowarn(203) // warning elimination
return NONE;
-#pragma warn(203) // warning elimination
};
//reduce the number of histogram intervals in the histogram
@@ -7634,9 +7629,7 @@ void StatsList::reduceNumHistIntsAfterFetch(NATable& table)
void StatsList::deepDelete()
{
-#pragma nowarn(1506) // warning elimination
unsigned short members = (UInt32)this->entries();
-#pragma warn(1506) // warning elimination
for( unsigned short i=0;i<members;i++)
{
(*this)[i]->deepDelete();
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/Stats.h
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/Stats.h b/core/sql/optimizer/Stats.h
index aa424b3..da7ff8d 100644
--- a/core/sql/optimizer/Stats.h
+++ b/core/sql/optimizer/Stats.h
@@ -661,9 +661,7 @@ private:
// NB: the values for these should always be >= 0 !
// --> and if the value is extremely low (e.g., 1e-16), round it to zero
-// warning elimination (removed "inline")
void setCardinality (CostScalar card);
-// warning elimination (removed "inline")
void setUec (CostScalar uec);
EncodedValue boundary_; // histint boundary (upper bound)
@@ -749,7 +747,6 @@ public:
// returns the # of intervals in the Histogram
// this number will be somewhere in between 0 and entries()
-// warning elimination (removed "inline")
CollIndex numIntervals() const
{
DCMPASSERT( entries() != 1 ) ; // generic Histogram sanity check
@@ -862,9 +859,7 @@ public:
inline Interval getFirstInterval() const ;
inline Interval getLastInterval() const ;
inline Interval getLastNonNullInterval () const ;
-// warning elimination (removed "inline")
Interval getNextInterval(const Interval & current) const ;
-// warning elimination (removed "inline")
Interval getPrevInterval(const Interval & current) const ;
// returns the interval #'d by index
@@ -952,7 +947,6 @@ private:
// developer needs to call refreshHiInt()
// -----------------------------------------------------------------------
-#pragma nowarn(270) // warning elimination
class Interval : public NABasicObject
{
public:
@@ -1001,7 +995,6 @@ public:
inline NABoolean isLast() const ;
// gets/sets the uec & rowcount values
-// warning elimination (removed "inline")
CostScalar getUec() const
{
OK() ;
@@ -1009,7 +1002,6 @@ public:
return hiInt_.getUec() ;
}
-// warning elimination (removed "inline")
CostScalar getRowcount() const
{
OK() ;
@@ -1106,7 +1098,6 @@ public:
return hiInt_.getMCBoundary() ;
}
-// warning elimination (removed "inline")
const EncodedValue& hiBound() const
{
DCMPASSERT(hiInt_ == ((*hist_)[loIndex_+1]));
@@ -1118,7 +1109,6 @@ public:
// gets/sets the bounds incl values
inline NABoolean isLoBoundInclusive() const ;
-// warning elimination (removed "inline")
NABoolean isHiBoundInclusive() const
{
DCMPASSERT(hiInt_ == ((*hist_)[loIndex_+1]));
@@ -1231,8 +1221,6 @@ private:
HistogramSharedPtr hist_ ;
HistInt hiInt_; // the histogram we're interfacing with
} ;
-#pragma warn(270) // warning elimination
-
// get the next/prev Interval
@@ -1660,10 +1648,8 @@ public:
private:
// these two are private because we never want them used individually
// ==> use the ::setRowsAndUec() routine instead
-// warning elimination (removed "inline")
void setRowcount (CostScalar row);
-// warning elimination (removed "inline")
// We have added the allowMinusOne flag to allow uecs to be
// initialized to minusOne. This is only used for UDFs, and the minusOne
// is used to indicate that we do not have valid UEC information for a
@@ -1677,7 +1663,6 @@ public:
// See comment above as to the use of the allowMinusOne flag.
void setRowsAndUec (CostScalar rows, CostScalar uec, NABoolean allowMinusOne=FALSE) ;
-// warning elimination (removed "inline")
void setBaseRowCount (CostScalar row);
void setBaseUec(CostScalar uec);
@@ -1695,10 +1680,8 @@ public:
// because they can legitimately become very close to zero but not equal
// to zero (e.g., join between 2 1-billion row tables returns 1 row ==>
// redfactor == 1e-18)
-// warning elimination (remove "inline")
void setRedFactor (CostScalar rowred);
-// warning elimination (removed "inline")
void setUecRedFactor (CostScalar uecred);
// setting the flags
@@ -1737,25 +1720,19 @@ public:
// ---------------------------------------------------------------------
// is there a NULL interval in the Histogram?
-// warning elimination (removed "inline")
NABoolean isNullInstantiated () const ;
// removing that NULL interval, if it exists
-// warning elimination (removed "inline")
void removeNullInterval () ;
// inserting a NULL interval, if it doesn't already exist
-// warning elimination (removed "inline")
void insertNullInterval () ;
// reporting the number of NULLs / NULL-uecs in that interval
-// warning elimination (removed "inline")
CostScalar getNullCount () const ;
-// warning elimination (removed "inline")
CostScalar getNullUec () const ;
// setting the number of NULLs and NULL-uecs in that interval
- // warning elimination (removed "inline")
void setNullRowsAndUec (CostScalar nulls, CostScalar nullUec) ;
// ---------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/SynthType.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/SynthType.cpp b/core/sql/optimizer/SynthType.cpp
index 73096cc..ceab243 100644
--- a/core/sql/optimizer/SynthType.cpp
+++ b/core/sql/optimizer/SynthType.cpp
@@ -927,8 +927,6 @@ const NAType *ItemExpr::synthesizeType()
// does nothing. Currently is only redefined by ValueIdUnion
// to propagate the desired type to the sources of the ValueIdUnion.
//
-#pragma nowarn(1506) // warning elimination
-#pragma warning (disable : 4018) //warning elimination
const NAType *
ItemExpr::pushDownType(NAType& desiredType,
enum NABuiltInTypeEnum defaultQualifier)
@@ -965,8 +963,6 @@ void ItemExpr::coerceChildType(NAType& desiredType,
child(i) -> getValueId().coerceType(desiredType, defaultQualifier);
}
}
-#pragma warning (default : 4018) //warning elimination
-#pragma warn(1506) // warning elimination
// -----------------------------------------------------------------------
// member functions for class BuiltinFunction.
@@ -4366,7 +4362,6 @@ const NAType *CompDecode::synthesizeType()
// member functions for class Extract
// -----------------------------------------------------------------------
-#pragma nowarn(1506) // warning elimination
const NAType *Extract::synthesizeType()
{
// Assert that we are bound, or created by Generator, so we have type info.
@@ -4448,7 +4443,6 @@ const NAType *Extract::synthesizeType()
disAmbiguate,
dti.supportsSQLnull());
}
-#pragma warn(1506) // warning elimination
// -----------------------------------------------------------------------
// member functions for class Increment
@@ -5504,7 +5498,6 @@ const NAType *Translate::synthesizeType()
// member functions for class ValueIdUnion
// -----------------------------------------------------------------------
-#pragma nowarn(1506) // warning elimination
const NAType *ValueIdUnion::synthesizeType()
{
const NAType *result = NULL;
@@ -5591,7 +5584,6 @@ const NAType *ValueIdUnion::synthesizeType()
return result;
}
-#pragma warn(1506) // warning elimination
// ValueIdUnion::pushDownType() -----------------------------------
// Propagate type information down the ItemExpr tree. This method
@@ -5616,7 +5608,6 @@ const NAType *ValueIdUnion::synthesizeType()
// and re-synthesize the Type of the inner ValueIdUnion node.
//
//
-#pragma nowarn(1506) // warning elimination
const NAType *
ValueIdUnion::pushDownType(NAType& desiredType,
enum NABuiltInTypeEnum defaultQualifier)
@@ -5628,7 +5619,6 @@ ValueIdUnion::pushDownType(NAType& desiredType,
return (NAType *)synthesizeType();
}
-#pragma warn(1506) // warning elimination
const NAType *
@@ -5679,8 +5669,6 @@ const NAType *ValueIdProxy::synthesizeType()
// Propagate type information down the node we are Proxy for.
// Called by coerceType().
//
-#pragma nowarn(1506) // warning elimination
-#pragma warning (disable : 4018) //warning elimination
const NAType *
ValueIdProxy::pushDownType(NAType& desiredType,
enum NABuiltInTypeEnum defaultQualifier)
@@ -5983,8 +5971,6 @@ const NAType *RowSubquery::synthesizeType()
// the RowSubquery is of degree 1 and the returned value in the select
// list is of unknown or character type.
//
-#pragma nowarn(1506) // warning elimination
-#pragma warning (disable : 4018) //warning elimination
const NAType *
RowSubquery::pushDownType(NAType& desiredType,
enum NABuiltInTypeEnum defaultQualifier)
@@ -6478,7 +6464,6 @@ const NAType *ItmSeqRowsSince::synthesizeType()
// member functions for class ItmSeqMovingFunction
// -----------------------------------------------------------------------
-#pragma nowarn(262) // warning elimination
const NAType *ItmSeqMovingFunction::synthesizeType()
{
const NAType *result=NULL;
@@ -6551,7 +6536,6 @@ const NAType *ItmSeqMovingFunction::synthesizeType()
return result;
}
-#pragma warn(262) // warning elimination
// -----------------------------------------------------------------------
// member functions for class ItmSeqThisFunction
// -----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/TableDesc.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/TableDesc.cpp b/core/sql/optimizer/TableDesc.cpp
index 245b720..14db124 100644
--- a/core/sql/optimizer/TableDesc.cpp
+++ b/core/sql/optimizer/TableDesc.cpp
@@ -562,8 +562,6 @@ TableDesc::setBaseSelectivityHintForScan(SelectivityHint *selHint,
// -----------------------------------------------------------------------
// Print function for TableDesc
// -----------------------------------------------------------------------
-#pragma nowarn(1506) // warning elimination
-#pragma nowarn(770) // warning elimination
void TableDesc::print(FILE* ofd, const char* indent, const char* title)
{
#ifndef NDEBUG
@@ -581,8 +579,6 @@ void TableDesc::print(FILE* ofd, const char* indent, const char* title)
#endif
} // TableDesc::print()
-#pragma warn(1506) // warning elimination
-#pragma warn(770) // warning elimination
// -----------------------------------------------------------------------
// Print function for TableDescList
@@ -590,9 +586,7 @@ void TableDesc::print(FILE* ofd, const char* indent, const char* title)
void TableDescList::print(FILE* ofd, const char* indent, const char* title)
{
#ifndef NDEBUG
-#pragma nowarn(1506) // warning elimination
BUMP_INDENT(indent);
-#pragma warn(1506) // warning elimination
for (CollIndex i = 0; i < entries(); i++)
{
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/TransRule.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/TransRule.cpp b/core/sql/optimizer/TransRule.cpp
index 89881ed..481eadb 100644
--- a/core/sql/optimizer/TransRule.cpp
+++ b/core/sql/optimizer/TransRule.cpp
@@ -1631,9 +1631,7 @@ NABoolean IndexJoinRule2::topMatch (RelExpr * expr,
// for now, return FALSE for this rule (failures in TEST005)
return FALSE;
-#pragma nowarn(203) // warning elimination
if (NOT Rule::topMatch(expr, context))
-#pragma warn(203) // warning elimination
return FALSE;
Scan * s = (Scan *) expr;
@@ -1717,7 +1715,6 @@ struct IndexToDisjuncts
private:
// private constructor, object should be created by a friend only
-// warning elimination (removed "inline")
IndexToDisjuncts() : maxPoints_(0.0)
{}
};
@@ -1747,7 +1744,6 @@ NABoolean doesValueIdEvaluateToFalse( ValueId predId )
return FALSE;
}
-#pragma nowarn(262) // warning elimination
RelExpr * OrOptimizationRule::nextSubstitute(
RelExpr * before,
Context * /*context*/,
@@ -2017,9 +2013,7 @@ RelExpr * OrOptimizationRule::nextSubstitute(
DCMPASSERT(bc->getOperatorType() == ITM_BASECOLUMN);
if (colNum == (CollIndex) bc->getColNumber())
{
-#pragma nowarn(1506) // warning elimination
colNumInIndex = ixcolnum;
-#pragma warn(1506) // warning elimination
break;
}
}
@@ -2187,7 +2181,6 @@ RelExpr * OrOptimizationRule::nextSubstitute(
return result;
}
-#pragma warn(262) // warning elimination
CostScalar OrOptimizationRule::rateIndexForColumn(
Int32 colNumInIndex,
@@ -2394,9 +2387,7 @@ RelExpr * OrOptimizationRule::makeSubstituteScan(
ValueIdUnion(resultCharOutputs[i],
newValId,
NULL_VALUE_ID,
-#pragma nowarn(1506) // warning elimination
unionNode->getUnionFlags());
-#pragma warn(1506) // warning elimination
vidUnion->synthTypeAndValueId();
unionNode->addValueIdUnion(vidUnion->getValueId(),
CmpCommon::statementHeap());
@@ -4225,9 +4216,7 @@ NABoolean GroupByTernarySplitRule::topMatch(RelExpr * expr,
// Old Code End
-#pragma nowarn(203) // warning elimination
if (NOT Rule::topMatch(expr,context)) // MUST be a GroupByAgg
-#pragma warn(203) // warning elimination
return FALSE;
if (expr->getOperatorType() == REL_SHORTCUT_GROUPBY)
@@ -4769,9 +4758,7 @@ NABoolean GroupBySplitRule::topMatch(RelExpr * expr,
}
}
-#pragma nowarn(1506) // warning elimination
Lng32 dc = distinctColumns.entries();
-#pragma warn(1506) // warning elimination
if (dc > 0)
{
@@ -5601,7 +5588,6 @@ NABoolean PartialGroupByOnTSJRule::topMatch (RelExpr * expr,
// produced from either Cut#0 or Cut#1 above.
//
// -----------------------------------------------------------------------
-#pragma nowarn(770) // warning elimination
RelExpr * PartialGroupByOnTSJRule::nextSubstitute(RelExpr * before,
Context * /*context*/,
RuleSubstituteMemory * & /*memory*/)
@@ -5711,7 +5697,6 @@ RelExpr * PartialGroupByOnTSJRule::nextSubstitute(RelExpr * before,
return newJoin;
} // PartialGroupByOnTSJRule::nextSubstitute()
-#pragma warn(770) // warning elimination
// -----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/TransRule.h
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/TransRule.h b/core/sql/optimizer/TransRule.h
index a037d85..20d2dac 100644
--- a/core/sql/optimizer/TransRule.h
+++ b/core/sql/optimizer/TransRule.h
@@ -476,7 +476,6 @@ public:
// copy ctor
JoinCommutativityRule (const JoinCommutativityRule &) ; // not written
-// warning elimination (removed "inline")
virtual ~JoinCommutativityRule() {}
virtual NABoolean topMatch (RelExpr * expr,
@@ -499,7 +498,6 @@ public:
// copy ctor
JoinLeftShiftRule (const JoinLeftShiftRule &) ; // not written
-// warning elimination (removed "inline")
virtual ~JoinLeftShiftRule() {}
virtual NABoolean topMatch (RelExpr * expr,
@@ -528,7 +526,6 @@ public:
// copy ctor
IndexJoinRule1 (const IndexJoinRule1 &) ; // not written
-// warning elimination (removed "inline")
virtual ~IndexJoinRule1() {}
virtual NABoolean topMatch (RelExpr * expr,
Context * context);
@@ -555,7 +552,6 @@ public:
// copy ctor
IndexJoinRule2 (const IndexJoinRule2 &) ; // not written
-// warning elimination (removed "inline")
virtual ~IndexJoinRule2() {}
virtual NABoolean topMatch (RelExpr * expr,
Context * context);
@@ -575,7 +571,6 @@ public:
// copy ctor
OrOptimizationRule (const OrOptimizationRule &) ; // not written
-// warning elimination (removed "inline")
virtual ~OrOptimizationRule() {}
virtual NABoolean topMatch (RelExpr * expr,
Context * context);
@@ -610,7 +605,6 @@ public:
// copy ctor
TSJRule (const TSJRule &) ; // not written
-// warning elimination (removed "inline")
virtual ~TSJRule() {}
virtual NABoolean topMatch (RelExpr * expr,
@@ -657,7 +651,6 @@ public:
// copy ctor
JoinToTSJRule (const JoinToTSJRule &) ; // not written
-// warning elimination (removed "inline")
virtual ~JoinToTSJRule() {}
virtual NABoolean topMatch (RelExpr * expr,
@@ -683,7 +676,6 @@ public:
// copy ctor
TSJFlowRule (const TSJFlowRule &) ; // not written
-// warning elimination (removed "inline")
virtual ~TSJFlowRule() {}
virtual NABoolean topMatch (RelExpr * expr,
@@ -704,7 +696,6 @@ public:
RelExpr * substitute) :
Rule(name,pattern,substitute) {}
-// warning elimination (removed "inline")
virtual ~TSJUDRRule() {}
virtual NABoolean topMatch (RelExpr * expr,
@@ -736,7 +727,6 @@ public:
// copy ctor
FilterRule (const FilterRule &) ; // not written
- // warning elimination (removed "inline")
virtual ~FilterRule() {}
virtual Guidance * guidanceForExploringChild(Guidance * guidance,
Context * context,
@@ -973,7 +963,6 @@ public:
// copy ctor
SampleScanRule (const SampleScanRule &) ; // not written
-// warning elimination (removed "inline")
virtual ~SampleScanRule() {}
virtual NABoolean topMatch (RelExpr * expr,
Context * context);
@@ -991,12 +980,10 @@ public:
class JoinToBushyTreeRule : public Rule
{
public:
-// warning elimination (removed "inline")
JoinToBushyTreeRule(const char * name,
RelExpr * pattern,
RelExpr * substitute) :
Rule(name,pattern,substitute) {}
-// warning elimination (removed "inline")
virtual ~JoinToBushyTreeRule() {}
virtual NABoolean topMatch (RelExpr * expr,
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/TriggerDB.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/TriggerDB.cpp b/core/sql/optimizer/TriggerDB.cpp
index 9bf4ebb..a487841 100644
--- a/core/sql/optimizer/TriggerDB.cpp
+++ b/core/sql/optimizer/TriggerDB.cpp
@@ -180,9 +180,7 @@ TriggerDB::clearAndDestroy()
TableOp * key = NULL;
BeforeAndAfterTriggers* value = NULL;
// iterate over all entries and destroy them
-#pragma warning (disable : 4018) //warning elimination
for (Int32 i=0; i < iter.entries(); i++)
-#pragma warning (default : 4018) //warning elimination
{
iter.getNext(key, value);
CMPASSERT(key != NULL);
@@ -253,9 +251,7 @@ TriggerDB::cleanupPerStatement()
BeforeAndAfterTriggers* curr = NULL;
// iterate over all entries
-#pragma warning (disable : 4018) //warning elimination
for (Int32 i=0; i < iter.entries(); i++)
-#pragma warning (default : 4018) //warning elimination
{
iter.getNext(key, curr);
CMPASSERT(curr != NULL);
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/TriggerDB.h
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/TriggerDB.h b/core/sql/optimizer/TriggerDB.h
index 15e2e68..ccc314b 100644
--- a/core/sql/optimizer/TriggerDB.h
+++ b/core/sql/optimizer/TriggerDB.h
@@ -60,7 +60,6 @@ class TableOp : public NABasicObject
public:
// explicit ctor
-// warning elimination (removed "inline")
TableOp(QualifiedName &subjectTable, ComOperation operation)
: subjectTable_(subjectTable),
operation_(operation)
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/Triggers.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/Triggers.cpp b/core/sql/optimizer/Triggers.cpp
index 0b18d9d..4bed042 100644
--- a/core/sql/optimizer/Triggers.cpp
+++ b/core/sql/optimizer/Triggers.cpp
@@ -265,9 +265,7 @@ Trigger::parseTriggerText() const
// Parse the SQL text.
Parser parser(CmpCommon::context());
-#pragma nowarn(1506) // warning elimination
if (parser.parseDML(sqlText_->data(), sqlText_->length(), sqlTextCharSet_, &parsedNode))
-#pragma warn(1506) // warning elimination
return NULL;
// Extract the trigger body without the DDL nodes on top
@@ -381,8 +379,6 @@ Trigger::getParsedTrigger(BindWA *bindWA)
//
// Debugging aid.
//
-#pragma nowarn(770) // warning elimination
-#pragma nowarn(1506) // warning elimination
// used for debugging only
void
Trigger::print(ostream &os, const char* indent, const char* title) const
@@ -413,8 +409,6 @@ Trigger::print(ostream &os, const char* indent, const char* title) const
os << "TimeStamp: " << convertInt64ToDouble(timeStamp_) << endl;
os << "Recursion Counter: " << recursionCounter_ << endl;
}
-#pragma warn(1506) // warning elimination
-#pragma warn(770) // warning elimination
//------------------------------------------------------------------------------
@@ -518,8 +512,6 @@ TriggerList::sortByTimeStamp()
//
// Debugging aid.
//
-#pragma nowarn(1506) // warning elimination
-#pragma nowarn(770) // warning elimination
// used for debugging only
void
TriggerList::print(ostream & os, const char* indent, const char* title) const
@@ -532,8 +524,6 @@ TriggerList::print(ostream & os, const char* indent, const char* title) const
os << ". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ";
}
}
-#pragma warn(770) // warning elimination
-#pragma warn(1506) // warning elimination
//
// -- TriggerList::clearAndDestroy()
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/Triggers.h
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/Triggers.h b/core/sql/optimizer/Triggers.h
index 8e5ec11..b787c50 100644
--- a/core/sql/optimizer/Triggers.h
+++ b/core/sql/optimizer/Triggers.h
@@ -107,7 +107,6 @@ class Trigger : public NABasicObject
public:
// Explicit ctor
-// warning elimination (removed "inline")
Trigger(const QualifiedName &name,
const QualifiedName &subjectTable,
ComOperation operation,
@@ -178,7 +177,6 @@ public:
{ return (granularity_== COM_ROW); }
// MV
-// warning elimination (removed "inline")
virtual NABoolean isMVImmediate() const
{ return false; } // this is a regular trigger
@@ -311,7 +309,6 @@ public:
{};
virtual RelExpr *getParsedTrigger(BindWA *bindWA);
-// warning elimination (removed "inline")
virtual NABoolean isMVImmediate() const
{ return true; } // this is a special trigger (ON STATEMENT MV)
@@ -339,7 +336,6 @@ class UpdateColumns : public NABasicObject
{
public:
-// warning elimination (removed "inline")
UpdateColumns(NABoolean allColumns)
: allColumns_(allColumns)
{
@@ -450,7 +446,6 @@ public:
// Should never be called. Needed for compilation. We rely on
// NAHashBucket::contains() being called with a default NULL argument for
// Values in the triggerDB hash where BeforeAndAfterTriggers are Values.
- // warning elimination (removed "inline")
NABoolean operator == (const BeforeAndAfterTriggers &other) const
{ CMPASSERT(FALSE); return FALSE; }
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/VEGTable.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/VEGTable.cpp b/core/sql/optimizer/VEGTable.cpp
index 7b07531..57e71bb 100644
--- a/core/sql/optimizer/VEGTable.cpp
+++ b/core/sql/optimizer/VEGTable.cpp
@@ -146,9 +146,7 @@ NABoolean VEGMember::operator==(const VEGMember & other) const
// -----------------------------------------------------------------------
void VEGMember::print(FILE* ofd, const char* indent, const char* title)
{
-#pragma nowarn(1506) // warning elimination
BUMP_INDENT(indent);
-#pragma warn(1506) // warning elimination
fprintf(ofd,"%s %s %s",NEW_INDENT,title,NEW_INDENT);
fprintf(ofd,"Member (0x%x) VEG (0x%x) VEGRef (0x%x) VEGPred (0x%x) {%s} {%s}\n",
CollIndex(memberM_), CollIndex(groupG_),
@@ -175,9 +173,7 @@ void VEGMember::display()
VEGMember * VEGRegion::findVEGMember(VEGReference *vegReference)
{
-#pragma nowarn(1506) // warning elimination
Lng32 ne = members_.entries();
-#pragma warn(1506) // warning elimination
Lng32 i = 0;
NABoolean found = FALSE;
ValueId memberValueId;
@@ -202,9 +198,7 @@ VEGMember * VEGRegion::findVEGMember(VEGReference *vegReference)
// -----------------------------------------------------------------------
VEGMember * VEGRegion::findVEGMember(const ValueId & vid) const
{
-#pragma nowarn(1506) // warning elimination
Lng32 ne = members_.entries();
-#pragma warn(1506) // warning elimination
Lng32 i = 0;
NABoolean found = FALSE;
ValueId memberValueId;
@@ -624,9 +618,7 @@ VEGReference * VEGRegion::getVEGReferenceFromCurrentVEGRegion
VEGMember * memberPtr = findVEGMember(exprId);
-#pragma nowarn(1506) // warning elimination
Lng32 count = zones_.entries();
-#pragma warn(1506) // warning elimination
if (memberPtr == NULL &&
searchThisVegRegionFirst &&
@@ -737,9 +729,7 @@ void VEGRegion::importVEGsForUnionChildVEGRegion()
while (parentRegion)
{
parentZone = parentRegion; // initialize per iteration
-#pragma nowarn(1506) // warning elimination
parentZoneCount = getParentVEGRegion()->zones_.entries();
-#pragma warn(1506) // warning elimination
parentZoneCountPlusOne = 1 + parentZoneCount;
iterations = 0;
@@ -877,9 +867,7 @@ void VEGRegion::importVEGsForUnionChildVEGRegion()
// -----------------------------------------------------------------------
void VEGRegion::gatherInstantiateNullMembers(ValueIdSet & vidset)
{
-#pragma nowarn(1506) // warning elimination
Lng32 ne = members_.entries();
-#pragma warn(1506) // warning elimination
Lng32 index;
for (index = 0; index < ne; index ++)
{
@@ -896,9 +884,7 @@ void VEGRegion::gatherInstantiateNullMembers(ValueIdSet & vidset)
// -----------------------------------------------------------------------
void VEGRegion::replaceInstantiateNullMembers()
{
-#pragma nowarn(1506) // warning elimination
Lng32 ne = members_.entries(); // number of entries in the VEGRegion
-#pragma warn(1506) // warning elimination
Lng32 index; // loop index
InstantiateNull * instNullPtr; // -> an InstantiateNull
VEGMember * memberPtr; // -> a VEGMember
@@ -958,9 +944,7 @@ void VEGRegion::replaceInstantiateNullMembers()
// Iterate over entries in deleteStack.
// Each entry of deleteStack is for a member that is an InstantiateNull.
// ---------------------------------------------------------------------
-#pragma nowarn(1506) // warning elimination
ne = deleteStack.entries();
-#pragma warn(1506) // warning elimination
ValueId vegId;
for (index = 0; index < ne; index++)
{
@@ -1179,9 +1163,7 @@ void VEGRegion::mergeZonesFromSameVEGRegion(VEGRegion * fromRegion,
replaceInstantiateNullMembers();
// Process all the descendant VEGRegions
-#pragma nowarn(1506) // warning elimination
Lng32 ne = zones_.entries();
-#pragma warn(1506) // warning elimination
// this call is not needed as the above call to
// replaceInstantiateNullMembers() already does this
@@ -1213,9 +1195,7 @@ void VEGRegion::mergeZonesFromSameVEGRegion(VEGRegion * fromRegion,
void VEGRegion::processZones()
{
Lng32 index;
-#pragma nowarn(1506) // warning elimination
Lng32 ne = members_.entries();
-#pragma warn(1506) // warning elimination
LIST(VEGMember *) deleteStack(STMTHEAP);
// Walk through the members of this VEGRegion to check if any member
@@ -1227,17 +1207,13 @@ void VEGRegion::processZones()
// Delete all the unwanted members.
if (deleteStack.entries() > 0)
{
-#pragma nowarn(1506) // warning elimination
ne = deleteStack.entries();
-#pragma warn(1506) // warning elimination
for (index = 0; index < ne; index ++)
deleteVEGMember(deleteStack[index]->getMemberValueId());
}
// Process all the descendant VEGRegions
-#pragma nowarn(1506) // warning elimination
ne = zones_.entries();
-#pragma warn(1506) // warning elimination
for (index = 0; index < ne; index++)
zones_[index]->processZones();
@@ -1263,9 +1239,7 @@ void VEGRegion::processZones()
void VEGRegion::fixupZonesAfterFullToLeftConversion()
{
Lng32 index;
-#pragma nowarn(1506) // warning elimination
Lng32 ne = zones_.entries();
-#pragma warn(1506) // warning elimination
// And that this method is invoked right after conversion
// of full outer Join to left outer join.
@@ -1299,9 +1273,7 @@ void VEGRegion::fixupActiveZones(VEGRegion * activeParentRegion,
CMPASSERT(isActive());
Lng32 index;
-#pragma nowarn(1506) // warning elimination
Lng32 ne = zones_.entries();
-#pragma warn(1506) // warning elimination
ValueIdSet newOuterReferences(outerReferences);
ValueIdSet setOfMembers;
@@ -1462,9 +1434,7 @@ void VEGRegion::fixupZonesAndParentPointers()
parentRegion->zones_.remove(candidateRegion);
-#pragma nowarn(1506) // warning elimination
Lng32 ne = candidateRegion->zones_.entries();
-#pragma warn(1506) // warning elimination
// loop throught the zones of this region and add them to the
// parent region zones
@@ -1549,9 +1519,7 @@ void VEGRegion::print(FILE* ofd, const char* indent, const char* title)
{
Lng32 ne;
-#pragma nowarn(1506) // warning elimination
BUMP_INDENT(indent);
-#pragma warn(1506) // warning elimination
fprintf(ofd,"************\n");
fprintf(ofd,"%s %s[%d] %s",NEW_INDENT,title,getRegionId(),NEW_INDENT);
if (isActive())
@@ -1955,18 +1923,14 @@ void VEGTable::processVEGRegions()
// -----------------------------------------------------------------------
void VEGTable::print(FILE* ofd, const char* indent, const char* title)
{
-#pragma nowarn(1506) // warning elimination
BUMP_INDENT(indent);
-#pragma warn(1506) // warning elimination
fprintf(ofd,"%s %s %s",NEW_INDENT,title,NEW_INDENT);
if (getCurrentVEGRegion())
{
fprintf(ofd,"nextInSequence = %d\n>>>> Current Region is Region[%d] <<<<\n",
nextInSequence_,getCurrentVEGRegion()->getRegionId());
-#pragma nowarn(1506) // warning elimination
Lng32 ne = arrayEntry_.entries();
-#pragma warn(1506) // warning elimination
// Print all the regions
for (RegionId index = FIRST_VEG_REGION;
index < (RegionId)arrayEntry_.entries();
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/ValueDesc.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/ValueDesc.cpp b/core/sql/optimizer/ValueDesc.cpp
index cf82e2f..605118b 100644
--- a/core/sql/optimizer/ValueDesc.cpp
+++ b/core/sql/optimizer/ValueDesc.cpp
@@ -251,11 +251,7 @@ void ValueId::coerceType(enum NABuiltInTypeEnum desiredQualifier,
break;
case NA_CHARACTER_TYPE:
{
-#pragma warning (disable : 4244) // warning elimination
-#pragma nowarn(1506) // warning elimination
Lng32 len = CmpCommon::getDefaultNumeric(VARCHAR_PARAM_DEFAULT_SIZE);
-#pragma warn(1506) // warning elimination
-#pragma warning (default : 4244) // warning elimination
desiredType = new STMTHEAP
SQLVarChar(STMTHEAP, len, //DEFAULT_CHARACTER_LENGTH,
@@ -1736,9 +1732,7 @@ void ValueIdList::replaceOperandsOfInstantiateNull
void ValueIdList::print(FILE* ofd, const char* indent, const char* title,
CollHeap *c, char *buf) const
{
-#pragma nowarn(1506) // warning elimination
BUMP_INDENT(indent);
-#pragma warn(1506) // warning elimination
Space * space = (Space *)c;
char mybuf[1000];
@@ -2157,7 +2151,6 @@ NABoolean ValueIdSet::hasRandom() const
// Check whether any of the members of this ValueIdSet are contained
// in the provided ValueIdSet. Return the number of members found.
// -----------------------------------------------------------------------
-#pragma nowarn(262) // warning elimination
Int32 ValueIdSet::membersCoveredInSet (const ValueIdSet& vidSet, NABoolean lookBelowInstantiateNull) const
{
NABoolean coverFlag = FALSE;
@@ -2184,7 +2177,6 @@ Int32 ValueIdSet::membersCoveredInSet (const ValueIdSet& vidSet, NABoolean lookB
return (membersFound);
}
-#pragma warn(262) // warning elimination
//-------------------------------------------------------
//removeCoveredVidSet()
@@ -4598,7 +4590,6 @@ void ValueIdSet::unparse(NAString &result,
result += ")";
} // ValueIdSet::unparse
-#pragma nowarn(1506) // warning elimination
void ValueIdSet::print(FILE* ofd, const char* indent, const char* title,
CollHeap *c, char *buf) const
{
@@ -4621,14 +4612,12 @@ void ValueIdSet::print(FILE* ofd, const char* indent, const char* title,
PRINTIT(ofd, c, space, buf, mybuf);
}
} // ValueIdSet::print()
-#pragma warn(1506) // warning elimination
void ValueIdSet::display() const // To be called from the debugger
{
print();
}
-#pragma nowarn(1506) // warning elimination
ex_expr::exp_return_type ValueIdList::evalAtCompileTime
(short addConvNodes, // (IN) : 1 to add conv nodes, 0 otherwise
ExpTupleDesc::TupleDataFormat tf, // (IN) : tuple format of resulting expr(s)
@@ -4731,7 +4720,6 @@ ex_expr::exp_return_type ValueIdList::evalAtCompileTime
return rc;
}
-#pragma warn(1506) // warning elimination
// Used by constant folding. Calls the executor evaluator. The parameters are:
// 1.- The root of the expression tree to evaluate. It is assumed that it
@@ -4762,7 +4750,6 @@ short ValueIdList::evaluateTree( const ItemExpr * root,
// Parent is the parent of ch and childNumber is the number of ch. The function
// computes the value represented by the subtree rooted at ch and puts
// the new value in the position of ch. Used by constant folding.
-#pragma nowarn(262) // warning elimination
Lng32 ValueIdList::evaluateConstantTree( const ValueId &parent,
const ValueId & ch,
Int32 childNumber,
@@ -4884,7 +4871,6 @@ Lng32 ValueIdList::evaluateConstantTree( const ValueId &parent,
return error;
}
-#pragma warn(262) // warning elimination
////////////////////////////////////////////////////////////////////////////
// Tells us if some sort of algebraic simplification can be done in a tree.
@@ -5965,7 +5951,6 @@ ValueId ValueDesc::create(ItemExpr *expr, const NAType *type, CollHeap *h)
// ***********************************************************************
// Methods for class ValueDescArray
// ***********************************************************************
-#pragma nowarn(1506) // warning elimination
void ValueDescArray::print(FILE* ofd, const char* indent, const char* title,
NABoolean dontDisplayErrors) const
{
@@ -6005,7 +5990,6 @@ void ValueDescArray::print(FILE* ofd, const char* indent, const char* title,
}
#endif
} // ValueDescArray::print()
-#pragma warn(1506) // warning elimination
void ValueDescArray::display(NABoolean dontDisplayErrors) const
{
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/costmethod.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/costmethod.cpp b/core/sql/optimizer/costmethod.cpp
index c063f1d..ec0fc4f 100644
--- a/core/sql/optimizer/costmethod.cpp
+++ b/core/sql/optimizer/costmethod.cpp
@@ -295,9 +295,7 @@ CostMethod::print( FILE* ofd
, const char* title
) const
{
-#pragma nowarn(1506) // warning elimination
BUMP_INDENT(indent);
-#pragma warn(1506) // warning elimination
fprintf(ofd,"%s ",NEW_INDENT);
if (title)
fprintf(ofd,"%s ",title);
@@ -1415,9 +1413,7 @@ CostMethodExchange::computeOperatorCostInternal(RelExpr* op,
getNumActivePartitions();
const CostScalar& numOfPartitions = ((NodeMap *)(childPartFunc->getNodeMap()))->
getEstNumActivePartitionsAtRuntime();
-#pragma warning (disable : 4018) //warning elimination
const CostScalar& numOfProducers = MINOF( numOfPartitions ,sppForChild->getCurrentCountOfCPUs() );
-#pragma warning (default : 4018) //warning elimination
//---------------------------------------------------------------
// Exchange operator's number of streams is parent's degree of
@@ -4850,9 +4846,7 @@ void CostMethodFixedCostPerRow::print(FILE* ofd,
const char* indent,
const char* title) const
{
-#pragma nowarn(1506) // warning elimination
BUMP_INDENT(indent);
-#pragma warn(1506) // warning elimination
CostMethod::print(ofd,indent,title);
fprintf(ofd,"%s ",NEW_INDENT);
fprintf(ofd,
@@ -8663,9 +8657,7 @@ NABoolean CostMethodJoin::computeRepresentativeStream()
GroupAttributes * child1GA = jn_->child(1).getGroupAttr();
// This is essentially an implementation shared by MJ and HJ but not NJ.
-#pragma nowarn(203) // warning elimination
if(jn_->isTSJ()) return FALSE;
-#pragma warn(203) // warning elimination
// Cannot do better if no colstats are available for analysis.
if(NOT isColStatsMeaningful_) return FALSE;
@@ -9277,16 +9269,12 @@ void CostMethodHashJoin::cacheParameters(RelExpr* op,
// Length of a row from the left table.
GroupAttributes* child0GA = hj_->child(0).getGroupAttr();
-#pragma nowarn(1506) // warning elimination
child0RowLength_ = child0GA->getRecordLength();
-#pragma warn(1506) // warning elimination
extChild0RowLength_ = child0RowLength_ + hashedRowOverhead_;
// Length of a row from the right table.
GroupAttributes* child1GA = hj_->child(1).getGroupAttr();
-#pragma nowarn(1506) // warning elimination
child1RowLength_ = child1GA->getRecordLength();
-#pragma warn(1506) // warning elimination
extChild1RowLength_ = child1RowLength_ + hashedRowOverhead_;
// Cost for making a copy of those rows to the local buffer.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/mdam.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/mdam.cpp b/core/sql/optimizer/mdam.cpp
index faa9ffb..6e05724 100644
--- a/core/sql/optimizer/mdam.cpp
+++ b/core/sql/optimizer/mdam.cpp
@@ -1455,39 +1455,29 @@ void MdamKey::setAllColumnsToSparse()
void MdamKey::setStopColumn(CollIndex disjunctNumber,
CollIndex columnOrder)
{
-#pragma nowarn(270) // warning elimination
DCMPASSERT(disjunctNumber >= 0 AND disjunctNumber < getDisjuncts().entries());
-#pragma warn(270) // warning elimination
-#pragma nowarn(270) // warning elimination
DCMPASSERT(columnOrder >= 0 AND columnOrder < getKeyColumns().entries());
-#pragma warn(270) // warning elimination
DCMPASSERT(stopColumnArray_ != NULL);
stopColumnArray_[disjunctNumber] = columnOrder;
}
CollIndex MdamKey::getStopColumn(CollIndex disjunctNumber) const
{
-#pragma nowarn(270) // warning elimination
DCMPASSERT(disjunctNumber >= 0 AND disjunctNumber < getDisjuncts().entries());
-#pragma warn(270) // warning elimination
DCMPASSERT(stopColumnArray_ != NULL);
return stopColumnArray_[disjunctNumber];
}
NABoolean MdamKey::getSparseFlag(CollIndex columnOrder) const
{
-#pragma nowarn(270) // warning elimination
DCMPASSERT(columnOrder >= 0 AND columnOrder < getKeyColumns().entries());
-#pragma warn(270) // warning elimination
DCMPASSERT(sparseFlagArray_ != NULL);
return sparseFlagArray_[columnOrder];
}
void MdamKey::setSparseFlag(CollIndex columnOrder, NABoolean isSparse)
{
-#pragma nowarn(270) // warning elimination
DCMPASSERT(columnOrder >= 0 AND columnOrder < getKeyColumns().entries());
-#pragma warn(270) // warning elimination
DCMPASSERT(sparseFlagArray_ != NULL);
sparseFlagArray_[columnOrder] = isSparse;
}
@@ -2527,7 +2517,6 @@ void KeyColumns::KeyColumn::clearPredicates()
// are conflicting predicates. Resolve conflict will pick any
// one of them (in this case we may like to get A < 2, but
// this is difficult to do in the optimizer)
-#pragma nowarn(262) // warning elimination
void KeyColumns::KeyColumn::resolveConflict()
{
@@ -2603,7 +2592,6 @@ void KeyColumns::KeyColumn::resolveConflict()
}
} // resolveConflict(...)
-#pragma warn(262) // warning elimination
//---------------------------------------------------------
@@ -2648,7 +2636,6 @@ void KeyColumns::insertColumn(const ValueId& column)
} // KeyColumns::insertColumn(..)
-#pragma nowarn(262) // warning elimination
void KeyColumns::append(const ValueIdSet& andPredicateExpression)
{
@@ -2667,7 +2654,6 @@ void KeyColumns::append(const ValueIdSet& andPredicateExpression)
} // for every predicate
} // KeyColumns::fill(..)
-#pragma warn(262) // warning elimination
KeyColumns::~KeyColumns()
@@ -2749,7 +2735,6 @@ void KeyColumns::insertPredicate(const ValueId& predicate)
insertPredicate(predicate,NULL);
}
-#pragma nowarn(262) // warning elimination
void KeyColumns::insertPredicate(const ValueId& predicate,
const ValueId* columnPtr)
{
@@ -2881,7 +2866,6 @@ void KeyColumns::insertPredicate(const ValueId& predicate,
// and T1.A is a key col. but T1.D is not a key col.
} // KeyColumns::insertPredicate(..)
-#pragma warn(262) // warning elimination
void KeyColumns::clear()
@@ -3024,17 +3008,13 @@ ColumnOrderList::ColumnOrderList(const ValueIdList& listOfColumns):
void ColumnOrderList::validateOrder(CollIndex order)
{
-#pragma nowarn(270) // warning elimination
DCMPASSERT(order >= 0 && order < columnList_.entries());
-#pragma warn(270) // warning elimination
orderKeyColumnPtrList_[order] = getKeyColumnPtr(columnList_[order]);
}
void ColumnOrderList::invalidateOrder(CollIndex order)
{
-#pragma nowarn(270) // warning elimination
DCMPASSERT(order >= 0 && order < columnList_.entries());
-#pragma warn(270) // warning elimination
orderKeyColumnPtrList_[order] = NULL;
}
@@ -3051,9 +3031,7 @@ void ColumnOrderList::invalidateAllColumns()
const ColumnOrderList::KeyColumn* ColumnOrderList::
getPredicateExpressionPtr(CollIndex order) const
{
-#pragma nowarn(270) // warning elimination
DCMPASSERT(order >= 0 && order < orderKeyColumnPtrList_.entries());
-#pragma warn(270) // warning elimination
if (orderKeyColumnPtrList_[order] == NULL)
return NULL;
else
@@ -3082,9 +3060,7 @@ void ColumnOrderList::setStopColumn(CollIndex stopColumn)
void ColumnOrderList::resolveConflict(CollIndex order)
{
-#pragma nowarn(270) // warning elimination
DCMPASSERT(order >= 0 && order < orderKeyColumnPtrList_.entries());
-#pragma warn(270) // warning elimination
if (orderKeyColumnPtrList_[order] != NULL)
{
orderKeyColumnPtrList_[order]->resolveConflict();
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/memo.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/memo.cpp b/core/sql/optimizer/memo.cpp
index 0298e1b..8363b33 100644
--- a/core/sql/optimizer/memo.cpp
+++ b/core/sql/optimizer/memo.cpp
@@ -106,9 +106,7 @@ CascadesGroup::~CascadesGroup()
groupAttr_->decrementReferenceCount();
// delete associated contexts
-#pragma nowarn(1506) // warning elimination
Lng32 maxc = goals_.entries();
-#pragma warn(1506) // warning elimination
for (Lng32 i = 0; i < maxc; i++)
delete goals_[i];
@@ -245,9 +243,7 @@ void CascadesGroup::addPlan (CascadesPlan * plan)
{
CURRSTMT_OPTGLOBALS->plans_count++; // increment global counter for # of plans
-#pragma nowarn(1506) // warning elimination
Lng32 index = plans_.entries();
-#pragma warn(1506) // warning elimination
plans_.insertAt(index,plan); // insert plan at end of list
}
@@ -436,14 +432,10 @@ void CascadesGroup::merge(CascadesGroup * other)
// -----------------------------------------------------------------
// move all contexts from the other group into this group
// -----------------------------------------------------------------
-#pragma nowarn(1506) // warning elimination
Lng32 maxg = other->goals_.entries();
-#pragma warn(1506) // warning elimination
for (Lng32 i = 0; i < maxg; i++)
{
-#pragma nowarn(1506) // warning elimination
Lng32 maxc = goals_.entries();
-#pragma warn(1506) // warning elimination
NABoolean found = FALSE;
// change the context to the new group number
@@ -553,9 +545,7 @@ Context * CascadesGroup::shareContext(
Context *newContext = new (CmpCommon::statementHeap())
Context(groupId_, reqdPhys, inputPhys, inputLogProp) ;
Context* result = newContext;
-#pragma nowarn(1506) // warning elimination
Lng32 maxc = goals_.entries();
-#pragma warn(1506) // warning elimination
NABoolean found = FALSE;
// The "setCostLimitInContext" below is used to indicate whether the
@@ -778,28 +768,18 @@ CascadesMemo::~CascadesMemo()
e = e->getNextInBucket())
++ count;
}
-#pragma nowarn(1506) // warning elimination
m1 += count;
-#pragma warn(1506) // warning elimination
-#pragma nowarn(1506) // warning elimination
m2 += count * count;
-#pragma warn(1506) // warning elimination
}
-#pragma nowarn(1506) // warning elimination
m1 /= hashSize_; m2 /= hashSize_;
-#pragma warn(1506) // warning elimination
printf("%.0lf entries / %d buckets = %.6lf, var %.6lf\n",
-#pragma nowarn(1506) // warning elimination
m1 * hashSize_, hashSize_, m1, m2 - m1 * m1);
-#pragma warn(1506) // warning elimination
}
// weed out those groups that have been merged, to avoid deleting
// some groups twice
-#pragma nowarn(1506) // warning elimination
Lng32 groupEntries = group_.entries();
-#pragma warn(1506) // warning elimination
CascadesGroupId groupId = 0;
for (groupId = 0; (Lng32)groupId < groupEntries; groupId++)
@@ -1270,9 +1250,7 @@ Int32 CascadesMemo::garbageCollection()
}
// return the number of changed expressions
-#pragma nowarn(1506) // warning elimination
return changed.entries();
-#pragma warn(1506) // warning elimination
} // CascadesMemo::garbageCollection()
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/opt.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/opt.cpp b/core/sql/optimizer/opt.cpp
index 4fe847f..26c456a 100644
--- a/core/sql/optimizer/opt.cpp
+++ b/core/sql/optimizer/opt.cpp
@@ -212,9 +212,6 @@ void clearFailedPlanWarningsForStream()
}
}
-#pragma warning (disable : 4101) //warning elimination
-#pragma nowarn(262) // warning elimination
-
// This method is for the old driver and not used unless CQD NEW_OPT_DRIVER
// is OFF. We use the new driver by default.
RelExpr * RelExpr::optimize(NABoolean exceptionMode,
@@ -364,9 +361,7 @@ if (CURRSTMT_OPTDEFAULTS->optimizerHeuristic2()) {//#ifdef _DEBUG
// maximum parallelism can be forced by setting CDQ COMP_BOOL_69 to ON
CURRSTMT_OPTGLOBALS->maxParIsFeasible = TRUE;
-#pragma nowarn(1506) // warning elimination
Lng32 t0 = clock();
-#pragma warn(1506) // warning elimination
// ---------------------------------------------------------------------
// -- Triggers.
@@ -927,8 +922,6 @@ if (plan && context->getGroupAttr()->isStream())
return ( plan );
} // optimize
-#pragma warn(262) // warning elimination
-#pragma warning (default : 4101) //warning elimination
//<pb>
/* ============================================================ */
@@ -1218,7 +1211,6 @@ NAString Context::getRPPString() const
}
//GTOOL
-#pragma nowarn(262) // warning elimination
NAString Context::getIPPString() const
{
// Return a one-line description of the input physical properties.
@@ -1273,7 +1265,6 @@ NAString Context::getIPPString() const
return propString;
}
-#pragma warn(262) // warning elimination
//GTOOL
NAString Context::getILPString() const
@@ -2603,7 +2594,6 @@ void PlanWorkSpace::setPartialPlanCostToOperatorCost()
// Operator's cost independent of its children.
//
//==============================================================================
-#pragma nowarn(770) // warning elimination
Cost*
PlanWorkSpace::getFinalOperatorCost(Lng32 planNumber)
{
@@ -2758,7 +2748,6 @@ PlanWorkSpace::getFinalOperatorCost(Lng32 planNumber)
return operatorCost;
} // PlanWorkSpace::getFinalOperatorCost()
-#pragma warn(770) // warning elimination
//<pb>
//==============================================================================
// Set partialPlan cost to a newly specified cost.
@@ -3589,9 +3578,7 @@ NABoolean CascadesBinding::advance()
// used for that since they are used to represent cascades group).
CutOp* newPattern = new (CmpCommon::statementHeap())
-#pragma nowarn(1506) // warning elimination
CutOp((*curExpr_)[childIndex].getGroupId(), CmpCommon::statementHeap());
-#pragma warn(1506) // warning elimination
newPattern->setGroupIdAndAttr((*curExpr_)[childIndex].getGroupId());
childBinding = new(CmpCommon::statementHeap())
CascadesBinding(
@@ -3700,9 +3687,7 @@ NABoolean CascadesBinding::advance()
if (children_.entries() > 0)
{
// existing log expr is finished; dealloc children
-#pragma nowarn(1506) // warning elimination
for (Lng32 childIndex = children_.entries(); -- childIndex >= 0; )
-#pragma warn(1506) // warning elimination
{
childBinding = children_[childIndex];
delete childBinding;
@@ -3749,9 +3734,7 @@ NABoolean CascadesBinding::advance()
} // state analysis and transitions
} // loop until either failure or success
-#pragma nowarn(203) // warning elimination
ABORT("should never terminate this loop");
-#pragma warn(203) // warning elimination
return( FALSE );
} // CascadesBinding::advance
@@ -5409,7 +5392,6 @@ NABoolean OptDefaults::cacheHistograms()
ActiveSchemaDB()->getDefaults().getAsLong(CACHE_HISTOGRAMS_IN_KB)>0);
}
-#pragma warn(262) // warning elimination
// ---------------------------------------------------------------------
// OptDebug class methods
@@ -5561,16 +5543,10 @@ void OptDebug::showTree( const ExprNode *tree,
if ( plan != NULL )
{
CollIndex index = 0;
-#pragma nowarn(1506) // warning elimination
while ( plan->getSolutionForChild(index) )
-#pragma warn(1506) // warning elimination
{
-#pragma nowarn(1506) // warning elimination
showTree( plan->getSolutionForChild(index)->getPhysicalExpr(),
-#pragma warn(1506) // warning elimination
-#pragma nowarn(1506) // warning elimination
plan->getSolutionForChild(index),
-#pragma warn(1506) // warning elimination
indent,
showDetail );
index++;
@@ -6542,9 +6518,7 @@ void OptDebug::showMemoStats(CascadesMemo *memo,
if (detailedStat)
{
const CascadesPlanList& grPlanList = groupPtr->getPlans();
-#pragma nowarn(1506) // warning elimination
grPlanCnt = grPlanList.entries();
-#pragma warn(1506) // warning elimination
grFailedPlanCnt=0;
for (Lng32 j=0; j<grPlanCnt; j++)
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/opt.h
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/opt.h b/core/sql/optimizer/opt.h
index 80d61ed..de3995e 100644
--- a/core/sql/optimizer/opt.h
+++ b/core/sql/optimizer/opt.h
@@ -1221,7 +1221,6 @@ public:
// ---------------------------------------------------------------------
// Constructor and Destructor.
// ---------------------------------------------------------------------
-// warning elimination (removed "inline")
CascadesPlan(RelExpr * physExpr, Context * context = NULL);
virtual ~CascadesPlan();
@@ -1418,7 +1417,6 @@ public:
// applying transformation rules
// -----------------------------------------------------------------------
-#pragma nowarn(1506) // warning elimination
class Context : public NABasicObject
{
@@ -1749,7 +1747,6 @@ private:
PlanWorkSpace* myPws_; // my PlanWorkSpace
}; // Context
-#pragma warn(1506) // warning elimination
// -----------------------------------------------------------------------
// A list and an array of context pointers
@@ -2159,7 +2156,6 @@ private:
// (d) a list of pattern for which this group has been expanded
// -----------------------------------------------------------------------
-#pragma nowarn(1506) // warning elimination
class CascadesGroup : public NABasicObject
{
@@ -2246,7 +2242,6 @@ private:
// top parallelism heristic and nice contrext for top groupBy
NABoolean isBelowRoot_;
}; // CascadesGroup
-#pragma warn(1506) // warning elimination
//<pb>
// -----------------------------------------------------------------------
// Search space memory
@@ -2257,7 +2252,6 @@ private:
// duplicate expressions.
// -----------------------------------------------------------------------
-#pragma nowarn(1506) // warning elimination
class CascadesMemo : public NABasicObject
{
@@ -2310,7 +2304,6 @@ private:
Lng32 hashSize_; // size of hash table
}; // CascadesMemo
-#pragma warn(1506) // warning elimination
//<pb>
// -----------------------------------------------------------------------
// Tasks
@@ -2738,7 +2731,6 @@ public:
EXPR_FINISHED // current expr is finished; in advance() only
};
-// warning elimination (removed "inline")
static const char * binding_state_name (CascadesBindingStateEnum state)
{
return state == START_GROUP ? "start a group" :
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/parser/ElemDDLFileAttr.cpp
----------------------------------------------------------------------
diff --git a/core/sql/parser/ElemDDLFileAttr.cpp b/core/sql/parser/ElemDDLFileAttr.cpp
index b8bf860..b3511a9 100644
--- a/core/sql/parser/ElemDDLFileAttr.cpp
+++ b/core/sql/parser/ElemDDLFileAttr.cpp
@@ -347,9 +347,7 @@ NAString ElemDDLFileAttrBlockSize::getSyntax() const
{
NAString syntax = "BLOCKSIZE ";
-#pragma nowarn(1506) // warning elimination
syntax += LongToNAString(blockSizeInBytes_);
-#pragma warn(1506) // warning elimination
return syntax;
} // getSyntax()
@@ -1112,9 +1110,7 @@ ElemDDLFileAttrMVCommitEach::displayLabel1() const
NAString ElemDDLFileAttrMVCommitEach::getSyntax() const
{
NAString syntax = "COMMIT REFRESH EACH ";
-#pragma nowarn(1506) // warning elimination
syntax += LongToNAString(nrows_);
-#pragma warn(1506) // warning elimination
return syntax;
@@ -1193,9 +1189,7 @@ NAString ElemDDLFileAttrMaxSize::getSyntax() const
}
else
{
-#pragma nowarn(1506) // warning elimination
syntax += LongToNAString(maxSize_);
-#pragma warn(1506) // warning elimination
syntax += " ";
switch(maxSizeUnit_)
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/parser/ElemDDLList.h
----------------------------------------------------------------------
diff --git a/core/sql/parser/ElemDDLList.h b/core/sql/parser/ElemDDLList.h
index fbe1281..963f234 100644
--- a/core/sql/parser/ElemDDLList.h
+++ b/core/sql/parser/ElemDDLList.h
@@ -77,7 +77,6 @@ class ElemDDLList;
// -----------------------------------------------------------------------
// A list of elements in DDL statement.
// -----------------------------------------------------------------------
-#pragma nowarn(1319) // warning elimination
class ElemDDLList : public ElemDDLNode
{
@@ -185,7 +184,6 @@ private:
ElemDDLNode * children_[MAX_ELEM_DDL_LIST_ARITY];
}; // class ElemDDLList
-#pragma warn(1319) // warning elimination
// -----------------------------------------------------------------------
// definitions of inline methods for class ElemDDLList
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/parser/ElemDDLPartition.cpp
----------------------------------------------------------------------
diff --git a/core/sql/parser/ElemDDLPartition.cpp b/core/sql/parser/ElemDDLPartition.cpp
index 42f8f14..93d3544 100644
--- a/core/sql/parser/ElemDDLPartition.cpp
+++ b/core/sql/parser/ElemDDLPartition.cpp
@@ -444,9 +444,7 @@ ElemDDLPartitionSystem::setPartitionAttr(ElemDDLNode * pPartitionAttr)
ElemDDLFileAttrMaxExtents * pMaxExtents =
pPartitionAttr->castToElemDDLFileAttrMaxExtents();
// error checking for limits when we specify the MAXEXTENTS clause
-#pragma nowarn(1506) // warning elimination
Lng32 maxext = pMaxExtents->getMaxExtents();
-#pragma warn(1506) // warning elimination
if ((maxext <= 0) || (maxext > COM_MAX_MAXEXTENTS))
{
*SqlParser_Diags << DgSqlCode(-3191);
@@ -618,10 +616,8 @@ ElemDDLPartitionSystem::getDetailInfo() const
detailText += LongToNAString((Lng32)getMaxSize());
detailTextList.append(detailText);
-#pragma nowarn(1506) // warning elimination
ElemDDLFileAttrMaxSize maxSizeFileAttr(getMaxSize(),
getMaxSizeUnit());
-#pragma warn(1506) // warning elimination
detailText = " max size unit: ";
detailText += maxSizeFileAttr.getMaxSizeUnitAsNAString();;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/parser/ElemDDLUdr.cpp
----------------------------------------------------------------------
diff --git a/core/sql/parser/ElemDDLUdr.cpp b/core/sql/parser/ElemDDLUdr.cpp
index 11672e4..58307b0 100644
--- a/core/sql/parser/ElemDDLUdr.cpp
+++ b/core/sql/parser/ElemDDLUdr.cpp
@@ -387,9 +387,7 @@ ElemDDLUdrMaxResults::getDetailInfo() const
NATraceList detailTextList;
detailText = "MaxResults: ";
-#pragma nowarn(1506) // warning elimination
detailText += LongToNAString(getMaxResults());
-#pragma warn(1506) // warning elimination
detailTextList.append(detailText);
return detailTextList;
@@ -918,9 +916,7 @@ ElemDDLUdfStateAreaSize::getDetailInfo() const
NATraceList detailTextList;
detailText = "StateAreaSize: ";
-#pragma nowarn(1506) // warning elimination
detailText += LongToNAString(getStateAreaSize());
-#pragma warn(1506) // warning elimination
detailTextList.append(detailText);
return detailTextList;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/parser/ParDDLFileAttrs.cpp
----------------------------------------------------------------------
diff --git a/core/sql/parser/ParDDLFileAttrs.cpp b/core/sql/parser/ParDDLFileAttrs.cpp
index 74a4b99..c8ba867 100644
--- a/core/sql/parser/ParDDLFileAttrs.cpp
+++ b/core/sql/parser/ParDDLFileAttrs.cpp
@@ -120,9 +120,7 @@ ParDDLFileAttrsAlterIndex::operator = (
NAString
ParDDLFileAttrsAlterIndex::getMaxSizeUnitAsNAString() const
{
-#pragma nowarn(1506) // warning elimination
ElemDDLFileAttrMaxSize maxSizeFileAttr(getMaxSize(), getMaxSizeUnit());
-#pragma warn(1506) // warning elimination
return maxSizeFileAttr.getMaxSizeUnitAsNAString();
}
@@ -443,9 +441,7 @@ ParDDLFileAttrsAlterIndex::setFileAttr(ElemDDLFileAttr * pFileAttr)
/////////////////////////////////////////////////////////////////
//error checking while specifying the MAXEXTENTS attribute clause
/////////////////////////////////////////////////////////////////
-#pragma nowarn(1506) // warning elimination
Lng32 maxext = pMaxExtents->getMaxExtents();
-#pragma warn(1506) // warning elimination
if ((maxext <= 0) || (maxext > COM_MAX_MAXEXTENTS))
{
*SqlParser_Diags << DgSqlCode(-3191);
@@ -672,12 +668,8 @@ ParDDLFileAttrsAlterTable::operator = (
NAString
ParDDLFileAttrsAlterTable::getMaxSizeUnitAsNAString() const
{
-#pragma nowarn(1506) // warning elimination
ElemDDLFileAttrMaxSize maxSizeFileAttr(getMaxSize(), getMaxSizeUnit());
-#pragma warn(1506) // warning elimination
-#pragma nowarn(1506) // warning elimination
return maxSizeFileAttr.getMaxSizeUnitAsNAString();
-#pragma warn(1506) // warning elimination
}
//
@@ -1050,9 +1042,7 @@ ParDDLFileAttrsAlterTable::setFileAttr(ElemDDLFileAttr * pFileAttr)
ElemDDLFileAttrMaxExtents * pMaxExtents =
pFileAttr->castToElemDDLFileAttrMaxExtents();
// error checking for limits when we specify the MAXEXTENTS clause
-#pragma nowarn(1506) // warning elimination
Lng32 maxext = pMaxExtents->getMaxExtents();
-#pragma warn(1506) // warning elimination
if ((maxext <= 0) || (maxext > COM_MAX_MAXEXTENTS))
{
*SqlParser_Diags << DgSqlCode(-3191);
@@ -1316,9 +1306,7 @@ ParDDLFileAttrsCreateIndex::operator = (
NAString
ParDDLFileAttrsCreateIndex::getMaxSizeUnitAsNAString() const
{
-#pragma nowarn(1506) // warning elimination
ElemDDLFileAttrMaxSize maxSizeFileAttr(getMaxSize(), getMaxSizeUnit());
-#pragma warn(1506) // warning elimination
return maxSizeFileAttr.getMaxSizeUnitAsNAString();
}
@@ -1693,9 +1681,7 @@ ParDDLFileAttrsCreateIndex::setFileAttr(ElemDDLFileAttr * pFileAttr)
//////////////////////////////////////////////////////
// error checking when we define the MAXEXTENTS clause
//////////////////////////////////////////////////////
-#pragma nowarn(1506) // warning elimination
Lng32 maxext = pMaxExtents->getMaxExtents();
-#pragma warn(1506) // warning elimination
if ((maxext <= 0) || (maxext > COM_MAX_MAXEXTENTS))
{
*SqlParser_Diags << DgSqlCode(-3191);
[04/12] incubator-trafodion git commit: TRAFODION-2731 CodeCleanup:
Phase 4. Remove legacy/obsolete pragmas
Posted by an...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/MvRefreshBuilder.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/MvRefreshBuilder.cpp b/core/sql/optimizer/MvRefreshBuilder.cpp
index d1f508f..2f2d9f0 100644
--- a/core/sql/optimizer/MvRefreshBuilder.cpp
+++ b/core/sql/optimizer/MvRefreshBuilder.cpp
@@ -819,7 +819,6 @@ RelExpr *MvRefreshBuilder::buildReadRangesBlock() const
// Build the scan on the table and rename the table syskey column if exists
// to @SYSKEY
// Excluded from coverage test - used only with range logging.
-#pragma nowarn(1506) // warning elimination
RelExpr *MvRefreshBuilder::buildReadBaseTable() const
{
RelExpr *topNode = new(heap_) Scan(getLogsInfo().getBaseTableName());
@@ -831,9 +830,7 @@ RelExpr *MvRefreshBuilder::buildReadBaseTable() const
// For nested-join because the fact that the ranges in the range log
// do not overlap the scan on the table will not produce more than
// the table cardinality .
-#pragma warning (disable : 4244) //warning elimination
fixScanCardinality(topNode, 1.0, coveredRows);
-#pragma warning (default : 4244) //warning elimination
// The root select list is (*, isLastExpr).
ColRefName *star = new(heap_) ColRefName(1); // isStar
@@ -855,7 +852,6 @@ RelExpr *MvRefreshBuilder::buildReadBaseTable() const
return rootNode;
}
-#pragma warn(1506) // warning elimination
//----------------------------------------------------------------------------
// Excluded from coverage test - used only with range logging.
@@ -1597,7 +1593,6 @@ RelExpr *MavBuilder::buildDeltaProcessingBlock(DeltaDefinition *deltaDef)
// WHERE expressions: b = tableForWhere.b
// This method is also used by MinMaxMavBuilder.
//////////////////////////////////////////////////////////////////////////////
-#pragma nowarn(1506) // warning elimination
RelExpr *MavBuilder::buildDPBUpdate(const NAString& tableForSet,
const NAString& tableForWhere) const
{
@@ -1647,7 +1642,6 @@ RelExpr *MavBuilder::buildDPBUpdate(const NAString& tableForSet,
updateRoot->setEmptySelectList();
return updateRoot;
}
-#pragma warn(1506) // warning elimination
//////////////////////////////////////////////////////////////////////////////
// Build the Delete sub-tree of the MAV Delta Processing Block.
@@ -1705,7 +1699,6 @@ RelExpr *MavBuilder::buildDPBInsert(DeltaDefinition *deltaDef, RelExpr *topNode)
//////////////////////////////////////////////////////////////////////////////
// Build the Insert sub-tree of the MAV Delta Processing Block.
-#pragma nowarn(1506) // warning elimination
RelExpr *MavBuilder::buildDPBInsertNodes(const NAString& sourceTable) const
{
// The group-by columns are always taken from the DELTA table.
@@ -1760,7 +1753,6 @@ RelExpr *MavBuilder::buildDPBInsertNodes(const NAString& sourceTable) const
return insertRoot;
}
-#pragma warn(1506) // warning elimination
// ===========================================================================
// ==== Methods for supporting Min/Max.
@@ -1845,7 +1837,6 @@ NABoolean MavBuilder::useUnionBakeboneToMergeEpochs() const
// Check if the Group by columns are a prefix of the base table clustering
// index. The order of the group by columns is not important.
//----------------------------------------------------------------------------
-#pragma nowarn(1506) // warning elimination
Int32 MavBuilder::isGroupByAprefixOfTableCKeyColumns() const
{
if (isGroupByAprefixOfTableCKeyColumns_ != -1)
@@ -1884,7 +1875,6 @@ Int32 MavBuilder::isGroupByAprefixOfTableCKeyColumns() const
return isGroupByAprefixOfTableCKeyColumns_;
}
-#pragma warn(1506) // warning elimination
// ===========================================================================
@@ -1992,7 +1982,6 @@ void MinMaxOptimizedMavBuilder::fixGroupingColumns(RelRoot* pRoot) const
// Remove the GroupBy columns from the select list of the MV select tree.
// After removing the GroupBy volumns from the GroupBy node, these columns
// can no longer be used in the select list above the GroupBy node.
-#pragma nowarn(1506) // warning elimination
void MinMaxOptimizedMavBuilder::removeGroupingColsFromSelectList(RelRoot* pRoot) const
{
// Convert the root select list from an ItemExpr tree to a list.
@@ -2026,7 +2015,6 @@ void MinMaxOptimizedMavBuilder::removeGroupingColsFromSelectList(RelRoot* pRoot)
// Set it as the Select list.
pRoot->addCompExprTree(nonGroupedSelectList);
}
-#pragma warn(1506) // warning elimination
// ===========================================================================
// ===========================================================================
@@ -2199,7 +2187,6 @@ void MultiDeltaMavBuilder::bindJoinProduct(RelRoot *product, NABoolean isSignPl
// @OP as well as @EPOCH, @IGNORE etc. should be deleted from the RETDesc,
// for both T1 and T3. A new column called @OP should be adde instead:
// (T1.@OP * T3.@OP * -1).
-#pragma nowarn(1506) // warning elimination
void MultiDeltaMavBuilder::prepareRetdescForUnion(RETDesc *retDesc, NABoolean isSignPlus)
{
CMPASSERT(retDesc != NULL);
@@ -2318,7 +2305,6 @@ void MultiDeltaMavBuilder::prepareRetdescForUnion(RETDesc *retDesc, NABoolean i
// And add it to the RETDesc.
retDesc->addColumn(bindWA_, opName, newOpExpr->getValueId());
}
-#pragma warn(1506) // warning elimination
// This method returns TRUE if the columnDesc parameter is an @OP column
// That needs to be deleted from the RETDesc.
@@ -2767,7 +2753,6 @@ void MultiDeltaRefreshMatrixRow::display() const
// ===========================================================================
//----------------------------------------------------------------------------
-#pragma nowarn(1506) // warning elimination
// Construct the matrix from the join graph solution, and add the first row.
MultiDeltaRefreshMatrix::MultiDeltaRefreshMatrix(Int32 maxNumOfRows,
MVJoinGraph *joinGraph,
@@ -2823,7 +2808,6 @@ MultiDeltaRefreshMatrix::MultiDeltaRefreshMatrix(Int32 maxNumOfRows,
// And insert it into the matrix.
theMatrix_[0] = firstRow;
}
-#pragma warn(1506) // warning elimination
//----------------------------------------------------------------------------
MultiDeltaRefreshMatrix::~MultiDeltaRefreshMatrix()
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/MvRefreshBuilder.h
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/MvRefreshBuilder.h b/core/sql/optimizer/MvRefreshBuilder.h
index b86102c..74cda8a 100644
--- a/core/sql/optimizer/MvRefreshBuilder.h
+++ b/core/sql/optimizer/MvRefreshBuilder.h
@@ -101,9 +101,7 @@ public:
private:
// Copy Ctor and = operator are not implemented.
MvRefreshBuilder(const MvRefreshBuilder& other);
-#pragma nowarn(1026) // warning elimination
MvRefreshBuilder& operator=(const MvRefreshBuilder& other);
-#pragma warn(1026) // warning elimination
public:
enum { MAX_EPOCH_FOR_UNION_BACKBONE = 50 };
@@ -276,9 +274,7 @@ public:
private:
// Copy Ctor and = operator are not implemented.
MvRecomputeBuilder(const MvRecomputeBuilder& other);
-#pragma nowarn(1026) // warning elimination
MvRecomputeBuilder& operator=(const MvRecomputeBuilder& other);
-#pragma warn(1026) // warning elimination
public:
virtual RelExpr *buildRefreshTree();
@@ -310,9 +306,7 @@ public:
private:
// Copy Ctor and = operator are not implemented.
MavBuilder(const MavBuilder& other);
-#pragma nowarn(1026) // warning elimination
MavBuilder& operator=(const MavBuilder& other);
-#pragma warn(1026) // warning elimination
public:
enum GroupOpNumbers { GOP_INSERT = 1,
@@ -464,9 +458,7 @@ public:
private:
// Copy Ctor and = operator are not implemented.
MinMaxOptimizedMavBuilder(const MinMaxOptimizedMavBuilder& other);
-#pragma nowarn(1026) // warning elimination
MinMaxOptimizedMavBuilder& operator=(const MinMaxOptimizedMavBuilder& other);
-#pragma warn(1026) // warning elimination
protected:
virtual RelExpr *buildMinMaxRecomputationBlock() const;
@@ -493,9 +485,7 @@ public:
private:
// Copy Ctor and = operator are not implemented.
MultiDeltaMavBuilder(const MultiDeltaMavBuilder& other);
-#pragma nowarn(1026) // warning elimination
MultiDeltaMavBuilder& operator=(const MultiDeltaMavBuilder& other);
-#pragma warn(1026) // warning elimination
public:
@@ -545,9 +535,7 @@ public:
private:
// Copy Ctor and = operator are not implemented.
MvMultiTxnMavBuilder(const MvMultiTxnMavBuilder& other);
-#pragma nowarn(1026) // warning elimination
MvMultiTxnMavBuilder& operator=(const MvMultiTxnMavBuilder& other);
-#pragma warn(1026) // warning elimination
public:
@@ -626,9 +614,7 @@ public:
private:
// Copy Ctor and = operator are not implemented.
MultiTxnDEMavBuilder(const MultiTxnDEMavBuilder& other);
-#pragma nowarn(1026) // warning elimination
MultiTxnDEMavBuilder& operator=(const MultiTxnDEMavBuilder& other);
-#pragma warn(1026) // warning elimination
public:
@@ -709,9 +695,7 @@ public:
private:
// Copy Ctor and = operator are not implemented.
PipelinedMavBuilder(const PipelinedMavBuilder& other);
-#pragma nowarn(1026) // warning elimination
PipelinedMavBuilder& operator=(const PipelinedMavBuilder& other);
-#pragma warn(1026) // warning elimination
public:
virtual ~PipelinedMavBuilder() {}
@@ -747,9 +731,7 @@ public:
private:
// Copy Ctor and = operator are not implemented.
LogsInfo(const LogsInfo& other);
-#pragma nowarn(1026) // warning elimination
LogsInfo& operator=(const LogsInfo& other);
-#pragma warn(1026) // warning elimination
public:
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/NAClusterInfo.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/NAClusterInfo.cpp b/core/sql/optimizer/NAClusterInfo.cpp
index fa681ad..e066de6 100644
--- a/core/sql/optimizer/NAClusterInfo.cpp
+++ b/core/sql/optimizer/NAClusterInfo.cpp
@@ -366,7 +366,6 @@ NAClusterInfo::numOfSMPs()
return result;
} // NAClusterInfo::numOfSMPs()
-#pragma warn(1506) // warning elimination
// Returns total number of CPUs (including down CPUs)
Lng32 NAClusterInfo::getTotalNumberOfCPUs()
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/NAColumn.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/NAColumn.cpp b/core/sql/optimizer/NAColumn.cpp
index a7b0a68..38d8dde 100644
--- a/core/sql/optimizer/NAColumn.cpp
+++ b/core/sql/optimizer/NAColumn.cpp
@@ -151,7 +151,6 @@ const QualifiedName& NAColumn::getNotNullConstraintName() const
return isNotNullNondroppable_->getConstraintName();
}
-// warning elimination (removed "inline")
static NAString makeTableName(const NATable *table,
const TrafColumnsDesc *column_desc)
{
@@ -160,7 +159,6 @@ static NAString makeTableName(const NATable *table,
table->getTableName().getQualifiedNameAsAnsiString().data() : "");
}
-// warning elimination (removed "inline")
static NAString makeColumnName(const NATable *table,
const TrafColumnsDesc *column_desc)
{
@@ -652,9 +650,7 @@ void NAColumnArray::print(FILE* ofd, const char* indent, const char* title,
{
Space * space = (Space *)c;
char mybuf[1000];
-#pragma nowarn(1506) // warning elimination
BUMP_INDENT(indent);
-#pragma warn(1506) // warning elimination
for (CollIndex i = 0; i < entries(); i++)
{
snprintf(mybuf, sizeof(mybuf), "%s%s[%2d] =", NEW_INDENT, title, i);
@@ -696,19 +692,15 @@ NAColumnArray::~NAColumnArray()
}
-#pragma nowarn(1506) // warning elimination
void NAColumnArray::deepDelete()
{
-#pragma warning (disable : 4244) //warning elimination
unsigned short members = this->entries();
-#pragma warning (default : 4244) //warning elimination
for( unsigned short i=0;i<members;i++)
{
(*this)[i]->deepDelete();
delete (*this)[i];
}
}
-#pragma warn(1506) // warning elimination
void NAColumnArray::insertAt(CollIndex index, NAColumn * newColumn)
{
LIST(NAColumn *)::insertAt(index,newColumn);
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/NARoutine.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/NARoutine.cpp b/core/sql/optimizer/NARoutine.cpp
index f98dd6c..905e374 100644
--- a/core/sql/optimizer/NARoutine.cpp
+++ b/core/sql/optimizer/NARoutine.cpp
@@ -58,7 +58,6 @@
// -----------------------------------------------------------------------
// Copy a string. A null terminated buffer is returned.
// -----------------------------------------------------------------------
-#pragma nowarn(1506) // warning elimination
char *UDRCopyString ( const ComString &sourceString, CollHeap *heap )
{
char *string = new(heap)char [sourceString.length()+1];
@@ -68,7 +67,6 @@ char *UDRCopyString ( const ComString &sourceString, CollHeap *heap )
);
return string;
} // UDRCopyString
-#pragma warn(1506) // warning elimination
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/NARoutine.h
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/NARoutine.h b/core/sql/optimizer/NARoutine.h
index 6dce421..65aa473 100644
--- a/core/sql/optimizer/NARoutine.h
+++ b/core/sql/optimizer/NARoutine.h
@@ -87,7 +87,6 @@ public:
ULng32 hashKey(const NARoutineDBKey &);
-#pragma nowarn(1506) // warning elimination
class NARoutine : public NABasicObject
{
friend class NARoutineDB;
@@ -287,7 +286,6 @@ private:
PrivMgrUserPrivs *privInfo_;
};
-#pragma warn(1506) // warning elimination
//-----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/NATable.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/NATable.cpp b/core/sql/optimizer/NATable.cpp
index 1fcd1f2..8c417d1 100644
--- a/core/sql/optimizer/NATable.cpp
+++ b/core/sql/optimizer/NATable.cpp
@@ -239,7 +239,6 @@ void HistogramCache::invalidateCache()
// context heap to store it in the hash table.
//--------------------------------------------------------------------------
-#pragma nowarn(770) // warning elimination
void HistogramCache::getHistograms(NATable& table)
{
const QualifiedName& qualifiedName = table.getFullyQualifiedGuardianName();
@@ -333,7 +332,6 @@ void HistogramCache::getHistograms(NATable& table)
lastTouchTime_ = getCurrentTime();
} //1//
-#pragma warn(770) // warning elimination
//----------------------------------------------------------------------------
// HistogramCache::createColStatsList()
@@ -575,7 +573,6 @@ void HistogramCache::createColStatsList
//found in the cache. The columns whose statistics are required
//are passed in through colArray.
//------------------------------------------------------------------------
-#pragma nowarn(1506) // warning elimination
Int32 HistogramCache::getStatsListFromCache
( StatsList& list, //In \ Out
NAColumnArray& colArray, //In
@@ -673,7 +670,6 @@ Int32 HistogramCache::getStatsListFromCache
return columnsCovered;
}
-#pragma warn(1506) // warning elimination
//this method is used to put into the cache stats lists, that
//needed to be re-read or were not there in the cache
@@ -1816,7 +1812,6 @@ NABoolean checkColumnTypeForSupportability(const NAColumnArray & partColArray, c
// permissible values that the partitioning key columns can contain
// within a certain partition, for range-partitioned data.
// -----------------------------------------------------------------------
-#pragma nowarn(1506) // warning elimination
static RangePartitionBoundaries * createRangePartitionBoundaries
(TrafDesc * part_desc_list,
Lng32 numberOfPartitions,
@@ -1956,7 +1951,6 @@ static RangePartitionBoundaries * createRangePartitionBoundaries
return partBounds;
} // static createRangePartitionBoundaries()
-#pragma warn(1506) // warning elimination
// -----------------------------------------------------------------------
// createRangePartitioningFunction()
@@ -2216,7 +2210,6 @@ createHash2PartitioningFunctionForHBase(TrafDesc* desc,
// a histogram's boundary values.
//
// -----------------------------------------------------------------------
-#pragma nowarn(1506) // warning elimination
RangePartitionBoundaries * createRangePartitionBoundariesFromStats
(const IndexDesc* idesc,
HistogramSharedPtr& hist,
@@ -2377,7 +2370,6 @@ RangePartitionBoundaries * createRangePartitionBoundariesFromStats
return partBounds;
} // createRangePartitionBoundariesFromStats()
-#pragma warn(1506) // warning elimination
static
PartitioningFunction*
@@ -2665,7 +2657,6 @@ static PartitioningFunction * createHivePartitioningFunction
// This method is used for creating a node map for all DP2 partitions of
// associated with this table or index.
// -----------------------------------------------------------------------
-#pragma nowarn(1506) // warning elimination
static void createNodeMap (TrafDesc* part_desc_list,
NodeMap* nodeMap,
NAMemory* heap,
@@ -2771,9 +2762,7 @@ static void createNodeMap (TrafDesc* part_desc_list,
}
} // static createNodeMap()
-#pragma warn(1506) // warning elimination
-#pragma nowarn(1506) // warning elimination
static void createNodeMap (hive_tbl_desc* hvt_desc,
NodeMap* nodeMap,
NAMemory* heap,
@@ -2820,7 +2809,6 @@ static void createNodeMap (hive_tbl_desc* hvt_desc,
// No fake volumn assignment because Hive' partitions are not hash
// based, there is no balance of data among all partitions.
} // static createNodeMap()
-#pragma warn(1506) // warning elimination
//-------------------------------------------------------------------------
// This function checks if a table/index or any of its partitions are
@@ -2829,13 +2817,11 @@ static void createNodeMap (hive_tbl_desc* hvt_desc,
// - approx 31000 for messages to remote nodes, and 56000 for messages
// on the local node.
//-------------------------------------------------------------------------
-#pragma nowarn(262) // warning elimination
static NABoolean checkRemote(TrafDesc* part_desc_list,
char * tableName)
{
return TRUE;
}
-#pragma warn(262) // warning elimination
static NAString makeTableName(const NATable *table,
@@ -2846,7 +2832,6 @@ static NAString makeTableName(const NATable *table,
table->getTableName().getQualifiedNameAsAnsiString().data() : "");
}
-// warning elimination (removed "inline")
static NAString makeColumnName(const NATable *table,
const TrafColumnsDesc *column_desc)
{
@@ -3311,7 +3296,6 @@ NABoolean createNAType(TrafColumnsDesc *column_desc /*IN*/,
// Method for inserting new NAColumn entries in NATable::colArray_,
// one for each column_desc in the list supplied as input.
// -----------------------------------------------------------------------
-#pragma nowarn(1506) // warning elimination
NABoolean createNAColumns(TrafDesc *column_desc_list /*IN*/,
NATable *table /*IN*/,
NAColumnArray &colArray /*OUT*/,
@@ -3485,7 +3469,6 @@ NABoolean createNAColumns(TrafDesc *column_desc_list /*IN*/,
return FALSE; // no error
} // createNAColumns()
-#pragma warn(1506) // warning elimination
NAType* getSQColTypeForHive(const char* hiveType, NAMemory* heap)
{
@@ -3553,7 +3536,6 @@ NABoolean createNAColumns(struct hive_column_desc* hcolumn /*IN*/,
return FALSE; // no error
} // createNAColumns()
-#pragma warn(1506) // warning elimination
@@ -3625,7 +3607,6 @@ void processDuplicateNames(NAHashDictionaryIterator<NAString, Int32> &Iter,
// - inserting new NAFileSet entries in NATable::vertParts_
// one for each vertical partition in the list supplied as input.
// -----------------------------------------------------------------------
-#pragma nowarn(1506) // warning elimination
static
NABoolean createNAFileSets(TrafDesc * table_desc /*IN*/,
const NATable * table /*IN*/,
@@ -4290,7 +4271,6 @@ NABoolean createNAFileSets(TrafDesc * table_desc /*IN*/,
// logic related to indexes hiding
return FALSE;
} // static createNAFileSets()
- #pragma warn(1506) // warning elimination
// for Hive tables
@@ -4589,7 +4569,6 @@ NABoolean createNAFileSets(TrafDesc * table_desc /*IN*/,
return FALSE;
} // static createNAFileSets()
- #pragma warn(1506) // warning elimination
// -----------------------------------------------------------------------
// Mark columns named in PRIMARY KEY constraint (these will be different
@@ -4901,7 +4880,6 @@ NABoolean NATable::fetchObjectUIDForNativeTable(const CorrName& corrName,
const Lng32 initHeapSize = 32 * 1024; // ## 32K: tune this someday!
- #pragma nowarn(770) // warning elimination
NATable::NATable(BindWA *bindWA,
const CorrName& corrName,
NAMemory *heap,
@@ -5546,21 +5524,15 @@ NABoolean NATable::fetchObjectUIDForNativeTable(const CorrName& corrName,
//get volume/catalog name
//skip ".$"
catStr=&nodeName[nodeNameLen+2];
-#pragma nowarn(1506) // warning elimination
catStrLen = catalogName.length() - (nodeNameLen+2);
-#pragma warn(1506) // warning elimination
//get subvolume/schema name
schemaStr = (char *) schemaName.data();
-#pragma nowarn(1506) // warning elimination
schemaStrLen = schemaName.length();
-#pragma warn(1506) // warning elimination
//get file name
fileStr = (char *) fileName.data();
-#pragma nowarn(1506) // warning elimination
fileStrLen = fileName.length();
-#pragma warn(1506) // warning elimination
//figure out the node number for the node
//which has the primary partition.
@@ -5641,7 +5613,6 @@ NABoolean NATable::fetchObjectUIDForNativeTable(const CorrName& corrName,
initialSize_ = heap_->getAllocSize();
MonitorMemoryUsage_Exit((char*)mmPhase.data(), heap_, NULL, TRUE);
} // NATable()
-#pragma warn(770) // warning elimination
// Constructor for a Hive table
@@ -5934,7 +5905,6 @@ NATable::NATable(BindWA *bindWA,
initialSize_ = heap_->getAllocSize();
MonitorMemoryUsage_Exit((char*)mmPhase.data(), heap_, NULL, TRUE);
} // NATable()
-#pragma warn(770) // warning elimination
NABoolean NATable::doesMissingStatsWarningExist(CollIndexSet & colsSet) const
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/NATable.h
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/NATable.h b/core/sql/optimizer/NATable.h
index edf338f..4feece9 100644
--- a/core/sql/optimizer/NATable.h
+++ b/core/sql/optimizer/NATable.h
@@ -373,7 +373,6 @@ struct NATableEntryDetails {
//
// ***********************************************************************
-#pragma nowarn(1506) // warning elimination
class NATable : public NABasicObject
{
friend class NATableDB;
@@ -1236,7 +1235,6 @@ private:
NAList<NAString> allColFams_;
}; // class NATable
-#pragma warn(1506) // warning elimination
struct NATableCacheStats {
char contextType[8];
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/NodeMap.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/NodeMap.cpp b/core/sql/optimizer/NodeMap.cpp
index 86913dc..451e653 100644
--- a/core/sql/optimizer/NodeMap.cpp
+++ b/core/sql/optimizer/NodeMap.cpp
@@ -111,7 +111,6 @@ volumeFound(const DP2VolumeNamesContainer& container, const char& volumeName)
// none
//
//==============================================================================
-#pragma nowarn(1506) // warning elimination
NodeMapEntry::NodeMapEntry(char* fullName, char* givenName, CollHeap* heap,
Int32 tableIdent, NABoolean noService)
: heap_(heap),
@@ -121,9 +120,7 @@ NodeMapEntry::NodeMapEntry(char* fullName, char* givenName, CollHeap* heap,
Int32 error;
CMPASSERT(fullName);
-#pragma nowarn(1506) // warning elimination
short nameBufferSize = strlen(fullName) + 1;
-#pragma warn(1506) // warning elimination
char* name = new (heap_) char[nameBufferSize];
short length=4;
@@ -183,7 +180,6 @@ NodeMapEntry::NodeMapEntry(char* fullName, char* givenName, CollHeap* heap,
}
} // NodeMapEntry constructor
-#pragma warn(1506) // warning elimination
//<pb>
//==============================================================================
@@ -447,9 +443,7 @@ NodeMapEntry::getText() const
void
NodeMapEntry::print(FILE* ofd, const char* indent, const char* title) const
{
-#pragma nowarn(1506) // warning elimination
BUMP_INDENT(indent);
-#pragma warn(1506) // warning elimination
fprintf(ofd,"%s %s (%-8s %s %2d, %s %2d, %s %2d)\n",
NEW_INDENT,
@@ -1381,7 +1375,6 @@ NodeMap::getClusterNumber(const CollIndex position) const
// Number of active partitions for this node map.
//
//==============================================================================
-#pragma nowarn(1506) // warning elimination
CollIndex
NodeMap::getNumActivePartitions()
{
@@ -1461,7 +1454,6 @@ NodeMap::getEstNumActivePartitionsAtRuntime()
// Number of DP2 volumes for this node map.
//
//==============================================================================
-#pragma nowarn(1506) // warning elimination
CollIndex
NodeMap::getNumOfDP2Volumes()
{
@@ -1480,10 +1472,8 @@ NodeMap::getNumOfDP2Volumes()
//--------------------------------------------------------------
if (CmpCommon::getDefault(FAKE_VOLUME_ASSIGNMENTS) == DF_ON)
{
-#pragma warning (disable : 4244) //warning elimination
numOfDP2Volumes_ = MINOF(getNumEntries(),
CmpCommon::getDefaultNumeric(FAKE_VOLUME_NUM_VOLUMES));
-#pragma warning (default : 4244) //warning elimination
return numOfDP2Volumes_;
}
@@ -1518,21 +1508,17 @@ NodeMap::getNumOfDP2Volumes()
return numOfDP2Volumes_;
} // NodeMap::getNumOfDP2Volumes()
-#pragma warn(1506) // warning elimination
// COLOCATION CHECKING: test whether the locations of partitions match
-#pragma nowarn(1506) // warning elimination
NABoolean NodeMap::isCoLocated(const NodeMap* rMap) const
{
const NodeMapEntry *n_entry = NULL;
const NodeMapEntry *r_entry = NULL;
Int32 numEntries;
-#pragma warning (disable : 4018) //warning elimination
if ((numEntries=getNumEntries()) != rMap->getNumEntries()) return FALSE;
for (CollIndex i=0; i<numEntries; i++ ) {
-#pragma warning (default : 4018) //warning elimination
n_entry = getNodeMapEntry(i);
r_entry = rMap->getNodeMapEntry(i);
@@ -1557,7 +1543,6 @@ NABoolean NodeMap::isCoLocated(const NodeMap* rMap) const
}
return TRUE;
}
-#pragma warn(1506) // warning elimination
//<pb>
//==============================================================================
@@ -1575,7 +1560,6 @@ NABoolean NodeMap::isCoLocated(const NodeMap* rMap) const
// partitions.
//
//==============================================================================
-#pragma nowarn(1506) // warning elimination
CollIndex
NodeMap::getNumActiveDP2Volumes()
{
@@ -1595,10 +1579,8 @@ NodeMap::getNumActiveDP2Volumes()
//---------------------------------------------------
if (CmpCommon::getDefault(FAKE_VOLUME_ASSIGNMENTS) == DF_ON)
{
-#pragma warning (disable : 4244) //warning elimination
numOfActiveDP2Volumes_ = MINOF(getNumActivePartitions(),
CmpCommon::getDefaultNumeric(FAKE_VOLUME_NUM_VOLUMES));
-#pragma warning (default : 4244) //warning elimination
return numOfActiveDP2Volumes_;
}
@@ -1643,7 +1625,6 @@ NodeMap::getNumActiveDP2Volumes()
return numOfActiveDP2Volumes_;
} // NodeMap::getNumActiveDP2Volumes()
-#pragma warn(1506) // warning elimination
//<pb>
//==============================================================================
// Determine if a contiguous set of entries includes more than one cluster,
@@ -1764,7 +1745,6 @@ NodeMap::containsPartition(const char *fullName) const
// none
//
//==============================================================================
-#pragma nowarn(270) // warning elimination
void
NodeMap::setPartitionState(const CollIndex& position,
const NodeMapEntry::PartitionState& newState)
@@ -1793,7 +1773,6 @@ NodeMap::setPartitionState(const CollIndex& position,
resetCachedValues();
} // NodeMap::setPartitionState()
-#pragma warn(270) // warning elimination
//<pb>
//==============================================================================
// Change node number of a node map entry at a specified position within the
@@ -1810,7 +1789,6 @@ NodeMap::setPartitionState(const CollIndex& position,
// none
//
//==============================================================================
-#pragma nowarn(270) // warning elimination
void
NodeMap::setNodeNumber(const CollIndex position, const Lng32 nodeNumber)
{
@@ -1826,7 +1804,6 @@ NodeMap::setNodeNumber(const CollIndex position, const Lng32 nodeNumber)
map_[position]->setNodeNumber(nodeNumber);
} // NodeMap::setNodeNumber()
-#pragma warn(270) // warning elimination
//==============================================================================
// Change cluster number of a node map entry at a specified position within the
@@ -1843,7 +1820,6 @@ NodeMap::setNodeNumber(const CollIndex position, const Lng32 nodeNumber)
// none
//
//==============================================================================
-#pragma nowarn(270) // warning elimination
void
NodeMap::setClusterNumber(const CollIndex position, const Lng32 clusterNumber)
{
@@ -1857,7 +1833,6 @@ NodeMap::setClusterNumber(const CollIndex position, const Lng32 clusterNumber)
map_[position]->setClusterNumber(clusterNumber);
}
-#pragma warn(270) // warning elimination
//<pb>
//<pb>
@@ -1894,9 +1869,7 @@ short NodeMap::codeGen(const PartitioningFunction *partFunc,
char clusterNameTemp[256];
NABoolean result;
-#pragma warning (disable : 4018) //warning elimination
assert(numESPs == compNodeMap->getNumEntries());
-#pragma warning (default : 4018) //warning elimination
assert(IPC_CPU_DONT_CARE == ANY_NODE);
exeNodeMap->setMapArray(numESPs, mapEntries);
@@ -2397,7 +2370,6 @@ NodeMap::display() const
// none
//
//==============================================================================
-#pragma nowarn(1506) // warning elimination
void
NodeMap::print(FILE* ofd, const char* indent, const char* title) const
{
@@ -2482,7 +2454,6 @@ NodeMap::print(FILE* ofd, const char* indent, const char* title) const
);
} // NodeMap::print()
-#pragma warn(1506) // warning elimination
//=======================================================
// Generate a string representation of this NodeMap.
@@ -2639,9 +2610,7 @@ Int32 NodeMap::getNumberOfUniqueNodes() const
void
HiveNodeMapEntry::print(FILE* ofd, const char* indent, const char* title) const
{
-#pragma nowarn(1506) // warning elimination
BUMP_INDENT(indent);
-#pragma warn(1506) // warning elimination
for (CollIndex i=0; i<scanInfo_.entries(); i++) {
fprintf(ofd,"%s %s [offs=%12ld, span=%12ld, %s file=%s]\n",
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/NormItemExpr.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/NormItemExpr.cpp b/core/sql/optimizer/NormItemExpr.cpp
index 834bcf0..abd213a 100644
--- a/core/sql/optimizer/NormItemExpr.cpp
+++ b/core/sql/optimizer/NormItemExpr.cpp
@@ -61,7 +61,6 @@ DBGDECL( static NAString unp; )
// -----------------------------------------------------------------------
// -----------------------------------------------------------------------
-// warning elimination (removed "inline")
static NABoolean canBeSQLUnknown(const ItemExpr *ie,
NABoolean typeMustBeSQLBoolean = TRUE)
{
@@ -734,7 +733,6 @@ ItemExpr * Between::transformMultiValuePredicate(
return tfm;
}
-#pragma nowarn(1506) // warning elimination
void Between::transformNode(NormWA & normWARef,
ExprValueId & locationOfPointerToMe,
ExprGroupId & introduceSemiJoinHere,
@@ -780,7 +778,6 @@ void Between::transformNode(NormWA & normWARef,
setReplacementExpr(locationOfPointerToMe);
} // Between::transformNode()
-#pragma warn(1506) // warning elimination
ItemExpr * Between::transformSubtreeOfNot(NormWA & normWARef,
OperatorTypeEnum falseOrNot)
@@ -1405,7 +1402,6 @@ ItemExpr * BiLogic::transformMultiValuePredicate(
return tfm;
}
-#pragma nowarn(1506) // warning elimination
void BiLogic::transformNode(NormWA & normWARef,
ExprValueId & locationOfPointerToMe,
ExprGroupId & introduceSemiJoinHere,
@@ -1478,7 +1474,6 @@ void BiLogic::transformNode(NormWA & normWARef,
setReplacementExpr(locationOfPointerToMe);
} // BiLogic::transformNode()
-#pragma warn(1506) // warning elimination
// -----------------------------------------------------------------------
// Apply De-Morgan's Laws. Distribute a NOT over each subtree.
@@ -1904,9 +1899,7 @@ static ItemExpr * transformMultiValueComparison(BiRelat *thisCmp,
// For exampl OneRow aggregate
}
-#pragma nowarn(1506) // warning elimination
Int32 i = lhs.entries() - 1;
-#pragma warn(1506) // warning elimination
// As an extension to Ansi, we allow predicates like
// select x,y from xy where((select a,b from t),x) = (y,(select m,n from s))
@@ -1925,9 +1918,7 @@ static ItemExpr * transformMultiValueComparison(BiRelat *thisCmp,
rr = ((Subquery *)rhs[i])->getSubquery()->getDegree();
if (ll != rr) return NULL;
}
-#pragma nowarn(1506) // warning elimination
i = lhs.entries() - 1; // reset for loops following
-#pragma warn(1506) // warning elimination
}
ItemExpr * tfm;
@@ -2107,7 +2098,6 @@ ItemExpr * BiRelat::transformMultiValuePredicate(
return tfm;
} // BiRelat::transformMultiValuePredicate()
-#pragma nowarn(1506) // warning elimination
void BiRelat::transformNode(NormWA & normWARef,
ExprValueId & locationOfPointerToMe,
ExprGroupId & introduceSemiJoinHere,
@@ -2476,7 +2466,6 @@ void BiRelat::transformNode(NormWA & normWARef,
setReplacementExpr(locationOfPointerToMe);
} // BiRelat::transformNode()
-#pragma warn(1506) // warning elimination
// -----------------------------------------------------------------------
// predicateEliminatesNullAugmentedRows()
@@ -3950,7 +3939,6 @@ ItemExpr * UnLogicMayBeAnEliminableTruthTest(ItemExpr *unlogic, NABoolean aggOK)
return NULL;
} // UnLogicMayBeAnEliminableTruthTest()
-#pragma nowarn(1506) // warning elimination
//
// transformNode2() - a helper routine for UnLogic::transformNode()
@@ -4123,7 +4111,6 @@ void UnLogic::transformNode(NormWA & normWARef,
setReplacementExpr(locationOfPointerToMe);
} // UnLogic::transformNode()
-#pragma warn(1506) // warning elimination
// -----------------------------------------------------------------------
// A method for transforming a subtree rooted in a NOT.
@@ -5531,7 +5518,6 @@ ItemExpr *ItmSeqOlapFunction::transformOlapFunction(CollHeap *heap)
///---------------
-#pragma nowarn(1506) // warning elimination
void ItmSeqRowsSince::transformNode(NormWA & normWARef,
ExprValueId & locationOfPointerToMe,
ExprGroupId & introduceSemiJoinHere,
@@ -5569,7 +5555,6 @@ void ItmSeqRowsSince::transformNode(NormWA & normWARef,
BuiltinFunction::transformNode(normWARef, locationOfPointerToMe,
introduceSemiJoinHere, externalInputs);
} // ItmSeqRowsSince::transformNode()
-#pragma warn(1506) // warning elimination
// ***********************************************************************
// $$$$ ItmSeqMovingFunction
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/NormRelExpr.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/NormRelExpr.cpp b/core/sql/optimizer/NormRelExpr.cpp
index 5a33084..bf8d687 100644
--- a/core/sql/optimizer/NormRelExpr.cpp
+++ b/core/sql/optimizer/NormRelExpr.cpp
@@ -8671,7 +8671,6 @@ void TupleList::rewriteNode(NormWA & normWARef)
// but here we need to tranform each member of each ValueIdUnion of
// transUnionVals().
//
-#pragma nowarn(1506) // warning elimination
void Transpose::transformNode(NormWA &normWARef,
ExprGroupId &locationOfPointerToMe)
{
@@ -8769,7 +8768,6 @@ void Transpose::transformNode(NormWA &normWARef,
transformSelectPred(normWARef, locationOfPointerToMe);
} // Transpose::transformNode()
-#pragma warn(1506) // warning elimination
// Transpose::rewriteNode() ---------------------------------------------
// rewriteNode() is the virtual function that computes
@@ -8785,7 +8783,6 @@ void Transpose::transformNode(NormWA &normWARef,
// but here we need to normalize each member of each ValueIdUnion of
// transUnionVals().
//
-#pragma nowarn(1506) // warning elimination
void Transpose::rewriteNode(NormWA & normWARef)
{
// Rewrite the expressions of the child node.
@@ -8830,7 +8827,6 @@ void Transpose::rewriteNode(NormWA & normWARef)
//
getGroupAttr()->normalizeInputsAndOutputs(normWARef);
} // Transpose::rewriteNode()
-#pragma warn(1506) // warning elimination
// Transpose::recomputeOuterReferences() --------------------------------
// This method is used by the normalizer for recomputing the
@@ -8840,7 +8836,6 @@ void Transpose::rewriteNode(NormWA & normWARef)
//
// Side Effects: sets the characteristicInputs of the groupAttr.
//
-#pragma nowarn(1506) // warning elimination
void Transpose::recomputeOuterReferences()
{
// This is virtual method on RelExpr.
@@ -8897,7 +8892,6 @@ void Transpose::recomputeOuterReferences()
//
getGroupAttr()->setCharacteristicInputs(outerRefs);
} // Transpose::recomputeOuterReferences()
-#pragma warn(1506) // warning elimination
// ***********************************************************************
// Member functions for class Pack
@@ -10303,9 +10297,7 @@ CANodeId CqsWA::findCANodeId(const NAString &tableName)
//if you are here, invoke error handling
AssertException("", __FILE__, __LINE__).throwException();
-#pragma nowarn(203) // warning elimination
return CANodeId(); // keep VisualC++ happy
-#pragma warn(203) // warning elimination
} // CqsWA::findCANodeId()
@@ -10597,9 +10589,7 @@ RelExpr * CqsWA::checkAndProcessGroupByJBBC( RelExpr *relExpr,
}
// error
-#pragma nowarn(203) // warning elimination
return NULL; // keep VisualC++ happy
-#pragma warn(203) // warning elimination
}// CqsWA::checkAndProcessGroupByJBBC()
@@ -10656,9 +10646,7 @@ RelExpr *ScanForceWildCard::generateMatchingExpr(CANodeIdSet &lChildSet,
else
{
AssertException("", __FILE__, __LINE__).throwException();
-#pragma nowarn(203) // warning elimination
return NULL; // keep VisualC++ happy
-#pragma warn(203) // warning elimination
}
} // ScanForceWildCard::generateMatchingExpr()
@@ -10666,9 +10654,7 @@ RelExpr * RelExpr::generateLogicalExpr(CANodeIdSet &lChildSet,
CANodeIdSet &rChildSet)
{
AssertException("", __FILE__, __LINE__).throwException();
-#pragma nowarn(203) // warning elimination
return NULL; // keep VisualC++ happy
-#pragma warn(203) // warning elimination
}
//**************************************************************
@@ -10697,9 +10683,7 @@ RelExpr * GroupByAgg::generateLogicalExpr(CANodeIdSet &lChildSet,
{
AssertException("", __FILE__, __LINE__).throwException();
-#pragma nowarn(203) // warning elimination
return NULL; // keep VisualC++ happy
-#pragma warn(203) // warning elimination
}
NABoolean RelRoot::forceCQS(RelExpr *cqsExpr)
@@ -10921,9 +10905,7 @@ NABoolean CqsWA::isMPTable(const NAString &tableName)
else
{
AssertException("", __FILE__, __LINE__).throwException();
-#pragma nowarn(203) // warning elimination
return FALSE; // keep VisualC++ happy
-#pragma warn(203) // warning elimination
}
}
else
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/ObjectNames.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/ObjectNames.cpp b/core/sql/optimizer/ObjectNames.cpp
index e36b34a..f7bf1c9 100644
--- a/core/sql/optimizer/ObjectNames.cpp
+++ b/core/sql/optimizer/ObjectNames.cpp
@@ -543,13 +543,11 @@ QualifiedName::QualifiedName(const NAString &ansiString,
CmpContext *cmpContext = bindWA ? bindWA->currentCmpContext() : NULL;
Parser parser(cmpContext);
NAString ns("TABLE " + ansiString + ";", CmpCommon::statementHeap());
-#pragma nowarn(1506) // warning elimination
// save the current parserflags setting
ULng32 savedParserFlags = Get_SqlParser_Flags (0xFFFFFFFF);
StmtQuery *stmt = (StmtQuery *)parser.parseDML(ns, ns.length(), GetAnsiNameCharSet());
// Restore parser flags settings
Set_SqlParser_Flags (savedParserFlags);
-#pragma warn(1506) // warning elimination
if (stmt) {
CMPASSERT(stmt->getOperatorType() == STM_QUERY);
*this = stmt->getQueryExpression()->getScanNode()->getTableName().getQualifiedNameObj();
@@ -811,9 +809,7 @@ void CorrName::applyPrototype(BindWA *bindWA)
return;
}
// upcase value returned by getenv
-#pragma nowarn(1506) // warning elimination
Int32 len = strlen(value);
-#pragma warn(1506) // warning elimination
char * ucValue = new (bindWA->wHeap()) char[len+1];
str_cpy_convert(ucValue, value, len, -1/*upshift*/);
ucValue[len] = 0;
@@ -836,13 +832,11 @@ void CorrName::applyPrototype(BindWA *bindWA)
Parser parser(bindWA->currentCmpContext());
NAString ns("TABLE " + proto->getPrototypeValue() + ";",
CmpCommon::statementHeap());
-#pragma nowarn(1506) // warning elimination
// save the current parserflags setting
ULng32 savedParserFlags = Get_SqlParser_Flags (0xFFFFFFFF);
StmtQuery *stmt = (StmtQuery *)parser.parseDML(ns, ns.length(), GetAnsiNameCharSet());
// Restore parser flags settings
Set_SqlParser_Flags (savedParserFlags);
-#pragma warn(1506) // warning elimination
if (stmt) {
CMPASSERT(stmt->getOperatorType() == STM_QUERY);
CorrName &protoCorrName =
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/OptItemExpr.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/OptItemExpr.cpp b/core/sql/optimizer/OptItemExpr.cpp
index 31aa50c..9741c10 100644
--- a/core/sql/optimizer/OptItemExpr.cpp
+++ b/core/sql/optimizer/OptItemExpr.cpp
@@ -718,9 +718,7 @@ NABoolean UnLogic::synthSupportedOp() const
return FALSE;
}
-#pragma nowarn(203) // warning elimination
return TRUE;
-#pragma warn(203) // warning elimination
}
NABoolean UnLogic::applyDefaultPred(ColStatDescList & histograms,
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/OptLogRelExpr.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/OptLogRelExpr.cpp b/core/sql/optimizer/OptLogRelExpr.cpp
index a3edc37..fb587d5 100644
--- a/core/sql/optimizer/OptLogRelExpr.cpp
+++ b/core/sql/optimizer/OptLogRelExpr.cpp
@@ -3419,7 +3419,6 @@ Union::synthLogProp(NormWA * normWAPtr)
// -----------------------------------------------------------------------
// member functions for class GroupByAgg
// -----------------------------------------------------------------------
-#pragma nowarn(262) // warning elimination
void
GroupByAgg::synthEstLogProp(const EstLogPropSharedPtr& inputEstLogProp)
{
@@ -4423,7 +4422,6 @@ GroupByAgg::synthEstLogProp(const EstLogPropSharedPtr& inputEstLogProp)
myEstProps /* final OLP - after applying grouping and HAVING preds */,
intermedEstProps /* intermediate OLP - after grouping */);
} // GroupByAgg::synthEstLogProp
-#pragma warn(262) // warning elimination
void GroupByAgg::handleIndirectDepInGroupingcols(ValueIdSet& workGroup,
ValueIdSet& interestingColSet,
@@ -5703,7 +5701,6 @@ ExplainFunc::synthLogProp(NormWA * normWAPtr)
// UEC of C4 = 2
//
-#pragma nowarn(770) // warning elimination
void
Transpose::synthEstLogProp(const EstLogPropSharedPtr& inputEstLogProp)
{
@@ -6060,7 +6057,6 @@ Transpose::synthEstLogProp(const EstLogPropSharedPtr& inputEstLogProp)
getGroupAttr()->addInputOutputLogProp(inputEstLogProp, myEstProps);
} // Transpose::synthEstLogProp
-#pragma warn(770) // warning elimination
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/OptPhysRelExpr.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/OptPhysRelExpr.cpp b/core/sql/optimizer/OptPhysRelExpr.cpp
index 7156322..323fd21 100644
--- a/core/sql/optimizer/OptPhysRelExpr.cpp
+++ b/core/sql/optimizer/OptPhysRelExpr.cpp
@@ -7074,7 +7074,6 @@ NABoolean MergeJoin::parentAndChildPartReqsCompatible(
// are disjoint, then the requirement must allow a single
// partition part func, because this will be the only way
// to satisfy both the requirement and the join cols.
-#pragma nowarn(1506) // warning elimination
if (joinLeftPartKey.isEmpty() AND
joinRightPartKey.isEmpty() AND
(reqPartCount != ANY_NUMBER_OF_PARTITIONS) AND
@@ -7084,7 +7083,6 @@ NABoolean MergeJoin::parentAndChildPartReqsCompatible(
EXACTLY_ONE_PARTITION)
)
return FALSE;
-#pragma warn(1506) // warning elimination
}
} // end if fuzzy requirement
} // end if there was a partitioning requirement for the join
@@ -11582,7 +11580,6 @@ NABoolean GroupByAgg::rppAreCompatibleWithOperator
{
// Scalar aggregates cannot execute in parallel, so the
// requirement must allow a single partition part func.
-#pragma nowarn(1506) // warning elimination
if ((reqPartCount != ANY_NUMBER_OF_PARTITIONS) AND
((reqPartCount -
(reqPartCount * partReq->castToRequireApproximatelyNPartitions()->
@@ -11590,7 +11587,6 @@ NABoolean GroupByAgg::rppAreCompatibleWithOperator
EXACTLY_ONE_PARTITION)
)
return FALSE;
-#pragma warn(1506) // warning elimination
}
else if (partReq->getPartitioningKey().entries() > 0)
{
@@ -11600,7 +11596,6 @@ NABoolean GroupByAgg::rppAreCompatibleWithOperator
// are disjoint, then the requirement must allow a single
// partition part func, because this will be the only way
// to satisfy both the requirement and the GB cols.
-#pragma nowarn(1506) // warning elimination
if (myPartKey.isEmpty() AND
(reqPartCount != ANY_NUMBER_OF_PARTITIONS) AND
((reqPartCount -
@@ -11608,7 +11603,6 @@ NABoolean GroupByAgg::rppAreCompatibleWithOperator
getAllowedDeviation())) >
EXACTLY_ONE_PARTITION))
return FALSE;
-#pragma warn(1506) // warning elimination
}
} // end if fuzzy requirement
} // end if there was a partitioning requirement for the GB
@@ -13057,9 +13051,7 @@ computeDP2CostDataThatDependsOnSPP(
// Assume at least one DP2 volume even if node map indicates otherwise.
Lng32 numOfDP2Volumes =
-#pragma nowarn(1506) // warning elimination
MIN_ONE(((NodeMap *)(physicalPartFunc.getNodeMap()))->getNumOfDP2Volumes());
-#pragma warn(1506) // warning elimination
// The number of cpus executing DP2's cannot be more than the number
// of active partitions :
@@ -13368,9 +13360,7 @@ computeDP2CostDataThatDependsOnSPP(
// the synthesis for AP:
Lng32 affectedPartitions =
-#pragma nowarn(1506) // warning elimination
newNodeMapPtr->getNumActivePartitions();
-#pragma warn(1506) // warning elimination
// Now estimate the RC:
@@ -15828,7 +15818,6 @@ Tuple::costMethod() const
// should change as well.
//
//==============================================================================
-#pragma nowarn(262) // warning elimination
PhysicalProperty*
Tuple::synthPhysicalProperty(const Context* myContext,
const Lng32 planNumber,
@@ -16067,7 +16056,6 @@ Tuple::synthPhysicalProperty(const Context* myContext,
return sppForMe;
} // Tuple::synthPhysicalProperty()
-#pragma warn(262) // warning elimination
//<pb>
//==============================================================================
@@ -17163,7 +17151,6 @@ PhysicalIsolatedScalarUDF::costMethod() const
// should change as well.
//
//==============================================================================
-#pragma nowarn(262) // warning elimination
PhysicalProperty*
IsolatedScalarUDF::synthPhysicalProperty(const Context* myContext,
const Lng32 planNumber,
@@ -17341,7 +17328,6 @@ IsolatedScalarUDF::synthPhysicalProperty(const Context* myContext,
return sppForMe;
} // IsolatedScalarUDF::synthPhysicalProperty()
-#pragma warn(262) // warning elimination
PhysicalProperty *CallSP::synthPhysicalProperty(const Context* context,
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/OptTrigger.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/OptTrigger.cpp b/core/sql/optimizer/OptTrigger.cpp
index a00a781..b7341ab 100644
--- a/core/sql/optimizer/OptTrigger.cpp
+++ b/core/sql/optimizer/OptTrigger.cpp
@@ -874,9 +874,7 @@ void
OptTriggersBackbone::reorder()
{
CollIndex idx;
-#pragma nowarn(1506) // warning elimination
Int32 triggerArraySize = triggerList_->entries();
-#pragma warn(1506) // warning elimination
// optTriggerPtrArray - array of pointers to OptTrigger , used for qsort
OptTriggerPtr *optTriggerPtrArray = new(CmpCommon::statementHeap())
OptTriggerPtr[triggerArraySize];
@@ -1237,16 +1235,11 @@ OptTriggersBackbone::toTree()
void OptTriggersBackbone::forceCardinalityAsIud(RelExpr *expr) const
{
-#pragma nowarn(1506) // warning elimination
-#pragma warning (disable : 4244) //warning elimination
-
CostScalar card =
getIudDrivingNode()->getGroupAttr()->getResultCardinalityForEmptyInput();
expr->getInliningInfo().BuildForceCardinalityInfo(1.0, // factor ignored
card.getValue(),
CmpCommon::statementHeap());
-#pragma warning (default : 4244) //warning elimination
-#pragma warn(1506) // warning elimination
}
//-----------------------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/PackedColDesc.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/PackedColDesc.cpp b/core/sql/optimizer/PackedColDesc.cpp
index 52def3e..4fd2470 100644
--- a/core/sql/optimizer/PackedColDesc.cpp
+++ b/core/sql/optimizer/PackedColDesc.cpp
@@ -115,9 +115,7 @@
Lng32
PackedColDesc::determinePackedColSize(Lng32 packingFactor) const
{
-#pragma nowarn(1026) // warning elimination
const Int32 BitsPerByte = 8;
-#pragma warn(1026) // warning elimination
const NAType *colType = getType();
@@ -185,9 +183,7 @@ PackedColDesc::generatePackingInfo(Lng32 packingFactor)
CMPASSERT(packingFactor > 1);
-#pragma nowarn(1026) // warning elimination
const Int32 BitsPerByte = 8;
-#pragma warn(1026) // warning elimination
const NAType *colType = getType();
@@ -232,9 +228,7 @@ Lng32
PackedAPDesc::determinePackingFactor(Lng32 maxPackedRecLen) const
{
-#pragma nowarn(1026) // warning elimination
const Int32 BitsPerByte = 8;
-#pragma warn(1026) // warning elimination
PackedColDescList apCols = getAPColumns();
@@ -300,12 +294,10 @@ PackedAPDesc::determinePackingFactor(Lng32 maxPackedRecLen) const
// The keySizeinBytes is for the SYSKEY (one per AP).
// The (SQL_INT_SIZE * numUserColumns) is for the NUM_ROWS fields.
//
-#pragma nowarn(1506) // warning elimination
Lng32 packingFactor =
((maxPackedRecLen - keySizeInBytes - (SQL_INT_SIZE * numUserColumns))
* BitsPerByte) /
(numNullFlags + dataSizeInBits);
-#pragma warn(1506) // warning elimination
return packingFactor;
}
@@ -489,15 +481,11 @@ PackedTableDesc::generatePackingInfo()
// The maximum size of any packed AP (which could have more than
// one column.
//
-#pragma nowarn(1026) // warning elimination
const Int32 MaxPackedAPSize = 4000;
-#pragma warn(1026) // warning elimination
// The maximum size of all the packed AP's of this table.
//
-#pragma nowarn(1026) // warning elimination
const Int32 MaxPackedTableSize = 24000;
-#pragma warn(1026) // warning elimination
// The current minimum packing factor. This will be the packing
// factor limited by MaxPackedAPSize for the worst case AP.
@@ -550,9 +538,7 @@ PackedTableDesc::generatePackingInfo()
if(packedTableSize > MaxPackedTableSize) {
float packingFactorAdj = MaxPackedTableSize/(float)packedTableSize;
-#pragma nowarn(1506) // warning elimination
minPackingFactor = (Int32)(minPackingFactor * packingFactorAdj) - 1;
-#pragma warn(1506) // warning elimination
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/PackedColDesc.h
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/PackedColDesc.h b/core/sql/optimizer/PackedColDesc.h
index 2a96991..0cc969b 100644
--- a/core/sql/optimizer/PackedColDesc.h
+++ b/core/sql/optimizer/PackedColDesc.h
@@ -165,7 +165,6 @@ public:
// It is up to the user to ensure that the packing information is
// properly set.
//
-// warning elimination (removed "inline")
PackedColDesc(Lng32 position,
const NAType *type)
: position_(position),
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/PartFunc.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/PartFunc.cpp b/core/sql/optimizer/PartFunc.cpp
index 7e46e94..afadbb9 100644
--- a/core/sql/optimizer/PartFunc.cpp
+++ b/core/sql/optimizer/PartFunc.cpp
@@ -666,9 +666,7 @@ void PartitioningFunction::resetAfterStatement()
void PartitioningFunction::print(FILE* ofd, const char* indent,
const char* title) const
{
-#pragma nowarn(1506) // warning elimination
BUMP_INDENT(indent);
-#pragma warn(1506) // warning elimination
fprintf(ofd,"%s--Partitioning-Function----------------\n",NEW_INDENT);
fprintf(ofd,"%s%s (%d)\n",
@@ -3327,9 +3325,7 @@ NABoolean RangePartitionBoundaries::compareRangePartitionBoundaries(
// Since we didn't look at the last group, we need to compute the
// number of partitions in it and see if it is the group with
// the largest number of partitions.
-#pragma nowarn(1506) // warning elimination
numOfPartsInLastGroup = (other.partitionCount_ - otherix) + 1;
-#pragma warn(1506) // warning elimination
if ((maxPartsPerGroup != NULL) AND
(numOfPartsInLastGroup > *maxPartsPerGroup))
{
@@ -3477,9 +3473,7 @@ RangePartitionBoundaries::merge(const RangePartitionBoundaries& other,
}
result->encodedBoundaryKeyLength_ = encodedBoundaryKeyLength_;
-#pragma nowarn(1506) // warning elimination
result->partitionCount_ = resultix - 1;
-#pragma warn(1506) // warning elimination
return result;
} // RangePartitionBoundaries::merge
@@ -3516,9 +3510,7 @@ Lng32 RangePartitionBoundaries::getOptimizedNumberOfPartKeys()
}
}
-#pragma nowarn(1506) // warning elimination
return numPartKeyCols;
-#pragma warn(1506) // warning elimination
}
Lng32 RangePartitionBoundaries::scaleNumberOfPartitions(
@@ -3785,9 +3777,7 @@ void RangePartitionBoundaries::completePartitionBoundaries(
ItemExprList(CmpCommon::statementHeap());
// set some data members that could not be set before
-#pragma nowarn(1506) // warning elimination
partKeyColumnCount_ = partitioningKeyOrder.entries();
-#pragma warn(1506) // warning elimination
encodedBoundaryKeyLength_ = encodedBoundaryKeyLength;
Lng32 i;
@@ -3920,9 +3910,7 @@ void RangePartitionBoundaries::setupForStatement(NABoolean useStringVersion)
for(UInt32 i=0; i < boundaryValuesList_.entries(); i++)
{
-#pragma nowarn(1506) // warning elimination
bindAddBoundaryValue(i);
-#pragma warn(1506) // warning elimination
}
setupForStatement_ = TRUE;
@@ -3948,9 +3936,7 @@ void RangePartitionBoundaries::resetAfterStatement()
void RangePartitionBoundaries::print(FILE* ofd, const char* indent,
const char* title) const
{
-#pragma nowarn(1506) // warning elimination
BUMP_INDENT(indent);
-#pragma warn(1506) // warning elimination
char btitle[50];
char* S = btitle;
Lng32 index;
@@ -4108,9 +4094,7 @@ void RangePartitioningFunction::createPartitioningKeyPredicates()
CollIndex nCols = keyColumnList_.entries();
ValueIdSet setOfKeyPredicates;
-#pragma nowarn(1506) // warning elimination
ValueIdList partInputValues(2*nCols+1);
-#pragma warn(1506) // warning elimination
ValueIdList loValues;
ValueIdList hiValues;
@@ -4449,9 +4433,7 @@ RangePartitioningFunction::createPartitioningFunctionForIndexDesc
for (i = 0; i < partKeyColumns.entries(); i++)
{
// which column of the index is this (usually this will be == i)
-#pragma nowarn(1506) // warning elimination
ixColNumber = allColumns.index(partKeyColumns[i]);
-#pragma warn(1506) // warning elimination
// insert the value id of the index column into the partitioning
// key column value id list
@@ -4576,9 +4558,7 @@ ItemExpr* RangePartitioningFunction::createPartitioningExpression()
dataConversionErrorFlag,
&oType);
// form the key encoding of the key column (a character string)
-#pragma nowarn(1506) // warning elimination
ItemExpr *e = new (CmpCommon::statementHeap()) CompEncode (c,descOrder);
-#pragma warn(1506) // warning elimination
// concatenate the individual key encodings of the key columns
if (encKey == NULL)
@@ -4833,12 +4813,8 @@ RangePartitioningFunction::partFuncAndFuncPushDownCompatible(
if ( other == NULL ) return FALSE;
-#pragma nowarn(1506) // warning elimination
Lng32 thisKeyCount = getPartitioningKey().entries();
-#pragma warn(1506) // warning elimination
-#pragma nowarn(1506) // warning elimination
Lng32 otherKeyCount = other->getPartitioningKey().entries();
-#pragma warn(1506) // warning elimination
// same key count
if (thisKeyCount != otherKeyCount)
@@ -5767,9 +5743,7 @@ createPartitioningFunctionForIndexDesc(IndexDesc *idesc) const
for (CollIndex i = 0; i < partKeyColumns.entries(); i++)
{
// which column of the index is this (usually this will be == i)
-#pragma nowarn(1506) // warning elimination
ixColNumber = allColumns.index(partKeyColumns[i]);
-#pragma warn(1506) // warning elimination
// insert the value id of the index column into the partitioning
// key column value id set
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/PartFunc.h
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/PartFunc.h b/core/sql/optimizer/PartFunc.h
index 92f577d..f5f320f 100644
--- a/core/sql/optimizer/PartFunc.h
+++ b/core/sql/optimizer/PartFunc.h
@@ -785,7 +785,6 @@ protected:
inline void storePartitioningKeyPredicates(const ValueIdSet& partKeyPreds)
{ partitioningKeyPredicates_ = partKeyPreds;
partKeyPredsCreated_ = TRUE; }
-// warning elimination (removed "inline")
void storePartitionInputValues(const ValueIdList& partInputValues)
{ partitionInputValues_ = partInputValues;
partitionInputValuesLayout_ = partInputValues; }
@@ -2615,13 +2614,11 @@ public:
// --------------------------------------------------------------------
// Destructor functions
// --------------------------------------------------------------------
-// warning elimination (removed "inline")
virtual ~RoundRobinPartitioningFunction() {}
// ---------------------------------------------------------------------
// see base class for explanations of the virtual methods
// ---------------------------------------------------------------------
-// warning elimination (removed "inline")
virtual const RoundRobinPartitioningFunction *
castToRoundRobinPartitioningFunction() const { return this; }
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/PartKeyDist.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/PartKeyDist.cpp b/core/sql/optimizer/PartKeyDist.cpp
index 524f6b1..88cc0a0 100644
--- a/core/sql/optimizer/PartKeyDist.cpp
+++ b/core/sql/optimizer/PartKeyDist.cpp
@@ -72,9 +72,7 @@ PartitionKeyDistribution::PartitionKeyDistribution (
EncodedValueList(CmpCommon::statementHeap(), 0);
boundaries.insertAt(i, evl);
-#pragma nowarn(1506) // warning elimination
const ItemExprList *boundary = rpBoundariesPtr->getBoundaryValues(i);
-#pragma warn(1506) // warning elimination
// transform to encoded value list
for (CollIndex j=0; j < boundary->entries(); j++)
@@ -127,9 +125,7 @@ PartitionKeyDistribution::getHistIdxFromPartIdx (CollIndex extIdx) const
// to provide the "inverse" hist idx. See PartKeyDist.h for a careful
// description of what's going on.
-#pragma nowarn(270) // warning elimination
DCMPASSERT(extIdx >= 0 AND extIdx < getNumPartitions());
-#pragma warn(270) // warning elimination
CollIndex countParts, interval ;
@@ -168,9 +164,7 @@ PartitionKeyDistribution::getRowsForPartition(CollIndex extIdx) const
// it corresponds to a "partition" for all rows below "MIN".
// No rows satisfy this. Thus, the first partition is described
// by the first interval.
-#pragma nowarn(270) // warning elimination
DCMPASSERT(extIdx >= 0 AND extIdx < getNumPartitions());
-#pragma warn(270) // warning elimination
// remember : each entry in the histogram represents potentially many
// different partition boundaries, each with the same partition boundary value.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/PartReq.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/PartReq.cpp b/core/sql/optimizer/PartReq.cpp
index e19c609..8b0060a 100644
--- a/core/sql/optimizer/PartReq.cpp
+++ b/core/sql/optimizer/PartReq.cpp
@@ -143,10 +143,8 @@ const NAString PartitioningRequirement::getText() const
{
Lng32 lo, hi;
hi = getCountOfPartitions();
-#pragma nowarn(1506) // warning elimination
lo = hi - (Lng32) (hi * castToRequireApproximatelyNPartitions()->
getAllowedDeviation());
-#pragma warn(1506) // warning elimination
// if rounded down we may have to add one
if (NOT castToRequireApproximatelyNPartitions()->
isPartitionCountWithinRange(lo) OR
@@ -371,12 +369,8 @@ FullySpecifiedPartitioningRequirement::comparePartReqToReq
ValueIdSet myPartKey = getPartitioningKey();
ValueIdSet otherPartKey = other->getPartitioningKey();
-#pragma nowarn(1506) // warning elimination
Lng32 myKeyCount = myPartKey.entries();
-#pragma warn(1506) // warning elimination
-#pragma nowarn(1506) // warning elimination
Lng32 otherKeyCount = otherPartKey.entries();
-#pragma warn(1506) // warning elimination
Lng32 myPartCount = getCountOfPartitions();
Lng32 otherPartCount = other->getCountOfPartitions();
float otherAllowedDeviation =
@@ -391,12 +385,8 @@ FullySpecifiedPartitioningRequirement::comparePartReqToReq
// Compare the required number of partitions.
if ( (otherPartCount == ANY_NUMBER_OF_PARTITIONS) OR
-#pragma nowarn(1506) // warning elimination
((myPartCount >= (otherPartCount -
-#pragma warn(1506) // warning elimination
-#pragma nowarn(1506) // warning elimination
(otherPartCount * otherAllowedDeviation))) AND
-#pragma warn(1506) // warning elimination
(myPartCount <= otherPartCount)) )
result = combine_compare_results(result,MORE);
else
@@ -559,9 +549,7 @@ RequireApproximatelyNPartitions::partReqAndFuncCompatible
{
CMPASSERT(other != NULL);
-#pragma nowarn(1506) // warning elimination
Lng32 reqKeyCount = getPartitioningKey().entries();
-#pragma warn(1506) // warning elimination
Lng32 reqPartCount = getCountOfPartitions();
Lng32 actualPartCount = other->getCountOfPartitions();
float reqAllowedDeviation = getAllowedDeviation();
@@ -617,18 +605,12 @@ RequireApproximatelyNPartitions::comparePartReqToReq
ValueIdSet myPartKey = getPartitioningKey();
ValueIdSet otherPartKey = other->getPartitioningKey();
-#pragma nowarn(1506) // warning elimination
Lng32 myKeyCount = myPartKey.entries();
-#pragma warn(1506) // warning elimination
-#pragma nowarn(1506) // warning elimination
Lng32 otherKeyCount = otherPartKey.entries();
-#pragma warn(1506) // warning elimination
Lng32 myPartCount = getCountOfPartitions();
Lng32 otherPartCount = other->getCountOfPartitions();
float myAllowedDeviation = getAllowedDeviation();
-#pragma nowarn(1506) // warning elimination
float myLowerBound = myPartCount - (myPartCount * myAllowedDeviation);
-#pragma warn(1506) // warning elimination
COMPARE_RESULT result;
@@ -647,9 +629,7 @@ RequireApproximatelyNPartitions::comparePartReqToReq
// Compare the required number of partitions.
if ( (myPartCount == ANY_NUMBER_OF_PARTITIONS) OR
-#pragma nowarn(1506) // warning elimination
((otherPartCount >= myLowerBound) AND
-#pragma warn(1506) // warning elimination
(otherPartCount <= myPartCount)) )
result = combine_compare_results(result,LESS);
else
@@ -711,9 +691,7 @@ RequireApproximatelyNPartitions::comparePartReqToReq
other->castToRequireApproximatelyNPartitions()->
getAllowedDeviation();
float otherLowerBound =
-#pragma nowarn(1506) // warning elimination
otherPartCount - (otherPartCount * otherAllowedDeviation);
-#pragma warn(1506) // warning elimination
if (myPartCount == otherPartCount)
{
@@ -733,9 +711,7 @@ RequireApproximatelyNPartitions::comparePartReqToReq
{
if (myPartCount > otherPartCount) // my # of parts is largest
{
-#pragma nowarn(1506) // warning elimination
if (otherPartCount >= myLowerBound) //overlap
-#pragma warn(1506) // warning elimination
{
// Only if other's lower bound is greater than my lower bound
// can we definitely say LESS.
@@ -755,9 +731,7 @@ RequireApproximatelyNPartitions::comparePartReqToReq
}
else // other's # of parts is larger
{
-#pragma nowarn(1506) // warning elimination
if (myPartCount >= otherLowerBound) //overlap
-#pragma warn(1506) // warning elimination
{
// Only if my lower bound is greater than other's lower bound
// can we definitely say MORE.
@@ -895,13 +869,9 @@ RequireApproximatelyNPartitions::isPartitionCountWithinRange(Lng32 numOfParts)
// less a given percentage deviation of that upper bound. The specified
// partition must fall between the lower and upper bound (inclusive).
//---------------------------------------------------------------------------
-#pragma nowarn(1506) // warning elimination
float lowerBound = reqPartCount - (reqPartCount * getAllowedDeviation());
-#pragma warn(1506) // warning elimination
if ( numOfParts > reqPartCount
-#pragma nowarn(1506) // warning elimination
OR numOfParts < lowerBound )
-#pragma warn(1506) // warning elimination
{
return FALSE;
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/PartReq.h
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/PartReq.h b/core/sql/optimizer/PartReq.h
index 7ad893e..fef3743 100644
--- a/core/sql/optimizer/PartReq.h
+++ b/core/sql/optimizer/PartReq.h
@@ -1092,7 +1092,6 @@ class LogicalPartitioningRequirement : public NABasicObject
public:
// constructor
-// warning elimination (removed "inline")
LogicalPartitioningRequirement(
PartitioningRequirement *logPartReq,
LogPhysPartitioningFunction::logPartType logPartType =
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/PhyProp.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/PhyProp.cpp b/core/sql/optimizer/PhyProp.cpp
index 7849e47..892886f 100644
--- a/core/sql/optimizer/PhyProp.cpp
+++ b/core/sql/optimizer/PhyProp.cpp
@@ -76,12 +76,8 @@ NABoolean PhysicalProperty::isPartKeyPrefixOfSortKey() const
ValueIdList actualPartKey(
partFunc->castToRangePartitioningFunction()->getKeyColumnList());
ValueIdList actualSortKey(getSortKey());
-#pragma nowarn(1506) // warning elimination
Lng32 numPartCols = actualPartKey.entries();
-#pragma warn(1506) // warning elimination
-#pragma nowarn(1506) // warning elimination
Lng32 numClusterCols = actualSortKey.entries();
-#pragma warn(1506) // warning elimination
for (CollIndex index = 0; index < CollIndex(numPartCols); index++)
{
@@ -127,12 +123,8 @@ PhysicalProperty::compareProperties (const PhysicalProperty &other) const
// expressions (same ValueId, same NAType, etc.), consisting of
// the shorter of the two keys.
// ---------------------------------------------------------------------
-#pragma nowarn(1506) // warning elimination
Lng32 myKeyCount = sortKey_.entries();
-#pragma warn(1506) // warning elimination
-#pragma nowarn(1506) // warning elimination
Lng32 otherKeyCount = other.sortKey_.entries();
-#pragma warn(1506) // warning elimination
Lng32 minEntries = MINOF(myKeyCount,otherKeyCount);
for (CollIndex index = 0; index < (CollIndex)minEntries; index++)
@@ -561,16 +553,12 @@ ReqdPhysicalProperty::compareRequirements(const ReqdPhysicalProperty &other) con
// Compute the number of sort key columns.
if (orderedBy_ != NULL)
-#pragma nowarn(1506) // warning elimination
mySortEntries = orderedBy_->entries();
-#pragma warn(1506) // warning elimination
else
mySortEntries = 0;
if (other.orderedBy_ != NULL)
-#pragma nowarn(1506) // warning elimination
otherSortEntries = other.orderedBy_->entries();
-#pragma warn(1506) // warning elimination
else
otherSortEntries = 0;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/PhyProp.h
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/PhyProp.h b/core/sql/optimizer/PhyProp.h
index 79ccd23..b343201 100644
--- a/core/sql/optimizer/PhyProp.h
+++ b/core/sql/optimizer/PhyProp.h
@@ -595,7 +595,6 @@ public:
// Constructor, copy constructor, destructor, and assignment operator
// ---------------------------------------------------------------------
-// warning elimination (removed "inline")
ReqdPhysicalProperty(
const ValueIdSet* const arrangedBy = NULL,
const ValueIdList* const orderedBy = NULL,
@@ -694,7 +693,6 @@ public:
// NOTE: required property to another when the partitioning requirement
// NOTE: is changed
// ---------------------------------------------------------------------
-// warning elimination (removed "inline")
ReqdPhysicalProperty(const ReqdPhysicalProperty& other,
const ValueIdSet* const arrangedBy,
const ValueIdList* const orderedBy,
@@ -729,7 +727,6 @@ public:
// NOTE: required property to another when the partitioning requirement
// NOTE: is changed
// ---------------------------------------------------------------------
-// warning elimination (removed "inline")
ReqdPhysicalProperty(const ReqdPhysicalProperty &other,
const ValueIdSet* const arrangedBy,
const ValueIdList* const orderedBy,
@@ -765,7 +762,6 @@ public:
// NOTE: required property to another when the partitioning requirement
// NOTE: is changed
// ---------------------------------------------------------------------
-// warning elimination (removed "inline")
ReqdPhysicalProperty(const ReqdPhysicalProperty &other,
const ValueIdSet* const arrangedBy,
const ValueIdList* const orderedBy,
@@ -798,7 +794,6 @@ public:
}
// create an empty requirement with only a must match in it
-// warning elimination (removed "inline")
ReqdPhysicalProperty(RelExpr* mustMatch)
: arrangedBy_(NULL), orderedBy_(NULL),
sortOrderTypeReq_(NO_SOT),
@@ -827,7 +822,6 @@ public:
// attribute of an operator's rpp. This constructor is never
// used when creating a new rpp for a child.
// ---------------------------------------------------------------------
-// warning elimination (removed "inline")
ReqdPhysicalProperty(const ReqdPhysicalProperty& other,
RelExpr* mustMatch
)
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/QueryGraph.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/QueryGraph.cpp b/core/sql/optimizer/QueryGraph.cpp
index ab64527..01f3af0 100644
--- a/core/sql/optimizer/QueryGraph.cpp
+++ b/core/sql/optimizer/QueryGraph.cpp
@@ -180,7 +180,6 @@ void JBB::displayReductionPaths()
}
#ifndef NDEBUG
-#pragma nowarn(770) // warning elimination
void JBB::debugQueryGraph(){
//get integer representing the reduction path to be built
Lng32 reductionPathString=0;
@@ -229,7 +228,6 @@ void JBB::debugQueryGraph(){
}
}
-#pragma warn(770) // warning elimination
#endif
const NAString JBBC::getQueryGraphNodeText() const{
@@ -244,11 +242,7 @@ const NAString JBBC::getQueryGraphNodeText() const{
//print the reduction path
result += (*reductionPaths_)[i]->getText();
-#pragma warning (disable : 4244) //warning elimination
-#pragma nowarn(1506) // warning elimination
Int32 cardinality = ((*cardinalityOfReductionPaths_)[i]).getValue();
-#pragma warn(1506) // warning elimination
-#pragma warning (default : 4244) //warning elimination
result += ("cardinality: " + istring(cardinality)+"\n");
}
@@ -281,9 +275,7 @@ void JBBC::initializeQueryGraphNode()
CANodeIdSet connectedJBBCs = getJoinedJBBCs();
//Allocate the list that will store all incoming connections
-#pragma nowarn(1506) // warning elimination
Int32 numIncomingConnections = connectedJBBCs.entries();
-#pragma warn(1506) // warning elimination
incomingConnections_ = new (heap_) NAList<QueryGraphConnection *>(heap_,numIncomingConnections);
//create a QueryGraphConnection object representing a connection from
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/RETDesc.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/RETDesc.cpp b/core/sql/optimizer/RETDesc.cpp
index ee675a3..c45994c 100644
--- a/core/sql/optimizer/RETDesc.cpp
+++ b/core/sql/optimizer/RETDesc.cpp
@@ -799,9 +799,7 @@ void RETDesc::print(FILE* ofd, const char* indent, const char* title) const
#ifndef NDEBUG
CollIndex i;
-#pragma nowarn(1506) // warning elimination
BUMP_INDENT(indent);
-#pragma warn(1506) // warning elimination
fprintf(ofd,"\n NEW RetDesc START \n%s%s %p %s\n --------------------- \n",
NEW_INDENT, title, this,
groupedFlag_ ? "(grouped) " : "");
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/Refresh.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/Refresh.cpp b/core/sql/optimizer/Refresh.cpp
index ed575dd..8f749e9 100644
--- a/core/sql/optimizer/Refresh.cpp
+++ b/core/sql/optimizer/Refresh.cpp
@@ -517,9 +517,7 @@ NABoolean Refresh::doesBaseTableHaveSupportingIndex(BindWA *bindWA,
LIST (MVColumnInfo *) mvGroupByColumns(bindWA->wHeap());
for ( i = 0 ; i < pMvInfoColumnList.entries() ; i++)
{
-#pragma nowarn(1506) // warning elimination
MVColumnInfo *currentMvColInfo = pMvInfoColumnList[i];
-#pragma warn(1506) // warning elimination
if (COM_MVCOL_GROUPBY == currentMvColInfo->getColType())
{
mvGroupByColumns.insert(currentMvColInfo);
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/Refresh.h
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/Refresh.h b/core/sql/optimizer/Refresh.h
index a1b712c..d6953bc 100644
--- a/core/sql/optimizer/Refresh.h
+++ b/core/sql/optimizer/Refresh.h
@@ -198,9 +198,7 @@ public:
private:
// Copy Ctor and = operator are not implemented.
IUDStatistics(const IUDStatistics& other);
-#pragma nowarn(1026) // warning elimination
IUDStatistics& operator=(const IUDStatistics& other);
-#pragma warn(1026) // warning elimination
Lng32 numInsertedRows_;
Lng32 numDeletedRows_;
@@ -230,9 +228,7 @@ public:
private:
// Copy Ctor and = operator are not implemented.
DeltaDefIUDLog(const DeltaDefIUDLog& other);
-#pragma nowarn(1026) // warning elimination
DeltaDefIUDLog& operator=(const DeltaDefIUDLog& other);
-#pragma warn(1026) // warning elimination
Option op_;
IUDStatistics *optionalStat_;
@@ -260,9 +256,7 @@ public:
private:
// Copy Ctor and = operator are not implemented.
DeltaDefRangeLog(const DeltaDefRangeLog& other);
-#pragma nowarn(1026) // warning elimination
DeltaDefRangeLog& operator=(const DeltaDefRangeLog& other);
-#pragma warn(1026) // warning elimination
Option op_;
Lng32 numOfRanges_;
@@ -290,9 +284,7 @@ public:
private:
// Copy Ctor and = operator are not implemented.
DeltaDefLogs(const DeltaDefLogs& other);
-#pragma nowarn(1026) // warning elimination
DeltaDefLogs& operator=(const DeltaDefLogs& other);
-#pragma warn(1026) // warning elimination
DeltaDefRangeLog * rangeDef_;
DeltaDefIUDLog * iudDef_;
@@ -331,9 +323,7 @@ public:
private:
// Copy Ctor and = operator are not implemented.
DeltaOptions(const DeltaOptions& other);
-#pragma nowarn(1026) // warning elimination
DeltaOptions& operator=(const DeltaOptions& other);
-#pragma warn(1026) // warning elimination
const DELevel deLevel_;
DeltaDefLogs *pDeltaDefLogs_;
@@ -446,9 +436,7 @@ public:
private:
// Copy Ctor and = operator are not implemented.
DeltaDefinition(const DeltaDefinition& other);
-#pragma nowarn(1026) // warning elimination
DeltaDefinition& operator=(const DeltaDefinition& other);
-#pragma warn(1026) // warning elimination
QualifiedName *tableName_;
const Lng32 beginEpoch_;
@@ -499,9 +487,7 @@ public:
private:
// Copy Ctor and = operator are not implemented.
PipelineClause(const PipelineClause& other);
-#pragma nowarn(1026) // warning elimination
PipelineClause& operator=(const PipelineClause& other);
-#pragma warn(1026) // warning elimination
const QualNamePtrList *firstPipelineDef_;
const PipelineDefPtrList *pipelineDefList_;
@@ -532,9 +518,7 @@ public:
private:
// Copy Ctor and = operator are not implemented.
DeltaDefinitionPtrList(const DeltaDefinitionPtrList& other);
-#pragma nowarn(1026) // warning elimination
DeltaDefinitionPtrList& operator=(const DeltaDefinitionPtrList& other);
-#pragma warn(1026) // warning elimination
}; // class DeltaDefinitionPtrList
//----------------------------------------------------------------------------
@@ -558,9 +542,7 @@ public:
private:
// Copy Ctor and = operator are not implemented.
PipelineDef(const PipelineDef& other);
-#pragma nowarn(1026) // warning elimination
PipelineDef& operator=(const PipelineDef& other);
-#pragma warn(1026) // warning elimination
QualifiedName *fromClause_;
QualNamePtrList *toClause_;
@@ -584,9 +566,7 @@ public:
private:
// Copy Ctor and = operator are not implemented.
PipelineDefPtrList(const PipelineDefPtrList& other);
-#pragma nowarn(1026) // warning elimination
PipelineDefPtrList& operator=(const PipelineDefPtrList& other);
-#pragma warn(1026) // warning elimination
}; // class PipelineDefPtrList
@@ -609,9 +589,7 @@ public:
private:
// Copy Ctor and = operator are not implemented.
RecomputeRefreshOption(const RecomputeRefreshOption& other);
-#pragma nowarn(1026) // warning elimination
RecomputeRefreshOption& operator=(const RecomputeRefreshOption& other);
-#pragma warn(1026) // warning elimination
const NABoolean noDelete_;
}; // class RecomputeRefreshOption
@@ -641,9 +619,7 @@ public:
private:
// Copy Ctor and = operator are not implemented.
NRowsClause(const NRowsClause& other);
-#pragma nowarn(1026) // warning elimination
NRowsClause& operator=(const NRowsClause& other);
-#pragma warn(1026) // warning elimination
Lng32 commitEach_;
Lng32 phase_;
@@ -697,9 +673,7 @@ public:
public:
// Copy Ctor and = operator are not implemented.
IncrementalRefreshOption(const IncrementalRefreshOption& other);
-#pragma nowarn(1026) // warning elimination
IncrementalRefreshOption& operator=(const IncrementalRefreshOption& other);
-#pragma warn(1026) // warning elimination
refreshType type_;
DeltaDefinitionPtrList *pDeltaDefList_;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/Rel3GL.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/Rel3GL.cpp b/core/sql/optimizer/Rel3GL.cpp
index 65397b5..62c2954 100644
--- a/core/sql/optimizer/Rel3GL.cpp
+++ b/core/sql/optimizer/Rel3GL.cpp
@@ -510,9 +510,7 @@ NABoolean AssignmentStHostVars::updateValueIds(const ValueIdList &returnedList,
if (hostVarList || (listSize != returnedList.entries())) {
// Mismatch in number of variables in SET list and the returned list
*CmpCommon::diags() << DgSqlCode(-4094)
-#pragma nowarn(1506) // warning elimination
<< DgInt0(listSize) << DgInt1(returnedList.entries());
-#pragma warn(1506) // warning elimination
bindWA_->setErrStatus();
return FALSE;
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/RelExeUtil.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/RelExeUtil.cpp b/core/sql/optimizer/RelExeUtil.cpp
index 4aad49d..9cf45a9 100644
--- a/core/sql/optimizer/RelExeUtil.cpp
+++ b/core/sql/optimizer/RelExeUtil.cpp
@@ -4749,7 +4749,6 @@ RelExpr * ExeUtilLoadVolatileTable::bindNode(BindWA *bindWA)
NAWchar *inputStr = SQLTEXTW();
Int32 start_pos = 0;
-#pragma nowarn(1506) // warning elimination
CharInfo::CharSet targetCharSet = SqlParser_CurrentParser->charset_;
if ( targetCharSet == CharInfo::UCS2 )
{
@@ -4761,7 +4760,6 @@ RelExpr * ExeUtilLoadVolatileTable::bindNode(BindWA *bindWA)
NAWstrlen(&inputStr[start_pos]),
targetCharSet,
bindWA->wHeap());
-#pragma warn(1506) // warning elimination
// get the upd stats query
updStatsQuery_ =
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/RelExpr.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/RelExpr.cpp b/core/sql/optimizer/RelExpr.cpp
index 6087a96..0537074 100644
--- a/core/sql/optimizer/RelExpr.cpp
+++ b/core/sql/optimizer/RelExpr.cpp
@@ -2367,9 +2367,7 @@ RelExpr * WildCardOp::copyTopNode(RelExpr * derivedNode,
}
}
-#pragma nowarn(203) // warning elimination
return NULL; // shouldn't really reach here
-#pragma warn(203) // warning elimination
}
// -----------------------------------------------------------------------
@@ -6831,9 +6829,7 @@ void Union::getPotentialOutputValues(ValueIdSet & outputValues) const
// The output of the union is defined by the ValueIdUnion
// expressions that are maintained in the colMapTable_.
//
-#pragma nowarn(1506) // warning elimination
Lng32 ne = unionMap_->colMapTable_.entries();
-#pragma warn(1506) // warning elimination
for (Lng32 index = 0; index < ne; index++)
{
// Accumulate the ValueIds of the result of the union
@@ -7286,7 +7282,6 @@ HashValue MergeUnion::topHash()
return result;
}
-#pragma nowarn(262) // warning elimination
NABoolean MergeUnion::duplicateMatch(const RelExpr & other) const
{
if (!RelExpr::duplicateMatch(other))
@@ -7300,7 +7295,6 @@ NABoolean MergeUnion::duplicateMatch(const RelExpr & other) const
return FALSE;
}
-#pragma warn(262) // warning elimination
RelExpr * MergeUnion::copyTopNode(RelExpr *derivedNode, CollHeap* outHeap)
{
@@ -9930,7 +9924,6 @@ const NAString FileScan::getTypeText() const
return descr;
}
-#pragma nowarn(262) // warning elimination
void FileScan::addLocalExpr(LIST(ExprNode *) &xlist,
LIST(NAString) &llist) const
{
@@ -10072,7 +10065,6 @@ void FileScan::addLocalExpr(LIST(ExprNode *) &xlist,
RelExpr::addLocalExpr(xlist,llist);
}
-#pragma warn(262) // warning elimination
const Disjuncts& FileScan::getDisjuncts() const
{
@@ -11487,9 +11479,7 @@ Tuple::Tuple(const Tuple & other) : RelExpr(other.getOperatorType())
Tuple::~Tuple() {}
-#pragma nowarn(1026) // warning elimination
Int32 Tuple::getArity() const { return 0; }
-#pragma warn(1026) // warning elimination
// -----------------------------------------------------------------------
// A virtual method for computing output values that an operator can
@@ -11895,9 +11885,7 @@ RelExpr * BeforeTrigger::copyTopNode(RelExpr *derivedNode, CollHeap* outHeap)
else
{
CMPASSERT(setList_ != NULL); // Must have either SET or SIGNAL clause.
-#pragma nowarn(1506) // warning elimination
ItemExprList *setList = new(outHeap) ItemExprList(setList_->entries(), outHeap);
-#pragma warn(1506) // warning elimination
for (CollIndex i=0; i<setList_->entries(); i++)
setList->insert(setList_->at(i)->copyTree(outHeap));
[12/12] incubator-trafodion git commit: PR-1251 [TRAFOFION-2731]
CodeCleanup: Phase4: Removed lagacy/obsolete warning elimination pragmas
Posted by an...@apache.org.
PR-1251 [TRAFOFION-2731] CodeCleanup: Phase4: Removed lagacy/obsolete warning elimination pragmas
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/2eaef5d7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/2eaef5d7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/2eaef5d7
Branch: refs/heads/master
Commit: 2eaef5d7a9b3beb1b4f45ab97899c2a4b6b7059e
Parents: bd2932b 781d97e
Author: Anoop Sharma <an...@esgyn.com>
Authored: Mon Oct 2 00:13:35 2017 +0000
Committer: Anoop Sharma <an...@esgyn.com>
Committed: Mon Oct 2 00:13:35 2017 +0000
----------------------------------------------------------------------
core/sql/arkcmp/ApplicationFile.cpp | 2 -
core/sql/arkcmp/CmpContext.cpp | 8 --
core/sql/arkcmp/CmpContext.h | 2 -
core/sql/arkcmp/CmpISPUtils.cpp | 2 -
core/sql/arkcmp/CmpStatement.cpp | 12 --
core/sql/arkcmp/CmpStoredProc.cpp | 4 -
core/sql/arkcmp/CmpStoredProc.h | 2 -
core/sql/arkcmp/ExtQualModuleNames.cpp | 1 -
core/sql/arkcmp/ExtQualModuleNames.h | 4 -
core/sql/arkcmp/ProcessEnv.cpp | 4 -
core/sql/arkcmp/SPUtil.cpp | 8 --
core/sql/arkcmp/SQLJFile.cpp | 2 -
core/sql/arkcmp/VersioningStoredProc.cpp | 2 -
core/sql/arkcmp/cmpargs.cpp | 2 -
core/sql/bin/ex_esp_main.cpp | 2 -
core/sql/cli/Cli.cpp | 10 --
core/sql/cli/CliExpExchange.cpp | 27 ----
core/sql/cli/CliExtern.cpp | 2 -
core/sql/cli/Context.cpp | 6 -
core/sql/cli/Context.h | 4 -
core/sql/cli/Descriptor.cpp | 24 ----
core/sql/cli/Descriptor.h | 2 -
core/sql/cli/Globals.cpp | 2 -
core/sql/cli/Globals.h | 2 -
core/sql/cli/QuasiFileManager.cpp | 10 --
core/sql/cli/Statement.cpp | 9 --
core/sql/cli/StoredProcInterface.cpp | 2 -
core/sql/cli/sql_id.cpp | 4 -
core/sql/comexe/CmpMessage.cpp | 32 -----
core/sql/comexe/CmpMessage.h | 6 -
core/sql/comexe/ComKeyMDAM.h | 2 -
core/sql/comexe/ComKeyRange.cpp | 6 -
core/sql/comexe/ComResourceInfo.cpp | 4 -
core/sql/comexe/ComTdb.cpp | 128 -----------------
core/sql/comexe/ComTdb.h | 2 -
core/sql/comexe/ComTdbControl.cpp | 2 -
core/sql/comexe/ComTdbDDL.h | 3 -
core/sql/comexe/ComTdbDp2Oper.h | 8 --
core/sql/comexe/ComTdbExeUtil.h | 1 -
core/sql/comexe/ComTdbExplain.h | 12 --
core/sql/comexe/ComTdbRoot.h | 2 -
core/sql/comexe/ComTdbSendTop.cpp | 4 -
core/sql/comexe/ComTdbSort.cpp | 4 -
core/sql/comexe/ComTdbStats.cpp | 6 -
core/sql/comexe/ComTdbTupleFlow.cpp | 38 +++--
core/sql/comexe/LateBindInfo.cpp | 12 --
core/sql/comexe/PartInputDataDesc.cpp | 12 --
core/sql/comexe/SqlTableOpenInfo.h | 2 -
core/sql/common/BigNumHelper.cpp | 14 --
core/sql/common/CharType.cpp | 23 ---
core/sql/common/Collections.cpp | 6 +-
core/sql/common/Collections.h | 7 -
core/sql/common/ComDistribution.h | 2 -
core/sql/common/ComObjectName.cpp | 4 -
core/sql/common/ComResWords.cpp | 6 -
core/sql/common/ComResWords.h | 2 -
core/sql/common/ComRtUtils.cpp | 16 ---
core/sql/common/ComSchemaName.cpp | 2 -
core/sql/common/ComSmallDefs.cpp | 2 -
core/sql/common/ComTransInfo.h | 2 -
core/sql/common/DTICommonType.h | 2 -
core/sql/common/DateTimeType.cpp | 32 -----
core/sql/common/DatetimeType.h | 8 --
core/sql/common/IntervalType.cpp | 6 -
core/sql/common/IntervalType.h | 4 -
core/sql/common/Ipc.cpp | 4 -
core/sql/common/Ipc.h | 2 -
core/sql/common/IpcGuardian.cpp | 37 -----
core/sql/common/IpcSockets.cpp | 2 -
core/sql/common/NAAssert.cpp | 2 -
core/sql/common/NAError.cpp | 2 -
core/sql/common/NAMemory.cpp | 10 --
core/sql/common/NAString.cpp | 4 -
core/sql/common/NAString2.cpp | 4 -
core/sql/common/NAStringDefGlobals.h | 1 -
core/sql/common/NATestpoint.cpp | 2 -
core/sql/common/NAType.cpp | 10 --
core/sql/common/NAWinNT.h | 4 -
core/sql/common/NumericType.cpp | 14 --
core/sql/common/NumericType.h | 3 -
core/sql/common/QueryText.h | 4 -
core/sql/common/SequenceGeneratorAttributes.h | 2 -
core/sql/common/charinfo.cpp | 4 -
core/sql/common/conversionHex.cpp | 18 ---
core/sql/common/conversionSJIS.cpp | 2 -
core/sql/common/csconvert.cpp | 2 -
core/sql/common/dfs2rec.h | 4 -
core/sql/common/ipcmsg.cpp | 42 ------
core/sql/common/nawstring.cpp | 2 -
core/sql/common/str.cpp | 28 ----
core/sql/common/swscanf.cpp | 28 ----
core/sql/common/swsprintf.cpp | 32 -----
core/sql/common/unicode_char_set.cpp | 8 --
core/sql/common/wstr.cpp | 10 --
core/sql/executor/ExBitMapTable.cpp | 4 -
core/sql/executor/ExBitMapTable.h | 3 -
core/sql/executor/ExCancel.cpp | 10 --
core/sql/executor/ExComTdb.cpp | 144 -------------------
core/sql/executor/ExExeUtilCommon.cpp | 2 -
core/sql/executor/ExExeUtilExplain.cpp | 1 -
core/sql/executor/ExExplain.cpp | 8 --
core/sql/executor/ExFirstN.cpp | 4 -
core/sql/executor/ExPack.h | 4 -
core/sql/executor/ExPackedRows.cpp | 2 -
core/sql/executor/ExPackedRows.h | 4 -
core/sql/executor/ExRsInfo.h | 3 -
core/sql/executor/ExScheduler.cpp | 2 -
core/sql/executor/ExSequence.cpp | 2 -
core/sql/executor/ExSimpleSample.h | 3 -
core/sql/executor/ExStats.h | 18 ---
core/sql/executor/ExTranspose.cpp | 2 -
core/sql/executor/ExTranspose.h | 4 -
core/sql/executor/ExUdr.cpp | 2 -
core/sql/executor/ExUdrClientIpc.cpp | 6 -
core/sql/executor/ExUdrServer.cpp | 2 -
core/sql/executor/ExVPJoin.cpp | 4 -
core/sql/executor/MdamPoint.cpp | 4 -
core/sql/executor/MdamPoint.h | 5 -
core/sql/executor/TriggerEnable.h | 2 -
core/sql/executor/ex_ddl.cpp | 10 --
core/sql/executor/ex_esp_frag_dir.cpp | 6 -
core/sql/executor/ex_esp_msg.cpp | 14 --
core/sql/executor/ex_ex.cpp | 8 --
core/sql/executor/ex_god.h | 3 -
core/sql/executor/ex_io_control.h | 10 --
core/sql/executor/ex_mdam.cpp | 14 --
core/sql/executor/ex_mj.cpp | 2 -
core/sql/executor/ex_onlj.cpp | 2 -
core/sql/executor/ex_queue.cpp | 12 --
core/sql/executor/ex_queue.h | 8 --
core/sql/executor/ex_root.cpp | 18 ---
core/sql/executor/ex_root.h | 9 --
core/sql/executor/ex_sort.cpp | 6 -
core/sql/executor/ex_split_top.cpp | 32 -----
core/sql/executor/ex_stored_proc.cpp | 16 ---
core/sql/executor/ex_tcb.h | 3 -
core/sql/executor/ex_tcb_private.h | 2 -
core/sql/executor/ex_timeout.cpp | 6 -
core/sql/executor/ex_transaction.cpp | 15 --
core/sql/executor/ex_transaction.h | 1 -
core/sql/executor/ex_tuple.cpp | 8 --
core/sql/executor/ex_tuple_flow.cpp | 4 -
core/sql/executor/ex_union.cpp | 14 --
core/sql/executor/key_range.cpp | 4 -
core/sql/executor/key_single_subset.cpp | 6 -
core/sql/executor/sql_buffer.cpp | 61 --------
core/sql/executor/sql_buffer.h | 6 -
core/sql/executor/timeout_data.cpp | 10 --
core/sql/exp/ExpAtp.cpp | 8 --
core/sql/exp/ExpAtp.h | 4 -
core/sql/exp/ExpBitMuxFunction.cpp | 10 --
core/sql/exp/ExpBitMuxFunction.h | 2 -
core/sql/exp/ExpConvMxcs.cpp | 2 -
core/sql/exp/ExpCriDesc.h | 2 -
core/sql/exp/ExpPCode.h | 2 -
core/sql/exp/ExpPCodeClauseGen.cpp | 38 -----
core/sql/exp/ExpPCodeExpGen.cpp | 4 -
core/sql/exp/ExpSequenceFunction.cpp | 2 -
core/sql/exp/ExpSqlTupp.h | 4 -
core/sql/exp/exp_aggregate.cpp | 2 -
core/sql/exp/exp_arith.cpp | 16 ---
core/sql/exp/exp_attrs.cpp | 16 ---
core/sql/exp/exp_attrs.h | 6 -
core/sql/exp/exp_bignum.cpp | 42 ------
core/sql/exp/exp_bignum.h | 2 -
core/sql/exp/exp_clause.cpp | 10 --
core/sql/exp/exp_clause.h | 4 -
core/sql/exp/exp_clause_derived.h | 2 -
core/sql/exp/exp_comp.cpp | 4 -
core/sql/exp/exp_conv.cpp | 94 ------------
core/sql/exp/exp_datetime.cpp | 14 --
core/sql/exp/exp_datetime.h | 2 -
core/sql/exp/exp_dp2_expr.cpp | 2 -
core/sql/exp/exp_dp2_expr.h | 2 -
core/sql/exp/exp_expr.cpp | 8 --
core/sql/exp/exp_expr.h | 4 -
core/sql/exp/exp_function.cpp | 93 ------------
core/sql/exp/exp_function.h | 2 -
core/sql/exp/exp_function_lower_unicode.cpp | 2 -
core/sql/exp/exp_function_substring_unicode.cpp | 2 -
core/sql/exp/exp_function_trim_unicode.cpp | 4 -
core/sql/exp/exp_function_upper_unicode.cpp | 2 -
core/sql/exp/exp_interval.cpp | 2 -
core/sql/exp/exp_like.cpp | 8 --
core/sql/exp/exp_math_func.cpp | 4 -
core/sql/exp/exp_math_func.h | 2 -
core/sql/exp/exp_tuple_desc.cpp | 8 --
core/sql/exp/exp_tuple_desc.h | 2 -
core/sql/export/ComDiags.cpp | 18 ---
core/sql/export/ComDiags.h | 2 -
core/sql/export/HeapLog.cpp | 6 -
core/sql/export/IpcMessageObj.cpp | 14 --
core/sql/export/NAAbort.cpp | 2 -
core/sql/export/NABasicObject.cpp | 4 -
core/sql/export/NAStringDef.cpp | 26 ----
core/sql/export/NAVersionedObject.cpp | 2 -
core/sql/export/NAVersionedObject.h | 2 -
core/sql/generator/GenExpGenerator.cpp | 58 --------
core/sql/generator/GenFastTransport.cpp | 2 -
core/sql/generator/GenItemExpr.cpp | 6 -
core/sql/generator/GenItemFunc.cpp | 22 ---
core/sql/generator/GenKey.cpp | 12 --
core/sql/generator/GenMapTable.cpp | 12 --
core/sql/generator/GenMdamPred.cpp | 16 ---
core/sql/generator/GenPartFunc.cpp | 2 -
core/sql/generator/GenPreCode.cpp | 34 -----
core/sql/generator/GenRel3GL.cpp | 2 -
core/sql/generator/GenRelDCL.cpp | 4 -
core/sql/generator/GenRelEnforcer.cpp | 16 ---
core/sql/generator/GenRelExeUtil.cpp | 92 ------------
core/sql/generator/GenRelGrby.cpp | 8 --
core/sql/generator/GenRelJoin.cpp | 8 --
core/sql/generator/GenRelMisc.cpp | 82 -----------
core/sql/generator/GenRelPackedRows.cpp | 10 --
core/sql/generator/GenRelScan.cpp | 8 --
core/sql/generator/GenRelSequence.cpp | 10 --
core/sql/generator/GenRelSet.cpp | 6 -
core/sql/generator/GenResources.cpp | 2 -
core/sql/generator/GenStoredProc.cpp | 2 -
core/sql/generator/GenUdr.cpp | 2 -
core/sql/generator/Generator.h | 2 -
core/sql/langman/LmContManager.cpp | 2 -
core/sql/langman/LmGenUtil.cpp | 2 -
core/sql/langman/LmJavaOptions.h | 2 -
core/sql/langman/LmRoutine.h | 3 -
core/sql/optimizer/AccessSets.cpp | 4 -
core/sql/optimizer/BindItemExpr.cpp | 20 ---
core/sql/optimizer/BindRelExpr.cpp | 34 -----
core/sql/optimizer/BindWA.cpp | 2 -
core/sql/optimizer/CascadesBasic.h | 1 -
core/sql/optimizer/ChangesTable.cpp | 14 --
core/sql/optimizer/ClusteredBitmap.cpp | 10 --
core/sql/optimizer/ColStatDesc.cpp | 14 --
core/sql/optimizer/ColumnDesc.h | 2 -
core/sql/optimizer/ColumnNameMap.h | 2 -
core/sql/optimizer/ControlDB.cpp | 10 --
core/sql/optimizer/Cost.h | 1 -
core/sql/optimizer/CostVector.h | 3 -
core/sql/optimizer/EncodedValue.cpp | 5 -
core/sql/optimizer/EstLogProp.h | 2 -
core/sql/optimizer/GroupAttr.cpp | 6 -
core/sql/optimizer/ImplRule.cpp | 3 -
core/sql/optimizer/IndexDesc.cpp | 16 ---
core/sql/optimizer/Inlining.cpp | 10 --
core/sql/optimizer/ItemArith.h | 4 -
core/sql/optimizer/ItemColRef.h | 7 -
core/sql/optimizer/ItemConstr.h | 3 -
core/sql/optimizer/ItemExpr.cpp | 32 -----
core/sql/optimizer/ItemExpr.h | 3 -
core/sql/optimizer/ItemLog.h | 3 -
core/sql/optimizer/ItemNAType.h | 1 -
core/sql/optimizer/ItemOther.h | 8 --
core/sql/optimizer/ItemSubq.h | 10 --
core/sql/optimizer/ItmBitMuxFunction.cpp | 2 -
core/sql/optimizer/ItmFlowControlFunction.cpp | 6 -
core/sql/optimizer/LargeScopeRules.cpp | 2 -
core/sql/optimizer/MJVIndexBuilder.cpp | 4 -
core/sql/optimizer/MJVIndexBuilder.h | 10 --
core/sql/optimizer/MVInfo.cpp | 44 ------
core/sql/optimizer/MVInfo.h | 24 ----
core/sql/optimizer/MVJoinGraph.cpp | 4 -
core/sql/optimizer/MVJoinGraph.h | 2 -
core/sql/optimizer/MavRelRootBuilder.cpp | 4 -
core/sql/optimizer/MultiJoin.cpp | 6 -
core/sql/optimizer/MultiJoin.h | 2 -
core/sql/optimizer/MvLog.cpp | 8 --
core/sql/optimizer/MvLog.h | 2 -
core/sql/optimizer/MvMultiTxnMavBuilder.cpp | 2 -
core/sql/optimizer/MvRefreshBuilder.cpp | 16 ---
core/sql/optimizer/MvRefreshBuilder.h | 18 ---
core/sql/optimizer/NAClusterInfo.cpp | 1 -
core/sql/optimizer/NAColumn.cpp | 8 --
core/sql/optimizer/NARoutine.cpp | 2 -
core/sql/optimizer/NARoutine.h | 2 -
core/sql/optimizer/NATable.cpp | 30 ----
core/sql/optimizer/NATable.h | 2 -
core/sql/optimizer/NodeMap.cpp | 31 ----
core/sql/optimizer/NormItemExpr.cpp | 15 --
core/sql/optimizer/NormRelExpr.cpp | 18 ---
core/sql/optimizer/ObjectNames.cpp | 6 -
core/sql/optimizer/OptItemExpr.cpp | 2 -
core/sql/optimizer/OptLogRelExpr.cpp | 4 -
core/sql/optimizer/OptPhysRelExpr.cpp | 14 --
core/sql/optimizer/OptTrigger.cpp | 7 -
core/sql/optimizer/PackedColDesc.cpp | 14 --
core/sql/optimizer/PackedColDesc.h | 1 -
core/sql/optimizer/PartFunc.cpp | 26 ----
core/sql/optimizer/PartFunc.h | 3 -
core/sql/optimizer/PartKeyDist.cpp | 6 -
core/sql/optimizer/PartReq.cpp | 30 ----
core/sql/optimizer/PartReq.h | 1 -
core/sql/optimizer/PhyProp.cpp | 12 --
core/sql/optimizer/PhyProp.h | 6 -
core/sql/optimizer/QueryGraph.cpp | 8 --
core/sql/optimizer/RETDesc.cpp | 2 -
core/sql/optimizer/Refresh.cpp | 2 -
core/sql/optimizer/Refresh.h | 26 ----
core/sql/optimizer/Rel3GL.cpp | 2 -
core/sql/optimizer/RelExeUtil.cpp | 2 -
core/sql/optimizer/RelExpr.cpp | 12 --
core/sql/optimizer/RelExpr.h | 5 -
core/sql/optimizer/RelGrby.h | 5 -
core/sql/optimizer/RelJoin.h | 13 --
core/sql/optimizer/RelMisc.h | 1 -
core/sql/optimizer/RelPackedRows.h | 1 -
core/sql/optimizer/RelSample.h | 2 -
core/sql/optimizer/RelScan.h | 2 -
core/sql/optimizer/RelSequence.h | 5 -
core/sql/optimizer/RelSet.h | 2 -
core/sql/optimizer/RelStoredProc.cpp | 8 --
core/sql/optimizer/ReqGen.cpp | 10 --
core/sql/optimizer/RoutineDesc.cpp | 4 -
core/sql/optimizer/Rule.cpp | 2 -
core/sql/optimizer/Rule.h | 5 -
core/sql/optimizer/ScanOptimizer.cpp | 6 -
core/sql/optimizer/ScmCostMethod.cpp | 2 -
core/sql/optimizer/SearchKey.cpp | 16 ---
core/sql/optimizer/Stats.cpp | 7 -
core/sql/optimizer/Stats.h | 23 ---
core/sql/optimizer/SynthType.cpp | 16 ---
core/sql/optimizer/TableDesc.cpp | 6 -
core/sql/optimizer/TransRule.cpp | 15 --
core/sql/optimizer/TransRule.h | 13 --
core/sql/optimizer/TriggerDB.cpp | 4 -
core/sql/optimizer/TriggerDB.h | 1 -
core/sql/optimizer/Triggers.cpp | 10 --
core/sql/optimizer/Triggers.h | 5 -
core/sql/optimizer/VEGTable.cpp | 36 -----
core/sql/optimizer/ValueDesc.cpp | 16 ---
core/sql/optimizer/costmethod.cpp | 12 --
core/sql/optimizer/mdam.cpp | 24 ----
core/sql/optimizer/memo.cpp | 22 ---
core/sql/optimizer/opt.cpp | 26 ----
core/sql/optimizer/opt.h | 8 --
core/sql/parser/ElemDDLFileAttr.cpp | 6 -
core/sql/parser/ElemDDLList.h | 2 -
core/sql/parser/ElemDDLPartition.cpp | 4 -
core/sql/parser/ElemDDLUdr.cpp | 4 -
core/sql/parser/ParDDLFileAttrs.cpp | 14 --
core/sql/parser/ParKeyWords.cpp | 2 -
core/sql/parser/ParKeyWords.h | 2 -
core/sql/parser/ParNameLocList.cpp | 22 ---
core/sql/parser/SqlParserAux.cpp | 36 -----
core/sql/parser/StmtNode.h | 3 -
core/sql/parser/sqlparser.y | 112 ---------------
core/sql/parser/ulexer.cpp | 8 --
core/sql/parser/ulexer.h | 2 -
core/sql/qms/QmmQmm.cpp | 1 -
core/sql/qmscommon/QRQueries.cpp | 5 -
core/sql/qmscommon/QRQueries.sql | 4 -
core/sql/refresh/RuDeltaDef.cpp | 6 -
core/sql/refresh/RuDupElimLogRecord.cpp | 4 -
core/sql/refresh/RuDupElimLogScanner.cpp | 2 -
core/sql/refresh/RuDupElimTaskExUnit.cpp | 2 -
core/sql/refresh/RuDupElimTaskExecutor.cpp | 8 --
core/sql/refresh/RuException.cpp | 12 --
core/sql/refresh/RuForceOptionsParser.cpp | 2 -
core/sql/refresh/RuOptions.cpp | 12 --
core/sql/refresh/RuRefreshTaskExecutor.cpp | 26 ----
.../refresh/RuSQLDynamicStatementContainer.cpp | 6 -
core/sql/refresh/RuSQLStatementContainer.cpp | 4 -
core/sql/refresh/RuTableSyncTaskExecutor.cpp | 4 -
core/sql/refresh/RuTaskExecutor.cpp | 4 -
core/sql/refresh/RuTestTaskExecutor.cpp | 16 ---
.../refresh/RuUnAuditRefreshTaskExecutor.cpp | 16 ---
core/sql/sort/RunDirectory.cpp | 2 -
core/sql/sort/ScratchSpace.cpp | 2 -
core/sql/sort/SortAlgo.cpp | 6 -
core/sql/sort/SortUtil.cpp | 6 -
core/sql/sort/TourTree.cpp | 2 -
core/sql/sort/TreeNode.cpp | 6 -
core/sql/sort/scratchfile_base.cpp | 2 -
core/sql/sqlcomp/CmpDescribe.cpp | 8 --
core/sql/sqlcomp/DefaultValidator.cpp | 4 -
core/sql/sqlcomp/NewDel.cpp | 8 --
core/sql/sqlcomp/nadefaults.cpp | 14 --
core/sql/sqlcomp/parser.cpp | 8 --
core/sql/sqlmsg/ComDiagsMsg.cpp | 14 --
core/sql/sqlmsg/ErrorMessage.cpp | 12 --
core/sql/sqlmsg/GetErrorMessage.cpp | 10 --
core/sql/sqlmsg/ParserMsg.cpp | 4 -
core/sql/sqlmxevents/logmxevent_sq.h | 2 -
core/sql/sqlshare/CatSQLShare.cpp | 2 -
core/sql/udrserv/UdrStreams.cpp | 2 -
core/sql/udrserv/udrutil.cpp | 2 -
core/sql/ustat/hs_cli.cpp | 43 ------
core/sql/ustat/hs_cli.h | 2 -
core/sql/ustat/hs_globals.cpp | 14 --
core/sql/ustat/hs_la.cpp | 4 -
core/sql/ustat/hs_lex.ll | 3 -
core/sql/ustat/hs_read.cpp | 16 ---
core/sql/ustat/hs_util.cpp | 2 -
core/sql/ustat/hs_yacc.y | 5 -
393 files changed, 18 insertions(+), 3921 deletions(-)
----------------------------------------------------------------------
[08/12] incubator-trafodion git commit: TRAFODION-2731 CodeCleanup:
Phase 4. Remove legacy/obsolete pragmas
Posted by an...@apache.org.
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);
[07/12] incubator-trafodion git commit: TRAFODION-2731 CodeCleanup:
Phase 4. Remove legacy/obsolete pragmas
Posted by an...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/exp/exp_conv.cpp
----------------------------------------------------------------------
diff --git a/core/sql/exp/exp_conv.cpp b/core/sql/exp/exp_conv.cpp
index ecda9c2..1d51814 100644
--- a/core/sql/exp/exp_conv.cpp
+++ b/core/sql/exp/exp_conv.cpp
@@ -1123,17 +1123,13 @@ ex_expr::exp_return_type convLargeDecToAscii(char *target,
// fill in digits
Lng32 i = 0;
for (i = 0; i < (requiredDigits-sourceScale); i++, targetPos++, currPos++)
-#pragma nowarn(1506) // warning elimination
target[targetPos] = source[currPos] + '0';
-#pragma warn(1506) // warning elimination
// if we have a scale, add decimal point and some digits
if (sourceScale) {
target[targetPos++] = '.';
for (i = 0; i < sourceScale; i++, targetPos++, currPos++)
-#pragma nowarn(1506) // warning elimination
target[targetPos] = source[currPos] + '0';
-#pragma warn(1506) // warning elimination
};
// Right pad blanks for fixed char.
@@ -2114,9 +2110,7 @@ ex_expr::exp_return_type convInt64ToDec(char *target,
return ex_expr::EXPR_ERROR;
};
-#pragma nowarn(1506) // warning elimination
target[currPos--] = '0' + (char)(source % 10);
-#pragma warn(1506) // warning elimination
source /= 10;
};
@@ -2165,9 +2159,7 @@ ex_expr::exp_return_type convAsciiToDec(char *target,
{
// pad the target with zeros
while (targetPos >= 0)
-#pragma nowarn(1506) // warning elimination
target[targetPos--] = '0' - offset;
-#pragma warn(1506) // warning elimination
return ex_expr::EXPR_OK;
}
@@ -2244,9 +2236,7 @@ ex_expr::exp_return_type convAsciiToDec(char *target,
// only zeros found, target is 0
if (sourceStart == sourceLen) {
-#pragma nowarn(1506) // warning elimination
str_pad(target, targetLen, '0' - offset);
-#pragma warn(1506) // warning elimination
return ex_expr::EXPR_OK;
};
@@ -2269,9 +2259,7 @@ ex_expr::exp_return_type convAsciiToDec(char *target,
while ((sourcePos >= sourceStart) && (targetPos >= 0)) {
// add zeros to adjust scale
if (targetScale > sourceScale) {
-#pragma nowarn(1506) // warning elimination
target[targetPos--] = '0' - offset;
-#pragma warn(1506) // warning elimination
targetScale--;
}
else if (targetScale < sourceScale) {
@@ -2296,9 +2284,7 @@ ex_expr::exp_return_type convAsciiToDec(char *target,
return ex_expr::EXPR_ERROR;
};
// copy source to target
-#pragma nowarn(1506) // warning elimination
target[targetPos--] = source[sourcePos--] - offset;
-#pragma warn(1506) // warning elimination
};
};
@@ -2321,9 +2307,7 @@ ex_expr::exp_return_type convAsciiToDec(char *target,
// left pad the target with zeros
while (targetPos >= 0)
-#pragma nowarn(1506) // warning elimination
target[targetPos--] = '0' - offset;
-#pragma warn(1506) // warning elimination
// add sign
if (negative)
@@ -2552,9 +2536,7 @@ ex_expr::exp_return_type convAsciiFieldToInt64(Int64 &target,
while ((currPos < sourceLen) && ((source[currPos] >= '0') &&
(source[currPos] <= '9')))
{
-#pragma nowarn(1506) // warning elimination
short thisDigit = source[currPos] - '0';
-#pragma warn(1506) // warning elimination
if (target > (LLONG_MAX / 10))
{ // next power of 10 causes an overflow
ExRaiseDetailSqlError(heap, diagsArea, EXE_NUMERIC_OVERFLOW, source,
@@ -2796,9 +2778,7 @@ ex_expr::exp_return_type convAsciiToInterval(char *target,
return ex_expr::EXPR_ERROR;
};
if (negInterval)
-#pragma nowarn(1506) // warning elimination
*(Target<short> *)target = -(short)intermediate;
-#pragma warn(1506) // warning elimination
else
*(Target<short> *)target = (short)intermediate;
break;
@@ -3251,9 +3231,7 @@ ex_conv_clause::ConvResult convLargeDecToDecAndScale(char *target,
str_pad(target, targetPos, '0');
while (sourcePos < sourceLen)
-#pragma nowarn(1506) // warning elimination
target[targetPos++] = source[sourcePos++] + '0';
-#pragma warn(1506) // warning elimination
// do any scaling down needed
while (exponent > 0)
@@ -4882,7 +4860,6 @@ ex_expr::exp_return_type convCharToChar(
-#pragma warning (disable : 4101) //warning elimination
ex_expr::exp_return_type
convDoIt(char * source,
Lng32 sourceLen,
@@ -5774,9 +5751,7 @@ convDoIt(char * source,
{
if (dataConversionErrorFlag != 0)
{ // Set the target value.
-#pragma nowarn(1506) // warning elimination
*(short *)target = *(unsigned short *)source;
-#pragma warn(1506) // warning elimination
}
else
{ // Check target precision. Then set target value.
@@ -5792,9 +5767,7 @@ convDoIt(char * source,
diagsArea,
tempFlags) == ex_expr::EXPR_OK)
{
-#pragma nowarn(1506) // warning elimination
*(short *)target = *(unsigned short *)source;
-#pragma warn(1506) // warning elimination
}
else
{
@@ -6356,9 +6329,7 @@ convDoIt(char * source,
{
if (dataConversionErrorFlag != 0)
{ // Set the target value.
-#pragma nowarn(1506) // warning elimination
*(Lng32 *)target = *(ULng32 *)source;
-#pragma warn(1506) // warning elimination
}
else
{ // Check target precision. Then set target value.
@@ -6374,9 +6345,7 @@ convDoIt(char * source,
diagsArea,
tempFlags) == ex_expr::EXPR_OK)
{
-#pragma nowarn(1506) // warning elimination
*(Lng32 *)target = *(ULng32 *)source;
-#pragma warn(1506) // warning elimination
}
else
{
@@ -7297,11 +7266,7 @@ convDoIt(char * source,
if (dataConversionErrorFlag != 0)
{
// Convert back and check for a value change.
-#pragma warning (disable : 4244) //warning elimination
-#pragma nowarn(1506) // warning elimination
float floatsource2 = int64source;
-#pragma warn(1506) // warning elimination
-#pragma warning (default : 4244) //warning elimination
if (floatsource2 > floatsource)
{
*dataConversionErrorFlag = ex_conv_clause::CONV_RESULT_ROUNDED_UP;
@@ -7374,11 +7339,7 @@ convDoIt(char * source,
if (dataConversionErrorFlag != 0)
{
// Convert back and check for a value change.
-#pragma warning (disable : 4244) //warning elimination
-#pragma nowarn(1506) // warning elimination
float floatsource2 = int64source;
-#pragma warn(1506) // warning elimination
-#pragma warning (default : 4244) //warning elimination
if (floatsource2 > floatsource)
{
*dataConversionErrorFlag = ex_conv_clause::CONV_RESULT_ROUNDED_UP;
@@ -7453,11 +7414,7 @@ convDoIt(char * source,
if (dataConversionErrorFlag != 0)
{
// Convert back and check for a value change.
-#pragma warning (disable : 4244) //warning elimination
-#pragma nowarn(1506) // warning elimination
float floatsource2 = int64source;
-#pragma warn(1506) // warning elimination
-#pragma warning (default : 4244) //warning elimination
if (floatsource2 > floatsource)
{
*dataConversionErrorFlag = ex_conv_clause::CONV_RESULT_ROUNDED_UP;
@@ -7530,11 +7487,7 @@ convDoIt(char * source,
if (dataConversionErrorFlag != 0)
{
// Convert back and check for a value change.
-#pragma warning (disable : 4244) //warning elimination
-#pragma nowarn(1506) // warning elimination
float floatsource2 = int64source;
-#pragma warn(1506) // warning elimination
-#pragma warning (default : 4244) //warning elimination
if (floatsource2 > floatsource)
{
*dataConversionErrorFlag = ex_conv_clause::CONV_RESULT_ROUNDED_UP;
@@ -7609,11 +7562,7 @@ convDoIt(char * source,
if (dataConversionErrorFlag != 0)
{
// Convert back and check for a value change.
-#pragma warning (disable : 4244) //warning elimination
-#pragma nowarn(1506) // warning elimination
float floatsource2 = int64source;
-#pragma warn(1506) // warning elimination
-#pragma warning (default : 4244) //warning elimination
if (floatsource2 > floatsource)
{
*dataConversionErrorFlag = ex_conv_clause::CONV_RESULT_ROUNDED_UP;
@@ -7726,9 +7675,7 @@ convDoIt(char * source,
case CONV_FLOAT32_DECS:
{
float floatsource = *floatSrcPtr;
-#pragma nowarn(1506) // warning elimination
if (floatsource < getMinDecValue(targetLen, targetType))
-#pragma warn(1506) // warning elimination
{
if (dataConversionErrorFlag != 0)
{
@@ -7743,9 +7690,7 @@ convDoIt(char * source,
return ex_expr::EXPR_ERROR;
}
}
-#pragma nowarn(1506) // warning elimination
else if (floatsource > getMaxDecValue(targetLen))
-#pragma warn(1506) // warning elimination
{
if (dataConversionErrorFlag != 0)
{
@@ -7766,11 +7711,7 @@ convDoIt(char * source,
if (dataConversionErrorFlag != 0)
{
// Convert back and check for a value change.
-#pragma warning (disable : 4244) //warning elimination
-#pragma nowarn(1506) // warning elimination
float floatsource2 = int64source;
-#pragma warn(1506) // warning elimination
-#pragma warning (default : 4244) //warning elimination
if (floatsource2 > floatsource)
{
*dataConversionErrorFlag = ex_conv_clause::CONV_RESULT_ROUNDED_UP;
@@ -7924,11 +7865,7 @@ convDoIt(char * source,
if (dataConversionErrorFlag != 0)
{
// Convert back and check for a value change.
-#pragma warning (disable : 4244) //warning elimination
-#pragma nowarn(1506) // warning elimination
double doublesource2 = int64source;
-#pragma warn(1506) // warning elimination
-#pragma warning (default : 4244) //warning elimination
if (doublesource2 > doublesource)
{
*dataConversionErrorFlag = ex_conv_clause::CONV_RESULT_ROUNDED_UP;
@@ -8000,12 +7937,8 @@ convDoIt(char * source,
Int64 int64source = (Int64) doublesource;
if (dataConversionErrorFlag != 0)
{
-#pragma warning (disable : 4244) //warning elimination
// Convert back and check for a value change.
-#pragma nowarn(1506) // warning elimination
double doublesource2 = int64source;
-#pragma warn(1506) // warning elimination
-#pragma warning (default : 4244) //warning elimination
if (doublesource2 > doublesource)
{
*dataConversionErrorFlag = ex_conv_clause::CONV_RESULT_ROUNDED_UP;
@@ -8079,11 +8012,7 @@ convDoIt(char * source,
if (dataConversionErrorFlag != 0)
{
// Convert back and check for a value change.
-#pragma warning (disable : 4244) //warning elimination
-#pragma nowarn(1506) // warning elimination
double doublesource2 = int64source;
-#pragma warn(1506) // warning elimination
-#pragma warning (default : 4244) //warning elimination
if (doublesource2 > doublesource)
{
*dataConversionErrorFlag = ex_conv_clause::CONV_RESULT_ROUNDED_UP;
@@ -8156,13 +8085,7 @@ convDoIt(char * source,
if (dataConversionErrorFlag != 0)
{
// Convert back and check for a value change.
-#pragma warning (disable : 4244) //warning elimination
-#pragma nowarn(1506) // warning elimination
double doublesource2 = int64source;
-#pragma warn(1506) // warning elimination
-#pragma nowarn(1506) // warning elimination
-#pragma warning (default : 4244) //warning elimination
-#pragma warn(1506) // warning elimination
if (doublesource2 > doublesource)
{
*dataConversionErrorFlag = ex_conv_clause::CONV_RESULT_ROUNDED_UP;
@@ -8237,13 +8160,7 @@ convDoIt(char * source,
if (dataConversionErrorFlag != 0)
{
// Convert back and check for a value change.
-#pragma warning (disable : 4244) //warning elimination
-#pragma nowarn(1506) // warning elimination
double doublesource2 = int64source;
-#pragma warn(1506) // warning elimination
-#pragma nowarn(1506) // warning elimination
-#pragma warning (default : 4244) //warning elimination
-#pragma warn(1506) // warning elimination
if (doublesource2 > doublesource)
{
*dataConversionErrorFlag = ex_conv_clause::CONV_RESULT_ROUNDED_UP;
@@ -8356,9 +8273,7 @@ convDoIt(char * source,
case CONV_FLOAT64_DECU:
{
double doublesource = *doubleSrcPtr;
-#pragma nowarn(1506) // warning elimination
if (doublesource < getMinDecValue(targetLen, targetType))
-#pragma warn(1506) // warning elimination
{
if (dataConversionErrorFlag != 0)
{
@@ -8373,9 +8288,7 @@ convDoIt(char * source,
return ex_expr::EXPR_ERROR;
}
}
-#pragma nowarn(1506) // warning elimination
else if (doublesource > getMaxDecValue(targetLen))
-#pragma warn(1506) // warning elimination
{
if (dataConversionErrorFlag != 0)
{
@@ -8396,11 +8309,7 @@ convDoIt(char * source,
if (dataConversionErrorFlag != 0)
{
// Convert back and check for a value change.
-#pragma warning (disable : 4244) //warning elimination
-#pragma nowarn(1506) // warning elimination
double doublesource2 = int64source;
-#pragma warn(1506) // warning elimination
-#pragma warning (default : 4244) //warning elimination
if (doublesource2 > doublesource)
{
*dataConversionErrorFlag = ex_conv_clause::CONV_RESULT_ROUNDED_UP;
@@ -11417,7 +11326,6 @@ convDoIt(char * source,
};
return ex_expr::EXPR_OK;
}
-#pragma warning (default : 4101) //warning elimination
ex_expr::exp_return_type ex_conv_clause::eval(char *op_data[],
CollHeap *heap,
@@ -11553,7 +11461,6 @@ ex_expr::exp_return_type ex_conv_clause::eval(char *op_data[],
source = (char*)ptrVal;
}
-#pragma nowarn(1506) // warning elimination
retcode = convDoIt(source, //op_data[1],
src->getLength(op_data[-MAX_OPERANDS + 1]),
src->getDatatype(),
@@ -11572,7 +11479,6 @@ ex_expr::exp_return_type ex_conv_clause::eval(char *op_data[],
dataConversionErrorFlag,
convFlags
);
-#pragma warn(1506) // warning elimination
if ((flags_ & REVERSE_DATA_ERROR_CONVERSION_FLAG) != 0)
{
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/exp/exp_datetime.cpp
----------------------------------------------------------------------
diff --git a/core/sql/exp/exp_datetime.cpp b/core/sql/exp/exp_datetime.cpp
index 90403b1..3a899e7 100644
--- a/core/sql/exp/exp_datetime.cpp
+++ b/core/sql/exp/exp_datetime.cpp
@@ -1164,9 +1164,7 @@ short ExpDatetime::subDatetimeDatetime(Attributes *datetimeOpType,
// Scale the result to the interval qualifier's fractional precision.
//
if (intervalEndField == REC_DATE_SECOND) {
-#pragma nowarn(1506) // warning elimination
short fpDiff = intervalOpType->getScale() - datetimeOpType->getScale();
-#pragma warn(1506) // warning elimination
if (fpDiff > 0) {
do {
result *= 10;
@@ -3091,9 +3089,7 @@ convertToAscii(Lng32 value, char *&result, UInt32 width)
// Format value as a string.
//
while ((value != 0) && (i > 0)) {
-#pragma nowarn(1506) // warning elimination
result[--i] = '0' + (char) (value % 10);
-#pragma warn(1506) // warning elimination
value /= 10;
}
@@ -3747,9 +3743,7 @@ short ExpDatetime::getDisplaySize(Lng32 datetimeCode,
displayLength += 1 /* for separator */ + fractionPrecision;
}
}
-#pragma nowarn(1506) // warning elimination
return displayLength;
-#pragma warn(1506) // warning elimination
}
short ExpDatetime::convAsciiDatetimeToASCII(char *srcData,
@@ -3764,14 +3758,10 @@ short ExpDatetime::convAsciiDatetimeToASCII(char *srcData,
{
short rc = 0;
-#pragma warning (disable : 4244) //warning elimination
-#pragma nowarn(1506) // warning elimination
SimpleType tempST(REC_DATETIME, 12,
srcScale, srcPrecision,
ExpTupleDesc::SQLMX_FORMAT,
0, 0, 0, 0, Attributes::NO_DEFAULT, 0);
-#pragma warn(1506) // warning elimination
-#pragma warning (default : 4244) //warning elimination
char tempDTBuf[12]; // max length for an internal datetime value.
@@ -3782,13 +3772,9 @@ short ExpDatetime::convAsciiDatetimeToASCII(char *srcData,
if (rc)
return rc;
-#pragma warning (disable : 4244) //warning elimination
-#pragma nowarn(1506) // warning elimination
rc =
tempDT.convDatetimeToASCII(tempDTBuf, dstData, dstLen, format, NULL,
heap, diagsArea);
-#pragma warn(1506) // warning elimination
-#pragma warning (default : 4244) //warning elimination
if (rc < 0)
return rc;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/exp/exp_datetime.h
----------------------------------------------------------------------
diff --git a/core/sql/exp/exp_datetime.h b/core/sql/exp/exp_datetime.h
index d8d0bd7..c665d21 100644
--- a/core/sql/exp/exp_datetime.h
+++ b/core/sql/exp/exp_datetime.h
@@ -44,7 +44,6 @@
#include "exp_attrs.h"
#include "Int64.h"
-#pragma warning ( disable : 4251 )
class ExpDatetime : public SimpleType {
@@ -393,7 +392,6 @@ private:
};
-#pragma warning ( default : 4251 )
#endif
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/exp/exp_dp2_expr.cpp
----------------------------------------------------------------------
diff --git a/core/sql/exp/exp_dp2_expr.cpp b/core/sql/exp/exp_dp2_expr.cpp
index 5b689be..0f83500 100644
--- a/core/sql/exp/exp_dp2_expr.cpp
+++ b/core/sql/exp/exp_dp2_expr.cpp
@@ -53,13 +53,11 @@
// -----------------------------------------------------------------------
Lng32 ExpDP2Expr::spaceNeededForWorkAtp()
{
-#pragma nowarn(1506) // warning elimination
return ( ( criDesc_ != (ExCriDescPtr) NULL )
? 2 * (sizeof(atp_struct) +
criDesc_->noTuples() * (sizeof(tupp) +
sizeof(tupp_descriptor)))
: 0);
-#pragma warn(1506) // warning elimination
}
ExpDP2Expr::ExpDP2Expr(ex_expr_base * expr,
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/exp/exp_dp2_expr.h
----------------------------------------------------------------------
diff --git a/core/sql/exp/exp_dp2_expr.h b/core/sql/exp/exp_dp2_expr.h
index d163066..af47936 100644
--- a/core/sql/exp/exp_dp2_expr.h
+++ b/core/sql/exp/exp_dp2_expr.h
@@ -50,7 +50,6 @@ class ExpDP2Expr;
typedef NAOpenObjectPtrTempl<atp_struct> AtpStructPtr;
typedef NAVersionedObjectPtrTempl<ExpDP2Expr> ExpDP2ExprPtr;
-#pragma warning ( disable : 4251 )
/////////////////////////////////////////////////////////////////////////////
// class ExpDP2Expr
@@ -145,6 +144,5 @@ public:
};
-#pragma warning ( default : 4251 )
#endif
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/exp/exp_expr.cpp
----------------------------------------------------------------------
diff --git a/core/sql/exp/exp_expr.cpp b/core/sql/exp/exp_expr.cpp
index f7dc7bb..1b0098b 100644
--- a/core/sql/exp/exp_expr.cpp
+++ b/core/sql/exp/exp_expr.cpp
@@ -60,24 +60,16 @@ char *ex_expr::findVTblPtr(short classID)
switch (classID)
{
case exp_INPUT_OUTPUT:
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblPtr, InputOutputExpr);
-#pragma warn(1506) // warning elimination
break;
case exp_AGGR:
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblPtr, AggrExpr);
-#pragma warn(1506) // warning elimination
break;
case exp_LEAN_EXPR:
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblPtr, ex_expr_lean);
-#pragma warn(1506) // warning elimination
break;
default:
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblPtr, ex_expr);
-#pragma warn(1506) // warning elimination
break;
}
return vtblPtr;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/exp/exp_expr.h
----------------------------------------------------------------------
diff --git a/core/sql/exp/exp_expr.h b/core/sql/exp/exp_expr.h
index 477e855..8283d40 100644
--- a/core/sql/exp/exp_expr.h
+++ b/core/sql/exp/exp_expr.h
@@ -141,7 +141,6 @@ public:
void setNExDbgLvl( Int32 Lvl ) { NExDbgLvl_ = Lvl ; }
};
-#pragma warning ( disable : 4251 )
class ex_expr : public NAVersionedObject
{
@@ -865,7 +864,6 @@ protected:
//////////////////////////////////////////////////
// class AggrExpr
//////////////////////////////////////////////////
-#pragma nowarn(1319) // warning elimination
class AggrExpr : public ex_expr {
enum Flags {
@@ -947,7 +945,6 @@ public:
NABoolean isOneRowAggr()
{ return( (flags_ & ONE_ROW_AGGR) != 0); }
};
-#pragma warn(1319) // warning elimination
// -----------------------------------------------------------------------
// Template instantiation to produce a 64-bit pointer emulator class
@@ -1250,7 +1247,6 @@ public:
};
-#pragma warning ( default : 4251 )
///////////////////////////////////////////////////
// class Target
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/exp/exp_function.cpp
----------------------------------------------------------------------
diff --git a/core/sql/exp/exp_function.cpp b/core/sql/exp/exp_function.cpp
index 64f2c3b..b0e01de 100644
--- a/core/sql/exp/exp_function.cpp
+++ b/core/sql/exp/exp_function.cpp
@@ -808,9 +808,7 @@ ex_expr::exp_return_type ex_function_get_bit_value_at::eval(char *op_data[],
CollHeap *heap,
ComDiagsArea** diagsArea)
{
-#pragma nowarn(1506) // warning elimination
Lng32 buffLen = getOperand(1)->getLength(op_data[1]);
-#pragma warn(1506) // warning elimination
// Get the position from operand 2.
Lng32 pos = *(Lng32 *)op_data[2];
@@ -829,9 +827,7 @@ ex_expr::exp_return_type ex_function_get_bit_value_at::eval(char *op_data[],
unsigned char onechar = *(unsigned char *)(op_data[1] + charnum);
unsigned char mask = 1;
-#pragma nowarn(1506) // warning elimination
mask = mask<<bitnum;
-#pragma warn(1506) // warning elimination
*((ULng32*)op_data[0]) = (ULng32) (mask & onechar ? 1 : 0);
@@ -845,10 +841,8 @@ ex_expr::exp_return_type ex_function_is_bitwise_and_true::eval(char *op_data[],
CollHeap *heap,
ComDiagsArea** diagsArea)
{
-#pragma nowarn(1506) // warning elimination
Lng32 leftSize = getOperand(1)->getLength(op_data[1]);
Lng32 rightSize = getOperand(2)->getLength(op_data[2]);
-#pragma warn(1506) // warning elimination
if (leftSize != rightSize)
{
@@ -933,10 +927,8 @@ ex_expr::exp_return_type ex_function_concat::eval(char *op_data[],
CollHeap *heap,
ComDiagsArea** diagsArea)
{
-#pragma nowarn(1506) // warning elimination
Lng32 len1 = getOperand(1)->getLength(op_data[-MAX_OPERANDS+1]);
Lng32 len2 = getOperand(2)->getLength(op_data[-MAX_OPERANDS+2]);
-#pragma warn(1506) // warning elimination
CharInfo::CharSet cs = ((SimpleType *)getOperand(1))->getCharSet();
@@ -1346,9 +1338,7 @@ ex_expr::exp_return_type ex_function_trim_char::eval(char *op_data[],
char trimCharSmallBuf[lenTrimCharSmallBuf];
// find out the length of trim character.
-#pragma nowarn(1506) // warning elimination
Lng32 len1 = getOperand(1)->getLength(op_data[-MAX_OPERANDS+1]);
-#pragma warn(1506) // warning elimination
CharInfo::CharSet cs = ((SimpleType *)getOperand(0))->getCharSet();
@@ -1381,9 +1371,7 @@ ex_expr::exp_return_type ex_function_trim_char::eval(char *op_data[],
return ex_expr::EXPR_ERROR;
}
-#pragma nowarn(1506) // warning elimination
Lng32 len2 = getOperand(2)->getLength(op_data[-MAX_OPERANDS+2]);
-#pragma warn(1506) // warning elimination
if (cs == CharInfo::UTF8) // If so, must ignore any filler spaces at end of string
{
@@ -1782,9 +1770,7 @@ ex_expr::exp_return_type ex_function_oct_length::eval(char *op_data[],
Int32 prec1 = ((SimpleType *)getOperand(1))->getPrecision();
len1 = Attributes::trimFillerSpaces( op_data[1], prec1, len1, cs );
}
-#pragma nowarn(1506) // warning elimination
*(Lng32 *)op_data[0] = len1;
-#pragma warn(1506) // warning elimination
return ex_expr::EXPR_OK;
};
@@ -2017,9 +2003,7 @@ ex_expr::exp_return_type ExFunctionConvertHex::eval(char *op_data[],
{
static const char HexArray[16] = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'};
-#pragma nowarn(1506) // warning elimination
Lng32 len1 = getOperand(1)->getLength(op_data[-MAX_OPERANDS+1]);
-#pragma warn(1506) // warning elimination
if (getOperType() == ITM_CONVERTTOHEX)
{
Int32 i;
@@ -2079,27 +2063,17 @@ ex_expr::exp_return_type ExFunctionConvertHex::eval(char *op_data[],
unsigned char upper4Bits;
unsigned char lower4Bits;
if ((op_data[1][i] >= '0') && (op_data[1][i] <= '9'))
-#pragma nowarn(1506) // warning elimination
upper4Bits = (unsigned char)(op_data[1][i]) - '0';
-#pragma warn(1506) // warning elimination
else
-#pragma nowarn(1506) // warning elimination
upper4Bits = (unsigned char)(op_data[1][i]) - 'A' + 10;
-#pragma warn(1506) // warning elimination
if ((op_data[1][i+1] >= '0') && (op_data[1][i+1] <= '9'))
-#pragma nowarn(1506) // warning elimination
lower4Bits = (unsigned char)(op_data[1][i+1]) - '0';
-#pragma warn(1506) // warning elimination
else
-#pragma nowarn(1506) // warning elimination
lower4Bits = (unsigned char)(op_data[1][i+1]) - 'A' + 10;
-#pragma warn(1506) // warning elimination
-#pragma nowarn(1506) // warning elimination
op_data[0][j] = (upper4Bits << 4) | lower4Bits;
-#pragma warn(1506) // warning elimination
i += 2;
j++;
@@ -2227,9 +2201,7 @@ ex_function_char_length_doublebyte::eval(char *op_data[],
// The data type of result is long.
*(Lng32 *)op_data[0] =
-#pragma nowarn(1506) // warning elimination
(getOperand(1)->getLength(op_data[-MAX_OPERANDS+1])) >> 1;
-#pragma warn(1506) // warning elimination
return ex_expr::EXPR_OK;
@@ -2243,9 +2215,7 @@ ex_expr::exp_return_type ex_function_position::eval(char *op_data[],
// search for operand 1
-#pragma nowarn(1506) // warning elimination
Lng32 len1 = getOperand(1)->getLength(op_data[-MAX_OPERANDS+1]);
-#pragma warn(1506) // warning elimination
if ( cs == CharInfo::UTF8 )
{
Int32 prec1 = ((SimpleType *)getOperand(1))->getPrecision();
@@ -2253,9 +2223,7 @@ ex_expr::exp_return_type ex_function_position::eval(char *op_data[],
}
// in operand 2
-#pragma nowarn(1506) // warning elimination
Lng32 len2 = getOperand(2)->getLength(op_data[-MAX_OPERANDS+2]);
-#pragma warn(1506) // warning elimination
if ( cs == CharInfo::UTF8 )
{
Int32 prec2 = ((SimpleType *)getOperand(2))->getPrecision();
@@ -2303,17 +2271,13 @@ ex_expr::exp_return_type ex_function_position_doublebyte::eval(char *op_data[],
CollHeap*,
ComDiagsArea**)
{
-#pragma nowarn(1506) // warning elimination
Lng32 len1 = ( getOperand(1)->getLength(op_data[-MAX_OPERANDS+1]) ) / sizeof(NAWchar);
-#pragma warn(1506) // warning elimination
// If len1 is 0, return a position of 1.
Lng32 position = 1;
if (len1 > 0)
{
-#pragma nowarn(1506) // warning elimination
Lng32 len2 = ( getOperand(2)->getLength(op_data[-MAX_OPERANDS+2]) ) / sizeof(NAWchar);
-#pragma warn(1506) // warning elimination
NAWchar* pat = (NAWchar*)op_data[1];
NAWchar* source = (NAWchar*)op_data[2];
@@ -2372,9 +2336,7 @@ ex_expr::exp_return_type ExFunctionTokenStr::eval(char *op_data[],
{
CharInfo::CharSet cs = ((SimpleType *)getOperand(1))->getCharSet();
// search for operand 1
-#pragma nowarn(1506) // warning elimination
Lng32 len1 = getOperand(1)->getLength(op_data[-MAX_OPERANDS+1]);
-#pragma warn(1506) // warning elimination
if ( cs == CharInfo::UTF8 )
{
Int32 prec1 = ((SimpleType *)getOperand(1))->getPrecision();
@@ -2382,9 +2344,7 @@ ex_expr::exp_return_type ExFunctionTokenStr::eval(char *op_data[],
}
// in operand 2
-#pragma nowarn(1506) // warning elimination
Lng32 len2 = getOperand(2)->getLength(op_data[-MAX_OPERANDS+2]);
-#pragma warn(1506) // warning elimination
if ( cs == CharInfo::UTF8 )
{
Int32 prec2 = ((SimpleType *)getOperand(2))->getPrecision();
@@ -2792,9 +2752,7 @@ ex_expr::exp_return_type ex_function_dayofweek::eval(char *op_data[],
month = *datetimeOpData++;
day = *datetimeOpData;
interval = datetimeOpType->getTotalDays(year, month, day);
-#pragma nowarn(1506) // warning elimination
unsigned short result = (unsigned short)((interval + 1) % 7) + 1;
-#pragma warn(1506) // warning elimination
str_cpy_all(op_data[0], (char *) &result, sizeof(result));
return ex_expr::EXPR_OK;
}
@@ -3504,9 +3462,7 @@ void ex_function_encode::encodeKeyValue(Attributes * attr,
//
if (source[0] & 0200) {
for (Lng32 i = 0; i < length; i++)
-#pragma nowarn(1506) // warning elimination
target[i] = ~source[i];
-#pragma warn(1506) // warning elimination
} else {
if (target != source)
str_cpy_all(target, source, length);
@@ -4328,7 +4284,6 @@ ex_expr::exp_return_type ex_function_explode_varchar::eval(char *op_data[],
if (forInsert_)
{
// move source to target. No blankpadding.
-#pragma nowarn(1506) // warning elimination
return convDoIt(op_data[1],
getOperand(1)->getLength(op_data[-MAX_OPERANDS + 1]),
getOperand(1)->getDatatype(),
@@ -4343,12 +4298,10 @@ ex_expr::exp_return_type ex_function_explode_varchar::eval(char *op_data[],
getOperand(0)->getVCIndicatorLength(),
heap,
diagsArea);
-#pragma warn(1506) // warning elimination
}
else
{
// move source to target. Blankpad target to maxLength.
-#pragma nowarn(1506) // warning elimination
if (convDoIt(op_data[1],
getOperand(1)->getLength(op_data[-MAX_OPERANDS + 1]),
getOperand(0)->getDatatype(),
@@ -4364,7 +4317,6 @@ ex_expr::exp_return_type ex_function_explode_varchar::eval(char *op_data[],
heap,
diagsArea))
return ex_expr::EXPR_ERROR;
-#pragma warn(1506) // warning elimination
// Move max length to length bytes of target.
getOperand(0)->setVarLength(getOperand(0)->getLength(),
@@ -5339,9 +5291,7 @@ ex_expr::exp_return_type ExpRaiseErrorFunction::eval(char *op_data[],
if (getNumOperands()==2)
{
-#pragma nowarn(1506) // warning elimination
Lng32 len1 = getOperand(1)->getLength(op_data[-MAX_OPERANDS+1]);
-#pragma warn(1506) // warning elimination
op_data[1][len1] = '\0';
*(*diagsArea) << DgString1(op_data[1]); // The string expression
}
@@ -5431,9 +5381,7 @@ ex_expr::exp_return_type ExFunctionPack::eval(char* op_data[],
char* nullByte = op_data[0] + nullBitOffsetInBytes + sizeof(Int32);
// Used to set/unset the null bit.
-#pragma nowarn(1506) // warning elimination
unsigned char nullByteMask = (1 << nullBitOffsetInBits);
-#pragma warn(1506) // warning elimination
// Turn bit off/on depending on whether operand is null.
if(nullFlag == 0)
@@ -5492,20 +5440,16 @@ ex_expr::exp_return_type ExFunctionPack::eval(char* op_data[],
if(bitsToCopyThisRound > bitsToCopy) bitsToCopyThisRound = bitsToCopy;
// Mask has ones in the those positions where bits will be copied to.
-#pragma nowarn(1506) // warning elimination
unsigned char mask = ((0xFF >> tgtBitOffset) <<
(8 - bitsToCopyThisRound)) >>
(8 - tgtBitOffset - bitsToCopyThisRound);
-#pragma warn(1506) // warning elimination
// Clear target bits. Keep other bits unchanged in the target byte.
(*tgtBytePtr) &= (~mask);
// Align source bits with its the destination. Mask off other bits.
unsigned char srcByte = *(op_data[1] + srcByteOffset);
-#pragma nowarn(1506) // warning elimination
srcByte = ((srcByte >> srcBitOffset) << tgtBitOffset) & mask;
-#pragma warn(1506) // warning elimination
// Make the copy.
(*tgtBytePtr) |= srcByte;
@@ -5598,9 +5542,7 @@ ExUnPackCol::eval(char *op_data[], CollHeap *heap, ComDiagsArea **diagsArea)
// The byte of the CHAR field containing the bit.
//
-#pragma nowarn(1506) // warning elimination
Lng32 byteOffset = sizeof(Int32) + (bitOffset >> 3);
-#pragma warn(1506) // warning elimination
// The bit of the byte at byteOffset to be extracted.
//
@@ -5685,9 +5627,7 @@ ExUnPackCol::eval(char *op_data[], CollHeap *heap, ComDiagsArea **diagsArea)
// The index into the byte of the value.
//
-#pragma nowarn(1506) // warning elimination
Lng32 itemIndex = index & ( itemsPerByte - 1);
-#pragma warn(1506) // warning elimination
// A mask to extract an item of size width.
//
@@ -5712,14 +5652,10 @@ ExUnPackCol::eval(char *op_data[], CollHeap *heap, ComDiagsArea **diagsArea)
//
switch(getOperand(0)->getLength()) {
case 1:
-#pragma nowarn(1506) // warning elimination
*(unsigned char *)op_data[0] = value;
-#pragma warn(1506) // warning elimination
return ex_expr::EXPR_OK;
case 2:
-#pragma nowarn(1506) // warning elimination
*(unsigned short *)op_data[0] = value;
-#pragma warn(1506) // warning elimination
return ex_expr::EXPR_OK;
case 4:
*(ULng32 *)op_data[0] = value;
@@ -5731,9 +5667,7 @@ ExUnPackCol::eval(char *op_data[], CollHeap *heap, ComDiagsArea **diagsArea)
return ex_expr::EXPR_ERROR;
}
-#pragma nowarn(203) // warning elimination
return ex_expr::EXPR_OK;
-#pragma warn(203) // warning elimination
}
@@ -5813,9 +5747,7 @@ ExUnPackCol::eval(char *op_data[], CollHeap *heap, ComDiagsArea **diagsArea)
// to the destination. This is the first time this
// byte is written to.
//
-#pragma nowarn(1506) // warning elimination
op_data[0][dindex] = byte >> rshift;
-#pragma warn(1506) // warning elimination
}
dindex++;
@@ -5827,9 +5759,7 @@ ExUnPackCol::eval(char *op_data[], CollHeap *heap, ComDiagsArea **diagsArea)
//
for(i = 0; i < (Lng32) getOperand(0)->getLength(); i++) {
-#pragma nowarn(1506) // warning elimination
unsigned char mask = (width > 7) ? 0xFF : masks[width];
-#pragma warn(1506) // warning elimination
op_data[0][i] &= mask;
width -= 8;
@@ -5857,7 +5787,6 @@ ex_expr::exp_return_type ex_function_translate::eval(char *op_data[],
ULng32 convFlags = (flags_ & TRANSLATE_FLAG_ALLOW_INVALID_CODEPOINT ?
CONV_ALLOW_INVALID_CODE_VALUE : 0);
-#pragma nowarn(1506) // warning elimination
return convDoIt(op_data[1],
op1->getLength(op_data[-MAX_OPERANDS + 1]),
op1->getDatatype(),
@@ -5875,7 +5804,6 @@ ex_expr::exp_return_type ex_function_translate::eval(char *op_data[],
(ConvInstruction)convType,
NULL,
convFlags);
-#pragma warn(1506) // warning elimination
}
void ExFunctionRandomNum::initSeed(char *op_data[])
@@ -5892,9 +5820,7 @@ void ExFunctionRandomNum::initSeed(char *op_data[])
if (getNumOperands() == 2)
{
// seed is specified as an argument. Use it.
-#pragma nowarn(1506) // warning elimination
seed_ = *(ULng32 *)op_data[1];
-#pragma warn(1506) // warning elimination
return;
}
@@ -6012,9 +5938,7 @@ void ExFunctionRandomSelection::initDiff()
// reset the selProbability_ to original value in case this function
// gets called again
-#pragma nowarn(1506) // warning elimination
selProbability_ += difference_;
-#pragma warn(1506) // warning elimination
}
}
@@ -6060,12 +5984,8 @@ ex_expr::exp_return_type ExProgDistrib::eval(char *op_data[],
ULng32 i = 2;
while(offset >= i && i <= totNumValues) {
-#pragma nowarn(1506) // warning elimination
Lng32 n1 = offset % i;
-#pragma warn(1506) // warning elimination
-#pragma nowarn(1506) // warning elimination
Lng32 n2 = offset / i;
-#pragma warn(1506) // warning elimination
if (n1 == 0) {
offset = (i-1) * (n2 - 1) + resultValue;
resultValue = i;
@@ -6569,9 +6489,7 @@ ex_expr::exp_return_type ex_function_json_object_field_text::eval(char *op_data[
{
CharInfo::CharSet cs = ((SimpleType *)getOperand(1))->getCharSet();
// search for operand 1
-#pragma nowarn(1506) // warning elimination
Lng32 len1 = getOperand(1)->getLength(op_data[-MAX_OPERANDS+1]);
-#pragma warn(1506) // warning elimination
if ( cs == CharInfo::UTF8 )
{
Int32 prec1 = ((SimpleType *)getOperand(1))->getPrecision();
@@ -6579,9 +6497,7 @@ ex_expr::exp_return_type ex_function_json_object_field_text::eval(char *op_data[
}
// in operand 2
-#pragma nowarn(1506) // warning elimination
Lng32 len2 = getOperand(2)->getLength(op_data[-MAX_OPERANDS+2]);
-#pragma warn(1506) // warning elimination
if ( cs == CharInfo::UTF8 )
{
Int32 prec2 = ((SimpleType *)getOperand(2))->getPrecision();
@@ -7254,9 +7170,7 @@ short ex_function_encode::decodeKeyValue(Attributes * attr,
{
// compliment all bytes
for (Lng32 k = 0; k < encodedKeyLen; k++)
-#pragma nowarn(1506) // warning elimination
target[k] = ~(source[k]);
-#pragma warn(1506) // warning elimination
source = target;
}
@@ -7442,9 +7356,7 @@ short ex_function_encode::decodeKeyValue(Attributes * attr,
//
if (NOT(source[0] & 0200)) {
for (Lng32 i = 0; i < length; i++)
-#pragma nowarn(1506) // warning elimination
target[i] = ~source[i];
-#pragma warn(1506) // warning elimination
} else {
if (target != source)
str_cpy_all(target, source, length);
@@ -7496,9 +7408,7 @@ short ex_function_encode::decodeKeyValue(Attributes * attr,
// this was a negative number.
// flip all bits.
for (Lng32 i = 0; i < length; i++)
-#pragma nowarn(1506) // warning elimination
target[i] = ~source[i];
-#pragma warn(1506) // warning elimination
}
// here comes the dependent part
@@ -7546,9 +7456,7 @@ short ex_function_encode::decodeKeyValue(Attributes * attr,
// this was a negative number.
// flip all bits.
for (Lng32 i = 0; i < length; i++)
-#pragma nowarn(1506) // warning elimination
target[i] = ~source[i];
-#pragma warn(1506) // warning elimination
}
// here comes the dependent part
@@ -8606,4 +8514,3 @@ aes_decrypt_error:
return ex_expr::EXPR_ERROR;
}
-#pragma warn(1506) // warning elimination
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/exp/exp_function.h
----------------------------------------------------------------------
diff --git a/core/sql/exp/exp_function.h b/core/sql/exp/exp_function.h
index 45779fa..1f8732a 100644
--- a/core/sql/exp/exp_function.h
+++ b/core/sql/exp/exp_function.h
@@ -45,7 +45,6 @@
#include "exp_dp2_expr.h"
#include "SequenceGeneratorAttributes.h"
-#pragma warning ( disable : 4251 )
class ex_function_clause;
@@ -4120,7 +4119,6 @@ private:
};
-#pragma warning ( default : 4251 )
#ifndef ULONG
#define ULONG ULng32
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/exp/exp_function_lower_unicode.cpp
----------------------------------------------------------------------
diff --git a/core/sql/exp/exp_function_lower_unicode.cpp b/core/sql/exp/exp_function_lower_unicode.cpp
index 381798b..11864f3 100644
--- a/core/sql/exp/exp_function_lower_unicode.cpp
+++ b/core/sql/exp/exp_function_lower_unicode.cpp
@@ -61,9 +61,7 @@ ex_expr::exp_return_type ex_function_lower_unicode::eval(char *op_data[],
CollHeap*,
ComDiagsArea**)
{
-#pragma nowarn(1506) // warning elimination
Lng32 len1 = getOperand(1)->getLength(op_data[-MAX_OPERANDS+1]);
-#pragma warn(1506) // warning elimination
getOperand(0)->setVarLength(len1, op_data[-MAX_OPERANDS]);
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/exp/exp_function_substring_unicode.cpp
----------------------------------------------------------------------
diff --git a/core/sql/exp/exp_function_substring_unicode.cpp b/core/sql/exp/exp_function_substring_unicode.cpp
index 29300c2..7fa576e 100644
--- a/core/sql/exp/exp_function_substring_unicode.cpp
+++ b/core/sql/exp/exp_function_substring_unicode.cpp
@@ -61,9 +61,7 @@ ex_expr::exp_return_type ex_function_substring_doublebyte::eval(char *op_data[],
CollHeap* heap,
ComDiagsArea** diagsArea)
{
-#pragma nowarn(1506) // warning elimination
Lng32 len1 = getOperand(1)->getLength(op_data[-MAX_OPERANDS+1]);
-#pragma warn(1506) // warning elimination
len1 /= sizeof(NAWchar); // len1 now counts in terms of number of NCHARs.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/exp/exp_function_trim_unicode.cpp
----------------------------------------------------------------------
diff --git a/core/sql/exp/exp_function_trim_unicode.cpp b/core/sql/exp/exp_function_trim_unicode.cpp
index 1e73446..d26bd5f 100644
--- a/core/sql/exp/exp_function_trim_unicode.cpp
+++ b/core/sql/exp/exp_function_trim_unicode.cpp
@@ -57,9 +57,7 @@ ex_expr::exp_return_type ex_function_trim_doublebyte::eval(char *op_data[],
ComDiagsArea** diagsArea)
{
// find out the length of trim character.
-#pragma nowarn(1506) // warning elimination
Lng32 len1 = (getOperand(1)->getLength(op_data[-MAX_OPERANDS+1])) / sizeof(NAWchar);
-#pragma warn(1506) // warning elimination
// len1 (length of trim character) must be 1. Raise an exception if greater
// than 1.
@@ -69,9 +67,7 @@ ex_expr::exp_return_type ex_function_trim_doublebyte::eval(char *op_data[],
return ex_expr::EXPR_ERROR;
}
-#pragma nowarn(1506) // warning elimination
Lng32 len2 = (getOperand(2)->getLength(op_data[-MAX_OPERANDS+2])) / sizeof(NAWchar);
-#pragma warn(1506) // warning elimination
// Find how many leading characters in operand 2 correspond to the trim
// character.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/exp/exp_function_upper_unicode.cpp
----------------------------------------------------------------------
diff --git a/core/sql/exp/exp_function_upper_unicode.cpp b/core/sql/exp/exp_function_upper_unicode.cpp
index 09ae764..854da1b 100644
--- a/core/sql/exp/exp_function_upper_unicode.cpp
+++ b/core/sql/exp/exp_function_upper_unicode.cpp
@@ -61,9 +61,7 @@ ex_expr::exp_return_type ex_function_upper_unicode::eval(char *op_data[],
CollHeap* heap,
ComDiagsArea** diagsArea)
{
-#pragma nowarn(1506) // warning elimination
Lng32 len1 = getOperand(1)->getLength(op_data[-MAX_OPERANDS+1]);
-#pragma warn(1506) // warning elimination
// Now, copy the contents of operand 1 after the case change into
// operand 0.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/exp/exp_interval.cpp
----------------------------------------------------------------------
diff --git a/core/sql/exp/exp_interval.cpp b/core/sql/exp/exp_interval.cpp
index 1aa4a3a..159fc98 100644
--- a/core/sql/exp/exp_interval.cpp
+++ b/core/sql/exp/exp_interval.cpp
@@ -153,8 +153,6 @@ Lng32 ExpInterval::getDisplaySize(Lng32 fsDatatype,
if (fractionPrecision)
result += fractionPrecision + 1; // 1 for "."
}
-#pragma nowarn(1506) // warning elimination
return result;
-#pragma warn(1506) // warning elimination
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/exp/exp_like.cpp
----------------------------------------------------------------------
diff --git a/core/sql/exp/exp_like.cpp b/core/sql/exp/exp_like.cpp
index e08aa53..4cd365f 100644
--- a/core/sql/exp/exp_like.cpp
+++ b/core/sql/exp/exp_like.cpp
@@ -555,11 +555,9 @@ ex_expr::exp_return_type ex_like_clause_char::eval(char *op_data[],
cs = ((SimpleType *)getOperand(1))->getIsoMapping();
// get length of operands
-#pragma nowarn(1506) // warning elimination
Lng32 len1 = getOperand(1)->getLength(op_data[-MAX_OPERANDS+1]);
Lng32 len2 = getOperand(2)->getLength(op_data[-MAX_OPERANDS+2]);
Lng32 len3 = 0;
-#pragma warn(1506) // warning elimination
if ( cs == CharInfo::UTF8 )
{
Int32 prec1 = ((SimpleType *)getOperand(1))->getPrecision();
@@ -578,9 +576,7 @@ ex_expr::exp_return_type ex_like_clause_char::eval(char *op_data[],
escapeChar = NULL;
else {
// get length of escape character
-#pragma nowarn(1506) // warning elimination
len3 = getOperand(3)->getLength(op_data[-MAX_OPERANDS+3]);
-#pragma warn(1506) // warning elimination
if ( cs == CharInfo::UTF8 )
{
Int32 prec3 = ((SimpleType *)getOperand(3))->getPrecision();
@@ -682,10 +678,8 @@ ex_expr::exp_return_type ex_like_clause_doublebyte::eval(char *op_data[],
ComDiagsArea** diagsArea)
{
// get length of operands
-#pragma nowarn(1506) // warning elimination
Lng32 len1 = getOperand(1)->getLength(op_data[-MAX_OPERANDS+1]);
Lng32 len2 = getOperand(2)->getLength(op_data[-MAX_OPERANDS+2]);
-#pragma warn(1506) // warning elimination
NAWchar wPercentChar = 0;
NAWchar wUnderScoreChar = 0;
@@ -726,13 +720,11 @@ ex_expr::exp_return_type ex_like_clause_doublebyte::eval(char *op_data[],
}
}
-#pragma nowarn(1506) // warning elimination
LikePatternString patternString(op_data[2], (UInt16)len2,
getOperand(1)->getCharSet(), escapeChar, BYTES_PER_NAWCHAR,
(char*)&wUnderScoreChar, BYTES_PER_NAWCHAR,
(char*)&wPercentChar, BYTES_PER_NAWCHAR
);
-#pragma warn(1506) // warning elimination
LikePattern pattern(patternString, exHeap, CharInfo::UNICODE);
if (pattern.error()) {
ExRaiseSqlError(exHeap, diagsArea, EXE_INVALID_ESCAPE_SEQUENCE);
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/exp/exp_math_func.cpp
----------------------------------------------------------------------
diff --git a/core/sql/exp/exp_math_func.cpp b/core/sql/exp/exp_math_func.cpp
index b182bf8..d401e6f 100644
--- a/core/sql/exp/exp_math_func.cpp
+++ b/core/sql/exp/exp_math_func.cpp
@@ -105,10 +105,8 @@ ex_expr::exp_return_type ex_function_abs::eval(char *op_data[],
break;
case REC_BIN16_SIGNED:
-#pragma nowarn(1506) // warning elimination
*(short *)op_data[0] = (*(short *)op_data[1] < 0 ? -*(short *)op_data[1]
: *(short *)op_data[1]);
-#pragma warn(1506) // warning elimination
break;
case REC_BIN32_SIGNED:
@@ -800,9 +798,7 @@ ex_expr::exp_return_type ExFunctionBitOper::eval(char *op_data[],
case ITM_CONVERTTOBITS:
{
-#pragma nowarn(1506) // warning elimination
Lng32 len1 = getOperand(1)->getLength(op_data[-MAX_OPERANDS+1]);
-#pragma warn(1506) // warning elimination
Int32 i;
if ( DFS2REC::isDoubleCharacter(getOperand(1)->getDatatype()) )
{
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/exp/exp_math_func.h
----------------------------------------------------------------------
diff --git a/core/sql/exp/exp_math_func.h b/core/sql/exp/exp_math_func.h
index ccf300b..b1789a4 100644
--- a/core/sql/exp/exp_math_func.h
+++ b/core/sql/exp/exp_math_func.h
@@ -42,7 +42,6 @@
#include "exp_clause.h"
#include "exp_clause_derived.h"
-#pragma warning ( disable : 4251 )
class ex_function_abs : public ex_function_clause {
public:
@@ -169,6 +168,5 @@ public:
// ---------------------------------------------------------------------
};
-#pragma warning ( default : 4251 )
#endif
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/exp/exp_tuple_desc.cpp
----------------------------------------------------------------------
diff --git a/core/sql/exp/exp_tuple_desc.cpp b/core/sql/exp/exp_tuple_desc.cpp
index e60c7ee..2f6ac8c 100644
--- a/core/sql/exp/exp_tuple_desc.cpp
+++ b/core/sql/exp/exp_tuple_desc.cpp
@@ -452,9 +452,7 @@ Int16 ExpTupleDesc::computeOffsets(UInt32 num_attrs, /* IN */
if (attrs[i]->getNullFlag())
{
-#pragma nowarn(1506) // warning elimination
attrs[i]->setNullIndOffset(offset);
-#pragma warn(1506) // warning elimination
offset += attrs[i]->getNullIndicatorLength();
}
@@ -564,9 +562,7 @@ Int16 ExpTupleDesc::computeOffsets(UInt32 num_attrs, /* IN */
// Note vcIndicatorLength_ is set to sizeof(Int16) for rowset
// SQLVarChars.
if (attrs[i]->getNullFlag()){
-#pragma nowarn(1506) // warning elimination
attrs[i]->setNullIndOffset(attrStartOffset+sizeof(Int32));
-#pragma warn(1506) // warning elimination
elementDataLen += attrs[i]->getNullIndicatorLength();
if (attrs[i]->getVCIndicatorLength() > 0){
attrs[i]->setVCLenIndOffset(attrStartOffset+
@@ -925,9 +921,7 @@ Long ExpTupleDesc::pack(void * space)
{
if (! packed())
{
-#pragma nowarn(1506) // warning elimination
if (attrs_) attrs_.pack(space, numAttrs_);
-#pragma warn(1506) // warning elimination
}
flags_ |= PACKED;
return NAVersionedObject::pack(space);
@@ -938,9 +932,7 @@ Int32 ExpTupleDesc::unpack(void * base, void * reallocator)
if (packed())
{
if (attrs_)
-#pragma nowarn(1506) // warning elimination
if (attrs_.unpack(base, numAttrs_, reallocator)) return -1;
-#pragma warn(1506) // warning elimination
flags_ &= ~PACKED;
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/exp/exp_tuple_desc.h
----------------------------------------------------------------------
diff --git a/core/sql/exp/exp_tuple_desc.h b/core/sql/exp/exp_tuple_desc.h
index 04eacdf..8c017e1 100644
--- a/core/sql/exp/exp_tuple_desc.h
+++ b/core/sql/exp/exp_tuple_desc.h
@@ -58,7 +58,6 @@ typedef NAVersionedObjectPtrArrayTempl<ExpTupleDescPtr> ExpTupleDescPtrPtr;
typedef NAVersionedObjectPtrTempl<Attributes> AttributesPtr;
typedef NAVersionedObjectPtrArrayTempl<AttributesPtr> AttributesPtrPtr;
-#pragma warning ( disable : 4251 )
#define NEG_BIT_MASK 0x0080 //the first bit in a byte - used for finding
@@ -927,6 +926,5 @@ public:
};
-#pragma warning ( default : 4251 )
#endif
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/export/ComDiags.cpp
----------------------------------------------------------------------
diff --git a/core/sql/export/ComDiags.cpp b/core/sql/export/ComDiags.cpp
index 65595c4..270423e 100644
--- a/core/sql/export/ComDiags.cpp
+++ b/core/sql/export/ComDiags.cpp
@@ -1225,9 +1225,7 @@ void ComCondition::assignStringMember(char *& memberBuff,const char *const src)
memberBuff = new char[buffsize];
assert(memberBuff != NULL);
}
-#pragma nowarn(1506) // warning elimination
str_cpy(memberBuff,src,buffsize);
-#pragma warn(1506) // warning elimination
memberBuff[buffsize-1]=0;
}
}
@@ -1712,9 +1710,7 @@ void ComDiagsArea::enforceLengthLimit()
// make errors a sequence 1..j, where j = errors_.entries() -
// (numToDiscard-warnings_.entries())
-#pragma nowarn(1506) // warning elimination
numToDiscard = numToDiscard - warnings_.entries();
-#pragma warn(1506) // warning elimination
CollIndex j = errors_.entries() - numToDiscard;
while (numToDiscard-- != 0) {
errors_[j]->deAllocate();// remove near end and slide towards front
@@ -1880,7 +1876,6 @@ void ComDiagsArea::unpackObj32(IpcMessageObjType objType,
// Let us not forget the size of the base class.
//
// We do not pack newCondition_.
-#pragma nowarn(770) // warning elimination
IpcMessageObjSize ComDiagsArea::packedLength(void)
{
// NOTE: changes to any of the following methods also require
@@ -1989,7 +1984,6 @@ IpcMessageObjSize ComDiagsArea::packedLength32(void)
return size;
}
-#pragma warn(770) // warning elimination
IpcMessageObjSize ComDiagsArea::packObjIntoMessage(char *buffer)
{
@@ -2285,20 +2279,14 @@ NABoolean ComDiagsArea::checkObj(IpcMessageObjType objType,
Lng32 ComDiagsArea::getNumber () const
{
-#pragma nowarn(1506) // warning elimination
return errors_.entries() + warnings_.entries();
-#pragma warn(1506) // warning elimination
}
Lng32 ComDiagsArea::getNumber (DgSqlCode::ErrorOrWarning type) const
{
switch (type) {
-#pragma nowarn(1506) // warning elimination
case DgSqlCode::ERROR_: return errors_.entries();
-#pragma warn(1506) // warning elimination
-#pragma nowarn(1506) // warning elimination
case DgSqlCode::WARNING_: return warnings_.entries();
-#pragma warn(1506) // warning elimination
default: return -1;
}
}
@@ -3186,9 +3174,7 @@ static char *copyStringMember(char* src, CollHeap *heap)
copy = (char*) heap->allocateMemory(buffsize);
assert(copy!=NULL);
-#pragma nowarn(1506) // warning elimination
str_cpy(copy,src,buffsize);
-#pragma warn(1506) // warning elimination
copy[buffsize-1]=0;
return copy;
@@ -3282,18 +3268,14 @@ Lng32 ComDiagsArea::mark() const
void ComDiagsArea::rewind(Lng32 markValue, NABoolean decId)
{
CollIndex maxError = errors_.entries()-1;
-#pragma nowarn(161) // warning elimination
while (maxError != -1 && errors_[maxError]->getDiagsId() > markValue) {
-#pragma warn(161) // warning elimination
errors_[maxError]->deAllocate();
NABoolean removed = errors_.removeAt(maxError--);
assert(removed);
if (decId) --maxDiagsId_; // This is the merged line
}
CollIndex maxWarning = warnings_.entries()-1;
-#pragma nowarn(161) // warning elimination
while (maxWarning != -1 && warnings_[maxWarning]->getDiagsId() > markValue){
-#pragma warn(161) // warning elimination
warnings_[maxWarning]->deAllocate();
NABoolean removed = warnings_.removeAt(maxWarning--);
assert(removed);
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/export/ComDiags.h
----------------------------------------------------------------------
diff --git a/core/sql/export/ComDiags.h b/core/sql/export/ComDiags.h
index 13aa97a..fa9b1e5 100644
--- a/core/sql/export/ComDiags.h
+++ b/core/sql/export/ComDiags.h
@@ -729,7 +729,6 @@ NABoolean ComCondition::isLocked () const
// Class ComDiagsArea
// -----------------------------------------------------------------------
-#pragma warning( disable : 4251 )
class ComDiagsArea : public IpcMessageObj {
public:
// For the ``SQL function'' setting and getting operations, we declare
@@ -1459,7 +1458,6 @@ void NegateAllErrors (ComDiagsArea *a)
{
a->negateAllErrors();
}
-// #pragma warning( default : 4251 )
///////////////////////////////////////////////////////////////
// These are the inline functions of the ComDiagsArea class. //
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/export/HeapLog.cpp
----------------------------------------------------------------------
diff --git a/core/sql/export/HeapLog.cpp b/core/sql/export/HeapLog.cpp
index 902da3c..8afa7f1 100644
--- a/core/sql/export/HeapLog.cpp
+++ b/core/sql/export/HeapLog.cpp
@@ -457,9 +457,7 @@ Lng32 HeapLogRoot::fetchLine( char *buf
}
Lng32 error = log->fetchLine(&buf[2], 1 /*sqlci*/);
-#pragma nowarn(1506) // warning elimination
*((short*)buf) = strlen(&buf[2]);
-#pragma warn(1506) // warning elimination
if (error == FETCH_EOF)
control2(flags, LeakDescribe::FLAG_SQLCI);
return error;
@@ -708,9 +706,7 @@ Lng32 HeapLog::fetchLine( char *buf
if (datalen_ > 0)
{ // Fetch log data from ARKCMP.
-#pragma nowarn(1506) // warning elimination
Lng32 s = strlen(packdata_) + 1;
-#pragma warn(1506) // warning elimination
if (currlen_ >= datalen_ ||
s == 1)
{ // eof
@@ -878,8 +874,6 @@ Lng32 HeapLog::fetchLine( char *buf
close();
return FETCH_EOF;
}
-#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/export/IpcMessageObj.cpp
----------------------------------------------------------------------
diff --git a/core/sql/export/IpcMessageObj.cpp b/core/sql/export/IpcMessageObj.cpp
index 4ae4ce3..22b9a0d 100644
--- a/core/sql/export/IpcMessageObj.cpp
+++ b/core/sql/export/IpcMessageObj.cpp
@@ -141,9 +141,7 @@ IpcMessageObjSize IpcMessageObj::packObjIntoMessage(IpcMessageBufferPtr buffer,
// stored directly following the base class data (this may not be the
// case if multiple inheritance is used!!!!).
// ---------------------------------------------------------------------
-#pragma nowarn(1506) // warning elimination
str_cpy_all(buffer, (const char *) &this[1], derivedObjLen);
-#pragma warn(1506) // warning elimination
return derivedObjLen + sizeof(IpcMessageObj);
}
@@ -170,9 +168,7 @@ IpcMessageObjSize IpcMessageObj::packObjIntoMessage32(IpcMessageBufferPtr buffer
// stored directly following the base class data (this may not be the
// case if multiple inheritance is used!!!!).
// ---------------------------------------------------------------------
-#pragma nowarn(1506) // warning elimination
str_cpy_all(buffer, (const char *) &this[1], derivedObjLen);
-#pragma warn(1506) // warning elimination
return derivedObjLen + sizeof(IpcMessageObj);
}
@@ -191,9 +187,7 @@ void IpcMessageObj::unpackObj(IpcMessageObjType /*objType*/,
// copy the rest into the memory following the IpcMessageObj data members
// (should we allow such a dangerous default implementation?)
-#pragma nowarn(1506) // warning elimination
str_cpy_all((char *) &this[1], buffer, objSize - sizeof(IpcMessageObj));
-#pragma warn(1506) // warning elimination
// - Change the offset in the next ptr to zero
//
s_.next_ = NULL;
@@ -213,9 +207,7 @@ void IpcMessageObj::unpackObj32(IpcMessageObjType /*objType*/,
// copy the rest into the memory following the IpcMessageObj data members
// (should we allow such a dangerous default implementation?)
-#pragma nowarn(1506) // warning elimination
str_cpy_all((char *) &this[1], buffer, objSize - SQL_32BIT_IPC_MESSAGE_OBJ_SIZE);
-#pragma warn(1506) // warning elimination
// - Change the offset in the next ptr to zero
//
s_.next_ = NULL;
@@ -334,9 +326,7 @@ IpcMessageObjSize IpcMessageObj::packBaseClassIntoMessage(
s_.objLength_ = bswap_32(s_.objLength_);
s_.refCount_ = bswap_32(s_.refCount_);
}
-#pragma nowarn(1506) // warning elimination
str_cpy_all(buffer,(const char *)this,copyLen);
-#pragma warn(1506) // warning elimination
if (swapBytes)
{
@@ -702,9 +692,7 @@ IpcMessageObjSize packCharStarIntoBuffer(IpcMessageBufferPtr &buffer,
if (strPtr==NULL)
length=0;
else
-#pragma nowarn(1506) // warning elimination
length=na_wcslen(strPtr)+1; // 1 is for the null-terminator char
-#pragma warn(1506) // warning elimination
length *= sizeof(NAWchar);
// NOT a recursive call.
@@ -791,9 +779,7 @@ NABoolean checkAndUnpackBuffer (
}
else
{
-#pragma nowarn(1506) // warning elimination
str_cpy_all(dataPtr, (char *) buffer, dataLength);
-#pragma warn(1506) // warning elimination
buffer += dataLength;
}
return result;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/export/NAAbort.cpp
----------------------------------------------------------------------
diff --git a/core/sql/export/NAAbort.cpp b/core/sql/export/NAAbort.cpp
index 9ed3055..262175c 100644
--- a/core/sql/export/NAAbort.cpp
+++ b/core/sql/export/NAAbort.cpp
@@ -215,14 +215,12 @@ void NAAssert(const char* condition, const char * file_, Int32 line_)
assert_botch_abend(file_, line_, condition);
}
-#pragma nowarn(770) // warning elimination
void assert_botch_no_abend( const char *f, Int32 l, const char * m)
{
}
-#pragma warn(770) // warning elimination
void assert_botch_abend( const char *f, Int32 l, const char * m, const char *c)
{
NAAssertMutexLock(); // Assure "termination synchronization"
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/export/NABasicObject.cpp
----------------------------------------------------------------------
diff --git a/core/sql/export/NABasicObject.cpp b/core/sql/export/NABasicObject.cpp
index 113ade2..524971e 100644
--- a/core/sql/export/NABasicObject.cpp
+++ b/core/sql/export/NABasicObject.cpp
@@ -91,9 +91,7 @@ void* NABasicObject::operator new(size_t t, CollHeap* h, NABoolean failureIsFata
p = ::operator new(t);
-#pragma nowarn(1506) // warning elimination
// HEAPLOG_ADD_ENTRY(p, t, NA_HEAP_BASIC, "NABasic Heap")
-#pragma warn(1506) // warning elimination
}
if (p)
@@ -189,9 +187,7 @@ void* NABasicObject::operator new[](size_t t, CollHeap* h, NABoolean failureIsFa
p = ::operator new(t);
-#pragma nowarn(1506) // warning elimination
// HEAPLOG_ADD_ENTRY(p, t, NA_HEAP_BASIC, "NABasic Heap")
-#pragma warn(1506) // warning elimination
}
if (p)
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/export/NAStringDef.cpp
----------------------------------------------------------------------
diff --git a/core/sql/export/NAStringDef.cpp b/core/sql/export/NAStringDef.cpp
index 099b51d..6fd471d 100644
--- a/core/sql/export/NAStringDef.cpp
+++ b/core/sql/export/NAStringDef.cpp
@@ -190,12 +190,8 @@ NAString::compareTo(const char* cs2, caseCompare cmp) const
} else { // ignore case
for (; cs2[i]; ++i) {
if (i == len) return -1;
-#pragma nowarn(1506) // warning elimination
char c1 = tolower((unsigned char)cs1[i]);
-#pragma warn(1506) // warning elimination
-#pragma nowarn(1506) // warning elimination
char c2 = tolower((unsigned char)cs2[i]);
-#pragma warn(1506) // warning elimination
if (c1 != c2) return ((c1 > c2)? 1 : -1);
}
}
@@ -214,12 +210,8 @@ NAString::compareTo(const NAString& str, caseCompare cmp) const
} else {
size_t i = 0;
for (; i < len; ++i) {
-#pragma nowarn(1506) // warning elimination
char c1 = tolower((unsigned char)s1[i]);
-#pragma warn(1506) // warning elimination
-#pragma nowarn(1506) // warning elimination
char c2 = tolower((unsigned char)s2[i]);
-#pragma warn(1506) // warning elimination
if (c1 != c2) return ((c1 > c2)? 1 : -1);
}
}
@@ -529,9 +521,7 @@ NAString::toLower()
cow();
register size_t N = length();
register char* p = fbstring_.begin();
-#pragma nowarn(1506) // warning elimination
while ( N-- ) { *p = tolower((unsigned char)*p); p++;}
-#pragma warn(1506) // warning elimination
}
// Change self to upper case
@@ -541,9 +531,7 @@ NAString::toUpper()
cow();
register size_t N = length();
register char* p = fbstring_.begin();
-#pragma nowarn(1506) // warning elimination
while ( N-- ) { *p = toupper((unsigned char)*p); p++;}
-#pragma warn(1506) // warning elimination
}
// Change self to upper case
@@ -559,9 +547,7 @@ NAString::toUpper8859_1()
(*p != 0xff) && // small y with diaeresis has no upcase equiv in 8859-1
(*p != 0xdf)) // small german sharp s has no upcase euqiv in 8859-1
{
-#pragma nowarn(1506) // warning elimination
*p = *p - 32; // convert to uppercase equivalent
-#pragma warn(1506) // warning elimination
}
p++;
}
@@ -642,9 +628,7 @@ toLower(const NAString& str)
register const char* uc = str.data();
register char* lc = (char*)temp.data();
// Guard against tolower() being a macro:
-#pragma nowarn(1506) // warning elimination
while( N-- ) { *lc++ = tolower((unsigned char)*uc); uc++; }
-#pragma warn(1506) // warning elimination
return temp;
}
@@ -657,9 +641,7 @@ toUpper(const NAString& str)
register const char* uc = str.data();
register char* lc = (char*)temp.data();
// Guard against toupper() being a macro:
-#pragma nowarn(1506) // warning elimination
while( N-- ) { *lc++ = toupper((unsigned char)*uc); uc++; }
-#pragma warn(1506) // warning elimination
return temp;
}
@@ -856,9 +838,7 @@ NASubString::toLower()
str_->cow();
register char* p = (char*)(str_->data() + begin_); // Cast away constness
size_t N = extent_;
-#pragma nowarn(1506) // warning elimination
while( N-- ) { *p = tolower((unsigned char)*p); p++;}
-#pragma warn(1506) // warning elimination
}
}
@@ -871,9 +851,7 @@ NASubString::toUpper()
str_->cow();
register char* p = (char*)(str_->data() + begin_); // Cast away constness
size_t N = extent_;
-#pragma nowarn(1506) // warning elimination
while( N-- ) { *p = toupper((unsigned char)*p); p++;}
-#pragma warn(1506) // warning elimination
}
}
@@ -967,14 +945,10 @@ operator<<(ostream& os, const NAString& s)
size_t wid = os.width();
wid = (len < wid) ? wid - len : 0;
Lng32 flags = os.flags();
-#pragma nowarn(1506) // warning elimination
os.width(wid);
-#pragma warn(1506) // warning elimination
if (wid && !(flags & ios::left))
os << ""; // let the ostream fill
-#pragma nowarn(1506) // warning elimination
os.rdbuf()->sputn((char*)s.data(), s.length());
-#pragma warn(1506) // warning elimination
if (wid && (flags & ios::left))
os << ""; // let the ostream fill
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/export/NAVersionedObject.cpp
----------------------------------------------------------------------
diff --git a/core/sql/export/NAVersionedObject.cpp b/core/sql/export/NAVersionedObject.cpp
index 7eed5ac..64fb041 100644
--- a/core/sql/export/NAVersionedObject.cpp
+++ b/core/sql/export/NAVersionedObject.cpp
@@ -150,9 +150,7 @@ void NAVersionedObject::makeRoomForNewVersion(
{
char *src = (char *)this + oldSubClassSize;
char *des = (char *)this + newSubClassSize;
-#pragma nowarn(1506) // warning elimination
short siz = imageSize_ - newSubClassSize;
-#pragma warn(1506) // warning elimination
str_cpy_all(des,src,siz);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/export/NAVersionedObject.h
----------------------------------------------------------------------
diff --git a/core/sql/export/NAVersionedObject.h b/core/sql/export/NAVersionedObject.h
index 39ef55e..4a569fa 100644
--- a/core/sql/export/NAVersionedObject.h
+++ b/core/sql/export/NAVersionedObject.h
@@ -1438,7 +1438,6 @@ protected:
// ---------------------------------------------------------------------
typedef NAVersionedObjectPtrTempl<NAVersionedObject> NAVersionedObjectPtr;
-#pragma warning ( disable : 4251 )
// ---------------------------------------------------------------------
// Class NAVersionedObject
@@ -1836,7 +1835,6 @@ private:
}; // END of class declaration for NAVersionedObject ------------------
-#pragma warning ( default : 4251 )
#endif // ---------------------------------------------------- EOF ----
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/generator/GenExpGenerator.cpp
----------------------------------------------------------------------
diff --git a/core/sql/generator/GenExpGenerator.cpp b/core/sql/generator/GenExpGenerator.cpp
index c0c6108..3171c39 100644
--- a/core/sql/generator/GenExpGenerator.cpp
+++ b/core/sql/generator/GenExpGenerator.cpp
@@ -271,9 +271,7 @@ Attributes * ExpGenerator::convertNATypeToAttributes
attr->setRowsetSize(rsSize);
result = attr;
-#pragma nowarn(1506) // warning elimination
attr->setNullFlag(naType->supportsSQLnull());
-#pragma warn(1506) // warning elimination
attr->setNullIndicatorLength((short) naType->getSQLnullHdrSize());
attr->setVCIndicatorLength((short) naType->getVarLenHdrSize());
attr->setDatatype(naType->getFSDatatype());
@@ -282,9 +280,7 @@ Attributes * ExpGenerator::convertNATypeToAttributes
if (naType_x.getTypeQualifier() == NA_ROWSET_TYPE) {
if (((SQLRowset *)(&naType_x))->useTotalSize()) {
// This indicates us to use the whole array size
-#pragma nowarn(1506) // warning elimination
attr->setLength(sizeof(Lng32) + (attr->getRowsetSize() * naType->getTotalSize()));
-#pragma warn(1506) // warning elimination
result->setUseTotalRowsetSize();
((SQLRowset *)(&naType_x))->useTotalSize() = FALSE;
}
@@ -348,19 +344,13 @@ Attributes * ExpGenerator::convertNATypeToAttributes
{
attr->setPrecision(REC_DTCODE_SECOND);
}
-#pragma nowarn(1506) // warning elimination
attr->setScale(datetimeType->getFractionPrecision());
-#pragma warn(1506) // warning elimination
}
else if (naType->getTypeQualifier() == NA_INTERVAL_TYPE)
{
const IntervalType *intervalType = (const IntervalType *) naType;
-#pragma nowarn(1506) // warning elimination
attr->setPrecision(intervalType->getLeadingPrecision());
-#pragma warn(1506) // warning elimination
-#pragma nowarn(1506) // warning elimination
attr->setScale(intervalType->getFractionPrecision());
-#pragma warn(1506) // warning elimination
if (attr->getDatatype() == REC_INT_FRACTION)
{
attr->setDatatype(REC_INT_SECOND);
@@ -395,16 +385,12 @@ Attributes * ExpGenerator::convertNATypeToAttributes
BigNum(numericType->getNominalSize(),
numericType->getPrecision(),
(short)numericType->getScale(),
-#pragma nowarn(1506) // warning elimination
numericType->isUnsigned());
-#pragma warn(1506) // warning elimination
attr->setRowsetSize(rsSize);
result = attr;
-#pragma nowarn(1506) // warning elimination
attr->setNullFlag(naType->supportsSQLnull());
-#pragma warn(1506) // warning elimination
attr->setNullIndicatorLength((short) naType->getSQLnullHdrSize());
attr->setVCIndicatorLength((short) naType->getVarLenHdrSize());
attr->setDatatype(numericType->getFSDatatype());
@@ -413,9 +399,7 @@ Attributes * ExpGenerator::convertNATypeToAttributes
if (naType_x.getTypeQualifier() == NA_ROWSET_TYPE) {
if (((SQLRowset *)(&naType_x))->useTotalSize()) {
// This indicates us to use the whole array size
-#pragma nowarn(1506) // warning elimination
attr->setLength(sizeof(Lng32) + (attr->getRowsetSize() * naType->getTotalSize()));
-#pragma warn(1506) // warning elimination
result->setUseTotalRowsetSize();
((SQLRowset *)(&naType_x))->useTotalSize() = FALSE;
}
@@ -1088,14 +1072,12 @@ ItemExpr * ExpGenerator::matchScalesNoCast(const ValueId & source,
// Upscale or downscale the source to the target scale. If the source scale
// is the same as the target scale, return the source tree unchanged.
//
-#pragma nowarn(1506) // warning elimination
Lng32 sourceScale = (source.getType().getTypeQualifier() == NA_NUMERIC_TYPE)
? ((NumericType &) source.getType()).getScale()
: ((IntervalType &) source.getType()).getFractionPrecision();
Lng32 targetScale = (targetType.getTypeQualifier() == NA_NUMERIC_TYPE)
? ((NumericType &) targetType).getScale()
: ((IntervalType &) targetType).getFractionPrecision();
-#pragma warn(1506) // warning elimination
if (sourceScale == targetScale)
return retTree;
@@ -1157,7 +1139,6 @@ ItemExpr * ExpGenerator::convertIntervalToNumeric(const ValueId & source)
//
// Convert the source interval to numeric, bind the tree, and return it.
//
-#pragma nowarn(1506) // warning elimination
const Int16 DisAmbiguate = 0;
retTree = new(wHeap())
Cast(retTree, new(wHeap()) SQLNumeric(wHeap(), TRUE, /* signed */
@@ -1165,7 +1146,6 @@ ItemExpr * ExpGenerator::convertIntervalToNumeric(const ValueId & source)
sourceInterval.getFractionPrecision(),
DisAmbiguate, // added for 64bit proj.
sourceInterval.supportsSQLnull()));
-#pragma warn(1506) // warning elimination
retTree->bindNode(generator->getBindWA());
return retTree;
@@ -2956,9 +2936,7 @@ NABoolean ExpGenerator::processKeyEncodingOptimization(
CollIndex i = 0;
while ( i < prevColNumber )
{
-#pragma nowarn(1506) // warning elimination
if (allColumns.getColumn(i)->getType()->getVarLenHdrSize() > 0)
-#pragma warn(1506) // warning elimination
return TRUE;
else
i++;
@@ -2971,27 +2949,21 @@ NABoolean ExpGenerator::processKeyEncodingOptimization(
{
ValueId valId = indexKey[i];
-#pragma nowarn(1506) // warning elimination
NAColumn * naCol = indexKeyColumns.getColumn(i);
-#pragma warn(1506) // warning elimination
Attributes * thisAttr = generator->getMapInfo(valId)->getAttr();
-#pragma warning (disable : 4018) //warning elimination
if ((valId.getType().isEncodingNeeded() == TRUE) ||
((valId.getType().getTypeQualifier() == NA_CHARACTER_TYPE) &&
((((CharType&)valId.getType()).isCaseinsensitive()) ||
(CollationInfo::isSystemCollation(((CharType&)valId.getType()).getCollation())))) ||
(valId.getType().supportsSQLnull() == TRUE) ||
(indexKeyColumns.isAscending(i) == FALSE) ||
-#pragma nowarn(270) // warning elimination
((naCol->getPosition() - prevColNumber) < 0) ||
-#pragma warn(270) // warning elimination
((naCol->getPosition() - prevColNumber) > 1) ||
((thisAttr->getOffset() - prevAttr->getOffset())
> prevAttr->getStorageLength()) ||
(!naCol->isStoredOnDisk()))
-#pragma warning (default : 4018) //warning elimination
return TRUE;
prevColNumber = naCol->getPosition();
@@ -3404,9 +3376,7 @@ ItemExpr * ExpGenerator::generateKeyCast(const ValueId vid,
relativeMin = new(wHeap()) Cast(relativeMin,targetType);
// Add an encode node here.
-#pragma nowarn(1506) // warning elimination
relativeMin = new(wHeap()) CompEncode(relativeMin, desc_flag);
-#pragma warn(1506) // warning elimination
ItemExpr * relativeMax = new(wHeap()) ConstValue(targetType->newCopy(wHeap()),
desc_flag,
@@ -3414,9 +3384,7 @@ ItemExpr * ExpGenerator::generateKeyCast(const ValueId vid,
relativeMax = new(wHeap()) Cast(relativeMax,targetType);
// Add an encode node here.
-#pragma nowarn(1506) // warning elimination
relativeMax = new(wHeap()) CompEncode(relativeMax, desc_flag);
-#pragma warn(1506) // warning elimination
knode = createExprTree("CASE WHEN @A1 = 0 THEN @A2 WHEN @A1 < 0 THEN @A3 ELSE @A4 END",
0,
@@ -3615,13 +3583,11 @@ short ExpGenerator::generateInputExpr(const ValueIdList &val_id_list,
// attr[0] = generator->getMapInfo(val_id)->getAttr();
attr[0] = generator->getAttr(item_expr);
-#pragma nowarn(1506) // warning elimination
if (getShowplan())
attr[1] =
new(wHeap()) ShowplanAttributes(val_id,
convertNAString(item_expr->getText(),
generator->wHeap()));
-#pragma warn(1506) // warning elimination
num_input_entries++;
@@ -4591,13 +4557,9 @@ short ExpGenerator::assignAtpAndAtpIndex(ValueIdList valIdList,
{
Attributes * attr = generator->getMapInfo(valIdList[i])->getAttr();
if (atp >= 0)
-#pragma nowarn(1506) // warning elimination
attr->setAtp(atp);
-#pragma warn(1506) // warning elimination
if (atpIndex >= 0)
-#pragma nowarn(1506) // warning elimination
attr->setAtpIndex(atpIndex);
-#pragma warn(1506) // warning elimination
}
return 0;
@@ -4681,9 +4643,7 @@ short ExpGenerator::endExprGen(ex_expr ** expr, short gen_last_clause)
// get the PCode mode from the ctor ExpGenerator and set it in the
// expression itself. This allows us to regenerate PCode at runtime
// (for versioning) with the same mode specified at compile time.
-#pragma nowarn(1506) // warning elimination
(*expr)->setPCodeMode( getPCodeMode() );
-#pragma warn(1506) // warning elimination
// Get default low-level opt flags and prevent predicate reordering from
// happening if this expression represents a case statement.
@@ -4728,33 +4688,23 @@ short ExpGenerator::endExprGen(ex_expr ** expr, short gen_last_clause)
// Set the constant expression storage length and area.
//
-#pragma nowarn(1506) // warning elimination
char * constants_area = placeConstants(getConstantList(), getConstLength());
-#pragma warn(1506) // warning elimination
(*expr)->setConstantsArea(constants_area);
-#pragma nowarn(1506) // warning elimination
(*expr)->setConstsLength(getConstLength());
-#pragma warn(1506) // warning elimination
// Set the persistent expression storage length and initialization area.
//
char *persistentInitializationArea
-#pragma nowarn(1506) // warning elimination
= placeConstants(getPersistentList(), persistentLength());
-#pragma warn(1506) // warning elimination
(*expr)->persistentInitializationArea() = persistentInitializationArea;
-#pragma nowarn(1506) // warning elimination
(*expr)->persistentLength() = persistentLength();
-#pragma warn(1506) // warning elimination
(*expr)->persistentArea()
= getSpace()->allocateAlignedSpace(persistentLength());
// Set the temporary expression storage length.
//
-#pragma nowarn(1506) // warning elimination
(*expr)->setTempsLength(getTempsLength());
-#pragma warn(1506) // warning elimination
// set the pointer to the first clause in the ex_expr
(*expr)->setClauses((ex_clause *)(getClauseList()->getElement()));
@@ -4788,9 +4738,7 @@ short ExpGenerator::endExprGen(ex_expr ** expr, short gen_last_clause)
Lng32 totalExprLen =
getSpace()->getAllocatedSpaceSize() - (*expr)->getLength();
-#pragma nowarn(1506) // warning elimination
(*expr)->setLength(totalExprLen);
-#pragma warn(1506) // warning elimination
#ifdef NEW_LEAN_EXPR
// If tempSpace exists, then the entire expression was written to it, so
// we need to now make a "lean" copy of it and copy it back into the
@@ -5053,9 +5001,7 @@ short ExpGenerator::endExprGen(ex_expr ** expr, short gen_last_clause)
getSpace()->getAllocatedSpaceSize() - len1;
pcodeExprLen = ((ex_expr_lean*)newExpr)->getPCodeSize();
-#pragma nowarn(1506) // warning elimination
((ex_expr_lean*)newExpr)->setLength(totalExprLen);
-#pragma warn(1506) // warning elimination
}
delete tempSpace;
@@ -5265,9 +5211,7 @@ NABoolean GenEvalPredicate(ItemExpr * rootPtr)
workCriDesc,
space);
-#pragma nowarn(1506) // warning elimination
dp2Expr->setPCodeMode( expGen.getPCodeMode() );
-#pragma warn(1506) // warning elimination
dp2Expr->getExpr()->fixup(0,0,0,NULL,NULL,FALSE,NULL);
@@ -5321,9 +5265,7 @@ short ExpGenerator::generateSamplingExpr(const ValueId &valId, ex_expr **expr,
GenAssert(attr->getAtpIndex() == 1,
"Sampling result must be a persistent expression variable.");
-#pragma nowarn(1506) // warning elimination
returnFactorOffset = attr->getOffset();
-#pragma warn(1506) // warning elimination
return 0;
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/generator/GenFastTransport.cpp
----------------------------------------------------------------------
diff --git a/core/sql/generator/GenFastTransport.cpp b/core/sql/generator/GenFastTransport.cpp
index b91e76d..bc788d9 100644
--- a/core/sql/generator/GenFastTransport.cpp
+++ b/core/sql/generator/GenFastTransport.cpp
@@ -38,9 +38,7 @@
#include "Generator.h"
#include "GenExpGenerator.h"
#include "sql_buffer.h"
-#pragma warning ( disable : 4244 )
#include "ExplainTuple.h"
-#pragma warning ( default : 4244 )
#include "ExplainTupleMaster.h"
#include "ComQueue.h"
//#include "UdfDllInteraction.h"
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/generator/GenItemExpr.cpp
----------------------------------------------------------------------
diff --git a/core/sql/generator/GenItemExpr.cpp b/core/sql/generator/GenItemExpr.cpp
index ef904bd..ead1926 100644
--- a/core/sql/generator/GenItemExpr.cpp
+++ b/core/sql/generator/GenItemExpr.cpp
@@ -314,9 +314,7 @@ short BiArith::codeGen(Generator * generator)
if (attr[0]->isComplexType())
{
eg->addTempsLength(((ComplexType *)attr[0])->setTempSpaceInfo(getOperatorType(),
-#pragma nowarn(1506) // warning elimination
eg->getTempsLength()));
-#pragma warn(1506) // warning elimination
}
attr[0]->resetlastdaymonthflag();
@@ -353,9 +351,7 @@ short BiArithSum::codeGen(Generator * generator)
if (attr[0]->isComplexType())
{
eg->addTempsLength(((ComplexType *)attr[0])->setTempSpaceInfo(getOperatorType(),
-#pragma nowarn(1506) // warning elimination
eg->getTempsLength()));
-#pragma warn(1506) // warning elimination
}
ex_arith_sum_clause * arith_clause =
@@ -382,9 +378,7 @@ short BiArithCount::codeGen(Generator * generator)
if (attr[0]->isComplexType())
{
eg->addTempsLength(((ComplexType *)attr[0])->setTempSpaceInfo(getOperatorType(),
-#pragma nowarn(1506) // warning elimination
eg->getTempsLength()));
-#pragma warn(1506) // warning elimination
}
ex_arith_count_clause * arith_clause =
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/generator/GenItemFunc.cpp
----------------------------------------------------------------------
diff --git a/core/sql/generator/GenItemFunc.cpp b/core/sql/generator/GenItemFunc.cpp
index 8b40c9a..f1c4618 100644
--- a/core/sql/generator/GenItemFunc.cpp
+++ b/core/sql/generator/GenItemFunc.cpp
@@ -110,7 +110,6 @@ short BuiltinFunction::codeGen(Generator * generator)
case CharInfo::ISO88591:
case CharInfo::UTF8:
// case CharInfo::SJIS: // Uncomment this if we ever support SJIS
-#pragma nowarn(1506) // warning elimination
function_clause =
new(generator->getSpace()) ex_like_clause_char(getOperatorType()
,1+getArity()
@@ -138,9 +137,7 @@ short BuiltinFunction::codeGen(Generator * generator)
function_clause->setNoPCodeAvailable(TRUE);
break;
-#pragma warn(1506) // warning elimination
case CharInfo::UCS2:
-#pragma nowarn(1506) // warning elimination
function_clause = new(generator->getSpace())
ex_like_clause_doublebyte(ITM_LIKE_DOUBLEBYTE
,1+getArity()
@@ -148,7 +145,6 @@ short BuiltinFunction::codeGen(Generator * generator)
,space
);
break;
-#pragma warn(1506) // warning elimination
default:
GenAssert(0, "unknown value for bytes-per-char.");
}
@@ -330,7 +326,6 @@ short BuiltinFunction::codeGen(Generator * generator)
}
-#pragma nowarn(1506) // warning elimination
const CharType& substringOperandType =
(CharType&)((child(0)->getValueId()).getType());
@@ -355,7 +350,6 @@ short BuiltinFunction::codeGen(Generator * generator)
GenAssert(0, "unknown value for bytes-per-char.");
}
}
-#pragma warn(1506) // warning elimination
break;
@@ -885,13 +879,11 @@ short BitOperFunc::codeGen(Generator * generator)
if (generator->getExpGenerator()->genItemExpr(this, &attr, (1 + getArity()), -1) == 1)
return 0;
-#pragma nowarn(1506) // warning elimination
ex_clause * function_clause = NULL;
function_clause =
new(generator->getSpace()) ExFunctionBitOper(getOperatorType(),
(1+getArity()),
attr, generator->getSpace());
-#pragma warn(1506) // warning elimination
generator->getExpGenerator()->linkClause(this, function_clause);
@@ -1417,12 +1409,9 @@ short Cast::codeGen(Generator * generator)
// if temp space is needed for this operation, set it.
if (attr[0]->isComplexType())
{
-#pragma nowarn(1506) // warning elimination
eg->addTempsLength(((ComplexType *)attr[0])->setTempSpaceInfo(getOperatorType(),
eg->getTempsLength()));
-#pragma warn(1506) // warning elimination
}
-#pragma nowarn(1506) // warning elimination
ex_conv_clause * conv_clause;
if(attr[0]->getNullFlag()) //if target is nullable
conv_clause = new(generator->getSpace()) ex_conv_clause(getOperatorType(), attr,
@@ -1440,7 +1429,6 @@ short Cast::codeGen(Generator * generator)
reverseDataErrorConversionFlag_,
noStringTruncationWarnings(),
FALSE);
-#pragma warn(1506) // warning elimination
conv_clause->setTreatAllSpacesAsZero(treatAllSpacesAsZero());
@@ -1791,7 +1779,6 @@ short MathFunc::codeGen(Generator * generator)
if (generator->getExpGenerator()->genItemExpr(this, &attr, (1 + getArity()), -1) == 1)
return 0;
-#pragma nowarn(1506) // warning elimination
ex_clause * function_clause = NULL;
function_clause =
@@ -1799,7 +1786,6 @@ short MathFunc::codeGen(Generator * generator)
(1+getArity()),
attr, generator->getSpace());
-#pragma warn(1506) // warning elimination
generator->getExpGenerator()->linkClause(this, function_clause);
@@ -2091,16 +2077,12 @@ short RangeLookup::codeGen(Generator * generator)
// copy 2 Attribute pointers and 2 showplan attribute pointers to array with 3 pointers
str_cpy_all((char *) attr3,
(const char *) attr2,
-#pragma nowarn(1506) // warning elimination
sizeof(Attributes *) * (numAttrs-1));
-#pragma warn(1506) // warning elimination
if (numAttrsShowPlan)
{
str_cpy_all((char *) &attr3[numAttrs],
(const char *) &attr2[numAttrs-1],
-#pragma nowarn(1506) // warning elimination
sizeof(Attributes *) * (numAttrs-1));
-#pragma warn(1506) // warning elimination
}
// make a ConstValue that is a huge character column with all the
@@ -2131,13 +2113,11 @@ short RangeLookup::codeGen(Generator * generator)
// ...and showplan equivalent, if needed
if (numAttrsShowPlan)
{
-#pragma nowarn(1506) // warning elimination
attr3[numAttrs + numAttrsShowPlan - 1] = new (generator->wHeap())
ShowplanAttributes(
constValSplitKeys->getValueId(),
convertNAString("SplitKeysForRangeRepartitioning",
generator->wHeap()));
-#pragma warn(1506) // warning elimination
}
// now that we prepared all the inputs, add the clause itself
@@ -2316,13 +2296,11 @@ short RandomNum::codeGen(Generator *generator)
if (generator->getExpGenerator()->genItemExpr(this, &attr, (1 + getArity()), -1) == 1)
return 0;
-#pragma nowarn(1506) // warning elimination
ex_clause *function_clause = new (space) ExFunctionRandomNum(ITM_RANDOMNUM,
(1+getArity()),
simpleRandom_,
attr,
space);
-#pragma warn(1506) // warning elimination
if (function_clause)
generator->getExpGenerator()->linkClause(this, function_clause);
[05/12] incubator-trafodion git commit: TRAFODION-2731 CodeCleanup:
Phase 4. Remove legacy/obsolete pragmas
Posted by an...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/BindRelExpr.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/BindRelExpr.cpp b/core/sql/optimizer/BindRelExpr.cpp
index 6085508..403a55b 100644
--- a/core/sql/optimizer/BindRelExpr.cpp
+++ b/core/sql/optimizer/BindRelExpr.cpp
@@ -163,7 +163,6 @@ static void GU_DEBUG_Display(BindWA *bindWA, GenericUpdate *gu,
#endif
} // GU_DEBUG_Display()
-#pragma nowarn(770) // warning elimination
static RETDesc *bindRowValues(BindWA *bindWA,
ItemExpr *exprTree,
ValueIdList &vidList,
@@ -609,7 +608,6 @@ static RETDesc *bindRowValues(BindWA *bindWA,
return resultTable;
} // bindRowValues()
-#pragma warn(770) // warning elimination
// Bind a constraint (MP Check Constraint).
// Returns NULL if error in constraint *OR* we can safely ignore the constraint
@@ -3499,9 +3497,7 @@ RelExpr *Union::bindNode(BindWA *bindWA)
ValueIdUnion(leftTable.getValueId(i),
rightTable.getValueId(i),
NULL_VALUE_ID,
-#pragma nowarn(1506) // warning elimination
getUnionFlags());
-#pragma warn(1506) // warning elimination
vidUnion->setIsTrueUnion(TRUE);
vidUnion->bindNode(bindWA);
if (bindWA->errStatus()) {
@@ -6030,9 +6026,7 @@ RelExpr *RelRoot::bindNode(BindWA *bindWA)
Lng32 sqlcode = (CmpCommon::context()->GetMode() == STMT_DYNAMIC) ?
-4093 : -4094;
*CmpCommon::diags() << DgSqlCode(sqlcode)
-#pragma nowarn(1506) // warning elimination
<< DgInt0(outputVarCnt()) << DgInt1(getRETDesc()->getDegree());
-#pragma warn(1506) // warning elimination
bindWA->setErrStatus();
return NULL;
}
@@ -9000,9 +8994,7 @@ RelExpr *RenameTable::bindNode(BindWA *bindWA)
if (derivedColList.entries() != sourceTable.getDegree()) {
// 4016 The number of derived columns must equal the degree of the derived table.
*CmpCommon::diags() << DgSqlCode(-4016)
-#pragma nowarn(1506) // warning elimination
<< DgInt0(derivedColList.entries()) << DgInt1(sourceTable.getDegree());
-#pragma warn(1506) // warning elimination
bindWA->setErrStatus();
delete resultTable;
return this;
@@ -10117,9 +10109,7 @@ RelExpr *Insert::bindNode(BindWA *bindWA)
if ((sourceTable.getDegree() != newTgtColList.entries())&& !bulkLoadIndex) {
// 4023 degree of row value constructor must equal that of target table
*CmpCommon::diags() << DgSqlCode(-4023)
-#pragma nowarn(1506) // warning elimination
<< DgInt0(sourceTable.getDegree()) << DgInt1(tgtColList.entries());
-#pragma warn(1506) // warning elimination
bindWA->setErrStatus();
return boundExpr;
}
@@ -11336,12 +11326,8 @@ const char *Insert::getColDefaultValue(BindWA *bindWA, CollIndex i) const
if (colList.entries() <= pos) {
// 4023 degree of row value constructor must equal that of target table
*CmpCommon::diags() << DgSqlCode(-4023)
-#pragma nowarn(1506) // warning elimination
<< DgInt0(++pos)
-#pragma warn(1506) // warning elimination
-#pragma nowarn(1506) // warning elimination
<< DgInt1(colList.entries());
-#pragma warn(1506) // warning elimination
bindWA->setErrStatus();
return NULL;
}
@@ -12136,7 +12122,6 @@ static const char OLDTable [] = "OLD"; // QSTUFF: corr for embedded d/u
// the before image.
// delete from tab set on rollback x = 1;
// update tab set x = 1 set on rollback x = 2;
-#pragma nowarn(770) // warning elimination
void GenericUpdate::bindUpdateExpr(BindWA *bindWA,
ItemExpr *recExpr,
ItemExprList &assignList,
@@ -12334,9 +12319,7 @@ void GenericUpdate::bindUpdateExpr(BindWA *bindWA,
// to the columns, of course.
//
CollIndex totalColCount = getTableDesc()->getColumnList().entries();
-#pragma nowarn(1506) // warning elimination
ValueIdArray holeyArray(totalColCount);
-#pragma warn(1506) // warning elimination
ValueId assignId; // i'th newRecExpr valueid
for (i = 0, assignId = newRecExpr.init(); // bizarre ValueIdSet iter
newRecExpr.next(assignId);
@@ -12448,7 +12431,6 @@ void GenericUpdate::bindUpdateExpr(BindWA *bindWA,
CMPASSERT(j == a);
bindWA->getCurrentScope()->setRETDesc(origScope);
}
-#pragma warn(770) // warning elimination
void getScanPreds(RelExpr *start, ValueIdSet &preds)
{
@@ -15116,9 +15098,7 @@ RelExpr *Transpose::bindNode(BindWA *bindWA)
// Construct the constant value
//
-#pragma nowarn(1506) // warning elimination
constExpr = new(bindWA->wHeap()) SystemLiteral(keyVal);
-#pragma warn(1506) // warning elimination
// Bind the constant value.
//
@@ -15323,9 +15303,7 @@ RelExpr* Pack::bindNode(BindWA* bindWA)
// ---------------------------------------------------------------------
// Create and bind the packing factor item expression.
-#pragma nowarn(1506) // warning elimination
ItemExpr* pfie = new (bindWA->wHeap()) SystemLiteral(packingFactorLong());
-#pragma warn(1506) // warning elimination
pfie->bindNode(bindWA);
if (bindWA->errStatus()) return this;
@@ -15348,14 +15326,10 @@ RelExpr* Pack::bindNode(BindWA* bindWA)
// Add all columns to result table.
NAString packedColName( "PACKEDCOL_", bindWA->wHeap());
packedColName += bindWA->fabricateUniqueName();
-#pragma nowarn(1506) // warning elimination
Int32 length = packedColName.length();
-#pragma warn(1506) // warning elimination
char * colName = new (bindWA->wHeap()) char[length + 1];
colName[length] = 0;
-#pragma nowarn(1506) // warning elimination
str_cpy_all(colName, packedColName, packedColName.length());
-#pragma warn(1506) // warning elimination
ColRefName colRefName(colName);
resultTable->addColumn(bindWA,
@@ -15440,10 +15414,8 @@ RelExpr* Pack::bindNode(BindWA* bindWA)
&(packedCols[i].getItemExpr()->child(0)->getValueId().getType());
Lng32 width = colType->getNominalSize();
-#pragma nowarn(1506) // warning elimination
Lng32 base = (colType->supportsSQLnullPhysical() ? (pf-1)/CHAR_BIT +1 : 0)
+ sizeof(Int32);
-#pragma warn(1506) // warning elimination
// $$$ Some duplicate code to be moved to PackColDesc later.
ColRefName colRefName;
@@ -16097,9 +16069,7 @@ RelExpr * RowsetInto::bindNode(BindWA* bindWA)
if (numOutputHostvars != childTableVidList.entries()) {
// 4094 The number of output host vars ($0) must equal the number of cols
*CmpCommon::diags() << DgSqlCode(-4094)
-#pragma nowarn(1506) // warning elimination
<< DgInt0(numOutputHostvars) << DgInt1(childTableVidList.entries());
-#pragma warn(1506) // warning elimination
bindWA->setErrStatus();
return NULL;
}
@@ -16914,13 +16884,11 @@ void CallSP::setInOrOutParam ( ItemExpr *expr,
if ( throwInTranslateNode == FALSE )
{
// Error, data types dont match
-#pragma nowarn(1506) // warning elimination
*CmpCommon::diags() << DgSqlCode(-UDR_BINDER_PARAM_TYPE_MISMATCH)
<< DgInt0 (ordinalPosition)
<< DgTableName(getRoutineName().getQualifiedNameAsString())
<< DgString0 (inputType.getTypeSQLname (TRUE))
<< DgString1 (paramType.getTypeSQLname (TRUE));
-#pragma warn(1506) // warning elimination
bindWA->setErrStatus ();
return;
}
@@ -16968,11 +16936,9 @@ void CallSP::setInOrOutParam ( ItemExpr *expr,
if (!( ITM_HOSTVAR == expr->getOperatorType () ||
ITM_DYN_PARAM == expr->getOperatorType ()))
{
-#pragma nowarn(1506) // warning elimination
*CmpCommon::diags() << DgSqlCode(-UDR_BINDER_OUTVAR_NOT_HV_OR_DP)
<< DgInt0(ordinalPosition)
<< DgTableName(getRoutineName().getQualifiedNameAsString());
-#pragma warn(1506) // warning elimination
bindWA->setErrStatus ();
return;
} // if NOT HOSTVAR or DYNAMIC PARAM
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/BindWA.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/BindWA.cpp b/core/sql/optimizer/BindWA.cpp
index 8e8c89a..a6e19d8 100644
--- a/core/sql/optimizer/BindWA.cpp
+++ b/core/sql/optimizer/BindWA.cpp
@@ -1095,9 +1095,7 @@ void HostArraysWA::processArrayHostVar(ItemExpr *parent, Int32 childNumber)
// an INSERT, for instance, the types will be determined in the Insert node
SQLRowset *rowsetType =
new (bindWA_->wHeap()) SQLRowset(bindWA_->wHeap(), (new (bindWA_->wHeap()) SQLUnknown(bindWA_->wHeap())),
-#pragma nowarn(1506) // warning elimination
size, size);
-#pragma warn(1506) // warning elimination
NAString name = param->getName();
if (name.isNull()) {
name = "__array" + bindWA_->fabricateUniqueName();
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/CascadesBasic.h
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/CascadesBasic.h b/core/sql/optimizer/CascadesBasic.h
index a8915d7..1a7cf68 100644
--- a/core/sql/optimizer/CascadesBasic.h
+++ b/core/sql/optimizer/CascadesBasic.h
@@ -82,7 +82,6 @@ class HashValue : public NABasicObject
{
public:
-// warning elimination (removed "inline")
HashValue(ULng32 v = 0x0) { val_ = v; }
inline NABoolean operator == (const HashValue &other)
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/ChangesTable.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/ChangesTable.cpp b/core/sql/optimizer/ChangesTable.cpp
index f6a9b29..7f62890 100644
--- a/core/sql/optimizer/ChangesTable.cpp
+++ b/core/sql/optimizer/ChangesTable.cpp
@@ -249,9 +249,7 @@ RelExpr *ChangesTable::buildInsert(NABoolean useLeafInsert,
ItemExpr *delColExpr, *insColExpr;
for (CollIndex i=0; i < tempColumns.entries(); i++)
{
-#pragma nowarn(1506) // warning elimination
NAColumn *currentTempCol = tempColumns.getColumn(i);
-#pragma warn(1506) // warning elimination
const NAString& colName = currentTempCol->getColName();
delColExpr = insColExpr = NULL;
@@ -465,9 +463,7 @@ ItemExpr *ChangesTable::buildBaseColsSelectList(const CorrName& tableName) const
for (CollIndex i=0; i<subjectColumns.entries(); i++)
{
-#pragma nowarn(1506) // warning elimination
NAString colName(subjectColumns.getColumn(i)->getColName());
-#pragma warn(1506) // warning elimination
if (!colName.compareTo("SYSKEY"))
continue; // Skip SYSKEY.
@@ -498,9 +494,7 @@ ChangesTable::buildColsCorrespondingToBaseSelectList() const
for (CollIndex i=0; i<columns.entries(); i++)
{
-#pragma nowarn(1506) // warning elimination
NAString colName(columns.getColumn(i)->getColName());
-#pragma warn(1506) // warning elimination
if (colName.data()[0] == '@' && colName.compareTo("@SYSKEY"))
continue; // Skip any special column that is not @SYSKEY.
@@ -581,9 +575,7 @@ ItemExpr *ChangesTable::buildRenameColsList() const
for (CollIndex i=0; i<subjectColumns.entries(); i++)
{
-#pragma nowarn(1506) // warning elimination
const NAString subjectCol(subjectColumns.getColumn(i)->getColName());
-#pragma warn(1506) // warning elimination
const NAString *colName = &subjectCol;
if (!subjectCol.compareTo("SYSKEY"))
{
@@ -1247,7 +1239,6 @@ ItemExpr *MvIudLog::buildLogEpochPredicate(const DeltaDefinition *deltaDef,
// We use here a special builtin function that evalutes
// this expression
//////////////////////////////////////////////////////////////////////////////
-#pragma nowarn(262) // warning elimination
ItemExpr *MvIudLog::createSpecificWhereExpr(RowsType type) const
{
CMPASSERT(deltaDef_ != NULL);
@@ -1333,7 +1324,6 @@ ItemExpr *MvIudLog::createSpecificWhereExpr(RowsType type) const
return result;
}
-#pragma warn(262) // warning elimination
//////////////////////////////////////////////////////////////////////////////
// The orig selection predicate is on the base table columns. This recursive
@@ -1387,9 +1377,7 @@ ItemExpr *MvIudLog::buildOrigScanPredicate() const
parser.getItemExprTree((char *)textPredicate.data());
ItemExprList predicateList(origScanPredicate, bindWA_->wHeap(), ITM_AND);
-#pragma nowarn(1506) // warning elimination
for (Int32 i=predicateList.entries()-1; i>=0; i--)
-#pragma warn(1506) // warning elimination
{
if (fixReferencesFromBaseTableToLog(predicateList[i]) == FALSE)
predicateList.removeAt(i);
@@ -1453,9 +1441,7 @@ ItemExpr *MvIudLog::constructUpdateBitmapFromList(const LIST(Lng32) &columnList)
for (CollIndex i=0; i < logColumns.entries(); i++)
{
-#pragma nowarn(1506) // warning elimination
currentTempCol = logColumns.getColumn(i);
-#pragma warn(1506) // warning elimination
if (!currentTempCol->getColName().compareTo(COMMV_BITMAP_COL))
break;
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/ClusteredBitmap.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/ClusteredBitmap.cpp b/core/sql/optimizer/ClusteredBitmap.cpp
index e530246..8c75b3f 100644
--- a/core/sql/optimizer/ClusteredBitmap.cpp
+++ b/core/sql/optimizer/ClusteredBitmap.cpp
@@ -42,12 +42,6 @@
#include "ClusteredBitmap.h"
-#ifdef WIN32
-// The firstSetBit() function produces a warning on Windows.
-// Turn it off temporarily.
-#pragma warning( disable : 4146 ) // disable "unsigned" warnings
-#endif // WIN32
-
// Isolate the first set bit in the integer value.
inline ClusteredBitmap::cb_int_t
ClusteredBitmap::firstSetBit(cb_int_t value)
@@ -55,10 +49,6 @@ ClusteredBitmap::firstSetBit(cb_int_t value)
return value & (-value);
}
-#ifdef WIN32
-#pragma warning( default : 4146 ) // allow "unsigned" warnings
-#endif // WIN32
-
// Return the significant bits for a particular value. The
// significant bits are bits 9-31 and are used as a lookup
// value in the bitmapMap_ array.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/ColStatDesc.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/ColStatDesc.cpp b/core/sql/optimizer/ColStatDesc.cpp
index f5a6f65..8623526 100644
--- a/core/sql/optimizer/ColStatDesc.cpp
+++ b/core/sql/optimizer/ColStatDesc.cpp
@@ -3780,7 +3780,6 @@ ColStatDescList::identifyMergeCandidates (ItemExpr * operand,
// This is the new version of this function which facilitates applying all
// predicates at once.
// -----------------------------------------------------------------------
-#pragma nowarn(770) // warning elimination
NABoolean
ColStatDescList::applyVEGPred (ItemExpr *VEGpred,
CostScalar & rowcount,
@@ -4119,9 +4118,7 @@ ColStatDescList::applyVEGPred (ItemExpr *VEGpred,
// statsToMerge
//NB: i is unsigned, so this loop as-is should never terminate
-#pragma nowarn(270) // warning elimination
for ( i = statsToMerge.entries() - 1; i >= 0; i-- )
-#pragma warn(270) // warning elimination
{
if (statsToMerge[i] != rootStatIndex)
{
@@ -4243,7 +4240,6 @@ ColStatDescList::applyVEGPred (ItemExpr *VEGpred,
return appliedPredicateFlag;
} // applyVEGPred
-#pragma warn(770) // warning elimination
// -----------------------------------------------------------------------
// ColStatDescList::applyBiLogicPred
@@ -4771,7 +4767,6 @@ ColStatDescList::applyBiLogicPred(CostScalar & tempRowcount,
ValueIdSet matchedRight;
CollIndex currentL, currentR;
-#pragma nowarn(262) // warning elimination
if( this->entries() != copyStatsList.entries() )
{
// copyStatsList is a copy of THIS statsList, during
@@ -4779,7 +4774,6 @@ ColStatDescList::applyBiLogicPred(CostScalar & tempRowcount,
// the copy, we should not have dropped any columns.
Int32 stophere = 0;
}
-#pragma warn(262) // warning elimination
for( currentL = 0; currentL < entries(); currentL++ )
{
@@ -4868,14 +4862,12 @@ ColStatDescList::applyBiLogicPred(CostScalar & tempRowcount,
}
} // for (currentL)
-#pragma nowarn(262) // warning elimination
if( copyStatsList.entries() != 0 )
{
CCMPASSERT (copyStatsList.entries() == 0);
// The OR merge between THIS and the copy did not go properly
return newRowCount;
}
-#pragma warn(262) // warning elimination
// Determine the resultant rowcount. If not all columns overlapped,
// use previously determined rowcount
@@ -8360,7 +8352,6 @@ ColStatDescList::getColStatDescIndex (CollIndex& index, /* out */
// ColStatDescList
// -----------------------------------------------------------------------
-#pragma nowarn(262) // warning elimination
ColStatsSharedPtr
ColStatDescList::getColStatsPtrForColumn (const ValueId& inputColumn) const
{
@@ -8374,7 +8365,6 @@ ColStatDescList::getColStatsPtrForColumn (const ValueId& inputColumn) const
}
else
{
-#pragma nowarn(270) // warning elimination
if ((index < 0) || (index >= entries()) )
{
// if the index is out side the range of histogram list, return
@@ -8384,11 +8374,9 @@ ColStatDescList::getColStatsPtrForColumn (const ValueId& inputColumn) const
return NULL;
}
-#pragma warn(270) // warning elimination
return (*this)[index]->getColStats();
}
}
-#pragma warn(262) // warning elimination
// -----------------------------------------------------------------------
// This method returns the ColStatsSharedPtr for the ColStats that references
@@ -9468,7 +9456,6 @@ MultiColumnUecList::findDenom (const ValueIdSet & columns) const
ULng32 TableDescHashFn (const TableDesc & tablePtr)
{ return (ULng32)((Long)&tablePtr/8) ; }
-#pragma nowarn(262) // warning elimination
NABoolean
MultiColumnUecList::useMCUecForCorrPreds (
NAHashDictionary<ValueId, CostScalar> & predReductions, /* in/mod */
@@ -9784,7 +9771,6 @@ MultiColumnUecList::useMCUecForCorrPreds (
numPredicates );
return TRUE;
}
-#pragma warn(262) // warning elimination
NABoolean
MultiColumnUecList::createMCStatsForColumnSet(ValueIdSet colsWithReductions,
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/ColumnDesc.h
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/ColumnDesc.h b/core/sql/optimizer/ColumnDesc.h
index 8d32e0b..5475d45 100644
--- a/core/sql/optimizer/ColumnDesc.h
+++ b/core/sql/optimizer/ColumnDesc.h
@@ -49,7 +49,6 @@ class ColumnDescList;
// ***********************************************************************
// ColumnDesc : A column descriptor
// ***********************************************************************
-#pragma nowarn(1506) // warning elimination
class ColumnDesc : public NABasicObject
{
public:
@@ -145,7 +144,6 @@ private:
const char * viewFileName_;
}; // class ColumnDesc
-#pragma warn(1506) // warning elimination
// ***********************************************************************
// ColumnDescList : A list of column descriptors
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/ColumnNameMap.h
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/ColumnNameMap.h b/core/sql/optimizer/ColumnNameMap.h
index 0f31955..e161aea 100644
--- a/core/sql/optimizer/ColumnNameMap.h
+++ b/core/sql/optimizer/ColumnNameMap.h
@@ -67,7 +67,6 @@ class XCNM;
// whose name is exposed in a given scope.
//
// ***********************************************************************
-#pragma nowarn(1506) // warning elimination
class ColumnNameMap : public NABasicObject
{
public:
@@ -198,7 +197,6 @@ private:
NABoolean qualColAmbiguousFlag_;
}; // class ColumnNameMap
-#pragma warn(1506) // warning elimination
// ***********************************************************************
// Implementation for inline functions
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/ControlDB.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/ControlDB.cpp b/core/sql/optimizer/ControlDB.cpp
index 4af0d81..cd64594 100644
--- a/core/sql/optimizer/ControlDB.cpp
+++ b/core/sql/optimizer/ControlDB.cpp
@@ -1133,18 +1133,14 @@ void ControlTableOptions::addTokenAndValue(const NAString &token,
const NAString &ControlTableOptions::getToken(CollIndex index)
{
-#pragma nowarn(270) // warning elimination
CMPASSERT((index >= 0) && (index < tokens_->entries()));
-#pragma warn(270) // warning elimination
return *((*tokens_)[index]);
}
const NAString &ControlTableOptions::getValue(CollIndex index)
{
-#pragma nowarn(270) // warning elimination
CMPASSERT((index >= 0) && (index < values_->entries()));
-#pragma warn(270) // warning elimination
return *((*values_)[index]);
}
@@ -1595,9 +1591,7 @@ ExprNode *DecodeShapeSyntax(const NAString &fname,
fname == "FILE_SCAN" OR
fname == "INDEX_SCAN")
{
-#pragma nowarn(1506) // warning elimination
Int32 numArgs = args->entries();
-#pragma warn(1506) // warning elimination
Int32 firstNonStringArg=0;
NAString tableName(CmpCommon::statementHeap());
NAString indexName(CmpCommon::statementHeap());
@@ -1709,9 +1703,7 @@ ExprNode *DecodeShapeSyntax(const NAString &fname,
{
result = new (heap) ScanForceWildCard();
NABoolean dummyNegate = FALSE;
-#pragma nowarn(1506) // warning elimination
Int32 numColumns = args->entries();
-#pragma warn(1506) // warning elimination
ItemExpr *itm;
ScanForceWildCard::scanOptionEnum* columnAlgorithms
@@ -1938,9 +1930,7 @@ ExprNode *DecodeShapeSyntax(const NAString &fname,
}
else if (fname == "ISOLATED_SCALAR_UDF")
{
-#pragma nowarn(1506) // warning elimination
Int32 numArgs = args->entries();
-#pragma warn(1506) // warning elimination
if (numArgs > 2)
{
// No more than two arguments allowed.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/Cost.h
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/Cost.h b/core/sql/optimizer/Cost.h
index 26600ae..e5c1cfc 100644
--- a/core/sql/optimizer/Cost.h
+++ b/core/sql/optimizer/Cost.h
@@ -905,7 +905,6 @@ class CostWeight : public NABasicObject
{
public:
-// warning elimination (removed "inline")
virtual ~CostWeight() {}
// ---------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/CostVector.h
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/CostVector.h b/core/sql/optimizer/CostVector.h
index 3f90647..78c91be 100644
--- a/core/sql/optimizer/CostVector.h
+++ b/core/sql/optimizer/CostVector.h
@@ -76,7 +76,6 @@ class CostVector : public NABasicObject
{
public:
-// warning elimination (removed "inline)
virtual ~CostVector() {}
// A virtual method that returns the number of entries.
@@ -287,14 +286,12 @@ j*/
SimpleCostVector(const SimpleCostVector &other);
-// warning elimination (removed "inline")
virtual CostVector* copy() const
{ return new(CmpCommon::statementHeap()) SimpleCostVector(*this); }
// ---------------------------------------------------------------------
// Destructor
// ---------------------------------------------------------------------
-// warning elimination (removed "inline")
~SimpleCostVector() {}
// ---------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/EncodedValue.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/EncodedValue.cpp b/core/sql/optimizer/EncodedValue.cpp
index 0e769ef..cd0bc0d 100644
--- a/core/sql/optimizer/EncodedValue.cpp
+++ b/core/sql/optimizer/EncodedValue.cpp
@@ -645,7 +645,6 @@ EncodedValue::EncodedValue (ItemExpr *expr,
addANormValue(this,expr,negate);
}
-#pragma nowarn(262) // warning elimination
void
EncodedValue::constructorFunction (const NAWchar * theValue,
const NAColumnArray &columns,
@@ -803,7 +802,6 @@ EncodedValue::constructorFunction (const NAWchar * theValue,
// invoke parser to parse the char string and generate a ConstValue
Parser parser(CmpCommon::context());
-#pragma nowarn(1506) // warning elimination
// Leave space for both semi-colon and null
// next points to the next char after the value
Int32 numChars = MINOF(BOUNDARY_LEN-2,na_wcslen(item)-na_wcslen(next));
@@ -846,9 +844,7 @@ EncodedValue::constructorFunction (const NAWchar * theValue,
buf[numChars+prefixLen] = L';';
buf[numChars+prefixLen+1] = L'\0';
-#pragma warn(1506) // warning elimination
-#pragma warn(1506) // warning elimination
NABoolean negate = FALSE;
@@ -933,7 +929,6 @@ EncodedValue::constructorFunction (const NAWchar * theValue,
return;
}
-#pragma warn(262) // warning elimination
// -----------------------------------------------------------------------
// Given an upper and lower bound, represented in multi-attribute
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/EstLogProp.h
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/EstLogProp.h b/core/sql/optimizer/EstLogProp.h
index 959a3fa..3400dd1 100644
--- a/core/sql/optimizer/EstLogProp.h
+++ b/core/sql/optimizer/EstLogProp.h
@@ -94,12 +94,10 @@ public:
// ---------------------------------------------------------------------
// Accessor Functions
// ---------------------------------------------------------------------
-// warning elimination (removed "inline")
CostScalar getResultCardinality() const
{ CCMPASSERT (resultCardinality_ >= 0) ;
return resultCardinality_;
}
-// warning elimination (removed "inline")
void setResultCardinality(CostScalar v)
{ CCMPASSERT (v >= 0) ;
v.round();
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/GroupAttr.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/GroupAttr.cpp b/core/sql/optimizer/GroupAttr.cpp
index 7e87bb6..30a04fd 100644
--- a/core/sql/optimizer/GroupAttr.cpp
+++ b/core/sql/optimizer/GroupAttr.cpp
@@ -908,7 +908,6 @@ HashValue GroupAttributes::hash() const
// covered by a partitioning requirement that has no part key cols
// Returns: A list that is a prefix of the chosen index sort key.
// -----------------------------------------------------------------------
-#pragma nowarn(770) // warning elimination
ValueIdList GroupAttributes::recommendedOrderForNJProbing(
GroupAttributes* child0GA, // IN
Lng32 numForcedParts, //IN
@@ -1011,9 +1010,7 @@ ValueIdList GroupAttributes::recommendedOrderForNJProbing(
getCharacteristicInputs(),
currentIndexUncoveredCols);
-#pragma nowarn(1506) // warning elimination
currentIndexNumUncoveredCols = currentIndexUncoveredCols.entries();
-#pragma warn(1506) // warning elimination
// The current index must have at least one equijoincolumn to use it.
if (currentIndexOrder.entries() == 0)
@@ -1259,7 +1256,6 @@ ValueIdList GroupAttributes::recommendedOrderForNJProbing(
return chosenIndexOrder;
} // GroupAttributes::recommendedOrderForNJProbing()
-#pragma warn(770) // warning elimination
// -----------------------------------------------------------------------
// coverTest()
@@ -2346,9 +2342,7 @@ Int32 GroupAttributes::existsInputLogProp (const EstLogPropSharedPtr& inputLP) c
for (CollIndex i = 0; i < inputEstLogProp_.entries(); i++)
{
if (inputEstLogProp_[i]->compareEstLogProp (inputLP) == SAME)
-#pragma nowarn(1506) // warning elimination
return i;
-#pragma warn(1506) // warning elimination
}
return -1;
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/ImplRule.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/ImplRule.cpp b/core/sql/optimizer/ImplRule.cpp
index 38c9ff0..bbd4659 100644
--- a/core/sql/optimizer/ImplRule.cpp
+++ b/core/sql/optimizer/ImplRule.cpp
@@ -1621,7 +1621,6 @@ RelExpr * FileScanRule::nextSubstitute(RelExpr * before,
return generateScanSubstitutes(before, context, memory, FALSE);
}
-#pragma warn(770) // warning elimination
// -----------------------------------------------------------------------
// methods for class HbaseScanRule
@@ -4084,7 +4083,6 @@ PhysicalPackRule::~PhysicalPackRule()
}
// PhysicalPackRule::topMatch()
-#pragma nowarn(262) // warning elimination
NABoolean PhysicalPackRule::topMatch(RelExpr* relExpr, Context* context)
{
// Match the node type first.
@@ -4205,7 +4203,6 @@ NABoolean PhysicalPackRule::topMatch(RelExpr* relExpr, Context* context)
return TRUE;
}
-#pragma warn(262) // warning elimination
RelExpr* PhysicalPackRule::nextSubstitute(RelExpr* before,
Context* /*context*/,
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/IndexDesc.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/IndexDesc.cpp b/core/sql/optimizer/IndexDesc.cpp
index 9ae1518..dfb9593 100644
--- a/core/sql/optimizer/IndexDesc.cpp
+++ b/core/sql/optimizer/IndexDesc.cpp
@@ -101,9 +101,7 @@ IndexDesc::IndexDesc(TableDesc *tdesc,
baseItemExpr = NULL;
}
-#pragma nowarn(1506) // warning elimination
IndexColumn *ixcol = new(wHeap()) IndexColumn(fileSet_,i,baseValueId);
-#pragma warn(1506) // warning elimination
ixcol->synthTypeAndValueId();
// add the newly obtained value id to the index column list
@@ -125,7 +123,6 @@ IndexDesc::IndexDesc(TableDesc *tdesc,
for (i = 0; i < indexKeyColumns.entries(); i++)
{
// which column of the index is this (usually this will be == i)
-#pragma nowarn(1506) // warning elimination
if ( !naTable->isHbaseTable() )
ixColNumber = allColumns.index(indexKeyColumns[i]);
@@ -139,7 +136,6 @@ IndexDesc::IndexDesc(TableDesc *tdesc,
CMPASSERT(ixColNumber >= 0);
}
-#pragma warn(1506) // warning elimination
// insert the value id of the index column into the key column
// value id list
@@ -173,9 +169,7 @@ IndexDesc::IndexDesc(TableDesc *tdesc,
for (i = 0; i < clustKeyColumns.entries() AND found; i++)
{
// which column of the index is this?
-#pragma nowarn(1506) // warning elimination
ixColNumber = allColumns.index(clustKeyColumns[i]);
-#pragma warn(1506) // warning elimination
found = (ixColNumber != NULL_COLL_INDEX);
@@ -203,9 +197,7 @@ IndexDesc::IndexDesc(TableDesc *tdesc,
for (i = 0; i < partitioningKeyColumns.entries(); i++)
{
// which column of the index is this
-#pragma nowarn(1506) // warning elimination
ixColNumber = allColumns.index(partitioningKeyColumns[i]);
-#pragma warn(1506) // warning elimination
// insert the value id of the index column into the partitioningkey column
// value id list
@@ -301,12 +293,9 @@ int IndexDesc::indexHintPriorityDelta() const
}
// Print function
-#pragma nowarn(770) // warning elimination
void IndexDesc::print(FILE* ofd, const char* indent, const char* title)
{
-#pragma nowarn(1506) // warning elimination
BUMP_INDENT(indent);
-#pragma warn(1506) // warning elimination
cout << title << " " << this << " "
<< indexLevels_ << "," << clusteringIndexFlag_
<< " pf=" << partFunc_ << " fs=" << fileSet_
@@ -316,7 +305,6 @@ void IndexDesc::print(FILE* ofd, const char* indent, const char* title)
orderOfKeyValues_.print(ofd, indent, "IndexDesc::orderOfKeyValues_");
clusteringKey_.print(ofd, indent, "IndexDesc::clusteringKey_");
}
-#pragma warn(770) // warning elimination
// Get the statement heap
CollHeap* IndexDesc::wHeap()
@@ -469,10 +457,8 @@ IndexDesc::getEstimatedIndexBlocksLowerBound(const CostScalar& probes) const
indexBlocksLowerBound = MINOF( indexBlocks, probes );
// Index blocks touch by all probes for level three and above:
-#pragma warning (disable : 4018) //warning elimination
for (CollIndex i=2; i < levels; i++)
{
-#pragma warning (default : 4018) //warning elimination
indexBlocks = indexBlocks*40;
indexBlocksLowerBound += MINOF( indexBlocks, probes );
}
@@ -573,9 +559,7 @@ NABoolean IndexDesc::isUniqueIndex() const
return getNAFileSet()->uniqueIndex();
-#pragma nowarn(269) // warning elimination
ValueIdList nonKeyColumnList;
-#pragma warn(269) // warning elimination
getNonKeyColumnList(nonKeyColumnList);
// if there are some non-index-key columns(the key of base table),
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/Inlining.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/Inlining.cpp b/core/sql/optimizer/Inlining.cpp
index 6b7ebd2..234acf5 100644
--- a/core/sql/optimizer/Inlining.cpp
+++ b/core/sql/optimizer/Inlining.cpp
@@ -893,9 +893,7 @@ static ItemExpr *addCheckForTriggerEnabled(BindWA *bindWA,
ItemExpr *enableCheck = new(heap)
GetBitValueAt(new(heap) GetTriggersStatus(),
-#pragma nowarn(1506) // warning elimination
new(heap) ConstValue(triggerIndex) );
-#pragma warn(1506) // warning elimination
// Check if whenClause is empty or TRUE
if (whenClause == NULL || whenClause->getOperatorType() == ITM_RETURN_TRUE)
@@ -1632,14 +1630,10 @@ RelExpr *Update::createEffectiveGU(BindWA *bindWA,
for (CollIndex i=0; i<subjectColumns.entries(); i++)
{
// If this column was not SET into, no need to change it.
-#pragma nowarn(1506) // warning elimination
if (!colsToSet->contains(i))
-#pragma warn(1506) // warning elimination
continue;
-#pragma nowarn(1506) // warning elimination
NAColumn *currentColumn = subjectColumns.getColumn(i);
-#pragma warn(1506) // warning elimination
const NAString &colName = currentColumn->getColName();
// Cannot update a clustering/primary key column!
@@ -2281,9 +2275,7 @@ RelExpr * GenericUpdate::createUndoTempTable(TriggersTempTable *tempTableObj,Bin
tempCorrName.setCorrName( NEWCorr);
for (CollIndex i=0; i<tempColumns.entries(); i++)
{
-#pragma nowarn(1506) // warning elimination
NAString tempColName(tempColumns.getColumn(i)->getColName());
-#pragma warn(1506) // warning elimination
ColReference *tempColRef = new(bindWA->wHeap())
@@ -2700,9 +2692,7 @@ RelExpr* GenericUpdate::inlineRI (BindWA *bindWA,
CMPASSERT (!refConstraints->isEmpty())
-#pragma nowarn(1506) // warning elimination
if ((entries = refConstraints->entries()))
-#pragma warn(1506) // warning elimination
{
riSubtree = createRISubtree(bindWA, naTable, *(refConstraints->at(0)), heap);
for (Int32 i=1; i < entries; i++)
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/ItemArith.h
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/ItemArith.h b/core/sql/optimizer/ItemArith.h
index 5278f51..80cfaf5 100644
--- a/core/sql/optimizer/ItemArith.h
+++ b/core/sql/optimizer/ItemArith.h
@@ -57,7 +57,6 @@ class BiArith : public ItemExpr
{
// ITM_PLUS, ITM_MINUS, ITM_TIMES, ITM_DIVIDE, ITM_EXPONENT
public:
-// warning elimination (removed "inline")
BiArith(OperatorTypeEnum otype,
ItemExpr *child0 = NULL,
ItemExpr *child1 = NULL)
@@ -71,7 +70,6 @@ public:
{}
// virtual destructor
-// warning elimination (removed "inline")
virtual ~BiArith() {}
// accessor functions
@@ -194,7 +192,6 @@ private:
class BiArithSum : public BiArith
{
public:
-// warning elimination (removed "inline")
BiArithSum(OperatorTypeEnum otype,
ItemExpr *child0 = NULL,
ItemExpr *child1 = NULL)
@@ -202,7 +199,6 @@ public:
{}
// virtual destructor
-// warning elimination (removed "inline")
virtual ~BiArithSum() {}
virtual ItemExpr * copyTopNode(ItemExpr *derivedNode = NULL,
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/ItemColRef.h
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/ItemColRef.h b/core/sql/optimizer/ItemColRef.h
index 6a96370..783d327 100644
--- a/core/sql/optimizer/ItemColRef.h
+++ b/core/sql/optimizer/ItemColRef.h
@@ -78,7 +78,6 @@ typedef ClusteredBitmap PositionSet;
// the ValueDesc.
// -----------------------------------------------------------------------
-#pragma nowarn(1682) // warning elimination
class BaseColumn : public ItemExpr
{
@@ -183,13 +182,11 @@ private:
// If this is a computed column, the expression used to compute it (NULL otherwise)
ValueId computedColumnExpr_;
}; // class BaseColumn
-#pragma warn(1682) // warning elimination
// -----------------------------------------------------------------------
// An index column object is allocated each time when an index is used
// by a rule that transforms some base table access into an index scan.
// -----------------------------------------------------------------------
-#pragma nowarn(1682) // warning elimination
class IndexColumn : public ItemExpr
{
@@ -256,7 +253,6 @@ private:
ValueId indexColDefinition_;
};
-#pragma warn(1682) // warning elimination
// -----------------------------------------------------------------------
// A column reference points to a column in a relational node. Constants
@@ -954,11 +950,8 @@ public:
// Raj P - 01/2001
// Parameter mode, ordinal position and variable index
// needed for (java) stored procedures
-// warning elimination (removed "inline")
ComColumnDirection getParamMode () const {return paramMode_;};
-// warning elimination (removed "inline")
Int32 getOrdinalPosition () const {return ordinalPosition_;};
-// warning elimination (removed "inline")
Int32 getHVorDPIndex () const { return hvIndex_;}
virtual void setPMOrdPosAndIndex( ComColumnDirection paramMode,
Int32 ordinalPosition,
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/ItemConstr.h
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/ItemConstr.h b/core/sql/optimizer/ItemConstr.h
index 9d21aa8..1b3642a 100644
--- a/core/sql/optimizer/ItemConstr.h
+++ b/core/sql/optimizer/ItemConstr.h
@@ -471,7 +471,6 @@ protected:
}; // AbstractRIConstraint
-#pragma nowarn(1026) // warning elimination
class ComplementaryRIConstraint : public NABasicObject
{
public:
@@ -521,7 +520,6 @@ public:
const QualifiedName &getTableName() const { return tableName_; }
}; // ComplementaryRIConstraint
-#pragma warn(1026) // warning elimination
// -----------------------------------------------------------------------
// Uniqueness of a combination of columns in a table:
@@ -641,7 +639,6 @@ public:
inline NABoolean isaForeignKeyinTableBeingUpdated() const;
inline NABoolean referencesTableBeingUpdated() const;
- //warning elimination (removed "inline")
const QualifiedName &getOtherTableName() const
{
return *otherTableName_;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/ItemExpr.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/ItemExpr.cpp b/core/sql/optimizer/ItemExpr.cpp
index 31b8e58..154d39a 100644
--- a/core/sql/optimizer/ItemExpr.cpp
+++ b/core/sql/optimizer/ItemExpr.cpp
@@ -1358,14 +1358,10 @@ ItemExpr * ItemExpr::transformMultiValuePredicate( // virtual method
NABoolean ItemExpr::containsAnAggregate() const
{
-#pragma warning (disable : 4018) //warning elimination
for (Int32 i=0; i<getArity(); i++)
{
-#pragma warning (default : 4018) //warning elimination
-#pragma nowarn(1506) // warning elimination
if (child(i)->containsAnAggregate())
return TRUE;
-#pragma warn(1506) // warning elimination
}
return FALSE;
}
@@ -4635,14 +4631,12 @@ NABoolean ValueIdUnion::isCovered(const ValueIdSet& newExternalInputs,
for(CollIndex i = 0; i < entries(); i++)
{
localSubExpr.clear();
-#pragma nowarn(1506) // warning elimination
if (coveringGA.covers(getSource(i), newExternalInputs,
referencedInputs, &localSubExpr) )
{
coveredSubExpr += getSource(i);
break;
}
-#pragma warn(1506) // warning elimination
}
// ---------------------------------------------------------------------
@@ -4723,9 +4717,7 @@ HashValue ValueIdUnion::topHash()
// hash any local data members of the derived class
for(CollIndex i = 0; i < entries(); i++)
{
-#pragma nowarn(1506) // warning elimination
result ^= getSource(i);
-#pragma warn(1506) // warning elimination
}
result ^= result_;
@@ -4746,10 +4738,8 @@ NABoolean ValueIdUnion::duplicateMatch(const ItemExpr & other) const
// and return FALSE if they don't match
for(CollIndex i = 0; i < entries(); i++)
{
-#pragma nowarn(1506) // warning elimination
if (getSource(i) != o.getSource(i))
return FALSE;
-#pragma warn(1506) // warning elimination
}
if (result_ != o.result_ || flags_ != o.flags_)
@@ -7246,7 +7236,6 @@ ItemExpr * PivotGroup::copyTopNode(ItemExpr *derivedNode, CollHeap* outHeap)
// -----------------------------------------------------------------------
// member functions for class Function
// -----------------------------------------------------------------------
-#pragma nowarn(262) // warning elimination
Function::Function(OperatorTypeEnum otype,
NAMemory *h,
Lng32 argumentCount,
@@ -7284,16 +7273,13 @@ Function::Function(OperatorTypeEnum otype,
children_.insertAt(i, childx);
} // end for
}
-#pragma warn(262) // warning elimination
Function::Function(OperatorTypeEnum otype, const LIST(ItemExpr *) &children,
CollHeap *h)
: ItemExpr(otype),
children_(h)
{
-#pragma nowarn(1506) // warning elimination
Lng32 ne = children.entries();
-#pragma warn(1506) // warning elimination
for (Lng32 i = 0; i < ne; i++)
{
@@ -7305,9 +7291,7 @@ Function::~Function() {}
Lng32 Function::getNumChildren() const
{
-#pragma nowarn(1506) // warning elimination
Lng32 count = children_.entries();
-#pragma warn(1506) // warning elimination
// $$$$ Skip all the NULL children at the tail end.
// $$$$ Assumes children that are missing in the middle
// $$$$ should figure in the count, e.g., F(a, NULL, b, NULL, NULL)
@@ -7327,9 +7311,7 @@ ItemExpr * Function::copyTopNode(ItemExpr * derivedNode, CollHeap* outHeap)
result->allowsSQLnullArg() = allowsSQLnullArg();
// Make sure we copy the kids as well.
-#pragma nowarn(1506) // warning elimination
Lng32 ne = children_.entries();
-#pragma warn(1506) // warning elimination
for (Lng32 i = 0; i < ne; i++)
result->children_.insertAt(i, children_[i]);
@@ -9021,7 +9003,6 @@ Lng32 RangeLookup::splitKeysLen()
partFunc_->getRangePartitionBoundaries()->getEncodedBoundaryKeyLength();
}
-#pragma nowarn(770) // warning elimination
void RangeLookup::copySplitKeys(char *tgt, Lng32 tgtLen)
{
CMPASSERT(tgtLen = splitKeysLen());
@@ -9039,7 +9020,6 @@ void RangeLookup::copySplitKeys(char *tgt, Lng32 tgtLen)
offset += entryLen;
}
}
-#pragma warn(770) // warning elimination
Lng32 RangeLookup::getNumOfPartitions()
{
@@ -9137,9 +9117,7 @@ void PackFunc::deriveFormatInfoFromUnpackType(const NAType* unpackType)
// For bit precision integers, width needs to be in negative no of bits.
if(unpackType->getFSDatatype() == REC_BPINT_UNSIGNED)
{
-#pragma nowarn(1506) // warning elimination
width_ = ((SQLBPInt*)unpackType)->getDeclaredLength();
-#pragma warn(1506) // warning elimination
dataSizeInBytes = (width_*pf-1)/8+1;
width_ = -width_;
}
@@ -9955,7 +9933,6 @@ ConstValue::ConstValue()
}
// constructor for a numeric constant
-#pragma nowarn(262) // warning elimination
ConstValue::ConstValue(Lng32 intval, NAMemory * outHeap)
: ItemExpr(ITM_CONSTANT)
, isNull_(IS_NOT_NULL)
@@ -9979,7 +9956,6 @@ ConstValue::ConstValue(Lng32 intval, NAMemory * outHeap)
// copy the bit pattern as is
memcpy(value_,(void *)(&intval),(Int32)storageSize_);
}
-#pragma warn(262) // warning elimination
ConstValue::ConstValue(const NAString & strval,
enum CharInfo::CharSet charSet,
@@ -10057,9 +10033,7 @@ void ConstValue::initCharConstValue
charSet, collation, coercibility);
-#pragma nowarn(1506) // warning elimination
storageSize_ = strval.length();
-#pragma warn(1506) // warning elimination
value_ = (void *)( new (outHeap)
char[storageSize_] );
memcpy(value_, (void *)(strval.data()), (Int32)storageSize_);
@@ -10144,9 +10118,7 @@ void ConstValue::initCharConstValue(const NAWString& strval,
SQLChar(outHeap, num_of_chars, FALSE, FALSE, FALSE, FALSE,
charSet, collation, coercibility);
-#pragma nowarn(1506) // warning elimination
storageSize_ = cachedBPC * strval.length();
-#pragma warn(1506) // warning elimination
value_ = (void *)( new (outHeap)
NAWchar[storageSize_] );
memcpy(value_, (void *)(strval.data()), (Int32)storageSize_);
@@ -10518,9 +10490,7 @@ void ConstValue::changeStringConstant(const NAString* strval)
value_ = (void *)( new (CmpCommon::statementHeap()) char[storageSize_] );
str_pad((char *)value_, (Int32)storageSize_, '\0');
} else {
-#pragma nowarn(1506) // warning elimination
storageSize_ = strval -> length();
-#pragma warn(1506) // warning elimination
value_ = (void *)( new (CmpCommon::statementHeap()) char[storageSize_] );
memcpy(value_,(void *)(strval -> data()),(Int32)storageSize_);
}
@@ -12236,7 +12206,6 @@ ConstValue * Cast::castToConstValue(NABoolean & negate_it)
return child(0)->castToConstValue(negate_it);
}
-#pragma nowarn(262) // warning elimination
ItemExpr * Cast::foldConstants(ComDiagsArea * diagsArea,
NABoolean newTypeSynthesis)
{
@@ -12263,7 +12232,6 @@ ItemExpr * Cast::foldConstants(ComDiagsArea * diagsArea,
return ItemExpr::foldConstants(diagsArea,newTypeSynthesis);
}
-#pragma warn(262) // warning elimination
NABoolean Cast::isCovered
(const ValueIdSet& newExternalInputs,
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/ItemExpr.h
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/ItemExpr.h b/core/sql/optimizer/ItemExpr.h
index 992a12a..e24a1fc 100644
--- a/core/sql/optimizer/ItemExpr.h
+++ b/core/sql/optimizer/ItemExpr.h
@@ -120,7 +120,6 @@ public:
inline ItemExpr * operator ->() const; // defined below class ItemExpr
// same as a "normal" method
-// warning elimination (removed "inline")
ItemExpr * getPtr() const; // defined below class ItemExpr
// cast into an ItemExpr *
@@ -129,7 +128,6 @@ public:
// cast into a ValueId
inline operator ValueId() const { return getValueId(); }
-// warning elimination (removed "inline")
NAColumn *getNAColumn(NABoolean okIfNotColumn = FALSE) const
{ return getValueId().getNAColumn(okIfNotColumn); }
@@ -1164,7 +1162,6 @@ public:
virtual ComColumnDirection getParamMode () const;
virtual Int32 getOrdinalPosition () const;
virtual Int32 getHVorDPIndex () const;
-// warning elimination (removed "inline")
virtual void setPMOrdPosAndIndex( ComColumnDirection paramMode,
Int32 ordinalPosition,
Int32 index) { CMPASSERT (0);}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/ItemLog.h
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/ItemLog.h b/core/sql/optimizer/ItemLog.h
index 9e5240f..a6597f5 100644
--- a/core/sql/optimizer/ItemLog.h
+++ b/core/sql/optimizer/ItemLog.h
@@ -82,7 +82,6 @@ public:
}
// virtual destructor
- // warning elimination (removed "inline")
virtual ~BiLogic() {}
// we want BiLogic to be cacheable
@@ -215,7 +214,6 @@ public:
{}
// virtual destructor
-// warning elimination (removed "inline")
virtual ~UnLogic() {}
// get the degree of this node (it is a unary op).
@@ -357,7 +355,6 @@ public:
}
// virtual destructor
- // warning elimination (removed "inline")
virtual ~BiRelat() {}
// we want BiRelat to be cacheable
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/ItemNAType.h
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/ItemNAType.h b/core/sql/optimizer/ItemNAType.h
index 85eb2c4..5d64557 100644
--- a/core/sql/optimizer/ItemNAType.h
+++ b/core/sql/optimizer/ItemNAType.h
@@ -63,7 +63,6 @@ public:
}
// virtual destructor
-// warning elimination (removed "inline")
virtual ~NATypeToItem() { delete natype_pointer; }
// a virtual function for type propagating the node
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/ItemOther.h
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/ItemOther.h b/core/sql/optimizer/ItemOther.h
index 30aef79..4ebdad5 100644
--- a/core/sql/optimizer/ItemOther.h
+++ b/core/sql/optimizer/ItemOther.h
@@ -355,7 +355,6 @@ private:
// the derivation hierarchy for ValueDescs.
// -----------------------------------------------------------------------
-#pragma nowarn(1682) // warning elimination
class ValueIdRef : public ItemExpr
{
@@ -397,7 +396,6 @@ private:
ValueId derivedFrom_;
}; // class ValueIdRef
-#pragma warn(1682) // warning elimination
//! ValueIdProxy class
// -----------------------------------------------------------------------
@@ -415,7 +413,6 @@ private:
//
// -----------------------------------------------------------------------
-#pragma nowarn(1682) // warning elimination
class ValueIdProxy : public ItemExpr
{
@@ -585,7 +582,6 @@ private:
Int32 outputOrdinalNumber_;
}; // class ValueIdProxy
-#pragma warn(1682) // warning elimination
// -----------------------------------------------------------------------
// A ValueIdUnion is used whenever two or more data streams are
@@ -1054,7 +1050,6 @@ private:
// Its datatype is computed as the minimum of the values that belong
// to the VEG it references.
// -----------------------------------------------------------------------
-#pragma nowarn(1682) // warning elimination
class VEGReference : public ItemExpr
{
@@ -1411,7 +1406,4 @@ static void usePartofSelectionPredicatesFromTheItemExpressionTree(ValueIdSet& in
}
}
-#pragma warn(1682) // warning elimination
-
-
#endif /* ITEMOTHER_H */
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/ItemSubq.h
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/ItemSubq.h b/core/sql/optimizer/ItemSubq.h
index 6cadbfa..919f66c 100644
--- a/core/sql/optimizer/ItemSubq.h
+++ b/core/sql/optimizer/ItemSubq.h
@@ -60,12 +60,10 @@ class GenericUpdate;
// ***********************************************************************
// A subquery
// ***********************************************************************
-#pragma nowarn(1506) // warning elimination
class Subquery : public ItemExpr
{
public:
-// warning elimination (removed "inline")
Subquery(OperatorTypeEnum otype,
RelExpr * tableExpr, ItemExpr * scalarExpr = NULL)
: ItemExpr(otype,scalarExpr),
@@ -73,7 +71,6 @@ public:
tableExpr_(tableExpr)
{}
-// warning elimination (removed "inline")
virtual ~Subquery() {}
// get the degree of this node
@@ -207,7 +204,6 @@ public:
RelExpr * tableExpr_;
}; // class Subquery
-#pragma warn(1506) // warning elimination
// ***********************************************************************
// Row subquery
@@ -217,11 +213,9 @@ class RowSubquery : public Subquery
// ITM_ROW_SUBQUERY
public:
-// warning elimination (removed "inline")
RowSubquery(RelExpr * tableExpr)
: Subquery(ITM_ROW_SUBQUERY, tableExpr) {}
-// warning elimination (removed "inline")
virtual ~RowSubquery() {}
// a virtual function for type propagating the node
@@ -255,7 +249,6 @@ class QuantifiedComp : public Subquery
// ITM_GREATER_EQ_ALL, ITM_GREATER_EQ_ANY
public:
-// warning elimination (removed "inline")
QuantifiedComp(OperatorTypeEnum otype,
ItemExpr * scalarExpr,
RelExpr * tableExpr,
@@ -267,7 +260,6 @@ public:
setAvoidHalloweenR2(avoidHalloweenR2);
}
-// warning elimination (removed "inline")
virtual ~QuantifiedComp() {}
// a virtual function for type propagating the node
@@ -317,13 +309,11 @@ class InSubquery : public Subquery
// ITM_IN_SUBQUERY
public:
-// warning elimination (removed "inline")
InSubquery(OperatorTypeEnum otype,
ItemExpr * scalarExpr,
RelExpr * tableExpr)
: Subquery(otype, tableExpr, scalarExpr) {}
-// warning elimination (removed "inline")
virtual ~InSubquery() {}
// get a printable string that identifies the operator
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/ItmBitMuxFunction.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/ItmBitMuxFunction.cpp b/core/sql/optimizer/ItmBitMuxFunction.cpp
index 6a77ec8..05aa05f 100644
--- a/core/sql/optimizer/ItmBitMuxFunction.cpp
+++ b/core/sql/optimizer/ItmBitMuxFunction.cpp
@@ -47,7 +47,6 @@ const NAType *ItmBitMuxFunction::synthesizeType() {
// copyTopNode
//
-#pragma nowarn(770) // warning elimination
ItemExpr *ItmBitMuxFunction::copyTopNode(ItemExpr *derivedNode,
CollHeap *outHeap) {
ItemExpr *result;
@@ -61,4 +60,3 @@ ItemExpr *ItmBitMuxFunction::copyTopNode(ItemExpr *derivedNode,
return BuiltinFunction::copyTopNode(result, outHeap);
};
-#pragma warn(770) // warning elimination
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/ItmFlowControlFunction.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/ItmFlowControlFunction.cpp b/core/sql/optimizer/ItmFlowControlFunction.cpp
index fc9a974..03b2298 100644
--- a/core/sql/optimizer/ItmFlowControlFunction.cpp
+++ b/core/sql/optimizer/ItmFlowControlFunction.cpp
@@ -38,7 +38,6 @@ const NAType *ItmDoWhileFunction::synthesizeType() {
// copyTopNode
//
-#pragma nowarn(770) // warning elimination
ItemExpr *ItmDoWhileFunction::copyTopNode(ItemExpr *derivedNode,
CollHeap *outHeap) {
ItemExpr *result;
@@ -51,7 +50,6 @@ ItemExpr *ItmDoWhileFunction::copyTopNode(ItemExpr *derivedNode,
return BuiltinFunction::copyTopNode(result, outHeap);
};
-#pragma warn(770) // warning elimination
//
@@ -68,7 +66,6 @@ const NAType *ItmBlockFunction::synthesizeType() {
// copyTopNode
//
-#pragma nowarn(770) // warning elimination
ItemExpr *ItmBlockFunction::copyTopNode(ItemExpr *derivedNode,
CollHeap *outHeap) {
ItemExpr *result;
@@ -81,7 +78,6 @@ ItemExpr *ItmBlockFunction::copyTopNode(ItemExpr *derivedNode,
return BuiltinFunction::copyTopNode(result, outHeap);
};
-#pragma warn(770) // warning elimination
//
// ItmWhile
@@ -95,7 +91,6 @@ const NAType *ItmWhileFunction::synthesizeType() {
// copyTopNode
//
-#pragma nowarn(770) // warning elimination
ItemExpr *ItmWhileFunction::copyTopNode(ItemExpr *derivedNode,
CollHeap *outHeap) {
ItemExpr *result;
@@ -108,7 +103,6 @@ ItemExpr *ItmWhileFunction::copyTopNode(ItemExpr *derivedNode,
return BuiltinFunction::copyTopNode(derivedNode, outHeap);
};
-#pragma warn(770) // warning elimination
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/LargeScopeRules.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/LargeScopeRules.cpp b/core/sql/optimizer/LargeScopeRules.cpp
index 30cf4d2..74c85f5 100644
--- a/core/sql/optimizer/LargeScopeRules.cpp
+++ b/core/sql/optimizer/LargeScopeRules.cpp
@@ -412,9 +412,7 @@ RelExpr * MJEnumRule::nextSubstitute(RelExpr * before,
// Data flow optimization
CostScalar childrenFlow = mjoin->getChildrenDataFlow();
-#pragma nowarn(1506) // warning elimination
const Lng32 numChildren = jbbcs.entries();
-#pragma warn(1506) // warning elimination
Lng32 childIter = -1; // temp iterator. *NOT* the same as child index
RelExpr** potentialSubstitutes = new (CmpCommon::statementHeap()) RelExpr*[numChildren];
CostScalar* substituteMetric = new (CmpCommon::statementHeap()) CostScalar[numChildren];
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/MJVIndexBuilder.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/MJVIndexBuilder.cpp b/core/sql/optimizer/MJVIndexBuilder.cpp
index 8679b38..3fe08fc 100644
--- a/core/sql/optimizer/MJVIndexBuilder.cpp
+++ b/core/sql/optimizer/MJVIndexBuilder.cpp
@@ -233,9 +233,7 @@ ColIndSetBucketVector::insert (ColIndSet& newSet)
// get the size of new ColIndSet -
// remember - the size defines the order number of ColIndSetBucket
// the new ColIndSet will be inserted into.
-#pragma nowarn(1506) // warning elimination
Int32 newSetSize = newSet.entries();
-#pragma warn(1506) // warning elimination
if (newSetSize > (Int32)maxNonEmptyEntrySize_)
{ // if the new ColIndSet is longer than the maximal already inserted
@@ -243,9 +241,7 @@ ColIndSetBucketVector::insert (ColIndSet& newSet)
// at the last resize(), getSize() entries were allocated
// (it can be more than asked) -- so the last entry is
// getSize()-1
-#pragma nowarn(1506) // warning elimination
Int32 oldArrSize = getSize();
-#pragma warn(1506) // warning elimination
// if the size of the new ColIndSet is greater than the number of
// the last entry allocated - resize self
if (newSetSize > (oldArrSize - 1))
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/MJVIndexBuilder.h
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/MJVIndexBuilder.h b/core/sql/optimizer/MJVIndexBuilder.h
index b6dcde8..98fd5cc 100644
--- a/core/sql/optimizer/MJVIndexBuilder.h
+++ b/core/sql/optimizer/MJVIndexBuilder.h
@@ -175,9 +175,7 @@ public:
private:
// Prevent accidental use of default copy Ctor and = operator.
-#pragma nowarn(1026) // warning elimination
ColIndSetBucketVector& operator=(const ColIndSetBucketVector& other);
-#pragma warn(1026) // warning elimination
ColIndSetBucketVector();
ColIndSetBucketVector(const ColIndSetBucketVector& other);
@@ -236,9 +234,7 @@ public:
private:
// Prevent accidental use of default copy Ctor and = operator.
-#pragma nowarn(1026) // warning elimination
ColIndSetMatrix& operator=(const ColIndSetMatrix& other);
-#pragma warn(1026) // warning elimination
//
// ctors
//
@@ -323,9 +319,7 @@ public:
private:
// Prevent accidental use of default copy Ctor and = operator.
-#pragma nowarn(1026) // warning elimination
NestingStack& operator=(const NestingStack& other);
-#pragma warn(1026) // warning elimination
NestingStack();
NestingStack(const NestingStack& other);
@@ -401,9 +395,7 @@ public:
private:
// Prevent accidental use of default copy Ctor and = operator.
-#pragma nowarn(1026) // warning elimination
MJVIndCook& operator=(const MJVIndCook& other);
-#pragma warn(1026) // warning elimination
MJVIndCook();
MJVIndCook(const MJVIndCook& other);
@@ -452,9 +444,7 @@ public:
private:
// Prevent accidental use of default copy Ctor and = operator.
-#pragma nowarn(1026) // warning elimination
MJVIndexBuilder& operator=(const MJVIndexBuilder& other);
-#pragma warn(1026) // warning elimination
MJVIndexBuilder();
MJVIndexBuilder(const MJVIndexBuilder& other);
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/MVInfo.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/MVInfo.cpp b/core/sql/optimizer/MVInfo.cpp
index 515a70f..03e324b 100644
--- a/core/sql/optimizer/MVInfo.cpp
+++ b/core/sql/optimizer/MVInfo.cpp
@@ -945,9 +945,7 @@ Lng32 MVVegPredicate::findIndexFor(const QualifiedName& tableName,
const MVVegPredicateColumn *col = at(i);
if ((col->getTableName() == tableName) &&
(col->getColNumber() == colPosition))
-#pragma nowarn(1506) // warning elimination
return i;
-#pragma warn(1506) // warning elimination
}
return -1;
}
@@ -2072,8 +2070,6 @@ Int32 MVColumnInfo::newMavDependentColumn(ExpressionHash& expHash,
// STDDEVW(a,b) and VARIANCE(a,b) need SUM(b), SUM(a*b) and SUM(a*a*b).
// If a is NOT NULL, then COUNT(a) can be replaced by COUNT(*).
//////////////////////////////////////////////////////////////////////////////
-#pragma nowarn(770) // warning elimination
-#pragma nowarn(262) // warning elimination
void MVColumnInfo::createDependentColumns(ExpressionHash& expHash,
MVInfoForDDL& mvInfoObj,
CollHeap *heap)
@@ -2152,8 +2148,6 @@ void MVColumnInfo::createDependentColumns(ExpressionHash& expHash,
dep1_ = newStddevwDepColumn(2, expHash, newExprText, mvInfoObj, heap);
}
}
-#pragma warn(770) // warning elimination
-#pragma warn(262) // warning elimination
//////////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////
@@ -2613,9 +2607,7 @@ MVInfo::MVInfo( const NAString& nameOfMV,
{
switch (directColumnList[i]->getOperatorType())
{
-#pragma nowarn(1506) // warning elimination
case ITM_COUNT: posOfCountStar_ = i;
-#pragma warn(1506) // warning elimination
break;
case ITM_MIN :
case ITM_MAX : isMinMaxUsed_ = TRUE;
@@ -2735,9 +2727,7 @@ void MVInfo::fixMvSelectList(RelRoot *mvSelectTree) const
selectListIndex < selectList.entries();
selectListIndex++, mvColIndex++)
{
-#pragma nowarn(1506) // warning elimination
const MVColumnInfo *mvCol = mvColumns[mvColIndex];
-#pragma warn(1506) // warning elimination
const NAString& mvColName = mvCol->getColName();
ItemExpr *colExpr = selectList[selectListIndex];
@@ -2793,9 +2783,7 @@ RelRoot *MVInfo::buildMVSelectTree(const NAString* alternativeText, CharInfo::Ch
// Parse the SQL text.
Parser parser(CmpCommon::context());
-#pragma nowarn(1506) // warning elimination
if (parser.parseDML(MVSelectText.data(), MVSelectText.length(), textCharSet, &parsedNode))
-#pragma warn(1506) // warning elimination
return NULL;
// Skip the DDL nodes of the CREATE MV command.
@@ -3154,9 +3142,7 @@ NAString MVInfo::getOptionalNameClause(StmtDDLCreateMV *createMvNode,
const MVColumns& mvCols = getMVColumns();
for (CollIndex ci(0); ci < mvCols.entries() ; ci++)
{
-#pragma nowarn(1506) // warning elimination
const MVColumnInfo *mvCol = mvCols[ci];
-#pragma warn(1506) // warning elimination
if (!mvCol->isSystem())
{ // skip columns that are not system added.
continue;
@@ -3204,9 +3190,7 @@ NAString MVInfo::getSelectPhraseAsString(NAString& sysAddedCols) const
selectListIndex++, mvColIndex++)
{
CMPASSERT(mvColIndex < mvCols.entries());
-#pragma nowarn(1506) // warning elimination
const MVColumnInfo *mvCol = mvCols[mvColIndex];
-#pragma warn(1506) // warning elimination
const NAString& mvColName = mvCol->getColName();
ItemExpr *colExpr = selectList[selectListIndex];
NAString origColName("", heap_);
@@ -3495,9 +3479,7 @@ MVInfo::buildColumnInfoListFromColIndList(const ColIndList ¤tRCI) const
{
currentColNumber = currentRCI.at(i);
MVColumnInfo *currentColInfo =
-#pragma nowarn(1506) // warning elimination
getMVColumns().getMvColInfoByIndex(currentColNumber);
-#pragma warn(1506) // warning elimination
currentColumnInfoList->insert(currentColInfo);
}
return currentColumnInfoList;
@@ -3600,9 +3582,7 @@ void MVInfoForDDL::setRootNode(RelRoot *rootNode, BindWA *bindWA)
// Get the unbound column text.
ItemExprList selectList(selectItemList, getHeap());
for (CollIndex colNumber=0; colNumber<selectList.entries(); colNumber++)
-#pragma nowarn(1506) // warning elimination
extractParsedColumnText(colNumber, selectList[colNumber]);
-#pragma warn(1506) // warning elimination
}
//////////////////////////////////////////////////////////////////////////////
@@ -3716,9 +3696,7 @@ void MVInfoForDDL::initUsedObjectsList(BindWA *bindWA)
}
// Construct the join graph.
-#pragma nowarn(1506) // warning elimination
newJoinGraph(scanNodesNumber);
-#pragma warn(1506) // warning elimination
// For each Scan node on the tree
for (CollIndex scanNodeIndex=0;
@@ -3747,9 +3725,7 @@ void MVInfoForDDL::initUsedObjectsList(BindWA *bindWA)
getUsedObjectsList().insert(usedInfo);
// And into the join graph.
-#pragma nowarn(1506) // warning elimination
getJoinGraph()->addTable(scanNodeIndex, scanNodeIndex, naTable);
-#pragma warn(1506) // warning elimination
}
// Now make sure Views' usage is marked correctly, the default is
@@ -3990,14 +3966,10 @@ void MVInfoForDDL::addMavSystemColumns(BindWA *bindWA)
// Add the user columns to the expression hash.
for (CollIndex i=0; i<columnList.entries(); i++)
{
-#pragma nowarn(1506) // warning elimination
MVColumnInfo *colInfo = columnList[i];
-#pragma warn(1506) // warning elimination
// Remember the position of the COUNT(*) column.
if (colInfo->isCountStarColumn())
-#pragma nowarn(1506) // warning elimination
setPosOfCountStar(i);
-#pragma warn(1506) // warning elimination
else
{
// Remember if we are using any Min/Max functions.
@@ -4032,9 +4004,7 @@ void MVInfoForDDL::addMavSystemColumns(BindWA *bindWA)
// Identify them by ValueId from the column expression.
for (CollIndex j=0; j<columnList.entries(); j++)
{
-#pragma nowarn(1506) // warning elimination
MVColumnInfo *colInfo = columnList[j];
-#pragma warn(1506) // warning elimination
if (colInfo->getColType() == COM_MVCOL_GROUPBY)
groupingCols.remove(colInfo->getColExpr()->getValueId());
}
@@ -4059,9 +4029,7 @@ void MVInfoForDDL::addMavSystemColumns(BindWA *bindWA)
// so createDependentColumns() is called for these new columns as well.
for (CollIndex k=0; k<columnList.entries(); k++)
{
-#pragma nowarn(1506) // warning elimination
MVColumnInfo *colInfo = columnList[k];
-#pragma warn(1506) // warning elimination
colInfo->createDependentColumns(expHash, *this, getHeap());
}
}
@@ -4224,9 +4192,7 @@ void MVInfoForDDL::addBaseColsUsedByComputedMvColumns()
MVColumns& columnList = getMVColumns();
for (CollIndex mvCol=0; mvCol<columnList.entries(); mvCol++)
{
-#pragma nowarn(1506) // warning elimination
MVColumnInfo *colInfo = columnList[mvCol];
-#pragma warn(1506) // warning elimination
// Insert only base columns (not complex)
if (colInfo->getColType() != COM_MVCOL_FUNCTION)
@@ -4400,9 +4366,7 @@ void MVInfoForDDL::processBoundInformation(BindWA *bindWA)
// build the MV column list is taken from.
colDescList_ = rootNode_->getRETDesc()->getColumnList();
CMPASSERT(colDescList_ != NULL);
-#pragma nowarn(1506) // warning elimination
userColumnCount_ = colDescList_->entries();
-#pragma warn(1506) // warning elimination
// Only one GroupBy node allowed on the direct tree.
if (groupByNodes_.entries()>1)
@@ -4621,9 +4585,7 @@ void MVInfoForDDL::verifyGroupByColumns(GroupByAgg *groupByNode)
for (CollIndex i=0; i<columnList.entries(); i++)
{
// Check only column of type GROUPBY
-#pragma nowarn(1506) // warning elimination
MVColumnInfo *colInfo = columnList[i];
-#pragma warn(1506) // warning elimination
if (colInfo->getColType() != COM_MVCOL_GROUPBY)
continue;
@@ -4802,9 +4764,7 @@ void MVInfoForDML::getMavGroupByColumns(LIST(Lng32)& gbColList) const
for (CollIndex i=0; i<columnList.entries(); i++)
{
-#pragma nowarn(1506) // warning elimination
MVColumnInfo *currentCol = columnList[i];
-#pragma warn(1506) // warning elimination
if (currentCol->getColType() == COM_MVCOL_GROUPBY)
gbColList.insert(currentCol->getColNumber());
}
@@ -4853,9 +4813,7 @@ MVJoinGraph *MVInfoForDML::initJoinGraph(BindWA *bindWA,
CMPASSERT(naTable != NULL);
MVJoinTable *newNode = new(getHeap())
-#pragma nowarn(1506) // warning elimination
MVJoinTable(nodeNumber, usedObjectsIndex, directTables, naTable, getHeap());
-#pragma warn(1506) // warning elimination
DeltaDefinition *deltaDef =
deltaDefList->findEntryFor(usedInfo->getObjectName());
@@ -5092,9 +5050,7 @@ void MVUsedObjectColNameMap::initColNameMap(const NATable *naTable, CollHeap *he
const NAColumn *naCol = naColumns[i];
// Initialize the current position of the array with i.
-#pragma nowarn(1506) // warning elimination
*colPositionPtr = i;
-#pragma warn(1506) // warning elimination
// Insert the entry into the hash table.
colNameHash_.insert(&naCol->getColName(), colPositionPtr);
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/MVInfo.h
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/MVInfo.h b/core/sql/optimizer/MVInfo.h
index bee133d..53278cf 100644
--- a/core/sql/optimizer/MVInfo.h
+++ b/core/sql/optimizer/MVInfo.h
@@ -167,9 +167,7 @@ public:
private:
// Copy Ctor and = operator are not implemented.
ViewColumnConnection(const ViewColumnConnection& other);
-#pragma nowarn(1026) // warning elimination
ViewColumnConnection& operator=(const ViewColumnConnection& other);
-#pragma warn(1026) // warning elimination
ColRefName baseColName_; // The name of the column in the base table.
const ColRefName viewColName_; // The name of the column in the view.
@@ -223,9 +221,7 @@ public:
private:
// Copy Ctor and = operator are not implemented.
ViewTableConnection(const ViewTableConnection& other);
-#pragma nowarn(1026) // warning elimination
ViewTableConnection& operator=(const ViewTableConnection& other);
-#pragma warn(1026) // warning elimination
typedef NAHashDictionary<const NAString, const ViewColumnConnection> columnConnection;
@@ -277,9 +273,7 @@ public:
private:
// Copy Ctor and = operator are not implemented.
ViewColumnGraph(const ViewColumnGraph& other);
-#pragma nowarn(1026) // warning elimination
ViewColumnGraph& operator=(const ViewColumnGraph& other);
-#pragma warn(1026) // warning elimination
void addConnection(ViewColumnConnection *colConnection, CollHeap *heap);
const ViewColumnConnection *findColumn(const ValueId vid) const;
@@ -367,9 +361,7 @@ public:
private:
// Prevent accidental use of default copy Ctor and = operator.
-#pragma nowarn(1026) // warning elimination
MVVegPredicateColumn& operator=(const MVVegPredicateColumn& other);
-#pragma warn(1026) // warning elimination
MVVegPredicateColumn(const MVVegPredicateColumn& other);
const QualifiedName tableName_;
@@ -447,9 +439,7 @@ public:
private:
// Prevent accidental use of default copy Ctor and = operator.
-#pragma nowarn(1026) // warning elimination
MVVegPredicate& operator=(const MVVegPredicate& other);
-#pragma warn(1026) // warning elimination
MVVegPredicate(const MVVegPredicate& other);
// Is this predicate from a left join?
@@ -535,9 +525,7 @@ public:
private:
// Prevent accidental use of default = operator.
-#pragma nowarn(1026) // warning elimination
MVUsedObjectCatmanFlags& operator=(const MVUsedObjectCatmanFlags& other);
-#pragma warn(1026) // warning elimination
ComMVSUsedTableAttribute objectAttributes_; // Ignore changes/Insert only.
ComMVSUsageType usageType_; // Direct/Expanded/User specified.
@@ -701,9 +689,7 @@ public:
private:
// Prevent accidental use of default copy Ctor and = operator.
-#pragma nowarn(1026) // warning elimination
MVUsedObjectInfo& operator=(const MVUsedObjectInfo& other);
-#pragma warn(1026) // warning elimination
MVUsedObjectInfo(const MVUsedObjectInfo& other);
const QualifiedName objectName_;
@@ -856,9 +842,7 @@ public:
private:
// Prevent accidental use of default copy Ctor and = operator.
-#pragma nowarn(1026) // warning elimination
MVColumnInfo& operator=(const MVColumnInfo& other);
-#pragma warn(1026) // warning elimination
MVColumnInfo(const MVColumnInfo& other);
ItemExpr *findMavColumnType(ItemExpr *expr, MVInfoForDDL& mvInfoObj);
@@ -959,9 +943,7 @@ public:
private:
// Prevent accidental use of default copy Ctor and = operator.
-#pragma nowarn(1026) // warning elimination
MVColumns& operator=(const MVColumns& other);
-#pragma warn(1026) // warning elimination
MVColumns(const MVColumns& other);
typedef NAHashDictionary<const NAString, MVColumnInfo> ColumnInfoHash;
@@ -1116,9 +1098,7 @@ protected:
private:
// Prevent accidental use of default copy Ctor and = operator.
-#pragma nowarn(1026) // warning elimination
MVInfo& operator=(const MVInfo& other);
-#pragma warn(1026) // warning elimination
MVInfo(); // do not use
MVInfo(const MVInfo& other);
@@ -1234,9 +1214,7 @@ public:
private:
// Prevent accidental use of default copy Ctor and = operator.
-#pragma nowarn(1026) // warning elimination
MVInfoForDDL& operator=(const MVInfoForDDL& other);
-#pragma warn(1026) // warning elimination
MVInfoForDDL(const MVInfoForDDL& other);
// Called by processBoundInformation() and processNormalizedInformation().
@@ -1357,9 +1335,7 @@ public:
private:
// Prevent accidental use of default copy Ctor and = operator.
MVInfoForDML(const MVInfoForDML& other);
-#pragma nowarn(1026) // warning elimination
MVInfoForDML& operator=(const MVInfoForDML& other);
-#pragma warn(1026) // warning elimination
TableNameHash usedObjectsHash_;
CharInfo::CharSet mvSelectTextCharSet_;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/MVJoinGraph.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/MVJoinGraph.cpp b/core/sql/optimizer/MVJoinGraph.cpp
index 4bc0d2f..5efc4b6 100644
--- a/core/sql/optimizer/MVJoinGraph.cpp
+++ b/core/sql/optimizer/MVJoinGraph.cpp
@@ -220,9 +220,7 @@ static void BitmapToString(const NABitVector& bm, NAString& text)
CollIndex lastBit;
bm.lastUsed(lastBit);
-#pragma nowarn(1506) // warning elimination
for (Int32 i=lastBit; i>=0; i--)
-#pragma warn(1506) // warning elimination
{
if (bm.testBit(i))
text += "1 ";
@@ -248,9 +246,7 @@ void MVJoinTable::print(FILE* ofd, const char* indent, const char* title)const
CollIndex lastBit;
predicateBitmap_.lastUsed(lastBit);
-#pragma nowarn(1506) // warning elimination
for (Int32 i=lastBit; i>=0 ; i--)
-#pragma warn(1506) // warning elimination
{
snprintf( buffer, 20, "%d", i );
titleString += buffer;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/MVJoinGraph.h
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/MVJoinGraph.h b/core/sql/optimizer/MVJoinGraph.h
index 4035426..3aedd38 100644
--- a/core/sql/optimizer/MVJoinGraph.h
+++ b/core/sql/optimizer/MVJoinGraph.h
@@ -151,7 +151,6 @@ private:
//////////////////////////////////////////////////////////////////////////////
// This class describes an ordered traverse of the join tree, where each
// table is connected to at lease one of its predecessors.
-#pragma nowarn(1506) // warning elimination
class MVJoinGraphSolution : public NABasicObject
{
public:
@@ -190,7 +189,6 @@ private:
NABitVector bitmap_; // Bitmap of route tables.
MVTableSet riTables_; // Set of tables for which RI opt. can be used.
}; // MVJoinGraphSolution
-#pragma warn(1506) // warning elimination
//////////////////////////////////////////////////////////////////////////////
// Holds the state of the graph during the traverse.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/MavRelRootBuilder.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/MavRelRootBuilder.cpp b/core/sql/optimizer/MavRelRootBuilder.cpp
index 52e7bb8..66a980e 100644
--- a/core/sql/optimizer/MavRelRootBuilder.cpp
+++ b/core/sql/optimizer/MavRelRootBuilder.cpp
@@ -91,9 +91,7 @@ void MavRelRootBuilder::init()
// Divide the MAV columns to groups:
for (CollIndex i=0; i<mavCols_.entries(); i++)
{
-#pragma nowarn(1506) // warning elimination
MVColumnInfo *currentCol = mavCols_[i];
-#pragma warn(1506) // warning elimination
if (currentCol->getColType() != COM_MVCOL_AGGREGATE)
{
@@ -965,7 +963,6 @@ ItemExpr *MavRelRootBuilder::buildExtraMinMaxExpr(const ItemExpr *pMinMaxExpr,
// than op2 (called delVsInsertRelation) is the same as op1. Otherwise it
// does not cover the = case (which means it is < instead of <=, and > instead
// of >=).
-#pragma nowarn(262) // warning elimination
ItemExpr *MavRelRootBuilder::buildMinMaxRecomputeOnUpdateCondition(const NAString& mavColName,
ColReference *deltaInsCol,
ColReference *deltaDelCol,
@@ -1021,7 +1018,6 @@ ItemExpr *MavRelRootBuilder::buildMinMaxRecomputeOnUpdateCondition(const NAStrin
return finalCondition;
} // MavRelRootBuilder::buildMinMaxRecomputeOnUpdateCondition()
-#pragma warn(262) // warning elimination
//----------------------------------------------------------------------------
// Build the conditional expression for deciding if the min/max value of a
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/MultiJoin.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/MultiJoin.cpp b/core/sql/optimizer/MultiJoin.cpp
index 7eae8f3..ac271a0 100644
--- a/core/sql/optimizer/MultiJoin.cpp
+++ b/core/sql/optimizer/MultiJoin.cpp
@@ -68,9 +68,7 @@ MultiJoin::MultiJoin(const JBBSubset & jbbSubset,
}
lsrC_ = new (oHeap) LSRConfidence(oHeap);
-#pragma warning (disable : 4018) //warning elimination
CMPASSERT (getArity() == jbbcs.entries());
-#pragma warning (default : 4018) //warning elimination
}
NABoolean MultiJoin::isSymmetricMultiJoin() const
@@ -473,9 +471,7 @@ RelExpr* MultiJoin::getJBBCRelExpr(CANodeId jbbc) const
result = exprGroupId.getPtr();
else
{
-#pragma nowarn(1506) // warning elimination
result = new (outHeap) CutOp(exprGroupId.getGroupId(), outHeap);
-#pragma warn(1506) // warning elimination
((CutOp*)result)->setGroupIdAndAttr(exprGroupId.getGroupId());
// may be we should re-use existing cut-op rather than creating
// new one.
@@ -786,9 +782,7 @@ const ExprGroupId &
JBBCExprGroupMap::getExprGroupIdOfJBBC(CANodeId jbbc) const
{
-#pragma nowarn(1506) // warning elimination
Int32 entries = array_.entries();
-#pragma warn(1506) // warning elimination
for (Int32 i = 0; i < entries; i++)
{
CMPASSERT(array_.used(i));
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/MultiJoin.h
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/MultiJoin.h b/core/sql/optimizer/MultiJoin.h
index 1e539b2..8449a81 100644
--- a/core/sql/optimizer/MultiJoin.h
+++ b/core/sql/optimizer/MultiJoin.h
@@ -93,7 +93,6 @@ private:
// JBBCExprGroupMap :
// -----------------------------------------------------------------------
-#pragma nowarn(1506) // warning elimination
class JBBCExprGroupMap
{
public:
@@ -145,7 +144,6 @@ private:
CollHeap* heap_;
};
-#pragma warn(1506) // warning elimination
// -----------------------------------------------------------------------
// member functions for class LSRConfidence
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/MvLog.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/MvLog.cpp b/core/sql/optimizer/MvLog.cpp
index bc99cad..cdaa98d 100644
--- a/core/sql/optimizer/MvLog.cpp
+++ b/core/sql/optimizer/MvLog.cpp
@@ -49,9 +49,7 @@
// MVLOG command is not supported
-#pragma nowarn(1000) // warning elimination
const MvLogInternalNames MvLog::internalNames_;
-#pragma warn(1000) // warning elimination
const char MvLogInternalNames::beginRangeSuffix_[] = "_BEGIN";
const char MvLogInternalNames::endRangeSuffix_[] = "_FIRST";
@@ -304,7 +302,6 @@ NABoolean MvLog::isTableRangePartitioned() const
// 1. The columns from the MVLOG command line.
// 2. The base table clustering index columns.
// 3. The base table columns that are not in the clustering index.
-#pragma nowarn(262) // warning elimination
void MvLog::buildBaseTableColumnNamesLists()
{
CMPASSERT(NULL != pNaTable_);
@@ -364,7 +361,6 @@ void MvLog::buildBaseTableColumnNamesLists()
}
}
} // MvLog::buildBaseTableColumnNamesLists
-#pragma warn(262) // warning elimination
//----------------------------------------------------------------------------
// Verify that the list of columns from the MVLOG command line are a prefix
@@ -516,9 +512,7 @@ void MvLog::getColumnsPositionsInCI(const NAFileSet * pCiFileSet)
if(ciColName == colRefName)
{
-#pragma nowarn(1506) // warning elimination
pRelevantCiPositionsList_.insert(inputColIndex);
-#pragma warn(1506) // warning elimination
}
else // not a CI prefix
{
@@ -566,9 +560,7 @@ void MvLog::addRangePartitionBoundries(
boundryIndex++)
{
const ItemExprList* pBoundry =
-#pragma nowarn(1506) // warning elimination
pBoundries->getBoundaryValues(boundryIndex);
-#pragma warn(1506) // warning elimination
CMPASSERT(NULL != pBoundry);
ItemExprList *pBoundryCopy = new(heap_)ItemExprList(heap_);
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/MvLog.h
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/MvLog.h b/core/sql/optimizer/MvLog.h
index ed9314c..6d8a969 100644
--- a/core/sql/optimizer/MvLog.h
+++ b/core/sql/optimizer/MvLog.h
@@ -166,9 +166,7 @@ private:
private:
// Copy Ctor and = operator are not implemented.
MvLog(const MvLog& other);
-#pragma nowarn(1026) // warning elimination
MvLog& operator=(const MvLog& other);
-#pragma warn(1026) // warning elimination
const QualifiedName *tableName_;
const ItemExpr *pColumnNamesItem_;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/MvMultiTxnMavBuilder.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/MvMultiTxnMavBuilder.cpp b/core/sql/optimizer/MvMultiTxnMavBuilder.cpp
index 0ae276f..cdd7a52 100644
--- a/core/sql/optimizer/MvMultiTxnMavBuilder.cpp
+++ b/core/sql/optimizer/MvMultiTxnMavBuilder.cpp
@@ -369,7 +369,6 @@ ItemExpr *MvMultiTxnMavBuilder::buildSelectionPredicateForScanOnIudLog() const
} // MvMultiTxnMavBuilder::buildSelectionPredicateForScanOnIudLog()
//----------------------------------------------------------------------------
-#pragma nowarn(262) // warning elimination
ItemExpr *MvMultiTxnMavBuilder::addContextPredicatesOnIUDLog() const
{
@@ -443,7 +442,6 @@ ItemExpr *MvMultiTxnMavBuilder::addContextPredicatesOnIUDLog() const
return CatchupPredicate;
} // MvMultiTxnMavBuilder::addContextPredicatesOnIUDLog()
-#pragma warn(262) // warning elimination
//----------------------------------------------------------------------------
// This method is called by Scan::bindNode(), when getting to the Scan on
[11/12] incubator-trafodion git commit: TRAFODION-2731 CodeCleanup:
Phase 4. Remove legacy/obsolete pragmas
Posted by an...@apache.org.
TRAFODION-2731 CodeCleanup: Phase 4. Remove legacy/obsolete pragmas
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/781d97e6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/781d97e6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/781d97e6
Branch: refs/heads/master
Commit: 781d97e6ce89495e457a70e41dd1caa9b3b10599
Parents: bd2932b
Author: Anoop Sharma <an...@esgyn.com>
Authored: Sun Oct 1 18:25:57 2017 +0000
Committer: Anoop Sharma <an...@esgyn.com>
Committed: Sun Oct 1 18:25:57 2017 +0000
----------------------------------------------------------------------
core/sql/arkcmp/ApplicationFile.cpp | 2 -
core/sql/arkcmp/CmpContext.cpp | 8 --
core/sql/arkcmp/CmpContext.h | 2 -
core/sql/arkcmp/CmpISPUtils.cpp | 2 -
core/sql/arkcmp/CmpStatement.cpp | 12 --
core/sql/arkcmp/CmpStoredProc.cpp | 4 -
core/sql/arkcmp/CmpStoredProc.h | 2 -
core/sql/arkcmp/ExtQualModuleNames.cpp | 1 -
core/sql/arkcmp/ExtQualModuleNames.h | 4 -
core/sql/arkcmp/ProcessEnv.cpp | 4 -
core/sql/arkcmp/SPUtil.cpp | 8 --
core/sql/arkcmp/SQLJFile.cpp | 2 -
core/sql/arkcmp/VersioningStoredProc.cpp | 2 -
core/sql/arkcmp/cmpargs.cpp | 2 -
core/sql/bin/ex_esp_main.cpp | 2 -
core/sql/cli/Cli.cpp | 10 --
core/sql/cli/CliExpExchange.cpp | 27 ----
core/sql/cli/CliExtern.cpp | 2 -
core/sql/cli/Context.cpp | 6 -
core/sql/cli/Context.h | 4 -
core/sql/cli/Descriptor.cpp | 24 ----
core/sql/cli/Descriptor.h | 2 -
core/sql/cli/Globals.cpp | 2 -
core/sql/cli/Globals.h | 2 -
core/sql/cli/QuasiFileManager.cpp | 10 --
core/sql/cli/Statement.cpp | 9 --
core/sql/cli/StoredProcInterface.cpp | 2 -
core/sql/cli/sql_id.cpp | 4 -
core/sql/comexe/CmpMessage.cpp | 32 -----
core/sql/comexe/CmpMessage.h | 6 -
core/sql/comexe/ComKeyMDAM.h | 2 -
core/sql/comexe/ComKeyRange.cpp | 6 -
core/sql/comexe/ComResourceInfo.cpp | 4 -
core/sql/comexe/ComTdb.cpp | 128 -----------------
core/sql/comexe/ComTdb.h | 2 -
core/sql/comexe/ComTdbControl.cpp | 2 -
core/sql/comexe/ComTdbDDL.h | 3 -
core/sql/comexe/ComTdbDp2Oper.h | 8 --
core/sql/comexe/ComTdbExeUtil.h | 1 -
core/sql/comexe/ComTdbExplain.h | 12 --
core/sql/comexe/ComTdbRoot.h | 2 -
core/sql/comexe/ComTdbSendTop.cpp | 4 -
core/sql/comexe/ComTdbSort.cpp | 4 -
core/sql/comexe/ComTdbStats.cpp | 6 -
core/sql/comexe/ComTdbTupleFlow.cpp | 38 +++--
core/sql/comexe/LateBindInfo.cpp | 12 --
core/sql/comexe/PartInputDataDesc.cpp | 12 --
core/sql/comexe/SqlTableOpenInfo.h | 2 -
core/sql/common/BigNumHelper.cpp | 14 --
core/sql/common/CharType.cpp | 23 ---
core/sql/common/Collections.cpp | 6 +-
core/sql/common/Collections.h | 7 -
core/sql/common/ComDistribution.h | 2 -
core/sql/common/ComObjectName.cpp | 4 -
core/sql/common/ComResWords.cpp | 6 -
core/sql/common/ComResWords.h | 2 -
core/sql/common/ComRtUtils.cpp | 16 ---
core/sql/common/ComSchemaName.cpp | 2 -
core/sql/common/ComSmallDefs.cpp | 2 -
core/sql/common/ComTransInfo.h | 2 -
core/sql/common/DTICommonType.h | 2 -
core/sql/common/DateTimeType.cpp | 32 -----
core/sql/common/DatetimeType.h | 8 --
core/sql/common/IntervalType.cpp | 6 -
core/sql/common/IntervalType.h | 4 -
core/sql/common/Ipc.cpp | 4 -
core/sql/common/Ipc.h | 2 -
core/sql/common/IpcGuardian.cpp | 37 -----
core/sql/common/IpcSockets.cpp | 2 -
core/sql/common/NAAssert.cpp | 2 -
core/sql/common/NAError.cpp | 2 -
core/sql/common/NAMemory.cpp | 10 --
core/sql/common/NAString.cpp | 4 -
core/sql/common/NAString2.cpp | 4 -
core/sql/common/NAStringDefGlobals.h | 1 -
core/sql/common/NATestpoint.cpp | 2 -
core/sql/common/NAType.cpp | 10 --
core/sql/common/NAWinNT.h | 4 -
core/sql/common/NumericType.cpp | 14 --
core/sql/common/NumericType.h | 3 -
core/sql/common/QueryText.h | 4 -
core/sql/common/SequenceGeneratorAttributes.h | 2 -
core/sql/common/charinfo.cpp | 4 -
core/sql/common/conversionHex.cpp | 18 ---
core/sql/common/conversionSJIS.cpp | 2 -
core/sql/common/csconvert.cpp | 2 -
core/sql/common/dfs2rec.h | 4 -
core/sql/common/ipcmsg.cpp | 42 ------
core/sql/common/nawstring.cpp | 2 -
core/sql/common/str.cpp | 28 ----
core/sql/common/swscanf.cpp | 28 ----
core/sql/common/swsprintf.cpp | 32 -----
core/sql/common/unicode_char_set.cpp | 8 --
core/sql/common/wstr.cpp | 10 --
core/sql/executor/ExBitMapTable.cpp | 4 -
core/sql/executor/ExBitMapTable.h | 3 -
core/sql/executor/ExCancel.cpp | 10 --
core/sql/executor/ExComTdb.cpp | 144 -------------------
core/sql/executor/ExExeUtilCommon.cpp | 2 -
core/sql/executor/ExExeUtilExplain.cpp | 1 -
core/sql/executor/ExExplain.cpp | 8 --
core/sql/executor/ExFirstN.cpp | 4 -
core/sql/executor/ExPack.h | 4 -
core/sql/executor/ExPackedRows.cpp | 2 -
core/sql/executor/ExPackedRows.h | 4 -
core/sql/executor/ExRsInfo.h | 3 -
core/sql/executor/ExScheduler.cpp | 2 -
core/sql/executor/ExSequence.cpp | 2 -
core/sql/executor/ExSimpleSample.h | 3 -
core/sql/executor/ExStats.h | 18 ---
core/sql/executor/ExTranspose.cpp | 2 -
core/sql/executor/ExTranspose.h | 4 -
core/sql/executor/ExUdr.cpp | 2 -
core/sql/executor/ExUdrClientIpc.cpp | 6 -
core/sql/executor/ExUdrServer.cpp | 2 -
core/sql/executor/ExVPJoin.cpp | 4 -
core/sql/executor/MdamPoint.cpp | 4 -
core/sql/executor/MdamPoint.h | 5 -
core/sql/executor/TriggerEnable.h | 2 -
core/sql/executor/ex_ddl.cpp | 10 --
core/sql/executor/ex_esp_frag_dir.cpp | 6 -
core/sql/executor/ex_esp_msg.cpp | 14 --
core/sql/executor/ex_ex.cpp | 8 --
core/sql/executor/ex_god.h | 3 -
core/sql/executor/ex_io_control.h | 10 --
core/sql/executor/ex_mdam.cpp | 14 --
core/sql/executor/ex_mj.cpp | 2 -
core/sql/executor/ex_onlj.cpp | 2 -
core/sql/executor/ex_queue.cpp | 12 --
core/sql/executor/ex_queue.h | 8 --
core/sql/executor/ex_root.cpp | 18 ---
core/sql/executor/ex_root.h | 9 --
core/sql/executor/ex_sort.cpp | 6 -
core/sql/executor/ex_split_top.cpp | 32 -----
core/sql/executor/ex_stored_proc.cpp | 16 ---
core/sql/executor/ex_tcb.h | 3 -
core/sql/executor/ex_tcb_private.h | 2 -
core/sql/executor/ex_timeout.cpp | 6 -
core/sql/executor/ex_transaction.cpp | 15 --
core/sql/executor/ex_transaction.h | 1 -
core/sql/executor/ex_tuple.cpp | 8 --
core/sql/executor/ex_tuple_flow.cpp | 4 -
core/sql/executor/ex_union.cpp | 14 --
core/sql/executor/key_range.cpp | 4 -
core/sql/executor/key_single_subset.cpp | 6 -
core/sql/executor/sql_buffer.cpp | 61 --------
core/sql/executor/sql_buffer.h | 6 -
core/sql/executor/timeout_data.cpp | 10 --
core/sql/exp/ExpAtp.cpp | 8 --
core/sql/exp/ExpAtp.h | 4 -
core/sql/exp/ExpBitMuxFunction.cpp | 10 --
core/sql/exp/ExpBitMuxFunction.h | 2 -
core/sql/exp/ExpConvMxcs.cpp | 2 -
core/sql/exp/ExpCriDesc.h | 2 -
core/sql/exp/ExpPCode.h | 2 -
core/sql/exp/ExpPCodeClauseGen.cpp | 38 -----
core/sql/exp/ExpPCodeExpGen.cpp | 4 -
core/sql/exp/ExpSequenceFunction.cpp | 2 -
core/sql/exp/ExpSqlTupp.h | 4 -
core/sql/exp/exp_aggregate.cpp | 2 -
core/sql/exp/exp_arith.cpp | 16 ---
core/sql/exp/exp_attrs.cpp | 16 ---
core/sql/exp/exp_attrs.h | 6 -
core/sql/exp/exp_bignum.cpp | 42 ------
core/sql/exp/exp_bignum.h | 2 -
core/sql/exp/exp_clause.cpp | 10 --
core/sql/exp/exp_clause.h | 4 -
core/sql/exp/exp_clause_derived.h | 2 -
core/sql/exp/exp_comp.cpp | 4 -
core/sql/exp/exp_conv.cpp | 94 ------------
core/sql/exp/exp_datetime.cpp | 14 --
core/sql/exp/exp_datetime.h | 2 -
core/sql/exp/exp_dp2_expr.cpp | 2 -
core/sql/exp/exp_dp2_expr.h | 2 -
core/sql/exp/exp_expr.cpp | 8 --
core/sql/exp/exp_expr.h | 4 -
core/sql/exp/exp_function.cpp | 93 ------------
core/sql/exp/exp_function.h | 2 -
core/sql/exp/exp_function_lower_unicode.cpp | 2 -
core/sql/exp/exp_function_substring_unicode.cpp | 2 -
core/sql/exp/exp_function_trim_unicode.cpp | 4 -
core/sql/exp/exp_function_upper_unicode.cpp | 2 -
core/sql/exp/exp_interval.cpp | 2 -
core/sql/exp/exp_like.cpp | 8 --
core/sql/exp/exp_math_func.cpp | 4 -
core/sql/exp/exp_math_func.h | 2 -
core/sql/exp/exp_tuple_desc.cpp | 8 --
core/sql/exp/exp_tuple_desc.h | 2 -
core/sql/export/ComDiags.cpp | 18 ---
core/sql/export/ComDiags.h | 2 -
core/sql/export/HeapLog.cpp | 6 -
core/sql/export/IpcMessageObj.cpp | 14 --
core/sql/export/NAAbort.cpp | 2 -
core/sql/export/NABasicObject.cpp | 4 -
core/sql/export/NAStringDef.cpp | 26 ----
core/sql/export/NAVersionedObject.cpp | 2 -
core/sql/export/NAVersionedObject.h | 2 -
core/sql/generator/GenExpGenerator.cpp | 58 --------
core/sql/generator/GenFastTransport.cpp | 2 -
core/sql/generator/GenItemExpr.cpp | 6 -
core/sql/generator/GenItemFunc.cpp | 22 ---
core/sql/generator/GenKey.cpp | 12 --
core/sql/generator/GenMapTable.cpp | 12 --
core/sql/generator/GenMdamPred.cpp | 16 ---
core/sql/generator/GenPartFunc.cpp | 2 -
core/sql/generator/GenPreCode.cpp | 34 -----
core/sql/generator/GenRel3GL.cpp | 2 -
core/sql/generator/GenRelDCL.cpp | 4 -
core/sql/generator/GenRelEnforcer.cpp | 16 ---
core/sql/generator/GenRelExeUtil.cpp | 92 ------------
core/sql/generator/GenRelGrby.cpp | 8 --
core/sql/generator/GenRelJoin.cpp | 8 --
core/sql/generator/GenRelMisc.cpp | 82 -----------
core/sql/generator/GenRelPackedRows.cpp | 10 --
core/sql/generator/GenRelScan.cpp | 8 --
core/sql/generator/GenRelSequence.cpp | 10 --
core/sql/generator/GenRelSet.cpp | 6 -
core/sql/generator/GenResources.cpp | 2 -
core/sql/generator/GenStoredProc.cpp | 2 -
core/sql/generator/GenUdr.cpp | 2 -
core/sql/generator/Generator.h | 2 -
core/sql/langman/LmContManager.cpp | 2 -
core/sql/langman/LmGenUtil.cpp | 2 -
core/sql/langman/LmJavaOptions.h | 2 -
core/sql/langman/LmRoutine.h | 3 -
core/sql/optimizer/AccessSets.cpp | 4 -
core/sql/optimizer/BindItemExpr.cpp | 20 ---
core/sql/optimizer/BindRelExpr.cpp | 34 -----
core/sql/optimizer/BindWA.cpp | 2 -
core/sql/optimizer/CascadesBasic.h | 1 -
core/sql/optimizer/ChangesTable.cpp | 14 --
core/sql/optimizer/ClusteredBitmap.cpp | 10 --
core/sql/optimizer/ColStatDesc.cpp | 14 --
core/sql/optimizer/ColumnDesc.h | 2 -
core/sql/optimizer/ColumnNameMap.h | 2 -
core/sql/optimizer/ControlDB.cpp | 10 --
core/sql/optimizer/Cost.h | 1 -
core/sql/optimizer/CostVector.h | 3 -
core/sql/optimizer/EncodedValue.cpp | 5 -
core/sql/optimizer/EstLogProp.h | 2 -
core/sql/optimizer/GroupAttr.cpp | 6 -
core/sql/optimizer/ImplRule.cpp | 3 -
core/sql/optimizer/IndexDesc.cpp | 16 ---
core/sql/optimizer/Inlining.cpp | 10 --
core/sql/optimizer/ItemArith.h | 4 -
core/sql/optimizer/ItemColRef.h | 7 -
core/sql/optimizer/ItemConstr.h | 3 -
core/sql/optimizer/ItemExpr.cpp | 32 -----
core/sql/optimizer/ItemExpr.h | 3 -
core/sql/optimizer/ItemLog.h | 3 -
core/sql/optimizer/ItemNAType.h | 1 -
core/sql/optimizer/ItemOther.h | 8 --
core/sql/optimizer/ItemSubq.h | 10 --
core/sql/optimizer/ItmBitMuxFunction.cpp | 2 -
core/sql/optimizer/ItmFlowControlFunction.cpp | 6 -
core/sql/optimizer/LargeScopeRules.cpp | 2 -
core/sql/optimizer/MJVIndexBuilder.cpp | 4 -
core/sql/optimizer/MJVIndexBuilder.h | 10 --
core/sql/optimizer/MVInfo.cpp | 44 ------
core/sql/optimizer/MVInfo.h | 24 ----
core/sql/optimizer/MVJoinGraph.cpp | 4 -
core/sql/optimizer/MVJoinGraph.h | 2 -
core/sql/optimizer/MavRelRootBuilder.cpp | 4 -
core/sql/optimizer/MultiJoin.cpp | 6 -
core/sql/optimizer/MultiJoin.h | 2 -
core/sql/optimizer/MvLog.cpp | 8 --
core/sql/optimizer/MvLog.h | 2 -
core/sql/optimizer/MvMultiTxnMavBuilder.cpp | 2 -
core/sql/optimizer/MvRefreshBuilder.cpp | 16 ---
core/sql/optimizer/MvRefreshBuilder.h | 18 ---
core/sql/optimizer/NAClusterInfo.cpp | 1 -
core/sql/optimizer/NAColumn.cpp | 8 --
core/sql/optimizer/NARoutine.cpp | 2 -
core/sql/optimizer/NARoutine.h | 2 -
core/sql/optimizer/NATable.cpp | 30 ----
core/sql/optimizer/NATable.h | 2 -
core/sql/optimizer/NodeMap.cpp | 31 ----
core/sql/optimizer/NormItemExpr.cpp | 15 --
core/sql/optimizer/NormRelExpr.cpp | 18 ---
core/sql/optimizer/ObjectNames.cpp | 6 -
core/sql/optimizer/OptItemExpr.cpp | 2 -
core/sql/optimizer/OptLogRelExpr.cpp | 4 -
core/sql/optimizer/OptPhysRelExpr.cpp | 14 --
core/sql/optimizer/OptTrigger.cpp | 7 -
core/sql/optimizer/PackedColDesc.cpp | 14 --
core/sql/optimizer/PackedColDesc.h | 1 -
core/sql/optimizer/PartFunc.cpp | 26 ----
core/sql/optimizer/PartFunc.h | 3 -
core/sql/optimizer/PartKeyDist.cpp | 6 -
core/sql/optimizer/PartReq.cpp | 30 ----
core/sql/optimizer/PartReq.h | 1 -
core/sql/optimizer/PhyProp.cpp | 12 --
core/sql/optimizer/PhyProp.h | 6 -
core/sql/optimizer/QueryGraph.cpp | 8 --
core/sql/optimizer/RETDesc.cpp | 2 -
core/sql/optimizer/Refresh.cpp | 2 -
core/sql/optimizer/Refresh.h | 26 ----
core/sql/optimizer/Rel3GL.cpp | 2 -
core/sql/optimizer/RelExeUtil.cpp | 2 -
core/sql/optimizer/RelExpr.cpp | 12 --
core/sql/optimizer/RelExpr.h | 5 -
core/sql/optimizer/RelGrby.h | 5 -
core/sql/optimizer/RelJoin.h | 13 --
core/sql/optimizer/RelMisc.h | 1 -
core/sql/optimizer/RelPackedRows.h | 1 -
core/sql/optimizer/RelSample.h | 2 -
core/sql/optimizer/RelScan.h | 2 -
core/sql/optimizer/RelSequence.h | 5 -
core/sql/optimizer/RelSet.h | 2 -
core/sql/optimizer/RelStoredProc.cpp | 8 --
core/sql/optimizer/ReqGen.cpp | 10 --
core/sql/optimizer/RoutineDesc.cpp | 4 -
core/sql/optimizer/Rule.cpp | 2 -
core/sql/optimizer/Rule.h | 5 -
core/sql/optimizer/ScanOptimizer.cpp | 6 -
core/sql/optimizer/ScmCostMethod.cpp | 2 -
core/sql/optimizer/SearchKey.cpp | 16 ---
core/sql/optimizer/Stats.cpp | 7 -
core/sql/optimizer/Stats.h | 23 ---
core/sql/optimizer/SynthType.cpp | 16 ---
core/sql/optimizer/TableDesc.cpp | 6 -
core/sql/optimizer/TransRule.cpp | 15 --
core/sql/optimizer/TransRule.h | 13 --
core/sql/optimizer/TriggerDB.cpp | 4 -
core/sql/optimizer/TriggerDB.h | 1 -
core/sql/optimizer/Triggers.cpp | 10 --
core/sql/optimizer/Triggers.h | 5 -
core/sql/optimizer/VEGTable.cpp | 36 -----
core/sql/optimizer/ValueDesc.cpp | 16 ---
core/sql/optimizer/costmethod.cpp | 12 --
core/sql/optimizer/mdam.cpp | 24 ----
core/sql/optimizer/memo.cpp | 22 ---
core/sql/optimizer/opt.cpp | 26 ----
core/sql/optimizer/opt.h | 8 --
core/sql/parser/ElemDDLFileAttr.cpp | 6 -
core/sql/parser/ElemDDLList.h | 2 -
core/sql/parser/ElemDDLPartition.cpp | 4 -
core/sql/parser/ElemDDLUdr.cpp | 4 -
core/sql/parser/ParDDLFileAttrs.cpp | 14 --
core/sql/parser/ParKeyWords.cpp | 2 -
core/sql/parser/ParKeyWords.h | 2 -
core/sql/parser/ParNameLocList.cpp | 22 ---
core/sql/parser/SqlParserAux.cpp | 36 -----
core/sql/parser/StmtNode.h | 3 -
core/sql/parser/sqlparser.y | 112 ---------------
core/sql/parser/ulexer.cpp | 8 --
core/sql/parser/ulexer.h | 2 -
core/sql/qms/QmmQmm.cpp | 1 -
core/sql/qmscommon/QRQueries.cpp | 5 -
core/sql/qmscommon/QRQueries.sql | 4 -
core/sql/refresh/RuDeltaDef.cpp | 6 -
core/sql/refresh/RuDupElimLogRecord.cpp | 4 -
core/sql/refresh/RuDupElimLogScanner.cpp | 2 -
core/sql/refresh/RuDupElimTaskExUnit.cpp | 2 -
core/sql/refresh/RuDupElimTaskExecutor.cpp | 8 --
core/sql/refresh/RuException.cpp | 12 --
core/sql/refresh/RuForceOptionsParser.cpp | 2 -
core/sql/refresh/RuOptions.cpp | 12 --
core/sql/refresh/RuRefreshTaskExecutor.cpp | 26 ----
.../refresh/RuSQLDynamicStatementContainer.cpp | 6 -
core/sql/refresh/RuSQLStatementContainer.cpp | 4 -
core/sql/refresh/RuTableSyncTaskExecutor.cpp | 4 -
core/sql/refresh/RuTaskExecutor.cpp | 4 -
core/sql/refresh/RuTestTaskExecutor.cpp | 16 ---
.../refresh/RuUnAuditRefreshTaskExecutor.cpp | 16 ---
core/sql/sort/RunDirectory.cpp | 2 -
core/sql/sort/ScratchSpace.cpp | 2 -
core/sql/sort/SortAlgo.cpp | 6 -
core/sql/sort/SortUtil.cpp | 6 -
core/sql/sort/TourTree.cpp | 2 -
core/sql/sort/TreeNode.cpp | 6 -
core/sql/sort/scratchfile_base.cpp | 2 -
core/sql/sqlcomp/CmpDescribe.cpp | 8 --
core/sql/sqlcomp/DefaultValidator.cpp | 4 -
core/sql/sqlcomp/NewDel.cpp | 8 --
core/sql/sqlcomp/nadefaults.cpp | 14 --
core/sql/sqlcomp/parser.cpp | 8 --
core/sql/sqlmsg/ComDiagsMsg.cpp | 14 --
core/sql/sqlmsg/ErrorMessage.cpp | 12 --
core/sql/sqlmsg/GetErrorMessage.cpp | 10 --
core/sql/sqlmsg/ParserMsg.cpp | 4 -
core/sql/sqlmxevents/logmxevent_sq.h | 2 -
core/sql/sqlshare/CatSQLShare.cpp | 2 -
core/sql/udrserv/UdrStreams.cpp | 2 -
core/sql/udrserv/udrutil.cpp | 2 -
core/sql/ustat/hs_cli.cpp | 43 ------
core/sql/ustat/hs_cli.h | 2 -
core/sql/ustat/hs_globals.cpp | 14 --
core/sql/ustat/hs_la.cpp | 4 -
core/sql/ustat/hs_lex.ll | 3 -
core/sql/ustat/hs_read.cpp | 16 ---
core/sql/ustat/hs_util.cpp | 2 -
core/sql/ustat/hs_yacc.y | 5 -
393 files changed, 18 insertions(+), 3921 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/arkcmp/ApplicationFile.cpp
----------------------------------------------------------------------
diff --git a/core/sql/arkcmp/ApplicationFile.cpp b/core/sql/arkcmp/ApplicationFile.cpp
index 54c3bb8..a531e17 100644
--- a/core/sql/arkcmp/ApplicationFile.cpp
+++ b/core/sql/arkcmp/ApplicationFile.cpp
@@ -104,10 +104,8 @@ bool ApplicationFile::mxcmpModule(char *mdf)
mxcmp = mxcmp ? mxcmp : DEFAULT_MXCMP;
// make sure we have enough space for the mxcmp invocation string
assert(args_ != NULL);
-#pragma nowarn(1506) // warning elimination
Int32 cmdLen = strlen(mxcmp)+args_->application().length()+
args_->otherArgs().length()+strlen(mdf)+7;
-#pragma warn(1506) // warning elimination
// for efficiency we try to use the stack-allocated cmd variable.
// but, no matter how big we declare it, eg: char cmd[12345],
// it is always possible for someone like QA try something like
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/arkcmp/CmpContext.cpp
----------------------------------------------------------------------
diff --git a/core/sql/arkcmp/CmpContext.cpp b/core/sql/arkcmp/CmpContext.cpp
index 3a8a9f9..e5c179e 100644
--- a/core/sql/arkcmp/CmpContext.cpp
+++ b/core/sql/arkcmp/CmpContext.cpp
@@ -172,9 +172,7 @@ CmpContext::CmpContext(UInt32 f, CollHeap * h)
// initialize CmpStatement related members.
statements_.insert(0);
-#pragma nowarn(1506) // warning elimination
currentStatement_ = statements_.index(0);
-#pragma warn(1506) // warning elimination
currentStatementPtrCache_ = statements_[currentStatement_];
diags_ = ComDiagsArea::allocate(heap_);
@@ -595,9 +593,7 @@ void CmpContext::setStatement(CmpStatement* s)
init();
statements_.insert(s);
s->setPrvCmpStatement(statements_[currentStatement_]);
-#pragma nowarn(1506) // warning elimination
currentStatement_ = statements_.index(s);
-#pragma warn(1506) // warning elimination
currentStatementPtrCache_ = statements_[currentStatement_];
// Commented this out, as init() is now a no-op:
@@ -608,9 +604,7 @@ void CmpContext::unsetStatement(CmpStatement* s, NABoolean exceptionRaised)
{
CollIndex i = statements_.index(s);
statements_.removeAt(i);
-#pragma nowarn(1506) // warning elimination
currentStatement_ = statements_.index(s->prvCmpStatement());
-#pragma warn(1506) // warning elimination
currentStatementPtrCache_ = statements_[currentStatement_];
for ( i = 0; i < statements_.entries(); i++ )
if (statements_[i] && statements_[i]->prvCmpStatement() == s)
@@ -624,9 +618,7 @@ void CmpContext::unsetStatement(CmpStatement* s, NABoolean exceptionRaised)
void CmpContext::setCurrentStatement(CmpStatement* s)
{
CollIndex i = statements_.index(s);
-#pragma nowarn(1506) // warning elimination
currentStatement_ = ( i == NULL_COLL_INDEX ) ? 0 : i;
-#pragma warn(1506) // warning elimination
currentStatementPtrCache_ = statements_[currentStatement_];
CMPASSERT(s->diags()->getNumber() == 0);
// diags()->clear();
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/arkcmp/CmpContext.h
----------------------------------------------------------------------
diff --git a/core/sql/arkcmp/CmpContext.h b/core/sql/arkcmp/CmpContext.h
index ea366a6..b875927 100644
--- a/core/sql/arkcmp/CmpContext.h
+++ b/core/sql/arkcmp/CmpContext.h
@@ -154,7 +154,6 @@ private :
Int32 useCount_;
};
-#pragma nowarn(1506) // warning elimination
class CmpContext
{
public :
@@ -647,7 +646,6 @@ private:
// for any Hive SQL operations we may want to do
HiveClient_JNI* hiveClient_;
}; // end of CmpContext
-#pragma warn(1506) // warning elimination
static inline CmpContext::InternalCompileEnum &InternalCompile()
{ return cmpCurrentContext->internalCompile(); }
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/arkcmp/CmpISPUtils.cpp
----------------------------------------------------------------------
diff --git a/core/sql/arkcmp/CmpISPUtils.cpp b/core/sql/arkcmp/CmpISPUtils.cpp
index 35c03ab..0786c24 100644
--- a/core/sql/arkcmp/CmpISPUtils.cpp
+++ b/core/sql/arkcmp/CmpISPUtils.cpp
@@ -83,7 +83,6 @@ SP_HELPER_STATUS CmpSPFormatFunc_ (Lng32 fieldNo,
Lng32 casting)
{
CmpSPExecDataItemReply* replyPtr = (CmpSPExecDataItemReply*)rowData;
-#pragma nowarn(262) // warning elimination
ULng32 tempNum = (ULng32)fieldNo;
ULng32 tempLen = (ULng32)fieldLen;
ComDiagsArea* diags = replyPtr->SPFuncsDiags();
@@ -97,7 +96,6 @@ SP_HELPER_STATUS CmpSPFormatFunc_ (Lng32 fieldNo,
else
return SP_NO_ERROR;
}
-#pragma warn(262) // warning elimination
SP_HELPER_STATUS CmpSPKeyValueFunc_ (
Lng32 keyIndex,
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/arkcmp/CmpStatement.cpp
----------------------------------------------------------------------
diff --git a/core/sql/arkcmp/CmpStatement.cpp b/core/sql/arkcmp/CmpStatement.cpp
index f1a8f4e..e16ff5c 100644
--- a/core/sql/arkcmp/CmpStatement.cpp
+++ b/core/sql/arkcmp/CmpStatement.cpp
@@ -730,9 +730,7 @@ CmpStatement::process (const CmpMessageDDL& statement)
// from the UpdateStats() method.
char *userStr= new (heap()) char[2000];
-#pragma nowarn(1506) // warning elimination
Int32 len=strlen(sqlStr);
-#pragma warn(1506) // warning elimination
if (len > 1999)
len=1999;
@@ -1036,7 +1034,6 @@ CmpStatement::process(const CmpMessageDDLwithStatus &statement)
CmpStatement::ReturnStatus
CmpStatement::process (const CmpMessageDescribe& statement)
{
-#pragma nowarn(262) // warning elimination
ReturnStatus ret = CmpStatement_SUCCESS;
// There will be memory leak handling CmpMessageReplyCode *bound this way.
// The correct way should be making bound a local variable with statementHeap passed in.
@@ -1052,9 +1049,7 @@ CmpStatement::process (const CmpMessageDescribe& statement)
// the sqlcomp() method.
char *userStr= (char *) (heap())->allocateMemory(sizeof(char) * (2000));
-#pragma nowarn(1506) // warning elimination
Int32 len=strlen(statement.data());
-#pragma warn(1506) // warning elimination
if (len > 1999)
len=1999;
@@ -1089,7 +1084,6 @@ CmpStatement::process (const CmpMessageDescribe& statement)
sqlTextStr_=NULL;
return CmpStatement_SUCCESS;
}
-#pragma warn(262) // warning elimination
CmpStatement::ReturnStatus
CmpStatement::process (const CmpMessageUpdateHist& statement)
@@ -1099,9 +1093,7 @@ CmpStatement::process (const CmpMessageUpdateHist& statement)
// the UpdateStats() method.
char *userStr= new (heap()) char[2000];
-#pragma nowarn(1506) // warning elimination
Int32 len=strlen(statement.data());
-#pragma warn(1506) // warning elimination
if (len > 1999)
len=1999;
@@ -1365,7 +1357,6 @@ static NABoolean ISPFetchPut(CmpInternalSP* storedProc, // to fetch data
{
NABoolean bufferFull = FALSE;
// fetch until there is no more data
-#pragma nowarn(770) // warning elimination
CmpStoredProc::ExecStatus execStatus;
short putStatus;
while ( !bufferFull &&
@@ -1385,7 +1376,6 @@ static NABoolean ISPFetchPut(CmpInternalSP* storedProc, // to fetch data
}
return bufferFull;
}
-#pragma warn(770) // warning elimination
static NABoolean ISPPrepareReply(CmpISPDataObject* ispData,
CmpMessageReply* reply,
@@ -1402,7 +1392,6 @@ static NABoolean ISPPrepareReply(CmpISPDataObject* ispData,
CmpStatement::ReturnStatus
CmpStatementISP::process (CmpMessageISPRequest& isp)
{
-#pragma nowarn(262) // warning elimination
ReturnStatus ret = CmpStatement_ERROR;
#ifdef _DEBUG
@@ -1458,7 +1447,6 @@ CmpStatementISP::process (CmpMessageISPRequest& isp)
return CmpStatement_SUCCESS;
}
-#pragma warn(262) // warning elimination
CmpStatement::ReturnStatus
CmpStatementISP::process (const CmpMessageISPGetNext& getNext)
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/arkcmp/CmpStoredProc.cpp
----------------------------------------------------------------------
diff --git a/core/sql/arkcmp/CmpStoredProc.cpp b/core/sql/arkcmp/CmpStoredProc.cpp
index 4206685..5a3dc49 100644
--- a/core/sql/arkcmp/CmpStoredProc.cpp
+++ b/core/sql/arkcmp/CmpStoredProc.cpp
@@ -78,11 +78,9 @@ static const char emptyString[] = "";
inline static char *copyString(const NAString &s) // cf. readRealArk.cpp
{
-#pragma nowarn(1506) // warning elimination
char *c = new(CmpCommon::statementHeap()) char[s.length()+1];
str_cpy_all(c, s.data(), s.length()+1);
return c;
-#pragma warn(1506) // warning elimination
}
static void CmpSPERROR2Diags(const SP_ERROR_STRUCT* spError,
@@ -437,7 +435,6 @@ NABoolean CmpSPOutputFormat::ElemDDLColDef2ColumnDescStruct
colDesc->precision = 0;
}
-#pragma nowarn(1506) // warning elimination
if ( genericType->getTypeQualifier() == NA_CHARACTER_TYPE )
{
CharType & charType = (CharType &) *genericType;
@@ -457,7 +454,6 @@ NABoolean CmpSPOutputFormat::ElemDDLColDef2ColumnDescStruct
colDesc->datetimefractprec = dti.getFractionPrecision();
colDesc->intervalleadingprec = dti.getLeadingPrecision();
}
-#pragma warn(1506) // warning elimination
// offset, to be done (do we need it?)
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/arkcmp/CmpStoredProc.h
----------------------------------------------------------------------
diff --git a/core/sql/arkcmp/CmpStoredProc.h b/core/sql/arkcmp/CmpStoredProc.h
index 3ee41cd..0614b94 100644
--- a/core/sql/arkcmp/CmpStoredProc.h
+++ b/core/sql/arkcmp/CmpStoredProc.h
@@ -586,7 +586,6 @@ public:
const CmpISPFuncs& operator = (const CmpISPFuncs&);
}; // end of CmpISPFuncs
-#pragma nowarn(1319) // warning elimination
class CmpInternalSP : public CmpStoredProc
{
public:
@@ -662,7 +661,6 @@ private:
CmpInternalSP(const CmpInternalSP&);
const CmpInternalSP& operator=(const CmpInternalSP&);
}; // CmpInternalSP
-#pragma warn(1319) // warning elimination
inline const CmpISPFuncs::ProcFuncsStruct&
CmpISPFuncs::operator[](const NAString& name) const
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/arkcmp/ExtQualModuleNames.cpp
----------------------------------------------------------------------
diff --git a/core/sql/arkcmp/ExtQualModuleNames.cpp b/core/sql/arkcmp/ExtQualModuleNames.cpp
index 828a112..bc125e1 100644
--- a/core/sql/arkcmp/ExtQualModuleNames.cpp
+++ b/core/sql/arkcmp/ExtQualModuleNames.cpp
@@ -378,4 +378,3 @@ void ExtQualModuleNames::processExtQualModuleNames()
currentTokenCode_ = scanner();
parseExternallyQualifiedModuleNames();
}
-#pragma warning (disable : 4786) //warning elimination
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/arkcmp/ExtQualModuleNames.h
----------------------------------------------------------------------
diff --git a/core/sql/arkcmp/ExtQualModuleNames.h b/core/sql/arkcmp/ExtQualModuleNames.h
index 1686808..880aa92 100644
--- a/core/sql/arkcmp/ExtQualModuleNames.h
+++ b/core/sql/arkcmp/ExtQualModuleNames.h
@@ -34,9 +34,7 @@
*/
#include <string>
-#pragma nowarn(1506) //warning elimination (to hide warnings from vector2)
#include <vector>
-#pragma warn(1506) //warning elimination
struct ThreePartModuleName {
std::string catalog, schema, module;
@@ -49,7 +47,6 @@ struct ThreePartModuleName {
}
};
-#pragma nowarn(1506) //warning elimination
class ExtQualModuleNames {
public:
// constructor
@@ -122,6 +119,5 @@ class ExtQualModuleNames {
std::string moduleTableSet_;// default module tableset
std::string moduleVersion_; // default module version
};
-#pragma warn(1506) //warning elimination
#endif // EXTQUALMODULENAMES__H
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/arkcmp/ProcessEnv.cpp
----------------------------------------------------------------------
diff --git a/core/sql/arkcmp/ProcessEnv.cpp b/core/sql/arkcmp/ProcessEnv.cpp
index 39597e4..18a0826 100644
--- a/core/sql/arkcmp/ProcessEnv.cpp
+++ b/core/sql/arkcmp/ProcessEnv.cpp
@@ -274,9 +274,7 @@ void ProcessEnv::removeEnv(char **newenvs, Lng32 nEnvs)
CollHeap *stmtHeap = CmpCommon::statementHeap();
NAList<Lng32> deleteArray(stmtHeap, 16);
-#pragma warning (disable : 4018) //warning elimination
for (j=0; j < envs_.getSize(); j++)
-#pragma warning (default : 4018) //warning elimination
{
if (envs_.used(j))
{
@@ -300,9 +298,7 @@ void ProcessEnv::removeEnv(char **newenvs, Lng32 nEnvs)
}
}
-#pragma warning (disable : 4018) //warning elimination
for (j=0; j < deleteArray.entries(); j++) {
-#pragma warning (default : 4018) //warning elimination
envs_.remove(deleteArray[j]);
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/arkcmp/SPUtil.cpp
----------------------------------------------------------------------
diff --git a/core/sql/arkcmp/SPUtil.cpp b/core/sql/arkcmp/SPUtil.cpp
index b058a8b..1510a51 100644
--- a/core/sql/arkcmp/SPUtil.cpp
+++ b/core/sql/arkcmp/SPUtil.cpp
@@ -169,13 +169,9 @@ SP_STATUS SP_FILEINFO_Process(SP_PROCESS_ACTION action,
{
char* nlptr = strchr(p, '\n');
if (nlptr) *nlptr = '\0';
-#pragma nowarn(1506) // warning elimination
short len = strlen(p);
-#pragma warn(1506) // warning elimination
memcpy(&tempstr[0], &len, sizeof(len));
-#pragma nowarn(1506) // warning elimination
fFunc(0, outputData, strlen(p) + 2, tempstr, 0);
-#pragma warn(1506) // warning elimination
// error when fetching output
if (strncmp(&tempstr[2], "errors", 6) == 0)
@@ -199,9 +195,7 @@ SP_STATUS SP_FILEINFO_Process(SP_PROCESS_ACTION action,
return SP_FAIL;
}
// char as output
-#pragma nowarn(1506) // warning elimination
fFunc(1, outputData, strlen(fileInfo->desc), fileInfo->desc, 0);
-#pragma warn(1506) // warning elimination
// datetime as output
fFunc(2, outputData, 64, fileInfo->dt1, 0);
@@ -306,9 +300,7 @@ inline short string2Varchar(char* string, char* varchar, short size)
{
if ((UInt32)strlen(string) + sizeof(short) > (UInt32)size )
return 0;
-#pragma nowarn(1506) // warning elimination
short len = strlen(string);
-#pragma warn(1506) // warning elimination
memcpy(varchar, &len, sizeof(short));
memcpy(varchar+sizeof(short), string, len);
return 1;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/arkcmp/SQLJFile.cpp
----------------------------------------------------------------------
diff --git a/core/sql/arkcmp/SQLJFile.cpp b/core/sql/arkcmp/SQLJFile.cpp
index 5c64d98..f66608d 100644
--- a/core/sql/arkcmp/SQLJFile.cpp
+++ b/core/sql/arkcmp/SQLJFile.cpp
@@ -61,12 +61,10 @@ bool SQLJFile::openFile(Cmdline_Args &args)
// invoke MDFWriter to extract modules
const char mdfWriter[]= "java sqlj.runtime.profile.util.MDFWriter";
-#pragma nowarn(1506) // warning elimination
cmdLen = strlen(mdfWriter) + strlen(moduleNamesOption) + 2 +
strlen("-CerrorFileName=") + strlen(errFileName) + 2 +
strlen("-CMDFList=") + strlen(outputFileName) + 1 +
args.application().length();
-#pragma warn(1506) // warning elimination
// for efficiency we try to use the stack-allocated cmd variable.
// but, no matter how big we declare it, eg: char cmd[12345],
// it is always possible for someone like QA try something like
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/arkcmp/VersioningStoredProc.cpp
----------------------------------------------------------------------
diff --git a/core/sql/arkcmp/VersioningStoredProc.cpp b/core/sql/arkcmp/VersioningStoredProc.cpp
index ff2c600..f3cbbb6 100644
--- a/core/sql/arkcmp/VersioningStoredProc.cpp
+++ b/core/sql/arkcmp/VersioningStoredProc.cpp
@@ -448,7 +448,6 @@ SP_STATUS
{
// Provide output values from current element
const ComVersion_NodeInfo & element = nodeSet[rowIndex];
-#pragma nowarn(1506)
// First two columns are copies of the corresponding input columns
fFunc(0, outputData, strlen(context->getInputType()), (void *)context->getInputType(), TRUE);
fFunc(1, outputData, strlen(context->getInputValue()), (void *)context->getInputValue(), TRUE);
@@ -457,7 +456,6 @@ SP_STATUS
fFunc(2, outputData, sizeof(Lng32), (void *)&outputVersion, FALSE);
// Fourth column is the node name from the element
fFunc(3, outputData, strlen(element.getNodeName()), (void *)&element.getNodeName(), TRUE);
-#pragma warn(1506)
// Fifth column is the MXV of the node from the element.
outputVersion = element.getMXV();
fFunc (4, outputData, sizeof(Lng32), (void *)&outputVersion, FALSE);
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/arkcmp/cmpargs.cpp
----------------------------------------------------------------------
diff --git a/core/sql/arkcmp/cmpargs.cpp b/core/sql/arkcmp/cmpargs.cpp
index 0780021..3a40e48 100644
--- a/core/sql/arkcmp/cmpargs.cpp
+++ b/core/sql/arkcmp/cmpargs.cpp
@@ -285,9 +285,7 @@ void Cmdline_Args::processArgs(Int32 argc, char **argv)
{
NAString nam(optarg);
// find the = if it exists
-#pragma nowarn(1506) // warning elimination
Int32 loopx = 0, len = nam.length();
-#pragma warn(1506) // warning elimination
while((loopx < len) && ((nam)(loopx) != '=') )loopx++;
if (len == loopx) {
diags << DgSqlCode(mxcmpUmIllformatedOptionD) << DgString0(optarg);
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/bin/ex_esp_main.cpp
----------------------------------------------------------------------
diff --git a/core/sql/bin/ex_esp_main.cpp b/core/sql/bin/ex_esp_main.cpp
index 0a54fb6..57dd43c 100644
--- a/core/sql/bin/ex_esp_main.cpp
+++ b/core/sql/bin/ex_esp_main.cpp
@@ -322,7 +322,6 @@ GuaReceiveFastStart::GuaReceiveFastStart()
// Startup handling of ESP
// -----------------------------------------------------------------------
-#pragma nowarn(770) // warning elimination
Int32 runESP(Int32 argc, char** argv, GuaReceiveFastStart *guaReceiveFastStart)
{
// initialize ESP global data
@@ -406,7 +405,6 @@ Int32 runESP(Int32 argc, char** argv, GuaReceiveFastStart *guaReceiveFastStart)
// nobody wants us anymore, right now that means that we stop
return 0;
}
-#pragma warn(770) // warning elimination
void DoEspStartup(Int32 argc,
char **argv,
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/cli/Cli.cpp
----------------------------------------------------------------------
diff --git a/core/sql/cli/Cli.cpp b/core/sql/cli/Cli.cpp
index 8b3a78c..b128ed6 100644
--- a/core/sql/cli/Cli.cpp
+++ b/core/sql/cli/Cli.cpp
@@ -1156,9 +1156,7 @@ Lng32 SQLCLI_BreakEnabled(/*IN*/ CliGlobals * cliGlobals,
}
-#pragma nowarn(1506) // warning elimination
cliGlobals->setBreakEnabled (enabled);
-#pragma warn(1506) // warning elimination
return 0;
}
Lng32 SQLCLI_SPBreakRecvd(/*IN*/ CliGlobals * cliGlobals,
@@ -1170,14 +1168,11 @@ Lng32 SQLCLI_SPBreakRecvd(/*IN*/ CliGlobals * cliGlobals,
}
-#pragma nowarn(1506) // warning elimination
*breakRecvd = cliGlobals->SPBreakReceived();
cliGlobals->setSPBreakReceived(FALSE);
-#pragma warn(1506) // warning elimination
return 0;
}
-#pragma nowarn(770) // warning elimination
Lng32 SQLCLI_CreateContext(/*IN*/ CliGlobals * cliGlobals,
/*OUT*/ SQLCTX_HANDLE *contextHandle,
/*IN*/ char * sqlAuthId,
@@ -1215,7 +1210,6 @@ Lng32 SQLCLI_CreateContext(/*IN*/ CliGlobals * cliGlobals,
return SUCCESS;
}
-#pragma warn(770) // warning elimination
Lng32 SQLCLI_CurrentContext(/*IN*/ CliGlobals * cliGlobals,
/*OUT*/ SQLCTX_HANDLE *contextHandle)
@@ -4290,7 +4284,6 @@ static Lng32 getStmtInfo(
*(Int32 *)numeric_value = diags.getFunction(); // returns FunctionEnum type
break;
-#pragma warning (disable : 4244) //warning elimination
case SQLDIAG_ROW_COUNT:
{
Int64 rowCount;
@@ -4304,7 +4297,6 @@ static Lng32 getStmtInfo(
break;
}
-#pragma warning (default : 4244) //warning elimination
case SQLDIAG_ROWSET_ROW_COUNT:
{
@@ -7721,9 +7713,7 @@ Lng32 SQLCLI_GetCollectStatsType_Internal(/*IN*/ CliGlobals * cliGlobals,
*collectStatsType = (ULng32)ComTdb::NO_STATS;
}
-#pragma nowarn(769) // warning elimination
return retcode;
-#pragma warn(769) // warning elimination
}
// For internal use only -- do not document!
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/cli/CliExpExchange.cpp
----------------------------------------------------------------------
diff --git a/core/sql/cli/CliExpExchange.cpp b/core/sql/cli/CliExpExchange.cpp
index 15e3e7b..fd0f578 100644
--- a/core/sql/cli/CliExpExchange.cpp
+++ b/core/sql/cli/CliExpExchange.cpp
@@ -151,14 +151,10 @@ ex_expr::exp_return_type InputOutputExpr::describeOutput(void * output_desc_,
0);
if (NOT isIFIO)
{
-#pragma warning (disable : 4244) //warning elimination
Lng32 displaySize =
ExpInterval::getDisplaySize(operand->getDatatype(),
-#pragma nowarn(1506) // warning elimination
operand->getPrecision(),
-#pragma warn(1506) // warning elimination
operand->getScale());
-#pragma warning (default : 4244) //warning elimination
length = displaySize;
}
} else if (operand->getDatatype() == REC_DATETIME) {
@@ -686,7 +682,6 @@ Descriptor::BulkMoveStatus Descriptor::checkBulkMoveStatusV2(
-#pragma warning (disable : 4273) //warning elimination
void InputOutputExpr::setupBulkMoveInfo(void * desc_, CollHeap * heap,
NABoolean isInputDesc,
UInt32 flags)
@@ -971,9 +966,7 @@ next_clause:
}
}
}
-#pragma warning (default : 4273) //warning elimination
-#pragma warning (disable : 4273) //warning elimination
ex_expr::exp_return_type InputOutputExpr::doBulkMove(atp_struct * atp,
void * desc_,
char * tgtRowPtr,
@@ -1026,9 +1019,7 @@ ex_expr::exp_return_type InputOutputExpr::doBulkMove(atp_struct * atp,
return ex_expr::EXPR_OK;
}
-#pragma warning (default : 4273) //warning elimination
-#pragma warning (disable : 4273) //warning elimination
ex_expr::exp_return_type
InputOutputExpr::outputValues(atp_struct *atp,
void * output_desc_,
@@ -1213,9 +1204,7 @@ InputOutputExpr::outputValues(atp_struct *atp,
default:
dataPtr = (atp->getTupp(operand->getAtpIndex())).getDataPointer();
-#pragma nowarn(270) // warning elimination
if (operand->getOffset() < 0) {
-#pragma warn(270) // warning elimination
// Offset is negative. This indicates that this offset
// is the negative of field number in a base table
// and this field follows one or more varchar fields.
@@ -2097,7 +2086,6 @@ next_clause:
return ex_expr::EXPR_OK;
}
-#pragma warning (default : 4273) //warning elimination
ex_expr::exp_return_type InputOutputExpr::describeInput(void * input_desc_,
@@ -2180,14 +2168,10 @@ ex_expr::exp_return_type InputOutputExpr::describeInput(void * input_desc_,
0);
if (NOT isIFIO)
{
-#pragma warning (disable : 4244) //warning elimination
displayLength =
ExpInterval::getDisplaySize(dataType,
-#pragma nowarn(1506) // warning elimination
operand->getPrecision(),
-#pragma warn(1506) // warning elimination
operand->getScale());
-#pragma warning (default : 4244) //warning elimination
length = displayLength;
}
@@ -2516,7 +2500,6 @@ then place the following four lines of code after the call to setRowNumberInCli.
return ex_expr::EXPR_ERROR;
*/
// error path not taken . This is only if something bad happens in NVT
-#pragma warning (disable : 4273) //warning elimination
ex_expr::exp_return_type
InputOutputExpr::inputSingleRowValue(atp_struct *atp,
void * inputDesc_,
@@ -2871,9 +2854,7 @@ InputOutputExpr::inputSingleRowValue(atp_struct *atp,
if (sourceType == REC_NCHAR_V_ANSI_UNICODE)
{
-#pragma nowarn(1506) // warning elimination
realSourceLen = NAWstrlen((wchar_t*)source) * SQL_DBCHAR_SIZE;
-#pragma warn(1506) // warning elimination
if ( realSourceLen > sourceLen )
realSourceLen = sourceLen ;
@@ -3895,9 +3876,7 @@ InputOutputExpr::inputValues(atp_struct *atp,
Int32 i;
if ((sourceType >= REC_MIN_V_N_CHAR_H)
&& (sourceType <= REC_MAX_V_N_CHAR_H)) {
-#pragma nowarn(1506) // warning elimination
for (i = strlen(source); i < operand->getLength(); i++) {
-#pragma warn(1506) // warning elimination
target[i] = 0;
}
}
@@ -3950,9 +3929,7 @@ InputOutputExpr::inputValues(atp_struct *atp,
Lng32 realSourceLen = sourceLen;
if (sourceType == REC_NCHAR_V_ANSI_UNICODE) {
-#pragma nowarn(1506) // warning elimination
realSourceLen = NAWstrlen((NAWchar*)source) * SQL_DBCHAR_SIZE;
-#pragma warn(1506) // warning elimination
if ( realSourceLen > sourceLen )
realSourceLen = sourceLen ;
@@ -4302,9 +4279,7 @@ InputOutputExpr::inputValues(atp_struct *atp,
return ex_expr::EXPR_ERROR;
}
else {
-#pragma nowarn(1506) // warning elimination
dynamicRowsetSize = *((ULng32 *) target);
-#pragma warn(1506) // warning elimination
break;
}
@@ -4351,7 +4326,6 @@ next_clause:
return ex_expr::EXPR_OK;
}
-#pragma warning (disable : 4273) //warning elimination
Lng32 InputOutputExpr::getCompiledOutputRowsetSize(atp_struct *atp)
{
ex_clause * clause = getClauses();
@@ -4369,7 +4343,6 @@ Lng32 InputOutputExpr::getCompiledOutputRowsetSize(atp_struct *atp)
return sourceRowsetSize;
}
-#pragma warning (default : 4273) //warning elimination
ex_expr::exp_return_type InputOutputExpr::addDescInfoIntoStaticDesc
(Descriptor * desc, NABoolean isInput)
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/cli/CliExtern.cpp
----------------------------------------------------------------------
diff --git a/core/sql/cli/CliExtern.cpp b/core/sql/cli/CliExtern.cpp
index f943c26..f4724c6 100644
--- a/core/sql/cli/CliExtern.cpp
+++ b/core/sql/cli/CliExtern.cpp
@@ -3519,7 +3519,6 @@ Lng32 SQL_EXEC_GETDIAGNOSTICSCONDINFO(
};
-#pragma nowarn(770) // warning elimination
Lng32 SQL_EXEC_GetDiagnosticsCondInfo2(
/*IN* (SQLDIAG_COND_INFO_ITEM_ID) */ Lng32 what_to_get,
/*IN*/ Lng32 conditionNum,
@@ -3633,7 +3632,6 @@ Lng32 SQL_EXEC_GetDiagnosticsCondInfo2(
return retcode;
}
-#pragma warn(770) // warning elimination
Lng32 SQL_EXEC_GETDIAGNOSTICSCONDINFO2(
/*IN* (SQLDIAG_COND_INFO_ITEM_ID) */ Lng32 what_to_get,
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/cli/Context.cpp
----------------------------------------------------------------------
diff --git a/core/sql/cli/Context.cpp b/core/sql/cli/Context.cpp
index 0b5a09c..ab11551 100644
--- a/core/sql/cli/Context.cpp
+++ b/core/sql/cli/Context.cpp
@@ -390,10 +390,8 @@ void ContextCli::deleteMe()
ex_assert(cmpContextInUse_.entries() == 0,
"Should not be inside recursive compilation");
-#pragma warning( disable : 4018 ) // warning elimination
for (short i = 0; i < arkcmpArray_.entries(); i++)
delete arkcmpArray_[i];
-#pragma warning( default : 4018 ) // warning elimination
arkcmpArray_.clear();
@@ -2180,14 +2178,10 @@ Lng32 ContextCli::setUdrRuntimeOptions(const char *options,
char *newOptions = (char *) exHeap()->allocateMemory(optionsLen + 1);
char *newDelims = (char *) exHeap()->allocateMemory(delimsLen + 1);
-#pragma nowarn(1506) // warning elimination
str_cpy_all(newOptions, options, optionsLen);
-#pragma warn(1506) // warning elimination
newOptions[optionsLen] = 0;
-#pragma nowarn(1506) // warning elimination
str_cpy_all(newDelims, delimiters, delimsLen);
-#pragma warn(1506) // warning elimination
newDelims[delimsLen] = 0;
if (udrRuntimeOptions_)
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/cli/Context.h
----------------------------------------------------------------------
diff --git a/core/sql/cli/Context.h b/core/sql/cli/Context.h
index e691323..973a647 100644
--- a/core/sql/cli/Context.h
+++ b/core/sql/cli/Context.h
@@ -73,8 +73,6 @@ class ExUdrServer;
class UdrContextMsg;
class SequenceValueGenerator;
class LmRoutine;
-#pragma warning( disable : 4244 ) // warning elimination
-#pragma nowarn(1506) // warning elimination
class ContextCli : public ExGod {
public:
@@ -1054,8 +1052,6 @@ public:
ContextCli *context_;
};
-#pragma warn(1506) // warning elimination
-#pragma warning( default : 4244 ) // warning elimination
inline HashQueue *
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/cli/Descriptor.cpp
----------------------------------------------------------------------
diff --git a/core/sql/cli/Descriptor.cpp b/core/sql/cli/Descriptor.cpp
index efa5d58..9b7446b 100644
--- a/core/sql/cli/Descriptor.cpp
+++ b/core/sql/cli/Descriptor.cpp
@@ -176,9 +176,7 @@ Descriptor::Descriptor(SQLDESC_ID * descriptor_id_,
case desc_handle:
{
-#pragma nowarn(1506) // warning elimination
descriptor_id.handle = (void*)context_->getNextDescriptorHandle();
-#pragma warn(1506) // warning elimination
}
break;
@@ -1278,14 +1276,10 @@ char * desc_var_data_alloc(char *source,
if ( CharInfo::is_NCHAR_MP(sourceCharSet) == FALSE )
sourceDataLen = str_len(source);
else
-#pragma nowarn(1506) // warning elimination
sourceDataLen = na_wcslen((NAWchar*)source) * SQL_DBCHAR_SIZE;
-#pragma warn(1506) // warning elimination
break;
case REC_NCHAR_V_ANSI_UNICODE:
-#pragma nowarn(1506) // warning elimination
sourceDataLen = na_wcslen((NAWchar*)source) * SQL_DBCHAR_SIZE;
-#pragma warn(1506) // warning elimination
break;
case REC_BYTE_F_ASCII:
case REC_NCHAR_F_UNICODE:
@@ -2410,9 +2404,7 @@ RETCODE Descriptor::setDescItem(Lng32 entry, Lng32 what_to_set,
// need to set type, len, precision and scale for both
// source and target
sourceType = REC_BYTE_V_ANSI;
-#pragma nowarn(1506) // warning elimination
sourceLen = strlen(source) + 1; // max source length including
-#pragma warn(1506) // warning elimination
// the null at the end
sourcePrecision = sourceScale = 0;
@@ -2709,27 +2701,15 @@ RETCODE Descriptor::setDescItem(Lng32 entry, Lng32 what_to_set,
break;
case SQLDESC_PARAMETER_MODE:
-#pragma warning (disable : 4244) //warning elimination
-#pragma nowarn(1506) // warning elimination
descItem.parameterMode = numeric_value;
-#pragma warn(1506) // warning elimination
-#pragma warning (default : 4244) //warning elimination
break;
case SQLDESC_ORDINAL_POSITION:
-#pragma warning (disable : 4244) //warning elimination
-#pragma nowarn(1506) // warning elimination
descItem.ordinalPosition = numeric_value;
-#pragma warn(1506) // warning elimination
-#pragma warning (default : 4244) //warning elimination
break;
case SQLDESC_PARAMETER_INDEX:
-#pragma warning (disable : 4244) //warning elimination
-#pragma nowarn(1506) // warning elimination
descItem.parameterIndex = numeric_value;
-#pragma warn(1506) // warning elimination
-#pragma warning (default : 4244) //warning elimination
break;
case SQLDESC_DESCRIPTOR_TYPE:
@@ -3482,8 +3462,6 @@ SQLCLI_OBJ_ID* Descriptor::GetNameViaDesc(SQLDESC_ID *desc_id, ContextCli *conte
return NULL;
}
-#pragma warning (disable : 4244) //warning elimination
-#pragma nowarn(1506) // warning elimination
short retcode = convDoIt(
data,
length,
@@ -3499,8 +3477,6 @@ SQLCLI_OBJ_ID* Descriptor::GetNameViaDesc(SQLDESC_ID *desc_id, ContextCli *conte
0,
&heap,
&diagsArea);
-#pragma warn(1506) // warning elimination
-#pragma warning (default : 4244) //warning elimination
if (retcode != ex_expr::EXPR_OK)
{
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/cli/Descriptor.h
----------------------------------------------------------------------
diff --git a/core/sql/cli/Descriptor.h b/core/sql/cli/Descriptor.h
index 5f27d0f..647f99a 100644
--- a/core/sql/cli/Descriptor.h
+++ b/core/sql/cli/Descriptor.h
@@ -129,9 +129,7 @@ private:
// -----------------------------------------------------------------------
// Descriptor
// -----------------------------------------------------------------------
-#pragma warning (disable : 4275) //warning elimination
class Descriptor : public ExGod {
-#pragma warning (default : 4275) //warning elimination
enum Flags
{
/*************************************************************
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/cli/Globals.cpp
----------------------------------------------------------------------
diff --git a/core/sql/cli/Globals.cpp b/core/sql/cli/Globals.cpp
index 8e42254..32cb6b0 100644
--- a/core/sql/cli/Globals.cpp
+++ b/core/sql/cli/Globals.cpp
@@ -719,9 +719,7 @@ Lng32 CliGlobals::setEnvVars(char ** envvars)
for (nEnvs=0; envvars[nEnvs]; nEnvs++);
// one extra to null terminate envvar list
-#pragma nowarn(1506) // warning elimination
Lng32 envvarsLen = (nEnvs + 1) * sizeof(char*);
-#pragma warn(1506) // warning elimination
Int32 count;
for (count=0; count < nEnvs; count++)
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/cli/Globals.h
----------------------------------------------------------------------
diff --git a/core/sql/cli/Globals.h b/core/sql/cli/Globals.h
index 776722b..ca498fa 100644
--- a/core/sql/cli/Globals.h
+++ b/core/sql/cli/Globals.h
@@ -106,7 +106,6 @@ enum ArkcmpFailMode { arkcmpIS_OK_ = FALSE/*no failure*/,
arkcmpWARN_,
arkcmpERROR_ };
-#pragma nowarn(1506) // warning elimination
class CliGlobals : public NAAssertGlobals
{
public:
@@ -587,7 +586,6 @@ private:
LmLanguageManagerJava *langManJava_;
NABoolean espProcess_;
};
-#pragma warn(1506) // warning elimination
// -----------------------------------------------------------------------
// A global method to get a pointer to the CLI globals. The method
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/cli/QuasiFileManager.cpp
----------------------------------------------------------------------
diff --git a/core/sql/cli/QuasiFileManager.cpp b/core/sql/cli/QuasiFileManager.cpp
index b481ede..7e1b8a3 100644
--- a/core/sql/cli/QuasiFileManager.cpp
+++ b/core/sql/cli/QuasiFileManager.cpp
@@ -129,11 +129,7 @@ RETCODE QuasiFileManager::disassocFileNumber(ComDiagsArea &diagsArea,
{
RETCODE rc = SUCCESS; // assume success
-#pragma warning (disable : 4244) //warning elimination
-#pragma nowarn(1506) // warning elimination
short fileNumber = statement->getFileNumber();
-#pragma warn(1506) // warning elimination
-#pragma warning (default : 4244) //warning elimination
if (fileNumber == -1)
{
@@ -208,11 +204,7 @@ RETCODE QuasiFileManager::awaitIox(Lng32 fileNumber,
RETCODE rc = NOT_FINISHED; // show no completions yet
QuasiFile *quasiFile;
-#pragma warning (disable : 4244) //warning elimination
-#pragma nowarn(1506) // warning elimination
quasiFile = getQuasiFile(fileNumber);
-#pragma warn(1506) // warning elimination
-#pragma warning (default : 4244) //warning elimination
if (quasiFile != NULL)
rc = quasiFile->awaitIox(ipcEnv_, tag, feError);
else
@@ -489,7 +481,6 @@ short QfoRevealSegs(CliGlobals *&cliGlobals)
//Code that does SEGMENT_HIDE_ appears in two places
// switchToNonPriv() in cli/CliLayerForNsk.cpp
// QfoHideSegs() in cli/CliLayerForNsk.cpp
-#pragma nowarn(770) // warning elimination
short QfoHideSegs(CliGlobals *cliGlobals)
{
@@ -497,7 +488,6 @@ short QfoHideSegs(CliGlobals *cliGlobals)
return 0;
}
-#pragma warn(770) // warning elimination
SQL_QFO_FUNCTION_ATTRIBUTES short Sql_Qfo_IOComp(short quasi_file_number /*in*/,
Lng32 *tag /*out*/,
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/cli/Statement.cpp
----------------------------------------------------------------------
diff --git a/core/sql/cli/Statement.cpp b/core/sql/cli/Statement.cpp
index cc6044f..2169373 100644
--- a/core/sql/cli/Statement.cpp
+++ b/core/sql/cli/Statement.cpp
@@ -1277,20 +1277,16 @@ NABoolean Statement::isExeDebug(char *src, Lng32 charset)
Int32 Statement::octetLen(char *s, Lng32 charset)
{
-#pragma nowarn(1506) // warning elimination
return charset==SQLCHARSETCODE_UCS2 ?
na_wcslen((const NAWchar*)s) *
CharInfo::maxBytesPerChar((CharInfo::CharSet)charset) : str_len(s);
-#pragma warn(1506) // warning elimination
}
Int32 Statement::octetLenplus1(char *s, Lng32 charset)
{
-#pragma nowarn(1506) // warning elimination
return charset==SQLCHARSETCODE_UCS2 ?
(na_wcslen((const NAWchar*)s)+1)*
CharInfo::maxBytesPerChar((CharInfo::CharSet)charset) : str_len(s)+1;
-#pragma warn(1506) // warning elimination
}
Int32 Statement::sourceLenplus1()
@@ -3001,7 +2997,6 @@ RETCODE Statement::execute(CliGlobals * cliGlobals, Descriptor * input_desc,
// make sure that the table name in the update/del stmt is the
// same as the tablename specified in the cursor.
ex_root_tdb *cursorTdb = currentOfCursorStatement_->getRootTdb();
-#pragma nowarn(1506) // warning elimination
Int16 cursorTableNameLen =
str_len( cursorTdb->getLateNameInfoList()->
getLateNameInfo(cursorTdb->baseTablenamePosition()).
@@ -4602,9 +4597,7 @@ void Statement::copyGenCode(char * gen_code, ULng32 gen_code_len,
}
if ((stmt_type == STATIC_STMT) && (root_tdb))
-#pragma nowarn(1506) // warning elimination
setRecompWarn(root_tdb->recompWarn());
-#pragma warn(1506) // warning elimination
} // if (unpackTDBs)
@@ -4956,9 +4949,7 @@ short Statement::rollbackSavepoint(ComDiagsArea & diagsArea,
if (rollbackSP)
{
-#pragma nowarn(1506) // warning elimination
short retcode = root_tcb->rollbackSavepoint();
-#pragma warn(1506) // warning elimination
if (retcode)
{
diagsArea.mergeAfter(*statementGlobals_->getDiagsArea());
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/cli/StoredProcInterface.cpp
----------------------------------------------------------------------
diff --git a/core/sql/cli/StoredProcInterface.cpp b/core/sql/cli/StoredProcInterface.cpp
index 4e9fe14..a9b6559 100644
--- a/core/sql/cli/StoredProcInterface.cpp
+++ b/core/sql/cli/StoredProcInterface.cpp
@@ -229,9 +229,7 @@ short ExSPPutReplyRow(void * replyBuffer, // IN: the reply buffer
0,
0) == SqlBuffer::MOVE_SUCCESS)
{
-#pragma nowarn(1506) // warning elimination
str_cpy_all(tdesc->getTupleAddress(), replyRow, rowLen);
-#pragma warn(1506) // warning elimination
}
else
{
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/cli/sql_id.cpp
----------------------------------------------------------------------
diff --git a/core/sql/cli/sql_id.cpp b/core/sql/cli/sql_id.cpp
index 4a7e0d4..cf020ec 100644
--- a/core/sql/cli/sql_id.cpp
+++ b/core/sql/cli/sql_id.cpp
@@ -242,9 +242,7 @@ char* getModNameInLocale(const SQLMODULE_ID* m)
if (nameInWchar == 0)
return 0;
-#pragma nowarn(1506) // warning elimination
Int32 wcNameLen = NAWstrlen(nameInWchar);
-#pragma warn(1506) // warning elimination
static char* nameInLocale = new char[MAX_CHAR_SET_STRING_LENGTH+1];
@@ -275,9 +273,7 @@ char* getIdInLocale(SQLCLI_OBJ_ID* x)
if (nameInWchar == 0)
return 0;
-#pragma nowarn(1506) // warning elimination
Int32 wcNameLen = NAWstrlen(nameInWchar);
-#pragma warn(1506) // warning elimination
static char* nameInLocale = new char[MAX_CHAR_SET_STRING_LENGTH+1];
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/comexe/CmpMessage.cpp
----------------------------------------------------------------------
diff --git a/core/sql/comexe/CmpMessage.cpp b/core/sql/comexe/CmpMessage.cpp
index 55bcf42..7ee112b 100644
--- a/core/sql/comexe/CmpMessage.cpp
+++ b/core/sql/comexe/CmpMessage.cpp
@@ -69,9 +69,7 @@ IpcMessageObjSize CmpMessageObj::packIntoBuffer(IpcMessageBufferPtr& buffer,
IpcMessageObjSize result = ::packIntoBuffer(buffer,length);
if (strPtr!=NULL)
-#pragma nowarn(1506) // warning elimination
str_cpy_all((char*)buffer,strPtr,length);
-#pragma warn(1506) // warning elimination
buffer += length;
return result+length;
}
@@ -103,9 +101,7 @@ void CmpMessageObj::unpackBuffer(IpcConstMessageBufferPtr& buffer,
else {
strPtr = new(h) char[length];
assert(strPtr!=NULL);
-#pragma nowarn(1506) // warning elimination
str_cpy_all((char*)strPtr,(char*) buffer,length);
-#pragma warn(1506) // warning elimination
buffer += length;
}
}
@@ -120,9 +116,7 @@ void CmpMessageObj::unpackBuffer(IpcConstMessageBufferPtr& buffer,
assert(length <= maxSize);
if ( length > 0 )
{
-#pragma nowarn(1506) // warning elimination
str_cpy_all((char*)strPtr,(char*) buffer,length);
-#pragma warn(1506) // warning elimination
buffer += length;
}
sizeMoved = length;
@@ -523,9 +517,7 @@ IpcMessageObjSize CmpMessageReply::mypackedLength()
{
IpcMessageObjSize size = CmpMessageReplyBasic::mypackedLength();
size += sizeof(sz_);
-#pragma nowarn(1506) // warning elimination
advanceSize(size,data_,sz_);
-#pragma warn(1506) // warning elimination
return size;
}
@@ -533,9 +525,7 @@ IpcMessageObjSize CmpMessageReply::packMyself(IpcMessageBufferPtr& buffer)
{
IpcMessageObjSize size= CmpMessageReplyBasic::packMyself(buffer);
size += ::packIntoBuffer(buffer,sz_);
-#pragma nowarn(1506) // warning elimination
size += packIntoBuffer(buffer,data_,sz_);
-#pragma warn(1506) // warning elimination
return size;
}
@@ -687,9 +677,7 @@ void CmpMessageRequest::copyToString(char* &dest, CmpMsgBufLenType& sz,
{
sz = sz1 + 1;
dest = new (getHeap()) char[sz];
-#pragma nowarn(1506) // warning elimination
str_cpy_all(dest, source, sz1);
-#pragma warn(1506) // warning elimination
dest[sz1] = 0;
}
else
@@ -705,9 +693,7 @@ IpcMessageObjSize CmpMessageRequest::mypackedLength()
size += sizeof(sz_);
size += sizeof(flags_);
size += sizeof(charSet_);
-#pragma nowarn(1506) // warning elimination
advanceSize(size, data_, sz_);
-#pragma warn(1506) // warning elimination
size += sizeof(parentQidLen_);
size += parentQidLen_;
return size;
@@ -719,9 +705,7 @@ IpcMessageObjSize CmpMessageRequest::packMyself(IpcMessageBufferPtr& buffer)
size += ::packIntoBuffer(buffer, sz_);
size += ::packIntoBuffer(buffer, flags_);
size += ::packIntoBuffer(buffer, charSet_);
-#pragma nowarn(1506) // warning elimination
size += packIntoBuffer(buffer, data_, sz_);
-#pragma warn(1506) // warning elimination
size += ::packIntoBuffer(buffer, parentQidLen_);
if (parentQidLen_ != 0 && parentQid_ != NULL)
size += packStrIntoBuffer(buffer, (char *)parentQid_, parentQidLen_);
@@ -942,21 +926,13 @@ IpcMessageObjSize CmpMessageISPRequest::mypackedLength()
IpcMessageObjSize size = CmpMessageRequest::mypackedLength();
advanceSize(size, procName_);
size += sizeof(inputExprSize_);
-#pragma nowarn(1506) // warning elimination
advanceSize(size,inputExpr_,inputExprSize_);
-#pragma warn(1506) // warning elimination
size += sizeof(outputExprSize_);
-#pragma nowarn(1506) // warning elimination
advanceSize(size,outputExpr_,outputExprSize_);
-#pragma warn(1506) // warning elimination
size += sizeof(keyExprSize_);
-#pragma nowarn(1506) // warning elimination
advanceSize(size,keyExpr_,keyExprSize_);
-#pragma warn(1506) // warning elimination
size += sizeof(inputDataSize_);
-#pragma nowarn(1506) // warning elimination
advanceSize(size,inputData_,inputDataSize_);
-#pragma warn(1506) // warning elimination
size += sizeof(outputRowSize_);
size += sizeof(outputTotalSize_);
@@ -969,21 +945,13 @@ IpcMessageObjSize CmpMessageISPRequest::packMyself(IpcMessageBufferPtr& buffer)
size += packIntoBuffer(buffer, procName_);
size += ::packIntoBuffer(buffer,inputExprSize_);
-#pragma nowarn(1506) // warning elimination
size += packIntoBuffer(buffer, inputExpr_, inputExprSize_);
-#pragma warn(1506) // warning elimination
size += ::packIntoBuffer(buffer,outputExprSize_);
-#pragma nowarn(1506) // warning elimination
size += packIntoBuffer(buffer, outputExpr_, outputExprSize_);
-#pragma warn(1506) // warning elimination
size += ::packIntoBuffer(buffer, keyExprSize_);
-#pragma nowarn(1506) // warning elimination
size += packIntoBuffer(buffer, keyExpr_, keyExprSize_);
-#pragma warn(1506) // warning elimination
size += ::packIntoBuffer(buffer,inputDataSize_);
-#pragma nowarn(1506) // warning elimination
size += packIntoBuffer(buffer, inputData_, inputDataSize_);
-#pragma warn(1506) // warning elimination
size += ::packIntoBuffer(buffer,outputRowSize_);
size += ::packIntoBuffer(buffer,outputTotalSize_);
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/comexe/CmpMessage.h
----------------------------------------------------------------------
diff --git a/core/sql/comexe/CmpMessage.h b/core/sql/comexe/CmpMessage.h
index 5c306f5..3733239 100644
--- a/core/sql/comexe/CmpMessage.h
+++ b/core/sql/comexe/CmpMessage.h
@@ -69,7 +69,6 @@ class FragmentDir;
// -----------------------------------------------------------------------
// The base class for all the executor/compiler messages
// -----------------------------------------------------------------------
-#pragma nowarn(1506) // warning elimination
class CmpMessageObj : public IpcMessageObj
{
public:
@@ -220,7 +219,6 @@ private:
CollHeap* h_;
}; // end of CmpMessageObj
-#pragma warn(1506) // warning elimination
// -----------------------------------------------------------------------
// Basic request objects
@@ -302,7 +300,6 @@ protected:
// Information that is sent to recompile a dynamic or static statement.
// This class is sent as part of the data() field.
// -----------------------------------------------------------------------
-#pragma nowarn(1506) // warning elimination
class CmpCompileInfo
{
public:
@@ -426,7 +423,6 @@ protected:
Lng32 sqlTextCharSet_; // 40-43
char fillerBytes_[FILLERSIZE]; // 44-103
};
-#pragma warn(1506) // warning elimination
class CmpMessageRequest : public CmpMessageRequestBasic
{
@@ -492,7 +488,6 @@ private:
// Basic class for reply to executor
// -----------------------------------------------------------------------
-#pragma nowarn(1506) // warning elimination
class CmpMessageReply : public CmpMessageReplyBasic
{
public:
@@ -560,7 +555,6 @@ private:
// This CollHeap* is used to allocate data_.
CollHeap* outh_;
}; // end of CmpMessageReply
-#pragma warn(1506) // warning elimination
// -----------------------------------------------------------------------
// connection control messages
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/comexe/ComKeyMDAM.h
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComKeyMDAM.h b/core/sql/comexe/ComKeyMDAM.h
index ca51fa8..f43fea0 100644
--- a/core/sql/comexe/ComKeyMDAM.h
+++ b/core/sql/comexe/ComKeyMDAM.h
@@ -55,7 +55,6 @@ typedef NAVersionedObjectPtrTempl<MdamPred> MdamPredPtr;
///////////////////////////////////////////////////////////
// Class MdamPred
///////////////////////////////////////////////////////////
-#pragma nowarn(1506) // warning elimination
class MdamPred : public NAVersionedObject
{
public:
@@ -200,7 +199,6 @@ public:
ex_expr::exp_return_type getValue2(atp_struct* atp0, atp_struct* atp1)
{ return getValue_(value2_, atp0, atp1); }
};
-#pragma warn(1506) // warning elimination
// ---------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/comexe/ComKeyRange.cpp
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComKeyRange.cpp b/core/sql/comexe/ComKeyRange.cpp
index 712de27..05d4905 100644
--- a/core/sql/comexe/ComKeyRange.cpp
+++ b/core/sql/comexe/ComKeyRange.cpp
@@ -74,19 +74,13 @@ char *keyRangeGen::findVTblPtr(short classID)
switch (classID)
{
case KEYSINGLESUBSET:
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblPtr, keySingleSubsetGen);
-#pragma warn(1506) // warning elimination
break;
case KEYMDAM:
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblPtr, keyMdamGen);
-#pragma warn(1506) // warning elimination
break;
default:
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblPtr, keyRangeGen);
-#pragma warn(1506) // warning elimination
break;
}
return vtblPtr;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/comexe/ComResourceInfo.cpp
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComResourceInfo.cpp b/core/sql/comexe/ComResourceInfo.cpp
index c9ad7f0..dbc5a5c 100644
--- a/core/sql/comexe/ComResourceInfo.cpp
+++ b/core/sql/comexe/ComResourceInfo.cpp
@@ -152,7 +152,6 @@ Lng32 ExScratchFileOptions::ipcPackObjIntoMessage(char *buffer) const
return (currPtr - buffer);
}
-#pragma nowarn(770) // warning elimination
void ExScratchFileOptions::ipcUnpackObj(Lng32 objSize,
const char *buffer,
CollHeap *heap,
@@ -175,10 +174,8 @@ void ExScratchFileOptions::ipcUnpackObj(Lng32 objSize,
// allocate one common buffer for the arrays of ExScratchDiskDrive
// structs and for all the names
Lng32 bufferLen =
-#pragma nowarn(1506) // warning elimination
(numSpecifiedDirs_) *
sizeof(ExScratchDiskDrive) + totalNameLength;
-#pragma warn(1506) // warning elimination
if (bufferLen == 0)
{
@@ -233,4 +230,3 @@ void ExScratchFileOptions::ipcUnpackObj(Lng32 objSize,
assert(currPtr-buffer == objSize);
}
-#pragma warn(770) // warning elimination
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/comexe/ComTdb.cpp
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComTdb.cpp b/core/sql/comexe/ComTdb.cpp
index 6677891..2578c46 100644
--- a/core/sql/comexe/ComTdb.cpp
+++ b/core/sql/comexe/ComTdb.cpp
@@ -255,9 +255,7 @@ void ComTdb::displayExpression(Space *space,ULng32 flag)
for (Int32 i = 0; i < numExpressions(); i++)
{
if (getExpressionNode(i))
-#pragma nowarn(1506) // warning elimination
getExpressionNode(i)->displayContents(space, expressionMode_,
-#pragma warn(1506) // warning elimination
(char *)getExpressionName(i),flag);
else
{
@@ -319,153 +317,115 @@ char *ComTdb::findVTblPtrCom(short classID)
case ex_FIRST_N:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbFirstN);
-#pragma warn(1506) // warning elimination
break;
}
case ex_HASH_GRBY:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbHashGrby);
-#pragma warn(1506) // warning elimination
break;
}
case ex_SORT_GRBY:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbSortGrby);
-#pragma warn(1506) // warning elimination
break;
}
case ex_TRANSPOSE:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbTranspose);
-#pragma warn(1506) // warning elimination
break;
}
case ex_UNPACKROWS:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbUnPackRows);
-#pragma warn(1506) // warning elimination
break;
}
case ex_PACKROWS:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbPackRows);
-#pragma warn(1506) // warning elimination
break;
}
case ex_SAMPLE:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbSample);
-#pragma warn(1506) // warning elimination
break;
}
case ex_LEAF_TUPLE:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbTupleLeaf);
-#pragma warn(1506) // warning elimination
break;
}
case ex_NON_LEAF_TUPLE:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbTupleNonLeaf);
-#pragma warn(1506) // warning elimination
break;
}
case ex_COMPOUND_STMT:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbCompoundStmt);
-#pragma warn(1506) // warning elimination
break;
}
case ex_TUPLE:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbTuple);
-#pragma warn(1506) // warning elimination
break;
}
case ex_SEQUENCE_FUNCTION:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbSequence);
-#pragma warn(1506) // warning elimination
break;
}
case ex_CONTROL_QUERY:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbControl);
-#pragma warn(1506) // warning elimination
break;
}
case ex_ROOT:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbRoot);
-#pragma warn(1506) // warning elimination
break;
}
case ex_ONLJ:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbOnlj);
-#pragma warn(1506) // warning elimination
break;
}
case ex_HASHJ:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbHashj);
-#pragma warn(1506) // warning elimination
break;
}
case ex_MJ:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbMj);
-#pragma warn(1506) // warning elimination
break;
}
case ex_UNION:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbUnion);
-#pragma warn(1506) // warning elimination
break;
}
case ex_EXPLAIN:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbExplain);
-#pragma warn(1506) // warning elimination
break;
}
@@ -473,342 +433,256 @@ char *ComTdb::findVTblPtrCom(short classID)
// unused feature, done as part of SQ SQL code cleanup effort
case ex_SEQ:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbSeq);
-#pragma warn(1506) // warning elimination
break;
}
#endif // if 0
case ex_SORT:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbSort);
-#pragma warn(1506) // warning elimination
break;
}
case ex_SPLIT_TOP:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbSplitTop);
-#pragma warn(1506) // warning elimination
break;
}
case ex_SPLIT_BOTTOM:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbSplitBottom);
-#pragma warn(1506) // warning elimination
break;
}
case ex_SEND_TOP:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbSendTop);
-#pragma warn(1506) // warning elimination
break;
}
case ex_SEND_BOTTOM:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbSendBottom);
-#pragma warn(1506) // warning elimination
break;
}
case ex_STATS:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbStats);
-#pragma warn(1506) // warning elimination
break;
}
case ex_STORED_PROC:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbStoredProc);
-#pragma warn(1506) // warning elimination
break;
}
case ex_TUPLE_FLOW:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbTupleFlow);
-#pragma warn(1506) // warning elimination
break;
}
case ex_TRANSACTION:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbTransaction);
-#pragma warn(1506) // warning elimination
break;
}
case ex_DDL:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbDDL);
-#pragma warn(1506) // warning elimination
break;
}
case ex_DDL_WITH_STATUS:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbDDLwithStatus);
-#pragma warn(1506) // warning elimination
break;
}
case ex_DESCRIBE:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbDescribe);
-#pragma warn(1506) // warning elimination
break;
}
case ex_EXE_UTIL:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbExeUtil);
-#pragma warn(1506) // warning elimination
break;
}
case ex_MAINTAIN_OBJECT:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbExeUtilMaintainObject);
-#pragma warn(1506) // warning elimination
break;
}
case ex_LONG_RUNNING:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbExeUtilLongRunning);
-#pragma warn(1506) // warning elimination
break;
}
case ex_DISPLAY_EXPLAIN:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbExeUtilDisplayExplain);
-#pragma warn(1506) // warning elimination
break;
}
case ex_DISPLAY_EXPLAIN_COMPLEX:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbExeUtilDisplayExplainComplex);
-#pragma warn(1506) // warning elimination
break;
}
case ex_LOAD_VOLATILE_TABLE:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbExeUtilLoadVolatileTable);
-#pragma warn(1506) // warning elimination
break;
}
case ex_PROCESS_VOLATILE_TABLE:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbProcessVolatileTable);
-#pragma warn(1506) // warning elimination
break;
}
case ex_CLEANUP_VOLATILE_TABLES:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbExeUtilCleanupVolatileTables);
-#pragma warn(1506) // warning elimination
break;
}
case ex_GET_VOLATILE_INFO:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbExeUtilGetVolatileInfo);
-#pragma warn(1506) // warning elimination
break;
}
case ex_PROCESS_INMEMORY_TABLE:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbProcessInMemoryTable);
-#pragma warn(1506) // warning elimination
break;
}
case ex_CREATE_TABLE_AS:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbExeUtilCreateTableAs);
-#pragma warn(1506) // warning elimination
break;
}
case ex_FAST_DELETE:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbExeUtilFastDelete);
-#pragma warn(1506) // warning elimination
break;
}
case ex_HIVE_TRUNCATE:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbExeUtilHiveTruncate);
-#pragma warn(1506) // warning elimination
break;
}
case ex_GET_STATISTICS:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbExeUtilGetStatistics);
-#pragma warn(1506) // warning elimination
break;
}
case ex_LOB_INFO:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbExeUtilLobInfo);
-#pragma warn(1506) // warning elimination
break;
}
case ex_GET_METADATA_INFO:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbExeUtilGetMetadataInfo);
-#pragma warn(1506) // warning elimination
break;
}
case ex_GET_HIVE_METADATA_INFO:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbExeUtilGetHiveMetadataInfo);
-#pragma warn(1506) // warning elimination
break;
}
case ex_GET_UID:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbExeUtilGetUID);
-#pragma warn(1506) // warning elimination
break;
}
case ex_GET_QID:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbExeUtilGetQID);
-#pragma warn(1506) // warning elimination
break;
}
case ex_POP_IN_MEM_STATS:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbExeUtilPopulateInMemStats);
-#pragma warn(1506) // warning elimination
break;
}
case ex_SET_TIMEOUT:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbTimeout);
-#pragma warn(1506) // warning elimination
break;
}
case ex_FAST_EXTRACT:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbFastExtract);
-#pragma warn(1506) // warning elimination
break;
}
case ex_UDR:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbUdr);
-#pragma warn(1506) // warning elimination
break;
}
case ex_PROBE_CACHE:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbProbeCache);
-#pragma warn(1506) // warning elimination
break;
}
case ex_CANCEL:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbCancel);
-#pragma warn(1506) // warning elimination
break;
}
case ex_SHOW_SET:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbExeUtilShowSet);
-#pragma warn(1506) // warning elimination
break;
}
case ex_AQR:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbExeUtilAQR);
-#pragma warn(1506) // warning elimination
break;
}
case ex_GET_ERROR_INFO:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbExeUtilGetErrorInfo);
-#pragma warn(1506) // warning elimination
break;
}
case ex_HDFS_SCAN:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbHdfsScan);
-#pragma warn(1506) // warning elimination
}
break;
case ex_HIVE_MD_ACCESS:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbExeUtilHiveMDaccess);
-#pragma warn(1506) // warning elimination
}
break;
@@ -826,9 +700,7 @@ char *ComTdb::findVTblPtrCom(short classID)
case ex_ARQ_WNR_INSERT:
{
-#pragma nowarn(1506) // warning elimination
GetVTblPtr(vtblptr,ComTdbExeUtilAqrWnrInsert);
-#pragma warn(1506) // warning elimination
break;
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/comexe/ComTdb.h
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComTdb.h b/core/sql/comexe/ComTdb.h
index 8f561f8..62b7550 100644
--- a/core/sql/comexe/ComTdb.h
+++ b/core/sql/comexe/ComTdb.h
@@ -178,7 +178,6 @@ private:
// -----------------------------------------------------------------------
// ComTdb
// -----------------------------------------------------------------------
-#pragma nowarn(1506) // warning elimination
class ComTdb : public NAVersionedObject
{
// ---------------------------------------------------------------------
@@ -778,7 +777,6 @@ protected:
// ---------------------------------------------------------------------
char fillersComTdb_[34]; // 94-127
};
-#pragma warn(1506) // warning elimination
class ComTdbVirtTableBase
{
[02/12] incubator-trafodion git commit: TRAFODION-2731 CodeCleanup:
Phase 4. Remove legacy/obsolete pragmas
Posted by an...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/parser/ParKeyWords.cpp
----------------------------------------------------------------------
diff --git a/core/sql/parser/ParKeyWords.cpp b/core/sql/parser/ParKeyWords.cpp
index e0a2f28..2186dd4 100644
--- a/core/sql/parser/ParKeyWords.cpp
+++ b/core/sql/parser/ParKeyWords.cpp
@@ -1440,9 +1440,7 @@ NABoolean normalizeKeyWord(NAWchar *wWord, char *word, UInt32 size)
// Upper case all words since all the words in the keyword table
// are also uppercase.
//
-#pragma nowarn(1506) // warning elimination
word[i] = TOUPPER(word[i]);
-#pragma warn(1506) // warning elimination
i++;
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/parser/ParKeyWords.h
----------------------------------------------------------------------
diff --git a/core/sql/parser/ParKeyWords.h b/core/sql/parser/ParKeyWords.h
index 33d606f..aa7e43d 100644
--- a/core/sql/parser/ParKeyWords.h
+++ b/core/sql/parser/ParKeyWords.h
@@ -104,7 +104,6 @@ enum {
// ParKeyWord : A description of a key word.
//
// ***********************************************************************
-#pragma nowarn(1506) // warning elimination
class ParKeyWord : public NABasicObject
{
public:
@@ -187,7 +186,6 @@ private:
//
UInt32 flags_;
};
-#pragma warn(1506) // warning elimination
// ***********************************************************************
//
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/parser/ParNameLocList.cpp
----------------------------------------------------------------------
diff --git a/core/sql/parser/ParNameLocList.cpp b/core/sql/parser/ParNameLocList.cpp
index c0e5e58..d9c9ada 100644
--- a/core/sql/parser/ParNameLocList.cpp
+++ b/core/sql/parser/ParNameLocList.cpp
@@ -419,15 +419,11 @@ void ParSetEndOfOptionalColumnListPos(ParNameLocList * pNameLocList)
tokStr.toUpper();
ComASSERT(tokStr EQU ")");
// Store position of ')' in global variable
-#pragma nowarn(1506) // warning elimination
ParEndOfOptionalColumnListPos = MVTokInfo.tokenStrPos;
-#pragma warn(1506) // warning elimination
return;
}
// Store position of ')' in global variable
-#pragma nowarn(1506) // warning elimination
ParEndOfOptionalColumnListPos = tokInfo.tokenStrPos;
-#pragma warn(1506) // warning elimination
}
// ---------------------------------------------------------------------
@@ -448,9 +444,7 @@ void ParSetBeginingOfFileOptionsListPos(ParNameLocList * pNameLocList)
tokStr.toUpper();
// Store current position in global variable
-#pragma nowarn(1506) // warning elimination
ParBeginingOfFileOptionsListPos = tokInfo.tokenStrPos;
-#pragma warn(1506) // warning elimination
NAString rewriteStr = NAString("REWRITE");
@@ -483,9 +477,7 @@ void ParSetBeginOfMVQueryPos(ParNameLocList * pNameLocList)
ComASSERT("AS" == tokStr);
-#pragma nowarn(1506) // warning elimination
Int32 nextWhiteSpacePos = tokInfo.tokenStrPos + sizeof("AS") - 1;
-#pragma warn(1506) // warning elimination
NAString space(&pInputStr[nextWhiteSpacePos], 1);
@@ -527,9 +519,7 @@ void ParSetEndOfSelectColumnListPos(ParNameLocList * pNameLocList)
if (IsNAStringSpace(tokStr))
{
// Store position in the global variable
-#pragma nowarn(1506) // warning elimination
ParEndOfSelectColumnListPos = MVTokInfo.tokenStrPos;
-#pragma warn(1506) // warning elimination
}
else
{ // Special cases:
@@ -537,9 +527,7 @@ void ParSetEndOfSelectColumnListPos(ParNameLocList * pNameLocList)
// Ex #2: CREATE MV ... AS SELECT COUNT(*)FROM ...
// Store position in the global variable
-#pragma nowarn(1506) // warning elimination
ParEndOfSelectColumnListPos = tokInfo.tokenStrPos;
-#pragma warn(1506) // warning elimination
}
}
@@ -560,9 +548,7 @@ void ParSetEndOfFileOptionsListPos(ParNameLocList * pNameLocList)
// ComASSERT(tokStr EQU "AS");
// Store the current (end) position in the global variable
-#pragma nowarn(1506) // warning elimination
ParEndOfFileOptionsListPos = tokInfo.tokenStrPos;
-#pragma warn(1506) // warning elimination
ComASSERT( ParEndOfFileOptionsListPos > ParBeginingOfFileOptionsListPos );
ComASSERT( ParBeginingOfFileOptionsListPos > 0 );
@@ -735,9 +721,7 @@ void ParSetBeginOfCreateTableAsQueryPos(ParNameLocList * pNameLocList)
ComASSERT("AS" == tokStr);
-#pragma nowarn(1506) // warning elimination
Int32 nextWhiteSpacePos = tokInfo.tokenStrPos + sizeof("AS") - 1;
-#pragma warn(1506) // warning elimination
NAString space(&pInputStr[nextWhiteSpacePos], 1);
@@ -770,9 +754,7 @@ void ParSetBeginOfCreateTableAsAttrList(ParNameLocList * pNameLocList)
Int32 nextPos = 0;
if (")" == tokStr)
{
-#pragma nowarn(1506) // warning elimination
nextPos = tokInfo.tokenStrPos + sizeof(")") - 1;
-#pragma warn(1506) // warning elimination
}
else
nextPos = tokInfo.tokenStrPos;
@@ -804,15 +786,11 @@ void ParSetEndOfCreateTableAsAttrList(ParNameLocList * pNameLocList)
Int32 nextPos = 0;
/* if ("NO" == tokStr)
{
-#pragma nowarn(1506) // warning elimination
nextPos = tokInfo.tokenStrPos + sizeof("NO") - 1;
-#pragma warn(1506) // warning elimination
}
else if ("LOAD" == tokStr)
{
-#pragma nowarn(1506) // warning elimination
nextPos = tokInfo.tokenStrPos + sizeof("LOAD") - 1;
-#pragma warn(1506) // warning elimination
}
else*/
nextPos = tokInfo.tokenStrPos;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/parser/SqlParserAux.cpp
----------------------------------------------------------------------
diff --git a/core/sql/parser/SqlParserAux.cpp b/core/sql/parser/SqlParserAux.cpp
index ff62d2d..43db45a 100644
--- a/core/sql/parser/SqlParserAux.cpp
+++ b/core/sql/parser/SqlParserAux.cpp
@@ -150,12 +150,10 @@ void yyerror(const char *errtext)
if (tok.tokenStrLen)
{
NAString *ti = unicodeToChar
-#pragma nowarn(1506) // warning elimination
(&inputStr[tok.tokenStrPos], tok.tokenStrLen,
CharInfo::UTF8
,
PARSERHEAP(), TRUE);
-#pragma warn(1506) // warning elimination
cerr << "<" << (ti ? ti->data() : "") << "> ";
delete ti;
}
@@ -165,12 +163,10 @@ void yyerror(const char *errtext)
}
}
NAString *stmt = unicodeToChar
-#pragma nowarn(1506) // warning elimination
(inputStr, NAWstrlen(inputStr),
CharInfo::UTF8
,
PARSERHEAP(), TRUE);
-#pragma warn(1506) // warning elimination
cerr << " " << (stmt ? stmt->data() : "") << endl;
delete stmt;
}
@@ -319,9 +315,7 @@ void MarkInteriorNodesAsInCompoundStmt(RelExpr *node)
NAWString* localeMBStringToUnicode(NAString* localeString, Lng32 charset, CollHeap *heap)
{
-#pragma nowarn(1506) // warning elimination
charBuf cbuf((unsigned char*)(localeString->data()), localeString->length());
-#pragma warn(1506) // warning elimination
NAWcharBuf* wcbuf = 0;
Int32 errorcode = 0;
switch (charset) {
@@ -614,7 +608,6 @@ NAString * getSqlStmtStr(CharInfo::CharSet & refparam_targetCharSet, CollHeap *
if (NAWstrncmp(temp, WIDE_("DISPLAY"), 7) == 0)
start_pos = 7;
}
-#pragma nowarn(1506) // warning elimination
// SqlParser_CurrentParser->charset_ is the encoding charset of the
// sql stmt under parsing now. Target is the charset that the stmt
@@ -629,7 +622,6 @@ NAString * getSqlStmtStr(CharInfo::CharSet & refparam_targetCharSet, CollHeap *
, heap
);
ParScannedInputCharset = CharInfo::UTF8;
-#pragma warn(1506) // warning elimination
return stmt;
}
@@ -747,9 +739,7 @@ NABoolean literalToNumber(NAString *strptr, char sign, NAString *cvtstr,
}
if (strSize < 5) {
-#pragma nowarn(1506) // warning elimination
shortVal = atoi(*cvtstr);
-#pragma warn(1506) // warning elimination
} else if (strSize < 10) {
longVal = atol(*cvtstr);
} else if (strSize < 19) {
@@ -770,21 +760,15 @@ NABoolean literalToNumber(NAString *strptr, char sign, NAString *cvtstr,
// aware that atoInt64(LLONG_MAX) even with overflow checking can
// kill mxcmp with a signal 31!
// Prepare BCD representation of number
-#pragma nowarn(1506) // warning elimination
Lng32 largestrSize = strSize + 1; // extra byte for sign
-#pragma warn(1506) // warning elimination
char *largestr = new (PARSERHEAP()) char[largestrSize];
largestr[0] = sign;
size_t j = (sign == '+') ? 0 : 1;
for (size_t i = 0; i < strSize; i++) // strSize, not largestrSize
-#pragma nowarn(1506) // warning elimination
largestr[i+1] = (*cvtstr)[i+j] - '0';
-#pragma warn(1506) // warning elimination
// Convert BCD to Big Num representation
-#pragma nowarn(1506) // warning elimination
bigNumSize = BigNumHelper::ConvPrecisionToStorageLengthHelper(strSize);
-#pragma warn(1506) // warning elimination
*bigNum = new (PARSERHEAP()) char[bigNumSize];
BigNumHelper::ConvBcdToBigNumWithSignHelper(largestrSize,
bigNumSize,
@@ -933,21 +917,15 @@ ItemExpr *literalOfNumericPassingScale(NAString *strptr, char sign,
// aware that atoInt64(LLONG_MAX) even with overflow checking can
// kill mxcmp with a signal 31!
// Prepare BCD representation of number
-#pragma nowarn(1506) // warning elimination
Lng32 largestrSize = strSize + 1; // extra byte for sign
-#pragma warn(1506) // warning elimination
char *largestr = new (PARSERHEAP()) char[largestrSize];
largestr[0] = sign;
size_t j = (sign == '+') ? 0 : 1;
for (size_t i = 0; i < strSize; i++) // strSize, not largestrSize
-#pragma nowarn(1506) // warning elimination
largestr[i+1] = (*cvtstr)[i+j] - '0';
-#pragma warn(1506) // warning elimination
// Convert BCD to Big Num representation
-#pragma nowarn(1506) // warning elimination
Lng32 bigNumSize = BigNumHelper::ConvPrecisionToStorageLengthHelper(strSize);
-#pragma warn(1506) // warning elimination
char *bigNumData = new (PARSERHEAP()) char[bigNumSize];
BigNumHelper::ConvBcdToBigNumWithSignHelper(largestrSize,
bigNumSize,
@@ -955,7 +933,6 @@ ItemExpr *literalOfNumericPassingScale(NAString *strptr, char sign,
bigNumData);
returnValue = new (PARSERHEAP()) ConstValue
-#pragma nowarn(1506) // warning elimination
(new (PARSERHEAP()) SQLBigNum(PARSERHEAP(), strSize,
scale,
TRUE,
@@ -964,7 +941,6 @@ ItemExpr *literalOfNumericPassingScale(NAString *strptr, char sign,
(void *) bigNumData,
bigNumSize,
strptr);
-#pragma warn(1506) // warning elimination
NADELETEBASIC(largestr, (PARSERHEAP()));
NADELETEBASIC(bigNumData, (PARSERHEAP()));
} else { // precision >= FLT_MAX_10_EXP in a user-specified literal
@@ -1876,9 +1852,7 @@ NABoolean transformIdentifier(NAString& delimIdent,
void PicStream::skipPicture()
{
NAString theIdentifier;
-#pragma nowarn(1506) // warning elimination
while (isalpha(sgetc())) theIdentifier.append(toupper(sbumpc()));
-#pragma warn(1506) // warning elimination
skipWhite();
NAString string1 = "PIC";
NAString string2 = "PICTURE";
@@ -1918,9 +1892,7 @@ NABoolean PicStream::skipCount (UInt32*result, const char pattern, NABoolean isC
} while (isdigit(sgetc()));
skipWhite();
-#pragma nowarn(1506) // warning elimination
char ch = sbumpc();
-#pragma warn(1506) // warning elimination
if ( isCharType == TRUE && ( ch=='C' || ch=='c' ) ) {
@@ -1931,9 +1903,7 @@ NABoolean PicStream::skipCount (UInt32*result, const char pattern, NABoolean isC
assert(n == 9 && strcasecmp(len_unit_array, "CHARACTERS") == 0);
skipWhite();
-#pragma nowarn(1506) // warning elimination
ch = sbumpc();
-#pragma warn(1506) // warning elimination
}
assert(ch==')');
@@ -2060,9 +2030,7 @@ NAType *picNAType(const NABoolean isString,
break;
case STYLE_UPSHIFT:
returnValue = new (PARSERHEAP())
-#pragma nowarn(1506) // warning elimination
SQLChar(PARSERHEAP(), precision,TRUE,TRUE,isCaseinsensitive,FALSE,charset,collation,coerc);
-#pragma warn(1506) // warning elimination
assert(returnValue);
break;
case STYLE_LEADING_SIGN:
@@ -2099,9 +2067,7 @@ NAType *picNAType(const NABoolean isString,
}
else
returnValue = new (PARSERHEAP())
-#pragma nowarn(1506) // warning elimination
SQLDecimal(PARSERHEAP(), precision,scale,hasSign);
-#pragma warn(1506) // warning elimination
assert(returnValue);
break;
case STYLE_UPSHIFT:
@@ -2122,9 +2088,7 @@ NAType *picNAType(const NABoolean isString,
else {
const Int16 DisAmbiguate = 0; // added for 64bit project
returnValue = new (PARSERHEAP())
-#pragma nowarn(1506) // warning elimination
SQLNumeric(PARSERHEAP(), hasSign, precision, scale, DisAmbiguate);
-#pragma warn(1506) // warning elimination
assert(returnValue);
}
break;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/parser/StmtNode.h
----------------------------------------------------------------------
diff --git a/core/sql/parser/StmtNode.h b/core/sql/parser/StmtNode.h
index 742b3f1..c4f258a 100644
--- a/core/sql/parser/StmtNode.h
+++ b/core/sql/parser/StmtNode.h
@@ -266,7 +266,6 @@ public:
{};
};
-#pragma nowarn(1319) // warning elimination
class StmtModule : public StmtNode
{
public:
@@ -304,8 +303,6 @@ private:
QualifiedName name_;
NAString charSet_;
};
-#pragma warn(1319) // warning elimination
-
class StmtSourceFile : public StmtNode
{
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/parser/sqlparser.y
----------------------------------------------------------------------
diff --git a/core/sql/parser/sqlparser.y b/core/sql/parser/sqlparser.y
index 2d3265d..d8e85b0 100755
--- a/core/sql/parser/sqlparser.y
+++ b/core/sql/parser/sqlparser.y
@@ -99,8 +99,6 @@
YYERROR; \
}
-#pragma warning (disable : 4065)//don't complain about empty switch statements
-
#define INCLUDE_UNION
# include <alloca.h>
#include "ComCextdecs.h"
@@ -183,9 +181,6 @@ using namespace std;
#include "ExpLOBenums.h"
-#pragma warning (disable : 4065)//don't complain about empty switch statements.
-
-
//!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
// The SQL parser auxiliary methods that used to be here had to be moved
// to SqlParserAux.{h,cpp} to work around a c89 (v2.1) internal limit that
@@ -336,7 +331,6 @@ static void enableMakeQuotedStringISO88591Mechanism()
// makeQuotedStringISO88591 = makeQuotedStringISO88591CurrentValue;
// }
-#pragma nowarn(1506) // warning elimination
%}
%define api.pure full
@@ -3014,7 +3008,6 @@ enableCharsetInferenceInColDefaultVal :
/* type item */
numeric_literal_exact : NUMERIC_LITERAL_EXACT_NO_SCALE
{
-#pragma warn(1506) // warning elimination (goes with the nowarn above. do not remove.
$$ = literalOfNumericNoScale($1);
if (! $$) YYERROR;
SqlParser_CurrentParser->collectItem4HQC($$);
@@ -3185,9 +3178,7 @@ literal : numeric_literal
| TOK_INTERVAL disableCharsetInference sign QUOTED_STRING interval_qualifier
{
// DEFAULT_CHARSET has no effect on QUOTED_STRING in this context
-#pragma nowarn(1506) // warning elimination
$$ = literalOfInterval($4, $5, $3);
-#pragma warn(1506) // warning elimination
if (! $$) YYERROR;
SqlParser_CurrentParser->collectItem4HQC($$);
restoreInferCharsetState();
@@ -3204,9 +3195,7 @@ literal : numeric_literal
| '{' TOK_INTERVAL disableCharsetInference sign QUOTED_STRING interval_qualifier '}'
{
// DEFAULT_CHARSET has no effect on QUOTED_STRING in this context
-#pragma nowarn(1506) // warning elimination
$$ = literalOfInterval($5, $6, $4);
-#pragma warn(1506) // warning elimination
if (! $$) YYERROR;
SqlParser_CurrentParser->collectItem4HQC($$);
restoreInferCharsetState();
@@ -3336,7 +3325,6 @@ character_literal_notcasespecific_option : '(' TOK_NOT_CASESPECIFIC ')'
literal_negatable : literal
| sign NUMERIC_LITERAL_EXACT_NO_SCALE
{
-#pragma nowarn(1506) // warning elimination
$$ = literalOfNumericNoScale($2, $1);
if (! $$) YYERROR;
SqlParser_CurrentParser->collectItem4HQC($$);
@@ -3369,7 +3357,6 @@ literal_negatable : literal
if (! $$) YYERROR;
SqlParser_CurrentParser->collectItem4HQC($$);
restoreInferCharsetState();
-#pragma warn(1506) // warning elimination
}
/* type stringval */
@@ -6222,14 +6209,12 @@ rowset_input_host_variable_list : rowset_input_host_variable
/* type item */
rowset_size: unsigned_integer
{
-#pragma nowarn(1506) // warning elimination
$$ = new (PARSERHEAP()) ConstValue($1);
}
| simple_host_variable
{
TheHostVarRoles->setLastUnassignedTo(HV_IS_INPUT);
$$ = $1;
-#pragma warn(1506) // warning elimination
}
| dynamic_parameter
@@ -10831,7 +10816,6 @@ predefined_type : date_time_type
/* type na_type */
rowset_type : TOK_ROWSET unsigned_integer predefined_type
{
-#pragma nowarn(1506) // warning elimination
$$ = new (PARSERHEAP()) SQLRowset(PARSERHEAP(), $3, $2, $2);
}
| TOK_ROWSET unsigned_integer float_type
@@ -10847,7 +10831,6 @@ proc_arg_rowset_type : TOK_ROWSET unsigned_integer predefined_type
| TOK_ROWSET unsigned_integer proc_arg_float_type
{
$$ = new (PARSERHEAP()) SQLRowset(PARSERHEAP(), $3, $2, $2);
-#pragma warn(1506) // warning elimination
}
/* type na_type */
@@ -10925,7 +10908,6 @@ numeric_type_token : TOK_NUMERIC
/* na type for the numeric */
non_int_type : numeric_type_token left_uint_uint_right signed_option
{
-#pragma nowarn(1506) // warning elimination
if (! ($2->left() > 0 )) {
// Precision must be > 0.
@@ -11004,7 +10986,6 @@ non_int_type : numeric_type_token left_uint_uint_right signed_option
}
| TOK_LSDECIMAL left_uint_uint_right signed_option
{
-#pragma nowarn(1506) // warning elimination
if ($2->left() > 18) {
// Precision of a Decimal, " << $2->left()
// may not exceed 18.
@@ -11039,7 +11020,6 @@ non_int_type : numeric_type_token left_uint_uint_right signed_option
$$ = new (PARSERHEAP())
LSDecimal(PARSERHEAP(), $2->left(), $2->right(), $3);
delete $2;
-#pragma warn(1506) // warning elimination
}
| TOK_LSDECIMAL signed_option
{
@@ -11048,7 +11028,6 @@ non_int_type : numeric_type_token left_uint_uint_right signed_option
}
| TOK_DECIMAL left_uint_uint_right signed_option
{
-#pragma nowarn(1506) // warning elimination
if ($2->left() > 18) {
// Precision of a Decimal, " << $2->left()
// may not exceed 18.
@@ -11083,7 +11062,6 @@ non_int_type : numeric_type_token left_uint_uint_right signed_option
$$ = new (PARSERHEAP())
SQLDecimal(PARSERHEAP(), $2->left(), $2->right(), $3);
delete $2;
-#pragma warn(1506) // warning elimination
}
| TOK_DECIMAL signed_option
{
@@ -11127,9 +11105,7 @@ proc_arg_float_type : TOK_FLOAT_IEEE
}
| TOK_FLOAT_IEEE left_unsigned_right
{
-#pragma nowarn(1506) // warning elimination
$$ = new (PARSERHEAP()) SQLDoublePrecision(PARSERHEAP(), TRUE, $2);
-#pragma warn(1506) // warning elimination
if (! ((SQLDoublePrecision *)$$)->checkValid(SqlParser_Diags))
YYERROR;
}
@@ -11147,9 +11123,7 @@ proc_arg_float_type : TOK_FLOAT_IEEE
}
| TOK_FLOAT left_unsigned_right
{
-#pragma nowarn(1506) // warning elimination
$$ = new (PARSERHEAP()) SQLDoublePrecision(PARSERHEAP(), TRUE, $2);
-#pragma warn(1506) // warning elimination
if (! ((SQLDoublePrecision *)$$)->checkValid(SqlParser_Diags))
YYERROR;
}
@@ -11189,9 +11163,7 @@ pic_type : TOK_PICTURE char_set collation_option pic_tail pic_notcasespecific_op
*/
if (! (precision > 0 )) {
// Precision must be > 0.
-#pragma nowarn(1506) // warning elimination
*SqlParser_Diags << DgSqlCode(-3003) << DgInt0(precision);
-#pragma warn(1506) // warning elimination
yyerror("");
YYABORT;
}
@@ -11207,12 +11179,10 @@ pic_type : TOK_PICTURE char_set collation_option pic_tail pic_notcasespecific_op
(NOT hasSign))
{
// $1~int0, cannot exceed 9.
-#pragma nowarn(1506) // warning elimination
*SqlParser_Diags << DgSqlCode(-3008)
<< DgString0("DECIMAL")
<< DgInt0(precision)
<< DgInt1(9);
-#pragma warn(1506) // warning elimination
yyerror("");
YYABORT;
}
@@ -11303,21 +11273,17 @@ string_type : tok_char_or_character_or_byte new_optional_left_charlen_right char
((SQLChar *)$$)->generateTextThenSetDisplayDataType ( eCharSet , ddt );
}
else // keep the old behavior
-#pragma nowarn(1506) // warning elimination
$$ = new (PARSERHEAP()) SQLChar
(PARSERHEAP(), specifiedLength, TRUE, $5, $6, FALSE,
eCharSet, $4.collation_, $4.coercibility_);
-#pragma warn(1506) // warning elimination
if (checkError3179($$)) YYERROR;
}
| TOK_ANSIVARCHAR left_charlen_right char_set collation_option upshift_flag notcasespecific_option
{
-#pragma nowarn(1506) // warning elimination
$$ = new (PARSERHEAP()) ANSIChar
(PARSERHEAP(), $2, TRUE, $5, TRUE,
$3, $4.collation_, $4.coercibility_);
-#pragma warn(1506) // warning elimination
if (checkError3179($$)) YYERROR;
}
| tok_char_or_character_or_byte TOK_VARYING toggled_optional_left_charlen_right char_set
@@ -11370,11 +11336,9 @@ string_type : tok_char_or_character_or_byte new_optional_left_charlen_right char
((SQLVarChar *)$$)->generateTextThenSetDisplayDataType ( eCharSet , ddt );
}
else // keep the old behavior
-#pragma nowarn(1506) // warning elimination
$$ = new (PARSERHEAP()) SQLVarChar
(PARSERHEAP(), specifiedLength, TRUE, $6, $7,
eCharSet, $5.collation_, $5.coercibility_);
-#pragma warn(1506) // warning elimination
if (checkError3179($$)) YYERROR;
}
@@ -11419,11 +11383,9 @@ string_type : tok_char_or_character_or_byte new_optional_left_charlen_right char
((SQLVarChar *)$$)->generateTextThenSetDisplayDataType ( eEncodingCharSet , ddt );
}
else // keep the old behavior
-#pragma nowarn(1506) // warning elimination
$$ = new (PARSERHEAP()) SQLVarChar
(PARSERHEAP(), specifiedLength, TRUE, $5, $6,
eCharSet, $4.collation_, $4.coercibility_);
-#pragma warn(1506) // warning elimination
if (checkError3179($$)) YYERROR;
}
@@ -11481,14 +11443,12 @@ string_type : tok_char_or_character_or_byte new_optional_left_charlen_right char
ParAuxCharLenSpec::ECharLenUnit parCLU = $3/*new_left_charlen_right*/->getCharLenUnit();
Int32 maxSize = getDefaultMaxLengthForLongVarChar(eCharSet);
-#pragma warning (disable : 4018) //warning elimination
if (maxLenInBytes > maxSize) {
*SqlParser_Diags << DgSqlCode(-3213) << DgInt0(maxSize);
YYABORT;
}
Int32 minSize = getDefaultMinLengthForLongVarChar(eCharSet);
if (maxLenInBytes < minSize) {
-#pragma warning (default : 4018) //warning elimination
*SqlParser_Diags << DgSqlCode(-3214) << DgInt0(minSize);
YYABORT;
}
@@ -11522,7 +11482,6 @@ string_type : tok_char_or_character_or_byte new_optional_left_charlen_right char
((CharType *)$$)->generateTextThenSetDisplayDataType ( eEncodingCharSet , ddt );
}
else // keep the old behavior
-#pragma nowarn(1506) // warning elimination
// KLUDGE begin: fix cases 10-040511-5169, 10-040610-2860,
// soln 10-040610-6863 by temporarily mapping
// "create table t(c long varchar, w longwvarchar)" into
@@ -11530,50 +11489,41 @@ string_type : tok_char_or_character_or_byte new_optional_left_charlen_right char
$$ = new (PARSERHEAP()) SQLVarChar
(PARSERHEAP(), maxLenInBytes, TRUE, $6, $7, eCharSet, $5.collation_, $5.coercibility_);
// end KLUDGE.
-#pragma warn(1506) // warning elimination
if (checkError3179($$)) YYERROR;
}
| nchar optional_left_charlen_right collation_option upshift_flag notcasespecific_option
{
-#pragma nowarn(1506) // warning elimination
$$ = new (PARSERHEAP()) SQLChar
(PARSERHEAP(), $2, TRUE, $4, $5, FALSE,
SqlParser_NATIONAL_CHARSET,
$3.collation_, $3.coercibility_);
-#pragma warn(1506) // warning elimination
if (checkError3179($$)) YYERROR;
}
| nchar_varying left_charlen_right collation_option upshift_flag notcasespecific_option
{
-#pragma nowarn(1506) // warning elimination
$$ = new (PARSERHEAP()) SQLVarChar
(PARSERHEAP(), $2, TRUE, $4, $5,
SqlParser_NATIONAL_CHARSET,
$3.collation_, $3.coercibility_);
-#pragma warn(1506) // warning elimination
if (checkError3179($$)) YYERROR;
}
| TOK_WCHAR left_unsigned_right collation_option upshift_flag notcasespecific_option
{
// odbc SQL_WCHAR is WCHAR(n): Unicode character string
// of fixed string length n.
-#pragma nowarn(1506) // warning elimination
$$ = new (PARSERHEAP()) SQLChar
(PARSERHEAP(), $2, TRUE, $4, $5, FALSE, CharInfo::UNICODE,
$3.collation_, $3.coercibility_);
-#pragma warn(1506) // warning elimination
if (checkError3179($$)) YYERROR;
}
| TOK_VARWCHAR left_unsigned_right collation_option upshift_flag notcasespecific_option
{
// odbc SQL_WVARCHAR is VARWCHAR(n): Unicode variable-length
// character string with a maximum string length n.
-#pragma nowarn(1506) // warning elimination
$$ = new (PARSERHEAP()) SQLVarChar
(PARSERHEAP(), $2, TRUE, $4, $5, CharInfo::UNICODE,
$3.collation_, $3.coercibility_);
-#pragma warn(1506) // warning elimination
if (checkError3179($$)) YYERROR;
}
| TOK_LONGWVARCHAR collation_option upshift_flag notcasespecific_option
@@ -11591,7 +11541,6 @@ string_type : tok_char_or_character_or_byte new_optional_left_charlen_right char
{
Lng32 maxSize = getDefaultMaxLengthForLongVarChar(CharInfo::UNICODE);
-#pragma warning (disable : 4018) //warning elimination
if ($2 > maxSize) {
*SqlParser_Diags << DgSqlCode(-3209) << DgInt0(maxSize);
YYABORT;
@@ -11599,32 +11548,25 @@ string_type : tok_char_or_character_or_byte new_optional_left_charlen_right char
Lng32 minSize = getDefaultMinLengthForLongVarChar(CharInfo::UNICODE);
if ($2 < minSize) {
-#pragma warning (default : 4018) //warning elimination
*SqlParser_Diags << DgSqlCode(-3210) << DgInt0(minSize);
YYABORT;
}
-#pragma nowarn(1506) // warning elimination
$$ = new (PARSERHEAP()) SQLLongVarChar
(PARSERHEAP(), $2, TRUE, TRUE, $4, $5, CharInfo::UNICODE,
$3.collation_, $3.coercibility_);
-#pragma warn(1506) // warning elimination
if (checkError3179($$)) YYERROR;
}
| TOK_BINARY left_unsigned_right
{
// odbc SQL_BINARY is BINARY(n). Binary data of fixed length n.
-#pragma nowarn(1506) // warning elimination
$$ = new (PARSERHEAP()) SQLChar(PARSERHEAP(), $2, TRUE, FALSE, FALSE);
-#pragma warn(1506) // warning elimination
if (checkError3179($$)) YYERROR;
}
| TOK_VARBINARY left_unsigned_right
{
// odbc SQL_VARBINARY is VARBINARY(n). Variable length binary data
// of maximum length n. The maximum length is set by the user.
-#pragma nowarn(1506) // warning elimination
$$ = new (PARSERHEAP()) SQLVarChar(PARSERHEAP(), $2);
-#pragma warn(1506) // warning elimination
if (checkError3179($$)) YYERROR;
}
| TOK_LONG TOK_VARBINARY
@@ -11637,25 +11579,21 @@ string_type : tok_char_or_character_or_byte new_optional_left_charlen_right char
| TOK_LONG TOK_VARBINARY left_unsigned_right
{
Lng32 maxSize = getDefaultMaxLengthForLongVarChar(CharInfo::ISO88591);
-#pragma warning (disable : 4018) //warning elimination
if ($3 > maxSize) {
*SqlParser_Diags << DgSqlCode(-3211) << DgInt0(maxSize);
YYABORT;
}
Lng32 minSize = getDefaultMinLengthForLongVarChar(CharInfo::ISO88591);
if ($3 < minSize) {
-#pragma warning (default : 4018) //warning elimination
*SqlParser_Diags << DgSqlCode(-3212) << DgInt0(minSize);
YYABORT;
}
-#pragma nowarn(1506) // warning elimination
// KLUDGE begin: fix cases 10-040511-5169, 10-040610-2860,
// soln 10-040610-6863 by temporarily mapping
// "create table t(b long varbinary(n))" into
// "create table t(b varchar(n))".
$$ = new (PARSERHEAP()) SQLVarChar(PARSERHEAP(), $3);
// end KLUDGE.
-#pragma warn(1506) // warning elimination
if (checkError3179($$)) YYERROR;
}
@@ -18528,10 +18466,8 @@ routine_invocation: routine_name '(' routine_arg_list ')'
// Error
NAString errName;
errName.append($1->extract (0)->data ());
-#pragma warning (disable : 4018) //warning elimination
for (Int32 i=1; i < $1->numParts (); i++)
{
-#pragma warning (default : 4018) //warning elimination
errName.append (".");
errName.append ($1->extract (i)->data ());
}
@@ -22052,9 +21988,7 @@ query_shape_control : shape_identifier
{
$$ = new (PARSERHEAP()) ScanForceWildCard();
NABoolean dummyNegate = FALSE;
-#pragma nowarn(1506) // warning elimination
Int32 numColumns = $4->entries();
-#pragma warn(1506) // warning elimination
ItemExpr *itm;
ScanForceWildCard::scanOptionEnum* columnAlgorithms
@@ -26464,11 +26398,9 @@ file_attribute : file_attribute_allocate_clause
/* type pElemDDL */
file_attribute_allocate_clause : TOK_ALLOCATE unsigned_smallint
{
-#pragma nowarn(1506) // warning elimination
$$ = new (PARSERHEAP())
ElemDDLFileAttrAllocate(
$2 /*unsigned_smallint*/);
-#pragma warn(1506) // warning elimination
}
/* type pElemDDL */
@@ -26628,87 +26560,67 @@ file_attribute_extent : TOK_UNBOUNDED
| extent_page
{
-#pragma nowarn(1506) // warning elimination
$$ = new (PARSERHEAP())
ElemDDLFileAttrExtents(
$1 /*unsigned_integer (pri ext)*/,
$1 /*unsigned_integer (sec ext)*/);
-#pragma warn(1506) // warning elimination
}
| '(' extent_page ')'
{
-#pragma nowarn(1506) // warning elimination
-#pragma nowarn(106) // warning elimination
$$ = new (PARSERHEAP())
ElemDDLFileAttrExtents(
$2 /*unsigned_integer (pri ext)*/,
$2 /*unsigned_integer (sec ext)*/);
-#pragma warn(1506) // warning elimination
-#pragma warn(106) // warning elimination
}
| '(' extent_page ',' extent_page ')'
{
-#pragma nowarn(1506) // warning elimination
$$ = new (PARSERHEAP())
ElemDDLFileAttrExtents(
$2 /*unsigned_integer (pri ext)*/,
$4 /*unsigned_integer (sec ext)*/);
-#pragma warn(1506) // warning elimination
}
| signed_extent_page
{
-#pragma nowarn(1506) // warning elimination
$$ = new (PARSERHEAP())
ElemDDLFileAttrExtents(
$1 /*unsigned_integer (pri ext)*/,
$1 /*unsigned_integer (sec ext)*/);
-#pragma warn(1506) // warning elimination
}
| '(' signed_extent_page ')'
{
-#pragma nowarn(1506) // warning elimination
-#pragma nowarn(106) // warning elimination
$$ = new (PARSERHEAP())
ElemDDLFileAttrExtents(
$2 /*unsigned_integer (pri ext)*/);
/*since no sec ext was supplied, let the default be used*/
-#pragma warn(1506) // warning elimination
-#pragma warn(106) // warning elimination
}
| '(' signed_extent_page ',' extent_page ')'
{
-#pragma nowarn(1506) // warning elimination
$$ = new (PARSERHEAP())
ElemDDLFileAttrExtents(
$2 /*unsigned_integer (pri ext)*/,
$4 /*unsigned_integer (sec ext)*/);
-#pragma warn(1506) // warning elimination
}
| '(' extent_page ',' signed_extent_page ')'
{
-#pragma nowarn(1506) // warning elimination
$$ = new (PARSERHEAP())
ElemDDLFileAttrExtents(
$2 /*unsigned_integer (pri ext)*/,
$4 /*unsigned_integer (sec ext)*/);
-#pragma warn(1506) // warning elimination
}
| '(' signed_extent_page ',' signed_extent_page ')'
{
-#pragma nowarn(1506) // warning elimination
$$ = new (PARSERHEAP())
ElemDDLFileAttrExtents(
$2 /*unsigned_integer (pri ext)*/,
$4 /*unsigned_integer (sec ext)*/);
-#pragma warn(1506) // warning elimination
}
/* type pElemDDL */
@@ -26725,11 +26637,9 @@ file_attribute_maxextent : TOK_UNBOUNDED
| extent_page
{
-#pragma nowarn(1506) // warning elimination
$$ = new (PARSERHEAP())
ElemDDLFileAttrMaxExtents(
$1 /*unsigned_integer (max ext)*/);
-#pragma warn(1506) // warning elimination
}
/* type pElemDDL */
@@ -29489,9 +29399,7 @@ mv_file_attribute : mv_audit_type
}
| TOK_COMMIT TOK_REFRESH TOK_EACH unsigned_integer
{
-#pragma nowarn(1506) // warning elimination
$$ = new (PARSERHEAP())ElemDDLFileAttrMVCommitEach($4);
-#pragma warn(1506) // warning elimination
}
@@ -30672,14 +30580,12 @@ incremental_refresh_options : TOK_FROM TOK_SINGLEDELTA delta_definition_list opt
}
| TOK_FROM TOK_MULTIDELTA delta_definition_list TOK_PHASE unsigned_integer optional_pipeline_clause
{
-#pragma nowarn(1506) // warning elimination
$$ = new (PARSERHEAP())IncrementalRefreshOption
(
$3, //pDeltaDefinitionPtrList
$5, // uint
$6 // pOptionalPipelineClause
);
-#pragma warn(1506) // warning elimination
}
@@ -30700,7 +30606,6 @@ delta_definition_list : delta_definition_node
//pDeltaDefinition
delta_definition_node: qualified_name TOK_BETWEEN begin_epoch TOK_AND end_epoch delta_options
{
-#pragma nowarn(1506) // warning elimination
$$ = new(PARSERHEAP())DeltaDefinition
(
qualifiedNameFromStrings($1),
@@ -30708,7 +30613,6 @@ delta_definition_node: qualified_name TOK_BETWEEN begin_epoch TOK_AND end_epoch
$5, // end_epoch
$6 // pDeltaOptions
);
-#pragma warn(1506) // warning elimination
// delete $1 done in qualifiedNameFromStrings;
@@ -30726,9 +30630,7 @@ end_epoch : unsigned_integer
//pDeltaOptions
delta_options : TOK_DE TOK_LEVEL unsigned_integer delta_def_logs
{
-#pragma nowarn(1506) // warning elimination
$$ = new (PARSERHEAP())DeltaOptions($3, $4);
-#pragma warn(1506) // warning elimination
}
//pDeltaDefLogs
@@ -30744,15 +30646,11 @@ delta_def_range_log : TOK_USE TOK_NO TOK_RANGELOG
}
| TOK_USE TOK_RANGELOG unsigned_integer TOK_NUM_OF_RANGES
{
-#pragma nowarn(1506) // warning elimination
$$ = new (PARSERHEAP())DeltaDefRangeLog(DeltaDefRangeLog::CARDINALITY_ONLY, $3);
-#pragma warn(1506) // warning elimination
}
| TOK_USE TOK_RANGELOG unsigned_integer TOK_NUM_OF_RANGES unsigned_integer TOK_ROWS_COVERED
{
-#pragma nowarn(1506) // warning elimination
$$ = new (PARSERHEAP())DeltaDefRangeLog(DeltaDefRangeLog::ALL, $3, $5);
-#pragma warn(1506) // warning elimination
}
//pDeltaDefIUDLog
@@ -30779,9 +30677,7 @@ delta_def_iud_log : TOK_USE TOK_IUDLOG iud_statistics_rows
//pIUDStatistics
iud_statistics_rows : num_inserted num_deleted num_updated optional_update_collumns
{
-#pragma nowarn(1506) // warning elimination
$$ = new (PARSERHEAP())IUDStatistics($1,$2,$3,$4);
-#pragma warn(1506) // warning elimination
}
//uint
@@ -30818,15 +30714,11 @@ optional_update_collumns : TOK_COLUMNS '(' columns_num_list ')'
columns_num_list : unsigned_integer
{
$$ = new (PARSERHEAP())IntegerList();
-#pragma nowarn(1506) // warning elimination
$$->insert($1);
-#pragma warn(1506) // warning elimination
}
| columns_num_list ',' unsigned_integer
{
-#pragma nowarn(1506) // warning elimination
$1->insert($3);
-#pragma warn(1506) // warning elimination
$$ = $1;
}
@@ -30838,12 +30730,10 @@ optional_nrows_clause: empty
| TOK_COMMIT TOK_EACH unsigned_integer TOK_PHASE phase_num optional_catchup
{
-#pragma nowarn(1506) // warning elimination
$$ = new (PARSERHEAP())NRowsClause( $3, // commit each
$5, // PHASE
$6 // pOptionalCatchupClause
);
-#pragma warn(1506) // warning elimination
}
@@ -30858,9 +30748,7 @@ optional_catchup : empty
}
| TOK_CATCHUP unsigned_integer
{
-#pragma nowarn(1506) // warning elimination
$$ = new (PARSERHEAP())ConstValue($2);
-#pragma warn(1506) // warning elimination
}
| TOK_CATCHUP dynamic_parameter
{
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/parser/ulexer.cpp
----------------------------------------------------------------------
diff --git a/core/sql/parser/ulexer.cpp b/core/sql/parser/ulexer.cpp
index 4843e6f..a2d2fab 100644
--- a/core/sql/parser/ulexer.cpp
+++ b/core/sql/parser/ulexer.cpp
@@ -46,10 +46,8 @@
#include <stdlib.h>
#include <string.h>
-#pragma warning (disable : 4005) //warning elimination
// Use a reserved UCS-2 character (but not the last one) as EOF substitute
#define WEOF (NAWchar)(0xFFEF)
-#pragma warning (default : 4005) //warning elimination
#include "arkcmp_parser_defs.h"
#undef SQLPARSERGLOBALS_CONTEXT_AND_DIAGS
#define SQLPARSERGLOBALS_CONTEXT_AND_DIAGS
@@ -192,9 +190,7 @@ void yyULexer::yyULexer_ctor(const NAWchar *str, Int32 charCount)
/* yy_ch_buf has to be 2 characters longer than the size given because
* we need to put in 2 end-of-buffer characters.
*/
-#pragma nowarn(1506) // warning elimination
Int32 buf_size = charCount * BYTES_PER_NAWCHAR;
-#pragma warn(1506) // warning elimination
b->yy_ch_buf = b->yy_buf_pos = yy_c_buf_p_ = new (PARSERHEAP()) NAWchar[charCount+2];
if ( ! b->yy_ch_buf )
// UR2-CNTNSK
@@ -1394,9 +1390,7 @@ Int32 yyULexer::yylex(YYSTYPE *lvalp)
} // switch (keyWordEntry1->getTokenCode())
// control should not reach here. but if it does, we may be
// seeing an identifier beginning with letter [Cc]
-#pragma nowarn(203) // warning elimination
return anIdentifier(lvalp);
-#pragma warn(203) // warning elimination
break;
case L'G': case L'g':
// identifier prefix specified by [Gg]
@@ -3232,9 +3226,7 @@ Int32 yyULexer::yylex(YYSTYPE *lvalp)
return setTokval(0, DBGMSG("The end symbol %s\n"), lvalp);
}
}
-#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/parser/ulexer.h
----------------------------------------------------------------------
diff --git a/core/sql/parser/ulexer.h b/core/sql/parser/ulexer.h
index 62fdc88..2a1a7ce 100644
--- a/core/sql/parser/ulexer.h
+++ b/core/sql/parser/ulexer.h
@@ -90,7 +90,6 @@ typedef Int32 yy_state_type;
union YYSTYPE;
-#pragma nowarn(1506) // warning elimination
class ULexer {
public:
virtual ~ULexer() { }
@@ -131,7 +130,6 @@ protected:
void yyToNarrow() {}
#endif
};
-#pragma warn(1506) // warning elimination
}
#endif // __U_LEXER_H
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/qms/QmmQmm.cpp
----------------------------------------------------------------------
diff --git a/core/sql/qms/QmmQmm.cpp b/core/sql/qms/QmmQmm.cpp
index 0c78e3a..d2440a8 100644
--- a/core/sql/qms/QmmQmm.cpp
+++ b/core/sql/qms/QmmQmm.cpp
@@ -476,7 +476,6 @@ void QmpStub::allocateProcess(IpcEnvironment& ipcEnv, short cpu)
}
}
-//#pragma nowarn(770) // warning elimination
void QmpStub::spawnProcess(IpcEnvironment& ipcEnv, short cpu) //, ComDiagsArea **diags, CollHeap *diagsHeap)
{
SB_Phandle_Type p_handle;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/qmscommon/QRQueries.cpp
----------------------------------------------------------------------
diff --git a/core/sql/qmscommon/QRQueries.cpp b/core/sql/qmscommon/QRQueries.cpp
index 760da51..acc8f90 100644
--- a/core/sql/qmscommon/QRQueries.cpp
+++ b/core/sql/qmscommon/QRQueries.cpp
@@ -1975,8 +1975,6 @@ extern SQLMODULE_ID __SQL_mod_199222286715188012;
#include "wstr.h"
#include "csconvert.h"
-// Disable warning 4390
-#pragma warning ( disable : 4390 )
/* EXEC SQL
MODULE HP_SYSTEM_CATALOG.SYSTEM_SCHEMA.MVQR_N29_000 NAMES ARE ISO88591;
@@ -3304,9 +3302,6 @@ SQL_EXEC_ExecFetch(&__SQL_id0,(long)0,0)) != 0);}
return 0;
}
-#pragma warning ( default : 4390 )
-
-
#ifdef __linux__
SQLMODULE_ID __SQL_mod_199222286715188012 = {
/* version */ 1,
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/qmscommon/QRQueries.sql
----------------------------------------------------------------------
diff --git a/core/sql/qmscommon/QRQueries.sql b/core/sql/qmscommon/QRQueries.sql
index 1d11738..babfa27 100644
--- a/core/sql/qmscommon/QRQueries.sql
+++ b/core/sql/qmscommon/QRQueries.sql
@@ -43,9 +43,6 @@
#include "csconvert.h"
#include "catapirequest.h"
-// Disable warning 4390
-#pragma warning ( disable : 4390 )
-
EXEC SQL MODULE HP_SYSTEM_CATALOG.SYSTEM_SCHEMA.MVQR_N29_000 NAMES ARE ISO88591;
/* For CharSet project: add 3 CQDs */
@@ -1034,5 +1031,4 @@ Lng32 QRQueries::reDescribeMV(const NAString& mvName, NABoolean rePublish)
return SQLCODE;
}
-#pragma warning ( default : 4390 )
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/refresh/RuDeltaDef.cpp
----------------------------------------------------------------------
diff --git a/core/sql/refresh/RuDeltaDef.cpp b/core/sql/refresh/RuDeltaDef.cpp
index c1158a7..586bae0 100644
--- a/core/sql/refresh/RuDeltaDef.cpp
+++ b/core/sql/refresh/RuDeltaDef.cpp
@@ -160,9 +160,7 @@ CreateInstance(CUOFsIpcMessageTranslator &translator)
RUASSERT(size > 0);
char *buffer = new char[size];
-#pragma nowarn(1506) // warning elimination
translator.ReadBlock(buffer, size);
-#pragma warn(1506) // warning elimination
CRUUpdateBitmap *pUpdateBitmap = new CRUUpdateBitmap(size, buffer);
@@ -181,9 +179,7 @@ void CRUUpdateBitmap::StoreData(CUOFsIpcMessageTranslator &translator)
RUASSERT(size_ > 0);
translator.WriteBlock(&size_, sizeof(Int32));
-#pragma nowarn(1506) // warning elimination
translator.WriteBlock(buffer_, size_);
-#pragma warn(1506) // warning elimination
}
//--------------------------------------------------------------------------//
@@ -422,7 +418,6 @@ void CRUDeltaStatistics::StoreData(CUOFsIpcMessageTranslator &translator)
TInt32 CRUDeltaStatistics::GetPackedBufferSize(Int32 updateBitmapSize)
{
-#pragma nowarn(1506) // warning elimination
return sizeof(TInt32) // nRanges_
+ sizeof(TInt32) // nRangeCoveredRows_
+ sizeof(TInt32) // nInsertedRows_
@@ -431,7 +426,6 @@ TInt32 CRUDeltaStatistics::GetPackedBufferSize(Int32 updateBitmapSize)
+ sizeof(Int32) // update bitmap buffer size
+ updateBitmapSize + 1 // update bitmap buffer
;
-#pragma warn(1506) // warning elimination
}
//--------------------------------------------------------------------------//
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/refresh/RuDupElimLogRecord.cpp
----------------------------------------------------------------------
diff --git a/core/sql/refresh/RuDupElimLogRecord.cpp b/core/sql/refresh/RuDupElimLogRecord.cpp
index 5a62f8d..54f1c21 100644
--- a/core/sql/refresh/RuDupElimLogRecord.cpp
+++ b/core/sql/refresh/RuDupElimLogRecord.cpp
@@ -109,9 +109,7 @@ CopyCKTupleValuesToParams(CDMPreparedStatement &stmt,
Lng32 len = GetCKLength();
for (Int32 i=0; i<len; i++)
{
-#pragma nowarn(1506) // warning elimination
ckTuple_.GetItem(i).SetStatementParam(stmt, firstParam+i);
-#pragma warn(1506) // warning elimination
}
}
@@ -210,9 +208,7 @@ ReadCKColumns(CDMResultSet &rs, Int32 startCKColumn)
{
Int32 colIndex = i + startCKColumn;
-#pragma nowarn(1506) // warning elimination
ckTuple_.GetItem(i).Build(rs, colIndex);
-#pragma warn(1506) // warning elimination
}
rs.PresetNotNullable(FALSE);
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/refresh/RuDupElimLogScanner.cpp
----------------------------------------------------------------------
diff --git a/core/sql/refresh/RuDupElimLogScanner.cpp b/core/sql/refresh/RuDupElimLogScanner.cpp
index 809c0f1..6ddb16c 100644
--- a/core/sql/refresh/RuDupElimLogScanner.cpp
+++ b/core/sql/refresh/RuDupElimLogScanner.cpp
@@ -263,9 +263,7 @@ void CRUDupElimLogScanner::SetupScan()
for (i=0; i < len; i++)
{
Int32 colIndex = i + ckStartColumn_;
-#pragma nowarn(1506) // warning elimination
tupleDesc_.GetItemDesc(i).Build(*pResultSet_, colIndex);
-#pragma warn(1506) // warning elimination
}
// Allocate space for input buffer
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/refresh/RuDupElimTaskExUnit.cpp
----------------------------------------------------------------------
diff --git a/core/sql/refresh/RuDupElimTaskExUnit.cpp b/core/sql/refresh/RuDupElimTaskExUnit.cpp
index a3bd871..38a23cf 100644
--- a/core/sql/refresh/RuDupElimTaskExUnit.cpp
+++ b/core/sql/refresh/RuDupElimTaskExUnit.cpp
@@ -44,7 +44,6 @@
// Constructor
//--------------------------------------------------------------------------//
-#pragma nowarn(1506) // warning elimination
CRUDupElimTaskExUnit::
CRUDupElimTaskExUnit(const CRUDupElimGlobals &dupElimGlobals,
CRUSQLDynamicStatementContainer &ctrlStmtContainer,
@@ -53,7 +52,6 @@ CRUDupElimTaskExUnit(const CRUDupElimGlobals &dupElimGlobals,
ctrlStmtContainer_(ctrlStmtContainer),
stmtContainer_(nStmts)
{}
-#pragma warn(1506) // warning elimination
//--------------------------------------------------------------------------//
// CRUDupElimResolver::ExecuteCQSForceMDAM()
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/refresh/RuDupElimTaskExecutor.cpp
----------------------------------------------------------------------
diff --git a/core/sql/refresh/RuDupElimTaskExecutor.cpp b/core/sql/refresh/RuDupElimTaskExecutor.cpp
index 3a476e3..200eb49 100644
--- a/core/sql/refresh/RuDupElimTaskExecutor.cpp
+++ b/core/sql/refresh/RuDupElimTaskExecutor.cpp
@@ -461,17 +461,13 @@ void CRUDupElimTaskExecutor::InitSQL(CRUDupElimTask *pParentTask)
for (i=0; i<CRUDupElimConst::NUM_CONTROL_STMTS; i++)
{
comp.ComposeControlText(i);
-#pragma nowarn(1506) // warning elimination
ctrlStmtContainer_.SetStatementText(i, comp.GetSQL());
-#pragma warn(1506) // warning elimination
}
for (i=0; i<CRUDupElimConst::NUM_QUERY_STMTS; i++)
{
comp.ComposeQueryText(i);
-#pragma nowarn(1506) // warning elimination
pLogScanner_->SetStatementText(i, comp.GetSQL());
-#pragma warn(1506) // warning elimination
}
if (NULL != pSingleRowResolver_)
@@ -479,9 +475,7 @@ void CRUDupElimTaskExecutor::InitSQL(CRUDupElimTask *pParentTask)
for (i=0; i<CRUDupElimConst::NUM_SINGLE_RESOLV_STMTS; i++)
{
comp.ComposeSingleRowResolvText(i);
-#pragma nowarn(1506) // warning elimination
pSingleRowResolver_->SetStatementText(i, comp.GetSQL());
-#pragma warn(1506) // warning elimination
}
}
@@ -490,9 +484,7 @@ void CRUDupElimTaskExecutor::InitSQL(CRUDupElimTask *pParentTask)
for (i=0; i<CRUDupElimConst::NUM_RNG_RESOLV_STMTS; i++)
{
comp.ComposeRangeResolvText(i);
-#pragma nowarn(1506) // warning elimination
pRangeResolver_->SetStatementText(i, comp.GetSQL());
-#pragma warn(1506) // warning elimination
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/refresh/RuException.cpp
----------------------------------------------------------------------
diff --git a/core/sql/refresh/RuException.cpp b/core/sql/refresh/RuException.cpp
index 39b4dd2..91c78ac 100644
--- a/core/sql/refresh/RuException.cpp
+++ b/core/sql/refresh/RuException.cpp
@@ -58,14 +58,10 @@ void CRUException::StoreData(CUOFsIpcMessageTranslator &translator)
char *buffer = new char[bufsize];
GetErrorMsg(i, buffer, bufsize);
-#pragma nowarn(1506) // warning elimination
Int32 strSize = strlen(buffer)+1; // Can be smaller than bufsize
-#pragma warn(1506) // warning elimination
translator.WriteBlock(&strSize, sizeof(Int32));
-#pragma nowarn(1506) // warning elimination
translator.WriteBlock(buffer, strSize);
-#pragma warn(1506) // warning elimination
delete [] buffer;
@@ -95,13 +91,9 @@ void CRUException::StoreErrorParams(CUOFsIpcMessageTranslator &translator,
for (i=0;i<numStrParams;i++)
{
const char *param = GetStrArgument(index,i);
-#pragma nowarn(1506) // warning elimination
Int32 strSize = strlen(param) + 1;
-#pragma warn(1506) // warning elimination
translator.WriteBlock(&strSize,sizeof(Int32));
-#pragma nowarn(1506) // warning elimination
translator.WriteBlock(param,strSize);
-#pragma warn(1506) // warning elimination
}
}
@@ -122,9 +114,7 @@ void CRUException::LoadData(CUOFsIpcMessageTranslator &translator)
translator.ReadBlock(&strSize,sizeof(Int32));
char *buffer = new char[strSize];
-#pragma nowarn(1506) // warning elimination
translator.ReadBlock(buffer,strSize);
-#pragma warn(1506) // warning elimination
SetError(errorCode,buffer);
delete [] buffer;
@@ -160,9 +150,7 @@ LoadErrorParams(CUOFsIpcMessageTranslator &translator,
translator.ReadBlock(&strSize,sizeof(Int32));
char *buffer = new char[strSize];
-#pragma nowarn(1506) // warning elimination
translator.ReadBlock(buffer,strSize);
-#pragma warn(1506) // warning elimination
AddArgument(buffer);
delete [] buffer;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/refresh/RuForceOptionsParser.cpp
----------------------------------------------------------------------
diff --git a/core/sql/refresh/RuForceOptionsParser.cpp b/core/sql/refresh/RuForceOptionsParser.cpp
index 4e184b4..01e676e 100644
--- a/core/sql/refresh/RuForceOptionsParser.cpp
+++ b/core/sql/refresh/RuForceOptionsParser.cpp
@@ -704,9 +704,7 @@ BOOL CRUForceOptionsParser::IsCurrentWord(const char* word)
void CRUForceOptionsParser::UpCase(char* aLine)
{
-#pragma nowarn(1506) // warning elimination
Int32 len = strlen(aLine);
-#pragma warn(1506) // warning elimination
Int32 i;
for (i=0; i<len; i++)
{
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/refresh/RuOptions.cpp
----------------------------------------------------------------------
diff --git a/core/sql/refresh/RuOptions.cpp b/core/sql/refresh/RuOptions.cpp
index e3991b3..4f1d362 100644
--- a/core/sql/refresh/RuOptions.cpp
+++ b/core/sql/refresh/RuOptions.cpp
@@ -222,16 +222,12 @@ void CRUOptions::StoreData(CUOFsIpcMessageTranslator &translator)
// Output filename
stringSize = outFilename_.GetLength() + 1;
translator.WriteBlock(&stringSize, sizeof(Int32));
-#pragma nowarn(1506) // warning elimination
translator.WriteBlock(outFilename_.c_string(), stringSize);
-#pragma warn(1506) // warning elimination
// Force filename
stringSize = forceFilename_.GetLength() + 1;
translator.WriteBlock(&stringSize, sizeof(Int32));
-#pragma nowarn(1506) // warning elimination
translator.WriteBlock(forceFilename_.c_string(), stringSize);
-#pragma warn(1506) // warning elimination
// Debug options
Int32 size = debugOptionList_.GetCount();
@@ -246,9 +242,7 @@ void CRUOptions::StoreData(CUOFsIpcMessageTranslator &translator)
stringSize = opt.objName_.GetLength() + 1;
translator.WriteBlock(&stringSize, sizeof(Int32));
-#pragma nowarn(1506) // warning elimination
translator.WriteBlock(opt.objName_.c_string(), stringSize);
-#pragma warn(1506) // warning elimination
}
}
@@ -262,18 +256,14 @@ void CRUOptions::LoadData(CUOFsIpcMessageTranslator &translator)
// Output filename
translator.ReadBlock(&stringSize, sizeof(Int32));
-#pragma nowarn(1506) // warning elimination
translator.ReadBlock(buf, stringSize);
-#pragma warn(1506) // warning elimination
CDSString outFileName(buf);
SetOutputFilename(outFileName);
// Force filename
translator.ReadBlock(&stringSize, sizeof(Int32));
-#pragma nowarn(1506) // warning elimination
translator.ReadBlock(buf, stringSize);
-#pragma warn(1506) // warning elimination
CDSString forceFileName(buf);
SetForceFilename(forceFileName);
@@ -292,9 +282,7 @@ void CRUOptions::LoadData(CUOFsIpcMessageTranslator &translator)
RUASSERT(PACK_BUFFER_SIZE > stringSize);
-#pragma nowarn(1506) // warning elimination
translator.ReadBlock(buf, stringSize);
-#pragma warn(1506) // warning elimination
CDSString objName(buf);
AddDebugOption(testpoint, objName);
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/refresh/RuRefreshTaskExecutor.cpp
----------------------------------------------------------------------
diff --git a/core/sql/refresh/RuRefreshTaskExecutor.cpp b/core/sql/refresh/RuRefreshTaskExecutor.cpp
index aca1c64..d3ce3ad 100644
--- a/core/sql/refresh/RuRefreshTaskExecutor.cpp
+++ b/core/sql/refresh/RuRefreshTaskExecutor.cpp
@@ -87,21 +87,15 @@ void CRURefreshTaskExecutor::
Int32 stringSize = rootMVName_.GetLength() + 1;
translator.WriteBlock(&stringSize, sizeof(Int32));
-#pragma nowarn(1506) // warning elimination
translator.WriteBlock(rootMVName_.c_string(), stringSize);
-#pragma warn(1506) // warning elimination
stringSize = rootMVSchema_.GetLength() + 1;
translator.WriteBlock(&stringSize, sizeof(Int32));
-#pragma nowarn(1506) // warning elimination
translator.WriteBlock(rootMVSchema_.c_string(), stringSize);
-#pragma warn(1506) // warning elimination
stringSize = rootMVCatalog_.GetLength() + 1;
translator.WriteBlock(&stringSize, sizeof(Int32));
-#pragma nowarn(1506) // warning elimination
translator.WriteBlock(rootMVCatalog_.c_string(), stringSize);
-#pragma warn(1506) // warning elimination
translator.WriteBlock(&rootMVUID_, sizeof(TInt64));
@@ -159,23 +153,17 @@ void CRURefreshTaskExecutor::
char buffer[CUOFsIpcMessageTranslator::MaxMsgSize];
translator.ReadBlock(&stringSize, sizeof(Int32));
-#pragma nowarn(1506) // warning elimination
translator.ReadBlock(buffer, stringSize);
-#pragma warn(1506) // warning elimination
rootMVName_ = CDSString(buffer);
translator.ReadBlock(&stringSize, sizeof(Int32));
-#pragma nowarn(1506) // warning elimination
translator.ReadBlock(buffer, stringSize);
-#pragma warn(1506) // warning elimination
rootMVSchema_ = CDSString(buffer);
translator.ReadBlock(&stringSize, sizeof(Int32));
-#pragma nowarn(1506) // warning elimination
translator.ReadBlock(buffer, stringSize);
-#pragma warn(1506) // warning elimination
rootMVCatalog_ = CDSString(buffer);
@@ -190,9 +178,7 @@ void CRURefreshTaskExecutor::
translator.ReadBlock(&numOfStmtInContainer_, sizeof(TInt32));
pRefreshTEDynamicContainer_ =
-#pragma nowarn(1506) // warning elimination
new CRUSQLDynamicStatementContainer(numOfStmtInContainer_);
-#pragma warn(1506) // warning elimination
// Handle refresh executor sql dynamic container
pRefreshTEDynamicContainer_->LoadData(translator);
}
@@ -263,9 +249,7 @@ void CRURefreshTaskExecutor::ComposeMySql()
numOfStmtInContainer_ = rootMV.GetTablesUsedByMe().GetCount() + FIRST_TBL_STAT;
pRefreshTEDynamicContainer_ =
-#pragma nowarn(1506) // warning elimination
new CRUSQLDynamicStatementContainer(numOfStmtInContainer_);
-#pragma warn(1506) // warning elimination
ComposeForceStatements();
}
@@ -451,9 +435,7 @@ void CRURefreshTaskExecutor::ComposeControlTableStmtForUsedTable(CRUTbl &tbl,
// Compose CONTROL TABLE table_name MDAM option
myComposer.ComposeCntrlTableMDAMText(mdamOpt, &(tbl.GetFullName()));
pRefreshTEDynamicContainer_->SetStatementText
-#pragma nowarn(1506) // warning elimination
(stmtIndex++, myComposer.GetSQL());
-#pragma warn(1506) // warning elimination
forceFlags_ |= FORCE_TABLE_MDAM;
}
@@ -1056,9 +1038,7 @@ void CRURefreshTaskExecutor::ApplyIRCompilerDefaults()
for (Int32 i=FIRST_TBL_STAT;i<pRefreshTEDynamicContainer_->GetNumOfStmt();i++)
{
CDMPreparedStatement *pStat = pRefreshTEDynamicContainer_->
-#pragma nowarn(1506) // warning elimination
GetPreparedStatement(i);
-#pragma warn(1506) // warning elimination
if (NULL == pStat)
{
@@ -1069,9 +1049,7 @@ void CRURefreshTaskExecutor::ApplyIRCompilerDefaults()
ExecuteStatement(*pStat, i);
CRUGlobals::GetInstance()->GetJournal().LogMessage(
-#pragma nowarn(1506) // warning elimination
pRefreshTEDynamicContainer_->GetLastSQL(i));
-#pragma warn(1506) // warning elimination
}
}
}
@@ -1593,9 +1571,7 @@ void CRUSingleTableLockProtocol::StoreDataFileNameList(CUOFsIpcMessageTranslator
stringSize = str.GetLength() + 1;
translator.WriteBlock(&stringSize, sizeof(Int32));
-#pragma nowarn(1506) // warning elimination
translator.WriteBlock(str.c_string(), stringSize);
-#pragma warn(1506) // warning elimination
}
}
@@ -1620,9 +1596,7 @@ void CRUSingleTableLockProtocol::
RUASSERT(bufSize > stringSize);
-#pragma nowarn(1506) // warning elimination
translator.ReadBlock(buf, stringSize);
-#pragma warn(1506) // warning elimination
CDSString *objName = new CDSString(buf);
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/refresh/RuSQLDynamicStatementContainer.cpp
----------------------------------------------------------------------
diff --git a/core/sql/refresh/RuSQLDynamicStatementContainer.cpp b/core/sql/refresh/RuSQLDynamicStatementContainer.cpp
index 034e4af..68e6b21 100644
--- a/core/sql/refresh/RuSQLDynamicStatementContainer.cpp
+++ b/core/sql/refresh/RuSQLDynamicStatementContainer.cpp
@@ -99,9 +99,7 @@ void CRUSQLDynamicStatementContainer::PrepareSQL()
{
for (Int32 i=0; i < GetNumOfStmt(); i++)
{
-#pragma nowarn(1506) // warning elimination
PrepareStatement(i);
-#pragma warn(1506) // warning elimination
}
}
@@ -289,9 +287,7 @@ void CRUSQLDynamicStatementContainer::DynamicStmt::PrepareStatement(BOOL DeleteU
short retry_delay = 1000 ; // milliseconds.
for (Int32 retry = 0; retry < 2; retry++)
{
-#pragma nowarn(1506) // warning elimination
retry_delay = retry_delay * (retry + 1);
-#pragma warn(1506) // warning elimination
try
{
// need to add here the handling of compiled params
@@ -428,9 +424,7 @@ StoreData(CUOFsIpcMessageTranslator &translator)
return;
}
-#pragma nowarn(1506) // warning elimination
size = strlen(sql_)+1;
-#pragma warn(1506) // warning elimination
translator.WriteBlock(&size, sizeof(short));
translator.WriteBlock(¶mNum_, sizeof(Lng32));
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/refresh/RuSQLStatementContainer.cpp
----------------------------------------------------------------------
diff --git a/core/sql/refresh/RuSQLStatementContainer.cpp b/core/sql/refresh/RuSQLStatementContainer.cpp
index e36abd5..c2f5f9d 100644
--- a/core/sql/refresh/RuSQLStatementContainer.cpp
+++ b/core/sql/refresh/RuSQLStatementContainer.cpp
@@ -56,9 +56,7 @@ StoreData(CUOFsIpcMessageTranslator &translator)
for (Int32 i=0;i<GetNumOfStmt();i++)
{
-#pragma nowarn(1506) // warning elimination
GetStmt(i).StoreData(translator);
-#pragma warn(1506) // warning elimination
}
}
@@ -76,9 +74,7 @@ void CRUSQLStatementContainer::
for (Int32 i=0;i<GetNumOfStmt();i++)
{
-#pragma nowarn(1506) // warning elimination
GetStmt(i).LoadData(translator);
-#pragma warn(1506) // warning elimination
}
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/refresh/RuTableSyncTaskExecutor.cpp
----------------------------------------------------------------------
diff --git a/core/sql/refresh/RuTableSyncTaskExecutor.cpp b/core/sql/refresh/RuTableSyncTaskExecutor.cpp
index 9ccd4e6..080a925 100644
--- a/core/sql/refresh/RuTableSyncTaskExecutor.cpp
+++ b/core/sql/refresh/RuTableSyncTaskExecutor.cpp
@@ -123,9 +123,7 @@ void CRUTableSyncTaskExecutor::
Int32 stringSize = tableName_.GetLength() + 1;
translator.WriteBlock(&stringSize, sizeof(Int32));
-#pragma nowarn(1506) // warning elimination
translator.WriteBlock(tableName_.c_string(), stringSize);;
-#pragma warn(1506) // warning elimination
syncTableDynamicContainer_.StoreData(translator);
@@ -150,9 +148,7 @@ void CRUTableSyncTaskExecutor::
RUASSERT(maxStringSize > stringSize);
-#pragma nowarn(1506) // warning elimination
translator.ReadBlock(buffer, stringSize);
-#pragma warn(1506) // warning elimination
tableName_ = CDSString(buffer);
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/refresh/RuTaskExecutor.cpp
----------------------------------------------------------------------
diff --git a/core/sql/refresh/RuTaskExecutor.cpp b/core/sql/refresh/RuTaskExecutor.cpp
index e039cc5..8e3cd05 100644
--- a/core/sql/refresh/RuTaskExecutor.cpp
+++ b/core/sql/refresh/RuTaskExecutor.cpp
@@ -310,9 +310,7 @@ ExecuteStatement(CDMPreparedStatement &stmt,
short retry_delay = 1000 ; // milliseconds.
for (Int32 retry = 0; retry < 2; retry++)
{
-#pragma nowarn(1506) // warning elimination
retry_delay = retry_delay * (retry + 1);
-#pragma warn(1506) // warning elimination
try
{
@@ -393,7 +391,5 @@ void CRUTaskExecutor::CreateBufferAndTranslator(Int32 bufsize)
pIpcBuffer_ = new char[bufsize];
pIpcTranslator_ =
-#pragma nowarn(1506) // warning elimination
new CUOFsIpcMessageTranslator(pIpcBuffer_, bufsize);
-#pragma warn(1506) // warning elimination
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/refresh/RuTestTaskExecutor.cpp
----------------------------------------------------------------------
diff --git a/core/sql/refresh/RuTestTaskExecutor.cpp b/core/sql/refresh/RuTestTaskExecutor.cpp
index 010e1d7..784105f 100644
--- a/core/sql/refresh/RuTestTaskExecutor.cpp
+++ b/core/sql/refresh/RuTestTaskExecutor.cpp
@@ -90,9 +90,7 @@ void CRUTestTaskExecutor::Work()
void CRUTestTaskExecutor::ReadSqlStatement()
{
pDynamicSQLContainer_ =
-#pragma nowarn(1506) // warning elimination
new CRUSQLDynamicStatementContainer(numberOfStatements_);
-#pragma warn(1506) // warning elimination
pNumberOfExecutions_ = new Int32[numberOfStatements_];
pNumberOfRetries_ = new Int32[numberOfStatements_];
@@ -151,9 +149,7 @@ void CRUTestTaskExecutor::ReadSqlStatement()
text.TrimLeft();
-#pragma nowarn(1506) // warning elimination
pDynamicSQLContainer_->SetStatementText(i,text);
-#pragma warn(1506) // warning elimination
i++;
}
@@ -215,9 +211,7 @@ void CRUTestTaskExecutor::ExecuteAllStatements()
}
CDMPreparedStatement *pStmt =
-#pragma nowarn(1506) // warning elimination
pDynamicSQLContainer_->GetPreparedStatement(i);
-#pragma warn(1506) // warning elimination
pStmt->Close();
continue;
@@ -232,16 +226,10 @@ void CRUTestTaskExecutor::ExecuteAllStatements()
void CRUTestTaskExecutor::ExecuteStatement(Int32 i)
{
CDMPreparedStatement *pStmt =
-#pragma nowarn(1506) // warning elimination
pDynamicSQLContainer_->GetPreparedStatement(i);
-#pragma warn(1506) // warning elimination
-#pragma nowarn(1506) // warning elimination
if (pDynamicSQLContainer_->GetLastSQL(i)[0] == 'S' ||
-#pragma warn(1506) // warning elimination
-#pragma nowarn(1506) // warning elimination
pDynamicSQLContainer_->GetLastSQL(i)[0] == 's' )
-#pragma warn(1506) // warning elimination
{
// Sleep(10);
@@ -253,12 +241,8 @@ void CRUTestTaskExecutor::ExecuteStatement(Int32 i)
}
else
{
-#pragma nowarn(1506) // warning elimination
if (pDynamicSQLContainer_->GetLastSQL(i)[0] == 'R' ||
-#pragma warn(1506) // warning elimination
-#pragma nowarn(1506) // warning elimination
pDynamicSQLContainer_->GetLastSQL(i)[0] == 'r' )
-#pragma warn(1506) // warning elimination
{
if (TRUE == IsTransactionOpen())
{
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/refresh/RuUnAuditRefreshTaskExecutor.cpp
----------------------------------------------------------------------
diff --git a/core/sql/refresh/RuUnAuditRefreshTaskExecutor.cpp b/core/sql/refresh/RuUnAuditRefreshTaskExecutor.cpp
index b23d021..b7ca66b 100644
--- a/core/sql/refresh/RuUnAuditRefreshTaskExecutor.cpp
+++ b/core/sql/refresh/RuUnAuditRefreshTaskExecutor.cpp
@@ -206,17 +206,11 @@ void CRUUnAuditRefreshTaskExecutor::
if (0 < numOfIndexes_)
{
pUnAuditPopIndexdynamicContainer_ =
-#pragma nowarn(1506) // warning elimination
new CRUSQLDynamicStatementContainer(numOfIndexes_);
-#pragma warn(1506) // warning elimination
pUnAuditAvailableIndeXdynamicContainer_ =
-#pragma nowarn(1506) // warning elimination
new CRUSQLDynamicStatementContainer(numOfIndexes_);
-#pragma warn(1506) // warning elimination
pUnAuditUnavailableIndeXdynamicContainer_ =
-#pragma nowarn(1506) // warning elimination
new CRUSQLDynamicStatementContainer(numOfIndexes_);
-#pragma warn(1506) // warning elimination
pUnAuditPopIndexdynamicContainer_->LoadData(translator);
pUnAuditAvailableIndeXdynamicContainer_->LoadData(translator);
@@ -537,9 +531,7 @@ void CRUUnAuditRefreshTaskExecutor::ComposeMySql()
CRUTbl *pTbl = tblList.GetNext(pos);
myComposer.ComposeLock(pTbl->GetFullName(), FALSE /*shared*/);
pLockTablesTEDynamicContainer_->SetStatementText
-#pragma nowarn(1506) // warning elimination
(i,myComposer.GetSQL());
-#pragma warn(1506) // warning elimination
i++;
}
}
@@ -579,25 +571,19 @@ void CRUUnAuditRefreshTaskExecutor::ComposeIndexesSql()
CDSString popIdxRqst;
GetRootMV().GetPopIndexCatApiRequestText(popIdxRqst, pddIndex);
-#pragma nowarn(1506) // warning elimination
pUnAuditPopIndexdynamicContainer_->SetStatementText(i, popIdxRqst);
-#pragma warn(1506) // warning elimination
CDSString availablepopIdxRqst;
GetRootMV().GetUpdateIndexStatusCatApiRequestText(availablepopIdxRqst,
TRUE, /*available*/
pddIndex);
-#pragma nowarn(1506) // warning elimination
pUnAuditAvailableIndeXdynamicContainer_->SetStatementText(i, availablepopIdxRqst);
-#pragma warn(1506) // warning elimination
CDSString unavailableIdxRqst;
GetRootMV().GetUpdateIndexStatusCatApiRequestText(unavailableIdxRqst,
FALSE, /*unavailable*/
pddIndex);
-#pragma nowarn(1506) // warning elimination
pUnAuditUnavailableIndeXdynamicContainer_->SetStatementText(i, unavailableIdxRqst);
-#pragma warn(1506) // warning elimination
}
}
@@ -803,9 +789,7 @@ void CRUUnAuditRefreshTaskExecutor::EpilogueHandleOnStatementMV()
CRUTbl *pTbl = tblList.GetNext(pos);
CDMPreparedStatement *pStat =
-#pragma nowarn(1506) // warning elimination
pLockTablesTEDynamicContainer_->GetPreparedStatement(i);
-#pragma warn(1506) // warning elimination
// Perform the LOCK TABLE statement on the used table
// (the lock overlaps the original RP open, therefore
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/sort/RunDirectory.cpp
----------------------------------------------------------------------
diff --git a/core/sql/sort/RunDirectory.cpp b/core/sql/sort/RunDirectory.cpp
index e81d0af..e9172fc 100644
--- a/core/sql/sort/RunDirectory.cpp
+++ b/core/sql/sort/RunDirectory.cpp
@@ -138,7 +138,6 @@ Lng32 RunDirectory::startNewRun(SBN scrblocknum)
// run number of the newly started run.
//
//-----------------------------------------------------------------------
-#pragma nowarn(770) // warning elimination
void RunDirectory::endCurrentRun(void)
{
RunDirectoryEntry *tempRdListPtr;
@@ -146,7 +145,6 @@ void RunDirectory::endCurrentRun(void)
tempRdListPtr = rdListPtr_ + numRunsGenerated_;
// TIMESTAMP(tempRdListPtr->endTime_);
}
-#pragma warn(770) // warning elimination
//-----------------------------------------------------------------------
// Name : getTotalNumOfRuns
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/sort/ScratchSpace.cpp
----------------------------------------------------------------------
diff --git a/core/sql/sort/ScratchSpace.cpp b/core/sql/sort/ScratchSpace.cpp
index c3c41b0..221c7d5 100644
--- a/core/sql/sort/ScratchSpace.cpp
+++ b/core/sql/sort/ScratchSpace.cpp
@@ -1440,9 +1440,7 @@ RESULT SortScratchSpace::flushRun(NABoolean endrun,NABoolean waited)
else {
blockHead_.nextBlockNum_ = totalNumOfScrBlocks_ + 1;
}
-#pragma nowarn(1506) // warning elimination
blockHead_.runNum_ = currentRun_;
-#pragma warn(1506) // warning elimination
memcpy(currentBlock_, &blockHead_, sizeof(ScrBlockHeader));
retval = ScratchSpace::writeFile(currentBlock_,
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/sort/SortAlgo.cpp
----------------------------------------------------------------------
diff --git a/core/sql/sort/SortAlgo.cpp b/core/sql/sort/SortAlgo.cpp
index c1bef4b..7038957 100644
--- a/core/sql/sort/SortAlgo.cpp
+++ b/core/sql/sort/SortAlgo.cpp
@@ -81,9 +81,7 @@ SortScratchSpace* SortAlgo::getScratch() const
Lng32 SortAlgo::getRunSize() const
{
-#pragma nowarn(1506) // warning elimination
return runSize_;
-#pragma warn(1506) // warning elimination
}
//-----------------------------------------------------------------------
@@ -108,18 +106,14 @@ short SortAlgo :: compare(char* key1, char* key2)
if (key1 && key2 ) {
result = str_cmp(key1,key2,(Int32)keySize_);
//return (memcmp(key1,key2,(int)keySize_));
-#pragma nowarn(1506) // warning elimination
return result;
-#pragma warn(1506) // warning elimination
}
else {
if (key1 == NULL && key2 == NULL) return KEYS_ARE_EQUAL;
if (key1 == NULL) return KEY1_IS_SMALLER;
/*if (key2 == NULL)*/ return KEY1_IS_GREATER;
};
-#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/sort/SortUtil.cpp
----------------------------------------------------------------------
diff --git a/core/sql/sort/SortUtil.cpp b/core/sql/sort/SortUtil.cpp
index 42e33fc..cd75706 100644
--- a/core/sql/sort/SortUtil.cpp
+++ b/core/sql/sort/SortUtil.cpp
@@ -371,10 +371,8 @@ Lng32 SortUtil::sortReceivePrepare(void)
stats_.scrNumBlocks_ = tempScratch->getTotalNumOfScrBlocks();
// Total memory used
-#pragma nowarn(1506) // warning elimination
stats_.memSizeB_ = sortAlgo_->getRunSize()*sizeof(Record) +
sortAlgo_->getRunSize()*sizeof(RecKeyBuffer);
-#pragma warn(1506) // warning elimination
initialRunSize = sortAlgo_->getRunSize();
@@ -1231,12 +1229,8 @@ void SortUtil::setupComputations(SortUtilConfig& config)
config_ = &config;
config.runSize_ = 2*config.runSize_;
-#pragma nowarn(1506) // warning elimination
stats_.recLen_ = config.recSize_;
-#pragma warn(1506) // warning elimination
-#pragma nowarn(1506) // warning elimination
stats_.runSize_ = config.runSize_;
-#pragma warn(1506) // warning elimination
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/sort/TourTree.cpp
----------------------------------------------------------------------
diff --git a/core/sql/sort/TourTree.cpp b/core/sql/sort/TourTree.cpp
index 6f284ad..9b523d4 100644
--- a/core/sql/sort/TourTree.cpp
+++ b/core/sql/sort/TourTree.cpp
@@ -94,9 +94,7 @@ Tree::Tree(ULng32 numruns, ULng32 runsize, ULng32 recsize,
ex_assert(rootNode_ != NULL, "Tree::Tree, root_Node_ is NULL");
ex_assert(rootRecord_ != NULL, "Tree::Tree, rootRecord_ is NULL");
-#pragma nowarn(1506) // warning elimination
str_pad(keyOfLastWinner_, keysize, '\377');
-#pragma warn(1506) // warning elimination
baseRun_ = runnum;
winner_ = rootNode_;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/sort/TreeNode.cpp
----------------------------------------------------------------------
diff --git a/core/sql/sort/TreeNode.cpp b/core/sql/sort/TreeNode.cpp
index 5311ff4..1d9fd6b 100644
--- a/core/sql/sort/TreeNode.cpp
+++ b/core/sql/sort/TreeNode.cpp
@@ -52,7 +52,6 @@ TreeNode::TreeNode() {}
//---------------------------------------------------------------------------
// Class Destructor. Delete all the space pointed to by the ptrs in TreeNode
//---------------------------------------------------------------------------
-#pragma nowarn(770) // warning elimination
TreeNode::~TreeNode() {
if (key_ != NULL) {
key_ = NULL;
@@ -68,7 +67,6 @@ TreeNode::~TreeNode() {
sortMergeNode_ = NULL;
}
}
-#pragma warn(770) // warning elimination
//-----------------------------------------------------------------------
// Name : initialize
@@ -106,9 +104,7 @@ void TreeNode::initialize(ULng32 nodenum,
heap_ = heap;
if (merge)
{
-#pragma nowarn(1506) // warning elimination
sortMergeNode_ = new (heap_) SortMergeNode(associatedrun, scratch);
-#pragma warn(1506) // warning elimination
if (sortMergeNode_ == NULL)
{
sortError_->setErrorInfo( EScrNoMemory //sort error
@@ -140,7 +136,6 @@ void TreeNode::initialize(ULng32 nodenum,
// Description : This function is used to deallocate objects that
// were allocated in initialize().
-#pragma nowarn(770) // warning elimination
void TreeNode::deallocate()
{
// No need to delete scratch file, it is managed outside the scope
@@ -153,7 +148,6 @@ void TreeNode::deallocate()
sortMergeNode_ = NULL;
}
}
-#pragma warn(770) // warning elimination
//-----------------------------------------------------------------------
// Name : outputScr
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/sort/scratchfile_base.cpp
----------------------------------------------------------------------
diff --git a/core/sql/sort/scratchfile_base.cpp b/core/sql/sort/scratchfile_base.cpp
index fd8ece1..778e96a 100644
--- a/core/sql/sort/scratchfile_base.cpp
+++ b/core/sql/sort/scratchfile_base.cpp
@@ -225,9 +225,7 @@ RESULT ScratchFile::processAsynchronousReadCompletion(Int32 index)
numReadsPending_--;
AsyncIOBuffer * completedAB = fileHandle_[index].associatedAsyncIOBuffer;
-#pragma nowarn(161) // warning elimination
completedAB->tag_ = -1;
-#pragma warn(161) // warning elimination
completedAB->state_ = READCOMPLETE;
completedAB->processMisc();
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/sqlcomp/CmpDescribe.cpp
----------------------------------------------------------------------
diff --git a/core/sql/sqlcomp/CmpDescribe.cpp b/core/sql/sqlcomp/CmpDescribe.cpp
index 0693fe7..efb30d2 100644
--- a/core/sql/sqlcomp/CmpDescribe.cpp
+++ b/core/sql/sqlcomp/CmpDescribe.cpp
@@ -1409,9 +1409,7 @@ static short CmpGetPlan(SQLSTMT_ID &stmt_id,
&stmt_id);
if (retcode)
-#pragma nowarn(1506) // warning elimination
return ((retcode < 0) ? -1 : (short)retcode);
-#pragma warn(1506) // warning elimination
rootTdbBuf = new (heap) char[rootTdbSize];
srcStrBuf = new (heap) char[srcStrSize+1];
@@ -1427,9 +1425,7 @@ static short CmpGetPlan(SQLSTMT_ID &stmt_id,
srcStrSize,
&stmt_id);
if (retcode)
-#pragma nowarn(1506) // warning elimination
return ((retcode < 0) ? -1 : (short)retcode);
-#pragma warn(1506) // warning elimination
if (srcStrSize > 0)
srcStrBuf[srcStrSize] = 0;
@@ -1667,9 +1663,7 @@ static short CmpDescribePlan(
retcode = SQL_EXEC_ClearDiagnostics(NULL);
if (retcode)
-#pragma nowarn(1506) // warning elimination
return ((retcode < 0) ? -1 : (short)retcode);
-#pragma warn(1506) // warning elimination
//Allocate a SQL statement
stmt_id.name_mode = stmt_handle;
@@ -1776,9 +1770,7 @@ static short CmpDescribePlan(
// free up resources
retcode = SQL_EXEC_DeallocDesc(&sql_src);
if (retcode)
-#pragma nowarn(1506) // warning elimination
return ((retcode < 0) ? -1 : (short)retcode);
-#pragma warn(1506) // warning elimination
retcode = SQL_EXEC_DeallocStmt(&stmt_id);
if (retcode)
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/sqlcomp/DefaultValidator.cpp
----------------------------------------------------------------------
diff --git a/core/sql/sqlcomp/DefaultValidator.cpp b/core/sql/sqlcomp/DefaultValidator.cpp
index cd16e50..4ac4c38 100644
--- a/core/sql/sqlcomp/DefaultValidator.cpp
+++ b/core/sql/sqlcomp/DefaultValidator.cpp
@@ -68,9 +68,7 @@ void DefaultValidator::applyUpper(NAString &value) const
if (*s == '"')
quoted = !quoted;
else if (!quoted)
-#pragma nowarn(1506) // warning elimination
*s = toupper(*s);
-#pragma warn(1506) // warning elimination
}
value = tmp;
return;
@@ -378,9 +376,7 @@ Int32 ValidateNumericRange::validate( const char *value,
}
if (multiple_ && !multipleOK)
-#pragma nowarn(1506) // warning elimination
*CmpCommon::diags() << DgSqlCode(ERRWARN(2057)) << DgInt0(multiple_);
-#pragma warn(1506) // warning elimination
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/sqlcomp/NewDel.cpp
----------------------------------------------------------------------
diff --git a/core/sql/sqlcomp/NewDel.cpp b/core/sql/sqlcomp/NewDel.cpp
index 19d58c8..b81bd0d 100644
--- a/core/sql/sqlcomp/NewDel.cpp
+++ b/core/sql/sqlcomp/NewDel.cpp
@@ -103,9 +103,7 @@ void * operator new(size_t size)
if (!p && globalCmpNewHandler) {
globalCmpNewHandler();
}
-#pragma nowarn(1506)
HEAPLOG_ADD_ENTRY(p, size, DEFAULT_SYSTEM_HEAP_ID, "Default System Heap");
-#pragma warn(1506)
memset(p, 0, size);
return p;
@@ -114,9 +112,7 @@ void * operator new(size_t size)
void operator delete(void * ptr)
{
-#pragma nowarn(1506)
HEAPLOG_DELETE_ENTRY(ptr,DEFAULT_SYSTEM_HEAP_ID);
-#pragma warn(1506)
free(ptr);
}
@@ -136,9 +132,7 @@ void *operator new[](size_t size)
if (!p && globalCmpNewHandler) {
globalCmpNewHandler();
}
-#pragma nowarn(1506)
HEAPLOG_ADD_ENTRY(p, size, DEFAULT_SYSTEM_HEAP_ID, "Default System Heap");
-#pragma warn(1506)
//printf("M\tGlobalND\t%10x\t%10x\t%10x\n", p, size, (char *) p + size);
memset (p, 0, size);
return p; //malloc(size);
@@ -147,9 +141,7 @@ void *operator new[](size_t size)
void operator delete[](void * ptr)
{
-#pragma nowarn(1506)
HEAPLOG_DELETE_ENTRY(ptr,DEFAULT_SYSTEM_HEAP_ID);
-#pragma warn(1506)
free(ptr);
//printf("F\tGlobalND\t%10x\n", ptr);
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/sqlcomp/nadefaults.cpp
----------------------------------------------------------------------
diff --git a/core/sql/sqlcomp/nadefaults.cpp b/core/sql/sqlcomp/nadefaults.cpp
index dba86b6..3a8d4f5 100644
--- a/core/sql/sqlcomp/nadefaults.cpp
+++ b/core/sql/sqlcomp/nadefaults.cpp
@@ -3691,9 +3691,7 @@ inline static UInt32 getFlags(Int32 attrEnum)
inline static NABoolean isFlagOn(Int32 attrEnum, NADefaultFlags flagbit)
{
-#pragma nowarn(1506) // warning elimination
return defaultDefaults[defDefIx_[attrEnum]].flags & (UInt32)flagbit;
-#pragma warn(1506) // warning elimination
}
inline static void setFlagOn(Int32 attrEnum, NADefaultFlags flagbit)
@@ -4071,15 +4069,11 @@ void NADefaults::initCurrentDefaultsWithDefaultDefaults()
for ( i = 0; i < numAttrs; i++ )
{
#ifndef NDEBUG
-#pragma nowarn(1506) // warning elimination
const DefaultValidatorType validatorType = validator(i)->getType();
-#pragma warn(1506) // warning elimination
#endif
-#pragma nowarn(1506) // warning elimination
if ( validator(i)->getType() == VALID_KWD && (i != NATIONAL_CHARSET) &&
(i != INPUT_CHARSET) && (i != ISO_MAPPING) )
-#pragma warn(1506) // warning elimination
{
currentTokens_[i] = new NADHEAP DefaultToken;
@@ -4088,9 +4082,7 @@ void NADefaults::initCurrentDefaultsWithDefaultDefaults()
if (isNonResetableAttribute(defaultDefaults[defDefIx_[i]].attrName))
*currentTokens_[i] = DF_OFF;
else
-#pragma nowarn(1506) // warning elimination
*currentTokens_[i] = token( i, tmp );
-#pragma warn(1506) // warning elimination
}
}
@@ -4273,9 +4265,7 @@ enum DefaultConstants NADefaults::lookupAttrName(const char *name,
while (cresult != 0 && lo < hi);
if (position != 0)
-#pragma nowarn(1506) // warning elimination
*position = split;
-#pragma warn(1506) // warning elimination
// if the last comparison result was equal, return value at "split"
if (cresult == 0)
@@ -6144,21 +6134,17 @@ static void setCatSchErr(NAString &value,
stmt += value;
stmt += "\"";
stmt += ";";
-#pragma nowarn(1506) // warning elimination
parser.parseDML(stmt, stmt.length(),
OBJECTNAMECHARSET
);
-#pragma warn(1506) // warning elimination
}
if (errs == CmpCommon::diags()->getNumber(DgSqlCode::ERROR_)) {
stmt = pfx;
stmt += value;
stmt += ";";
-#pragma nowarn(1506) // warning elimination
parser.parseDML(stmt, stmt.length(),
OBJECTNAMECHARSET
);
-#pragma warn(1506) // warning elimination
}
// Change errors to warnings if errOrWarn is +1 (i.e. warning).
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/sqlcomp/parser.cpp
----------------------------------------------------------------------
diff --git a/core/sql/sqlcomp/parser.cpp b/core/sql/sqlcomp/parser.cpp
index 8e6a5ce..d5f7dec 100644
--- a/core/sql/sqlcomp/parser.cpp
+++ b/core/sql/sqlcomp/parser.cpp
@@ -766,9 +766,7 @@ Int32 Parser::parseSQL
{
if (wInputStr() &&
stringScanWillTerminateInParser(wInputStr(), internalExpr,
-#pragma nowarn(1506) // warning elimination
wInputStrLen()))
-#pragma warn(1506) // warning elimination
{
// convert str to Unicode
delete lexer;
@@ -1165,9 +1163,7 @@ ExprNode *Parser::getExprTree(const char * str,
{
// add a semicolon and a null character to the end of str (required by the parser)
newstr = new(wHeap()) char[newlen + 1 + 1];
-#pragma nowarn(1506) // warning elimination
str_cpy_all(newstr, str, newlen);
-#pragma warn(1506) // warning elimination
newstr[newlen] = ';' ;
newstr[newlen+1] = '\0';
newlen++;
@@ -1198,9 +1194,7 @@ ExprNode *Parser::getExprTree(const char * str,
// save the current SqlParser_Flags and restore them after parse step.
ULng32 saved_SqlParser_Flags = SqlParser_Flags;
-#pragma nowarn(1506) // warning elimination
parseDML(newstr, newlen, strCharSet, &node, token, paramItemList);
-#pragma warn(1506) // warning elimination
delete paramItemList;
// restore the saved SqlParser_Flags
@@ -1261,9 +1255,7 @@ ExprNode *Parser::get_w_ExprTree(const NAWchar * str, // strCharSet should be Ch
if (num_params >= 6) paramItemList->insert(p6);
}
-#pragma nowarn(1506) // warning elimination
parse_w_DML(newstr, newlen, &node, token, paramItemList);
-#pragma warn(1506) // warning elimination
delete paramItemList;
if (newstr != str)
[10/12] incubator-trafodion git commit: TRAFODION-2731 CodeCleanup:
Phase 4. Remove legacy/obsolete pragmas
Posted by an...@apache.org.
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);
}
[06/12] incubator-trafodion git commit: TRAFODION-2731 CodeCleanup:
Phase 4. Remove legacy/obsolete pragmas
Posted by an...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/generator/GenKey.cpp
----------------------------------------------------------------------
diff --git a/core/sql/generator/GenKey.cpp b/core/sql/generator/GenKey.cpp
index 31bd6b1..44fcb04 100644
--- a/core/sql/generator/GenKey.cpp
+++ b/core/sql/generator/GenKey.cpp
@@ -188,9 +188,7 @@ short ExpGenerator::buildKeyInfo(keyRangeGen ** keyInfo, // out -- generated obj
{
NABoolean x = bkey_excluded;
bkey_excluded = ekey_excluded;
-#pragma nowarn(1506) // warning elimination
ekey_excluded = x;
-#pragma warn(1506) // warning elimination
ex_expr* temp = bk_excluded_expr;
bk_excluded_expr = ek_excluded_expr;
@@ -292,9 +290,7 @@ short ExpGenerator::buildKeyInfo(keyRangeGen ** keyInfo, // out -- generated obj
else
desc_flag = !reverseScan;
-#pragma nowarn(1506) // warning elimination
enode = new(generator->wHeap()) CompEncode(enode,desc_flag);
-#pragma warn(1506) // warning elimination
enode->bindNode(generator->getBindWA());
attrs[i] =
@@ -377,9 +373,7 @@ short ExpGenerator::buildKeyInfo(keyRangeGen ** keyInfo, // out -- generated obj
ItemExpr * lo = new(generator->wHeap()) ConstValue(targetType,
!desc_flag,
TRUE /* allow NULL */);
-#pragma nowarn(1506) // warning elimination
lo = new(generator->wHeap()) CompEncode(lo,desc_flag);
-#pragma warn(1506) // warning elimination
lo->bindNode(generator->getBindWA());
ValueIdList loList;
@@ -399,9 +393,7 @@ short ExpGenerator::buildKeyInfo(keyRangeGen ** keyInfo, // out -- generated obj
ItemExpr * hi = new(generator->wHeap()) ConstValue(targetType->newCopy(generator->wHeap()),
desc_flag,
TRUE /* allow NULL */);
-#pragma nowarn(1506) // warning elimination
hi = new(generator->wHeap()) CompEncode(hi,desc_flag);
-#pragma warn(1506) // warning elimination
hi->bindNode(generator->getBindWA());
ValueIdList hiList;
@@ -428,9 +420,7 @@ short ExpGenerator::buildKeyInfo(keyRangeGen ** keyInfo, // out -- generated obj
ConstValue(targetType->newCopy(generator->wHeap()),
!desc_flag,
FALSE /* don't allow NULL */);
- #pragma nowarn(1506) // warning elimination
nonNullLo = new(generator->wHeap()) CompEncode(nonNullLo,desc_flag);
- #pragma warn(1506) // warning elimination
nonNullLo->bindNode(generator->getBindWA());
ValueIdList nonNullLoList;
@@ -451,9 +441,7 @@ short ExpGenerator::buildKeyInfo(keyRangeGen ** keyInfo, // out -- generated obj
ConstValue(targetType->newCopy(generator->wHeap()),
desc_flag,
FALSE /* don't allow NULL */);
-#pragma nowarn(1506) // warning elimination
nonNullHi = new(generator->wHeap()) CompEncode(nonNullHi,desc_flag);
-#pragma warn(1506) // warning elimination
nonNullHi->bindNode(generator->getBindWA());
ValueIdList nonNullHiList;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/generator/GenMapTable.cpp
----------------------------------------------------------------------
diff --git a/core/sql/generator/GenMapTable.cpp b/core/sql/generator/GenMapTable.cpp
index 5473c0a..6cffd00 100644
--- a/core/sql/generator/GenMapTable.cpp
+++ b/core/sql/generator/GenMapTable.cpp
@@ -74,7 +74,6 @@ void MapInfo::set(const ValueId & valueId, Attributes * attr, CollHeap * heap)
};
-#pragma nowarn(270) // warning elimination
short MapInfo::isOffsetAssigned()
{
if (attr_->getOffset() >= 0)
@@ -82,7 +81,6 @@ short MapInfo::isOffsetAssigned()
else
return 0;
};
-#pragma warn(270) // warning elimination
//////////////////////////////////////////////////////////////////
@@ -100,9 +98,7 @@ MapInfo * MapTable::addMapInfoToThis(const ValueId & value_id,
Attributes * attr)
{
const CollIndex valueId = value_id;
-#pragma nowarn(1506) // warning elimination
const Int32 whichMap = valueId / bitsPerUnit;
-#pragma warn(1506) // warning elimination
// --------------------------------------------------
// Do we need to allocate more memory for the bitmaps?
@@ -116,9 +112,7 @@ MapInfo * MapTable::addMapInfoToThis(const ValueId & value_id,
// How many bytes is needed for the bitmap array and the integer array.
const Int32 bytesToAllocate =
-#pragma nowarn(1506) // warning elimination
newBitMapArraySize * (sizeof(MTBitmapUnit) + sizeof(short));
-#pragma warn(1506) // warning elimination
// Allocate memory from statement heap, which is always defined when
// compiling a SQL statement.
@@ -231,9 +225,7 @@ MapInfo * MapTable::addMapInfoToThis(const ValueId & value_id,
? moveXMapInfoPtrsAtATime
: mapInfosLeftToMove;
-#pragma nowarn(1506) // warning elimination
const Int32 bytesToMove = sizeof(MapInfo *) * ptrsToMove;
-#pragma warn(1506) // warning elimination
// Copy to a local array.
memcpy(
@@ -324,9 +316,7 @@ MapInfo * MapTable::getMapInfoFromThis(const ValueId & value_id)
// Find the bits in the bitmap that we're interested in.
// --------------------------------------------------
const CollIndex valueId = value_id;
-#pragma nowarn(1506) // warning elimination
const Int32 whichMap = valueId / bitsPerUnit;
-#pragma warn(1506) // warning elimination
// Range check.
if ( whichMap >= vidBitMapArraySize_ )
@@ -430,9 +420,7 @@ void MapTable::shiftAtpIndex(short shiftIndex)
// Only change the atp if the original ATP index is greater
// than 1. This excludes constants, temps, and persistents.
//
-#pragma nowarn(1506) // warning elimination
attr->setAtpIndex( attr->getAtpIndex() + shiftIndex );
-#pragma warn(1506) // warning elimination
}
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/generator/GenMdamPred.cpp
----------------------------------------------------------------------
diff --git a/core/sql/generator/GenMdamPred.cpp b/core/sql/generator/GenMdamPred.cpp
index 1cf81b1..0ca2665 100644
--- a/core/sql/generator/GenMdamPred.cpp
+++ b/core/sql/generator/GenMdamPred.cpp
@@ -276,9 +276,7 @@ short BiRelat::mdamPredGen(Generator * generator,
vnode->bindNode(generator->getBindWA());
vnode->preCodeGen(generator);
-#pragma nowarn(1506) // warning elimination
vnode = new(generator->wHeap()) CompEncode(vnode,mdamHelper.isDescending());
-#pragma warn(1506) // warning elimination
vnode->bindNode(generator->getBindWA());
ValueIdList vnodeList;
@@ -296,12 +294,10 @@ short BiRelat::mdamPredGen(Generator * generator,
dummyLen, // out
&vexpr);
-#pragma nowarn(1506) // warning elimination
*head = *tail = new(generator->getSpace()) MdamPred(
mdamHelper.getDisjunctNumber(),
predType,
vexpr);
-#pragma warn(1506) // warning elimination
return rc;
}
@@ -377,9 +373,7 @@ void BiRelat::getMdamPredDetails(Generator* generator,
vnode->bindNode(generator->getBindWA());
vnode->preCodeGen(generator);
-#pragma nowarn(1506) // warning elimination
vnode = new(generator->wHeap()) CompEncode(vnode,mdamHelper.isDescending());
-#pragma warn(1506) // warning elimination
vnode->bindNode(generator->getBindWA());
ValueIdList vnodeList;
@@ -438,14 +432,12 @@ void BiLogic::mdamPredGenSubrange(Generator* generator,
GenAssert(FALSE, "mdamPredGenSubrange: subrange does not conform to "
"rangespec canonical form.");
-#pragma nowarn(1506) // warning elimination
*head = *tail = new(generator->getSpace()) MdamPred(
mdamHelper.getDisjunctNumber(),
MdamPred::MDAM_BETWEEN,
vexpr1, vexpr2,
val1Inclusive, val2Inclusive,
(Int16)mdamHelper.isDescending());
-#pragma warn(1506) // warning elimination
}
@@ -473,9 +465,7 @@ short TriRelational::mdamPredGen(Generator * generator,
return -1;
// end temp code
-#pragma nowarn(269) // warning elimination
short rc = 0;
-#pragma warn(269) // warning elimination
enum MdamPred::MdamPredType predType =
MdamPred::MDAM_EQ; // just to initialize
@@ -558,9 +548,7 @@ short TriRelational::mdamPredGen(Generator * generator,
Cast(keyValue,mdamHelper.getTargetType()->newCopy());
}
-#pragma nowarn(1506) // warning elimination
vnode = new CompEncode(vnode,mdamHelper.isDescending());
-#pragma warn(1506) // warning elimination
vnode->bindNode(generator->getBindWA());
@@ -623,12 +611,10 @@ short TriRelational::mdamPredGen(Generator * generator,
ex_expr::exp_ARITH_EXPR,
&vexpr);
-#pragma nowarn(1506) // warning elimination
*head = *tail = new(generator->getSpace())
MdamPred(mdamHelper.getDisjunctNumber(),
predType,
vexpr);
-#pragma warn(1506) // warning elimination
return rc;
}
@@ -670,12 +656,10 @@ short UnLogic::mdamPredGen(Generator * generator,
}
}
-#pragma nowarn(1506) // warning elimination
*head = *tail = new(generator->getSpace())
MdamPred(mdamHelper.getDisjunctNumber(),
predType,
0 /* no expression for IS NULL and IS NOT NULL */);
-#pragma warn(1506) // warning elimination
return rc;
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/generator/GenPartFunc.cpp
----------------------------------------------------------------------
diff --git a/core/sql/generator/GenPartFunc.cpp b/core/sql/generator/GenPartFunc.cpp
index a07d90c..d4a56ec 100644
--- a/core/sql/generator/GenPartFunc.cpp
+++ b/core/sql/generator/GenPartFunc.cpp
@@ -346,7 +346,6 @@ short RangePartitioningFunction::codeGen(Generator *generator,
// begEndAttrs[2*numPartKeyCols-1]->getOffset(),
// "begin/end piv keys have different layouts");
-#pragma nowarn(1506) // warning elimination
generatedObject = new(generator->getSpace()) ExRangePartInputData(
partInputCriDesc,
partInputDataLength,
@@ -357,7 +356,6 @@ short RangePartitioningFunction::codeGen(Generator *generator,
TRUE); // uses expressions to calculate ranges in the executor
generatedObject->setPartitionExprAtp(pivMoveAtp);
generatedObject->setPartitionExprAtpIndex(pivMoveAtpIndex);
-#pragma warn(1506) // warning elimination
// now fill in the individual partition boundaries
// (NOTE: there is one more than there are partitions)
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/generator/GenPreCode.cpp
----------------------------------------------------------------------
diff --git a/core/sql/generator/GenPreCode.cpp b/core/sql/generator/GenPreCode.cpp
index 06ed196..af24046 100644
--- a/core/sql/generator/GenPreCode.cpp
+++ b/core/sql/generator/GenPreCode.cpp
@@ -676,12 +676,8 @@ ItemExpr * ValueIdUnion::replaceVEGExpressions
for(CollIndex i = 0; i < entries(); i++) {
viduPtr->
-#pragma nowarn(1506) // warning elimination
setSource(i,
-#pragma warn(1506) // warning elimination
-#pragma nowarn(1506) // warning elimination
(viduPtr->getSource(i).getItemExpr()
-#pragma warn(1506) // warning elimination
->replaceVEGExpressions(availableValues,inputValues,
thisIsAnMdamKeyPredicate,lookup,
FALSE, /* replicateExpression default */
@@ -6064,12 +6060,8 @@ RelExpr * MergeUnion::preCodeGen(Generator * generator,
// -------------------------------------------------------------------
if (outputId.isEmpty())
{
-#pragma nowarn(1506) // warning elimination
Int32 leftIndex = getLeftMap().getTopValues().index(v);
-#pragma warn(1506) // warning elimination
-#pragma nowarn(1506) // warning elimination
Int32 rightIndex = getRightMap().getTopValues().index(v);
-#pragma warn(1506) // warning elimination
CMPASSERT((leftIndex != NULL_COLL_INDEX) &&
(rightIndex != NULL_COLL_INDEX));
@@ -7821,12 +7813,8 @@ ItemExpr * BiArith::preCodeGen(Generator * generator)
case ITM_PLUS:
case ITM_MINUS:
if (type_op1->getTypeQualifier() == NA_DATETIME_TYPE) {
-#pragma nowarn(1506) // warning elimination
Lng32 fp1 = ((DatetimeType *) type_op1)->getFractionPrecision();
-#pragma warn(1506) // warning elimination
-#pragma nowarn(1506) // warning elimination
Lng32 fp2 = ((DatetimeType *) type_op2)->getFractionPrecision();
-#pragma warn(1506) // warning elimination
if (fp1 < fp2) {
child(0) = new(generator->wHeap()) Cast(child(0), type_op2);
child(0)->bindNode(generator->getBindWA());
@@ -7902,12 +7890,10 @@ ItemExpr * BiArith::preCodeGen(Generator * generator)
const Int16 DisAmbiguate = 0;
child(1) = new(generator->wHeap()) Cast(child(1),
new(generator->wHeap()) SQLNumeric(generator->wHeap(), TRUE, /* signed */
-#pragma nowarn(1506) // warning elimination
interval->getTotalPrecision(),
0,
DisAmbiguate, // added for 64bit proj.
interval->supportsSQLnull()));
-#pragma warn(1506) // warning elimination
child(1)->bindNode(generator->getBindWA());
}
break;
@@ -7951,12 +7937,10 @@ ItemExpr * BiArith::preCodeGen(Generator * generator)
const Int16 DisAmbiguate = 0;
child(1) = new(generator->wHeap()) Cast(child(1),
new(generator->wHeap()) SQLNumeric(generator->wHeap(), TRUE, /* signed */
-#pragma nowarn(1506) // warning elimination
interval->getTotalPrecision(),
0,
DisAmbiguate, // added for 64bit proj.
interval->supportsSQLnull()));
-#pragma warn(1506) // warning elimination
child(1)->bindNode(generator->getBindWA());
}
break;
@@ -7970,19 +7954,15 @@ ItemExpr * BiArith::preCodeGen(Generator * generator)
case ITM_MINUS: {
if ((type_op1->getTypeQualifier() == NA_INTERVAL_TYPE) &&
(((IntervalType*) type_op1)->getEndField() == REC_DATE_SECOND)) {
-#pragma nowarn(1506) // warning elimination
Lng32 sourceScale = ((IntervalType *) type_op1)->getFractionPrecision();
Lng32 targetScale = ((DatetimeType *) type_op2)->getFractionPrecision();
-#pragma warn(1506) // warning elimination
child(0) = generator->getExpGenerator()->scaleBy10x(
child(0)->getValueId(),
targetScale - sourceScale);
} else if ((type_op2->getTypeQualifier() == NA_INTERVAL_TYPE) &&
(((IntervalType*) type_op2)->getEndField() == REC_DATE_SECOND)) {
-#pragma nowarn(1506) // warning elimination
Lng32 targetScale = ((DatetimeType *) type_op1)->getFractionPrecision();
Lng32 sourceScale = ((IntervalType *) type_op2)->getFractionPrecision();
-#pragma warn(1506) // warning elimination
child(1) = generator->getExpGenerator()->scaleBy10x(
child(1)->getValueId(),
targetScale - sourceScale);
@@ -8653,15 +8633,9 @@ ItemExpr * BiRelat::preCodeGen(Generator * generator)
*result_type);
}
else if (result_type->getTypeQualifier() == NA_DATETIME_TYPE) {
-#pragma nowarn(1506) // warning elimination
Lng32 fp1 = ((DatetimeType *) type_op1)->getFractionPrecision();
-#pragma warn(1506) // warning elimination
-#pragma nowarn(1506) // warning elimination
Lng32 fp2 = ((DatetimeType *) type_op2)->getFractionPrecision();
-#pragma warn(1506) // warning elimination
-#pragma nowarn(1506) // warning elimination
Lng32 fpResult = ((DatetimeType *) result_type)->getFractionPrecision();
-#pragma warn(1506) // warning elimination
if (fp1 != fpResult) {
child(0) = new(generator->wHeap()) Cast(child(0), result_type,
ITM_CAST, FALSE);
@@ -9042,9 +9016,7 @@ ItemExpr * Cast::preCodeGen(Generator * generator)
// Size (in bytes) of the source value represented as a
// character string.
//
-#pragma nowarn(1506) // warning elimination
Int32 sourceFieldsSize = sourceType.getDisplayLength();
-#pragma warn(1506) // warning elimination
// Construct an expression (string) to concatinate the given
// value with the required fields from the current timestamp as
@@ -10432,12 +10404,8 @@ VEGRewritePairs::insert(const ValueId& original,
void VEGRewritePairs::VEGRewritePair::print(FILE *ofd) const
{
-#pragma nowarn(1506) // warning elimination
Lng32 orId = CollIndex(original_),
-#pragma warn(1506) // warning elimination
-#pragma nowarn(1506) // warning elimination
reId = CollIndex(rewritten_);
-#pragma warn(1506) // warning elimination
fprintf(ofd,"<%d, %d>",orId,reId);
}
@@ -10446,9 +10414,7 @@ void VEGRewritePairs::print( FILE* ofd,
const char* indent,
const char* title) const
{
-#pragma nowarn(1506) // warning elimination
BUMP_INDENT(indent);
-#pragma warn(1506) // warning elimination
fprintf(ofd,"%s %s\n%s",NEW_INDENT,title,NEW_INDENT);
CollIndex *key;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/generator/GenRel3GL.cpp
----------------------------------------------------------------------
diff --git a/core/sql/generator/GenRel3GL.cpp b/core/sql/generator/GenRel3GL.cpp
index 843451c..3e8a84f 100644
--- a/core/sql/generator/GenRel3GL.cpp
+++ b/core/sql/generator/GenRel3GL.cpp
@@ -177,13 +177,11 @@ short PhysCompoundStmt::codeGen(Generator * generator)
givenDesc, returnedCRI,
(queue_index)getDefault(GEN_CS_SIZE_DOWN),
(queue_index)getDefault(GEN_CS_SIZE_UP),
-#pragma nowarn(1506) // warning elimination
getDefault(GEN_CS_NUM_BUFFERS),
getDefault(GEN_CS_BUFFER_SIZE),
rowsFromLeft,
rowsFromRight,
afterUpdate);
-#pragma warn(1506) // warning elimination
generator->initTdbFields(tdb);
// Add expain info.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/generator/GenRelDCL.cpp
----------------------------------------------------------------------
diff --git a/core/sql/generator/GenRelDCL.cpp b/core/sql/generator/GenRelDCL.cpp
index 10b1a4d..821d416 100644
--- a/core/sql/generator/GenRelDCL.cpp
+++ b/core/sql/generator/GenRelDCL.cpp
@@ -231,10 +231,8 @@ short RelTransaction::codeGen(Generator * generator)
(ex_cri_desc *)(generator->getCriDesc(Generator::DOWN)),
(queue_index)getDefault(GEN_TRAN_SIZE_DOWN),
(queue_index)getDefault(GEN_TRAN_SIZE_UP),
-#pragma nowarn(1506) // warning elimination
getDefault(GEN_TRAN_NUM_BUFFERS),
getDefault(GEN_TRAN_BUFFER_SIZE));
-#pragma warn(1506) // warning elimination
generator->initTdbFields(trans_tdb);
// SET TRANSACTION is allowed within a transaction, if this query
@@ -358,10 +356,8 @@ short RelSetTimeout::codeGen(Generator * generator)
(ex_cri_desc *)(generator->getCriDesc(Generator::DOWN)),
(queue_index)getDefault(GEN_TIMEOUT_SIZE_DOWN),
(queue_index)getDefault(GEN_TIMEOUT_SIZE_UP),
-#pragma nowarn(1506) // warning elimination
getDefault(GEN_TIMEOUT_NUM_BUFFERS),
getDefault(GEN_TIMEOUT_BUFFER_SIZE));
-#pragma warn(1506) // warning elimination
timeout_tdb->setStream( isStream_ ); // set the flags in the TCB
timeout_tdb->setReset( isReset_ );
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/generator/GenRelEnforcer.cpp
----------------------------------------------------------------------
diff --git a/core/sql/generator/GenRelEnforcer.cpp b/core/sql/generator/GenRelEnforcer.cpp
index ae4cf22..197aadb 100644
--- a/core/sql/generator/GenRelEnforcer.cpp
+++ b/core/sql/generator/GenRelEnforcer.cpp
@@ -257,9 +257,7 @@ short Exchange::codeGenForESP(Generator * generator)
= generator->getCriDesc(Generator::DOWN);
ex_cri_desc *returned_cri_desc
-#pragma nowarn(1506) // warning elimination
= new(space) ex_cri_desc(given_cri_desc->noTuples() + 1, space);
-#pragma warn(1506) // warning elimination
ex_cri_desc *splitTopWorkCriDesc = new(space) ex_cri_desc(splitTopWorkTupps,space);
ex_cri_desc *sendTopWorkCriDesc = new(space) ex_cri_desc(sendTopWorkTupps,space);
@@ -479,11 +477,9 @@ short Exchange::codeGenForESP(Generator * generator)
&initialESPMapTable);
// we MUST be able to fit at least one row into a buffer
-#pragma nowarn(1506) // warning elimination
downSqlBufferLength =
MAXOF((ULng32) ComTdbSendTop::minSendBufferSize(downRecordLength),
(ULng32) (downMessageBufferLength_.getValue() * 1024));
-#pragma warn(1506) // warning elimination
CollIndex childFragmentId = 0;
@@ -847,17 +843,14 @@ short Exchange::codeGenForESP(Generator * generator)
&returnedValuesMapTable);
// we MUST be able to fit at least one row into a buffer
-#pragma nowarn(1506) // warning elimination
upSqlBufferLength =
MAXOF((ULng32) ComTdbSendTop::minReceiveBufferSize(upRecordLength),
(ULng32) (upMessageBufferLength_.getValue() * 1024));
-#pragma warn(1506) // warning elimination
// ---------------------------------------------------------------------
// generate send bottom tdb
// ---------------------------------------------------------------------
-#pragma nowarn(1506) // warning elimination
sendBottom = new(space) ComTdbSendBottom(
outputMoveExpr,
(queue_index)getDefault(GEN_SNDB_SIZE_DOWN),
@@ -874,7 +867,6 @@ short Exchange::codeGenForESP(Generator * generator)
numUpBuffers,
(Cardinality) numRowsDown.value(),
(Cardinality) numRowsUp.value());
-#pragma warn(1506) // warning elimination
sendBottom->setConsiderBufferDefrag(considerBufferDefrag);
sendBottom->setCIFON( (tupleFormat == ExpTupleDesc::SQLMX_ALIGNED_FORMAT));
@@ -1080,9 +1072,7 @@ short Exchange::codeGenForESP(Generator * generator)
// the row coming up from the connection is returned as the tupp
// following the input tupps
attr->setAtp(0);
-#pragma nowarn(1506) // warning elimination
attr->setAtpIndex(given_cri_desc->noTuples());
-#pragma warn(1506) // warning elimination
}
// ---------------------------------------------------------------------
@@ -1130,7 +1120,6 @@ short Exchange::codeGenForESP(Generator * generator)
// Generate send top tdb
// ---------------------------------------------------------------------
-#pragma nowarn(1506) // warning elimination
sendTop = new(space) ComTdbSendTop(
childFragmentId,
inputMoveExpr,
@@ -1151,7 +1140,6 @@ short Exchange::codeGenForESP(Generator * generator)
(Cardinality) numRowsDown.value(),
(Cardinality) numRowsUp.value(),
(CmpCommon::getDefault(EXE_DIAGNOSTIC_EVENTS) == DF_ON));
-#pragma warn(1506) // warning elimination
generator->initTdbFields(sendTop);
if (isExtractConsumer_)
@@ -1211,14 +1199,10 @@ short Exchange::codeGenForESP(Generator * generator)
(Cardinality) getGroupAttr()->
getOutputLogPropList()[0]->getResultCardinality().value(),
numBottomPartitions,
-#pragma warning (disable : 4244) //warning elimination
-#pragma nowarn(1506) // warning elimination
CmpCommon::getDefaultNumeric(STREAM_TIMEOUT),
getDefault(GEN_SID_NUM_BUFFERS),
getDefault(GEN_SID_BUFFER_SIZE)
);
-#pragma warn(1506) // warning elimination
-#pragma warning (default : 4244) //warning elimination
generator->initTdbFields(splitTop);
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/generator/GenRelExeUtil.cpp
----------------------------------------------------------------------
diff --git a/core/sql/generator/GenRelExeUtil.cpp b/core/sql/generator/GenRelExeUtil.cpp
index 9d0df8c..21275d1 100644
--- a/core/sql/generator/GenRelExeUtil.cpp
+++ b/core/sql/generator/GenRelExeUtil.cpp
@@ -185,9 +185,7 @@ short ExeUtilProcessVolatileTable::codeGen(Generator * generator)
// remove trailing blanks and append a semicolon, if one is not present.
char * ddlStmt = NULL;
-#pragma nowarn(1506) // warning elimination
Int32 i = strlen(getDDLStmtText());
-#pragma warn(1506) // warning elimination
while ((i > 0) && (getDDLStmtText()[i-1] == ' '))
i--;
@@ -238,10 +236,8 @@ short ExeUtilProcessVolatileTable::codeGen(Generator * generator)
(ex_cri_desc *)(generator->getCriDesc(Generator::DOWN)),
(queue_index)getDefault(GEN_DDL_SIZE_DOWN),
(queue_index)getDefault(GEN_DDL_SIZE_UP),
-#pragma nowarn(1506) // warning elimination
getDefault(GEN_DDL_NUM_BUFFERS),
getDefault(GEN_DDL_BUFFER_SIZE));
-#pragma warn(1506) // warning elimination
generator->initTdbFields(pvt_tdb);
if(!generator->explainDisabled()) {
@@ -337,9 +333,7 @@ short ExeUtilDisplayExplain::codeGen(Generator * generator)
CollIndex i = 0;
if (stmtText)
{
-#pragma nowarn(1506) // warning elimination
i = strlen(stmtText);
-#pragma warn(1506) // warning elimination
while ((i > 0) && (getStmtText()[i-1] == ' '))
i--;
@@ -380,9 +374,7 @@ short ExeUtilDisplayExplain::codeGen(Generator * generator)
= generator->getCriDesc(Generator::DOWN);
ex_cri_desc * returnedDesc
-#pragma nowarn(1506) // warning elimination
= new(space) ex_cri_desc(givenDesc->noTuples() + 1, space);
-#pragma warn(1506) // warning elimination
ex_cri_desc * workCriDesc = new(space) ex_cri_desc(4, space);
const Int32 work_atp = 1;
@@ -508,9 +500,7 @@ short ExeUtilDisplayExplainComplex::codeGen(Generator * generator)
= generator->getCriDesc(Generator::DOWN);
ex_cri_desc * returnedDesc
-#pragma nowarn(1506) // warning elimination
= new(space) ex_cri_desc(givenDesc->noTuples() + 1, space);
-#pragma warn(1506) // warning elimination
ex_cri_desc * workCriDesc = new(space) ex_cri_desc(4, space);
const Int32 work_atp = 1;
@@ -535,10 +525,8 @@ short ExeUtilDisplayExplainComplex::codeGen(Generator * generator)
returnedDesc,
(queue_index)8,
(queue_index)1024,
-#pragma nowarn(1506) // warning elimination
2, // num buffers
32000); // bufferSIze
-#pragma warn(1506) // warning elimination
exe_util_tdb->setIsVolatile(isVolatile_);
@@ -640,10 +628,8 @@ short ExeUtilWnrInsert::codeGen(Generator * generator)
(ex_cri_desc *)(generator->getCriDesc(Generator::DOWN)),
(queue_index)getDefault(GEN_DDL_SIZE_DOWN),
(queue_index)getDefault(GEN_DDL_SIZE_UP),
-#pragma nowarn(1506) // warning elimination
getDefault(GEN_DDL_NUM_BUFFERS),
getDefault(GEN_DDL_BUFFER_SIZE)
-#pragma warn(1506) // warning elimination
);
generator->initTdbFields(exe_util_tdb);
@@ -706,9 +692,7 @@ short ExeUtilLoadVolatileTable::codeGen(Generator * generator)
= generator->getCriDesc(Generator::DOWN);
ex_cri_desc * returnedDesc
-#pragma nowarn(1506) // warning elimination
= new(space) ex_cri_desc(givenDesc->noTuples() + 1, space);
-#pragma warn(1506) // warning elimination
ex_cri_desc * workCriDesc = new(space) ex_cri_desc(4, space);
const Int32 work_atp = 1;
@@ -740,10 +724,8 @@ short ExeUtilLoadVolatileTable::codeGen(Generator * generator)
(ex_cri_desc *)(generator->getCriDesc(Generator::DOWN)),
(queue_index)getDefault(GEN_DDL_SIZE_DOWN),
(queue_index)getDefault(GEN_DDL_SIZE_UP),
-#pragma nowarn(1506) // warning elimination
getDefault(GEN_DDL_NUM_BUFFERS),
getDefault(GEN_DDL_BUFFER_SIZE));
-#pragma warn(1506) // warning elimination
generator->initTdbFields(exe_util_tdb);
@@ -783,9 +765,7 @@ short ExeUtilCleanupVolatileTables::codeGen(Generator * generator)
= generator->getCriDesc(Generator::DOWN);
ex_cri_desc * returnedDesc
-#pragma nowarn(1506) // warning elimination
= new(space) ex_cri_desc(givenDesc->noTuples() + 1, space);
-#pragma warn(1506) // warning elimination
ex_cri_desc * workCriDesc = new(space) ex_cri_desc(4, space);
const Int32 work_atp = 1;
@@ -813,10 +793,8 @@ short ExeUtilCleanupVolatileTables::codeGen(Generator * generator)
(ex_cri_desc *)(generator->getCriDesc(Generator::DOWN)),
(queue_index)getDefault(GEN_DDL_SIZE_DOWN),
(queue_index)getDefault(GEN_DDL_SIZE_UP),
-#pragma nowarn(1506) // warning elimination
getDefault(GEN_DDL_NUM_BUFFERS),
getDefault(GEN_DDL_BUFFER_SIZE));
-#pragma warn(1506) // warning elimination
generator->initTdbFields(exe_util_tdb);
@@ -861,9 +839,7 @@ short ExeUtilGetVolatileInfo::codeGen(Generator * generator)
= generator->getCriDesc(Generator::DOWN);
ex_cri_desc * returnedDesc
-#pragma nowarn(1506) // warning elimination
= new(space) ex_cri_desc(givenDesc->noTuples() + 1, space);
-#pragma warn(1506) // warning elimination
ex_cri_desc * workCriDesc = new(space) ex_cri_desc(4, space);
const Int32 work_atp = 1;
@@ -912,10 +888,8 @@ short ExeUtilGetVolatileInfo::codeGen(Generator * generator)
returnedDesc,
(queue_index)8,
(queue_index)64,
-#pragma nowarn(1506) // warning elimination
2, //getDefault(GEN_DDL_NUM_BUFFERS),
32000); //getDefault(GEN_DDL_BUFFER_SIZE));
-#pragma warn(1506) // warning elimination
generator->initTdbFields(exe_util_tdb);
@@ -964,9 +938,7 @@ short ExeUtilGetErrorInfo::codeGen(Generator * generator)
= generator->getCriDesc(Generator::DOWN);
ex_cri_desc * returnedDesc
-#pragma nowarn(1506) // warning elimination
= new(space) ex_cri_desc(givenDesc->noTuples() + 1, space);
-#pragma warn(1506) // warning elimination
ex_cri_desc * workCriDesc = new(space) ex_cri_desc(4, space);
const Int32 work_atp = 1;
@@ -987,10 +959,8 @@ short ExeUtilGetErrorInfo::codeGen(Generator * generator)
returnedDesc,
(queue_index)8,
(queue_index)64,
-#pragma nowarn(1506) // warning elimination
2, //getDefault(GEN_DDL_NUM_BUFFERS),
32000); //getDefault(GEN_DDL_BUFFER_SIZE));
-#pragma warn(1506) // warning elimination
generator->initTdbFields(exe_util_tdb);
@@ -1052,9 +1022,7 @@ short ExeUtilCreateTableAs::codeGen(Generator * generator)
= generator->getCriDesc(Generator::DOWN);
ex_cri_desc * returnedDesc
-#pragma nowarn(1506) // warning elimination
= new(space) ex_cri_desc(givenDesc->noTuples() + 1, space);
-#pragma warn(1506) // warning elimination
ex_cri_desc * workCriDesc = new(space) ex_cri_desc(4, space);
const Int32 work_atp = 1;
@@ -1085,10 +1053,8 @@ short ExeUtilCreateTableAs::codeGen(Generator * generator)
returnedDesc,
(queue_index)getDefault(GEN_DDL_SIZE_DOWN),
(queue_index)getDefault(GEN_DDL_SIZE_UP),
-#pragma nowarn(1506) // warning elimination
2, //getDefault(GEN_DDL_NUM_BUFFERS),
1024); //getDefault(GEN_DDL_BUFFER_SIZE));
-#pragma warn(1506) // warning elimination
exe_util_tdb->setLoadIfExists(loadIfExists_);
exe_util_tdb->setNoLoad(noLoad_);
@@ -1133,9 +1099,7 @@ short ExeUtilGetStatistics::codeGen(Generator * generator)
= generator->getCriDesc(Generator::DOWN);
ex_cri_desc * returnedDesc
-#pragma nowarn(1506) // warning elimination
= new(space) ex_cri_desc(givenDesc->noTuples() + 1, space);
-#pragma warn(1506) // warning elimination
ex_cri_desc * workCriDesc = new(space) ex_cri_desc(4, space);
const Int32 work_atp = 1;
@@ -1166,7 +1130,6 @@ short ExeUtilGetStatistics::codeGen(Generator * generator)
returnedDesc,
(queue_index)8,
(queue_index)512,
-#pragma nowarn(1506) // warning elimination
2, //getDefault(GEN_DDL_NUM_BUFFERS),
32000); //getDefault(GEN_DDL_BUFFER_SIZE));
@@ -1182,7 +1145,6 @@ short ExeUtilGetStatistics::codeGen(Generator * generator)
returnedDesc,
(queue_index)8,
(queue_index)512,
-#pragma nowarn(1506) // warning elimination
2, //getDefault(GEN_DDL_NUM_BUFFERS),
32000); //getDefault(GEN_DDL_BUFFER_SIZE));
@@ -1251,9 +1213,7 @@ short ExeUtilGetUID::codeGen(Generator * generator)
= generator->getCriDesc(Generator::DOWN);
ex_cri_desc * returnedDesc
-#pragma nowarn(1506) // warning elimination
= new(space) ex_cri_desc(givenDesc->noTuples() + 1, space);
-#pragma warn(1506) // warning elimination
ex_cri_desc * workCriDesc = new(space) ex_cri_desc(4, space);
const Int32 work_atp = 1;
@@ -1274,10 +1234,8 @@ short ExeUtilGetUID::codeGen(Generator * generator)
returnedDesc,
(queue_index)8,
(queue_index)512,
-#pragma nowarn(1506) // warning elimination
2, //getDefault(GEN_DDL_NUM_BUFFERS),
32000); //getDefault(GEN_DDL_BUFFER_SIZE));
-#pragma warn(1506) // warning elimination
generator->initTdbFields(exe_util_tdb);
@@ -1388,9 +1346,7 @@ short ExeUtilPopulateInMemStats::codeGen(Generator * generator)
= generator->getCriDesc(Generator::DOWN);
ex_cri_desc * returnedDesc
-#pragma nowarn(1506) // warning elimination
= new(space) ex_cri_desc(givenDesc->noTuples() + 1, space);
-#pragma warn(1506) // warning elimination
ex_cri_desc * workCriDesc = new(space) ex_cri_desc(4, space);
const Int32 work_atp = 1;
@@ -1473,10 +1429,8 @@ short ExeUtilPopulateInMemStats::codeGen(Generator * generator)
returnedDesc,
(queue_index)8,
(queue_index)512,
-#pragma nowarn(1506) // warning elimination
2, //getDefault(GEN_DDL_NUM_BUFFERS),
32000); //getDefault(GEN_DDL_BUFFER_SIZE));
-#pragma warn(1506) // warning elimination
generator->initTdbFields(exe_util_tdb);
@@ -1514,9 +1468,7 @@ short ExeUtilGetMetadataInfo::codeGen(Generator * generator)
= generator->getCriDesc(Generator::DOWN);
ex_cri_desc * returnedDesc
-#pragma nowarn(1506) // warning elimination
= new(space) ex_cri_desc(givenDesc->noTuples() + 1, space);
-#pragma warn(1506) // warning elimination
ex_cri_desc * workCriDesc = new(space) ex_cri_desc(4, space);
const Int32 work_atp = 1;
@@ -2185,10 +2137,8 @@ short ExeUtilGetMetadataInfo::codeGen(Generator * generator)
returnedDesc,
(queue_index)8,
(queue_index)128,
-#pragma nowarn(1506) // warning elimination
2,
32000);
-#pragma warn(1506) // warning elimination
exe_util_tdb = gm_exe_util_tdb;
}
@@ -2208,12 +2158,10 @@ short ExeUtilGetMetadataInfo::codeGen(Generator * generator)
returnedDesc,
(queue_index)8,
(queue_index)128,
-#pragma nowarn(1506) // warning elimination
2,
32000,
server,
zkPort);
-#pragma warn(1506) // warning elimination
if (hbaseObjects())
{
@@ -2339,9 +2287,7 @@ short ExeUtilMaintainObject::codeGen(Generator * generator)
= generator->getCriDesc(Generator::DOWN);
ex_cri_desc * returnedDesc
-#pragma nowarn(1506) // warning elimination
= new(space) ex_cri_desc(givenDesc->noTuples() + 1, space);
-#pragma warn(1506) // warning elimination
ex_cri_desc * workCriDesc = new(space) ex_cri_desc(4, space);
const Int32 work_atp = 1;
@@ -2441,10 +2387,8 @@ short ExeUtilMaintainObject::codeGen(Generator * generator)
returnedDesc,
(queue_index)8,
(queue_index)64,
-#pragma nowarn(1506) // warning elimination
2,
10240);
-#pragma warn(1506) // warning elimination
generator->initTdbFields(exe_util_tdb);
@@ -3196,9 +3140,7 @@ short ExeUtilFastDelete::codeGen(Generator * generator)
CollIndex i = 0;
if (stmtText)
{
-#pragma nowarn(1506) // warning elimination
i = strlen(stmtText);
-#pragma warn(1506) // warning elimination
while ((i > 0) && (getStmtText()[i-1] == ' '))
i--;
@@ -3225,9 +3167,7 @@ short ExeUtilFastDelete::codeGen(Generator * generator)
= generator->getCriDesc(Generator::DOWN);
ex_cri_desc * returnedDesc
-#pragma nowarn(1506) // warning elimination
= new(space) ex_cri_desc(givenDesc->noTuples() + 1, space);
-#pragma warn(1506) // warning elimination
ex_cri_desc * workCriDesc = new(space) ex_cri_desc(4, space);
const Int32 work_atp = 1;
@@ -3948,9 +3888,7 @@ short ExeUtilShowSet::codeGen(Generator * generator)
= generator->getCriDesc(Generator::DOWN);
ex_cri_desc * returnedDesc
-#pragma nowarn(1506) // warning elimination
= new(space) ex_cri_desc(givenDesc->noTuples() + 1, space);
-#pragma warn(1506) // warning elimination
ex_cri_desc * workCriDesc = new(space) ex_cri_desc(4, space);
const Int32 work_atp = 1;
@@ -3990,10 +3928,8 @@ short ExeUtilShowSet::codeGen(Generator * generator)
returnedDesc,
(queue_index)8,
(queue_index)64,
-#pragma nowarn(1506) // warning elimination
2,
32000); //getDefault(GEN_DDL_BUFFER_SIZE));
-#pragma warn(1506) // warning elimination
generator->initTdbFields(exe_util_tdb);
if(!generator->explainDisabled()) {
@@ -4029,9 +3965,7 @@ short ExeUtilAQR::codeGen(Generator * generator)
= generator->getCriDesc(Generator::DOWN);
ex_cri_desc * returnedDesc
-#pragma nowarn(1506) // warning elimination
= new(space) ex_cri_desc(givenDesc->noTuples() + 1, space);
-#pragma warn(1506) // warning elimination
short rc = processOutputRow(generator, 0, returnedDesc->noTuples()-1,
returnedDesc);
@@ -4061,10 +3995,8 @@ short ExeUtilAQR::codeGen(Generator * generator)
returnedDesc,
(queue_index)8,
(queue_index)64,
-#pragma nowarn(1506) // warning elimination
2,
32000);
-#pragma warn(1506) // warning elimination
generator->initTdbFields(exe_util_tdb);
exe_util_tdb->setParams(sqlcode_, nskcode_, retries_, delay_, type_);
@@ -4103,9 +4035,7 @@ short ExeUtilLobExtract::codeGen(Generator * generator)
= generator->getCriDesc(Generator::DOWN);
ex_cri_desc * returnedDesc
-#pragma nowarn(1506) // warning elimination
= new(space) ex_cri_desc(givenDesc->noTuples() + 1, space);
-#pragma warn(1506) // warning elimination
ex_cri_desc * workCriDesc = new(space) ex_cri_desc(4, space);
const Int32 work_atp = 1;
@@ -4258,10 +4188,8 @@ short ExeUtilLobExtract::codeGen(Generator * generator)
returnedDesc,
(queue_index)8,
(queue_index)128,
-#pragma nowarn(1506) // warning elimination
2,
32000);
-#pragma warn(1506) // warning elimination
if (handleInStringFormat_)
exe_util_tdb->setHandleInStringFormat(TRUE);
@@ -4330,9 +4258,7 @@ short ExeUtilLobUpdate::codeGen(Generator * generator)
= generator->getCriDesc(Generator::DOWN);
ex_cri_desc * returnedDesc
-#pragma nowarn(1506) // warning elimination
= new(space) ex_cri_desc(givenDesc->noTuples() + 1, space);
-#pragma warn(1506) // warning elimination
ex_cri_desc * workCriDesc = new(space) ex_cri_desc(4, space);
const Int32 work_atp = 1;
@@ -4438,10 +4364,8 @@ short ExeUtilLobUpdate::codeGen(Generator * generator)
returnedDesc,
(queue_index)8,
(queue_index)128,
-#pragma nowarn(1506) // warning elimination
2,
32000);
-#pragma warn(1506) // warning elimination
@@ -4509,9 +4433,7 @@ short ExeUtilLobShowddl::codeGen(Generator * generator)
= generator->getCriDesc(Generator::DOWN);
ex_cri_desc * returnedDesc
-#pragma nowarn(1506) // warning elimination
= new(space) ex_cri_desc(givenDesc->noTuples() + 1, space);
-#pragma warn(1506) // warning elimination
ex_cri_desc * workCriDesc = new(space) ex_cri_desc(4, space);
const Int32 work_atp = 1;
@@ -4612,10 +4534,8 @@ short ExeUtilLobShowddl::codeGen(Generator * generator)
returnedDesc,
(queue_index)8,
(queue_index)128,
-#pragma nowarn(1506) // warning elimination
2,
32000);
-#pragma warn(1506) // warning elimination
generator->initTdbFields(exe_util_tdb);
@@ -4820,9 +4740,7 @@ short HiveMDaccessFunc::codeGen(Generator * generator)
= generator->getCriDesc(Generator::DOWN);
ex_cri_desc * returnedDesc
-#pragma nowarn(1506) // warning elimination
= new(space) ex_cri_desc(givenDesc->noTuples() + 1, space);
-#pragma warn(1506) // warning elimination
ex_cri_desc * workCriDesc = new(space) ex_cri_desc(4, space);
const Int32 work_atp = 1;
@@ -4928,9 +4846,7 @@ short HiveMDaccessFunc::codeGen(Generator * generator)
}
// add this descriptor to the work cri descriptor.
-#pragma nowarn(1506) // warning elimination
returnedDesc->setTupleDescriptor(returnedDesc->noTuples()-1, tupleDesc);
-#pragma warn(1506) // warning elimination
ComTdbExeUtilHiveMDaccess::MDType type = ComTdbExeUtilHiveMDaccess::NOOP_;
if (mdType_ == "TABLES")
@@ -5454,9 +5370,7 @@ short ExeUtilHBaseBulkLoad::codeGen(Generator * generator)
ex_cri_desc * givenDesc = generator->getCriDesc(Generator::DOWN);
ex_cri_desc * returnedDesc
-#pragma nowarn(1506) // warning elimination
= new (space) ex_cri_desc(givenDesc->noTuples() + 1, space);
-#pragma warn(1506) // warning elimination
////ex_cri_desc * workCriDesc = new(space) ex_cri_desc(4, space);
const Int32 work_atp = 1;
@@ -5481,12 +5395,10 @@ short ExeUtilHBaseBulkLoad::codeGen(Generator * generator)
returnedDesc,
(queue_index)getDefault(GEN_DDL_SIZE_DOWN),
(queue_index)getDefault(GEN_DDL_SIZE_UP),
-#pragma nowarn(1506) // warning elimination
getDefault(GEN_DDL_NUM_BUFFERS),
1024, //getDefault(GEN_DDL_BUFFER_SIZE));
errCountTab,
logLocation);
-#pragma warn(1506) // warning elimination
exe_util_tdb->setPreloadCleanup(CmpCommon::getDefault(TRAF_LOAD_PREP_CLEANUP) == DF_ON);
exe_util_tdb->setPreparation(TRUE);
@@ -5664,9 +5576,7 @@ short ExeUtilHBaseBulkUnLoad::codeGen(Generator * generator)
ex_cri_desc * givenDesc = generator->getCriDesc(Generator::DOWN);
ex_cri_desc * returnedDesc
-#pragma nowarn(1506) // warning elimination
= new (space) ex_cri_desc(givenDesc->noTuples() + 1, space);
-#pragma warn(1506) // warning elimination
////ex_cri_desc * workCriDesc = new(space) ex_cri_desc(4, space);
const Int32 work_atp = 1;
@@ -5693,10 +5603,8 @@ short ExeUtilHBaseBulkUnLoad::codeGen(Generator * generator)
returnedDesc,
(queue_index)getDefault(GEN_DDL_SIZE_DOWN),
(queue_index)getDefault(GEN_DDL_SIZE_UP),
-#pragma nowarn(1506) // warning elimination
getDefault(GEN_DDL_NUM_BUFFERS),
1024); //getDefault(GEN_DDL_BUFFER_SIZE));
-#pragma warn(1506) // warning elimination
exe_util_tdb->setEmptyTarget(emptyTarget_);
exe_util_tdb->setLogErrors(logErrors_);
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/generator/GenRelGrby.cpp
----------------------------------------------------------------------
diff --git a/core/sql/generator/GenRelGrby.cpp b/core/sql/generator/GenRelGrby.cpp
index 6af554e..4920a35 100644
--- a/core/sql/generator/GenRelGrby.cpp
+++ b/core/sql/generator/GenRelGrby.cpp
@@ -553,9 +553,7 @@ short HashGroupBy::codeGen(Generator * generator) {
= generator->getCriDesc(Generator::DOWN);
ex_cri_desc * returnedDesc
-#pragma nowarn(1506) // warning elimination
= new(space) ex_cri_desc(givenDesc->noTuples() + 1, space);
-#pragma warn(1506) // warning elimination
generator->setCriDesc(returnedDesc, Generator::DOWN);
@@ -1365,9 +1363,7 @@ short HashGroupBy::codeGen(Generator * generator) {
ExplainTuple *childExplainTuple = generator->getExplainTuple();
returnedDesc->
-#pragma nowarn(1506) // warning elimination
setTupleDescriptor(returnedDesc->noTuples() - 1, tupleDesc);
-#pragma warn(1506) // warning elimination
// This estimate on the number of groups should work correctly even when
// under the right side of a NestedLoopJoin (i.e., multiple probes are
@@ -1738,9 +1734,7 @@ short GroupByAgg::codeGen(Generator * generator) {
= generator->getCriDesc(Generator::DOWN);
ex_cri_desc * returnedDesc
-#pragma nowarn(1506) // warning elimination
= new(space) ex_cri_desc(givenDesc->noTuples() + 1, space);
-#pragma warn(1506) // warning elimination
generator->setCriDesc(returnedDesc, Generator::DOWN);
@@ -1772,7 +1766,6 @@ short GroupByAgg::codeGen(Generator * generator) {
ExplainTuple *childExplainTuple = generator->getExplainTuple();
returnedDesc->
-#pragma nowarn(1506) // warning elimination
setTupleDescriptor(returnedDesc->noTuples() - 1, tupleDesc);
ComTdbSortGrby * sortGrbyTdb
@@ -1793,7 +1786,6 @@ short GroupByAgg::codeGen(Generator * generator) {
getDefault(GEN_SGBY_NUM_BUFFERS),
getDefault(GEN_SGBY_BUFFER_SIZE),
generator->getTolerateNonFatalError());
-#pragma warn(1506) // warning elimination
generator->initTdbFields(sortGrbyTdb);
if (isRollup())
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/generator/GenRelJoin.cpp
----------------------------------------------------------------------
diff --git a/core/sql/generator/GenRelJoin.cpp b/core/sql/generator/GenRelJoin.cpp
index 0bf75b2..245b838 100644
--- a/core/sql/generator/GenRelJoin.cpp
+++ b/core/sql/generator/GenRelJoin.cpp
@@ -560,9 +560,7 @@ short HashJoin::codeGen(Generator * generator) {
//
////////////////////////////////////////////////////////////////////////////
-#pragma nowarn(1506) // warning elimination
returnedTuples = givenDesc->noTuples();
-#pragma warn(1506) // warning elimination
if (leftOutputValIds.entries())
returnedLeftRowAtpIndex = returnedTuples++;
@@ -3116,7 +3114,6 @@ short MergeJoin::codeGen(Generator * generator)
bool yieldQuota = !(generator->getRightSideOfFlow());
UInt16 quotaPct = (UInt16) getDefault(MJ_BMO_QUOTA_PERCENT);
-#pragma nowarn(1506) // warning elimination
ComTdbMj * mj_tdb =
new(space) ComTdbMj(child_tdb1,
child_tdb2,
@@ -3155,7 +3152,6 @@ short MergeJoin::codeGen(Generator * generator)
quotaMB,
quotaPct,
yieldQuota);
-#pragma warn(1506) // warning elimination
generator->initTdbFields(mj_tdb);
if (CmpCommon::getDefault(EXE_DIAGNOSTIC_EVENTS) == DF_ON)
@@ -3486,7 +3482,6 @@ short NestedJoin::codeGen(Generator * generator)
OperatorTypeEnum rightChildOp = rightChildExpr->getOperatorType();
NABoolean usedForMvLogging = FALSE;
-#pragma nowarn(1506) // warning elimination
ComTdbOnlj * nlj_tdb =
new(space) ComTdbOnlj(tdb1,
tdb2,
@@ -3517,7 +3512,6 @@ short NestedJoin::codeGen(Generator * generator)
tolerateNonFatalError,
usedForMvLogging
);
-#pragma warn(1506) // warning elimination
// getRowsetRowCountArraySize() should return positive values
// only if isRowsetIterator() returns TRUE.
GenAssert((((getRowsetRowCountArraySize() > 0) && isRowsetIterator()) ||
@@ -3695,13 +3689,11 @@ short NestedJoinFlow::codeGen(Generator * generator)
(Cardinality) getGroupAttr()->
getOutputLogPropList()[0]->
getResultCardinality().value(),
-#pragma nowarn(1506) // warning elimination
getDefault(GEN_TFLO_NUM_BUFFERS),
getDefault(GEN_TFLO_BUFFER_SIZE),
generator->getVSBBInsert(),
isRowsetIterator(),
tolerateNonFatalError);
-#pragma warn(1506) // warning elimination
generator->initTdbFields(tflow_tdb);
// turn off the VSBB insert flag in the generator, it has been
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/generator/GenRelMisc.cpp
----------------------------------------------------------------------
diff --git a/core/sql/generator/GenRelMisc.cpp b/core/sql/generator/GenRelMisc.cpp
index c429ebe..c28916e 100644
--- a/core/sql/generator/GenRelMisc.cpp
+++ b/core/sql/generator/GenRelMisc.cpp
@@ -390,9 +390,7 @@ short DDLExpr::codeGen(Generator * generator)
// remove trailing blanks and append a semicolon, if one is not present.
char * ddlStmt = NULL;
-#pragma nowarn(1506) // warning elimination
Int32 i = strlen(getDDLStmtText());
-#pragma warn(1506) // warning elimination
while ((i > 0) && (getDDLStmtText()[i-1] == ' '))
i--;
@@ -893,9 +891,7 @@ short RelRoot::codeGen(Generator * generator)
NABoolean blankHV = FALSE ;
if (item_expr->previousHostVar()) {
Int32 j = 0;
-#pragma warning (disable : 4018) //warning elimination
for (j = 0; j < i; j++) {
-#pragma warning (default : 4018) //warning elimination
ItemExpr *ie = inputVars()[j].getItemExpr();
if (ie->getOperatorType() == ITM_HOSTVAR) {
if (item_expr->previousName() == ((HostVar *) ie)->getName()) {
@@ -904,9 +900,7 @@ short RelRoot::codeGen(Generator * generator)
}
}
-#pragma warning (disable : 4018) //warning elimination
if (i == j) {
-#pragma warning (default : 4018) //warning elimination
NAString str1 = "previousHV__";
char str2[30];
str_itoa(i, str2);
@@ -1028,16 +1022,12 @@ short RelRoot::codeGen(Generator * generator)
{
ItemExpr * item_expr = (newInputVars)[i].getItemExpr();
if (item_expr->getOperatorType() == ITM_UNIQUE_EXECUTE_ID)
-#pragma nowarn(1506) // warning elimination
uniqueExecuteIdOffset = attrs[i]->getOffset();
-#pragma warn(1506) // warning elimination
if (item_expr->getOperatorType() == ITM_GET_TRIGGERS_STATUS)
{
GenAssert(getTriggersList()->entries()>0,
"No triggers, yet TriggerStatusOffset != -1");
-#pragma nowarn(1506) // warning elimination
triggersStatusOffset = attrs[i]->getOffset();
-#pragma warn(1506) // warning elimination
}
}
@@ -1181,9 +1171,7 @@ short RelRoot::codeGen(Generator * generator)
&input_expr);
}
-#pragma nowarn(1506) // warning elimination
ex_cri_desc * cri_desc = new(space) ex_cri_desc(num_tupps, space);
-#pragma warn(1506) // warning elimination
generator->setCriDesc(cri_desc, Generator::DOWN);
generator->setInputExpr((void *)input_expr);
@@ -1406,9 +1394,7 @@ short RelRoot::codeGen(Generator * generator)
HostVar * hv = (HostVar *)(val_id.getItemExpr());
if (hv->getName() == cursorHvar->getName())
-#pragma nowarn(1506) // warning elimination
fetchedCursorHvar = (short)i+1; // 1-based
-#pragma warn(1506) // warning elimination
}
} // more input
@@ -1690,11 +1676,7 @@ short RelRoot::codeGen(Generator * generator)
}
// UDR Security
-#pragma warning (disable : 4244) //warning elimination
-#pragma nowarn(1506) // warning elimination
short noOfUdrs = generator->getBindWA()->getUdrStoiList().entries ();
-#pragma warn(1506) // warning elimination
-#pragma warning (default : 4244) //warning elimination
SqlTableOpenInfo **udrStoiList = NULL;
if ( noOfUdrs )
@@ -1765,9 +1747,7 @@ short RelRoot::codeGen(Generator * generator)
LateNameInfoList * lnil = NULL;
Int32 numEntries = 0;
if (generator->getLateNameInfoList().entries() > 0)
-#pragma nowarn(1506) // warning elimination
numEntries = generator->getLateNameInfoList().entries();
-#pragma warn(1506) // warning elimination
lnil =
(LateNameInfoList *)
space->allocateMemory( sizeof(LateNameInfoList) +
@@ -1796,9 +1776,7 @@ short RelRoot::codeGen(Generator * generator)
for (CollIndex i = 0;
i < generator->getLateNameInfoList().entries(); i++)
{
-#pragma nowarn(1506) // warning elimination
LateNameInfo * tgt = &(lnil->getLateNameInfo(i));
-#pragma warn(1506) // warning elimination
LateNameInfo * src = (LateNameInfo *)generator->getLateNameInfoList()[i];
if (src->isVariable())
{
@@ -1895,9 +1873,7 @@ short RelRoot::codeGen(Generator * generator)
} // for
}
-#pragma nowarn(1506) // warning elimination
lnil->setViewPresent(viewPresent);
-#pragma warn(1506) // warning elimination
lnil->setVariablePresent(variablePresent);
@@ -1910,13 +1886,11 @@ short RelRoot::codeGen(Generator * generator)
// it to the root_tdb
NABoolean fragmentQuotas = CmpCommon::getDefault(ESP_MULTI_FRAGMENTS) == DF_ON;
ExFragDir *exFragDir =
-#pragma nowarn(1506) // warning elimination
new(space) ExFragDir(compFragDir->entries(),space,
CmpCommon::getDefault(ESP_MULTI_FRAGMENTS) == DF_ON,
fragmentQuotas,
(UInt16)CmpCommon::getDefaultLong(ESP_MULTI_FRAGMENT_QUOTA_VM),
(UInt8)CmpCommon::getDefaultLong(ESP_NUM_FRAGMENTS));
-#pragma warn(1506) // warning elimination
// We compute the space needed in execution time for input Rowset variables
for (i = 0; i < inputVars().entries(); i++)
@@ -1964,9 +1938,7 @@ short RelRoot::codeGen(Generator * generator)
{
if (baseTablenamePosition == -1)
{
-#pragma nowarn(1506) // warning elimination
baseTablenamePosition = n;
-#pragma warn(1506) // warning elimination
}
}
}
@@ -1996,9 +1968,7 @@ short RelRoot::codeGen(Generator * generator)
{
if (baseTablenamePosition == -1)
{
-#pragma nowarn(1506) // warning elimination
baseTablenamePosition = n;
-#pragma warn(1506) // warning elimination
}
}
}
@@ -2232,14 +2202,11 @@ short RelRoot::codeGen(Generator * generator)
// This init() call passes in the space object. The root might allocate
// more space for its uses inside init().
// ---------------------------------------------------------------------
-#pragma warning (disable : 4244) //warning elimination
root_tdb->init(child_tdb,
cri_desc, // input to child
(InputOutputExpr *)input_expr,
(InputOutputExpr *)output_expr,
-#pragma nowarn(1506) // warning elimination
input_vars_size,
-#pragma warn(1506) // warning elimination
pkey_expr,
pkey_len,
pred_expr,
@@ -2275,14 +2242,10 @@ short RelRoot::codeGen(Generator * generator)
// Not needed for hbase/seabase access.
(getGroupAttr()->isEmbeddedUpdateOrDelete() &&
(NOT hdfsAccess())),
-#pragma nowarn(1506) // warning elimination
CmpCommon::getDefaultNumeric(STREAM_TIMEOUT),
-#pragma warn(1506) // warning elimination
generator->getPlanId(),
qCacheInfoBuf,
-#pragma nowarn(1506) // warning elimination
cacheVarsSize,
-#pragma warn(1506) // warning elimination
udrStoiList,
noOfUdrs,
maxResultSets,
@@ -2296,7 +2259,6 @@ short RelRoot::codeGen(Generator * generator)
compilationStatsData,
tmpLoc,
listOfSnapshotscanTables);
-#pragma warning (default : 4244) //warning elimination
root_tdb->setTdbId(generator->getAndIncTdbId());
@@ -3180,7 +3142,6 @@ short Sort::generateTdb(Generator * generator,
sortKeyLen,
sortRecLen,
sortPrefixKeyLen,
-#pragma nowarn(1506) // warning elimination
returned_desc->noTuples() - 1,
child_tdb,
given_desc,
@@ -3200,7 +3161,6 @@ short Sort::generateTdb(Generator * generator,
sort_options,
sortGrowthPercent);
sort_tdb->setCollectNFErrors(this->collectNFErrors());
-#pragma warn(1506) // warning elimination
sort_tdb->setSortFromTop(sortFromTop());
sort_tdb->setOverflowMode(generator->getOverflowMode());
@@ -4003,10 +3963,8 @@ short Tuple::codeGen(Generator * generator)
(queue_index)getDefault(GEN_TUPL_SIZE_DOWN),
(queue_index)getDefault(GEN_TUPL_SIZE_UP),
(Cardinality) (getInputCardinality() * getEstRowsUsed()).getValue(),
-#pragma nowarn(1506) // warning elimination
getDefault(GEN_TUPL_NUM_BUFFERS),
getDefault(GEN_TUPL_BUFFER_SIZE));
-#pragma warn(1506) // warning elimination
generator->initTdbFields(tuple_tdb);
if(!generator->explainDisabled()) {
@@ -4033,9 +3991,7 @@ short TupleList::codeGen(Generator * generator)
ex_cri_desc * givenDesc
= generator->getCriDesc(Generator::DOWN);
ex_cri_desc * returnedDesc
-#pragma nowarn(1506) // warning elimination
= new(space) ex_cri_desc(givenDesc->noTuples() + 1, space);
-#pragma warn(1506) // warning elimination
Int32 tuppIndex = returnedDesc->noTuples() - 1;
// disable common subexpression elimination for now.
@@ -4141,9 +4097,7 @@ short TupleList::codeGen(Generator * generator)
qList->insert(moveExpr);
}
-#pragma nowarn(1506) // warning elimination
returnedDesc->setTupleDescriptor(tuppIndex, tupleDesc);
-#pragma warn(1506) // warning elimination
// generate expression for selection predicate, if it exists
ex_expr *predExpr = NULL;
@@ -4158,9 +4112,7 @@ short TupleList::codeGen(Generator * generator)
// Try to get enough buffer space to hold twice as many records
// as the up queue.
ULng32 buffersize = getDefault(GEN_TUPL_BUFFER_SIZE);
-#pragma nowarn(1506) // warning elimination
Int32 numBuffers = getDefault(GEN_TUPL_NUM_BUFFERS);
-#pragma warn(1506) // warning elimination
queue_index upqueuelength = (queue_index)getDefault(GEN_TUPL_SIZE_UP);
ULng32 cbuffersize =
((tupleLen + sizeof(tupp_descriptor))
@@ -4168,7 +4120,6 @@ short TupleList::codeGen(Generator * generator)
SqlBufferNeededSize(0,0);
buffersize = buffersize > cbuffersize ? buffersize : cbuffersize;
-#pragma nowarn(1506) // warning elimination
ComTdbTupleLeaf *tupleTdb = new(generator->getSpace())
ComTdbTupleLeaf(qList,
tupleLen,
@@ -4181,7 +4132,6 @@ short TupleList::codeGen(Generator * generator)
(Cardinality) (getInputCardinality() * getEstRowsUsed()).getValue(),
getDefault(GEN_TUPL_NUM_BUFFERS),
buffersize);
-#pragma warn(1506) // warning elimination
generator->initTdbFields(tupleTdb);
if(!generator->explainDisabled())
@@ -4216,14 +4166,10 @@ short ExplainFunc::codeGen(Generator * generator)
= generator->getCriDesc(Generator::DOWN);
ex_cri_desc * returnedDesc
-#pragma nowarn(1506) // warning elimination
= new(space) ex_cri_desc(givenDesc->noTuples() + 1, space);
-#pragma warn(1506) // warning elimination
ex_cri_desc * paramsDesc
-#pragma nowarn(1506) // warning elimination
= new(space) ex_cri_desc(givenDesc->noTuples() + 1, space);
-#pragma warn(1506) // warning elimination
// Assumption (for now): retrievedCols contains ALL columns from
@@ -4262,9 +4208,7 @@ short ExplainFunc::codeGen(Generator * generator)
NADELETEBASIC(attrs, generator->wHeap());
// add this descriptor to the work cri descriptor.
-#pragma nowarn(1506) // warning elimination
returnedDesc->setTupleDescriptor(returnedDesc->noTuples()-1, explTupleDesc);
-#pragma warn(1506) // warning elimination
// generate explain selection expression, if present
if (! selectionPred().isEmpty())
@@ -4293,9 +4237,7 @@ short ExplainFunc::codeGen(Generator * generator)
ExpTupleDesc::LONG_FORMAT);
// add this descriptor to the work cri descriptor.
-#pragma nowarn(1506) // warning elimination
paramsDesc->setTupleDescriptor(paramsDesc->noTuples()-1, tupleDesc);
-#pragma warn(1506) // warning elimination
}
// allocate buffer space to contain atleast 2 rows.
@@ -4303,7 +4245,6 @@ short ExplainFunc::codeGen(Generator * generator)
bufferSize = MAXOF(bufferSize, 30000); // min buf size 30000
Int32 numBuffers = 3; // allocate 3 buffers
-#pragma nowarn(1506) // warning elimination
ComTdbExplain *explainTdb
= new(space)
ComTdbExplain(givenDesc, // given_cri_desc
@@ -4319,7 +4260,6 @@ short ExplainFunc::codeGen(Generator * generator)
// the explain parameters
numBuffers, // Number of buffers to allocate
bufferSize); // Size of each buffer
-#pragma warn(1506) // warning elimination
generator->initTdbFields(explainTdb);
// Add the explain Information for this node to the EXPLAIN
@@ -4419,9 +4359,7 @@ PhysTranspose::codeGen(Generator *generator)
// along.
//
returnedCriDesc =
-#pragma nowarn(1506) // warning elimination
new(space) ex_cri_desc(givenCriDesc->noTuples() + 1, space);
-#pragma warn(1506) // warning elimination
// Make all of my child's outputs map to ATP 1. Since they are
// not needed above, they will not be in the work ATP (0).
@@ -4434,9 +4372,7 @@ PhysTranspose::codeGen(Generator *generator)
// The child's outputs are needed above, so must pass them along.
//
returnedCriDesc =
-#pragma nowarn(1506) // warning elimination
new(space) ex_cri_desc(childCriDesc->noTuples() + 1, space);
-#pragma warn(1506) // warning elimination
}
// transposeCols is the last Tp in Atp 0.
@@ -4600,9 +4536,7 @@ PhysTranspose::codeGen(Generator *generator)
// Cast to cast it to the proper type.
//
castExpr = new(generator->wHeap())
-#pragma nowarn(1506) // warning elimination
Cast(keyValIdUnion->getSource(exprNum).getValueDesc()->getItemExpr(),
-#pragma warn(1506) // warning elimination
&(keyValIdUnion->getResult().getType()));
// Bind this new item expression.
@@ -4686,9 +4620,7 @@ PhysTranspose::codeGen(Generator *generator)
//
castExpr = new(generator->wHeap())
Cast(valValIdUnion->
-#pragma nowarn(1506) // warning elimination
getSource(valExprNum).getValueDesc()->getItemExpr(),
-#pragma warn(1506) // warning elimination
&(valValIdUnion->getResult().getType()));
} else {
@@ -4769,9 +4701,7 @@ PhysTranspose::codeGen(Generator *generator)
// This will be set only the first time through the loop.
//
if(exprNum == 0) {
-#pragma nowarn(1506) // warning elimination
returnedCriDesc->setTupleDescriptor(transColsAtpIndex,
-#pragma warn(1506) // warning elimination
transColsTupleDesc);
// Take the result (ie. the Cast nodes) of generateContiguousMove
@@ -4843,7 +4773,6 @@ PhysTranspose::codeGen(Generator *generator)
//
queue_index upQ = (queue_index)getDefault(GEN_TRSP_SIZE_UP);
-#pragma nowarn(1506) // warning elimination
ComTdbTranspose *transTdb =
new (space) ComTdbTranspose(childTdb,
transExprs,
@@ -4860,7 +4789,6 @@ PhysTranspose::codeGen(Generator *generator)
getDefault(GEN_TRSP_NUM_BUFFERS),
getDefault(GEN_TRSP_BUFFER_SIZE),
space);
-#pragma warn(1506) // warning elimination
generator->initTdbFields(transTdb);
// If the child's outputs are not needed above this node,
// remove the entries from the map table.
@@ -4914,9 +4842,7 @@ short PhyPack::codeGen(Generator* generator)
ex_cri_desc* givenCriDesc = generator->getCriDesc(Generator::DOWN);
// PhyPack adds one tupp to what its parent gives in its return tuple.
-#pragma nowarn(1506) // warning elimination
unsigned short returnedNoOfTuples = givenCriDesc->noTuples() + 1;
-#pragma warn(1506) // warning elimination
ex_cri_desc* returnedCriDesc =
new (space) ex_cri_desc(returnedNoOfTuples,space);
@@ -4963,9 +4889,7 @@ short PhyPack::codeGen(Generator* generator)
NADELETEBASIC(attrs,generator->wHeap());
// Store the computed tuple desc for the new tuple added by PhyPack.
-#pragma nowarn(1506) // warning elimination
returnedCriDesc->setTupleDescriptor(returnedNoOfTuples - 1,tupleDesc);
-#pragma warn(1506) // warning elimination
// Set the DOWN descriptor in the generator to what my child gets from me.
generator->setCriDesc(returnedCriDesc,Generator::DOWN);
@@ -5014,14 +4938,12 @@ short PhyPack::codeGen(Generator* generator)
ComTdbPackRows* packTdb = new (space) ComTdbPackRows (childTdb,
packExpr,
predExpr,
-#pragma nowarn(1506) // warning elimination
returnedNoOfTuples - 1,
tupleLen,
givenCriDesc,
returnedCriDesc,
(queue_index) 8,
(queue_index) 8);
-#pragma warn(1506) // warning elimination
generator->initTdbFields(packTdb);
// Add explain info of this node to the EXPLAIN fragment. Set explainTuple
@@ -5100,9 +5022,7 @@ short StatisticsFunc::codeGen(Generator* generator)
= generator->getCriDesc(Generator::DOWN);
ex_cri_desc * returnedDesc
-#pragma nowarn(1506) // warning elimination
= new(space) ex_cri_desc(givenDesc->noTuples() + 1, space);
-#pragma warn(1506) // warning elimination
// cri descriptor for work atp has 4 entries:
// first two entries for consts and temps.
@@ -5195,9 +5115,7 @@ short StatisticsFunc::codeGen(Generator* generator)
0, returnedDesc->noTuples()-1);
Lng32 numBuffers = 3;
-#pragma nowarn(1506) // warning elimination
Lng32 bufferSize = 10 * tupleLength;
-#pragma warn(1506) // warning elimination
ComTdbStats *statsTdb = new(space) ComTdbStats
(
tupleLength, // Length of stats Tuple
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/generator/GenRelPackedRows.cpp
----------------------------------------------------------------------
diff --git a/core/sql/generator/GenRelPackedRows.cpp b/core/sql/generator/GenRelPackedRows.cpp
index 4088035..8a43c49 100644
--- a/core/sql/generator/GenRelPackedRows.cpp
+++ b/core/sql/generator/GenRelPackedRows.cpp
@@ -181,14 +181,10 @@ PhysUnPackRows::codeGen(Generator *generator)
ex_cri_desc *givenCriDesc = generator->getCriDesc(Generator::DOWN);
ex_cri_desc *returnedCriDesc =
-#pragma nowarn(1506) // warning elimination
new(space) ex_cri_desc(givenCriDesc->noTuples() + 1, space);
-#pragma warn(1506) // warning elimination
ex_cri_desc *workCriDesc =
-#pragma nowarn(1506) // warning elimination
new(space) ex_cri_desc(givenCriDesc->noTuples() + 2, space);
-#pragma warn(1506) // warning elimination
// unPackCols is the next to the last Tp in Atp 0, the work ATP.
@@ -303,14 +299,10 @@ PhysUnPackRows::codeGen(Generator *generator)
&unPackColsTupleDesc,
ExpTupleDesc::SHORT_FORMAT);
-#pragma nowarn(1506) // warning elimination
workCriDesc->setTupleDescriptor(unPackColsAtpIndex,
-#pragma warn(1506) // warning elimination
unPackColsTupleDesc);
-#pragma nowarn(1506) // warning elimination
returnedCriDesc->setTupleDescriptor(unPackColsAtpIndex,
-#pragma warn(1506) // warning elimination
unPackColsTupleDesc);
@@ -436,7 +428,6 @@ PhysUnPackRows::codeGen(Generator *generator)
new (space) ComTdbUnPackRows(childTdb,
packingFactorExpr,
unPackColsExpr,
-#pragma nowarn(1506) // warning elimination
unPackColsTupleLen,
unPackColsAtpIndex,
indexValueAtpIndex,
@@ -452,7 +443,6 @@ PhysUnPackRows::codeGen(Generator *generator)
tolerateNonFatalError);
}
-#pragma warn(1506) // warning elimination
generator->initTdbFields(unPackTdb);
// Remove child's outputs from mapTable, They are not needed
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/generator/GenRelScan.cpp
----------------------------------------------------------------------
diff --git a/core/sql/generator/GenRelScan.cpp b/core/sql/generator/GenRelScan.cpp
index e9c60ac..6d62720 100644
--- a/core/sql/generator/GenRelScan.cpp
+++ b/core/sql/generator/GenRelScan.cpp
@@ -76,9 +76,7 @@ short Describe::codeGen(Generator * generator)
= generator->getCriDesc(Generator::DOWN);
ex_cri_desc * returned_desc
-#pragma nowarn(1506) // warning elimination
= new(space) ex_cri_desc(given_desc->noTuples() + 1, space);
-#pragma warn(1506) // warning elimination
ExpTupleDesc * tuple_desc = 0;
ULng32 tupleLength;
@@ -91,9 +89,7 @@ short Describe::codeGen(Generator * generator)
&tuple_desc, ExpTupleDesc::SHORT_FORMAT);
// add this descriptor to the returned cri descriptor.
-#pragma nowarn(1506) // warning elimination
returned_desc->setTupleDescriptor(returned_desc->noTuples()-1, tuple_desc);
-#pragma warn(1506) // warning elimination
char * query =
space->allocateAndCopyToAlignedSpace(originalQuery_,
@@ -135,12 +131,8 @@ short Describe::codeGen(Generator * generator)
returned_desc,
(queue_index)getDefault(GEN_DESC_SIZE_DOWN),
(queue_index)getDefault(GEN_DESC_SIZE_UP),
-#pragma nowarn(1506) // warning elimination
getDefault(GEN_DESC_NUM_BUFFERS),
-#pragma warn(1506) // warning elimination
-#pragma nowarn(1506) // warning elimination
getDefault(GEN_DESC_BUFFER_SIZE));
-#pragma warn(1506) // warning elimination
generator->initTdbFields(desc_tdb);
if(!generator->explainDisabled()) {
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/generator/GenRelSequence.cpp
----------------------------------------------------------------------
diff --git a/core/sql/generator/GenRelSequence.cpp b/core/sql/generator/GenRelSequence.cpp
index 8b7086d..39a713e 100644
--- a/core/sql/generator/GenRelSequence.cpp
+++ b/core/sql/generator/GenRelSequence.cpp
@@ -834,9 +834,7 @@ PhysSequence::codeGen(Generator *generator)
//
Int32 numberTuples = givenCriDesc->noTuples() + 1;
ex_cri_desc * returnCriDesc
-#pragma nowarn(1506) // warning elimination
= new (space) ex_cri_desc(numberTuples, space);
-#pragma warn(1506) // warning elimination
// For now, the history buffer row looks just the return row. Later,
// it may be useful to add an additional tupp for sequence function
@@ -845,9 +843,7 @@ PhysSequence::codeGen(Generator *generator)
//
const Int32 historyAtp = 0;
const Int32 historyAtpIndex = numberTuples-1;
-#pragma nowarn(1506) // warning elimination
ex_cri_desc *historyCriDesc = new (space) ex_cri_desc(numberTuples, space);
-#pragma warn(1506) // warning elimination
ExpTupleDesc *historyDesc = 0;
//seperate the read and retur expressions
@@ -947,12 +943,8 @@ PhysSequence::codeGen(Generator *generator)
&historyDesc,
ExpTupleDesc::SHORT_FORMAT);
NADELETEBASIC(attrs, wHeap);
-#pragma nowarn(1506) // warning elimination
returnCriDesc->setTupleDescriptor(historyAtpIndex, historyDesc);
-#pragma warn(1506) // warning elimination
-#pragma nowarn(1506) // warning elimination
historyCriDesc->setTupleDescriptor(historyAtpIndex, historyDesc);
-#pragma warn(1506) // warning elimination
// If there are any sequence function items, generate the sequence
// function expressions.
@@ -1054,7 +1046,6 @@ PhysSequence::codeGen(Generator *generator)
postPred,
cancelExpression,
getMinFollowingRows(),
-#pragma nowarn(1506) // warning elimination
historyRecLen,
historyAtpIndex,
childTdb,
@@ -1078,7 +1069,6 @@ PhysSequence::codeGen(Generator *generator)
numberOfWinOLAPBuffers,
noOverflow,
checkPartChangeExpr);
-#pragma warn(1506) // warning elimination
generator->initTdbFields(sequenceTdb);
// update the estimated value of HistoryRowLength with actual value
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/generator/GenRelSet.cpp
----------------------------------------------------------------------
diff --git a/core/sql/generator/GenRelSet.cpp b/core/sql/generator/GenRelSet.cpp
index 86819b7..f457400 100644
--- a/core/sql/generator/GenRelSet.cpp
+++ b/core/sql/generator/GenRelSet.cpp
@@ -95,9 +95,7 @@ short MergeUnion::codeGen(Generator * generator)
ex_cri_desc * returned_desc = NULL;
if(child(0) || child(1))
-#pragma nowarn(1506) // warning elimination
returned_desc = new(space) ex_cri_desc(given_desc->noTuples() + 1, space);
-#pragma warn(1506) // warning elimination
else
returned_desc = given_desc;
@@ -312,9 +310,7 @@ short MergeUnion::codeGen(Generator * generator)
}
// describe the returned unioned row
-#pragma nowarn(1506) // warning elimination
returned_desc->setTupleDescriptor(returned_desc->noTuples() - 1, tuple_desc);
-#pragma warn(1506) // warning elimination
// if sort-merge union is being done, generate expression to
// compare the left and the right values.
@@ -373,7 +369,6 @@ short MergeUnion::codeGen(Generator * generator)
merge_expr,
cond_expr,
trig_expr,
-#pragma nowarn(1506) // warning elimination
tuple_length, // unioned rowlen
returned_desc->noTuples()-1, // tupp index for
// unioned buffer
@@ -391,7 +386,6 @@ short MergeUnion::codeGen(Generator * generator)
rowsFromRight,
afterUpdate,
getInNotAtomicStatement());
-#pragma warn(1506) // warning elimination
generator->initTdbFields(union_tdb);
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/generator/GenResources.cpp
----------------------------------------------------------------------
diff --git a/core/sql/generator/GenResources.cpp b/core/sql/generator/GenResources.cpp
index c381df8..1348f71 100644
--- a/core/sql/generator/GenResources.cpp
+++ b/core/sql/generator/GenResources.cpp
@@ -115,9 +115,7 @@ static ExScratchDiskDrive * genScratchDisks(const NAString &def,
// ---------------------------------------------------------------------
// Calculate total generated space needed and allocate it
// ---------------------------------------------------------------------
-#pragma nowarn(1506) // warning elimination
numDirs = tempList.entries();
-#pragma warn(1506) // warning elimination
Lng32 allDirNamesLen = 0;
char *generatedDirNames = NULL;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/generator/GenStoredProc.cpp
----------------------------------------------------------------------
diff --git a/core/sql/generator/GenStoredProc.cpp b/core/sql/generator/GenStoredProc.cpp
index 0291f77..ab41559 100644
--- a/core/sql/generator/GenStoredProc.cpp
+++ b/core/sql/generator/GenStoredProc.cpp
@@ -186,9 +186,7 @@ short RelInternalSP::codeGen(Generator * generator)
= generator->getCriDesc(Generator::DOWN);
ex_cri_desc * returned_desc
-#pragma nowarn(1506) // warning elimination
= new(space) ex_cri_desc(given_desc->noTuples() + 1, space);
-#pragma warn(1506) // warning elimination
// cri descriptor for work atp has 3 entries:
// -- the first two entries for consts and temps.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/generator/GenUdr.cpp
----------------------------------------------------------------------
diff --git a/core/sql/generator/GenUdr.cpp b/core/sql/generator/GenUdr.cpp
index eb9c926..682ab6a 100644
--- a/core/sql/generator/GenUdr.cpp
+++ b/core/sql/generator/GenUdr.cpp
@@ -43,9 +43,7 @@
#include "sql_buffer.h"
#include "NAUserId.h"
#include "ComUser.h"
-#pragma warning ( disable : 4244 )
#include "ExplainTuple.h"
-#pragma warning ( default : 4244 )
#include "ExplainTupleMaster.h"
#include "ComQueue.h"
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/generator/Generator.h
----------------------------------------------------------------------
diff --git a/core/sql/generator/Generator.h b/core/sql/generator/Generator.h
index ae96334..b398703 100644
--- a/core/sql/generator/Generator.h
+++ b/core/sql/generator/Generator.h
@@ -89,7 +89,6 @@ struct CifAvgVarCharSizeCache
//////////////////////////////////////////////////////////////////////////
// class Generator
//////////////////////////////////////////////////////////////////////////
-#pragma nowarn(1506) // warning elimination
class Generator : public NABasicObject
{
enum {TRANSACTION_FLAG = 0x0001, // transaction is needed somewhere
@@ -1695,7 +1694,6 @@ public:
inline ULng32 getTopNRows() { return topNRows_; }
}; // class Generator
-#pragma warn(1506) // warning elimination
class GenOperSimilarityInfo : public NABasicObject
{
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/langman/LmContManager.cpp
----------------------------------------------------------------------
diff --git a/core/sql/langman/LmContManager.cpp b/core/sql/langman/LmContManager.cpp
index 8cf02bf..a03ec67 100644
--- a/core/sql/langman/LmContManager.cpp
+++ b/core/sql/langman/LmContManager.cpp
@@ -474,9 +474,7 @@ void LmContainerManagerCache::checkCache()
void LmContainerManagerCache::cleanCache(ComBoolean purge)
{
// Try a finite number of times.
-#pragma nowarn(1506) // warning elimination
Int32 attempts = metaContainers_->entries() / 4 + 1;
-#pragma warn(1506) // warning elimination
// Update stats.
if (purge)
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/langman/LmGenUtil.cpp
----------------------------------------------------------------------
diff --git a/core/sql/langman/LmGenUtil.cpp b/core/sql/langman/LmGenUtil.cpp
index d04dfe1..dfd1f89 100644
--- a/core/sql/langman/LmGenUtil.cpp
+++ b/core/sql/langman/LmGenUtil.cpp
@@ -50,9 +50,7 @@ LmResult setLMObjectMapping(
char *origSigPtr = sig;
LmResult retCode = LM_OK;
-#pragma nowarn(1506) // warning elimination
str_cpy_all(sig, routineSig, sigLen);
-#pragma warn(1506) // warning elimination
sig[sigLen] = '\0';
ComUInt32 pos = 0;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/langman/LmJavaOptions.h
----------------------------------------------------------------------
diff --git a/core/sql/langman/LmJavaOptions.h b/core/sql/langman/LmJavaOptions.h
index 9b39594..e13d306 100644
--- a/core/sql/langman/LmJavaOptions.h
+++ b/core/sql/langman/LmJavaOptions.h
@@ -69,7 +69,6 @@ class NAMemory;
// DLL. The Windows compiler generates a warning about them requiring
// a DLL interface in order to be used by LmJavaOptions clients. We
// will suppress such warnings.
-#pragma warning ( disable : 4251 )
class SQLLM_LIB_FUNC LmJavaOptions : public NABasicObject
{
@@ -138,6 +137,5 @@ protected:
}; // class LmJavaOptions
-#pragma warning ( default : 4251 )
#endif // LMJAVAOPTIONS_H
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/langman/LmRoutine.h
----------------------------------------------------------------------
diff --git a/core/sql/langman/LmRoutine.h b/core/sql/langman/LmRoutine.h
index 2426a2b..b95ae1f 100644
--- a/core/sql/langman/LmRoutine.h
+++ b/core/sql/langman/LmRoutine.h
@@ -35,7 +35,6 @@
// DLL. The Windows compiler generates a warning about them requiring
// a DLL interface in order to be used by LmRoutine clients. We
// will suppress such warnings.
-#pragma warning ( disable : 4251 )
#include "LmCommon.h"
#include "ComSmallDefs.h"
@@ -47,7 +46,6 @@
// DLL. The Windows compiler generates a warning about them requiring
// a DLL interface in order to be used by LmRoutine clients. We
// will suppress such warnings.
-#pragma warning ( disable : 4251 )
//////////////////////////////////////////////////////////////////////
//
@@ -246,6 +244,5 @@ private:
}; // class LmRoutine
-#pragma warning ( default : 4251 )
#endif
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/AccessSets.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/AccessSets.cpp b/core/sql/optimizer/AccessSets.cpp
index 8a4c89f..f14beeb 100644
--- a/core/sql/optimizer/AccessSets.cpp
+++ b/core/sql/optimizer/AccessSets.cpp
@@ -90,9 +90,7 @@ void TableAccess::print(FILE *ofd, const char *indent, const char *title) const
fprintf(ofd,"%s - Opaque.\n", title);
else
{
-#pragma nowarn(1506) // warning elimination
BUMP_INDENT(indent);
-#pragma warn(1506) // warning elimination
fprintf(ofd,"%s%s this=%p, NATable=%p, ",
NEW_INDENT, title, this, tableID_);
fprintf(ofd,"%s\n",
@@ -295,9 +293,7 @@ void SubTreeAccessSet::print(FILE *ofd, const char *indent, const char *title) c
{
CollIndex i;
-#pragma nowarn(1506) // warning elimination
BUMP_INDENT(indent);
-#pragma warn(1506) // warning elimination
fprintf(ofd,"%s%s %p \n", NEW_INDENT, title, this);
if (this == NULL)
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/781d97e6/core/sql/optimizer/BindItemExpr.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/BindItemExpr.cpp b/core/sql/optimizer/BindItemExpr.cpp
index 7a1ae78..a23e311 100644
--- a/core/sql/optimizer/BindItemExpr.cpp
+++ b/core/sql/optimizer/BindItemExpr.cpp
@@ -1353,10 +1353,8 @@ ItemExpr* BiRelat::tryToRelaxCharTypeMatchRules(BindWA *bindWA)
if ( leafList1 -> entries() != leafList2 -> entries() )
return this;
-#pragma warning (disable : 4018) //warning elimination
// relax by pairs
for ( Int32 i=0; i<leafList1 -> entries(); i++ ) {
-#pragma warning (default : 4018) //warning elimination
if ( performRelaxation((*leafList1)[i], (*leafList2)[i], bindWA) == FALSE )
return this; // If one pair can not be made to be type-compatible, return
// right away. The type synthesise code will flag the
@@ -6637,9 +6635,7 @@ ItemExpr *Like::applyBeginEndKeys(BindWA *bindWA, ItemExpr *boundExpr,
if (escapeNode)
{
CharInfo::CharSet cs = matchCharType->getCharSet();
-#pragma nowarn(1506) // warning elimination
escapeChar_len = escapeNode->getRawText()->length();
-#pragma warn(1506) // warning elimination
escapeChar = escapeNode->getRawText()->data();
if ( CharInfo::isSingleByteCharSet(cs) && escapeChar_len == 1) /*ok*/;
@@ -6728,21 +6724,17 @@ ItemExpr *Like::applyBeginEndKeys(BindWA *bindWA, ItemExpr *boundExpr,
Int32 pattern_str_len = 0;
pattern_str = patternNode->getRawText() -> data();
-#pragma nowarn(1506) // warning elimination
pattern_str_len = patternNode->getRawText()->length();
-#pragma warn(1506) // warning elimination
CharInfo::CharSet cs = matchCharType->getCharSet();
-#pragma nowarn(1506) // warning elimination
LikePatternString patternString( pattern_str,
pattern_str_len, cs,
escapeChar, escapeChar_len,
underscoreChar, underscoreChar_len,
percentChar, percentChar_len
);
-#pragma warn(1506) // warning elimination
LikePattern pattern(patternString, heap, cs);
@@ -6992,10 +6984,8 @@ ItemExpr *Like::applyBeginEndKeys(BindWA *bindWA, ItemExpr *boundExpr,
// Zero-pad into prefixZ, e.g. for mv type VARCHAR(4), make "ab\0\0"
char *prefixZ = new (heap) char[matchLen];
- #pragma nowarn(1506) // warning elimination
byte_str_cpy(prefixZ, matchLen, prefix.data(), prefix.length(),
(char)zeroChar);
- #pragma warn(1506) // warning elimination
ItemExpr *child1 = new (heap) SystemLiteral(
NAString(prefixZ, matchLen),
@@ -7070,10 +7060,8 @@ ItemExpr *Like::applyBeginEndKeys(BindWA *bindWA, ItemExpr *boundExpr,
if ( matchCharType->getCharSet() == CharInfo::ISO88591 )
{
foundNextKey = matchCharType->computeNextKeyValue(prefix);
- #pragma nowarn(1506) // warning elimination
byte_str_cpy(prefixZ, matchLen, prefix.data(), prefix.length(),
(char)zeroChar);
- #pragma warn(1506) // warning elimination
}
else if ( matchCharType->getCharSet() == CharInfo::UCS2 )
{
@@ -7083,20 +7071,14 @@ ItemExpr *Like::applyBeginEndKeys(BindWA *bindWA, ItemExpr *boundExpr,
foundNextKey = matchCharType->computeNextKeyValue(prefixW);
byte_str_cpy(prefixZ, matchLen,
(char*)prefixW.data(), prefixW.length()<<1,
- #pragma nowarn(1506) // warning elimination
(char)zeroChar
- #pragma warn(1506) // warning elimination
- #pragma nowarn(1506) // warning elimination
);
- #pragma warn(1506) // warning elimination
}
else if ( matchCharType->getCharSet() == CharInfo::UTF8 )
{
foundNextKey = matchCharType->computeNextKeyValue_UTF8(prefix);
- #pragma nowarn(1506) // warning elimination
byte_str_cpy(prefixZ, matchLen, prefix.data(), prefix.length(),
(char)zeroChar);
- #pragma warn(1506) // warning elimination
}
if ( foundNextKey )
@@ -8890,7 +8872,6 @@ ItemExpr *Replace::bindNode(BindWA *bindWA)
// member functions for class SelIndex
// -----------------------------------------------------------------------
-#pragma nowarn(1506) // warning elimination
ItemExpr *SelIndex::bindNode(BindWA *bindWA)
{
if (nodeIsBound())
@@ -8940,7 +8921,6 @@ ItemExpr *SelIndex::bindNode(BindWA *bindWA)
setValueId(resultTable->getValueId(i - 1));
return getValueId().getItemExpr();
}
-#pragma warn(1506) // warning elimination
// -----------------------------------------------------------------------
// member functions for class Subquery