trafodion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ansha...@apache.org
Subject [01/30] incubator-trafodion git commit: TRAFODION-2731 CodeCleanup: Remove obsolete, legacy and unused code
Date Thu, 07 Sep 2017 01:54:55 GMT
Repository: incubator-trafodion
Updated Branches:
  refs/heads/master 19119e749 -> b62e57701


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/regress/seabase/EXPECTED011
----------------------------------------------------------------------
diff --git a/core/sql/regress/seabase/EXPECTED011 b/core/sql/regress/seabase/EXPECTED011
index bd28f64..c8ed78f 100644
--- a/core/sql/regress/seabase/EXPECTED011
+++ b/core/sql/regress/seabase/EXPECTED011
@@ -7,7 +7,7 @@
 >>invoke T011T1;
 
 -- Definition of Trafodion table TRAFODION.SCH.T011T1
--- Definition current  Fri Feb 17 17:11:37 2017
+-- Definition current  Sun Sep  3 07:21:45 2017
 
   (
     A                                INT NO DEFAULT NOT NULL NOT DROPPABLE
@@ -143,7 +143,7 @@ A            B
 ------------------------------------------------------------------ PLAN SUMMARY
 MODULE_NAME .............. DYNAMICALLY COMPILED
 STATEMENT_NAME ........... NOT NAMED
-PLAN_ID .................. 212354111499137048
+PLAN_ID .................. 212371183306853153
 ROWS_OUT ................. 7
 EST_TOTAL_COST ........... 0.01
 STATEMENT ................ select * from t011t1 where a >= 3 and a < 5;
@@ -160,7 +160,6 @@ DESCRIPTION
   fragment_id ............ 0
   parent_frag ............ (none)
   fragment_type .......... master
-  statement_index ........ 0
   affinity_value ......... 0
   max_max_cardinality ... 11
   total_overflow_size .... 0.00 KB
@@ -182,7 +181,7 @@ DESCRIPTION
   QUERY_CACHE ............ 0
   TRAF_ALIGNED_ROW_FORMAT  OFF
   GENERATE_EXPLAIN ....... ON
-  ObjectUIDs ............. 1451969908907031756
+  ObjectUIDs ............. 931258273795435832
   select_list ............ TRAFODION.SCH.T011T1.A, TRAFODION.SCH.T011T1.B
 
 
@@ -1275,7 +1274,7 @@ METRIC_TEXT_TABLE
 >>invoke trafodion."_REPOS_".metric_query_table;
 
 -- Definition of Trafodion table TRAFODION."_REPOS_".METRIC_QUERY_TABLE
--- Definition current  Fri Feb 17 17:13:41 2017
+-- Definition current  Sun Sep  3 07:23:51 2017
 
   (
     INSTANCE_ID                      INT UNSIGNED NO DEFAULT NOT NULL NOT
@@ -1463,7 +1462,7 @@ METRIC_TEXT_TABLE
 >>-- get qid for the prepared stmt
 >>get qid for statement explstmt;
 
-MXID11000018963212354111473302000000000000206U3333300_2378_EXPLSTMT
+MXID11000001654212371183276408861000000000206U3333300_2289_EXPLSTMT
 
 --- SQL operation complete.
 >>
@@ -1515,7 +1514,7 @@ SEQ_NUM      OPERATOR
 --- SQL command prepared.
 >>get qid for statement explstmt2;
 
-MXID11000018963212354111473302000000000000206U3333300_2389_EXPLSTMT2
+MXID11000001654212371183276408861000000000206U3333300_2300_EXPLSTMT2
 
 --- SQL operation complete.
 >>set qid MXID123456 for explstmt2;

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/regress/seabase/EXPECTED016
----------------------------------------------------------------------
diff --git a/core/sql/regress/seabase/EXPECTED016 b/core/sql/regress/seabase/EXPECTED016
index ca81ae2..440832a 100644
--- a/core/sql/regress/seabase/EXPECTED016
+++ b/core/sql/regress/seabase/EXPECTED016
@@ -179,9 +179,9 @@ LC   RC   OP   OPERATOR              OPT       DESCRIPTION           CARD
 ------------------------------------------------------------------ PLAN SUMMARY
 MODULE_NAME .............. DYNAMICALLY COMPILED
 STATEMENT_NAME ........... ST1
-PLAN_ID .................. 212341125600218829
+PLAN_ID .................. 212371184195273823
 ROWS_OUT ................. 1
-EST_TOTAL_COST ......... 553.48
+EST_TOTAL_COST ......... 553.72
 STATEMENT ................ select f,count(f)
                            from mcStatPart7 <<+ cardinality 10e8 >>
                            group by f;
@@ -192,13 +192,12 @@ ROOT ======================================  SEQ_NO 5        ONLY CHILD 4
 REQUESTS_IN .............. 1
 ROWS_OUT ................. 1
 EST_OPER_COST ............ 0
-EST_TOTAL_COST ......... 553.48
+EST_TOTAL_COST ......... 553.72
 DESCRIPTION
   max_card_est ........... 1
   fragment_id ............ 0
   parent_frag ............ (none)
   fragment_type .......... master
-  statement_index ........ 0
   affinity_value ......... 0
   max_max_cardinal  1,000,000,000
   total_overflow_size .... 0.00 KB
@@ -224,7 +223,7 @@ DESCRIPTION
   HBASE_MIN_BYTES_PER_ESP  1
   USTAT_COLLECT_MC_SKEW_V  ON
   PARALLEL_NUM_ESPS ...... 4
-  ObjectUIDs ............. 4615735661077609573
+  ObjectUIDs ............. 8472535850543409395
   select_list ............ TRAFODION.HBASE.MCSTATPART7.F,
                              cast(sum(count_nonull(TRAFODION.HBASE.MCSTATPART7.
                              F)))
@@ -234,7 +233,7 @@ HASH_PARTIAL_GROUPBY_ROOT =================  SEQ_NO 4        ONLY CHILD 3
 REQUESTS_IN .............. 1
 ROWS_OUT ................. 1
 EST_OPER_COST ............ 0.01
-EST_TOTAL_COST ......... 553.48
+EST_TOTAL_COST ......... 553.72
 DESCRIPTION
   memory_quota ........... 1200 MB
   max_card_est ........... 1
@@ -249,7 +248,7 @@ ESP_EXCHANGE ==============================  SEQ_NO 3        ONLY CHILD 2
 REQUESTS_IN .............. 1
 ROWS_OUT ................. 1
 EST_OPER_COST ............ 0.01
-EST_TOTAL_COST ......... 553.48
+EST_TOTAL_COST ......... 553.72
 DESCRIPTION
   max_card_est ........... 1
   fragment_id ............ 2
@@ -267,8 +266,8 @@ DESCRIPTION
 HASH_PARTIAL_GROUPBY_LEAF =================  SEQ_NO 2        ONLY CHILD 1
 REQUESTS_IN .............. 1
 ROWS_OUT ................. 1
-EST_OPER_COST ............ 4.98
-EST_TOTAL_COST ......... 553.48
+EST_OPER_COST ............ 5.22
+EST_TOTAL_COST ......... 553.72
 DESCRIPTION
   max_card_est ........... 1
   fragment_id ............ 2
@@ -325,9 +324,9 @@ LC   RC   OP   OPERATOR              OPT       DESCRIPTION           CARD
 ------------------------------------------------------------------ PLAN SUMMARY
 MODULE_NAME .............. DYNAMICALLY COMPILED
 STATEMENT_NAME ........... ST1
-PLAN_ID .................. 212341125600682569
+PLAN_ID .................. 212371184195982638
 ROWS_OUT ................. 1
-EST_TOTAL_COST ......... 568.59
+EST_TOTAL_COST ......... 568.72
 STATEMENT ................ select f,count(f)
                            from mcStatPart5 <<+ cardinality 10e8 >>
                            group by f;
@@ -338,13 +337,12 @@ ROOT ======================================  SEQ_NO 5        ONLY CHILD 4
 REQUESTS_IN .............. 1
 ROWS_OUT ................. 1
 EST_OPER_COST ............ 0
-EST_TOTAL_COST ......... 568.59
+EST_TOTAL_COST ......... 568.72
 DESCRIPTION
   max_card_est ........... 1
   fragment_id ............ 0
   parent_frag ............ (none)
   fragment_type .......... master
-  statement_index ........ 0
   affinity_value ......... 0
   max_max_cardinal  1,000,000,000
   total_overflow_size .... 0.00 KB
@@ -370,7 +368,7 @@ DESCRIPTION
   HBASE_MIN_BYTES_PER_ESP  1
   USTAT_COLLECT_MC_SKEW_V  ON
   PARALLEL_NUM_ESPS ...... 4
-  ObjectUIDs ............. 4615735661077611408
+  ObjectUIDs ............. 8472535850543411300
   select_list ............ TRAFODION.HBASE.MCSTATPART5.F,
                              cast(sum(count_nonull(TRAFODION.HBASE.MCSTATPART5.
                              F)))
@@ -380,7 +378,7 @@ HASH_PARTIAL_GROUPBY_ROOT =================  SEQ_NO 4        ONLY CHILD 3
 REQUESTS_IN .............. 1
 ROWS_OUT ................. 1
 EST_OPER_COST ............ 0.01
-EST_TOTAL_COST ......... 568.59
+EST_TOTAL_COST ......... 568.72
 DESCRIPTION
   memory_quota ........... 1200 MB
   max_card_est ........... 1
@@ -395,7 +393,7 @@ ESP_EXCHANGE ==============================  SEQ_NO 3        ONLY CHILD 2
 REQUESTS_IN .............. 1
 ROWS_OUT ................. 1
 EST_OPER_COST ............ 0.01
-EST_TOTAL_COST ......... 568.59
+EST_TOTAL_COST ......... 568.72
 DESCRIPTION
   max_card_est ........... 1
   fragment_id ............ 2
@@ -413,8 +411,8 @@ DESCRIPTION
 HASH_PARTIAL_GROUPBY_LEAF =================  SEQ_NO 2        ONLY CHILD 1
 REQUESTS_IN .............. 1
 ROWS_OUT ................. 1
-EST_OPER_COST ............ 4.98
-EST_TOTAL_COST ......... 568.59
+EST_OPER_COST ............ 5.1
+EST_TOTAL_COST ......... 568.72
 DESCRIPTION
   max_card_est ........... 1
   fragment_id ............ 2
@@ -471,9 +469,9 @@ LC   RC   OP   OPERATOR              OPT       DESCRIPTION           CARD
 ------------------------------------------------------------------ PLAN SUMMARY
 MODULE_NAME .............. DYNAMICALLY COMPILED
 STATEMENT_NAME ........... ST1
-PLAN_ID .................. 212341125601113093
+PLAN_ID .................. 212371184196719364
 ROWS_OUT ................. 1
-EST_TOTAL_COST ......... 553.48
+EST_TOTAL_COST ......... 553.66
 STATEMENT ................ select f,count(f)
                            from mcStatPart3 <<+ cardinality 10e8 >>
                            group by f;
@@ -484,13 +482,12 @@ ROOT ======================================  SEQ_NO 5        ONLY CHILD 4
 REQUESTS_IN .............. 1
 ROWS_OUT ................. 1
 EST_OPER_COST ............ 0
-EST_TOTAL_COST ......... 553.48
+EST_TOTAL_COST ......... 553.66
 DESCRIPTION
   max_card_est ........... 1
   fragment_id ............ 0
   parent_frag ............ (none)
   fragment_type .......... master
-  statement_index ........ 0
   affinity_value ......... 0
   max_max_cardinal  1,000,000,000
   total_overflow_size .... 0.00 KB
@@ -516,7 +513,7 @@ DESCRIPTION
   HBASE_MIN_BYTES_PER_ESP  1
   USTAT_COLLECT_MC_SKEW_V  ON
   PARALLEL_NUM_ESPS ...... 4
-  ObjectUIDs ............. 4615735661077612835
+  ObjectUIDs ............. 8472535850543413146
   select_list ............ TRAFODION.HBASE.MCSTATPART3.F,
                              cast(sum(count_nonull(TRAFODION.HBASE.MCSTATPART3.
                              F)))
@@ -526,7 +523,7 @@ HASH_PARTIAL_GROUPBY_ROOT =================  SEQ_NO 4        ONLY CHILD 3
 REQUESTS_IN .............. 1
 ROWS_OUT ................. 1
 EST_OPER_COST ............ 0.01
-EST_TOTAL_COST ......... 553.48
+EST_TOTAL_COST ......... 553.66
 DESCRIPTION
   memory_quota ........... 1200 MB
   max_card_est ........... 1
@@ -541,7 +538,7 @@ ESP_EXCHANGE ==============================  SEQ_NO 3        ONLY CHILD 2
 REQUESTS_IN .............. 1
 ROWS_OUT ................. 1
 EST_OPER_COST ............ 0.01
-EST_TOTAL_COST ......... 553.48
+EST_TOTAL_COST ......... 553.66
 DESCRIPTION
   max_card_est ........... 1
   fragment_id ............ 2
@@ -559,8 +556,8 @@ DESCRIPTION
 HASH_PARTIAL_GROUPBY_LEAF =================  SEQ_NO 2        ONLY CHILD 1
 REQUESTS_IN .............. 1
 ROWS_OUT ................. 1
-EST_OPER_COST ............ 4.98
-EST_TOTAL_COST ......... 553.48
+EST_OPER_COST ............ 5.16
+EST_TOTAL_COST ......... 553.66
 DESCRIPTION
   max_card_est ........... 1
   fragment_id ............ 2
@@ -617,9 +614,9 @@ LC   RC   OP   OPERATOR              OPT       DESCRIPTION           CARD
 ------------------------------------------------------------------ PLAN SUMMARY
 MODULE_NAME .............. DYNAMICALLY COMPILED
 STATEMENT_NAME ........... ST1
-PLAN_ID .................. 212341125601513932
+PLAN_ID .................. 212371184197447093
 ROWS_OUT ................. 1
-EST_TOTAL_COST ......... 523.92
+EST_TOTAL_COST ......... 524.1
 STATEMENT ................ select f,count(f)
                            from mcStatPart6 <<+ cardinality 10e8 >>
                            group by f;
@@ -630,13 +627,12 @@ ROOT ======================================  SEQ_NO 5        ONLY CHILD 4
 REQUESTS_IN .............. 1
 ROWS_OUT ................. 1
 EST_OPER_COST ............ 0
-EST_TOTAL_COST ......... 523.92
+EST_TOTAL_COST ......... 524.1
 DESCRIPTION
   max_card_est ........... 1
   fragment_id ............ 0
   parent_frag ............ (none)
   fragment_type .......... master
-  statement_index ........ 0
   affinity_value ......... 0
   max_max_cardinal  1,000,000,000
   total_overflow_size .... 0.00 KB
@@ -662,7 +658,7 @@ DESCRIPTION
   HBASE_MIN_BYTES_PER_ESP  1
   USTAT_COLLECT_MC_SKEW_V  ON
   PARALLEL_NUM_ESPS ...... 4
-  ObjectUIDs ............. 4615735661077614228
+  ObjectUIDs ............. 8472535850543414693
   select_list ............ TRAFODION.HBASE.MCSTATPART6.F,
                              cast(sum(count_nonull(TRAFODION.HBASE.MCSTATPART6.
                              F)))
@@ -672,7 +668,7 @@ HASH_PARTIAL_GROUPBY_ROOT =================  SEQ_NO 4        ONLY CHILD 3
 REQUESTS_IN .............. 1
 ROWS_OUT ................. 1
 EST_OPER_COST ............ 0.01
-EST_TOTAL_COST ......... 523.92
+EST_TOTAL_COST ......... 524.1
 DESCRIPTION
   memory_quota ........... 1200 MB
   max_card_est ........... 1
@@ -687,7 +683,7 @@ ESP_EXCHANGE ==============================  SEQ_NO 3        ONLY CHILD 2
 REQUESTS_IN .............. 1
 ROWS_OUT ................. 1
 EST_OPER_COST ............ 0.01
-EST_TOTAL_COST ......... 523.92
+EST_TOTAL_COST ......... 524.1
 DESCRIPTION
   max_card_est ........... 1
   fragment_id ............ 2
@@ -705,8 +701,8 @@ DESCRIPTION
 HASH_PARTIAL_GROUPBY_LEAF =================  SEQ_NO 2        ONLY CHILD 1
 REQUESTS_IN .............. 1
 ROWS_OUT ................. 1
-EST_OPER_COST ............ 4.98
-EST_TOTAL_COST ......... 523.92
+EST_OPER_COST ............ 5.16
+EST_TOTAL_COST ......... 524.1
 DESCRIPTION
   max_card_est ........... 1
   fragment_id ............ 2
@@ -763,9 +759,9 @@ LC   RC   OP   OPERATOR              OPT       DESCRIPTION           CARD
 ------------------------------------------------------------------ PLAN SUMMARY
 MODULE_NAME .............. DYNAMICALLY COMPILED
 STATEMENT_NAME ........... ST1
-PLAN_ID .................. 212341125601934693
+PLAN_ID .................. 212371184198151284
 ROWS_OUT ................. 1
-EST_TOTAL_COST ......... 523.92
+EST_TOTAL_COST ......... 524.16
 STATEMENT ................ select f,count(f)
                            from mcStatPart2 <<+ cardinality 10e8 >>
                            group by f;
@@ -776,13 +772,12 @@ ROOT ======================================  SEQ_NO 5        ONLY CHILD 4
 REQUESTS_IN .............. 1
 ROWS_OUT ................. 1
 EST_OPER_COST ............ 0
-EST_TOTAL_COST ......... 523.92
+EST_TOTAL_COST ......... 524.16
 DESCRIPTION
   max_card_est ........... 1
   fragment_id ............ 0
   parent_frag ............ (none)
   fragment_type .......... master
-  statement_index ........ 0
   affinity_value ......... 0
   max_max_cardinal  1,000,000,000
   total_overflow_size .... 0.00 KB
@@ -808,7 +803,7 @@ DESCRIPTION
   HBASE_MIN_BYTES_PER_ESP  1
   USTAT_COLLECT_MC_SKEW_V  ON
   PARALLEL_NUM_ESPS ...... 4
-  ObjectUIDs ............. 4615735661077615714
+  ObjectUIDs ............. 8472535850543416280
   select_list ............ TRAFODION.HBASE.MCSTATPART2.F,
                              cast(sum(count_nonull(TRAFODION.HBASE.MCSTATPART2.
                              F)))
@@ -818,7 +813,7 @@ HASH_PARTIAL_GROUPBY_ROOT =================  SEQ_NO 4        ONLY CHILD 3
 REQUESTS_IN .............. 1
 ROWS_OUT ................. 1
 EST_OPER_COST ............ 0.01
-EST_TOTAL_COST ......... 523.92
+EST_TOTAL_COST ......... 524.16
 DESCRIPTION
   memory_quota ........... 1200 MB
   max_card_est ........... 1
@@ -833,7 +828,7 @@ ESP_EXCHANGE ==============================  SEQ_NO 3        ONLY CHILD 2
 REQUESTS_IN .............. 1
 ROWS_OUT ................. 1
 EST_OPER_COST ............ 0.01
-EST_TOTAL_COST ......... 523.92
+EST_TOTAL_COST ......... 524.16
 DESCRIPTION
   max_card_est ........... 1
   fragment_id ............ 2
@@ -851,8 +846,8 @@ DESCRIPTION
 HASH_PARTIAL_GROUPBY_LEAF =================  SEQ_NO 2        ONLY CHILD 1
 REQUESTS_IN .............. 1
 ROWS_OUT ................. 1
-EST_OPER_COST ............ 4.98
-EST_TOTAL_COST ......... 523.92
+EST_OPER_COST ............ 5.22
+EST_TOTAL_COST ......... 524.16
 DESCRIPTION
   max_card_est ........... 1
   fragment_id ............ 2
@@ -909,9 +904,9 @@ LC   RC   OP   OPERATOR              OPT       DESCRIPTION           CARD
 ------------------------------------------------------------------ PLAN SUMMARY
 MODULE_NAME .............. DYNAMICALLY COMPILED
 STATEMENT_NAME ........... ST1
-PLAN_ID .................. 212341125602445711
+PLAN_ID .................. 212371184198803415
 ROWS_OUT ................. 1
-EST_TOTAL_COST ......... 538.3
+EST_TOTAL_COST ......... 538.55
 STATEMENT ................ select f,count(f)
                            from mcStatPart1 <<+ cardinality 10e8 >>
                            group by f;
@@ -922,13 +917,12 @@ ROOT ======================================  SEQ_NO 5        ONLY CHILD 4
 REQUESTS_IN .............. 1
 ROWS_OUT ................. 1
 EST_OPER_COST ............ 0
-EST_TOTAL_COST ......... 538.3
+EST_TOTAL_COST ......... 538.55
 DESCRIPTION
   max_card_est ........... 1
   fragment_id ............ 0
   parent_frag ............ (none)
   fragment_type .......... master
-  statement_index ........ 0
   affinity_value ......... 0
   max_max_cardinal  1,000,000,000
   total_overflow_size .... 0.00 KB
@@ -954,7 +948,7 @@ DESCRIPTION
   HBASE_MIN_BYTES_PER_ESP  1
   USTAT_COLLECT_MC_SKEW_V  ON
   PARALLEL_NUM_ESPS ...... 4
-  ObjectUIDs ............. 4615735661077617072
+  ObjectUIDs ............. 8472535850543417806
   select_list ............ TRAFODION.HBASE.MCSTATPART1.F,
                              cast(sum(count_nonull(TRAFODION.HBASE.MCSTATPART1.
                              F)))
@@ -964,7 +958,7 @@ HASH_PARTIAL_GROUPBY_ROOT =================  SEQ_NO 4        ONLY CHILD 3
 REQUESTS_IN .............. 1
 ROWS_OUT ................. 1
 EST_OPER_COST ............ 0.01
-EST_TOTAL_COST ......... 538.3
+EST_TOTAL_COST ......... 538.55
 DESCRIPTION
   memory_quota ........... 1200 MB
   max_card_est ........... 1
@@ -979,7 +973,7 @@ ESP_EXCHANGE ==============================  SEQ_NO 3        ONLY CHILD 2
 REQUESTS_IN .............. 1
 ROWS_OUT ................. 1
 EST_OPER_COST ............ 0.01
-EST_TOTAL_COST ......... 538.3
+EST_TOTAL_COST ......... 538.55
 DESCRIPTION
   max_card_est ........... 1
   fragment_id ............ 2
@@ -997,8 +991,8 @@ DESCRIPTION
 HASH_PARTIAL_GROUPBY_LEAF =================  SEQ_NO 2        ONLY CHILD 1
 REQUESTS_IN .............. 1
 ROWS_OUT ................. 1
-EST_OPER_COST ............ 4.98
-EST_TOTAL_COST ......... 538.3
+EST_OPER_COST ............ 5.22
+EST_TOTAL_COST ......... 538.55
 DESCRIPTION
   max_card_est ........... 1
   fragment_id ............ 2
@@ -1055,9 +1049,9 @@ LC   RC   OP   OPERATOR              OPT       DESCRIPTION           CARD
 ------------------------------------------------------------------ PLAN SUMMARY
 MODULE_NAME .............. DYNAMICALLY COMPILED
 STATEMENT_NAME ........... ST1
-PLAN_ID .................. 212341125602861602
+PLAN_ID .................. 212371184199525160
 ROWS_OUT ................. 1
-EST_TOTAL_COST ......... 553.48
+EST_TOTAL_COST ......... 553.72
 STATEMENT ................ select f,count(f)
                            from mcStatPart8 <<+ cardinality 10e8 >>
                            group by f;
@@ -1068,13 +1062,12 @@ ROOT ======================================  SEQ_NO 5        ONLY CHILD 4
 REQUESTS_IN .............. 1
 ROWS_OUT ................. 1
 EST_OPER_COST ............ 0
-EST_TOTAL_COST ......... 553.48
+EST_TOTAL_COST ......... 553.72
 DESCRIPTION
   max_card_est ........... 1
   fragment_id ............ 0
   parent_frag ............ (none)
   fragment_type .......... master
-  statement_index ........ 0
   affinity_value ......... 0
   max_max_cardinal  1,000,000,000
   total_overflow_size .... 0.00 KB
@@ -1100,7 +1093,7 @@ DESCRIPTION
   HBASE_MIN_BYTES_PER_ESP  1
   USTAT_COLLECT_MC_SKEW_V  ON
   PARALLEL_NUM_ESPS ...... 4
-  ObjectUIDs ............. 4615735661077618405
+  ObjectUIDs ............. 8472535850543419349
   select_list ............ TRAFODION.HBASE.MCSTATPART8.F,
                              cast(sum(count_nonull(TRAFODION.HBASE.MCSTATPART8.
                              F)))
@@ -1110,7 +1103,7 @@ HASH_PARTIAL_GROUPBY_ROOT =================  SEQ_NO 4        ONLY CHILD 3
 REQUESTS_IN .............. 1
 ROWS_OUT ................. 1
 EST_OPER_COST ............ 0.01
-EST_TOTAL_COST ......... 553.48
+EST_TOTAL_COST ......... 553.72
 DESCRIPTION
   memory_quota ........... 1200 MB
   max_card_est ........... 1
@@ -1125,7 +1118,7 @@ ESP_EXCHANGE ==============================  SEQ_NO 3        ONLY CHILD 2
 REQUESTS_IN .............. 1
 ROWS_OUT ................. 1
 EST_OPER_COST ............ 0.01
-EST_TOTAL_COST ......... 553.48
+EST_TOTAL_COST ......... 553.72
 DESCRIPTION
   max_card_est ........... 1
   fragment_id ............ 2
@@ -1143,8 +1136,8 @@ DESCRIPTION
 HASH_PARTIAL_GROUPBY_LEAF =================  SEQ_NO 2        ONLY CHILD 1
 REQUESTS_IN .............. 1
 ROWS_OUT ................. 1
-EST_OPER_COST ............ 4.98
-EST_TOTAL_COST ......... 553.48
+EST_OPER_COST ............ 5.22
+EST_TOTAL_COST ......... 553.72
 DESCRIPTION
   max_card_est ........... 1
   fragment_id ............ 2

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/runtimestats/SqlStats.cpp
----------------------------------------------------------------------
diff --git a/core/sql/runtimestats/SqlStats.cpp b/core/sql/runtimestats/SqlStats.cpp
index 8dc6924..2d966c3 100644
--- a/core/sql/runtimestats/SqlStats.cpp
+++ b/core/sql/runtimestats/SqlStats.cpp
@@ -87,12 +87,11 @@ StatsGlobals::StatsGlobals(void *baseAddr, short envType, Lng32 maxSegSize)
   statsSharedSegAddr_ = baseAddr; 
   version_ = CURRENT_SHARED_OBJECTS_VERSION_;
   isSscpInitialized_ = FALSE;
-  // LCOV_EXCL_START 
+
   // On Seaquest, no need for a private env.
   if (envType == 0)
     rtsEnvType_ = RTS_PRIVATE_ENV;
   else
-  // LCOV_EXCL_STOP
     rtsEnvType_ = RTS_GLOBAL_ENV;
   storeSqlSrcLen_ = RMS_STORE_SQL_SOURCE_LEN;
   abortedSemPid_ = -1;
@@ -140,7 +139,6 @@ void StatsGlobals::init()
   sem_close((sem_t *)semId);
 }
 
-#ifndef __EID
 Int64 StatsGlobals::getLastGCTime() { return rmsStats_->getLastGCTime(); }
 pid_t StatsGlobals::getSsmpPid() { return rmsStats_->getSsmpPid(); } 
 Int64 StatsGlobals::getSsmpTimestamp() { return rmsStats_->getSsmpTimestamp(); }
@@ -165,10 +163,7 @@ void StatsGlobals::incProcessStatsHeaps() { rmsStats_->incProcessStatsHeaps();
 void StatsGlobals::decProcessStatsHeaps() { rmsStats_->decProcessStatsHeaps();  }
 void StatsGlobals::setNodesInCluster(short numNodes) 
            { rmsStats_->setNodesInCluster(numNodes); }
-#endif
-// LCOV_EXCL_START
-// Coverage cannot be collected here on Linux.  This method is called only 
-// if the env is Private -- see ExExeUilGetStats.cpp 
+
 const char *StatsGlobals::rmsEnvType(RTSEnvType envType) 
 {
   switch (envType)
@@ -178,7 +173,6 @@ const char *StatsGlobals::rmsEnvType(RTSEnvType envType)
   default: return "Unknown";
   }
 }
-// LCOV_EXCL_STOP
 
 void StatsGlobals::addProcess(pid_t pid, NAHeap *heap)
 {
@@ -190,11 +184,7 @@ void StatsGlobals::addProcess(pid_t pid, NAHeap *heap)
       statsArray_[i].processId_ = 0;
       statsArray_[i].processStats_ = NULL;
       statsArray_[i].creationTime_ = 0;
-#ifdef SQ_PHANDLE_VERIFIER
       statsArray_[i].phandleSeqNum_ = -1;
-#else
-      statsArray_[i].removedAtAdd_ = FALSE;
-#endif
     }
   }
   if (statsArray_[pid].processStats_ != NULL)
