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:01 UTC

[07/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/exp/exp_function.h
----------------------------------------------------------------------
diff --git a/core/sql/exp/exp_function.h b/core/sql/exp/exp_function.h
index f9de57b..45779fa 100644
--- a/core/sql/exp/exp_function.h
+++ b/core/sql/exp/exp_function.h
@@ -75,242 +75,163 @@ class ex_function_clause;
 #define MIN_IPV6_STRING_LEN  2
 #define IPV6_PARTS_NUM       8
 
-SQLEXP_LIB_FUNC NA_EIDPROC UInt32 FastHash(char *data, Int32 length);
+UInt32 FastHash(char *data, Int32 length);
 
-class SQLEXP_LIB_FUNC  ExFunctionAscii : public ex_function_clause {
+class  ExFunctionAscii : public ex_function_clause {
 public:
-  NA_EIDPROC ExFunctionAscii(OperatorTypeEnum oper_type,
+  ExFunctionAscii(OperatorTypeEnum oper_type,
 			     Attributes ** attr,
 			     Space * space);
-  NA_EIDPROC ExFunctionAscii();
+  ExFunctionAscii();
 
 
-  NA_EIDPROC ex_expr::exp_return_type eval(char *op_data[], CollHeap*,
+  ex_expr::exp_return_type eval(char *op_data[], CollHeap*,
 					   ComDiagsArea** = 0);  
-  NA_EIDPROC Long pack(void *);
+  Long pack(void *);
 
   // ---------------------------------------------------------------------
   // 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); }
-  // ---------------------------------------------------------------------
-};
-
-
-// class ExAuditImage 
-// This function clause implements the AuditImage ItemExpr. It generates
-// the audit row image by evaluating the expression(ex_expr) stored in 
-// its data member auditImageContainerExpr_. This clause also sets the 
-// length  of audit row image on to the length field of the return value.
-//  
-// The data members of this class are:
-//
-//  ExpDP2ExprPtr auditImageContainerExpr_: This ExpDp2Expr object contains the ex_expr
-//                                        that creates the audit row image.
-//                                        This ex_expr is generated by the 
-//                                        generateContiguousMoveExpr
-//                                        
-//  This node is a leaf node. 
-//
-
-class SQLEXP_LIB_FUNC  ExAuditImage : public ex_function_clause {
-public:
-  NA_EIDPROC ExAuditImage(Attributes **attr,
-			  Space *space,
-			  ExpDP2ExprPtr auditImageContainerExpr
-			    );
-  NA_EIDPROC ExAuditImage();
-
-
-  // This is where all the work is done.
-  //
-  NA_EIDPROC
-  ex_expr::exp_return_type eval(char *op_data[],
-                                CollHeap *, 
-                                ComDiagsArea** diagsArea = 0);
-
-  NA_EIDPROC
-  Long pack(void *space);
-  NA_EIDPROC Lng32 unpack(void *, void * reallocator);
-
-  NA_EIDPROC ex_expr::exp_return_type fixup(Space * space = 0,
-                                            CollHeap * exHeap = 0,
-                                            char * constants_area = 0,
-                                            char * temps_area = 0,
-                                            char * persistentArea = 0,
-                                            short = 0,
-					    NABoolean spaceCompOnly = FALSE);
-  // Cuttrently we are not going to generate PCODE. The spec. calls for 
-  // generating PCODE if time permits. So, commenting it out instead of 
-  // deleting it.
-  // 
-  //  NA_EIDPROC ex_expr::exp_return_type pCodeGenerate(Space *space);
-
-  NA_EIDPROC void displayContents(Space * space, const char * displayStr, 
-					  Int32 clauseNum, char * constsArea);
-
-
-  // ---------------------------------------------------------------------
-  // Redefinition of methods inherited from NAVersionedObject.
-  // ---------------------------------------------------------------------
-  NA_EIDPROC virtual unsigned char getClassVersionID()
-  {
-    return 1;
-  }
-
-  NA_EIDPROC 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); }
   // ---------------------------------------------------------------------
-
-private:
-  ExpDP2ExprPtr auditImageContainerExpr_; // 00-07 
-  char             fillers_[8];           // 08-15
 };
 
-
-
-
-class SQLEXP_LIB_FUNC  ExFunctionChar : public ex_function_clause {
+class  ExFunctionChar : public ex_function_clause {
 public:
-  NA_EIDPROC ExFunctionChar(OperatorTypeEnum oper_type,
+  ExFunctionChar(OperatorTypeEnum oper_type,
 			    Attributes ** attr,
 			    Space * space);
-  NA_EIDPROC ExFunctionChar();
+  ExFunctionChar();
 
 
-  NA_EIDPROC ex_expr::exp_return_type eval(char *op_data[], CollHeap*,
+  ex_expr::exp_return_type eval(char *op_data[], CollHeap*,
 					   ComDiagsArea** = 0);  
-  NA_EIDPROC Long pack(void *);
+  Long pack(void *);
 
   // ---------------------------------------------------------------------
   // 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); }
   // ---------------------------------------------------------------------
 };
 
-class SQLEXP_LIB_FUNC  ExFunctionConvertHex : public ex_function_clause {
+class  ExFunctionConvertHex : public ex_function_clause {
 public:
-  NA_EIDPROC ExFunctionConvertHex(OperatorTypeEnum oper_type,
+  ExFunctionConvertHex(OperatorTypeEnum oper_type,
 				  Attributes ** attr,
 				  Space * space);
-  NA_EIDPROC ExFunctionConvertHex();
+  ExFunctionConvertHex();
 
 
-  NA_EIDPROC ex_expr::exp_return_type eval(char *op_data[], CollHeap*,
+  ex_expr::exp_return_type eval(char *op_data[], CollHeap*,
 					   ComDiagsArea** = 0);  
-  NA_EIDPROC Long pack(void *);
+  Long pack(void *);
 
   // ---------------------------------------------------------------------
   // 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); }
   // ---------------------------------------------------------------------
 };
 
-class SQLEXP_LIB_FUNC  ExFunctionRepeat : public ex_function_clause {
+class  ExFunctionRepeat : public ex_function_clause {
 public:
-  NA_EIDPROC ExFunctionRepeat(OperatorTypeEnum oper_type,
+  ExFunctionRepeat(OperatorTypeEnum oper_type,
 			     Attributes ** attr,
 			     Space * space);
-  NA_EIDPROC ExFunctionRepeat();
+  ExFunctionRepeat();
 
 
-  NA_EIDPROC ex_expr::exp_return_type pCodeGenerate(Space *space, UInt32 f);
+  ex_expr::exp_return_type pCodeGenerate(Space *space, UInt32 f);
 
-  NA_EIDPROC ex_expr::exp_return_type eval(char *op_data[], CollHeap*,
+  ex_expr::exp_return_type eval(char *op_data[], CollHeap*,
 					   ComDiagsArea** = 0);  
-  NA_EIDPROC Long pack(void *);
+  Long pack(void *);
 
   // ---------------------------------------------------------------------
   // 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); }
   // ---------------------------------------------------------------------
 };
 
-class SQLEXP_LIB_FUNC  ExFunctionReplace : public ex_function_clause {
+class  ExFunctionReplace : public ex_function_clause {
 public:
-  NA_EIDPROC ExFunctionReplace(OperatorTypeEnum oper_type,
+  ExFunctionReplace(OperatorTypeEnum oper_type,
 			     Attributes ** attr,
 			     Space * space);
-  NA_EIDPROC ExFunctionReplace();
+  ExFunctionReplace();
 
 
-  NA_EIDPROC ex_expr::exp_return_type eval(char *op_data[], CollHeap*,
+  ex_expr::exp_return_type eval(char *op_data[], CollHeap*,
 					   ComDiagsArea** = 0);  
-  NA_EIDPROC Long pack(void *);
+  Long pack(void *);
   
   // ---------------------------------------------------------------------
   // collation
   // ---------------------------------------------------------------------
 
-  NA_EIDPROC CharInfo::Collation getCollation()
+  CharInfo::Collation getCollation()
   {
     return (CharInfo::Collation) collation_;
   }
 
-  NA_EIDPROC void setCollation( CharInfo::Collation c)
+  void setCollation( CharInfo::Collation c)
   {
     collation_ = (Int16) c;
   }
 
-  NA_EIDPROC Int16 getArgEncodedLen( Int16 i)
+  Int16 getArgEncodedLen( Int16 i)
   {
     assert(i <2 && i>=0);
     return argsEncodedLen_[i];
   }
   
-  NA_EIDPROC void setArgEncodedLen( Int16 v, Int16 i)
+  void setArgEncodedLen( Int16 v, Int16 i)
   {
     assert(i <2 && i>=0);
     argsEncodedLen_[i] = v;
@@ -319,18 +240,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());
     ex_function_clause::populateImageVersionIDArray();
   }
 
-  NA_EIDPROC virtual short getClassSize() { return (short)sizeof(*this); }
+  virtual short getClassSize() { return (short)sizeof(*this); }
  
 private:
   Int16 collation_;
@@ -340,108 +261,108 @@ private:
   // ---------------------------------------------------------------------
 };
 
-class SQLEXP_LIB_FUNC  ex_function_char_length : public ex_function_clause {
+class  ex_function_char_length : public ex_function_clause {
 public:
-  NA_EIDPROC ex_function_char_length(OperatorTypeEnum oper_type,
+  ex_function_char_length(OperatorTypeEnum oper_type,
 				     Attributes ** attr,
 				     Space * space);
-  NA_EIDPROC ex_function_char_length();
+  ex_function_char_length();
 
 
-  NA_EIDPROC ex_expr::exp_return_type pCodeGenerate(Space *space, UInt32 f);
+  ex_expr::exp_return_type pCodeGenerate(Space *space, UInt32 f);
 
-  NA_EIDPROC ex_expr::exp_return_type eval(char *op_data[], CollHeap*,
+  ex_expr::exp_return_type eval(char *op_data[], CollHeap*,
 					   ComDiagsArea** = 0);  
-  NA_EIDPROC Long pack(void *);
+  Long pack(void *);
 
   // ---------------------------------------------------------------------
   // 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); }
   // ---------------------------------------------------------------------
 };
 
-class SQLEXP_LIB_FUNC  ex_function_oct_length : public ex_function_clause {
+class  ex_function_oct_length : public ex_function_clause {
 public:
-  NA_EIDPROC ex_function_oct_length(OperatorTypeEnum oper_type,
+  ex_function_oct_length(OperatorTypeEnum oper_type,
 				    Attributes ** attr,
 				    Space * space);
-  NA_EIDPROC ex_function_oct_length();
+  ex_function_oct_length();
 
 
-  NA_EIDPROC ex_expr::exp_return_type eval(char *op_data[], CollHeap*, 
+  ex_expr::exp_return_type eval(char *op_data[], CollHeap*, 
 					   ComDiagsArea** = 0);  
-  NA_EIDPROC Long pack(void *);
+  Long pack(void *);
   
   // ---------------------------------------------------------------------
   // 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); }
   // ---------------------------------------------------------------------
 };
 
-class SQLEXP_LIB_FUNC  ex_function_char_length_doublebyte : 
+class  ex_function_char_length_doublebyte : 
 	public ex_function_clause 
 {
 public:
-  NA_EIDPROC ex_function_char_length_doublebyte(OperatorTypeEnum oper_type,
+  ex_function_char_length_doublebyte(OperatorTypeEnum oper_type,
                                    Attributes ** attr,
                                    Space * space);
-  NA_EIDPROC ex_function_char_length_doublebyte();
+  ex_function_char_length_doublebyte();
 
 
-  NA_EIDPROC ex_expr::exp_return_type pCodeGenerate(Space *space, UInt32 f);
+  ex_expr::exp_return_type pCodeGenerate(Space *space, UInt32 f);
 
-  NA_EIDPROC ex_expr::exp_return_type eval(char *op_data[], CollHeap*,
+  ex_expr::exp_return_type eval(char *op_data[], CollHeap*,
                                          ComDiagsArea** = 0);
-  NA_EIDPROC Long pack(void *);
+  Long pack(void *);
 
   // ---------------------------------------------------------------------
   // 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); }
   // ---------------------------------------------------------------------
 };
 
-class SQLEXP_LIB_FUNC  ex_function_position : public ex_function_clause {
+class  ex_function_position : public ex_function_clause {
 public:
-  NA_EIDPROC ex_function_position(OperatorTypeEnum oper_type,
+  ex_function_position(OperatorTypeEnum oper_type,
 				  Attributes ** attr,
 				  Space * space);
-  NA_EIDPROC ex_function_position();
+  ex_function_position();
 
 
   ////////////////////////////////////////////////////////
@@ -458,7 +379,7 @@ public:
   // checking the entire string).  This is used by LIKE
   // clauses.
   ////////////////////////////////////////////////////////
-  NA_EIDPROC static
+  static
   Int32 findPosition(char* pat,
                      Int32 patLen,
                      char* src,
@@ -472,7 +393,7 @@ public:
   // otherwise return the position of searchStr in
   // sourceStr.
   ////////////////////////////////////////////////////////
-  NA_EIDPROC static
+  static
   Lng32 findPosition(char * sourceStr, 
 		    Lng32 sourceLen,
 		    char * searchStr, 
@@ -483,39 +404,39 @@ public:
                     short charOffsetFlag = 0,
                     CharInfo::CharSet cs = CharInfo::ISO88591);
 
-  NA_EIDPROC ex_expr::exp_return_type pCodeGenerate(Space *space, UInt32 f);
+  ex_expr::exp_return_type pCodeGenerate(Space *space, UInt32 f);
 
-  NA_EIDPROC ex_expr::exp_return_type eval(char *op_data[], CollHeap*, 
+  ex_expr::exp_return_type eval(char *op_data[], CollHeap*, 
 					   ComDiagsArea** = 0);  
-  NA_EIDPROC Long pack(void *);
+  Long pack(void *);
   
   // ---------------------------------------------------------------------
   // 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); }
 
 
   // ---------------------------------------------------------------------
   // collation.
   // ---------------------------------------------------------------------
 
-  NA_EIDPROC CharInfo::Collation getCollation() 
+  CharInfo::Collation getCollation() 
   {
     return (CharInfo::Collation) collation_;
   }
 
-  NA_EIDPROC void setCollation(CharInfo::Collation v) 
+  void setCollation(CharInfo::Collation v) 
   {
     collation_ = (Int16) v;
   }
@@ -528,288 +449,288 @@ private:
 
 };
 
-class SQLEXP_LIB_FUNC  ex_function_position_doublebyte : 
+class  ex_function_position_doublebyte : 
 	public ex_function_clause {
 public:
-  NA_EIDPROC ex_function_position_doublebyte(OperatorTypeEnum oper_type,
+  ex_function_position_doublebyte(OperatorTypeEnum oper_type,
                                 Attributes ** attr,
                                 Space * space);
-  NA_EIDPROC ex_function_position_doublebyte();
+  ex_function_position_doublebyte();
 
 
-  NA_EIDPROC ex_expr::exp_return_type eval(char *op_data[], CollHeap*,
+  ex_expr::exp_return_type eval(char *op_data[], CollHeap*,
                                          ComDiagsArea** = 0);
-  NA_EIDPROC Long pack(void *);
+  Long pack(void *);
 
   // ---------------------------------------------------------------------
   // 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); }
   // ---------------------------------------------------------------------
 };
 
-class SQLEXP_LIB_FUNC  ex_function_concat : public ex_function_clause {
+class  ex_function_concat : public ex_function_clause {
 public:
-  NA_EIDPROC ex_function_concat(OperatorTypeEnum oper_type,
+  ex_function_concat(OperatorTypeEnum oper_type,
 				Attributes ** attr,
 				Space * space);
-  NA_EIDPROC ex_function_concat();
+  ex_function_concat();
 
 
-  NA_EIDPROC ex_expr::exp_return_type pCodeGenerate(Space *space, UInt32 f);
+  ex_expr::exp_return_type pCodeGenerate(Space *space, UInt32 f);
 
-  NA_EIDPROC ex_expr::exp_return_type eval(char *op_data[], CollHeap*, 
+  ex_expr::exp_return_type eval(char *op_data[], CollHeap*, 
 					   ComDiagsArea** = 0);  
-  NA_EIDPROC Long pack(void *);
+  Long pack(void *);
   
   // ---------------------------------------------------------------------
   // 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); }
   // ---------------------------------------------------------------------
 };
 
-class SQLEXP_LIB_FUNC  ex_function_lower : public ex_function_clause {
+class  ex_function_lower : public ex_function_clause {
 public:
-  NA_EIDPROC ex_function_lower(OperatorTypeEnum oper_type,
+  ex_function_lower(OperatorTypeEnum oper_type,
 			       Attributes ** attr,
 			       Space * space);
-  NA_EIDPROC ex_function_lower();
+  ex_function_lower();
 
 
-  NA_EIDPROC ex_expr::exp_return_type pCodeGenerate(Space *space, UInt32 f);
+  ex_expr::exp_return_type pCodeGenerate(Space *space, UInt32 f);
 
-  NA_EIDPROC ex_expr::exp_return_type eval(char *op_data[], CollHeap*, 
+  ex_expr::exp_return_type eval(char *op_data[], CollHeap*, 
 					   ComDiagsArea** = 0);  
-  NA_EIDPROC Long pack(void *);
+  Long pack(void *);
   
   // ---------------------------------------------------------------------
   // 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); }
   // ---------------------------------------------------------------------
 };
 
-class SQLEXP_LIB_FUNC  ex_function_lower_unicode : public ex_function_clause {
+class  ex_function_lower_unicode : public ex_function_clause {
 public:
-  NA_EIDPROC ex_function_lower_unicode(OperatorTypeEnum oper_type,
+  ex_function_lower_unicode(OperatorTypeEnum oper_type,
                              Attributes ** attr,
                              Space * space);
-  NA_EIDPROC ex_function_lower_unicode();
+  ex_function_lower_unicode();
 
 
-  NA_EIDPROC ex_expr::exp_return_type eval(char *op_data[], CollHeap*,
+  ex_expr::exp_return_type eval(char *op_data[], CollHeap*,
                                          ComDiagsArea** = 0);
-  NA_EIDPROC Long pack(void *);
+  Long pack(void *);
 
   // ---------------------------------------------------------------------
   // 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); }
   // ---------------------------------------------------------------------
 };
 
-class SQLEXP_LIB_FUNC  ex_function_upper : public ex_function_clause {
+class  ex_function_upper : public ex_function_clause {
 public:
-  NA_EIDPROC ex_function_upper(OperatorTypeEnum oper_type,
+  ex_function_upper(OperatorTypeEnum oper_type,
 			       Attributes ** attr,
 			       Space * space);
-  NA_EIDPROC ex_function_upper();
+  ex_function_upper();
 
 
-  NA_EIDPROC ex_expr::exp_return_type pCodeGenerate(Space *space, UInt32 f);
+  ex_expr::exp_return_type pCodeGenerate(Space *space, UInt32 f);
 
-  NA_EIDPROC ex_expr::exp_return_type eval(char *op_data[], CollHeap*, 
+  ex_expr::exp_return_type eval(char *op_data[], CollHeap*, 
 					   ComDiagsArea** = 0);  
-  NA_EIDPROC Long pack(void *);
+  Long pack(void *);
   
   // ---------------------------------------------------------------------
   // 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); }
   // ---------------------------------------------------------------------
 };
 
-class SQLEXP_LIB_FUNC  ex_function_upper_unicode : public ex_function_clause {
+class  ex_function_upper_unicode : public ex_function_clause {
 public:
-  NA_EIDPROC ex_function_upper_unicode(OperatorTypeEnum oper_type,
+  ex_function_upper_unicode(OperatorTypeEnum oper_type,
                              Attributes ** attr,
                              Space * space);
-  NA_EIDPROC ex_function_upper_unicode();
+  ex_function_upper_unicode();
 
 
-  NA_EIDPROC ex_expr::exp_return_type eval(char *op_data[], CollHeap*,
+  ex_expr::exp_return_type eval(char *op_data[], CollHeap*,
                                          ComDiagsArea** = 0);
-  NA_EIDPROC Long pack(void *);
+  Long pack(void *);
 
   // ---------------------------------------------------------------------
   // 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); }
   // ---------------------------------------------------------------------
 };
 
-class SQLEXP_LIB_FUNC  ex_function_substring : public ex_function_clause {
+class  ex_function_substring : public ex_function_clause {
 public:
-  NA_EIDPROC ex_function_substring(OperatorTypeEnum oper_type,
+  ex_function_substring(OperatorTypeEnum oper_type,
 				   short num_operands,
 				   Attributes ** attr,
 				   Space * space);
-  NA_EIDPROC ex_function_substring();
+  ex_function_substring();
 
 
-  NA_EIDPROC ex_expr::exp_return_type pCodeGenerate(Space *space, UInt32 f);
+  ex_expr::exp_return_type pCodeGenerate(Space *space, UInt32 f);
 
-  NA_EIDPROC ex_expr::exp_return_type eval(char *op_data[], CollHeap*, 
+  ex_expr::exp_return_type eval(char *op_data[], CollHeap*, 
 					   ComDiagsArea** = 0);  
-  NA_EIDPROC Long pack(void *);
+  Long pack(void *);
 
   // ---------------------------------------------------------------------
   // 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); }
   // ---------------------------------------------------------------------
 };
 
-class SQLEXP_LIB_FUNC  ex_function_trim : public ex_function_clause {
+class  ex_function_trim : public ex_function_clause {
 public:
-  NA_EIDPROC ex_function_trim(OperatorTypeEnum oper_type,
+  ex_function_trim(OperatorTypeEnum oper_type,
 			      Attributes ** attr, 
 			      Space * space, Int32 mode);
-  NA_EIDPROC ex_function_trim() {};
+  ex_function_trim() {};
 
 
-  NA_EIDPROC inline Int32 getTrimMode() const {return mode_;}
-  NA_EIDPROC ex_expr::exp_return_type eval(char *op_data[], CollHeap*, 
+  inline Int32 getTrimMode() const {return mode_;}
+  ex_expr::exp_return_type eval(char *op_data[], CollHeap*, 
 					   ComDiagsArea** = 0) = 0;  
-  NA_EIDPROC Long pack(void *) = 0;
+  Long pack(void *) = 0;
 
     // ---------------------------------------------------------------------
   // collation
   // ---------------------------------------------------------------------
 
-  NA_EIDPROC CharInfo::Collation getCollation()
+  CharInfo::Collation getCollation()
   {
     return (CharInfo::Collation) collation_;
   }
 
-  NA_EIDPROC void setCollation( CharInfo::Collation c)
+  void setCollation( CharInfo::Collation c)
   {
     collation_ = (Int16) c;
   }
 
-  NA_EIDPROC Int16 getSrcStrEncodedLength()
+  Int16 getSrcStrEncodedLength()
   {
     return srcStrEncodedLength_;
   }
   
-  NA_EIDPROC void setSrcStrEncodedLength( Int16 v)
+  void setSrcStrEncodedLength( Int16 v)
   {
     srcStrEncodedLength_ = v;
   }
 
   
-  NA_EIDPROC Int16 getTrimCharEncodedLength()
+  Int16 getTrimCharEncodedLength()
   {
     return trimCharEncodedLength_;
   }
   
-  NA_EIDPROC void setTrimCharEncodedLength( Int16 v)
+  void setTrimCharEncodedLength( Int16 v)
   {
     trimCharEncodedLength_ = v;
   }
   // ---------------------------------------------------------------------
   // 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); }
   // ---------------------------------------------------------------------
   
 private:
@@ -825,302 +746,302 @@ private:
   char             fillers_[6];          // 10-15
 };
 
-class SQLEXP_LIB_FUNC  ex_function_trim_char : public ex_function_trim {
+class  ex_function_trim_char : public ex_function_trim {
 public:
-  NA_EIDPROC ex_function_trim_char(OperatorTypeEnum oper_type,
+  ex_function_trim_char(OperatorTypeEnum oper_type,
                             Attributes ** attr,
                             Space * space, Int32 mode);
-  NA_EIDPROC ex_function_trim_char();
+  ex_function_trim_char();
 
 
-  NA_EIDPROC ex_expr::exp_return_type pCodeGenerate(Space *space, UInt32 f);
-  NA_EIDPROC ex_expr::exp_return_type eval(char *op_data[], CollHeap*,
+  ex_expr::exp_return_type pCodeGenerate(Space *space, UInt32 f);
+  ex_expr::exp_return_type eval(char *op_data[], CollHeap*,
                                          ComDiagsArea** = 0);
-  NA_EIDPROC Long pack(void *);
+  Long pack(void *);
 
   // ---------------------------------------------------------------------
   // 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(3,getClassVersionID());
     ex_function_trim::populateImageVersionIDArray();
   }
 
-  NA_EIDPROC virtual short getClassSize() { return (short)sizeof(*this); }
+  virtual short getClassSize() { return (short)sizeof(*this); }
   // ---------------------------------------------------------------------
 };
 
-class SQLEXP_LIB_FUNC ExFunctionCrc32: public ex_function_clause {
+class ExFunctionCrc32: public ex_function_clause {
 public:
-  NA_EIDPROC ExFunctionCrc32(OperatorTypeEnum oper_type,
+  ExFunctionCrc32(OperatorTypeEnum oper_type,
 				Attributes ** attr,
 				Space * space);
-  NA_EIDPROC ExFunctionCrc32();
+  ExFunctionCrc32();
 
-  NA_EIDPROC ex_expr::exp_return_type eval(char *op_data[], CollHeap*, 
+  ex_expr::exp_return_type eval(char *op_data[], CollHeap*, 
 					   ComDiagsArea** = 0);  
-  NA_EIDPROC Long pack(void *);
+  Long pack(void *);
 
   // ---------------------------------------------------------------------
   // 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); }
   // ---------------------------------------------------------------------
 };
 
-class SQLEXP_LIB_FUNC ExFunctionSha: public ex_function_clause {
+class ExFunctionSha: public ex_function_clause {
 public:
-  NA_EIDPROC ExFunctionSha(OperatorTypeEnum oper_type,
+  ExFunctionSha(OperatorTypeEnum oper_type,
 				Attributes ** attr,
 				Space * space);
-  NA_EIDPROC ExFunctionSha();
+  ExFunctionSha();
 
-  NA_EIDPROC ex_expr::exp_return_type eval(char *op_data[], CollHeap*, 
+  ex_expr::exp_return_type eval(char *op_data[], CollHeap*, 
 					   ComDiagsArea** = 0);  
-  NA_EIDPROC Long pack(void *);
+  Long pack(void *);
 
   // ---------------------------------------------------------------------
   // 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); }
   // ---------------------------------------------------------------------
 };
 
-class SQLEXP_LIB_FUNC ExFunctionSha2: public ex_function_clause {
+class ExFunctionSha2: public ex_function_clause {
 public:
-  NA_EIDPROC ExFunctionSha2(OperatorTypeEnum oper_type,
+  ExFunctionSha2(OperatorTypeEnum oper_type,
 				Attributes ** attr,
 				Space * space,
                 Lng32 mode);
-  NA_EIDPROC ExFunctionSha2();
+  ExFunctionSha2();
 
-  NA_EIDPROC ex_expr::exp_return_type eval(char *op_data[], CollHeap*, 
+  ex_expr::exp_return_type eval(char *op_data[], CollHeap*, 
 					   ComDiagsArea** = 0);  
-  NA_EIDPROC Long pack(void *);
+  Long pack(void *);
 
   // ---------------------------------------------------------------------
   // 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); }
   // ---------------------------------------------------------------------
 
 private:
   Lng32 mode;
 };
 
-class SQLEXP_LIB_FUNC ExFunctionSoundex: public ex_function_clause {
+class ExFunctionSoundex: public ex_function_clause {
 public:
-  NA_EIDPROC ExFunctionSoundex(OperatorTypeEnum oper_type,
+  ExFunctionSoundex(OperatorTypeEnum oper_type,
 				Attributes ** attr,
 				Space * space);
-  NA_EIDPROC ExFunctionSoundex();
+  ExFunctionSoundex();
 
-  NA_EIDPROC ex_expr::exp_return_type eval(char *op_data[], CollHeap*, 
+  ex_expr::exp_return_type eval(char *op_data[], CollHeap*, 
 					   ComDiagsArea** = 0);  
-  NA_EIDPROC Long pack(void *);
+  Long pack(void *);
 
   // ---------------------------------------------------------------------
   // 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); }
   // ---------------------------------------------------------------------
 };
 
-class SQLEXP_LIB_FUNC ExFunctionMd5: public ex_function_clause {
+class ExFunctionMd5: public ex_function_clause {
 public:
-  NA_EIDPROC ExFunctionMd5(OperatorTypeEnum oper_type,
+  ExFunctionMd5(OperatorTypeEnum oper_type,
 				Attributes ** attr,
 				Space * space);
-  NA_EIDPROC ExFunctionMd5();
+  ExFunctionMd5();
 
-  NA_EIDPROC ex_expr::exp_return_type eval(char *op_data[], CollHeap*, 
+  ex_expr::exp_return_type eval(char *op_data[], CollHeap*, 
 					   ComDiagsArea** = 0);  
-  NA_EIDPROC Long pack(void *);
+  Long pack(void *);
 
   // ---------------------------------------------------------------------
   // 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); }
   // ---------------------------------------------------------------------
 };
 
-class SQLEXP_LIB_FUNC ExFunctionIsIP : public ex_function_clause {
+class ExFunctionIsIP : public ex_function_clause {
 public:
-  NA_EIDPROC ExFunctionIsIP(OperatorTypeEnum oper_type,
+  ExFunctionIsIP(OperatorTypeEnum oper_type,
 				Attributes ** attr,
 				Space * space);
-  NA_EIDPROC ExFunctionIsIP();
+  ExFunctionIsIP();
 
-  NA_EIDPROC ex_expr::exp_return_type eval(char *op_data[], CollHeap*, 
+  ex_expr::exp_return_type eval(char *op_data[], CollHeap*, 
 					   ComDiagsArea** = 0);  
-  NA_EIDPROC Long pack(void *);
+  Long pack(void *);
 
   // ---------------------------------------------------------------------
   // 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); }
   // ---------------------------------------------------------------------
 };
 
-class SQLEXP_LIB_FUNC ExFunctionInetAton: public ex_function_clause {
+class ExFunctionInetAton: public ex_function_clause {
 public:
-  NA_EIDPROC ExFunctionInetAton(OperatorTypeEnum oper_type,
+  ExFunctionInetAton(OperatorTypeEnum oper_type,
 				Attributes ** attr,
 				Space * space);
-  NA_EIDPROC ExFunctionInetAton();
+  ExFunctionInetAton();
 
-  NA_EIDPROC ex_expr::exp_return_type eval(char *op_data[], CollHeap*, 
+  ex_expr::exp_return_type eval(char *op_data[], CollHeap*, 
 					   ComDiagsArea** = 0);  
-  NA_EIDPROC Long pack(void *);
+  Long pack(void *);
 
   // ---------------------------------------------------------------------
   // 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); }
   // ---------------------------------------------------------------------
 };
 
 
-class SQLEXP_LIB_FUNC ExFunctionInetNtoa: public ex_function_clause {
+class ExFunctionInetNtoa: public ex_function_clause {
 public:
-  NA_EIDPROC ExFunctionInetNtoa(OperatorTypeEnum oper_type,
+  ExFunctionInetNtoa(OperatorTypeEnum oper_type,
 				Attributes ** attr,
 				Space * space);
-  NA_EIDPROC ExFunctionInetNtoa();
+  ExFunctionInetNtoa();
 
-  NA_EIDPROC ex_expr::exp_return_type eval(char *op_data[], CollHeap*, 
+  ex_expr::exp_return_type eval(char *op_data[], CollHeap*, 
 					   ComDiagsArea** = 0);  
-  NA_EIDPROC Long pack(void *);
+  Long pack(void *);
 
   // ---------------------------------------------------------------------
   // 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); }
   // ---------------------------------------------------------------------
 };
 
-class SQLEXP_LIB_FUNC ExFunctionAESEncrypt : public ex_function_clause {
+class ExFunctionAESEncrypt : public ex_function_clause {
 public:
-  NA_EIDPROC ExFunctionAESEncrypt(OperatorTypeEnum oper_type,
+  ExFunctionAESEncrypt(OperatorTypeEnum oper_type,
                                   Attributes ** attr,
                                   Space * space,
                                   int args_num,
                                   Int32 aes_mode);
-  NA_EIDPROC ExFunctionAESEncrypt();
+  ExFunctionAESEncrypt();
 
-  NA_EIDPROC ex_expr::exp_return_type eval(char *op_datap[], CollHeap*,
+  ex_expr::exp_return_type eval(char *op_datap[], CollHeap*,
                                            ComDiagsArea** = 0);
-  NA_EIDPROC long pack(void *);
+  long pack(void *);
 
   // ---------------------------------------------------------------------
   // 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); }
 
   // ---------------------------------------------------------------------
 private:
@@ -1128,36 +1049,36 @@ private:
   Int32 args_num;
 };
 
-class SQLEXP_LIB_FUNC ExFunctionAESDecrypt : public ex_function_clause {
+class ExFunctionAESDecrypt : public ex_function_clause {
 public:
-  NA_EIDPROC ExFunctionAESDecrypt(OperatorTypeEnum oper_type,
+  ExFunctionAESDecrypt(OperatorTypeEnum oper_type,
                                   Attributes ** attr,
                                   Space *space,
                                   int args_num,
                                   Int32 aes_mode);
 
-  NA_EIDPROC ExFunctionAESDecrypt();
+  ExFunctionAESDecrypt();
 
-  NA_EIDPROC ex_expr::exp_return_type eval(char *op_data[], CollHeap*,
+  ex_expr::exp_return_type eval(char *op_data[], CollHeap*,
                                            ComDiagsArea ** = 0);
 
-  NA_EIDPROC long pack(void *);
+  long pack(void *);
 
   // ---------------------------------------------------------------------
   // 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); }
 
   // ---------------------------------------------------------------------
 private:
@@ -1165,37 +1086,37 @@ private:
   Int32 args_num;
 };
 
-class SQLEXP_LIB_FUNC  ExFunctionTokenStr : public ex_function_clause {
+class  ExFunctionTokenStr : public ex_function_clause {
 public:
-  NA_EIDPROC ExFunctionTokenStr(OperatorTypeEnum oper_type,
+  ExFunctionTokenStr(OperatorTypeEnum oper_type,
 				Attributes ** attr,
 				Space * space);
-  NA_EIDPROC ExFunctionTokenStr();
+  ExFunctionTokenStr();
 
 
-  NA_EIDPROC ex_expr::exp_return_type eval(char *op_data[], CollHeap*, 
+  ex_expr::exp_return_type eval(char *op_data[], CollHeap*, 
 					   ComDiagsArea** = 0);  
-  NA_EIDPROC Long pack(void *);
+  Long pack(void *);
   
   // ---------------------------------------------------------------------
   // 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); }
   // ---------------------------------------------------------------------
 };
 
-class SQLEXP_LIB_FUNC  ExFunctionReverseStr : public ex_function_clause {
+class  ExFunctionReverseStr : public ex_function_clause {
 public:
   ExFunctionReverseStr(OperatorTypeEnum oper_type,
 				Attributes ** attr,
@@ -1224,184 +1145,184 @@ public:
   // ---------------------------------------------------------------------
 };
 
-class SQLEXP_LIB_FUNC  ex_function_trim_doublebyte : public ex_function_trim {
+class  ex_function_trim_doublebyte : public ex_function_trim {
 public:
-  NA_EIDPROC ex_function_trim_doublebyte(OperatorTypeEnum oper_type,
+  ex_function_trim_doublebyte(OperatorTypeEnum oper_type,
                             Attributes ** attr,
                             Space * space, Int32 mode);
-  NA_EIDPROC ex_function_trim_doublebyte();
+  ex_function_trim_doublebyte();
 
 
-  NA_EIDPROC ex_expr::exp_return_type eval(char *op_data[], CollHeap*,
+  ex_expr::exp_return_type eval(char *op_data[], CollHeap*,
                                          ComDiagsArea** = 0);
-  NA_EIDPROC Long pack(void *);
+  Long pack(void *);
 
   // ---------------------------------------------------------------------
   // 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(3,getClassVersionID());
     ex_function_trim::populateImageVersionIDArray();
   }
 
-  NA_EIDPROC virtual short getClassSize() { return (short)sizeof(*this); }
+  virtual short getClassSize() { return (short)sizeof(*this); }
   // ---------------------------------------------------------------------
 };
 
-class SQLEXP_LIB_FUNC  ex_function_current : public ex_function_clause {
+class  ex_function_current : public ex_function_clause {
 public:
-  NA_EIDPROC ex_function_current(OperatorTypeEnum oper_type,
+  ex_function_current(OperatorTypeEnum oper_type,
 				 Attributes ** attr,
 				 Space * space);
-  NA_EIDPROC ex_function_current();
+  ex_function_current();
 
 
-  NA_EIDPROC ex_expr::exp_return_type eval(char *op_data[], CollHeap*, 
+  ex_expr::exp_return_type eval(char *op_data[], CollHeap*, 
 					   ComDiagsArea** = 0);
-  NA_EIDPROC Long pack(void *);
+  Long pack(void *);
 
   // ---------------------------------------------------------------------
   // 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); }
   // ---------------------------------------------------------------------
 };
 
 // ++ Triggers -
-class SQLEXP_LIB_FUNC ex_function_unique_execute_id : public ex_function_clause {
+class ex_function_unique_execute_id : public ex_function_clause {
 public:
-  NA_EIDPROC ex_function_unique_execute_id(OperatorTypeEnum oper_type,
+  ex_function_unique_execute_id(OperatorTypeEnum oper_type,
 				 Attributes ** attr,
 				 Space * space);
-  NA_EIDPROC ex_function_unique_execute_id();
+  ex_function_unique_execute_id();
   // this eval is dummy, the value is set in ex_root
-  NA_EIDPROC ex_expr::exp_return_type eval(char *op_data[], CollHeap*, 
+  ex_expr::exp_return_type eval(char *op_data[], CollHeap*, 
 					ComDiagsArea** = 0){ return ex_expr::EXPR_OK;};
-  NA_EIDPROC Long pack(void *);
+  Long pack(void *);
   
 };
 
 // ++ Triggers -
-class SQLEXP_LIB_FUNC ex_function_get_triggers_status : public ex_function_clause {
+class ex_function_get_triggers_status : public ex_function_clause {
 public:
-  NA_EIDPROC ex_function_get_triggers_status(OperatorTypeEnum oper_type,
+  ex_function_get_triggers_status(OperatorTypeEnum oper_type,
 				 Attributes ** attr,
 				 Space * space);
-  NA_EIDPROC ex_function_get_triggers_status();
+  ex_function_get_triggers_status();
   // this eval is dummy, the value is set in ex_root
-  NA_EIDPROC ex_expr::exp_return_type eval(char *op_data[], CollHeap*, 
+  ex_expr::exp_return_type eval(char *op_data[], CollHeap*, 
 					ComDiagsArea** = 0){ return ex_expr::EXPR_OK;};
-  NA_EIDPROC Long pack(void *);
+  Long pack(void *);
 };
 
 // ++ Triggers -
-class SQLEXP_LIB_FUNC ex_function_get_bit_value_at : public ex_function_clause {
+class ex_function_get_bit_value_at : public ex_function_clause {
 public:
-  NA_EIDPROC ex_function_get_bit_value_at(OperatorTypeEnum oper_type,
+  ex_function_get_bit_value_at(OperatorTypeEnum oper_type,
 				 Attributes ** attr,
 				 Space * space);
-  NA_EIDPROC ex_function_get_bit_value_at();
+  ex_function_get_bit_value_at();
   // this eval is dummy, the value is set in ex_root
-  NA_EIDPROC ex_expr::exp_return_type eval(char *op_data[], CollHeap*, 
+  ex_expr::exp_return_type eval(char *op_data[], CollHeap*, 
 					ComDiagsArea** = 0);
-  NA_EIDPROC Long pack(void *);
+  Long pack(void *);
 };
 
 // ++ MV
-class SQLEXP_LIB_FUNC ex_function_is_bitwise_and_true : public ex_function_clause {
+class ex_function_is_bitwise_and_true : public ex_function_clause {
 public:
-  NA_EIDPROC ex_function_is_bitwise_and_true(OperatorTypeEnum oper_type,
+  ex_function_is_bitwise_and_true(OperatorTypeEnum oper_type,
 				 Attributes ** attr,
 				 Space * space);
-  NA_EIDPROC ex_function_is_bitwise_and_true();
+  ex_function_is_bitwise_and_true();
   // this eval is dummy, the value is set in ex_root
-  NA_EIDPROC ex_expr::exp_return_type eval(char *op_data[], CollHeap*, 
+  ex_expr::exp_return_type eval(char *op_data[], CollHeap*, 
 					ComDiagsArea** = 0);
-  NA_EIDPROC Long pack(void *);
-  NA_EIDPROC virtual short getClassSize() { return (short)sizeof(*this); }
+  Long pack(void *);
+  virtual short getClassSize() { return (short)sizeof(*this); }
 
 };
 
-class SQLEXP_LIB_FUNC  ex_function_substring_doublebyte: public ex_function_clause {
+class  ex_function_substring_doublebyte: public ex_function_clause {
 public:
-  NA_EIDPROC ex_function_substring_doublebyte(OperatorTypeEnum oper_type,
+  ex_function_substring_doublebyte(OperatorTypeEnum oper_type,
                                  short num_operands,
                                  Attributes ** attr,
                                  Space * space);
-  NA_EIDPROC ex_function_substring_doublebyte();
+  ex_function_substring_doublebyte();
 
 
-  NA_EIDPROC ex_expr::exp_return_type eval(char *op_data[], CollHeap*,
+  ex_expr::exp_return_type eval(char *op_data[], CollHeap*,
                                          ComDiagsArea** = 0);
-  NA_EIDPROC Long pack(void *);
+  Long pack(void *);
 
   // ---------------------------------------------------------------------
   // 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); }
   // ---------------------------------------------------------------------
 };
 
-class SQLEXP_LIB_FUNC  ex_function_translate : public ex_function_clause {
+class  ex_function_translate : public ex_function_clause {
 
 public:
-  NA_EIDPROC ex_function_translate (OperatorTypeEnum oper_type,
+  ex_function_translate (OperatorTypeEnum oper_type,
                                     Attributes ** attr,
                                     Space * space,
                                     Int32 conv_type,
                                     Int16 flags);
-  NA_EIDPROC ex_function_translate () {};
+  ex_function_translate () {};
 
 
-  NA_EIDPROC ex_expr::exp_return_type eval(char *op_data[], CollHeap*,
+  ex_expr::exp_return_type eval(char *op_data[], CollHeap*,
                                            ComDiagsArea** = 0);
-  NA_EIDPROC Long pack(void *);
+  Long pack(void *);
 
-  NA_EIDPROC Int32 get_conv_type() { return conv_type_; };
+  Int32 get_conv_type() { return conv_type_; };
 
   // ---------------------------------------------------------------------
   // 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); }
 
   // flags:
   // 0x0001 set the CONV_ALLOW_INVALID_CODE_VALUE flag when converting
@@ -1427,18 +1348,18 @@ private:
 
 };
 
-class SQLEXP_LIB_FUNC  ex_function_encode : public ex_function_clause {
+class  ex_function_encode : public ex_function_clause {
 	       public:
 
   // Construction
   // 
-  NA_EIDPROC ex_function_encode();
-  NA_EIDPROC ex_function_encode(OperatorTypeEnum oper_type,
+  ex_function_encode();
+  ex_function_encode(OperatorTypeEnum oper_type,
 				Attributes ** attr,
 				Space * space,
 				short descFlag = 0);
 
-  NA_EIDPROC ex_function_encode(OperatorTypeEnum oper_type,
+  ex_function_encode(OperatorTypeEnum oper_type,
 				Attributes ** attr,
 				Space * space,
 				CharInfo::Collation collation = CharInfo::DefaultCollation,
@@ -1448,25 +1369,25 @@ class SQLEXP_LIB_FUNC  ex_function_encode : public ex_function_clause {
 
   // Null Semantics
   //
-  NA_EIDPROC Int32 isNullInNullOut() const { return 0; };
-  NA_EIDPROC Int32 isNullRelevant() const { return 1; };
-  NA_EIDPROC ex_expr::exp_return_type processNulls(char *op_data[], CollHeap*, 
+  Int32 isNullInNullOut() const { return 0; };
+  Int32 isNullRelevant() const { return 1; };
+  ex_expr::exp_return_type processNulls(char *op_data[], CollHeap*, 
 						   ComDiagsArea** = 0);
 
   // Execution
   //
-  NA_EIDPROC Int32 isEvalRelevant() const { return 1; };
-  NA_EIDPROC ex_expr::exp_return_type eval(char *op_data[], CollHeap*, 
+  Int32 isEvalRelevant() const { return 1; };
+  ex_expr::exp_return_type eval(char *op_data[], CollHeap*, 
 					   ComDiagsArea** = 0);
 
   // Fixup
   //
-  NA_EIDPROC Long pack(void *);
-  NA_EIDPROC ex_expr::exp_return_type pCodeGenerate(Space *space, UInt32 f);
+  Long pack(void *);
+  ex_expr::exp_return_type pCodeGenerate(Space *space, UInt32 f);
   
   // Helpers
   //
-  NA_EIDPROC static void encodeKeyValue(Attributes * attr, 
+  static void encodeKeyValue(Attributes * attr, 
 					const char *source,
 					const char *varlen_ptr,
 					char *target,
@@ -1478,7 +1399,7 @@ class SQLEXP_LIB_FUNC  ex_function_encode : public ex_function_clause {
 					CollationInfo::CollationType collType = CollationInfo::Sort);
 					
 
-  NA_EIDPROC static void encodeCollationKey(const UInt8 * src,
+  static void encodeCollationKey(const UInt8 * src,
 					    Int32 srcLength,
 					    UInt8 * encodedKey,
 					    const Int32 encodedKeyLength,
@@ -1486,7 +1407,7 @@ class SQLEXP_LIB_FUNC  ex_function_encode : public ex_function_clause {
 					    CharInfo::Collation  collation = CharInfo::DefaultCollation,
 					    NABoolean rmTSpaces = TRUE);
 
-  NA_EIDPROC static void encodeCollationSearchKey(
+  static void encodeCollationSearchKey(
 					    const UInt8 * src,
 					    Int32 srcLength,
 					    UInt8 * encodedKey,
@@ -1499,7 +1420,7 @@ class SQLEXP_LIB_FUNC  ex_function_encode : public ex_function_clause {
   ex_expr::exp_return_type evalDecode(char *op_data[],
 				      CollHeap* heap);
 
-  NA_EIDPROC static short decodeKeyValue(Attributes * attr, 
+  static short decodeKeyValue(Attributes * attr, 
 					 NABoolean isDesc,
 					 char *source,
 					 char *varlen_ptr,
@@ -1510,105 +1431,105 @@ class SQLEXP_LIB_FUNC  ex_function_encode : public ex_function_clause {
   // ---------------------------------------------------------------------
   // 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); }
   // ---------------------------------------------------------------------
 
-  NA_EIDPROC NABoolean isDesc()
+  NABoolean isDesc()
   {
     return ((flags_ & IS_DESC) != 0);
   };
 
-  NA_EIDPROC inline void setIsDesc(NABoolean v)
+  inline void setIsDesc(NABoolean v)
   {
     (v) ? flags_ |= IS_DESC: flags_ &= ~IS_DESC;
   };
 
-  NA_EIDPROC NABoolean caseInsensitive()
+  NABoolean caseInsensitive()
   {
     return ((flags_ & CASE_INSENSITIVE) != 0);
   };
 
-  NA_EIDPROC inline void setCaseInsensitive(NABoolean v)
+  inline void setCaseInsensitive(NABoolean v)
   {
     (v) ? flags_ |= CASE_INSENSITIVE: flags_ &= ~CASE_INSENSITIVE;
   };
 
-  NA_EIDPROC NABoolean regularNullability()
+  NABoolean regularNullability()
   {
     return ((flags_ & REGULAR_NULLABILITY) != 0);
   };
 
-  NA_EIDPROC inline void setRegularNullability(NABoolean v)
+  inline void setRegularNullability(NABoolean v)
   {
     (v) ? flags_ |= REGULAR_NULLABILITY: flags_ &= ~REGULAR_NULLABILITY;
   };
 
-  NA_EIDPROC NABoolean isDecode()
+  NABoolean isDecode()
   {
     return ((flags_ & IS_DECODE) != 0);
   };
 
-  NA_EIDPROC inline void setIsDecode(NABoolean v)
+  inline void setIsDecode(NABoolean v)
   {
     (v) ? flags_ |= IS_DECODE: flags_ &= ~IS_DECODE;
   };
 
 
-  NA_EIDPROC  static unsigned char getCollationWeight( 
+   static unsigned char getCollationWeight( 
                                                       CharInfo::Collation collation,
 						      Int16 pass,
 						      UInt16 chr) ;
 
-  NA_EIDPROC  static void getCollationWeight( 
+   static void getCollationWeight( 
 					CharInfo::Collation collation,
 					Int16 pass,
                                         UInt16 chr,
                                         UInt8 * weightStr,
                                         Int16 & weightStrLen);
 
-  NA_EIDPROC CollationInfo::CollationType getCollEncodingType() const
+  CollationInfo::CollationType getCollEncodingType() const
   {
     return (CollationInfo::CollationType)CollEncodingType_;
   };
 
-  NA_EIDPROC void setCollEncodingType(CollationInfo::CollationType v)
+  void setCollEncodingType(CollationInfo::CollationType v)
   {
     CollEncodingType_ = (UInt8)v;
   };
 
-  NA_EIDPROC CharInfo::Collation getCollation() const	
+  CharInfo::Collation getCollation() const	
   { 
     return (CharInfo::Collation) collation_; 
   }
 
-  NA_EIDPROC void setCollation(CharInfo::Collation v) 	
+  void setCollation(CharInfo::Collation v) 	
   { 
     collation_ = (Int16)v;; 
   }
 
 
-  NA_EIDPROC static Int16 getNumberOfDigraphs(CharInfo::Collation collation);	
+  static Int16 getNumberOfDigraphs(CharInfo::Collation collation);	
 
-  NA_EIDPROC static UInt8 * getDigraph(const CharInfo::Collation collation, const Int32 digraphNum);	
+  static UInt8 * getDigraph(const CharInfo::Collation collation, const Int32 digraphNum);	
 
-  NA_EIDPROC static Int16 getDigraphIndex(const CharInfo::Collation collation, const Int32 digraphNum);	
+  static Int16 getDigraphIndex(const CharInfo::Collation collation, const Int32 digraphNum);	
   
-  NA_EIDPROC static NABoolean getRmTSpaces(const CharInfo::Collation collation);
+  static NABoolean getRmTSpaces(const CharInfo::Collation collation);
 
-  NA_EIDPROC static NABoolean getNumberOfChars(const CharInfo::Collation collation);
+  static NABoolean getNumberOfChars(const CharInfo::Collation collation);
 
-  NA_EIDPROC static NABoolean isOneToOneCollation(const CharInfo::Collation collation);
+  static NABoolean isOneToOneCollation(const CharInfo::Collation collation);
 
 private:
   enum
@@ -1645,7 +1566,7 @@ private:
 //          char *sortBuffer2 - buffer to hold encoded Collation Key 2
 // NOTE:    sortBuffer1 & sortBuffer2 MUST BE preallocated and big enough.
 // ---------------------------------------------------------------------
-// NOTE: No need to use NA_EIDPROC ... maybe in the future?
+// NOTE: No need to use ... maybe in the future?
 static Int32 Collated_cmp(char *string1, char *string2, Int32 length,
                  CharInfo::Collation Collation,
                  char *sortBuffer1, char *sortBuffer2)
@@ -2019,49 +1940,49 @@ static const CollationParams collParams[3]=
 
 };
 //-- Czech collation info END
-class SQLEXP_LIB_FUNC  ex_function_explode_varchar : public ex_function_clause {
+class  ex_function_explode_varchar : public ex_function_clause {
 public:
-  NA_EIDPROC ex_function_explode_varchar(OperatorTypeEnum oper_type,
+  ex_function_explode_varchar(OperatorTypeEnum oper_type,
 					 short num_operands,
 					 Attributes ** attr,
 					 Space * space,
 					 NABoolean forInsert);
 
-  NA_EIDPROC ex_function_explode_varchar();
+  ex_function_explode_varchar();
 
 
   // Null Semantics
   //
-  NA_EIDPROC Int32 isNullInNullOut() const { return 0; };
-  NA_EIDPROC Int32 isNullRelevant() const { return 1; };
+  Int32 isNullInNullOut() const { return 0; };
+  Int32 isNullRelevant() const { return 1; };
 
   // Execution
   //
-  NA_EIDPROC Int32 isEvalRelevant() const { return 1; };
+  Int32 isEvalRelevant() const { return 1; };
 
-  NA_EIDPROC ex_expr::exp_return_type eval(char *op_data[], CollHeap*, 
+  ex_expr::exp_return_type eval(char *op_data[], CollHeap*, 
 					   ComDiagsArea** = 0);  
-  NA_EIDPROC Long pack(void *);
+  Long pack(void *);
   
-  NA_EIDPROC virtual ex_expr::exp_return_type processNulls(char *op_data[],
+  virtual ex_expr::exp_return_type processNulls(char *op_data[],
 							   CollHeap * = 0,
 							   ComDiagsArea ** = 0);
 
   // ---------------------------------------------------------------------
   // 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); }
   // ---------------------------------------------------------------------
 
 private:
@@ -2075,36 +1996,36 @@ private:
 
 };
 
-class SQLEXP_LIB_FUNC  ex_function_hash : public ex_function_clause {
+class  ex_function_hash : public ex_function_clause {
 public:
-  NA_EIDPROC ex_function_hash(OperatorTypeEnum oper_type,
+  ex_function_hash(OperatorTypeEnum oper_type,
 			      Attributes ** attr,
 			      Space * space);
-  NA_EIDPROC ex_function_hash();
+  ex_function_hash();
 
 
-  NA_EIDPROC Int32 isNullInNullOut() const { return 0; };
-  NA_EIDPROC Int32 isNullRelevant() const { return 0; };
-  NA_EIDPROC ex_expr::exp_return_type eval(char *op_data[], CollHeap*, 
+  Int32 isNullInNullOut() const { return 0; };
+  Int32 isNullRelevant() const { return 0; };
+  ex_expr::exp_return_type eval(char *op_data[], CollHeap*, 
 					   ComDiagsArea** = 0);
-  NA_EIDPROC Long pack(void *);
-  NA_EIDPROC ex_expr::exp_return_type pCodeGenerate(Space *space, UInt32 f);
+  Long pack(void *);
+  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); }
   // ---------------------------------------------------------------------
   
 private:
@@ -2114,38 +2035,38 @@ private:
   // that the size of the object remains the same (and is modulo 8).
   // ---------------------------------------------------------------------
   char          fillers_[8];                // 00-07
-  NA_EIDPROC ULng32 HashHash(ULng32 inValue);
+  ULng32 HashHash(ULng32 inValue);
 
 };
 
-class SQLEXP_LIB_FUNC  ex_function_hivehash : public ex_function_clause {
+class  ex_function_hivehash : public ex_function_clause {
 public:
-  NA_EIDPROC ex_function_hivehash(OperatorTypeEnum oper_type,
+  ex_function_hivehash(OperatorTypeEnum oper_type,
 			      Attributes ** attr,
 			      Space * space);
-  NA_EIDPROC ex_function_hivehash();
+  ex_function_hivehash();
 
 
-  NA_EIDPROC ex_expr::exp_return_type eval(char *op_data[], CollHeap*, 
+  ex_expr::exp_return_type eval(char *op_data[], CollHeap*, 
 					   ComDiagsArea** = 0);
-  NA_EIDPROC Long pack(void *);
-  NA_EIDPROC ex_expr::exp_return_type pCodeGenerate(Space *space, UInt32 f)
+  Long pack(void *);
+  ex_expr::exp_return_type pCodeGenerate(Space *space, UInt32 f)
     { return ex_clause::pCodeGenerate(space, f); };
 
-  NA_EIDPROC virtual unsigned char getClassVersionID() { return 1; }
+  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); }
   
 protected:
 
-  NA_EIDPROC virtual Lng32 hashForCharType(char*, Lng32);
+  virtual Lng32 hashForCharType(char*, Lng32);
 
 
 private:
@@ -2153,61 +2074,61 @@ private:
 
 };
 
-class SQLEXP_LIB_FUNC ExHashComb : public ex_function_clause {
+class ExHashComb : public ex_function_clause {
 public:
-  NA_EIDPROC ExHashComb(OperatorTypeEnum oper_type,
+  ExHashComb(OperatorTypeEnum oper_type,
                         Attributes ** attr,
                         Space * space);
-  NA_EIDPROC ExHashComb();
+  ExHashComb();
 
 
-  NA_EIDPROC ex_expr::exp_return_type eval(char *op_data[], CollHeap*, 
+  ex_expr::exp_return_type eval(char *op_data[], CollHeap*, 
 					   ComDiagsArea** = 0);
-  NA_EIDPROC Long pack(void *);
-  NA_EIDPROC ex_expr::exp_return_type pCodeGenerate(Space *space, UInt32 f);
+  Long pack(void *);
+  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); }
   // ---------------------------------------------------------------------
 };
 
-class SQLEXP_LIB_FUNC ExHiveHashComb : public ex_function_clause {
+class ExHiveHashComb : public ex_function_clause {
 public:
-  NA_EIDPROC ExHiveHashComb(OperatorTypeEnum oper_type,
+  ExHiveHashComb(OperatorTypeEnum oper_type,
                         Attributes ** attr,
                         Space * space);
-  NA_EIDPROC ExHiveHashComb();
+  ExHiveHashComb();
 
 
-  NA_EIDPROC virtual unsigned char getClassVersionID() { return 1; }
+  virtual unsigned char getClassVersionID() { return 1; }
 
-  NA_EIDPROC virtual void populateImageVersionIDArray()
+  virtual void populateImageVersionIDArray()
   {
     setImageVersionID(2,getClassVersionID());
     ex_function_clause::populateImageVersionIDArray();
   }
 
 
-  NA_EIDPROC ex_expr::exp_return_type eval(char *op_data[], CollHeap*, 
+  ex_expr::exp_return_type eval(char *op_data[], CollHeap*, 
 					   ComDiagsArea** = 0);
-  NA_EIDPROC Long pack(void *);
-  NA_EIDPROC ex_expr::exp_return_type pCodeGenerate(Space *space, UInt32 f)
+  Long pack(void *);
+  ex_expr::exp_return_type pCodeGenerate(Space *space, UInt32 f)
     { return ex_clause::pCodeGenerate(space, f); };
 
-  NA_EIDPROC virtual short getClassSize() { return (short)sizeof(*this); }
+  virtual short getClassSize() { return (short)sizeof(*this); }
   // ---------------------------------------------------------------------
 };
 
@@ -2292,12 +2213,12 @@ static const ULng32 randomHashValues[256] = {
 // change once Hash Partitioning is released!  Defined for all data
 // types, returns a 32 bit non-nullable hash value for the data item.
 //
-class SQLEXP_LIB_FUNC ExHDPHash : public ex_function_clause {
+class ExHDPHash : public ex_function_clause {
 public:
-  NA_EIDPROC ExHDPHash(OperatorTypeEnum oper_type,
+  ExHDPHash(OperatorTypeEnum oper_type,
                        Attributes ** attr,
                        Space * space);
-  NA_EIDPROC ExHDPHash();
+  ExHDPHash();
 
 
   enum
@@ -2311,16 +2232,16 @@ public:
   };
 
 
-  NA_EIDPROC Int32 isNullInNullOut() const { return 0; };
-  NA_EIDPROC Int32 isNullRelevant() const { return 0; };
-  NA_EIDPROC ex_expr::exp_return_type eval(char *op_data[], CollHeap*, 
+  Int32 isNullInNullOut() const { return 0; };
+  Int32 isNullRelevant() const { return 0; };
+  ex_expr::exp_return_type eval(char *op_data[], CollHeap*, 
 					   ComDiagsArea** = 0);
-  NA_EIDPROC Long pack(void *);
-  NA_EIDPROC ex_expr::exp_return_type pCodeGenerate(Space *space, UInt32 f);
+  Long pack(void *);
+  ex_expr::exp_return_type pCodeGenerate(Space *space, UInt32 f);
 
-  NA_EIDPROC static ULng32 hash(const char *data, UInt32 flags, Int32 length);
+  static ULng32 hash(const char *data, UInt32 flags, Int32 length);
 
-  NA_EIDPROC static UInt64 hashP(const unsigned char *src1,
+  static UInt64 hashP(const unsigned char *src1,
                                              const unsigned char *src2,
                                              Int32 len1, Int32 len2)
   {
@@ -2347,7 +2268,7 @@ public:
   }
 
   // Hash an 8 byte long key
-  NA_EIDPROC static ULng32 hash8(const char *data, UInt32 flags)
+  static ULng32 hash8(const char *data, UInt32 flags)
   {
     unsigned char *valp = (unsigned char *)data;
     ULng32 hashValue = 0;
@@ -2400,7 +2321,7 @@ public:
   }
   
   // Hash a 4-byte long key
-  NA_EIDPROC static ULng32 hash4(const char *data, UInt32 flags)
+  static ULng32 hash4(const char *data, UInt32 flags)
   {
     unsigned char *valp = (unsigned char *)data;
     ULng32 hashValue = 0;
@@ -2440,7 +2361,7 @@ public:
   }
   
   // Hash a 2-byte long key
-  NA_EIDPROC static ULng32 hash2(const char *data, UInt32 flags)
+  static ULng32 hash2(const char *data, UInt32 flags)
   {
     unsigned char *valp = (unsigned char *)data;
     ULng32 hashValue = 0;
@@ -2469,18 +2390,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());
     ex_function_clause::populateImageVersionIDArray();
   }
 
-  NA_EIDPROC virtual short getClassSize() { return (short)sizeof(*this); }
+  virtual short getClassSize() { return (short)sizeof(*this); }
   // ---------------------------------------------------------------------
   
   static const UInt32 nullHashValue = 666654765;
@@ -2498,70 +2419,70 @@ private:
 // once Hash Partitioning is released!  Defined for all data types,
 // returns a 32 bit non-nullable hash value for the data item.
 //
-class SQLEXP_LIB_FUNC ExHDPHashComb : public ex_function_clause {
+class ExHDPHashComb : public ex_function_clause {
 public:
-  NA_EIDPROC ExHDPHashComb(OperatorTypeEnum oper_type,
+  ExHDPHashComb(OperatorTypeEnum oper_type,
                            Attributes ** attr,
                            Space * space);
-  NA_EIDPROC ExHDPHashComb();
+  ExHDPHashComb();
 
 
-  NA_EIDPROC ex_expr::exp_return_type pCodeGenerate(Space *space, UInt32 f);
+  ex_expr::exp_return_type pCodeGenerate(Space *space, UInt32 f);
 
-  NA_EIDPROC ex_expr::exp_return_type eval(char *op_data[], CollHeap*, 
+  ex_expr::exp_return_type eval(char *op_data[], CollHeap*, 
 					   ComDiagsArea** = 0);
-  NA_EIDPROC Long pack(void *);
+  Long pack(void *);
 
   // ---------------------------------------------------------------------
   // 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); }
   // ---------------------------------------------------------------------
 };
 
-class SQLEXP_LIB_FUNC  ex_function_replace_null : public ex_function_clause {
+class  ex_function_replace_null : public ex_function_clause {
 public:
-  NA_EIDPROC ex_function_replace_null(OperatorTypeEnum oper_type,
+  ex_function_replace_null(OperatorTypeEnum oper_type,
 				      Attributes ** attr,
 				      Space * space);
-  NA_EIDPROC ex_function_replace_null();
+  ex_function_replace_null();
 
 
-  NA_EIDPROC Int32 isNullInNullOut() const { return 0; };
-  NA_EIDPROC Int32 isNullRelevant() const { return 0; };
-  NA_EIDPROC ex_expr::exp_return_type eval(char *op_data[], CollHeap*, 
+  Int32 isNullInNullOut() const { return 0; };
+  Int32 isNullRelevant() const { return 0; };
+  ex_expr::exp_return_type eval(char *op_data[], CollHeap*, 
 					   ComDiagsArea** = 0);
-  NA_EIDPROC ex_expr::exp_return_type processNulls(char *op_data[], CollHeap*,
+  ex_expr::exp_return_type processNulls(char *op_data[], CollHeap*,
                                                    ComDiagsArea** = 0);
-  NA_EIDPROC Long pack(void *);
-  NA_EIDPROC ex_expr::exp_return_type pCodeGenerate(Space *space, UInt32 f);
+  Long pack(void *);
+  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); }
   // ---------------------------------------------------------------------
   
 private:
@@ -2574,189 +2495,189 @@ private:
 
 };
 
-class SQLEXP_LIB_FUNC  ex_function_mod : public ex_function_clause {
+class  ex_function_mod : public ex_function_clause {
 public:
-  NA_EIDPROC ex_function_mod(OperatorTypeEnum oper_type,
+  ex_function_mod(OperatorTypeEnum oper_type,
 			     Attributes ** attr,
 			     Space * space);
-  NA_EIDPROC ex_function_mod();
+  ex_function_mod();
 
 
-  NA_EIDPROC ex_expr::exp_return_type eval(char *op_data[], CollHeap*, 
+  ex_expr::exp_return_type eval(char *op_data[], CollHeap*, 
 					   ComDiagsArea** = 0);
-  NA_EIDPROC Long pack(void *);
-  NA_EIDPROC ex_expr::exp_return_type pCodeGenerate(Space *space, UInt32 f);
+  Long pack(void *);
+  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); }
   // ---------------------------------------------------------------------
 };
 
-class SQLEXP_LIB_FUNC  ex_function_mask : public ex_function_clause {
+class  ex_function_mask : public ex_function_clause {
 public:
-  NA_EIDPROC ex_function_mask(OperatorTypeEnum oper_type,
+  ex_function_mask(OperatorTypeEnum oper_type,
                               Attributes ** attr,
                               Space * space);
-  NA_EIDPROC ex_function_mask();
+  ex_function_mask();
 
 
-  NA_EIDPROC ex_expr::exp_return_type eval(char *op_data[], CollHeap*, 
+  ex_expr::exp_return_type eval(char *op_data[], CollHeap*, 
 					   ComDiagsArea** = 0);
-  NA_EIDPROC Long pack(void *);
-//  NA_EIDPROC ex_expr::exp_return_type pCodeGenerate(Space *space, UInt32 f);
+  Long pack(void *);
+//  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); }
   // ---------------------------------------------------------------------
 };
 
-class SQLEXP_LIB_FUNC  ExFunctionShift : public ex_function_clause {
+class  ExFunctionShift : public ex_function_clause {
 public:
-  NA_EIDPROC ExFunctionShift(OperatorTypeEnum oper_type,
+  ExFunctionShift(OperatorTypeEnum oper_type,
                              Attributes ** attr,
                              Space * space);
-  NA_EIDPROC ExFunctionShift();
+  ExFunctionShift();
 
 
-  NA_EIDPROC ex_expr::exp_return_type eval(char *op_data[], CollHeap*, 
+  ex_expr::exp_return_type eval(char *op_data[], CollHeap*, 
 					   ComDiagsArea** = 0);
-  NA_EIDPROC Long pack(void *);
-//  NA_EIDPROC ex_expr::exp_return_type pCodeGenerate(Space *space, UInt32 f);
+  Long pack(void *);
+//  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); }
   // ---------------------------------------------------------------------
 };
 
-class SQLEXP_LIB_FUNC  ex_function_bool : public ex_function_clause {
+class  ex_function_bool : public ex_function_clause {
 public:
-  NA_EIDPROC ex_function_bool(OperatorTypeEnum oper_type,
+  ex_function_bool(OperatorTypeEnum oper_type,
 			      Attributes ** attr,
 			      Space * space);
-  NA_EIDPROC ex_function_bool() {}
+  ex_function_bool() {}
 
 
-  NA_EIDPROC ex_expr::exp_return_type eval(char *op_data[], CollHeap*, 
+  ex_expr::exp_return_type eval(char *op_data[], CollHeap*, 
 					   ComDiagsArea** = 0);
-  NA_EIDPROC ex_expr::exp_return_type pCodeGenerate(Space *space, UInt32 f);
+  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); }
   // ---------------------------------------------------------------------
 };
 
-class SQLEXP_LIB_FUNC  ex_function_converttimestamp : public ex_function_clause {
+class  ex_function_converttimestamp : public ex_function_clause {
 public:
-  NA_EIDPROC ex_function_converttimestamp(OperatorTypeEnum oper_type,
+  ex_function_converttimestamp(OperatorTypeEnum oper_type,
 					  Attributes ** attr, 
 					  Space * space);
-  NA_EIDPROC ex_function_converttimestamp();
+  ex_function_converttimestamp();
 
 
-  NA_EIDPROC ex_expr::exp_return_type eval(char *op_data[], CollHeap*, 
+  ex_expr::exp_return_type eval(char *op_data[], CollHeap*, 
 					   ComDiagsArea** = 0);  
-  NA_EIDPROC Long pack(void *);
+  Long pack(void *);
   
   // ---------------------------------------------------------------------
   // 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_claus

<TRUNCATED>