You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by an...@apache.org on 2017/09/19 22:25:26 UTC
[8/9] incubator-trafodion git commit: TRAFODION-2731 CodeCleanup:
Phase 2: Remove obsolete code
TRAFODION-2731 CodeCleanup: Phase 2: Remove obsolete code
This phase handles the following:
-- removed files:
cli/rtdu.h, rtdu2.h, rtdu.cpp, rtdu.cpp
executor/dmeasql.h
executor/ExMeas.h, ExMeas.cpp
executor/tempfile.h, .cpp
executor/rcb.h
executor/stubs.cpp, stubs2.cpp
exp/srlversion.cpp
exp/exp_space.h
cli/VicKeyValuePair.h
cli/CliDll.cpp
cli/CliStubsStaticBuild.cpp
cli/globalsrlversion.cpp
cli/globalstubs.cpp
cli/sqlciSRLStubs.cpp
cli/test.cpp
cli/privsrlversion.cpp
common/SqlExpDllDefines.h
common/SqlExportDllDefines.h
sqlcat/enum.h
sqlcat/ReadTableDef.h, cpp
sqlcat/readRealArk.h, cpp
sqlshare/catapirequest.*
-- removed defines and code referencing them:
-- NA_STD_NAMESPACE
-- NA_NO_CMPCONTEXT
-- NA_CATMAN_SIM, NA_CATMAN_SIM_FS
-- common/purify.h
-- DONT_USE_MATH_H
-- NT_PORT
-- NA_MSVC
-- NA_NO_FRIENDS_WITH_TEMPLATE_REFS
-- NA_FLEXBUILD
-- removed multiple obsolete sqlci features and syntax:
(report writer, MACL, Help, Simulators, Utils, MXCS mode, Help,
and few others).
-- removed following files in sqlci dir:
CSInterface.h
CharSetConstants.cpp
CharSetConstants.h
MsgCat.cpp
MsgCat.h
MxciEHCallBack.cpp
MxciEHCallBack.h
RWInterface.cpp
RWInterface.h
SqlciCSCmd.cpp
SqlciCSCmd.h
SqlciCSSimulator.cpp
SqlciHelp.cpp
SqlciRWCmd.cpp
SqlciRWCmd.h
SqlciRWSimulator.cpp
SqlciUsage.cpp
SqlciUtil.cpp
SqlciUtil.h
UtilInt.cpp
UtilInt.h
UtilMsg.cpp
UtilMsg.h
immudefs.cpp
immudefs.h
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/62b45310
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/62b45310
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/62b45310
Branch: refs/heads/master
Commit: 62b45310c224be5c2e83de0ca5afbd7ad283166b
Parents: 331fbd2
Author: Anoop Sharma <an...@esgyn.com>
Authored: Sun Sep 17 23:09:11 2017 +0000
Committer: Anoop Sharma <an...@esgyn.com>
Committed: Sun Sep 17 23:09:11 2017 +0000
----------------------------------------------------------------------
core/sql/arkcmp/CmpCommon.cpp | 2 +-
core/sql/arkcmp/ProcessEnv.cpp | 2 +-
core/sql/arkcmp/cmpargs.cpp | 2 +-
core/sql/bin/arkcmp.cpp | 5 ---
core/sql/cli/Cli.h | 2 +-
core/sql/cli/Descriptor.h | 6 +--
core/sql/cli/Globals.h | 2 +-
core/sql/cli/NoWaitOp.h | 2 +-
core/sql/cli/QuasiFileManager.h | 2 +-
core/sql/cli/SQLCLIdev.h | 2 +-
core/sql/cli/Statement.h | 4 +-
core/sql/comexe/ExplainTuple.cpp | 6 +--
core/sql/comexe/PartInputDataDesc.cpp | 39 -----------------
core/sql/common/BaseTypes.h | 9 +---
core/sql/common/CharType.cpp | 2 +-
core/sql/common/CmpCommon.h | 15 ++-----
core/sql/common/Collections.h | 8 +---
core/sql/common/ComAnsiNamePart.h | 4 --
core/sql/common/ComObjectName.h | 4 --
core/sql/common/ComRoutineActionNamePart.h | 6 ---
core/sql/common/ComRtUtils.h | 2 -
core/sql/common/ComSmallDefs.cpp | 2 +-
core/sql/common/ComSmallDefs.h | 4 --
core/sql/common/ComSpace.h | 5 ---
core/sql/common/DgBaseType.cpp | 2 +-
core/sql/common/Ipc.h | 4 --
core/sql/common/NAHeap.h | 4 --
core/sql/common/NAMemory.h | 4 --
core/sql/common/NAType.cpp | 2 +-
core/sql/common/NumericType.cpp | 2 +-
core/sql/common/Platform.h | 6 ---
core/sql/common/charinfo.cpp | 4 --
core/sql/common/dfs2rec.h | 2 -
core/sql/common/purify.h | 36 ---------------
core/sql/eh/EHJmpBufStack.cpp | 2 +-
core/sql/executor/ExHbaseAccess.h | 13 ------
core/sql/executor/ExHdfsScan.h | 13 ------
core/sql/executor/ExRsInfo.h | 16 +++----
core/sql/executor/MdamRefListEntry.h | 2 +-
core/sql/executor/dfs2fe.h | 3 +-
core/sql/executor/ex_exe_stmt_globals.h | 8 ++--
core/sql/executor/ex_frag_rt.h | 6 +--
core/sql/executor/ex_root.cpp | 2 +-
core/sql/executor/ex_split_bottom.cpp | 2 +-
core/sql/exp/ExpConvMxcs.cpp | 2 +-
core/sql/exp/exp_comp.cpp | 24 ----------
core/sql/exp/exp_fixup.cpp | 2 +-
core/sql/exp/exp_function.cpp | 2 +-
core/sql/export/ComDiags.cpp | 4 --
core/sql/export/ComMemoryDiags.h | 6 ---
core/sql/export/HeapLog.cpp | 5 ---
core/sql/export/NABasicObject.cpp | 5 ---
core/sql/export/NABasicObject.h | 29 -------------
core/sql/export/NAStringDef.cpp | 2 -
core/sql/export/NAStringDef.h | 2 -
core/sql/generator/GenPreCode.cpp | 4 +-
core/sql/optimizer/ControlDB.h | 4 --
core/sql/optimizer/CostScalar.h | 27 ++----------
core/sql/optimizer/GroupAttr.cpp | 4 +-
core/sql/optimizer/NormItemExpr.cpp | 2 +-
core/sql/optimizer/NormRelExpr.cpp | 2 -
core/sql/optimizer/PhyProp.cpp | 3 +-
core/sql/optimizer/SearchKey.cpp | 2 +-
core/sql/optimizer/ValueDesc.cpp | 2 +-
core/sql/parser/ElemDDLNode.cpp | 2 +-
core/sql/parser/ElemDDLPartition.cpp | 2 +-
core/sql/parser/HvRoles_templ.cpp | 2 +-
core/sql/qms/QmpMain.cpp | 7 ---
core/sql/sort/DiskPool_base.h | 6 +--
core/sql/sort/DiskPool_sq.h | 2 +-
core/sql/sort/SortAlgo.cpp | 2 +-
core/sql/sort/diskpool_sq.cpp | 2 +-
core/sql/sqlci/ShellCmd.cpp | 2 +-
core/sql/sqlci/SqlciEnv.cpp | 2 -
core/sql/sqlci/SqlciList_templ.h | 2 -
core/sql/sqlci/SqlciParser.cpp | 41 +++--------------
core/sql/sqlci/SqlciStats.h | 2 +-
core/sql/sqlci/sqlci_lex.ll | 58 -------------------------
core/sql/sqlci/sqlci_yacc.y | 6 ---
core/sql/sqlcomp/CmpMain.cpp | 28 ++----------
core/sql/sqlcomp/parser.cpp | 1 -
core/sql/sqlmsg/ComDiagsMsg.cpp | 2 +-
core/sql/sqlmsg/ErrorMessage.h | 1 -
core/sql/sqlmsg/ParserMsg.cpp | 2 -
core/sql/ustat/hs_lex.ll | 4 +-
core/sql/ustat/hs_update.cpp | 2 +-
86 files changed, 87 insertions(+), 494 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/62b45310/core/sql/arkcmp/CmpCommon.cpp
----------------------------------------------------------------------
diff --git a/core/sql/arkcmp/CmpCommon.cpp b/core/sql/arkcmp/CmpCommon.cpp
index c32d206..1077b75 100644
--- a/core/sql/arkcmp/CmpCommon.cpp
+++ b/core/sql/arkcmp/CmpCommon.cpp
@@ -38,7 +38,7 @@
*****************************************************************************
*/
-#include <stdio.h> // NT_PORT ( bd 10/24/96 ) define NULL
+#include <stdio.h>
#include <iostream>
#include "Platform.h"
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/62b45310/core/sql/arkcmp/ProcessEnv.cpp
----------------------------------------------------------------------
diff --git a/core/sql/arkcmp/ProcessEnv.cpp b/core/sql/arkcmp/ProcessEnv.cpp
index 08149b9..39597e4 100644
--- a/core/sql/arkcmp/ProcessEnv.cpp
+++ b/core/sql/arkcmp/ProcessEnv.cpp
@@ -40,7 +40,7 @@
-#include "Platform.h" // NT_PORT SK 02/08/97
+#include "Platform.h"
#include "Collections.h"
#include "ProcessEnv.h"
#include "CmpCommon.h"
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/62b45310/core/sql/arkcmp/cmpargs.cpp
----------------------------------------------------------------------
diff --git a/core/sql/arkcmp/cmpargs.cpp b/core/sql/arkcmp/cmpargs.cpp
index 6ebfa91..0780021 100644
--- a/core/sql/arkcmp/cmpargs.cpp
+++ b/core/sql/arkcmp/cmpargs.cpp
@@ -33,7 +33,7 @@
******************************************************************************
*/
-#include "Platform.h" // NT_PORT SK 02/08/97
+#include "Platform.h"
#include <ctype.h>
#include <iostream>
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/62b45310/core/sql/bin/arkcmp.cpp
----------------------------------------------------------------------
diff --git a/core/sql/bin/arkcmp.cpp b/core/sql/bin/arkcmp.cpp
index 638ba55..251deef 100644
--- a/core/sql/bin/arkcmp.cpp
+++ b/core/sql/bin/arkcmp.cpp
@@ -291,11 +291,6 @@ Int32 main(Int32 argc, char **argv)
exCmpMessage.clearAllObjects();
exCmpMessage.receive();
-#ifdef NA_LINUX_SETENV
- //SQ_TBD
- putenv("SQLMX_MODULE_DIR=../sqlmx/USERMODULES/");
- putenv("SQLMX_SYSMODULE_DIR=../sqlmx/SYSTEMMODULES/");
-#endif
}
// in most (probably all?) cases, an mxci-spawned mxcmp calls NAExit
// in CmpConnection.cpp. So, everything below this line is probably
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/62b45310/core/sql/cli/Cli.h
----------------------------------------------------------------------
diff --git a/core/sql/cli/Cli.h b/core/sql/cli/Cli.h
index 0a1ca29..4784af1 100644
--- a/core/sql/cli/Cli.h
+++ b/core/sql/cli/Cli.h
@@ -45,7 +45,7 @@
#include "SQLCLIdev.h"
#include "ExpLOBexternal.h"
#include "ComDiags.h"
-class CliStatement;
+class Statement;
class CliGlobals;
class ContextCli;
class Descriptor;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/62b45310/core/sql/cli/Descriptor.h
----------------------------------------------------------------------
diff --git a/core/sql/cli/Descriptor.h b/core/sql/cli/Descriptor.h
index b092069..5f27d0f 100644
--- a/core/sql/cli/Descriptor.h
+++ b/core/sql/cli/Descriptor.h
@@ -54,7 +54,7 @@
class ContextCli;
class Attributes;
-class CliStatement;
+class Statement;
// -----------------------------------------------------------------------
// BulkMoveInfo
@@ -387,7 +387,7 @@ class Descriptor : public ExGod {
BulkMoveInfo *bmInfo_;
// the statement for which bulk move was done from/to this descriptor.
- CliStatement * bulkMoveStmt_;
+ Statement * bulkMoveStmt_;
ContextCli *context_; // the context that contains this descriptor
@@ -729,7 +729,7 @@ public:
return ((rowwiseRowsetV2()) && (NOT rowwiseRowsetDisabled()));
}
- CliStatement* &bulkMoveStmt() { return bulkMoveStmt_; }
+ Statement* &bulkMoveStmt() { return bulkMoveStmt_; }
NABoolean isDescTypeWide();
void setDescTypeWide(NABoolean v)
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/62b45310/core/sql/cli/Globals.h
----------------------------------------------------------------------
diff --git a/core/sql/cli/Globals.h b/core/sql/cli/Globals.h
index 7687639..3afa185 100644
--- a/core/sql/cli/Globals.h
+++ b/core/sql/cli/Globals.h
@@ -72,7 +72,7 @@
#include "ComRtUtils.h"
#include "ComSmallDefs.h"
class ContextCli;
-class CliStatement; // $$$ possibly a stub for QuasiFileberManager
+class Statement; // $$$ possibly a stub for QuasiFileberManager
class ComDiagsArea; // $$$ possibly a stub for QuasiFileberManager
class ExEspManager;
class ExSsmpManager;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/62b45310/core/sql/cli/NoWaitOp.h
----------------------------------------------------------------------
diff --git a/core/sql/cli/NoWaitOp.h b/core/sql/cli/NoWaitOp.h
index 3d218b5..9879d8e 100644
--- a/core/sql/cli/NoWaitOp.h
+++ b/core/sql/cli/NoWaitOp.h
@@ -40,7 +40,7 @@
//#include "Statement.h"
//#include "Descriptor.h"
-class CliStatement;
+class Statement;
class Descriptor;
class NoWaitOp;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/62b45310/core/sql/cli/QuasiFileManager.h
----------------------------------------------------------------------
diff --git a/core/sql/cli/QuasiFileManager.h b/core/sql/cli/QuasiFileManager.h
index ea0a210..b30f2ee 100644
--- a/core/sql/cli/QuasiFileManager.h
+++ b/core/sql/cli/QuasiFileManager.h
@@ -39,7 +39,7 @@
*/
#include "NoWaitOp.h"
-class CliStatement;
+class Statement;
class IpcEnvironment;
class ComDiagsArea;
class HashQueue;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/62b45310/core/sql/cli/SQLCLIdev.h
----------------------------------------------------------------------
diff --git a/core/sql/cli/SQLCLIdev.h b/core/sql/cli/SQLCLIdev.h
index 438b052..3dddf9e 100644
--- a/core/sql/cli/SQLCLIdev.h
+++ b/core/sql/cli/SQLCLIdev.h
@@ -44,7 +44,7 @@
/*#include "ExpLOBexternal.h"*/
class ComDiagsArea;
-class CliStatement;
+class Statement;
class ComTdb;
class ExStatisticsArea;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/62b45310/core/sql/cli/Statement.h
----------------------------------------------------------------------
diff --git a/core/sql/cli/Statement.h b/core/sql/cli/Statement.h
index 30b5c3f..724d3e0 100644
--- a/core/sql/cli/Statement.h
+++ b/core/sql/cli/Statement.h
@@ -72,8 +72,7 @@ class ExRsInfo;
class AQRStatementInfo;
class StrTarget;
-class CliStatement;
-#define Statement CliStatement
+class Statement;
////////////////////////////////////////////////////////////////////////
// this class stores statement information that is needed on each cli
@@ -413,7 +412,6 @@ private:
void buildConsumerQueryTemplate();
// returns true, if plan has been fixed up. 0, otherwise.
- // NT_PORT ( bd 10/22/96 )
inline short fixupState();
inline void setFixupState(short state);
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/62b45310/core/sql/comexe/ExplainTuple.cpp
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ExplainTuple.cpp b/core/sql/comexe/ExplainTuple.cpp
index f1599ce..b7f0a06 100644
--- a/core/sql/comexe/ExplainTuple.cpp
+++ b/core/sql/comexe/ExplainTuple.cpp
@@ -517,7 +517,7 @@ void
ExplainTupleMaster::setCardinality(double card)
{
- float fcard = (float) card; // NT_PORT ( bd 10/22/96 ) cast to float
+ float fcard = (float) card;
setCol(EX_COL_CARD, &fcard, 0, 0);
}
@@ -526,7 +526,7 @@ ExplainTupleMaster::setCardinality(double card)
void
ExplainTupleMaster::setOperatorCost(double opCost)
{
- float fopCost = (float) opCost; // NT_PORT ( bd 10/22/96 ) cast to float
+ float fopCost = (float) opCost;
setCol(EX_COL_OPCOST, &fopCost, 0, 0);
}
@@ -534,7 +534,7 @@ ExplainTupleMaster::setOperatorCost(double opCost)
void
ExplainTupleMaster::setTotalCost(double totCost)
{
- float ftotCost = (float) totCost; // NT_PORT ( bd 10/22/96 ) cast to float
+ float ftotCost = (float) totCost;
setCol(EX_COL_TOTCOST, &ftotCost, 0, 0);
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/62b45310/core/sql/comexe/PartInputDataDesc.cpp
----------------------------------------------------------------------
diff --git a/core/sql/comexe/PartInputDataDesc.cpp b/core/sql/comexe/PartInputDataDesc.cpp
index 894c42a..e48a1ae 100644
--- a/core/sql/comexe/PartInputDataDesc.cpp
+++ b/core/sql/comexe/PartInputDataDesc.cpp
@@ -484,14 +484,7 @@ char *ExPartInputDataDesc::findVTblPtr(short classID)
void ExPartInputDataDesc::fixupVTblPtr()
{
-#if defined( NA_MSVC )
char * to_vtbl_ptr = (char *) this;
-#else
- // virtual function in NABasicObject, so layout of objects
- // is changed, now -wlr-
- // (char *) this + sizeof(ExPartInputDataDesc) - sizeof(char *);;
- char * to_vtbl_ptr = (char *) this + sizeof(NABasicObject) - sizeof(char *);;
-#endif
char * from_vtbl_ptr;
switch (partType_)
@@ -499,67 +492,35 @@ void ExPartInputDataDesc::fixupVTblPtr()
case HASH_PARTITIONED:
{
ExHashPartInputData partInputDataDesc (NULL,1);
-#if defined( NA_MSVC )
from_vtbl_ptr = (char *)&partInputDataDesc;
-#else
- // virtual function in NABasicObject, so layout of objects
- // is changed, now -wlr-
- // from_vtbl_ptr = (char *)&partInputDataDesc + sizeof(ExPartInputDataDesc) - sizeof(char *);
- from_vtbl_ptr = (char *)&partInputDataDesc + sizeof(NABasicObject) - sizeof(char *);
-#endif
str_cpy_all(to_vtbl_ptr, from_vtbl_ptr, sizeof(char *));
}
break;
case RANGE_PARTITIONED:
{
ExRangePartInputData partInputDataDesc (NULL,0,0,0,0,NULL,0);
-#if defined( NA_MSVC )
from_vtbl_ptr = (char *)&partInputDataDesc;
-#else
- // virtual function in NABasicObject, so layout of objects
- // is changed, now -wlr-
- // from_vtbl_ptr = (char *)&partInputDataDesc + sizeof(ExPartInputDataDesc) - sizeof(char *);
- from_vtbl_ptr = (char *)&partInputDataDesc + sizeof(NABasicObject) - sizeof(char *);
-#endif
str_cpy_all(to_vtbl_ptr, from_vtbl_ptr, sizeof(char *));
}
break;
case ROUNDROBIN_PARTITIONED:
{
ExRoundRobinPartInputData partInputDataDesc (NULL,1,1);
-#if defined( NA_MSVC )
from_vtbl_ptr = (char *)&partInputDataDesc;
-#else
- from_vtbl_ptr = (char *)&partInputDataDesc + sizeof(NABasicObject) - sizeof(char *);
-#endif
str_cpy_all(to_vtbl_ptr, from_vtbl_ptr, sizeof(char *));
}
break;
case HASH1_PARTITIONED:
{
ExHashDistPartInputData partInputDataDesc (NULL,1,1);
-#if defined( NA_MSVC )
from_vtbl_ptr = (char *)&partInputDataDesc;
-#else
- // virtual function in NABasicObject, so layout of objects
- // is changed, now -wlr-
- // from_vtbl_ptr = (char *)&partInputDataDesc + sizeof(ExPartInputDataDesc) - sizeof(char *);
- from_vtbl_ptr = (char *)&partInputDataDesc + sizeof(NABasicObject) - sizeof(char *);
-#endif
str_cpy_all(to_vtbl_ptr, from_vtbl_ptr, sizeof(char *));
}
break;
case HASH2_PARTITIONED:
{
ExHash2PartInputData partInputDataDesc (NULL,1);
-#if defined( NA_MSVC )
from_vtbl_ptr = (char *)&partInputDataDesc;
-#else
- // virtual function in NABasicObject, so layout of objects
- // is changed, now -wlr-
- // from_vtbl_ptr = (char *)&partInputDataDesc + sizeof(ExPartInputDataDesc) - sizeof(char *);
- from_vtbl_ptr = (char *)&partInputDataDesc + sizeof(NABasicObject) - sizeof(char *);
-#endif
str_cpy_all(to_vtbl_ptr, from_vtbl_ptr, sizeof(char *));
}
break;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/62b45310/core/sql/common/BaseTypes.h
----------------------------------------------------------------------
diff --git a/core/sql/common/BaseTypes.h b/core/sql/common/BaseTypes.h
index 6bea280..15703bb 100644
--- a/core/sql/common/BaseTypes.h
+++ b/core/sql/common/BaseTypes.h
@@ -38,16 +38,11 @@
#include "Platform.h"
- #include <stdio.h>
- #include <stdlib.h>
+#include <stdio.h>
+#include <stdlib.h>
-#ifdef NA_STD_NAMESPACE
#include <iostream>
using namespace std;
-#else
- #include <iostream>
-#endif
-
#include "NAAssert.h"
#include "NAHeap.h"
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/62b45310/core/sql/common/CharType.cpp
----------------------------------------------------------------------
diff --git a/core/sql/common/CharType.cpp b/core/sql/common/CharType.cpp
index eaedfc1..2a56ecb 100644
--- a/core/sql/common/CharType.cpp
+++ b/core/sql/common/CharType.cpp
@@ -1164,7 +1164,7 @@ void CharType::generateTextThenSetDisplayDataType ( CharInfo::CharSet cs // in
//LCOV_EXCL_START :rfi
void CharType::print(FILE *ofd, const char *indent)
{
-#ifdef TRACING_ENABLED // NT_PORT ( bd 8/4/96 )
+#ifdef TRACING_ENABLED
fprintf(ofd,"%s%s\n",indent,getTypeSQLname());
#endif
} // CharType::print()
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/62b45310/core/sql/common/CmpCommon.h
----------------------------------------------------------------------
diff --git a/core/sql/common/CmpCommon.h b/core/sql/common/CmpCommon.h
index 91716b9..74393ad 100644
--- a/core/sql/common/CmpCommon.h
+++ b/core/sql/common/CmpCommon.h
@@ -200,18 +200,11 @@ public:
// request if possible.
// Notice this *always* asserts something, even if NDEBUG is TRUE.
//
-#ifdef NA_NO_CMPCONTEXT
- // This is for the common code (e.g. parser) shared by sqlc and arkcmp:
- // It won't put the internal error into Diags area, instead just print it.
- #define CMPASSERT(b) \
- { if (!(b)) NAAssert("" # b "", __FILE__, __LINE__); }
-#else
- #define CMPASSERT(b) \
- { if (!(b)) CmpAssertInternal("" # b "", __FILE__, __LINE__); }
-#endif
+#define CMPASSERT(b) \
+ { if (!(b)) CmpAssertInternal("" # b "", __FILE__, __LINE__); }
- #define CMPASSERT_STRING(b,str) \
- { if (!(b)) { cerr << str << endl; CMPASSERT(b); }}
+#define CMPASSERT_STRING(b,str) \
+ { if (!(b)) { cerr << str << endl; CMPASSERT(b); }}
// The following DCMPASSERT is for supporting an assert mechanism for the
// compiler that gets disabled in RELEASE (NDEBUG) code:
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/62b45310/core/sql/common/Collections.h
----------------------------------------------------------------------
diff --git a/core/sql/common/Collections.h b/core/sql/common/Collections.h
index acccd94..a317cfb 100644
--- a/core/sql/common/Collections.h
+++ b/core/sql/common/Collections.h
@@ -342,13 +342,7 @@ public:
inline CollIndex getUsedLength() const {return usedLength_; }
-// The c89 compiler doesn't recognize the friend declaration above.
-// For now, make all methods public when using c89.
-
-#if !defined( NA_MSVC ) && !defined(NA_NO_FRIENDS_WITH_TEMPLATE_REFS)
-
-protected: // NT_PORT SK 04/08/97
-#endif // ! NA_MSVC && ! NA_NO_FRIENDS_WITH_TEMPLATE_REFS
+ //protected:
// default constructor(empty collection)
NACollection(CollIndex initLen = 0) : heap_(NULL)
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/62b45310/core/sql/common/ComAnsiNamePart.h
----------------------------------------------------------------------
diff --git a/core/sql/common/ComAnsiNamePart.h b/core/sql/common/ComAnsiNamePart.h
index a655908..7b64171 100644
--- a/core/sql/common/ComAnsiNamePart.h
+++ b/core/sql/common/ComAnsiNamePart.h
@@ -40,12 +40,8 @@
#include "Platform.h"
#include "NAWinNT.h" // for wchar (tcr)
-#ifdef NA_STD_NAMESPACE
#include <iosfwd>
using namespace std;
-#else
-#include <iostream>
-#endif
#include <string.h>
#include "ComOperators.h"
#include "ComSmallDefs.h"
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/62b45310/core/sql/common/ComObjectName.h
----------------------------------------------------------------------
diff --git a/core/sql/common/ComObjectName.h b/core/sql/common/ComObjectName.h
index 0b07a49..b18c4a9 100644
--- a/core/sql/common/ComObjectName.h
+++ b/core/sql/common/ComObjectName.h
@@ -47,12 +47,8 @@
*****************************************************************************
*/
-#ifdef NA_STD_NAMESPACE
#include <iosfwd>
using namespace std;
-#else
-#include <iostream>
-#endif
#include "NABoolean.h"
#include "NAString.h"
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/62b45310/core/sql/common/ComRoutineActionNamePart.h
----------------------------------------------------------------------
diff --git a/core/sql/common/ComRoutineActionNamePart.h b/core/sql/common/ComRoutineActionNamePart.h
index 4c6134e..a6f6ebd 100644
--- a/core/sql/common/ComRoutineActionNamePart.h
+++ b/core/sql/common/ComRoutineActionNamePart.h
@@ -39,14 +39,8 @@
#include "Platform.h"
#include "NAWinNT.h" // for wchar (tcr)
-#ifdef NA_STD_NAMESPACE
#include <iosfwd>
using namespace std;
-#else
-#pragma nowarn (1506) // warning elimination
-#include <iostream.h>
-#pragma warn (1506) // warning elimination
-#endif
#include <string.h>
#include "ComOperators.h"
#include "ComSmallDefs.h"
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/62b45310/core/sql/common/ComRtUtils.h
----------------------------------------------------------------------
diff --git a/core/sql/common/ComRtUtils.h b/core/sql/common/ComRtUtils.h
index 3f7e4f7..94d309c 100644
--- a/core/sql/common/ComRtUtils.h
+++ b/core/sql/common/ComRtUtils.h
@@ -77,10 +77,8 @@ const char * ComRtGetNextInternalModName(Lng32 &index, char * modNameBuf);
// Class to read an oss file by oss path name or Guardian File name
// -----------------------------------------------------------------------
-#ifdef NA_STD_NAMESPACE
#include <iosfwd>
using namespace std;
-#endif
class ModuleOSFile
{
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/62b45310/core/sql/common/ComSmallDefs.cpp
----------------------------------------------------------------------
diff --git a/core/sql/common/ComSmallDefs.cpp b/core/sql/common/ComSmallDefs.cpp
index 7986305..3257ca8 100644
--- a/core/sql/common/ComSmallDefs.cpp
+++ b/core/sql/common/ComSmallDefs.cpp
@@ -135,7 +135,7 @@ ostream & operator << (ostream &s, const ComUID &uid)
num = uid.data;
while (num > 0)
{
- digit = (Int32) (num % 10); // NT_PORT (10/17/96)
+ digit = (Int32) (num % 10);
num = num / 10;
#pragma nowarn(1506) // warning elimination
buf[i--] = digit+'0';
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/62b45310/core/sql/common/ComSmallDefs.h
----------------------------------------------------------------------
diff --git a/core/sql/common/ComSmallDefs.h b/core/sql/common/ComSmallDefs.h
index ab07e6a..77914e9 100644
--- a/core/sql/common/ComSmallDefs.h
+++ b/core/sql/common/ComSmallDefs.h
@@ -40,12 +40,8 @@
*/
-#ifdef NA_STD_NAMESPACE
#include <iosfwd>
using namespace std;
-#else
-#include <iostream>
-#endif
#include <stdio.h>
#include "NAAssert.h" // required after including a RogueWave file!
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/62b45310/core/sql/common/ComSpace.h
----------------------------------------------------------------------
diff --git a/core/sql/common/ComSpace.h b/core/sql/common/ComSpace.h
index 4965c70..91e624c 100644
--- a/core/sql/common/ComSpace.h
+++ b/core/sql/common/ComSpace.h
@@ -43,14 +43,9 @@
#include <stddef.h>
#include "CollHeap.h"
-
class Block;
-#ifdef NA_STD_NAMESPACE
#include <iosfwd>
using namespace std;
-#else
-class ostream;
-#endif
/////////////////////////////////////////////////////
//
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/62b45310/core/sql/common/DgBaseType.cpp
----------------------------------------------------------------------
diff --git a/core/sql/common/DgBaseType.cpp b/core/sql/common/DgBaseType.cpp
index 795344e..f9a6225 100644
--- a/core/sql/common/DgBaseType.cpp
+++ b/core/sql/common/DgBaseType.cpp
@@ -316,6 +316,6 @@ ComDiagsArea& operator<<(ComDiagsArea& d, const DgBase & dgObj)
} // end switch.
- return d; // NT_PORT ( bd 1/14/97 ) eliminate compiler warning
+ return d;
} // end operator <<.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/62b45310/core/sql/common/Ipc.h
----------------------------------------------------------------------
diff --git a/core/sql/common/Ipc.h b/core/sql/common/Ipc.h
index 85680b4..329e386 100644
--- a/core/sql/common/Ipc.h
+++ b/core/sql/common/Ipc.h
@@ -3443,12 +3443,8 @@ private:
// -----------------------------------------------------------------------
// Default heap for IPC, using global operator new and delete
// -----------------------------------------------------------------------
-#ifdef NA_STD_NAMESPACE
#include <iosfwd>
using namespace std;
-#else
-class ostream; // needed for decl below
-#endif
// convenience function to make sure a diagnostics area is allocated
void IpcAllocateDiagsArea(ComDiagsArea *&diags, CollHeap *diagsHeap);
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/62b45310/core/sql/common/NAHeap.h
----------------------------------------------------------------------
diff --git a/core/sql/common/NAHeap.h b/core/sql/common/NAHeap.h
index 6a38511..700ce9b 100644
--- a/core/sql/common/NAHeap.h
+++ b/core/sql/common/NAHeap.h
@@ -38,12 +38,8 @@
#include "ComSpace.h"
-#ifdef NA_STD_NAMESPACE
#include <iosfwd>
using namespace std;
-#else
-class ostream;
-#endif
// -----------------------------------------------------------------------
// This file contains the memory management classes :
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/62b45310/core/sql/common/NAMemory.h
----------------------------------------------------------------------
diff --git a/core/sql/common/NAMemory.h b/core/sql/common/NAMemory.h
index a6f04c5..b66fa6b 100644
--- a/core/sql/common/NAMemory.h
+++ b/core/sql/common/NAMemory.h
@@ -64,12 +64,8 @@ template <class T> class NAList;
#endif // _DEBUG
#if (defined(_DEBUG) || defined(NSK_MEMDEBUG))
-#ifdef NA_STD_NAMESPACE
#include <iosfwd>
using namespace std;
-#else
-class ostream;
-#endif
#endif // (defined(_DEBUG) || defined(NSK_MEMDEBUG))
#include <unistd.h>
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/62b45310/core/sql/common/NAType.cpp
----------------------------------------------------------------------
diff --git a/core/sql/common/NAType.cpp b/core/sql/common/NAType.cpp
index 73595f4..b72cec2 100644
--- a/core/sql/common/NAType.cpp
+++ b/core/sql/common/NAType.cpp
@@ -400,7 +400,7 @@ NABoolean NAType::computeNextKeyValue(NAString &keyValue) const
//LCOV_EXCL_START :
void NAType::print(FILE* ofd, const char* indent)
{
-#ifdef TRACING_ENABLED // NT_PORT ( bd 8/4/96 )
+#ifdef TRACING_ENABLED
fprintf(ofd,"%s nominal size %d, total %d\n",
indent,getNominalSize(),getTotalSize());
#endif
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/62b45310/core/sql/common/NumericType.cpp
----------------------------------------------------------------------
diff --git a/core/sql/common/NumericType.cpp b/core/sql/common/NumericType.cpp
index 95612f3..e16cf57 100644
--- a/core/sql/common/NumericType.cpp
+++ b/core/sql/common/NumericType.cpp
@@ -802,7 +802,7 @@ NABoolean NumericType::createSQLLiteral(const char * buf,
// -----------------------------------------------------------------------
void NumericType::print(FILE* ofd, const char* indent)
{
-#ifdef TRACING_ENABLED // NT_PORT ( bd 8/4/96 )
+#ifdef TRACING_ENABLED
fprintf(ofd,"%s %s\n",indent,getTypeSQLname());
#endif
} // NumericType::print()
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/62b45310/core/sql/common/Platform.h
----------------------------------------------------------------------
diff --git a/core/sql/common/Platform.h b/core/sql/common/Platform.h
index 3b4933b..f648405 100644
--- a/core/sql/common/Platform.h
+++ b/core/sql/common/Platform.h
@@ -80,11 +80,6 @@
/* ----------------------------------------------------------------------- */
-/* Turn on simulated FS labels feature usage for the catman. */
-/* ----------------------------------------------------------------------- */
-#define NA_CATMAN_SIM_FS
-
-/* ----------------------------------------------------------------------- */
/* Designate use of static or dynamic queries for Update Statistics. */
/* ----------------------------------------------------------------------- */
#undef NA_USTAT_USE_STATIC
@@ -105,7 +100,6 @@
/* ----------------------------------------------------------------------- */
/* Designate if we're switched over to FLEX/BISON */
/* ----------------------------------------------------------------------- */
-/* BBZ -- this flag is used in sqlci */
#define NA_FLEXBUILD
/* ----------------------------------------------------------------------- */
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/62b45310/core/sql/common/charinfo.cpp
----------------------------------------------------------------------
diff --git a/core/sql/common/charinfo.cpp b/core/sql/common/charinfo.cpp
index c26efe8..ff019f3 100644
--- a/core/sql/common/charinfo.cpp
+++ b/core/sql/common/charinfo.cpp
@@ -55,11 +55,7 @@
#include "CmpContext.h"
#include "CmpCommon.h"
-
-
-#ifdef NA_STD_NAMESPACE
using namespace std;
-#endif
//****************************************************************************
// CHARSET stuff
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/62b45310/core/sql/common/dfs2rec.h
----------------------------------------------------------------------
diff --git a/core/sql/common/dfs2rec.h b/core/sql/common/dfs2rec.h
index 7136bd4..52d34dd 100644
--- a/core/sql/common/dfs2rec.h
+++ b/core/sql/common/dfs2rec.h
@@ -528,7 +528,6 @@ public:
len_etc.datetime_.len = (unsigned short) len;
};
-#ifdef NA_CATMAN_SIM
Lng32 getBeginType()
{
if (type == REC_DATETIME)
@@ -556,7 +555,6 @@ public:
if (type == REC_DATETIME)
len_etc.datetime_.end_type = (unsigned short) etype;
};
-#endif // NA_CATMAN_SIM
unsigned char flags;
unsigned char type;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/62b45310/core/sql/common/purify.h
----------------------------------------------------------------------
diff --git a/core/sql/common/purify.h b/core/sql/common/purify.h
deleted file mode 100644
index aa76325..0000000
--- a/core/sql/common/purify.h
+++ /dev/null
@@ -1,36 +0,0 @@
-// @@@ START COPYRIGHT @@@
-//
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements. See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership. The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License. You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations
-// under the License.
-//
-// @@@ END COPYRIGHT @@@
-
-// -------------------------------------------------------------------------
-// This .h file will define Pure Software Inc.'s purify API
-// (functions such as purify_watch)
-// if you have modified the appropriate makefile (common/makedefs.$TARGTYPE)
-// from:
-// CPLUS= nice CC
-// to:
-// CPLUS= purify CC -DPURIFY
-// -------------------------------------------------------------------------
-
-#ifdef PURIFY
- // The path below works on SunOS Unix.
- // Probably need some #ifdef's to set this path correctly for OSS and GDN.
- #include "/usr/vendor/purify/purify.h"
-#endif
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/62b45310/core/sql/eh/EHJmpBufStack.cpp
----------------------------------------------------------------------
diff --git a/core/sql/eh/EHJmpBufStack.cpp b/core/sql/eh/EHJmpBufStack.cpp
index 40f6c0a..60afb67 100644
--- a/core/sql/eh/EHJmpBufStack.cpp
+++ b/core/sql/eh/EHJmpBufStack.cpp
@@ -33,7 +33,7 @@
*/
-#include <stdio.h> // NT_PORT ( bd 10/22/96 ) NULL must be defined
+#include <stdio.h>
#include "EHCommonDefs.h"
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/62b45310/core/sql/executor/ExHbaseAccess.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExHbaseAccess.h b/core/sql/executor/ExHbaseAccess.h
index 098d779..661fa5b 100644
--- a/core/sql/executor/ExHbaseAccess.h
+++ b/core/sql/executor/ExHbaseAccess.h
@@ -43,9 +43,6 @@
// -----------------------------------------------------------------------
class ExHbaseAccessTdb;
class ExHbaseAccessTcb;
-#ifdef NEED_PSTATE
-class ExBlockingHbaseAccessPrivateState;
-#endif
// -----------------------------------------------------------------------
// Classes referenced in this file
@@ -109,9 +106,6 @@ private:
class ExHbaseAccessTcb : public ex_tcb
{
-#ifdef NEED_PSTATE
- friend class ExHbaseAccessPrivateState;
-#endif
friend class ExHbaseTaskTcb;
friend class ExHbaseScanTaskTcb;
friend class ExHbaseScanRowwiseTaskTcb;
@@ -155,13 +149,6 @@ public:
return NULL;
}
-#ifdef NEED_PSTATE
- // For dynamic queue resizing.
- virtual ex_tcb_private_state * allocatePstates(
- Lng32 &numElems, // inout, desired/actual elements
- Lng32 &pstateLength); // out, length of one element
-#endif
-
// Overridden by ExHbaseAccessSelectTcb, for which sampling may be used.
virtual Float32 getSamplePercentage() const
{
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/62b45310/core/sql/executor/ExHdfsScan.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExHdfsScan.h b/core/sql/executor/ExHdfsScan.h
index d9ab216..6a8baef 100644
--- a/core/sql/executor/ExHdfsScan.h
+++ b/core/sql/executor/ExHdfsScan.h
@@ -46,9 +46,6 @@
// -----------------------------------------------------------------------
class ExHdfsScanTdb;
class ExHdfsScanTcb;
-#ifdef NEED_PSTATE
-class ExBlockingHdfsScanPrivateState;
-#endif
// -----------------------------------------------------------------------
// Classes referenced in this file
@@ -113,10 +110,6 @@ private:
class ExHdfsScanTcb : public ex_tcb
{
-#ifdef NEED_PSTATE
- friend class ExHdfsScanPrivateState;
-#endif
-
public:
ExHdfsScanTcb( const ComTdbHdfsScan &tdb,
ex_globals *glob );
@@ -150,12 +143,6 @@ public:
else
return NULL;
}
-#ifdef NEED_PSTATE
- // For dynamic queue resizing.
- virtual ex_tcb_private_state * allocatePstates(
- Lng32 &numElems, // inout, desired/actual elements
- Lng32 &pstateLength); // out, length of one element
-#endif
protected:
enum {
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/62b45310/core/sql/executor/ExRsInfo.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExRsInfo.h b/core/sql/executor/ExRsInfo.h
index 5231184..f837af3 100644
--- a/core/sql/executor/ExRsInfo.h
+++ b/core/sql/executor/ExRsInfo.h
@@ -47,7 +47,7 @@ class ExRsInfo;
// Forward declarations
class NAMemory;
class ExUdrServer;
-class CliStatement;
+class Statement;
class ExExeStmtGlobals;
class UdrClientControlStream;
@@ -73,21 +73,21 @@ private:
virtual ~RsInfo();
//Accessors
- CliStatement * getStatement() const {return statement_;}
+ Statement * getStatement() const {return statement_;}
NABoolean getOpenAttempted() const {return openAttempted_;}
NABoolean getCloseAttempted() const {return closeAttempted_;}
NABoolean isPrepared() const {return prepared_;}
char * getProxySyntax() const { return proxySyntax_;}
//Mutators
- void setStatement(CliStatement *statement) {statement_ = statement;}
+ void setStatement(Statement *statement) {statement_ = statement;}
void setOpenAttempted(NABoolean flag) {openAttempted_ = flag;}
void setCloseAttempted(NABoolean flag) {closeAttempted_ = flag;}
void setPrepared(NABoolean flag) {prepared_ = flag;}
void setProxySyntax(char *proxySyntax) {proxySyntax_ = proxySyntax;}
//Class data members
- CliStatement *statement_;
+ Statement *statement_;
NABoolean openAttempted_;
NABoolean closeAttempted_;
NABoolean prepared_;
@@ -109,8 +109,8 @@ public:
void populate(ULng32 index,
const char * proxySyntax);
void bind(ULng32 index,
- CliStatement * statement);
- void unbind(CliStatement *statement);
+ Statement * statement);
+ void unbind(Statement *statement);
void setOpenAttempted(ULng32 index);
void setCloseAttempted(ULng32 index);
void setPrepared(ULng32 index);
@@ -120,13 +120,13 @@ public:
NABoolean closeAttempted(ULng32 index) const;
NABoolean isPrepared(ULng32 index) const;
NABoolean getRsInfo(ULng32 position, // IN
- CliStatement *&statement, // OUT
+ Statement *&statement, // OUT
const char *&proxySyntax, // OUT
NABoolean &openAttempted, // OUT
NABoolean &closeAttempted, // OUT
NABoolean &isPrepared) // OUT
const;
- ULng32 getIndex(CliStatement * statement) const;
+ ULng32 getIndex(Statement * statement) const;
ExUdrServer * getUdrServer() const {return udrServer_;}
const IpcProcessId & getIpcProcessId() const {return ipcProcessId_;}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/62b45310/core/sql/executor/MdamRefListEntry.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/MdamRefListEntry.h b/core/sql/executor/MdamRefListEntry.h
index 1841af6..fc43464 100644
--- a/core/sql/executor/MdamRefListEntry.h
+++ b/core/sql/executor/MdamRefListEntry.h
@@ -55,7 +55,7 @@ class MdamRefListEntry
// nextEntryPtr_ is set to point to the newly-created node to begin a
// circularly-linked list.
MdamRefListEntry(const Int32 disjunctNum)
- : disjunctNum_(disjunctNum) /* NT_PORT , nextEntryPtr_(this) */
+ : disjunctNum_(disjunctNum)
{
nextEntryPtr_ = this;
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/62b45310/core/sql/executor/dfs2fe.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/dfs2fe.h b/core/sql/executor/dfs2fe.h
index 075f74e..055a4de 100644
--- a/core/sql/executor/dfs2fe.h
+++ b/core/sql/executor/dfs2fe.h
@@ -21,9 +21,8 @@
#ifndef __DFS2FE__
#define __DFS2FE__
-#include "Platform.h" // NT_PORT SK 02/10/97
+#include "Platform.h"
-// NT Port - vs 01/22/97
#define dfs2fe_base 20000
enum ExeDfs2feEnum
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/62b45310/core/sql/executor/ex_exe_stmt_globals.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/ex_exe_stmt_globals.h b/core/sql/executor/ex_exe_stmt_globals.h
index c007b73..bd46988 100644
--- a/core/sql/executor/ex_exe_stmt_globals.h
+++ b/core/sql/executor/ex_exe_stmt_globals.h
@@ -147,7 +147,7 @@ class MemoryMonitor;
class ExMsgResourceInfo;
class ExScratchFileOptions;
class ComTdbRoot;
-class CliStatement;
+class Statement;
class ExUdrServer;
class ExRsInfo;
class ex_send_top_tcb;
@@ -468,7 +468,7 @@ public:
ExMasterStmtGlobals(short num_temps,
CliGlobals *cliGlobals,
- CliStatement *statement,
+ Statement *statement,
short create_gui_sched = 0,
Space * space = NULL,
CollHeap * heap = NULL);
@@ -528,7 +528,7 @@ public:
Int64 getRowsAffected() const {return rowsAffected_;}
void setRowsAffected(Int64 newRows) {rowsAffected_ = newRows;}
- inline CliStatement *getStatement() { return statement_; }
+ inline Statement *getStatement() { return statement_; }
// For asynchronous CLI cancel.
inline CancelState getCancelState() const {return cancelState_;}
@@ -601,7 +601,7 @@ private:
ExRtFragTable *fragTable_;
// Current statement
- CliStatement *statement_;
+ Statement *statement_;
// rows affected during the execution of this statement.
// Applies to rows updated/deleted/inserted ONLY.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/62b45310/core/sql/executor/ex_frag_rt.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/ex_frag_rt.h b/core/sql/executor/ex_frag_rt.h
index 00400ac..e218c31 100644
--- a/core/sql/executor/ex_frag_rt.h
+++ b/core/sql/executor/ex_frag_rt.h
@@ -513,7 +513,7 @@ class ExEspManager
ComDiagsArea **diags,
LIST(ExEspDbEntry *) &alreadyAssignedEsps,
CollHeap *statementHeap,
- CliStatement *statement,
+ Statement *statement,
const char * clusterName,
NABoolean &startedANewEsp, // returns TRUE, if a new esp was started
IpcCpuNum cpuNum,
@@ -555,7 +555,7 @@ class ExEspManager
private:
ExEspDbEntry *getEspFromCache(LIST(ExEspDbEntry *) &alreadyAssignedEsps, // multi fragment esp
CollHeap *statementHeap,
- CliStatement *statement,
+ Statement *statement,
const char *clusterName,
IpcCpuNum cpuNum,
short memoryQuota,
@@ -657,7 +657,7 @@ class ExEspDbEntry : public NABasicObject
bool inUse_;
short totalMemoryQuota_;
Lng32 usageCount_; // how many fragment instances use this process - multi-fragment
- CliStatement *statement_; // Allow multiple fragments for just this statement
+ Statement *statement_; // Allow multiple fragments for just this statement
bool soloFragment_;
};
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/62b45310/core/sql/executor/ex_root.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ex_root.cpp b/core/sql/executor/ex_root.cpp
index 0ffb4be..145f220 100644
--- a/core/sql/executor/ex_root.cpp
+++ b/core/sql/executor/ex_root.cpp
@@ -2383,7 +2383,7 @@ Int32 ex_root_tcb::cancel(ExExeStmtGlobals * glob, ComDiagsArea *&diagsArea,
// diags area. It would be nice to have a more general
// fix, but meanwhile, we store off the curr context diags
// area before calling scheduler and restore afterwards.
- CliStatement *statement =
+ Statement *statement =
glob->castToExMasterStmtGlobals()->getStatement();
ContextCli *context = statement->getContext();
ComDiagsArea *savedContextDiags = context->diags().copy();
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/62b45310/core/sql/executor/ex_split_bottom.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ex_split_bottom.cpp b/core/sql/executor/ex_split_bottom.cpp
index 5e35cc9..b53b91c 100644
--- a/core/sql/executor/ex_split_bottom.cpp
+++ b/core/sql/executor/ex_split_bottom.cpp
@@ -1698,7 +1698,7 @@ const ex_tcb* ex_split_bottom_tcb::getChild(Int32 pos) const
ex_assert((pos >= 0), "");
if (pos == 0)
return tcbChild_;
- else if (pos > 0 AND pos <= (Int32)sendNodes_.entries()) // NT_PORT ( bd 12/6/96 )
+ else if (pos > 0 AND pos <= (Int32)sendNodes_.entries())
return (ex_tcb *) sendNodes_[pos-1];
else
return NULL;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/62b45310/core/sql/exp/ExpConvMxcs.cpp
----------------------------------------------------------------------
diff --git a/core/sql/exp/ExpConvMxcs.cpp b/core/sql/exp/ExpConvMxcs.cpp
index 64dc58a..c116550 100644
--- a/core/sql/exp/ExpConvMxcs.cpp
+++ b/core/sql/exp/ExpConvMxcs.cpp
@@ -109,7 +109,7 @@
#endif
-#if defined (NA_LITTLE_ENDIAN) || defined(NA_MXCS) // NT_PORT SK 08/13/96
+#if defined (NA_LITTLE_ENDIAN) || defined(NA_MXCS)
#ifndef LLONG_MAX
#define LLONG_MAX _I64_MAX
#endif
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/62b45310/core/sql/exp/exp_comp.cpp
----------------------------------------------------------------------
diff --git a/core/sql/exp/exp_comp.cpp b/core/sql/exp/exp_comp.cpp
index d6bd42a..90fc7f8 100644
--- a/core/sql/exp/exp_comp.cpp
+++ b/core/sql/exp/exp_comp.cpp
@@ -211,7 +211,6 @@ ex_expr::exp_return_type ex_comp_clause::eval(char *op_data[],
break;
// LCOV_EXCL_START
case EQ_BIN16S_BIN32U:
- // NT_PORT (BD 7/11/96) cast to unsigned long
*(Lng32 *)op_data[0] = ((ULng32)*(short *)op_data[1] == *(ULng32 *)op_data[2]);
break;
@@ -249,19 +248,16 @@ ex_expr::exp_return_type ex_comp_clause::eval(char *op_data[],
break;
case EQ_BIN32S_BIN32U:
- // NT_PORT (BD 7/11/96) cast to unsigned long
*(Lng32 *)op_data[0] = ((ULng32)*(Lng32 *)op_data[1] == *(ULng32 *)op_data[2]);
break;
case EQ_BIN32U_BIN16S:
- // NT_PORT (BD 7/11/96) cast to unsigned long
*(Lng32 *)op_data[0] = (*(ULng32 *)op_data[1] == (ULng32)*(short *)op_data[2]);
break;
case EQ_BIN32U_BIN32S:
- // NT_PORT (BD 7/11/96) cast to unsigned long
*(Lng32 *)op_data[0] = (*(ULng32 *)op_data[1] == (ULng32)*(Lng32 *)op_data[2]);
break;
@@ -349,7 +345,6 @@ ex_expr::exp_return_type ex_comp_clause::eval(char *op_data[],
break;
case NE_BIN16S_BIN32U:
- // NT_PORT (BD 7/11/96) cast to unsigned long
*(Lng32 *)op_data[0] = ((ULng32)*(short *)op_data[1] != *(ULng32 *)op_data[2]);
break;
@@ -387,19 +382,16 @@ ex_expr::exp_return_type ex_comp_clause::eval(char *op_data[],
break;
case NE_BIN32S_BIN32U:
- // NT_PORT (BD 7/11/96) cast to unsigned long
*(Lng32 *)op_data[0] = ((ULng32)*(Lng32 *)op_data[1] != *(ULng32 *)op_data[2]);
break;
case NE_BIN32U_BIN16S:
- // NT_PORT (BD 7/11/96) cast to unsigned long
*(Lng32 *)op_data[0] = (*(ULng32 *)op_data[1] != (ULng32)*(short *)op_data[2]);
break;
case NE_BIN32U_BIN32S:
- // NT_PORT (BD 7/11/96) cast to unsigned long
*(Lng32 *)op_data[0] = (*(ULng32 *)op_data[1] != (ULng32)*(Lng32 *)op_data[2]);
break;
@@ -488,7 +480,6 @@ ex_expr::exp_return_type ex_comp_clause::eval(char *op_data[],
break;
case LT_BIN16S_BIN32U:
- // NT_PORT (BD 7/11/96) cast to long in order to handle negative values
*(Lng32 *)op_data[0] = ((Int64)*(short *)op_data[1] < (Int64)*(ULng32 *)op_data[2]);
break;
@@ -527,19 +518,16 @@ ex_expr::exp_return_type ex_comp_clause::eval(char *op_data[],
break;
case LT_BIN32S_BIN32U:
- // NT_PORT (BD 7/11/96) cast to long
*(Lng32 *)op_data[0] = ((Int64)*(Lng32 *)op_data[1] < (Int64)*(ULng32 *)op_data[2]);
break;
// LCOV_EXCL_STOP
case LT_BIN32U_BIN16S:
- // NT_PORT (BD 7/11/96) cast to long in order to handle negative values
*(Lng32 *)op_data[0] = ((Int64)*(ULng32 *)op_data[1] < *(short *)op_data[2]);
break;
case LT_BIN32U_BIN32S:
- // NT_PORT (BD 7/11/96) cast to long
*(Lng32 *)op_data[0] = ((Int64)*(ULng32 *)op_data[1] < (Int64)*(Lng32 *)op_data[2]);
break;
@@ -671,7 +659,6 @@ ex_expr::exp_return_type ex_comp_clause::eval(char *op_data[],
break;
case LE_BIN16S_BIN32U:
- // NT_PORT (BD 7/11/96) cast to long in order to handle negative values
*(Lng32 *)op_data[0] = (*(short *)op_data[1] <= (Int64)*(ULng32 *)op_data[2]);
break;
@@ -712,19 +699,16 @@ ex_expr::exp_return_type ex_comp_clause::eval(char *op_data[],
break;
case LE_BIN32S_BIN32U:
- // NT_PORT (BD 7/11/96) cast to long
*(Lng32 *)op_data[0] = ((Int64)*(Lng32 *)op_data[1] <= (Int64)*(ULng32 *)op_data[2]);
break;
// LCOV_EXCL_STOP
case LE_BIN32U_BIN16S:
- // NT_PORT (BD 7/11/96) cast to long in order to handle negative values
*(Lng32 *)op_data[0] = ((Int64)*(ULng32 *)op_data[1] <= *(short *)op_data[2]);
break;
case LE_BIN32U_BIN32S:
- // NT_PORT (BD 7/11/96) cast to unsigned long
*(Lng32 *)op_data[0] = ((Int64)*(ULng32 *)op_data[1] <= (Int64)*(Lng32 *)op_data[2]);
break;
@@ -860,7 +844,6 @@ ex_expr::exp_return_type ex_comp_clause::eval(char *op_data[],
break;
case GT_BIN16S_BIN32U:
- // NT_PORT (BD 7/11/96) cast to long in order to handle negative values
*(Lng32 *)op_data[0] = (*(short *)op_data[1] > (Int64)*(ULng32 *)op_data[2]);
break;
@@ -899,19 +882,16 @@ ex_expr::exp_return_type ex_comp_clause::eval(char *op_data[],
break;
case GT_BIN32S_BIN32U:
- // NT_PORT (BD 7/11/96) cast to long
*(Lng32 *)op_data[0] = ((Int64)*(Lng32 *)op_data[1] > (Int64)*(ULng32 *)op_data[2]);
break;
// LCOV_EXCL_STOP
case GT_BIN32U_BIN16S:
- // NT_PORT (BD 7/11/96) cast to long in order to handle negative values
*(Lng32 *)op_data[0] = ((Int64)*(ULng32 *)op_data[1] > *(short *)op_data[2]);
break;
case GT_BIN32U_BIN32S:
- // NT_PORT (BD 7/11/96) cast to long
*(Lng32 *)op_data[0] = ((Int64)*(ULng32 *)op_data[1] > (Int64)*(Lng32 *)op_data[2]);
break;
@@ -1047,7 +1027,6 @@ ex_expr::exp_return_type ex_comp_clause::eval(char *op_data[],
// LCOV_EXCL_STOP
case GE_BIN16S_BIN32U:
- // NT_PORT (BD 7/11/96) cast to long
*(Lng32 *)op_data[0] = (*(short *)op_data[1] >= (Int64)*(ULng32 *)op_data[2]);
break;
@@ -1084,19 +1063,16 @@ ex_expr::exp_return_type ex_comp_clause::eval(char *op_data[],
break;
case GE_BIN32S_BIN32U:
- // NT_PORT (BD 7/11/96) cast to long
*(Lng32 *)op_data[0] = ((Int64)*(Lng32 *)op_data[1] >= (Int64)*(ULng32 *)op_data[2]);
break;
case GE_BIN32U_BIN16S:
- // NT_PORT (BD 7/11/96) cast to long in order to handle negative values
*(Lng32 *)op_data[0] = ((Int64)*(ULng32 *)op_data[1] >= *(short *)op_data[2]);
break;
case GE_BIN32U_BIN32S:
- // NT_PORT (BD 7/11/96) cast to long
*(Lng32 *)op_data[0] = ((Int64)*(ULng32 *)op_data[1] >= (Int64)*(Lng32 *)op_data[2]);
break;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/62b45310/core/sql/exp/exp_fixup.cpp
----------------------------------------------------------------------
diff --git a/core/sql/exp/exp_fixup.cpp b/core/sql/exp/exp_fixup.cpp
index 7cb9330..756612e 100644
--- a/core/sql/exp/exp_fixup.cpp
+++ b/core/sql/exp/exp_fixup.cpp
@@ -36,7 +36,7 @@
*****************************************************************************
*/
-#include "Platform.h" // NT_PORT SK 02/10/97
+#include "Platform.h"
#include "exp_stdh.h"
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/62b45310/core/sql/exp/exp_function.cpp
----------------------------------------------------------------------
diff --git a/core/sql/exp/exp_function.cpp b/core/sql/exp/exp_function.cpp
index 9b9a407..782131e 100644
--- a/core/sql/exp/exp_function.cpp
+++ b/core/sql/exp/exp_function.cpp
@@ -2803,7 +2803,7 @@ ex_expr::exp_return_type ex_function_dayofweek::eval(char *op_data[],
day = *datetimeOpData;
interval = datetimeOpType->getTotalDays(year, month, day);
#pragma nowarn(1506) // warning elimination
- unsigned short result = (unsigned short)((interval + 1) % 7) + 1; // NT_PORT ( bd 12/9/96 ) cast to unsigned short
+ 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;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/62b45310/core/sql/export/ComDiags.cpp
----------------------------------------------------------------------
diff --git a/core/sql/export/ComDiags.cpp b/core/sql/export/ComDiags.cpp
index 41dab6f..f99bacd 100644
--- a/core/sql/export/ComDiags.cpp
+++ b/core/sql/export/ComDiags.cpp
@@ -3381,11 +3381,7 @@ void ComDiagsArea::destroyMe()
void ComDiagsArea::DiagsCondition::destroyMe()
{
-#ifdef NA_MSVC // NT_PORT (bsv 11/7/96)
this -> DiagsCondition::~DiagsCondition();
-#else
- this -> ComDiagsArea::DiagsCondition::~DiagsCondition();
-#endif
}
ComDiagsArea::DiagsCondition &
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/62b45310/core/sql/export/ComMemoryDiags.h
----------------------------------------------------------------------
diff --git a/core/sql/export/ComMemoryDiags.h b/core/sql/export/ComMemoryDiags.h
index ef8b59b..b20b244 100644
--- a/core/sql/export/ComMemoryDiags.h
+++ b/core/sql/export/ComMemoryDiags.h
@@ -42,14 +42,8 @@
// -----------------------------------------------------------------------
class ComMemoryDiags; // used to diagnose memory leaks
-
-#ifdef NA_STD_NAMESPACE
#include <iosfwd>
using namespace std;
-#else
-class ostream ; // forward decl
-#endif
-
//
// class ComMemoryDiags is simply a wrapper around the static data member
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/62b45310/core/sql/export/HeapLog.cpp
----------------------------------------------------------------------
diff --git a/core/sql/export/HeapLog.cpp b/core/sql/export/HeapLog.cpp
index 4a85299..902da3c 100644
--- a/core/sql/export/HeapLog.cpp
+++ b/core/sql/export/HeapLog.cpp
@@ -45,12 +45,7 @@
#include "HeapLog.h"
#include "HeapLogImpl.h"
-
-#ifdef NA_STD_NAMESPACE
using namespace std;
-#endif
-
-
#define HEAP_NUM_BASE 19
#define HEAP_NUM_RESERVED 9
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/62b45310/core/sql/export/NABasicObject.cpp
----------------------------------------------------------------------
diff --git a/core/sql/export/NABasicObject.cpp b/core/sql/export/NABasicObject.cpp
index d04e70f..113ade2 100644
--- a/core/sql/export/NABasicObject.cpp
+++ b/core/sql/export/NABasicObject.cpp
@@ -36,13 +36,8 @@
#include "Platform.h"
-
-#ifdef NA_STD_NAMESPACE
#include <iosfwd>
using namespace std;
-#else
-#include <iostream>
-#endif
#include <stdlib.h>
#include "ComASSERT.h"
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/62b45310/core/sql/export/NABasicObject.h
----------------------------------------------------------------------
diff --git a/core/sql/export/NABasicObject.h b/core/sql/export/NABasicObject.h
index d20c192..0af4129 100644
--- a/core/sql/export/NABasicObject.h
+++ b/core/sql/export/NABasicObject.h
@@ -43,14 +43,6 @@
#include "NAStdlib.h"
#include "NABoolean.h"
-#ifndef NULL
-#define NULL 0
-#endif
-
-
-
-
-
#define NOT_CHECK_NAHEAP(h) (h)
class NAMemory ;
@@ -148,7 +140,6 @@ typedef NAMemory CollHeap ;
class NABasicObject
{
-// NT_PORT ( bd 12/10/96 )
protected:
virtual ~NABasicObject() {};
@@ -220,7 +211,6 @@ public:
Int32 maybeInvalidObject() { return h_ == invalidHeapPtr();}
// For smart-pointer callers, some defensive programming for Debug build.
- // For some reason, this method won't link into the NSK mxcmp static object.
#if !defined(NDEBUG)
Int32 checkInvalidObject(const void* const referencingObject=NULL);
#else
@@ -295,24 +285,12 @@ void * operator new[](size_t size, CollHeap* h, NABoolean failureIsFatal);
// char* p = new (CmpCommon::contextHeap()) char[10];
// NADELETEBASIC(p,CmpCommon::contextHeap());
-#ifdef USE_RUNTIME_BUT_NOT_FOR_UNIX
-#define NADELETEBASIC(p,h) \
- (void) (!(p) || \
- (((h) ? (h)->deallocateMemory((void*)p) : (delete (void*)p)), 0) )
-#define NADELETEBASICARRAY(p,h) \
- (void) (!(p) || \
- (((h) ? (h)->deallocateMemory((void*)p) : delete [] p), 0))
-#else
#define NADELETEBASIC(p,h) \
(void) (!(p) || \
((NOT_CHECK_NAHEAP(h) ? (h)->deallocateMemory((void*)p) : delete p), 0) )
#define NADELETEBASICARRAY(p,h) \
(void) (!(p) || \
((NOT_CHECK_NAHEAP(h) ? (h)->deallocateMemory((void*)p) : delete [] p), 0))
-#endif
-
-
-
// NADELETE(p,C,h) deletes p from CollHeap h, and calls p's destructor ~C.
// so the destructor of class C will be called.
@@ -320,17 +298,10 @@ void * operator new[](size_t size, CollHeap* h, NABoolean failureIsFatal);
// ClassA* a = new(CmpCommon::contextHeap()) ClassA;
// NADELETE(a,ClassA,CmpCommon::contextHeap());
-#ifdef USE_RUNTIME_BUT_NOT_FOR_UNIX
-#define NADELETE(p,C,h) \
- (void) (!(p) || \
- (((h) ? ((p)->~C(), (h)->deallocateMemory((void*)p)) : \
- (delete (void*)p)), 0))
-#else
#define NADELETE(p,C,h) \
(void) (!(p) || \
((NOT_CHECK_NAHEAP(h) ? ((p)->~C(), (h)->deallocateMemory((void*)p)) : \
delete p), 0))
-#endif
// NADELETEARRAY(p,n,C,h) deletes p from CollHeap h, p is an array of class C
// so the destructor of C will be called for each element of p (if not NULL).
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/62b45310/core/sql/export/NAStringDef.cpp
----------------------------------------------------------------------
diff --git a/core/sql/export/NAStringDef.cpp b/core/sql/export/NAStringDef.cpp
index 7b11d06..099b51d 100644
--- a/core/sql/export/NAStringDef.cpp
+++ b/core/sql/export/NAStringDef.cpp
@@ -55,9 +55,7 @@
#include "str.h"
#include <fstream>
-#ifdef NA_STD_NAMESPACE
using namespace std;
-#endif // NA_STD_NAMESPACE
// we're using the multithread-safe versions here
#define MULTITHREAD_LOCK
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/62b45310/core/sql/export/NAStringDef.h
----------------------------------------------------------------------
diff --git a/core/sql/export/NAStringDef.h b/core/sql/export/NAStringDef.h
index fe1f44d..76e9027 100644
--- a/core/sql/export/NAStringDef.h
+++ b/core/sql/export/NAStringDef.h
@@ -42,10 +42,8 @@
#include "Platform.h"
-#ifdef NA_STD_NAMESPACE
#include <iosfwd>
using namespace std;
-#endif
// -----------------------------------------------------------------------
//
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/62b45310/core/sql/generator/GenPreCode.cpp
----------------------------------------------------------------------
diff --git a/core/sql/generator/GenPreCode.cpp b/core/sql/generator/GenPreCode.cpp
index 84edc29..95fff08 100644
--- a/core/sql/generator/GenPreCode.cpp
+++ b/core/sql/generator/GenPreCode.cpp
@@ -2312,7 +2312,7 @@ RelExpr * Join::preCodeGen(Generator * generator,
ValueIdSet discardSet;
CollIndex ne = nullInstantiatedOutput().entries();
- for (CollIndex j = 0; j < ne; j++) // NT_PORT FIX SK 07/16/96
+ for (CollIndex j = 0; j < ne; j++)
{
instNullId = nullInstantiatedOutput_[j];
GenAssert(instNullId.getItemExpr()->getOperatorType() == ITM_INSTANTIATE_NULL,"NOT instNullId.getItemExpr()->getOperatorType() == ITM_INSTANTIATE_NULL");
@@ -2356,7 +2356,7 @@ RelExpr * Join::preCodeGen(Generator * generator,
availableValues += child(1)->getGroupAttr()->getCharacteristicOutputs();
CollIndex neR = nullInstantiatedForRightJoinOutput().entries();
- for (CollIndex j = 0; j < neR; j++) // NT_PORT FIX SK 07/16/96
+ for (CollIndex j = 0; j < neR; j++)
{
instNullIdForRightJoin = nullInstantiatedForRightJoinOutput_[j];
GenAssert(instNullIdForRightJoin.getItemExpr()->getOperatorType() == ITM_INSTANTIATE_NULL,"NOT instNullId.getItemExpr()->getOperatorType() == ITM_INSTANTIATE_NULL");
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/62b45310/core/sql/optimizer/ControlDB.h
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/ControlDB.h b/core/sql/optimizer/ControlDB.h
index 1d60116..b543ae6 100644
--- a/core/sql/optimizer/ControlDB.h
+++ b/core/sql/optimizer/ControlDB.h
@@ -41,12 +41,8 @@
#include "RelControl.h"
-#ifdef NA_STD_NAMESPACE
#include <iosfwd>
using namespace std;
-#else
-class ostream;
-#endif
class ControlDB;
class ControlQueryDefault;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/62b45310/core/sql/optimizer/CostScalar.h
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/CostScalar.h b/core/sql/optimizer/CostScalar.h
index 78be834..12105e8 100644
--- a/core/sql/optimizer/CostScalar.h
+++ b/core/sql/optimizer/CostScalar.h
@@ -128,10 +128,7 @@ extern THREAD_P NABoolean ASSERTIONS_ALWAYS_ON ;
#define ASSERT_IS_A_VALID_COSTSCALAR
#endif // NDEBUG
-// for some reason, you might not want to use <math.h> functions ...
-#ifndef DONT_USE_MATH_H
#include <math.h>
-#endif
// -----------------------------------------------------------------------
// The following classes are defined in this file.
@@ -316,31 +313,15 @@ public:
// getCeiling : ceiling of 12.34 = 13.0, assumes non-negative CostScalar
CostScalar getCeiling() const
{
-#ifdef DONT_USE_MATH_H
- CMPASSERT (dpv_ >= 0) ;
- // we assume that cast-to-long does truncation
- Lng32 valLong = Lng32(dpv_) ;
- if (double(valLong) < dpv_)
- return CostScalar (double(valLong+1)) ; // go "up" to next integer
- else
- return CostScalar (double(valLong)) ; // already exactly equal to a integer
-#else
- // use ANSI c-runtime function defined in <math.h>:
- return CostScalar(ceil(getValue()));
-#endif
+ // use ANSI c-runtime function defined in <math.h>:
+ return CostScalar(ceil(getValue()));
}
// getFloor : floor of 12.34 = 12.0, assumes non-negative CostScalar
CostScalar getFloor() const
{
-#ifdef DONT_USE_MATH_H
- CMPASSERT (dpv_ >= 0) ;
- // we assume that cast-to-long does truncation
- return CostScalar (double(Lng32(dpv_))) ;
-#else
- // use ANSI c-runtime function defined in <math.h>:
- return CostScalar(floor(getValue()));
-#endif
+ // use ANSI c-runtime function defined in <math.h>:
+ return CostScalar(floor(getValue()));
}
// getValue, value : getting at the underlying double value explicitly
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/62b45310/core/sql/optimizer/GroupAttr.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/GroupAttr.cpp b/core/sql/optimizer/GroupAttr.cpp
index 1e38050..6007a4e 100644
--- a/core/sql/optimizer/GroupAttr.cpp
+++ b/core/sql/optimizer/GroupAttr.cpp
@@ -478,8 +478,8 @@ NABoolean GroupAttributes::hasCardConstraint(Cardinality &minNumOfRows,
{
NABoolean found = FALSE;
- minNumOfRows = (Cardinality)0; // NT_PORT ( bd 10/22/96 ) cast to Cardinality
- maxNumOfRows = (Cardinality)INFINITE_CARDINALITY; // NT_PORT ( bd 10/22/96 ) cast to Cardinality
+ minNumOfRows = (Cardinality)0;
+ maxNumOfRows = (Cardinality)INFINITE_CARDINALITY;
for (ValueId x= constraints_.init();
constraints_.next(x);
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/62b45310/core/sql/optimizer/NormItemExpr.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/NormItemExpr.cpp b/core/sql/optimizer/NormItemExpr.cpp
index 4a248e7..834bcf0 100644
--- a/core/sql/optimizer/NormItemExpr.cpp
+++ b/core/sql/optimizer/NormItemExpr.cpp
@@ -1712,7 +1712,7 @@ DisjunctArray * BiLogic::mdamTreeWalk()
break;
}
- return 0; // NT_PORT ( bd 1/14/96 ) Eliminate compiler warning
+ return 0;
} // BiLogic::mdamTreeWalk()
// MDAMR
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/62b45310/core/sql/optimizer/NormRelExpr.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/NormRelExpr.cpp b/core/sql/optimizer/NormRelExpr.cpp
index b4b4269..2c8eeab 100644
--- a/core/sql/optimizer/NormRelExpr.cpp
+++ b/core/sql/optimizer/NormRelExpr.cpp
@@ -5865,7 +5865,6 @@ void Scan::rewriteNode(NormWA & normWARef)
// -------------------------------------------------------------------------
// Normalize the indexes.
// -------------------------------------------------------------------------
- // NT_PORT ( bd 7/16/96 ) cast to int
for (i = 0;
i < (Int32)getTableDesc()->getIndexes().entries();
i++)
@@ -6626,7 +6625,6 @@ void GenericUpdate::rewriteNode(NormWA & normWARef)
// -------------------------------------------------------------------------
// Normalize the indexes.
// -------------------------------------------------------------------------
- // NT_PORT ( bd 7/16/96 ) cast to int
for (j = 0;
j < (Int32)getTableDesc()->getIndexes().entries();
j++)
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/62b45310/core/sql/optimizer/PhyProp.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/PhyProp.cpp b/core/sql/optimizer/PhyProp.cpp
index 1262a9a..c6aedc3 100644
--- a/core/sql/optimizer/PhyProp.cpp
+++ b/core/sql/optimizer/PhyProp.cpp
@@ -137,7 +137,6 @@ PhysicalProperty::compareProperties (const PhysicalProperty &other) const
#pragma warn(1506) // warning elimination
Lng32 minEntries = MINOF(myKeyCount,otherKeyCount);
- // NT_PORT ( bd 10/22/96 ) cast to CollIndex
for (CollIndex index = 0; index < (CollIndex)minEntries; index++)
if (NOT (sortKey_[index] == other.sortKey_[index]))
{
@@ -580,7 +579,7 @@ ReqdPhysicalProperty::compareRequirements(const ReqdPhysicalProperty &other) con
otherSortEntries = 0;
// The columns in coreesponding positions must be the same.
- for (CollIndex i = 0; i < (CollIndex)MINOF(mySortEntries,otherSortEntries); i++) // NT_PORT ( bd 10/22/96 ) cast to CollIndex
+ for (CollIndex i = 0; i < (CollIndex)MINOF(mySortEntries,otherSortEntries); i++)
{
if (NOT (orderedBy_->at(i) == other.orderedBy_->at(i)))
{
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/62b45310/core/sql/optimizer/SearchKey.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/SearchKey.cpp b/core/sql/optimizer/SearchKey.cpp
index 424770b..5f0d915 100644
--- a/core/sql/optimizer/SearchKey.cpp
+++ b/core/sql/optimizer/SearchKey.cpp
@@ -1532,7 +1532,7 @@ void SearchKeyWorkSpace::analyzeSearchPredicates
const ValueIdSet & externalInputs
)
{
- for (CollIndex keyNum = 0; keyNum < (CollIndex)keyCount_; keyNum++) // NT_PORT ( bd 10/22/96 ) cast to CollIndex
+ for (CollIndex keyNum = 0; keyNum < (CollIndex)keyCount_; keyNum++)
{
// Set the value contained in the key predicate (if any)
// for this key column (i.e. bound):
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/62b45310/core/sql/optimizer/ValueDesc.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/ValueDesc.cpp b/core/sql/optimizer/ValueDesc.cpp
index 073c77b..74e2db7 100644
--- a/core/sql/optimizer/ValueDesc.cpp
+++ b/core/sql/optimizer/ValueDesc.cpp
@@ -534,7 +534,7 @@ ValueId::getNAColumn(NABoolean okIfNotColumn) const
return NULL;
CMPASSERT(okIfNotColumn);
}
- return NULL; // NT_PORT
+ return NULL;
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/62b45310/core/sql/parser/ElemDDLNode.cpp
----------------------------------------------------------------------
diff --git a/core/sql/parser/ElemDDLNode.cpp b/core/sql/parser/ElemDDLNode.cpp
index 39b9486..b973e72 100644
--- a/core/sql/parser/ElemDDLNode.cpp
+++ b/core/sql/parser/ElemDDLNode.cpp
@@ -1982,7 +1982,7 @@ ElemDDLNode::print(FILE * f,
const char * prefix,
const char * suffix) const
{
-#ifdef TRACING_ENABLED // NT_PORT ( bd 8/4/96 )
+#ifdef TRACING_ENABLED
fprintf(f,"%s%s(%s)\n", prefix, (const char *)getText(), suffix);
#endif
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/62b45310/core/sql/parser/ElemDDLPartition.cpp
----------------------------------------------------------------------
diff --git a/core/sql/parser/ElemDDLPartition.cpp b/core/sql/parser/ElemDDLPartition.cpp
index fa5dc06..42f8f14 100644
--- a/core/sql/parser/ElemDDLPartition.cpp
+++ b/core/sql/parser/ElemDDLPartition.cpp
@@ -529,7 +529,7 @@ ElemDDLPartitionSystem::bindNode(BindWA * /*pBindWA*/)
// if the specified OSS environment variable has the
// dollar sign prefix, removes it.
//
- if (envVarName[(size_t) 0] EQU '$') // NT_PORT FIX SK 07/15/96
+ if (envVarName[(size_t) 0] EQU '$')
{
envVarName = envVarName(1/*startpos*/, envVarName.length() - 1);
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/62b45310/core/sql/parser/HvRoles_templ.cpp
----------------------------------------------------------------------
diff --git a/core/sql/parser/HvRoles_templ.cpp b/core/sql/parser/HvRoles_templ.cpp
index 69bbc77..ee2ec12 100644
--- a/core/sql/parser/HvRoles_templ.cpp
+++ b/core/sql/parser/HvRoles_templ.cpp
@@ -23,7 +23,7 @@
// This file holds the implementation code supporting the
// HostVarRoles_vec class.
-#include "Platform.h" // NT_PORT SK 02/08/97
+#include "Platform.h"
// Always good to assert yourself.
#include <assert.h>
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/62b45310/core/sql/qms/QmpMain.cpp
----------------------------------------------------------------------
diff --git a/core/sql/qms/QmpMain.cpp b/core/sql/qms/QmpMain.cpp
index 536975c..e0944d3 100644
--- a/core/sql/qms/QmpMain.cpp
+++ b/core/sql/qms/QmpMain.cpp
@@ -32,15 +32,12 @@
#include "QmpPublish.h"
#include "NAType.h"
-#ifdef NA_LINUX
#include "nsk/nskport.h"
#include "seabed/ms.h"
#include "seabed/fs.h"
extern void my_mpi_fclose();
#include "SCMVersHelp.h"
DEFINE_DOVERS(tdm_arkqmp)
-#endif
-
/**
* \file
@@ -115,17 +112,14 @@ static NABoolean processCommandLine(Int32 argc, char *argv[])
return TRUE;
} // End of processCommandLine
-#ifdef NA_LINUX
extern "C"
{
Int32 sq_fs_dllmain();
}
-#endif
Int32 main(Int32 argc, char *argv[])
{
-#ifdef NA_LINUX
dovers(argc, argv);
try
@@ -143,7 +137,6 @@ Int32 main(Int32 argc, char *argv[])
exit(1);
}
// LCOV_EXCL_STOP
-#endif
NAHeap qmpHeap("QMP Heap", NAMemory::DERIVED_FROM_SYS_HEAP, (Lng32)131072);
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/62b45310/core/sql/sort/DiskPool_base.h
----------------------------------------------------------------------
diff --git a/core/sql/sort/DiskPool_base.h b/core/sql/sort/DiskPool_base.h
index 90094f6..810a189 100644
--- a/core/sql/sort/DiskPool_base.h
+++ b/core/sql/sort/DiskPool_base.h
@@ -88,7 +88,7 @@ public:
ULng32 espInstance,
ULng32 numEsps,
unsigned short threshold
- ) = 0; // NT_PORT ( ls 2/7/97 )
+ ) = 0;
DiskDetails **getDiskTablePtr() const {return diskTablePtr_;};
DiskDetails **getLocalDisksPtr() const {return localDisksPtr_;};
@@ -101,14 +101,14 @@ public:
#ifdef FORDEBUG
- virtual NABoolean printDiskTable() = 0; // NT_PORT ( ls 2/7/97 )
+ virtual NABoolean printDiskTable() = 0;
#endif
protected:
virtual void assignWeight(DiskDetails *diskPtr) = 0;
- virtual NABoolean refreshDisk(DiskDetails *diskPtr) = 0; // NT_PORT (2/7/97 )
+ virtual NABoolean refreshDisk(DiskDetails *diskPtr) = 0;
virtual NABoolean computeNumScratchFiles(DiskDetails *diskPtr )= 0;
// index into the diskdetails pointer
Int32 numberOfDisks_;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/62b45310/core/sql/sort/DiskPool_sq.h
----------------------------------------------------------------------
diff --git a/core/sql/sort/DiskPool_sq.h b/core/sql/sort/DiskPool_sq.h
index 15fe1d5..ce4cc73 100644
--- a/core/sql/sort/DiskPool_sq.h
+++ b/core/sql/sort/DiskPool_sq.h
@@ -65,7 +65,7 @@ private:
short factorImportanceTotalFreeSpace_;
short factorImportanceNumScrFiles_;
- SortError *sortError_; // NT_PORT ( ls 2/7/97 )
+ SortError *sortError_;
};
//--------------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/62b45310/core/sql/sort/SortAlgo.cpp
----------------------------------------------------------------------
diff --git a/core/sql/sort/SortAlgo.cpp b/core/sql/sort/SortAlgo.cpp
index 42804f2..c1bef4b 100644
--- a/core/sql/sort/SortAlgo.cpp
+++ b/core/sql/sort/SortAlgo.cpp
@@ -118,7 +118,7 @@ short SortAlgo :: compare(char* key1, char* key2)
/*if (key2 == NULL)*/ return KEY1_IS_GREATER;
};
#pragma nowarn(203) // warning elimination
- return 0; // NT_PORT ( ls 2/7/97 )
+ return 0;
#pragma warn(203) // warning elimination
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/62b45310/core/sql/sort/diskpool_sq.cpp
----------------------------------------------------------------------
diff --git a/core/sql/sort/diskpool_sq.cpp b/core/sql/sort/diskpool_sq.cpp
index 2744d20..db1ab4a 100644
--- a/core/sql/sort/diskpool_sq.cpp
+++ b/core/sql/sort/diskpool_sq.cpp
@@ -29,7 +29,7 @@
// The constructor of NT version of DiskPool.
//--------------------------------------------------------------------------
SQDisk::SQDisk(SortError* sorterror, CollHeap *heap) :DiskPool(heap),
-sortError_(sorterror) { // NT_PORT ( ls 2/7/97 )
+sortError_(sorterror) {
factorImportanceTotalFreeSpace_ = 30;
factorImportanceNumScrFiles_ = 70;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/62b45310/core/sql/sqlci/ShellCmd.cpp
----------------------------------------------------------------------
diff --git a/core/sql/sqlci/ShellCmd.cpp b/core/sql/sqlci/ShellCmd.cpp
index 15c60e1..55794c1 100644
--- a/core/sql/sqlci/ShellCmd.cpp
+++ b/core/sql/sqlci/ShellCmd.cpp
@@ -114,7 +114,7 @@ short Chdir::process(SqlciEnv * sqlci_env)
NAString dir = LookupDefineName(cmd);
- if (chdir(dir)) // NT_PORT: Use _chdir() instead?
+ if (chdir(dir))
{
//use constructor and destructor when C++ compiler bug is fixed
ErrorParam *ep1 = new ErrorParam(errno);
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/62b45310/core/sql/sqlci/SqlciEnv.cpp
----------------------------------------------------------------------
diff --git a/core/sql/sqlci/SqlciEnv.cpp b/core/sql/sqlci/SqlciEnv.cpp
index 84bb9ba..417cff5 100644
--- a/core/sql/sqlci/SqlciEnv.cpp
+++ b/core/sql/sqlci/SqlciEnv.cpp
@@ -1071,10 +1071,8 @@ short Env::process(SqlciEnv *sqlci_env)
log->WriteAllWithoutEOL("CURRENT DIRECTORY ");
- // NT_PORT (bv 10/24/96) Added NA_MAX_PATH here and in common/Platform.h
log->WriteAll(getcwd((char *)NULL, NA_MAX_PATH));
-
log->WriteAllWithoutEOL("LIST_COUNT ");
char buf[100];
Int32 len = sprintf(buf, "%u", sqlci_env->getListCount());
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/62b45310/core/sql/sqlci/SqlciList_templ.h
----------------------------------------------------------------------
diff --git a/core/sql/sqlci/SqlciList_templ.h b/core/sql/sqlci/SqlciList_templ.h
index 4b34ba1..a7a4634 100644
--- a/core/sql/sqlci/SqlciList_templ.h
+++ b/core/sql/sqlci/SqlciList_templ.h
@@ -76,8 +76,6 @@ public:
T * getNext();
};
-// NT_PORT ( bd 10/28/96 )
-//JMHPORT
#if defined(NA_COMPILE_INSTANTIATE)
#include "SqlciList_templ.cpp"
#endif // NA_COMPILE_INSTANTIATE
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/62b45310/core/sql/sqlci/SqlciParser.cpp
----------------------------------------------------------------------
diff --git a/core/sql/sqlci/SqlciParser.cpp b/core/sql/sqlci/SqlciParser.cpp
index c8153f3..fdf0c1e 100644
--- a/core/sql/sqlci/SqlciParser.cpp
+++ b/core/sql/sqlci/SqlciParser.cpp
@@ -78,9 +78,7 @@ static Int32 sqlci_parser_subproc(char *instr, char *origstr, SqlciNode ** node,
if (j >= 0)
{
-#ifdef NA_FLEXBUILD
- SqlciLexReinit(); // NT_PORT ( bd 10/11/96 )
-#endif
+ SqlciLexReinit();
retval = sqlciparse();
@@ -89,19 +87,12 @@ static Int32 sqlci_parser_subproc(char *instr, char *origstr, SqlciNode ** node,
{
assert(SqlciParseTree->isSqlciNode());
- // check to see if the SqlciNode is valid or not.Returns 1 if it is
- // valid and 0 if invalid.
- retval = sqlci_parser_handle_report_writer(sqlci_env,retval);
-
- if (retval)
- {
- if (retval = SqlciParseTree->errorCode()) // oops, an error
- {
- delete SqlciParseTree;
- SqlciParseTree = NULL;
- retval = -ABS(retval); // error, caller won't retry
- }
- }
+ if (retval = SqlciParseTree->errorCode()) // oops, an error
+ {
+ delete SqlciParseTree;
+ SqlciParseTree = NULL;
+ retval = -ABS(retval); // error, caller won't retry
+ }
}
else
retval = +ABS(retval); // error, caller will retry
@@ -146,7 +137,6 @@ Int32 sqlci_parser(char *instr, char *origstr, SqlciNode ** node, SqlciEnv *sqlc
if (retval > 0)
{
SqlciParse_OriginalStr = origstr;
- retval = sqlci_parser_handle_error(node, retval);
}
if (newstr != origstr)
@@ -176,21 +166,4 @@ Int32 sqlci_parser_syntax_error_cleanup(char *instr, SqlciEnv *sqlci_env)
return 0;
}
-Int32 sqlci_parser_handle_report_writer(SqlciEnv *sqlci_env, Lng32 retval)
-{
- return 0;
-}
-
-Int32 sqlci_parser_handle_error(SqlciNode **node, Lng32 retval)
-{
- NABoolean syntaxError_ = sqlci_DA.contains(-SQLCI_SYNTAX_ERROR);
-
- if (retval && syntaxError_)
- {
- return retval;
- }
- else
- return retval;
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/62b45310/core/sql/sqlci/SqlciStats.h
----------------------------------------------------------------------
diff --git a/core/sql/sqlci/SqlciStats.h b/core/sql/sqlci/SqlciStats.h
index c873918..543cc47 100644
--- a/core/sql/sqlci/SqlciStats.h
+++ b/core/sql/sqlci/SqlciStats.h
@@ -43,7 +43,7 @@
*****************************************************************************
*/
-#include "Platform.h" // NT_PORT (bv 10/18/96)
+#include "Platform.h"
#include "SqlciCmd.h" // Statistics class enum
#include <sys/time.h>
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/62b45310/core/sql/sqlci/sqlci_lex.ll
----------------------------------------------------------------------
diff --git a/core/sql/sqlci/sqlci_lex.ll b/core/sql/sqlci/sqlci_lex.ll
index 4299a1c..57dd363 100755
--- a/core/sql/sqlci/sqlci_lex.ll
+++ b/core/sql/sqlci/sqlci_lex.ll
@@ -91,10 +91,6 @@ extern "C" { int yylex(void); }
extern "C" { int yylex(void); }
#endif
-#ifndef NA_FLEXBUILD
-#undef input
-#define input() SqlciInput()
-#else // NT_PORT
# undef YY_INPUT
#define YY_INPUT(buffer,result,maxsize)\
{\
@@ -104,7 +100,6 @@ extern "C" { int yylex(void); }
else\
result=1;\
}
-#endif // NA_FLEXBUILD
#undef unput
#define unput(c) SqlciUnput(c)
@@ -112,45 +107,11 @@ extern "C" { int yylex(void); }
#define yylval sqlcilval
#define yyerror sqlcierror
-#ifndef NA_FLEXBUILD // NT_PORT ( bd 10/6/96 ) moving to flex/bison BEGIN
-void sqlci_unput_(int c);
-char sqlci_input_();
-
-char SqlciInput(void)
-{
-
- short x;
- x = sqlci_input_();
-
- return x;
-}
-
-#endif // NT_PORT ( bd 10/6/96 ) moving to flex/bison END
-
// put back a previously read input character that wasn't needed
void SqlciUnput(char c)
{
-#ifndef NA_FLEXBUILD // NT_PORT ( bd 10/6/96 ) moving to flex/bison BEGIN
- sqlci_unput_(c);
-#else
SqlciParse_InputPos--;
-#endif // NT_PORT ( bd 10/6/96 ) moving to flex/bison END
-}
-
-#ifndef NA_FLEXBUILD // NT_PORT ( bd 10/6/96 ) moving to flex/bison BEGIN
-void sqlci_unput_(int c)
-{
- SqlciParse_InputPos--;
-};
-
-char sqlci_input_()
-{
- char a;
-
- a = SqlciParse_InputStr[SqlciParse_InputPos++];
- return a;
}
-#endif // NT_PORT ( bd 10/6/96 ) moving to flex/bison END
// handle EOF in the input stream and let lex continue
// with the next input file
@@ -226,7 +187,6 @@ B [ \t\n]+
[Dd][Ii][Ss][Pp][Ll][Aa][Yy]_[Qq][Cc]_[Ee][Nn][Tt][Rr][Ii][Ee][Ss] return_IDENT_or_TOKEN(DISPLAY_QC_ENTRIES,0);
[Dd][Ii][Ss][Pp][Ll][Aa][Yy]_[Qq][Cc]_[Ee][Nn][Tt][Rr][Ii][Ee][Ss]_[Nn][Oo][Tt][Ii][Mm][Ee] return_IDENT_or_TOKEN(DISPLAY_QC_ENTRIES_NOTIME,0);
[Dd][Ii][Ss][Pp][Ll][Aa][Yy]{B}[Uu][Ss][Ee]{B}[Oo][Ff] return_IDENT_or_TOKEN(DISPLAY_USE_OF, 0);
-[Dd][Uu][Pp] return_IDENT_or_TOKEN(DUP, 0);
[Ee][Nn][Vv] return_IDENT_or_TOKEN(MXCI_TOK_ENV, 0);
[Ee][Nn][Vv][Vv][Aa][Rr] return_IDENT_or_TOKEN(ENVVARtoken, 0);
[Ee][Tt] return_IDENT_or_TOKEN(COMMIT, 0);
@@ -490,22 +450,6 @@ B [ \t\n]+
SqlciParse_IdentifierExpected = 0;
return_IDENT_or_TOKEN(FILENAME, 0);
}
-\\{G}\.\${G}\.{G}\.{G} {
- if (yylval.stringval_type)
- delete [] yylval.stringval_type;
- yylval.stringval_type = new char[strlen(yytext)+1];
- strcpy(yylval.stringval_type, yytext);
- return(NSK_NAME);
- }
-
-\\{G}\.\${G} {
- if (yylval.stringval_type)
- delete [] yylval.stringval_type;
- yylval.stringval_type = new char[strlen(yytext)+1];
- strcpy(yylval.stringval_type, yytext);
- return(NODE_VOL_NAME);
- }
-
\\{G}\.[0-9]*\,[0-9]* {
if (yylval.stringval_type)
delete [] yylval.stringval_type;
@@ -532,9 +476,7 @@ B [ \t\n]+
%%
-#ifdef NA_FLEXBUILD
void SqlciLexReinit()
{
sqlcirestart(0);
}
-#endif
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/62b45310/core/sql/sqlci/sqlci_yacc.y
----------------------------------------------------------------------
diff --git a/core/sql/sqlci/sqlci_yacc.y b/core/sql/sqlci/sqlci_yacc.y
index 3f4a8cb..95a37b3 100644
--- a/core/sql/sqlci/sqlci_yacc.y
+++ b/core/sql/sqlci/sqlci_yacc.y
@@ -392,7 +392,6 @@ static char * FCString (const char *idString, int isFC)
%token DISPLAY_QC_ENTRIES
%token DISPLAY_QC_ENTRIES_NOTIME
%token DISPLAY_USE_OF
-%token DUP
%token EDIT
%token MXCI_TOK_ENV
%token EXIT
@@ -432,8 +431,6 @@ static char * FCString (const char *idString, int isFC)
%token MODIFYV
%token NEXT
%token NOEtoken
-%token NODE_VOL_NAME
-%token NSK_NAME
%token OBEY
%token OBJECTtoken
%token OFtoken
@@ -548,8 +545,6 @@ static char * FCString (const char *idString, int isFC)
%type <sql_cmd_type> sql_cmd
%type <shell_cmd_type> shell_cmd
%type <stringval_type> IDENTIFIER
-%type <stringval_type> NODE_VOL_NAME
-%type <stringval_type> NSK_NAME
%type <stringval_type> PARAM_NAME
%type <stringval_type> PATTERN_NAME
%type <stringval_type> PID_VALUE
@@ -1929,7 +1924,6 @@ dml_type :
| SIGNAL {$$ = DML_CONTROL_TYPE;}
| INTERNAL {$$ = DML_CONTROL_TYPE;}
| MVLOG {$$ = DML_CONTROL_TYPE;}
- | DUP {$$ = DML_DDL_TYPE;}
| PURGEDATA {$$ = DML_DDL_TYPE;}
| TRUNCATE {$$ = DML_DDL_TYPE;}
| WITH {$$ = DML_DDL_TYPE;}