trafodion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ansha...@apache.org
Subject [12/30] incubator-trafodion git commit: TRAFODION-2731 CodeCleanup: Remove obsolete, legacy and unused code
Date Thu, 07 Sep 2017 01:55:06 GMT
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/sql_buffer.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/sql_buffer.cpp b/core/sql/executor/sql_buffer.cpp
index 5d5ed0a..3a2509b 100644
--- a/core/sql/executor/sql_buffer.cpp
+++ b/core/sql/executor/sql_buffer.cpp
@@ -222,7 +222,7 @@ SqlBufferBase::moveStatus
 				       NABoolean useExternalDA,
 				       NABoolean callerHasExternalDA,
 				       tupp_descriptor * defragTd
-#if (defined (NA_LINUX) && defined(_DEBUG) && !defined(__EID))
+#if (defined(_DEBUG) )
 				       ,ex_tcb * tcb
 #endif
 				       ,NABoolean noMoveWarnings
@@ -411,7 +411,7 @@ SqlBuffer::moveStatus SqlBuffer::moveInSendOrReplyData(NABoolean isSend,
                                             NABoolean useExternalDA,
                                             NABoolean callerHasExternalDA,
                                             tupp_descriptor * defragTd
-#if (defined (NA_LINUX) && defined(_DEBUG) && !defined(__EID))
+#if (defined(_DEBUG) )
                                             ,ex_tcb * tcb
 #endif
 					    ,NABoolean noMoveWarnings
@@ -575,7 +575,7 @@ SqlBuffer::moveStatus SqlBuffer::moveInSendOrReplyData(NABoolean isSend,
       {
         defragLength = rowLen;
 
-#if (defined (NA_LINUX) && defined(_DEBUG) && !defined(__EID))
+#if (defined(_DEBUG) )
         char txt[] = "exchange";
         sql_buffer_pool::logDefragInfo(txt,
                         SqlBufferGetTuppSize(projRowLen, bufType()),
@@ -602,53 +602,7 @@ SqlBuffer::moveStatus SqlBuffer::moveInSendOrReplyData(NABoolean isSend,
 
 	  if (controlInfoMoved == TRUE)
 	    remove_tuple_desc();
-#if defined(__EID)          
-	  if (getTotalTuppDescs() == 0)
-          {
-            if (diagsArea == NULL)
-            {
-              // tbd - is expr ever null?  Is expr->getHeap() ?
-              diagsArea = ComDiagsArea::allocate(expr->getHeap());
-            }
-            *diagsArea  << DgSqlCode(-EXE_ROWLENGTH_EXCEEDS_BUFFER);
-
-            up_state errorUpState;
-            errorUpState.status = ex_queue::Q_SQLERROR;
-
-            tupp_descriptor * dDesc = NULL;
-            Int32 moveRetcode = 0;
-
-            moveRetcode = moveInSendOrReplyData(isSend,// false b/c this is EID
-						doMoveControl,
-						FALSE,   // <-------- doMoveData.
-						&errorUpState,
-						controlInfoLen,
-						controlInfo,
-						projRowLen,
-						outTdesc,
-						diagsArea ,
-						&dDesc,
-						expr, atp1, workAtp,
-						destAtp, 
-						tuppIndex, 
-						doMoveStats,
-						statsArea, 
-						statsDesc, 
-						useExternalDA, 
-						useExternalDA,
-						NULL,
-						noMoveWarnings
-                                 );
-            ex_assert((moveRetcode != SqlBuffer::BUFFER_FULL),
-                      "sending an empty buffer from EID");
-
-            if (dDesc)
-            {
-              diagsArea->packObjIntoMessage(dDesc->getTupleAddress());
-              diagsArea->decrRefCount();
-            }
-          }
-#endif
+
           return SqlBuffer::BUFFER_FULL;
 	}
       
@@ -793,7 +747,7 @@ SqlBuffer::moveStatus SqlBuffer::moveInSendOrReplyData(NABoolean isSend,
                                    useExternalDA, 
                                    useExternalDA, // always have ext. DA if used
                                    defragTd
-#if (defined (NA_LINUX) && defined(_DEBUG) && !defined(__EID))
+#if (defined(_DEBUG) )
                                    ,tcb
 #endif
 				   ,noMoveWarnings
@@ -855,53 +809,6 @@ SqlBuffer::moveStatus SqlBuffer::moveInSendOrReplyData(NABoolean isSend,
 
 	  if (daMark >= 0)
 	    diagsArea->rewind(daMark);
-#if defined(__EID)          
-	  if (getTotalTuppDescs() == 0)
-          {
-           //there is no room for DA even, clear DA and send one condition only
-            if(!space_available(diagsArea->packedLength()))
-              diagsArea->clear();
-
-            *diagsArea  << DgSqlCode(-EXE_ROWLENGTH_EXCEEDS_BUFFER);
-
-            up_state errorUpState;
-            errorUpState.status = ex_queue::Q_SQLERROR;
-
-            tupp_descriptor * dDesc = NULL;
-            Int32 moveRetcode ;
-
-            moveRetcode = moveInSendOrReplyData(isSend,// false b/c this is EID
-                                 doMoveControl,
-                                 FALSE,   // <-------- doMoveData.
-                                 &errorUpState,
-                                 controlInfoLen,
-                                 controlInfo,
-                                 projRowLen,
-                                 outTdesc,
-                                 diagsArea ,
-                                 &dDesc,
-                                 expr, atp1, workAtp,
-                                 destAtp, 
-                                 tuppIndex, 
-				 doMoveStats,
-                                 statsArea, 
-                                 statsDesc, 
-                                 useExternalDA, 
-                                 useExternalDA,
-				 NULL,
-				 noMoveWarnings
-                                 );
-            ex_assert((moveRetcode != SqlBuffer::BUFFER_FULL),
-                      "Sending an empty buffer from EID");
-
-            if (dDesc)
-            {
-              diagsArea->packObjIntoMessage(dDesc->getTupleAddress());
-              diagsArea->decrRefCount();
-            }
-          
-          }
-#endif
 
 	  return  SqlBuffer::BUFFER_FULL;  // not enough space.
 	}
@@ -2628,7 +2535,6 @@ void sql_buffer_pool::compact_buffers()
     }
 }
 
-#if (!defined(NA_NSK) && defined(_DEBUG))  ||  !defined(__EID)
 // for debugging purposes
 void sql_buffer_pool::printAllBufferInfo() {
   staticBufferList_->position();
@@ -2640,7 +2546,6 @@ void sql_buffer_pool::printAllBufferInfo() {
   while (buf = (SqlBuffer *)dynBufferList_->getNext())
     buf->printInfo();
 };
-#endif
 
 SqlBufferBase * sql_buffer_pool::findBuffer(Lng32 freeSpace,
 					    Int32 mustBeEmpty)
@@ -2696,11 +2601,6 @@ SqlBufferBase * sql_buffer_pool::getBuffer(Lng32 freeSpace,
 
   result = findBuffer(freeSpace,mustBeEmpty);
 
-// #if defined(NA_WINNT) && defined(_DEBUG)
-//   if (! result)
-//     printAllBufferInfo();
-// #endif
-
   if (! result)
     {
       if (staticMode())
@@ -2817,7 +2717,7 @@ sql_buffer_pool::moveIn(atp_struct *atp1,
     }
     if (!get_free_tuple(atp2->getTupp(tuppIndex), defRowLen))
     {
-#if (defined (NA_LINUX) && defined(_DEBUG) && !defined(__EID))
+#if (defined(_DEBUG) )
       char txt[] = "hashj";
       SqlBuffer *buf = getCurrentBuffer();
       sql_buffer_pool::logDefragInfo(txt,
@@ -3214,7 +3114,7 @@ SqlBufferBase::moveStatus
 				      NABoolean useExternalDA,
 				      NABoolean callerHasExternalDA,
 				      tupp_descriptor * defragTd
-#if (defined (NA_LINUX) && defined(_DEBUG) && !defined(__EID))
+#if (defined(_DEBUG) )
 				      ,ex_tcb * tcb
 #endif
 				       ,NABoolean noMoveWarnings
@@ -3621,7 +3521,7 @@ NABoolean SqlBufferOltSmall::moveOutReplyData(void * currQState,
   return FALSE;
 }
 
-#if (defined (NA_LINUX) && defined(_DEBUG) && !defined(__EID))
+#if (defined(_DEBUG) )
 void sql_buffer_pool::logDefragInfo(char * txt,
                                     Lng32 neededSpace,
                                     Lng32 actNeededSpace,

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/sql_buffer.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/sql_buffer.h b/core/sql/executor/sql_buffer.h
index 7bea9ad..09f59f5 100644
--- a/core/sql/executor/sql_buffer.h
+++ b/core/sql/executor/sql_buffer.h
@@ -363,7 +363,7 @@ public:
 			NABoolean useExternalDA = FALSE,
 			NABoolean callerHasExternalDA = FALSE,
 			tupp_descriptor * defragTd = NULL
-#if (defined (NA_LINUX) && defined(_DEBUG) && !defined(__EID))
+#if (defined(_DEBUG))
 			,ex_tcb * tcb = NULL
 #endif
 			,NABoolean noMoveWarnings = FALSE
@@ -466,7 +466,6 @@ protected:
 #pragma warn(1506)  // warning elimination 
 
 /*
-NA_EIDPROC
 unsigned long SqlBufferNeededSize(long numTuples = 0, 
 				  long recordLength = 0,
 				  SqlBufferHeader::BufferType bufType = SqlBufferHeader::NORMAL_);
@@ -599,7 +598,7 @@ public:
 			NABoolean useExternalDA = FALSE,
 			NABoolean callerHasExternalDA = FALSE,
 			tupp_descriptor * defragTd = NULL
-#if (defined (NA_LINUX) && defined(_DEBUG) && !defined(__EID))
+#if (defined(_DEBUG))
 			,ex_tcb * tcb = NULL  // for debuggin
 #endif
 			,NABoolean noMoveWarnings = FALSE
@@ -1351,7 +1350,7 @@ public:
 			NABoolean useExternalDA = FALSE,
 			NABoolean callerHasExternalDA = FALSE,
 			tupp_descriptor * defragTd = NULL
-#if (defined (NA_LINUX) && defined(_DEBUG) && !defined(__EID))
+#if (defined(_DEBUG))
                         ,ex_tcb * tcb = NULL  // for debuggin
 #endif
 			,NABoolean noMoveWarnings = FALSE
@@ -1525,7 +1524,6 @@ private:
 /*
 definitions moved to sql_buffer_size.h
 
-NA_EIDPROC
 static unsigned long SqlBufferGetTuppSize(
      long recordLength = 0,
      SqlBufferHeader::BufferType bufType = SqlBufferHeader::NORMAL_)
@@ -1542,7 +1540,6 @@ static unsigned long SqlBufferGetTuppSize(
 // given number of records with a given length are to be stored
 
 
-NA_EIDPROC
 static unsigned long SqlBufferNeededSize(long numTuples, 
 					 long recordLength,
 					 SqlBufferHeader::BufferType bufType)
@@ -1641,10 +1638,8 @@ public:
   inline void set_max_number_of_buffers(Lng32 maxnumbuf)
 			{maxNumberOfBuffers_ = maxnumbuf;}
 
-#if (!defined(NA_NSK) && defined(_DEBUG))  ||  !defined(__EID)
-// for debugging purposes
-void printAllBufferInfo();
-#endif
+  // for debugging purposes
+  void printAllBufferInfo();
 
 
   Lng32 getTotalMemorySize() { return memoryUsed_;}
@@ -1692,7 +1687,7 @@ void printAllBufferInfo();
     return defragTd_;
   }
 
-#if (defined (NA_LINUX) && defined(_DEBUG) && !defined(__EID))
+#if (defined(_DEBUG))
   static void logDefragInfo(char * txt,
                             Lng32 neededSpace,
                             Lng32 actNeededSpace,

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/sql_buffer_size.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/sql_buffer_size.h b/core/sql/executor/sql_buffer_size.h
index 03c4b67..1efd473 100644
--- a/core/sql/executor/sql_buffer_size.h
+++ b/core/sql/executor/sql_buffer_size.h
@@ -48,7 +48,6 @@
 // SqlBufferNeededSize or SqlBufferGetTuppSize to include this file (11/01/2003)
 //
 
-NA_EIDPROC
 static inline ULng32 SqlBufferHeaderSize(SqlBufferHeader::BufferType bufType)
 {
   // Return the buffer header size 
@@ -77,7 +76,6 @@ static inline ULng32 SqlBufferHeaderSize(SqlBufferHeader::BufferType bufType)
   return (headerSize);
 }
 
-NA_EIDPROC
 static inline ULng32 SqlBufferGetTuppSize(
      Lng32 recordLength = 0,
      SqlBufferHeader::BufferType bufType = SqlBufferHeader::NORMAL_)
@@ -90,7 +88,6 @@ static inline ULng32 SqlBufferGetTuppSize(
   
 }
 
-NA_EIDPROC
 static inline ULng32 SqlBufferNeededSize(Lng32 numTuples = 0, 
 				  Lng32 recordLength = 0,
 				  SqlBufferHeader::BufferType bufType = SqlBufferHeader::NORMAL_)

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/stubs.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/stubs.cpp b/core/sql/executor/stubs.cpp
index edce6bd..0d0386d 100644
--- a/core/sql/executor/stubs.cpp
+++ b/core/sql/executor/stubs.cpp
@@ -36,387 +36,3 @@
  *****************************************************************************
  */
 
-#include "Platform.h"
-
-class ex_expr;
-#include <sys/types.h>
-#include <sys/time.h>
-
-#include "ex_stdh.h"
-//#include "fs.h"
-#include "cli_stdh.h"
-#include "fs/feerrors.h"
-
-#include "Int64.h"
-
-#ifndef __EID
-//#include "arksort.h"
-#endif
-
-#ifdef __EID
-// -----------------------------------------------------------------------
-// Procedures that must not be called from DP2
-// -----------------------------------------------------------------------
-
-NA_EIDPROC void NAAbort(const char * filename, Int32 lineno, const char * msg)
-{
-}
-
-NA_EIDPROC void NAAssert(const char * condition, const char * file_, Int32 line_)
-{
-}
-
-
-NA_EIDPROC RETCODE Descriptor::alloc(Lng32 used_entries_)
-{
-  return ERROR;
-}
-
-NA_EIDPROCRETCODE Descriptor::dealloc()
-{
-  return ERROR;
-}
-
-NA_EIDPROC RETCODE Descriptor::getDescItem(Lng32 entry, Lng32 what_to_get, 
-				Lng32 * numeric_value, char * string_value,
-				Lng32 max_string_len, Lng32 * returned_len,
-				Lng32 /*start_from_offset*/)
-{
-  return ERROR;
-}
-
-NA_EIDPROC
-void Descriptor::setDescItem(Lng32 entry, Lng32 what_to_set, 
-			     Lng32 numeric_value, char * string_value)
-{
- 
-}
-
-NA_EIDPROC
-void Descriptor::setUsedEntryCount(Lng32 used_entries_)
-{
-  used_entries = used_entries_;
-
-}
-
-NA_EIDPROC
-void GeneratorAbort(char *f, Int32 l, char * m)
-{
-}
-
-NA_EIDPROC
-void filesystem::open(char *fname, Lng32 *fnum, File::fio_open_mode open_mode)
-{
-}
-
-NA_EIDPROC
-void filesystem::start_subset(short fnum, short keytag,
-			      char *begin_key, char *end_key,
-			      ex_expr *dp2_pred,
-			      char *input_values_data,
-			      unsigned short reverse_scan)
-{
-}
-
-
-NA_EIDPROC
-void filesystem::get_buffer(char *data_buffer, ULng32 data_buffer_len)
-{
-}
-
-NA_EIDPROC
-void filesystem::await_io()
-{
-}
-
-NA_EIDPROC
-void filesystem::stop_subset()
-{
-}
-
-NA_EIDPROC
-void filesystem::close()
-{
-}
-
-NA_EIDPROC
-Int32 filesystem::status()
-{
-}
-
-NA_EIDPROC
-void filesystem::delete_buffer(char * key_buffer)
-{
-}
-
-NA_EIDPROC
-void filesystem::update_buffer(char * key_buffer, char * data_buffer,
-			       rec_project_struct * datalist)
-{
-}
-
-NA_EIDPROC
-void filesystem::insert_buffer(char * data_buffer, ULng32 data_buffer_len)
-{
-}
-#endif
-
-
-#ifndef __EID
-// LCOV_EXCL_START
-// -----------------------------------------------------------------------
-// DP2 procedures (stub out if this is not a compile for EID)
-// -----------------------------------------------------------------------
-Int16 DP2_EXECUTOR_POSITION ( char  * Low_Key_Addr,
-		     	      Int16 * Low_Key_Excluded,
-			      char  * High_Key_Addr,
-			      Int16 * High_Key_Excluded,
-			      Int32   Key_Length,
-			      Int16   Operation,
-			      char  * Next_Low_Key_Addr,
-			      char  * Next_High_Key_Addr,
-			      Int16   Begin_Range_Flags,
-			      Int16   Reverse_Flag,
-			      Int16   numIoBlocks
-                            , Int16 * partOp
-			    ){return 0;}
-
-Int16 DP2_EXECUTOR_POSITION_UNIQUE (
-				    char * Key_Addr,
-				    Int32  Key_Length,
-				    Int16  Operation,
-				    char * Next_Low_Key_Addr,
-				    char * Next_High_Key_Addr,
-				    Int16  numIoBlocks
-			           ){return 0;}
-
-Int16 DP2_EXECUTOR_POSITION_SAMPLE (
-				    Int32  percentage,
-				    Int16  operation,
-				    Int16  Begin_Range_Flag
-				    ){return 0;}
-
-Int16 DP2_EXECUTOR_POSITION_CSAMPLE (
-				     Int32  percentage,
-				     Int32  cluster_size,
-				     Int16  operation,
-				     Int16  Begin_Range_Flag
-				    ){return 0;}
-
-Int16 DP2_EXECUTOR_FETCH (
-			  void  ** Row_Addr,
-			  Int32  * Row_Length,
-			  char   * syskey_addr,
-			  Int16    Operation,
-			  Int16  * Request_Status,
-			  void  ** LastRowAddr,           
-			  Int32  * LastRowLength 
-			  ){return 0;}
-
-Int16 DP2_EXECUTOR_FETCH_BLOCK (
-			  void  ** Block_Addr,
-			  Int32  * Block_Length,
-			  Int32  * Num_Recs_In_Block,
-			  Int32  * Start_Recnum,
-			  Int16    Operation,
-			  Int16  * Request_Status
-			  ){return 0;}
-
-Int16 DP2_EXECUTOR_FETCH_ROW (Int32    recnum,
-			      Int32    blocklen,
-			      void   * buffer,
-			      void  ** record,
-			      Int32  * reclen,
-			      Int16  * request_status){return 0;};
-
-Int16 DP2_EXECUTOR_LOCK_FILE (
-                              void   * /*Lock_Flags_Struct*/ Lock_Flags,
-			      Int16    Operation,
-			      char   * Consumed_Key_Pointer_Addr,
-			      Int32    Consumed_Key_Length,
-			      Int16  * Request_Status
-			      ){return 0;}
-
-Int16 DP2_EXECUTOR_ROW_SELECTED (
-				 char  * Key_Addr,
-				 Int32   Key_Length,
-				 Int16   Operation,
-				 Int16   End_Of_Range,
-				 void  * /*Lock_Flags_Struct*/ Lock_Flags,
-				 Int16 * Request_Status,
-				 void  * Before_Image_Addr,
-				 Int32   Before_Image_Length,
-				 void  * After_Image_Addr,
-				 Int32   After_Image_Length,
-				 void  * /*MFMap_STRUCT*/ mfMap,
-                                 Int16   Op_Type   // BertBert
-				 ){return 0;}
-
-Int16 DP2_EXECUTOR_ROW_NOT_SELECTED (
-				     char   * Key_Addr,
-				     Int32    Key_Length,
-				     Int16    Operation,
-				     Int16    End_Of_Range,
-				     void   * /*Lock_Flags_Struct*/ Lock_Flags,
-				     Int16  * Request_Status
-				     ){return 0;}
-
-// Memory Allocation/Deallocation
-Int16 DP2_EXECUTOR_ADD_MEMORY (
-			       Int32    Memory_Size,
-			       void  ** Returned_Memory_Addr
-			       ){return 0;}
-
-Int16 DP2_EXECUTOR_DROP_MEMORY (
-				void  * Drop_Memory_Addr
-			       ){return 0;}
-
-// reply to filesystem with reply buffer
-Int16 DP2_EXECUTOR_REPLY (
-			  Int16   Reply_Error,
-			  void  * Reply_Buffer_Addr,
-			  Int32   Reply_Buffer_Length
-			  ){return 0;}
-
-Int16 DP2_EXECUTOR_INSERT (
-			   char   * Key_Addr,
-			   Int32    Key_Length,
-			   void   * Row_Addr,
-			   Int32    Row_Length,
-			   void   * /*Lock_Flags_Struct*/ Lock_Flags,
-			   void   * /*Insert_Control_Flags_Struct*/ Insert_Control_Flags,
-			   Int16  * Request_Status,
-			   char   * Range_Protector_Key_Addr,
-			   Int32  * Range_Protector_Key_Length
-			   ){return 0;}
-
-Int16 DP2_EXECUTOR_INSERT_VSBB (
-				void   * /*Lock_Flags_Struct*/ Lock_Flags,
-				void   * VSBB_Insert_Buffer,
-				Int32    VSBB_Buffer_Length,
-				char   * Range_Protector_Key_Addr,
-				Int16    Insert_Anywhere,
-				Int16    Insert_At_End,
-				Int16  * Request_Status
-				){return 0;}
-
-Int16 DP2_EXECUTOR_SIDETREE_INSERT (
-                                   void   * VSBB_Insert_Buffer,
-				   Int32    VSBB_Buffer_Length,
-				   Int16  * Request_Status
-				   ){return 0;}
-				   
-Int16 DP2_EXECUTOR_SIDETREE_SETUP (
-				  Int16  * Request_Status
-				  ){return 0;}
-
-Int16 DP2_EXECUTOR_SIDETREE_COMMIT (
-				   Int16  * Request_Status
-				   ){return 0;}
-
-Int16 DP2_EXECUTOR_VSBB_NAK (
-			    char * Range_Protector_Key_Addr,
-			    Int32  Range_Protector_Key_Length
-			    ){return 0;}
-
-Int16 DP2_EXECUTOR_DELETE_RANGE(
-				void   * Scan_Expr_Pointer,
-				void   * /*Lock_Flags_Struct*/ Lock_Flags,
-				char   * Last_Begin_Key_Addr,
-				Int32  * Last_Begin_Key_Length,
-				Int16  * Request_Status
-				){return 0;}
-
-Int16 DP2_EXECUTOR_GET_OVERFLOW_DATA(
-				     void * Buffer_Addr, 
-				     Int32  Buffer_Length
-				     ){return 0;}
-
-Int32 DP2_EXECUTOR_SESSION_NID() {return 0;}
-Int32 DP2_EXECUTOR_SESSION_PID() {return 0;}
-
-Int16 DP2_EXECUTOR_SWITCH_CONTEXT(Int16   switchSessionFlag,
-				  Int64   OCBID,
-				  Int16  ocbindex,
-				  void ** RCB
-                                , void ** Row_Hiding_Predicate
-				  ){return 0;}
-
-
-Int16 DP2_EXECUTOR_SET_WAITFORROWS(void){return 1;}
-void DP2_EXECUTOR_DISCARD_DELTA_KEY(Int32 DP2_key_index){return;}
-void DP2_EXECUTOR_DISC_DK_ATCOMMIT(Int32 DP2_key_index){return;}
-Int16 DP2_EXECUTOR_GET_DELTA_KEY(char  ** key_addr,
-                                 Int32  * key_len,
-                                 Int32  * DP2_key_index){return 0;}
-Int16 DP2_EXECUTOR_DELTA_SCAN_STATUS(Int16 delta_scan_active,
-                                     Int16 regular_scan_is_finished){return 0;}
-void DP2_EXECUTOR_DELTA_SCAN_INIT(Int16  streaming,
-                                  Int16  destructive,
-                                  Int16  ordered, 
-                                  Int32  stream_timeout,
-                                  Int32  rowset_size){return;}
-void DP2_EXECUTOR_INSERT_DK_IN_SSCB(char * in_key, Int32 in_key_len){return;}
-void DP2_EXECUTOR_UPDATE_OP_IN_SSCB(Int16  operation){return;}
-Int16 DP2_EXECUTOR_CHECK_DK_X_LOCKED(Int32 dp2_key_index){return TRUE;}
-void DP2_EXECUTOR_INSERT_DK_UNCOMMIT(char  * low_key,
-                                     Int32   low_key_excluded,
-		                     char  * high_key,
-                                     Int32   high_key_excluded,
-	                             Int32   key_len,
-                                     char  * anchor_key){};
-Int16 DP2_EXECUTOR_REPOSITION_NEEDED(void){return TRUE;}
-Int64 DP2_EXECUTOR_GET_SYSKEY(Int64  prev_syskey){return 0;}
-void DP2_EXECUTOR_GET_STATS(Int32 * stats,
-                            Int32   values_requested, 
-                            Int32 * values_returned){return;}
-
-void DP2_EXECUTOR_SESSION_STATS(void * stats) {return;}
-
-Int16 DP2_EXECUTOR_QUERYID_STATS(void * stats) {return 0;}
-
-Int16 DP2_EXECUTOR_MXBUFFER_STATS(void * stats) {return -1;}
-
-Int16 DP2_EXECUTOR_FETCH_UNIQUE (
-                                 void   * /*Lock_Flags_Struct*/ Lock_Flags,
-                                 char   * Key_Addr,
-				 Int32    Key_Length,
-				 void  ** Row_Addr,
-				 Int32  * Row_Length,
-				 void   * Unique_Expr_Addr,
-				 Int16  * Request_Status
-				 ){return 0;}
-
-Int16 DP2_EXECUTOR_DELETE_UNIQUE (
-                                 void   * /*Lock_Flags_Struct*/ Lock_Flags,
-                                 char   * Key_Addr,
-				 Int32    Key_Length,
-				 void   * Unique_Expr_Addr,
-				 Int16  * Request_Status
-				 ){return 0;}
-
-Int16 DP2_EXECUTOR_UPDATE_UNIQUE (
-                                 void   * /*Lock_Flags_Struct*/ Lock_Flags,
-                                 char   * Key_Addr,
-				 Int32    Key_Length,
-				 void   * Unique_Expr_Addr,
-                                 void   * Updated_Row_Buffer,
-				 void   * /*MFMap_STRUCT*/ mfMap,
-				 Int16  * Request_Status
-				 ){return 0;}
-
-Int16 DP2_EXECUTOR_INSERT_UNIQUE (
-                                 void   * /*Lock_Flags_Struct*/ Lock_Flags,
-                                 char   * Key_Addr,
-				 Int32    Key_Length,
-				 void   * Row_Addr,
-				 Int32    Row_Length,
-				 void   * /*Insert_Control_Flags_Struct*/ Insert_Control_Flags,
-				 void   * Unique_Expr_Addr,
-				 Int16  * Request_Status
-				 ){return 0;}
-
-void DP2_EXECUTOR_COUNT_ROWS(Int64 rows_accessed, Int64 rows_selected) {}
-
-// LCOV_EXCL_STOP
-#endif /* __EID */

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/stubs2.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/stubs2.cpp b/core/sql/executor/stubs2.cpp
index bf213b2..127422a 100644
--- a/core/sql/executor/stubs2.cpp
+++ b/core/sql/executor/stubs2.cpp
@@ -20,88 +20,7 @@
 //
 // @@@ END COPYRIGHT @@@
 **********************************************************************/
-#include "Platform.h"
 
 
 
-#if (defined (NA_LINUX) && defined(__EID))
-#include "ex_ex.h"
-#endif // NA_LINUX
-
-// stubbed procedures for executor in dp2 object.
-#ifdef __EID 
-// NT Port - vs 01/17/97
-
-// NT Port - vs 01/17/97
-#define _resident
-
-extern "C"
-{
-  
-#include <setjmp.h>
-  void __pure_virtual_called();
-  void __vec_delete();
-  char    *__vec_new();
-}
-
-
-// #if defined __EID && defined (NA_NSK)
-// extern "C" _resident void bytesPerChar__8CharInfoSFQ2_8CharInfo7CharSet()
-// {
-// }
-// #endif
-
-
-
-
-// NT Port - vs 01/17/97 
-
-
-
-// LCOV_EXCL_START
-_resident void __pure_virtual_called()
-{
-}
-
-NA_EIDPROC
-void NAAssert(const char * condition, const char * file_, Int32 line_)
-{
-#if (defined (NA_LINUX) && defined (__EID))
-assert_botch_in_eid(file_, line_, condition);
-#endif // NA_LINUX & __EID
-}
-NA_EIDPROC
-void NAAssert(char * condition, char * file_, Int32 line_)
-{
-#if (defined (NA_LINUX) && defined (__EID))
-assert_botch_in_eid(file_, line_, condition);
-#endif // NA_LINUX & __EID
-}
-
-NA_EIDPROC
-void GeneratorAbort(char *f, Int32 l, char * m)
-{
-}
-
-NA_EIDPROC
-void NAError_stub_for_breakpoints() {}
-NA_EIDPROC
-void NAArkcmpExceptionEpilogue() {}
-
-// LCOV_EXCL_STOP
-
-
-
-// LCOV_EXCL_START
-
-#if (defined (NA_LINUX) && defined (__EID))
-#endif // NA_LINUX
-#endif // __EID
-
-// LCOV_EXCL_STOP
-
-#pragma nowarn(1103)   //warning elimination 
-// This pragma hides 1103 warnings for constructor and destructor of class VerticalPartInfo; 
-
-
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/tempfile.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/tempfile.cpp b/core/sql/executor/tempfile.cpp
index 5d23077..d868dd3 100644
--- a/core/sql/executor/tempfile.cpp
+++ b/core/sql/executor/tempfile.cpp
@@ -1,7 +1,7 @@
 /* -*-C++-*-
 ******************************************************************************
 *
-* File:         termpfile.C
+* File:         tempfile.C
 * Description:  Methods temporary overflow files
 *
 *               
@@ -35,72 +35,3 @@
 ******************************************************************************
 */
 
-// begining of regular compilation
-#include "Platform.h"
-#include "tempfile.h"
-#include <fcntl.h>
-
-#include <stdio.h>
-
-
-TempFile::TempFile()
-  : fd_(-1),
-    offset_(-1) {
-};
-
-TempFile::~TempFile() {
-  TFclose();
-};
-
-void TempFile::TFread(FilePos * position,
-			 char * buffer,
-			 Int32 size) {
-  if ((position->fileId_ != fd_) ||
-      (!position->valid() ||
-      ((position->offset_ + size) > offset_)))
-    ex_assert(0, "tried to read from non existing temporary file");
-  lseek(fd_, offset_, SEEK_SET);
-  read(fd_, buffer, size);
-};
-
-void TempFile::TFwrite(FilePos * position,
-		       char * buffer,
-		       Int32 size) {
-  if (fd_ == -1) {
-    fd_ = open(name_, O_RDWR | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR);
-
-    if (fd_ == -1)
-    {
-      // we couldn't create the tmpfile. Too bad!!
-      printf ("temporary file name: %s\n", name_);
-      ex_assert(0, "unable to open temporary file");
-    };
-    offset_ = 0;
-  };
-
-  lseek(fd_, offset_, SEEK_SET);
-  write(fd_, buffer, size);
-  // return the file position of the written buffer
-  position->fileId_ = fd_;
-  position->offset_ = offset_;
-
-  // the offset has changed
-  offset_ += size;
-};
-
-void TempFile::TFclose() {
-  if (fd_ > -1) {
-    ex_assert((close(fd_) == 0), "unable to close temporary file");
-    ex_assert((unlink(name_) == 0), "unable to purge temporary file");
-    fd_ = -1;
-  };
-  offset_ = -1;
-};
-
-NABoolean TempFile::ioComplete() {
-  return FALSE; // for NSK, no overlapped io
-};
-
-NABoolean TempFile::ioSucessfull() {
-  return TRUE;
-};

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/tempfile.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/tempfile.h b/core/sql/executor/tempfile.h
index d3b56a4..72fdfae 100644
--- a/core/sql/executor/tempfile.h
+++ b/core/sql/executor/tempfile.h
@@ -35,70 +35,3 @@
  *
  *****************************************************************************
  */
-
-#include "BaseTypes.h"
-#include "NABasicObject.h"
-#include "ex_stdh.h"
-
-// for now we support only UNIX and OSS
-
-// The class FilePos is NOT derived from ExGod! It is never allocated
-// with new. Instead, it is just an "overlay" on an allocated buffer.
-class FilePos {
-  friend class TempFile;
-public:
-  inline FilePos();
-  inline ~FilePos() {};
-  inline NABoolean valid();
-private:
-  unsigned short fileId_;
-  Int32 offset_;
-};
-
-inline FilePos::FilePos() {
-  fileId_ = 0;
-  offset_ = -1;
-};
-
-inline NABoolean FilePos::valid() {
-  return (offset_ != -1);
-};
-
-class TempFile : public NABasicObject {
-public:
-  TempFile();
-  ~TempFile();
-  void TFread(FilePos * position,
-	      char * buffer,
-	      Int32 size);
-  void TFwrite(FilePos * position,
-	       char * buffer,
-	       Int32 size);
-  void TFclose();
-
-  NABoolean ioComplete();
-
-  NABoolean ioSucessfull();
-
-inline char * getName() {
-  return (name_);
-};
-private:
-  Int32 fd_;
-  char  name_[L_tmpnam];
-  Int32 offset_;
-};
-
-#endif
-
-
-
-
-
-
-
-
-
-
-
-

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/exp/ExpAtp.cpp
----------------------------------------------------------------------
diff --git a/core/sql/exp/ExpAtp.cpp b/core/sql/exp/ExpAtp.cpp
index 74ff5b7..d183232 100644
--- a/core/sql/exp/ExpAtp.cpp
+++ b/core/sql/exp/ExpAtp.cpp
@@ -43,7 +43,6 @@
 #include "str.h"
 
 // constructor (Allocate and initialize) for an Atp
-NA_EIDPROC SQLEXP_LIB_FUNC
 atp_struct * allocateAtp(ex_cri_desc * criDesc, CollHeap * space)
 {
   // Allocate space for the atp_struct (which has room for one tupp in
@@ -78,7 +77,6 @@ atp_struct * allocateAtp(ex_cri_desc * criDesc, CollHeap * space)
 
 // Create an atp inside a pre-allocated buffer instead of allocating it from
 // a space object. Used by ExpDP2Expr.
-NA_EIDPROC SQLEXP_LIB_FUNC
 atp_struct * createAtpInBuffer(ex_cri_desc * criDesc, char * & buf)
 {
   atp_struct * atp = (atp_struct *)buf;
@@ -103,7 +101,6 @@ atp_struct * createAtpInBuffer(ex_cri_desc * criDesc, char * & buf)
   return atp;
 }
 
-NA_EIDPROC SQLEXP_LIB_FUNC
 atp_struct * allocateAtp(Lng32 numTuples, CollHeap * space)
 {
   // Allocate space for the atp_struct (which has room for one tupp in
@@ -136,14 +133,12 @@ atp_struct * allocateAtp(Lng32 numTuples, CollHeap * space)
   return atp;
 }
 
-NA_EIDPROC SQLEXP_LIB_FUNC
 void deallocateAtp(atp_struct * atp, CollHeap * space)
 {
   if (space)
     space->deallocateMemory((char *)atp);
 }
 
-NA_EIDPROC SQLEXP_LIB_FUNC
 atp_struct * allocateAtpArray(
      ex_cri_desc * criDesc, Lng32 cnt, Int32 *atpSize, CollHeap * space, NABoolean failureIsFatal)
 {
@@ -189,7 +184,6 @@ atp_struct * allocateAtpArray(
   return atpStart;
 }
 
-NA_EIDPROC SQLEXP_LIB_FUNC
 void deallocateAtpArray(atp_struct ** atp, CollHeap * space)
 {
   if (space)

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/exp/ExpAtp.h
----------------------------------------------------------------------
diff --git a/core/sql/exp/ExpAtp.h b/core/sql/exp/ExpAtp.h
index 5693402..24ac649 100644
--- a/core/sql/exp/ExpAtp.h
+++ b/core/sql/exp/ExpAtp.h
@@ -70,68 +70,47 @@ class ExStatisticsArea;
 
 #pragma warning ( disable : 4251 )
 
-class SQLEXP_LIB_FUNC  atp_struct
+class atp_struct
 {
  public:
 
-  NA_EIDPROC
     inline ex_cri_desc* getCriDesc() const;
-  NA_EIDPROC
     inline tupp &       getTupp(Lng32 i);
-  NA_EIDPROC
     inline tupp &       getTuppForNativeExpr(long i);
-  NA_EIDPROC
     inline void         setCriDesc(ex_cri_desc *p);
   // defined in ex_queue.h
-  NA_EIDPROC
     inline void         copyAtp(const ex_queue_entry *from);
-  NA_EIDPROC
     inline void         copyAtp(atp_struct *from);
-  NA_EIDPROC
     inline void         copyPartialAtp(atp_struct * from);
-  NA_EIDPROC
     inline void         copyPartialAtp(atp_struct * from, 
 				       short first_tupp,
 				       short last_tupp);
-  NA_EIDPROC
     inline void         copyPartialAtp(atp_struct * from, 
 				       short my_first_tupp,
 				       short from_first_tupp,
 				       short last_tupp);
-  NA_EIDPROC
     inline unsigned short  numTuples() const;
-  NA_EIDPROC
     inline void         release();   // de-initialize
 
   // 
   // Methods for manipulating diagnostics area.
   //
-  NA_EIDPROC
     inline ComDiagsArea *getDiagsArea() const;
-  NA_EIDPROC
     inline void setDiagsArea(ComDiagsArea* diagsArea);
-  NA_EIDPROC
     inline void initDiagsArea(ComDiagsArea* diagsArea);
-  NA_EIDPROC
     Long pack(void * space);
-  NA_EIDPROC
     Lng32 unpack(Lng32 base);
   
   // ****  information for GUI  *** -------------
-  NA_EIDPROC
     inline void set_tag(Int32 tag);
-  NA_EIDPROC
     inline Int32 get_tag() const;
-  NA_EIDPROC
     inline void unset_tag();
 
   // The passed-in cri will be used if it is not NULL. Otherwise
   // the cri associated with the atp is used.
-  NA_EIDPROC
   void display(const char* title = "", ex_cri_desc* cri = NULL);
   //
   // print the content of a data field, based on the data type dt
-  NA_EIDPROC
   void print(char* title, Int16 dt, char* ptr, UInt32 len);
   //---------------------------------------------
    
@@ -162,29 +141,23 @@ class SQLEXP_LIB_FUNC  atp_struct
 // the ATP.
 // TBD: move to exp/ExpAtp.h
 
-extern SQLEXP_LIB_FUNC
 atp_struct * allocateAtp (Lng32 numTuples, CollHeap * space);
 
-extern SQLEXP_LIB_FUNC
 atp_struct * allocateAtp (ex_cri_desc * criDesc, CollHeap * space);
 
 // Create an atp inside a pre-allocated buffer instead of allocating it from
 // a space object. Used by ExpDP2Expr.
-extern SQLEXP_LIB_FUNC
 atp_struct * createAtpInBuffer (ex_cri_desc * criDesc, char * & buf);
 
 
-extern SQLEXP_LIB_FUNC
 void deallocateAtp (atp_struct * atp, CollHeap * space);
 
-extern SQLEXP_LIB_FUNC
 atp_struct * allocateAtpArray (ex_cri_desc * criDesc,
 			       Lng32 cnt,
 			       Int32 *atpSize,
 			       CollHeap * space,
                                NABoolean failureIsFatal=FALSE);
 
-extern SQLEXP_LIB_FUNC
 void deallocateAtpArray(atp_struct **atp, CollHeap * space);
 
 //

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/exp/ExpBitMuxFunction.h
----------------------------------------------------------------------
diff --git a/core/sql/exp/ExpBitMuxFunction.h b/core/sql/exp/ExpBitMuxFunction.h
index a671d44..71a415b 100644
--- a/core/sql/exp/ExpBitMuxFunction.h
+++ b/core/sql/exp/ExpBitMuxFunction.h
@@ -83,58 +83,58 @@ class ExpBitMuxFunction;
 
 // ExpBitMuxFunction declaration
 //
-class SQLEXP_LIB_FUNC  ExpBitMuxFunction : public ex_function_clause {
+class ExpBitMuxFunction : public ex_function_clause {
 public:
   // Construction - this is the "real" constructor
   //
-  NA_EIDPROC ExpBitMuxFunction(OperatorTypeEnum oper_type,
+  ExpBitMuxFunction(OperatorTypeEnum oper_type,
 			       Int32 arity,
 			       Attributes ** attr,
 			       Space * space);
   // This constructor is used only to get at the virtual function table.
   //
-  NA_EIDPROC ExpBitMuxFunction();
+  ExpBitMuxFunction();
 
 
   // isNullInNullOut - Must redefine this virtual function to return 0
   // since a NULL input does not simply produce a NULL output.
   //
-  NA_EIDPROC Int32 isNullInNullOut() const { return 0; };
+  Int32 isNullInNullOut() const { return 0; };
 
   // isNullRelevant - Must redefine this virtual function to return 0
   // since all the work is done in eval and none in processNulls.
   //
-  NA_EIDPROC Int32 isNullRelevant() const { return 0; };
+  Int32 isNullRelevant() const { return 0; };
 
   // eval - Must redefine eval to compute the BitMuxing function.
   //
-  NA_EIDPROC ex_expr::exp_return_type eval(char *op_data[], CollHeap*, 
+  ex_expr::exp_return_type eval(char *op_data[], CollHeap*, 
 					   ComDiagsArea** =0);
 
   // pack - Must redefine pack.
-  NA_EIDPROC Long pack(void *);
+  Long pack(void *);
 
   // pCodeGenerate - Must redefine pCodeGenerate the produce specific
   // PCODE instructions for BitMuxing.
   //
-  NA_EIDPROC ex_expr::exp_return_type pCodeGenerate(Space *space,
+  ex_expr::exp_return_type pCodeGenerate(Space *space,
 						    UInt32 f);
 
   // ---------------------------------------------------------------------
   // Redefinition of methods inherited from NAVersionedObject.
   // ---------------------------------------------------------------------
-  NA_EIDPROC virtual unsigned char getClassVersionID()
+  virtual unsigned char getClassVersionID()
   {
     return 1;
   }
 
-  NA_EIDPROC virtual void populateImageVersionIDArray()
+  virtual void populateImageVersionIDArray()
   {
     setImageVersionID(2,getClassVersionID());
     ex_function_clause::populateImageVersionIDArray();
   }
 
-  NA_EIDPROC virtual short getClassSize() { return (short)sizeof(*this); }
+  virtual short getClassSize() { return (short)sizeof(*this); }
   // ---------------------------------------------------------------------
 
   // There are no private members.

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/exp/ExpCriDesc.cpp
----------------------------------------------------------------------
diff --git a/core/sql/exp/ExpCriDesc.cpp b/core/sql/exp/ExpCriDesc.cpp
index 92d2f21..795263b 100644
--- a/core/sql/exp/ExpCriDesc.cpp
+++ b/core/sql/exp/ExpCriDesc.cpp
@@ -60,7 +60,7 @@ ex_cri_desc::ex_cri_desc(const unsigned short numTuples, void * space_) :
   flags_ = 0;
 };
 
-NA_EIDPROC Long ex_cri_desc::pack(void * space)
+Long ex_cri_desc::pack(void * space)
 {
   if ( ! (flags_ & PACKED)) // REVISIT
     {
@@ -70,7 +70,7 @@ NA_EIDPROC Long ex_cri_desc::pack(void * space)
   return NAVersionedObject::pack(space);
 }
 
-NA_EIDPROC Lng32 ex_cri_desc::unpack(void * base, void * reallocator)
+Lng32 ex_cri_desc::unpack(void * base, void * reallocator)
 {
   if (flags_ & PACKED) // REVISIT
     {
@@ -80,7 +80,7 @@ NA_EIDPROC Lng32 ex_cri_desc::unpack(void * base, void * reallocator)
   return NAVersionedObject::unpack(base, reallocator);
 }
 
-NA_EIDPROC void ex_cri_desc::display(const char* title)
+void ex_cri_desc::display(const char* title)
 {
    cout << title << endl;
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/exp/ExpCriDesc.h
----------------------------------------------------------------------
diff --git a/core/sql/exp/ExpCriDesc.h b/core/sql/exp/ExpCriDesc.h
index d5d863d..951e9d7 100644
--- a/core/sql/exp/ExpCriDesc.h
+++ b/core/sql/exp/ExpCriDesc.h
@@ -65,7 +65,7 @@ typedef NAVersionedObjectPtrTempl<ex_cri_desc> ExCriDescPtr;
 
 #pragma warning( disable : 4251 )
 
-class SQLEXP_LIB_FUNC   ex_cri_desc : public NAVersionedObject
+class ex_cri_desc : public NAVersionedObject
 {
   enum {PACKED = 0x0001};
 
@@ -81,41 +81,38 @@ class SQLEXP_LIB_FUNC   ex_cri_desc : public NAVersionedObject
   char               fillers_[10];      // 14-23
 
 public:
-NA_EIDPROC 
+
   ex_cri_desc(const unsigned short numTuples, void * space_); //constructor
 
-NA_EIDPROC
   ex_cri_desc() : NAVersionedObject(-1), numTuples_(0) {}
 
-NA_EIDPROC 
+
   inline unsigned short noTuples() const;
-NA_EIDPROC 
+
   inline ExpTupleDesc * getTupleDescriptor(const unsigned short tupleNo) const;
-NA_EIDPROC 
+
   inline void setTupleDescriptor(const unsigned short tupleNo, ExpTupleDesc * tupleDesc);
   
-NA_EIDPROC 
+
   Long pack(void *);
-NA_EIDPROC
   Lng32 unpack(void *, void * reallocator);
 
-NA_EIDPROC
   void display(const char* title = "");
   
   // ---------------------------------------------------------------------
   // Redefinition of methods inherited from NAVersionedObject.
   // ---------------------------------------------------------------------
-  NA_EIDPROC virtual unsigned char getClassVersionID()
+  virtual unsigned char getClassVersionID()
   {
     return 1;
   }
 
-  NA_EIDPROC virtual void populateImageVersionIDArray()
+  virtual void populateImageVersionIDArray()
   {
     setImageVersionID(0,getClassVersionID());
   }
 
-  NA_EIDPROC virtual short getClassSize() { return (short)sizeof(*this); }
+  virtual short getClassSize() { return (short)sizeof(*this); }
   // ---------------------------------------------------------------------
 };  // descriptor for cri
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/exp/ExpDll.cpp
----------------------------------------------------------------------
diff --git a/core/sql/exp/ExpDll.cpp b/core/sql/exp/ExpDll.cpp
index 74014f1..9e13620 100644
--- a/core/sql/exp/ExpDll.cpp
+++ b/core/sql/exp/ExpDll.cpp
@@ -38,8 +38,7 @@
 
 
 #include "SqlExpDllDefines.h"
-#include "SqlExportDllDefines.h"
 
 #include <setjmp.h>
 
-THREAD_P SQLEXPORT_LIB_FUNC jmp_buf ExportJmpBuf;
+THREAD_P jmp_buf ExportJmpBuf;

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/exp/ExpError.cpp
----------------------------------------------------------------------
diff --git a/core/sql/exp/ExpError.cpp b/core/sql/exp/ExpError.cpp
index 652b8cf..2105f2f 100644
--- a/core/sql/exp/ExpError.cpp
+++ b/core/sql/exp/ExpError.cpp
@@ -59,7 +59,6 @@ class PCIType;
 extern char * exClauseGetText(OperatorTypeEnum ote);
 extern char * getDatatypeAsString( Int32 Datatype, NABoolean extFormat );
 
-SQLEXP_LIB_FUNC
 ComDiagsArea *ExAddCondition(CollHeap* heap, ComDiagsArea** diagsArea,
 			     Lng32 err, ComCondition** newCond,
 			     Lng32 * intParam1,
@@ -123,8 +122,6 @@ ComDiagsArea *ExAddCondition(CollHeap* heap, ComDiagsArea** diagsArea,
   return *diagsArea;
 }
 
-NA_EIDPROC
-SQLEXP_LIB_FUNC
 ComDiagsArea *ExRaiseSqlError(CollHeap* heap, ComDiagsArea** diagsArea,
                               ExeErrorCode err, ComCondition** cond,
 			      Lng32 * intParam1,
@@ -139,8 +136,6 @@ ComDiagsArea *ExRaiseSqlError(CollHeap* heap, ComDiagsArea** diagsArea,
 			stringParam1, stringParam2, stringParam3);
 }
 
-NA_EIDPROC
-SQLEXP_LIB_FUNC
 ComDiagsArea *ExRaiseSqlWarning(CollHeap* heap, ComDiagsArea** diagsArea,
                               ExeErrorCode err, ComCondition** cond,
                               Lng32 * intParam1,
@@ -154,16 +149,12 @@ ComDiagsArea *ExRaiseSqlWarning(CollHeap* heap, ComDiagsArea** diagsArea,
                         intParam1, intParam2, intParam3,
                         stringParam1, stringParam2, stringParam3);
 }
-NA_EIDPROC
-SQLEXP_LIB_FUNC
 ComDiagsArea *ExRaiseSqlWarning(CollHeap* heap, ComDiagsArea** diagsArea,
                                 ExeErrorCode err, ComCondition** cond)
 {
   return ExAddCondition(heap, diagsArea, (Lng32) err, cond, NULL, NULL, NULL);
 }
 
-NA_EIDPROC
-SQLEXP_LIB_FUNC
 ComDiagsArea *ExRaiseFunctionSqlError(CollHeap* heap, 
 				      ComDiagsArea** diagsArea,
 				      ExeErrorCode err, 
@@ -181,8 +172,6 @@ ComDiagsArea *ExRaiseFunctionSqlError(CollHeap* heap,
   return *diagsArea;
 }
 
-NA_EIDPROC
-SQLEXP_LIB_FUNC
 Int32 convertToHexAscii(char *src, Int32 srcLength, char *result,
                       Int32 maxResultSize)
 {
@@ -218,8 +207,6 @@ Int32 convertToHexAscii(char *src, Int32 srcLength, char *result,
 }
 
 
-NA_EIDPROC
-SQLEXP_LIB_FUNC
 void ExConvertErrorToString(CollHeap* heap, 
 		            ComDiagsArea** diagsArea,
                             char *src,
@@ -307,8 +294,6 @@ void ExConvertErrorToString(CollHeap* heap,
 }
 
 //Detailed error support for pcode expression evaluation.
-NA_EIDPROC
-SQLEXP_LIB_FUNC
 ComDiagsArea *ExRaiseDetailSqlError(CollHeap* heap, 
 				    ComDiagsArea** diagsArea,
 				    ExeErrorCode err, 
@@ -444,8 +429,6 @@ ComDiagsArea *ExRaiseDetailSqlError(CollHeap* heap,
 }
  
 //Detailed error support for clause expression evaluation.
-NA_EIDPROC
-SQLEXP_LIB_FUNC
 ComDiagsArea *ExRaiseDetailSqlError(CollHeap* heap, 
 				    ComDiagsArea** diagsArea,
 				    ExeErrorCode err, 
@@ -524,8 +507,6 @@ ComDiagsArea *ExRaiseDetailSqlError(CollHeap* heap,
 
 
 //Detailed error support for conversions, especially for use in convdoit.
-NA_EIDPROC
-SQLEXP_LIB_FUNC
 ComDiagsArea *ExRaiseDetailSqlError(CollHeap* heap, 
 				    ComDiagsArea** diagsArea,
 				    ExeErrorCode err, 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/exp/ExpError.h
----------------------------------------------------------------------
diff --git a/core/sql/exp/ExpError.h b/core/sql/exp/ExpError.h
index bc30682..7b993de 100644
--- a/core/sql/exp/ExpError.h
+++ b/core/sql/exp/ExpError.h
@@ -65,8 +65,6 @@ class ComCondition;
 // above version in that it puts an error condition in the supplied
 // ComDiagsArea rather than in a copy.
 
-NA_EIDPROC
-SQLEXP_LIB_FUNC
 ComDiagsArea *ExAddCondition(NAMemory * heap, ComDiagsArea** diagsArea,
 			     Lng32 err, ComCondition** cond=NULL,
 			     Lng32 * intParam1 = NULL,
@@ -76,8 +74,6 @@ ComDiagsArea *ExAddCondition(NAMemory * heap, ComDiagsArea** diagsArea,
 			     const char * stringParam2 = NULL,
 			     const char * stringParam3 = NULL);
 
-NA_EIDPROC
-SQLEXP_LIB_FUNC
 ComDiagsArea *ExRaiseSqlError(NAMemory * heap, ComDiagsArea** diagsArea,
 			      ExeErrorCode err, ComCondition** cond=NULL,
 			      Lng32 * intParam1 = NULL,
@@ -87,12 +83,8 @@ ComDiagsArea *ExRaiseSqlError(NAMemory * heap, ComDiagsArea** diagsArea,
 			      const char * stringParam2 = NULL,
 			      const char * stringParam3 = NULL);
 
-NA_EIDPROC
-SQLEXP_LIB_FUNC
 ComDiagsArea *ExRaiseSqlWarning(NAMemory * heap, ComDiagsArea** diagsArea,
 				ExeErrorCode err, ComCondition** cond=NULL);
-NA_EIDPROC
-SQLEXP_LIB_FUNC
 ComDiagsArea *ExRaiseSqlWarning(NAMemory * heap, ComDiagsArea** diagsArea,
                               ExeErrorCode err, ComCondition** cond,
                               Lng32 * intParam1 = NULL,
@@ -101,16 +93,12 @@ ComDiagsArea *ExRaiseSqlWarning(NAMemory * heap, ComDiagsArea** diagsArea,
                               const char * stringParam1 = NULL,
                               const char * stringParam2 = NULL,
                               const char * stringParam3 = NULL);
-NA_EIDPROC
-SQLEXP_LIB_FUNC
 ComDiagsArea *ExRaiseFunctionSqlError(NAMemory * heap, 
 				      ComDiagsArea** diagsArea,
 				      ExeErrorCode err, 
 				      NABoolean derivedFunction = FALSE,
 				      OperatorTypeEnum origOperType = ITM_FIRST_ITEM_OP,
 				      ComCondition** cond=NULL);
-NA_EIDPROC
-SQLEXP_LIB_FUNC
 ComDiagsArea *ExRaiseDetailSqlError(CollHeap* heap, 
 				    ComDiagsArea** diagsArea,
 				    ExeErrorCode err, 
@@ -119,16 +107,12 @@ ComDiagsArea *ExRaiseDetailSqlError(CollHeap* heap,
                                     char *op2 = NULL,
                                     char *op3 = NULL);
 
-NA_EIDPROC
-SQLEXP_LIB_FUNC
 ComDiagsArea *ExRaiseDetailSqlError(CollHeap* heap, 
 				    ComDiagsArea** diagsArea,
 				    ExeErrorCode err, 
 				    ex_clause *clause,
                                     char *op_data[]);
 
-NA_EIDPROC
-SQLEXP_LIB_FUNC
 ComDiagsArea *ExRaiseDetailSqlError(CollHeap* heap, 
 				    ComDiagsArea** diagsArea,
 				    ExeErrorCode err, 
@@ -141,8 +125,6 @@ ComDiagsArea *ExRaiseDetailSqlError(CollHeap* heap,
                                     Int32 tgtLength = -1,
                                     Int32 tgtScale = -1,
                                     Int32 tgtPrecision = 0);
-NA_EIDPROC
-SQLEXP_LIB_FUNC
 char *stringToHex(char * out, Int32 outLen, char * in, Int32 inLen);
                                                                 
 #endif /* EXP_ERROR_H */

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/exp/ExpErrorEnums.h
----------------------------------------------------------------------
diff --git a/core/sql/exp/ExpErrorEnums.h b/core/sql/exp/ExpErrorEnums.h
index fb1baf0..d9aedf7 100644
--- a/core/sql/exp/ExpErrorEnums.h
+++ b/core/sql/exp/ExpErrorEnums.h
@@ -201,11 +201,6 @@ enum ExeErrorCode
   EXE_RELEASE_WORK_TIMEOUT              = 8584,
   EXE_SCHEMA_SECURITY_CHANGED           = 8585,
   EXE_ASSIGN_ESPS_ERROR                 = 8586,
-  EXE_IAR_MFMAP_BAD                     = 8590,
-  EXE_IAR_ERROR_EXTRACTING_COLUMNS      = 8591,
-  EXE_IAR_NO_MFMAP                      = 8592,
-  EXE_IAR_MISSING_COLS_COMPRESSED_AUDIT = 8593,
-  EXE_AUDIT_IMAGE_EXPR_EVAL_ERROR       = 8594, 
   EXE_MERGE_STMT_ERROR                  = 8595,
   EXE_ESP_CHANGE_PRIORITY_FAILED        = 8596,
   EXE_RECOMPILE_AUTO_QUERY_RETRY        = 8597,
@@ -274,11 +269,6 @@ enum ExeErrorCode
   EXE_PARALLEL_EXTRACT_OPEN_ERROR       = 8701,
   EXE_PARALLEL_EXTRACT_CONNECT_ERROR    = 8702,
 
-  // ---------------------------------------------------------------------
-  // Warning from updating Measure SQL counters.
-  // ---------------------------------------------------------------------
-  EXE_MEASURE                           = 8710,
-
   //----------------------------------------------------------------------
   // Errors generated in the CLI code
   //----------------------------------------------------------------------
@@ -410,7 +400,6 @@ enum ExeErrorCode
   CLI_INVALID_CHARSET_FOR_DESCRIPTOR    = 8895,
   CLI_CHARSET_MISMATCH                  = 8896,
 
-  CLI_SHADOW_RPC_EXCEPTION		= 8897,
   CLI_INTERNAL_ERROR			= 8898,
   CLI_LAST_ERROR			= 8899,
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/exp/ExpLOB.cpp
----------------------------------------------------------------------
diff --git a/core/sql/exp/ExpLOB.cpp b/core/sql/exp/ExpLOB.cpp
index 0db6b57..2338850 100644
--- a/core/sql/exp/ExpLOB.cpp
+++ b/core/sql/exp/ExpLOB.cpp
@@ -675,13 +675,10 @@ void ExpLOBinsert::displayContents(Space * space, const char * displayStr,
 {
   ex_clause::displayContents(space, "ExpLOBinsert", clauseNum, constsArea);
 
-#ifndef __EID
   char buf[100];
 
   str_sprintf(buf, "    liFlags_ = %d", liFlags_);
   space->allocateAndCopyToAlignedSpace(buf, str_len(buf), sizeof(short));
-#endif
-
 }
 
 ex_expr::exp_return_type ExpLOBiud::insertDesc(char *op_data[],
@@ -758,13 +755,6 @@ ex_expr::exp_return_type ExpLOBiud::insertDesc(char *op_data[],
   
 
   Lng32 waitedOp = 0;
-#ifdef __EID
-  waitedOp = 0; // nowaited op from EID/TSE process
-#else
-  waitedOp = 1;
-#endif
-
-  //temptemp. Remove after ExLobsOper adds nowaited support.
   waitedOp = 1;
 
   // temp. Pass lobLen. When ExLobsOper fixes it so len is not needed during
@@ -987,13 +977,6 @@ ex_expr::exp_return_type ExpLOBiud::insertData(Lng32 handleLen,
 
  
   Lng32 waitedOp = 0;
-#ifdef __EID
-  waitedOp = 0; // nowaited op from EID/TSE process
-#else
-  waitedOp = 1;
-#endif
-
-  //temptemp. Remove after ExLobsOper adds nowaited support.
   waitedOp = 1;
 
   Lng32 cliError = 0;
@@ -1058,11 +1041,9 @@ ex_expr::exp_return_type ExpLOBinsert::eval(char *op_data[],
   if(fromEmpty())
     return err;
 
-#ifndef __EID
   char * handle = op_data[0];
   Lng32 handleLen = getOperand(0)->getLength();
   err = insertData(handleLen, handle, op_data, h, diagsArea);
-#endif
 
   return err;
 }
@@ -1119,13 +1100,6 @@ ex_expr::exp_return_type ExpLOBdelete::eval(char *op_data[],
     return ex_expr::EXPR_ERROR;
 
   Lng32 waitedOp = 0;
-#ifdef __EID
-  waitedOp = 0; // nowaited op from EID/TSE process
-#else
-  waitedOp = 1;
-#endif
-
-  //temptemp. Remove after ExLobsOper adds nowaited support.
   waitedOp = 1;
 
   Lng32 cliError = 0;
@@ -1188,13 +1162,10 @@ void ExpLOBupdate::displayContents(Space * space, const char * displayStr,
 {
   ExpLOBoper::displayContents(space, "ExpLOBupdate", clauseNum, constsArea);
 
-#ifndef __EID
   char buf[100];
 
   str_sprintf(buf, "    luFlags_ = %d", luFlags_);
   space->allocateAndCopyToAlignedSpace(buf, str_len(buf), sizeof(short));
-#endif
-
 }
 
 ex_expr::exp_return_type 
@@ -1354,13 +1325,6 @@ ex_expr::exp_return_type ExpLOBupdate::eval(char *op_data[],
   else
     lobMaxSize = getLobMaxSize();
   Lng32 waitedOp = 0;
-#ifdef __EID
-  waitedOp = 0; // nowaited op from EID/TSE process
-#else
-  waitedOp = 1;
-#endif
-
-  //temptemp. Remove after ExLobsOper adds nowaited support.
   waitedOp = 1;
 
   Lng32 cliError = 0;
@@ -1554,14 +1518,8 @@ ex_expr::exp_return_type ExpLOBconvert::eval(char *op_data[],
   Lng32 waitedOp = 0;
   Int64 lobLen = 0; 
   char *lobData = NULL;
-#ifdef __EID
-  waitedOp = 0; // nowaited op from EID/TSE process
-#else
   waitedOp = 1;
-#endif
 
-  //temptemp. Remove after ExLobsOper adds nowaited support.
-  waitedOp = 1;
   extractFromLOBhandle(&flags, &lobType, &lobNum, &uid,
 			   &descKey, &descTS, 
 			   &schNameLen, schName,

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/exp/ExpLOB.h
----------------------------------------------------------------------
diff --git a/core/sql/exp/ExpLOB.h b/core/sql/exp/ExpLOB.h
index 0d2561d..850f6bc 100644
--- a/core/sql/exp/ExpLOB.h
+++ b/core/sql/exp/ExpLOB.h
@@ -422,87 +422,87 @@ class ExpLOBiud : public ExpLOBoper {
 				      CollHeap*h,
 				      ComDiagsArea** diagsArea);
 
-  NA_EIDPROC NABoolean isAppend()
+  NABoolean isAppend()
   {
     return ((liudFlags_ & IS_APPEND) != 0);
   };
 
-  NA_EIDPROC inline void setIsAppend(NABoolean v)
+  inline void setIsAppend(NABoolean v)
   {
     (v) ? liudFlags_ |= IS_APPEND: liudFlags_ &= ~IS_APPEND;
   };
 
-  NA_EIDPROC NABoolean fromString()
+  NABoolean fromString()
   {
     return ((liudFlags_ & FROM_STRING) != 0);
   };
 
-  NA_EIDPROC inline void setFromString(NABoolean v)
+  inline void setFromString(NABoolean v)
   {
     (v) ? liudFlags_ |= FROM_STRING: liudFlags_ &= ~FROM_STRING;
   };
-  NA_EIDPROC NABoolean fromBuffer()
+  NABoolean fromBuffer()
   {
     return ((liudFlags_ & FROM_BUFFER) != 0);
   };
-  NA_EIDPROC inline void setFromBuffer(NABoolean v)
+  inline void setFromBuffer(NABoolean v)
   {
     (v) ? liudFlags_ |= FROM_BUFFER: liudFlags_ &= ~FROM_BUFFER;
   };
-  NA_EIDPROC inline void setFromEmpty(NABoolean v)
+  inline void setFromEmpty(NABoolean v)
   {
     (v) ? liudFlags_ |= FROM_EMPTY: liudFlags_ &= ~FROM_EMPTY;
   };
-  NA_EIDPROC NABoolean fromEmpty()
+  NABoolean fromEmpty()
   {
     return ((liudFlags_ & FROM_EMPTY) != 0);
   };
  
-  NA_EIDPROC NABoolean fromFile()
+  NABoolean fromFile()
   {
     return ((liudFlags_ & FROM_FILE) != 0);
   };
 
-  NA_EIDPROC inline void setFromFile(NABoolean v)
+  inline void setFromFile(NABoolean v)
   {
     (v) ? liudFlags_ |= FROM_FILE: liudFlags_ &= ~FROM_FILE;
   };
 
-  NA_EIDPROC NABoolean fromLoad()
+  NABoolean fromLoad()
   {
     return ((liudFlags_ & FROM_LOAD) != 0);
   };
 
-  NA_EIDPROC inline void setFromLoad(NABoolean v)
+  inline void setFromLoad(NABoolean v)
   {
     (v) ? liudFlags_ |= FROM_LOAD: liudFlags_ &= ~FROM_LOAD;
   };
 
-  NA_EIDPROC NABoolean fromLob()
+  NABoolean fromLob()
   {
     return ((liudFlags_ & FROM_LOB) != 0);
   };
 
-  NA_EIDPROC inline void setFromLob(NABoolean v)
+  inline void setFromLob(NABoolean v)
   {
     (v) ? liudFlags_ |= FROM_LOB: liudFlags_ &= ~FROM_LOB;
   };
-  NA_EIDPROC NABoolean fromLobExternal()
+  NABoolean fromLobExternal()
   {
     return ((liudFlags_ & FROM_LOB_EXTERNAL) != 0);
   };
 
-  NA_EIDPROC inline void setFromLobExternal(NABoolean v)
+  inline void setFromLobExternal(NABoolean v)
   {
     (v) ? liudFlags_ |= FROM_LOB_EXTERNAL: liudFlags_ &= ~FROM_LOB_EXTERNAL;
   };
 
-  NA_EIDPROC NABoolean fromExternal()
+  NABoolean fromExternal()
   {
     return ((liudFlags_ & FROM_EXTERNAL) != 0);
   };
 
-  NA_EIDPROC inline void setFromExternal(NABoolean v)
+  inline void setFromExternal(NABoolean v)
   {
     (v) ? liudFlags_ |= FROM_EXTERNAL: liudFlags_ &= ~FROM_EXTERNAL;
   };
@@ -696,21 +696,21 @@ public:
 
   virtual short getClassSize() { return (short)sizeof(*this); }
   // ---------------------------------------------------------------------
-   NA_EIDPROC NABoolean toLob()
+   NABoolean toLob()
   {
     return ((lsFlags_ & TO_LOB) != 0);
   };
 
-  NA_EIDPROC inline void setToLob(NABoolean v)
+  inline void setToLob(NABoolean v)
   {
     (v) ? lsFlags_ |= TO_LOB: lsFlags_ &= ~TO_LOB;
   };
-  NA_EIDPROC NABoolean toFile()
+  NABoolean toFile()
   {
     return ((lsFlags_ & TO_FILE) != 0);
   };
 
-  NA_EIDPROC inline void setToFile(NABoolean v)
+  inline void setToFile(NABoolean v)
   {
     (v) ? lsFlags_ |= TO_FILE: lsFlags_ &= ~TO_FILE;
   };
@@ -779,31 +779,31 @@ public:
   virtual short getClassSize() { return (short)sizeof(*this); }
   // ---------------------------------------------------------------------
 
-  NA_EIDPROC NABoolean toString()
+  NABoolean toString()
   {
     return ((lcFlags_ & TO_STRING) != 0);
   };
 
-  NA_EIDPROC inline void setToString(NABoolean v)
+  inline void setToString(NABoolean v)
   {
     (v) ? lcFlags_ |= TO_STRING: lcFlags_ &= ~TO_STRING;
   };
 
-  NA_EIDPROC NABoolean toLob()
+  NABoolean toLob()
   {
     return ((lcFlags_ & TO_LOB) != 0);
   };
 
-  NA_EIDPROC inline void setToLob(NABoolean v)
+  inline void setToLob(NABoolean v)
   {
     (v) ? lcFlags_ |= TO_LOB: lcFlags_ &= ~TO_LOB;
   };
-  NA_EIDPROC NABoolean toFile()
+  NABoolean toFile()
   {
     return ((lcFlags_ & TO_FILE) != 0);
   };
 
-  NA_EIDPROC inline void setToFile(NABoolean v)
+  inline void setToFile(NABoolean v)
   {
     (v) ? lcFlags_ |= TO_FILE: lcFlags_ &= ~TO_FILE;
   };
@@ -872,22 +872,22 @@ public:
   virtual short getClassSize() { return (short)sizeof(*this); }
   // ---------------------------------------------------------------------
 
-  NA_EIDPROC NABoolean toString()
+  NABoolean toString()
   {
     return ((lchFlags_ & TO_STRING) != 0);
   };
 
-  NA_EIDPROC inline void setToString(NABoolean v)
+  inline void setToString(NABoolean v)
   {
     (v) ? lchFlags_ |= TO_STRING: lchFlags_ &= ~TO_STRING;
   };
 
-  NA_EIDPROC NABoolean toLob()
+  NABoolean toLob()
   {
     return ((lchFlags_ & TO_LOB) != 0);
   };
 
-  NA_EIDPROC inline void setToLob(NABoolean v)
+  inline void setToLob(NABoolean v)
   {
     (v) ? lchFlags_ |= TO_LOB: lchFlags_ &= ~TO_LOB;
   };
@@ -992,18 +992,18 @@ public:
   // ---------------------------------------------------------------------
   // Redefinition of methods inherited from NAVersionedObject.
   // ---------------------------------------------------------------------
-  NA_EIDPROC virtual unsigned char getClassVersionID()
+  virtual unsigned char getClassVersionID()
   {
     return 1;
   }
 
-  NA_EIDPROC virtual void populateImageVersionIDArray()
+  virtual void populateImageVersionIDArray()
   {
     setImageVersionID(2,getClassVersionID());
     ExpLOBoper::populateImageVersionIDArray();
   }
 
-  NA_EIDPROC virtual short getClassSize() { return (short)sizeof(*this); }
+  virtual short getClassSize() { return (short)sizeof(*this); }
  
  private:
 }

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/exp/ExpPCode.cpp
----------------------------------------------------------------------
diff --git a/core/sql/exp/ExpPCode.cpp b/core/sql/exp/ExpPCode.cpp
index 441c041..f3f2096 100644
--- a/core/sql/exp/ExpPCode.cpp
+++ b/core/sql/exp/ExpPCode.cpp
@@ -48,7 +48,6 @@
 // Uncomment the line below to debug new PCode instructions.
 // #define SQLMX_DEBUG_PCIT
 
-NA_EIDPROC
 PCodeSegment::PCodeSegment(PCodeBinary* pcode) : NAVersionedObject() {
   str_cpy_all((char*)&eyeCatcher_, PC_eyeCatcher, PC_eyeCatcherSize);
   flags_ = 0;
@@ -57,38 +56,32 @@ PCodeSegment::PCodeSegment(PCodeBinary* pcode) : NAVersionedObject() {
 }
 
 
-NA_EIDPROC
 unsigned char PCodeSegment::getClassVersionID() {
   return 1;
 }
 
 
-NA_EIDPROC
 Long PCodeSegment::pack(void *space) {
   convAddrToOffsetInPCode(space);
   pCodeSegment_.pack(space);
   return NAVersionedObject::pack(space);
 }
 
-NA_EIDPROC
 Lng32 PCodeSegment::unpack(void *base, void * reallocator) {
   if (pCodeSegment_.unpack(base)) return -1;
   convOffsetToAddrInPCode(base);
   return NAVersionedObject::unpack(base, reallocator);
 }
 
-NA_EIDPROC
 Int32 PCodeSegment::getPCodeSegmentSize() {
   return pCodeSegmentSize_;
 }
 
-NA_EIDPROC
 void PCodeSegment::setPCodeSegmentSize(Int32 size) {
   pCodeSegmentSize_ = size;
 }
 
 
-NA_EIDPROC
 short PCodeSegment::getClassSize() {
   Int32 trueSize = sizeof(*this) + getPCodeSegmentSize();
   return( (short)(trueSize + (trueSize % 8)) );
@@ -101,7 +94,6 @@ short PCodeSegment::getClassSize() {
 // passed in space object and replace the old attributes pointer in the pcode
 // segment with the new pointer
 //
-NA_EIDPROC
 void PCodeSegment::replaceAttributesPtr(ex_clause* clauses, Space* space)
 {
   Int32 addrBuf[6];
@@ -186,7 +178,6 @@ void PCodeSegment::replaceAttributesPtr(ex_clause* clauses, Space* space)
 
 // Locate the clause pointer "oldClause" in the pcode segment and replace it
 // with the clause "newClause".
-NA_EIDPROC
 void PCodeSegment::replaceClauseEvalPtr(ex_clause* oldClause,
                                         ex_clause* newClause)
 {
@@ -225,7 +216,6 @@ void PCodeSegment::replaceClauseEvalPtr(ex_clause* oldClause,
 //
 // convOffsetToAddrInPCode translates the offsets to addresses
 // -----------------------------------------------------------------------
-NA_EIDPROC
 void PCodeSegment::convAddrToOffsetInPCode(void * space) {
   PCodeBinary *pcode = getPCodeBinary();
   if (!pcode)
@@ -246,7 +236,6 @@ void PCodeSegment::convAddrToOffsetInPCode(void * space) {
   }
 }
 
-NA_EIDPROC
 void PCodeSegment::convOffsetToAddrInPCode(void* base) {
   PCodeBinary *pcode = getPCodeBinary();
   if (!pcode)
@@ -1161,31 +1150,19 @@ Int32 *PCode::getEmbeddedAddresses(Int32 opcode, Int32 addr[]) {
         break;
 
       case PCIT::CLAUSE_BRANCH:
-#ifdef NA_64BIT
         addr[0] = 3;  // address of branch clause starts from pcode[3]
-#else
-        addr[0] = 2;
-#endif
         addr[1] = -1;
         break;
 
     case PCIT::NULL_VIOLATION_MPTR32_MPTR32_IPTR_IPTR:
       addr[0] = 5;
-#ifdef NA_64BIT
       addr[1] = 7;  // address of 2nd attributes struct starts from pcode[7]
-#else
-      addr[1] = 6;
-#endif
       addr[2] = -1;
       break;
 
     case PCIT::NOT_NULL_BRANCH_MBIN32S_MBIN16S_MBIN16S_IBIN32S:
       addr[0] = 7;
-#ifdef NA_64BIT
       addr[1] = 9;  // should be pcode[9], but don't know if this opcode is used
-#else
-      addr[1] = 8;
-#endif
       addr[2] = -1;
       break;
 
@@ -1206,7 +1183,6 @@ Int32 PCode::getInstructionLength(PCodeBinary * pcode) {
     NAAssert(tmpbuf, __FILE__ , __LINE__ );
   }
 
-// 64BIT : should here be a switch statement?
   if ((opcode == PCIT::HASHCOMB_BULK_MBIN32U) ||
       (opcode == PCIT::NOT_NULL_BRANCH_BULK) ||
       (opcode == PCIT::MOVE_BULK) ||
@@ -1254,11 +1230,11 @@ PCIT::Instruction PCode::getInstruction(PCI *pci) {
               return (PCIT::Instruction)opcodeMap[i].opcode;
           } 
       } 
-#ifdef NA_DEBUG_C_RUNTIME
+#ifdef _DEBUG
   fprintf(stderr, 
           "ERROR(getInstruction) -- Unknown instruction, opcode = %d\n", 
           pci->getOperation());
-#endif // NA_DEBUG_C_RUNTIME
+#endif // _DEBUG
   ExpAssert(0, "Unknown PCode Instruction");
 
   return(PCIT::NOP);
@@ -1356,7 +1332,7 @@ void PCIT::operandString(Int32 operand, char* buffer) {
 }
 
 void PCode::print(PCIList code) {
-#ifdef NA_DEBUG_C_RUNTIME
+#ifdef _DEBUG
   PCIListIter iter(code);
   for(PCI *pci = iter.first(); pci; pci = iter.next()) {
     pci->print();
@@ -1364,7 +1340,7 @@ void PCode::print(PCIList code) {
   }
 #endif
 }
-#ifdef NA_DEBUG_C_RUNTIME
+#ifdef _DEBUG
 void PCI::print() {
     char buffer[32];
     PCIT::operandString(operation_, buffer);
@@ -1388,7 +1364,6 @@ void PCI::print() {
 };
 #endif
 
-#ifndef __EID
 void PCode::displayContents(PCIList code, Space *space) {
   char buf[256];
   char operandBuf[32];
@@ -1474,8 +1449,6 @@ void PCode::displayContents(PCodeBinary* pCode, Space *space) {
   space->allocateAndCopyToAlignedSpace(buf, str_len(buf), sizeof(short));
 }
 
-#endif
-
 Int32 PCode::dumpContents(PCIList code, char * buf, Int32 bufLen) {
   char operandBuf[32];
   Int32 len = 0;
@@ -2468,11 +2441,7 @@ PCIID PCode::generateJumpAndBranch(Attributes *dst,
   if (notNullBranch)
     {
       AML aml;
-#ifdef NA_64BIT
       OL ol((Int64) notNullBranch);
-#else
-      OL ol((PCIType::Operand) notNullBranch);
-#endif
       PCI pci(PCIT::Op_TARGET, aml, ol);
       code.append(pci);
     }
@@ -2607,12 +2576,7 @@ void PCode::preClausePCI(ex_clause *clause, PCIList& code) {
     for(Int32 i=0; i<clause->getNumberBranchTargets(); i++)
     {
       AML aml;
-#ifdef NA_64BIT
-      // dg64 - match signature
       OL ol((Int64) clause);
-#else
-      OL ol((PCIType::Operand) clause);
-#endif
       PCI pci(PCIT::Op_TARGET, aml, ol);
       code.append(pci);
     }
@@ -2695,11 +2659,7 @@ PCIID PCode::nullBranchHelper(AttributesPtr *attrs,
                 attrA->getNullIndOffset(),
                 attrB->getAtp(), attrB->getAtpIndex(),
                 attrB->getNullIndOffset(),
-#ifdef NA_64BIT
                 (Int64)attrA, (Int64)attrB
-#else
-                (PCIType::Operand)attrA, (PCIType::Operand)attrB
-#endif
                 );
           PCI pci(PCIT::Op_NULL_VIOLATION, aml, ol);
           code.append(pci);
@@ -2765,13 +2725,8 @@ PCIID PCode::nullBranchHelper(AttributesPtr *attrs,
           AML aml(PCIT::MPTR32,PCIT::MPTR32,PCIT::IPTR,PCIT::IPTR);
           OL ol(attrA->getAtp(),attrA->getAtpIndex(),attrA->getNullIndOffset(),
                 attrA->getAtp(),attrA->getAtpIndex(),attrA->getNullIndOffset(),
-#ifdef NA_64BIT
                 (Int64)attrA,
                 (Int64)0
-#else
-                (PCIType::Operand)attrA,
-                (Int32)0
-#endif
                 );
           PCI pci(PCIT::Op_NULL_VIOLATION, aml, ol);
           code.append(pci);

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/exp/ExpPCode.h
----------------------------------------------------------------------
diff --git a/core/sql/exp/ExpPCode.h b/core/sql/exp/ExpPCode.h
index 261e0ec..a39334d 100644
--- a/core/sql/exp/ExpPCode.h
+++ b/core/sql/exp/ExpPCode.h
@@ -59,19 +59,7 @@
 //Opcode map defines
 #define OPCODE_MAP_FIRSTSIX_BITS  0x000000000000003F
 
-/* #ifdef NA_DEBUG_C_RUNTIME
 #ifdef _DEBUG
-#ifdef _EID
-#if !defined(NA_NSK)
-#define DEBUG_PCODE
-#endif  // NA_WINNT
-#else // _EID
-#define DEBUG_PCODE
-#endif // _EID
-#endif // _DEBUG
-#endif */
-
-#ifdef NA_DEBUG_C_RUNTIME
 #include <stdio.h>
 #endif
 
@@ -123,17 +111,13 @@ public:
   Int32 length;
   Int32 numAmodes;
 };
-//#if defined( __EID ) && defined( NA_NSK )
-//#pragma class_functions PCodeInstructionMap (resident)
-//#endif
-
 
 // class PCodeSegment
 //
 // this class contains the actual byte code 
 
 #pragma warning ( disable : 4251 )
-class SQLEXP_LIB_FUNC PCodeSegment : public NAVersionedObject {
+class PCodeSegment : public NAVersionedObject {
 public:
   PCodeSegment(PCodeBinary* pcode = 0);
 
@@ -147,11 +131,7 @@ public:
   // Adds pointer to PCodeBinary sequences and advance idx
   Int32 setPtrAsPCodeBinary(PCodeBinary *pcode, Int32 idx, Long ptr)
     {
-    #ifdef NA_64BIT
       *(Long*)&(pcode[idx]) = ptr;
-    #else
-      pcode[idx] = (PCodeBinary) ptr;
-    #endif
       return (sizeof(ptr)/sizeof(PCodeBinary));
     }
 
@@ -223,7 +203,7 @@ private:
 // functions that operate on PCI's.
 //
 //
-class SQLEXP_LIB_FUNC  PCode {
+class  PCode {
 public:
 
   // Construction/Destruction
@@ -394,12 +374,11 @@ public:
   //
   static void print(PCIList pciList);
 
-#ifndef __EID
   // Used by SHOWPLAN to display PCI's
   //
   static void displayContents(PCIList pciList, Space *space);
   static void displayContents(PCodeBinary* pCode, Space *space);
-#endif
+
   // for debug
   static Int32 dumpContents(PCIList pciList, char *buf, Int32 bufLen);
   static void dumpContents(PCodeBinary* pCode, char *buf, Int32 bufLen);

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/exp/ExpPCodeClauseGen.cpp
----------------------------------------------------------------------
diff --git a/core/sql/exp/ExpPCodeClauseGen.cpp b/core/sql/exp/ExpPCodeClauseGen.cpp
index d3a4e53..e181cff 100644
--- a/core/sql/exp/ExpPCodeClauseGen.cpp
+++ b/core/sql/exp/ExpPCodeClauseGen.cpp
@@ -201,11 +201,7 @@ ex_expr::exp_return_type ex_clause::pCodeGenerate(Space *space, UInt32 f) {
   // clause->eval(), and then pops the stack.
   //
   AML aml(PCIT::IPTR, PCIT::IBIN32S);
-#ifdef NA_64BIT
   OL ol((Int64)this, useProcessNulls);
-#else
-  OL ol((PCIType::Operand)this, useProcessNulls);
-#endif
   PCI pci(PCIT::Op_CLAUSE_EVAL, aml, ol);
  
   setNoPCodeAvailable(TRUE);
@@ -228,11 +224,7 @@ ex_expr::exp_return_type ex_clause::pCodeGenerate(Space *space, UInt32 f) {
   if(branchEndA)
   {
     AML aml1;
-#ifdef NA_64BIT
     OL ol1((Int64)branchEndA);
-#else
-    OL ol1((PCIType::Operand)branchEndA);
-#endif
     PCI pci1(PCIT::Op_TARGET, aml1, ol1);
     code.append(pci1);
   }
@@ -248,11 +240,7 @@ ex_expr::exp_return_type ex_clause::pCodeGenerate(Space *space, UInt32 f) {
       ex_branch_clause *branchClause = (ex_branch_clause*)this;
       ex_clause *targetClause = branchClause->get_branch_clause();
       AML aml(PCIT::IPTR, PCIT::IPTR);
-#ifdef NA_64BIT
       OL ol((Int64)targetClause, (Int64)this);
-#else
-      OL ol((PCIType::Operand)targetClause, (PCIType::Operand)this);
-#endif
       PCI pci(PCIT::Op_CLAUSE_BRANCH, aml, ol);
       code.append(pci);
     }
@@ -278,11 +266,9 @@ ex_expr::exp_return_type ex_inout_clause::pCodeGenerate(Space *space, UInt32 f)
 ex_expr::exp_return_type ex_aggr_min_max_clause::pCodeGenerate(Space *space, UInt32 f) {
 
 #ifdef _DEBUG
-#ifndef __EID
   if (getenv("NO_PCODE_MIN_MAX"))
     return ex_clause::pCodeGenerate(space, f);
 #endif
-#endif
 
   if ((getOperand(1)->getNullFlag()) ||
       (getOperand(0)->getVCIndicatorLength() > 0))
@@ -366,11 +352,7 @@ ex_expr::exp_return_type ex_aggr_min_max_clause::pCodeGenerate(Space *space, UIn
   // End branch target.
   //
   AML aml6;
-#ifdef NA_64BIT
   OL ol6((Int64)branchTgt);
-#else
-  OL ol6((PCIType::Operand)branchTgt);
-#endif
   PCI pci6(PCIType::Op_TARGET, aml6, ol6);
   code.append(pci6);
     
@@ -402,7 +384,7 @@ ex_expr::exp_return_type ex_function_clause::pCodeGenerate(Space *space, UInt32
 // EFFECTS: stores pointer to PCodeObject in clause
 //
 ex_expr::exp_return_type ex_function_encode::pCodeGenerate(Space *space, UInt32 f) {
-#ifdef NA_DEBUG_C_RUNTIME
+#ifdef _DEBUG
   // For debugging...
   if(getenv("PCODE_NO_ENCODE")) return ex_clause::pCodeGenerate(space, f);
 #endif
@@ -570,11 +552,7 @@ ex_expr::exp_return_type ex_function_encode::pCodeGenerate(Space *space, UInt32
   if(branchToEnd)
   {
     AML aml;
-#ifdef NA_64BIT
     OL ol((Int64)branchToEnd);
-#else
-    OL ol((PCIType::Operand)branchToEnd);
-#endif
     PCI pci(PCIT::Op_TARGET, aml, ol);
     code.append(pci);
   }
@@ -623,7 +601,7 @@ ex_expr::exp_return_type ex_aggr_any_true_max_clause::pCodeGenerate(Space *space
 // EFFECTS: stores pointer to PCodeObject in clause
 //
 ex_expr::exp_return_type ex_bool_clause::pCodeGenerate(Space *space, UInt32 f) { 
-#ifdef NA_DEBUG_C_RUNTIME
+#ifdef _DEBUG
   // For debugging...
   if(getenv("PCODE_NO_BOOL")) return ex_clause::pCodeGenerate(space, f);
 #endif
@@ -693,7 +671,7 @@ ex_expr::exp_return_type ex_bool_clause::pCodeGenerate(Space *space, UInt32 f) {
 // EFFECTS: stores pointer to PCodeObject in clause
 //
 ex_expr::exp_return_type bool_result_clause::pCodeGenerate(Space *space, UInt32 f) { 
-#ifdef NA_DEBUG_C_RUNTIME
+#ifdef _DEBUG
   // For debugging...
   if(getenv("PCODE_NO_BOOL_RESULT")) return ex_clause::pCodeGenerate(space, f);
 #endif
@@ -753,15 +731,9 @@ ex_expr::exp_return_type ex_branch_clause::pCodeGenerate(Space *space, UInt32 f)
   
   ex_clause *targetClause = get_branch_clause();
   AML aml(PCIT::IPTR, PCIT::IPTR, PCIT::MBIN32S, PCIT::MBIN32S);
-#ifdef NA_64BIT
   OL ol((Int64)targetClause, (Int64)0,
 	attrs[0]->getAtp(), attrs[0]->getAtpIndex(), (Int32)attrs[0]->getOffset(),
 	attrs[1]->getAtp(), attrs[1]->getAtpIndex(), (Int32)attrs[1]->getOffset());
-#else
-  OL ol((PCIType::Operand)targetClause, 0,
-	attrs[0]->getAtp(), attrs[0]->getAtpIndex(), (Int32)attrs[0]->getOffset(),
-	attrs[1]->getAtp(), attrs[1]->getAtpIndex(), (Int32)attrs[1]->getOffset());
-#endif // NA_64BIT
 
   // Generate the branch instruction
   //
@@ -794,7 +766,7 @@ ex_expr::exp_return_type ex_branch_clause::pCodeGenerate(Space *space, UInt32 f)
 // EFFECTS: stores pointer to PCodeObject in clause
 //
 ex_expr::exp_return_type ex_comp_clause::pCodeGenerate(Space *space, UInt32 f) { 
-#ifdef NA_DEBUG_C_RUNTIME
+#ifdef _DEBUG
   // For debugging...
   if(getenv("PCODE_NO_COMP")) return ex_clause::pCodeGenerate(space, f);
 #endif
@@ -1383,11 +1355,7 @@ ex_expr::exp_return_type ex_comp_clause::pCodeGenerate(Space *space, UInt32 f) {
   if(branchToEnd)
   {
     AML aml; 
-#ifdef NA_64BIT
     OL ol((Int64)branchToEnd);
-#else
-    OL ol((PCIType::Operand)branchToEnd);
-#endif
     PCI pci(PCIT::Op_TARGET, aml, ol); 
     code.append(pci);
   }
@@ -1431,7 +1399,7 @@ ex_expr::exp_return_type ex_noop_clause::pCodeGenerate(Space *space, UInt32 f) {
 // EFFECTS: stores pointer to PCodeObject in clause
 //
 ex_expr::exp_return_type ex_unlogic_clause::pCodeGenerate(Space *space, UInt32 f) {
-#ifdef NA_DEBUG_C_RUNTIME
+#ifdef _DEBUG
   // For debugging...
   if(getenv("PCODE_NO_UNLOGIC")) return ex_clause::pCodeGenerate(space, f);
 #endif
@@ -1498,7 +1466,7 @@ ex_expr::exp_return_type ex_unlogic_clause::pCodeGenerate(Space *space, UInt32 f
 // EFFECTS: stores pointer to PCodeObject in clause
 //
 ex_expr::exp_return_type ex_function_bool::pCodeGenerate(Space *space, UInt32 f) {
-#ifdef NA_DEBUG_C_RUNTIME
+#ifdef _DEBUG
   // For debugging...
   if(getenv("PCODE_NO_BOOL")) return ex_clause::pCodeGenerate(space, f);
 #endif
@@ -1563,7 +1531,7 @@ ex_expr::exp_return_type ExHDPHash::pCodeGenerate(Space *space, UInt32 f)
   // again, resulting in an infinite loop.  So just duplicate the code below
   // and keep it up-to-date.
 
-#ifdef NA_DEBUG_C_RUNTIME
+#ifdef _DEBUG
   // For debugging...
   if(getenv("PCODE_NO_HASH")) return ex_clause::pCodeGenerate(space, f);
 #endif
@@ -1687,11 +1655,7 @@ ex_expr::exp_return_type ExHDPHash::pCodeGenerate(Space *space, UInt32 f)
   if(branchToEnd)
     {
       AML aml;
-#ifdef NA_64BIT
       OL ol((Int64)branchToEnd);
-#else
-      OL ol((PCIType::Operand)branchToEnd);
-#endif
       PCI pci(PCIT::Op_TARGET, aml, ol);
       code.append(pci);
     }
@@ -1717,7 +1681,7 @@ ex_expr::exp_return_type ExHDPHash::pCodeGenerate(Space *space, UInt32 f)
 ex_expr::exp_return_type ex_function_hash::pCodeGenerate(Space *space, UInt32 f)
 {
 
-#ifdef NA_DEBUG_C_RUNTIME
+#ifdef _DEBUG
   // For debugging...
   if(getenv("PCODE_NO_HASH")) return ex_clause::pCodeGenerate(space, f);
 #endif
@@ -1793,11 +1757,7 @@ ex_expr::exp_return_type ex_function_hash::pCodeGenerate(Space *space, UInt32 f)
   if(branchToEnd)
     {
       AML aml; 
-#ifdef NA_64BIT
       OL ol((Int64)branchToEnd);
-#else
-      OL ol((PCIType::Operand)branchToEnd);
-#endif
       PCI pci(PCIT::Op_TARGET, aml, ol); 
       code.append(pci);
     }
@@ -1822,7 +1782,7 @@ ex_expr::exp_return_type ex_function_hash::pCodeGenerate(Space *space, UInt32 f)
 // EFFECTS: stores pointer to PCodeObject in clause
 //
 ex_expr::exp_return_type ExHDPHashComb::pCodeGenerate(Space *space, UInt32 f) {
-#ifdef NA_DEBUG_C_RUNTIME
+#ifdef _DEBUG
   // For debugging...
   if(getenv("PCODE_NO_HASHCOMB")) return ex_clause::pCodeGenerate(space, f);
 #endif
@@ -1886,7 +1846,7 @@ ex_expr::exp_return_type ExHDPHashComb::pCodeGenerate(Space *space, UInt32 f) {
 // EFFECTS: stores pointer to PCodeObject in clause
 //
 ex_expr::exp_return_type ExHashComb::pCodeGenerate(Space *space, UInt32 f) {
-#ifdef NA_DEBUG_C_RUNTIME
+#ifdef _DEBUG
   // For debugging...
   if(getenv("PCODE_NO_HASHCOMB")) return ex_clause::pCodeGenerate(space, f);
 #endif
@@ -1942,7 +1902,7 @@ ex_expr::exp_return_type ExHashComb::pCodeGenerate(Space *space, UInt32 f) {
 //
 //
 ex_expr::exp_return_type ex_function_replace_null::pCodeGenerate(Space *space, UInt32 f){
-#ifdef NA_DEBUG_C_RUNTIME
+#ifdef _DEBUG
   // For debugging...
   if(getenv("PCODE_NO_REPLACE_NULL")) return ex_clause::pCodeGenerate(space, f);
 #endif
@@ -2020,17 +1980,13 @@ ex_expr::exp_return_type ex_function_replace_null::pCodeGenerate(Space *space, U
 
 // Helpers for working with attributes
 //
-NA_EIDPROC
 Int32 isSameAttribute(Attributes *attrA, Attributes *attrB) {
   if(attrA->getAtpIndex() != attrB->getAtpIndex()) return 0;
   if(attrA->getOffset() != attrB->getOffset()) return 0;
   return 1;
 };
-NA_EIDPROC
 Int32 isConstantAttribute(Attributes *attr) { return attr->getAtpIndex() == 0; };
-NA_EIDPROC
 Int32 isTemporaryAttribute(Attributes *attr) { return attr->getAtpIndex() == 1;};
-NA_EIDPROC
 Int32 isAtpAttribute(Attributes *attr) { return attr->getAtpIndex() > 1; };
 
 ex_expr::exp_return_type ex_arith_clause::unaryArithPCodeGenerate
@@ -2101,11 +2057,7 @@ ex_expr::exp_return_type ex_arith_clause::unaryArithPCodeGenerate
   if(branchToEnd)
   {
     AML aml; 
-#ifdef NA_64BIT
     OL ol((Int64)branchToEnd);
-#else
-    OL ol((PCIType::Operand)branchToEnd);
-#endif
     PCI pci(PCIT::Op_TARGET, aml, ol); 
     code.append(pci);
   }
@@ -2129,7 +2081,7 @@ ex_expr::exp_return_type ex_arith_clause::unaryArithPCodeGenerate
 // EFFECTS: stores pointer to PCodeObject in clause
 //
 ex_expr::exp_return_type ex_arith_clause::pCodeGenerate(Space *space, UInt32 f) {
-#ifdef NA_DEBUG_C_RUNTIME
+#ifdef _DEBUG
   // For debugging...
   if(getenv("PCODE_NO_ARITH")) return ex_clause::pCodeGenerate(space, f);
 #endif
@@ -2414,11 +2366,7 @@ ex_expr::exp_return_type ex_arith_clause::pCodeGenerate(Space *space, UInt32 f)
   if(branchToEnd)
   {
     AML aml; 
-#ifdef NA_64BIT
     OL ol((Int64)branchToEnd);
-#else
-    OL ol((PCIType::Operand)branchToEnd);
-#endif
     PCI pci(PCIT::Op_TARGET, aml, ol); 
     code.append(pci);
   }
@@ -2441,7 +2389,7 @@ ex_expr::exp_return_type ex_arith_clause::pCodeGenerate(Space *space, UInt32 f)
 // EFFECTS: stores pointer to PCodeObject in clause
 //
 ex_expr::exp_return_type ex_arith_sum_clause::pCodeGenerate(Space *space, UInt32 f) {
-#ifdef NA_DEBUG_C_RUNTIME
+#ifdef _DEBUG
   // For debugging...
   if(getenv("PCODE_NO_ARITH_SUM")) return ex_clause::pCodeGenerate(space, f);
 #endif
@@ -2588,7 +2536,7 @@ ex_expr::exp_return_type ex_arith_count_clause::pCodeGenerate(Space *space, UInt
   return ex_clause::pCodeGenerate(space, f);
 };
 
-NA_EIDPROC static void computeBounds(Attributes *attr, Int64 &lowBounds, 
+static void computeBounds(Attributes *attr, Int64 &lowBounds, 
 			  UInt64 &highBounds, Int32 &bigBounds, Int32 &isSigned)
 {
 const  UInt64 decimalPrecision[] = {
@@ -2734,7 +2682,7 @@ const  Int32 bpPrecision[] = { 0, 1, 3, 7, 15, 31, 63, 127, 255, 511,
 // EFFECTS: stores pointer to PCodeObject in clause
 //
 ex_expr::exp_return_type ex_conv_clause::pCodeGenerate(Space *space, UInt32 f) {
-#ifdef NA_DEBUG_C_RUNTIME
+#ifdef _DEBUG
   // For debugging...
   if(getenv("PCODE_NO_CONV")) return ex_clause::pCodeGenerate(space, f);
 #endif
@@ -3026,11 +2974,7 @@ ex_expr::exp_return_type ex_conv_clause::pCodeGenerate(Space *space, UInt32 f) {
       if (nullJmp)
 	{
 	  AML aml;
-#ifdef NA_64BIT
 	  OL ol((Int64) nullJmp);
-#else
-	  OL ol((PCIType::Operand) nullJmp);
-#endif
 	  PCI pci(PCIT::Op_TARGET, aml, ol);
 	  code.append(pci);
 	}
@@ -3069,7 +3013,7 @@ ex_expr::exp_return_type ex_conv_clause::pCodeGenerate(Space *space, UInt32 f) {
     return ex_clause::pCodeGenerate(space, f);
   }
   
-#ifdef NA_DEBUG_C_RUNTIME
+#ifdef _DEBUG
   // Allow 64 -> 64 with differing scale
   //
   if(getInstruction() == CONV_BIN64S_BIN64S)
@@ -3156,7 +3100,7 @@ ex_expr::exp_return_type ex_conv_clause::pCodeGenerate(Space *space, UInt32 f) {
       }
   }
 
-#if (defined (_DEBUG) && !(defined(__EID)))
+#if (defined (_DEBUG) )
   if(!getenv("NO_PCODE_FLOAT_RANGE"))
 #endif
     if( getInstruction() == CONV_FLOAT64_FLOAT64 &&
@@ -3367,11 +3311,7 @@ ex_expr::exp_return_type ex_conv_clause::pCodeGenerate(Space *space, UInt32 f) {
   if(nullBranch)
   {
     AML aml; 
-#ifdef NA_64BIT
     OL ol((Int64)nullBranch);
-#else
-    OL ol((PCIType::Operand)nullBranch);
-#endif
     PCI pci(PCIT::Op_TARGET, aml, ol); 
     code.append(pci);
   }
@@ -3423,7 +3363,7 @@ ex_expr::exp_return_type ExUnPackCol::pCodeGenerate(Space *space, UInt32 f) {
 
   /*
 
-#ifdef NA_DEBUG_C_RUNTIME
+#ifdef _DEBUG
   // For debugging to disable the pCode generation
   if(getenv("PCODE_NO_UNPACK"))
     // Generate the default clause_eval instruction.
@@ -3648,11 +3588,7 @@ ex_expr::exp_return_type ex_function_mod::pCodeGenerate(Space *space, UInt32 f)
   if(branchEnd)
   {
     AML aml1;
-#ifdef NA_64BIT
     OL ol1((Int64)branchEnd);
-#else
-    OL ol1((PCIType::Operand)branchEnd);
-#endif
     PCI pci1(PCIT::Op_TARGET, aml1, ol1);
     code.append(pci1);
   }
@@ -3703,11 +3639,7 @@ ex_function_nullifzero::pCodeGenerate(Space *space, UInt32 f)
   if (nullBranch)
     {
       AML aml; 
-#ifdef NA_64BIT
       OL ol((Int64)nullBranch);
-#else
-      OL ol((PCIType::Operand)nullBranch);
-#endif
       PCI pci(PCIT::Op_TARGET, aml, ol); 
       code.append(pci);
     }
@@ -3855,11 +3787,7 @@ ex_expr::exp_return_type ex_function_nvl::pCodeGenerate(Space *space, UInt32 f)
   if (nullBranch)
   {
     AML aml;
-#ifdef NA_64BIT
     OL ol((Int64)nullBranch);
-#else
-    OL ol((PCIType::Operand)nullBranch);
-#endif
     PCI pci(PCIT::Op_TARGET, aml, ol);
     code.append(pci);
   }
@@ -4018,11 +3946,7 @@ ex_function_concat::pCodeGenerate(Space *space, UInt32 f)
   if(branchToEnd)
   {
     AML aml;
-#ifdef NA_64BIT
     OL ol((Int64)branchToEnd);
-#else
-    OL ol((PCIType::Operand)branchToEnd);
-#endif
     PCI pci(PCIT::Op_TARGET, aml, ol);
     code.append(pci);
   }
@@ -4120,11 +4044,7 @@ ex_expr::exp_return_type ex_function_substring::pCodeGenerate(Space *space,
   if (nullBranch)
   {
     AML aml;
-#ifdef NA_64BIT
     OL ol((Int64)nullBranch);
-#else
-    OL ol((PCIType::Operand)nullBranch);
-#endif
     PCI pci(PCIT::Op_TARGET, aml, ol);
     code.append(pci);
   }
@@ -4178,11 +4098,7 @@ ex_expr::exp_return_type ExFunctionBitOper::pCodeGenerate(Space *space, UInt32 f
   if(branchToEnd)
   {
     AML aml; 
-#ifdef NA_64BIT
     OL ol((Int64)branchToEnd);
-#else
-    OL ol((PCIType::Operand)branchToEnd);
-#endif
     PCI pci(PCIT::Op_TARGET, aml, ol); 
     code.append(pci);
   }
@@ -4292,11 +4208,7 @@ ex_function_upper::pCodeGenerate(Space *space, UInt32 f)
   if (nullBranch)
     {
       AML aml;
-#ifdef NA_64BIT
       OL ol((Int64)nullBranch);
-#else
-      OL ol((PCIType::Operand)nullBranch);
-#endif
       PCI pci(PCIT::Op_TARGET, aml, ol);
       code.append(pci);
     }
@@ -4371,11 +4283,7 @@ ex_function_lower::pCodeGenerate(Space *space, UInt32 f)
   if (nullBranch)
     {
       AML aml;
-#ifdef NA_64BIT
       OL ol((Int64)nullBranch);
-#else
-      OL ol((PCIType::Operand)nullBranch);
-#endif
       PCI pci(PCIT::Op_TARGET, aml, ol);
       code.append(pci);
     }
@@ -4457,11 +4365,7 @@ ex_function_trim_char::pCodeGenerate(Space *space, UInt32 f)
   if (nullBranch)
     {
       AML aml;
-#ifdef NA_64BIT
       OL ol((Int64)nullBranch);
-#else
-      OL ol((PCIType::Operand)nullBranch);
-#endif
       PCI pci(PCIT::Op_TARGET, aml, ol);
       code.append(pci);
     }
@@ -4527,11 +4431,7 @@ ex_function_char_length_doublebyte::pCodeGenerate(Space *space, UInt32 f)
   if(branchToEnd)
   {
     AML aml;
-#ifdef NA_64BIT
     OL ol((Int64)branchToEnd);
-#else
-    OL ol((PCIType::Operand)branchToEnd);
-#endif
     PCI pci(PCIT::Op_TARGET, aml, ol);
     code.append(pci);
   }
@@ -4597,11 +4497,7 @@ ex_function_char_length::pCodeGenerate(Space *space, UInt32 f)
   if(branchToEnd)
   {
     AML aml;
-#ifdef NA_64BIT
     OL ol((Int64)branchToEnd);
-#else
-    OL ol((PCIType::Operand)branchToEnd);
-#endif
     PCI pci(PCIT::Op_TARGET, aml, ol);
     code.append(pci);
   }
@@ -4669,11 +4565,7 @@ ExFunctionRepeat::pCodeGenerate(Space *space, UInt32 f)
   if (nullBranch)
     {
       AML aml;
-#ifdef NA_64BIT
       OL ol((Int64)nullBranch);
-#else
-      OL ol((PCIType::Operand)nullBranch);
-#endif
       PCI pci(PCIT::Op_TARGET, aml, ol);
       code.append(pci);
     }
@@ -4742,11 +4634,7 @@ ex_function_position::pCodeGenerate(Space *space, UInt32 f)
   if(branchToEnd)
   {
     AML aml;
-#ifdef NA_64BIT
     OL ol((Int64)branchToEnd);
-#else
-    OL ol((PCIType::Operand)branchToEnd);
-#endif
     PCI pci(PCIT::Op_TARGET, aml, ol);
     code.append(pci);
   }
@@ -4915,11 +4803,7 @@ ex_like_clause_base::pCodeGenerate(Space *space, UInt32 f)
   if(branchToEnd)
   {
     AML aml;
-#ifdef NA_64BIT
     OL ol((Int64)branchToEnd);
-#else
-    OL ol((PCIType::Operand)branchToEnd);
-#endif
     PCI pci(PCIT::Op_TARGET, aml, ol);
     code.append(pci);
   }
@@ -5000,11 +4884,7 @@ ex_function_extract::pCodeGenerate(Space *space, UInt32 f)
   if(branchToEnd)
   {
     AML aml;
-#ifdef NA_64BIT
     OL ol((Int64)branchToEnd);
-#else
-    OL ol((PCIType::Operand)branchToEnd);
-#endif
     PCI pci(PCIT::Op_TARGET, aml, ol);
     code.append(pci);
   }


Mime
View raw message