@@ -205,17 +195,11 @@ void StatsGlobals::addProcess(pid_t pid, NAHeap *heap)
         "Pid %d,%d got recycled soon or SSMP didn't receive the death message ",
            cpu_, pid);
     SQLMXLoggingArea::logExecRtInfo(__FILE__, __LINE__, msg, 0);
-#ifdef SQ_PHANDLE_VERIFIER
-#else
-    statsArray_[pid].removedAtAdd_ = TRUE;
-#endif
     removeProcess(pid, TRUE);
   }   
   statsArray_[pid].processId_ = pid;
   statsArray_[pid].creationTime_ = GetCliGlobals()->myStartTime();
-#ifdef SQ_PHANDLE_VERIFIER
   statsArray_[pid].phandleSeqNum_ = GetCliGlobals()->myVerifier();
-#endif
   statsArray_[pid].processStats_ = new (heap) ProcessStats(heap, nodeId_, pid);
   incProcessRegd();
   incProcessStatsHeaps();
@@ -234,46 +218,6 @@ void StatsGlobals::removeProcess(pid_t pid, NABoolean calledAtAdd)
   {
     if (!calledAtAdd)
     {
-#ifdef SQ_PHANDLE_VERIFIER
-    //  Caller is either the process that wishes to be removed,
-    //  or else the caller is StatsGlobals::verifyAndCleanup which
-    //  has used the death message's phandle's verifier to avoid 
-    //  and misidentifcation which PID recycle would cause.
-#else
-      if (statsArray_[pid].removedAtAdd_ )
-      {
-        statsArray_[pid].removedAtAdd_ = FALSE;
-
-        // check if process exists
-        if (kill(pid, 0) == 0) 
-        {
-          //Possibily pid was recycled and death message came later
-          // ignore it
-          return;
-        }
-      }
-      else
-      {
-        // check if process pid exists. If not, cleanup. But if it 
-        // does exist, do not be fooled by pid recycle. To prevent
-        // the pid recycle scenario from causing problems, check 
-        // the creation timestamp of the current incarnation of the 
-        // pid. If it differs from the creation timestamp recorded
-        // during addProcess, or if the new incarnation is not even 
-        // a known process (i.e., msg_mon_get_process_name fails)
-        // then do the cleanup. Otherwise, cannot cleanup. 
-        if (kill(pid, 0) == 0)
-        {
-          Int64 processCreateTime = -1;
-          short errorDetail = 0;
-          if ((ComRtGetProcessCreateTime(&cpu_, &pid, NULL, 
-                                        processCreateTime, errorDetail) 
-              == XZFIL_ERR_OK) &&
-              (processCreateTime == statsArray_[pid].creationTime_))
-            return;
-        }
-      }
-#endif
     }
     stmtStatsList_->position();
     StmtStats *ss;
@@ -303,9 +247,7 @@ void StatsGlobals::removeProcess(pid_t pid, NABoolean calledAtAdd)
   }
   statsArray_[pid].processId_ = 0;
   statsArray_[pid].creationTime_ = 0;
