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/07 01:55:16 UTC
[22/30] incubator-trafodion git commit: TRAFODION-2731 CodeCleanup:
Remove obsolete, legacy and unused code
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/comexe/ComTdb.h
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComTdb.h b/core/sql/comexe/ComTdb.h
index 0cdb244..4a7b754 100644
--- a/core/sql/comexe/ComTdb.h
+++ b/core/sql/comexe/ComTdb.h
@@ -36,7 +36,6 @@
#ifndef COMTDB_H
#define COMTDB_H
-#include "Platform.h" // for NA_EIDPROC
#include "Int64.h" // for Int64
#include "NAVersionedObject.h" // for NAVersionedObject
#include "BaseTypes.h" // for Cardinality
@@ -142,18 +141,8 @@ public:
ex_cri_desc *criUp,
queue_index sizeDown,
queue_index sizeUp,
-#ifdef NA_64BIT
- // dg64 - match signature
Int32 numBuffers,
-#else
- Lng32 numBuffers,
-#endif
-#ifdef NA_64BIT
- // dg64 - match signature
UInt32 bufferSize,
-#else
- ULng32 bufferSize,
-#endif
Int32 firstNRows
)
: estimatedRowCount_(estimatedRowCount),
@@ -168,18 +157,8 @@ public:
ExCriDescPtr &criUp,
queue_index &sizeDown,
queue_index &sizeUp,
-#ifdef NA_64BIT
- // dg64 - match signature
Int32 &numBuffers,
-#else
- Lng32 &numBuffers,
-#endif
-#ifdef NA_64BIT
- // dg64 - match signature
UInt32 &bufferSize,
-#else
- ULng32 &bufferSize,
-#endif
Int32 &firstNRows);
private:
@@ -188,18 +167,8 @@ private:
ex_cri_desc *criUp_;
queue_index sizeDown_;
queue_index sizeUp_;
-#ifdef NA_64BIT
- // dg64 - match signature
Int32 numBuffers_;
-#else
- Lng32 numBuffers_;
-#endif
-#ifdef NA_64BIT
- // dg64 - match signature
UInt32 bufferSize_;
-#else
- ULng32 bufferSize_;
-#endif
Int32 firstNRows_;
char filler_[40];
@@ -331,25 +300,15 @@ public:
// If params is not NULL, then initialize variable from ComTdbParams
// object passed in.
// ---------------------------------------------------------------------
- NA_EIDPROC ComTdb(ex_node_type type,
+ ComTdb(ex_node_type type,
const char *eye,
Cardinality estRowsUsed = 0.0,
ex_cri_desc *criDown = NULL,
ex_cri_desc *criUp = NULL,
queue_index sizeDown = 0,
queue_index sizeUp = 0,
-#ifdef NA_64BIT
- // dg64 - match signature
Int32 numBuffers = 0,
-#else
- Lng32 numBuffers = 0,
-#endif
-#ifdef NA_64BIT
- // dg64 - match signature
UInt32 bufferSize = 0,
-#else
- ULng32 bufferSize = 0,
-#endif
Lng32 uniqueId = 0,
ULng32 initialQueueSizeDown = 4,
ULng32 initialQueueSizeUp = 4,
@@ -360,17 +319,17 @@ public:
// ---------------------------------------------------------------------
// Dummy constructor used in findVTblPtr()
// ---------------------------------------------------------------------
- NA_EIDPROC ComTdb();
+ ComTdb();
- NA_EIDPROC virtual ~ComTdb();
+ virtual ~ComTdb();
// ---------------------------------------------------------------------
// Pack a TDB before storing it on disk or transporting it to another
// process. Unpack a TDB after it's retrieved from disk or receive from
// another process.
// ---------------------------------------------------------------------
- NA_EIDPROC virtual Long pack(void *space);
- NA_EIDPROC virtual Lng32 unpack(void *base, void * reallocator);
+ virtual Long pack(void *space);
+ virtual Lng32 unpack(void *base, void * reallocator);
// ---------------------------------------------------------------------
// Fix up the virtual function table pointer of a TDB retrieved from
@@ -379,18 +338,18 @@ public:
// fixes up the result to an Executor version of TDB which redefines
// project.
// ---------------------------------------------------------------------
- NA_EIDPROC void fixupVTblPtr();
- NA_EIDPROC void fixupVTblPtrCom();
- NA_EIDPROC void fixupVTblPtrExe();
+ void fixupVTblPtr();
+ void fixupVTblPtrCom();
+ void fixupVTblPtrExe();
// ---------------------------------------------------------------------
// Redefinition of methods inherited from NAVersionedObject.
// ---------------------------------------------------------------------
- NA_EIDPROC virtual char *findVTblPtr(short classID);
- NA_EIDPROC virtual unsigned char getClassVersionID() { return 1; }
- NA_EIDPROC virtual void populateImageVersionIDArray()
+ virtual char *findVTblPtr(short classID);
+ virtual unsigned char getClassVersionID() { return 1; }
+ virtual void populateImageVersionIDArray()
{ setImageVersionID(0,getClassVersionID()); }
- NA_EIDPROC virtual short getClassSize()
+ virtual short getClassSize()
{ return (short)sizeof(ComTdb); }
// ---------------------------------------------------------------------
@@ -401,70 +360,70 @@ public:
// which has the build() method defined, while the latter returns the
// one of a "compiler" TDB with no build() method.
// ---------------------------------------------------------------------
- NA_EIDPROC char *findVTblPtrExe(short classID);
- NA_EIDPROC char *findVTblPtrCom(short classID);
+ char *findVTblPtrExe(short classID);
+ char *findVTblPtrCom(short classID);
// ---------------------------------------------------------------------
// Whether the TDB supports out-of-order replies to its requests.
// ---------------------------------------------------------------------
// LCOV_EXCL_START
- NA_EIDPROC virtual Int32 orderedQueueProtocol() const { return 1; }
+ virtual Int32 orderedQueueProtocol() const { return 1; }
// LCOV_EXCL_STOP
// ---------------------------------------------------------------------
// Used by the internal SHOWPLAN command to get attributes of a TDB.
// ---------------------------------------------------------------------
- NA_EIDPROC virtual void displayContents(Space *space,ULng32 flag);
- NA_EIDPROC virtual void displayExpression(Space *space,ULng32 flag);
- NA_EIDPROC virtual void displayChildren(Space *space,ULng32 flag);
+ virtual void displayContents(Space *space,ULng32 flag);
+ virtual void displayExpression(Space *space,ULng32 flag);
+ virtual void displayChildren(Space *space,ULng32 flag);
// ---------------------------------------------------------------------
// Accessors/Mutators.
// ---------------------------------------------------------------------
- NA_EIDPROC inline ex_node_type getNodeType() const
+ inline ex_node_type getNodeType() const
{ return (ComTdb::ex_node_type)getClassID(); }
- NA_EIDPROC inline void setNodeType(ex_node_type t) { setClassID(t); }
+ inline void setNodeType(ex_node_type t) { setClassID(t); }
inline void setEyeCatcher(const char * eye) { str_cpy_all((char*)&eyeCatcher_, eye, 4); }
- NA_EIDPROC inline ComTdb *getParentTdb() { return parentTdb_; }
- NA_EIDPROC inline void setParentTdb(ComTdb *tdb) { parentTdb_ = tdb; }
- NA_EIDPROC inline void setTdbId(Lng32 uniqueId) { tdbId_ = uniqueId; }
- NA_EIDPROC inline Lng32 getTdbId() const { return tdbId_; }
- NA_EIDPROC inline Cardinality getEstRowsAccessed() const
+ inline ComTdb *getParentTdb() { return parentTdb_; }
+ inline void setParentTdb(ComTdb *tdb) { parentTdb_ = tdb; }
+ inline void setTdbId(Lng32 uniqueId) { tdbId_ = uniqueId; }
+ inline Lng32 getTdbId() const { return tdbId_; }
+ inline Cardinality getEstRowsAccessed() const
{
return estRowsAccessed_;
}
- NA_EIDPROC inline void setEstRowsAccessed(Cardinality estRowsAccessed)
+ inline void setEstRowsAccessed(Cardinality estRowsAccessed)
{
estRowsAccessed_ = estRowsAccessed;
}
- NA_EIDPROC inline Cardinality getEstRowsUsed() const
+ inline Cardinality getEstRowsUsed() const
{
return estRowsUsed_;
}
- NA_EIDPROC inline void setEstRowsUsed(Cardinality estRowsUsed)
+ inline void setEstRowsUsed(Cardinality estRowsUsed)
{
estRowsUsed_ = estRowsUsed;
}
- NA_EIDPROC inline ULng32 getMaxQueueSizeDown() const
+ inline ULng32 getMaxQueueSizeDown() const
{ return queueSizeDown_; }
- NA_EIDPROC inline ULng32 getMaxQueueSizeUp() const
+ inline ULng32 getMaxQueueSizeUp() const
{ return queueSizeUp_; }
- NA_EIDPROC inline void setMaxQueueSizeUp(ULng32 qSize)
+ inline void setMaxQueueSizeUp(ULng32 qSize)
{ queueSizeUp_ = qSize; }
- NA_EIDPROC inline ULng32 getInitialQueueSizeDown() const
+ inline ULng32 getInitialQueueSizeDown() const
{ return initialQueueSizeDown_; }
- NA_EIDPROC inline ULng32 getInitialQueueSizeUp() const
+ inline ULng32 getInitialQueueSizeUp() const
{ return initialQueueSizeUp_; }
- NA_EIDPROC inline short getQueueResizeLimit() const
+ inline short getQueueResizeLimit() const
{ return queueResizeLimit_; }
- NA_EIDPROC inline short getQueueResizeFactor() const
+ inline short getQueueResizeFactor() const
{ return queueResizeFactor_; }
- NA_EIDPROC inline void setQueueResizeParams(
+ inline void setQueueResizeParams(
ULng32 initialQueueSizeDown,
ULng32 initialQueueSizeUp,
short queueResizeLimit,
@@ -478,7 +437,7 @@ public:
// this method should be defined in any TDB which store the plan
// version.
- NA_EIDPROC virtual
+ virtual
void setPlanVersion(UInt32 /*pv*/)
{
// should never reach here.
@@ -487,19 +446,19 @@ public:
// ---------------------------------------------------------------------
// numChildren() -- Returns the number of children for this TDB
// ---------------------------------------------------------------------
- NA_EIDPROC virtual Int32 numChildren() const { return -1; } // LCOV_EXCL_LINE
+ virtual Int32 numChildren() const { return -1; } // LCOV_EXCL_LINE
// ---------------------------------------------------------------------
// getNodeName() -- Returns the name of this TDB.
// ---------------------------------------------------------------------
- NA_EIDPROC virtual const char *getNodeName() const { return "ComTDB"; } // LCOV_EXCL_LINE
+ virtual const char *getNodeName() const { return "ComTDB"; } // LCOV_EXCL_LINE
// ---------------------------------------------------------------------
// getChild(int child) -- Returns a pointer to the nth child TDB of this
// TDB. This function cannot be used to get children which reside in
// other processes -- see getChildForGUI.
// ---------------------------------------------------------------------
- NA_EIDPROC virtual const ComTdb *getChild(Int32) const { return NULL; } // LCOV_EXCL_LINE
+ virtual const ComTdb *getChild(Int32) const { return NULL; } // LCOV_EXCL_LINE
// ---------------------------------------------------------------------
// getChildForGUI() takes as additional arguments the fragment directory
@@ -523,41 +482,41 @@ public:
// ---------------------------------------------------------------------
// numExpressions() -- Returns the number of expression for this TDB.
// ---------------------------------------------------------------------
- NA_EIDPROC virtual Int32 numExpressions() const { return 0; }
+ virtual Int32 numExpressions() const { return 0; }
// ---------------------------------------------------------------------
// GetExpressionName(int) -- Returns a string identifying the nth
// expression for this TDB.
// ---------------------------------------------------------------------
- NA_EIDPROC virtual const char *getExpressionName(Int32) const
+ virtual const char *getExpressionName(Int32) const
{ return "none"; }
// ---------------------------------------------------------------------
// GetExpressionNode(int) -- Returns the nth expression for this TDB.
// ---------------------------------------------------------------------
- NA_EIDPROC virtual ex_expr *getExpressionNode(Int32) { return 0; }
+ virtual ex_expr *getExpressionNode(Int32) { return 0; }
// ---------------------------------------------------------------------
// overloaded to return TRUE for root operators (master executor root,
// EID root, ESP root)
// ---------------------------------------------------------------------
- NA_EIDPROC virtual NABoolean isRoot() const { return FALSE; }
+ virtual NABoolean isRoot() const { return FALSE; }
// ---------------------------------------------------------------------
// Build a TCB for this TDB. Redefined in the Executor project.
// ---------------------------------------------------------------------
- NA_EIDPROC virtual ex_tcb *build(ex_globals *globals) { return NULL; }
+ virtual ex_tcb *build(ex_globals *globals) { return NULL; }
- NA_EIDPROC Lng32 getBufferSize() const {return bufferSize_;}
- NA_EIDPROC Lng32 getNumBuffers() const {return numBuffers_;}
+ Lng32 getBufferSize() const {return bufferSize_;}
+ Lng32 getNumBuffers() const {return numBuffers_;}
- NA_EIDPROC void resetBufInfo(Int32 numBuffers, UInt32 bufferSize)
+ void resetBufInfo(Int32 numBuffers, UInt32 bufferSize)
{
numBuffers_ = numBuffers;
bufferSize_ = bufferSize;
}
- NA_EIDPROC Int32 &firstNRows()
+ Int32 &firstNRows()
{
return firstNRows_;
}
@@ -568,69 +527,57 @@ public:
// The root nodes allocate a stats area if the indicator is true. All
// other tcbs allocate a stats entry if the stats area is present
// ---------------------------------------------------------------------
- NA_EIDPROC NABoolean getCollectStats()
+ NABoolean getCollectStats()
{ return (flags_ & COLLECT_STATS) != 0; }
- NA_EIDPROC inline void setCollectStats(NABoolean v)
+ inline void setCollectStats(NABoolean v)
{ (v ? flags_ |= COLLECT_STATS : flags_ &= ~COLLECT_STATS); }
- NA_EIDPROC NABoolean denseBuffers()
+ NABoolean denseBuffers()
{ return (flags_ & DENSE_BUFFERS) != 0; }
- NA_EIDPROC inline void setDenseBuffers(NABoolean v)
+ inline void setDenseBuffers(NABoolean v)
{ (v ? flags_ |= DENSE_BUFFERS : flags_ &= ~DENSE_BUFFERS); }
- NA_EIDPROC
short doOltQueryOpt() const{return flags_ & DO_OLT_QUERY_OPT;}
- NA_EIDPROC
void setDoOltQueryOpt(NABoolean v)
{ (v ? flags_ |= DO_OLT_QUERY_OPT : flags_ &= ~DO_OLT_QUERY_OPT); };
- NA_EIDPROC
short doOltQueryOptLean() const{return flags_ & DO_OLT_QUERY_OPT_LEAN;}
- NA_EIDPROC
void setDoOltQueryOptLean(NABoolean v)
{ (v ? flags_ |= DO_OLT_QUERY_OPT_LEAN : flags_ &= ~DO_OLT_QUERY_OPT_LEAN); };
- NA_EIDPROC NABoolean getCollectRtsStats()
+ NABoolean getCollectRtsStats()
{ return (flags_ & COLLECT_RTS_STATS) != 0; }
- NA_EIDPROC inline void setCollectRtsStats(NABoolean v)
+ inline void setCollectRtsStats(NABoolean v)
{ (v ? flags_ |= COLLECT_RTS_STATS : flags_ &= ~COLLECT_RTS_STATS); }
- NA_EIDPROC
short floatFieldsAreIEEE() const{return flags_ & FLOAT_FIELDS_ARE_IEEE;}
-NA_EIDPROC
short isNonFatalErrorTolerated() const { return flags_ & TOLERATE_NONFATAL_ERROR;}
-NA_EIDPROC
void setTolerateNonFatalError(NABoolean v){ v ? flags_ |= TOLERATE_NONFATAL_ERROR: flags_ &= ~TOLERATE_NONFATAL_ERROR;}
-NA_EIDPROC
short isCIFON() const { return flags_ & CIFON;}
-NA_EIDPROC
void setCIFON(NABoolean v){ v ? flags_ |= CIFON: flags_ &= ~CIFON;}
-NA_EIDPROC
short processLOB() const { return flags_ & PROCESS_LOB;}
-NA_EIDPROC
void setProcessLOB(NABoolean v){ v ? flags_ |= PROCESS_LOB: flags_ &= ~PROCESS_LOB;}
enum CollectStatsType
{
NO_STATS = SQLCLI_NO_STATS,
- MEASURE_STATS = SQLCLI_MEASURE_STATS, // collect statistics for measure counters
- ACCUMULATED_STATS = SQLCLI_ACCUMULATED_STATS, // collect accumulated stats. Same as measure.
- PERTABLE_STATS = SQLCLI_PERTABLE_STATS, // collect same stats that were collected in sql/mp
+ ACCUMULATED_STATS = SQLCLI_ACCUMULATED_STATS, // collect accumulated stats.
+ PERTABLE_STATS = SQLCLI_PERTABLE_STATS, // collect per table stats that
ALL_STATS = SQLCLI_ALL_STATS, // collect all stats about all exe operators
OPERATOR_STATS = SQLCLI_OPERATOR_STATS, // collect all stats but merge at operator(tdb)
// granularity. Used to return data at user operator
// level.
- CPU_OFFENDER_STATS = SQLCLI_CPU_OFFENDER_STATS, // Collection of ROOT_OPER_STATS or MEAS_STATS of
+ CPU_OFFENDER_STATS = SQLCLI_CPU_OFFENDER_STATS, // Collection of ROOT_OPER_STATS of
// all currently running queries in a cpu
- QID_DETAIL_STATS = SQLCLI_QID_DETAIL_STATS, // Collection of ROOT_OPER_STATS or MEAS_STATS for
+ QID_DETAIL_STATS = SQLCLI_QID_DETAIL_STATS, // Collection of ROOT_OPER_STATS for
// a given QID
SE_OFFENDER_STATS = SQLCLI_SE_OFFENDER_STATS,
RMS_INFO_STATS = SQLCLI_RMS_INFO_STATS,
@@ -641,23 +588,16 @@ NA_EIDPROC
};
-NA_EIDPROC
CollectStatsType getCollectStatsType() { return (CollectStatsType)collectStatsType_; };
-NA_EIDPROC
void setCollectStatsType(CollectStatsType s)
{ collectStatsType_ = s; };
-NA_EIDPROC
Lng32 getExplainNodeId() const { return (Lng32) explainNodeId_; }
-NA_EIDPROC
void setExplainNodeId(Lng32 id) { explainNodeId_ = (Int32) id; }
-NA_EIDPROC
UInt16 getPertableStatsTdbId() const { return pertableStatsTdbId_; }
-NA_EIDPROC
void setPertableStatsTdbId(UInt16 id) { pertableStatsTdbId_ = id; }
-NA_EIDPROC
Float32 getFloatValue(char * v) const
{
Float32 f;
@@ -666,7 +606,6 @@ NA_EIDPROC
return f;
}
-NA_EIDPROC
Float64 getDoubleValue(char * v) const
{
Float64 f;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/comexe/ComTdbAll.h
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComTdbAll.h b/core/sql/comexe/ComTdbAll.h
index cb0b515..79492fa 100644
--- a/core/sql/comexe/ComTdbAll.h
+++ b/core/sql/comexe/ComTdbAll.h
@@ -51,7 +51,6 @@
#include "ComTdbTimeout.h"
-#ifndef __EID
#include "ComTdbControl.h"
#include "ComTdbRoot.h"
#include "ComTdbOnlj.h"
@@ -79,10 +78,3 @@
#include "ComTdbHdfsScan.h"
#include "ComTdbHbaseAccess.h"
#endif
-
-#endif
-
-
-
-
-
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/comexe/ComTdbBlockingHdfsScan.cpp
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComTdbBlockingHdfsScan.cpp b/core/sql/comexe/ComTdbBlockingHdfsScan.cpp
index 7b9b991..9968493 100755
--- a/core/sql/comexe/ComTdbBlockingHdfsScan.cpp
+++ b/core/sql/comexe/ComTdbBlockingHdfsScan.cpp
@@ -54,18 +54,8 @@ ComTdbBlockingHdfsScan::ComTdbBlockingHdfsScan():
queue_index down,
queue_index up,
Cardinality estimatedRowCount,
-#ifdef NA_64BIT
- // dg64 - match signature
Int32 numBuffers,
-#else
- Lng32 numBuffers,
-#endif
-#ifdef NA_64BIT
- // dg64 - match signature
UInt32 bufferSize
-#else
- ULng32 bufferSize
-#endif
)
: ComTdb( ComTdb::ex_BLOCK_HDFS_SCAN,
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/comexe/ComTdbBlockingHdfsScan.h
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComTdbBlockingHdfsScan.h b/core/sql/comexe/ComTdbBlockingHdfsScan.h
index 40c7612..88a3b40 100755
--- a/core/sql/comexe/ComTdbBlockingHdfsScan.h
+++ b/core/sql/comexe/ComTdbBlockingHdfsScan.h
@@ -124,16 +124,8 @@ public:
queue_index down,
queue_index up,
Cardinality estimatedRowCount,
-#ifdef NA_64BIT
Int32 numBuffers,
-#else
- Lng32 numBuffers,
-#endif
-#ifdef NA_64BIT
UInt32 bufferSize
-#else
- ULng32 bufferSize
-#endif
);
~ComTdbBlockingHdfsScan();
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/comexe/ComTdbCompoundStmt.h
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComTdbCompoundStmt.h b/core/sql/comexe/ComTdbCompoundStmt.h
index 20920e7..68a7ce0 100644
--- a/core/sql/comexe/ComTdbCompoundStmt.h
+++ b/core/sql/comexe/ComTdbCompoundStmt.h
@@ -53,10 +53,8 @@ public:
//
// Standard TDB methods.
//
-NA_EIDPROC
ComTdbCompoundStmt();
-NA_EIDPROC
ComTdbCompoundStmt(ComTdb *left,
ComTdb *right,
ex_cri_desc *given,
@@ -72,56 +70,43 @@ NA_EIDPROC
// LCOV_EXCL_START
// exclude from code coverage analsysis since this method is not used
-NA_EIDPROC
Int32 orderedQueueProtocol() const { return -1; }
// LCOV_EXCL_STOP
-NA_EIDPROC
Long pack(void *);
-NA_EIDPROC
Lng32 unpack(void *, void * reallocator);
-NA_EIDPROC
void display() const {};
-NA_EIDPROC
virtual const ComTdb *getChild(Int32 pos) const;
-NA_EIDPROC
virtual Int32 numChildren() const { return 2; }
-NA_EIDPROC
virtual Int32 numExpressions() const { return 0; }
-NA_EIDPROC
virtual const char *getNodeName() const { return "EX_COMPOUND_STMT"; };
// LCOV_EXCL_START
// exclude from code coverage analysys since there are no expressions for
// this operator
-NA_EIDPROC
virtual ex_expr* getExpressionNode(Int32 pos) { return NULL; }
-NA_EIDPROC
virtual const char * getExpressionName(Int32 pos) const { return NULL; }
// LCOV_EXCL_STOP
// ---------------------------------------------------------------------
// Redefine virtual functions required for Versioning.
//----------------------------------------------------------------------
-NA_EIDPROC
virtual unsigned char getClassVersionID()
{
return 1;
}
-NA_EIDPROC
virtual void populateImageVersionIDArray()
{
setImageVersionID(1,getClassVersionID());
ComTdb::populateImageVersionIDArray();
}
-NA_EIDPROC
virtual short getClassSize() { return (short)sizeof(*this); }
protected:
@@ -139,15 +124,12 @@ protected:
char fillersComTdbCompound_[30]; // 18-47
-NA_EIDPROC
inline NABoolean expectingLeftRows() const
{ return (flags_ & ROWS_FROM_LEFT) != 0; }
-NA_EIDPROC
inline NABoolean expectingRightRows() const
{ return (flags_ & ROWS_FROM_RIGHT) != 0; }
-NA_EIDPROC
inline NABoolean afterUpdate() const
{ return (flags_ & AFTER_UPDATE) != 0; }
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/comexe/ComTdbExeUtil.h
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComTdbExeUtil.h b/core/sql/comexe/ComTdbExeUtil.h
index 7e608b2..884a7d9 100644
--- a/core/sql/comexe/ComTdbExeUtil.h
+++ b/core/sql/comexe/ComTdbExeUtil.h
@@ -163,13 +163,11 @@ public:
return "EX_EXE_UTIL";
};
-NA_EIDPROC
virtual Int32 numExpressions() const
{
return (ComTdbGenericUtil::numExpressions() + 1);
}
-NA_EIDPROC
virtual ex_expr* getExpressionNode(Int32 pos) {
if (pos >= numExpressions())
return NULL;
@@ -180,7 +178,6 @@ NA_EIDPROC
return scanExpr_;
}
-NA_EIDPROC
virtual const char * getExpressionName(Int32 pos) const {
if (pos >= numExpressions())
return NULL;
@@ -301,7 +298,7 @@ public:
// ---------------------------------------------------------------------
// Used by the internal SHOWPLAN command to get attributes of a TDB.
// ---------------------------------------------------------------------
- NA_EIDPROC void displayContents(Space *space, ULng32 flag);
+ void displayContents(Space *space, ULng32 flag);
NABoolean isOptionE() { return ((flags_ & OPTION_E) != 0); };
NABoolean isOptionF() { return ((flags_ & OPTION_F) != 0); };
@@ -418,7 +415,7 @@ public:
// ---------------------------------------------------------------------
// Used by the internal SHOWPLAN command to get attributes of a TDB.
// ---------------------------------------------------------------------
- NA_EIDPROC void displayContents(Space *space, ULng32 flag);
+ void displayContents(Space *space, ULng32 flag);
private:
enum
@@ -996,7 +993,7 @@ void setLabelStatsIncRelated(NABoolean v)
// Used by the internal SHOWPLAN command to get attributes of a TDB.
// ---------------------------------------------------------------------
- NA_EIDPROC void displayContents(Space *space, ULng32 flag);
+ void displayContents(Space *space, ULng32 flag);
protected:
//enum for flags_
@@ -1232,7 +1229,7 @@ public:
// ---------------------------------------------------------------------
// Used by the internal SHOWPLAN command to get attributes of a TDB.
// ---------------------------------------------------------------------
- NA_EIDPROC void displayContents(Space *space, ULng32 flag);
+ void displayContents(Space *space, ULng32 flag);
private:
NABasicPtr insertQuery_; // 00-07
@@ -1280,7 +1277,7 @@ public:
// ---------------------------------------------------------------------
// Used by the internal SHOWPLAN command to get attributes of a TDB.
// ---------------------------------------------------------------------
- NA_EIDPROC void displayContents(Space *space, ULng32 flag);
+ void displayContents(Space *space, ULng32 flag);
void setCleanupAllTables(NABoolean v)
{(v ? flags_ |= CLEANUP_ALL_TABLES : flags_ &= ~CLEANUP_ALL_TABLES); };
@@ -1358,7 +1355,7 @@ public:
// ---------------------------------------------------------------------
// Used by the internal SHOWPLAN command to get attributes of a TDB.
// ---------------------------------------------------------------------
- NA_EIDPROC void displayContents(Space *space, ULng32 flag);
+ void displayContents(Space *space, ULng32 flag);
private:
enum GetType
@@ -1412,7 +1409,7 @@ public:
// ---------------------------------------------------------------------
// Used by the internal SHOWPLAN command to get attributes of a TDB.
// ---------------------------------------------------------------------
- NA_EIDPROC void displayContents(Space *space, ULng32 flag);
+ void displayContents(Space *space, ULng32 flag);
private:
Lng32 errNum_; // 00-03
@@ -1480,7 +1477,7 @@ public:
// ---------------------------------------------------------------------
// Used by the internal SHOWPLAN command to get attributes of a TDB.
// ---------------------------------------------------------------------
- NA_EIDPROC void displayContents(Space *space, ULng32 flag);
+ void displayContents(Space *space, ULng32 flag);
private:
enum
@@ -1571,7 +1568,7 @@ public:
// ---------------------------------------------------------------------
// Used by the internal SHOWPLAN command to get attributes of a TDB.
// ---------------------------------------------------------------------
- NA_EIDPROC void displayContents(Space *space, ULng32 flag);
+ void displayContents(Space *space, ULng32 flag);
void setDoPurgedataCat(NABoolean v)
{(v ? flags_ |= DO_PURGEDATA_CAT : flags_ &= ~DO_PURGEDATA_CAT); };
@@ -1716,7 +1713,7 @@ public:
// ---------------------------------------------------------------------
// Used by the internal SHOWPLAN command to get attributes of a TDB.
// ---------------------------------------------------------------------
- NA_EIDPROC void displayContents(Space *space, ULng32 flag);
+ void displayContents(Space *space, ULng32 flag);
private:
NABasicPtr hiveTableName_; // 00-07
@@ -1766,7 +1763,7 @@ public:
// ---------------------------------------------------------------------
// Used by the internal SHOWPLAN command to get attributes of a TDB.
// ---------------------------------------------------------------------
- NA_EIDPROC void displayContents(Space *space, ULng32 flag);
+ void displayContents(Space *space, ULng32 flag);
private:
NABasicPtr hiveQuery_; // 00-07
@@ -1851,7 +1848,7 @@ public:
// ---------------------------------------------------------------------
// Used by the internal SHOWPLAN command to get attributes of a TDB.
// ---------------------------------------------------------------------
- NA_EIDPROC void displayContents(Space *space, ULng32 flag);
+ void displayContents(Space *space, ULng32 flag);
inline const char * getStmtName() const { return stmtName_.getPointer(); }
protected:
@@ -1928,7 +1925,7 @@ public:
// ---------------------------------------------------------------------
// Used by the internal SHOWPLAN command to get attributes of a TDB.
// ---------------------------------------------------------------------
- NA_EIDPROC void displayContents(Space *space, ULng32 flag);
+ void displayContents(Space *space, ULng32 flag);
private:
};
@@ -1998,7 +1995,7 @@ public:
// ---------------------------------------------------------------------
// Used by the internal SHOWPLAN command to get attributes of a TDB.
// ---------------------------------------------------------------------
- NA_EIDPROC void displayContents(Space *space, ULng32 flag);
+ void displayContents(Space *space, ULng32 flag);
private:
Int64 uid_; // 00-07
@@ -2074,7 +2071,7 @@ public:
// ---------------------------------------------------------------------
// Used by the internal SHOWPLAN command to get attributes of a TDB.
// ---------------------------------------------------------------------
- NA_EIDPROC void displayContents(Space *space, ULng32 flag);
+ void displayContents(Space *space, ULng32 flag);
private:
NABasicPtr stmtName_;
@@ -2129,7 +2126,7 @@ public:
// ---------------------------------------------------------------------
// Used by the internal SHOWPLAN command to get attributes of a TDB.
// ---------------------------------------------------------------------
- NA_EIDPROC void displayContents(Space *space, ULng32 flag);
+ void displayContents(Space *space, ULng32 flag);
inline const char * getInMemHistogramsTableName() const
{ return inMemHistogramsTableName_.getPointer() ; } ;
@@ -2209,7 +2206,7 @@ public:
// ---------------------------------------------------------------------
// Used by the internal SHOWPLAN command to get attributes of a TDB.
// ---------------------------------------------------------------------
- NA_EIDPROC void displayContents(Space *space, ULng32 flag);
+ void displayContents(Space *space, ULng32 flag);
private:
@@ -2258,7 +2255,7 @@ public:
// ---------------------------------------------------------------------
// Used by the internal SHOWPLAN command to get attributes of a TDB.
// ---------------------------------------------------------------------
- NA_EIDPROC void displayContents(Space *space, ULng32 flag);
+ void displayContents(Space *space, ULng32 flag);
void setLongRunningDelete(NABoolean v)
{(v ? flags_ |= LR_DELETE : flags_ &= ~LR_DELETE); };
@@ -2385,7 +2382,7 @@ public:
// ---------------------------------------------------------------------
// Used by the internal SHOWPLAN command to get attributes of a TDB.
// ---------------------------------------------------------------------
- NA_EIDPROC void displayContents(Space *space, ULng32 flag);
+ void displayContents(Space *space, ULng32 flag);
private:
@@ -2457,7 +2454,7 @@ public:
// ---------------------------------------------------------------------
// Used by the internal SHOWPLAN command to get attributes of a TDB.
// ---------------------------------------------------------------------
- NA_EIDPROC void displayContents(Space *space, ULng32 flag);
+ void displayContents(Space *space, ULng32 flag);
private:
Lng32 task_;
@@ -2684,7 +2681,7 @@ public:
// ---------------------------------------------------------------------
// Used by the internal SHOWPLAN command to get attributes of a TDB.
// ---------------------------------------------------------------------
- NA_EIDPROC void displayContents(Space *space, ULng32 flag);
+ void displayContents(Space *space, ULng32 flag);
protected:
enum
@@ -2781,7 +2778,7 @@ public:
// ---------------------------------------------------------------------
// Used by the internal SHOWPLAN command to get attributes of a TDB.
// ---------------------------------------------------------------------
- NA_EIDPROC void displayContents(Space *space, ULng32 flag);
+ void displayContents(Space *space, ULng32 flag);
private:
@@ -2865,7 +2862,7 @@ public:
// ---------------------------------------------------------------------
// Used by the internal SHOWPLAN command to get attributes of a TDB.
// ---------------------------------------------------------------------
- NA_EIDPROC void displayContents(Space *space, ULng32 flag);
+ void displayContents(Space *space, ULng32 flag);
void setHandleInStringFormat(NABoolean v)
{(v ? flags_ |= STRING_FORMAT : flags_ &= ~STRING_FORMAT); };
@@ -3001,7 +2998,7 @@ public:
// ---------------------------------------------------------------------
// Used by the internal SHOWPLAN command to get attributes of a TDB.
// ---------------------------------------------------------------------
- NA_EIDPROC void displayContents(Space *space, ULng32 flag);
+ void displayContents(Space *space, ULng32 flag);
void setAppend(NABoolean v)
{(v ? flags_ |= APPEND_ : flags_ &= ~APPEND_); };
@@ -3099,7 +3096,7 @@ public:
// ---------------------------------------------------------------------
// Used by the internal SHOWPLAN command to get attributes of a TDB.
// ---------------------------------------------------------------------
- NA_EIDPROC void displayContents(Space *space, ULng32 flag);
+ void displayContents(Space *space, ULng32 flag);
short getLOBnum(short i);
char * getLOBloc(short i);
@@ -3421,7 +3418,7 @@ public:
// ---------------------------------------------------------------------
// Used by the internal SHOWPLAN command to get attributes of a TDB.
// ---------------------------------------------------------------------
- NA_EIDPROC void displayContents(Space *space, ULng32 flag);
+ void displayContents(Space *space, ULng32 flag);
// Virtual routines to provide a consistent interface to TDB's
@@ -3636,7 +3633,7 @@ public:
// ---------------------------------------------------------------------
// Used by the internal SHOWPLAN command to get attributes of a TDB.
// ---------------------------------------------------------------------
- NA_EIDPROC void displayContents(Space *space, ULng32 flag);
+ void displayContents(Space *space, ULng32 flag);
private:
enum
@@ -3780,7 +3777,7 @@ public:
// ---------------------------------------------------------------------
// Used by the internal SHOWPLAN command to get attributes of a TDB.
// ---------------------------------------------------------------------
- NA_EIDPROC void displayContents(Space *space, ULng32 flag);
+ void displayContents(Space *space, ULng32 flag);
private:
enum
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/comexe/ComTdbExplain.h
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComTdbExplain.h b/core/sql/comexe/ComTdbExplain.h
index 945f9e5..09366df 100644
--- a/core/sql/comexe/ComTdbExplain.h
+++ b/core/sql/comexe/ComTdbExplain.h
@@ -137,7 +137,7 @@ public:
// ---------------------------------------------------------------------
// Used by the internal SHOWPLAN command to get attributes of a TDB.
// ---------------------------------------------------------------------
- NA_EIDPROC void displayContents(Space *space, ULng32 flag);
+ void displayContents(Space *space, ULng32 flag);
// The index of the ATP being returned to the parent, that has the
// new row (explain Info)
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/comexe/ComTdbFastTransport.h
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComTdbFastTransport.h b/core/sql/comexe/ComTdbFastTransport.h
index a63290b..37c01da 100644
--- a/core/sql/comexe/ComTdbFastTransport.h
+++ b/core/sql/comexe/ComTdbFastTransport.h
@@ -117,18 +117,15 @@ public:
//----------------------------------------------------------------------
// Redefine virtual functions required for versioning
//----------------------------------------------------------------------
- NA_EIDPROC
virtual unsigned char getClassVersionID()
{
return 1;
}
- NA_EIDPROC
virtual void populateImageVersionIDArray()
{
setImageVersionID(1,getClassVersionID());
ComTdb::populateImageVersionIDArray();
}
- NA_EIDPROC
virtual short getClassSize()
{
return (short) sizeof(ComTdbFastExtract);
@@ -137,41 +134,33 @@ public:
//----------------------------------------------------------------------
// Pack/unpack
//----------------------------------------------------------------------
- NA_EIDPROC
Long pack(void *);
- NA_EIDPROC
Lng32 unpack(void *, void *);
//----------------------------------------------------------------------
// Other required TDB support functions
//----------------------------------------------------------------------
- NA_EIDPROC
Int32 orderedQueueProtocol() const
{
return -1;
}
- NA_EIDPROC
void display() const
{
// All TDBs have an no-op display() function. Not sure why.
}
- NA_EIDPROC
virtual Int32 numChildren() const
{
return 1;
}
- NA_EIDPROC
virtual const char *getNodeName() const
{
return "EX_FAST_EXTRACT";
}
- NA_EIDPROC
virtual const ComTdb *getChild() const
{
return childTdb_;
}
- NA_EIDPROC
virtual const ComTdb* getChild(Int32 pos) const
{
if (pos == 0)
@@ -180,12 +169,10 @@ public:
return NULL;
}
- NA_EIDPROC
virtual Int32 numExpressions() const
{
return 3;
}
- NA_EIDPROC
virtual const char *getExpressionName(Int32 pos) const
{
if (pos == 0)
@@ -198,7 +185,6 @@ public:
return NULL;
}
- NA_EIDPROC
virtual ex_expr *getExpressionNode(Int32 pos)
{
if (pos == 0)
@@ -211,7 +197,6 @@ public:
return NULL;
}
- NA_EIDPROC
virtual void displayContents(Space *space, ULng32 flag);
NABoolean getIsAppend() const
@@ -345,18 +330,18 @@ public:
NABoolean getContinueOnError() const
{ return ((flags_ & CONTINUE_ON_ERROR) != 0); }
- NA_EIDPROC inline const char *getTargetName() const { return targetName_; }
- NA_EIDPROC inline const char *getHdfsHostName() const { return hdfsHostName_; }
- NA_EIDPROC inline const Int32 getHdfsPortNum() const {return (Int32)hdfsPortNum_;}
- NA_EIDPROC inline const char *getHiveTableName() const { return hiveTableName_; }
- NA_EIDPROC inline const char *getHeader() const { return header_; }
- NA_EIDPROC inline const char *getNullString() const { return nullString_; }
- NA_EIDPROC inline const char *getDelimiter() const { return delimiter_; }
- NA_EIDPROC inline const char *getRecordSeparator() const
+ inline const char *getTargetName() const { return targetName_; }
+ inline const char *getHdfsHostName() const { return hdfsHostName_; }
+ inline const Int32 getHdfsPortNum() const {return (Int32)hdfsPortNum_;}
+ inline const char *getHiveTableName() const { return hiveTableName_; }
+ inline const char *getHeader() const { return header_; }
+ inline const char *getNullString() const { return nullString_; }
+ inline const char *getDelimiter() const { return delimiter_; }
+ inline const char *getRecordSeparator() const
{ return recordSeparator_; }
- NA_EIDPROC Int32 getNumIOBuffers() {return (Int32)numIOBuffers_;}
- NA_EIDPROC Int32 getIoTimeout() {return (Int32)ioTimeout_;}
+ Int32 getNumIOBuffers() {return (Int32)numIOBuffers_;}
+ Int32 getIoTimeout() {return (Int32)ioTimeout_;}
Int64 getHdfsIoBufferSize() const
{
return hdfsIOBufferSize_;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/comexe/ComTdbFirstN.h
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComTdbFirstN.h b/core/sql/comexe/ComTdbFirstN.h
index a9f1c04..bc27109 100644
--- a/core/sql/comexe/ComTdbFirstN.h
+++ b/core/sql/comexe/ComTdbFirstN.h
@@ -72,12 +72,12 @@ public:
// ---------------------------------------------------------------------
// Redefine virtual functions required for Versioning.
//----------------------------------------------------------------------
- NA_EIDPROC virtual unsigned char getClassVersionID()
+ virtual unsigned char getClassVersionID()
{
return 1;
}
- NA_EIDPROC virtual void populateImageVersionIDArray()
+ virtual void populateImageVersionIDArray()
{
setImageVersionID(1,getClassVersionID());
ComTdb::populateImageVersionIDArray();
@@ -108,7 +108,7 @@ public:
// ---------------------------------------------------------------------
// Used by the internal SHOWPLAN command to get attributes of a TDB.
// ---------------------------------------------------------------------
- NA_EIDPROC virtual void displayContents(Space *space,ULng32 flag);
+ virtual void displayContents(Space *space,ULng32 flag);
Int64 firstNRows() { return firstNRows_; }
protected:
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/comexe/ComTdbHashGrby.h
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComTdbHashGrby.h b/core/sql/comexe/ComTdbHashGrby.h
index 79fb444..f31f70e 100644
--- a/core/sql/comexe/ComTdbHashGrby.h
+++ b/core/sql/comexe/ComTdbHashGrby.h
@@ -96,11 +96,9 @@ protected:
public:
-NA_EIDPROC
ComTdbHashGrby(); // dummy constructor.
// Used by 'unpack' routines.
-NA_EIDPROC
ComTdbHashGrby(ComTdb * childTdb,
ex_cri_desc * givenDesc,
ex_cri_desc * returnedDesc,
@@ -145,37 +143,32 @@ NA_EIDPROC
short hgbGrowthPercent
);
-NA_EIDPROC
~ComTdbHashGrby();
// ---------------------------------------------------------------------
// Redefine virtual functions required for Versioning.
//----------------------------------------------------------------------
- NA_EIDPROC virtual unsigned char getClassVersionID()
+ virtual unsigned char getClassVersionID()
{
return 1;
}
- NA_EIDPROC virtual void populateImageVersionIDArray()
+ virtual void populateImageVersionIDArray()
{
setImageVersionID(1,getClassVersionID());
ComTdb::populateImageVersionIDArray();
}
- NA_EIDPROC virtual short getClassSize()
+ virtual short getClassSize()
{ return (short)sizeof(ComTdbHashGrby); }
Long pack(void *);
-NA_EIDPROC
Lng32 unpack(void *, void * reallocator);
-NA_EIDPROC
void display() const;
-NA_EIDPROC
inline ComTdb * getChildTdb();
-NA_EIDPROC
Int32 orderedQueueProtocol() const;
AggrExpr * hbAggrExpr() const { return (AggrExpr*)((ex_expr*)hbAggrExpr_); }
@@ -185,10 +178,10 @@ NA_EIDPROC
// ---------------------------------------------------------------------
// Used by the internal SHOWPLAN command to get attributes of a TDB.
// ---------------------------------------------------------------------
- NA_EIDPROC virtual void displayContents(Space *space,ULng32 flag);
+ virtual void displayContents(Space *space,ULng32 flag);
#if 0
-NA_EIDPROC
+
//virtual
void allocateStatsEntry(Int64 operID,
Int64 estRowsReturned,
@@ -196,19 +189,14 @@ NA_EIDPROC
#endif
// **** GUI ****
-NA_EIDPROC
virtual const ComTdb* getChild(Int32 pos) const;
-NA_EIDPROC
virtual Int32 numChildren() const { return 1; };
-NA_EIDPROC
virtual const char *getNodeName() const { return "EX_HASH_GRBY"; };
-NA_EIDPROC
virtual Int32 numExpressions() const { return 13; };
-NA_EIDPROC
virtual ex_expr * getExpressionNode(Int32 pos) {
if (pos == 0)
return hashExpr_;
@@ -240,7 +228,6 @@ NA_EIDPROC
return NULL;
};
-NA_EIDPROC
virtual const char * getExpressionName(Int32 pos) const {
if (pos == 0)
return "hashExpr_";
@@ -284,20 +271,18 @@ NA_EIDPROC
{(v ? hashGroupByFlags_ |= LOG_DIAGNOSTICS_ : hashGroupByFlags_ &= ~LOG_DIAGNOSTICS_);}
- NA_EIDPROC
NABoolean isPossibleMultipleCalls()
{return (hashGroupByFlags_ & POSSIBLE_MULTIPLE_CALLS) != 0;}
- NA_EIDPROC
+
void setPossibleMultipleCalls(NABoolean v)
{(v ? hashGroupByFlags_ |= POSSIBLE_MULTIPLE_CALLS :
hashGroupByFlags_ &= ~POSSIBLE_MULTIPLE_CALLS);}
- NA_EIDPROC
NABoolean isPassPartialRows()
{return (hashGroupByFlags_ & PASS_PARTIAL_ROWS) != 0;}
- NA_EIDPROC
+
void setPassPartialRows(NABoolean v)
{(v ? hashGroupByFlags_ |= PASS_PARTIAL_ROWS :
hashGroupByFlags_ &= ~PASS_PARTIAL_ROWS);}
@@ -313,51 +298,38 @@ NA_EIDPROC
NABoolean considerBufferDefrag() const {return (hashGroupByFlags_ & CONSIDER_BUFFER_DEFRAG) !=0; };
void setConsiderBufferDefrag() {hashGroupByFlags_ |= CONSIDER_BUFFER_DEFRAG;};
- NA_EIDPROC UInt16 forceOverflowEvery() {return forceOverflowEvery_;}
+ UInt16 forceOverflowEvery() {return forceOverflowEvery_;}
- NA_EIDPROC
+
void setForceOverflowEvery(UInt16 times) { forceOverflowEvery_ = times; }
- NA_EIDPROC
ULng32 memoryQuotaMB() { return (ULng32) memoryQuotaMB_; }
- NA_EIDPROC
void setMemoryQuotaMB(UInt16 v) { memoryQuotaMB_ = v; }
- NA_EIDPROC
ULng32 partialGrbyMemoryMB() { return (ULng32) partialGrbyMemoryMB_; }
- NA_EIDPROC
void setPartialGrbyMemoryMB(UInt16 v) { partialGrbyMemoryMB_ = v; }
- NA_EIDPROC
void setHgbMemEstInMbPerCpu(Float32 s) {hgbMemEstInMbPerCpu_=s;}
- NA_EIDPROC
Float32 getHgbMemEstInMbPerCpu() {return hgbMemEstInMbPerCpu_;}
- NA_EIDPROC
Float32 hgbGrowthPercent() {return Float32(hgbGrowthPercent_/100.0);}
- NA_EIDPROC
Int32 scratchIOVectorSize() { return (Int32) scratchIOVectorSize_; }
- NA_EIDPROC
void setScratchIOVectorSize(Int16 v) { scratchIOVectorSize_ = v; }
- NA_EIDPROC
void setBmoMinMemBeforePressureCheck(UInt16 m)
{ bmoMinMemBeforePressureCheck_ = m ; }
- NA_EIDPROC
UInt16 getBmoMinMemBeforePressureCheck()
{ return bmoMinMemBeforePressureCheck_; }
- NA_EIDPROC
void setBMOMaxMemThresholdMB(UInt16 m)
{ bmoMaxMemThresholdMB_ = m ; }
- NA_EIDPROC
UInt16 getBMOMaxMemThresholdMB()
{ return bmoMaxMemThresholdMB_; }
@@ -366,7 +338,6 @@ NA_EIDPROC
};
-NA_EIDPROC
inline ComTdb * ComTdbHashGrby::getChildTdb(){
return childTdb_;
};
@@ -379,7 +350,6 @@ inline ComTdb * ComTdbHashGrby::getChildTdb(){
History : Yeogirl Yun 8/22/95
Initial Revision.
*****************************************************************************/
-NA_EIDPROC
inline const ComTdb* ComTdbHashGrby::getChild(Int32 pos) const {
if (pos == 0)
return childTdb_;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/comexe/ComTdbHashj.h
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComTdbHashj.h b/core/sql/comexe/ComTdbHashj.h
index b0976b8..a32aa05 100644
--- a/core/sql/comexe/ComTdbHashj.h
+++ b/core/sql/comexe/ComTdbHashj.h
@@ -159,7 +159,7 @@ public:
// ---------------------------------------------------------------------
// Used by the internal SHOWPLAN command to get attributes of a TDB.
// ---------------------------------------------------------------------
- NA_EIDPROC virtual void displayContents(Space *space,ULng32 flag);
+ virtual void displayContents(Space *space,ULng32 flag);
// **** information for GUI *** -------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/comexe/ComTdbHbaseAccess.h
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComTdbHbaseAccess.h b/core/sql/comexe/ComTdbHbaseAccess.h
index 2e13a9f..b84c0c4 100644
--- a/core/sql/comexe/ComTdbHbaseAccess.h
+++ b/core/sql/comexe/ComTdbHbaseAccess.h
@@ -588,7 +588,7 @@ public:
// ---------------------------------------------------------------------
// Used by the internal SHOWPLAN command to get attributes of a TDB.
// ---------------------------------------------------------------------
- NA_EIDPROC void displayContents(Space *space, ULng32 flag);
+ void displayContents(Space *space, ULng32 flag);
// Virtual routines to provide a consistent interface to TDB's
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/comexe/ComTdbMj.h
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComTdbMj.h b/core/sql/comexe/ComTdbMj.h
index 39be950..0cd25e1 100644
--- a/core/sql/comexe/ComTdbMj.h
+++ b/core/sql/comexe/ComTdbMj.h
@@ -206,7 +206,7 @@ public:
// ---------------------------------------------------------------------
// Used by the internal SHOWPLAN command to get attributes of a TDB.
// ---------------------------------------------------------------------
- NA_EIDPROC virtual void displayContents(Space *space,ULng32 flag);
+ virtual void displayContents(Space *space,ULng32 flag);
// GUI functions
virtual const ComTdb* getChild(Int32 pos) const
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/comexe/ComTdbOnlj.h
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComTdbOnlj.h b/core/sql/comexe/ComTdbOnlj.h
index 37d6961..7054a15 100644
--- a/core/sql/comexe/ComTdbOnlj.h
+++ b/core/sql/comexe/ComTdbOnlj.h
@@ -166,7 +166,7 @@ public:
// ---------------------------------------------------------------------
// Used by the internal SHOWPLAN command to get attributes of a TDB.
// ---------------------------------------------------------------------
- NA_EIDPROC virtual void displayContents(Space *space,ULng32 flag);
+ virtual void displayContents(Space *space,ULng32 flag);
};
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/comexe/ComTdbPackRows.h
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComTdbPackRows.h b/core/sql/comexe/ComTdbPackRows.h
index da57d2d..2b5fd25 100644
--- a/core/sql/comexe/ComTdbPackRows.h
+++ b/core/sql/comexe/ComTdbPackRows.h
@@ -51,15 +51,12 @@ class ComTdbPackRows: public ComTdb
public:
// Default Constructor.
- NA_EIDPROC
ComTdbPackRows();
// Copy constructor.
- NA_EIDPROC
ComTdbPackRows(const ComTdbPackRows* packTdb);
// Constructor used by the PhyPack::codeGen() in GenRelMisc.cpp.
- NA_EIDPROC
ComTdbPackRows(ComTdb* childTdb,
ex_expr* packExpr,
ex_expr* predExpr,
@@ -72,27 +69,21 @@ public:
// Pack the pack TDB for transmission from one process to another.
- NA_EIDPROC
Long pack(void *);
// Unpack the pack TDB after receiving it from another process.
- NA_EIDPROC
Lng32 unpack(void *, void * reallocator);
// Don't know what it is for ??
- NA_EIDPROC
void display() const;
// Return a pointer to the child TBD of this Pack TDB.
- NA_EIDPROC
inline ComTdb* getChildTdb() { return childTdb_; }
// We are observing order queue protocol.
- NA_EIDPROC
Int32 orderedQueueProtocol() const ;
// Return a pointer to the specifed (by position) child TDB.
- NA_EIDPROC
virtual const ComTdb* getChild(Int32 pos) const
{
if(pos == 0) return childTdb_;
@@ -100,15 +91,12 @@ public:
}
// Return the number of children for this node.
- NA_EIDPROC
virtual Int32 numChildren() const { return 1; }
// Return the number of expression this node has.
- NA_EIDPROC
virtual Int32 numExpressions() const { return 2; }
// Return the expression by position.
- NA_EIDPROC
virtual ex_expr* getExpressionNode(Int32 pos)
{
switch(pos)
@@ -121,7 +109,6 @@ public:
}
// Return the name of an expression by position.
- NA_EIDPROC
virtual const char* getExpressionName(Int32 pos) const
{
switch(pos)
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/comexe/ComTdbRoot.h
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComTdbRoot.h b/core/sql/comexe/ComTdbRoot.h
index b1e4662..77a5000 100644
--- a/core/sql/comexe/ComTdbRoot.h
+++ b/core/sql/comexe/ComTdbRoot.h
@@ -721,7 +721,7 @@ public:
// ---------------------------------------------------------------------
// Used by the internal SHOWPLAN command to get attributes of a TDB.
// ---------------------------------------------------------------------
- NA_EIDPROC virtual void displayContents(Space *space,ULng32 flag);
+ virtual void displayContents(Space *space,ULng32 flag);
//-------------------------------------------------------------------------
// GSH : This function is called from within arkcmp if the user requested
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/comexe/ComTdbSample.h
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComTdbSample.h b/core/sql/comexe/ComTdbSample.h
index 0927b8c..c6f584d 100644
--- a/core/sql/comexe/ComTdbSample.h
+++ b/core/sql/comexe/ComTdbSample.h
@@ -50,10 +50,8 @@ class ComTdbSample : public ComTdb
friend class ExSamplePrivateState;
public:
- NA_EIDPROC
ComTdbSample();
- NA_EIDPROC
ComTdbSample(ex_expr *initExpr,
ex_expr *balanceExpr,
Int32 returnFactorOffset,
@@ -64,51 +62,37 @@ public:
queue_index down,
queue_index up);
- NA_EIDPROC
~ComTdbSample();
// ---------------------------------------------------------------------
// Redefine virtual functions required for Versioning.
//----------------------------------------------------------------------
- NA_EIDPROC
virtual unsigned char getClassVersionID()
{
return 1;
}
- NA_EIDPROC
virtual void populateImageVersionIDArray()
{
setImageVersionID(1,getClassVersionID());
ComTdb::populateImageVersionIDArray();
}
- NA_EIDPROC
virtual short getClassSize() { return (short)sizeof(*this); }
- NA_EIDPROC
Long pack(void *);
- NA_EIDPROC
Lng32 unpack(void *, void * reallocator);
- NA_EIDPROC
void display() const;
- NA_EIDPROC
inline ComTdb * getChildTdb();
- NA_EIDPROC
Int32 orderedQueueProtocol() const;
- NA_EIDPROC
virtual const ComTdb* getChild(Int32 pos) const;
- NA_EIDPROC
virtual Int32 numChildren() const { return 1; }
- NA_EIDPROC
virtual const char *getNodeName() const { return "EX_SAMPLE"; };
- NA_EIDPROC
virtual Int32 numExpressions() const { return 3; }
- NA_EIDPROC
virtual ex_expr* getExpressionNode(Int32 pos) {
if (pos == 0)
return initExpr_;
@@ -119,7 +103,6 @@ public:
else
return NULL;
}
- NA_EIDPROC
virtual const char * getExpressionName(Int32 pos) const {
if (pos == 0)
return "initExpr_";
@@ -146,7 +129,6 @@ protected:
char fillers_[36]; // 36-71
};
-NA_EIDPROC
inline ComTdb * ComTdbSample::getChildTdb(){
return tdbChild_;
};
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/comexe/ComTdbSequence.h
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComTdbSequence.h b/core/sql/comexe/ComTdbSequence.h
index 2107c96..447158b 100644
--- a/core/sql/comexe/ComTdbSequence.h
+++ b/core/sql/comexe/ComTdbSequence.h
@@ -47,10 +47,8 @@ class ComTdbSequence : public ComTdb
friend class ExSequencePrivateState;
public:
- NA_EIDPROC
ComTdbSequence();
- NA_EIDPROC
ComTdbSequence(ex_expr * sequenceExpr,
ex_expr * returnExpr,
ex_expr * postPred,
@@ -81,7 +79,6 @@ public:
NABoolean noOverflow,
ex_expr * partExpr);
- NA_EIDPROC
~ComTdbSequence();
// ---------------------------------------------------------------------
@@ -100,34 +97,24 @@ public:
virtual short getClassSize() { return (short)sizeof(*this); }
- NA_EIDPROC
Long pack(void *);
- NA_EIDPROC
Lng32 unpack(void *, void * reallocator);
- NA_EIDPROC
void display() const;
// ---------------------------------------------------------------------
// Used by the internal SHOWPLAN command to get attributes of a TDB.
// ---------------------------------------------------------------------
- NA_EIDPROC virtual void displayContents(Space *space,ULng32 flag);
+ virtual void displayContents(Space *space,ULng32 flag);
- NA_EIDPROC
inline ComTdb * getChildTdb();
- NA_EIDPROC
Int32 orderedQueueProtocol() const;
- NA_EIDPROC
virtual const ComTdb* getChild(Int32 pos) const;
- NA_EIDPROC
virtual Int32 numChildren() const { return 1; }
- NA_EIDPROC
virtual const char *getNodeName() const { return "EX_SEQUENCE_FUNCTION"; };
- NA_EIDPROC
virtual Int32 numExpressions() const { return 5; }
- NA_EIDPROC
virtual ex_expr* getExpressionNode(Int32 pos) {
if (pos == 0)
return sequenceExpr_;
@@ -189,25 +176,21 @@ public:
{
return maxRowsInOLAPBuffer_;
}
- NA_EIDPROC
Int32 getMinNumberOfOLAPBuffers() const
{
return minNumberOfOLAPBuffers_;
}
- NA_EIDPROC
Int32 getMaxNumberOfOLAPBuffers() const
{
return maxNumberOfOLAPBuffers_;
}
- NA_EIDPROC
Int32 getNumberOfWinOLAPBuffers() const
{
return numberOfWinOLAPBuffers_;
}
- NA_EIDPROC
Int32 getMinFollowing() const
{
return minFollowing_;
@@ -269,7 +252,6 @@ protected:
char fillers_[2]; // 102-103
};
-NA_EIDPROC
inline ComTdb * ComTdbSequence::getChildTdb(){
return tdbChild_;
};
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/comexe/ComTdbSort.h
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComTdbSort.h b/core/sql/comexe/ComTdbSort.h
index ab0fd64..15a64c3 100644
--- a/core/sql/comexe/ComTdbSort.h
+++ b/core/sql/comexe/ComTdbSort.h
@@ -120,7 +120,7 @@ public:
// ---------------------------------------------------------------------
// Used by the internal SHOWPLAN command to get attributes of a TDB.
// ---------------------------------------------------------------------
- NA_EIDPROC void displayContents(Space *space);
+ void displayContents(Space *space);
protected:
enum
@@ -338,7 +338,7 @@ public:
// ---------------------------------------------------------------------
// Used by the internal SHOWPLAN command to get attributes of a TDB.
// ---------------------------------------------------------------------
- NA_EIDPROC virtual void displayContents(Space *space,ULng32 flag);
+ virtual void displayContents(Space *space,ULng32 flag);
};
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/comexe/ComTdbSortGrby.cpp
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComTdbSortGrby.cpp b/core/sql/comexe/ComTdbSortGrby.cpp
index f35aa7e..f3932d1 100644
--- a/core/sql/comexe/ComTdbSortGrby.cpp
+++ b/core/sql/comexe/ComTdbSortGrby.cpp
@@ -119,7 +119,7 @@ Lng32 ComTdbSortGrby::unpack(void * base, void * reallocator)
if(havingExpr_.unpack(base, reallocator)) return -1;
return ComTdb::unpack(base, reallocator);
}
-NA_EIDPROC void ComTdbSortGrby::displayContents(Space * space,ULng32 flag)
+void ComTdbSortGrby::displayContents(Space * space,ULng32 flag)
{
ComTdb::displayContents(space,flag & 0xFFFFFFFE);
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/comexe/ComTdbSortGrby.h
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComTdbSortGrby.h b/core/sql/comexe/ComTdbSortGrby.h
index 4c0528f..c5b03ad 100644
--- a/core/sql/comexe/ComTdbSortGrby.h
+++ b/core/sql/comexe/ComTdbSortGrby.h
@@ -75,10 +75,8 @@ protected:
public:
// Constructor
-NA_EIDPROC
ComTdbSortGrby(); // dummy constructor. Used by 'unpack' routines.
-NA_EIDPROC
ComTdbSortGrby(ex_expr * aggr_expr,
ex_expr * grby_expr,
ex_expr * move_expr,
@@ -95,7 +93,6 @@ NA_EIDPROC
ULng32 buffer_size,
NABoolean tolerateNonFatalError);
-NA_EIDPROC
~ComTdbSortGrby();
AggrExpr * aggrExpr() { return (AggrExpr*)((ex_expr*)aggrExpr_); }
@@ -106,49 +103,36 @@ NA_EIDPROC
// ---------------------------------------------------------------------
// Redefine virtual functions required for Versioning.
//----------------------------------------------------------------------
-NA_EIDPROC
virtual unsigned char getClassVersionID()
{
return 1;
}
-NA_EIDPROC
virtual void populateImageVersionIDArray()
{
setImageVersionID(1,getClassVersionID());
ComTdb::populateImageVersionIDArray();
}
-NA_EIDPROC
virtual short getClassSize() { return (short)sizeof(ComTdbSortGrby); }
Long pack(void *);
-NA_EIDPROC
Lng32 unpack(void *, void * reallocator);
-NA_EIDPROC
void display() const;
-NA_EIDPROC
inline ComTdb * getChildTdb();
-NA_EIDPROC
Int32 orderedQueueProtocol() const;
// ---------------------------------------------------------------------
// Used by the internal SHOWPLAN command to get attributes of a TDB.
// ---------------------------------------------------------------------
-NA_EIDPROC
virtual void displayContents(Space *space,ULng32 flag);
-NA_EIDPROC
virtual const ComTdb* getChild(Int32 pos) const;
-NA_EIDPROC
virtual Int32 numChildren() const { return 1; }
-NA_EIDPROC
virtual const char *getNodeName() const { return "EX_SORT_GRBY"; };
-NA_EIDPROC
virtual Int32 numExpressions() const { return 4; }
-NA_EIDPROC
virtual ex_expr* getExpressionNode(Int32 pos) {
if (pos == 0)
return aggrExpr_;
@@ -161,7 +145,6 @@ NA_EIDPROC
else
return NULL;
}
-NA_EIDPROC
virtual const char * getExpressionName(Int32 pos) const {
if (pos == 0)
return "aggrExpr_";
@@ -181,7 +164,6 @@ NA_EIDPROC
};
-NA_EIDPROC
inline ComTdb * ComTdbSortGrby::getChildTdb(){
return tdbChild_;
};
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/comexe/ComTdbSplitTop.h
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComTdbSplitTop.h b/core/sql/comexe/ComTdbSplitTop.h
index b33c83e..e3ae493 100644
--- a/core/sql/comexe/ComTdbSplitTop.h
+++ b/core/sql/comexe/ComTdbSplitTop.h
@@ -123,7 +123,7 @@ public:
void display() const;
- NA_EIDPROC Int32 getBottomNumParts() {return bottomNumParts_;}
+ Int32 getBottomNumParts() {return bottomNumParts_;}
// for GUI
virtual const ComTdb* getChild(Int32 pos) const;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/comexe/ComTdbTranspose.h
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComTdbTranspose.h b/core/sql/comexe/ComTdbTranspose.h
index f000df9..3a95583 100644
--- a/core/sql/comexe/ComTdbTranspose.h
+++ b/core/sql/comexe/ComTdbTranspose.h
@@ -65,13 +65,11 @@ public:
// Used when unpacking the Transpose TDB. Used to get a pointer
// to the Virtual Method Table.
//
- NA_EIDPROC
ComTdbTranspose();
// Construct a copy of the given node.
// (This constructor does not seem to be used)
//
- NA_EIDPROC
ComTdbTranspose(const ComTdbTranspose *transposeTdb);
// Construct a new Transpose TDB.
@@ -130,7 +128,6 @@ public:
// unsigned long bufferSize
// IN: Recommended size for pool buffers.
//
- NA_EIDPROC
ComTdbTranspose(ComTdb * childTdb,
ex_expr ** transColExprs,
Int32 numTransExprs,
@@ -149,18 +146,18 @@ public:
// ---------------------------------------------------------------------
// Redefine virtual functions required for Versioning.
//----------------------------------------------------------------------
- NA_EIDPROC virtual unsigned char getClassVersionID()
+ virtual unsigned char getClassVersionID()
{
return 1;
}
- NA_EIDPROC virtual void populateImageVersionIDArray()
+ virtual void populateImageVersionIDArray()
{
setImageVersionID(1,getClassVersionID());
ComTdb::populateImageVersionIDArray();
}
- NA_EIDPROC virtual short getClassSize()
+ virtual short getClassSize()
{ return (short)sizeof(ComTdbTranspose); }
@@ -178,7 +175,6 @@ public:
// that can be reached from this TDB points to memory outside
// this space object.
//
- NA_EIDPROC
Long pack(void *);
// ComTdbTranspose::unpack() ---------------------------------------------
@@ -193,19 +189,16 @@ public:
// IN - The base address of the TDB fragment. Pointers are calculated
// by adding the offset to the base address (more or less).
//
- NA_EIDPROC
Lng32 unpack(void *, void * reallocator);
// ComTdbTranspose::Display() -----------------------------------------
// (Don't know why this is here. It does not seem to be virtual and
// on class seems to do anything for this method.)
//
- NA_EIDPROC
void display() const;
// Return a pointer to the child TBD of this transpose TDB.
//
- NA_EIDPROC
inline ComTdb * getChildTdb() { return childTdb_; }
// We are observing order queue protocol. Results from
@@ -215,14 +208,12 @@ public:
// Exclude this code from coverage analysis.
// This code could be deleted since it is the same as the base implementation.
// LCOV_EXCL_START
- NA_EIDPROC
Int32 orderedQueueProtocol() const { return -1; }
// LCOV_EXCL_STOP
// return a pointer to the specifed (by position) child TDB.
// Transpose has only one child.
//
- NA_EIDPROC
virtual const ComTdb *getChild(Int32 pos) const
{
if(pos == 0)
@@ -233,7 +224,6 @@ public:
// Return the number of children for this node.
// Transpose has one child.
//
- NA_EIDPROC
virtual Int32 numChildren() const { return 1; }
// Return the number of expression this node has.
@@ -241,7 +231,6 @@ public:
// There are numTransExprs_ transpose expressions, plus
// the afterTransPred_ selection predicate.
//
- NA_EIDPROC
virtual Int32 numExpressions() const
{
return numTransExprs_ + 1;
@@ -251,7 +240,6 @@ public:
// The transpose expressions come first, followed
// by the selection pred.
//
- NA_EIDPROC
virtual ex_expr * getExpressionNode(Int32 pos)
{
if(transColExprs_ && (pos >= 0) && (pos < numTransExprs_))
@@ -265,7 +253,6 @@ public:
// The transpose expressions come first, followed
// by the selection pred.
//
- NA_EIDPROC
virtual const char * getExpressionName(Int32 pos) const
{
if(transColExprs_ && (pos >= 0) && (pos < numTransExprs_))
@@ -283,7 +270,6 @@ public:
// Return the number of transpose expressions. Used by
// the Transpose TDB and TCB methods.
//
- NA_EIDPROC
Int32 numTransExprs() { return numTransExprs_; };
protected:
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/comexe/ComTdbTuple.h
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComTdbTuple.h b/core/sql/comexe/ComTdbTuple.h
index e845d43..1ecb285 100644
--- a/core/sql/comexe/ComTdbTuple.h
+++ b/core/sql/comexe/ComTdbTuple.h
@@ -52,10 +52,8 @@ public:
enum TupleTdbType {
LEAF_, NON_LEAF_ };
-NA_EIDPROC
ComTdbTuple();
-NA_EIDPROC
ComTdbTuple(TupleTdbType ttt,
Queue * tupleExprList,
const ULng32 tupleLen,
@@ -69,12 +67,10 @@ NA_EIDPROC
ULng32 bufferSize,
ex_expr *predExpr = NULL);
-NA_EIDPROC
~ComTdbTuple();
// LCOV_EXCL_START
// only derived class is used, see GenRelMisc.cpp
-NA_EIDPROC
Int32 orderedQueueProtocol() const
{
return -1;
@@ -83,29 +79,25 @@ NA_EIDPROC
// ---------------------------------------------------------------------
// Redefine virtual functions required for Versioning.
//----------------------------------------------------------------------
- NA_EIDPROC virtual unsigned char getClassVersionID()
+ virtual unsigned char getClassVersionID()
{
return 1;
}
- NA_EIDPROC virtual void populateImageVersionIDArray()
+ virtual void populateImageVersionIDArray()
{
setImageVersionID(1,getClassVersionID());
ComTdb::populateImageVersionIDArray();
}
- NA_EIDPROC virtual short getClassSize()
+ virtual short getClassSize()
{ return (short)sizeof(ComTdbTuple); }
-NA_EIDPROC
virtual Long pack (void *);
-NA_EIDPROC
virtual Lng32 unpack(void *, void * reallocator);
-NA_EIDPROC
void display() const;
-NA_EIDPROC
TupleTdbType getTupleType() { return (TupleTdbType)ttt_; }
virtual const ComTdb* getChild(Int32 pos) const
@@ -145,10 +137,8 @@ class ComTdbTupleLeaf: public ComTdbTuple
friend class ExTupleLeafPrivateState;
public:
-NA_EIDPROC
ComTdbTupleLeaf(){};
-NA_EIDPROC
ComTdbTupleLeaf(Queue * tupleExprList,
const ULng32 tupleLen,
const unsigned short tuppIndex,
@@ -165,18 +155,18 @@ NA_EIDPROC
// ---------------------------------------------------------------------
// Redefine virtual functions required for Versioning.
//----------------------------------------------------------------------
- NA_EIDPROC virtual unsigned char getClassVersionID()
+ virtual unsigned char getClassVersionID()
{
return 1;
}
- NA_EIDPROC virtual void populateImageVersionIDArray()
+ virtual void populateImageVersionIDArray()
{
setImageVersionID(2,getClassVersionID());
ComTdbTuple::populateImageVersionIDArray();
}
- NA_EIDPROC virtual short getClassSize()
+ virtual short getClassSize()
{ return (short)sizeof(ComTdbTupleLeaf); }
virtual Int32 numChildren() const { return 0; }
@@ -198,10 +188,8 @@ class ComTdbTupleNonLeaf : public ComTdbTuple
friend class ExTupleNonLeafPrivateState;
public:
-NA_EIDPROC
ComTdbTupleNonLeaf(){};
-NA_EIDPROC
ComTdbTupleNonLeaf(Queue * tupleExprList,
ComTdb* childTdb,
const ULng32 tupleLen,
@@ -218,23 +206,21 @@ NA_EIDPROC
// ---------------------------------------------------------------------
// Redefine virtual functions required for Versioning.
//----------------------------------------------------------------------
- NA_EIDPROC virtual unsigned char getClassVersionID()
+ virtual unsigned char getClassVersionID()
{
return 1;
}
- NA_EIDPROC virtual void populateImageVersionIDArray()
+ virtual void populateImageVersionIDArray()
{
setImageVersionID(2,getClassVersionID());
ComTdbTuple::populateImageVersionIDArray();
}
- NA_EIDPROC virtual short getClassSize()
+ virtual short getClassSize()
{ return (short)sizeof(ComTdbTupleNonLeaf); }
-NA_EIDPROC
virtual Long pack (void *);
-NA_EIDPROC
virtual Lng32 unpack(void *, void * reallocator);
virtual Int32 numChildren() const { return 1; }
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/comexe/ComTdbTupleFlow.cpp
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComTdbTupleFlow.cpp b/core/sql/comexe/ComTdbTupleFlow.cpp
index b1b7432..42641f9 100644
--- a/core/sql/comexe/ComTdbTupleFlow.cpp
+++ b/core/sql/comexe/ComTdbTupleFlow.cpp
@@ -127,7 +127,7 @@ const char * ComTdbTupleFlow::getExpressionName(Int32 pos) const
return NULL;
}
-NA_EIDPROC void ComTdbTupleFlow::displayContents(Space * space,ULng32 flag)
+void ComTdbTupleFlow::displayContents(Space * space,ULng32 flag)
{
ComTdb::displayContents(space,flag & 0xFFFFFFFE);
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/comexe/ComTdbTupleFlow.h
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComTdbTupleFlow.h b/core/sql/comexe/ComTdbTupleFlow.h
index 9932755..f277ab9 100644
--- a/core/sql/comexe/ComTdbTupleFlow.h
+++ b/core/sql/comexe/ComTdbTupleFlow.h
@@ -163,7 +163,7 @@ public:
// ---------------------------------------------------------------------
// Used by the internal SHOWPLAN command to get attributes of a TDB.
// ---------------------------------------------------------------------
- NA_EIDPROC virtual void displayContents(Space *space,ULng32 flag);
+ virtual void displayContents(Space *space,ULng32 flag);
};
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/comexe/ComTdbUdr.h
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComTdbUdr.h b/core/sql/comexe/ComTdbUdr.h
index 18dccb3..4bb4a88 100644
--- a/core/sql/comexe/ComTdbUdr.h
+++ b/core/sql/comexe/ComTdbUdr.h
@@ -235,7 +235,7 @@ public:
paramInfo_[i] = info;
}
- NA_EIDPROC inline const char *getSqlName() const { return sqlName_; }
+ inline const char *getSqlName() const { return sqlName_; }
inline const char *getRuntimeOptions() const { return runtimeOptions_; }
inline const char *getRuntimeOptionDelimiters() const
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/comexe/ComTdbUnPackRows.h
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComTdbUnPackRows.h b/core/sql/comexe/ComTdbUnPackRows.h
index 97d5cea..79d22dd 100644
--- a/core/sql/comexe/ComTdbUnPackRows.h
+++ b/core/sql/comexe/ComTdbUnPackRows.h
@@ -75,13 +75,11 @@ public:
// Used when unpacking the UnPackRows TDB. Used to get a pointer
// to the Virtual Method Table.
//
- NA_EIDPROC
ComTdbUnPackRows();
// Construct a copy of the given node.
// (This constructor does not seem to be used)
//
- NA_EIDPROC
ComTdbUnPackRows(const ComTdbUnPackRows *UnPackRowsTdb);
// Construct a new UnPackRows TDB.
@@ -137,7 +135,6 @@ public:
// IN: Used to set flags_ if nonfatal errors are tolerated.
//
- NA_EIDPROC
ComTdbUnPackRows(ComTdb *childTdb,
ex_expr *packingFactor,
ex_expr *unPackColsExpr,
@@ -171,18 +168,18 @@ public:
// ---------------------------------------------------------------------
// Redefine virtual functions required for Versioning.
//----------------------------------------------------------------------
- NA_EIDPROC virtual unsigned char getClassVersionID()
+ virtual unsigned char getClassVersionID()
{
return 1;
}
- NA_EIDPROC virtual void populateImageVersionIDArray()
+ virtual void populateImageVersionIDArray()
{
setImageVersionID(1,getClassVersionID());
ComTdb::populateImageVersionIDArray();
}
- NA_EIDPROC virtual short getClassSize()
+ virtual short getClassSize()
{ return (short)sizeof(ComTdbUnPackRows); }
// ComTdbUnPackRows::pack() ---------------------------------------------
@@ -200,7 +197,6 @@ public:
// that can be reached from this TDB points to memory outside
// this space object.
//
- NA_EIDPROC
Long pack(void *);
// ComTdbUnPackRows::unpack() ---------------------------------------------
@@ -215,7 +211,6 @@ public:
// IN - The base address of the TDB fragment. Pointers are calculated
// by adding the offset to the base address (more or less).
//
- NA_EIDPROC
Lng32 unpack(void *, void * reallocator);
// methods used for rowwise rowset processing
@@ -228,12 +223,10 @@ public:
// (Don't know why this is here. It does not seem to be virtual and
// on class seems to do anything for this method.)
//
- NA_EIDPROC
void display() const;
// Return a pointer to the child TBD of this UnPackRows TDB.
//
- NA_EIDPROC
inline ComTdb * getChildTdb() { return childTdb_; }
// We are observing order queue protocol. Results from
@@ -243,14 +236,12 @@ public:
// Exclude this code from coverage analysis.
// This code could be deleted since it is the same as the base implementation.
// LCOV_EXCL_START
- NA_EIDPROC
Int32 orderedQueueProtocol() const { return -1; }
// LCOV_EXCL_STOP
// return a pointer to the specifed (by position) child TDB.
// UnPackRows has only one child.
//
- NA_EIDPROC
virtual const ComTdb *getChild(Int32 pos) const
{
if(pos == 0)
@@ -261,12 +252,10 @@ public:
// Return the number of children for this node.
// UnPackRows has one child.
//
- NA_EIDPROC
virtual Int32 numChildren() const { return (childTdb_ ? 1 : 0); }
// Return the number of expression this node has.
//
- NA_EIDPROC
virtual Int32 numExpressions() const
{
if (rowwiseRowset())
@@ -279,7 +268,6 @@ public:
// The UnPackRows expressions come first, followed
// by the selection pred.
//
- NA_EIDPROC
virtual ex_expr * getExpressionNode(Int32 pos)
{
switch(pos) {
@@ -307,7 +295,6 @@ public:
// The UnPackRows expressions come first, followed
// by the selection pred.
//
- NA_EIDPROC
virtual const char * getExpressionName(Int32 pos) const
{
switch(pos) {
@@ -336,15 +323,12 @@ public:
return "EX_UNPACK_ROWS";
}
- NA_EIDPROC
short isRowsetIterator()
{ return short(flags_ & ROWSET_ITERATOR);}
- NA_EIDPROC
NABoolean rowwiseRowset()
{ return (flags_ & ROWWISE_ROWSET) != 0;}
- NA_EIDPROC
NABoolean rowwiseRowset() const
{ return (flags_ & ROWWISE_ROWSET) != 0;}
@@ -354,7 +338,7 @@ public:
// ---------------------------------------------------------------------
// Used by the internal SHOWPLAN command to get attributes of a TDB.
// ---------------------------------------------------------------------
- NA_EIDPROC void displayContents(Space *space, ULng32 flag);
+ void displayContents(Space *space, ULng32 flag);
protected:
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/comexe/ComTdbUnion.cpp
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComTdbUnion.cpp b/core/sql/comexe/ComTdbUnion.cpp
index 0cf1edf..8b123c8 100644
--- a/core/sql/comexe/ComTdbUnion.cpp
+++ b/core/sql/comexe/ComTdbUnion.cpp
@@ -225,7 +225,7 @@ const char * ComTdbUnion::getExpressionName(Int32 pos) const
return NULL;
}
-NA_EIDPROC void ComTdbUnion::displayContents(Space * space,ULng32 flag)
+void ComTdbUnion::displayContents(Space * space,ULng32 flag)
{
ComTdb::displayContents(space,flag & 0xFFFFFFFE);
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/comexe/ComTdbUnion.h
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComTdbUnion.h b/core/sql/comexe/ComTdbUnion.h
index 83026b7..9dcbda8 100644
--- a/core/sql/comexe/ComTdbUnion.h
+++ b/core/sql/comexe/ComTdbUnion.h
@@ -122,20 +122,16 @@ public:
// ---------------------------------------------------------------------
// Used by the internal SHOWPLAN command to get attributes of a TDB.
// ---------------------------------------------------------------------
- NA_EIDPROC virtual void displayContents(Space *space,ULng32 flag);
+ virtual void displayContents(Space *space,ULng32 flag);
- NA_EIDPROC
inline NABoolean expectingLeftRows() const
{ return (csErrFlags_ & ROWS_FROM_LEFT) != 0; }
- NA_EIDPROC
inline NABoolean expectingRightRows() const
{ return (csErrFlags_ & ROWS_FROM_RIGHT) != 0; }
- NA_EIDPROC
inline NABoolean afterUpdate() const
{ return (csErrFlags_ & AFTER_UPDATE) != 0; }
- NA_EIDPROC
inline NABoolean inNotAtomicStmt() const { return (flags_ & IN_NOT_ATOMIC_STMT) != 0; }
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/comexe/HashBufferHeader.h
----------------------------------------------------------------------
diff --git a/core/sql/comexe/HashBufferHeader.h b/core/sql/comexe/HashBufferHeader.h
index d241478..0d7a73e 100644
--- a/core/sql/comexe/HashBufferHeader.h
+++ b/core/sql/comexe/HashBufferHeader.h
@@ -49,15 +49,10 @@ class HashBufferHeader {
friend class HashBuffer;
friend class HashBufferSerial;
private:
-NA_EIDPROC
HashBufferHeader();
-NA_EIDPROC
~HashBufferHeader() {};
-NA_EIDPROC
inline ULng32 getRowCount() const;
-NA_EIDPROC
inline void setRowCount(ULng32 rowCount);
-NA_EIDPROC
inline void incRowCount();
ULng32 rowCount_; // # rows in buffer (pointer to next free row)
@@ -72,17 +67,14 @@ NA_EIDPROC
// inline functions of HashBufferHeader
/////////////////////////////////////////////////////////////////////////////
-NA_EIDPROC
inline ULng32 HashBufferHeader::getRowCount() const {
return rowCount_;
};
-NA_EIDPROC
inline void HashBufferHeader::setRowCount(ULng32 rowCount) {
rowCount_ = rowCount;
};
-NA_EIDPROC
inline void HashBufferHeader::incRowCount() {
rowCount_++;
};
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/comexe/HashRow.h
----------------------------------------------------------------------
diff --git a/core/sql/comexe/HashRow.h b/core/sql/comexe/HashRow.h
index c3afa36..be48431 100644
--- a/core/sql/comexe/HashRow.h
+++ b/core/sql/comexe/HashRow.h
@@ -54,48 +54,34 @@ class HashRow {
friend class HashTable;
friend class HashBufferSerial;
public:
-NA_EIDPROC
inline HashRow() {};
-NA_EIDPROC
inline ~HashRow() {};
-NA_EIDPROC
void print(ULng32 rowlength);
-NA_EIDPROC
inline SimpleHashValue hashValue() const { return hashValue_ & MASK31; }
// Return the raw hash value (no masking)
- NA_EIDPROC
inline SimpleHashValue hashValueRaw() const { return hashValue_; }
-NA_EIDPROC
inline void setHashValue(SimpleHashValue hv) { hashValue_ = hv & MASK31; }
// Set the hash value to the raw hash value (no masking)
- NA_EIDPROC
inline void setHashValueRaw(SimpleHashValue hv) { hashValue_ = hv; }
-NA_EIDPROC
inline NABoolean bitSet() const { return ((hashValue_ & ~MASK31) != 0L) ; }
-NA_EIDPROC
inline void setBit(NABoolean val)
{ if ( val ) hashValue_ |= ~MASK31 ; else hashValue_ &= MASK31 ;}
-NA_EIDPROC
inline void setNext (HashRow *next) {next_ = next;}
-NA_EIDPROC
inline HashRow *next() const {return next_;}
-NA_EIDPROC
inline char *getData() const {
return ((char *)this) + sizeof(HashRow);
}
-NA_EIDPROC
inline UInt32 getRowLength() const {
return *((UInt32 *)getData());
}
private:
-NA_EIDPROC
inline void setRowLength(UInt32 rowLen) {
*((UInt32 *)getData()) = rowLen;
}