-#ifdef SQ_PHANDLE_VERIFIER
   statsArray_[pid].phandleSeqNum_ = -1;
-#endif
   statsArray_[pid].processStats_ = NULL;
   if (pid == maxPid_)
   { 
@@ -335,7 +277,7 @@ void StatsGlobals::checkForDeadProcesses(pid_t myPid)
     {
       char *cdf = getenv("MXSSMP_CHECK_DEAD_SECONDS");
       if (cdf)
-        CheckDeadFreq = str_atoi(cdf, str_len(cdf)); // LCOV_EXCL_LINE
+        CheckDeadFreq = str_atoi(cdf, str_len(cdf));
     }
   }
 
@@ -410,7 +352,6 @@ void StatsGlobals::cleanupDanglingSemaphore(NABoolean checkForSemaphoreHolders)
           && cliGlobals->myStartTime() == getSsmpTimestamp()))
     return; // Only ssmp is allowed to cleanup after another process.
 
-  // LCOV_EXCL_START
   // Coverage notes - it would be too difficult to automate a test
   // for this since usually a death message is used to clean up a
   // generic SQL process' exit.  But this code has been unit tested
@@ -476,7 +417,6 @@ void StatsGlobals::cleanupDanglingSemaphore(NABoolean checkForSemaphoreHolders)
         cleanup_SQL(tempPid, myPhandle.getPin());
       }
     }
-    // LCOV_EXCL_STOP
 }
 
 ProcessStats *StatsGlobals::checkProcess(pid_t pid)
@@ -567,12 +507,8 @@ short StatsGlobals::getStatsSemaphore(Long &semId, pid_t pid,
     if (isShmDirty())
     {
        genLinuxCorefile("Shared Segment might be corrupted");
-#ifdef SQ_PHANDLE_VERIFIER
        Int32 ndRetcode = msg_mon_node_down2(getCpu(),
                        "RMS shared segment is corrupted.");
-#else
-       Int32 ndRetcode = msg_mon_node_down(getCpu());
-#endif
        sleep(30);
        NAExit(0);    // already made a core.
     }
@@ -787,7 +723,6 @@ short StatsGlobals::openStatsSemaphore(Long &semId)
   return error; 
 }
 
-// LCOV_EXCL_START
 // I removed this method and rebuilt successfully.  It seems to 
 // be dead code.  It is only to be extra cautious that I am not removing it
 // for M5.
@@ -805,7 +740,6 @@ ExStatisticsArea *StatsGlobals::getStatsArea(char *queryId, Lng32 queryIdLen)
   }
   return NULL;
 }
-// LCOV_EXCL_STOP
 
 StmtStats *StatsGlobals::getMasterStmtStats(const char *queryId, Lng32 queryIdLen, short activeQueryNum)
 {
@@ -1161,7 +1095,6 @@ Lng32 StatsGlobals::updateStats(ComDiagsArea &diags, SQLQUERY_ID *query_id, void
   return retcode;
 }
 
-#ifndef __EID
 Lng32 StatsGlobals::getSecInvalidKeys(
                           CliGlobals * cliGlobals,
                           Int64 lastCallTimestamp,
@@ -1241,8 +1174,6 @@ void StatsGlobals::mergeNewSikeys(Int32 numSikeys, SQL_QIKEY sikeys[])
   }
 }
 
-#endif
-
 ProcessStats:: ProcessStats(NAHeap *heap, short nid, pid_t pid)
    : heap_(heap)
    , stats_(NULL)
@@ -1528,25 +1459,6 @@ void StatsGlobals::cleanup_SQL(
 {
   short savedPriority = 0;
   short savedStopMode = 0;
-#ifdef SQ_PHANDLE_VERIFIER
-#else
-  if (statsArray_  && statsArray_[pidToCleanup].processId_ == 0)
-  {
-    // It is possible that process died before it registered
-    // in the shared segment. 
-    statsArray_[pidToCleanup].removedAtAdd_ = FALSE;
-    return;
-  }
-  else if ((semPid_ == pidToCleanup) && 
-            (statsArray_[pidToCleanup].removedAtAdd_))
-  {
-    // New process got here before this death message. It does the 
-    // cleanup. The semPid_ is held by a new incarnation of the pidToCleanup.
-    statsArray_[pidToCleanup].removedAtAdd_ = FALSE;
-    return;
-  }
-#endif
-
   if (myPid != getSsmpPid())
      return;
   Long semId = ssmpProcSemId_;
@@ -1562,7 +1474,7 @@ void StatsGlobals::cleanup_SQL(
                   semId, myPid,
                   savedPriority, savedStopMode);
 }
-#ifdef SQ_PHANDLE_VERIFIER
+
 void StatsGlobals::verifyAndCleanup(pid_t pidThatDied, SB_Int64_Type seqNum)
 {
   short savedPriority = 0;
@@ -1577,7 +1489,6 @@ void StatsGlobals::verifyAndCleanup(pid_t pidThatDied, SB_Int64_Type seqNum)
   releaseStatsSemaphore(ssmpProcSemId_, getSsmpPid(),
                         savedPriority, savedStopMode);
 }
-#endif
 
 void StatsGlobals::updateMemStats(pid_t pid, 
           NAHeap *exeHeap, NAHeap *ipcHeap)
@@ -1820,7 +1731,6 @@ short getRTSSemaphore()
   return retcode;
 }
 
-#ifndef __EID
 void updateMemStats()
 {
    CliGlobals *cliGlobals = GetCliGlobals();
@@ -1831,7 +1741,6 @@ void updateMemStats()
       statsGlobals->updateMemStats(cliGlobals->myPin(),
             cliGlobals->getExecutorMemory(), cliGlobals->getProcessIpcHeap());
 }
-#endif
 
 void releaseRTSSemaphore()
 {

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/runtimestats/SqlStats.h
----------------------------------------------------------------------
diff --git a/core/sql/runtimestats/SqlStats.h b/core/sql/runtimestats/SqlStats.h
index 18e673b..4292b08 100644
--- a/core/sql/runtimestats/SqlStats.h
+++ b/core/sql/runtimestats/SqlStats.h
@@ -64,9 +64,7 @@ class ExOperStats;
 class ExProcessStats;
 class MemoryMonitor;
 
-#ifndef __EID
 #include "rts_msg.h"
-#endif
 #include "ComTdb.h"
 #include "SQLCLIdev.h"
 #include "memorymonitor.h"
@@ -76,11 +74,7 @@ class MemoryMonitor;
 typedef struct GlobalStatsArray
 {
   pid_t  processId_;
-#ifdef SQ_PHANDLE_VERIFIER
   SB_Verif_Type  phandleSeqNum_;
-#else
-  NABoolean      removedAtAdd_;
-#endif
   Int64  creationTime_;
   ProcessStats  *processStats_;
 } GlobalStatsArray;
@@ -449,7 +443,6 @@ public:
           { ssmpDumpedTimestamp_ = dumpTime; }
   inline Int64 getSsmpDumpTimestamp() 
           { return ssmpDumpedTimestamp_; }
-#ifndef __EID
   Int64 getLastGCTime();
   void setLastGCTime(Int64 gcTime) ;
   void incStmtStatsGCed(short inc) ;
@@ -472,7 +465,6 @@ public:
   void decProcessRegd();
   void incProcessStatsHeaps();
   void decProcessStatsHeaps();
-#endif
   inline short getCpu() { return cpu_; }
   inline short getNodeId() { return nodeId_; }
   inline void setAbortedSemPid()
@@ -495,9 +487,7 @@ public:
   NABoolean isShmDirty() { return isBeingUpdated_; }
   void setShmDirty() { isBeingUpdated_ = TRUE; }
   void cleanup_SQL(pid_t pidToCleanup, pid_t myPid);
-#ifdef SQ_PHANDLE_VERIFIER
   void verifyAndCleanup(pid_t pidThatDied, SB_Int64_Type seqNum);
-#endif
 
   void updateMemStats(pid_t pid, NAHeap *exeMem, NAHeap *ipcHeap);
   SB_Phandle_Type *getSsmpProcHandle() { return &ssmpProcHandle_; }
@@ -554,9 +544,5 @@ NABoolean filterStmtStats(ExMasterStats *masterStats, short activeQueryNum, shor
 short getRTSSemaphore();
 void releaseRTSSemaphore();
 SB_Phandle_Type *getMySsmpPhandle();
-#ifdef __EID
-void updateProcessMemStats(size_t alloc,
-        size_t used, size_t highWM);
-#endif
 short getDefineNumericValue(char * defineName, short *numValue);
 #endif

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/runtimestats/rts_msg.h
----------------------------------------------------------------------
diff --git a/core/sql/runtimestats/rts_msg.h b/core/sql/runtimestats/rts_msg.h
index c4994b3..7f833c0 100644
--- a/core/sql/runtimestats/rts_msg.h
+++ b/core/sql/runtimestats/rts_msg.h
@@ -119,7 +119,6 @@ typedef Int64 RtsHandle;
 #define INVALID_RTS_HANDLE 0
 #define RtsHandleIsValid(x) ( (x) != (INVALID_RTS_HANDLE) )
 
-#ifndef __EID
 //----------------------------------------------------------------------
 // RTS message base class
 //
@@ -1195,6 +1194,5 @@ private:
 
 };
 
-#endif // __EID
 #endif // _RTS_EXE_IPC_H_
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/runtimestats/sscpipc.cpp
----------------------------------------------------------------------
diff --git a/core/sql/runtimestats/sscpipc.cpp b/core/sql/runtimestats/sscpipc.cpp
index faf7260..91471f2 100755
--- a/core/sql/runtimestats/sscpipc.cpp
+++ b/core/sql/runtimestats/sscpipc.cpp
@@ -35,9 +35,7 @@
 #include <semaphore.h>
 #include "nsk/nskport.h"
 #include "seabed/ms.h"
-#if defined (SQ_NEW_PHANDLE)
 #include "seabed/fs.h"
-#endif // SQ_NEW_PHANDLE
 #include "NAStdlib.h"
 #include "zsysc.h"
 #include "ExStats.h"

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/runtimestats/ssmpipc.cpp
----------------------------------------------------------------------
diff --git a/core/sql/runtimestats/ssmpipc.cpp b/core/sql/runtimestats/ssmpipc.cpp
index 63fde9b..31aed7c 100755
--- a/core/sql/runtimestats/ssmpipc.cpp
+++ b/core/sql/runtimestats/ssmpipc.cpp
@@ -1074,7 +1074,6 @@ void SsmpGuaReceiveControlConnection::actOnSystemMessage(
         SB_Phandle_Type  *phandle = (SB_Phandle_Type *)&msg->z_phandle;
         Int32 cpu;
         pid_t pid;
-#ifdef SQ_PHANDLE_VERIFIER
         SB_Int64_Type seqNum = 0;
         if (XZFIL_ERR_OK == XPROCESSHANDLE_DECOMPOSE_(
               phandle, &cpu, &pid
@@ -1091,14 +1090,6 @@ void SsmpGuaReceiveControlConnection::actOnSystemMessage(
           if (cpu == ssmpGlobals_->myCpu())
             ssmpGlobals_->getStatsGlobals()->verifyAndCleanup(pid, seqNum);
         }
-#else
-        if (XPROCESSHANDLE_DECOMPOSE_(phandle, &cpu, &pid) == 0)
-        {
-           if (cpu == ssmpGlobals_->myCpu())
-             ssmpGlobals_->getStatsGlobals()->cleanup_SQL(
-                         pid, ssmpGlobals_->myPin());
-        }
-#endif
       }
       break;
     case ZSYS_VAL_SMSG_CPUDOWN:

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/runtimestats/ssmpipc.h
----------------------------------------------------------------------
diff --git a/core/sql/runtimestats/ssmpipc.h b/core/sql/runtimestats/ssmpipc.h
index 15ff0e5..dce7bce 100644
--- a/core/sql/runtimestats/ssmpipc.h
+++ b/core/sql/runtimestats/ssmpipc.h
@@ -216,10 +216,8 @@ public:
     ipcEnv_ = ipcEnv;
     ssmpGlobals_ = ssmpGlobals;
     heap_ = heap;
-#ifndef __EID
     handle_ = INVALID_RTS_HANDLE;
     wmsProcess_ = FALSE;
-#endif
   }
 
   ~SsmpNewIncomingConnectionStream();
@@ -256,23 +254,18 @@ public:
   void clearSscpDiagsArea() { sscpDiagsArea_->decrRefCount(); 
                               sscpDiagsArea_ = NULL; }
 
-#ifndef __EID
   inline RtsHandle getHandle() { return handle_; }
   inline void setHandle(const RtsHandle h) { handle_ = h; }
   inline NABoolean isWmsProcess() { return wmsProcess_; }
   inline void setWmsProcess(NABoolean flag) { wmsProcess_ = flag; }
-#endif
 private:
 
   NAHeap *heap_;
   IpcEnvironment *ipcEnv_;
   SsmpGlobals *ssmpGlobals_;
   ComDiagsArea *sscpDiagsArea_;
-#ifndef __EID
   RtsHandle handle_;
   NABoolean wmsProcess_;
-#endif
-
 }; // SsmpNewIncomingConnectionStream
 
 // -----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/sort/CommonStructs.h
----------------------------------------------------------------------
diff --git a/core/sql/sort/CommonStructs.h b/core/sql/sort/CommonStructs.h
index 5d42a53..e5b27d0 100644
--- a/core/sql/sort/CommonStructs.h
+++ b/core/sql/sort/CommonStructs.h
@@ -53,9 +53,6 @@
   #ifdef min
     #undef min
   #endif
-  #ifdef ERROR
-    #undef ERROR
-  #endif
 
 #include "NABasicObject.h"
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/sort/Statistics.h
----------------------------------------------------------------------
diff --git a/core/sql/sort/Statistics.h b/core/sql/sort/Statistics.h
index 400d049..1f88471 100644
--- a/core/sql/sort/Statistics.h
+++ b/core/sql/sort/Statistics.h
@@ -51,9 +51,6 @@
   #ifdef min
     #undef min
   #endif
-  #ifdef ERROR
-    #undef ERROR
-  #endif
 
 #include "Int64.h"
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/sqlcat/ReadTableDef.cpp
----------------------------------------------------------------------
diff --git a/core/sql/sqlcat/ReadTableDef.cpp b/core/sql/sqlcat/ReadTableDef.cpp
index be64096..4107dd2 100644
--- a/core/sql/sqlcat/ReadTableDef.cpp
+++ b/core/sql/sqlcat/ReadTableDef.cpp
@@ -37,59 +37,3 @@
 ******************************************************************************
 */
 
-//------------------------------------------------------------------------
-// Include files
-//------------------------------------------------------------------------
-#include "Platform.h"			// must be first
-
-#define  SQLPARSERGLOBALS_NADEFAULTS	// must precede other #include's
-#define  READTABLEDEF_IMPLEMENTATION	// for ReadTableDef.h and dfs2rec.h
-
-#include "ReadTableDef.h"
-#include "readRealArk.h"
-#include "SQLCLIdev.h"
-#include <ctype.h>
-#include <iostream>
-#include <iomanip>
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "CmpCommon.h"		// HEAP stuff
-#include "CmpContext.h"		// CmpCommon::context()->readTableDef_
-#include "DefaultValidator.h"	// for ValidateCollationList
-#include "ExSqlComp.h"		// for NAExecTrans
-#include "IntervalType.h"
-#include "DatetimeType.h"
-#include "SchemaDB.h"
-
-#include "NAAssert.h"
-#include "SqlParserGlobals.h"	// must be last #include!
-
-
-//------------------------------------------------------------------------
-// Global variables declarations
-//------------------------------------------------------------------------
-extern Lng32 SQLCODE;
-
-//------------------------------------------------------------------------
-// Constructor
-//------------------------------------------------------------------------
-
-ReadTableDef::ReadTableDef()
-: transactionState_   (NO_TXN),
-  transInProgress_    (FALSE),
-  transId_            (-1)
-{
-} // ctor
-
-//------------------------------------------------------------------------
-// Destructor
-//------------------------------------------------------------------------
-
-ReadTableDef::~ReadTableDef()
-{
-  // end any transactions started by "me"
-}
-

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/sqlcat/ReadTableDef.h
----------------------------------------------------------------------
diff --git a/core/sql/sqlcat/ReadTableDef.h b/core/sql/sqlcat/ReadTableDef.h
index e813745..89e0dba 100644
--- a/core/sql/sqlcat/ReadTableDef.h
+++ b/core/sql/sqlcat/ReadTableDef.h
@@ -41,58 +41,4 @@
 #ifndef __READTABLEDEF_H
 #define __READTABLEDEF_H
 
-// SQL/MX definitions
-#include "BaseTypes.h"
-#include "ObjectNames.h"
-#include "ComSmallDefs.h"        // added for ComDiskFileFormat enum
-
-#include "sqlca.h"
-
-// Forward references
-class BeforeAndAfterTriggers;
-class MVInfoForDML;
-class BindWA;
-class NARoutine;
-class CatRORoutine;
-class CatRORoutineAction;
-class CatROObject;
-
-#define READTABLEDEF_VERSION 2	// Incr this if any defs herein are changed!
-#define NO_ACTIVE_REPLYTAG -1
-
-enum RTDTransactions
-{
-  TRANS_MATCHED                 = 0,    // All transaction identifiers matched
-  TRANS_MISMATCHED              = 1,    // Transaction identifiers mismatched
-  TRANS_NONE_ACTIVE             = 2,    // No ReadTableDef transaction active
-  TRANS_READTABLEDEF_CLEANED    = 3     // ReadTableDef transaction was cleaned up
-};
-
-//***********************************************************************
-// ReadTableDef class definition
-//***********************************************************************
-
-class ReadTableDef : public NABasicObject
-{
-public:
-
-  enum TransactionState	{ TXN_IN_PROGRESS, NO_TXN };
-
-  // constructor
-  ReadTableDef();
-
-  // destructor
-  ~ReadTableDef();
-
-private:
-  void initSQLCA(NABoolean force = FALSE);
-
-  // data members
-  TransactionState      transactionState_;
-  NABoolean		transInProgress_;
-  Int64                 transId_;
-}; // class ReadTableDef
-
-
-  
 #endif // READTABLEDEF_H

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/sqlcat/TrafDDLdesc.cpp
----------------------------------------------------------------------
diff --git a/core/sql/sqlcat/TrafDDLdesc.cpp b/core/sql/sqlcat/TrafDDLdesc.cpp
index d3074fb..e1d4597 100644
--- a/core/sql/sqlcat/TrafDDLdesc.cpp
+++ b/core/sql/sqlcat/TrafDDLdesc.cpp
@@ -24,6 +24,71 @@
 
 #include "TrafDDLdesc.h"
 #include "CmpCommon.h"
+#include "SQLTypeDefs.h"
+
+// -----------------------------------------------------------------------
+// Allocate a column_desc and do simple initialization of several fields,
+// based on what's passed in.  Many of the fields we just default,
+// to either hardcoded values or to zero.  The callers,
+// in arkcmplib + generator + optimizer, can set additional fields afterwards.
+// -----------------------------------------------------------------------
+TrafDesc *TrafMakeColumnDesc(const char *tablename,
+                             const char *colname,
+                             Lng32 &colnumber,	// INOUT
+                             Int32 datatype,
+                             Lng32 length,
+                             Lng32 &offset,	// INOUT
+                             NABoolean null_flag,
+                             SQLCHARSET_CODE datacharset,
+                             NAMemory * space
+                             )
+{
+  #undef  COLUMN
+  #define COLUMN returnDesc->columnsDesc()
+
+  // Pass in the optional "passedDesc" if you just want to overwrite an
+  // already existing desc.
+  TrafDesc *returnDesc = 
+    TrafAllocateDDLdesc(DESC_COLUMNS_TYPE, space);
+
+  COLUMN->colname = (char *)colname;
+
+  COLUMN->colnumber = colnumber;
+  COLUMN->datatype = datatype;
+  COLUMN->length = length;
+  COLUMN->offset = offset;
+  COLUMN->setNullable(null_flag);
+
+  // Hardcode some fields here.
+  // All other fields (scale, precision, etc) default to zero!
+
+  COLUMN->colclass = 'U';
+  COLUMN->setDefaultClass(COM_NO_DEFAULT);
+
+  if (DFS2REC::isAnyCharacter(datatype)) {
+    if (datacharset == SQLCHARSETCODE_UNKNOWN) {
+    COLUMN->character_set      = CharInfo::DefaultCharSet;
+    COLUMN->encoding_charset   = CharInfo::DefaultCharSet;
+    }
+    else {
+    COLUMN->character_set      = (CharInfo::CharSet)datacharset;
+    COLUMN->encoding_charset   = (CharInfo::CharSet)datacharset;
+    }
+    COLUMN->collation_sequence = CharInfo::DefaultCollation;
+    if (DFS2REC::isSQLVarChar(datatype))
+      offset += SQL_VARCHAR_HDR_SIZE;
+  }
+  else {	// datetime, interval, numeric, etc.
+    COLUMN->datetimestart = COLUMN->datetimeend = REC_DATE_UNKNOWN;
+  }
+
+  colnumber++;
+
+  offset += length;
+  if (null_flag) offset += SQL_NULL_HDR_SIZE;
+
+  return returnDesc;
+}
 
 // -----------------------------------------------------------------------
 // Allocate one of the primitive structs and initialize to all zeroes.

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/sqlcat/enum.h
----------------------------------------------------------------------
diff --git a/core/sql/sqlcat/enum.h b/core/sql/sqlcat/enum.h
index 0111eb4..178ea35 100644
--- a/core/sql/sqlcat/enum.h
+++ b/core/sql/sqlcat/enum.h
@@ -18,45 +18,3 @@
 // under the License.
 //
 // @@@ END COPYRIGHT @@@
-#ifndef ENUM_H
-#define ENUM_H
-
-class catsim {
-
-public:
-  enum parsenode_type { 
-  		   CREATE_CATALOG_TYPE, CREATE_TABLE_TYPE, ALTER_TABLE_TYPE,
-		   DROP_CATALOG_TYPE, DROP_TABLE_TYPE, 
-		   CREATE_INDEX_TYPE, DROP_INDEX_TYPE, UPDATE_STATS_TYPE,
-		   CREATE_VIEW_TYPE, DROP_VIEW_TYPE,
-		   TABLE_TYPE, UPDATE_HIST_TYPE,
-		   PARTNS_DEF_TYPE,
-		   COLDEF_TYPE, CONSTRNT_TYPE, UNIQUE_CONSTRNT_TYPE,
-		   CHECK_CONSTRNT_TYPE, REF_CONSTRNT_TYPE,
-		   UNION_TYPE,
-		   SELECT_TYPE, UPDATE_TYPE, INSERT_TYPE, DELETE_TYPE,
-		   LITERAL_TYPE, MISC_TYPE,
-		   COMP_OP_TYPE, COLUMN_TYPE,
-		   BOOL_OP_TYPE, ARITH_OP_TYPE,
-		   FUNCTION_TYPE, CONV_OP_TYPE,
-		   AGGREGATE_TYPE,
-		   ALLOCATE_DESC_TYPE, DECLARE_CURSOR_TYPE,
-		   MODULE_TYPE, PROCEDURE_TYPE,
-		   OPTR_AGGR_TYPE, OPTR_OUTPUT_TYPE,
-		   CLEANUP_TYPE
-		 };
-  enum aggregate_type 	  { SUM_, AVG_, COUNT_, MIN_, MAX_ };
-  enum alter_type 	  { ADD_CONSTRAINT, DROP_CONSTRAINT, ADD_COLUMN, 
-			    SET_CONSTRAINT };
-  enum arith_oper_type 	  { ADD_, SUB_, MUL_, DIV_, EXP_ };
-  enum bool_oper_type 	  { AND_, OR_, NOT_ };
-  enum comp_oper_type 	  { EQ_, NE_, LT_, GT_, LE_, GE_ };
-  enum unique_constr_type { UNIQUE_, PRIMARY_KEY_ };
-  enum function_type 	  { UPSHIFT_, DOWNSHIFT_, CONCAT_, SUBSTRING_, TRIM_, 
-			    CHAR_LENGTH_, OCTET_LENGTH_, POSITION_ };
-  enum match_type 	  { MATCH_FULL, NONE };
-  enum referential_action { CASCADE_, SET_NULL, SET_DEFAULT, NO_ACTION };
-  enum yes_no_type 	  { YES_, NO_ };
-};
-
-#endif

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/sqlcat/readRealArk.cpp
----------------------------------------------------------------------
diff --git a/core/sql/sqlcat/readRealArk.cpp b/core/sql/sqlcat/readRealArk.cpp
index 62e7232..46e7744 100644
--- a/core/sql/sqlcat/readRealArk.cpp
+++ b/core/sql/sqlcat/readRealArk.cpp
@@ -32,92 +32,3 @@
  *
  *****************************************************************************
  */
-
-#define   SQLPARSERGLOBALS_FLAGS        // should precede all other #include's
-#define   SQLPARSERGLOBALS_NADEFAULTS   // should precede all other #include's
-
-#include "Platform.h"
-
-#include "NAAssert.h"
-#include "CmpCommon.h"
-#include "CmpStatement.h"	   
-#include "BaseTypes.h"
-#include "readRealArk.h"
-#include "TrafDDLdesc.h"
-
-// Copy a string.  A null terminated buffer is returned.
-// Uses HEAP (StatementHeap) of CmpCommon!
-static char *copyString(const ComString &sourceString,
-			       ComBoolean wideNull = FALSE)
-{
-  static char emptyString[] = "\0\0\0\0";	// empty, works for narrow OR wide null
-  return (sourceString.length() == 0) ?
-    emptyString :
-    convertNAString(sourceString, HEAP, wideNull);
-}
-
-
-// -----------------------------------------------------------------------
-// Allocate a column_desc and do simple initialization of several fields,
-// based on what's passed in.  Many of the fields we just default,
-// to either hardcoded values or to zero.  The callers,
-// in arkcmplib + generator + optimizer, can set additional fields afterwards.
-// -----------------------------------------------------------------------
-TrafDesc *TrafMakeColumnDesc(const char *tablename,
-                                const char *colname,
-                                Lng32 &colnumber,	// INOUT
-                                Int32 datatype,
-                                Lng32 length,
-                                Lng32 &offset,	// INOUT
-                                NABoolean null_flag,
-                                SQLCHARSET_CODE datacharset,
-                                NAMemory * space
-                                )
-{
-  #undef  COLUMN
-  #define COLUMN returnDesc->columnsDesc()
-
-  // Pass in the optional "passedDesc" if you just want to overwrite an
-  // already existing desc.
-  TrafDesc *returnDesc = 
-    TrafAllocateDDLdesc(DESC_COLUMNS_TYPE, space);
-
-  COLUMN->colname = (char *)colname;
-
-  COLUMN->colnumber = colnumber;
-  COLUMN->datatype = datatype;
-  COLUMN->length = length;
-  COLUMN->offset = offset;
-  COLUMN->setNullable(null_flag);
-
-  // Hardcode some fields here.
-  // All other fields (scale, precision, etc) default to zero!
-
-  COLUMN->colclass = 'U';
-  COLUMN->setDefaultClass(COM_NO_DEFAULT);
-
-  if (DFS2REC::isAnyCharacter(datatype)) {
-    if (datacharset == SQLCHARSETCODE_UNKNOWN) {
-    COLUMN->character_set      = CharInfo::DefaultCharSet;
-    COLUMN->encoding_charset   = CharInfo::DefaultCharSet;
-    }
-    else {
-    COLUMN->character_set      = (CharInfo::CharSet)datacharset;
-    COLUMN->encoding_charset   = (CharInfo::CharSet)datacharset;
-    }
-    COLUMN->collation_sequence = CharInfo::DefaultCollation;
-    if (DFS2REC::isSQLVarChar(datatype))
-      offset += SQL_VARCHAR_HDR_SIZE;
-  }
-  else {	// datetime, interval, numeric, etc.
-    COLUMN->datetimestart = COLUMN->datetimeend = REC_DATE_UNKNOWN;
-  }
-
-  colnumber++;
-
-  offset += length;
-  if (null_flag) offset += SQL_NULL_HDR_SIZE;
-
-  return returnDesc;
-}
-

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/sqlcat/readRealArk.h
----------------------------------------------------------------------
diff --git a/core/sql/sqlcat/readRealArk.h b/core/sql/sqlcat/readRealArk.h
index cb2867b..b64a043 100644
--- a/core/sql/sqlcat/readRealArk.h
+++ b/core/sql/sqlcat/readRealArk.h
@@ -21,11 +21,3 @@
 // @@@ END COPYRIGHT @@@
 //
 **********************************************************************/
-#ifndef READREALARK_H
-#define READREALARK_H
-
-#include "ComSmallDefs.h"
-#include "ObjectNames.h"
-
-
-#endif // READREALARK_H

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/sqlcat/vers_libsqlcat.cpp
----------------------------------------------------------------------
diff --git a/core/sql/sqlcat/vers_libsqlcat.cpp b/core/sql/sqlcat/vers_libsqlcat.cpp
index 3a7e798..6cda6a4 100644
--- a/core/sql/sqlcat/vers_libsqlcat.cpp
+++ b/core/sql/sqlcat/vers_libsqlcat.cpp
@@ -18,7 +18,6 @@
 // under the License.
 //
 // @@@ END COPYRIGHT @@@
-
 #include "SCMVersHelp.h"
 
 // component version
@@ -26,6 +25,4 @@
 #define VERS_CV_MIN 0
 #define VERS_CV_UPD 1
 
-// LCOV_EXCL_START
 VERS_LIB(libsqlcat)
-// LCOV_EXCL_STOP

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/sqlci/SqlCmd.cpp
----------------------------------------------------------------------
diff --git a/core/sql/sqlci/SqlCmd.cpp b/core/sql/sqlci/SqlCmd.cpp
index 0ceb174..6c5b353 100644
--- a/core/sql/sqlci/SqlCmd.cpp
+++ b/core/sql/sqlci/SqlCmd.cpp
@@ -96,15 +96,9 @@ const Int32  MAX_OTHERBUF_LEN = ComAnsiNamePart::MAX_IDENTIFIER_EXT_LEN+1+1;
 #define SELECTED_MESSAGE	"--- %d row(s) selected."
 #define SELECTED_BUT_MESSAGE	"--- %d row(s) selected (but none displayed)."
 #define SELECTED_FIRST_ROW_DISPLAY_MESSAGE "--- %d row(s) selected (and first row displayed)."
-#ifdef NA_64BIT
 #define INSERTED_MESSAGE	"--- %ld row(s) inserted."
 #define UPDATED_MESSAGE		"--- %ld row(s) updated."
 #define DELETED_MESSAGE		"--- %ld row(s) deleted."
-#else
-#define INSERTED_MESSAGE	"--- %Ld row(s) inserted."
-#define UPDATED_MESSAGE		"--- %Ld row(s) updated."
-#define DELETED_MESSAGE		"--- %Ld row(s) deleted."
-#endif // NA_64BIT
 #define OP_COMPLETE_MESSAGE	"--- SQL operation complete."
 #define OP_COMPLETED_ERRORS	"--- SQL operation failed with errors."
 #define OP_COMPLETED_WARNINGS	"--- SQL operation completed with warnings."
@@ -365,7 +359,7 @@ void HandleCLIError(Lng32 &error, SqlciEnv *sqlci_env,
 		    const char *outtext = msgtext;
 		    size_t pfxl = strlen("*** ERROR[20109] ");
 		    
-#if defined(USE_WCHAR) && !defined(NA_NSK)
+#if defined(USE_WCHAR)
 		    if (wcsncmp(msgtext, L"*** ERROR[20109] ", pfxl) == 0)
 #else
 		      if (strncmp(msgtext,  "*** ERROR[20109] ", pfxl) == 0)

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/sqlci/SqlciDefs.h
----------------------------------------------------------------------
diff --git a/core/sql/sqlci/SqlciDefs.h b/core/sql/sqlci/SqlciDefs.h
index 29da4e5..e9de024 100644
--- a/core/sql/sqlci/SqlciDefs.h
+++ b/core/sql/sqlci/SqlciDefs.h
@@ -61,10 +61,6 @@ enum dml_type
   DML_OSIM_TYPE
 };
 
-  #ifdef ERROR
-    #undef ERROR
-  #endif
-
 enum SQLCI_CLI_RETCODE
 {
   SQL_Success = 0, SQL_Eof = 100, SQL_Error = -1, SQL_Warning = 1, SQL_Canceled = -8007,

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/sqlci/SqlciEnv.h
----------------------------------------------------------------------
diff --git a/core/sql/sqlci/SqlciEnv.h b/core/sql/sqlci/SqlciEnv.h
index f4b5019..8f922e9 100644
--- a/core/sql/sqlci/SqlciEnv.h
+++ b/core/sql/sqlci/SqlciEnv.h
@@ -69,7 +69,7 @@ class ComSchemaName;
 class ComAnsiNamePart;
 
 #pragma nowarn(1506)   // warning elimination 
-class SQLCLI_LIB_FUNC Logfile {
+class Logfile {
 
 private:
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/sqlcomp/CmpDDLCatErrorCodes.h
----------------------------------------------------------------------
diff --git a/core/sql/sqlcomp/CmpDDLCatErrorCodes.h b/core/sql/sqlcomp/CmpDDLCatErrorCodes.h
index 68d09c7..3c9d1f2 100644
--- a/core/sql/sqlcomp/CmpDDLCatErrorCodes.h
+++ b/core/sql/sqlcomp/CmpDDLCatErrorCodes.h
@@ -215,7 +215,6 @@ enum CatErrorCode { CAT_FIRST_ERROR = 1000
                   //
                   , CAT_EXTERNAL_NAME_MISMATCH                    = 1180
                   , CAT_EXTERNAL_SCHEMA_NAME_TOO_LONG             = 1181
-                  , CAT_RFORK_SQL_ERROR                           = 1182
                   , CAT_METADATA_SQL_ERROR                        = 1183
                   , CAT_INSUFFICIENT_PRIV_ON_COLUMN               = 1184
                   , CAT_LOCATION_INVALID_OR_MISSING               = 1185

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/sqlcomp/CmpDescribe.cpp
----------------------------------------------------------------------
diff --git a/core/sql/sqlcomp/CmpDescribe.cpp b/core/sql/sqlcomp/CmpDescribe.cpp
index b638623..cccdf6c 100644
--- a/core/sql/sqlcomp/CmpDescribe.cpp
+++ b/core/sql/sqlcomp/CmpDescribe.cpp
@@ -66,7 +66,6 @@
 #include "FragDir.h"
 #include "HeapLog.h"
 #include "parser.h"
-#include "ReadTableDef.h"
 #include "RelControl.h"
 #include "RelExpr.h"
 #include "RelExeUtil.h"
@@ -1399,7 +1398,7 @@ static short CmpGetPlan(SQLSTMT_ID &stmt_id,
                         char* &srcStrBuf, Lng32 &srcStrSize)
 {
   Lng32 retcode = 0;
-  ULong stmtHandle = (ULong)stmt_id.handle;  // NA_64BIT
+  ULong stmtHandle = (ULong)stmt_id.handle;
 
   // Now get the generated code to describe the plan.
   // do not advance to next statement yet, if all stmts are to be retrieved.

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/sqlcomp/CmpMain.cpp
----------------------------------------------------------------------
diff --git a/core/sql/sqlcomp/CmpMain.cpp b/core/sql/sqlcomp/CmpMain.cpp
index bef69f4..d19e51a 100644
--- a/core/sql/sqlcomp/CmpMain.cpp
+++ b/core/sql/sqlcomp/CmpMain.cpp
@@ -81,7 +81,6 @@
 #include "OptimizerSimulator.h"
 #include "parser.h"
 #include "PhyProp.h"
-#include "ReadTableDef.h"
 #include "SQLCLIdev.h"
 #include "Sqlcomp.h"
 #include "StmtNode.h"
@@ -120,7 +119,7 @@ extern NABoolean FindLeaks;
 THREAD_P Int32 CostScalar::ovflwCount_ = 0;
 THREAD_P Int32 CostScalar::udflwCount_ = 0;
 
-#if !defined(NA_NSK) && !defined(NDEBUG)
+#if !defined(NDEBUG)
   NABoolean TraceCatManMemAlloc = FALSE;
 #endif
 
@@ -184,7 +183,6 @@ static Int32 sqlcompTestExit(QueryText& input)
 }
 
 #ifdef _DEBUG
-// LCOV_EXCL_START
 // for debugging only
 // +7 below is to get past "insert " in input_str, e.g. "insert INTOINSPECT;"
 static Int32 sqlcompTest(QueryText& input)
@@ -261,33 +259,11 @@ static Int32 sqlcompTest(QueryText& input)
   {
     return 1;
   }
-  else if (strncmp(input_str, "GETDEFAULTVOLUMES", 17) == 0)
-  {
-    NAString heading;
-    NAString listOfVols;
-    heading =
-      "List of DP2 Volumes derived from SQL_EXEC_GetListOfVolumes_Internal():";
-    const char *const * p = SQL_EXEC_GetListOfVolumes_Internal();
-    for (; p NEQ NULL AND *p NEQ NULL; p++)
-      listOfVols += *p + NAString(",");
-    if (listOfVols[listOfVols.length()-1] EQU ',')
-      listOfVols.remove(listOfVols.length()-1);
-    *CmpCommon::diags() << DgSqlCode(3066) << DgString0(heading);
-    *CmpCommon::diags() << DgSqlCode(3066) << DgString0(listOfVols);
-    return 1;
-  }
 
   return 0;
 }
-// LCOV_EXCL_STOP
 #endif  // !defined(NDEBUG)
 
-#if !defined(NA_NSK) && defined(NA_DEBUG_GUI)
-// On Windows XP, the call to LoadLibrary may fail with error 10093
-// ("Either the application has not called WSAStartup, or WSAStartup
-// failed").  This function calls WSAStartup() to fix the problem.
-#endif // NA_DEBUG_GUI
-
 // -----------------------------------------------------------------------
 // -----------------------------------------------------------------------
 #ifdef NA_DEBUG_GUI
@@ -1784,11 +1760,7 @@ fixupCompilationStats(ComTdbRoot *rootTdb,
     //
     // converting the offset to a pointer.
     CompilationStatsData *cmpStatsData = 
-#ifdef NA_64BIT
       (CompilationStatsData*)rootSpace->convertToPtr(offset);
-#else
-      (CompilationStatsData*)rootSpace->convertToPtr(int64ToInt32(offset));
-#endif
               
     CMPASSERT(NULL != cmpStatsData);
     //
@@ -2145,11 +2117,6 @@ CmpMain::ReturnStatus CmpMain::compile(const char *input_str,           //IN
     if (compileFromCache(input_str, charset, queryExpr, bindWA, cachewa,
                          gen_code, gen_code_len, (NAHeap*)heap, op,
                          bPatchOK, *begTime)) {
-      // binder (via bindNode->getNATable->NATable->readTableDef->
-      // beginTransaction...) does a "begin work;" which requires a
-      // matching "commit work;" or "rollback work;" (via endTransaction),
-      // otherwise, mxcmp emits "ERROR[8819] Begin transaction failed
-      // while preparing the statement" messages.
       if (cacheable) *cacheable = cachewa.isCacheable();
       if (!bPatchOK) {
         sqlcompCleanup(input_str, queryExpr, TRUE);

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/sqlcomp/DefaultConstants.h
----------------------------------------------------------------------
diff --git a/core/sql/sqlcomp/DefaultConstants.h b/core/sql/sqlcomp/DefaultConstants.h
index 71176a6..6d5d82c 100644
--- a/core/sql/sqlcomp/DefaultConstants.h
+++ b/core/sql/sqlcomp/DefaultConstants.h
@@ -1805,8 +1805,6 @@ enum DefaultConstants
   QUERY_TEMPLATE_CACHE,
   // turn pre-parser query caching ON or OFF
   QUERY_TEXT_CACHE,
-  // enable/disable caching of mpalias queries
-  QUERY_CACHE_MPALIAS,
 
   // allows users to specify a limit on the number of nonfatal errors that will be
   // tolerated for a non-atomic statement.
@@ -2134,18 +2132,8 @@ enum DefaultConstants
   // Controls for utility testware support (query plan logging and testpoints)
   SQLMX_UTIL_EXPLAIN_PLAN,
 
-  // Controls for INTERPRET_AS_ROW
-  GEN_IAR_BUFFER_SIZE,
-  GEN_IAR_NUM_BUFFERS,
-  GEN_IAR_SIZE_DOWN,
-  GEN_IAR_SIZE_UP,
-
-  AUDIT_IMAGE_FOR_TABLES,
-
   ALLOW_DP2_ROW_SAMPLING,
 
-
-
   POS_ALLOW_NON_PK_TABLES,
   INCORPORATE_SKEW_IN_COSTING,
   TOTAL_RESOURCE_COSTING,
@@ -2949,12 +2937,9 @@ enum DefaultConstants
   // for schema access control
   DEFAULT_SCHEMA_ACCESS_ONLY,
 
-  VALIDATE_RFORK_REDEF_TS,
-
   // PUBLISH/UNPUBLISH command
   PUBLISHING_ROLES,
 
-
   // default used to test catman features
   CAT_TEST_BOOL,
 
@@ -3020,16 +3005,6 @@ enum DefaultConstants
 // Gen Sol:10-100408-9393
   ALLOW_RISKY_UPDATE_WITH_NO_ROLLBACK,
 
-  // Assert if a fatal transaction identifier mismatch is found.
-  READTABLEDEF_TRANSACTION_ASSERT,
-
-  // Allow non-fatal transaction identifier mismatch warnings to be posted
-  // from ReadTableDef
-  READTABLEDEF_TRANSACTION_ENABLE_WARNINGS,
-
-  // Force transaction mismatch errors for testing
-  READTABLEDEF_TRANSACTION_TESTPOINT,
-
   // used for controlling multi-join transformation level.
   ASYMMETRIC_JOIN_TRANSFORMATION,
 
@@ -4000,7 +3975,6 @@ enum DefaultToken {
  DF_LOCAL_NODE,
  DF_LOG,
  DF_MAXIMUM,
- DF_MEASURE,
  DF_MEDIUM,
  DF_MEDIUM_LOW,
  DF_MERGE,
@@ -4009,7 +3983,6 @@ enum DefaultToken {
  DF_MULTI_NODE,
  DF_MVCC,
  DF_NONE,
- DF_NSK,
  DF_OFF,
  DF_ON,
  DF_OPENS_FOR_WRITE,

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/sqlcomp/QCache.cpp
----------------------------------------------------------------------
diff --git a/core/sql/sqlcomp/QCache.cpp b/core/sql/sqlcomp/QCache.cpp
index d458b04..fd96627 100644
--- a/core/sql/sqlcomp/QCache.cpp
+++ b/core/sql/sqlcomp/QCache.cpp
@@ -301,7 +301,6 @@ CompilerEnv::CompilerEnv(NAHeap *h, CmpPhase phase,
         case QUERY_CACHE_STATISTICS_FILE:
         case QUERY_TEMPLATE_CACHE:
         case QUERY_TEXT_CACHE:
-        case QUERY_CACHE_MPALIAS:
         case SHARE_TEMPLATE_CACHED_PLANS: 
           break;
           // skip these CQD settings -- they are represented in CacheKey
@@ -2484,27 +2483,6 @@ void QCache::deCacheAll(TextKey *stmt, RelExpr *qry)
   // else it's not in cache, so we're done
 }
 
-// decache all mpalias queries
-// LCOV_EXCL_START
-void QCache::deCacheAliases()
-{
-  // decache all entries whose keys indicate they are mpalias queries
-  LRUList::iterator mru = begin();
-  while (mru != end()) {
-    KeyDataPair& entry = *mru;
-    // am I an mpalias query?
-    if (entry.first_ &&
-        !((CacheKey*)(entry.first_))->contains(AM_AN_MPALIAS_QUERY))
-      ++mru; // no, advance to next entry.
-    else { // yes.
-      if (entry.first_)
-        deCache((CacheKey*)(entry.first_)); // decache it.
-      mru = begin(); // restart iterator.
-    }
-  }
-}
-// LCOV_EXCL_STOP
-
 // increment number of compiles
 void QCache::incNOfCompiles(IpcMessageObjType op)
 {
@@ -2756,7 +2734,7 @@ QCache* QCache::resizeCache(ULng32 maxSize, ULng32 maxVictims)
         freeLRUentries(getFreeSize() + currentSize - maxSize -
                  ULng32(totalHashTblSize_ * 
                          (1 - float(maxSize) / currentSize)), 
-                 INT_MAX);  // NA_64BIT - revisit if large value is needed.
+                 INT_MAX);
       }
     }
     else { // desired size is bigger

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/sqlcomp/QCache.h
----------------------------------------------------------------------
diff --git a/core/sql/sqlcomp/QCache.h b/core/sql/sqlcomp/QCache.h
index a3d03dc..b0a06c3 100644
--- a/core/sql/sqlcomp/QCache.h
+++ b/core/sql/sqlcomp/QCache.h
@@ -82,8 +82,6 @@ typedef CacheData*  CacheDataPtr;
 typedef CacheEntry* CacheEntryPtr;
 typedef TextData*   TextDataPtr;
 
-#define AM_AN_MPALIAS_QUERY " AmAnMpAliasQ "
-
 ULng32 getDefaultInK(const Int32& key);
 
 class CQDefault : public NABasicObject {
@@ -1487,11 +1485,6 @@ class QCache : public NABasicObject {
   //           from cache. This is used by recompiles to make sure all
   //           outdated cached entries that match a query are decached.
 
-  // decache all mpalias queries
-  void deCacheAliases();
-  // modifies: cache
-  // effects : decaches all mpalias queries
-
   // decache a preparser cache entry
   void deCachePreParserEntry
     (TextKey  *stmt); // (IN) : key of a preparser cache entry
@@ -1793,10 +1786,6 @@ class QueryCache {
      RelExpr   *qry)  // (IN) : sql query
     { if (cache_) cache_->deCacheAll(stmt, qry); }
 
-  // decache all mpalias queries
-  void deCacheAliases()
-    { if (cache_) cache_->deCacheAliases(); }
-
   // decache a preparser cache entry
   void deCachePreParserEntry
     (TextKey  *stmt) // (IN) : key of a preparser cache entry

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/sqlcomp/nadefaults.cpp
----------------------------------------------------------------------
diff --git a/core/sql/sqlcomp/nadefaults.cpp b/core/sql/sqlcomp/nadefaults.cpp
index 5603ca3..af9ecce 100644
--- a/core/sql/sqlcomp/nadefaults.cpp
+++ b/core/sql/sqlcomp/nadefaults.cpp
@@ -444,11 +444,6 @@ SDDkwd__(ALLOW_DP2_ROW_SAMPLING,               "SYSTEM"),
   DDkwd__(ATTEMPT_ESP_PARALLELISM,		"ON"),
   DDkwd__(ATTEMPT_REVERSE_SYNCHRONOUS_ORDER,    "ON"),
 
- //  Online Populate Index uses AuditImage for index tables only.
- // By setting this CQD to ON, one can generate AuditImage for
- // tables also.
- DDkwd__(AUDIT_IMAGE_FOR_TABLES,	       "OFF"),
-
   DDkwd__(AUTOMATIC_RECOMPILATION,		"OFF"),
 
   DDkwd__(AUTO_QUERY_RETRY,                     "SYSTEM"),
@@ -1544,10 +1539,6 @@ SDDkwd__(EXE_DIAGNOSTIC_EVENTS,		"OFF"),
   DDui1__(GEN_HSHJ_NUM_BUFFERS,			"1"),
   DDui1__(GEN_HSHJ_SIZE_DOWN,			"2048"),
   DDui1__(GEN_HSHJ_SIZE_UP,			"2048"),
-  DDui1__(GEN_IAR_BUFFER_SIZE,                  "10240"),
-  DDui1__(GEN_IAR_NUM_BUFFERS,                  "1"),
-  DDui1__(GEN_IAR_SIZE_DOWN,                    "2"),
-  DDui1__(GEN_IAR_SIZE_UP,                      "4"),
   DDui1__(GEN_IMDT_BUFFER_SIZE,			"2"),
   DDui1__(GEN_IMDT_NUM_BUFFERS,			"1"),
   DDui1__(GEN_IMDT_SIZE_DOWN,			"2"),
@@ -2949,7 +2940,6 @@ SDDkwd__(ISO_MAPPING,           (char *)SQLCHARSETSTRING_ISO88591),
  // the largest number of cache entries that an unusually large cache
  // entry is allowed to displace from mxcmp's cache of query plans
  DD0_200000(QUERY_CACHE_MAX_VICTIMS,      "10"),
- DDkwd__(QUERY_CACHE_MPALIAS,               "OFF"),
  DD0_255(QUERY_CACHE_REQUIRED_PREFIX_KEYS, "255"),
  DDkwd__(QUERY_CACHE_RUNTIME,               "ON"),
 SDDflt0_(QUERY_CACHE_SELECTIVITY_TOLERANCE,       "0"),
@@ -2988,11 +2978,6 @@ SDDflt0_(QUERY_CACHE_SELECTIVITY_TOLERANCE,       "0"),
  // To be ANSI compliant you would have to set this default to 'FALSE'
  DDkwd__(READONLY_CURSOR,			"TRUE"),
 
- // ReadTableDef compares transactional identifiers during endTransaction() processing
- DDkwd__(READTABLEDEF_TRANSACTION_ASSERT,			"OFF"),
- DDkwd__(READTABLEDEF_TRANSACTION_ENABLE_WARNINGS,		"OFF"),
- DDint__(READTABLEDEF_TRANSACTION_TESTPOINT,                    "0"),
-
  DDflt0_(READ_AHEAD_MAX_BLOCKS,	    "16.0"),
  // OFF means Ansi/NIST setting, ON is more similar to the SQL/MP behavior
  DDkwd__(RECOMPILATION_WARNINGS,		"OFF"),
@@ -3636,7 +3621,6 @@ XDDkwd__(SUBQUERY_UNNESTING,			"ON"),
   DDkwd__(USTAT_USE_SLIDING_SAMPLE_RATIO,       "ON"), // Trend sampling rate down w/increasing table size, going
                                                        //   flat at 1%.
  XDDflt1_(USTAT_YOULL_LIKELY_BE_SORRY,          "100000000"),  // guard against unintentional long-running UPDATE STATS
-  DDkwd__(VALIDATE_RFORK_REDEF_TS,	        "OFF"),
 
   DDkwd__(VALIDATE_VIEWS_AT_OPEN_TIME,		"OFF"),
 
@@ -4037,7 +4021,6 @@ void NADefaults::initCurrentDefaultsWithDefaultDefaults()
     {
       currentDefaults_[GENERATE_EXPLAIN] = "ON";
       currentDefaults_[DO_RUNTIME_EID_SPACE_COMPUTATION] = "ON";
-      currentDefaults_[DETAILED_STATISTICS] = "MEASURE";
     }
   else
     {
@@ -6342,7 +6325,6 @@ const char *NADefaults::keywords_[DF_lastToken] = {
   "LOCAL_NODE",
   "LOG",
   "MAXIMUM",
-  "MEASURE",
   "MEDIUM",
   "MEDIUM_LOW",
   "MERGE",
@@ -6351,7 +6333,6 @@ const char *NADefaults::keywords_[DF_lastToken] = {
   "MULTI_NODE",
   "MVCC",
   "NONE",
-  "NSK",
   "OFF",
   "ON",
   "OPENS_FOR_WRITE",
@@ -6590,7 +6571,7 @@ DefaultToken NADefaults::token(Int32 attrEnum,
       break;
 
     case DETAILED_STATISTICS:
-      if (tok == DF_ALL || tok == DF_MEASURE ||
+      if (tok == DF_ALL ||
 	  tok == DF_ACCUMULATED || tok == DF_OPERATOR ||
 	  tok == DF_PERTABLE || tok == DF_OFF)
 	isValid = TRUE;
@@ -6632,7 +6613,7 @@ DefaultToken NADefaults::token(Int32 attrEnum,
            tok == DF_REPSEL || tok == DF_QS)
           isValid = TRUE;
      break;
-    case QUERY_CACHE_MPALIAS:
+
     case QUERY_TEMPLATE_CACHE:
     case SHARE_TEMPLATE_CACHED_PLANS:
     case VSBB_TEST_MODE:
@@ -6713,8 +6694,7 @@ DefaultToken NADefaults::token(Int32 attrEnum,
       break;
 
     case NAMETYPE:
-      if (tok == DF_ANSI	 || tok == DF_SHORTANSI ||
-          tok == DF_NSK)
+      if (tok == DF_ANSI	 || tok == DF_SHORTANSI)
         isValid = TRUE;
       break;
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/sqlmsg/ErrorMessage.h
----------------------------------------------------------------------
diff --git a/core/sql/sqlmsg/ErrorMessage.h b/core/sql/sqlmsg/ErrorMessage.h
index d621086..21ca07b 100644
--- a/core/sql/sqlmsg/ErrorMessage.h
+++ b/core/sql/sqlmsg/ErrorMessage.h
@@ -43,7 +43,6 @@
 
 #undef max
 #undef min
-#undef ERROR
 
 class SqlciEnv;
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/sqlmsg/GetErrorMessage.cpp
----------------------------------------------------------------------
diff --git a/core/sql/sqlmsg/GetErrorMessage.cpp b/core/sql/sqlmsg/GetErrorMessage.cpp
index 895b8f2..204b3e0 100644
--- a/core/sql/sqlmsg/GetErrorMessage.cpp
+++ b/core/sql/sqlmsg/GetErrorMessage.cpp
@@ -138,7 +138,6 @@ private:
 static NAList<SqlstateInfo*> listOfSqlstates_(NULL);
 static pthread_mutex_t       listOfSqlstates_mutex = PTHREAD_MUTEX_INITIALIZER;
 
-SQLERRORS_LIB_FUNC 
 NABoolean GetSqlstateInfo(Lng32 sqlcode, char * sqlstate,
 			  NABoolean &fabricatedSqlstate)
 {
@@ -168,7 +167,6 @@ NABoolean GetSqlstateInfo(Lng32 sqlcode, char * sqlstate,
   return found;
 }
 
-SQLERRORS_LIB_FUNC 
 void AddSqlstateInfo(Lng32 sqlcode, char * sqlstate,
 		     NABoolean fabricatedSqlstate)
 {

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/sqlmsg/GetErrorMessage.h
----------------------------------------------------------------------
diff --git a/core/sql/sqlmsg/GetErrorMessage.h b/core/sql/sqlmsg/GetErrorMessage.h
index 7989aac..3e14c34 100644
--- a/core/sql/sqlmsg/GetErrorMessage.h
+++ b/core/sql/sqlmsg/GetErrorMessage.h
@@ -43,16 +43,6 @@
 #include "NABoolean.h"
 #include "NAWinNT.h"
 
-#ifdef _WINDOWS
-    #ifdef SQLERRORS_LIB
-      #define SQLERRORS_LIB_FUNC __declspec( dllexport )
-    #else
-      #define SQLERRORS_LIB_FUNC __declspec( dllimport )
-    #endif
-#else
-    #define SQLERRORS_LIB_FUNC
-#endif
-
 enum MsgTextType { ERROR_TEXT=1,
                    CAUSE_TEXT,
                    EFFECT_TEXT,
@@ -74,15 +64,15 @@ extern "C"
 #endif
 
 
-SQLERRORS_LIB_FUNC void 	 GetErrorMessageRebindMessageFile();
-SQLERRORS_LIB_FUNC char 	*GetPastHeaderOfErrorMessage(char *text);
+void 	 GetErrorMessageRebindMessageFile();
+char 	*GetPastHeaderOfErrorMessage(char *text);
 
 
-SQLERRORS_LIB_FUNC const char 	*GetErrorMessageFileName();
+const char 	*GetErrorMessageFileName();
 
-SQLERRORS_LIB_FUNC short GetErrorMessageRC (Lng32 num, NAWchar *msgBuf, Lng32 bufSize);
+short GetErrorMessageRC (Lng32 num, NAWchar *msgBuf, Lng32 bufSize);
 
-SQLERRORS_LIB_FUNC short GetErrorMessage (Lng32 error_code, 
+short GetErrorMessage (Lng32 error_code, 
                                           NAWchar*& return_text,
                                           MsgTextType M_type = ERROR_TEXT,
                                           NAWchar *alternate_return_text = NULL,
@@ -92,7 +82,7 @@ SQLERRORS_LIB_FUNC short GetErrorMessage (Lng32 error_code,
 
 
 
-SQLERRORS_LIB_FUNC void ErrorMessageOverflowCheckW (NAWchar *buf, size_t maxsiz);
+void ErrorMessageOverflowCheckW (NAWchar *buf, size_t maxsiz);
 
 
 #ifdef __cplusplus

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/udrserv/UdrStreams.cpp
----------------------------------------------------------------------
diff --git a/core/sql/udrserv/UdrStreams.cpp b/core/sql/udrserv/UdrStreams.cpp
index b24c4f9..661c63e 100644
--- a/core/sql/udrserv/UdrStreams.cpp
+++ b/core/sql/udrserv/UdrStreams.cpp
@@ -251,7 +251,7 @@ void UdrServerDataStream::actOnReceive(IpcConnection *conn)
   
 } // UdrServerDataStream::actOnReceive()
 
-#if (defined(NA_GUARDIAN_IPC) || defined(NA_GUARDIAN_MSG))
+#if (defined(NA_GUARDIAN_IPC))
 void
 UdrGuaControlConnection::actOnSystemMessage(
   short                  messageNum,

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/udrserv/spinfo.cpp
----------------------------------------------------------------------
diff --git a/core/sql/udrserv/spinfo.cpp b/core/sql/udrserv/spinfo.cpp
index 4bd708d..cdfa6de 100644
--- a/core/sql/udrserv/spinfo.cpp
+++ b/core/sql/udrserv/spinfo.cpp
@@ -283,7 +283,7 @@ SPInfo::SPInfo(UdrGlobals *udrGlobals,
 
   Lng32 diagsPad = 1000;
 
-#ifdef NA_DEBUG_C_RUNTIME
+#ifdef _DEBUG
   //
   // In a debug build we can get the pad size from the Java system
   // property UDR_BUFFER_PAD.
@@ -297,7 +297,7 @@ SPInfo::SPInfo(UdrGlobals *udrGlobals,
       diagsPad = tempPad;
     }
   }
-#endif // NA_DEBUG_C_RUNTIME
+#endif // _DEBUG
 
   maxBufSize += diagsPad;
   IpcMessageBuffer::alignOffset(maxBufSize);
@@ -1689,7 +1689,7 @@ SPInfo::processOneRequestRow(SqlBuffer *reqSqlBuf,
     udrGlobals_->numErrInvokeSP_++;
   }
 
-#ifdef NA_DEBUG_C_RUNTIME
+#ifdef _DEBUG
   // In the debug build we allow the UDR server to corrupt the reply
   // by reversing the diags flag for this reply row. In response the
   // executor should cause the statement to fail due to some sort of

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/udrserv/udrglobals.cpp
----------------------------------------------------------------------
diff --git a/core/sql/udrserv/udrglobals.cpp b/core/sql/udrserv/udrglobals.cpp
index c0817fb..89f5689 100644
--- a/core/sql/udrserv/udrglobals.cpp
+++ b/core/sql/udrserv/udrglobals.cpp
@@ -128,12 +128,7 @@ UdrGlobals::UdrGlobals(NAHeap *udrheap, NAHeap *ipcheap)
   Int32 i;
   Int32 j;
   for (i=0; i<UDRMAXOPENERS_V100; i++)
-#if (defined (NA_LINUX) && defined (SQ_NEW_PHANDLE))
-          XPROCESSHANDLE_NULLIT_(&(gOpenerPhandle_[i].phandle_));
-#else
-	  for (j=0; j<10; j++)
-		gOpenerPhandle_[i].phandle_[j] = NULL;
-#endif // NA_LINUX
+    XPROCESSHANDLE_NULLIT_(&(gOpenerPhandle_[i].phandle_));
 
   str_cpy_all(serverName_, "tdm_udrserv", str_len("tdm_udrserv"));
   serverName_[str_len("tdm_udrserv")] = '\0';

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/udrserv/udrload.cpp
----------------------------------------------------------------------
diff --git a/core/sql/udrserv/udrload.cpp b/core/sql/udrserv/udrload.cpp
index 9e74f74..09194db 100644
--- a/core/sql/udrserv/udrload.cpp
+++ b/core/sql/udrserv/udrload.cpp
@@ -372,13 +372,13 @@ void processALoadMessage(UdrGlobals *UdrGlob,
     ServerDebug("[UdrServ (%s)] About to send LOAD reply", moduleName);
   }
 
-#ifdef NA_DEBUG_C_RUNTIME
+#ifdef _DEBUG
   if (UdrGlob && UdrGlob->getJavaLM())
   {
     sleepIfPropertySet(*(UdrGlob->getJavaLM()),
                        "MXUDR_LOAD_DELAY", diags);
   }
-#endif // NA_DEBUG_C_RUNTIME
+#endif // _DEBUG
 
   sendControlReply(UdrGlob, msgStream, sp);
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/udrserv/udrserv.cpp
----------------------------------------------------------------------
diff --git a/core/sql/udrserv/udrserv.cpp b/core/sql/udrserv/udrserv.cpp
index a65c10d..3bc69ed 100644
--- a/core/sql/udrserv/udrserv.cpp
+++ b/core/sql/udrserv/udrserv.cpp
@@ -90,8 +90,8 @@ DEFINE_DOVERS(tdm_udrserv)
 // Global pointer to the UdrGlobals instance
 UdrGlobals *UDR_GLOBALS = NULL;
 
-extern THREAD_P SQLEXPORT_LIB_FUNC jmp_buf ExportJmpBuf;
-extern THREAD_P SQLEXPORT_LIB_FUNC jmp_buf* ExportJmpBufPtr;
+extern THREAD_P jmp_buf ExportJmpBuf;
+extern THREAD_P jmp_buf* ExportJmpBufPtr;
 
 void processASessionMessage(UdrGlobals *UdrGlob,
                             UdrServerReplyStream &msgStream,
@@ -361,7 +361,7 @@ Int32 main(Int32 argc, char **argv)
 
 static void runServer(Int32 argc, char **argv)
 {
-#ifdef NA_DEBUG_C_RUNTIME
+#ifdef _DEBUG
   UDR_DEBUG1("Process ID: %ld", (Lng32) GETPID());
   UDR_DEBUG0("[BEGIN argv]");
   Int32 i;
@@ -396,7 +396,7 @@ static void runServer(Int32 argc, char **argv)
     showMsgBox = TRUE;
   }
 
-#ifdef NA_DEBUG_C_RUNTIME
+#ifdef _DEBUG
   putenv((char *)"MXUDR_DEBUG_BUILD=1");
 #endif
 
@@ -483,7 +483,7 @@ static void runServer(Int32 argc, char **argv)
         UdrServerReplyStream *stream = replyStreams[0];
         replyStreams.removeAt(0);
 
-#ifdef NA_DEBUG_C_RUNTIME
+#ifdef _DEBUG
           Lng32 crashPoint = 0;
 #endif
         if (stream->moreObjects())
@@ -491,7 +491,7 @@ static void runServer(Int32 argc, char **argv)
           UdrIpcObjectType msgType =
            (UdrIpcObjectType) stream->getNextObjType();
 
-#ifdef NA_DEBUG_C_RUNTIME
+#ifdef _DEBUG
           // Bring the process down if an environment variable value
           // matches the message type
           const char *crashString = getenv("MXUDR_CRASH_POINT");
@@ -511,7 +511,7 @@ static void runServer(Int32 argc, char **argv)
           // Do some real work on the incoming message
           processARequest(UDR_GLOBALS, *stream, *env);
 
-#ifdef NA_DEBUG_C_RUNTIME
+#ifdef _DEBUG
           // Bring the process down if the environment variable checked
           // earlier has a negative value and its positive value matches
           // the message type
@@ -1088,7 +1088,7 @@ static void displayUsageInfo()
   fprintf(stdout, "    Verify UDR Server and Language Manager startup.\n");
   fprintf(stdout, "\n");
 
-#ifdef NA_DEBUG_C_RUNTIME
+#ifdef _DEBUG
   // The "-invoke" and "-obey" options are supported in the release
   // build but we do not tell users about them in this help message.
   fprintf(stdout, "  mxudr -invoke [-n N] [-param java|c] [-rs numRS]\n");

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/udrserv/udrunload.cpp
----------------------------------------------------------------------
diff --git a/core/sql/udrserv/udrunload.cpp b/core/sql/udrserv/udrunload.cpp
index 63ad2f9..bfc2e01 100644
--- a/core/sql/udrserv/udrunload.cpp
+++ b/core/sql/udrserv/udrunload.cpp
@@ -181,13 +181,13 @@ void processAnUnLoadMessage(UdrGlobals *UdrGlob,
     ServerDebug("[UdrServ (%s)] Send Unload Reply", moduleName);
   }
 
-#ifdef NA_DEBUG_C_RUNTIME
+#ifdef _DEBUG
   if (UdrGlob && UdrGlob->getJavaLM())
   {
     sleepIfPropertySet(*(UdrGlob->getJavaLM()),
                        "MXUDR_UNLOAD_DELAY", diags);
   }
-#endif // NA_DEBUG_C_RUNTIME
+#endif // _DEBUG
 
   sendControlReply(UdrGlob, msgStream, NULL);
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/udrserv/udrutil.cpp
----------------------------------------------------------------------
diff --git a/core/sql/udrserv/udrutil.cpp b/core/sql/udrserv/udrutil.cpp
index 27c2e75..e2262b3 100644
--- a/core/sql/udrserv/udrutil.cpp
+++ b/core/sql/udrserv/udrutil.cpp
@@ -620,7 +620,7 @@ void doMessageBox(UdrGlobals *UdrGlob, Int32 trLevel,
 }
 // LCOV_EXCL_STOP
 
-#ifdef NA_DEBUG_C_RUNTIME
+#ifdef _DEBUG
 void sleepIfPropertySet(LmLanguageManager &lm,
 	const char *property,
 	ComDiagsArea *d)
@@ -648,7 +648,7 @@ NABoolean getLmProperty(LmLanguageManager &lm,
   }
   return ok;
 }
-#endif // NA_DEBUG_C_RUNTIME
+#endif // _DEBUG
 
 // This function is used by the signal/trap/exit handler code.
 // It is moved from UdrFFDC.cpp file to avoid compilation errors.

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/udrserv/udrutil.h
----------------------------------------------------------------------
diff --git a/core/sql/udrserv/udrutil.h b/core/sql/udrserv/udrutil.h
index c9020c1..ad8e508 100644
--- a/core/sql/udrserv/udrutil.h
+++ b/core/sql/udrserv/udrutil.h
@@ -71,7 +71,7 @@ void doMessageBox(UdrGlobals *UdrGlob, Int32 trLevel,
                   NABoolean moduleType, const char *moduleName);
 
 
-#ifdef NA_DEBUG_C_RUNTIME
+#ifdef _DEBUG
 void sleepIfPropertySet(LmLanguageManager &lm,
                         const char *property,
                         ComDiagsArea *d);
@@ -79,7 +79,7 @@ NABoolean getLmProperty(LmLanguageManager &lm,
                         const char *property,
                         Lng32 &result,
                         ComDiagsArea *diags);
-#endif // NA_DEBUG_C_RUNTIME
+#endif // _DEBUG
 
 void  getActiveRoutineInfo(UdrGlobals *UdrGlob, 
                            char *routineName,

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/ustat/hs_cli.cpp
----------------------------------------------------------------------
diff --git a/core/sql/ustat/hs_cli.cpp b/core/sql/ustat/hs_cli.cpp
index 55b27ee..8e207e9 100644
--- a/core/sql/ustat/hs_cli.cpp
+++ b/core/sql/ustat/hs_cli.cpp
@@ -57,7 +57,6 @@
 #include "ComMPLoc.h"
 #include "CmpContext.h"
 #include "CompException.h"
-#include "ReadTableDef.h"
 #include "hs_globals.h"
 #include "hs_cli.h"
 #include "hs_auto.h"
@@ -3738,8 +3737,6 @@ Lng32 HSCursor::fetchNumColumn( const char *clistr
 
   switch(colDesc_[0].length)
     {
-#ifdef NA_64BIT
-    // dg64 - Int64 already taken care of below
     case sizeof(Int32):
       {
         Int32 tmp;
@@ -3752,20 +3749,6 @@ Lng32 HSCursor::fetchNumColumn( const char *clistr
           *pLargeValue = (Int64)tmp;
         break;
       }
-#else
-    case sizeof(Lng32):
-      {
-        Lng32 tmp;
-        memcpy((char *) &tmp,
-               colDesc_[0].data,
-               sizeof(Lng32));
-        if (pSmallValue != NULL)
-          *pSmallValue = tmp;
-        if (pLargeValue != NULL)
-          *pLargeValue = (Int64)tmp;
-        break;
-      }
-#endif
     case sizeof(Int64):
       {
         Int64 tmp;
@@ -3811,7 +3794,7 @@ Lng32 HSCursor::fetchCharNumColumn(const char *clistr, NAString &value1, Int64 &
   {
     // Copy varchar output to 'value'.  First byte is length of varchar.
     // Varchar data starts at byte 3.
-#if defined(NA_LITTLE_ENDIAN) || defined(NA_WINNT)
+#if defined(NA_LITTLE_ENDIAN)
     char length = colDesc_[0].data[0];
 #elif defined(NA_BIG_ENDIAN)
     char length = colDesc_[0].data[1];

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/ustat/hs_globals.cpp
----------------------------------------------------------------------
diff --git a/core/sql/ustat/hs_globals.cpp b/core/sql/ustat/hs_globals.cpp
index d48d41a..afed2c6 100644
--- a/core/sql/ustat/hs_globals.cpp
+++ b/core/sql/ustat/hs_globals.cpp
@@ -62,7 +62,6 @@
 #include "CompException.h"
 #include "SQLTypeDefs.h"
 #include "csconvert.h"
-#include "ReadTableDef.h"
 #include "exp_clause_derived.h"  // convDoIt
 #include "ExSqlComp.h" // for NAExecTrans()
 #include "sql_id.h"
@@ -15102,7 +15101,6 @@ static short convInt64ToAscii(char *target,
 // 1 byte for at least one digit after decimal point
 // 5 bytes for exponent (E+DDD)
 ///////////////////////////////////////////////////////////////////
-//NA_EIDPROC
 static short convFloat64ToAscii(char *target,
 		 Lng32 targetLen,
 			double source,

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/ustat/hs_read.cpp
----------------------------------------------------------------------
diff --git a/core/sql/ustat/hs_read.cpp b/core/sql/ustat/hs_read.cpp
index 07ffe74..f8f9114 100644
--- a/core/sql/ustat/hs_read.cpp
+++ b/core/sql/ustat/hs_read.cpp
@@ -61,8 +61,6 @@
 #include "Stats.h"
 #include "CmpSqlSession.h"
 
-#include "ReadTableDef.h"
-
 #include "ExSqlComp.h"          // for NAExecTrans
 
 #include "hs_globals.h"

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/ustat/hs_update.cpp
----------------------------------------------------------------------
diff --git a/core/sql/ustat/hs_update.cpp b/core/sql/ustat/hs_update.cpp
index 38b0802..78a2cf6 100644
--- a/core/sql/ustat/hs_update.cpp
+++ b/core/sql/ustat/hs_update.cpp
@@ -54,7 +54,6 @@
 #define   SQLPARSERGLOBALS_FLAGS				  
 #include "SqlParserGlobals.h"
 #include "SchemaDB.h"
-#include "ReadTableDef.h"
 
 THREAD_P char *hs_input = NULL;
 THREAD_P HSGlobalsClass *hs_globals_y = NULL; // Declare global pointer to hs_globals.  Used by 


Mime
View raw message