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:54:55 UTC
[01/30] incubator-trafodion git commit: TRAFODION-2731 CodeCleanup:
Remove obsolete, legacy and unused code
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
[04/30] incubator-trafodion git commit: TRAFODION-2731 CodeCleanup:
Remove obsolete, legacy and unused code
Posted by an...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/generator/GenExpGenerator.cpp
----------------------------------------------------------------------
diff --git a/core/sql/generator/GenExpGenerator.cpp b/core/sql/generator/GenExpGenerator.cpp
index 31e6f11..c0c6108 100644
--- a/core/sql/generator/GenExpGenerator.cpp
+++ b/core/sql/generator/GenExpGenerator.cpp
@@ -165,7 +165,6 @@ ExpGenerator::ExpGenerator(Generator * generator_)
ex_expr::PCODE_LLO;
break;
}
-#ifdef NA_64BIT
static Int32 pcodeEnvSet = 0;
static Int32 pcodeEnv = 1; // if non-zero, pcode is enabled as before.
if (pcodeEnvSet == 0)
@@ -178,7 +177,6 @@ ExpGenerator::ExpGenerator(Generator * generator_)
}
if (pcodeEnv == 0)
pCodeMode_ = ex_expr::PCODE_NONE;
-#endif
addPCodeMode( ex_expr::PCODE_SPECIAL_FIELDS );
@@ -4832,9 +4830,7 @@ short ExpGenerator::endExprGen(ex_expr ** expr, short gen_last_clause)
clause;
clause = clause->getNextClause())
{
- if ((clause->getClassID() == ex_clause::FUNC_EXTRACT_COLUMNS) ||
- (clause->getClassID() == ex_clause::FUNC_AUDIT_ROW_IMAGE) ||
- (clause->getClassID() == ex_clause::FUNC_HBASE_COLUMN_CREATE) ||
+ if ((clause->getClassID() == ex_clause::FUNC_HBASE_COLUMN_CREATE) ||
(clause->getClassID() == ex_clause::FUNC_HBASE_COLUMNS_DISPLAY))
tooHard = TRUE;
break;
@@ -5332,150 +5328,6 @@ short ExpGenerator::generateSamplingExpr(const ValueId &valId, ex_expr **expr,
return 0;
}
-short ExpGenerator::generateIarExtractionExpr (
- Int32 workAtp,
- Int32 workAtpIndex,
- const ValueIdList &extractedColIdList,
- Int32 extractedRowLen,
- const ValueId &auditImageId,
- const ValueId &mfMapId,
- ExpTupleDesc *extractedRowDesc,
- ExpTupleDesc *auditImageDesc,
- ULng32 *extractColList,
- UInt32 compressedAuditFlag,
- ULng32 encodedKeyLength,
- ex_expr ** expr )
-{
- ExFunctionExtractColumns *extractClause = 0;
-
- // 3 operands.
- // input: the audit row image and possibly the mfMap, in the
- // upEntry/downEntry atp, atp 0.
- // output: the extracted tuple, in the upEntry atp, atp 0.
- short numOperands;
- short totalNumOperands;
- Attributes **attr;
-
- // Compute how many input operands this expression will work with. If
- // a null constant is passed in for the modified field map (this is allowed
- // by the parser), then there is no need to process it or pass it in as an
- // operand. A flag is set in the expression indicating that a null constant
- // was used. Note that only a null constant can be passed in - any other
- // constant value should be caught by the parser, but if not, will cause
- // an assertion here.
- if (mfMapId.getItemExpr()->getOperatorType() == ITM_CONSTANT)
- {
- ConstValue * constant = (ConstValue *)(mfMapId.getItemExpr());
- GenAssert((constant->isNull()), "Cannot have a non-null constant value for the modified field map parameter to INTERPRET_AS_ROW");
-
- numOperands = 2;
- }
- else
- numOperands = 3;
-
- totalNumOperands = numOperands;
-
- // Initialize clause list, constants list etc. and allocate a map table.
- // By not calling initExprGen() we avoid using tempSapce.
- // We don't want to use tempSpace here because the datamembers of
- // EXE_IAR_ERROR_EXTRACTING_COLUMNS actully use fagment space.
- // Such uses confuse the codeGenerator() during packing and unpacking
- // that is used as part of the Leaner Expressiopn project.
- // Hence we use fragment space for generating IAR expressions.
- // initExprGen();
- startExprGen(expr,ex_expr::exp_ARITH_EXPR);
-
- // This is a showplan statement.
- if (getShowplan())
-#pragma nowarn(1506)
- totalNumOperands = totalNumOperands * 2;
-#pragma warn(1506)
-
- attr = new(generator->wHeap()) Attributes * [totalNumOperands];
-
- // attr[0] gives the extracted row, i.e., the extracted columns. Allocate
- // an Attribute object with the atp set to the workAtp and the atpIndex
- // set to workAtpIndex. Initialize all the other relevant attributes.
- attr[0] = (Attributes *) new(generator->wHeap())
- SimpleType(extractedRowLen, 1, 0);
- attr[0]->setDatatype(REC_BYTE_F_ASCII);
- attr[0]->setTupleFormat(ExpTupleDesc::SQLARK_EXPLODED_FORMAT);
- attr[0]->setOffset(0);
- attr[0]->setNullIndicatorLength(0);
- attr[0]->setNullFlag(0);
- attr[0]->setVCIndicatorLength(0);
-#pragma nowarn(1506)
- attr[0]->setAtpIndex(workAtpIndex);
- attr[0]->setAtp(workAtp);
-#pragma warn(1506)
-
- // attr[1] gives the input audit row image
- attr[1] = generator->getMapInfo(auditImageId)->getAttr();
-
- if (numOperands == 3)
- {
- // attr[2] gives the input modified field map
- attr[2] = generator->getMapInfo(mfMapId)->getAttr();
- }
-
- if (getShowplan())
- {
- attr[0]->setShowplan();
- NAString extractedCols;
- for (CollIndex i=0; i<extractedColIdList.entries(); i++)
- {
- extractedCols += extractedColIdList[i].getItemExpr()->getText();
- if (i < extractedColIdList.entries() - 1)
- extractedCols += ", ";
- }
-
-#pragma nowarn(1506)
- ValueId dummyValId(NULL_VALUE_ID);
- attr[numOperands] = new(generator->wHeap())
- ShowplanAttributes
- (dummyValId,
- convertNAString(extractedCols,
- generator->wHeap())
- );
- attr[numOperands+1] = new(generator->wHeap())
- ShowplanAttributes
- (auditImageId,
- convertNAString(auditImageId.getItemExpr()->getText(),
- generator->wHeap())
- );
- if (numOperands == 3)
- {
- attr[numOperands+2] = new(generator->wHeap())
- ShowplanAttributes
- (mfMapId,
- convertNAString(mfMapId.getItemExpr()->getText(),
- generator->wHeap())
- );
- }
-#pragma warn(1506)
-
- }
-
- // Create the extraction clause, which has the information to do the
- // actual work.
- extractClause = new(getSpace()) ExFunctionExtractColumns(ITM_EXTRACT_COLUMNS,
- numOperands,
- attr,
- getSpace(),
- compressedAuditFlag,
- extractColList,
- encodedKeyLength,
- auditImageDesc,
- extractedRowDesc);
-
- // Add extract clause to the clause_list. This is attached to the expression
- // by the method endExprGen().
- linkClause(0, extractClause);
-
- endExprGen (expr, -1);
- return 0;
-}
-
MapInfo *ExpGenerator::addTemporary(ValueId val, MapTable *mapTable)
{
// Add the value ID to the last map table.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/generator/GenExpGenerator.h
----------------------------------------------------------------------
diff --git a/core/sql/generator/GenExpGenerator.h b/core/sql/generator/GenExpGenerator.h
index 6ec022e..2e7a051 100644
--- a/core/sql/generator/GenExpGenerator.h
+++ b/core/sql/generator/GenExpGenerator.h
@@ -615,21 +615,6 @@ public:
ConstNAStringPtr *colNamesForExpr,
ConstQualifiedNamePtr *tblNamesForExpr);
- // generate code to extract columns from an audit row image, as required
- // by the INTERPRET_AS_ROW function.
- short generateIarExtractionExpr(Int32 workAtp,
- Int32 workAtpIndex,
- const ValueIdList &extractedColIdList,
- Int32 extractedRowLen,
- const ValueId &auditImageId,
- const ValueId &mfMapId,
- ExpTupleDesc *extractedRowDesc,
- ExpTupleDesc *auditImageDesc,
- ULng32 *extractColList,
- UInt32 compressedAuditFlag,
- ULng32 encodedKeyLength,
- ex_expr ** expr );
-
//////////////////////////////////////////////////////////////////////
// Input is a ValueIdList to be copied into a contiguous buffer.
// Adds convert nodes before moving, if addConvNodes is true.
@@ -1053,7 +1038,7 @@ public:
flags_ &= ~SAVE_CLAUSES_IN_EXPR;
};
- NA_EIDPROC NABoolean saveClausesInExpr() {
+ NABoolean saveClausesInExpr() {
return ((flags_ & SAVE_CLAUSES_IN_EXPR) != 0);
};
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/generator/GenExplain.cpp
----------------------------------------------------------------------
diff --git a/core/sql/generator/GenExplain.cpp b/core/sql/generator/GenExplain.cpp
index 738d95e..1997674 100644
--- a/core/sql/generator/GenExplain.cpp
+++ b/core/sql/generator/GenExplain.cpp
@@ -1395,8 +1395,6 @@ RelRoot::addSpecificExplainInfo(ExplainTupleMaster *explainTuple,
// on different systems.
if ((child(0) && child(0)->castToRelExpr()->getOperatorType() == REL_DDL) &&
(sqlmxRegress))
- // (val = ActiveControlDB()->getControlSessionValue("EXPLAIN")) &&
- // (*val == "ON"))
{
explainTuple->setDescription(statement);
@@ -1406,10 +1404,6 @@ RelRoot::addSpecificExplainInfo(ExplainTupleMaster *explainTuple,
char buf[20];
- statement += "statement_index: ";
- sprintf(buf,"%d ", CmpCommon::statement()->getStmtIndex());
- statement += buf;
-
// For Adaptive Segmentation
//
statement += "affinity_value: ";
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/generator/GenItemFunc.cpp
----------------------------------------------------------------------
diff --git a/core/sql/generator/GenItemFunc.cpp b/core/sql/generator/GenItemFunc.cpp
index bf0b306..8b40c9a 100644
--- a/core/sql/generator/GenItemFunc.cpp
+++ b/core/sql/generator/GenItemFunc.cpp
@@ -2469,225 +2469,6 @@ newExpr->codeGen(generator);
return 0;
}
-
-short AuditImage::codeGen(Generator * generator)
-{
- // Used to save the original Expression Generator.
- ExpGenerator *saveExpGen = NULL;
-
- try
- {
- Attributes ** attr;
- Int32 numAttrs = 1 /* result */ + getArity();
-
- if (generator->getExpGenerator()->genItemExpr
- (this, // (IN) : the tree for which code is to be generated
- &attr, // (OUT): the generated attributes array is returned here
- numAttrs, // 1 (result) + number of children
- -1 // if -1, generate code for children.
- )
- == 1)
- return 0;
-
- // Note that we always generate a Cast operator here, even
- // if it's not necessary. Because columnValuesVidList may be a
- // VEGReference and it may not be possible to determine its
- // exact type at this time. This Cast operator serves dual purpose -
- // in addition to casting the result of VEGReference resolution
- // to the original datatype, it moves the result value to the target
- // location. We would have opted to add a conv node (parameter 2) in
- // our call to generateContiguousMoveExpr() to do the move if we
- // hadn't introduced the Cast operator here.
-
- ValueIdList typedColumnValueVidList;
- Lng32 numChildren = getNumChildren();
- for (Lng32 i = 0; i < numChildren; i++)
- {
- // cast the key column to the exact type of the original key column
- const NAType &oType = *columnTypeList_[i];
- ItemExpr *resultCastExpr = NULL;
-
- ItemExpr * ie = children()[i].getPtr();
-
- resultCastExpr = new(generator->wHeap()) Cast(ie,&oType);
- resultCastExpr->synthTypeAndValueId();
- resultCastExpr = resultCastExpr->preCodeGen(generator);
-
- // We assemble all the inputs to AI in a temporary tuple.
- // We don't need to explicitly set the (atp, atpIndx) as, we
- // get this as part of the codeGen of new cast expression.
- // The value is added to the temporary ATP (atp,atpindex) - (0,1).
- resultCastExpr->codeGen(generator);
-
- // Set these these cast nodes as the children.
- children().insertAt(i, resultCastExpr->getValueId());
-
- // Populate the typedColumnValueVidList. This list is
- // passed to generateContiguousMoveExpr.
- typedColumnValueVidList.insert(children()[i].getValueId());
- }
-
- // These cast nodes will copy the inputs to the temp tuple.
- // At runtime the temp tuple will be made available in (atp,atpindx) -(0,3)
- // So, modify the map table for the cast nodes to say (0,3)
- // for the atp and atp index.
- CollIndex idx=0;
- for (idx=0; idx<typedColumnValueVidList.entries(); idx++)
- {
- Attributes * mapAttr =
- generator->getMapInfo(typedColumnValueVidList[idx])->getAttr();
-
- mapAttr->setAtp(0);
- mapAttr->setAtpIndex(3);
- }
-
- // We use a separate ExpGenerator to generate the ex_expr
- // that builds the audit row image.
- ExpGenerator tempExpGen(generator);
-
- // Save the original one. We need to set it back to this value after
- // generataContiguousMoveExpr.
- saveExpGen = generator->getExpGenerator();
-
- // Use the temp Exp Generator for generateContiguousMoveExpr
- generator->setExpGenerator(&tempExpGen);
- generator->getExpGenerator()->setInContainerExpr(TRUE);
-
- // allocate a work cri desc to generate audit image. It has
- // 4 entries: 0, for consts. 1, for temps.
- // 2, for the audit row image.
- // 3, where the input tuple in EXPLODED format will be available.
- ex_cri_desc * auditRowImageCriDesc = new(generator->getSpace())
- ex_cri_desc(4, generator->getSpace());
- short auditRowImageAtpIndex = 2; // where the audit row image will be built
- ex_expr *auditRowImageExpr = NULL;
- ULng32 rowLength = 0;
- ExpTupleDesc * auditRowImageTupleDesc = 0;
-
- // Note that we opt to add a convert node (second parameter) in this call.
- // The above cast node will copy the inputs to AuditImage to the temporary
- // tuple, the convert node created as part of this generateContiguousMoveExpr
- // will copy the inputs from the temporary tuple to the result location.
-
- ExpTupleDesc::TupleDataFormat tupleFormat =
- generator->getTableDataFormat(getNATable());
-
- GenAssert((tupleFormat == ExpTupleDesc::SQLMX_FORMAT ||
- tupleFormat == ExpTupleDesc::SQLMX_ALIGNED_FORMAT )
- ,"AUDIT_IMAGE supported only for PACKED and ALIGNED format");
-
- // Tell the expression generator to gen a header clause.
- tempExpGen.setForInsertUpdate( TRUE );
-
- tempExpGen.generateContiguousMoveExpr
- (
- typedColumnValueVidList, // [IN] source ValueIds
- TRUE, // [IN] add convert nodes?
- 0, // [IN] target atp number
- auditRowImageAtpIndex, // [IN] target tupp index
- tupleFormat, // [IN]
- rowLength, // [OUT] target tuple length
- &auditRowImageExpr, // [OUT] move expression
- &auditRowImageTupleDesc, // [optional OUT] target tuple desc
- ExpTupleDesc::LONG_FORMAT // [optional IN] target desc format
- );
-
- // Need this to obtain the length of the row with no varChar columns.
- auditRowImageCriDesc->setTupleDescriptor(auditRowImageAtpIndex /* 2 */,
- auditRowImageTupleDesc);
-
- // Create a ExpDp2Expr and pass it to ExAuditImage clause.
- ExpDP2Expr * auditImageContainerExpr =
- new(generator->getSpace()) ExpDP2Expr(auditRowImageExpr,
- auditRowImageCriDesc,
- generator->getSpace());
-
- generator->getExpGenerator()->setInContainerExpr(FALSE);
- // Reset it back to the original.
- generator->setExpGenerator(saveExpGen);
-
- // Reset the map table entries for the input values to temp (atp, atpIndx)
- // - (0,1). This is the same as creating a map table with this information
- // without the overhead of creating a map table.
-
- for (idx=0; idx < typedColumnValueVidList.entries(); idx++)
- {
- Attributes * mapAttr = generator->getMapInfo(typedColumnValueVidList[idx])->getAttr();
- mapAttr->setAtp(0);
- mapAttr->setAtpIndex(1);
- }
-
- // Use the Expression Generator object from the Generator work area for
- // generating ExAuditImage.
- ExpGenerator * expGen = generator->getExpGenerator();
-
- // set the numAttrs to 2. Note that it was (1 /* result */ + getArity())
- // up till now. Beyond this the ExAuditImage clause will have two operands.
- // operand(0) - (attr[0]) represents the result.
- // operand(1) - points to the beginning of temp tuple
- // carrying the inputs.
-
- Int32 numAttrsSave = numAttrs;
- numAttrs = 2;
-
- Int32 numAttrsShowPlan =
- (generator->getExpGenerator()->getShowplan() ? numAttrs : 0);
- Attributes ** auditImageAttrs =
- new(generator->wHeap()) Attributes * [numAttrs + numAttrsShowPlan];
-
- // Copy the result attributes of AuditImage to auditImageAttrs[0]
- auditImageAttrs[0] = attr[0]->newCopy(generator->wHeap());
- if (numAttrsShowPlan)
- {
- // copy the showplan attributes for AuditImage result (attr[0]) as well
- auditImageAttrs[numAttrs] =
- attr[numAttrsSave]->newCopy(generator->wHeap());
- }
-
- // Since this attr represents the temps area, get its length.
- auditImageAttrs[1] = (Attributes *) new(generator->wHeap())
- SimpleType((Lng32)expGen->getTempsLength(),
- 1 /* scale */,
- 0 /* precision */);
- // ex_clause constructor requires the format to be set.
- auditImageAttrs[1]->setDatatype(REC_BYTE_F_ASCII);
- auditImageAttrs[1]->setTupleFormat(ExpTupleDesc::SQLARK_EXPLODED_FORMAT);
- auditImageAttrs[1]->setAtp(0);
- auditImageAttrs[1]->setAtpIndex(1);
- auditImageAttrs[1]->setOffset(0);
-
- if (numAttrsShowPlan)
- {
- // copy the showplan attributes for ExAuditImage's input tuple as well
- // Create ShowplanAttributes corresponding to auditImageAttrs[1].
- auditImageAttrs[numAttrs + 1] = new (generator->wHeap())
- ShowplanAttributes(0, /* NULL_VALUE_ID */
- convertNAString("TemporaryTupleWithAuditImageInputValues",
- generator->wHeap()));
- }
-
- ex_clause * function_clause =
- new(generator->getSpace()) ExAuditImage(auditImageAttrs,
- generator->getSpace(),
- auditImageContainerExpr
- );
-
- if (function_clause)
- expGen->linkClause(this, function_clause);
-
- return 0;
- } //try
-
- catch (...)
- {
- // Reset it back to the original.
- if(saveExpGen != NULL)
- generator->setExpGenerator(saveExpGen);
-
- throw;
- } // catch (...)
-}
-
short HbaseColumnLookup::codeGen(Generator * generator)
{
Attributes ** attr;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/generator/GenPreCode.cpp
----------------------------------------------------------------------
diff --git a/core/sql/generator/GenPreCode.cpp b/core/sql/generator/GenPreCode.cpp
index 0505432..1789cc0 100644
--- a/core/sql/generator/GenPreCode.cpp
+++ b/core/sql/generator/GenPreCode.cpp
@@ -44,7 +44,6 @@
#include "GroupAttr.h"
#include "AllRelExpr.h"
#include "RelPackedRows.h"
-#include "ReadTableDef.h"
#include "Generator.h"
#include "GenExpGenerator.h"
#include "dfs2rec.h"
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/generator/GenRelDCL.cpp
----------------------------------------------------------------------
diff --git a/core/sql/generator/GenRelDCL.cpp b/core/sql/generator/GenRelDCL.cpp
index ea0c8e1..10b1a4d 100644
--- a/core/sql/generator/GenRelDCL.cpp
+++ b/core/sql/generator/GenRelDCL.cpp
@@ -293,12 +293,7 @@ short RelSetTimeout::codeGen(Generator * generator)
char * varName;
GenAssert(hv->getName().data(), "Hostvar pointer must have name");
-#pragma nowarn(1506) // warning elimination
lateNameInfo->setEnvVar(hv->isEnvVar());
-#pragma warn(1506) // warning elimination
-#pragma nowarn(1506) // warning elimination
- lateNameInfo->setDefine(hv->isDefine());
-#pragma warn(1506) // warning elimination
varName = convertNAString(hv->getName(), generator->wHeap());
strcpy(lateNameInfo->variableName(), varName);
@@ -309,7 +304,6 @@ short RelSetTimeout::codeGen(Generator * generator)
lateNameInfo->setLastUsedName(prototypeValue, space);
strcpy(lateNameInfo->resolvedPhyName(), prototypeValue);
lateNameInfo->setVariable(1);
- lateNameInfo->setAvoidSimCheck(TRUE);
} // end of host-var
else if ( isForAllTables_ ) { // a "*" was specified for a table name
strcpy( lateNameInfo->resolvedPhyName(), "*" ); // special mark
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/generator/GenRelMisc.cpp
----------------------------------------------------------------------
diff --git a/core/sql/generator/GenRelMisc.cpp b/core/sql/generator/GenRelMisc.cpp
index c7ad623..33f90cb 100644
--- a/core/sql/generator/GenRelMisc.cpp
+++ b/core/sql/generator/GenRelMisc.cpp
@@ -40,7 +40,6 @@
#include "ComOptIncludes.h"
#include "GroupAttr.h"
#include "ItemColRef.h"
-#include "ReadTableDef.h"
#include "RelEnforcer.h"
#include "RelJoin.h"
#include "RelExeUtil.h"
@@ -1664,17 +1663,9 @@ short RelRoot::codeGen(Generator * generator)
char * varName;
GenAssert(hv->getName().data(), "Hostvar pointer must have name");
-#pragma nowarn(1506) // warning elimination
lateNameInfo->setEnvVar(hv->isEnvVar());
-#pragma warn(1506) // warning elimination
-#pragma nowarn(1506) // warning elimination
- lateNameInfo->setDefine(hv->isDefine());
-#pragma warn(1506) // warning elimination
-
-#pragma nowarn(1506) // warning elimination
lateNameInfo->setCachedParam(hv->isCachedParam());
-#pragma warn(1506) // warning elimination
varName = convertNAString(hv->getName(), generator->wHeap());
strcpy(lateNameInfo->variableName(), varName);
@@ -1795,7 +1786,6 @@ short RelRoot::codeGen(Generator * generator)
for (j = 0; j < numEntries; j++)
lnil->setLateNameInfo(j,((LateNameInfo *)(lnil + 1)) + j);
- NABoolean definePresent = FALSE;
NABoolean viewPresent = FALSE;
NABoolean variablePresent = FALSE;
@@ -1813,14 +1803,12 @@ short RelRoot::codeGen(Generator * generator)
if (src->isVariable())
{
doTablenameOltOpt = FALSE;
- if (src->isDefine())
- definePresent = TRUE;
}
// *tgt = *src wouldn't work since it doesn't copy over the vtblptr.
memmove(tgt,src,sizeof(LateNameInfo));
// find the position of this hostvar in input var list.
- if ((src->isVariable()) && (! src->isEnvVar()) && (! src->isDefine()))
+ if ((src->isVariable()) && (! src->isEnvVar()))
{
if (tgt->isCachedParam())
{
@@ -1854,18 +1842,11 @@ short RelRoot::codeGen(Generator * generator)
{
if (NOT tgt->isVariable())
{
- if (NOT tgt->isMPalias())
- tgt->setAnsiPhySame(TRUE);
- else
- tgt->setAnsiPhySame(FALSE);
+ tgt->setAnsiPhySame(TRUE);
}
else
{
- if (tgt->isMPalias())
- tgt->setAnsiPhySame(FALSE);
- else if (tgt->isDefine())
- tgt->setAnsiPhySame(TRUE);
- else if (tgt->isEnvVar())
+ if (tgt->isEnvVar())
tgt->setAnsiPhySame(TRUE);
else
{
@@ -1888,9 +1869,6 @@ short RelRoot::codeGen(Generator * generator)
char * compileTimeAnsiName = space->AllocateAndCopyToAlignedSpace(
qn.getQualifiedNameAsAnsiString(), 0);
tgt->setCompileTimeName(compileTimeAnsiName, space);
-
- if (tgt->isView())
- tgt->setMPalias(1);
}
} // else
@@ -1918,10 +1896,6 @@ short RelRoot::codeGen(Generator * generator)
}
#pragma nowarn(1506) // warning elimination
- lnil->setDefinePresent(definePresent);
-#pragma warn(1506) // warning elimination
-
-#pragma nowarn(1506) // warning elimination
lnil->setViewPresent(viewPresent);
#pragma warn(1506) // warning elimination
@@ -2733,7 +2707,6 @@ short RelRoot::codeGen(Generator * generator)
if ((NOT root_tdb->getUpdAbortOnError()) &&
(NOT root_tdb->getUpdSavepointOnError()) &&
(NOT root_tdb->getUpdPartialOnError()) &&
- (NOT definePresent) &&
(retryableStmt) &&
(NOT root_tdb->thereIsACompoundStatement()))
{
@@ -5348,8 +5321,6 @@ TrafDesc *ProxyFunc::createVirtualTableDesc()
table_desc->tableDesc()->colcount;
index_desc->indexesDesc()->blocksize = 4096; // doesn't matter.
- // cannot simply point to same files desc as the table one,
- // because then ReadTableDef::deleteTree frees same memory twice (error)
TrafDesc *i_files_desc = TrafAllocateDDLdesc(DESC_FILES_TYPE, NULL);
i_files_desc->filesDesc()->setAudited(TRUE); // audited table
index_desc->indexesDesc()->files_desc = i_files_desc;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/generator/Generator.cpp
----------------------------------------------------------------------
diff --git a/core/sql/generator/Generator.cpp b/core/sql/generator/Generator.cpp
index 9bd81a9..8e72b60 100644
--- a/core/sql/generator/Generator.cpp
+++ b/core/sql/generator/Generator.cpp
@@ -415,8 +415,6 @@ RelExpr * Generator::preGenCode(RelExpr * expr_node)
collectStatsType_ = ComTdb::ALL_STATS;
else if (tmp == "ACCUMULATED")
collectStatsType_ = ComTdb::ACCUMULATED_STATS;
- else if (tmp == "MEASURE")
- collectStatsType_ = ComTdb::MEASURE_STATS;
else if (tmp == "PERTABLE")
collectStatsType_ = ComTdb::PERTABLE_STATS;
else if (tmp == "OPERATOR")
@@ -1837,7 +1835,7 @@ TrafDesc * Generator::createRefConstrDescStructs(
}
-static Lng32 createDescStructs(char * rforkName,
+static Lng32 createDescStructs(char * tableName,
Int32 numCols,
ComTdbVirtTableColumnInfo * columnInfo,
Int32 numKeys,
@@ -1851,7 +1849,7 @@ static Lng32 createDescStructs(char * rforkName,
UInt32 reclen = 0;
// create column descs
- colDescs = Generator::createColDescs(rforkName, columnInfo, (Int16) numCols,
+ colDescs = Generator::createColDescs(tableName, columnInfo, (Int16) numCols,
reclen, space);
keyDescs = Generator::createKeyDescs(numKeys, keyInfo, space);
@@ -2273,8 +2271,6 @@ TrafDesc * Generator::createVirtualTableDesc
if (privInfo)
priv_desc = createPrivDescs(privInfo, space);
- // cannot simply point to same files desc as the table one,
- // because then ReadTableDef::deleteTree frees same memory twice (error)
TrafDesc * i_files_desc = TrafAllocateDDLdesc(DESC_FILES_TYPE, space);
i_files_desc->filesDesc()->setAudited(TRUE); // audited table
index_desc->indexesDesc()->files_desc = i_files_desc;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/langman/LmComQueue.h
----------------------------------------------------------------------
diff --git a/core/sql/langman/LmComQueue.h b/core/sql/langman/LmComQueue.h
index 6d6b514..6a40f5a 100644
--- a/core/sql/langman/LmComQueue.h
+++ b/core/sql/langman/LmComQueue.h
@@ -139,9 +139,6 @@ class Queue
Q_EntryPtr curr; // 16-31
CollHeap *heap_;
-#ifndef NA_64BIT
- char fillersQueue1_[4];
-#endif // 32-39
Int32 numEntries_; // 40-43
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/langman/LmCommon.h
----------------------------------------------------------------------
diff --git a/core/sql/langman/LmCommon.h b/core/sql/langman/LmCommon.h
index 8686db7..b20eff7 100644
--- a/core/sql/langman/LmCommon.h
+++ b/core/sql/langman/LmCommon.h
@@ -36,23 +36,19 @@
#include "ComSmallDefs.h"
#include "ComDiags.h"
- #ifdef __EID
- #define SQLLM_LIB_FUNC
+#ifdef LMCOMP_BUILD
+ // This is for the lmcomp library which gets statically linked
+ // into tdm_arkcmp
+ #define SQLLM_LIB_FUNC
+#else
+ #ifdef LM_DLL
+ // This is for building the LM DLL
+ #define SQLLM_LIB_FUNC __declspec( dllexport )
#else
- #ifdef LMCOMP_BUILD
- // This is for the lmcomp library which gets statically linked
- // into tdm_arkcmp
- #define SQLLM_LIB_FUNC
- #else
- #ifdef LM_DLL
- // This is for building the LM DLL
- #define SQLLM_LIB_FUNC __declspec( dllexport )
- #else
- // This is for LM DLL callers
- #define SQLLM_LIB_FUNC __declspec( dllimport )
- #endif
- #endif
+ // This is for LM DLL callers
+ #define SQLLM_LIB_FUNC __declspec( dllimport )
#endif
+#endif
//////////////////////////////////////////////////////////////////////
//
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/langman/LmDebug.h
----------------------------------------------------------------------
diff --git a/core/sql/langman/LmDebug.h b/core/sql/langman/LmDebug.h
index c03ccf7..67a9f19 100644
--- a/core/sql/langman/LmDebug.h
+++ b/core/sql/langman/LmDebug.h
@@ -60,7 +60,7 @@ void lmDebug(const char *, ...);
#define LM_DEBUG5(msg,a1,a2,a3,a4,a5)
#endif
-#if defined(LM_DEBUG) && !defined(NA_WINNT)
+#if defined(LM_DEBUG)
void debugLmSignalHandlers();
#define LM_DEBUG_SIGNAL_HANDLERS(msg) \
lmDebug(msg); \
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/nskgmake/arkcmplib/Makefile
----------------------------------------------------------------------
diff --git a/core/sql/nskgmake/arkcmplib/Makefile b/core/sql/nskgmake/arkcmplib/Makefile
index 0a20fd2..0037d7a 100755
--- a/core/sql/nskgmake/arkcmplib/Makefile
+++ b/core/sql/nskgmake/arkcmplib/Makefile
@@ -36,8 +36,6 @@ CPPSRC := cmpargs.cpp \
ProcessEnv.cpp \
QueryCacheSt.cpp \
NATableSt.cpp \
- rtdu.cpp \
- rtdu2.cpp \
vers_libarkcmp.cpp
INCLUDE_DIRS := sqludr
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/nskgmake/tdm_sqlcli/Makefile
----------------------------------------------------------------------
diff --git a/core/sql/nskgmake/tdm_sqlcli/Makefile b/core/sql/nskgmake/tdm_sqlcli/Makefile
index f7ff985..251f995 100755
--- a/core/sql/nskgmake/tdm_sqlcli/Makefile
+++ b/core/sql/nskgmake/tdm_sqlcli/Makefile
@@ -23,7 +23,6 @@
CPPSRC := CliDll.cpp \
StoredProcInterface.cpp \
- rtdu.cpp \
vers_libcli.cpp
SRCPATH := cli catman smdio
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/optimizer/BindItemExpr.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/BindItemExpr.cpp b/core/sql/optimizer/BindItemExpr.cpp
index eb54ddb9..de5cc78 100644
--- a/core/sql/optimizer/BindItemExpr.cpp
+++ b/core/sql/optimizer/BindItemExpr.cpp
@@ -1231,7 +1231,6 @@ Int32 ItemExpr::shouldPushTranslateDown(CharInfo::CharSet chrset) const
case ITM_MOVING_MIN: // b) possibly different orderings
case ITM_SCALAR_MIN: // b) ordering, also may eliminate data
case ITM_SCALAR_MAX: // b) ordering, also may eliminate data
- case ITM_AUDIT_IMAGE: // a), b) output is binary disguised as ISO
case ITM_OLAP_MAX: // b) ordering, also may eliminate data
case ITM_OLAP_MIN: // b) ordering, also may eliminate data
case ITM_CONVERTTOHEX: // b) operator depends on encoding
@@ -12597,42 +12596,6 @@ ItemExpr *ItmSequenceFunction::bindNode(BindWA *bindWA)
return getValueId().getItemExpr();
}
-//-------------------------------------------------------------------------
-//
-// member functions for class AuditImage
-//
-//-------------------------------------------------------------------------
-ItemExpr *AuditImage::bindNode(BindWA *bindWA)
-{
- if (nodeIsBound())
- return getValueId().getItemExpr();
-
- ItemExpr * boundExpr = NULL;
-
- // Obtain the NATable for the objectName.
- NATable *table = bindWA->getNATable(getObjectName());
- if (bindWA->errStatus()) return NULL;
-
- setNATable(table);
-
- // The number of columns in the object must match the number of columns
- // in the expression list for AUDIT_IMAGE. The columns in the expression
- // list form the children of AUDIT_IMAGE node.
- if (table->getColumnCount() != (ULng32) getArity())
- {
- *CmpCommon::diags() << DgSqlCode(-4315)
- << DgTableName(getObjectName().getQualifiedNameAsString());
- bindWA->setErrStatus();
- return NULL;
- }
-
- // Binds self; Binds children; AuditImage::synthesize();
- boundExpr = Function::bindNode(bindWA);
- if (bindWA->errStatus()) return NULL;
-
- return boundExpr;
-}
-
//---------------------------------------------------------------------------
//
// member functions for class HbaseColumnLookup
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/optimizer/BindRelExpr.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/BindRelExpr.cpp b/core/sql/optimizer/BindRelExpr.cpp
index 2e46dcf..266e23f 100644
--- a/core/sql/optimizer/BindRelExpr.cpp
+++ b/core/sql/optimizer/BindRelExpr.cpp
@@ -7751,8 +7751,7 @@ OptSqlTableOpenInfo *setupStoi(OptSqlTableOpenInfo *&optStoi_,
// notion to begin with.
if ((naTable->getSpecialType() == ExtendedQualName::TRIGTEMP_TABLE) ||
(naTable->getSpecialType() == ExtendedQualName::IUD_LOG_TABLE) ||
- (naTable->getSpecialType() == ExtendedQualName::INDEX_TABLE) ||
- (naTable->getSpecialType() == ExtendedQualName::RESOURCE_FORK))
+ (naTable->getSpecialType() == ExtendedQualName::INDEX_TABLE))
{
return NULL;
}
@@ -14540,20 +14539,6 @@ RelExpr *Describe::bindNode(BindWA *bindWA)
NAString cat(catsch.getCatalogNameAsAnsiString(),bindWA->wHeap());
NAString sch(catsch.getUnqualifiedSchemaNameAsAnsiString(),bindWA->wHeap());
//
- if (SqlParser_NAMETYPE == DF_NSK) {
-// LCOV_EXCL_START - nsk
- // The cat & sch from the BindWA are really from MPLOC.
- // Get the real ANSI cat & sch, prepending them to the strings
- // and put the MPLOC info in parens.
- const SchemaName &csAnsi = ActiveSchemaDB()->getDefaultSchema();
- NAString cAnsi(csAnsi.getCatalogNameAsAnsiString(),bindWA->wHeap());
- NAString sAnsi(csAnsi.getUnqualifiedSchemaNameAsAnsiString(),bindWA->wHeap());
- cat.prepend(cAnsi + " (");
- cat += ")";
- sch.prepend(sAnsi + " (");
- sch += ")";
-// LCOV_EXCL_STOP
- }
*CmpCommon::diags() << DgSqlCode(-ABS(ShowSchema::DiagSqlCode()))
<< DgCatalogName(cat) << DgSchemaName (sch);
bindWA->setErrStatus();
@@ -14629,8 +14614,6 @@ RelExpr *Describe::bindNode(BindWA *bindWA)
index_desc->indexesDesc()->colcount = table_desc->tableDesc()->colcount;
index_desc->indexesDesc()->blocksize = 4096; // anything > 0
- // Cannot simply point to same files desc as the table one,
- // because then ReadTableDef::deleteTree frees same memory twice (error)
TrafDesc * i_files_desc = TrafAllocateDDLdesc(DESC_FILES_TYPE, NULL);
index_desc->indexesDesc()->files_desc = i_files_desc;
@@ -14679,28 +14662,6 @@ RelExpr *Describe::bindNode(BindWA *bindWA)
// do not override schema for showddl
bindWA->setToOverrideSchema(FALSE);
- // if this is a showlabel command on a resource fork,
- // but the describedTableName
- // is not a fully qualified rfork name, then get the rfork name
- // for the specified table.
- if ((getFormat() == Describe::LABEL_) &&
- (describedTableName_.getSpecialType() == ExtendedQualName::RESOURCE_FORK) &&
- (describedTableName_.getLocationName().isNull()))
- {
- describedTableName_.setSpecialType(ExtendedQualName::NORMAL_TABLE);
- NATable *naTable = bindWA->getNATable(describedTableName_);
- if (NOT bindWA->errStatus())
- {
- // replace the describedTableName with its rfork name.
- describedTableName_.setSpecialType(ExtendedQualName::RESOURCE_FORK);
-
- NAString rforkName = naTable->getClusteringIndex()->getFileSetName().getQualifiedNameAsString();
- char * rforkNameData = (char*)(rforkName.data());
- rforkNameData[rforkName.length()-1] += 1;
- describedTableName_.setLocationName(rforkName);
- }
- }
-
// check if we need to consider public schema before
// describedTableName_ is qualified by getNATable
if (describedTableName_.getQualifiedNameObj().getSchemaName().isNull())
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/optimizer/ColStatDesc.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/ColStatDesc.cpp b/core/sql/optimizer/ColStatDesc.cpp
index 9e2ce36..cb95703 100644
--- a/core/sql/optimizer/ColStatDesc.cpp
+++ b/core/sql/optimizer/ColStatDesc.cpp
@@ -9500,12 +9500,7 @@ MultiColumnUecList::findDenom (const ValueIdSet & columns) const
// all tablePtrs should be 4-byte aligned, so divide by 4
// to get a better hash value
ULng32 TableDescHashFn (const TableDesc & tablePtr)
-#ifdef NA_64BIT
{ return (ULng32)((Long)&tablePtr/8) ; }
-#else
-{ return (ULng32)&tablePtr/4 ; }
-#endif
-
#pragma nowarn(262) // warning elimination
NABoolean
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/optimizer/ControlDB.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/ControlDB.cpp b/core/sql/optimizer/ControlDB.cpp
index ceab262..f8e2f1b 100644
--- a/core/sql/optimizer/ControlDB.cpp
+++ b/core/sql/optimizer/ControlDB.cpp
@@ -452,12 +452,7 @@ void ControlDB::setControlDefault(ControlQueryDefault *def)
}
}
break;
- case QUERY_CACHE_MPALIAS:
- // turning off mpalias query caching decaches any mpalias queries
- if (CmpCommon::getDefault(QUERY_CACHE_MPALIAS) == DF_OFF) {
- CURRENTQCACHE->deCacheAliases();
- }
- break;
+
case QUERY_CACHE_STATISTICS: // is now a no-op
break;
case QUERY_CACHE_AVERAGE_PLAN_SIZE:
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/optimizer/EncodedKeyValue.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/EncodedKeyValue.cpp b/core/sql/optimizer/EncodedKeyValue.cpp
index 1c697c2..ce63728 100644
--- a/core/sql/optimizer/EncodedKeyValue.cpp
+++ b/core/sql/optimizer/EncodedKeyValue.cpp
@@ -26,7 +26,7 @@
* File: EncodedKeyValue.cpp
* Description: Functions to compute binary encoded keys that can be written
to disk for a given set of TrafDescs.
-* Origin: Copy of existing code from GenRFork.cpp
+* Origin:
* Created: 10/30/2013
* Language: C++
*
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/optimizer/ItemConstr.h
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/ItemConstr.h b/core/sql/optimizer/ItemConstr.h
index 6c94c64..25ee914 100644
--- a/core/sql/optimizer/ItemConstr.h
+++ b/core/sql/optimizer/ItemConstr.h
@@ -597,7 +597,7 @@ private:
//
// The whole scheme with the ComplementaryRIConstraint's array of columns
// "parallel" to the defining constraint's columns assumes that constraint info
-// is is stored in CatMan (or at least by the ReadTableDef/NATable) in the
+// is stored in CatMan (or at least by NATable) in the
// manner described for this example:
// CREATE TABLE U ... CONSTRAINT U0 UNIQUE(V,W,X) [ or PRIMARY KEY(V,W,X) ]
// CREATE TABLE F ... CONSTRAINT R1 FOREIGN KEY(G,H,I) REFERENCES U(X,W,V)
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/optimizer/ItemExpr.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/ItemExpr.cpp b/core/sql/optimizer/ItemExpr.cpp
index 6ed6ad2..565f6bf 100644
--- a/core/sql/optimizer/ItemExpr.cpp
+++ b/core/sql/optimizer/ItemExpr.cpp
@@ -14810,123 +14810,11 @@ NABoolean ItemExpr::isARangePredicate() const
}
-
-// -----------------------------------------------------------------------
-// member functions for AuditImage
-// -----------------------------------------------------------------------
-AuditImage:: AuditImage(const CorrName &objectName,
- ItemExpr *columnValueList)
- : objectName_(objectName),
- naTable_(NULL),
- columnTypeList_(CmpCommon::statementHeap()),
- Function(ITM_AUDIT_IMAGE, FALSE /* not a leaf node */)
-{
-
- // The parser generates a ItemList for the column value arguments.
-
- // If there is only one item, then a ItemList is not generated.
- // In that case, set that value as AuditImage's child.
- if (columnValueList->getOperatorType() != ITM_ITEM_LIST)
- {
- children().insertAt(0, (columnValueList));
- }
- else
- {
-
- // Assert that the columnValueList is of type ItemList.
- CMPASSERT(columnValueList->getOperatorType() == ITM_ITEM_LIST);
-
- // Collect all the leaf nodes from the (ItemList) columnList
- // into a list and set each leaf as a child of AuditImage.
-
- ExprValueIdList *list = ((ItemList *)columnValueList)->collectLeaves(
- CmpCommon::statementHeap());
- const ULng32 num = list->entries();
-
- for (ULng32 i = 0; i < num; i++)
- {
- children().insertAt(i, (*(*list)[i]));
- }
- }
-}
-
-AuditImage::~AuditImage() {}
-
-Int32 AuditImage::getArity() const
-{
- return Function::getNumChildren();
-}
-
-HashValue AuditImage::topHash()
-{
- HashValue result = ItemExpr::topHash();
-
- // hash any local data members of the derived class
- result ^= objectName_.getQualifiedNameAsString();
-
- return result;
-}
-
-NABoolean AuditImage::duplicateMatch(const ItemExpr & other) const
-{
- if (NOT genericDuplicateMatch(other))
- return FALSE;
-
- AuditImage &o = (AuditImage &) other;
-
- // compare any local data members of the derived class
- // and return FALSE if they don't match
- if (objectName_ != o.objectName_)
- return FALSE;
-
- if (!(columnTypeList_ == o.columnTypeList_))
- return FALSE;
-
- return TRUE;
-}
-
-ItemExpr * AuditImage::copyTopNode(ItemExpr *derivedNode,
- CollHeap* outHeap)
-{
- AuditImage *result=NULL;
-
- CMPASSERT(derivedNode == NULL);
-
- result = new (outHeap) AuditImage(objectName_);
- result->naTable_ = naTable_;
- result->columnTypeList_ = columnTypeList_;
-
- return Function::copyTopNode(result, outHeap);
-}
-
QR::ExprElement Function::getQRExprElem() const
{
return QR::QRFunctionElem;
}
-void AuditImage::unparse(NAString &result,
- PhaseEnum phase,
- UnparseFormatEnum form,
- TableDesc * tabId) const
-{
-
- result += getText();
- result += "(INDEX_TABLE ";
- result += getObjectName().getQualifiedNameAsString();
-
- result += ", (";
- for (Int32 i=0; i < getNumChildren(); i++)
- {
- if (i>0) // if not the first parameter.
- result +=", ";
- child(i)->unparse(result, phase, form, tabId);
- }
- result += ")";
-
- result += ")";
-
-}
-
// Flipping the tree in 1 pass top->bottom
//
//ITEM_LIST (OLD TREE)
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/optimizer/ItemFunc.h
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/ItemFunc.h b/core/sql/optimizer/ItemFunc.h
index 2bb3c67..e4bdf07 100644
--- a/core/sql/optimizer/ItemFunc.h
+++ b/core/sql/optimizer/ItemFunc.h
@@ -2570,10 +2570,10 @@ public:
void setSrcIsVarcharPtr(NABoolean v)
{ (v ? flags_ |= SRC_IS_VARCHAR_PTR : flags_ &= ~SRC_IS_VARCHAR_PTR); }
- NA_EIDPROC NABoolean allowSignInInterval()
+ NABoolean allowSignInInterval()
{ return ((flags_ & ALLOW_SIGN_IN_INTERVAL) != 0); };
- NA_EIDPROC void setAllowSignInInterval(NABoolean v)
+ void setAllowSignInInterval(NABoolean v)
{ (v) ? flags_ |= ALLOW_SIGN_IN_INTERVAL : flags_ &= ~ALLOW_SIGN_IN_INTERVAL; }
NABoolean convertNullWhenError()
@@ -5354,94 +5354,6 @@ public:
} ; // class ItmSeqNotTHISFunction
-
-
-//
-// This function creates an audit row image given the
-// name of the object (table or index - initially just index) and
-// the list of expressions (column values) that make the row.
-//
-
-class AuditImage : public Function
-{
-public:
- AuditImage(const CorrName &objectName,
- ItemExpr *columnValueList);
-
- AuditImage(const CorrName &objectName)
- : objectName_(objectName),
- naTable_ (NULL),
- columnTypeList_(CmpCommon::statementHeap()),
- Function(ITM_AUDIT_IMAGE, CmpCommon::statementHeap(), 0){};
-
-
- // copy ctor
- AuditImage (const AuditImage &, CollHeap * h=0) ; // not written
-
- // virtual destructor
- virtual ~AuditImage();
-
- // get the degree of this node (it depends on the type of the operator)
- virtual Int32 getArity() const;
-
- // Does semantic checks and binds the function.
- virtual ItemExpr * bindNode(BindWA * bindWA);
-
- // a virtual function that does type synthesis.
- //
- virtual const NAType * synthesizeType();
-
- // virtual method to do code generation
- //
- virtual short codeGen(Generator*);
-
- // get a printable string that identifies the operator
- //
- virtual const NAString getText() const
- {
- return "AUDIT_IMAGE";
- };
-
- virtual HashValue topHash();
-
- virtual NABoolean duplicateMatch(const ItemExpr & other) const;
-
- virtual ItemExpr * copyTopNode(ItemExpr *derivedNode = NULL,
- CollHeap* outHeap = 0);
-
- // produce an ascii-version of the object (for display or saving into a file)
- virtual void unparse(NAString &result,
- PhaseEnum phase = DEFAULT_PHASE,
- UnparseFormatEnum form = EXPLAIN_FORMAT,
- TableDesc * tabId = NULL) const;
-
-
- const CorrName & getObjectName() const { return objectName_; }
- CorrName & getObjectName() { return objectName_; }
-
- inline const NATable *getNATable() const { return naTable_; }
- void setNATable (NATable *naTable) {naTable_ = naTable;}
-
-private:
- // ---------------------------------------------------------------//
- // the user-specified name of the table or an index or any other
- // SQL/MX object.
- // -------------------------------------------------------------- //
- CorrName objectName_;
- // ---------------------------------------------------------------------
- // This stores the original column values. The original column values
- // can be replaced with an equivalent value as a result of
- // VEGReference resolution. If this happens, we refer to this list to
- // cast the replaced value to the data type in this original list.
- // ---------------------------------------------------------------------
- LIST(const NAType *) columnTypeList_;
-
- // NATable for the object (INDEX) referenced by objectName_.
- // This is needed to do semantic checks
- const NATable *naTable_;
-
-};
-
// lookup a column in a native hbase table that is being accessed in row format
class HbaseColumnLookup : public BuiltinFunction
{
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/optimizer/NATable.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/NATable.cpp b/core/sql/optimizer/NATable.cpp
index e8ba671..dbcc323 100644
--- a/core/sql/optimizer/NATable.cpp
+++ b/core/sql/optimizer/NATable.cpp
@@ -36,10 +36,8 @@
#undef _DP2NT_
#define _DP2NT_
-// #define NA_ARKFS
#define __ROSETTA
#undef _DP2NT_
-// #undef NA_ARKFS
#undef __ROSETTA
#include "NATable.h"
@@ -3375,7 +3373,7 @@ NABoolean createNAColumns(TrafDesc *column_desc_list /*IN*/,
NAColumn *newColumn = NULL;
if (column_desc->colname[0] != '\0')
{
- // Standard named column from ReadTableDef...
+ // Standard named column
CMPASSERT(column_desc->colnumber >= 0);
char* defaultValue = column_desc->defaultvalue;
@@ -5035,7 +5033,7 @@ NABoolean NATable::fetchObjectUIDForNativeTable(const CorrName& corrName,
MonitorMemoryUsage_Enter((char*)mmPhase.data(), heap_, TRUE);
- // Do a readTableDef, if table descriptor has not been passed in
+ // Do a metadata read, if table descriptor has not been passed in
//
TrafDesc * table_desc;
Int32 *maxIndexLevelsPtr = new (STMTHEAP) Int32;
@@ -5276,7 +5274,7 @@ NABoolean NATable::fetchObjectUIDForNativeTable(const CorrName& corrName,
//
// The updatable flag is false for an MP view only if it is NOT a
// protection view. Therefore updatable == FALSE iff it is a
- // shorthand view. See ReadTableDef.cpp, l. 3379.
+ // shorthand view.
//
viewFileName_ = NULL;
@@ -5456,12 +5454,7 @@ NABoolean NATable::fetchObjectUIDForNativeTable(const CorrName& corrName,
Int32 catStrLen = 0;
Int32 schemaStrLen = 0;
Int32 fileStrLen = 0;
-#ifdef NA_64BIT
- // dg64 - match signature
int_32 primaryNodeNum=0;
-#else
- Int32 primaryNodeNum=0;
-#endif
short error = 0;
//clusteringIndex has physical filename that can be used to check
@@ -7526,7 +7519,6 @@ NATable * NATableDB::get(const ExtendedQualName* key, BindWA* bindWA, NABoolean
const Int64 tableRedefTime = cachedNATable->getRedefTime();
//Get last catalog operation time
Int64 labelCatalogOpTime = tableRedefTime;
- Int64 rforkCatalogOpTime = tableRedefTime;
Int64 currentSchemaRedefTS = 0;
Int64 cachedSchemaRedefTS = 0;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/optimizer/NATable.h
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/NATable.h b/core/sql/optimizer/NATable.h
index 3d4b96e..111f99f 100644
--- a/core/sql/optimizer/NATable.h
+++ b/core/sql/optimizer/NATable.h
@@ -1018,13 +1018,13 @@ private:
UInt32 flags_;
// ---------------------------------------------------------------------
- // NORMAL, INDEX, RFORK, VIRTUAL, etc.
+ // NORMAL, INDEX, VIRTUAL, etc.
// ---------------------------------------------------------------------
// ExtendedQualName::SpecialTableType specialType_;
// ---------------------------------------------------------------------
// Extended Qualified name for the table. This also has the specialType
- // (NORMAL, INDEX, RFORK, VIRTUAL, etc.) and the location Name.
+ // (NORMAL, INDEX, VIRTUAL, etc.) and the location Name.
// ---------------------------------------------------------------------
ExtendedQualName qualifiedName_;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/optimizer/ObjectNames.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/ObjectNames.cpp b/core/sql/optimizer/ObjectNames.cpp
index d309ca6..c58fef1 100644
--- a/core/sql/optimizer/ObjectNames.cpp
+++ b/core/sql/optimizer/ObjectNames.cpp
@@ -55,12 +55,11 @@
#include "ComSmallDefs.h"
+#include "ComResWords.h"
#include "SqlParserGlobals.h" // must be last
-#if !defined(__EID) && !defined(ARKFS_OPEN)
-#include "ComResWords.h"
-#endif
+
// -----------------------------------------------------------------------
// Context variable for "getXxxAsAnsiString()" methods simplifies the
// calling interface (we don't have to pass a boolean all over the place).
@@ -429,12 +428,6 @@ Int32 QualifiedName::extractAndDefaultNameParts(const SchemaName& defCatSch
catName = defCatSch.getCatalogName();
}
}
- else if (SqlParser_NAMETYPE == DF_NSK &&
- *catName.data() == '$' &&
- SqlParser_MPLOC.hasSystemName()) {
- // If user specified only a $VOL, fill in the current default \SYS.
- catName.prepend(SqlParser_MPLOC.getSystemName() + ".");
- }
if (schName.isNull()) {
if((ActiveSchemaDB()->getDefaults().schSetToUserID()) &&
@@ -1496,7 +1489,6 @@ ComAnsiNameSpace ExtendedQualName::convSpecialTableTypeToAnsiNameSpace( const Sp
case MV_TABLE:
case PARTITION_TABLE:
case TRIGTEMP_TABLE:
- case RESOURCE_FORK:
case VIRTUAL_TABLE:
case MVS_UMD:
return COM_TABLE_NAME;
@@ -1628,10 +1620,7 @@ ostream& operator<< (ostream& out, TaskMonitor t)
return out<< "Time = " <<
((double) t.timer()) / CLOCKS_PER_SEC
<< " us (microsecond)" <<
-//#if defined(NA_LINUX)
- //"\tET = " << out.fixed << out.precision(6) << t.elapsed_time() << " s" <<
"\tET = " << t.elapsed_time() << " s" <<
-//#endif
" \tCounts = "<<t.count()<<" \tGoodCnts = "<<t.goodcount();
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/optimizer/ObjectNames.h
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/ObjectNames.h b/core/sql/optimizer/ObjectNames.h
index b799ffa..c900a2a 100644
--- a/core/sql/optimizer/ObjectNames.h
+++ b/core/sql/optimizer/ObjectNames.h
@@ -477,7 +477,6 @@ public:
ISP_TABLE, // Internal Stored Procedure
LOAD_TABLE,
PARTITION_TABLE,
- RESOURCE_FORK,
VIRTUAL_TABLE,
IUD_LOG_TABLE,
RANGE_LOG_TABLE,
@@ -667,11 +666,6 @@ private:
// These are 'virtual' tables for special purpose needs.
// Binder uses this information to 'generate' table descriptors.
// Ustat does not fetch real histograms for virtual tables.
-// E.g., RESOURCE_FORK is a SQL table that doesn't exist in metadata
-// as a base table.
-// So, any sql dml operation on resource fork is done by specifying a
-// special syntax in the SQL statement that tells if this is a resource fork.
-// "SELECT * FROM TABLE (RESOURCE_FORK <rfork-guardian-name>)" is an example.
// -----------------------------------------------------------------------
class CorrName : public NABasicObject
{
@@ -741,19 +735,6 @@ public:
flagbits_(corr.flagbits_)
{}
-/*
-// c89 can't distinguish between the non-tandem version of
-// this constructor and the above constructor taking four NAString
-// arguments (what? It can't tell a NABoolean is not a NAString, or,
-// somebody wrote a conversion operator from NABoolean to NAString?)
-// May need more investigation, but this fix certainly works. -wlr-
-#ifndef __TANDEM
- #define CORRNAME_CTOR_const const
-#else
- #define CORRNAME_CTOR_const
-#endif
- CorrName(CORRNAME_CTOR_const NAString& corrName,
-*/
CorrName(const NAString& corrName,
NABoolean isFabricated,
CollHeap * h=0,
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/optimizer/RelCache.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/RelCache.cpp b/core/sql/optimizer/RelCache.cpp
index 5fb606c..2496f65 100644
--- a/core/sql/optimizer/RelCache.cpp
+++ b/core/sql/optimizer/RelCache.cpp
@@ -1208,10 +1208,6 @@ void Scan::generateCacheKey(CacheWA &cwa) const
if (stream_) {
cwa += " stream ";
}
- // mark mpalias queries so they can be decached upon user request
- if (getTableDesc()->getNATable()->isAnMPTableWithAnsiName()) {
- cwa += AM_AN_MPALIAS_QUERY;
- }
if (getHbaseAccessOptions())
{
@@ -1237,11 +1233,7 @@ NABoolean Scan::isCacheableExpr(CacheWA& cwa)
if (stream_) { // pub-sub streams are not cacheable
return FALSE;
}
- // mpalias SELECT is not cacheable unless explicitly requested
- if (getTableDesc()->getNATable()->isAnMPTableWithAnsiName() &&
- CmpCommon::getDefault(QUERY_CACHE_MPALIAS) == DF_OFF) {
- return FALSE;
- }
+
cwa.setConditionallyCacheable();
if (CmpCommon::getDefaultLong(MVQR_REWRITE_LEVEL) >= 1 &&
QRDescGenerator::hasRewriteEnabledMVs(getTableDesc())) {
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/optimizer/SchemaDB.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/SchemaDB.cpp b/core/sql/optimizer/SchemaDB.cpp
index a2f611f..ef5f3a9 100644
--- a/core/sql/optimizer/SchemaDB.cpp
+++ b/core/sql/optimizer/SchemaDB.cpp
@@ -81,7 +81,7 @@ void InitSchemaDB()
// there were a statement heap, as soon as it was "wiped away" these data
// members would be time bombs, since their internal heap pointers would be
// invalid.
-SchemaDB::SchemaDB(ReadTableDef *rtd)
+SchemaDB::SchemaDB()
: tableDB_(
new CTXTHEAP NAHeap("NATable Heap", (NAHeap *)CTXTHEAP,
16 * 1024,
@@ -90,7 +90,6 @@ SchemaDB::SchemaDB(ReadTableDef *rtd)
actionRoutineDB_(CmpCommon::contextHeap()),
valueDArray_(),
domainDList_(CmpCommon::contextHeap()),
- readTableDef_(rtd),
defaults_(CmpCommon::contextHeap()),
defaultSchema_(CmpCommon::contextHeap()),
// triggers -- eliezer
@@ -150,16 +149,10 @@ void SchemaDB::initPerStatement(NABoolean lightweight)
}
// By default, this returns the ANSI default schema.
-// You need to pass in a flag bit to get the MPLOC, if NAMETYPE is NSK
-// (BindWA does this).
-//
const SchemaName &SchemaDB::getDefaultSchema(UInt32 flags)
{
- if (flags & REFRESH_CACHE) initPerStatement();
-
- if (flags & APPLY_NAMETYPE_RULES)
- if (SqlParser_Initialized() && SqlParser_NAMETYPE == DF_NSK)
- return SqlParser_MPLOC_as_SchemaName;
+ if (flags & REFRESH_CACHE)
+ initPerStatement();
return defaultSchema_;
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/optimizer/SchemaDB.h
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/SchemaDB.h b/core/sql/optimizer/SchemaDB.h
index 8f4a8cd..0bc9a9b 100644
--- a/core/sql/optimizer/SchemaDB.h
+++ b/core/sql/optimizer/SchemaDB.h
@@ -93,7 +93,7 @@ public:
// --------------------------------------------------------------------
// Constructor function
// --------------------------------------------------------------------
- SchemaDB(ReadTableDef *rtd) ;
+ SchemaDB() ;
// copy ctor
SchemaDB(const SchemaDB & orig) ; // not written
@@ -107,7 +107,6 @@ public:
// Accessor functions
// --------------------------------------------------------------------
NATableDB * getNATableDB() { return &tableDB_; }
- ReadTableDef * getReadTableDef() { return readTableDef_; }
ValueDescArray & getValueDescArray() { return valueDArray_; }
NADefaults & getDefaults() { return defaults_; }
NARoutineDB * getNARoutineDB() { return &routineDB_; }
@@ -136,8 +135,6 @@ public:
// now **ONLY** CmpContext should manage the init/cleanupPerStatement
// calls, which is the current mechanism!
//
- // This is also a convenient spot to hide transaction ends and begins;
- // see ReadTableDef.[hC] for fuller discussion.
// --------------------------------------------------------------------
void createStmtTables(); // no longer used (formerly required)
void dropStmtTables(); // no longer used
@@ -179,8 +176,7 @@ private:
// SQL compiler terminates processing. For now, (11/20/96) tableDB_
// needs to be cleanup up for each statement, because it is caching
// the information without checking the timestamp for reload if
- // necessary. After integrated with catman ReadTableDef code, it
- // will only be reloaded if necessary.
+ // necessary.
// --------------------------------------------------------------------
NATableDB tableDB_;
@@ -200,11 +196,6 @@ private:
DomainDescList domainDList_;
// --------------------------------------------------------------------
- // ReadTableDef server
- // --------------------------------------------------------------------
- ReadTableDef *readTableDef_;
-
- // --------------------------------------------------------------------
// In-memory table of defaults values.
// --------------------------------------------------------------------
NADefaults defaults_;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/optimizer/SynthType.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/SynthType.cpp b/core/sql/optimizer/SynthType.cpp
index 1445562..44d6d99 100644
--- a/core/sql/optimizer/SynthType.cpp
+++ b/core/sql/optimizer/SynthType.cpp
@@ -87,7 +87,6 @@ static void shortenTypeSQLname(const NAType &op,
}
}
-// This one's NOT static -- GenRfork calls it!
void emitDyadicTypeSQLnameMsg(Lng32 sqlCode,
const NAType &op1,
const NAType &op2,
@@ -6651,76 +6650,6 @@ const NAType *ItmSeqNotTHISFunction::synthesizeType()
return result;
}
-// -----------------------------------------------------------------------
-// member functions for class AuditImage
-// -----------------------------------------------------------------------
-
-const NAType *AuditImage::synthesizeType()
-{
- const NAType * type = NULL;
-
- const NATable *naTable = getNATable();
-
- // The data types of the columns (in order) in the object
- // must match the data types of columns specified in the
- // expression list for AUDIT_IMAGE. The columns in the expression
- // list form the children of AUDIT_IMAGE node.
-
- const NAColumnArray &naColumns = naTable->getNAColumnArray();
- for (UInt32 i=0; i < naColumns.entries(); i++)
- {
-
- const NAColumn *tableNACol = naColumns[i];
- const NAType *tableColumnType = tableNACol->getType();
-
- // Populate member varaible columnTypeList_ (to be used
- // during codeGen. See AuditImage::codeGen()) with the
- // column types of the object.
- columnTypeList_.insert(tableColumnType);
-
- // Actual datatype checking is done only for non-Constants.
- // Compatiblity type checking is done for Constants.
- // Note: Constants are used only for internal testing.
- const NAType *childType = &children()[i].getValueId().getType();
- if (children()[i].getPtr()->getOperatorType() == ITM_CONSTANT ||
- childType->getTypeQualifier() == NA_UNKNOWN_TYPE)
- {
- children()[i].getValueId().coerceType(*tableColumnType);
- // the coerceType method above might have changed
- // the childType. So, get it one more time.
- childType = &children()[i].getValueId().getType();
- if (NOT childType->isCompatible(*tableColumnType))
- {
- *CmpCommon::diags() << DgSqlCode(-4316)
- << DgTableName(getObjectName().getQualifiedNameAsString())
- << DgColumnName(tableNACol->getColName());
- return NULL;
- }
- }
- else
- {
- // Not a constant, so enforce type checking; but w.r.t NULL - check
- // only if it's physical and not if the value of
- // has the exact enum NAType::SupportsSQLnull.
- if (!(tableColumnType->equalPhysical(*childType)))
- {
- *CmpCommon::diags() << DgSqlCode(-4316)
- << DgTableName(getObjectName().getQualifiedNameAsString())
- << DgColumnName(tableNACol->getColName());
- return NULL;
- }
- }
- }
-
-
- const Lng32 recordLength = naTable->getRecordLength();
-
- type = new HEAP
- SQLVarChar(HEAP, recordLength);
-
- return type;
-}
-
const NAType * HbaseColumnLookup::synthesizeType()
{
NAType * type = NULL;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/optimizer/TableDesc.h
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/TableDesc.h b/core/sql/optimizer/TableDesc.h
index d749c58..321be1b 100644
--- a/core/sql/optimizer/TableDesc.h
+++ b/core/sql/optimizer/TableDesc.h
@@ -196,12 +196,7 @@ public:
//
// 64-bit Project: Cast 'this' to "long" first to avoid C++ error
//
-#ifdef NA_64BIT
ULng32 hash() const { return (ULng32) ((Long)this/8);}
-#else
- ULng32 hash() const { return (ULng32) this/4;}
-#endif
-
// get local predicates for this table
ValueIdSet getLocalPreds();
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/optimizer/VEGTable.h
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/VEGTable.h b/core/sql/optimizer/VEGTable.h
index 0501c1a..b353f3a 100644
--- a/core/sql/optimizer/VEGTable.h
+++ b/core/sql/optimizer/VEGTable.h
@@ -99,7 +99,7 @@ public:
// oops I need to delete theArray_ and arrayValid_, but since I dont
// have time to run regression again and RAList is only used within
// CmpStatementHeap so far, then I will delay this to next checkin
- NA_EIDPROC virtual ~RAList() {};
+ virtual ~RAList() {};
// assignment
RAList<T> & operator =(const RAList<T> &other);
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/optimizer/costmethod.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/costmethod.cpp b/core/sql/optimizer/costmethod.cpp
index 9ff5c3a..83683e5 100644
--- a/core/sql/optimizer/costmethod.cpp
+++ b/core/sql/optimizer/costmethod.cpp
@@ -7146,7 +7146,7 @@ CostMethodHashGroupBy::computePassCost(NABoolean isFirstPass,
// this check was added to prevent overflowing. 11/06/00
if ( noOfClustersToBeProcessed_ > INT_MAX/MIN_ONE(noOfClustersSpilled) )
- noOfClustersToBeProcessed_ = INT_MAX; // NA_64BIT revisit for large value
+ noOfClustersToBeProcessed_ = INT_MAX;
else
noOfClustersToBeProcessed_ *= noOfClustersSpilled;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/optimizer/opt.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/opt.cpp b/core/sql/optimizer/opt.cpp
index bc81124..2ab3de9 100644
--- a/core/sql/optimizer/opt.cpp
+++ b/core/sql/optimizer/opt.cpp
@@ -3773,8 +3773,8 @@ OptDefaults::OptDefaults(CollHeap* h) : heap_(h)
readAheadMaxBlocks_ =16.0;
acceptableInputEstLogPropError_ = 0.5;
taskCount_ = 0;
- optTaskLimit_ = INT_MAX; // NA_64BIT - revisit for large value
- enumPotentialThreshold_ = INT_MAX; // NA_64BIT - revisit for large value
+ optTaskLimit_ = INT_MAX;
+ enumPotentialThreshold_ = INT_MAX;
level1Constant1_ = 100;
level1Constant2_ = 100;
level1ImmunityLimit_ = 5000;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/parser/HvRoles.h
----------------------------------------------------------------------
diff --git a/core/sql/parser/HvRoles.h b/core/sql/parser/HvRoles.h
index ab8c896..6245583 100644
--- a/core/sql/parser/HvRoles.h
+++ b/core/sql/parser/HvRoles.h
@@ -54,8 +54,7 @@ enum HostVarRole {
HV_IS_DESC_DEST,
HV_IS_DESC_SOURCE,
HV_IS_DYNPARAM,
- HV_IS_INPUT_OUTPUT, // A variable appearing in a SET statement of a Compound Statement
- HV_IS_DEFINE // NSK define
+ HV_IS_INPUT_OUTPUT // A variable appearing in a SET statement of a Compound Statement
};
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/parser/ParKeyWords.cpp
----------------------------------------------------------------------
diff --git a/core/sql/parser/ParKeyWords.cpp b/core/sql/parser/ParKeyWords.cpp
index a599ec5..e0a2f28 100644
--- a/core/sql/parser/ParKeyWords.cpp
+++ b/core/sql/parser/ParKeyWords.cpp
@@ -110,7 +110,6 @@ ParKeyWord ParKeyWords::keyWords_[] = {
ParKeyWord("ATTRIBUTE", TOK_ATTRIBUTE, NONRESTOKEN_),
ParKeyWord("ATTRIBUTES", TOK_ATTRIBUTES, NONRESTOKEN_),
ParKeyWord("AUDIT", TOK_AUDIT, NONRESTOKEN_),
- ParKeyWord("AUDIT_IMAGE", TOK_AUDIT_IMAGE, NONRESTOKEN_),
ParKeyWord("AUDITCOMPRESS", TOK_AUDITCOMPRESS, NONRESTOKEN_),
ParKeyWord("AUTHENTICATION", TOK_AUTHENTICATION, NONRESTOKEN_),
ParKeyWord("AUDITONREFRESH", TOK_AUDITONREFRESH, FLAGSNONE_),
@@ -680,7 +679,6 @@ ParKeyWord ParKeyWords::keyWords_[] = {
ParKeyWord("MOVINGSTDDEV", TOK_MSTDDEV, NONRESTOKEN_),
ParKeyWord("MOVINGSUM", TOK_MSUM, NONRESTOKEN_),
ParKeyWord("MOVINGVARIANCE", TOK_MVARIANCE, NONRESTOKEN_),
- ParKeyWord("MPLOC", TOK_MPLOC, NONRESTOKEN_),
ParKeyWord("MTS", TOK_MTS, NONRESTOKEN_),
ParKeyWord("MULTI", TOK_MULTI, NONRESTOKEN_),
ParKeyWord("MULTIDELTA", TOK_MULTIDELTA, FLAGSNONE_),
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/parser/SqlParserAux.cpp
----------------------------------------------------------------------
diff --git a/core/sql/parser/SqlParserAux.cpp b/core/sql/parser/SqlParserAux.cpp
index 58196dd..ff62d2d 100644
--- a/core/sql/parser/SqlParserAux.cpp
+++ b/core/sql/parser/SqlParserAux.cpp
@@ -1771,10 +1771,7 @@ CorrName * corrNameFromStrings(ShortStringSequence *names)
const NAString &tblName = qn->getObjectName();
- if ((qn->getCatalogName() == "") && (SqlParser_NAMETYPE == DF_NSK))
- result = new (PARSERHEAP()) CorrName(*qn, PARSERHEAP(), tblName);
- else
- result = new (PARSERHEAP()) CorrName(*qn, PARSERHEAP());
+ result = new (PARSERHEAP()) CorrName(*qn, PARSERHEAP());
ComASSERT(result);
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/parser/sqlparser.y
----------------------------------------------------------------------
diff --git a/core/sql/parser/sqlparser.y b/core/sql/parser/sqlparser.y
index 0639508..076c9e7 100755
--- a/core/sql/parser/sqlparser.y
+++ b/core/sql/parser/sqlparser.y
@@ -466,7 +466,6 @@ static void enableMakeQuotedStringISO88591Mechanism()
%token <tokval> TOK_ASC
%token <tokval> TOK_ASCII
%token <tokval> TOK_ATOMIC
-%token <tokval> TOK_AUDIT_IMAGE // Utilities.
%token <tokval> TOK_AUDITONREFRESH // MV
%token <tokval> TOK_AUTOABORT
%token <tokval> TOK_AUTOBEGIN
@@ -854,7 +853,6 @@ static void enableMakeQuotedStringISO88591Mechanism()
// %token <tokval> TOK_M -- already defined below
%token <tokval> TOK_MONTHNAME
%token <tokval> TOK_MORE /* ANSI SQL non-reserved word */
-%token <tokval> TOK_MPLOC /* Tandem extension non-reserved word */
%token <tokval> TOK_MRANK /* Tandem extension non-reserved word */
%token <tokval> TOK_MSTDDEV /* Tandem extension non-reserved word */
%token <tokval> TOK_MSUM /* Tandem extension non-reserved word */
@@ -2003,9 +2001,6 @@ static void enableMakeQuotedStringISO88591Mechanism()
%type <item> insert_value_expression_list_paren
// left recursion for insert statement values.
-%type <item> audit_image_value
-%type <item> audit_image_arg_list
-%type <corrName> audit_image_object
%type <hbaseColumnCreateOptionsList> hbase_column_create_list
%type <hbaseColumnCreateOptions> hbase_column_create_value
%type <item> cast_specification
@@ -2484,7 +2479,6 @@ static void enableMakeQuotedStringISO88591Mechanism()
%type <boolean> optional_with_shared_access_clause
%type <stringval> fully_expanded_guardian_loc_name
%type <stringval> guardian_location_name
-%type <stringval> guardian_subvolume_name
%type <stringval> partition_name
%type <pElemDDL> location_list
%type <pElemDDL> source_location_list
@@ -10080,12 +10074,6 @@ misc_function :
((BiArith*) $$)->setStandardNormalization();
}
- | TOK_AUDIT_IMAGE '(' audit_image_object ',' '(' audit_image_arg_list ')' ')'
- {
- // Create an AuditImage function.
- $$ = new(PARSERHEAP()) AuditImage(*$3, $6);
- }
-
| TOK_LAST_DAY '(' value_expression ')'
{
$$ = new (PARSERHEAP()) ZZZBinderFunction(ITM_LAST_DAY, $3);
@@ -10327,76 +10315,6 @@ date_time_operand : TOK_YEAR { $$ = ITM_DATEDIFF_YEAR ;}
}
}
-/* type corrname */
-audit_image_object: TOK_INDEX_TABLE actual_table_name
- {
- // This syntax is only allowed if the internal
- // parser flag is set, since this is internal syntax.
- // For showplan, note that currently, the internal
- // sqlparser flags are not correctly propagated to
- // the second mxcmp, hence a check for the control
- // session value for showplan is also needed.
- const NAString * val =
- ActiveControlDB()->getControlSessionValue("SHOWPLAN");
- if (((val) && (*val == "ON")) ||
- (Get_SqlParser_Flags(ALLOW_SPECIALTABLETYPE))
-#ifdef _DEBUG
- || (getenv("TEST_INTERNAL_SYNTAX"))
-#endif // _DEBUG
- )
- {
- $2->setSpecialType(ExtendedQualName::INDEX_TABLE);
- $$ = $2;
- }
- else
- {
- yyerror(""); YYERROR;
- }
- } // TOK_INDEX_TABLE
- | TOK_TABLE actual_table_name
- {
-
- // Enable AUDIT_IMAGE functions for tables.
- // This is used only for testing purpose right now.
- if (CmpCommon::getDefault(AUDIT_IMAGE_FOR_TABLES) == DF_ON)
- {
- // This syntax is only allowed if the internal
- // parser flag is set, since this is internal
- // syntax. For showplan, note that currently,
- // the internal sqlparser flags are not correctly
- // propagated to the second mxcmp,
- // hence a check for the control session value for
- // showplan is also needed.
-
- // In addition, AuditImage for TOK_TABLE must be allowed
- // only if CQD AUDIT_IMAGE_FOR_TABLES is set to ON.
- const NAString * val =
- ActiveControlDB()->getControlSessionValue("SHOWPLAN");
- if (((val) && (*val == "ON")) ||
- (Get_SqlParser_Flags(ALLOW_SPECIALTABLETYPE))
-#ifdef _DEBUG
- || (getenv("TEST_INTERNAL_SYNTAX"))
-#endif // _DEBUG
- )
- {
- // NORMAL_TABLE should be the default. Setting it
- // anyway to be consistent with its INDEX_TABLE
- // counterpart.
- $2->setSpecialType(ExtendedQualName::NORMAL_TABLE);
- $$ = $2;
- }
- else
- {
- yyerror(""); YYERROR;
- }
-
- } // End of CQD AUDIT_IMAGE_FOR_TABLES
- else
- {
- yyerror(""); YYERROR;
- }
- }
-
// The value_expression must be cast to the Token Type
/* type token */
datetime_keywords : TOK_QUARTER ',' value_expression // 3 months Cast 3*num_expr to months
@@ -10557,20 +10475,6 @@ timestamp_keywords : IDENTIFIER ',' value_expression
}
/* type item */
-audit_image_arg_list: audit_image_value
- {
- $$ = $1;
- }
- | audit_image_value ',' audit_image_arg_list
- {
- $$ = new(PARSERHEAP()) ItemList($1, $3);
- }
-
-/* type item */
-audit_image_value : value_expression
-
-
-/* type item */
encode_key_cast_spec : cast_specification
| TOK_LOW_VALUE '(' data_type
@@ -21524,19 +21428,6 @@ declare_or_set_cqd: TOK_DECLARE TOK_CATALOG character_string_literal
ControlQueryDefault(
SQLTEXT(), (CharInfo::CharSet)SQLTEXTCHARSET(), "NAMETYPE", *$3);
}
- | TOK_DECLARE TOK_MPLOC character_string_literal
- {
- // DEFAULT_CHARSET has no effect on character_string_literal in this context
- $$ = new (PARSERHEAP())
- ControlQueryDefault(
- SQLTEXT(), (CharInfo::CharSet)SQLTEXTCHARSET(), "MP_SUBVOLUME", *$3);
- }
- | TOK_DECLARE TOK_MPLOC guardian_subvolume_name
- {
- $$ = new (PARSERHEAP())
- ControlQueryDefault(
- SQLTEXT(), (CharInfo::CharSet)SQLTEXTCHARSET(), "MP_SUBVOLUME", *$3);
- }
/* The SET flavor is dynamic (the extra TRUE flag).
/* See the comments way at the top for when
@@ -21627,17 +21518,6 @@ declare_or_set_cqd: TOK_DECLARE TOK_CATALOG character_string_literal
$$ = normalizeDynamicCQD(
"NAMETYPE", *$3);
}
- | TOK_SET TOK_MPLOC character_string_literal
- {
- // DEFAULT_CHARSET has no effect on character_string_literal in this context
- $$ = normalizeDynamicCQD(
- "MP_SUBVOLUME", *$3);
- }
- | TOK_SET TOK_MPLOC guardian_subvolume_name
- {
- $$ = normalizeDynamicCQD(
- "MP_SUBVOLUME", *$3);
- }
/* type tokval */
query_shape_options : TOK_IMPLICIT TOK_EXCHANGE
@@ -22773,9 +22653,6 @@ show_statement:
case ExtendedQualName::TRIGTEMP_TABLE:
labelAnsiNameSpace = COM_TRIGTEMP_TABLE_NAME;
break;
- case ExtendedQualName::RESOURCE_FORK:
- labelAnsiNameSpace = COM_TABLE_NAME;
- break;
default :
// There should be a case for every special type that
// is specified by the production extended_label_name.
@@ -23103,15 +22980,6 @@ collate_clause : TOK_COLLATE TOK_DEFAULT { $$ = CharInfo::DefaultCollation; }
//
$$ = CharInfo::UNKNOWN_COLLATION;
NABoolean lookupNameAsNSK = FALSE;
- if (SqlParser_NAMETYPE == DF_NSK) {
- if (qn->getCatalogName().isNull()) {
- lookupNameAsNSK = TRUE;
- if (qn->getSchemaName().isNull()) {
- NAString n(qn->getObjectName());
- $$ = CharInfo::getCollationEnum(n, lookupNameAsNSK);
- } // SJIS
- } // Y.SJIS or SJIS
- } // NAMETYPE NSK
if ($$ == CharInfo::UNKNOWN_COLLATION) {
@@ -28905,18 +28773,6 @@ location_definition : guardian_location_name
*/
/* type stringval */
-/* ...lu-shung... kludge */
-// Use identifier instead of regular_identifier to allow reserved words all
-// caps in double quotes as subvolume name. Double quotes are handled in
-// ValidateNSKNamePart::validate of DefaultValidator.cpp and
-// ComMPLoc::parse of ComMPLoc.cpp.
-guardian_subvolume_name : guardian_volume_name '.' identifier
- {
- $1->append("." + *$3);
- delete $3;
- $$ = $1;
- }
-/* type stringval */
guardian_location_name : guardian_volume_name
| guardian_volume_name '.'
regular_identifier '.'
@@ -33753,7 +33609,6 @@ nonreserved_word : TOK_ABORT
| TOK_MORE
| TOK_MOVE
| TOK_MOVEMENT
- | TOK_MPLOC /* Tandem extension */
| TOK_MTS
| TOK_MV
| TOK_MULTI /* Long Running */
@@ -34084,7 +33939,6 @@ nonreserved_func_word: TOK_ABS
| TOK_ASIN
| TOK_ATAN
| TOK_ATAN2
- | TOK_AUDIT_IMAGE // Utilities
| TOK_AUTHNAME
| TOK_AUTHTYPE
| TOK_BITAND
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/qms/QmmMain.cpp
----------------------------------------------------------------------
diff --git a/core/sql/qms/QmmMain.cpp b/core/sql/qms/QmmMain.cpp
index 140db8d..557a8ce 100644
--- a/core/sql/qms/QmmMain.cpp
+++ b/core/sql/qms/QmmMain.cpp
@@ -27,14 +27,12 @@
#include "QRLogger.h"
#include "NAType.h"
-#if defined (NA_LINUX)
#include "nsk/nskport.h"
#include "seabed/ms.h"
#include "seabed/fs.h"
extern void my_mpi_fclose();
#include "SCMVersHelp.h"
DEFINE_DOVERS(tdm_arkqmm)
-#endif
/**
* \file
@@ -144,10 +142,6 @@ static short getDefaultQmpCpu(const IpcEnvironment* ipcEnv)
{
short qmpCpu;
-#ifdef NA_WINNT
- qmpCpu = 0;
-#elif defined(NA_LINUX)
-
// Default QMP location is the same cpu QMM is running on.
SB_Phandle_Type procHandle;
Int32 lc_cpu;
@@ -161,24 +155,19 @@ static short getDefaultQmpCpu(const IpcEnvironment* ipcEnv)
"XPROCESSHANDLE_DECOMPOSE_ returned error %d", error);
qmpCpu = 3; // best-guess default
}
-#endif
return qmpCpu;
}
-#ifdef NA_LINUX
extern "C"
{
Int32 sq_fs_dllmain();
}
-#endif
-
Int32 main(Int32 argc, char *argv[])
{
-#ifdef NA_LINUX
dovers(argc, argv);
try
@@ -194,7 +183,6 @@ Int32 main(Int32 argc, char *argv[])
cerr << "Error while initializing messaging system. Exiting..." << endl;
exit(1);
}
-#endif
Lng32 result = 0;
@@ -206,13 +194,6 @@ Int32 main(Int32 argc, char *argv[])
//for (int i=0; i<argc; i++)
// debugMessage2("Program argument %d is %s", i, argv[i]);
-#ifdef NA_WINNT
- if (getenv("QMP_MSGBOX_PROCESS") != NULL)
- {
- MessageBox( NULL, "QMM Process Launched", (CHAR *)argv[0], MB_OK|MB_ICONINFORMATION );
- };
-#endif
-
Qmm* qmm = NULL;
try
{
[18/30] incubator-trafodion git commit: TRAFODION-2731 CodeCleanup:
Remove obsolete, legacy and unused code
Posted by an...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/common/charinfo.cpp
----------------------------------------------------------------------
diff --git a/core/sql/common/charinfo.cpp b/core/sql/common/charinfo.cpp
index 576637f..c26efe8 100644
--- a/core/sql/common/charinfo.cpp
+++ b/core/sql/common/charinfo.cpp
@@ -171,7 +171,7 @@ NABoolean CharInfo::isCharSetSupported(CharSet cs)
if (cs >= CHARSET_MIN && cs <= CHARSET_MAX)
{
// Special for running regress/fullstack/TEST001 on NSK:
-#ifdef NA_DEBUG_C_RUNTIME
+#ifdef _DEBUG
if (IF_WIDE == FALSE &&
mapCSArray[cs-CHARSET_MIN].maxBytesPerChar > 1 && // SJIS or UNICODE
getenv("NCHAR_SJIS_DEBUG"))
@@ -188,7 +188,7 @@ NABoolean CharInfo::isCharSetFullySupported(CharSet cs)
if (cs >= CHARSET_MIN && cs <= CHARSET_MAX)
{
// Special for running regress/fullstack/TEST001 on NSK:
-#ifdef NA_DEBUG_C_RUNTIME
+#ifdef _DEBUG
if (IF_WIDE == FALSE &&
mapCSArray[cs-CHARSET_MIN].maxBytesPerChar > 1 && // SJIS or UNICODE
getenv("NCHAR_SJIS_DEBUG"))
@@ -223,7 +223,7 @@ NABoolean CharInfo::isMsgCharSetSupported(CharSet cs) {
// see TESTCHARSET in CmpMain.cpp
void CharInfo::toggleCharSetSupport(CharSet cs)
{
-#ifdef NA_DEBUG_C_RUNTIME
+#ifdef _DEBUG
size_t i;
for (i = 0; i < SIZEOF_CS; i++)
if (cs == mapCSArray[i].cs)
@@ -486,10 +486,6 @@ Int32 CollationDB::getCollationFlags(CharInfo::Collation co) const
//
// So we must check that any spaces are *trailing* spaces only.
//
-// The smdio/CmColumnsRow.cpp and sqlcat/ReadTableDef.cpp
-// callers do not have a '\0'-terminated string,
-// hence our needing this length arg to pass in.
-//
// We can't use plain old strcmp here, because we want both
// "SJIS" and "SJIS "
// to be matched. The public caller CharInfo::getCollationEnum()
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/common/conversionLocale.cpp
----------------------------------------------------------------------
diff --git a/core/sql/common/conversionLocale.cpp b/core/sql/common/conversionLocale.cpp
index a225308..9d587b3 100644
--- a/core/sql/common/conversionLocale.cpp
+++ b/core/sql/common/conversionLocale.cpp
@@ -69,7 +69,7 @@ cnv_charset convertCharsetEnum (Int32 inset)
// The optional utf8String argument holds the buffer into which the Unicode string
// will be stored. In case the argument is NULL or it is not big enough,
// the function allocates memory from the heap (if the heap pointer is not NULL),
-// or from the C run-time system heap (if NA_NO_C_RUNTIME is not defined).
+// or from the C run-time system heap.
// If the memory allocation fails, the function returns 0. If any illegal
// characters are encountered, the function also returns 0.
//
@@ -651,7 +651,6 @@ Int32 ComputeStrLenInNAWchars (const char * pStr,
// error code values are defined in w:/common/csconvert.h. Note that
// this function does not need to use a workspace heap.
// -----------------------------------------------------------------------
-NA_EIDPROC
Int32 ComputeStrLenInUCS4chars (const char * pStr,
const Int32 strLenInBytes,
const CharInfo::CharSet cs)
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/common/conversionSJIS.cpp
----------------------------------------------------------------------
diff --git a/core/sql/common/conversionSJIS.cpp b/core/sql/common/conversionSJIS.cpp
index 52aaa65..5aab462 100644
--- a/core/sql/common/conversionSJIS.cpp
+++ b/core/sql/common/conversionSJIS.cpp
@@ -58,7 +58,6 @@
// unicode.org.
///////////////////////////////////////////////////////////////////////
-NA_EIDPROC
inline Int32 in_range(Int32 x, Int32 lower, Int32 upper)
{
return ( lower <= x && x <= upper ) ? 1 : 0;
@@ -80,7 +79,7 @@ typedef struct SJISCodeBound {
// will be stored. In case the result argument is NULL or the buffer it points
// at is not big enough, the function allocates memory from the heap
// (if the heap pointer is not NULL), or from the C run-time system heap
-// (if NA_NO_C_RUNTIME is not defined), and returns the result.
+// and returns the result.
//
// If memory allocation fails, the function returns NULL.
// If any illegal characters are encountered, the function also returns NULL.
@@ -282,7 +281,6 @@ typedef struct Unicode2SjisMap
// The function only returns the SJIS that are double-byte. Hense it is static.
//
static
-NA_EIDPROC
NABoolean binarySearchU2STable(NAWchar u, NAWchar& sjis)
{
@@ -328,7 +326,6 @@ NABoolean binarySearchU2STable(NAWchar u, NAWchar& sjis)
// bytes is returned by the function. The function returns 0 if the
// Unicode character is not mappable from SJIS.
//
-NA_EIDPROC
Int32 unicodeToSjisChar(NAWchar wc, unsigned char *sjis, NABoolean allowInvalidCodePoint)
{
NAWchar t;
@@ -369,7 +366,7 @@ Int32 unicodeToSjisChar(NAWchar wc, unsigned char *sjis, NABoolean allowInvalidC
// The optional sjisString argument holds the buffer into which the Unicode string
// will be stored. In case the argument is NULL or it is not big enough,
// the function allocates memory from the heap (if the heap pointer is not NULL),
-// or from the C run-time system heap (if NA_NO_C_RUNTIME is not defined).
+// or from the C run-time system heap.
// If the memory allocation fails, the function returns 0. If any illegal
// characters are encountered, the function also returns 0.
//
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/common/csconvert.h
----------------------------------------------------------------------
diff --git a/core/sql/common/csconvert.h b/core/sql/common/csconvert.h
index 810fae5..3e9417c 100644
--- a/core/sql/common/csconvert.h
+++ b/core/sql/common/csconvert.h
@@ -31,11 +31,6 @@
// for them can be used in not only the SQL/MX compiler build,
// but also used by the ODBC build and maybe others.
-#ifndef NA_EIDPROC
-#define NA_EIDPROC
-#define _resident
-#endif
-
enum cnv_version { cnv_version1 = 1 }; /* For future expansion */
#ifndef cnv_charset_DEFINED
@@ -59,7 +54,6 @@ enum cnv_charset { cnv_UnknownCharSet = 0, cnv_UTF8 = 1,
#endif
//NOTE: The following definitions assume that FALSE = 0 and TRUE <> 0
-NA_EIDPROC
int LocaleToUTF8( const enum cnv_version version,
const char *in_bufr, const int in_len,
const char *out_bufr, const int out_len,
@@ -69,7 +63,6 @@ int LocaleToUTF8( const enum cnv_version version,
const int addNullAtEnd_flag = FALSE,
unsigned int *translated_char_cnt_p = NULL );
-NA_EIDPROC
int UTF8ToLocale( const enum cnv_version version,
const char *in_bufr, const int in_len,
const char *out_bufr, const int out_len,
@@ -81,7 +74,6 @@ int UTF8ToLocale( const enum cnv_version version,
unsigned int * translated_char_cnt_p = NULL ,
const char *substitution_char = NULL );
-NA_EIDPROC
int LocaleToUTF16( const enum cnv_version version,
const char *in_bufr, const int in_len,
const char *out_bufr, const int out_len,
@@ -93,7 +85,6 @@ int LocaleToUTF16( const enum cnv_version version,
unsigned int *translated_char_cnt_p = NULL ,
unsigned int max_chars_to_convert = 0xffffffff);
-NA_EIDPROC
int UTF16ToLocale( const enum cnv_version version,
const char *in_bufr, const int in_len,
const char *out_bufr, const int out_len,
@@ -106,7 +97,6 @@ int UTF16ToLocale( const enum cnv_version version,
unsigned int * translated_char_cnt_p = NULL ,
const char *substitution_char = NULL );
-NA_EIDPROC
int gbkToUtf8(char* gbkString, size_t gbklen,
char* result ,size_t outlen, bool addNullAtEnd=FALSE);
@@ -115,7 +105,6 @@ int gbkToUtf8(char* gbkString, size_t gbklen,
* UCS4 value. Returns the UCS4 value at location specified AND the
* length of the input character in bytes as the return value.
*/
-NA_EIDPROC
int LocaleCharToUCS4( const char *in_bufr, //Ptr to Input string
const int in_len, //Len of Input string (bytes)
unsigned int *UCS4ptr , //Ptr to output location
@@ -125,7 +114,6 @@ int LocaleCharToUCS4( const char *in_bufr, //Ptr to Input string
* and stores the character in the output buffer specified.
* Returns length of the output character in bytes as the return value.
*/
-NA_EIDPROC
int UCS4ToLocaleChar( const unsigned int *UCS4ptr , //Ptr to input char
const char *out_bufr, //Ptr to output bufr
const int out_len, //Len of output bufr
@@ -250,13 +238,11 @@ int UCS4ToLocaleChar( const unsigned int *UCS4ptr , //Ptr to input char
* truncated with blanks
*/
-NA_EIDPROC
int lightValidateUTF8Str(const char *bufr, // ptr to buffer to validate
int in_len, // len in bytes of buffer
int max_chars = 0, // max chars allowed in buffer or 0 for unlimited
int ignore_trailing_blanks = 1); // don't count trailing blanks as chars
-NA_EIDPROC
int lightValidateUTF8StrAndPad(char *bufr,
int in_len,
int max_chars = 0,
@@ -285,7 +271,6 @@ inline int fillWithMinMaxUTF8Chars(char *bufr,
/* A method to find the beginning of a UTF8 char that is at the end off
a buffer.
*/
-NA_EIDPROC
char * findStartOfChar( char *someByteInChar, char *startOfBuffer );
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/common/dfs2rec.h
----------------------------------------------------------------------
diff --git a/core/sql/common/dfs2rec.h b/core/sql/common/dfs2rec.h
index 1d27fa2..7136bd4 100644
--- a/core/sql/common/dfs2rec.h
+++ b/core/sql/common/dfs2rec.h
@@ -66,14 +66,9 @@
#define REC_MIN_FLOAT 142
#define REC_IEEE_FLOAT32 142
#define REC_IEEE_FLOAT64 143
-#define REC_MAX_FLOAT 143
-
-#if defined(NA_IEEE_FLOAT)
#define REC_FLOAT32 142
#define REC_FLOAT64 143
-#else
-#error Unknown float type
-#endif
+#define REC_MAX_FLOAT 143
#define REC_MIN_DECIMAL 150
#define REC_DECIMAL_UNSIGNED 150
@@ -100,15 +95,7 @@
// not-quite-right values.
// These unused, unnecessary #defines have been commented out.
//
-// In MX, none of the _UP datatypes occur because a column's UPSHIFT attribute
-// is kept only in a separate COLUMNS.ISUPSHIFTED metadata column,
-// and ReadTableDef correctly maps REC_BYTE_x_ASCII_UP to REC_BYTE_x_ASCII.
-// Below, these are marked "[Mxmapped]".
-// Thus, only ReadTableDef.cpp needs to know about REC_BYTE_x_ASCII_UP --
-// none of the rest of MX will ever encounter this datatype --
-// thus, no other MX code should use the #defines for REC_BYTE_x_ASCII_UP.
-
-// All MP or MX multibyte char data is REC_BYTE_x_DOUBLE;
+// All MX multibyte char data is REC_BYTE_x_DOUBLE;
// the REC_NCHAR_x_UNICODE are synonyms, for convenience, marked "[Mxsynonym]".
//
// The COLUMNS.CHARSET metadata of sqlcat/desc.h,
@@ -126,9 +113,6 @@
#define REC_MIN_F_CHAR_H 0 // MP same name
#define REC_BYTE_F_ASCII 0 // MP same name
- #ifdef READTABLEDEF_IMPLEMENTATION
- #define REC_BYTE_F_ASCII_UP 1 // MP same name [MXmapped]
- #endif
#define REC_BYTE_F_DOUBLE 2 // MP same name
#define REC_NCHAR_F_UNICODE 2 // [MXsynonym]
@@ -137,9 +121,6 @@
#define REC_MIN_V_CHAR_H 64 // MP same name
#define REC_BYTE_V_ASCII 64 // MP same name
- #ifdef READTABLEDEF_IMPLEMENTATION
- #define REC_BYTE_V_ASCII_UP 65 // MP same name [MXmapped]
- #endif
#define REC_BYTE_V_DOUBLE 66 // MP same name
#define REC_NCHAR_V_UNICODE 66 // [MXsynonym]
@@ -232,7 +213,7 @@ enum REC_DATETIME_CODE {
#define REC_INT_DAY_SECOND 207
// #define REC_MAX_INTERVAL 207
-#define REC_INT_FRACTION 208 // Used in MP only! See ReadTableDef.C
+#define REC_INT_FRACTION 208 // Used in MP only!
#define REC_MAX_INTERVAL 208
#define REC_MAX_INTERVAL_MP 212
#define REC_MAX_INTERVAL_MP 212
@@ -249,7 +230,7 @@ enum rec_datetime_field {
, REC_DATE_HOUR
, REC_DATE_MINUTE
, REC_DATE_SECOND
-, REC_DATE_FRACTION_MP // Used in MP only! See ReadTableDef.C
+, REC_DATE_FRACTION_MP // Used in MP only!
, REC_DATE_MAX_SINGLE_FIELD
// other datetime fields, not used in FS2 and DDL
@@ -397,7 +378,6 @@ struct rec_project_struct
class rec_field_struct
{
private:
-NA_EIDPROC
// this code is same as that in common/DateTimeType.cpp.
// We cannot source in DateTimeType.h in here. Maybe we
// extract this method in some kind of common utility.
@@ -479,7 +459,6 @@ NA_EIDPROC
public:
//LCOV_EXCL_START : Reported by Code Coverage tool as unused, but actually not executable on SQ
- NA_EIDPROC
Lng32 getLength()
{
if ((type >= REC_MIN_NUMERIC) && (type <= REC_MAX_NUMERIC))
@@ -495,7 +474,6 @@ public:
};
//LCOV_EXCL_STOP
-NA_EIDPROC
Lng32 getPrecision()
{
if ((type >= REC_MIN_NUMERIC) && (type <= REC_MAX_NUMERIC))
@@ -521,7 +499,6 @@ NA_EIDPROC
return 0;
};
-NA_EIDPROC
Lng32 getScale()
{
if ((type >= REC_MIN_NUMERIC) && (type <= REC_MAX_NUMERIC))
@@ -537,7 +514,6 @@ NA_EIDPROC
};
-NA_EIDPROC
void setLength(Lng32 len)
{
if ((type >= REC_MIN_NUMERIC) && (type <= REC_MAX_NUMERIC))
@@ -553,7 +529,6 @@ NA_EIDPROC
};
#ifdef NA_CATMAN_SIM
-NA_EIDPROC
Lng32 getBeginType()
{
if (type == REC_DATETIME)
@@ -562,14 +537,12 @@ NA_EIDPROC
return -1;
};
-NA_EIDPROC
void setBeginType(Lng32 ltype)
{
if (type == REC_DATETIME)
len_etc.datetime_.lead_type = (unsigned short) ltype;
};
-NA_EIDPROC
Lng32 getEndType()
{
if (type == REC_DATETIME)
@@ -578,7 +551,6 @@ NA_EIDPROC
return -1;
};
-NA_EIDPROC
void setEndType(Lng32 etype)
{
if (type == REC_DATETIME)
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/common/from_GB18030.c
----------------------------------------------------------------------
diff --git a/core/sql/common/from_GB18030.c b/core/sql/common/from_GB18030.c
index 2c90f0a..8b02627 100644
--- a/core/sql/common/from_GB18030.c
+++ b/core/sql/common/from_GB18030.c
@@ -149,7 +149,6 @@ static const gb4idx_ucs_t gb4idx_ucs_table[] = { 0, 0 } ;
static const ucs_gb4idx_t ucs_gb4idx_table[] = { 0, 0, 0 } ;
#endif
-NA_EIDPROC
static int
compare_gb4idx_ucs(gb4idx_ucs_t *ptr1, gb4idx_ucs_t *ptr2)
{
@@ -174,14 +173,12 @@ compare_gb4idx_ucs(gb4idx_ucs_t *ptr1, gb4idx_ucs_t *ptr2)
return(factor) ;
}
-NA_EIDPROC
static int
compare_gb4idx_ucs_C(const void *ptr1, const void *ptr2) //JAC - CAST FUNCTION needed to make our NT compiler happy
{
return compare_gb4idx_ucs( (gb4idx_ucs_t *) ptr1, (gb4idx_ucs_t *) ptr2 );
}
-NA_EIDPROC
static int
compare_ucs_gb4idx(ucs_gb4idx_t *ptr1, ucs_gb4idx_t *ptr2)
{
@@ -205,7 +202,6 @@ compare_ucs_gb4idx(ucs_gb4idx_t *ptr1, ucs_gb4idx_t *ptr2)
return(0) ; /* A match */
}
-NA_EIDPROC
static int
compare_ucs_gb4idx_C(const void *ptr1, const void *ptr2) //JAC - CAST FUNCTION needed to make our NT compiler happy
{
@@ -218,7 +214,6 @@ compare_ucs_gb4idx_C(const void *ptr1, const void *ptr2) //JAC - CAST FUNCTION n
* a 2-byte GB18030 code if the value >= 0xa1a1. Otherwise, it is assumed
* to be a 4-byte index and converted to a 4-byte GB18030 code.
*/
-NA_EIDPROC
static uint_t
tudc_to_gb(int udc)
{
@@ -240,7 +235,6 @@ tudc_to_gb(int udc)
* -1 - Invalid sequence (EILSEQ)
* -2 - Input incomplete
*/
-NA_EIDPROC
int
__gb18030_index(_LC_fcconv_iconv_t * cd, uchar_t **in, int len)
{
@@ -320,7 +314,6 @@ __gb18030_index(_LC_fcconv_iconv_t * cd, uchar_t **in, int len)
/*
* This routine maps UDC characters in Unicode to those in GB18030
*/
-NA_EIDPROC
WChar_t // JAC
__UDC_to_gb18030(ucs4_t ucs)
{
@@ -341,7 +334,6 @@ __UDC_to_gb18030(ucs4_t ucs)
/*
* This routine maps UCS characters to 4-byte GB18030 characters
*/
-NA_EIDPROC
WChar_t // JAC
__UCS_to_gb18030(ucs4_t ucs)
{
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/common/from_GBK.c
----------------------------------------------------------------------
diff --git a/core/sql/common/from_GBK.c b/core/sql/common/from_GBK.c
index b44a1ed..556bf60 100644
--- a/core/sql/common/from_GBK.c
+++ b/core/sql/common/from_GBK.c
@@ -57,7 +57,6 @@
* -1 - Invalid sequence (EILSEQ)
* -2 - Input incomplete
*/
-NA_EIDPROC
int
__gbk_index(_LC_fcconv_iconv_t * cd, uchar_t **in, int len)
{
@@ -97,7 +96,6 @@ __gbk_index(_LC_fcconv_iconv_t * cd, uchar_t **in, int len)
* This routine performs the conversion from a GBK code to GBK:GLGR
* code.
*/
-NA_EIDPROC
int
__gbk_to_gbkglgr(WChar_t code)
{
@@ -109,7 +107,6 @@ __gbk_to_gbkglgr(WChar_t code)
/*
* This routine maps UDC characters in Unicode to those in GBK
*/
-NA_EIDPROC
WChar_t
__UDC_to_gbk(ucs4_t ucs)
{
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/common/from_SJIS.c
----------------------------------------------------------------------
diff --git a/core/sql/common/from_SJIS.c b/core/sql/common/from_SJIS.c
index e6e5498..73aea9c 100644
--- a/core/sql/common/from_SJIS.c
+++ b/core/sql/common/from_SJIS.c
@@ -135,7 +135,6 @@ static const uchar_t idx_to_sjis[] =
* -1 - Invalid sequence (EILSEQ)
* -2 - Input incomplete
*/
-NA_EIDPROC
int
__sjis_index(_LC_fcconv_iconv_t *cd, uchar_t **in, int len)
{
@@ -167,7 +166,6 @@ __sjis_index(_LC_fcconv_iconv_t *cd, uchar_t **in, int len)
/*
* This routine map UDC characters in Unicode to those in SJIS
*/
-NA_EIDPROC
WChar_t // JAC
__UDC_to_sjis(ucs4_t ucs)
{
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/common/from_ksc5601.c
----------------------------------------------------------------------
diff --git a/core/sql/common/from_ksc5601.c b/core/sql/common/from_ksc5601.c
index 1433966..14c4fcd 100644
--- a/core/sql/common/from_ksc5601.c
+++ b/core/sql/common/from_ksc5601.c
@@ -56,7 +56,6 @@
* -1 - Invalid sequence (EILSEQ)
* -2 - Input incomplete
*/
-NA_EIDPROC
int
__cp949_index(_LC_fcconv_iconv_t *cd, uchar_t **in, int len)
{
@@ -85,7 +84,6 @@ __cp949_index(_LC_fcconv_iconv_t *cd, uchar_t **in, int len)
/*
* This routine enables table lookup of BMP UDC characters to cp949
*/
-NA_EIDPROC
WChar_t // JAC
__UDC_to_cp949(ucs4_t ucs)
{
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/common/iconv_gen.c
----------------------------------------------------------------------
diff --git a/core/sql/common/iconv_gen.c b/core/sql/common/iconv_gen.c
index 5af2956..547b152 100644
--- a/core/sql/common/iconv_gen.c
+++ b/core/sql/common/iconv_gen.c
@@ -167,7 +167,6 @@
* Driver routine for converting from UCS/UTF.
**********/
#ifdef USING_OPEN_SOURCE_from_ucs_exec /* JAC */
-NA_EIDPROC
int
__from_ucs_exec (_LC_fcconv_iconv_t *cd,
uchar_t** in_buff , size_t *in_bytes_left ,
@@ -367,7 +366,6 @@ __from_ucs_exec (_LC_fcconv_iconv_t *cd,
**********/
#ifdef USING_OPEN_SOURCE_sb_to_ucs_exec /* JAC */
-NA_EIDPROC
int
__sb_to_ucs_exec(_LC_fcconv_iconv_t *cd,
uchar_t** in_buff , size_t *in_bytes_left ,
@@ -457,7 +455,6 @@ __sb_to_ucs_exec(_LC_fcconv_iconv_t *cd,
**********/
#ifdef USING_OPEN_SOURCE_sb_to_sb_exec /* JAC */
-NA_EIDPROC
int
__sb_to_sb_exec(_LC_fcconv_iconv_t *cd,
uchar_t** in_buff , size_t *in_bytes_left ,
@@ -600,7 +597,6 @@ __sb_to_sb_exec(_LC_fcconv_iconv_t *cd,
**********/
#ifdef USING_OPEN_SOURCE_to_ucs_exec /* JAC */
-NA_EIDPROC
int
__to_ucs_exec(_LC_fcconv_iconv_t *cd,
uchar_t** in_buff , size_t *in_bytes_left ,
@@ -746,7 +742,6 @@ __to_ucs_exec(_LC_fcconv_iconv_t *cd,
**********/
#ifdef USING_OPEN_SOURCE_cs_to_ucs_exec /* JAC */
-NA_EIDPROC
int
__cs_to_ucs_exec(_LC_fcconv_iconv_t *cd,
uchar_t** in_buff , size_t *in_bytes_left ,
@@ -857,7 +852,6 @@ __cs_to_ucs_exec(_LC_fcconv_iconv_t *cd,
**********/
#ifdef USING_OPEN_SOURCE_mb_to_mb_exec /* JAC */
-NA_EIDPROC
int
__mb_to_mb_exec(_LC_fcconv_iconv_t *cd,
uchar_t** in_buff , size_t *in_bytes_left ,
@@ -1255,7 +1249,6 @@ typedef struct utf7_conv
/*
* UTF-7 conversion table initialization routine
*/
-NA_EIDPROC
static void
utf7_convtable_init(_LC_fcconv_iconv_t *cd)
{
@@ -1312,7 +1305,6 @@ utf7_convtable_init(_LC_fcconv_iconv_t *cd)
/* */
/************************************************************************/
//LCOV_EXCL_START :cnu -- As of 8/30/2011, not used on SQ platform, but may be used on Clients
-NA_EIDPROC
int __input_ucs4(_LC_fcconv_iconv_t *cd, uchar_t **in, int len)
{
ucs4_t *inptr = (ucs4_t *)*in ;
@@ -1349,7 +1341,6 @@ int __input_ucs4(_LC_fcconv_iconv_t *cd, uchar_t **in, int len)
//LCOV_EXCL_STOP
/*#endif /* USING_OPEN_SOURCE_input_ucs4 // JAC */
-NA_EIDPROC
int __input_ucs2(_LC_fcconv_iconv_t *cd, uchar_t **in, int len)
{
ucs2_t *inptr = (ucs2_t *)*in ;
@@ -1404,7 +1395,6 @@ int __input_ucs2(_LC_fcconv_iconv_t *cd, uchar_t **in, int len)
return((int)word) ;
}
-NA_EIDPROC
int __input_utf8(_LC_fcconv_iconv_t *cd, uchar_t **in, int len)
{
int first = !(cd->flags & CONV_INPUT_PROCESSED) ;
@@ -1497,7 +1487,6 @@ int __input_utf8(_LC_fcconv_iconv_t *cd, uchar_t **in, int len)
* character-by-character basis.
*/
#ifdef USING_OPEN_SOURCE_UTF7 /* JAC */
-NA_EIDPROC
int __input_utf7(_LC_fcconv_iconv_t *cd, uchar_t **in, int len)
{
uchar_t *inptr = *in ;
@@ -1601,7 +1590,6 @@ int __input_utf7(_LC_fcconv_iconv_t *cd, uchar_t **in, int len)
/* */
/************************************************************************/
//LCOV_EXCL_START :cnu -- As of 8/30/2011, not used on SQ platform, but may be used on Clients
-NA_EIDPROC
int __output_ucs4(_LC_fcconv_iconv_t *cd, uchar_t *out, int len, ucs4_t word)
{
ucs4_t *outptr = (ucs4_t *)out ;
@@ -1632,7 +1620,6 @@ int __output_ucs4(_LC_fcconv_iconv_t *cd, uchar_t *out, int len, ucs4_t word)
//LCOV_EXCL_STOP
/*#endif /* USING_OPEN_SOURCE_output_ucs4 // JAC */
-NA_EIDPROC
int __output_ucs2(_LC_fcconv_iconv_t *cd, uchar_t *out, int len, ucs4_t word)
{
ucs2_t *outptr = (ucs2_t *)out ;
@@ -1681,7 +1668,6 @@ int __output_ucs2(_LC_fcconv_iconv_t *cd, uchar_t *out, int len, ucs4_t word)
return((uchar_t *)outptr - out) ;
}
-NA_EIDPROC
int __output_utf8(_LC_fcconv_iconv_t *cd, uchar_t *out, int len, ucs4_t word)
{
uchar_t *outptr = out ;
@@ -1725,7 +1711,6 @@ int __output_utf8(_LC_fcconv_iconv_t *cd, uchar_t *out, int len, ucs4_t word)
}
#ifdef USING_OPEN_SOURCE_output_utf7 /* JAC */
-NA_EIDPROC
int __output_utf7(_LC_fcconv_iconv_t *cd, uchar_t *out, int len, ucs4_t word)
{
uchar_t *outptr = out ;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/common/ipcmsg.cpp
----------------------------------------------------------------------
diff --git a/core/sql/common/ipcmsg.cpp b/core/sql/common/ipcmsg.cpp
index 5001f7d..1daa976 100644
--- a/core/sql/common/ipcmsg.cpp
+++ b/core/sql/common/ipcmsg.cpp
@@ -69,7 +69,7 @@ enum {FS_SMS_VERSION_MAY94 = 1};
#include <fcntl.h>
#include "logmxevent.h"
-#if (defined(NA_GUARDIAN_IPC) || defined(NA_GUARDIAN_MSG))
+#if (defined(NA_GUARDIAN_IPC))
// all of these files are OK in the executor environment (PRIV, no globals)
extern "C" {
//#include <cextdecs.h>
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/common/mb_lconv.c
----------------------------------------------------------------------
diff --git a/core/sql/common/mb_lconv.c b/core/sql/common/mb_lconv.c
index f5a47db..a3ecdbd 100644
--- a/core/sql/common/mb_lconv.c
+++ b/core/sql/common/mb_lconv.c
@@ -109,7 +109,7 @@
#define Max_BIG5_chr 0xF9FF /* Max for using lookup table */
#define BAD_UCS_VAL 0x0000FFFF
-NA_EIDPROC size_t Our_mbtowc_big5_ucs4(WChar_t *pwc, const char *ts, size_t maxlen,
+size_t Our_mbtowc_big5_ucs4(WChar_t *pwc, const char *ts, size_t maxlen,
_LC_charmap_t *hdl)
{
uchar_t *s = (uchar_t *)ts ;
@@ -169,7 +169,7 @@ err_exit:
#define Min_SJIS_chr 0x8140 /* Min for using lookup table */
#define Max_SJIS_chr 0xFC4B /* Max for using lookup table */
-NA_EIDPROC size_t Our_mbtowc_sjis_ucs4(WChar_t *pwc, const char *ts, size_t maxlen,
+size_t Our_mbtowc_sjis_ucs4(WChar_t *pwc, const char *ts, size_t maxlen,
_LC_charmap_t *hdl)
{
uchar_t *s = (uchar_t *)ts ;
@@ -250,7 +250,7 @@ err_exit:
#define Min_KSC_chr 0x8141 /* Min for using lookup table */
#define Max_KSC_chr 0xFEFE /* Max for using lookup table */
-NA_EIDPROC size_t Our_mbtowc_cp949_ucs4(WChar_t *pwc, const char *ts, size_t maxlen,
+size_t Our_mbtowc_cp949_ucs4(WChar_t *pwc, const char *ts, size_t maxlen,
_LC_charmap_t *hdl)
{
uchar_t *s = (uchar_t *)ts ;
@@ -317,7 +317,7 @@ err_exit:
#define EUCJP_ROW_LEN (0xFE - 0xA1 + 1)
#define EUCJP_NUM_ROWS (0xFE - 0xA1 +1)
-NA_EIDPROC size_t Our_mbtowc_eucjp_ucs4(WChar_t *pwc, const char *ts, size_t maxlen,
+size_t Our_mbtowc_eucjp_ucs4(WChar_t *pwc, const char *ts, size_t maxlen,
_LC_charmap_t *hdl)
{
uchar_t *s = (uchar_t *)ts ;
@@ -402,7 +402,7 @@ err_exit:
*/
#define Max_BIG5_UCS_val (0xFFFE)
-NA_EIDPROC int Our_wctomb_big5_ucs4(char *s, WChar_t wc, _LC_charmap_t *hdl)
+int Our_wctomb_big5_ucs4(char *s, WChar_t wc, _LC_charmap_t *hdl)
{
WChar_t mb = 0 ;
@@ -452,7 +452,7 @@ NA_EIDPROC int Our_wctomb_big5_ucs4(char *s, WChar_t wc, _LC_charmap_t *hdl)
*/
#define Max_KSC_UCS_val (0xFFFE)
-NA_EIDPROC int Our_wctomb_cp949_ucs4(char *s, WChar_t wc, _LC_charmap_t *hdl)
+int Our_wctomb_cp949_ucs4(char *s, WChar_t wc, _LC_charmap_t *hdl)
{
WChar_t mb = 0 ;
@@ -508,7 +508,7 @@ NA_EIDPROC int Our_wctomb_cp949_ucs4(char *s, WChar_t wc, _LC_charmap_t *hdl)
*/
#define Max_SJIS_UCS_val (0xFFFE)
-NA_EIDPROC int Our_wctomb_sjis_ucs4(char *s, WChar_t wc, _LC_charmap_t *hdl)
+int Our_wctomb_sjis_ucs4(char *s, WChar_t wc, _LC_charmap_t *hdl)
{
WChar_t mb = 0 ;
@@ -562,7 +562,7 @@ NA_EIDPROC int Our_wctomb_sjis_ucs4(char *s, WChar_t wc, _LC_charmap_t *hdl)
* NOTE: It is the caller's responsibility to ensure output array is
* big enough.
*/
-NA_EIDPROC int Our_wctomb_eucjp_ucs4(char *s, WChar_t wc, _LC_charmap_t *hdl)
+int Our_wctomb_eucjp_ucs4(char *s, WChar_t wc, _LC_charmap_t *hdl)
{
WChar_t mb = 0 ;
@@ -711,8 +711,8 @@ NA_EIDPROC int Our_wctomb_eucjp_ucs4(char *s, WChar_t wc, _LC_charmap_t *hdl)
/*
* Dummy pctomb() and pcstombs() routines
*/
-NA_EIDPROC int __pctomb_mb_ucs4 () { return(-1) ; }
-NA_EIDPROC int __pcstombs_mb_ucs4() { return(-1) ; }
+int __pctomb_mb_ucs4 () { return(-1) ; }
+int __pcstombs_mb_ucs4() { return(-1) ; }
/*
* Dummy cell4_t table
@@ -811,7 +811,7 @@ const static int WCDMAPVAL = WCDMAP ;
/*
* Map a wide character code (UCS) to its multibyte format
*/
-NA_EIDPROC inline static WChar_t WCGETVAL(WChar_t wc) //JAC
+inline static WChar_t WCGETVAL(WChar_t wc) //JAC
{
int row = ROW(wc) ;
if ((row >= WCROWSIZE) || ((row = WCROW[row]) == UCS2_BAD))
@@ -828,7 +828,7 @@ NA_EIDPROC inline static WChar_t WCGETVAL(WChar_t wc) //JAC
/*
* Map a multibyte index to wide character encoding
*/
-NA_EIDPROC inline static WChar_t MBGETVAL(int idx) //JAC
+inline static WChar_t MBGETVAL(int idx) //JAC
{
int row = ROW(idx) ;
if ((row >= MBROWSIZE) || ((row = MBROW[row]) == UCS2_BAD))
@@ -845,7 +845,7 @@ NA_EIDPROC inline static WChar_t MBGETVAL(int idx) //JAC
/*--------------------[ Conversion routines start here ]---------------------*/
#ifdef USING_OPEN_SOURCE_MBLEN
-NA_EIDPROC int MBLEN(const char *ts, size_t maxlen, _LC_charmap_t *hdl)
+int MBLEN(const char *ts, size_t maxlen, _LC_charmap_t *hdl)
{
uchar_t *s = (uchar_t *)ts ;
#ifdef DONT_NEED_THIS // JAC
@@ -886,7 +886,7 @@ NA_EIDPROC int MBLEN(const char *ts, size_t maxlen, _LC_charmap_t *hdl)
}
#endif // USING_OPEN_SOURCE_MBLEN
-NA_EIDPROC size_t MBTOWC(WChar_t *pwc, const char *ts, size_t maxlen, _LC_charmap_t *hdl) // JAC
+size_t MBTOWC(WChar_t *pwc, const char *ts, size_t maxlen, _LC_charmap_t *hdl) // JAC
{
uchar_t *s = (uchar_t *)ts ;
WChar_t wc ; //JAC
@@ -1033,7 +1033,7 @@ err_exit:
return((size_t)-1);
}
-NA_EIDPROC int WCTOMB(char *s, WChar_t wc, _LC_charmap_t *hdl) // JAC
+int WCTOMB(char *s, WChar_t wc, _LC_charmap_t *hdl) // JAC
{
WChar_t mb = 0 ;
#ifdef DONT_NEED_THIS // JAC
@@ -1150,7 +1150,7 @@ success_exit:
}
#ifdef USING_OPEN_SOURCE_MBSTOWCS
-NA_EIDPROC size_t MBSTOWCS(WChar_t *pwcs, const char *ts, size_t n, _LC_charmap_t *hdl) // JAC
+size_t MBSTOWCS(WChar_t *pwcs, const char *ts, size_t n, _LC_charmap_t *hdl) // JAC
{
uchar_t *s = (uchar_t *)ts ;
WChar_t wc ; // JAC
@@ -1231,7 +1231,7 @@ NA_EIDPROC size_t MBSTOWCS(WChar_t *pwcs, const char *ts, size_t n, _LC_charmap_
#endif // USING_OPEN_SOURCE_MBSTOWCS
#ifdef USING_OPEN_SOURCE_WCSTOMBS
-NA_EIDPROC size_t WCSTOMBS(char *s, const WChar_t *pwcs, size_t n, _LC_charmap_t *hdl) // JAC
+size_t WCSTOMBS(char *s, const WChar_t *pwcs, size_t n, _LC_charmap_t *hdl) // JAC
{
#ifdef DONT_NEED_THIS // JAC
int cnt, len, row ;
@@ -1301,7 +1301,7 @@ NA_EIDPROC size_t WCSTOMBS(char *s, const WChar_t *pwcs, size_t n, _LC_charmap_t
#endif // USING_OPEN_SOURCE_WCSTOMBS
#ifdef USING_OPEN_SOURCE_MBTOPC
-NA_EIDPROC size_t
+size_t
MBTOPC(WChar_t *pwc, char *ts, size_t maxlen, int *err, _LC_charmap_t *hdl) // JAC
{
uchar_t *s=(uchar_t *)ts ; /* Better to work with unsigned char. */
@@ -1368,7 +1368,7 @@ MBTOPC(WChar_t *pwc, char *ts, size_t maxlen, int *err, _LC_charmap_t *hdl) // J
#endif // USING_OPEN_SOURCE_MBTOPC
#ifdef USING_OPEN_SOURCE_MBSTOPCS
-NA_EIDPROC size_t MBSTOPCS(WChar_t *pwcs, size_t pwcs_len, const char *s, size_t s_len, /* JAC */
+size_t MBSTOPCS(WChar_t *pwcs, size_t pwcs_len, const char *s, size_t s_len, /* JAC */
int stopchr, char **endptr, int *err, _LC_charmap_t *hdl)
{
int pwcs_cnt = 0 ;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/common/memtest.cpp
----------------------------------------------------------------------
diff --git a/core/sql/common/memtest.cpp b/core/sql/common/memtest.cpp
index 1bc5ad5..747b877 100644
--- a/core/sql/common/memtest.cpp
+++ b/core/sql/common/memtest.cpp
@@ -30,7 +30,6 @@
// by regress/core/TESTMEM and increase the regression runtime substantially.
//
//-------------------------------------------------------------------------
-#undef __EID // force non-mmap based allocation
#include "NAMemory.h"
#include <fstream>
#include <unistd.h>
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/common/multi-byte.h
----------------------------------------------------------------------
diff --git a/core/sql/common/multi-byte.h b/core/sql/common/multi-byte.h
index fb7d6cf..af7cd5c 100644
--- a/core/sql/common/multi-byte.h
+++ b/core/sql/common/multi-byte.h
@@ -27,11 +27,6 @@
#include <sys/types.h>
-#ifndef NA_EIDPROC
-#define NA_EIDPROC
-#define _resident
-#endif
-
/*
* Macros
*/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/common/nawstring.cpp
----------------------------------------------------------------------
diff --git a/core/sql/common/nawstring.cpp b/core/sql/common/nawstring.cpp
index ca35736..33ca1a1 100644
--- a/core/sql/common/nawstring.cpp
+++ b/core/sql/common/nawstring.cpp
@@ -150,7 +150,6 @@ NAWString::replace(size_t pos, size_t n1, const NAWchar* cs, size_t n2)
return *this;
}
-SQLEXPORT_LIB_FUNC
NAWString operator+(const NAWString& s1, const NAWString& s2)
{
// Use the special concatenation constructor:
@@ -249,7 +248,6 @@ size_t NAWString::index(const NAWchar* pattern, size_t patLen, size_t startIndex
// call (C macro expansion/invocation) to deallocate the buffer.
// -----------------------------------------------------------------------
//LCOV_EXCL_START :cnu -- As of 8/30/2011, no callers in SQ SQL except copyNAWString() which has no callers
-SQLEXPORT_LIB_FUNC
NAWchar * newNAWcharBuffer(const NAWString& naws, CollHeap *heap)
{
size_t len = naws.length();
@@ -285,7 +283,6 @@ NAWchar * newNAWcharBuffer(const NAWString& naws, CollHeap *heap)
// call (C macro expansion/invocation) to deallocate the buffer.
// -----------------------------------------------------------------------
//LCOV_EXCL_START :cnu -- As of 8/30/2011, no callers in SQ SQL except copyNAWString() which has no callers
-SQLEXPORT_LIB_FUNC
NAWchar * newNAWcharBufferContainingAnEmptyString(CollHeap *heap)
{
NAWchar* buf = NULL;
@@ -306,7 +303,6 @@ NAWchar * newNAWcharBufferContainingAnEmptyString(CollHeap *heap)
// -----------------------------------------------------------------------
// Remove whitespace (spaces and tabs) from front or back or both
// -----------------------------------------------------------------------
-SQLEXPORT_LIB_FUNC
void TrimNAWStringSpace(NAWString& ns, NAString::stripType eStripType) // default is NAString::trailing
{
StringPos i;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/common/nawstring.h
----------------------------------------------------------------------
diff --git a/core/sql/common/nawstring.h b/core/sql/common/nawstring.h
index 985d3e2..f6b47f5 100644
--- a/core/sql/common/nawstring.h
+++ b/core/sql/common/nawstring.h
@@ -50,7 +50,7 @@
// count in the trailing NAWchar null here.
#define NAW_TO_NASTRING(w) (const char *)w.data(), (w.length()+1) * BYTES_PER_NAWCHAR
-class SQLEXPORT_LIB_FUNC NAWString : public NABasicObject
+class NAWString : public NABasicObject
{
public:
@@ -111,19 +111,15 @@ public:
NAWString ToQuotedWString();
friend
-SQLEXPORT_LIB_FUNC
NAWString operator+(const NAWString& s1, const NAWString& s2);
friend
-SQLEXPORT_LIB_FUNC
NABoolean operator==(const NAWString& s1, const NAWString& s2);
friend
-SQLEXPORT_LIB_FUNC
NABoolean operator< (const NAWString& s1, const NAWString& s2);
friend
-SQLEXPORT_LIB_FUNC
NABoolean operator> (const NAWString& s1, const NAWString& s2);
protected:
@@ -160,29 +156,22 @@ private:
}; //NAWString
// NAWString Logical operators:
-NA_EIDPROC
-//#ifdef NA_NSK // :cnu -- As of 8/30/2011, there are no callers in SQ SQL
inline NABoolean operator==(const NAWString& s1, const NAWString& s2)
{ return s1.fbwstring_ == s2.fbwstring_; }
-NA_EIDPROC
inline NABoolean operator< (const NAWString& s1, const NAWString& s2)
{ return s1.fbwstring_ < s2.fbwstring_; }
//#endif // :cnu
-NA_EIDPROC
inline NABoolean operator!=(const NAWString& s1, const NAWString& s2)
{ return !(s1 == s2); }
-NA_EIDPROC
inline NABoolean operator> (const NAWString& s1, const NAWString& s2)
{ return s1.fbwstring_ > s2.fbwstring_; }
-NA_EIDPROC
inline NABoolean operator<=(const NAWString& s1, const NAWString& s2)
{ return !(s1 > s2); }
-NA_EIDPROC
inline NABoolean operator>=(const NAWString& s1, const NAWString& s2)
{ return !(s1 < s2); }
@@ -191,13 +180,11 @@ inline NABoolean operator>=(const NAWString& s1, const NAWString& s2)
// Returns TRUE if the string consists entirely of whitespace
// (zero or more spaces or tabs, and nothing else), including none (empty str).
// -----------------------------------------------------------------------
-SQLEXPORT_LIB_FUNC
NABoolean IsNAWStringSpaceOrEmpty(const NAWString& naws);
// -----------------------------------------------------------------------
// Remove whitespace (spaces and tabs) from front or back or both
// -----------------------------------------------------------------------
-SQLEXPORT_LIB_FUNC
void TrimNAWStringSpace(NAWString& naws, NAString::stripType s = NAString::trailing);
// -----------------------------------------------------------------------
@@ -212,7 +199,6 @@ void TrimNAWStringSpace(NAWString& naws, NAString::stripType s = NAString::trail
// Use the NADELETEBASIC(returned_NAWchar_star_pointer, heap_pointer)
// call (C macro expansion/invocation) to deallocate the buffer.
// -----------------------------------------------------------------------
-SQLEXPORT_LIB_FUNC
NAWchar * newNAWcharBuffer(const NAWString& naws, CollHeap *heap = NULL);
// -----------------------------------------------------------------------
@@ -228,7 +214,6 @@ NAWchar * newNAWcharBuffer(const NAWString& naws, CollHeap *heap = NULL);
// Use the NADELETEBASIC(returned_NAWchar_star_pointer, heap_pointer)
// call (C macro expansion/invocation) to deallocate the buffer.
// -----------------------------------------------------------------------
-SQLEXPORT_LIB_FUNC
NAWchar * newNAWcharBufferContainingAnEmptyString(CollHeap *heap = NULL);
// // -----------------------------------------------------------------------
@@ -245,6 +230,5 @@ NAWchar * newNAWcharBufferContainingAnEmptyString(CollHeap *heap = NULL);
// //
// // 3/21/2011 Comment out the function because it is not currently used.
// // -----------------------------------------------------------------------
-// SQLEXPORT_LIB_FUNC
// NAWString Latin1StrToUCS2(const NAString & latin1Str, CollHeap * workHeap = NULL);
#endif
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/common/nchar_mp.h
----------------------------------------------------------------------
diff --git a/core/sql/common/nchar_mp.h b/core/sql/common/nchar_mp.h
index 08fe81a..0008684 100644
--- a/core/sql/common/nchar_mp.h
+++ b/core/sql/common/nchar_mp.h
@@ -59,24 +59,15 @@ class kanji_char_set
{
public:
-NA_EIDPROC
kanji_char_set() {};
-#ifndef PRIV_SRL
-NA_EIDPROC
virtual ~kanji_char_set() {};
-#else
-NA_EIDPROC ~kanji_char_set() {};
-#endif // PRIV_SRL
-
-NA_EIDPROC
static NAWchar space_char() { return ' '; };
-NA_EIDPROC
static NAWchar null_char() {return 0;};
-NA_EIDPROC static NAWchar underscore_char()
+static NAWchar underscore_char()
{
#ifdef NA_LITTLE_ENDIAN
// need to flip the two bytes because KANJI_MP data is in multi-byte
@@ -87,7 +78,7 @@ NA_EIDPROC static NAWchar underscore_char()
#endif
};
-NA_EIDPROC static NAWchar percent_char()
+static NAWchar percent_char()
{
#ifdef NA_LITTLE_ENDIAN
// need to flip the two bytes because KANJI_MP data is in multi-byte
@@ -98,9 +89,9 @@ NA_EIDPROC static NAWchar percent_char()
#endif
};
-NA_EIDPROC static NAWchar maxCharValue() { return USHRT_MAX; };
+static NAWchar maxCharValue() { return USHRT_MAX; };
-NA_EIDPROC static short bytesPerChar() { return 2; };
+static short bytesPerChar() { return 2; };
private:
@@ -118,24 +109,15 @@ class ksc5601_char_set
{
public:
-NA_EIDPROC
ksc5601_char_set() {};
-#ifndef PRIV_SRL
-NA_EIDPROC
virtual ~ksc5601_char_set() {};
-#else
-NA_EIDPROC ~ksc5601_char_set() {};
-#endif // PRIV_SRL
-
-NA_EIDPROC
static NAWchar space_char() { return ' '; };
-NA_EIDPROC
static NAWchar null_char() {return 0;};
-NA_EIDPROC static NAWchar underscore_char()
+static NAWchar underscore_char()
{
#ifdef NA_LITTLE_ENDIAN
// need to flip the two bytes because KANJI_MP data is in multi-byte
@@ -146,7 +128,7 @@ NA_EIDPROC static NAWchar underscore_char()
#endif
};
-NA_EIDPROC static NAWchar percent_char()
+static NAWchar percent_char()
{
#ifdef NA_LITTLE_ENDIAN
// need to flip the two bytes because KANJI_MP data is in multi-byte
@@ -157,10 +139,9 @@ NA_EIDPROC static NAWchar percent_char()
#endif
};
-NA_EIDPROC
static NAWchar maxCharValue() { return USHRT_MAX; };
-NA_EIDPROC static short bytesPerChar() { return 2; };
+static short bytesPerChar() { return 2; };
private:
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/common/str.cpp
----------------------------------------------------------------------
diff --git a/core/sql/common/str.cpp b/core/sql/common/str.cpp
index 8e1195b..bcb9d36 100644
--- a/core/sql/common/str.cpp
+++ b/core/sql/common/str.cpp
@@ -45,10 +45,7 @@
#include <stdarg.h>
-
-#if !defined(__EID) && !defined(ARKFS_OPEN)
#include "ComResWords.h"
-#endif
/*
******************************************************************
@@ -56,7 +53,6 @@
*
*/
-NA_EIDPROC
Int32 isUpper8859_1(NAWchar c)
{
if ((c >= 'A') && (c <= 'Z'))
@@ -75,7 +71,6 @@ Int32 isUpper8859_1(NAWchar c)
}
-NA_EIDPROC
Int32 isLower8859_1(NAWchar c)
{
if ((c >= 'a') && (c <= 'z'))
@@ -94,7 +89,6 @@ Int32 isLower8859_1(NAWchar c)
}
-NA_EIDPROC
Int32 isAlpha8859_1(NAWchar c)
{
if (((c >= 'a') && (c <= 'z')) ||
@@ -115,19 +109,16 @@ Int32 isAlpha8859_1(NAWchar c)
return FALSE;
}
-NA_EIDPROC
Int32 isHexDigit8859_1(NAWchar c)
{
return (isDigit8859_1(c) || ('A' <= c AND c <= 'F' ) || ( 'a' <= c AND c <= 'f'));
}
-NA_EIDPROC
Int32 isAlNum8859_1(NAWchar c)
{
return (isAlpha8859_1(c) || isDigit8859_1(c));
}
-NA_EIDPROC
Int32 isSpace8859_1(NAWchar c)
{
if (((c >= 0x09) && (c <= 0x0d)) ||
@@ -137,7 +128,6 @@ Int32 isSpace8859_1(NAWchar c)
return FALSE;
}
-NA_EIDPROC
Int32 isDigit8859_1(NAWchar c) // ISO 8859-1 char set safe isdigit routine
{
if ((c >= '0') && (c <= '9'))
@@ -145,7 +135,6 @@ Int32 isDigit8859_1(NAWchar c) // ISO 8859-1 char set safe isdigit routine
return FALSE;
}
-NA_EIDPROC
Int32 isCaseInsensitive8859_1(NAWchar c) // ISO 8859-1 char for which there is no
// upcase equivalent. hex values 0xDF & 0xFF
{
@@ -1037,7 +1026,6 @@ char * str_strip_blanks(char *src , Lng32 &len,
return &src[i];
}
-#if !defined(__EID) && !defined(ARKFS_OPEN)
//------------------------------------------------
//See .h file for explanation on parameters etc
//------------------------------------------------
@@ -1164,17 +1152,12 @@ Lng32 str_to_ansi_id(char *src, char *tgt,Lng32 &tgtLen, short mustValidate, cha
tgt = pBuf;
return 0;
}
-#endif
-
-
-
// -----------------------------------------------------------------------
// following two functions are used to return the catalog and schema names
// given a qualified table name. Either the catalog or schema name can be
// a delimited identifier name.
// -----------------------------------------------------------------------
-NA_EIDPROC
Int32 extractDelimitedName (char* tgt, const char* const src, const char sep)
{
Int32 i = 0, j = 0;
@@ -1208,7 +1191,6 @@ Int32 extractDelimitedName (char* tgt, const char* const src, const char sep)
return (i);
}
-NA_EIDPROC
void extractCatSchemaNames (char* catName, char *schName, char* qualTabName)
{
assert(catName && schName && qualTabName);
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/common/str.h
----------------------------------------------------------------------
diff --git a/core/sql/common/str.h b/core/sql/common/str.h
index eb60ae0..ce8db9a 100644
--- a/core/sql/common/str.h
+++ b/core/sql/common/str.h
@@ -74,7 +74,6 @@ Int32 isAlNum8859_1(NAWchar c);
Int32 isSpace8859_1(NAWchar c);
Int32 isHexDigit8859_1(NAWchar c); // 0, 1, .., A, B, C, D, E, F (case insensitive)
-NA_EIDPROC
Int32 isDigit8859_1(NAWchar c);
Int32 isCaseInsensitive8859_1(NAWchar c); // ISO 8859-1 char for which there is no
@@ -87,7 +86,6 @@ Int32 isCaseInsensitive8859_1(NAWchar c); // ISO 8859-1 char for which there is
// return 0 if left == right,
// return 1 if left > right.
// -----------------------------------------------------------------------
-NA_EIDPROC
inline Int32 str_cmp(const char *left, const char *right, Int32 length)
{
Int32 result = memcmp(left, right, length);
@@ -96,7 +94,6 @@ inline Int32 str_cmp(const char *left, const char *right, Int32 length)
else
return ((result > 0)? 1: -1);
}
-NA_EIDPROC
Int32 str_cmp_ne(const char *left, const char *right);
// str_cmp_c() takes two strings as arguments and returns a value less
@@ -105,7 +102,6 @@ Int32 str_cmp_ne(const char *left, const char *right);
// than the second, or zero if the two strings are equal. The
// comparison is done by comparing the coded (ascii) value of the
// chararacters, character by character.
-NA_EIDPROC
Int32 (str_cmp_c)(const char *s1, const char *s2);
// The str_ncmp() function shall compare not more than n bytes
@@ -114,7 +110,6 @@ Int32 (str_cmp_c)(const char *s1, const char *s2);
// non-zero return value is determined by the sign of the difference
// between the values of the first pair of bytes (both interpreted
// as type unsigned char) that differ in the strings being compared.
-NA_EIDPROC
Int32 (str_ncmp)(const char *s1, const char *s2, size_t n);
// The str_str() function shall locate the first occurrence in the
@@ -123,7 +118,6 @@ Int32 (str_ncmp)(const char *s1, const char *s2, size_t n);
// function returns the pointer to the matching string in s1 or a
// null pointer if a match is not found. If s2 is an empty string,
// the function returns s1.
-NA_EIDPROC
char *(str_str)(const char *s1, const char *s2);
// The str_chr() function shall locate the first occurrence of c
@@ -132,7 +126,6 @@ char *(str_str)(const char *s1, const char *s2);
// returns the location of the found character, or a null pointer
// if the character was not found.
// This function is used to find certain characters in strings.
-NA_EIDPROC
char *(str_chr)(const char *s, Int32 c);
// The str_replace() function shall locate all occurrences in the
@@ -143,13 +136,11 @@ char *(str_chr)(const char *s, Int32 c);
// The function returns the pointer to the replaced string s1 or a
// null pointer if a match is not found. If s2 or s3 are empty strings,
// or do not have the same length, the function returns NULL.
-NA_EIDPROC
char *(str_replace)(char *s1, const char *s2, const char *s3);
// -----------------------------------------------------------------------
// fill string <str> for <length> bytes with <padchar>
// -----------------------------------------------------------------------
-NA_EIDPROC
inline
Int32 str_pad(char *str, Int32 length, char padchar = ' ')
{
@@ -182,14 +173,12 @@ Int32 str_pad(char *str, Int32 length, char padchar = ' ')
// work. You may want to use str_cpy_all() instead; that
// routine works more like memcpy() and behaves well.
// -----------------------------------------------------------------------
-NA_EIDPROC
Int32 str_cpy(char *tgt, const char *src, Int32 tgtlen, char padchar = ' ');
// -----------------------------------------------------------------------
// This routine behaves like str_cpy except that the length of
// the target is also supplied.
// -----------------------------------------------------------------------
-NA_EIDPROC
Int32 byte_str_cpy(char *tgt, Int32 tgtlen,
const char *src, Int32 srclen, char padchar);
@@ -199,7 +188,6 @@ Int32 byte_str_cpy(char *tgt, Int32 tgtlen,
// s1. If copying takes place between objects that overlap,
// the behavior is undefined. The function returns s1. No value is
// used to indicate an error.
-NA_EIDPROC
char *(str_cpy_c)(char *s1, const char *s2);
// The str_ncpy() function shall copy not more than n bytes (bytes
@@ -210,13 +198,11 @@ char *(str_cpy_c)(char *s1, const char *s2);
// shall be appended to the copy in the array pointed to by s1, until
// n bytes in all are written. The function shall return s1;
// no return value is reserved to indicate an error.
-NA_EIDPROC
char *(str_ncpy)(char *s1, const char *s2, size_t n);
// -----------------------------------------------------------------------
// concatenate <first> and <second> and store the result in <result>
// -----------------------------------------------------------------------
-NA_EIDPROC
Int32 str_cat(const char *first, const char *second, char *result);
@@ -228,21 +214,17 @@ Int32 str_cat(const char *first, const char *second, char *result);
// This function is used to attach one string to the end of another
// string. It is imperative that the first string (s1) have the space
// needed to store both strings.
-NA_EIDPROC
char *(str_cat_c)(char *s1, const char *s2);
// -----------------------------------------------------------------------
// convert <i> to ASCII and store the result in <outstr>
// -----------------------------------------------------------------------
-NA_EIDPROC
char *str_itoa(ULng32 i, char *outstr);
-NA_EIDPROC
char *str_ltoa(Int64 i, char *outstr);
// -----------------------------------------------------------------------
// convert instr to numeric and return in i. String must be numbers only.
// -----------------------------------------------------------------------
-NA_EIDPROC
Int64 str_atoi(const char * instr, Lng32 instrLen);
// convert a scaled exact numeric string and return as float.
@@ -253,13 +235,11 @@ double str_ftoi(const char * instr, Lng32 instrLen);
// the compiler is fixed to inline routines with calls to assert,
// Remove callAssert() in callers and replace with direct call to
// assert.
-NA_EIDPROC
void callAssert(const char* tgt, const char* src, Lng32 length);
// -----------------------------------------------------------------------
// move <length> bytes from <src> to <tgt>
// -----------------------------------------------------------------------
-NA_EIDPROC
inline void str_cpy_all(char *tgt, const char *src, Lng32 length)
{
if ((!tgt || !src) && length)
@@ -281,7 +261,6 @@ inline void str_cpy_all(char *tgt, const char *src, Lng32 length)
// move <length> bytes from <src> to <tgt>
// handles overlapping memory between target and source
// -----------------------------------------------------------------------
-NA_EIDPROC
void str_memmove(char *tgt, const char *src, Lng32 length);
// -----------------------------------------------------------------------
@@ -292,14 +271,12 @@ void str_memmove(char *tgt, const char *src, Lng32 length);
//
// Compare convertNAString in String.h
// -----------------------------------------------------------------------
-NA_EIDPROC
Int32 str_varchar_alloc_and_copy(char *tgt, const char *src, Lng32 length);
// -----------------------------------------------------------------------
// Copies <src> to <tgt> for <length> bytes.
// Removes trailing <blank_char>s by putting an <end_char> as terminator.
// -----------------------------------------------------------------------
-NA_EIDPROC
Int32 str_cpy_and_null(char * tgt,
const char * src,
Lng32 length,
@@ -312,31 +289,27 @@ Int32 str_cpy_and_null(char * tgt,
// else downshifts.
// Src and Tgt may point to the same location.
// ---------------------------------------------------------------
-NA_EIDPROC
Int32 str_cpy_convert(char * tgt, char * src,
Lng32 length, Int32 upshift);
-NA_EIDPROC
Int32 str_len(const char * s);
// -----------------------------------------------------------------------
// "Increments" a string. If successful, 0 is returned. Otherwise, 1
// is returned.
// -----------------------------------------------------------------------
-NA_EIDPROC
Int32 str_inc(const ULng32 length, char * s);
// -----------------------------------------------------------------------
// Complements a string.
// -----------------------------------------------------------------------
-NA_EIDPROC
void str_complement(const ULng32 length, char * s);
//------------------------------------------------------------------------
// Our own version of sprintf that provides a subset of the functionality
// of sprintf as we cannot call C runtime from the SQL executor.
//------------------------------------------------------------------------
-NA_EIDPROC
+
Int32 str_sprintf(char *, const char *, ...);
// -----------------------------------------------------------------------
@@ -349,13 +322,9 @@ Int32 str_sprintf(char *, const char *, ...);
// bytes decoded
// -----------------------------------------------------------------------
-NA_EIDPROC
Lng32 str_encoded_len(Lng32 byteLen);
-NA_EIDPROC
Lng32 str_encode(char *tgt, Lng32 tgtMaxLen, void *src, Lng32 srcLen);
-NA_EIDPROC
Lng32 str_decoded_len(Lng32 srcLen);
-NA_EIDPROC
Lng32 str_decode(void *tgt, Lng32 tgtMaxLen, const char *src, Lng32 srcLen);
//------------------------------------------------------------------------
@@ -378,14 +347,13 @@ char * str_strip_blanks(char *src , Lng32 &len,
// characters to be allowed as part of the Id, then a null termintated string
// of these chars needs to be passed in eg : "$#"
//------------------------------------------------------------------------
-NA_EIDPROC Lng32 str_to_ansi_id(char *src, char *tgt,Lng32 &tgtLen,short mustValidate = 1, char *allowedChar = 0);
+Lng32 str_to_ansi_id(char *src, char *tgt,Lng32 &tgtLen,short mustValidate = 1, char *allowedChar = 0);
//int strSprintf(char * buffer, char * format, ...);
// -----------------------------------------------------------------------
// following function is used to extract a name that may be delimited
// from a given string. The name may end with a separator or end of line.
// -----------------------------------------------------------------------
-NA_EIDPROC
Int32 extractDelimitedName (char* tgt, const char* const src, const char sep = '.');
// -----------------------------------------------------------------------
@@ -393,10 +361,9 @@ Int32 extractDelimitedName (char* tgt, const char* const src, const char sep =
// given a qualified table name. Either the catalog or schema name can be
// a delimited identifier name.
// -----------------------------------------------------------------------
-NA_EIDPROC
+
void extractCatSchemaNames (char* catName, char *schName, char* qualTabName);
-NA_EIDPROC
//inline
Int32 mem_cpy_all(void *tgt, const void *src, Lng32 length);
//{
@@ -410,7 +377,6 @@ Int32 mem_cpy_all(void *tgt, const void *src, Lng32 length);
//}
-NA_EIDPROC
// Similar to strtok, but for the following
// Only one character can be delimiter
// Third parameter char **internal should not be manipulated by the caller
@@ -422,11 +388,8 @@ char *str_tok(char *inStr, char c, char **internal);
// String compression and decompression functions using RLE method
// See str.cpp for details
//------------------------------------------------------------------------
-NA_EIDPROC
size_t str_compress_size(const char *src, const size_t len);
-NA_EIDPROC
size_t str_compress(char *tgt, const char *src, const size_t len);
-NA_EIDPROC
size_t str_decompress(char *tgt, const char *src, const size_t srcLen);
// -----------------------------------------------------------------------
@@ -437,7 +400,6 @@ size_t str_decompress(char *tgt, const char *src, const size_t srcLen);
// The computed length includes neither the NULL terminator character
// nor the 0x (or 0X) prefix.
// -----------------------------------------------------------------------
-NA_EIDPROC
size_t str_computeHexAsciiLen(size_t srcByteLen);
// -----------------------------------------------------------------------
@@ -446,7 +408,6 @@ size_t str_computeHexAsciiLen(size_t srcByteLen);
// The output string does not include the 0x prefix. By default a
// NULL character - i.e. '\0' - is appended to the output string.
// -----------------------------------------------------------------------
-NA_EIDPROC
Int32 str_convertToHexAscii(const char * src, // in
const size_t srcLength, // in
char * result, // out
@@ -465,6 +426,5 @@ Int32 str_convertToHexAscii(const char * src, // in
//
// printBrief(dataPointer, len, FALSE) if you don't
//
-NA_EIDPROC
void printBrief(char* dataPointer, Lng32 keyLen, NABoolean endLine = TRUE);
#endif // STR_H
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/common/stringBuf.h
----------------------------------------------------------------------
diff --git a/core/sql/common/stringBuf.h b/core/sql/common/stringBuf.h
index fdcb0fb..b03f8b1 100644
--- a/core/sql/common/stringBuf.h
+++ b/core/sql/common/stringBuf.h
@@ -48,24 +48,24 @@
#include "NAWinNT.h"
#endif
-#ifdef NA_DEBUG_C_RUNTIME
+#ifdef _DEBUG
#include <iostream>
-#endif // NA_DEBUG_C_RUNTIME
+#endif // _DEBUG
template <class T> class stringBuf
{
public:
-NA_EIDPROC stringBuf(T* buf, Int32 len, CollHeap* heap = 0) :
+stringBuf(T* buf, Int32 len, CollHeap* heap = 0) :
buf_(buf), bufSize_(len), count_(len), alloc_(FALSE), heap_(heap) {};
-NA_EIDPROC stringBuf(T* buf, Int32 iBufSize, Int32 iStrLen, CollHeap* heap = 0) :
+stringBuf(T* buf, Int32 iBufSize, Int32 iStrLen, CollHeap* heap = 0) :
buf_(buf), bufSize_(iBufSize),
count_(iStrLen <= iBufSize? iStrLen : iBufSize),
alloc_(FALSE), heap_(heap) {};
-NA_EIDPROC stringBuf(Int32 len, CollHeap* heap = 0) :
+ stringBuf(Int32 len, CollHeap* heap = 0) :
bufSize_(len),
count_(len), // should be set to 0, but keep the existing behavior for now
alloc_(FALSE), heap_(heap)
@@ -84,7 +84,6 @@ NA_EIDPROC stringBuf(Int32 len, CollHeap* heap = 0) :
}
};
-NA_EIDPROC
~stringBuf()
{
if ( alloc_ ) {
@@ -95,34 +94,24 @@ NA_EIDPROC
}
};
-NA_EIDPROC
inline Int32 getBufSize() const { return bufSize_; }
-NA_EIDPROC
inline Int32 getStrLen() const { return count_; } // same as length()
-NA_EIDPROC
inline Int32 length() const { return count_; }
-NA_EIDPROC
inline void setStrLen(Int32 x) { count_ = (x <= bufSize_) ? x : bufSize_; } // avoid buffer overrun
-NA_EIDPROC
inline void setLength(Int32 x) { count_ = x; }
-NA_EIDPROC
inline T* data() const { return buf_; }
-NA_EIDPROC
T operator() (Int32 i) const { return buf_[i]; };
-NA_EIDPROC
T last() const { return buf_[getStrLen()-1]; };
-NA_EIDPROC
void decrementAndNullTerminate() { /* if (count > 0) */ buf_[--count_]=0; }
-NA_EIDPROC
void zeroOutBuf(Int32 startPos = 0)
{
if (startPos >= 0 && buf_ && bufSize_ > 0 && bufSize_ - startPos > 0)
@@ -132,8 +121,7 @@ NA_EIDPROC
}
};
-#ifdef NA_DEBUG_C_RUNTIME
-NA_EIDPROC
+#ifdef _DEBUG
ostream& print(ostream& out) {
Int32 i=0;
@@ -147,7 +135,7 @@ NA_EIDPROC
out << endl;
return out;
};
-#endif // NA_DEBUG_C_RUNTIME
+#endif // _DEBUG
private:
T* buf_;
@@ -172,17 +160,14 @@ typedef stringBuf<unsigned char> charBuf;
// is returned; otherwise, NULL is returned.
// case 2: target buffer pointer 'target' is NULL
// a buffer of SIZE is allocated from the heap (if the heap argument
-// is not NULL), or from the C runtime system heap if NA_NO_C_RUNTIME is
-// not defined. Otherwise, a NULL is returned.
+// is not NULL), or from the C runtime system heap.
// For either case, SIZE is defined as olen + (addNullAtEnd) ? 1 : 0.
//
// If addNullAtEnd is TRUE, a NULL will be inserted at the beginning of 'target'
// if it is not NULL.
//
-NA_EIDPROC
NAWcharBuf* checkSpace(CollHeap* heap, Int32 olen, NAWcharBuf*& target, NABoolean addNullAtEnd);
-NA_EIDPROC
charBuf* checkSpace(CollHeap* heap, Int32 olen, charBuf*& target, NABoolean addNullAtEnd);
#endif
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/common/swscanf.cpp
----------------------------------------------------------------------
diff --git a/core/sql/common/swscanf.cpp b/core/sql/common/swscanf.cpp
index 33ffb37..241fc64 100644
--- a/core/sql/common/swscanf.cpp
+++ b/core/sql/common/swscanf.cpp
@@ -114,7 +114,6 @@ typedef quad_t (*ccfnT)(const NAWchar*);
#include <string.h>
-NA_EIDPROC
Int32
__srefill(SCANBUF* fp)
@@ -122,7 +121,6 @@ __srefill(SCANBUF* fp)
return 1;
}
-NA_EIDPROC
void ungetc(NAWchar c, SCANBUF* fp)
{
fp->_p--;
@@ -135,7 +133,6 @@ void ungetc(NAWchar c, SCANBUF* fp)
* closing `]'. The table has a 1 wherever characters should be
* considered part of the scanset.
*/
-NA_EIDPROC
static NAWchar *
__sccl(NAWchar* tab, NAWchar* fmt)
{
@@ -236,7 +233,6 @@ doswitch:
/*
* vfscanf
*/
-NA_EIDPROC
Int32
__svfscanf(SCANBUF* fp, NAWchar const* fmt0, va_list ap)
{
@@ -844,7 +840,6 @@ match_failure:
return (nassigned);
}
-NA_EIDPROC
Int32 na_swscanf(const NAWchar *str, NAWchar const *fmt, ...)
{
Int32 ret;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/common/swsprintf.cpp
----------------------------------------------------------------------
diff --git a/core/sql/common/swsprintf.cpp b/core/sql/common/swsprintf.cpp
index 84fc586..fbcc1e8 100644
--- a/core/sql/common/swsprintf.cpp
+++ b/core/sql/common/swsprintf.cpp
@@ -79,7 +79,6 @@
//#define FLOATING_POINT 1
-NA_EIDPROC
Int32
vfprintf(SPRINTF_BUF* fp, const NAWchar* fmt0, va_list ap);
@@ -152,7 +151,6 @@ static Int32 exponent __P((char *, Int32, Int32));
#define SHORTINT 0x040 /* short integer */
#define ZEROPAD 0x080 /* zero (as opposed to blank) pad */
#define FPT 0x100 /* Floating point number */
-NA_EIDPROC
Int32
vfprintf(SPRINTF_BUF* fp, const NAWchar* fmt0, va_list ap)
{
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/common/unicode_char_set.cpp
----------------------------------------------------------------------
diff --git a/core/sql/common/unicode_char_set.cpp b/core/sql/common/unicode_char_set.cpp
index 9f1eee4..e469da8 100644
--- a/core/sql/common/unicode_char_set.cpp
+++ b/core/sql/common/unicode_char_set.cpp
@@ -43,9 +43,7 @@
#include "unicode_char_set.h"
#include "BaseTypes.h"
-#if !defined(_EID) && !defined(CLI_PRIV_SRL)
#include "nawstring.h"
-#endif
// 4/10/98 Unicode char/string manipulations
@@ -80,7 +78,6 @@ static const unicode_mapping_t unicode_upper2lower_mapping_table[] =
};
-NA_EIDPROC
NAWchar
binary_search(NAWchar wc, Int32 lower, Int32 upper,
unicode_mapping_t table[])
@@ -99,7 +96,6 @@ binary_search(NAWchar wc, Int32 lower, Int32 upper,
}
// search the lower to upper full mapping table
-NA_EIDPROC
NAWchar*
binary_search(NAWchar wc, Int32 lower, Int32 upper,
unicode_mapping_full_t table[])
@@ -154,7 +150,6 @@ NAWchar* unicode_char_set::to_upper_full(const NAWchar x)
// by ConstValue::toUpper() while applying upper method on constants.
// The 'len' number of chars in 'str' are upshifted and the result
// is kept in 'upStr'.
-#if !defined(__EID) && !defined(CLI_PRIV_SRL)
void
unicode_char_set::to_upper(NAWchar *str, size_t len, NAWString &upStr)
{
@@ -179,7 +174,6 @@ unicode_char_set::to_upper(NAWchar *str, size_t len, NAWString &upStr)
}
}
}
-#endif
/*
long unicode_char_set::to_upper(NAWchar *str, long srcLen,
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/common/unicode_char_set.h
----------------------------------------------------------------------
diff --git a/core/sql/common/unicode_char_set.h b/core/sql/common/unicode_char_set.h
index 2b54a71..8e98292 100644
--- a/core/sql/common/unicode_char_set.h
+++ b/core/sql/common/unicode_char_set.h
@@ -65,50 +65,32 @@ public:
enum CHAR_CODE_POINTS {SPACE=0x0020, PERCENT=0x0025, UNDERSCORE=0x005F};
-NA_EIDPROC
unicode_char_set() {};
-#ifndef PRIV_SRL
-NA_EIDPROC
virtual ~unicode_char_set() {};
-#else
-NA_EIDPROC ~unicode_char_set() {};
-#endif // PRIV_SRL
-NA_EIDPROC
static NAWchar to_upper(const NAWchar);
-#if !defined(__EID) && !defined(CLI_PRIV_SRL)
-NA_EIDPROC
static void to_upper(NAWchar *, size_t, NAWString &);
-#endif
static Lng32 to_upper(NAWchar *, Lng32 , NAWchar *, Lng32);
// For full case mapping, an lower case character may map to
// more than one upper case character
-NA_EIDPROC
static NAWchar* to_upper_full(const NAWchar);
-NA_EIDPROC
static NAWchar to_lower(const NAWchar);
-NA_EIDPROC
static NAWchar space_char() { return unicode_char_set::SPACE; };
-NA_EIDPROC
static NAWchar null_char() {return 0;};
-NA_EIDPROC
static NAWchar underscore_char() { return unicode_char_set::UNDERSCORE; };
-NA_EIDPROC
static NAWchar percent_char() { return unicode_char_set::PERCENT; };
-NA_EIDPROC
static NAWchar maxCharValue() { return USHRT_MAX; };
-NA_EIDPROC
static short bytesPerChar() { return sizeof(NAWchar); };
static NABoolean isValidUCS2CodePoint(NAWchar wc)
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/common/wc_scanf_sprintf.h
----------------------------------------------------------------------
diff --git a/core/sql/common/wc_scanf_sprintf.h b/core/sql/common/wc_scanf_sprintf.h
index d4c7a44..998c52b 100644
--- a/core/sql/common/wc_scanf_sprintf.h
+++ b/core/sql/common/wc_scanf_sprintf.h
@@ -24,24 +24,6 @@
#ifndef WIDECHAR_H
#define WIDECHAR_H 1
-/* uncomment out for debug
-#if !defined(NA_NSK) // for debug on NT only
-#include <wchar.h>
-#else
-#include "NAWinnt.h"
-#endif
-
-#ifdef NAWchar
-#undef NAWchar
-#endif
-
-#if !defined(NA_NSK) // for debug on NT only
-#define NAWchar NAWchar
-#else
-#define NAWchar NAWchar
-#endif
-*/
-
#include "NAWinNT.h"
struct _scanfbuf {
@@ -68,7 +50,7 @@ typedef struct _sprintf_buf SPRINTF_BUF;
Int32
na_wsprintf(NAWchar *str, NAWchar const *fmt, ...);
-#if (defined(NA_C89) || defined(NA_WINNT) || defined(NA_HSC_WINDOWS))
+#if (defined(NA_C89) || defined(NA_WINNT))
typedef UInt64 u_quad_t;
typedef Int64 quad_t;
#endif
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/common/wstr.h
----------------------------------------------------------------------
diff --git a/core/sql/common/wstr.h b/core/sql/common/wstr.h
index a7f9d81..ca819eb 100644
--- a/core/sql/common/wstr.h
+++ b/core/sql/common/wstr.h
@@ -62,7 +62,6 @@ Int32 compareWcharWithBlankPadding(const NAWchar *wstr1, UInt32 len1,
// return 0 if left == right,
// return a positive value if left > right.
// -----------------------------------------------------------------------
-NA_EIDPROC
inline
Int32 wc_str_cmp(const NAWchar *left, const NAWchar *right, Int32 length)
{
@@ -76,7 +75,7 @@ Int32 wc_str_cmp(const NAWchar *left, const NAWchar *right, Int32 length)
// -----------------------------------------------------------------------
// fill string <str> for <length> bytes with <padchar>
// -----------------------------------------------------------------------
-NA_EIDPROC
+
inline
void wc_str_pad(NAWchar *str, Int32 length,
NAWchar padchar = unicode_char_set::SPACE)
@@ -85,7 +84,6 @@ void wc_str_pad(NAWchar *str, Int32 length,
}
// Swap bytes for each NAWchar in the string.
-NA_EIDPROC
inline
void wc_swap_bytes(NAWchar *str, Int32 length)
{
@@ -103,7 +101,6 @@ void wc_swap_bytes(NAWchar *str, Int32 length)
}
}
-NA_EIDPROC
Int32 na_wstr_cpy_convert(NAWchar *tgt, NAWchar *src, Lng32 length, Int32 upshift);
#endif
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/ExBitMapTable.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExBitMapTable.cpp b/core/sql/executor/ExBitMapTable.cpp
index ea0f0ff..375007f 100644
--- a/core/sql/executor/ExBitMapTable.cpp
+++ b/core/sql/executor/ExBitMapTable.cpp
@@ -107,12 +107,6 @@ ExBitMapTable::ExBitMapTable(Int32 keySize, Int32 dataSize, Int32 countOffset,
//
numberHashBuckets_ = ROUND2(memSize_ / (sizeof(char*) + rowSize_));
-//#ifdef _DEBUG
-//#ifndef _EID
- // if(getenv("EX_BITMAP_BUCKETS"))
- // numberHashBuckets_ = atoi(getenv("EX_BITMAP_BUCKETS"));
-//#endif
-//#endif
// Compute the maximum number of groups that can be stored in the table.
//
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/ExBitMapTable.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExBitMapTable.h b/core/sql/executor/ExBitMapTable.h
index 92f4403..670b903 100644
--- a/core/sql/executor/ExBitMapTable.h
+++ b/core/sql/executor/ExBitMapTable.h
@@ -56,66 +56,54 @@ class ExBitMapTable : public ExGod {
public:
// constructor
//
-NA_EIDPROC
ExBitMapTable(Int32 keySize, Int32 dataSize, Int32 countOffset,
Int32 memSize, NAMemory *heap);
// destructor
//
-NA_EIDPROC
~ExBitMapTable();
// Returns the maximum number of groups that can fit in the table. This
// reflects the best case scenario.
//
-NA_EIDPROC
Int32 getMaximumNumberGroups() const { return maximumNumberGroups_; };
// Returns the minimum number of groups that can fit in the table. This
// reflects the worst case scenario.
//
-NA_EIDPROC
Int32 getMinimumNumberGroups() const { return maximumNumberGroups_; };
// Returns a pointer to the current group's data.
//
-NA_EIDPROC
char *getData() const { return data_; };
// Returns a pointer to the Nth group's data.
//
-NA_EIDPROC
char *getGroup(Int32 n) { return groups_ + n * rowSize_; }
// Returns a pointer to the group's key.
//
-NA_EIDPROC
char *getKey(char *group) { return group + dataSize_; }
// Returns a pointer to the group's next group pointer.
//
-NA_EIDPROC
char**getNextPtr(char *group)
{ return (char**)(group + dataSize_ + ROUND4(keySize_) ); }
// Return the number of groups in the table.
//
-NA_EIDPROC
Int32 getNumberGroups() const { return numberGroups_; };
// Advances the current return group.
//
-NA_EIDPROC
void advanceReturnGroup() { returnGroup_++; };
// Resets the current return group.
//
-NA_EIDPROC
void resetReturnGroup() { returnGroup_ = 0; };
// Gets the current returng group.
//
-NA_EIDPROC
char *getReturnGroup() {
if(returnGroup_ < numberGroups_) return getGroup(returnGroup_);
return NULL;
@@ -123,22 +111,18 @@ NA_EIDPROC
// Find or adds the group pointed to be key to the table.
//
-NA_EIDPROC
Int32 findOrAdd(char *key);
// Initialize any table aggregates.
//
-NA_EIDPROC
inline void initAggregates() { *(Int64*)(data_ + countOffset_) = 0; };
// Increment any table aggregates.
//
-NA_EIDPROC
inline void applyAggregates() { (*(Int64*)(data_ + countOffset_))++; };
// Reset the table.
//
-NA_EIDPROC
void reset();
private:
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/ExCancel.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExCancel.h b/core/sql/executor/ExCancel.h
index 9eb2b1c..1382364 100644
--- a/core/sql/executor/ExCancel.h
+++ b/core/sql/executor/ExCancel.h
@@ -57,16 +57,16 @@ public:
// retrieval of the virtual table function pointer of the class while
// unpacking. An empty constructor is enough.
// ---------------------------------------------------------------------
- NA_EIDPROC ExCancelTdb()
+ ExCancelTdb()
{}
- NA_EIDPROC virtual ~ExCancelTdb()
+ virtual ~ExCancelTdb()
{}
// ---------------------------------------------------------------------
// Build a TCB for this TDB. Redefined in the Executor project.
// ---------------------------------------------------------------------
- NA_EIDPROC virtual ex_tcb *build(ex_globals *globals);
+ virtual ex_tcb *build(ex_globals *globals);
private:
// ---------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/ExComTdb.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExComTdb.cpp b/core/sql/executor/ExComTdb.cpp
index a68f80f..cd54970 100644
--- a/core/sql/executor/ExComTdb.cpp
+++ b/core/sql/executor/ExComTdb.cpp
@@ -53,9 +53,6 @@
#include "ex_onlj.h"
#include "ex_tuple_flow.h"
#include "ExFastTransport.h"
-
-
-#ifndef __EID
#include "ex_root.h"
#include "ex_mj.h"
#include "ex_hashj.h"
@@ -81,9 +78,6 @@
#include "ExHdfsScan.h"
#include "ExHbaseAccess.h"
-
-#endif
-
// -----------------------------------------------------------------------
// When called within tdm_sqlcli.dll, fixupVTblPtr() translates to a call
// to fix up the TDB's to the Executor version. This function is also
@@ -124,7 +118,7 @@ void ComTdb::fixupVTblPtrExe()
// implemented in the comexe project (in ComTdb.cpp) which returns the
// pointer for an "compiler TDB".
// -----------------------------------------------------------------------
-NA_EIDPROC char *ComTdb::findVTblPtrExe(short classID)
+char *ComTdb::findVTblPtrExe(short classID)
{
char *vtblptr = NULL;
switch (classID)
@@ -212,8 +206,6 @@ NA_EIDPROC char *ComTdb::findVTblPtrExe(short classID)
break;
}
-// LCOV_EXCL_START
-
case ex_NON_LEAF_TUPLE:
{
#pragma nowarn(1506) // warning elimination
@@ -222,10 +214,6 @@ NA_EIDPROC char *ComTdb::findVTblPtrExe(short classID)
break;
}
-#ifndef __EID
-
-// LCOV_EXCL_STOP
-
case ex_CONTROL_QUERY:
{
#pragma nowarn(1506) // warning elimination
@@ -241,7 +229,6 @@ NA_EIDPROC char *ComTdb::findVTblPtrExe(short classID)
#pragma warn(1506) // warning elimination
break;
}
-#endif
case ex_ONLJ:
{
@@ -282,7 +269,6 @@ NA_EIDPROC char *ComTdb::findVTblPtrExe(short classID)
break;
}
-#ifndef __EID
case ex_UDR:
{
#pragma nowarn(1506) // warning elimination
@@ -361,7 +347,6 @@ NA_EIDPROC char *ComTdb::findVTblPtrExe(short classID)
#pragma warn(1506) // warning elimination
break;
}
-#endif
case ex_TUPLE_FLOW:
{
@@ -371,7 +356,6 @@ NA_EIDPROC char *ComTdb::findVTblPtrExe(short classID)
break;
}
-#ifndef __EID
case ex_SET_TIMEOUT:
{
#pragma nowarn(1506) // warning elimination
@@ -733,7 +717,6 @@ case ex_LOB_INFO:
break;
}
-#endif
default:
ex_assert(0, "findVTblPtrExe(): Cannot find entry of this ClassId"); // LCOV_EXCL_LINE
break;
@@ -741,7 +724,6 @@ case ex_LOB_INFO:
return vtblptr;
}
-NA_EIDPROC
void fixupExeVtblPtr(ComTdb * tdb)
{
for (Int32 i = 0; i < tdb->numChildren(); i++)
@@ -755,7 +737,6 @@ void fixupExeVtblPtr(ComTdb * tdb)
}
-NA_EIDPROC
void fixupComVtblPtr(ComTdb * tdb)
{
for (Int32 i = 0; i < tdb->numChildren(); i++)
@@ -769,7 +750,6 @@ void fixupComVtblPtr(ComTdb * tdb)
}
-NA_EIDPROC
void resetBufSize(ex_tcb * tcb, Lng32 &tcbSpaceNeeded, Lng32 &poolSpaceNeeded)
{
for (Int32 i = 0; i < tcb->numChildren(); i++)
@@ -805,7 +785,6 @@ void resetBufSize(ex_tcb * tcb, Lng32 &tcbSpaceNeeded, Lng32 &poolSpaceNeeded)
}
#pragma nowarn(262) // warning elimination
-NA_EIDPROC
Lng32 getTotalTcbSpace(char*inTdb, char * otherInfo, char * parentMemory)
{
ComTdb * tdb = (ComTdb*)inTdb;
@@ -820,7 +799,6 @@ Lng32 getTotalTcbSpace(char*inTdb, char * otherInfo, char * parentMemory)
NAHeap heap("temp heap", (NAHeap*)parentMemory, 32000 /*blocksize*/);
ex_globals * g = NULL;
-#ifndef __EID
switch (tdb->getNodeType())
{
// LCOV_EXCL_START
@@ -843,8 +821,6 @@ Lng32 getTotalTcbSpace(char*inTdb, char * otherInfo, char * parentMemory)
break;
}
-#else
-#endif
g->setComputeSpace(TRUE);
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/ExCompoundStmt.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExCompoundStmt.h b/core/sql/executor/ExCompoundStmt.h
index fed1674..641eacc 100644
--- a/core/sql/executor/ExCompoundStmt.h
+++ b/core/sql/executor/ExCompoundStmt.h
@@ -164,16 +164,16 @@ public:
// retrieval of the virtual table function pointer of the class while
// unpacking. An empty constructor is enough.
// ---------------------------------------------------------------------
- NA_EIDPROC ExCatpoundStmtTdb()
+ ExCatpoundStmtTdb()
{}
- NA_EIDPROC virtual ~ExCatpoundStmtTdb()
+ virtual ~ExCatpoundStmtTdb()
{}
// ---------------------------------------------------------------------
// Build a TCB for this TDB. Redefined in the Executor project.
// ---------------------------------------------------------------------
- NA_EIDPROC virtual ex_tcb *build(ex_globals *globals);
+ virtual ex_tcb *build(ex_globals *globals);
private:
// ---------------------------------------------------------------------
@@ -214,86 +214,60 @@ class ExCatpoundStmtTcb : public ex_tcb
public:
// Standard TCB methods.
-NA_EIDPROC
ExCatpoundStmtTcb(const ExCatpoundStmtTdb &tdb,
const ex_tcb &left,
const ex_tcb &right,
ex_globals *glob);
-NA_EIDPROC
~ExCatpoundStmtTcb();
-NA_EIDPROC
void freeResources() {}
-NA_EIDPROC
void registerSubtasks();
-NA_EIDPROC
virtual const ex_tcb* getChild(Int32 pos) const;
-NA_EIDPROC
virtual Int32 numChildren() const { return 2; }
-NA_EIDPROC
ExWorkProcRetcode work();
private:
// CS TCB specific methods.
-NA_EIDPROC
ex_queue_pair getParentQueue() const { return qparent_; }
-NA_EIDPROC
ExWorkProcRetcode workDownLeft();
-NA_EIDPROC
ExWorkProcRetcode workLeft2Right();
-NA_EIDPROC
ExWorkProcRetcode workUp();
-NA_EIDPROC
ExWorkProcRetcode workCancel();
-NA_EIDPROC
static ExWorkProcRetcode sWorkDownLeft(ex_tcb *tcb)
{ return ((ExCatpoundStmtTcb *) tcb)->workDownLeft(); }
-NA_EIDPROC
static ExWorkProcRetcode sWorkLeft2Right(ex_tcb *tcb)
{ return ((ExCatpoundStmtTcb *) tcb)->workLeft2Right(); }
-NA_EIDPROC
static ExWorkProcRetcode sWorkUp(ex_tcb *tcb)
{ return ((ExCatpoundStmtTcb *) tcb)->workUp(); }
-NA_EIDPROC
+
static ExWorkProcRetcode sWorkCancel(ex_tcb *tcb)
{ return ((ExCatpoundStmtTcb *) tcb)->workCancel(); }
-NA_EIDPROC
void startLeftChild();
-NA_EIDPROC
void flowLeft2Right(ex_queue_entry *lentry);
-NA_EIDPROC
void flowParent2Right(queue_index pindex);
-NA_EIDPROC
void passChildReplyUp(ex_queue_entry *centry);
-NA_EIDPROC
void processError(atp_struct *atp, ComDiagsArea *da);
-NA_EIDPROC
void processCardinalityError(ex_queue_entry *centry);
-NA_EIDPROC
void processEODErrorOrWarning(NABoolean isWarning);
-NA_EIDPROC
inline ExCatpoundStmtTdb & csTdb() const
{ return (ExCatpoundStmtTdb &) tdb; }
-NA_EIDPROC
inline NABoolean expectingRightRows() const
{ return csTdb().expectingRightRows(); }
-NA_EIDPROC
inline NABoolean expectingLeftRows() const
{ return csTdb().expectingLeftRows(); }
-NA_EIDPROC
inline NABoolean afterUpdate() const
{ return csTdb().afterUpdate(); }
@@ -329,18 +303,14 @@ class ExCatpoundStmtPrivateState : public ex_tcb_private_state
public:
// Standard private state methods.
-NA_EIDPROC
ExCatpoundStmtPrivateState(const ExCatpoundStmtTcb *tcb)
{ init(); }
-NA_EIDPROC
~ExCatpoundStmtPrivateState(){}
-NA_EIDPROC
ex_tcb_private_state * allocate_new(const ex_tcb *tcb);
private:
-NA_EIDPROC
void init();
private:
[22/30] incubator-trafodion git commit: TRAFODION-2731 CodeCleanup:
Remove obsolete, legacy and unused code
Posted by an...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/comexe/ComTdb.h
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComTdb.h b/core/sql/comexe/ComTdb.h
index 0cdb244..4a7b754 100644
--- a/core/sql/comexe/ComTdb.h
+++ b/core/sql/comexe/ComTdb.h
@@ -36,7 +36,6 @@
#ifndef COMTDB_H
#define COMTDB_H
-#include "Platform.h" // for NA_EIDPROC
#include "Int64.h" // for Int64
#include "NAVersionedObject.h" // for NAVersionedObject
#include "BaseTypes.h" // for Cardinality
@@ -142,18 +141,8 @@ public:
ex_cri_desc *criUp,
queue_index sizeDown,
queue_index sizeUp,
-#ifdef NA_64BIT
- // dg64 - match signature
Int32 numBuffers,
-#else
- Lng32 numBuffers,
-#endif
-#ifdef NA_64BIT
- // dg64 - match signature
UInt32 bufferSize,
-#else
- ULng32 bufferSize,
-#endif
Int32 firstNRows
)
: estimatedRowCount_(estimatedRowCount),
@@ -168,18 +157,8 @@ public:
ExCriDescPtr &criUp,
queue_index &sizeDown,
queue_index &sizeUp,
-#ifdef NA_64BIT
- // dg64 - match signature
Int32 &numBuffers,
-#else
- Lng32 &numBuffers,
-#endif
-#ifdef NA_64BIT
- // dg64 - match signature
UInt32 &bufferSize,
-#else
- ULng32 &bufferSize,
-#endif
Int32 &firstNRows);
private:
@@ -188,18 +167,8 @@ private:
ex_cri_desc *criUp_;
queue_index sizeDown_;
queue_index sizeUp_;
-#ifdef NA_64BIT
- // dg64 - match signature
Int32 numBuffers_;
-#else
- Lng32 numBuffers_;
-#endif
-#ifdef NA_64BIT
- // dg64 - match signature
UInt32 bufferSize_;
-#else
- ULng32 bufferSize_;
-#endif
Int32 firstNRows_;
char filler_[40];
@@ -331,25 +300,15 @@ public:
// If params is not NULL, then initialize variable from ComTdbParams
// object passed in.
// ---------------------------------------------------------------------
- NA_EIDPROC ComTdb(ex_node_type type,
+ ComTdb(ex_node_type type,
const char *eye,
Cardinality estRowsUsed = 0.0,
ex_cri_desc *criDown = NULL,
ex_cri_desc *criUp = NULL,
queue_index sizeDown = 0,
queue_index sizeUp = 0,
-#ifdef NA_64BIT
- // dg64 - match signature
Int32 numBuffers = 0,
-#else
- Lng32 numBuffers = 0,
-#endif
-#ifdef NA_64BIT
- // dg64 - match signature
UInt32 bufferSize = 0,
-#else
- ULng32 bufferSize = 0,
-#endif
Lng32 uniqueId = 0,
ULng32 initialQueueSizeDown = 4,
ULng32 initialQueueSizeUp = 4,
@@ -360,17 +319,17 @@ public:
// ---------------------------------------------------------------------
// Dummy constructor used in findVTblPtr()
// ---------------------------------------------------------------------
- NA_EIDPROC ComTdb();
+ ComTdb();
- NA_EIDPROC virtual ~ComTdb();
+ virtual ~ComTdb();
// ---------------------------------------------------------------------
// Pack a TDB before storing it on disk or transporting it to another
// process. Unpack a TDB after it's retrieved from disk or receive from
// another process.
// ---------------------------------------------------------------------
- NA_EIDPROC virtual Long pack(void *space);
- NA_EIDPROC virtual Lng32 unpack(void *base, void * reallocator);
+ virtual Long pack(void *space);
+ virtual Lng32 unpack(void *base, void * reallocator);
// ---------------------------------------------------------------------
// Fix up the virtual function table pointer of a TDB retrieved from
@@ -379,18 +338,18 @@ public:
// fixes up the result to an Executor version of TDB which redefines
// project.
// ---------------------------------------------------------------------
- NA_EIDPROC void fixupVTblPtr();
- NA_EIDPROC void fixupVTblPtrCom();
- NA_EIDPROC void fixupVTblPtrExe();
+ void fixupVTblPtr();
+ void fixupVTblPtrCom();
+ void fixupVTblPtrExe();
// ---------------------------------------------------------------------
// Redefinition of methods inherited from NAVersionedObject.
// ---------------------------------------------------------------------
- NA_EIDPROC virtual char *findVTblPtr(short classID);
- NA_EIDPROC virtual unsigned char getClassVersionID() { return 1; }
- NA_EIDPROC virtual void populateImageVersionIDArray()
+ virtual char *findVTblPtr(short classID);
+ virtual unsigned char getClassVersionID() { return 1; }
+ virtual void populateImageVersionIDArray()
{ setImageVersionID(0,getClassVersionID()); }
- NA_EIDPROC virtual short getClassSize()
+ virtual short getClassSize()
{ return (short)sizeof(ComTdb); }
// ---------------------------------------------------------------------
@@ -401,70 +360,70 @@ public:
// which has the build() method defined, while the latter returns the
// one of a "compiler" TDB with no build() method.
// ---------------------------------------------------------------------
- NA_EIDPROC char *findVTblPtrExe(short classID);
- NA_EIDPROC char *findVTblPtrCom(short classID);
+ char *findVTblPtrExe(short classID);
+ char *findVTblPtrCom(short classID);
// ---------------------------------------------------------------------
// Whether the TDB supports out-of-order replies to its requests.
// ---------------------------------------------------------------------
// LCOV_EXCL_START
- NA_EIDPROC virtual Int32 orderedQueueProtocol() const { return 1; }
+ virtual Int32 orderedQueueProtocol() const { return 1; }
// LCOV_EXCL_STOP
// ---------------------------------------------------------------------
// Used by the internal SHOWPLAN command to get attributes of a TDB.
// ---------------------------------------------------------------------
- NA_EIDPROC virtual void displayContents(Space *space,ULng32 flag);
- NA_EIDPROC virtual void displayExpression(Space *space,ULng32 flag);
- NA_EIDPROC virtual void displayChildren(Space *space,ULng32 flag);
+ virtual void displayContents(Space *space,ULng32 flag);
+ virtual void displayExpression(Space *space,ULng32 flag);
+ virtual void displayChildren(Space *space,ULng32 flag);
// ---------------------------------------------------------------------
// Accessors/Mutators.
// ---------------------------------------------------------------------
- NA_EIDPROC inline ex_node_type getNodeType() const
+ inline ex_node_type getNodeType() const
{ return (ComTdb::ex_node_type)getClassID(); }
- NA_EIDPROC inline void setNodeType(ex_node_type t) { setClassID(t); }
+ inline void setNodeType(ex_node_type t) { setClassID(t); }
inline void setEyeCatcher(const char * eye) { str_cpy_all((char*)&eyeCatcher_, eye, 4); }
- NA_EIDPROC inline ComTdb *getParentTdb() { return parentTdb_; }
- NA_EIDPROC inline void setParentTdb(ComTdb *tdb) { parentTdb_ = tdb; }
- NA_EIDPROC inline void setTdbId(Lng32 uniqueId) { tdbId_ = uniqueId; }
- NA_EIDPROC inline Lng32 getTdbId() const { return tdbId_; }
- NA_EIDPROC inline Cardinality getEstRowsAccessed() const
+ inline ComTdb *getParentTdb() { return parentTdb_; }
+ inline void setParentTdb(ComTdb *tdb) { parentTdb_ = tdb; }
+ inline void setTdbId(Lng32 uniqueId) { tdbId_ = uniqueId; }
+ inline Lng32 getTdbId() const { return tdbId_; }
+ inline Cardinality getEstRowsAccessed() const
{
return estRowsAccessed_;
}
- NA_EIDPROC inline void setEstRowsAccessed(Cardinality estRowsAccessed)
+ inline void setEstRowsAccessed(Cardinality estRowsAccessed)
{
estRowsAccessed_ = estRowsAccessed;
}
- NA_EIDPROC inline Cardinality getEstRowsUsed() const
+ inline Cardinality getEstRowsUsed() const
{
return estRowsUsed_;
}
- NA_EIDPROC inline void setEstRowsUsed(Cardinality estRowsUsed)
+ inline void setEstRowsUsed(Cardinality estRowsUsed)
{
estRowsUsed_ = estRowsUsed;
}
- NA_EIDPROC inline ULng32 getMaxQueueSizeDown() const
+ inline ULng32 getMaxQueueSizeDown() const
{ return queueSizeDown_; }
- NA_EIDPROC inline ULng32 getMaxQueueSizeUp() const
+ inline ULng32 getMaxQueueSizeUp() const
{ return queueSizeUp_; }
- NA_EIDPROC inline void setMaxQueueSizeUp(ULng32 qSize)
+ inline void setMaxQueueSizeUp(ULng32 qSize)
{ queueSizeUp_ = qSize; }
- NA_EIDPROC inline ULng32 getInitialQueueSizeDown() const
+ inline ULng32 getInitialQueueSizeDown() const
{ return initialQueueSizeDown_; }
- NA_EIDPROC inline ULng32 getInitialQueueSizeUp() const
+ inline ULng32 getInitialQueueSizeUp() const
{ return initialQueueSizeUp_; }
- NA_EIDPROC inline short getQueueResizeLimit() const
+ inline short getQueueResizeLimit() const
{ return queueResizeLimit_; }
- NA_EIDPROC inline short getQueueResizeFactor() const
+ inline short getQueueResizeFactor() const
{ return queueResizeFactor_; }
- NA_EIDPROC inline void setQueueResizeParams(
+ inline void setQueueResizeParams(
ULng32 initialQueueSizeDown,
ULng32 initialQueueSizeUp,
short queueResizeLimit,
@@ -478,7 +437,7 @@ public:
// this method should be defined in any TDB which store the plan
// version.
- NA_EIDPROC virtual
+ virtual
void setPlanVersion(UInt32 /*pv*/)
{
// should never reach here.
@@ -487,19 +446,19 @@ public:
// ---------------------------------------------------------------------
// numChildren() -- Returns the number of children for this TDB
// ---------------------------------------------------------------------
- NA_EIDPROC virtual Int32 numChildren() const { return -1; } // LCOV_EXCL_LINE
+ virtual Int32 numChildren() const { return -1; } // LCOV_EXCL_LINE
// ---------------------------------------------------------------------
// getNodeName() -- Returns the name of this TDB.
// ---------------------------------------------------------------------
- NA_EIDPROC virtual const char *getNodeName() const { return "ComTDB"; } // LCOV_EXCL_LINE
+ virtual const char *getNodeName() const { return "ComTDB"; } // LCOV_EXCL_LINE
// ---------------------------------------------------------------------
// getChild(int child) -- Returns a pointer to the nth child TDB of this
// TDB. This function cannot be used to get children which reside in
// other processes -- see getChildForGUI.
// ---------------------------------------------------------------------
- NA_EIDPROC virtual const ComTdb *getChild(Int32) const { return NULL; } // LCOV_EXCL_LINE
+ virtual const ComTdb *getChild(Int32) const { return NULL; } // LCOV_EXCL_LINE
// ---------------------------------------------------------------------
// getChildForGUI() takes as additional arguments the fragment directory
@@ -523,41 +482,41 @@ public:
// ---------------------------------------------------------------------
// numExpressions() -- Returns the number of expression for this TDB.
// ---------------------------------------------------------------------
- NA_EIDPROC virtual Int32 numExpressions() const { return 0; }
+ virtual Int32 numExpressions() const { return 0; }
// ---------------------------------------------------------------------
// GetExpressionName(int) -- Returns a string identifying the nth
// expression for this TDB.
// ---------------------------------------------------------------------
- NA_EIDPROC virtual const char *getExpressionName(Int32) const
+ virtual const char *getExpressionName(Int32) const
{ return "none"; }
// ---------------------------------------------------------------------
// GetExpressionNode(int) -- Returns the nth expression for this TDB.
// ---------------------------------------------------------------------
- NA_EIDPROC virtual ex_expr *getExpressionNode(Int32) { return 0; }
+ virtual ex_expr *getExpressionNode(Int32) { return 0; }
// ---------------------------------------------------------------------
// overloaded to return TRUE for root operators (master executor root,
// EID root, ESP root)
// ---------------------------------------------------------------------
- NA_EIDPROC virtual NABoolean isRoot() const { return FALSE; }
+ virtual NABoolean isRoot() const { return FALSE; }
// ---------------------------------------------------------------------
// Build a TCB for this TDB. Redefined in the Executor project.
// ---------------------------------------------------------------------
- NA_EIDPROC virtual ex_tcb *build(ex_globals *globals) { return NULL; }
+ virtual ex_tcb *build(ex_globals *globals) { return NULL; }
- NA_EIDPROC Lng32 getBufferSize() const {return bufferSize_;}
- NA_EIDPROC Lng32 getNumBuffers() const {return numBuffers_;}
+ Lng32 getBufferSize() const {return bufferSize_;}
+ Lng32 getNumBuffers() const {return numBuffers_;}
- NA_EIDPROC void resetBufInfo(Int32 numBuffers, UInt32 bufferSize)
+ void resetBufInfo(Int32 numBuffers, UInt32 bufferSize)
{
numBuffers_ = numBuffers;
bufferSize_ = bufferSize;
}
- NA_EIDPROC Int32 &firstNRows()
+ Int32 &firstNRows()
{
return firstNRows_;
}
@@ -568,69 +527,57 @@ public:
// The root nodes allocate a stats area if the indicator is true. All
// other tcbs allocate a stats entry if the stats area is present
// ---------------------------------------------------------------------
- NA_EIDPROC NABoolean getCollectStats()
+ NABoolean getCollectStats()
{ return (flags_ & COLLECT_STATS) != 0; }
- NA_EIDPROC inline void setCollectStats(NABoolean v)
+ inline void setCollectStats(NABoolean v)
{ (v ? flags_ |= COLLECT_STATS : flags_ &= ~COLLECT_STATS); }
- NA_EIDPROC NABoolean denseBuffers()
+ NABoolean denseBuffers()
{ return (flags_ & DENSE_BUFFERS) != 0; }
- NA_EIDPROC inline void setDenseBuffers(NABoolean v)
+ inline void setDenseBuffers(NABoolean v)
{ (v ? flags_ |= DENSE_BUFFERS : flags_ &= ~DENSE_BUFFERS); }
- NA_EIDPROC
short doOltQueryOpt() const{return flags_ & DO_OLT_QUERY_OPT;}
- NA_EIDPROC
void setDoOltQueryOpt(NABoolean v)
{ (v ? flags_ |= DO_OLT_QUERY_OPT : flags_ &= ~DO_OLT_QUERY_OPT); };
- NA_EIDPROC
short doOltQueryOptLean() const{return flags_ & DO_OLT_QUERY_OPT_LEAN;}
- NA_EIDPROC
void setDoOltQueryOptLean(NABoolean v)
{ (v ? flags_ |= DO_OLT_QUERY_OPT_LEAN : flags_ &= ~DO_OLT_QUERY_OPT_LEAN); };
- NA_EIDPROC NABoolean getCollectRtsStats()
+ NABoolean getCollectRtsStats()
{ return (flags_ & COLLECT_RTS_STATS) != 0; }
- NA_EIDPROC inline void setCollectRtsStats(NABoolean v)
+ inline void setCollectRtsStats(NABoolean v)
{ (v ? flags_ |= COLLECT_RTS_STATS : flags_ &= ~COLLECT_RTS_STATS); }
- NA_EIDPROC
short floatFieldsAreIEEE() const{return flags_ & FLOAT_FIELDS_ARE_IEEE;}
-NA_EIDPROC
short isNonFatalErrorTolerated() const { return flags_ & TOLERATE_NONFATAL_ERROR;}
-NA_EIDPROC
void setTolerateNonFatalError(NABoolean v){ v ? flags_ |= TOLERATE_NONFATAL_ERROR: flags_ &= ~TOLERATE_NONFATAL_ERROR;}
-NA_EIDPROC
short isCIFON() const { return flags_ & CIFON;}
-NA_EIDPROC
void setCIFON(NABoolean v){ v ? flags_ |= CIFON: flags_ &= ~CIFON;}
-NA_EIDPROC
short processLOB() const { return flags_ & PROCESS_LOB;}
-NA_EIDPROC
void setProcessLOB(NABoolean v){ v ? flags_ |= PROCESS_LOB: flags_ &= ~PROCESS_LOB;}
enum CollectStatsType
{
NO_STATS = SQLCLI_NO_STATS,
- MEASURE_STATS = SQLCLI_MEASURE_STATS, // collect statistics for measure counters
- ACCUMULATED_STATS = SQLCLI_ACCUMULATED_STATS, // collect accumulated stats. Same as measure.
- PERTABLE_STATS = SQLCLI_PERTABLE_STATS, // collect same stats that were collected in sql/mp
+ ACCUMULATED_STATS = SQLCLI_ACCUMULATED_STATS, // collect accumulated stats.
+ PERTABLE_STATS = SQLCLI_PERTABLE_STATS, // collect per table stats that
ALL_STATS = SQLCLI_ALL_STATS, // collect all stats about all exe operators
OPERATOR_STATS = SQLCLI_OPERATOR_STATS, // collect all stats but merge at operator(tdb)
// granularity. Used to return data at user operator
// level.
- CPU_OFFENDER_STATS = SQLCLI_CPU_OFFENDER_STATS, // Collection of ROOT_OPER_STATS or MEAS_STATS of
+ CPU_OFFENDER_STATS = SQLCLI_CPU_OFFENDER_STATS, // Collection of ROOT_OPER_STATS of
// all currently running queries in a cpu
- QID_DETAIL_STATS = SQLCLI_QID_DETAIL_STATS, // Collection of ROOT_OPER_STATS or MEAS_STATS for
+ QID_DETAIL_STATS = SQLCLI_QID_DETAIL_STATS, // Collection of ROOT_OPER_STATS for
// a given QID
SE_OFFENDER_STATS = SQLCLI_SE_OFFENDER_STATS,
RMS_INFO_STATS = SQLCLI_RMS_INFO_STATS,
@@ -641,23 +588,16 @@ NA_EIDPROC
};
-NA_EIDPROC
CollectStatsType getCollectStatsType() { return (CollectStatsType)collectStatsType_; };
-NA_EIDPROC
void setCollectStatsType(CollectStatsType s)
{ collectStatsType_ = s; };
-NA_EIDPROC
Lng32 getExplainNodeId() const { return (Lng32) explainNodeId_; }
-NA_EIDPROC
void setExplainNodeId(Lng32 id) { explainNodeId_ = (Int32) id; }
-NA_EIDPROC
UInt16 getPertableStatsTdbId() const { return pertableStatsTdbId_; }
-NA_EIDPROC
void setPertableStatsTdbId(UInt16 id) { pertableStatsTdbId_ = id; }
-NA_EIDPROC
Float32 getFloatValue(char * v) const
{
Float32 f;
@@ -666,7 +606,6 @@ NA_EIDPROC
return f;
}
-NA_EIDPROC
Float64 getDoubleValue(char * v) const
{
Float64 f;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/comexe/ComTdbAll.h
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComTdbAll.h b/core/sql/comexe/ComTdbAll.h
index cb0b515..79492fa 100644
--- a/core/sql/comexe/ComTdbAll.h
+++ b/core/sql/comexe/ComTdbAll.h
@@ -51,7 +51,6 @@
#include "ComTdbTimeout.h"
-#ifndef __EID
#include "ComTdbControl.h"
#include "ComTdbRoot.h"
#include "ComTdbOnlj.h"
@@ -79,10 +78,3 @@
#include "ComTdbHdfsScan.h"
#include "ComTdbHbaseAccess.h"
#endif
-
-#endif
-
-
-
-
-
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/comexe/ComTdbBlockingHdfsScan.cpp
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComTdbBlockingHdfsScan.cpp b/core/sql/comexe/ComTdbBlockingHdfsScan.cpp
index 7b9b991..9968493 100755
--- a/core/sql/comexe/ComTdbBlockingHdfsScan.cpp
+++ b/core/sql/comexe/ComTdbBlockingHdfsScan.cpp
@@ -54,18 +54,8 @@ ComTdbBlockingHdfsScan::ComTdbBlockingHdfsScan():
queue_index down,
queue_index up,
Cardinality estimatedRowCount,
-#ifdef NA_64BIT
- // dg64 - match signature
Int32 numBuffers,
-#else
- Lng32 numBuffers,
-#endif
-#ifdef NA_64BIT
- // dg64 - match signature
UInt32 bufferSize
-#else
- ULng32 bufferSize
-#endif
)
: ComTdb( ComTdb::ex_BLOCK_HDFS_SCAN,
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/comexe/ComTdbBlockingHdfsScan.h
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComTdbBlockingHdfsScan.h b/core/sql/comexe/ComTdbBlockingHdfsScan.h
index 40c7612..88a3b40 100755
--- a/core/sql/comexe/ComTdbBlockingHdfsScan.h
+++ b/core/sql/comexe/ComTdbBlockingHdfsScan.h
@@ -124,16 +124,8 @@ public:
queue_index down,
queue_index up,
Cardinality estimatedRowCount,
-#ifdef NA_64BIT
Int32 numBuffers,
-#else
- Lng32 numBuffers,
-#endif
-#ifdef NA_64BIT
UInt32 bufferSize
-#else
- ULng32 bufferSize
-#endif
);
~ComTdbBlockingHdfsScan();
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/comexe/ComTdbCompoundStmt.h
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComTdbCompoundStmt.h b/core/sql/comexe/ComTdbCompoundStmt.h
index 20920e7..68a7ce0 100644
--- a/core/sql/comexe/ComTdbCompoundStmt.h
+++ b/core/sql/comexe/ComTdbCompoundStmt.h
@@ -53,10 +53,8 @@ public:
//
// Standard TDB methods.
//
-NA_EIDPROC
ComTdbCompoundStmt();
-NA_EIDPROC
ComTdbCompoundStmt(ComTdb *left,
ComTdb *right,
ex_cri_desc *given,
@@ -72,56 +70,43 @@ NA_EIDPROC
// LCOV_EXCL_START
// exclude from code coverage analsysis since this method is not used
-NA_EIDPROC
Int32 orderedQueueProtocol() const { return -1; }
// LCOV_EXCL_STOP
-NA_EIDPROC
Long pack(void *);
-NA_EIDPROC
Lng32 unpack(void *, void * reallocator);
-NA_EIDPROC
void display() const {};
-NA_EIDPROC
virtual const ComTdb *getChild(Int32 pos) const;
-NA_EIDPROC
virtual Int32 numChildren() const { return 2; }
-NA_EIDPROC
virtual Int32 numExpressions() const { return 0; }
-NA_EIDPROC
virtual const char *getNodeName() const { return "EX_COMPOUND_STMT"; };
// LCOV_EXCL_START
// exclude from code coverage analysys since there are no expressions for
// this operator
-NA_EIDPROC
virtual ex_expr* getExpressionNode(Int32 pos) { return NULL; }
-NA_EIDPROC
virtual const char * getExpressionName(Int32 pos) const { return NULL; }
// LCOV_EXCL_STOP
// ---------------------------------------------------------------------
// Redefine virtual functions required for Versioning.
//----------------------------------------------------------------------
-NA_EIDPROC
virtual unsigned char getClassVersionID()
{
return 1;
}
-NA_EIDPROC
virtual void populateImageVersionIDArray()
{
setImageVersionID(1,getClassVersionID());
ComTdb::populateImageVersionIDArray();
}
-NA_EIDPROC
virtual short getClassSize() { return (short)sizeof(*this); }
protected:
@@ -139,15 +124,12 @@ protected:
char fillersComTdbCompound_[30]; // 18-47
-NA_EIDPROC
inline NABoolean expectingLeftRows() const
{ return (flags_ & ROWS_FROM_LEFT) != 0; }
-NA_EIDPROC
inline NABoolean expectingRightRows() const
{ return (flags_ & ROWS_FROM_RIGHT) != 0; }
-NA_EIDPROC
inline NABoolean afterUpdate() const
{ return (flags_ & AFTER_UPDATE) != 0; }
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/comexe/ComTdbExeUtil.h
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComTdbExeUtil.h b/core/sql/comexe/ComTdbExeUtil.h
index 7e608b2..884a7d9 100644
--- a/core/sql/comexe/ComTdbExeUtil.h
+++ b/core/sql/comexe/ComTdbExeUtil.h
@@ -163,13 +163,11 @@ public:
return "EX_EXE_UTIL";
};
-NA_EIDPROC
virtual Int32 numExpressions() const
{
return (ComTdbGenericUtil::numExpressions() + 1);
}
-NA_EIDPROC
virtual ex_expr* getExpressionNode(Int32 pos) {
if (pos >= numExpressions())
return NULL;
@@ -180,7 +178,6 @@ NA_EIDPROC
return scanExpr_;
}
-NA_EIDPROC
virtual const char * getExpressionName(Int32 pos) const {
if (pos >= numExpressions())
return NULL;
@@ -301,7 +298,7 @@ public:
// ---------------------------------------------------------------------
// Used by the internal SHOWPLAN command to get attributes of a TDB.
// ---------------------------------------------------------------------
- NA_EIDPROC void displayContents(Space *space, ULng32 flag);
+ void displayContents(Space *space, ULng32 flag);
NABoolean isOptionE() { return ((flags_ & OPTION_E) != 0); };
NABoolean isOptionF() { return ((flags_ & OPTION_F) != 0); };
@@ -418,7 +415,7 @@ public:
// ---------------------------------------------------------------------
// Used by the internal SHOWPLAN command to get attributes of a TDB.
// ---------------------------------------------------------------------
- NA_EIDPROC void displayContents(Space *space, ULng32 flag);
+ void displayContents(Space *space, ULng32 flag);
private:
enum
@@ -996,7 +993,7 @@ void setLabelStatsIncRelated(NABoolean v)
// Used by the internal SHOWPLAN command to get attributes of a TDB.
// ---------------------------------------------------------------------
- NA_EIDPROC void displayContents(Space *space, ULng32 flag);
+ void displayContents(Space *space, ULng32 flag);
protected:
//enum for flags_
@@ -1232,7 +1229,7 @@ public:
// ---------------------------------------------------------------------
// Used by the internal SHOWPLAN command to get attributes of a TDB.
// ---------------------------------------------------------------------
- NA_EIDPROC void displayContents(Space *space, ULng32 flag);
+ void displayContents(Space *space, ULng32 flag);
private:
NABasicPtr insertQuery_; // 00-07
@@ -1280,7 +1277,7 @@ public:
// ---------------------------------------------------------------------
// Used by the internal SHOWPLAN command to get attributes of a TDB.
// ---------------------------------------------------------------------
- NA_EIDPROC void displayContents(Space *space, ULng32 flag);
+ void displayContents(Space *space, ULng32 flag);
void setCleanupAllTables(NABoolean v)
{(v ? flags_ |= CLEANUP_ALL_TABLES : flags_ &= ~CLEANUP_ALL_TABLES); };
@@ -1358,7 +1355,7 @@ public:
// ---------------------------------------------------------------------
// Used by the internal SHOWPLAN command to get attributes of a TDB.
// ---------------------------------------------------------------------
- NA_EIDPROC void displayContents(Space *space, ULng32 flag);
+ void displayContents(Space *space, ULng32 flag);
private:
enum GetType
@@ -1412,7 +1409,7 @@ public:
// ---------------------------------------------------------------------
// Used by the internal SHOWPLAN command to get attributes of a TDB.
// ---------------------------------------------------------------------
- NA_EIDPROC void displayContents(Space *space, ULng32 flag);
+ void displayContents(Space *space, ULng32 flag);
private:
Lng32 errNum_; // 00-03
@@ -1480,7 +1477,7 @@ public:
// ---------------------------------------------------------------------
// Used by the internal SHOWPLAN command to get attributes of a TDB.
// ---------------------------------------------------------------------
- NA_EIDPROC void displayContents(Space *space, ULng32 flag);
+ void displayContents(Space *space, ULng32 flag);
private:
enum
@@ -1571,7 +1568,7 @@ public:
// ---------------------------------------------------------------------
// Used by the internal SHOWPLAN command to get attributes of a TDB.
// ---------------------------------------------------------------------
- NA_EIDPROC void displayContents(Space *space, ULng32 flag);
+ void displayContents(Space *space, ULng32 flag);
void setDoPurgedataCat(NABoolean v)
{(v ? flags_ |= DO_PURGEDATA_CAT : flags_ &= ~DO_PURGEDATA_CAT); };
@@ -1716,7 +1713,7 @@ public:
// ---------------------------------------------------------------------
// Used by the internal SHOWPLAN command to get attributes of a TDB.
// ---------------------------------------------------------------------
- NA_EIDPROC void displayContents(Space *space, ULng32 flag);
+ void displayContents(Space *space, ULng32 flag);
private:
NABasicPtr hiveTableName_; // 00-07
@@ -1766,7 +1763,7 @@ public:
// ---------------------------------------------------------------------
// Used by the internal SHOWPLAN command to get attributes of a TDB.
// ---------------------------------------------------------------------
- NA_EIDPROC void displayContents(Space *space, ULng32 flag);
+ void displayContents(Space *space, ULng32 flag);
private:
NABasicPtr hiveQuery_; // 00-07
@@ -1851,7 +1848,7 @@ public:
// ---------------------------------------------------------------------
// Used by the internal SHOWPLAN command to get attributes of a TDB.
// ---------------------------------------------------------------------
- NA_EIDPROC void displayContents(Space *space, ULng32 flag);
+ void displayContents(Space *space, ULng32 flag);
inline const char * getStmtName() const { return stmtName_.getPointer(); }
protected:
@@ -1928,7 +1925,7 @@ public:
// ---------------------------------------------------------------------
// Used by the internal SHOWPLAN command to get attributes of a TDB.
// ---------------------------------------------------------------------
- NA_EIDPROC void displayContents(Space *space, ULng32 flag);
+ void displayContents(Space *space, ULng32 flag);
private:
};
@@ -1998,7 +1995,7 @@ public:
// ---------------------------------------------------------------------
// Used by the internal SHOWPLAN command to get attributes of a TDB.
// ---------------------------------------------------------------------
- NA_EIDPROC void displayContents(Space *space, ULng32 flag);
+ void displayContents(Space *space, ULng32 flag);
private:
Int64 uid_; // 00-07
@@ -2074,7 +2071,7 @@ public:
// ---------------------------------------------------------------------
// Used by the internal SHOWPLAN command to get attributes of a TDB.
// ---------------------------------------------------------------------
- NA_EIDPROC void displayContents(Space *space, ULng32 flag);
+ void displayContents(Space *space, ULng32 flag);
private:
NABasicPtr stmtName_;
@@ -2129,7 +2126,7 @@ public:
// ---------------------------------------------------------------------
// Used by the internal SHOWPLAN command to get attributes of a TDB.
// ---------------------------------------------------------------------
- NA_EIDPROC void displayContents(Space *space, ULng32 flag);
+ void displayContents(Space *space, ULng32 flag);
inline const char * getInMemHistogramsTableName() const
{ return inMemHistogramsTableName_.getPointer() ; } ;
@@ -2209,7 +2206,7 @@ public:
// ---------------------------------------------------------------------
// Used by the internal SHOWPLAN command to get attributes of a TDB.
// ---------------------------------------------------------------------
- NA_EIDPROC void displayContents(Space *space, ULng32 flag);
+ void displayContents(Space *space, ULng32 flag);
private:
@@ -2258,7 +2255,7 @@ public:
// ---------------------------------------------------------------------
// Used by the internal SHOWPLAN command to get attributes of a TDB.
// ---------------------------------------------------------------------
- NA_EIDPROC void displayContents(Space *space, ULng32 flag);
+ void displayContents(Space *space, ULng32 flag);
void setLongRunningDelete(NABoolean v)
{(v ? flags_ |= LR_DELETE : flags_ &= ~LR_DELETE); };
@@ -2385,7 +2382,7 @@ public:
// ---------------------------------------------------------------------
// Used by the internal SHOWPLAN command to get attributes of a TDB.
// ---------------------------------------------------------------------
- NA_EIDPROC void displayContents(Space *space, ULng32 flag);
+ void displayContents(Space *space, ULng32 flag);
private:
@@ -2457,7 +2454,7 @@ public:
// ---------------------------------------------------------------------
// Used by the internal SHOWPLAN command to get attributes of a TDB.
// ---------------------------------------------------------------------
- NA_EIDPROC void displayContents(Space *space, ULng32 flag);
+ void displayContents(Space *space, ULng32 flag);
private:
Lng32 task_;
@@ -2684,7 +2681,7 @@ public:
// ---------------------------------------------------------------------
// Used by the internal SHOWPLAN command to get attributes of a TDB.
// ---------------------------------------------------------------------
- NA_EIDPROC void displayContents(Space *space, ULng32 flag);
+ void displayContents(Space *space, ULng32 flag);
protected:
enum
@@ -2781,7 +2778,7 @@ public:
// ---------------------------------------------------------------------
// Used by the internal SHOWPLAN command to get attributes of a TDB.
// ---------------------------------------------------------------------
- NA_EIDPROC void displayContents(Space *space, ULng32 flag);
+ void displayContents(Space *space, ULng32 flag);
private:
@@ -2865,7 +2862,7 @@ public:
// ---------------------------------------------------------------------
// Used by the internal SHOWPLAN command to get attributes of a TDB.
// ---------------------------------------------------------------------
- NA_EIDPROC void displayContents(Space *space, ULng32 flag);
+ void displayContents(Space *space, ULng32 flag);
void setHandleInStringFormat(NABoolean v)
{(v ? flags_ |= STRING_FORMAT : flags_ &= ~STRING_FORMAT); };
@@ -3001,7 +2998,7 @@ public:
// ---------------------------------------------------------------------
// Used by the internal SHOWPLAN command to get attributes of a TDB.
// ---------------------------------------------------------------------
- NA_EIDPROC void displayContents(Space *space, ULng32 flag);
+ void displayContents(Space *space, ULng32 flag);
void setAppend(NABoolean v)
{(v ? flags_ |= APPEND_ : flags_ &= ~APPEND_); };
@@ -3099,7 +3096,7 @@ public:
// ---------------------------------------------------------------------
// Used by the internal SHOWPLAN command to get attributes of a TDB.
// ---------------------------------------------------------------------
- NA_EIDPROC void displayContents(Space *space, ULng32 flag);
+ void displayContents(Space *space, ULng32 flag);
short getLOBnum(short i);
char * getLOBloc(short i);
@@ -3421,7 +3418,7 @@ public:
// ---------------------------------------------------------------------
// Used by the internal SHOWPLAN command to get attributes of a TDB.
// ---------------------------------------------------------------------
- NA_EIDPROC void displayContents(Space *space, ULng32 flag);
+ void displayContents(Space *space, ULng32 flag);
// Virtual routines to provide a consistent interface to TDB's
@@ -3636,7 +3633,7 @@ public:
// ---------------------------------------------------------------------
// Used by the internal SHOWPLAN command to get attributes of a TDB.
// ---------------------------------------------------------------------
- NA_EIDPROC void displayContents(Space *space, ULng32 flag);
+ void displayContents(Space *space, ULng32 flag);
private:
enum
@@ -3780,7 +3777,7 @@ public:
// ---------------------------------------------------------------------
// Used by the internal SHOWPLAN command to get attributes of a TDB.
// ---------------------------------------------------------------------
- NA_EIDPROC void displayContents(Space *space, ULng32 flag);
+ void displayContents(Space *space, ULng32 flag);
private:
enum
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/comexe/ComTdbExplain.h
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComTdbExplain.h b/core/sql/comexe/ComTdbExplain.h
index 945f9e5..09366df 100644
--- a/core/sql/comexe/ComTdbExplain.h
+++ b/core/sql/comexe/ComTdbExplain.h
@@ -137,7 +137,7 @@ public:
// ---------------------------------------------------------------------
// Used by the internal SHOWPLAN command to get attributes of a TDB.
// ---------------------------------------------------------------------
- NA_EIDPROC void displayContents(Space *space, ULng32 flag);
+ void displayContents(Space *space, ULng32 flag);
// The index of the ATP being returned to the parent, that has the
// new row (explain Info)
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/comexe/ComTdbFastTransport.h
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComTdbFastTransport.h b/core/sql/comexe/ComTdbFastTransport.h
index a63290b..37c01da 100644
--- a/core/sql/comexe/ComTdbFastTransport.h
+++ b/core/sql/comexe/ComTdbFastTransport.h
@@ -117,18 +117,15 @@ public:
//----------------------------------------------------------------------
// Redefine virtual functions required for versioning
//----------------------------------------------------------------------
- NA_EIDPROC
virtual unsigned char getClassVersionID()
{
return 1;
}
- NA_EIDPROC
virtual void populateImageVersionIDArray()
{
setImageVersionID(1,getClassVersionID());
ComTdb::populateImageVersionIDArray();
}
- NA_EIDPROC
virtual short getClassSize()
{
return (short) sizeof(ComTdbFastExtract);
@@ -137,41 +134,33 @@ public:
//----------------------------------------------------------------------
// Pack/unpack
//----------------------------------------------------------------------
- NA_EIDPROC
Long pack(void *);
- NA_EIDPROC
Lng32 unpack(void *, void *);
//----------------------------------------------------------------------
// Other required TDB support functions
//----------------------------------------------------------------------
- NA_EIDPROC
Int32 orderedQueueProtocol() const
{
return -1;
}
- NA_EIDPROC
void display() const
{
// All TDBs have an no-op display() function. Not sure why.
}
- NA_EIDPROC
virtual Int32 numChildren() const
{
return 1;
}
- NA_EIDPROC
virtual const char *getNodeName() const
{
return "EX_FAST_EXTRACT";
}
- NA_EIDPROC
virtual const ComTdb *getChild() const
{
return childTdb_;
}
- NA_EIDPROC
virtual const ComTdb* getChild(Int32 pos) const
{
if (pos == 0)
@@ -180,12 +169,10 @@ public:
return NULL;
}
- NA_EIDPROC
virtual Int32 numExpressions() const
{
return 3;
}
- NA_EIDPROC
virtual const char *getExpressionName(Int32 pos) const
{
if (pos == 0)
@@ -198,7 +185,6 @@ public:
return NULL;
}
- NA_EIDPROC
virtual ex_expr *getExpressionNode(Int32 pos)
{
if (pos == 0)
@@ -211,7 +197,6 @@ public:
return NULL;
}
- NA_EIDPROC
virtual void displayContents(Space *space, ULng32 flag);
NABoolean getIsAppend() const
@@ -345,18 +330,18 @@ public:
NABoolean getContinueOnError() const
{ return ((flags_ & CONTINUE_ON_ERROR) != 0); }
- NA_EIDPROC inline const char *getTargetName() const { return targetName_; }
- NA_EIDPROC inline const char *getHdfsHostName() const { return hdfsHostName_; }
- NA_EIDPROC inline const Int32 getHdfsPortNum() const {return (Int32)hdfsPortNum_;}
- NA_EIDPROC inline const char *getHiveTableName() const { return hiveTableName_; }
- NA_EIDPROC inline const char *getHeader() const { return header_; }
- NA_EIDPROC inline const char *getNullString() const { return nullString_; }
- NA_EIDPROC inline const char *getDelimiter() const { return delimiter_; }
- NA_EIDPROC inline const char *getRecordSeparator() const
+ inline const char *getTargetName() const { return targetName_; }
+ inline const char *getHdfsHostName() const { return hdfsHostName_; }
+ inline const Int32 getHdfsPortNum() const {return (Int32)hdfsPortNum_;}
+ inline const char *getHiveTableName() const { return hiveTableName_; }
+ inline const char *getHeader() const { return header_; }
+ inline const char *getNullString() const { return nullString_; }
+ inline const char *getDelimiter() const { return delimiter_; }
+ inline const char *getRecordSeparator() const
{ return recordSeparator_; }
- NA_EIDPROC Int32 getNumIOBuffers() {return (Int32)numIOBuffers_;}
- NA_EIDPROC Int32 getIoTimeout() {return (Int32)ioTimeout_;}
+ Int32 getNumIOBuffers() {return (Int32)numIOBuffers_;}
+ Int32 getIoTimeout() {return (Int32)ioTimeout_;}
Int64 getHdfsIoBufferSize() const
{
return hdfsIOBufferSize_;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/comexe/ComTdbFirstN.h
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComTdbFirstN.h b/core/sql/comexe/ComTdbFirstN.h
index a9f1c04..bc27109 100644
--- a/core/sql/comexe/ComTdbFirstN.h
+++ b/core/sql/comexe/ComTdbFirstN.h
@@ -72,12 +72,12 @@ public:
// ---------------------------------------------------------------------
// Redefine virtual functions required for Versioning.
//----------------------------------------------------------------------
- NA_EIDPROC virtual unsigned char getClassVersionID()
+ virtual unsigned char getClassVersionID()
{
return 1;
}
- NA_EIDPROC virtual void populateImageVersionIDArray()
+ virtual void populateImageVersionIDArray()
{
setImageVersionID(1,getClassVersionID());
ComTdb::populateImageVersionIDArray();
@@ -108,7 +108,7 @@ public:
// ---------------------------------------------------------------------
// Used by the internal SHOWPLAN command to get attributes of a TDB.
// ---------------------------------------------------------------------
- NA_EIDPROC virtual void displayContents(Space *space,ULng32 flag);
+ virtual void displayContents(Space *space,ULng32 flag);
Int64 firstNRows() { return firstNRows_; }
protected:
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/comexe/ComTdbHashGrby.h
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComTdbHashGrby.h b/core/sql/comexe/ComTdbHashGrby.h
index 79fb444..f31f70e 100644
--- a/core/sql/comexe/ComTdbHashGrby.h
+++ b/core/sql/comexe/ComTdbHashGrby.h
@@ -96,11 +96,9 @@ protected:
public:
-NA_EIDPROC
ComTdbHashGrby(); // dummy constructor.
// Used by 'unpack' routines.
-NA_EIDPROC
ComTdbHashGrby(ComTdb * childTdb,
ex_cri_desc * givenDesc,
ex_cri_desc * returnedDesc,
@@ -145,37 +143,32 @@ NA_EIDPROC
short hgbGrowthPercent
);
-NA_EIDPROC
~ComTdbHashGrby();
// ---------------------------------------------------------------------
// Redefine virtual functions required for Versioning.
//----------------------------------------------------------------------
- NA_EIDPROC virtual unsigned char getClassVersionID()
+ virtual unsigned char getClassVersionID()
{
return 1;
}
- NA_EIDPROC virtual void populateImageVersionIDArray()
+ virtual void populateImageVersionIDArray()
{
setImageVersionID(1,getClassVersionID());
ComTdb::populateImageVersionIDArray();
}
- NA_EIDPROC virtual short getClassSize()
+ virtual short getClassSize()
{ return (short)sizeof(ComTdbHashGrby); }
Long pack(void *);
-NA_EIDPROC
Lng32 unpack(void *, void * reallocator);
-NA_EIDPROC
void display() const;
-NA_EIDPROC
inline ComTdb * getChildTdb();
-NA_EIDPROC
Int32 orderedQueueProtocol() const;
AggrExpr * hbAggrExpr() const { return (AggrExpr*)((ex_expr*)hbAggrExpr_); }
@@ -185,10 +178,10 @@ NA_EIDPROC
// ---------------------------------------------------------------------
// Used by the internal SHOWPLAN command to get attributes of a TDB.
// ---------------------------------------------------------------------
- NA_EIDPROC virtual void displayContents(Space *space,ULng32 flag);
+ virtual void displayContents(Space *space,ULng32 flag);
#if 0
-NA_EIDPROC
+
//virtual
void allocateStatsEntry(Int64 operID,
Int64 estRowsReturned,
@@ -196,19 +189,14 @@ NA_EIDPROC
#endif
// **** GUI ****
-NA_EIDPROC
virtual const ComTdb* getChild(Int32 pos) const;
-NA_EIDPROC
virtual Int32 numChildren() const { return 1; };
-NA_EIDPROC
virtual const char *getNodeName() const { return "EX_HASH_GRBY"; };
-NA_EIDPROC
virtual Int32 numExpressions() const { return 13; };
-NA_EIDPROC
virtual ex_expr * getExpressionNode(Int32 pos) {
if (pos == 0)
return hashExpr_;
@@ -240,7 +228,6 @@ NA_EIDPROC
return NULL;
};
-NA_EIDPROC
virtual const char * getExpressionName(Int32 pos) const {
if (pos == 0)
return "hashExpr_";
@@ -284,20 +271,18 @@ NA_EIDPROC
{(v ? hashGroupByFlags_ |= LOG_DIAGNOSTICS_ : hashGroupByFlags_ &= ~LOG_DIAGNOSTICS_);}
- NA_EIDPROC
NABoolean isPossibleMultipleCalls()
{return (hashGroupByFlags_ & POSSIBLE_MULTIPLE_CALLS) != 0;}
- NA_EIDPROC
+
void setPossibleMultipleCalls(NABoolean v)
{(v ? hashGroupByFlags_ |= POSSIBLE_MULTIPLE_CALLS :
hashGroupByFlags_ &= ~POSSIBLE_MULTIPLE_CALLS);}
- NA_EIDPROC
NABoolean isPassPartialRows()
{return (hashGroupByFlags_ & PASS_PARTIAL_ROWS) != 0;}
- NA_EIDPROC
+
void setPassPartialRows(NABoolean v)
{(v ? hashGroupByFlags_ |= PASS_PARTIAL_ROWS :
hashGroupByFlags_ &= ~PASS_PARTIAL_ROWS);}
@@ -313,51 +298,38 @@ NA_EIDPROC
NABoolean considerBufferDefrag() const {return (hashGroupByFlags_ & CONSIDER_BUFFER_DEFRAG) !=0; };
void setConsiderBufferDefrag() {hashGroupByFlags_ |= CONSIDER_BUFFER_DEFRAG;};
- NA_EIDPROC UInt16 forceOverflowEvery() {return forceOverflowEvery_;}
+ UInt16 forceOverflowEvery() {return forceOverflowEvery_;}
- NA_EIDPROC
+
void setForceOverflowEvery(UInt16 times) { forceOverflowEvery_ = times; }
- NA_EIDPROC
ULng32 memoryQuotaMB() { return (ULng32) memoryQuotaMB_; }
- NA_EIDPROC
void setMemoryQuotaMB(UInt16 v) { memoryQuotaMB_ = v; }
- NA_EIDPROC
ULng32 partialGrbyMemoryMB() { return (ULng32) partialGrbyMemoryMB_; }
- NA_EIDPROC
void setPartialGrbyMemoryMB(UInt16 v) { partialGrbyMemoryMB_ = v; }
- NA_EIDPROC
void setHgbMemEstInMbPerCpu(Float32 s) {hgbMemEstInMbPerCpu_=s;}
- NA_EIDPROC
Float32 getHgbMemEstInMbPerCpu() {return hgbMemEstInMbPerCpu_;}
- NA_EIDPROC
Float32 hgbGrowthPercent() {return Float32(hgbGrowthPercent_/100.0);}
- NA_EIDPROC
Int32 scratchIOVectorSize() { return (Int32) scratchIOVectorSize_; }
- NA_EIDPROC
void setScratchIOVectorSize(Int16 v) { scratchIOVectorSize_ = v; }
- NA_EIDPROC
void setBmoMinMemBeforePressureCheck(UInt16 m)
{ bmoMinMemBeforePressureCheck_ = m ; }
- NA_EIDPROC
UInt16 getBmoMinMemBeforePressureCheck()
{ return bmoMinMemBeforePressureCheck_; }
- NA_EIDPROC
void setBMOMaxMemThresholdMB(UInt16 m)
{ bmoMaxMemThresholdMB_ = m ; }
- NA_EIDPROC
UInt16 getBMOMaxMemThresholdMB()
{ return bmoMaxMemThresholdMB_; }
@@ -366,7 +338,6 @@ NA_EIDPROC
};
-NA_EIDPROC
inline ComTdb * ComTdbHashGrby::getChildTdb(){
return childTdb_;
};
@@ -379,7 +350,6 @@ inline ComTdb * ComTdbHashGrby::getChildTdb(){
History : Yeogirl Yun 8/22/95
Initial Revision.
*****************************************************************************/
-NA_EIDPROC
inline const ComTdb* ComTdbHashGrby::getChild(Int32 pos) const {
if (pos == 0)
return childTdb_;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/comexe/ComTdbHashj.h
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComTdbHashj.h b/core/sql/comexe/ComTdbHashj.h
index b0976b8..a32aa05 100644
--- a/core/sql/comexe/ComTdbHashj.h
+++ b/core/sql/comexe/ComTdbHashj.h
@@ -159,7 +159,7 @@ public:
// ---------------------------------------------------------------------
// Used by the internal SHOWPLAN command to get attributes of a TDB.
// ---------------------------------------------------------------------
- NA_EIDPROC virtual void displayContents(Space *space,ULng32 flag);
+ virtual void displayContents(Space *space,ULng32 flag);
// **** information for GUI *** -------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/comexe/ComTdbHbaseAccess.h
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComTdbHbaseAccess.h b/core/sql/comexe/ComTdbHbaseAccess.h
index 2e13a9f..b84c0c4 100644
--- a/core/sql/comexe/ComTdbHbaseAccess.h
+++ b/core/sql/comexe/ComTdbHbaseAccess.h
@@ -588,7 +588,7 @@ public:
// ---------------------------------------------------------------------
// Used by the internal SHOWPLAN command to get attributes of a TDB.
// ---------------------------------------------------------------------
- NA_EIDPROC void displayContents(Space *space, ULng32 flag);
+ void displayContents(Space *space, ULng32 flag);
// Virtual routines to provide a consistent interface to TDB's
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/comexe/ComTdbMj.h
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComTdbMj.h b/core/sql/comexe/ComTdbMj.h
index 39be950..0cd25e1 100644
--- a/core/sql/comexe/ComTdbMj.h
+++ b/core/sql/comexe/ComTdbMj.h
@@ -206,7 +206,7 @@ public:
// ---------------------------------------------------------------------
// Used by the internal SHOWPLAN command to get attributes of a TDB.
// ---------------------------------------------------------------------
- NA_EIDPROC virtual void displayContents(Space *space,ULng32 flag);
+ virtual void displayContents(Space *space,ULng32 flag);
// GUI functions
virtual const ComTdb* getChild(Int32 pos) const
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/comexe/ComTdbOnlj.h
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComTdbOnlj.h b/core/sql/comexe/ComTdbOnlj.h
index 37d6961..7054a15 100644
--- a/core/sql/comexe/ComTdbOnlj.h
+++ b/core/sql/comexe/ComTdbOnlj.h
@@ -166,7 +166,7 @@ public:
// ---------------------------------------------------------------------
// Used by the internal SHOWPLAN command to get attributes of a TDB.
// ---------------------------------------------------------------------
- NA_EIDPROC virtual void displayContents(Space *space,ULng32 flag);
+ virtual void displayContents(Space *space,ULng32 flag);
};
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/comexe/ComTdbPackRows.h
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComTdbPackRows.h b/core/sql/comexe/ComTdbPackRows.h
index da57d2d..2b5fd25 100644
--- a/core/sql/comexe/ComTdbPackRows.h
+++ b/core/sql/comexe/ComTdbPackRows.h
@@ -51,15 +51,12 @@ class ComTdbPackRows: public ComTdb
public:
// Default Constructor.
- NA_EIDPROC
ComTdbPackRows();
// Copy constructor.
- NA_EIDPROC
ComTdbPackRows(const ComTdbPackRows* packTdb);
// Constructor used by the PhyPack::codeGen() in GenRelMisc.cpp.
- NA_EIDPROC
ComTdbPackRows(ComTdb* childTdb,
ex_expr* packExpr,
ex_expr* predExpr,
@@ -72,27 +69,21 @@ public:
// Pack the pack TDB for transmission from one process to another.
- NA_EIDPROC
Long pack(void *);
// Unpack the pack TDB after receiving it from another process.
- NA_EIDPROC
Lng32 unpack(void *, void * reallocator);
// Don't know what it is for ??
- NA_EIDPROC
void display() const;
// Return a pointer to the child TBD of this Pack TDB.
- NA_EIDPROC
inline ComTdb* getChildTdb() { return childTdb_; }
// We are observing order queue protocol.
- NA_EIDPROC
Int32 orderedQueueProtocol() const ;
// Return a pointer to the specifed (by position) child TDB.
- NA_EIDPROC
virtual const ComTdb* getChild(Int32 pos) const
{
if(pos == 0) return childTdb_;
@@ -100,15 +91,12 @@ public:
}
// Return the number of children for this node.
- NA_EIDPROC
virtual Int32 numChildren() const { return 1; }
// Return the number of expression this node has.
- NA_EIDPROC
virtual Int32 numExpressions() const { return 2; }
// Return the expression by position.
- NA_EIDPROC
virtual ex_expr* getExpressionNode(Int32 pos)
{
switch(pos)
@@ -121,7 +109,6 @@ public:
}
// Return the name of an expression by position.
- NA_EIDPROC
virtual const char* getExpressionName(Int32 pos) const
{
switch(pos)
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/comexe/ComTdbRoot.h
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComTdbRoot.h b/core/sql/comexe/ComTdbRoot.h
index b1e4662..77a5000 100644
--- a/core/sql/comexe/ComTdbRoot.h
+++ b/core/sql/comexe/ComTdbRoot.h
@@ -721,7 +721,7 @@ public:
// ---------------------------------------------------------------------
// Used by the internal SHOWPLAN command to get attributes of a TDB.
// ---------------------------------------------------------------------
- NA_EIDPROC virtual void displayContents(Space *space,ULng32 flag);
+ virtual void displayContents(Space *space,ULng32 flag);
//-------------------------------------------------------------------------
// GSH : This function is called from within arkcmp if the user requested
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/comexe/ComTdbSample.h
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComTdbSample.h b/core/sql/comexe/ComTdbSample.h
index 0927b8c..c6f584d 100644
--- a/core/sql/comexe/ComTdbSample.h
+++ b/core/sql/comexe/ComTdbSample.h
@@ -50,10 +50,8 @@ class ComTdbSample : public ComTdb
friend class ExSamplePrivateState;
public:
- NA_EIDPROC
ComTdbSample();
- NA_EIDPROC
ComTdbSample(ex_expr *initExpr,
ex_expr *balanceExpr,
Int32 returnFactorOffset,
@@ -64,51 +62,37 @@ public:
queue_index down,
queue_index up);
- NA_EIDPROC
~ComTdbSample();
// ---------------------------------------------------------------------
// Redefine virtual functions required for Versioning.
//----------------------------------------------------------------------
- NA_EIDPROC
virtual unsigned char getClassVersionID()
{
return 1;
}
- NA_EIDPROC
virtual void populateImageVersionIDArray()
{
setImageVersionID(1,getClassVersionID());
ComTdb::populateImageVersionIDArray();
}
- NA_EIDPROC
virtual short getClassSize() { return (short)sizeof(*this); }
- NA_EIDPROC
Long pack(void *);
- NA_EIDPROC
Lng32 unpack(void *, void * reallocator);
- NA_EIDPROC
void display() const;
- NA_EIDPROC
inline ComTdb * getChildTdb();
- NA_EIDPROC
Int32 orderedQueueProtocol() const;
- NA_EIDPROC
virtual const ComTdb* getChild(Int32 pos) const;
- NA_EIDPROC
virtual Int32 numChildren() const { return 1; }
- NA_EIDPROC
virtual const char *getNodeName() const { return "EX_SAMPLE"; };
- NA_EIDPROC
virtual Int32 numExpressions() const { return 3; }
- NA_EIDPROC
virtual ex_expr* getExpressionNode(Int32 pos) {
if (pos == 0)
return initExpr_;
@@ -119,7 +103,6 @@ public:
else
return NULL;
}
- NA_EIDPROC
virtual const char * getExpressionName(Int32 pos) const {
if (pos == 0)
return "initExpr_";
@@ -146,7 +129,6 @@ protected:
char fillers_[36]; // 36-71
};
-NA_EIDPROC
inline ComTdb * ComTdbSample::getChildTdb(){
return tdbChild_;
};
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/comexe/ComTdbSequence.h
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComTdbSequence.h b/core/sql/comexe/ComTdbSequence.h
index 2107c96..447158b 100644
--- a/core/sql/comexe/ComTdbSequence.h
+++ b/core/sql/comexe/ComTdbSequence.h
@@ -47,10 +47,8 @@ class ComTdbSequence : public ComTdb
friend class ExSequencePrivateState;
public:
- NA_EIDPROC
ComTdbSequence();
- NA_EIDPROC
ComTdbSequence(ex_expr * sequenceExpr,
ex_expr * returnExpr,
ex_expr * postPred,
@@ -81,7 +79,6 @@ public:
NABoolean noOverflow,
ex_expr * partExpr);
- NA_EIDPROC
~ComTdbSequence();
// ---------------------------------------------------------------------
@@ -100,34 +97,24 @@ public:
virtual short getClassSize() { return (short)sizeof(*this); }
- NA_EIDPROC
Long pack(void *);
- NA_EIDPROC
Lng32 unpack(void *, void * reallocator);
- NA_EIDPROC
void display() const;
// ---------------------------------------------------------------------
// Used by the internal SHOWPLAN command to get attributes of a TDB.
// ---------------------------------------------------------------------
- NA_EIDPROC virtual void displayContents(Space *space,ULng32 flag);
+ virtual void displayContents(Space *space,ULng32 flag);
- NA_EIDPROC
inline ComTdb * getChildTdb();
- NA_EIDPROC
Int32 orderedQueueProtocol() const;
- NA_EIDPROC
virtual const ComTdb* getChild(Int32 pos) const;
- NA_EIDPROC
virtual Int32 numChildren() const { return 1; }
- NA_EIDPROC
virtual const char *getNodeName() const { return "EX_SEQUENCE_FUNCTION"; };
- NA_EIDPROC
virtual Int32 numExpressions() const { return 5; }
- NA_EIDPROC
virtual ex_expr* getExpressionNode(Int32 pos) {
if (pos == 0)
return sequenceExpr_;
@@ -189,25 +176,21 @@ public:
{
return maxRowsInOLAPBuffer_;
}
- NA_EIDPROC
Int32 getMinNumberOfOLAPBuffers() const
{
return minNumberOfOLAPBuffers_;
}
- NA_EIDPROC
Int32 getMaxNumberOfOLAPBuffers() const
{
return maxNumberOfOLAPBuffers_;
}
- NA_EIDPROC
Int32 getNumberOfWinOLAPBuffers() const
{
return numberOfWinOLAPBuffers_;
}
- NA_EIDPROC
Int32 getMinFollowing() const
{
return minFollowing_;
@@ -269,7 +252,6 @@ protected:
char fillers_[2]; // 102-103
};
-NA_EIDPROC
inline ComTdb * ComTdbSequence::getChildTdb(){
return tdbChild_;
};
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/comexe/ComTdbSort.h
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComTdbSort.h b/core/sql/comexe/ComTdbSort.h
index ab0fd64..15a64c3 100644
--- a/core/sql/comexe/ComTdbSort.h
+++ b/core/sql/comexe/ComTdbSort.h
@@ -120,7 +120,7 @@ public:
// ---------------------------------------------------------------------
// Used by the internal SHOWPLAN command to get attributes of a TDB.
// ---------------------------------------------------------------------
- NA_EIDPROC void displayContents(Space *space);
+ void displayContents(Space *space);
protected:
enum
@@ -338,7 +338,7 @@ public:
// ---------------------------------------------------------------------
// Used by the internal SHOWPLAN command to get attributes of a TDB.
// ---------------------------------------------------------------------
- NA_EIDPROC virtual void displayContents(Space *space,ULng32 flag);
+ virtual void displayContents(Space *space,ULng32 flag);
};
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/comexe/ComTdbSortGrby.cpp
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComTdbSortGrby.cpp b/core/sql/comexe/ComTdbSortGrby.cpp
index f35aa7e..f3932d1 100644
--- a/core/sql/comexe/ComTdbSortGrby.cpp
+++ b/core/sql/comexe/ComTdbSortGrby.cpp
@@ -119,7 +119,7 @@ Lng32 ComTdbSortGrby::unpack(void * base, void * reallocator)
if(havingExpr_.unpack(base, reallocator)) return -1;
return ComTdb::unpack(base, reallocator);
}
-NA_EIDPROC void ComTdbSortGrby::displayContents(Space * space,ULng32 flag)
+void ComTdbSortGrby::displayContents(Space * space,ULng32 flag)
{
ComTdb::displayContents(space,flag & 0xFFFFFFFE);
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/comexe/ComTdbSortGrby.h
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComTdbSortGrby.h b/core/sql/comexe/ComTdbSortGrby.h
index 4c0528f..c5b03ad 100644
--- a/core/sql/comexe/ComTdbSortGrby.h
+++ b/core/sql/comexe/ComTdbSortGrby.h
@@ -75,10 +75,8 @@ protected:
public:
// Constructor
-NA_EIDPROC
ComTdbSortGrby(); // dummy constructor. Used by 'unpack' routines.
-NA_EIDPROC
ComTdbSortGrby(ex_expr * aggr_expr,
ex_expr * grby_expr,
ex_expr * move_expr,
@@ -95,7 +93,6 @@ NA_EIDPROC
ULng32 buffer_size,
NABoolean tolerateNonFatalError);
-NA_EIDPROC
~ComTdbSortGrby();
AggrExpr * aggrExpr() { return (AggrExpr*)((ex_expr*)aggrExpr_); }
@@ -106,49 +103,36 @@ NA_EIDPROC
// ---------------------------------------------------------------------
// Redefine virtual functions required for Versioning.
//----------------------------------------------------------------------
-NA_EIDPROC
virtual unsigned char getClassVersionID()
{
return 1;
}
-NA_EIDPROC
virtual void populateImageVersionIDArray()
{
setImageVersionID(1,getClassVersionID());
ComTdb::populateImageVersionIDArray();
}
-NA_EIDPROC
virtual short getClassSize() { return (short)sizeof(ComTdbSortGrby); }
Long pack(void *);
-NA_EIDPROC
Lng32 unpack(void *, void * reallocator);
-NA_EIDPROC
void display() const;
-NA_EIDPROC
inline ComTdb * getChildTdb();
-NA_EIDPROC
Int32 orderedQueueProtocol() const;
// ---------------------------------------------------------------------
// Used by the internal SHOWPLAN command to get attributes of a TDB.
// ---------------------------------------------------------------------
-NA_EIDPROC
virtual void displayContents(Space *space,ULng32 flag);
-NA_EIDPROC
virtual const ComTdb* getChild(Int32 pos) const;
-NA_EIDPROC
virtual Int32 numChildren() const { return 1; }
-NA_EIDPROC
virtual const char *getNodeName() const { return "EX_SORT_GRBY"; };
-NA_EIDPROC
virtual Int32 numExpressions() const { return 4; }
-NA_EIDPROC
virtual ex_expr* getExpressionNode(Int32 pos) {
if (pos == 0)
return aggrExpr_;
@@ -161,7 +145,6 @@ NA_EIDPROC
else
return NULL;
}
-NA_EIDPROC
virtual const char * getExpressionName(Int32 pos) const {
if (pos == 0)
return "aggrExpr_";
@@ -181,7 +164,6 @@ NA_EIDPROC
};
-NA_EIDPROC
inline ComTdb * ComTdbSortGrby::getChildTdb(){
return tdbChild_;
};
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/comexe/ComTdbSplitTop.h
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComTdbSplitTop.h b/core/sql/comexe/ComTdbSplitTop.h
index b33c83e..e3ae493 100644
--- a/core/sql/comexe/ComTdbSplitTop.h
+++ b/core/sql/comexe/ComTdbSplitTop.h
@@ -123,7 +123,7 @@ public:
void display() const;
- NA_EIDPROC Int32 getBottomNumParts() {return bottomNumParts_;}
+ Int32 getBottomNumParts() {return bottomNumParts_;}
// for GUI
virtual const ComTdb* getChild(Int32 pos) const;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/comexe/ComTdbTranspose.h
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComTdbTranspose.h b/core/sql/comexe/ComTdbTranspose.h
index f000df9..3a95583 100644
--- a/core/sql/comexe/ComTdbTranspose.h
+++ b/core/sql/comexe/ComTdbTranspose.h
@@ -65,13 +65,11 @@ public:
// Used when unpacking the Transpose TDB. Used to get a pointer
// to the Virtual Method Table.
//
- NA_EIDPROC
ComTdbTranspose();
// Construct a copy of the given node.
// (This constructor does not seem to be used)
//
- NA_EIDPROC
ComTdbTranspose(const ComTdbTranspose *transposeTdb);
// Construct a new Transpose TDB.
@@ -130,7 +128,6 @@ public:
// unsigned long bufferSize
// IN: Recommended size for pool buffers.
//
- NA_EIDPROC
ComTdbTranspose(ComTdb * childTdb,
ex_expr ** transColExprs,
Int32 numTransExprs,
@@ -149,18 +146,18 @@ public:
// ---------------------------------------------------------------------
// Redefine virtual functions required for Versioning.
//----------------------------------------------------------------------
- NA_EIDPROC virtual unsigned char getClassVersionID()
+ virtual unsigned char getClassVersionID()
{
return 1;
}
- NA_EIDPROC virtual void populateImageVersionIDArray()
+ virtual void populateImageVersionIDArray()
{
setImageVersionID(1,getClassVersionID());
ComTdb::populateImageVersionIDArray();
}
- NA_EIDPROC virtual short getClassSize()
+ virtual short getClassSize()
{ return (short)sizeof(ComTdbTranspose); }
@@ -178,7 +175,6 @@ public:
// that can be reached from this TDB points to memory outside
// this space object.
//
- NA_EIDPROC
Long pack(void *);
// ComTdbTranspose::unpack() ---------------------------------------------
@@ -193,19 +189,16 @@ public:
// IN - The base address of the TDB fragment. Pointers are calculated
// by adding the offset to the base address (more or less).
//
- NA_EIDPROC
Lng32 unpack(void *, void * reallocator);
// ComTdbTranspose::Display() -----------------------------------------
// (Don't know why this is here. It does not seem to be virtual and
// on class seems to do anything for this method.)
//
- NA_EIDPROC
void display() const;
// Return a pointer to the child TBD of this transpose TDB.
//
- NA_EIDPROC
inline ComTdb * getChildTdb() { return childTdb_; }
// We are observing order queue protocol. Results from
@@ -215,14 +208,12 @@ public:
// Exclude this code from coverage analysis.
// This code could be deleted since it is the same as the base implementation.
// LCOV_EXCL_START
- NA_EIDPROC
Int32 orderedQueueProtocol() const { return -1; }
// LCOV_EXCL_STOP
// return a pointer to the specifed (by position) child TDB.
// Transpose has only one child.
//
- NA_EIDPROC
virtual const ComTdb *getChild(Int32 pos) const
{
if(pos == 0)
@@ -233,7 +224,6 @@ public:
// Return the number of children for this node.
// Transpose has one child.
//
- NA_EIDPROC
virtual Int32 numChildren() const { return 1; }
// Return the number of expression this node has.
@@ -241,7 +231,6 @@ public:
// There are numTransExprs_ transpose expressions, plus
// the afterTransPred_ selection predicate.
//
- NA_EIDPROC
virtual Int32 numExpressions() const
{
return numTransExprs_ + 1;
@@ -251,7 +240,6 @@ public:
// The transpose expressions come first, followed
// by the selection pred.
//
- NA_EIDPROC
virtual ex_expr * getExpressionNode(Int32 pos)
{
if(transColExprs_ && (pos >= 0) && (pos < numTransExprs_))
@@ -265,7 +253,6 @@ public:
// The transpose expressions come first, followed
// by the selection pred.
//
- NA_EIDPROC
virtual const char * getExpressionName(Int32 pos) const
{
if(transColExprs_ && (pos >= 0) && (pos < numTransExprs_))
@@ -283,7 +270,6 @@ public:
// Return the number of transpose expressions. Used by
// the Transpose TDB and TCB methods.
//
- NA_EIDPROC
Int32 numTransExprs() { return numTransExprs_; };
protected:
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/comexe/ComTdbTuple.h
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComTdbTuple.h b/core/sql/comexe/ComTdbTuple.h
index e845d43..1ecb285 100644
--- a/core/sql/comexe/ComTdbTuple.h
+++ b/core/sql/comexe/ComTdbTuple.h
@@ -52,10 +52,8 @@ public:
enum TupleTdbType {
LEAF_, NON_LEAF_ };
-NA_EIDPROC
ComTdbTuple();
-NA_EIDPROC
ComTdbTuple(TupleTdbType ttt,
Queue * tupleExprList,
const ULng32 tupleLen,
@@ -69,12 +67,10 @@ NA_EIDPROC
ULng32 bufferSize,
ex_expr *predExpr = NULL);
-NA_EIDPROC
~ComTdbTuple();
// LCOV_EXCL_START
// only derived class is used, see GenRelMisc.cpp
-NA_EIDPROC
Int32 orderedQueueProtocol() const
{
return -1;
@@ -83,29 +79,25 @@ NA_EIDPROC
// ---------------------------------------------------------------------
// Redefine virtual functions required for Versioning.
//----------------------------------------------------------------------
- NA_EIDPROC virtual unsigned char getClassVersionID()
+ virtual unsigned char getClassVersionID()
{
return 1;
}
- NA_EIDPROC virtual void populateImageVersionIDArray()
+ virtual void populateImageVersionIDArray()
{
setImageVersionID(1,getClassVersionID());
ComTdb::populateImageVersionIDArray();
}
- NA_EIDPROC virtual short getClassSize()
+ virtual short getClassSize()
{ return (short)sizeof(ComTdbTuple); }
-NA_EIDPROC
virtual Long pack (void *);
-NA_EIDPROC
virtual Lng32 unpack(void *, void * reallocator);
-NA_EIDPROC
void display() const;
-NA_EIDPROC
TupleTdbType getTupleType() { return (TupleTdbType)ttt_; }
virtual const ComTdb* getChild(Int32 pos) const
@@ -145,10 +137,8 @@ class ComTdbTupleLeaf: public ComTdbTuple
friend class ExTupleLeafPrivateState;
public:
-NA_EIDPROC
ComTdbTupleLeaf(){};
-NA_EIDPROC
ComTdbTupleLeaf(Queue * tupleExprList,
const ULng32 tupleLen,
const unsigned short tuppIndex,
@@ -165,18 +155,18 @@ NA_EIDPROC
// ---------------------------------------------------------------------
// Redefine virtual functions required for Versioning.
//----------------------------------------------------------------------
- NA_EIDPROC virtual unsigned char getClassVersionID()
+ virtual unsigned char getClassVersionID()
{
return 1;
}
- NA_EIDPROC virtual void populateImageVersionIDArray()
+ virtual void populateImageVersionIDArray()
{
setImageVersionID(2,getClassVersionID());
ComTdbTuple::populateImageVersionIDArray();
}
- NA_EIDPROC virtual short getClassSize()
+ virtual short getClassSize()
{ return (short)sizeof(ComTdbTupleLeaf); }
virtual Int32 numChildren() const { return 0; }
@@ -198,10 +188,8 @@ class ComTdbTupleNonLeaf : public ComTdbTuple
friend class ExTupleNonLeafPrivateState;
public:
-NA_EIDPROC
ComTdbTupleNonLeaf(){};
-NA_EIDPROC
ComTdbTupleNonLeaf(Queue * tupleExprList,
ComTdb* childTdb,
const ULng32 tupleLen,
@@ -218,23 +206,21 @@ NA_EIDPROC
// ---------------------------------------------------------------------
// Redefine virtual functions required for Versioning.
//----------------------------------------------------------------------
- NA_EIDPROC virtual unsigned char getClassVersionID()
+ virtual unsigned char getClassVersionID()
{
return 1;
}
- NA_EIDPROC virtual void populateImageVersionIDArray()
+ virtual void populateImageVersionIDArray()
{
setImageVersionID(2,getClassVersionID());
ComTdbTuple::populateImageVersionIDArray();
}
- NA_EIDPROC virtual short getClassSize()
+ virtual short getClassSize()
{ return (short)sizeof(ComTdbTupleNonLeaf); }
-NA_EIDPROC
virtual Long pack (void *);
-NA_EIDPROC
virtual Lng32 unpack(void *, void * reallocator);
virtual Int32 numChildren() const { return 1; }
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/comexe/ComTdbTupleFlow.cpp
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComTdbTupleFlow.cpp b/core/sql/comexe/ComTdbTupleFlow.cpp
index b1b7432..42641f9 100644
--- a/core/sql/comexe/ComTdbTupleFlow.cpp
+++ b/core/sql/comexe/ComTdbTupleFlow.cpp
@@ -127,7 +127,7 @@ const char * ComTdbTupleFlow::getExpressionName(Int32 pos) const
return NULL;
}
-NA_EIDPROC void ComTdbTupleFlow::displayContents(Space * space,ULng32 flag)
+void ComTdbTupleFlow::displayContents(Space * space,ULng32 flag)
{
ComTdb::displayContents(space,flag & 0xFFFFFFFE);
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/comexe/ComTdbTupleFlow.h
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComTdbTupleFlow.h b/core/sql/comexe/ComTdbTupleFlow.h
index 9932755..f277ab9 100644
--- a/core/sql/comexe/ComTdbTupleFlow.h
+++ b/core/sql/comexe/ComTdbTupleFlow.h
@@ -163,7 +163,7 @@ public:
// ---------------------------------------------------------------------
// Used by the internal SHOWPLAN command to get attributes of a TDB.
// ---------------------------------------------------------------------
- NA_EIDPROC virtual void displayContents(Space *space,ULng32 flag);
+ virtual void displayContents(Space *space,ULng32 flag);
};
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/comexe/ComTdbUdr.h
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComTdbUdr.h b/core/sql/comexe/ComTdbUdr.h
index 18dccb3..4bb4a88 100644
--- a/core/sql/comexe/ComTdbUdr.h
+++ b/core/sql/comexe/ComTdbUdr.h
@@ -235,7 +235,7 @@ public:
paramInfo_[i] = info;
}
- NA_EIDPROC inline const char *getSqlName() const { return sqlName_; }
+ inline const char *getSqlName() const { return sqlName_; }
inline const char *getRuntimeOptions() const { return runtimeOptions_; }
inline const char *getRuntimeOptionDelimiters() const
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/comexe/ComTdbUnPackRows.h
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComTdbUnPackRows.h b/core/sql/comexe/ComTdbUnPackRows.h
index 97d5cea..79d22dd 100644
--- a/core/sql/comexe/ComTdbUnPackRows.h
+++ b/core/sql/comexe/ComTdbUnPackRows.h
@@ -75,13 +75,11 @@ public:
// Used when unpacking the UnPackRows TDB. Used to get a pointer
// to the Virtual Method Table.
//
- NA_EIDPROC
ComTdbUnPackRows();
// Construct a copy of the given node.
// (This constructor does not seem to be used)
//
- NA_EIDPROC
ComTdbUnPackRows(const ComTdbUnPackRows *UnPackRowsTdb);
// Construct a new UnPackRows TDB.
@@ -137,7 +135,6 @@ public:
// IN: Used to set flags_ if nonfatal errors are tolerated.
//
- NA_EIDPROC
ComTdbUnPackRows(ComTdb *childTdb,
ex_expr *packingFactor,
ex_expr *unPackColsExpr,
@@ -171,18 +168,18 @@ public:
// ---------------------------------------------------------------------
// Redefine virtual functions required for Versioning.
//----------------------------------------------------------------------
- NA_EIDPROC virtual unsigned char getClassVersionID()
+ virtual unsigned char getClassVersionID()
{
return 1;
}
- NA_EIDPROC virtual void populateImageVersionIDArray()
+ virtual void populateImageVersionIDArray()
{
setImageVersionID(1,getClassVersionID());
ComTdb::populateImageVersionIDArray();
}
- NA_EIDPROC virtual short getClassSize()
+ virtual short getClassSize()
{ return (short)sizeof(ComTdbUnPackRows); }
// ComTdbUnPackRows::pack() ---------------------------------------------
@@ -200,7 +197,6 @@ public:
// that can be reached from this TDB points to memory outside
// this space object.
//
- NA_EIDPROC
Long pack(void *);
// ComTdbUnPackRows::unpack() ---------------------------------------------
@@ -215,7 +211,6 @@ public:
// IN - The base address of the TDB fragment. Pointers are calculated
// by adding the offset to the base address (more or less).
//
- NA_EIDPROC
Lng32 unpack(void *, void * reallocator);
// methods used for rowwise rowset processing
@@ -228,12 +223,10 @@ public:
// (Don't know why this is here. It does not seem to be virtual and
// on class seems to do anything for this method.)
//
- NA_EIDPROC
void display() const;
// Return a pointer to the child TBD of this UnPackRows TDB.
//
- NA_EIDPROC
inline ComTdb * getChildTdb() { return childTdb_; }
// We are observing order queue protocol. Results from
@@ -243,14 +236,12 @@ public:
// Exclude this code from coverage analysis.
// This code could be deleted since it is the same as the base implementation.
// LCOV_EXCL_START
- NA_EIDPROC
Int32 orderedQueueProtocol() const { return -1; }
// LCOV_EXCL_STOP
// return a pointer to the specifed (by position) child TDB.
// UnPackRows has only one child.
//
- NA_EIDPROC
virtual const ComTdb *getChild(Int32 pos) const
{
if(pos == 0)
@@ -261,12 +252,10 @@ public:
// Return the number of children for this node.
// UnPackRows has one child.
//
- NA_EIDPROC
virtual Int32 numChildren() const { return (childTdb_ ? 1 : 0); }
// Return the number of expression this node has.
//
- NA_EIDPROC
virtual Int32 numExpressions() const
{
if (rowwiseRowset())
@@ -279,7 +268,6 @@ public:
// The UnPackRows expressions come first, followed
// by the selection pred.
//
- NA_EIDPROC
virtual ex_expr * getExpressionNode(Int32 pos)
{
switch(pos) {
@@ -307,7 +295,6 @@ public:
// The UnPackRows expressions come first, followed
// by the selection pred.
//
- NA_EIDPROC
virtual const char * getExpressionName(Int32 pos) const
{
switch(pos) {
@@ -336,15 +323,12 @@ public:
return "EX_UNPACK_ROWS";
}
- NA_EIDPROC
short isRowsetIterator()
{ return short(flags_ & ROWSET_ITERATOR);}
- NA_EIDPROC
NABoolean rowwiseRowset()
{ return (flags_ & ROWWISE_ROWSET) != 0;}
- NA_EIDPROC
NABoolean rowwiseRowset() const
{ return (flags_ & ROWWISE_ROWSET) != 0;}
@@ -354,7 +338,7 @@ public:
// ---------------------------------------------------------------------
// Used by the internal SHOWPLAN command to get attributes of a TDB.
// ---------------------------------------------------------------------
- NA_EIDPROC void displayContents(Space *space, ULng32 flag);
+ void displayContents(Space *space, ULng32 flag);
protected:
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/comexe/ComTdbUnion.cpp
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComTdbUnion.cpp b/core/sql/comexe/ComTdbUnion.cpp
index 0cf1edf..8b123c8 100644
--- a/core/sql/comexe/ComTdbUnion.cpp
+++ b/core/sql/comexe/ComTdbUnion.cpp
@@ -225,7 +225,7 @@ const char * ComTdbUnion::getExpressionName(Int32 pos) const
return NULL;
}
-NA_EIDPROC void ComTdbUnion::displayContents(Space * space,ULng32 flag)
+void ComTdbUnion::displayContents(Space * space,ULng32 flag)
{
ComTdb::displayContents(space,flag & 0xFFFFFFFE);
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/comexe/ComTdbUnion.h
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComTdbUnion.h b/core/sql/comexe/ComTdbUnion.h
index 83026b7..9dcbda8 100644
--- a/core/sql/comexe/ComTdbUnion.h
+++ b/core/sql/comexe/ComTdbUnion.h
@@ -122,20 +122,16 @@ public:
// ---------------------------------------------------------------------
// Used by the internal SHOWPLAN command to get attributes of a TDB.
// ---------------------------------------------------------------------
- NA_EIDPROC virtual void displayContents(Space *space,ULng32 flag);
+ virtual void displayContents(Space *space,ULng32 flag);
- NA_EIDPROC
inline NABoolean expectingLeftRows() const
{ return (csErrFlags_ & ROWS_FROM_LEFT) != 0; }
- NA_EIDPROC
inline NABoolean expectingRightRows() const
{ return (csErrFlags_ & ROWS_FROM_RIGHT) != 0; }
- NA_EIDPROC
inline NABoolean afterUpdate() const
{ return (csErrFlags_ & AFTER_UPDATE) != 0; }
- NA_EIDPROC
inline NABoolean inNotAtomicStmt() const { return (flags_ & IN_NOT_ATOMIC_STMT) != 0; }
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/comexe/HashBufferHeader.h
----------------------------------------------------------------------
diff --git a/core/sql/comexe/HashBufferHeader.h b/core/sql/comexe/HashBufferHeader.h
index d241478..0d7a73e 100644
--- a/core/sql/comexe/HashBufferHeader.h
+++ b/core/sql/comexe/HashBufferHeader.h
@@ -49,15 +49,10 @@ class HashBufferHeader {
friend class HashBuffer;
friend class HashBufferSerial;
private:
-NA_EIDPROC
HashBufferHeader();
-NA_EIDPROC
~HashBufferHeader() {};
-NA_EIDPROC
inline ULng32 getRowCount() const;
-NA_EIDPROC
inline void setRowCount(ULng32 rowCount);
-NA_EIDPROC
inline void incRowCount();
ULng32 rowCount_; // # rows in buffer (pointer to next free row)
@@ -72,17 +67,14 @@ NA_EIDPROC
// inline functions of HashBufferHeader
/////////////////////////////////////////////////////////////////////////////
-NA_EIDPROC
inline ULng32 HashBufferHeader::getRowCount() const {
return rowCount_;
};
-NA_EIDPROC
inline void HashBufferHeader::setRowCount(ULng32 rowCount) {
rowCount_ = rowCount;
};
-NA_EIDPROC
inline void HashBufferHeader::incRowCount() {
rowCount_++;
};
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/comexe/HashRow.h
----------------------------------------------------------------------
diff --git a/core/sql/comexe/HashRow.h b/core/sql/comexe/HashRow.h
index c3afa36..be48431 100644
--- a/core/sql/comexe/HashRow.h
+++ b/core/sql/comexe/HashRow.h
@@ -54,48 +54,34 @@ class HashRow {
friend class HashTable;
friend class HashBufferSerial;
public:
-NA_EIDPROC
inline HashRow() {};
-NA_EIDPROC
inline ~HashRow() {};
-NA_EIDPROC
void print(ULng32 rowlength);
-NA_EIDPROC
inline SimpleHashValue hashValue() const { return hashValue_ & MASK31; }
// Return the raw hash value (no masking)
- NA_EIDPROC
inline SimpleHashValue hashValueRaw() const { return hashValue_; }
-NA_EIDPROC
inline void setHashValue(SimpleHashValue hv) { hashValue_ = hv & MASK31; }
// Set the hash value to the raw hash value (no masking)
- NA_EIDPROC
inline void setHashValueRaw(SimpleHashValue hv) { hashValue_ = hv; }
-NA_EIDPROC
inline NABoolean bitSet() const { return ((hashValue_ & ~MASK31) != 0L) ; }
-NA_EIDPROC
inline void setBit(NABoolean val)
{ if ( val ) hashValue_ |= ~MASK31 ; else hashValue_ &= MASK31 ;}
-NA_EIDPROC
inline void setNext (HashRow *next) {next_ = next;}
-NA_EIDPROC
inline HashRow *next() const {return next_;}
-NA_EIDPROC
inline char *getData() const {
return ((char *)this) + sizeof(HashRow);
}
-NA_EIDPROC
inline UInt32 getRowLength() const {
return *((UInt32 *)getData());
}
private:
-NA_EIDPROC
inline void setRowLength(UInt32 rowLen) {
*((UInt32 *)getData()) = rowLen;
}
[17/30] incubator-trafodion git commit: TRAFODION-2731 CodeCleanup:
Remove obsolete, legacy and unused code
Posted by an...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/ExExeUtil.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExExeUtil.h b/core/sql/executor/ExExeUtil.h
index 07d3b22..76ccfe2 100644
--- a/core/sql/executor/ExExeUtil.h
+++ b/core/sql/executor/ExExeUtil.h
@@ -109,16 +109,16 @@ class ExExeUtilTdb : public ComTdbExeUtil
// retrieval of the virtual table function pointer of the class while
// unpacking. An empty constructor is enough.
// ---------------------------------------------------------------------
- NA_EIDPROC ExExeUtilTdb()
+ ExExeUtilTdb()
{}
- NA_EIDPROC virtual ~ExExeUtilTdb()
+ virtual ~ExExeUtilTdb()
{}
// ---------------------------------------------------------------------
// Build a TCB for this TDB. Redefined in the Executor project.
// ---------------------------------------------------------------------
- NA_EIDPROC virtual ex_tcb *build(ex_globals *globals);
+ virtual ex_tcb *build(ex_globals *globals);
private:
// ---------------------------------------------------------------------
@@ -419,8 +419,7 @@ private:
NABoolean restoreTimeout_;
- AnsiOrNskName *extractedPartsObj_;
-
+ AnsiName *extractedPartsObj_;
Int64 startTime_;
Int64 endTime_;
@@ -463,16 +462,16 @@ class ExExeUtilDisplayExplainTdb : public ComTdbExeUtilDisplayExplain
// retrieval of the virtual table function pointer of the class while
// unpacking. An empty constructor is enough.
// ---------------------------------------------------------------------
- NA_EIDPROC ExExeUtilDisplayExplainTdb()
+ ExExeUtilDisplayExplainTdb()
{}
- NA_EIDPROC virtual ~ExExeUtilDisplayExplainTdb()
+ virtual ~ExExeUtilDisplayExplainTdb()
{}
// ---------------------------------------------------------------------
// Build a TCB for this TDB. Redefined in the Executor project.
// ---------------------------------------------------------------------
- NA_EIDPROC virtual ex_tcb *build(ex_globals *globals);
+ virtual ex_tcb *build(ex_globals *globals);
private:
// ---------------------------------------------------------------------
@@ -521,7 +520,7 @@ class ExExeUtilDisplayExplainTcb : public ExExeUtilTcb
virtual short work();
- NA_EIDPROC virtual ex_tcb_private_state * allocatePstates(
+ virtual ex_tcb_private_state * allocatePstates(
Lng32 &numElems, // inout, desired/actual elements
Lng32 &pstateLength); // out, length of one element
@@ -669,16 +668,16 @@ class ExExeUtilDisplayExplainComplexTdb : public ComTdbExeUtilDisplayExplainComp
// retrieval of the virtual table function pointer of the class while
// unpacking. An empty constructor is enough.
// ---------------------------------------------------------------------
- NA_EIDPROC ExExeUtilDisplayExplainComplexTdb()
+ ExExeUtilDisplayExplainComplexTdb()
{}
- NA_EIDPROC virtual ~ExExeUtilDisplayExplainComplexTdb()
+ virtual ~ExExeUtilDisplayExplainComplexTdb()
{}
// ---------------------------------------------------------------------
// Build a TCB for this TDB. Redefined in the Executor project.
// ---------------------------------------------------------------------
- NA_EIDPROC virtual ex_tcb *build(ex_globals *globals);
+ virtual ex_tcb *build(ex_globals *globals);
private:
// ---------------------------------------------------------------------
@@ -727,7 +726,7 @@ class ExExeUtilDisplayExplainComplexTcb : public ExExeUtilTcb
virtual short work();
- NA_EIDPROC virtual ex_tcb_private_state *
+ virtual ex_tcb_private_state *
allocatePstates(
Lng32 &numElems, // inout, desired/actual elements
Lng32 &pstateLength); // out, length of one element
@@ -784,7 +783,7 @@ class ExExeUtilDisplayExplainShowddlTcb : public ExExeUtilTcb
virtual short work();
- NA_EIDPROC virtual ex_tcb_private_state *
+ virtual ex_tcb_private_state *
allocatePstates(
Lng32 &numElems, // inout, desired/actual elements
Lng32 &pstateLength); // out, length of one element
@@ -833,16 +832,16 @@ class ExExeUtilCreateTableAsTdb : public ComTdbExeUtilCreateTableAs
// retrieval of the virtual table function pointer of the class while
// unpacking. An empty constructor is enough.
// ---------------------------------------------------------------------
- NA_EIDPROC ExExeUtilCreateTableAsTdb()
+ ExExeUtilCreateTableAsTdb()
{}
- NA_EIDPROC virtual ~ExExeUtilCreateTableAsTdb()
+ virtual ~ExExeUtilCreateTableAsTdb()
{}
// ---------------------------------------------------------------------
// Build a TCB for this TDB. Redefined in the Executor project.
// ---------------------------------------------------------------------
- NA_EIDPROC virtual ex_tcb *build(ex_globals *globals);
+ virtual ex_tcb *build(ex_globals *globals);
private:
// ---------------------------------------------------------------------
@@ -889,7 +888,7 @@ class ExExeUtilCreateTableAsTcb : public ExExeUtilTcb
return (ExExeUtilCreateTableAsTdb &) tdb;
};
- NA_EIDPROC virtual ex_tcb_private_state * allocatePstates(
+ virtual ex_tcb_private_state * allocatePstates(
Lng32 &numElems, // inout, desired/actual elements
Lng32 &pstateLength); // out, length of one element
@@ -944,16 +943,16 @@ class ExExeUtilCleanupVolatileTablesTdb : public ComTdbExeUtilCleanupVolatileTab
// retrieval of the virtual table function pointer of the class while
// unpacking. An empty constructor is enough.
// ---------------------------------------------------------------------
- NA_EIDPROC ExExeUtilCleanupVolatileTablesTdb()
+ ExExeUtilCleanupVolatileTablesTdb()
{}
- NA_EIDPROC virtual ~ExExeUtilCleanupVolatileTablesTdb()
+ virtual ~ExExeUtilCleanupVolatileTablesTdb()
{}
// ---------------------------------------------------------------------
// Build a TCB for this TDB. Redefined in the Executor project.
// ---------------------------------------------------------------------
- NA_EIDPROC virtual ex_tcb *build(ex_globals *globals);
+ virtual ex_tcb *build(ex_globals *globals);
private:
// ---------------------------------------------------------------------
@@ -1074,16 +1073,16 @@ class ExExeUtilGetVolatileInfoTdb : public ComTdbExeUtilGetVolatileInfo
// retrieval of the virtual table function pointer of the class while
// unpacking. An empty constructor is enough.
// ---------------------------------------------------------------------
- NA_EIDPROC ExExeUtilGetVolatileInfoTdb()
+ ExExeUtilGetVolatileInfoTdb()
{}
- NA_EIDPROC virtual ~ExExeUtilGetVolatileInfoTdb()
+ virtual ~ExExeUtilGetVolatileInfoTdb()
{}
// ---------------------------------------------------------------------
// Build a TCB for this TDB. Redefined in the Executor project.
// ---------------------------------------------------------------------
- NA_EIDPROC virtual ex_tcb *build(ex_globals *globals);
+ virtual ex_tcb *build(ex_globals *globals);
private:
// ---------------------------------------------------------------------
@@ -1169,16 +1168,16 @@ class ExExeUtilGetErrorInfoTdb : public ComTdbExeUtilGetErrorInfo
// retrieval of the virtual table function pointer of the class while
// unpacking. An empty constructor is enough.
// ---------------------------------------------------------------------
- NA_EIDPROC ExExeUtilGetErrorInfoTdb()
+ ExExeUtilGetErrorInfoTdb()
{}
- NA_EIDPROC virtual ~ExExeUtilGetErrorInfoTdb()
+ virtual ~ExExeUtilGetErrorInfoTdb()
{}
// ---------------------------------------------------------------------
// Build a TCB for this TDB. Redefined in the Executor project.
// ---------------------------------------------------------------------
- NA_EIDPROC virtual ex_tcb *build(ex_globals *globals);
+ virtual ex_tcb *build(ex_globals *globals);
private:
// ---------------------------------------------------------------------
@@ -1272,16 +1271,16 @@ class ExExeUtilLoadVolatileTableTdb : public ComTdbExeUtilLoadVolatileTable
// retrieval of the virtual table function pointer of the class while
// unpacking. An empty constructor is enough.
// ---------------------------------------------------------------------
- NA_EIDPROC ExExeUtilLoadVolatileTableTdb()
+ ExExeUtilLoadVolatileTableTdb()
{}
- NA_EIDPROC virtual ~ExExeUtilLoadVolatileTableTdb()
+ virtual ~ExExeUtilLoadVolatileTableTdb()
{}
// ---------------------------------------------------------------------
// Build a TCB for this TDB. Redefined in the Executor project.
// ---------------------------------------------------------------------
- NA_EIDPROC virtual ex_tcb *build(ex_globals *globals);
+ virtual ex_tcb *build(ex_globals *globals);
private:
// ---------------------------------------------------------------------
@@ -1369,16 +1368,16 @@ class ExExeUtilFastDeleteTdb : public ComTdbExeUtilFastDelete
// retrieval of the virtual table function pointer of the class while
// unpacking. An empty constructor is enough.
// ---------------------------------------------------------------------
- NA_EIDPROC ExExeUtilFastDeleteTdb()
+ ExExeUtilFastDeleteTdb()
{}
- NA_EIDPROC virtual ~ExExeUtilFastDeleteTdb()
+ virtual ~ExExeUtilFastDeleteTdb()
{}
// ---------------------------------------------------------------------
// Build a TCB for this TDB. Redefined in the Executor project.
// ---------------------------------------------------------------------
- NA_EIDPROC virtual ex_tcb *build(ex_globals *globals);
+ virtual ex_tcb *build(ex_globals *globals);
private:
// ---------------------------------------------------------------------
@@ -1422,7 +1421,7 @@ class ExExeUtilFastDeleteTcb : public ExExeUtilTcb
virtual short work();
- NA_EIDPROC virtual ex_tcb_private_state * allocatePstates(
+ virtual ex_tcb_private_state * allocatePstates(
Lng32 &numElems, // inout, desired/actual elements
Lng32 &pstateLength); // out, length of one element
@@ -1505,16 +1504,16 @@ public:
// retrieval of the virtual table function pointer of the class while
// unpacking. An empty constructor is enough.
// ---------------------------------------------------------------------
- NA_EIDPROC ExExeUtilGetStatisticsTdb()
+ ExExeUtilGetStatisticsTdb()
{}
- NA_EIDPROC virtual ~ExExeUtilGetStatisticsTdb()
+ virtual ~ExExeUtilGetStatisticsTdb()
{}
// ---------------------------------------------------------------------
// Build a TCB for this TDB. Redefined in the Executor project.
// ---------------------------------------------------------------------
- NA_EIDPROC virtual ex_tcb *build(ex_globals *globals);
+ virtual ex_tcb *build(ex_globals *globals);
private:
// ---------------------------------------------------------------------
@@ -1563,7 +1562,7 @@ public:
virtual short work();
- NA_EIDPROC virtual ex_tcb_private_state * allocatePstates(
+ virtual ex_tcb_private_state * allocatePstates(
Lng32 &numElems, // inout, desired/actual elements
Lng32 &pstateLength); // out, length of one element
@@ -1635,16 +1634,16 @@ public:
// retrieval of the virtual table function pointer of the class while
// unpacking. An empty constructor is enough.
// ---------------------------------------------------------------------
- NA_EIDPROC ExExeUtilGetProcessStatisticsTdb()
+ ExExeUtilGetProcessStatisticsTdb()
{}
- NA_EIDPROC virtual ~ExExeUtilGetProcessStatisticsTdb()
+ virtual ~ExExeUtilGetProcessStatisticsTdb()
{}
// ---------------------------------------------------------------------
// Build a TCB for this TDB. Redefined in the Executor project.
// ---------------------------------------------------------------------
- NA_EIDPROC virtual ex_tcb *build(ex_globals *globals);
+ virtual ex_tcb *build(ex_globals *globals);
private:
};
@@ -1663,16 +1662,16 @@ public:
// retrieval of the virtual table function pointer of the class while
// unpacking. An empty constructor is enough.
// ---------------------------------------------------------------------
- NA_EIDPROC ExExeUtilGetUIDTdb()
+ ExExeUtilGetUIDTdb()
{}
- NA_EIDPROC virtual ~ExExeUtilGetUIDTdb()
+ virtual ~ExExeUtilGetUIDTdb()
{}
// ---------------------------------------------------------------------
// Build a TCB for this TDB. Redefined in the Executor project.
// ---------------------------------------------------------------------
- NA_EIDPROC virtual ex_tcb *build(ex_globals *globals);
+ virtual ex_tcb *build(ex_globals *globals);
private:
// ---------------------------------------------------------------------
@@ -1720,7 +1719,7 @@ public:
virtual short work();
- NA_EIDPROC virtual ex_tcb_private_state * allocatePstates(
+ virtual ex_tcb_private_state * allocatePstates(
Lng32 &numElems, // inout, desired/actual elements
Lng32 &pstateLength); // out, length of one element
@@ -1764,16 +1763,16 @@ public:
// retrieval of the virtual table function pointer of the class while
// unpacking. An empty constructor is enough.
// ---------------------------------------------------------------------
- NA_EIDPROC ExExeUtilGetQIDTdb()
+ ExExeUtilGetQIDTdb()
{}
- NA_EIDPROC virtual ~ExExeUtilGetQIDTdb()
+ virtual ~ExExeUtilGetQIDTdb()
{}
// ---------------------------------------------------------------------
// Build a TCB for this TDB. Redefined in the Executor project.
// ---------------------------------------------------------------------
- NA_EIDPROC virtual ex_tcb *build(ex_globals *globals);
+ virtual ex_tcb *build(ex_globals *globals);
private:
// ---------------------------------------------------------------------
@@ -1821,7 +1820,7 @@ public:
virtual short work();
- NA_EIDPROC virtual ex_tcb_private_state * allocatePstates(
+ virtual ex_tcb_private_state * allocatePstates(
Lng32 &numElems, // inout, desired/actual elements
Lng32 &pstateLength); // out, length of one element
@@ -1865,16 +1864,16 @@ public:
// retrieval of the virtual table function pointer of the class while
// unpacking. An empty constructor is enough.
// ---------------------------------------------------------------------
- NA_EIDPROC ExExeUtilPopulateInMemStatsTdb()
+ ExExeUtilPopulateInMemStatsTdb()
{}
- NA_EIDPROC virtual ~ExExeUtilPopulateInMemStatsTdb()
+ virtual ~ExExeUtilPopulateInMemStatsTdb()
{}
// ---------------------------------------------------------------------
// Build a TCB for this TDB. Redefined in the Executor project.
// ---------------------------------------------------------------------
- NA_EIDPROC virtual ex_tcb *build(ex_globals *globals);
+ virtual ex_tcb *build(ex_globals *globals);
private:
// ---------------------------------------------------------------------
@@ -1922,7 +1921,7 @@ public:
virtual short work();
- NA_EIDPROC virtual ex_tcb_private_state * allocatePstates(
+ virtual ex_tcb_private_state * allocatePstates(
Lng32 &numElems, // inout, desired/actual elements
Lng32 &pstateLength); // out, length of one element
@@ -1972,16 +1971,16 @@ public:
// retrieval of the virtual table function pointer of the class while
// unpacking. An empty constructor is enough.
// ---------------------------------------------------------------------
- NA_EIDPROC ExExeUtilAqrWnrInsertTdb()
+ ExExeUtilAqrWnrInsertTdb()
{}
- NA_EIDPROC virtual ~ExExeUtilAqrWnrInsertTdb()
+ virtual ~ExExeUtilAqrWnrInsertTdb()
{}
// ---------------------------------------------------------------------
// Build a TCB for this TDB. Redefined in the Executor project.
// ---------------------------------------------------------------------
- NA_EIDPROC virtual ex_tcb *build(ex_globals *globals);
+ virtual ex_tcb *build(ex_globals *globals);
private:
// ---------------------------------------------------------------------
@@ -2067,16 +2066,16 @@ public:
// retrieval of the virtual table function pointer of the class while
// unpacking. An empty constructor is enough.
// ---------------------------------------------------------------------
- NA_EIDPROC ExExeUtilLongRunningTdb()
+ ExExeUtilLongRunningTdb()
{}
- NA_EIDPROC virtual ~ExExeUtilLongRunningTdb()
+ virtual ~ExExeUtilLongRunningTdb()
{}
// ---------------------------------------------------------------------
// Build a TCB for this TDB. Redefined in the Executor project.
// ---------------------------------------------------------------------
- NA_EIDPROC virtual ex_tcb *build(ex_globals *globals);
+ virtual ex_tcb *build(ex_globals *globals);
private:
// ---------------------------------------------------------------------
@@ -2123,7 +2122,7 @@ public:
virtual short work();
- NA_EIDPROC virtual ex_tcb_private_state * allocatePstates(
+ virtual ex_tcb_private_state * allocatePstates(
Lng32 &numElems, // inout, desired/actual elements
Lng32 &pstateLength); // out, length of one element
@@ -2208,7 +2207,7 @@ public:
virtual short work();
- NA_EIDPROC virtual ex_tcb_private_state * allocatePstates(
+ virtual ex_tcb_private_state * allocatePstates(
Lng32 &numElems, // inout, desired/actual elements
Lng32 &pstateLength); // out, length of one element
@@ -2349,16 +2348,16 @@ public:
// retrieval of the virtual table function pointer of the class while
// unpacking. An empty constructor is enough.
// ---------------------------------------------------------------------
- NA_EIDPROC ExExeUtilGetMetadataInfoTdb()
+ ExExeUtilGetMetadataInfoTdb()
{}
- NA_EIDPROC virtual ~ExExeUtilGetMetadataInfoTdb()
+ virtual ~ExExeUtilGetMetadataInfoTdb()
{}
// ---------------------------------------------------------------------
// Build a TCB for this TDB. Redefined in the Executor project.
// ---------------------------------------------------------------------
- NA_EIDPROC virtual ex_tcb *build(ex_globals *globals);
+ virtual ex_tcb *build(ex_globals *globals);
private:
// ---------------------------------------------------------------------
@@ -2406,7 +2405,7 @@ public:
virtual short work();
- NA_EIDPROC virtual ex_tcb_private_state * allocatePstates(
+ virtual ex_tcb_private_state * allocatePstates(
Lng32 &numElems, // inout, desired/actual elements
Lng32 &pstateLength); // out, length of one element
@@ -2601,16 +2600,16 @@ public:
// retrieval of the virtual table function pointer of the class while
// unpacking. An empty constructor is enough.
// ---------------------------------------------------------------------
- NA_EIDPROC ExExeUtilGetHiveMetadataInfoTdb()
+ ExExeUtilGetHiveMetadataInfoTdb()
{}
- NA_EIDPROC virtual ~ExExeUtilGetHiveMetadataInfoTdb()
+ virtual ~ExExeUtilGetHiveMetadataInfoTdb()
{}
// ---------------------------------------------------------------------
// Build a TCB for this TDB. Redefined in the Executor project.
// ---------------------------------------------------------------------
- NA_EIDPROC virtual ex_tcb *build(ex_globals *globals);
+ virtual ex_tcb *build(ex_globals *globals);
private:
// ---------------------------------------------------------------------
@@ -2701,16 +2700,16 @@ class ExExeUtilShowSetTdb : public ComTdbExeUtilShowSet
// retrieval of the virtual table function pointer of the class while
// unpacking. An empty constructor is enough.
// ---------------------------------------------------------------------
- NA_EIDPROC ExExeUtilShowSetTdb()
+ ExExeUtilShowSetTdb()
{}
- NA_EIDPROC virtual ~ExExeUtilShowSetTdb()
+ virtual ~ExExeUtilShowSetTdb()
{}
// ---------------------------------------------------------------------
// Build a TCB for this TDB. Redefined in the Executor project.
// ---------------------------------------------------------------------
- NA_EIDPROC virtual ex_tcb *build(ex_globals *globals);
+ virtual ex_tcb *build(ex_globals *globals);
private:
// ---------------------------------------------------------------------
@@ -2788,16 +2787,16 @@ class ExExeUtilAQRTdb : public ComTdbExeUtilAQR
// retrieval of the virtual table function pointer of the class while
// unpacking. An empty constructor is enough.
// ---------------------------------------------------------------------
- NA_EIDPROC ExExeUtilAQRTdb()
+ ExExeUtilAQRTdb()
{}
- NA_EIDPROC virtual ~ExExeUtilAQRTdb()
+ virtual ~ExExeUtilAQRTdb()
{}
// ---------------------------------------------------------------------
// Build a TCB for this TDB. Redefined in the Executor project.
// ---------------------------------------------------------------------
- NA_EIDPROC virtual ex_tcb *build(ex_globals *globals);
+ virtual ex_tcb *build(ex_globals *globals);
private:
// ---------------------------------------------------------------------
@@ -2876,16 +2875,16 @@ class ExExeUtilLobExtractTdb : public ComTdbExeUtilLobExtract
// retrieval of the virtual table function pointer of the class while
// unpacking. An empty constructor is enough.
// ---------------------------------------------------------------------
- NA_EIDPROC ExExeUtilLobExtractTdb()
+ ExExeUtilLobExtractTdb()
{}
- NA_EIDPROC virtual ~ExExeUtilLobExtractTdb()
+ virtual ~ExExeUtilLobExtractTdb()
{}
// ---------------------------------------------------------------------
// Build a TCB for this TDB. Redefined in the Executor project.
// ---------------------------------------------------------------------
- NA_EIDPROC virtual ex_tcb *build(ex_globals *globals);
+ virtual ex_tcb *build(ex_globals *globals);
private:
// ---------------------------------------------------------------------
@@ -3006,17 +3005,17 @@ class ExExeUtilLobUpdateTdb : public ComTdbExeUtilLobUpdate
// retrieval of the virtual table function pointer of the class while
// unpacking. An empty constructor is enough.
// ---------------------------------------------------------------------
- NA_EIDPROC ExExeUtilLobUpdateTdb()
+ ExExeUtilLobUpdateTdb()
{}
- NA_EIDPROC virtual ~ExExeUtilLobUpdateTdb()
+ virtual ~ExExeUtilLobUpdateTdb()
{}
// ---------------------------------------------------------------------
// Build a TCB for this TDB. Redefined in the Executor project.
// ---------------------------------------------------------------------
- NA_EIDPROC virtual ex_tcb *build(ex_globals *globals);
+ virtual ex_tcb *build(ex_globals *globals);
private:
};
@@ -3135,16 +3134,16 @@ class ExExeUtilLobShowddlTdb : public ComTdbExeUtilLobShowddl
// retrieval of the virtual table function pointer of the class while
// unpacking. An empty constructor is enough.
// ---------------------------------------------------------------------
- NA_EIDPROC ExExeUtilLobShowddlTdb()
+ ExExeUtilLobShowddlTdb()
{}
- NA_EIDPROC virtual ~ExExeUtilLobShowddlTdb()
+ virtual ~ExExeUtilLobShowddlTdb()
{}
// ---------------------------------------------------------------------
// Build a TCB for this TDB. Redefined in the Executor project.
// ---------------------------------------------------------------------
- NA_EIDPROC virtual ex_tcb *build(ex_globals *globals);
+ virtual ex_tcb *build(ex_globals *globals);
private:
// ---------------------------------------------------------------------
@@ -3278,16 +3277,16 @@ public:
// retrieval of the virtual table function pointer of the class while
// unpacking. An empty constructor is enough.
// ---------------------------------------------------------------------
- NA_EIDPROC ExExeUtilHiveMDaccessTdb()
+ ExExeUtilHiveMDaccessTdb()
{}
- NA_EIDPROC virtual ~ExExeUtilHiveMDaccessTdb()
+ virtual ~ExExeUtilHiveMDaccessTdb()
{}
// ---------------------------------------------------------------------
// Build a TCB for this TDB. Redefined in the Executor project.
// ---------------------------------------------------------------------
- NA_EIDPROC virtual ex_tcb *build(ex_globals *globals);
+ virtual ex_tcb *build(ex_globals *globals);
private:
// ---------------------------------------------------------------------
@@ -3340,7 +3339,7 @@ public:
return (ExExeUtilHiveMDaccessTdb &) tdb;
};
-NA_EIDPROC virtual ex_tcb_private_state *
+virtual ex_tcb_private_state *
allocatePstates(
Lng32 &numElems, // inout, desired/actual elements
Lng32 &pstateLength); // out, length of one element
@@ -3412,16 +3411,16 @@ class ExExeUtilHiveTruncateTdb : public ComTdbExeUtilHiveTruncate
// retrieval of the virtual table function pointer of the class while
// unpacking. An empty constructor is enough.
// ---------------------------------------------------------------------
- NA_EIDPROC ExExeUtilHiveTruncateTdb()
+ ExExeUtilHiveTruncateTdb()
{}
- NA_EIDPROC virtual ~ExExeUtilHiveTruncateTdb()
+ virtual ~ExExeUtilHiveTruncateTdb()
{}
// ---------------------------------------------------------------------
// Build a TCB for this TDB. Redefined in the Executor project.
// ---------------------------------------------------------------------
- NA_EIDPROC virtual ex_tcb *build(ex_globals *globals);
+ virtual ex_tcb *build(ex_globals *globals);
private:
// ---------------------------------------------------------------------
@@ -3466,7 +3465,7 @@ class ExExeUtilHiveTruncateTcb : public ExExeUtilTcb
virtual void freeResources();
virtual short work();
- NA_EIDPROC virtual ex_tcb_private_state * allocatePstates(
+ virtual ex_tcb_private_state * allocatePstates(
Lng32 &numElems, // inout, desired/actual elements
Lng32 &pstateLength); // out, length of one element
virtual Int32 fixup();
@@ -3513,16 +3512,16 @@ class ExExeUtilHiveQueryTdb : public ComTdbExeUtilHiveQuery
// retrieval of the virtual table function pointer of the class while
// unpacking. An empty constructor is enough.
// ---------------------------------------------------------------------
- NA_EIDPROC ExExeUtilHiveQueryTdb()
+ ExExeUtilHiveQueryTdb()
{}
- NA_EIDPROC virtual ~ExExeUtilHiveQueryTdb()
+ virtual ~ExExeUtilHiveQueryTdb()
{}
// ---------------------------------------------------------------------
// Build a TCB for this TDB. Redefined in the Executor project.
// ---------------------------------------------------------------------
- NA_EIDPROC virtual ex_tcb *build(ex_globals *globals);
+ virtual ex_tcb *build(ex_globals *globals);
private:
// ---------------------------------------------------------------------
@@ -3608,16 +3607,16 @@ class ExExeUtilHBaseBulkLoadTdb : public ComTdbExeUtilHBaseBulkLoad
// retrieval of the virtual table function pointer of the class while
// unpacking. An empty constructor is enough.
// ---------------------------------------------------------------------
- NA_EIDPROC ExExeUtilHBaseBulkLoadTdb()
+ ExExeUtilHBaseBulkLoadTdb()
{}
- NA_EIDPROC virtual ~ExExeUtilHBaseBulkLoadTdb()
+ virtual ~ExExeUtilHBaseBulkLoadTdb()
{}
// ---------------------------------------------------------------------
// Build a TCB for this TDB. Redefined in the Executor project.
// ---------------------------------------------------------------------
- NA_EIDPROC virtual ex_tcb *build(ex_globals *globals);
+ virtual ex_tcb *build(ex_globals *globals);
private:
// ---------------------------------------------------------------------
@@ -3678,7 +3677,7 @@ class ExExeUtilHBaseBulkLoadTcb : public ExExeUtilTcb
short * rc,
int bufPos = 0,
NABoolean withtime = FALSE);
- NA_EIDPROC virtual ex_tcb_private_state * allocatePstates(
+ virtual ex_tcb_private_state * allocatePstates(
Lng32 &numElems, // inout, desired/actual elements
Lng32 &pstateLength); // out, length of one element
void setLoggingLocation();
@@ -3748,16 +3747,16 @@ class ExExeUtilHBaseBulkUnLoadTdb : public ComTdbExeUtilHBaseBulkUnLoad
// retrieval of the virtual table function pointer of the class while
// unpacking. An empty constructor is enough.
// ---------------------------------------------------------------------
- NA_EIDPROC ExExeUtilHBaseBulkUnLoadTdb()
+ ExExeUtilHBaseBulkUnLoadTdb()
{}
- NA_EIDPROC virtual ~ExExeUtilHBaseBulkUnLoadTdb()
+ virtual ~ExExeUtilHBaseBulkUnLoadTdb()
{}
// ---------------------------------------------------------------------
// Build a TCB for this TDB. Redefined in the Executor project.
// ---------------------------------------------------------------------
- NA_EIDPROC virtual ex_tcb *build(ex_globals *globals);
+ virtual ex_tcb *build(ex_globals *globals);
private:
// ---------------------------------------------------------------------
@@ -3819,7 +3818,7 @@ class ExExeUtilHBaseBulkUnLoadTcb : public ExExeUtilTcb
short * rc,
int bufPos = 0,
NABoolean withtime = FALSE);
- NA_EIDPROC virtual ex_tcb_private_state * allocatePstates(
+ virtual ex_tcb_private_state * allocatePstates(
Lng32 &numElems, // inout, desired/actual elements
Lng32 &pstateLength); // out, length of one element
@@ -3919,16 +3918,16 @@ public:
// retrieval of the virtual table function pointer of the class while
// unpacking. An empty constructor is enough.
// ---------------------------------------------------------------------
- NA_EIDPROC ExExeUtilRegionStatsTdb()
+ ExExeUtilRegionStatsTdb()
{}
- NA_EIDPROC virtual ~ExExeUtilRegionStatsTdb()
+ virtual ~ExExeUtilRegionStatsTdb()
{}
// ---------------------------------------------------------------------
// Build a TCB for this TDB. Redefined in the Executor project.
// ---------------------------------------------------------------------
- NA_EIDPROC virtual ex_tcb *build(ex_globals *globals);
+ virtual ex_tcb *build(ex_globals *globals);
private:
// ---------------------------------------------------------------------
@@ -4132,16 +4131,16 @@ public:
// retrieval of the virtual table function pointer of the class while
// unpacking. An empty constructor is enough.
// ---------------------------------------------------------------------
- NA_EIDPROC ExExeUtilLobInfoTdb()
+ ExExeUtilLobInfoTdb()
{}
- NA_EIDPROC virtual ~ExExeUtilLobInfoTdb()
+ virtual ~ExExeUtilLobInfoTdb()
{}
// ---------------------------------------------------------------------
// Build a TCB for this TDB. Redefined in the Executor project.
// ---------------------------------------------------------------------
- NA_EIDPROC virtual ex_tcb *build(ex_globals *globals);
+ virtual ex_tcb *build(ex_globals *globals);
private:
// ---------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/ExExeUtilCommon.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExExeUtilCommon.cpp b/core/sql/executor/ExExeUtilCommon.cpp
index 91d9da8..0bd991d 100644
--- a/core/sql/executor/ExExeUtilCommon.cpp
+++ b/core/sql/executor/ExExeUtilCommon.cpp
@@ -1278,8 +1278,8 @@ short ExExeUtilTcb::alterDDLLock(NABoolean add, char * tableName,
ExExeStmtGlobals *exeGlob = getGlobals()->castToExExeStmtGlobals();
ExMasterStmtGlobals *masterGlob = exeGlob->castToExMasterStmtGlobals();
- AnsiOrNskName aonn(tableName);
- aonn.convertAnsiOrNskName(FALSE);
+ AnsiName aonn(tableName);
+ aonn.convertAnsiName(FALSE);
char * parts[4];
Lng32 numParts;
aonn.extractParts(numParts, parts);
@@ -1609,13 +1609,13 @@ Lng32 ExExeUtilTcb::extractParts
Lng32 rc = 0;
// We want to ignore any "." dots within a delimited
- // name. The AnsiOrNskName object is ultimately deleted
+ // name. The AnsiName object is ultimately deleted
// in the ExExeUtilMainObjectTcb destructor.
if (extractedPartsObj_)
delete extractedPartsObj_;
- extractedPartsObj_ = new (getHeap()) AnsiOrNskName(objectName);
+ extractedPartsObj_ = new (getHeap()) AnsiName(objectName);
if ((rc = extractedPartsObj_->extractParts(numParts, parts)) != 0 ||
(numParts != 3))
{
@@ -1795,7 +1795,7 @@ Lng32 ExExeUtilTcb::extractParts
strcpy(parts2, parts[2]);
}
- /* The AnsiOrNskName() method strips out the leading
+ /* The AnsiName() method strips out the leading
and ending double quotes. The following code
is no longer needed.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/ExExeUtilGetStats.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExExeUtilGetStats.cpp b/core/sql/executor/ExExeUtilGetStats.cpp
index 847985e..1dd0d44 100644
--- a/core/sql/executor/ExExeUtilGetStats.cpp
+++ b/core/sql/executor/ExExeUtilGetStats.cpp
@@ -949,8 +949,7 @@ short ExExeUtilGetStatisticsTcb::work()
break;
}
- if ((statsMergeType_ == SQLCLIDEV_MEASURE_STATS) ||
- (statsMergeType_ == SQLCLIDEV_ACCUMULATED_STATS) ||
+ if ((statsMergeType_ == SQLCLIDEV_ACCUMULATED_STATS) ||
(statsMergeType_ == SQLCLIDEV_PERTABLE_STATS) ||
(statsMergeType_ == SQLCLI_PROGRESS_STATS))
{
@@ -1058,9 +1057,7 @@ short ExExeUtilGetStatisticsTcb::work()
if ((NOT getStatsTdb().oldFormat()) &&
(NOT getStatsTdb().shortFormat()))
{
- if (statsMergeType_ == SQLCLIDEV_MEASURE_STATS)
- strcpy(statsType, "MEASURE");
- else if (statsMergeType_ == SQLCLIDEV_ACCUMULATED_STATS)
+ if (statsMergeType_ == SQLCLIDEV_ACCUMULATED_STATS)
strcpy(statsType, "ACCUMULATED");
else if (statsMergeType_ == SQLCLIDEV_PERTABLE_STATS)
strcpy(statsType, "PERTABLE");
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/ExExplain.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExExplain.cpp b/core/sql/executor/ExExplain.cpp
index cb29821..fb7d4f0 100644
--- a/core/sql/executor/ExExplain.cpp
+++ b/core/sql/executor/ExExplain.cpp
@@ -264,15 +264,6 @@ ExExplainTcb::loadModule()
);
#pragma warn(1506) // warning elimination
//moduleId.module_name = modName_;
-
- // If the module isn't already loaded (added) load it
- if(!context->moduleAdded(&moduleId))
- {
- rc = context->addModule(&moduleId, FALSE /*no timestamp check*/,
- TRUE /* unpack tdbs*/,
- (modDir_[0] ? modDir_ : NULL),
- FALSE /*do not look in global mod dir*/);
- }
}
// Get a pointer to the statement list for this context.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/ExExplain.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExExplain.h b/core/sql/executor/ExExplain.h
index e9a1bae..1e27fa8 100644
--- a/core/sql/executor/ExExplain.h
+++ b/core/sql/executor/ExExplain.h
@@ -79,16 +79,16 @@ public:
// retrieval of the virtual table function pointer of the class while
// unpacking. An empty constructor is enough.
// ---------------------------------------------------------------------
- NA_EIDPROC ExExplainTdb()
+ ExExplainTdb()
{}
- NA_EIDPROC virtual ~ExExplainTdb()
+ virtual ~ExExplainTdb()
{}
// ---------------------------------------------------------------------
// Build a TCB for this TDB. Redefined in the Executor project.
// ---------------------------------------------------------------------
- NA_EIDPROC virtual ex_tcb *build(ex_globals *globals);
+ virtual ex_tcb *build(ex_globals *globals);
private:
// ---------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/ExFastTransport.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExFastTransport.cpp b/core/sql/executor/ExFastTransport.cpp
index 13d6d85..c97104d 100644
--- a/core/sql/executor/ExFastTransport.cpp
+++ b/core/sql/executor/ExFastTransport.cpp
@@ -47,9 +47,7 @@
#include <errno.h>
#include <pthread.h>
#include "ComSysUtils.h"
-#ifndef __EID
#include "SequenceFileReader.h"
-#endif
#include "cli_stdh.h"
#include "ComSmallDefs.h"
@@ -599,10 +597,6 @@ void ExHdfsFastExtractTcb::convertSQRowToString(ULng32 nullLen,
ExWorkProcRetcode ExHdfsFastExtractTcb::work()
{
-#ifdef __EID
- // This class should not be instantiated in EID.
- return WORK_BAD_ERROR;
-#else
Lng32 retcode = 0;
SFW_RetCode sfwRetCode = SFW_OK;
ULng32 recSepLen = strlen(myTdb().getRecordSeparator());
@@ -1159,7 +1153,6 @@ ExWorkProcRetcode ExHdfsFastExtractTcb::work()
} // while
return WORK_OK;
-#endif
}//ExHdfsFastExtractTcb::work()
void ExHdfsFastExtractTcb::insertUpQueueEntry(ex_queue::up_status status, ComDiagsArea *diags, NABoolean popDownQueue)
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/ExFastTransport.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExFastTransport.h b/core/sql/executor/ExFastTransport.h
index 4f57a9f..7ad950e 100644
--- a/core/sql/executor/ExFastTransport.h
+++ b/core/sql/executor/ExFastTransport.h
@@ -40,14 +40,9 @@
// -----------------------------------------------------------------------
// Forward class declarations
// -----------------------------------------------------------------------
-#ifndef __EID
class sql_buffer;
class ExExeStmtGlobals;
class SequenceFileWriter;
-#endif
-
-class SequenceFileWriter;
-
// -----------------------------------------------------------------------
// Classes defined in this file
@@ -108,18 +103,18 @@ public:
// retrieval of the virtual table function pointer of the class while
// unpacking. An empty constructor is enough.
// ---------------------------------------------------------------------
- NA_EIDPROC ExFastExtractTdb()
+ ExFastExtractTdb()
{
}
- NA_EIDPROC virtual ~ExFastExtractTdb()
+ virtual ~ExFastExtractTdb()
{
}
// ---------------------------------------------------------------------
// Build a TCB for this TDB. Redefined in the Executor project.
// ---------------------------------------------------------------------
- NA_EIDPROC virtual ex_tcb *build(ex_globals *globals);
+ virtual ex_tcb *build(ex_globals *globals);
// ---------------------------------------------------------------------
// Public accessor functions
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/ExFirstN.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExFirstN.h b/core/sql/executor/ExFirstN.h
index 007956e..a0b8106 100644
--- a/core/sql/executor/ExFirstN.h
+++ b/core/sql/executor/ExFirstN.h
@@ -66,16 +66,16 @@ public:
// retrieval of the virtual table function pointer of the class while
// unpacking. An empty constructor is enough.
// ---------------------------------------------------------------------
- NA_EIDPROC ExFirstNTdb()
+ ExFirstNTdb()
{}
- NA_EIDPROC virtual ~ExFirstNTdb()
+ virtual ~ExFirstNTdb()
{}
// ---------------------------------------------------------------------
// Build a TCB for this TDB. Redefined in the Executor project.
// ---------------------------------------------------------------------
- NA_EIDPROC virtual ex_tcb *build(ex_globals *globals);
+ virtual ex_tcb *build(ex_globals *globals);
private:
// ---------------------------------------------------------------------
@@ -144,29 +144,29 @@ class ExFirstNTcb : public ex_tcb
public:
// Constructor
- NA_EIDPROC ExFirstNTcb(const ExFirstNTdb & firstn_tdb,
+ ExFirstNTcb(const ExFirstNTdb & firstn_tdb,
const ex_tcb & child_tcb, // child queue pair
ex_globals *glob
);
- NA_EIDPROC ~ExFirstNTcb();
+ ~ExFirstNTcb();
- NA_EIDPROC short moveChildDataToParent();
+ short moveChildDataToParent();
- NA_EIDPROC void freeResources(); // free resources
+ void freeResources(); // free resources
- NA_EIDPROC short work(); // when scheduled to do work
- NA_EIDPROC virtual void registerSubtasks(); // register work procedures with scheduler
- NA_EIDPROC short cancel(); // for the fickle.
+ short work(); // when scheduled to do work
+ virtual void registerSubtasks(); // register work procedures with scheduler
+ short cancel(); // for the fickle.
- NA_EIDPROC inline ExFirstNTdb & firstnTdb() const { return (ExFirstNTdb &) tdb; }
+ inline ExFirstNTdb & firstnTdb() const { return (ExFirstNTdb &) tdb; }
- NA_EIDPROC ex_queue_pair getParentQueue() const { return qparent_;}
+ ex_queue_pair getParentQueue() const { return qparent_;}
- NA_EIDPROC virtual Int32 numChildren() const { return 1; }
- NA_EIDPROC virtual const ex_tcb* getChild(Int32 /*pos*/) const { return childTcb_; }
+ virtual Int32 numChildren() const { return 1; }
+ virtual const ex_tcb* getChild(Int32 /*pos*/) const { return childTcb_; }
};
@@ -176,9 +176,9 @@ class ExFirstNPrivateState : public ex_tcb_private_state
friend class ExFirstNTcb;
public:
- NA_EIDPROC ExFirstNPrivateState(const ExFirstNTcb * tcb); //constructor
- NA_EIDPROC ex_tcb_private_state * allocate_new(const ex_tcb * tcb);
- NA_EIDPROC ~ExFirstNPrivateState(); // destructor
+ ExFirstNPrivateState(const ExFirstNTcb * tcb); //constructor
+ ex_tcb_private_state * allocate_new(const ex_tcb * tcb);
+ ~ExFirstNPrivateState(); // destructor
};
#endif
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/ExHbaseAccess.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExHbaseAccess.h b/core/sql/executor/ExHbaseAccess.h
index c402eba..098d779 100644
--- a/core/sql/executor/ExHbaseAccess.h
+++ b/core/sql/executor/ExHbaseAccess.h
@@ -68,16 +68,16 @@ public:
// retrieval of the virtual table function pointer of the class while
// unpacking. An empty constructor is enough.
// ---------------------------------------------------------------------
- NA_EIDPROC ExHbaseAccessTdb()
+ ExHbaseAccessTdb()
{}
- NA_EIDPROC virtual ~ExHbaseAccessTdb()
+ virtual ~ExHbaseAccessTdb()
{}
// ---------------------------------------------------------------------
// Build a TCB for this TDB. Redefined in the Executor project.
// ---------------------------------------------------------------------
- NA_EIDPROC virtual ex_tcb *build(ex_globals *globals);
+ virtual ex_tcb *build(ex_globals *globals);
private:
// ---------------------------------------------------------------------
@@ -1271,16 +1271,16 @@ public:
// retrieval of the virtual table function pointer of the class while
// unpacking. An empty constructor is enough.
// ---------------------------------------------------------------------
- NA_EIDPROC ExHbaseCoProcAggrTdb()
+ ExHbaseCoProcAggrTdb()
{}
- NA_EIDPROC virtual ~ExHbaseCoProcAggrTdb()
+ virtual ~ExHbaseCoProcAggrTdb()
{}
// ---------------------------------------------------------------------
// Build a TCB for this TDB. Redefined in the Executor project.
// ---------------------------------------------------------------------
- NA_EIDPROC virtual ex_tcb *build(ex_globals *globals);
+ virtual ex_tcb *build(ex_globals *globals);
private:
// ---------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/ExHdfsScan.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExHdfsScan.h b/core/sql/executor/ExHdfsScan.h
index 407fa48..d9ab216 100644
--- a/core/sql/executor/ExHdfsScan.h
+++ b/core/sql/executor/ExHdfsScan.h
@@ -72,16 +72,16 @@ public:
// retrieval of the virtual table function pointer of the class while
// unpacking. An empty constructor is enough.
// ---------------------------------------------------------------------
- NA_EIDPROC ExHdfsScanTdb()
+ ExHdfsScanTdb()
{}
- NA_EIDPROC virtual ~ExHdfsScanTdb()
+ virtual ~ExHdfsScanTdb()
{}
// ---------------------------------------------------------------------
// Build a TCB for this TDB. Redefined in the Executor project.
// ---------------------------------------------------------------------
- NA_EIDPROC virtual ex_tcb *build(ex_globals *globals);
+ virtual ex_tcb *build(ex_globals *globals);
private:
// ---------------------------------------------------------------------
@@ -374,16 +374,16 @@ public:
// retrieval of the virtual table function pointer of the class while
// unpacking. An empty constructor is enough.
// ---------------------------------------------------------------------
- NA_EIDPROC ExOrcFastAggrTdb()
+ ExOrcFastAggrTdb()
{}
- NA_EIDPROC virtual ~ExOrcFastAggrTdb()
+ virtual ~ExOrcFastAggrTdb()
{}
// ---------------------------------------------------------------------
// Build a TCB for this TDB. Redefined in the Executor project.
// ---------------------------------------------------------------------
- NA_EIDPROC virtual ex_tcb *build(ex_globals *globals);
+ virtual ex_tcb *build(ex_globals *globals);
private:
// ---------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/ExMeas.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExMeas.cpp b/core/sql/executor/ExMeas.cpp
index 503968e..ade3632 100644
--- a/core/sql/executor/ExMeas.cpp
+++ b/core/sql/executor/ExMeas.cpp
@@ -20,144 +20,3 @@
//
// @@@ END COPYRIGHT @@@
**********************************************************************/
-/* -*-C++-*-
- *****************************************************************************
- *
- * File: ExMeas.cpp
- * Description: methods for classes ExMeasStmtCntrs and ExMeasProcCntrs
- *
- *
- * Created: 9/26/2000
- * Language: C++
- *
- *
- *
- *
- *****************************************************************************
- */
-
-#include "ExMeas.h"
-#include "str.h"
-#include "ComCextdecs.h"
-
-#include "dmeasql.h"
-
-
-#include "seabed/trace.h"
-
-#include "ex_ex.h"
-
-/******************************************************************/
-// class ExMeasStmtCntrs
-/******************************************************************/
-
-void ExMeasStmtCntrs::init(Int32 statementIndex)
-{
-#pragma nowarn(1506) // warning elimination
- stmtCtrs_.statement_index = statementIndex;
-#pragma warn(1506) // warning elimination
- stmtCtrs_.sorts = 0;
- stmtCtrs_.recompiles = 0;
- stmtCtrs_.lock_waits = 0;
- stmtCtrs_.calls = 0;
- stmtCtrs_.elapsed_busy_time = 0;
- stmtCtrs_.records_accessed = 0;
- stmtCtrs_.records_used = 0;
- stmtCtrs_.disc_reads = 0;
- stmtCtrs_.messages = 0;
- stmtCtrs_.message_bytes = 0;
- stmtCtrs_.elapsed_sort_time = 0;
- stmtCtrs_.elapsed_compile_time = 0;
- stmtCtrs_.timeouts = 0;
- stmtCtrs_.escalations = 0;
-};
-
-ExMeasStmtCntrs::ExMeasStmtCntrs()
-{
- init(0);
-#ifdef NA_LINUX_DEBUG
- trace_printf("ExMeasStmtCntrsBump(%p) ctor\n", this);
-#endif
-}
-
-ExMeasStmtCntrs::~ExMeasStmtCntrs()
-{
-#ifdef NA_LINUX_DEBUG
- trace_printf("ExMeasStmtCntrsBump(%p) dtor\n", this);
-#endif
-};
-
-// Update Measure statement counters.
-Int32 ExMeasStmtCntrs::ExMeasStmtCntrsBump(Int32 statementCount, char *moduleName,
- Int32 moduleNameLen)
-{
-
-#ifdef NA_LINUX_DEBUG
- trace_printf("ExMeasStmtCntrsBump (%p): %d %s\n", this, statementCount, moduleName);
-#endif
- return 0;
-}
-
-
-
-
-/******************************************************************/
-// class ExMeasProcCntrs
-/******************************************************************/
-ExMeasProcCntrs::ExMeasProcCntrs()
-{
- procCtrs_.sql_obj_recompiles= 0;
- procCtrs_.sql_obj_recompile_time = 0;
- procCtrs_.sql_stmt_recompiles = 0;
- procCtrs_.sql_stmt_recompile_time = 0;
- procCtrs_.sql_newprocesses = 0;
- procCtrs_.sql_newprocess_time = 0;
- procCtrs_.opens = 0;
- procCtrs_.open_time = 0;
-#ifdef NA_LINUX_DEBUG
- trace_printf("ExMeasProcCntrs(%p) ctor\n", this);
-#endif
-};
-
-ExMeasProcCntrs::~ExMeasProcCntrs()
-{
-#ifdef NA_LINUX_DEBUG
- trace_printf("ExMeasProcCntrs(%p) dtor\n", this);
-#endif
-};
-
-Int32 ExMeasProcCntrs::ExMeasProcCntrsBump ()
-{
-#ifdef NA_LINUX_DEBUG
- trace_printf("ExMeasProcCntrsBump\n");
-#endif
- return 0;
-}
-
-Int32 ExMeasGetStatus (NABoolean &stmtflag /* out */
- , NABoolean &procflag /* out */
- , NABoolean &measureflag /* out */)
-{
- Int32 status = 0;
- static short dSqlMeasureEnabled = 0;
- static bool bCheckedMeasureEnv = false;
-
- if (!bCheckedMeasureEnv) {
- const char * pEnvStr = getenv("SQL_MEASURE_ENABLE");
- if (pEnvStr != NULL) {
- dSqlMeasureEnabled = atoi(pEnvStr);
- }
- bCheckedMeasureEnv = true;
- }
- if (dSqlMeasureEnabled) {
- stmtflag = 1;
- procflag = 1;
- measureflag = 1;
- } else {
- stmtflag = 0;
- procflag = 0;
- measureflag = 0;
- }
-
- return 0;
-}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/ExMeas.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExMeas.h b/core/sql/executor/ExMeas.h
index f035b17..ade3632 100644
--- a/core/sql/executor/ExMeas.h
+++ b/core/sql/executor/ExMeas.h
@@ -20,270 +20,3 @@
//
// @@@ END COPYRIGHT @@@
**********************************************************************/
-#ifndef __EX_MEAS_H__
-#define __EX_MEAS_H__
-
-/* -*-C++-*-
- *****************************************************************************
- *
- * File: ExMeas.h
- * Description:
- *
- *
- * Created: 9/25/2000
- * Language: C++
- *
- *
- *
- *
- *****************************************************************************
- */
-#include "Platform.h"
-
-#include "ComSizeDefs.h"
-#include "Int64.h"
-#include "BaseTypes.h"
-
-#define EXP_SHORT_OV_ADD_SETMAX( op1, op2) 0
-#define EXP_FIXED_OV_ADD_SETMAX( op1, op2) 0
-
-// Define for the max Ansiname size.
-// See max Ansiname size definitions in w:/common/ComSizeDefs.h
-#define MODULE_ID_SIZE ComMAX_3_PART_EXTERNAL_UTF8_NAME_LEN_IN_BYTES
-
-// Defines for dynamic statement name
-
-#define DYNAMIC_STMT_NAME "SQLMX^EXECUTE_"
-#define DYNAMIC_STMT_NAME_SIZE 14
-
-
-/*****************************************************************/
-/* classes defined in this file */
-/*****************************************************************/
-//class ExMeasStmtCntrs;
-//class ExMeasProcCntrs;
-
-/*****************************************************************/
-/* ExMeasGetStatus */
-/* Function to check if measure is enabled. */
-/* stmtflag is set true if statement counter is enabled, */
-/* procflag is set true if process counter is enabled. */
-/*****************************************************************/
-Int32 ExMeasGetStatus (NABoolean &stmtflag /* out */
- , NABoolean &procflag /* out */
- , NABoolean &measureflag /* out */);
-
-/******************************************************************/
-/* class ExMeasStmtCntrs */
-/* */
-/* To store Measure Sqlstmt counters. */
-/******************************************************************/
-
-
-#include "dmeasql.h"
-
-
-class ExMeasStmtCntrs
-{
-public:
-NA_EIDPROC
- ExMeasStmtCntrs();
-
-NA_EIDPROC
- ~ExMeasStmtCntrs();
-
-NA_EIDPROC
- void init(Int32 statementIndex);
-
-NA_EIDPROC
-inline void setStatementIndex (short i) { stmtCtrs_.statement_index = i; }
-
-NA_EIDPROC
-inline void setSorts (short s) { stmtCtrs_.sorts = s; }
-
-NA_EIDPROC
-inline void setRecompiles (short c) { stmtCtrs_.recompiles = c; }
-
-NA_EIDPROC
-inline void setLockWaits (short lw) { stmtCtrs_.lock_waits = lw; }
-
-NA_EIDPROC
-inline void setCalls (Int64 c) { stmtCtrs_.calls = c; }
-
-NA_EIDPROC
-inline void setElapsedBusyTime(Int64 et) { stmtCtrs_.elapsed_busy_time = et; }
-
-NA_EIDPROC
-inline void setRowsUsed (Int64 ru) { stmtCtrs_.records_used = ru; }
-
-NA_EIDPROC
-inline void setRowsAccessed (Int64 ra) { stmtCtrs_.records_accessed = ra; }
-
-NA_EIDPROC
-inline void setDiscReads (Int64 dr) { stmtCtrs_.disc_reads = dr; }
-
-NA_EIDPROC
-inline void setMessages (Int64 m) { stmtCtrs_.messages = m; }
-
-NA_EIDPROC
-inline void setMessageBytes (Int64 mb) { stmtCtrs_.message_bytes = mb; }
-
-NA_EIDPROC
-inline void setElapsedSortTime (Int64 st) { stmtCtrs_.elapsed_sort_time = st; }
-
-NA_EIDPROC
-inline void setElapsedCompileTime(Int64 ct) { stmtCtrs_.elapsed_compile_time = ct; }
-
-NA_EIDPROC
-inline void setTimeouts (short to) { stmtCtrs_.timeouts = to; }
-
-NA_EIDPROC
-inline void setEscalations (short e) { stmtCtrs_.escalations = e; }
-
-NA_EIDPROC
-inline void incSorts (short s)
- { stmtCtrs_.sorts = EXP_SHORT_OV_ADD_SETMAX (stmtCtrs_.sorts, s); }
-
-NA_EIDPROC
-inline void incRecompiles (short c)
- { stmtCtrs_.recompiles = EXP_SHORT_OV_ADD_SETMAX (stmtCtrs_.recompiles, c); }
-
-NA_EIDPROC
-inline void incLockWaits (short lw)
- { stmtCtrs_.lock_waits = EXP_SHORT_OV_ADD_SETMAX (stmtCtrs_.lock_waits, lw); }
-
-NA_EIDPROC
-inline void incCalls (Int64 c)
- { stmtCtrs_.calls = EXP_FIXED_OV_ADD_SETMAX (stmtCtrs_.calls, c); }
-
-NA_EIDPROC
-inline void incElapseBusyTime(Int64 et)
- { stmtCtrs_.elapsed_busy_time = EXP_FIXED_OV_ADD_SETMAX (stmtCtrs_.elapsed_busy_time, et); }
-
-NA_EIDPROC
-inline void incRowsUsed (Int64 ru)
- { stmtCtrs_.records_used = EXP_FIXED_OV_ADD_SETMAX (stmtCtrs_.records_used, ru); }
-
-NA_EIDPROC
-inline void incRowsAccessed (Int64 ra)
- { stmtCtrs_.records_accessed = EXP_FIXED_OV_ADD_SETMAX (stmtCtrs_.records_accessed, ra); }
-
-NA_EIDPROC
-inline void incDiscReads (Int64 dr)
- { stmtCtrs_.disc_reads = EXP_FIXED_OV_ADD_SETMAX (stmtCtrs_.disc_reads, dr); }
-
-NA_EIDPROC
-inline void incMessages (Int64 m)
- { stmtCtrs_.messages = EXP_FIXED_OV_ADD_SETMAX (stmtCtrs_.messages, m); }
-
-NA_EIDPROC
-inline void incMessageBytes (Int64 mb)
- { stmtCtrs_.message_bytes = EXP_FIXED_OV_ADD_SETMAX (stmtCtrs_.message_bytes, mb); }
-
-NA_EIDPROC
-inline void incElapsedSortTime (Int64 st)
- { stmtCtrs_.elapsed_sort_time = EXP_FIXED_OV_ADD_SETMAX (stmtCtrs_.elapsed_sort_time, st); }
-
-NA_EIDPROC
-inline void incElapsedCompileTime(Int64 ct)
- { stmtCtrs_.elapsed_compile_time = EXP_FIXED_OV_ADD_SETMAX (stmtCtrs_.elapsed_compile_time, ct); }
-
-NA_EIDPROC
-inline void incTimeouts (short to)
- { stmtCtrs_.timeouts = EXP_SHORT_OV_ADD_SETMAX (stmtCtrs_.timeouts, to); }
-
-NA_EIDPROC
-inline void incEscalations (short e)
- { stmtCtrs_.escalations = EXP_SHORT_OV_ADD_SETMAX (stmtCtrs_.escalations, e); }
-
-// Update Measure statement counters.
-NA_EIDPROC
-Int32 ExMeasStmtCntrsBump (Int32 statementCount, char *moduleName, Int32 moduleNameLen);
-
-private:
- SQLSTMT_CTRS_DEF stmtCtrs_;
-
-};
-
-
-/******************************************************************/
-/* class ExMeasProcCntrs */
-/* */
-/* To store Measure Sqlproc counters. Should have the same layout */
-/* as the Measure SQLPROC^CTRS^DEF. */
-/******************************************************************/
-
-class ExMeasProcCntrs
-{
-public:
-NA_EIDPROC
- ExMeasProcCntrs();
-
-NA_EIDPROC
- ~ExMeasProcCntrs();
-
-NA_EIDPROC
-inline void setSqlObjRecompiles(short rc) { procCtrs_.sql_obj_recompiles = rc; }
-
-NA_EIDPROC
-inline void setSqlObjRecompileTime(Int64 rct) { procCtrs_.sql_obj_recompile_time = rct; }
-
-NA_EIDPROC
-inline void setSqlStmtRecompiles(short rc) { procCtrs_.sql_stmt_recompiles = rc; }
-
-NA_EIDPROC
-inline void setSqlStmtRecompileTime(Int64 rct) { procCtrs_.sql_stmt_recompile_time = rct; }
-
-NA_EIDPROC
-inline void setSqlNewprocesses(short n) { procCtrs_.sql_newprocesses = n; }
-
-NA_EIDPROC
-inline void setSqlNewprocesstime(Int64 nt) { procCtrs_.sql_newprocess_time = nt; }
-
-NA_EIDPROC
-inline void setOpens (short op) { procCtrs_.opens = op; }
-
-NA_EIDPROC
-inline void setOpenTime (Int64 ot) { procCtrs_.open_time = ot; }
-
-NA_EIDPROC
-inline void incSqlObjRecompiles(short rc)
- { procCtrs_.sql_obj_recompiles = EXP_SHORT_OV_ADD_SETMAX (procCtrs_.sql_obj_recompiles, rc); }
-
-NA_EIDPROC
-inline void incSqlObjRecompileTime(Int64 rct)
- { procCtrs_.sql_obj_recompile_time = EXP_FIXED_OV_ADD_SETMAX (procCtrs_.sql_obj_recompile_time, rct ); }
-
-NA_EIDPROC
-inline void incSqlStmtRecompiles(short rc)
- { procCtrs_.sql_stmt_recompiles = EXP_SHORT_OV_ADD_SETMAX (procCtrs_.sql_stmt_recompiles, rc); }
-
-NA_EIDPROC
-inline void incSqlStmtRecompileTime(Int64 rct)
- { procCtrs_.sql_stmt_recompile_time = EXP_FIXED_OV_ADD_SETMAX (procCtrs_.sql_stmt_recompile_time, rct ); }
-
-NA_EIDPROC
-inline void incNewprocess (short np)
- { procCtrs_.sql_newprocesses = EXP_SHORT_OV_ADD_SETMAX (procCtrs_.sql_newprocesses, np ); }
-
-NA_EIDPROC
-inline void incNewprocessTime (Int64 nt)
- { procCtrs_.sql_newprocess_time = EXP_FIXED_OV_ADD_SETMAX (procCtrs_.sql_newprocess_time, nt); }
-
-NA_EIDPROC
-inline void incOpens (short op)
- { procCtrs_.opens = EXP_SHORT_OV_ADD_SETMAX (procCtrs_.opens, op ); }
-
-NA_EIDPROC
-inline void incOpenTime (Int64 ot) { procCtrs_.open_time = procCtrs_.open_time + ot; }
-
-// Update Measure process counters.
-NA_EIDPROC
-Int32 ExMeasProcCntrsBump ();
-
-private:
- SQLPROC_CTRS_DEF procCtrs_;
-
-};
-
-#endif
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/ExPack.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExPack.h b/core/sql/executor/ExPack.h
index 53b63ea..9b4ea93 100644
--- a/core/sql/executor/ExPack.h
+++ b/core/sql/executor/ExPack.h
@@ -71,16 +71,16 @@ public:
// retrieval of the virtual table function pointer of the class while
// unpacking. An empty constructor is enough.
// ---------------------------------------------------------------------
- NA_EIDPROC ExPackRowsTdb()
+ ExPackRowsTdb()
{}
- NA_EIDPROC virtual ~ExPackRowsTdb()
+ virtual ~ExPackRowsTdb()
{}
// ---------------------------------------------------------------------
// Build a TCB for this TDB. Redefined in the Executor project.
// ---------------------------------------------------------------------
- NA_EIDPROC virtual ex_tcb *build(ex_globals *globals);
+ virtual ex_tcb *build(ex_globals *globals);
private:
// ---------------------------------------------------------------------
@@ -144,43 +144,34 @@ public:
// - initializes local state.
// - fixes up all expressions.
//
- NA_EIDPROC
ExPackRowsTcb(const ExPackRowsTdb& packTdb,
const ex_tcb& childTdb,
ex_globals* glob);
// Destructor
- NA_EIDPROC
~ExPackRowsTcb();
// Free up any run-time resources.
- NA_EIDPROC
void freeResources();
// Register all the pack subtasks with the scheduler.
- NA_EIDPROC
void registerSubtasks();
// The basic work method for a TCB. Pack does not use this method.
- NA_EIDPROC
ExWorkProcRetcode work();
// Work method to pass requests from parent down to child.
- NA_EIDPROC
ExWorkProcRetcode workDown();
// Work method to recieve results from child, process and pass up to parent
// when the packed record has been formed or there is EOD.
- NA_EIDPROC
ExWorkProcRetcode workUp();
// Work method called by workUp() to return rows when we form a fully packed
// record or get an EOD before that.
- NA_EIDPROC
ExWorkProcRetcode workReturnRow();
// Stub to workUp() used by scheduler.
- NA_EIDPROC
// warning elimination (removed "inline")
static ExWorkProcRetcode sWorkUp(ex_tcb *tcb)
{
@@ -188,7 +179,6 @@ public:
}
// Stub to workDown() used by scheduler.
- NA_EIDPROC
// warning elimination (removed "inline")
static ExWorkProcRetcode sWorkDown(ex_tcb *tcb)
{
@@ -196,7 +186,6 @@ public:
}
// Stub to processCancel() used by scheduler.
- NA_EIDPROC
// warning elimination (removed "inline")
static ExWorkProcRetcode sCancel(ex_tcb *tcb)
{
@@ -204,31 +193,25 @@ public:
}
// Return the parent queue pair.
- NA_EIDPROC
// warning elimination (removed "inline")
ex_queue_pair getParentQueue() const { return qParent_; }
// Return a reference to the Pack TDB associated with this Pack TCB.
- NA_EIDPROC
inline ExPackRowsTdb& packTdb() const
{
return (ExPackRowsTdb &) tdb;
}
// Return the selection predicate.
- NA_EIDPROC
inline ex_expr* predExpr() { return packTdb().predExpr_; }
// Return the packing expression.
- NA_EIDPROC
inline ex_expr* packExpr() { return packTdb().packExpr_; }
// Pack has one child.
- NA_EIDPROC
virtual Int32 numChildren() const { return 1; }
// Return the child of the pack node by position.
- NA_EIDPROC
virtual const ex_tcb* getChild(Int32 pos) const
{
if(pos == 0) return childTcb_;
@@ -253,15 +236,12 @@ protected:
ExSimpleSQLBuffer* pool_;
// Send next request down to children. (called by workDown())
- NA_EIDPROC
void start();
// Send EOD to parent. (called when child return Q_NO_DATA in queue)
- NA_EIDPROC
void stop();
// Process cancel requests. (called when parent cancel its request)
- NA_EIDPROC
ExWorkProcRetcode processCancel();
};
@@ -277,21 +257,16 @@ class ExPackPrivateState : public ex_tcb_private_state
ExPackRowsTcb::workState childState_;
Int64 matchCount_;
- NA_EIDPROC
void init();
public:
- NA_EIDPROC
ExPackPrivateState(const ExPackRowsTcb* tcb);
- NA_EIDPROC
~ExPackPrivateState();
- NA_EIDPROC
ex_tcb_private_state* allocate_new(const ex_tcb* tcb);
- NA_EIDPROC
void printPackTupp();
};
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/ExPackedRows.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExPackedRows.h b/core/sql/executor/ExPackedRows.h
index 89612db..e80a609 100644
--- a/core/sql/executor/ExPackedRows.h
+++ b/core/sql/executor/ExPackedRows.h
@@ -78,16 +78,16 @@ public:
// retrieval of the virtual table function pointer of the class while
// unpacking. An empty constructor is enough.
// ---------------------------------------------------------------------
- NA_EIDPROC ExUnPackRowsTdb()
+ ExUnPackRowsTdb()
{}
- NA_EIDPROC virtual ~ExUnPackRowsTdb()
+ virtual ~ExUnPackRowsTdb()
{}
// ---------------------------------------------------------------------
// Build a TCB for this TDB. Redefined in the Executor project.
// ---------------------------------------------------------------------
- NA_EIDPROC virtual ex_tcb *build(ex_globals *globals);
+ virtual ex_tcb *build(ex_globals *globals);
private:
// ---------------------------------------------------------------------
@@ -182,7 +182,6 @@ public:
// IN: Contains references to global executor information,
// notably the space object used to allocate objects.
//
- NA_EIDPROC
ExUnPackRowsTcb(const ExUnPackRowsTdb &unPackTdb,
const ex_tcb &childTdb,
ex_globals *glob);
@@ -190,7 +189,6 @@ public:
// Destructor
//
- NA_EIDPROC
~ExUnPackRowsTcb();
// Free up any run-time resources.
@@ -198,35 +196,29 @@ public:
// (Does not free up the queues, should it).
// Called by the destructor.
//
- NA_EIDPROC
void freeResources();
// Register all the UnPackRows subtasks with the scheduler.
//
- NA_EIDPROC
void registerSubtasks();
// The basic work method for a TCB. UnPackRows does not
// use this method, but rather uses three subtasks.
// - sWorkDown(), sWorkUp() and sCancel().
//
- NA_EIDPROC
ExWorkProcRetcode work();
// Work method to pass requests from parent down to child.
//
- NA_EIDPROC
ExWorkProcRetcode workDown();
// Work method to recieve results from child, process and
// pass up to parent.
//
- NA_EIDPROC
virtual ExWorkProcRetcode workUp();
// Stub to workUp() used by scheduler.
//
- NA_EIDPROC
// warning elimination (removed "inline")
static ExWorkProcRetcode sWorkUp(ex_tcb *tcb)
{
@@ -235,7 +227,6 @@ public:
// Stub to workDown() used by scheduler.
//
- NA_EIDPROC
// warning elimination (removed "inline")
static ExWorkProcRetcode sWorkDown(ex_tcb *tcb)
{
@@ -244,7 +235,6 @@ public:
// Stub to processCancel() used by scheduler.
//
- NA_EIDPROC
// warning elimination (removed "inline")
static ExWorkProcRetcode sCancel(ex_tcb *tcb)
{
@@ -253,35 +243,29 @@ public:
// Return the parent queue pair.
//
- NA_EIDPROC
// warning elimination (removed "inline")
ex_queue_pair getParentQueue() const { return qParent_; }
// Return a reference to the UnPackRows TDB associated with this
// UnPackRows TCB.
//
- NA_EIDPROC
inline ExUnPackRowsTdb &unPackRowsTdb() const
{
return(ExUnPackRowsTdb &)tdb;
}
- NA_EIDPROC
inline ex_expr *packingFactor() { return unPackRowsTdb().packingFactor_; }
// Return the UnPackRows expression
//
- NA_EIDPROC
inline ex_expr *unPackColsExpr() { return unPackRowsTdb().unPackColsExpr_; }
// UnPackRows has one child.
//
- NA_EIDPROC
virtual Int32 numChildren() const { return 1; }
// Return the child of the UnPackRows node by position.
//
- NA_EIDPROC
virtual const ex_tcb * getChild(Int32 pos) const
{
if(pos == 0) return childTcb_;
@@ -380,18 +364,14 @@ class ExUnPackRowsPrivateState : public ex_tcb_private_state
Int32 nextCLIErrorRowNum_;
- NA_EIDPROC
void init();
public:
- NA_EIDPROC
ExUnPackRowsPrivateState(const ExUnPackRowsTcb * tcb);
- NA_EIDPROC
ex_tcb_private_state * allocate_new(const ex_tcb * tcb);
- NA_EIDPROC
~ExUnPackRowsPrivateState();
};
@@ -410,7 +390,6 @@ class ExUnPackRowwiseRowsTcb : public ex_tcb
public:
// Constructor
- NA_EIDPROC
ExUnPackRowwiseRowsTcb(const ExUnPackRowsTdb &unPackTdb,
ex_globals *glob);
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/ExProbeCache.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExProbeCache.h b/core/sql/executor/ExProbeCache.h
index 8059daa..8ff3573 100644
--- a/core/sql/executor/ExProbeCache.h
+++ b/core/sql/executor/ExProbeCache.h
@@ -57,16 +57,16 @@ public:
// retrieval of the virtual table function pointer of the class while
// unpacking. An empty constructor is enough.
// ---------------------------------------------------------------------
- NA_EIDPROC ExProbeCacheTdb()
+ ExProbeCacheTdb()
{}
- NA_EIDPROC virtual ~ExProbeCacheTdb()
+ virtual ~ExProbeCacheTdb()
{}
// ---------------------------------------------------------------------
// Build a TCB for this TDB. Redefined in the Executor project.
// ---------------------------------------------------------------------
- NA_EIDPROC virtual ex_tcb *build(ex_globals *globals);
+ virtual ex_tcb *build(ex_globals *globals);
private:
// ---------------------------------------------------------------------
@@ -146,7 +146,7 @@ public:
}
- NA_EIDPROC virtual ex_tcb_private_state * allocatePstates(
+ virtual ex_tcb_private_state * allocatePstates(
Lng32 &numElems, // inout, desired/actual elements
Lng32 &pstateLength); // out, length of one element
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/ExRLE.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExRLE.h b/core/sql/executor/ExRLE.h
index 996bd3c..4cc608d 100644
--- a/core/sql/executor/ExRLE.h
+++ b/core/sql/executor/ExRLE.h
@@ -125,26 +125,16 @@ typedef struct comp_buf {
#define RLE_PACKBITS_MAXBUF_BYTE (RLE_PACKBITS_MAXCOPY_BYTE + RLE_PACKBITS_MINRUN - 1)
#define RLE_PACKBITS_MAXBUF_SHORT (RLE_PACKBITS_MAXCOPY_SHORT + RLE_PACKBITS_MINRUN - 1)
-NA_EIDPROC
static Int32 encode_byte(unsigned char *dbuf, Int32 dlen, unsigned char *ebuf, Int32 *elen);
-NA_EIDPROC
static Int32 pb_encode_byte(unsigned char *dbuf, Int32 dlen, unsigned char *ebuf, Int32 *elen);
-NA_EIDPROC
static Int32 encode_short(unsigned short *dbuf, Int32 dlen_bytes, unsigned short *ebuf, Int32 *elen_bytes);
-NA_EIDPROC
static Int32 pb_encode_short(unsigned short *dbuf, Int32 dlen_bytes, unsigned short *ebuf, Int32 *elen_bytes);
-NA_EIDPROC
static Int32 decode_byte(unsigned char *ebuf, Int32 elen, unsigned char *dbuf, Int32 *dlen);
-NA_EIDPROC
static Int32 pb_decode_byte(unsigned char *ebuf, Int32 elen, unsigned char *dbuf, Int32 *dlen);
-NA_EIDPROC
static Int32 decode_short(unsigned short *ebuf, Int32 elen_bytes, unsigned short *dbuf, Int32 *dlen_bytes);
-NA_EIDPROC
static Int32 pb_decode_short(unsigned short *ebuf, Int32 elen_bytes, unsigned short *dbuf, Int32 *dlen_bytes);
-NA_EIDPROC
Int32 ExEncode(unsigned char *dbuf, Int32 dlen, unsigned char *ebuf, Int32 *elen, Int32 flags);
-NA_EIDPROC
Int32 ExDecode(unsigned char *ebuf, Int32 elen, unsigned char *dbuf, Int32 *dlen,
Lng32 ¶m1, Lng32 ¶m2);
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/ExRsInfo.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExRsInfo.cpp b/core/sql/executor/ExRsInfo.cpp
index 39f2d0a..ea6873e 100644
--- a/core/sql/executor/ExRsInfo.cpp
+++ b/core/sql/executor/ExRsInfo.cpp
@@ -79,7 +79,7 @@
#include "ex_exe_stmt_globals.h"
#include "ExUdrClientIpc.h"
-#ifdef NA_DEBUG_C_RUNTIME
+#ifdef _DEBUG
#include <stdarg.h>
#define ExRsDebug0(s) ExRsPrintf((s))
#define ExRsDebug1(s,a1) ExRsPrintf((s),(a1))
@@ -129,7 +129,7 @@ ExRsInfo::ExRsInfo()
numReturnedByLastCall_(0),
numClosedSinceLastCall_(0)
{
-#ifdef NA_DEBUG_C_RUNTIME
+#ifdef _DEBUG
// We enable the debug_ flag if either the UDR_DEBUG or UDR_RS_DEBUG
// env var is set. We enable the txDebug_ flag if either debug_ is
// enabled or the UDR_TX_DEBUG env var is set.
@@ -664,7 +664,7 @@ void ExRsInfo::setNumEntries(ComUInt32 maxEntries)
*/
void ExRsInfo::setIpcProcessId(const IpcProcessId &ipcProcessId)
{
-#ifdef NA_DEBUG_C_RUNTIME
+#ifdef _DEBUG
char buf[300];
ipcProcessId.toAscii(buf, 300);
ExRsDebug1("[BEGIN setIpcProcessId] ipcProcessId=%s", buf);
@@ -673,7 +673,7 @@ void ExRsInfo::setIpcProcessId(const IpcProcessId &ipcProcessId)
ExRsDebug0("[END setIpcProcessId]");
}// ExRsInfo::setIpcProcessId
-#ifdef NA_DEBUG_C_RUNTIME
+#ifdef _DEBUG
void ExRsInfo::displayList() const
{
ULng32 e = getNumEntries();
@@ -723,7 +723,7 @@ void ExRsInfo::ExRsPrintf(const char *formatString, ...) const
// encountered.
void ExRsInfo::enterUdrTx(ExExeStmtGlobals &stmtGlobals)
{
-#ifdef NA_DEBUG_C_RUNTIME
+#ifdef _DEBUG
NABoolean oldDebug = debug_;
if (txDebug_)
debug_ = TRUE;
@@ -737,7 +737,7 @@ void ExRsInfo::enterUdrTx(ExExeStmtGlobals &stmtGlobals)
sendTxMessage(stmtGlobals, ENTER);
}
-#ifdef NA_DEBUG_C_RUNTIME
+#ifdef _DEBUG
ExRsDebug2("[END enterUdrTx] %p, state %s",
this, getTxStateString(txState_));
debug_ = oldDebug;
@@ -750,7 +750,7 @@ void ExRsInfo::enterUdrTx(ExExeStmtGlobals &stmtGlobals)
// IPC errors are encountered.
void ExRsInfo::suspendUdrTx(ExExeStmtGlobals &stmtGlobals)
{
-#ifdef NA_DEBUG_C_RUNTIME
+#ifdef _DEBUG
NABoolean oldDebug = debug_;
if (txDebug_)
debug_ = TRUE;
@@ -764,7 +764,7 @@ void ExRsInfo::suspendUdrTx(ExExeStmtGlobals &stmtGlobals)
sendTxMessage(stmtGlobals, SUSPEND);
}
-#ifdef NA_DEBUG_C_RUNTIME
+#ifdef _DEBUG
ExRsDebug2("[END suspendUdrTx] %p, state %s",
this, getTxStateString(txState_));
debug_ = oldDebug;
@@ -777,7 +777,7 @@ void ExRsInfo::suspendUdrTx(ExExeStmtGlobals &stmtGlobals)
// encountered.
void ExRsInfo::exitUdrTx(ExExeStmtGlobals &stmtGlobals)
{
-#ifdef NA_DEBUG_C_RUNTIME
+#ifdef _DEBUG
NABoolean oldDebug = debug_;
if (txDebug_)
debug_ = TRUE;
@@ -796,7 +796,7 @@ void ExRsInfo::exitUdrTx(ExExeStmtGlobals &stmtGlobals)
sendTxMessage(stmtGlobals, EXIT);
}
-#ifdef NA_DEBUG_C_RUNTIME
+#ifdef _DEBUG
ExRsDebug2("[END exitUdrTx] %p, state %s",
this, getTxStateString(txState_));
debug_ = oldDebug;
@@ -843,7 +843,7 @@ void ExRsInfo::sendTxMessage(ExExeStmtGlobals &stmtGlobals, TxMsgType t)
if (!(ipcProcessId_ == otherEnd) ||
(udrServer_->getState() == ExUdrServer::EX_UDR_BROKEN))
{
-#ifdef NA_DEBUG_C_RUNTIME
+#ifdef _DEBUG
if (!(ipcProcessId_ == otherEnd))
{
char buf1[300];
@@ -958,7 +958,7 @@ void ExRsInfo::sendTxMessage(ExExeStmtGlobals &stmtGlobals, TxMsgType t)
exitOrSuspendStream_ = s;
}
-#ifdef NA_DEBUG_C_RUNTIME
+#ifdef _DEBUG
if (debug_)
s->setTraceFile(stdout);
#endif
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/ExRsInfo.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExRsInfo.h b/core/sql/executor/ExRsInfo.h
index c78aeb5..5231184 100644
--- a/core/sql/executor/ExRsInfo.h
+++ b/core/sql/executor/ExRsInfo.h
@@ -233,7 +233,7 @@ private:
ULng32 numReturnedByLastCall_;
ULng32 numClosedSinceLastCall_;
-#ifdef NA_DEBUG_C_RUNTIME
+#ifdef _DEBUG
public:
void ExRsPrintf(const char *formatString, ...) const;
NABoolean debugEnabled() const { return debug_; }
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/ExSample.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExSample.h b/core/sql/executor/ExSample.h
index 754e3d0..68440f9 100644
--- a/core/sql/executor/ExSample.h
+++ b/core/sql/executor/ExSample.h
@@ -70,16 +70,16 @@ public:
// retrieval of the virtual table function pointer of the class while
// unpacking. An empty constructor is enough.
// ---------------------------------------------------------------------
- NA_EIDPROC ExSampleTdb()
+ ExSampleTdb()
{};
- NA_EIDPROC virtual ~ExSampleTdb()
+ virtual ~ExSampleTdb()
{};
// ---------------------------------------------------------------------
// Build a TCB for this TDB. Redefined in the Executor project.
// ---------------------------------------------------------------------
- NA_EIDPROC virtual ex_tcb *build(ex_globals *globals);
+ virtual ex_tcb *build(ex_globals *globals);
private:
// ---------------------------------------------------------------------
@@ -130,28 +130,28 @@ public:
ExSamp_DONE
};
- NA_EIDPROC ExSampleTcb(const ExSampleTdb & sample_tdb,
+ ExSampleTcb(const ExSampleTdb & sample_tdb,
const ex_tcb & child_tcb,
ex_globals * glob
);
- NA_EIDPROC ~ExSampleTcb();
+ ~ExSampleTcb();
- NA_EIDPROC void freeResources();
- NA_EIDPROC short work();
+ void freeResources();
+ short work();
- NA_EIDPROC inline ExSampleTdb & myTdb() const;
- NA_EIDPROC ex_queue_pair getParentQueue() const
+ inline ExSampleTdb & myTdb() const;
+ ex_queue_pair getParentQueue() const
{
return (qparent_);
}
- NA_EIDPROC inline ex_expr * initExpr() const;
- NA_EIDPROC inline ex_expr * balanceExpr() const;
- NA_EIDPROC inline Int32 returnFactorOffset() const;
- NA_EIDPROC inline ex_expr * postPred() const;
+ inline ex_expr * initExpr() const;
+ inline ex_expr * balanceExpr() const;
+ inline Int32 returnFactorOffset() const;
+ inline ex_expr * postPred() const;
- NA_EIDPROC virtual Int32 numChildren() const;
- NA_EIDPROC virtual const ex_tcb* getChild(Int32 pos) const;
+ virtual Int32 numChildren() const;
+ virtual const ex_tcb* getChild(Int32 pos) const;
private:
const ex_tcb * childTcb_;
@@ -164,32 +164,32 @@ private:
// ExSampleTdb inline function definitions
//
-NA_EIDPROC inline ex_expr * ExSampleTcb::initExpr() const
+inline ex_expr * ExSampleTcb::initExpr() const
{
return myTdb().initExpr_;
};
-NA_EIDPROC inline ex_expr * ExSampleTcb::balanceExpr() const
+inline ex_expr * ExSampleTcb::balanceExpr() const
{
return myTdb().balanceExpr_;
};
-NA_EIDPROC inline Int32 ExSampleTcb::returnFactorOffset() const
+inline Int32 ExSampleTcb::returnFactorOffset() const
{
return myTdb().returnFactorOffset_;
};
-NA_EIDPROC inline ex_expr * ExSampleTcb::postPred() const
+inline ex_expr * ExSampleTcb::postPred() const
{
return myTdb().postPred_;
};
-NA_EIDPROC inline Int32 ExSampleTcb::numChildren() const
+inline Int32 ExSampleTcb::numChildren() const
{
return 1;
}
-NA_EIDPROC inline const ex_tcb* ExSampleTcb::getChild(Int32 pos) const
+inline const ex_tcb* ExSampleTcb::getChild(Int32 pos) const
{
ex_assert((pos >= 0), "");
if (pos == 0)
@@ -198,7 +198,7 @@ NA_EIDPROC inline const ex_tcb* ExSampleTcb::getChild(Int32 pos) const
return NULL;
}
-NA_EIDPROC inline ExSampleTdb & ExSampleTcb::myTdb() const
+inline ExSampleTdb & ExSampleTcb::myTdb() const
{
return (ExSampleTdb &) tdb;
};
@@ -211,9 +211,9 @@ class ExSamplePrivateState : public ex_tcb_private_state
friend class ExSampleTcb;
public:
- NA_EIDPROC ExSamplePrivateState(const ExSampleTcb * tcb);
- NA_EIDPROC ex_tcb_private_state * allocate_new(const ex_tcb * tcb);
- NA_EIDPROC ~ExSamplePrivateState();
+ ExSamplePrivateState(const ExSampleTcb * tcb);
+ ex_tcb_private_state * allocate_new(const ex_tcb * tcb);
+ ~ExSamplePrivateState();
private:
ExSampleTcb::RequestState step_;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/ExScheduler.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExScheduler.cpp b/core/sql/executor/ExScheduler.cpp
index f3b9893..544eba8 100644
--- a/core/sql/executor/ExScheduler.cpp
+++ b/core/sql/executor/ExScheduler.cpp
@@ -46,23 +46,11 @@
#include "ExStats.h"
#include "ex_error.h"
-#ifndef __EID
// wait method need more include files
#include "ex_exe_stmt_globals.h"
#include "Ipc.h"
#include "ex_frag_rt.h"
#include "ex_root.h"
-#endif
-
-
-#ifdef __EID
-#if !defined(NDEBUG)
-// See test harness below
-#include "ex_eid_stmt_globals.h"
-#include "SqlSessionData.h"
-#endif
-#include "ex_dp2exe_root.h"
-#endif
#include "ExCextdecs.h"
#include "ComRtUtils.h"
@@ -98,24 +86,19 @@ ExScheduler::ExScheduler(ex_globals *glob)
#endif
subtaskTrace_[i].rmsTimeConsumed_ = -1;
}
-#ifndef __EID
exeTrace_ = 0;
-#endif
}
ExScheduler::~ExScheduler()
{
-#ifndef __EID
if (exeTrace_ && glob_->castToExExeStmtGlobals()->getCliGlobals())
{
ExeTraceInfo *ti = glob_->castToExExeStmtGlobals()->getCliGlobals()
->getExeTraceInfo();
ti->removeTrace(exeTrace_);
}
-#endif
}
-#ifndef __EID
Int32 ExScheduler::printALiner(Int32 lineno, char *buf)
{
if (lineno >= NumLastCalled)
@@ -132,10 +115,6 @@ Int32 ExScheduler::printALiner(Int32 lineno, char *buf)
subtaskTrace_[lineno].rmsTimeConsumed_);
return rv;
}
-#endif // not __EID
-
-// const char * NodeTypeToString(ComTdb::ex_node_type nodeType);
-
ExWorkProcRetcode ExScheduler::work(Int64 prevWaitTime)
{
@@ -158,7 +137,6 @@ ExWorkProcRetcode ExScheduler::work(Int64 prevWaitTime)
if (suspended_)
return WORK_OK;
-#ifndef __EID
if (exeTrace_ == 0 && glob_->castToExExeStmtGlobals()->getCliGlobals())
{
ExeTraceInfo *ti = glob_->castToExExeStmtGlobals()->getCliGlobals()
@@ -183,29 +161,7 @@ ExWorkProcRetcode ExScheduler::work(Int64 prevWaitTime)
}
}
}
-#endif // not __EID
-
-#ifdef __EID
-#if !defined(NDEBUG)
- // This is for DEBUG exe-in-dp2. Note the double negative in the test
- // above.
-
- // Test harness for EID loop detection -- only for EID. Also,
- // only for debug to avoid a small performance penalty.
- // Run through the subtasks and "unschedule" them all. This
- // should trigger the EID loop detection code.
- if (((ExEidStmtGlobals *)glob_)->getSqlSessionData()->isEidLoopTest())
- {
- subtask = subtasks_;
- while (subtask)
- {
- subtask->reset();
- subtask = subtask->getNext();
- }
- }
-#endif // endif eid debug.
-#endif
-
+
ExOperStats *rootStats = NULL;
ExFragRootOperStats *fragRootOperStats = NULL;
ExMeasStats *measStats = NULL;
@@ -226,7 +182,7 @@ ExWorkProcRetcode ExScheduler::work(Int64 prevWaitTime)
fragRootOperStats = rootStats->castToExFragRootOperStats();
measStats = rootStats->castToExMeasStats();
}
-#ifndef __EID
+
ExProcessStats *processStats;
if (fragRootOperStats != NULL)
{
@@ -235,7 +191,6 @@ ExWorkProcRetcode ExScheduler::work(Int64 prevWaitTime)
if (processStats != NULL)
processStats->setRecentQid(fragRootOperStats->getQueryId());
}
-#endif
// ---------------------------------------------------------------------
// Loop through all events that are managed by this scheduler
@@ -322,10 +277,6 @@ ExWorkProcRetcode ExScheduler::work(Int64 prevWaitTime)
// taken before the subtask has returned.
subtaskTrace_[lastCalledIdx_].lastWorkRetcode_ = 666;
-#ifndef __EID
-// cout << "Calling subtask " << subtask << ", tcb " << subtask->tcb_ << ", name_ " << subtask->taskName_ << endl;
-#endif
-
// Do the work
//
rc = subtask->work();
@@ -425,12 +376,7 @@ ExWorkProcRetcode ExScheduler::work(Int64 prevWaitTime)
{
// reset flag (may not have to but can't hurt)
externalEventCompleted_ = FALSE;
-#ifdef __EID
- QueryIDStats qidstats;
- if ((maxCpuTime_ != LLONG_MAX) &&
- (qidstats.getProcessBusyTime() > maxCpuTime_))
- localRootTcb_->cpuLimitExceeded();
-#else
+
// Special case for cancel: master must check for I/O
// completion here.
@@ -447,7 +393,6 @@ ExWorkProcRetcode ExScheduler::work(Int64 prevWaitTime)
}
-#endif
return rc;
}
@@ -486,12 +431,10 @@ ExWorkProcRetcode ExScheduler::work(Int64 prevWaitTime)
poolsBlocked = 0;
prevPoolsBlocked = 0;
-#ifndef __EID
// poll each active connection once for each cycle through
// the scheduled subtasks
glob_->castToExExeStmtGlobals()->getIpcEnvironment()->
getAllConnections()->waitOnAll(IpcImmediately);
-#endif
}
else if (poolsBlocked)
{
@@ -520,25 +463,7 @@ ExWorkProcRetcode ExScheduler::work(Int64 prevWaitTime)
poolsBlocked = 0;
subtask = subtasks_;
} // if poolsBlocked
-#ifdef __EID
- if (subtaskLoopCnt_++ == maxSubtaskLoops_)
- {
- QueryIDStats qidstats;
- if ((maxCpuTime_ != LLONG_MAX) &&
- (qidstats.getProcessBusyTime() > maxCpuTime_))
- {
- localRootTcb_->cpuLimitExceeded();
-
- // reset subtask to NULL to ensure we return to the EID root
- // operator before any scan tcb gets a chance to process
- // the cancel. This is needed since the scan tcb can insert
- // Q_NO_DATA directly into the reply buffer. We have to make
- // sure that the root tcb inserts Q_SQLERROR first.
- subtask = NULL;
- }
- subtaskLoopCnt_ = 1;
- }
-#else
+
if (rootStats)
{
if ((subtaskLoopCnt_ == maxSubtaskLoops_) ||
@@ -550,7 +475,6 @@ ExWorkProcRetcode ExScheduler::work(Int64 prevWaitTime)
else
subtaskLoopCnt_++;
}
-#endif
} // if subtask == NULL
} // While Loop
// reset flag
@@ -700,7 +624,6 @@ ExExceptionSubtask * ExScheduler::addOrFindExceptionSubtask(
NABoolean ExScheduler::checkSuspendAndLimit()
{
-#ifndef __EID
ExFragRootOperStats *fragRootStats = NULL;
ExMeasStats *measRootStats = NULL;
Int64 localCpuTime = 0;
@@ -743,7 +666,7 @@ NABoolean ExScheduler::checkSuspendAndLimit()
}
}
}
-#endif // not EID
+
return FALSE;
}
@@ -762,12 +685,6 @@ ExOperStats * ExScheduler::getRootStats()
void ExScheduler::setRootTcb(ex_tcb *tcb)
{
localRootTcb_ = tcb;
-#ifdef __EID
- // In the EID, the interval to check CPU time is config'd with
- // QUERY_LIMIT_SQL_PROCESS_CPU_DP2_FREQ.
- maxSubtaskLoops_ = ((ExEIDRootTcb *) localRootTcb_)->getSchLoopCnt();
- subtaskLoopCnt_ = maxSubtaskLoops_;
-#endif
}
const char *ExWorkProcRetcodeToString(ExWorkProcRetcode r)
@@ -782,11 +699,7 @@ const char *ExWorkProcRetcodeToString(ExWorkProcRetcode r)
case WORK_NOBODY_WORKED: return "WORK_NOBODY_WORKED";
case WORK_STATS_PREEMPT: return "WORK_STATS_PREEMPT";
case WORK_HASHJ_PREEMPT: return "WORK_HASHJ_PREEMPT";
-#ifdef __EID
- default: return "UNKNOWN";
-#else
default: return ComRtGetUnknownString((Int32) r);
-#endif
}
}
[14/30] incubator-trafodion git commit: TRAFODION-2731 CodeCleanup:
Remove obsolete, legacy and unused code
Posted by an...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/ex_control.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ex_control.cpp b/core/sql/executor/ex_control.cpp
index 5a7ba4e..3684b1f 100644
--- a/core/sql/executor/ex_control.cpp
+++ b/core/sql/executor/ex_control.cpp
@@ -55,9 +55,7 @@
#include "ex_ddl.h"
#include "ComRtUtils.h"
#include "ComUser.h"
-#ifdef NA_CMPDLL
#include "CmpContext.h"
-#endif // NA_CMPDLL
ex_tcb * ExControlTdb::build(ex_globals * glob)
{
@@ -182,11 +180,9 @@ short ExControlTcb::work()
// Only a STATIC compile will actually affect Arkcmp's context.
- CmpCompileInfo c(buf, usedlen, sqlTextCharSet, NULL, 0, NULL, 0, 0, 0);
+ CmpCompileInfo c(buf, usedlen, sqlTextCharSet, NULL, 0, 0, 0);
size_t dataLen = c.getLength();
-#ifdef NA_CMPDLL
NABoolean saveControl = FALSE; // if save controls in exe ControlInfoTables
-#endif // NA_CMPDLL
char * data = new(getHeap()) char[dataLen];
c.pack(data);
ContextCli *currCtxt = getGlobals()->castToExExeStmtGlobals()->
@@ -194,8 +190,6 @@ short ExControlTcb::work()
ExSqlComp *cmp = NULL;
Int32 cmpStatus = 0;
{
-#ifdef NA_CMPDLL
-
// If use embedded compiler, send the settings to it
if (currCtxt->getSessionDefaults()->callEmbeddedArkcmp() &&
currCtxt->isEmbeddedArkcmpInitialized() && (CmpCommon::context()) &&
@@ -234,7 +228,7 @@ short ExControlTcb::work()
dummyReply = NULL;
}
}
-#endif // NA_CMPDLL
+
// if there is an error using embedded compiler or we are already in the
// embedded compiler, send this to a regular compiler .
if (!currCtxt->getSessionDefaults()->callEmbeddedArkcmp() ||
@@ -279,179 +273,175 @@ short ExControlTcb::work()
getGlobals(), cmp->getDiags());
}
else
-#ifdef NA_CMPDLL
saveControl = TRUE;
-#endif // NA_CMPDLL
} // sendSettingsToCompiler(i) is true
} // i < currCtxt->getNumArkcmps()
} //cmpStatus= 0) || (CmpCommon::context()->getRecursionLevel() > 0
-#ifdef NA_CMPDLL
- if (saveControl)
-#endif // NA_CMPDLL
- {
- // Add control info to executor ControlInfoTable.
- currCtxt->
- getControlArea()->addControl(
- controlTdb().getType(),
- controlTdb().reset_,
- buf, usedlen,
- value[1], len[1],
- value[2], len[2],
- value[3], len[3],
- controlTdb().getControlActionType(),
- ExControlEntry::UPON_ALL,
- controlTdb().isNonResettable());
-
- // reset processing of setOnce cqds if a cqd * reset reset
- // is seen while the setOnce parserflags is set.
- // This indicates that ndcs has sent a cqd * reset reset
- // after setting all the cqds from its DSN.
- if (((currCtxt->getSqlParserFlags() & 0x400000) != 0) &&
- (controlTdb().getType() == DEFAULT_) &&
- (controlTdb().reset_ == -1) &&
- (value[1] != NULL) &&
- (len[1] == 0) &&
- (value[2] != NULL) &&
- (! str_cmp_ne(value[2], "RESET")))
- {
- currCtxt->resetSqlParserFlags(0x400000);
- }
- // Add cqds which are also ssds(set session defaults) to
- // the session defaults table.
- if (controlTdb().getType() == DEFAULT_)
- {
- if (strcmp(value[1], "AUTO_QUERY_RETRY") == 0)
- {
- if (strcmp(value[2], "OFF") == 0)
- currCtxt->getSessionDefaults()->setAqrType(0);
- else if (strcmp(value[2], "SYSTEM") == 0)
- currCtxt->getSessionDefaults()->setAqrType(1);
- else if (strcmp(value[2], "ON") == 0)
- currCtxt->getSessionDefaults()->setAqrType(2);
- }
- else if (strcmp(value[1], "AUTO_QUERY_RETRY_WARNINGS") == 0)
- {
- if (strcmp(value[2], "ON") == 0)
- currCtxt->getSessionDefaults()->setAQRWarnings(1);
- else
- currCtxt->getSessionDefaults()->setAQRWarnings(0);
- }
- else if (strcmp(value[1], "CATALOG") == 0)
- {
- currContext->getSessionDefaults()->
- setCatalog(value[2], strlen(value[2]));
- }
- else if (strcmp(value[1], "DBTR_PROCESS") == 0)
- {
- if (strcmp(value[2], "ON") == 0)
- currContext->getSessionDefaults()->setDbtrProcess(TRUE);
- }
- else if (strcmp(value[1], "IS_SQLCI") == 0)
- {
- if (strcmp(value[2], "ON") == 0)
- currContext->getSessionDefaults()->setMxciProcess(TRUE);
- }
- else if (strcmp(value[1], "NVCI_PROCESS") == 0)
- {
- if (strcmp(value[2], "ON") == 0)
- {
- currContext->getSessionDefaults()->setNvciProcess(TRUE);
- currContext->getSessionDefaults()->setStatisticsViewType(SQLCLI_PERTABLE_STATS);
- }
- }
- else if (strcmp(value[1], "ODBC_PROCESS") == 0)
- {
- if (strcmp(value[2], "ON") == 0)
- {
- currContext->getSessionDefaults()->setOdbcProcess(TRUE);
- currContext->getSessionDefaults()->setStatisticsViewType(SQLCLI_PERTABLE_STATS);
- }
- }
- else if (strcmp(value[1], "MARIAQUEST_PROCESS") == 0)
- {
- if (strcmp(value[2], "ON") == 0)
- {
- currContext->getSessionDefaults()->setMariaQuestProcess(TRUE);
- }
- }
- else if (strcmp(value[1], "JDBC_PROCESS") == 0)
- {
- if (strcmp(value[2], "ON") == 0)
- {
- currContext->getSessionDefaults()->setJdbcProcess(TRUE);
- currContext->getSessionDefaults()->setStatisticsViewType(SQLCLI_PERTABLE_STATS);
- }
- }
- else if (strcmp(value[1], "MODE_SEABASE") == 0)
- {
- if (strcmp(value[2], "ON") == 0)
- currContext->getSessionDefaults()->setModeSeabase(TRUE);
- else
- currContext->getSessionDefaults()->setModeSeabase(FALSE);
- }
- else if (strcmp(value[1], "SCHEMA") == 0)
- {
- currContext->getSessionDefaults()->
- setSchema(value[2], strlen(value[2]));
- }
- else if (strcmp(value[1], "USER_EXPERIENCE_LEVEL") == 0)
- {
- currContext->getSessionDefaults()->
- setUEL(value[2], strlen(value[2]));
- }
- else if (strcmp(value[1], "REDRIVE_CTAS") == 0)
- {
- if (strcmp(value[2], "ON") == 0)
- currContext->getSessionDefaults()->setRedriveCTAS(TRUE);
- else
- currContext->getSessionDefaults()->setRedriveCTAS(FALSE);
- }
- else if (strcmp(value[1], "EXSM_TRACE_FILE_PREFIX") == 0)
- {
- char *prefix = value[2];
- if (prefix != NULL)
- currContext->getSessionDefaults()->
- setExSMTraceFilePrefix(prefix, strlen(prefix));
- }
- else if (strcmp(value[1], "EXSM_TRACE_LEVEL") == 0)
- {
- int lvl = (int) strtoul(value[2], NULL, 10);
- currContext->getSessionDefaults()->
- setExSMTraceLevel(lvl);
- }
- else if (strcmp(value[1], "CALL_EMBEDDED_ARKCMP") == 0)
- {
- if ((strcmp(value[2], "TRUE") == 0) ||
- (strcmp(value[2], "ON") == 0)
- )
- {
- currContext->getSessionDefaults()->setCallEmbeddedArkcmp(TRUE);
- }
- else if ((strcmp(value[2], "FALSE") == 0) ||
- (strcmp(value[2], "OFF") == 0)
- )
- {
- currContext->getSessionDefaults()->setCallEmbeddedArkcmp(FALSE);
- }
- }
- else if (strcmp(value[1], "ESP_IDLE_TIMEOUT") == 0)
- {
- int lvl = (int) strtoul(value[2], NULL, 10);
- currContext->getSessionDefaults()->
- setEspIdleTimeout(lvl);
- }
- else if (strcmp(value[1], "COMPILER_IDLE_TIMEOUT") == 0)
- {
- int lvl = (int) strtoul(value[2], NULL, 10);
- currContext->getSessionDefaults()->
- setCompilerIdleTimeout(lvl);
- }
- }
- }
+ if (saveControl)
+ {
+ // Add control info to executor ControlInfoTable.
+ currCtxt->
+ getControlArea()->addControl(
+ controlTdb().getType(),
+ controlTdb().reset_,
+ buf, usedlen,
+ value[1], len[1],
+ value[2], len[2],
+ value[3], len[3],
+ controlTdb().getControlActionType(),
+ ExControlEntry::UPON_ALL,
+ controlTdb().isNonResettable());
+
+ // reset processing of setOnce cqds if a cqd * reset reset
+ // is seen while the setOnce parserflags is set.
+ // This indicates that ndcs has sent a cqd * reset reset
+ // after setting all the cqds from its DSN.
+ if (((currCtxt->getSqlParserFlags() & 0x400000) != 0) &&
+ (controlTdb().getType() == DEFAULT_) &&
+ (controlTdb().reset_ == -1) &&
+ (value[1] != NULL) &&
+ (len[1] == 0) &&
+ (value[2] != NULL) &&
+ (! str_cmp_ne(value[2], "RESET")))
+ {
+ currCtxt->resetSqlParserFlags(0x400000);
+ }
+
+ // Add cqds which are also ssds(set session defaults) to
+ // the session defaults table.
+ if (controlTdb().getType() == DEFAULT_)
+ {
+ if (strcmp(value[1], "AUTO_QUERY_RETRY") == 0)
+ {
+ if (strcmp(value[2], "OFF") == 0)
+ currCtxt->getSessionDefaults()->setAqrType(0);
+ else if (strcmp(value[2], "SYSTEM") == 0)
+ currCtxt->getSessionDefaults()->setAqrType(1);
+ else if (strcmp(value[2], "ON") == 0)
+ currCtxt->getSessionDefaults()->setAqrType(2);
+ }
+ else if (strcmp(value[1], "AUTO_QUERY_RETRY_WARNINGS") == 0)
+ {
+ if (strcmp(value[2], "ON") == 0)
+ currCtxt->getSessionDefaults()->setAQRWarnings(1);
+ else
+ currCtxt->getSessionDefaults()->setAQRWarnings(0);
+ }
+ else if (strcmp(value[1], "CATALOG") == 0)
+ {
+ currContext->getSessionDefaults()->
+ setCatalog(value[2], strlen(value[2]));
+ }
+ else if (strcmp(value[1], "DBTR_PROCESS") == 0)
+ {
+ if (strcmp(value[2], "ON") == 0)
+ currContext->getSessionDefaults()->setDbtrProcess(TRUE);
+ }
+ else if (strcmp(value[1], "IS_SQLCI") == 0)
+ {
+ if (strcmp(value[2], "ON") == 0)
+ currContext->getSessionDefaults()->setMxciProcess(TRUE);
+ }
+ else if (strcmp(value[1], "NVCI_PROCESS") == 0)
+ {
+ if (strcmp(value[2], "ON") == 0)
+ {
+ currContext->getSessionDefaults()->setNvciProcess(TRUE);
+ currContext->getSessionDefaults()->setStatisticsViewType(SQLCLI_PERTABLE_STATS);
+ }
+ }
+ else if (strcmp(value[1], "ODBC_PROCESS") == 0)
+ {
+ if (strcmp(value[2], "ON") == 0)
+ {
+ currContext->getSessionDefaults()->setOdbcProcess(TRUE);
+ currContext->getSessionDefaults()->setStatisticsViewType(SQLCLI_PERTABLE_STATS);
+ }
+ }
+ else if (strcmp(value[1], "MARIAQUEST_PROCESS") == 0)
+ {
+ if (strcmp(value[2], "ON") == 0)
+ {
+ currContext->getSessionDefaults()->setMariaQuestProcess(TRUE);
+ }
+ }
+ else if (strcmp(value[1], "JDBC_PROCESS") == 0)
+ {
+ if (strcmp(value[2], "ON") == 0)
+ {
+ currContext->getSessionDefaults()->setJdbcProcess(TRUE);
+ currContext->getSessionDefaults()->setStatisticsViewType(SQLCLI_PERTABLE_STATS);
+ }
+ }
+ else if (strcmp(value[1], "MODE_SEABASE") == 0)
+ {
+ if (strcmp(value[2], "ON") == 0)
+ currContext->getSessionDefaults()->setModeSeabase(TRUE);
+ else
+ currContext->getSessionDefaults()->setModeSeabase(FALSE);
+ }
+ else if (strcmp(value[1], "SCHEMA") == 0)
+ {
+ currContext->getSessionDefaults()->
+ setSchema(value[2], strlen(value[2]));
+ }
+ else if (strcmp(value[1], "USER_EXPERIENCE_LEVEL") == 0)
+ {
+ currContext->getSessionDefaults()->
+ setUEL(value[2], strlen(value[2]));
+ }
+ else if (strcmp(value[1], "REDRIVE_CTAS") == 0)
+ {
+ if (strcmp(value[2], "ON") == 0)
+ currContext->getSessionDefaults()->setRedriveCTAS(TRUE);
+ else
+ currContext->getSessionDefaults()->setRedriveCTAS(FALSE);
+ }
+ else if (strcmp(value[1], "EXSM_TRACE_FILE_PREFIX") == 0)
+ {
+ char *prefix = value[2];
+ if (prefix != NULL)
+ currContext->getSessionDefaults()->
+ setExSMTraceFilePrefix(prefix, strlen(prefix));
+ }
+ else if (strcmp(value[1], "EXSM_TRACE_LEVEL") == 0)
+ {
+ int lvl = (int) strtoul(value[2], NULL, 10);
+ currContext->getSessionDefaults()->
+ setExSMTraceLevel(lvl);
+ }
+ else if (strcmp(value[1], "CALL_EMBEDDED_ARKCMP") == 0)
+ {
+ if ((strcmp(value[2], "TRUE") == 0) ||
+ (strcmp(value[2], "ON") == 0)
+ )
+ {
+ currContext->getSessionDefaults()->setCallEmbeddedArkcmp(TRUE);
+ }
+ else if ((strcmp(value[2], "FALSE") == 0) ||
+ (strcmp(value[2], "OFF") == 0)
+ )
+ {
+ currContext->getSessionDefaults()->setCallEmbeddedArkcmp(FALSE);
+ }
+ }
+ else if (strcmp(value[1], "ESP_IDLE_TIMEOUT") == 0)
+ {
+ int lvl = (int) strtoul(value[2], NULL, 10);
+ currContext->getSessionDefaults()->
+ setEspIdleTimeout(lvl);
+ }
+ else if (strcmp(value[1], "COMPILER_IDLE_TIMEOUT") == 0)
+ {
+ int lvl = (int) strtoul(value[2], NULL, 10);
+ currContext->getSessionDefaults()->
+ setCompilerIdleTimeout(lvl);
+ }
+ }
+ }
}
getHeap()->deallocateMemory(data);
-
// all ok. Return EOF.
ex_queue_entry * up_entry = qparent_.up->getTailEntry();
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/ex_control.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/ex_control.h b/core/sql/executor/ex_control.h
index 5c4a845..0a05376 100644
--- a/core/sql/executor/ex_control.h
+++ b/core/sql/executor/ex_control.h
@@ -63,16 +63,16 @@ public:
// retrieval of the virtual table function pointer of the class while
// unpacking. An empty constructor is enough.
// ---------------------------------------------------------------------
- NA_EIDPROC ExControlTdb()
+ ExControlTdb()
{}
- NA_EIDPROC virtual ~ExControlTdb()
+ virtual ~ExControlTdb()
{}
// ---------------------------------------------------------------------
// Build a TCB for this TDB. Redefined in the Executor project.
// ---------------------------------------------------------------------
- NA_EIDPROC virtual ex_tcb *build(ex_globals *globals);
+ virtual ex_tcb *build(ex_globals *globals);
private:
// ---------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/ex_ddl.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ex_ddl.cpp b/core/sql/executor/ex_ddl.cpp
index b7b4d94..b370a16 100644
--- a/core/sql/executor/ex_ddl.cpp
+++ b/core/sql/executor/ex_ddl.cpp
@@ -49,9 +49,7 @@
#include "ExSqlComp.h"
#include "HeapLog.h"
-#ifdef NA_CMPDLL
#include "CmpContext.h"
-#endif // NA_CMPDLL
#include "ComSmallDefs.h"
#include "ExExeUtil.h"
@@ -205,8 +203,6 @@ short ExDDLTcb::work()
CmpCompileInfo c(ddlTdb().query_, ddlTdb().queryLen_ + 1,
(Lng32)ddlTdb().queryCharSet_,
ddlTdb().objectName_, ddlTdb().objectNameLen_+1,
- masterGlob->getStatement()->recompControlInfo(),
- masterGlob->getStatement()->recompControlInfoLen(),
0, 0);
size_t dataLen = c.getLength();
@@ -253,7 +249,6 @@ short ExDDLTcb::work()
}
}
-#ifdef NA_CMPDLL
// Call either the embedded arkcmp, if exists, or external arkcmp
// but not both
if ( currContext->isEmbeddedArkcmpInitialized() &&
@@ -300,7 +295,6 @@ short ExDDLTcb::work()
}
}
else if (getArkcmp()) // regular arkcmp exists
-#endif
{ // start of calling the standard arkcmp process
cmp = getArkcmp();
@@ -529,9 +523,7 @@ short ExDDLwithStatusTcb::work()
mdi_ = new(getHeap())
CmpDDLwithStatusInfo(ddlTdb().query_, ddlTdb().queryLen_ + 1,
(Lng32)ddlTdb().queryCharSet_,
- ddlTdb().objectName_, ddlTdb().objectNameLen_+1,
- masterGlob->getStatement()->recompControlInfo(),
- masterGlob->getStatement()->recompControlInfoLen());
+ ddlTdb().objectName_, ddlTdb().objectNameLen_+1);
if (ddlTdb().getMDVersion())
mdi_->setGetMDVersion(TRUE);
@@ -868,10 +860,8 @@ ExSqlComp * ExDDLTcb::getArkcmp (void)
short indexIntoCompilerArray = currContext()->getIndexToCompilerArray();
const COM_VERSION compilerVersionOnEntry = (COM_VERSION) currContext()->getVersionOfCompiler();
-#ifdef NA_CMPDLL
if (!currContext()->getNumArkcmps())
return NULL; // no regular compiler exists
-#endif // NA_CMPDLL
if (compilerVersionOnEntry != getCompilerVersion())
{
@@ -988,7 +978,6 @@ short ExDescribeTcb::work()
}
}
#endif
-#ifdef NA_CMPDLL
// Call either the embedded arkcmp, if exists, or external arkcmp
// but not both
if (currContext() && currContext()->isEmbeddedArkcmpInitialized() &&
@@ -1037,7 +1026,6 @@ short ExDescribeTcb::work()
}
else if (getArkcmp()) // regular arkcmp exists
{
-#endif // NA_CMPDLL
// Build request and send to arkcmp. Wait for reply.
// This could be a waited or a nowaited call.
ExSqlComp *cmp = getArkcmp();
@@ -1480,8 +1468,6 @@ short ExProcessVolatileTableTcb::work()
CmpCompileInfo c(pvtTdb().query_, pvtTdb().queryLen_ + 1,
pvtTdb().queryCharSet_,
pvtTdb().objectName_, pvtTdb().objectNameLen_+1,
- masterGlob->getStatement()->recompControlInfo(),
- masterGlob->getStatement()->recompControlInfoLen(),
0, 0);
if (pvtTdb().hbaseDDL())
@@ -1514,133 +1500,132 @@ short ExProcessVolatileTableTcb::work()
size_t dataLen = c.getLength();
char * data = new(getHeap()) char[dataLen];
c.pack(data);
-#ifdef NA_CMPDLL
- // Call either the embedded arkcmp, if exists, or external arkcmp
- // but not both
- if ( currContext->isEmbeddedArkcmpInitialized() &&
- currContext->getSessionDefaults()->callEmbeddedArkcmp()
- && pvtTdb().hbaseDDL() &&
- CmpCommon::context() && (CmpCommon::context()->getRecursionLevel() == 0)
- )
- {
- Int32 embCmpStatus;
- const char *parentQid = masterGlob->getStatement()->
- getUniqueStmtId();
- CmpCommon::context()->sqlSession()->setParentQid(parentQid);
- if (embCmpDiagsArea == NULL)
- embCmpDiagsArea = ComDiagsArea::allocate(getHeap());
- embCmpStatus = CmpCommon::context()->compileDirect(
- data, dataLen,
- currContext->exHeap(),
- SQLCHARSETCODE_UTF8,
- EXSQLCOMP::PROCESSDDL,
- dummyReply, dummyLength,
- currContext->getSqlParserFlags(),
- parentQid, str_len(parentQid),
- embCmpDiagsArea);
- getHeap()->deallocateMemory(data);
- if (dummyReply != NULL)
- currContext->exHeap()->deallocateMemory((void*)dummyReply);
- if (embCmpStatus == ExSqlComp::SUCCESS)
- {
-
- // clear diagsArea of cli context which may have warnings
- // set when calling cli inside the embedded compiler
- if (!currContext->diags().getNumber(DgSqlCode::ERROR_))
- currContext->diags().clear();
-
- }
- else
- {
- handleErrors(pentry_down, embCmpDiagsArea, embCmpStatus);
- //Don't proceed if its an error.
- if (embCmpStatus == ExSqlComp::ERROR)
- {
- step_ = ERROR_;
- break;
- }
-
- }
- }
- else if (getArkcmp()) // regular arkcmp exists
-#endif
- {
- cmp = getGlobals()->castToExExeStmtGlobals()->
- castToExMasterStmtGlobals()->getCliGlobals()->getArkcmp();
-
- // ddl data is already in iso mapping default value.
- // Indicate that.
- // We cannot use the enum SQLCHARSETCODE_ISO_MAPPING out here as that
- // will cause mxcmp to use the default charset as iso88591.
- // So we send the charset of this input string.
- cmpStatus =
- cmp->sendRequest(EXSQLCOMP::PROCESSDDL, data, dataLen,
- TRUE, NULL,
- SQLCHARSETCODE_UTF8,
- TRUE, /*resend, if needed*/
- masterGlob->getStatement()->getUniqueStmtId(),
- masterGlob->getStatement()->getUniqueStmtIdLen());
-
- getHeap()->deallocateMemory(data);
-
- if (cmpStatus != ExSqlComp::SUCCESS)
- {
- // If its an error don't proceed further.
- handleErrors(pentry_down, cmp->getDiags(), (Int32) cmpStatus);
- if (cmpStatus == ExSqlComp::ERROR)
- {
- step_ = ERROR_;
- break;
- }
- }
-
- cmpStatus = cmp->getReply(dummyReply, dummyLength);
- cmp->getHeap()->deallocateMemory((void*)dummyReply);
- if (cmpStatus != ExSqlComp::SUCCESS)
- {
- // If its an error don't proceed further.
- handleErrors(pentry_down, cmp->getDiags(), (Int32) cmpStatus);
- if (cmpStatus == ExSqlComp::ERROR)
- {
- step_ = ERROR_;
- break;
- }
- }
-
- if (cmp->status() != ExSqlComp::FETCHED)
- {
- handleErrors(pentry_down, cmp->getDiags(), (Int32) cmpStatus);
-
- step_ = ERROR_;
- break;
- }
- }
-
- if ((pvtTdb().isCreate()) &&
- (pvtTdb().isSchema()))
- {
- masterGlob->getStatement()->getContext()->
- setVolatileSchemaCreated(TRUE);
- }
- if ((NOT pvtTdb().isCreate()) &&
- (pvtTdb().isSchema()))
- {
- masterGlob->getStatement()->getContext()->
- setVolatileSchemaCreated(FALSE);
- }
-
- if ((pvtTdb().isCreate()) &&
- (pvtTdb().isTable()))
- step_ = ADD_TO_VOL_TAB_LIST_;
- else if ((NOT pvtTdb().isCreate()) &&
- (pvtTdb().isTable()))
- step_ = REMOVE_FROM_VOL_TAB_LIST_;
- else
- step_ = DONE_;
+ // Call either the embedded arkcmp, if exists, or external arkcmp
+ // but not both
+ if ( currContext->isEmbeddedArkcmpInitialized() &&
+ currContext->getSessionDefaults()->callEmbeddedArkcmp()
+ && pvtTdb().hbaseDDL() &&
+ CmpCommon::context() && (CmpCommon::context()->getRecursionLevel() == 0)
+ )
+ {
+ Int32 embCmpStatus;
+ const char *parentQid = masterGlob->getStatement()->
+ getUniqueStmtId();
+ CmpCommon::context()->sqlSession()->setParentQid(parentQid);
+ if (embCmpDiagsArea == NULL)
+ embCmpDiagsArea = ComDiagsArea::allocate(getHeap());
+ embCmpStatus = CmpCommon::context()->compileDirect(
+ data, dataLen,
+ currContext->exHeap(),
+ SQLCHARSETCODE_UTF8,
+ EXSQLCOMP::PROCESSDDL,
+ dummyReply, dummyLength,
+ currContext->getSqlParserFlags(),
+ parentQid, str_len(parentQid),
+ embCmpDiagsArea);
+ getHeap()->deallocateMemory(data);
+ if (dummyReply != NULL)
+ currContext->exHeap()->deallocateMemory((void*)dummyReply);
+ if (embCmpStatus == ExSqlComp::SUCCESS)
+ {
+
+ // clear diagsArea of cli context which may have warnings
+ // set when calling cli inside the embedded compiler
+ if (!currContext->diags().getNumber(DgSqlCode::ERROR_))
+ currContext->diags().clear();
+
+ }
+ else
+ {
+ handleErrors(pentry_down, embCmpDiagsArea, embCmpStatus);
+ //Don't proceed if its an error.
+ if (embCmpStatus == ExSqlComp::ERROR)
+ {
+ step_ = ERROR_;
+ break;
+ }
+
+ }
+ }
+ else if (getArkcmp()) // regular arkcmp exists
+ {
+ cmp = getGlobals()->castToExExeStmtGlobals()->
+ castToExMasterStmtGlobals()->getCliGlobals()->getArkcmp();
+
+ // ddl data is already in iso mapping default value.
+ // Indicate that.
+ // We cannot use the enum SQLCHARSETCODE_ISO_MAPPING out here as that
+ // will cause mxcmp to use the default charset as iso88591.
+ // So we send the charset of this input string.
+ cmpStatus =
+ cmp->sendRequest(EXSQLCOMP::PROCESSDDL, data, dataLen,
+ TRUE, NULL,
+ SQLCHARSETCODE_UTF8,
+ TRUE, /*resend, if needed*/
+ masterGlob->getStatement()->getUniqueStmtId(),
+ masterGlob->getStatement()->getUniqueStmtIdLen());
+
+ getHeap()->deallocateMemory(data);
+
+ if (cmpStatus != ExSqlComp::SUCCESS)
+ {
+ // If its an error don't proceed further.
+ handleErrors(pentry_down, cmp->getDiags(), (Int32) cmpStatus);
+ if (cmpStatus == ExSqlComp::ERROR)
+ {
+ step_ = ERROR_;
+ break;
+ }
+ }
+
+ cmpStatus = cmp->getReply(dummyReply, dummyLength);
+ cmp->getHeap()->deallocateMemory((void*)dummyReply);
+ if (cmpStatus != ExSqlComp::SUCCESS)
+ {
+ // If its an error don't proceed further.
+ handleErrors(pentry_down, cmp->getDiags(), (Int32) cmpStatus);
+ if (cmpStatus == ExSqlComp::ERROR)
+ {
+ step_ = ERROR_;
+ break;
+ }
+ }
+
+ if (cmp->status() != ExSqlComp::FETCHED)
+ {
+ handleErrors(pentry_down, cmp->getDiags(), (Int32) cmpStatus);
+
+ step_ = ERROR_;
+ break;
+ }
+ }
+
+ if ((pvtTdb().isCreate()) &&
+ (pvtTdb().isSchema()))
+ {
+ masterGlob->getStatement()->getContext()->
+ setVolatileSchemaCreated(TRUE);
+ }
+
+ if ((NOT pvtTdb().isCreate()) &&
+ (pvtTdb().isSchema()))
+ {
+ masterGlob->getStatement()->getContext()->
+ setVolatileSchemaCreated(FALSE);
+ }
+
+ if ((pvtTdb().isCreate()) &&
+ (pvtTdb().isTable()))
+ step_ = ADD_TO_VOL_TAB_LIST_;
+ else if ((NOT pvtTdb().isCreate()) &&
+ (pvtTdb().isTable()))
+ step_ = REMOVE_FROM_VOL_TAB_LIST_;
+ else
+ step_ = DONE_;
}
break;
-
+
case ADD_TO_VOL_TAB_LIST_:
{
HashQueue * volTabList = currContext->getVolTabList();
@@ -1933,8 +1918,6 @@ short ExProcessInMemoryTableTcb::work()
CmpCompileInfo c(pimtTdb().query_, pimtTdb().queryLen_ + 1,
pimtTdb().queryCharSet_,
pimtTdb().objectName_, pimtTdb().objectNameLen_+1,
- masterGlob->getStatement()->recompControlInfo(),
- masterGlob->getStatement()->recompControlInfoLen(),
0, 0);
size_t dataLen = c.getLength();
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/ex_ddl.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/ex_ddl.h b/core/sql/executor/ex_ddl.h
index ad47ebe..efb3eac 100644
--- a/core/sql/executor/ex_ddl.h
+++ b/core/sql/executor/ex_ddl.h
@@ -69,16 +69,16 @@ public:
// retrieval of the virtual table function pointer of the class while
// unpacking. An empty constructor is enough.
// ---------------------------------------------------------------------
- NA_EIDPROC ExDDLTdb()
+ ExDDLTdb()
{}
- NA_EIDPROC virtual ~ExDDLTdb()
+ virtual ~ExDDLTdb()
{}
// ---------------------------------------------------------------------
// Build a TCB for this TDB. Redefined in the Executor project.
// ---------------------------------------------------------------------
- NA_EIDPROC virtual ex_tcb *build(ex_globals *globals);
+ virtual ex_tcb *build(ex_globals *globals);
private:
// ---------------------------------------------------------------------
@@ -121,16 +121,16 @@ public:
// retrieval of the virtual table function pointer of the class while
// unpacking. An empty constructor is enough.
// ---------------------------------------------------------------------
- NA_EIDPROC ExDDLwithStatusTdb()
+ ExDDLwithStatusTdb()
{}
- NA_EIDPROC virtual ~ExDDLwithStatusTdb()
+ virtual ~ExDDLwithStatusTdb()
{}
// ---------------------------------------------------------------------
// Build a TCB for this TDB. Redefined in the Executor project.
// ---------------------------------------------------------------------
- NA_EIDPROC virtual ex_tcb *build(ex_globals *globals);
+ virtual ex_tcb *build(ex_globals *globals);
private:
// ---------------------------------------------------------------------
@@ -341,16 +341,16 @@ public:
// retrieval of the virtual table function pointer of the class while
// unpacking. An empty constructor is enough.
// ---------------------------------------------------------------------
- NA_EIDPROC ExDescribeTdb()
+ ExDescribeTdb()
{}
- NA_EIDPROC virtual ~ExDescribeTdb()
+ virtual ~ExDescribeTdb()
{}
// ---------------------------------------------------------------------
// Build a TCB for this TDB. Redefined in the Executor project.
// ---------------------------------------------------------------------
- NA_EIDPROC virtual ex_tcb *build(ex_globals *globals);
+ virtual ex_tcb *build(ex_globals *globals);
private:
// ---------------------------------------------------------------------
@@ -444,16 +444,16 @@ public:
// retrieval of the virtual table function pointer of the class while
// unpacking. An empty constructor is enough.
// ---------------------------------------------------------------------
- NA_EIDPROC ExProcessVolatileTableTdb()
+ ExProcessVolatileTableTdb()
{}
- NA_EIDPROC virtual ~ExProcessVolatileTableTdb()
+ virtual ~ExProcessVolatileTableTdb()
{}
// ---------------------------------------------------------------------
// Build a TCB for this TDB. Redefined in the Executor project.
// ---------------------------------------------------------------------
- NA_EIDPROC virtual ex_tcb *build(ex_globals *globals);
+ virtual ex_tcb *build(ex_globals *globals);
private:
// ---------------------------------------------------------------------
@@ -545,16 +545,16 @@ public:
// retrieval of the virtual table function pointer of the class while
// unpacking. An empty constructor is enough.
// ---------------------------------------------------------------------
- NA_EIDPROC ExProcessInMemoryTableTdb()
+ ExProcessInMemoryTableTdb()
{}
- NA_EIDPROC virtual ~ExProcessInMemoryTableTdb()
+ virtual ~ExProcessInMemoryTableTdb()
{}
// ---------------------------------------------------------------------
// Build a TCB for this TDB. Redefined in the Executor project.
// ---------------------------------------------------------------------
- NA_EIDPROC virtual ex_tcb *build(ex_globals *globals);
+ virtual ex_tcb *build(ex_globals *globals);
private:
// ---------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/ex_error.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/ex_error.h b/core/sql/executor/ex_error.h
index 0e308d6..a1a07bc 100644
--- a/core/sql/executor/ex_error.h
+++ b/core/sql/executor/ex_error.h
@@ -54,21 +54,18 @@ struct ex_queue_pair;
// attached diagnostics area, then an empty one is allocated in heap "heap",
// and the indicated condition added to it. In either case, a pointer to
// the new condition is returned through parameter "cond".
-NA_EIDPROC
ComDiagsArea *ExRaiseSqlError(CollHeap* heap, ex_queue_entry* req,
ExeErrorCode code,
Lng32 * intParam1 = NULL,
char * stringParam1 = NULL,
ComCondition** cond=NULL);
-NA_EIDPROC
ComDiagsArea *ExRaiseSqlWarning(CollHeap* heap, ex_queue_entry* req,
ExeErrorCode code,
Lng32 * intParam1 = NULL,
char * stringParam1 = NULL,
ComCondition** cond=NULL);
-NA_EIDPROC
void ExHandleArkcmpErrors(ex_queue_pair &qparent,
ex_queue_entry *down_entry,
Lng32 matchNo,
@@ -76,7 +73,6 @@ void ExHandleArkcmpErrors(ex_queue_pair &qparent,
ComDiagsArea *da,
ExeErrorCode err = EXE_INTERNAL_ERROR);
-NA_EIDPROC
void ExHandleErrors(ex_queue_pair &qparent,
ex_queue_entry *down_entry,
Lng32 matchNo,
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/ex_esp_frag_dir.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ex_esp_frag_dir.cpp b/core/sql/executor/ex_esp_frag_dir.cpp
index f2ba14f..5627fe2 100644
--- a/core/sql/executor/ex_esp_frag_dir.cpp
+++ b/core/sql/executor/ex_esp_frag_dir.cpp
@@ -1182,9 +1182,7 @@ void ExEspControlMessage::actOnReceive(IpcConnection *connection)
int otherCPU, otherPID, otherNode_unused;
SB_Int64_Type seqNum = -1;
phandle.decompose(otherCPU, otherPID, otherNode_unused
-#ifdef SQ_PHANDLE_VERIFIER
, seqNum
-#endif
);
sm_target_t target;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/ex_ex.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ex_ex.cpp b/core/sql/executor/ex_ex.cpp
index 83fb62f..0e71bd3 100644
--- a/core/sql/executor/ex_ex.cpp
+++ b/core/sql/executor/ex_ex.cpp
@@ -48,24 +48,9 @@
#include "NAError.h"
#include "exp_expr.h"
#include "ExCextdecs.h"
-
-
-#ifndef __EID
#include "logmxevent.h"
-#else // __EID
-#include "ExeDp2.h"
-#endif
-
-// -----------------------------------------------------------------------
-// There is currently a bug in the tandem include file sys/time.h that
-// prevents us to get the definition of gettimeofday from there.
-// -----------------------------------------------------------------------
-// NT Port - vs 01/17/97
-// -----------------------------------------------------------------------
-#if (!defined (__TANDEM) && !defined(__EID) )
extern Int32 gettimeofday(struct timeval *, struct timezone *);
-#endif
// -----------------------------------------------------------------------
// NT Port - GSH 03/18/97
@@ -495,7 +480,6 @@ void ex_tcb::computeNeededPoolInfo(
}
}
-#ifndef __EID
void ex_tcb::mergeStats(ExStatisticsArea *otherStats)
{
ex_globals * glob = getGlobals();
@@ -515,7 +499,6 @@ void ex_tcb::mergeStats(ExStatisticsArea *otherStats)
else
glob->getStatsArea()->merge(otherStats);
}
-#endif
void ex_tcb::cpuLimitExceeded()
{
@@ -668,7 +651,6 @@ short ex_tcb::handleDone(ex_queue_pair *qparent, ComDiagsArea *inDiagsArea)
}
__declspec(dllexport)
-NA_EIDPROC
NABoolean ExExprComputeSpace(ex_tcb * tcb)
{
@@ -678,40 +660,6 @@ NABoolean ExExprComputeSpace(ex_tcb * tcb)
void ex_log_ems( const char *f, Int32 l, const char * m)
{
}
-#if defined(NA_LINUX) && defined(__EID)
-void assert_botch_in_eid( const char *f, Int32 l, const char * m)
-{
- // longjmp to handler if the assert botches in DP2
- void * sessionBufPtr;
- int_32 sessionBufLen;
- Int32 retCode;
- ex_log_ems(f, l, m);
- // testpoint to softdown dp2 before doing longjmp.
- if (DP2_EXECUTOR_IS_TESTPOINT_SET(SoftDownOnInternalError) != 0)
- // DP2_EXECUTOR_PER('test', 'pnts', 011504);
- DP2_EXECUTOR_PER(0x74657374, 0x706e7473, 011504);
- char *envvar;
- envvar = getenv("EID_ABORT_ON_ASSERT");
- if (envvar && *envvar == '1')
- {
- abort();
- }
- retCode = DP2_GET_SESSION_CONTEXT(&sessionBufPtr, &sessionBufLen);
- if (retCode == 0 && sessionBufPtr != EID_NULLP)
- {
- jmp_buf *jmpBufPtr;
- ex_globals * glob;
- SqlSessionData * sqlSessionData = (SqlSessionData *)sessionBufPtr;
- if ((glob = sqlSessionData->getGlobals()) != 0)
- {
- if (glob->IsJmpInScope() && (jmpBufPtr = glob->getJmpBuf()) != 0)
- longjmp(*jmpBufPtr, EXASSERT_FAILURE);
- }
- }
- // retCode = DP2_EXECUTOR_PER('asrt', 'fail', 011504);
- retCode = DP2_EXECUTOR_PER(0x61737274, 0x6661696c, 011504);
-}
-#endif
#pragma nowarn(770) // warning elimination
void assert_botch_longjmp( const char *f, Int32 l, const char * m)
{
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/ex_ex.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/ex_ex.h b/core/sql/executor/ex_ex.h
index 8e2b336..eb3b164 100644
--- a/core/sql/executor/ex_ex.h
+++ b/core/sql/executor/ex_ex.h
@@ -41,35 +41,19 @@
#include <setjmp.h>
#include "Platform.h"
-#ifndef __EID
extern jmp_buf ExeBuf;
-#endif
//typedef int (*funcptr) (void *);
typedef Int32 funcptr; // for now
-#if !defined(NA_WINNT) && defined(__EID)
- // The following fn is defined in ex_dp2exe_root.cpp
-NA_EIDPROC short logInternalErrorCode( const char * filename, Int32 line, Lng32 r );
-
-#define logInternalError(r) logInternalErrorCode(__FILE__, __LINE__, (r))
-
-#else
#define logInternalError(r) ((short)r)
-#endif
-NA_EIDPROC
void ex_log_ems( const char *f, Int32 l, const char * m);
-NA_EIDPROC
void assert_botch_longjmp( const char *f, int l, const char * m);
-#ifndef __EID
#define ex_assert(p, msg) if (!(p)) { assert_botch_abend( __FILE__ , __LINE__ , msg); }; // LCOV_EXCL_LINE
-#else
-void assert_botch_in_eid( const char *f, Int32 l, const char * m);
-#define ex_assert(p, msg) if (!(p)) { assert_botch_in_eid( __FILE__ , __LINE__ , msg); }; // LCOV_EXCL_LINE
-#endif
+
class ex_expr; // to be defined
// other classes referenced
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/ex_exe_stmt_globals.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ex_exe_stmt_globals.cpp b/core/sql/executor/ex_exe_stmt_globals.cpp
index caa2cdc..ecfbed1 100644
--- a/core/sql/executor/ex_exe_stmt_globals.cpp
+++ b/core/sql/executor/ex_exe_stmt_globals.cpp
@@ -59,7 +59,7 @@
class ComTdbRoot;
-#if !defined(__EID) && defined(_DEBUG) && defined(TRACE_ESP_ACCESS)
+#if defined(_DEBUG) && defined(TRACE_ESP_ACCESS)
#include "ComCextdecs.h"
// Comment in and build to trace an ESPAccess ESP process
@@ -262,7 +262,7 @@ ExExeStmtGlobals::ExExeStmtGlobals(short num_temps,
diagsArea_ = NULL;
resolvedNameList_ = NULL;
-#if !defined(__EID) && defined(_DEBUG) && defined (TRACE_ESP_ACCESS)
+#if defined(_DEBUG) && defined (TRACE_ESP_ACCESS)
espTraceList_ = new(getDefaultHeap()) ESPTraceList(this, getDefaultHeap());
#endif
@@ -372,7 +372,7 @@ void ExExeStmtGlobals::deleteMe(NABoolean fatalError)
// don't be fooled! The next statement does nothing... (don't know why)
deleteMemory(this);
-#if !defined(__EID) && defined(_DEBUG) && defined (TRACE_ESP_ACCESS)
+#if defined(_DEBUG) && defined (TRACE_ESP_ACCESS)
if (espTraceList_)
{
NADELETE(espTraceList_, ESPTraceList, getDefaultHeap());
@@ -598,7 +598,6 @@ ExMasterStmtGlobals::ExMasterStmtGlobals(
statement_ = statement;
rowsAffected_ = 0;
cancelState_ = CLI_CANCEL_TCB_INVALID;
- stmtCntrs_ = NULL;
resultSetInfo_ = NULL;
extractInfo_ = NULL;
verifyESP_ = FALSE;
@@ -981,17 +980,11 @@ void ExMasterStmtGlobals::insertExtractEsp(const IpcProcessId &pid)
Lng32 len = str_len(pidBuf);
const GuaProcessHandle &phandle = pid.getPhandle();
-#if (defined (NA_LINUX) && defined (SQ_NEW_PHANDLE))
Int32 cpu = -1, pin = -1;
-#else
- short cpu = -1, pin = -1;
-#endif // NA_LINUX
Int32 nodeNumber = -1;
SB_Int64_Type seqNum = 0;
Lng32 guaError = phandle.decompose(cpu, pin, nodeNumber
-#ifdef SQ_PHANDLE_VERIFIER
, seqNum
-#endif
);
if (guaError != 0)
{
@@ -1004,11 +997,9 @@ void ExMasterStmtGlobals::insertExtractEsp(const IpcProcessId &pid)
str_cpy_all(esp->phandleText_, pidBuf, len + 1);
esp->cpu_ = cpu;
esp->nodeNumber_ = nodeNumber;
-#ifdef SQ_PHANDLE_VERIFIER
// tbd - parallel extract - extract master executor will need to use
// verifier as part of process name. Need to test this and see if it
// is happening correctly. Maybe defer until we support parallel extract.
-#endif
}
void ExMasterStmtGlobals::insertExtractSecurityKey(const char *key)
@@ -1352,8 +1343,7 @@ void ExEspStmtGlobals::setReplyTag(Int64 transid, short replyTag)
NABoolean ExEspStmtGlobals::restoreTransaction()
{
-#if (defined(NA_GUARDIAN_IPC) || defined(NA_GUARDIAN_MSG))
-#ifndef NA_TMFNOTYETSUPPORTED
+#if (defined(NA_GUARDIAN_IPC))
if (replyTag_ != GuaInvalidReplyTag)
{
// we do have a transaction work request, switch to its transaction
@@ -1372,9 +1362,6 @@ NABoolean ExEspStmtGlobals::restoreTransaction()
getFragment(myHandle_)->getNeedsTransaction();
}
#else
- return TRUE;
-#endif
-#else
// without TMF, just wing it and return TRUE, if browse access
ex_assert(NOT espFragInstanceDir_->
getFragment(myHandle_)->getNeedsTransaction(),
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/ex_exe_stmt_globals.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/ex_exe_stmt_globals.h b/core/sql/executor/ex_exe_stmt_globals.h
index 7fc2904..5815eb7 100644
--- a/core/sql/executor/ex_exe_stmt_globals.h
+++ b/core/sql/executor/ex_exe_stmt_globals.h
@@ -52,12 +52,8 @@
#include "ex_frag_inst.h"
#include "Int64.h"
#include "ExCollections.h"
-#ifndef __EID
#include "timeout_data.h"
-#endif
-#if (defined (NA_NSK) || defined(NA_LINUX)) && !defined(__EID)
#include "ex_esp_frag_dir.h"
-#endif
// forward
class SequenceValueGenerator;
@@ -66,7 +62,7 @@ class SequenceValueGenerator;
//
//#define TRACE_ESP_ACCESS 1
-#if !defined(__EID) && defined(_DEBUG) && defined(TRACE_ESP_ACCESS)
+#if defined(_DEBUG) && defined(TRACE_ESP_ACCESS)
class ESPTraceEntry
{
@@ -112,9 +108,9 @@ public:
~ESPTraceList();
- NA_EIDPROC void insertNewTraceEntry(char *msg);
+ void insertNewTraceEntry(char *msg);
- NA_EIDPROC void logESPTraceToFile(char *fn, char *signature, ESPTraceList &traceList);
+ void logESPTraceToFile(char *fn, char *signature, ESPTraceList &traceList);
// Remove all entries the list and call their destructors
void clearAndDestroy();
@@ -171,9 +167,9 @@ public:
// Deletes objects this object points to... does NOT destroy
// this object
- NA_EIDPROC virtual void deleteMe(NABoolean fatalError);
+ virtual void deleteMe(NABoolean fatalError);
- NA_EIDPROC virtual ExExeStmtGlobals * castToExExeStmtGlobals();
+ virtual ExExeStmtGlobals * castToExExeStmtGlobals();
virtual ExMasterStmtGlobals * castToExMasterStmtGlobals();
virtual ExEspStmtGlobals * castToExEspStmtGlobals();
@@ -222,7 +218,7 @@ public:
inline ComDiagsArea *getDiagsArea() const { return diagsArea_; }
void setGlobDiagsArea(ComDiagsArea *da);
-#if !defined(__EID) && defined(_DEBUG) && defined (TRACE_ESP_ACCESS)
+#if defined(_DEBUG) && defined (TRACE_ESP_ACCESS)
inline ESPTraceList *getESPTraceList() const {return espTraceList_; }
void setESPTraceList(ESPTraceList *traceList) {espTraceList_ = traceList;}
#endif
@@ -299,8 +295,6 @@ public:
void setCloseAllOpens(NABoolean v) { closeAllOpens_ = v; }
NABoolean closeAllOpens() { return closeAllOpens_; }
-#ifndef __EID
-
// return TRUE iff this timeout was set, and then put value in timeoutValue
inline NABoolean getLockTimeout( char * tableName, Lng32 & timeoutValue )
{
@@ -325,8 +319,6 @@ public:
inline void yieldMemoryQuota(ULng32 size)
{ unusedBMOsMemoryQuota_ += size; }
-#endif
-
// getStreamTimeout: return TRUE (FALSE) if the stream-timeout was set (was
// not set). If set, the timeoutValue parameter would return that value
virtual NABoolean getStreamTimeout( Lng32 & timeoutValue );
@@ -398,16 +390,14 @@ private:
NABoolean closeAllOpens_;
-#ifndef __EID
// Hold all the dynamicly set timeout data (relevant to this statement)
// (Note: This pointer is NULL when there are no relevant timeouts set.)
TimeoutData * timeouts_;
// memory quota allocation given back by BMOs to be used by other BMOs
ULng32 unusedBMOsMemoryQuota_;
-#endif
-#if !defined(__EID) && defined(_DEBUG) && defined (TRACE_ESP_ACCESS)
+#if defined(_DEBUG) && defined (TRACE_ESP_ACCESS)
ESPTraceList *espTraceList_;
#endif
@@ -465,7 +455,7 @@ public:
// Deletes objects this object points to... does NOT destroy
// this object
- NA_EIDPROC virtual void deleteMe(NABoolean fatalError);
+ virtual void deleteMe(NABoolean fatalError);
virtual ExMasterStmtGlobals * castToExMasterStmtGlobals();
@@ -515,7 +505,7 @@ public:
NABoolean udrRuntimeOptionsChanged() const;
- NA_EIDPROC Int64 getRowsAffected() const {return rowsAffected_;}
+ Int64 getRowsAffected() const {return rowsAffected_;}
void setRowsAffected(Int64 newRows) {rowsAffected_ = newRows;}
inline CliStatement *getStatement() { return statement_; }
@@ -527,14 +517,12 @@ public:
void resetCancelState();
// The following two methods are called in /cli/Statement.cpp :
-#ifndef __EID
// copy timeout data relevant to this stmt (from the global CLI context)
// (This method is called after the statement was fixed up)
void setLocalTimeoutData(ComTdbRoot * rootTdb);
// check if a previous SET TIMEOUT statement affects this fixedup statement
// (This method is called before executing a previously fixedup statement)
NABoolean timeoutSettingChanged();
-#endif
ExRsInfo *getResultSetInfo(NABoolean createIfNecessary = FALSE);
void deleteResultSetInfo();
@@ -544,7 +532,6 @@ public:
IpcProcessId &pid, // OUT
ExRsInfo *&rsInfo); // OUT
-#if (defined (NA_NSK) || defined(NA_LINUX)) && !defined (__EID)
StatsGlobals *getStatsGlobals()
{ return (cliGlobals_ ? cliGlobals_->getStatsGlobals() : NULL); }
Long getSemId()
@@ -558,8 +545,6 @@ public:
Lng32 myNodeNumber() { return (cliGlobals_ ? cliGlobals_->myNodeNumber() : (short)0);}
-#endif
-
inline NABoolean verifyESP() { return verifyESP_; }
inline void setVerifyESP() { verifyESP_ = TRUE; }
inline void resetVerifyESP() { verifyESP_ = FALSE; }
@@ -609,9 +594,6 @@ private:
// stmt was fixed up (speeds up checking that timeout values are up-to-date)
ULng32 localSnapshotOfTimeoutChangeCounter_;
- // Measure stmt counters
- ExMeasStmtCntrs *stmtCntrs_;
-
// Store Procedure Result Set Info
// will always be NULL except for CALL statements that produce result sets.
ExRsInfo *resultSetInfo_;
@@ -737,7 +719,6 @@ public:
virtual void decrementSendTopMsgesOut();
-#if (defined (NA_NSK) || defined(NA_LINUX)) && !defined (__EID)
StatsGlobals *getStatsGlobals()
{ return espFragInstanceDir_->getStatsGlobals(); }
Long getSemId()
@@ -746,7 +727,6 @@ public:
{ return espFragInstanceDir_->getPid();}
pid_t getTid()
{ return espFragInstanceDir_->getTid();}
-#endif
NABoolean isAnESPAccess() {return isAnESPAccess_;}
void setIsAnESPAccess(NABoolean a) { isAnESPAccess_ = a;}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/ex_frag_rt.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ex_frag_rt.cpp b/core/sql/executor/ex_frag_rt.cpp
index f468fd6..f56769c 100644
--- a/core/sql/executor/ex_frag_rt.cpp
+++ b/core/sql/executor/ex_frag_rt.cpp
@@ -55,7 +55,7 @@
#include "ComDistribution.h"
#include "sql_buffer_size.h"
// #include "MXVersion.h"
-#if (defined(NA_GUARDIAN_IPC) || defined(NA_GUARDIAN_MSG) || defined(NA_HSC))
+#if (defined(NA_GUARDIAN_IPC))
#include "ExCextdecs.h"
#endif
@@ -1306,13 +1306,8 @@ void ExRtFragTable::assignPartRangesAndTA(NABoolean /*initial*/)
new(ipcHeap) ExMsgTransId
(ipcHeap,
glob_->getTransid(),
-#if (defined (NA_LINUX) && defined (SQ_NEW_PHANDLE))
(short *)&(inst->usedEsp_->getIpcServer()->
getServerId().getPhandle().phandle_));
-#else
- (short *)inst->usedEsp_->getIpcServer()->
- getServerId().getPhandle().phandle_);
-#endif // NA_LINUX
*workMsg << *msgTransId;
@@ -1764,7 +1759,7 @@ void ExRtFragTable::addLoadRequestToMessage(ExMasterEspMessage *msg,
userID = *((Int32 *) pUserID);
userName = context->getDatabaseUserName();
userNameLen = (Int32) strlen(userName) + 1;
-#if defined(NA_DEBUG_C_RUNTIME)
+#ifdef _DEBUG
if (fragDir_->getType(fragId) == ExFragDir::ESP)
{
NABoolean doDebug = (getenv("DBUSER_DEBUG") ? TRUE : FALSE);
@@ -2093,9 +2088,7 @@ void ExRtFragTable::dumpSMRouteTable()
inst->usedEsp_->getIpcServer()->getServerId();
processId.getPhandle().decompose(cpu, pin, node
-#ifdef SQ_PHANDLE_VERIFIER
, seqNum
-#endif
);
node = ExSM_GetNodeID(cpu);
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/ex_globals.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ex_globals.cpp b/core/sql/executor/ex_globals.cpp
index a931391..add53ee 100644
--- a/core/sql/executor/ex_globals.cpp
+++ b/core/sql/executor/ex_globals.cpp
@@ -119,7 +119,6 @@ void ex_globals::deleteMe(NABoolean fatalError)
if (statsArea_)
{
-#ifndef __EID
StatsGlobals *statsGlobals = getStatsGlobals();
if (statsGlobals == NULL)
{
@@ -135,9 +134,6 @@ void ex_globals::deleteMe(NABoolean fatalError)
NADELETE(statsArea_, ExStatisticsArea, statsArea_->getHeap());
statsGlobals->releaseStatsSemaphore(semId, getPid(), savedPriority, savedStopMode);
}
-#else
- NADELETE(statsArea_, ExStatisticsArea, statsArea_->getHeap());
-#endif
}
statsArea_ = NULL;
cleanupTcbs();
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/ex_globals.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/ex_globals.h b/core/sql/executor/ex_globals.h
index f835b1a..27e2ae2 100644
--- a/core/sql/executor/ex_globals.h
+++ b/core/sql/executor/ex_globals.h
@@ -70,67 +70,67 @@ class ex_globals : public ExGod
{
public:
- NA_EIDPROC ex_globals(short num_temps,
+ ex_globals(short num_temps,
short create_gui_sched = 0,
Space * space = NULL,
CollHeap * heap = NULL);
// reallocate members
- NA_EIDPROC void reAllocate(short create_gui_sched = 0);
+ void reAllocate(short create_gui_sched = 0);
// to be called instead of a destructor
- NA_EIDPROC virtual void deleteMe(NABoolean fatalError);
+ virtual void deleteMe(NABoolean fatalError);
// operator to delete memory allocated with ::operator new(ex_globals *)
// NOTE: this of course does NOT call the destructor for the object to delete
- NA_EIDPROC void deleteMemory(void *mem);
+ void deleteMemory(void *mem);
- NA_EIDPROC inline ExScheduler * getScheduler() { return sch_; }
+ inline ExScheduler * getScheduler() { return sch_; }
- NA_EIDPROC inline void ** getTempsList() { return tempList_; }
- NA_EIDPROC inline Lng32 getNumTemps() const { return numTemps_; }
- NA_EIDPROC void setNumOfTemps(Lng32 numTemps);
+ inline void ** getTempsList() { return tempList_; }
+ inline Lng32 getNumTemps() const { return numTemps_; }
+ void setNumOfTemps(Lng32 numTemps);
- NA_EIDPROC inline void setSpace(Space * space) {space_ = space;}
- NA_EIDPROC inline Space * getSpace() {return space_;}
+ inline void setSpace(Space * space) {space_ = space;}
+ inline Space * getSpace() {return space_;}
// return a pointer to default heap, which is the heap specified
// as an argument to the constructor
- NA_EIDPROC inline CollHeap *getDefaultHeap() { return heap_; }
+ inline CollHeap *getDefaultHeap() { return heap_; }
- NA_EIDPROC virtual ExExeStmtGlobals * castToExExeStmtGlobals();
- NA_EIDPROC virtual ExEidStmtGlobals * castToExEidStmtGlobals();
+ virtual ExExeStmtGlobals * castToExExeStmtGlobals();
+ virtual ExEidStmtGlobals * castToExEidStmtGlobals();
- NA_EIDPROC inline void setStatsArea(ExStatisticsArea * statsArea)
+ inline void setStatsArea(ExStatisticsArea * statsArea)
{ statsArea_ = statsArea; }
// returns stats area, if allocated AND if stats are enabled
- NA_EIDPROC ExStatisticsArea* getStatsArea()
+ ExStatisticsArea* getStatsArea()
{ return (statsEnabled() ? statsArea_ : NULL); }
// returns stats area, if it were allocated
- NA_EIDPROC ExStatisticsArea* getOrigStatsArea()
+ ExStatisticsArea* getOrigStatsArea()
{ return statsArea_; }
- NA_EIDPROC inline jmp_buf *getJmpBuf() { return &longJmpTgt_; }
- NA_EIDPROC inline void setJmpInScope(NABoolean jmpInScope)
+ inline jmp_buf *getJmpBuf() { return &longJmpTgt_; }
+ inline void setJmpInScope(NABoolean jmpInScope)
{ jmpInScope_ = jmpInScope; }
- NA_EIDPROC inline NABoolean IsJmpInScope() { return jmpInScope_; }
+ inline NABoolean IsJmpInScope() { return jmpInScope_; }
- NA_EIDPROC inline void setEventConsumed(UInt32 *eventConsumed)
+ inline void setEventConsumed(UInt32 *eventConsumed)
{ eventConsumedAddr_ = eventConsumed; }
- NA_EIDPROC inline UInt32 *getEventConsumed()
+ inline UInt32 *getEventConsumed()
{ return eventConsumedAddr_; }
- NA_EIDPROC inline void registerTcb( ex_tcb *newTcb)
+ inline void registerTcb( ex_tcb *newTcb)
{ tcbList_.insert(newTcb); }
- NA_EIDPROC void cleanupTcbs();
+ void cleanupTcbs();
- NA_EIDPROC void testAllQueues();
+ void testAllQueues();
- NA_EIDPROC ExMeasStmtCntrs* getMeasStmtCntrs();
+ ExMeasStmtCntrs* getMeasStmtCntrs();
// get the fragment id, the number of instances for my fragment,
@@ -139,43 +139,39 @@ public:
virtual Lng32 getNumOfInstances() const = 0;
virtual Lng32 getMyInstanceNumber() const = 0;
-NA_EIDPROC
+
inline ULng32 getInjectErrorAtExpr() const
{ return injectErrorAtExprFreq_; }
-NA_EIDPROC
+
inline void setInjectErrorAtExpr(ULng32 cif)
{ injectErrorAtExprFreq_ = cif; }
-NA_EIDPROC
+
inline ULng32 getInjectErrorAtQueue() const
{ return injectErrorAtQueueFreq_; }
-NA_EIDPROC
+
inline void setInjectErrorAtQueue(ULng32 cif)
{ injectErrorAtQueueFreq_ = cif; }
-NA_EIDPROC
const LIST(ex_tcb *) &tcbList() const { return tcbList_; }
-NA_EIDPROC
+
NABoolean computeSpace(){return (flags_ & COMPUTE_SPACE) != 0;};
-NA_EIDPROC
void setComputeSpace(NABoolean v)
{ (v ? flags_ |= COMPUTE_SPACE : flags_ &= ~COMPUTE_SPACE); };
-NA_EIDPROC
+
NABoolean measStmtEnabled(){return (flags_ & MEAS_STMT_ENABLED) != 0;};
-NA_EIDPROC
void setMeasStmtEnabled(NABoolean v)
{ (v ? flags_ |= MEAS_STMT_ENABLED : flags_ &= ~MEAS_STMT_ENABLED); };
-NA_EIDPROC
+
NABoolean statsEnabled() {return (flags_ & STATS_ENABLED) != 0;};
-NA_EIDPROC
void setStatsEnabled(NABoolean v)
{ (v ? flags_ |= STATS_ENABLED : flags_ &= ~STATS_ENABLED); };
// getStreamTimeout: return TRUE (FALSE) if the stream-timeout was set (was
// not set). If set, the timeoutValue parameter would return that value
- NA_EIDPROC virtual NABoolean getStreamTimeout( Lng32 & timeoutValue ) = 0;
+ virtual NABoolean getStreamTimeout( Lng32 & timeoutValue ) = 0;
UInt32 planVersion() {return planVersion_;};
void setPlanVersion(UInt32 pv){planVersion_ = pv; };
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/ex_god.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/ex_god.h b/core/sql/executor/ex_god.h
index 1ec8124..9bbe887 100644
--- a/core/sql/executor/ex_god.h
+++ b/core/sql/executor/ex_god.h
@@ -48,7 +48,6 @@
class ExGod : public NABasicObject
{
protected:
-NA_EIDPROC
virtual ~ExGod();
};
#pragma warn(1103) // warning elimination
@@ -57,6 +56,5 @@ NA_EIDPROC
// the next two methods will eventually be removed after all
// executor objects have been derived from ExGod(or something
// similar).
-NA_EIDPROC
void * operator new(size_t size, Space *s);
#endif
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/ex_hash_grby.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ex_hash_grby.cpp b/core/sql/executor/ex_hash_grby.cpp
index 325c169..8ce966c 100644
--- a/core/sql/executor/ex_hash_grby.cpp
+++ b/core/sql/executor/ex_hash_grby.cpp
@@ -75,7 +75,7 @@ const char *ex_hash_grby_tcb::HashGrbyPhaseStr[] = {
NABoolean ex_hash_grby_tcb::needStatsEntry()
{
ComTdb::CollectStatsType statsType = getGlobals()->getStatsArea()->getCollectStatsType();
- // stats are collected for ALL and MEASURE options.
+ // stats are collected for ALL and OPERATOR options.
if (statsType == ComTdb::ALL_STATS || statsType == ComTdb::OPERATOR_STATS)
return TRUE;
else
@@ -166,14 +166,10 @@ ex_hash_grby_tcb::ex_hash_grby_tcb(const ex_hash_grby_tdb & hash_grby_tdb,
{
bmoStats_ = NULL;
hashGroupByStats_ = NULL;
-#ifndef __EID
heap_ = new (glob->getDefaultHeap()) NAHeap("Hash Groupby Heap", (NAHeap *)glob->getDefaultHeap());
// set the memory monitor
memMonitor_ = getGlobals()->castToExExeStmtGlobals()->getMemoryMonitor();
-#else
- heap_ = glob->getDefaultHeap();
-#endif
// Copy all expression pointers. This must be done first because
// some of the pointers are used subsequently (i.e. bitMuxExpr_) in
@@ -470,8 +466,6 @@ short ex_hash_grby_tcb::work() {
workReadChild();
} break;
-#ifndef __EID
-
case HASH_GRBY_READ_OF_ROW: {
if (parentQueue_.up->isFull())
return WORK_OK;
@@ -510,8 +504,6 @@ short ex_hash_grby_tcb::work() {
return WORK_CALL_AGAIN;
} break;
-#endif
-
case HASH_GRBY_EVALUATE: {
workEvaluate();
} break;
@@ -654,7 +646,6 @@ short ex_hash_grby_tcb::work() {
// pass it to parent. rc_ has the error code and
// oldState_ tells us in which state the error occured
ComDiagsArea * diags = NULL;
-#ifndef __EID
if(rc_ == EXE_SORT_ERROR)
{
char msg[512];
@@ -678,7 +669,6 @@ short ex_hash_grby_tcb::work() {
msg);
}
else
-#endif
diags = ExRaiseSqlError(heap_, downParentEntry, (ExeErrorCode)-rc_);
downParentEntry->setDiagsArea(diags);
@@ -728,7 +718,6 @@ void ex_hash_grby_tcb::workInitialize() {
ULng32 noOfClusters = 0;
-#ifndef __EID
// We use memUsagePercent_ of the physical memory for the HGB.
ULng32 availableMemory = memMonitor_->getPhysMemInBytes() / 100
* hashGrbyTdb().memUsagePercent_;
@@ -739,19 +728,12 @@ void ex_hash_grby_tcb::workInitialize() {
if ( hashGrbyTdb().memoryQuotaMB() > 10 && // mem quota set? (10MB, 2 B safe)
hashGrbyTdb().memoryQuotaMB() * ONE_MEG < availableMemory )
availableMemory = hashGrbyTdb().memoryQuotaMB() * ONE_MEG ;
-#else
- // in DP2 just use 10 MB
- ULng32 availableMemory = 10 * ONE_MEG;
-#endif
haveSpilled_ = FALSE;
-#if !defined (__EID)
ioTimer_.resetTimer();
-#endif
if (!hashGrbyTdb().isPartialGroup_) {
-#ifndef __EID
// size of inner table (including row headers and hash chains) in bytes
// This may be a very large number, max out at 8 GB and take at
// least 100 KB. Don't completely trust the optimizer ;-)
@@ -788,7 +770,6 @@ void ex_hash_grby_tcb::workInitialize() {
// the extreme case, each cluster has only one bucket and only one buffer
ULng32 maxNoOfClusters = totalBuffers/bucketsPerCluster;
noOfClusters = MINOF(noOfClusters, maxNoOfClusters);
-#endif
}
else {
// partial group by. we need only one cluster. If this cluster is full
@@ -798,8 +779,6 @@ void ex_hash_grby_tcb::workInitialize() {
// Memory to be used for pHGB.
//
-#ifndef __EID
-
// For Partial Groupby in ESP, use a limited amount of memory
// Based on CQD EXE_MEMORY_FOR_PARTIALHGB_MB.
// Default to 100 MB, minimum setting 10 MB
@@ -810,7 +789,6 @@ void ex_hash_grby_tcb::workInitialize() {
} else if(availableMemory < 10 * ONE_MEG) {
availableMemory = 10 * ONE_MEG;
} // LCOV_EXCL_STOP
-#endif
// reset the counter for every run.
partialGroupbyMissCounter_ = 0;
@@ -843,15 +821,12 @@ void ex_hash_grby_tcb::workInitialize() {
buckets_,
bucketCount_,
availableMemory,
-#ifndef __EID
memMonitor_,
hashGrbyTdb().pressureThreshold_,
getGlobals()->castToExExeStmtGlobals(),
-#endif
&rc_,
hashGrbyTdb().isPartialGroup_, // no O/F
hashGrbyTdb().isPartialGroup_,
-#ifndef __EID
hashGrbyTdb().minBuffersToFlush_,
hashGrbyTdb().numInBatch_,
@@ -874,7 +849,6 @@ void ex_hash_grby_tcb::workInitialize() {
0,
0,
0,
-#endif
hashGrbyTdb().initialHashTableSize_,
getStatsEntry()
);
@@ -901,9 +875,7 @@ void ex_hash_grby_tcb::workInitialize() {
break;
}
-#ifndef __EID
clusterDb_->setBMOMaxMemThresholdMB(hashGrbyTdb().getBMOMaxMemThresholdMB());
-#endif
Cluster * cluster = NULL;
ULng32 i;
@@ -1177,11 +1149,7 @@ void ex_hash_grby_tcb::workReadChild() {
}
} else // (distinct) New group, no aggregates
if ( cluster->getState() == Cluster::CHAINED ) // not spilled yet
- #ifdef __EID
- returnResultCurrentRow();
- #else
- returnResultCurrentRow(cluster->getLastDataPointer()); // return this row now up to the parent
- #endif
+ returnResultCurrentRow(cluster->getLastDataPointer()); // return this row now up to the parent
}
else {
// we couldn't insert the row. If we got an error, handle it.
@@ -1242,14 +1210,13 @@ void ex_hash_grby_tcb::workReadChild() {
// remove the row from the child's queue
childQueue_.up->removeHead();
-#ifndef __EID
if ( hashGrbyTdb().logDiagnostics() ) { // LOG
// Report memory quota allocation grabbing while reading child rows
if ( clusterDb_->memoryQuotaMB() > hashGrbyTdb().memoryQuotaMB() ) {
char msg[512];
sprintf(msg, "HGB End reading input (%u). GRABBED additional quota %u MB",
- 0, // NA_64BIT, use instance id later
+ 0,
clusterDb_->memoryQuotaMB() -
hashGrbyTdb().memoryQuotaMB());
// log an EMS event and continue
@@ -1317,8 +1284,6 @@ void ex_hash_grby_tcb::workReadChild() {
// global count of unused memory, so that other BMOs may use this memory
clusterDb_->yieldUnusedMemoryQuota(ofClusterList_, bucketCount_ );
-#endif
-
} break;
case ex_queue::Q_SQLERROR: {
@@ -1452,8 +1417,6 @@ Int32 ex_hash_grby_tcb::workReadChildBitMux() {
}
// LCOV_EXCL_STOP
-#ifndef __EID
-
/////////////////////////////////////////////////////////////////////////////
// read rows from the overflow buffer and aggregate them into the
// hash buffer
@@ -1620,7 +1583,6 @@ void ex_hash_grby_tcb::workSpill() {
// all I/Os are done, go back to the state were we came from
setState(oldState_);
clusterDb_->setClusterToFlush(NULL);
-#ifndef __EID
if ( hashGrbyTdb().logDiagnostics() ) {
Int64 elapsedIOTime = ioTimer_.endTimer(); // stop timing, get current total
if (!haveSpilled_) {
@@ -1633,15 +1595,12 @@ void ex_hash_grby_tcb::workSpill() {
haveSpilled_ = TRUE;
}
}
-#endif
}
else {
numIOChecks_++;
-#ifndef __EID
if ( hashGrbyTdb().logDiagnostics() ) {
ioTimer_.startTimer(); // start accumulating time
}
-#endif
if (rc_)
setState(HASH_GRBY_ERROR);
};
@@ -1664,8 +1623,6 @@ void ex_hash_grby_tcb::workReadBuffer() {
};
};
-#endif
-
/////////////////////////////////////////////////////////////////////////////
// workEvaluate: prepare clusters for next phase
/////////////////////////////////////////////////////////////////////////////
@@ -1701,8 +1658,6 @@ void ex_hash_grby_tcb::workEvaluate() {
}
}
-#ifndef __EID
-
else {
// the cluster is FLUSHED/SPILLED.
@@ -1736,13 +1691,9 @@ void ex_hash_grby_tcb::workEvaluate() {
cluster->releaseAllHashBuffers();
};
-#endif
-
cluster = clusterDb_->getClusterList();
};
-#ifndef __EID
-
// all clusters are now either processed or on the overFlowList.
// Before handling another spilled cluster, try and yield some memory
@@ -1817,7 +1768,6 @@ void ex_hash_grby_tcb::workEvaluate() {
return;
}
-#endif
// no more clusters to process. We are done unless there are bitmux
// rows to return (and aggregation is used, so these rows weren't returned)
if ( bitMuxTable_ && hbAggrExpr_ )
@@ -1887,7 +1837,7 @@ ULng32 ex_hash_grby_tcb::workReturnRows(NABoolean tryToDefrag) {
}
if (resultPool_->get_free_tuple(workAtp_->getTupp(resultRowAtpIndex_),*rowLenPtr))
return 2 ; //WORK_POOL_BLOCKED;
-#if (defined (NA_LINUX) && defined(_DEBUG) && !defined(__EID))
+#if (defined(_DEBUG))
char txt[] = "hashgrpby";
SqlBuffer * buf = resultPool_->getCurrentBuffer();
sql_buffer_pool::logDefragInfo(txt,
@@ -1953,7 +1903,6 @@ ULng32 ex_hash_grby_tcb::workReturnRows(NABoolean tryToDefrag) {
matchCount_++;
upParentEntry->upState.setMatchNo(matchCount_);
-#ifndef __EID
if ( matchCount_ == 1 && haveSpilled_ ) {
// haveSpilled_ indicates that an overflow took place (Only for distinct
// HGB the overflow occurs after the return of the first row, but that
@@ -1963,7 +1912,6 @@ ULng32 ex_hash_grby_tcb::workReturnRows(NABoolean tryToDefrag) {
"HASH GRBY returns first row.",
hashGrbyTdb().getExplainNodeId());
}
-#endif
// insert into parent up queue
parentQueue_.up->insert();
@@ -2084,7 +2032,6 @@ void ex_hash_grby_tcb::workDone() {
parentQueue_.down->removeHead();
-#ifndef __EID
if ( haveSpilled_ && hashGrbyTdb().logDiagnostics() ) {
char msg[256];
Int64 elapsedIOTime = ioTimer_.endTimer();// stop timing, get current total
@@ -2096,7 +2043,6 @@ void ex_hash_grby_tcb::workDone() {
hashGrbyTdb().getExplainNodeId());
numIOChecks_ = 0;
}
-#endif
setState(HASH_GRBY_EMPTY);
parentQueue_.up->insert();
@@ -2116,11 +2062,9 @@ void ex_hash_grby_tcb::workDone() {
};
if (clusterDb_) {
-#ifndef __EID
// Yield memory allocated back to global count of unused memory, so that
// other BMOs may use this memory
clusterDb_->yieldAllMemoryQuota(); // yield all of the alloc memory
-#endif
delete clusterDb_;
clusterDb_ = NULL;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/ex_hash_grby.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/ex_hash_grby.h b/core/sql/executor/ex_hash_grby.h
index 5c06566..ace7ca5 100644
--- a/core/sql/executor/ex_hash_grby.h
+++ b/core/sql/executor/ex_hash_grby.h
@@ -78,16 +78,16 @@ public:
// retrieval of the virtual table function pointer of the class while
// unpacking. An empty constructor is enough.
// ---------------------------------------------------------------------
- NA_EIDPROC ex_hash_grby_tdb()
+ ex_hash_grby_tdb()
{}
- NA_EIDPROC virtual ~ex_hash_grby_tdb()
+ virtual ~ex_hash_grby_tdb()
{} // LCOV_EXCL_LINE
// ---------------------------------------------------------------------
// Build a TCB for this TDB. Redefined in the Executor project.
// ---------------------------------------------------------------------
- NA_EIDPROC virtual ex_tcb *build(ex_globals *globals);
+ virtual ex_tcb *build(ex_globals *globals);
private:
// ---------------------------------------------------------------------
@@ -152,9 +152,7 @@ class ex_hash_grby_tcb : public ex_tcb {
Space * space_;
CollHeap * heap_;
-#ifndef __EID
MemoryMonitor * memMonitor_;
-#endif
const ex_tcb * childTcb_;
ex_queue_pair parentQueue_;
@@ -260,91 +258,64 @@ class ex_hash_grby_tcb : public ex_tcb {
//CIF buffer defragmentation
tupp_descriptor * defragTd_;
-NA_EIDPROC
void workInitialize();
-NA_EIDPROC
void workReadChild();
-NA_EIDPROC
Int32 workReadChildBitMux();
-NA_EIDPROC
void workReadOverFlowRow();
-NA_EIDPROC
void workSpill();
-NA_EIDPROC
void workReadBuffer();
-NA_EIDPROC
void workEvaluate();
-NA_EIDPROC
ULng32 workReturnRows(NABoolean tryToDefrag);
-NA_EIDPROC
void workDone();
-NA_EIDPROC
void workHandleError(atp_struct* atp = NULL);
-NA_EIDPROC
inline void setState(HashGrbyState state) {
oldState_ = state_;
state_ = state;
};
-NA_EIDPROC
inline NABoolean isReadingFromChild() const { return readingChild_; }
-NA_EIDPROC
inline void inReadingFromChild() { readingChild_ = TRUE; }
-NA_EIDPROC
inline void doneReadingFromChild() { readingChild_ = FALSE; }
-NA_EIDPROC
void returnResultCurrentRow(HashRow * dataPointer = NULL);
-NA_EIDPROC
void resetClusterAndReadFromChild(); // Tmobile.
public:
static const char *HashGrbyPhaseStr[];
-NA_EIDPROC
ex_hash_grby_tcb(const ex_hash_grby_tdb & hash_grby_tdb,
const ex_tcb & childTcb,
ex_globals * glob);
-NA_EIDPROC
~ex_hash_grby_tcb();
-NA_EIDPROC
void freeResources(); // free resources
-NA_EIDPROC
void registerSubtasks();
-NA_EIDPROC
short work(); // when scheduled to do work
-NA_EIDPROC
inline ex_hash_grby_tdb & hashGrbyTdb() const;
-NA_EIDPROC
ex_queue_pair getParentQueue() const { return parentQueue_; }
-NA_EIDPROC
virtual const ex_tcb* getChild(Int32 pos) const;
-NA_EIDPROC
virtual Int32 numChildren() const { return 1; }
-NA_EIDPROC
virtual NABoolean needStatsEntry();
-NA_EIDPROC
virtual ExOperStats *doAllocateStatsEntry(CollHeap *heap,
ComTdb *tdb);
@@ -358,7 +329,6 @@ NA_EIDPROC
History : Yeogirl Yun 8/14/95
Initial Revision.
*****************************************************************************/
-NA_EIDPROC
inline const ex_tcb* ex_hash_grby_tcb::getChild(Int32 pos) const {
ex_assert((pos >= 0), ""); // LCOV_EXCL_START
if (pos == 0)
@@ -373,7 +343,6 @@ inline const ex_tcb* ex_hash_grby_tcb::getChild(Int32 pos) const {
//
///////////////////////////////////////////////////////////////////////////
-NA_EIDPROC
inline ex_hash_grby_tdb & ex_hash_grby_tcb::hashGrbyTdb() const {
return (ex_hash_grby_tdb &) tdb;
};
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/ex_hashj.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ex_hashj.cpp b/core/sql/executor/ex_hashj.cpp
index 602ce8d..b029975 100644
--- a/core/sql/executor/ex_hashj.cpp
+++ b/core/sql/executor/ex_hashj.cpp
@@ -216,14 +216,13 @@ void ex_hashj_tcb::registerSubtasks()
NABoolean ex_hashj_tcb::needStatsEntry()
{
ComTdb::CollectStatsType statsType = getGlobals()->getStatsArea()->getCollectStatsType();
- // stats are collected for ALL and MEASURE options.
+ // stats are collected for ALL and OPERATOR options.
if (statsType == ComTdb::ALL_STATS || statsType == ComTdb::OPERATOR_STATS)
return TRUE;
else
return FALSE;
}
-
ExOperStats * ex_hashj_tcb::doAllocateStatsEntry(CollHeap *heap, ComTdb *tdb)
{
ExBMOStats *stat;
@@ -1051,7 +1050,6 @@ ExWorkProcRetcode ex_hashj_tcb::workUp() {
if (!da || !da->contains((Lng32) -rc_))
{
ComDiagsArea * diags = NULL;
-#ifndef __EID
if(rc_ == EXE_SORT_ERROR)
{
char msg[512];
@@ -1076,7 +1074,6 @@ ExWorkProcRetcode ex_hashj_tcb::workUp() {
}
else
-#endif
diags = ExRaiseSqlError(heap_, downParentEntry,
(ExeErrorCode) -rc_);
@@ -1479,9 +1476,7 @@ NABoolean ex_hashj_tcb::allocateClusters() {
clusterDb_->setScratchOverflowMode(SCRATCH_DISK);
break;
}
-#ifndef __EID
clusterDb_->setBMOMaxMemThresholdMB(hashJoinTdb().getBMOMaxMemThresholdMB());
-#endif
bucketIdx = 0;
Cluster * cluster = NULL;
ULng32 i;
@@ -1966,7 +1961,6 @@ void ex_hashj_tcb::workEndPhase1() {
return;
}
-#if !defined(__EID)
// Yield memory quota (or if needed, flush another in-memory cluster
// to free more memory for phase 2) .
// first get some information about the clusters (number, sizes, etc.)
@@ -2019,7 +2013,7 @@ void ex_hashj_tcb::workEndPhase1() {
if ( clusterDb_->memoryQuotaMB() > hashJoinTdb().memoryQuotaMB() ) {
char msg[512];
str_sprintf(msg, "HJ End Phase 1 (%d). GRABBED additional quota %d MB",
- 0, // NA_64BIT, use instance id later
+ 0,
clusterDb_->memoryQuotaMB() - hashJoinTdb().memoryQuotaMB());
// log an EMS event and continue
SQLMXLoggingArea::logExecRtInfo(NULL, 0, msg, tdb.getExplainNodeId());
@@ -2030,7 +2024,7 @@ void ex_hashj_tcb::workEndPhase1() {
str_sprintf(msg,
"HJ End Phase 1 (%d). #inner rows: %Ld, #buckets: %d, #clusters: %d, #flushed: %d, total size %d MB, cluster size max- %d MB min- %d, variable size records: %s",
- 0, // NA_64BIT, use instance id later
+ 0,
totalRightRowsRead_,
bucketCount_ , numClusters, numFlushed,
totalSize, maxSize, minSize,
@@ -2040,7 +2034,6 @@ void ex_hashj_tcb::workEndPhase1() {
}
} // if logDiagnostics
-#endif
// all clusters are prepared. Go on with phase 2 of the join
pstate.setPhase(PHASE_2, bmoStats_);
@@ -2355,7 +2348,6 @@ void ex_hashj_tcb::workEndPhase2() {
clusterDb_->yieldUnusedMemoryQuota();
// Log -- end of phase 2
-#if !defined(__EID)
if ( hashJoinTdb().logDiagnostics() /* && clusterDb_->sawPressure() */ ) {
// L O G
// count the number of clusters
@@ -2380,14 +2372,13 @@ void ex_hashj_tcb::workEndPhase2() {
char msg[1024];
str_sprintf(msg,
"HJ End of Phase 2 (%d). Total outer size %d MB, cluster size max- %d MB min- %d MB, variable size records: %s",
- 0, // NA_64BIT, use instance id later
+ 0,
totalSize, maxSize, minSize,
hashJoinTdb().useVariableLength() ? "y" : "n");
// log an EMS event and continue
SQLMXLoggingArea::logExecRtInfo(NULL, 0, msg, tdb.getExplainNodeId());
}
-#endif
// all clusters are prepared. Go on with phase 3 of the join
// set the first inner cluster to read
@@ -2424,7 +2415,6 @@ void ex_hashj_tcb::resetClusterForHashLoop(Cluster *iCluster)
void ex_hashj_tcb::prepareForNextPairOfClusters(Cluster *iCluster)
{
-#if !defined(__EID)
if ( hashJoinTdb().logDiagnostics() /* && clusterDb_->sawPressure() */ ) {
// L O G
Int64 currTime = NA_JulianTimestamp();
@@ -2452,8 +2442,8 @@ void ex_hashj_tcb::prepareForNextPairOfClusters(Cluster *iCluster)
{
str_sprintf(msg,
"HJ Finished cluster (%d) in Phase 3 (%d) with %d Hash-Loop iterations.",
- 0, // NA_64BIT, use some id later (ULng32)iCluster & 0xFFF,
- 0, // NA_64BIT, use some id later (ULng32)clusterDb_ & 0xFFF,
+ 0,
+ 0,
iCluster->numLoops() + 1); // add uncounted last iter
// log an EMS event and continue
SQLMXLoggingArea::logExecRtInfo(NULL, 0, msg, tdb.getExplainNodeId());
@@ -2461,8 +2451,6 @@ void ex_hashj_tcb::prepareForNextPairOfClusters(Cluster *iCluster)
#endif
}
-#endif
-
// we are done with this pair of clusters; delete them and process
// the next pair;
@@ -3137,7 +3125,6 @@ void ex_hashj_tcb::workDone() {
if(!hashJoinTdb().isUniqueHashJoin())
releaseResultTupps();
-#if !defined(__EID)
if ( hashJoinTdb().logDiagnostics() &&
!hashJoinTdb().isUniqueHashJoin()
/* && clusterDb_->sawPressure() */ ) {
@@ -3164,7 +3151,7 @@ void ex_hashj_tcb::workDone() {
#else
str_sprintf(msg,
"HJ Finished Phase 3 (%d)",
- 0 // NA_64BIT, use instance id later
+ 0
);
#endif
@@ -3172,7 +3159,6 @@ void ex_hashj_tcb::workDone() {
SQLMXLoggingArea::logExecRtInfo(NULL, 0, msg, tdb.getExplainNodeId());
}
-#endif
// When Reuse is applied the inner clusters/buckets should be kept!
if ( ! isReuse() ) {
@@ -3743,7 +3729,7 @@ short ExUniqueHashJoinTcb::workReadInner(UInt32 defragLength)
bufferPool_->castToSerial()->setRowLength(dataPointer, defragLength);
}
-#if (defined (NA_LINUX) && defined(_DEBUG) && !defined(__EID))
+#if (defined(_DEBUG))
char txt[] = "hashjU";
sql_buffer_pool::logDefragInfo(txt,bufferPool_->getMaxRowLength(),
ROUND4(defragLength) + sizeof(HashRow),
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/ex_hashj.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/ex_hashj.h b/core/sql/executor/ex_hashj.h
index c2e5130..ff5826a 100644
--- a/core/sql/executor/ex_hashj.h
+++ b/core/sql/executor/ex_hashj.h
@@ -71,16 +71,16 @@ public:
// retrieval of the virtual table function pointer of the class while
// unpacking. An empty constructor is enough.
// ---------------------------------------------------------------------
- NA_EIDPROC ex_hashj_tdb()
+ ex_hashj_tdb()
{}
- NA_EIDPROC virtual ~ex_hashj_tdb()
+ virtual ~ex_hashj_tdb()
{}
// ---------------------------------------------------------------------
// Build a TCB for this TDB. Redefined in the Executor project.
// ---------------------------------------------------------------------
- NA_EIDPROC virtual ex_tcb *build(ex_globals *globals);
+ virtual ex_tcb *build(ex_globals *globals);
private:
// ---------------------------------------------------------------------
@@ -171,8 +171,8 @@ public:
static const char *HashJoinPhaseStr[];
- virtual NA_EIDPROC NABoolean needStatsEntry();
- virtual NA_EIDPROC ExOperStats *doAllocateStatsEntry(CollHeap *heap,
+ virtual NABoolean needStatsEntry();
+ virtual ExOperStats *doAllocateStatsEntry(CollHeap *heap,
ComTdb *tdb);
protected:
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/ex_io_control.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/ex_io_control.h b/core/sql/executor/ex_io_control.h
index 12e2bd5..8678e57 100644
--- a/core/sql/executor/ex_io_control.h
+++ b/core/sql/executor/ex_io_control.h
@@ -47,48 +47,30 @@
class ControlInfo
{
public:
-NA_EIDPROC
ControlInfo(): ciFlags_(HAS_NOTHING) {};
-NA_EIDPROC
~ControlInfo(){};
-NA_EIDPROC
inline up_state &getUpState();
-NA_EIDPROC
inline down_state &getDownState();
-NA_EIDPROC
+
inline ULng32 getBufferSequenceNumber();
-NA_EIDPROC
+
inline void setBufferSequenceNumber(ULng32 snum);
-NA_EIDPROC
inline NABoolean getIsDiagsAreaPresent() const;
-NA_EIDPROC
inline void setIsDiagsAreaPresent(NABoolean);
-NA_EIDPROC
inline NABoolean getIsDiagsAreaUnpacked() const;
-NA_EIDPROC
inline void setIsDiagsAreaUnpacked(NABoolean);
// an external diags area is one that gets sent outside of the sql_buffer
-NA_EIDPROC
inline NABoolean getIsExtDiagsAreaPresent() const;
-NA_EIDPROC
inline void setIsExtDiagsAreaPresent(NABoolean);
-NA_EIDPROC
inline NABoolean getIsDataRowPresent() const;
-NA_EIDPROC
inline void setIsDataRowPresent(NABoolean);
-NA_EIDPROC
inline NABoolean getIsStatsAreaPresent() const;
-NA_EIDPROC
inline void setIsStatsAreaPresent(NABoolean);
// an external stats area is one that gets sent outside of the sql_buffer
-NA_EIDPROC
inline NABoolean getIsExtStatsAreaPresent() const;
-NA_EIDPROC
inline void setIsExtStatsAreaPresent(NABoolean);
-NA_EIDPROC
inline void resetFlags();
-NA_EIDPROC
inline void copyFlags(const ControlInfo &other);
private:
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/ex_key_object.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/ex_key_object.h b/core/sql/executor/ex_key_object.h
index 57a2300..8f1f426 100644
--- a/core/sql/executor/ex_key_object.h
+++ b/core/sql/executor/ex_key_object.h
@@ -51,7 +51,6 @@ class KeyObject : public ExGod
ULng32 keyLength_;
public:
- NA_EIDPROC
KeyObject(ex_expr * lkey_expr, ex_expr * hkey_expr,
ULng32 key_length);
~KeyObject();
[12/30] incubator-trafodion git commit: TRAFODION-2731 CodeCleanup:
Remove obsolete, legacy and unused code
Posted by an...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/sql_buffer.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/sql_buffer.cpp b/core/sql/executor/sql_buffer.cpp
index 5d5ed0a..3a2509b 100644
--- a/core/sql/executor/sql_buffer.cpp
+++ b/core/sql/executor/sql_buffer.cpp
@@ -222,7 +222,7 @@ SqlBufferBase::moveStatus
NABoolean useExternalDA,
NABoolean callerHasExternalDA,
tupp_descriptor * defragTd
-#if (defined (NA_LINUX) && defined(_DEBUG) && !defined(__EID))
+#if (defined(_DEBUG) )
,ex_tcb * tcb
#endif
,NABoolean noMoveWarnings
@@ -411,7 +411,7 @@ SqlBuffer::moveStatus SqlBuffer::moveInSendOrReplyData(NABoolean isSend,
NABoolean useExternalDA,
NABoolean callerHasExternalDA,
tupp_descriptor * defragTd
-#if (defined (NA_LINUX) && defined(_DEBUG) && !defined(__EID))
+#if (defined(_DEBUG) )
,ex_tcb * tcb
#endif
,NABoolean noMoveWarnings
@@ -575,7 +575,7 @@ SqlBuffer::moveStatus SqlBuffer::moveInSendOrReplyData(NABoolean isSend,
{
defragLength = rowLen;
-#if (defined (NA_LINUX) && defined(_DEBUG) && !defined(__EID))
+#if (defined(_DEBUG) )
char txt[] = "exchange";
sql_buffer_pool::logDefragInfo(txt,
SqlBufferGetTuppSize(projRowLen, bufType()),
@@ -602,53 +602,7 @@ SqlBuffer::moveStatus SqlBuffer::moveInSendOrReplyData(NABoolean isSend,
if (controlInfoMoved == TRUE)
remove_tuple_desc();
-#if defined(__EID)
- if (getTotalTuppDescs() == 0)
- {
- if (diagsArea == NULL)
- {
- // tbd - is expr ever null? Is expr->getHeap() ?
- diagsArea = ComDiagsArea::allocate(expr->getHeap());
- }
- *diagsArea << DgSqlCode(-EXE_ROWLENGTH_EXCEEDS_BUFFER);
-
- up_state errorUpState;
- errorUpState.status = ex_queue::Q_SQLERROR;
-
- tupp_descriptor * dDesc = NULL;
- Int32 moveRetcode = 0;
-
- moveRetcode = moveInSendOrReplyData(isSend,// false b/c this is EID
- doMoveControl,
- FALSE, // <-------- doMoveData.
- &errorUpState,
- controlInfoLen,
- controlInfo,
- projRowLen,
- outTdesc,
- diagsArea ,
- &dDesc,
- expr, atp1, workAtp,
- destAtp,
- tuppIndex,
- doMoveStats,
- statsArea,
- statsDesc,
- useExternalDA,
- useExternalDA,
- NULL,
- noMoveWarnings
- );
- ex_assert((moveRetcode != SqlBuffer::BUFFER_FULL),
- "sending an empty buffer from EID");
-
- if (dDesc)
- {
- diagsArea->packObjIntoMessage(dDesc->getTupleAddress());
- diagsArea->decrRefCount();
- }
- }
-#endif
+
return SqlBuffer::BUFFER_FULL;
}
@@ -793,7 +747,7 @@ SqlBuffer::moveStatus SqlBuffer::moveInSendOrReplyData(NABoolean isSend,
useExternalDA,
useExternalDA, // always have ext. DA if used
defragTd
-#if (defined (NA_LINUX) && defined(_DEBUG) && !defined(__EID))
+#if (defined(_DEBUG) )
,tcb
#endif
,noMoveWarnings
@@ -855,53 +809,6 @@ SqlBuffer::moveStatus SqlBuffer::moveInSendOrReplyData(NABoolean isSend,
if (daMark >= 0)
diagsArea->rewind(daMark);
-#if defined(__EID)
- if (getTotalTuppDescs() == 0)
- {
- //there is no room for DA even, clear DA and send one condition only
- if(!space_available(diagsArea->packedLength()))
- diagsArea->clear();
-
- *diagsArea << DgSqlCode(-EXE_ROWLENGTH_EXCEEDS_BUFFER);
-
- up_state errorUpState;
- errorUpState.status = ex_queue::Q_SQLERROR;
-
- tupp_descriptor * dDesc = NULL;
- Int32 moveRetcode ;
-
- moveRetcode = moveInSendOrReplyData(isSend,// false b/c this is EID
- doMoveControl,
- FALSE, // <-------- doMoveData.
- &errorUpState,
- controlInfoLen,
- controlInfo,
- projRowLen,
- outTdesc,
- diagsArea ,
- &dDesc,
- expr, atp1, workAtp,
- destAtp,
- tuppIndex,
- doMoveStats,
- statsArea,
- statsDesc,
- useExternalDA,
- useExternalDA,
- NULL,
- noMoveWarnings
- );
- ex_assert((moveRetcode != SqlBuffer::BUFFER_FULL),
- "Sending an empty buffer from EID");
-
- if (dDesc)
- {
- diagsArea->packObjIntoMessage(dDesc->getTupleAddress());
- diagsArea->decrRefCount();
- }
-
- }
-#endif
return SqlBuffer::BUFFER_FULL; // not enough space.
}
@@ -2628,7 +2535,6 @@ void sql_buffer_pool::compact_buffers()
}
}
-#if (!defined(NA_NSK) && defined(_DEBUG)) || !defined(__EID)
// for debugging purposes
void sql_buffer_pool::printAllBufferInfo() {
staticBufferList_->position();
@@ -2640,7 +2546,6 @@ void sql_buffer_pool::printAllBufferInfo() {
while (buf = (SqlBuffer *)dynBufferList_->getNext())
buf->printInfo();
};
-#endif
SqlBufferBase * sql_buffer_pool::findBuffer(Lng32 freeSpace,
Int32 mustBeEmpty)
@@ -2696,11 +2601,6 @@ SqlBufferBase * sql_buffer_pool::getBuffer(Lng32 freeSpace,
result = findBuffer(freeSpace,mustBeEmpty);
-// #if defined(NA_WINNT) && defined(_DEBUG)
-// if (! result)
-// printAllBufferInfo();
-// #endif
-
if (! result)
{
if (staticMode())
@@ -2817,7 +2717,7 @@ sql_buffer_pool::moveIn(atp_struct *atp1,
}
if (!get_free_tuple(atp2->getTupp(tuppIndex), defRowLen))
{
-#if (defined (NA_LINUX) && defined(_DEBUG) && !defined(__EID))
+#if (defined(_DEBUG) )
char txt[] = "hashj";
SqlBuffer *buf = getCurrentBuffer();
sql_buffer_pool::logDefragInfo(txt,
@@ -3214,7 +3114,7 @@ SqlBufferBase::moveStatus
NABoolean useExternalDA,
NABoolean callerHasExternalDA,
tupp_descriptor * defragTd
-#if (defined (NA_LINUX) && defined(_DEBUG) && !defined(__EID))
+#if (defined(_DEBUG) )
,ex_tcb * tcb
#endif
,NABoolean noMoveWarnings
@@ -3621,7 +3521,7 @@ NABoolean SqlBufferOltSmall::moveOutReplyData(void * currQState,
return FALSE;
}
-#if (defined (NA_LINUX) && defined(_DEBUG) && !defined(__EID))
+#if (defined(_DEBUG) )
void sql_buffer_pool::logDefragInfo(char * txt,
Lng32 neededSpace,
Lng32 actNeededSpace,
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/sql_buffer.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/sql_buffer.h b/core/sql/executor/sql_buffer.h
index 7bea9ad..09f59f5 100644
--- a/core/sql/executor/sql_buffer.h
+++ b/core/sql/executor/sql_buffer.h
@@ -363,7 +363,7 @@ public:
NABoolean useExternalDA = FALSE,
NABoolean callerHasExternalDA = FALSE,
tupp_descriptor * defragTd = NULL
-#if (defined (NA_LINUX) && defined(_DEBUG) && !defined(__EID))
+#if (defined(_DEBUG))
,ex_tcb * tcb = NULL
#endif
,NABoolean noMoveWarnings = FALSE
@@ -466,7 +466,6 @@ protected:
#pragma warn(1506) // warning elimination
/*
-NA_EIDPROC
unsigned long SqlBufferNeededSize(long numTuples = 0,
long recordLength = 0,
SqlBufferHeader::BufferType bufType = SqlBufferHeader::NORMAL_);
@@ -599,7 +598,7 @@ public:
NABoolean useExternalDA = FALSE,
NABoolean callerHasExternalDA = FALSE,
tupp_descriptor * defragTd = NULL
-#if (defined (NA_LINUX) && defined(_DEBUG) && !defined(__EID))
+#if (defined(_DEBUG))
,ex_tcb * tcb = NULL // for debuggin
#endif
,NABoolean noMoveWarnings = FALSE
@@ -1351,7 +1350,7 @@ public:
NABoolean useExternalDA = FALSE,
NABoolean callerHasExternalDA = FALSE,
tupp_descriptor * defragTd = NULL
-#if (defined (NA_LINUX) && defined(_DEBUG) && !defined(__EID))
+#if (defined(_DEBUG))
,ex_tcb * tcb = NULL // for debuggin
#endif
,NABoolean noMoveWarnings = FALSE
@@ -1525,7 +1524,6 @@ private:
/*
definitions moved to sql_buffer_size.h
-NA_EIDPROC
static unsigned long SqlBufferGetTuppSize(
long recordLength = 0,
SqlBufferHeader::BufferType bufType = SqlBufferHeader::NORMAL_)
@@ -1542,7 +1540,6 @@ static unsigned long SqlBufferGetTuppSize(
// given number of records with a given length are to be stored
-NA_EIDPROC
static unsigned long SqlBufferNeededSize(long numTuples,
long recordLength,
SqlBufferHeader::BufferType bufType)
@@ -1641,10 +1638,8 @@ public:
inline void set_max_number_of_buffers(Lng32 maxnumbuf)
{maxNumberOfBuffers_ = maxnumbuf;}
-#if (!defined(NA_NSK) && defined(_DEBUG)) || !defined(__EID)
-// for debugging purposes
-void printAllBufferInfo();
-#endif
+ // for debugging purposes
+ void printAllBufferInfo();
Lng32 getTotalMemorySize() { return memoryUsed_;}
@@ -1692,7 +1687,7 @@ void printAllBufferInfo();
return defragTd_;
}
-#if (defined (NA_LINUX) && defined(_DEBUG) && !defined(__EID))
+#if (defined(_DEBUG))
static void logDefragInfo(char * txt,
Lng32 neededSpace,
Lng32 actNeededSpace,
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/sql_buffer_size.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/sql_buffer_size.h b/core/sql/executor/sql_buffer_size.h
index 03c4b67..1efd473 100644
--- a/core/sql/executor/sql_buffer_size.h
+++ b/core/sql/executor/sql_buffer_size.h
@@ -48,7 +48,6 @@
// SqlBufferNeededSize or SqlBufferGetTuppSize to include this file (11/01/2003)
//
-NA_EIDPROC
static inline ULng32 SqlBufferHeaderSize(SqlBufferHeader::BufferType bufType)
{
// Return the buffer header size
@@ -77,7 +76,6 @@ static inline ULng32 SqlBufferHeaderSize(SqlBufferHeader::BufferType bufType)
return (headerSize);
}
-NA_EIDPROC
static inline ULng32 SqlBufferGetTuppSize(
Lng32 recordLength = 0,
SqlBufferHeader::BufferType bufType = SqlBufferHeader::NORMAL_)
@@ -90,7 +88,6 @@ static inline ULng32 SqlBufferGetTuppSize(
}
-NA_EIDPROC
static inline ULng32 SqlBufferNeededSize(Lng32 numTuples = 0,
Lng32 recordLength = 0,
SqlBufferHeader::BufferType bufType = SqlBufferHeader::NORMAL_)
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/stubs.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/stubs.cpp b/core/sql/executor/stubs.cpp
index edce6bd..0d0386d 100644
--- a/core/sql/executor/stubs.cpp
+++ b/core/sql/executor/stubs.cpp
@@ -36,387 +36,3 @@
*****************************************************************************
*/
-#include "Platform.h"
-
-class ex_expr;
-#include <sys/types.h>
-#include <sys/time.h>
-
-#include "ex_stdh.h"
-//#include "fs.h"
-#include "cli_stdh.h"
-#include "fs/feerrors.h"
-
-#include "Int64.h"
-
-#ifndef __EID
-//#include "arksort.h"
-#endif
-
-#ifdef __EID
-// -----------------------------------------------------------------------
-// Procedures that must not be called from DP2
-// -----------------------------------------------------------------------
-
-NA_EIDPROC void NAAbort(const char * filename, Int32 lineno, const char * msg)
-{
-}
-
-NA_EIDPROC void NAAssert(const char * condition, const char * file_, Int32 line_)
-{
-}
-
-
-NA_EIDPROC RETCODE Descriptor::alloc(Lng32 used_entries_)
-{
- return ERROR;
-}
-
-NA_EIDPROCRETCODE Descriptor::dealloc()
-{
- return ERROR;
-}
-
-NA_EIDPROC RETCODE Descriptor::getDescItem(Lng32 entry, Lng32 what_to_get,
- Lng32 * numeric_value, char * string_value,
- Lng32 max_string_len, Lng32 * returned_len,
- Lng32 /*start_from_offset*/)
-{
- return ERROR;
-}
-
-NA_EIDPROC
-void Descriptor::setDescItem(Lng32 entry, Lng32 what_to_set,
- Lng32 numeric_value, char * string_value)
-{
-
-}
-
-NA_EIDPROC
-void Descriptor::setUsedEntryCount(Lng32 used_entries_)
-{
- used_entries = used_entries_;
-
-}
-
-NA_EIDPROC
-void GeneratorAbort(char *f, Int32 l, char * m)
-{
-}
-
-NA_EIDPROC
-void filesystem::open(char *fname, Lng32 *fnum, File::fio_open_mode open_mode)
-{
-}
-
-NA_EIDPROC
-void filesystem::start_subset(short fnum, short keytag,
- char *begin_key, char *end_key,
- ex_expr *dp2_pred,
- char *input_values_data,
- unsigned short reverse_scan)
-{
-}
-
-
-NA_EIDPROC
-void filesystem::get_buffer(char *data_buffer, ULng32 data_buffer_len)
-{
-}
-
-NA_EIDPROC
-void filesystem::await_io()
-{
-}
-
-NA_EIDPROC
-void filesystem::stop_subset()
-{
-}
-
-NA_EIDPROC
-void filesystem::close()
-{
-}
-
-NA_EIDPROC
-Int32 filesystem::status()
-{
-}
-
-NA_EIDPROC
-void filesystem::delete_buffer(char * key_buffer)
-{
-}
-
-NA_EIDPROC
-void filesystem::update_buffer(char * key_buffer, char * data_buffer,
- rec_project_struct * datalist)
-{
-}
-
-NA_EIDPROC
-void filesystem::insert_buffer(char * data_buffer, ULng32 data_buffer_len)
-{
-}
-#endif
-
-
-#ifndef __EID
-// LCOV_EXCL_START
-// -----------------------------------------------------------------------
-// DP2 procedures (stub out if this is not a compile for EID)
-// -----------------------------------------------------------------------
-Int16 DP2_EXECUTOR_POSITION ( char * Low_Key_Addr,
- Int16 * Low_Key_Excluded,
- char * High_Key_Addr,
- Int16 * High_Key_Excluded,
- Int32 Key_Length,
- Int16 Operation,
- char * Next_Low_Key_Addr,
- char * Next_High_Key_Addr,
- Int16 Begin_Range_Flags,
- Int16 Reverse_Flag,
- Int16 numIoBlocks
- , Int16 * partOp
- ){return 0;}
-
-Int16 DP2_EXECUTOR_POSITION_UNIQUE (
- char * Key_Addr,
- Int32 Key_Length,
- Int16 Operation,
- char * Next_Low_Key_Addr,
- char * Next_High_Key_Addr,
- Int16 numIoBlocks
- ){return 0;}
-
-Int16 DP2_EXECUTOR_POSITION_SAMPLE (
- Int32 percentage,
- Int16 operation,
- Int16 Begin_Range_Flag
- ){return 0;}
-
-Int16 DP2_EXECUTOR_POSITION_CSAMPLE (
- Int32 percentage,
- Int32 cluster_size,
- Int16 operation,
- Int16 Begin_Range_Flag
- ){return 0;}
-
-Int16 DP2_EXECUTOR_FETCH (
- void ** Row_Addr,
- Int32 * Row_Length,
- char * syskey_addr,
- Int16 Operation,
- Int16 * Request_Status,
- void ** LastRowAddr,
- Int32 * LastRowLength
- ){return 0;}
-
-Int16 DP2_EXECUTOR_FETCH_BLOCK (
- void ** Block_Addr,
- Int32 * Block_Length,
- Int32 * Num_Recs_In_Block,
- Int32 * Start_Recnum,
- Int16 Operation,
- Int16 * Request_Status
- ){return 0;}
-
-Int16 DP2_EXECUTOR_FETCH_ROW (Int32 recnum,
- Int32 blocklen,
- void * buffer,
- void ** record,
- Int32 * reclen,
- Int16 * request_status){return 0;};
-
-Int16 DP2_EXECUTOR_LOCK_FILE (
- void * /*Lock_Flags_Struct*/ Lock_Flags,
- Int16 Operation,
- char * Consumed_Key_Pointer_Addr,
- Int32 Consumed_Key_Length,
- Int16 * Request_Status
- ){return 0;}
-
-Int16 DP2_EXECUTOR_ROW_SELECTED (
- char * Key_Addr,
- Int32 Key_Length,
- Int16 Operation,
- Int16 End_Of_Range,
- void * /*Lock_Flags_Struct*/ Lock_Flags,
- Int16 * Request_Status,
- void * Before_Image_Addr,
- Int32 Before_Image_Length,
- void * After_Image_Addr,
- Int32 After_Image_Length,
- void * /*MFMap_STRUCT*/ mfMap,
- Int16 Op_Type // BertBert
- ){return 0;}
-
-Int16 DP2_EXECUTOR_ROW_NOT_SELECTED (
- char * Key_Addr,
- Int32 Key_Length,
- Int16 Operation,
- Int16 End_Of_Range,
- void * /*Lock_Flags_Struct*/ Lock_Flags,
- Int16 * Request_Status
- ){return 0;}
-
-// Memory Allocation/Deallocation
-Int16 DP2_EXECUTOR_ADD_MEMORY (
- Int32 Memory_Size,
- void ** Returned_Memory_Addr
- ){return 0;}
-
-Int16 DP2_EXECUTOR_DROP_MEMORY (
- void * Drop_Memory_Addr
- ){return 0;}
-
-// reply to filesystem with reply buffer
-Int16 DP2_EXECUTOR_REPLY (
- Int16 Reply_Error,
- void * Reply_Buffer_Addr,
- Int32 Reply_Buffer_Length
- ){return 0;}
-
-Int16 DP2_EXECUTOR_INSERT (
- char * Key_Addr,
- Int32 Key_Length,
- void * Row_Addr,
- Int32 Row_Length,
- void * /*Lock_Flags_Struct*/ Lock_Flags,
- void * /*Insert_Control_Flags_Struct*/ Insert_Control_Flags,
- Int16 * Request_Status,
- char * Range_Protector_Key_Addr,
- Int32 * Range_Protector_Key_Length
- ){return 0;}
-
-Int16 DP2_EXECUTOR_INSERT_VSBB (
- void * /*Lock_Flags_Struct*/ Lock_Flags,
- void * VSBB_Insert_Buffer,
- Int32 VSBB_Buffer_Length,
- char * Range_Protector_Key_Addr,
- Int16 Insert_Anywhere,
- Int16 Insert_At_End,
- Int16 * Request_Status
- ){return 0;}
-
-Int16 DP2_EXECUTOR_SIDETREE_INSERT (
- void * VSBB_Insert_Buffer,
- Int32 VSBB_Buffer_Length,
- Int16 * Request_Status
- ){return 0;}
-
-Int16 DP2_EXECUTOR_SIDETREE_SETUP (
- Int16 * Request_Status
- ){return 0;}
-
-Int16 DP2_EXECUTOR_SIDETREE_COMMIT (
- Int16 * Request_Status
- ){return 0;}
-
-Int16 DP2_EXECUTOR_VSBB_NAK (
- char * Range_Protector_Key_Addr,
- Int32 Range_Protector_Key_Length
- ){return 0;}
-
-Int16 DP2_EXECUTOR_DELETE_RANGE(
- void * Scan_Expr_Pointer,
- void * /*Lock_Flags_Struct*/ Lock_Flags,
- char * Last_Begin_Key_Addr,
- Int32 * Last_Begin_Key_Length,
- Int16 * Request_Status
- ){return 0;}
-
-Int16 DP2_EXECUTOR_GET_OVERFLOW_DATA(
- void * Buffer_Addr,
- Int32 Buffer_Length
- ){return 0;}
-
-Int32 DP2_EXECUTOR_SESSION_NID() {return 0;}
-Int32 DP2_EXECUTOR_SESSION_PID() {return 0;}
-
-Int16 DP2_EXECUTOR_SWITCH_CONTEXT(Int16 switchSessionFlag,
- Int64 OCBID,
- Int16 ocbindex,
- void ** RCB
- , void ** Row_Hiding_Predicate
- ){return 0;}
-
-
-Int16 DP2_EXECUTOR_SET_WAITFORROWS(void){return 1;}
-void DP2_EXECUTOR_DISCARD_DELTA_KEY(Int32 DP2_key_index){return;}
-void DP2_EXECUTOR_DISC_DK_ATCOMMIT(Int32 DP2_key_index){return;}
-Int16 DP2_EXECUTOR_GET_DELTA_KEY(char ** key_addr,
- Int32 * key_len,
- Int32 * DP2_key_index){return 0;}
-Int16 DP2_EXECUTOR_DELTA_SCAN_STATUS(Int16 delta_scan_active,
- Int16 regular_scan_is_finished){return 0;}
-void DP2_EXECUTOR_DELTA_SCAN_INIT(Int16 streaming,
- Int16 destructive,
- Int16 ordered,
- Int32 stream_timeout,
- Int32 rowset_size){return;}
-void DP2_EXECUTOR_INSERT_DK_IN_SSCB(char * in_key, Int32 in_key_len){return;}
-void DP2_EXECUTOR_UPDATE_OP_IN_SSCB(Int16 operation){return;}
-Int16 DP2_EXECUTOR_CHECK_DK_X_LOCKED(Int32 dp2_key_index){return TRUE;}
-void DP2_EXECUTOR_INSERT_DK_UNCOMMIT(char * low_key,
- Int32 low_key_excluded,
- char * high_key,
- Int32 high_key_excluded,
- Int32 key_len,
- char * anchor_key){};
-Int16 DP2_EXECUTOR_REPOSITION_NEEDED(void){return TRUE;}
-Int64 DP2_EXECUTOR_GET_SYSKEY(Int64 prev_syskey){return 0;}
-void DP2_EXECUTOR_GET_STATS(Int32 * stats,
- Int32 values_requested,
- Int32 * values_returned){return;}
-
-void DP2_EXECUTOR_SESSION_STATS(void * stats) {return;}
-
-Int16 DP2_EXECUTOR_QUERYID_STATS(void * stats) {return 0;}
-
-Int16 DP2_EXECUTOR_MXBUFFER_STATS(void * stats) {return -1;}
-
-Int16 DP2_EXECUTOR_FETCH_UNIQUE (
- void * /*Lock_Flags_Struct*/ Lock_Flags,
- char * Key_Addr,
- Int32 Key_Length,
- void ** Row_Addr,
- Int32 * Row_Length,
- void * Unique_Expr_Addr,
- Int16 * Request_Status
- ){return 0;}
-
-Int16 DP2_EXECUTOR_DELETE_UNIQUE (
- void * /*Lock_Flags_Struct*/ Lock_Flags,
- char * Key_Addr,
- Int32 Key_Length,
- void * Unique_Expr_Addr,
- Int16 * Request_Status
- ){return 0;}
-
-Int16 DP2_EXECUTOR_UPDATE_UNIQUE (
- void * /*Lock_Flags_Struct*/ Lock_Flags,
- char * Key_Addr,
- Int32 Key_Length,
- void * Unique_Expr_Addr,
- void * Updated_Row_Buffer,
- void * /*MFMap_STRUCT*/ mfMap,
- Int16 * Request_Status
- ){return 0;}
-
-Int16 DP2_EXECUTOR_INSERT_UNIQUE (
- void * /*Lock_Flags_Struct*/ Lock_Flags,
- char * Key_Addr,
- Int32 Key_Length,
- void * Row_Addr,
- Int32 Row_Length,
- void * /*Insert_Control_Flags_Struct*/ Insert_Control_Flags,
- void * Unique_Expr_Addr,
- Int16 * Request_Status
- ){return 0;}
-
-void DP2_EXECUTOR_COUNT_ROWS(Int64 rows_accessed, Int64 rows_selected) {}
-
-// LCOV_EXCL_STOP
-#endif /* __EID */
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/stubs2.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/stubs2.cpp b/core/sql/executor/stubs2.cpp
index bf213b2..127422a 100644
--- a/core/sql/executor/stubs2.cpp
+++ b/core/sql/executor/stubs2.cpp
@@ -20,88 +20,7 @@
//
// @@@ END COPYRIGHT @@@
**********************************************************************/
-#include "Platform.h"
-#if (defined (NA_LINUX) && defined(__EID))
-#include "ex_ex.h"
-#endif // NA_LINUX
-
-// stubbed procedures for executor in dp2 object.
-#ifdef __EID
-// NT Port - vs 01/17/97
-
-// NT Port - vs 01/17/97
-#define _resident
-
-extern "C"
-{
-
-#include <setjmp.h>
- void __pure_virtual_called();
- void __vec_delete();
- char *__vec_new();
-}
-
-
-// #if defined __EID && defined (NA_NSK)
-// extern "C" _resident void bytesPerChar__8CharInfoSFQ2_8CharInfo7CharSet()
-// {
-// }
-// #endif
-
-
-
-
-// NT Port - vs 01/17/97
-
-
-
-// LCOV_EXCL_START
-_resident void __pure_virtual_called()
-{
-}
-
-NA_EIDPROC
-void NAAssert(const char * condition, const char * file_, Int32 line_)
-{
-#if (defined (NA_LINUX) && defined (__EID))
-assert_botch_in_eid(file_, line_, condition);
-#endif // NA_LINUX & __EID
-}
-NA_EIDPROC
-void NAAssert(char * condition, char * file_, Int32 line_)
-{
-#if (defined (NA_LINUX) && defined (__EID))
-assert_botch_in_eid(file_, line_, condition);
-#endif // NA_LINUX & __EID
-}
-
-NA_EIDPROC
-void GeneratorAbort(char *f, Int32 l, char * m)
-{
-}
-
-NA_EIDPROC
-void NAError_stub_for_breakpoints() {}
-NA_EIDPROC
-void NAArkcmpExceptionEpilogue() {}
-
-// LCOV_EXCL_STOP
-
-
-
-// LCOV_EXCL_START
-
-#if (defined (NA_LINUX) && defined (__EID))
-#endif // NA_LINUX
-#endif // __EID
-
-// LCOV_EXCL_STOP
-
-#pragma nowarn(1103) //warning elimination
-// This pragma hides 1103 warnings for constructor and destructor of class VerticalPartInfo;
-
-
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/tempfile.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/tempfile.cpp b/core/sql/executor/tempfile.cpp
index 5d23077..d868dd3 100644
--- a/core/sql/executor/tempfile.cpp
+++ b/core/sql/executor/tempfile.cpp
@@ -1,7 +1,7 @@
/* -*-C++-*-
******************************************************************************
*
-* File: termpfile.C
+* File: tempfile.C
* Description: Methods temporary overflow files
*
*
@@ -35,72 +35,3 @@
******************************************************************************
*/
-// begining of regular compilation
-#include "Platform.h"
-#include "tempfile.h"
-#include <fcntl.h>
-
-#include <stdio.h>
-
-
-TempFile::TempFile()
- : fd_(-1),
- offset_(-1) {
-};
-
-TempFile::~TempFile() {
- TFclose();
-};
-
-void TempFile::TFread(FilePos * position,
- char * buffer,
- Int32 size) {
- if ((position->fileId_ != fd_) ||
- (!position->valid() ||
- ((position->offset_ + size) > offset_)))
- ex_assert(0, "tried to read from non existing temporary file");
- lseek(fd_, offset_, SEEK_SET);
- read(fd_, buffer, size);
-};
-
-void TempFile::TFwrite(FilePos * position,
- char * buffer,
- Int32 size) {
- if (fd_ == -1) {
- fd_ = open(name_, O_RDWR | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR);
-
- if (fd_ == -1)
- {
- // we couldn't create the tmpfile. Too bad!!
- printf ("temporary file name: %s\n", name_);
- ex_assert(0, "unable to open temporary file");
- };
- offset_ = 0;
- };
-
- lseek(fd_, offset_, SEEK_SET);
- write(fd_, buffer, size);
- // return the file position of the written buffer
- position->fileId_ = fd_;
- position->offset_ = offset_;
-
- // the offset has changed
- offset_ += size;
-};
-
-void TempFile::TFclose() {
- if (fd_ > -1) {
- ex_assert((close(fd_) == 0), "unable to close temporary file");
- ex_assert((unlink(name_) == 0), "unable to purge temporary file");
- fd_ = -1;
- };
- offset_ = -1;
-};
-
-NABoolean TempFile::ioComplete() {
- return FALSE; // for NSK, no overlapped io
-};
-
-NABoolean TempFile::ioSucessfull() {
- return TRUE;
-};
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/tempfile.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/tempfile.h b/core/sql/executor/tempfile.h
index d3b56a4..72fdfae 100644
--- a/core/sql/executor/tempfile.h
+++ b/core/sql/executor/tempfile.h
@@ -35,70 +35,3 @@
*
*****************************************************************************
*/
-
-#include "BaseTypes.h"
-#include "NABasicObject.h"
-#include "ex_stdh.h"
-
-// for now we support only UNIX and OSS
-
-// The class FilePos is NOT derived from ExGod! It is never allocated
-// with new. Instead, it is just an "overlay" on an allocated buffer.
-class FilePos {
- friend class TempFile;
-public:
- inline FilePos();
- inline ~FilePos() {};
- inline NABoolean valid();
-private:
- unsigned short fileId_;
- Int32 offset_;
-};
-
-inline FilePos::FilePos() {
- fileId_ = 0;
- offset_ = -1;
-};
-
-inline NABoolean FilePos::valid() {
- return (offset_ != -1);
-};
-
-class TempFile : public NABasicObject {
-public:
- TempFile();
- ~TempFile();
- void TFread(FilePos * position,
- char * buffer,
- Int32 size);
- void TFwrite(FilePos * position,
- char * buffer,
- Int32 size);
- void TFclose();
-
- NABoolean ioComplete();
-
- NABoolean ioSucessfull();
-
-inline char * getName() {
- return (name_);
-};
-private:
- Int32 fd_;
- char name_[L_tmpnam];
- Int32 offset_;
-};
-
-#endif
-
-
-
-
-
-
-
-
-
-
-
-
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/exp/ExpAtp.cpp
----------------------------------------------------------------------
diff --git a/core/sql/exp/ExpAtp.cpp b/core/sql/exp/ExpAtp.cpp
index 74ff5b7..d183232 100644
--- a/core/sql/exp/ExpAtp.cpp
+++ b/core/sql/exp/ExpAtp.cpp
@@ -43,7 +43,6 @@
#include "str.h"
// constructor (Allocate and initialize) for an Atp
-NA_EIDPROC SQLEXP_LIB_FUNC
atp_struct * allocateAtp(ex_cri_desc * criDesc, CollHeap * space)
{
// Allocate space for the atp_struct (which has room for one tupp in
@@ -78,7 +77,6 @@ atp_struct * allocateAtp(ex_cri_desc * criDesc, CollHeap * space)
// Create an atp inside a pre-allocated buffer instead of allocating it from
// a space object. Used by ExpDP2Expr.
-NA_EIDPROC SQLEXP_LIB_FUNC
atp_struct * createAtpInBuffer(ex_cri_desc * criDesc, char * & buf)
{
atp_struct * atp = (atp_struct *)buf;
@@ -103,7 +101,6 @@ atp_struct * createAtpInBuffer(ex_cri_desc * criDesc, char * & buf)
return atp;
}
-NA_EIDPROC SQLEXP_LIB_FUNC
atp_struct * allocateAtp(Lng32 numTuples, CollHeap * space)
{
// Allocate space for the atp_struct (which has room for one tupp in
@@ -136,14 +133,12 @@ atp_struct * allocateAtp(Lng32 numTuples, CollHeap * space)
return atp;
}
-NA_EIDPROC SQLEXP_LIB_FUNC
void deallocateAtp(atp_struct * atp, CollHeap * space)
{
if (space)
space->deallocateMemory((char *)atp);
}
-NA_EIDPROC SQLEXP_LIB_FUNC
atp_struct * allocateAtpArray(
ex_cri_desc * criDesc, Lng32 cnt, Int32 *atpSize, CollHeap * space, NABoolean failureIsFatal)
{
@@ -189,7 +184,6 @@ atp_struct * allocateAtpArray(
return atpStart;
}
-NA_EIDPROC SQLEXP_LIB_FUNC
void deallocateAtpArray(atp_struct ** atp, CollHeap * space)
{
if (space)
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/exp/ExpAtp.h
----------------------------------------------------------------------
diff --git a/core/sql/exp/ExpAtp.h b/core/sql/exp/ExpAtp.h
index 5693402..24ac649 100644
--- a/core/sql/exp/ExpAtp.h
+++ b/core/sql/exp/ExpAtp.h
@@ -70,68 +70,47 @@ class ExStatisticsArea;
#pragma warning ( disable : 4251 )
-class SQLEXP_LIB_FUNC atp_struct
+class atp_struct
{
public:
- NA_EIDPROC
inline ex_cri_desc* getCriDesc() const;
- NA_EIDPROC
inline tupp & getTupp(Lng32 i);
- NA_EIDPROC
inline tupp & getTuppForNativeExpr(long i);
- NA_EIDPROC
inline void setCriDesc(ex_cri_desc *p);
// defined in ex_queue.h
- NA_EIDPROC
inline void copyAtp(const ex_queue_entry *from);
- NA_EIDPROC
inline void copyAtp(atp_struct *from);
- NA_EIDPROC
inline void copyPartialAtp(atp_struct * from);
- NA_EIDPROC
inline void copyPartialAtp(atp_struct * from,
short first_tupp,
short last_tupp);
- NA_EIDPROC
inline void copyPartialAtp(atp_struct * from,
short my_first_tupp,
short from_first_tupp,
short last_tupp);
- NA_EIDPROC
inline unsigned short numTuples() const;
- NA_EIDPROC
inline void release(); // de-initialize
//
// Methods for manipulating diagnostics area.
//
- NA_EIDPROC
inline ComDiagsArea *getDiagsArea() const;
- NA_EIDPROC
inline void setDiagsArea(ComDiagsArea* diagsArea);
- NA_EIDPROC
inline void initDiagsArea(ComDiagsArea* diagsArea);
- NA_EIDPROC
Long pack(void * space);
- NA_EIDPROC
Lng32 unpack(Lng32 base);
// **** information for GUI *** -------------
- NA_EIDPROC
inline void set_tag(Int32 tag);
- NA_EIDPROC
inline Int32 get_tag() const;
- NA_EIDPROC
inline void unset_tag();
// The passed-in cri will be used if it is not NULL. Otherwise
// the cri associated with the atp is used.
- NA_EIDPROC
void display(const char* title = "", ex_cri_desc* cri = NULL);
//
// print the content of a data field, based on the data type dt
- NA_EIDPROC
void print(char* title, Int16 dt, char* ptr, UInt32 len);
//---------------------------------------------
@@ -162,29 +141,23 @@ class SQLEXP_LIB_FUNC atp_struct
// the ATP.
// TBD: move to exp/ExpAtp.h
-extern SQLEXP_LIB_FUNC
atp_struct * allocateAtp (Lng32 numTuples, CollHeap * space);
-extern SQLEXP_LIB_FUNC
atp_struct * allocateAtp (ex_cri_desc * criDesc, CollHeap * space);
// Create an atp inside a pre-allocated buffer instead of allocating it from
// a space object. Used by ExpDP2Expr.
-extern SQLEXP_LIB_FUNC
atp_struct * createAtpInBuffer (ex_cri_desc * criDesc, char * & buf);
-extern SQLEXP_LIB_FUNC
void deallocateAtp (atp_struct * atp, CollHeap * space);
-extern SQLEXP_LIB_FUNC
atp_struct * allocateAtpArray (ex_cri_desc * criDesc,
Lng32 cnt,
Int32 *atpSize,
CollHeap * space,
NABoolean failureIsFatal=FALSE);
-extern SQLEXP_LIB_FUNC
void deallocateAtpArray(atp_struct **atp, CollHeap * space);
//
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/exp/ExpBitMuxFunction.h
----------------------------------------------------------------------
diff --git a/core/sql/exp/ExpBitMuxFunction.h b/core/sql/exp/ExpBitMuxFunction.h
index a671d44..71a415b 100644
--- a/core/sql/exp/ExpBitMuxFunction.h
+++ b/core/sql/exp/ExpBitMuxFunction.h
@@ -83,58 +83,58 @@ class ExpBitMuxFunction;
// ExpBitMuxFunction declaration
//
-class SQLEXP_LIB_FUNC ExpBitMuxFunction : public ex_function_clause {
+class ExpBitMuxFunction : public ex_function_clause {
public:
// Construction - this is the "real" constructor
//
- NA_EIDPROC ExpBitMuxFunction(OperatorTypeEnum oper_type,
+ ExpBitMuxFunction(OperatorTypeEnum oper_type,
Int32 arity,
Attributes ** attr,
Space * space);
// This constructor is used only to get at the virtual function table.
//
- NA_EIDPROC ExpBitMuxFunction();
+ ExpBitMuxFunction();
// isNullInNullOut - Must redefine this virtual function to return 0
// since a NULL input does not simply produce a NULL output.
//
- NA_EIDPROC Int32 isNullInNullOut() const { return 0; };
+ Int32 isNullInNullOut() const { return 0; };
// isNullRelevant - Must redefine this virtual function to return 0
// since all the work is done in eval and none in processNulls.
//
- NA_EIDPROC Int32 isNullRelevant() const { return 0; };
+ Int32 isNullRelevant() const { return 0; };
// eval - Must redefine eval to compute the BitMuxing function.
//
- NA_EIDPROC ex_expr::exp_return_type eval(char *op_data[], CollHeap*,
+ ex_expr::exp_return_type eval(char *op_data[], CollHeap*,
ComDiagsArea** =0);
// pack - Must redefine pack.
- NA_EIDPROC Long pack(void *);
+ Long pack(void *);
// pCodeGenerate - Must redefine pCodeGenerate the produce specific
// PCODE instructions for BitMuxing.
//
- NA_EIDPROC ex_expr::exp_return_type pCodeGenerate(Space *space,
+ ex_expr::exp_return_type pCodeGenerate(Space *space,
UInt32 f);
// ---------------------------------------------------------------------
// Redefinition of methods inherited from NAVersionedObject.
// ---------------------------------------------------------------------
- NA_EIDPROC virtual unsigned char getClassVersionID()
+ virtual unsigned char getClassVersionID()
{
return 1;
}
- NA_EIDPROC virtual void populateImageVersionIDArray()
+ virtual void populateImageVersionIDArray()
{
setImageVersionID(2,getClassVersionID());
ex_function_clause::populateImageVersionIDArray();
}
- NA_EIDPROC virtual short getClassSize() { return (short)sizeof(*this); }
+ virtual short getClassSize() { return (short)sizeof(*this); }
// ---------------------------------------------------------------------
// There are no private members.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/exp/ExpCriDesc.cpp
----------------------------------------------------------------------
diff --git a/core/sql/exp/ExpCriDesc.cpp b/core/sql/exp/ExpCriDesc.cpp
index 92d2f21..795263b 100644
--- a/core/sql/exp/ExpCriDesc.cpp
+++ b/core/sql/exp/ExpCriDesc.cpp
@@ -60,7 +60,7 @@ ex_cri_desc::ex_cri_desc(const unsigned short numTuples, void * space_) :
flags_ = 0;
};
-NA_EIDPROC Long ex_cri_desc::pack(void * space)
+Long ex_cri_desc::pack(void * space)
{
if ( ! (flags_ & PACKED)) // REVISIT
{
@@ -70,7 +70,7 @@ NA_EIDPROC Long ex_cri_desc::pack(void * space)
return NAVersionedObject::pack(space);
}
-NA_EIDPROC Lng32 ex_cri_desc::unpack(void * base, void * reallocator)
+Lng32 ex_cri_desc::unpack(void * base, void * reallocator)
{
if (flags_ & PACKED) // REVISIT
{
@@ -80,7 +80,7 @@ NA_EIDPROC Lng32 ex_cri_desc::unpack(void * base, void * reallocator)
return NAVersionedObject::unpack(base, reallocator);
}
-NA_EIDPROC void ex_cri_desc::display(const char* title)
+void ex_cri_desc::display(const char* title)
{
cout << title << endl;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/exp/ExpCriDesc.h
----------------------------------------------------------------------
diff --git a/core/sql/exp/ExpCriDesc.h b/core/sql/exp/ExpCriDesc.h
index d5d863d..951e9d7 100644
--- a/core/sql/exp/ExpCriDesc.h
+++ b/core/sql/exp/ExpCriDesc.h
@@ -65,7 +65,7 @@ typedef NAVersionedObjectPtrTempl<ex_cri_desc> ExCriDescPtr;
#pragma warning( disable : 4251 )
-class SQLEXP_LIB_FUNC ex_cri_desc : public NAVersionedObject
+class ex_cri_desc : public NAVersionedObject
{
enum {PACKED = 0x0001};
@@ -81,41 +81,38 @@ class SQLEXP_LIB_FUNC ex_cri_desc : public NAVersionedObject
char fillers_[10]; // 14-23
public:
-NA_EIDPROC
+
ex_cri_desc(const unsigned short numTuples, void * space_); //constructor
-NA_EIDPROC
ex_cri_desc() : NAVersionedObject(-1), numTuples_(0) {}
-NA_EIDPROC
+
inline unsigned short noTuples() const;
-NA_EIDPROC
+
inline ExpTupleDesc * getTupleDescriptor(const unsigned short tupleNo) const;
-NA_EIDPROC
+
inline void setTupleDescriptor(const unsigned short tupleNo, ExpTupleDesc * tupleDesc);
-NA_EIDPROC
+
Long pack(void *);
-NA_EIDPROC
Lng32 unpack(void *, void * reallocator);
-NA_EIDPROC
void display(const char* title = "");
// ---------------------------------------------------------------------
// Redefinition of methods inherited from NAVersionedObject.
// ---------------------------------------------------------------------
- NA_EIDPROC virtual unsigned char getClassVersionID()
+ virtual unsigned char getClassVersionID()
{
return 1;
}
- NA_EIDPROC virtual void populateImageVersionIDArray()
+ virtual void populateImageVersionIDArray()
{
setImageVersionID(0,getClassVersionID());
}
- NA_EIDPROC virtual short getClassSize() { return (short)sizeof(*this); }
+ virtual short getClassSize() { return (short)sizeof(*this); }
// ---------------------------------------------------------------------
}; // descriptor for cri
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/exp/ExpDll.cpp
----------------------------------------------------------------------
diff --git a/core/sql/exp/ExpDll.cpp b/core/sql/exp/ExpDll.cpp
index 74014f1..9e13620 100644
--- a/core/sql/exp/ExpDll.cpp
+++ b/core/sql/exp/ExpDll.cpp
@@ -38,8 +38,7 @@
#include "SqlExpDllDefines.h"
-#include "SqlExportDllDefines.h"
#include <setjmp.h>
-THREAD_P SQLEXPORT_LIB_FUNC jmp_buf ExportJmpBuf;
+THREAD_P jmp_buf ExportJmpBuf;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/exp/ExpError.cpp
----------------------------------------------------------------------
diff --git a/core/sql/exp/ExpError.cpp b/core/sql/exp/ExpError.cpp
index 652b8cf..2105f2f 100644
--- a/core/sql/exp/ExpError.cpp
+++ b/core/sql/exp/ExpError.cpp
@@ -59,7 +59,6 @@ class PCIType;
extern char * exClauseGetText(OperatorTypeEnum ote);
extern char * getDatatypeAsString( Int32 Datatype, NABoolean extFormat );
-SQLEXP_LIB_FUNC
ComDiagsArea *ExAddCondition(CollHeap* heap, ComDiagsArea** diagsArea,
Lng32 err, ComCondition** newCond,
Lng32 * intParam1,
@@ -123,8 +122,6 @@ ComDiagsArea *ExAddCondition(CollHeap* heap, ComDiagsArea** diagsArea,
return *diagsArea;
}
-NA_EIDPROC
-SQLEXP_LIB_FUNC
ComDiagsArea *ExRaiseSqlError(CollHeap* heap, ComDiagsArea** diagsArea,
ExeErrorCode err, ComCondition** cond,
Lng32 * intParam1,
@@ -139,8 +136,6 @@ ComDiagsArea *ExRaiseSqlError(CollHeap* heap, ComDiagsArea** diagsArea,
stringParam1, stringParam2, stringParam3);
}
-NA_EIDPROC
-SQLEXP_LIB_FUNC
ComDiagsArea *ExRaiseSqlWarning(CollHeap* heap, ComDiagsArea** diagsArea,
ExeErrorCode err, ComCondition** cond,
Lng32 * intParam1,
@@ -154,16 +149,12 @@ ComDiagsArea *ExRaiseSqlWarning(CollHeap* heap, ComDiagsArea** diagsArea,
intParam1, intParam2, intParam3,
stringParam1, stringParam2, stringParam3);
}
-NA_EIDPROC
-SQLEXP_LIB_FUNC
ComDiagsArea *ExRaiseSqlWarning(CollHeap* heap, ComDiagsArea** diagsArea,
ExeErrorCode err, ComCondition** cond)
{
return ExAddCondition(heap, diagsArea, (Lng32) err, cond, NULL, NULL, NULL);
}
-NA_EIDPROC
-SQLEXP_LIB_FUNC
ComDiagsArea *ExRaiseFunctionSqlError(CollHeap* heap,
ComDiagsArea** diagsArea,
ExeErrorCode err,
@@ -181,8 +172,6 @@ ComDiagsArea *ExRaiseFunctionSqlError(CollHeap* heap,
return *diagsArea;
}
-NA_EIDPROC
-SQLEXP_LIB_FUNC
Int32 convertToHexAscii(char *src, Int32 srcLength, char *result,
Int32 maxResultSize)
{
@@ -218,8 +207,6 @@ Int32 convertToHexAscii(char *src, Int32 srcLength, char *result,
}
-NA_EIDPROC
-SQLEXP_LIB_FUNC
void ExConvertErrorToString(CollHeap* heap,
ComDiagsArea** diagsArea,
char *src,
@@ -307,8 +294,6 @@ void ExConvertErrorToString(CollHeap* heap,
}
//Detailed error support for pcode expression evaluation.
-NA_EIDPROC
-SQLEXP_LIB_FUNC
ComDiagsArea *ExRaiseDetailSqlError(CollHeap* heap,
ComDiagsArea** diagsArea,
ExeErrorCode err,
@@ -444,8 +429,6 @@ ComDiagsArea *ExRaiseDetailSqlError(CollHeap* heap,
}
//Detailed error support for clause expression evaluation.
-NA_EIDPROC
-SQLEXP_LIB_FUNC
ComDiagsArea *ExRaiseDetailSqlError(CollHeap* heap,
ComDiagsArea** diagsArea,
ExeErrorCode err,
@@ -524,8 +507,6 @@ ComDiagsArea *ExRaiseDetailSqlError(CollHeap* heap,
//Detailed error support for conversions, especially for use in convdoit.
-NA_EIDPROC
-SQLEXP_LIB_FUNC
ComDiagsArea *ExRaiseDetailSqlError(CollHeap* heap,
ComDiagsArea** diagsArea,
ExeErrorCode err,
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/exp/ExpError.h
----------------------------------------------------------------------
diff --git a/core/sql/exp/ExpError.h b/core/sql/exp/ExpError.h
index bc30682..7b993de 100644
--- a/core/sql/exp/ExpError.h
+++ b/core/sql/exp/ExpError.h
@@ -65,8 +65,6 @@ class ComCondition;
// above version in that it puts an error condition in the supplied
// ComDiagsArea rather than in a copy.
-NA_EIDPROC
-SQLEXP_LIB_FUNC
ComDiagsArea *ExAddCondition(NAMemory * heap, ComDiagsArea** diagsArea,
Lng32 err, ComCondition** cond=NULL,
Lng32 * intParam1 = NULL,
@@ -76,8 +74,6 @@ ComDiagsArea *ExAddCondition(NAMemory * heap, ComDiagsArea** diagsArea,
const char * stringParam2 = NULL,
const char * stringParam3 = NULL);
-NA_EIDPROC
-SQLEXP_LIB_FUNC
ComDiagsArea *ExRaiseSqlError(NAMemory * heap, ComDiagsArea** diagsArea,
ExeErrorCode err, ComCondition** cond=NULL,
Lng32 * intParam1 = NULL,
@@ -87,12 +83,8 @@ ComDiagsArea *ExRaiseSqlError(NAMemory * heap, ComDiagsArea** diagsArea,
const char * stringParam2 = NULL,
const char * stringParam3 = NULL);
-NA_EIDPROC
-SQLEXP_LIB_FUNC
ComDiagsArea *ExRaiseSqlWarning(NAMemory * heap, ComDiagsArea** diagsArea,
ExeErrorCode err, ComCondition** cond=NULL);
-NA_EIDPROC
-SQLEXP_LIB_FUNC
ComDiagsArea *ExRaiseSqlWarning(NAMemory * heap, ComDiagsArea** diagsArea,
ExeErrorCode err, ComCondition** cond,
Lng32 * intParam1 = NULL,
@@ -101,16 +93,12 @@ ComDiagsArea *ExRaiseSqlWarning(NAMemory * heap, ComDiagsArea** diagsArea,
const char * stringParam1 = NULL,
const char * stringParam2 = NULL,
const char * stringParam3 = NULL);
-NA_EIDPROC
-SQLEXP_LIB_FUNC
ComDiagsArea *ExRaiseFunctionSqlError(NAMemory * heap,
ComDiagsArea** diagsArea,
ExeErrorCode err,
NABoolean derivedFunction = FALSE,
OperatorTypeEnum origOperType = ITM_FIRST_ITEM_OP,
ComCondition** cond=NULL);
-NA_EIDPROC
-SQLEXP_LIB_FUNC
ComDiagsArea *ExRaiseDetailSqlError(CollHeap* heap,
ComDiagsArea** diagsArea,
ExeErrorCode err,
@@ -119,16 +107,12 @@ ComDiagsArea *ExRaiseDetailSqlError(CollHeap* heap,
char *op2 = NULL,
char *op3 = NULL);
-NA_EIDPROC
-SQLEXP_LIB_FUNC
ComDiagsArea *ExRaiseDetailSqlError(CollHeap* heap,
ComDiagsArea** diagsArea,
ExeErrorCode err,
ex_clause *clause,
char *op_data[]);
-NA_EIDPROC
-SQLEXP_LIB_FUNC
ComDiagsArea *ExRaiseDetailSqlError(CollHeap* heap,
ComDiagsArea** diagsArea,
ExeErrorCode err,
@@ -141,8 +125,6 @@ ComDiagsArea *ExRaiseDetailSqlError(CollHeap* heap,
Int32 tgtLength = -1,
Int32 tgtScale = -1,
Int32 tgtPrecision = 0);
-NA_EIDPROC
-SQLEXP_LIB_FUNC
char *stringToHex(char * out, Int32 outLen, char * in, Int32 inLen);
#endif /* EXP_ERROR_H */
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/exp/ExpErrorEnums.h
----------------------------------------------------------------------
diff --git a/core/sql/exp/ExpErrorEnums.h b/core/sql/exp/ExpErrorEnums.h
index fb1baf0..d9aedf7 100644
--- a/core/sql/exp/ExpErrorEnums.h
+++ b/core/sql/exp/ExpErrorEnums.h
@@ -201,11 +201,6 @@ enum ExeErrorCode
EXE_RELEASE_WORK_TIMEOUT = 8584,
EXE_SCHEMA_SECURITY_CHANGED = 8585,
EXE_ASSIGN_ESPS_ERROR = 8586,
- EXE_IAR_MFMAP_BAD = 8590,
- EXE_IAR_ERROR_EXTRACTING_COLUMNS = 8591,
- EXE_IAR_NO_MFMAP = 8592,
- EXE_IAR_MISSING_COLS_COMPRESSED_AUDIT = 8593,
- EXE_AUDIT_IMAGE_EXPR_EVAL_ERROR = 8594,
EXE_MERGE_STMT_ERROR = 8595,
EXE_ESP_CHANGE_PRIORITY_FAILED = 8596,
EXE_RECOMPILE_AUTO_QUERY_RETRY = 8597,
@@ -274,11 +269,6 @@ enum ExeErrorCode
EXE_PARALLEL_EXTRACT_OPEN_ERROR = 8701,
EXE_PARALLEL_EXTRACT_CONNECT_ERROR = 8702,
- // ---------------------------------------------------------------------
- // Warning from updating Measure SQL counters.
- // ---------------------------------------------------------------------
- EXE_MEASURE = 8710,
-
//----------------------------------------------------------------------
// Errors generated in the CLI code
//----------------------------------------------------------------------
@@ -410,7 +400,6 @@ enum ExeErrorCode
CLI_INVALID_CHARSET_FOR_DESCRIPTOR = 8895,
CLI_CHARSET_MISMATCH = 8896,
- CLI_SHADOW_RPC_EXCEPTION = 8897,
CLI_INTERNAL_ERROR = 8898,
CLI_LAST_ERROR = 8899,
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/exp/ExpLOB.cpp
----------------------------------------------------------------------
diff --git a/core/sql/exp/ExpLOB.cpp b/core/sql/exp/ExpLOB.cpp
index 0db6b57..2338850 100644
--- a/core/sql/exp/ExpLOB.cpp
+++ b/core/sql/exp/ExpLOB.cpp
@@ -675,13 +675,10 @@ void ExpLOBinsert::displayContents(Space * space, const char * displayStr,
{
ex_clause::displayContents(space, "ExpLOBinsert", clauseNum, constsArea);
-#ifndef __EID
char buf[100];
str_sprintf(buf, " liFlags_ = %d", liFlags_);
space->allocateAndCopyToAlignedSpace(buf, str_len(buf), sizeof(short));
-#endif
-
}
ex_expr::exp_return_type ExpLOBiud::insertDesc(char *op_data[],
@@ -758,13 +755,6 @@ ex_expr::exp_return_type ExpLOBiud::insertDesc(char *op_data[],
Lng32 waitedOp = 0;
-#ifdef __EID
- waitedOp = 0; // nowaited op from EID/TSE process
-#else
- waitedOp = 1;
-#endif
-
- //temptemp. Remove after ExLobsOper adds nowaited support.
waitedOp = 1;
// temp. Pass lobLen. When ExLobsOper fixes it so len is not needed during
@@ -987,13 +977,6 @@ ex_expr::exp_return_type ExpLOBiud::insertData(Lng32 handleLen,
Lng32 waitedOp = 0;
-#ifdef __EID
- waitedOp = 0; // nowaited op from EID/TSE process
-#else
- waitedOp = 1;
-#endif
-
- //temptemp. Remove after ExLobsOper adds nowaited support.
waitedOp = 1;
Lng32 cliError = 0;
@@ -1058,11 +1041,9 @@ ex_expr::exp_return_type ExpLOBinsert::eval(char *op_data[],
if(fromEmpty())
return err;
-#ifndef __EID
char * handle = op_data[0];
Lng32 handleLen = getOperand(0)->getLength();
err = insertData(handleLen, handle, op_data, h, diagsArea);
-#endif
return err;
}
@@ -1119,13 +1100,6 @@ ex_expr::exp_return_type ExpLOBdelete::eval(char *op_data[],
return ex_expr::EXPR_ERROR;
Lng32 waitedOp = 0;
-#ifdef __EID
- waitedOp = 0; // nowaited op from EID/TSE process
-#else
- waitedOp = 1;
-#endif
-
- //temptemp. Remove after ExLobsOper adds nowaited support.
waitedOp = 1;
Lng32 cliError = 0;
@@ -1188,13 +1162,10 @@ void ExpLOBupdate::displayContents(Space * space, const char * displayStr,
{
ExpLOBoper::displayContents(space, "ExpLOBupdate", clauseNum, constsArea);
-#ifndef __EID
char buf[100];
str_sprintf(buf, " luFlags_ = %d", luFlags_);
space->allocateAndCopyToAlignedSpace(buf, str_len(buf), sizeof(short));
-#endif
-
}
ex_expr::exp_return_type
@@ -1354,13 +1325,6 @@ ex_expr::exp_return_type ExpLOBupdate::eval(char *op_data[],
else
lobMaxSize = getLobMaxSize();
Lng32 waitedOp = 0;
-#ifdef __EID
- waitedOp = 0; // nowaited op from EID/TSE process
-#else
- waitedOp = 1;
-#endif
-
- //temptemp. Remove after ExLobsOper adds nowaited support.
waitedOp = 1;
Lng32 cliError = 0;
@@ -1554,14 +1518,8 @@ ex_expr::exp_return_type ExpLOBconvert::eval(char *op_data[],
Lng32 waitedOp = 0;
Int64 lobLen = 0;
char *lobData = NULL;
-#ifdef __EID
- waitedOp = 0; // nowaited op from EID/TSE process
-#else
waitedOp = 1;
-#endif
- //temptemp. Remove after ExLobsOper adds nowaited support.
- waitedOp = 1;
extractFromLOBhandle(&flags, &lobType, &lobNum, &uid,
&descKey, &descTS,
&schNameLen, schName,
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/exp/ExpLOB.h
----------------------------------------------------------------------
diff --git a/core/sql/exp/ExpLOB.h b/core/sql/exp/ExpLOB.h
index 0d2561d..850f6bc 100644
--- a/core/sql/exp/ExpLOB.h
+++ b/core/sql/exp/ExpLOB.h
@@ -422,87 +422,87 @@ class ExpLOBiud : public ExpLOBoper {
CollHeap*h,
ComDiagsArea** diagsArea);
- NA_EIDPROC NABoolean isAppend()
+ NABoolean isAppend()
{
return ((liudFlags_ & IS_APPEND) != 0);
};
- NA_EIDPROC inline void setIsAppend(NABoolean v)
+ inline void setIsAppend(NABoolean v)
{
(v) ? liudFlags_ |= IS_APPEND: liudFlags_ &= ~IS_APPEND;
};
- NA_EIDPROC NABoolean fromString()
+ NABoolean fromString()
{
return ((liudFlags_ & FROM_STRING) != 0);
};
- NA_EIDPROC inline void setFromString(NABoolean v)
+ inline void setFromString(NABoolean v)
{
(v) ? liudFlags_ |= FROM_STRING: liudFlags_ &= ~FROM_STRING;
};
- NA_EIDPROC NABoolean fromBuffer()
+ NABoolean fromBuffer()
{
return ((liudFlags_ & FROM_BUFFER) != 0);
};
- NA_EIDPROC inline void setFromBuffer(NABoolean v)
+ inline void setFromBuffer(NABoolean v)
{
(v) ? liudFlags_ |= FROM_BUFFER: liudFlags_ &= ~FROM_BUFFER;
};
- NA_EIDPROC inline void setFromEmpty(NABoolean v)
+ inline void setFromEmpty(NABoolean v)
{
(v) ? liudFlags_ |= FROM_EMPTY: liudFlags_ &= ~FROM_EMPTY;
};
- NA_EIDPROC NABoolean fromEmpty()
+ NABoolean fromEmpty()
{
return ((liudFlags_ & FROM_EMPTY) != 0);
};
- NA_EIDPROC NABoolean fromFile()
+ NABoolean fromFile()
{
return ((liudFlags_ & FROM_FILE) != 0);
};
- NA_EIDPROC inline void setFromFile(NABoolean v)
+ inline void setFromFile(NABoolean v)
{
(v) ? liudFlags_ |= FROM_FILE: liudFlags_ &= ~FROM_FILE;
};
- NA_EIDPROC NABoolean fromLoad()
+ NABoolean fromLoad()
{
return ((liudFlags_ & FROM_LOAD) != 0);
};
- NA_EIDPROC inline void setFromLoad(NABoolean v)
+ inline void setFromLoad(NABoolean v)
{
(v) ? liudFlags_ |= FROM_LOAD: liudFlags_ &= ~FROM_LOAD;
};
- NA_EIDPROC NABoolean fromLob()
+ NABoolean fromLob()
{
return ((liudFlags_ & FROM_LOB) != 0);
};
- NA_EIDPROC inline void setFromLob(NABoolean v)
+ inline void setFromLob(NABoolean v)
{
(v) ? liudFlags_ |= FROM_LOB: liudFlags_ &= ~FROM_LOB;
};
- NA_EIDPROC NABoolean fromLobExternal()
+ NABoolean fromLobExternal()
{
return ((liudFlags_ & FROM_LOB_EXTERNAL) != 0);
};
- NA_EIDPROC inline void setFromLobExternal(NABoolean v)
+ inline void setFromLobExternal(NABoolean v)
{
(v) ? liudFlags_ |= FROM_LOB_EXTERNAL: liudFlags_ &= ~FROM_LOB_EXTERNAL;
};
- NA_EIDPROC NABoolean fromExternal()
+ NABoolean fromExternal()
{
return ((liudFlags_ & FROM_EXTERNAL) != 0);
};
- NA_EIDPROC inline void setFromExternal(NABoolean v)
+ inline void setFromExternal(NABoolean v)
{
(v) ? liudFlags_ |= FROM_EXTERNAL: liudFlags_ &= ~FROM_EXTERNAL;
};
@@ -696,21 +696,21 @@ public:
virtual short getClassSize() { return (short)sizeof(*this); }
// ---------------------------------------------------------------------
- NA_EIDPROC NABoolean toLob()
+ NABoolean toLob()
{
return ((lsFlags_ & TO_LOB) != 0);
};
- NA_EIDPROC inline void setToLob(NABoolean v)
+ inline void setToLob(NABoolean v)
{
(v) ? lsFlags_ |= TO_LOB: lsFlags_ &= ~TO_LOB;
};
- NA_EIDPROC NABoolean toFile()
+ NABoolean toFile()
{
return ((lsFlags_ & TO_FILE) != 0);
};
- NA_EIDPROC inline void setToFile(NABoolean v)
+ inline void setToFile(NABoolean v)
{
(v) ? lsFlags_ |= TO_FILE: lsFlags_ &= ~TO_FILE;
};
@@ -779,31 +779,31 @@ public:
virtual short getClassSize() { return (short)sizeof(*this); }
// ---------------------------------------------------------------------
- NA_EIDPROC NABoolean toString()
+ NABoolean toString()
{
return ((lcFlags_ & TO_STRING) != 0);
};
- NA_EIDPROC inline void setToString(NABoolean v)
+ inline void setToString(NABoolean v)
{
(v) ? lcFlags_ |= TO_STRING: lcFlags_ &= ~TO_STRING;
};
- NA_EIDPROC NABoolean toLob()
+ NABoolean toLob()
{
return ((lcFlags_ & TO_LOB) != 0);
};
- NA_EIDPROC inline void setToLob(NABoolean v)
+ inline void setToLob(NABoolean v)
{
(v) ? lcFlags_ |= TO_LOB: lcFlags_ &= ~TO_LOB;
};
- NA_EIDPROC NABoolean toFile()
+ NABoolean toFile()
{
return ((lcFlags_ & TO_FILE) != 0);
};
- NA_EIDPROC inline void setToFile(NABoolean v)
+ inline void setToFile(NABoolean v)
{
(v) ? lcFlags_ |= TO_FILE: lcFlags_ &= ~TO_FILE;
};
@@ -872,22 +872,22 @@ public:
virtual short getClassSize() { return (short)sizeof(*this); }
// ---------------------------------------------------------------------
- NA_EIDPROC NABoolean toString()
+ NABoolean toString()
{
return ((lchFlags_ & TO_STRING) != 0);
};
- NA_EIDPROC inline void setToString(NABoolean v)
+ inline void setToString(NABoolean v)
{
(v) ? lchFlags_ |= TO_STRING: lchFlags_ &= ~TO_STRING;
};
- NA_EIDPROC NABoolean toLob()
+ NABoolean toLob()
{
return ((lchFlags_ & TO_LOB) != 0);
};
- NA_EIDPROC inline void setToLob(NABoolean v)
+ inline void setToLob(NABoolean v)
{
(v) ? lchFlags_ |= TO_LOB: lchFlags_ &= ~TO_LOB;
};
@@ -992,18 +992,18 @@ public:
// ---------------------------------------------------------------------
// Redefinition of methods inherited from NAVersionedObject.
// ---------------------------------------------------------------------
- NA_EIDPROC virtual unsigned char getClassVersionID()
+ virtual unsigned char getClassVersionID()
{
return 1;
}
- NA_EIDPROC virtual void populateImageVersionIDArray()
+ virtual void populateImageVersionIDArray()
{
setImageVersionID(2,getClassVersionID());
ExpLOBoper::populateImageVersionIDArray();
}
- NA_EIDPROC virtual short getClassSize() { return (short)sizeof(*this); }
+ virtual short getClassSize() { return (short)sizeof(*this); }
private:
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/exp/ExpPCode.cpp
----------------------------------------------------------------------
diff --git a/core/sql/exp/ExpPCode.cpp b/core/sql/exp/ExpPCode.cpp
index 441c041..f3f2096 100644
--- a/core/sql/exp/ExpPCode.cpp
+++ b/core/sql/exp/ExpPCode.cpp
@@ -48,7 +48,6 @@
// Uncomment the line below to debug new PCode instructions.
// #define SQLMX_DEBUG_PCIT
-NA_EIDPROC
PCodeSegment::PCodeSegment(PCodeBinary* pcode) : NAVersionedObject() {
str_cpy_all((char*)&eyeCatcher_, PC_eyeCatcher, PC_eyeCatcherSize);
flags_ = 0;
@@ -57,38 +56,32 @@ PCodeSegment::PCodeSegment(PCodeBinary* pcode) : NAVersionedObject() {
}
-NA_EIDPROC
unsigned char PCodeSegment::getClassVersionID() {
return 1;
}
-NA_EIDPROC
Long PCodeSegment::pack(void *space) {
convAddrToOffsetInPCode(space);
pCodeSegment_.pack(space);
return NAVersionedObject::pack(space);
}
-NA_EIDPROC
Lng32 PCodeSegment::unpack(void *base, void * reallocator) {
if (pCodeSegment_.unpack(base)) return -1;
convOffsetToAddrInPCode(base);
return NAVersionedObject::unpack(base, reallocator);
}
-NA_EIDPROC
Int32 PCodeSegment::getPCodeSegmentSize() {
return pCodeSegmentSize_;
}
-NA_EIDPROC
void PCodeSegment::setPCodeSegmentSize(Int32 size) {
pCodeSegmentSize_ = size;
}
-NA_EIDPROC
short PCodeSegment::getClassSize() {
Int32 trueSize = sizeof(*this) + getPCodeSegmentSize();
return( (short)(trueSize + (trueSize % 8)) );
@@ -101,7 +94,6 @@ short PCodeSegment::getClassSize() {
// passed in space object and replace the old attributes pointer in the pcode
// segment with the new pointer
//
-NA_EIDPROC
void PCodeSegment::replaceAttributesPtr(ex_clause* clauses, Space* space)
{
Int32 addrBuf[6];
@@ -186,7 +178,6 @@ void PCodeSegment::replaceAttributesPtr(ex_clause* clauses, Space* space)
// Locate the clause pointer "oldClause" in the pcode segment and replace it
// with the clause "newClause".
-NA_EIDPROC
void PCodeSegment::replaceClauseEvalPtr(ex_clause* oldClause,
ex_clause* newClause)
{
@@ -225,7 +216,6 @@ void PCodeSegment::replaceClauseEvalPtr(ex_clause* oldClause,
//
// convOffsetToAddrInPCode translates the offsets to addresses
// -----------------------------------------------------------------------
-NA_EIDPROC
void PCodeSegment::convAddrToOffsetInPCode(void * space) {
PCodeBinary *pcode = getPCodeBinary();
if (!pcode)
@@ -246,7 +236,6 @@ void PCodeSegment::convAddrToOffsetInPCode(void * space) {
}
}
-NA_EIDPROC
void PCodeSegment::convOffsetToAddrInPCode(void* base) {
PCodeBinary *pcode = getPCodeBinary();
if (!pcode)
@@ -1161,31 +1150,19 @@ Int32 *PCode::getEmbeddedAddresses(Int32 opcode, Int32 addr[]) {
break;
case PCIT::CLAUSE_BRANCH:
-#ifdef NA_64BIT
addr[0] = 3; // address of branch clause starts from pcode[3]
-#else
- addr[0] = 2;
-#endif
addr[1] = -1;
break;
case PCIT::NULL_VIOLATION_MPTR32_MPTR32_IPTR_IPTR:
addr[0] = 5;
-#ifdef NA_64BIT
addr[1] = 7; // address of 2nd attributes struct starts from pcode[7]
-#else
- addr[1] = 6;
-#endif
addr[2] = -1;
break;
case PCIT::NOT_NULL_BRANCH_MBIN32S_MBIN16S_MBIN16S_IBIN32S:
addr[0] = 7;
-#ifdef NA_64BIT
addr[1] = 9; // should be pcode[9], but don't know if this opcode is used
-#else
- addr[1] = 8;
-#endif
addr[2] = -1;
break;
@@ -1206,7 +1183,6 @@ Int32 PCode::getInstructionLength(PCodeBinary * pcode) {
NAAssert(tmpbuf, __FILE__ , __LINE__ );
}
-// 64BIT : should here be a switch statement?
if ((opcode == PCIT::HASHCOMB_BULK_MBIN32U) ||
(opcode == PCIT::NOT_NULL_BRANCH_BULK) ||
(opcode == PCIT::MOVE_BULK) ||
@@ -1254,11 +1230,11 @@ PCIT::Instruction PCode::getInstruction(PCI *pci) {
return (PCIT::Instruction)opcodeMap[i].opcode;
}
}
-#ifdef NA_DEBUG_C_RUNTIME
+#ifdef _DEBUG
fprintf(stderr,
"ERROR(getInstruction) -- Unknown instruction, opcode = %d\n",
pci->getOperation());
-#endif // NA_DEBUG_C_RUNTIME
+#endif // _DEBUG
ExpAssert(0, "Unknown PCode Instruction");
return(PCIT::NOP);
@@ -1356,7 +1332,7 @@ void PCIT::operandString(Int32 operand, char* buffer) {
}
void PCode::print(PCIList code) {
-#ifdef NA_DEBUG_C_RUNTIME
+#ifdef _DEBUG
PCIListIter iter(code);
for(PCI *pci = iter.first(); pci; pci = iter.next()) {
pci->print();
@@ -1364,7 +1340,7 @@ void PCode::print(PCIList code) {
}
#endif
}
-#ifdef NA_DEBUG_C_RUNTIME
+#ifdef _DEBUG
void PCI::print() {
char buffer[32];
PCIT::operandString(operation_, buffer);
@@ -1388,7 +1364,6 @@ void PCI::print() {
};
#endif
-#ifndef __EID
void PCode::displayContents(PCIList code, Space *space) {
char buf[256];
char operandBuf[32];
@@ -1474,8 +1449,6 @@ void PCode::displayContents(PCodeBinary* pCode, Space *space) {
space->allocateAndCopyToAlignedSpace(buf, str_len(buf), sizeof(short));
}
-#endif
-
Int32 PCode::dumpContents(PCIList code, char * buf, Int32 bufLen) {
char operandBuf[32];
Int32 len = 0;
@@ -2468,11 +2441,7 @@ PCIID PCode::generateJumpAndBranch(Attributes *dst,
if (notNullBranch)
{
AML aml;
-#ifdef NA_64BIT
OL ol((Int64) notNullBranch);
-#else
- OL ol((PCIType::Operand) notNullBranch);
-#endif
PCI pci(PCIT::Op_TARGET, aml, ol);
code.append(pci);
}
@@ -2607,12 +2576,7 @@ void PCode::preClausePCI(ex_clause *clause, PCIList& code) {
for(Int32 i=0; i<clause->getNumberBranchTargets(); i++)
{
AML aml;
-#ifdef NA_64BIT
- // dg64 - match signature
OL ol((Int64) clause);
-#else
- OL ol((PCIType::Operand) clause);
-#endif
PCI pci(PCIT::Op_TARGET, aml, ol);
code.append(pci);
}
@@ -2695,11 +2659,7 @@ PCIID PCode::nullBranchHelper(AttributesPtr *attrs,
attrA->getNullIndOffset(),
attrB->getAtp(), attrB->getAtpIndex(),
attrB->getNullIndOffset(),
-#ifdef NA_64BIT
(Int64)attrA, (Int64)attrB
-#else
- (PCIType::Operand)attrA, (PCIType::Operand)attrB
-#endif
);
PCI pci(PCIT::Op_NULL_VIOLATION, aml, ol);
code.append(pci);
@@ -2765,13 +2725,8 @@ PCIID PCode::nullBranchHelper(AttributesPtr *attrs,
AML aml(PCIT::MPTR32,PCIT::MPTR32,PCIT::IPTR,PCIT::IPTR);
OL ol(attrA->getAtp(),attrA->getAtpIndex(),attrA->getNullIndOffset(),
attrA->getAtp(),attrA->getAtpIndex(),attrA->getNullIndOffset(),
-#ifdef NA_64BIT
(Int64)attrA,
(Int64)0
-#else
- (PCIType::Operand)attrA,
- (Int32)0
-#endif
);
PCI pci(PCIT::Op_NULL_VIOLATION, aml, ol);
code.append(pci);
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/exp/ExpPCode.h
----------------------------------------------------------------------
diff --git a/core/sql/exp/ExpPCode.h b/core/sql/exp/ExpPCode.h
index 261e0ec..a39334d 100644
--- a/core/sql/exp/ExpPCode.h
+++ b/core/sql/exp/ExpPCode.h
@@ -59,19 +59,7 @@
//Opcode map defines
#define OPCODE_MAP_FIRSTSIX_BITS 0x000000000000003F
-/* #ifdef NA_DEBUG_C_RUNTIME
#ifdef _DEBUG
-#ifdef _EID
-#if !defined(NA_NSK)
-#define DEBUG_PCODE
-#endif // NA_WINNT
-#else // _EID
-#define DEBUG_PCODE
-#endif // _EID
-#endif // _DEBUG
-#endif */
-
-#ifdef NA_DEBUG_C_RUNTIME
#include <stdio.h>
#endif
@@ -123,17 +111,13 @@ public:
Int32 length;
Int32 numAmodes;
};
-//#if defined( __EID ) && defined( NA_NSK )
-//#pragma class_functions PCodeInstructionMap (resident)
-//#endif
-
// class PCodeSegment
//
// this class contains the actual byte code
#pragma warning ( disable : 4251 )
-class SQLEXP_LIB_FUNC PCodeSegment : public NAVersionedObject {
+class PCodeSegment : public NAVersionedObject {
public:
PCodeSegment(PCodeBinary* pcode = 0);
@@ -147,11 +131,7 @@ public:
// Adds pointer to PCodeBinary sequences and advance idx
Int32 setPtrAsPCodeBinary(PCodeBinary *pcode, Int32 idx, Long ptr)
{
- #ifdef NA_64BIT
*(Long*)&(pcode[idx]) = ptr;
- #else
- pcode[idx] = (PCodeBinary) ptr;
- #endif
return (sizeof(ptr)/sizeof(PCodeBinary));
}
@@ -223,7 +203,7 @@ private:
// functions that operate on PCI's.
//
//
-class SQLEXP_LIB_FUNC PCode {
+class PCode {
public:
// Construction/Destruction
@@ -394,12 +374,11 @@ public:
//
static void print(PCIList pciList);
-#ifndef __EID
// Used by SHOWPLAN to display PCI's
//
static void displayContents(PCIList pciList, Space *space);
static void displayContents(PCodeBinary* pCode, Space *space);
-#endif
+
// for debug
static Int32 dumpContents(PCIList pciList, char *buf, Int32 bufLen);
static void dumpContents(PCodeBinary* pCode, char *buf, Int32 bufLen);
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/exp/ExpPCodeClauseGen.cpp
----------------------------------------------------------------------
diff --git a/core/sql/exp/ExpPCodeClauseGen.cpp b/core/sql/exp/ExpPCodeClauseGen.cpp
index d3a4e53..e181cff 100644
--- a/core/sql/exp/ExpPCodeClauseGen.cpp
+++ b/core/sql/exp/ExpPCodeClauseGen.cpp
@@ -201,11 +201,7 @@ ex_expr::exp_return_type ex_clause::pCodeGenerate(Space *space, UInt32 f) {
// clause->eval(), and then pops the stack.
//
AML aml(PCIT::IPTR, PCIT::IBIN32S);
-#ifdef NA_64BIT
OL ol((Int64)this, useProcessNulls);
-#else
- OL ol((PCIType::Operand)this, useProcessNulls);
-#endif
PCI pci(PCIT::Op_CLAUSE_EVAL, aml, ol);
setNoPCodeAvailable(TRUE);
@@ -228,11 +224,7 @@ ex_expr::exp_return_type ex_clause::pCodeGenerate(Space *space, UInt32 f) {
if(branchEndA)
{
AML aml1;
-#ifdef NA_64BIT
OL ol1((Int64)branchEndA);
-#else
- OL ol1((PCIType::Operand)branchEndA);
-#endif
PCI pci1(PCIT::Op_TARGET, aml1, ol1);
code.append(pci1);
}
@@ -248,11 +240,7 @@ ex_expr::exp_return_type ex_clause::pCodeGenerate(Space *space, UInt32 f) {
ex_branch_clause *branchClause = (ex_branch_clause*)this;
ex_clause *targetClause = branchClause->get_branch_clause();
AML aml(PCIT::IPTR, PCIT::IPTR);
-#ifdef NA_64BIT
OL ol((Int64)targetClause, (Int64)this);
-#else
- OL ol((PCIType::Operand)targetClause, (PCIType::Operand)this);
-#endif
PCI pci(PCIT::Op_CLAUSE_BRANCH, aml, ol);
code.append(pci);
}
@@ -278,11 +266,9 @@ ex_expr::exp_return_type ex_inout_clause::pCodeGenerate(Space *space, UInt32 f)
ex_expr::exp_return_type ex_aggr_min_max_clause::pCodeGenerate(Space *space, UInt32 f) {
#ifdef _DEBUG
-#ifndef __EID
if (getenv("NO_PCODE_MIN_MAX"))
return ex_clause::pCodeGenerate(space, f);
#endif
-#endif
if ((getOperand(1)->getNullFlag()) ||
(getOperand(0)->getVCIndicatorLength() > 0))
@@ -366,11 +352,7 @@ ex_expr::exp_return_type ex_aggr_min_max_clause::pCodeGenerate(Space *space, UIn
// End branch target.
//
AML aml6;
-#ifdef NA_64BIT
OL ol6((Int64)branchTgt);
-#else
- OL ol6((PCIType::Operand)branchTgt);
-#endif
PCI pci6(PCIType::Op_TARGET, aml6, ol6);
code.append(pci6);
@@ -402,7 +384,7 @@ ex_expr::exp_return_type ex_function_clause::pCodeGenerate(Space *space, UInt32
// EFFECTS: stores pointer to PCodeObject in clause
//
ex_expr::exp_return_type ex_function_encode::pCodeGenerate(Space *space, UInt32 f) {
-#ifdef NA_DEBUG_C_RUNTIME
+#ifdef _DEBUG
// For debugging...
if(getenv("PCODE_NO_ENCODE")) return ex_clause::pCodeGenerate(space, f);
#endif
@@ -570,11 +552,7 @@ ex_expr::exp_return_type ex_function_encode::pCodeGenerate(Space *space, UInt32
if(branchToEnd)
{
AML aml;
-#ifdef NA_64BIT
OL ol((Int64)branchToEnd);
-#else
- OL ol((PCIType::Operand)branchToEnd);
-#endif
PCI pci(PCIT::Op_TARGET, aml, ol);
code.append(pci);
}
@@ -623,7 +601,7 @@ ex_expr::exp_return_type ex_aggr_any_true_max_clause::pCodeGenerate(Space *space
// EFFECTS: stores pointer to PCodeObject in clause
//
ex_expr::exp_return_type ex_bool_clause::pCodeGenerate(Space *space, UInt32 f) {
-#ifdef NA_DEBUG_C_RUNTIME
+#ifdef _DEBUG
// For debugging...
if(getenv("PCODE_NO_BOOL")) return ex_clause::pCodeGenerate(space, f);
#endif
@@ -693,7 +671,7 @@ ex_expr::exp_return_type ex_bool_clause::pCodeGenerate(Space *space, UInt32 f) {
// EFFECTS: stores pointer to PCodeObject in clause
//
ex_expr::exp_return_type bool_result_clause::pCodeGenerate(Space *space, UInt32 f) {
-#ifdef NA_DEBUG_C_RUNTIME
+#ifdef _DEBUG
// For debugging...
if(getenv("PCODE_NO_BOOL_RESULT")) return ex_clause::pCodeGenerate(space, f);
#endif
@@ -753,15 +731,9 @@ ex_expr::exp_return_type ex_branch_clause::pCodeGenerate(Space *space, UInt32 f)
ex_clause *targetClause = get_branch_clause();
AML aml(PCIT::IPTR, PCIT::IPTR, PCIT::MBIN32S, PCIT::MBIN32S);
-#ifdef NA_64BIT
OL ol((Int64)targetClause, (Int64)0,
attrs[0]->getAtp(), attrs[0]->getAtpIndex(), (Int32)attrs[0]->getOffset(),
attrs[1]->getAtp(), attrs[1]->getAtpIndex(), (Int32)attrs[1]->getOffset());
-#else
- OL ol((PCIType::Operand)targetClause, 0,
- attrs[0]->getAtp(), attrs[0]->getAtpIndex(), (Int32)attrs[0]->getOffset(),
- attrs[1]->getAtp(), attrs[1]->getAtpIndex(), (Int32)attrs[1]->getOffset());
-#endif // NA_64BIT
// Generate the branch instruction
//
@@ -794,7 +766,7 @@ ex_expr::exp_return_type ex_branch_clause::pCodeGenerate(Space *space, UInt32 f)
// EFFECTS: stores pointer to PCodeObject in clause
//
ex_expr::exp_return_type ex_comp_clause::pCodeGenerate(Space *space, UInt32 f) {
-#ifdef NA_DEBUG_C_RUNTIME
+#ifdef _DEBUG
// For debugging...
if(getenv("PCODE_NO_COMP")) return ex_clause::pCodeGenerate(space, f);
#endif
@@ -1383,11 +1355,7 @@ ex_expr::exp_return_type ex_comp_clause::pCodeGenerate(Space *space, UInt32 f) {
if(branchToEnd)
{
AML aml;
-#ifdef NA_64BIT
OL ol((Int64)branchToEnd);
-#else
- OL ol((PCIType::Operand)branchToEnd);
-#endif
PCI pci(PCIT::Op_TARGET, aml, ol);
code.append(pci);
}
@@ -1431,7 +1399,7 @@ ex_expr::exp_return_type ex_noop_clause::pCodeGenerate(Space *space, UInt32 f) {
// EFFECTS: stores pointer to PCodeObject in clause
//
ex_expr::exp_return_type ex_unlogic_clause::pCodeGenerate(Space *space, UInt32 f) {
-#ifdef NA_DEBUG_C_RUNTIME
+#ifdef _DEBUG
// For debugging...
if(getenv("PCODE_NO_UNLOGIC")) return ex_clause::pCodeGenerate(space, f);
#endif
@@ -1498,7 +1466,7 @@ ex_expr::exp_return_type ex_unlogic_clause::pCodeGenerate(Space *space, UInt32 f
// EFFECTS: stores pointer to PCodeObject in clause
//
ex_expr::exp_return_type ex_function_bool::pCodeGenerate(Space *space, UInt32 f) {
-#ifdef NA_DEBUG_C_RUNTIME
+#ifdef _DEBUG
// For debugging...
if(getenv("PCODE_NO_BOOL")) return ex_clause::pCodeGenerate(space, f);
#endif
@@ -1563,7 +1531,7 @@ ex_expr::exp_return_type ExHDPHash::pCodeGenerate(Space *space, UInt32 f)
// again, resulting in an infinite loop. So just duplicate the code below
// and keep it up-to-date.
-#ifdef NA_DEBUG_C_RUNTIME
+#ifdef _DEBUG
// For debugging...
if(getenv("PCODE_NO_HASH")) return ex_clause::pCodeGenerate(space, f);
#endif
@@ -1687,11 +1655,7 @@ ex_expr::exp_return_type ExHDPHash::pCodeGenerate(Space *space, UInt32 f)
if(branchToEnd)
{
AML aml;
-#ifdef NA_64BIT
OL ol((Int64)branchToEnd);
-#else
- OL ol((PCIType::Operand)branchToEnd);
-#endif
PCI pci(PCIT::Op_TARGET, aml, ol);
code.append(pci);
}
@@ -1717,7 +1681,7 @@ ex_expr::exp_return_type ExHDPHash::pCodeGenerate(Space *space, UInt32 f)
ex_expr::exp_return_type ex_function_hash::pCodeGenerate(Space *space, UInt32 f)
{
-#ifdef NA_DEBUG_C_RUNTIME
+#ifdef _DEBUG
// For debugging...
if(getenv("PCODE_NO_HASH")) return ex_clause::pCodeGenerate(space, f);
#endif
@@ -1793,11 +1757,7 @@ ex_expr::exp_return_type ex_function_hash::pCodeGenerate(Space *space, UInt32 f)
if(branchToEnd)
{
AML aml;
-#ifdef NA_64BIT
OL ol((Int64)branchToEnd);
-#else
- OL ol((PCIType::Operand)branchToEnd);
-#endif
PCI pci(PCIT::Op_TARGET, aml, ol);
code.append(pci);
}
@@ -1822,7 +1782,7 @@ ex_expr::exp_return_type ex_function_hash::pCodeGenerate(Space *space, UInt32 f)
// EFFECTS: stores pointer to PCodeObject in clause
//
ex_expr::exp_return_type ExHDPHashComb::pCodeGenerate(Space *space, UInt32 f) {
-#ifdef NA_DEBUG_C_RUNTIME
+#ifdef _DEBUG
// For debugging...
if(getenv("PCODE_NO_HASHCOMB")) return ex_clause::pCodeGenerate(space, f);
#endif
@@ -1886,7 +1846,7 @@ ex_expr::exp_return_type ExHDPHashComb::pCodeGenerate(Space *space, UInt32 f) {
// EFFECTS: stores pointer to PCodeObject in clause
//
ex_expr::exp_return_type ExHashComb::pCodeGenerate(Space *space, UInt32 f) {
-#ifdef NA_DEBUG_C_RUNTIME
+#ifdef _DEBUG
// For debugging...
if(getenv("PCODE_NO_HASHCOMB")) return ex_clause::pCodeGenerate(space, f);
#endif
@@ -1942,7 +1902,7 @@ ex_expr::exp_return_type ExHashComb::pCodeGenerate(Space *space, UInt32 f) {
//
//
ex_expr::exp_return_type ex_function_replace_null::pCodeGenerate(Space *space, UInt32 f){
-#ifdef NA_DEBUG_C_RUNTIME
+#ifdef _DEBUG
// For debugging...
if(getenv("PCODE_NO_REPLACE_NULL")) return ex_clause::pCodeGenerate(space, f);
#endif
@@ -2020,17 +1980,13 @@ ex_expr::exp_return_type ex_function_replace_null::pCodeGenerate(Space *space, U
// Helpers for working with attributes
//
-NA_EIDPROC
Int32 isSameAttribute(Attributes *attrA, Attributes *attrB) {
if(attrA->getAtpIndex() != attrB->getAtpIndex()) return 0;
if(attrA->getOffset() != attrB->getOffset()) return 0;
return 1;
};
-NA_EIDPROC
Int32 isConstantAttribute(Attributes *attr) { return attr->getAtpIndex() == 0; };
-NA_EIDPROC
Int32 isTemporaryAttribute(Attributes *attr) { return attr->getAtpIndex() == 1;};
-NA_EIDPROC
Int32 isAtpAttribute(Attributes *attr) { return attr->getAtpIndex() > 1; };
ex_expr::exp_return_type ex_arith_clause::unaryArithPCodeGenerate
@@ -2101,11 +2057,7 @@ ex_expr::exp_return_type ex_arith_clause::unaryArithPCodeGenerate
if(branchToEnd)
{
AML aml;
-#ifdef NA_64BIT
OL ol((Int64)branchToEnd);
-#else
- OL ol((PCIType::Operand)branchToEnd);
-#endif
PCI pci(PCIT::Op_TARGET, aml, ol);
code.append(pci);
}
@@ -2129,7 +2081,7 @@ ex_expr::exp_return_type ex_arith_clause::unaryArithPCodeGenerate
// EFFECTS: stores pointer to PCodeObject in clause
//
ex_expr::exp_return_type ex_arith_clause::pCodeGenerate(Space *space, UInt32 f) {
-#ifdef NA_DEBUG_C_RUNTIME
+#ifdef _DEBUG
// For debugging...
if(getenv("PCODE_NO_ARITH")) return ex_clause::pCodeGenerate(space, f);
#endif
@@ -2414,11 +2366,7 @@ ex_expr::exp_return_type ex_arith_clause::pCodeGenerate(Space *space, UInt32 f)
if(branchToEnd)
{
AML aml;
-#ifdef NA_64BIT
OL ol((Int64)branchToEnd);
-#else
- OL ol((PCIType::Operand)branchToEnd);
-#endif
PCI pci(PCIT::Op_TARGET, aml, ol);
code.append(pci);
}
@@ -2441,7 +2389,7 @@ ex_expr::exp_return_type ex_arith_clause::pCodeGenerate(Space *space, UInt32 f)
// EFFECTS: stores pointer to PCodeObject in clause
//
ex_expr::exp_return_type ex_arith_sum_clause::pCodeGenerate(Space *space, UInt32 f) {
-#ifdef NA_DEBUG_C_RUNTIME
+#ifdef _DEBUG
// For debugging...
if(getenv("PCODE_NO_ARITH_SUM")) return ex_clause::pCodeGenerate(space, f);
#endif
@@ -2588,7 +2536,7 @@ ex_expr::exp_return_type ex_arith_count_clause::pCodeGenerate(Space *space, UInt
return ex_clause::pCodeGenerate(space, f);
};
-NA_EIDPROC static void computeBounds(Attributes *attr, Int64 &lowBounds,
+static void computeBounds(Attributes *attr, Int64 &lowBounds,
UInt64 &highBounds, Int32 &bigBounds, Int32 &isSigned)
{
const UInt64 decimalPrecision[] = {
@@ -2734,7 +2682,7 @@ const Int32 bpPrecision[] = { 0, 1, 3, 7, 15, 31, 63, 127, 255, 511,
// EFFECTS: stores pointer to PCodeObject in clause
//
ex_expr::exp_return_type ex_conv_clause::pCodeGenerate(Space *space, UInt32 f) {
-#ifdef NA_DEBUG_C_RUNTIME
+#ifdef _DEBUG
// For debugging...
if(getenv("PCODE_NO_CONV")) return ex_clause::pCodeGenerate(space, f);
#endif
@@ -3026,11 +2974,7 @@ ex_expr::exp_return_type ex_conv_clause::pCodeGenerate(Space *space, UInt32 f) {
if (nullJmp)
{
AML aml;
-#ifdef NA_64BIT
OL ol((Int64) nullJmp);
-#else
- OL ol((PCIType::Operand) nullJmp);
-#endif
PCI pci(PCIT::Op_TARGET, aml, ol);
code.append(pci);
}
@@ -3069,7 +3013,7 @@ ex_expr::exp_return_type ex_conv_clause::pCodeGenerate(Space *space, UInt32 f) {
return ex_clause::pCodeGenerate(space, f);
}
-#ifdef NA_DEBUG_C_RUNTIME
+#ifdef _DEBUG
// Allow 64 -> 64 with differing scale
//
if(getInstruction() == CONV_BIN64S_BIN64S)
@@ -3156,7 +3100,7 @@ ex_expr::exp_return_type ex_conv_clause::pCodeGenerate(Space *space, UInt32 f) {
}
}
-#if (defined (_DEBUG) && !(defined(__EID)))
+#if (defined (_DEBUG) )
if(!getenv("NO_PCODE_FLOAT_RANGE"))
#endif
if( getInstruction() == CONV_FLOAT64_FLOAT64 &&
@@ -3367,11 +3311,7 @@ ex_expr::exp_return_type ex_conv_clause::pCodeGenerate(Space *space, UInt32 f) {
if(nullBranch)
{
AML aml;
-#ifdef NA_64BIT
OL ol((Int64)nullBranch);
-#else
- OL ol((PCIType::Operand)nullBranch);
-#endif
PCI pci(PCIT::Op_TARGET, aml, ol);
code.append(pci);
}
@@ -3423,7 +3363,7 @@ ex_expr::exp_return_type ExUnPackCol::pCodeGenerate(Space *space, UInt32 f) {
/*
-#ifdef NA_DEBUG_C_RUNTIME
+#ifdef _DEBUG
// For debugging to disable the pCode generation
if(getenv("PCODE_NO_UNPACK"))
// Generate the default clause_eval instruction.
@@ -3648,11 +3588,7 @@ ex_expr::exp_return_type ex_function_mod::pCodeGenerate(Space *space, UInt32 f)
if(branchEnd)
{
AML aml1;
-#ifdef NA_64BIT
OL ol1((Int64)branchEnd);
-#else
- OL ol1((PCIType::Operand)branchEnd);
-#endif
PCI pci1(PCIT::Op_TARGET, aml1, ol1);
code.append(pci1);
}
@@ -3703,11 +3639,7 @@ ex_function_nullifzero::pCodeGenerate(Space *space, UInt32 f)
if (nullBranch)
{
AML aml;
-#ifdef NA_64BIT
OL ol((Int64)nullBranch);
-#else
- OL ol((PCIType::Operand)nullBranch);
-#endif
PCI pci(PCIT::Op_TARGET, aml, ol);
code.append(pci);
}
@@ -3855,11 +3787,7 @@ ex_expr::exp_return_type ex_function_nvl::pCodeGenerate(Space *space, UInt32 f)
if (nullBranch)
{
AML aml;
-#ifdef NA_64BIT
OL ol((Int64)nullBranch);
-#else
- OL ol((PCIType::Operand)nullBranch);
-#endif
PCI pci(PCIT::Op_TARGET, aml, ol);
code.append(pci);
}
@@ -4018,11 +3946,7 @@ ex_function_concat::pCodeGenerate(Space *space, UInt32 f)
if(branchToEnd)
{
AML aml;
-#ifdef NA_64BIT
OL ol((Int64)branchToEnd);
-#else
- OL ol((PCIType::Operand)branchToEnd);
-#endif
PCI pci(PCIT::Op_TARGET, aml, ol);
code.append(pci);
}
@@ -4120,11 +4044,7 @@ ex_expr::exp_return_type ex_function_substring::pCodeGenerate(Space *space,
if (nullBranch)
{
AML aml;
-#ifdef NA_64BIT
OL ol((Int64)nullBranch);
-#else
- OL ol((PCIType::Operand)nullBranch);
-#endif
PCI pci(PCIT::Op_TARGET, aml, ol);
code.append(pci);
}
@@ -4178,11 +4098,7 @@ ex_expr::exp_return_type ExFunctionBitOper::pCodeGenerate(Space *space, UInt32 f
if(branchToEnd)
{
AML aml;
-#ifdef NA_64BIT
OL ol((Int64)branchToEnd);
-#else
- OL ol((PCIType::Operand)branchToEnd);
-#endif
PCI pci(PCIT::Op_TARGET, aml, ol);
code.append(pci);
}
@@ -4292,11 +4208,7 @@ ex_function_upper::pCodeGenerate(Space *space, UInt32 f)
if (nullBranch)
{
AML aml;
-#ifdef NA_64BIT
OL ol((Int64)nullBranch);
-#else
- OL ol((PCIType::Operand)nullBranch);
-#endif
PCI pci(PCIT::Op_TARGET, aml, ol);
code.append(pci);
}
@@ -4371,11 +4283,7 @@ ex_function_lower::pCodeGenerate(Space *space, UInt32 f)
if (nullBranch)
{
AML aml;
-#ifdef NA_64BIT
OL ol((Int64)nullBranch);
-#else
- OL ol((PCIType::Operand)nullBranch);
-#endif
PCI pci(PCIT::Op_TARGET, aml, ol);
code.append(pci);
}
@@ -4457,11 +4365,7 @@ ex_function_trim_char::pCodeGenerate(Space *space, UInt32 f)
if (nullBranch)
{
AML aml;
-#ifdef NA_64BIT
OL ol((Int64)nullBranch);
-#else
- OL ol((PCIType::Operand)nullBranch);
-#endif
PCI pci(PCIT::Op_TARGET, aml, ol);
code.append(pci);
}
@@ -4527,11 +4431,7 @@ ex_function_char_length_doublebyte::pCodeGenerate(Space *space, UInt32 f)
if(branchToEnd)
{
AML aml;
-#ifdef NA_64BIT
OL ol((Int64)branchToEnd);
-#else
- OL ol((PCIType::Operand)branchToEnd);
-#endif
PCI pci(PCIT::Op_TARGET, aml, ol);
code.append(pci);
}
@@ -4597,11 +4497,7 @@ ex_function_char_length::pCodeGenerate(Space *space, UInt32 f)
if(branchToEnd)
{
AML aml;
-#ifdef NA_64BIT
OL ol((Int64)branchToEnd);
-#else
- OL ol((PCIType::Operand)branchToEnd);
-#endif
PCI pci(PCIT::Op_TARGET, aml, ol);
code.append(pci);
}
@@ -4669,11 +4565,7 @@ ExFunctionRepeat::pCodeGenerate(Space *space, UInt32 f)
if (nullBranch)
{
AML aml;
-#ifdef NA_64BIT
OL ol((Int64)nullBranch);
-#else
- OL ol((PCIType::Operand)nullBranch);
-#endif
PCI pci(PCIT::Op_TARGET, aml, ol);
code.append(pci);
}
@@ -4742,11 +4634,7 @@ ex_function_position::pCodeGenerate(Space *space, UInt32 f)
if(branchToEnd)
{
AML aml;
-#ifdef NA_64BIT
OL ol((Int64)branchToEnd);
-#else
- OL ol((PCIType::Operand)branchToEnd);
-#endif
PCI pci(PCIT::Op_TARGET, aml, ol);
code.append(pci);
}
@@ -4915,11 +4803,7 @@ ex_like_clause_base::pCodeGenerate(Space *space, UInt32 f)
if(branchToEnd)
{
AML aml;
-#ifdef NA_64BIT
OL ol((Int64)branchToEnd);
-#else
- OL ol((PCIType::Operand)branchToEnd);
-#endif
PCI pci(PCIT::Op_TARGET, aml, ol);
code.append(pci);
}
@@ -5000,11 +4884,7 @@ ex_function_extract::pCodeGenerate(Space *space, UInt32 f)
if(branchToEnd)
{
AML aml;
-#ifdef NA_64BIT
OL ol((Int64)branchToEnd);
-#else
- OL ol((PCIType::Operand)branchToEnd);
-#endif
PCI pci(PCIT::Op_TARGET, aml, ol);
code.append(pci);
}
[28/30] incubator-trafodion git commit: TRAFODION-2731 CodeCleanup:
Remove obsolete, legacy and unused code
Posted by an...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/cli/Cli.cpp
----------------------------------------------------------------------
diff --git a/core/sql/cli/Cli.cpp b/core/sql/cli/Cli.cpp
index a25a31b..c6b9ea4 100644
--- a/core/sql/cli/Cli.cpp
+++ b/core/sql/cli/Cli.cpp
@@ -413,16 +413,6 @@ static Lng32 CliPrologue(CliGlobals * cliGlobals,
ContextCli * context = cliGlobals->currContext();
ComDiagsArea & diags = context->diags();
- // load the module, if specified and not already loaded
- if ((module) &&
- (module->module_name != 0) &&
- (!context->moduleAdded(module)))
- {
- retcode = SQLCLI_AddModule(cliGlobals, module);
- if (isERROR(retcode))
- return SQLCLI_ReturnCode(cliGlobals->currContext(),retcode);
- }
-
// If this is not a recursive CLI call, inherit the current
// process transid into this context. (We don't want to
// inherit the current process transid if this is a recursive
@@ -604,28 +594,28 @@ static Lng32 getNumericHostVarInfo(Descriptor *desc,
(Lng32*) &hv_ptr,
NULL, 0, NULL, 0);
if (retcode != 0)
- return SQLCLI_ReturnCode(desc->getContext(),retcode);//LCOV_EXCL_LINE
+ return SQLCLI_ReturnCode(desc->getContext(),retcode);
retcode = desc->getDescItem(desc_entry,
SQLDESC_LENGTH,
(Lng32*) &hv_length,
NULL, 0, NULL, 0);
if (retcode != 0)
- return SQLCLI_ReturnCode(desc->getContext(),retcode);//LCOV_EXCL_LINE
+ return SQLCLI_ReturnCode(desc->getContext(),retcode);
retcode = desc->getDescItem(desc_entry,
SQLDESC_TYPE_FS,
(Lng32*) &hv_type,
NULL, 0, NULL, 0);
if (retcode != 0)
- return SQLCLI_ReturnCode(desc->getContext(),retcode);//LCOV_EXCL_LINE
+ return SQLCLI_ReturnCode(desc->getContext(),retcode);
retcode = desc->getDescItem(desc_entry,
SQLDESC_IND_PTR,
(Lng32*) &ind_ptr,
NULL, 0, NULL, 0);
if (retcode != 0)
- return SQLCLI_ReturnCode(desc->getContext(),retcode);//LCOV_EXCL_LINE
+ return SQLCLI_ReturnCode(desc->getContext(),retcode);
// the host variable must have a scale of 0
Lng32 hv_scale;
@@ -634,7 +624,7 @@ static Lng32 getNumericHostVarInfo(Descriptor *desc,
(Lng32*) &hv_scale,
NULL, 0, NULL, 0);
if (retcode != 0)
- return SQLCLI_ReturnCode(desc->getContext(),retcode);//LCOV_EXCL_LINE
+ return SQLCLI_ReturnCode(desc->getContext(),retcode);
// $$$$ Enable this after scale got initialized
// if (hv_scale != 0)
// return -1;
@@ -712,7 +702,7 @@ static Lng32 InputValueFromNumericHostvar(Descriptor *desc,
indLength,
indType);
if (retcode)
- return SQLCLI_ReturnCode(desc->getContext(),retcode);//LCOV_EXCL_LINE
+ return SQLCLI_ReturnCode(desc->getContext(),retcode);
expRetcode = convDoIt((char *) hvPtr,
hvLength,
@@ -729,7 +719,7 @@ static Lng32 InputValueFromNumericHostvar(Descriptor *desc,
heap,
&diagsArea);
if (expRetcode != ex_expr::EXPR_OK)
- return ERROR;//LCOV_EXCL_LINE
+ return ERROR;
//LCOV_EXCL_START - rare error check
if (indPtr)
{
@@ -790,7 +780,7 @@ static Lng32 OutputValueIntoNumericHostvar(Descriptor *desc,
indLength,
indType);
if (retcode)
- return ERROR;//LCOV_EXCL_LINE
+ return ERROR;
if (hvType >= REC_MIN_NUMERIC && hvType <= REC_MAX_NUMERIC)
{
@@ -848,53 +838,6 @@ static Lng32 OutputValueIntoNumericHostvar(Descriptor *desc,
return SUCCESS;
}
-Lng32 SQLCLI_AddModule(/*IN*/ CliGlobals * cliGlobals,
- /*IN*/ const SQLMODULE_ID * module_id)
-{
- Lng32 retcode;
-
-
- ContextCli & currContext = *(cliGlobals->currContext());
- ComDiagsArea & diags = currContext.diags();
- //LCOV_EXCL_START
- if (!module_id || !(module_id->module_name))
- {
- diags << DgSqlCode(-CLI_NO_MODULE_NAME);
- return SQLCLI_ReturnCode(&currContext,-CLI_NO_MODULE_NAME);
- }
-
- if (currContext.moduleAdded(module_id))
- {
- diags << DgSqlCode(-CLI_MODULE_ALREADY_ADDED);
- return SQLCLI_ReturnCode(&currContext,-CLI_MODULE_ALREADY_ADDED);
- }
- //LCOV_EXCL_STOP
-
- // create initial context, if first call, don't add module because
- // that would cause infinite recursion
- retcode = CliPrologue(cliGlobals,NULL);
- if (isERROR(retcode))
- return retcode;//LCOV_EXCL_LINE
-
- retcode = currContext.addModule(module_id,
- TRUE /*do ts check*/,
- TRUE /*unpack tdbs*/,
- (cliGlobals->ossProcess() ?
- cliGlobals->programDir() :
- NULL)
- );
- //LCOV_EXCL_START
- if (isERROR(retcode))
- {
- diags << DgSqlCode(- CLI_ADD_MODULE_ERROR);
- return SQLCLI_ReturnCode(&currContext,-CLI_ADD_MODULE_ERROR);
- }
- //LCOV_EXCL_STOP
-
- return SUCCESS;
-}
-
-
Lng32 SQLCLI_GetDiskMaxSize (
/*IN*/ CliGlobals *cliGlobals,
/*IN*/ char *volname,
@@ -1047,7 +990,7 @@ Lng32 SQLCLI_AllocDesc(/*IN*/ CliGlobals * cliGlobals,
/* is "desc_handle" */
retcode = currContext.allocateDesc(desc_id, maxEntries);
if (isERROR(retcode))
- return SQLCLI_ReturnCode(&currContext,retcode);//LCOV_EXCL_LINE
+ return SQLCLI_ReturnCode(&currContext,retcode);
return CliEpilogue(cliGlobals, NULL);
}
@@ -1069,7 +1012,7 @@ Lng32 SQLCLI_AllocStmt(/*IN*/ CliGlobals * cliGlobals,
// create initial context, if first call, and add module, if any.
retcode = CliPrologue(cliGlobals,statement_id->module);
if (isERROR(retcode))
- return retcode;//LCOV_EXCL_LINE
+ return retcode;
ContextCli & currContext = *(cliGlobals->currContext());
ComDiagsArea & diags = currContext.diags();
@@ -1080,85 +1023,6 @@ Lng32 SQLCLI_AllocStmt(/*IN*/ CliGlobals * cliGlobals,
/* return the statement handle in statement_id, if name mode */
/* is "stmt_handle" */
-#if defined(MULTIPLE_CURSORS_PER_STATEMENT) && defined(KLUGE_CURSOR)
- // kluge!!! - to get around problems with our SQL preprocessor/arkcmp
- // until they can get around to creating empty statements.
- // For now in ContextCli::addModule(), when a
- // <dynamic declare cursor> (e.g. DECLARE C1 CURSOR FOR S1;)
- // is loaded, we create an empty dynamic statement (e.g.
- // we allocate an empty dynamic statement for "S1") AND
- // we create a static 'cursor' statement. The preprocessor
- // always generates an AllocStmt() for a PREPARE and this
- // AllocStmt() gets an error, since we've already allocated
- // an empty statement... Prior to this work, it allocated
- // a single statement with a cursor name, which still gave
- // us an error with the AllocStmt(), AND it didn't support
- // having more than one cursor per statement.
- //
- // Ideally, the preprocessor should generate an empty statement into
- // the module definition file, and arkcmp should be able to parse this
- // empty statement and create an empty statement entry in the compiled
- // module file. When this happens, we will need to a) modify the
- // preprocessor so that it generates the empty statement into the module
- // definition file, b) NOT generate an AllocStmt() call for every prepare,
- // c) recognize the possibility that there could be multiple prepare
- // statements which use the same statement name, so it does not generate
- // multiple empty statements, but instead generates only one.
- // Also, when this happens ContextCli::addModule() should be modified to
- // NOT create the extra dynamic statement for each <dynamic declare cursor>.
- // It would also be nice if the preprocessor instead of generating
- // <declare cursor> (e.g. DECLARE C1 CURSOR FOR SELECT * FROM T1;) statements
- // as they are done today with the statement name and the cursor name
- // being the same, instead it might be better to do the
- // following: a) generate an 'internal' statement name for the
- // hardcoded statement (e.g. SELECT * FROM T1;) and putting this into
- // the module definition file. Then the cursor statement could be
- // rewritten in the module file to read...
- // DECLARE C1 CURSOR FOR <internal_name>.
- //
- // Anyway... back to the kluge...
- // we are looking to ignore AllocStmt calls being done for a prepare...
- // where we have already created an empty statement during
- // ContextCli::addModule()
- //LCOV_EXCL_START - embedded cursor declare - not supported for SQ
- if (statement_id->name_mode == stmt_name)
- {
- Statement * stmt = currContext.getStatement(statement_id);
- // if there is a statement
- // AND it is a DYNAMIC statement
- if (stmt && stmt->allocated())
- {
- // now...
- // if there is a cursor declared or allocated for the statement...
- // we don't need to allocate it or alarm anyone with an error...
- // this is our special case...
-
- Statement * tmpStmt;
- HashQueue * stmtList = currContext.getCursorList();
- stmtList->position();
- while (tmpStmt = (Statement *)stmtList->getNext())
- {
- if (statement_id->module &&
- statement_id->module->module_name &&
- tmpStmt->getModuleId()->module_name &&
-
- isEqualByName(statement_id->module,
- tmpStmt->getModuleId()) &&
-
- tmpStmt->getCursorName() &&
- tmpStmt->getIdentifier() &&
-
- !isEqualByName(tmpStmt->getCursorName(), statement_id) &&
- isEqualByName(tmpStmt->getStmtId(), statement_id)
- ) {
- return SUCCESS;
- }
- }
- }
- //LCOV_EXCL_STOP
- }
-#endif
-
retcode = currContext.allocateStmt(statement_id, Statement::DYNAMIC_STMT);
if (isERROR(retcode))
return SQLCLI_ReturnCode(&currContext,retcode);
@@ -1421,39 +1285,6 @@ Lng32 SQLCLI_DeleteContext(/*IN*/ CliGlobals * cliGlobals,
Lng32 SQLCLI_DropModule(/*IN*/ CliGlobals * cliGlobals,
/*IN*/ const SQLMODULE_ID * module_id)
{
- Lng32 retcode;
-
-
- // create initial context, if first call, don't add module because
- // we are trying to drop it.
- retcode = CliPrologue(cliGlobals,NULL);
- if (isERROR(retcode))
- return retcode;
-
- ContextCli & currContext = *(cliGlobals->currContext());
- ComDiagsArea & diags = currContext.diags();
-
- if (!module_id || !(module_id->module_name))
- {
- diags << DgSqlCode(-CLI_NO_MODULE_NAME);
- return SQLCLI_ReturnCode(&currContext,-CLI_NO_MODULE_NAME);
- }
-
- if (! currContext.moduleAdded(module_id))
- {
- // no module, nothing to be done.
- // Should we return an error instead???
- return SUCCESS;
- }
-
- retcode = currContext.dropModule(module_id);
- if (isERROR(retcode))
- {
- // TBD: change to DROP_MODULE_ERROR
- diags << DgSqlCode(- CLI_ADD_MODULE_ERROR);
- return SQLCLI_ReturnCode(&currContext,-CLI_ADD_MODULE_ERROR);
- }
-
return SUCCESS;
}
@@ -1586,31 +1417,7 @@ Lng32 SQLCLI_SetUdrRuntimeOptions_Internal(/*IN*/ CliGlobals *cliGlobals,
return SQLCLI_ReturnCode(&currContext, retcode);
}
-//LCOV_EXCL_START
-Lng32 SQLCLI_DecodeAndFormatKey(
- CliGlobals *cliGlobals,
- void * RCB_Pointer_Addr, // in
- void * KeyAddr, // in
- Int32 KeyLength, // in
- void * DecodedKeyBufAddr, // in/out: where decoded key to be returned
- void * FormattedKeyBufAddr, // in/out: formatted key to be returned
- Int32 FormattedKeyBufLen, // in
- Int32 * NeededKeyBufLen) // out: required buffer size to be returned
-
-{
- return FEBADRECDESC; // Error
-}
-Lng32 SQLCLI_GetPartitionKeyFromRow(
- CliGlobals *cliGlobals, // in
- void * RCB_Pointer_Addr, // in
- void * Row_Addr, // in
- Int32 Row_Length, // in
- void * KeyAddr, // in/out
- Int32 KeyLength) // in
-{
- return FEBADKEYDESC;
-}
//LCOV_EXCL_STOP
Lng32 SQLCLI_DeallocDesc(/*IN*/ CliGlobals * cliGlobals,
/*IN*/ SQLDESC_ID * desc_id)
@@ -3002,12 +2809,10 @@ Lng32 SQLCLI_PerformTasks(
Descriptor * input_desc = NULL;
Descriptor * output_desc = NULL;
-#ifdef NA_64BIT
va_list cpy;
if (num_input_ptr_pairs || num_output_ptr_pairs)
va_copy(cpy, ap);
-#endif
if (tasks & CLI_PT_GET_INPUT_DESC)
{
@@ -3041,28 +2846,13 @@ Lng32 SQLCLI_PerformTasks(
if ((setPtrs) && (num_input_ptr_pairs > 0))
{
/* descriptor must exist */
- //LCOV_EXCL_START
if (!input_desc)
{
diags << DgSqlCode(-CLI_DESC_NOT_EXISTS);
return SQLCLI_ReturnCode(&currContext,-CLI_DESC_NOT_EXISTS);
}
- //LCOV_EXCL_STOP
-/*
-#ifdef NA_64BIT
- // dg64 - the old way won't compile on 64-bit
- va_list cpy;
- va_copy(cpy, ap);
- va_end(ap);
-#endif
-*/
retcode = local_SetDescPointers(input_desc, 1,
-#ifdef NA_64BIT
- // dg64 - the old way won't compile on 64-bit
num_input_ptr_pairs, &cpy, input_ptr_pairs);
-#else
- num_input_ptr_pairs, &ap, input_ptr_pairs);
-#endif
if (isERROR(retcode))
return SQLCLI_ReturnCode(&currContext,retcode);
}
@@ -3109,12 +2899,7 @@ Lng32 SQLCLI_PerformTasks(
}
retcode = local_SetDescPointers(output_desc, 1,
-#ifdef NA_64BIT
- // dg64 - the old way won't compile on 64-bit
num_output_ptr_pairs, &cpy, output_ptr_pairs);
-#else
- num_output_ptr_pairs, &ap, output_ptr_pairs);
-#endif
if (isERROR(retcode))
return SQLCLI_ReturnCode(&currContext,retcode);
}
@@ -3311,14 +3096,6 @@ Lng32 SQLCLI_PerformTasks(
stmt->aqrStmtInfo()->setRetryFirstFetch(FALSE);
retcode = stmt->fetch(cliGlobals, output_desc, diags, TRUE);
-
- // update Measure if enabled.
- if (stmt->getRootTdb()&&
- ((ComTdb*)stmt->getRootTdb())->getCollectStatsType() == ComTdb::MEASURE_STATS &&
- stmt->getGlobals()->getMeasStmtCntrs())
- {
- stmt->getGlobals()->getMeasStmtCntrs()->incCalls(1);
- }
if (isERROR(retcode))
{
@@ -3396,16 +3173,6 @@ Lng32 SQLCLI_PerformTasks(
cliGlobals->setPriorityChanged(FALSE);
}
}
- else
- // update Measure elapsed time if Measure enabled.
- if (stmt->getRootTdb() &&
- ((ComTdb*)stmt->getRootTdb())->getCollectStatsType() == ComTdb::MEASURE_STATS &&
- stmt->getGlobals()->getMeasStmtCntrs() != NULL)
- {
- stmt->getGlobals()->getMeasStmtCntrs()->
- incElapseBusyTime(NA_JulianTimestamp() - startTime);
-
- }
if (tasks & CLI_PT_SPECIAL_END_PROCESS)
{
@@ -4589,7 +4356,7 @@ static Lng32 getStmtInfo(
/*IN*/ ComDiagsArea & diags,
/*IN*/ Statement * stmt,
/*IN* (SQLDIAG_STMT_INFO_ITEM_ID) */ Lng32 what_to_get,
- /*OUT OPTIONAL*/ void * numeric_value, // NA_64BIT
+ /*OUT OPTIONAL*/ void * numeric_value,
/*OUT OPTIONAL*/ char * string_value,
/*IN OPTIONAL*/ Lng32 max_string_len,
/*OUT OPTIONAL*/ Lng32 * len_of_item)
@@ -4626,7 +4393,7 @@ static Lng32 getStmtInfo(
rowCount = stmt->getRowsAffected(); // returns Int64
else
rowCount = diags.getRowCount(); // returns ComDiagBigInt
- if ( rowCount > LONG_MAX) // NA_64BIT - could be no-op
+ if ( rowCount > LONG_MAX)
return EXE_NUMERIC_OVERFLOW;
*(Int64*)numeric_value = rowCount;
break;
@@ -4646,7 +4413,7 @@ static Lng32 getStmtInfo(
{
rowCount = diags.getValueFromRowsetRowCountArray(i);
assert ( rowCount != -1 ); // accessing a row count array element that was never set.
- if ( rowCount > INT_MAX) // NA_64BIT - rowset row count < 2^32
+ if ( rowCount > INT_MAX)
return EXE_NUMERIC_OVERFLOW;
((Lng32 *)numeric_value)[i] = (Lng32) rowCount;
}
@@ -4663,7 +4430,7 @@ static Lng32 getStmtInfo(
case SQLDIAG_COST:
{
double temp_double = diags.getCost();
- if(((double) INT_MAX) <= temp_double) // NA_64BIT - revisit here
+ if(((double) INT_MAX) <= temp_double)
{
*(Lng32 *)numeric_value = INT_MAX;
}
@@ -4680,7 +4447,7 @@ static Lng32 getStmtInfo(
case SQLDIAG_FIRST_FSCODE:
case SQLDIAG_LAST_FSCODE:
case SQLDIAG_LAST_SYSKEY:
- *(Lng32 *)numeric_value = 0; // NA_64BIT - safe to assume Lng32
+ *(Lng32 *)numeric_value = 0;
break;
default:
@@ -4941,7 +4708,7 @@ Lng32 SQLCLI_GetDiagnosticsStmtInfo2(
/*IN*/ CliGlobals * cliGlobals,
/*IN OPTIONAL*/ SQLSTMT_ID * statement_id,
/*IN* (SQLDIAG_STMT_INFO_ITEM_ID) */ Lng32 what_to_get,
- /*OUT OPTIONAL*/ void * numeric_value, // NA_64BIT
+ /*OUT OPTIONAL*/ void * numeric_value,
/*OUT OPTIONAL*/ char * string_value,
/*IN OPTIONAL*/ Lng32 max_string_len,
/*OUT OPTIONAL*/ Lng32 * len_of_item)
@@ -5625,39 +5392,6 @@ Lng32 SQLCLI_GetMainSQLSTATE(/*IN*/ CliGlobals * cliGlobals,
return -1;
}
-
-Lng32 SQLCLI_GetPfsSize(/*IN*/ CliGlobals * cliGlobals,
- /*OUT*/ Int32 *pfsSize,
- /*OUT*/ Int32 *pfsCurUse,
- /*OUT*/ Int32 *pfsMaxUse)
-{
- Lng32 retcode = 0;
- // create initial context, if first call, don't add module because
- // that would cause infinite recursion
- retcode = CliPrologue(cliGlobals,NULL);
- if (isERROR(retcode))
- return retcode;
-
- ContextCli & currContext = *(cliGlobals->currContext());
- ComDiagsArea & diags = currContext.diags();
- return retcode;
-}
-
-Lng32 SQLCLI_CleanUpPfsResources(/*IN*/ CliGlobals * cliGlobals)
-{
- Lng32 retcode = 0;
-
- // create initial context, if first call, don't add module because
- // that would cause infinite recursion
- retcode = CliPrologue(cliGlobals,NULL);
- if (isERROR(retcode))
- return retcode;
-
- ContextCli & currContext = *(cliGlobals->currContext());
- ComDiagsArea & diags = currContext.diags();
- return retcode;
-}
-
/////////////////////////////////////////////////////////////////
// if sql_source->name_mode is string_data, then
// sql_source->identifier points to the sql_source string and
@@ -7330,27 +7064,19 @@ Lng32 SQLCLI_SetDescPointers(/*IN*/ CliGlobals * cliGlobals,
ComDiagsArea & diags = currContext.diags();
Descriptor * desc = currContext.getDescriptor(desc_id);
- //LCOV_EXCL_START
+
/* descriptor must exist */
if (!desc)
{
diags << DgSqlCode(-CLI_DESC_NOT_EXISTS);
return SQLCLI_ReturnCode(&currContext,-CLI_DESC_NOT_EXISTS);
}
- //LCOV_EXCL_STOP
-
-#ifdef NA_64BIT
- // dg64 - the old way won't compile on 64-bit
- va_list cpy;
- va_copy(cpy, ap);
- va_end(ap);
-#endif
-#ifdef NA_64BIT
- // dg64 - the old way won't compile on 64-bit
+
+ va_list cpy;
+ va_copy(cpy, ap);
+ va_end(ap);
+
retcode = local_SetDescPointers(desc, starting_entry, num_ptr_pairs, &cpy, ptr_pairs);
-#else
- retcode = local_SetDescPointers(desc, starting_entry, num_ptr_pairs, &ap, ptr_pairs);
-#endif
va_end(ap);
return SQLCLI_ReturnCode(&currContext,retcode);
@@ -7953,26 +7679,7 @@ Lng32 SQLCLI_MergeDiagnostics(/*IN*/ CliGlobals * cliGlobals,
newDiags.mergeAfter(cliGlobals->currContext()->diags());
return SUCCESS;
}
-// In this call, the caller can set either mxcmpVersion or nodeName but not both
-Lng32 SQLCLI_SetCompilerVersion_Internal(CliGlobals *cliGlobals, short mxcmpVersion, char *nodeName)
-{
- Lng32 retcode= 0;
- return retcode;
-
-}
-
-// In this call, the caller can get the mxcmpVersion for the local node or for a remote node if nodeName is passed in.
-Lng32 SQLCLI_GetCompilerVersion_Internal(CliGlobals *cliGlobals, short &mxcmpVersion, char *nodeName)
-{
- Lng32 retcode= 0;
- mxcmpVersion = COM_VERS_COMPILER_VERSION;
- return retcode;
-
-}
-//LCOV_EXCL_STOP
-
-//LCOV_EXCL_START
// For internal use only -- do not document!
static Lng32 GetStatement_Internal(/*IN*/ CliGlobals * cliGlobals,
/*INOUT*/ Statement ** statement_ptr,
@@ -7998,21 +7705,6 @@ static Lng32 GetStatement_Internal(/*IN*/ CliGlobals * cliGlobals,
currContext.getStatementList()->setSequentialAdd(sequentialAdd);
}
- if ((statement_id->module) &&
- (statement_id->module->module_name) &&
- (! currContext.moduleAdded(statement_id->module)))
- {
- retcode = currContext.addModule(statement_id->module,
- FALSE /*no ts check*/,
- FALSE /*do not unpack*/,
- NULL);
- if (isERROR(retcode))
- {
- diags << DgSqlCode(- CLI_ADD_MODULE_ERROR);
- return SQLCLI_ReturnCode(&currContext,-CLI_ADD_MODULE_ERROR);
- }
- }
-
Statement * stmt = NULL;
if (getnext)
@@ -8031,27 +7723,6 @@ static Lng32 GetStatement_Internal(/*IN*/ CliGlobals * cliGlobals,
return SUCCESS;
}
-// For internal use only -- do not document!
-Lng32 SQLCLI_AttachCodeToStatement_Internal(CliGlobals * cliGlobals,
- SQLSTMT_ID * statement_id,
- ComDiagsArea & comDiagsArea,
- char *generated_code,
- ULng32 gen_code_len)
-{
- // this call is not supported.
- comDiagsArea << DgSqlCode(-CLI_INTERNAL_ERROR);
- return ERROR;
-}
-
-// For internal use only -- do not document!
-Lng32 SQLCLI_IsTransactionStarted_Internal(CliGlobals * cliGlobals)
-{
-// return ( cliGlobals->currContext()->
-// getTransaction()->isTransactionStarted() == TRUE ? 1 : 0 );
- return 0;
-}
-
-
//Function to get the length of the desc_items array
//returns the length if no error occurs, if error_occurred
//is 1 on return then return value indicates error
@@ -8250,566 +7921,6 @@ Lng32 SQLCLI_GetParserFlagsForExSqlComp_Internal(
return 0;
}
-//LCOV_EXCL_START
-Lng32 SQLCLI_GetVersion_Internal
-(/*IN*/ CliGlobals * cliGlobals,
- /*IN*/ Lng32 versionType,
- /*OUT*/ Lng32 * versionValue,
- /*IN OPTIONAL*/ const char * nodeName,
- /*IN OPTIONAL*/ const SQLMODULE_ID * module_id,
- /*IN OPTIONAL*/ const SQLSTMT_ID * statement_id)
-{
- Lng32 retcode = 0;
-
-
- // create initial context, if first call, don't add module because
- // that would cause infinite recursion
- retcode = CliPrologue(cliGlobals,NULL);
- if (isERROR(retcode))
- return retcode;
-
- ContextCli & currContext = *(cliGlobals->currContext());
- ComDiagsArea & diags = currContext.diags();
-
- if ((versionType == SQLCLIDEV_MODULE_VERSION) ||
- (versionType == SQLCLIDEV_STATIC_STMT_PLAN_VERSION) ||
- (versionType == SQLCLIDEV_DYN_STMT_PLAN_VERSION) ||
- (versionType == SQLCLIDEV_MODULE_VPROC_VERSION))
- {
- SQLMODULE_ID * module_id_ptr = NULL;
-
- module_id_ptr = (SQLMODULE_ID*)module_id;
-
- if (versionType != SQLCLIDEV_DYN_STMT_PLAN_VERSION)
- {
- if (module_id_ptr)
- {
- if (!(module_id_ptr->module_name))
- {
- diags << DgSqlCode(-CLI_NO_MODULE_NAME);
- return SQLCLI_ReturnCode(&currContext,-CLI_NO_MODULE_NAME);
- }
-
- if (! currContext.moduleAdded(module_id_ptr))
- {
- //diags << DgSqlCode(-CLI_MODULE_ALREADY_ADDED);
- //return SQLCLI_ReturnCode(&currContext,-CLI_MODULE_ALREADY_ADDED);
- //}
-
- retcode = currContext.addModule(module_id_ptr,
- FALSE /*no ts check*/,
- TRUE /*unpack tdbs*/,
- (cliGlobals->ossProcess() ?
- cliGlobals->programDir() :
- NULL)
- );
-
- if (isERROR(retcode))
- {
- diags << DgSqlCode(- CLI_ADD_MODULE_ERROR);
- return SQLCLI_ReturnCode(&currContext,-CLI_ADD_MODULE_ERROR);
- }
- }
- }
- }
-
- if (versionType == SQLCLIDEV_MODULE_VPROC_VERSION)
- {
- Module * module = currContext.getModule(module_id_ptr);
- if (module == NULL)
- {
- diags << DgSqlCode(- CLI_INTERNAL_ERROR);
- return ERROR;
- }
-
- if (versionValue)
- {
- if (module->getVproc())
- strcpy((char *)versionValue, module->getVproc());
- else
- strcpy((char *)versionValue, "\0");
- }
- }
- else if (versionType == SQLCLIDEV_MODULE_VERSION)
- {
- Module * module = currContext.getModule(module_id_ptr);
- if (module == NULL)
- {
- diags << DgSqlCode(- CLI_INTERNAL_ERROR);
- return ERROR;
- }
-
- if (versionValue)
- *versionValue = (Lng32)module->getVersion();
- }
- else
- {
- Statement * stmt = currContext.getStatement((SQLSTMT_ID*)statement_id);
- if ((!stmt) ||
- (! stmt->getRootTdb()))
- {
- diags << DgSqlCode(-CLI_STMT_NOT_EXISTS);
- return SQLCLI_ReturnCode(&currContext,-CLI_STMT_NOT_EXISTS);
- }
-
- if (versionValue)
- *versionValue = (Lng32)stmt->getRootTdb()->getPlanVersion();
- }
- } // module version
- else if (versionType == SQLCLIDEV_SYSTEM_VERSION)
- {
- diags << DgSqlCode(-4222)
- << DgString0("MXV");
- return ERROR;
- }
-
- return retcode;
-}
-
- // Arrays are used, not ptrs, so that sizeof can be used instead
- // of strlen.
-static const char SmdLocEnvVarName[] = "SQLMX_SMD_LOCATION";
-static const char SmdLocDefaultSubvol [] = ".ZSD0";
-static const Lng32 VolSubvolSize = 18; // '$' + VOLNAME + '.' +
- // SUBVOL + null-terminator
-
-static char *getSMDLocFromEnvVarWithNodeName(
- CliGlobals * cliGlobals,
- const char * nodeName ) // w/o leading backslash
-{
- // Use the null-terminated nodename passed in to form the name of an env var.
- // of the form SQLMX_SMD_LOCATION_<nodename>.
- char smdEnvVarNameWithNodeName[ sizeof SmdLocEnvVarName
- + 1 // "_"
- + 8 // node name
- ]; // null term already counted in sizeof
- str_cpy_all(smdEnvVarNameWithNodeName, SmdLocEnvVarName,
- sizeof SmdLocEnvVarName - 1); // omit null terminator
-
- smdEnvVarNameWithNodeName[ sizeof SmdLocEnvVarName -1 ] = '_';
-
-#pragma nowarn(1506) // warning elimination
- Int32 nodeNameLen = strlen(nodeName) + 1; // include null_terminator.
-#pragma warn(1506) // warning elimination
- if (nodeNameLen > 8) // 8 because leading \ has been
- nodeNameLen = 8; // stripped off.
-
- str_cpy_all(&smdEnvVarNameWithNodeName[ sizeof SmdLocEnvVarName ],
- nodeName,
- nodeNameLen);
-
- return cliGlobals->getEnv(smdEnvVarNameWithNodeName);
-}
-
-static NABoolean useSMDLocFromEnvVar( char * outputSMDLoc,
- const char * envVarPtr,
- Lng32 &length,
- NABoolean &noSubvol
- )
-{
- // This function performs three tasks:
- // 1. determines if the SMD subvol is included in the input envVarPtr,
- // because the callers need to know whether to supply the
- // SmdLocDefaultSubvol if it wasn't.
- // 2. determine if the input envVarPtr's string value, along
- /// with the SmdLocDefaultSubvol (if necessary) will exceed
- // the length of outputSMDLoc, given by the constant VolSubvolSize.
- // If it will exceed, then this function returns an error.
- // 3. Otherwise, the envVarPtr string is copied to the outputSMDLoc.
- // It is up to the caller to copy the subvol part if no subvol
- // was present in the envVarPtr.
-
- Lng32 lengthIncludingSubvol;
- length = str_len(envVarPtr);
- if (memchr(envVarPtr, '.', length) == NULL)
- {
- noSubvol = TRUE;
-#pragma nowarn(1506) // warning elimination
- lengthIncludingSubvol = length + sizeof SmdLocDefaultSubvol;
-#pragma warn(1506) // warning elimination
- }
- else
- {
- noSubvol = FALSE;
- lengthIncludingSubvol = length;
- }
-
- if ( lengthIncludingSubvol >= VolSubvolSize )
- return TRUE; // error.
- str_cpy_all(outputSMDLoc, envVarPtr, length);
- outputSMDLoc[length] = 0;
- return FALSE; // no error.
-}
-
-static void useSMDLocFromDefine( char * outputSMDLoc,
- Lng32 &SMDLocNameLength )
-{
-}
-
-// This function encapsultates the error reporting for FS errors
-// that can happen when ComRtGetMXSysVolName is called.
-static Lng32 handleCallToComRtGetMXSysVolName(
- char *sysCatBuffer, /* out */
- Lng32 inputBufferLength, /* in */
- Lng32 *sysCatLength, /* out */
- const char *nodeName, /* in */
- NABoolean fakeReadError, /* in */
- NABoolean fakeCorruptAnchorError, /* in */
- Lng32 *fsError /* out */
- )
-{
- Lng32 retcode = 0;
- return retcode;
-}
-//LCOV_EXCL_STOP
-
-// For internal use only -- do not document!
-//
-// returns pointer pointing to the Tandem System Volume name
-// (NULL-terminated) cached in the Executor dynamic global
-// memory area.
-//
-// If it cannot find the name in globals, NULL is returned. Callers must
-// check for NULL and terminate if found.
-//
-
-// For internal use only -- do not document!
-
-Lng32 SQLCLI_GetSystemVolume_Internal(
- /*IN*/ CliGlobals * cliGlobals,
- /*INOUT*/ char * SMDlocation,
- /*INOUT*/ Lng32 *fsError)
-{
- Lng32 retcode = 0;
- Lng32 length = 0;
- Lng32 SMDLocNameLength = 0;
-
- // Very first time the SMD Location is uninitialized in CliGlobals. In this
- // case the location is acquired from
- // the environment variable SQLMX_SMD_LOCATION defined in the
- // $TRAF_HOME/etc/ms.env configuration file
- // (The SQLMX_SMD_LOCATION value should contain a valid volume name only;
- // for example: SQLMX_SMD_LOCATION='$DATA2' - The default volume name
- // $SYSTEM is used when SQLMX_SMD_LOCATION is not defined or when the
- // specified volume name is not valid)
- // and the SMD location in CliGlobals is set.
-
- if (cliGlobals->isSysVolNameInitialized() == FALSE)
- {
- char *pVolName = cliGlobals->getSysVolName();
- NABoolean addSubvol = FALSE;
-
- NAString nameVolume(cliGlobals->currContext()->exCollHeap());
-
- nameVolume = getTandemSysVol();
-
- if (!nameVolume.isNull())
- {
- nameVolume.toUpper();
- length = nameVolume.length();
- str_cpy_all(pVolName, nameVolume.data(), length);
- }
- addSubvol = TRUE;
-
-
- // If caller did not specify the subvolume, then attach ZSD0
- if (addSubvol)
- {
- str_cpy_all((pVolName+length), SmdLocDefaultSubvol, sizeof SmdLocDefaultSubvol);
- length += sizeof SmdLocDefaultSubvol - 1;
- }
- ComRt_Upshift (pVolName);
- cliGlobals->setSysVolNameIsInitialized();
- }
- else
- {
- length = str_len(cliGlobals->getSysVolName());
- }
-
- memcpy(SMDlocation, cliGlobals->getSysVolName(), length + 1);
-
- return 0;
-}
-
-// For internal use only -- do not document!
-
-//LCOV_EXCL_START
-const char *const *const SQLCLI_GetListOfVolumes_Internal()
-{
- // this method not supported on NSK platform
- return NULL;
-
-} // SQLCLI_GetListOfVolumes_Internal()
-
-//LCOV_EXCL_STOP
-// returns TRUE if the volume component is 7 chars (not including $)
-// for examples: $CHAR777
-bool SQLCLI_IsVolume7Chars_Internal (const char *const fileName)
-{
- char *dollarPtr;
- char *dotPtr;
- short volNameLen;
-
- dollarPtr = (char * ) strchr(fileName, '$');
- if (dollarPtr == NULL)
- return FALSE;
-
- dotPtr = (char * ) strchr(dollarPtr, '.');
- if (dotPtr == NULL)
- volNameLen = (short) strlen(dollarPtr);
- else
- volNameLen = (short) (dotPtr - dollarPtr);
-
- if (volNameLen > 7)
- return TRUE;
-
- return FALSE;
-}
-//LCOV_EXCL_START
-// returns TRUE if the volume name is $SYSTEM
-bool SQLCLI_IsSystemVolume_Internal (const char *const fileName)
-{
- char *dollarPtr;
-
- dollarPtr = (char * ) strchr(fileName, '$');
- if ((dollarPtr != NULL) &&
- (strlen(dollarPtr) >= 7) &&
- (TOUPPER(dollarPtr[1]) == 'S') &&
- (TOUPPER(dollarPtr[2]) == 'Y') &&
- (TOUPPER(dollarPtr[3]) == 'S') &&
- (TOUPPER(dollarPtr[4]) == 'T') &&
- (TOUPPER(dollarPtr[5]) == 'E') &&
- (TOUPPER(dollarPtr[6]) == 'M') &&
- ((dollarPtr[7] == '.') || (dollarPtr[7] == '\0')) )
- return TRUE;
-
- return FALSE;
-}
-
-
-//This method returns n (numOfVols) number of volume names in callers memory
-//pointed by volName. If this method cannnot generate n(numOfVols) number
-//of volume names, then numOfVols will be updated to the actual number of volume
-//names generated. The caller of this method is supposed to allocate
-//memory for the volume names to be returned and also provide the number
-//volume names the caller wants.
-Lng32 SQLCLI_GetListOfAuditedVolumes_Internal(CliGlobals *cliGlobals,
- char **volNames,
- Lng32 *numOfVols)
-{
-
- CollHeap * heap;
- NABoolean retValue = 0;
- Int32 volCount = 0;
-
-
- heap = cliGlobals->currContext()->exCollHeap();
-
-
-NABoolean seenAtleastOneDisk = FALSE;
-
- for (Int32 i=0; i < *numOfVols; i++)
- {
- short volNameLen = 0;
- retValue = SQL_EXEC_GetDefaultVolume_Internal(volNames[i],
- 9,
- volNameLen);
-
- if (retValue)
- {
- if (!seenAtleastOneDisk)
- {
- return 1;
- }
- else
- break;
- }
- else
- {
- volCount++;
- seenAtleastOneDisk = TRUE;
- }
- }
-
-
- *numOfVols = volCount;
-
-return 0;
-}
-
-Lng32 SQLCLI_GetNumOfQualifyingVolumes_Internal(CliGlobals *cliGlobals,
- const char *nodeName,
- Lng32 *numOfVols)
-{
- if (nodeName)
- {
- // if the volumes info for this node is already cached do not
- // call sort and return the saved info to the caller.
- if (cliGlobals->getNodeName() &&
- strcmp(nodeName, cliGlobals->getNodeName()) == 0)
- {
- Lng32 numOfVolumes = cliGlobals->getNumOfQualifyingVols();
-
- if (numOfVolumes > 0)
- {
- *numOfVols = numOfVolumes;
- return 0;
- }
- }
-
- CollHeap * heap = cliGlobals->currContext()->exCollHeap();
- NABoolean retValue = 0;
-
-
- // VO, Oct. 2007: For the benefit of POS locations for metadata on NT
- const char * const * const listOfVols = SQLCLI_GetListOfVolumes_Internal();
- // Call clearQualifiedDiskInfo() to remove any previous information
- // that is stored in the cliGlobals.
- cliGlobals->clearQualifiedDiskInfo();
- cliGlobals->setNodeName(nodeName);
- *numOfVols = 0;
-
- // Add qualified disk info for all useful NT datavols. Fake the capacity,
- // freespace and fragment information.
- for (Int32 numOfDisks=0;listOfVols[numOfDisks] != NULL;numOfDisks++)
- {
- short fsErr;
- if (SQL_EXEC_IsVolumeUseful_Internal (listOfVols[numOfDisks], fsErr))
- {
- (*numOfVols)++;
- cliGlobals->addQualifiedDiskInfo(
- listOfVols[numOfDisks],
- 0,
- 100,
- 100,
- 50);
- }
- }
-
-
- }
- else
- return -1;
-
- return 0;
-}
-
-// Before calling this method the user has to call the other CLI method
-// SQL_EXEC_GetNumOfQualifyingVolumes_Internal to get the number of volumes
-// so the right amount of memory is allocated for parameters volNames and
-// cpuNums to get the volume names and its corresponding cpu numbers.
-Lng32 SQLCLI_GetListOfQualifyingVolumes_Internal(CliGlobals *cliGlobals,
- const char *nodeName,
- Lng32 numOfVols,
- char **volNames,
- Lng32 *cpuNums,
- Lng32 *capacities,
- Lng32 *freespaces,
- Lng32 *largestFragments)
-{
- if (nodeName)
- {
- if (cliGlobals->getNodeName() &&
- strcmp(nodeName, cliGlobals->getNodeName()) == 0)
- {
- Lng32 numOfVolumes = cliGlobals->getNumOfQualifyingVols();
-
- // If there aren't any stored volumes or the caller didn't
- // allocate enough memory to pass all of the stored values,
- // return an error.
- if (numOfVolumes == 0 || numOfVolumes > numOfVols)
- return -1;
-
- for (Lng32 i=0; i < numOfVolumes; i++)
- {
- strcpy(volNames[i], cliGlobals->getQualifyingVolume(i));
- cpuNums[i] = cliGlobals->getCpuNumberForVol(i);
- capacities[i] = cliGlobals->getCapacityForVol(i);
- freespaces[i] = cliGlobals->getFreespaceForVol(i);
- largestFragments[i] = cliGlobals->getLargestFragmentForVol(i);
- }
- }
- else
- {
- return -1;
- }
- }
- else
- return -1;
-
- return 0;
-}
-
-
-short SQLCLI_GetDefaultVolume_Internal(char *const outBuf,
- const short outBufMaxLen,
- short &defaultVolLen)
-{
- CliGlobals *exec_globals = GetCliGlobals();
-
- if (exec_globals->getDefaultVolSeed() == 0)
- { // if first time, sets up for random number generator
- exec_globals->setDefaultVolSeed((UInt32)time(NULL));
- srand((UInt32)exec_globals->getDefaultVolSeed());
- }
-
- size_t randIndex = 0;
- const char *const *pVolNames = NULL;
- LIST(char*) *pAuditedVols = NULL;
- const Int32 MAX_NUM_OF_TRIES = 2;
- for (Int32 numOfTries = 1; numOfTries <= MAX_NUM_OF_TRIES; numOfTries++)
- {
- pVolNames = SQL_EXEC_GetListOfVolumes_Internal();
- if (pVolNames == NULL OR pVolNames[0] == NULL)
- {
- if (numOfTries >= MAX_NUM_OF_TRIES)
- return 2; // There are not any DP2 volumes in the cluster
- // The list of DP2 volumes in the cache may be out-of-date.
- // Refreshes it by setting the ListOfVolNamesCacheTime to 0.
- // and then calling SQL_EXEC_GetListOfVolumes_Internal().
- exec_globals->setListOfVolNamesCacheTime((_int64)0);
- continue;
- }
-
- pAuditedVols = (LIST(char*) *) exec_globals->getListOfAuditedVols();
- while (pAuditedVols->entries() > 0)
- {
- randIndex = rand() % pAuditedVols->entries();
- short fsErr = 0;
- if (SQL_EXEC_IsVolumeUseful_Internal(pAuditedVols
- ->operator[](randIndex),
- fsErr))
- break;
- pAuditedVols->removeAt(randIndex);
- }
- if (pAuditedVols->entries() == 0)
- {
- if (numOfTries >= MAX_NUM_OF_TRIES)
- return 3; // There are not any audited DP2 volumes in the cluster
- // The list of DP2 volumes in the cache may be out-of-date.
- // Refreshes it by setting the ListOfVolNamesCacheTime to 0
- // and then calling SQL_EXEC_GetListOfVolumes_Internal().
- exec_globals->setListOfVolNamesCacheTime((_int64)0);
- continue;
- }
- } // for (Int32 numOfTries...
-
- char *pVol = pAuditedVols->operator[](randIndex);
- size_t volLen = str_len(pVol);
- if (volLen + 1 > (size_t) outBufMaxLen)
- return 1; // Output buffer too small
-
- str_cpy_all( outBuf
- , pVol
- , volLen + 1 // including NULL terminator
- );
- defaultVolLen = volLen;
-
- return 0; // Successful
-
-} // SQL_EXEC_GetDefaultVolume_Internal()
-//LCOV_EXCL_STOP
-
Lng32 SQLCLI_OutputValueIntoNumericHostvar(
/*IN*/ CliGlobals * cliGlobals,
/*IN*/ SQLDESC_ID * output_descriptor,
@@ -8894,7 +8005,6 @@ Lng32 SQLCLI_SetErrorCodeInRTS(
return retcode;
}
-
Lng32 SQLCLI_LocaleToUTF8 (
CliGlobals *cliGlobals,
Int32 conv_charset,
@@ -9031,7 +8141,6 @@ Lng32 SQLCLI_UTF8ToLocale(
return error;
}
-//LCOV_EXCL_START
Lng32 SQLCLI_UTF16ToLocale (
CliGlobals *cliGlobals,
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/cli/Cli.h
----------------------------------------------------------------------
diff --git a/core/sql/cli/Cli.h b/core/sql/cli/Cli.h
index ae322d5..0a1ca29 100644
--- a/core/sql/cli/Cli.h
+++ b/core/sql/cli/Cli.h
@@ -101,9 +101,6 @@ struct DiagsConditionItem {
extern "C"
{
- Lng32 SQLCLI_AddModule(/*IN*/ CliGlobals * cliGlobals,
- /*IN*/ const SQLMODULE_ID * module_name);
-
Lng32 SQLCLI_AllocDesc(/*IN*/ CliGlobals * cliGlobals,
/*INOUT*/ SQLDESC_ID * desc_id,
@@ -328,7 +325,7 @@ Lng32 SQLCLI_ExecDirect2(/*IN*/ CliGlobals * cliGlobals,
/*IN*/ CliGlobals * cliGlobals,
/*IN OPTIONAL*/ SQLSTMT_ID * statement_id,
/*IN* (SQLDIAG_STMT_INFO_ITEM_ID) */ Lng32 what_to_get,
- /*OUT OPTIONAL*/ void * numeric_value, /* NA_64BIT */
+ /*OUT OPTIONAL*/ void * numeric_value,
/*OUT OPTIONAL*/ char * string_value,
/*IN OPTIONAL*/ Lng32 max_string_len,
/*OUT OPTIONAL*/ Lng32 * len_of_item);
@@ -360,7 +357,7 @@ Lng32 SQLCLI_ExecDirect2(/*IN*/ CliGlobals * cliGlobals,
Lng32 SQLCLI_GetSQLCODE(/*IN*/ CliGlobals * cliGlobals,
/*OUT*/ Lng32 * theSQLCODE);
-SQLCLI_LIB_FUNC Lng32 SQLCLI_GetDiagnosticsCondInfo2(
+ Lng32 SQLCLI_GetDiagnosticsCondInfo2(
/*IN*/ CliGlobals * cliGlobals,
/*IN* (SQLDIAG_COND_INFO_ITEM_ID) */ Lng32 what_to_get,
/*IN*/ Lng32 conditionNum,
@@ -369,7 +366,7 @@ SQLCLI_LIB_FUNC Lng32 SQLCLI_GetDiagnosticsCondInfo2(
/*IN OPTIONAL */ Lng32 max_string_len,
/*OUT OPTIONAL*/ Lng32 * len_of_item);
-SQLCLI_LIB_FUNC Lng32 SQLCLI_GetDiagnosticsCondInfo3 (
+ Lng32 SQLCLI_GetDiagnosticsCondInfo3 (
/*IN*/ CliGlobals * cliGlobals,
/*IN*/ Lng32 no_of_condition_items,
/*IN*/ SQLDIAG_COND_INFO_ITEM_VALUE
@@ -437,15 +434,6 @@ SQLCLI_LIB_FUNC Lng32 SQLCLI_GetDiagnosticsCondInfo3 (
/*OUT*/ Int32 *pfsMaxUse);
Lng32 SQLCLI_CleanUpPfsResources(/*IN*/ CliGlobals *cliGlobals);
-
- Lng32 SQLCLI_GetVersion_Internal
- (/*IN*/ CliGlobals * cliGlobals,
- /*IN*/ Lng32 versionType,
- /*OUT*/ Lng32 * versionValue,
- /*IN OPTIONAL*/ const char * nodeName,
- /*IN OPTIONAL*/ const SQLMODULE_ID * module_name,
- /*IN OPTIONAL*/ const SQLSTMT_ID * statement_id);
-
Lng32 SQLCLI_PerformTasks(
/*IN*/ CliGlobals * cliGlobals,
/*IN*/ULng32 tasks,
@@ -656,7 +644,6 @@ Lng32 SQLCLI_SetAuthID(
/*?*/ SQLSTMT_ID * statement_id,
/*?*/ Int64 & rowsAffected);
-//#ifdef NA_NSK
//Function to get the length of the desc_items array
//returns the length if no error occurs, if error_occurred
//is 1 on return then return value indicates error
@@ -690,7 +677,6 @@ Lng32 SQLCLI_OutputValueIntoNumericHostvar(
/*IN*/ Lng32 desc_entry,
/*IN*/ Lng32 value);
-//#endif /* NA_NSK */
Lng32 SQLCLI_GetSystemVolume_Internal(
/*IN*/ CliGlobals * cliGlobals,
/*INOUT*/ char * SMDLocation,
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/cli/CliDefs.h
----------------------------------------------------------------------
diff --git a/core/sql/cli/CliDefs.h b/core/sql/cli/CliDefs.h
index 709f1d0..d70e1b4 100644
--- a/core/sql/cli/CliDefs.h
+++ b/core/sql/cli/CliDefs.h
@@ -41,9 +41,6 @@
// -----------------------------------------------------------------------
-# ifdef ERROR
-# undef ERROR
-# endif
enum RETCODE
{
SUCCESS = 0, SQL_EOF = 100, ERROR = -1, WARNING = 1,
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/cli/CliDll.cpp
----------------------------------------------------------------------
diff --git a/core/sql/cli/CliDll.cpp b/core/sql/cli/CliDll.cpp
index 4cfb249..f98e94c 100644
--- a/core/sql/cli/CliDll.cpp
+++ b/core/sql/cli/CliDll.cpp
@@ -34,47 +34,3 @@
*****************************************************************************
*/
-
-// This file is home to InitApp() which is called when the DLL is loaded.
-//
-// This DLL is the *only* one which needs InitApp()!
-// In particular,
-// basic/BasicDll.cpp exp/ExpDll.cpp export/ExportDll.cpp
-// do *not* need it!
-
-
-#include "Platform.h"
-
-
-#include "cli_stdh.h"
-#include "ex_transaction.h"
-#include <stdarg.h>
-
-// Only if we're building a DLL do we need to include the stuff below;
-// otherwise, just ignore them.
-#if defined(CLI_DLL) || defined(CLI_LIB)
- #include "NABoolean.h"
-// #include "UtilInt.h"
- #include "catnames.h"
- #include "SqlciEnv.h" // only reason why we need sqlcilib in DLL.
- #include "StoredProcInterface.h" // to export the interface.
-
- #include <setjmp.h>
- SQLEXPORT_LIB_FUNC jmp_buf ExportJmpBuf;
- extern "C"
- {
- SQLCLI_LIB_FUNC void InitApp(Int32 *argc, char *argv[]) {}
- }
-
- // stub functions used only in case CLI is built as a DLL.
- #if defined(CLI_DLL)
-
- // Stub for UNUSED virtual ../optimizer/SynthType.cpp function
- // (pulled in by ../sqlci/Formatter.cpp).
- #include "NAType.h"
- NABoolean NAType::isComparable(const NAType &, ItemExpr *, NABoolean) const
- { return FALSE; }
- #endif
-
-#endif
-
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/cli/CliExpExchange.cpp
----------------------------------------------------------------------
diff --git a/core/sql/cli/CliExpExchange.cpp b/core/sql/cli/CliExpExchange.cpp
index 953fc8b..1713409 100644
--- a/core/sql/cli/CliExpExchange.cpp
+++ b/core/sql/cli/CliExpExchange.cpp
@@ -48,9 +48,6 @@
#include "cli_stdh.h"
#include "exp_datetime.h"
#include "exp_interval.h"
-#if defined( NA_SHADOWCALLS )
-#include "sqlclisp.h" //shadow
-#endif
#include "exp_expr.h"
#include "ExRLE.h"
@@ -465,9 +462,9 @@ Descriptor::BulkMoveStatus Descriptor::checkBulkMoveStatusV1(
// if (! getenv("DOSLOWBULKMOVE"))
// return BULK_MOVE_OFF;
if (getenv("BULKMOVEOFF"))
- return BULK_MOVE_OFF;//LCOV_EXCL_LINE
+ return BULK_MOVE_OFF;
else if (getenv("BULKMOVEDISALLOWED"))
- return BULK_MOVE_DISALLOWED;//LCOV_EXCL_LINE
+ return BULK_MOVE_DISALLOWED;
#endif
desc_struct &descItem = desc[entry - 1]; // Zero base
@@ -1068,9 +1065,6 @@ InputOutputExpr::outputValues(atp_struct *atp,
Lng32 targetPrecision;
char * targetVarPtr = NULL;
char * targetIndPtr = NULL;
-#if defined( NA_SHADOWCALLS )
- char * bimodalIndPtr = NULL;
-#endif
char * targetVCLen = NULL;
short targetVCLenSize = 0;
@@ -1410,12 +1404,7 @@ InputOutputExpr::outputValues(atp_struct *atp,
if (tempTarget && output_desc->rowwiseRowset() && (NOT output_desc->rowwiseRowsetDisabled()))
tempTarget = tempTarget + output_desc->getCurrRowOffsetInRowwiseRowset();
-#if defined( NA_SHADOWCALLS )
- bimodalIndPtr = (char *)tempTarget;
- targetIndPtr = SqlCliSp_GetBufPtr(bimodalIndPtr, FALSE);
-#else
targetIndPtr = (char *)tempTarget;
-#endif
if ((operand->getVCIndicatorLength()) && (sourceVCLenInd)) {
if (operand->getVCIndicatorLength() == sizeof(short))
[13/30] incubator-trafodion git commit: TRAFODION-2731 CodeCleanup:
Remove obsolete, legacy and unused code
Posted by an...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/ex_mdam.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/ex_mdam.h b/core/sql/executor/ex_mdam.h
index e07aaa7..e7fa197 100644
--- a/core/sql/executor/ex_mdam.h
+++ b/core/sql/executor/ex_mdam.h
@@ -86,25 +86,25 @@ class MdamPredIterator : public ExGod
public:
- NA_EIDPROC MdamPredIterator(MdamColumn * first,Lng32 maxDisjunctNumber);
+ MdamPredIterator(MdamColumn * first,Lng32 maxDisjunctNumber);
- NA_EIDPROC ~MdamPredIterator()
+ ~MdamPredIterator()
{ };
- NA_EIDPROC Lng32 getNextDisjunctNumber(); // -1 means no more disjuncts
+ Lng32 getNextDisjunctNumber(); // -1 means no more disjuncts
// In the next three methods, currentPred is state stored in MdamColumn
// objects, but updated by these methods only.
// FALSE means no more predicates
- NA_EIDPROC NABoolean positionToNextOr(MdamPred **currentPred);
+ NABoolean positionToNextOr(MdamPred **currentPred);
// 0 (NULL) means no more predicates
// for this key column within this predicate
- NA_EIDPROC MdamPred * getNextPred(MdamPred **currentPred);
+ MdamPred * getNextPred(MdamPred **currentPred);
// Position the predicate list to the current disjunct.
- NA_EIDPROC void positionToCurrentDisjunct(MdamPred **currentPred);
+ void positionToCurrentDisjunct(MdamPred **currentPred);
};
@@ -189,7 +189,7 @@ public:
enum getNextValueReturnType { TRAVERSE_DOWN, TRAVERSE_UP, SUBSET, PROBE };
- NA_EIDPROC MdamColumn(MdamColumn * previous,
+ MdamColumn(MdamColumn * previous,
MdamColumnGen *columnGenInfo,
ex_globals *glob,
sql_buffer_pool *pool,
@@ -198,15 +198,15 @@ public:
unsigned short valueAtpIndex,
const ex_tcb *tcb);
- NA_EIDPROC ~MdamColumn();
+ ~MdamColumn();
// methods used to build an Mdam network
- NA_EIDPROC void initCurrentPred()
+ void initCurrentPred()
{ currentPred_ = columnGenInfo_->getFirstPred(); };
// returns TRUE if the disjunct number is in some stop list
- NA_EIDPROC NABoolean buildDisjunct(MdamPredIterator & predIterator,
+ NABoolean buildDisjunct(MdamPredIterator & predIterator,
sql_buffer_pool *pool,
atp_struct *atp0,
atp_struct *atp1,
@@ -220,29 +220,29 @@ public:
mdamRefListEntrysForStopListsHeap,
Lng32 & dataConvErrorFlag);
- NA_EIDPROC void tossDisjunct(FixedSizeHeapManager & mdamIntervalHeap,
+ void tossDisjunct(FixedSizeHeapManager & mdamIntervalHeap,
FixedSizeHeapManager & mdamRefListEntryHeap);
- NA_EIDPROC void mergeDisjunct(Lng32 disjunct_number,
+ void mergeDisjunct(Lng32 disjunct_number,
FixedSizeHeapManager & mdamIntervalHeap,
FixedSizeHeapManager & mdamRefListEntryHeap);
- NA_EIDPROC NABoolean disjunctIsEmpty();
+ NABoolean disjunctIsEmpty();
// Method used to destroy an Mdam network.
- NA_EIDPROC void releaseNetwork(FixedSizeHeapManager & mdamIntervalHeap,
+ void releaseNetwork(FixedSizeHeapManager & mdamIntervalHeap,
FixedSizeHeapManager & mdamRefListEntryHeap);
// Member function used when we are done with the plan.
- NA_EIDPROC void release(FixedSizeHeapManager & mdamRefListEntrysForStopListsHeap);
+ void release(FixedSizeHeapManager & mdamRefListEntrysForStopListsHeap);
// methods used to traverse an Mdam network
- NA_EIDPROC MdamIntervalList & getIntervalList();
+ MdamIntervalList & getIntervalList();
- NA_EIDPROC MdamColumn * nextColumn() { return next_; };
- NA_EIDPROC MdamColumn * previousColumn() { return previous_; };
+ MdamColumn * nextColumn() { return next_; };
+ MdamColumn * previousColumn() { return previous_; };
- NA_EIDPROC NABoolean initNextValue();
+ NABoolean initNextValue();
// returns TRAVERSE_DOWN if a value was obtained, and the current
// interval is not a subset interval; SUBSET if values were obtained
@@ -259,30 +259,30 @@ public:
// (but might not be the same value)
// beginExclFlag and endExclFlag are both set and
// should be applied to the key range as a whole
- NA_EIDPROC getNextValueReturnType getNextValue(ULng32 pFRCounter,
+ getNextValueReturnType getNextValue(ULng32 pFRCounter,
char *bktarget,
char *ektarget,
short &beginExclFlag,
short &endExclFlag,
FixedSizeHeapManager & mdamRefListEntryHeap);
- NA_EIDPROC void reportProbeResult(char *keyData);
+ void reportProbeResult(char *keyData);
- NA_EIDPROC void completeKey(char *bktarget,
+ void completeKey(char *bktarget,
char *ektarget,
short bkexcl,
short ekexcl);
- NA_EIDPROC ULng32 getOffset()
+ ULng32 getOffset()
{ return columnGenInfo_->getOffset(); };
// Print function.
#ifdef NA_MDAM_EXECUTOR_DEBUG
- NA_EIDPROC void print(const char * header = "") const;
+ void print(const char * header = "") const;
#endif /* NA_MDAM_EXECUTOR_DEBUG */
private:
- NA_EIDPROC void setNextColumn(MdamColumn * next);
+ void setNextColumn(MdamColumn * next);
@@ -326,39 +326,39 @@ class keyMdamEx : public keyRangeEx
NABoolean complementKeysBeforeReturning_;
public:
- NA_EIDPROC keyMdamEx(const keyRangeGen & tdb_key,
+ keyMdamEx(const keyRangeGen & tdb_key,
const short in_version,
sql_buffer_pool *pool,
ex_globals *glob,
const ex_tcb *tcb);
- NA_EIDPROC ~keyMdamEx();
+ ~keyMdamEx();
- NA_EIDPROC virtual ExeErrorCode initNextKeyRange(sql_buffer_pool *pool,
+ virtual ExeErrorCode initNextKeyRange(sql_buffer_pool *pool,
atp_struct * atp0);
- NA_EIDPROC virtual getNextKeyRangeReturnType getNextKeyRange
+ virtual getNextKeyRangeReturnType getNextKeyRange
(atp_struct * atp0,NABoolean fetchRangeHadRows,
NABoolean detectNullRange = TRUE);
- NA_EIDPROC virtual void reportProbeResult(char *keyData);
+ virtual void reportProbeResult(char *keyData);
// release tupp storage
- NA_EIDPROC void release();
+ void release();
- NA_EIDPROC keyMdamGen & getGenInfo()
+ keyMdamGen & getGenInfo()
{ return (keyMdamGen &)tdbKey_; };
private:
// Returns zero if memory for MdamRefListEntry's and MdamInterval's
// is successfully acquired. Otherwise, returns ExeErrorCode.
- NA_EIDPROC ExeErrorCode buildNetwork(sql_buffer_pool *pool,atp_struct *atp0);
+ ExeErrorCode buildNetwork(sql_buffer_pool *pool,atp_struct *atp0);
- NA_EIDPROC void destroyNetwork();
+ void destroyNetwork();
// Print function.
#ifdef NA_MDAM_EXECUTOR_DEBUG
- NA_EIDPROC void print(const char * header = "") const;
+ void print(const char * header = "") const;
#endif /* NA_MDAM_EXECUTOR_DEBUG */
};
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/ex_mj.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/ex_mj.h b/core/sql/executor/ex_mj.h
index 6844df6..4d1e6ae 100644
--- a/core/sql/executor/ex_mj.h
+++ b/core/sql/executor/ex_mj.h
@@ -75,16 +75,16 @@ public:
// retrieval of the virtual table function pointer of the class while
// unpacking. An empty constructor is enough.
// ---------------------------------------------------------------------
- NA_EIDPROC ex_mj_tdb()
+ ex_mj_tdb()
{}
- NA_EIDPROC virtual ~ex_mj_tdb()
+ virtual ~ex_mj_tdb()
{}
// ---------------------------------------------------------------------
// Build a TCB for this TDB. Redefined in the Executor project.
// ---------------------------------------------------------------------
- NA_EIDPROC virtual ex_tcb *build(ex_globals *globals);
+ virtual ex_tcb *build(ex_globals *globals);
private:
// ---------------------------------------------------------------------
@@ -158,7 +158,7 @@ public:
void freeResources(); // free resources
- NA_EIDPROC virtual ex_tcb_private_state * allocatePstates(
+ virtual ex_tcb_private_state * allocatePstates(
Lng32 &numElems, // inout, desired/actual elements
Lng32 &pstateLength); // out, length of one element
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/ex_onlj.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ex_onlj.cpp b/core/sql/executor/ex_onlj.cpp
index 87118ec..5c5f4b6 100644
--- a/core/sql/executor/ex_onlj.cpp
+++ b/core/sql/executor/ex_onlj.cpp
@@ -43,9 +43,7 @@
#include "str.h"
#include "ExStats.h"
-#ifndef __EID
#include "ex_exe_stmt_globals.h"
-#endif
#include "sql_buffer_size.h"
/////////////////////////////////////////////////////////////////////////
@@ -455,7 +453,6 @@ ExWorkProcRetcode ExOnljTcb::work_phase1()
else
{
#ifdef TRACE_PAPA_DEQUEUE
-#ifndef __EID
if ((pentry1->downState.numGetNextsIssued - pstate1.pushedDownGetNexts_ ) > 1)
{
cout << "ExOnljTcb::work_phase1, too many requests."
@@ -466,7 +463,6 @@ ExWorkProcRetcode ExOnljTcb::work_phase1()
<< endl;
}
#endif
-#endif
// Push down the GET_NEXT request
if (pentry1->downState.request == ex_queue::GET_NEXT_N || pentry1->downState.request == ex_queue::GET_NEXT_N_SKIP)
@@ -681,7 +677,6 @@ ExWorkProcRetcode ExOnljTcb::work_phase2()
lentry->setDiagsArea(NULL);
// Adjust the rowcount in the statement globals
// Subtract the rows that were "undone"
-#ifndef __EID
//if we have already subtracted rowcount once for this
// parent entry don't do it again. We only have to do it once per parent entry row.
if (!pstate.rowAlreadyRaisedNFError_)
@@ -699,14 +694,6 @@ ExWorkProcRetcode ExOnljTcb::work_phase2()
else
ex_assert(g, "Rowset insert has a flow node that is not in the master executor");
}
-#else
- if (onljTdb().isRowsetIterator() &&
- onljTdb().isNonFatalErrorTolerated() &&
- onljTdb().isSetNFErrorJoin())
- ex_assert(0, "Cannot execute in DP2");
-
-
-#endif
}
}
// set the atp of the right child to be the same as the left atp
@@ -1429,14 +1416,7 @@ ExWorkProcRetcode ExOnljTcb::work_phase3()
pstate.tgtRequestCount_++;
- // If it is an EID then it is a pushdown and we should not count the number of rows
- // coming from the right side if the right side is an MV IUD LOG
-#ifdef __EID
- if (!isDrivingMVLogging())
- pstate.rowCount_ += rentry->upState.getMatchNo();
-#else
- pstate.rowCount_ += rentry->upState.getMatchNo();
-#endif
+ pstate.rowCount_ += rentry->upState.getMatchNo();
// Be ready to null instantiate the new left row
pstate.outerMatched_ = ExConstants::EX_FALSE;
@@ -1677,11 +1657,8 @@ ExWorkProcRetcode ExOnljTcb::work_phase3()
// merge any diags from the upentry with any diags that may be in the
// parent entry diags area.
NABoolean anyRowsAffected = FALSE;
-#ifndef __EID
ExMasterStmtGlobals *g = getGlobals()->
castToExExeStmtGlobals()->castToExMasterStmtGlobals();
-#endif
-
// if a split-top is returning a diags area,
// set the accumulated diags in the parent entry.
@@ -1716,7 +1693,6 @@ ExWorkProcRetcode ExOnljTcb::work_phase3()
// Compute the rows affected and set the NF warning for any errors coming from the left or right.
if (onljTdb().isRowsetIterator() && onljTdb().isNonFatalErrorTolerated() && onljTdb().isSetNFErrorJoin())
{
-#ifndef __EID
if (g)
{
Int64 rowsAffected = g->getRowsAffected();
@@ -1725,7 +1701,6 @@ ExWorkProcRetcode ExOnljTcb::work_phase3()
}
else
ex_assert(g, "Rowset insert has a flow node that is not in the master executor");
-#endif
ComDiagsArea *mergedDiags = uentry->getDiagsArea();
// if it's a diags just containing rowcount and no error/warning
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/ex_onlj.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/ex_onlj.h b/core/sql/executor/ex_onlj.h
index 5d7dab1..e8e68d0 100644
--- a/core/sql/executor/ex_onlj.h
+++ b/core/sql/executor/ex_onlj.h
@@ -70,16 +70,16 @@ public:
// retrieval of the virtual table function pointer of the class while
// unpacking. An empty constructor is enough.
// ---------------------------------------------------------------------
- NA_EIDPROC ExOnljTdb()
+ ExOnljTdb()
{}
- NA_EIDPROC virtual ~ExOnljTdb()
+ virtual ~ExOnljTdb()
{}
// ---------------------------------------------------------------------
// Build a TCB for this TDB. Redefined in the Executor project.
// ---------------------------------------------------------------------
- NA_EIDPROC virtual ex_tcb *build(ex_globals *globals);
+ virtual ex_tcb *build(ex_globals *globals);
private:
// ---------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/ex_queue.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ex_queue.cpp b/core/sql/executor/ex_queue.cpp
index c40377d..460aa60 100644
--- a/core/sql/executor/ex_queue.cpp
+++ b/core/sql/executor/ex_queue.cpp
@@ -676,7 +676,6 @@ void ex_queue_entry::initializeState(const ex_queue::queue_type type)
}
}
-NA_EIDPROC
const char * NodeTypeToString(ComTdb::ex_node_type nodeType)
{
const char * tdbName;
@@ -823,7 +822,6 @@ void ex_queue::injectErrorOrCancel()
{
needsError = TRUE;
qe->upState.status = Q_SQLERROR;
- #if (!defined (__EID) && !defined(NA_C89))
cerr << "Converting a Q_OK_MMORE to a Q_SQLERROR, from "
<< NodeTypeToString(unblockSubtask_->getTcb()->getNodeType())
<< "(" << unblockSubtask_->getTcb() << ")"
@@ -831,7 +829,6 @@ void ex_queue::injectErrorOrCancel()
<< NodeTypeToString(insertSubtask_->getTcb()->getNodeType())
<< "(" << insertSubtask_->getTcb() << ")"
<< endl;
- #endif
break;
}
case Q_NO_DATA:
@@ -844,7 +841,6 @@ void ex_queue::injectErrorOrCancel()
newQNODATA->upState.status = Q_NO_DATA;
newQNODATA->getAtp()->copyAtp(qe->getAtp());
tail_++;
-#if (!defined (__EID) && !defined(NA_C89))
cerr << "Injecting a Q_SQLERROR before a Q_NO_DATA, from "
<< NodeTypeToString(unblockSubtask_->getTcb()->getNodeType())
<< "(" << unblockSubtask_->getTcb() << ")"
@@ -852,7 +848,6 @@ void ex_queue::injectErrorOrCancel()
<< NodeTypeToString(insertSubtask_->getTcb()->getNodeType())
<< "(" << insertSubtask_->getTcb() << ")"
<< endl;
-#endif
}
break;
default:
@@ -879,7 +874,6 @@ void ex_queue::injectErrorOrCancel()
void ex_queue::logHeader()
{
-#if (!defined (__EID) && !defined(NA_C89))
if (upDown_ == UP_QUEUE)
{
cerr
@@ -899,14 +893,11 @@ void ex_queue::logHeader()
<< "(" << insertSubtask_->getTcb() << ")"
;
}
-
-#endif
}
void ex_queue::logRemoveHead()
{
#if 0
-#if (!defined (__EID) && !defined(NA_C89))
ex_queue_entry *qe = &queue_[head_ & mask_];
@@ -957,7 +948,6 @@ void ex_queue::logRemoveHead()
}
cerr << endl;
#endif
-#endif
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/ex_queue.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/ex_queue.h b/core/sql/executor/ex_queue.h
index 114176c..6e4d82a 100644
--- a/core/sql/executor/ex_queue.h
+++ b/core/sql/executor/ex_queue.h
@@ -174,7 +174,6 @@ public:
};
// Constructor for a queue
- NA_EIDPROC
ex_queue(const queue_type type,
queue_index initialSize,
ex_cri_desc * criDesc,
@@ -184,7 +183,6 @@ public:
// allocate ATPs for entries that don't have one already,
// use pre-allocated ATPs if they are passed in
- NA_EIDPROC
NABoolean allocateAtps(CollHeap * space,
atp_struct * atps = NULL,
queue_index numNewAtps = 0,
@@ -195,43 +193,32 @@ public:
// PSTATE as a sample (deprecated method, use the other method that
// doesn't need the pstate to be passed in and that supports
// preallocated pstates and allocation as an array)
- NA_EIDPROC
void allocatePstate(ex_tcb_private_state *p,
ex_tcb * tcb);
// allocate PSTATE objects for queue entries that don't have a
// PSTATE yet, using an array of pre-allocated PSTATEs if passed in
- NA_EIDPROC
NABoolean allocatePstate(ex_tcb * tcb,
ex_tcb_private_state *pstates = NULL,
queue_index numNewPstates = 0,
Lng32 pstateLength = 0,
NABoolean failureIsFatal = TRUE);
- NA_EIDPROC
void deallocateAtps();
- NA_EIDPROC
void deallocatePstate();
// does this queue need its own ATPs?
- NA_EIDPROC
Int32 needsAtps() const { return needsAtps_; }
// resize a queue (including the ATPs and the pstates), return new size
- NA_EIDPROC
NABoolean needsResize() const { return needsResize_; }
- NA_EIDPROC
Lng32 getResizeLimit() const { return (Lng32) resizeLimit_; }
- NA_EIDPROC
void setResizeLimit(Lng32 l) { resizeLimit_ = (ULng32) l; }
- NA_EIDPROC
queue_index resize(ex_tcb * tcb,
queue_index newSize);
- NA_EIDPROC
ex_cri_desc * getCriDesc();
// destructor
- NA_EIDPROC
~ex_queue();
//
@@ -244,39 +231,36 @@ public:
// gets address/index of empty queue_entry to modify it
// (the entry is not yet inserted into the queue)
//
- NA_EIDPROC ex_queue_entry * getTailEntry() const;
- NA_EIDPROC
+ ex_queue_entry * getTailEntry() const;
queue_index getTailIndex() const;
// next queue_entry now becomes tail_
- NA_EIDPROC
void insert();
//
// Cancel a down request already inserted into the queue; cancel
// a request with a given value for parentIndex.
//
- NA_EIDPROC void cancelRequest();
- NA_EIDPROC
+ void cancelRequest();
void cancelRequest(const queue_index i);
- NA_EIDPROC void cancelRequestWithParentIndex(queue_index pindex);
- NA_EIDPROC void cancelRequestWithParentIndexRange(queue_index startPI, queue_index endPI);
+ void cancelRequestWithParentIndex(queue_index pindex);
+ void cancelRequestWithParentIndexRange(queue_index startPI, queue_index endPI);
//?johannes?
- NA_EIDPROC void getNextNRequestInit(const Lng32 tuples);
- NA_EIDPROC void getNextNRequest(const Lng32 tuples);
+ void getNextNRequestInit(const Lng32 tuples);
+ void getNextNRequest(const Lng32 tuples);
- NA_EIDPROC void getNextNMaybeWaitRequestInit(const Lng32 tuples);
- NA_EIDPROC void getNextNMaybeWaitRequest(const Lng32 tuples);
+ void getNextNMaybeWaitRequestInit(const Lng32 tuples);
+ void getNextNMaybeWaitRequest(const Lng32 tuples);
- NA_EIDPROC void getNextNSkipRequestInit(const Lng32 tuples);
- NA_EIDPROC void getNextNSkipRequest(const Lng32 tuples);
+ void getNextNSkipRequestInit(const Lng32 tuples);
+ void getNextNSkipRequest(const Lng32 tuples);
- NA_EIDPROC void getNextNMaybeWaitSkipRequestInit(const Lng32 tuples);
- NA_EIDPROC void getNextNMaybeWaitSkipRequest(const Lng32 tuples);
+ void getNextNMaybeWaitSkipRequestInit(const Lng32 tuples);
+ void getNextNMaybeWaitSkipRequest(const Lng32 tuples);
- NA_EIDPROC void getNext0MaybeWaitRequest(void);
- NA_EIDPROC void getNext0MaybeWaitRequestInit(void);
+ void getNext0MaybeWaitRequest(void);
+ void getNext0MaybeWaitRequestInit(void);
//?johannes??
//
@@ -287,22 +271,17 @@ public:
//
// gets address of i-th queue-entry
//
- NA_EIDPROC
ex_queue_entry * getQueueEntry(const queue_index i) const;
- NA_EIDPROC
ex_queue_entry * getHeadEntry() const;
- NA_EIDPROC
queue_index getHeadIndex() const;
// check whether a certain entry exists (used to loop through entries)
- NA_EIDPROC
inline Int32 entryExists(queue_index ix) const;
void handleFullQueue();
void handleEmptyQueue();
// removes the head and it becomes empty;
-NA_EIDPROC
#ifndef _DEBUG
inline
#endif
@@ -320,33 +299,28 @@ inline
// the queue is just looking for a Q_NO_DATA. Hence these shouldnt be
// considered for qresizing as the query has been satisfied.
- NA_EIDPROC
void deleteHeadEntry();
// soln 10-040111-2308 end
// queue the size of the queue and the number of entries in it.
- NA_EIDPROC
queue_index getSize() const; //allocated size
- NA_EIDPROC
queue_index inline getLength() const; //occupied entries between 0 and size-1
- NA_EIDPROC
Int32 inline isFull() const; // returns true if queue is full
- NA_EIDPROC
Int32 inline isEmpty() const; // returns true if queue is full
- NA_EIDPROC inline void setInsertSubtask(ExSubtask *insertSubtask)
+ inline void setInsertSubtask(ExSubtask *insertSubtask)
{ insertSubtask_ = insertSubtask; }
- NA_EIDPROC inline void setUnblockSubtask(ExSubtask *unblockSubtask)
+ inline void setUnblockSubtask(ExSubtask *unblockSubtask)
{ unblockSubtask_ = unblockSubtask; }
// warning elimination (removed "inline")
- NA_EIDPROC void setCancelSubtask(ExSubtask *cancelSubtask)
+ void setCancelSubtask(ExSubtask *cancelSubtask)
{ ExQueueAssert(upDown_ == DOWN_QUEUE,""); cancelSubtask_ = cancelSubtask; }
- NA_EIDPROC inline void setResizeSubtask(ExSubtask *resizeSubtask)
+ inline void setResizeSubtask(ExSubtask *resizeSubtask)
{ resizeSubtask_ = resizeSubtask; }
//?johannes?
// warning elimination (removed "inline")
- NA_EIDPROC void setNextSubtask(ExSubtask *nextSubtask)
+ void setNextSubtask(ExSubtask *nextSubtask)
{ ExQueueAssert(upDown_ == DOWN_QUEUE,""); nextSubtask_ = nextSubtask; }
//?johannes??
@@ -398,34 +372,27 @@ private:
//?johannes??
// is queue entry i vacant?
- NA_EIDPROC inline Int32 isVacant(const queue_index i) const;
+ inline Int32 isVacant(const queue_index i) const;
- NA_EIDPROC void injectErrorOrCancel();
+ void injectErrorOrCancel();
// for debuggin'
- NA_EIDPROC
void logHeader();
- NA_EIDPROC
void logCancel(queue_index i)
{
#if 0
- #if (!defined (__EID) && !defined(NA_C89))
logHeader();
cerr << " cancel " << i << " (" << (i & (size_-1)) << ")" << endl;
#endif
- #endif
}
- NA_EIDPROC
void logInsert()
{
#if 0
- #if (!defined (__EID) && !defined(NA_C89))
-
ex_queue_entry *qe = &queue_[tail_ & (size_ - 1)];
logHeader();
@@ -474,10 +441,8 @@ private:
}
cerr << endl;
#endif
- #endif
}
- NA_EIDPROC
void logRemoveHead();
}; // ex_queue
@@ -514,7 +479,7 @@ public:
queue_index parentIndex;
- NA_EIDPROC inline NABoolean operator==(const down_state &other) const
+ inline NABoolean operator==(const down_state &other) const
{
return (request == other.request) &&
(requestValue == other.requestValue) &&
@@ -534,7 +499,7 @@ friend class SqlBufferOlt;
friend class SqlBufferOltSmall;
public:
- NA_EIDPROC inline NABoolean operator==(const up_state &other) const
+ inline NABoolean operator==(const up_state &other) const
{
return (parentIndex == other.parentIndex) &&
(status == other.status);
@@ -545,12 +510,12 @@ public:
ex_queue::up_status status; // type of entry (end-of-data, error, etc.)
// accessors
- NA_EIDPROC inline Lng32 getMatchNo(void) const;
- NA_EIDPROC inline NABoolean getDoneNoRowsMatchNo(void) const;
+ inline Lng32 getMatchNo(void) const;
+ inline NABoolean getDoneNoRowsMatchNo(void) const;
// mutators
- NA_EIDPROC inline Lng32 setMatchNo(Int64 n);
- NA_EIDPROC inline void setDoneNoRowsMatchNo(void);
+ inline Lng32 setMatchNo(Int64 n);
+ inline void setDoneNoRowsMatchNo(void);
private:
// matchNo is private to handle overflow situations. There is only one
@@ -583,38 +548,36 @@ class ex_queue_entry
ex_tcb_private_state * pstate; // private (reader's) state
- NA_EIDPROC
+
inline ex_cri_desc * criDesc() const;
- NA_EIDPROC
+
inline unsigned short numTuples() const;
- NA_EIDPROC
+
inline tupp & getTupp(Lng32 i) const;
- NA_EIDPROC
+
void passAtp(const ex_queue_entry *from);
- NA_EIDPROC
+
void passAtp(atp_struct *from);
- NA_EIDPROC
+
inline void copyAtp(const ex_queue_entry *from);
- NA_EIDPROC
+
inline void copyAtp(atp_struct *from);
- NA_EIDPROC
+
inline atp_struct * getAtp() const;
//
// Routines to get and set diagnostics area.
//
- NA_EIDPROC
+
inline ComDiagsArea *getDiagsArea() const;
- NA_EIDPROC
+
inline void setDiagsArea(ComDiagsArea* diagsArea);
private:
- NA_EIDPROC
void initializeState (const ex_queue::queue_type type);
// Used to check that an entry being inserted is intialized properly
- NA_EIDPROC
inline Int32 checkState(const ex_queue::queue_type type)
{
return (type == ex_queue::UP_QUEUE
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/ex_root.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ex_root.cpp b/core/sql/executor/ex_root.cpp
index e8a116c..77ab218 100644
--- a/core/sql/executor/ex_root.cpp
+++ b/core/sql/executor/ex_root.cpp
@@ -139,8 +139,7 @@ ex_tcb * ex_root_tdb::build(CliGlobals *cliGlobals, ex_globals * glob)
UInt32 numOfNewEspsStarted = 0; // num of new esps started by this operator.
UInt32 numOfTotalEspsUsed = 0; // num of total esps used by this operator.
Int64 newprocessTime = 0;
- if ((getCollectStatsType() == ComTdb::MEASURE_STATS) ||
- (getCollectStatsType() == ComTdb::ACCUMULATED_STATS) ||
+ if ((getCollectStatsType() == ComTdb::ACCUMULATED_STATS) ||
(getCollectStatsType() == ComTdb::OPERATOR_STATS) ||
(getCollectStatsType() == ComTdb::PERTABLE_STATS))
{
@@ -151,10 +150,9 @@ ex_tcb * ex_root_tdb::build(CliGlobals *cliGlobals, ex_globals * glob)
rtFragTable->assignEsps(TRUE, numOfTotalEspsUsed, numOfNewEspsStarted
);
- if (((getCollectStatsType() == ComTdb::MEASURE_STATS) ||
- (getCollectStatsType() == ComTdb::ACCUMULATED_STATS) ||
+ if (((getCollectStatsType() == ComTdb::ACCUMULATED_STATS) ||
(getCollectStatsType() == ComTdb::OPERATOR_STATS) ||
- (getCollectStatsType() == ComTdb::PERTABLE_STATS)) &&
+ (getCollectStatsType() == ComTdb::PERTABLE_STATS)) &&
(numOfNewEspsStarted > 0))
{
newprocessTime = JULIANTIMESTAMP(OMIT,OMIT,OMIT,OMIT) - newprocessTime;
@@ -603,11 +601,10 @@ ExOperStats * ex_root_tcb::doAllocateStatsEntry(CollHeap *heap, ComTdb *tdb)
if (ss != NULL)
((ExFragRootOperStats *)stat)->setQueryId(ss->getQueryId(), ss->getQueryIdLen());
}
- else if (statsType == ComTdb::MEASURE_STATS ||
- statsType == ComTdb::ACCUMULATED_STATS)
+ else if (statsType == ComTdb::ACCUMULATED_STATS)
{
- // if measure or accumulated statistics are to be collected, allocate
- // one measure stats entry and insert it into the queue.
+ // if accumulated statistics are to be collected, allocate
+ // one stats entry and insert it into the queue.
// All executor operators that collect stats will use this
// entry to update stats.
// These stats are not associated with any particular
@@ -1839,7 +1836,7 @@ Int32 ex_root_tcb::fetch(CliGlobals *cliGlobals,
// Note that NA_JulianTimestamp is in micro seconds and that
// streamTimeout_ is in .01 seconds
Int64 wait64 = streamTimeout_; // to avoid timeout overflow
- // Extra time may be needed, if Measure is running for stats
+ // Extra time may be needed
IpcTimeout extraTime = 0;
if (getGlobals()->statsEnabled())
extraTime = 100;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/ex_root.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/ex_root.h b/core/sql/executor/ex_root.h
index 88cc759..9797c9e 100644
--- a/core/sql/executor/ex_root.h
+++ b/core/sql/executor/ex_root.h
@@ -87,16 +87,16 @@ public:
// retrieval of the virtual table function pointer of the class while
// unpacking. An empty constructor is enough.
// ---------------------------------------------------------------------
- NA_EIDPROC ex_root_tdb()
+ ex_root_tdb()
{}
- NA_EIDPROC virtual ~ex_root_tdb()
+ virtual ~ex_root_tdb()
{}
// ---------------------------------------------------------------------
// Build a TCB for this TDB. Redefined in the Executor project.
// ---------------------------------------------------------------------
- NA_EIDPROC virtual ex_tcb *build(CliGlobals *cliGlobals,
+ virtual ex_tcb *build(CliGlobals *cliGlobals,
ex_globals *globals);
private:
@@ -303,7 +303,7 @@ public:
void dumpCb();
// Enforce query CPU limit.
- NA_EIDPROC virtual void cpuLimitExceeded();
+ virtual void cpuLimitExceeded();
private:
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/ex_send_bottom.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ex_send_bottom.cpp b/core/sql/executor/ex_send_bottom.cpp
index 1717eee..3db48fb 100644
--- a/core/sql/executor/ex_send_bottom.cpp
+++ b/core/sql/executor/ex_send_bottom.cpp
@@ -199,9 +199,7 @@ ex_send_bottom_tcb::ex_send_bottom_tcb(
Int32 otherCPU, otherPID, otherNode;
SB_Int64_Type seqNum = 0;
phandle.decompose2(otherCPU, otherPID, otherNode
-#ifdef SQ_PHANDLE_VERIFIER
, seqNum
-#endif
);
// Seaquest Node num == old cpuNum
@@ -809,7 +807,7 @@ short ex_send_bottom_tcb::checkReply()
TRUE, // diags areas are external.
isDiagsAreaToBeSent, //);// Already have a DA.
defragTd_
-#if (defined (NA_LINUX) && defined(_DEBUG) && !defined(__EID))
+#if (defined(_DEBUG))
,this
#endif
);
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/ex_send_bottom.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/ex_send_bottom.h b/core/sql/executor/ex_send_bottom.h
index 944e42f..7a81432 100644
--- a/core/sql/executor/ex_send_bottom.h
+++ b/core/sql/executor/ex_send_bottom.h
@@ -81,16 +81,16 @@ public:
// retrieval of the virtual table function pointer of the class while
// unpacking. An empty constructor is enough.
// ---------------------------------------------------------------------
- NA_EIDPROC ex_send_bottom_tdb()
+ ex_send_bottom_tdb()
{}
- NA_EIDPROC virtual ~ex_send_bottom_tdb()
+ virtual ~ex_send_bottom_tdb()
{}
// ---------------------------------------------------------------------
// Build a TCB for this TDB. Redefined in the Executor project.
// ---------------------------------------------------------------------
- NA_EIDPROC virtual ex_tcb *build(ex_globals *globals);
+ virtual ex_tcb *build(ex_globals *globals);
// allocate one node to communicate with a particular parent instance
virtual ex_send_bottom_tcb * buildInstance(ExExeStmtGlobals * glob,
@@ -190,7 +190,7 @@ public:
IpcConnection * getClient();
- virtual NA_EIDPROC ExOperStats *doAllocateStatsEntry(CollHeap *heap,
+ virtual ExOperStats *doAllocateStatsEntry(CollHeap *heap,
ComTdb *tdb);
void setExtractConsumerFlag(NABoolean b) { isExtractConsumer_ = b; }
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/ex_send_top.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ex_send_top.cpp b/core/sql/executor/ex_send_top.cpp
index e0862c8..c4a1ec9 100644
--- a/core/sql/executor/ex_send_top.cpp
+++ b/core/sql/executor/ex_send_top.cpp
@@ -358,9 +358,7 @@ Int32 ex_send_top_tcb::fixup()
Int32 otherCPU, otherPID, otherNode;
SB_Int64_Type seqNum = 0;
phandle.decompose2(otherCPU, otherPID, otherNode
-#ifdef SQ_PHANDLE_VERIFIER
, seqNum
-#endif
);
// Store SeaMonster information in the TCB and in IPC objects
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/ex_send_top.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/ex_send_top.h b/core/sql/executor/ex_send_top.h
index c00ddf1..c4da720 100644
--- a/core/sql/executor/ex_send_top.h
+++ b/core/sql/executor/ex_send_top.h
@@ -79,16 +79,16 @@ public:
// retrieval of the virtual table function pointer of the class while
// unpacking. An empty constructor is enough.
// ---------------------------------------------------------------------
- NA_EIDPROC ex_send_top_tdb()
+ ex_send_top_tdb()
{}
- NA_EIDPROC virtual ~ex_send_top_tdb()
+ virtual ~ex_send_top_tdb()
{}
// ---------------------------------------------------------------------
// Build a TCB for this TDB. Redefined in the Executor project.
// ---------------------------------------------------------------------
- NA_EIDPROC virtual ex_tcb *build(ex_globals *globals);
+ virtual ex_tcb *build(ex_globals *globals);
// ---------------------------------------------------------------------
// send top nodes are usually built such that many tcbs exist for a
@@ -188,7 +188,7 @@ public:
virtual const ex_tcb* getChild(Int32 pos) const;
- virtual NA_EIDPROC ExOperStats *doAllocateStatsEntry(CollHeap *heap,
+ virtual ExOperStats *doAllocateStatsEntry(CollHeap *heap,
ComTdb *tdb);
// Tell the server that we lost interest in a request
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/ex_sort.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ex_sort.cpp b/core/sql/executor/ex_sort.cpp
index c92a38e..de9a2c7 100644
--- a/core/sql/executor/ex_sort.cpp
+++ b/core/sql/executor/ex_sort.cpp
@@ -66,9 +66,10 @@ const char *ExSortTcb::SortPhaseStr[] = {
NABoolean ExSortTcb::needStatsEntry()
{
ComTdb::CollectStatsType statsType = getGlobals()->getStatsArea()->getCollectStatsType();
- // stats are collected for ALL and MEASURE options.
- if (statsType == ComTdb::MEASURE_STATS || statsType == ComTdb::ALL_STATS ||
- statsType == ComTdb::OPERATOR_STATS)
+
+ // stats are collected for ALL or OPERATOR options.
+ if (statsType == ComTdb::ALL_STATS ||
+ statsType == ComTdb::OPERATOR_STATS)
return TRUE;
else
return FALSE;
@@ -80,11 +81,11 @@ ExOperStats * ExSortTcb::doAllocateStatsEntry(CollHeap *heap,
ExBMOStats *stat;
ComTdb::CollectStatsType statsType = getGlobals()->getStatsArea()->getCollectStatsType();
- if (statsType == ComTdb::MEASURE_STATS)
+ if (statsType == ComTdb::ACCUMULATED_STATS)
{
- // measure or accum stats
+ // accum stats
ex_assert(getGlobals()->getStatsArea()->numEntries() == 1,
- "Must have one and only one entry for measure/accum stats case");
+ "Must have one and only one entry for accum stats case");
getGlobals()->getStatsArea()->position();
setStatsEntry(getGlobals()->getStatsArea()->getNext());
return NULL;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/ex_sort.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/ex_sort.h b/core/sql/executor/ex_sort.h
index aa09b8f..8352672 100644
--- a/core/sql/executor/ex_sort.h
+++ b/core/sql/executor/ex_sort.h
@@ -73,16 +73,16 @@ public:
// retrieval of the virtual table function pointer of the class while
// unpacking. An empty constructor is enough.
// ---------------------------------------------------------------------
- NA_EIDPROC ExSortTdb()
+ ExSortTdb()
{}
- NA_EIDPROC virtual ~ExSortTdb()
+ virtual ~ExSortTdb()
{}
// ---------------------------------------------------------------------
// Build a TCB for this TDB. Redefined in the Executor project.
// ---------------------------------------------------------------------
- NA_EIDPROC virtual ex_tcb *build(ex_globals *globals);
+ virtual ex_tcb *build(ex_globals *globals);
private:
// ---------------------------------------------------------------------
@@ -304,7 +304,7 @@ public:
virtual ExOperStats *doAllocateStatsEntry(CollHeap *heap,
ComTdb *tdb);
- NA_EIDPROC virtual ex_tcb_private_state * allocatePstates(
+ virtual ex_tcb_private_state * allocatePstates(
Lng32 &numElems, // inout, desired/actual elements
Lng32 &pstateLength); // out, length of one element
};
@@ -348,7 +348,7 @@ public:
virtual void registerSubtasks(); // register work procedures with scheduler
- NA_EIDPROC virtual ex_tcb_private_state * allocatePstates(
+ virtual ex_tcb_private_state * allocatePstates(
Lng32 &numElems, // inout, desired/actual elements
Lng32 &pstateLength); // out, length of one element
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/ex_sort_grby.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/ex_sort_grby.h b/core/sql/executor/ex_sort_grby.h
index 63fa075..879d1af 100644
--- a/core/sql/executor/ex_sort_grby.h
+++ b/core/sql/executor/ex_sort_grby.h
@@ -72,16 +72,16 @@ public:
// retrieval of the virtual table function pointer of the class while
// unpacking. An empty constructor is enough.
// ---------------------------------------------------------------------
- NA_EIDPROC ex_sort_grby_tdb()
+ ex_sort_grby_tdb()
{}
- NA_EIDPROC virtual ~ex_sort_grby_tdb()
+ virtual ~ex_sort_grby_tdb()
{}
// ---------------------------------------------------------------------
// Build a TCB for this TDB. Redefined in the Executor project.
// ---------------------------------------------------------------------
- NA_EIDPROC virtual ex_tcb *build(ex_globals *globals);
+ virtual ex_tcb *build(ex_globals *globals);
private:
// ---------------------------------------------------------------------
@@ -135,13 +135,11 @@ protected:
public:
// Constructor
-NA_EIDPROC
ex_sort_grby_tcb(const ex_sort_grby_tdb & sort_grby_tdb,
const ex_tcb & child_tcb , // child queue pair
ex_globals * glob
);
-NA_EIDPROC
~ex_sort_grby_tcb();
enum sort_grby_step {
@@ -175,7 +173,6 @@ NA_EIDPROC
// return a pair of queue pointers to the parent node. Needed only during
// construction of nodes.
- NA_EIDPROC
ex_queue_pair getParentQueue() const
{
return (qparent_);
@@ -272,8 +269,8 @@ class ex_sort_grby_private_state : public ex_tcb_private_state
public:
- NA_EIDPROC ex_sort_grby_private_state();
- NA_EIDPROC ~ex_sort_grby_private_state();
+ ex_sort_grby_private_state();
+ ~ex_sort_grby_private_state();
private:
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/ex_split_bottom.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ex_split_bottom.cpp b/core/sql/executor/ex_split_bottom.cpp
index 6dd35aa..c1a2360 100644
--- a/core/sql/executor/ex_split_bottom.cpp
+++ b/core/sql/executor/ex_split_bottom.cpp
@@ -461,11 +461,10 @@ ExOperStats * ex_split_bottom_tcb::doAllocateStatsEntry(CollHeap *heap,
if (ss != NULL)
((ExFragRootOperStats *)stat)->setQueryId(ss->getQueryId(), ss->getQueryIdLen());
}
- else if ((statsType == ComTdb::MEASURE_STATS) ||
- (statsType == ComTdb::ACCUMULATED_STATS))
+ else if (statsType == ComTdb::ACCUMULATED_STATS)
{
- // if measure or accumulated statistics are to be collected, allocate
- // one measure stats entry and insert it into the queue.
+ // if accumulated statistics are to be collected, allocate
+ // one stats entry and insert it into the queue.
// All executor operators that collect stats will use this
// entry to update stats.
// These stats are not associated with any particular
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/ex_split_bottom.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/ex_split_bottom.h b/core/sql/executor/ex_split_bottom.h
index 717777c..417dab8 100644
--- a/core/sql/executor/ex_split_bottom.h
+++ b/core/sql/executor/ex_split_bottom.h
@@ -85,16 +85,16 @@ public:
// retrieval of the virtual table function pointer of the class while
// unpacking. An empty constructor is enough.
// ---------------------------------------------------------------------
- NA_EIDPROC ex_split_bottom_tdb()
+ ex_split_bottom_tdb()
{}
- NA_EIDPROC virtual ~ex_split_bottom_tdb()
+ virtual ~ex_split_bottom_tdb()
{}
// ---------------------------------------------------------------------
// Build a TCB for this TDB. Redefined in the Executor project.
// ---------------------------------------------------------------------
- NA_EIDPROC virtual ex_tcb *build(ex_globals *globals);
+ virtual ex_tcb *build(ex_globals *globals);
ex_split_bottom_tcb *buildESPTcbTree(ExExeStmtGlobals * glob,
ExEspFragInstanceDir *espInstanceDir,
@@ -201,7 +201,7 @@ public:
void setLocalSendBottom(CollIndex s);
// Enforce query CPU limit.
- NA_EIDPROC virtual void cpuLimitExceeded();
+ virtual void cpuLimitExceeded();
private:
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/ex_split_top.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/ex_split_top.h b/core/sql/executor/ex_split_top.h
index 1c4bb6a..26a98cc 100644
--- a/core/sql/executor/ex_split_top.h
+++ b/core/sql/executor/ex_split_top.h
@@ -84,16 +84,16 @@ public:
// retrieval of the virtual table function pointer of the class while
// unpacking. An empty constructor is enough.
// ---------------------------------------------------------------------
- NA_EIDPROC ex_split_top_tdb()
+ ex_split_top_tdb()
{}
- NA_EIDPROC virtual ~ex_split_top_tdb()
+ virtual ~ex_split_top_tdb()
{}
// ---------------------------------------------------------------------
// Build a TCB for this TDB. Redefined in the Executor project.
// ---------------------------------------------------------------------
- NA_EIDPROC virtual ex_tcb *build(ex_globals *globals);
+ virtual ex_tcb *build(ex_globals *globals);
private:
// ---------------------------------------------------------------------
@@ -245,7 +245,7 @@ public:
virtual Int32 numChildren() const;
virtual const ex_tcb* getChild(Int32 pos) const;
- virtual NA_EIDPROC ExOperStats *doAllocateStatsEntry(CollHeap *heap,
+ virtual ExOperStats *doAllocateStatsEntry(CollHeap *heap,
ComTdb *tdb);
private:
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/ex_stored_proc.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/ex_stored_proc.h b/core/sql/executor/ex_stored_proc.h
index a4db173..22f032f 100644
--- a/core/sql/executor/ex_stored_proc.h
+++ b/core/sql/executor/ex_stored_proc.h
@@ -66,16 +66,16 @@ public:
// retrieval of the virtual table function pointer of the class while
// unpacking. An empty constructor is enough.
// ---------------------------------------------------------------------
- NA_EIDPROC ExStoredProcTdb()
+ ExStoredProcTdb()
{}
- NA_EIDPROC virtual ~ExStoredProcTdb()
+ virtual ~ExStoredProcTdb()
{}
// ---------------------------------------------------------------------
// Build a TCB for this TDB. Redefined in the Executor project.
// ---------------------------------------------------------------------
- NA_EIDPROC virtual ex_tcb *build(ex_globals *globals);
+ virtual ex_tcb *build(ex_globals *globals);
private:
// ---------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/ex_tcb.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/ex_tcb.h b/core/sql/executor/ex_tcb.h
index 3f744a9..c3ae5ba 100644
--- a/core/sql/executor/ex_tcb.h
+++ b/core/sql/executor/ex_tcb.h
@@ -62,33 +62,33 @@ class ex_tcb : public ExGod
{
public:
- NA_EIDPROC ex_tcb(const ComTdb & tdb,
+ ex_tcb(const ComTdb & tdb,
const short in_version,
ex_globals * g); // constructor
- NA_EIDPROC virtual ~ex_tcb(); // destroy
+ virtual ~ex_tcb(); // destroy
- NA_EIDPROC virtual void freeResources() = 0; // free resources
+ virtual void freeResources() = 0; // free resources
// register subtasks with scheduler
- NA_EIDPROC virtual void registerSubtasks();
+ virtual void registerSubtasks();
- NA_EIDPROC virtual ex_queue_pair getParentQueue() const = 0;
+ virtual ex_queue_pair getParentQueue() const = 0;
- NA_EIDPROC inline short getVersion() const { return version_; }
+ inline short getVersion() const { return version_; }
// access child TCBs via virtual methods
- NA_EIDPROC virtual const ex_tcb* getChild(Int32 pos) const = 0;
- NA_EIDPROC virtual Int32 numChildren() const = 0;
+ virtual const ex_tcb* getChild(Int32 pos) const = 0;
+ virtual Int32 numChildren() const = 0;
- NA_EIDPROC virtual Int32 fixup();
+ virtual Int32 fixup();
// return of TRUE means error, FALSE means all Ok.
- NA_EIDPROC virtual NABoolean reOpenTables();
- NA_EIDPROC virtual NABoolean closeTables();
+ virtual NABoolean reOpenTables();
+ virtual NABoolean closeTables();
// this method is called to rollback to a previously set savepoint.
- NA_EIDPROC virtual Int32 rollbackSavepoint();
+ virtual Int32 rollbackSavepoint();
// Three officially supported work methods: work, cancel, and resize.
// The default implementations make use of these work methods. Individual
@@ -96,45 +96,45 @@ public:
// to redefine some more virtual functions, such as registerSubtasks.
// The work() method is a pure virtual method, the other two have
// default implementations that may be sufficient for most TCBs.
- NA_EIDPROC virtual ExWorkProcRetcode work() = 0;
+ virtual ExWorkProcRetcode work() = 0;
// default static work proc for scheduler
// warning elimination (removed "inline")
- NA_EIDPROC static ExWorkProcRetcode sWork(ex_tcb *tcb)
+ static ExWorkProcRetcode sWork(ex_tcb *tcb)
{ return tcb->work(); }
- NA_EIDPROC virtual ExWorkProcRetcode workCancel();
+ virtual ExWorkProcRetcode workCancel();
// default static work proc for scheduler
- NA_EIDPROC static ExWorkProcRetcode sCancel(ex_tcb *tcb)
+ static ExWorkProcRetcode sCancel(ex_tcb *tcb)
{ return tcb->workCancel(); }
// methods to resize the parent up/down queues
- NA_EIDPROC virtual ExWorkProcRetcode workResize();
+ virtual ExWorkProcRetcode workResize();
// the static version
- NA_EIDPROC static ExWorkProcRetcode sResize(ex_tcb *tcb)
+ static ExWorkProcRetcode sResize(ex_tcb *tcb)
{ return tcb->workResize(); }
- NA_EIDPROC virtual void display() const {};
+ virtual void display() const {};
- NA_EIDPROC inline const ComTdb * getTdb() const { return &tdb; }
- NA_EIDPROC inline ex_globals * getGlobals() const { return globals_; }
+ inline const ComTdb * getTdb() const { return &tdb; }
+ inline ex_globals * getGlobals() const { return globals_; }
- NA_EIDPROC unsigned short getExpressionMode() const;
- NA_EIDPROC inline Space * getSpace() {return globals_->getSpace();}
- NA_EIDPROC inline CollHeap * getHeap() {return globals_->getDefaultHeap();}
+ unsigned short getExpressionMode() const;
+ inline Space * getSpace() {return globals_->getSpace();}
+ inline CollHeap * getHeap() {return globals_->getDefaultHeap();}
// helper methods to allocate parent queues and register queue resize tasks
- NA_EIDPROC void allocateParentQueues(ex_queue_pair &parentQueues,
+ void allocateParentQueues(ex_queue_pair &parentQueues,
NABoolean allocatePstate = TRUE);
- NA_EIDPROC void registerResizeSubtasks();
+ void registerResizeSubtasks();
- NA_EIDPROC virtual ex_tcb_private_state * allocatePstates(
+ virtual ex_tcb_private_state * allocatePstates(
Lng32 &numElems, // inout, desired/actual elements
Lng32 &pstateLength); // out, length of one element
- NA_EIDPROC void setStatsEntry(ExOperStats * statsEntry) {
+ void setStatsEntry(ExOperStats * statsEntry) {
statsEntry_ = statsEntry; }
// return stats entry, if stats are enabled.
- NA_EIDPROC ExOperStats * getStatsEntry()
+ ExOperStats * getStatsEntry()
{
return (getGlobals()->statsEnabled() ? statsEntry_ : NULL);
}
@@ -142,26 +142,26 @@ public:
// this method find the first set of children in the child tree
// that have a valid stats area and sets their parent id to the
// input tdb id.
- NA_EIDPROC void propagateTdbIdForStats(Lng32 tdbId);
+ void propagateTdbIdForStats(Lng32 tdbId);
- NA_EIDPROC void allocateStatsEntry(CollHeap * heap = NULL);
+ void allocateStatsEntry(CollHeap * heap = NULL);
- NA_EIDPROC virtual ExOperStats * doAllocateStatsEntry(CollHeap *heap,
+ virtual ExOperStats * doAllocateStatsEntry(CollHeap *heap,
ComTdb *tdb);
- NA_EIDPROC sql_buffer_pool * getPool() { return pool_; }
+ sql_buffer_pool * getPool() { return pool_; }
- NA_EIDPROC virtual NABoolean resizePoolInfo() { return FALSE; }
+ virtual NABoolean resizePoolInfo() { return FALSE; }
- NA_EIDPROC virtual void computeNeededPoolInfo(
+ virtual void computeNeededPoolInfo(
Int32 &numBuffs,
UInt32 &bufferSize,
UInt32 &poolSize);
- NA_EIDPROC Lng32 getTotalPoolSize()
+ Lng32 getTotalPoolSize()
{ return pool_->getTotalMemorySize();};
- NA_EIDPROC virtual void cleanup();
+ virtual void cleanup();
// **** information for GUI *** -------------
Int32 objectId;
@@ -175,22 +175,20 @@ public:
Int32 getObjectId() const { return objectId; }
#endif
- NA_EIDPROC ComTdb::ex_node_type getNodeType() const { return nodeType_; }
+ ComTdb::ex_node_type getNodeType() const { return nodeType_; }
// QSTUFF
- NA_EIDPROC NABoolean isHoldable() const { return holdable_; }
+ NABoolean isHoldable() const { return holdable_; }
// setHoldable is redefined by the partition access tcb
- NA_EIDPROC virtual void setHoldable(NABoolean h) { holdable_ = h;}
- NA_EIDPROC void propagateHoldable(NABoolean h);
+ virtual void setHoldable(NABoolean h) { holdable_ = h;}
+ void propagateHoldable(NABoolean h);
// QSTUFF
- NA_EIDPROC virtual NABoolean needStatsEntry();
-#ifndef __EID
- NA_EIDPROC void mergeStats(ExStatisticsArea *otherStats);
-#endif
+ virtual NABoolean needStatsEntry();
+ void mergeStats(ExStatisticsArea *otherStats);
- NA_EIDPROC virtual void cpuLimitExceeded();
- NA_EIDPROC inline char * getEyeCatcher()
+ virtual void cpuLimitExceeded();
+ inline char * getEyeCatcher()
{ return eyeCatcher_.name_for_sun_compiler; }
virtual short moveRowToUpQueue(
@@ -241,7 +239,7 @@ template <class T> class PstateAllocator
public:
#pragma nowarn(1103) // warning elimination
- NA_EIDPROC ex_tcb_private_state *allocatePstates(
+ ex_tcb_private_state *allocatePstates(
#pragma warn(1103) // warning elimination
ex_tcb *tcb,
Lng32 &numElems, // inout, desired/actual elements
@@ -257,7 +255,6 @@ public:
// __vec_new() in the executor, because it is part of the C++
// Runtime library.
-//SQ_LINUX #if defined(NA_HSC)
// Arguments do not match with any function 'new []'.
result = new(tcb->getSpace()/*,FALSE*/) T[numElems];
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/ex_tcb_private.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/ex_tcb_private.h b/core/sql/executor/ex_tcb_private.h
index 6e1861f..6ab98ae 100644
--- a/core/sql/executor/ex_tcb_private.h
+++ b/core/sql/executor/ex_tcb_private.h
@@ -65,16 +65,11 @@ class ex_tcb_private_state : public ExGod
Lng32 errorCode_;
public:
-NA_EIDPROC
ex_tcb_private_state();
-NA_EIDPROC
virtual ex_tcb_private_state * allocate_new(const ex_tcb * tcb);
-NA_EIDPROC
virtual ~ex_tcb_private_state();
-NA_EIDPROC
inline Lng32 getErrorCode(){return errorCode_;}
-NA_EIDPROC
inline void setErrorCode(Lng32 error_code){errorCode_ = error_code;}
};
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/ex_timeout.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/ex_timeout.h b/core/sql/executor/ex_timeout.h
index 5bb6c7f..8c5d95c 100644
--- a/core/sql/executor/ex_timeout.h
+++ b/core/sql/executor/ex_timeout.h
@@ -72,14 +72,14 @@ public:
// retrieval of the virtual table function pointer of the class while
// unpacking. An empty constructor is enough.
// ---------------------------------------------------------------------
- NA_EIDPROC ExTimeoutTdb() {}
+ ExTimeoutTdb() {}
- NA_EIDPROC virtual ~ExTimeoutTdb() {}
+ virtual ~ExTimeoutTdb() {}
// ---------------------------------------------------------------------
// Build a TCB for this TDB. Redefined in the Executor project.
// ---------------------------------------------------------------------
- NA_EIDPROC virtual ex_tcb *build(ex_globals *globals);
+ virtual ex_tcb *build(ex_globals *globals);
private:
// ---------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/ex_transaction.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ex_transaction.cpp b/core/sql/executor/ex_transaction.cpp
index 5b27ad6..437170b 100644
--- a/core/sql/executor/ex_transaction.cpp
+++ b/core/sql/executor/ex_transaction.cpp
@@ -54,16 +54,8 @@
#include "ex_error.h"
#include "ExSqlComp.h"
-#ifdef NA_CMPDLL
#include "CmpContext.h"
-#endif // NA_CMPDLL
-
-
-
#include "ExCextdecs.h"
-
-
-
#include "dtm/tm.h"
ExTransaction::ExTransaction(CliGlobals * cliGlob, CollHeap *heap)
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/ex_transaction.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/ex_transaction.h b/core/sql/executor/ex_transaction.h
index 702ce91..8c5ed61 100644
--- a/core/sql/executor/ex_transaction.h
+++ b/core/sql/executor/ex_transaction.h
@@ -335,16 +335,16 @@ public:
// retrieval of the virtual table function pointer of the class while
// unpacking. An empty constructor is enough.
// ---------------------------------------------------------------------
- NA_EIDPROC ExTransTdb()
+ ExTransTdb()
{}
- NA_EIDPROC virtual ~ExTransTdb()
+ virtual ~ExTransTdb()
{}
// ---------------------------------------------------------------------
// Build a TCB for this TDB. Redefined in the Executor project.
// ---------------------------------------------------------------------
- NA_EIDPROC virtual ex_tcb *build(ex_globals *globals);
+ virtual ex_tcb *build(ex_globals *globals);
private:
// ---------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/ex_tuple.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ex_tuple.cpp b/core/sql/executor/ex_tuple.cpp
index 55ea114..3f8b9b2 100644
--- a/core/sql/executor/ex_tuple.cpp
+++ b/core/sql/executor/ex_tuple.cpp
@@ -171,7 +171,7 @@ ExWorkProcRetcode ExTupleLeafTcb::work()
if (qparent.down->isEmpty())
return WORK_OK;
-#ifdef NA_DEBUG_C_RUNTIME
+#ifdef _DEBUG
//
// This block of code is for UDR testing only. It lets us create a
// situation where a non-UDR node in the dataflow tree returns
@@ -181,7 +181,7 @@ ExWorkProcRetcode ExTupleLeafTcb::work()
{
return WORK_BAD_ERROR;
}
-#endif // NA_DEBUG_C_RUNTIME
+#endif // _DEBUG
ex_queue_entry * pentry_down = qparent.down->getHeadEntry();
ExTuplePrivateState * pstate
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/ex_tuple.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/ex_tuple.h b/core/sql/executor/ex_tuple.h
index 08822f6..3a64db6 100644
--- a/core/sql/executor/ex_tuple.h
+++ b/core/sql/executor/ex_tuple.h
@@ -65,16 +65,16 @@ public:
// retrieval of the virtual table function pointer of the class while
// unpacking. An empty constructor is enough.
// ---------------------------------------------------------------------
- NA_EIDPROC ExTupleLeafTdb()
+ ExTupleLeafTdb()
{}
- NA_EIDPROC virtual ~ExTupleLeafTdb()
+ virtual ~ExTupleLeafTdb()
{}
// ---------------------------------------------------------------------
// Build a TCB for this TDB. Redefined in the Executor project.
// ---------------------------------------------------------------------
- NA_EIDPROC virtual ex_tcb *build(ex_globals *globals);
+ virtual ex_tcb *build(ex_globals *globals);
private:
// ---------------------------------------------------------------------
@@ -117,16 +117,16 @@ public:
// retrieval of the virtual table function pointer of the class while
// unpacking. An empty constructor is enough.
// ---------------------------------------------------------------------
- NA_EIDPROC ExTupleNonLeafTdb()
+ ExTupleNonLeafTdb()
{}
- NA_EIDPROC virtual ~ExTupleNonLeafTdb()
+ virtual ~ExTupleNonLeafTdb()
{}
// ---------------------------------------------------------------------
// Build a TCB for this TDB. Redefined in the Executor project.
// ---------------------------------------------------------------------
- NA_EIDPROC virtual ex_tcb *build(ex_globals *globals);
+ virtual ex_tcb *build(ex_globals *globals);
private:
// ---------------------------------------------------------------------
@@ -178,38 +178,32 @@ public:
HANDLE_SQLERROR
};
-NA_EIDPROC
+
ExTupleTcb(const ComTdbTuple & tupleTdb,
ex_globals * glob);
-NA_EIDPROC
~ExTupleTcb();
-NA_EIDPROC
virtual short work();
-NA_EIDPROC
void freeResources();
-NA_EIDPROC
ex_queue_pair getParentQueue() const
{
return (qparent);
}
-NA_EIDPROC
virtual ex_tcb_private_state * allocatePstates(
Lng32 &numElems, // inout, desired/actual elements
Lng32 &pstateLength); // out, length of one element
-NA_EIDPROC
Int32 orderedQueueProtocol() const
{
return ((const ComTdbTuple &)tdb).orderedQueueProtocol();
};
- NA_EIDPROC virtual Int32 numChildren() const { return 0;};
- NA_EIDPROC virtual const ex_tcb* getChild(Int32 pos) const { return NULL;}; //LCOV_EXCL_LINE
+ virtual Int32 numChildren() const { return 0;};
+ virtual const ex_tcb* getChild(Int32 pos) const { return NULL;}; //LCOV_EXCL_LINE
protected:
ex_queue_pair qparent;
@@ -219,13 +213,11 @@ protected:
// Atp and buffers to build expressions
atp_struct * workAtp_;
-NA_EIDPROC
ComTdbTuple & tupleTdb() const
{
return (ComTdbTuple &) tdb;
};
-NA_EIDPROC
Queue * tupleExprList() const { return tupleTdb().tupleExprList_; };
};
@@ -235,11 +227,9 @@ NA_EIDPROC
class ExTupleLeafTcb : public ExTupleTcb
{
public:
-NA_EIDPROC
ExTupleLeafTcb(const ExTupleLeafTdb & tupleTdb,
ex_globals * glob = 0);
-NA_EIDPROC
ExWorkProcRetcode work();
};
@@ -252,16 +242,14 @@ NA_EIDPROC
class ExTupleNonLeafTcb : public ExTupleTcb
{
public:
-NA_EIDPROC
ExTupleNonLeafTcb(const ExTupleNonLeafTdb & tupleTdb,
const ex_tcb & tcbChild,
ex_globals * glob = 0);
-NA_EIDPROC
ExWorkProcRetcode work();
- NA_EIDPROC virtual Int32 numChildren() const { return 1;};
- NA_EIDPROC virtual const ex_tcb* getChild(Int32 pos) const
+ virtual Int32 numChildren() const { return 1;};
+ virtual const ex_tcb* getChild(Int32 pos) const
{
ex_assert((pos >= 0), "");
if (pos == 0)
@@ -289,9 +277,7 @@ class ExTuplePrivateState : public ex_tcb_private_state
ExTupleTcb::TupleStep step_; // step in processing this parent row
public:
-NA_EIDPROC
ExTuplePrivateState(); //constructor
-NA_EIDPROC
~ExTuplePrivateState(); // destructor
};
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/ex_tuple_flow.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ex_tuple_flow.cpp b/core/sql/executor/ex_tuple_flow.cpp
index 4ef87de..a568a5c 100644
--- a/core/sql/executor/ex_tuple_flow.cpp
+++ b/core/sql/executor/ex_tuple_flow.cpp
@@ -45,10 +45,7 @@
#include "str.h"
#include "ExStats.h"
#include "ExpError.h"
-#ifndef __EID
#include "cli_stdh.h"
-#endif
-
/////////////////////////////////////////////////////////////////////////
//
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/ex_tuple_flow.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/ex_tuple_flow.h b/core/sql/executor/ex_tuple_flow.h
index b84584d..a4b1674 100644
--- a/core/sql/executor/ex_tuple_flow.h
+++ b/core/sql/executor/ex_tuple_flow.h
@@ -63,16 +63,16 @@ public:
// retrieval of the virtual table function pointer of the class while
// unpacking. An empty constructor is enough.
// ---------------------------------------------------------------------
- NA_EIDPROC ExTupleFlowTdb()
+ ExTupleFlowTdb()
{}
- NA_EIDPROC virtual ~ExTupleFlowTdb()
+ virtual ~ExTupleFlowTdb()
{}
// ---------------------------------------------------------------------
// Build a TCB for this TDB. Redefined in the Executor project.
// ---------------------------------------------------------------------
- NA_EIDPROC virtual ex_tcb *build(ex_globals *globals);
+ virtual ex_tcb *build(ex_globals *globals);
private:
// ---------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/ex_union.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/ex_union.h b/core/sql/executor/ex_union.h
index 9460157..279ff07 100644
--- a/core/sql/executor/ex_union.h
+++ b/core/sql/executor/ex_union.h
@@ -72,16 +72,16 @@ public:
// retrieval of the virtual table function pointer of the class while
// unpacking. An empty constructor is enough.
// ---------------------------------------------------------------------
- NA_EIDPROC ex_union_tdb()
+ ex_union_tdb()
{}
- NA_EIDPROC virtual ~ex_union_tdb()
+ virtual ~ex_union_tdb()
{}
// ---------------------------------------------------------------------
// Build a TCB for this TDB. Redefined in the Executor project.
// ---------------------------------------------------------------------
- NA_EIDPROC virtual ex_tcb *build(ex_globals *globals);
+ virtual ex_tcb *build(ex_globals *globals);
private:
// ---------------------------------------------------------------------
@@ -133,35 +133,27 @@ public:
};
// Constructor
-NA_EIDPROC
ex_union_tcb(const ex_union_tdb & union_tdb, //
const ex_tcb * left_tcb, // left queue pair
const ex_tcb * right_tcb, // right queue pair
ex_globals *glob
);
-NA_EIDPROC
~ex_union_tcb();
-NA_EIDPROC
void freeResources(); // free resources
-NA_EIDPROC
virtual void registerSubtasks();
-NA_EIDPROC
ExWorkProcRetcode work(); // not used for this TCB
-NA_EIDPROC
ExWorkProcRetcode workDown(); // pass requests down to child
-NA_EIDPROC
ExWorkProcRetcode workUp(); // pass results up to parent
-NA_EIDPROC
+
static ExWorkProcRetcode sWorkUp(ex_tcb *tcb)
{ return ((ex_union_tcb *) tcb)->workUp(); }
-NA_EIDPROC
static ExWorkProcRetcode sWorkDown(ex_tcb *tcb)
{ return ((ex_union_tcb *) tcb)->workDown(); }
-NA_EIDPROC
+
static ExWorkProcRetcode sCancel(ex_tcb *tcb)
{ return ((ex_union_tcb *) tcb)->processCancel(); }
@@ -191,22 +183,16 @@ virtual const ex_tcb* getChild(Int32 pos) const
return NULL;
}
-NA_EIDPROC
inline ex_expr * moveExpr(Int32 i)
{ return (i == 0 ? union_tdb().leftExpr_ : union_tdb().rightExpr_); }
-NA_EIDPROC
inline ex_expr * mergeExpr() const { return union_tdb().mergeExpr_; }
-NA_EIDPROC
inline ex_expr * condExpr() const { return union_tdb().condExpr_; }
-NA_EIDPROC
inline ex_expr * trigExceptExpr() const { return union_tdb().trigExceptExpr_;}
-NA_EIDPROC
virtual Int32 numChildren() const { return union_tdb().numChildren(); }
-//NA_EIDPROC
// virtual const ex_tcb* getChild(int pos) const;
virtual Int32 hasNoOutputs() const {return FALSE;};
protected:
@@ -219,13 +205,9 @@ protected:
queue_index processedInputs_; // next parent down queue entry to process
-NA_EIDPROC
virtual void start(); // send next request down to children
-NA_EIDPROC
virtual void stop(); // send EOD to parent
-NA_EIDPROC
virtual ExWorkProcRetcode processCancel(); // check for cancelled request
-NA_EIDPROC
virtual void processError(ex_union_private_state &pstate, Int32 &endOfData,
atp_struct* atp);
@@ -235,7 +217,6 @@ NA_EIDPROC
// no the method returns whether the current request is at end of
// data (EOD entries in both child queues) or not. The procedure
// also needs to set pstate.childStates_[i] to DONE_, if appropriate.
-NA_EIDPROC
virtual Int32 whichSide(ex_union_private_state & pstate,
Int32 &side,
Int32 &endOfData);
@@ -249,14 +230,12 @@ class ex_m_union_tcb : public ex_union_tcb
{
public:
// Constructor
-NA_EIDPROC
ex_m_union_tcb(const ex_union_tdb & union_tdb, //
const ex_tcb * left_tcb, // left queue pair
const ex_tcb * right_tcb, // right queue pair
ex_globals *glob
);
-NA_EIDPROC
virtual Int32 whichSide(ex_union_private_state & pstate,
Int32 &side,
Int32 &endOfData);
@@ -270,7 +249,6 @@ class ex_o_union_tcb : public ex_union_tcb
{
public:
// Constructor
-NA_EIDPROC
ex_o_union_tcb(const ex_union_tdb & union_tdb, //
const ex_tcb * left_tcb, // left queue pair
const ex_tcb * right_tcb, // right queue pair
@@ -279,52 +257,40 @@ NA_EIDPROC
Int32 hasNoOutputs
);
-NA_EIDPROC
virtual Int32 whichSide(ex_union_private_state & pstate,
Int32 &side,
Int32 &endOfData);
-NA_EIDPROC
ExWorkProcRetcode workDownLeft(); // pass requests down to child
ExWorkProcRetcode workDownBlockedLeft(); // pass requests down to child
-NA_EIDPROC
ExWorkProcRetcode workDownRight(); // pass requests down to child
-NA_EIDPROC
virtual ExWorkProcRetcode processCancel(); // Cancel request
-NA_EIDPROC
static ExWorkProcRetcode sWorkPhase1(ex_tcb *tcb)
{ return ((ex_o_union_tcb *) tcb)->workDownLeft(); }
-NA_EIDPROC
static ExWorkProcRetcode sWorkBlockedPhase1(ex_tcb *tcb)
{ return ((ex_o_union_tcb *) tcb)->workDownBlockedLeft(); }
-NA_EIDPROC
static ExWorkProcRetcode sWorkPhase2(ex_tcb *tcb)
{ return ((ex_o_union_tcb *) tcb)->workDownRight(); }
-NA_EIDPROC
static ExWorkProcRetcode sCancel(ex_tcb *tcb)
{ return ((ex_o_union_tcb *) tcb)->processCancel(); }
-NA_EIDPROC
virtual void registerSubtasks();
virtual Int32 hasNoOutputs() const {return hasNoOutputs_;};
private:
-NA_EIDPROC
void startLeftchild();
-NA_EIDPROC
void startRightchild();
// Helper to determine which child's (left or right) parent is farther
// from the parent down ex_queue's head_.
-NA_EIDPROC
queue_index whichSideParentIndex();
short rightRequestCnt_; // a counter for pipelining requests to right child
@@ -360,42 +326,32 @@ NA_EIDPROC
class ex_c_union_tcb : public ex_union_tcb
{
public:
-NA_EIDPROC
ex_c_union_tcb(const ex_union_tdb &union_tdb,
const ex_tcb *left_tcb,
const ex_tcb *right_tcb,
ex_globals *glob);
-NA_EIDPROC
virtual void registerSubtasks();
-NA_EIDPROC
ExWorkProcRetcode condWorkDown();
-NA_EIDPROC
static ExWorkProcRetcode sCondWorkDown(ex_tcb *tcb)
{ return ((ex_c_union_tcb *) tcb)->condWorkDown(); }
//issue a EXE_CS_EOD or a EXE_CS_EOD_ROLLBACK_ERROR type error/warning for
//conditional union
-NA_EIDPROC
void processEODErrorOrWarning(NABoolean isWarning) ;
protected:
-NA_EIDPROC
virtual void start();
-NA_EIDPROC
virtual void stop();
-NA_EIDPROC
virtual Int32 whichSide(ex_union_private_state &pstate,
Int32 &side,
Int32 &endOfData);
-NA_EIDPROC
virtual ExWorkProcRetcode processCancel();
-NA_EIDPROC
virtual void processError(ex_union_private_state &pstate, Int32 &endOfData,
atp_struct* atp);
@@ -427,19 +383,14 @@ class ex_union_private_state : public ex_tcb_private_state
Int32 whichChild_; // which side of conditional union to execute.
-NA_EIDPROC
void init(); // initialize state
public:
-NA_EIDPROC
ex_union_private_state(const ex_union_tcb * tcb); //constructor
-NA_EIDPROC
ex_tcb_private_state * allocate_new(const ex_tcb * tcb);
-NA_EIDPROC
~ex_union_private_state(); // destructor
-NA_EIDPROC
Int32 validChild() const {return whichChild_ >= 0 && whichChild_ <=1; }
};
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/hash_table.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/hash_table.cpp b/core/sql/executor/hash_table.cpp
index 884355e..d2baf63 100644
--- a/core/sql/executor/hash_table.cpp
+++ b/core/sql/executor/hash_table.cpp
@@ -34,7 +34,6 @@
#include "hash_table.h"
void HashRow::print(ULng32 rowlength) {
-#ifndef __EID
printf("\tHashValue: %6d\n\tData: ", hashValue_);
unsigned char * data = (unsigned char *)this;
ULng32 i = 0;
@@ -50,7 +49,6 @@ void HashRow::print(ULng32 rowlength) {
else
printf ("%1d0", i/10);
printf ("\n");
-#endif
}
HashTableCursor::HashTableCursor() {
@@ -87,10 +85,8 @@ HashTable::HashTable(ULng32 headerCount,
singleChainLastRow_(NULL) {
#ifdef _DEBUG
-#ifndef __EID
if ( getenv("ALLOW_HV_DUPS" ) ) noHashValueDups_ = FALSE; // for testing
#endif
-#endif
headerCount_ *= 2; // the first iteration below would divide it back
@@ -292,9 +288,6 @@ ULng32 HashTable::resize(NABoolean enoughMemory) {
return memAdded ;
}
-#ifndef __EID
-// this is only used by Hash Join, so does not need to be in EID code
-
// HashTable::insertUniq()
// An insert method used by UniqueHashJoin.
// Assumes input is unique and so does not need to check for
@@ -340,7 +333,6 @@ void HashTable::insertUniq(HashRow *newRow)
return;
}
-#endif
///////////////////////////////////////////////////////////////////
// Add a row to the end of the first hash header. The purpose
@@ -539,9 +531,6 @@ void HashTable::position(HashTableCursor * cursor,
cursor->init();
}
-#ifndef __EID
-// this is only used by Hash Join, so does not need to be in EID code
-
// HashTable::positionUniq()
// A position method used by UniqueHashJoin.
// Assumes entries are unique and so does not need to check for
@@ -600,7 +589,6 @@ ex_expr::exp_return_type HashTable::positionUniq(HashRow **currRow,
// Not found
return ex_expr::EXPR_FALSE;
}
-#endif
/////////////////////////////////////////////////////////
// positions to the first entry in the hash table.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/hash_table.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/hash_table.h b/core/sql/executor/hash_table.h
index 5819168..371d32e 100644
--- a/core/sql/executor/hash_table.h
+++ b/core/sql/executor/hash_table.h
@@ -70,18 +70,14 @@ class HashTableCursor : public NABasicObject {
ULng32 currHeader_;
public:
-NA_EIDPROC
HashTableCursor();
-NA_EIDPROC
~HashTableCursor();
-NA_EIDPROC
void init() {
beginRow_ =
endRow_ =
currRow_ = NULL;
currHeader_ = 0;
};
-NA_EIDPROC
inline HashRow * getBeginRow() {return beginRow_;};
};
@@ -91,11 +87,8 @@ NA_EIDPROC
class HashTableHeader {
friend class HashTable;
public:
-NA_EIDPROC
HashTableHeader();
-NA_EIDPROC
inline ~HashTableHeader() {};
-NA_EIDPROC
void init();
private:
// for now we disable the rowCount_. This cuts the size of the hash table
@@ -139,20 +132,16 @@ public:
// doResize: If TRUE (HGB) then this table is resizable - when the table
// becomes %75 full, then allocate a new one of twice the
// previous size, move the entries and deallocate the old one.
-NA_EIDPROC
HashTable(ULng32 headerCount,
NABoolean evenFactor,
ULng32 primeFactor,
NABoolean noHVDups = TRUE,
NABoolean doResize = FALSE
);
-NA_EIDPROC
~HashTable();
-NA_EIDPROC
void init();
-NA_EIDPROC
void insert(atp_struct * workAtp,
HashRow * newRow,
tupp& workAtpTupp1,
@@ -160,38 +149,26 @@ NA_EIDPROC
ex_expr * searchExpr);
// Used only by Hash-Groupby; return TRUE is HT need be resized
-NA_EIDPROC
NABoolean insert(HashRow * newRow);
// Used only by Hash-Groupby; resize the HT (only if enough memory)
-NA_EIDPROC
ULng32 resize(NABoolean enoughMemory);
-#ifndef __EID
- // this is only used by Hash Join, so does not need to be in EID code
-
// An insert method used by UniqueHashJoin.
// Assumes input is unique and so does not need to check for
// duplicates.
// Entries are inserted in HashValue order.
//
- NA_EIDPROC
void insertUniq(HashRow *newRow);
-#endif
-NA_EIDPROC
void insertSingleChain(HashRow * newRow);
-NA_EIDPROC
void convertToOffsets();
-NA_EIDPROC
HashRow * getNext(HashTableCursor * cursor);
-NA_EIDPROC
void position(HashTableCursor * cursor);
-NA_EIDPROC
void position(HashTableCursor * cursor,
atp_struct * rowAtp,
atp_struct * workAtp,
@@ -202,43 +179,32 @@ NA_EIDPROC
// (anti)semi-joins.
NABoolean returnOrdered = FALSE );
-#ifndef __EID
- // this is only used by Hash Join, so does not need to be in EID code
-
// A position method used by UniqueHashJoin.
// Assumes entries are unique and so does not need to check for
// duplicates.
// Returns first match found.
//
- NA_EIDPROC
ex_expr::exp_return_type positionUniq(HashRow **currRow,
atp_struct * leftRowAtp,
atp_struct * workAtp,
short rightRowAtpIndex,
ex_expr * searchExpr,
SimpleHashValue hashValue);
-#endif
-NA_EIDPROC
void positionSingleChain(HashTableCursor * cursor);
-NA_EIDPROC
inline ULng32 getHeaderCount() const {
return headerCount_;
};
-NA_EIDPROC
ULng32 getChainSize(ULng32 i);
// In case the object was created, but not enough memory for the actual HT
-NA_EIDPROC
inline NABoolean noTableAllocated() { return header_ == NULL ; };
// Return the size the HT would be resized-to (used to check mem availability)
-NA_EIDPROC
ULng32 resizeTo() { return headerCount_ * HT_RESIZE_FACTOR ; };
-NA_EIDPROC
inline NABoolean originalSize() { return originalSize_ ; };
private:
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/key_range.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/key_range.h b/core/sql/executor/key_range.h
index f7d0f5e..e493d58 100644
--- a/core/sql/executor/key_range.h
+++ b/core/sql/executor/key_range.h
@@ -95,21 +95,21 @@ protected:
public:
- NA_EIDPROC keyRangeEx(const keyRangeGen & tdb_key,
+ keyRangeEx(const keyRangeGen & tdb_key,
ex_globals * globals,
const short in_version,
sql_buffer_pool *pool);
- NA_EIDPROC virtual ~keyRangeEx();
+ virtual ~keyRangeEx();
- NA_EIDPROC virtual void freeResources(); // free resources
+ virtual void freeResources(); // free resources
- NA_EIDPROC virtual void release(); // release
+ virtual void release(); // release
- NA_EIDPROC virtual void display() const {}; // LCOV_EXCL_LINE
+ virtual void display() const {}; // LCOV_EXCL_LINE
// key range iterator methods
- NA_EIDPROC virtual ExeErrorCode initNextKeyRange(sql_buffer_pool *pool,
+ virtual ExeErrorCode initNextKeyRange(sql_buffer_pool *pool,
atp_struct *atp0) = 0;
enum getNextKeyRangeReturnType { NO_MORE_RANGES,
@@ -117,14 +117,14 @@ public:
PROBE_RANGE,
EXPRESSION_ERROR };
- NA_EIDPROC virtual getNextKeyRangeReturnType getNextKeyRange(
+ virtual getNextKeyRangeReturnType getNextKeyRange(
atp_struct *atp0,NABoolean fetchRangeHadRows,
NABoolean detectNullRange = TRUE) = 0;
// on the next method, we pass in NULL if a probe resulted in no
// data; we pass in the encoded key value if data was obtained
// LCOV_EXCL_START
- NA_EIDPROC virtual void reportProbeResult(char *)
+ virtual void reportProbeResult(char *)
{
ex_assert(0,"reportProbeResult() was called when it shouldn't have been");
};
@@ -133,19 +133,19 @@ public:
// when getNextKeyRange() returns FETCH_RANGE or PROBE_RANGE, the
// caller should call the next four methods to get its hands on the
// key values
- NA_EIDPROC tupp & getBkData()
+ tupp & getBkData()
{ return bkData_; };
- NA_EIDPROC tupp & getEkData()
+ tupp & getEkData()
{ return ekData_; };
- NA_EIDPROC short getBkExcludeFlag()
+ short getBkExcludeFlag()
{ return bkExcludeFlag_; };
- NA_EIDPROC short getEkExcludeFlag()
+ short getEkExcludeFlag()
{ return ekExcludeFlag_; };
- NA_EIDPROC ULng32 getKeyLength()
+ ULng32 getKeyLength()
{ return tdbKey_.getKeyLength(); };
};
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/key_single_subset.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/key_single_subset.h b/core/sql/executor/key_single_subset.h
index 370c9aa..7c90165 100644
--- a/core/sql/executor/key_single_subset.h
+++ b/core/sql/executor/key_single_subset.h
@@ -73,7 +73,7 @@ private:
public:
- NA_EIDPROC keySingleSubsetEx(const keyRangeGen & tdb_key,
+ keySingleSubsetEx(const keyRangeGen & tdb_key,
const short in_version,
sql_buffer_pool *pool,
ex_globals *g,
@@ -81,42 +81,42 @@ public:
const ex_tcb * tcb);
- NA_EIDPROC virtual ~keySingleSubsetEx();
+ virtual ~keySingleSubsetEx();
- // NA_EIDPROC virtual void freeResources(); -- just inherit from base class
+ // virtual void freeResources(); -- just inherit from base class
- NA_EIDPROC virtual void display() const {};
+ virtual void display() const {};
// key range iterator methods
- NA_EIDPROC virtual ExeErrorCode initNextKeyRange(sql_buffer_pool *pool,
+ virtual ExeErrorCode initNextKeyRange(sql_buffer_pool *pool,
atp_struct *atp0);
- NA_EIDPROC virtual getNextKeyRangeReturnType getNextKeyRange(
+ virtual getNextKeyRangeReturnType getNextKeyRange(
atp_struct *atp0,NABoolean fetchRangeHadRows,
NABoolean detectNullRange = TRUE);
// inlines to save some typing
- NA_EIDPROC inline keySingleSubsetGen & tdbBeginEndKey() const
+ inline keySingleSubsetGen & tdbBeginEndKey() const
{ return (keySingleSubsetGen &)tdbKey_; }
- NA_EIDPROC inline ex_expr * bkPred() const
+ inline ex_expr * bkPred() const
{ return tdbBeginEndKey().bkPred(); };
- NA_EIDPROC inline ex_expr * ekPred() const
+ inline ex_expr * ekPred() const
{ return tdbBeginEndKey().ekPred(); };
- NA_EIDPROC inline ex_expr * bkExcludedExpr() const
+ inline ex_expr * bkExcludedExpr() const
{ return tdbBeginEndKey().bkExcludedExpr(); }
- NA_EIDPROC inline ex_expr * ekExcludedExpr() const
+ inline ex_expr * ekExcludedExpr() const
{ return tdbBeginEndKey().ekExcludedExpr(); }
- NA_EIDPROC inline short isBkeyExcluded() const
+ inline short isBkeyExcluded() const
{ return tdbBeginEndKey().isBkeyExcluded();}
- NA_EIDPROC inline short isEkeyExcluded() const
+ inline short isEkeyExcluded() const
{ return tdbBeginEndKey().isEkeyExcluded();}
- NA_EIDPROC inline Lng32 getExcludeFlagValue() const
+ inline Lng32 getExcludeFlagValue() const
{ return excludeFlag_; }
};
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/rcb.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/rcb.h b/core/sql/executor/rcb.h
index 698e027..178ea35 100644
--- a/core/sql/executor/rcb.h
+++ b/core/sql/executor/rcb.h
@@ -18,53 +18,3 @@
// under the License.
//
// @@@ END COPYRIGHT @@@
-struct field_struct
-{
- char flags;
- char type;
-
- short char_len;
-
- short exploded_offset;
- short offset_ix;
-
- short default_offset;
-
-};
-
-
-
-struct rcb_struct
-{
- short eye_catcher;
- short rcblen;
- short fcbnum;
- short kcbnum;
-
- short vsn[3];
-
- short kfield_off;
-
- short last_index_col_ix;
-
- short signed_kfield_off;
-
- char signed_kfield_max;
- char unsigned_dec_kfield_flg;
-
- short flags2;
-
- short sect_len;
-
- short ttag;
- short tflags;
-
- short max_packed_reclen;
-
- short max_exp_reclen;
- short flags;
- short default_area_len;
- short num_entries;
-
- field_struct field[1];
-}; // rcb_struct
[21/30] incubator-trafodion git commit: TRAFODION-2731 CodeCleanup:
Remove obsolete, legacy and unused code
Posted by an...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/comexe/LateBindInfo.cpp
----------------------------------------------------------------------
diff --git a/core/sql/comexe/LateBindInfo.cpp b/core/sql/comexe/LateBindInfo.cpp
index e96d75f..c49f97e 100644
--- a/core/sql/comexe/LateBindInfo.cpp
+++ b/core/sql/comexe/LateBindInfo.cpp
@@ -42,11 +42,9 @@
#include "exp_stdh.h"
#include "exp_tuple_desc.h"
#include "ComQueue.h"
-
-#if !defined(__EID) && !defined(ARKFS_OPEN)
#include "ComResWords.h"
#include "ComDistribution.h"
-#endif
+
//////////////////////////////////////////////////////////////////
// Constructor: UninitializedMvName
// Description:
@@ -210,13 +208,12 @@ Lng32 LateNameInfoList::unpack(void * base, void * reallocator)
return NAVersionedObject::unpack(base, reallocator);
}
-AnsiOrNskName::AnsiOrNskName(char *inName)
+AnsiName::AnsiName(char *inName)
{
Int32 len;
extName_[0] = '\0';
intName_[0] = '\0';
- isNskName_ = FALSE;
noOfParts_ = 0;
len = str_len(inName);
if (len < sizeof(extName_))
@@ -234,7 +231,7 @@ AnsiOrNskName::AnsiOrNskName(char *inName)
isValid_ = FALSE;
}
-Int16 AnsiOrNskName::convertAnsiOrNskName(bool doCheck)
+Int16 AnsiName::convertAnsiName(bool doCheck)
{
// If doCheck is false, this function will not uppercase the name and will not check for
@@ -269,7 +266,6 @@ Int16 AnsiOrNskName::convertAnsiOrNskName(bool doCheck)
noOfParts_ = 0;
partPtr = parts_[noOfParts_];
- isNskName_ = FALSE;
// Remove leading spaces
while (*ptr != '\0' && *ptr == ' ')
*ptr++;
@@ -284,7 +280,6 @@ Int16 AnsiOrNskName::convertAnsiOrNskName(bool doCheck)
return -1;
else
{
- isNskName_ = TRUE;
if (*(ptr) == '$')
dollarFound = TRUE;
}
@@ -293,10 +288,7 @@ Int16 AnsiOrNskName::convertAnsiOrNskName(bool doCheck)
}
else
return -1; // Error when all are spaces
- if (isNskName_)
- partCheckLen = 8; // NskNameLen
- else
- partCheckLen = ComAnsiNamePart::MAX_IDENTIFIER_INT_LEN;
+ partCheckLen = ComAnsiNamePart::MAX_IDENTIFIER_INT_LEN;
while(*ptr != '\0')
{
switch (*ptr)
@@ -364,16 +356,10 @@ Int16 AnsiOrNskName::convertAnsiOrNskName(bool doCheck)
ptr++;
totalLen++;
}
- if (isNskName_)
- {
- if (noOfParts_ >= 3)
- return -1;
- }
- else
- {
- if (noOfParts_ >= 2)
- return -1;
- }
+
+ if (noOfParts_ >= 2)
+ return -1;
+
partBegin = TRUE;
partLen = 0;
*partPtr = '\0';
@@ -386,41 +372,11 @@ Int16 AnsiOrNskName::convertAnsiOrNskName(bool doCheck)
delimited = FALSE;
noOfParts_++;
partPtr = parts_[noOfParts_];
- if (isNskName_)
- {
- if (noOfParts_ == 1 && *ptr != '\0')
+ if (*ptr != '\0' && *ptr != '\"') // Check that char is Alpha if not in quotes
{
- if (! dollarFound)
- {
- if (*ptr != '$')
- return -1;
- }
- else
- {
- if (*ptr != '\"')
- {
- if (! isAlpha8859_1((unsigned char)(*ptr)))
- return -1;
- }
- }
+ if (! isAlpha8859_1((unsigned char)(*ptr)))
+ return -1;
}
- else
- {
- if (*ptr != '\0' && *ptr != '\"')
- {
- if (! isAlpha8859_1((unsigned char)(*ptr)))
- return -1;
- }
- }
- }
- else
- {
- if (*ptr != '\0' && *ptr != '\"') // Check that char is Alpha if not in quotes
- {
- if (! isAlpha8859_1((unsigned char)(*ptr)))
- return -1;
- }
- }
}
else
{
@@ -547,7 +503,7 @@ Int16 AnsiOrNskName::convertAnsiOrNskName(bool doCheck)
return 0;
}
-Int16 AnsiOrNskName::extractParts(Lng32 &numParts,
+Int16 AnsiName::extractParts(Lng32 &numParts,
char *parts[])
{
Int16 ret;
@@ -555,7 +511,7 @@ Int16 AnsiOrNskName::extractParts(Lng32 &numParts,
if (! isValid_)
{
- if ((ret = convertAnsiOrNskName(FALSE)) == -1)
+ if ((ret = convertAnsiName(FALSE)) == -1)
return ret;
}
numParts = noOfParts_;
@@ -564,7 +520,7 @@ Int16 AnsiOrNskName::extractParts(Lng32 &numParts,
return 0;
}
-Int16 AnsiOrNskName::equals(AnsiOrNskName *inName)
+Int16 AnsiName::equals(AnsiName *inName)
{
// Check if the external name are equal
if (str_cmp_ne(inName->extName_, extName_) == 0)
@@ -573,12 +529,12 @@ Int16 AnsiOrNskName::equals(AnsiOrNskName *inName)
{
if (! isValid_)
{
- if (convertAnsiOrNskName(FALSE) != 0)
+ if (convertAnsiName(FALSE) != 0)
return -1;
}
if (! inName->isValid_)
{
- if (inName->convertAnsiOrNskName() != 0)
+ if (inName->convertAnsiName() != 0)
return -1;
}
if (str_cmp_ne(inName->intName_, intName_) == 0)
@@ -588,45 +544,45 @@ Int16 AnsiOrNskName::equals(AnsiOrNskName *inName)
}
}
-char *AnsiOrNskName::getInternalName()
+char *AnsiName::getInternalName()
{
if (! isValid_)
{
- if (convertAnsiOrNskName() != 0)
+ if (convertAnsiName() != 0)
return NULL;
}
return intName_;
}
-char *AnsiOrNskName::getExternalName()
+char *AnsiName::getExternalName()
{
- if (isValid_ && !isNskName_)
+ if (isValid_)
// Build the ANSI name from the individual parts
ComBuildANSIName (parts_[0], parts_[1], parts_[2], extName_, sizeof(extName_));
return extName_;
}
-AnsiOrNskName *LateNameInfo::getLastUsedName(NAMemory *heap)
+AnsiName *LateNameInfo::getLastUsedName(NAMemory *heap)
{
- AnsiOrNskName *ansiName;
+ AnsiName *ansiName;
NABasicPtr nameStr;
void * addr;
if (! isLastUsedNameEmbedded())
{
addr = *((void **)lastUsedAnsiName_);
- return (AnsiOrNskName *)addr;
+ return (AnsiName *)addr;
}
else
{
if (heap == NULL)
return NULL;
if (isLastUsedNameCompEmbedded())
- ansiName = new (heap) AnsiOrNskName(lastUsedAnsiName_);
+ ansiName = new (heap) AnsiName(lastUsedAnsiName_);
else
{
memcpy((void *)&nameStr, lastUsedAnsiName_, sizeof(nameStr));
- ansiName = new (heap) AnsiOrNskName(nameStr.getPointer());
+ ansiName = new (heap) AnsiName(nameStr.getPointer());
}
*(void **)lastUsedAnsiName_ = (void *)ansiName;
setLastUsedNameMode(TRUE);
@@ -634,7 +590,7 @@ AnsiOrNskName *LateNameInfo::getLastUsedName(NAMemory *heap)
}
}
-Int16 AnsiOrNskName::fillInMissingParts(char *schemaName)
+Int16 AnsiName::fillInMissingParts(char *schemaName)
{
char *ptr;
char *tgt;
@@ -647,11 +603,11 @@ Int16 AnsiOrNskName::fillInMissingParts(char *schemaName)
if (! isValid_)
{
- if (convertAnsiOrNskName() != 0)
+ if (convertAnsiName() != 0)
return -1;
}
partsToFill = (Int16)(3 - noOfParts_);
- if (isNskName_ || partsToFill == 0)
+ if (partsToFill == 0)
return 1;
// Remove leading blanks in the schemaName
ptr = schemaName;
@@ -730,7 +686,7 @@ Int16 AnsiOrNskName::fillInMissingParts(char *schemaName)
extName_[totalLen] ='\0';
isValid_ = FALSE;
isError_ = FALSE;
- retCode = convertAnsiOrNskName();
+ retCode = convertAnsiName();
if (retCode != -1 && noOfParts_ != 3)
retCode = -1;
return retCode;
@@ -762,9 +718,9 @@ void LateNameInfo::setLastUsedName(char *name, NAMemory *heap)
}
-void LateNameInfo::setLastUsedName(AnsiOrNskName *name)
+void LateNameInfo::setLastUsedName(AnsiName *name)
{
- AnsiOrNskName *ansiName;
+ AnsiName *ansiName;
if (! isLastUsedNameEmbedded())
{
@@ -802,7 +758,7 @@ void LateNameInfo::setCompileTimeName(char *name, NAMemory *heap)
char *LateNameInfo::lastUsedAnsiName()
{
- AnsiOrNskName *name;
+ AnsiName *name;
NABasicPtr nameStr;
name = getLastUsedName(NULL);
@@ -822,7 +778,7 @@ char *LateNameInfo::lastUsedAnsiName()
char *LateNameInfo::lastUsedExtAnsiName()
{
- AnsiOrNskName *name;
+ AnsiName *name;
NABasicPtr nameStr;
name = getLastUsedName(NULL);
@@ -842,7 +798,7 @@ char *LateNameInfo::lastUsedExtAnsiName()
void LateNameInfo::zeroLastUsedAnsiName()
{
- AnsiOrNskName *ansiName;
+ AnsiName *ansiName;
if (! isLastUsedNameEmbedded())
{
@@ -917,138 +873,6 @@ void LateNameInfo::resetRuntimeFlags()
runtimeFlags_ = 0;
}
-bool AnsiOrNskName::isNskName()
-{
- if (! isValid_)
- {
- if (convertAnsiOrNskName() != 0)
- return FALSE;
- }
- return isNskName_;
-}
-
-Int16 AnsiOrNskName::updateNSKInternalName(char *inName)
-{
- if (isError_ || (! isValid_))
- return -1;
- if (noOfParts_ == 4)
- return -1;
- char *ptr, *tgt, *partPtr;
- Int32 len;
- Int16 partsToFill, partsFilled;
-
-
- char temp[ComAnsiNamePart::MAX_ANSI_NAME_EXT_LEN+1];
-
- len = str_len(extName_);
- str_cpy_all(temp, extName_, len);
- temp[len] = '\0';
-
- partsToFill = (Int16)(4 - noOfParts_);
- partsFilled = 0;
- // Move down the parts
- Int32 i, j;
- for (i = 3, j = noOfParts_-1 ; j >= 0 ; i--, j--)
- memcpy(parts_[i], parts_[j], ComAnsiNamePart::MAX_IDENTIFIER_INT_LEN+1);
- ptr = inName;
- partPtr = parts_[0];
- tgt = extName_;
- // Copy the system name and volume name if needed
- while (*ptr != '\0')
- {
- *tgt = *ptr;
- tgt++;
- if (*ptr == '.')
- {
- *partPtr = '\0';
- partsFilled++;
- partPtr = parts_[partsFilled];
- if (partsFilled == partsToFill || partsFilled == 2)
- {
- ptr++;
- break;
- }
- }
- else
- {
- *partPtr = *ptr;
- partPtr++;
- }
- ptr++;
- }
- *tgt = '\0';
- // Copy the subvolume and quote if reserved name in extName
- if (partsFilled < partsToFill)
- {
- while (*ptr != '\0' && *ptr != '.')
- {
- *partPtr = *ptr;
- ptr++;
- partPtr++;
- }
- // zero-terminate
- *partPtr = '\0';
-
- if (*ptr == '\0')
- return -1;
- if (IsSqlReservedWord(parts_[2]))
- {
- *tgt = '\"';
- tgt++;
- *tgt = '\0';
- str_cat(extName_, parts_[2], extName_);
- str_cat(extName_, "\".", extName_);
- }
- else
- {
- str_cat(extName_, parts_[2], extName_);
- str_cat(extName_, ".", extName_);
- }
- partsFilled++;
- }
- str_cat(extName_, temp, extName_);
- // copy the internal name
- len = str_len(inName);
- str_cpy_all(intName_, inName, len);
- intName_[len] = '\0';
- noOfParts_ = 4;
- isNskName_ = TRUE;
- return 0;
-}
-
-Int16 AnsiOrNskName::quoteNSKExtName()
-{
- Int32 len;
-
- if (isError_ || (! isValid_))
- return -1;
- if (noOfParts_ != 4)
- return -1;
- if (IsSqlReservedWord(parts_[3]))
- {
- // copy just the table name with quotes
- extName_[0] = '\"';
- len = str_len(parts_[3]);
- str_cpy_all(extName_+1, parts_[3], len);
- extName_[len+1] = '\"';
- extName_[len+2] = '\0';
- noOfParts_ = 1;
- return updateNSKInternalName(intName_);
- }
- else
- if (IsSqlReservedWord(parts_[2]))
- {
- // copy just the table name
- len = str_len(parts_[3]);
- str_cpy_all(extName_, parts_[3], len);
- extName_[len] = '\0';
- noOfParts_ = 1;
- return updateNSKInternalName(intName_);
- }
- else
- return 0;
-}
-
///////////////////////////////////////////////////////////////////
// class TrafSimilarityTableInfo
///////////////////////////////////////////////////////////////////
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/comexe/LateBindInfo.h
----------------------------------------------------------------------
diff --git a/core/sql/comexe/LateBindInfo.h b/core/sql/comexe/LateBindInfo.h
index 38afb40..668eeb0 100644
--- a/core/sql/comexe/LateBindInfo.h
+++ b/core/sql/comexe/LateBindInfo.h
@@ -51,7 +51,7 @@
class Queue;
class NAMemory;
class ExpTupleDesc;
-class AnsiOrNskName;
+class AnsiName;
class ResolvedNameListPre1800;
// ---------------------------------------------------------------------
@@ -71,7 +71,7 @@ class ResolvedNameListPre1800;
class UninitializedMvName : public NABasicObject
{
public:
- NA_EIDPROC UninitializedMvName();
+ UninitializedMvName();
char * getPhysicalName() { return physicalName_; }
char * getAnsiName() { return ansiName_; }
@@ -154,9 +154,6 @@ public:
void setEnvVar(short v) { (v ? flags_ |= ENV_VAR : flags_ &= ~ENV_VAR); };
NABoolean isEnvVar() { return (flags_ & ENV_VAR) != 0; };
- void setDefine(short v) { (v ? flags_ |= DEFINE : flags_ &= ~DEFINE); };
- NABoolean isDefine() { return (flags_ & DEFINE) != 0; };
-
void setCachedParam(short v) { (v ? flags_ |= CACHED_PARAM : flags_ &= ~CACHED_PARAM); };
NABoolean isCachedParam() { return (flags_ & CACHED_PARAM) != 0; };
@@ -169,20 +166,6 @@ public:
void setView(short v) {(v ? flags_ |= IS_VIEW : flags_ &= ~IS_VIEW); };
NABoolean isView() { return (flags_ & IS_VIEW) != 0; };
- void setMPalias(short v) {(v ? flags_ |= IS_MPALIAS : flags_ &= ~IS_MPALIAS); };
- NABoolean isMPalias() { return (flags_ & IS_MPALIAS) != 0; };
-
-// Set to avoid similarity check and recompilation
- void setAvoidSimCheck(short v)
- {
- if (v) flags_ |= NAME_ONLY; else flags_ &= ~NAME_ONLY;
- }
-
- // Force skipping the similarity check (while still resolving the
- // physical name.) Used in special statements (e.g., SET TABLE TIMEOUT)
- // when only the table name is needed, not its meta data
- NABoolean isAvoidSimCheck() { return((flags_ & NAME_ONLY) ? TRUE : FALSE); };
-
void setAnsiNameChange(short v) { (v ? runtimeFlags_ |= ANSI_NAME_CHANGE : runtimeFlags_ &= ~ANSI_NAME_CHANGE); };
NABoolean isAnsiNameChange() { return (runtimeFlags_ & ANSI_NAME_CHANGE) != 0; };
@@ -200,14 +183,11 @@ public:
NABoolean isLastUsedNameCompEmbedded() { return (runtimeFlags_ & LASTUSED_NAME_STR_PTR) == 0; };
static NABoolean makeSQLIdentifier(char * invalue, char * outvalue);
- static NABoolean applyMPAliasDefaults(char * invalue,
- char * outvalue,
- char * defValString);
- AnsiOrNskName *getLastUsedName(NAMemory *heap);
+ AnsiName *getLastUsedName(NAMemory *heap);
void setCompileTimeName(char *name, NAMemory *heap);
void setLastUsedName(char *name, NAMemory *heap);
- void setLastUsedName(AnsiOrNskName *name);
+ void setLastUsedName(AnsiName *name);
Long pack(void *);
Lng32 unpack(void *, void * reallocator);
@@ -259,12 +239,7 @@ private:
// Used when the variable name is the
// name of a resource fork.
IS_INDEX = 0x0008, // this is an index.
- DEFINE = 0x0010, // name is a guardian Define
IS_VIEW = 0x0020, // this is a view
- IS_MPALIAS = 0x0040, // the variable contains an mpalias name.
- NAME_ONLY = 0x0080, // variable, but only the table-name is needed
- // (not the table's meta-data.) So avoid simila
- // check and recompilation. Used by SET TIMEOUT
COMP_NAME_STR_PTR = 0x0100, // If not set, compileTimeAnsiName is the embedded string
CACHED_PARAM = 0x0200 // prototyped hvar for cached tablenames.
};
@@ -274,7 +249,7 @@ private:
ANSI_NAME_CHANGE = 0x0001, IGNORE_TS = 0x0002, VIEW_NAME_CHANGE = 0x0004,
RESERVED_NAME = 0x0008,
LASTUSED_NAME_STR_PTR = 0x0010,
- LASTUSED_NAME_CLASS_PTR =0x0020, // If set, LastUsedName points to AnsiOrNskName, else is the
+ LASTUSED_NAME_CLASS_PTR =0x0020, // If set, LastUsedName points to AnsiName, else is the
// character string embedded in LateBindInfo
};
@@ -291,7 +266,7 @@ private:
// Valid if this is a variable name and not an env var.
Int16 inputListIndex_; // 12- 13
- // name of hvar/param/envVar/define used to input the table name.
+ // name of hvar/param/envVar used to input the table name.
char varName_[MAX_ANSI_IDENTIFIER_LEN+1/*null terminator*/]; // 14-272
// the ANSI name as known at compile time. Could be:
@@ -395,10 +370,6 @@ public:
void getRecompLateNameInfoListPre1800(char * buffer);
void resetRuntimeFlags();
- NABoolean definePresent() { return (flags_ & DEFINE_PRESENT) != 0; };
- void setDefinePresent(short v)
- { (v ? flags_ |= DEFINE_PRESENT : flags_ &= ~DEFINE_PRESENT); };
-
NABoolean viewPresent() { return (flags_ & VIEW_PRESENT) != 0; };
void setViewPresent(short v)
{ (v ? flags_ |= VIEW_PRESENT : flags_ &= ~VIEW_PRESENT); };
@@ -415,13 +386,12 @@ public:
private:
enum Flags
{
- DEFINE_PRESENT = 0x0001, // one or more DEFINEs used in query
VIEW_PRESENT = 0x0002, // one or more views used in query
ENVVARS_PRESENT = 0x0004, // one or more envvars as tablenames used
// in the query.
VARIABLE_PRESENT = 0x0008 // one of more tablenames used in the query
// are passed in as variables.
- // (hostvar, defines or envvars)
+ // (hostvar, envvars)
};
UInt32 flags_; // 00- 03
@@ -436,21 +406,18 @@ private:
// ---------------------------------------------------------------------
typedef NAVersionedObjectPtrTempl<LateNameInfoList> LateNameInfoListPtr;
-class AnsiOrNskName : public NABasicObject
+class AnsiName : public NABasicObject
{
public:
- AnsiOrNskName(char *inName);
+ AnsiName(char *inName);
char *getInternalName() ;
char *getExternalName() ;
Int16 extractParts(Lng32 &numParts,
char *parts[]);
- Int16 equals(AnsiOrNskName *name);
- Int16 convertAnsiOrNskName(bool doCheck = TRUE);
+ Int16 equals(AnsiName *name);
+ Int16 convertAnsiName(bool doCheck = TRUE);
Int16 fillInMissingParts(char *schemaName);
- bool isNskName();
- Int16 updateNSKInternalName(char *inName);
- Int16 quoteNSKExtName();
private:
char extName_[MAX_ANSI_NAME_LENGTH]; // Given (external) 3-part name
@@ -460,13 +427,11 @@ private:
// for the 3-part interal name the same as that for the 3-part external name.
char intName_[MAX_ANSI_NAME_LENGTH];
Int16 noOfParts_;
- bool isNskName_; // TRUE if NSK name, FALSE if ansi name
char parts_[4][ComMAX_1_PART_EXTERNAL_UTF8_NAME_LEN_IN_BYTES+1]; // in UTF8
bool isValid_; // The flag that denotes if the name is checked and extracted into parts
bool isError_;
};
-
///////////////////////////////////////////////////////////
// class TrafSimilarityTableInfo
///////////////////////////////////////////////////////////
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/comexe/PartInputDataDesc.cpp
----------------------------------------------------------------------
diff --git a/core/sql/comexe/PartInputDataDesc.cpp b/core/sql/comexe/PartInputDataDesc.cpp
index 3424ee6..894c42a 100644
--- a/core/sql/comexe/PartInputDataDesc.cpp
+++ b/core/sql/comexe/PartInputDataDesc.cpp
@@ -45,7 +45,6 @@
#include "ExpAtp.h"
#include "ComPackDefs.h"
-#define NA_NO_C_RUNTIME
#include "BaseTypes.h"
// -----------------------------------------------------------------------
@@ -444,7 +443,7 @@ Lng32 ExHash2PartInputData::unpack(void * base, void * reallocator)
// This method returns the virtual function table pointer for an object
// with the given class ID; used by NAVersionedObject::driveUnpack().
// -----------------------------------------------------------------------
-NA_EIDPROC char *ExPartInputDataDesc::findVTblPtr(short classID)
+char *ExPartInputDataDesc::findVTblPtr(short classID)
{
char *vtblPtr;
switch (classID)
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/comexe/QueueIndex.h
----------------------------------------------------------------------
diff --git a/core/sql/comexe/QueueIndex.h b/core/sql/comexe/QueueIndex.h
index 6ce1d02..f12cb16 100644
--- a/core/sql/comexe/QueueIndex.h
+++ b/core/sql/comexe/QueueIndex.h
@@ -39,12 +39,7 @@
// definition of queue_index needs to be known as compiler time since
// objects of it are passed as arguments to the TDB constructors.
-#ifdef NA_64BIT
-// dg64 - 32-bits on disk
typedef UInt32 queue_index;
-#else
-typedef ULng32 queue_index;
-#endif
#endif
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/comexe/SqlTableOpenInfo.h
----------------------------------------------------------------------
diff --git a/core/sql/comexe/SqlTableOpenInfo.h b/core/sql/comexe/SqlTableOpenInfo.h
index 44be07e..2377ae2 100644
--- a/core/sql/comexe/SqlTableOpenInfo.h
+++ b/core/sql/comexe/SqlTableOpenInfo.h
@@ -134,7 +134,6 @@ public:
NABoolean distributeOpens() { return (openFlags_ & DISTRIBUTE_OPENS) != 0; }
NABoolean reuseOpens() { return (openFlags_ & REUSE_OPENS) != 0; }
NABoolean reuseOpensForWrite() { return (openFlags_ & REUSE_OPENS_FOR_WRITE) != 0; }
- NABoolean validateRforkTS() { return (openFlags_ & VALIDATE_RFORK_TS) != 0;}
NABoolean readProtectedOpen() { return (openFlags_ & READ_PROTECTED_OPEN) != 0;}
NABoolean insertToNonAudited() { return (openFlags_ & INSERT_TO_NONAUDITED_OPEN) != 0;}
@@ -217,9 +216,6 @@ public:
{ (v ? otherFlags_ |= IS_MX_METADATA_TABLE : otherFlags_ &= ~IS_MX_METADATA_TABLE); }
void setIsInsertOfUpdateCK(NABoolean v)
{ (v ? otherFlags_ |= INSERT_OF_UPDATE_CK : otherFlags_ &= ~INSERT_OF_UPDATE_CK); }
- void setValidateRforkTS(NABoolean v)
- { (v ? openFlags_ |= VALIDATE_RFORK_TS : openFlags_ &= ~VALIDATE_RFORK_TS); }
-
inline
void setSubjectTable(NABoolean v)
@@ -412,17 +408,6 @@ private:
// Tables are closed if the process is exited, or if user id changes.
REUSE_OPENS = 0x0100,
- // if this flag is set, then we compare the compile TS against the
- // redef TS of the rfork.
- // This is to implement the feature of not blowing away opens of
- // running queries unless it is required.
- // With this feature, catman changes the redef TS of the rfork for
- // the cases where running queries need not be disrupted. For ex, if
- // permissions are revoked. On the next execution of the query, executor
- // validates the compile timestamp against the TS of rfork and recompiles,
- // if rfork TS is greater.
- VALIDATE_RFORK_TS = 0x0200,
-
// sets exclusion mode to ARK_DML_PROTECTED. This does a read protected
// open which prevents any write access to the table.
READ_PROTECTED_OPEN = 0x0400,
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/common/BaseTypes.cpp
----------------------------------------------------------------------
diff --git a/core/sql/common/BaseTypes.cpp b/core/sql/common/BaseTypes.cpp
index ae03ca8..0689333 100644
--- a/core/sql/common/BaseTypes.cpp
+++ b/core/sql/common/BaseTypes.cpp
@@ -64,9 +64,7 @@ extern void my_mpi_fclose();
#include "CompException.h"
#include "StmtCompilationMode.h"
-#if defined(NA_LINUX) && !defined(__EID)
extern void releaseRTSSemaphore(); // Functions implemented in SqlStats.cpp
-#endif
// LCOV_EXCL_START :dpm
void NADebug()
@@ -104,9 +102,7 @@ void NAArkcmpExceptionEpilogue()
// wrapper for exit(), calling NAError_stub_for_breakpoints() first
void NAExit(Int32 status)
{
-#ifndef __EID
NAAssertMutexLock(); // Serialize termination
-#endif
releaseRTSSemaphore();
if (status)
NAError_stub_for_breakpoints(); // LCOV_EXCL_LINE :dpm
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/common/BaseTypes.h
----------------------------------------------------------------------
diff --git a/core/sql/common/BaseTypes.h b/core/sql/common/BaseTypes.h
index 3d3bc6a..6bea280 100644
--- a/core/sql/common/BaseTypes.h
+++ b/core/sql/common/BaseTypes.h
@@ -237,14 +237,8 @@ extern void NADebug();
// Abnormal program termination
// -----------------------------------------------------------------------
-#include "SqlExportDllDefines.h"
-
-#ifdef __EID
-#define ABORT(msg) {}
-#else
#define ABORT(msg) NAAbort (__FILE__, __LINE__, (msg))
-extern void SQLEXPORT_LIB_FUNC NAAbort (const char *, Int32, const char *);
-#endif
+extern void NAAbort (const char *, Int32, const char *);
// -----------------------------------------------------------------------
// the NAString datatype used to be Tools.h++'s RWCString; now it's a
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/common/BigNumHelper.h
----------------------------------------------------------------------
diff --git a/core/sql/common/BigNumHelper.h b/core/sql/common/BigNumHelper.h
index c93abdc..eb4f0aa 100644
--- a/core/sql/common/BigNumHelper.h
+++ b/core/sql/common/BigNumHelper.h
@@ -57,14 +57,12 @@ class BigNumHelper {
public:
// The following method adds two Big Nums (without signs).
-NA_EIDPROC
static short AddHelper(Lng32 dataLength,
char * leftData,
char * rightData,
char * resultData);
// The following method subtracts one Big Num from another (without signs).
-NA_EIDPROC
static short SubHelper(Lng32 dataLength,
char * leftData,
char * rightData,
@@ -73,7 +71,6 @@ static short SubHelper(Lng32 dataLength,
// The following method multiplies two Big Nums (without signs).
// The assumption is that the result is big enough to hold the
// product.
-NA_EIDPROC
static short MulHelper(Lng32 resultLength,
Lng32 leftLength,
Lng32 rightLength,
@@ -84,7 +81,6 @@ static short MulHelper(Lng32 resultLength,
// The following method divides one Big Num by another (both without signs),
// only if the divisor fits in an unsigned short. It returns 1 if there is
// a remainder, 0 if there is no remainder, and -1 if there is an error.
-NA_EIDPROC
static short SimpleDivHelper(Lng32 dividendLength,
Lng32 divisorLength,
char * dividendData,
@@ -93,7 +89,6 @@ static short SimpleDivHelper(Lng32 dividendLength,
// The following method divides one Big Num by another (both without signs).
// It returns 1 if there is a remainder, 0 if there is no remainder.
-NA_EIDPROC
static short DivHelper(Lng32 dividendLength,
Lng32 divisorLength,
char * dividendData,
@@ -104,7 +99,6 @@ static short DivHelper(Lng32 dividendLength,
// The following method converts a given Big Num (without sign) into
// its equivalent BCD string representation (with the more significant decimal
// digits in the lower addresses).
-NA_EIDPROC
static short ConvBigNumToBcdHelper(Lng32 sourceLength,
Lng32 targetLength,
char * sourceData,
@@ -114,7 +108,6 @@ static short ConvBigNumToBcdHelper(Lng32 sourceLength,
// The following method converts a given BCD string representation (without sign,
// and with the more significant decimal digits in the lower addresses)
// into its equivalent Big Num representation.
-NA_EIDPROC
static short ConvBcdToBigNumHelper(Lng32 sourceLength,
Lng32 targetLength,
char * sourceData,
@@ -123,7 +116,6 @@ static short ConvBcdToBigNumHelper(Lng32 sourceLength,
// The following method converts a given Big Num (with sign) into
// its equivalent BCD string representation (with the more significant
// decimal digits in the lower addresses).
-NA_EIDPROC
static short ConvBigNumWithSignToBcdHelper(Lng32 sourceLength,
Lng32 targetLength,
char * sourceData,
@@ -133,7 +125,6 @@ static short ConvBigNumWithSignToBcdHelper(Lng32 sourceLength,
// The following method converts a given BCD string representation
// (with sign, and with the more significant decimal digits in the lower
// addresses) into its equivalent Big Num representation.
-NA_EIDPROC
static short ConvBcdToBigNumWithSignHelper(Lng32 sourceLength,
Lng32 targetLength,
char * sourceData,
@@ -142,7 +133,6 @@ static short ConvBcdToBigNumWithSignHelper(Lng32 sourceLength,
// The following method converts a given Big Num (without sign) into
// its equivalent ASCII string representation (with the more significant
// decimal digits in the lower addresses).
-NA_EIDPROC
static short ConvBigNumToAsciiHelper(Lng32 sourceLength,
Lng32 targetLength,
char * sourceData,
@@ -152,7 +142,6 @@ static short ConvBigNumToAsciiHelper(Lng32 sourceLength,
// The following method converts a given ASCII string representation
// (without sign, and with the more significant decimal digits in the lower
// addresses) into its equivalent Big Num representation.
-NA_EIDPROC
static short ConvAsciiToBigNumHelper(Lng32 sourceLength,
Lng32 targetLength,
char * sourceData,
@@ -161,7 +150,6 @@ static short ConvAsciiToBigNumHelper(Lng32 sourceLength,
// The following method converts a given Big Num (with sign) into
// its equivalent ASCII string representation (with the more significant
// decimal digits in the lower addresses).
-NA_EIDPROC
static short ConvBigNumWithSignToAsciiHelper(Lng32 sourceLength,
Lng32 targetLength,
char * sourceData,
@@ -171,7 +159,6 @@ static short ConvBigNumWithSignToAsciiHelper(Lng32 sourceLength,
// The following method converts a given ASCII string representation
// (with sign, and with the more significant decimal digits in the lower
// addresses) into its equivalent Big Num representation.
-NA_EIDPROC
static short ConvAsciiToBigNumWithSignHelper(Lng32 sourceLength,
Lng32 targetLength,
char * sourceData,
@@ -180,26 +167,22 @@ static short ConvAsciiToBigNumWithSignHelper(Lng32 sourceLength,
// Given a desired precision of a Big Num, the following method calculates
// the required storage length (including the sign). We assume that the
// precision is > 0. Storage will always be at a minimum 8 bytes.
-NA_EIDPROC
static Lng32 ConvPrecisionToStorageLengthHelper(Lng32 precision);
// The following method converts an integer, 10^exponent, to a Big Num
// representation (without sign). The given exponent should be >= 0.
-NA_EIDPROC
static short ConvPowersOfTenToBigNumHelper(Lng32 exponent,
Lng32 targetLength,
Lng32 * finalTargetLength,
char * targetData);
// The following converts an Int64 to a Big Num (with sign).
-NA_EIDPROC
static short ConvInt64ToBigNumWithSignHelper(Lng32 targetLength,
Int64 sourceData,
char * targetData,
NABoolean isUnsigned);
// The following converts a Big Num (with sign) into an Int64.
-NA_EIDPROC
static short ConvBigNumWithSignToInt64Helper(Lng32 sourceLength,
char * sourceData,
void * targetData,
@@ -215,7 +198,6 @@ static short ConvBigNumWithSignToInt64Helper(Lng32 sourceLength,
// 2: the result was rounded down to LLONG_MAX
// 3: the result was rounded up
// 4: the result was rounded down
-NA_EIDPROC
static short ConvBigNumWithSignToInt64AndScaleHelper(Lng32 sourceLength,
char * sourceData,
Int64 * targetData,
@@ -223,7 +205,6 @@ static short ConvBigNumWithSignToInt64AndScaleHelper(Lng32 sourceLength,
NAMemory * heap);
// The following converts a Big Num to a Big Num.
-NA_EIDPROC
static short ConvBigNumWithSignToBigNumWithSignHelper(Lng32 sourceLength,
Lng32 targetLength,
char * sourceData,
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/common/Collections.cpp
----------------------------------------------------------------------
diff --git a/core/sql/common/Collections.cpp b/core/sql/common/Collections.cpp
index 04c953d..2da7f98 100644
--- a/core/sql/common/Collections.cpp
+++ b/core/sql/common/Collections.cpp
@@ -73,10 +73,8 @@ void NACollection<T>::insert(CollIndex posToInsert,
CollIndex newUsage)
{
// is a valid position and usage given?
-#ifndef PRIV_SRL
assert((posToInsert < MAX_COLL_INDEX) AND
(newUsage != UNUSED_COLL_ENTRY));
-#endif // PRIV_SRL
// do we need to increase the size?
if (posToInsert >= maxLength_)
@@ -124,16 +122,12 @@ CollIndex NACollection<T>::resize(CollIndex newSize)
}
// shouldn't even come close to this
-#ifndef PRIV_SRL
assert (newSize < MAX_COLL_INDEX);
-#endif // PRIV_SRL
// use a temp collection with the new size
NACollection<T> newOne(heap_,newSize);
-#ifndef PRIV_SRL
assert(newSize >= usedLength_);
-#endif // PRIV_SRL
for (CollIndex i = FIRST_COLL_INDEX; i < usedLength_; i++)
{
@@ -175,9 +169,7 @@ template <class T> void NACollection<T>::allocate(CollIndex initLen)
{
// NOTE: this assumes that the heap_ data member has been set.
// No other data members need to be set before calling this.
-#ifndef PRIV_SRL
assert(initLen < MAX_COLL_INDEX);
-#endif // PRIV_SRL
maxLength_ = initLen;
usedLength_ = 0;
@@ -1394,16 +1386,12 @@ K* NAHashBucket<K,V>::remove(K* key)
template <class K, class V>
NAHashDictionary<K,V>::NAHashDictionary(
// see long detailed comment in Collections.h about the hash function param.
-//#if !defined(NA_UNIX) || defined(NA_LINUX)
ULng32 (*hashFunction)(const K &),
-//#endif
ULng32 hashSize,
NABoolean enforceUniqueness,
NAMemory* heap)
: heap_(heap),
-//#if !defined(NA_UNIX) || defined(NA_LINUX)
hash_(hashFunction),
-//#endif
entries_(0),
enforceUniqueness_(enforceUniqueness)
{
@@ -1414,9 +1402,7 @@ template <class K, class V>
NAHashDictionary<K,V>::NAHashDictionary (const NAHashDictionary<K,V> & other,
NAMemory * heap)
: heap_( (heap==NULL) ? other.heap_ : heap ),
-//#if !defined(NA_UNIX) || defined(NA_LINUX)
hash_(other.hash_),
-//#endif
entries_(other.entries_),
enforceUniqueness_(other.enforceUniqueness_)
{
@@ -1471,7 +1457,6 @@ void NAHashDictionary<K,V>::createHashTable(ULng32 hashSize)
template <class K, class V>
ULng32 NAHashDictionary<K,V>::getHashCode(const K& key) const
{
-//#if defined(NA_UNIX) && !defined(NA_LINUX)
// use the key's hash method to get the hash value
// unsigned long hashValue = key.hash() % hashSize_;
//#else
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/common/Collections.h
----------------------------------------------------------------------
diff --git a/core/sql/common/Collections.h b/core/sql/common/Collections.h
index 915dbf1..acccd94 100644
--- a/core/sql/common/Collections.h
+++ b/core/sql/common/Collections.h
@@ -43,8 +43,6 @@
-//#include "SqlExportDllDefines.h"
-
/**
*** _m64_popcnt is an instruction-level intrinsic routine supported in the
*** IA64 compiler. It quickly counts the number of bits set in a 64-bit
@@ -353,30 +351,25 @@ protected: // NT_PORT SK 04/08/97
#endif // ! NA_MSVC && ! NA_NO_FRIENDS_WITH_TEMPLATE_REFS
// default constructor(empty collection)
- NA_EIDPROC NACollection(CollIndex initLen = 0) : heap_(NULL)
+ NACollection(CollIndex initLen = 0) : heap_(NULL)
{ allocate(initLen); }
// constructor for a collection with user-defined heap management
- NA_EIDPROC NACollection(CollHeap *heap, CollIndex initLen = 0) : heap_(heap)
+ NACollection(CollHeap *heap, CollIndex initLen = 0) : heap_(heap)
{ allocate(initLen); }
// copy ctor
- NA_EIDPROC NACollection(const NACollection<T> &other, CollHeap *heap=0)
+ NACollection(const NACollection<T> &other, CollHeap *heap=0)
: heap_( (heap==NULL) ? other.heap_ : heap )
{ copy(other); }
// virtual destructor
-#if !defined(PRIV_SRL)
- NA_EIDPROC virtual ~NACollection();
-#else
- NA_EIDPROC ~NACollection();
-#endif // NA_HSC
-
+ virtual ~NACollection();
// copy another collection into this one
// NOTE: this method is called by a constructor and it
// assumes that the collection is in the deallocated state!!!
- NA_EIDPROC void copy(const NACollection<T> &other) ;
+ void copy(const NACollection<T> &other) ;
// assignment operator (deep copy instead of shallow one)
inline NACollection<T> & operator =(const NACollection<T> &other)
@@ -389,29 +382,29 @@ protected: // NT_PORT SK 04/08/97
void clearFrom( CollIndex entry );
// return entry ix(create entry, if it doesn't exist already)
- NA_EIDPROC T & rawEntry(CollIndex ix);
+ T & rawEntry(CollIndex ix);
// overloaded operator [] to access elements of the collection
T & usedEntry(CollIndex ix)
{
-#if defined(_DEBUG) && !defined(PRIV_SRL)
+#if defined(_DEBUG)
if((ix >= usedLength_) OR
(usages_[ix] == UNUSED_COLL_ENTRY))
ABORT("referencing an unused element of a collection");
-#endif // PRIV_SRL
+#endif
return arr_[ix];
}
// the const version of usedEntry
const T & constEntry(CollIndex ix) const
{
-#if defined(_DEBUG) && !defined(PRIV_SRL)
+#if defined(_DEBUG)
if((ix >= usedLength_) OR
(usages_[ix] == UNUSED_COLL_ENTRY))
{
ABORT("referencing an unused element of a collection");
}
-#endif // PRIV_SRL
+#endif
return arr_[ix];
}
@@ -433,7 +426,7 @@ protected: // NT_PORT SK 04/08/97
{ return sizeof(*this) + (maxLength_ * (sizeof(T)+sizeof(CollIndex))); }
// Resize the arrays to a new size(return new size)
- NA_EIDPROC CollIndex resize(CollIndex newSize);
+ CollIndex resize(CollIndex newSize);
inline void setUsage(CollIndex pos, CollIndex newUsage)
{
@@ -446,10 +439,10 @@ protected: // NT_PORT SK 04/08/97
// allocate the arrays(used in constructor, don't assume
// that the data members except "heap_" are initialized yet)
- NA_EIDPROC void allocate(CollIndex initLen);
+ void allocate(CollIndex initLen);
//inline void deallocate()
- NA_EIDPROC virtual void deallocate()
+ virtual void deallocate()
{
// NOTE: dirty deallocate, no cleanup!!!
if ( heap_ == NABasicObject::systemHeapPtr() )
@@ -525,7 +518,7 @@ protected: // NT_PORT SK 04/08/97
return;
}
- NA_EIDPROC void insert(CollIndex posToInsert,
+ void insert(CollIndex posToInsert,
const T &newElement,
CollIndex newUsage = NULL_COLL_INDEX);
@@ -632,7 +625,7 @@ const Lng32 bitsSet[] = {
//
// ***********************************************************************
-NA_EIDPROC inline Lng32 firstOne( ULng32 x )
+inline Lng32 firstOne( ULng32 x )
{
#define FIRSTHALFWORDBITS 0xFFFF0000
#define FIRSTQUARTERWORDBITS 0xFF000000
@@ -839,7 +832,6 @@ NA_EIDPROC inline Lng32 firstOne( ULng32 x )
// to compiler intrinsic _m64_popcnt - much *MUCH* faster.
//
// ***********************************************************************
-NA_EIDPROC
inline Lng32 lastOne( ULng32 x )
{
#define LASTHALFWORDBITS 0x0000FFFF
@@ -1040,7 +1032,6 @@ inline Lng32 lastOne( ULng32 x )
// argument.
//
// ***********************************************************************
-NA_EIDPROC
inline Lng32 ones( ULng32 x )
{
unsigned char * px = (unsigned char *) &x;
@@ -1071,7 +1062,7 @@ public:
// set heap after constructor has been called but before object is used
void setHeap(CollHeap *heap);
- NA_EIDPROC inline CollIndex resize( CollIndex newSize )
+ inline CollIndex resize( CollIndex newSize )
{
if (newSize > maxLength_)
{
@@ -1131,10 +1122,10 @@ public:
return( wordSize_ * BitsPerWord );
}
- NA_EIDPROC CollIndex getWordSize () const { return( wordSize_ ); }
- NA_EIDPROC CollIndex getLastStaleBit() const { return( lastStaleBit_ ); }
+ CollIndex getWordSize () const { return( wordSize_ ); }
+ CollIndex getLastStaleBit() const { return( lastStaleBit_ ); }
- NA_EIDPROC inline void extendWordSize( CollIndex minWordSize )
+ inline void extendWordSize( CollIndex minWordSize )
{
// resize the array
resize( minWordSize );
@@ -1261,7 +1252,7 @@ public:
// e.g. in a for-loop: for(CollIndex i = 0; nextUsed(i); i++) ...
// ---------------------------------------------------------------------
- NA_EIDPROC inline NABoolean nextUsed( CollIndex & start ) const
+ inline NABoolean nextUsed( CollIndex & start ) const
{
CollIndex limit = wordSize_ << LogBitsPerWord;
@@ -1432,7 +1423,7 @@ public:
NASubCollection<T> & intersectSet(const NASubCollection<T> & other);
NASubCollection<T> & subtractSet(const NASubCollection<T> & other);
- NA_EIDPROC inline NASubCollection<T> & addElement( CollIndex elem )
+ inline NASubCollection<T> & addElement( CollIndex elem )
{
CollIndex wordNumber = wordNo( elem );
@@ -1465,7 +1456,7 @@ public:
// Fast path when elem is probably less than 64.
inline NASubCollection<T> & addElementFast(CollIndex elem);
- NA_EIDPROC inline NASubCollection<T> & subtractElement( CollIndex elem )
+ inline NASubCollection<T> & subtractElement( CollIndex elem )
{
CollIndex wordNumber = wordNo( elem );
@@ -1600,7 +1591,7 @@ inline CollIndex NASubCollection<T>::prevUsed(CollIndex start) const
// Returns the ordinal position of the last bit set in the uint64_t passed as
// an argument.
-NA_EIDPROC inline ULng32 FindLastOne(uint64_t x)
+inline ULng32 FindLastOne(uint64_t x)
{
// Set bits right of, and clear bits left of, last bit set.
uint64_t y = x ^ (x - 1);
@@ -1886,7 +1877,7 @@ public:
{ return NACollection<T>::getByteSize() + sizeof(*this) -
sizeof(NACollection<T>); }
- NA_EIDPROC inline NABoolean insert(const T &elem)
+ inline NABoolean insert(const T &elem)
{
invalidateCache();
if (NACollection<T>::find(elem) == NULL_COLL_INDEX)
@@ -1899,7 +1890,7 @@ public:
}
// A dumb but easy implementation for insert one SET into another
- NA_EIDPROC inline NABoolean insert(const NASet<T> &other)
+ inline NABoolean insert(const NASet<T> &other)
{
CollIndex count = other.entries();
for (CollIndex i = 0; i < count; i++)
@@ -1909,7 +1900,7 @@ public:
return TRUE;
} // insert(SET(T))
- NA_EIDPROC inline NABoolean remove(const T &elem)
+ inline NABoolean remove(const T &elem)
{
CollIndex ix = NACollection<T>::find(elem);
@@ -1924,7 +1915,7 @@ public:
}
// A dumb but easy implementation for remove one SET from another
- NA_EIDPROC inline NABoolean remove(const NASet<T> &other)
+ inline NABoolean remove(const NASet<T> &other)
{
CollIndex count = this->entries();
for (CollIndex i = 0; i < count; i++)
@@ -1969,7 +1960,7 @@ public:
}
// virtual destructor
- NA_EIDPROC virtual ~NAList();
+ virtual ~NAList();
// assignment
@@ -1984,7 +1975,7 @@ public:
// insert a set, array, or list
// void insert(const SET(T) &other);
- NA_EIDPROC void insert(const LIST(T) &other);
+ void insert(const LIST(T) &other);
// remove an element(the first that matches) that is given by its value
//(returns whether the element was found and removed)
@@ -2013,7 +2004,7 @@ public:
{ return(NACollection<T>::find(elem) != NULL_COLL_INDEX); }
// find a given element in the collection and return it
- NA_EIDPROC NABoolean find(const T &elem, T &returnedElem) const;
+ NABoolean find(const T &elem, T &returnedElem) const;
// find the index of a given element or return NULL_COLL_INDEX if not found
inline CollIndex index (const T &elem) const
@@ -2038,7 +2029,7 @@ public:
}
// index access(both reference and value), zero based
- NA_EIDPROC T & operator [](CollIndex i);
+ T & operator [](CollIndex i);
const T & operator [](CollIndex i) const;
inline T & at(CollIndex i) { return operator [](i); }
@@ -2059,7 +2050,7 @@ public:
// remove the index'th element from the list
//(returns TRUE if list[index] was found, FALSE if index was out of bounds)
- NA_EIDPROC inline NABoolean removeAt(const CollIndex index)
+ inline NABoolean removeAt(const CollIndex index)
{
// check whether index is legal
if (index >= this->entries())
@@ -2102,7 +2093,7 @@ public:
// insert a new entry at a given position(new element becomes element # i,
// the rest of the list moves 1 entry up)
// use i = entries() to insert at the end, i = 0 to insert at the front
- NA_EIDPROC inline CollIndex insertAt(CollIndex i, const T &elem)
+ inline CollIndex insertAt(CollIndex i, const T &elem)
{
CollIndex newIndex = this->freePos();
CollIndex newUsage;
@@ -2157,7 +2148,7 @@ public:
// remove the first entry from the list and store it in "elem"
//(returns FALSE if the list is empty and no value is returned)
- NA_EIDPROC inline NABoolean getFirst(T &elem)
+ inline NABoolean getFirst(T &elem)
{
if (this->entries() > 0)
{
@@ -2590,7 +2581,6 @@ friend class NAHashDictionaryIterator<K,V>;
// --------------------------------------------------------------------
// Constructor functions.
// --------------------------------------------------------------------
-//#if defined(NA_UNIX) && !defined(NA_LINUX)
// Previously the code was ugly -- it used a hash function that was defined
// in the scope of the file using the NAHashDictionary template. New
// compilers produce an error ("undeclared variable" ) in case the template
@@ -2703,14 +2693,12 @@ private:
private:
-//#if !defined(NA_UNIX) || defined(NA_LINUX)
// Needed only for the old way of NAHashDictionary -- see comment above
// --------------------------------------------------------------------
// The hash function that is applied to the key for determining the
// bucket to which it belongs.
// --------------------------------------------------------------------
ULng32(*hash_)(const K&);
-//#endif
// --------------------------------------------------------------------
// The hash table is an array of hash buckets.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/common/ComASSERT.h
----------------------------------------------------------------------
diff --git a/core/sql/common/ComASSERT.h b/core/sql/common/ComASSERT.h
index bf56bdf..713fc3d 100644
--- a/core/sql/common/ComASSERT.h
+++ b/core/sql/common/ComASSERT.h
@@ -41,13 +41,13 @@
// macro ComASSERT does nothing.
// -----------------------------------------------------------------------
-#if defined(NDEBUG) || defined(NA_NO_C_RUNTIME)
+#if defined(NDEBUG)
#define ComASSERT(ex)
#else
#define ComASSERT(ex) { if (!(ex)) NAAssert("" # ex "", __FILE__, __LINE__); }
#endif
-#if defined(NDEBUG) || defined(__EID)
+#if defined(NDEBUG)
#define ComDEBUG(ex)
// An ABORT macro is defined in BaseTypes.h specifically for EID; must be used
//#define ComABORT(ex){ if (!(ex)) NAAbort(__FILE__, __LINE__, "" # ex ""); }
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/common/ComAnsiNamePart.h
----------------------------------------------------------------------
diff --git a/core/sql/common/ComAnsiNamePart.h b/core/sql/common/ComAnsiNamePart.h
index a8e5ad0..a655908 100644
--- a/core/sql/common/ComAnsiNamePart.h
+++ b/core/sql/common/ComAnsiNamePart.h
@@ -245,7 +245,7 @@ class ComAnsiNamePart : public NABasicObject
//
NABoolean operator== (const ComAnsiNamePart &rhs) const;
- NA_EIDPROC inline Int32 compareTo (const ComAnsiNamePart &rhs) const;
+ inline Int32 compareTo (const ComAnsiNamePart &rhs) const;
//
// accessors
@@ -375,7 +375,6 @@ class ComAnsiNamePart : public NABasicObject
// definitions of inline methods
// -----------------------------------------------------------------------
-NA_EIDPROC
Int32 ComAnsiNamePart::compareTo (const ComAnsiNamePart &rhs) const
{
if (this EQU &rhs) return 0;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/common/ComCextMisc.cpp
----------------------------------------------------------------------
diff --git a/core/sql/common/ComCextMisc.cpp b/core/sql/common/ComCextMisc.cpp
index b67901b..93b9037 100644
--- a/core/sql/common/ComCextMisc.cpp
+++ b/core/sql/common/ComCextMisc.cpp
@@ -1228,13 +1228,8 @@ extern "C"
DLLEXPORT
int_16 PROCESSHANDLE_DECOMPOSE_
(int_16 *prochand, // INPUT
-#ifdef SQ_NEW_PHANDLE
int *cpu, // OUTPUT
int *pin, // OUTPUT
-#else
- int_16 *cpu, // OUTPUT
- int_16 *pin, // OUTPUT
-#endif // SQ_NEW_PHANDLE
int_32 *node, // OUTPUT THE NODE NUMBER
unsigned_char *nn, // OUTPUT NODE NAME
int_16 nnml, // INPUT MAXIMUM OUTPUT LENGTH
@@ -1244,14 +1239,9 @@ int_16 PROCESSHANDLE_DECOMPOSE_
int_16 *nl, // OUTPUT
fixed_0 *seq )
{
-#ifdef SQ_NEW_PHANDLE
PNSK_PORT_HANDLE phandle = (PNSK_PORT_HANDLE)prochand;
return XPROCESSHANDLE_DECOMPOSE_(phandle, cpu, pin, node, (char *)nn,
nnml, nnl, (char *)name, nml, nl, seq);
-#else
- return XPROCESSHANDLE_DECOMPOSE_(prochand, cpu, pin, node, (char *)nn,
- nnml, nnl, (char *)name, nml, nl, seq);
-#endif // SQ_NEW_PHANDLE
}
extern "C"
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/common/ComDistribution.h
----------------------------------------------------------------------
diff --git a/core/sql/common/ComDistribution.h b/core/sql/common/ComDistribution.h
index 61dad33..a3a1e6f 100644
--- a/core/sql/common/ComDistribution.h
+++ b/core/sql/common/ComDistribution.h
@@ -39,10 +39,8 @@
#include "NABoolean.h"
#include "ComSizeDefs.h"
#include "ComCharSetDefs.h"
-#if !defined (ARKFS_OPEN)
- #include "ComDiags.h"
- #include "ComSmallDefs.h"
-#endif
+#include "ComDiags.h"
+#include "ComSmallDefs.h"
#ifndef __DERROR__
#include "fs/feerrors.h"
@@ -307,8 +305,6 @@ void ComFeatureVersionInfoSPInputTypeToLiteral ( const FeatureVersionInfoSPInput
FeatureVersionInfoSPInputType ComFeatureVersionInfoSPLiteralToInputType
( const char * inputTypeLiteral );
-
-#if !defined (ARKFS_OPEN)
//----------------------------------------------------------------------
//
// Translate an anchor file access error to something more sensible.
@@ -352,9 +348,7 @@ private:
// objects survive the table name's allocation.
//
// NB: Metadata access through DDOL will not use this class in R2.0. That is,
-// utilities will not perform the SMD table error translation. The RFork
-// error translation is done by the DDL layer, utilities that access RForks
-// using classes from DDL will see RFork access error translation.
+// utilities will not perform the SMD table error translation.
//
class MetaDataErrorTranslator : public ComDiagsTranslator
{
@@ -409,8 +403,6 @@ private:
};
-#endif
-
//----------------------------------------------------------------------
//
// Handy defines, to convert between different string formats (fix length&space filled vs. zero-terminated)
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/common/ComMPLoc.h
----------------------------------------------------------------------
diff --git a/core/sql/common/ComMPLoc.h b/core/sql/common/ComMPLoc.h
index b3483e2..65d444a 100644
--- a/core/sql/common/ComMPLoc.h
+++ b/core/sql/common/ComMPLoc.h
@@ -46,16 +46,16 @@
#include "ComSmallDefs.h"
#include "Platform.h"
-NA_EIDPROC inline ComBoolean IsMPLocPrefix(const char c)
+inline ComBoolean IsMPLocPrefix(const char c)
{ return c == '$' || c == '\\'; }
-NA_EIDPROC inline ComBoolean IsMPLocPrefix(const unsigned char c)
+inline ComBoolean IsMPLocPrefix(const unsigned char c)
{ return c == '$' || c == '\\'; }
-NA_EIDPROC inline ComBoolean HasMPLocPrefix(const char *s)
+inline ComBoolean HasMPLocPrefix(const char *s)
{ return IsMPLocPrefix(*s); }
-NA_EIDPROC inline const char *ChopMPLocPrefix(const char *s)
+inline const char *ChopMPLocPrefix(const char *s)
{ return HasMPLocPrefix(s) ? &s[1] : s; }
// Max length of an externally formatted name
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/common/ComObjectName.cpp
----------------------------------------------------------------------
diff --git a/core/sql/common/ComObjectName.cpp b/core/sql/common/ComObjectName.cpp
index d34cb0c..9307d75 100644
--- a/core/sql/common/ComObjectName.cpp
+++ b/core/sql/common/ComObjectName.cpp
@@ -783,36 +783,6 @@ ComObjectName::scan( const NAString &externalObjectName
size_t trailingJunkIsOk = bytesScanned;
bytesScanned = 0;
- if (( SqlParser_Initialized() && SqlParser_NAMETYPE == DF_NSK) ||
- //(ComRtIsNSKName((char *)externalObjectName.data())) ||
- //(*externalObjectName.data() == '\$') ) {
- (!SqlParser_Initialized() && *externalObjectName.data() == '\\')) {
-
- NAString nam(externalObjectName);
- size_t b = externalObjectNameLen;
-
- if (trailingJunkIsOk) {
- #define LEGAL_PUNCTUATION " \t,();"
- size_t j = strcspn(externalObjectName, LEGAL_PUNCTUATION);
- if (j < b) {
- b = j;
- nam.remove(b);
- }
- }
-
- // Is this a valid 1, 2, 3, or 4-part NSK filename?
- ComMPLoc loc(nam, ComMPLoc::FILE);
- if (loc.isValid(ComMPLoc::FILE)) {
- #define COPY_VALIDATED_STRING(x) \
- ComAnsiNamePart(x, ComAnsiNamePart::INTERNAL_FORMAT)
- catalogNamePart_ = COPY_VALIDATED_STRING(loc.getSysDotVol());
- schemaNamePart_ = COPY_VALIDATED_STRING(loc.getSubvolName());
- objectNamePart_ = COPY_VALIDATED_STRING(loc.getFileName());
- bytesScanned = b;
- return TRUE;
- }
- } // end of if (( SqlParser_Initialized() ...
-
// ---------------------------------------------------------------------
// Scan the leftmost ANSI SQL name part.
// ---------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/common/ComRtUtils.cpp
----------------------------------------------------------------------
diff --git a/core/sql/common/ComRtUtils.cpp b/core/sql/common/ComRtUtils.cpp
index e82c23c..217bf08 100644
--- a/core/sql/common/ComRtUtils.cpp
+++ b/core/sql/common/ComRtUtils.cpp
@@ -92,7 +92,6 @@ static const ModName internalSystemSchemaModNameList[] = {
,{"CMSMDIOWRITEM_N29_000"}
,{"MVQR_N29_000"}
,{"READDEF_N29_000"}
- ,{"RFORK_N29_000"}
,{"SQLHIST_N29_000"}
,{"SQLUTILS_N29_000"}
,{"HP_ROUTINES_N29_000"}
@@ -516,7 +515,7 @@ const char * ComRtGetEnvValueFromEnvvars(const char ** envvars,
return NULL;
}
-#if defined (_DEBUG) && !defined (ARKFS_OPEN) && !defined (__EID)
+#if defined (_DEBUG)
// -----------------------------------------------------------------------
// Convenient handling of envvars: Return a value if one exists
// NB: DEBUG mode only!
@@ -706,9 +705,7 @@ Lng32 ComRtGetProgramInfo(char * pathName, /* out */
Int64 &processCreateTime,
char *processNameString,
char *parentProcessNameString
-#ifdef SQ_PHANDLE_VERIFIER
, SB_Verif_Type *verifier
-#endif
)
{
Lng32 retcode = 0;
@@ -721,10 +718,8 @@ Lng32 ComRtGetProgramInfo(char * pathName, /* out */
myPhandle.decompose();
cpu = myPhandle.getCpu();
pin = myPhandle.getPin();
-#ifdef SQ_PHANDLE_VERIFIER
if (verifier)
*verifier = myPhandle.getSeqNum();
-#endif
// Map the node number to cpu
nodeNumber = cpu;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/common/ComRtUtils.h
----------------------------------------------------------------------
diff --git a/core/sql/common/ComRtUtils.h b/core/sql/common/ComRtUtils.h
index 165b6b4..3f7e4f7 100644
--- a/core/sql/common/ComRtUtils.h
+++ b/core/sql/common/ComRtUtils.h
@@ -45,12 +45,9 @@
#include <fstream>
using namespace std;
#include "seabed/ms.h"
-#ifdef NA_64BIT
-// dg64 - the following includes defines min
#ifdef min
#undef min
#endif // min
-#endif // NA_64BIT
#define MAX_SEGMENT_NAME_LEN 255
#define PROCESSNAME_STRING_LEN 40
@@ -189,9 +186,7 @@ Lng32 ComRtGetProgramInfo(char * pathName, /* out */
Int64 &processCreateTime,
char *processNameString,
char *parentProcessNameString = NULL
-#ifdef SQ_PHANDLE_VERIFIER
, SB_Verif_Type *verifier = NULL
-#endif
);
// OUT: processPriority: current priority of process
@@ -226,7 +221,7 @@ const char * ComRtGetEnvValueFromEnvvars(const char ** envvars,
const char * envvar,
Lng32 * envvarPos = NULL);
-#if defined (_DEBUG) && !defined (ARKFS_OPEN) && !defined (__EID)
+#if defined (_DEBUG)
// -----------------------------------------------------------------------
// Convenient handling of envvars: Return a value if one exists
// NB: DEBUG mode only!
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/common/ComSafePrinter.cpp
----------------------------------------------------------------------
diff --git a/core/sql/common/ComSafePrinter.cpp b/core/sql/common/ComSafePrinter.cpp
index b382423..a40fb3f 100644
--- a/core/sql/common/ComSafePrinter.cpp
+++ b/core/sql/common/ComSafePrinter.cpp
@@ -69,7 +69,7 @@ Int32 ComSafePrinter::vsnPrintf(char *str, size_t n,
if (!outfile_)
{
outfile_ = tmpfile();
-#ifdef NA_DEBUG_C_RUNTIME
+#ifdef _DEBUG
if (!outfile_)
{
fprintf(stderr,
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/common/ComSchemaName.cpp
----------------------------------------------------------------------
diff --git a/core/sql/common/ComSchemaName.cpp b/core/sql/common/ComSchemaName.cpp
index 0618daa..772aa64 100644
--- a/core/sql/common/ComSchemaName.cpp
+++ b/core/sql/common/ComSchemaName.cpp
@@ -217,29 +217,6 @@ ComSchemaName::scan(const NAString &externalSchemaName,
size_t externalSchemaNameLen = externalSchemaName.length();
bytesScanned = 0;
- #define COPY_VALIDATED_STRING(x) \
- ComAnsiNamePart(x, ComAnsiNamePart::INTERNAL_FORMAT)
-
- if (( SqlParser_Initialized() && SqlParser_NAMETYPE == DF_NSK) ||
- (!SqlParser_Initialized() && *externalSchemaName.data() == '\\')) {
- ComMPLoc loc(externalSchemaName);
- switch (loc.getFormat()) {
- case ComMPLoc::SUBVOL:
- catalogNamePart_ = COPY_VALIDATED_STRING(loc.getSysDotVol());
- schemaNamePart_ = COPY_VALIDATED_STRING(loc.getSubvolName());
- bytesScanned = externalSchemaNameLen;
- return TRUE;
-
- case ComMPLoc::FILE:
- if (!loc.hasSubvolName()) {
- catalogNamePart_ = "";
- schemaNamePart_ = COPY_VALIDATED_STRING(loc.getFileName());
- bytesScanned = externalSchemaNameLen;
- return TRUE;
- }
- }
- }
-
// Each ComAnsiNamePart ctor below must be preceded by "count = 0;"
// -- see ComAnsiNamePart.cpp, and for a better scan implementation,
// see ComObjectName::scan() + ComObjectName(bytesScanned) ctor.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/common/ComSmallDefs.cpp
----------------------------------------------------------------------
diff --git a/core/sql/common/ComSmallDefs.cpp b/core/sql/common/ComSmallDefs.cpp
index 09211af..7986305 100644
--- a/core/sql/common/ComSmallDefs.cpp
+++ b/core/sql/common/ComSmallDefs.cpp
@@ -68,16 +68,7 @@
// This function now for non-NSKLite platforms only (UNIX)
Int64 ComSmallDef_local_GetTimeStamp(void)
{
- //#if defined(NA_HSC_LINUX) || defined(NA_LINUX)
-#if defined(NA_HSC_LINUX)
- struct timeval tv;
- gettimeofday(&tv, NULL);
- return(Int64(tv.tv_usec) + (Int64(tv.tv_sec)*Int64(1000000L)));
-
-#else
return(JULIANTIMESTAMP());
-
-#endif
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/common/ComSpace.cpp
----------------------------------------------------------------------
diff --git a/core/sql/common/ComSpace.cpp b/core/sql/common/ComSpace.cpp
index 693cf25..12f2e87 100644
--- a/core/sql/common/ComSpace.cpp
+++ b/core/sql/common/ComSpace.cpp
@@ -47,16 +47,11 @@ extern ostream *TraceFile;
#include <stdlib.h>
#include <string.h>
-#ifdef __EID
- #include "ExeDp2.h"
-#endif
-
#include "ComASSERT.h"
#include "ComSpace.h"
#include "str.h"
#include "HeapLog.h"
-NA_EIDPROC
void * operator new(size_t size, Space *s)
{
if (s)
@@ -87,7 +82,6 @@ ComSpace::ComSpace(SpaceType type, NABoolean fillUp, char *name)
allocSize_ = 0;
}
-NA_EIDPROC
ComSpace::~ComSpace()
{
destroy();
@@ -101,9 +95,8 @@ void Space::setType(SpaceType type, Lng32 initialSize)
void Space::setParent(CollHeap * parent) {
// make sure that we haven't allocated anything yet. If something
- // is already allocated, we do not set parent_!! Also, parent_
- // is not set for DP2_SPACE
- if ((allocSize_) || (type_ == DP2_SPACE))
+ // is already allocated, we do not set parent_.
+ if (allocSize_)
return;
parent_ = parent;
@@ -119,7 +112,6 @@ void Space::freeBlocks(void) {
// free up all the blocks attached to this space pointer.
Block * currBlock = firstBlock_;
switch (type_) {
- case DP2_SPACE:
case SINGLE_BLOCK_SPACE:
break;
@@ -162,10 +154,6 @@ Lng32 Space::defaultBlockSize(SpaceType type)
// use default size
switch (type)
{
- case DP2_SPACE:
- // block_size = DP2_BLOCK_MAX_SIZE;
- block_size = 32768;
- break;
case EXECUTOR_SPACE:
case GENERATOR_SPACE:
case SYSTEM_SPACE:
@@ -181,7 +169,7 @@ Lng32 Space::defaultBlockSize(SpaceType type)
// Round up input value to nearest multiple of 8.
//
-NA_EIDPROC static Lng32 roundUp8(Lng32 val)
+static Lng32 roundUp8(Lng32 val)
{
ULng32 uval = (ULng32) val;
@@ -262,32 +250,6 @@ Block * Space::allocateBlock(SpaceType type,
}
else {
switch (type) {
- case DP2_SPACE: {
-#ifdef __EID
- short rc;
- void * memaddr = 0;
-
- rc = DP2_EXECUTOR_ADD_MEMORY (block_size, &memaddr);
-
- //fprintf(stdout,"alloc %d bytes, retcode %d, memaddr %d\n",
- // block_size, rc, memaddr);
- //fflush(stdout);
-
- // if the allocation failed, return NULL
- if (rc != FEOK)
- return NULL;
-
-#ifdef TRACE_DP2_MALLOCS
- *TraceFile << "DP2_EXECUTOR_ADD_MEMORY alloc'd " << block_size
- << " bytes at " << (void *) memaddr
- << " which the executor will use as a Space block." << endl;
-#endif
-
- block_ptr = (char *)memaddr;
-#endif
- }
- break;
-
case EXECUTOR_SPACE:
case GENERATOR_SPACE:
case SYSTEM_SPACE: {
@@ -344,9 +306,7 @@ char *Space::privateAllocateSpace(ULng32 size, NABoolean failureIsFatal) {
// we do something special in firstAllocation
const NABoolean firstAllocation = TRUE ;
firstBlock_ = lastBlock_ = searchList_ =
-#pragma nowarn(1506) // warning elimination
allocateBlock(type_, size, firstAllocation, NULL, failureIsFatal);
-#pragma warn(1506) // warning elimination
}
if (firstBlock_ == NULL)
@@ -387,9 +347,7 @@ char *Space::privateAllocateSpace(ULng32 size, NABoolean failureIsFatal) {
// space not found in any existing block.
// Allocate a new one and append it to the last block.
// The minimum space allocated in a block is max size for 'type'.
-#pragma nowarn(1506) // warning elimination
currBlock = allocateBlock(type_, size, FALSE, NULL, failureIsFatal);
-#pragma warn(1506) // warning elimination
// return if we couldn't allocate a block
if (currBlock == NULL)
@@ -424,9 +382,7 @@ char *Space::privateAllocateSpace(ULng32 size, NABoolean failureIsFatal) {
void * Space::allocateSpaceMemory(size_t size, NABoolean failureIsFatal) {
void * rc = allocateAlignedSpace(size, failureIsFatal);
-#pragma nowarn(1506) // warning elimination
HEAPLOG_ADD_ENTRY(rc, size, heapID_.heapNum, getName())
-#pragma warn(1506) // warning elimination
if (rc) return rc;
if (failureIsFatal && size > 0)
{
@@ -477,39 +433,21 @@ char *Space::allocateAndCopyToAlignedSpace(const char *dp,
break;
case sizeof(char):
ComASSERT(dlen <= UCHAR_MAX)
-#pragma nowarn(1506) // warning elimination
*(char *)rp = dlen;
-#pragma warn(1506) // warning elimination
break;
case sizeof(short):
ComASSERT(dlen <= USHRT_MAX)
-#pragma nowarn(1506) // warning elimination
*(short *)rp = dlen;
-#pragma warn(1506) // warning elimination
break;
-#ifdef NA_64BIT
- // dg64 - a bit of a guess
case sizeof(Int32):
ComASSERT(dlen <= UINT_MAX)
-#pragma nowarn(1506) // warning elimination
*(Int32 *)rp = dlen;
-#pragma warn(1506) // warning elimination
break;
-#else
- case sizeof(Lng32):
- ComASSERT(dlen <= ULONG_MAX)
-#pragma nowarn(1506) // warning elimination
- *(Lng32 *)rp = dlen;
-#pragma warn(1506) // warning elimination
- break;
-#endif
default:
ComASSERT(0==1);
}
char* rdp = rp + countPrefixSize;
-#pragma nowarn(1506) // warning elimination
str_cpy_all(rdp, dp, dlen);
-#pragma warn(1506) // warning elimination
if ((countPrefixSize == 0) && (NOT noSizeAdjustment))
rdp[dlen] = '\0';
@@ -625,9 +563,7 @@ void* Space::convertToPtr(Long offset) const
Lng32 Space::allocAndCopy(void * from, ULng32 size, NABoolean failureIsFatal)
{
char * to = allocateAlignedSpace(size, failureIsFatal);
-#pragma nowarn(1506) // warning elimination
str_cpy_all(to, (char *)from, size);
-#pragma warn(1506) // warning elimination
return (convertToOffset(to));
}
// LCOV_EXCL_STOP
@@ -678,9 +614,8 @@ char * Space::makeContiguous(char * out_buf, ULng32 out_buflen)
return out_buf;
}
-#if (defined(_DEBUG) || defined(NSK_MEMDEBUG)) && !defined(__EID) && !defined(STAND_ALONE)
+#if (defined(_DEBUG) || defined(NSK_MEMDEBUG))
-// LCOV_EXCL_START
void Space::dumpSpaceInfo(ostream* outstream, Lng32 indent) {
char ind[100];
Lng32 indIdx = 0;
@@ -691,9 +626,6 @@ void Space::dumpSpaceInfo(ostream* outstream, Lng32 indent) {
outstream = &cerr;
*outstream << ind << "Dump of Space: " << this << " (";
switch (type_) {
- case DP2_SPACE:
- *outstream << "DP2_SPACE";
- break;
case EXECUTOR_SPACE:
*outstream << "EXECUTOR_SPACE";
break;
@@ -710,7 +642,6 @@ void Space::dumpSpaceInfo(ostream* outstream, Lng32 indent) {
<< ind << "Total Allocated Size (Bytes): " << allocSize_ << endl;
}
-// LCOV_EXCL_STOP
#endif
/////////////////////////////////////////////
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/common/ComSpace.h
----------------------------------------------------------------------
diff --git a/core/sql/common/ComSpace.h b/core/sql/common/ComSpace.h
index 5de6565..4965c70 100644
--- a/core/sql/common/ComSpace.h
+++ b/core/sql/common/ComSpace.h
@@ -63,9 +63,8 @@ typedef class ComSpace : public CollHeap {
public:
enum SpaceType
{
- DP2_SPACE, // executor in DP2
EXECUTOR_SPACE, // master executor and ESPs
- GENERATOR_SPACE, // arkcmp, used to generate module files and rfork
+ GENERATOR_SPACE, // arkcmp, used to generate module file
SYSTEM_SPACE,
SINGLE_BLOCK_SPACE
};
@@ -77,12 +76,6 @@ private:
// recommended/default size for block. Caller can allocate
// a different size, though, and pass that to
// the init method.
- enum BlockSize
- { DP2_BLOCK_MAX_SIZE = 100000
- // EXECUTOR_BLOCK_MAX_SIZE = 131072,
- // SYSTEM_BLOCK_MAX_SIZE = 10240
- };
-
SpaceType type_;
// if this space is an EXECUTOR_SPACE or SYSTEM_SPACE, it is
@@ -111,12 +104,10 @@ private:
// this.
// don't call this directly, as allocateAlignedSpace() won't work
// if some of the requests are for non-aligned space
-NA_EIDPROC
char * privateAllocateSpace(ULng32 size, NABoolean failureIsFatal = TRUE);
// allocate a block of the indicated length (must be a multiple
// of 8)
-NA_EIDPROC
Block * allocateBlock(SpaceType type,
Lng32 in_block_size = 0,
NABoolean firstAllocation = FALSE,
@@ -124,31 +115,22 @@ NA_EIDPROC
NABoolean failureIsFatal = TRUE);
public:
-NA_EIDPROC
ComSpace(SpaceType type = SYSTEM_SPACE, NABoolean fillUp = TRUE, char *name = NULL);
-NA_EIDPROC
void destroy();
-NA_EIDPROC
~ComSpace();
-NA_EIDPROC
void freeBlocks(void);
-NA_EIDPROC
void setType(SpaceType type, Lng32 initialSize = 0);
-NA_EIDPROC
void setFirstBlock(char * blockAddr, Lng32 blockLen, NABoolean failureIsFatal = TRUE);
-NA_EIDPROC
void setParent(CollHeap * parent);
-NA_EIDPROC
char * allocateAlignedSpace(ULng32 size, NABoolean failureIsFatal = TRUE);
-NA_EIDPROC
char * allocateAndCopyToAlignedSpace(const char* dp,
size_t dlen,
size_t countPrefixSize = 0,
@@ -156,63 +138,45 @@ NA_EIDPROC
NABoolean noSizeAdjustment = FALSE);
// returns total space allocated size (space allocated by the user)
-NA_EIDPROC
inline Lng32 getAllocatedSpaceSize(){
return allocSize_;
}
-NA_EIDPROC
void * allocateSpaceMemory(size_t size, NABoolean failureIsFatal = TRUE);
-NA_EIDPROC
void deallocateSpaceMemory(void *)
{ /* no op */ };
-NA_EIDPROC
Long convertToOffset(void *);
-NA_EIDPROC
void* convertToPtr(Long offset) const;
-NA_EIDPROC
Lng32 allocAndCopy(void *, ULng32, NABoolean failureIsFatal = TRUE);
-NA_EIDPROC
short isOffset(void *);
-NA_EIDPROC
NABoolean isOverlappingMyBlocks(char * buf, ULng32 size);
// moves all the Blocks into the output contiguous buffer.
-NA_EIDPROC
char * makeContiguous(char * out_buf, ULng32 out_buflen);
-#if (defined(_DEBUG) || defined(NSK_MEMDEBUG)) && !defined(__EID) && !defined(STAND_ALONE)
-NA_EIDPROC
+#if (defined(_DEBUG) || defined(NSK_MEMDEBUG))
void dumpSpaceInfo(ostream *outstream, Lng32 indent);
#endif
-NA_EIDPROC
static void outputBuffer(ComSpace * space, char * buf, char * newbuf);
-NA_EIDPROC
static void display(char *buf, size_t buflen,
size_t countPrefixSize, ostream &outstream);
-NA_EIDPROC
static Lng32 defaultBlockSize(SpaceType type);
NABoolean outputbuf_; // set to false until we use the buffer for output
} Space;
-NA_EIDPROC
void * operator new(size_t size, ComSpace *s);
-#ifndef ARKFS_OPEN
-#endif // !ARKFS_OPEN
-
-
/////////////////////////////////////////////
//
// class Block
@@ -241,41 +205,29 @@ class Block {
public:
-NA_EIDPROC
void init(Lng32 block_size, Lng32 data_size, char * data_ptr);
// allocate 'size' amount of space in this block
-NA_EIDPROC
char *allocateMemory(ULng32 size);
-NA_EIDPROC
NABoolean isOverlapping(char * buf, ULng32 size);
-NA_EIDPROC
inline Lng32 getAllocatedSize(){return allocatedSize_;};
-NA_EIDPROC
inline Block *getNext(){return nextBlock_;};
-NA_EIDPROC
inline Lng32 getFreeSpace(){return freeSpaceSize_;};
-NA_EIDPROC
inline Lng32 getBlockSize(){return blockSize_;};
-NA_EIDPROC
inline Block *getNextSearch(){return nextSearchBlock_;};
-NA_EIDPROC
inline void setNext(Block *b){nextBlock_ = b;};
-NA_EIDPROC
inline void setNextSearch(Block* b){nextSearchBlock_ = b;};
-NA_EIDPROC
inline char * getDataPtr(){return dataPtr_;};
-NA_EIDPROC
inline Lng32 getMaxSize(){return maxSize_;};
};
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/common/ComSqlId.h
----------------------------------------------------------------------
diff --git a/core/sql/common/ComSqlId.h b/core/sql/common/ComSqlId.h
index 80e70ed..8d0abc7 100644
--- a/core/sql/common/ComSqlId.h
+++ b/core/sql/common/ComSqlId.h
@@ -143,7 +143,7 @@ public:
{
MIN_SESSION_ID_LEN =
PREFIX_LEN + VERSION_LEN + SEGMENT_LEN +
-// in case NA_LINUX Cpu and Segment number are at the same location
+ // in case Cpu and Segment number are at the same location
PIN_LEN + STARTTS_LEN + SESSIONNUM_LEN + USERNAMELEN_LEN +
SESSIONNAMELEN_LEN
};
@@ -184,10 +184,10 @@ public:
USERNAME_OFFSET = USERNAMELEN_OFFSET + USERNAMELEN_LEN
};
-NA_EIDPROC
+
ComSqlId(CollHeap * heap);
-NA_EIDPROC
+
static Lng32 getSqlQueryIdAttr
(Lng32 attr, // which attr (SqlQueryIDAttr)
char * queryId, // query ID
@@ -198,7 +198,7 @@ NA_EIDPROC
// the returned value.
char * stringValue); // null terminated returned value for string attrs.
-NA_EIDPROC
+
static Lng32 getSqlSessionIdAttr
(Lng32 attr, // which attr (SqlQueryIDAttr)
char * queryId, // query ID
@@ -210,7 +210,7 @@ NA_EIDPROC
char * stringValue); // null terminated returned value for string attrs.
-NA_EIDPROC
+
static Lng32 createSqlSessionId
(char * sessionId, // INOUT
Lng32 maxSessionIdLen, // IN
@@ -226,7 +226,7 @@ NA_EIDPROC
const char *userSessionName // IN
);
-NA_EIDPROC
+
static Lng32 createSqlQueryId
(char * queryId, // INOUT
Lng32 maxQueryIdLen, // IN
@@ -238,7 +238,7 @@ NA_EIDPROC
char * queryName // IN
);
-NA_EIDPROC
+
static Lng32 extractSqlSessionIdAttrs
(const char * sessionId, // IN
Lng32 sessionIdLen, // IN
@@ -255,7 +255,7 @@ NA_EIDPROC
);
// returns a compact form of query id which is shipped to dp2.
-NA_EIDPROC
+
static Lng32 getDp2QueryIdString
(char * queryId,
Lng32 queryIdLen,
@@ -263,7 +263,6 @@ NA_EIDPROC
Lng32 &dp2QueryIdLen
);
-NA_EIDPROC
static Lng32 decomposeDp2QueryIdString
(char * queryId, // input: buffer containing dp2 query id
Lng32 queryIdLen, // input: length of query id
@@ -276,7 +275,7 @@ NA_EIDPROC
);
private:
- NA_EIDPROC
+
static Lng32 getSqlIdAttr
(Lng32 attr, // which attr (SqlQueryIDAttr)
const char * queryId,// query ID
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/common/ComSysUtils.cpp
----------------------------------------------------------------------
diff --git a/core/sql/common/ComSysUtils.cpp b/core/sql/common/ComSysUtils.cpp
index 38bbcd2..957ee51 100644
--- a/core/sql/common/ComSysUtils.cpp
+++ b/core/sql/common/ComSysUtils.cpp
@@ -80,7 +80,6 @@
// ****************************************************************************
extern "C" {
-NA_EIDPROC
Int32 NA_gettimeofday(struct NA_timeval *tp, struct NA_timezone *tzp)
{
return gettimeofday(tp, 0);
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/common/ComSysUtils.h
----------------------------------------------------------------------
diff --git a/core/sql/common/ComSysUtils.h b/core/sql/common/ComSysUtils.h
index 8f786e4..341851a 100644
--- a/core/sql/common/ComSysUtils.h
+++ b/core/sql/common/ComSysUtils.h
@@ -150,26 +150,19 @@ inline UInt64 reversebytes( UInt64 xx )
return sink.xx;
}
-#ifdef NA_64BIT /* Needed when _int64 and Int64 don't resolve to same basic type */
-/*inline _int64 reversebytes( _int64 sometexianendian )
-{
- return( (_int64) reversebytes( (Int64) sometexianendian ) );
-} */
-#endif
-
-#endif // NA_LITTLE_ENDIAN and NA_WINNT
+#endif // NA_LITTLE_ENDIAN
//----------------------------------------------------------------
#endif
-NA_EIDPROC
+
void copyInteger (void *destination, Int32 targetLength,
void *sourceAddress, Int32 sourceLength);
void copyToInteger1 (Int8 *destination, void *sourceAddress, Int32 sourceSize);
-NA_EIDPROC
+
void copyToInteger2 (short *destination, void *sourceAddress, Int32 sourceSize);
-NA_EIDPROC
+
void copyToInteger4 (Lng32 *destination, void *sourceAddress, Int32 sourceSize);
-NA_EIDPROC
+
void copyToInteger8 (Int64 *destination, void *sourceAddress, Int32 sourceSize);
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/common/ComVersionDefs.h
----------------------------------------------------------------------
diff --git a/core/sql/common/ComVersionDefs.h b/core/sql/common/ComVersionDefs.h
index 09da278..4c11ce0 100644
--- a/core/sql/common/ComVersionDefs.h
+++ b/core/sql/common/ComVersionDefs.h
@@ -104,7 +104,7 @@ inline
COM_VERSION ComVersion_GetCurrentSchemaVersion (void) {return COM_VERS_CURR_SCHEMA;};
inline
COM_VERSION ComVersion_GetMXV (void) {return COM_VERS_MXV;};
-inline NA_EIDPROC
+inline
COM_VERSION ComVersion_GetCurrentPlanVersion (void) {return COM_VERS_CURR_PLAN;};
//
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/common/DgBaseType.h
----------------------------------------------------------------------
diff --git a/core/sql/common/DgBaseType.h b/core/sql/common/DgBaseType.h
index a538205..721af8b 100644
--- a/core/sql/common/DgBaseType.h
+++ b/core/sql/common/DgBaseType.h
@@ -84,13 +84,13 @@ enum DGTYPE
class DgBase
{
public:
-NA_EIDPROC
+
virtual DGTYPE getTypeName() const = 0;
};
-NA_EIDPROC
+
ComDiagsArea& operator<<(ComDiagsArea&, const DgBase &);
@@ -106,13 +106,11 @@ class DgSqlCode : public DgBase
{
public:
enum ErrorOrWarning { ERROR_ = -1, WARNING_ = +1 };
-NA_EIDPROC
DgSqlCode (Lng32 aSqlCode);
-NA_EIDPROC
DgSqlCode (Lng32 aSqlCode, ErrorOrWarning e);
-NA_EIDPROC
+
Lng32 getSQLCODE() const {return theSQLCODE_; }
-NA_EIDPROC
+
DGTYPE getTypeName() const ;
private:
Lng32 theSQLCODE_;
@@ -122,11 +120,11 @@ private:
class DgColumnName : public DgBase
{
public:
-NA_EIDPROC
+
DgColumnName (const char * const);
-NA_EIDPROC
+
const char * getCharStr () const {return theCharStr_; };
-NA_EIDPROC
+
DGTYPE getTypeName() const;
private:
const char * const theCharStr_;
@@ -136,11 +134,11 @@ private:
class DgCustomSQLState : public DgBase
{
public:
-NA_EIDPROC
+
DgCustomSQLState (const char * const);
-NA_EIDPROC
+
const char * getCharStr () const {return theCharStr_; };
-NA_EIDPROC
+
DGTYPE getTypeName() const;
private:
const char * const theCharStr_;
@@ -150,11 +148,11 @@ private:
class DgCatalogName : public DgBase
{
public:
-NA_EIDPROC
+
DgCatalogName (const char * const);
-NA_EIDPROC
+
const char * getCharStr () const {return theCharStr_; };
-NA_EIDPROC
+
DGTYPE getTypeName() const;
private:
const char * const theCharStr_;
@@ -164,11 +162,11 @@ private:
class DgSchemaName : public DgBase
{
public:
-NA_EIDPROC
+
DgSchemaName (const char * const);
-NA_EIDPROC
+
const char * getCharStr () const {return theCharStr_; };
-NA_EIDPROC
+
DGTYPE getTypeName() const;
private:
const char * const theCharStr_;
@@ -178,11 +176,11 @@ private:
class DgTableName : public DgBase
{
public:
-NA_EIDPROC
+
DgTableName (const char * const);
-NA_EIDPROC
+
const char * getCharStr () const {return theCharStr_; };
-NA_EIDPROC
+
DGTYPE getTypeName() const;
private:
const char * const theCharStr_;
@@ -192,11 +190,11 @@ private:
class DgConstraintCatalog : public DgBase
{
public:
-NA_EIDPROC
+
DgConstraintCatalog (const char * const);
-NA_EIDPROC
+
const char * getCharStr () const {return theCharStr_; };
-NA_EIDPROC
+
DGTYPE getTypeName() const ;
private:
const char * const theCharStr_;
@@ -206,11 +204,11 @@ private:
class DgConstraintSchema : public DgBase
{
public:
-NA_EIDPROC
+
DgConstraintSchema (const char * const);
-NA_EIDPROC
+
const char * getCharStr () const {return theCharStr_; };
-NA_EIDPROC
+
DGTYPE getTypeName() const ;
private:
const char * const theCharStr_;
@@ -220,11 +218,11 @@ private:
class DgConstraintName : public DgBase
{
public:
-NA_EIDPROC
+
DgConstraintName (const char * const);
-NA_EIDPROC
+
const char * getCharStr () const {return theCharStr_; };
-NA_EIDPROC
+
DGTYPE getTypeName() const ;
private:
const char * const theCharStr_;
@@ -234,11 +232,11 @@ private:
class DgRowNumber : public DgBase
{
public:
-NA_EIDPROC
+
DgRowNumber (Lng32);
-NA_EIDPROC
+
Lng32 getLong () const {return theLong_; };
-NA_EIDPROC
+
DGTYPE getTypeName() const;
private:
Lng32 theLong_;
@@ -248,11 +246,8 @@ private:
class DgTriggerCatalog : public DgBase
{
public:
-NA_EIDPROC
DgTriggerCatalog (const char * const);
-NA_EIDPROC
const char * getCharStr () const {return theCharStr_; };
-NA_EIDPROC
DGTYPE getTypeName() const ;
private:
const char * const theCharStr_;
@@ -262,11 +257,8 @@ private:
class DgTriggerSchema : public DgBase
{
public:
-NA_EIDPROC
DgTriggerSchema (const char * const);
-NA_EIDPROC
const char * getCharStr () const {return theCharStr_; };
-NA_EIDPROC
DGTYPE getTypeName() const ;
private:
const char * const theCharStr_;
@@ -276,11 +268,8 @@ private:
class DgTriggerName : public DgBase
{
public:
-NA_EIDPROC
DgTriggerName (const char * const);
-NA_EIDPROC
const char * getCharStr () const {return theCharStr_; };
-NA_EIDPROC
DGTYPE getTypeName() const ;
private:
const char * const theCharStr_;
@@ -290,11 +279,11 @@ private:
class DgNskCode : public DgBase
{
public:
-NA_EIDPROC
+
DgNskCode (Lng32);
-NA_EIDPROC
+
Lng32 getLong () const {return theLong_; };
-NA_EIDPROC
+
DGTYPE getTypeName() const;
private:
Lng32 theLong_;
@@ -304,11 +293,11 @@ private:
class DgString0 : public DgBase
{
public:
-NA_EIDPROC
+
DgString0 (const char * const);
-NA_EIDPROC
+
const char * getCharStr () const {return theCharStr_; };
-NA_EIDPROC
+
DGTYPE getTypeName() const;
private:
const char * const theCharStr_;
@@ -318,11 +307,11 @@ private:
class DgString1 : public DgBase
{
public:
-NA_EIDPROC
+
DgString1 (const char * const);
-NA_EIDPROC
+
const char * getCharStr () const {return theCharStr_; };
-NA_EIDPROC
+
DGTYPE getTypeName() const ;
private:
const char * const theCharStr_;
@@ -332,11 +321,11 @@ private:
class DgString2 : public DgBase
{
public:
-NA_EIDPROC
+
DgString2 (const char * const);
-NA_EIDPROC
+
const char * getCharStr () const {return theCharStr_; };
-NA_EIDPROC
+
DGTYPE getTypeName() const ;
private:
const char * const theCharStr_;
@@ -346,11 +335,11 @@ private:
class DgString3 : public DgBase
{
public:
-NA_EIDPROC
+
DgString3 (const char * const);
-NA_EIDPROC
+
const char * getCharStr () const {return theCharStr_; };
-NA_EIDPROC
+
DGTYPE getTypeName() const;
private:
const char * const theCharStr_;
@@ -360,11 +349,11 @@ private:
class DgString4 : public DgBase
{
public:
-NA_EIDPROC
+
DgString4 (const char * const);
-NA_EIDPROC
+
const char * getCharStr () const {return theCharStr_; };
-NA_EIDPROC
+
DGTYPE getTypeName() const ;
private:
const char * const theCharStr_;
@@ -375,11 +364,11 @@ private:
class DgWString0 : public DgBase
{
public:
-NA_EIDPROC
+
DgWString0 (const NAWchar* const x) : theWCharStr_(x) {};
-NA_EIDPROC
+
const NAWchar* getWCharStr () const {return theWCharStr_; };
-NA_EIDPROC
+
DGTYPE getTypeName() const { return DGWSTRING0; };
private:
const NAWchar* const theWCharStr_;
@@ -389,11 +378,11 @@ private:
class DgWString1 : public DgBase
{
public:
-NA_EIDPROC
+
DgWString1 (const NAWchar* const x) : theWCharStr_(x) {};
-NA_EIDPROC
+
const NAWchar* getWCharStr () const {return theWCharStr_; };
-NA_EIDPROC
+
DGTYPE getTypeName() const { return DGWSTRING1; };
private:
const NAWchar* const theWCharStr_;
@@ -403,11 +392,11 @@ private:
class DgWString2 : public DgBase
{
public:
-NA_EIDPROC
+
DgWString2 (const NAWchar* const x) : theWCharStr_(x) {};
-NA_EIDPROC
+
const NAWchar* getWCharStr () const {return theWCharStr_; };
-NA_EIDPROC
+
DGTYPE getTypeName() const { return DGWSTRING2; };
private:
const NAWchar* const theWCharStr_;
@@ -417,11 +406,11 @@ private:
class DgWString3 : public DgBase
{
public:
-NA_EIDPROC
+
DgWString3 (const NAWchar* const x) : theWCharStr_(x) {};
-NA_EIDPROC
+
const NAWchar* getWCharStr () const {return theWCharStr_; };
-NA_EIDPROC
+
DGTYPE getTypeName() const { return DGWSTRING3; };
private:
const NAWchar* const theWCharStr_;
@@ -431,11 +420,11 @@ private:
class DgWString4 : public DgBase
{
public:
-NA_EIDPROC
+
DgWString4 (const NAWchar* const x) : theWCharStr_(x) {};
-NA_EIDPROC
+
const NAWchar* getWCharStr () const {return theWCharStr_; };
-NA_EIDPROC
+
DGTYPE getTypeName() const { return DGWSTRING4; };
private:
const NAWchar* const theWCharStr_;
@@ -445,11 +434,11 @@ private:
class DgInt0 : public DgBase
{
public:
-NA_EIDPROC
+
DgInt0 (Lng32);
-NA_EIDPROC
+
Lng32 getLong () const {return theLong_; };
-NA_EIDPROC
+
DGTYPE getTypeName() const;
private:
Lng32 theLong_;
@@ -459,11 +448,11 @@ private:
class DgInt1 : public DgBase
{
public:
-NA_EIDPROC
+
DgInt1 (Lng32);
-NA_EIDPROC
+
Lng32 getLong () const {return theLong_; };
-NA_EIDPROC
+
DGTYPE getTypeName() const ;
private:
Lng32 theLong_;
@@ -473,11 +462,11 @@ private:
class DgInt2 : public DgBase
{
public:
-NA_EIDPROC
+
DgInt2 (Lng32);
-NA_EIDPROC
+
Lng32 getLong () const {return theLong_; };
-NA_EIDPROC
+
DGTYPE getTypeName() const ;
private:
Lng32 theLong_;
@@ -487,11 +476,11 @@ private:
class DgInt3 : public DgBase
{
public:
-NA_EIDPROC
+
DgInt3 (Lng32);
-NA_EIDPROC
+
Lng32 getLong () const {return theLong_; };
-NA_EIDPROC
+
DGTYPE getTypeName() const ;
private:
Lng32 theLong_;
@@ -501,11 +490,11 @@ private:
class DgInt4 : public DgBase
{
public:
-NA_EIDPROC
+
DgInt4 (Lng32);
-NA_EIDPROC
+
Lng32 getLong () const {return theLong_; };
-NA_EIDPROC
+
DGTYPE getTypeName() const ;
private:
Lng32 theLong_;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/common/DllExportDefines.h
----------------------------------------------------------------------
diff --git a/core/sql/common/DllExportDefines.h b/core/sql/common/DllExportDefines.h
index e700690..178ea35 100644
--- a/core/sql/common/DllExportDefines.h
+++ b/core/sql/common/DllExportDefines.h
@@ -18,24 +18,3 @@
// under the License.
//
// @@@ END COPYRIGHT @@@
-#ifndef DLL_EXPORT_DEFINES_H
-#define DLL_EXPORT_DEFINES_H
-
-#undef SQLCLI_LIB_FUNC
-
-#if (defined (CLI_DLL) && !defined (NA_NSK))
- #ifdef SQLCLI_LIB
- #define SQLCLI_LIB_FUNC __declspec( dllexport )
- #else
- #define SQLCLI_LIB_FUNC __declspec( dllimport )
- #endif
-#else
- #define SQLCLI_LIB_FUNC
-#endif
-#ifdef NA_64BIT
- // dg64 - get rid of _declspec
- #undef SQLCLI_LIB_FUNC
- #define SQLCLI_LIB_FUNC
-#endif
-
-#endif // DLL_EXPORT_DEFINES.h
[07/30] incubator-trafodion git commit: TRAFODION-2731 CodeCleanup:
Remove obsolete, legacy and unused code
Posted by an...@apache.org.
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>
[15/30] incubator-trafodion git commit: TRAFODION-2731 CodeCleanup:
Remove obsolete, legacy and unused code
Posted by an...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/ExVPJoin.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExVPJoin.cpp b/core/sql/executor/ExVPJoin.cpp
index 0de47cd..ff9caa6 100644
--- a/core/sql/executor/ExVPJoin.cpp
+++ b/core/sql/executor/ExVPJoin.cpp
@@ -43,7 +43,6 @@
// obsolete and not used.
// LCOV_EXCL_START
-NA_EIDPROC
ex_tcb * ExVPJoinTdb::build(ex_globals * glob)
{
// first build the child TCBs
@@ -67,7 +66,6 @@ ex_tcb * ExVPJoinTdb::build(ex_globals * glob)
}
-NA_EIDPROC
ExVPJoinTcb::ExVPJoinTcb(const ExVPJoinTdb & vpjTdb,
const ex_tcb ** childTcbs,
ex_globals *glob)
@@ -116,7 +114,6 @@ ExVPJoinTcb::ExVPJoinTcb(const ExVPJoinTdb & vpjTdb,
nextReqIx_ = qParent_.down->getHeadIndex();
}
-NA_EIDPROC
ExVPJoinTcb::~ExVPJoinTcb()
{
delete qParent_.up;
@@ -143,11 +140,9 @@ Int32 ExVPJoinTcb::numChildren() const
-NA_EIDPROC
void ExVPJoinTcb::freeResources()
{}
-NA_EIDPROC
void ExVPJoinTcb::registerSubtasks()
{
ExScheduler *sched = getGlobals()->getScheduler();
@@ -173,7 +168,6 @@ void ExVPJoinTcb::registerSubtasks()
exceptionEvent_ = sched->registerNonQueueSubtask(sWorkUp, this);
}
-NA_EIDPROC
short ExVPJoinTcb::work()
{
// The work procedures for VPJoin first pass a request from the
@@ -191,7 +185,6 @@ short ExVPJoinTcb::work()
return WORK_OK;
}
-NA_EIDPROC
ExWorkProcRetcode ExVPJoinTcb::workDown()
{
// Move requests from parent down queue to child down queues.
@@ -255,7 +248,6 @@ ExWorkProcRetcode ExVPJoinTcb::workDown()
return WORK_OK;
}
-NA_EIDPROC
ExWorkProcRetcode ExVPJoinTcb::workUp()
{
// Move replies from child nodes up to parent. The replies at the
@@ -435,7 +427,6 @@ ExWorkProcRetcode ExVPJoinTcb::workUp()
return WORK_OK;
}
-NA_EIDPROC
void ExVPJoinTcb::cancelParentRequest(ex_queue_entry * pentry,
queue_index pix)
{
@@ -453,7 +444,6 @@ void ExVPJoinTcb::cancelParentRequest(ex_queue_entry * pentry,
}
}
-NA_EIDPROC
ExWorkProcRetcode ExVPJoinTcb::workCancel()
{
// Walk through already processed down requests and cancel those
@@ -472,29 +462,23 @@ ExWorkProcRetcode ExVPJoinTcb::workCancel()
return WORK_OK;
}
-NA_EIDPROC
short ExVPJoinTcb::sWorkDown(ex_tcb *tcb)
{ return ((ExVPJoinTcb *) tcb)->workDown(); }
-NA_EIDPROC
short ExVPJoinTcb::sWorkUp(ex_tcb *tcb)
{ return ((ExVPJoinTcb *) tcb)->workUp(); }
-NA_EIDPROC
short ExVPJoinTcb::sWorkCancel(ex_tcb *tcb)
{ return ((ExVPJoinTcb *) tcb)->workCancel(); }
-NA_EIDPROC
ExVPJoinPrivateState::ExVPJoinPrivateState(const ExVPJoinTcb * tcb)
{
init();
}
-NA_EIDPROC
ex_tcb_private_state * ExVPJoinPrivateState::allocate_new(const ex_tcb * tcb)
{
return new (((ex_tcb*)tcb)->getSpace()) ExVPJoinPrivateState((ExVPJoinTcb*) tcb);
}
-NA_EIDPROC
ExVPJoinPrivateState::~ExVPJoinPrivateState()
{}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/ExVPJoin.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExVPJoin.h b/core/sql/executor/ExVPJoin.h
index 1e7f156..bbc7c80 100644
--- a/core/sql/executor/ExVPJoin.h
+++ b/core/sql/executor/ExVPJoin.h
@@ -88,16 +88,16 @@ public:
// retrieval of the virtual table function pointer of the class while
// unpacking. An empty constructor is enough.
// ---------------------------------------------------------------------
- NA_EIDPROC ExVPJoinTdb()
+ ExVPJoinTdb()
{}
- NA_EIDPROC virtual ~ExVPJoinTdb()
+ virtual ~ExVPJoinTdb()
{}
// ---------------------------------------------------------------------
// Build a TCB for this TDB. Redefined in the Executor project.
// ---------------------------------------------------------------------
- NA_EIDPROC virtual ex_tcb *build(ex_globals *globals);
+ virtual ex_tcb *build(ex_globals *globals);
private:
// ---------------------------------------------------------------------
@@ -136,16 +136,16 @@ class ExVPJoinTcb: public ex_tcb
public:
- NA_EIDPROC ExVPJoinTcb(const ExVPJoinTdb & vpjTdb, // TDB from which to build TCB
+ ExVPJoinTcb(const ExVPJoinTdb & vpjTdb, // TDB from which to build TCB
const ex_tcb ** childTcbs, // child TCBs
ex_globals *glob // globals
);
- NA_EIDPROC ~ExVPJoinTcb();
+ ~ExVPJoinTcb();
- NA_EIDPROC void freeResources();
- NA_EIDPROC ExWorkProcRetcode work();
- NA_EIDPROC void registerSubtasks();
+ void freeResources();
+ ExWorkProcRetcode work();
+ void registerSubtasks();
const ex_tcb* getChild(Int32 pos) const;
ex_queue_pair getParentQueue() const;
@@ -157,19 +157,16 @@ private:
// Work methods.
//
- NA_EIDPROC ExWorkProcRetcode workDown();
- NA_EIDPROC ExWorkProcRetcode workUp();
- NA_EIDPROC ExWorkProcRetcode workCancel();
+ ExWorkProcRetcode workDown();
+ ExWorkProcRetcode workUp();
+ ExWorkProcRetcode workCancel();
// Static work procedures for scheduler.
//
- NA_EIDPROC
static short sWorkDown(ex_tcb *tcb);
// { return ((ExVPJoinTcb *) tcb)->workDown(); }
- NA_EIDPROC
static short sWorkUp(ex_tcb *tcb);
// { return ((ExVPJoinTcb *) tcb)->workUp(); }
- NA_EIDPROC
static short sWorkCancel(ex_tcb *tcb);
// { return ((ExVPJoinTcb *) tcb)->workCancel(); }
@@ -178,7 +175,7 @@ private:
// Cancel request from parent. pReq points to (parent down)
// queue entry containing the request, and pIx identifies the
// queue index of this entry.
- NA_EIDPROC void cancelParentRequest(ex_queue_entry *pReq, queue_index pIx);
+ void cancelParentRequest(ex_queue_entry *pReq, queue_index pIx);
// Event by which we can tell the scheduler to call workUp(). This
// is sometimes necessary to handle cancelled requests correctly.
@@ -205,9 +202,9 @@ class ExVPJoinPrivateState : public ex_tcb_private_state
friend class ExVPJoinTcb;
public:
- NA_EIDPROC ExVPJoinPrivateState(const ExVPJoinTcb * tcb);
- NA_EIDPROC ex_tcb_private_state * allocate_new(const ex_tcb * tcb);
- NA_EIDPROC ~ExVPJoinPrivateState();
+ ExVPJoinPrivateState(const ExVPJoinTcb * tcb);
+ ex_tcb_private_state * allocate_new(const ex_tcb * tcb);
+ ~ExVPJoinPrivateState();
private:
inline void init();
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/Ex_esp_msg.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/Ex_esp_msg.h b/core/sql/executor/Ex_esp_msg.h
index 4b7b924..aea180f 100644
--- a/core/sql/executor/Ex_esp_msg.h
+++ b/core/sql/executor/Ex_esp_msg.h
@@ -1132,14 +1132,8 @@ public:
{ return f_.fragmentLength_; }
inline char *getFragment() const { return fragment_; }
inline Lng32 getNumTemps() const { return f_.numTemps_; }
-#ifndef NA_TMFNOTYETSUPPORTED
inline NABoolean getNeedsTransaction() const
{ return (NABoolean) f_.needsTransaction_; }
-#else
- inline NABoolean getNeedsTransaction() const
- { return (NABoolean) 0; }
-
-#endif
inline NABoolean getDisplayInGui() const
{ return (NABoolean) f_.displayInGui_; }
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/FixedSizeHeapElement.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/FixedSizeHeapElement.h b/core/sql/executor/FixedSizeHeapElement.h
index d14a41e..d944976 100644
--- a/core/sql/executor/FixedSizeHeapElement.h
+++ b/core/sql/executor/FixedSizeHeapElement.h
@@ -58,41 +58,41 @@ class FixedSizeHeapElement
public:
// Constructor.
- NA_EIDPROC FixedSizeHeapElement
+ FixedSizeHeapElement
(FixedSizeHeapElement * nextElementPtr = 0)
: nextElementPtr_(nextElementPtr) {}
// Destructor.
- NA_EIDPROC inline ~FixedSizeHeapElement() {}
+ inline ~FixedSizeHeapElement() {}
// Operator new.
- NA_EIDPROC inline void * operator new(size_t, char * ptr);
+ inline void * operator new(size_t, char * ptr);
// Operator new. This should never be called.
- NA_EIDPROC void * operator new(size_t)
+ void * operator new(size_t)
{
ex_assert(0,"FixedSizeHeapElement::operator new(size_t) called.");
return 0;
}
// Operator delete. This should never be called.
- NA_EIDPROC void operator delete(void *)
+ void operator delete(void *)
{
ex_assert(0,"FixedSizeHeapElement::operator delete(void *) called.");
}
// Get function for nextElementPtr_.
- NA_EIDPROC inline FixedSizeHeapElement * getNextElementPtr() const;
+ inline FixedSizeHeapElement * getNextElementPtr() const;
// Print the status of the element.
#ifdef NA_MDAM_EXECUTOR_DEBUG
- NA_EIDPROC inline void print(const char * header = "") const;
+ inline void print(const char * header = "") const;
#endif /* NA_MDAM_EXECUTOR_DEBUG */
// Set function for nextElementPtr_.
- NA_EIDPROC inline void setNextElementPtr
+ inline void setNextElementPtr
(FixedSizeHeapElement * nextElementPtr);
private:
@@ -110,7 +110,7 @@ private:
// Operator new.
-NA_EIDPROC inline void * FixedSizeHeapElement::operator new(size_t, char * ptr)
+inline void * FixedSizeHeapElement::operator new(size_t, char * ptr)
{
return (void *)ptr; // $$$$ is the cast necessary?
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/FixedSizeHeapManager.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/FixedSizeHeapManager.h b/core/sql/executor/FixedSizeHeapManager.h
index 7e22933..dbf5d59 100644
--- a/core/sql/executor/FixedSizeHeapManager.h
+++ b/core/sql/executor/FixedSizeHeapManager.h
@@ -63,37 +63,37 @@ friend class FixedSizeHeapManagerBlock;
public:
// Constructor.
- NA_EIDPROC FixedSizeHeapManager(const size_t elementSize,
+ FixedSizeHeapManager(const size_t elementSize,
const Lng32 numberOfElements);
// Destructor.
- NA_EIDPROC ~FixedSizeHeapManager();
+ ~FixedSizeHeapManager();
// Obtains the memory for the heap. Returns 0 if successful and an
// ExeErrorCode if not successful. Builds the free list.
- NA_EIDPROC ExeErrorCode acquireHeapMemory(NAMemory * defaultHeapPtr);
+ ExeErrorCode acquireHeapMemory(NAMemory * defaultHeapPtr);
// Allocate an element on the heap.
- NA_EIDPROC void * allocateElement(size_t size);
+ void * allocateElement(size_t size);
// Returns true if the heap memory has been acquired. Otherwise, returns
// false.
- NA_EIDPROC NABoolean heapMemoryAcquired() const;
+ NABoolean heapMemoryAcquired() const;
// Print the status of the heap.
#ifdef NA_MDAM_EXECUTOR_DEBUG
- NA_EIDPROC void print(const char * header = "") const;
+ void print(const char * header = "") const;
#endif /* NA_MDAM_EXECUTOR_DEBUG */
// Release an element from the heap and return the space to the free list.
- NA_EIDPROC inline void releaseElement(void * elementPtr);
+ inline void releaseElement(void * elementPtr);
// Release heap memory.
- NA_EIDPROC void releaseHeapMemory();
+ void releaseHeapMemory();
// Returns true if there is space available for an element on the heap.
// Retruns false if the heap is full or memory not acquired.
- NA_EIDPROC inline NABoolean elementSpaceAvailable() const;
+ inline NABoolean elementSpaceAvailable() const;
private:
@@ -120,7 +120,7 @@ private:
Lng32 sizeBlockRounded_;
// Copy constructor disallowed.
- NA_EIDPROC inline FixedSizeHeapManager(const FixedSizeHeapManager &);
+ inline FixedSizeHeapManager(const FixedSizeHeapManager &);
}; // class FixedSizeHeapManager
@@ -171,19 +171,19 @@ class FixedSizeHeapManagerBlock
public:
// Constructor.
- NA_EIDPROC FixedSizeHeapManagerBlock(FixedSizeHeapManager & fixedSizeHeapManagerRef,
+ FixedSizeHeapManagerBlock(FixedSizeHeapManager & fixedSizeHeapManagerRef,
const Lng32 numberOfElements,
const size_t rawMemorySize);
// Destructor.
- NA_EIDPROC inline ~FixedSizeHeapManagerBlock();
+ inline ~FixedSizeHeapManagerBlock();
// Operator new.
- NA_EIDPROC inline void * operator new(size_t, char * ptr);
+ inline void * operator new(size_t, char * ptr);
// Get function for nextBlockPtr_.
- NA_EIDPROC inline FixedSizeHeapManagerBlock * getNextBlockPtr();
+ inline FixedSizeHeapManagerBlock * getNextBlockPtr();
private:
@@ -205,7 +205,7 @@ private:
// Print function.
#ifdef NA_MDAM_EXECUTOR_DEBUG
- NA_EIDPROC void print(const char * header = "") const;
+ void print(const char * header = "") const;
#endif /* NA_MDAM_EXECUTOR_DEBUG */
}; // class FixedSizeHeapManagerBlock
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/MdamEndPoint.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/MdamEndPoint.h b/core/sql/executor/MdamEndPoint.h
index ba3dc7b..51285a9 100644
--- a/core/sql/executor/MdamEndPoint.h
+++ b/core/sql/executor/MdamEndPoint.h
@@ -65,20 +65,20 @@ class MdamEndPoint
public:
// Default constructor.
- NA_EIDPROC MdamEndPoint();
+ MdamEndPoint();
// This constructor is passed a pointer to the interval from which the
// MdamPoint is taken. Point type is also passed to specify which of the
// two points to use.
- NA_EIDPROC MdamEndPoint(MdamInterval * intervalPtr,
+ MdamEndPoint(MdamInterval * intervalPtr,
MdamEnums::MdamEndPointType endPointType,
const Int32 logicalIntervalListNumber);
// Destructor.
- NA_EIDPROC ~MdamEndPoint() {}
+ ~MdamEndPoint() {}
// Adjust the interval pointer to track the active reference list.
- NA_EIDPROC void adjustIntervalPtr(MdamInterval * & intervalPtr,
+ void adjustIntervalPtr(MdamInterval * & intervalPtr,
const Int32 logicalIntervalListNumber) const;
// Assign intervalPtr[1] in this to the corresponding value in other.
@@ -86,48 +86,48 @@ public:
// represents points from both interval lists. intervalPtr is the
// only data member that needs to be transferred. All others are
// equal or the points wouldn't have been treated as duplicates.
- NA_EIDPROC inline void assignIntervalPtr1(const MdamEndPoint * other);
+ inline void assignIntervalPtr1(const MdamEndPoint * other);
// Determine if the point is a begin endpoint.
- NA_EIDPROC inline NABoolean begin() const;
+ inline NABoolean begin() const;
// Compare two endpoints. The function determines if the endpoint pointed
// to by this is {less than | equal to | greater than} the endpoint pointed
// to by other.
- NA_EIDPROC MdamEnums::MdamOrder compare
+ MdamEnums::MdamOrder compare
(const MdamEndPoint * other, const ULng32 keyLen) const;
// Determine if the point is a end endpoint.
- NA_EIDPROC inline NABoolean end() const;
+ inline NABoolean end() const;
// Determine if the point exists.
- NA_EIDPROC inline NABoolean exists() const;
+ inline NABoolean exists() const;
// Get function for inclusion.
- NA_EIDPROC inline MdamEnums::MdamInclusion getInclusion();
+ inline MdamEnums::MdamInclusion getInclusion();
// Get function for pointPtr_.
- NA_EIDPROC inline const MdamPoint * getPointPtr() const;
+ inline const MdamPoint * getPointPtr() const;
// If an interval were to be formed using this MdamEndPoint as the end endpoint
// and previousEndPoint MdamEndPoint as the begin endpoint, this function determines
// if the resulting interval would be empty.
- NA_EIDPROC NABoolean givesNonEmptyInterval
+ NABoolean givesNonEmptyInterval
(const MdamEndPoint * previousEndPoint, const ULng32 keyLen) const;
// Print function.
#ifdef NA_MDAM_EXECUTOR_DEBUG
- NA_EIDPROC void print(const char * header = "") const;
+ void print(const char * header = "") const;
#endif /* NA_MDAM_EXECUTOR_DEBUG */
// Reset an endpoint to its newly-constructed state.
- NA_EIDPROC void reset();
+ void reset();
// Reverse inclusion.
- NA_EIDPROC void reverseInclusion();
+ void reverseInclusion();
// Set member data items to reflect the specified endpoint.
- NA_EIDPROC void set(MdamInterval * intervalPtr,
+ void set(MdamInterval * intervalPtr,
MdamEnums::MdamEndPointType endPointType,
const Int32 logicalIntervalListNumber);
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/MdamInterval.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/MdamInterval.h b/core/sql/executor/MdamInterval.h
index c807b4a..7d3d73e 100644
--- a/core/sql/executor/MdamInterval.h
+++ b/core/sql/executor/MdamInterval.h
@@ -63,7 +63,7 @@ public:
// Constructor.
// $$$$ Possibly testing only.
- NA_EIDPROC inline MdamInterval(const tupp & beginTupp,
+ inline MdamInterval(const tupp & beginTupp,
const MdamEnums::MdamInclusion beginInclusion,
const tupp & endTupp,
const MdamEnums::MdamInclusion endInclusion,
@@ -71,20 +71,20 @@ public:
FixedSizeHeapManager & mdamRefListEntryHeap);
// Constructor without a disjunctNum. Building of MdamRefList is deferred.
- NA_EIDPROC MdamInterval(const tupp & beginTupp,
+ MdamInterval(const tupp & beginTupp,
const MdamEnums::MdamInclusion beginInclusion,
const tupp & endTupp,
const MdamEnums::MdamInclusion endInclusion);
// Constructor without a disjunctNum. Building of MdamRefList is deferred.
- NA_EIDPROC MdamInterval(MdamEndPoint & beginEndPoint,
+ MdamInterval(MdamEndPoint & beginEndPoint,
MdamEndPoint & endEndPoint);
// This constructor meets the special requirements of
// MdamIntervalList::unionSeparateDisjuncts. These requirements are:
// + reverse the inclusion of endEndPoint if it is of type BEGIN, and
// + build a reference list.
- NA_EIDPROC MdamInterval(MdamEndPoint & beginEndPoint,
+ MdamInterval(MdamEndPoint & beginEndPoint,
MdamEndPoint & endEndPoint,
MdamInterval * intervalPtr0,
MdamInterval * intervalPtr1,
@@ -92,28 +92,28 @@ public:
FixedSizeHeapManager & mdamRefListEntryHeap);
// Destructor.
- NA_EIDPROC ~MdamInterval();
+ ~MdamInterval();
// Operator new.
- NA_EIDPROC inline void * operator new(size_t size,
+ inline void * operator new(size_t size,
FixedSizeHeapManager & mdamIntervalHeap);
// Operator new with just size_t. This should never be called.
- NA_EIDPROC void * operator new(size_t size);
+ void * operator new(size_t size);
// Operator delete. This should never be called.
- NA_EIDPROC void operator delete(void *);
+ void operator delete(void *);
// Determines if a value is contained within this interval.
- NA_EIDPROC NABoolean contains(const ULng32 keyLen, const char * v)
+ NABoolean contains(const ULng32 keyLen, const char * v)
const;
// Create the Reference list for an interval. The new reference list is
// a copy of the reference list associated with interval1Ptr. disjunctNum
// is inserted into the new list if the interval pointed to by interval2Ptr
// is active.
- NA_EIDPROC void createRefList(const MdamInterval * interval1Ptr,
+ void createRefList(const MdamInterval * interval1Ptr,
const MdamInterval * interval2Ptr,
const Int32 disjunctNum,
FixedSizeHeapManager & mdamRefListEntryHeap);
@@ -124,49 +124,49 @@ public:
// Otherwise, it returns false. Failure can occur if the begin
// end point is excluded and incrementing the value results
// in an error or a value that is outside the interval.
- NA_EIDPROC NABoolean getFirstValue(const ULng32 keyLen, char * s)
+ NABoolean getFirstValue(const ULng32 keyLen, char * s)
const;
// Const function to get nextMdamIntervalPtr_.
- NA_EIDPROC inline MdamInterval * getNextMdamIntervalPtr() const;
+ inline MdamInterval * getNextMdamIntervalPtr() const;
// Get function that obtains the next value in an interval. The
// value is stored at the location specified by s. If the operation
// is successful, the function returns true. Otherwise, it returns
// false. Failure can occur if incrementing the value results in an
// error or a value that is outside the interval.
- NA_EIDPROC NABoolean getNextValue(const ULng32 keyLen, char * s) const;
+ NABoolean getNextValue(const ULng32 keyLen, char * s) const;
// Const function to get the address of the beginning or ending point.
- NA_EIDPROC MdamPoint * getPointPtr
+ MdamPoint * getPointPtr
(const MdamEnums::MdamEndPointType endPointType);
// Function to get the address of the MdamRefList.
- NA_EIDPROC inline MdamRefList * getRefListPtr();
+ inline MdamRefList * getRefListPtr();
// This function inserts a single disjunct number into the reference list
// associated with this MdamInterval.
- NA_EIDPROC inline void insertDisjunctNum(const Int32 disjunctNum,
+ inline void insertDisjunctNum(const Int32 disjunctNum,
FixedSizeHeapManager & mdamRefListEntryHeap);
// Release resources associated with this interval.
// This is used prior to returning the interval to the free list.
- NA_EIDPROC inline void release(FixedSizeHeapManager & mdamRefListEntryHeap);
+ inline void release(FixedSizeHeapManager & mdamRefListEntryHeap);
// Release reference list entries associated with this interval.
- NA_EIDPROC inline void releaseRefListEntries(FixedSizeHeapManager & mdamRefListEntryHeap);
+ inline void releaseRefListEntries(FixedSizeHeapManager & mdamRefListEntryHeap);
// Release tupp storage associated with this interval.
- NA_EIDPROC inline void releaseTupps();
+ inline void releaseTupps();
// Print functions.
#ifdef NA_MDAM_EXECUTOR_DEBUG
- NA_EIDPROC void print(const char * header = "") const;
- NA_EIDPROC void printBrief() const;
+ void print(const char * header = "") const;
+ void printBrief() const;
#endif /* NA_MDAM_EXECUTOR_DEBUG */
// Mutator function to set nextMdamIntervalPtr_.
- NA_EIDPROC void setNextMdamIntervalPtr(MdamInterval * nextMdamIntervalPtr);
+ void setNextMdamIntervalPtr(MdamInterval * nextMdamIntervalPtr);
private:
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/MdamIntervalIterator.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/MdamIntervalIterator.h b/core/sql/executor/MdamIntervalIterator.h
index 41f49f4..bf55859 100644
--- a/core/sql/executor/MdamIntervalIterator.h
+++ b/core/sql/executor/MdamIntervalIterator.h
@@ -62,14 +62,14 @@ class MdamIntervalIterator
public:
// Constructor.
- NA_EIDPROC MdamIntervalIterator(const MdamIntervalList * intervalListPtr,
+ MdamIntervalIterator(const MdamIntervalList * intervalListPtr,
const Int32 logicalIntervalListNumber);
// Destructor.
- NA_EIDPROC ~MdamIntervalIterator();
+ ~MdamIntervalIterator();
// Iteration operator returns the next endpoint on each call.
- NA_EIDPROC NABoolean operator()(MdamEndPoint & mdamEndPoint);
+ NABoolean operator()(MdamEndPoint & mdamEndPoint);
private:
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/MdamIntervalList.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/MdamIntervalList.h b/core/sql/executor/MdamIntervalList.h
index 11a71a6..41ab088 100644
--- a/core/sql/executor/MdamIntervalList.h
+++ b/core/sql/executor/MdamIntervalList.h
@@ -74,47 +74,47 @@ public:
// Default constructor creates an empty list.
#if defined ( NA_MDAM_EXECUTOR_DEBUG_ILTF )
- NA_EIDPROC MdamIntervalList(const Lng32 callerTag = -1);
+ MdamIntervalList(const Lng32 callerTag = -1);
#else
- NA_EIDPROC MdamIntervalList();
+ MdamIntervalList();
#endif /* NA_MDAM_EXECUTOR_DEBUG_ILTF */
// Destructor.
- NA_EIDPROC ~MdamIntervalList();
+ ~MdamIntervalList();
// Appends an MdamInterval onto an MdamIntervalList. Warning: caller
// must ensure that the new interval is disjoint and in order. No
// integrity checks are performed.
- NA_EIDPROC MdamIntervalList & append(MdamInterval * interval);
+ MdamIntervalList & append(MdamInterval * interval);
#if defined ( NA_MDAM_EXECUTOR_DEBUG_ILTF )
- NA_EIDPROC Lng32 countIntervals() const;
+ Lng32 countIntervals() const;
#endif /* NA_MDAM_EXECUTOR_DEBUG_ILTF */
// Delete all intervals in the list.
- NA_EIDPROC void deleteAllIntervals(FixedSizeHeapManager & mdamIntervalHeap,
+ void deleteAllIntervals(FixedSizeHeapManager & mdamIntervalHeap,
FixedSizeHeapManager & mdamRefListEntryHeap);
// This function inserts a single disjunct number into the reference list
// associated with each MdamInterval on the MdamIntervalList.
- NA_EIDPROC void insertDisjunctNum(const Int32 disjunctNum,
+ void insertDisjunctNum(const Int32 disjunctNum,
FixedSizeHeapManager & mdamRefListEntryHeap);
// Performs an intersect operation on two interval lists to produce a
// result list. The this list and the otherList are inputs to the
// intersect operation. The result replaces the this list. The
// original interval list entries for the this list are deleted.
- NA_EIDPROC MdamIntervalList & intersect
+ MdamIntervalList & intersect
(const MdamIntervalList & otherList,
const ULng32 keyLen,
FixedSizeHeapManager & mdamIntervalHeap,
FixedSizeHeapManager & mdamRefListEntryHeap);
// Determine if an interval list is empty.
- NA_EIDPROC inline NABoolean isEmpty() const;
+ inline NABoolean isEmpty() const;
#if defined ( NA_MDAM_EXECUTOR_DEBUG_ILTF )
- NA_EIDPROC void logEvent(const Lng32 functionId,
+ void logEvent(const Lng32 functionId,
const Lng32 intervalCount = 0,
const Int64 otherListId = -1,
const Lng32 callerTag = -1) const;
@@ -122,8 +122,8 @@ public:
// Print functions.
#if defined ( NA_MDAM_EXECUTOR_DEBUG )
- NA_EIDPROC void print(const char * header = "") const;
- NA_EIDPROC void printBrief() const;
+ void print(const char * header = "") const;
+ void printBrief() const;
#endif /* NA_MDAM_EXECUTOR_DEBUG */
// Performs an union operation on two interval lists to produce a
@@ -131,7 +131,7 @@ public:
// with them. The this list and the otherList are inputs to the
// union operation. The result replaces the this list. The
// original interval list entries for this list are deleted.
- NA_EIDPROC MdamIntervalList & unionSameDisjunct
+ MdamIntervalList & unionSameDisjunct
(const MdamIntervalList & otherList,
const ULng32 keyLen,
FixedSizeHeapManager & mdamIntervalHeap,
@@ -144,7 +144,7 @@ public:
// instead. The this list and the otherList are inputs to the
// intersect operation. The result replaces the this list. The
// original interval list entries for the this list are deleted.
- NA_EIDPROC MdamIntervalList & unionSeparateDisjuncts
+ MdamIntervalList & unionSeparateDisjuncts
(const MdamIntervalList & otherList,
const Int32 disjunctNum,
const ULng32 keyLen,
@@ -162,7 +162,7 @@ private:
// Give all intervals from this list and put them in otherList.
// this list becomes empty.
- NA_EIDPROC void giveAllIntervals(MdamIntervalList & otherList);
+ void giveAllIntervals(MdamIntervalList & otherList);
#if defined ( NA_MDAM_EXECUTOR_DEBUG_ILTF )
const Int64 intervalListId_;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/MdamIntervalListIterator.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/MdamIntervalListIterator.h b/core/sql/executor/MdamIntervalListIterator.h
index 12a99b1..08ceffd 100644
--- a/core/sql/executor/MdamIntervalListIterator.h
+++ b/core/sql/executor/MdamIntervalListIterator.h
@@ -55,21 +55,21 @@ class MdamIntervalListIterator
public:
// Constructor.
- NA_EIDPROC MdamIntervalListIterator
+ MdamIntervalListIterator
(const MdamIntervalList & intervalListRef)
: intervalListRef_(intervalListRef),
intervalPtr_(intervalListRef.firstIntervalPtr_)
{ }
// Destructor.
- NA_EIDPROC ~MdamIntervalListIterator() {}
+ ~MdamIntervalListIterator() {}
// Iteration operator returns a pointer to the next interval on each call.
// It is safe to use this operator even if the intervals are being deleted.
- NA_EIDPROC inline MdamInterval * operator()();
+ inline MdamInterval * operator()();
// This function resets the iterator to the beginning of the list.
- NA_EIDPROC inline void init();
+ inline void init();
private:
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/MdamIntervalListMerger.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/MdamIntervalListMerger.h b/core/sql/executor/MdamIntervalListMerger.h
index 1e62158..16017d2 100644
--- a/core/sql/executor/MdamIntervalListMerger.h
+++ b/core/sql/executor/MdamIntervalListMerger.h
@@ -62,7 +62,7 @@ class MdamIntervalListMerger
public:
// Constructor.
- NA_EIDPROC MdamIntervalListMerger
+ MdamIntervalListMerger
(const MdamIntervalList * intervalListPtr0,
const MdamIntervalList * intervalListPtr1,
const ULng32 keyLen)
@@ -81,16 +81,16 @@ public:
// Destructor.
- NA_EIDPROC ~MdamIntervalListMerger();
+ ~MdamIntervalListMerger();
// Iteration operator returns the next endpoint on each call.
- NA_EIDPROC NABoolean operator()(MdamEndPoint & mdamEndPoint);
+ NABoolean operator()(MdamEndPoint & mdamEndPoint);
// Get the number of active intervals for the most recent iteration call.
- NA_EIDPROC inline Int32 getActiveIntervals() const;
+ inline Int32 getActiveIntervals() const;
// Get the number of active intervals for the previous iteration call.
- NA_EIDPROC inline Int32 getPreviousActiveIntervals() const;
+ inline Int32 getPreviousActiveIntervals() const;
private:
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/MdamPoint.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/MdamPoint.h b/core/sql/executor/MdamPoint.h
index 2dcdf0e..815cd06 100644
--- a/core/sql/executor/MdamPoint.h
+++ b/core/sql/executor/MdamPoint.h
@@ -62,45 +62,45 @@ class MdamPoint
public:
// Constructor that accepts tupp and inclusion.
- NA_EIDPROC MdamPoint(const tupp & tupp,
+ MdamPoint(const tupp & tupp,
const MdamEnums::MdamInclusion inclusion);
// Constructor that accepts an MdamEndPoint.
- NA_EIDPROC MdamPoint(MdamEndPoint & endPoint);
+ MdamPoint(MdamEndPoint & endPoint);
// Determine if v could be within an interval for which this MdamPoint
// is the begin endpoint.
- NA_EIDPROC NABoolean beginContains
+ NABoolean beginContains
(const ULng32 keyLen, const char * v) const;
// Compare function.
- NA_EIDPROC MdamEnums::MdamOrder compare(const MdamPoint * other,
+ MdamEnums::MdamOrder compare(const MdamPoint * other,
const ULng32 keyLen) const;
// Determine if v could be within an interval for which this MdamPoint
// is the end endpoint.
- NA_EIDPROC NABoolean endContains
+ NABoolean endContains
(const ULng32 keyLen, const char * v) const;
// Get function for data pointer.
- NA_EIDPROC inline char * getDataPointer() const;
+ inline char * getDataPointer() const;
// Get function for inclusion_.
- NA_EIDPROC MdamEnums::MdamInclusion getInclusion() const;
+ MdamEnums::MdamInclusion getInclusion() const;
// Determine if the MdamPoint is included.
- NA_EIDPROC NABoolean included() const;
+ NABoolean included() const;
// Reverse inclusion.
- NA_EIDPROC void reverseInclusion();
+ void reverseInclusion();
// Release tupp storage
- NA_EIDPROC inline void release();
+ inline void release();
// Print functions.
#ifdef NA_MDAM_EXECUTOR_DEBUG
- NA_EIDPROC void print(const char * header = "") const;
- NA_EIDPROC void printBrief() const;
+ void print(const char * header = "") const;
+ void printBrief() const;
#endif /* NA_MDAM_EXECUTOR_DEBUG */
private:
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/MdamRefList.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/MdamRefList.h b/core/sql/executor/MdamRefList.h
index d947b75..cb2028c 100644
--- a/core/sql/executor/MdamRefList.h
+++ b/core/sql/executor/MdamRefList.h
@@ -66,63 +66,63 @@ class MdamRefList
public:
// Default constructor. Creates an empty list.
- NA_EIDPROC MdamRefList() : lastEntryPtr_(0) {}
+ MdamRefList() : lastEntryPtr_(0) {}
// Constructor. Creates a list with one entry.
- NA_EIDPROC inline MdamRefList(const Int32 disjunctNum,
+ inline MdamRefList(const Int32 disjunctNum,
FixedSizeHeapManager & mdamRefListEntryHeap);
// Copy constructor is not supported.
// Destructor.
- NA_EIDPROC ~MdamRefList();
+ ~MdamRefList();
// Assignment operator is not supported.
// LCOV_EXCL_START
// this operator was defined for completeness but is not currently used
// Test for equality.
- NA_EIDPROC NABoolean operator==(const MdamRefList & otherList) const;
+ NABoolean operator==(const MdamRefList & otherList) const;
// LCOV_EXCL_STOP
// end of excluding this equal operator from coverage checking
// Copy the entries from one reference list to another.
// Source list is otherList. Target list is this list.
- NA_EIDPROC void copyEntries(const MdamRefList & otherList,
+ void copyEntries(const MdamRefList & otherList,
FixedSizeHeapManager & mdamRefListEntryHeap);
// Delete all reference list entries.
- NA_EIDPROC void deleteEntries(FixedSizeHeapManager & mdamRefListEntryHeap);
+ void deleteEntries(FixedSizeHeapManager & mdamRefListEntryHeap);
// Insert an entry into the reference list.
- NA_EIDPROC MdamRefList & insert(const Int32 disjunctNum,
+ MdamRefList & insert(const Int32 disjunctNum,
FixedSizeHeapManager & mdamRefListEntryHeap);
// Calculate the intersection of two reference lists.
- NA_EIDPROC void intersect(const MdamRefList & refList0Ref,
+ void intersect(const MdamRefList & refList0Ref,
const MdamRefList & refList1Ref,
FixedSizeHeapManager & mdamRefListEntryHeap);
// Determine if the intersection of two reference lists is empty.
- NA_EIDPROC NABoolean intersectEmpty(const MdamRefList & otherList);
+ NABoolean intersectEmpty(const MdamRefList & otherList);
// Determine if the intersection of three reference lists (this, refList1
// and refList2) is empty.
- NA_EIDPROC NABoolean intersectEmpty(const MdamRefList & refList1,
+ NABoolean intersectEmpty(const MdamRefList & refList1,
const MdamRefList & refList2);
// Determine if the list is empty.
- NA_EIDPROC inline NABoolean isEmpty() const;
+ inline NABoolean isEmpty() const;
// Print functions.
#ifdef NA_MDAM_EXECUTOR_DEBUG
- NA_EIDPROC void print(const char * header = "") const;
- NA_EIDPROC void printBrief() const;
+ void print(const char * header = "") const;
+ void printBrief() const;
#endif /* NA_MDAM_EXECUTOR_DEBUG */
// Calculate the union of two reference lists.
- NA_EIDPROC void unionx(const MdamRefList & refList0Ref,
+ void unionx(const MdamRefList & refList0Ref,
const MdamRefList & refList1Ref,
FixedSizeHeapManager & mdamRefListEntryHeap);
@@ -132,7 +132,7 @@ private:
MdamRefListEntry * lastEntryPtr_;
// Assignment operator is not supported.
- NA_EIDPROC MdamRefList & operator=(const MdamRefList & otherList);
+ MdamRefList & operator=(const MdamRefList & otherList);
}; // class MdamRefList
@@ -153,7 +153,7 @@ inline MdamRefList::MdamRefList(const Int32 disjunctNum,
// LCOV_EXCL_START
// this method is only called in the destruct, see MdamRefList.cpp for reason
// Determine if the list is empty.
-NA_EIDPROC inline NABoolean MdamRefList::isEmpty() const
+inline NABoolean MdamRefList::isEmpty() const
{
return lastEntryPtr_ == 0;
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/MdamRefListEntry.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/MdamRefListEntry.h b/core/sql/executor/MdamRefListEntry.h
index 2299b3a..1841af6 100644
--- a/core/sql/executor/MdamRefListEntry.h
+++ b/core/sql/executor/MdamRefListEntry.h
@@ -54,7 +54,7 @@ class MdamRefListEntry
// Constructor for use on an empty list.
// nextEntryPtr_ is set to point to the newly-created node to begin a
// circularly-linked list.
- NA_EIDPROC MdamRefListEntry(const Int32 disjunctNum)
+ MdamRefListEntry(const Int32 disjunctNum)
: disjunctNum_(disjunctNum) /* NT_PORT , nextEntryPtr_(this) */
{
nextEntryPtr_ = this;
@@ -63,7 +63,7 @@ class MdamRefListEntry
// Constructor for use on a non-empty list.
// The new node is inserted into the linked list following the node pointed
// to by beforePtr.
- NA_EIDPROC MdamRefListEntry(const Int32 disjunctNum,
+ MdamRefListEntry(const Int32 disjunctNum,
MdamRefListEntry * beforePtr)
: disjunctNum_(disjunctNum),
nextEntryPtr_(beforePtr->nextEntryPtr_)
@@ -72,36 +72,36 @@ class MdamRefListEntry
}
// Destructor.
- NA_EIDPROC inline ~MdamRefListEntry();
+ inline ~MdamRefListEntry();
// Operator new.
- NA_EIDPROC inline void * operator new(size_t size,
+ inline void * operator new(size_t size,
FixedSizeHeapManager & mdamRefListEntryHeap);
// Operator new with just size_t. This should never be called.
- NA_EIDPROC void * operator new(size_t size)
+ void * operator new(size_t size)
{
ex_assert(0,"MdamRefListEntry::operator new(size_t) called.");
return 0;
}
// Operator delete. This should never be called.
- NA_EIDPROC void operator delete(void *)
+ void operator delete(void *)
{
ex_assert(0,"MdamRefListEntry::operator delete(void *) called.");
}
// Get function for disjunctNum_.
- NA_EIDPROC inline Int32 getDisjunctNum() const;
+ inline Int32 getDisjunctNum() const;
// Get function for nextEntryPtr_.
- NA_EIDPROC inline MdamRefListEntry * getNextEntryPtr();
+ inline MdamRefListEntry * getNextEntryPtr();
// This function returns beforePtr to prepare for an insertion.
// The object for which the function is called must be the last
// entry of a reference list.
- NA_EIDPROC MdamRefListEntry * positionBeforePtr(const Int32 disjunctNum);
+ MdamRefListEntry * positionBeforePtr(const Int32 disjunctNum);
private:
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/MdamRefListIterator.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/MdamRefListIterator.h b/core/sql/executor/MdamRefListIterator.h
index 428c3dc..6587eac 100644
--- a/core/sql/executor/MdamRefListIterator.h
+++ b/core/sql/executor/MdamRefListIterator.h
@@ -56,14 +56,14 @@ class MdamRefListIterator
public:
// Constructor.
- NA_EIDPROC MdamRefListIterator(const MdamRefList * RefListPtr);
+ MdamRefListIterator(const MdamRefList * RefListPtr);
// Iteration operator returns a boolean that indicates if there was or
// was not a "next" entry and the corresponding disjunct number.
- NA_EIDPROC NABoolean operator () (Int32 & disjunctNum_);
+ NABoolean operator () (Int32 & disjunctNum_);
// Iteration operator returns a pointer to the next entry.
- NA_EIDPROC MdamRefListEntry * operator()();
+ MdamRefListEntry * operator()();
private:
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/UdrExeIpc.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/UdrExeIpc.h b/core/sql/executor/UdrExeIpc.h
index 97c7363..b86214b 100644
--- a/core/sql/executor/UdrExeIpc.h
+++ b/core/sql/executor/UdrExeIpc.h
@@ -56,13 +56,13 @@
// Define UDR_DEBUG only if we are doing a debug build with the C
// runtime library
//
-#ifdef NA_DEBUG_C_RUNTIME
+#ifdef _DEBUG
#ifndef UDR_DEBUG
#define UDR_DEBUG 1
#endif // not UDR_DEBUG
-#else // NA_DEBUG_C_RUNTIME
+#else // _DEBUG
#undef UDR_DEBUG
-#endif // NA_DEBUG_C_RUNTIME else
+#endif // _DEBUG else
//
// Define a local assert macro. We define UdrExeAssert to something
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/cluster.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/cluster.cpp b/core/sql/executor/cluster.cpp
index 8e8f1e8..a17d014 100644
--- a/core/sql/executor/cluster.cpp
+++ b/core/sql/executor/cluster.cpp
@@ -39,9 +39,7 @@
// begining of regular compilation
#include "cluster.h"
-#ifndef __EID
#include "memorymonitor.h"
-#endif
#include "ExStats.h"
#include "ComResourceInfo.h"
#include "logmxevent.h"
@@ -83,10 +81,8 @@ HashBuffer::HashBuffer (Cluster * cluster)
// if we did not see pressure yet, the maximum cluster
// size is as big as the total memory used
-#ifndef __EID
if ( clusterDb->memMonitor_ && !clusterDb->sawPressure_ )
clusterDb->maxClusterSize_ = clusterDb->memoryUsed_;
-#endif
// initialize this buffer
init(cluster);
@@ -96,7 +92,6 @@ HashBuffer::HashBuffer (Cluster * cluster)
};
-#ifndef __EID
// A constructor for cases when the HashBuffer is used without a
// Cluster object.
// Currently, this is only used by the UniqueHashJoin (ExUniqueHashJoinTcb).
@@ -167,13 +162,10 @@ HashBuffer::HashBuffer(ULng32 bufferSize,
};
-#endif
-
HashBufferSerial::HashBufferSerial (Cluster * cluster)
: HashBuffer(cluster)
{};
-#ifndef __EID
// A constructor for cases when the HashBuffer is used without a
// Cluster object.
// Currently, this is only used by the UniqueHashJoin (ExUniqueHashJoinTcb).
@@ -187,7 +179,6 @@ HashBufferSerial::HashBufferSerial(ULng32 bufferSize,
: HashBuffer(bufferSize, rowSize, useVariableLength, heap, rc)
{};
*/
-#endif
/////////////////////////////////////////////////////////////////////////////
@@ -292,15 +283,12 @@ ClusterDB::ClusterDB(HashOperator hashOperator,
Bucket * buckets,
ULng32 bucketCount,
ULng32 availableMemory,
-#ifndef __EID
MemoryMonitor * memMonitor,
short pressureThreshold,
ExExeStmtGlobals * stmtGlobals,
-#endif
ExeErrorCode *rc,
NABoolean noOverFlow,
NABoolean isPartialGroupBy,
-#ifndef __EID
unsigned short minBuffersToFlush,
ULng32 numInBatch,
@@ -321,8 +309,6 @@ ClusterDB::ClusterDB(HashOperator hashOperator,
Int32 pMemoryContingencyMB,
Float32 estimateErrorPenalty,
Float32 hashMemEstInMbPerCpu,
-
-#endif
ULng32 initialHashTableSize,
ExOperStats * hashOperStats
)
@@ -337,12 +323,10 @@ ClusterDB::ClusterDB(HashOperator hashOperator,
buckets_(buckets),
bucketCount_(bucketCount),
memoryUsed_(0),
-#ifndef __EID
memMonitor_(memMonitor),
pressureThreshold_(pressureThreshold),
sawPressure_(FALSE),
stmtGlobals_(stmtGlobals),
-#endif
hashLoop_(FALSE),
noOverFlow_(noOverFlow),
isPartialGroupBy_(isPartialGroupBy),
@@ -353,7 +337,6 @@ ClusterDB::ClusterDB(HashOperator hashOperator,
clusterToRead_(NULL),
clusterReturnRightRows_(NULL),
clusterList_(NULL),
-#ifndef __EID
tempFile_(NULL),
minBuffersToFlush_(minBuffersToFlush),
minNumWriteOuterBatch_((UInt16)(numInBatch ? (numInBatch/100) % 100
@@ -390,7 +373,6 @@ ClusterDB::ClusterDB(HashOperator hashOperator,
totalIOCnt_(0),
earlyOverflowStarted_(FALSE),
bmoMaxMemThresholdMB_(0),
-#endif
hashOperStats_(NULL),
bmoStats_(NULL),
initialHashTableSize_(initialHashTableSize),
@@ -417,14 +399,13 @@ ClusterDB::ClusterDB(HashOperator hashOperator,
// the regular statement heap. We want this in DP2. If we are not running
// in DP2, we set up a seperate heap (see below)
bufferHeap_ = (NAHeap*)collHeap();
-#ifndef __EID
+
// we are not running in DP2. Setup our own bufferHeap. We want at least
// 10 buffers in each block of this heap. Also add a few bytes to the buffer
// size to account for some memory management overhead.
bufferHeap_ = new(collHeap()) NAHeap("Buffer Heap",
bufferHeap_,
10 * ((Lng32)bufferSize_ + 20));
-#endif
// These fields are used to ensure that #buckets and #hash-table-entries
// have no common prime factors (to make even use of the hash table entries)
@@ -438,8 +419,6 @@ ClusterDB::ClusterDB(HashOperator hashOperator,
/////////////////////////////////////////////////////////////////////////////
ClusterDB::~ClusterDB() {
-#ifndef __EID
-
// there is no point of checking pending I/O, as either there shouldn't
// be any pending I/O, or we should aband pending I/Os (by closing the
// file at delete) in case of error.
@@ -459,8 +438,6 @@ ClusterDB::~ClusterDB() {
availableMemory_ += bufferSize_;
};
-#endif
-
while (clusterList_) {
Cluster * p = clusterList_->next_;
Cluster * q;
@@ -480,9 +457,6 @@ ClusterDB::~ClusterDB() {
};
/////////////////////////////////////////////////////////////////////////////
-#ifndef __EID
-
-// LCOV_EXCL_START
// given the time it took some cluster to run phase 3, add to local stats
void ClusterDB::updatePhase3Time(Int64 someClusterTime)
{
@@ -493,7 +467,6 @@ void ClusterDB::updatePhase3Time(Int64 someClusterTime)
if ( maxPhase3Time_ < someClusterTime ) maxPhase3Time_ = someClusterTime ;
++numClustersNoHashLoop_;
}
-// LCOV_EXCL_STOP
////// Q U O T A /////////
@@ -510,7 +483,7 @@ void ClusterDB::yieldAllMemoryQuota()
sprintf(msg,
"YIELDED ALL MEMORY ALLOWED: %u MB (%u). Unused pool %u MB",
memoryQuotaMB_-minMemoryQuotaMB_,
- 0, // NA_64BIT, use instance id later
+ 0,
stmtGlobals_->unusedMemoryQuota() );
// log an EMS event and continue
SQLMXLoggingArea::logExecRtInfo(NULL, 0, msg, explainNodeId_);
@@ -637,7 +610,7 @@ void ClusterDB::yieldUnusedMemoryQuota(Cluster * theOFList,
sprintf(msg, "%s YIELDED %d MB (%u). %s needed %u MB, unused pool %u",
extraBuffers == 1 ? "HJ" : "HGB", memToYieldMB,
- 0, // NA_64BIT, use instance id later
+ 0,
msg1, memNeededMB,
stmtGlobals_->unusedMemoryQuota());
@@ -670,8 +643,6 @@ ULng32 ClusterDB::roundUpToPrime(ULng32 noOfClusters)
return primes[ind] ;
}
-#endif
-
/////////////////////////////////////////////////////////////////////////////
// Perform checks to find if memory allocation of reqSize bytes is possible
// Return FALSE if allocation is not possible.
@@ -683,7 +654,6 @@ ULng32 ClusterDB::roundUpToPrime(ULng32 noOfClusters)
/////////////////////////////////////////////////////////////////////////////
NABoolean ClusterDB::enoughMemory(ULng32 reqSize, NABoolean checkCompilerHints)
{
-#ifndef __EID
char msg[512]; // for logging messages
// For testing overflow only -- Simulate extreme memory conditions
@@ -721,7 +691,7 @@ NABoolean ClusterDB::enoughMemory(ULng32 reqSize, NABoolean checkCompilerHints)
if ( doLog_ && memNeededMB > 1 ) { // LOG -- only for more than a buffer
sprintf(msg,
"GRABBED %u MB (%u). Memory used %u, now allowed %u MB, request size %u, unused pool %u",
- memNeededMB, 0, // NA_64BIT, use instance id later
+ memNeededMB, 0,
memoryUsed_,
memoryQuotaMB_, reqSize,stmtGlobals_->unusedMemoryQuota() );
// log an EMS event and continue
@@ -981,13 +951,10 @@ NABoolean ClusterDB::enoughMemory(ULng32 reqSize, NABoolean checkCompilerHints)
} // if (memMonitor_ && memoryUsed_ >= minMemBeforePressureCheck_ )
-#endif // not EID
-
// Always return TRUE, but for Partial HGB there's one more check
return (!isPartialGroupBy_ || availableMemory_ >= reqSize);
};
/////////////////////////////////////////////////////////////////////////////
-#ifndef __EID
// A superset of setClusterToRead, for an outer cluster.
// Also allocates the global list of buffers (in the first time) and
// initializes the outer cluster to start reading more
@@ -1076,7 +1043,6 @@ NABoolean ClusterBitMap::testBit(ULng32 bitIndex) {
return (NABoolean)(bitMap_[bitIndex >> 3] & bitMask);
};
-#endif
/////////////////////////////////////////////////////////////////////////////
// Internal utility: Calculate memory and create a hash table
@@ -1160,13 +1126,11 @@ Cluster::Cluster(ClusterState state,
next_(next),
ioPending_(FALSE),
totalClusterSize_(0),
-#ifndef __EID
outerBitMap_(NULL),
tempFile_(NULL),
readHandle_(NULL),
completeCurrentRead_(FALSE),
buffersRead_(0),
-#endif
hashTable_(NULL),
rowCount_(0),
readCount_(0),
@@ -1175,7 +1139,6 @@ Cluster::Cluster(ClusterState state,
bufferPool_(bufferPool),
numInMemBuffers_(0),
scanPosition_(NULL)
-#ifndef __EID
,returnOverflowRows_(FALSE)
,batchCountDown_(clusterDb->numReadOuterBatch_)
,lastSqueezedBuffer_(NULL) // no buffer squeezed yet
@@ -1189,7 +1152,6 @@ Cluster::Cluster(ClusterState state,
,startTimePhase3_(0)
,keepRecentBuffer_(FALSE)
,flushMe_(FALSE)
-#endif
,defragBuffer_(NULL)
{
// assume success
@@ -1243,12 +1205,10 @@ Cluster::Cluster(ClusterState state,
if (!hashTable_) return;
};
-#ifndef __EID
// set up a unique sequence ID for this cluster to use for overflow
maxSeqIDIndex_ = seqIDIndex_ = 0 ;
seqID_[seqIDIndex_] = clusterDb_->generateSequenceID();
seqID_[1] = seqID_[2] = 0 ; // 0 is an invalid seq value
-#endif
if (considerBufferDefrag_)
{
@@ -1261,13 +1221,11 @@ Cluster::Cluster(ClusterState state,
Cluster::~Cluster() {
releaseAllHashBuffers();
-#ifndef __EID
if (outerBitMap_) {
delete outerBitMap_;
outerBitMap_ = NULL;
};
if ( readHandle_ ) delete readHandle_;
-#endif
removeHashTable();
@@ -1302,7 +1260,6 @@ void Cluster::removeHashTable() {
/////////////////////////////////////////////////////////////////////////////
-#ifndef __EID
// Decide which cluster to flush: Find the FLUSHED cluster with the max
// #buffers, and use that one if that #buffers > minimum ; else pick one of
// the non-flushed clusters, and if none -- use the "last resort" cluster
@@ -1387,8 +1344,6 @@ void ClusterDB::chooseClusterToFlush(Cluster * lastResort)
}
-#endif
-
/////////////////////////////////////////////////////////////////////////////
NABoolean Cluster::insert(atp_struct * newEntry,
@@ -1422,9 +1377,7 @@ NABoolean Cluster::insert(atp_struct * newEntry,
totalClusterSize_ += clusterDb_->bufferSize_;
};
-#ifndef __EID
lastDataPointer_ = NULL;
-#endif
NABoolean defragmented = FALSE;
// allocate space for the new row in the buffer pool
@@ -1466,7 +1419,7 @@ NABoolean Cluster::insert(atp_struct * newEntry,
//rows are variable-- set row length
bufferPool_->castToSerial()->setRowLength(dataPointer, rowLen);
-#if (defined (NA_LINUX) && defined(_DEBUG) && !defined(__EID))
+#if (defined(_DEBUG))
char txt[] = "Cluster::insert";
sql_buffer_pool::logDefragInfo(txt,bufferPool_->getMaxRowLength(),
ROUND4(rowLen) + sizeof(HashRow),
@@ -1499,7 +1452,6 @@ NABoolean Cluster::insert(atp_struct * newEntry,
};
// reset rc in case it was set in the constructor of HashBuffer
*rc = EXE_OK;
-#ifndef __EID
// set saw pressure as we indeed can not allocate memory
// fix for CR 10-071012-6254
clusterDb_->sawPressure_ = TRUE;
@@ -1509,7 +1461,6 @@ NABoolean Cluster::insert(atp_struct * newEntry,
// returning partial groups
if (!clusterDb_->isPartialGroupBy_)
clusterDb_->chooseClusterToFlush(this);
-#endif
return FALSE;
};
@@ -1526,10 +1477,8 @@ NABoolean Cluster::insert(atp_struct * newEntry,
// not enough memory avaliable. Select a cluster
// for flushing
-#ifndef __EID
if (!clusterDb_->isPartialGroupBy_)
clusterDb_->chooseClusterToFlush(this);
-#endif
return FALSE;
};
@@ -1566,9 +1515,7 @@ NABoolean Cluster::insert(atp_struct * newEntry,
}
}
-#ifndef __EID
lastDataPointer_ = dataPointer; // keep location of most recent row
-#endif
// set the hash value in the row header
dataPointer->setHashValueRaw(hashValue);
@@ -1593,10 +1540,8 @@ NABoolean Cluster::insert(atp_struct * newEntry,
// if Hash-Table was resized up, then update memory use
clusterDb_->memoryUsed_ += memAdded ;
-#ifndef __EID
// if could not create a new HT, better pick this cluster for a flush
if ( ! memAdded ) flushMe_ = TRUE;
-#endif
}
}
@@ -1606,7 +1551,6 @@ NABoolean Cluster::insert(atp_struct * newEntry,
/////////////////////////////////////////////////////////////////////////////
-#ifndef __EID
// initialize the cluster's scratch file and read handler (and the clusterDB
// global scratch file, if needed). Return TRUE if error.
NABoolean Cluster::initScratch(ExeErrorCode * rc)
@@ -2690,8 +2634,6 @@ void Cluster::resetForHashLoop() {
// we don't release the buffer of the outer, since we need it
};
-#endif
-
/////////////////////////////////////////////////////////////////////////////
ExClusterStats* Cluster::getStats(CollHeap* heap) {
ExStatsCounter hashChains;
@@ -2758,8 +2700,6 @@ ULng32 Cluster::getMemorySizeForHashTable(ULng32 entryCount)
return (entryCount * sizeof(HashTableHeader) * 3 / 2);
}
-#ifndef __EID
-
void Cluster::updateBitMap() {
ex_assert(outerBitMap_, "no bitmap to update");
outerBitMap_->setBit(readCount_);
@@ -2772,7 +2712,6 @@ NABoolean Cluster::testBitMap() {
#include "ComCextdecs.h"
-// LCOV_EXCL_START
void IOTimer::resetTimer()
{
ioStarted_ = FALSE;
@@ -2818,7 +2757,6 @@ void ClusterDB::getScratchErrorDetail(Lng32 &scratchError,
strcpy(errorMsg, sError->getSortErrorMsg());
}
}
-// LCOV_EXCL_STOP
// Every time totalIOCnt_ grows, update the stats for this operator
void ClusterDB::updateIOStats()
@@ -2831,8 +2769,6 @@ void ClusterDB::updateIOStats()
hashOperStats_->castToExHashJoinStats()->updIoSize(ioSize);
}
-#endif
-
// Every time memoryUsed_ grows, update the stats for max memory used by this operator
void ClusterDB::updateMemoryStats()
{
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/cluster.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/cluster.h b/core/sql/executor/cluster.h
index 8b8cd1c..7e7fa74 100644
--- a/core/sql/executor/cluster.h
+++ b/core/sql/executor/cluster.h
@@ -41,11 +41,9 @@
#include "hash_table.h"
#include "CommonStructs.h"
-#ifndef __EID
#include "ScratchSpace.h"
#include "ex_exe_stmt_globals.h"
#define END_OF_BUF_LIST ((ULng32) -1)
-#endif
// To be used as the limits on input size estimates by HJ, HGB
#define MAX_INPUT_SIZE 0x200000000LL
@@ -58,9 +56,7 @@ class Bucket;
class IOTimer;
class ExBMOStats;
-#ifndef __EID
class MemoryMonitor;
-#endif
#include "HashBufferHeader.h"
#include "ExpError.h"
@@ -78,12 +74,8 @@ class HashBufferSerial;
class HashBuffer : public NABasicObject {
friend class HashBufferSerial;
public:
-NA_EIDPROC
HashBuffer (Cluster * cluster);
-#ifndef __EID
- // this is only used by Hash Join, so does not need to be in EID code
-
// A constructor for cases when the HashBuffer is used without a
// Cluster object.
// Currently, this is only used by the UniqueHashJoin (ExUniqueHashJoinTcb).
@@ -94,50 +86,33 @@ NA_EIDPROC
CollHeap *heap,
ClusterDB * clusterDb,
ExeErrorCode * rc);
-#endif
-NA_EIDPROC
~HashBuffer();
-NA_EIDPROC
inline ULng32 getMaxRowLength() const;
-NA_EIDPROC
inline HashBuffer * getPrev() const;
-NA_EIDPROC
inline void setPrev(HashBuffer * prev);
-NA_EIDPROC
inline HashBuffer * getNext() const;
-NA_EIDPROC
inline void setNext(HashBuffer * next);
-NA_EIDPROC
inline char * getDataPointer() const;
-NA_EIDPROC
inline void deallocateData(CollHeap * heap) ;
-NA_EIDPROC
inline ULng32 getRowCount() const;
-NA_EIDPROC
inline HashBufferHeader * getHeader() const;
-NA_EIDPROC
void init(Cluster * cluster);
-NA_EIDPROC
inline char * getFirstRow() const;
// Does this buffer contain variable length or fixed length rows.
-NA_EIDPROC
inline NABoolean isVariableLength() const;
-NA_EIDPROC
inline NABoolean considerBufferDefrag() const;
// Cast this instance to a pointer to a HashBufferSerial in order to
// use the Serial Interface
-NA_EIDPROC
inline HashBufferSerial *castToSerial() const;
-NA_EIDPROC
inline ULng32 getFreeSpace() const
{
return freeSpace_;
@@ -236,12 +211,8 @@ inline HashBufferSerial *HashBuffer::castToSerial() const {
class HashBufferSerial : public HashBuffer {
private:
// Constuctors and Destuctor are private - They are never used.
-NA_EIDPROC
HashBufferSerial (Cluster * cluster);
-#ifndef __EID
- // this is only used by Hash Join, so does not need to be in EID code
-
// A constructor for cases when the HashBuffer is used without a
// Cluster object.
// Currently, this is only used by the UniqueHashJoin (ExUniqueHashJoinTcb).
@@ -252,9 +223,6 @@ NA_EIDPROC
CollHeap *heap,
ExeErrorCode * rc);
-#endif
-
-NA_EIDPROC
~HashBufferSerial() {};
public:
@@ -263,71 +231,54 @@ public:
// order (series) from the start of the buffer to the end. Rows cannot be
// accessed randomly (via a row index or number)
-NA_EIDPROC
inline void setRowCount(ULng32 cnt);
// Set rowcount to 0 and reset buffer to be empty.
-NA_EIDPROC
inline void clearRowCount();
// Methods dealing with how many rows can fit in a buffer
// Get the estimated number of rows per buffer. It is an estimate
// since the rows can be variable length
-NA_EIDPROC
inline ULng32 getMaxNumFullRows() const;
-#ifndef __EID
// Recalculate the number of rows that can be allocated from this buffer.
inline ULng32 getRemainingNumFullRows() const;
// Is this buffer full?
inline NABoolean notFull() const;
-#endif
// Methods for accessing rows in series based on an internal cursor (currRow_)
-NA_EIDPROC
inline void positionOnFirstRow();
// return the next row in the buffer
-NA_EIDPROC
inline HashRow *getCurrentRowAndAdvance();
-NA_EIDPROC
inline HashRow *getCurrentRow();
// Methods for accessing rows in series based on an external cursor (the previous row)
// Return a pointer to the first row,
-NA_EIDPROC
inline HashRow *getFirstRow() const;
// Get the next row after 'currentRow' based on the length of currentRow
-NA_EIDPROC
inline HashRow *getNextRow(HashRow *currentRow) const;
// Allocate a row of size maxRowLength_ from this HashBuffer
-NA_EIDPROC
inline HashRow *getFreeRow();
-NA_EIDPROC
inline HashRow *getFreeRow(ULng32 spaceNeeded);
// Resize the last row allocated from this HashBuffer
-NA_EIDPROC
inline void resizeLastRow(ULng32 newSize, HashRow *dataPointer);
// Get row length. If varLen, get length from row. If fixed, based
// on maxRowLength_
-NA_EIDPROC
inline ULng32 getRowLength(HashRow *row) const;
// Set the row length in the row. If row is fixed length, this method does nothing
-NA_EIDPROC
inline void setRowLength(HashRow *row, UInt32 len);
-NA_EIDPROC
void print() const;
-NA_EIDPROC
void fixup();
@@ -389,7 +340,6 @@ inline ULng32 HashBufferSerial::getMaxNumFullRows() const {
return maxNumFullRowsSer_;
};
-#ifndef __EID
// Recalculate the number of rows that can be allocated from this buffer.
inline ULng32 HashBufferSerial::getRemainingNumFullRows() const {
return (freeSpace_ / maxRowLength_);
@@ -400,7 +350,6 @@ inline NABoolean HashBufferSerial::notFull() const
{
return (freeSpace_ >= maxRowLength_);
};
-#endif
// Methods for accessing rows in series based on an internal cursor (currRow_)
inline void HashBufferSerial::positionOnFirstRow()
@@ -558,27 +507,18 @@ inline void HashBufferSerial::setRowLength(HashRow *row, UInt32 len) {
/////////////////////////////////////////////////////////////////////////////
class Bucket {
public:
-NA_EIDPROC
Bucket();
-NA_EIDPROC
~Bucket() {}; // LCOV_EXCL_LINE
-NA_EIDPROC
void init();
-NA_EIDPROC
inline ULng32 getRowCount() const;
-NA_EIDPROC
inline Cluster * getInnerCluster () const;
-NA_EIDPROC
inline Cluster * getOuterCluster () const;
-NA_EIDPROC
inline NABoolean insert (atp_struct * newEntry,
ex_expr * moveExpr,
SimpleHashValue hashValue,
ExeErrorCode * rc,
NABoolean skipMemoryCheck = FALSE);
-NA_EIDPROC
inline void setInnerCluster (Cluster * innerCluster);
-NA_EIDPROC
inline void setOuterCluster (Cluster * outerCluster);
private:
Cluster * innerCluster_; // corresponding inner Cluster
@@ -627,7 +567,6 @@ public:
CROSS_PRODUCT,
SEQUENCE_OLAP // not a hash operator; but uses ClusterDB and Cluster
};
-NA_EIDPROC
ClusterDB (HashOperator hashOperator,
ULng32 bufferSize,
atp_struct * workAtp,
@@ -638,15 +577,12 @@ NA_EIDPROC
Bucket * buckets,
ULng32 bucketCount,
ULng32 availableMemory,
-#ifndef __EID
MemoryMonitor * memMonitor,
short pressureThreshold,
ExExeStmtGlobals * stmtGlobals,
-#endif
ExeErrorCode * rc,
NABoolean noOverFlow = FALSE,
NABoolean isPartialGroupBy = FALSE,
-#ifndef __EID
unsigned short minBuffersToFlush = 1,
ULng32 numInBatch = 0,
@@ -669,60 +605,37 @@ NA_EIDPROC
Int32 pMemoryContingencyMB = 0,
Float32 estimateErrorPenalty = 0,
Float32 hashMemEstInMbPerCpu = 0,
-
-#endif
ULng32 initialHashTableSize = 0, // default not resizable
ExOperStats * hashOperStats = NULL
);
-NA_EIDPROC
~ClusterDB();
-NA_EIDPROC
inline Cluster * getClusterList() const;
-NA_EIDPROC
inline void setClusterList(Cluster * clusterList);
-#ifndef __EID
inline Cluster * getClusterToFlush() const;
inline void setClusterToFlush(Cluster * cluster);
void setBMOMaxMemThresholdMB(UInt16 mm)
{ bmoMaxMemThresholdMB_ = mm; }
-#endif
-NA_EIDPROC
inline Cluster * getClusterToProbe() const;
-NA_EIDPROC
inline void setClusterToProbe(Cluster * cluster);
-NA_EIDPROC
inline Cluster * getClusterToRead() const;
-NA_EIDPROC
inline void setClusterToRead(Cluster * cluster);
-NA_EIDPROC
NABoolean setOuterClusterToRead(Cluster * cluster, ExeErrorCode * rc);
-NA_EIDPROC
inline Cluster * getClusterReturnRightRows() const;
-NA_EIDPROC
inline void setClusterReturnRightRows(Cluster * cluster);
-NA_EIDPROC
inline NABoolean isHashLoop() const { return hashLoop_; }
-NA_EIDPROC
inline Int64 getMemoryHWM() const;
-NA_EIDPROC
inline ULng32 getBufferSize() const { return bufferSize_; }
-NA_EIDPROC
void setScratchIOVectorSize(Int16 vectorSize)
{
scratchIOVectorSize_ = vectorSize;
}
-NA_EIDPROC
Int32 getScratchIOVectorSize() { return scratchIOVectorSize_;}
-NA_EIDPROC
void setScratchOverflowMode(ScratchOverflowMode ovMode)
{ overFlowMode_ = ovMode;}
-NA_EIDPROC
ScratchOverflowMode getScratchOverflowMode(void)
{ return overFlowMode_;}
-#ifndef __EID
-
void chooseClusterToFlush(Cluster * lastResort);
HashScratchSpace *getScratch() const;
@@ -762,19 +675,13 @@ NA_EIDPROC
static ULng32 roundUpToPrime(ULng32 noOfClusters);
-
-#endif
-NA_EIDPROC
NABoolean enoughMemory(ULng32 size, NABoolean checkCompilerHints = FALSE);
private:
-NA_EIDPROC
void updateMemoryStats();
-#ifndef __EID
void updateIOStats();
-#endif
HashOperator hashOperator_; // indicates the type of the tcb
// using this clusterDB
@@ -807,21 +714,18 @@ NA_EIDPROC
// much main memory the operator uses right now. Cluster.totalClusterSize_
// tells us the size of a cluster!
ExOperStats * hashOperStats_; // stats for this hash operator
-#ifndef __EID
ULng32 totalIOCnt_; // total IO ( # buffers read or writen )
MemoryMonitor * memMonitor_; // for dynamic memory management
short pressureThreshold_;
NABoolean sawPressure_; // set when we see pressure the
// first time
ExExeStmtGlobals * stmtGlobals_; // for dynamic memory allocation
-#endif
ULng32 maxClusterSize_; // in bytes
Cluster * clusterToFlush_; // cluster which is to be flushed
Cluster * clusterToProbe_; // cluster which is to be probed
Cluster * clusterToRead_; // cluster which is to be read
Cluster * clusterReturnRightRows_; // cluster which is to be read
Cluster * clusterList_; // list of all clusters
-#ifndef __EID
HashScratchSpace * tempFile_; // for overflow handling
ExSubtask *ioEventHandler_;
ex_tcb * callingTcb_;
@@ -854,7 +758,6 @@ NA_EIDPROC
ULng32 bmoMaxMemThresholdMB_;
NABoolean earlyOverflowStarted_; // if o/f based on compiler hints
-#endif
// These fields are used to ensure that #buckets and #hash-table-entries
// have no common prime factors (to make even use of the hash table entries)
@@ -889,11 +792,9 @@ inline Cluster * ClusterDB::getClusterList() const {
inline void ClusterDB::setClusterList(Cluster * clusterList) {
clusterList_ = clusterList;
};
-#ifndef __EID
inline Cluster * ClusterDB::getClusterToFlush() const {
return clusterToFlush_;
};
-#endif
inline Cluster * ClusterDB::getClusterToProbe() const {
return clusterToProbe_;
@@ -919,18 +820,14 @@ inline void ClusterDB::setClusterReturnRightRows(Cluster * cluster) {
clusterReturnRightRows_ = cluster;
};
-#ifndef __EID
inline HashScratchSpace * ClusterDB::getScratch() const {
return tempFile_;
};
-#endif
/////////////////////////////////////////////////////////////////////////////
// ClusterBitMap is used for left joins with a hash loop or for right joins
/////////////////////////////////////////////////////////////////////////////
-#ifndef __EID
-
class ClusterBitMap : public NABasicObject {
public:
ClusterBitMap(ULng32 size, ExeErrorCode * rc);
@@ -942,8 +839,6 @@ private:
char * bitMap_; // the bitmap itself
};
-#endif
-
/////////////////////////////////////////////////////////////////////////////
// a Cluster is the unit of overflow handling
/////////////////////////////////////////////////////////////////////////////
@@ -959,7 +854,6 @@ public:
// hash table
};
-NA_EIDPROC
Cluster(ClusterState state,
ClusterDB * clusterDb,
Bucket * buckets,
@@ -981,20 +875,13 @@ NA_EIDPROC
ExeErrorCode *rc,
HashBuffer * bufferPool = NULL); // an already existing buffer
-NA_EIDPROC
~Cluster();
-NA_EIDPROC
inline ClusterState getState() const;
-NA_EIDPROC
inline ULng32 getRowsInBuffer() const;
-NA_EIDPROC
inline ULng32 getRowCount() const;
-NA_EIDPROC
inline ULng32 getReadCount() const;
-NA_EIDPROC
inline void incReadCount();
-#ifndef __EID
inline NABoolean endOfCluster();
inline NABoolean hasBitMap();
void updateBitMap();
@@ -1005,24 +892,14 @@ NA_EIDPROC
inline NABoolean returnOverflowRows() { return returnOverflowRows_; }
inline void initializeReadPosition();
-#endif
-NA_EIDPROC
inline NABoolean bitMapEnable() const;
-NA_EIDPROC
inline NABoolean isInner() const;
-NA_EIDPROC
inline Cluster * getNext() const;
-NA_EIDPROC
Cluster * getOuterCluster() const { return buckets_->getOuterCluster(); };
-NA_EIDPROC
inline void setOuterCluster(Cluster * outerCluster);
-NA_EIDPROC
HashTable * getHashTable() const { return hashTable_; };
-NA_EIDPROC
inline HashBuffer * getFirstBuffer() const { return bufferPool_; };
-NA_EIDPROC
inline void setNext(Cluster * next);
-NA_EIDPROC
void positionOnFirstRowInBuffer()
{ // position on the first row in main memory
scanPosition_ = bufferPool_;
@@ -1030,7 +907,6 @@ NA_EIDPROC
};
// remove the hash table from the cluster
-NA_EIDPROC
void removeHashTable();
// insert a new row into the cluster. If insert() was not sucessful, it
@@ -1038,14 +914,12 @@ NA_EIDPROC
// for insert() not to be sucessful is, if we could not t allocate a
// new buffer for this cluster. In case of a partial group by, we do not
// flush a cluster, instead, we return the current row as a partial group.
-NA_EIDPROC
NABoolean insert(atp_struct * newEntry,
ex_expr * moveExpr,
SimpleHashValue hashValue,
ExeErrorCode * rc,
NABoolean skipMemoryCheck = FALSE);
-#ifndef __EID
void positionOnFirstRowInFirstOuterBuffer()
{ // position on the first row in the first outer buffer in memory
@@ -1095,23 +969,18 @@ NA_EIDPROC
Int64 startTimePhase3() { return startTimePhase3_; };
void setStartTimePhase3(Int64 theTime) { startTimePhase3_ = theTime ; };
-#endif
// set up a cluster stats entry in heap and return it
ExClusterStats* getStats(CollHeap* heap);
// release all buffers of the Cluster
-NA_EIDPROC
void releaseAllHashBuffers();
// return next row from buffer
-NA_EIDPROC
HashRow * advance();
-NA_EIDPROC
HashRow * getCurrentRow();
// Report the size (in bytes) of this cluster
-NA_EIDPROC
inline Int64 clusterSize() {return totalClusterSize_; } // total size (bytes)
// Internal utility: Calculate memory and create a hash table
@@ -1120,7 +989,6 @@ NA_EIDPROC
// skip mem check for HGB; it starts at min HT
NABoolean checkMemory = FALSE );
- NA_EIDPROC
inline char * getDefragBuffer()
{
return defragBuffer_;
@@ -1129,7 +997,6 @@ NA_EIDPROC
private:
-#ifndef __EID
// split a Cluster into two. Adjust buckets accordingly.
NABoolean checkAndSplit(ExeErrorCode * rc) ;
HashBuffer * lastSqueezedBuffer_ ; // last buffer "squeezed"
@@ -1145,7 +1012,6 @@ private:
UInt16 batchCountDown_; // count buffers in a batch (for split only)
HashBuffer * keepRecentBuffer_; // don't flush most recent (not full) buffer
-#endif
// return the memory size for building a hash table of given entry count
ULng32 getMemorySizeForHashTable(ULng32 entryCount);
@@ -1161,20 +1027,15 @@ private:
NABoolean isInner_;
NABoolean bitMapEnable_;
-#ifndef __EID
HashScratchSpace * tempFile_;
ClusterPassBack * readHandle_;
-#endif
Cluster * next_; // next Cluster in list
NABoolean ioPending_; // this Cluster has an I/O in flight
Int64 totalClusterSize_; // total size of this cluster (bytes)
-#ifndef __EID
ClusterBitMap * outerBitMap_;
-#endif
-
HashTable * hashTable_;
ULng32 rowCount_; // # of rows stored in this cluster
ULng32 readCount_; // for inner: number of rows read in
@@ -1188,8 +1049,6 @@ private:
ULng32 numInMemBuffers_; // number of in-memory buffers for this cluster
HashBuffer * scanPosition_; // for scanning all buffers
-#ifndef __EID
-
// for concurrent writing of multiple buffers, need to know which is next
HashBuffer * nextBufferToFlush_;
// For OLAP - when reading buffers from overflow for "bounded following",
@@ -1229,8 +1088,6 @@ private:
NABoolean completeCurrentRead_ ; // synch buffers read so far
Int16 buffersRead_ ;
-#endif
-
char * defragBuffer_;
};
@@ -1260,7 +1117,6 @@ inline void Cluster::incReadCount() {
readCount_++;
};
-#ifndef __EID
inline NABoolean Cluster::hasBitMap() {
return (outerBitMap_ != NULL);
};
@@ -1308,9 +1164,6 @@ inline NABoolean Cluster::IONotReady(ExeErrorCode * rc,
return FALSE; // IO is ready
}
-
-#endif
-
inline NABoolean Cluster::bitMapEnable() const {
return bitMapEnable_;
};
@@ -1337,7 +1190,6 @@ inline void Cluster::setNext(Cluster * next) {
next_ = next;
};
-#ifndef __EID
// This ClusterDB method needs to follow the reclaration of the class Cluster
inline void ClusterDB::setClusterToFlush(Cluster * cluster) {
clusterToFlush_ = cluster;
@@ -1347,7 +1199,6 @@ inline void ClusterDB::setClusterToFlush(Cluster * cluster) {
// when cluster is selected explicitly -- flush all the buffers (incl. last)
clusterToFlush_->keepRecentBuffer_ = NULL;
};
-#endif
// The Bucket::insert is just a wrapper over Cluster::insert that also
// updates the per-Bucket rows counter
@@ -1372,16 +1223,16 @@ inline NABoolean Bucket::insert(atp_struct * newEntry,
class IOTimer
{
public:
- NA_EIDPROC
+
IOTimer () ;
- NA_EIDPROC
+
void resetTimer(); // re-zero the elapsed time (not needed on first use)
- NA_EIDPROC
+
NABoolean startTimer(); // do nothing, return FALSE is already started
- NA_EIDPROC
+
Int64 endTimer(); // Return elapsed time.
private:
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/dfs2fe.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/dfs2fe.h b/core/sql/executor/dfs2fe.h
index 74cdade..075f74e 100644
--- a/core/sql/executor/dfs2fe.h
+++ b/core/sql/executor/dfs2fe.h
@@ -657,7 +657,6 @@ enum ExeDfs2feEnum
, FEMOREDATA = dfs2fe_base + 1179
, FESEQUENCE = dfs2fe_base + 1180
, FESIDETREE = dfs2fe_base + 1181
- , FERFORKLOCKED = dfs2fe_base + 1182
, FENOSQLMX = dfs2fe_base + 1183
, FECPUSWITCHED = dfs2fe_base + 1184
, FESQLMXINTERNALERR= dfs2fe_base + 1185
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/dmeasql.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/dmeasql.h b/core/sql/executor/dmeasql.h
index 37bcd1f..ade3632 100644
--- a/core/sql/executor/dmeasql.h
+++ b/core/sql/executor/dmeasql.h
@@ -20,70 +20,3 @@
//
// @@@ END COPYRIGHT @@@
**********************************************************************/
-#ifndef _DMEASQL
-#define _DMEASQL
-
-//#pragma columns 79
-#pragma page "dmeasql.h - T9086 Measure / SQL Interface Declarations"
-
-
-//#ifndef _rosgenh_
-//#define _rosgenh_
-//#include "rosgen.h"
-//#endif
-
-
-typedef struct SQLSTMT_CTRS_DEF {
- char run_unit[128] ;
- Int32 statement_index; //indexed statement number
- Int32 sorts;
- Int32 recompiles;
- Int32 lock_waits;
- Int64 calls;
- Int64 elapsed_busy_time;
- Int64 records_used;
- Int64 records_accessed;
- Int64 disc_reads;
- Int64 messages;
- Int64 message_bytes;
- Int64 elapsed_sort_time;
- Int64 elapsed_compile_time;
- Int32 timeouts;
- Int32 escalations;
- char _filler[4];
-} SQLSTMT_CTRS_DEF;
-
-typedef struct SQLPROC_CTRS_DEF {
- Int32 sql_obj_recompiles;
- Int64 sql_obj_recompile_time;
- Int32 sql_stmt_recompiles;
- Int64 sql_stmt_recompile_time;
- Int32 sql_newprocesses;
- Int64 sql_newprocess_time;
- Int32 opens;
- Int64 open_time;
-} SQLPROC_CTRS_DEF;
-
-//#pragma section MEASCHECKITOUT
-//extern _tal _callable int_16 MEASCHECKITOUT();
-
-enum {MEASURE_NOTHING = 0};
-enum {MEASURE_STMT_ONLY = 1};
-enum {MEASURE_PROC_ONLY = 2};
-enum {MEASURE_PROC_AND_STMTS = 3};
-
-//#pragma section MEASSQLPROCBUMP
-//extern _tal _callable _resident int_16 MEASSQLPROCBUMP
-// (SQLPROC_CTRS_DEF *sqlproc_ctrs);
-
-//#pragma section MEASSQLSTMTBUMP
-//extern _tal _callable _resident _extensible int_16 MEASQLSTMTBUMP
-// (SQLSTMT_CTRS_DEF *sqlstmt_ctrs,
-// int_16 num_stmts,
-// int_16 total_proc,
-// int_16 caller);
-
-enum {SQL_MP_CALLER = 1}; // parameters to be passed in MEASQLSTMTBUMP
-enum {SQL_ARK_CALLER = 2};
-
-#endif /* _DMEASQL defined */
[03/30] incubator-trafodion git commit: TRAFODION-2731 CodeCleanup:
Remove obsolete, legacy and unused code
Posted by an...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/qms/QmmQmm.cpp
----------------------------------------------------------------------
diff --git a/core/sql/qms/QmmQmm.cpp b/core/sql/qms/QmmQmm.cpp
index 6cc2760..0c78e3a 100644
--- a/core/sql/qms/QmmQmm.cpp
+++ b/core/sql/qms/QmmQmm.cpp
@@ -81,11 +81,7 @@ void QmmGuaReceiveControlConnection::actOnSystemMessage
case ZSYS_VAL_SMSG_CLOSE:
case ZSYS_VAL_SMSG_PROCDEATH:
-#ifdef NA_LINUX
qmm_->handleClientExit((short *)&(clientPhandle.phandle_), messageNum);
-#else
- qmm_->handleClientExit(&clientPhandle.phandle_[0], messageNum);
-#endif
if (connection)
connection->setFatalError(NULL); //@ZX
break;
@@ -191,8 +187,6 @@ void Qmm::handleClientExit(const short* phandle, short messageNum)
short result = 0;
NABoolean qmpDied = FALSE;
-#ifdef NA_LINUX
-
Int32 lc_pin;
Int32 lc_cpu;
Int32 lc_seg;
@@ -210,13 +204,6 @@ void Qmm::handleClientExit(const short* phandle, short messageNum)
qmpDied = TRUE;
}
-#else
-
- result = PROCESSHANDLE_DECOMPOSE_(const_cast<short*>(phandle),
- &cpu, &pin, &segmentNumber);
- if (result)
-#endif
-
if (!qmpDied)
{
// When a qms dies we are delivered a null connection pointer and handle.
@@ -231,7 +218,6 @@ void Qmm::handleClientExit(const short* phandle, short messageNum)
qmsStub = qmsPool_[i];
NABoolean processDoesNotExist = FALSE;
-#ifdef NA_LINUX
char procName[200];
short result = -1;
@@ -248,9 +234,6 @@ void Qmm::handleClientExit(const short* phandle, short messageNum)
if (result || (lc_cpu < 0) || (lc_pin < 0))
processDoesNotExist = TRUE;
-#else
- processDoesNotExist = PROCESS_GETINFO_((short*)qmsStub->getProcessHandle()) == 4;
-#endif
if (qmsStub->getStatus() == QmsStub::RUNNING && processDoesNotExist)
{
found = TRUE;
@@ -292,7 +275,6 @@ void Qmm::handleClientExit(const short* phandle, short messageNum)
"*** Process %d,%d on segment %d has terminated, message=%d. ***",
cpu, pin, segmentNumber, messageNum);
-#ifdef NA_LINUX
if (qmp_ && *qmp_ == *(SB_Phandle_Type *)phandle)
{
QRLogger::log(CAT_QR_IPC, LL_INFO,
@@ -300,15 +282,6 @@ void Qmm::handleClientExit(const short* phandle, short messageNum)
qmp_->scheduleRestart();
}
else if (*getQmsStub(segmentNumber, cpu) == *(SB_Phandle_Type *)phandle)
-#else
- if (qmp_ && *qmp_ == phandle)
- {
- QRLogger::log(CAT_QR_IPC, LL_ERROR,
- "*** QMP has died, will attempt to restart...");
- qmp_->scheduleRestart();
- }
- else if (*getQmsStub(segmentNumber, cpu) == phandle)
-#endif
{
// This probably never gets executed; process handle usually delivered
// for a qms termination is null, and is handled in loop above that looks
@@ -342,7 +315,6 @@ void Qmm::allocateQms()
/*qmsMsgStream_,*/ ipcEnv_, heap_);
}
-#ifdef NA_LINUX
void Qmm::allocateQmsPool()
{
short qmsInx = 0;
@@ -421,95 +393,6 @@ void Qmm::checkAndRetryQms(Int16 maxRetries, Int16 delaySeconds)
}
}
-#endif
-
-#ifdef NA_NSK
-void Qmm::allocateQmsPool()
-{
- char segmentName[SEGMENT_NAME_LEN + 1];
- short result;
- short segmentNumber = 0;
- short lastSegmentNumber = MAX_SEGMENTS;
- short segmentNameLen;
- do
- {
- //result = NODENUMBER_TO_NODENAME_(segmentNumber,(short*)segmentName);
- result = NODENUMBER_TO_NODENAME_(lastSegmentNumber, segmentName,
- SEGMENT_NAME_LEN, &segmentNameLen);
- QRLogger::log(CAT_QR_IPC, LL_DEBUG,
- "Result for segment %d is %d", lastSegmentNumber, result);
- segmentName[segmentNameLen] = '\0';
- if (result != 0)
- lastSegmentNumber--;
- }
- while (lastSegmentNumber > 0 && result != 0);
-
- assertLogAndThrow1(CAT_QR_IPC, LL_ERROR,
- lastSegmentNumber, QmmException,
- "No segments found, result for segment 1 is %d", result);
- QRLogger::log(CAT_QR_IPC, LL_DEBUG,
- "Last segment number found = %d", lastSegmentNumber);
-
- short qmsInx = 0;
- short cpu;
- qmsCount_ = lastSegmentNumber * CPUS_PER_SEGMENT;
- qmsPool_ = new(heap_) QmsStub*[qmsCount_];
- UInt32 processorStatus;
- Int32 processorsInSegment;
- UInt32 processorBitmap;
- for (segmentNumber = 1; segmentNumber <= lastSegmentNumber; segmentNumber++)
- {
- segmentNameLen = 0; // make sure we have empty name if fail
- result = NODENUMBER_TO_NODENAME_(segmentNumber, segmentName,
- SEGMENT_NAME_LEN, &segmentNameLen);
- segmentName[segmentNameLen] = '\0';
- QRLogger::log(CAT_QR_IPC, LL_DEBUG,
- "Segment %d: result=%d, name=%s", segmentNumber, result, segmentName);
- if (result == 0)
- {
- // REMOTEPROCESSORSTATUS not available for NT, but not needed.
- #ifdef NA_NSK
- processorStatus = REMOTEPROCESSORSTATUS(segmentNumber);
- #else
- processorStatus = PROCESSORSTATUS();
- #endif
- processorsInSegment = processorStatus>>16;
- QRLogger::log(CAT_QR_IPC, LL_DEBUG,
- "%d processors in segment %d", processorsInSegment, segmentNumber);
- processorBitmap = processorStatus & 0x0000FFFF;
-
- // Create a qms stub for each possible cpu in the cluster, including
- // a placeholder for any missing cpu. If it is down, it could come on
- // line later and we will be notified via a system message. If it is
- // nonexistent (segment has fewer than 16 processors), we still include
- // a slot for it to allow two-dimensional referencing of a particular
- // qms stub using segment number and cpu number.
- for (cpu = 0; cpu < CPUS_PER_SEGMENT; cpu++)
- {
- qmsPool_[qmsInx++] =
- new(heap_) QmsStub(segmentNumber, segmentName,
- cpu, result,
- cpu < processorsInSegment,
- processorBitmap & (0x00008000 >> cpu),
- ipcEnv_, //qmsMsgStream_,
- heap_);
- }
- }
- else
- {
- // As with unreachable cpu of a reachable segment, we need slots for
- // the cpus of a down segment in case it becomes available, and to
- // allow for accurate indexing using seg#/cpu#.
- qmsPool_[qmsInx++] = new(heap_) QmsStub(segmentNumber, segmentName,
- cpu, result,
- FALSE, FALSE,
- ipcEnv_, //qmsMsgStream_,
- heap_);
- }
- }
-} // allocateQmsPool()
-#endif
-
void Qmm::startQmp(short cpu)
{
if (qmp_)
@@ -519,28 +402,8 @@ void Qmm::startQmp(short cpu)
NABoolean QmpStub::start()
{
-#ifndef NA_WINNT
-
char* baseProcName = MvQueryRewriteServer::getProcessName(IPC_SQLQMP_SERVER, NULL, cpu_);
-#ifdef NA_NSK
- baseProcName = strrchr(baseProcName, '/');
- if (baseProcName)
- {
- *baseProcName = '$';
- short rc = 0;
- short phandle[10];
- rc = PROCESSSTRING_SCAN_(baseProcName, strlen(baseProcName), , phandle);
-
- if (*phandle != -1)
- {
- QRLogger::log(CAT_QR_IPC, LL_INFO,
- "qmm found existing qmp process, not starting new one.");
- setProcessHandle(phandle);
- return TRUE;
- }
- }
-#else
SB_Phandle_Type *phandle;
phandle = get_phandle_with_retry(baseProcName);
@@ -551,9 +414,6 @@ NABoolean QmpStub::start()
setProcessHandle(*phandle);
return TRUE;
}
-#endif //NA_NSK
-
-#endif //NA_WINNT
switch ((Int32)qmpStartOpt_)
{
@@ -606,11 +466,7 @@ void QmpStub::allocateProcess(IpcEnvironment& ipcEnv, short cpu)
QRLogger::log(CAT_QR_IPC, LL_DEBUG,
"QMP process started on cpu #%d", qmpServer_->getServerId().getCpuNum());
-#ifdef NA_LINUX
setProcessHandle(qmpServer_->getServerId().getPhandle().phandle_);
-#else
- setProcessHandle(&qmpServer_->getServerId().getPhandle().phandle_[0]);
-#endif
}
else
{
@@ -623,263 +479,6 @@ void QmpStub::allocateProcess(IpcEnvironment& ipcEnv, short cpu)
//#pragma nowarn(770) // warning elimination
void QmpStub::spawnProcess(IpcEnvironment& ipcEnv, short cpu) //, ComDiagsArea **diags, CollHeap *diagsHeap)
{
-#ifdef NA_NSK
- Lng32 newPid; // new OSS procid
- Lng32 nowaitTag; // for nowait proc create
- char *argv[5]; // argv for new process
- char **envp = NULL; // ptr to environment/NULL
- zsys_ddl_fdinfo_def fdinfo; // duplicated file descs
- zsys_ddl_fdentry_def *fdentry = &fdinfo.z_fdentry; // array of ent.
- // const long numFileDescs = 1; // # entries in fdinfo
- zsys_ddl_inheritance_def inheritance; // signal masks
- zsys_ddl_processextension_def processExtension; // create options
- zsys_ddl_processresults_def processResults; // return values
-
- char* progFileName;
- const char* progName;
- char progFileNameBuf[1000];
- char defaultsName[1000];
- Int32 defaultsNameLen = 0;
- Int32 retcode;
- Int32 nodeNameLen = 0;
- GuaErrorNumber guardianError;
-
- // variable that holds the mxmcp program name
- char mxcmpVerProg[9];
- short cmpVersion;
- char drcliname[9];
- char drclipname[9];
-
- char valueBuf[128];
- short valueBufLen;
-
- progName = "mxqmp";
-
-#pragma nowarn(1506) // warning elimination
- short progNameLen = str_len(progName);
-#pragma warn(1506) // warning elimination
- char localSegmentName[SEGMENT_NAME_LEN + 1];
- short localSegmentNameLen;
- short result = NODENUMBER_TO_NODENAME_(-1,localSegmentName,
- SEGMENT_NAME_LEN,
- &localSegmentNameLen);
- assertLogAndThrow1(CAT_QR_IPC, LL_ERROR,
- result==0, QmmException,
- "Could not get name of local segment, error is %d", result);
- localSegmentName[localSegmentNameLen] = '\0';
-
- str_cpy(&defaultsName[defaultsNameLen], localSegmentName, localSegmentNameLen);
- defaultsNameLen += localSegmentNameLen;
- defaultsName[defaultsNameLen] = '.';
- defaultsNameLen++;
- // now the program file looks like "\node."
-
- // now add the default subvolume for program files, "$SYSTEM.SYSTEM."
- str_cpy(&defaultsName[defaultsNameLen],"$SYSTEM.SYSTEM",14);
- //assert(defaultsNameLen+15 < IpcMaxGuardianPathNameLength);
- defaultsNameLen += 14;
-
- char overridingDefineForProgFile[] = "=_MX_QMP_PROG_FILE_NAME";
- Int32 overridingDefineLen = str_len(overridingDefineForProgFile);
-
- char* progfileFromEnvvar = NULL;
-#ifndef NDEBUG
- progfileFromEnvvar =
- getenv((overridingDefineForProgFile[0] == '=')
- ? &overridingDefineForProgFile[1]
- : overridingDefineForProgFile);
-#endif
- if (progfileFromEnvvar != NULL)
- {
- str_pad(progFileNameBuf, IpcMaxGuardianPathNameLength, '\0');
- strcpy(progFileNameBuf, progfileFromEnvvar);
- progFileName = progFileNameBuf;
- }
- else
- {
- //// If the define for downrev compiler subvolume is set, check that and
- //// change the defaultsName to point to that subvolume instead.
- //if (cmpVersion != COM_VERS_MXV)
- //{
- // char dummy1[16];
- // char dummy2[16];
- // char dummy3[24];
- // short progdefnamelen = 0;
- // if (DEFINEINFO("=_MX_CMP_DR_SUBVOL ",
- // dummy1,
- // dummy2,
- // dummy3,
- // 24,
- // &progdefnamelen) == 0)
- // {
- // str_pad(defaultsName, 1000, '\0');
- // strcpy(defaultsName, "=_MX_CMP_DR_SUBVOL ");
- // defaultsNameLen = 24;
- // }
- //}
-
- // correcting overridingDefineForProgFile with correct Node name
- char overridingDefineValue[36];
- short overridingDefineValueLen = 0;
- retcode = ComRtGetDefine((char *)overridingDefineForProgFile,
- overridingDefineValue,
- sizeof(overridingDefineValue),
- overridingDefineValueLen);
- if (retcode == 0)
- {
- // Extract filename and volume/subvolume name from the define
- // value which is in the form \\NODENAME.$VOL.SUBVOL.FILENAME
- char *fileNameFromDefineValue;
- short index = overridingDefineValueLen;
- while (overridingDefineValue[index] != '.' && index >= 0)
- index--;
- fileNameFromDefineValue = &overridingDefineValue[index+1];
-
- char *volSubvolFromDefineValue =
- str_chr(overridingDefineValue, '$');
- overridingDefineValue[index] = '\0'; // replace '.' before file
- // name with '\0'
-
- ComRtDeleteDefine((char *)overridingDefineForProgFile);
- ComRtAddDefine((char *)overridingDefineForProgFile,
- fileNameFromDefineValue,
- NULL, // local nodename will be assumed
- volSubvolFromDefineValue);
- }
-
- if (( retcode = guardianError=
- FILENAME_RESOLVE_((char*) progName,
- progNameLen,
- valueBuf,
- 128,
- &valueBufLen,
- 32 + 8, // allow DEFINEs
- (char *) overridingDefineForProgFile,
-#pragma nowarn(1506) // warning elimination
- overridingDefineLen,
-#pragma warn(1506) // warning elimination
- NULL, // no search
- 0,
- defaultsName,
-#pragma nowarn(1506) // warning elimination
- defaultsNameLen) ) == 0 )
-#pragma warn(1506) // warning elimination
-
- {
- short pathLen; // a dummy
-
- // We got a Guardian name for the object file (must be an
- // executable OSS program file in the /G directory)
- retcode = guardianError = FILENAME_TO_PATHNAME_(valueBuf,
- valueBufLen,
- progFileNameBuf,
- 1000,
- &pathLen);
- if (guardianError == 0)
- // success, we converted the cheat define to an OSS name
- progFileName = progFileNameBuf;
- else
- assertLogAndThrow3(CAT_QMM, LL_ERROR,
- FALSE, QmmException,
- "Error %d returned from FILENAME_TO_PATHNAME_ "
- "for file name %.*s",
- guardianError, valueBufLen, valueBuf);
- }
- else
- assertLogAndThrow3(CAT_QMM, LL_ERROR,
- FALSE, QmmException,
- "Error %d returned from FILENAME_RESOLVE_ "
- "for file name %s",
- guardianError, progNameLen, progName);
-
- }
-
- progFileName[IpcMaxGuardianPathNameLength-1] = 0; // limit length
- QRLogger::log(CAT_QMM, LL_DEBUG,
- "spawn: using prog file name %s", progFileName);
-
- // ---------------------------------------------------------------------
- // Prepare input parameters for PROCESS_SPAWN_
- // ---------------------------------------------------------------------
-
- // argv first
- argv[0] = (char *) progName;
- argv[1] = "-oss";
- argv[2] = NULL;
-
- Lng32 structLen = sizeof(fdinfo);
- str_pad((char *) &fdinfo,structLen,0);
- fdinfo.z_len = structLen;
- fdinfo.z_timeout = 7200; // wait at most 2 hour
- fdinfo.z_umask = -1;
- fdinfo.z_fdcount = 0;
- fdentry[0].z_fd = 0;
- fdentry[0].z_dupfd = 0;
- fdentry[0].z_name = (zsys_ddl_char_extaddr_def) 0;
- fdentry[0].z_oflag = 0;
- fdentry[0].z_mode = 0;
-
- // use the environment from ipc environment
- envp = ipcEnv.getEnvVars();
-
- // initialize inheritance struct (all zeroes for now)
- str_pad((char*)&inheritance, sizeof(inheritance), 0);
-
- // input parameters for process attributes
- str_pad((char *) &processExtension, sizeof(processExtension), 0);
- processExtension.z_len = sizeof(processExtension);
- processExtension.z_memorypages = -1;
- processExtension.z_jobid = -1;
- processExtension.z_priority = IPC_PRIORITY_DONT_CARE;
- processExtension.z_cpu = cpu;
- processExtension.z_mainstackmax = 4 * 1024 * 1024; // 4 MB of main stack
- processExtension.z_heapmax = 384 * 1024 * 1024; // 384 MB heap max
-
- // Can't call getServerProcessName() in the IPC code to get the process name,
- // it returns a Guardian process name.
- char* qmpProcName = MvQueryRewriteServer::getProcessName(IPC_SQLQMP_SERVER,
- NULL, cpu, heap_);
- processExtension.z_nameoptions = 1;
- processExtension.z_processname = (zsys_ddl_char_extaddr_def)qmpProcName;
-
- // debugQmp_ is initialized to FALSE; usually we will break here when debugging
- // qmm and modify the value so it will launch qmp in the debugger.
- if (debugQmp_)
- {
- processExtension.z_debugoptions |=
- ZSYS_VAL_PCREATOPT_RUND |
- ZSYS_VAL_PCREATOPT_SAVEABEND |
- ZSYS_VAL_PCREATOPT_INSPECT;
- }
-
- // identify length of return structure
- str_pad((char *) &processResults, sizeof(processResults), 0);
- processResults.z_len = sizeof(processResults);
-
- newPid = PROCESS_SPAWN_(
- progFileName,
- &fdinfo,
- argv,
- envp,
- &inheritance,
- sizeof(inheritance),
- &processExtension,
- &processResults,
- -1, // nowait
- NULL);
-
- //populateDiagsAreaFromTPCError(*diags,diagsHeap);
- assertLogAndThrow3(CAT_QR_IPC, LL_ERROR,
- processResults.z_errno == 0, QmmException,
- "Attempt to spawn QMP process failed: "
- "error = %d, tpcerror = %d, tcpdetail = %d",
- processResults.z_errno,
- processResults.z_tpcerror,
- processResults.z_tpcdetail);
-
- setProcessHandle((short*)processResults.z_phandle.u_z_data.z_word);
-
-#elif defined (NA_LINUX)
SB_Phandle_Type p_handle;
const char* progFile = "tdm_arkqmp";
@@ -928,84 +527,7 @@ void QmpStub::spawnProcess(IpcEnvironment& ipcEnv, short cpu) //, ComDiagsArea *
NULL); /* pid */
setProcessHandle(p_handle);
-
-#else
- launchNSKLiteProcess(ipcEnv, cpu);
-#endif
-}
-
-#ifdef NA_WINNT
-void QmpStub::launchNSKLiteProcess(IpcEnvironment& ipcEnv, short p_pe)
-{
- // a character string with the program file name
- const Int32 maxLengthOfCommandLineArgs = 32;
- char progFileName[(IpcMaxGuardianPathNameLength +
- maxLengthOfCommandLineArgs)];
-
- // parameters to NSKProcessCreate
- NSK_PORT_HANDLE p_phandle;
-
- // -----------------------------------------------------------------
- // create the program file name from the class name and the overriding
- // define name.
- //
- // for now, we form the name from an environment variable. if the
- // environment variable is not present then we form the name from
- // the class name. we look for environment variables of the form
- // =_ARK_???_PROG_FILE_NAME
- //
- // names which are formed from class names are hard coded below.
- //
- // the long term plan is to form the name from the registry while allowing
- // overrides for development and debugging purposes only
- //
- // note we REQUIRE the name to be identical on each PE !!!
- // -----------------------------------------------------------------
-
- strcpy(progFileName, "tdm_arkqmp.exe");
-
- // ---------------------------------------------------------------------
- // Set the run time arguments in the command line
- // ---------------------------------------------------------------------
- strcat(progFileName, " -guardian");
-
- // ---------------------------------------------------------------------
- // start a new process on the specified PE with the specified
- // program file
- // ---------------------------------------------------------------------
-
- // use the environment from ipc environment
- void* envp = ipcEnv.getEnvVars();
- Lng32 envpLen = ipcEnv.getEnvVarsLen();
- Lng32 procCreateError = NSKProcessCreate
- ((char*)&progFileName // command string
- , NORMAL_PRIORITY_CLASS // priority
- , p_pe // pe (aka cpu)
- , &p_phandle // lpNSKphandle
- , 0 // portclass - devtype 0 == process
- , 0 // portsubclass - devsubtype 0
- , NAMED_AUTO // nmopt $RECEIVE
- , NULL // pr_name
- , NULL // process_desc ?????
- , -1 // waited
- , USE_CALLER_ENV // create_options
- , NULL // env_block
- , 0 // env_block_size
- , 0 // pfs_size
- , NULL // lph my port
- );
-
- //if (getenv("SQL_MSGBOX_PROCESS") != NULL)
- // {
- // MessageBox( NULL, "Requester: Process Launched", (CHAR *)&progFileName, MB_OK|MB_ICONINFORMATION );
- // };
-
- assertLogAndThrow1(CAT_QR_IPC, LL_ERROR,
- procCreateError == NO_ERROR, QmmException,
- "Attempt to launch NSKLite process failed with error %d",
- procCreateError);
}
-#endif
void Qmm::relayPendingPubsToQms()
{
@@ -1288,10 +810,6 @@ void QRProcessStub::checkRestarts()
void QRProcessStub::nullProcessHandle()
{
-#ifndef NA_LINUX
- for (Int32 i=0; i<10; i++)
- processHandle_[i] = -1;
-#endif
}
QmsStub::QmsStub(short segmentNumber, char* segmentName, short cpuNumber,
@@ -1384,11 +902,7 @@ NABoolean QmsStub::start()
qmsMsgStream_->addRecipient(qmsServer_->getControlConnection());
status_ = RUNNING;
-#ifdef NA_LINUX
setProcessHandle(qmsServer_->getServerId().getPhandle().phandle_);
-#else
- setProcessHandle(&qmsServer_->getServerId().getPhandle().phandle_[0]);
-#endif
QRLogger::log(CAT_QR_IPC, LL_DEBUG,
"QMS process started on cpu #%d", qmsServer_->getServerId().getCpuNum());
MvQueryRewriteServer::initQms(qmsServer_, heap_);
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/qms/QmmQmm.h
----------------------------------------------------------------------
diff --git a/core/sql/qms/QmmQmm.h b/core/sql/qms/QmmQmm.h
index 0413d53..d8073eb 100644
--- a/core/sql/qms/QmmQmm.h
+++ b/core/sql/qms/QmmQmm.h
@@ -29,9 +29,6 @@
#include "QRLogger.h"
#include "Collections.h"
-#ifndef NA_LINUX
-#include <zsysc.h>
-#else
#include "seabed/fs.h"
#include "seabed/ms.h"
#include "seabed/int/opts.h"
@@ -43,7 +40,6 @@ extern "C" {
#include "zsysc.h"
}
-#endif
// Classes defined in this file.
class QmmException;
@@ -226,7 +222,6 @@ class QRProcessStub : public NABasicObject
virtual ~QRProcessStub()
{}
-#ifdef NA_LINUX
Int32 operator==(SB_Phandle_Type ph) const
{
return !memcmp((char*)&processHandle_, (char*)&ph, sizeof(SB_Phandle_Type));
@@ -241,35 +236,6 @@ class QRProcessStub : public NABasicObject
{
memcpy(&processHandle_, &ph, sizeof(SB_Phandle_Type));
}
-#else
- //int operator==(const zsys_ddl_phandle_def& ph) const
- Int32 operator==(const short* ph) const
- {
- // @ZXros -- following won't compile now on Windows. Used in Qmm::handleClientExit() to see who died.
-#ifdef NA_NSK
- //return !strncmp(processHandle_.u_z_data.z_byte, ph.u_z_data.z_byte, 20);
- return !memcmp((char*)processHandle_, (char*)ph, 20);
- //sizeof(zsys_ddl_phandle_def));
-#else
- return 0;
-#endif
- }
-
- const short* getProcessHandle() const
- {
- return &processHandle_[0];
- }
-
- //void setProcessHandle(const zsys_ddl_phandle_def& ph)
- void setProcessHandle(const short* ph)
- {
- //processHandle_ = ph;
- memcpy((char*)processHandle_, (char*)ph, 20);
- //sizeof(zsys_ddl_phandle_def));// zsys_ddl_phandle_def_Size);
- }
-
-#endif
-
Int64 getLockoutEndTS() const
{
return lockoutEndTS_;
@@ -289,11 +255,7 @@ class QRProcessStub : public NABasicObject
void setLockout();
//zsys_ddl_phandle_def processHandle_;
-#ifdef NA_LINUX
SB_Phandle_Type processHandle_;
-#else
- short processHandle_[10];
-#endif
Int64 lockoutEndTS_;
Lng32 retryNumber_;
CollHeap* heap_;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/qms/QmsMain.cpp
----------------------------------------------------------------------
diff --git a/core/sql/qms/QmsMain.cpp b/core/sql/qms/QmsMain.cpp
index ba10d74..1d438b9 100644
--- a/core/sql/qms/QmsMain.cpp
+++ b/core/sql/qms/QmsMain.cpp
@@ -32,14 +32,12 @@
#include "QueryRewriteServer.h"
#include "QRIpc.h"
-#if defined (NA_LINUX)
#include "nsk/nskport.h"
#include "seabed/ms.h"
#include "seabed/fs.h"
extern void my_mpi_fclose();
#include "SCMVersHelp.h"
DEFINE_DOVERS(tdm_arkqms)
-#endif
/**
* \file
@@ -66,16 +64,13 @@ static QmsGuaReceiveControlConnection* initializeIPC(IpcEnvironment*& env)
return conn;
}
-#ifdef NA_LINUX
extern "C"
{
Int32 sq_fs_dllmain();
}
-#endif
Int32 main(Int32 argc, char *argv[])
{
-#ifdef NA_LINUX
dovers(argc, argv);
try
@@ -93,7 +88,6 @@ Int32 main(Int32 argc, char *argv[])
exit(1);
}
// LCOV_EXCL_STOP
-#endif
NABoolean performSMDInit = FALSE;
NABoolean performXMLInit = FALSE;
@@ -103,13 +97,6 @@ Int32 main(Int32 argc, char *argv[])
// from a command-line in the shell that defines the env var.
//Sleep(30000);
-#ifdef NA_WINNT
- if (getenv("QMS_MSGBOX_PROCESS") != NULL)
- {
- MessageBox( NULL, "QMS Process Launched", (CHAR *)argv[0], MB_OK|MB_ICONINFORMATION );
- };
-#endif
-
QRLogger::instance().setModule(QRLogger::QRL_QMS);
QRLogger::instance().initLog4cxx("log4cxx.qms.config");
@@ -126,11 +113,7 @@ Int32 main(Int32 argc, char *argv[])
// If invoked via the message interface, -oss will be the program
// parameter after the program name.
-#if defined (NA_WINNT) || defined (NA_LINUX)
NABoolean commandLineInterface = (strncmp(argv[1], "-guardian", 9) != 0);
-#else
- NABoolean commandLineInterface = (strncmp(argv[1], "-oss", 4) != 0);
-#endif
// For message interface, initialize IPC so it will return to qmm from the
// process creation code before we begin qms initialization.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/qms/QmsRequest.cpp
----------------------------------------------------------------------
diff --git a/core/sql/qms/QmsRequest.cpp b/core/sql/qms/QmsRequest.cpp
index f262aee..f074b9b 100644
--- a/core/sql/qms/QmsRequest.cpp
+++ b/core/sql/qms/QmsRequest.cpp
@@ -23,10 +23,6 @@
#include "Platform.h" // Must precede zsysc.h or weird errors occur
-#ifndef NA_LINUX
-#include <zsysc.h>
-#endif
-
#include "QmsRequest.h"
#include "QmsQms.h"
#include "QmsInitializer.h"
@@ -35,14 +31,6 @@
using namespace QR;
#define XML_BUFF_SIZE 32768
-#ifdef NA_NSK
-extern "C"
-{
- #include "cextdecs.h(PROCESSHANDLE_TO_FILENAME_, \
- PROCESSHANDLE_GETMINE_, \
- PROCESS_GETINFO_)"
-}
-#elif defined (NA_LINUX)
#include "seabed/fs.h"
#include "seabed/ms.h"
#include "seabed/int/opts.h"
@@ -53,7 +41,6 @@ extern "C" {
#include "cextdecs/cextdecs.h"
#include "zsysc.h"
}
-#endif
QRMessageRequest::~QRMessageRequest()
{
@@ -182,22 +169,9 @@ void QRCommandLineRequest::getNextParameter(NAString& param)
QmsGuaReceiveControlConnection::QmsGuaReceiveControlConnection(IpcEnvironment* env)
: GuaReceiveControlConnection(env)
{
-#ifndef NA_LINUX
- // Get the name of this qms process.
- short myProcHandle[10];
- short actualLen;
- PROCESSHANDLE_GETMINE_(myProcHandle);
- PROCESSHANDLE_TO_FILENAME_(myProcHandle, procName_,
- PROCESSNAME_STRING_LEN, &actualLen);
- procName_[actualLen] = '\0';
-#else // (NA_LINUX)
-
memset(procName_, 0, sizeof(procName_));
short retval = msg_mon_get_my_process_name(procName_, sizeof(procName_) - 1);
-#endif
-
-
// If the process is "unnamed" (i.e., the name is not one we assign to a
// public qms), mark it as private, so we'll know to terminate if we get a
// close message.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/qmscommon/QRDescriptor.cpp
----------------------------------------------------------------------
diff --git a/core/sql/qmscommon/QRDescriptor.cpp b/core/sql/qmscommon/QRDescriptor.cpp
index a683702..1d2830f 100644
--- a/core/sql/qmscommon/QRDescriptor.cpp
+++ b/core/sql/qmscommon/QRDescriptor.cpp
@@ -1749,11 +1749,7 @@ void QRNumericVal::setNumericVal(Int64 unscaledVal, Int32 scale)
// the new value.
snprintf(buf,
sizeof(buf),
- #ifdef NA_64BIT
"%0*ld",
- #else
- "%0*Ld",
- #endif // NA_64BIT
scale + (unscaledVal < 0), // add one for sign if negative
unscaledVal);
stringRep_ = buf;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/qmscommon/QRQueries.cpp
----------------------------------------------------------------------
diff --git a/core/sql/qmscommon/QRQueries.cpp b/core/sql/qmscommon/QRQueries.cpp
index 833a230..1d143ef 100644
--- a/core/sql/qmscommon/QRQueries.cpp
+++ b/core/sql/qmscommon/QRQueries.cpp
@@ -39,20 +39,7 @@
/* Size specific types used here */
typedef int Int32;
typedef unsigned int UInt32;
-#if defined(NA_LINUX) && defined(NA_64BIT)
typedef long Int64;
-#else
-typedef long long int Int64;
-#endif
-
-#undef SQLCLI_LIB_FUNC
-
- #define SQLCLI_LIB_FUNC
-#ifdef NA_64BIT
- /* dg64 - get rid of __declspec */
- #undef SQLCLI_LIB_FUNC
- #define SQLCLI_LIB_FUNC
-#endif
#ifdef __cplusplus
extern "C"
@@ -849,7 +836,6 @@ enum SQLSTATS_TYPE {
SQLCLI_NO_STATS = 0,
/* SQLCLI_DEFAULT_STATS means the statistics is merged based on the statistics view type */
SQLCLI_DEFAULT_STATS = 0,
- SQLCLI_MEASURE_STATS = 1,
SQLCLI_ACCUMULATED_STATS = 2,
SQLCLI_PERTABLE_STATS = 3,
SQLCLI_ALL_STATS = 4,
@@ -1202,38 +1188,32 @@ enum PREPARE_FLAGS
PREPARE_NOT_A_NEW_OPERATION = 0x0020
};
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_AddModule (
- /*IN*/ SQLMODULE_ID * module_name);
-
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_ADDMODULE (
- /*IN*/ SQLMODULE_ID * module_name);
-
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_AllocDesc (
+Int32 SQL_EXEC_AllocDesc (
/*INOUT*/ SQLDESC_ID * desc_id,
/*IN OPTIONAL*/ SQLDESC_ID * input_descriptor);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_ALLOCDESC (
+Int32 SQL_EXEC_ALLOCDESC (
/*INOUT*/ SQLDESC_ID * desc_id,
/*IN OPTIONAL*/ SQLDESC_ID * input_descriptor);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_AllocDescBasic (
+Int32 SQL_EXEC_AllocDescBasic (
/*INOUT*/ SQLDESC_ID * desc_id,
/*IN OPTIONAL*/ Int32 max_entries);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_AssocFileNumber (
+Int32 SQL_EXEC_AssocFileNumber (
/*IN*/ SQLSTMT_ID * statement_id,
/*IN*/ short file_number);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_ASSOCFILENUMBER (
+Int32 SQL_EXEC_ASSOCFILENUMBER (
/*IN*/ SQLSTMT_ID * statement_id,
/*IN*/ short file_number);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetDiskMaxSize (
+Int32 SQL_EXEC_GetDiskMaxSize (
/*IN*/ char *volname,
/*OUT*/ Int64 *totalCapacity,
/*OUT*/ Int64 *totalFreespace);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetListOfDisks (
+Int32 SQL_EXEC_GetListOfDisks (
/*IN/OUT*/ char *diskBuf,
/* OUT */ Int32 *numTSEs,
/* OUT */ Int32 *maxTSELength,
@@ -1241,180 +1221,170 @@ SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetListOfDisks (
);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_AllocStmt (
+Int32 SQL_EXEC_AllocStmt (
/*INOUT*/ SQLSTMT_ID * new_statement_id,
/*IN OPTIONAL*/ SQLSTMT_ID * cloned_statement);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_ALLOCSTMT (
+Int32 SQL_EXEC_ALLOCSTMT (
/*INOUT*/ SQLSTMT_ID * new_statement_id,
/*IN OPTIONAL*/ SQLSTMT_ID * cloned_statement);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_AllocStmtForRS (
+Int32 SQL_EXEC_AllocStmtForRS (
/*IN*/ SQLSTMT_ID *callStmtId,
/*IN*/ Int32 resultSetIndex,
/*INOUT*/ SQLSTMT_ID *resultSetStmtId);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_ALLOCSTMTFORRS (
+Int32 SQL_EXEC_ALLOCSTMTFORRS (
/*IN*/ SQLSTMT_ID *callStmtId,
/*IN*/ Int32 resultSetIndex,
/*INOUT*/ SQLSTMT_ID *resultSetStmtId);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_ClearDiagnostics (/*IN*/ SQLSTMT_ID *statement_id);
+Int32 SQL_EXEC_ClearDiagnostics (/*IN*/ SQLSTMT_ID *statement_id);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_CLEARDIAGNOSTICS (/*IN*/ SQLSTMT_ID *statement_id);
+Int32 SQL_EXEC_CLEARDIAGNOSTICS (/*IN*/ SQLSTMT_ID *statement_id);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_CLI_VERSION ();
+Int32 SQL_EXEC_CLI_VERSION ();
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_CloseStmt (
+Int32 SQL_EXEC_CloseStmt (
/*IN*/ SQLSTMT_ID * statement_id);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_CLOSESTMT (
+Int32 SQL_EXEC_CLOSESTMT (
/*IN*/ SQLSTMT_ID * statement_id);
-SQLCLI_LIB_FUNC
Int32 SQL_EXEC_CreateContext(/*OUT*/ SQLCTX_HANDLE * context_handle,
/*IN OPTIONAL*/ char* sqlAuthId,
/*IN OPTIONAL*/ Int32 suppressAutoXactStart);
-SQLCLI_LIB_FUNC
Int32 SQL_EXEC_CREATECONTEXT(/*OUT*/ SQLCTX_HANDLE * context_handle,
/*IN OPTIONAL*/ char* sqlAuthId,
/*IN OPTIONAL*/ Int32 suppressAutoXactStart);
-SQLCLI_LIB_FUNC
Int32 SQL_EXEC_CurrentContext(/*OUT*/ SQLCTX_HANDLE * contextHandle);
-SQLCLI_LIB_FUNC
Int32 SQL_EXEC_CURRENTCONTEXT(/*OUT*/ SQLCTX_HANDLE * contextHandle);
-SQLCLI_LIB_FUNC
Int32 SQL_EXEC_DeleteContext(/*IN*/ SQLCTX_HANDLE contextHandle);
-SQLCLI_LIB_FUNC
Int32 SQL_EXEC_DELETECONTEXT(/*IN*/ SQLCTX_HANDLE contextHandle);
-SQLCLI_LIB_FUNC
Int32 SQL_EXEC_ResetContext(/*IN*/ SQLCTX_HANDLE contextHandle, /*IN*/ void *contextMsg);
-SQLCLI_LIB_FUNC
Int32 SQL_EXEC_RESETCONTEXT(/*IN*/ SQLCTX_HANDLE contextHandle, /*IN*/ void *contextMsg);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_DeallocDesc (
+Int32 SQL_EXEC_DeallocDesc (
/*IN*/ SQLDESC_ID * desc_id );
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_DEALLOCDESC (
+Int32 SQL_EXEC_DEALLOCDESC (
/*IN*/ SQLDESC_ID * desc_id );
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_DeallocStmt (
+Int32 SQL_EXEC_DeallocStmt (
/*IN*/ SQLSTMT_ID * statement_id);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_DEALLOCSTMT (
+Int32 SQL_EXEC_DEALLOCSTMT (
/*IN*/ SQLSTMT_ID * statement_id);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_DefineDesc (
+Int32 SQL_EXEC_DefineDesc (
/*IN*/ SQLSTMT_ID * statement_id,
/*IN* (SQLWHAT_DESC) */ Int32 what_descriptor,
/*IN*/ SQLDESC_ID * sql_descriptor);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_DEFINEDESC (
+Int32 SQL_EXEC_DEFINEDESC (
/*IN*/ SQLSTMT_ID * statement_id,
/*IN* (SQLWHAT_DESC) */ Int32 what_descriptor,
/*IN*/ SQLDESC_ID * sql_descriptor);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_DescribeStmt (
+Int32 SQL_EXEC_DescribeStmt (
/*IN*/ SQLSTMT_ID * statement_id,
/*IN OPTIONAL*/ SQLDESC_ID * input_descriptor,
/*IN OPTIONAL*/ SQLDESC_ID * output_descriptor);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_DESCRIBESTMT (
+Int32 SQL_EXEC_DESCRIBESTMT (
/*IN*/ SQLSTMT_ID * statement_id,
/*IN OPTIONAL*/ SQLDESC_ID * input_descriptor,
/*IN OPTIONAL*/ SQLDESC_ID * output_descriptor);
-SQLCLI_LIB_FUNC
Int32 SQL_EXEC_DisassocFileNumber(/*IN*/ SQLSTMT_ID * statement_id);
-SQLCLI_LIB_FUNC
Int32 SQL_EXEC_DISASSOCFILENUMBER(/*IN*/ SQLSTMT_ID * statement_id);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_DropContext (
+Int32 SQL_EXEC_DropContext (
/*IN*/ SQLCTX_HANDLE context_handle );
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_DROPCONTEXT (
+Int32 SQL_EXEC_DROPCONTEXT (
/*IN*/ SQLCTX_HANDLE context_handle );
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_Exec (
+Int32 SQL_EXEC_Exec (
/*IN*/ SQLSTMT_ID * statement_id,
/*IN OPTIONAL*/ SQLDESC_ID * input_descriptor,
/*IN*/ Int32 num_ptr_pairs,
...);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_EXEC (
+Int32 SQL_EXEC_EXEC (
/*IN*/ SQLSTMT_ID * statement_id,
/*IN OPTIONAL*/ SQLDESC_ID * input_descriptor,
/*IN*/ Int32 num_ptr_pairs,
/*IN*/ struct SQLCLI_PTR_PAIRS ptr_pairs[]);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_ExecClose (
+Int32 SQL_EXEC_ExecClose (
/*IN*/ SQLSTMT_ID * statement_id,
/*IN OPTIONAL*/ SQLDESC_ID * input_descriptor,
/*IN*/ Int32 num_ptr_pairs,
...);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_EXECCLOSE (
+Int32 SQL_EXEC_EXECCLOSE (
/*IN*/ SQLSTMT_ID * statement_id,
/*IN OPTIONAL*/ SQLDESC_ID * input_descriptor,
/*IN*/ Int32 num_ptr_pairs,
/*IN*/ struct SQLCLI_PTR_PAIRS ptr_pairs[]);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_ExecDirect(
+Int32 SQL_EXEC_ExecDirect(
/*IN*/ SQLSTMT_ID * statement_id,
/*IN*/ SQLDESC_ID * sql_source,
/*IN OPTIONAL*/ SQLDESC_ID * input_descriptor,
/*IN*/ Int32 num_ptr_pairs,
...);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_EXECDIRECT (
+Int32 SQL_EXEC_EXECDIRECT (
/*IN*/ SQLSTMT_ID * statement_id,
/*IN*/ SQLDESC_ID * sql_source,
/*IN OPTIONAL*/ SQLDESC_ID * input_descriptor,
/*IN*/ Int32 num_ptr_pairs,
/*IN*/ struct SQLCLI_PTR_PAIRS ptr_pairs[]);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_ExecDirectDealloc(
+Int32 SQL_EXEC_ExecDirectDealloc(
/*IN*/ SQLSTMT_ID * statement_id,
/*IN*/ SQLDESC_ID * sql_source,
/*IN OPTIONAL*/ SQLDESC_ID * input_descriptor,
/*IN*/ Int32 num_ptr_pairs,
...);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_EXECDIRECTDEALLOC(
+Int32 SQL_EXEC_EXECDIRECTDEALLOC(
/*IN*/ SQLSTMT_ID * statement_id,
/*IN*/ SQLDESC_ID * sql_source,
/*IN OPTIONAL*/ SQLDESC_ID * input_descriptor,
/*IN*/ Int32 num_ptr_pairs,
/*IN*/ struct SQLCLI_PTR_PAIRS ptr_pairs[]);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_ExecFetch(
+Int32 SQL_EXEC_ExecFetch(
/*IN*/ SQLSTMT_ID * statement_id,
/*IN OPTIONAL*/ SQLDESC_ID * input_descriptor,
/*IN*/ Int32 num_ptr_pairs,
...);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_EXECFETCH(
+Int32 SQL_EXEC_EXECFETCH(
/*IN*/ SQLSTMT_ID * statement_id,
/*IN OPTIONAL*/ SQLDESC_ID * input_descriptor,
/*IN*/ Int32 num_ptr_pairs,
/*IN*/ struct SQLCLI_PTR_PAIRS ptr_pairs[]);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_ClearExecFetchClose(
+Int32 SQL_EXEC_ClearExecFetchClose(
/*IN*/ SQLSTMT_ID * statement_id,
/*IN OPTIONAL*/ SQLDESC_ID * input_descriptor,
/*IN OPTIONAL*/ SQLDESC_ID * output_descriptor,
@@ -1423,7 +1393,7 @@ SQLCLI_LIB_FUNC Int32 SQL_EXEC_ClearExecFetchClose(
/*IN*/ Int32 num_total_ptr_pairs,
...);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_CLEAREXECFETCHCLOSE(
+Int32 SQL_EXEC_CLEAREXECFETCHCLOSE(
/*IN*/ SQLSTMT_ID * statement_id,
/*IN OPTIONAL*/ SQLDESC_ID * input_descriptor,
/*IN OPTIONAL*/ SQLDESC_ID * output_descriptor,
@@ -1433,63 +1403,63 @@ SQLCLI_LIB_FUNC Int32 SQL_EXEC_CLEAREXECFETCHCLOSE(
/*IN*/ struct SQLCLI_PTR_PAIRS input_ptr_pairs[],
/*IN*/ struct SQLCLI_PTR_PAIRS output_ptr_pairs[]);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_Fetch(
+Int32 SQL_EXEC_Fetch(
/*IN*/ SQLSTMT_ID * statement_id,
/*IN OPTIONAL*/ SQLDESC_ID * output_descriptor,
/*IN*/ Int32 num_ptr_pairs,
...);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_FETCH(
+Int32 SQL_EXEC_FETCH(
/*IN*/ SQLSTMT_ID * statement_id,
/*IN OPTIONAL*/ SQLDESC_ID * output_descriptor,
/*IN*/ Int32 num_ptr_pairs,
/*IN*/ struct SQLCLI_PTR_PAIRS ptr_pairs[]);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_FetchClose(
+Int32 SQL_EXEC_FetchClose(
/*IN*/ SQLSTMT_ID * statement_id,
/*IN OPTIONAL*/ SQLDESC_ID * output_descriptor,
/*IN*/ Int32 num_ptr_pairs,
...);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_FETCHCLOSE(
+Int32 SQL_EXEC_FETCHCLOSE(
/*IN*/ SQLSTMT_ID * statement_id,
/*IN OPTIONAL*/ SQLDESC_ID * output_descriptor,
/*IN*/ Int32 num_ptr_pairs,
/*IN*/ struct SQLCLI_PTR_PAIRS ptr_pairs[]);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_FetchMultiple(/*IN*/ SQLSTMT_ID * statement_id,
+Int32 SQL_EXEC_FetchMultiple(/*IN*/ SQLSTMT_ID * statement_id,
/*IN OPTIONAL*/ SQLDESC_ID * output_descriptor,
/*IN*/ Int32 rowset_size,
/*IN*/ Int32 * rowset_status_ptr,
/*OUT*/ Int32 * rowset_nfetched,
/*IN*/ Int32 num_quadruple_fields,
...);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_FETCHMULTIPLE(/*IN*/ SQLSTMT_ID * statement_id,
+Int32 SQL_EXEC_FETCHMULTIPLE(/*IN*/ SQLSTMT_ID * statement_id,
/*IN OPTIONAL*/ SQLDESC_ID * output_descriptor,
/*IN*/ Int32 rowset_size,
/*IN*/ Int32 * rowset_status_ptr,
/*OUT*/ Int32 * rowset_nfetched,
/*IN*/ Int32 num_quadruple_fields,
/*IN*/ struct SQLCLI_QUAD_FIELDS quad_fields[]);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_Cancel (
+Int32 SQL_EXEC_Cancel (
/*IN OPTIONAL*/ SQLSTMT_ID * statement_id);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_CANCEL (
+Int32 SQL_EXEC_CANCEL (
/*IN OPTIONAL*/ SQLSTMT_ID * statement_id);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetDescEntryCount(
+Int32 SQL_EXEC_GetDescEntryCount(
/*IN*/ SQLDESC_ID * sql_descriptor,
/*IN*/ SQLDESC_ID * output_descriptor);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GETDESCENTRYCOUNT(
+Int32 SQL_EXEC_GETDESCENTRYCOUNT(
/*IN*/ SQLDESC_ID * sql_descriptor,
/*IN*/ SQLDESC_ID * output_descriptor);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetDescEntryCountBasic(
+Int32 SQL_EXEC_GetDescEntryCountBasic(
/*IN*/ SQLDESC_ID * sql_descriptor,
/*OUT*/ Int32 * num_entries);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetDescItem(
+Int32 SQL_EXEC_GetDescItem(
/*IN*/ SQLDESC_ID * sql_descriptor,
/*IN*/ Int32 entry,
/*IN* (SQLDESC_ITEM_ID) */ Int32 what_to_get,
@@ -1499,7 +1469,7 @@ SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetDescItem(
/*OUT OPTIONAL*/ Int32 * len_of_item,
/*IN OPTIONAL*/ Int32 start_from_offset);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GETDESCITEM(
+Int32 SQL_EXEC_GETDESCITEM(
/*IN*/ SQLDESC_ID * sql_descriptor,
/*IN*/ Int32 entry,
/*IN* (SQLDESC_ITEM_ID) */ Int32 what_to_get,
@@ -1509,37 +1479,37 @@ SQLCLI_LIB_FUNC Int32 SQL_EXEC_GETDESCITEM(
/*OUT OPTIONAL*/ Int32 * len_of_item,
/*IN OPTIONAL*/ Int32 start_from_offset);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetDescItems(
+Int32 SQL_EXEC_GetDescItems(
/*IN*/ SQLDESC_ID * sql_descriptor,
/*IN*/ SQLDESC_ITEM desc_items[],
/*IN*/ SQLDESC_ID * value_num_descriptor,
/*IN*/ SQLDESC_ID * output_descriptor);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GETDESCITEMS(
+Int32 SQL_EXEC_GETDESCITEMS(
/*IN*/ SQLDESC_ID * sql_descriptor,
/*IN*/ SQLDESC_ITEM desc_items[],
/*IN*/ SQLDESC_ID * value_num_descriptor,
/*IN*/ SQLDESC_ID * output_descriptor);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetDescItems2(
+Int32 SQL_EXEC_GetDescItems2(
/*IN*/ SQLDESC_ID * sql_descriptor,
/*IN*/ Int32 no_of_desc_items,
/*IN*/ SQLDESC_ITEM desc_items[]);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GETDESCITEMS2(
+Int32 SQL_EXEC_GETDESCITEMS2(
/*IN*/ SQLDESC_ID * sql_descriptor,
/*IN*/ Int32 no_of_desc_items,
/*IN*/ SQLDESC_ITEM desc_items[]);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetDiagnosticsStmtInfo(
+Int32 SQL_EXEC_GetDiagnosticsStmtInfo(
/*IN*/ Int32 *stmt_info_items,
/*IN*/ SQLDESC_ID * output_descriptor);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GETDIAGNOSTICSSTMTINFO(
+Int32 SQL_EXEC_GETDIAGNOSTICSSTMTINFO(
/*IN*/ Int32 *stmt_info_items,
/*IN*/ SQLDESC_ID * output_descriptor);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetDiagnosticsStmtInfo2(
+Int32 SQL_EXEC_GetDiagnosticsStmtInfo2(
/*IN OPTIONAL*/ SQLSTMT_ID * statement_id,
/*IN* (SQLDIAG_STMT_INFO_ITEM_ID) */ Int32 what_to_get,
/*OUT OPTIONAL*/ void * numeric_value,
@@ -1547,7 +1517,7 @@ SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetDiagnosticsStmtInfo2(
/*IN OPTIONAL*/ Int32 max_string_len,
/*OUT OPTIONAL*/ Int32 * len_of_item);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GETDIAGNOSTICSSTMTINFO2(
+Int32 SQL_EXEC_GETDIAGNOSTICSSTMTINFO2(
/*IN OPTIONAL*/ SQLSTMT_ID * statement_id,
/*IN* (SQLDIAG_STMT_INFO_ITEM_ID) */ Int32 what_to_get,
/*OUT OPTIONAL*/ void * numeric_value,
@@ -1555,17 +1525,17 @@ SQLCLI_LIB_FUNC Int32 SQL_EXEC_GETDIAGNOSTICSSTMTINFO2(
/*IN OPTIONAL*/ Int32 max_string_len,
/*OUT OPTIONAL*/ Int32 * len_of_item);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetDiagnosticsCondInfo(
+Int32 SQL_EXEC_GetDiagnosticsCondInfo(
/*IN*/ SQLDIAG_COND_INFO_ITEM *cond_info_items,
/*IN*/ SQLDESC_ID * cond_num_descriptor,
/*IN*/ SQLDESC_ID * output_descriptor);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GETDIAGNOSTICSCONDINFO(
+Int32 SQL_EXEC_GETDIAGNOSTICSCONDINFO(
/*IN*/ SQLDIAG_COND_INFO_ITEM *cond_info_items,
/*IN*/ SQLDESC_ID * cond_num_descriptor,
/*IN*/ SQLDESC_ID * output_descriptor);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetDiagnosticsCondInfo2(
+Int32 SQL_EXEC_GetDiagnosticsCondInfo2(
/*IN* (SQLDIAG_COND_INFO_ITEM_ID) */ Int32 what_to_get,
/*IN*/ Int32 conditionNum,
/*OUT OPTIONAL*/ Int32 * numeric_value,
@@ -1573,7 +1543,7 @@ SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetDiagnosticsCondInfo2(
/*IN OPTIONAL */ Int32 max_string_len,
/*OUT OPTIONAL*/ Int32 * len_of_item);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GETDIAGNOSTICSCONDINFO2(
+Int32 SQL_EXEC_GETDIAGNOSTICSCONDINFO2(
/*IN* (SQLDIAG_COND_INFO_ITEM_ID) */ Int32 what_to_get,
/*IN*/ Int32 conditionNum,
/*OUT OPTIONAL*/ Int32 * numeric_value,
@@ -1581,64 +1551,64 @@ SQLCLI_LIB_FUNC Int32 SQL_EXEC_GETDIAGNOSTICSCONDINFO2(
/*IN OPTIONAL */ Int32 max_string_len,
/*OUT OPTIONAL*/ Int32 * len_of_item);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetDiagnosticsCondInfo3 (
+Int32 SQL_EXEC_GetDiagnosticsCondInfo3 (
/*IN*/ Int32 no_of_condition_items,
/*IN*/ SQLDIAG_COND_INFO_ITEM_VALUE
diag_cond_info_item_values[]);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GETDIAGNOSTICSCONDINFO3 (
+Int32 SQL_EXEC_GETDIAGNOSTICSCONDINFO3 (
/*IN*/ Int32 no_of_condition_items,
/*IN*/ SQLDIAG_COND_INFO_ITEM_VALUE
diag_cond_info_item_values[]);
/* This function retrieves the SQLSTATE from the statement diagnostics area
if possible */
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetMainSQLSTATE(
+Int32 SQL_EXEC_GetMainSQLSTATE(
/*IN*/ SQLSTMT_ID * statement_id,
/*IN*/ Int32 sqlcode,
/*OUT*/ char * sqlstate /* assumed to be char[6] */);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GETMAINSQLSTATE(
+Int32 SQL_EXEC_GETMAINSQLSTATE(
/*IN*/ SQLSTMT_ID * statement_id,
/*IN*/ Int32 sqlcode,
/*OUT*/ char * sqlstate /* assumed to be char[6] */);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetCSQLSTATE(
+Int32 SQL_EXEC_GetCSQLSTATE(
/*OUT*/ char * sqlstate /* assumed to be char[6] */,
/*IN*/ Int32 sqlcode);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GETCSQLSTATE(
+Int32 SQL_EXEC_GETCSQLSTATE(
/*OUT*/ char * sqlstate /* assumed to be char[6] */,
/*IN*/ Int32 sqlcode);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetCobolSQLSTATE(
+Int32 SQL_EXEC_GetCobolSQLSTATE(
/*OUT*/ char * sqlstate /* assumed to be char[5] */,
/*IN*/ Int32 sqlcode);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GETCOBOLSQLSTATE(
+Int32 SQL_EXEC_GETCOBOLSQLSTATE(
/*OUT*/ char * sqlstate /* assumed to be char[5] */,
/*IN*/ Int32 sqlcode);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetSQLSTATE(
+Int32 SQL_EXEC_GetSQLSTATE(
/*OUT*/ char * sqlstate /* assumed to be char[6] */);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GETSQLSTATE(
+Int32 SQL_EXEC_GETSQLSTATE(
/*OUT*/ char * sqlstate /* assumed to be char[6] */);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetSessionAttr(
+Int32 SQL_EXEC_GetSessionAttr(
/*IN* (SESSIONATTR_TYPE) */ Int32 attrName,
/*OUT OPTIONAL*/ Int32 * numeric_value,
/*OUT OPTIONAL*/ char * string_value,
/*IN OPTIONAL*/ Int32 max_string_len,
/*OUT OPTIONAL*/ Int32 * len_of_item);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetUniqueQueryIdAttrs (
+Int32 SQL_EXEC_GetUniqueQueryIdAttrs (
/*IN*/ char * uniqueQueryId,
/*IN*/ Int32 uniqueQueryIdLen,
/*IN*/ Int32 no_of_attrs,
/*INOUT*/ UNIQUEQUERYID_ATTR unique_queryid_attrs[]);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetStmtAttr(
+Int32 SQL_EXEC_GetStmtAttr(
/*IN*/ SQLSTMT_ID * statement_id,
/*IN* (SQLATTR_TYPE) */ Int32 attrName,
/*OUT OPTIONAL*/ Int32 * numeric_value,
@@ -1646,7 +1616,7 @@ SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetStmtAttr(
/*IN OPTIONAL*/ Int32 max_string_len,
/*OUT OPTIONAL*/ Int32 * len_of_item);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GETSTMTATTR(
+Int32 SQL_EXEC_GETSTMTATTR(
/*IN*/ SQLSTMT_ID * statement_id,
/*IN* (SQLATTR_TYPE) */ Int32 attrName,
/*OUT OPTIONAL*/ Int32 * numeric_value,
@@ -1654,19 +1624,19 @@ SQLCLI_LIB_FUNC Int32 SQL_EXEC_GETSTMTATTR(
/*IN OPTIONAL*/ Int32 max_string_len,
/*OUT OPTIONAL*/ Int32 * len_of_item);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetStmtAttrs(
+Int32 SQL_EXEC_GetStmtAttrs(
/*IN*/ SQLSTMT_ID * statement_id,
/*IN*/ Int32 number_of_attrs,
/*INOUT*/ SQLSTMT_ATTR attrs[],
/*OUT OPTIONAL*/ Int32 * num_returned);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GETSTMTATTRS(
+Int32 SQL_EXEC_GETSTMTATTRS(
/*IN*/ SQLSTMT_ID * statement_id,
/*IN*/ Int32 number_of_attrs,
/*INOUT*/ SQLSTMT_ATTR attrs[],
/*OUT OPTIONAL*/ Int32 * num_returned);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GETMPCATALOG(
+Int32 SQL_EXEC_GETMPCATALOG(
/*IN*/ char * AnsiObjName,
/*INOUT*/ char * MPObjName,
/*IN*/ Int32 MPObjNameMaxLen,
@@ -1675,28 +1645,28 @@ SQLCLI_LIB_FUNC Int32 SQL_EXEC_GETMPCATALOG(
/*IN*/ Int32 MPCatalogNameMaxLen,
/*OUT*/ Int32 * MPCatalogNameLen);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetPfsSize(
+Int32 SQL_EXEC_GetPfsSize(
/*OUT*/ Int32 *pfsSize,
/*OUT*/ Int32 *pfsCurUse,
/*OUT*/ Int32 *pfsMaxUse);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_CleanUpPfsResources();
+Int32 SQL_EXEC_CleanUpPfsResources();
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GoAway(
+Int32 SQL_EXEC_GoAway(
/*IN*/ SQLDESC_ID * tableNameDesc);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GOAWAY(
+Int32 SQL_EXEC_GOAWAY(
/*IN*/ SQLDESC_ID * tableNameDesc);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_Prepare(
+Int32 SQL_EXEC_Prepare(
/*IN*/ SQLSTMT_ID * statement_id,
/*IN*/ SQLDESC_ID * sql_source);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_PREPARE(
+Int32 SQL_EXEC_PREPARE(
/*IN*/ SQLSTMT_ID * statement_id,
/*IN*/ SQLDESC_ID * sql_source);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_Prepare2(
+Int32 SQL_EXEC_Prepare2(
/*IN*/ SQLSTMT_ID * statement_id,
/*IN*/ SQLDESC_ID * sql_source,
/*INOUT*/ char * gencode_ptr,
@@ -1708,157 +1678,157 @@ SQLCLI_LIB_FUNC Int32 SQL_EXEC_Prepare2(
/*INOUT*/ Int32 * uniqueQueryIdLen,
/*IN*/ UInt32 flags);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_ResDescName(
+Int32 SQL_EXEC_ResDescName(
/*INOUT*/ SQLDESC_ID * statement_id,
/*IN OPTIONAL*/ SQLSTMT_ID * from_statement,
/*IN OPTIONAL (SQLWHAT_DESC) */ Int32 what_desc);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_RESDESCNAME(
+Int32 SQL_EXEC_RESDESCNAME(
/*INOUT*/ SQLDESC_ID * statement_id,
/*IN OPTIONAL*/ SQLSTMT_ID * from_statement,
/*IN OPTIONAL (SQLWHAT_DESC) */ Int32 what_desc);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_ResStmtName(
+Int32 SQL_EXEC_ResStmtName(
/*INOUT*/ SQLSTMT_ID * statement_id);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_RESSTMTNAME(
+Int32 SQL_EXEC_RESSTMTNAME(
/*INOUT*/ SQLSTMT_ID * statement_id);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_SetCursorName(
+Int32 SQL_EXEC_SetCursorName(
/*IN*/ SQLSTMT_ID * statement_id,
/*IN*/ SQLSTMT_ID * cursor_name);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_SETCURSORNAME(
+Int32 SQL_EXEC_SETCURSORNAME(
/*IN*/ SQLSTMT_ID * statement_id,
/*IN*/ SQLSTMT_ID * cursor_name);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_SetDescEntryCount(
+Int32 SQL_EXEC_SetDescEntryCount(
/*IN*/ SQLDESC_ID * sql_descriptor,
/*IN*/ SQLDESC_ID * input_descriptor);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_SETDESCENTRYCOUNT(
+Int32 SQL_EXEC_SETDESCENTRYCOUNT(
/*IN*/ SQLDESC_ID * sql_descriptor,
/*IN*/ SQLDESC_ID * input_descriptor);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_SetDescEntryCountBasic(
+Int32 SQL_EXEC_SetDescEntryCountBasic(
/*IN*/ SQLDESC_ID * sql_descriptor,
/*IN*/ Int32 num_entries);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_SetDescItem(
+Int32 SQL_EXEC_SetDescItem(
/*IN*/ SQLDESC_ID * sql_descriptor,
/*IN*/ Int32 entry,
/*IN* (SQLDESC_ITEM_ID) */ Int32 what_to_set,
/*IN OPTIONAL*/ long numeric_value,
/*IN OPTIONAL*/ char * string_value);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_SETDESCITEM(
+Int32 SQL_EXEC_SETDESCITEM(
/*IN*/ SQLDESC_ID * sql_descriptor,
/*IN*/ Int32 entry,
/*IN* (SQLDESC_ITEM_ID) */ Int32 what_to_set,
/*IN OPTIONAL*/ long numeric_value,
/*IN OPTIONAL*/ char * string_value);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_SetDescItems(
+Int32 SQL_EXEC_SetDescItems(
/*IN*/ SQLDESC_ID * sql_descriptor,
/*IN*/ SQLDESC_ITEM desc_items[],
/*IN*/ SQLDESC_ID * value_num_descriptor,
/*IN*/ SQLDESC_ID * input_descriptor);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_SETDESCITEMS(
+Int32 SQL_EXEC_SETDESCITEMS(
/*IN*/ SQLDESC_ID * sql_descriptor,
/*IN*/ SQLDESC_ITEM desc_items[],
/*IN*/ SQLDESC_ID * value_num_descriptor,
/*IN*/ SQLDESC_ID * input_descriptor);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_SetDescItems2(
+Int32 SQL_EXEC_SetDescItems2(
/*IN*/ SQLDESC_ID * sql_descriptor,
/*IN*/ Int32 no_of_desc_items,
/*IN*/ SQLDESC_ITEM desc_items[]);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_SETDESCITEMS2(
+Int32 SQL_EXEC_SETDESCITEMS2(
/*IN*/ SQLDESC_ID * sql_descriptor,
/*IN*/ Int32 no_of_desc_items,
/*IN*/ SQLDESC_ITEM desc_items[]);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_SetDescPointers(
+Int32 SQL_EXEC_SetDescPointers(
/*IN*/ SQLDESC_ID * sql_descriptor,
/*IN*/ Int32 starting_entry,
/*IN*/ Int32 num_ptr_pairs,
...);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_SETDESCPOINTERS(
+Int32 SQL_EXEC_SETDESCPOINTERS(
/*IN*/ SQLDESC_ID * sql_descriptor,
/*IN*/ Int32 starting_entry,
/*IN*/ Int32 num_ptr_pairs,
/*IN*/ struct SQLCLI_PTR_PAIRS ptr_pairs[]);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_SetRowsetDescPointers(SQLDESC_ID * desc_id,
+Int32 SQL_EXEC_SetRowsetDescPointers(SQLDESC_ID * desc_id,
Int32 rowset_size,
Int32 *rowset_status_ptr,
Int32 starting_entry,
Int32 num_quadruple_fields,
...);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_SETROWSETDESCPOINTERS(SQLDESC_ID * desc_id,
+Int32 SQL_EXEC_SETROWSETDESCPOINTERS(SQLDESC_ID * desc_id,
Int32 rowset_size,
Int32 *rowset_status_ptr,
Int32 starting_entry,
Int32 num_quadruple_fields,
struct SQLCLI_QUAD_FIELDS quad_fields[]);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_SetStmtAttr(
+Int32 SQL_EXEC_SetStmtAttr(
/*IN*/ SQLSTMT_ID * statement_id,
/*IN* (SQLATTR_TYPE) */ Int32 attrName,
/*IN OPTIONAL*/ Int32 numeric_value,
/*IN OPTIONAL*/ char * string_value);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_SETSTMTATTR(
+Int32 SQL_EXEC_SETSTMTATTR(
/*IN*/ SQLSTMT_ID * statement_id,
/*IN* (SQLATTR_TYPE) */ Int32 attrName,
/*IN OPTIONAL*/ Int32 numeric_value,
/*IN OPTIONAL*/ char * string_value);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_SwitchContext(
+Int32 SQL_EXEC_SwitchContext(
/*IN*/ SQLCTX_HANDLE context_handle,
/*OUT OPTIONAL*/ SQLCTX_HANDLE * prev_context_handle);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_SWITCHCONTEXT(
+Int32 SQL_EXEC_SWITCHCONTEXT(
/*IN*/ SQLCTX_HANDLE context_handle,
/*OUT OPTIONAL*/ SQLCTX_HANDLE * prev_context_handle);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_Xact(
+Int32 SQL_EXEC_Xact(
/*IN* (SQLTRANS_COMMAND) */ Int32 command,
/*OUT OPTIONAL*/ SQLDESC_ID * transid_descriptor);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_XACT(
+Int32 SQL_EXEC_XACT(
/*IN* (SQLTRANS_COMMAND) */ Int32 command,
/*OUT OPTIONAL*/ SQLDESC_ID * transid_descriptor);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_SetAuthIDNew(
+Int32 SQL_EXEC_SetAuthIDNew(
/*IN*/ char * authID,
/*IN*/ char * credentials,
/* OUT Logon role name */ char * logonRoleName,
/* OUT Logon role name len */ short * logonRoleNameLen,
- /* OUT User redef time */ Int64 * redefTime); // NA_64BIT
+ /* OUT User redef time */ Int64 * redefTime);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_SetAuthID(
+Int32 SQL_EXEC_SetAuthID(
/*IN*/ char * authID,
/*IN SQLAUTHID_TYPE */ Int32 authIDType,
/* OUT Primary role name */ char * primaryRoleName,
/* OUT Primary role name len */ short * primaryRoleNameLen,
- /* OUT User redef time */ Int64 * redefTime); // NA_64BIT
+ /* OUT User redef time */ Int64 * redefTime);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_SETAUTHID(
+Int32 SQL_EXEC_SETAUTHID(
/*IN*/ char * authID,
/*IN SQLAUTHID_TYPE */ Int32 authIDType,
/* OUT OPTIONAL primaryRole*/ char *primaryRole,
/* OUT OPTIONAL role len*/ short *primaryRoleLen,
- /* OUT OPTIONAL userRedefTime*/ Int64 *redefTime); // NA_64BIT
+ /* OUT OPTIONAL userRedefTime*/ Int64 *redefTime);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_DecodeAndFormatKey(
+Int32 SQL_EXEC_DecodeAndFormatKey(
/*IN*/void * RCB_Pointer_Addr,
/*IN*/void * KeyAddr,
/*IN*/Int32 KeyLength,
@@ -1867,14 +1837,14 @@ SQLCLI_LIB_FUNC Int32 SQL_EXEC_DecodeAndFormatKey(
/*IN*/Int32 FormattedKeyBufLen,
/*OUT*/Int32 * NeededKeyBufLen );
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetPartitionKeyFromRow(
+Int32 SQL_EXEC_GetPartitionKeyFromRow(
/*IN*/void * RCB_Pointer_Addr,
/*IN*/void * Row_Addr,
/*IN*/Int32 Row_Length,
/*INOUT*/void * KeyAddr,
/*IN*/Int32 KeyLength);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_LocaleToUTF8 (
+Int32 SQL_EXEC_LocaleToUTF8 (
/*IN*/Int32 conv_charset,
/*IN*/void * Input_Buffer_Addr,
/*IN*/Int32 Input_Buffer_Length,
@@ -1886,7 +1856,7 @@ SQLCLI_LIB_FUNC Int32 SQL_EXEC_LocaleToUTF8 (
/*OUT*/Int32 * num_translated_char
);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_UTF8ToLocale(
+Int32 SQL_EXEC_UTF8ToLocale(
/*IN*/Int32 conv_charset,
/*IN*/void * Input_Buffer_Addr,
/*IN*/Int32 Input_Buffer_Length,
@@ -1900,7 +1870,7 @@ SQLCLI_LIB_FUNC Int32 SQL_EXEC_UTF8ToLocale(
/*IN*/void * substitution_char_addr
);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_LocaleToUTF16 (
+Int32 SQL_EXEC_LocaleToUTF16 (
/*IN*/Int32 conv_charset,
/*IN*/void * Input_Buffer_Addr,
/*IN*/Int32 Input_Buffer_Length,
@@ -1913,7 +1883,7 @@ SQLCLI_LIB_FUNC Int32 SQL_EXEC_LocaleToUTF16 (
/*OUT*/Int32 * num_translated_char
);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_UTF16ToLocale(
+Int32 SQL_EXEC_UTF16ToLocale(
/*IN*/Int32 conv_charset,
/*IN*/void * Input_Buffer_Addr,
/*IN*/Int32 Input_Buffer_Length,
@@ -1927,7 +1897,7 @@ SQLCLI_LIB_FUNC Int32 SQL_EXEC_UTF16ToLocale(
/*OUT*/Int32 * num_translated_char,
/*IN*/void * substitution_char_addr
);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetStatistics2(
+Int32 SQL_EXEC_GetStatistics2(
/* IN */ short statsReqType,
/* IN */ char *statsReqStr,
/* IN */ Int32 statsReqStrLen,
@@ -1938,14 +1908,14 @@ SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetStatistics2(
/* IN */ Int32 max_stats_desc,
/* OUT */ Int32 *no_returned_stats_desc);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetStatisticsItems(
+Int32 SQL_EXEC_GetStatisticsItems(
/* IN */ short statsReqType,
/* IN */ char *queryId,
/* IN */ Int32 queryIdLen,
/* IN */ Int32 no_of_stats_items,
/* IN/OUT */ SQLSTATS_ITEM sqlstats_items[]);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetChildQueryInfo(
+Int32 SQL_EXEC_GetChildQueryInfo(
/*IN*/ SQLSTMT_ID * statement_id,
/*INOUT*/ char * uniqueQueryId,
/*IN */ Int32 uniqueQueryIdMaxLen,
@@ -1959,15 +1929,15 @@ SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetChildQueryInfo(
/* temporary functions -- for use by sqlcat simulator only */
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_AllocDesc (
+Int32 SQL_EXEC_AllocDesc (
/*INOUT*/ SQLDESC_ID * desc_id,
/*IN OPTIONAL*/ Int32 max_entries);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetDescEntryCount(
+Int32 SQL_EXEC_GetDescEntryCount(
/*IN*/ SQLDESC_ID * sql_descriptor,
/*OUT*/ Int32 * num_entries);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_SetDescEntryCount(
+Int32 SQL_EXEC_SetDescEntryCount(
/*IN*/ SQLDESC_ID * sql_descriptor,
/*IN*/ Int32 num_entries);
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/regress/compGeneral/EXPECTED006.SB
----------------------------------------------------------------------
diff --git a/core/sql/regress/compGeneral/EXPECTED006.SB b/core/sql/regress/compGeneral/EXPECTED006.SB
index aeed2f1..0caed73 100644
--- a/core/sql/regress/compGeneral/EXPECTED006.SB
+++ b/core/sql/regress/compGeneral/EXPECTED006.SB
@@ -940,16 +940,6 @@
--- SQL operation complete.
>>
->>control query default VALIDATE_RFORK_REDEF_TS 'ON';
-
---- SQL operation complete.
->>prepare xx from select * from t006t7;
-
---- SQL command prepared.
->>control query default VALIDATE_RFORK_REDEF_TS reset;
-
---- SQL operation complete.
->>
>>control query default COMP_BOOL_108 'OFF';
--- SQL operation complete.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/regress/compGeneral/TEST006
----------------------------------------------------------------------
diff --git a/core/sql/regress/compGeneral/TEST006 b/core/sql/regress/compGeneral/TEST006
index 153e310..e31054f 100644
--- a/core/sql/regress/compGeneral/TEST006
+++ b/core/sql/regress/compGeneral/TEST006
@@ -440,10 +440,6 @@ control query default OVERRIDE_SYSKEY 'ON';
prepare xx from select * from t006t7;
control query default OVERRIDE_SYSKEY reset;
-control query default VALIDATE_RFORK_REDEF_TS 'ON';
-prepare xx from select * from t006t7;
-control query default VALIDATE_RFORK_REDEF_TS reset;
-
control query default COMP_BOOL_108 'OFF';
prepare xx from select * from t006t2, t006t3 where log(t006t2.a) = log(t006t3.a);
control query default COMP_BOOL_108 reset;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/regress/executor/EXPECTED020
----------------------------------------------------------------------
diff --git a/core/sql/regress/executor/EXPECTED020 b/core/sql/regress/executor/EXPECTED020
index a41f8e8..a8bdc64 100644
--- a/core/sql/regress/executor/EXPECTED020
+++ b/core/sql/regress/executor/EXPECTED020
@@ -107,7 +107,6 @@ A B
4001 0 1 0 1
4023 0 1 0 1
4039 0 1 0 1
- 4419 0 1 0 4
8436 0 1 0 0
8550 30 1 60 0
8550 31 1 60 0
@@ -175,7 +174,6 @@ A B
4001 0 1 0 1
4023 0 1 0 1
4039 0 1 0 1
- 4419 0 1 0 4
8436 0 1 0 0
8550 30 1 60 0
8550 31 1 60 0
@@ -242,7 +240,6 @@ A B
4001 0 1 0 1
4023 0 1 0 1
4039 0 1 0 1
- 4419 0 1 0 4
8436 0 1 0 0
8550 30 1 60 0
8550 31 1 60 0
@@ -310,7 +307,6 @@ A B
4001 0 1 0 1
4023 0 1 0 1
4039 0 1 0 1
- 4419 0 1 0 4
8436 0 1 0 0
8550 30 1 60 0
8550 31 1 60 0
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/regress/hive/EXPECTED009
----------------------------------------------------------------------
diff --git a/core/sql/regress/hive/EXPECTED009 b/core/sql/regress/hive/EXPECTED009
index e318532..90250a7 100644
--- a/core/sql/regress/hive/EXPECTED009
+++ b/core/sql/regress/hive/EXPECTED009
@@ -214,7 +214,7 @@ A B C
>>invoke t009hivecust1;
-- Definition of Trafodion table TRAFODION.HIVE_T009.T009HIVECUST1
--- Definition current Wed Jul 12 21:37:45 2017
+-- Definition current Tue Sep 5 08:23:44 2017
(
SYSKEY LARGEINT NO DEFAULT NOT NULL NOT DROPPABLE
@@ -263,7 +263,7 @@ A B C
>>invoke t009hivecust2;
-- Definition of Trafodion table TRAFODION.HIVE_T009.T009HIVECUST2
--- Definition current Wed Jul 12 21:37:55 2017
+-- Definition current Tue Sep 5 08:23:55 2017
(
SYSKEY LARGEINT NO DEFAULT NOT NULL NOT DROPPABLE
@@ -434,7 +434,7 @@ T009T2
>>invoke hive.sch_t009.t009t1;
-- Definition of hive table T009T1
--- Definition current Wed Jul 12 21:39:07 2017
+-- Definition current Tue Sep 5 08:25:19 2017
(
A INT
@@ -516,7 +516,7 @@ ROW_ID COLS
>>invoke bblike1;
-- Definition of Trafodion table TRAFODION.HIVE_T009.BBLIKE1
--- Definition current Wed Jul 12 21:39:20 2017
+-- Definition current Tue Sep 5 08:25:34 2017
(
ROW_ID VARCHAR(100) CHARACTER SET ISO88591
@@ -533,7 +533,7 @@ ROW_ID COLS
>>invoke bblike2;
-- Definition of Trafodion table TRAFODION.HIVE_T009.BBLIKE2
--- Definition current Wed Jul 12 21:39:25 2017
+-- Definition current Tue Sep 5 08:25:40 2017
(
ROW_ID VARCHAR(100) CHARACTER SET ISO88591
@@ -572,7 +572,7 @@ ROW_ID COLS
>>invoke hive.hive.store_sales;
-- Definition of hive table STORE_SALES
--- Definition current Wed Jul 12 21:39:32 2017
+-- Definition current Tue Sep 5 08:25:49 2017
(
SS_SOLD_DATE_SK INT
@@ -633,7 +633,6 @@ DESCRIPTION
fragment_id ............ 0
parent_frag ............ (none)
fragment_type .......... master
- statement_index ...... ###
affinity_value ....... ###
max_max_cardinality ###
total_overflow_size ###
@@ -917,7 +916,7 @@ DESCRIPTION
>>invoke hive.hive.date_dim;
-- Definition of hive table DATE_DIM
--- Definition current Wed Jul 12 21:39:40 2017
+-- Definition current Tue Sep 5 08:25:55 2017
(
D_DATE_SK INT
@@ -1001,7 +1000,7 @@ CREATE TABLE DATE_DIM
;
REGISTER /*INTERNAL*/ HIVE TABLE HIVE.HIVE.DATE_DIM;
-/* ObjectUID = 5537310018384739180 */
+/* ObjectUID = 1585406280815125826 */
/* Trafodion DDL */
@@ -1080,7 +1079,6 @@ DESCRIPTION
fragment_id ............ 0
parent_frag ............ (none)
fragment_type .......... master
- statement_index ...... ###
affinity_value ....... ###
max_max_cardinality ###
total_overflow_size ###
@@ -1152,7 +1150,7 @@ DESCRIPTION
>>invoke hive.hive.date_dim;
-- Definition of hive table DATE_DIM
--- Definition current Wed Jul 12 21:39:56 2017
+-- Definition current Tue Sep 5 08:26:10 2017
(
D_DATE_SK INT
@@ -1236,7 +1234,7 @@ CREATE TABLE DATE_DIM
;
REGISTER /*INTERNAL*/ HIVE TABLE HIVE.HIVE.DATE_DIM;
-/* ObjectUID = 5537310018384739180 */
+/* ObjectUID = 1585406280815125826 */
/* Trafodion DDL */
@@ -1288,8 +1286,6 @@ CREATE EXTERNAL TABLE DATE_DIM
--- SQL operation complete.
>>prepare s from select * from hive.hive.date_dim where d_date = date '2016-01-27';
-*** WARNING[6008] Statistics for column (D_DATE) from table HIVE.HIVE.DATE_DIM were not available. As a result, the access path chosen might not be the best possible.
-
--- SQL command prepared.
>>explain options 'p' s;
[09/30] incubator-trafodion git commit: TRAFODION-2731 CodeCleanup:
Remove obsolete, legacy and unused code
Posted by an...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/exp/exp_clause_derived.h
----------------------------------------------------------------------
diff --git a/core/sql/exp/exp_clause_derived.h b/core/sql/exp/exp_clause_derived.h
index b45fd8b..adfa2c6 100644
--- a/core/sql/exp/exp_clause_derived.h
+++ b/core/sql/exp/exp_clause_derived.h
@@ -53,12 +53,12 @@
/////////////////////////////////////////
// Class ex_aggregate_clause //
/////////////////////////////////////////
-class SQLEXP_LIB_FUNC ex_aggregate_clause : public ex_clause {
+class ex_aggregate_clause : public ex_clause {
public:
// Construction
//
- NA_EIDPROC ex_aggregate_clause(){};
- NA_EIDPROC ex_aggregate_clause(OperatorTypeEnum oper_type,
+ ex_aggregate_clause(){};
+ ex_aggregate_clause(OperatorTypeEnum oper_type,
short num_operands,
Attributes ** attr,
Space * space);
@@ -66,48 +66,48 @@ public:
// Null Semantics
//
- NA_EIDPROC Int32 isNullInNullOut() const { return 0; };
- NA_EIDPROC Int32 isNullRelevant() const { return 0; };
+ Int32 isNullInNullOut() const { return 0; };
+ Int32 isNullRelevant() const { return 0; };
// Execution
//
- NA_EIDPROC Int32 isEvalRelevant() const { return 1; };
- NA_EIDPROC virtual ex_expr::exp_return_type init();
- NA_EIDPROC virtual ex_expr::exp_return_type eval(char *op_data[],
+ Int32 isEvalRelevant() const { return 1; };
+ virtual ex_expr::exp_return_type init();
+ virtual ex_expr::exp_return_type eval(char *op_data[],
CollHeap * = 0,
ComDiagsArea** = 0);
// Fixup
//
- NA_EIDPROC Long pack(void *);
- NA_EIDPROC virtual ex_expr::exp_return_type
+ Long pack(void *);
+ virtual ex_expr::exp_return_type
pCodeGenerate(Space *space, UInt32 flags);
// ---------------------------------------------------------------------
// 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(1,getClassVersionID());
ex_clause::populateImageVersionIDArray();
}
- NA_EIDPROC virtual short getClassSize() { return (short)sizeof(*this); }
+ virtual short getClassSize() { return (short)sizeof(*this); }
// ---------------------------------------------------------------------
};
-class SQLEXP_LIB_FUNC ex_aggr_one_row_clause : public ex_aggregate_clause {
+class ex_aggr_one_row_clause : public ex_aggregate_clause {
public:
// Construction
//
- NA_EIDPROC ex_aggr_one_row_clause(){};
- NA_EIDPROC ex_aggr_one_row_clause(OperatorTypeEnum oper_type,
+ ex_aggr_one_row_clause(){};
+ ex_aggr_one_row_clause(OperatorTypeEnum oper_type,
short num_operands,
Attributes ** attr,
Space * space)
@@ -116,36 +116,36 @@ public:
// Execution
//
- NA_EIDPROC ex_expr::exp_return_type init();
- NA_EIDPROC ex_expr::exp_return_type eval(char *op_data[],
+ ex_expr::exp_return_type init();
+ ex_expr::exp_return_type eval(char *op_data[],
CollHeap * = 0,
ComDiagsArea ** = 0);
// Fixup
//
- NA_EIDPROC ex_expr::exp_return_type
+ ex_expr::exp_return_type
pCodeGenerate(Space *space, UInt32 flags);
// Display
//
- NA_EIDPROC void displayContents(Space * space, const char * displayStr,
+ void displayContents(Space * space, const char * displayStr,
Int32 clauseNum, char * constsArea);
// ---------------------------------------------------------------------
// 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_aggregate_clause::populateImageVersionIDArray();
}
- NA_EIDPROC virtual short getClassSize() { return (short)sizeof(*this); }
+ virtual short getClassSize() { return (short)sizeof(*this); }
// ---------------------------------------------------------------------
private:
@@ -160,12 +160,12 @@ private:
};
-class SQLEXP_LIB_FUNC ex_aggr_any_true_max_clause : public ex_aggregate_clause {
+class ex_aggr_any_true_max_clause : public ex_aggregate_clause {
public:
// Construction
//
- NA_EIDPROC ex_aggr_any_true_max_clause(){};
- NA_EIDPROC ex_aggr_any_true_max_clause(OperatorTypeEnum oper_type,
+ ex_aggr_any_true_max_clause(){};
+ ex_aggr_any_true_max_clause(OperatorTypeEnum oper_type,
short num_operands,
Attributes ** attr,
Space * space)
@@ -174,36 +174,36 @@ public:
// Execution
//
- NA_EIDPROC ex_expr::exp_return_type init();
- NA_EIDPROC ex_expr::exp_return_type eval(char *op_data[],
+ ex_expr::exp_return_type init();
+ ex_expr::exp_return_type eval(char *op_data[],
CollHeap * = 0,
ComDiagsArea ** = 0);
// Fixup
//
- NA_EIDPROC ex_expr::exp_return_type
+ ex_expr::exp_return_type
pCodeGenerate(Space *space, UInt32 flags);
// Display
//
- NA_EIDPROC void displayContents(Space * space, const char * displayStr,
+ void displayContents(Space * space, const char * displayStr,
Int32 clauseNum, char * constsArea);
// ---------------------------------------------------------------------
// 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_aggregate_clause::populateImageVersionIDArray();
}
- NA_EIDPROC virtual short getClassSize() { return (short)sizeof(*this); }
+ virtual short getClassSize() { return (short)sizeof(*this); }
// ---------------------------------------------------------------------
private:
@@ -219,12 +219,12 @@ private:
};
-class SQLEXP_LIB_FUNC ex_aggr_min_max_clause : public ex_aggregate_clause {
+class ex_aggr_min_max_clause : public ex_aggregate_clause {
public:
// Construction
//
- NA_EIDPROC ex_aggr_min_max_clause(){};
- NA_EIDPROC ex_aggr_min_max_clause(OperatorTypeEnum oper_type,
+ ex_aggr_min_max_clause(){};
+ ex_aggr_min_max_clause(OperatorTypeEnum oper_type,
short num_operands,
Attributes ** attr,
Space * space)
@@ -233,35 +233,35 @@ public:
// Execution
//
- NA_EIDPROC ex_expr::exp_return_type eval(char *op_data[],
+ ex_expr::exp_return_type eval(char *op_data[],
CollHeap * = 0,
ComDiagsArea ** = 0);
// Fixup
//
- NA_EIDPROC ex_expr::exp_return_type
+ ex_expr::exp_return_type
pCodeGenerate(Space *space, UInt32 flags);
// Display
//
- NA_EIDPROC void displayContents(Space * space, const char * displayStr,
+ void displayContents(Space * space, const char * displayStr,
Int32 clauseNum, char * constsArea);
// ---------------------------------------------------------------------
// 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_aggregate_clause::populateImageVersionIDArray();
}
- NA_EIDPROC virtual short getClassSize() { return (short)sizeof(*this); }
+ virtual short getClassSize() { return (short)sizeof(*this); }
private:
// ---------------------------------------------------------------------
@@ -274,7 +274,7 @@ private:
// ---------------------------------------------------------------------
};
-class SQLEXP_LIB_FUNC ExFunctionGrouping : public ex_aggregate_clause {
+class ExFunctionGrouping : public ex_aggregate_clause {
public:
ExFunctionGrouping(OperatorTypeEnum oper_type,
short num_operands,
@@ -293,11 +293,11 @@ public:
CollHeap* = 0,
ComDiagsArea** = 0);
- NA_EIDPROC virtual short getClassSize() { return (short)sizeof(*this); }
+ virtual short getClassSize() { return (short)sizeof(*this); }
// Display
//
- NA_EIDPROC void displayContents(Space * space, const char * displayStr,
+ void displayContents(Space * space, const char * displayStr,
Int32 clauseNum, char * constsArea);
Int16 getRollupGroupIndex() { return rollupGroupIndex_; }
@@ -311,12 +311,12 @@ private:
// ---------------------------------------------------------------------
};
-class SQLEXP_LIB_FUNC ex_pivot_group_clause : public ex_aggregate_clause {
+class ex_pivot_group_clause : public ex_aggregate_clause {
public:
// Construction
//
- NA_EIDPROC ex_pivot_group_clause(){};
- NA_EIDPROC ex_pivot_group_clause(OperatorTypeEnum oper_type,
+ ex_pivot_group_clause(){};
+ ex_pivot_group_clause(OperatorTypeEnum oper_type,
short num_operands,
Attributes ** attr,
char * delim,
@@ -338,23 +338,23 @@ public:
CollHeap * = 0,
ComDiagsArea ** = 0);
- NA_EIDPROC Int32 isNullInNullOut() const { return 0; };
- NA_EIDPROC Int32 isNullRelevant() const { return 1; };
+ Int32 isNullInNullOut() const { return 0; };
+ Int32 isNullRelevant() const { return 1; };
// Display
//
- NA_EIDPROC void displayContents(Space * space, const char * displayStr,
+ void displayContents(Space * space, const char * displayStr,
Int32 clauseNum, char * constsArea);
// ---------------------------------------------------------------------
// 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_aggregate_clause::populateImageVersionIDArray();
@@ -474,7 +474,7 @@ enum ArithInstruction {
NEGATE_BOOLEAN =70
};
-class SQLEXP_LIB_FUNC ex_arith_clause : public ex_clause {
+class ex_arith_clause : public ex_clause {
typedef struct {
OperatorTypeEnum op;
@@ -489,13 +489,13 @@ public:
// Construction
//
- NA_EIDPROC ex_arith_clause(){};
- NA_EIDPROC ex_arith_clause(OperatorTypeEnum oper_type,
+ ex_arith_clause(){};
+ ex_arith_clause(OperatorTypeEnum oper_type,
Attributes ** attr,
Space * space,
short arithRoundingMode,
NABoolean divToDownscale);
- NA_EIDPROC ex_arith_clause(clause_type type,
+ ex_arith_clause(clause_type type,
OperatorTypeEnum oper_type,
Attributes ** attr,
Space * space);
@@ -531,32 +531,32 @@ public:
// Null Semantics
//
- NA_EIDPROC Int32 isNullInNullOut() const { return 1; };
- NA_EIDPROC Int32 isNullRelevant() const { return 1; };
+ Int32 isNullInNullOut() const { return 1; };
+ Int32 isNullRelevant() const { return 1; };
// Execution
//
- NA_EIDPROC Int32 isEvalRelevant() const { return 1; };
- NA_EIDPROC ex_expr::exp_return_type eval(char *op_data[],
+ Int32 isEvalRelevant() const { return 1; };
+ ex_expr::exp_return_type eval(char *op_data[],
CollHeap * = 0,
ComDiagsArea ** = 0);
- NA_EIDPROC ex_expr::exp_return_type evalUnsupportedOperations(
+ ex_expr::exp_return_type evalUnsupportedOperations(
char *op_data[],
CollHeap * heap,
ComDiagsArea ** diagsArea);
// Fixup
//
- NA_EIDPROC Long pack(void *);
- NA_EIDPROC ex_expr::exp_return_type pCodeGenerate(Space *space,
+ Long pack(void *);
+ ex_expr::exp_return_type pCodeGenerate(Space *space,
UInt32 flags);
// pcode for unary arith operators, like NEGATE.
ex_expr::exp_return_type unaryArithPCodeGenerate
(Space *space, UInt32 flags);
- NA_EIDPROC ex_expr::exp_return_type fixup(Space * space = 0,
+ ex_expr::exp_return_type fixup(Space * space = 0,
CollHeap * exHeap = 0,
char * constants_area = 0,
char * temps_area = 0,
@@ -566,24 +566,24 @@ public:
// Display
//
- NA_EIDPROC void displayContents(Space * space, const char * displayStr,
+ void displayContents(Space * space, const char * displayStr,
Int32 clauseNum, char * constsArea);
// ---------------------------------------------------------------------
// 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(1,getClassVersionID());
ex_clause::populateImageVersionIDArray();
}
- NA_EIDPROC virtual short getClassSize() { return (short)sizeof(*this); }
+ virtual short getClassSize() { return (short)sizeof(*this); }
// ---------------------------------------------------------------------
private:
@@ -604,60 +604,60 @@ private:
// ---------------------------------------------------------------------
char fillers_[18]; // 06-23
- NA_EIDPROC const ArithInstrStruct * getMatchingRow(OperatorTypeEnum op,
+ const ArithInstrStruct * getMatchingRow(OperatorTypeEnum op,
short datatype1,
short datatype2,
short resulttype);
- NA_EIDPROC const ArithInstruction computeCaseIndex(OperatorTypeEnum op,
+ const ArithInstruction computeCaseIndex(OperatorTypeEnum op,
Attributes * attr1,
Attributes * attr2,
Attributes * result);
- NA_EIDPROC NABoolean getDivToDownscale()
+ NABoolean getDivToDownscale()
{ return (flags_ & DIV_TO_DOWNSCALE) != 0;}
- NA_EIDPROC void setDivToDownscale(NABoolean v)
+ void setDivToDownscale(NABoolean v)
{ (v ? flags_ |= DIV_TO_DOWNSCALE : flags_ &= ~DIV_TO_DOWNSCALE); }
};
-class SQLEXP_LIB_FUNC ex_arith_sum_clause : public ex_arith_clause {
+class ex_arith_sum_clause : public ex_arith_clause {
public:
- NA_EIDPROC ex_arith_sum_clause() {};
- NA_EIDPROC ex_arith_sum_clause(OperatorTypeEnum oper_type,
+ ex_arith_sum_clause() {};
+ ex_arith_sum_clause(OperatorTypeEnum oper_type,
Attributes ** attr,
Space * space);
- NA_EIDPROC ex_expr::exp_return_type pCodeGenerate(Space *space,
+ ex_expr::exp_return_type pCodeGenerate(Space *space,
UInt32 flags);
// Null Semantics
//
- NA_EIDPROC Int32 isNullInNullOut() const { return 0; };
- NA_EIDPROC ex_expr::exp_return_type processNulls(char *op_data[],
+ Int32 isNullInNullOut() const { return 0; };
+ ex_expr::exp_return_type processNulls(char *op_data[],
CollHeap * = 0,
ComDiagsArea ** = 0);
// Display
//
- NA_EIDPROC void displayContents(Space * space, const char * displayStr,
+ void displayContents(Space * space, const char * displayStr,
Int32 clauseNum, char * constsArea);
// ---------------------------------------------------------------------
// 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(1,getClassVersionID());
ex_clause::populateImageVersionIDArray();
}
- NA_EIDPROC virtual short getClassSize() { return (short)sizeof(*this); }
+ virtual short getClassSize() { return (short)sizeof(*this); }
// ---------------------------------------------------------------------
private:
@@ -671,43 +671,43 @@ private:
};
-class SQLEXP_LIB_FUNC ex_arith_count_clause : public ex_arith_clause {
+class ex_arith_count_clause : public ex_arith_clause {
public:
- NA_EIDPROC ex_arith_count_clause() {};
- NA_EIDPROC ex_arith_count_clause(OperatorTypeEnum oper_type,
+ ex_arith_count_clause() {};
+ ex_arith_count_clause(OperatorTypeEnum oper_type,
Attributes ** attr,
Space * space);
- NA_EIDPROC ex_expr::exp_return_type pCodeGenerate(Space *space
+ ex_expr::exp_return_type pCodeGenerate(Space *space
, UInt32 flags);
// Null Semantics
//
- NA_EIDPROC Int32 isNullInNullOut() const { return 0; };
- NA_EIDPROC ex_expr::exp_return_type processNulls(char *op_data[],
+ Int32 isNullInNullOut() const { return 0; };
+ ex_expr::exp_return_type processNulls(char *op_data[],
CollHeap * = 0,
ComDiagsArea ** = 0);
// Display
//
- NA_EIDPROC void displayContents(Space * space, const char * displayStr,
+ void displayContents(Space * space, const char * displayStr,
Int32 clauseNum, char * constsArea);
// ---------------------------------------------------------------------
// 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_arith_clause::populateImageVersionIDArray();
}
- NA_EIDPROC virtual short getClassSize() { return (short)sizeof(*this); }
+ virtual short getClassSize() { return (short)sizeof(*this); }
// ---------------------------------------------------------------------
private:
@@ -724,54 +724,54 @@ private:
/////////////////////////////////////////
// Class bool_clause //
/////////////////////////////////////////
-class SQLEXP_LIB_FUNC ex_bool_clause : public ex_clause {
+class ex_bool_clause : public ex_clause {
public:
// Construction
//
- NA_EIDPROC ex_bool_clause(){};
- NA_EIDPROC ex_bool_clause(OperatorTypeEnum oper_type,
+ ex_bool_clause(){};
+ ex_bool_clause(OperatorTypeEnum oper_type,
Attributes ** attr,
Space * space);
// Null Semantics
//
- NA_EIDPROC Int32 isNullInNullOut() const { return 0; };
- NA_EIDPROC Int32 isNullRelevant() const { return 0; };
+ Int32 isNullInNullOut() const { return 0; };
+ Int32 isNullRelevant() const { return 0; };
// Execution
//
- NA_EIDPROC Int32 isEvalRelevant() const { return 1; };
- NA_EIDPROC ex_expr::exp_return_type eval(char *op_data[],
+ Int32 isEvalRelevant() const { return 1; };
+ ex_expr::exp_return_type eval(char *op_data[],
CollHeap * = 0,
ComDiagsArea ** = 0);
// Fixup
//
- NA_EIDPROC Long pack(void *);
- NA_EIDPROC ex_expr::exp_return_type
+ Long pack(void *);
+ ex_expr::exp_return_type
pCodeGenerate(Space *space, UInt32 flags);
// Display
//
- NA_EIDPROC void displayContents(Space * space, const char * displayStr,
+ void displayContents(Space * space, const char * displayStr,
Int32 clauseNum, char * constsArea);
// ---------------------------------------------------------------------
// 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(1,getClassVersionID());
ex_clause::populateImageVersionIDArray();
}
- NA_EIDPROC virtual short getClassSize() { return (short)sizeof(*this); }
+ virtual short getClassSize() { return (short)sizeof(*this); }
private:
// ---------------------------------------------------------------------
@@ -787,53 +787,53 @@ private:
////////////////////////////////////////////////
// Class bool_result_clause
///////////////////////////////////////////////
-class SQLEXP_LIB_FUNC bool_result_clause : public ex_clause {
+class bool_result_clause : public ex_clause {
public:
// Construction
//
- NA_EIDPROC bool_result_clause(){};
- NA_EIDPROC bool_result_clause(OperatorTypeEnum oper_type, Attributes ** attr,
+ bool_result_clause(){};
+ bool_result_clause(OperatorTypeEnum oper_type, Attributes ** attr,
Space * space);
// Null Semantics
//
- NA_EIDPROC Int32 isNullInNullOut() const { return 0; };
- NA_EIDPROC Int32 isNullRelevant() const { return 0; };
+ Int32 isNullInNullOut() const { return 0; };
+ Int32 isNullRelevant() const { return 0; };
// Execution
//
- NA_EIDPROC Int32 isEvalRelevant() const { return 1; };
- NA_EIDPROC ex_expr::exp_return_type eval(char *op_data[],
+ Int32 isEvalRelevant() const { return 1; };
+ ex_expr::exp_return_type eval(char *op_data[],
CollHeap * = 0,
ComDiagsArea ** = 0);
// Fixup
//
- NA_EIDPROC Long pack(void *);
- NA_EIDPROC ex_expr::exp_return_type
+ Long pack(void *);
+ ex_expr::exp_return_type
pCodeGenerate(Space *space, UInt32 flags);
// Display
//
- NA_EIDPROC void displayContents(Space * space, const char * displayStr,
+ void displayContents(Space * space, const char * displayStr,
Int32 clauseNum, char * constsArea);
// ---------------------------------------------------------------------
// 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(1,getClassVersionID());
ex_clause::populateImageVersionIDArray();
}
- NA_EIDPROC virtual short getClassSize() { return (short)sizeof(*this); }
+ virtual short getClassSize() { return (short)sizeof(*this); }
private:
// ---------------------------------------------------------------------
@@ -849,37 +849,37 @@ private:
/////////////////////////////////////////
// Class branch_clause //
/////////////////////////////////////////
-class SQLEXP_LIB_FUNC ex_branch_clause : public ex_clause {
+class ex_branch_clause : public ex_clause {
public:
// Construction
//
- NA_EIDPROC ex_branch_clause() : saved_next_clause(NULL), branch_clause(NULL)
+ ex_branch_clause() : saved_next_clause(NULL), branch_clause(NULL)
{};
- NA_EIDPROC ex_branch_clause(OperatorTypeEnum oper_type,
+ ex_branch_clause(OperatorTypeEnum oper_type,
Attributes ** attr,
Space * space);
- NA_EIDPROC ex_branch_clause(OperatorTypeEnum oper_type,
+ ex_branch_clause(OperatorTypeEnum oper_type,
Space * space);
// Accessors
//
- //NA_EIDPROC inline void set_branch_clause(ex_clause*);
+ //inline void set_branch_clause(ex_clause*);
inline void set_branch_clause(ex_clause *clause_)
{
branch_clause = clause_;
};
- //NA_EIDPROC inline void set_saved_next(ex_clause*);
+ //inline void set_saved_next(ex_clause*);
inline void set_saved_next(ex_clause *clause_)
{
saved_next_clause = clause_;
};
- NA_EIDPROC inline ex_clause * get_branch_clause()
+ inline ex_clause * get_branch_clause()
{
return branch_clause;
};
- //NA_EIDPROC inline ex_clause * get_saved_next();
+ //inline ex_clause * get_saved_next();
inline ex_clause * get_saved_next()
{
return saved_next_clause;
@@ -887,52 +887,52 @@ public:
// This is a branching clause
//
- NA_EIDPROC Int32 isBranchingClause() const { return 1; };
+ Int32 isBranchingClause() const { return 1; };
// Null Semantics
//
- NA_EIDPROC Int32 isNullInNullOut() const { return 0; };
- NA_EIDPROC Int32 isNullRelevant() const { return 0; };
+ Int32 isNullInNullOut() const { return 0; };
+ Int32 isNullRelevant() const { return 0; };
// Execution
//
- NA_EIDPROC Int32 isEvalRelevant() const { return 1; };
- NA_EIDPROC ex_expr::exp_return_type eval(char *op_data[],
+ Int32 isEvalRelevant() const { return 1; };
+ ex_expr::exp_return_type eval(char *op_data[],
CollHeap * = 0,
ComDiagsArea ** = 0);
// Fixup
//
- NA_EIDPROC Long pack(void *);
- NA_EIDPROC Lng32 unpack(void *, void * reallocator);
- NA_EIDPROC ex_expr::exp_return_type fixup(Space * space = 0,
+ Long pack(void *);
+ Lng32 unpack(void *, void * reallocator);
+ 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);
- NA_EIDPROC ex_expr::exp_return_type
+ ex_expr::exp_return_type
pCodeGenerate(Space *space, UInt32 flags);
- NA_EIDPROC void displayContents(Space * space, const char * displayStr,
+ void displayContents(Space * space, const char * displayStr,
Int32 clauseNum, char * constsArea);
// ---------------------------------------------------------------------
// 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(1,getClassVersionID());
ex_clause::populateImageVersionIDArray();
}
- NA_EIDPROC virtual short getClassSize() { return (short)sizeof(*this); }
+ virtual short getClassSize() { return (short)sizeof(*this); }
// ---------------------------------------------------------------------
private:
@@ -1185,7 +1185,7 @@ enum CompInstruction {
COMP_NOT_SUPPORTED =191
};
-class SQLEXP_LIB_FUNC ex_comp_clause : public ex_clause {
+class ex_comp_clause : public ex_clause {
typedef struct {
OperatorTypeEnum op;
@@ -1199,9 +1199,9 @@ public:
// Construction
//
- NA_EIDPROC ex_comp_clause(): flags_(0)
+ ex_comp_clause(): flags_(0)
{ };
- NA_EIDPROC ex_comp_clause(OperatorTypeEnum oper_type,
+ ex_comp_clause(OperatorTypeEnum oper_type,
Attributes ** attr,
Space * space,
ULng32 flags_);
@@ -1209,7 +1209,7 @@ public:
// Accessors
//
- NA_EIDPROC inline CompInstruction getInstruction()
+ inline CompInstruction getInstruction()
{
if (getInstrArrayIndex() >= 0)
return getInstruction(getInstrArrayIndex());
@@ -1217,12 +1217,12 @@ public:
return COMP_NOT_SUPPORTED;
};
- NA_EIDPROC void setInstruction();
- NA_EIDPROC void setInstruction(OperatorTypeEnum op,
+ void setInstruction();
+ void setInstruction(OperatorTypeEnum op,
Attributes * attr1,
Attributes * attr2);
- NA_EIDPROC short isComparisonSupported(OperatorTypeEnum op,
+ short isComparisonSupported(OperatorTypeEnum op,
Attributes * attr1,
Attributes * attr2);
@@ -1239,30 +1239,30 @@ public:
// 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[],
+ Int32 isNullInNullOut() const { return 0; };
+ Int32 isNullRelevant() const { return 1; };
+ ex_expr::exp_return_type processNulls(char *op_data[],
CollHeap * = 0,
ComDiagsArea ** = 0);
// Execution
//
- NA_EIDPROC Int32 isEvalRelevant() const { return 1; };
- NA_EIDPROC ex_expr::exp_return_type eval(char *op_data[],
+ Int32 isEvalRelevant() const { return 1; };
+ ex_expr::exp_return_type eval(char *op_data[],
CollHeap * = 0,
ComDiagsArea ** = 0);
- NA_EIDPROC ex_expr::exp_return_type evalUnsupportedOperations(
+ ex_expr::exp_return_type evalUnsupportedOperations(
char *op_data[],
CollHeap * heap,
ComDiagsArea ** diagsArea);
// Fixup
//
- NA_EIDPROC Long pack(void *);
- NA_EIDPROC ex_expr::exp_return_type
+ Long pack(void *);
+ ex_expr::exp_return_type
pCodeGenerate(Space *space, UInt32 flags);
- NA_EIDPROC ex_expr::exp_return_type fixup(Space * space = 0,
+ ex_expr::exp_return_type fixup(Space * space = 0,
CollHeap * exHeap = 0,
char * constants_area = 0,
char * temps_area = 0,
@@ -1272,30 +1272,30 @@ public:
// Display
//
- NA_EIDPROC void displayContents(Space * space, const char * displayStr,
+ void displayContents(Space * space, const char * displayStr,
Int32 clauseNum, char * constsArea);
// ---------------------------------------------------------------------
// 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(1,getClassVersionID());
ex_clause::populateImageVersionIDArray();
}
- NA_EIDPROC virtual short getClassSize() { return (short)sizeof(*this); }
+ virtual short getClassSize() { return (short)sizeof(*this); }
- NA_EIDPROC NABoolean getCollationEncodeComp()
+ NABoolean getCollationEncodeComp()
{
return ((flags_ & COLLATION_ENCODE_COMP) != 0);
}
- NA_EIDPROC void setCollationEncodeComp(NABoolean v)
+ void setCollationEncodeComp(NABoolean v)
{
(v) ? flags_ |= COLLATION_ENCODE_COMP: flags_ &= ~COLLATION_ENCODE_COMP;
}
@@ -1323,15 +1323,15 @@ private:
// that the size of the object remains the same (and is modulo 8).
// ---------------------------------------------------------------------
char fillers_[24]; // 08-31
- NA_EIDPROC ex_expr::exp_return_type processResult(Int32 compare_code, Lng32* result,
+ ex_expr::exp_return_type processResult(Int32 compare_code, Lng32* result,
CollHeap *heap,
ComDiagsArea** diagsArea);
- NA_EIDPROC const CompInstrStruct * getMatchingRow(OperatorTypeEnum op,
+ const CompInstrStruct * getMatchingRow(OperatorTypeEnum op,
short datatype1,
short datatype2);
- NA_EIDPROC const CompInstruction computeCaseIndex(OperatorTypeEnum op,
+ const CompInstruction computeCaseIndex(OperatorTypeEnum op,
Attributes * attr1,
Attributes * attr2);
};
@@ -1698,7 +1698,7 @@ enum ConvInstruction {
CONV_BIN8U_BIN8S =286
};
-class SQLEXP_LIB_FUNC ex_conv_clause : public ex_clause {
+class ex_conv_clause : public ex_clause {
typedef struct {
short type_op1; // left operand
@@ -1711,13 +1711,13 @@ public:
// Construction
//
- NA_EIDPROC ex_conv_clause()
+ ex_conv_clause()
{
lastVOAoffset_ = 0;
lastVcIndicatorLength_ = 0;
lastNullIndicatorLength_ = 0;
};
- NA_EIDPROC ex_conv_clause(OperatorTypeEnum oper_type,
+ ex_conv_clause(OperatorTypeEnum oper_type,
Attributes ** attr,
Space * space,
short num_operands = 2,
@@ -1740,21 +1740,21 @@ public:
// Accessors
//
- NA_EIDPROC void setInstruction();
+ void setInstruction();
// Null Semantics
//
- NA_EIDPROC Int32 isNullInNullOut() const ;
+ Int32 isNullInNullOut() const ;
- NA_EIDPROC Int32 isNullRelevant() const { return 1; };
- NA_EIDPROC ex_expr::exp_return_type processNulls(char *op_data[],
+ Int32 isNullRelevant() const { return 1; };
+ ex_expr::exp_return_type processNulls(char *op_data[],
CollHeap * = 0,
ComDiagsArea ** = 0);
// Execution
//
- NA_EIDPROC Int32 isEvalRelevant() const { return 1; };
- NA_EIDPROC ex_expr::exp_return_type eval(char *op_data[],
+ Int32 isEvalRelevant() const { return 1; };
+ ex_expr::exp_return_type eval(char *op_data[],
CollHeap * = 0,
ComDiagsArea ** = 0);
@@ -1767,7 +1767,7 @@ public:
return CONV_NOT_SUPPORTED;
};
- NA_EIDPROC ConvInstruction findInstruction(short sourceType, Lng32 sourceLen,
+ ConvInstruction findInstruction(short sourceType, Lng32 sourceLen,
short targetType, Lng32 targetLen,
Lng32 scaleDifference);
@@ -1788,22 +1788,22 @@ public:
Lng32 findIndexIntoInstrArray(ConvInstruction ci);
- NA_EIDPROC NABoolean treatAllSpacesAsZero()
+ NABoolean treatAllSpacesAsZero()
{ return ((flags_ & TREAT_ALL_SPACES_AS_ZERO) != 0); };
- NA_EIDPROC void setTreatAllSpacesAsZero(NABoolean v)
+ void setTreatAllSpacesAsZero(NABoolean v)
{ (v) ? flags_ |= TREAT_ALL_SPACES_AS_ZERO : flags_ &= ~TREAT_ALL_SPACES_AS_ZERO; }
- NA_EIDPROC NABoolean allowSignInInterval()
+ NABoolean allowSignInInterval()
{ return ((flags_ & ALLOW_SIGN_IN_INTERVAL) != 0); };
- NA_EIDPROC void setAllowSignInInterval(NABoolean v)
+ void setAllowSignInInterval(NABoolean v)
{ (v) ? flags_ |= ALLOW_SIGN_IN_INTERVAL : flags_ &= ~ALLOW_SIGN_IN_INTERVAL; }
- NA_EIDPROC NABoolean noDatetimeValidation()
+ NABoolean noDatetimeValidation()
{ return ((flags_ & NO_DATETIME_VALIDATION) != 0); };
- NA_EIDPROC void setNoDatetimeValidation(NABoolean v)
+ void setNoDatetimeValidation(NABoolean v)
{ (v) ? flags_ |= NO_DATETIME_VALIDATION : flags_ &= ~NO_DATETIME_VALIDATION; }
NABoolean srcIsVarcharPtr() { return (flags_ & SRC_IS_VARCHAR_PTR) != 0; }
@@ -1812,10 +1812,10 @@ public:
// Fixup
//
- NA_EIDPROC Long pack(void *);
- NA_EIDPROC ex_expr::exp_return_type
+ Long pack(void *);
+ ex_expr::exp_return_type
pCodeGenerate(Space *space, UInt32 flags);
- NA_EIDPROC ex_expr::exp_return_type fixup(Space * space = 0,
+ ex_expr::exp_return_type fixup(Space * space = 0,
CollHeap * exHeap = 0,
char * constants_area = 0,
char * temps_area = 0,
@@ -1825,58 +1825,58 @@ public:
// Display
//
- NA_EIDPROC void displayContents(Space * space, const char * displayStr,
+ void displayContents(Space * space, const char * displayStr,
Int32 clauseNum, char * constsArea);
// ---------------------------------------------------------------------
// 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(1,getClassVersionID());
ex_clause::populateImageVersionIDArray();
}
- NA_EIDPROC virtual short getClassSize() { return (short)sizeof(*this); }
+ virtual short getClassSize() { return (short)sizeof(*this); }
// ---------------------------------------------------------------------
- NA_EIDPROC void setLastVOAoffset( UInt32 v)
+ void setLastVOAoffset( UInt32 v)
{
lastVOAoffset_ = v;
}
- NA_EIDPROC UInt32 getLastVOAoffset()
+ UInt32 getLastVOAoffset()
{
return lastVOAoffset_;
}
- NA_EIDPROC void setLastVcIndicatorLength( Int16 v)
+ void setLastVcIndicatorLength( Int16 v)
{
lastVcIndicatorLength_ = v;
}
- NA_EIDPROC void setLastNullIndicatorLength( Int16 v)
+ void setLastNullIndicatorLength( Int16 v)
{
lastNullIndicatorLength_ = v;
}
- NA_EIDPROC void setComputedLength( UInt32 v)
+ void setComputedLength( UInt32 v)
{
computedLength_ = v;
}
- NA_EIDPROC UInt32 getComputedLength( )
+ UInt32 getComputedLength( )
{
return computedLength_;
}
- NA_EIDPROC void setAlignment( Int16 v)
+ void setAlignment( Int16 v)
{
alignment_ = v;
}
- NA_EIDPROC Int16 getAlignment()
+ Int16 getAlignment()
{
return alignment_;
}
@@ -2001,8 +2001,6 @@ inline int requiresNoConvOrVal(Lng32 sourceLen, Lng32 sourcePrecision, Lng32 sou
)));
}
-NA_EIDPROC
-SQLEXP_LIB_FUNC
ex_expr::exp_return_type
convDoIt(char * source,
Lng32 sourceLen,
@@ -2022,7 +2020,6 @@ convDoIt(char * source,
Lng32 * dataConversionErrorFlag = 0,
ULng32 flags = 0);
-SQLEXP_LIB_FUNC
ex_expr::exp_return_type
scaleDoIt(char *operand, // ptr to operand
Lng32 operandLen, // len of operand
@@ -2067,19 +2064,18 @@ inline void swapBytes(void *ptr, UInt32 size)
}
}
-SQLEXP_LIB_FUNC
ex_expr::exp_return_type swapBytes(Attributes *attr,
void *ptr);
/////////////////////////////////////////
// Class ex_function_clause //
/////////////////////////////////////////
-class SQLEXP_LIB_FUNC ex_function_clause : public ex_clause {
+class ex_function_clause : public ex_clause {
public:
// Construction
//
- NA_EIDPROC ex_function_clause(){};
- NA_EIDPROC ex_function_clause(OperatorTypeEnum oper_type,
+ ex_function_clause(){};
+ ex_function_clause(OperatorTypeEnum oper_type,
short num_operands,
Attributes ** attr,
Space * space);
@@ -2087,33 +2083,33 @@ public:
// Null Semantics
//
- NA_EIDPROC Int32 isNullInNullOut() const { return 1; };
- NA_EIDPROC Int32 isNullRelevant() const { return 1; };
+ Int32 isNullInNullOut() const { return 1; };
+ Int32 isNullRelevant() const { return 1; };
// Execution
//
- NA_EIDPROC Int32 isEvalRelevant() const { return 1; };
+ Int32 isEvalRelevant() const { return 1; };
// Fixup
//
- NA_EIDPROC Long pack(void *);
- NA_EIDPROC ex_expr::exp_return_type
+ Long pack(void *);
+ ex_expr::exp_return_type
pCodeGenerate(Space *space, UInt32 flags);
- NA_EIDPROC NABoolean derivedFunction()
+ NABoolean derivedFunction()
{ return ((flags_ & DERIVED_FUNCTION) != 0); };
- NA_EIDPROC void setDerivedFunction(NABoolean v)
+ void setDerivedFunction(NABoolean v)
{ (v) ? flags_ |= DERIVED_FUNCTION: flags_ &= ~DERIVED_FUNCTION; }
- NA_EIDPROC NABoolean caseInsensitiveOperation()
+ NABoolean caseInsensitiveOperation()
{ return ((flags_ & CI_OPERATION) != 0); };
- NA_EIDPROC void setCaseInsensitiveOperation(NABoolean v)
+ void setCaseInsensitiveOperation(NABoolean v)
{ (v) ? flags_ |= CI_OPERATION: flags_ &= ~CI_OPERATION; }
- NA_EIDPROC OperatorTypeEnum origFunctionOperType()
+ OperatorTypeEnum origFunctionOperType()
{ return (OperatorTypeEnum)origFunctionOperType_; }
void setOrigFunctionOperType(OperatorTypeEnum type)
{ origFunctionOperType_ = (Int16)type; }
@@ -2122,24 +2118,24 @@ public:
// Display
//
- NA_EIDPROC virtual void displayContents(Space * space, const char * displayStr,
+ virtual void displayContents(Space * space, const char * displayStr,
Int32 clauseNum, char * constsArea);
// ---------------------------------------------------------------------
// 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(1,getClassVersionID());
ex_clause::populateImageVersionIDArray();
}
- NA_EIDPROC virtual short getClassSize() { return (short)sizeof(*this); }
+ virtual short getClassSize() { return (short)sizeof(*this); }
// ---------------------------------------------------------------------
private:
@@ -2173,73 +2169,73 @@ private:
/////////////////////////////////////////
// Class ex_inout_clause
/////////////////////////////////////////
-class SQLEXP_LIB_FUNC ex_inout_clause : public ex_clause {
+class ex_inout_clause : public ex_clause {
public:
// Consruction
//
- NA_EIDPROC ex_inout_clause() { flags_ = 0; };
- NA_EIDPROC ex_inout_clause(OperatorTypeEnum oper_type, Attributes ** attr,
+ ex_inout_clause() { flags_ = 0; };
+ ex_inout_clause(OperatorTypeEnum oper_type, Attributes ** attr,
Space * space);
// Accessors
//
- NA_EIDPROC inline char * getName(){ return name; };
- NA_EIDPROC inline void setName(char * name_){ name = name_; };
+ inline char * getName(){ return name; };
+ inline void setName(char * name_){ name = name_; };
- NA_EIDPROC inline char * getHeading(){ return heading_; };
- NA_EIDPROC inline void setHeading(char * heading){ heading_ = heading; };
+ inline char * getHeading(){ return heading_; };
+ inline void setHeading(char * heading){ heading_ = heading; };
- NA_EIDPROC inline char * getTableName(){ return table_name_; };
- NA_EIDPROC inline void setTableName(char * tn){ table_name_ = tn; };
+ inline char * getTableName(){ return table_name_; };
+ inline void setTableName(char * tn){ table_name_ = tn; };
- NA_EIDPROC inline char * getSchemaName(){ return schema_name_; };
- NA_EIDPROC inline void setSchemaName(char * sn){ schema_name_ = sn; };
+ inline char * getSchemaName(){ return schema_name_; };
+ inline void setSchemaName(char * sn){ schema_name_ = sn; };
- NA_EIDPROC inline char * getCatalogName(){ return catalog_name_; };
- NA_EIDPROC inline void setCatalogName(char * cn){ catalog_name_ = cn; };
+ inline char * getCatalogName(){ return catalog_name_; };
+ inline void setCatalogName(char * cn){ catalog_name_ = cn; };
- // NA_EIDPROC inline ex_conv_clause* &getConvClause(){ return convHVClause_; };
+ // inline ex_conv_clause* &getConvClause(){ return convHVClause_; };
// Null Semantics
//
- NA_EIDPROC Int32 isNullInNullOut() const { return 0; };
- NA_EIDPROC Int32 isNullRelevant() const { return 0; };
+ Int32 isNullInNullOut() const { return 0; };
+ Int32 isNullRelevant() const { return 0; };
// Execution
//
- NA_EIDPROC Int32 isEvalRelevant() const { return 0; };
- NA_EIDPROC ex_expr::exp_return_type eval(char *op_data[],
+ Int32 isEvalRelevant() const { return 0; };
+ ex_expr::exp_return_type eval(char *op_data[],
CollHeap * = 0,
ComDiagsArea ** = 0);
// Fixup
//
- NA_EIDPROC Long pack(void *);
- NA_EIDPROC Lng32 unpack(void *, void * reallocator);
- NA_EIDPROC ex_expr::exp_return_type
+ Long pack(void *);
+ Lng32 unpack(void *, void * reallocator);
+ ex_expr::exp_return_type
pCodeGenerate(Space *space, UInt32 flags);
// Display
//
- NA_EIDPROC void displayContents(Space * space, const char * displayStr,
+ void displayContents(Space * space, const char * displayStr,
Int32 clauseNum, char * constsArea);
// ---------------------------------------------------------------------
// 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(1,getClassVersionID());
ex_clause::populateImageVersionIDArray();
}
- NA_EIDPROC virtual short getClassSize() { return (short)sizeof(*this); }
+ virtual short getClassSize() { return (short)sizeof(*this); }
// ---------------------------------------------------------------------
short getParamMode() { return paramMode_; }
@@ -2297,52 +2293,52 @@ private:
/////////////////////////////////////////
// Class noop_clause //
/////////////////////////////////////////
-class SQLEXP_LIB_FUNC ex_noop_clause : public ex_clause {
+class ex_noop_clause : public ex_clause {
public:
// Construction
//
- NA_EIDPROC ex_noop_clause();
+ ex_noop_clause();
// Null Semantics
//
- NA_EIDPROC Int32 isNullInNullOut() const { return 0; };
- NA_EIDPROC Int32 isNullRelevant() const { return 0; };
+ Int32 isNullInNullOut() const { return 0; };
+ Int32 isNullRelevant() const { return 0; };
// Execution
//
- NA_EIDPROC Int32 isEvalRelevant() const { return 0; };
- NA_EIDPROC ex_expr::exp_return_type eval(char *op_data[],
+ Int32 isEvalRelevant() const { return 0; };
+ ex_expr::exp_return_type eval(char *op_data[],
CollHeap * = 0,
ComDiagsArea ** = 0);
// Fixup
//
- NA_EIDPROC Long pack(void *);
- NA_EIDPROC ex_expr::exp_return_type
+ Long pack(void *);
+ ex_expr::exp_return_type
pCodeGenerate(Space *space, UInt32 flags);
// Display
//
- NA_EIDPROC void displayContents(Space * space, const char * displayStr,
+ void displayContents(Space * space, const char * displayStr,
Int32 clauseNum, char * constsArea);
// ---------------------------------------------------------------------
// 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(1,getClassVersionID());
ex_clause::populateImageVersionIDArray();
}
- NA_EIDPROC virtual short getClassSize() { return (short)sizeof(*this); }
+ virtual short getClassSize() { return (short)sizeof(*this); }
// ---------------------------------------------------------------------
private:
@@ -2361,54 +2357,54 @@ private:
/////////////////////////////////////////
// Class un_logic_clause //
/////////////////////////////////////////
-class SQLEXP_LIB_FUNC ex_unlogic_clause : public ex_clause {
+class ex_unlogic_clause : public ex_clause {
public:
// Construction
//
- NA_EIDPROC ex_unlogic_clause(){};
- NA_EIDPROC ex_unlogic_clause(OperatorTypeEnum oper_type,
+ ex_unlogic_clause(){};
+ ex_unlogic_clause(OperatorTypeEnum oper_type,
Attributes ** attr, Space * space);
// Null Semantics
//
- NA_EIDPROC Int32 isNullInNullOut() const { return 0; };
- NA_EIDPROC Int32 isNullRelevant() const { return 0; };
+ Int32 isNullInNullOut() const { return 0; };
+ Int32 isNullRelevant() const { return 0; };
// Execution
//
- NA_EIDPROC Int32 isEvalRelevant() const { return 1; };
- NA_EIDPROC ex_expr::exp_return_type eval(char *op_data[],
+ Int32 isEvalRelevant() const { return 1; };
+ ex_expr::exp_return_type eval(char *op_data[],
CollHeap * = 0,
ComDiagsArea ** = 0);
// Fixup
//
- NA_EIDPROC Long pack(void *);
- NA_EIDPROC ex_expr::exp_return_type
+ Long pack(void *);
+ ex_expr::exp_return_type
pCodeGenerate(Space *space, UInt32 flags);
// Display
//
- NA_EIDPROC void displayContents(Space * space, const char * displayStr,
+ void displayContents(Space * space, const char * displayStr,
Int32 clauseNum, char * constsArea);
// ---------------------------------------------------------------------
// 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(1,getClassVersionID());
ex_clause::populateImageVersionIDArray();
}
- NA_EIDPROC virtual short getClassSize() { return (short)sizeof(*this); }
+ virtual short getClassSize() { return (short)sizeof(*this); }
private:
@@ -2423,16 +2419,16 @@ private:
};
-class SQLEXP_LIB_FUNC ExRegexpClauseBase : public ex_clause {
+class ExRegexpClauseBase : public ex_clause {
public:
// Construction
//
- NA_EIDPROC ExRegexpClauseBase()
+ ExRegexpClauseBase()
{
setCollation(CharInfo::DefaultCollation);
}
- NA_EIDPROC ExRegexpClauseBase(OperatorTypeEnum oper_type,
+ ExRegexpClauseBase(OperatorTypeEnum oper_type,
short num_operands,
Attributes ** attr,
Space * space) :
@@ -2446,26 +2442,26 @@ public:
// 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[],
+ Int32 isNullInNullOut() const { return 0; };
+ Int32 isNullRelevant() const { return 1; };
+ ex_expr::exp_return_type processNulls(char *op_data[],
CollHeap * = 0,
ComDiagsArea ** = 0);
// Execution
//
- NA_EIDPROC Int32 isEvalRelevant() const { return 1; };
- NA_EIDPROC ex_expr::exp_return_type eval(char *op_data[],
+ Int32 isEvalRelevant() const { return 1; };
+ ex_expr::exp_return_type eval(char *op_data[],
CollHeap * = 0,
ComDiagsArea ** = 0) = 0;
// Fixup
//
- NA_EIDPROC Long pack (void *) = 0;
+ Long pack (void *) = 0;
// Display
//
- NA_EIDPROC void displayContents(Space * space, const char * displayStr,
+ void displayContents(Space * space, const char * displayStr,
Int32 clauseNum, char * constsArea)
{};
@@ -2473,25 +2469,25 @@ 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(1,getClassVersionID());
ex_clause::populateImageVersionIDArray();
}
- NA_EIDPROC virtual short getClassSize() { return (short)sizeof(*this); }
+ virtual short getClassSize() { return (short)sizeof(*this); }
- NA_EIDPROC inline char* getPatternStr()
+ inline char* getPatternStr()
{
return patternStr_;
}
- NA_EIDPROC inline void setPatternStr(char* pat)
+ inline void setPatternStr(char* pat)
{
patternStr_ = pat;
}
@@ -2507,12 +2503,12 @@ public:
// ---------------------------------------------------------------------
protected:
- NA_EIDPROC inline CharInfo::Collation getCollation()
+ inline CharInfo::Collation getCollation()
{
return (CharInfo::Collation) collation_;
}
- NA_EIDPROC inline void setCollation(CharInfo::Collation v)
+ inline void setCollation(CharInfo::Collation v)
{
collation_ = (Int16) v;
}
@@ -2522,9 +2518,6 @@ union {
LikePattern *pattern_; // 00-07
char *patternStr_;
};
-#ifndef NA_64BIT
- char fillerPattern_[4]; // 04-07
-#endif
Int16 collation_; //08-09
@@ -2539,13 +2532,13 @@ union {
// Added for unicode like function
-class SQLEXP_LIB_FUNC ExRegexpClauseChar : public ExRegexpClauseBase {
+class ExRegexpClauseChar : public ExRegexpClauseBase {
public:
// Construction
//
- NA_EIDPROC ExRegexpClauseChar() {};
- NA_EIDPROC ExRegexpClauseChar(OperatorTypeEnum oper_type,
+ ExRegexpClauseChar() {};
+ ExRegexpClauseChar(OperatorTypeEnum oper_type,
short num_operands,
Attributes ** attr,
Space * space);
@@ -2553,34 +2546,34 @@ public:
// Execution
//
- NA_EIDPROC ex_expr::exp_return_type eval(char *op_data[],
+ ex_expr::exp_return_type eval(char *op_data[],
CollHeap * = 0,
ComDiagsArea ** = 0);
// Fixup
//
- NA_EIDPROC Long pack (void *);
+ Long pack (void *);
// Display
//
- NA_EIDPROC void displayContents(Space * space, const char * displayStr,
+ void displayContents(Space * space, const char * displayStr,
Int32 clauseNum, char * constsArea);
// ---------------------------------------------------------------------
// 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());
ExRegexpClauseBase::populateImageVersionIDArray();
}
- NA_EIDPROC virtual short getClassSize() { return (short)sizeof(*this); }
+ virtual short getClassSize() { return (short)sizeof(*this); }
// ---------------------------------------------------------------------
private:
@@ -2597,16 +2590,16 @@ private:
// Class like_clause //
//////////////////////////////////
-class SQLEXP_LIB_FUNC ex_like_clause_base : public ex_clause {
+class ex_like_clause_base : public ex_clause {
public:
// Construction
//
- NA_EIDPROC ex_like_clause_base()
+ ex_like_clause_base()
{
setCollation(CharInfo::DefaultCollation);
}
- NA_EIDPROC ex_like_clause_base(OperatorTypeEnum oper_type,
+ ex_like_clause_base(OperatorTypeEnum oper_type,
short num_operands,
Attributes ** attr,
Space * space) :
@@ -2620,27 +2613,27 @@ public:
// 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[],
+ Int32 isNullInNullOut() const { return 0; };
+ Int32 isNullRelevant() const { return 1; };
+ ex_expr::exp_return_type processNulls(char *op_data[],
CollHeap * = 0,
ComDiagsArea ** = 0);
// Execution
//
- NA_EIDPROC Int32 isEvalRelevant() const { return 1; };
- NA_EIDPROC ex_expr::exp_return_type eval(char *op_data[],
+ Int32 isEvalRelevant() const { return 1; };
+ ex_expr::exp_return_type eval(char *op_data[],
CollHeap * = 0,
ComDiagsArea ** = 0) = 0;
// Fixup
//
- NA_EIDPROC Long pack (void *) = 0;
- NA_EIDPROC ex_expr::exp_return_type pCodeGenerate(Space *space, UInt32 flags);
+ Long pack (void *) = 0;
+ ex_expr::exp_return_type pCodeGenerate(Space *space, UInt32 flags);
// Display
//
- NA_EIDPROC void displayContents(Space * space, const char * displayStr,
+ void displayContents(Space * space, const char * displayStr,
Int32 clauseNum, char * constsArea)
{};
@@ -2648,25 +2641,25 @@ 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(1,getClassVersionID());
ex_clause::populateImageVersionIDArray();
}
- NA_EIDPROC virtual short getClassSize() { return (short)sizeof(*this); }
+ virtual short getClassSize() { return (short)sizeof(*this); }
- NA_EIDPROC inline char* getPatternStr()
+ inline char* getPatternStr()
{
return patternStr_;
}
- NA_EIDPROC inline void setPatternStr(char* pat)
+ inline void setPatternStr(char* pat)
{
patternStr_ = pat;
}
@@ -2682,12 +2675,12 @@ public:
// ---------------------------------------------------------------------
protected:
- NA_EIDPROC inline CharInfo::Collation getCollation()
+ inline CharInfo::Collation getCollation()
{
return (CharInfo::Collation) collation_;
}
- NA_EIDPROC inline void setCollation(CharInfo::Collation v)
+ inline void setCollation(CharInfo::Collation v)
{
collation_ = (Int16) v;
}
@@ -2697,9 +2690,6 @@ union {
LikePattern *pattern_; // 00-07
char *patternStr_;
};
-#ifndef NA_64BIT
- char fillerPattern_[4]; // 04-07
-#endif
Int16 collation_; //08-09
@@ -2713,13 +2703,13 @@ union {
};
// Added for unicode like function
-class SQLEXP_LIB_FUNC ex_like_clause_char : public ex_like_clause_base {
+class ex_like_clause_char : public ex_like_clause_base {
public:
// Construction
//
- NA_EIDPROC ex_like_clause_char() {};
- NA_EIDPROC ex_like_clause_char(OperatorTypeEnum oper_type,
+ ex_like_clause_char() {};
+ ex_like_clause_char(OperatorTypeEnum oper_type,
short num_operands,
Attributes ** attr,
Space * space);
@@ -2727,34 +2717,34 @@ public:
// Execution
//
- NA_EIDPROC ex_expr::exp_return_type eval(char *op_data[],
+ ex_expr::exp_return_type eval(char *op_data[],
CollHeap * = 0,
ComDiagsArea ** = 0);
// Fixup
//
- NA_EIDPROC Long pack (void *);
+ Long pack (void *);
// Display
//
- NA_EIDPROC void displayContents(Space * space, const char * displayStr,
+ void displayContents(Space * space, const char * displayStr,
Int32 clauseNum, char * constsArea);
// ---------------------------------------------------------------------
// 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_like_clause_base::populateImageVersionIDArray();
}
- NA_EIDPROC virtual short getClassSize() { return (short)sizeof(*this); }
+ virtual short getClassSize() { return (short)sizeof(*this); }
// ---------------------------------------------------------------------
private:
@@ -2768,13 +2758,13 @@ private:
};
-class SQLEXP_LIB_FUNC ex_like_clause_doublebyte: public ex_like_clause_base {
+class ex_like_clause_doublebyte: public ex_like_clause_base {
public:
// Construction
//
- NA_EIDPROC ex_like_clause_doublebyte() {};
- NA_EIDPROC ex_like_clause_doublebyte(OperatorTypeEnum oper_type,
+ ex_like_clause_doublebyte() {};
+ ex_like_clause_doublebyte(OperatorTypeEnum oper_type,
short num_operands,
Attributes ** attr,
Space * space);
@@ -2782,34 +2772,34 @@ public:
// Execution
//
- NA_EIDPROC ex_expr::exp_return_type eval(char *op_data[],
+ ex_expr::exp_return_type eval(char *op_data[],
CollHeap * = 0,
ComDiagsArea ** = 0);
// Fixup
//
- NA_EIDPROC Long pack (void *);
+ Long pack (void *);
// Display
//
- NA_EIDPROC void displayContents(Space * space, const char * displayStr,
+ void displayContents(Space * space, const char * displayStr,
Int32 clauseNum, char * constsArea);
// ---------------------------------------------------------------------
// 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_like_clause_base::populateImageVersionIDArray();
};
- NA_EIDPROC virtual short getClassSize() { return (short)sizeof(*this); };
+ virtual short getClassSize() { return (short)sizeof(*this); };
// ---------------------------------------------------------------------
private:
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/exp/exp_conv.cpp
----------------------------------------------------------------------
diff --git a/core/sql/exp/exp_conv.cpp b/core/sql/exp/exp_conv.cpp
index 8c5d443..d1f131b 100644
--- a/core/sql/exp/exp_conv.cpp
+++ b/core/sql/exp/exp_conv.cpp
@@ -38,14 +38,9 @@
#include "Platform.h"
-
-
-
#include "exp_ieee.h"
-//#ifndef NA_NO_C_RUNTIME
#include <stdlib.h>
#include <errno.h>
-//#endif
#include <math.h>
# define MathPow(op1, op2, err) pow(op1, op2)
@@ -53,13 +48,9 @@
#define MathLog10(op, err) log10(op)
#include <stdlib.h>
-#if defined( NA_SHADOWCALLS )
-#include "sqlclisp.h" //shadow
-#endif
-
#include "exp_stdh.h"
#include "exp_clause_derived.h"
-//#include "exp_tuple_desc.h"
+
#include "float.h"
#include "str.h"
#include "wstr.h"
@@ -70,30 +61,19 @@
#include "exp_datetime.h"
#include "SQLTypeDefs.h"
#include "exp_bignum.h"
-
-
-
#include "fenv.h"
-//#pragma innerlist
-
// forward declarations
-NA_EIDPROC
-//SQ_LINUX #ifdef NA_HSC
static
rec_datetime_field getIntervalStartField(Lng32 datatype);
-NA_EIDPROC
Int64 getMaxDecValue(Lng32 targetLen);
-NA_EIDPROC
Lng32 getDigitCount(UInt64 value);
-NA_EIDPROC
void setVCLength(char * VCLen, Lng32 VCLenSize, ULng32 value);
-NA_EIDPROC
ex_expr::exp_return_type checkPrecision(Int64 source,
Lng32 sourceLen,
short sourceType,
@@ -115,7 +95,6 @@ ex_expr::exp_return_type checkPrecision(Int64 source,
// length calculated by the Ascii function. 6/3/98
//
//////////////////////////////////////////////////////////////////
-NA_EIDPROC
void double_varchar_length(
char * varCharLen, // NULL if not a varChar
Lng32 varCharLenSize // 0 if not a varChar
@@ -185,7 +164,6 @@ static const char* scaleToString(short scale)
// a string of digits to double. jdu 6/10/02
//
//////////////////////////////////////////////////////////////////
-NA_EIDPROC
static Int32 safe_add_digit_to_double(
double dvalue, // Original value
Int32 digit, // Single digit to be added
@@ -220,7 +198,6 @@ static Int32 safe_add_digit_to_double(
// Returns ex_expr::EXPR_ERROR if (a conversion error occurred) and
// (no data conversion error flag is present).
///////////////////////////////////////////////////////////////////
-NA_EIDPROC
ex_expr::exp_return_type convBinToBinScaleMult(
char *target,
short targetType,
@@ -403,7 +380,6 @@ else
// Returns ex_expr::EXPR_ERROR if (a conversion error occurred) and
// (no data conversion error flag is present).
///////////////////////////////////////////////////////////////////
-NA_EIDPROC
ex_expr::exp_return_type convBinToBinScaleDiv(
char *target,
short targetType,
@@ -594,7 +570,6 @@ else
// e.g., caller wants to convert 7 -> 07 as in month -> ascii
// or 8 -> ' 8' as in sqlci display
///////////////////////////////////////////////////////////////////
-NA_EIDPROC
ex_expr::exp_return_type convInt64ToAscii(char *target,
Lng32 targetLen,
Lng32 targetPrecision, // max. characters
@@ -772,7 +747,6 @@ ex_expr::exp_return_type convInt64ToAscii(char *target,
// 1 byte for at least one digit after decimal point
// 5 bytes for exponent (E+DDD)
///////////////////////////////////////////////////////////////////
-NA_EIDPROC
short convFloat64ToAscii(char *target,
Lng32 targetLen,
Lng32 targetPrecision, // max. characters
@@ -974,7 +948,6 @@ short convFloat64ToAscii(char *target,
//////////////////////////////////////////////////////////////////
// function to convert an Int64 to a Big Num
///////////////////////////////////////////////////////////////////
-NA_EIDPROC
ex_expr::exp_return_type convInt64ToBigNum(char *target,
Lng32 targetLen,
Int64 source,
@@ -1000,7 +973,6 @@ ex_expr::exp_return_type convInt64ToBigNum(char *target,
//////////////////////////////////////////////////////////////////
// function to convert a UInt64 to a Big Num
///////////////////////////////////////////////////////////////////
-NA_EIDPROC
ex_expr::exp_return_type convUInt64ToBigNum(char *target,
Lng32 targetLen,
UInt64 source,
@@ -1026,7 +998,7 @@ ex_expr::exp_return_type convUInt64ToBigNum(char *target,
//////////////////////////////////////////////////////////////////
// function to convert BIGNUM to LARGEDEC
///////////////////////////////////////////////////////////////////
-NA_EIDPROC
+
ex_expr::exp_return_type convBigNumToLargeDec(char *target,
Lng32 targetLen,
char *source,
@@ -1068,7 +1040,6 @@ ex_expr::exp_return_type convBigNumToLargeDec(char *target,
// convDoIt sets leftPad to TRUE if callers pass in a
// CONV_UNKNOWN_LEFTPAD to convDoIt.
///////////////////////////////////////////////////////////////////
-NA_EIDPROC
ex_expr::exp_return_type convLargeDecToAscii(char *target,
Lng32 targetLen,
Lng32 targetPrecision, // max chars
@@ -1196,7 +1167,6 @@ ex_expr::exp_return_type convLargeDecToAscii(char *target,
// This function first converts the BIGNUM to an intermediate
// LARGEDEC, then calls the previous function convLargeDecToAscii()
///////////////////////////////////////////////////////////////////
-NA_EIDPROC
ex_expr::exp_return_type convBigNumToAscii(char *target,
Lng32 targetLen,
Lng32 targetPrecision, // max chars
@@ -1265,7 +1235,6 @@ ex_expr::exp_return_type convBigNumToAscii(char *target,
// datetime types and all combinations of conversions.
// ===================================================================
//
-NA_EIDPROC
ex_expr::exp_return_type convDatetimeToAscii(char *target,
Lng32 targetLen,
Lng32 targetPrecision, // tgt length in char or 0
@@ -1370,7 +1339,6 @@ ex_expr::exp_return_type convDatetimeToAscii(char *target,
// IMPORT conversion performance.
// ===================================================================
//
-NA_EIDPROC
ex_expr::exp_return_type convAsciiToDatetime(char *target,
Lng32 targetLen,
REC_DATETIME_CODE code,
@@ -1409,7 +1377,6 @@ ex_expr::exp_return_type convAsciiToDatetime(char *target,
}
// LCOV_EXCL_START
-NA_EIDPROC
ex_expr::exp_return_type convUnicodeToDatetime(char *target,
Lng32 targetLen,
REC_DATETIME_CODE code,
@@ -1473,7 +1440,6 @@ ex_expr::exp_return_type convUnicodeToDatetime(char *target,
// datetime types and all combinations of conversions.
// ===================================================================
//
-NA_EIDPROC
ex_expr::exp_return_type convDatetimeDatetime(char * target,
Lng32 targetLen,
REC_DATETIME_CODE targetCode,
@@ -1558,7 +1524,6 @@ ex_expr::exp_return_type convDatetimeDatetime(char * target,
// The function assumes that source is at least
// sourceLen long. Trailing '\0' is not recongnized
///////////////////////////////////////////////////////////////////
-NA_EIDPROC
ex_expr::exp_return_type convAsciiToFloat64(char * target,
char *source,
Lng32 sourceLen,
@@ -2133,7 +2098,6 @@ ex_expr::exp_return_type convAsciiToInt64(Int64 &target,
// function to convert an Int64 to Decimal
///////////////////////////////////////////////////////////////////
-NA_EIDPROC
ex_expr::exp_return_type convInt64ToDec(char *target,
Lng32 targetLen,
Int64 source,
@@ -2189,7 +2153,6 @@ ex_expr::exp_return_type convInt64ToDec(char *target,
// The function assumes that source is at least
// sourceLen long. Trailing '\0' is not recongnized
///////////////////////////////////////////////////////////////////
-NA_EIDPROC
ex_expr::exp_return_type convAsciiToDec(char *target,
Lng32 targetType,
Lng32 targetLen,
@@ -2390,7 +2353,6 @@ ex_expr::exp_return_type convAsciiToDec(char *target,
///////////////////////////////////////////////////////////////////
// function to convert a DOUBLE to BIGNUM.
///////////////////////////////////////////////////////////////////
-NA_EIDPROC
ex_expr::exp_return_type convDoubleToBigNum(char *target,
Lng32 targetLen,
Lng32 targetType,
@@ -2427,7 +2389,6 @@ ex_expr::exp_return_type convDoubleToBigNum(char *target,
// First convert from ASCII to LARGEDEC, then convert from LARGEDEC
// to BIGNUM
///////////////////////////////////////////////////////////////////
-NA_EIDPROC
ex_expr::exp_return_type convAsciiToBigNum(char *target,
Lng32 targetLen,
Lng32 targetType,
@@ -2565,7 +2526,6 @@ static rec_datetime_field getIntervalStartField(Lng32 datatype)
return REC_DATE_YEAR;
}
-NA_EIDPROC
static rec_datetime_field getIntervalEndField(Lng32 datatype)
{
switch (datatype) {
@@ -2597,7 +2557,6 @@ static rec_datetime_field getIntervalEndField(Lng32 datatype)
// This function is used for ASCII to INTERVAL conversions only.
// Blanks and sign are already removed.
///////////////////////////////////////////////////////////////////
-NA_EIDPROC
ex_expr::exp_return_type convAsciiFieldToInt64(Int64 &target,
Lng32 targetScale,
char *source,
@@ -2651,7 +2610,6 @@ ex_expr::exp_return_type convAsciiFieldToInt64(Int64 &target,
///////////////////////////////////////////////////////////////////
// function to convert an ASCII string to an interval datatype.
///////////////////////////////////////////////////////////////////
-NA_EIDPROC
ex_expr::exp_return_type convAsciiToInterval(char *target,
Lng32 targetLen,
Lng32 targetDatatype,
@@ -2892,7 +2850,6 @@ ex_expr::exp_return_type convAsciiToInterval(char *target,
///////////////////////////////////////////////////////////////////
// function to convert a INTERVAL to a string.
///////////////////////////////////////////////////////////////////
-NA_EIDPROC
ex_expr::exp_return_type convIntervalToAscii(char *source,
Lng32 sourceLen,
Lng32 leadingPrecision,
@@ -3141,7 +3098,6 @@ ex_expr::exp_return_type convIntervalToAscii(char *source,
///////////////////////////////////////////////////////////////////
// function to convert a BIGNUM to Int64
///////////////////////////////////////////////////////////////////
-NA_EIDPROC
ex_expr::exp_return_type convBigNumToInt64(Int64 *target,
char *source,
Lng32 sourceLen,
@@ -3200,7 +3156,6 @@ ex_expr::exp_return_type convBigNumToUInt64(UInt64 *target,
// or minimum value is returned.
///////////////////////////////////////////////////////////////////
-NA_EIDPROC
ex_conv_clause::ConvResult convBigNumToInt64AndScale(Int64 *target,
char *source,
Lng32 sourceLen,
@@ -3239,8 +3194,6 @@ ex_conv_clause::ConvResult convBigNumToInt64AndScale(Int64 *target,
// with scaling -- returns a return code indicating whether
// the result is equal to the original or if rounding occurred
///////////////////////////////////////////////////////////////////
-NA_EIDPROC
-SQLEXP_LIB_FUNC
ex_conv_clause::ConvResult convLargeDecToDecAndScale(char *target,
Lng32 targetLen,
char *source,
@@ -3351,8 +3304,6 @@ ex_conv_clause::ConvResult convLargeDecToDecAndScale(char *target,
// We first convert from BIGNUM to LARGEDEC, then convert from LARGEDEC
// to DEC and scale
///////////////////////////////////////////////////////////////////
-NA_EIDPROC
-SQLEXP_LIB_FUNC
ex_conv_clause::ConvResult convBigNumToDecAndScale(char *target,
Lng32 targetLen,
char *source,
@@ -3387,7 +3338,6 @@ ex_conv_clause::ConvResult convBigNumToDecAndScale(char *target,
///////////////////////////////////////////////////////////////////
// function to convert a BIGNUM to BIGNUM
///////////////////////////////////////////////////////////////////
-NA_EIDPROC
ex_expr::exp_return_type convBigNumToBigNum(char *target,
Lng32 targetLen,
Lng32 targetType,
@@ -3486,7 +3436,6 @@ ex_expr::exp_return_type convBigNumToBigNum(char *target,
// function to convert Decimal to Int64
///////////////////////////////////////////////////////////////////
-NA_EIDPROC
ex_expr::exp_return_type convDecToInt64(Int64 &target,
char *source,
Lng32 sourceLen,
@@ -3544,7 +3493,6 @@ ex_expr::exp_return_type convDecToInt64(Int64 &target,
// function to convert Decimal to Decimal
///////////////////////////////////////////////////////////////////
// LCOV_EXCL_START
-NA_EIDPROC
ex_expr::exp_return_type convDecToDec(char *target,
Lng32 targetLen,
char *source,
@@ -3589,7 +3537,6 @@ ex_expr::exp_return_type convDecToDec(char *target,
//////////////////////////////////////////////////////////////////
// function to convert DecimalLS to ASCII
///////////////////////////////////////////////////////////////////
-NA_EIDPROC
ex_expr::exp_return_type convDecLStoAscii(char *target,
Lng32 targetLen,
Lng32 targetPrecision, // num chars in tgt
@@ -3717,7 +3664,6 @@ ex_expr::exp_return_type convDecLStoAscii(char *target,
// REC_DECIMAL_LSE (152).
///////////////////////////////////////////////////////////////////
-NA_EIDPROC
Int64 getMinDecValue(Lng32 targetLen,
short targetType)
{
@@ -3732,7 +3678,6 @@ Int64 getMinDecValue(Lng32 targetLen,
-9999999,
-99999999,
-999999999,
-//SQ_LINUX #ifndef NA_HSC
-9999999999LL,
-99999999999LL,
-999999999999LL,
@@ -3764,7 +3709,6 @@ Int64 getMinDecValue(Lng32 targetLen,
// - MARIA - 11/06/98
///////////////////////////////////////////////////////////////////
-NA_EIDPROC
Int64 getMinIntervalValue(Lng32 targetPrecision,
short targetType) {
@@ -3778,7 +3722,6 @@ Int64 getMinIntervalValue(Lng32 targetPrecision,
// so where a target type and precision would demand a value
// smaller than this, we use this minimum instead.
-//SQ_LINUX #ifndef NA_HSC
static const Int64 MinValue[][19] =
{
{0, -9, -99, -999, -9999, -99999, -999999, -9999999, -99999999,
@@ -3886,7 +3829,6 @@ Int64 getMinIntervalValue(Lng32 targetPrecision,
// The function assumes that targetLen is 1 to 19, inclusive.
///////////////////////////////////////////////////////////////////
-NA_EIDPROC
Lng32 getDigitCount(UInt64 value)
{
static const UInt64 decValue[] = {0,
@@ -3936,7 +3878,6 @@ Lng32 getDigitCount(UInt64 value)
// The function assumes that targetLen is 0 to 18, inclusive.
///////////////////////////////////////////////////////////////////
-NA_EIDPROC
Int64 getMaxDecValue(Lng32 targetLen)
{
static const Int64 decValue[] = {0,
@@ -3949,7 +3890,6 @@ Int64 getMaxDecValue(Lng32 targetLen)
9999999,
99999999,
999999999,
-//SQ_LINUX #ifndef NA_HSC
9999999999LL,
99999999999LL,
999999999999LL,
@@ -3973,7 +3913,6 @@ Int64 getMaxDecValue(Lng32 targetLen)
///////////////////////////////////////////////////////////////////
-NA_EIDPROC
Int64 getMaxIntervalValue(Lng32 targetPrecision,
short targetType) {
targetType -= REC_MIN_INTERVAL; //REC_MIN_INTERVAL should be 195
@@ -3984,7 +3923,6 @@ Int64 getMaxIntervalValue(Lng32 targetPrecision,
// so where a target type and precision would demand a value
// larger than this, we use this maximum instead.
-//SQ_LINUX #ifndef NA_HSC
static const Int64 MaxValue[][19] =
{
{0, 9, 99, 999, 9999, 99999, 999999, 9999999, 99999999,
@@ -4086,7 +4024,6 @@ Int64 getMaxIntervalValue(Lng32 targetPrecision,
// NUMERIC(m) NUMERIC(n), where m > n
// FLOAT NUMERIC(n)
//////////////////////////////////////////////////////////////////////
-NA_EIDPROC
ex_expr::exp_return_type checkPrecision(Int64 source,
Lng32 sourceLen,
short sourceType,
@@ -4268,7 +4205,6 @@ ex_expr::exp_return_type checkPrecision(Int64 source,
// REC_DECIMAL_LSE (152).
///////////////////////////////////////////////////////////////////
-NA_EIDPROC
void setMinDecValue(char *target,
Lng32 targetLen,
short targetType)
@@ -4297,7 +4233,6 @@ void setMinDecValue(char *target,
// decimal type specified by the arguement.
///////////////////////////////////////////////////////////////////
-NA_EIDPROC
void setMaxDecValue(char *target,
Lng32 targetLen)
{
@@ -4314,7 +4249,6 @@ void setMaxDecValue(char *target,
// int64 to decimal.
///////////////////////////////////////////////////////////////////
-NA_EIDPROC
ex_expr::exp_return_type convExactToDec(char *target,
Lng32 targetLen,
short targetType,
@@ -4381,7 +4315,6 @@ ex_expr::exp_return_type convExactToDec(char *target,
///////////////////////////////////////////////
// find the first non blank character
///////////////////////////////////////////////
-NA_EIDPROC
char * str_find_first_nonblank(char *s, Lng32 len) {
for (Lng32 i = 0; i < len; i++)
if (s[i] != ' ')
@@ -4392,7 +4325,6 @@ char * str_find_first_nonblank(char *s, Lng32 len) {
///////////////////////////////////////////////
// find the first non blank wide character
///////////////////////////////////////////////
-NA_EIDPROC
NAWchar * wc_str_find_first_nonblank(NAWchar *s, Lng32 len) {
for (Lng32 i = 0; i < len; i++)
if (s[i] != unicode_char_set::space_char())
@@ -4405,7 +4337,6 @@ NAWchar * wc_str_find_first_nonblank(NAWchar *s, Lng32 len) {
// find the first non zero(character 0) character
////////////////////////////////////////////////
// LCOV_EXCL_START
-NA_EIDPROC
char* str_find_first_nonzero(char* s, Lng32 len) {
for (Lng32 i = 0; i< len; i++)
if (s[i] != '0')
@@ -4414,7 +4345,6 @@ char* str_find_first_nonzero(char* s, Lng32 len) {
}
// LCOV_EXCL_STOP
-NA_EIDPROC
void setVCLength(char * VCLen, Lng32 VCLenSize, ULng32 value) {
if (VCLenSize == sizeof(short)) {
assert(value <= USHRT_MAX);
@@ -4437,7 +4367,6 @@ typedef charBuf* (*unicodeToChar_FP)(
///////////////////////////////////////////////
// Unicode to single byte string
///////////////////////////////////////////////
-NA_EIDPROC
ex_expr::exp_return_type
unicodeToSByteTarget(
unicodeToChar_FP conv_func, // convert function pointer
@@ -4518,7 +4447,6 @@ unicodeToSByteTarget(
///////////////////////////////////////////////
// Unicode to multiple byte string
///////////////////////////////////////////////
-NA_EIDPROC
ex_expr::exp_return_type
unicodeToMByteTarget(
unicodeToChar_FP conv_func, // conversion function pointer
@@ -4616,7 +4544,6 @@ unicodeToMByteTarget(
// we ever support that). It does handle things like ISO8859-1 to UTF-8
// and UTF-8 to UTF-8.
-NA_EIDPROC
ex_expr::exp_return_type convCharToChar(
char *source,
Lng32 sourceLen,
@@ -4992,7 +4919,6 @@ ex_expr::exp_return_type convCharToChar(
#pragma warning (disable : 4101) //warning elimination
-NA_EIDPROC SQLEXP_LIB_FUNC
ex_expr::exp_return_type
convDoIt(char * source,
Lng32 sourceLen,
@@ -11962,8 +11888,6 @@ ex_expr::exp_return_type ex_conv_clause::processNulls(char *op_data[],
////////////////////////////////////////////////////////////////////////
// up- or downscale an exact numeric.
////////////////////////////////////////////////////////////////////////
-NA_EIDPROC
-SQLEXP_LIB_FUNC
ex_expr::exp_return_type scaleDoIt(char *operand,
Lng32 operandLen,
Lng32 operandType,
@@ -12211,8 +12135,6 @@ ex_expr::exp_return_type scaleDoIt(char *operand,
// LCOV_EXCL_START
-NA_EIDPROC
-SQLEXP_LIB_FUNC
ex_expr::exp_return_type swapBytes(Attributes *attr,
void *ptr)
{
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/exp/exp_datetime.cpp
----------------------------------------------------------------------
diff --git a/core/sql/exp/exp_datetime.cpp b/core/sql/exp/exp_datetime.cpp
index 4c90ef6..0d3f55e 100644
--- a/core/sql/exp/exp_datetime.cpp
+++ b/core/sql/exp/exp_datetime.cpp
@@ -1221,7 +1221,6 @@ short ExpDatetime::subDatetimeDatetime(Attributes *datetimeOpType,
// project.
// ===================================================================
//
-NA_EIDPROC
static Lng32
scaleFraction(Int32 srcFractPrec,
Lng32 srcFraction,
@@ -1371,7 +1370,6 @@ ExpDatetime::currentTimeStamp(char *dstData,
// project.
// =====================================================================
//
-NA_EIDPROC
static Lng32
sizeofDatetimeFields(rec_datetime_field startField,
rec_datetime_field endField,
@@ -1411,7 +1409,6 @@ sizeofDatetimeFields(rec_datetime_field startField,
// project.
// =====================================================================
//
-NA_EIDPROC
static short
copyDatetimeFields(rec_datetime_field startField,
rec_datetime_field endField,
@@ -1474,7 +1471,6 @@ copyDatetimeFields(rec_datetime_field startField,
// project.
// =====================================================================
//
-NA_EIDPROC
static short
minimumTimeStamp(char *dstData,
rec_datetime_field dstStartField,
@@ -1686,7 +1682,6 @@ ExpDatetime::extractDatetime(rec_datetime_field srcStartField,
// project.
// =====================================================================
//
-NA_EIDPROC
static
ExpDatetime::DatetimeFormats
determineFormat(char *src,
@@ -1778,7 +1773,6 @@ determineFormat(char *src,
// project.
// =====================================================================
//
-NA_EIDPROC
static
NABoolean
containsField(rec_datetime_field field,
@@ -1843,7 +1837,6 @@ containsField(rec_datetime_field field,
// project.
// =====================================================================
//
-NA_EIDPROC
static
NABoolean
scanField(char *&src,
@@ -3102,7 +3095,6 @@ ExpDatetime::convAsciiToDate(char *srcData,
// project.
// =====================================================================
//
-NA_EIDPROC
static void
convertToAscii(Lng32 value, char *&result, UInt32 width)
{
@@ -3127,7 +3119,6 @@ convertToAscii(Lng32 value, char *&result, UInt32 width)
result += width;
}
-NA_EIDPROC
static void
convertMonthToStr(Lng32 value, char *&result, UInt32 width)
{
@@ -3817,8 +3808,6 @@ short ExpDatetime::convAsciiDatetimeToASCII(char *srcData,
}
-#ifndef __EID
-
// getFieldName() ====================================================
// This static helper function of the ExpDatetime class returns the
// string (char *) value of the given datetime field. For example, if
@@ -3869,7 +3858,6 @@ getFieldName(rec_datetime_field field)
//
// This method is only called from the generator
// (ExpGenerator::addDefaultValue() in generator/GenExpGenerator.cpp)
-// thus the #ifndef __EID above.
//
// This method was added as part of the MP Datetime Compatibility
// project.
@@ -3973,6 +3961,3 @@ ExpDatetime::getDefaultStringValue(CollHeap *heap)
return ptr;
}
-
-
-#endif
[10/30] incubator-trafodion git commit: TRAFODION-2731 CodeCleanup:
Remove obsolete, legacy and unused code
Posted by an...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/exp/exp_attrs.cpp
----------------------------------------------------------------------
diff --git a/core/sql/exp/exp_attrs.cpp b/core/sql/exp/exp_attrs.cpp
index 9e05929..a1f3c88 100644
--- a/core/sql/exp/exp_attrs.cpp
+++ b/core/sql/exp/exp_attrs.cpp
@@ -40,12 +40,6 @@
#include "exp_stdh.h"
-// #ifndef __EID
-// #include <stdio.h>
-// #include <stdlib.h>
-// #endif
-//
-// #include "ComPackDefs.h"
#include "exp_attrs.h"
#include "exp_clause_derived.h"
#include "exp_bignum.h"
@@ -78,7 +72,7 @@ void SimpleType::copyAttrs(Attributes *source_) // copy source attrs to this.
*this = *(SimpleType *)source_;
}
-NA_EIDPROC Attributes::Attributes(short complex_type) :
+Attributes::Attributes(short complex_type) :
NAVersionedObject(AttribAnchorID)
{
datatype_ = -1;
@@ -129,7 +123,7 @@ NA_EIDPROC Attributes::Attributes(short complex_type) :
// This method returns the virtual function table pointer for an object
// with the given class ID; used by NAVersionedObject::driveUnpack().
// -----------------------------------------------------------------------
-NA_EIDPROC char *Attributes::findVTblPtr(short classID)
+char *Attributes::findVTblPtr(short classID)
{
char *vtblPtr;
switch (classID)
@@ -159,14 +153,14 @@ NA_EIDPROC char *Attributes::findVTblPtr(short classID)
return vtblPtr;
}
-NA_EIDPROC Long Attributes::pack(void * space)
+Long Attributes::pack(void * space)
{
defaultValue_.pack(space);
return NAVersionedObject::pack(space);
}
-NA_EIDPROC Lng32 Attributes::unpack(void * base, void * reallocator)
+Lng32 Attributes::unpack(void * base, void * reallocator)
{
if (defaultValue_.unpack(base)) return -1;
return NAVersionedObject::unpack(base, reallocator);
@@ -212,7 +206,6 @@ void Attributes::fixup(Space * /*space*/,
}
-NA_EIDPROC SQLEXP_LIB_FUNC
char * getDatatypeAsString(Int32 datatype, NABoolean extFormat = false )
{
switch (datatype)
@@ -240,15 +233,9 @@ switch (datatype)
case REC_NUM_BIG_SIGNED: return extFormat? (char *)"NUMERIC":(char *)"REC_NUM_BIG_SIGNED";
case REC_BYTE_F_ASCII: return extFormat? (char *)"CHAR":(char *)"REC_BYTE_F_ASCII";
-#ifdef READTABLEDEF_IMPLEMENTATION
- case REC_BYTE_F_ASCII_UP: return extFormat? (char *)"CHAR UPSHIFT":(char *)"REC_BYTE_F_ASCII_UP";
-#endif
case REC_NCHAR_F_UNICODE: return extFormat? (char *)"NCHAR":(char *)"REC_NCHAR_F_UNICODE";
case REC_BYTE_V_ASCII: return extFormat? (char *)"VARCHAR":(char *)"REC_BYTE_V_ASCII";
-#ifdef READTABLEDEF_IMPLEMENTATION
- case REC_BYTE_V_ASCII_UP: return extFormat? (char *)"VARCHAR UPSHIFT":(char *)"REC_BYTE_V_ASCII_UP";
-#endif
case REC_NCHAR_V_UNICODE: return extFormat? (char *)"NCHAR VARYING":(char *)"REC_NCHAR_V_UNICODE";
case REC_BYTE_V_ASCII_LONG: return extFormat? (char *)"VARCHAR":(char *)"REC_BYTE_V_ASCII_LONG";
@@ -327,7 +314,6 @@ Attributes * ShowplanAttributes::newCopy(CollHeap * heap)
void Attributes::displayContents(Space * space, Int32 operandNum,
char * constsArea, Attributes * spAttr)
{
-#ifndef __EID
char buf[250];
char r[15];
@@ -466,7 +452,6 @@ void Attributes::displayContents(Space * space, Int32 operandNum,
((ShowplanAttributes *)spAttr)->text() : ""));
space->allocateAndCopyToAlignedSpace(buf, str_len(buf), sizeof(short));
}
-#endif // __EID
}
ExpDatetime *
@@ -549,27 +534,27 @@ NABoolean ComplexType::operator==(const Attributes& other) const
return FALSE;
}
-NA_EIDPROC NABoolean isAddedColumn(Attributes * srcAttr,
- NABoolean tableHasAddedColumns,
- NABoolean tableHasVariableColumns,
- ULng32 offsetOfFirstFixedFieldInRec,
- ULng32 recordLength,
- char * recordPtr
- )
+NABoolean isAddedColumn(Attributes * srcAttr,
+ NABoolean tableHasAddedColumns,
+ NABoolean tableHasVariableColumns,
+ ULng32 offsetOfFirstFixedFieldInRec,
+ ULng32 recordLength,
+ char * recordPtr
+ )
{
// Check if this is an added column.
// There are 4 cases to check for:
// (1) The column is a variable column and the offset to the first
- // fixed field in the audit row image is greater than the offset
+ // fixed field is greater than the offset
// to VOA entry for this column.
// (2) This is a fixed column and its offset is greater than the
- // length of the audit image passed in, and there are no varchar
- // columns in the audit row image.
+ // length of the row in, and there are no varchar
+ // columns in the roq
// (3) This is a fixed column and its offset is greater than
// the offset for the first variable length column in the audit
// row image.
// (4) This is a fixed column, but there are no previous fixed fields
- // in the audit row image.
+ // in the row
if (((srcAttr->isAddedCol()) || (tableHasAddedColumns)) &&
(((srcAttr->getVCIndicatorLength() > 0) &&
(srcAttr->getVoaOffset() >= offsetOfFirstFixedFieldInRec)) ||
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/exp/exp_attrs.h
----------------------------------------------------------------------
diff --git a/core/sql/exp/exp_attrs.h b/core/sql/exp/exp_attrs.h
index 5d5a0cf..2f1c9df 100644
--- a/core/sql/exp/exp_attrs.h
+++ b/core/sql/exp/exp_attrs.h
@@ -87,7 +87,7 @@ class ExpDatetime;
#pragma warning ( disable : 4251 )
#pragma nowarn(1506) // warning elimination
-class SQLEXP_LIB_FUNC Attributes : public NAVersionedObject
+class Attributes : public NAVersionedObject
{
public:
@@ -683,7 +683,7 @@ inline Int32 Attributes::isNotAlwaysAligned()
// Operations on these are supported by underlying hardware
// and thus are performed as a 'fastpath'.
///////////////////////////////////////////////////////////////
-class SQLEXP_LIB_FUNC SimpleType : public Attributes
+class SimpleType : public Attributes
{
public:
@@ -875,7 +875,7 @@ private:
// classes derived from ComplexType.
//
/////////////////////////////////////////////////////////////
-class SQLEXP_LIB_FUNC ComplexType : public Attributes
+class ComplexType : public Attributes
{
public:
@@ -1011,7 +1011,7 @@ private:
char fillers_[22]; // 02-23
};
-class SQLEXP_LIB_FUNC ShowplanAttributes : public Attributes
+class ShowplanAttributes : public Attributes
{
public:
ShowplanAttributes(Int32 valueId, char * text);
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/exp/exp_bignum.cpp
----------------------------------------------------------------------
diff --git a/core/sql/exp/exp_bignum.cpp b/core/sql/exp/exp_bignum.cpp
index 64ffa6e..14187e5 100644
--- a/core/sql/exp/exp_bignum.cpp
+++ b/core/sql/exp/exp_bignum.cpp
@@ -46,21 +46,9 @@
#include "SQLTypeDefs.h"
#include "exp_clause_derived.h"
-#if (!defined (__TANDEM) && !defined(__EID))
#include <iostream>
-#endif
#include <stdlib.h>
-#if !defined( NA_NSK) && defined( NA_IX86 )
-
-#if defined( NA_MSVC )
-# include <limits.h>
-#endif
-
-#pragma warning( default : 4035 )
-
-#endif
-
#pragma warning (disable : 4273) //warning elimination
BigNum::BigNum(Lng32 length, Lng32 precision, short scale, short unSigned)
: length_(length),
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/exp/exp_bignum.h
----------------------------------------------------------------------
diff --git a/core/sql/exp/exp_bignum.h b/core/sql/exp/exp_bignum.h
index ced6d90..409f998 100644
--- a/core/sql/exp/exp_bignum.h
+++ b/core/sql/exp/exp_bignum.h
@@ -43,7 +43,7 @@
#pragma warning ( disable : 4251 )
-class SQLEXP_LIB_FUNC BigNum : public ComplexType {
+class BigNum : public ComplexType {
Int32 length_; // 00-03
Int32 precision_; // 04-07
@@ -63,118 +63,89 @@ class SQLEXP_LIB_FUNC BigNum : public ComplexType {
char fillers_[4]; // 20-23
// Temporary space starting point at runtime
-#ifdef NA_64BIT
ULong tempSpacePtr_; // 24-31 //Put on 8-byte boundary
-#else
- Int32 tempSpacePtr_; // 24-27
- char fillers_b[4]; // 28-31
-#endif
public:
-NA_EIDPROC
BigNum(Lng32 length, Lng32 precision, short scale, short unSigned);
-NA_EIDPROC
BigNum();
-NA_EIDPROC
~BigNum();
-NA_EIDPROC
void init(char * op_data, char * str);
-NA_EIDPROC
short add (Attributes * left,
Attributes * right,
char * op_data[]);
-NA_EIDPROC
short sub (Attributes * left,
Attributes * right,
char * op_data[]);
-NA_EIDPROC
short mul (Attributes * left,
Attributes * right,
char * op_data[]);
-NA_EIDPROC
short div (Attributes * left,
Attributes * right,
char * op_data[],
NAMemory *heap,
ComDiagsArea** diagsArea);
-NA_EIDPROC
short conv (Attributes * source,
char * op_data[]);
-NA_EIDPROC
short comp (OperatorTypeEnum compOp,
Attributes * other,
char * op_data[]);
-NA_EIDPROC
short castFrom (Attributes * source /*source*/,
char * op_data[],
NAMemory *heap,
ComDiagsArea** diagsArea);
// if desc <> 0, then this is a descending key.
-NA_EIDPROC
void encode(const char * inBuf, char * outBuf, short desc = 0);
-NA_EIDPROC
void decode(const char * inBuf, char * outBuf, short desc = 0);
-NA_EIDPROC
Lng32 getDisplayLength()
{
return precision_ + (scale_ > 0 ? 2 : 1);
};
-NA_EIDPROC
Lng32 getPrecision(){return precision_;};
-NA_EIDPROC
+
void setLength(Int32 length)
{length_ = length;}
-NA_EIDPROC
Lng32 getLength() {return length_;};
-NA_EIDPROC
short getScale() {return scale_;};
-NA_EIDPROC
short isUnsigned() {return unSigned_;};
-NA_EIDPROC
Lng32 getStorageLength()
{
return length_ + (getNullFlag() ? getNullIndicatorLength() : 0);
};
-NA_EIDPROC
Lng32 getDefaultValueStorageLength()
{
return length_ + (getNullFlag() ? ExpTupleDesc::NULL_INDICATOR_LENGTH : 0);
};
-NA_EIDPROC
Attributes * newCopy();
-NA_EIDPROC
Attributes * newCopy(NAMemory *);
-NA_EIDPROC
void copyAttrs(Attributes * source);
-NA_EIDPROC
Lng32 setTempSpaceInfo(OperatorTypeEnum operType,
ULong offset, Lng32 length = 0);
-NA_EIDPROC
+
void fixup(Space * space,
char * constantsArea,
char * tempsArea,
@@ -185,37 +156,31 @@ NA_EIDPROC
// ---------------------------------------------------------------------
// 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());
ComplexType::populateImageVersionIDArray();
};
-NA_EIDPROC virtual short getClassSize() { return (short) sizeof(*this); };
+virtual short getClassSize() { return (short) sizeof(*this); };
// ---------------------------------------------------------------------
};
-NA_EIDPROC
-SQLEXP_LIB_FUNC
short EXP_FIXED_BIGN_OV_MUL(Attributes * op1,
Attributes * op2,
char * op_data[]);
-NA_EIDPROC
-SQLEXP_LIB_FUNC
short EXP_FIXED_BIGN_OV_DIV(Attributes * op1,
Attributes * op2,
char * op_data[]);
-NA_EIDPROC
-SQLEXP_LIB_FUNC
Int64 EXP_FIXED_BIGN_OV_MOD(Attributes * op1,
Attributes * op2,
char * op_data[],
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/exp/exp_clause.cpp
----------------------------------------------------------------------
diff --git a/core/sql/exp/exp_clause.cpp b/core/sql/exp/exp_clause.cpp
index 3f71a54..8050450 100644
--- a/core/sql/exp/exp_clause.cpp
+++ b/core/sql/exp/exp_clause.cpp
@@ -39,10 +39,8 @@
#include "Platform.h"
-#ifndef __EID
#include <stdio.h>
#include <stdlib.h>
-#endif
#include "exp_stdh.h"
#include "exp_clause_derived.h"
@@ -59,7 +57,6 @@
///////////////////////////////////////////////////////////
// class ex_clause
///////////////////////////////////////////////////////////
-NA_EIDPROC
void ex_clause::copyOperands(ex_clause* clause, Space* space)
{
NABoolean showplan = (clause->getOperand() ?
@@ -160,7 +157,7 @@ void ex_clause::copyOperands(ex_clause* clause, Space* space)
}
}
-NA_EIDPROC
+
ex_clause::ex_clause(clause_type type,
OperatorTypeEnum oper_type,
short num_operands,
@@ -421,9 +418,6 @@ ex_clause::ex_clause(clause_type type,
case ITM_RANGE_LOOKUP:
setClassID(FUNC_RANGE_LOOKUP_ID);
break;
- case ITM_AUDIT_IMAGE:
- setClassID(FUNC_AUDIT_ROW_IMAGE);
- break;
case ITM_OFFSET:
setClassID(FUNC_OFFSET_ID);
break;
@@ -499,13 +493,9 @@ ex_clause::ex_clause(clause_type type,
case ITM_NVL:
setClassID(FUNC_NVL);
break;
- case ITM_JSONOBJECTFIELDTEXT:
+ case ITM_JSONOBJECTFIELDTEXT:
setClassID(FUNC_JSON_ID);
break;
-
- case ITM_EXTRACT_COLUMNS:
- setClassID(FUNC_EXTRACT_COLUMNS);
- break;
case ITM_QUERYID_EXTRACT:
setClassID(FUNC_QUERYID_EXTRACT);
break;
@@ -667,7 +657,7 @@ ex_clause::ex_clause(clause_type type,
};
-NA_EIDPROC ex_clause::~ex_clause()
+ex_clause::~ex_clause()
{
}
@@ -676,7 +666,7 @@ NA_EIDPROC ex_clause::~ex_clause()
// with the given class ID; used by NAVersionedObject::driveUnpack().
// -----------------------------------------------------------------------
#pragma nowarn(1506) // warning elimination
-NA_EIDPROC char *ex_clause::findVTblPtr(short classID)
+char *ex_clause::findVTblPtr(short classID)
{
char *vtblPtr;
switch (classID)
@@ -898,9 +888,6 @@ NA_EIDPROC char *ex_clause::findVTblPtr(short classID)
case ex_clause::FUNC_RANGE_LOOKUP_ID:
GetVTblPtr(vtblPtr, ExFunctionRangeLookup);
break;
- case ex_clause::FUNC_AUDIT_ROW_IMAGE:
- GetVTblPtr(vtblPtr, ExAuditImage);
- break;
case ex_clause::FUNC_OFFSET_ID:
GetVTblPtr(vtblPtr, ExpSequenceFunction);
break;
@@ -961,9 +948,6 @@ NA_EIDPROC char *ex_clause::findVTblPtr(short classID)
case ex_clause::FUNC_JSON_ID:
GetVTblPtr(vtblPtr, ex_function_json_object_field_text);
break;
- case ex_clause::FUNC_EXTRACT_COLUMNS:
- GetVTblPtr(vtblPtr, ExFunctionExtractColumns);
- break;
case ex_clause::FUNC_QUERYID_EXTRACT:
GetVTblPtr(vtblPtr, ex_function_queryid_extract);
break;
@@ -1115,7 +1099,7 @@ ex_expr::exp_return_type ex_clause::processNulls(char *null_data[],
return ex_expr::EXPR_OK;
}
-NA_EIDPROC Long ex_clause::packClause(void * space, Lng32 /*size*/)
+Long ex_clause::packClause(void * space, Lng32 /*size*/)
{
if (op_) {
if (op_[0]->showplan()) {
@@ -1129,12 +1113,12 @@ NA_EIDPROC Long ex_clause::packClause(void * space, Lng32 /*size*/)
return NAVersionedObject::pack(space);
}
-NA_EIDPROC Long ex_clause::pack(void * space)
+Long ex_clause::pack(void * space)
{
return packClause(space, sizeof(ex_clause));
}
-NA_EIDPROC Lng32 ex_clause::unpackClause(void *base, void * reallocator)
+Lng32 ex_clause::unpackClause(void *base, void * reallocator)
{
if (op_) {
if (op_.unpackShallow(base)) return -1;
@@ -1150,12 +1134,12 @@ NA_EIDPROC Lng32 ex_clause::unpackClause(void *base, void * reallocator)
return NAVersionedObject::unpack(base, reallocator);
}
-NA_EIDPROC Lng32 ex_clause::unpack(void *base, void * reallocator)
+Lng32 ex_clause::unpack(void *base, void * reallocator)
{
return unpackClause(base, reallocator);
}
-NA_EIDPROC const char * getOperTypeEnumAsString(Int16 /*OperatorTypeEnum*/ ote)
+const char * getOperTypeEnumAsString(Int16 /*OperatorTypeEnum*/ ote)
{
switch (ote)
{
@@ -1444,8 +1428,6 @@ NA_EIDPROC const char * getOperTypeEnumAsString(Int16 /*OperatorTypeEnum*/ ote)
case ITM_PAGROUP: return "ITM_PAGROUP";
// LCOV_EXCL_STOP
case ITM_HASH2_DISTRIB: return "ITM_HASH2_DISTRIB";
- // LCOV_EXCL_START
- case ITM_EXTRACT_COLUMNS: return "ITM_EXTRACT_COLUMNS";
case ITM_HEADER: return "ITM_HEADER";
@@ -1551,7 +1533,6 @@ NA_EIDPROC const char * getOperTypeEnumAsString(Int16 /*OperatorTypeEnum*/ ote)
case ITM_SET_TRANS_MULTI_COMMIT: return "ITM_SET_TRANS_MULTI_COMMIT";
case ITM_LAST_ITEM_OP: return "ITM_LAST_ITEM_OP";
- case ITM_AUDIT_IMAGE: return "ITM_AUDIT_IMAGE";
case ITM_UNIQUE_ID: return "ITM_UNIQUE_ID";
case ITM_ROWNUM: return "ITM_ROWNUM";
case ITM_HBASE_COLUMN_LOOKUP: return "ITM_HBASE_COLUMN_LOOKUP";
@@ -1568,16 +1549,14 @@ NA_EIDPROC const char * getOperTypeEnumAsString(Int16 /*OperatorTypeEnum*/ ote)
// when adding new types
default:
{
-#ifndef __EID
cout << "OperatorType must be added to getOperTypeEnumAsString()"
<< ote << endl;
-#endif // __EID
return "Add To getOperTypeEnumAsString()";
}
}
}
-NA_EIDPROC char * exClauseGetText(OperatorTypeEnum ote)
+char * exClauseGetText(OperatorTypeEnum ote)
{
char * itmText = (char *)getOperTypeEnumAsString(ote);
@@ -1657,10 +1636,8 @@ void ex_clause::displayContents(Space * space, const char * displayStr,
(showplan
? getOperand(i+numOperands_)
: NULL));
- #ifndef __EID
str_sprintf(buf, "\n");
space->allocateAndCopyToAlignedSpace(buf, str_len(buf), sizeof(short));
- #endif
#pragma warn(1506) // warning elimination
}
}
@@ -1936,7 +1913,6 @@ void ex_arith_clause::displayContents(Space * space, const char * /*displayStr*/
{
setInstruction();
-#ifndef __EID
char buf[100];
str_sprintf(buf, " Clause #%d: ex_arith_clause", clauseNum);
space->allocateAndCopyToAlignedSpace(buf, str_len(buf), sizeof(short));
@@ -1948,8 +1924,6 @@ void ex_arith_clause::displayContents(Space * space, const char * /*displayStr*/
space->allocateAndCopyToAlignedSpace(buf, str_len(buf), sizeof(short));
}
-#endif
-
ex_clause::displayContents(space, (const char *)NULL, clauseNum, constsArea, 0,
ex_arith_clause::getInstruction(getInstrArrayIndex()),
ex_arith_clause::getInstructionStr(getInstrArrayIndex()));
@@ -1983,7 +1957,6 @@ void bool_result_clause::displayContents(Space * space, const char * /*displaySt
void ex_branch_clause::displayContents(Space * space, const char * /*displayStr*/, Int32 clauseNum, char * constsArea)
{
-#ifndef __EID
char buf[100];
str_sprintf(buf, " Clause #%d: ex_branch_clause", clauseNum);
space->allocateAndCopyToAlignedSpace(buf, str_len(buf), sizeof(short));
@@ -2009,8 +1982,6 @@ void ex_branch_clause::displayContents(Space * space, const char * /*displayStr*
str_sprintf(buf, " branch to = #%d ",branch_clause->clauseNum());
space->allocateAndCopyToAlignedSpace(buf, str_len(buf), sizeof(short));
-#endif
-
if (getNumOperands() == 0)
return;
@@ -2026,10 +1997,8 @@ void ex_branch_clause::displayContents(Space * space, const char * /*displayStr*
(showplan
? getOperand(i+getNumOperands())
: NULL));
- #ifndef __EID
str_sprintf(buf, "\n");
space->allocateAndCopyToAlignedSpace(buf, str_len(buf), sizeof(short));
- #endif
#pragma warn(1506) // warning elimination
}
}
@@ -2117,28 +2086,6 @@ void ex_like_clause_doublebyte::displayContents(Space * space, const char * /*di
ex_clause::displayContents(space, "ex_like_clause_doublebyte", clauseNum, constsArea);
}
-void ExAuditImage::displayContents(Space * space, const char * /*displayStr*/, Int32 clauseNum, char * constsArea)
-{
- ex_clause::displayContents(space, "ExAuditImage", clauseNum, constsArea);
- // LCOV_EXCL_STOP
-
- // Make sure that you display the ex_expr auditImageExpr_ also.
- // This ex_expr is enclosed within a header and footer.
-#ifndef __EID
- char buf[100];
- str_sprintf(buf, "Start of %s (Clause #%d: %s) \n", "ExAuditRowImageExpr", clauseNum, "ExAuditImage");
- space->allocateAndCopyToAlignedSpace(buf, str_len(buf), sizeof(short));
-#endif
-
- ((ex_expr *)auditImageContainerExpr_->getExpr())->displayContents(space,
- -1 /* mode */,
- "ExAuditRowImageExpr");
-#ifndef __EID
- str_sprintf(buf, "End of %s (Clause #%d: %s) \n", "ExAuditRowImageExpr", clauseNum, "ExAuditImage");
- space->allocateAndCopyToAlignedSpace(buf, str_len(buf), sizeof(short));
-#endif
-}
-
void ExFunctionHbaseTimestamp::displayContents(Space * space, const char * /*displayStr*/, Int32 clauseNum, char * constsArea)
{
char buf[100];
@@ -2176,7 +2123,7 @@ void ex_function_dateformat::displayContents(Space * space, const char * /*displ
}
// Function to compare two strings.
-NA_EIDPROC Int32 charStringCompareWithPad(char* in_s1, Int32 length1,
+Int32 charStringCompareWithPad(char* in_s1, Int32 length1,
char* in_s2, Int32 length2,
char space)
{
@@ -2232,7 +2179,7 @@ NA_EIDPROC Int32 charStringCompareWithPad(char* in_s1, Int32 length1,
return compare_code;
}
-NA_EIDPROC Int32 wcharStringCompareWithPad(NAWchar* s1, Int32 length1,
+Int32 wcharStringCompareWithPad(NAWchar* s1, Int32 length1,
NAWchar* s2, Int32 length2,
NAWchar space)
{
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/exp/exp_clause.h
----------------------------------------------------------------------
diff --git a/core/sql/exp/exp_clause.h b/core/sql/exp/exp_clause.h
index 9c83c79..24fec96 100644
--- a/core/sql/exp/exp_clause.h
+++ b/core/sql/exp/exp_clause.h
@@ -71,7 +71,7 @@ class ex_clause;
// Class ex_clause
/////////////////////////////////////////////////
#pragma nowarn(1506) // warning elimination
-class SQLEXP_LIB_FUNC ex_clause : public NAVersionedObject {
+class ex_clause : public NAVersionedObject {
public:
// Possible types of clauses
// (these codes must remain invariant across future versions)
@@ -172,8 +172,6 @@ public:
FUNC_NULLIFZERO =87,
FUNC_NVL =88,
FUNC_HASH2_DISTRIB_ID =89,
- FUNC_EXTRACT_COLUMNS =90,
- FUNC_AUDIT_ROW_IMAGE =91,
FUNC_HEADER =92,
FUNC_QUERYID_EXTRACT =93,
FUNC_BIT_OPER_ID =94,
@@ -229,22 +227,22 @@ public:
// Construction, Destruction
//
- NA_EIDPROC ex_clause() : NAVersionedObject(CLAUSE_ANCHOR),
+ ex_clause() : NAVersionedObject(CLAUSE_ANCHOR),
nextClause_(NULL), op_(NULL) {};
- NA_EIDPROC ex_clause(clause_type type_,
+ ex_clause(clause_type type_,
OperatorTypeEnum operType_,
short num_operands_,
Attributes ** op_,
Space * space_);
- NA_EIDPROC ~ex_clause();
+ ~ex_clause();
// Bookkeeping Accessors
//
- NA_EIDPROC void generateClause(char *pt);
- NA_EIDPROC inline clause_type getType();
- NA_EIDPROC inline void setType(clause_type t);
+ void generateClause(char *pt);
+ inline clause_type getType();
+ inline void setType(clause_type t);
- NA_EIDPROC inline OperatorTypeEnum getOperType()
+ inline OperatorTypeEnum getOperType()
{return (OperatorTypeEnum)operType_;};
// PCode Methods
@@ -257,10 +255,10 @@ public:
// a clause. If not redefined, the default implementations generates
// PCode to set up for and call the clause->eval() method.
//
- NA_EIDPROC inline PCILink *getPCIList() { return pciLink_; };
- NA_EIDPROC inline void setPCIList(PCILink *pciLink) {
+ inline PCILink *getPCIList() { return pciLink_; };
+ inline void setPCIList(PCILink *pciLink) {
pciLink_ = pciLink; };
- NA_EIDPROC virtual ex_expr::exp_return_type pCodeGenerate(Space *space,
+ virtual ex_expr::exp_return_type pCodeGenerate(Space *space,
UInt32 flags);
// Null Processing Methods
@@ -289,49 +287,49 @@ public:
// isSpecialNulls - Return TRUE if NULL should compare bigger than maximum
// value
//
- NA_EIDPROC virtual Int32 isNullInNullOut() const
+ virtual Int32 isNullInNullOut() const
{ return 1;}; // must be redefined in derived classes
- NA_EIDPROC virtual Int32 isNullRelevant() const
+ virtual Int32 isNullRelevant() const
{ return 1;}; // must be redefined in derived classes
- NA_EIDPROC inline Int32 isAnyInputNullable() {
+ inline Int32 isAnyInputNullable() {
return flags_ & ANY_INPUT_NULLABLE; };
- NA_EIDPROC inline Int32 isAnyOutputNullable() {
+ inline Int32 isAnyOutputNullable() {
return flags_ & ANY_OUTPUT_NULLABLE; };
- NA_EIDPROC inline Int32 isAnyOperandNullable() {
+ inline Int32 isAnyOperandNullable() {
return flags_ & (ANY_INPUT_NULLABLE | ANY_OUTPUT_NULLABLE); };
- NA_EIDPROC inline Int32 useProcessNulls() {
+ inline Int32 useProcessNulls() {
return flags_ & USE_PROCESS_NULLS;
};
- NA_EIDPROC void setProcessNulls() {
+ void setProcessNulls() {
if(isNullRelevant() && (flags_ & (ANY_INPUT_NULLABLE|ANY_OUTPUT_NULLABLE)))
flags_ |= USE_PROCESS_NULLS;
};
- NA_EIDPROC void setSpecialNulls() { flags_ |= SPECIAL_NULLS; };
- NA_EIDPROC Int32 isSpecialNulls() { return (flags_ & SPECIAL_NULLS) != 0; };
+ void setSpecialNulls() { flags_ |= SPECIAL_NULLS; };
+ Int32 isSpecialNulls() { return (flags_ & SPECIAL_NULLS) != 0; };
NABoolean noPCodeAvailable() { return (flags_ & NO_PCODE_AVAILABLE) != 0; };
- NA_EIDPROC void setNoPCodeAvailable(NABoolean v)
+ void setNoPCodeAvailable(NABoolean v)
{
(v ? flags_ |= NO_PCODE_AVAILABLE : flags_ &= ~NO_PCODE_AVAILABLE);
};
- NA_EIDPROC NABoolean handleIndirectVC() { return (flags_ & HANDLE_INDIRECT_VC) != 0; };
- NA_EIDPROC void setHandleIndirectVC(NABoolean v)
+ NABoolean handleIndirectVC() { return (flags_ & HANDLE_INDIRECT_VC) != 0; };
+ void setHandleIndirectVC(NABoolean v)
{
(v ? flags_ |= HANDLE_INDIRECT_VC : flags_ &= ~HANDLE_INDIRECT_VC);
};
- NA_EIDPROC NABoolean forInsertUpdate() { return (flags_ & FOR_INSERT_UPDATE) != 0; };
- NA_EIDPROC void setForInsertUpdate(NABoolean v)
+ NABoolean forInsertUpdate() { return (flags_ & FOR_INSERT_UPDATE) != 0; };
+ void setForInsertUpdate(NABoolean v)
{
(v ? flags_ |= FOR_INSERT_UPDATE : flags_ &= ~FOR_INSERT_UPDATE);
};
- NA_EIDPROC inline Int32 getAllFlags() { return flags_ ; };
+ inline Int32 getAllFlags() { return flags_ ; };
//
// SPECIAL TRUNCATION FLAG
@@ -341,14 +339,14 @@ public:
//
// The following two methods are used only in ex_conv_clause objects
- NA_EIDPROC void setCheckTruncationFlag()
+ void setCheckTruncationFlag()
{flags_ |= CHECK_STRING_TRUNCATION;};
- NA_EIDPROC Int32 getCheckTruncationFlag()
+ Int32 getCheckTruncationFlag()
{return (flags_ & CHECK_STRING_TRUNCATION); }
- NA_EIDPROC void setNoTruncationWarningsFlag()
+ void setNoTruncationWarningsFlag()
{flags_ |= NO_STRING_TRUNCATION_WARNINGS; };
- NA_EIDPROC Int32 getNoTruncationWarningsFlag()
+ Int32 getNoTruncationWarningsFlag()
{ return (flags_ & NO_STRING_TRUNCATION_WARNINGS); }
// Branch handling
@@ -365,43 +363,43 @@ public:
// addBranchTarget - Increments the number of branch clauses
// which target this clause.
//
- NA_EIDPROC virtual Int32 isBranchingClause() const { return 0; };
- NA_EIDPROC Int32 isBranchTarget() const { return numberBranchTargets_ != 0; };
- NA_EIDPROC Int32 getNumberBranchTargets() { return numberBranchTargets_; };
- NA_EIDPROC void setNumberBranchTargets(Int32 num) { numberBranchTargets_ = num; };
- NA_EIDPROC void addBranchTarget() { numberBranchTargets_++; };
+ virtual Int32 isBranchingClause() const { return 0; };
+ Int32 isBranchTarget() const { return numberBranchTargets_ != 0; };
+ Int32 getNumberBranchTargets() { return numberBranchTargets_; };
+ void setNumberBranchTargets(Int32 num) { numberBranchTargets_ = num; };
+ void addBranchTarget() { numberBranchTargets_++; };
- NA_EIDPROC unsigned short &clauseNum() { return clauseNum_; }
+ unsigned short &clauseNum() { return clauseNum_; }
// Operand Accessors
//
- NA_EIDPROC inline short getNumOperands();
- NA_EIDPROC inline Attributes *getOperand(short operand_num);
- NA_EIDPROC inline AttributesPtr *getOperand();
- NA_EIDPROC inline void setOperand(AttributesPtrPtr& attr_);
+ inline short getNumOperands();
+ inline Attributes *getOperand(short operand_num);
+ inline AttributesPtr *getOperand();
+ inline void setOperand(AttributesPtrPtr& attr_);
// Clause List Accessors
//
- NA_EIDPROC inline ex_clause *getNextClause();
- NA_EIDPROC inline void setNextClause(ex_clause *clause_);
- NA_EIDPROC inline void setNextPackedClause(Int64 offset);
- NA_EIDPROC inline void setNext(Lng32 next_clause_offset);
- NA_EIDPROC inline void setLastClause();
+ inline ex_clause *getNextClause();
+ inline void setNextClause(ex_clause *clause_);
+ inline void setNextPackedClause(Int64 offset);
+ inline void setNext(Lng32 next_clause_offset);
+ inline void setLastClause();
// Packing, Unpacking, and Fixup
//
- NA_EIDPROC virtual Long pack(void *);
- NA_EIDPROC virtual Lng32 unpack(void *, void * reallocator);
- NA_EIDPROC Long packClause(void *, Lng32 size);
- NA_EIDPROC Lng32 unpackClause(void *base, void * reallocator);
+ virtual Long pack(void *);
+ virtual Lng32 unpack(void *, void * reallocator);
+ Long packClause(void *, Lng32 size);
+ Lng32 unpackClause(void *base, void * reallocator);
virtual Lng32 initClause(){return 0;};
// SpaceCompOnly: if TRUE, then compute space requirement only.
// Do not make any changes to the generated expressions,
// (like assigning tempsArea, assigning generated pcode, etc).
- NA_EIDPROC virtual ex_expr::exp_return_type fixup(Space * space = 0,
+ virtual ex_expr::exp_return_type fixup(Space * space = 0,
CollHeap * exHeap = 0,
char * constants_area = 0,
char * temps_area = 0,
@@ -445,27 +443,27 @@ public:
// op_data[-2*MAX_OPERANDS], etc.
//
//
- NA_EIDPROC virtual Int32 isEvalRelevant() const
+ virtual Int32 isEvalRelevant() const
{ return 1;}; // must be redefined in derived classes
- 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);
- NA_EIDPROC virtual ex_expr::exp_return_type eval(char *op_data[],
+ virtual ex_expr::exp_return_type eval(char *op_data[],
CollHeap * = 0,
ComDiagsArea ** = 0);
// Display
//
- NA_EIDPROC virtual void displayContents(Space * space, const char * displayStr,
+ virtual void displayContents(Space * space, const char * displayStr,
Int32 clauseNum, char * constsArea);
- NA_EIDPROC void displayContents(Space * space, const char * displayStr,
+ void displayContents(Space * space, const char * displayStr,
Int32 clauseNum, char * constsArea,
UInt32 clauseFlags,
Int16 instruction = -1,
const char * instrText = NULL);
- NA_EIDPROC static void clearVOA(Attributes *attr, atp_struct *atp)
+ static void clearVOA(Attributes *attr, atp_struct *atp)
{
CollIndex atpIdx = attr->getAtpIndex();
@@ -474,7 +472,7 @@ public:
}
- NA_EIDPROC static void setRowLength(Attributes * attr,
+ static void setRowLength(Attributes * attr,
atp_struct * atp,
UInt32 * rowLen,
UInt32 newLength)
@@ -492,14 +490,14 @@ public:
}
- NA_EIDPROC static void setVoaData(char *dataPtr, UInt32 voaOffset, UInt32 value)
+ static void setVoaData(char *dataPtr, UInt32 voaOffset, UInt32 value)
{
assert(dataPtr);
if (voaOffset != ExpOffsetMax)
str_cpy_all(dataPtr + voaOffset, (char *)&value, ExpVoaSize);
}
- NA_EIDPROC static void evalSetRowLength(Attributes *attr,
+ static void evalSetRowLength(Attributes *attr,
atp_struct *atp,
UInt32 *rowLen,
UInt32 newLength)
@@ -519,26 +517,26 @@ public:
*rowLen = newLength;
}
- NA_EIDPROC void copyOperands(ex_clause* clause, Space* space);
+ void copyOperands(ex_clause* clause, Space* space);
// ---------------------------------------------------------------------
// Redefinition of methods inherited from NAVersionedObject.
// ---------------------------------------------------------------------
- NA_EIDPROC virtual unsigned char getClassVersionID()
+ virtual unsigned char getClassVersionID()
{
return 1;
}
- NA_EIDPROC virtual void populateImageVersionIDArray()
+ virtual void populateImageVersionIDArray()
{
setImageVersionID(0,getClassVersionID());
}
- NA_EIDPROC virtual short getClassSize() { return (short)sizeof(*this); }
- NA_EIDPROC virtual char *findVTblPtr(short classID);
+ virtual short getClassSize() { return (short)sizeof(*this); }
+ virtual char *findVTblPtr(short classID);
// ---------------------------------------------------------------------
- NA_EIDPROC void setExeGlobals(ex_globals * glob)
+ void setExeGlobals(ex_globals * glob)
{
globals_ = glob;
}
@@ -547,7 +545,7 @@ public:
void setInstrArrayIndex(Int16 index) { instrArrayIndex_ = index; }
protected:
- NA_EIDPROC ex_globals * getExeGlobals()
+ ex_globals * getExeGlobals()
{
return globals_;
}
@@ -555,9 +553,6 @@ protected:
private:
ExClausePtr nextClause_; // 00-07
PCILink *pciLink_; // 08-15
-#ifndef NA_64BIT
- char fillerpciLink_[4]; // 12-15
-#endif
AttributesPtrPtr op_; // 16-23
UInt16 clauseNum_; // 24-25
UInt16 numberBranchTargets_; // 26-27
@@ -644,11 +639,11 @@ inline void ex_clause::setNextPackedClause(Int64 offset){
};
// functions to compare two strings
-NA_EIDPROC Int32 charStringCompareWithPad(char* in_s1, Int32 length1,
+Int32 charStringCompareWithPad(char* in_s1, Int32 length1,
char* in_s2, Int32 length2,
char space);
-NA_EIDPROC Int32 wcharStringCompareWithPad(NAWchar* s1, Int32 length1,
+Int32 wcharStringCompareWithPad(NAWchar* s1, Int32 length1,
NAWchar* s2, Int32 length2,
NAWchar space);
#endif
[29/30] incubator-trafodion git commit: TRAFODION-2731 CodeCleanup:
Remove obsolete, legacy and unused code
Posted by an...@apache.org.
TRAFODION-2731 CodeCleanup: Remove obsolete, legacy and unused code
This phase handles the following:
-- removal of code that dealt with:
-- mpalias, NSK, MP, mploc, resource fork, rfork
-- ARLIB, DISK, VOLUME, PFS, compiler version info
-- interpretasrow/IAR, AuditImage, ExtractColumns functions
-- ARKCMP_SINGLE_PROCESS and oneProcess()
-- recompControl, remoteDefaults, rtdu, module
-- latebind thru nsk defines, guardian names, nametype nsk
-- SHADOW implementation
-- MEASURE
-- older sqlcat ReadTableDef
-- DP2_MEMORY, DP2_SPACE, HGB_DP2_MEMORY_LIMIT
-- internal cli methods no longer used by any caller
Code within the following defines is removed if it is obsolete
or the define itself is removed if that feature is always on:
-- removed NA_EIDPROC
-- removed SQLEXP_LIB_FUNC
-- removed NA_CMPDLL
-- removed SQ_PHANDLE_VERIFIER
-- removed SQ_NEW_PHANDLE
-- removed __EID
-- removed ARKFS_OPEN
-- removed STAND_ALONE
-- removed __TANDEM
-- removed NA_C89
-- removed NA_NSK
-- removed SQLEXPORT_LIB_FUNC
-- removed SQLCLI_LIB_FUNC
-- removed CLI_PRIV_SRL
-- removed PRIV_SRL
-- removed NA_LINUX
-- removed NA_HSC_LINUX
-- removed NA_UNIX
-- removed NA_WINNT
-- removed HAVE_MMAP
-- removed NA_NO_C_RUNTIME
-- removed NA_DEBUG_C_RUNTIME(replaced with _DEBUG)
-- removed NA_64BIT usage except in sqlcli.h
-- removed dg64
-- removed SQLEXPORT_LIB
-- removed NA_ARKFS
-- removed NA_IEEE_FLOAT
-- removed NA_GUARDIAN_MSG
-- removed NA_HSC
-- removed NA_TMFNOTYETSUPPORTED
-- removed ERROR
-- removed ERROR_STATE
-- removed SQLERRORS_LIB_FUNC
Contents of these files have been removed.
Next checkin fill remove the files itself from git:
executor/dmeasql.h
executor/ExMeas.h, ExMeas.cpp
executor/tempfile.h, .cpp
executor/rcb.h
executor/stubs.cpp, stubs2.cpp
exp/srlversion.cpp
cli/rtdu.h, rtdu2.h, rtdu.cpp, rtdu.cpp
cli/VicKeyValuePair.h
cli/CliDll.cpp
cli/CliStubsStaticBuild.cpp
cli/globalsrlversion.cpp
cli/globalstubs.cpp
cli/sqlciSRLStubs.cpp
cli/test.cpp
cli/privsrlversion.cpp
common/SqlExpDllDefines.h
common/SqlExportDllDefines.h
sqlcat/enum.h
sqlcat/ReadTableDef.h, cpp
sqlcat/readRealArk.h, cpp
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/1522c8cd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/1522c8cd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/1522c8cd
Branch: refs/heads/master
Commit: 1522c8cd0e33859c0671606364183f31d0d3902f
Parents: 19119e7
Author: Anoop Sharma <an...@esgyn.com>
Authored: Wed Sep 6 18:20:09 2017 +0000
Committer: Anoop Sharma <an...@esgyn.com>
Committed: Wed Sep 6 18:20:09 2017 +0000
----------------------------------------------------------------------
core/conn/odbc/src/odbc/nsksrvr/SrvrConnect.cpp | 6 +
.../odbc/src/odbc/nsksrvrcore/SQLWrapper.cpp | 5 +-
core/sql/SqlCompilerDebugger/QueryData.cpp | 4 -
core/sql/arkcmp/CmpConnection.cpp | 18 +-
core/sql/arkcmp/CmpContext.cpp | 15 +-
core/sql/arkcmp/CmpContext.h | 8 -
core/sql/arkcmp/CmpSqlSession.cpp | 4 +-
core/sql/arkcmp/CmpStatement.cpp | 121 +-
core/sql/arkcmp/CmpStatement.h | 12 -
core/sql/arkcmp/CmpStoredProc.cpp | 5 -
core/sql/arkcmp/ProcessEnv.cpp | 2 -
core/sql/arkcmp/ProcessEnv.h | 5 -
core/sql/bin/SqlciErrors.txt | 1 -
core/sql/bin/SqlciMain.cpp | 14 +-
core/sql/bin/arkcmp.cpp | 9 +-
core/sql/bin/ex_esp_main.cpp | 24 +-
core/sql/bin/vproceid.cpp | 2 +-
core/sql/cli/Cli.cpp | 935 +---------
core/sql/cli/Cli.h | 20 +-
core/sql/cli/CliDefs.h | 3 -
core/sql/cli/CliDll.cpp | 44 -
core/sql/cli/CliExpExchange.cpp | 15 +-
core/sql/cli/CliExtern.cpp | 962 +---------
core/sql/cli/CliStubsStaticBuild.cpp | 41 -
core/sql/cli/Context.cpp | 1278 +-------------
core/sql/cli/Context.h | 31 +-
core/sql/cli/Descriptor.cpp | 30 -
core/sql/cli/Descriptor.h | 4 +-
core/sql/cli/ExSqlComp.cpp | 274 +--
core/sql/cli/ExSqlComp.h | 1 -
core/sql/cli/Globals.cpp | 50 +-
core/sql/cli/Globals.h | 28 -
core/sql/cli/GlobalsDef.cpp | 2 +-
core/sql/cli/Module.cpp | 48 +-
core/sql/cli/Module.h | 5 -
core/sql/cli/NoWaitOp.cpp | 13 +-
core/sql/cli/SQLCLIdev.h | 673 +------
core/sql/cli/SessionDefaults.cpp | 4 -
core/sql/cli/Statement.cpp | 270 +--
core/sql/cli/Statement.h | 31 +-
core/sql/cli/StoredProcInterface.cpp | 9 -
core/sql/cli/StoredProcInterface.h | 9 -
core/sql/cli/VicKeyValuePair.h | 14 -
core/sql/cli/cli_stdh.h | 1 -
core/sql/cli/globalsrlversion.cpp | 2 +-
core/sql/cli/globalstubs.cpp | 17 -
core/sql/cli/memorymonitor.cpp | 2 -
core/sql/cli/memorymonitor.h | 3 -
core/sql/cli/muse.cpp | 6 -
core/sql/cli/privsrlversion.cpp | 2 +-
core/sql/cli/rtdu.cpp | 61 -
core/sql/cli/rtdu.h | 897 +---------
core/sql/cli/rtdu2.cpp | 254 ---
core/sql/cli/rtdu2.h | 118 +-
core/sql/cli/sql_id.cpp | 12 -
core/sql/cli/sql_id.h | 18 -
core/sql/cli/sqlciSRLStubs.cpp | 2 +
core/sql/cli/sqlcli.h | 318 ++--
core/sql/cli/test.cpp | 99 --
core/sql/comexe/CmpMessage.cpp | 34 +-
core/sql/comexe/CmpMessage.h | 26 +-
core/sql/comexe/ComKeyMDAM.h | 116 +-
core/sql/comexe/ComKeyRange.cpp | 2 +-
core/sql/comexe/ComKeyRange.h | 38 +-
core/sql/comexe/ComKeySingleSubset.h | 30 +-
core/sql/comexe/ComQueue.cpp | 4 -
core/sql/comexe/ComQueue.h | 60 +-
core/sql/comexe/ComTdb.cpp | 51 +-
core/sql/comexe/ComTdb.h | 179 +-
core/sql/comexe/ComTdbAll.h | 8 -
core/sql/comexe/ComTdbBlockingHdfsScan.cpp | 10 -
core/sql/comexe/ComTdbBlockingHdfsScan.h | 8 -
core/sql/comexe/ComTdbCompoundStmt.h | 18 -
core/sql/comexe/ComTdbExeUtil.h | 59 +-
core/sql/comexe/ComTdbExplain.h | 2 +-
core/sql/comexe/ComTdbFastTransport.h | 35 +-
core/sql/comexe/ComTdbFirstN.h | 6 +-
core/sql/comexe/ComTdbHashGrby.h | 48 +-
core/sql/comexe/ComTdbHashj.h | 2 +-
core/sql/comexe/ComTdbHbaseAccess.h | 2 +-
core/sql/comexe/ComTdbMj.h | 2 +-
core/sql/comexe/ComTdbOnlj.h | 2 +-
core/sql/comexe/ComTdbPackRows.h | 13 -
core/sql/comexe/ComTdbRoot.h | 2 +-
core/sql/comexe/ComTdbSample.h | 18 -
core/sql/comexe/ComTdbSequence.h | 20 +-
core/sql/comexe/ComTdbSort.h | 4 +-
core/sql/comexe/ComTdbSortGrby.cpp | 2 +-
core/sql/comexe/ComTdbSortGrby.h | 18 -
core/sql/comexe/ComTdbSplitTop.h | 2 +-
core/sql/comexe/ComTdbTranspose.h | 20 +-
core/sql/comexe/ComTdbTuple.h | 32 +-
core/sql/comexe/ComTdbTupleFlow.cpp | 2 +-
core/sql/comexe/ComTdbTupleFlow.h | 2 +-
core/sql/comexe/ComTdbUdr.h | 2 +-
core/sql/comexe/ComTdbUnPackRows.h | 24 +-
core/sql/comexe/ComTdbUnion.cpp | 2 +-
core/sql/comexe/ComTdbUnion.h | 6 +-
core/sql/comexe/HashBufferHeader.h | 8 -
core/sql/comexe/HashRow.h | 14 -
core/sql/comexe/LateBindInfo.cpp | 244 +--
core/sql/comexe/LateBindInfo.h | 57 +-
core/sql/comexe/PartInputDataDesc.cpp | 3 +-
core/sql/comexe/QueueIndex.h | 5 -
core/sql/comexe/SqlTableOpenInfo.h | 15 -
core/sql/common/BaseTypes.cpp | 4 -
core/sql/common/BaseTypes.h | 8 +-
core/sql/common/BigNumHelper.h | 19 -
core/sql/common/Collections.cpp | 15 -
core/sql/common/Collections.h | 80 +-
core/sql/common/ComASSERT.h | 4 +-
core/sql/common/ComAnsiNamePart.h | 3 +-
core/sql/common/ComCextMisc.cpp | 10 -
core/sql/common/ComDistribution.h | 14 +-
core/sql/common/ComMPLoc.h | 8 +-
core/sql/common/ComObjectName.cpp | 30 -
core/sql/common/ComRtUtils.cpp | 7 +-
core/sql/common/ComRtUtils.h | 7 +-
core/sql/common/ComSafePrinter.cpp | 2 +-
core/sql/common/ComSchemaName.cpp | 23 -
core/sql/common/ComSmallDefs.cpp | 9 -
core/sql/common/ComSpace.cpp | 77 +-
core/sql/common/ComSpace.h | 52 +-
core/sql/common/ComSqlId.h | 19 +-
core/sql/common/ComSysUtils.cpp | 1 -
core/sql/common/ComSysUtils.h | 17 +-
core/sql/common/ComVersionDefs.h | 2 +-
core/sql/common/DgBaseType.h | 169 +-
core/sql/common/DllExportDefines.h | 21 -
core/sql/common/Int64.h | 28 +-
core/sql/common/IntervalType.cpp | 10 -
core/sql/common/IntervalType.h | 10 +-
core/sql/common/Ipc.cpp | 39 +-
core/sql/common/Ipc.h | 84 +-
core/sql/common/IpcGuardian.cpp | 280 +--
core/sql/common/IpcMessageType.h | 44 -
core/sql/common/IpcSockets.cpp | 20 -
core/sql/common/NAAssert.h | 10 +-
core/sql/common/NAError.h | 58 +-
core/sql/common/NAHeap.h | 10 +-
core/sql/common/NAIpc.cpp | 2 +-
core/sql/common/NAIpc.h | 2 +-
core/sql/common/NAMemory.cpp | 305 +---
core/sql/common/NAMemory.h | 399 ++---
core/sql/common/NAStdlib.h | 9 -
core/sql/common/NAString.cpp | 2 +-
core/sql/common/NAString2.cpp | 16 +-
core/sql/common/NAStringDefGlobals.h | 5 +-
core/sql/common/NAWinNT.h | 54 +-
core/sql/common/NLSConversion.h | 20 -
core/sql/common/NumericType.cpp | 17 -
core/sql/common/OperTypeEnum.h | 4 -
core/sql/common/Platform.h | 27 +-
core/sql/common/SMConnection.cpp | 13 -
core/sql/common/SqlEventsDllDefines.h | 8 +-
core/sql/common/SqlExpDllDefines.h | 27 -
core/sql/common/SqlExportDllDefines.h | 24 -
core/sql/common/SqlLmDllDefines.h | 20 +-
core/sql/common/arkcmp_proc.cpp | 2 -
core/sql/common/charinfo.cpp | 10 +-
core/sql/common/conversionLocale.cpp | 3 +-
core/sql/common/conversionSJIS.cpp | 7 +-
core/sql/common/csconvert.h | 15 -
core/sql/common/dfs2rec.h | 36 +-
core/sql/common/from_GB18030.c | 8 -
core/sql/common/from_GBK.c | 3 -
core/sql/common/from_SJIS.c | 2 -
core/sql/common/from_ksc5601.c | 2 -
core/sql/common/iconv_gen.c | 15 -
core/sql/common/ipcmsg.cpp | 2 +-
core/sql/common/mb_lconv.c | 38 +-
core/sql/common/memtest.cpp | 1 -
core/sql/common/multi-byte.h | 5 -
core/sql/common/nawstring.cpp | 4 -
core/sql/common/nawstring.h | 18 +-
core/sql/common/nchar_mp.h | 33 +-
core/sql/common/str.cpp | 18 -
core/sql/common/str.h | 46 +-
core/sql/common/stringBuf.h | 31 +-
core/sql/common/swscanf.cpp | 5 -
core/sql/common/swsprintf.cpp | 2 -
core/sql/common/unicode_char_set.cpp | 6 -
core/sql/common/unicode_char_set.h | 18 -
core/sql/common/wc_scanf_sprintf.h | 20 +-
core/sql/common/wstr.h | 5 +-
core/sql/executor/ExBitMapTable.cpp | 6 -
core/sql/executor/ExBitMapTable.h | 16 -
core/sql/executor/ExCancel.h | 6 +-
core/sql/executor/ExComTdb.cpp | 26 +-
core/sql/executor/ExCompoundStmt.h | 38 +-
core/sql/executor/ExExeUtil.h | 215 ++-
core/sql/executor/ExExeUtilCommon.cpp | 10 +-
core/sql/executor/ExExeUtilGetStats.cpp | 7 +-
core/sql/executor/ExExplain.cpp | 9 -
core/sql/executor/ExExplain.h | 6 +-
core/sql/executor/ExFastTransport.cpp | 7 -
core/sql/executor/ExFastTransport.h | 11 +-
core/sql/executor/ExFirstN.h | 34 +-
core/sql/executor/ExHbaseAccess.h | 12 +-
core/sql/executor/ExHdfsScan.h | 12 +-
core/sql/executor/ExMeas.cpp | 141 --
core/sql/executor/ExMeas.h | 267 ---
core/sql/executor/ExPack.h | 31 +-
core/sql/executor/ExPackedRows.h | 27 +-
core/sql/executor/ExProbeCache.h | 8 +-
core/sql/executor/ExRLE.h | 10 -
core/sql/executor/ExRsInfo.cpp | 24 +-
core/sql/executor/ExRsInfo.h | 2 +-
core/sql/executor/ExSample.h | 50 +-
core/sql/executor/ExScheduler.cpp | 97 +-
core/sql/executor/ExScheduler.h | 26 +-
core/sql/executor/ExSequence.cpp | 2 -
core/sql/executor/ExSimpleSample.h | 20 +-
core/sql/executor/ExSimpleSqlBuffer.h | 12 -
core/sql/executor/ExStats.cpp | 64 +-
core/sql/executor/ExStats.h | 812 +--------
core/sql/executor/ExTranspose.h | 29 +-
core/sql/executor/ExUdr.h | 6 +-
core/sql/executor/ExUdrServer.cpp | 29 +-
core/sql/executor/ExVPJoin.cpp | 16 -
core/sql/executor/ExVPJoin.h | 33 +-
core/sql/executor/Ex_esp_msg.h | 6 -
core/sql/executor/FixedSizeHeapElement.h | 18 +-
core/sql/executor/FixedSizeHeapManager.h | 30 +-
core/sql/executor/MdamEndPoint.h | 32 +-
core/sql/executor/MdamInterval.h | 44 +-
core/sql/executor/MdamIntervalIterator.h | 6 +-
core/sql/executor/MdamIntervalList.h | 30 +-
core/sql/executor/MdamIntervalListIterator.h | 8 +-
core/sql/executor/MdamIntervalListMerger.h | 10 +-
core/sql/executor/MdamPoint.h | 24 +-
core/sql/executor/MdamRefList.h | 32 +-
core/sql/executor/MdamRefListEntry.h | 18 +-
core/sql/executor/MdamRefListIterator.h | 6 +-
core/sql/executor/UdrExeIpc.h | 6 +-
core/sql/executor/cluster.cpp | 74 +-
core/sql/executor/cluster.h | 157 +-
core/sql/executor/dfs2fe.h | 1 -
core/sql/executor/dmeasql.h | 67 -
core/sql/executor/ex_control.cpp | 338 ++--
core/sql/executor/ex_control.h | 6 +-
core/sql/executor/ex_ddl.cpp | 265 ++-
core/sql/executor/ex_ddl.h | 30 +-
core/sql/executor/ex_error.h | 4 -
core/sql/executor/ex_esp_frag_dir.cpp | 2 -
core/sql/executor/ex_ex.cpp | 52 -
core/sql/executor/ex_ex.h | 18 +-
core/sql/executor/ex_exe_stmt_globals.cpp | 21 +-
core/sql/executor/ex_exe_stmt_globals.h | 38 +-
core/sql/executor/ex_frag_rt.cpp | 11 +-
core/sql/executor/ex_globals.cpp | 4 -
core/sql/executor/ex_globals.h | 70 +-
core/sql/executor/ex_god.h | 2 -
core/sql/executor/ex_hash_grby.cpp | 64 +-
core/sql/executor/ex_hash_grby.h | 37 +-
core/sql/executor/ex_hashj.cpp | 30 +-
core/sql/executor/ex_hashj.h | 10 +-
core/sql/executor/ex_io_control.h | 22 +-
core/sql/executor/ex_key_object.h | 1 -
core/sql/executor/ex_mdam.h | 70 +-
core/sql/executor/ex_mj.h | 8 +-
core/sql/executor/ex_onlj.cpp | 27 +-
core/sql/executor/ex_onlj.h | 6 +-
core/sql/executor/ex_queue.cpp | 10 -
core/sql/executor/ex_queue.h | 111 +-
core/sql/executor/ex_root.cpp | 17 +-
core/sql/executor/ex_root.h | 8 +-
core/sql/executor/ex_send_bottom.cpp | 4 +-
core/sql/executor/ex_send_bottom.h | 8 +-
core/sql/executor/ex_send_top.cpp | 2 -
core/sql/executor/ex_send_top.h | 8 +-
core/sql/executor/ex_sort.cpp | 13 +-
core/sql/executor/ex_sort.h | 10 +-
core/sql/executor/ex_sort_grby.h | 13 +-
core/sql/executor/ex_split_bottom.cpp | 7 +-
core/sql/executor/ex_split_bottom.h | 8 +-
core/sql/executor/ex_split_top.h | 8 +-
core/sql/executor/ex_stored_proc.h | 6 +-
core/sql/executor/ex_tcb.h | 95 +-
core/sql/executor/ex_tcb_private.h | 5 -
core/sql/executor/ex_timeout.h | 6 +-
core/sql/executor/ex_transaction.cpp | 8 -
core/sql/executor/ex_transaction.h | 6 +-
core/sql/executor/ex_tuple.cpp | 4 +-
core/sql/executor/ex_tuple.h | 36 +-
core/sql/executor/ex_tuple_flow.cpp | 3 -
core/sql/executor/ex_tuple_flow.h | 6 +-
core/sql/executor/ex_union.h | 59 +-
core/sql/executor/hash_table.cpp | 12 -
core/sql/executor/hash_table.h | 34 -
core/sql/executor/key_range.h | 26 +-
core/sql/executor/key_single_subset.h | 28 +-
core/sql/executor/rcb.h | 50 -
core/sql/executor/sql_buffer.cpp | 116 +-
core/sql/executor/sql_buffer.h | 17 +-
core/sql/executor/sql_buffer_size.h | 3 -
core/sql/executor/stubs.cpp | 384 ----
core/sql/executor/stubs2.cpp | 81 -
core/sql/executor/tempfile.cpp | 71 +-
core/sql/executor/tempfile.h | 67 -
core/sql/exp/ExpAtp.cpp | 6 -
core/sql/exp/ExpAtp.h | 29 +-
core/sql/exp/ExpBitMuxFunction.h | 22 +-
core/sql/exp/ExpCriDesc.cpp | 6 +-
core/sql/exp/ExpCriDesc.h | 21 +-
core/sql/exp/ExpDll.cpp | 3 +-
core/sql/exp/ExpError.cpp | 19 -
core/sql/exp/ExpError.h | 18 -
core/sql/exp/ExpErrorEnums.h | 11 -
core/sql/exp/ExpLOB.cpp | 42 -
core/sql/exp/ExpLOB.h | 70 +-
core/sql/exp/ExpPCode.cpp | 53 +-
core/sql/exp/ExpPCode.h | 27 +-
core/sql/exp/ExpPCodeClauseGen.cpp | 156 +-
core/sql/exp/ExpPCodeExpGen.cpp | 37 +-
core/sql/exp/ExpPCodeInstruction.h | 138 +-
core/sql/exp/ExpPCodeList.h | 30 +-
core/sql/exp/ExpPCodeOptimizations.cpp | 191 +-
core/sql/exp/ExpPCodeOptimizations.h | 24 +-
core/sql/exp/ExpPCodeOptsNativeExpr.cpp | 7 -
core/sql/exp/ExpPCodeOptsPeeling.cpp | 15 +-
core/sql/exp/ExpPCodeOptsRuntime.cpp | 16 +-
core/sql/exp/ExpPackDefs.cpp | 221 ++-
core/sql/exp/ExpSequenceFunction.cpp | 13 -
core/sql/exp/ExpSequenceFunction.h | 48 +-
core/sql/exp/ExpSqlTupp.h | 66 +-
core/sql/exp/exp_arith.cpp | 12 -
core/sql/exp/exp_attrs.cpp | 45 +-
core/sql/exp/exp_attrs.h | 8 +-
core/sql/exp/exp_bignum.cpp | 12 -
core/sql/exp/exp_bignum.h | 47 +-
core/sql/exp/exp_clause.cpp | 77 +-
core/sql/exp/exp_clause.h | 141 +-
core/sql/exp/exp_clause_derived.h | 660 ++++---
core/sql/exp/exp_conv.cpp | 82 +-
core/sql/exp/exp_datetime.cpp | 15 -
core/sql/exp/exp_datetime.h | 33 +-
core/sql/exp/exp_dp2_expr.cpp | 1 +
core/sql/exp/exp_dp2_expr.h | 33 +-
core/sql/exp/exp_eval.cpp | 23 +-
core/sql/exp/exp_expr.cpp | 36 +-
core/sql/exp/exp_expr.h | 361 ++--
core/sql/exp/exp_fixup.cpp | 43 -
core/sql/exp/exp_function.cpp | 158 +-
core/sql/exp/exp_function.h | 1663 ++++++++----------
core/sql/exp/exp_interval.h | 6 +-
core/sql/exp/exp_like.h | 59 +-
core/sql/exp/exp_math_func.cpp | 2 -
core/sql/exp/exp_math_func.h | 42 +-
core/sql/exp/exp_space.cpp | 49 -
core/sql/exp/exp_stdh.h | 4 +-
core/sql/exp/exp_tuple_desc.cpp | 3 +-
core/sql/exp/exp_tuple_desc.h | 4 +-
core/sql/export/ComDiags.cpp | 53 +-
core/sql/export/ComDiags.h | 343 +---
core/sql/export/ComMemoryDiags.h | 4 +-
core/sql/export/ExportDll.cpp | 3 +-
core/sql/export/HeapID.h | 18 +-
core/sql/export/HeapLog.h | 3 +-
core/sql/export/IpcMessageObj.cpp | 18 -
core/sql/export/IpcMessageObj.h | 85 +-
core/sql/export/NAAbort.cpp | 13 +-
core/sql/export/NABasicObject.cpp | 27 +-
core/sql/export/NABasicObject.h | 52 +-
core/sql/export/NAInternalError.h | 4 +-
core/sql/export/NAStringDef.cpp | 11 -
core/sql/export/NAStringDef.h | 83 +-
core/sql/export/NAVersionedObject.cpp | 22 +-
core/sql/export/NAVersionedObject.h | 815 ++++-----
core/sql/generator/GenAll.cpp | 1 -
core/sql/generator/GenExpGenerator.cpp | 150 +-
core/sql/generator/GenExpGenerator.h | 17 +-
core/sql/generator/GenExplain.cpp | 6 -
core/sql/generator/GenItemFunc.cpp | 219 ---
core/sql/generator/GenPreCode.cpp | 1 -
core/sql/generator/GenRelDCL.cpp | 6 -
core/sql/generator/GenRelMisc.cpp | 35 +-
core/sql/generator/Generator.cpp | 8 +-
core/sql/langman/LmComQueue.h | 3 -
core/sql/langman/LmCommon.h | 26 +-
core/sql/langman/LmDebug.h | 2 +-
core/sql/nskgmake/arkcmplib/Makefile | 2 -
core/sql/nskgmake/tdm_sqlcli/Makefile | 1 -
core/sql/optimizer/BindItemExpr.cpp | 37 -
core/sql/optimizer/BindRelExpr.cpp | 41 +-
core/sql/optimizer/ColStatDesc.cpp | 5 -
core/sql/optimizer/ControlDB.cpp | 7 +-
core/sql/optimizer/EncodedKeyValue.cpp | 2 +-
core/sql/optimizer/ItemConstr.h | 2 +-
core/sql/optimizer/ItemExpr.cpp | 112 --
core/sql/optimizer/ItemFunc.h | 92 +-
core/sql/optimizer/NATable.cpp | 14 +-
core/sql/optimizer/NATable.h | 4 +-
core/sql/optimizer/ObjectNames.cpp | 15 +-
core/sql/optimizer/ObjectNames.h | 19 -
core/sql/optimizer/RelCache.cpp | 10 +-
core/sql/optimizer/SchemaDB.cpp | 13 +-
core/sql/optimizer/SchemaDB.h | 13 +-
core/sql/optimizer/SynthType.cpp | 71 -
core/sql/optimizer/TableDesc.h | 5 -
core/sql/optimizer/VEGTable.h | 2 +-
core/sql/optimizer/costmethod.cpp | 2 +-
core/sql/optimizer/opt.cpp | 4 +-
core/sql/parser/HvRoles.h | 3 +-
core/sql/parser/ParKeyWords.cpp | 2 -
core/sql/parser/SqlParserAux.cpp | 5 +-
core/sql/parser/sqlparser.y | 146 --
core/sql/qms/QmmMain.cpp | 19 -
core/sql/qms/QmmQmm.cpp | 486 -----
core/sql/qms/QmmQmm.h | 38 -
core/sql/qms/QmsMain.cpp | 17 -
core/sql/qms/QmsRequest.cpp | 26 -
core/sql/qmscommon/QRDescriptor.cpp | 4 -
core/sql/qmscommon/QRQueries.cpp | 290 ++-
core/sql/regress/compGeneral/EXPECTED006.SB | 10 -
core/sql/regress/compGeneral/TEST006 | 4 -
core/sql/regress/executor/EXPECTED020 | 4 -
core/sql/regress/hive/EXPECTED009 | 24 +-
core/sql/regress/seabase/EXPECTED010 | 460 ++---
core/sql/regress/seabase/EXPECTED011 | 13 +-
core/sql/regress/seabase/EXPECTED016 | 119 +-
core/sql/runtimestats/SqlStats.cpp | 99 +-
core/sql/runtimestats/SqlStats.h | 14 -
core/sql/runtimestats/rts_msg.h | 2 -
core/sql/runtimestats/sscpipc.cpp | 2 -
core/sql/runtimestats/ssmpipc.cpp | 9 -
core/sql/runtimestats/ssmpipc.h | 7 -
core/sql/sort/CommonStructs.h | 3 -
core/sql/sort/Statistics.h | 3 -
core/sql/sqlcat/ReadTableDef.cpp | 56 -
core/sql/sqlcat/ReadTableDef.h | 54 -
core/sql/sqlcat/TrafDDLdesc.cpp | 65 +
core/sql/sqlcat/enum.h | 42 -
core/sql/sqlcat/readRealArk.cpp | 89 -
core/sql/sqlcat/readRealArk.h | 8 -
core/sql/sqlcat/vers_libsqlcat.cpp | 3 -
core/sql/sqlci/SqlCmd.cpp | 8 +-
core/sql/sqlci/SqlciDefs.h | 4 -
core/sql/sqlci/SqlciEnv.h | 2 +-
core/sql/sqlcomp/CmpDDLCatErrorCodes.h | 1 -
core/sql/sqlcomp/CmpDescribe.cpp | 3 +-
core/sql/sqlcomp/CmpMain.cpp | 35 +-
core/sql/sqlcomp/DefaultConstants.h | 27 -
core/sql/sqlcomp/QCache.cpp | 24 +-
core/sql/sqlcomp/QCache.h | 11 -
core/sql/sqlcomp/nadefaults.cpp | 26 +-
core/sql/sqlmsg/ErrorMessage.h | 1 -
core/sql/sqlmsg/GetErrorMessage.cpp | 2 -
core/sql/sqlmsg/GetErrorMessage.h | 22 +-
core/sql/udrserv/UdrStreams.cpp | 2 +-
core/sql/udrserv/spinfo.cpp | 6 +-
core/sql/udrserv/udrglobals.cpp | 7 +-
core/sql/udrserv/udrload.cpp | 4 +-
core/sql/udrserv/udrserv.cpp | 16 +-
core/sql/udrserv/udrunload.cpp | 4 +-
core/sql/udrserv/udrutil.cpp | 4 +-
core/sql/udrserv/udrutil.h | 4 +-
core/sql/ustat/hs_cli.cpp | 19 +-
core/sql/ustat/hs_globals.cpp | 2 -
core/sql/ustat/hs_read.cpp | 2 -
core/sql/ustat/hs_update.cpp | 1 -
461 files changed, 4840 insertions(+), 20729 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/conn/odbc/src/odbc/nsksrvr/SrvrConnect.cpp
----------------------------------------------------------------------
diff --git a/core/conn/odbc/src/odbc/nsksrvr/SrvrConnect.cpp b/core/conn/odbc/src/odbc/nsksrvr/SrvrConnect.cpp
index 39f363e..7b071d4 100644
--- a/core/conn/odbc/src/odbc/nsksrvr/SrvrConnect.cpp
+++ b/core/conn/odbc/src/odbc/nsksrvr/SrvrConnect.cpp
@@ -8971,6 +8971,11 @@ bool checkSyntaxInfoDisk(char* sqlString, char *diskName)
bool isInfoDisk(char*& sqlString, const IDL_char *stmtLabel, short& error, char *errBuf )
{
+ return true;
+
+#if 0
+ // Obsolete function, should not be used
+
static char buffer[1000];
static char * str = NULL;
static int strSize = 0;
@@ -9165,6 +9170,7 @@ out:
}
return true;
+#endif
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/conn/odbc/src/odbc/nsksrvrcore/SQLWrapper.cpp
----------------------------------------------------------------------
diff --git a/core/conn/odbc/src/odbc/nsksrvrcore/SQLWrapper.cpp b/core/conn/odbc/src/odbc/nsksrvrcore/SQLWrapper.cpp
index aaf78ed..15253db 100644
--- a/core/conn/odbc/src/odbc/nsksrvrcore/SQLWrapper.cpp
+++ b/core/conn/odbc/src/odbc/nsksrvrcore/SQLWrapper.cpp
@@ -68,11 +68,12 @@ bool sql_diagnostics = false;
Int32 SRVR::WSQL_EXEC_AddModule (
/*IN*/ SQLMODULE_ID * module_name)
{
+ // this SQL_EXEC_AddModule is an obsolete call. It should be removed.
+
SRVRTRACE_ENTER(WSQL_AddModule);
INIT
- retcode = SQL_EXEC_AddModule (
- module_name);
+ retcode = 0; //SQL_EXEC_AddModule (module_name);
SRVRTRACE_EXIT(WSQL_AddModule);
RETURN
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/SqlCompilerDebugger/QueryData.cpp
----------------------------------------------------------------------
diff --git a/core/sql/SqlCompilerDebugger/QueryData.cpp b/core/sql/SqlCompilerDebugger/QueryData.cpp
index 0400013..1851c15 100644
--- a/core/sql/SqlCompilerDebugger/QueryData.cpp
+++ b/core/sql/SqlCompilerDebugger/QueryData.cpp
@@ -124,7 +124,6 @@ void *QueryData::GetAnalysis()
void QueryData::SetTDBData(void *tdb, void *fragDir)
{
m_tdb = tdb;
- #if defined(NA_64BIT)
union {
struct {
unsigned int low;
@@ -134,9 +133,6 @@ void QueryData::SetTDBData(void *tdb, void *fragDir)
} tmp;
tmp.ptr = tdb;
m_baseAddr = tmp.data.low;
- #else
- m_baseAddr = (Lng32)tdb;
- #endif
m_fragDir = fragDir;
}
void QueryData::GetTDBData(void **tdb, void **fragDir, Lng32 & baseAddr)
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/arkcmp/CmpConnection.cpp
----------------------------------------------------------------------
diff --git a/core/sql/arkcmp/CmpConnection.cpp b/core/sql/arkcmp/CmpConnection.cpp
index fb4f9b6..0acf0d8 100644
--- a/core/sql/arkcmp/CmpConnection.cpp
+++ b/core/sql/arkcmp/CmpConnection.cpp
@@ -53,15 +53,13 @@
#include "NewDel.h"
#include "opt.h"
#include "NAExit.h"
-#include "SqlExportDllDefines.h"
#include "QCache.h"
#include "CompException.h"
#include "CostMethod.h"
-#include "ReadTableDef.h"
#include "NAExecTrans.h"
-extern THREAD_P SQLEXPORT_LIB_FUNC jmp_buf ExportJmpBuf;
-extern THREAD_P SQLEXPORT_LIB_FUNC jmp_buf CmpInternalErrorJmpBuf;
+extern THREAD_P jmp_buf ExportJmpBuf;
+extern THREAD_P jmp_buf CmpInternalErrorJmpBuf;
// This is a global variable used per process to identify whether this
// arkcmp process is spawned for internal stored procedure execution.
@@ -338,23 +336,11 @@ void ExCmpMessage::actOnReceive(IpcConnection* )
// CmpMessageDescribe
// CmpMessageUpdateHist
// CmpMessageSetTrans
- // CmpMessageReadTableDef
// CmpMessageEndSession
// Reset the parent qid and the requests that has parent qid will set it later
if (CmpCommon::context() && CmpCommon::context()->sqlSession())
CmpCommon::context()->sqlSession()->setParentQid(NULL);
- // Checks to see if there is currently an active TMF transaction
- // and set a flag in the readTableDef structure
- CmpContext *pContext = CmpCommon::context();
- /*
- Int64 transId = -1;
- NABoolean transInProgress = FALSE;
- // this call inherits transaction id, if one has been passed in.
- if (NAExecTrans(0, transId))
- transInProgress = TRUE;
- */
-
switch (typ=getNextObjType())
{
case CmpMessageObj::SQLTEXT_RECOMPILE :
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/arkcmp/CmpContext.cpp
----------------------------------------------------------------------
diff --git a/core/sql/arkcmp/CmpContext.cpp b/core/sql/arkcmp/CmpContext.cpp
index a2cdeb9..842ac7e 100644
--- a/core/sql/arkcmp/CmpContext.cpp
+++ b/core/sql/arkcmp/CmpContext.cpp
@@ -51,7 +51,6 @@
#include "NAHeap.h"
#include "NewDel.h"
#include "OptimizerSimulator.h"
-#include "ReadTableDef.h" // for ReadTableDef::endTransaction
#include "SchemaDB.h"
#include "CmpCommon.h"
#include "Rule.h"
@@ -60,9 +59,7 @@
#include "PhyProp.h" // for InitCostVariables()
#include "NAClusterInfo.h"
#include "UdfDllInteraction.h"
-#ifdef NA_CMPDLL
#define SQLPARSERGLOBALS_FLAGS // needed to set SqlParser_Flags
-#endif // NA_CMPDLL
#include "SqlParserGlobals.h" // last #include
#include "CmpErrLog.h"
#include "QRLogger.h"
@@ -74,10 +71,8 @@
#include "PCodeExprCache.h"
#include "HBaseClient_JNI.h"
-#ifdef NA_CMPDLL
#include "CompException.h"
#include "CostMethod.h"
-#endif // NA_CMPDLL
//++MV
extern "C" {
@@ -120,7 +115,7 @@ CmpContext::CmpContext(UInt32 f, CollHeap * h)
internalCompile_(NOT_INTERNAL_COMPILE),
// Template changes for Yosemite compiler incompatible with others
staticCursors_(hashCursor),
- readTableDef_(NULL), schemaDB_(NULL), controlDB_(NULL),tmpFileNumber_(-1),
+ schemaDB_(NULL), controlDB_(NULL),tmpFileNumber_(-1),
isRuntimeCompile_(TRUE),
mxcmpPrimarySecondaryStatusSet_(FALSE),
sqlmxRegress_(0),
@@ -207,10 +202,9 @@ CmpContext::CmpContext(UInt32 f, CollHeap * h)
}
CDBList_ = new (heap_) CollationDBList(heap_);
- readTableDef_ = new(heap_) ReadTableDef();
// globals for Optimizer -- also causes NADefaults table to be read in
- schemaDB_ = new(heap_) SchemaDB(readTableDef_);
+ schemaDB_ = new(heap_) SchemaDB();
// error during nadefault creation. Cannot proceed. Return.
if (! schemaDB_->getDefaults().getSqlParser_NADefaults_Ptr())
@@ -356,7 +350,6 @@ CmpContext::~CmpContext()
if (diags_)
diags_->decrRefCount();
- delete readTableDef_;
delete schemaDB_;
delete controlDB_;
NADELETE(optDefaults_, OptDefaults, heap_);
@@ -368,7 +361,6 @@ CmpContext::~CmpContext()
delete optSimulator_;
optSimulator_ = NULL;
- readTableDef_ = 0;
schemaDB_ = 0;
controlDB_ = 0;
optDefaults_ = 0;
@@ -773,7 +765,6 @@ CmpStatementISP* CmpContext::getISPStatement(Int64 id)
return 0;
}
-#ifdef NA_CMPDLL
// Interface to the embedded arkcmp, used for executor master to compile
// query statement using this SQL compiler inside the same process.
//
@@ -1227,5 +1218,3 @@ void CmpContext::clearAllCaches()
if(histogramCache_)
histogramCache_->invalidateCache();
}
-
-#endif // NA_CMPDLL
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/arkcmp/CmpContext.h
----------------------------------------------------------------------
diff --git a/core/sql/arkcmp/CmpContext.h b/core/sql/arkcmp/CmpContext.h
index dbe970d..ea366a6 100644
--- a/core/sql/arkcmp/CmpContext.h
+++ b/core/sql/arkcmp/CmpContext.h
@@ -62,13 +62,10 @@
#include "hs_cmp.h" // for uStatID_;
#include "NAAssert.h" // required after including a RogueWave file!
-#ifdef NA_CMPDLL
#include "CmpMessage.h"
-#endif // NA_CMPDLL
#include "SharedPtr.h"
-class ReadTableDef;
class SchemaDB;
class ControlDB;
class CmpStatement;
@@ -303,9 +300,6 @@ public :
// clean up globals at the end of each statement.
void cleanup(NABoolean exception=TRUE);
- // sqlcat globals
- ReadTableDef* readTableDef_;
-
// optimizer globals
// SchemaDB and initialization procedure at the beginning of each statement
@@ -383,7 +377,6 @@ public :
void switchBackContext();
void resetContext();
-#ifdef NA_CMPDLL
Int32
compileDirect(char *data, UInt32 dataLen, CollHeap *outHeap, Int32 charset,
CmpMessageObj::MessageTypeEnum op, char *&gen_code,
@@ -401,7 +394,6 @@ public :
void setNumSQNodes(CollIndex n) { numSQNodes_ = n; }
NABoolean getHasVirtualSQNodes() { return hasVirtualSQNodes_; }
void setHasVirtualSQNodes(NABoolean v) { hasVirtualSQNodes_ = v; }
-#endif // NA_CMPDLL
// used by sendAllControlsAndFlags() and restoreAllControlsAndFlags()
Int32 getCntlCount() { return allControlCount_; }
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/arkcmp/CmpSqlSession.cpp
----------------------------------------------------------------------
diff --git a/core/sql/arkcmp/CmpSqlSession.cpp b/core/sql/arkcmp/CmpSqlSession.cpp
index 6b56664..962e754 100644
--- a/core/sql/arkcmp/CmpSqlSession.cpp
+++ b/core/sql/arkcmp/CmpSqlSession.cpp
@@ -85,7 +85,7 @@ Lng32 CmpSqlSession::getUserInfoFromCLI()
{
NABoolean doDebug = FALSE;
-#if defined (NA_DEBUG_C_RUNTIME)
+#ifdef _DEBUG
doDebug = (getenv("DBUSER_DEBUG") ? TRUE : FALSE);
if (doDebug)
printf("[DBUSER:%d] BEGIN CmpSqlSession::getUserInfoFromCLI\n",
@@ -165,7 +165,7 @@ Lng32 CmpSqlSession::setDatabaseUser(Int32 userID, const char *userName)
{
NABoolean doDebug = FALSE;
-#if defined(NA_DEBUG_C_RUNTIME)
+#ifdef _DEBUG
doDebug = (getenv("DBUSER_DEBUG") ? TRUE : FALSE);
if (doDebug)
{
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/arkcmp/CmpStatement.cpp
----------------------------------------------------------------------
diff --git a/core/sql/arkcmp/CmpStatement.cpp b/core/sql/arkcmp/CmpStatement.cpp
index fab4c62..f1a8f4e 100644
--- a/core/sql/arkcmp/CmpStatement.cpp
+++ b/core/sql/arkcmp/CmpStatement.cpp
@@ -67,7 +67,6 @@
#include "CmpStoredProc.h"
#include "CmpDescribe.h"
#include "ProcessEnv.h"
-#include "ReadTableDef.h"
#include "SchemaDB.h"
#include "ControlDB.h"
#include "Context.h"
@@ -109,11 +108,9 @@
#include "UdfDllInteraction.h"
-#include "rtdu.h"
-
//#include "SqlParserGlobals.h" // must be the last #include.
-extern THREAD_P SQLEXPORT_LIB_FUNC jmp_buf ExportJmpBuf;
+extern THREAD_P jmp_buf ExportJmpBuf;
// -----------------------------------------------------------------------
// helper routines for CmpStatement class
@@ -151,7 +148,6 @@ CmpStatement::CmpStatement(CmpContext* context,
sqlTextStr_ = NULL;
sqlTextLen_ = 0;
sqlTextCharSet_ = (Lng32)SQLCHARSETCODE_UNKNOWN;
- measureStatementIndex_ = 0;
recompiling_ = FALSE;
isDDL_ = FALSE;
isSMDRecompile_ = FALSE;
@@ -324,7 +320,6 @@ static NABoolean processRecvdCmpCompileInfo(CmpStatement *cmpStmt,
NABoolean &catSchNameRecvd,
NAString &currCatName,
NAString &currSchName,
- char* &recompControlInfo,
NABoolean &nametypeNsk,
NABoolean &odbcProcess,
NABoolean &noTextCache,
@@ -333,7 +328,7 @@ static NABoolean processRecvdCmpCompileInfo(CmpStatement *cmpStmt,
NABoolean &doNotCachePlan)
{
char * catSchStr = NULL;
- cmpInfo->getUnpackedFields(sqlStr, catSchStr, recompControlInfo);
+ cmpInfo->getUnpackedFields(sqlStr, catSchStr);
sqlStrLen = cmpInfo->getSqlTextLen();
catSchNameRecvd = FALSE;
@@ -364,15 +359,6 @@ static NABoolean processRecvdCmpCompileInfo(CmpStatement *cmpStmt,
standaloneQuery = cmpInfo->standaloneQuery();
doNotCachePlan = cmpInfo->doNotCachePlan();
- if (recompControlInfo)
- {
- // if recompControlInfo is received, then ignore the specialized
- // default values (catSchStr, nametypeNsk, odbcProcess).
- // Values from recompControlInfo will be used to get to
- // them. Return from here.
- return FALSE;
- }
-
if (catSchStr)
{
// The cat.sch name was received. It may or may not need to be SET here,
@@ -403,7 +389,6 @@ static NABoolean processRecvdCmpCompileInfo(CmpStatement *cmpStmt,
}
}
- nametypeNsk = cmpInfo->nametypeNsk();
odbcProcess = cmpInfo->odbcProcess();
return FALSE; // no error
@@ -421,7 +406,6 @@ CmpStatement::process (const CmpMessageSQLText& sqltext)
Lng32 inputCS = 0;
NAString currCatName;
NAString currSchName;
- char * recompControlInfo = NULL;
NABoolean isSchNameRecvd;
NABoolean nametypeNsk;
NABoolean odbcProcess;
@@ -438,7 +422,6 @@ CmpStatement::process (const CmpMessageSQLText& sqltext)
inputCS,
isSchNameRecvd,
currCatName, currSchName,
- recompControlInfo,
nametypeNsk,
odbcProcess,
noTextCache,
@@ -540,76 +523,6 @@ CmpStatement::process (const CmpMessageSQLText& sqltext)
}
CmpStatement::ReturnStatus
-CmpStatement::setupRecompControlInfo(char * recompControlInfo,
- CmpMain * cmpmain,
- Lng32 charset)
-{
- // process recompControlInfo, if received
- if (! recompControlInfo)
- return CmpStatement_SUCCESS;
-
- RtduRecompControlInfo * rci = (RtduRecompControlInfo*)recompControlInfo;
- rci->unpackIt((char*)rci);
-
- // unpack the defaults in rci->defaults..
- context_->schemaDB_->getDefaults().unpackDefaultsFromBuffer(rci->numCqdInfoEntries(),
- rci->cqdInfo());
- // set up current defaults from rci->defaults.
- context_->schemaDB_->getDefaults().createNewDefaults(rci->numCqdInfoEntries(),
- rci->cqdInfo());
-
-
- // save current CTO and reset ctList_.
- context_->controlDB_->saveCurrentCTO();
-
- if (rci->ctoInfoLength() > 0)
- {
- context_->controlDB_->unpackControlTableOptionsFromBuffer(rci->ctoInfo());
- }
-
- // save current CQS and reset requiredShape.
- context_->controlDB_->saveCurrentCQS();
-
- // if a shape as been sent, use it.
- if (rci->cqsInfoLength() > 0)
- {
- // compile the CQS passed in. Do not generate code for it.
- char * genCode = NULL;
- ULng32 genCodeLen = 0;
- QueryText qText(rci->cqsInfo(), SQLCHARSETCODE_ISO88591);
-
- CmpMain::ReturnStatus rs =
- cmpmain->sqlcompStatic(qText, 0,
- &genCode, &genCodeLen,
- outHeap_, CmpMain::PRECODEGEN,
- charset);
- }
-
- return CmpStatement_SUCCESS;
-}
-
-CmpStatement::ReturnStatus
-CmpStatement::restoreRecompControlInfo(char * recompControlInfo)
-{
- if (! recompControlInfo)
- return CmpStatement_SUCCESS;
-
- RtduRecompControlInfo * rci = (RtduRecompControlInfo*)recompControlInfo;
-
- // restore the original cqd.
- context_->schemaDB_->getDefaults().restoreDefaults(rci->numCqdInfoEntries(),
- rci->cqdInfo());
-
- // restore saved CTO
- context_->controlDB_->restoreCurrentCTO();
-
- // restore saved CQS
- context_->controlDB_->restoreCurrentCQS();
-
- return CmpStatement_SUCCESS;
-}
-
-CmpStatement::ReturnStatus
CmpStatement::process (const CmpMessageCompileStmt& compilestmt)
{
CmpMain cmpmain;
@@ -621,7 +534,6 @@ CmpStatement::process (const CmpMessageCompileStmt& compilestmt)
Lng32 inputCS = 0;
NAString currCatName;
NAString currSchName;
- char * recompControlInfo = NULL;
NABoolean isSchNameRecvd;
NABoolean nametypeNsk;
NABoolean odbcProcess;
@@ -638,7 +550,6 @@ CmpStatement::process (const CmpMessageCompileStmt& compilestmt)
inputCS,
isSchNameRecvd,
currCatName, currSchName,
- recompControlInfo,
nametypeNsk,
odbcProcess,
noTextCache,
@@ -658,11 +569,6 @@ CmpStatement::process (const CmpMessageCompileStmt& compilestmt)
sqlTextStr_ = sqlStr;
sqlTextLen_ = sqlStrLen;
- // process recompControlInfo, if received
- if (recompControlInfo)
- setupRecompControlInfo(recompControlInfo, &cmpmain, inputCS);
-
-
// set ODBC_PROCESS default.
NABoolean odbcProcessChanged = FALSE;
if (odbcProcess)
@@ -718,10 +624,6 @@ CmpStatement::process (const CmpMessageCompileStmt& compilestmt)
context_->schemaDB_->getDefaults().setSchemaTrustedFast(currSchName);
}
- if (recompControlInfo)
- restoreRecompControlInfo(recompControlInfo);
-
-
if (odbcProcessChanged)
{
// restore the original odbc process setting
@@ -758,7 +660,6 @@ CmpStatement::process (const CmpMessageDDL& statement)
Lng32 inputCS = 0;
NAString currCatName;
NAString currSchName;
- char * recompControlInfo = NULL;
NABoolean isSchNameRecvd;
NABoolean nametypeNsk;
NABoolean odbcProcess;
@@ -777,7 +678,6 @@ CmpStatement::process (const CmpMessageDDL& statement)
inputCS,
isSchNameRecvd,
currCatName, currSchName,
- recompControlInfo,
nametypeNsk,
odbcProcess,
noTextCache,
@@ -788,9 +688,6 @@ CmpStatement::process (const CmpMessageDDL& statement)
CmpCommon::context()->sqlSession()->setParentQid(
statement.getParentQid());
- // process recompControlInfo, if received
- if (recompControlInfo)
- setupRecompControlInfo(recompControlInfo, &cmpmain);
cmpmain.setSqlParserFlags(statement.getFlags());
@@ -850,16 +747,13 @@ CmpStatement::process (const CmpMessageDDL& statement)
{
sqlTextStr_ = NULL;
sqlTextLen_ = 0;
- if (recompControlInfo)
- restoreRecompControlInfo(recompControlInfo);
+
return CmpStatement_ERROR;
}
sqlTextStr_ = NULL;
sqlTextLen_ = 0;
-
- if (recompControlInfo)
- restoreRecompControlInfo(recompControlInfo);
+
return CmpStatement_SUCCESS;
}
@@ -1048,7 +942,6 @@ CmpStatement::process(const CmpMessageDDLwithStatus &statement)
Lng32 inputCS = 0;
NAString currCatName;
NAString currSchName;
- char * recompControlInfo = NULL;
NABoolean isSchNameRecvd;
NABoolean nametypeNsk;
NABoolean odbcProcess;
@@ -1067,7 +960,6 @@ CmpStatement::process(const CmpMessageDDLwithStatus &statement)
inputCS,
isSchNameRecvd,
currCatName, currSchName,
- recompControlInfo,
nametypeNsk,
odbcProcess,
noTextCache,
@@ -1077,10 +969,6 @@ CmpStatement::process(const CmpMessageDDLwithStatus &statement)
return CmpStatement_ERROR;
CmpCommon::context()->sqlSession()->setParentQid(statement.getParentQid());
- // process recompControlInfo, if received
- if (recompControlInfo)
- setupRecompControlInfo(recompControlInfo, &cmpmain);
-
cmpmain.setSqlParserFlags(statement.getFlags());
// set the current catalog and schema names.
@@ -1357,7 +1245,6 @@ CmpStatement::process (const CmpMessageObj& request)
// CmpMessageDescribe
// CmpMessageUpdateHist
// CmpMessageSetTrans
- // CmpMessageReadTableDef
// CmpMessageEndSession
// Reset the parent qid and the requests that has parent qid will set it later
CmpCommon::context()->sqlSession()->setParentQid(NULL);
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/arkcmp/CmpStatement.h
----------------------------------------------------------------------
diff --git a/core/sql/arkcmp/CmpStatement.h b/core/sql/arkcmp/CmpStatement.h
index 8e9f6cf..14b1781 100644
--- a/core/sql/arkcmp/CmpStatement.h
+++ b/core/sql/arkcmp/CmpStatement.h
@@ -132,10 +132,6 @@ public:
void setSqlTextLen(Lng32 txtLen) { sqlTextLen_ = txtLen; }
void setSqlTextCharSet(Lng32 charSet) { sqlTextCharSet_ = charSet; }
- // get/set statement index
- Int32 getStmtIndex() const { return measureStatementIndex_; }
- void setStmtIndex(Int32 si) { measureStatementIndex_ = si; }
-
void setSMDRecompile(NABoolean TorF ) {isSMDRecompile_ = TorF;}
// set the exceptionRaised_ flag;
void exceptionRaised();
@@ -282,9 +278,6 @@ private:
Lng32 sqlTextLen_;
Lng32 sqlTextCharSet_;
- // statement index stored in the module file, mainly used by MEASURE
- Int32 measureStatementIndex_;
-
//flag, indicates if this is a recompilation
NABoolean recompiling_;
@@ -303,11 +296,6 @@ private:
// force a shape
CqsWA* cqsWA_;
- ReturnStatus setupRecompControlInfo(char * recompControlInfo,
- CmpMain * cmpmain,
- Lng32 charset=SQLCHARSETCODE_UNKNOWN);
- ReturnStatus restoreRecompControlInfo(char * recompControlInfo);
-
QueryAnalysis* queryAnalysis_;
CostMethod* CostMethodHead_;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/arkcmp/CmpStoredProc.cpp
----------------------------------------------------------------------
diff --git a/core/sql/arkcmp/CmpStoredProc.cpp b/core/sql/arkcmp/CmpStoredProc.cpp
index 7d90c7e..4206685 100644
--- a/core/sql/arkcmp/CmpStoredProc.cpp
+++ b/core/sql/arkcmp/CmpStoredProc.cpp
@@ -335,8 +335,6 @@ NABoolean CmpSPOutputFormat::SetFormat(Lng32 nCols,
table_desc->tableDesc()->colcount;
index_desc->indexesDesc()->blocksize = 4096; // anything > 0
- // cannot simply point to same files desc as the table one,
- // because then ReadTableDef::deleteTree frees same memory twice (error)
TrafDesc * i_files_desc = TrafAllocateDDLdesc(DESC_FILES_TYPE, NULL);
index_desc->indexesDesc()->files_desc = i_files_desc;
@@ -392,9 +390,6 @@ NABoolean CmpSPOutputFormat::getKeysDesc(Lng32 nKeys,
return TRUE;
}
-// ##TODO: this code might be better put into ReadTableDef or readRealArk.cpp
-// ##For now for new data types, etc. this piece will be changed accordingly.
-
NABoolean CmpSPOutputFormat::ElemDDLColDef2ColumnDescStruct
(ElemDDLColDef* elem,
const char* tableName,
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/arkcmp/ProcessEnv.cpp
----------------------------------------------------------------------
diff --git a/core/sql/arkcmp/ProcessEnv.cpp b/core/sql/arkcmp/ProcessEnv.cpp
index c47f2d5..08149b9 100644
--- a/core/sql/arkcmp/ProcessEnv.cpp
+++ b/core/sql/arkcmp/ProcessEnv.cpp
@@ -136,7 +136,6 @@ Int32 ProcessEnv::unsetEnv(char* env)
return 0;
}
-#ifdef NA_CMPDLL
void ProcessEnv::resetEnv(const char* envName)
{
if (!envName)
@@ -172,7 +171,6 @@ void ProcessEnv::resetEnv(const char* envName)
envs_.remove(deleteArray[j]);
}
}
-#endif // NA_CMPDLL
Int32 ProcessEnv::chdir(char* dir)
{
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/arkcmp/ProcessEnv.h
----------------------------------------------------------------------
diff --git a/core/sql/arkcmp/ProcessEnv.h b/core/sql/arkcmp/ProcessEnv.h
index 4b54f17..263800c 100644
--- a/core/sql/arkcmp/ProcessEnv.h
+++ b/core/sql/arkcmp/ProcessEnv.h
@@ -55,10 +55,8 @@ public:
void cleanup();
void setEnv(char** newenvs, Lng32 nEnvs);
-#ifdef NA_CMPDLL
void addOrChangeEnv(char **newenvs, Lng32 nEnvs);
void resetEnv(const char *envName);
-#endif // NA_CMPDLL
Int32 unsetEnv(char* env);
Int32 chdir(char* dir);
void dumpEnvs();
@@ -66,9 +64,6 @@ public:
virtual ~ProcessEnv();
private:
-#ifndef NA_CMPDLL
- void addOrChangeEnv(char **newenvs, Lng32 nEnvs);
-#endif // ! NA_CMPDLL
void removeEnv(char **newenvs, Lng32 nEnvs);
CollHeap *heap_;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/bin/SqlciErrors.txt
----------------------------------------------------------------------
diff --git a/core/sql/bin/SqlciErrors.txt b/core/sql/bin/SqlciErrors.txt
index fa6ce82..028a379 100644
--- a/core/sql/bin/SqlciErrors.txt
+++ b/core/sql/bin/SqlciErrors.txt
@@ -1403,7 +1403,6 @@ $1~String1 --------------------------------
4416 ZZZZZ 99999 BEGINNER MINOR LOGONLY Certificate has been updated
4417 ZZZZZ 99999 BEGINNER MAJOR LOGONLY Error in shared segment
4418 ZZZZZ 99999 BEGINNER MAJOR LOGONLY Unauthorized user
-4419 ZZZZZ 99999 BEGINNER MAJOR DBADMIN Mismatched transaction identifiers during end transaction: Compiler transid $0~string0, Executor transid $0~string1, TMF transid $0~string2, TMF tcbref $0~string3.
4450 ZZZZZ 99999 BEGINNER MAJOR DBADMIN Function $0~String0 is not a built-in function or registered user-defined function.
4451 ZZZZZ 99999 BEGINNER MAJOR DBADMIN Action $0~String0 is not a registered action for user-defined function $1~String1.
4452 ZZZZZ 99999 BEGINNER MAJOR DBADMIN Function $0~String0 expects $1~Int0 input values but was called with $2~Int1 values.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/bin/SqlciMain.cpp
----------------------------------------------------------------------
diff --git a/core/sql/bin/SqlciMain.cpp b/core/sql/bin/SqlciMain.cpp
index 60076e5..f453b8a 100644
--- a/core/sql/bin/SqlciMain.cpp
+++ b/core/sql/bin/SqlciMain.cpp
@@ -73,7 +73,7 @@
DEFINE_DOVERS(sqlci)
-#if defined(_DEBUG) && !defined(NA_NSK)
+#if defined(_DEBUG)
#include "security/dsecure.h"
#define psecure_h_including_section
#define psecure_h_security_psb_set_
@@ -344,15 +344,3 @@ Int32 main (Int32 argc, char *argv[])
#endif // _DEBUG
return 0;
}
-
-
-#ifndef NA_CMPDLL
-#include "NAType.h"
-NABoolean NAType::isComparable(const NAType &other,
- ItemExpr *parentOp,
- Int32 emitErr) const
-{ return FALSE; }
-
-#endif // Not NA_CMPDLL
-
-
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/bin/arkcmp.cpp
----------------------------------------------------------------------
diff --git a/core/sql/bin/arkcmp.cpp b/core/sql/bin/arkcmp.cpp
index d3ee9c0..638ba55 100644
--- a/core/sql/bin/arkcmp.cpp
+++ b/core/sql/bin/arkcmp.cpp
@@ -55,8 +55,6 @@ extern void my_mpi_fclose();
DEFINE_DOVERS(tdm_arkcmp)
-#include "SqlExportDllDefines.h"
-
#include "CmpMessage.h"
#include "CmpConnection.h"
#include "CmpContext.h"
@@ -87,14 +85,11 @@ DEFINE_DOVERS(tdm_arkcmp)
#include "QRLogger.h"
-
-// extern SQLEXPORT_LIB_FUNC jmp_buf ExportJmpBuf;
THREAD_P jmp_buf ExportJmpBuf;
ostream &operator<<(ostream &dest, const ComDiagsArea& da);
-
extern CmpISPInterface cmpISPInterface;
// The following global is defined in CmpConnection.cpp
@@ -325,7 +320,7 @@ Int32 main(Int32 argc, char **argv)
return 0;
}
-#ifdef NA_CMPDLL
+
// stubs
Int32 arkcmp_main_entry()
{ // return 1 for embedded cmpiler not created
@@ -333,5 +328,5 @@ Int32 arkcmp_main_entry()
}
// no-op
void arkcmp_main_exit() {}
-#endif // NA_CMPDLL
+
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/bin/ex_esp_main.cpp
----------------------------------------------------------------------
diff --git a/core/sql/bin/ex_esp_main.cpp b/core/sql/bin/ex_esp_main.cpp
index 9ad31c3..ae27eec 100644
--- a/core/sql/bin/ex_esp_main.cpp
+++ b/core/sql/bin/ex_esp_main.cpp
@@ -53,12 +53,7 @@
#include "ComUser.h"
#include "ExpError.h"
#include "ComSqlId.h"
-#if !defined(__EID) && !defined(NA_WINNT)
-#endif
#include "PortProcessCalls.h"
-
-
-
#include "cextdecs/cextdecs.h"
#include "security/dsecure.h"
#define psecure_h_including_section
@@ -78,7 +73,7 @@ DEFINE_DOVERS(tdm_arkesp)
#include "Context.h"
#include "StmtCompilationMode.h"
-#if (defined(NA_GUARDIAN_IPC) || defined(NA_GUARDIAN_MSG))
+#if (defined(NA_GUARDIAN_IPC))
// -----------------------------------------------------------------------
// ESP control connection, handle system messages
// -----------------------------------------------------------------------
@@ -129,7 +124,7 @@ private:
// we only need these members in non-WINNT builds.
};
-#endif // NA_GUARDIAN_IPC || NA_GUARDIAN_MSG
+#endif // NA_GUARDIAN_IPC
class EspSockControlConnection : public SockControlConnection
{
@@ -301,11 +296,8 @@ GuaReceiveFastStart::GuaReceiveFastStart()
awaitiox_ = TRUE;
if (fileGetInfoError_ == 0 && awaitioxError_ == 6)
{
-#ifdef SQ_NEW_PHANDLE
fileGetReceiveInfoError_ = BFILE_GETRECEIVEINFO_((FS_Receiveinfo_Type *)&receiveInfo_);
-#else
- fileGetReceiveInfoError_ = BFILE_GETRECEIVEINFO_((short *)&receiveInfo_);
-#endif
+
// fileGetReceiveInfo_ -- altered
fileGetReceiveInfo_ = TRUE;
if (fileGetReceiveInfoError_ == 0)
@@ -469,7 +461,7 @@ void DoEspStartup(Int32 argc,
// create control connection (open $RECEIVE in Tandemese)
switch (allocMethod)
{
-#if (defined(NA_GUARDIAN_IPC) || defined(NA_GUARDIAN_MSG)) // (3/19/97)
+#if (defined(NA_GUARDIAN_IPC))
case IPC_LAUNCH_GUARDIAN_PROCESS:
case IPC_SPAWN_OSS_PROCESS:
{
@@ -489,7 +481,7 @@ void DoEspStartup(Int32 argc,
env.setIdleTimestamp();
}
break;
-#endif //NA_GUARDIAN_IPC || NA_GUARDIAN_MSG
+#endif //NA_GUARDIAN_IPC
case IPC_INETD:
case IPC_POSIX_FORK_EXEC:
@@ -527,7 +519,7 @@ void DoEspStartup(Int32 argc,
}
}
-#if (defined(NA_GUARDIAN_IPC) || defined(NA_GUARDIAN_MSG)) // (3/19/97)
+#if (defined(NA_GUARDIAN_IPC))
void EspGuaControlConnection::actOnSystemMessage(
short messageNum,
IpcMessageBufferPtr sysMsg,
@@ -849,7 +841,7 @@ void EspNewIncomingConnectionStream::actOnReceive(IpcConnection *connection)
// set.
NABoolean doAuthIdCheck = TRUE;
Int32 status = 0;
-#ifdef NA_DEBUG_C_RUNTIME
+#ifdef _DEBUG
const char *envvar = getenv("NO_EXTRACT_AUTHID_CHECK");
if (envvar && envvar[0])
doAuthIdCheck = FALSE;
@@ -877,7 +869,7 @@ void EspNewIncomingConnectionStream::actOnReceive(IpcConnection *connection)
// Make sure user id passed in ExMsgSecurityInfo matches
// the user id associated with the current session
-#if defined(NA_DEBUG_C_RUNTIME)
+#if defined(_DEBUG)
NABoolean doDebug = (getenv("DBUSER_DEBUG") ? TRUE : FALSE);
if (doDebug)
printf("[DBUSER:%d] ESP extract user ID: "
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/bin/vproceid.cpp
----------------------------------------------------------------------
diff --git a/core/sql/bin/vproceid.cpp b/core/sql/bin/vproceid.cpp
index ac55d1a..ac276b8 100644
--- a/core/sql/bin/vproceid.cpp
+++ b/core/sql/bin/vproceid.cpp
@@ -38,7 +38,7 @@
#include "Platform.h"
extern "C" {
-NA_EIDPROC void
+void
VPROC (PRODNUMEID,DATE1EID,EID_CC_LABEL)
() {} }
[19/30] incubator-trafodion git commit: TRAFODION-2731 CodeCleanup:
Remove obsolete, legacy and unused code
Posted by an...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/common/NAMemory.cpp
----------------------------------------------------------------------
diff --git a/core/sql/common/NAMemory.cpp b/core/sql/common/NAMemory.cpp
index 7b781f0..3dd5afd 100644
--- a/core/sql/common/NAMemory.cpp
+++ b/core/sql/common/NAMemory.cpp
@@ -54,25 +54,13 @@
#include <errno.h>
#include "seabed/fs.h"
-#ifndef __EID
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <iostream>
-#endif
-#ifndef STAND_ALONE
#include "str.h"
#include "ComSpace.h"
-#else
-#define MEMALLOC_FAILURE 1
-#endif
-
-#ifdef __EID
-#include "ExeDp2.h"
-#endif
-
-
#include <unistd.h>
#include <sys/types.h>
@@ -83,12 +71,10 @@
#include <fstream>
#endif
-#ifndef STAND_ALONE
#include "NAError.h"
#include "HeapLog.h"
#include "Platform.h"
#include "NAAssert.h"
-#endif
#include "ComRtUtils.h"
#include "StmtCompilationMode.h"
@@ -155,7 +141,6 @@ THREAD_P DeallocTraceEntry (*deallocTraceArray)[deallocTraceEntries] = 0;
#include "Collections.h"
#endif // _DEBUG
-#if defined(NA_LINUX) && !defined(__EID)
class NAMutex
{
bool threadSafe_;
@@ -184,29 +169,21 @@ public:
}
}
};
-#endif
-#if !defined (NA_WINNT) && !defined(__EID)
#include "logmxevent.h"
-#endif //!defined (NA_WINNT) && !defined(__EID)
-
#define NO_MERGE 0x0
#define BACKWARD_MERGE 0x1
#define FORWARD_MERGE 0x2
-#if !defined (NA_WINNT) && !defined(__EID)
#include "logmxevent.h"
-#endif //!defined (NA_WINNT) && !defined(__EID)
-#if !defined(STAND_ALONE) && (defined(__TANDEM) || defined(NA_LINUX)) && !defined(__EID)
extern short getRTSSemaphore(); // Functions implemented in SqlStats.cpp
extern void releaseRTSSemaphore();
extern NABoolean checkIfRTSSemaphoreLocked();
extern void updateMemStats();
extern SB_Phandle_Type *getMySsmpPhandle();
-#endif
//CollHeap *CTXTHEAP__ = NULL; // a global, set by CmpContext ctor and used by
// Collections.cpp allocate method
@@ -214,16 +191,12 @@ const size_t DEFAULT_NT_HEAP_INIT_SIZE = 524288;
const size_t DEFAULT_NT_HEAP_MAX_SIZE = (size_t)-1; // by default, heaps have no max size
const size_t DEFAULT_NT_HEAP_INCR_SIZE = 524288;
-
-#ifdef HAVE_MMAP
// MIN_MMAP_ALLOC_SIZE defines the minimum user size that will be used to
// allocate a NABlock using mmap().
const size_t MIN_MMAP_ALLOC_SIZE = 524288;
-#endif
-
-// Ignore all HEAPLOG stuff if STAND_ALONE or MUSE
-#if defined(STAND_ALONE) || defined(MUSE)
+// Ignore all HEAPLOG stuff if MUSE
+#if defined(MUSE)
#undef HEAPLOG_ON
#undef HEAPLOG_OFF
#undef HEAPLOG_REINITIALIZE
@@ -234,7 +207,7 @@ const size_t MIN_MMAP_ALLOC_SIZE = 524288;
#define HEAPLOG_REINITIALIZE(a)
#define HEAPLOG_ADD_ENTRY(a, b, c, d)
#define HEAPLOG_DELETE_ENTRY(a, b)
-#endif // STAND_ALONE
+#endif
// ****************************************************************************
// Numeric constants that are local to this file
@@ -275,11 +248,7 @@ const size_t DEFAULT_MAX_INCREMENT = 4194304;
#define BLOCK_OVERHEAD (sizeof(NABlock) + 2 * sizeof(size_t))
-#ifdef NA_64BIT
#define MAX_REQUEST (0x7fffffffffffff - FRAG_ALIGN_MASK - FRAGMENT_OVERHEAD)
-#else
-#define MAX_REQUEST (0x7fffffff - FRAG_ALIGN_MASK - FRAGMENT_OVERHEAD)
-#endif // NA_64BIT
#define MIN_REQUEST (MIN_FRAGMENT_SIZE - FRAGMENT_OVERHEAD - 1)
#define SMALLBIN_SHIFT 3
#define TREEBIN_SHIFT 8
@@ -299,7 +268,7 @@ const size_t DEFAULT_MAX_INCREMENT = 4194304;
// addressing by index. See above about smallbin repositioning
-#if ( defined(_DEBUG) || defined(NSK_MEMDEBUG) ) && !defined(__EID)
+#if ( defined(_DEBUG) || defined(NSK_MEMDEBUG) )
#define RTCHECK(e) (e)
#define CORRUPTION_ERROR_ACTION assert(0)
#define USAGE_ERROR_ACTION assert(0)
@@ -325,7 +294,7 @@ const size_t DEFAULT_MAX_INCREMENT = 4194304;
#define checkTopFragment(P)
#define checkMallocedFragment(P,N)
#define checkMallocState()
-#endif // !( defined(_DEBUG) || defined(NSK_MEMDEBUG) ) && !defined(__EID)
+#endif // !( defined(_DEBUG) || defined(NSK_MEMDEBUG) )
// ****************************************************************************
#ifdef NA_YOS_SIMULATION
@@ -393,14 +362,12 @@ NABlock::isExternSegment()
return (sflags_ & EXTERN_BIT) != 0;
}
-#ifdef HAVE_MMAP
// Return whether this NABlock was allocated using mmap().
inline NABoolean
NABlock::isMMapped()
{
return (sflags_ & MMAP_BIT) != 0;
}
-#endif // HAVE_MMAP
// Return the offset of the first fragment in the block
inline size_t
@@ -682,7 +649,6 @@ NAHeapFragment::setFencePosts()
next->head_ = FENCEPOST_HEAD;
}
-#ifdef HAVE_MMAP
// Return whether the MMAPPED_BIT is set. This bit is only set when a
// NABlock contains a single large fragment and the NABlock was allocated
// using mmap().
@@ -701,7 +667,6 @@ NAHeapFragment::setSizeOfMMapFragment(size_t size)
((NAHeapFragment*)((char*)this + size))->head_ = FENCEPOST_HEAD;
((NAHeapFragment*)((char*)this + size + sizeof(size_t)))->head_ = FENCEPOST_HEAD;
}
-#endif
// mark free pages in this fragment as "non-dirty". Benefits are:
// 1) pages will become readily stealable if needed by the OS.
@@ -782,7 +747,6 @@ NATreeFragment::setFreedNSKMemory(short value)
freedNSKMemory_ = value;
}
-#if (defined(NA_LINUX) && !defined(__EID))
Lng32 NAMemory::getVmSize()
{
pid_t myPid;
@@ -835,9 +799,7 @@ NATreeFragment::setFreedNSKMemory(short value)
crowdedTotalSize_ = 0ll;
}
}
-#endif // (defined(NA_LINUX) && !defined(__EID))
-#ifdef HAVE_MMAP
NABlock*
NAMemory::allocateMMapBlock(size_t s)
{
@@ -846,15 +808,11 @@ NAMemory::allocateMMapBlock(size_t s)
(MAP_PRIVATE|MAP_ANONYMOUS), -1, 0);
if (blk == (NABlock*)-1)
{
-#ifndef __EID
mmapErrno_ = errno;
-#endif //__EID
return NULL;
}
-#ifndef __EID
else
allocationIncrement(s);
-#endif // __EID
// one more block allocated
blockCnt_++;
@@ -873,37 +831,22 @@ NAMemory::allocateMMapBlock(size_t s)
inline void
NAMemory::deallocateMMapBlock(NABlock *blk)
{
-#ifndef __EID
allocationDecrement(blk->size_);
-#endif // __EID
Int32 munmapRetVal;
munmapRetVal = munmap((void*)blk, blk->size_);
-#ifndef __EID
if (munmapRetVal == -1)
munmapErrno_ = errno;
-#endif // __EID
}
-#endif // HAVE_MMAP
-
// Either the correct call to free the memory used by a NABlock. This function
// prevents a lot of extra #ifdef code in later sections of code.
inline void
NAMemory::sysFreeBlock(NABlock *blk)
{
-#ifdef HAVE_MMAP
if (blk->isMMapped())
deallocateMMapBlock(blk);
else
free((void*)blk);
-#else
- {
-#if (defined(NA_LINUX) && !defined(__EID))
- allocationDecrement(blk->size_);
-#endif // NA_LINUX
- free((void*)blk);
- }
-#endif
}
#ifndef MUSE
@@ -929,7 +872,6 @@ NAMemory::NAMemory(const char * name)
exhaustedMem_(FALSE),
errorsMask_(0),
crowdedTotalSize_(0ll)
-#ifndef __EID
, allocationDelta_(0ll)
, procStatusFile_(NULL)
, mmapErrno_(0)
@@ -937,9 +879,8 @@ NAMemory::NAMemory(const char * name)
, lastVmSize_(0l)
, maxVmSize_(0l)
, sharedMemory_(FALSE)
-#endif // __EID
{
-#if ( defined(_DEBUG) || defined(NSK_MEMDEBUG) ) && !defined(__EID)
+#if ( defined(_DEBUG) || defined(NSK_MEMDEBUG) )
char * debugLevel = getenv("MEMDEBUG");
if (debugLevel)
debugLevel_ = (Lng32)atoi(debugLevel);
@@ -953,13 +894,11 @@ NAMemory::NAMemory(const char * name)
else
setName("Unnamed memory");
-#ifndef STAND_ALONE
// need to initialize an NAStringRef object "on top" of the array
// (don't touch this unless you know what you're doing!)
NAStringRef * tmp =
new ( (void*) (&nullNAStringRep_[3]) )
NAStringRef (NAStringRef::NULL_CTOR, this) ;
-#endif
}
NAMemory::NAMemory(const char * name, NAHeap * parent, size_t blockSize,
@@ -985,7 +924,6 @@ NAMemory::NAMemory(const char * name, NAHeap * parent, size_t blockSize,
exhaustedMem_(FALSE),
errorsMask_(0),
crowdedTotalSize_(0ll)
-#ifndef __EID
, allocationDelta_(0ll)
, procStatusFile_(NULL)
, mmapErrno_(0)
@@ -993,15 +931,12 @@ NAMemory::NAMemory(const char * name, NAHeap * parent, size_t blockSize,
, lastVmSize_(0l)
, maxVmSize_(0l)
, sharedMemory_(FALSE)
-#endif // __EID
{
-#ifndef __EID
if (parent_->getSharedMemory())
setSharedMemory();
-#endif
// a derived memory has to have a parent from which it is derived
assert(parent_);
-#if ( defined(_DEBUG) || defined(NSK_MEMDEBUG) ) && !defined(__EID)
+#if ( defined(_DEBUG) || defined(NSK_MEMDEBUG) )
char * debugLevel = getenv("MEMDEBUG");
if (debugLevel)
debugLevel_ = (Lng32)atoi(debugLevel);
@@ -1017,13 +952,11 @@ NAMemory::NAMemory(const char * name, NAHeap * parent, size_t blockSize,
blockSize = (Lng32)524288;
initialSize_ = incrementSize_ = blockSize;
-#ifndef STAND_ALONE
// need to initialize an NAStringRef object "on top" of the array
// (don't touch this unless you know what you're doing!)
NAStringRef * tmp =
new ( (void*) (&nullNAStringRep_[3]) )
NAStringRef (NAStringRef::NULL_CTOR, this) ;
-#endif
}
NAMemory::NAMemory(const char * name, NAMemoryType type, size_t blockSize,
@@ -1049,7 +982,6 @@ NAMemory::NAMemory(const char * name, NAMemoryType type, size_t blockSize,
exhaustedMem_(FALSE),
errorsMask_(0),
crowdedTotalSize_(0ll)
-#ifndef __EID
, allocationDelta_(0ll)
, procStatusFile_(NULL)
, mmapErrno_(0)
@@ -1057,11 +989,10 @@ NAMemory::NAMemory(const char * name, NAMemoryType type, size_t blockSize,
, lastVmSize_(0l)
, maxVmSize_(0l)
, sharedMemory_(FALSE)
-#endif // __EID
{
// call setType to initialize the values of all the sizes
setType(type_, blockSize);
-#if ( defined(_DEBUG) || defined(NSK_MEMDEBUG) ) && !defined(__EID)
+#if ( defined(_DEBUG) || defined(NSK_MEMDEBUG) )
char * debugLevel = getenv("MEMDEBUG");
if (debugLevel)
debugLevel_ = (Lng32)atoi(debugLevel);
@@ -1072,13 +1003,11 @@ NAMemory::NAMemory(const char * name, NAMemoryType type, size_t blockSize,
#endif
setName(name);
-#ifndef STAND_ALONE
// need to initialize an NAStringRef object "on top" of the array
// (don't touch this unless you know what you're doing!)
NAStringRef * tmp =
new ( (void*) (&nullNAStringRep_[3]) )
NAStringRef (NAStringRef::NULL_CTOR, this) ;
-#endif
}
NAMemory::NAMemory(const char * name,
@@ -1109,7 +1038,6 @@ NAMemory::NAMemory(const char * name,
exhaustedMem_(FALSE),
errorsMask_(0),
crowdedTotalSize_(0ll)
-#ifndef __EID
, allocationDelta_(0ll)
, procStatusFile_(NULL)
, mmapErrno_(0)
@@ -1117,7 +1045,6 @@ NAMemory::NAMemory(const char * name,
, lastVmSize_(0l)
, maxVmSize_(0l)
, sharedMemory_(FALSE)
-#endif // __EID
{
segGlobals_->setFirstSegInfo(extFirstSegId,
extFirstSegStart,
@@ -1129,7 +1056,7 @@ NAMemory::NAMemory(const char * name,
// call setType to initialize the values of all the sizes
setType(type_, 0);
-#if ( defined(_DEBUG) || defined(NSK_MEMDEBUG) ) && !defined(__EID)
+#if ( defined(_DEBUG) || defined(NSK_MEMDEBUG) )
char * debugLevel = getenv("MEMDEBUG");
if (debugLevel)
debugLevel_ = (Lng32)atoi(debugLevel);
@@ -1157,13 +1084,11 @@ NAMemory::NAMemory(const char * name,
}
}
-#ifndef STAND_ALONE
// need to initialize an NAStringRef object "on top" of the array
// (don't touch this unless you know what you're doing!)
NAStringRef * tmp =
new ( (void*) (&nullNAStringRep_[3]) )
NAStringRef (NAStringRef::NULL_CTOR, this) ;
-#endif
}
void NAMemory::reInitialize()
@@ -1179,16 +1104,6 @@ void NAMemory::reInitialize()
if (p != NULL) {
switch (type_) {
- case DP2_MEMORY:
-#ifdef __EID
- while (p) {
- NABlock *q = p->next_;
- DP2_EXECUTOR_DROP_MEMORY(p);
- p = q;
- }
-#endif
- break;
-#ifndef __EID
case EXECUTOR_MEMORY:
case SYSTEM_MEMORY:
case IPC_MEMORY:
@@ -1217,7 +1132,6 @@ void NAMemory::reInitialize()
assert(parent_);
HEAPLOG_OFF() // no recursive logging. (eric)
-#if !defined(STAND_ALONE) && (defined(__TANDEM) || defined(NA_LINUX)) && !defined(__EID)
// This code provides mutual exclusion for the runtime stats shared
// memory segment.
short semRetcode = 0;
@@ -1226,13 +1140,11 @@ void NAMemory::reInitialize()
parent_->getSegGlobals()->getFirstSegId() == getStatsSegmentId()) {
semRetcode = getRTSSemaphore();
}
-#endif
while (p) {
NABlock *q = p->next_;
parent_->deallocateHeapMemory((void*)p);
p = q;
}
-#if !defined(STAND_ALONE) && (defined(__TANDEM) || defined(NA_LINUX)) && !defined(__EID)
if (semRetcode == 1)
releaseRTSSemaphore();
if (parent_->type_ == NAMemory::EXECUTOR_MEMORY &&
@@ -1240,11 +1152,9 @@ void NAMemory::reInitialize()
{
updateMemStats();
}
-#endif
HEAPLOG_ON()
}
break;
-#endif // __EID
default:
assert(0);
} // switch(_type)
@@ -1287,7 +1197,6 @@ NAMemory::~NAMemory()
void NAMemory::setType(NAMemoryType type, Lng32 blockSize)
{
// upperLimit_ must be zero for EXECUTOR_MEMORY, IPC_MEMORY, SYSTEM_MEMORY,
- // DP2_MEMORY.
type_ = type;
@@ -1301,21 +1210,6 @@ void NAMemory::setType(NAMemoryType type, Lng32 blockSize)
// initialSize_ + n * incrementSize_ = maximumSize_
switch(type_) {
- case DP2_MEMORY:
- if (blockSize > 0)
- {
- initialSize_ = blockSize;
- incrementSize_ = blockSize * 2; // nothing special about *2 here.
- }
- else
- {
- initialSize_ = 100000;
- incrementSize_ = 100000;
- }
-
- maximumSize_ = (size_t)-1; // not used for this memory type
- break;
-
case EXECUTOR_MEMORY:
// input parameter blockSize is ignored
// this is an NAMemory using flat segments on NSK
@@ -1412,7 +1306,7 @@ void NAMemory::deallocateMemory(void* addr)
// dump() writes memory statistics to an output file that the caller must open.
// It is used as an aid for debugging memory problems and for saving memory
// statistics during certain tests.
-#if (defined(_DEBUG) || defined(NSK_MEMDEBUG)) && !defined(__EID) && !defined(STAND_ALONE)
+#if (defined(_DEBUG) || defined(NSK_MEMDEBUG))
void NAMemory::dump(ostream* outstream, Lng32 indent)
{
switch (derivedClass_)
@@ -1509,7 +1403,7 @@ NAHeap::idx2bit(bindex_t idx)
inline NAHeap::bindex_t
NAHeap::bit2idx(binmap_t x)
{
-#if defined(NA_LINUX) && defined(i386)
+#if defined(i386)
UInt32 ret;
__asm__("bsfl %1,%0\n\t" : "=r" (ret) : "rm" (x));
return (NAHeap::bindex_t)ret;
@@ -1605,7 +1499,7 @@ NAHeap::computeTreeIndex(size_t size)
return NTREEBINS - 1;
else {
UInt32 k;
-#if defined(NA_LINUX) && defined(i386)
+#if defined(i386)
__asm__("bsrl %1,%0\n\t" : "=r" (k) : "rm" (x));
#else
UInt32 y = (UInt32)x;
@@ -1973,7 +1867,6 @@ NAHeap::replaceDV(NAHeapFragment *p, size_t size)
}
// Resize the top fragment when a segment changes size.
-// LCOV_EXCL_START
inline void
NAHeap::resizeTop(size_t newsize)
{
@@ -1985,7 +1878,6 @@ NAHeap::resizeTop(size_t newsize)
NAHeapFragment *next = top_->nextFragment();
next->setFencePosts();
}
-// LCOV_EXCL_STOP
// Initialize the top fragment
inline void
@@ -2075,12 +1967,6 @@ NAHeap::deallocateFreeBlock(NAHeapFragment *p)
// Now release the memory to the operating system.
switch (type_)
{
- case DP2_MEMORY:
-#ifdef __EID
- DP2_EXECUTOR_DROP_MEMORY(curr);
-#endif
- break;
-#ifndef __EID
case EXECUTOR_MEMORY:
case SYSTEM_MEMORY:
case IPC_MEMORY:
@@ -2092,7 +1978,6 @@ NAHeap::deallocateFreeBlock(NAHeapFragment *p)
case DERIVED_MEMORY:
assert(parent_);
HEAPLOG_OFF() // no recursive logging.
-#if !defined(STAND_ALONE) && (defined(__TANDEM) || defined(NA_LINUX)) && !defined(__EID)
// This code provides mutual exclusion for the runtime stats shared
// memory segment.
if (parent_->getType() == EXECUTOR_MEMORY &&
@@ -2105,12 +1990,8 @@ NAHeap::deallocateFreeBlock(NAHeapFragment *p)
} else {
parent_->deallocateHeapMemory((void*)curr);
}
-#else
- parent_->deallocateHeapMemory((void*)curr);
-#endif
HEAPLOG_ON()
break;
-#endif // __EID
default:
assert(0); // Shouldn't happen
break;
@@ -2250,21 +2131,14 @@ Lng32 NAMemory::getAllocatedSpaceSize()
assert(type_ != NO_MEMORY_TYPE);
return allocSize_;
}
-// LCOV_EXCL_STOP
void NAMemory::setName(const char * name)
{
-#ifndef __EID
-#ifndef STAND_ALONE
Lng32 copyLen = str_len(name);
-#else
- Lng32 copyLen = strlen(name);
-#endif
if (copyLen > 20)
copyLen = 20;
memcpy(name_, name, copyLen);
name_[copyLen] = 0;
-#endif
}
void NAMemory::registerMemory(NAMemory * child)
@@ -2352,87 +2226,53 @@ NAHeap::allocateBlock(size_t size, NABoolean failureIsFatal)
NABlock *p = NULL; // Pointer to the returned block.
switch (type_) {
- case DP2_MEMORY: {
-#ifdef __EID
-
- short returnCode = DP2_EXECUTOR_ADD_MEMORY (blockSize, &addr);
-
- if (returnCode == FEOK) {
-#ifdef TRACE_DP2_MALLOCS
- extern ostream *TraceFile;
- *TraceFile << "DP2_EXECUTOR_ADD_MEMORY alloc'd " << size
- << " bytes at " << (void *) addr
- << " which the executor will use as an NAMemory block." << endl;
-#endif
-
- p = (NABlock*)addr;
- }
-
-#endif
- }
- break;
-
-#ifndef __EID
case EXECUTOR_MEMORY: {
// This could be either Global Executor Memory or Stats Globals
// Don't add a block if Stats Globals!
- // (segGlobals_->reachedMaxSegCnt which is used in the NA_NSK case
- // is obsolete)
if (getSegGlobals()->getFirstSegId() == getStatsSegmentId())
return NULL;
-#ifdef HAVE_MMAP
+
// Try to allocate the NABlock using mmap(). If it succeeds return the
// NABlock. Otherwise, fall through and try to allocate the normal way.
if (blockSize >= MIN_MMAP_ALLOC_SIZE &&
(p = allocateMMapBlock(blockSize)) != NULL)
return p;
-#endif
// allocate a block from the OS memory
p = (NABlock*)malloc(blockSize);
-#if (defined(NA_LINUX) && !defined(__EID))
if (p)
allocationIncrement(blockSize);
-#endif // NA_LINUX
}
break;
case SYSTEM_MEMORY:
case IPC_MEMORY:
{
-
-#ifdef HAVE_MMAP
// Try to allocate the NABlock using mmap(). If it succeeds return the
// NABlock. Otherwise, fall through and try to allocate the normal way.
if (blockSize >= MIN_MMAP_ALLOC_SIZE &&
(p = allocateMMapBlock(blockSize)) != NULL)
return p;
-#endif
// allocate a block from the OS memory
p = (NABlock*)malloc(blockSize);
-#if (defined(NA_LINUX) && !defined(__EID))
if (p)
allocationIncrement(blockSize);
-#endif // (defined(NA_LINUX) && !defined(__EID))
}
break;
case DERIVED_FROM_SYS_HEAP: {
// allocate a block from the OS memory
-#ifdef HAVE_MMAP
// Try to allocate the NABlock using mmap(). If it succeeds return the
// NABlock. Otherwise, fall through and try to allocate the normal way.
if (blockSize >= MIN_MMAP_ALLOC_SIZE &&
(p = allocateMMapBlock(blockSize)) != NULL)
return p;
-#endif
+
p = (NABlock*)malloc(blockSize);
-#if (defined(NA_LINUX) && !defined(__EID))
if (p)
allocationIncrement(blockSize);
-#endif // (defined(NA_LINUX) && !defined(__EID))
}
break;
@@ -2442,7 +2282,6 @@ NAHeap::allocateBlock(size_t size, NABoolean failureIsFatal)
// allocate a block from the parent
HEAPLOG_OFF() // no recursive logging. (eric)
-#if !defined(STAND_ALONE) && (defined(__TANDEM) || defined(NA_LINUX)) && !defined(__EID)
// This code provides mutual exclusion for the runtime stats shared
// memory segment.
// The IF condition below is not needed since we are checking if
@@ -2456,7 +2295,6 @@ NAHeap::allocateBlock(size_t size, NABoolean failureIsFatal)
p = (NABlock*)parent_->allocateHeapMemory(blockSize, FALSE);
if (p == NULL)
-//LCOV_EXCL_START
// Unit tested this code with the test case in QC 1387
// - 3/22/2012.
{
@@ -2487,40 +2325,29 @@ NAHeap::allocateBlock(size_t size, NABoolean failureIsFatal)
char coreFile[1024];
msg_mon_dump_process_name(NULL, ssmpName, coreFile);
}
-#ifdef SQ_PHANDLE_VERIFIER
Int32 ndRetcode = msg_mon_node_down2(nid,
"RMS shared segment is exhausted.");
-#else
- Int32 ndRetcode = msg_mon_node_down(nid);
-#endif
sleep(30);
NAExit(0); // already made a core.
}
else
assert(p != NULL);
-//LCOV_EXCL_STOP
}
if (retcode == 1)
releaseRTSSemaphore();
} else {
p = (NABlock*)parent_->allocateHeapMemory(blockSize, failureIsFatal);
-#ifndef __EID
if (parent_->type_ == NAMemory::EXECUTOR_MEMORY &&
parent_->parent_ == NULL)
{
updateMemStats();
}
-#endif
}
-#else
- p = (NABlock*)parent_->allocateHeapMemory(blockSize, failureIsFatal);
-#endif
segmentId = NABlock::DERIVED_SEGMENT_ID; // Add another check for muse
HEAPLOG_ON()
}
break;
-#endif // ifndef __EID
} // switch(type_)
// if the allocation was not sucessfull, we return a NULL
@@ -2541,7 +2368,6 @@ NAHeap::allocateBlock(size_t size, NABoolean failureIsFatal)
} // NAHeap::allocateBlock(size_t size, NABoolean failureIsFatal)
#endif // !MUSE
-#ifndef __EID
void NAMemory::showStats(ULng32 level)
{
char indent[100];
@@ -2555,9 +2381,6 @@ void NAMemory::showStats(ULng32 level)
case NO_MEMORY_TYPE:
cerr << "NO_MEMORY_TYPE";
break;
- case DP2_MEMORY:
- cerr << "DP2_MEMORY";
- break;
case EXECUTOR_MEMORY:
cerr << "EXECUTOR_MEMORY";
break;
@@ -2591,7 +2414,6 @@ void NAMemory::showStats(ULng32 level)
for (NAMemory * p = memoryList_; p != NULL; p = p->nextEntry_)
p->showStats(level + 1);
}
-#endif //__EID
// this method used to belong to CollHeap
#ifndef MUSE
@@ -2601,9 +2423,7 @@ NAMemory::handleExhaustedMemory()
exhaustedMem_ = TRUE;
if (heapJumpBuf_)
{
-#ifndef STAND_ALONE
ARKCMP_EXCEPTION_EPILOGUE("NAMemory");
-#endif
longjmp(*heapJumpBuf_, MEMALLOC_FAILURE);
}
}
@@ -2612,7 +2432,6 @@ NAMemory::handleExhaustedMemory()
void
NAMemory::logAllocateError(short error, SEG_ID segmentId, Lng32 blockSize, short errorDetail)
{
-#if !defined (NA_WINNT) && !defined(__EID)
char msg[128], msgErrorDetail[32];
if (error != 0 && error != 15)
{
@@ -2630,15 +2449,12 @@ NAMemory::logAllocateError(short error, SEG_ID segmentId, Lng32 blockSize, short
SQLMXLoggingArea::logExecRtInfo(__FILE__, __LINE__, msg, 0);
}
}
-#endif //!defined (NA_WINNT) && !defined(__EID)
}
void NAMemory::setJmpBuf( jmp_buf *newJmpBuf )
{
-#if defined(NA_LINUX) && !defined(__EID)
if (derivedClass_ == NAHEAP_CLASS)
assert(((NAHeap*)this)->getThreadSafe() == false);
-#endif
heapJumpBuf_ = newJmpBuf;
}
@@ -2698,7 +2514,6 @@ void NASegGlobals::setFirstSegInfo(SEG_ID firstSegId,
}
}
-// LCOV_EXCL_START
Int32 NASegGlobals::addSegId(short segId, void *start, size_t len)
{
if (addedSegCount_ == NA_MAX_SECONDARY_SEGS)
@@ -2813,7 +2628,6 @@ NABoolean NASegGlobals::overlaps(void *start, size_t len) const
}
return FALSE;
}
-// LCOV_EXCL_STOP
// ---------------------------------------------------------------------------
// NAHeap methods
@@ -2833,10 +2647,8 @@ NAHeap::NAHeap()
initBins();
derivedClass_ = NAHEAP_CLASS;
-#if defined(NA_LINUX) && !defined(__EID)
threadSafe_ = false;
memset(&mutex_, '\0', sizeof(mutex_));
-#endif
#ifdef _DEBUG
setAllocTrace();
@@ -2860,10 +2672,8 @@ NAHeap::NAHeap(const char * name,
initBins();
derivedClass_ = NAHEAP_CLASS;
-#if defined(NA_LINUX) && !defined(__EID)
threadSafe_ = false;
memset(&mutex_, '\0', sizeof(mutex_));
-#endif
if (parent != NULL)
{
NAMutex mutex(parent->threadSafe_, &parent->mutex_);
@@ -2892,10 +2702,8 @@ NAHeap::NAHeap(const char * name,
initBins();
derivedClass_ = NAHEAP_CLASS;
-#if defined(NA_LINUX) && !defined(__EID)
threadSafe_ = false;
memset(&mutex_, '\0', sizeof(mutex_));
-#endif
#ifdef _DEBUG
setAllocTrace();
@@ -2941,10 +2749,8 @@ NAHeap::NAHeap(const char * name,
}
}
-#if defined(NA_LINUX) && !defined(__EID)
threadSafe_ = false;
memset(&mutex_, '\0', sizeof(mutex_));
-#endif
#ifdef _DEBUG
setAllocTrace();
@@ -2958,7 +2764,6 @@ NAHeap::~NAHeap()
pthread_mutex_destroy(&mutex_);
}
-#if defined(NA_LINUX) && !defined(__EID)
void NAHeap::setThreadSafe()
{
assert(((NAMemory*)this)->getJmpBuf() == NULL);
@@ -2981,7 +2786,6 @@ void NAHeap::setThreadSafe()
heap = heap->parent_;
}
}
-#endif
// destroy() is called by the NAMemory destructor to perform the
// derived class destructor. It is part of the mechanism that
@@ -2989,10 +2793,8 @@ void NAHeap::setThreadSafe()
// runtime statistics.
void NAHeap::destroy()
{
-#if defined(NA_LINUX) && !defined(__EID)
if (parent_ != NULL)
NAMutex mutex(parent_->threadSafe_, &parent_->mutex_);
-#endif
#ifdef _DEBUG
if (la_)
@@ -3015,11 +2817,9 @@ void NAHeap::destroy()
// NAMemory reInitialize(), which may either be called directly or from a destructor.
void NAHeap::reInitializeHeap()
{
-#if defined(NA_LINUX) && !defined(__EID)
NAMutex mutex(threadSafe_, &mutex_);
-#endif
-#if (defined(_DEBUG) || defined(NSK_MEMDEBUG)) && !defined(__EID) && !defined(STAND_ALONE)
+#if (defined(_DEBUG) || defined(NSK_MEMDEBUG))
// Before freeing the NABlocks in reInitialize(), check to see whether any
// of the memory fragments in the blocks have overflowed
if (debugLevel_ == 2)
@@ -3122,10 +2922,7 @@ void * NAHeap::allocateAlignedHeapMemory(size_t userSize, size_t alignment, NABo
void * NAHeap::allocateHeapMemory(size_t userSize, NABoolean failureIsFatal)
{
-#if defined(NA_LINUX) && !defined(__EID)
NAMutex mutex(threadSafe_, &mutex_);
-#endif
-
assert(type_ != NO_MEMORY_TYPE);
@@ -3135,7 +2932,6 @@ void * NAHeap::allocateHeapMemory(size_t userSize, NABoolean failureIsFatal)
if (userSize == 0)
return NULL;
-#if !defined(STAND_ALONE) && (defined(__TANDEM) || defined(NA_LINUX)) && !defined(__EID)
// getSharedMemory() check alone is enough since it will return for both
// global and process stats heap. Leaving the rest of the condition here
//
@@ -3147,16 +2943,15 @@ void * NAHeap::allocateHeapMemory(size_t userSize, NABoolean failureIsFatal)
if (! checkIfRTSSemaphoreLocked())
NAExit(1);
}
-#endif
+
// Some additional bytes are added in debug mode, but the original userSize
// must be retained.
size_t additionalUserSize = userSize;
-#if (defined(_DEBUG) || defined(NSK_MEMDEBUG)) && !defined(__EID)
+#if (defined(_DEBUG) || defined(NSK_MEMDEBUG))
if (debugLevel_)
dynamicAllocs.addEntry(userSize);
-#ifndef STAND_ALONE
// Allocate some additional memory to help with memory debugging. At
// debug level 2 on Windows, there are 40 bytes allocated to store
// 10 program counters of 4 bytes each. There are 4 bytes to store
@@ -3172,8 +2967,7 @@ void * NAHeap::allocateHeapMemory(size_t userSize, NABoolean failureIsFatal)
const size_t additionalBytes[4] = { 12, 15, 14, 13 };
additionalUserSize += additionalBytes[userSize & 0x3];
}
-#endif // !STAND_ALONE
-#endif // (defined(_DEBUG) || defined(NSK_MEMDEBUG)) && !defined(__EID)
+#endif // (defined(_DEBUG) || defined(NSK_MEMDEBUG))
size_t nb;
NAHeapFragment *p;
@@ -3183,7 +2977,6 @@ void * NAHeap::allocateHeapMemory(size_t userSize, NABoolean failureIsFatal)
// checking logic to work.
NABoolean cleanUpPrevNext = debugLevel_== 0 ? TRUE : FALSE;
-#ifdef HAVE_MMAP
// If the user is allocating a large piece of memory from a non-derived
// heap that is also not the runtime statistics shared memory segment,
// then allocate a NABlock using mmap(). This prevents any changes
@@ -3222,7 +3015,6 @@ void * NAHeap::allocateHeapMemory(size_t userSize, NABoolean failureIsFatal)
}
// Fall through and try to allocate the regular way.
}
-#endif // HAVE_MMAP
if (additionalUserSize <= MAX_SMALL_REQUEST) {
@@ -3474,12 +3266,8 @@ void NAHeap::deallocateHeapMemory(void* addr)
assert(type_ != NO_MEMORY_TYPE);
-#if defined(NA_LINUX) && !defined(__EID)
NAMutex mutex(threadSafe_, &mutex_);
-#endif
-
-#if !defined(STAND_ALONE) && (defined(__TANDEM) || defined(NA_LINUX)) && !defined(__EID)
-
+
if (getSharedMemory() || (parent_ && parent_->getType() == EXECUTOR_MEMORY &&
parent_->getSegGlobals() != NULL &&
parent_->getSegGlobals()->getFirstSegId() == getStatsSegmentId()))
@@ -3488,7 +3276,6 @@ void NAHeap::deallocateHeapMemory(void* addr)
if (! checkIfRTSSemaphoreLocked())
NAExit(1);
}
-#endif
HEAPLOG_DELETE_ENTRY(addr, heapID_.heapNum)
@@ -3534,12 +3321,10 @@ void NAHeap::deallocateHeapMemory(void* addr)
deallocTraceIndex = i;
}
-#ifdef HAVE_MMAP
if (p->isMMapped()) {
deallocateFreeBlock(p);
return;
}
-#endif // HAVE_MMAP
// Get a pointer to the next fragment
NAHeapFragment *next = p->fragmentPlusOffset(psize);
@@ -3660,12 +3445,10 @@ void NAHeap::deallocateHeapMemory(void* addr)
#endif // !MUSE
-#if (defined(_DEBUG) || defined(NSK_MEMDEBUG)) && !defined(__EID) && !defined(STAND_ALONE)
+#if (defined(_DEBUG) || defined(NSK_MEMDEBUG))
void NAHeap::dumpHeapInfo(ostream* outstream, Lng32 indent)
{
-#if defined(NA_LINUX) && !defined(__EID)
NAMutex mutex(threadSafe_, &mutex_);
-#endif
char ind[100];
@@ -3696,7 +3479,6 @@ void NAHeap::dumpHeapInfo(ostream* outstream, Lng32 indent)
MemoryStats freeStats;
MemoryStats allocStats;
-#ifndef STAND_ALONE
NABlock * p = firstBlk_;
while (p) {
p->dump(outstream, debugLevel_, freeStats, allocStats, top_, indent);
@@ -3719,9 +3501,8 @@ void NAHeap::dumpHeapInfo(ostream* outstream, Lng32 indent)
derivedHeap->dump(outstream, indent + 2);
derivedHeap = derivedHeap->nextEntry_;
}
-#endif // !STAND_ALONE
}
-#endif // (defined(_DEBUG) || defined(NSK_MEMDEBUG)) && !defined(__EID) ...
+#endif // (defined(_DEBUG) || defined(NSK_MEMDEBUG)) ...
//////////////////////////////////////////////////////////////////////////////
@@ -3729,7 +3510,7 @@ void NAHeap::dumpHeapInfo(ostream* outstream, Lng32 indent)
// NABlock methods
// ---------------------------------------------------------------------------
-#if (defined(_DEBUG) || defined(NSK_MEMDEBUG)) && !defined(__EID) && !defined(STAND_ALONE)
+#if (defined(_DEBUG) || defined(NSK_MEMDEBUG))
void NABlock::dump(ostream* outstream,
Lng32 debugLevel,
MemoryStats& freeStats,
@@ -3765,11 +3546,10 @@ void NABlock::dump(ostream* outstream,
q = q->nextFragment();
}
}
-#endif // (defined(_DEBUG) || defined(NSK_MEMDEBUG)) && !defined(__EID) ...
+#endif // (defined(_DEBUG) || defined(NSK_MEMDEBUG)) ...
//////////////////////////////////////////////////////////////////////////////
-#ifndef __EID
MemoryStats::MemoryStats()
: count_(0),
sum_(0.0),
@@ -3797,7 +3577,7 @@ void MemoryStats::addEntry(size_t value)
histBuckets_[i]++;
}
-#if (defined(_DEBUG) || defined(NSK_MEMDEBUG)) && !defined(__EID) && !defined(STAND_ALONE)
+#if (defined(_DEBUG) || defined(NSK_MEMDEBUG))
void MemoryStats::dump(ostream* outstream, const char * name, Lng32 indent)
{
char ind[100];
@@ -3834,17 +3614,15 @@ void MemoryStats::dump(ostream* outstream, const char * name, Lng32 indent)
<< " : " << histBuckets_[17] << endl;
}
-#endif // (defined(_DEBUG) || defined(NSK_MEMDEBUG)) && !defined(__EID) && !defined(STAND_ALONE)
-#endif // #ifndef __EID
+#endif // (defined(_DEBUG) || defined(NSK_MEMDEBUG))
// -------------------- Debugging Support ---------------------------
-#if ( defined(_DEBUG) || defined(NSK_MEMDEBUG) ) && !defined(__EID)
+#if ( defined(_DEBUG) || defined(NSK_MEMDEBUG) )
// The below values are used for buffer overflow detection. Lookup
// tables are used so that the logic for checking the remaining
// bytes in a word can be very quick.
-#ifndef STAND_ALONE
const UInt32 buf_overflow_val = 0xF2F2F2F2;
#ifdef NA_LITTLE_ENDIAN
const UInt32 overflow_mask[4] = { 0, 0xFFFFFF00, 0xFFFF0000, 0xFF000000 };
@@ -3853,7 +3631,6 @@ const UInt32 overflow_val[4] = { 0, 0xF2F2F200, 0xF2F20000, 0xF2000000 };
const UInt32 overflow_mask[4] = { 0, 0xFFFFFF, 0xFFFF, 0xFF };
const UInt32 overflow_val[4] = { 0, 0xF2F2F2, 0xF2F2, 0xF2 };
#endif
-#endif // !STAND_ALONE
// doAllocDebugProcess() is called with debugLevel_ is set to at
// least 1. It resets newly allocated memory to a 0xfafafafa. On
@@ -3861,7 +3638,6 @@ const UInt32 overflow_val[4] = { 0, 0xF2F2F2, 0xF2F2, 0xF2 };
// information to indicate whether the end of the buffer has been
// overwritten and saves the last 10 levels of the stack frame.
-// LCOV_EXCL_START
void
NAHeap::doAllocDebugProcess(NAHeapFragment *p, size_t userSize)
{
@@ -3869,7 +3645,6 @@ NAHeap::doAllocDebugProcess(NAHeapFragment *p, size_t userSize)
// Disabled for now, see Todo 1)
// memset(p->getMemory(), 0xfa, userSize);
-#ifndef STAND_ALONE
if (debugLevel_ == 2 && p->fragmentSize() < INT_MAX) {
// Determine location that the user requested size is stored
@@ -3895,31 +3670,25 @@ NAHeap::doAllocDebugProcess(NAHeapFragment *p, size_t userSize)
*userSizePtr = (UInt32) userSize;
}
-#endif // !STAND_ALONE
}
-// LCOV_EXCL_STOP
// doDeallocDebugProcess() resets the deallocated memory to
// a 0xfdfdfdfd. This function is only called when debugLevel_ is
// at set to at least 1.
-// LCOV_EXCL_START
void
NAHeap::doDeallocDebugProcess(NAHeapFragment *p)
{
-#ifndef STAND_ALONE
if (debugLevel_ == 2 && p->fragmentSize() < INT_MAX) {
- // Check for buffer overflows (if not STAND_ALONE)
+ // Check for buffer overflows
p->checkBufferOverflow();
}
-#endif
// Reset the user memory to a 0xfdfdfdfd pattern.
// size_t userSize = p->fragmentSize() - sizeof(size_t);
// Disabled for now, see Todo 1)
// memset(p->getMemory(), 0xfd, userSize);
}
-// LCOV_EXCL_STOP
// Check properties of any fragment, whether free, inuse, etc.
void
@@ -4198,15 +3967,11 @@ NAHeap::traverseAndCheck()
if (s->isExternSegment()) {
assert(!q->getFirstFragmentBit());
} else {
-#ifdef HAVE_MMAP
if (s->isMMapped()) {
assert(q->getFirstFragmentBit() || q->isMMapped());
} else {
assert(q->getFirstFragmentBit());
}
-#else
- assert(q->getFirstFragmentBit());
-#endif
}
NAHeapFragment *lastq = NULL;
@@ -4229,9 +3994,7 @@ NAHeap::traverseAndCheck()
if (q->isFencePost())
break;
assert(!q->getFirstFragmentBit());
-#ifdef HAVE_MMAP
assert(!q->isMMapped());
-#endif // HAVE_MMAP
}
s = (NABlock*)s->next_;
}
@@ -4240,8 +4003,6 @@ NAHeap::traverseAndCheck()
return sum;
}
-#ifndef STAND_ALONE
-// LCOV_EXCL_START
void
NAHeapFragment::checkBufferOverflow()
{
@@ -4284,10 +4045,8 @@ NAHeap::checkForOverflow()
bp = bp->next_;
}
}
-// LCOV_EXCL_STOP
-#endif // !STAND_ALONE
-#endif // ( defined(_DEBUG) || defined(NSK_MEMDEBUG) ) && !defined(__EID)
+#endif // ( defined(_DEBUG) || defined(NSK_MEMDEBUG) )
#ifdef _DEBUG
void
@@ -4316,7 +4075,6 @@ NAHeap::setAllocTrace()
// methods for class DefaultIpcHeap
// -----------------------------------------------------------------------
-// LCOV_EXCL_START
// This object is allocated on either global or a passed-in heap.
// Its dstr (defined here) is never explicitly called.
DefaultIpcHeap::~DefaultIpcHeap()
@@ -4328,7 +4086,6 @@ void DefaultIpcHeap::destroy()
// This class can't delete anything because it doesn't keep track of
// any of its allocations.
}
-// LCOV_EXCL_STOP
void * DefaultIpcHeap::allocateIpcHeapMemory(size_t size, NABoolean failureIsFatal)
{
@@ -4352,14 +4109,12 @@ void DefaultIpcHeap::deallocateIpcHeapMemory(void * buffer)
::operator delete(buffer);
}
-#if (defined(_DEBUG) || defined(NSK_MEMDEBUG)) && !defined(__EID) && !defined(STAND_ALONE)
-// LCOV_EXCL_START
+#if (defined(_DEBUG) || defined(NSK_MEMDEBUG))
void DefaultIpcHeap::dumpIpcHeapInfo(ostream* outstream, Lng32 indent)
{
// This class doesn't keep track of anything so it can't dump anything
// useful.
}
-// LCOV_EXCL_STOP
#endif
// Release unused memory in the heap back to kernel. This will help
@@ -4373,7 +4128,6 @@ void NAHeapFragment::releaseFreePages(NAHeapFragment *prev,
SEG_ID gStatsSegmentId_ = -1;
#define RMS_SEGMENT_ID_OFFSET 0x10000000
-#if ((defined(NA_NSK) || defined (NA_LINUX)) && (!defined(__EID)))
SEG_ID getStatsSegmentId()
{
@@ -4387,4 +4141,3 @@ SEG_ID getStatsSegmentId()
}
return gStatsSegmentId_;
}
-#endif
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/common/NAMemory.h
----------------------------------------------------------------------
diff --git a/core/sql/common/NAMemory.h b/core/sql/common/NAMemory.h
index b2e1c4f..609e936 100644
--- a/core/sql/common/NAMemory.h
+++ b/core/sql/common/NAMemory.h
@@ -46,30 +46,16 @@
// for release and debug builds to prevent corruption
// of the shared memory segment used by runtime stats.
-#if (defined(NA_LINUX) && !defined(__EID))
#include <stdio.h>
-#endif
-#ifdef STAND_ALONE
-#define NA_EIDPROC
-#define TRUE 1
-#define NABoolean bool
-#endif
-
-#ifndef STAND_ALONE
#include "NABasicObject.h"
-#endif
-#ifndef STAND_ALONE
#include "Platform.h"
#include "NAStringDefGlobals.h"
-#endif
#include <stddef.h>
#include <setjmp.h>
-#ifndef STAND_ALONE
#include "NAError.h"
#include "HeapID.h"
-#endif
#ifdef _DEBUG
// forward declaration
@@ -77,21 +63,18 @@ template <class T> class NAList;
#define LIST(Type) NAList<Type>
#endif // _DEBUG
-#if (defined(_DEBUG) || defined(NSK_MEMDEBUG)) && !defined(__EID)
+#if (defined(_DEBUG) || defined(NSK_MEMDEBUG))
#ifdef NA_STD_NAMESPACE
#include <iosfwd>
using namespace std;
#else
class ostream;
#endif
-#endif // (defined(_DEBUG) || defined(NSK_MEMDEBUG)) && !defined(__EID)
+#endif // (defined(_DEBUG) || defined(NSK_MEMDEBUG))
#include <unistd.h>
#include <sys/types.h>
typedef uid_t SEG_ID;
-#if !defined(__EID) && (defined(NA_LINUX) || defined(NA_WINNT))
-#define HAVE_MMAP 1
-#endif
// contents of this file:
class NAMemory;
@@ -106,13 +89,12 @@ class SegmentStatus;
// MemoryStats is used for dynamically allocated statistics (when MEMDEBUG=1 or higher)
// and if NAHeap::dump() is called.
-#ifndef __EID
class MemoryStats {
public:
MemoryStats();
void addEntry(size_t value);
-#if (defined(_DEBUG) || defined(NSK_MEMDEBUG)) && !defined(__EID) && !defined(STAND_ALONE)
+#if (defined(_DEBUG) || defined(NSK_MEMDEBUG))
void dump(ostream* outstream, const char* name, Lng32 indent);
#endif
private:
@@ -127,7 +109,6 @@ private:
// 16 - all objects <= 2 MB
// 17 - all objects > 2 MB
};
-#endif
////////////////////////////////////////////////////////////////////////////
// One NASegGlobals object exists in the executor as a member variable
@@ -160,7 +141,6 @@ public:
return 0;
}
-NA_EIDPROC
short getSegInfo(Lng32 index, void **startAddr) const
{
*startAddr = startAddresses_[index];
@@ -234,29 +214,20 @@ public:
NABlock * next_; // next block in chain
UInt32 sflags_; // "extern" and future other flags
-NA_EIDPROC
NABoolean blockHolds(void *addr);
-NA_EIDPROC
static NABlock *blockHolding(NABlock *firstBlock, void *addr);
-NA_EIDPROC
NABoolean isExternSegment();
-#ifdef HAVE_MMAP
-NA_EIDPROC
NABoolean isMMapped();
-#endif // HAVE_MMAP
-NA_EIDPROC
size_t firstFragmentOffset();
-NA_EIDPROC
NAHeapFragment* alignAsFragment();
-#if (defined(_DEBUG) || defined(NSK_MEMDEBUG)) && !defined(__EID) && !defined(STAND_ALONE)
+#if (defined(_DEBUG) || defined(NSK_MEMDEBUG))
// LCOV_EXCL_START
-NA_EIDPROC
void dump(ostream* outstream,
Lng32 debugLevel,
MemoryStats& freeStats,
@@ -266,7 +237,6 @@ void dump(ostream* outstream,
// LCOV_EXCL_STOP
#endif
-NA_EIDPROC
NABlock();
private:
@@ -277,11 +247,7 @@ private:
// NAMemory is an abstract base class. NAHeap and Space/NASpace are derived
// from it.
////////////////////////////////////////////////////////////////////////////
-#ifndef STAND_ALONE
class NAMemory : public NABasicObject {
-#else
-class NAMemory {
-#endif
friend class NAHeap;
friend class ExMemStats; // Class used in muse
friend class ExHeapStats; // Class used in muse
@@ -292,7 +258,6 @@ public:
// memory type NT/UNIX NSK
// -----------------------------------------------------------------------
- // DP2_MEMORY regular memory memory maintained by DP2
// EXECUTOR_MEMORY regular memory selectable segment used in the
// master. This is a priv
// segment.
@@ -316,7 +281,6 @@ public:
// SYSTEM_MEMORY/IPC segment ids in the NASegGlobals object.
enum NAMemoryType {
NO_MEMORY_TYPE = 0,
- DP2_MEMORY = 1,
EXECUTOR_MEMORY = 2,
SYSTEM_MEMORY = 3,
DERIVED_MEMORY = 4,
@@ -340,19 +304,16 @@ public:
};
// default constructor. Initializes the memory to NO_MEMORY_TYPE.
-NA_EIDPROC
NAMemory(const char * name = NULL);
- // a basic (OS depended) memory. type is one of DP2_MEMORY,
- // or SYSTEM_MEMORY. DERIVED_MEMORY is not allowed as basic memory.
-NA_EIDPROC
+ // a basic (OS depended) memory. type is one of
+ // SYSTEM_MEMORY. DERIVED_MEMORY is not allowed as basic memory.
NAMemory(const char * name, NAMemoryType type, size_t blockSize,
size_t upperLimit);
// an NAMemory of type EXECUTOR_MEMORY that uses a first flat segment
// that is allocated by the caller (on NSK, uses malloc on NT and ignores
// the parameters after the first one)
-NA_EIDPROC
NAMemory(const char * name,
SEG_ID extFirstSegId,
void * extFirstSegStart,
@@ -363,154 +324,106 @@ NA_EIDPROC
Lng32 extMaxSecSegCount = NASegGlobals::NA_MAX_SECONDARY_SEGS);
// DERIVED_MEMORY
-NA_EIDPROC
NAMemory(const char * name, NAHeap * parent, size_t blockSize,
size_t upperLimit);
-NA_EIDPROC
~NAMemory();
-NA_EIDPROC
void reInitialize();
-NA_EIDPROC
void setType(NAMemoryType type,
Lng32 blockSize = 0);
-NA_EIDPROC
Lng32 getAllocatedSpaceSize();
// This method takes and returns the same arguments as an "operator new".
// It is used to allocate arrays(!!) of the collected object(type T).
-NA_EIDPROC
void * allocateMemory(size_t size, NABoolean failureIsFatal = TRUE);
// This method takes and returns the same arguments as an "operator delete".
// It is used to deallocate the above arrays.
-NA_EIDPROC
void deallocateMemory(void * addr);
// this method is used to set the upper limit - currently only used for testing
// setjmp and longjmp
-NA_EIDPROC
void setUpperLimit ( size_t newUpperLimit ) { upperLimit_ = newUpperLimit; };
// these four methods used to reside in class CollHeap
-NA_EIDPROC
void setJmpBuf( jmp_buf *newJmpBuf );
-NA_EIDPROC
inline jmp_buf * getJmpBuf() { return heapJumpBuf_; }
-NA_EIDPROC
inline NABoolean getWasMemoryExhausted() { return exhaustedMem_; }
-NA_EIDPROC
void logAllocateError(short error, SEG_ID segmentId, Lng32 blockSize, short errorDetail);
-NA_EIDPROC
void handleExhaustedMemory();
-#ifndef STAND_ALONE
-#if (defined(_DEBUG) || defined(NSK_MEMDEBUG)) && !defined(__EID)
-NA_EIDPROC
+#if (defined(_DEBUG) || defined(NSK_MEMDEBUG))
void dump(ostream* outstream, Lng32 indent);
#else
-NA_EIDPROC
inline void dump(void* outstream, Lng32 indent) {}
#endif
-#endif // !STAND_ALONE
-NA_EIDPROC
void incrementStats(size_t size);
-NA_EIDPROC
void decrementStats(size_t size);
-#ifndef __EID
- NA_EIDPROC
void showStats(ULng32 level = 0);
-#endif
-NA_EIDPROC
inline size_t getTotalSize() {return totalSize_;};
-NA_EIDPROC
inline size_t getIncrementSize() {return incrementSize_;};
-NA_EIDPROC
inline size_t getInitialSize() {return initialSize_;};
-NA_EIDPROC
inline NAHeap* getParent() {return parent_;};
-NA_EIDPROC
inline size_t getAllocSize() {return allocSize_;};
-NA_EIDPROC
inline size_t getAllocCnt() {return allocCnt_;};
-NA_EIDPROC
inline size_t getHighWaterMark() {return highWaterMark_;};
-NA_EIDPROC
inline size_t getIntervalWaterMark() {return intervalWaterMark_;};
-NA_EIDPROC
inline void resetIntervalWaterMark() { intervalWaterMark_ = allocSize_;};
-NA_EIDPROC
inline NASegGlobals * getSegGlobals() { return segGlobals_; }
-NA_EIDPROC
char *getName() { return name_; }
-NA_EIDPROC
NAMemoryType getType() { return type_; }
-NA_EIDPROC
NABoolean getUsage(size_t* lastSegSize, size_t* freeSize, size_t* totalSize);
// for debugging
-NA_EIDPROC
NABoolean containsAddress(void *addr)
{ return NABlock::blockHolding(firstBlk_, addr) != NULL; }
- // #ifdef NA_WINNT
-#ifndef __EID
NABoolean getSharedMemory() { return sharedMemory_; }
void setSharedMemory() { sharedMemory_ = TRUE; }
-#endif
NABoolean isComSpace(void) { return derivedClass_ == COMSPACE_CLASS; } ;
protected:
// set the name of this memory
-NA_EIDPROC
void setName(const char * name);
// put child on memoryList_
-NA_EIDPROC
void registerMemory(NAMemory * child);
// remove child from memoryList_
-NA_EIDPROC
void unRegisterMemory(NAMemory * child);
-NA_EIDPROC
void sysFreeBlock(NABlock *blk);
-#ifdef HAVE_MMAP
-NA_EIDPROC
NABlock* allocateMMapBlock(size_t size);
void deallocateMMapBlock(NABlock *blk);
-#endif // HAVE_MMAP
-#if (defined(NA_LINUX) && !defined(__EID))
Lng32 getVmSize();
void allocationIncrement(Lng32 size);
void allocationDecrement(Lng32 size);
-#endif // NA_LINUX
private:
// these ctors make no sense at all -- should never be used
NAMemory (const NAMemory &) ; // not written
@@ -566,11 +479,8 @@ protected:
jmp_buf *heapJumpBuf_; // Setjmp() buffer for handing memory failures
NABoolean exhaustedMem_; // Set to true if cannot satisfy memory request
unsigned short errorsMask_; // SEGMENT_ALLOCATE_ errors that have occurred
-#ifndef STAND_ALONE
HeapID heapID_; // For tracking leaks. (eric)
-#endif
Int64 crowdedTotalSize_; // Total size at which memory pressure seen
-#ifndef __EID
Int64 allocationDelta_; // Change in memory size since last check of VmSize
FILE* procStatusFile_; // FILE pointer for "reading" process status
Lng32 executorVmReserveSize_; // Size in MB of VM safety net
@@ -578,10 +488,8 @@ protected:
Int32 munmapErrno_;
Lng32 lastVmSize_;
Lng32 maxVmSize_;
-#endif // __EID
DerivedClass derivedClass_; // The derived class (removes virtual functions)
public:
-#ifndef STAND_ALONE
// ---------------------------------------------------------------------
// The following method and data member are needed for minimizing
// NAString's memory usage -- each heap needs to maintain a
@@ -591,26 +499,20 @@ public:
// See NAStringDef.h/.cpp for a complete explanation of why this
// dependence on NAString code is necessary.
// ---------------------------------------------------------------------
-NA_EIDPROC
NAStringRef * nullNAStringRef()
// NB: the fudge-factor ("3") below is probably no longer necessary ...
{ return (NAStringRef*) ( (&nullNAStringRep_[3]) ) ; }
protected:
Lng32 nullNAStringRep_[(sizeof(NAStringRef)+1)/sizeof(Lng32)+1+4] ; // +4 for good luck :-)
-#endif
-#ifndef __EID
NABoolean sharedMemory_;
-#endif
// ---------------------------------------------------------------------
private:
-#ifndef PRIV_SRL
// the PRIV SRL will add a vtbl pointer for NAMemory because it
// will see NABasicObject as an object without virtual functions.
// Add this filler for the non-priv code so NAMemory will have
// the same length for both PRIV and non-PRIV code.
Lng32 fillerForVtblPtr_;
-#endif
};
@@ -639,17 +541,13 @@ public:
// see the corresponding NAMemory constructors for an explanation
-NA_EIDPROC
NAHeap();
-NA_EIDPROC
NAHeap(const char * name,
NAHeap * parent,
Lng32 blockSize = 0,
Lng32 upperLimit =0);
-NA_EIDPROC
NAHeap(const char * name, NAMemoryType type = DERIVED_FROM_SYS_HEAP,
Lng32 blockSize = 0, Lng32 upperLimit = 0);
-NA_EIDPROC
NAHeap(const char * name,
SEG_ID extFirstSegId,
void * extFirstSegStart,
@@ -658,39 +556,29 @@ NA_EIDPROC
Lng32 extFirstSegMaxLen,
NASegGlobals *segGlobals,
Lng32 extMaxSecSegCount = NASegGlobals::NA_MAX_SECONDARY_SEGS);
-NA_EIDPROC
~NAHeap();
-NA_EIDPROC
void destroy();
-NA_EIDPROC
void reInitializeHeap();
-NA_EIDPROC
void * allocateHeapMemory(size_t userSize, NABoolean failureIsFatal = TRUE);
-NA_EIDPROC
void deallocateHeapMemory(void * addr);
-NA_EIDPROC
void * allocateAlignedHeapMemory(size_t userSize, size_t alignment, NABoolean failureIsFatal = TRUE);
-NA_EIDPROC
void setErrorCallback(void (*errCallback)(NAHeap*,size_t));
-#if (defined(_DEBUG) || defined(NSK_MEMDEBUG)) && !defined(__EID) && !defined(STAND_ALONE)
- NA_EIDPROC void dumpHeapInfo(ostream* outstream, Lng32 indent);
+#if (defined(_DEBUG) || defined(NSK_MEMDEBUG))
+ void dumpHeapInfo(ostream* outstream, Lng32 indent);
#endif
-#if defined(NA_LINUX) && !defined(__EID)
// setThreadSafe must be called by the thread that creates the heap
// before other threads use it
void setThreadSafe();
const inline bool getThreadSafe() { return threadSafe_; }
-#endif
#ifdef _DEBUG
LIST(TrafAddrStack *) *getSAL() { return la_; }
#endif // _DEBUG
private:
-NA_EIDPROC
NABlock* allocateBlock(size_t size, NABoolean failureIsFatal);
binmap_t smallmap_; // Bitmap of small bins
@@ -725,18 +613,15 @@ NA_EIDPROC
// are 2 equally spaced treebins for each power
// of two from TREE_SHIFT to TREE_SHIFT+16.
// The last bin holds anything larger.
-#ifndef __EID
+
MemoryStats dynamicAllocs; // Statistics about memory allocations
-#endif
void (*errCallback_)(NAHeap*, size_t); // Pointer to a function that
// will be called when an error occurs. The
// function can log the error or handle the
// error in an appropriate way.
-#if defined(NA_LINUX) && !defined(__EID)
bool threadSafe_; // Heao is thread safe
pthread_mutex_t mutex_; // Mutex to serialize thread safe access
-#endif
#ifdef _DEBUG
LIST(TrafAddrStack *) *la_; // List of back traces when centain size
@@ -745,94 +630,92 @@ NA_EIDPROC
public:
// Operations from Doug Lea's malloc implementation
- NA_EIDPROC static NABoolean isSmall(size_t size);
- NA_EIDPROC static bindex_t smallIndex(size_t size);
- NA_EIDPROC static size_t smallIndex2Size(bindex_t idx);
+ static NABoolean isSmall(size_t size);
+ static bindex_t smallIndex(size_t size);
+ static size_t smallIndex2Size(bindex_t idx);
- NA_EIDPROC static bindex_t computeTreeIndex(size_t size);
- NA_EIDPROC static size_t minsizeForTreeIndex(bindex_t idx);
+ static bindex_t computeTreeIndex(size_t size);
+ static size_t minsizeForTreeIndex(bindex_t idx);
- NA_EIDPROC void releaseFreePages(); // release deallocted pages to kernel
+ void releaseFreePages(); // release deallocted pages to kernel
-#if (defined(_DEBUG) || defined(NSK_MEMDEBUG)) && !defined(__EID)
+#if (defined(_DEBUG) || defined(NSK_MEMDEBUG))
// useful method for debugging buffer overruns; sprinkle your code
// with calls to this in order to narrow down where a buffer overrun
// is occurring
- NA_EIDPROC void doCheckMallocState();
-#endif // (defined(_DEBUG) || defined(NSK_MEMDEBUG)) && !defined(__EID)
+ void doCheckMallocState();
+#endif // (defined(_DEBUG) || defined(NSK_MEMDEBUG))
private:
- NA_EIDPROC static NABoolean isAligned(void *a);
- NA_EIDPROC static size_t granularityAlign(size_t size);
+ static NABoolean isAligned(void *a);
+ static size_t granularityAlign(size_t size);
- NA_EIDPROC NABoolean okAddress(void *addr);
- NA_EIDPROC static NABoolean okNext(NAHeapFragment *p, NAHeapFragment *n);
- NA_EIDPROC static NABoolean okCinuse(NAHeapFragment *p);
- NA_EIDPROC static NABoolean okPinuse(NAHeapFragment *p);
+ NABoolean okAddress(void *addr);
+ static NABoolean okNext(NAHeapFragment *p, NAHeapFragment *n);
+ static NABoolean okCinuse(NAHeapFragment *p);
+ static NABoolean okPinuse(NAHeapFragment *p);
- NA_EIDPROC static binmap_t idx2bit(bindex_t idx);
- NA_EIDPROC static bindex_t bit2idx(binmap_t x);
+ static binmap_t idx2bit(bindex_t idx);
+ static bindex_t bit2idx(binmap_t x);
- NA_EIDPROC void markSmallmap(bindex_t idx);
- NA_EIDPROC void clearSmallmap(bindex_t idx);
- NA_EIDPROC NABoolean smallmapIsMarked(bindex_t idx);
+ void markSmallmap(bindex_t idx);
+ void clearSmallmap(bindex_t idx);
+ NABoolean smallmapIsMarked(bindex_t idx);
- NA_EIDPROC void markTreemap(bindex_t idx);
- NA_EIDPROC void clearTreemap(bindex_t idx);
- NA_EIDPROC NABoolean treemapIsMarked(bindex_t idx);
+ void markTreemap(bindex_t idx);
+ void clearTreemap(bindex_t idx);
+ NABoolean treemapIsMarked(bindex_t idx);
- NA_EIDPROC static binmap_t leftBits(binmap_t bits);
- NA_EIDPROC static binmap_t leastBit(binmap_t bits);
+ static binmap_t leftBits(binmap_t bits);
+ static binmap_t leastBit(binmap_t bits);
- NA_EIDPROC static UInt32 leftshiftForTreeIndex(bindex_t idx);
+ static UInt32 leftshiftForTreeIndex(bindex_t idx);
- NA_EIDPROC NAHeapFragment* smallbinAt(bindex_t idx);
- NA_EIDPROC NATreeFragment** treebinAt(bindex_t idx);
+ NAHeapFragment* smallbinAt(bindex_t idx);
+ NATreeFragment** treebinAt(bindex_t idx);
- NA_EIDPROC void initBins();
+ void initBins();
- NA_EIDPROC void insertSmallFragment(NAHeapFragment *p, size_t size);
- NA_EIDPROC void unlinkSmallFragment(NAHeapFragment *p, size_t size);
- NA_EIDPROC void unlinkFirstSmallFragment(NAHeapFragment *b,
+ void insertSmallFragment(NAHeapFragment *p, size_t size);
+ void unlinkSmallFragment(NAHeapFragment *p, size_t size);
+ void unlinkFirstSmallFragment(NAHeapFragment *b,
NAHeapFragment *p, bindex_t idx);
- NA_EIDPROC void insertLargeFragment(NATreeFragment *p, size_t size);
- NA_EIDPROC void unlinkLargeFragment(NATreeFragment *p);
-
- NA_EIDPROC void insertFragment(NAHeapFragment *p, size_t size);
- NA_EIDPROC void unlinkFragment(NAHeapFragment *p, size_t size);
-
- NA_EIDPROC void replaceDV(NAHeapFragment *p, size_t size);
-
- NA_EIDPROC void resizeTop(size_t newsize);
- NA_EIDPROC void initTop(NABlock *block);
- NA_EIDPROC void addBlock(NABlock* newBlock);
-
- NA_EIDPROC NABoolean deallocateFreeBlock(NAHeapFragment *p);
-
- NA_EIDPROC NAHeapFragment *tmallocLarge(size_t nb);
- NA_EIDPROC NAHeapFragment *tmallocSmall(size_t nb);
-
-#if (defined(_DEBUG) || defined(NSK_MEMDEBUG)) && !defined(__EID)
- NA_EIDPROC void doAllocDebugProcess(NAHeapFragment *p, size_t userSize);
- NA_EIDPROC void doDeallocDebugProcess(NAHeapFragment *p);
- NA_EIDPROC void doCheckAnyFragment(NAHeapFragment *p);
- NA_EIDPROC void doCheckTopFragment(NAHeapFragment *p);
- NA_EIDPROC void doCheckInuseFragment(NAHeapFragment *p);
- NA_EIDPROC void doCheckFreeFragment(NAHeapFragment *p);
- NA_EIDPROC void doCheckMallocedFragment(NAHeapFragment *p, size_t s);
- NA_EIDPROC void doCheckTree(NATreeFragment *t);
- NA_EIDPROC void doCheckTreebin(bindex_t i);
- NA_EIDPROC void doCheckSmallbin(bindex_t i);
- NA_EIDPROC NABoolean binFind(NAHeapFragment *x);
- NA_EIDPROC size_t traverseAndCheck();
-#ifndef STAND_ALONE
- NA_EIDPROC void checkForOverflow();
-#endif // STAND_ALONE
-#endif // (defined(_DEBUG) || defined(NSK_MEMDEBUG)) && !defined(__EID)
+ void insertLargeFragment(NATreeFragment *p, size_t size);
+ void unlinkLargeFragment(NATreeFragment *p);
+
+ void insertFragment(NAHeapFragment *p, size_t size);
+ void unlinkFragment(NAHeapFragment *p, size_t size);
+
+ void replaceDV(NAHeapFragment *p, size_t size);
+
+ void resizeTop(size_t newsize);
+ void initTop(NABlock *block);
+ void addBlock(NABlock* newBlock);
+
+ NABoolean deallocateFreeBlock(NAHeapFragment *p);
+
+ NAHeapFragment *tmallocLarge(size_t nb);
+ NAHeapFragment *tmallocSmall(size_t nb);
+
+#if (defined(_DEBUG) || defined(NSK_MEMDEBUG))
+ void doAllocDebugProcess(NAHeapFragment *p, size_t userSize);
+ void doDeallocDebugProcess(NAHeapFragment *p);
+ void doCheckAnyFragment(NAHeapFragment *p);
+ void doCheckTopFragment(NAHeapFragment *p);
+ void doCheckInuseFragment(NAHeapFragment *p);
+ void doCheckFreeFragment(NAHeapFragment *p);
+ void doCheckMallocedFragment(NAHeapFragment *p, size_t s);
+ void doCheckTree(NATreeFragment *t);
+ void doCheckTreebin(bindex_t i);
+ void doCheckSmallbin(bindex_t i);
+ NABoolean binFind(NAHeapFragment *x);
+ size_t traverseAndCheck();
+ void checkForOverflow();
+#endif // (defined(_DEBUG) || defined(NSK_MEMDEBUG))
#ifdef _DEBUG
- NA_EIDPROC void setAllocTrace();
+ void setAllocTrace();
#endif // _DEBUG
};
@@ -972,56 +855,54 @@ private:
class NAHeapFragment {
public:
- NA_EIDPROC void *getMemory(NABoolean cleanUpPrevNext=FALSE);
- NA_EIDPROC static NAHeapFragment *memToFragment(void *mem);
-
- NA_EIDPROC NABoolean cinuse();
- NA_EIDPROC NABoolean pinuse();
- NA_EIDPROC NABoolean cpinuse();
- NA_EIDPROC size_t fragmentSize();
- NA_EIDPROC void clearCinuse();
- NA_EIDPROC void clearPinuse();
-
- NA_EIDPROC void initializeFirstFragment(size_t s);
- NA_EIDPROC size_t getFirstFragmentBit();
- NA_EIDPROC void setHeadBits(size_t bits);
- NA_EIDPROC NABoolean occupiesCompleteNABlock();
-
- NA_EIDPROC const size_t* getHeadAddr();
- NA_EIDPROC void setNext(NAHeapFragment *next);
- NA_EIDPROC void setPrev(NAHeapFragment *prev);
- NA_EIDPROC NAHeapFragment* getNext();
- NA_EIDPROC NAHeapFragment* getPrev();
- NA_EIDPROC size_t getPrevFoot();
- NA_EIDPROC void adjustBlockSize(Lng32 s);
- NA_EIDPROC NAHeapFragment *fragmentPlusOffset(size_t s);
- NA_EIDPROC NAHeapFragment *fragmentMinusOffset(size_t s);
- NA_EIDPROC NAHeapFragment *nextFragment();
- NA_EIDPROC NAHeapFragment *prevFragment();
- NA_EIDPROC NABoolean nextPinuse();
- NA_EIDPROC void setFoot(size_t s);
- NA_EIDPROC void setSizeAndPinuseOfFreeFragment(size_t s);
- NA_EIDPROC void setFreeWithPinuse(size_t s, NAHeapFragment *next);
- NA_EIDPROC void setInuseAndPinuse(size_t s);
- NA_EIDPROC void setSize(size_t s);
- NA_EIDPROC void setSizeAndPinuse(size_t s);
- NA_EIDPROC void setSizeAndPinuseOfInuseFragment(size_t s);
-
- NA_EIDPROC NABoolean isFencePost();
- NA_EIDPROC void setFencePosts();
-
-#ifdef HAVE_MMAP
- NA_EIDPROC NABoolean isMMapped();
- NA_EIDPROC void setSizeOfMMapFragment(size_t s);
-#endif
+ void *getMemory(NABoolean cleanUpPrevNext=FALSE);
+ static NAHeapFragment *memToFragment(void *mem);
+
+ NABoolean cinuse();
+ NABoolean pinuse();
+ NABoolean cpinuse();
+ size_t fragmentSize();
+ void clearCinuse();
+ void clearPinuse();
+
+ void initializeFirstFragment(size_t s);
+ size_t getFirstFragmentBit();
+ void setHeadBits(size_t bits);
+ NABoolean occupiesCompleteNABlock();
+
+ const size_t* getHeadAddr();
+ void setNext(NAHeapFragment *next);
+ void setPrev(NAHeapFragment *prev);
+ NAHeapFragment* getNext();
+ NAHeapFragment* getPrev();
+ size_t getPrevFoot();
+ void adjustBlockSize(Lng32 s);
+ NAHeapFragment *fragmentPlusOffset(size_t s);
+ NAHeapFragment *fragmentMinusOffset(size_t s);
+ NAHeapFragment *nextFragment();
+ NAHeapFragment *prevFragment();
+ NABoolean nextPinuse();
+ void setFoot(size_t s);
+ void setSizeAndPinuseOfFreeFragment(size_t s);
+ void setFreeWithPinuse(size_t s, NAHeapFragment *next);
+ void setInuseAndPinuse(size_t s);
+ void setSize(size_t s);
+ void setSizeAndPinuse(size_t s);
+ void setSizeAndPinuseOfInuseFragment(size_t s);
+
+ NABoolean isFencePost();
+ void setFencePosts();
+
+ NABoolean isMMapped();
+ void setSizeOfMMapFragment(size_t s);
-#if (defined(_DEBUG) || defined(NSK_MEMDEBUG)) && !defined(__EID) && !defined(STAND_ALONE)
- NA_EIDPROC void checkBufferOverflow();
-#endif // (defined(_DEBUG) || defined(NSK_MEMDEBUG)) && !defined(__EID) && !defined(STAND_ALONE)
+#if (defined(_DEBUG) || defined(NSK_MEMDEBUG))
+ void checkBufferOverflow();
+#endif // (defined(_DEBUG) || defined(NSK_MEMDEBUG))
- NA_EIDPROC void cleanFreePages(size_t fragSize); // mark free pages as "clean".
+ void cleanFreePages(size_t fragSize); // mark free pages as "clean".
// Release unused/free memory in the heap back to the kernel
- NA_EIDPROC void releaseFreePages(NAHeapFragment *prev,
+ void releaseFreePages(NAHeapFragment *prev,
NAHeapFragment *next,
Int32 mergeFlags);
@@ -1030,11 +911,7 @@ private:
PINUSE_BIT = 1, // Previous fragment is in use
CINUSE_BIT = 2, // Current fragment is in use
MMAPPED_BIT = 4, // This NABlock was allocated with MMAP and contains a single fragment.
-#ifdef NA_64BIT
FIRST_FRAGMENT_BIT = 0x8000000000000000, // First fragment in NABlock
-#else
- FIRST_FRAGMENT_BIT = 0x80000000, // First fragment in NABlock
-#endif
INUSE_BITS = (PINUSE_BIT|CINUSE_BIT),
FENCEPOST_HEAD = (INUSE_BITS|sizeof(size_t))
};
@@ -1118,19 +995,19 @@ private:
class NATreeFragment : public NAHeapFragment {
public:
- NA_EIDPROC NATreeFragment* getChild(UInt32 childNo);
- NA_EIDPROC NATreeFragment** getChildAddr(UInt32 childNo);
- NA_EIDPROC NATreeFragment* leftmostChild();
- NA_EIDPROC void setChild(Int32 childNo, NATreeFragment *p);
- NA_EIDPROC NATreeFragment* getParent();
- NA_EIDPROC void setParent(NATreeFragment *p);
- NA_EIDPROC NAHeap::bindex_t getIndex();
- NA_EIDPROC void setIndex(NAHeap::bindex_t idx);
- NA_EIDPROC short getFreedNSKMemory();
- NA_EIDPROC void setFreedNSKMemory(short value);
-
- NA_EIDPROC void recurseFreeMemory();
- NA_EIDPROC void releaseFreePages();
+ NATreeFragment* getChild(UInt32 childNo);
+ NATreeFragment** getChildAddr(UInt32 childNo);
+ NATreeFragment* leftmostChild();
+ void setChild(Int32 childNo, NATreeFragment *p);
+ NATreeFragment* getParent();
+ void setParent(NATreeFragment *p);
+ NAHeap::bindex_t getIndex();
+ void setIndex(NAHeap::bindex_t idx);
+ short getFreedNSKMemory();
+ void setFreedNSKMemory(short value);
+
+ void recurseFreeMemory();
+ void releaseFreePages();
private:
// The first four fields are in NAHeapFragment:
@@ -1152,26 +1029,18 @@ private:
class DefaultIpcHeap : public CollHeap
{
public:
-NA_EIDPROC
DefaultIpcHeap() { derivedClass_= DEFAULTIPCHEAP_CLASS; }
-NA_EIDPROC
void * allocateIpcHeapMemory(size_t size, NABoolean failureIsFatal = TRUE);
-NA_EIDPROC
void deallocateIpcHeapMemory(void * buffer);
-NA_EIDPROC
~DefaultIpcHeap();
-NA_EIDPROC
void destroy();
// bogus fn needed simply because of inheritance
-#if (defined(_DEBUG) || defined(NSK_MEMDEBUG)) && !defined(__EID) && !defined(STAND_ALONE)
-NA_EIDPROC
+#if (defined(_DEBUG) || defined(NSK_MEMDEBUG))
void dumpIpcHeapInfo(ostream* outstream, Lng32 indent);
#endif
};
-#if ((defined(NA_NSK) || defined (NA_LINUX)) && (!defined(__EID)))
SEG_ID getStatsSegmentId();
-#endif
extern SEG_ID gStatsSegmentId_;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/common/NAStdlib.h
----------------------------------------------------------------------
diff --git a/core/sql/common/NAStdlib.h b/core/sql/common/NAStdlib.h
index 97c39fe..203f9d3 100644
--- a/core/sql/common/NAStdlib.h
+++ b/core/sql/common/NAStdlib.h
@@ -38,15 +38,6 @@
#include "Platform.h"
#include <string.h>
-// -----------------------------------------------------------------------
-// The purpose of this file is to define C RUNTIME stuff found in the
-// system library if NA_NO_C_RUNTIME is defined. Otherwise, the regular
-// headers are included.
-// -----------------------------------------------------------------------
-
-// -----------------------------------------------------------------------
-// NT or NSK with C runtime available, use the standard header files
-// -----------------------------------------------------------------------
#include <stdlib.h>
#include <memory.h>
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/common/NAString.cpp
----------------------------------------------------------------------
diff --git a/core/sql/common/NAString.cpp b/core/sql/common/NAString.cpp
index 7431bff..2eeaf1c 100644
--- a/core/sql/common/NAString.cpp
+++ b/core/sql/common/NAString.cpp
@@ -403,7 +403,7 @@ NABoolean IsCIdentifier(const char *id)
NABoolean /*NAString::*/setMPLoc()
{
- if (!SqlParser_Initialized() || SqlParser_NAMETYPE == DF_NSK)
+ if (!SqlParser_Initialized() )
return TRUE;
else
return FALSE;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/common/NAString2.cpp
----------------------------------------------------------------------
diff --git a/core/sql/common/NAString2.cpp b/core/sql/common/NAString2.cpp
index bb24a54..32e9fbd 100644
--- a/core/sql/common/NAString2.cpp
+++ b/core/sql/common/NAString2.cpp
@@ -43,25 +43,14 @@
#include "ComSizeDefs.h"
#include "NAWinNT.h"
-#ifndef CLI_PRIV_SRL
#include "NAString.h"
#include "nawstring.h"
-#else
-// ComGetNameInterfaceCharSet() is declared and defined in NAString.h
-#include "ComCharSetDefs.h"
-inline SQLCHARSET_CODE ComGetNameInterfaceCharSet()
-{
- return SQLCHARSETCODE_UTF8;
-}
-#endif
-#include "sqlcli.h"
+#include "sqlcli.h"
// move this method to NAString.h later.
NABoolean setMPLoc();
-
-
// -----------------------------------------------------------------------
static NABoolean NAString2_isUpper(unsigned char c,
SQLCHARSET_CODE isoMapCS)
@@ -263,7 +252,6 @@ void ToAnsiIdentifier3(const char * inputData, size_t inputLen,
} // ToAnsiIdentifier3
-#ifndef CLI_PRIV_SRL
// -----------------------------------------------------------------------
// Remove whitespace (spaces and tabs) from front or back or both
// -----------------------------------------------------------------------
@@ -330,5 +318,3 @@ void RemoveTrailingZeros(NAString &ns)
ns.remove(++i);
}
}
-
-#endif
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/common/NAStringDefGlobals.h
----------------------------------------------------------------------
diff --git a/core/sql/common/NAStringDefGlobals.h b/core/sql/common/NAStringDefGlobals.h
index 2f4d5c9..edacbcd 100644
--- a/core/sql/common/NAStringDefGlobals.h
+++ b/core/sql/common/NAStringDefGlobals.h
@@ -51,7 +51,6 @@
// -----------------------------------------------------------------------
#include "Platform.h"
-#include "SqlExportDllDefines.h"
// #include "ComCharSetDefs.h" // includes definition of enum SQLCHARSET_CODE
// classes in this file:
@@ -71,7 +70,7 @@ class NAWString ;
// //
//////////////////////////////////////////////////////////////////////////
-class SQLEXPORT_LIB_FUNC NAReference
+class NAReference
{
protected:
UInt32 refs_; // (1 less than) number of references
@@ -103,7 +102,7 @@ public:
* There are no public member functions.
*/
-class SQLEXPORT_LIB_FUNC NAStringRef : public NAReference
+class NAStringRef : public NAReference
{
private: // not protected -- we don't expect anyone to ever inherit from NAStringRef
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/common/NAWinNT.h
----------------------------------------------------------------------
diff --git a/core/sql/common/NAWinNT.h b/core/sql/common/NAWinNT.h
index 46887b4..08f4d33 100644
--- a/core/sql/common/NAWinNT.h
+++ b/core/sql/common/NAWinNT.h
@@ -42,12 +42,8 @@
#include <ctype.h>
-#ifdef ARKFS_OPEN
- typedef unsigned short NAWchar;
-#else
- // We generally use NAWchar as the C data type for wide characters.
- #define NAWchar wchar_t
-#endif
+// We generally use NAWchar as the C data type for wide characters.
+#define NAWchar wchar_t
#ifndef BYTES_PER_NAWCHAR
#define BYTES_PER_NAWCHAR 2
@@ -64,7 +60,7 @@
// We avoid sourcing in more header files into this simple header NAWinNT.h
// file due to the complexity of the build of the SQL Engine products.
//
-// NA_EIDPROC inline void wc_str_pad(NAWchar *str, Int32 length,
+// inline void wc_str_pad(NAWchar *str, Int32 length,
// NAWchar padchar = unicode_char_set::SPACE);
@@ -86,7 +82,6 @@
#define NAWwcstol na_wcstol
// inline wchar functions
-NA_EIDPROC
inline
UInt32 na_wcslen (const NAWchar * wstr)
{
@@ -95,18 +90,18 @@ UInt32 na_wcslen (const NAWchar * wstr)
return s - wstr;
}
-NA_EIDPROC inline
+inline
Int32 na_iswspace (NAWchar wc)
{
return ( wc == NAWCHR(' ') );
}
-NA_EIDPROC NAWchar * na_wcscat (NAWchar*, const NAWchar*);
-NA_EIDPROC Int32 na_wcscmp (const NAWchar *, const NAWchar *);
-NA_EIDPROC Int32 na_wcsicmp (const NAWchar *, const NAWchar *);
-NA_EIDPROC Int32 na_wcsncmp (const NAWchar *, const NAWchar *, UInt32);
-NA_EIDPROC Int32 na_wcsincmp (const NAWchar *, const NAWchar *, UInt32);
-NA_EIDPROC NAWchar * na_wcsncpy (NAWchar * dest, const NAWchar * src, UInt32 n);
+NAWchar * na_wcscat (NAWchar*, const NAWchar*);
+Int32 na_wcscmp (const NAWchar *, const NAWchar *);
+Int32 na_wcsicmp (const NAWchar *, const NAWchar *);
+Int32 na_wcsncmp (const NAWchar *, const NAWchar *, UInt32);
+Int32 na_wcsincmp (const NAWchar *, const NAWchar *, UInt32);
+NAWchar * na_wcsncpy (NAWchar * dest, const NAWchar * src, UInt32 n);
// We define these functions on Linux because we have chosen to use the
// short version of wchar_t (i.e., the 2-byte-size NAWchar data type)
@@ -115,15 +110,14 @@ NA_EIDPROC NAWchar * na_wcsncpy (NAWchar * dest, const NAWchar * src, UInt32 n)
// Functions na_wcstombs(), na_mbstowcs(), and na_wcswcs are defined in
// the source file w:/common/wstr.cpp.
//
-NA_EIDPROC size_t na_wcstombs(char *, const NAWchar*, size_t);
-NA_EIDPROC size_t na_mbstowcs(NAWchar*, const char*, size_t);
-NA_EIDPROC NAWchar * na_wcswcs(const NAWchar*, const NAWchar*);
+size_t na_wcstombs(char *, const NAWchar*, size_t);
+size_t na_mbstowcs(NAWchar*, const char*, size_t);
+NAWchar * na_wcswcs(const NAWchar*, const NAWchar*);
// This compares two strings that can have embedded nulls.
-NA_EIDPROC Int32 na_wcsnncmp (const NAWchar *wstr1, UInt32 len1,
+Int32 na_wcsnncmp (const NAWchar *wstr1, UInt32 len1,
const NAWchar *wstr2, UInt32 len2);
-NA_EIDPROC
inline
NAWchar *na_wcscpy (NAWchar * dest, const NAWchar * src)
{
@@ -134,7 +128,6 @@ NAWchar *na_wcscpy (NAWchar * dest, const NAWchar * src)
return dest;
}
-NA_EIDPROC
inline
Int32 na_wcs_has_only_ascii_chars (const NAWchar * src, size_t srcLenInNAWchars)
{
@@ -146,7 +139,6 @@ Int32 na_wcs_has_only_ascii_chars (const NAWchar * src, size_t srcLenInNAWchars)
}
/*
-NA_EIDPROC
inline
NAWchar *na_wcsncpy (NAWchar * dest, const NAWchar * src, unsigned int n)
{
@@ -168,7 +160,6 @@ NAWchar *na_wcsncpy (NAWchar * dest, const NAWchar * src, unsigned int n)
}
*/
-NA_EIDPROC
inline
NAWchar na_towupper (NAWchar wc)
{
@@ -180,7 +171,6 @@ NAWchar na_towupper (NAWchar wc)
return wc;
}
-NA_EIDPROC
inline
NAWchar na_towlower (NAWchar wc)
{
@@ -192,15 +182,15 @@ NAWchar na_towlower (NAWchar wc)
return wc;
}
-NA_EIDPROC Int64 na_wcstoll (const NAWchar *);
-NA_EIDPROC Lng32 na_wcstol (const NAWchar *);
-NA_EIDPROC NAWchar *na_wcschr (const NAWchar *, NAWchar);
-NA_EIDPROC NAWchar *na_wcsrchr (const NAWchar *, NAWchar);
-NA_EIDPROC Int32 na_wsprintf(NAWchar *buffer, const NAWchar *format, ... );
-NA_EIDPROC NAWchar *na_wmemchr(const NAWchar *ws, NAWchar wc, Int32 n); // used by swsprintf
+Int64 na_wcstoll (const NAWchar *);
+Lng32 na_wcstol (const NAWchar *);
+NAWchar *na_wcschr (const NAWchar *, NAWchar);
+NAWchar *na_wcsrchr (const NAWchar *, NAWchar);
+Int32 na_wsprintf(NAWchar *buffer, const NAWchar *format, ... );
+NAWchar *na_wmemchr(const NAWchar *ws, NAWchar wc, Int32 n); // used by swsprintf
-NA_EIDPROC Int32 na_swscanf(const NAWchar *buffer, const NAWchar *format, ... );
-NA_EIDPROC double na_wcstod (const NAWchar *, NAWchar **); // used by swscanf
+Int32 na_swscanf(const NAWchar *buffer, const NAWchar *format, ... );
+double na_wcstod (const NAWchar *, NAWchar **); // used by swscanf
#define T_TEXT(q) WIDE_(q) // q is "string"
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/common/NLSConversion.h
----------------------------------------------------------------------
diff --git a/core/sql/common/NLSConversion.h b/core/sql/common/NLSConversion.h
index c809eed..289f4af 100644
--- a/core/sql/common/NLSConversion.h
+++ b/core/sql/common/NLSConversion.h
@@ -55,77 +55,62 @@
class NAString;
class NAWString;
-NA_EIDPROC
NAWcharBuf*
ISO88591ToUnicode(const charBuf& iso88591String, CollHeap *heap,
NAWcharBuf*& unicodeString, NABoolean addNullAtEnd = TRUE);
-NA_EIDPROC
charBuf*
unicodeToISO88591(const NAWcharBuf& unicodeString, CollHeap* heap,
charBuf*& iso88591String, NABoolean addNullAtEnd = TRUE,
NABoolean allowInvalidCodePoint = TRUE);
-NA_EIDPROC
NAWcharBuf*
csetToUnicode(const charBuf& csetString, CollHeap *heap,
NAWcharBuf*& unicodeString, Int32 cset, Int32 &errorcode,
NABoolean addNullAtEnd = TRUE, Int32 *charCount=NULL, Int32 *errorByteOff=NULL);
-NA_EIDPROC
charBuf*
unicodeTocset(const NAWcharBuf& unicodeString, CollHeap* heap,
charBuf*& csetString, Int32 cset, Int32 &errorcode, NABoolean addNullAtEnd = TRUE,
NABoolean allowInvalidCodePoint = TRUE, Int32 *charCount=NULL, Int32 *errorByteOff=NULL);
-NA_EIDPROC
NAWcharBuf*
sjisToUnicode(const charBuf& sjisString, CollHeap *heap,
NAWcharBuf*& unicodeString, NABoolean addNullAtEnd = TRUE);
-NA_EIDPROC
charBuf*
unicodeToSjis(const NAWcharBuf& unicodeString, CollHeap *heap,
charBuf*& sjisString, NABoolean addNullAtEnd = TRUE,
NABoolean allowInvalidCodePoint = TRUE);
-NA_EIDPROC
charBuf*
unicodeToUtf8(const NAWcharBuf& unicodeString, CollHeap *heap,
charBuf*& utf8String, NABoolean addNullAtEnd = TRUE,
NABoolean allowInvalidCodePoint = TRUE);
-NA_EIDPROC
NAWcharBuf*
ksc5601ToUnicode(const charBuf& ksc5601String, CollHeap *heap,
NAWcharBuf*& unicodeString, NABoolean addNullAtEnd = TRUE);
-NA_EIDPROC
charBuf*
unicodeToKsc5601(const NAWcharBuf& unicodeString, CollHeap *heap,
charBuf*& ksc5601String, NABoolean addNullAtEnd = TRUE,
NABoolean allowInvalidCodePoint = TRUE);
-NA_EIDPROC
Int32 unicodeToSjisChar(char *sjis, NAWchar wc);
-NA_EIDPROC
cnv_charset convertCharsetEnum (Int32/*i.e. enum CharInfo::CharSet*/ inset);
-NA_EIDPROC
const char* getCharsetAsString(Int32/*i.e. enum CharInfo::CharSet*/ charset);
-NA_EIDPROC
Lng32 UnicodeStringToLocale(Lng32/*i.e. enum CharInfo::CharSet*/ charset,
const NAWchar* wstr, Lng32 wstrLen, char* buf, Lng32 bufLen, NABoolean addNullAtEnd = TRUE,
NABoolean allowInvalidCodePoint = TRUE);
-NA_EIDPROC
Lng32 LocaleStringToUnicode(Lng32/*i.e. enum CharInfo::CharSet*/ charset,
const char* str, Lng32 strLen, NAWchar* wstrBuf, Lng32 wstrBufLen, NABoolean addNullAtEnd = TRUE);
-NA_EIDPROC
Int32 localeConvertToUTF8(char* source,
Lng32 sourceLen,
char* target,
@@ -135,7 +120,6 @@ Int32 localeConvertToUTF8(char* source,
Lng32 *charCount = NULL,
Lng32 *errorByteOff = NULL);
-NA_EIDPROC
Int32 UTF8ConvertToLocale(char* source,
Lng32 sourceLen,
char* target,
@@ -171,7 +155,6 @@ Int32 UTF8ConvertToLocale(char* source,
// Note that classes NAMemory and CollHeap are the same except for
// the names.
// -----------------------------------------------------------------------
-NA_EIDPROC
Int32 ComputeWidthInBytesOfMbsForDisplay ( const char * pp_cpMbs // in
, const Int32 pv_iMbsLenInBytes // in
, const Int32 pv_iMaxDisplayLenInBytes // in
@@ -191,7 +174,6 @@ Int32 ComputeWidthInBytesOfMbsForDisplay ( const char * pp_cpMbs
// Return an error code (a negative number) if encounters an error. The
// error code values are defined in w:/common/csconvert.h.
// -----------------------------------------------------------------------
-NA_EIDPROC
Int32 ComputeStrLenInNAWchars (const char * pStr,
const Int32 strLenInBytes,
const CharInfo::CharSet cs,
@@ -205,7 +187,6 @@ Int32 ComputeStrLenInNAWchars (const char * pStr,
// Return an error code (a negative number) if encounters an error. The
// error code values are defined in w:/common/csconvert.h.
// -----------------------------------------------------------------------
-NA_EIDPROC
Int32 ComputeStrLenInUCS4chars (const char * pStr,
const Int32 strLenInBytes,
const CharInfo::CharSet cs);
@@ -235,7 +216,6 @@ typedef char CollHeap;
#define NABoolean Int32
#define TRUE 1
#define FALSE 0
-#define NA_EIDPROC
#define NADELETEBASIC(buf_, heap_)
#define NADELETE(buf_, T_, heap_)
#include "stringBuf.h"
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/common/NumericType.cpp
----------------------------------------------------------------------
diff --git a/core/sql/common/NumericType.cpp b/core/sql/common/NumericType.cpp
index cce8b00..95612f3 100644
--- a/core/sql/common/NumericType.cpp
+++ b/core/sql/common/NumericType.cpp
@@ -1493,8 +1493,6 @@ SQLNumeric::SQLNumeric(NAMemory *heap, Lng32 length, Lng32 precision, Lng32 scal
} // SQLNumeric()
-// Note: DisAmbiguate arg added so Compiler can distinguish between
-// this constructor and the one above...for 64bit project.
SQLNumeric::SQLNumeric(NAMemory *heap, NABoolean allowNegValues, Lng32 precision, Lng32 scale,
const Int16 DisAmbiguate,
NABoolean allowSQLnull)
@@ -1776,12 +1774,7 @@ NAString* SQLNumeric::convertToString(double v, CollHeap* h) const
}
break;
-#ifdef NA_64BIT
- // dg64 - a bit of a guess
case sizeof(Int32):
-#else
- case sizeof(Lng32):
-#endif
{
Lng32 temp = (Lng32)v;
signedLongToAscii(temp, nameBuf);
@@ -1870,12 +1863,7 @@ double SQLNumeric::getMinValue() const
}
break;
-#ifdef NA_64BIT
- // dg64 - a bit of a guess
case sizeof(Int32):
-#else
- case sizeof(Lng32):
-#endif
{
Lng32 temp = 0;
Lng32 i=0;
@@ -1935,12 +1923,7 @@ double SQLNumeric::getMaxValue() const
}
break;
-#ifdef NA_64BIT
- // dg64 - a bit of a guess
case sizeof(Int32):
-#else
- case sizeof(Lng32):
-#endif
{
Lng32 temp = 0;
Lng32 i=0;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/common/OperTypeEnum.h
----------------------------------------------------------------------
diff --git a/core/sql/common/OperTypeEnum.h b/core/sql/common/OperTypeEnum.h
index a48f18e..b917f23 100644
--- a/core/sql/common/OperTypeEnum.h
+++ b/core/sql/common/OperTypeEnum.h
@@ -428,9 +428,6 @@ enum OperatorTypeEnum {
// returns operand2 if operand1 is null
ITM_NVL = 2150,
- // Functions for Utilities
- ITM_AUDIT_IMAGE = 2151,
-
// return NULL if 2 arguments match, else return 1st arg
ITM_NULLIF = 2152,
@@ -645,7 +642,6 @@ enum OperatorTypeEnum {
ITM_PAGROUP = 2370,
ITM_HASH2_DISTRIB = 2371,
ITM_IDENTITY = 2372,
- ITM_EXTRACT_COLUMNS = 2373,
ITM_QUERYID_EXTRACT = 2374,
ITM_HEADER = 2375,
ITM_RANGE_SPEC_FUNC = 2376,
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/common/Platform.h
----------------------------------------------------------------------
diff --git a/core/sql/common/Platform.h b/core/sql/common/Platform.h
index 24ffa73..3b4933b 100644
--- a/core/sql/common/Platform.h
+++ b/core/sql/common/Platform.h
@@ -37,9 +37,6 @@
*/
#ifdef __gnu_linux__
-
-
-
#endif /* __gnu_linux__ */
@@ -70,7 +67,7 @@
// been set because some other target may have been defined. The following
// should set it correctly on Linux.
*/
-#if defined(NA_LINUX) && !defined(USE_EMBEDDED_SQL_DEFINITIONS)
+#if !defined(USE_EMBEDDED_SQL_DEFINITIONS)
#include <endian.h>
#if __BYTE_ORDER == __LITTLE_ENDIAN
#undef NA_BIG_ENDIAN
@@ -120,15 +117,6 @@
#define NA_GUARDIAN_IPC
#endif
-#ifndef NA_NO_GUARDIAN_IPC /* allow override from dev environment*/
-#define NA_GUARDIAN_IPC
-#endif
-
-
-
-
-
-
#if defined( NA_C89 ) || defined( NA_MSVC )
/* ----------------------------------------------------------------------- */
/* C89 and MSVC perform template instantiation at compile time, */
@@ -161,9 +149,8 @@
#define NA_IEEE_FLOAT
#define NA_EIDPROC
-#define _resident
-
-
+#define SQLEXP_LIB_FUNC
+#define SQLEXPORT_LIB_FUNC
/* Use ANSI standard namespace for .NET and new GCC compilers. */
#if (_MSC_VER >= 1300) || (__GNUC__ >= 3)
@@ -183,14 +170,10 @@
#define NA_WIDE_CHARACTER
-
-
-
-#if !defined(NDEBUG) && !defined(NA_NO_C_RUNTIME)
+#if !defined(NDEBUG)
#define NA_DEBUG_C_RUNTIME
#endif
-
/* Linux with the gcc compiler */
typedef int TInt32;
typedef long long int TInt64;
@@ -268,7 +251,7 @@ typedef double Float64;
typedef long Int64;
typedef unsigned long UInt64;
-#elif (defined( NA_WINNT ) || defined(NA_LINUX)) && !defined(USE_EMBEDDED_SQL_DEFINITIONS ) /* NT_PORT SK 08/13/96 */
+#elif (defined( NA_WINNT )) && !defined(USE_EMBEDDED_SQL_DEFINITIONS ) /* NT_PORT SK 08/13/96 */
typedef _int64 Int64;
typedef unsigned __int64 UInt64;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/common/SMConnection.cpp
----------------------------------------------------------------------
diff --git a/core/sql/common/SMConnection.cpp b/core/sql/common/SMConnection.cpp
index 7af965d..ddf0218 100644
--- a/core/sql/common/SMConnection.cpp
+++ b/core/sql/common/SMConnection.cpp
@@ -1135,7 +1135,6 @@ bool SMConnection::getAckArrived()
void SMConnection::dumpAndStopOtherEnd(bool doDump, bool doStop) const
{
char coreFile[1024];
-#ifdef SQ_PHANDLE_VERIFIER
char processName[MS_MON_MAX_PROCESS_NAME+1];
char seqName[PhandleStringLen];
if (XZFIL_ERR_OK == msg_mon_get_process_name2(smTarget_.node,
@@ -1152,16 +1151,4 @@ void SMConnection::dumpAndStopOtherEnd(bool doDump, bool doStop) const
if (doStop)
msg_mon_stop_process_name(seqName);
}
-#else
- if (doDump)
- msg_mon_dump_process_id(NULL, smTarget_.node, smTarget_.pid,
- coreFile);
- if (doStop)
- {
- char pname[32];
- if (XZFIL_ERR_OK == msg_mon_get_process_name(smTarget_.node,
- smTarget_.pid, pname))
- msg_mon_stop_process(pname, smTarget_.node, smTarget_.pid);
- }
-#endif
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/common/SqlEventsDllDefines.h
----------------------------------------------------------------------
diff --git a/core/sql/common/SqlEventsDllDefines.h b/core/sql/common/SqlEventsDllDefines.h
index 8e95e17..0e509b5 100644
--- a/core/sql/common/SqlEventsDllDefines.h
+++ b/core/sql/common/SqlEventsDllDefines.h
@@ -25,21 +25,15 @@
#include "Platform.h"
#ifndef SQLEVENTS_LIB_FUNC
- #ifdef __EID
- #define SQLEVENTS_LIB_FUNC
- #else
#ifdef EVENTS_DLL
#define SQLEVENTS_LIB_FUNC __declspec( dllexport )
#else
#define SQLEVENTS_LIB_FUNC __declspec( dllimport )
#endif
- #endif // __EID
#endif // SQLEVENTS_LIB_FUNC
-#ifdef NA_64BIT
- // dg64 - get rid of __declspec
+
#undef SQLEVENTS_LIB_FUNC
#define SQLEVENTS_LIB_FUNC
-#endif
#endif // SQLEVENTS_DLL_DEFINES.h
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/common/SqlExpDllDefines.h
----------------------------------------------------------------------
diff --git a/core/sql/common/SqlExpDllDefines.h b/core/sql/common/SqlExpDllDefines.h
index 5172ab4..c5be5ac 100644
--- a/core/sql/common/SqlExpDllDefines.h
+++ b/core/sql/common/SqlExpDllDefines.h
@@ -21,30 +21,3 @@
// @@@ END COPYRIGHT @@@
**********************************************************************/
-#ifndef SQLEXPDLL_H
-#define SQLEXPDLL_H
-
-#include "Platform.h"
-
- #ifdef __EID
- #define SQLEXP_LIB_FUNC
- #else
- #ifdef EXP_DLL
- #define SQLEXP_LIB_FUNC __declspec( dllexport )
- #else
- #ifdef UDRSERV_BUILD
- #define SQLEXP_LIB_FUNC
- #else
- #define SQLEXP_LIB_FUNC __declspec( dllimport )
- #endif // UDRSERV_BUILD
- #endif // EXP_DLL
- #endif // __EID
-#ifdef NA_64BIT
- // dg64 - get rid of __declspec
- #undef SQLEXP_LIB_FUNC
- #define SQLEXP_LIB_FUNC
-#endif
-
-#endif // SQLEXPDLL_H
-
-
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/common/SqlExportDllDefines.h
----------------------------------------------------------------------
diff --git a/core/sql/common/SqlExportDllDefines.h b/core/sql/common/SqlExportDllDefines.h
index e8d1918..178ea35 100644
--- a/core/sql/common/SqlExportDllDefines.h
+++ b/core/sql/common/SqlExportDllDefines.h
@@ -18,27 +18,3 @@
// under the License.
//
// @@@ END COPYRIGHT @@@
-
-#ifndef SQLEXPORT_DLL_DEFINES_H
-#define SQLEXPORT_DLL_DEFINES_H
-
-#include "Platform.h"
-
- #ifndef SQLEXPORT_LIB_FUNC
- #ifdef __EID
- #define SQLEXPORT_LIB_FUNC
- #else
- #ifdef EXPORT_DLL
- #define SQLEXPORT_LIB_FUNC __declspec( dllexport )
- #else
- #define SQLEXPORT_LIB_FUNC __declspec( dllimport )
- #endif
- #endif // __EID
- #endif // SQLEXPORT_LIB_FUNC
-#ifdef NA_64BIT
- #undef SQLEXPORT_LIB_FUNC
- #define SQLEXPORT_LIB_FUNC
-#endif
-
-#endif // SQLEXPORT_DLL_DEFINES.h
-
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/common/SqlLmDllDefines.h
----------------------------------------------------------------------
diff --git a/core/sql/common/SqlLmDllDefines.h b/core/sql/common/SqlLmDllDefines.h
index b9e7cbb..bd29c8b 100644
--- a/core/sql/common/SqlLmDllDefines.h
+++ b/core/sql/common/SqlLmDllDefines.h
@@ -26,20 +26,14 @@
#include "Platform.h"
- #ifdef __EID
- #define SQLLM_LIB_FUNC
- #else
- #ifdef LM_DLL
- #define SQLLM_LIB_FUNC __declspec( dllexport )
- #else
- #define SQLLM_LIB_FUNC __declspec( dllimport )
- #endif
- #endif
-#ifdef NA_64BIT
- // dg64 - get rid of __declspec
- #undef SQLLIM_LIB_FUNC
- #define SQLLIM_LIB_FUNC
+#ifdef LM_DLL
+#define SQLLM_LIB_FUNC __declspec( dllexport )
+#else
+#define SQLLM_LIB_FUNC __declspec( dllimport )
#endif
+#undef SQLLIM_LIB_FUNC
+#define SQLLIM_LIB_FUNC
+
#endif
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/common/arkcmp_proc.cpp
----------------------------------------------------------------------
diff --git a/core/sql/common/arkcmp_proc.cpp b/core/sql/common/arkcmp_proc.cpp
index 0f0a8b9..0806178 100644
--- a/core/sql/common/arkcmp_proc.cpp
+++ b/core/sql/common/arkcmp_proc.cpp
@@ -53,8 +53,6 @@ extern void my_mpi_fclose();
DEFINE_DOVERS(tdm_arkcmp)
-#include "SqlExportDllDefines.h"
-
#include "CmpMessage.h"
#include "CmpConnection.h"
#include "CmpContext.h"
[16/30] incubator-trafodion git commit: TRAFODION-2731 CodeCleanup:
Remove obsolete, legacy and unused code
Posted by an...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/ExScheduler.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExScheduler.h b/core/sql/executor/ExScheduler.h
index 63f0835..c6f4af5 100644
--- a/core/sql/executor/ExScheduler.h
+++ b/core/sql/executor/ExScheduler.h
@@ -46,9 +46,7 @@
#include "ComSqlexedbg.h"
#include "Platform.h"
-#ifndef __EID
#include "ComExeTrace.h"
-#endif
// -----------------------------------------------------------------------
@@ -119,12 +117,7 @@ typedef ExWorkProcRetcode (*ExWorkProcPtr)(ex_tcb *);
// do not do it by default.
// -----------------------------------------------------------------------
-#ifdef __EID
-// #define TRACE_DP2_CPU_LIMIT
-const Int32 NumLastCalled = 256;
-#else
const Int32 NumLastCalled = 8;
-#endif
struct TraceEntry {
ExSubtask *lastCalledTask_;
@@ -234,7 +227,7 @@ public:
Int32 hasActiveEvents(ex_tcb *tcb);
- NA_EIDPROC inline NABoolean externalEventCompleted(void)
+ inline NABoolean externalEventCompleted(void)
{ return externalEventCompleted_; };
// ---------------------------------------------------------------------
@@ -247,25 +240,25 @@ public:
// definition of ExSubtask follows this class.)
// ---------------------------------------------------------------------
- NA_EIDPROC inline void setExternalEventCompleted(void)
+ inline void setExternalEventCompleted(void)
{ externalEventCompleted_ = TRUE; };
- NA_EIDPROC void setRootTcb(ex_tcb *tcb);
+ void setRootTcb(ex_tcb *tcb);
// ---------------------------------------------------------------------
// Query limits: next three methods support the ability to raise an error
// if a query takes too much of a ESP or master's CPU time. These are
// defined also for exe-in-dp2, though the feature is not used there.
// ---------------------------------------------------------------------
- NA_EIDPROC void setMaxCpuTime(Int64 m) { maxCpuTime_ = m * 1000L * 1000L; }
+ void setMaxCpuTime(Int64 m) { maxCpuTime_ = m * 1000L * 1000L; }
- NA_EIDPROC void setCpuLimitCheckFreq(Int32 m) {
+ void setCpuLimitCheckFreq(Int32 m) {
maxSubtaskLoops_ = m;
subtaskLoopCnt_ = maxSubtaskLoops_; // A trick to ensure we check CPU
// time on the the first iteration.
}
- NA_EIDPROC NABoolean checkSuspendAndLimit();
+ NABoolean checkSuspendAndLimit();
// ---------------------------------------------------------------------
// Method to start the GUI
@@ -276,18 +269,16 @@ public:
// Method to aid in diagnosing looping problems
// ---------------------------------------------------------------------
- NA_EIDPROC inline ExSubtask * getLastCalledTask(void) const
+ inline ExSubtask * getLastCalledTask(void) const
{ return (lastCalledIdx_ == -1 ? 0 :
subtaskTrace_[lastCalledIdx_].lastCalledTask_);}
// ---------------------------------------------------------------------
// Method to aid executor tracing
// ---------------------------------------------------------------------
-#ifndef __EID
Int32 printALiner(Int32 lineno, char *buf);
static Int32 getALine(void * mine, Int32 lineno, char * buf)
{ return ((ExScheduler *) mine)->printALiner(lineno, buf); }
-#endif // not __EID
private:
@@ -303,11 +294,8 @@ private:
// helps with debugging loops
TraceEntry subtaskTrace_[NumLastCalled];
Int32 lastCalledIdx_;
-#ifndef __EID
// helps with executor tracing
ExeTrace *exeTrace_;
-#endif // not __EID
-
// list of rarely used subtasks (could keep multiple of these later)
ExExceptionSubtask *exceptionSubtask_;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/ExSequence.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExSequence.cpp b/core/sql/executor/ExSequence.cpp
index 9098b21..6377b6e 100644
--- a/core/sql/executor/ExSequence.cpp
+++ b/core/sql/executor/ExSequence.cpp
@@ -1490,9 +1490,7 @@ void ExSequenceTcb::createCluster()
clusterDb_->setScratchOverflowMode(SCRATCH_DISK);
break;
}
-#ifndef __EID
clusterDb_->setBMOMaxMemThresholdMB(myTdb().getBMOMaxMemThresholdMB());
-#endif
cluster_ = new(heap_) Cluster(Cluster::IN_MEMORY,
clusterDb_,
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/ExSimpleSample.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExSimpleSample.h b/core/sql/executor/ExSimpleSample.h
index ad4171c..4d19302 100644
--- a/core/sql/executor/ExSimpleSample.h
+++ b/core/sql/executor/ExSimpleSample.h
@@ -70,16 +70,16 @@ public:
// retrieval of the virtual table function pointer of the class while
// unpacking. An empty constructor is enough.
// ---------------------------------------------------------------------
- NA_EIDPROC ExSimpleSampleTdb()
+ ExSimpleSampleTdb()
{}
- NA_EIDPROC virtual ~ExSimpleSampleTdb()
+ virtual ~ExSimpleSampleTdb()
{}
// ---------------------------------------------------------------------
// Build a TCB for this TDB. Redefined in the Executor project.
// ---------------------------------------------------------------------
- NA_EIDPROC virtual ex_tcb *build(ex_globals *globals);
+ virtual ex_tcb *build(ex_globals *globals);
private:
// ---------------------------------------------------------------------
@@ -126,36 +126,28 @@ public:
// with the parent.
// - initializes local state.
//
- NA_EIDPROC
ExSimpleSampleTcb(const ExSimpleSampleTdb& sampleTdb,
const ex_tcb& childTdb,
ex_globals *glob);
// Destructor
- NA_EIDPROC
~ExSimpleSampleTcb();
// Free up any run-time resources.
- NA_EIDPROC
void freeResources();
// Register all the pack subtasks with the scheduler.
- NA_EIDPROC
void registerSubtasks();
// The basic work method for a TCB. SimpleSample does not use this method.
- NA_EIDPROC
ExWorkProcRetcode work();
// Work method to pass requests from parent down to child.
- NA_EIDPROC
ExWorkProcRetcode workDown();
// Work method to recieve results from child, process and pass up to parent.
- NA_EIDPROC
ExWorkProcRetcode workUp();
// Stub to workUp() used by scheduler.
- NA_EIDPROC
// warning elimination (removed "inline")
static ExWorkProcRetcode sWorkUp(ex_tcb *tcb)
{
@@ -163,7 +155,6 @@ public:
}
// Stub to workDown() used by scheduler.
- NA_EIDPROC
// warning elimination (removed "inline")
static ExWorkProcRetcode sWorkDown(ex_tcb *tcb)
{
@@ -171,30 +162,25 @@ public:
}
// Stub to processCancel() used by scheduler.
- // NA_EIDPROC
// static inline ExWorkProcRetcode sCancel(ex_tcb *tcb)
// {
// return ((ExSimpleSampleTcb *) tcb)->processCancel();
// }
// Return the parent queue pair.
- NA_EIDPROC
// warning elimination (removed "inline")
ex_queue_pair getParentQueue() const { return qParent_; }
// Return a reference to the TDB associated with this TCB.
- NA_EIDPROC
inline ExSimpleSampleTdb& simpleSampleTdb() const
{
return (ExSimpleSampleTdb &) tdb;
}
// SimpleSample has one child.
- NA_EIDPROC
virtual Int32 numChildren() const { return 1; }
// Return the child of the pack node by position.
- NA_EIDPROC
virtual const ex_tcb* getChild(Int32 pos) const
{
if(pos == 0) return childTcb_;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/ExSimpleSqlBuffer.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExSimpleSqlBuffer.h b/core/sql/executor/ExSimpleSqlBuffer.h
index 1c01d81..0b1f2e5 100644
--- a/core/sql/executor/ExSimpleSqlBuffer.h
+++ b/core/sql/executor/ExSimpleSqlBuffer.h
@@ -104,11 +104,6 @@ private:
//
ExSimpleSQLBufferEntry *next_;
-#ifndef NA_64BIT
- // filler to make data_ fall on 8-byte aligned address
- Int32 filler_;
-#endif
-
// data_ - The begining of the tuple data. When an
// ExSimpleSQLBufferEntry is allocated, additional space is
// allocated for the tuple data. Initialization is done in the
@@ -124,23 +119,19 @@ class ExSimpleSQLBuffer : public ExGod {
public:
// ExSimpleSQLBuffer - constructor
//
- NA_EIDPROC
ExSimpleSQLBuffer(Int32 numTuples, Int32 tupleSize, NAMemory *);
// ExSimpleSQLBuffer - constructor specially designed for mapping
// sql_buffer_pool construction calls to ExSimpleSQLBuffer calls.
//
- NA_EIDPROC
ExSimpleSQLBuffer(Int32 numBuffers, Int32 bufferSize, Int32 tupleSize, NAMemory *);
// ~ExSimpleSQLBuffer - destructor
//
- NA_EIDPROC
~ExSimpleSQLBuffer();
// getFreeTuple - sets <tp> to reference a free tuple from the buffer
//
- NA_EIDPROC
Int32 getFreeTuple(tupp &tp);
// getNumTuples - returns the total number of tupps in the buffer
@@ -154,7 +145,6 @@ public:
protected:
// Get an entry from the free list. Reclaim unreferenced
// tuples if the free list is empty.
- NA_EIDPROC
ExSimpleSQLBufferEntry * getFreeEntry(void);
ExSimpleSQLBufferEntry * getUsedList(void) { return usedList_; }
@@ -164,11 +154,9 @@ protected:
private:
// Common constructor initialization code
- NA_EIDPROC
void init(CollHeap * heap);
// Move unreferenced tuples from the used list to the free list.
- NA_EIDPROC
void reclaimTuples(void);
// numberTuples_ - The total number of tuples in the buffer (free and used).
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/ExStats.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExStats.cpp b/core/sql/executor/ExStats.cpp
index b25a3e5..a2d20f6 100644
--- a/core/sql/executor/ExStats.cpp
+++ b/core/sql/executor/ExStats.cpp
@@ -84,7 +84,7 @@
#include "seabed/fs.h"
#include "seabed/ms.h"
-NA_EIDPROC inline void advanceSize2(UInt32 &size, const char * const buffPtr)
+inline void advanceSize2(UInt32 &size, const char * const buffPtr)
{
const Int32 lenSize = sizeof(Lng32);
size += lenSize;
@@ -1142,44 +1142,6 @@ ExUDRBaseStats *ExOperStats::castToExUDRBaseStats()
return NULL;
}
-void MeasureInDp2::unpackBuffer(const char* &buffer, Lng32 version)
-{
- if (version == _STATS_PRE_RTS_VERSION)
- {
- str_cpy_all((char*)this, buffer,sizeof(*this)-sizeof(processBusyTime_)-sizeof(lockWaits_));
- buffer += (sizeof(*this)-sizeof(processBusyTime_)-sizeof(lockWaits_));
- processBusyTime_ = 0;
- lockWaits_ = 0;
- }
- else
- if (version >= _STATS_RTS_VERSION)
- {
- str_cpy_all((char*)this, buffer,sizeof(*this));
- buffer += sizeof(*this);
- }
- else
- return;
-}
-
-void MeasureOltInDp2::unpackBuffer(const char* &buffer, Lng32 version)
-{
- if (version == _STATS_PRE_RTS_VERSION)
- {
- str_cpy_all((char*)this, buffer,sizeof(*this)-sizeof(processBusyTime_)-sizeof(lockWaits_));
- buffer += (sizeof(*this)-sizeof(processBusyTime_)-sizeof(lockWaits_));
- processBusyTime_ = 0;
- lockWaits_ = 0;
- }
- else
- if (version >= _STATS_RTS_VERSION)
- {
- str_cpy_all((char*)this, buffer,sizeof(*this));
- buffer += sizeof(*this);
- }
- else
- return;
-}
-
const char * ExOperStats::getNumValTxt(Int32 i) const
{
switch (i)
@@ -3153,12 +3115,7 @@ void ExPartitionAccessStats::merge(ExPartitionAccessStats* other)
openTime_ += other->openTime_;
}
-#ifdef NA_64BIT
-// dg64 - match return type
UInt32 ExPartitionAccessStats::packedLength()
-#else
-ULng32 ExPartitionAccessStats::packedLength()
-#endif
{
UInt32 size = ExOperStats::packedLength();
alignSizeForNextObj(size);
@@ -5440,8 +5397,6 @@ ExStatisticsArea::ExStatisticsArea(NAMemory * heap, Lng32 sendBottomNum,
sendBottomNum_(sendBottomNum),
sendBottomCnt_(0),
collectStatsType_(cst) ,
- deallocStmtCntrs_(FALSE),
- stmtCntrs_(NULL),
flags_(0),
masterStats_(NULL),
rootStats_(NULL),
@@ -5542,10 +5497,6 @@ ExStatisticsArea::~ExStatisticsArea()
{
removeEntries();
- if ( stmtCntrs_ && deallocStmtCntrs_ ) {
- heap_->deallocateMemory((void *)stmtCntrs_);
- stmtCntrs_ = NULL;
- }
if (masterStats_ != NULL)
{
NADELETE(masterStats_, ExMasterStats, masterStats_->getHeap());
@@ -6237,14 +6188,6 @@ IpcMessageObjSize ExStatisticsArea::packedLength()
{
IpcMessageObjSize size = 0;
-
- /*
- if ((statsInDp2()) &&
- ((numEntries() == 1) &&
- ((getCollectStatsType() == ComTdb::ACCUMULATED_STATS) ||
- (getCollectStatsType() == ComTdb::MEASURE_STATS) ||
- (getCollectStatsType() == ComTdb::PERTABLE_STATS))))
- */
if (smallStatsObj())
{
size = sizeof(unsigned char) // version
@@ -6509,8 +6452,7 @@ void
ExStatisticsArea::unpackSmallObjFromEid(IpcConstMessageBufferPtr buffer,
Lng32 version)
{
- if ((getCollectStatsType() == ComTdb::ACCUMULATED_STATS) ||
- (getCollectStatsType() == ComTdb::MEASURE_STATS))
+ if (getCollectStatsType() == ComTdb::ACCUMULATED_STATS)
{
ExMeasStats * stat = new(heap_) ExMeasStats(heap_);
stat->setStatsInDp2(statsInDp2());
@@ -6959,8 +6901,6 @@ const char *ExStatisticsArea::getStatsTypeText(short statsType)
{
case SQLCLI_NO_STATS:
return "NO_STATS";
- case SQLCLI_MEASURE_STATS:
- return "MEASURE_STATS";
case SQLCLI_ACCUMULATED_STATS:
return "ACCUMULATED_STATS";
case SQLCLI_PERTABLE_STATS:
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/ExStats.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExStats.h b/core/sql/executor/ExStats.h
index f2128f7..6dfee82 100644
--- a/core/sql/executor/ExStats.h
+++ b/core/sql/executor/ExStats.h
@@ -60,10 +60,7 @@
#include <sys/times.h>
-#if defined (SQ_NEW_PHANDLE)
#include "seabed/fs.h"
-#endif // SQ_NEW_PHANDLE
-
//////////////////////////////////////////////////////////////////
// classes defined in this file
@@ -138,37 +135,27 @@ const Lng32 StatsCurrVersion = _STATS_RTS_VERSION_R25_1;
class ExStatsBase
{
public:
-NA_EIDPROC
virtual UInt32 pack(char * buffer){return 0;};
-NA_EIDPROC
virtual void unpack(const char* &buffer){};
-NA_EIDPROC
UInt32 alignedPack(char * buffer);
-NA_EIDPROC
void alignedUnpack(const char* &buffer);
-NA_EIDPROC
void alignSizeForNextObj(UInt32 &size);
-NA_EIDPROC
void alignBufferForNextObj(const char* &buffer);
};
class ExStatsBaseNew : public ExStatsBase
{
public:
-NA_EIDPROC
virtual UInt32 pack(char * buffer){return 0;};
-NA_EIDPROC
virtual void unpack(const char* &buffer){};
-NA_EIDPROC
NAMemory *getHeap() { return heap_; }
-NA_EIDPROC
ExStatsBaseNew(NAHeap *heap)
{
heap_ = heap;
@@ -190,47 +177,34 @@ protected:
//////////////////////////////////////////////////////////////////
class ExStatsCounter {
public:
-NA_EIDPROC
ExStatsCounter();
-NA_EIDPROC
~ExStatsCounter(){};
-NA_EIDPROC
ExStatsCounter& operator=(const ExStatsCounter &other);
-NA_EIDPROC
void addEntry(Int64 value);
-NA_EIDPROC
ULng32 entryCnt() const { return entryCnt_; };
-NA_EIDPROC
Int64 min() const { return (entryCnt_ ? min_ : 0); }
-NA_EIDPROC
Int64 max() const { return (entryCnt_ ? max_ : 0); }
-NA_EIDPROC
Int64 sum() const { return sum_; };
-NA_EIDPROC
float sum2() const { return sum2_; };
-NA_EIDPROC
void merge(ExStatsCounter * other);
-NA_EIDPROC
void init();
//////////////////////////////////////////////////////////////////
// the following methods are only used to finalize statistics
// (display them). They are never used in DP2.
//////////////////////////////////////////////////////////////////
-NA_EIDPROC
float mean();
-NA_EIDPROC
float variance();
private:
@@ -250,9 +224,7 @@ private:
#pragma nowarn(1103) // warning elimination
class ExClusterStats : public ExStatsBase {
public:
-NA_EIDPROC
ExClusterStats();
-NA_EIDPROC
ExClusterStats(NABoolean isInner,
ULng32 bucketCnt,
Int64 actRows,
@@ -261,16 +233,12 @@ NA_EIDPROC
Int64 writeIOCnt,
Int64 readIOCnt);
-NA_EIDPROC
~ExClusterStats(){};
-NA_EIDPROC
ExClusterStats& operator=(const ExClusterStats &other);
-NA_EIDPROC
void getVariableStatsInfo(char * dataBuffer, char * datalen, Lng32 maxLen);
-NA_EIDPROC
void getVariableStatsInfoAggr(char * dataBuffer,
char * datalen,
Lng32 maxLen);
@@ -279,43 +247,31 @@ NA_EIDPROC
// accessors, mutators
//////////////////////////////////////////////////////////////////
// Returning const char *
-NA_EIDPROC
inline const char * getInner() const { return ((isInner_) ? "inner" : "outer"); };
-NA_EIDPROC
inline ULng32 getBucketCnt() const {return bucketCnt_; };
-NA_EIDPROC
inline Int64 getActRows() const {return actRows_; };
-NA_EIDPROC
inline Int64 getTotalSize() const {return totalSize_; };
-NA_EIDPROC
inline ExStatsCounter getHashChains() const {return hashChains_; };
-NA_EIDPROC
inline Int64 getWriteIOCnt() const {return writeIOCnt_; };
-NA_EIDPROC
inline Int64 getReadIOCnt() const {return readIOCnt_; };
-NA_EIDPROC
inline void setNext(ExClusterStats* i) { next_ = i; };
-NA_EIDPROC
inline ExClusterStats* getNext() const {return next_; };
-NA_EIDPROC
UInt32 packedLength();
//////////////////////////////////////////////////////////////////
// packs 'this' into a message.
//////////////////////////////////////////////////////////////////
-NA_EIDPROC
UInt32 pack(char * buffer);
-NA_EIDPROC
void unpack(const char* &buffer);
private:
@@ -346,22 +302,18 @@ friend class ExHashJoinStats;
public:
-NA_EIDPROC
ExTimeStats(
clockid_t clk_id = CLOCK_THREAD_CPUTIME_ID
);
-NA_EIDPROC
~ExTimeStats() {}
-NA_EIDPROC
inline ExTimeStats& operator+(const ExTimeStats &other) {
sumTime_ += other.sumTime_;
return *this;
}
-NA_EIDPROC
inline void incTime(Int64 time)
{
sumTime_ += time;
@@ -369,29 +321,21 @@ NA_EIDPROC
#pragma warn(1103) // warning elimination
// start an active period (record the starting time)
-NA_EIDPROC
void start();
// stop an active period and record the spent time
-NA_EIDPROC
// returns increment Time
Int64 stop();
-NA_EIDPROC
inline void reset();
-NA_EIDPROC
inline Int64 getTime() const { return sumTime_; }
-NA_EIDPROC
UInt32 packedLength();
-NA_EIDPROC
UInt32 pack(char * buffer);
-NA_EIDPROC
void unpack(const char* &buffer);
-NA_EIDPROC
void setVersion(Lng32 ver) { version_ = ver; }
Lng32 filterForSEstats(struct timespec currTimespec);
@@ -463,7 +407,6 @@ struct ExOperStatsId
class ExeSEStats : public ExStatsBase
{
public:
-NA_EIDPROC
ExeSEStats() :
accessedRows_(0),
usedRows_(0),
@@ -501,20 +444,16 @@ NA_EIDPROC
maxIOTime_ = 0;
}
-NA_EIDPROC
UInt32 packedLength();
-NA_EIDPROC
UInt32 pack(char * buffer);
void merge(ExeSEStats * other);
void merge(ExHbaseAccessStats * other);
void merge(ExHdfsScanStats * other);
-NA_EIDPROC
void unpack(const char* &buffer);
-NA_EIDPROC
void copyContents(ExeSEStats * other);
private:
@@ -544,7 +483,6 @@ private:
class ExBufferStats : public ExStatsBase
{
public:
-NA_EIDPROC
ExBufferStats() :
sendBufferSize_(0),
recdBufferSize_(0),
@@ -553,28 +491,20 @@ NA_EIDPROC
statsBytes_(0)
{};
-NA_EIDPROC
ULng32& sendBufferSize() { return sendBufferSize_; }
-NA_EIDPROC
ULng32& recdBufferSize() { return recdBufferSize_; }
-NA_EIDPROC
Int64& totalSentBytes() { return totalSentBytes_;}
-NA_EIDPROC
Int64& totalRecdBytes() { return totalRecdBytes_;}
-NA_EIDPROC
Int64& statsBytes() { return statsBytes_;}
-NA_EIDPROC
ExStatsCounter& sentBuffers() { return sentBuffers_;}
-NA_EIDPROC
ExStatsCounter& recdBuffers() { return recdBuffers_; }
-NA_EIDPROC
void init(NABoolean resetDop)
{
totalSentBytes_ = 0;
@@ -585,23 +515,18 @@ NA_EIDPROC
recdBuffers_.init();
}
-NA_EIDPROC
UInt32 packedLength();
-NA_EIDPROC
UInt32 pack(char * buffer);
//////////////////////////////////////////////////////////////////
// merge two ExBufferStats of the same type. Merging accumulated
// the counters of other into this.
//////////////////////////////////////////////////////////////////
-NA_EIDPROC
void merge(ExBufferStats * other);
-NA_EIDPROC
void unpack(const char* &buffer);
-NA_EIDPROC
void copyContents(ExBufferStats * other);
private:
@@ -668,14 +593,12 @@ public:
// constructor, destructor
// Keep a heap pointer for dynamic allocations.
//////////////////////////////////////////////////////////////////
-NA_EIDPROC
ExOperStats(NAMemory * heap,
StatType statType,
ex_tcb *tcb,
const ComTdb * tdb);
// second constructor is used only when unpacking objects from a message
-NA_EIDPROC
ExOperStats(NAMemory * heap,
StatType statType = EX_OPER_STATS);
@@ -689,161 +612,116 @@ NA_EIDPROC
ComTdb::ex_node_type tdbType,
char *tdbName,
Lng32 tdbNameLen);
-NA_EIDPROC
ExOperStats();
-NA_EIDPROC
~ExOperStats();
//////////////////////////////////////////////////////////////////
// Accessors, mutators
//////////////////////////////////////////////////////////////////
-NA_EIDPROC
+
inline StatType statType() const {return statType_; }
-NA_EIDPROC
+
inline short dop() const {return dop_; }
-NA_EIDPROC
inline short subReqType() { return subReqType_; }
-NA_EIDPROC
inline void setSubReqType(short subReqType)
{ subReqType_ = subReqType; }
-NA_EIDPROC
inline void restoreDop() {
if (statsInTcb())
dop_ = savedDop_;
}
-NA_EIDPROC
inline void incDop() {
dop_++;
if (statsInTcb())
savedDop_++;
}
-NA_EIDPROC
inline Lng32 getExplainNodeId() const {return explainNodeId_;}
-NA_EIDPROC
inline queue_index getDownQueueSize() const {return allStats.downQueueSize_;}
-NA_EIDPROC
inline void setDownQueueSize(queue_index size) {allStats.downQueueSize_ = size; }
-NA_EIDPROC
inline queue_index getUpQueueSize() const {return allStats.upQueueSize_;}
-NA_EIDPROC
inline void setUpQueueSize(queue_index size) {allStats.upQueueSize_ = size; }
-NA_EIDPROC
inline ExStatsCounter& getDownQueueStats() {return allStats.downQueueStats_;}
-NA_EIDPROC
inline ExStatsCounter& getUpQueueStats() {return allStats.upQueueStats_;}
-NA_EIDPROC
inline Lng32 getParentTdbId() const {return (Lng32) parentTdbId_;}
-NA_EIDPROC
inline Lng32 getLeftChildTdbId() const {return (Lng32) leftChildTdbId_;}
-NA_EIDPROC
inline Lng32 getRightChildTdbId() const {return (Lng32) rightChildTdbId_;}
-NA_EIDPROC
inline Lng32 getNTProcessId() const {return (Lng32) allStats.ntProcessId_;}
-NA_EIDPROC
inline void setParentTdbId(Lng32 id) { parentTdbId_ = id; }
-NA_EIDPROC
inline void setLeftChildTdbId(Lng32 id) { leftChildTdbId_ = id; }
-NA_EIDPROC
inline void setRightChildTdbId(Lng32 id) { rightChildTdbId_ = id; }
-NA_EIDPROC
inline void setPertableStatsId(Lng32 id) { pertableStatsId_ = id; }
-NA_EIDPROC
inline Lng32 getPertableStatsId() { return pertableStatsId_; }
-NA_EIDPROC
inline const ExOperStatsId * getId() const { return &id_; }
-NA_EIDPROC
inline Lng32 getFragId() const {return (Lng32) id_.fragId_;}
-NA_EIDPROC
inline Lng32 getTdbId() const {return id_.tdbId_;}
-NA_EIDPROC
inline Lng32 getInstNum() const {return id_.instNum_;}
-NA_EIDPROC
inline Lng32 getSubInstNum() const {return id_.subInstNum_;}
-NA_EIDPROC
inline void setSubInstNum(Lng32 n) {id_.subInstNum_ = n;}
-NA_EIDPROC
inline char * getTdbName() {return tdbName_;}
-NA_EIDPROC
inline ComTdb::ex_node_type getTdbType() const {return tdbType_;}
-NA_EIDPROC
inline ComTdb::CollectStatsType getCollectStatsType() const
{ return (ComTdb::CollectStatsType)collectStatsType_;}
-NA_EIDPROC
inline void setCollectStatsType(ComTdb::CollectStatsType s)
{collectStatsType_ = s;}
-NA_EIDPROC
// warning elimination (removed "inline")
virtual const char * getStatTypeAsString() const {return "EX_OPER_STATS";};
-NA_EIDPROC
inline Int64 getActualRowsReturned() const { return actualRowsReturned_; }
-NA_EIDPROC
inline void setActualRowsReturned(Int64 cnt) { actualRowsReturned_ = cnt; }
-NA_EIDPROC
inline void incActualRowsReturned(Int64 i = 1)
{ actualRowsReturned_ = actualRowsReturned_ + i; }
-NA_EIDPROC
inline Int64 getEstimatedRowsReturned() const { return u.estRowsReturned_; }
-NA_EIDPROC
inline void setEstimatedRowsReturned(Int64 cnt) { u.estRowsReturned_ = cnt; }
-NA_EIDPROC
inline Float32 getEstRowsUsed() const { return u.est.estRowsUsed_; }
-NA_EIDPROC
inline void setEstRowsUsed(Float32 cnt) { u.est.estRowsUsed_ = cnt; }
-NA_EIDPROC
inline Float32 getEstRowsAccessed() const { return u.est.estRowsAccessed_; }
-NA_EIDPROC
inline void setEstRowsAccessed(Float32 cnt) { u.est.estRowsAccessed_ = cnt; }
-NA_EIDPROC
inline Int64 getNumberCalls() const { return numberCalls_; }
-NA_EIDPROC
inline void setNumberCalls(Int64 cnt) { numberCalls_ = cnt; }
-NA_EIDPROC
inline void incNumberCalls() { numberCalls_++; }
@@ -851,14 +729,12 @@ NA_EIDPROC
// reset all counters in the stats. Init affects only counters
// and does NOT reset the tdbName and similar data members.
//////////////////////////////////////////////////////////////////
-NA_EIDPROC
virtual void init(NABoolean resetDop);
//////////////////////////////////////////////////////////////////
// subTaskReturn is used by the scheduler to set the return code
// of a tcb
//////////////////////////////////////////////////////////////////
-NA_EIDPROC
void subTaskReturn(ExWorkProcRetcode rc);
//////////////////////////////////////////////////////////////////
@@ -867,110 +743,82 @@ NA_EIDPROC
// members (strings, arrays, other obejcts) packedLength() has to
// be adjusted accordingly
//////////////////////////////////////////////////////////////////
-NA_EIDPROC
virtual UInt32 packedLength();
//////////////////////////////////////////////////////////////////
// packs 'this' into a message. Converts pointers to offsets.
//////////////////////////////////////////////////////////////////
-NA_EIDPROC
virtual UInt32 pack(char * buffer);
-NA_EIDPROC
virtual void unpack(const char* &buffer);
//////////////////////////////////////////////////////////////////
// merge two ExOperStats of the same type. Merging accumulated
// the counters of other into this.
//////////////////////////////////////////////////////////////////
-NA_EIDPROC
void merge(ExOperStats * other);
//////////////////////////////////////////////////////////////////
// copies the content of other to this. copyContent does NOT
// merge counters.
//////////////////////////////////////////////////////////////////
-NA_EIDPROC
void copyContents(ExOperStats * other);
//////////////////////////////////////////////////////////////////
// allocates a new ExOperStats object on heap and copies this
// to the new object.
//////////////////////////////////////////////////////////////////
-NA_EIDPROC
virtual ExOperStats * copyOper(NAMemory * heap);
/////////////////////////////////////////////////////////////////
// cast to more specific ExStatsEntry classes.
//////////////////////////////////////////////////////////////////
-NA_EIDPROC
virtual ExMeasStats * castToExMeasStats();
-NA_EIDPROC
virtual ExMeasBaseStats * castToExMeasBaseStats();
-NA_EIDPROC
virtual ExFragRootOperStats * castToExFragRootOperStats();
-NA_EIDPROC
virtual ExPartitionAccessStats * castToExPartitionAccessStats();
-NA_EIDPROC
virtual ExProbeCacheStats * castToExProbeCacheStats();
-NA_EIDPROC
virtual ExFastExtractStats * castToExFastExtractStats();
-NA_EIDPROC
virtual ExHdfsScanStats * castToExHdfsScanStats();
-NA_EIDPROC
virtual ExHbaseAccessStats * castToExHbaseAccessStats();
-NA_EIDPROC
virtual ExHashGroupByStats * castToExHashGroupByStats();
-NA_EIDPROC
virtual ExHashJoinStats * castToExHashJoinStats();
-NA_EIDPROC
virtual ExESPStats * castToExESPStats();
-NA_EIDPROC
virtual ExSplitTopStats * castToExSplitTopStats();
-NA_EIDPROC
virtual ExSortStats * castToExSortStats();
-NA_EIDPROC
virtual ExeSEStats * castToExeSEStats()
{
return NULL;
}
-NA_EIDPROC
virtual ExUDRStats * castToExUDRStats();
-NA_EIDPROC
virtual ExMasterStats * castToExMasterStats();
-NA_EIDPROC
virtual ExBMOStats * castToExBMOStats();
-NA_EIDPROC
virtual ExUDRBaseStats * castToExUDRBaseStats();
-NA_EIDPROC
ExTimeStats *getTimer()
{
return &operTimer_;
}
-NA_EIDPROC
inline void incCpuTime(Int64 cpuTime) { };
-NA_EIDPROC
NABoolean operator==(ExOperStats * other);
-NA_EIDPROC
Int64 getHashData(UInt16 statsMergeType = SQLCLI_SAME_STATS);
//////////////////////////////////////////////////////////////////
@@ -979,13 +827,10 @@ NA_EIDPROC
// return 3 characteristics counters for this operator and a short text
// identification what the counter means
-NA_EIDPROC
virtual const char * getNumValTxt(Int32 i) const;
-NA_EIDPROC
virtual Int64 getNumVal(Int32 i) const;
-NA_EIDPROC
virtual const char * getTextVal();
// this method returns the variable part of stats related information.
@@ -994,81 +839,66 @@ NA_EIDPROC
// It returns data in dataBuffer provided by caller and the length
// of data(2 bytes short) in location pointed to by datalen.
// This method is called by ExStatsTcb::work().
-NA_EIDPROC
virtual void getVariableStatsInfo(char * dataBuffer,
char * datalen,
Lng32 maxLen);
virtual Lng32 getStatsItem(SQLSTATS_ITEM* sqlStats_item);
-NA_EIDPROC
void setCpuStatsHistory() { return; }
-NA_EIDPROC
void setVersion(short version)
{version_ = version; }
-NA_EIDPROC
short getVersion() { return version_; }
- NA_EIDPROC
NABoolean statsInDp2()
{
return (flags_ & STATS_IN_DP2) != 0;
}
-NA_EIDPROC
void setStatsInDp2(NABoolean v)
{
(v ? flags_ |= STATS_IN_DP2 : flags_ &= ~STATS_IN_DP2);
}
-NA_EIDPROC
NABoolean statsInEsp()
{
return (flags_ & STATS_IN_ESP) != 0;
}
-NA_EIDPROC
void setStatsInEsp(NABoolean v)
{
(v ? flags_ |= STATS_IN_ESP : flags_ &= ~STATS_IN_ESP);
}
-NA_EIDPROC
NABoolean statsInTcb()
{
return (flags_ & STATS_IN_TCB) != 0;
}
-NA_EIDPROC
void setStatsInTcb(NABoolean v)
{
(v ? flags_ |= STATS_IN_TCB : flags_ &= ~STATS_IN_TCB);
}
-NA_EIDPROC
NABoolean hasSentMsgIUD()
{
return (flags_ & MSG_SENT_IUD) != 0;
}
-NA_EIDPROC
void setHasSentMsgIUD()
{
flags_ |= MSG_SENT_IUD;
}
-NA_EIDPROC
void clearHasSentMsgIUD()
{
flags_ &= ~MSG_SENT_IUD;
}
-NA_EIDPROC
void initTdbForRootOper();
-NA_EIDPROC
void setQueryId(char *queryId, Lng32 queryIdLen) {}
private:
@@ -1145,11 +975,10 @@ private:
};
-
class ExBMOStats : public ExOperStats
{
-friend class ExMeasStats;
-friend class ExFragRootOperStats;
+ friend class ExMeasStats;
+ friend class ExFragRootOperStats;
public:
ExBMOStats(NAMemory *heap);
ExBMOStats(NAMemory *heap, StatType statType);
@@ -1238,17 +1067,14 @@ private:
// class ExFragRootOperStats
/////////////////////////////////////////////////////////////////
class ExFragRootOperStats : public ExOperStats {
-friend class ExMeasStats;
+ friend class ExMeasStats;
public:
-NA_EIDPROC
ExFragRootOperStats(NAMemory * heap,
ex_tcb *tcb,
const ComTdb * tdb);
-NA_EIDPROC
ExFragRootOperStats(NAMemory * heap);
-NA_EIDPROC
ExFragRootOperStats(NAMemory *heap,
ComTdb::CollectStatsType collectStatsType,
ExFragId fragId,
@@ -1260,85 +1086,62 @@ NA_EIDPROC
Lng32 tdbNameLen);
-NA_EIDPROC
~ExFragRootOperStats();
-NA_EIDPROC
void init(NABoolean resetDop);
-NA_EIDPROC
UInt32 packedLength();
//////////////////////////////////////////////////////////////////
// packs 'this' into a message. Converts pointers to offsets.
//////////////////////////////////////////////////////////////////
-NA_EIDPROC
UInt32 pack(char * buffer);
-NA_EIDPROC
void unpack(const char* &buffer);
-NA_EIDPROC
void copyContents(ExFragRootOperStats* other);
-NA_EIDPROC
void merge(ExOperStats * other);
void merge(ExFragRootOperStats* other);
void merge(ExUDRBaseStats * other);
void merge(ExBMOStats * other);
-NA_EIDPROC
ExOperStats * copyOper(NAMemory * heap);
/////////////////////////////////////////////////////////////////
// accessors, mutators
/////////////////////////////////////////////////////////////////
-NA_EIDPROC
inline const SB_Phandle_Type * getPhandle() const
{ return (const SB_Phandle_Type *) &phandle_; }
-NA_EIDPROC
inline SB_Phandle_Type * getPhandlePtr() { return &phandle_; }
- NA_EIDPROC
bool isFragSuspended() const { return isFragSuspended_; }
- NA_EIDPROC
void setFragSuspended(bool s) { isFragSuspended_ = s; }
- NA_EIDPROC
inline Int64 getCpuTime() const { return cpuTime_; }
-NA_EIDPROC
inline Int64 getLocalCpuTime() const { return localCpuTime_; }
-NA_EIDPROC
inline void incCpuTime(Int64 cpuTime)
{
cpuTime_ += cpuTime;
localCpuTime_ += cpuTime;
}
-NA_EIDPROC
inline void setCpuTime(Int64 cpuTime) { cpuTime_ = cpuTime; }
-NA_EIDPROC
inline Int64 getMaxSpaceUsage() const { return spaceUsage_; }
-NA_EIDPROC
inline Int64 getMaxHeapUsage() const { return heapUsage_; }
-NA_EIDPROC
inline Lng32 getStmtIndex() const { return stmtIndex_; }
-NA_EIDPROC
inline void setStmtIndex(Lng32 i) { stmtIndex_ = i; }
-NA_EIDPROC
inline Int64 getTimestamp() const { return timestamp_; }
-NA_EIDPROC
inline void setTimestamp(Int64 t) { timestamp_ = t; }
-NA_EIDPROC
inline void updateSpaceUsage(Space *space, CollHeap *heap)
{
spaceUsage_ = (Int32)(space->getAllocSize() >> 10);
@@ -1348,23 +1151,17 @@ NA_EIDPROC
heapWM_ = (Int32)(heap->getHighWaterMark() >> 10);
}
-NA_EIDPROC
ExFragRootOperStats * castToExFragRootOperStats();
-NA_EIDPROC
virtual const char * getNumValTxt(Int32 i) const;
-NA_EIDPROC
virtual Int64 getNumVal(Int32 i) const;
-NA_EIDPROC
virtual const char * getTextVal();
-NA_EIDPROC
virtual void getVariableStatsInfo(char * dataBuffer,
char * datalen,
Lng32 maxLen);
-NA_EIDPROC
void initHistory();
Int32 getExecutionCount() const { return executionCount_; }
@@ -1492,96 +1289,71 @@ private:
/////////////////////////////////////////////////////////////////
class ExPartitionAccessStats : public ExOperStats {
public:
-NA_EIDPROC
ExPartitionAccessStats(NAMemory * heap,
ex_tcb *tcb,
ComTdb * tdb,
ULng32 bufferSize);
-NA_EIDPROC
ExPartitionAccessStats(NAMemory * heap);
-NA_EIDPROC
~ExPartitionAccessStats();
-NA_EIDPROC
void init(NABoolean resetDop);
-NA_EIDPROC
void copyContents(ExPartitionAccessStats* other);
-NA_EIDPROC
void merge(ExPartitionAccessStats* other);
-NA_EIDPROC
ExOperStats * copyOper(NAMemory * heap);
-NA_EIDPROC
UInt32 packedLength();
//////////////////////////////////////////////////////////////////
// packs 'this' into a message. Converts pointers to offsets.
//////////////////////////////////////////////////////////////////
-NA_EIDPROC
UInt32 pack(char * buffer);
-NA_EIDPROC
void unpack(const char* &buffer);
/////////////////////////////////////////////////////////////////
// accessors, mutators
/////////////////////////////////////////////////////////////////
-NA_EIDPROC
inline char * ansiName() const {return ansiName_;}
-NA_EIDPROC
inline char * fileName() const {return fileName_;}
-NA_EIDPROC
ExBufferStats * bufferStats()
{
return &bufferStats_;
}
-NA_EIDPROC
ExPartitionAccessStats * castToExPartitionAccessStats();
-NA_EIDPROC
virtual const char * getNumValTxt(Int32 i) const;
-NA_EIDPROC
virtual const char * getTextVal();
-NA_EIDPROC
virtual Int64 getNumVal(Int32 i) const;
ExeSEStats * castToExeSEStats()
{
return exeSEStats();
}
-NA_EIDPROC
ExeSEStats * exeSEStats()
{
return &seStats_;
}
-NA_EIDPROC
-inline Int32 getOpens() { return opens_; }
-NA_EIDPROC
-inline void setOpens(Int32 o) { opens_ = o; }
-NA_EIDPROC
-inline void incOpens(Int32 o = 1) { opens_ += o; }
-
-NA_EIDPROC
-inline Int64 getOpenTime() { return openTime_; }
-NA_EIDPROC
-inline void setOpenTime(Int64 t) { openTime_ = t; }
-NA_EIDPROC
-inline void incOpenTime(Int64 t) { openTime_ += t; }
+ inline Int32 getOpens() { return opens_; }
+ inline void setOpens(Int32 o) { opens_ = o; }
+ inline void incOpens(Int32 o = 1) { opens_ += o; }
+
+ inline Int64 getOpenTime() { return openTime_; }
+ inline void setOpenTime(Int64 t) { openTime_ = t; }
+ inline void incOpenTime(Int64 t) { openTime_ += t; }
Lng32 getStatsItem(SQLSTATS_ITEM* sqlStats_item);
-NA_EIDPROC
virtual void getVariableStatsInfo(char * dataBuffer,
char * datalen,
Lng32 maxLen);
@@ -1603,105 +1375,79 @@ private:
/////////////////////////////////////////////////////////////////
class ExProbeCacheStats : public ExOperStats {
public:
-NA_EIDPROC
ExProbeCacheStats(NAMemory * heap,
ex_tcb *tcb,
ComTdb * tdb,
ULng32 bufferSize,
ULng32 numCacheEntries);
-NA_EIDPROC
ExProbeCacheStats(NAMemory * heap);
-NA_EIDPROC
~ExProbeCacheStats(){};
-NA_EIDPROC
void init(NABoolean resetDop);
-NA_EIDPROC
void merge(ExProbeCacheStats* other);
-NA_EIDPROC
void copyContents(ExProbeCacheStats* other);
-NA_EIDPROC
ExOperStats * copyOper(NAMemory * heap);
-NA_EIDPROC
UInt32 packedLength();
//////////////////////////////////////////////////////////////////
// packs 'this' into a message. Converts pointers to offsets.
//////////////////////////////////////////////////////////////////
-NA_EIDPROC
UInt32 pack(char * buffer);
-NA_EIDPROC
void unpack(const char* &buffer);
/////////////////////////////////////////////////////////////////
// accessors, mutators
/////////////////////////////////////////////////////////////////
-NA_EIDPROC
inline void incHit() {++cacheHits_;}
-NA_EIDPROC
inline void incMiss() {++cacheMisses_;}
-NA_EIDPROC
inline void incCanceledHit() {++canceledHits_;}
-NA_EIDPROC
inline void incCanceledMiss() {++canceledMisses_;}
-NA_EIDPROC
inline void incCanceledNotStarted() {++canceledNotStarted_;}
-NA_EIDPROC
inline void updateLongChain(UInt32 clen)
{
if (clen > longestChain_)
longestChain_ = clen;
}
-NA_EIDPROC
inline void updateUseCount(UInt32 uc)
{
if (uc > highestUseCount_)
highestUseCount_ = uc;
}
-NA_EIDPROC
inline void newChain()
{
if (++numChains_ > maxNumChains_)
maxNumChains_ = numChains_;
}
-NA_EIDPROC
inline void freeChain()
{
--numChains_;
}
-NA_EIDPROC
ULng32 longestChain() const {return longestChain_;}
-NA_EIDPROC
ULng32 highestUseCount() const {return highestUseCount_;}
-NA_EIDPROC
ULng32 maxNumChains() const {return maxNumChains_;}
-NA_EIDPROC
ExProbeCacheStats * castToExProbeCacheStats();
-NA_EIDPROC
virtual const char * getNumValTxt(Int32 i) const;
-NA_EIDPROC
virtual Int64 getNumVal(Int32 i) const;
-NA_EIDPROC
virtual void getVariableStatsInfo(char * dataBuffer,
char * datalen,
Lng32 maxLen);
@@ -1725,78 +1471,57 @@ private:
//////////////////////////////////////////////////////////////////
class ExHashGroupByStats : public ExBMOStats {
public:
-NA_EIDPROC
ExHashGroupByStats(NAMemory * heap,
ex_tcb *tcb,
const ComTdb * tdb);
-NA_EIDPROC
ExHashGroupByStats(NAMemory * heap);
-NA_EIDPROC
~ExHashGroupByStats(){};
-NA_EIDPROC
void init(NABoolean resetDop);
-NA_EIDPROC
void copyContents(ExHashGroupByStats* other);
-NA_EIDPROC
void merge(ExHashGroupByStats* other);
-NA_EIDPROC
UInt32 packedLength();
//////////////////////////////////////////////////////////////////
// packs 'this' into a message. Converts pointers to offsets.
//////////////////////////////////////////////////////////////////
-NA_EIDPROC
UInt32 pack(char * buffer);
-NA_EIDPROC
void unpack(const char* &buffer);
-NA_EIDPROC
ExOperStats * copyOper(NAMemory * heap);
-NA_EIDPROC
ExHashGroupByStats * castToExHashGroupByStats();
-NA_EIDPROC
ExBMOStats * castToExBMOStats();
-NA_EIDPROC
void incPartialGroupsReturned() { partialGroups_++; };
-NA_EIDPROC
virtual const char * getNumValTxt(Int32 i) const;
-NA_EIDPROC
virtual Int64 getNumVal(Int32 i) const;
-NA_EIDPROC
virtual void getVariableStatsInfo(char * dataBuffer,
char * datalen,
Lng32 maxLen);
// just add the pointer as last element to cluster stats list
-NA_EIDPROC
void addClusterStats(ExClusterStats* clusterStats);
// make a copy of the clusterstats and add them to the list
-NA_EIDPROC
void addClusterStats(ExClusterStats clusterStats);
// delete all the clusterstats
-NA_EIDPROC
void deleteClusterStats();
-NA_EIDPROC
inline void updMemorySize(Int64 memSize)
{ if (memSize_ < memSize) memSize_ = memSize; }
-NA_EIDPROC
inline void updIoSize(Int64 newSize)
{ ioSize_ = newSize ; }
@@ -1815,86 +1540,63 @@ private:
//////////////////////////////////////////////////////////////////
class ExHashJoinStats : public ExBMOStats {
public:
-NA_EIDPROC
ExHashJoinStats(NAMemory * heap,
ex_tcb *tcb,
const ComTdb * tdb);
-NA_EIDPROC
ExHashJoinStats(NAMemory * heap);
-NA_EIDPROC
~ExHashJoinStats(){};
-NA_EIDPROC
void init(NABoolean resetDop);
-NA_EIDPROC
void copyContents(ExHashJoinStats* other);
-NA_EIDPROC
void merge(ExHashJoinStats* other);
-NA_EIDPROC
UInt32 packedLength();
//////////////////////////////////////////////////////////////////
// packs 'this' into a message. Converts pointers to offsets.
//////////////////////////////////////////////////////////////////
-NA_EIDPROC
UInt32 pack(char * buffer);
-NA_EIDPROC
void unpack(const char* &buffer);
-NA_EIDPROC
ExOperStats * copyOper(NAMemory * heap);
-NA_EIDPROC
ExHashJoinStats * castToExHashJoinStats();
-NA_EIDPROC
ExBMOStats * castToExBMOStats();
-NA_EIDPROC
virtual const char * getNumValTxt(Int32 i) const;
-NA_EIDPROC
virtual Int64 getNumVal(Int32 i) const;
-NA_EIDPROC
virtual void getVariableStatsInfo(char * dataBuffer,
char * datalen,
Lng32 maxLen);
// just add the pointer as last element to cluster stats list
-NA_EIDPROC
void addClusterStats(ExClusterStats* clusterStats);
// make a copy of the clusterstats and add them to the list
-NA_EIDPROC
void addClusterStats(ExClusterStats clusterStats);
// delete all the clusterstats
-NA_EIDPROC
void deleteClusterStats();
// set the phase of the HJ so that we charge the right time statistics
// note that we only can increae the phase number (makes sense, right?).
-NA_EIDPROC
inline void incPhase() { phase_++; };
-NA_EIDPROC
inline void incEmptyChains(ULng32 i = 1) { emptyChains_ += i; };
-NA_EIDPROC
inline ULng32 getEmptyChains() const { return emptyChains_; };
-NA_EIDPROC
inline void updMemorySize(Int64 memSize)
{ if (memSize_ < memSize) memSize_ = memSize; }
-NA_EIDPROC
inline void updIoSize(Int64 newSize)
{ ioSize_ = newSize ; }
@@ -1920,7 +1622,6 @@ private:
//////////////////////////////////////////////////////////////////
class ExESPStats : public ExOperStats {
public:
-NA_EIDPROC
ExESPStats(NAMemory * heap,
ULng32 sendBufferSize,
ULng32 recBufferSize,
@@ -1928,58 +1629,42 @@ NA_EIDPROC
ex_tcb *tcb,
const ComTdb * tdb);
-NA_EIDPROC
ExESPStats(NAMemory * heap);
-NA_EIDPROC
~ExESPStats(){};
-NA_EIDPROC
void init(NABoolean resetDop);
-NA_EIDPROC
void copyContents(ExESPStats* other);
-NA_EIDPROC
void merge(ExESPStats* other);
-NA_EIDPROC
UInt32 packedLength();
//////////////////////////////////////////////////////////////////
// packs 'this' into a message. Converts pointers to offsets.
//////////////////////////////////////////////////////////////////
-NA_EIDPROC
UInt32 pack(char * buffer);
-NA_EIDPROC
void unpack(const char* &buffer);
-NA_EIDPROC
ExOperStats * copyOper(NAMemory * heap);
-NA_EIDPROC
inline Int64 getSendTopStatID() const { return sendTopStatID_; }
-NA_EIDPROC
inline void setSendTopStatID(Int64 id) { sendTopStatID_ = id; }
-NA_EIDPROC
ExBufferStats * bufferStats()
{
return &bufferStats_;
}
-NA_EIDPROC
ExESPStats * castToExESPStats();
-NA_EIDPROC
virtual const char * getNumValTxt(Int32 i) const;
-NA_EIDPROC
virtual Int64 getNumVal(Int32 i) const;
-NA_EIDPROC
virtual void getVariableStatsInfo(char * dataBuffer,
char * datalen,
Lng32 maxLen);
@@ -1998,57 +1683,41 @@ private:
//////////////////////////////////////////////////////////////////
class ExSplitTopStats : public ExOperStats {
public:
-NA_EIDPROC
ExSplitTopStats(NAMemory * heap,
ex_tcb *tcb,
const ComTdb * tdb);
-NA_EIDPROC
ExSplitTopStats(NAMemory * heap);
-NA_EIDPROC
~ExSplitTopStats(){};
-NA_EIDPROC
void init(NABoolean resetDop);
-NA_EIDPROC
void merge(ExSplitTopStats* other);
-NA_EIDPROC
UInt32 packedLength();
//////////////////////////////////////////////////////////////////
// packs 'this' into a message. Converts pointers to offsets.
//////////////////////////////////////////////////////////////////
-NA_EIDPROC
UInt32 pack(char * buffer);
-NA_EIDPROC
void unpack(const char* &buffer);
-NA_EIDPROC
ExOperStats * copyOper(NAMemory * heap);
-NA_EIDPROC
void copyContents(ExSplitTopStats* other);
-NA_EIDPROC
inline ULng32 getMaxChildren() const { return maxChildren_; }
-NA_EIDPROC
inline ULng32 getActChildren() const { return actChildren_; }
-NA_EIDPROC
ExSplitTopStats * castToExSplitTopStats();
-NA_EIDPROC
virtual const char * getNumValTxt(Int32 i) const;
-NA_EIDPROC
virtual Int64 getNumVal(Int32 i) const;
-NA_EIDPROC
virtual void getVariableStatsInfo(char * dataBuffer,
char * datalen,
Lng32 maxLen);
@@ -2079,54 +1748,39 @@ private:
//////////////////////////////////////////////////////////////////
class ExSortStats : public ExBMOStats {
public:
- NA_EIDPROC
ExSortStats(NAMemory * heap,
ex_tcb *tcb,
const ComTdb * tdb);
-NA_EIDPROC
ExSortStats(NAMemory * heap);
-NA_EIDPROC
~ExSortStats(){};
-NA_EIDPROC
void init(NABoolean resetDop);
-NA_EIDPROC
void copyContents(ExSortStats* other);
-NA_EIDPROC
void merge(ExSortStats* other);
-NA_EIDPROC
UInt32 packedLength();
//////////////////////////////////////////////////////////////////
// packs 'this' into a message. Converts pointers to offsets.
//////////////////////////////////////////////////////////////////
-NA_EIDPROC
UInt32 pack(char * buffer);
-NA_EIDPROC
void unpack(const char* &buffer);
-NA_EIDPROC
ExOperStats * copyOper(NAMemory * heap);
-NA_EIDPROC
ExSortStats * castToExSortStats();
-NA_EIDPROC
ExBMOStats * castToExBMOStats();
-NA_EIDPROC
virtual const char * getNumValTxt(Int32 i) const;
-NA_EIDPROC
virtual Int64 getNumVal(Int32 i) const;
-NA_EIDPROC
virtual void getVariableStatsInfo(char * dataBuffer,
char * datalen,
Lng32 maxLen);
@@ -2162,39 +1816,29 @@ private:
class ExHdfsScanStats : public ExOperStats {
public:
-NA_EIDPROC
ExHdfsScanStats(NAMemory * heap,
ex_tcb *tcb,
ComTdb * tdb); // tbd - other, specific params?
-NA_EIDPROC
ExHdfsScanStats(NAMemory * heap);
-NA_EIDPROC
~ExHdfsScanStats();
-NA_EIDPROC
void init(NABoolean resetDop);
-NA_EIDPROC
void merge(ExHdfsScanStats* other);
-NA_EIDPROC
void copyContents(ExHdfsScanStats* other);
-NA_EIDPROC
ExOperStats * copyOper(NAMemory * heap);
-NA_EIDPROC
UInt32 packedLength();
//////////////////////////////////////////////////////////////////
//// packs 'this' into a message. Converts pointers to offsets.
////////////////////////////////////////////////////////////////////
-NA_EIDPROC
UInt32 pack(char * buffer);
-NA_EIDPROC
void unpack(const char* &buffer);
/////////////////////////////////////////////////////////////////
@@ -2202,40 +1846,29 @@ NA_EIDPROC
///////////////////////////////////////////////////////////////////
char * tableName() const {return tableName_;}
-NA_EIDPROC
ExTimeStats &getHdfsTimer() { return timer_; }
-NA_EIDPROC
inline void incBytesRead(Int64 bytesRead) {numBytesRead_ += bytesRead;}
-NA_EIDPROC
inline void incAccessedRows() {++accessedRows_;}
-NA_EIDPROC
inline void incUsedRows() {++usedRows_;}
inline void incMaxHdfsIOTime(Int64 v) {maxHdfsIOTime_ += v;}
-NA_EIDPROC
Int64 numBytesRead() const {return numBytesRead_;}
-NA_EIDPROC
Int64 rowsAccessed() const {return accessedRows_;}
-NA_EIDPROC
Int64 rowsUsed() const {return usedRows_;}
NABoolean filterForSEstats(struct timespec currTimespec, Lng32 filter);
Int64 maxHdfsIOTime() const {return maxHdfsIOTime_;}
-NA_EIDPROC
ExHdfsScanStats * castToExHdfsScanStats();
-NA_EIDPROC
virtual const char * getNumValTxt(Int32 i) const;
-NA_EIDPROC
virtual Int64 getNumVal(Int32 i) const;
-NA_EIDPROC
virtual void getVariableStatsInfo(char * dataBuffer,
char * datalen,
Lng32 maxLen);
@@ -2274,39 +1907,29 @@ private:
class ExHbaseAccessStats : public ExOperStats {
public:
- NA_EIDPROC
ExHbaseAccessStats(NAMemory * heap,
ex_tcb *tcb,
ComTdb * tdb); // tbd - other, specific params?
- NA_EIDPROC
ExHbaseAccessStats(NAMemory * heap);
- NA_EIDPROC
~ExHbaseAccessStats();
- NA_EIDPROC
void init(NABoolean resetDop);
- NA_EIDPROC
void merge(ExHbaseAccessStats* other);
- NA_EIDPROC
void copyContents(ExHbaseAccessStats* other);
- NA_EIDPROC
ExOperStats * copyOper(NAMemory * heap);
- NA_EIDPROC
UInt32 packedLength();
//////////////////////////////////////////////////////////////////
//// packs 'this' into a message. Converts pointers to offsets.
////////////////////////////////////////////////////////////////////
- NA_EIDPROC
UInt32 pack(char * buffer);
- NA_EIDPROC
void unpack(const char* &buffer);
/////////////////////////////////////////////////////////////////
@@ -2314,12 +1937,9 @@ class ExHbaseAccessStats : public ExOperStats {
///////////////////////////////////////////////////////////////////
char * tableName() const {return tableName_;}
- NA_EIDPROC
ExTimeStats &getHbaseTimer() { return timer_; }
- NA_EIDPROC
inline void incBytesRead(Int64 bytesRead) {numBytesRead_ += bytesRead;}
- NA_EIDPROC
inline void incAccessedRows() {++accessedRows_;}
inline void incAccessedRows(Int64 v) {accessedRows_ += v;}
@@ -2330,10 +1950,8 @@ class ExHbaseAccessStats : public ExOperStats {
inline void incMaxHbaseIOTime(Int64 v) {maxHbaseIOTime_ += v;}
- NA_EIDPROC
Int64 numBytesRead() const {return numBytesRead_;}
- NA_EIDPROC
Int64 rowsAccessed() const {return accessedRows_;}
Int64 rowsUsed() const {return usedRows_;}
@@ -2344,16 +1962,12 @@ class ExHbaseAccessStats : public ExOperStats {
NABoolean filterForSEstats(struct timespec currTimespec, Lng32 filter);
- NA_EIDPROC
ExHbaseAccessStats * castToExHbaseAccessStats();
- NA_EIDPROC
virtual const char * getNumValTxt(Int32 i) const;
- NA_EIDPROC
virtual Int64 getNumVal(Int32 i) const;
- NA_EIDPROC
virtual void getVariableStatsInfo(char * dataBuffer,
char * datalen,
Lng32 maxLen);
@@ -2385,254 +1999,62 @@ class ExHbaseAccessStats : public ExOperStats {
Lng32 blockTime_;
};
-
-class MeasureInDp2
-{
-public:
- MeasureInDp2()
- {
- accessedDp2Rows_ = 0;
- usedDp2Rows_ = 0;
- diskReads_ = 0;
- flags_ = 0;
- lockWaits_ = 0;
- processBusyTime_ = 0;
- };
-
- Int64 getAccessedDp2Rows()
- {
- return accessedDp2Rows_;
- }
- Int64 getUsedDp2Rows()
- {
- return usedDp2Rows_;
- }
- Int32 getDiskReads()
- {
- return diskReads_;
- }
- Int32 getEscalations()
- {
- if (flags_ & ESCALATION_)
- return 1;
- else
- return 0;
- }
- UInt32 getLockWaits ()
- {
- return lockWaits_;
- }
- Int64 getProcessBusyTime()
- {
- return processBusyTime_;
- }
- void setAccessedDp2Rows(Int64 adr)
- {
- accessedDp2Rows_ = (UInt32)adr;
- }
- void setUsedDp2Rows(Int64 udr)
- {
- usedDp2Rows_ = (UInt32)udr;
- }
- void setDiskReads(UInt32 dr)
- {
- diskReads_ = (UInt16)dr;
- }
- void setEscalations(Int32 e)
- {
- if (e)
- flags_ |= ESCALATION_;
- else
- flags_ &= ~ESCALATION_;
- }
-
- void setLockWaits(UInt32 l)
- {
- lockWaits_ = l;
- }
- void setProcessBusyTime(Int64 p)
- {
- processBusyTime_ = p;
- }
-
- void unpackBuffer(const char* &buffer, Lng32 version);
-
-private:
- enum Flags
- {
- ESCALATION_ = 0x0001
- };
-
- UInt32 accessedDp2Rows_;
- UInt32 usedDp2Rows_;
- UInt16 diskReads_;
- UInt16 flags_;
- UInt32 lockWaits_;
- Int64 processBusyTime_;
-};
-
-
-class MeasureOltInDp2
-{
-public:
- MeasureOltInDp2()
- {
- accessedDp2Rows_ = 0;
- usedDp2Rows_ = 0;
- diskReads_ = 0;
- flags_ = 0;
- lockWaits_ = 0;
- processBusyTime_ = 0;
- };
-
- Int64 getAccessedDp2Rows()
- {
- return accessedDp2Rows_;
- }
- Int64 getUsedDp2Rows()
- {
- return usedDp2Rows_;
- }
- Int32 getDiskReads()
- {
- return diskReads_;
- }
- Int32 getEscalations()
- {
- if (flags_ & ESCALATION_)
- return 1;
- else
- return 0;
- }
- UInt32 getLockWaits ()
- {
- return lockWaits_;
- }
- Int64 getProcessBusyTime()
- {
- return processBusyTime_;
- }
- void setAccessedDp2Rows(Int64 adr)
- {
- accessedDp2Rows_ = (unsigned char)adr;
- }
- void setUsedDp2Rows(Int64 udr)
- {
- usedDp2Rows_ = (unsigned char)udr;
- }
- void setDiskReads(Int32 dr)
- {
- diskReads_ = (unsigned char)dr;
- }
- void setEscalations(Int32 e)
- {
- if (e)
- flags_ |= ESCALATION_;
- else
- flags_ &= ~ESCALATION_;
- }
- void setLockWaits(Int32 l)
- {
- lockWaits_ = l;
- }
- void setProcessBusyTime(Int64 p)
- {
- processBusyTime_ = p;
- }
- void unpackBuffer(const char* &buffer, Lng32 version);
-private:
- enum Flags
- {
- ESCALATION_ = 0x01
- };
-
- unsigned char accessedDp2Rows_;
- unsigned char usedDp2Rows_;
- unsigned char diskReads_;
- unsigned char flags_;
- ULng32 lockWaits_;
- Int64 processBusyTime_;
-};
-
-
/////////////////////////////////////////////////////////////////
// class ExMeasBaseStats
/////////////////////////////////////////////////////////////////
class ExMeasBaseStats : public ExOperStats {
public:
-NA_EIDPROC
ExMeasBaseStats(NAMemory * heap,
StatType statType,
ex_tcb * tcb,
const ComTdb * tdb);
-NA_EIDPROC
ExMeasBaseStats(NAMemory * heap, StatType statType);
-NA_EIDPROC
~ExMeasBaseStats(){};
-NA_EIDPROC
virtual void init(NABoolean resetDop);
-NA_EIDPROC
virtual UInt32 packedLength();
//////////////////////////////////////////////////////////////////
// packs 'this' into a message. Converts pointers to offsets.
//////////////////////////////////////////////////////////////////
-NA_EIDPROC
virtual UInt32 pack(char * buffer);
-NA_EIDPROC
virtual void unpack(const char* &buffer);
-NA_EIDPROC
void merge(ExMeasBaseStats* other);
-NA_EIDPROC
void copyContents(ExMeasBaseStats* other);
-NA_EIDPROC
virtual ExeSEStats * castToExeSEStats()
{
return exeSEStats();
}
-NA_EIDPROC
ExeSEStats * exeSEStats()
{
return &seStats_;
}
-NA_EIDPROC
virtual void getVariableStatsInfo(char * dataBuffer, char * datalen,
Lng32 maxLen);
-NA_EIDPROC
virtual const char * getNumValTxt(Int32 i) const;
-NA_EIDPROC
virtual Int64 getNumVal(Int32 i) const;
-NA_EIDPROC
void setVersion(Lng32 version);
/*
-NA_EIDPROC
inline Int32 getOpens() { return opens_; }
-NA_EIDPROC
inline void setOpens(Int32 o) { opens_ = o; }
-NA_EIDPROC
inline void incOpens(Int32 o = 1) { opens_ = opens_ + o; }
-NA_EIDPROC
inline Int64 getOpenTime() { return openTime_; }
-NA_EIDPROC
inline void setOpenTime(Int64 t) { openTime_ = t; }
-NA_EIDPROC
inline void incOpenTime(Int64 t) { openTime_ = openTime_ + t; }
*/
-NA_EIDPROC
ExMeasBaseStats * castToExMeasBaseStats();
protected:
@@ -2653,24 +2075,18 @@ protected:
/////////////////////////////////////////////////////////////////
class ExMeasStats : public ExMeasBaseStats {
public:
-NA_EIDPROC
ExMeasStats(NAMemory * heap,
ex_tcb * tcb,
const ComTdb * tdb);
-NA_EIDPROC
ExMeasStats(NAMemory * heap);
-NA_EIDPROC
~ExMeasStats();
-NA_EIDPROC
ExMeasStats * castToExMeasStats();
-NA_EIDPROC
void init(NABoolean resetDop);
-NA_EIDPROC
UInt32 packedLength();
@@ -2678,13 +2094,10 @@ NA_EIDPROC
//////////////////////////////////////////////////////////////////
// packs 'this' into a message. Converts pointers to offsets.
//////////////////////////////////////////////////////////////////
-NA_EIDPROC
UInt32 pack(char * buffer);
-NA_EIDPROC
void unpack(const char* &buffer);
-NA_EIDPROC
void merge(ExOperStats * other);
void merge(ExMeasStats* other);
void merge(ExFragRootOperStats* other);
@@ -2693,79 +2106,52 @@ NA_EIDPROC
void merge(ExHdfsScanStats * other);
void merge(ExHbaseAccessStats * other);
-NA_EIDPROC
ExOperStats * copyOper(NAMemory * heap);
-NA_EIDPROC
void copyContents(ExMeasStats *other);
-NA_EIDPROC
virtual void getVariableStatsInfo(char * dataBuffer, char * datalen,
Lng32 maxLen);
-NA_EIDPROC
void updateSpaceUsage(Space *space,
CollHeap *heap);
-NA_EIDPROC
inline Int32 getNewprocess() { return newprocess_; }
-NA_EIDPROC
inline void setNewprocess(Int32 n) { newprocess_ = n; }
-NA_EIDPROC
inline void incNewprocess(Int32 n = 1) { newprocess_ = newprocess_ + n; }
-NA_EIDPROC
inline Int64 getNewprocessTime() { return newprocessTime_; }
-NA_EIDPROC
inline void setNewprocessTime(Int64 t) { newprocessTime_ = t; }
-NA_EIDPROC
inline void incNewprocessTime(Int64 t) { newprocessTime_ = newprocessTime_ + t; }
-NA_EIDPROC
inline Int32 getTimeouts() { return timeouts_; }
-NA_EIDPROC
inline void setTimeouts(Int32 t) { timeouts_ = t; }
-NA_EIDPROC
virtual const char * getNumValTxt(Int32 i) const;
-NA_EIDPROC
inline Int32 getNumSorts() { return numSorts_; }
-NA_EIDPROC
inline void setNumSorts(Int32 n) { numSorts_ = n; }
-NA_EIDPROC
inline void incNumSorts(Int32 n = 1) { numSorts_ = numSorts_ + n; }
-NA_EIDPROC
inline Int64 getSortElapsedTime() { return sortElapsedTime_; }
-NA_EIDPROC
inline void setSortElapsedTime(Int64 t) { sortElapsedTime_ = t; }
-NA_EIDPROC
inline void incSortElapsedTime(Int64 t) { sortElapsedTime_ = sortElapsedTime_ + t; }
-NA_EIDPROC
virtual Int64 getNumVal(Int32 i) const;
-NA_EIDPROC
void initHistory();
-NA_EIDPROC
bool isFragSuspended() const { return isFragSuspended_; }
-NA_EIDPROC
void setFragSuspended(bool s) { isFragSuspended_ = s; }
-NA_EIDPROC
inline Int64 getCpuTime() const { return cpuTime_; }
- NA_EIDPROC
inline Int64 getLocalCpuTime() const { return localCpuTime_; }
-NA_EIDPROC
inline void incCpuTime(Int64 cpuTime)
{
cpuTime_ += cpuTime;
localCpuTime_ += cpuTime;
}
-NA_EIDPROC
inline void setCpuTime(Int64 cpuTime) { cpuTime_ = cpuTime; }
Lng32 getStatsItem(SQLSTATS_ITEM* sqlStats_item);
@@ -2790,12 +2176,8 @@ NA_EIDPROC
}
Int32 getExecutionCount() const { return executionCount_; }
-#if (defined(NA_LINUX) && defined (SQ_NEW_PHANDLE))
inline const SB_Phandle_Type * getPhandle() const
{ return (const SB_Phandle_Type *)&phandle_; }
-#else
- inline const short * getPhandle() const { return phandle_; }
-#endif
private:
@@ -2828,12 +2210,7 @@ private:
Int32 executionCount_;
// Used by logic on runtimestats/CancelBroker.cpp (cancel escalation).
// Local copy, do not merge.
-#if (defined(NA_LINUX) && defined (SQ_NEW_PHANDLE))
SB_Phandle_Type phandle_;
-#else
- // on NSK systems, this is called a PHANDLE
- short phandle_[10];
-#endif // NA_LINUX
// Set to true and reset to false by the MXSSCP process under the
// stats global semaphore. Read by master and ESP EXE without the
// semaphore.
@@ -2853,7 +2230,6 @@ private:
Int64 scratchIOMaxTime_;
};
-
class ExUDRBaseStats : public ExOperStats
{
friend class ExMeasStats;
@@ -2913,81 +2289,59 @@ private:
class ExUDRStats : public ExUDRBaseStats {
public:
-NA_EIDPROC
ExUDRStats(NAMemory * heap,
ULng32 sendBufferSize,
ULng32 recBufferSize,
const ComTdb * tdb,
ex_tcb * tcb);
-NA_EIDPROC
ExUDRStats(NAMemory * heap);
-NA_EIDPROC
~ExUDRStats();
-NA_EIDPROC
void init(NABoolean resetDop);
-NA_EIDPROC
void copyContents(ExUDRStats* other);
-NA_EIDPROC
void merge(ExUDRStats* other);
-NA_EIDPROC
ExOperStats * copyOper(NAMemory * heap);
-NA_EIDPROC
UInt32 packedLength();
//////////////////////////////////////////////////////////////////
// packs 'this' into a message. Converts pointers to offsets.
//////////////////////////////////////////////////////////////////
-NA_EIDPROC
UInt32 pack(char *buffer);
-NA_EIDPROC
void unpack(const char * &buffer);
/////////////////////////////////////////////////////////////////
// accessors, mutators
/////////////////////////////////////////////////////////////////
-NA_EIDPROC
ExBufferStats * bufferStats() { return &bufferStats_; }
-NA_EIDPROC
inline ExStatsCounter& getSentControlBuffers() { return sentControlBuffers_; }
-NA_EIDPROC
inline ExStatsCounter& getSentContinueBuffers() { return sentContinueBuffers_; }
-NA_EIDPROC
inline void setUDRServerInit(Int64 i = 0) { UDRServerInit_ = i; }
-NA_EIDPROC
inline void setUDRServerStart(Int64 s = 0) { UDRServerStart_ = s; }
-NA_EIDPROC
inline const char * getUDRName() const { return UDRName_; }
-NA_EIDPROC
void setUDRName(const char * udrName, Lng32 maxlen);
-NA_EIDPROC
ExUDRStats * castToExUDRStats();
-NA_EIDPROC
virtual const char * getNumValTxt(Int32 i) const;
-NA_EIDPROC
virtual Int64 getNumVal(Int32 i) const;
-NA_EIDPROC
virtual const char * getTextVal();
-NA_EIDPROC
virtual void getVariableStatsInfo(char * dataBuffer, char * datalen, Lng32 maxLen);
private:
@@ -3011,45 +2365,32 @@ private:
class ExStatisticsArea : public IpcMessageObj {
public:
-NA_EIDPROC
ExStatisticsArea(NAMemory * heap = NULL, Lng32 sendBottomNum = 0,
ComTdb::CollectStatsType cst = ComTdb::ALL_STATS,
ComTdb::CollectStatsType origCst = ComTdb::NO_STATS);
-NA_EIDPROC
~ExStatisticsArea();
-NA_EIDPROC
void removeEntries();
//////////////////////////////////////////////////////////////////
// Accessors, mutators
//////////////////////////////////////////////////////////////////
-NA_EIDPROC
inline void setHeap(NAMemory * heap) { heap_ = heap; }
-NA_EIDPROC
void initEntries();
-NA_EIDPROC
void restoreDop();
-NA_EIDPROC
Lng32 numEntries();
-NA_EIDPROC
+
inline NAMemory *getHeap() { return heap_; }
-NA_EIDPROC
inline NABoolean sendStats() {
sendBottomCnt_++;
return (sendBottomCnt_ == sendBottomNum_);
}
-NA_EIDPROC
-ExMeasStmtCntrs * getStmtCntrs () { return stmtCntrs_; }
-NA_EIDPROC
-void setStmtCntrs (ExMeasStmtCntrs * cntrs) { stmtCntrs_ = cntrs; }
-NA_EIDPROC
void allocDynamicStmtCntrs(const char* stmtName);
//////////////////////////////////////////////////////////////////
@@ -3057,108 +2398,86 @@ void allocDynamicStmtCntrs(const char* stmtName);
// entry in the entries_. Searches for matching statID.
// Returns TRUE, if matching entry found. FALSE, if not found.
//////////////////////////////////////////////////////////////////
-NA_EIDPROC
NABoolean merge(ExOperStats * stats, UInt16 statsMergeType = SQLCLIDEV_SAME_STATS);
//////////////////////////////////////////////////////////////////
// merges all entries of statArea. If entries in statArea
// are not present in 'this', appends the new entries.
//////////////////////////////////////////////////////////////////
-NA_EIDPROC
NABoolean merge(ExStatisticsArea * otherStatArea, UInt16 statsMergeType = SQLCLIDEV_SAME_STATS);
//////////////////////////////////////////////////////////////////
// inserts a new entry, stats, to 'this'
//////////////////////////////////////////////////////////////////
-NA_EIDPROC
NABoolean insert(ExOperStats * stats);
//////////////////////////////////////////////////////////////////
// positions to the head of ExOperStats list
//////////////////////////////////////////////////////////////////
-NA_EIDPROC
void position();
//////////////////////////////////////////////////////////////////
// positions to the entry with the hash data passed in.
//////////////////////////////////////////////////////////////////
-NA_EIDPROC
void position(char * hashData, Lng32 hashDatalen);
//////////////////////////////////////////////////////////////////
// get the next entry
//////////////////////////////////////////////////////////////////
-NA_EIDPROC
ExOperStats * getNext();
-NA_EIDPROC
ExOperStats * get(const ExOperStatsId & id);
// gets the next 'type' of stat entry with 'operType'
-NA_EIDPROC
ExOperStats * get(ExOperStats::StatType type,
ComTdb::ex_node_type tdbType);
// gets the next 'type' of stat entry with 'tdbId'
-NA_EIDPROC
ExOperStats * get(ExOperStats::StatType type,
Lng32 tdbId);
// gets the next stat entry with 'tdbId'
-NA_EIDPROC
ExOperStats * get(Lng32 tdbId);
-NA_EIDPROC
IpcMessageObjSize packedLength();
//////////////////////////////////////////////////////////////////
// packs 'this' into a message. Converts pointers to offsets.
//////////////////////////////////////////////////////////////////
-NA_EIDPROC
IpcMessageObjSize packObjIntoMessage(IpcMessageBufferPtr buffer);
-NA_EIDPROC
IpcMessageObjSize packSmallObjIntoMessage(IpcMessageBufferPtr buffer);
-NA_EIDPROC
void unpackObj(IpcMessageObjType objType,
IpcMessageObjVersion objVersion,
NABoolean sameEndianness,
IpcMessageObjSize objSize,
IpcConstMessageBufferPtr buffer);
-NA_EIDPROC
void unpackObjFromEid(IpcConstMessageBufferPtr buffer,
ExOperStats *parentStatsEntry = NULL,
Lng32 parentTdb = -1);
-NA_EIDPROC
void unpackSmallObjFromEid(IpcConstMessageBufferPtr buffer,
Lng32 version = _STATS_PRE_RTS_VERSION);
-NA_EIDPROC
Int64 getExplainPlanId() const { return explainPlanId_; }
-NA_EIDPROC
void setExplainPlanId(Int64 pid) { explainPlanId_ = pid; }
-NA_EIDPROC
ComTdb::CollectStatsType getCollectStatsType() { return (ComTdb::CollectStatsType)collectStatsType_; };
-NA_EIDPROC
void setCollectStatsType(ComTdb::CollectStatsType s)
{ collectStatsType_ = s; };
-NA_EIDPROC
ComTdb::CollectStatsType getOrigCollectStatsType()
{ return (ComTdb::CollectStatsType)origCollectStatsType_; };
//////////////////////////////////////////////////////////////////
// scan all ExOperStats entries and update stmtCntrs.
//////////////////////////////////////////////////////////////////
-NA_EIDPROC
Int32 updateStmtCntrs(ExMeasStmtCntrs * stmtCntrs,
Int32 statementCount,
@@ -3169,79 +2488,56 @@ Int32 updateStmtCntrs(ExMeasStmtCntrs * stmtCntrs,
//////////////////////////////////////////////////////////////////
// get Opens counter from ExMeasStats entry.
//////////////////////////////////////////////////////////////////
-NA_EIDPROC
Int32 getMeasOpensCntr();
-NA_EIDPROC
Int64 getMeasOpenTimeCntr();
//////////////////////////////////////////////////////////////////
// get Newprocess counter from ExMeasStats entry.
//////////////////////////////////////////////////////////////////
-NA_EIDPROC
Int32 getMeasNewprocessCntr();
-NA_EIDPROC
Int64 getMeasNewprocessTimeCntr();
-NA_EIDPROC
NABoolean statsInDp2() { return (detailedFlags_.smallFlags_ & STATS_IN_DP2) != 0; }
-NA_EIDPROC
void setStatsInDp2(NABoolean v)
{ (v ? detailedFlags_.smallFlags_ |= STATS_IN_DP2 : detailedFlags_.smallFlags_ &= ~STATS_IN_DP2); }
-NA_EIDPROC
NABoolean statsInEsp() { return (detailedFlags_.smallFlags_ & STATS_IN_ESP) != 0; }
-NA_EIDPROC
void setStatsInEsp(NABoolean v)
{ (v ? detailedFlags_.smallFlags_ |= STATS_IN_ESP : detailedFlags_.smallFlags_ &= ~STATS_IN_ESP); }
-NA_EIDPROC
NABoolean smallStatsObj() { return (detailedFlags_.smallFlags_ & SMALL_STATS_OBJ) != 0; }
-NA_EIDPROC
void setSmallStatsObj(NABoolean v)
{ (v ? detailedFlags_.smallFlags_ |= SMALL_STATS_OBJ : detailedFlags_.smallFlags_ &= ~SMALL_STATS_OBJ);}
-NA_EIDPROC
NABoolean statsEnabled() { return (detailedFlags_.otherFlags_ & STATS_ENABLED) != 0; }
-NA_EIDPROC
void setStatsEnabled(NABoolean v)
{ (v ? detailedFlags_.otherFlags_ |= STATS_ENABLED : detailedFlags_.otherFlags_ &= ~STATS_ENABLED); }
-NA_EIDPROC
NABoolean rtsStatsCollectEnabled() { return (detailedFlags_.otherFlags_ & RTS_STATS_COLLECT_ENABLED) != 0; }
-NA_EIDPROC
void setRtsStatsCollectEnabled(NABoolean v)
{ (v ? detailedFlags_.otherFlags_ |= RTS_STATS_COLLECT_ENABLED : detailedFlags_.otherFlags_ &= ~RTS_STATS_COLLECT_ENABLED); }
-NA_EIDPROC
void setDonotUpdateCounters(NABoolean v)
{ (v ? detailedFlags_.smallFlags_ |= DONT_UPDATE_COUNTERS : detailedFlags_.smallFlags_ &= ~DONT_UPDATE_COUNTERS); }
-NA_EIDPROC
NABoolean donotUpdateCounters() { return (detailedFlags_.smallFlags_ & DONT_UPDATE_COUNTERS) != 0; }
-NA_EIDPROC
void setMasterStats(ExMasterStats *masterStats);
-NA_EIDPROC
ExMasterStats *getMasterStats()
{ return masterStats_; }
-NA_EIDPROC
void fixup(ExStatisticsArea *other);
-NA_EIDPROC
void updateSpaceUsage(Space *space,
CollHeap *heap);
-NA_EIDPROC
void initHistoryEntries();
-NA_EIDPROC
ExOperStats *getRootStats()
{ return rootStats_; };
-NA_EIDPROC
void setRootStats(ExOperStats *root)
{
rootStats_ = root;
@@ -3275,14 +2571,12 @@ NA_EIDPROC
void setSubReqType(short subReqType) { subReqType_ = subReqType; }
short getSubReqType() { return subReqType_; }
void setQueryId(char *queryId, Lng32 queryIdLen);
-NA_EIDPROC
Int64 getHashData(ExOperStats::StatType type,
Lng32 tdbId);
-NA_EIDPROC
+
NABoolean anyHaveSentMsgIUD();
private:
-NA_EIDPROC
void unpackThisClass(const char* &buffer,
ExOperStats *parentStatsEntry = NULL,
Lng32 parentTdb = -1);
@@ -3308,10 +2602,8 @@ NA_EIDPROC
RTS_STATS_COLLECT_ENABLED = 0x0002
};
-NA_EIDPROC
IDInfo * IDLookup(HashQueue * hq, Int64 id);
-NA_EIDPROC
void preProcessStats();
NAMemory * heap_;
@@ -3352,10 +2644,6 @@ NA_EIDPROC
short detailLevel_; // Detail Level for SQLCLI_QID_DETAIL_STATS
short subReqType_;
char filler_[16];
-
- // Measure statement counters
- ExMeasStmtCntrs * stmtCntrs_;
- NABoolean deallocStmtCntrs_;
};
@@ -3389,16 +2677,16 @@ public:
// retrieval of the virtual table function pointer of the class while
// unpacking. An empty constructor is enough.
// ---------------------------------------------------------------------
- NA_EIDPROC ExStatsTdb()
+ ExStatsTdb()
{}
- NA_EIDPROC virtual ~ExStatsTdb()
+ virtual ~ExStatsTdb()
{}
// ---------------------------------------------------------------------
// Build a TCB for this TDB. Redefined in the Executor project.
// ---------------------------------------------------------------------
- NA_EIDPROC virtual ex_tcb *build(ex_globals *globals);
+ virtual ex_tcb *build(ex_globals *globals);
private:
// ---------------------------------------------------------------------
@@ -3546,43 +2834,30 @@ private:
class ExMasterStats : public ExOperStats
{
public:
-NA_EIDPROC
ExMasterStats(NAHeap *heap);
-NA_EIDPROC
ExMasterStats(NAHeap *heap, char *sourceStr, Lng32 storedSqlTextLen, Lng32 originalSqlTextLen, char *queryId, Lng32 queryIdLen);
-NA_EIDPROC
ExMasterStats();
-NA_EIDPROC
~ExMasterStats();
-NA_EIDPROC
UInt32 packedLength();
//////////////////////////////////////////////////////////////////
// packs 'this' into a message.
//////////////////////////////////////////////////////////////////
-NA_EIDPROC
UInt32 pack(char * buffer);
-NA_EIDPROC
void unpack(const char* &buffer);
-NA_EIDPROC
void deleteMe();
-NA_EIDPROC
ExOperStats *copyOper(NAMemory * heap);
-NA_EIDPROC
void copyContents(ExMasterStats * other);
-NA_EIDPROC
void getVariableStatsInfo(char * dataBuffer,
char * dataLen,
Lng32 maxLen);
-NA_EIDPROC
ExMasterStats *castToExMasterStats();
-NA_EIDPROC
void setElapsedStartTime(Int64 elapsedStartTime)
{
elapsedStartTime_ = elapsedStartTime;
@@ -3590,26 +2865,22 @@ NA_EIDPROC
elapsedEndTime_ = -1;
}
-NA_EIDPROC
void setElapsedEndTime(Int64 elapsedEndTime)
{
elapsedEndTime_ = elapsedEndTime;
}
-NA_EIDPROC
void setCompStartTime(Int64 compStartTime)
{
compStartTime_ = compStartTime;
compEndTime_ = -1;
}
-NA_EIDPROC
void setCompEndTime(Int64 compEndTime)
{
compEndTime_ = compEndTime;
}
-NA_EIDPROC
void setExeStartTime(Int64 exeStartTime)
{
exeStartTime_ = exeStartTime;
@@ -3618,14 +2889,12 @@ NA_EIDPROC
querySuspendedTime_ = -1;
}
-NA_EIDPROC
void setExeEndTime(Int64 exeEndTime)
{
exeEndTime_ = exeEndTime;
exeTimes_.addEntry(exeEndTime_-exeStartTime_);
}
-NA_EIDPROC
void setCanceledTime(Int64 canceledTime)
{
canceledTime_ = canceledTime;
@@ -3658,7 +2927,6 @@ NA_EIDPROC
returnedRowsIOTime_ = rrIOtime;
}
-NA_EIDPROC
void setStmtState(short state)
{
stmtState_ = state;
@@ -3667,27 +2935,20 @@ NA_EIDPROC
char * getQueryId() { return queryId_; }
Lng32 getQueryIdLen() { return queryIdLen_; }
-NA_EIDPROC
Int64 getCompStartTime() { return compStartTime_; }
-NA_EIDPROC
Int64 getCompEndTime() { return compEndTime_; }
-NA_EIDPROC
Int64 getElapsedStartTime() { return elapsedStartTime_; }
-NA_EIDPROC
Int64 getElapsedEndTime() { return elapsedEndTime_; }
Int64 getFirstRowReturnTime() { return firstRowReturnTime_; }
-NA_EIDPROC
Int64 getExeStartTime() { return exeStartTime_; }
-NA_EIDPROC
Int64 getExeEndTime() { return exeEndTime_; }
-NA_EIDPROC
Int64 getCanceledTime() { return canceledTime_; }
void setRowsAffected(Int64 rowsAffected)
@@ -3749,13 +3010,10 @@ NA_EIDPROC
inline void setAqrDelayBeforeRetry(Lng32 d ) {delayBeforeAqrRetry_ = d;}
inline Lng32 getAqrDelayBeforeRetry() { return delayBeforeAqrRetry_;}
-NA_EIDPROC
short getState() { return stmtState_; }
-NA_EIDPROC
void fixup(ExMasterStats *other);
-NA_EIDPROC
void setEndTimes(NABoolean updateExeEndTime);
QueryCostInfo &queryCostInfo() { return queryCostInfo_; }
@@ -4086,95 +3344,61 @@ private:
//////////////////////////////////////////////////////////////////
class ExFastExtractStats : public ExOperStats {
public:
- NA_EIDPROC
ExFastExtractStats(NAMemory * heap,
ex_tcb *tcb,
const ComTdb * tdb);
- NA_EIDPROC
ExFastExtractStats(NAMemory * heap);
- NA_EIDPROC
~ExFastExtractStats(){};
- NA_EIDPROC
void init(NABoolean resetDop);
- NA_EIDPROC
void copyContents(ExFastExtractStats* other);
- NA_EIDPROC
void merge(ExFastExtractStats* other);
- NA_EIDPROC
UInt32 packedLength();
//////////////////////////////////////////////////////////////////
// packs 'this' into a message. Converts pointers to offsets.
//////////////////////////////////////////////////////////////////
- NA_EIDPROC
UInt32 pack(char * buffer);
- NA_EIDPROC
void unpack(const char* &buffer);
- NA_EIDPROC
ExOperStats * copyOper(NAMemory * heap);
- NA_EIDPROC
ExFastExtractStats * castToExFastExtractStats();
- NA_EIDPROC
virtual const char * getNumValTxt(Int32 i) const;
- NA_EIDPROC
virtual Int64 getNumVal(Int32 i) const;
- NA_EIDPROC
virtual void getVariableStatsInfo(char * dataBuffer,
char * datalen,
Lng32 maxLen);
- NA_EIDPROC
UInt32& buffersCount() { return buffersCount_;}
- NA_EIDPROC
UInt32& processedRowsCount() { return processedRowsCount_;}
- NA_EIDPROC
UInt32& readyToSendBuffersCount() { return readyToSendBuffersCount_;}
- NA_EIDPROC
UInt32& sentBuffersCount() { return sentBuffersCount_;}
- NA_EIDPROC
UInt32& partitionsCount() { return partitionNumber_;}
- NA_EIDPROC
UInt32& bufferAllocFailuresCount() { return bufferAllocFailuresCount_;}
- NA_EIDPROC
void setBuffersCount(UInt32 v) { buffersCount_ = v;}
- NA_EIDPROC
void setProcessedRowsCount(UInt32 v) {processedRowsCount_ = v;}
- NA_EIDPROC
UInt32 getProcessedRowsCount() { return processedRowsCount_ ;}
- NA_EIDPROC
void incProcessedRowsCount() {processedRowsCount_++;}
- NA_EIDPROC
void setErrorRowsCount(UInt32 v) {errorRowsCount_ = v;}
- NA_EIDPROC
UInt32 getErrorRowsCount() { return errorRowsCount_ ;}
- NA_EIDPROC
void incErrorRowsCount() {errorRowsCount_++;}
- NA_EIDPROC
void incReadyToSendBuffersCount() {readyToSendBuffersCount_++;}
- NA_EIDPROC
void incSentBuffersCount() { sentBuffersCount_++;}
- NA_EIDPROC
void incReadyToSendBytes( UInt32 v = 1) {readyToSendBytes_+= v;}
- NA_EIDPROC
void incSentBytes( UInt32 v = 1) { sentBytes_+= v;}
- NA_EIDPROC
void setPartitionNumber(UInt32 v) { partitionNumber_ = v;}
- NA_EIDPROC
void incBufferAllocFailuresCount() { bufferAllocFailuresCount_++;}
- NA_EIDPROC
void setBufferAllocFailuresCount(UInt32 v) { bufferAllocFailuresCount_ = v;}
private:
@@ -4205,10 +3429,8 @@ public:
recentQid_ = NULL;
};
- NA_EIDPROC
void init(NABoolean resetDop);
- NA_EIDPROC
void copyContents(ExProcessStats* other);
void merge(ExProcessStats* other);
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/ExTranspose.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExTranspose.h b/core/sql/executor/ExTranspose.h
index b921d85..992749c 100644
--- a/core/sql/executor/ExTranspose.h
+++ b/core/sql/executor/ExTranspose.h
@@ -78,16 +78,16 @@ public:
// retrieval of the virtual table function pointer of the class while
// unpacking. An empty constructor is enough.
// ---------------------------------------------------------------------
- NA_EIDPROC ExTransposeTdb()
+ ExTransposeTdb()
{}
- NA_EIDPROC virtual ~ExTransposeTdb()
+ virtual ~ExTransposeTdb()
{}
// ---------------------------------------------------------------------
// Build a TCB for this TDB. Redefined in the Executor project.
// ---------------------------------------------------------------------
- NA_EIDPROC virtual ex_tcb *build(ex_globals *globals);
+ virtual ex_tcb *build(ex_globals *globals);
private:
// ---------------------------------------------------------------------
@@ -183,7 +183,6 @@ public:
// IN: Contains references to global executor information,
// notably the space object used to allocate objects.
//
- NA_EIDPROC
ExTransposeTcb(const ExTransposeTdb &transTdb,
const ex_tcb &childTdb,
ex_globals *glob);
@@ -191,7 +190,6 @@ public:
// Destructor
//
- NA_EIDPROC
~ExTransposeTcb();
// Free up any run-time resources.
@@ -199,35 +197,30 @@ public:
// (Does not free up the queues, should it).
// Called by the destructor.
//
- NA_EIDPROC
void freeResources();
// Register all the transpose subtasks with the scheduler.
//
- NA_EIDPROC
void registerSubtasks();
// The basic work method for a TCB. Transpose does not
// use this method, but rather uses three subtasks.
// - sWorkDown(), sWorkUp() and sCancel().
//
- NA_EIDPROC
ExWorkProcRetcode work();
// Work method to pass requests from parent down to child.
//
- NA_EIDPROC
ExWorkProcRetcode workDown();
// Work method to recieve results from child, process and
// pass up to parent.
//
- NA_EIDPROC
ExWorkProcRetcode workUp();
// Stub to workUp() used by scheduler.
//
- NA_EIDPROC
+
// warning elimination (removed "inline")
static ExWorkProcRetcode sWorkUp(ex_tcb *tcb)
{
@@ -236,7 +229,6 @@ public:
// Stub to workDown() used by scheduler.
//
- NA_EIDPROC
// warning elimination (removed "inline")
static ExWorkProcRetcode sWorkDown(ex_tcb *tcb)
{
@@ -245,7 +237,6 @@ public:
// Stub to processCancel() used by scheduler.
//
- NA_EIDPROC
// warning elimination (removed "inline")
static ExWorkProcRetcode sCancel(ex_tcb *tcb)
{
@@ -254,34 +245,28 @@ public:
// Return the parent queue pair.
//
- NA_EIDPROC
// warning elimination (removed "inline")
ex_queue_pair getParentQueue() const { return qParent_; }
// Return a reference to the Transpose TDB associated with this
// Transpose TCB.
//
- NA_EIDPROC
inline ExTransposeTdb &transTdb() const { return (ExTransposeTdb&)tdb; }
// Return the transpose expression (index by number).
//
- NA_EIDPROC
inline ex_expr * transColExpr(Int32 i) { return transTdb().transColExprs_[i]; }
// Return the selection Predicate.
//
- NA_EIDPROC
inline ex_expr * afterTransPred() { return transTdb().afterTransPred_; }
// Transpose has one child.
//
- NA_EIDPROC
virtual Int32 numChildren() const { return 1; }
// Return the child of the transpose node by position.
//
- NA_EIDPROC
virtual const ex_tcb * getChild(Int32 pos) const {
if(pos == 0) return childTcb_;
return NULL;
@@ -316,13 +301,11 @@ protected:
// send next request down to children
// Called by workDown()
//
- NA_EIDPROC
void start();
// send EOD to parent
// Called when child return Q_NO_DATA in queue.
//
- NA_EIDPROC
void stop();
// Process cancell requests.
@@ -346,18 +329,14 @@ class ExTransposePrivateState : public ex_tcb_private_state
ExTransposeTcb::TransChildState childState_;
- NA_EIDPROC
void init();
public:
- NA_EIDPROC
ExTransposePrivateState(const ExTransposeTcb * tcb);
- NA_EIDPROC
ex_tcb_private_state * allocate_new(const ex_tcb * tcb);
- NA_EIDPROC
~ExTransposePrivateState();
};
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/ExUdr.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExUdr.h b/core/sql/executor/ExUdr.h
index 8359a90..3ba2838 100644
--- a/core/sql/executor/ExUdr.h
+++ b/core/sql/executor/ExUdr.h
@@ -77,18 +77,18 @@ public:
// retrieval of the virtual table function pointer of the class while
// unpacking. An empty constructor is enough.
// ---------------------------------------------------------------------
- NA_EIDPROC ExUdrTdb()
+ ExUdrTdb()
{
}
- NA_EIDPROC virtual ~ExUdrTdb()
+ virtual ~ExUdrTdb()
{
}
// ---------------------------------------------------------------------
// Build a TCB for this TDB. Redefined in the Executor project.
// ---------------------------------------------------------------------
- NA_EIDPROC virtual ex_tcb *build(ex_globals *globals);
+ virtual ex_tcb *build(ex_globals *globals);
// ---------------------------------------------------------------------
// Public accessor functions
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/executor/ExUdrServer.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExUdrServer.cpp b/core/sql/executor/ExUdrServer.cpp
index 067e2c3..7a7b20a 100644
--- a/core/sql/executor/ExUdrServer.cpp
+++ b/core/sql/executor/ExUdrServer.cpp
@@ -267,7 +267,7 @@ ExUdrServer::ExUdrServerStatus ExUdrServer::start(ComDiagsArea **diags,
Lng32 nowaitDepth = 2;
-#ifdef NA_DEBUG_C_RUNTIME
+#ifdef _DEBUG
char *e = getenv("UDR_NOWAIT_DEPTH");
if (e && e[0])
nowaitDepth = atol(e);
@@ -709,34 +709,13 @@ ExUdrServer::ExUdrServerStatus ExUdrServer::kill(ComDiagsArea *diags)
{
if (serverProcessId_.getDomain() == IPC_DOM_GUA_PHANDLE)
{
-#ifdef SQ_PHANDLE_VERIFIER
NAProcessHandle serverPhandle(
(SB_Phandle_Type *) &(serverProcessId_.getPhandle().phandle_));
Int32 guaRetcode = serverPhandle.decompose();
if (XZFIL_ERR_OK == guaRetcode)
msg_mon_stop_process_name(serverPhandle.getPhandleString());
-#else
- char procName[200];
- short procNameLen = 200;
- Int32 nid = 0;
- Int32 pid = 0;
- short result = 0;
-
- //ProcessHandle wrapper in porting layer
- NAProcessHandle serverPhandle((SB_Phandle_Type *)&(serverProcessId_.getPhandle().phandle_));
-
- Int32 guaRetcode = serverPhandle.decompose();
- if (!guaRetcode)
- {
- // Extract procName from serverPhandle
- //procName = serverPhandle.getPhandleString();
- memcpy(procName, serverPhandle.getPhandleString(), serverPhandle.getPhandleStringLen() + 1);
- msg_mon_get_process_info (procName, &nid, &pid);
- msg_mon_stop_process(procName, nid, pid);
- }
-#endif
- UdrDebug1(" PROCESS_STOP_ returned %d", (Int32) result);
- if (diags != NULL)
+ UdrDebug1(" PROCESS_STOP_ returned %d", (Int32) result);
+ if (diags != NULL)
{
*diags << DgSqlCode(EXE_UDR_ATTEMPT_TO_KILL)
<< DgString0(asciiPhandle)
@@ -793,7 +772,7 @@ IpcConnection *ExUdrServer::getAnIpcConnection() const
{
Lng32 nowaitDepth = DEFAULT_NOWAIT_DEPTH;
-#ifdef NA_DEBUG_C_RUNTIME
+#ifdef _DEBUG
char *e = getenv("UDR_NOWAIT_DEPTH");
if (e && e[0])
nowaitDepth = atol(e);
[08/30] incubator-trafodion git commit: TRAFODION-2731 CodeCleanup:
Remove obsolete, legacy and unused code
Posted by an...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/exp/exp_datetime.h
----------------------------------------------------------------------
diff --git a/core/sql/exp/exp_datetime.h b/core/sql/exp/exp_datetime.h
index fadda78..d8d0bd7 100644
--- a/core/sql/exp/exp_datetime.h
+++ b/core/sql/exp/exp_datetime.h
@@ -46,7 +46,7 @@
#pragma warning ( disable : 4251 )
-class SQLEXP_LIB_FUNC ExpDatetime : public SimpleType {
+class ExpDatetime : public SimpleType {
public:
// these enums must be in the same order as the datetimeFormat[] array
@@ -135,20 +135,15 @@ public:
enum arithOps {DATETIME_ADD, DATETIME_SUB};
-NA_EIDPROC
ExpDatetime();
-NA_EIDPROC
~ExpDatetime();
-NA_EIDPROC
static Int64 getTotalDays(short year, short month, short day);
-NA_EIDPROC
static short getDatetimeFields(Lng32 datetimeCode,
rec_datetime_field &startField,
rec_datetime_field &endField);
-NA_EIDPROC
void convertDatetimeToInterval(rec_datetime_field datetimeStartField,
rec_datetime_field datetimeEndField,
short fractionPrecision,
@@ -156,20 +151,17 @@ NA_EIDPROC
char *datetimeOpData,
Int64 &interval) const;
-NA_EIDPROC
static short getYearMonthDay(Int64 totalDays,
short &year,
char &month,
char &day);
-NA_EIDPROC
short convertIntervalToDatetime(Int64 interval,
rec_datetime_field startField,
rec_datetime_field endField,
short fractionPrecision,
char *datetimeOpData) const;
-NA_EIDPROC
static short validateDate(rec_datetime_field startField,
rec_datetime_field endField,
char *datetimeOpData,
@@ -177,14 +169,11 @@ NA_EIDPROC
short intervalFlag,
NABoolean &LastDayPrevMonth);
-NA_EIDPROC
static short validateTime(const char *datetimeOpData);
-NA_EIDPROC
short compDatetimes(char *datetimeOpData1,
char *datetimeOpData2);
-NA_EIDPROC
short arithDatetimeInterval(ExpDatetime::arithOps operation,
ExpDatetime *datetimeOpType,
Attributes *intervalOpType,
@@ -194,7 +183,6 @@ NA_EIDPROC
CollHeap *heap,
ComDiagsArea** diagsArea);
-NA_EIDPROC
short subDatetimeDatetime(Attributes *datetimeOpType,
Attributes *intervalOpType,
char *datetimeOpData1,
@@ -203,32 +191,25 @@ NA_EIDPROC
CollHeap *heap,
ComDiagsArea** diagsArea) const;
-NA_EIDPROC
static short getDisplaySize(Lng32 datetimeCode,
short fractionPrecision);
-NA_EIDPROC
static Lng32 getDatetimeFormatLen(Lng32 format, NABoolean to_date,
rec_datetime_field startField,
rec_datetime_field endField);
-NA_EIDPROC
Attributes * newCopy();
-NA_EIDPROC
Attributes * newCopy(CollHeap *);
-NA_EIDPROC
void copyAttrs(Attributes *source_); // copy source attrs to this.
// ---------------------------------------------------------------------
// Perform type-safe pointer casts.
// ---------------------------------------------------------------------
-NA_EIDPROC
virtual
ExpDatetime* castToExpDatetime();
-NA_EIDPROC
short convDatetimeDatetime(char *srcData,
rec_datetime_field dstStartField,
rec_datetime_field dstEndField,
@@ -238,13 +219,11 @@ NA_EIDPROC
short validateFlag,
NABoolean *roundedDownFlag = NULL);
-NA_EIDPROC
static short currentTimeStamp(char *dstData,
rec_datetime_field startField,
rec_datetime_field endField,
short fractPrec);
-NA_EIDPROC
short extractDatetime(rec_datetime_field srcStartField,
rec_datetime_field srcEndField,
short srcFractPrec,
@@ -273,7 +252,6 @@ NA_EIDPROC
ComDiagsArea** diagsArea,
ULng32 flags);
-NA_EIDPROC
short convAsciiToDate(char *target,
Lng32 targetLen,
char *source,
@@ -283,7 +261,6 @@ NA_EIDPROC
ComDiagsArea** diagsArea,
ULng32 flags);
-NA_EIDPROC
Lng32 convDatetimeToASCII(char *srcData,
char *dstData,
Lng32 dstLen,
@@ -292,7 +269,6 @@ NA_EIDPROC
CollHeap *heap,
ComDiagsArea** diagsArea);
-NA_EIDPROC
static Lng32 convNumericTimeToASCII(char *srcData,
char *dstData,
Lng32 dstLen,
@@ -301,7 +277,6 @@ NA_EIDPROC
CollHeap *heap,
ComDiagsArea** diagsArea);
-NA_EIDPROC
static
short convAsciiDatetimeToASCII(char *srcData,
Lng32 srcPrecision,
@@ -318,18 +293,18 @@ static
// ---------------------------------------------------------------------
// 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());
SimpleType::populateImageVersionIDArray();
}
- NA_EIDPROC virtual short getClassSize() { return (short)sizeof(*this); }
+ virtual short getClassSize() { return (short)sizeof(*this); }
// ---------------------------------------------------------------------
static const char * getDatetimeFormatStr(Lng32 frmt)
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/exp/exp_dp2_expr.cpp
----------------------------------------------------------------------
diff --git a/core/sql/exp/exp_dp2_expr.cpp b/core/sql/exp/exp_dp2_expr.cpp
index eec25da..5b689be 100644
--- a/core/sql/exp/exp_dp2_expr.cpp
+++ b/core/sql/exp/exp_dp2_expr.cpp
@@ -149,3 +149,4 @@ ExpDP2KeyEncodeExpr::ExpDP2KeyEncodeExpr(ex_expr_base * expr,
memset(fillersExpDP2KEExpr_, 0, FILLERS_EXP_DP2_KE_EXPR_SIZE);
}
+
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/exp/exp_dp2_expr.h
----------------------------------------------------------------------
diff --git a/core/sql/exp/exp_dp2_expr.h b/core/sql/exp/exp_dp2_expr.h
index db4798e..d163066 100644
--- a/core/sql/exp/exp_dp2_expr.h
+++ b/core/sql/exp/exp_dp2_expr.h
@@ -23,7 +23,6 @@
#ifndef EXP_DP2_EXPR_H
#define EXP_DP2_EXPR_H
-
/* -*-C++-*-
*****************************************************************************
*
@@ -56,7 +55,7 @@ typedef NAVersionedObjectPtrTempl<ExpDP2Expr> ExpDP2ExprPtr;
/////////////////////////////////////////////////////////////////////////////
// class ExpDP2Expr
/////////////////////////////////////////////////////////////////////////////
-class SQLEXP_LIB_FUNC ExpDP2Expr : public NAVersionedObject
+class ExpDP2Expr : public NAVersionedObject
{
private:
@@ -73,54 +72,40 @@ private:
public:
-NA_EIDPROC
ExpDP2Expr(ex_expr_base * expr,
ex_cri_desc * work_cri_desc,
Space * space,
short allocateWorkAtpAtRunTime = 0);
-NA_EIDPROC
ExpDP2Expr() : NAVersionedObject(-1) {}
-NA_EIDPROC
virtual ~ExpDP2Expr();
-NA_EIDPROC
virtual unsigned char getClassVersionID()
{
return 1;
}
-NA_EIDPROC
virtual void populateImageVersionIDArray()
{
setImageVersionID(0,getClassVersionID());
}
-NA_EIDPROC
virtual short getClassSize() { return (short)sizeof(ExpDP2Expr); }
-NA_EIDPROC
Long pack(void * space);
-NA_EIDPROC
Lng32 unpack(void * base, void * reallocator);
-NA_EIDPROC
Lng32 spaceNeededForWorkAtp();
-NA_EIDPROC
Int32 workAtpSpace(){return workAtpSpace_;};
// if inbuf is passed in, create work atp in it.
// if createTempTupp is TRUE, allocate tupp descriptor for
// temp space.
-NA_EIDPROC
void createWorkAtp(char* &inbuf, NABoolean createTempTupp);
-NA_EIDPROC
inline atp_struct * getWorkAtp() { return workAtp_; }
-NA_EIDPROC
inline ex_expr_base * getExpr() { return expr_; }
-NA_EIDPROC
ex_cri_desc * criDesc(){return criDesc_;};
- NA_EIDPROC Int16 getPCodeMode() { return pCodeMode_ ; }
- NA_EIDPROC inline void setPCodeMode(Int16 mode) { pCodeMode_ = mode; }
+ Int16 getPCodeMode() { return pCodeMode_ ; }
+ inline void setPCodeMode(Int16 mode) { pCodeMode_ = mode; }
};
-class SQLEXP_LIB_FUNC ExpDP2KeyEncodeExpr : public ExpDP2Expr
+class ExpDP2KeyEncodeExpr : public ExpDP2Expr
{
private:
#define FILLERS_EXP_DP2_KE_EXPR_SIZE 24
@@ -134,27 +119,19 @@ private:
// other in the key order.
KEY_ENCODE_OPT_1 = 0x0001
};
-#ifdef NA_64BIT
- // dg64 - 32-bits on disk
UInt32 flags_; // 00-03
-#else
- ULng32 flags_; // 00-03
-#endif
UInt16 firstKeyColOffset_; // 04-05
UInt16 keyLen_; // 06-07
char fillersExpDP2KEExpr_[FILLERS_EXP_DP2_KE_EXPR_SIZE]; // 08-31
public:
-NA_EIDPROC
ExpDP2KeyEncodeExpr(ex_expr_base * expr,
ex_cri_desc * work_cri_desc,
Space * space,
short allocateWorkAtpAtRunTime = 0);
-NA_EIDPROC
ExpDP2KeyEncodeExpr() : ExpDP2Expr() {}
-NA_EIDPROC
virtual short getClassSize() { return (short)sizeof(ExpDP2KeyEncodeExpr); }
UInt16 getFirstKeyColOffset() {return firstKeyColOffset_;}
@@ -171,5 +148,3 @@ NA_EIDPROC
#pragma warning ( default : 4251 )
#endif
-
-
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/exp/exp_eval.cpp
----------------------------------------------------------------------
diff --git a/core/sql/exp/exp_eval.cpp b/core/sql/exp/exp_eval.cpp
index 7780704..b260938 100644
--- a/core/sql/exp/exp_eval.cpp
+++ b/core/sql/exp/exp_eval.cpp
@@ -73,15 +73,12 @@ double MathConvReal64ToReal64(double op1, Int16 * ov);
( ((result) & 0x80000000) ? ((result) ^ 0x80000002) : (result) )
-NA_EIDPROC
void setVCLength(char * VCLen, Int32 VCLenSize, UInt32 value);
// --------------------------------------------------------------------
// Generate 31 bit hash value by
// multiplication, shift, and xor for every 4 byte.
// --------------------------------------------------------------------
-NA_EIDPROC
-SQLEXP_LIB_FUNC
UInt32 FastHash(char *data, Int32 length)
{
// FastHash should be removed someday
@@ -176,7 +173,6 @@ UInt32 FastHash(char *data, Int32 length)
//
static const Int32 nullBitmapData[] = { 0, 0, 0, 0 };
-NA_EIDPROC
ex_expr::exp_return_type getDefaultValueForAddedColumn(
UInt32 field_num, // field number whose default value is to be
// computed. Zero based.
@@ -242,8 +238,6 @@ ex_expr::exp_return_type getDefaultValueForAddedColumn(
// are stored next to each other in packed format(varchar
// fields are stored without blank padding).
/////////////////////////////////////////////////////////
-NA_EIDPROC
-SQLEXP_LIB_FUNC
void computeDataPtr(char * start_data_ptr, // start of data row
Int32 field_num, // field number whose address is to be
// computed. Zero based.
@@ -887,7 +881,6 @@ ex_expr::exp_return_type ex_expr::evalClauses(ex_clause *clause,
return retcode;
}
-NA_EIDPROC
static ex_expr::exp_return_type alignAndEval(ex_clause * clause,
char ** op_data,
CollHeap * heap,
@@ -2313,7 +2306,7 @@ ex_expr::exp_return_type ex_expr::evalPCode(PCodeBinary* pCode32,
char *opData[3 * ex_clause::MAX_OPERANDS];
char **opDataData = &opData[2 * ex_clause::MAX_OPERANDS];
- // dg64 - stack contains addresses
+ // stack contains addresses
Long stack[258];
// The first N entries in the stack are reserved for pointers to
@@ -2324,7 +2317,7 @@ ex_expr::exp_return_type ex_expr::evalPCode(PCodeBinary* pCode32,
//
atp_struct *atps[] = { atp1, atp2 };
- // dg64 - Use Long for stack
+ // Use Long for stack
stack[1] = (Long)(castToExExpr()->getMyConstantsArea());
stack[2] = (Long)(castToExExpr()->getTempsArea());
stack[3] = (Long)(castToExExpr()->getMyPersistentArea());
@@ -4301,7 +4294,7 @@ ex_expr::exp_return_type ex_expr::evalPCode(PCodeBinary* pCode32,
PTR_DEF_ASSIGN(Int64, result, 0);
PTR_DEF_ASSIGN(Int64, xptr, 2);
PTR_DEF_ASSIGN(Int64, yptr, 4);
-#if (defined NA_YOS || defined (NA_LINUX)) && !defined _DEBUG
+#if (!defined _DEBUG)
Int64 x = *xptr, y = *yptr;
Int64 z = x + y;
@@ -4348,7 +4341,7 @@ ex_expr::exp_return_type ex_expr::evalPCode(PCodeBinary* pCode32,
PTR_DEF_ASSIGN(Int64, result, 0);
PTR_DEF_ASSIGN(Int32, xptr32, 2);
PTR_DEF_ASSIGN(Int64, yptr, 4);
-#if (defined (NA_YOS) || defined (NA_LINUX)) && !defined _DEBUG
+#if (!defined _DEBUG)
Int64 x = (Int64) *xptr32 , y = *yptr;
Int64 z = x + y;
@@ -4396,7 +4389,7 @@ ex_expr::exp_return_type ex_expr::evalPCode(PCodeBinary* pCode32,
PTR_DEF_ASSIGN(Int64, result, 0);
PTR_DEF_ASSIGN(Int64, xptr, 2);
PTR_DEF_ASSIGN(Int64, yptr, 4);
-#if (defined NA_YOS || defined (NA_LINUX)) && !defined _DEBUG
+#if (!defined _DEBUG)
Int64 x = *xptr, y = *yptr;
Int64 z = x - y;
@@ -4523,7 +4516,7 @@ ex_expr::exp_return_type ex_expr::evalPCode(PCodeBinary* pCode32,
PTR_DEF_ASSIGN(Int64, result, 0);
PTR_DEF_ASSIGN(Int64, xptr, 2);
PTR_DEF_ASSIGN(Int64, yptr, 4);
-#if (defined (NA_YOS) || defined (NA_LINUX)) && !defined _DEBUG
+#if (!defined _DEBUG)
Int64 x = *xptr, y = *yptr;
@@ -4952,7 +4945,7 @@ ex_expr::exp_return_type ex_expr::evalPCode(PCodeBinary* pCode32,
{
PTR_DEF_ASSIGN(Int64, result, 0 );
PTR_DEF_ASSIGN(Int32, yptr, 2 );
-#if (defined (NA_YOS) || defined (NA_LINUX)) && !defined _DEBUG
+#if (!defined _DEBUG)
Int32 y = *yptr;
Int64 x = *result;
@@ -6368,7 +6361,6 @@ ex_expr::exp_return_type ex_expr::evalPCode(PCodeBinary* pCode32,
DEF_ASSIGN(Int32, bitwiseNOT , 4 );
Int64 result = *resultPtr;
-//SQ_LINUX #ifndef NA_HSC
result ^= 0x8000000000000000LL;
#ifdef NA_LITTLE_ENDIAN
result = reversebytes(result);
@@ -6533,7 +6525,6 @@ ex_expr::exp_return_type ex_expr::evalPCode(PCodeBinary* pCode32,
result = reversebytes(result);
#endif // NA_LITTLE_ENDIAN
-//SQ_LINUX #ifndef NA_HSC
result ^= 0x8000000000000000LL;
* outputPtr = result ;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/exp/exp_expr.cpp
----------------------------------------------------------------------
diff --git a/core/sql/exp/exp_expr.cpp b/core/sql/exp/exp_expr.cpp
index f1f374e..97d7ce0 100644
--- a/core/sql/exp/exp_expr.cpp
+++ b/core/sql/exp/exp_expr.cpp
@@ -39,17 +39,14 @@
#include "Platform.h"
-#ifndef __EID
#include <stdio.h>
#include <stdlib.h>
-#endif
#include "exp_stdh.h"
#include "exp_expr.h"
#include "ExpPCode.h"
#include "ExpPCodeOptimizations.h"
-NA_EIDPROC
void setVCLength(char * VCLen, Lng32 VCLenSize, ULng32 value);
@@ -57,7 +54,7 @@ void setVCLength(char * VCLen, Lng32 VCLenSize, ULng32 value);
// This method returns the virtual function table pointer for an object
// with the given class ID; used by NAVersionedObject::driveUnpack().
// -----------------------------------------------------------------------
-NA_EIDPROC char *ex_expr::findVTblPtr(short classID)
+char *ex_expr::findVTblPtr(short classID)
{
char *vtblPtr;
switch (classID)
@@ -112,25 +109,17 @@ void ex_expr_lean::displayContents(Space * space, short mode,
{
char buf[200];
-#ifndef __EID
str_sprintf(buf, "Expression: %s", displayStr);
-#endif
space->allocateAndCopyToAlignedSpace(buf, str_len(buf), sizeof(short));
-#ifndef __EID
str_sprintf(buf, " Total Expr Len: %d, Consts Area Len: %d", getLength(), getConstsLength());
-#endif
space->allocateAndCopyToAlignedSpace(buf, str_len(buf), sizeof(short));
-#ifndef __EID
str_sprintf(buf, " Temps Area Len: %d, Persistent Area Len: %d", getTempsLength(), persistentLength());
-#endif
space->allocateAndCopyToAlignedSpace(buf, str_len(buf), sizeof(short));
str_sprintf(buf, " PCode Expr Length: %d\n", getPCodeSize());
space->allocateAndCopyToAlignedSpace(buf, str_len(buf), sizeof(short));
if (flag & 0x00000002)
{
-#ifndef __EID
-
// Clear the fixup flag, since the expression has not been fixed up
// (pCodeGenerate undoes, the fixup of Const and Temp offsets.)
//
@@ -172,8 +161,6 @@ void ex_expr_lean::displayContents(Space * space, short mode,
str_sprintf(buf, "\n");
space->allocateAndCopyToAlignedSpace(buf, str_len(buf), sizeof(short));
}
-
-#endif //__EID
}
}
// LCOV_EXCL_STOP
@@ -266,15 +253,11 @@ void ex_expr::displayContents(Space * space, short mode, const char * displayStr
ULng32 exprLen = getLength();
-#ifndef __EID
str_sprintf(buf, "Expression: %s", displayStr);
-#endif
space->allocateAndCopyToAlignedSpace(buf, str_len(buf), sizeof(short));
-#ifndef __EID
str_sprintf(buf, "Expr Len: %d, Consts Len: %d", exprLen, getConstsLength());
space->allocateAndCopyToAlignedSpace(buf, str_len(buf), sizeof(short));
str_sprintf(buf, "flags_ = %b ",flags_ );
-#endif
space->allocateAndCopyToAlignedSpace(buf, str_len(buf), sizeof(short));
if (flag & 0x00000004)
@@ -292,8 +275,6 @@ void ex_expr::displayContents(Space * space, short mode, const char * displayStr
if (flag & 0x00000002)
{
-#ifndef __EID
-
if (getPCodeBinary())
{
str_sprintf(buf, " PCode:\n");
@@ -308,14 +289,12 @@ void ex_expr::displayContents(Space * space, short mode, const char * displayStr
else if ((flag & 0x00000010) &&
(getPCodeBinary()))
{
-// LCOV_EXCL_START
str_sprintf(buf, " PCode:\n");
space->allocateAndCopyToAlignedSpace(buf, str_len(buf), sizeof(short));
str_sprintf(buf, "PCode Expr Length: %d", getPCodeSize());
space->allocateAndCopyToAlignedSpace(buf, str_len(buf), sizeof(short));
PCode::displayContents(getPCodeBinary(), space);
-// LCOV_EXCL_STOP
}
else
{
@@ -347,7 +326,6 @@ void ex_expr::displayContents(Space * space, short mode, const char * displayStr
// LCOV_EXCL_STOP
}
}
-#endif //__EID
}
}
@@ -500,27 +478,21 @@ void AggrExpr::displayContents(Space * space, short mode, const char * displaySt
if (initExpr_)
{
-#ifndef __EID
- str_sprintf(buf, "%s::initExpr_", displayStr);
-#endif
+ str_sprintf(buf, "%s::initExpr_", displayStr);
initExpr_->displayContents(space, mode, buf, flag);
}
if (finalNullExpr_)
{
-#ifndef __EID
- str_sprintf(buf, "%s::finalNullExpr_", displayStr);
-#endif
+ str_sprintf(buf, "%s::finalNullExpr_", displayStr);
finalNullExpr_->displayContents(space, mode, buf, flag);
}
if (finalExpr_)
{
-#ifndef __EID
- str_sprintf(buf, "%s::finalExpr_", displayStr);
-#endif
+ str_sprintf(buf, "%s::finalExpr_", displayStr);
finalExpr_->displayContents(space, mode, buf, flag);
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/exp/exp_expr.h
----------------------------------------------------------------------
diff --git a/core/sql/exp/exp_expr.h b/core/sql/exp/exp_expr.h
index dfec9e0..9779fd5 100644
--- a/core/sql/exp/exp_expr.h
+++ b/core/sql/exp/exp_expr.h
@@ -111,7 +111,7 @@ struct exp_eye_catcher {
char name_[4];
};
-class SQLEXP_LIB_FUNC NExDbgInfo {
+class NExDbgInfo {
private:
char * NExLogPath_ ; // Ptr to Native Expr. Log Pathname
@@ -144,7 +144,7 @@ public:
#pragma warning ( disable : 4251 )
-class SQLEXP_LIB_FUNC ex_expr : public NAVersionedObject
+class ex_expr : public NAVersionedObject
{
friend class NodeInfo;
//----------------------------------------------------------------------
@@ -208,7 +208,7 @@ public:
// Construction/Destruction
//
- NA_EIDPROC ex_expr(exp_node_type type = exp_ANCHOR)
+ ex_expr(exp_node_type type = exp_ANCHOR)
: NAVersionedObject(type),
pCodeMaxOptBrCnt_(9999999),
pCodeMaxOptInCnt_(9999999),
@@ -235,33 +235,33 @@ public:
NExDbgInfo_ = NULL;
}
- NA_EIDPROC ~ex_expr() {}
+ ~ex_expr() {}
// ---------------------------------------------------------------------
// Redefinition of methods inherited from NAVersionedObject.
// ---------------------------------------------------------------------
- NA_EIDPROC virtual unsigned char getClassVersionID()
+ virtual unsigned char getClassVersionID()
{
return 1;
}
- NA_EIDPROC virtual void populateImageVersionIDArray()
+ virtual void populateImageVersionIDArray()
{
setImageVersionID(0,getClassVersionID());
}
- NA_EIDPROC virtual short getClassSize() { return (short)sizeof(*this); }
+ virtual short getClassSize() { return (short)sizeof(*this); }
// ---------------------------------------------------------------------
- NA_EIDPROC exp_node_type getType()
+ exp_node_type getType()
{
return (exp_node_type)getClassID();
};
// Accessors for Heap
//
- NA_EIDPROC inline void setHeap(CollHeap * heap) { heap_ = heap; }
- NA_EIDPROC inline CollHeap *getHeap() { return heap_; }
+ inline void setHeap(CollHeap * heap) { heap_ = heap; }
+ inline CollHeap *getHeap() { return heap_; }
ex_expr_lean * castToExExprLean()
{
@@ -275,62 +275,62 @@ public:
// Accessors for interogation
//
- NA_EIDPROC virtual void displayContents(ComSpace * space, short mode,
+ virtual void displayContents(ComSpace * space, short mode,
const char * displayStr,ULng32 flag = 0x00000006);
// Accessors for the clause linked list
//
- NA_EIDPROC ex_clause *getClauses(){
+ ex_clause *getClauses(){
return clauses_.getPointer();
};
- NA_EIDPROC void setClauses(ex_clause * clause)
+ void setClauses(ex_clause * clause)
{
clauses_ = clause;
};
- NA_EIDPROC void linkClause(ex_clause*);
+ void linkClause(ex_clause*);
// Accessors for the constants and temps areas and sizes
//
- NA_EIDPROC Lng32 getConstsLength() { return constantsAreaLength_; };
- NA_EIDPROC void setConstsLength(Lng32 constants_area_length)
+ Lng32 getConstsLength() { return constantsAreaLength_; };
+ void setConstsLength(Lng32 constants_area_length)
{constantsAreaLength_ = constants_area_length;}
- NA_EIDPROC inline char *getConstantsArea()
+ inline char *getConstantsArea()
{
return constantsArea_;
}
- NA_EIDPROC char *getMyConstantsArea()
+ char *getMyConstantsArea()
{
return constantsArea_;
}
- NA_EIDPROC void setConstantsArea(char * constants_area)
+ void setConstantsArea(char * constants_area)
{constantsArea_ = constants_area;};
- NA_EIDPROC inline char *getTempsArea()
+ inline char *getTempsArea()
{return tempsArea_;}
- NA_EIDPROC char *getMyTempsArea()
+ char *getMyTempsArea()
{return tempsArea_;}
- NA_EIDPROC void setTempsArea(char * temps_area)
+ void setTempsArea(char * temps_area)
{tempsArea_ = temps_area;};
- NA_EIDPROC Lng32 getTempsLength()
+ Lng32 getTempsLength()
{
return tempsAreaLength_;
};
- NA_EIDPROC void setTempsLength(Lng32 tempsLength){
+ void setTempsLength(Lng32 tempsLength){
tempsAreaLength_ = tempsLength;
};
- NA_EIDPROC void setLength(Lng32 length){
+ void setLength(Lng32 length){
length_ = length;
};
- NA_EIDPROC Lng32 getLength(){
+ Lng32 getLength(){
return length_;
};
@@ -339,7 +339,7 @@ public:
// computeSpaceOnly: if TRUE, then compute space requirement only.
// Do not make any changes to the generated expressions,
// (like assigning tempsArea, assigning generated pcode, etc).
- NA_EIDPROC virtual exp_return_type fixup(Lng32, unsigned short,
+ virtual exp_return_type fixup(Lng32, unsigned short,
const ex_tcb * tcb,
ComSpace * space,
CollHeap * exHeap,
@@ -382,13 +382,13 @@ public:
// update processing. See processUpdate() in ex_dp2_oper.cpp and
// exp/exp_eval.cpp for details.
////////////////////////////////////////////////////////////////////
- NA_EIDPROC exp_return_type
+ exp_return_type
evalPCodeAligned(PCodeBinary*pCode,
atp_struct*,
atp_struct*,
ULng32 *rowlen);
- NA_EIDPROC exp_return_type
+ exp_return_type
evalPCode(PCodeBinary*pCode,
atp_struct*,
atp_struct*,
@@ -400,77 +400,77 @@ public:
// being inlined.
//Moves
- static NA_EIDPROC exp_return_type
+ static exp_return_type
evalFast4(PCodeBinary*,atp_struct*,atp_struct*,ex_expr*);
- static NA_EIDPROC exp_return_type
+ static exp_return_type
evalFast202(PCodeBinary*,atp_struct*,atp_struct*,ex_expr*);
- static NA_EIDPROC exp_return_type
+ static exp_return_type
evalFast203(PCodeBinary*,atp_struct*,atp_struct*,ex_expr*);
//Compares
- static NA_EIDPROC exp_return_type
+ static exp_return_type
evalFast33(PCodeBinary*,atp_struct*,atp_struct*,ex_expr*);
- static NA_EIDPROC exp_return_type
+ static exp_return_type
evalFast36(PCodeBinary*,atp_struct*,atp_struct*,ex_expr*);
- static NA_EIDPROC exp_return_type
+ static exp_return_type
evalFast37(PCodeBinary*,atp_struct*,atp_struct*,ex_expr*);
- static NA_EIDPROC exp_return_type
+ static exp_return_type
evalFast40(PCodeBinary*,atp_struct*,atp_struct*,ex_expr*);
- static NA_EIDPROC exp_return_type
+ static exp_return_type
evalFast117(PCodeBinary*,atp_struct*,atp_struct*,ex_expr*);
- static NA_EIDPROC exp_return_type
+ static exp_return_type
evalFast130(PCodeBinary*,atp_struct*,atp_struct*,ex_expr*);
- static NA_EIDPROC exp_return_type
+ static exp_return_type
evalFast131(PCodeBinary*,atp_struct*,atp_struct*,ex_expr*);
- static NA_EIDPROC exp_return_type
+ static exp_return_type
evalFast132(PCodeBinary*,atp_struct*,atp_struct*,ex_expr*);
- static NA_EIDPROC exp_return_type
+ static exp_return_type
evalFast133(PCodeBinary*,atp_struct*,atp_struct*,ex_expr*);
- static NA_EIDPROC exp_return_type
+ static exp_return_type
evalFast162(PCodeBinary*,atp_struct*,atp_struct*,ex_expr*);
- static NA_EIDPROC exp_return_type
+ static exp_return_type
evalFast262(PCodeBinary*,atp_struct*,atp_struct*,ex_expr*);
- static NA_EIDPROC exp_return_type
+ static exp_return_type
evalFast275(PCodeBinary*,atp_struct*,atp_struct*,ex_expr*);
// Hash
- static NA_EIDPROC exp_return_type
+ static exp_return_type
evalFast94(PCodeBinary*,atp_struct*,atp_struct*,ex_expr*);
- static NA_EIDPROC exp_return_type
+ static exp_return_type
evalFast170(PCodeBinary*,atp_struct*,atp_struct*,ex_expr*);
- static NA_EIDPROC exp_return_type
+ static exp_return_type
evalFast171(PCodeBinary*,atp_struct*,atp_struct*,ex_expr*);
- static NA_EIDPROC exp_return_type
+ static exp_return_type
evalFast173(PCodeBinary*,atp_struct*,atp_struct*,ex_expr*);
- static NA_EIDPROC exp_return_type
+ static exp_return_type
evalFast223(PCodeBinary*,atp_struct*,atp_struct*,ex_expr*);
- NA_EIDPROC exp_return_type
+ exp_return_type
reportOverflowError(atp_struct*,
PCodeBinary* pCodeOpcode,
PCodeBinary* pCode,
Long* stack);
- NA_EIDPROC exp_return_type
+ exp_return_type
evalClauses(ex_clause *,
atp_struct *,
atp_struct *,
@@ -479,20 +479,20 @@ public:
short *lastFldIndex,
char * fetchedDataPtr);
- NA_EIDPROC virtual char *findVTblPtr(short classID);
+ virtual char *findVTblPtr(short classID);
- NA_EIDPROC virtual Long pack(void *);
- NA_EIDPROC virtual Lng32 unpack(void *, void * reallocator);
- NA_EIDPROC void packStuff(void *);
+ virtual Long pack(void *);
+ virtual Lng32 unpack(void *, void * reallocator);
+ void packStuff(void *);
- NA_EIDPROC void makeLeanCopyAll(ComSpace * space);
- NA_EIDPROC void makeLeanCopy(ex_expr_lean * other, ComSpace * space);
+ void makeLeanCopyAll(ComSpace * space);
+ void makeLeanCopy(ex_expr_lean * other, ComSpace * space);
- NA_EIDPROC inline Long packExpr(void * space) {
+ inline Long packExpr(void * space) {
return ex_expr::pack(space);
}
- NA_EIDPROC inline Lng32 unpackExpr(void * base, void * reallocator) {
+ inline Lng32 unpackExpr(void * base, void * reallocator) {
return ex_expr::unpack(base, reallocator);
}
@@ -502,72 +502,72 @@ public:
// Accessors and Methods for PCode
//
- NA_EIDPROC PCodeBinary *getPCodeBinary()
+ PCodeBinary *getPCodeBinary()
{
return (pCode_.getPointer() ? pCode_.getPointer()->getPCodeBinary() : NULL);
};
- NA_EIDPROC void setPCodeLean(PCodeBinary *pCode)
+ void setPCodeLean(PCodeBinary *pCode)
{
pCodeLean_ = pCode;
}
- NA_EIDPROC PCode *getPCodeObject()
+ PCode *getPCodeObject()
{
return pCodeObject_;
}
- NA_EIDPROC PCodeSegment * getPCodeSegment()
+ PCodeSegment * getPCodeSegment()
{ return pCode_.getPointer(); }
- NA_EIDPROC Int32 getPCodeSize()
+ Int32 getPCodeSize()
{
return pCode_.getPointer()->getPCodeSegmentSize();
}
- NA_EIDPROC virtual void setPCodeBinary(PCodeBinary *pCode)
+ virtual void setPCodeBinary(PCodeBinary *pCode)
{ pCode_.getPointer()->setPCodeBinary(pCode); }
- NA_EIDPROC void setPCodeObject(PCode *pCodeObject)
+ void setPCodeObject(PCode *pCodeObject)
{pCodeObject_ = pCodeObject; }
- NA_EIDPROC Int16 getPCodeMode()
+ Int16 getPCodeMode()
{ return pCodeMode_ ; }
- NA_EIDPROC void setPCodeMode(Int16 mode)
+ void setPCodeMode(Int16 mode)
{ pCodeMode_ = mode; }
- NA_EIDPROC UInt32 getPCodeOptFlags()
+ UInt32 getPCodeOptFlags()
{ return pCodeOptFlags_; }
- NA_EIDPROC void setPCodeOptFlags(UInt32 flags)
+ void setPCodeOptFlags(UInt32 flags)
{ pCodeOptFlags_ = flags; }
- NA_EIDPROC UInt32 getPCodeMaxOptBrCnt()
+ UInt32 getPCodeMaxOptBrCnt()
{ return pCodeMaxOptBrCnt_; }
- NA_EIDPROC UInt32 getPCodeMaxOptInCnt()
+ UInt32 getPCodeMaxOptInCnt()
{ return pCodeMaxOptInCnt_; }
- NA_EIDPROC void setPCodeMaxOptBrCnt(UInt32 cnt)
+ void setPCodeMaxOptBrCnt(UInt32 cnt)
{ pCodeMaxOptBrCnt_ = cnt; }
- NA_EIDPROC void setPCodeMaxOptInCnt(UInt32 cnt)
+ void setPCodeMaxOptInCnt(UInt32 cnt)
{ pCodeMaxOptInCnt_ = cnt; }
- NA_EIDPROC void setEvalPtr( NABoolean isSamePrimary );
+ void setEvalPtr( NABoolean isSamePrimary );
- NA_EIDPROC void setEvalPtr(evalPtrType e) { evalPtr_ = e; }
+ void setEvalPtr(evalPtrType e) { evalPtr_ = e; }
- NA_EIDPROC void setNExDbgInfo(NExDbgInfo * NExDbgPtr)
+ void setNExDbgInfo(NExDbgInfo * NExDbgPtr)
{ NExDbgInfo_ = NExDbgPtr; }
- NA_EIDPROC NExDbgInfo * getNExDbgInfoPtr() { return NExDbgInfo_ ; }
+ NExDbgInfo * getNExDbgInfoPtr() { return NExDbgInfo_ ; }
- NA_EIDPROC Long getEvalPtrOffset() { return evalPtrOff_ ; }
+ Long getEvalPtrOffset() { return evalPtrOff_ ; }
- NA_EIDPROC exp_return_type pCodeGenerate(ComSpace *space, CollHeap *heap,
+ exp_return_type pCodeGenerate(ComSpace *space, CollHeap *heap,
UInt32 flags);
- NA_EIDPROC void pCodePrint();
+ void pCodePrint();
// Takes pointer out of PCodeBinary sequences
- // NA_EIDPROC Long getPCodeBinaryAsPtr(PCodeBinary *pcode, Int32 idx)
+ // Long getPCodeBinaryAsPtr(PCodeBinary *pcode, Int32 idx)
// {
// return *(Long*)&pcode[idx];
// }
// Adds pointer to PCodeBinary sequences and returns # of PCodeBinary occupied
- NA_EIDPROC Int32 setPtrAsPCodeBinary(PCodeBinary *pcode, Int32 idx, Long ptr)
+ Int32 setPtrAsPCodeBinary(PCodeBinary *pcode, Int32 idx, Long ptr)
{
*(Long*)&pcode[idx] = ptr;
return (sizeof(ptr)/sizeof(PCodeBinary));
@@ -576,72 +576,67 @@ public:
// Accessors/Mutators and Methods for persisent expression storage.
//
- NA_EIDPROC inline char * getPersistentArea()
+ inline char * getPersistentArea()
{
return persistentArea_;
}
- NA_EIDPROC char * getMyPersistentArea()
+ char * getMyPersistentArea()
{
return persistentArea_;
}
- NA_EIDPROC char *getPersistentData(Int32 offset =0);
- NA_EIDPROC char* &persistentArea() { return persistentArea_.pointer(); }
- NA_EIDPROC char* &persistentInitializationArea()
+ char *getPersistentData(Int32 offset =0);
+ char* &persistentArea() { return persistentArea_.pointer(); }
+ char* &persistentInitializationArea()
{ return persistentInitializationArea_.pointer(); }
-#ifdef NA_64BIT
- // dg64 - Match ref type
- NA_EIDPROC Int32 &persistentLength() { return persistentLength_; }
-#else
- NA_EIDPROC Lng32 &persistentLength() { return persistentLength_; }
-#endif
- NA_EIDPROC void initializePersistentData() {
+ Int32 &persistentLength() { return persistentLength_; }
+ void initializePersistentData() {
str_cpy_all(persistentArea_,
persistentInitializationArea_,
persistentLength_);
}
- NA_EIDPROC void addPCodeMode(Int16 mode)
+ void addPCodeMode(Int16 mode)
{ pCodeMode_ |= mode; }
- NA_EIDPROC NABoolean pCodeSpecialFields() {
+ NABoolean pCodeSpecialFields() {
return (pCodeMode_ & PCODE_SPECIAL_FIELDS) != 0;
};
- NA_EIDPROC void setFixupConstsAndTemps(short v) {
+ void setFixupConstsAndTemps(short v) {
if (v != 0) flags_ |= FIXUP_CONSTS_AND_TEMPS;
else flags_ &= ~FIXUP_CONSTS_AND_TEMPS;
};
- NA_EIDPROC NABoolean getFixupConstsAndTemps() {
+ NABoolean getFixupConstsAndTemps() {
return ((flags_ & FIXUP_CONSTS_AND_TEMPS) != 0);
};
- NA_EIDPROC NABoolean generateNoPCode() {
+ NABoolean generateNoPCode() {
return ((flags_ & GENERATE_NO_PCODE) != 0);
}
- NA_EIDPROC void setGeneratePcode(short v) {
+ void setGeneratePcode(short v) {
if (v != 0) flags_ |= GENERATE_NO_PCODE;
else flags_ &= ~GENERATE_NO_PCODE;
}
- NA_EIDPROC NABoolean getPCodeGenCompile() {
+ NABoolean getPCodeGenCompile() {
return ((flags_ & PCODE_GEN_COMPILE) != 0);
}
- NA_EIDPROC void setPCodeGenCompile (short v) {
+ void setPCodeGenCompile (short v) {
if (v != 0)
flags_ |= PCODE_GEN_COMPILE;
else flags_ &= ~PCODE_GEN_COMPILE;
}
- NA_EIDPROC void setPCodeNative(NABoolean v) {
+ void setPCodeNative(NABoolean v) {
if (v) flags_ |= PCODE_EVAL_NATIVE;
else flags_ &= ~PCODE_EVAL_NATIVE;
};
- NA_EIDPROC NABoolean getPCodeNative() {
+ NABoolean getPCodeNative() {
return ((flags_ & PCODE_EVAL_NATIVE) != 0);
};
@@ -654,44 +649,44 @@ public:
flags_ &= ~PCODE_NE_IN_SHOWPLAN );
};
- NA_EIDPROC void setPCodeMoveFastpath(NABoolean v) {
+ void setPCodeMoveFastpath(NABoolean v) {
if (v) flags_ |= PCODE_MOVE_FASTPATH;
else flags_ &= ~PCODE_MOVE_FASTPATH;
};
- NA_EIDPROC NABoolean getPCodeMoveFastpath() {
+ NABoolean getPCodeMoveFastpath() {
return ((flags_ & PCODE_MOVE_FASTPATH) != 0);
};
- NA_EIDPROC void setForInsertUpdate(NABoolean value)
+ void setForInsertUpdate(NABoolean value)
{
if (value)
flags_ |= FOR_INSERT_UPDATE;
else
flags_ &= ~FOR_INSERT_UPDATE;
};
- NA_EIDPROC NABoolean forInsertUpdate() {
+ NABoolean forInsertUpdate() {
return ((flags_ & FOR_INSERT_UPDATE) != 0);
};
- NA_EIDPROC void setPCodeEvalAligned(NABoolean value)
+ void setPCodeEvalAligned(NABoolean value)
{
if (value)
flags_ |= PCODE_EVAL_ALIGNED;
else
flags_ &= ~PCODE_EVAL_ALIGNED;
};
- NA_EIDPROC NABoolean usePCodeEvalAligned() {
+ NABoolean usePCodeEvalAligned() {
return ((flags_ & PCODE_EVAL_ALIGNED) != 0);
};
- NA_EIDPROC void setHandleIndirectVC(NABoolean value) {
+ void setHandleIndirectVC(NABoolean value) {
if (value)
flags_ |= HANDLE_INDIRECT_VC;
else
flags_ &= ~HANDLE_INDIRECT_VC;
};
- NA_EIDPROC NABoolean handleIndirectVC() {
+ NABoolean handleIndirectVC() {
return ((flags_ & HANDLE_INDIRECT_VC) != 0);
};
@@ -704,7 +699,6 @@ public:
static void setNotValidateFloat64(UInt32 &f, NABoolean v)
{ ( v ? f |= NOT_VALIDATE_FLOAT64 : f &= ~NOT_VALIDATE_FLOAT64 );}
- NA_EIDPROC
static int formatARow2(const char** srcFldsPtr,
const int* srcFldsLength,
const int * srcFieldsConvIndex,
@@ -802,9 +796,6 @@ protected:
// heap will be set by the executor?
CollHeap *heap_;
-#ifndef NA_64BIT
- char fillerHeap_[4];
-#endif // 08-15
union // 16-19
{
@@ -812,19 +803,12 @@ protected:
PCode * pCodeObject_;
};
-#ifndef NA_64BIT
- char fillerPCodeObject_[4]; // 20-23
-#endif
-
PCodeSegmentPtr pCode_; // 24-31
ExClausePtr clauses_; // 32-39
// For error injection testing.
const ex_tcb *myTcb_;
-#ifndef NA_64BIT
- char fillerMyTcb_[4];
-#endif // 40-47
Int32 errorInjection_; // 48-51
Int32 warningInjection_; // 52-55
@@ -864,10 +848,6 @@ protected:
NExDbgInfo * NExDbgInfo_ ;
};
-#ifndef NA_64BIT
- char fillerEvalPtr_[4];
-#endif // 116-119
-
UInt32 pCodeMaxOptBrCnt_; // 120-123
UInt32 pCodeMaxOptInCnt_; // 124-127
@@ -878,7 +858,7 @@ protected:
// ---------------------------------------------------------------------
char fillers_[8]; // 128-135
- NA_EIDPROC void fixupNextClause();
+ void fixupNextClause();
};
@@ -887,7 +867,7 @@ protected:
// class AggrExpr
//////////////////////////////////////////////////
#pragma nowarn(1319) // warning elimination
-class SQLEXP_LIB_FUNC AggrExpr : public ex_expr {
+class AggrExpr : public ex_expr {
enum Flags {
ONE_ROW_AGGR = 0x0001
@@ -908,10 +888,8 @@ class SQLEXP_LIB_FUNC AggrExpr : public ex_expr {
char fillers_[12]; // 44-55
public:
-NA_EIDPROC
AggrExpr() : ex_expr(ex_expr::exp_AGGR), flags_(0) {}
-NA_EIDPROC
AggrExpr( ex_expr * init_expr,
ex_expr * perrec_expr,
ex_expr * final_expr,
@@ -927,31 +905,24 @@ NA_EIDPROC
flags_(0)
{}
-NA_EIDPROC ~AggrExpr() {}
+~AggrExpr() {}
ex_expr * perrecExpr() { return perrecExpr_;}
ex_expr * groupingExpr() { return groupingExpr_;}
-NA_EIDPROC
exp_return_type initializeAggr(atp_struct *);
-NA_EIDPROC
exp_return_type finalizeAggr(atp_struct *);
-NA_EIDPROC
exp_return_type finalizeNullAggr(atp_struct *);
exp_return_type evalGroupingForNull(Int16 startEntry, Int16 endEntry);
-NA_EIDPROC
virtual Long pack(void *);
-NA_EIDPROC
virtual Lng32 unpack(void *, void * reallocator);
-NA_EIDPROC
virtual exp_return_type fixup(Lng32, unsigned short, const ex_tcb * tcb,
ComSpace * space = 0,
CollHeap * exHeap = 0,
NABoolean computeSpaceOnly = FALSE,
ex_globals * glob = FALSE);
-NA_EIDPROC
virtual void displayContents(ComSpace * space, short mode, const char * displayStr,
ULng32 flag);
@@ -959,22 +930,22 @@ NA_EIDPROC
// ---------------------------------------------------------------------
// 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(1,getClassVersionID());
ex_expr::populateImageVersionIDArray();
}
- NA_EIDPROC virtual short getClassSize() { return (short)sizeof(*this); }
+ virtual short getClassSize() { return (short)sizeof(*this); }
// ---------------------------------------------------------------------
- NA_EIDPROC void setOneRowAggr() { flags_ |= ONE_ROW_AGGR; }
- NA_EIDPROC NABoolean isOneRowAggr()
+ void setOneRowAggr() { flags_ |= ONE_ROW_AGGR; }
+ NABoolean isOneRowAggr()
{ return( (flags_ & ONE_ROW_AGGR) != 0); }
};
#pragma warn(1319) // warning elimination
@@ -1043,15 +1014,14 @@ public:
void setCall(NABoolean flag) { isCall_ = (UInt32)flag; }
NABoolean isCall() { return (NABoolean)isCall_; }
- SQLEXP_LIB_FUNC InputOutputExpr()
+ InputOutputExpr()
: ex_expr(ex_expr::exp_INPUT_OUTPUT),
flags_(0), isCall_(0),
numEntries_(-1)
{}
- SQLEXP_LIB_FUNC InputOutputExpr(Generator * generator);
- NA_EIDPROC
- SQLEXP_LIB_FUNC ~InputOutputExpr() {}
+ InputOutputExpr(Generator * generator);
+ ~InputOutputExpr() {}
ex_expr::exp_return_type describeInput(void*, void*, UInt32);
ex_expr::exp_return_type describeOutput(void*, UInt32);
@@ -1062,14 +1032,14 @@ public:
Lng32 getMaxParamIdx();
- SQLEXP_LIB_FUNC ex_expr::exp_return_type inputSingleRowValue
+ ex_expr::exp_return_type inputSingleRowValue
(atp_struct*,
void*,
char*,
CollHeap *exHeap,
UInt32 flags);
- SQLEXP_LIB_FUNC ex_expr::exp_return_type inputRowwiseRowsetValues
+ ex_expr::exp_return_type inputRowwiseRowsetValues
(atp_struct*,
void*,
void*,
@@ -1077,98 +1047,98 @@ public:
CollHeap *exHeap,
UInt32 flags);
- SQLEXP_LIB_FUNC ex_expr::exp_return_type inputValues
+ ex_expr::exp_return_type inputValues
(atp_struct *atp,
void * inputDesc_,
NABoolean tolerateNonFatalError,
CollHeap * heap,
UInt32 flags);
- SQLEXP_LIB_FUNC ex_expr::exp_return_type outputValues(atp_struct*,
+ ex_expr::exp_return_type outputValues(atp_struct*,
void*,
CollHeap *exHeap,
UInt32 flags);
- SQLEXP_LIB_FUNC Lng32 getCompiledOutputRowsetSize(atp_struct *);
+ Lng32 getCompiledOutputRowsetSize(atp_struct *);
- SQLEXP_LIB_FUNC virtual Long pack(void *);
+ virtual Long pack(void *);
- SQLEXP_LIB_FUNC Lng32 getNumEntries(){
+ Lng32 getNumEntries(){
return numEntries_;
};
- SQLEXP_LIB_FUNC void setNumEntries(Lng32 entries){
+ void setNumEntries(Lng32 entries){
numEntries_ = entries;
};
- SQLEXP_LIB_FUNC NABoolean noEval()
+ NABoolean noEval()
{ return (flags_ & NO_EVAL) != 0; };
- SQLEXP_LIB_FUNC void setNoEval(NABoolean v)
+ void setNoEval(NABoolean v)
{ (v ? flags_ |= NO_EVAL : flags_ &= ~NO_EVAL); }
- SQLEXP_LIB_FUNC NABoolean skipTypeCheck()
+ NABoolean skipTypeCheck()
{ return (flags_ & SKIP_TYPE_CHECK) != 0; };
- SQLEXP_LIB_FUNC void setSkipTypeCheck(NABoolean v)
+ void setSkipTypeCheck(NABoolean v)
{ (v ? flags_ |= SKIP_TYPE_CHECK : flags_ &= ~SKIP_TYPE_CHECK); }
- SQLEXP_LIB_FUNC NABoolean restrictedSkipTypeCheck()
+ NABoolean restrictedSkipTypeCheck()
{ return (flags_ & RESTRICTED_SKIP_TYPE_CHECK) != 0; };
- SQLEXP_LIB_FUNC void setRestrictedSkipTypeCheck(NABoolean v)
+ void setRestrictedSkipTypeCheck(NABoolean v)
{ (v ? flags_ |= RESTRICTED_SKIP_TYPE_CHECK : flags_ &= ~RESTRICTED_SKIP_TYPE_CHECK); }
- SQLEXP_LIB_FUNC NABoolean isDBTR(UInt32 flags)
+ NABoolean isDBTR(UInt32 flags)
{ return (flags & IS_DBTR_) != 0; };
- SQLEXP_LIB_FUNC void setIsDBTR(UInt32 &flags, NABoolean v)
+ void setIsDBTR(UInt32 &flags, NABoolean v)
{ (v ? flags |= IS_DBTR_ : flags &= ~IS_DBTR_); }
- SQLEXP_LIB_FUNC NABoolean isODBC(UInt32 flags)
+ NABoolean isODBC(UInt32 flags)
{ return (flags & IS_ODBC_) != 0; };
- SQLEXP_LIB_FUNC void setIsODBC(UInt32 &flags, NABoolean v)
+ void setIsODBC(UInt32 &flags, NABoolean v)
{ (v ? flags |= IS_ODBC_ : flags &= ~IS_ODBC_); }
- SQLEXP_LIB_FUNC NABoolean isRWRS(UInt32 flags)
+ NABoolean isRWRS(UInt32 flags)
{ return (flags & IS_RWRS_) != 0; };
- SQLEXP_LIB_FUNC void setIsRWRS(UInt32 &flags, NABoolean v)
+ void setIsRWRS(UInt32 &flags, NABoolean v)
{ (v ? flags |= IS_RWRS_ : flags &= ~IS_RWRS_); }
- SQLEXP_LIB_FUNC NABoolean isInternalFormatIO(UInt32 flags)
+ NABoolean isInternalFormatIO(UInt32 flags)
{ return (flags & INTERNAL_FORMAT_IO_) != 0; };
- SQLEXP_LIB_FUNC void setInternalFormatIO(UInt32 &flags, NABoolean v)
+ void setInternalFormatIO(UInt32 &flags, NABoolean v)
{ (v ? flags |= INTERNAL_FORMAT_IO_ : flags &= ~INTERNAL_FORMAT_IO_); }
- SQLEXP_LIB_FUNC NABoolean noDatetimeValidation()
+ NABoolean noDatetimeValidation()
{ return ((flags_ & NO_DATETIME_VALIDATION) != 0); };
- SQLEXP_LIB_FUNC void setNoDatetimeValidation(NABoolean v)
+ void setNoDatetimeValidation(NABoolean v)
{ (v) ? flags_ |= NO_DATETIME_VALIDATION : flags_ &= ~NO_DATETIME_VALIDATION; }
// ---------------------------------------------------------------------
// Redefinition of methods inherited from NAVersionedObject.
// ---------------------------------------------------------------------
- SQLEXP_LIB_FUNC virtual unsigned char getClassVersionID()
+ virtual unsigned char getClassVersionID()
{
return 1;
}
- SQLEXP_LIB_FUNC virtual void populateImageVersionIDArray()
+ virtual void populateImageVersionIDArray()
{
setImageVersionID(1,getClassVersionID());
ex_expr::populateImageVersionIDArray();
}
- SQLEXP_LIB_FUNC virtual short getClassSize() { return (short)sizeof(*this); }
+ virtual short getClassSize() { return (short)sizeof(*this); }
- SQLEXP_LIB_FUNC void setupBulkMoveInfo(void * desc_, CollHeap * heap,
+ void setupBulkMoveInfo(void * desc_, CollHeap * heap,
NABoolean isInputDesc,
UInt32 flags);
- SQLEXP_LIB_FUNC ex_expr::exp_return_type doBulkMove(atp_struct * atp,
+ ex_expr::exp_return_type doBulkMove(atp_struct * atp,
void * desc_,
char * tgtRowPtr,
NABoolean isInputDesc);
@@ -1182,7 +1152,7 @@ public:
// For datetime and interval types, a detailed compatibility
// (matching qualifiers) is done later at conversion time.
/////////////////////////////////////////////////////////////////////
- static SQLEXP_LIB_FUNC NABoolean areCompatible(short source, short target)
+ static NABoolean areCompatible(short source, short target)
{
if ((((source >= REC_MIN_NUMERIC) && (source <= REC_MAX_NUMERIC)) &&
((target >= REC_MIN_NUMERIC) && (target <= REC_MAX_NUMERIC))) ||
@@ -1199,7 +1169,7 @@ public:
return FALSE;
}
- static SQLEXP_LIB_FUNC NABoolean implicitConversionSupported(short source, short target)
+ static NABoolean implicitConversionSupported(short source, short target)
{
if ((((source >= REC_MIN_CHARACTER) && (source <= REC_MAX_CHARACTER)) &&
((target == REC_DATETIME) || ((target >= REC_MIN_BINARY) && (target <= REC_MAX_BINARY)))) ||
@@ -1210,7 +1180,7 @@ public:
return FALSE;
}
- SQLEXP_LIB_FUNC NABoolean isExactNumeric(short type)
+ NABoolean isExactNumeric(short type)
{
if ((type >= REC_MIN_BINARY) && (type <= REC_MAX_BINARY) ||
(type >= REC_MIN_DECIMAL) && (type <= REC_MAX_DECIMAL))
@@ -1224,7 +1194,7 @@ public:
};
-class SQLEXP_LIB_FUNC ex_expr_lean : public ex_expr
+class ex_expr_lean : public ex_expr
{
friend class ex_expr;
// Int32 pCodeSize_;
@@ -1240,28 +1210,28 @@ public:
// computeSpaceOnly: if TRUE, then compute space requirement only.
// Do not make any changes to the generated expressions,
// (like assigning tempsArea, assigning generated pcode, etc).
- NA_EIDPROC virtual exp_return_type fixup(Lng32, unsigned short,
+ virtual exp_return_type fixup(Lng32, unsigned short,
const ex_tcb * tcb,
ComSpace * space = 0,
CollHeap * exHeap = 0,
NABoolean computeSpaceOnly = FALSE);
- NA_EIDPROC virtual Long pack(void *);
- NA_EIDPROC virtual Lng32 unpack(void *, void * reallocator);
+ virtual Long pack(void *);
+ virtual Lng32 unpack(void *, void * reallocator);
void convAddrToOffsetInPCode(void * space);
void convOffsetToAddrInPCode(void* base);
- NA_EIDPROC virtual void displayContents(ComSpace * space, short mode,
+ virtual void displayContents(ComSpace * space, short mode,
const char * displayStr,
ULng32 flag = 0x00000006);
- // NA_EIDPROC Int32 *getMyPCode()
+ // Int32 *getMyPCode()
// {
// return &pCodeLean_[1];
// }
- NA_EIDPROC Int32 getPCodeSize()
+ Int32 getPCodeSize()
{
return pCodeLean_[0];
// return pCodeSize_;
@@ -1290,17 +1260,10 @@ template <class t> class Target {
public:
t operator=(t source)
{
- t *targetBuffer;
-#if defined( NA_SHADOWCALLS )
- targetBuffer = (t *)SqlCliSp_GetBufPtr((char *)this, false);
-#else
- targetBuffer = (t *)this;
-#endif
- *targetBuffer = source;
-#if defined( NA_SHADOWCALLS )
- SqlCliSp_SetWriteLength((char *)this, sizeof(source));
-#endif
- return source;
+ t *targetBuffer;
+ targetBuffer = (t *)this;
+ *targetBuffer = source;
+ return source;
}
};
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/exp/exp_fixup.cpp
----------------------------------------------------------------------
diff --git a/core/sql/exp/exp_fixup.cpp b/core/sql/exp/exp_fixup.cpp
index 66d1a19..7cb9330 100644
--- a/core/sql/exp/exp_fixup.cpp
+++ b/core/sql/exp/exp_fixup.cpp
@@ -47,7 +47,6 @@
__declspec(dllimport) NABoolean ExExprComputeSpace(ex_tcb * tcb);
-NA_EIDPROC
static void getCaseDatatypes(short attr_type1, Lng32 attr_len1, short &type_op1,
short attr_type2, Lng32 attr_len2, short &type_op2,
Lng32 scaleDifference)
@@ -167,7 +166,6 @@ static void getCaseDatatypes(short attr_type1, Lng32 attr_len1, short &type_op1,
} // end if type_op2 is an interval
}
-NA_EIDPROC
static void getConvCaseDatatypes(short attr_type1, Lng32 attr_len1, short &type_op1,
short attr_type2, Lng32 attr_len2, short &type_op2,
Lng32 scaleDifference)
@@ -1987,44 +1985,3 @@ ex_expr::exp_return_type ex_conv_clause::fixup(Space * space,
persistentArea,
fixupConstsAndTemps, spaceCompOnly);
}
-
-ex_expr::exp_return_type ExAuditImage::fixup(Space * space,
- CollHeap * exHeap,
- char * constantsArea,
- char * tempsArea,
- char * persistentArea,
- short fixupFlag,
- NABoolean spaceCompOnly)
-{
-
- ex_expr::exp_return_type retcode;
-
- assert ( auditImageContainerExpr_ != (ExpDP2ExprPtr) NULL );
- ex_expr * auditRowImageExpr = (ex_expr *)auditImageContainerExpr_->getExpr();
-
- assert (auditRowImageExpr != NULL);
-
- retcode = auditRowImageExpr->fixup(0, // base is really not use. so set it to zero.
- ex_expr::PCODE_NONE,
- // The ExpressionMode enumeration specifies
- // the type of PCODE to generate at expression
- // fixup time. Also,
- // config's for error injection at fixup time.
- NULL, // tcb. For error injection testing.
- // We porbably don't need it, so setting it to NULL
- space,
- exHeap,
- spaceCompOnly, // computeSpaceOnly: if TRUE, then compute space
- // requirement only. Do not make any changes to the
- // generated expressions,(like assigning tempsArea
- // , assigning generated pcode, etc).
- NULL);
-
- if (retcode != ex_expr::EXPR_OK)
- return retcode;
-
-
- return ex_clause::fixup(space, exHeap, constantsArea,tempsArea,
- persistentArea, fixupFlag, spaceCompOnly);
-}
-
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/exp/exp_function.cpp
----------------------------------------------------------------------
diff --git a/core/sql/exp/exp_function.cpp b/core/sql/exp/exp_function.cpp
index 47e17e0..9b9a407 100644
--- a/core/sql/exp/exp_function.cpp
+++ b/core/sql/exp/exp_function.cpp
@@ -122,10 +122,8 @@ Section missing, generate compiler error
extern char * exClauseGetText(OperatorTypeEnum ote);
-NA_EIDPROC
void setVCLength(char * VCLen, Lng32 VCLenSize, ULng32 value);
-NA_EIDPROC
static void ExRaiseJSONError(CollHeap* heap, ComDiagsArea** diagsArea, JsonReturnType type);
@@ -213,7 +211,6 @@ ExPAGroup::ExPAGroup(){};
ExFunctionPack::ExFunctionPack(){};
ExUnPackCol::ExUnPackCol(){};
ExFunctionRangeLookup::ExFunctionRangeLookup(){};
-ExAuditImage::ExAuditImage(){};
ExFunctionCrc32::ExFunctionCrc32(){};
ExFunctionMd5::ExFunctionMd5(){};
ExFunctionSha::ExFunctionSha(){};
@@ -932,15 +929,6 @@ ExFunctionRangeLookup::ExFunctionRangeLookup(Attributes** attr,
{
}
-ExAuditImage::ExAuditImage(Attributes** attr,
- Space* space,
- ExpDP2ExprPtr auditImageContainerExpr
- )
- : ex_function_clause(ITM_AUDIT_IMAGE, 2, attr, space),
- auditImageContainerExpr_(auditImageContainerExpr)
-{
-}
-
ex_expr::exp_return_type ex_function_concat::eval(char *op_data[],
CollHeap *heap,
ComDiagsArea** diagsArea)
@@ -1976,7 +1964,6 @@ ex_expr::exp_return_type ExFunctionChar::eval(char *op_data[],CollHeap* heap,
// in multi-byte form (i.e. in big-endian order).
if (getOperType() == ITM_NCHAR_MP_CHAR)
{
-//SQ_LINUX #ifdef NA_WINNT
*(NAWchar*)op_data[0] = reversebytesUS(wcharCode);
} else
*(NAWchar*)op_data[0] = wcharCode;
@@ -2359,7 +2346,6 @@ ex_expr::exp_return_type ex_function_position_doublebyte::eval(char *op_data[],
return ex_expr::EXPR_OK;
};
// LCOV_EXCL_START
-NA_EIDPROC
static Lng32 findTokenPosition(char * sourceStr, Lng32 sourceLen,
char * searchStr, Lng32 searchLen,
short bytesPerChar)
@@ -2673,7 +2659,6 @@ ex_expr::exp_return_type ex_function_converttimestamp::eval(char *op_data[],
Int64 juliantimestamp;
str_cpy_all((char *) &juliantimestamp, op_data[1], sizeof(juliantimestamp));
const Int64 minJuliantimestamp = (Int64) 1487311632 * (Int64) 100000000;
-//SQ_LINUX #ifndef NA_HSC
const Int64 maxJuliantimestamp = (Int64) 2749273487LL * (Int64) 100000000 +
(Int64) 99999999;
if ((juliantimestamp < minJuliantimestamp) ||
@@ -3112,7 +3097,6 @@ short exp_function_get_user(
short result = FEOK;
Int32 lActualLen = 0;
-#if !defined (__EID)
Int32 userID;
if (userType == ITM_SESSION_USER)
@@ -3135,7 +3119,6 @@ short exp_function_get_user(
}
else
result = FEBUFTOOSMALL;
-#endif
if (((result == FEOK) || (result == FEBUFTOOSMALL)) && actualLength)
*actualLength = lActualLen;
@@ -4463,7 +4446,6 @@ ULng32 ex_function_hash::HashHash(ULng32 inValue) {
register ULng32 u, v, c, d, k0;
ULng32 a1, a2, b1, b2;
-//SQ_LINUX #ifndef NA_HSC
ULng32 c1 = (ULng32)5233452345LL;
ULng32 c2 = (ULng32)8578458478LL;
ULng32 d1 = 1862598173LL;
@@ -5200,7 +5182,7 @@ ex_expr::exp_return_type ExFunctionShift::eval(char *op_data[],
return ex_expr::EXPR_OK;
}
// LCOV_EXCL_STOP
-NA_EIDPROC static
+static
ex_expr::exp_return_type getDoubleValue(double *dest,
char *source,
Attributes *operand,
@@ -5218,7 +5200,7 @@ ex_expr::exp_return_type getDoubleValue(double *dest,
}
-NA_EIDPROC static
+static
ex_expr::exp_return_type setDoubleValue(char *dest,
Attributes *operand,
double *source,
@@ -5987,7 +5969,7 @@ void ExFunctionRandomNum::initSeed(char *op_data[])
}
-NA_EIDPROC void ExFunctionRandomNum::genRand(char *op_data[])
+void ExFunctionRandomNum::genRand(char *op_data[])
{
// Initialize seed if not already done
initSeed(op_data);
@@ -7108,7 +7090,7 @@ ExFunctionHbaseColumnsDisplay::eval(char *op_data[], CollHeap *heap,
}
}
- // store the audit row image length in the varlen indicator.
+ // store the row length in the varlen indicator.
getOperand(0)->setVarLength((result-resultStart), op_data[-MAX_OPERANDS]);
return ex_expr::EXPR_OK;
@@ -7265,78 +7247,6 @@ ExFunctionHbaseVersion::eval(char *op_data[], CollHeap *heap,
return ex_expr::EXPR_OK;
}
-/////////////////////////////////////////////////////////////////
-// ExAuditImage::eval()
-// The ExAuditImage clause evaluates the auditRowImageExpr_ and
-// stores the result from it into the result of ExAuditImage.
-// auditRowImageExpr_ constructs the audit row image in SQLMX_FORMAT.
-/////////////////////////////////////////////////////////////////
-ex_expr::exp_return_type
-ExAuditImage::eval(char *op_data[], CollHeap *heap,
- ComDiagsArea **diagsArea)
-{
- // op_data[0] points to result. The result is a varchar.
- Attributes *resultAttr = getOperand(0);
-
- // This cri desc generated at codeGen() time to generate audit row image
- // has 3 entries: 0, for consts. 1, for temps.
- // 2, for the audit row image.
- // 3, where the input tuple in EXPLODED format will be available.
- ex_cri_desc * auditImageWorkCriDesc = auditImageContainerExpr_->criDesc();
-
- short auditImageAtpIndex = 2; // where audit row image will be built
-
- //Allocate ATP to evaluate the auditRowImageExpr_
- atp_struct *auditImageWorkAtp = auditImageContainerExpr_->getWorkAtp();
-
- // Set the data pointer to point to the resultAttr's data space.
- auditImageWorkAtp->getTupp(auditImageAtpIndex).setDataPointer(op_data[0]);
-
- ex_expr * auditRowImageExpr = (ex_expr *)auditImageContainerExpr_->getExpr();
-
-
- Attributes *inputs = getOperand(1);
-
- // set the inputs tuple to point to the temp tuple
- short inputsAtpIndex = 3; // where the inputs to audit row image
- // is available.
-
- auditImageWorkAtp->getTupp(inputsAtpIndex).setDataPointer(op_data[1]);
-
-
- // Setting the auditRowImageLength to the length from the tuple descriptor.
- // This length is computed during compile time.
- // For a row with variable length field(s), the eval() method re-calculates
- // the row length and modifies the auditRowImageLength variable.
- ULng32 auditRowImageLength = auditImageWorkCriDesc->getTupleDescriptor(auditImageAtpIndex)->tupleDataLength();
-
- ex_expr::exp_return_type retCode = ex_expr::EXPR_OK;
-
- retCode = auditRowImageExpr->eval(auditImageWorkAtp, // Input - atp1
- 0, // None - atp2
- NULL, // heap
- -1, // datalen
- &auditRowImageLength // Output
- );
-
- if (retCode == ex_expr::EXPR_ERROR)
- {
- *diagsArea = auditImageWorkAtp->getDiagsArea();
- ExRaiseFunctionSqlError(heap, diagsArea, EXE_AUDIT_IMAGE_EXPR_EVAL_ERROR,
- derivedFunction(),
- origFunctionOperType());
-
- return retCode;
- }
-
- // store the audit row image length in the varlen indicator.
- getOperand(0)->setVarLength(auditRowImageLength, op_data[-MAX_OPERANDS]);
-
- return ex_expr::EXPR_OK;
-}
-
-
-
////////////////////////////////////////////////////////////////////
//
// decodeKeyValue
@@ -7761,7 +7671,6 @@ short ex_function_encode::decodeKeyValue(Attributes * attr,
return 0;
}
-NA_EIDPROC
static Lng32 convAsciiLength(Attributes * attr)
{
Lng32 d_len = 0;
@@ -7902,65 +7811,6 @@ static Lng32 convAsciiLength(Attributes * attr)
return d_len;
}
-// LCOV_EXCL_START
-// This is a function clause used by INTERPRET_AS_ROW to extract specific
-// columns as specified by an extraction column list from an audit row image
-// (compressed or uncompressed). The input to this function is an audit row
-// image, possibly a modified field map (for compressed audit), and a list
-// of columns to extract. The output is a tuple in exploded format made up of
-// the extracted columns.
-ExFunctionExtractColumns::ExFunctionExtractColumns
- (OperatorTypeEnum operType,
- short numOperands,
- Attributes ** attr,
- Space *space,
- UInt32 compressedAudit,
- ULng32 *extractColList,
- ULng32 encodedKeyLength,
- ExpTupleDesc *auditImageTupleDesc,
- ExpTupleDesc *extractedRowTupleDesc)
- : ex_function_clause(operType, numOperands, attr, space)
-{
- if (numOperands == 2)
- flags_.mfMapIsNullConst_ = 1;
- flags_.auditCompressionFlag_ = compressedAudit;
- extractColList_ = (Lng32 *)extractColList;
- numColsToExtract_ = extractedRowTupleDesc->numAttrs();
- auditRowImageDesc_ = auditImageTupleDesc;
- extractedRowDesc_ = extractedRowTupleDesc;
- encodedKeyLen_ = encodedKeyLength;
-}
-
-ExFunctionExtractColumns::ExFunctionExtractColumns(void)
-{
-}
-
-// This is the function that does the bulk of the work of extracting
-// columns from an audit row image (compressed or uncompressed) as part
-// of the work done by the function INTERPRET_AS_ROW.
-ex_expr::exp_return_type ExFunctionExtractColumns::eval(char * op_data[],
- CollHeap *heap,
- ComDiagsArea **diags)
-{
- return ex_expr::EXPR_ERROR;
-}
-
-Long ExFunctionExtractColumns::pack (void * space)
-{
- auditRowImageDesc_.pack(space);
- extractedRowDesc_.pack(space);
- extractColList_.pack(space);
- return packClause(space, sizeof(ExFunctionExtractColumns));
-}
-
-Lng32 ExFunctionExtractColumns::unpack (void * base, void * reallocator)
-{
- if (auditRowImageDesc_.unpack(base, reallocator)) return -1;
- if (extractedRowDesc_.unpack(base, reallocator)) return -1;
- if (extractColList_.unpack(base)) return -1;
- return unpackClause(base, reallocator);
-}
-
//helper function, convert a string into IPV4 , if valid, it can support leading and padding space
static Lng32 string2ipv4(char *srcData, Lng32 slen, unsigned int *inet_addr)
{
[06/30] incubator-trafodion git commit: TRAFODION-2731 CodeCleanup:
Remove obsolete, legacy and unused code
Posted by an...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/exp/exp_interval.h
----------------------------------------------------------------------
diff --git a/core/sql/exp/exp_interval.h b/core/sql/exp/exp_interval.h
index 420f48b..4096b3f 100644
--- a/core/sql/exp/exp_interval.h
+++ b/core/sql/exp/exp_interval.h
@@ -43,25 +43,21 @@
#include "exp_attrs.h"
#include "dfs2rec.h"
-class SQLEXP_LIB_FUNC ExpInterval : public SimpleType {
+class ExpInterval : public SimpleType {
public:
-NA_EIDPROC
static short getIntervalStartField(Lng32 fsDatatype,
rec_datetime_field &startField);
-NA_EIDPROC
static short getIntervalEndField(Lng32 fsDatatype,
rec_datetime_field &endField);
-NA_EIDPROC
static Lng32 getStorageSize(rec_datetime_field startField,
UInt32 leadingPrecision,
rec_datetime_field endField,
UInt32 fractionPrecision = 0);
-NA_EIDPROC
static Lng32 getDisplaySize(Lng32 fsDatatype,
short leadingPrecision,
short fractionPrecision);
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/exp/exp_like.h
----------------------------------------------------------------------
diff --git a/core/sql/exp/exp_like.h b/core/sql/exp/exp_like.h
index 2c4f902..bd5a69d 100644
--- a/core/sql/exp/exp_like.h
+++ b/core/sql/exp/exp_like.h
@@ -44,13 +44,12 @@
#include "csconvert.h"
#include "NLSConversion.h"
-class SQLEXP_LIB_FUNC LikePatternString : public NABasicObject
+class LikePatternString : public NABasicObject
{
public:
//
// Constructor.
//
-NA_EIDPROC
LikePatternString
( const char* pattern
, UInt16 patternLen
@@ -75,14 +74,12 @@ NA_EIDPROC
, underscoreChar_len_(underscoreChar_len)
{}
-NA_EIDPROC
~LikePatternString() {}
//
// Accessor functions.
//
CharInfo::CharSet getPatternCharSet() const { return patternCS_ ; }
-NA_EIDPROC
UInt16 getLength() const { return patternLen_; }
private:
const char* pattern_;
@@ -100,14 +97,13 @@ private:
};
-class SQLEXP_LIB_FUNC LikePatternStringIterator
+class LikePatternStringIterator
{
public:
//
// Construct an iterator that points to the first character in the given
// pattern.
//
-NA_EIDPROC
LikePatternStringIterator
( const LikePatternString& pattern
)
@@ -116,7 +112,6 @@ NA_EIDPROC
{
determineCharType();
}
-NA_EIDPROC
~LikePatternStringIterator() {}
//
// Determine the current character's classification.
@@ -128,7 +123,6 @@ NA_EIDPROC
, PERCENT
, CharType_ERROR
};
-NA_EIDPROC
void determineCharType()
{
if (currentChar_ >= pattern_.endOfPattern_)
@@ -165,16 +159,13 @@ NA_EIDPROC
//
// Accessor functions.
//
-NA_EIDPROC
operator CharType() const { return charType_; }
-NA_EIDPROC
const char* getCurrentChar()
{
return currentChar_;
}
-NA_EIDPROC
Int16 getChar(char* ch) const
{
Int16 chrLen = pattern_.bytesPerChar_;
@@ -198,13 +189,11 @@ NA_EIDPROC
return( chrLen );
}
-NA_EIDPROC
UInt16 getBytesPerChar() const { return pattern_.bytesPerChar_; }
//
// Return TRUE if the current character is equal to the given character.
//
-NA_EIDPROC
NABoolean thisCharIsEqualTo(const char* ch, const UInt16 ch_len) const
{
if ( currentChar_ + ch_len > pattern_.endOfPattern_ )
@@ -218,7 +207,6 @@ NA_EIDPROC
// Advance to the next character in the pattern.
//
-NA_EIDPROC
void operator += (Int32 numBytesToAdd)
{
currentChar_ += numBytesToAdd;
@@ -310,13 +298,12 @@ LikePatternString "%%ABC__%%%DEF%" is represented as:
******************************************************************************/
-class SQLEXP_LIB_FUNC LikePatternClause : public NABasicObject
+class LikePatternClause : public NABasicObject
{
public:
//
// Constructor.
//
-NA_EIDPROC
LikePatternClause
( LikePatternStringIterator::CharType charType
, char* patternBuf
@@ -330,30 +317,22 @@ NA_EIDPROC
, encodedPattern_(NULL)
{}
-NA_EIDPROC
~LikePatternClause() {}
//
// Accessor functions.
//
-NA_EIDPROC
LikePatternStringIterator::CharType getType() const { return charType_; }
-NA_EIDPROC
char* getPattern() const { return pattern_; }
-NA_EIDPROC
UInt16 getLength() const { return length_; }
-NA_EIDPROC
void setLength(UInt16 length)
{ length_ = length; }
-NA_EIDPROC
LikePatternClause* getNextClause() const { return nextClause_; }
-NA_EIDPROC
LikePatternClause* getPreviousClause() const { return previousClause_; }
//
// Set the clause's character classification. It indicates the type of
// character that will be stored in the clause.
//
-NA_EIDPROC
void setType(LikePatternStringIterator::CharType charType)
{
charType_ = charType;
@@ -361,7 +340,6 @@ NA_EIDPROC
//
// Append the given character to the clause.
//
-NA_EIDPROC
void append(const LikePatternStringIterator& i)
{
length_ += i.getChar(getPattern() + getLength());
@@ -369,7 +347,6 @@ NA_EIDPROC
//
// Append the given clause to the current clause.
//
-NA_EIDPROC
void append(LikePatternClause* clause)
{
nextClause_ = clause;
@@ -378,22 +355,17 @@ NA_EIDPROC
//
// Return TRUE if the clause matches the given text.
//
-NA_EIDPROC
NABoolean matches(const char* text);
-NA_EIDPROC
CharInfo::Collation getCollation() const
{ return co_; }
-NA_EIDPROC
void setCollation(CharInfo::Collation collation)
{ co_ = collation; }
-NA_EIDPROC
unsigned char* getEncodedPattern()
{ return encodedPattern_; }
-NA_EIDPROC
void setEncodedPattern(unsigned char* encodedPattern)
{ encodedPattern_ = encodedPattern; }
@@ -415,13 +387,12 @@ private:
};
-class SQLEXP_LIB_FUNC LikePatternHeader : public LikePatternClause
+class LikePatternHeader : public LikePatternClause
{
public:
//
// Constructor.
//
-NA_EIDPROC
LikePatternHeader
( LikePatternStringIterator::CharType charType
, char* patternBuf
@@ -440,7 +411,6 @@ NA_EIDPROC
//
// Destructor.
//
-NA_EIDPROC
~LikePatternHeader()
{
// If we have allocated space for encodedHeader, deallocate it.
@@ -459,21 +429,15 @@ NA_EIDPROC
//
// Accessor functions.
//
-NA_EIDPROC
LikePatternClause* getLastClause() const { return lastClause_; }
-NA_EIDPROC
UInt16 getLength() const { return length_; }
-NA_EIDPROC
UInt16 getClauseLength() const
{ return ((LikePatternClause *)this)->getLength(); }
-NA_EIDPROC
LikePatternHeader* getNextHeader() const { return nextHeader_; }
-NA_EIDPROC
CollHeap* getExHeap() const { return exHeap_; }
//
// Append the given character to the header.
//
-NA_EIDPROC
void append(const LikePatternStringIterator& i)
{
if (i != getLastClause()->getType()) {
@@ -487,7 +451,6 @@ NA_EIDPROC
//
// Append a new clause to the header.
//
-NA_EIDPROC
void addNewClause(LikePatternStringIterator::CharType charType)
{
length_ += getLastClause()->getLength();
@@ -500,7 +463,6 @@ NA_EIDPROC
// Terminate the clause chain with a NULL pointer and compute the header
// length.
//
-NA_EIDPROC
void endClauses()
{
length_ += getLastClause()->getLength();
@@ -508,32 +470,25 @@ NA_EIDPROC
//
// Append the given header to the current header.
//
-NA_EIDPROC
void append(LikePatternHeader* header) { nextHeader_ = header; }
//
// Return TRUE if the header matches the beginning of the given text.
//
-NA_EIDPROC
NABoolean matches(const char* text,
Int32 &headerMatchLen,
CharInfo::CharSet cs = CharInfo::ISO88591);
-NA_EIDPROC
NABoolean matchesR(const char* text, const char* &endText,
CharInfo::CharSet cs = CharInfo::ISO88591);
-NA_EIDPROC
ExeErrorCode error() const { return error_; }
-NA_EIDPROC
void setError(ExeErrorCode exeErrorCode)
{ error_ = exeErrorCode; }
-NA_EIDPROC
unsigned char* getEncodedHeader()
{ return encodedHeader_; }
-NA_EIDPROC
void setEncodedHeader(unsigned char *encodedHeader)
{ encodedHeader_ = encodedHeader; }
@@ -551,13 +506,12 @@ private:
};
-class SQLEXP_LIB_FUNC LikePattern : public LikePatternHeader
+class LikePattern : public LikePatternHeader
{
public:
//
// Constructor.
//
-NA_EIDPROC
LikePattern
( const LikePatternString& pattern
, CollHeap* exHeap
@@ -567,17 +521,14 @@ NA_EIDPROC
//
// Destructor.
//
-NA_EIDPROC
~LikePattern();
//
// Return TRUE if the pattern is invalid.
//
-NA_EIDPROC
ExeErrorCode error() const { return error_; }
//
// Return TRUE if the pattern matches the given text string.
//
-NA_EIDPROC
NABoolean matches(const char* text, UInt16 textLen,
CharInfo::CharSet cs = CharInfo::ISO88591);
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/exp/exp_math_func.cpp
----------------------------------------------------------------------
diff --git a/core/sql/exp/exp_math_func.cpp b/core/sql/exp/exp_math_func.cpp
index b4c9778..3ef09ca 100644
--- a/core/sql/exp/exp_math_func.cpp
+++ b/core/sql/exp/exp_math_func.cpp
@@ -76,14 +76,12 @@
#define HUGE_VAL_REAL64 1.15792089237316192E+77
#define HUGE_VAL_INT64 0777777777777777777777
-NA_EIDPROC
ex_expr::exp_return_type convInt64ToDec(char *target,
Lng32 targetLen,
Int64 source,
CollHeap *heap,
ComDiagsArea** diagsArea);
-NA_EIDPROC
ex_expr::exp_return_type convDoubleToBigNum(char *target,
Lng32 targetLen,
Lng32 targetType,
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/exp/exp_math_func.h
----------------------------------------------------------------------
diff --git a/core/sql/exp/exp_math_func.h b/core/sql/exp/exp_math_func.h
index e83da65..ccf300b 100644
--- a/core/sql/exp/exp_math_func.h
+++ b/core/sql/exp/exp_math_func.h
@@ -44,49 +44,45 @@
#pragma warning ( disable : 4251 )
-class SQLEXP_LIB_FUNC ex_function_abs : public ex_function_clause {
+class ex_function_abs : public ex_function_clause {
public:
-NA_EIDPROC
ex_function_abs(OperatorTypeEnum oper_type,
Attributes ** attr, Space * space)
: ex_function_clause(oper_type, 2, attr, space)
{};
-NA_EIDPROC
ex_function_abs()
{
};
-NA_EIDPROC
ex_expr::exp_return_type eval(char *op_data[],
CollHeap*,
ComDiagsArea** diagsArea = 0);
// Display
//
- NA_EIDPROC virtual void displayContents(Space * space, const char * displayStr,
+ virtual void displayContents(Space * space, const char * displayStr,
Int32 clauseNum, char * constsArea);
// ---------------------------------------------------------------------
// 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 ExFunctionBitOper : public ex_function_clause {
+class ExFunctionBitOper : public ex_function_clause {
public:
-NA_EIDPROC
ExFunctionBitOper(OperatorTypeEnum oper_type, short numOperands,
Attributes ** attr, Space * space)
: ex_function_clause(oper_type, numOperands, attr, space)
@@ -94,44 +90,41 @@ NA_EIDPROC
setType(ex_clause::MATH_FUNCTION_TYPE);
};
- NA_EIDPROC
ExFunctionBitOper()
{
};
- 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*,
ComDiagsArea** diagsArea = 0);
// Display
//
- NA_EIDPROC virtual void displayContents(Space * space, const char * displayStr,
+ virtual void displayContents(Space * space, const char * displayStr,
Int32 clauseNum, char * constsArea);
// ---------------------------------------------------------------------
// 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 ExFunctionMath : public ex_function_clause {
+class ExFunctionMath : public ex_function_clause {
public:
-NA_EIDPROC
ExFunctionMath(OperatorTypeEnum oper_type, short numOperands,
Attributes ** attr, Space * space)
: ex_function_clause(oper_type, numOperands, attr, space)
@@ -139,43 +132,40 @@ NA_EIDPROC
setType(ex_clause::MATH_FUNCTION_TYPE);
};
-NA_EIDPROC
ExFunctionMath()
: ex_function_clause()
{
};
-NA_EIDPROC
ex_expr::exp_return_type eval(char *op_data[],
CollHeap*,
ComDiagsArea** diagsArea = 0);
-NA_EIDPROC
ex_expr::exp_return_type evalUnsupportedOperations(char *op_data[],
CollHeap *heap,
ComDiagsArea** diagsArea);
// Display
//
- NA_EIDPROC virtual void displayContents(Space * space, const char * displayStr,
+ virtual void displayContents(Space * space, const char * displayStr,
Int32 clauseNum, char * constsArea);
// ---------------------------------------------------------------------
// 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); }
// ---------------------------------------------------------------------
};
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/exp/exp_space.cpp
----------------------------------------------------------------------
diff --git a/core/sql/exp/exp_space.cpp b/core/sql/exp/exp_space.cpp
index 75ac872..a50915e 100644
--- a/core/sql/exp/exp_space.cpp
+++ b/core/sql/exp/exp_space.cpp
@@ -36,9 +36,7 @@
#include <limits.h>
-#ifndef __EID
#include <stdlib.h>
-#endif
#include "NAAssert.h"
#include "exp_space.h"
@@ -62,9 +60,6 @@ Space::~Space()
Block * currBlock = firstBlock_;
switch (type_)
{
- case DP2_SPACE:
- break;
-
case EXECUTOR_SPACE:
{
// later change it to deallocate from executor segment. TBD.
@@ -72,10 +67,7 @@ Space::~Space()
{
Block * nextBlock = currBlock->getNext();
-#ifndef __EID
free(currBlock);
-
-#endif
currBlock = nextBlock;
}
}
@@ -87,10 +79,7 @@ Space::~Space()
{
Block * nextBlock = currBlock->getNext();
-#ifndef __EID
free(currBlock);
-
-#endif
currBlock = nextBlock;
}
}
@@ -105,10 +94,6 @@ Lng32 Space::defaultBlockSize(SpaceType type)
// use default size
switch (type)
{
- case DP2_SPACE:
- block_size = DP2_BLOCK_MAX_SIZE;
- break;
-
case EXECUTOR_SPACE:
block_size = EXECUTOR_BLOCK_MAX_SIZE;
break;
@@ -141,35 +126,11 @@ Block * Space::allocateBlock(SpaceType type, Lng32 in_block_size)
switch (type)
{
- case DP2_SPACE:
- {
-#ifdef __EID
- short rc;
- Lng32 memaddr;
-
- rc = DP2_EXECUTOR_ADD_MEMORY (block_size,
- &memaddr);
-
- block_ptr = (char *)memaddr + sizeof(SSCB_Buffer_Struct);
- data_ptr
- = (char *)(memaddr + sizeof(SSCB_Buffer_Struct) +
- ((((sizeof(Block)-1)/8)+1)*8));
- data_size
- = block_size - (sizeof(SSCB_Buffer_Struct) +
- ((((sizeof(Block)-1)/8)+1)*8));
-#else
- block_ptr = NULL;
-#endif
- }
- break;
-
case EXECUTOR_SPACE:
{
// allocate space from executor extended segment. TBD.
// For now, get it from system space.
-#ifndef __EID
block_ptr = (char *)malloc(block_size);
-#endif
data_ptr = block_ptr + ((((sizeof(Block)-1)/8)+1)*8);
data_size = block_size - ((((sizeof(Block)-1)/8)+1)*8);
}
@@ -178,9 +139,7 @@ Block * Space::allocateBlock(SpaceType type, Lng32 in_block_size)
case SYSTEM_SPACE:
{
// allocate space from system heap.
-#ifndef __EID
block_ptr = (char *)malloc(block_size);
-#endif
data_ptr = block_ptr + ((((sizeof(Block)-1)/8)+1)*8);
data_size = block_size - ((((sizeof(Block)-1)/8)+1)*8);
@@ -273,18 +232,10 @@ char *Space::allocateAndCopyToAlignedSpace(const char* dp,
assert(dlen <= USHRT_MAX); // NT_PORT ( bd 10/30/96 ) added missing semicolon
*(short *)rp = dlen;
break;
-#ifdef NA_64BIT
- // dg64 - Use correct MAX
case sizeof(Int32):
assert(dlen <= UINT_MAX); // NT_PORT ( bd 10/30/96 ) added missing semicolon
*(Int32 *)rp = dlen;
break;
-#else
- case sizeof(Lng32):
- assert(dlen <= ULONG_MAX); // NT_PORT ( bd 10/30/96 ) added missing semicolon
- *(Lng32 *)rp = dlen;
- break;
-#endif
default:
assert(0==1);
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/exp/exp_stdh.h
----------------------------------------------------------------------
diff --git a/core/sql/exp/exp_stdh.h b/core/sql/exp/exp_stdh.h
index fc331f0..2c317cb 100644
--- a/core/sql/exp/exp_stdh.h
+++ b/core/sql/exp/exp_stdh.h
@@ -40,11 +40,11 @@
#include "SqlExpDllDefines.h"
#include "Platform.h"
-#ifdef NA_DEBUG_C_RUNTIME
+#ifdef _DEBUG
#include <stdio.h>
#include <iostream>
#include <stdlib.h>
-#endif // NA_DEBUG_C_RUNTIME
+#endif // _DEBUG
#include "ComPackDefs.h"
#include "dfs2rec.h"
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/exp/exp_tuple_desc.cpp
----------------------------------------------------------------------
diff --git a/core/sql/exp/exp_tuple_desc.cpp b/core/sql/exp/exp_tuple_desc.cpp
index c529551..e60c7ee 100644
--- a/core/sql/exp/exp_tuple_desc.cpp
+++ b/core/sql/exp/exp_tuple_desc.cpp
@@ -147,7 +147,6 @@ ExpTupleDesc::~ExpTupleDesc()
// columns. The added columns follow the original fixed columns and are NOT
// ordered on their byte boundary, but put in the list in the order they
// were added.
-NA_EIDPROC
static Int16 orderFixedFieldsByAlignment( Attributes ** attrs,
NAList<UInt32> * fixedFields)
{
@@ -243,7 +242,7 @@ Int16 ExpTupleDesc::computeOffsets(Attributes * attr,
}
// This code is the same for fixed fields and GuOutput fields.
-NA_EIDPROC static
+static
void computeOffsetOfFixedField(Attributes ** attrs,
UInt32 fieldIdx,
UInt32 bitmapOffset,
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/exp/exp_tuple_desc.h
----------------------------------------------------------------------
diff --git a/core/sql/exp/exp_tuple_desc.h b/core/sql/exp/exp_tuple_desc.h
index aa4838c..b9a75a5 100644
--- a/core/sql/exp/exp_tuple_desc.h
+++ b/core/sql/exp/exp_tuple_desc.h
@@ -69,7 +69,7 @@ typedef NAVersionedObjectPtrArrayTempl<AttributesPtr> AttributesPtrPtr;
// Size of each VOA array entry for SQLMX_FORMAT.
// The SQLMX_ALIGNED_FORMAT has its own constant in ExpAlignedFormat.h
static const UInt32 ExpVoaSize = sizeof(Int32);
-static const UInt32 ExpOffsetMax = UINT_MAX; // NA_64BIT
+static const UInt32 ExpOffsetMax = UINT_MAX;
////////////////////////////////////////////////////////////////////
@@ -77,7 +77,7 @@ static const UInt32 ExpOffsetMax = UINT_MAX; // NA_64BIT
// class ExpTupleDesc
//
////////////////////////////////////////////////////////////////////
-class SQLEXP_LIB_FUNC ExpTupleDesc : public NAVersionedObject
+class ExpTupleDesc : public NAVersionedObject
{
public:
//
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/export/ComDiags.cpp
----------------------------------------------------------------------
diff --git a/core/sql/export/ComDiags.cpp b/core/sql/export/ComDiags.cpp
index 48b7814..41dab6f 100644
--- a/core/sql/export/ComDiags.cpp
+++ b/core/sql/export/ComDiags.cpp
@@ -45,19 +45,17 @@
#include "Int64.h"
#include "ExpError.h"
-#ifndef __EID
#include "seabed/ms.h"
#include <stdlib.h>
#include <unistd.h>
extern void releaseRTSSemaphore(); // Functions implemented in SqlStats.cpp
#include "logmxevent.h"
-#endif
#include <byteswap.h>
#include "ComRtUtils.h"
-#ifdef NA_DEBUG_C_RUNTIME
+#ifdef _DEBUG
#include <time.h>
#include <sys/time.h>
#include "PortProcessCalls.h"
@@ -67,7 +65,7 @@ extern void releaseRTSSemaphore(); // Functions implemented in SqlStats.cpp
// This is a "helper" function that factors out a bunch of code
// from the packedLength() routines.
-NA_EIDPROC static
+static
inline void advanceSize(IpcMessageObjSize &size, const char * const buffPtr)
{
const Int32 lenSize = sizeof( Lng32);
@@ -77,7 +75,7 @@ inline void advanceSize(IpcMessageObjSize &size, const char * const buffPtr)
}
//UR2
-NA_EIDPROC static
+static
inline void advanceSize(IpcMessageObjSize &size, const NAWchar * const buffPtr)
{
const Int32 lenSize = sizeof( Lng32);
@@ -88,7 +86,6 @@ inline void advanceSize(IpcMessageObjSize &size, const NAWchar * const buffPtr)
-// NA_EIDPROC
// static NABoolean isValidIsoMappingCharSet(CharInfo::CharSet cs)
// {
// if (cs == CharInfo::ISO88591 ||
@@ -99,16 +96,12 @@ inline void advanceSize(IpcMessageObjSize &size, const NAWchar * const buffPtr)
// return FALSE;
// }
-NA_EIDPROC
static NABoolean isSingleByteCharSet(CharInfo::CharSet cs)
{
if (cs == CharInfo::ISO88591) return TRUE;
if (cs == CharInfo::UTF8) return TRUE; // is variable-length/width multi-byte char-set but treat it as a C/C++ string
if (cs == CharInfo::SJIS) return TRUE; // is variable-length/width multi-byte char-set but treat it as a C/C++ string
if (cs == CharInfo::UNICODE) return FALSE;
-#if defined(NA_NO_C_RUNTIME) || defined(__EID)
- return TRUE; // in exe and DP2, everything else is a single-byte cs
-#else
// a "mini-cache" to avoid proc call, for performance.
static THREAD_P CharInfo::CharSet cachedCS = CharInfo::UnknownCharSet;
@@ -119,7 +112,6 @@ static NABoolean isSingleByteCharSet(CharInfo::CharSet cs)
cachedSByte = (CharInfo::maxBytesPerChar(cs) == 1);
}
return cachedSByte;
-#endif
}
@@ -171,11 +163,7 @@ ComCondition::ComCondition (CollHeap* heapPtr) :
// Make sure the size of ComCondition remains constant
// If you hit this after change or add new member, adjust the fillers_ size
Int32 classSize = sizeof(ComCondition);
-#ifdef NA_64BIT
assert(classSize == 376);
-#else
- assert(classSize == 264);
-#endif
}
ComCondition::ComCondition () :
@@ -221,11 +209,7 @@ ComCondition::ComCondition () :
// Make sure the size of ComCondition remains constant
// If you hit this after change or add new member, adjust the fillers_ size
Int32 classSize = sizeof(ComCondition);
-#ifdef NA_64BIT
assert(classSize == 376);
-#else
- assert(classSize == 264);
-#endif
}
// The destructor must free all of the char buffers which
@@ -1350,15 +1334,10 @@ void ComCondition::setConditionNumber(ComDiagBigInt newCondition)
conditionNumber_ = newCondition;
}
-#ifndef __EID
-#endif // no __EID
-
void ComCondition::setSQLCODE (Lng32 newSQLCODE)
{
theSQLCODE_ = newSQLCODE;
-#ifndef __EID
-
if ( ! (theSQLCODE_ < 0) ) return; // if not an error return
Lng32 theError = (theSQLCODE_ < 0) ? -theSQLCODE_ : theSQLCODE_;
@@ -1377,7 +1356,7 @@ void ComCondition::setSQLCODE (Lng32 newSQLCODE)
while ( loopError ) // To exit loop in gdb do: set var loopError=0
{
-#ifdef NA_DEBUG_C_RUNTIME
+#ifdef _DEBUG
// In the debug build, notify the user we are looping by
// printing to stdout every 60 seconds
if (loopCount % 20 == 0)
@@ -1464,9 +1443,6 @@ void ComCondition::setSQLCODE (Lng32 newSQLCODE)
genLinuxCorefile( (char *)
"Generating core-file to capture internal error scenario.");
}
-// LCOV_EXCL_STOP
-
-#endif // no __EID
}
void ComCondition::setRowNumber( Lng32 newRowNumber)
@@ -1478,8 +1454,6 @@ void ComCondition::setNskCode( Lng32 newNskCode)
{
nskCode_ = newNskCode;
-#ifndef __EID
- // LCOV_EXCL_START
char *reqErrorStr = NULL;
Lng32 reqError = 0;
@@ -1521,8 +1495,6 @@ void ComCondition::setNskCode( Lng32 newNskCode)
abort(); // dump core
}
}
- // LCOV_EXCL_STOP
-#endif // no __EID
}
// Getting and Setting the Optional Parameters
@@ -1661,12 +1633,7 @@ ComDiagsArea::ComDiagsArea (CollHeap* ptr): IpcMessageObj(IPC_SQL_DIAG_AREA,0),
// Make sure the size of ComDiagsArea remains constant
// If you hit this after change or add new member, adjust the fillers_ size
Int32 classSize = sizeof(ComDiagsArea);
-#ifdef NA_64BIT
- // dg64 - size changed
assert(classSize == 328);
-#else
- assert(classSize == 240);
-#endif
}
ComDiagsArea::ComDiagsArea () : IpcMessageObj(IPC_SQL_DIAG_AREA,0),
@@ -1691,13 +1658,8 @@ ComDiagsArea::ComDiagsArea () : IpcMessageObj(IPC_SQL_DIAG_AREA,0),
Int32 classSize = sizeof(ComDiagsArea);
-#ifndef NA_64BIT
- assert(classSize == 240);
-#else
// if (classSize != 320) printf("classSize=%d @ %d\n", classSize, __LINE__);
- // dg64 - size changed
assert(classSize == 328);
-#endif
}
@@ -2081,7 +2043,7 @@ IpcMessageObjSize ComDiagsArea::packObjIntoMessage(char* buffer,
short num = (short) errors_.entries();
short numToPack = num;
-#ifdef NA_DEBUG_C_RUNTIME
+#ifdef _DEBUG
// In the debug build we allow the UDR server to generate a corrupt
// packed object. This allows us to test error handling in the
// executor. The MXUDR_DEBUG_BUILD variable is always set by the
@@ -2180,7 +2142,7 @@ IpcMessageObjSize ComDiagsArea::packObjIntoMessage32(char* buffer,
short num = (short) errors_.entries();
short numToPack = num;
-#ifdef NA_DEBUG_C_RUNTIME
+#ifdef _DEBUG
// In the debug build we allow the UDR server to generate a corrupt
// packed object. This allows us to test error handling in the
// executor. The MXUDR_DEBUG_BUILD variable is always set by the
@@ -3168,7 +3130,6 @@ void ComDiagsArea::mergeAfter(const ComDiagsArea& source)
//
// assert( theSQLFunction_ == source.theSQLFunction_);
-#ifndef __EID
// if lengthLimit of source is greater than that of target
// then the target lengthLimit is assigned that of the source.
// Note that NO_LIMIT_ON_ERROR_CONDITIONS
@@ -3180,9 +3141,7 @@ void ComDiagsArea::mergeAfter(const ComDiagsArea& source)
(source.lengthLimit_ > lengthLimit_)) {
lengthLimit_ = source.lengthLimit_ ;
}
-#endif
- // VO, Feb 2004:
// changed to preserve insertion order of the conditions
for (Int32 index = (((nfMark != -1) ? (nfMark+1):1)); index <= source.getNumber(); index++)
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/export/ComDiags.h
----------------------------------------------------------------------
diff --git a/core/sql/export/ComDiags.h b/core/sql/export/ComDiags.h
index 0ce3c44..13aa97a 100644
--- a/core/sql/export/ComDiags.h
+++ b/core/sql/export/ComDiags.h
@@ -47,9 +47,6 @@
#ifdef min
#undef min
#endif
- #ifdef ERROR
- #undef ERROR
- #endif
#include "BaseTypes.h"
#include "Collections.h"
#include "IpcMessageObj.h"
@@ -58,7 +55,6 @@
#include "NAWinNT.h"
#include "DgBaseType.h"
-#include "SqlExportDllDefines.h"
#include "SqlCliDllDefines.h"
class ComCondition;
@@ -102,7 +98,7 @@ const Int32 ComDiags_TrigActionExceptionSQLCODE = 11028;
typedef Lng32 ComDiagBigInt;
// NOTE:
-// The following group of NA_EIDPROC global functions can be found in
+// The following group of global functions can be found in
// sqlmsg/ComDiagsMsg.cpp.
// We need to be able to map a SQLCODE value to a SQLSTATE value.
@@ -116,16 +112,12 @@ typedef Lng32 ComDiagBigInt;
// class and subclass simply by examining substrings of the returned
// SQLSTATE value.
-NA_EIDPROC
NABoolean ComSQLSTATE(Lng32 theSQLCODE, char *theSQLSTATE);
-NA_EIDPROC
void ComEMSSeverity(Lng32 theSQLCODE, char *theEMSSeverity);
-NA_EIDPROC
void ComEMSEventTarget(Lng32 theSQLCODE, char *theEMSEventTarget, NABoolean forceDialout=FALSE);
-NA_EIDPROC
void ComEMSExperienceLevel(Lng32 theSQLCODE, char *theEMSExperienceLevel);
// Closely tied to the SQLSTATE value itself is the class origin
@@ -134,12 +126,9 @@ void ComEMSExperienceLevel(Lng32 theSQLCODE, char *theEMSExperienceLevel);
// associated with the mapping from SQLCODE to SQLSTATE and the
// functions provide the origin information:
-NA_EIDPROC
const char * ComClassOrigin(Lng32 theSQLCODE);
-NA_EIDPROC
const char * ComSubClassOrigin(Lng32 theSQLCODE);
-NA_EIDPROC
void emitError( Lng32, char *, Lng32, ... );
@@ -224,8 +213,6 @@ public:
MORE_WARNINGS = 2
};
-SQLEXPORT_LIB_FUNC
-NA_EIDPROC
ComCondition();
// If you want to dynamically allocate a ComCondition, you can't
@@ -233,12 +220,8 @@ NA_EIDPROC
// to free this object. This is so that we can allow the option of
// this class' user supplying a CollHeap to manage storage.
-SQLEXPORT_LIB_FUNC
-NA_EIDPROC
static ComCondition *allocate (CollHeap* = NULL);
-SQLEXPORT_LIB_FUNC
-NA_EIDPROC
void deAllocate ();
// The destructor is not declared virtual in order
@@ -253,14 +236,10 @@ NA_EIDPROC
//
// The destructor **does not free** the heap referenced by collHeapPtr_.
-SQLEXPORT_LIB_FUNC
-NA_EIDPROC
~ComCondition ();
// Here is an assignment operator.
-SQLEXPORT_LIB_FUNC
-NA_EIDPROC
ComCondition &operator= (const ComCondition&);
// The clear() member function frees all storage used by this class,
@@ -268,8 +247,6 @@ NA_EIDPROC
// other members are "reset" to what they would be just after
// construction.
-SQLEXPORT_LIB_FUNC
-NA_EIDPROC
void clear ();
// We must guarantee of the ComCondition class:
@@ -283,25 +260,15 @@ NA_EIDPROC
// The following three methods are only exported through tdm_sqlcli.dll
// but not tdm_sqlexport.dll due to indirect dependencies on C-run time.
//
-SQLCLI_LIB_FUNC
-NA_EIDPROC
const NAWchar * getMessageText (NABoolean prefixAdded = TRUE);
-SQLCLI_LIB_FUNC
-NA_EIDPROC
const NAWchar * const getMessageText (NABoolean prefixAdded,
CharInfo::CharSet isoMapCS);
-SQLCLI_LIB_FUNC
-NA_EIDPROC
ComDiagBigInt getMessageLength ();
-SQLCLI_LIB_FUNC
-NA_EIDPROC
ComDiagBigInt getMessageOctetLength ();
-SQLEXPORT_LIB_FUNC
-NA_EIDPROC
NABoolean isLocked () const;
// We need to provide set and met methods for the data elements
@@ -313,8 +280,6 @@ NA_EIDPROC
// ANSI requires that the returned type be CHARACTER_VARYING(L) where
// L is not less then 128. For our purposes, a const char* will do.
-SQLEXPORT_LIB_FUNC
-NA_EIDPROC
ComDiagBigInt getConditionNumber () const;
//
@@ -322,89 +287,48 @@ NA_EIDPROC
// but not tdm_sqlexport.dll due to indirect dependencies on C-run time.
//
-SQLCLI_LIB_FUNC
-NA_EIDPROC
void getSQLSTATE (char *theSQLSTATE) const;
-SQLCLI_LIB_FUNC
-NA_EIDPROC
const char * getClassOrigin () const;
-SQLCLI_LIB_FUNC
-NA_EIDPROC
const char * getSubClassOrigin () const;
-SQLEXPORT_LIB_FUNC
-NA_EIDPROC
const char * getServerName () const;
-SQLEXPORT_LIB_FUNC
-NA_EIDPROC
const char * getConnectionName () const;
-SQLEXPORT_LIB_FUNC
-NA_EIDPROC
const char * getConstraintCatalog () const;
-SQLEXPORT_LIB_FUNC
-NA_EIDPROC
const char * getConstraintSchema () const;
-SQLEXPORT_LIB_FUNC
-NA_EIDPROC
const char * getConstraintName () const;
-SQLEXPORT_LIB_FUNC
-NA_EIDPROC
const char * getTriggerCatalog () const;
-SQLEXPORT_LIB_FUNC
-NA_EIDPROC
const char * getTriggerSchema () const;
-SQLEXPORT_LIB_FUNC
-NA_EIDPROC
const char * getTriggerName () const;
-SQLEXPORT_LIB_FUNC
-NA_EIDPROC
const char * getCatalogName () const;
-SQLEXPORT_LIB_FUNC
-NA_EIDPROC
const char * getSchemaName () const;
-SQLEXPORT_LIB_FUNC
-NA_EIDPROC
const char * getTableName () const;
-SQLEXPORT_LIB_FUNC
-NA_EIDPROC
const char * getColumnName () const;
-SQLEXPORT_LIB_FUNC
-NA_EIDPROC
const char * getSqlID () const;
-SQLEXPORT_LIB_FUNC
-NA_EIDPROC
Lng32 getRowNumber () const;
-SQLEXPORT_LIB_FUNC
-NA_EIDPROC
Lng32 getNskCode () const;
-SQLEXPORT_LIB_FUNC
-NA_EIDPROC
+
Lng32 getSQLCODE () const;
-SQLEXPORT_LIB_FUNC
-NA_EIDPROC
Lng32 getEMSEventVisits () const;
-SQLEXPORT_LIB_FUNC
-NA_EIDPROC
void incrEMSEventVisits ();
@@ -423,80 +347,44 @@ NA_EIDPROC
// the SQLCODE. You *are* allowed to set the SQLCODE.
-SQLEXPORT_LIB_FUNC
-NA_EIDPROC
void setConditionNumber (ComDiagBigInt);
-SQLEXPORT_LIB_FUNC
-NA_EIDPROC
void setSQLCODE (Lng32);
-SQLEXPORT_LIB_FUNC
-NA_EIDPROC
void setServerName (const char *const);
-SQLEXPORT_LIB_FUNC
-NA_EIDPROC
void setConnectionName (const char *const);
-SQLEXPORT_LIB_FUNC
-NA_EIDPROC
void setConstraintCatalog (const char *const);
-SQLEXPORT_LIB_FUNC
-NA_EIDPROC
void setConstraintSchema (const char *const);
-SQLEXPORT_LIB_FUNC
-NA_EIDPROC
void setConstraintName (const char *const);
-SQLEXPORT_LIB_FUNC
-NA_EIDPROC
void setTriggerCatalog (const char *const);
-SQLEXPORT_LIB_FUNC
-NA_EIDPROC
void setTriggerSchema (const char *const);
-SQLEXPORT_LIB_FUNC
-NA_EIDPROC
void setTriggerName (const char *const);
-SQLEXPORT_LIB_FUNC
-NA_EIDPROC
void setCatalogName (const char *const);
-SQLEXPORT_LIB_FUNC
-NA_EIDPROC
void setSchemaName (const char *const);
-SQLEXPORT_LIB_FUNC
-NA_EIDPROC
void setTableName (const char *const);
-SQLEXPORT_LIB_FUNC
-NA_EIDPROC
void setCustomSQLState (const char *const);
-SQLEXPORT_LIB_FUNC
-NA_EIDPROC
const char * getCustomSQLState ()
{
return customSQLState_;
}
-SQLEXPORT_LIB_FUNC
-NA_EIDPROC
void setColumnName (const char *const);
-SQLEXPORT_LIB_FUNC
-NA_EIDPROC
void setSqlID (const char *const);
-SQLEXPORT_LIB_FUNC
-NA_EIDPROC
void setRowNumber ( Lng32);
// Next, we declare a set of get and set functions which
@@ -506,13 +394,11 @@ NA_EIDPROC
// is 0...NumOptionalParms-1.
-SQLEXPORT_LIB_FUNC
-NA_EIDPROC
+
void setNskCode ( Lng32);
-SQLEXPORT_LIB_FUNC
-NA_EIDPROC
+
NABoolean hasOptionalString (Lng32) const;
// Next, we declare a set of get and set functions which
@@ -520,42 +406,29 @@ NA_EIDPROC
// parameters. It is an assertion failure to call one of these
// get or set functions with the index out of range. The range
// is 0...NumOptionalParms-1.
-SQLEXPORT_LIB_FUNC
-NA_EIDPROC
+
const char * getOptionalString (Lng32) const;
-SQLEXPORT_LIB_FUNC
-NA_EIDPROC
const NAWchar * getOptionalWString (Lng32) const;
-SQLEXPORT_LIB_FUNC
-NA_EIDPROC
Lng32 getOptionalInteger (Lng32) const;
-SQLEXPORT_LIB_FUNC
-NA_EIDPROC
void setOptionalString (Lng32, const char* const,
CharInfo::CharSet = CharInfo::ISO88591
);
-SQLEXPORT_LIB_FUNC
-NA_EIDPROC
void setOptionalWString (
Lng32, const NAWchar* const
);
-SQLEXPORT_LIB_FUNC
-NA_EIDPROC
CharInfo::CharSet getOptionalStringCharSet(Lng32) const;
-SQLEXPORT_LIB_FUNC
-NA_EIDPROC
void setOptionalInteger (Lng32,
Lng32);
@@ -564,51 +437,33 @@ NA_EIDPROC
// class in order to support IPC.
-SQLEXPORT_LIB_FUNC
-NA_EIDPROC
IpcMessageObjSize packedLength ();
-SQLEXPORT_LIB_FUNC
-NA_EIDPROC
IpcMessageObjSize packedLength32 ();
-SQLEXPORT_LIB_FUNC
-NA_EIDPROC
IpcMessageObjSize packObjIntoMessage (IpcMessageBufferPtr buffer);
-SQLEXPORT_LIB_FUNC
-NA_EIDPROC
IpcMessageObjSize packObjIntoMessage32 (IpcMessageBufferPtr buffer);
-SQLEXPORT_LIB_FUNC
-NA_EIDPROC
IpcMessageObjSize packObjIntoMessage (IpcMessageBufferPtr buffer,
NABoolean swapBytes);
-SQLEXPORT_LIB_FUNC
-NA_EIDPROC
IpcMessageObjSize packObjIntoMessage32 (IpcMessageBufferPtr buffer,
NABoolean swapBytes);
-SQLEXPORT_LIB_FUNC
-NA_EIDPROC
void unpackObj (IpcMessageObjType objType,
IpcMessageObjVersion objVersion,
NABoolean sameEndianness,
IpcMessageObjSize objSize,
IpcConstMessageBufferPtr buffer);
-SQLEXPORT_LIB_FUNC
-NA_EIDPROC
void unpackObj32 (IpcMessageObjType objType,
IpcMessageObjVersion objVersion,
NABoolean sameEndianness,
IpcMessageObjSize objSize,
IpcConstMessageBufferPtr buffer);
-SQLEXPORT_LIB_FUNC
-NA_EIDPROC
NABoolean checkObj (IpcMessageObjType objType,
IpcMessageObjVersion objVersion,
NABoolean sameEndianness,
@@ -619,20 +474,12 @@ protected:
// In support of allocation, creation, and destruction:
-SQLEXPORT_LIB_FUNC
-NA_EIDPROC
ComCondition (CollHeap *);
-SQLEXPORT_LIB_FUNC
-NA_EIDPROC
inline static void *operator new (size_t,CollHeap* = NULL);
-SQLEXPORT_LIB_FUNC
-NA_EIDPROC
inline static void operator delete (void*);
-SQLEXPORT_LIB_FUNC
-NA_EIDPROC
void destroyMe ();
// For the heap management there is a private data member which is
@@ -695,26 +542,16 @@ private:
// the proper heap to do so.
//
// Apparently we do need to overload this for WINNT.
-SQLEXPORT_LIB_FUNC NA_EIDPROC void assignStringMember(char *& memberBuff, const char *const src);
+void assignStringMember(char *& memberBuff, const char *const src);
// UR2
-SQLEXPORT_LIB_FUNC
-NA_EIDPROC
void assignStringMember(NAWchar *& memberBuff, const NAWchar *const src);
// can't touch these:
-SQLEXPORT_LIB_FUNC
-NA_EIDPROC
Int32 operator== (const ComCondition&);
-SQLEXPORT_LIB_FUNC
-NA_EIDPROC
ComCondition (const ComCondition&);
-
- //#if defined (NA_NSK) && ((SQLEXPORT_LIB)||(SQLEXPORT_LIB_CLIENT))
- //#pragma SRLExportClassMembers ZEXPTSRL *
- //#endif
};
///////////////////////////////////////////////////////////////
@@ -731,7 +568,6 @@ void *ComCondition::operator new(size_t theSize, CollHeap* heapPtr)
return (ComCondition*) ::new char[theSize]; // note: vector
}
-NA_EIDPROC
inline
void ComCondition::operator delete(void *ptr)
{
@@ -894,7 +730,7 @@ NABoolean ComCondition::isLocked () const
// -----------------------------------------------------------------------
#pragma warning( disable : 4251 )
-class SQLEXPORT_LIB_FUNC ComDiagsArea : public IpcMessageObj {
+class ComDiagsArea : public IpcMessageObj {
public:
// For the ``SQL function'' setting and getting operations, we declare
// an enumeration which represents a SQL function. This is entirely
@@ -969,7 +805,6 @@ public:
INVALID_MARK_VALUE = -1
};
-NA_EIDPROC
ComDiagsArea ();
// The destructor is not declared virtual since we
@@ -982,7 +817,6 @@ NA_EIDPROC
//
// The destructor **does not free** the heap referenced by collHeapPtr_.
-NA_EIDPROC
~ComDiagsArea ();
// If you want to dynamically allocate a ComDiagsArea, you can't
@@ -990,11 +824,8 @@ NA_EIDPROC
// to free this object. This is so that we can allow the option of
// this class' user supplying a CollHeap to manage storage.
-NA_EIDPROC
static ComDiagsArea *allocate (CollHeap*);
-NA_EIDPROC
static ComDiagsArea *allocate ();
-NA_EIDPROC
void deAllocate ();
// Copy a ComDiagsArea object. The copy is constructed in the same
@@ -1002,7 +833,6 @@ NA_EIDPROC
// performed, meaning that not only is the top-level object copied,
// but also all nested objects and attributes (except for the embedded
// CollHeap). The reference count of the copy is initialized to one.
-NA_EIDPROC
ComDiagsArea* copy();
@@ -1010,41 +840,26 @@ NA_EIDPROC
// of a ComDiagsArea that is defined in ANSI table 21, in subclause
// 18.1. See also, ``Creating Errors Korrectly.''
-NA_EIDPROC
Lng32 getNumber () const;
-NA_EIDPROC
Lng32 getNumber (DgSqlCode::ErrorOrWarning) const;
-NA_EIDPROC
NABoolean areMore () const;
-NA_EIDPROC
NABoolean canAcceptMoreErrors () const;
-NA_EIDPROC
Int64 getRowCount () const;
-NA_EIDPROC
void setRowCount (Int64);
-NA_EIDPROC
void addRowCount (Int64);
-NA_EIDPROC
ComDiagBigInt getAvgStreamWaitTime () const;
-NA_EIDPROC
void setAvgStreamWaitTime (ComDiagBigInt);
-NA_EIDPROC
double getCost () const;
-NA_EIDPROC
void setCost (double);
-NA_EIDPROC
Lng32 getLengthLimit () const;
-NA_EIDPROC
void setLengthLimit (Lng32);
// This method will set the sqlID attribute of every error condition
// and warning in the diags area that isn't already set.
-NA_EIDPROC
void setAllSqlID (char *);
// This method will set the RowNumber attribute of every error condition
// in the diags area when it called.
-NA_EIDPROC
void setAllRowNumber (Lng32, DgSqlCode::ErrorOrWarning errorOrWarn = DgSqlCode::ERROR_);
// This method will check the RowNumber attribute of every error condition
@@ -1052,29 +867,24 @@ NA_EIDPROC
// In other words it returns the value of the first rowset index that has raised an error
// that is greater than or equal to indexValue.
// If none is found, INVALID_ROWNUMBER will be returned.
-NA_EIDPROC
Lng32 getNextRowNumber (Lng32 indexValue) const;
// this method returns TRUE is rowsetRowCountArray_ is not NULL.
-NA_EIDPROC
NABoolean hasValidRowsetRowCountArray () const;
// this method returns the number of entries in the rowsetRowCountArray_.
// should not exceed run-time size of input rowset. Currently we do not
// support rowset sizes that do not fit into a long datatype.
-NA_EIDPROC
Lng32 numEntriesInRowsetRowCountArray () const;
// this method inserts "value" into the specified index of the rowsetRowCountArray_
// It also handles allocation of the array if this is the first element being inserted
// into the array.
-NA_EIDPROC
void insertIntoRowsetRowCountArray (Lng32 index, Int64 value,
Lng32 arraySize, CollHeap* heapPtr) ;
// this method returns the value in the specified index of rowsetRowCountArray_.
// returns -1 if the index specified is unused.
-NA_EIDPROC
Int64 getValueFromRowsetRowCountArray (Lng32 index) const;
@@ -1083,11 +893,8 @@ NA_EIDPROC
// type. You can also get a char* which is the name of the
// function.
-NA_EIDPROC
void setFunction (FunctionEnum);
-NA_EIDPROC
const char * getFunctionName () const;
-NA_EIDPROC
FunctionEnum getFunction () const;
// To help make it easier to get ComConditions and their data into
@@ -1113,41 +920,33 @@ NA_EIDPROC
// you have not ``accepted'' or ``discarded'' the current new
// ComCondition object.
-NA_EIDPROC
ComCondition * makeNewCondition ();
// mainSQLCODE() returns 0, if there are no ComConditions in
// this ComDiagsArea, and it returns the SQLCODE of the highest
// priority ComCondition otherwise.
-NA_EIDPROC
Lng32 mainSQLCODE () const;
// Returnes the SQLSTATE value of the last SIGNAL statement.
// Assumes the SIGNAL condition is the highest priority error.
-NA_EIDPROC
+
const char *getSignalSQLSTATE () const;
// Removes all ComConditions from this object. One is on their own
// if they mark,clear,acceptNewCondition,rewind.
-NA_EIDPROC
void clear ();
-NA_EIDPROC
void clearConditionsOnly ();
-NA_EIDPROC
void clearErrorConditionsOnly ();
// the next 3 methods are called to set a warning, an EOD indication(100),
// or an error. Useful while debugging to find out when/where an
// error/warning/EOD is being set.
-NA_EIDPROC
void insertNewWarning();
-NA_EIDPROC
void insertNewEODWarning();
-NA_EIDPROC
void insertNewError();
// acceptNewCondition -- inserts the new ComCondition object into the
@@ -1164,7 +963,6 @@ NA_EIDPROC
// An assertion failure will occur if this function is called at a
// time when there is current new condition.
-NA_EIDPROC
void acceptNewCondition ();
@@ -1175,7 +973,6 @@ NA_EIDPROC
// This method destroys that ComCondition object and makes the
// ComDiagsArea ready to create a new ComCondition object.
-NA_EIDPROC
void discardNewCondition ();
// In order to access an element of the sequence of ComCondition
@@ -1183,7 +980,6 @@ NA_EIDPROC
// is in the range 1...getNumber(). Passing an invalid
// index will result in an assertion failure.
-NA_EIDPROC
ComCondition &operator[] (Lng32) const;
@@ -1191,12 +987,9 @@ NA_EIDPROC
// operator, but this method only accesses ComCondition objects in the
// specified list (error or warning).
// index ranges from 1..getNumber(DgSqlCode::WARNING_ or ERROR_)
-NA_EIDPROC
ComCondition* getWarningEntry (Lng32);
-NA_EIDPROC
ComCondition* getErrorEntry (Lng32);
-NA_EIDPROC
ComCondition* findCondition (Lng32 sqlCode, Lng32 *entryNumber=NULL); // return NULL if not found
@@ -1219,7 +1012,6 @@ NA_EIDPROC
//
// Also see global function NegateAllErrors(), elsewhere in this file.
-NA_EIDPROC
void negateCondition (CollIndex);
void negateAllErrors ()
@@ -1238,7 +1030,6 @@ void negateAllWarnings ()
// one. An assertion failure occurs if there exists a new-condition
// (being built by the user) in this ComDiagsArea upon a "mergeAfter."
-NA_EIDPROC
void mergeAfter (const ComDiagsArea&);
// These functions allow you to:
@@ -1251,9 +1042,7 @@ NA_EIDPROC
// The other data members, such as the basic info, of this ComDiagsArea
// remains unaffected by a rewind operation.
-NA_EIDPROC
Lng32 mark () const;
-NA_EIDPROC
void rewind (Lng32 markValue, NABoolean decId=FALSE);
// The rewindAndMerge() method works very much like rewinding.
@@ -1262,7 +1051,6 @@ NA_EIDPROC
// a result of the rewind. If the given object is the same as *this,
// then a simple rewind takes place.
-NA_EIDPROC
void rewindAndMergeIfDifferent (Lng32,ComDiagsArea*);
// The removeFinalCondition100() method is a special purpose method,
@@ -1270,7 +1058,6 @@ NA_EIDPROC
// SQLCODE 100, is added to the context diags area always (?) but
// should not be returned to CLI client after a SELECT INTO or an I/U/D.
-NA_EIDPROC
void removeFinalCondition100();
// The removeLastErrorCondition() method is a special purpose method,
@@ -1278,64 +1065,53 @@ NA_EIDPROC
// If the number of errors raised exceeds this limit then the last condition is removed
// to make space for error -30031.
-NA_EIDPROC
void removeLastErrorCondition();
-NA_EIDPROC
void removeLastNonFatalCondition();
-NA_EIDPROC
Lng32 markDupNFConditions();
// the deleteWarning and deleteError methods delete a warning/error from
// the warnings_/errors_ list.
// entryNumber is the index to the warnings_/errors_ list
// entryNumber should range from 1 to getNumber(DgSqlCode::WARNING_ or
// ERROR_)
-NA_EIDPROC
void deleteWarning(Lng32 entryNumber);
-NA_EIDPROC
void deleteError(Lng32 entryNumber);
// similar to deleteError except that the Error entry is not
// destroyed (i.e. deallocated) and a pointer to it returned.
// The error entry is removes from the errors_ list.
-NA_EIDPROC
ComCondition * removeError(Lng32 entryNumber);
// returns TRUE, if any ComCondition in the diagsArea contains
// error SQLCode.
// returns FALSE, otherwise.
-NA_EIDPROC
NABoolean contains(Lng32 SQLCode) const;
// check if a particular error/warning occurred for a particular file.
// returns TRUE, if diagsArea contains the fileName for error SQLCode.
// returns FALSE, otherwise.
-NA_EIDPROC
NABoolean containsForFile(Lng32 SQLCode, const char * fileName);
// returns TRUE, if any ComCondition in the diagsArea contains
// warning SQLCode. Returns FALSE, otherwise.
-NA_EIDPROC
NABoolean containsWarning(Lng32 SQLCode) const;
// Check if warnings_ contains SQLCODE within the range [begin, warnings_.entries()).
// Note beg is 0-based.
-NA_EIDPROC
+
NABoolean containsWarning(CollIndex begin, Lng32 SQLCode) const;
// returns TRUE, if any ComCondition in the diagsArea contains
// error SQLCode. Returns FALSE, otherwise.
-NA_EIDPROC
+
NABoolean containsError(Lng32 SQLCode) const;
//returnIndex returns the index number of a given SQLCODE in this diagsarea
//If the given SQLCODE is not found in the diagsarea then NULL_COLL_INDEX is returned.
-NA_EIDPROC
CollIndex returnIndex(Lng32 SQLCODE) const;
// Decrement reference count. Object is deallocated, in the heap in
// which it resides, when reference count drops to zero.
-NA_EIDPROC
IpcMessageRefCount decrRefCount();
// There are three methods each that must be overridden
@@ -1345,67 +1121,48 @@ NA_EIDPROC
// An assertion failure occurs upon packing or unpacking a ComDiagsArea
// whose newCondition_ member is not NULL.
-NA_EIDPROC
IpcMessageObjSize packedLength ();
-NA_EIDPROC
IpcMessageObjSize packedLength32 ();
-NA_EIDPROC
IpcMessageObjSize packObjIntoMessage (IpcMessageBufferPtr buffer);
-NA_EIDPROC
IpcMessageObjSize packObjIntoMessage (IpcMessageBufferPtr buffer,
NABoolean swapBytes);
-NA_EIDPROC
IpcMessageObjSize packObjIntoMessage32 (IpcMessageBufferPtr buffer);
-NA_EIDPROC
IpcMessageObjSize packObjIntoMessage32 (IpcMessageBufferPtr buffer,
NABoolean swapBytes);
-NA_EIDPROC
void unpackObj (IpcMessageObjType objType,
IpcMessageObjVersion objVersion,
NABoolean sameEndianness,
IpcMessageObjSize objSize,
IpcConstMessageBufferPtr buffer);
-NA_EIDPROC
void unpackObj32 (IpcMessageObjType objType,
IpcMessageObjVersion objVersion,
NABoolean sameEndianness,
IpcMessageObjSize objSize,
IpcConstMessageBufferPtr buffer);
-NA_EIDPROC
NABoolean checkObj (IpcMessageObjType objType,
IpcMessageObjVersion objVersion,
NABoolean sameEndianness,
IpcMessageObjSize objSize,
IpcConstMessageBufferPtr buffer) const;
-NA_EIDPROC
NABoolean getRollbackTransaction() const;
-NA_EIDPROC
void setRollbackTransaction(short value);
-NA_EIDPROC
NABoolean getNoRollbackTransaction() const;
-NA_EIDPROC
void setNoRollbackTransaction(NABoolean value);
-NA_EIDPROC
NABoolean getNonFatalErrorSeen() const;
-NA_EIDPROC
void setNonFatalErrorSeen(NABoolean value);
-NA_EIDPROC
NABoolean containsRowCountFromEID() const;
-NA_EIDPROC
void setContainsRowCountFromEID(NABoolean value);
-NA_EIDPROC
NABoolean getNonFatalErrorIndexToBeSet() const;
-NA_EIDPROC
void setNonFatalErrorIndexToBeSet(NABoolean value);
private:
@@ -1422,9 +1179,7 @@ private:
class DiagsCondition : public ComCondition {
public:
-NA_EIDPROC
Lng32 getDiagsId () const;
-NA_EIDPROC
void setDiagsId (Lng32);
// We want a DiagsCondition object to behave pretty much
@@ -1432,61 +1187,46 @@ NA_EIDPROC
// comparison, and assignment operators will all be declared following the
// pattern of the ComCondition class:
-NA_EIDPROC
DiagsCondition ();
-NA_EIDPROC
~DiagsCondition ();
-NA_EIDPROC
static DiagsCondition *allocate (CollHeap* = NULL);
-NA_EIDPROC
void deAllocate ();
// Copy a DiagsCondition object. The copy is constructed in the same
// heap in which the object being copied resides. A deep copy is
// performed, meaning that not only is the top-level object copied,
// but all attributes as well (except for the CollHeap).
-NA_EIDPROC
DiagsCondition* copy();
// There are three methods each that must be overridden
// in order to provide for packing and unpacking of this
// class in order to support IPC.
-NA_EIDPROC
IpcMessageObjSize packedLength ();
-NA_EIDPROC
IpcMessageObjSize packedLength32 ();
-NA_EIDPROC
IpcMessageObjSize packObjIntoMessage(IpcMessageBufferPtr buffer);
-NA_EIDPROC
IpcMessageObjSize packObjIntoMessage(IpcMessageBufferPtr buffer,
NABoolean swapBytes);
-NA_EIDPROC
IpcMessageObjSize packObjIntoMessage32(IpcMessageBufferPtr buffer);
-NA_EIDPROC
IpcMessageObjSize packObjIntoMessage32(IpcMessageBufferPtr buffer,
NABoolean swapBytes);
-NA_EIDPROC
void unpackObj (IpcMessageObjType objType,
IpcMessageObjVersion objVersion,
NABoolean sameEndianness,
IpcMessageObjSize objSize,
IpcConstMessageBufferPtr buffer);
-NA_EIDPROC
void unpackObj32 (IpcMessageObjType objType,
IpcMessageObjVersion objVersion,
NABoolean sameEndianness,
IpcMessageObjSize objSize,
IpcConstMessageBufferPtr buffer);
-NA_EIDPROC
NABoolean checkObj (IpcMessageObjType objType,
IpcMessageObjVersion objVersion,
NABoolean sameEndianness,
IpcMessageObjSize objSize,
IpcConstMessageBufferPtr buffer) const;
-NA_EIDPROC
DiagsCondition &operator= (const DiagsCondition&);
private:
@@ -1494,24 +1234,18 @@ NA_EIDPROC
// In support of allocation, creation, and destruction:
-NA_EIDPROC
DiagsCondition (CollHeap *);
-NA_EIDPROC
inline static void *operator new (size_t,CollHeap* = NULL);
// delete inherited from ComCondition
-NA_EIDPROC
void destroyMe ();
// Added to allow NCHAR error messages.
class DgWString0 : public DgBase
{
public:
-NA_EIDPROC
DgWString0 (const NAWchar* const x) : theWCharStr_(x) {};
-NA_EIDPROC
const NAWchar* getWCharStr () const {return theWCharStr_; };
-NA_EIDPROC
DGTYPE getTypeName () const { return DGWSTRING0; };
private:
const NAWchar* const theWCharStr_;
@@ -1521,11 +1255,8 @@ private:
class DgWString1 : public DgBase
{
public:
-NA_EIDPROC
DgWString1 (const NAWchar* const x) : theWCharStr_(x) {};
-NA_EIDPROC
const NAWchar* getWCharStr () const {return theWCharStr_; };
-NA_EIDPROC
DGTYPE getTypeName () const { return DGWSTRING1; };
private:
const NAWchar* const theWCharStr_;
@@ -1535,11 +1266,8 @@ private:
class DgWString2 : public DgBase
{
public:
-NA_EIDPROC
DgWString2 (const NAWchar* const x) : theWCharStr_(x) {};
-NA_EIDPROC
const NAWchar* getWCharStr () const {return theWCharStr_; };
-NA_EIDPROC
DGTYPE getTypeName () const { return DGWSTRING2; };
private:
const NAWchar* const theWCharStr_;
@@ -1549,11 +1277,8 @@ private:
class DgWString3 : public DgBase
{
public:
-NA_EIDPROC
DgWString3 (const NAWchar* const x) : theWCharStr_(x) {};
-NA_EIDPROC
const NAWchar* getWCharStr () const {return theWCharStr_; };
-NA_EIDPROC
DGTYPE getTypeName () const { return DGWSTRING3; };
private:
const NAWchar* const theWCharStr_;
@@ -1563,11 +1288,8 @@ private:
class DgWString4 : public DgBase
{
public:
-NA_EIDPROC
DgWString4 (const NAWchar* const x) : theWCharStr_(x) {};
-NA_EIDPROC
const NAWchar* getWCharStr () const {return theWCharStr_; };
-NA_EIDPROC
DGTYPE getTypeName() const { return DGWSTRING4; };
private:
const NAWchar* const theWCharStr_;
@@ -1575,16 +1297,8 @@ private:
// can't touch these:
-#if defined (SQLEXPORT_LIB)
-#pragma SRLExports
-#endif
-NA_EIDPROC
Int32 operator== (const DiagsCondition&);
-#if defined (SQLEXPORT_LIB)
-#pragma SRLExports
-#endif
-NA_EIDPROC
DiagsCondition (const DiagsCondition&);
};
@@ -1592,32 +1306,15 @@ public:
// In support of allocation, creation, and destruction:
-NA_EIDPROC
ComDiagsArea (CollHeap *);
private:
-#if defined (SQLEXPORT_LIB)
-#pragma SRLExports
-#endif
-NA_EIDPROC
inline static void *operator new (size_t,CollHeap*);
-#if defined (SQLEXPORT_LIB)
-#pragma SRLExports
-#endif
-NA_EIDPROC
inline static void *operator new (size_t);
-#if defined (SQLEXPORT_LIB)
-#pragma SRLExports
-#endif
-NA_EIDPROC
inline static void operator delete (void*);
-#if defined (SQLEXPORT_LIB)
-#pragma SRLExports
-#endif
-NA_EIDPROC
void destroyMe ();
// This function is called when accepting, merging, and setLengthLimit
@@ -1628,30 +1325,14 @@ NA_EIDPROC
// In that case, those ComConditions with the lowest priority go first
// (warnings before errors, reverse chronologically).
-#if defined (SQLEXPORT_LIB)
-#pragma SRLExports
-#endif
-NA_EIDPROC
void enforceLengthLimit ();
// can't touch these:
-#if defined (SQLEXPORT_LIB)
-#pragma SRLExports
-#endif
-NA_EIDPROC
ComDiagsArea &operator= (const ComDiagsArea&);
-#if defined (SQLEXPORT_LIB)
-#pragma SRLExports
-#endif
-NA_EIDPROC
Int32 operator== (const ComDiagsArea&);
-#if defined (SQLEXPORT_LIB)
-#pragma SRLExports
-#endif
-NA_EIDPROC
ComDiagsArea (const ComDiagsArea&);
@@ -1773,7 +1454,6 @@ NA_EIDPROC
// ##This is a global inline func only because I am too lazy to make it a
// ##public ComDiagsArea::negateAllErrors() method, with the following
// ##(or equivalent) in the .cpp file, and recompile and rebuild everything.
-NA_EIDPROC
inline
void NegateAllErrors (ComDiagsArea *a)
{
@@ -1801,7 +1481,6 @@ void *ComDiagsArea::operator new(size_t theSize, CollHeap* heapPtr)
}
-NA_EIDPROC
inline
void ComDiagsArea::operator delete(void *ptr)
{
@@ -1980,7 +1659,7 @@ inline
// area
// -----------------------------------------------------------------------
-class SQLEXPORT_LIB_FUNC ComDiagsTranslator
+class ComDiagsTranslator
{
public:
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/export/ComMemoryDiags.h
----------------------------------------------------------------------
diff --git a/core/sql/export/ComMemoryDiags.h b/core/sql/export/ComMemoryDiags.h
index ac2ea06..ef8b59b 100644
--- a/core/sql/export/ComMemoryDiags.h
+++ b/core/sql/export/ComMemoryDiags.h
@@ -37,8 +37,6 @@
*
**************************************************************************** */
-#include "SqlExportDllDefines.h"
-
// -----------------------------------------------------------------------
// The following classes are defined in this file.
// -----------------------------------------------------------------------
@@ -75,7 +73,7 @@ class ostream ; // forward decl
// The static data member is initialized in ComMemoryDiags.cpp.
//
-class SQLEXPORT_LIB_FUNC ComMemoryDiags {
+class ComMemoryDiags {
public:
static ostream *& DumpMemoryInfo() { return dumpMemoryInfo_ ; }
private:
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/export/ExportDll.cpp
----------------------------------------------------------------------
diff --git a/core/sql/export/ExportDll.cpp b/core/sql/export/ExportDll.cpp
index 3b98ed3..e9673fb 100644
--- a/core/sql/export/ExportDll.cpp
+++ b/core/sql/export/ExportDll.cpp
@@ -42,7 +42,6 @@
//
#include "Platform.h"
-#include "SqlExportDllDefines.h"
#include <setjmp.h>
-THREAD_P SQLEXPORT_LIB_FUNC jmp_buf ExportJmpBuf;
+THREAD_P jmp_buf ExportJmpBuf;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/export/HeapID.h
----------------------------------------------------------------------
diff --git a/core/sql/export/HeapID.h b/core/sql/export/HeapID.h
index b7dcc56..146235f 100644
--- a/core/sql/export/HeapID.h
+++ b/core/sql/export/HeapID.h
@@ -39,14 +39,6 @@
#define HEAPID__H
#include "Platform.h"
-// -----------------------------------------------------------------------
-// Force heaplog off if __EID code.
-// -----------------------------------------------------------------------
-#ifndef __NOIMPORT_HEAPL
- #ifdef __EID
- #define __NOIMPORT_HEAPL
- #endif
-#endif
// -----------------------------------------------------------------------
// NA_DEBUG_HEAPLOG indicates this is a debug build on NT and
@@ -62,31 +54,25 @@
// -----------------------------------------------------------------------
#ifdef NA_DEBUG_HEAPLOG
// -----------------------------------------------------------------------
-#include "SqlExportDllDefines.h"
-class SQLEXPORT_LIB_FUNC HeapID
+class HeapID
{
public:
-NA_EIDPROC
HeapID();
-NA_EIDPROC
~HeapID();
// -----------------------------------------------------------------------
#else
// -----------------------------------------------------------------------
-#include "SqlExportDllDefines.h"
-class SQLEXPORT_LIB_FUNC HeapID
+class HeapID
{
public:
-NA_EIDPROC
HeapID() : heapNum(-1) {}
-NA_EIDPROC
~HeapID() {}
#endif
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/export/HeapLog.h
----------------------------------------------------------------------
diff --git a/core/sql/export/HeapLog.h b/core/sql/export/HeapLog.h
index ee74a2f..d79fb68 100644
--- a/core/sql/export/HeapLog.h
+++ b/core/sql/export/HeapLog.h
@@ -40,7 +40,6 @@
#include <stddef.h>
#include "HeapID.h"
#include "NABoolean.h"
-#include "SqlExportDllDefines.h"
// -----------------------------------------------------------------------
// Expand to empty if this is a release build or heaplog is not importable.
@@ -138,7 +137,7 @@ typedef enum HeapControlEnum
// -----------------------------------------------------------------------
class HeapLog;
-class SQLEXPORT_LIB_FUNC HeapLogRoot {
+class HeapLogRoot {
public:
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/export/IpcMessageObj.cpp
----------------------------------------------------------------------
diff --git a/core/sql/export/IpcMessageObj.cpp b/core/sql/export/IpcMessageObj.cpp
index 7d69571..4ae4ce3 100644
--- a/core/sql/export/IpcMessageObj.cpp
+++ b/core/sql/export/IpcMessageObj.cpp
@@ -74,12 +74,7 @@ IpcMessageObj::IpcMessageObj(IpcBufferedMsgStream* msgStream)
swapFourBytes(s_.objType_);
swapFourBytes(s_.objVersion_);
swapFourBytes(s_.objLength_);
-#ifdef NA_64BIT
- // dg64 - TODO?
assert(0); // didn't implement
-#else
- swapFourBytes((ULng32 &) s_.next_);
-#endif
s_.refCount_ = 1; // an object comes with an initial refcount of 1
s_.endianness_ = IpcMyEndianness;
}
@@ -112,7 +107,6 @@ IpcMessageObj::~IpcMessageObj()
}
}
-#ifndef __EID // not needed in DP2 yet, Larry Schumacher
///////////////////////////////////////////////////////////////////////////////
// used to allocate a packed send object.
void* IpcMessageObj::operator new(size_t size,
@@ -124,7 +118,6 @@ void* IpcMessageObj::operator new(size_t size,
alignSizeForNextObj(appendStart);
return (msgStream.sendMsgObj(appendStart + appendDataLen));
}
-#endif
IpcMessageObjSize IpcMessageObj::packObjIntoMessage(
IpcMessageBufferPtr buffer)
@@ -292,15 +285,9 @@ IpcMessageObjSize IpcMessageObj::packBaseClassIntoMessage(
IpcMessageObjSize copyLen = sizeof(IpcMessageObj);
char *savedVPtr = getMyVPtr();
-#ifdef NA_64BIT
assert(copyLen == 48 AND
sizeof(s_) == 40 AND
(char *) this == ((char *) &s_ - sizeof(char *)));
-#else
- assert(copyLen == 32 AND
- sizeof(s_) == 28 AND
- (char *) this == ((char *) &s_ - sizeof(char *)));
-#endif
// wipe out the virtual function pointer before moving data
// (makes sure that the copied object doesn't have a stray pointer in it)
@@ -821,12 +808,7 @@ NABoolean checkCharStarInBuffer (
/* IN */ IpcConstMessageBufferPtr lastByte )
{
NABoolean result = TRUE;
-#ifdef NA_64BIT
- // dg64 - should be 4 bytes
Int32 dataLength = 0;
-#else
- Lng32 dataLength = 0;
-#endif
if (!checkAndUnpackBuffer(buffer, sizeof(dataLength),
(char *) &dataLength, lastByte))
{
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/export/IpcMessageObj.h
----------------------------------------------------------------------
diff --git a/core/sql/export/IpcMessageObj.h b/core/sql/export/IpcMessageObj.h
index c672f55..ffc0790 100644
--- a/core/sql/export/IpcMessageObj.h
+++ b/core/sql/export/IpcMessageObj.h
@@ -39,7 +39,6 @@
#define IPCMESSAGEOBJ_H
#include "Platform.h"
-#include "SqlExportDllDefines.h"
#include "str.h"
@@ -74,7 +73,7 @@ class IpcMessageBuffer;
// the message. A virtual method can also be used to determine the
// length of the message when it gets packed into the message.
// -----------------------------------------------------------------------
-class SQLEXPORT_LIB_FUNC IpcMessageObj
+class IpcMessageObj
{
friend class IpcMessageStream;
friend class IpcBufferedMsgStream;
@@ -102,8 +101,6 @@ public:
// destructor
virtual ~IpcMessageObj();
-#ifndef __EID // not needed in DP2 yet, Larry Schumacher
-
// used to allocate a packed send object. Operator "new" gets
// packedObj from class IpcBufferedMsgStream, then sets "this =
// packedObj" for constructor. "AppendDataLen" allows raw data
@@ -117,8 +114,6 @@ public:
IpcBufferedMsgStream& msgStream,
IpcMessageObjSize appendDataLen = 0);
-#endif // !__EID
-
// used to perform copyless receive. User must get packedObj from
// IpcBufferedMsgStream::receiveMsgObj(). "new" sets "this = packedObj"
// for constructor so object can be mapped inplace.
@@ -467,19 +462,16 @@ private:
// has sufficient space for an item of a given size.
// -----------------------------------------------------------------------
-SQLEXPORT_LIB_FUNC
-NA_EIDPROC IpcMessageObjSize packCharStarIntoBuffer(IpcMessageBufferPtr &buffer,
+IpcMessageObjSize packCharStarIntoBuffer(IpcMessageBufferPtr &buffer,
char* strPtr,
NABoolean swapBytes = FALSE);
// UR2
-SQLEXPORT_LIB_FUNC
-NA_EIDPROC IpcMessageObjSize packCharStarIntoBuffer(IpcMessageBufferPtr &buffer,
+IpcMessageObjSize packCharStarIntoBuffer(IpcMessageBufferPtr &buffer,
NAWchar* strPtr,
NABoolean swapBytes = FALSE);
-SQLEXPORT_LIB_FUNC
-NA_EIDPROC inline IpcMessageObjSize packStrIntoBuffer(char* &buffer,
+inline IpcMessageObjSize packStrIntoBuffer(char* &buffer,
char* targetObj,
ULng32 objSize)
{
@@ -488,12 +480,10 @@ NA_EIDPROC inline IpcMessageObjSize packStrIntoBuffer(char* &buffer,
return objSize;
}
-SQLEXPORT_LIB_FUNC
-NA_EIDPROC void unpackBuffer(const char* &buffer,
+void unpackBuffer(const char* &buffer,
char* &strPtr, CollHeap* collHeapPtr);
-SQLEXPORT_LIB_FUNC
-NA_EIDPROC inline void unpackStrFromBuffer(const char* &buffer,
+inline void unpackStrFromBuffer(const char* &buffer,
char* targetObj,
ULng32 objSize)
{
@@ -501,24 +491,20 @@ NA_EIDPROC inline void unpackStrFromBuffer(const char* &buffer,
buffer += objSize;
}
-SQLEXPORT_LIB_FUNC
-NA_EIDPROC void skipCharStarInBuffer(const char* &buffer);
+void skipCharStarInBuffer(const char* &buffer);
-SQLEXPORT_LIB_FUNC
-NA_EIDPROC NABoolean checkBuffer (
+NABoolean checkBuffer (
/* INOUT */ IpcConstMessageBufferPtr &buffer,
/* IN */ ULng32 dataLength,
/* IN */ IpcConstMessageBufferPtr lastByte );
-SQLEXPORT_LIB_FUNC
-NA_EIDPROC NABoolean checkAndUnpackBuffer (
+NABoolean checkAndUnpackBuffer (
/* INOUT */ IpcConstMessageBufferPtr &buffer,
/* IN */ ULng32 dataLength,
/* OUT */ char *dataPtr,
/* IN */ IpcConstMessageBufferPtr lastByte );
-SQLEXPORT_LIB_FUNC
-NA_EIDPROC NABoolean checkCharStarInBuffer (
+NABoolean checkCharStarInBuffer (
/* INOUT */ IpcConstMessageBufferPtr &buffer,
/* IN */ NABoolean sameEndianness,
/* IN */ IpcConstMessageBufferPtr lastByte );
@@ -532,11 +518,10 @@ NA_EIDPROC NABoolean checkCharStarInBuffer (
// before returning FALSE. Current the epilogue's only purpose is as a
// debugging aid. By setting a breakpoint on the epilogue you can
// quickly track down the cause of a checkObj() failure.
-SQLEXPORT_LIB_FUNC
-NA_EIDPROC void ipcIntegrityCheckEpilogue(NABoolean status);
+void ipcIntegrityCheckEpilogue(NABoolean status);
template <class ScalarType>
-NA_EIDPROC inline IpcMessageObjSize packIntoBuffer(char* &buffer,
+inline IpcMessageObjSize packIntoBuffer(char* &buffer,
ScalarType scalarVariable)
{
// * (ScalarType *) buffer = scalarVariable;
@@ -546,7 +531,7 @@ NA_EIDPROC inline IpcMessageObjSize packIntoBuffer(char* &buffer,
}
template <class ScalarType>
-NA_EIDPROC inline IpcMessageObjSize packIntoBuffer(char* &buffer,
+inline IpcMessageObjSize packIntoBuffer(char* &buffer,
ScalarType scalarVariable,
NABoolean swapBytes)
{
@@ -572,7 +557,7 @@ NA_EIDPROC inline IpcMessageObjSize packIntoBuffer(char* &buffer,
}
template <class ScalarType>
-NA_EIDPROC inline void unpackBuffer(const char* &buffer,
+inline void unpackBuffer(const char* &buffer,
ScalarType& scalarVariable)
{
// scalarVariable = * (ScalarType *) buffer;
@@ -582,36 +567,7 @@ NA_EIDPROC inline void unpackBuffer(const char* &buffer,
buffer += sizeof(ScalarType);
}
-#ifdef NA_64BIT
-// may need swapEightBytes(long &b8)
-// and swapEightBytes(unsigned long &b8)
-#else
-NA_EIDPROC inline void swapFourBytes(Long &b4)
-{
- char *c4 = (char *) (&b4);
- char x;
-
- x = c4[0]; c4[0] = c4[3]; c4[3] = x;
- x = c4[1]; c4[1] = c4[2]; c4[2] = x;
-}
-
-NA_EIDPROC inline void swapFourBytes(ULong &b4)
-{
- char *c4 = (char *) (&b4);
- char x;
-
- x = c4[0]; c4[0] = c4[3]; c4[3] = x;
- x = c4[1]; c4[1] = c4[2]; c4[2] = x;
-}
-
-#endif
-
-#ifdef NA_64BIT
-// dg64 - match signature
-NA_EIDPROC inline void swapFourBytes(UInt32 &b4)
-#else
-NA_EIDPROC inline void swapFourBytes(ULng32 &b4)
-#endif
+inline void swapFourBytes(UInt32 &b4)
{
char *c4 = (char *) (&b4);
char x;
@@ -620,12 +576,7 @@ NA_EIDPROC inline void swapFourBytes(ULng32 &b4)
x = c4[1]; c4[1] = c4[2]; c4[2] = x;
}
-#ifdef NA_64BIT
-// dg64 - match signature
-NA_EIDPROC inline void swapFourBytes(Int32 &b4)
-#else
-NA_EIDPROC inline void swapFourBytes(Lng32 &b4)
-#endif
+inline void swapFourBytes(Int32 &b4)
{
char *c4 = (char *) (&b4);
char x;
@@ -634,7 +585,7 @@ NA_EIDPROC inline void swapFourBytes(Lng32 &b4)
x = c4[1]; c4[1] = c4[2]; c4[2] = x;
}
-NA_EIDPROC inline void swapTwoBytes(unsigned short &b2)
+inline void swapTwoBytes(unsigned short &b2)
{
char *c2 = (char *) (&b2);
char x;
@@ -642,7 +593,7 @@ NA_EIDPROC inline void swapTwoBytes(unsigned short &b2)
x = c2[0]; c2[0] = c2[1]; c2[1] = x;
}
-NA_EIDPROC inline void swapTwoBytes(short &b2)
+inline void swapTwoBytes(short &b2)
{
char *c2 = (char *) (&b2);
char x;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/export/NAAbort.cpp
----------------------------------------------------------------------
diff --git a/core/sql/export/NAAbort.cpp b/core/sql/export/NAAbort.cpp
index 166a640..9ed3055 100644
--- a/core/sql/export/NAAbort.cpp
+++ b/core/sql/export/NAAbort.cpp
@@ -116,21 +116,14 @@ int NAAssertMutexLock()
#include "Platform.h"
-
-
-#if (defined(__TANDEM) || defined(NA_LINUX)) && !defined(__EID)
extern short getRTSSemaphore(); // Functions implemented in SqlStats.cpp
extern void releaseRTSSemaphore();
-#endif
#include "BaseTypes.h" // for declaration of NAAbort()
#include "NAAssert.h" // for declaration of NAAssert()
#include "NAError.h" // for ARKCMP_EXCEPTION_EPILOGUE()
#include <setjmp.h>
-#include "SqlExportDllDefines.h"
-
-
#include <iostream>
#include "ExceptionCallBack.h"
@@ -182,7 +175,7 @@ void registerAbortCallBack(AbortCallBack *pACB)
pAbortCallBack = pACB;
}
-extern THREAD_P SQLEXPORT_LIB_FUNC jmp_buf* ExportJmpBufPtr;
+extern THREAD_P jmp_buf* ExportJmpBufPtr;
#include "logmxevent.h"
@@ -232,7 +225,6 @@ void assert_botch_no_abend( const char *f, Int32 l, const char * m)
#pragma warn(770) // warning elimination
void assert_botch_abend( const char *f, Int32 l, const char * m, const char *c)
{
-#ifndef __EID
NAAssertMutexLock(); // Assure "termination synchronization"
int pid = (int) getpid();
@@ -293,7 +285,4 @@ void assert_botch_abend( const char *f, Int32 l, const char * m, const char *c)
else
#endif
abort();
-#else
- assert_botch_in_eid(f, l, m);
-#endif
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/export/NABasicObject.cpp
----------------------------------------------------------------------
diff --git a/core/sql/export/NABasicObject.cpp b/core/sql/export/NABasicObject.cpp
index 9629561..d04e70f 100644
--- a/core/sql/export/NABasicObject.cpp
+++ b/core/sql/export/NABasicObject.cpp
@@ -37,7 +37,6 @@
#include "Platform.h"
-#ifndef __EID
#ifdef NA_STD_NAMESPACE
#include <iosfwd>
using namespace std;
@@ -45,7 +44,6 @@ using namespace std;
#include <iostream>
#endif
#include <stdlib.h>
-#endif
#include "ComASSERT.h"
#include "NAMemory.h"
@@ -63,22 +61,18 @@ using namespace std;
// Stack or statically allocated objects will just have random garbage in
// this field but as long as noone tries to "delete" them (as noone should)
// that will not matter (except to the Purify tool which may report UMR errors).
-NA_EIDPROC
NABasicObject::NABasicObject() {}
// Note that this just ignores the passed object, which is correct:
// we do *not* want to copy its heap pointer!
-NA_EIDPROC
NABasicObject::NABasicObject(const NABasicObject&) {}
// Note that this just ignores the passed object, which is correct:
// we do *not* want to copy its heap pointer!
// Otherwise, a default operator= on a NABasicObject-derived class would
// overwrite the heap pointer, a very bad thing.
-NA_EIDPROC
NABasicObject& NABasicObject::operator=(const NABasicObject&) { return *this; }
-NA_EIDPROC
void* NABasicObject::operator new(size_t t, CollHeap* h, NABoolean failureIsFatal)
{
if (t < sizeof(NABasicObject))
@@ -120,7 +114,6 @@ void* NABasicObject::operator new(size_t t, CollHeap* h, NABoolean failureIsFata
return p;
}
-NA_EIDPROC
void* NABasicObject::operator new(size_t t, void* loc, NAMemory* h)
{
if (loc != NULL)
@@ -130,7 +123,6 @@ void* NABasicObject::operator new(size_t t, void* loc, NAMemory* h)
}
return 0;
}
-NA_EIDPROC
void NABasicObject::operator delete(void* p)
{
if (p) // "delete NULL;" is legal in C++, obviously a no-op
@@ -141,13 +133,11 @@ void NABasicObject::operator delete(void* p)
if (h == invalidHeapPtr())
{
#ifndef NDEBUG
- #ifndef __EID
cerr << "**WARNING: " << __FILE__ << ": "
<< "Ignoring attempt to delete pointer twice "
<< "(possible memory leak at " << p << "; need to run Purify)"
<< endl;
#endif
- #endif
return;
}
@@ -163,7 +153,6 @@ void NABasicObject::operator delete(void* p)
}
-NA_EIDPROC
void NABasicObject::operator delete(void* p, NAMemory*h, NABoolean f)
{
if (p)
@@ -175,13 +164,11 @@ void NABasicObject::operator delete(void* p, NAMemory*h, NABoolean f)
}
}
-NA_EIDPROC
void NABasicObject::operator delete(void* p, void*, NAMemory*)
{
// This shouldn't do anything.
}
-NA_EIDPROC
void* NABasicObject::operator new[](size_t t, CollHeap* h, NABoolean failureIsFatal)
{
if (t < sizeof(NABasicObject))
@@ -225,7 +212,6 @@ void* NABasicObject::operator new[](size_t t, CollHeap* h, NABoolean failureIsFa
return p;
}
-NA_EIDPROC
void NABasicObject::operator delete[](void* p)
{
#if 0
@@ -238,13 +224,11 @@ void NABasicObject::operator delete[](void* p)
if (h == invalidHeapPtr())
{
#ifndef NDEBUG
- #ifndef __EID
cerr << "**WARNING: " << __FILE__ << ": "
<< "Ignoring attempt to delete pointer twice "
<< "(possible memory leak at " << p << "; need to run Purify)"
<< endl;
#endif
- #endif
return;
}
@@ -263,7 +247,6 @@ void NABasicObject::operator delete[](void* p)
}
// This function will be called if the constructor throws an exception.
-NA_EIDPROC
void NABasicObject::operator delete[](void* p, NAMemory* h, NABoolean)
{
if ( p ) {
@@ -274,13 +257,12 @@ void NABasicObject::operator delete[](void* p, NAMemory* h, NABoolean)
}
}
-//NA_EIDPROC
+//
//void* operator new[](size_t, NAMemory* h, NABoolean failureIsFatal)
//{
//return NABasicObject::operator new(t, h, failureIsFatal);
//}
-//NA_EIDPROC
//void* NABasicObject::operator delete[](void* p /* , another arg; see C++ ARM*/)
//{
// We need to call multiple destructors here, one for each object in
@@ -301,8 +283,6 @@ void NABasicObject::operator delete[](void* p, NAMemory* h, NABoolean)
// This finds latent bugs.)
#if !defined(NDEBUG)
-#ifndef __EID
- NA_EIDPROC
Int32 NABasicObject::checkInvalidObject(const void* const referencingObject)
{
if (this && maybeInvalidObject())
@@ -328,8 +308,6 @@ void NABasicObject::operator delete[](void* p, NAMemory* h, NABoolean)
return 0;
}
#endif
-#endif
-
// -----------------------------------------------------------------------
// overloaded new operator for CollHeap*
@@ -346,7 +324,6 @@ void NABasicObject::operator delete[](void* p, NAMemory* h, NABoolean)
// The compiler does not support exception yet. Should be done when
// the compiler supports exception.
//
-NA_EIDPROC
void* operator new (size_t t, CollHeap* h)
{
@@ -365,7 +342,6 @@ void* operator new (size_t t, CollHeap* h)
}
-NA_EIDPROC
void* operator new[] (size_t t, CollHeap* h)
{
//return ( (h) ? h->allocateMemory(t) : (::new char[t] ) );
@@ -385,7 +361,6 @@ void* operator new[] (size_t t, CollHeap* h)
}
-NA_EIDPROC
void* operator new[] (size_t t, CollHeap* h, NABoolean failureIsFatal)
{
if (NOT_CHECK_NAHEAP(h))
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/export/NABasicObject.h
----------------------------------------------------------------------
diff --git a/core/sql/export/NABasicObject.h b/core/sql/export/NABasicObject.h
index 01acb1c..d20c192 100644
--- a/core/sql/export/NABasicObject.h
+++ b/core/sql/export/NABasicObject.h
@@ -41,10 +41,6 @@
#include "Platform.h"
#include "NAStdlib.h"
-//#ifndef NA_NO_C_RUNTIME
-//#include <stdio.h>
-//#endif
-#include "SqlExportDllDefines.h"
#include "NABoolean.h"
#ifndef NULL
@@ -149,16 +145,12 @@ typedef NAMemory CollHeap ;
// memory management for classes derived from it.
// -----------------------------------------------------------------------
-class SQLEXPORT_LIB_FUNC NABasicObject
+class NABasicObject
{
// NT_PORT ( bd 12/10/96 )
protected:
-#ifndef PRIV_SRL
-NA_EIDPROC virtual ~NABasicObject() {};
-#else
-NA_EIDPROC ~NABasicObject() {};
-#endif // PRIV_SRL
+ virtual ~NABasicObject() {};
public:
@@ -172,25 +164,25 @@ public:
// do "delete h_;"! Likewise, the assignment operator here does not
// overwrite the h_ pointer.
- NA_EIDPROC NABasicObject();
- NA_EIDPROC NABasicObject(const NABasicObject&);
- NA_EIDPROC NABasicObject& operator=(const NABasicObject&);
+ NABasicObject();
+ NABasicObject(const NABasicObject&);
+ NABasicObject& operator=(const NABasicObject&);
- NA_EIDPROC void* operator new[](size_t t, NAMemory* h = 0, NABoolean failureIsFatal = TRUE);
+ void* operator new[](size_t t, NAMemory* h = 0, NABoolean failureIsFatal = TRUE);
void operator delete[](void*);
void operator delete[](void*, NAMemory*, NABoolean);
// In the future, when the compiler supports the operator new[] and
// operator [] delete, they should be added here for array allocation.
- // NA_EIDPROC void* operator new[](size_t, NAMemory* h = 0, NABoolean failureIsFatal = TRUE);
+ // void* operator new[](size_t, NAMemory* h = 0, NABoolean failureIsFatal = TRUE);
// void operator delete[](void*, etc... -- see .C file comments...)
- NA_EIDPROC void* operator new(size_t t, NAMemory* h = 0, NABoolean failureIsFatal = TRUE );
- NA_EIDPROC void* operator new(size_t t, void* loc, NAMemory* h = 0);
+ void* operator new(size_t t, NAMemory* h = 0, NABoolean failureIsFatal = TRUE );
+ void* operator new(size_t t, void* loc, NAMemory* h = 0);
- NA_EIDPROC void operator delete(void*);
- NA_EIDPROC void operator delete(void*, NAMemory*, NABoolean);
- NA_EIDPROC void operator delete(void*, void*, NAMemory*);
+ void operator delete(void*);
+ void operator delete(void*, NAMemory*, NABoolean);
+ void operator delete(void*, void*, NAMemory*);
// The CollHeap* returned is where this object is allocated from;
// if this object is allocated through new, it will be some CollHeap* or 0.
@@ -200,7 +192,7 @@ public:
// CollHeap* as further memory allocation, it is the user's
// responsibility to make sure the object is not from stack.
- NA_EIDPROC NAMemory* collHeap() { return h_; }
+ NAMemory* collHeap() { return h_; }
// The delete operator sets the object-being-deleted's heap pointer to the
// invalid value below. Thus dangling pointers to this object can *sometimes*
@@ -223,16 +215,16 @@ public:
// to be out-of-bounds for a heap. (0x0 already has a meaning: that no heap
// is to be used, just the global new/delete.)
- NA_EIDPROC static CollHeap* invalidHeapPtr() { return (CollHeap*)0x1; }
- NA_EIDPROC static CollHeap* systemHeapPtr() { return (CollHeap*)0x0; }
- NA_EIDPROC Int32 maybeInvalidObject() { return h_ == invalidHeapPtr();}
+ static CollHeap* invalidHeapPtr() { return (CollHeap*)0x1; }
+ static CollHeap* systemHeapPtr() { return (CollHeap*)0x0; }
+ Int32 maybeInvalidObject() { return h_ == invalidHeapPtr();}
// For smart-pointer callers, some defensive programming for Debug build.
// For some reason, this method won't link into the NSK mxcmp static object.
#if !defined(NDEBUG)
- NA_EIDPROC Int32 checkInvalidObject(const void* const referencingObject=NULL);
+ Int32 checkInvalidObject(const void* const referencingObject=NULL);
#else
- NA_EIDPROC Int32 checkInvalidObject(const void* const = NULL)
+ Int32 checkInvalidObject(const void* const = NULL)
{ return 0/*not invalid*/; }
#endif
@@ -243,10 +235,6 @@ private:
CollHeap* h_;
-#ifdef PRIV_SRL
- void * dummyvtbl_; //solve offset problems for priv srls
-#endif //PRIV_SRL
-
};
// -----------------------------------------------------------------------
@@ -255,12 +243,10 @@ private:
// other than system area, use the overloaded new.
// -----------------------------------------------------------------------
-SQLEXPORT_LIB_FUNC
void * operator new(size_t size, CollHeap* h);
-SQLEXPORT_LIB_FUNC
void * operator new[](size_t size, CollHeap* h);
-SQLEXPORT_LIB_FUNC
+
void * operator new[](size_t size, CollHeap* h, NABoolean failureIsFatal);
// The following operator delete functions will be called to free memory if
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/export/NAInternalError.h
----------------------------------------------------------------------
diff --git a/core/sql/export/NAInternalError.h b/core/sql/export/NAInternalError.h
index a120b14..5fdf0ca 100644
--- a/core/sql/export/NAInternalError.h
+++ b/core/sql/export/NAInternalError.h
@@ -34,11 +34,9 @@
*
*****************************************************************************
*/
-#include "SqlExportDllDefines.h"
-
class ExceptionCallBack;
-class SQLEXPORT_LIB_FUNC NAInternalError {
+class NAInternalError {
private:
static ExceptionCallBack *pExceptionCallBack_;
public:
[23/30] incubator-trafodion git commit: TRAFODION-2731 CodeCleanup:
Remove obsolete, legacy and unused code
Posted by an...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/cli/sqlcli.h
----------------------------------------------------------------------
diff --git a/core/sql/cli/sqlcli.h b/core/sql/cli/sqlcli.h
index 4366de9..a27d942 100644
--- a/core/sql/cli/sqlcli.h
+++ b/core/sql/cli/sqlcli.h
@@ -33,27 +33,17 @@
******************************************************************************
*/
-
-#ifdef __gnu_linux__
-#endif /* __gnu_linux__ */
-
/* Size specific types used here */
typedef int Int32;
typedef unsigned int UInt32;
-#if defined(NA_LINUX) && defined(NA_64BIT)
+#if defined(NA_64BIT)
typedef long Int64;
#else
typedef long long int Int64;
#endif
#undef SQLCLI_LIB_FUNC
-
- #define SQLCLI_LIB_FUNC
-#ifdef NA_64BIT
- /* dg64 - get rid of __declspec */
- #undef SQLCLI_LIB_FUNC
- #define SQLCLI_LIB_FUNC
-#endif
+#define SQLCLI_LIB_FUNC
#ifdef __cplusplus
extern "C"
@@ -882,7 +872,6 @@ enum SQLSTATS_TYPE {
SQLCLI_NO_STATS = 0,
/* SQLCLI_DEFAULT_STATS means the statistics is merged based on the statistics view type */
SQLCLI_DEFAULT_STATS = 0,
- SQLCLI_MEASURE_STATS = 1,
SQLCLI_ACCUMULATED_STATS = 2,
SQLCLI_PERTABLE_STATS = 3,
SQLCLI_ALL_STATS = 4,
@@ -1306,38 +1295,30 @@ typedef struct {
};
} SQL_QIKEY;
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_AddModule (
- /*IN*/ SQLMODULE_ID * module_name);
-
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_ADDMODULE (
- /*IN*/ SQLMODULE_ID * module_name);
-
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_AllocDesc (
+Int32 SQL_EXEC_AllocDesc (
/*INOUT*/ SQLDESC_ID * desc_id,
/*IN OPTIONAL*/ SQLDESC_ID * input_descriptor);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_ALLOCDESC (
+Int32 SQL_EXEC_ALLOCDESC (
/*INOUT*/ SQLDESC_ID * desc_id,
/*IN OPTIONAL*/ SQLDESC_ID * input_descriptor);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_AllocDescBasic (
+Int32 SQL_EXEC_AllocDescBasic (
/*INOUT*/ SQLDESC_ID * desc_id,
/*IN OPTIONAL*/ Int32 max_entries);
-
-
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_AssocFileNumber (
+Int32 SQL_EXEC_AssocFileNumber (
/*IN*/ SQLSTMT_ID * statement_id,
/*IN*/ short file_number);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_ASSOCFILENUMBER (
+Int32 SQL_EXEC_ASSOCFILENUMBER (
/*IN*/ SQLSTMT_ID * statement_id,
/*IN*/ short file_number);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetDiskMaxSize (
+Int32 SQL_EXEC_GetDiskMaxSize (
/*IN*/ char *volname,
/*OUT*/ Int64 *totalCapacity,
/*OUT*/ Int64 *totalFreespace);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetListOfDisks (
+Int32 SQL_EXEC_GetListOfDisks (
/*IN/OUT*/ char *diskBuf,
/* OUT */ Int32 *numTSEs,
/* OUT */ Int32 *maxTSELength,
@@ -1345,146 +1326,136 @@ SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetListOfDisks (
);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_AllocStmt (
+Int32 SQL_EXEC_AllocStmt (
/*INOUT*/ SQLSTMT_ID * new_statement_id,
/*IN OPTIONAL*/ SQLSTMT_ID * cloned_statement);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_ALLOCSTMT (
+Int32 SQL_EXEC_ALLOCSTMT (
/*INOUT*/ SQLSTMT_ID * new_statement_id,
/*IN OPTIONAL*/ SQLSTMT_ID * cloned_statement);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_AllocStmtForRS (
+Int32 SQL_EXEC_AllocStmtForRS (
/*IN*/ SQLSTMT_ID *callStmtId,
/*IN*/ Int32 resultSetIndex,
/*INOUT*/ SQLSTMT_ID *resultSetStmtId);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_ALLOCSTMTFORRS (
+Int32 SQL_EXEC_ALLOCSTMTFORRS (
/*IN*/ SQLSTMT_ID *callStmtId,
/*IN*/ Int32 resultSetIndex,
/*INOUT*/ SQLSTMT_ID *resultSetStmtId);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_ClearDiagnostics (/*IN*/ SQLSTMT_ID *statement_id);
+Int32 SQL_EXEC_ClearDiagnostics (/*IN*/ SQLSTMT_ID *statement_id);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_CLEARDIAGNOSTICS (/*IN*/ SQLSTMT_ID *statement_id);
+Int32 SQL_EXEC_CLEARDIAGNOSTICS (/*IN*/ SQLSTMT_ID *statement_id);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_CLI_VERSION ();
+Int32 SQL_EXEC_CLI_VERSION ();
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_CloseStmt (
+Int32 SQL_EXEC_CloseStmt (
/*IN*/ SQLSTMT_ID * statement_id);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_CLOSESTMT (
+Int32 SQL_EXEC_CLOSESTMT (
/*IN*/ SQLSTMT_ID * statement_id);
-SQLCLI_LIB_FUNC
Int32 SQL_EXEC_CreateContext(/*OUT*/ SQLCTX_HANDLE * context_handle,
/*IN OPTIONAL*/ char* sqlAuthId,
/*IN OPTIONAL*/ Int32 suppressAutoXactStart);
-SQLCLI_LIB_FUNC
Int32 SQL_EXEC_CREATECONTEXT(/*OUT*/ SQLCTX_HANDLE * context_handle,
/*IN OPTIONAL*/ char* sqlAuthId,
/*IN OPTIONAL*/ Int32 suppressAutoXactStart);
-SQLCLI_LIB_FUNC
Int32 SQL_EXEC_CurrentContext(/*OUT*/ SQLCTX_HANDLE * contextHandle);
-SQLCLI_LIB_FUNC
Int32 SQL_EXEC_CURRENTCONTEXT(/*OUT*/ SQLCTX_HANDLE * contextHandle);
-SQLCLI_LIB_FUNC
Int32 SQL_EXEC_DeleteContext(/*IN*/ SQLCTX_HANDLE contextHandle);
-SQLCLI_LIB_FUNC
Int32 SQL_EXEC_DELETECONTEXT(/*IN*/ SQLCTX_HANDLE contextHandle);
-SQLCLI_LIB_FUNC
Int32 SQL_EXEC_ResetContext(/*IN*/ SQLCTX_HANDLE contextHandle, /*IN*/ void *contextMsg);
-SQLCLI_LIB_FUNC
Int32 SQL_EXEC_RESETCONTEXT(/*IN*/ SQLCTX_HANDLE contextHandle, /*IN*/ void *contextMsg);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_DeallocDesc (
+Int32 SQL_EXEC_DeallocDesc (
/*IN*/ SQLDESC_ID * desc_id );
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_DEALLOCDESC (
+Int32 SQL_EXEC_DEALLOCDESC (
/*IN*/ SQLDESC_ID * desc_id );
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_DeallocStmt (
+Int32 SQL_EXEC_DeallocStmt (
/*IN*/ SQLSTMT_ID * statement_id);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_DEALLOCSTMT (
+Int32 SQL_EXEC_DEALLOCSTMT (
/*IN*/ SQLSTMT_ID * statement_id);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_DefineDesc (
+Int32 SQL_EXEC_DefineDesc (
/*IN*/ SQLSTMT_ID * statement_id,
/*IN* (SQLWHAT_DESC) */ Int32 what_descriptor,
/*IN*/ SQLDESC_ID * sql_descriptor);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_DEFINEDESC (
+Int32 SQL_EXEC_DEFINEDESC (
/*IN*/ SQLSTMT_ID * statement_id,
/*IN* (SQLWHAT_DESC) */ Int32 what_descriptor,
/*IN*/ SQLDESC_ID * sql_descriptor);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_DescribeStmt (
+Int32 SQL_EXEC_DescribeStmt (
/*IN*/ SQLSTMT_ID * statement_id,
/*IN OPTIONAL*/ SQLDESC_ID * input_descriptor,
/*IN OPTIONAL*/ SQLDESC_ID * output_descriptor);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_DESCRIBESTMT (
+Int32 SQL_EXEC_DESCRIBESTMT (
/*IN*/ SQLSTMT_ID * statement_id,
/*IN OPTIONAL*/ SQLDESC_ID * input_descriptor,
/*IN OPTIONAL*/ SQLDESC_ID * output_descriptor);
-SQLCLI_LIB_FUNC
Int32 SQL_EXEC_DisassocFileNumber(/*IN*/ SQLSTMT_ID * statement_id);
-SQLCLI_LIB_FUNC
Int32 SQL_EXEC_DISASSOCFILENUMBER(/*IN*/ SQLSTMT_ID * statement_id);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_DropContext (
+Int32 SQL_EXEC_DropContext (
/*IN*/ SQLCTX_HANDLE context_handle );
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_DROPCONTEXT (
+Int32 SQL_EXEC_DROPCONTEXT (
/*IN*/ SQLCTX_HANDLE context_handle );
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_Exec (
+Int32 SQL_EXEC_Exec (
/*IN*/ SQLSTMT_ID * statement_id,
/*IN OPTIONAL*/ SQLDESC_ID * input_descriptor,
/*IN*/ Int32 num_ptr_pairs,
...);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_EXEC (
+Int32 SQL_EXEC_EXEC (
/*IN*/ SQLSTMT_ID * statement_id,
/*IN OPTIONAL*/ SQLDESC_ID * input_descriptor,
/*IN*/ Int32 num_ptr_pairs,
/*IN*/ struct SQLCLI_PTR_PAIRS ptr_pairs[]);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_ExecClose (
+Int32 SQL_EXEC_ExecClose (
/*IN*/ SQLSTMT_ID * statement_id,
/*IN OPTIONAL*/ SQLDESC_ID * input_descriptor,
/*IN*/ Int32 num_ptr_pairs,
...);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_EXECCLOSE (
+Int32 SQL_EXEC_EXECCLOSE (
/*IN*/ SQLSTMT_ID * statement_id,
/*IN OPTIONAL*/ SQLDESC_ID * input_descriptor,
/*IN*/ Int32 num_ptr_pairs,
/*IN*/ struct SQLCLI_PTR_PAIRS ptr_pairs[]);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_ExecDirect(
+Int32 SQL_EXEC_ExecDirect(
/*IN*/ SQLSTMT_ID * statement_id,
/*IN*/ SQLDESC_ID * sql_source,
/*IN OPTIONAL*/ SQLDESC_ID * input_descriptor,
/*IN*/ Int32 num_ptr_pairs,
...);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_ExecDirect2(
+Int32 SQL_EXEC_ExecDirect2(
/*IN*/ SQLSTMT_ID * statement_id,
/*IN*/ SQLDESC_ID * sql_source,
/*IN*/ Int32 prepFlags,
@@ -1492,40 +1463,40 @@ SQLCLI_LIB_FUNC Int32 SQL_EXEC_ExecDirect2(
/*IN*/ Int32 num_ptr_pairs,
...
);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_EXECDIRECT (
+Int32 SQL_EXEC_EXECDIRECT (
/*IN*/ SQLSTMT_ID * statement_id,
/*IN*/ SQLDESC_ID * sql_source,
/*IN OPTIONAL*/ SQLDESC_ID * input_descriptor,
/*IN*/ Int32 num_ptr_pairs,
/*IN*/ struct SQLCLI_PTR_PAIRS ptr_pairs[]);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_ExecDirectDealloc(
+Int32 SQL_EXEC_ExecDirectDealloc(
/*IN*/ SQLSTMT_ID * statement_id,
/*IN*/ SQLDESC_ID * sql_source,
/*IN OPTIONAL*/ SQLDESC_ID * input_descriptor,
/*IN*/ Int32 num_ptr_pairs,
...);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_EXECDIRECTDEALLOC(
+Int32 SQL_EXEC_EXECDIRECTDEALLOC(
/*IN*/ SQLSTMT_ID * statement_id,
/*IN*/ SQLDESC_ID * sql_source,
/*IN OPTIONAL*/ SQLDESC_ID * input_descriptor,
/*IN*/ Int32 num_ptr_pairs,
/*IN*/ struct SQLCLI_PTR_PAIRS ptr_pairs[]);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_ExecFetch(
+Int32 SQL_EXEC_ExecFetch(
/*IN*/ SQLSTMT_ID * statement_id,
/*IN OPTIONAL*/ SQLDESC_ID * input_descriptor,
/*IN*/ Int32 num_ptr_pairs,
...);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_EXECFETCH(
+Int32 SQL_EXEC_EXECFETCH(
/*IN*/ SQLSTMT_ID * statement_id,
/*IN OPTIONAL*/ SQLDESC_ID * input_descriptor,
/*IN*/ Int32 num_ptr_pairs,
/*IN*/ struct SQLCLI_PTR_PAIRS ptr_pairs[]);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_ClearExecFetchClose(
+Int32 SQL_EXEC_ClearExecFetchClose(
/*IN*/ SQLSTMT_ID * statement_id,
/*IN OPTIONAL*/ SQLDESC_ID * input_descriptor,
/*IN OPTIONAL*/ SQLDESC_ID * output_descriptor,
@@ -1534,7 +1505,7 @@ SQLCLI_LIB_FUNC Int32 SQL_EXEC_ClearExecFetchClose(
/*IN*/ Int32 num_total_ptr_pairs,
...);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_CLEAREXECFETCHCLOSE(
+Int32 SQL_EXEC_CLEAREXECFETCHCLOSE(
/*IN*/ SQLSTMT_ID * statement_id,
/*IN OPTIONAL*/ SQLDESC_ID * input_descriptor,
/*IN OPTIONAL*/ SQLDESC_ID * output_descriptor,
@@ -1544,63 +1515,63 @@ SQLCLI_LIB_FUNC Int32 SQL_EXEC_CLEAREXECFETCHCLOSE(
/*IN*/ struct SQLCLI_PTR_PAIRS input_ptr_pairs[],
/*IN*/ struct SQLCLI_PTR_PAIRS output_ptr_pairs[]);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_Fetch(
+Int32 SQL_EXEC_Fetch(
/*IN*/ SQLSTMT_ID * statement_id,
/*IN OPTIONAL*/ SQLDESC_ID * output_descriptor,
/*IN*/ Int32 num_ptr_pairs,
...);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_FETCH(
+Int32 SQL_EXEC_FETCH(
/*IN*/ SQLSTMT_ID * statement_id,
/*IN OPTIONAL*/ SQLDESC_ID * output_descriptor,
/*IN*/ Int32 num_ptr_pairs,
/*IN*/ struct SQLCLI_PTR_PAIRS ptr_pairs[]);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_FetchClose(
+Int32 SQL_EXEC_FetchClose(
/*IN*/ SQLSTMT_ID * statement_id,
/*IN OPTIONAL*/ SQLDESC_ID * output_descriptor,
/*IN*/ Int32 num_ptr_pairs,
...);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_FETCHCLOSE(
+Int32 SQL_EXEC_FETCHCLOSE(
/*IN*/ SQLSTMT_ID * statement_id,
/*IN OPTIONAL*/ SQLDESC_ID * output_descriptor,
/*IN*/ Int32 num_ptr_pairs,
/*IN*/ struct SQLCLI_PTR_PAIRS ptr_pairs[]);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_FetchMultiple(/*IN*/ SQLSTMT_ID * statement_id,
+Int32 SQL_EXEC_FetchMultiple(/*IN*/ SQLSTMT_ID * statement_id,
/*IN OPTIONAL*/ SQLDESC_ID * output_descriptor,
/*IN*/ Int32 rowset_size,
/*IN*/ Int32 * rowset_status_ptr,
/*OUT*/ Int32 * rowset_nfetched,
/*IN*/ Int32 num_quadruple_fields,
...);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_FETCHMULTIPLE(/*IN*/ SQLSTMT_ID * statement_id,
+Int32 SQL_EXEC_FETCHMULTIPLE(/*IN*/ SQLSTMT_ID * statement_id,
/*IN OPTIONAL*/ SQLDESC_ID * output_descriptor,
/*IN*/ Int32 rowset_size,
/*IN*/ Int32 * rowset_status_ptr,
/*OUT*/ Int32 * rowset_nfetched,
/*IN*/ Int32 num_quadruple_fields,
/*IN*/ struct SQLCLI_QUAD_FIELDS quad_fields[]);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_Cancel (
+Int32 SQL_EXEC_Cancel (
/*IN OPTIONAL*/ SQLSTMT_ID * statement_id);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_CANCEL (
+Int32 SQL_EXEC_CANCEL (
/*IN OPTIONAL*/ SQLSTMT_ID * statement_id);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetDescEntryCount(
+Int32 SQL_EXEC_GetDescEntryCount(
/*IN*/ SQLDESC_ID * sql_descriptor,
/*IN*/ SQLDESC_ID * output_descriptor);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GETDESCENTRYCOUNT(
+Int32 SQL_EXEC_GETDESCENTRYCOUNT(
/*IN*/ SQLDESC_ID * sql_descriptor,
/*IN*/ SQLDESC_ID * output_descriptor);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetDescEntryCountBasic(
+Int32 SQL_EXEC_GetDescEntryCountBasic(
/*IN*/ SQLDESC_ID * sql_descriptor,
/*OUT*/ Int32 * num_entries);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetDescItem(
+Int32 SQL_EXEC_GetDescItem(
/*IN*/ SQLDESC_ID * sql_descriptor,
/*IN*/ Int32 entry,
/*IN* (SQLDESC_ITEM_ID) */ Int32 what_to_get,
@@ -1610,7 +1581,7 @@ SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetDescItem(
/*OUT OPTIONAL*/ Int32 * len_of_item,
/*IN OPTIONAL*/ Int32 start_from_offset);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GETDESCITEM(
+Int32 SQL_EXEC_GETDESCITEM(
/*IN*/ SQLDESC_ID * sql_descriptor,
/*IN*/ Int32 entry,
/*IN* (SQLDESC_ITEM_ID) */ Int32 what_to_get,
@@ -1620,37 +1591,37 @@ SQLCLI_LIB_FUNC Int32 SQL_EXEC_GETDESCITEM(
/*OUT OPTIONAL*/ Int32 * len_of_item,
/*IN OPTIONAL*/ Int32 start_from_offset);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetDescItems(
+Int32 SQL_EXEC_GetDescItems(
/*IN*/ SQLDESC_ID * sql_descriptor,
/*IN*/ SQLDESC_ITEM desc_items[],
/*IN*/ SQLDESC_ID * value_num_descriptor,
/*IN*/ SQLDESC_ID * output_descriptor);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GETDESCITEMS(
+Int32 SQL_EXEC_GETDESCITEMS(
/*IN*/ SQLDESC_ID * sql_descriptor,
/*IN*/ SQLDESC_ITEM desc_items[],
/*IN*/ SQLDESC_ID * value_num_descriptor,
/*IN*/ SQLDESC_ID * output_descriptor);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetDescItems2(
+Int32 SQL_EXEC_GetDescItems2(
/*IN*/ SQLDESC_ID * sql_descriptor,
/*IN*/ Int32 no_of_desc_items,
/*IN*/ SQLDESC_ITEM desc_items[]);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GETDESCITEMS2(
+Int32 SQL_EXEC_GETDESCITEMS2(
/*IN*/ SQLDESC_ID * sql_descriptor,
/*IN*/ Int32 no_of_desc_items,
/*IN*/ SQLDESC_ITEM desc_items[]);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetDiagnosticsStmtInfo(
+Int32 SQL_EXEC_GetDiagnosticsStmtInfo(
/*IN*/ Int32 *stmt_info_items,
/*IN*/ SQLDESC_ID * output_descriptor);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GETDIAGNOSTICSSTMTINFO(
+Int32 SQL_EXEC_GETDIAGNOSTICSSTMTINFO(
/*IN*/ Int32 *stmt_info_items,
/*IN*/ SQLDESC_ID * output_descriptor);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetDiagnosticsStmtInfo2(
+Int32 SQL_EXEC_GetDiagnosticsStmtInfo2(
/*IN OPTIONAL*/ SQLSTMT_ID * statement_id,
/*IN* (SQLDIAG_STMT_INFO_ITEM_ID) */ Int32 what_to_get,
/*OUT OPTIONAL*/ void * numeric_value,
@@ -1658,7 +1629,7 @@ SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetDiagnosticsStmtInfo2(
/*IN OPTIONAL*/ Int32 max_string_len,
/*OUT OPTIONAL*/ Int32 * len_of_item);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GETDIAGNOSTICSSTMTINFO2(
+Int32 SQL_EXEC_GETDIAGNOSTICSSTMTINFO2(
/*IN OPTIONAL*/ SQLSTMT_ID * statement_id,
/*IN* (SQLDIAG_STMT_INFO_ITEM_ID) */ Int32 what_to_get,
/*OUT OPTIONAL*/ void * numeric_value,
@@ -1666,17 +1637,17 @@ SQLCLI_LIB_FUNC Int32 SQL_EXEC_GETDIAGNOSTICSSTMTINFO2(
/*IN OPTIONAL*/ Int32 max_string_len,
/*OUT OPTIONAL*/ Int32 * len_of_item);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetDiagnosticsCondInfo(
+Int32 SQL_EXEC_GetDiagnosticsCondInfo(
/*IN*/ SQLDIAG_COND_INFO_ITEM *cond_info_items,
/*IN*/ SQLDESC_ID * cond_num_descriptor,
/*IN*/ SQLDESC_ID * output_descriptor);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GETDIAGNOSTICSCONDINFO(
+Int32 SQL_EXEC_GETDIAGNOSTICSCONDINFO(
/*IN*/ SQLDIAG_COND_INFO_ITEM *cond_info_items,
/*IN*/ SQLDESC_ID * cond_num_descriptor,
/*IN*/ SQLDESC_ID * output_descriptor);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetDiagnosticsCondInfo2(
+Int32 SQL_EXEC_GetDiagnosticsCondInfo2(
/*IN* (SQLDIAG_COND_INFO_ITEM_ID) */ Int32 what_to_get,
/*IN*/ Int32 conditionNum,
/*OUT OPTIONAL*/ Int32 * numeric_value,
@@ -1684,7 +1655,7 @@ SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetDiagnosticsCondInfo2(
/*IN OPTIONAL */ Int32 max_string_len,
/*OUT OPTIONAL*/ Int32 * len_of_item);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GETDIAGNOSTICSCONDINFO2(
+Int32 SQL_EXEC_GETDIAGNOSTICSCONDINFO2(
/*IN* (SQLDIAG_COND_INFO_ITEM_ID) */ Int32 what_to_get,
/*IN*/ Int32 conditionNum,
/*OUT OPTIONAL*/ Int32 * numeric_value,
@@ -1692,64 +1663,64 @@ SQLCLI_LIB_FUNC Int32 SQL_EXEC_GETDIAGNOSTICSCONDINFO2(
/*IN OPTIONAL */ Int32 max_string_len,
/*OUT OPTIONAL*/ Int32 * len_of_item);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetDiagnosticsCondInfo3 (
+Int32 SQL_EXEC_GetDiagnosticsCondInfo3 (
/*IN*/ Int32 no_of_condition_items,
/*IN*/ SQLDIAG_COND_INFO_ITEM_VALUE
diag_cond_info_item_values[]);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GETDIAGNOSTICSCONDINFO3 (
+Int32 SQL_EXEC_GETDIAGNOSTICSCONDINFO3 (
/*IN*/ Int32 no_of_condition_items,
/*IN*/ SQLDIAG_COND_INFO_ITEM_VALUE
diag_cond_info_item_values[]);
/* This function retrieves the SQLSTATE from the statement diagnostics area
if possible */
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetMainSQLSTATE(
+Int32 SQL_EXEC_GetMainSQLSTATE(
/*IN*/ SQLSTMT_ID * statement_id,
/*IN*/ Int32 sqlcode,
/*OUT*/ char * sqlstate /* assumed to be char[6] */);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GETMAINSQLSTATE(
+Int32 SQL_EXEC_GETMAINSQLSTATE(
/*IN*/ SQLSTMT_ID * statement_id,
/*IN*/ Int32 sqlcode,
/*OUT*/ char * sqlstate /* assumed to be char[6] */);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetCSQLSTATE(
+Int32 SQL_EXEC_GetCSQLSTATE(
/*OUT*/ char * sqlstate /* assumed to be char[6] */,
/*IN*/ Int32 sqlcode);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GETCSQLSTATE(
+Int32 SQL_EXEC_GETCSQLSTATE(
/*OUT*/ char * sqlstate /* assumed to be char[6] */,
/*IN*/ Int32 sqlcode);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetCobolSQLSTATE(
+Int32 SQL_EXEC_GetCobolSQLSTATE(
/*OUT*/ char * sqlstate /* assumed to be char[5] */,
/*IN*/ Int32 sqlcode);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GETCOBOLSQLSTATE(
+Int32 SQL_EXEC_GETCOBOLSQLSTATE(
/*OUT*/ char * sqlstate /* assumed to be char[5] */,
/*IN*/ Int32 sqlcode);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetSQLSTATE(
+Int32 SQL_EXEC_GetSQLSTATE(
/*OUT*/ char * sqlstate /* assumed to be char[6] */);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GETSQLSTATE(
+Int32 SQL_EXEC_GETSQLSTATE(
/*OUT*/ char * sqlstate /* assumed to be char[6] */);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetSessionAttr(
+Int32 SQL_EXEC_GetSessionAttr(
/*IN* (SESSIONATTR_TYPE) */ Int32 attrName,
/*OUT OPTIONAL*/ Int32 * numeric_value,
/*OUT OPTIONAL*/ char * string_value,
/*IN OPTIONAL*/ Int32 max_string_len,
/*OUT OPTIONAL*/ Int32 * len_of_item);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetUniqueQueryIdAttrs (
+Int32 SQL_EXEC_GetUniqueQueryIdAttrs (
/*IN*/ char * uniqueQueryId,
/*IN*/ Int32 uniqueQueryIdLen,
/*IN*/ Int32 no_of_attrs,
/*INOUT*/ UNIQUEQUERYID_ATTR unique_queryid_attrs[]);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetStmtAttr(
+Int32 SQL_EXEC_GetStmtAttr(
/*IN*/ SQLSTMT_ID * statement_id,
/*IN* (SQLATTR_TYPE) */ Int32 attrName,
/*OUT OPTIONAL*/ Int32 * numeric_value,
@@ -1757,7 +1728,7 @@ SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetStmtAttr(
/*IN OPTIONAL*/ Int32 max_string_len,
/*OUT OPTIONAL*/ Int32 * len_of_item);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GETSTMTATTR(
+Int32 SQL_EXEC_GETSTMTATTR(
/*IN*/ SQLSTMT_ID * statement_id,
/*IN* (SQLATTR_TYPE) */ Int32 attrName,
/*OUT OPTIONAL*/ Int32 * numeric_value,
@@ -1765,55 +1736,39 @@ SQLCLI_LIB_FUNC Int32 SQL_EXEC_GETSTMTATTR(
/*IN OPTIONAL*/ Int32 max_string_len,
/*OUT OPTIONAL*/ Int32 * len_of_item);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetStmtAttrs(
+Int32 SQL_EXEC_GetStmtAttrs(
/*IN*/ SQLSTMT_ID * statement_id,
/*IN*/ Int32 number_of_attrs,
/*INOUT*/ SQLSTMT_ATTR attrs[],
/*OUT OPTIONAL*/ Int32 * num_returned);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GETSTMTATTRS(
+Int32 SQL_EXEC_GETSTMTATTRS(
/*IN*/ SQLSTMT_ID * statement_id,
/*IN*/ Int32 number_of_attrs,
/*INOUT*/ SQLSTMT_ATTR attrs[],
/*OUT OPTIONAL*/ Int32 * num_returned);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GETMPCATALOG(
- /*IN*/ char * AnsiObjName,
- /*INOUT*/ char * MPObjName,
- /*IN*/ Int32 MPObjNameMaxLen,
- /*INOUT*/ Int32 * MPObjNameLen,
- /*OUT*/ char * MPCatalogName,
- /*IN*/ Int32 MPCatalogNameMaxLen,
- /*OUT*/ Int32 * MPCatalogNameLen);
-
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetPfsSize(
- /*OUT*/ Int32 *pfsSize,
- /*OUT*/ Int32 *pfsCurUse,
- /*OUT*/ Int32 *pfsMaxUse);
-
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetExplainData(
+Int32 SQL_EXEC_GetExplainData(
/*IN*/ SQLSTMT_ID * statement_id,
/*INOUT*/ char * explain_ptr,
/*IN*/ Int32 explain_len,
/*INOUT*/ Int32 * ret_explain_len);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_StoreExplainData(
+Int32 SQL_EXEC_StoreExplainData(
/*IN*/ Int64 * exec_start_utc_ts,
/*IN*/ char * query_id,
/*INOUT*/ char * explain_ptr,
/*IN*/ Int32 explain_len);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_CleanUpPfsResources();
-
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_Prepare(
+Int32 SQL_EXEC_Prepare(
/*IN*/ SQLSTMT_ID * statement_id,
/*IN*/ SQLDESC_ID * sql_source);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_PREPARE(
+Int32 SQL_EXEC_PREPARE(
/*IN*/ SQLSTMT_ID * statement_id,
/*IN*/ SQLDESC_ID * sql_source);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_Prepare2(
+Int32 SQL_EXEC_Prepare2(
/*IN*/ SQLSTMT_ID * statement_id,
/*IN*/ SQLDESC_ID * sql_source,
/*INOUT*/ char * gencode_ptr,
@@ -1825,131 +1780,131 @@ SQLCLI_LIB_FUNC Int32 SQL_EXEC_Prepare2(
/*INOUT*/ Int32 * uniqueQueryIdLen,
/*IN*/ UInt32 flags);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_ResDescName(
+Int32 SQL_EXEC_ResDescName(
/*INOUT*/ SQLDESC_ID * statement_id,
/*IN OPTIONAL*/ SQLSTMT_ID * from_statement,
/*IN OPTIONAL (SQLWHAT_DESC) */ Int32 what_desc);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_RESDESCNAME(
+Int32 SQL_EXEC_RESDESCNAME(
/*INOUT*/ SQLDESC_ID * statement_id,
/*IN OPTIONAL*/ SQLSTMT_ID * from_statement,
/*IN OPTIONAL (SQLWHAT_DESC) */ Int32 what_desc);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_ResStmtName(
+Int32 SQL_EXEC_ResStmtName(
/*INOUT*/ SQLSTMT_ID * statement_id);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_RESSTMTNAME(
+Int32 SQL_EXEC_RESSTMTNAME(
/*INOUT*/ SQLSTMT_ID * statement_id);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_SetCursorName(
+Int32 SQL_EXEC_SetCursorName(
/*IN*/ SQLSTMT_ID * statement_id,
/*IN*/ SQLSTMT_ID * cursor_name);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_SETCURSORNAME(
+Int32 SQL_EXEC_SETCURSORNAME(
/*IN*/ SQLSTMT_ID * statement_id,
/*IN*/ SQLSTMT_ID * cursor_name);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_SetDescEntryCount(
+Int32 SQL_EXEC_SetDescEntryCount(
/*IN*/ SQLDESC_ID * sql_descriptor,
/*IN*/ SQLDESC_ID * input_descriptor);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_SETDESCENTRYCOUNT(
+Int32 SQL_EXEC_SETDESCENTRYCOUNT(
/*IN*/ SQLDESC_ID * sql_descriptor,
/*IN*/ SQLDESC_ID * input_descriptor);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_SetDescEntryCountBasic(
+Int32 SQL_EXEC_SetDescEntryCountBasic(
/*IN*/ SQLDESC_ID * sql_descriptor,
/*IN*/ Int32 num_entries);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_SetDescItem(
+Int32 SQL_EXEC_SetDescItem(
/*IN*/ SQLDESC_ID * sql_descriptor,
/*IN*/ Int32 entry,
/*IN* (SQLDESC_ITEM_ID) */ Int32 what_to_set,
/*IN OPTIONAL*/ long numeric_value,
/*IN OPTIONAL*/ char * string_value);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_SETDESCITEM(
+Int32 SQL_EXEC_SETDESCITEM(
/*IN*/ SQLDESC_ID * sql_descriptor,
/*IN*/ Int32 entry,
/*IN* (SQLDESC_ITEM_ID) */ Int32 what_to_set,
/*IN OPTIONAL*/ long numeric_value,
/*IN OPTIONAL*/ char * string_value);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_SetDescItems(
+Int32 SQL_EXEC_SetDescItems(
/*IN*/ SQLDESC_ID * sql_descriptor,
/*IN*/ SQLDESC_ITEM desc_items[],
/*IN*/ SQLDESC_ID * value_num_descriptor,
/*IN*/ SQLDESC_ID * input_descriptor);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_SETDESCITEMS(
+Int32 SQL_EXEC_SETDESCITEMS(
/*IN*/ SQLDESC_ID * sql_descriptor,
/*IN*/ SQLDESC_ITEM desc_items[],
/*IN*/ SQLDESC_ID * value_num_descriptor,
/*IN*/ SQLDESC_ID * input_descriptor);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_SetDescItems2(
+Int32 SQL_EXEC_SetDescItems2(
/*IN*/ SQLDESC_ID * sql_descriptor,
/*IN*/ Int32 no_of_desc_items,
/*IN*/ SQLDESC_ITEM desc_items[]);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_SETDESCITEMS2(
+Int32 SQL_EXEC_SETDESCITEMS2(
/*IN*/ SQLDESC_ID * sql_descriptor,
/*IN*/ Int32 no_of_desc_items,
/*IN*/ SQLDESC_ITEM desc_items[]);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_SetDescPointers(
+Int32 SQL_EXEC_SetDescPointers(
/*IN*/ SQLDESC_ID * sql_descriptor,
/*IN*/ Int32 starting_entry,
/*IN*/ Int32 num_ptr_pairs,
...);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_SETDESCPOINTERS(
+Int32 SQL_EXEC_SETDESCPOINTERS(
/*IN*/ SQLDESC_ID * sql_descriptor,
/*IN*/ Int32 starting_entry,
/*IN*/ Int32 num_ptr_pairs,
/*IN*/ struct SQLCLI_PTR_PAIRS ptr_pairs[]);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_SetRowsetDescPointers(SQLDESC_ID * desc_id,
+Int32 SQL_EXEC_SetRowsetDescPointers(SQLDESC_ID * desc_id,
Int32 rowset_size,
Int32 *rowset_status_ptr,
Int32 starting_entry,
Int32 num_quadruple_fields,
...);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_SETROWSETDESCPOINTERS(SQLDESC_ID * desc_id,
+Int32 SQL_EXEC_SETROWSETDESCPOINTERS(SQLDESC_ID * desc_id,
Int32 rowset_size,
Int32 *rowset_status_ptr,
Int32 starting_entry,
Int32 num_quadruple_fields,
struct SQLCLI_QUAD_FIELDS quad_fields[]);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_SetStmtAttr(
+Int32 SQL_EXEC_SetStmtAttr(
/*IN*/ SQLSTMT_ID * statement_id,
/*IN* (SQLATTR_TYPE) */ Int32 attrName,
/*IN OPTIONAL*/ Int32 numeric_value,
/*IN OPTIONAL*/ char * string_value);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_SETSTMTATTR(
+Int32 SQL_EXEC_SETSTMTATTR(
/*IN*/ SQLSTMT_ID * statement_id,
/*IN* (SQLATTR_TYPE) */ Int32 attrName,
/*IN OPTIONAL*/ Int32 numeric_value,
/*IN OPTIONAL*/ char * string_value);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_SwitchContext(
+Int32 SQL_EXEC_SwitchContext(
/*IN*/ SQLCTX_HANDLE context_handle,
/*OUT OPTIONAL*/ SQLCTX_HANDLE * prev_context_handle);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_SWITCHCONTEXT(
+Int32 SQL_EXEC_SWITCHCONTEXT(
/*IN*/ SQLCTX_HANDLE context_handle,
/*OUT OPTIONAL*/ SQLCTX_HANDLE * prev_context_handle);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_Xact(
+Int32 SQL_EXEC_Xact(
/*IN* (SQLTRANS_COMMAND) */ Int32 command,
/*OUT OPTIONAL*/ SQLDESC_ID * transid_descriptor);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_XACT(
+Int32 SQL_EXEC_XACT(
/*IN* (SQLTRANS_COMMAND) */ Int32 command,
/*OUT OPTIONAL*/ SQLDESC_ID * transid_descriptor);
@@ -1961,36 +1916,20 @@ Int32 SQL_EXEC_SetAuthID(
Int32 effectiveUserID, /*IN*/
Int32 sessionUserID); /*IN*/
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_SETAUTHID(
+Int32 SQL_EXEC_SETAUTHID(
/*IN*/ char * authID,
/*IN SQLAUTHID_TYPE */ Int32 authIDType,
/* OUT OPTIONAL primaryRole*/ char *primaryRole,
/* OUT OPTIONAL role len*/ short *primaryRoleLen,
- /* OUT OPTIONAL userRedefTime*/ Int64 *redefTime); // NA_64BIT
+ /* OUT OPTIONAL userRedefTime*/ Int64 *redefTime);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetAuthState(
+Int32 SQL_EXEC_GetAuthState(
/*OUT*/ bool & authenticationEnabled,
/*OUT*/ bool & authorizationEnabled,
/*OUT*/ bool & authorizationReady,
/*OUT*/ bool & auditingEnabled);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_DecodeAndFormatKey(
- /*IN*/void * RCB_Pointer_Addr,
- /*IN*/void * KeyAddr,
- /*IN*/Int32 KeyLength,
- /*INOUT*/void * DecodedKeyBufAddr,
- /*INOUT*/void * FormattedKeyBufAddr,
- /*IN*/Int32 FormattedKeyBufLen,
- /*OUT*/Int32 * NeededKeyBufLen );
-
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetPartitionKeyFromRow(
- /*IN*/void * RCB_Pointer_Addr,
- /*IN*/void * Row_Addr,
- /*IN*/Int32 Row_Length,
- /*INOUT*/void * KeyAddr,
- /*IN*/Int32 KeyLength);
-
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_LocaleToUTF8 (
+Int32 SQL_EXEC_LocaleToUTF8 (
/*IN*/Int32 conv_charset,
/*IN*/void * Input_Buffer_Addr,
/*IN*/Int32 Input_Buffer_Length,
@@ -2002,7 +1941,7 @@ SQLCLI_LIB_FUNC Int32 SQL_EXEC_LocaleToUTF8 (
/*OUT*/Int32 * num_translated_char
);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_UTF8ToLocale(
+Int32 SQL_EXEC_UTF8ToLocale(
/*IN*/Int32 conv_charset,
/*IN*/void * Input_Buffer_Addr,
/*IN*/Int32 Input_Buffer_Length,
@@ -2016,7 +1955,7 @@ SQLCLI_LIB_FUNC Int32 SQL_EXEC_UTF8ToLocale(
/*IN*/void * substitution_char_addr
);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_LocaleToUTF16 (
+Int32 SQL_EXEC_LocaleToUTF16 (
/*IN*/Int32 conv_charset,
/*IN*/void * Input_Buffer_Addr,
/*IN*/Int32 Input_Buffer_Length,
@@ -2029,7 +1968,7 @@ SQLCLI_LIB_FUNC Int32 SQL_EXEC_LocaleToUTF16 (
/*OUT*/Int32 * num_translated_char
);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_UTF16ToLocale(
+Int32 SQL_EXEC_UTF16ToLocale(
/*IN*/Int32 conv_charset,
/*IN*/void * Input_Buffer_Addr,
/*IN*/Int32 Input_Buffer_Length,
@@ -2043,11 +1982,12 @@ SQLCLI_LIB_FUNC Int32 SQL_EXEC_UTF16ToLocale(
/*OUT*/Int32 * num_translated_char,
/*IN*/void * substitution_char_addr
);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_SetSecInvalidKeys(
+
+Int32 SQL_EXEC_SetSecInvalidKeys(
/* IN */ Int32 numSiKeys,
/* IN */ SQL_QIKEY siKeys[]);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetSecInvalidKeys(
+Int32 SQL_EXEC_GetSecInvalidKeys(
/* IN */ Int64 prevTimestamp,
/* IN/OUT */ SQL_QIKEY siKeys[],
/* IN */ Int32 maxNumSiKeys,
@@ -2055,7 +1995,7 @@ SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetSecInvalidKeys(
/* IN/OUT */ Int64 *maxTimestamp);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetStatistics2(
+Int32 SQL_EXEC_GetStatistics2(
/* IN */ short statsReqType,
/* IN */ char *statsReqStr,
/* IN */ Int32 statsReqStrLen,
@@ -2066,14 +2006,14 @@ SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetStatistics2(
/* IN */ Int32 max_stats_desc,
/* OUT */ Int32 *no_returned_stats_desc);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetStatisticsItems(
+Int32 SQL_EXEC_GetStatisticsItems(
/* IN */ short statsReqType,
/* IN */ char *queryId,
/* IN */ Int32 queryIdLen,
/* IN */ Int32 no_of_stats_items,
/* IN/OUT */ SQLSTATS_ITEM sqlstats_items[]);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetChildQueryInfo(
+Int32 SQL_EXEC_GetChildQueryInfo(
/*IN*/ SQLSTMT_ID * statement_id,
/*INOUT*/ char * uniqueQueryId,
/*IN */ Int32 uniqueQueryIdMaxLen,
@@ -2086,19 +2026,19 @@ SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetChildQueryInfo(
/* temporary functions -- for use by sqlcat simulator only */
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_AllocDesc (
+Int32 SQL_EXEC_AllocDesc (
/*INOUT*/ SQLDESC_ID * desc_id,
/*IN OPTIONAL*/ Int32 max_entries);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetDescEntryCount(
+Int32 SQL_EXEC_GetDescEntryCount(
/*IN*/ SQLDESC_ID * sql_descriptor,
/*OUT*/ Int32 * num_entries);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_SetDescEntryCount(
+Int32 SQL_EXEC_SetDescEntryCount(
/*IN*/ SQLDESC_ID * sql_descriptor,
/*IN*/ Int32 num_entries);
-SQLCLI_LIB_FUNC short sqInit();
+short sqInit();
#endif /*__cplusplus*/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/cli/test.cpp
----------------------------------------------------------------------
diff --git a/core/sql/cli/test.cpp b/core/sql/cli/test.cpp
index 285d32a..d706a41 100644
--- a/core/sql/cli/test.cpp
+++ b/core/sql/cli/test.cpp
@@ -18,103 +18,4 @@
// under the License.
//
// @@@ END COPYRIGHT @@@
-#include <limits.h>
-#include <stdlib.h>
-#include <iostream>
-
-class A
-{
-
-public:
- void * operator new(size_t size, Int32 a);
- void * operator new(size_t size);
- void operator delete(void * ptr);
-private:
- Int32 a;
-};
-
-class C
-{
- friend class B;
-
- Int32 a;
-public:
- C()
- {
- a = 10;
- };
-
-};
-
-
-class B : public A
-{
-public:
- B();
- ~B();
-
- Int32 b;
-
- C c;
-};
-
-void C()
-{
- cout << "C\n";
-
-}
-
-void D()
-{
- cout << "D \n";
-
-}
-
-void E()
-{
- cout << "E \n";
-}
-
-void * A::operator new(size_t size, Int32 a)
-{
- C();
-
- return ::operator new(size);
-}
-
-void * A::operator new(size_t size)
-{
- D();
-
- return ::operator new(size);
-}
-
-void A::operator delete(void * ptr)
-{
- E();
-
- ::operator delete(ptr);
-}
-
-B::B()
-{
- b = 10;
-
- cout << c.a << endl;
-}
-
-B::~B()
-{
- b = -1;
-}
-
-Int32 main()
-{
- B * b = new(1) B();
-
- delete b;
-
- return 0;
-}
-
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/comexe/CmpMessage.cpp
----------------------------------------------------------------------
diff --git a/core/sql/comexe/CmpMessage.cpp b/core/sql/comexe/CmpMessage.cpp
index 38d7a19..55bcf42 100644
--- a/core/sql/comexe/CmpMessage.cpp
+++ b/core/sql/comexe/CmpMessage.cpp
@@ -262,13 +262,11 @@ void CmpMessageReplyBasic::unpackMyself(IpcMessageObjType objType,
CmpCompileInfo::CmpCompileInfo(char * sourceStr, Lng32 sourceStrLen,
Lng32 sourceStrCharSet,
char * schemaName, Lng32 schemaNameLen,
- char * recompControlInfo, Lng32 recompControlInfoLen,
ULng32 inputArrayMaxsize, short atomicity)
: flags_(0),
sqltext_(sourceStr), sqlTextLen_(sourceStrLen),
sqlTextCharSet_(sourceStrCharSet),
schemaName_(schemaName), schemaNameLen_(schemaNameLen),
- recompControlInfo_(recompControlInfo), recompControlInfoLen_(recompControlInfoLen),
inputArrayMaxsize_(inputArrayMaxsize)
{
if (atomicity == 1) {
@@ -291,8 +289,6 @@ CmpCompileInfo::CmpCompileInfo()
sqlTextCharSet_(0),
schemaName_(NULL),
schemaNameLen_(0),
- recompControlInfo_(NULL),
- recompControlInfoLen_(0),
inputArrayMaxsize_(0)
{
str_pad(fillerBytes_, FILLERSIZE, '\0');
@@ -306,8 +302,6 @@ void CmpCompileInfo::init()
sqlTextCharSet_ = 0;
schemaName_ = NULL;
schemaNameLen_ = 0;
- recompControlInfo_ = NULL;
- recompControlInfoLen_ = 0;
inputArrayMaxsize_ = 0;
}
@@ -321,8 +315,7 @@ Lng32 CmpCompileInfo::getLength()
Lng32 CmpCompileInfo::getVarLength()
{
return ROUND8(sqlTextLen_) +
- ROUND8(schemaNameLen_)
- + ROUND8(recompControlInfoLen_);
+ ROUND8(schemaNameLen_);
}
void CmpCompileInfo::packVars(char * buffer, CmpCompileInfo *ci,
@@ -341,13 +334,6 @@ void CmpCompileInfo::packVars(char * buffer, CmpCompileInfo *ci,
ci->schemaName_ = (char *)nextOffset;
nextOffset += ROUND8(schemaNameLen_);
}
-
- if (recompControlInfo_ && (recompControlInfoLen_ > 0))
- {
- str_cpy_all(&buffer[nextOffset], (char *)recompControlInfo_, recompControlInfoLen_);
- ci->recompControlInfo_ = (char *)nextOffset;
- nextOffset += ROUND8(recompControlInfoLen_);
- }
}
void CmpCompileInfo::pack(char * buffer)
@@ -375,15 +361,10 @@ void CmpCompileInfo::unpack(char * base)
schemaName_ = base + (Lng32)(Long)schemaName_;
}
- if (recompControlInfo_)
- {
- recompControlInfo_ = base + (Lng32)(Long)recompControlInfo_;
- }
}
void CmpCompileInfo::getUnpackedFields(char* &sqltext,
- char* &schemaName,
- char* &recompControlInfo)
+ char* &schemaName)
{
char * base = (char *)this;
@@ -397,11 +378,6 @@ void CmpCompileInfo::getUnpackedFields(char* &sqltext,
schemaName = base + (Lng32)(Long)schemaName_;
}
- recompControlInfo = NULL;
- if (recompControlInfo_)
- {
- recompControlInfo = base + (Lng32)(Long)recompControlInfo_;
- }
}
const short CmpCompileInfo::getRowsetAtomicity()
@@ -446,11 +422,9 @@ CmpDDLwithStatusInfo::CmpDDLwithStatusInfo()
CmpDDLwithStatusInfo::CmpDDLwithStatusInfo(char * sourceStr, Lng32 sourceStrLen,
Lng32 sourceStrCharSet,
- char * schemaName, Lng32 schemaNameLen,
- char * recompControlInfo, Lng32 recompControlInfoLen)
+ char * schemaName, Lng32 schemaNameLen)
: CmpCompileInfo(sourceStr, sourceStrLen, sourceStrCharSet,
schemaName, schemaNameLen,
- recompControlInfo, recompControlInfoLen,
0, 0)
{
statusFlags_ = 0;
@@ -649,7 +623,6 @@ IpcMessageObjSize CmpMessageReplyCode::packMyself(IpcMessageBufferPtr& buffer)
return size;
}
-#ifdef NA_CMPDLL
IpcMessageObjSize
CmpMessageReplyCode::copyFragsToBuffer(IpcMessageBufferPtr& buffer)
{
@@ -673,7 +646,6 @@ CmpMessageReplyCode::copyFragsToBuffer(IpcMessageBufferPtr& buffer)
return size;
}
-#endif // NA_CMPDLL
// -----------------------------------------------------------------------
// methods for CmpMessageRequest
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/comexe/CmpMessage.h
----------------------------------------------------------------------
diff --git a/core/sql/comexe/CmpMessage.h b/core/sql/comexe/CmpMessage.h
index fde5f53..5c306f5 100644
--- a/core/sql/comexe/CmpMessage.h
+++ b/core/sql/comexe/CmpMessage.h
@@ -90,7 +90,6 @@ public:
INTERNALSP_REQUEST,
INTERNALSP_GETNEXT,
ENVS_REFRESH,
- READTABLEDEF_REQUEST,
SQLTEXT_RECOMPILE, // tells mxcmp to decache & recompile query
SQLTEXT_STATIC_RECOMPILE,
END_SESSION,
@@ -185,7 +184,7 @@ protected:
char* strPtr, ULng32 maxSize,
ULng32& sizeMoved);
- NA_EIDPROC void advanceSize(IpcMessageObjSize &size,
+ void advanceSize(IpcMessageObjSize &size,
const void * const buffPtr, Lng32 sz=0)
{
const Int32 lenSize = sizeof(CmpMsgBufLenType);
@@ -196,7 +195,7 @@ protected:
ID id_;
- NA_EIDPROC void advanceSize(IpcMessageObjSize &size, Int64 i64)
+ void advanceSize(IpcMessageObjSize &size, Int64 i64)
{ size += sizeof(i64); }
IpcMessageObjSize packIntoBuffer(char* &buffer, Int64 i64)
@@ -310,7 +309,6 @@ public:
CmpCompileInfo(char * sourceStr, Lng32 sourceStrLen,
Lng32 sourceStrCharSet,
char * schemaName, Lng32 schemaNameLen,
- char * recompControlInfo, Lng32 recompControlInfoLen,
ULng32 inputArrayMaxsize,
short rowsetAtomicity);
CmpCompileInfo();
@@ -326,17 +324,12 @@ public:
void unpack(char * base);
void getUnpackedFields(char* &sqltext,
- char* &schemaName,
- char* &recompControlInfo);
+ char* &schemaName);
const ULng32 getInputArrayMaxsize() {return inputArrayMaxsize_ ;}
const short getRowsetAtomicity();
- NABoolean nametypeNsk() { return (flags_ & NAMETYPE_NSK) != 0; }
- void setNametypeNsk(NABoolean v)
- { (v ? flags_ |= NAMETYPE_NSK : flags_ &= ~NAMETYPE_NSK); }
-
NABoolean odbcProcess() { return (flags_ & ODBC_PROCESS) != 0; }
void setOdbcProcess(NABoolean v)
{ (v ? flags_ |= ODBC_PROCESS : flags_ &= ~ODBC_PROCESS); }
@@ -382,7 +375,7 @@ public:
void setDoNotCachePlan(NABoolean v)
{ (v ? flags_ |= DO_NOT_CACHE_PLAN : flags_ &= ~DO_NOT_CACHE_PLAN); }
- enum { FILLERSIZE = 56 /* used to be 60 - took 4 bytes for sqlTextCharSet_ */ } ; // of original 72
+ enum { FILLERSIZE = 60 };
protected:
enum Flags
@@ -430,10 +423,8 @@ protected:
ULng32 inputArrayMaxsize_; // 32-35
ULng32 flags_; // 36-39
- char * recompControlInfo_; // 40-43
- Lng32 recompControlInfoLen_; // 44-47
- Lng32 sqlTextCharSet_; // 48-51
- char fillerBytes_[FILLERSIZE]; // 52-107
+ Lng32 sqlTextCharSet_; // 40-43
+ char fillerBytes_[FILLERSIZE]; // 44-103
};
#pragma warn(1506) // warning elimination
@@ -854,8 +845,7 @@ class CmpDDLwithStatusInfo : public CmpCompileInfo
CmpDDLwithStatusInfo(char * sourceStr, Lng32 sourceStrLen,
Lng32 sourceStrCharSet,
- char * schemaName, Lng32 schemaNameLen,
- char * recompControlInfo, Lng32 recompControlInfoLen);
+ char * schemaName, Lng32 schemaNameLen);
short getClassSize() { return (short)sizeof(CmpDDLwithStatusInfo); }
Lng32 getLength();
@@ -1096,9 +1086,7 @@ public:
IpcMessageObjSize mypackedLength();
IpcMessageObjSize packMyself(IpcMessageBufferPtr& buffer);
-#ifdef NA_CMPDLL
IpcMessageObjSize copyFragsToBuffer(IpcMessageBufferPtr& buffer);
-#endif // NA_CMPDLL
private:
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/comexe/ComKeyMDAM.h
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComKeyMDAM.h b/core/sql/comexe/ComKeyMDAM.h
index 123c6ea..ca51fa8 100644
--- a/core/sql/comexe/ComKeyMDAM.h
+++ b/core/sql/comexe/ComKeyMDAM.h
@@ -98,17 +98,17 @@ private:
Int16 reverseEndpoints_; // 38-39
// private method used by public methods getValue() and getValue2()
- NA_EIDPROC ex_expr::exp_return_type getValue_(ExExprPtr value,
+ ex_expr::exp_return_type getValue_(ExExprPtr value,
atp_struct * atp0,
atp_struct * atp1);
public:
- NA_EIDPROC MdamPred() // for use by unpack only
+ MdamPred() // for use by unpack only
: NAVersionedObject(-1)
{ }
- NA_EIDPROC MdamPred(Lng32 disjunctNumber,
+ MdamPred(Lng32 disjunctNumber,
MdamPredType pred_type,
ex_expr *value,
ex_expr *value2 = NULL,
@@ -130,45 +130,45 @@ public:
// ---------------------------------------------------------------------
// Redefine virtual functions required for Versioning.
//----------------------------------------------------------------------
- NA_EIDPROC virtual unsigned char getClassVersionID()
+ virtual unsigned char getClassVersionID()
{
return 1;
}
- NA_EIDPROC virtual void populateImageVersionIDArray()
+ virtual void populateImageVersionIDArray()
{
setImageVersionID(0,getClassVersionID());
}
- NA_EIDPROC virtual short getClassSize() { return (short)sizeof(MdamPred); }
+ virtual short getClassSize() { return (short)sizeof(MdamPred); }
- NA_EIDPROC ~MdamPred() { };
+ ~MdamPred() { };
// methods used during Generation only
void setOr()
{ firstInOrGroup_ = FALSE; };
- NA_EIDPROC Long pack(void *);
- NA_EIDPROC Lng32 unpack(void *,void * reallocator);
+ Long pack(void *);
+ Lng32 unpack(void *,void * reallocator);
- NA_EIDPROC ex_expr::exp_return_type fixup(Lng32 base, unsigned short,
+ ex_expr::exp_return_type fixup(Lng32 base, unsigned short,
const ex_tcb *tcb,
Space * space,
CollHeap *heap);
- NA_EIDPROC void setNext(MdamPred *next) { next_ = next; };
- NA_EIDPROC MdamPred *getNext() { return next_; };
- NA_EIDPROC NABoolean firstInOrGroup() { return firstInOrGroup_; };
- NA_EIDPROC Lng32 getDisjunctNumber() { return disjunctNumber_; };
+ void setNext(MdamPred *next) { next_ = next; };
+ MdamPred *getNext() { return next_; };
+ NABoolean firstInOrGroup() { return firstInOrGroup_; };
+ Lng32 getDisjunctNumber() { return disjunctNumber_; };
- NA_EIDPROC MdamPredType getPredType()
+ MdamPredType getPredType()
{ return (enum MdamPredType)predType_; };
- NA_EIDPROC NABoolean reverseEndpoints()
+ NABoolean reverseEndpoints()
{ return (NABoolean)reverseEndpoints_; }
// Indicates whether the start of an MDAM_BETWEEN interval is inclusive.
- NA_EIDPROC MdamEnums::MdamInclusion getStartInclusion()
+ MdamEnums::MdamInclusion getStartInclusion()
{
return val1Inclusive_
? MdamEnums::MDAM_INCLUDED
@@ -176,7 +176,7 @@ public:
}
// Indicates whether the end of an MDAM_BETWEEN interval is inclusive.
- NA_EIDPROC MdamEnums::MdamInclusion getEndInclusion()
+ MdamEnums::MdamInclusion getEndInclusion()
{
return val2Inclusive_
? MdamEnums::MDAM_INCLUDED
@@ -185,7 +185,7 @@ public:
// This function computes a transformed predicate type based on
// predType_ and dataConvErrorFlag.
- NA_EIDPROC MdamPredType getTransformedPredType
+ MdamPredType getTransformedPredType
(Lng32 dataConvErrorFlag,
Lng32 dataConvErrorFlag2,
MdamEnums::MdamInclusion& startInclusion,
@@ -193,11 +193,11 @@ public:
// Get the value used in this predicate. For MDAM_BETWEEN, which has two values,
// this is the start value.
- NA_EIDPROC ex_expr::exp_return_type getValue(atp_struct* atp0, atp_struct* atp1)
+ ex_expr::exp_return_type getValue(atp_struct* atp0, atp_struct* atp1)
{ return getValue_(value_, atp0, atp1); }
// Used only for MDAM_BETWEEN, this gets the end value.
- NA_EIDPROC ex_expr::exp_return_type getValue2(atp_struct* atp0, atp_struct* atp1)
+ ex_expr::exp_return_type getValue2(atp_struct* atp0, atp_struct* atp1)
{ return getValue_(value2_, atp0, atp1); }
};
#pragma warn(1506) // warning elimination
@@ -256,11 +256,11 @@ private:
public:
- NA_EIDPROC MdamColumnGen() // for use by unpack only
+ MdamColumnGen() // for use by unpack only
: NAVersionedObject(-1)
{ preds_ = NULL; };
- NA_EIDPROC MdamColumnGen(MdamColumnGen *previous,
+ MdamColumnGen(MdamColumnGen *previous,
ULng32 columnLength,
ULng32 keyBufferOffset,
NABoolean useSparseProbes,
@@ -287,36 +287,36 @@ public:
}
};
- NA_EIDPROC ~MdamColumnGen();
+ ~MdamColumnGen();
// ---------------------------------------------------------------------
// Redefine virtual functions required for Versioning.
//----------------------------------------------------------------------
- NA_EIDPROC virtual unsigned char getClassVersionID()
+ virtual unsigned char getClassVersionID()
{
return 1;
}
- NA_EIDPROC virtual void populateImageVersionIDArray()
+ virtual void populateImageVersionIDArray()
{
setImageVersionID(0,getClassVersionID());
}
- NA_EIDPROC virtual short getClassSize()
+ virtual short getClassSize()
{ return (short)sizeof(MdamColumnGen); }
- NA_EIDPROC ex_expr::exp_return_type fixup(Lng32 base, unsigned short mode,
+ ex_expr::exp_return_type fixup(Lng32 base, unsigned short mode,
Space * space,
CollHeap *heap, const ex_tcb *tcb);
- NA_EIDPROC MdamColumnGen *getNext()
+ MdamColumnGen *getNext()
{ return next_; };
- NA_EIDPROC void setNext(MdamColumnGen *next)
+ void setNext(MdamColumnGen *next)
{ next_ = next; };
// the following function is used in the Generator to obtain the
// maximum disjunct number
- NA_EIDPROC Lng32 getLastDisjunctNumber()
+ Lng32 getLastDisjunctNumber()
{
Lng32 rc = -1;
@@ -341,32 +341,32 @@ public:
{ useSparseProbes_ = FALSE; };
// the following functions are used at MdamColumn constructor time
- NA_EIDPROC ex_expr *getHiExpr()
+ ex_expr *getHiExpr()
{ return hiExpr_; };
- NA_EIDPROC ex_expr *getLoExpr()
+ ex_expr *getLoExpr()
{ return loExpr_; };
- NA_EIDPROC ex_expr *getNonNullHiExpr()
+ ex_expr *getNonNullHiExpr()
{ return nonNullHiExpr_; };
- NA_EIDPROC ex_expr *getNonNullLoExpr()
+ ex_expr *getNonNullLoExpr()
{ return nonNullLoExpr_; };
// the following function is used at MdamColumn constructor time
// and during tree traversal
- NA_EIDPROC ULng32 getLength()
+ ULng32 getLength()
{ return columnLength_; };
// the following function is used during tree traversal
- NA_EIDPROC ULng32 getOffset()
+ ULng32 getOffset()
{ return keyBufferOffset_; };
- NA_EIDPROC NABoolean useSparseProbes()
+ NABoolean useSparseProbes()
{ return useSparseProbes_; };
// the following function used when building an Mdam network
- NA_EIDPROC MdamPred *getFirstPred()
+ MdamPred *getFirstPred()
{ return preds_; };
- NA_EIDPROC Long pack(void *);
- NA_EIDPROC Lng32 unpack(void *, void * reallocator);
+ Long pack(void *);
+ Lng32 unpack(void *, void * reallocator);
};
@@ -411,10 +411,10 @@ class keyMdamGen : public keyRangeGen
public:
- NA_EIDPROC keyMdamGen() // default constructor needed for UNPACK
+ keyMdamGen() // default constructor needed for UNPACK
{ first_ = 0; last_ = 0; };
- NA_EIDPROC keyMdamGen(ULng32 keyLen,
+ keyMdamGen(ULng32 keyLen,
ex_cri_desc * workCriDesc,
unsigned short keyValuesAtpIndex,
unsigned short excludeFlagAtpIndex,
@@ -428,50 +428,50 @@ public:
// ---------------------------------------------------------------------
// Redefine virtual functions required for Versioning.
//----------------------------------------------------------------------
- NA_EIDPROC virtual unsigned char getClassVersionID()
+ virtual unsigned char getClassVersionID()
{
return 1;
}
- NA_EIDPROC virtual void populateImageVersionIDArray()
+ virtual void populateImageVersionIDArray()
{
setImageVersionID(1,getClassVersionID());
keyRangeGen::populateImageVersionIDArray();
}
- NA_EIDPROC virtual short getClassSize() { return (short)sizeof(keyMdamGen); }
+ virtual short getClassSize() { return (short)sizeof(keyMdamGen); }
- NA_EIDPROC ~keyMdamGen();
+ ~keyMdamGen();
- NA_EIDPROC MdamColumnGen *getFirst() const
+ MdamColumnGen *getFirst() const
{ return first_; };
- NA_EIDPROC unsigned short getValueAtpIndex() const
+ unsigned short getValueAtpIndex() const
{ return valueAtpIndex_; };
- NA_EIDPROC Lng32 getMaxDisjunctNumber() const
+ Lng32 getMaxDisjunctNumber() const
{ return maxDisjunctNumber_; };
- NA_EIDPROC Lng32 getMaxMdamIntervals() const
+ Lng32 getMaxMdamIntervals() const
{ return maxMdamIntervals_; };
- NA_EIDPROC Lng32 getMaxMdamRefs() const
+ Lng32 getMaxMdamRefs() const
{ return maxMdamRefs_; };
- NA_EIDPROC Lng32 getMaxMdamRefsForStopLists() const
+ Lng32 getMaxMdamRefsForStopLists() const
{ return maxMdamRefsForStopLists_; };
- NA_EIDPROC NABoolean complementKeysBeforeReturning() const
+ NABoolean complementKeysBeforeReturning() const
{ return complementKeysBeforeReturning_; };
- NA_EIDPROC virtual Long pack(void * space);
- NA_EIDPROC virtual Lng32 unpack(void * base, void * reallocator);
- NA_EIDPROC virtual ex_expr* getExpressionNode(Int32 pos);
+ virtual Long pack(void * space);
+ virtual Lng32 unpack(void * base, void * reallocator);
+ virtual ex_expr* getExpressionNode(Int32 pos);
virtual keyMdamGen * castToKeyMdamGen() { return this; }
private:
- NA_EIDPROC NABoolean isBlank(char *text);
+ NABoolean isBlank(char *text);
};
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/comexe/ComKeyRange.cpp
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComKeyRange.cpp b/core/sql/comexe/ComKeyRange.cpp
index b46bc7a..2352925 100644
--- a/core/sql/comexe/ComKeyRange.cpp
+++ b/core/sql/comexe/ComKeyRange.cpp
@@ -68,7 +68,7 @@ keyRangeGen::keyRangeGen(key_type keyType,
// This method returns the virtual function table pointer for an object
// with the given class ID; used by NAVersionedObject::driveUnpack().
// -----------------------------------------------------------------------
-NA_EIDPROC char *keyRangeGen::findVTblPtr(short classID)
+char *keyRangeGen::findVTblPtr(short classID)
{
char *vtblPtr;
switch (classID)
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/comexe/ComKeyRange.h
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComKeyRange.h b/core/sql/comexe/ComKeyRange.h
index 5e1984a..ce80757 100644
--- a/core/sql/comexe/ComKeyRange.h
+++ b/core/sql/comexe/ComKeyRange.h
@@ -95,66 +95,66 @@ private:
public:
// default constructor needed by UNPACK
- NA_EIDPROC keyRangeGen()
+ keyRangeGen()
: NAVersionedObject(-1)
{}
- NA_EIDPROC keyRangeGen(key_type keyType,
+ keyRangeGen(key_type keyType,
ULng32 keyLen,
ex_cri_desc * workCriDesc,
unsigned short keyValuesAtpIndex,
unsigned short excludeFlagAtpIndex,
unsigned short dataConvErrorFlagAtpIndex);
- NA_EIDPROC virtual ~keyRangeGen() { };
+ virtual ~keyRangeGen() { };
// ---------------------------------------------------------------------
// Redefine virtual functions required for Versioning.
//----------------------------------------------------------------------
- NA_EIDPROC virtual char *findVTblPtr(short classID);
+ virtual char *findVTblPtr(short classID);
- NA_EIDPROC virtual unsigned char getClassVersionID()
+ virtual unsigned char getClassVersionID()
{
return 1;
}
- NA_EIDPROC virtual void populateImageVersionIDArray()
+ virtual void populateImageVersionIDArray()
{
setImageVersionID(0,getClassVersionID());
}
- NA_EIDPROC virtual short getClassSize()
+ virtual short getClassSize()
{ return (short)sizeof(keyRangeGen); }
virtual keySingleSubsetGen * castToKeySingleSubsetGen() { return NULL; }
virtual keyMdamGen * castToKeyMdamGen() { return NULL; }
// for UNPACK
- NA_EIDPROC void fixupVTblPtr();
+ void fixupVTblPtr();
// accessor functions
- NA_EIDPROC key_type getType() { return (key_type) keyType_; };
+ key_type getType() { return (key_type) keyType_; };
- NA_EIDPROC ULng32 getKeyLength() const
+ ULng32 getKeyLength() const
{ return keyLength_; };
- NA_EIDPROC ex_cri_desc * getWorkCriDesc() const
+ ex_cri_desc * getWorkCriDesc() const
{ return workCriDesc_; };
- NA_EIDPROC unsigned short getKeyValuesAtpIndex() const
+ unsigned short getKeyValuesAtpIndex() const
{ return keyValuesAtpIndex_; };
- NA_EIDPROC unsigned short getExcludeFlagAtpIndex() const
+ unsigned short getExcludeFlagAtpIndex() const
{ return excludeFlagAtpIndex_; };
- NA_EIDPROC unsigned short getDataConvErrorFlagAtpIndex() const
+ unsigned short getDataConvErrorFlagAtpIndex() const
{ return dataConvErrorFlagAtpIndex_; };
- NA_EIDPROC UInt16 getKeytag() const
+ UInt16 getKeytag() const
{ return keytag_; };
- NA_EIDPROC void setKeytag(UInt16 kt)
+ void setKeytag(UInt16 kt)
{ keytag_ = kt; };
- NA_EIDPROC virtual Long pack(void *);
- NA_EIDPROC virtual Lng32 unpack(void *, void * reallocator);
+ virtual Long pack(void *);
+ virtual Lng32 unpack(void *, void * reallocator);
- NA_EIDPROC virtual ex_expr* getExpressionNode(Int32 pos) { return NULL; }
+ virtual ex_expr* getExpressionNode(Int32 pos) { return NULL; }
};
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/comexe/ComKeySingleSubset.h
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComKeySingleSubset.h b/core/sql/comexe/ComKeySingleSubset.h
index 3401f9e..8b7df07 100644
--- a/core/sql/comexe/ComKeySingleSubset.h
+++ b/core/sql/comexe/ComKeySingleSubset.h
@@ -79,9 +79,9 @@ private:
public:
- NA_EIDPROC keySingleSubsetGen() {}; // default constructor used by UNPACK
+ keySingleSubsetGen() {}; // default constructor used by UNPACK
- NA_EIDPROC keySingleSubsetGen(ULng32 keyLen,
+ keySingleSubsetGen(ULng32 keyLen,
ex_cri_desc * workCriDesc,
unsigned short keyValuesAtpIndex,
unsigned short excludeFlagAtpIndex,
@@ -96,46 +96,46 @@ public:
// ---------------------------------------------------------------------
// Redefine virtual functions required for Versioning.
//----------------------------------------------------------------------
- NA_EIDPROC virtual unsigned char getClassVersionID()
+ virtual unsigned char getClassVersionID()
{
return 1;
}
- NA_EIDPROC virtual void populateImageVersionIDArray()
+ virtual void populateImageVersionIDArray()
{
setImageVersionID(1,getClassVersionID());
keyRangeGen::populateImageVersionIDArray();
}
- NA_EIDPROC virtual short getClassSize()
+ virtual short getClassSize()
{ return (short)sizeof(keySingleSubsetGen); }
- NA_EIDPROC virtual ~keySingleSubsetGen();
+ virtual ~keySingleSubsetGen();
- NA_EIDPROC virtual Long pack(void * space);
- NA_EIDPROC virtual Lng32 unpack(void * base, void * reallocator);
+ virtual Long pack(void * space);
+ virtual Lng32 unpack(void * base, void * reallocator);
- NA_EIDPROC virtual ex_expr* getExpressionNode(Int32 pos);
+ virtual ex_expr* getExpressionNode(Int32 pos);
virtual keySingleSubsetGen * castToKeySingleSubsetGen() { return this; }
// accessor functions
- NA_EIDPROC inline ex_expr * bkPred() const
+ inline ex_expr * bkPred() const
{ return bkPred_; };
- NA_EIDPROC inline ex_expr * ekPred() const
+ inline ex_expr * ekPred() const
{ return ekPred_; };
- NA_EIDPROC inline ex_expr * bkExcludedExpr() const
+ inline ex_expr * bkExcludedExpr() const
{ return lowKeyExcludedExpr_; }
- NA_EIDPROC inline ex_expr * ekExcludedExpr() const
+ inline ex_expr * ekExcludedExpr() const
{ return highKeyExcludedExpr_; }
- NA_EIDPROC inline short isBkeyExcluded() const
+ inline short isBkeyExcluded() const
{ return lowKeyExcluded_;}
- NA_EIDPROC inline short isEkeyExcluded() const
+ inline short isEkeyExcluded() const
{ return highKeyExcluded_;}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/comexe/ComQueue.cpp
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComQueue.cpp b/core/sql/comexe/ComQueue.cpp
index ba09683..7fec9d1 100644
--- a/core/sql/comexe/ComQueue.cpp
+++ b/core/sql/comexe/ComQueue.cpp
@@ -144,11 +144,7 @@ void Queue::insert(const void * entry_, ULng32 packedLength)
if (heap_)
tail->next = new(heap_) Q_Entry(0, 0, 0);
else
-#ifdef __EID
- assert(heap_);
-#else
tail->next = new Q_Entry(0, 0, 0);
-#endif // __EID
tail->next->prev = tail;
tail = tail->next;
numEntries_++;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/comexe/ComQueue.h
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComQueue.h b/core/sql/comexe/ComQueue.h
index b42c472..e110b49 100644
--- a/core/sql/comexe/ComQueue.h
+++ b/core/sql/comexe/ComQueue.h
@@ -117,18 +117,13 @@ class Q_Entry
char fillersQ_Entry_[20]; // 28-47
public:
-NA_EIDPROC
Q_Entry(void * entry_, Q_Entry * prev_, Q_Entry * next_);
-NA_EIDPROC
~Q_Entry();
-NA_EIDPROC
Long pack(void *space);
-NA_EIDPROC
Lng32 unpack(void *base);
-NA_EIDPROC
ULng32 packedLength() { return packedLength_; }
};
@@ -139,9 +134,6 @@ class Queue : public NAVersionedObject
Q_EntryPtr curr; // 16-23
CollHeap *heap_;
-#ifndef NA_64BIT
- char fillersQueue1_[4];
-#endif // 24-31
Int32 numEntries_; // 32-35
@@ -162,125 +154,97 @@ class Queue : public NAVersionedObject
};
public:
-NA_EIDPROC
Queue();
// ---------------------------------------------------------------------
// Redefine virtual functions required for Versioning.
//----------------------------------------------------------------------
-NA_EIDPROC
virtual unsigned char getClassVersionID()
{
return 1;
}
-NA_EIDPROC
virtual void populateImageVersionIDArray()
{
setImageVersionID(0,getClassVersionID());
}
-NA_EIDPROC
virtual short getClassSize() { return (short)sizeof(Queue); }
-NA_EIDPROC
Queue(CollHeap * heap);
-NA_EIDPROC
~Queue();
// inserts at tail
-NA_EIDPROC
void insert(const void * entry_, ULng32 entryPackedLength = 0);
// inserts at tail, returns addr of Queue entry inserted
-NA_EIDPROC
void insert(const void * entry_, ULng32 entryPackedLength,
void ** queueEntry);
// returns the head entry
-NA_EIDPROC
void * get();
// returns the i'th entry. 0 based. First entry is i = 0
-NA_EIDPROC
void * get(ULng32 i);
// returns the head entry
-NA_EIDPROC
void * getHead();
// returns the tail(last) entry
-NA_EIDPROC
void * getTail();
// positions on the head entry
-NA_EIDPROC
void position();
// positions on a specified Queue entry
-NA_EIDPROC
void position(void * queueEntry);
// returns the current entry
-NA_EIDPROC
void * getCurr();
// advances the current entry
-NA_EIDPROC
void advance();
// returns the current entry and advances curr
-NA_EIDPROC
void * getNext();
// returns -1, if all entries have been returned.
-NA_EIDPROC
short atEnd();
// removes the head entry
-NA_EIDPROC
void remove();
// removes the head entry
-NA_EIDPROC
void removeHead() { remove(); };
// removes the tail entry
-NA_EIDPROC
void removeTail();
-NA_EIDPROC
void removeWithSpaceOpt();
// removes the 'entry' entry
-NA_EIDPROC
NABoolean remove(void * entry);
-NA_EIDPROC
virtual Long pack(void * space);
-NA_EIDPROC
virtual Lng32 unpack(void * base, void * reallocator);
// returns -1, if queue is empty. Otherwise, returns 0.
-NA_EIDPROC
Int32 isEmpty()
{
return ((numEntries() == 0) ? -1 : 0);
}
-NA_EIDPROC
Lng32 numEntries() { return numEntries_;}
Lng32 entries() { return numEntries();}
-NA_EIDPROC
ULng32 packedLength() { return packedLength_; }
- NA_EIDPROC
+
void setDoSpaceOpt(short v) {(v ? flags_ |= DO_SPACE_OPT : flags_ &= ~DO_SPACE_OPT); };
NABoolean doSpaceOpt() { return (flags_ & DO_SPACE_OPT) != 0; };
@@ -308,7 +272,6 @@ class HashQueueEntry {
friend class HashQueue;
public:
-NA_EIDPROC
HashQueueEntry(void * entry,
HashQueueEntry * prev,
HashQueueEntry * next,
@@ -319,7 +282,6 @@ NA_EIDPROC
hashValue_(hashValue) {
};
-NA_EIDPROC
~HashQueueEntry() {
};
@@ -333,66 +295,48 @@ private:
class HashQueue : public NABasicObject {
public:
-NA_EIDPROC
HashQueue(CollHeap * heap, ULng32 hashTableSize = 513);
-NA_EIDPROC
HashQueue(const NABoolean shadowCopy,
const HashQueue &other);
-NA_EIDPROC
~HashQueue();
-NA_EIDPROC
ULng32 entries() { return entries_; }
-NA_EIDPROC
ULng32 size() { return hashTableSize_; }
-NA_EIDPROC
void insert(const char * data, ULng32 dataLength, void * entry);
// position by hashing
-NA_EIDPROC
void position(const char * data, ULng32 dataLength);
// position globally
-NA_EIDPROC
void position();
-NA_EIDPROC
void * getNext();
// returns the current entry
-NA_EIDPROC
void * getCurr();
// advances the current entry
-NA_EIDPROC
void advance();
-NA_EIDPROC
void remove(void * entry);
// To remove the last rrturned entry via getNext() in case of global scan
// of hash queue
-NA_EIDPROC
void remove();
// To remove the entry by passing in the hashing fields and the corresponding entry
-NA_EIDPROC
void remove(const char *data, ULng32 dataLength, void *entry);
-NA_EIDPROC
Lng32 numEntries() { return (Lng32)entries_;}
-NA_EIDPROC
NABoolean sequentialAdd() { return (flags_ & SEQUENTIAL_ADD) != 0; }
-NA_EIDPROC
void setSequentialAdd(NABoolean v)
{ (v ? flags_ |= SEQUENTIAL_ADD : flags_ &= ~SEQUENTIAL_ADD); }
-NA_EIDPROC
Int32 isEmpty() { return ((entries_ == 0) ? -1 : 0); }
private:
@@ -416,10 +360,8 @@ private:
ULng32 flags_;
-NA_EIDPROC
void getHashValue(const char * data, ULng32 dataLength);
-NA_EIDPROC
void removeLastReturned();
};
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/comexe/ComTdb.cpp
----------------------------------------------------------------------
diff --git a/core/sql/comexe/ComTdb.cpp b/core/sql/comexe/ComTdb.cpp
index 2c2ddcb..5007e01 100644
--- a/core/sql/comexe/ComTdb.cpp
+++ b/core/sql/comexe/ComTdb.cpp
@@ -57,7 +57,6 @@
// -----------------------------------------------------------------------
// Used in constructor to retrieve PCODE environment variables.
// -----------------------------------------------------------------------
-#ifndef __EID
/*static char *GetEnv(char *eye, char *prefix)
{
char buffer[32];
@@ -71,9 +70,7 @@
return getenv(buffer);
}*/
-#endif
-// LCOV_EXCL_START
// This method is called only if params parameter is sent to ComTdb constructor
// and no where in the code the ComTdb constructor is being called with
// params paramter. It was tested by removing the the param parameter
@@ -83,18 +80,8 @@ void ComTdbParams::getValues(Cardinality &estimatedRowCount,
ExCriDescPtr &criUp,
queue_index &sizeDown,
queue_index &sizeUp,
-#ifdef NA_64BIT
- // dg64 - match signature
Int32 &numBuffers,
-#else
- Lng32 &numBuffers,
-#endif
-#ifdef NA_64BIT
- // dg64 - match signature
UInt32 &bufferSize,
-#else
- ULng32 &bufferSize,
-#endif
Int32 &firstNRows)
{
estimatedRowCount = estimatedRowCount_;
@@ -105,12 +92,11 @@ void ComTdbParams::getValues(Cardinality &estimatedRowCount,
numBuffers = numBuffers_;
firstNRows = firstNRows_;
}
-// LCOV_EXCL_STOP
// -----------------------------------------------------------------------
// TDB constructor & Destructor
// -----------------------------------------------------------------------
-NA_EIDPROC ComTdb::ComTdb(
+ComTdb::ComTdb(
ex_node_type type,
const char *eye,
Cardinality estRowsUsed,
@@ -118,18 +104,8 @@ NA_EIDPROC ComTdb::ComTdb(
ex_cri_desc *criUp,
queue_index sizeDown,
queue_index sizeUp,
-#ifdef NA_64BIT
- // dg64 - match signature
Int32 numBuffers,
-#else
- Lng32 numBuffers,
-#endif
-#ifdef NA_64BIT
- // dg64 - match signature
UInt32 bufferSize,
-#else
- ULng32 bufferSize,
-#endif
Lng32 uniqueId,
ULng32 initialQueueSizeDown,
ULng32 initialQueueSizeUp,
@@ -178,14 +154,14 @@ NA_EIDPROC ComTdb::ComTdb(
}
-NA_EIDPROC ComTdb::ComTdb()
+ComTdb::ComTdb()
: NAVersionedObject(-1),
overflowMode_(OFM_DISK)
{
}
-NA_EIDPROC ComTdb::~ComTdb()
+ComTdb::~ComTdb()
{
// ---------------------------------------------------------------------
// Change the eye catcher
@@ -194,7 +170,7 @@ NA_EIDPROC ComTdb::~ComTdb()
}
-NA_EIDPROC Long ComTdb::pack(void *space)
+Long ComTdb::pack(void *space)
{
criDescDown_.pack(space);
criDescUp_.pack(space);
@@ -203,7 +179,7 @@ NA_EIDPROC Long ComTdb::pack(void *space)
return NAVersionedObject::pack(space);
}
-NA_EIDPROC Lng32 ComTdb::unpack(void * base, void * reallocator)
+Lng32 ComTdb::unpack(void * base, void * reallocator)
{
if(criDescDown_.unpack(base, reallocator)) return -1;
if(criDescUp_.unpack(base, reallocator)) return -1;
@@ -215,10 +191,9 @@ NA_EIDPROC Lng32 ComTdb::unpack(void * base, void * reallocator)
// Used by the internal SHOWPLAN command to get attributes of a TDB in a
// string.
// -----------------------------------------------------------------------
-NA_EIDPROC void ComTdb::displayContents(Space * space,ULng32 flag)
+void ComTdb::displayContents(Space * space,ULng32 flag)
{
-#ifndef __EID
char buf[100];
str_sprintf(buf, "Contents of %s [%d]:", getNodeName(),getExplainNodeId());
Int32 j = str_len(buf);
@@ -262,7 +237,6 @@ NA_EIDPROC void ComTdb::displayContents(Space * space,ULng32 flag)
space->allocateAndCopyToAlignedSpace(buf, str_len(buf), sizeof(short));
}
}
- #endif
if(flag & 0x00000001)
{
@@ -271,7 +245,7 @@ NA_EIDPROC void ComTdb::displayContents(Space * space,ULng32 flag)
}
}
-NA_EIDPROC void ComTdb::displayExpression(Space *space,ULng32 flag)
+void ComTdb::displayExpression(Space *space,ULng32 flag)
{
char buf[100];
@@ -289,10 +263,8 @@ NA_EIDPROC void ComTdb::displayExpression(Space *space,ULng32 flag)
(char *)getExpressionName(i),flag);
else
{
-#ifndef __EID
str_sprintf(buf, "Expression: %s is NULL\n", (char *)getExpressionName(i));
space->allocateAndCopyToAlignedSpace(buf, str_len(buf), sizeof(short));
-#endif
}
}
}
@@ -314,7 +286,7 @@ NA_EIDPROC void ComTdb::displayExpression(Space *space,ULng32 flag)
}
}
-NA_EIDPROC void ComTdb::displayChildren(Space *space,ULng32 flag)
+void ComTdb::displayChildren(Space *space,ULng32 flag)
{
for (Int32 i = 0; i < numChildren(); i++)
{
@@ -331,7 +303,7 @@ NA_EIDPROC void ComTdb::displayChildren(Space *space,ULng32 flag)
// Executor version of the TDB.
// -----------------------------------------------------------------------
// LCOV_EXCL_START
-NA_EIDPROC void ComTdb::fixupVTblPtrCom()
+void ComTdb::fixupVTblPtrCom()
{
}
// LCOV_EXCL_STOP
@@ -343,7 +315,7 @@ NA_EIDPROC void ComTdb::fixupVTblPtrCom()
// implemented in the executor project (in ExComTdb.cpp) which returns
// the pointer for an "executor TDB".
// -----------------------------------------------------------------------
-NA_EIDPROC char *ComTdb::findVTblPtrCom(short classID)
+char *ComTdb::findVTblPtrCom(short classID)
{
char *vtblptr = NULL;
switch (classID)
@@ -429,8 +401,6 @@ NA_EIDPROC char *ComTdb::findVTblPtrCom(short classID)
break;
}
-#ifndef __EID
-
case ex_TUPLE:
{
#pragma nowarn(1506) // warning elimination
@@ -866,7 +836,6 @@ NA_EIDPROC char *ComTdb::findVTblPtrCom(short classID)
break;
}
-#endif
default:
break;
// LCOV_EXCL_STOP
[24/30] incubator-trafodion git commit: TRAFODION-2731 CodeCleanup:
Remove obsolete, legacy and unused code
Posted by an...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/cli/rtdu.h
----------------------------------------------------------------------
diff --git a/core/sql/cli/rtdu.h b/core/sql/cli/rtdu.h
index a169413..607fc67 100644
--- a/core/sql/cli/rtdu.h
+++ b/core/sql/cli/rtdu.h
@@ -20,900 +20,5 @@
//
// @@@ END COPYRIGHT @@@
**********************************************************************/
-#ifndef RTDU_H
-#define RTDU_H
-
-/* -*-C++-*-
- *****************************************************************************
- *
- * File: rtdu.h
- * Description: Contains description of the object module.
- *
- *
- * Created: 10/15/94
- * Language: C++
- *
- *
- *
- *
- *****************************************************************************
- */
-#include "NAVersionedObject.h"
-#include "Int64.h"
-#include "ExpError.h"
-
-//-----------------------------------------------------------------------------
-//
-// An SQL module consists of a header and several areas. The header
-// locates tha areas. An area is a contiguous string of bytes and it can
-// appear anywhere.
-//
-// The SQL module is created or replaced by the SQL compiler and contains:
-//
-// (1) Header.
-// (2) PLT (Procedure Location Table) area
-// (3) SQL source area.
-// (4) CONTROL area.
-// (5) Name Map area.
-// (6) DLT (Descriptor Location Table) area
-// (7) Descriptor area.
-// (8) SQL object area.
-//
-// The layout of a SQL module and the contents of the areas are discussed
-// below.
-//
-// The term "offset" is often used. Offsets in the HEADER refer
-// to the offset in the module of other areas relative to the start
-// of the module header.
-// Offsets in the different areas refer to offset WITHIN that area.
-//
-// (1) A HEADER area, describing global properties of the SQL module
-// and anchoring the areas described below.
-//
-// (2) A PLT (Procedure Location Table) which is an area containing
-// entries for all procedures in the module.
-//
-// (3) A SOURCE area which is an area containing the source SQL statements
-// for all the procedures.
-//
-// (4) A CONTROL area which is an area containing the source SQL compiler
-// CONTROL options for all the procedures. Used during auto recomp.
-//
-// (5) A NAME-MAP area which is an area containing name mapping information
-// (e.g. default volume, DEFINEs, etc.) for all the procedures.
-//
-// (6) A DLT (Descriptor Location Table) which is an area containing
-// entries for all static descriptor allocated in the module.
-//
-// (7) A DESCRIPTOR area which is an area containing the actual input and
-// output descriptors.
-//
-// (8) An OBJECT area which is an area containing generated SQL object
-// code for all the procedures.
-//
-//
-// Following is a picture of a SQL module having 3 Procedures
-// and 2 descriptors:
-//
-// Procedures 1 and 3 are CURSOR statements
-// Procedure 1 and 2 have statement names.
-//
-// +============================================+
-// MODULE HEADER | |
-// +============================================+
-// PLT AREA | PLT (Procedure Location Table) |
-// | PLT Header |
-// | Entry for Procedure 1 |
-// | Offset to source 1 |
-// | Offset to object 1 |
-// | Offset of CURSOR name. |
-// | Offset of STATEMENT name. |
-// | Entry for Procedure 2 |
-// | Offset to source 2 |
-// | Offset to object 2 |
-// | Offset of CURSOR name = -1 (no cursor) |
-// | Offset of STATEMENT name. |
-// | Entry for Procedure 3 |
-// | Offset to source 3 |
-// | Offset to object 3 |
-// | Offset of CURSOR name. |
-// | Offset of STATEMENT name = -1 (none) |
-// | CURSOR Name for Procedure 1 |
-// | STATEMENT Name for Procedure 1 |
-// | STATEMENT Name for Procedure 2 |
-// | CURSOR Name for Procedure 3 |
-// +============================================+
-// SQL SOURCE AREA | SQL STATEMENTS |
-// | source statement 1 |
-// | source statement 2 |
-// | source statement 3 |
-// +============================================+
-// CONTROL AREA | |
-// +============================================+
-// NAME-MAP AREA | |
-// +============================================+
-// DLT AREA | DLT (Descriptor Location Table) |
-// | DLT Header |
-// | Entry for Descriptor 1 |
-// | Offset to descriptor 1 |
-// | Offset of descriptor name. |
-// | Entry for Descriptor 2 |
-// | Offset to descriptor 2 |
-// | Offset of descriptor name. |
-// | Descriptor Name for descriptor 1 |
-// | Descriptor Name for descriptor 2 |
-// +============================================+
-// DESCRIPTOR AREA | |
-// +============================================+
-// SQL OBJECT AREA | OBJECTS FOR SQL STATEMENT |
-// | object 1 |
-// | object 2 |
-// | object 3 |
-// +============================================+
-//-----------------------------------------------------------------------------
-
-//=============================================================================
-// The SQL module header MODULE_HEADER_STRUCT is stored at the beginning
-// of the module. It contains global information and anchors the other areas
-// of the SQL module. It is loaded by the EXECUTOR when first referenced. All
-// offsets stored in the header of a module are relative to the beginning of
-// the module itself.
-//=============================================================================
-
-class module_header_struct;
-class plt_entry_struct;
-class plt_header_struct;
-class dlt_entry_struct;
-class dlt_header_struct;
-class desc_entry_struct;
-class desc_header_struct;
-
-//--------------------------------------------
-// SQL module header.
-//--------------------------------------------
-const Int32 module_header_name_length = 512; // 3-part ANSI name @128 bytes each
- // plus some dots and some slack
-
-// of original 127
-const Int32 module_header_filler_at_end = 125; // update this as you add fields
-const Int32 plt_entry_filler_at_end = 14;
-
-#define EYE_CATCHER_LEN 4
-#define MODULE_EYE_CATCHER "MOD "
-#define PLT_EYE_CATCHER "PLT "
-#define DLT_EYE_CATCHER "DLT "
-
-// Assuming that the module header version doesn't change between R1.8 and R2.0 ...
-#define R18_MODULE_HEADER_VERSION 3
-#define R15_MODULE_HEADER_VERSION 2
-#define R1_MODULE_HEADER_VERSION 1
-
-enum { NULL_RTDU_OFFSET = -1, MAX_RTDU_NAME_LEN = 34 };
-
-// SourceArea should be made Unicode (when we have time)
-typedef char SourceChar;
-typedef SourceChar* SourceBuf;
-
-class module_header_struct : public NAVersionedObject {
-public:
- Int64 prep_timestamp; // julian time stamp of preprocessing 00-07
- Int64 compile_timestamp; // julian time stamp of SQL compile 08-15
-
- char eye_catcher[EYE_CATCHER_LEN]; // set to "MOD " 16-19
- Int32 module_length; // length of the module 20-23
- Int32 flags; // various status flags 24-27
-
- Int32 num_areas; // number of areas (excluding header) 28-31
- // i.e. number of following offsets
- // to such areas. presently = 8
-
- Int32 plt_area_length; // length of plt area 32-35
- Int32 plt_area_offset; // offset to plt area 36-39
- Int32 plt_hdr_length; // length of plt header 40-43
- Int32 plt_entry_length; // length of one plt entry 44-47
-
- Int32 source_area_length; // length of sql source area 48-51
- Int32 source_area_offset; // offset to sql source area 52-55
-
- Int32 recomp_control_area_length; // length of control info area 56-59
- Int32 recomp_control_area_offset; // offset to control info area 60-63
-
- Int32 schema_names_area_length; // length of cat/sch name area 64-67
- Int32 schema_names_area_offset; // offset to cat/sch name area 68-71
-
- Int32 dlt_area_length; // length of dlt area 72-75
- Int32 dlt_area_offset; // offset to dlt area 76-79
- Int32 dlt_hdr_length; // length of dlt header 80-83
- Int32 dlt_entry_length; // length of one dlt entry 84-87
-
- Int32 descriptor_area_length; // length of descriptor area 88-91
- Int32 descriptor_area_offset; // offset to descriptor area 92-95
- Int32 desc_hdr_length; // length of descriptor header 96-99
- Int32 desc_entry_length; // length of one descriptor entry 100-103
-
- Int32 object_area_length; // length of object area 104-107
- Int32 object_area_offset; // offset to object area. 108-111
-
- char module_name[module_header_name_length]; // 112-623
- // fully qualified name of object file
- // at time of sql static compilation.
- // blanks before sql compilation.
- // Right now only 34 bytes are used!!
-
- UInt32 version_; // module version, as defined in
- // ComVersionPublic.h 624-627
- // room for future growth
-
- Int32 vproc_area_length; // length of vproc area 628-631
- Int32 vproc_area_offset; // offset of vproc area 632-635
-
- Int32 filler_[module_header_filler_at_end]; // 636-879
-
- //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- // the module_header_struct's size and data member layout (except
- // filler_ and its replacements) must not change across compatible
- // versions. otherwise, ContextCli::addmodule() would not be able to
- // correctly read the binary modules written by StaticCompiler.cpp
- //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
- module_header_struct() : NAVersionedObject(-1)
- {
- initialize();
- }
-
- void initialize();
-
- virtual unsigned char getClassVersionID() { return R18_MODULE_HEADER_VERSION;}
- virtual short getClassSize() { return (short)sizeof(*this); }
- virtual void populateImageVersionIDArray()
- {
- setImageVersionID(0,getClassVersionID());
- }
-
- unsigned char getVersion()
- {
- return getImageVersionID(0);
- }
-
- ULng32 getModuleVersion() const
- {
- return version_;
- }
-
- void setModuleVersion(const ULng32 value)
- {
- version_ = value;
- }
-
-
- Lng32 RtduStructIsCorrupt()
- {
- if (str_cmp(eye_catcher, MODULE_EYE_CATCHER, EYE_CATCHER_LEN) != 0 ||
- module_length <= 0 ||
- num_areas <= 0 ||
- plt_area_length < 0)
- return -CLI_MODULEFILE_CORRUPTED; // diags code, it is corrupt
- return 0; // no error, not corrupt
- }
-
- // drivePack and write this structure out to file fd
- Lng32 write(Int32 fd);
-};
-
-
-//----------------------------------------------------------------------------
-// The PLT (Procedure location table) of a module is stored within the plt area
-// of a module file.
-// It consists of:
-// (1) a fixed length header described by plt_header_struct.
-// (2) a variable length array of procedure entries, an entry being described
-// by plt_entry_struct.
-// (3) a variable length array containing cursor names and statement names.
-// Each name is a varchar string of maximum length 34( cm^sim^name^len ).
-// Names are stored packed, i.e. trailing blanks have been stripped.
-// hence a name may be on an odd byte boundary.
-//
-// Each entry describes and locates a "procedure", where a procedure logically
-// consists of 4 parts:
-// (a) a sql source statement.
-// (b) a cursor name and/or a statement name.
-// (c) a corresponding sql object.
-// (d) optional input and output descriptor.
-// Note that some of the parts of a procedure may be missing.
-//
-// All offsets are set to a negative value (= -1) when they are invalid.
-//
-// Offsets to statements and objects of procedures are computed relative
-// to the beginning of the source area and object area resp.
-//
-// Offsets to cursor/statement names are computed relative to the end
-// of the PLT itself, i.e. the offset of the first name is = 0.
-//
-//-----------------------------------------------------------------------------
-
-
-//------------------------------------------------------------
-// body of template for a plt entry
-//------------------------------------------------------------
-class plt_entry_struct : public NAVersionedObject {
-public:
- plt_entry_struct()
- : NAVersionedObject(-1)
- { }
-
- //-------------------------------------------------------------------------
- // Byte offset of statement name for a procedure.
- // Offsets are measured from the end of the PLT.
- // Names are stored in varchar format, and they are packed, i.e. their
- // offsets may be odd numbers.
- // Note that it could hold NAString * sometime, see arkcmp/cmp_templ.cpp
- //-------------------------------------------------------------------------
- Long stmtname_offset; // 00-03
-
- //-------------------------------------------------------------------------
- // Byte offset of cursor name for a procedure.
- // Set to -1 if no cursor name is associated with the statement.
- // Offsets are measured from the end of the PLT.
- // Names are stored in varchar format, and they are packed, i.e. their
- // offsets may be odd numbers.
- // Note that it could hold NAString * sometime, see arkcmp/cmp_templ.cpp
- //-------------------------------------------------------------------------
- Long curname_offset; // 04-07
-
- //--------------------------------------------------
- // description of sql source statement for section
- //--------------------------------------------------
- Int32 source_offset; // offset of sql statement from 08-11
- // beginning of source area.
- Int32 source_length; // length of item pointed by source_off 12-15
-
- //----------------------------------------------------------------
- // description of the cat.sch name used when compiling this stmt.
- // Used at recomp time.
- //----------------------------------------------------------------
- Int32 schema_name_offset; // offset of schema name from 16-19
- // beginning of schema_names area.
- Int32 schema_name_length; // length of item pointed by sch_nm_off 20-23
-
- //--------------------------------------------------------
- // description of sql object for procedure.
- // a section object is:
- // generated code for a dml statement.
- // the unmodified source statement for a ddl statement.
- //--------------------------------------------------------
- Int32 gen_object_offset; // offset of sql object from beginning 24-27
- // of object area.
- Int32 gen_object_length; // byte length of sql object produced 28-31
- // by sql compiler.
-
- Int32 input_desc_entry; // entry into DLT describing the 32-35
- // input descriptor. 0 based.
-
- Int32 output_desc_entry; // entry into DLT describing the 36-39
- // output descriptor. 0 based.
-
- //---------------------------------------------------------------------------
- // Offset to name-map
- //---------------------------------------------------------------------------
- Int32 name_map_offset; // 40-43
-
- //------------------------------------
- // status flags.
- //------------------------------------
- Int32 status; // 44-47
-
- // if the statement entry points to a cursor this indicates whether
- // the cursor is holdable..or not
- Int32 holdable; // 48-51
-
- Int32 statementIndex; // 52-55
-
- //--------------------------------------------------------------------------
- // Offset and length of control information(CQD, CT, CQS) for this stmt.
- // Offset relative to start of recomp_control_area_offset pointed to
- // by module header.
- // Offset points to class RecompControlInfo created at static compile time.
- // Used at auto recomp time to ship back to mxcmp.
- //--------------------------------------------------------------------------
- Int32 recomp_control_info_offset; // 56-59
- Int32 recomp_control_info_length; // 60-63
-
- Int32 filler_[plt_entry_filler_at_end]; // 64-91
-
- //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- // the plt_entry_struct's size and data member layout (except
- // filler_ and its replacements) must not change across compatible
- // versions. otherwise, ContextCli::addmodule() would not be able to
- // correctly read the binary modules written by StaticCompiler.cpp
- //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
- // get this entry's statement or cursor name and its length
- inline Int32 getNameAndLen
- (module_header_struct &mHdr, plt_header_struct &pHdr, char *&name);
-
- virtual unsigned char getClassVersionID() { return 1; }
- virtual short getClassSize() { return (short)sizeof(*this); }
- virtual void populateImageVersionIDArray()
- {
- setImageVersionID(0,getClassVersionID());
- }
-
- NABoolean autoRecomp() { return (status & AUTO_RECOMP) != 0; }
- void setAutoRecomp(NABoolean v)
- { (v ? status |= AUTO_RECOMP : status &= ~AUTO_RECOMP); }
-
- NABoolean recompWarn() { return (status & RECOMP_WARN) != 0; }
- void setRecompWarn(NABoolean v)
- { (v ? status |= RECOMP_WARN : status &= ~RECOMP_WARN); }
-
- NABoolean nametypeNsk() { return (status & NAMETYPE_NSK) != 0; }
- void setNametypeNsk(NABoolean v)
- { (v ? status |= NAMETYPE_NSK : status &= ~NAMETYPE_NSK); }
-
- NABoolean odbcProcess() { return (status & ODBC_PROCESS) != 0; }
- void setOdbcProcess(NABoolean v)
- { (v ? status |= ODBC_PROCESS : status &= ~ODBC_PROCESS); }
-
-
-private:
- enum StatusFlags {
- AUTO_RECOMP = 0x0001,
- RECOMP_WARN = 0x0002,
- NAMETYPE_NSK = 0x0004,
- ODBC_PROCESS = 0x0008
- };
-};
-
-//----------------------------------------------------------------------------
-// Structure describing the header of a PLT (Procedure Location Table).
-//----------------------------------------------------------------------------
-class plt_header_struct : public NAVersionedObject {
-public:
- plt_header_struct()
- : NAVersionedObject(-1)
- { }
-
- char eye_catcher[EYE_CATCHER_LEN]; // set to "PLT " 00-03
- Int32 plt_len; // Total length of the PLT area. 04-07
- Int32 num_procedures; // Number of procedure entries 08-11
- Int32 name_len; // total byte length of 12-15
- // cursor/statement name area
-
- char filler_[16]; // 16-23
-
- //plt_entry_struct plte[1]; // (num_procedures - 1) entries following
-
- plt_entry_struct *getPLTEntry(Int32 zbi, Int32 entryLen) {
- // this address arithmetic must reflect the way StaticCompiler.cpp
- // writes and Context.cpp's addModule() reads the plt_area
- assert(0 <= zbi && zbi < num_procedures);
- return (plt_entry_struct*)((char*)this + sizeof(*this) + zbi*entryLen);
- }
-
- char *getStmtNameStart(module_header_struct &hdr) {
- // this address arithmetic must reflect the way StaticCompiler.cpp
- // writes and Context.cpp's addModule() reads the plt_area
- return (((char*)(this)) + hdr.plt_hdr_length
- + num_procedures * hdr.plt_entry_length);
- }
-
- virtual unsigned char getClassVersionID() { return 1; }
- virtual short getClassSize() { return (short)sizeof(*this); }
- virtual void populateImageVersionIDArray()
- {
- setImageVersionID(0,getClassVersionID());
- }
-
- Lng32 RtduStructIsCorrupt()
- {
- if (str_cmp(eye_catcher, PLT_EYE_CATCHER, EYE_CATCHER_LEN) != 0 ||
- plt_len <= 0)
- return -CLI_MODULEFILE_CORRUPTED; // diags code, it is corrupt
- return 0; // no error, not corrupt
- }
-
- // drivePack and write this structure out to file fd
- Lng32 write(Int32 fd);
-};
-
-//----------------------------------------------------------------------------
-// The DLT (Descriptor location table) of a module is stored within the dlt
-// area of a module file.
-// It consists of:
-// (1) a fixed length header described by dlt_header_struct.
-// (2) a variable length array of dlt entries, an entry being described
-// by dlt_entry_struct.
-// (3) a variable length array containing descriptor names.
-// Each name is a varchar string of maximum length 34( ?? ).
-// Names are stored packed, i.e. trailing blanks have been stripped.
-// hence a name may be on an odd byte boundary.
-//
-// Each entry describes a "descriptor", where a descriptor logically
-// consists of 2 parts:
-//
-// (a) a descriptor name
-// (b) a corresponding descriptor
-//
-// Offsets to descriptor is computed relative to the beginning of the
-// descriptor area.
-//
-// Offsets to descriptor names are computed relative to the end
-// of the DLT itself, i.e. the offset of the first name is = 0.
-//
-//-----------------------------------------------------------------------------
-
-//---------------------------------------------------------------------------
-// struct describing an input or output descriptor
-// All *_offset fields in this struct are relative to the end of all
-// entries for this desc_header_struct.
-//---------------------------------------------------------------------------
-class desc_entry_struct : public NAVersionedObject {
-public:
- Int32 datatype; // 00-03
- Int32 length; // 04-07
- Int32 charset_offset; // 08-11
- Int32 coll_seq_offset; // 12-15
- Int32 scale; // 16-19
- Int32 precision; // 20-23
- Int32 fractional_precision; // 24-27
- Int32 output_name_offset; // 28-31
- Int32 heading_offset; // 32-35
- Int32 var_ptr; // 36-39
- Int32 var_data; // 40-43
- Int32 ind_ptr; // 44-47
- Int32 ind_data; // 48-51
- Int32 datatype_ind; // 52-55
- Int32 rowsetSize; // 56-59
-
- Int16 nullable; // 60-61
- Int16 generated_output_name; // 62-63
- Int16 string_format; // 64-65
-
-
-
- char reservedForSPJ_[6]; // 66-71
-
- char filler_[30]; // 72-101
-
- desc_entry_struct()
- : NAVersionedObject(-1)
- {
- Lng32 lenDescEntryStruct = ((char *)filler_ - (char *)&datatype);
- memset (&datatype, 0, lenDescEntryStruct);
- memset (filler_, 0, 30);
- }
-
- virtual unsigned char getClassVersionID() { return 1; }
- virtual short getClassSize() { return (short)sizeof(*this); }
- virtual void populateImageVersionIDArray()
- {
- setImageVersionID(0,getClassVersionID());
- }
-};
-
-class desc_header_struct : public NAVersionedObject {
-public:
- desc_header_struct()
- : NAVersionedObject(-1)
- { }
-
- Int32 num_entries; // 00-03
- char filler_[4]; // 04-07
- //desc_entry_struct desc_entry[1];// followed by (num_entries - 1) entries
- // of desc_entry_struct
-
- desc_entry_struct *getDescEntry(Int32 zbi, Int32 entryLen) {
- // this address arithmetic must reflect the way StaticCompiler.cpp
- // writes and Context.cpp's addModule() reads DescSeq/SimpleDesc area
- assert(0 <= zbi && zbi < num_entries);
- return (desc_entry_struct*)((char*)this + sizeof(*this) + zbi*entryLen);
- }
-
- virtual unsigned char getClassVersionID() { return 1; }
- virtual short getClassSize() { return (short)sizeof(*this); }
- virtual void populateImageVersionIDArray()
- {
- setImageVersionID(0,getClassVersionID());
- }
-};
-
-//------------------------------------------------------------
-// body of template for a dlt entry
-//------------------------------------------------------------
-class dlt_entry_struct : public NAVersionedObject {
-public:
- dlt_entry_struct()
- : NAVersionedObject(-1)
- { }
-
- //-------------------------------------------------------------------------
- // Byte offset of descriptor name.
- // Offsets are measured from the end of the DLT.
- // Names are stored in varchar format, and they are packed, i.e. their
- // offsets may be odd numbers.
- //-------------------------------------------------------------------------
-#ifdef NA_64BIT
- // dg64 - 32-bits on disk
- Int32 descname_offset; // 00-03
-#else
- Lng32 descname_offset; // 00-03
-#endif
-
- //-------------------------------------------------------------------------
- // Byte offset of statement name for which this descriptor is defined.
- // Offsets are measured from the end of the DLT.
- // Names are stored in varchar format, and they are packed, i.e. their
- // offsets may be odd numbers.
- //-------------------------------------------------------------------------
-#ifdef NA_64BIT
- // dg64 - 32-bits on disk
- Int32 stmtname_offset; // 04-07
-#else
- Lng32 stmtname_offset; // 04-07
-#endif
-
- //--------------------------------------------------
- // description of descriptor
- //--------------------------------------------------
-#ifdef NA_64BIT
- // dg64 - 32-bits on disk
- Int32 descriptor_offset; // offset of descriptor from the 08-11
-#else
- Lng32 descriptor_offset; // offset of descriptor from the 08-11
-#endif
- // beginning of descriptor area.
- // Points to desc_header_struct.
-
- enum DESC_TYPE {
- INPUT_DESC_TYPE, OUTPUT_DESC_TYPE
- };
- Int16 /*DESC_TYPE*/ desc_type; // 12-13
- char filler_[26]; // 14-39
-
- virtual unsigned char getClassVersionID() { return 1; }
- virtual short getClassSize() { return (short)sizeof(*this); }
- virtual void populateImageVersionIDArray()
- {
- setImageVersionID(0,getClassVersionID());
- }
-};
-
-//----------------------------------------------------------------------------
-// Structure describing the header of a DLT (Descriptor Location Table).
-//----------------------------------------------------------------------------
-class dlt_header_struct : public NAVersionedObject {
-public:
- char eye_catcher[EYE_CATCHER_LEN]; // set to "DLT " 00-03
- Int32 dlt_len; // 04-07
- Int32 num_descriptors; // Number of descriptor entries 08-11
- Int32 name_len; // Total byte length of 12-15
- // descriptor name area.
-
- char filler_[16]; // 16-23
-
- // dlt_entry_struct dlte[1]; // (num_descriptors - 1) entries following
- // this struct.
-
- dlt_entry_struct *getDLTEntry(Int32 zbi, Int32 entryLen) {
- assert(0 <= zbi && zbi < num_descriptors);
- // this address arithmetic must reflect the way StaticCompiler.cpp
- // writes and Context.cpp's addModule() reads the dlt_area
- return (dlt_entry_struct*)((char*)this + sizeof(*this) + zbi*entryLen);
- }
-
- virtual unsigned char getClassVersionID() { return 1; }
- virtual short getClassSize() { return (short)sizeof(*this); }
-
- Lng32 RtduStructIsCorrupt()
- {
- if (str_cmp(eye_catcher, DLT_EYE_CATCHER, EYE_CATCHER_LEN) != 0 ||
- num_descriptors <= 0 ||
- dlt_len <= 0)
- return -CLI_MODULEFILE_CORRUPTED; // diags code, it is corrupt
- return 0; // no error, not corrupt
- }
-
- virtual void populateImageVersionIDArray()
- {
- setImageVersionID(0,getClassVersionID());
- }
-};
-
-//--------------------------------------------------------------------------
-// class RtduRecompControlInfo
-//
-// This class contains all information related to control options.
-// It is created at static compile time and is shipped back as is
-// during auto recompilation by cli to mxcmp.
-//
-// cqdInfo_: contains packed currentDefaults_
-// (see sqlcomp/nadefaults.cpp)
-// ctoInfo_: contains packed control table options
-// (see optimizer/ControlDB.cpp)
-// cqsInfo_: contains the shape in effect for this stmt.
-//
-//--------------------------------------------------------------------------
-class RtduRecompControlInfo : public NAVersionedObject
-{
-public:
- RtduRecompControlInfo()
- : NAVersionedObject(-1),
- numCqdInfoEntries_(0),
- cqdInfo_(NULL), ctoInfo_(NULL), cqsInfo_(NULL),
- cqdInfoLength_(0), ctoInfoLength_(0), cqsInfoLength_(0),
- flags_(0)
- {
- };
-
- virtual unsigned char getClassVersionID() { return 1; }
- virtual void populateImageVersionIDArray()
- { setImageVersionID(0,getClassVersionID()); }
-
- void initialize(Lng32 numCqdInfoEntries,
- char * cqdInfo, Lng32 cqdInfoLength,
- char * ctoInfo, Lng32 ctoInfoLength,
- char * cqsInfo, Lng32 cqsInfoLength)
- {
- flags_ = 0;
- numCqdInfoEntries_ = numCqdInfoEntries;
- cqdInfo_ = cqdInfo;
- cqdInfoLength_ = cqdInfoLength;
- ctoInfo_ = ctoInfo;
- ctoInfoLength_ = ctoInfoLength;
- cqsInfo_ = cqsInfo;
- cqsInfoLength_ = cqsInfoLength;
-
- memset(filler_, 0, 48);
- };
-
- Lng32 numCqdInfoEntries() { return numCqdInfoEntries_;};
- char * cqdInfo() { return cqdInfo_;}
- Lng32 cqdInfoLength() { return cqdInfoLength_;};
- char * ctoInfo() { return ctoInfo_;}
- Lng32 ctoInfoLength() { return ctoInfoLength_;};
- char * cqsInfo() { return cqsInfo_;}
- Lng32 cqsInfoLength() { return cqsInfoLength_;};
-
- Lng32 packedLength()
- {
- Lng32 size = sizeof(RtduRecompControlInfo);
- size += cqdInfoLength_ + ctoInfoLength_ + cqsInfoLength_;
-
- return size;
- };
-
- void packIt(char * basePtr)
- {
- if (cqdInfoLength_ > 0)
- {
- cqdInfo_ = (char *)((char *)cqdInfo_ - (char *)basePtr);
- }
-
- if (ctoInfoLength_ > 0)
- {
- ctoInfo_ = (char *)((char *)ctoInfo_ - (char *)basePtr);
- }
-
- if (cqsInfoLength_ > 0)
- {
- cqsInfo_ = (char *)((char *)cqsInfo_ - (char *)basePtr);
- }
- };
-
- void unpackIt(char * basePtr)
- {
- if (cqdInfoLength_ > 0)
- {
- cqdInfo_ = (Long)cqdInfo_ + (char *)basePtr;
- }
-
- if (ctoInfoLength_ > 0)
- {
- ctoInfo_ = (Long)ctoInfo_ + (char *)basePtr;
- }
-
- if (cqsInfoLength_ > 0)
- {
- cqsInfo_ = (Long)cqsInfo_ + (char *)basePtr;
- }
- };
-
-private:
-#ifdef NA_64BIT
- // dg64 - 32-bits on disk
- Int32 numCqdInfoEntries_;
-#else
- Lng32 numCqdInfoEntries_;
-#endif
- char * cqdInfo_; // information related to CQD
-#ifdef NA_64BIT
- // dg64 - 32-bits on disk
- Int32 cqdInfoLength_;
-#else
- Lng32 cqdInfoLength_;
-#endif
-
- char * ctoInfo_; // information related to Control Table Options
-#ifdef NA_64BIT
- // dg64 - 32-bits on disk
- Int32 ctoInfoLength_;
-#else
- Lng32 ctoInfoLength_;
-#endif
-
- char * cqsInfo_; // the Control Query Shape in use for this stmt.
-#ifdef NA_64BIT
- // dg64 - 32-bits on disk
- Int32 cqsInfoLength_;
-#else
- Lng32 cqsInfoLength_;
-#endif
-
- UInt32 flags_;
-
- char filler_[48]; // of original 48 filler bytes
-};
-
-
-// get this entry's statement or cursor name and its length
-inline Int32 plt_entry_struct::getNameAndLen
-(module_header_struct &mHdr, plt_header_struct &pHdr, char *&name)
-{
- const Int32 LEN = 4; Int32 length=0;
- char *start = pHdr.getStmtNameStart(mHdr);
-
- if (stmtname_offset >= 0) {
- str_cpy_all((char *)&length, (start + stmtname_offset), LEN);
- name = start + stmtname_offset + LEN;
- }
- else if (curname_offset >= 0) {
- str_cpy_all((char *)&length, (start + curname_offset), LEN);
- name = start + curname_offset + LEN;
- }
- return length;
-}
-
-inline static void initializeVersionFields(plt_header_struct *dest)
-{
- plt_header_struct src;
- if (dest) memcpy(dest, &src, sizeof(NAVersionedObject));
-}
-
-inline static void initializeVersionFields(plt_entry_struct *dest)
-{
- plt_entry_struct src;
- if (dest) memcpy(dest, &src, sizeof(NAVersionedObject));
-}
-
-inline static void initializeVersionFields(dlt_header_struct *dest)
-{
- dlt_header_struct src;
- if (dest) memcpy(dest, &src, sizeof(NAVersionedObject));
-}
-
-inline static void initializeVersionFields(dlt_entry_struct *dest)
-{
- dlt_entry_struct src;
- if (dest) memcpy(dest, &src, sizeof(NAVersionedObject));
-}
-
-
-inline static void initializeVersionFields(desc_header_struct *dest)
-{
- desc_header_struct src;
- if (dest) memcpy(dest, &src, sizeof(NAVersionedObject));
-}
-
-
-inline static void initializeVersionFields(desc_entry_struct *dest)
-{
- desc_entry_struct src;
- if (dest)
- {
- memcpy(dest, &src, sizeof(NAVersionedObject));
- }
-}
-
-
-#endif
+this file is obsolete and has been removed
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/cli/rtdu2.cpp
----------------------------------------------------------------------
diff --git a/core/sql/cli/rtdu2.cpp b/core/sql/cli/rtdu2.cpp
index 3163512..da1a5fa 100644
--- a/core/sql/cli/rtdu2.cpp
+++ b/core/sql/cli/rtdu2.cpp
@@ -35,257 +35,3 @@
*
*****************************************************************************
*/
-#include "Platform.h"
-
-
-#include "rtdu2.h"
-#include "ExpError.h"
-//ss_cc_change : This file is obsolete and is not used
-//LCOV_EXCL_START
-// read and return module header structure
-module_header_struct*
-readModuleHeader
-(fstream &mf, // (IN): binary module file
- module_header_struct &hdr, // (IN): target of read
- const char * name, // (IN): name of module (for error msg)
- ComDiagsArea &diags) // (IN): deposit any error msg here
-{
- // read the module header
- mf.seekg(0, ios::beg);
- mf.read((char *)&hdr, sizeof(module_header_struct));
- if (mf.fail()) {
- diags << DgSqlCode(-CLI_READ_ERROR) << DgString0(name);
- return NULL;
- }
-
- // give versioning a chance to massage/migrate it to this version
- module_header_struct modHdrCls, *latestModHdr = (module_header_struct*)
- hdr.driveUnpack(&hdr, &modHdrCls, NULL);
- if (!latestModHdr) {
- // error: version is no longer supported
- diags << DgSqlCode(-CLI_MODULE_HDR_VERSION_ERROR)
- << DgString0(name);
- return NULL;
- }
-
- // verify its validity
- Lng32 errCode = latestModHdr->RtduStructIsCorrupt();
- if (errCode) {
- // the module file is corrupted or has invalid data
- diags << DgSqlCode(errCode) << DgString0(name);
- return NULL;
- }
- return latestModHdr;
-}
-
-// read and return procedure location table area (header + entries)
-Int32
-readPLTArea
-(fstream &mf, // (IN) : binary module file
- module_header_struct &latestModHdr,// (IN) : its module header
- NAHeap &heap, // (IN) : allocate PLT area from here
- const char * name, // (IN) : module name (for error msg)
- ComDiagsArea &diags, // (IN) : deposit any error msg here
- plt_header_struct *&pltArea) // (OUT): plt header + entries
-{
- // make sure we have reasonable arguments
- if (latestModHdr.plt_area_offset <= 0 ||
- latestModHdr.plt_area_length <= 0 ||
- latestModHdr.plt_hdr_length <= 0 ||
- latestModHdr.plt_entry_length <= 0)
- return -1;
-
- // allocate space for PLT header
- plt_header_struct pltHdrCls, *latestPLTHdr, *plt;
- plt = (plt_header_struct *)
- heap.allocateMemory(latestModHdr.plt_hdr_length);
-
- // read procedure location table header
- mf.seekg(latestModHdr.plt_area_offset, ios::beg);
- mf.read((char *)plt, latestModHdr.plt_hdr_length);
- if (mf.fail()) {
- diags << DgSqlCode(-CLI_READ_ERROR) << DgString0(name);
- return -1;
- }
-
- // give versioning a chance to massage/migrate it to this version
- latestPLTHdr = (plt_header_struct*)plt->driveUnpack(plt, &pltHdrCls,NULL);
- if (!latestPLTHdr) {
- // error: version is no longer supported
- diags << DgSqlCode(-CLI_MOD_PLT_HDR_VERSION_ERROR)
- << DgString0(name);
- return -1;
- }
-
- pltArea = latestPLTHdr;
- Int32 num_procs = latestPLTHdr->num_procedures;
-
- if (num_procs >= 1) {
- // allocate space for PLT header + entries
- heap.deallocateMemory(plt);
- plt = (plt_header_struct *)
- heap.allocateMemory((size_t)latestModHdr.plt_area_length);
-
- // read procedure location table header + entries
- mf.seekg(latestModHdr.plt_area_offset, ios::beg);
- mf.read((char *)plt, (Int32)latestModHdr.plt_area_length);
- if (mf.fail()) {
- diags << DgSqlCode(-CLI_READ_ERROR) << DgString0(name);
- return -1;
- }
-
- // give versioning a chance to massage/migrate it to this version
- latestPLTHdr = (plt_header_struct*)plt->driveUnpack(plt, &pltHdrCls, NULL);
- if (!latestPLTHdr) {
- // error: version is no longer supported
- diags << DgSqlCode(-CLI_MOD_PLT_HDR_VERSION_ERROR)
- << DgString0(name);
- return -1;
- }
- pltArea = latestPLTHdr;
- }
-
- // verify its validity
- Lng32 errCode = pltArea->RtduStructIsCorrupt();
- if (errCode) {
- // the module file is corrupted or has invalid data
- diags << DgSqlCode(errCode) << DgString0(name);
- heap.deallocateMemory(plt);
- return -1;
- }
- return num_procs;
-}
-
-// read and return descriptor location table area (header + entries)
-Int32
-readDLTArea
-(fstream &mf, // (IN) : binary module file
- module_header_struct &latestModHdr,// (IN) : its module header
- NAHeap &heap, // (IN) : allocate DLT area from here
- const char * name, // (IN) : module name (for error msg)
- ComDiagsArea &diags, // (IN) : deposit any error msg here
- dlt_header_struct *&dltArea) // (OUT): dlt header + entries
-{
- // make sure we have reasonable arguments
- if (latestModHdr.dlt_area_offset <= 0 ||
- latestModHdr.dlt_area_length <= 0 ||
- latestModHdr.dlt_hdr_length <= 0 ||
- latestModHdr.dlt_entry_length <= 0)
- return -1;
-
- // allocate space for DLT header
- dlt_header_struct dltHdrCls, *latestDLTHdr, *dlt;
- dlt = (dlt_header_struct *)
- heap.allocateMemory(latestModHdr.dlt_hdr_length);
-
- // read descriptor location table header
- mf.seekg(latestModHdr.dlt_area_offset, ios::beg);
- mf.read((char *)dlt, latestModHdr.dlt_hdr_length);
- if (mf.fail()) {
- diags << DgSqlCode(-CLI_READ_ERROR) << DgString0(name);
- return -1;
- }
-
- // give versioning a chance to massage/migrate it to this version
- latestDLTHdr = (dlt_header_struct*)dlt->driveUnpack(dlt, &dltHdrCls, NULL);
- if (!latestDLTHdr) {
- // error: version is no longer supported
- diags << DgSqlCode(-CLI_MOD_DLT_HDR_VERSION_ERROR)
- << DgString0(name);
- return -1;
- }
-
- dltArea = latestDLTHdr;
- Int32 num_descs = latestDLTHdr->num_descriptors;
-
- if (num_descs >= 1) {
- // allocate space for DLT header + entries
- heap.deallocateMemory(dlt);
- dlt = (dlt_header_struct *)
- heap.allocateMemory((size_t)latestModHdr.dlt_area_length);
-
- // read descriptor location table header + entries
- mf.seekg(latestModHdr.dlt_area_offset, ios::beg);
- mf.read((char *)dlt, (Int32)latestModHdr.dlt_area_length);
- if (mf.fail()) {
- diags << DgSqlCode(-CLI_READ_ERROR) << DgString0(name);
- return -1;
- }
-
- // give versioning a chance to massage/migrate it to this version
- latestDLTHdr = (dlt_header_struct*)dlt->driveUnpack(dlt, &dltHdrCls, NULL);
- if (!latestDLTHdr) {
- // error: version is no longer supported
- diags << DgSqlCode(-CLI_MOD_DLT_HDR_VERSION_ERROR)
- << DgString0(name);
- return -1;
- }
- dltArea = latestDLTHdr;
- }
-
- // verify its validity
- Lng32 errCode = dltArea->RtduStructIsCorrupt();
- if (errCode) {
- // the module file is corrupted or has invalid data
- diags << DgSqlCode(errCode) << DgString0(name);
- heap.deallocateMemory(dlt);
- return -1;
- }
- return num_descs;
-}
-
-// read and return descriptor area (headers + entries)
-Int32
-readDescArea
-(fstream &mf, // (IN) : binary module file
- module_header_struct &latestModHdr,// (IN) : its module header
- NAHeap &heap, // (IN) : allocate DESC area from here
- const char * name, // (IN) : module name (for error msg)
- ComDiagsArea &diags, // (IN) : deposit any error msg here
- char *&descArea) // (OUT): desc headers + entries
-{
- // make sure we have reasonable arguments
- if (latestModHdr.descriptor_area_offset <= 0 ||
- latestModHdr.descriptor_area_length <= 0)
- return -1;
-
- // allocate space for DESC headers + entries
- descArea = (char*)
- heap.allocateMemory((size_t)latestModHdr.descriptor_area_length);
-
- // read DESC headers + entries
- mf.seekg(latestModHdr.descriptor_area_offset, ios::beg);
- mf.read(descArea, (Int32)latestModHdr.descriptor_area_length);
- if (mf.fail()) {
- diags << DgSqlCode(-CLI_READ_ERROR) << DgString0(name);
- return -1;
- }
- return 1; // all OK
-}
-
-// read and return a binary module file's source area
-SourceBuf readSourceArea
-(fstream &mf, // (IN) : binary module file
- module_header_struct &latestModHdr,// (IN) : its module header
- NAHeap &heap, // (IN) : allocate PLT area from here
- const char * name, // (IN) : module name (for error msg)
- ComDiagsArea &diags) // (IN) : deposit any error msg here
-{
- SourceBuf srcArea = NULL;
- if (latestModHdr.source_area_length > 0) {
- // allocate space for source area
- srcArea = (SourceBuf)
- heap.allocateMemory((size_t)latestModHdr.source_area_length);
-
- // read source area
- mf.seekg(latestModHdr.source_area_offset, ios::beg);
- mf.read(srcArea, (Int32)latestModHdr.source_area_length);
- if (mf.fail()) {
- diags << DgSqlCode(-CLI_READ_ERROR) << DgString0(name);
- return NULL;
- }
- }
- return srcArea;
-}
-
-//LCOV_EXCL_STOP
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/cli/rtdu2.h
----------------------------------------------------------------------
diff --git a/core/sql/cli/rtdu2.h b/core/sql/cli/rtdu2.h
index f3965c3..d0197c0 100644
--- a/core/sql/cli/rtdu2.h
+++ b/core/sql/cli/rtdu2.h
@@ -22,121 +22,7 @@
**********************************************************************/
#ifndef RTDU2_H
#define RTDU2_H
-
-/* -*-C++-*-
- *****************************************************************************
- *
- * File: rtdu2.h
- * Description: Contains description of the object module.
- *
- *
- * Created: 10/15/94
- * Language: C++
- *
- *
- *
- *
- *****************************************************************************
- */
-#include <fstream>
-#include "ComDiags.h"
-#include "NAMemory.h"
-#include "rtdu.h"
-
-// The following code used to be in two places:
-// context.cpp's addModule() and
-// cmpmod.cpp's openInputModuleFile()
-// So to avoid inconsistent code changes, we merged the two versions
-// of that code into the following helper functions.
-
-// read and return module header structure
-SQLCLI_LIB_FUNC module_header_struct*
-readModuleHeader
-(fstream &mf, // (IN): binary module file
- module_header_struct &hdr, // (IN): target of read
- const char * name, // (IN): name of module (for error msg)
- ComDiagsArea &diags); // (IN): deposit any error msg here
-// requires: caller has invoked NAVersionedObject::setReallocator() to
-// set up the memory allocator for any version-migrated object(s)
-// mf is the binary module file (open for reading)
-// hdr has enough space to hold the module_header_struct
-// modifies: hdr, diags, NAVersionedObject::reallocator Space
-// effects : read module_header_struct from mf
-// driveUnpack, verify it, deposit any error msg in diags
-// return result of driveUnpack()
-
-// read and return procedure location table area (header + entries)
-SQLCLI_LIB_FUNC Int32
-readPLTArea
-(fstream &mf, // (IN) : binary module file
- module_header_struct &latestModHdr,// (IN) : its module header
- NAHeap &heap, // (IN) : allocate PLT area from here
- const char * name, // (IN) : module name (for error msg)
- ComDiagsArea &diags, // (IN) : deposit any error msg here
- plt_header_struct *&pltArea); // (OUT): plt header + entries
-// requires: caller has invoked NAVersionedObject::setReallocator() to
-// set up the memory allocator for any version-migrated object(s)
-// mf is the binary module file (open for reading)
-// latestModHdr is the result of readModuleHeader()
-// modifies: heap, diags, pltArea
-// effects: allocate space for procedure location table (PLT) area
-// read PLT area from mf
-// driveUnpack, verify it, deposit any error msg in diags
-// pltArea = result of driveUnpack()
-// return: < 0 if an error occurred,
-// pltArea->num_procedures, otherwise.
-
-// read and return desccriptor location table area (header + entries)
-SQLCLI_LIB_FUNC Int32
-readDLTArea
-(fstream &mf, // (IN) : binary module file
- module_header_struct &latestModHdr,// (IN) : its module header
- NAHeap &heap, // (IN) : allocate DLT area from here
- const char * name, // (IN) : module name (for error msg)
- ComDiagsArea &diags, // (IN) : deposit any error msg here
- dlt_header_struct *&dltArea); // (OUT): dlt header + entries
-// requires: caller has invoked NAVersionedObject::setReallocator() to
-// set up the memory allocator for any version-migrated object(s)
-// mf is the binary module file (open for reading)
-// latestModHdr is the result of readModuleHeader()
-// modifies: heap, diags, dltArea
-// effects: allocate space for descriptor location table (DLT) area
-// read DLT area from mf
-// driveUnpack, verify it, deposit any error msg in diags
-// dltArea = result of driveUnpack()
-// return: < 0 if an error occurred,
-// dltArea->num_descriptors, otherwise.
-
-// read and return desccriptor area (headers + entries)
-SQLCLI_LIB_FUNC Int32
-readDescArea
-(fstream &mf, // (IN) : binary module file
- module_header_struct &latestModHdr,// (IN) : its module header
- NAHeap &heap, // (IN) : allocate DESC area from here
- const char * name, // (IN) : module name (for error msg)
- ComDiagsArea &diags, // (IN) : deposit any error msg here
- char *&descArea); // (OUT): desc headers + entries
-// requires: mf is the binary module file (open for reading)
-// latestModHdr is the result of readModuleHeader()
-// modifies: heap, diags, descArea
-// effects: allocate space for descriptor (DESC) area
-// read DESC area from mf, deposit any error msg in diags
-// return: < 0 if an error occurred,
-// >=0 otherwise
-
-// read and return a binary module file's source area
-SQLCLI_LIB_FUNC SourceBuf
-readSourceArea
-(fstream &mf, // (IN) : binary module file
- module_header_struct &latestModHdr,// (IN) : its module header
- NAHeap &heap, // (IN) : allocate source area from here
- const char * name, // (IN) : module name (for error msg)
- ComDiagsArea &diags); // (IN) : deposit any error msg here
-// requires: mf is the binary module file (open for reading)
-// latestModHdr is the result of readModuleHeader()
-// modifies: heap, diags
-// effects: allocate space for source area
-// read and return source area of mf if all OK
-// return NULL otherwise
+this file is obsolete and has been removed
+
#endif
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/cli/sql_id.cpp
----------------------------------------------------------------------
diff --git a/core/sql/cli/sql_id.cpp b/core/sql/cli/sql_id.cpp
index f73ca26..4a7e0d4 100644
--- a/core/sql/cli/sql_id.cpp
+++ b/core/sql/cli/sql_id.cpp
@@ -46,7 +46,6 @@
#if 0
// Create a new SQL module id.
-SQLCLI_LIB_FUNC
SQLMODULE_ID* new_SQLMODULE_ID(
Lng32 version, const char* name,
Lng32 timestamp,
@@ -59,7 +58,6 @@ SQLMODULE_ID* new_SQLMODULE_ID(
}
#endif
// intialize a SQL module id.
-SQLCLI_LIB_FUNC
void init_SQLMODULE_ID(SQLMODULE_ID* m,
Lng32 version, const char* name,
Lng32 timestamp,
@@ -75,7 +73,6 @@ void init_SQLMODULE_ID(SQLMODULE_ID* m,
#if 0
// Create a new SQL object id.
-SQLCLI_LIB_FUNC
SQLCLI_OBJ_ID* new_SQLCLI_OBJ_ID(
Lng32 version, enum SQLOBJ_ID_NAME_MODE mode,
const SQLMODULE_ID* module, const char* id,
@@ -90,7 +87,6 @@ SQLCLI_OBJ_ID* new_SQLCLI_OBJ_ID(
#endif
// initialize a SQL object id.
-SQLCLI_LIB_FUNC
void init_SQLCLI_OBJ_ID(SQLCLI_OBJ_ID* x,
Lng32 version, enum SQLOBJ_ID_NAME_MODE mode,
const SQLMODULE_ID* module, const char* id,
@@ -111,7 +107,6 @@ void init_SQLCLI_OBJ_ID(SQLCLI_OBJ_ID* x,
// compare two SQL object ids for equality.
////////////////////////////////////////////
-SQLCLI_LIB_FUNC
Int32 isEqualByName(SQLCLI_OBJ_ID* x, SQLCLI_OBJ_ID* y)
{
// 8/6/98: Unicode based comparison is not enabled yet
@@ -132,7 +127,6 @@ Int32 isEqualByName(SQLCLI_OBJ_ID* x, SQLCLI_OBJ_ID* y)
// compare two SQL module ids for equality.
////////////////////////////////////////////
-SQLCLI_LIB_FUNC
Int32 isEqualByName(const SQLMODULE_ID* x, const SQLMODULE_ID* y)
{
// 8/6/98: Unicode based comparison is not enabled yet
@@ -152,7 +146,6 @@ Int32 isEqualByName(const SQLMODULE_ID* x, const SQLMODULE_ID* y)
////////////////////////////////////////////
// set the name for a SQL object id.
////////////////////////////////////////////
-SQLCLI_LIB_FUNC
void setNameForId(SQLCLI_OBJ_ID* x, const char* name, Lng32 len, const char* charset)
{
x->identifier = name;
@@ -166,7 +159,6 @@ void setNameForId(SQLCLI_OBJ_ID* x, const char* name, Lng32 len, const char* cha
////////////////////////////////////////////
// set the name for a SQL module id.
////////////////////////////////////////////
-SQLCLI_LIB_FUNC
void setNameForModule(SQLMODULE_ID* m, const char* name, Lng32 len, const char* charset)
{
m->module_name = name;
@@ -183,7 +175,6 @@ void setNameForModule(SQLMODULE_ID* m, const char* name, Lng32 len, const char*
// get the name of a SQL module id in
// Unicode.
////////////////////////////////////////////
-SQLCLI_LIB_FUNC
NAWchar* getModNameInWchar(const SQLMODULE_ID* m)
{
static NAWcharBuf * buf = new NAWcharBuf(MAX_CHAR_SET_STRING_LENGTH+1);
@@ -211,7 +202,6 @@ NAWchar* getModNameInWchar(const SQLMODULE_ID* m)
// get the name of a SQL object id in
// Unicode.
////////////////////////////////////////////
-SQLCLI_LIB_FUNC
NAWchar* getIdInWchar(SQLCLI_OBJ_ID* x)
{
static NAWcharBuf * buf = new NAWcharBuf(MAX_CHAR_SET_STRING_LENGTH+1);
@@ -238,7 +228,6 @@ NAWchar* getIdInWchar(SQLCLI_OBJ_ID* x)
////////////////////////////////////////////
// get the name of a SQL module id in locale.
////////////////////////////////////////////
-SQLCLI_LIB_FUNC
char* getModNameInLocale(const SQLMODULE_ID* m)
{
if ( m == 0 ) return 0;
@@ -272,7 +261,6 @@ char* getModNameInLocale(const SQLMODULE_ID* m)
////////////////////////////////////////////
// get the name of a SQL object id in locale.
////////////////////////////////////////////
-SQLCLI_LIB_FUNC
char* getIdInLocale(SQLCLI_OBJ_ID* x)
{
if ( x == 0 ) return 0;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/cli/sql_id.h
----------------------------------------------------------------------
diff --git a/core/sql/cli/sql_id.h b/core/sql/cli/sql_id.h
index f225ab4..b0f361d 100644
--- a/core/sql/cli/sql_id.h
+++ b/core/sql/cli/sql_id.h
@@ -64,7 +64,6 @@
SQLCHARSETSTRING_ISO88591 : (sqlcli_obj_ptr) -> charset \
)
#if 0
-SQLCLI_LIB_FUNC
SQLMODULE_ID* new_SQLMODULE_ID(
Lng32 version = SQLCLI_CURRENT_VERSION,
const char* module_name = 0,
@@ -74,7 +73,6 @@ SQLMODULE_ID* new_SQLMODULE_ID(
);
#endif
-SQLCLI_LIB_FUNC
void init_SQLMODULE_ID(SQLMODULE_ID* m,
Lng32 version = SQLCLI_CURRENT_VERSION,
const char* module_name = 0,
@@ -83,7 +81,6 @@ void init_SQLMODULE_ID(SQLMODULE_ID* m,
Lng32 name_len = 0
);
#if 0
-SQLCLI_LIB_FUNC
SQLCLI_OBJ_ID* new_SQLCLI_OBJ_ID( Lng32 version = SQLCLI_CURRENT_VERSION,
enum SQLOBJ_ID_NAME_MODE mode = stmt_name,
const SQLMODULE_ID* module = 0,
@@ -97,7 +94,6 @@ SQLCLI_OBJ_ID* new_SQLCLI_OBJ_ID( Lng32 version = SQLCLI_CURRENT_VERSION,
#define new_SQLDESC_ID new_SQLCLI_OBJ_ID
#endif
-SQLCLI_LIB_FUNC
void init_SQLCLI_OBJ_ID(SQLCLI_OBJ_ID* x,
Lng32 version = SQLCLI_CURRENT_VERSION,
enum SQLOBJ_ID_NAME_MODE mode = stmt_name,
@@ -111,27 +107,13 @@ void init_SQLCLI_OBJ_ID(SQLCLI_OBJ_ID* x,
#define init_SQLSTMT_ID init_SQLCLI_OBJ_ID
#define init_SQLDESC_ID init_SQLCLI_OBJ_ID
-SQLCLI_LIB_FUNC
Int32 isEqualByName(SQLCLI_OBJ_ID* x, SQLCLI_OBJ_ID* y);
-SQLCLI_LIB_FUNC
Int32 isEqualByName(const SQLMODULE_ID* x, const SQLMODULE_ID* y);
-SQLCLI_LIB_FUNC
void setNameForId(SQLCLI_OBJ_ID* x, const char* name, Lng32 len,
const char* charset = SQLCHARSETSTRING_ISO88591);
-SQLCLI_LIB_FUNC
void setNameForModule(SQLMODULE_ID* x, const char* name, Lng32 len,
const char* charset = SQLCHARSETSTRING_ISO88591);
-#if 0
-SQLCLI_LIB_FUNC NAWchar* getModNameInWchar(const SQLMODULE_ID* m);
-
-SQLCLI_LIB_FUNC NAWchar* getIdInWchar(SQLCLI_OBJ_ID* x);
-
-SQLCLI_LIB_FUNC char* getModNameInLocale(const SQLMODULE_ID* m);
-
-SQLCLI_LIB_FUNC char* getIdInLocale(SQLCLI_OBJ_ID* x);
-#endif
-
#endif
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/cli/sqlciSRLStubs.cpp
----------------------------------------------------------------------
diff --git a/core/sql/cli/sqlciSRLStubs.cpp b/core/sql/cli/sqlciSRLStubs.cpp
index 71546d3..38ad282 100644
--- a/core/sql/cli/sqlciSRLStubs.cpp
+++ b/core/sql/cli/sqlciSRLStubs.cpp
@@ -21,6 +21,7 @@
// @@@ END COPYRIGHT @@@
**********************************************************************/
+/*
#include "NAStringDef.h"
@@ -28,3 +29,4 @@
#endif // RW_NO_LOCALE
+*/
[11/30] incubator-trafodion git commit: TRAFODION-2731 CodeCleanup:
Remove obsolete, legacy and unused code
Posted by an...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/exp/ExpPCodeExpGen.cpp
----------------------------------------------------------------------
diff --git a/core/sql/exp/ExpPCodeExpGen.cpp b/core/sql/exp/ExpPCodeExpGen.cpp
index 2301481..e28030e 100644
--- a/core/sql/exp/ExpPCodeExpGen.cpp
+++ b/core/sql/exp/ExpPCodeExpGen.cpp
@@ -54,11 +54,9 @@ ex_expr::exp_return_type ex_expr::pCodeGenerate(Space * space,
UInt32 f) {
#ifdef _DEBUG
-#ifndef __EID
if (getenv("NO_PCODE"))
return ex_expr::EXPR_OK;
#endif
-#endif
// If the expression mode does not indicate that PCODE is "ON", then
// don't generate any code. It is important not to allocate any
@@ -78,7 +76,6 @@ ex_expr::exp_return_type ex_expr::pCodeGenerate(Space * space,
PCodeBinary *pCode = NULL;
NABoolean versionOK = TRUE;
#ifdef _DEBUG
-#ifndef __EID
// for debug
char *buf;
Int32 bufLen = 0; // to store PCode in ascii for to buf, set it to 16384
@@ -89,7 +86,6 @@ ex_expr::exp_return_type ex_expr::pCodeGenerate(Space * space,
bufLen = 0;
}
#endif
-#endif
if (pCode_.getPointer()) {
pCode = getPCodeBinary();
@@ -175,15 +171,10 @@ ex_expr::exp_return_type ex_expr::pCodeGenerate(Space * space,
// If offset is UINT_MAX, pcode is normally generated unless
// CQD says otherwise or if this operation is for insert/update.
for(short i = 0; i < clause->getNumOperands(); i++) {
-#if defined(__EID)
- if ((clause->getOperand(i)->getOffset() == UINT_MAX) ||
- (clause->getOperand(i)->isAddedCol() && !pCodeSpecialFields()))
-#else
if (((clause->getOperand(i)->getOffset() == UINT_MAX) &&
!handleIndirectVC()) ||
(clause->getOperand(i)->isAddedCol() &&
!pCodeSpecialFields()))
-#endif
{
setPCodeObject(0);
pCode_ = 0;
@@ -269,11 +260,9 @@ ex_expr::exp_return_type ex_expr::pCodeGenerate(Space * space,
}
#ifdef _DEBUG
-#ifndef __EID
if (dumpPci == 1)
PCode::dumpContents(code, buf, bufLen);
#endif
-#endif
// Fixup PCI CLAUSE_BRANCH instructions. Modify the corresponding TARGET
// PCIs so that they point to the actual PCIs for the branch sources.
@@ -310,11 +299,9 @@ ex_expr::exp_return_type ex_expr::pCodeGenerate(Space * space,
#ifdef _DEBUG
-#ifndef __EID
if (dumpPci == 1)
PCode::dumpContents(code, buf, bufLen);
#endif
-#endif
// Fixup addresses. This requires a pass over
// the PCODE instruction list. Any instruction that access memory
@@ -386,11 +373,9 @@ ex_expr::exp_return_type ex_expr::pCodeGenerate(Space * space,
}
#ifdef _DEBUG
-#ifndef __EID
if (dumpPci == 1)
PCode::dumpContents(code, buf, bufLen);
#endif
-#endif
// Do some optimization if required and possible:
@@ -419,7 +404,7 @@ ex_expr::exp_return_type ex_expr::pCodeGenerate(Space * space,
PCI *storePci = iter.first();
-#if (defined (_DEBUG) && !(defined(__EID)))
+#if (defined (_DEBUG))
if(!getenv("PCODE_NO_MOVE_REMOVE"))
#endif
// Case 1:
@@ -537,7 +522,7 @@ ex_expr::exp_return_type ex_expr::pCodeGenerate(Space * space,
storePci = iter.next();
} // while (storePci)
-#ifdef NA_DEBUG_C_RUNTIME
+#ifdef _DEBUG
GenAssert(inBranch == 0, "Unmatched branch and target instruction")
#endif
} // !getenv("PCODE_NO_MOVE_REMOVE")
@@ -688,7 +673,7 @@ ex_expr::exp_return_type ex_expr::pCodeGenerate(Space * space,
// Standard Sizes are: 1, 2, 4 and 8 byte moves.
// This avoids doing a str_cpy_all for these standard sizes.
//
-#if (defined (_DEBUG) && !(defined(__EID)))
+#if (defined (_DEBUG))
if (!getenv("PCODE_NO_STD_MOVE"))
#endif
{
@@ -745,7 +730,7 @@ ex_expr::exp_return_type ex_expr::pCodeGenerate(Space * space,
}
} // if PCIT::MOVE_MBIN8_MBIN8_IBIN32S
else
-#if (defined (_DEBUG) && !(defined(__EID)))
+#if (defined (_DEBUG))
if(!getenv("PCODE_NO_FLOAT_RANGE_REMOVE"))
{
#endif
@@ -768,7 +753,7 @@ ex_expr::exp_return_type ex_expr::pCodeGenerate(Space * space,
}
}
}
-#if (defined (_DEBUG) && !(defined(__EID)))
+#if (defined (_DEBUG))
} // !getenv("PCODE_NO_FLOAT_RANGE_REMOVE")
#endif
@@ -777,11 +762,9 @@ ex_expr::exp_return_type ex_expr::pCodeGenerate(Space * space,
} // PCODE_OPTIMIZE
#ifdef _DEBUG
-#ifndef __EID
if (dumpPci == 1)
PCode::dumpContents(code, buf, bufLen);
#endif
-#endif
// Since the call to get the base data address for a tupp is relatively
// expensive (triple dereference along with relocation checking), we want
@@ -931,7 +914,7 @@ ex_expr::exp_return_type ex_expr::pCodeGenerate(Space * space,
}
//#ifndef NDEBUG
-#ifdef NA_DEBUG_C_RUNTIME
+#ifdef _DEBUG
if(getenv("PCODE_PRINT")) {
fprintf(stderr, "PCode ...\n");
PCode::print(code);
@@ -940,11 +923,9 @@ ex_expr::exp_return_type ex_expr::pCodeGenerate(Space * space,
#endif
#ifdef _DEBUG
-#ifndef __EID
if (dumpPci == 1)
PCode::dumpContents(code, buf, bufLen);
#endif
-#endif
codeObject->setPCIList(code);
setPCodeObject(codeObject);
@@ -958,24 +939,20 @@ ex_expr::exp_return_type ex_expr::pCodeGenerate(Space * space,
pCode_.getPointer()->setContainsClauseEval(containsClauseEval);
#ifdef _DEBUG
-#ifndef __EID
if (dumpPci == 1)
PCode::dumpContents(pCode_.getPointer()->getPCodeBinary(), buf, bufLen);
#endif
-#endif
// get rid of the temporary object
if (! ex_expr_base::forShowplan(f))
setPCodeObject(0);
-#ifndef __EID
// Perform PCODE optimizations
if (pCodeMode_ & PCODE_LLO) {
PCodeCfg* cfg = new(heap) PCodeCfg(this, atpMap, atpIndexMap, heap, space);
cfg->optimize();
NADELETE(cfg, PCodeCfg, heap);
}
-#endif
// see if move fastpath could be done.
// In this case, we move source to target directly without going
@@ -984,11 +961,9 @@ ex_expr::exp_return_type ex_expr::pCodeGenerate(Space * space,
//
PCodeBinary *pc = getPCodeBinary();
#ifdef _DEBUG
-#ifndef __EID
if (getenv("NO_PCODE_MOVE_FASTPATH"))
return ex_expr::EXPR_OK;
#endif
-#endif
if (pc)
{
if ((pc[0] == 2) &&
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/exp/ExpPCodeInstruction.h
----------------------------------------------------------------------
diff --git a/core/sql/exp/ExpPCodeInstruction.h b/core/sql/exp/ExpPCodeInstruction.h
index 43a1b4f..2cf40e2 100644
--- a/core/sql/exp/ExpPCodeInstruction.h
+++ b/core/sql/exp/ExpPCodeInstruction.h
@@ -51,14 +51,8 @@ typedef PCIType PCIT;
typedef PCIAddressingModeList AML;
typedef PCIOperandList OL;
typedef PCodeInstruction PCI;
-#ifdef NA_64BIT
-// dg64 - a bit of a guess
typedef Int64 PCIID;
-#else
-typedef Int32 PCIID;
-#endif
-// NA_64BIT PCode changes
// PCode Binary (formally referred as code) remains to be 32-bit long on
// 64-bit platform but when it contains pointers/addresses it takes two
// consecutive storge space. The same applies to the operand list as Operand
@@ -83,7 +77,7 @@ typedef Int32 PCodeBinary;
// static member functions for converting these enumerations to strings
// for display.
//
-class SQLEXP_LIB_FUNC PCIType {
+class PCIType {
public:
// PCode operations -- These enumerations represent the different PCode
@@ -759,13 +753,10 @@ public:
// Helper functions for displaying the enumerations
//
-NA_EIDPROC
static const char *operationString(PCIType::Operation op);
-NA_EIDPROC
static const char *addressingModeString(PCIType::AddressingMode am);
//buf should be 32 bytes
-NA_EIDPROC
static void operandString(Int32 operand, char* buf);
static char *instructionString(PCIType::Instruction instr);
@@ -790,11 +781,10 @@ NA_EIDPROC
// The AML and OL classes are only meant to be used to simply argument
// passing to the PCI constructors. Nothing more.
//
-class SQLEXP_LIB_FUNC PCIAddressingModeList {
+class PCIAddressingModeList {
public:
// Constructor
//
- NA_EIDPROC
PCIAddressingModeList(PCIType::AddressingMode am1 =PCIType::AM_NONE,
PCIType::AddressingMode am2 =PCIType::AM_NONE,
PCIType::AddressingMode am3 =PCIType::AM_NONE,
@@ -818,9 +808,7 @@ public:
// Accessors
//
-NA_EIDPROC
Int32 getNumberAddressingModes() const { return numberAddressingModes_; };
-NA_EIDPROC
PCIType::AddressingMode getAddressingMode(Int32 mode) const
{ return addressingMode_[mode]; };
@@ -849,77 +837,76 @@ private:
//
// See PCIAddressingMode comments above.
//
-class SQLEXP_LIB_FUNC PCIOperandList {
+class PCIOperandList {
public:
// Constructors
//
- NA_EIDPROC PCIOperandList() { initList(0); };
- NA_EIDPROC PCIOperandList(PCIType::Operand arg1) { initList(1, arg1); };
+ PCIOperandList() { initList(0); };
+ PCIOperandList(PCIType::Operand arg1) { initList(1, arg1); };
- NA_EIDPROC PCIOperandList(Int64 arg1) {
+ PCIOperandList(Int64 arg1) {
numberOperands_ = 2;
*((Int64*)operand_) = arg1;
};
-#ifdef NA_64BIT
- NA_EIDPROC PCIOperandList(Int64 arg1, PCIType::Operand arg2) {
+ PCIOperandList(Int64 arg1, PCIType::Operand arg2) {
numberOperands_ = 3;
*((Int64*)&operand_[0]) = arg1;
operand_[2] = arg2;
};
- NA_EIDPROC PCIOperandList(Int64 arg1, Int64 arg2) {
+ PCIOperandList(Int64 arg1, Int64 arg2) {
numberOperands_ = 4;
*((Int64*)&operand_[0]) = arg1;
*((Int64*)&operand_[2]) = arg2;
};
-#endif
- NA_EIDPROC PCIOperandList(PCIType::Operand arg1, PCIType::Operand arg2) { initList(2, arg1, arg2); };
- NA_EIDPROC PCIOperandList(PCIType::Operand arg1, PCIType::Operand arg2, PCIType::Operand arg3) {
+
+ PCIOperandList(PCIType::Operand arg1, PCIType::Operand arg2) { initList(2, arg1, arg2); };
+ PCIOperandList(PCIType::Operand arg1, PCIType::Operand arg2, PCIType::Operand arg3) {
initList(3, arg1, arg2, arg3);
};
- NA_EIDPROC PCIOperandList(PCIType::Operand arg1, PCIType::Operand arg2, PCIType::Operand arg3, Int32 arg4) {
+ PCIOperandList(PCIType::Operand arg1, PCIType::Operand arg2, PCIType::Operand arg3, Int32 arg4) {
initList(4, arg1, arg2, arg3, arg4);
};
- NA_EIDPROC PCIOperandList(PCIType::Operand arg1, PCIType::Operand arg2, PCIType::Operand arg3, Int64 arg4) {
+ PCIOperandList(PCIType::Operand arg1, PCIType::Operand arg2, PCIType::Operand arg3, Int64 arg4) {
initList(5, arg1, arg2, arg3, 0, 0);
numberOperands_ = 5;
*((Int64*)&operand_[3]) = arg4;
};
- NA_EIDPROC PCIOperandList(PCIType::Operand arg1, PCIType::Operand arg2, PCIType::Operand arg3, PCIType::Operand arg4, PCIType::Operand arg5)
+ PCIOperandList(PCIType::Operand arg1, PCIType::Operand arg2, PCIType::Operand arg3, PCIType::Operand arg4, PCIType::Operand arg5)
{
initList(5, arg1, arg2, arg3, arg4, arg5);
};
- NA_EIDPROC PCIOperandList(PCIType::Operand arg1, PCIType::Operand arg2, PCIType::Operand arg3, PCIType::Operand arg4, PCIType::Operand arg5,
+ PCIOperandList(PCIType::Operand arg1, PCIType::Operand arg2, PCIType::Operand arg3, PCIType::Operand arg4, PCIType::Operand arg5,
PCIType::Operand arg6) {
initList(6, arg1, arg2, arg3, arg4, arg5, arg6);
};
- NA_EIDPROC PCIOperandList(PCIType::Operand arg1, PCIType::Operand arg2, PCIType::Operand arg3, PCIType::Operand arg4, PCIType::Operand arg5,
+ PCIOperandList(PCIType::Operand arg1, PCIType::Operand arg2, PCIType::Operand arg3, PCIType::Operand arg4, PCIType::Operand arg5,
PCIType::Operand arg6, PCIType::Operand arg7) {
initList(7, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
};
-#ifdef NA_64BIT
- NA_EIDPROC PCIOperandList(Int64 arg1, Int64 arg2, PCIType::Operand arg3, PCIType::Operand arg4, PCIType::Operand arg5,
+
+ PCIOperandList(Int64 arg1, Int64 arg2, PCIType::Operand arg3, PCIType::Operand arg4, PCIType::Operand arg5,
PCIType::Operand arg6, PCIType::Operand arg7, PCIType::Operand arg8) {
numberOperands_ = 10;
*((Int64*)&operand_[0]) = arg1; *((Int64*)&operand_[2]) = arg2;
operand_[4] = arg3; operand_[5] = arg4; operand_[6] = arg5;
operand_[7] = arg6; operand_[8] = arg7; operand_[9] = arg8;
};
- NA_EIDPROC PCIOperandList(PCIType::Operand arg1, PCIType::Operand arg2, PCIType::Operand arg3, PCIType::Operand arg4, PCIType::Operand arg5,
+ PCIOperandList(PCIType::Operand arg1, PCIType::Operand arg2, PCIType::Operand arg3, PCIType::Operand arg4, PCIType::Operand arg5,
PCIType::Operand arg6, Int64 arg7, Int64 arg8) {
numberOperands_ = 10;
operand_[0] = arg1; operand_[1] = arg2; operand_[2] = arg3;
operand_[3] = arg4; operand_[4] = arg5; operand_[5] = arg6;
*((Int64*)&operand_[6]) = arg7; *((Int64*)&operand_[8]) = arg8;
};
-#endif
- NA_EIDPROC PCIOperandList(PCIType::Operand arg1, PCIType::Operand arg2, PCIType::Operand arg3, PCIType::Operand arg4, PCIType::Operand arg5,
+
+ PCIOperandList(PCIType::Operand arg1, PCIType::Operand arg2, PCIType::Operand arg3, PCIType::Operand arg4, PCIType::Operand arg5,
PCIType::Operand arg6, PCIType::Operand arg7, PCIType::Operand arg8) {
initList(8, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
};
-#ifdef NA_64BIT
- NA_EIDPROC PCIOperandList(Int64 arg1, Int64 arg2, PCIType::Operand arg3, PCIType::Operand arg4, PCIType::Operand arg5,
+
+ PCIOperandList(Int64 arg1, Int64 arg2, PCIType::Operand arg3, PCIType::Operand arg4, PCIType::Operand arg5,
PCIType::Operand arg6, PCIType::Operand arg7, PCIType::Operand arg8, PCIType::Operand arg9) {
numberOperands_ = 11;
*((Int64*)&operand_[0]) = arg1; *((Int64*)&operand_[2]) = arg2;
@@ -927,17 +914,17 @@ public:
operand_[7] = arg6; operand_[8] = arg7; operand_[9] = arg8;
operand_[10] = arg9;
};
-#endif
- NA_EIDPROC PCIOperandList(PCIType::Operand arg1, PCIType::Operand arg2, PCIType::Operand arg3, PCIType::Operand arg4, PCIType::Operand arg5,
+
+ PCIOperandList(PCIType::Operand arg1, PCIType::Operand arg2, PCIType::Operand arg3, PCIType::Operand arg4, PCIType::Operand arg5,
PCIType::Operand arg6, PCIType::Operand arg7, PCIType::Operand arg8, PCIType::Operand arg9) {
initList(9, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);
};
- NA_EIDPROC PCIOperandList(PCIType::Operand arg1, PCIType::Operand arg2, PCIType::Operand arg3, PCIType::Operand arg4, PCIType::Operand arg5,
+ PCIOperandList(PCIType::Operand arg1, PCIType::Operand arg2, PCIType::Operand arg3, PCIType::Operand arg4, PCIType::Operand arg5,
PCIType::Operand arg6, PCIType::Operand arg7, PCIType::Operand arg8, PCIType::Operand arg9, PCIType::Operand arg10){
initList(10, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10);
};
-#ifdef NA_64BIT
- NA_EIDPROC PCIOperandList(Int64 arg1, Int64 arg2, PCIType::Operand arg3, PCIType::Operand arg4, PCIType::Operand arg5,
+
+ PCIOperandList(Int64 arg1, Int64 arg2, PCIType::Operand arg3, PCIType::Operand arg4, PCIType::Operand arg5,
PCIType::Operand arg6, PCIType::Operand arg7, PCIType::Operand arg8, PCIType::Operand arg9, PCIType::Operand arg10,
PCIType::Operand arg11){
numberOperands_ = 13;
@@ -946,41 +933,41 @@ public:
operand_[7] = arg6; operand_[8] = arg7; operand_[9] = arg8;
operand_[10] = arg9; operand_[11] = arg10; operand_[12] = arg11;
};
-#endif
- NA_EIDPROC PCIOperandList(PCIType::Operand arg1, PCIType::Operand arg2, PCIType::Operand arg3, PCIType::Operand arg4, PCIType::Operand arg5,
+
+ PCIOperandList(PCIType::Operand arg1, PCIType::Operand arg2, PCIType::Operand arg3, PCIType::Operand arg4, PCIType::Operand arg5,
PCIType::Operand arg6, PCIType::Operand arg7, PCIType::Operand arg8, PCIType::Operand arg9, PCIType::Operand arg10,
PCIType::Operand arg11){
initList(11, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10,
arg11);
};
- NA_EIDPROC PCIOperandList(PCIType::Operand arg1, PCIType::Operand arg2, PCIType::Operand arg3, PCIType::Operand arg4, PCIType::Operand arg5,
+ PCIOperandList(PCIType::Operand arg1, PCIType::Operand arg2, PCIType::Operand arg3, PCIType::Operand arg4, PCIType::Operand arg5,
PCIType::Operand arg6, PCIType::Operand arg7, PCIType::Operand arg8, PCIType::Operand arg9, PCIType::Operand arg10,
PCIType::Operand arg11, PCIType::Operand arg12){
initList(12, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10,
arg11, arg12);
};
- NA_EIDPROC PCIOperandList(PCIType::Operand arg1, PCIType::Operand arg2, PCIType::Operand arg3, PCIType::Operand arg4, PCIType::Operand arg5,
+ PCIOperandList(PCIType::Operand arg1, PCIType::Operand arg2, PCIType::Operand arg3, PCIType::Operand arg4, PCIType::Operand arg5,
PCIType::Operand arg6, PCIType::Operand arg7, PCIType::Operand arg8, PCIType::Operand arg9, PCIType::Operand arg10,
PCIType::Operand arg11, PCIType::Operand arg12, PCIType::Operand arg13){
initList(13, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10,
arg11, arg12, arg13);
};
- NA_EIDPROC PCIOperandList(PCIType::Operand arg1, PCIType::Operand arg2, PCIType::Operand arg3, PCIType::Operand arg4, PCIType::Operand arg5,
+ PCIOperandList(PCIType::Operand arg1, PCIType::Operand arg2, PCIType::Operand arg3, PCIType::Operand arg4, PCIType::Operand arg5,
PCIType::Operand arg6, PCIType::Operand arg7, PCIType::Operand arg8, PCIType::Operand arg9, PCIType::Operand arg10,
PCIType::Operand arg11, PCIType::Operand arg12, PCIType::Operand arg13, PCIType::Operand arg14){
initList(14, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10,
arg11, arg12, arg13, arg14);
};
- NA_EIDPROC PCIOperandList(PCIType::Operand arg1, PCIType::Operand arg2, PCIType::Operand arg3, PCIType::Operand arg4, PCIType::Operand arg5,
+ PCIOperandList(PCIType::Operand arg1, PCIType::Operand arg2, PCIType::Operand arg3, PCIType::Operand arg4, PCIType::Operand arg5,
PCIType::Operand arg6, PCIType::Operand arg7, PCIType::Operand arg8, PCIType::Operand arg9, PCIType::Operand arg10,
PCIType::Operand arg11, PCIType::Operand arg12, PCIType::Operand arg13, PCIType::Operand arg14, PCIType::Operand arg15){
initList(15, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10,
arg11, arg12, arg13, arg14, arg15);
};
- NA_EIDPROC PCIOperandList(PCIType::Operand arg1, PCIType::Operand arg2, PCIType::Operand arg3, PCIType::Operand arg4, PCIType::Operand arg5,
+ PCIOperandList(PCIType::Operand arg1, PCIType::Operand arg2, PCIType::Operand arg3, PCIType::Operand arg4, PCIType::Operand arg5,
PCIType::Operand arg6, PCIType::Operand arg7, PCIType::Operand arg8, PCIType::Operand arg9, PCIType::Operand arg10,
PCIType::Operand arg11, PCIType::Operand arg12, PCIType::Operand arg13, PCIType::Operand arg14,
PCIType::Operand arg15, PCIType::Operand arg16){
@@ -988,7 +975,7 @@ public:
arg11, arg12, arg13, arg14, arg15, arg16);
};
- NA_EIDPROC PCIOperandList(PCIType::Operand arg1, PCIType::Operand arg2, PCIType::Operand arg3, PCIType::Operand arg4, PCIType::Operand arg5,
+ PCIOperandList(PCIType::Operand arg1, PCIType::Operand arg2, PCIType::Operand arg3, PCIType::Operand arg4, PCIType::Operand arg5,
PCIType::Operand arg6, PCIType::Operand arg7, PCIType::Operand arg8, PCIType::Operand arg9, PCIType::Operand arg10,
PCIType::Operand arg11, PCIType::Operand arg12, PCIType::Operand arg13, PCIType::Operand arg14,
PCIType::Operand arg15, PCIType::Operand arg16, PCIType::Operand arg17){
@@ -996,7 +983,7 @@ public:
arg11, arg12, arg13, arg14, arg15, arg16, arg17);
};
- NA_EIDPROC PCIOperandList(PCIType::Operand arg1, PCIType::Operand arg2, PCIType::Operand arg3, PCIType::Operand arg4, PCIType::Operand arg5,
+ PCIOperandList(PCIType::Operand arg1, PCIType::Operand arg2, PCIType::Operand arg3, PCIType::Operand arg4, PCIType::Operand arg5,
PCIType::Operand arg6, PCIType::Operand arg7, PCIType::Operand arg8, PCIType::Operand arg9, PCIType::Operand arg10,
PCIType::Operand arg11, PCIType::Operand arg12, PCIType::Operand arg13, PCIType::Operand arg14,
PCIType::Operand arg15, PCIType::Operand arg16, PCIType::Operand arg17, PCIType::Operand arg18){
@@ -1004,7 +991,7 @@ public:
arg11, arg12, arg13, arg14, arg15, arg16, arg17, arg18);
};
- NA_EIDPROC PCIOperandList(PCIType::Operand arg1, PCIType::Operand arg2, PCIType::Operand arg3, PCIType::Operand arg4, PCIType::Operand arg5,
+ PCIOperandList(PCIType::Operand arg1, PCIType::Operand arg2, PCIType::Operand arg3, PCIType::Operand arg4, PCIType::Operand arg5,
PCIType::Operand arg6, PCIType::Operand arg7, PCIType::Operand arg8, PCIType::Operand arg9, PCIType::Operand arg10,
PCIType::Operand arg11, PCIType::Operand arg12, PCIType::Operand arg13, PCIType::Operand arg14,
PCIType::Operand arg15, PCIType::Operand arg16, PCIType::Operand arg17, PCIType::Operand arg18,
@@ -1013,7 +1000,7 @@ public:
arg11, arg12, arg13, arg14, arg15, arg16, arg17, arg18, arg19);
};
- NA_EIDPROC PCIOperandList(PCIType::Operand arg1, PCIType::Operand arg2, PCIType::Operand arg3, PCIType::Operand arg4, PCIType::Operand arg5,
+ PCIOperandList(PCIType::Operand arg1, PCIType::Operand arg2, PCIType::Operand arg3, PCIType::Operand arg4, PCIType::Operand arg5,
PCIType::Operand arg6, PCIType::Operand arg7, PCIType::Operand arg8, PCIType::Operand arg9, PCIType::Operand arg10,
PCIType::Operand arg11, PCIType::Operand arg12, PCIType::Operand arg13, PCIType::Operand arg14,
PCIType::Operand arg15, PCIType::Operand arg16, PCIType::Operand arg17, PCIType::Operand arg18,
@@ -1025,15 +1012,13 @@ public:
// Accessors
//
-NA_EIDPROC
Int32 getNumberOperands() { return numberOperands_; };
-NA_EIDPROC
PCIType::Operand getOperand(Int32 op) { return operand_[op]; };
private:
// Helper for constuctors
//
- NA_EIDPROC
+
void initList(Int32 numberOperands,
PCIType::Operand op1 =0, PCIType::Operand op2 =0, PCIType::Operand op3 =0, PCIType::Operand op4 =0,
PCIType::Operand op5 =0, PCIType::Operand op6 =0, PCIType::Operand op7 =0, PCIType::Operand op8 =0,
@@ -1078,33 +1063,29 @@ class PCodeInstruction {
public:
// Constructors
//
- NA_EIDPROC PCodeInstruction(PCIType::Operation operation) {
+ PCodeInstruction(PCIType::Operation operation) {
AML aml;
OL ol;
init(operation, aml, ol);
};
- NA_EIDPROC PCodeInstruction(PCIType::Operation operation, AML &aml) {
+ PCodeInstruction(PCIType::Operation operation, AML &aml) {
OL ol;
init(operation, aml, ol);
};
- NA_EIDPROC PCodeInstruction(PCIType::Operation operation, AML &aml, OL &ol) {
+ PCodeInstruction(PCIType::Operation operation, AML &aml, OL &ol) {
init(operation, aml, ol);
}
- NA_EIDPROC PCodeInstruction(const PCodeInstruction *pci) { copy(pci); };
+ PCodeInstruction(const PCodeInstruction *pci) { copy(pci); };
// Accessors
//
-NA_EIDPROC
Int32 getNumberAddressingModes() { return numberAddressingModes_; };
-NA_EIDPROC
Int32 getNumberOperands() { return numberOperands_; };
-NA_EIDPROC
void setNumberOperands(Int32 numOperands) { numberOperands_ = numOperands; };
-NA_EIDPROC
void replaceAddressingModesAndOperands(AML &aml, OL &ol) {
numberAddressingModes_ = aml.getNumberAddressingModes();
Int32 i = 0;
@@ -1118,58 +1099,35 @@ NA_EIDPROC
operand_[i] = ol.getOperand(i);
};
-NA_EIDPROC
PCIType::Operation getOperation() { return operation_; };
-NA_EIDPROC
PCIType::AddressingMode getAddressingMode(Int32 am)
{ return addressingMode_[am]; };
-NA_EIDPROC
-#ifdef NA_64BIT
Long getLongOperand(Int32 op) { return *(Long*)&operand_[op]; };
-#else
- PCIType::Operand getLongOperand(Int32 op) { return operand_[op]; };
-#endif // NA_64BIT
-NA_EIDPROC
PCIType::Operand getOperand(Int32 op) { return operand_[op]; };
-NA_EIDPROC
-#ifdef NA_64BIT
void setLongOperand(Int32 op, Long val) { *(Long*)&operand_[op] = val; };
-#else
- void setLongOperand(Int32 op, PCIType::Operand val) { operand_[op] = val; };
-#endif // NA_64BIT
-NA_EIDPROC
void setOperand(Int32 op, PCIType::Operand val) { operand_[op] = val; };
-NA_EIDPROC
Int32 getCodePosition() const { return codePosition_; };
-NA_EIDPROC
void setCodePosition(Int32 codePosition) { codePosition_ = codePosition; };
-NA_EIDPROC
Int32 getStackChange();
-NA_EIDPROC
Int32 getGeneratedCodeSize();
// Helpers
//
-NA_EIDPROC
static Int32 temporaryStoreLoadMatch(PCodeInstruction *store, PCodeInstruction *load);
-NA_EIDPROC
static Int32 temporaryStoreLoadOverlap(PCodeInstruction *store, PCodeInstruction *load);
-NA_EIDPROC
static Int32 replaceUsesOfTarget(PCodeInstruction *store, PCodeInstruction *use, Int32 check);
-NA_EIDPROC
Int32 getMemoryOperandLength(PCIType::AddressingMode, Int32 operand);
// Display
//
-NA_EIDPROC
void print();
private:
// Private helper for constructors
//
- NA_EIDPROC
+
void init(PCIType::Operation operation, AML &aml, OL &ol) {
operation_ = operation;
numberAddressingModes_ = aml.getNumberAddressingModes();
@@ -1186,7 +1144,7 @@ private:
// Private helper for constructors
//
- NA_EIDPROC
+
void copy(const PCodeInstruction *pci) {
operation_ = pci->operation_;
numberAddressingModes_ = pci->numberAddressingModes_;
@@ -1240,10 +1198,6 @@ private:
// A general method to take pointers out of PCode binary stream
// Takes pointer out of PCodeBinary sequences
-#ifdef NA_64BIT
#define GetPCodeBinaryAsPtr(pcode, idx) (*(Long*)&(pcode[idx]))
-#else
-#define GetPCodeBinaryAsPtr(pcode, idx) (pcode[idx])
-#endif
#endif // ExpPCodeInstruction_h
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/exp/ExpPCodeList.h
----------------------------------------------------------------------
diff --git a/core/sql/exp/ExpPCodeList.h b/core/sql/exp/ExpPCodeList.h
index afb6b57..eb93f3f 100644
--- a/core/sql/exp/ExpPCodeList.h
+++ b/core/sql/exp/ExpPCodeList.h
@@ -54,10 +54,10 @@ class PCILink;
class PCIList;
class PCIListIter;
-class SQLEXP_LIB_FUNC ListLink {
+class ListLink {
public:
- NA_EIDPROC ListLink() { prev_ = 0; next_ = 0; };
- NA_EIDPROC ListLink(ListLink *prev, ListLink *next) { prev_ = prev; next_ = next; };
+ ListLink() { prev_ = 0; next_ = 0; };
+ ListLink(ListLink *prev, ListLink *next) { prev_ = prev; next_ = next; };
ListLink *getNext() { return next_; };
ListLink *getPrev() { return prev_; };
@@ -71,10 +71,10 @@ private:
};
-class SQLEXP_LIB_FUNC ListBase {
+class ListBase {
public:
- NA_EIDPROC ListBase() { tail_ = NULL; }
- NA_EIDPROC ListBase(ListLink *tail) { tail_ = tail; }
+ ListBase() { tail_ = NULL; }
+ ListBase(ListLink *tail) { tail_ = tail; }
void insert(ListLink *item) {
if(tail_) {
@@ -124,13 +124,12 @@ private:
};
-class SQLEXP_LIB_FUNC ListBaseIter {
+class ListBaseIter {
public:
- NA_EIDPROC ListBaseIter(const ListBase &base) {
+ ListBaseIter(const ListBase &base) {
base_ = &base; link_ = base_->getTail();
};
- NA_EIDPROC
ListBaseIter(ListBaseIter &iter) {
base_ = iter.base_; link_ = iter.link_;
};
@@ -156,9 +155,8 @@ private:
};
-class SQLEXP_LIB_FUNC PCILink : public ListLink {
+class PCILink : public ListLink {
public:
- NA_EIDPROC
PCILink(PCodeInstruction *pci) : info_(pci) { ; };
PCodeInstruction *getData() { return info_; };
@@ -168,12 +166,12 @@ private:
};
-class SQLEXP_LIB_FUNC PCIList : private ListBase {
+class PCIList : private ListBase {
friend class PCIListIter;
public:
- NA_EIDPROC PCIList(CollHeap *heap) : heap_(heap) { ; };
- NA_EIDPROC PCIList(PCILink *base, CollHeap *heap) :
+ PCIList(CollHeap *heap) : heap_(heap) { ; };
+ PCIList(PCILink *base, CollHeap *heap) :
ListBase(base), heap_(heap) { ; };
void insert(PCodeInstruction *pci) {
@@ -209,12 +207,10 @@ private:
};
-class SQLEXP_LIB_FUNC PCIListIter : private ListBaseIter {
+class PCIListIter : private ListBaseIter {
public:
- NA_EIDPROC
PCIListIter(const PCIList &pcilist)
: ListBaseIter(pcilist) { ; };
- NA_EIDPROC
PCIListIter(PCIListIter &pciListIter)
: ListBaseIter(pciListIter) { ; };
PCodeInstruction *next() {
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/exp/ExpPCodeOptimizations.cpp
----------------------------------------------------------------------
diff --git a/core/sql/exp/ExpPCodeOptimizations.cpp b/core/sql/exp/ExpPCodeOptimizations.cpp
index 26be30c..fff0647 100644
--- a/core/sql/exp/ExpPCodeOptimizations.cpp
+++ b/core/sql/exp/ExpPCodeOptimizations.cpp
@@ -26,15 +26,13 @@
#include "CmpCommon.h"
#include "PCodeExprCache.h"
-#if defined(_DEBUG) && !defined(NA_NO_C_RUNTIME)
+#if defined(_DEBUG)
#define DUMP_PHASE(str,flag1,flag2) \
if (flag1) printBlocks(str, flag2);
#else
#define DUMP_PHASE(str,flag1,flag2)
#endif
-
-
/*****************************************************************************
* Debug code
*****************************************************************************/
@@ -252,7 +250,7 @@ void PCodeOperand::print( PCodeCfg *cfg )
/*****************************************************************************
* Hash functions for hash table
*****************************************************************************/
-NA_EIDPROC ULng32 constHashFunc(const PCodeConstants& c) {
+ULng32 constHashFunc(const PCodeConstants& c) {
char* data = (char*)c.data_;
ULng32 val = 0;
Int32 i;
@@ -263,19 +261,19 @@ NA_EIDPROC ULng32 constHashFunc(const PCodeConstants& c) {
return val + c.align_;
}
-NA_EIDPROC ULng32 nullTripleHashFunc(const NullTriple& o) {
+ULng32 nullTripleHashFunc(const NullTriple& o) {
return (o.atp_ * 1000) + o.idx_ + o.off_;
}
-NA_EIDPROC ULng32 operandHashFunc(const PCodeOperand& o) {
+ULng32 operandHashFunc(const PCodeOperand& o) {
return (o.stackIndex_ * 1000) + o.offset_ + o.nullBitIndex_;
}
-NA_EIDPROC ULng32 collIndexHashFunc(const CollIndex & o) {
+ULng32 collIndexHashFunc(const CollIndex & o) {
return (ULng32)o;
}
-NA_EIDPROC ULng32 collIndexHashFunc2(const CollIndex & o) {
+ULng32 collIndexHashFunc2(const CollIndex & o) {
return (ULng32)o;
}
@@ -287,7 +285,7 @@ NA_EIDPROC ULng32 collIndexHashFunc2(const CollIndex & o) {
// from the input on 64-bit platform, it wouldn't affect the quality of
// the hash value in most cases because the pcode binaries are normally
// stored in a confined area in the optimization phase.
-NA_EIDPROC ULng32 targetHashFunc(const ULong & o) {
+ULng32 targetHashFunc(const ULong & o) {
ULng32 v = (ULong)o;
return v;
}
@@ -1939,11 +1937,11 @@ void PCodeCfg::runtimeOptimize()
assert (expr_->getType() == ex_expr::exp_SCAN_PRED);
-#if defined(_DEBUG) && !defined(NA_NO_C_RUNTIME)
+#if defined(_DEBUG)
if (getenv("PCODE_LLO_DEBUG"))
debug = 1;
-#endif // defined(_DEBUG) && !defined(NA_NO_C_RUNTIME)
+#endif // defined(_DEBUG)
if (enableOpt) {
// First translate pcode bytecode into PCodeInst objects
@@ -2000,7 +1998,7 @@ void PCodeCfg::optimize()
MERGE_BLOCKS |
REMOVE_EMPTY_BLOCKS;
-#if defined(_DEBUG) && !defined(NA_NO_C_RUNTIME)
+#if defined(_DEBUG)
//static unsigned int count = 0;
//static unsigned int limit = 5000000; // count=69 is problem
@@ -2019,7 +2017,7 @@ void PCodeCfg::optimize()
//if (++count > limit)
// return;
-#endif // defined(_DEBUG) && !defined(NA_NO_C_RUNTIME)
+#endif // defined(_DEBUG)
// If this pcode sequence can't be optimized, or if decided to disable opts,
// return.
@@ -2029,10 +2027,10 @@ void PCodeCfg::optimize()
if ( !canPCodeBeOptimized(pCode , pcodeExprIsCacheable , savedUnOptPCodeLen ) ||
!enableOpt )
{
-#if defined(_DEBUG) && !defined(NA_NO_C_RUNTIME)
+#if defined(_DEBUG)
if ( debugSome )
NExLog( "FOUND: PCODE EXPRESSION NOT EVEN OPTIMIZABLE\n" );
-#endif // defined(_DEBUG) && !defined(NA_NO_C_RUNTIME)
+#endif // defined(_DEBUG)
return;
}
@@ -2042,7 +2040,7 @@ void PCodeCfg::optimize()
if ( optFlags_ & OPT_PCODE_CACHE_DISABLED )
pcodeExprIsCacheable = FALSE ;
-#if defined(_DEBUG) && !defined(NA_NO_C_RUNTIME)
+#if defined(_DEBUG)
if ( debugSome )
{
if ( pcodeExprIsCacheable )
@@ -2050,7 +2048,7 @@ void PCodeCfg::optimize()
else
NExLog( "FOUND: PCODE EXPRESSION IS NOT cacheable\n" );
}
-#endif // defined(_DEBUG) && !defined(NA_NO_C_RUNTIME)
+#endif // defined(_DEBUG)
// Initialize counters
initInstructionCounters();
@@ -2256,9 +2254,9 @@ void PCodeCfg::optimize()
if ( usingCachedPCodeExpr )
goto considerNativeCodeGen ;
-#if defined(_DEBUG) && !defined(NA_NO_C_RUNTIME)
+#if defined(_DEBUG)
if (debugSome) NExLog("-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\n");
-#endif // defined(_DEBUG) && !defined(NA_NO_C_RUNTIME)
+#endif // defined(_DEBUG)
#if OPT_PCC_DEBUG==1
@@ -2507,8 +2505,6 @@ considerNativeCodeGen:
Int32 constsLenAfterOpt = newConstsAreaLen_ ;
-#if defined(NA_LINUX) && ! defined(__EID)
-
#if OPT_PCC_DEBUG==1
UInt64 totalNEgenTime = 0;
#endif // OPT_PCC_DEBUG==1
@@ -2542,7 +2538,6 @@ considerNativeCodeGen:
expr_->setEvalPtr( (ex_expr::evalPtrType)( (CollIndex) 0 ) );//Ensure NULL!
}
-#endif // defined(NA_LINUX) && ! defined(__EID)
if ( ! usingCachedPCodeExpr )
{
@@ -2654,8 +2649,6 @@ PCodeCfg::~PCodeCfg() {
void PCodeCfg::destroy()
{
-#ifndef __EID
-
// If we're not dealing with runtime optimizations happening in EID, then
// all memory can be quickly deallocated by deleting the main heap_, followed
// by individual deletes of the member variables.
@@ -2678,129 +2671,8 @@ void PCodeCfg::destroy()
NADELETEBASIC(neg1_, origHeap_);
delete(heap_);
-
-#else
-
- // Since we're in EID, that implies that we were called at runtime. In this
- // case, all memory was allocated within the eid heap object (and not in a
- // heap within this heap). As such, we delete all the objects the old
- // fashion way. Perhaps there is a better way of doing this, but seeing as
- // how runtimeOptimize() is very rarely called, this should have little to
- // no perf impact.
-
- CollIndex i;
-
- // Delete operands
- //
- // Destroy all key-value pairs in operands and operandsMap list since the
- // objects contained in them were dynamically allocated and no longer needed.
- //
- if (operandToIndexMap_) {
- PCodeOperand* key;
- CollIndex* value;
- NAHashDictionaryIterator<PCodeOperand, CollIndex> iter(*operandToIndexMap_);
-
- for (i=0; i < iter.entries(); i++) {
- iter.getNext(key, value);
- NADELETEBASIC(key, heap_);
- NADELETEBASIC(value, heap_);
- }
-
- delete operandToIndexMap_;
- }
-
- //
- // Delete constants hash tables
- //
- if (constToOffsetMap_) {
- PCodeConstants* key;
- CollIndex* value;
- NAHashDictionaryIterator<PCodeConstants,CollIndex> iter(*constToOffsetMap_);
-
- for (i=0; i < iter.entries(); i++) {
- iter.getNext(key, value);
- NADELETEBASIC(key, heap_);
- NADELETEBASIC(value, heap_);
- }
-
- delete constToOffsetMap_;
- }
-
- // Since offsetToConstMap_ is just the reverse of constToOffsetMap_, nothing
- // to do but delete the hash table.
- if (offsetToConstMap_)
- delete offsetToConstMap_;
-
- // Destroy nullToPadMap hash table
- if (nullToPadMap_) {
- NullTriple* key;
- Int32* value;
- NAHashDictionaryIterator<NullTriple, Int32> iter(*(nullToPadMap_));
-
- for (i=0; i < iter.entries(); i++) {
- iter.getNext(key, value);
- NADELETEBASIC(key, heap_);
- NADELETEBASIC(value, heap_);
- }
-
- delete nullToPadMap_;
- }
-
- // Since indexToOperandMap_ is just the reverse mapping of operandToIndexMap_,
- // no need to delete key-value pairs for it since they were already deleted
- // above.
- if (indexToOperandMap_)
- delete indexToOperandMap_;
-
- // Destroy keys in the targets_ table since those objects were dynamically
- // allocated.
- if (targets_) {
- ULong * key;
- PCodeBinary * value;
- NAHashDictionaryIterator<ULong, PCodeBinary> iter(*targets_);
-
- for (i=0; i < iter.entries(); i++) {
- iter.getNext(key, value);
- NADELETEBASIC(key, heap_);
- }
-
- delete targets_;
- }
-
- // Delete insts
- if (allInsts_) {
- for (i=0; i < allInsts_->entries(); i++)
- NADELETE(allInsts_->at(i), PCodeInst, heap_);
-
- delete(allInsts_);
- }
-
- // Delete blocks
- if (allBlocks_) {
- for (i=0; i < allBlocks_->entries(); i++) {
- PCodeBlock* block = allBlocks_->at(i);
-
- if (block->reachingDefsTab_) {
- block->reachingDefsTab_->destroy();
- NADELETE(block->reachingDefsTab_, ReachDefsTable, heap_);
- }
-
- NADELETEBASIC(block, heap_);
- }
-
- delete(allBlocks_);
- }
-
- // Delete constant vectors
- delete (zeroes_);
- delete (ones_);
- delete (neg1_);
-
-#endif
}
-#ifndef __EID
-
void PCodeCfg::generateShowPlan(PCodeBinary* pCode, Space* space)
{
if (pCode == NULL)
@@ -2812,9 +2684,9 @@ void PCodeCfg::generateShowPlan(PCodeBinary* pCode, Space* space)
createInsts(pCode);
createCfg();
-#if defined(_DEBUG) && !defined(NA_NO_C_RUNTIME)
+#if defined(_DEBUG)
NExLog("-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*\n");
-#endif // defined(_DEBUG) && !defined(NA_NO_C_RUNTIME)
+#endif // defined(_DEBUG)
DUMP_PHASE("CFG [0]", TRUE, FALSE);
@@ -2941,9 +2813,6 @@ void PCodeCfg::generateShowPlan(PCodeBinary* pCode, Space* space)
}
}
-#endif // __EID
-
-
/*****************************************************************************
* PCodeCfg
*****************************************************************************/
@@ -3439,18 +3308,10 @@ void PCodeCfg::removeReachingDefs()
{
FOREACH_BLOCK_FAST(block, firstInst, lastInst, inst) {
if (block->reachingDefsTab_) {
-#ifdef __EID
- // in cmpiler, we'll delete whole rDefsHeap_ instead of individual
- // reaching Defs Tables
- block->reachingDefsTab_->destroy();
- NADELETE(block->reachingDefsTab_, ReachDefsTable, heap_);
-#endif
block->reachingDefsTab_ = NULL;
}
} ENDFE_BLOCK_FAST
-#ifndef __EID
delete(rDefsHeap_);
-#endif
rDefsHeap_ = NULL;
}
@@ -3515,12 +3376,8 @@ void PCodeCfg::computeReachingDefs(Int32 flags)
NABoolean noTemps = flags & 0x1;
-#ifndef __EID
// Allocate reach defs memory in separate heap for faster destruction.
rDefsHeap_ = new(heap_) NAHeap("Pcode Rdef", (NAHeap*)heap_, (Lng32)32768);
-#else
- rDefsHeap_ = heap_;
-#endif
// Initialize reaching defs table for each live block
FOREACH_BLOCK_REV_DFO(block, firstInst, lastInst, index) {
@@ -3825,12 +3682,10 @@ void PCodeCfg::assignBlockOffsetsAndFixup(BLOCKLIST& blockList)
PCode::getInstructionLength(inst->code)) - 1;
}
-#ifdef NA_64BIT
// Null branch PCode Binaries do not contail address operands
if (inst->isAnyLogicalBranch())
*((Long*)(targetOffsetPtrs[j])) = targetOffset;
else
-#endif
*(targetOffsetPtrs[j]) = (Int32)targetOffset;
}
}
@@ -7138,12 +6993,6 @@ NABoolean PCodeCfg::canPCodeBeOptimized( PCodeBinary * pCode
if (clause->getClassID() == ex_clause::INOUT_TYPE)
return FALSE;
- // ExAuditImage clauses contain auditRowImageExpr pointers which point
- // back to data (temps in particular) used by parent (like a function call
- // with reference parameters). We can't optimize across multiple exprs.
- else if (clause->getClassID() == ex_clause::FUNC_AUDIT_ROW_IMAGE)
- return FALSE;
-
// Clauses evaluated before HbaseColumnCreate directly update the result
// buffer of this clause. Pcode optimization will remove those pre-clauses
// as their output is not directly referenced in another clause.
@@ -7278,7 +7127,7 @@ NABoolean PCodeCfg::createInsts (PCodeBinary * pcode)
//
// Used for Aligned Format to get null bit index of column
//
-NA_EIDPROC static Int32 getBitIndex(PCodeBinary *code, const Int32 idx)
+static Int32 getBitIndex(PCodeBinary *code, const Int32 idx)
{
Attributes* attr = (Attributes*)GetPCodeBinaryAsPtr(code, idx);
if (attr->getTupleFormat() == ExpTupleDesc::SQLMX_ALIGNED_FORMAT)
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/exp/ExpPCodeOptimizations.h
----------------------------------------------------------------------
diff --git a/core/sql/exp/ExpPCodeOptimizations.h b/core/sql/exp/ExpPCodeOptimizations.h
index d3985e0..31ed8b9 100644
--- a/core/sql/exp/ExpPCodeOptimizations.h
+++ b/core/sql/exp/ExpPCodeOptimizations.h
@@ -123,7 +123,6 @@ inline uint16_t _byteswap_ushort(uint16_t value) {
#include "ExecutionEngine/ExecutionEngine.h"
-#ifndef __EID /* When in EID, must NOT reference routines in LLVM libraries */
#include "ExecutionEngine/JIT.h"
#include "LLVMContext.h"
#include "llvm/Module.h" /* Must put llvm/ here to avoid including .../cli/Module.h */
@@ -132,7 +131,6 @@ inline uint16_t _byteswap_ushort(uint16_t value) {
#include "Analysis/Passes.h"
#include "DataLayout.h"
#include "Transforms/Scalar.h"
-#endif /* __EID */
#include "IRBuilder.h"
#include "Config/config.h"
@@ -200,7 +198,7 @@ typedef NAList<NExTempListEntry*> NExTEMPSLIST ;
typedef NAArray<PCodeBlock*> BLOCKARRAY;
-NA_EIDPROC ULng32 collIndexHashFunc2(const CollIndex & o);
+ULng32 collIndexHashFunc2(const CollIndex & o);
// -----------------------------------------------------------------------
// Macros
@@ -555,7 +553,7 @@ public:
Int32 len_; // Length of data
Int32 align_; // Alignment of data
- friend NA_EIDPROC ULng32 constHashFunc(const PCodeConstants& c);
+ friend ULng32 constHashFunc(const PCodeConstants& c);
// Two constants are equal if their lengths, alignment, and data are the same.
NABoolean operator==(const PCodeConstants& other) const {
@@ -659,7 +657,7 @@ public:
Int32 idx_; // Tupp index of null indicator
Int32 off_; // Column offset of null indicator
- friend NA_EIDPROC ULng32 nullTripleHashFunc(const NullTriple& o);
+ friend ULng32 nullTripleHashFunc(const NullTriple& o);
NABoolean operator==(const NullTriple& other) const {
return ((other.off_ == off_) && (other.idx_ == idx_) &&
@@ -829,9 +827,9 @@ private:
public:
// Hash function used to insert operand bv element into hash table
- NA_EIDPROC friend ULng32 operandHashFunc(const PCodeOperand& o);
+ friend ULng32 operandHashFunc(const PCodeOperand& o);
- NA_EIDPROC friend ULng32 collIndexHashFunc(const CollIndex & o);
+ friend ULng32 collIndexHashFunc(const CollIndex & o);
// Operator equals function to compare two operand bv elements
NABoolean operator==(const PCodeOperand& other) const {
@@ -1305,7 +1303,7 @@ public:
NABitVector zeroesVector; // Zeroes constant vector
NABitVector neg1Vector; // Neg1 constant vector
- friend NA_EIDPROC ULng32 collIndexHashFunc2(const CollIndex & o);
+ friend ULng32 collIndexHashFunc2(const CollIndex & o);
ReachDefsTable* reachingDefsTab_;
@@ -1679,18 +1677,14 @@ public:
static const Int32 INVALID_INT32 = 0xFEFEFEFE;
static const Int64 INVALID_INT64 = 0xFEFEFEFEFEFEFEFELL;
-#ifdef NA_64BIT
#define INVALID_LONG INVALID_INT64
-#else
- #define INVALID_LONG INVALID_INT32
-#endif
// Static const variables used.
static const Int32 MAX_NUM_PCODE_INSTS = 500;
static const Int32 MAX_HASHCOMB_BULK_OPERANDS = 100;
// Friend classes
- // friend NA_EIDPROC ULng32 targetHashFunc(const Int32 & o);
+ // friend ULng32 targetHashFunc(const Int32 & o);
// Constructor Routines
PCodeCfg(ex_expr* expr,
@@ -1711,11 +1705,7 @@ public:
// deallocation can be done quickly. If we're called from within EID,
// however, heap_ should just be the heap passed in.
-#ifndef __EID
heap_ = new(heap) NAHeap("Pcode", (NAHeap*)heap, (Lng32)32768);
-#else
- heap_ = heap;
-#endif
allBlocks_ = new(heap) BLOCKLIST(heap_, 10);
allInsts_ = new(heap) INSTLIST(heap_, 20);
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/exp/ExpPCodeOptsNativeExpr.cpp
----------------------------------------------------------------------
diff --git a/core/sql/exp/ExpPCodeOptsNativeExpr.cpp b/core/sql/exp/ExpPCodeOptsNativeExpr.cpp
index 4cf07af..9ebd530 100755
--- a/core/sql/exp/ExpPCodeOptsNativeExpr.cpp
+++ b/core/sql/exp/ExpPCodeOptsNativeExpr.cpp
@@ -23,8 +23,6 @@
// Native Expressions only officially supported on Linux for now.
-//#ifndef __EID /* MOVED THIS LINE DOWN PAST PCodeCfg::NExLog() */
-
///////////////////////////////////////////////////////////////////////
//
// The following are a few notes regarding native exprs
@@ -87,8 +85,6 @@ void PCodeCfg::NExLog(const char *data)
}
}
-#ifndef __EID
-
#if NExprDbgLvl > VV_NO
//
// For routines in the PCodeCfg class, we have access to the
@@ -9375,10 +9371,8 @@ void PCodeCfg::layoutNativeCode(Space* showplanSpace = NULL)
NABoolean debug = FALSE;
NABoolean lowerOptLevel = FALSE; // Used to reduce jit opt level.
-//#if defined(_DEBUG) && !defined(NA_NO_C_RUNTIME)
if (getenv("NATIVE_EXPR_DEBUG"))
debug = TRUE;
-//#endif
PCodeOperand *src1, *src2, *res;
@@ -12391,4 +12385,3 @@ void PCodeCfg::layoutNativeCode(Space* showplanSpace = NULL)
}
#endif /* NA_LINUX_LIBJIT */
-#endif /* __EID */
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/exp/ExpPCodeOptsPeeling.cpp
----------------------------------------------------------------------
diff --git a/core/sql/exp/ExpPCodeOptsPeeling.cpp b/core/sql/exp/ExpPCodeOptsPeeling.cpp
index 204fd95..f56db49 100644
--- a/core/sql/exp/ExpPCodeOptsPeeling.cpp
+++ b/core/sql/exp/ExpPCodeOptsPeeling.cpp
@@ -25,7 +25,7 @@
// Forward declarations
-NA_EIDPROC static void setNeg1ConstantsForNullBranch(PCodeInst* inst,
+static void setNeg1ConstantsForNullBranch(PCodeInst* inst,
NABitVector& zeroes,
NABitVector& ones,
NABitVector& neg1);
@@ -58,10 +58,8 @@ void PCodeCfg::reorderPredicatesHelper()
PCodeBlock* retBlk;
PCodeInst *retInst, *branch;
-#ifdef NA_64BIT
-// 64BIT revisit -- hard-coded indexes on the source side may not be correct
branch = srcBlock->insertNewInstAfter(NULL, PCIT::BRANCH_OR);
- // for 64bit BRANCH_OR code[0] is opcode, code[1] and code[2] are target
+ // BRANCH_OR code[0] is opcode, code[1] and code[2] are target
// clause pointer; code[3] and code[4] are 64-bit 0; code[5] and code[6]
// for operand #1; code[7] and code[8] for operand #2
branch->code[3] = 0; // not necessary to clear
@@ -70,14 +68,6 @@ void PCodeCfg::reorderPredicatesHelper()
branch->code[6] = lastInst->prev->code[2];
branch->code[7] = branch->code[5];
branch->code[8] = branch->code[6];
-#else // !NA_64BIT
- branch = srcBlock->insertNewInstAfter(NULL, PCIT::BRANCH_OR);
- branch->code[2] = 0; // not necessary to clear
- branch->code[3] = lastInst->prev->code[1];
- branch->code[4] = lastInst->prev->code[2];
- branch->code[5] = branch->code[3];
- branch->code[6] = branch->code[4];
-#endif // NA_64BIT
branch->reloadOperands(this);
@@ -1323,7 +1313,6 @@ PCodeBlock::determineTargetBlock(NABitVector& zeroes,
// Make the assumption that the provided instruction (a null branch) is not
// taken, and set the known constants for the operands involved in the inst.
//
-NA_EIDPROC
static void setNeg1ConstantsForNullBranch(PCodeInst* inst,
NABitVector& zeroes,
NABitVector& ones,
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/exp/ExpPCodeOptsRuntime.cpp
----------------------------------------------------------------------
diff --git a/core/sql/exp/ExpPCodeOptsRuntime.cpp b/core/sql/exp/ExpPCodeOptsRuntime.cpp
index 675928a..a56b8be 100644
--- a/core/sql/exp/ExpPCodeOptsRuntime.cpp
+++ b/core/sql/exp/ExpPCodeOptsRuntime.cpp
@@ -128,7 +128,7 @@ PCodePredicateGroup::PCodePredicateGroup(CollHeap* heap,
//cost_ = (cost_ < 100) ? 1 : (cost_/100 * 100);
}
-#if defined(_DEBUG) && !defined(NA_NO_C_RUNTIME)
+#if defined(_DEBUG)
void PCodePredicateGroup::print()
{
@@ -156,7 +156,7 @@ void PCodePredicateGroup::print()
printf("\n");
}
-#endif // defined(_DEBUG) && !defined(NA_NO_C_RUNTIME)
+#endif // defined(_DEBUG)
//
// Gets invoked BEFORE predicate groups within unit have been shuffled. This
@@ -644,9 +644,9 @@ NABoolean PCodePredicateGroup::findUnits(GROUPLIST& unit,
PCodePredicateGroup *sibling, *group = this;
NABoolean unitFound = FALSE;
-#if defined(_DEBUG) && !defined(NA_NO_C_RUNTIME)
+#if defined(_DEBUG)
NABoolean debug = FALSE;
-#endif // defined(_DEBUG) && !defined(NA_NO_C_RUNTIME)
+#endif // defined(_DEBUG)
// The group is part of the unit, so add to unit and remove from workList
unit.insert(group);
@@ -777,14 +777,14 @@ NABoolean PCodePredicateGroup::findUnits(GROUPLIST& unit,
if (!isStatic)
group->adjustCost(unit);
-#if defined(_DEBUG) && !defined(NA_NO_C_RUNTIME)
+#if defined(_DEBUG)
if (debug) {
printf("Unit found:\n");
for (i=0; i < unit.entries(); i++)
unit[i]->print();
printf("\n");
}
-#endif // defined(_DEBUG) && !defined(NA_NO_C_RUNTIME)
+#endif // defined(_DEBUG)
// Record the fact on whether or not this unit contains a predicate group
// with a write operand.
@@ -857,14 +857,14 @@ NABoolean PCodePredicateGroup::findUnits(GROUPLIST& unit,
group->getWrites().insert(unit[i]->getWrites()[j]);
}
-#if defined(_DEBUG) && !defined(NA_NO_C_RUNTIME)
+#if defined(_DEBUG)
if (debug) {
printf("Unit after swap:\n");
for (i=0; i < unit.entries(); i++)
unit[i]->print();
printf("\n");
}
-#endif // defined(_DEBUG) && !defined(NA_NO_C_RUNTIME)
+#endif // defined(_DEBUG)
// Merge the rest of the unit into the leader predicate group
while (unit.entries() > 1) {
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/exp/ExpPackDefs.cpp
----------------------------------------------------------------------
diff --git a/core/sql/exp/ExpPackDefs.cpp b/core/sql/exp/ExpPackDefs.cpp
index bf450c5..4c67134 100644
--- a/core/sql/exp/ExpPackDefs.cpp
+++ b/core/sql/exp/ExpPackDefs.cpp
@@ -54,7 +54,7 @@
/////////////////////////////////////////////////////
// pack procs for classes ex_expr, OutputExpr
/////////////////////////////////////////////////////
-NA_EIDPROC void ex_expr::packStuff(void * space_)
+void ex_expr::packStuff(void * space_)
{
//Following code packs ex_clause elements iteratively.
ex_clause *keepClause = NULL;
@@ -86,13 +86,12 @@ NA_EIDPROC void ex_expr::packStuff(void * space_)
pCode_.pack(space_);
}
-NA_EIDPROC Long ex_expr::pack(void * space_)
+Long ex_expr::pack(void * space_)
{
packStuff(space_);
return NAVersionedObject::pack(space_);
}
-NA_EIDPROC
void ex_expr_lean::convAddrToOffsetInPCode(void * space) {
PCodeBinary *pcode = getPCodeBinary();
if (!pcode)
@@ -116,7 +115,7 @@ void ex_expr_lean::convAddrToOffsetInPCode(void * space) {
pCodeLean_ = (PCodeBinary*)((Space *)space)->convertToOffset((char*)pCodeLean_);
}
-NA_EIDPROC Long ex_expr_lean::pack(void * space_)
+Long ex_expr_lean::pack(void * space_)
{
constantsArea_.pack(space_);
tempsArea_.pack(space_);
@@ -128,7 +127,7 @@ NA_EIDPROC Long ex_expr_lean::pack(void * space_)
return NAVersionedObject::pack(space_);
}
-NA_EIDPROC Long AggrExpr::pack(void * space_)
+Long AggrExpr::pack(void * space_)
{
initExpr_.pack(space_);
perrecExpr_.pack(space_);
@@ -139,7 +138,7 @@ NA_EIDPROC Long AggrExpr::pack(void * space_)
return ex_expr::pack(space_);
}
-NA_EIDPROC Long InputOutputExpr::pack(void * space_)
+Long InputOutputExpr::pack(void * space_)
{
return ex_expr::pack(space_);
}
@@ -148,362 +147,362 @@ NA_EIDPROC Long InputOutputExpr::pack(void * space_)
// pack procs for clauses
//////////////////////////////////////////////
-NA_EIDPROC Long ex_aggregate_clause::pack(void * space_)
+Long ex_aggregate_clause::pack(void * space_)
{
return packClause(space_, sizeof(ex_aggregate_clause));
}
-NA_EIDPROC Long ex_arith_clause::pack(void * space_)
+Long ex_arith_clause::pack(void * space_)
{
return packClause(space_, sizeof(ex_arith_clause));
}
-NA_EIDPROC Long ex_unlogic_clause::pack(void * space_)
+Long ex_unlogic_clause::pack(void * space_)
{
return packClause(space_, sizeof(ex_unlogic_clause));
}
-NA_EIDPROC Long ExRegexpClauseChar::pack(void * space_)
+Long ExRegexpClauseChar::pack(void * space_)
{
return packClause(space_, sizeof(ExRegexpClauseChar));
}
-NA_EIDPROC Long ex_like_clause_char::pack(void * space_)
+Long ex_like_clause_char::pack(void * space_)
{
return packClause(space_, sizeof(ex_like_clause_char));
}
-NA_EIDPROC Long ex_like_clause_doublebyte::pack(void * space_)
+Long ex_like_clause_doublebyte::pack(void * space_)
{
return packClause(space_, sizeof(ex_like_clause_doublebyte));
}
-NA_EIDPROC Long ex_bool_clause::pack(void * space_)
+Long ex_bool_clause::pack(void * space_)
{
return packClause(space_, sizeof(ex_bool_clause));
}
-NA_EIDPROC Long bool_result_clause::pack(void * space_)
+Long bool_result_clause::pack(void * space_)
{
return packClause(space_, sizeof(bool_result_clause));
}
-NA_EIDPROC Long ex_branch_clause::pack(void * space_)
+Long ex_branch_clause::pack(void * space_)
{
saved_next_clause.pack(space_);
branch_clause.pack(space_);
return packClause(space_, sizeof(ex_branch_clause));
}
-NA_EIDPROC Long ex_comp_clause::pack(void * space_)
+Long ex_comp_clause::pack(void * space_)
{
return packClause(space_, sizeof(ex_comp_clause));
}
-NA_EIDPROC Long ex_conv_clause::pack(void * space_)
+Long ex_conv_clause::pack(void * space_)
{
return packClause(space_, sizeof(ex_conv_clause));
}
-NA_EIDPROC Long ex_function_clause::pack(void * space_)
+Long ex_function_clause::pack(void * space_)
{
return packClause(space_, sizeof(ex_function_clause));
}
-NA_EIDPROC Long ex_function_concat::pack(void * space_)
+Long ex_function_concat::pack(void * space_)
{
return packClause(space_, sizeof(ex_function_concat));
}
-NA_EIDPROC Long ex_function_substring::pack(void * space_)
+Long ex_function_substring::pack(void * space_)
{
return packClause(space_, sizeof(ex_function_substring));
}
-NA_EIDPROC Long ex_function_substring_doublebyte::pack(void * space_)
+Long ex_function_substring_doublebyte::pack(void * space_)
{
return packClause(space_, sizeof(ex_function_substring_doublebyte));
}
-NA_EIDPROC Long ex_function_trim_char::pack(void * space_)
+Long ex_function_trim_char::pack(void * space_)
{
return packClause(space_, sizeof(ex_function_trim_char));
}
-NA_EIDPROC Long ex_function_trim_doublebyte::pack(void * space_)
+Long ex_function_trim_doublebyte::pack(void * space_)
{
return packClause(space_, sizeof(ex_function_trim_doublebyte));
}
-NA_EIDPROC Long ex_function_lower::pack(void * space_)
+Long ex_function_lower::pack(void * space_)
{
return packClause(space_, sizeof(ex_function_lower));
}
-NA_EIDPROC Long ex_function_upper::pack(void * space_)
+Long ex_function_upper::pack(void * space_)
{
return packClause(space_, sizeof(ex_function_upper));
}
-NA_EIDPROC Long ex_function_translate::pack(void * space_)
+Long ex_function_translate::pack(void * space_)
{
return packClause(space_, sizeof(ex_function_translate));
}
-NA_EIDPROC Long ExFunctionAscii::pack(void * space_)
+Long ExFunctionAscii::pack(void * space_)
{
return packClause(space_, sizeof(ExFunctionAscii));
}
-NA_EIDPROC Long ExFunctionChar::pack(void * space_)
+Long ExFunctionChar::pack(void * space_)
{
return packClause(space_, sizeof(ExFunctionChar));
}
-NA_EIDPROC Long ExFunctionConvertHex::pack(void * space_)
+Long ExFunctionConvertHex::pack(void * space_)
{
return packClause(space_, sizeof(ExFunctionConvertHex));
}
-NA_EIDPROC Long ExFunctionRepeat::pack(void * space_)
+Long ExFunctionRepeat::pack(void * space_)
{
return packClause(space_, sizeof(ExFunctionRepeat));
}
-NA_EIDPROC Long ExFunctionReplace::pack(void * space_)
+Long ExFunctionReplace::pack(void * space_)
{
return packClause(space_, sizeof(ExFunctionReplace));
}
// 12/17/97: added for unicode UPPER()
-NA_EIDPROC Long ex_function_upper_unicode::pack(void * space_)
+Long ex_function_upper_unicode::pack(void * space_)
{
return packClause(space_, sizeof(ex_function_upper_unicode));
}
-NA_EIDPROC Long ex_function_lower_unicode::pack(void * space_)
+Long ex_function_lower_unicode::pack(void * space_)
{
return packClause(space_, sizeof(ex_function_lower_unicode));
}
-NA_EIDPROC Long ex_function_char_length::pack(void * space_)
+Long ex_function_char_length::pack(void * space_)
{
return packClause(space_, sizeof(ex_function_char_length));
}
-NA_EIDPROC Long ex_function_char_length_doublebyte::pack(void * space_)
+Long ex_function_char_length_doublebyte::pack(void * space_)
{
return packClause(space_, sizeof(ex_function_char_length_doublebyte));
}
-NA_EIDPROC Long ex_function_oct_length::pack(void * space_)
+Long ex_function_oct_length::pack(void * space_)
{
return packClause(space_, sizeof(ex_function_oct_length));
}
-NA_EIDPROC Long ex_function_position::pack(void * space_)
+Long ex_function_position::pack(void * space_)
{
return packClause(space_, sizeof(ex_function_position));
}
-NA_EIDPROC Long ex_function_position_doublebyte::pack(void * space_)
+Long ex_function_position_doublebyte::pack(void * space_)
{
return packClause(space_, sizeof(ex_function_position_doublebyte));
}
-NA_EIDPROC Long ExFunctionTokenStr::pack(void * space_)
+Long ExFunctionTokenStr::pack(void * space_)
{
return packClause(space_, sizeof(ExFunctionTokenStr));
}
-NA_EIDPROC Long ex_function_current::pack(void * space_)
+Long ex_function_current::pack(void * space_)
{
return packClause(space_, sizeof(ex_function_current));
}
-NA_EIDPROC Long ex_function_encode::pack(void * space_)
+Long ex_function_encode::pack(void * space_)
{
return packClause(space_, sizeof(ex_function_encode));
}
//++Triggers -
-NA_EIDPROC Long ex_function_unique_execute_id::pack(void * space_)
+Long ex_function_unique_execute_id::pack(void * space_)
{
return packClause(space_, sizeof(ex_function_unique_execute_id));
}
-NA_EIDPROC Long ex_function_get_triggers_status::pack(void * space_)
+Long ex_function_get_triggers_status::pack(void * space_)
{
return packClause(space_, sizeof(ex_function_get_triggers_status));
}
-NA_EIDPROC Long ex_function_get_bit_value_at::pack(void * space_)
+Long ex_function_get_bit_value_at::pack(void * space_)
{
return packClause(space_, sizeof(ex_function_get_bit_value_at));
}
//--Triggers -
-NA_EIDPROC Long ex_function_is_bitwise_and_true::pack(void * space_)
+Long ex_function_is_bitwise_and_true::pack(void * space_)
{
return packClause(space_, sizeof(ex_function_is_bitwise_and_true));
}
//--MV
-NA_EIDPROC Long ex_function_explode_varchar::pack(void * space_)
+Long ex_function_explode_varchar::pack(void * space_)
{
return packClause(space_, sizeof(ex_function_explode_varchar));
}
-NA_EIDPROC Long ex_function_hash::pack(void * space_)
+Long ex_function_hash::pack(void * space_)
{
return packClause(space_, sizeof(ex_function_hash));
}
-NA_EIDPROC Long ex_function_hivehash::pack(void * space_)
+Long ex_function_hivehash::pack(void * space_)
{
Lng32 x = sizeof(ex_function_hivehash);
return packClause(space_, sizeof(ex_function_hivehash));
}
-NA_EIDPROC Long ExHashComb::pack(void * space_)
+Long ExHashComb::pack(void * space_)
{
return packClause(space_, sizeof(ExHashComb));
}
-NA_EIDPROC Long ExHiveHashComb::pack(void * space_)
+Long ExHiveHashComb::pack(void * space_)
{
return packClause(space_, sizeof(ExHiveHashComb));
}
-NA_EIDPROC Long ExHDPHash::pack(void * space_)
+Long ExHDPHash::pack(void * space_)
{
return packClause(space_, sizeof(ExHDPHash));
}
-NA_EIDPROC Long ExHDPHashComb::pack(void * space_)
+Long ExHDPHashComb::pack(void * space_)
{
return packClause(space_, sizeof(ExHDPHashComb));
}
-NA_EIDPROC Long ex_function_replace_null::pack(void * space_)
+Long ex_function_replace_null::pack(void * space_)
{
return packClause(space_, sizeof(ex_function_replace_null));
}
-NA_EIDPROC Long ex_function_mod::pack(void * space_)
+Long ex_function_mod::pack(void * space_)
{
return packClause(space_, sizeof(ex_function_mod));
}
-NA_EIDPROC Long ex_function_mask::pack(void * space_)
+Long ex_function_mask::pack(void * space_)
{
return packClause(space_, sizeof(ex_function_mask));
}
-NA_EIDPROC Long ExFunctionShift::pack(void * space_)
+Long ExFunctionShift::pack(void * space_)
{
return packClause(space_, sizeof(ExFunctionShift));
}
-NA_EIDPROC Long ex_function_converttimestamp::pack(void * space_)
+Long ex_function_converttimestamp::pack(void * space_)
{
return packClause(space_, sizeof(ex_function_converttimestamp));
}
-NA_EIDPROC Long ex_function_dateformat::pack(void * space_)
+Long ex_function_dateformat::pack(void * space_)
{
return packClause(space_, sizeof(ex_function_dateformat));
}
-NA_EIDPROC Long ex_function_dayofweek::pack(void * space_)
+Long ex_function_dayofweek::pack(void * space_)
{
return packClause(space_, sizeof(ex_function_dayofweek));
}
-NA_EIDPROC Long ex_function_extract::pack(void * space_)
+Long ex_function_extract::pack(void * space_)
{
return packClause(space_, sizeof(ex_function_extract));
}
-NA_EIDPROC Long ex_function_juliantimestamp::pack(void * space_)
+Long ex_function_juliantimestamp::pack(void * space_)
{
return packClause(space_, sizeof(ex_function_juliantimestamp));
}
-NA_EIDPROC Long ex_function_exec_count::pack(void * space_)
+Long ex_function_exec_count::pack(void * space_)
{
return packClause(space_, sizeof(ex_function_exec_count));
}
-NA_EIDPROC Long ex_function_curr_transid::pack(void * space_)
+Long ex_function_curr_transid::pack(void * space_)
{
return packClause(space_, sizeof(ex_function_curr_transid));
}
-NA_EIDPROC Long ex_function_ansi_user::pack(void * space_)
+Long ex_function_ansi_user::pack(void * space_)
{
return packClause(space_, sizeof(ex_function_ansi_user));
}
-NA_EIDPROC Long ex_function_user::pack(void * space_)
+Long ex_function_user::pack(void * space_)
{
return packClause(space_, sizeof(ex_function_user));
}
-NA_EIDPROC Long ex_function_nullifzero::pack(void * space_)
+Long ex_function_nullifzero::pack(void * space_)
{
return packClause(space_, sizeof(ex_function_nullifzero));
}
-NA_EIDPROC Long ex_function_nvl::pack(void * space_)
+Long ex_function_nvl::pack(void * space_)
{
return packClause(space_, sizeof(ex_function_nvl));
}
-NA_EIDPROC Long ex_function_json_object_field_text::pack(void * space_)
+Long ex_function_json_object_field_text::pack(void * space_)
{
return packClause(space_, sizeof(ex_function_json_object_field_text));
}
-NA_EIDPROC Long ex_function_queryid_extract::pack(void * space_)
+Long ex_function_queryid_extract::pack(void * space_)
{
return packClause(space_, sizeof(ex_function_queryid_extract));
}
-NA_EIDPROC Long ExFunctionUniqueId::pack(void * space_)
+Long ExFunctionUniqueId::pack(void * space_)
{
return packClause(space_, sizeof(ExFunctionUniqueId));
}
-NA_EIDPROC Long ExFunctionRowNum::pack(void * space_)
+Long ExFunctionRowNum::pack(void * space_)
{
return packClause(space_, sizeof(ExFunctionUniqueId));
}
-NA_EIDPROC Long ExFunctionHbaseColumnLookup::pack(void * space_)
+Long ExFunctionHbaseColumnLookup::pack(void * space_)
{
return packClause(space_, sizeof(ExFunctionHbaseColumnLookup));
}
-NA_EIDPROC Long ExFunctionHbaseColumnsDisplay::pack(void * space_)
+Long ExFunctionHbaseColumnsDisplay::pack(void * space_)
{
colNames_.pack(space_);
return packClause(space_, sizeof(ExFunctionHbaseColumnsDisplay));
}
-NA_EIDPROC Long ExFunctionHbaseColumnCreate::pack(void * space_)
+Long ExFunctionHbaseColumnCreate::pack(void * space_)
{
return packClause(space_, sizeof(ExFunctionHbaseColumnCreate));
}
-NA_EIDPROC Long ex_noop_clause::pack(void * space_)
+Long ex_noop_clause::pack(void * space_)
{
return packClause(space_, sizeof(ex_noop_clause));
}
-NA_EIDPROC Long ex_inout_clause::pack(void * space_)
+Long ex_inout_clause::pack(void * space_)
{
name.pack(space_);
heading_.pack(space_);
@@ -513,24 +512,24 @@ NA_EIDPROC Long ex_inout_clause::pack(void * space_)
return packClause(space_, sizeof(ex_inout_clause));
}
-NA_EIDPROC Long ExFunctionSVariance::pack(void * space)
+Long ExFunctionSVariance::pack(void * space)
{
return packClause(space, sizeof(ExFunctionSVariance));
}
-NA_EIDPROC Long ExFunctionSStddev::pack(void * space)
+Long ExFunctionSStddev::pack(void * space)
{
return packClause(space, sizeof(ExFunctionSStddev));
}
-NA_EIDPROC Long ExpRaiseErrorFunction::pack(void * space)
+Long ExpRaiseErrorFunction::pack(void * space)
{
constraintName_.pack(space);
tableName_.pack(space);
return packClause(space, sizeof(ExpRaiseErrorFunction));
}
-NA_EIDPROC Long ExFunctionRandomNum::pack(void * space)
+Long ExFunctionRandomNum::pack(void * space)
{
return packClause(space, sizeof(ExFunctionRandomNum));
}
@@ -540,37 +539,37 @@ Long ExFunctionRandomSelection::pack(void * space)
return packClause(space, sizeof(ExFunctionRandomSelection));
}
-NA_EIDPROC Long ExProgDistrib::pack(void * space)
+Long ExProgDistrib::pack(void * space)
{
return packClause(space, sizeof(ExProgDistrib));
}
-NA_EIDPROC Long ExProgDistribKey::pack(void * space)
+Long ExProgDistribKey::pack(void * space)
{
return packClause(space, sizeof(ExProgDistribKey));
}
-NA_EIDPROC Long ExPAGroup::pack(void * space)
+Long ExPAGroup::pack(void * space)
{
return packClause(space, sizeof(ExPAGroup));
}
-NA_EIDPROC Long ExHash2Distrib::pack(void * space)
+Long ExHash2Distrib::pack(void * space)
{
return packClause(space, sizeof(ExHash2Distrib));
}
-NA_EIDPROC Long ExFunctionPack::pack(void * space)
+Long ExFunctionPack::pack(void * space)
{
return packClause(space, sizeof(ExFunctionPack));
}
-NA_EIDPROC Long ExFunctionRangeLookup::pack(void * space)
+Long ExFunctionRangeLookup::pack(void * space)
{
return packClause(space, sizeof(ExFunctionRangeLookup));
}
-NA_EIDPROC Long ExUnPackCol::pack(void * space)
+Long ExUnPackCol::pack(void * space)
{
return packClause(space, sizeof(ExUnPackCol));
}
@@ -586,63 +585,57 @@ Long ExFunctionInternalTimestamp::pack(void * space)
return packClause(space, sizeof(ExFunctionInternalTimestamp));
}
-NA_EIDPROC Long ExAuditImage::pack(void * space_)
-{
- auditImageContainerExpr_.pack(space_);
- return packClause(space_, sizeof(ExAuditImage));
-}
-
Long ExHeaderClause::pack(void * space)
{
return packClause(space, sizeof(ExHeaderClause));
}
-NA_EIDPROC Long ExFunctionSha::pack(void * space)
+Long ExFunctionSha::pack(void * space)
{
return packClause(space, sizeof(ExFunctionSha));
}
-NA_EIDPROC Long ExFunctionSha2::pack(void * space)
+Long ExFunctionSha2::pack(void * space)
{
return packClause(space, sizeof(ExFunctionSha2));
}
-NA_EIDPROC Long ExFunctionMd5::pack(void * space)
+Long ExFunctionMd5::pack(void * space)
{
return packClause(space, sizeof(ExFunctionMd5));
}
-NA_EIDPROC Long ExFunctionCrc32::pack(void * space)
+Long ExFunctionCrc32::pack(void * space)
{
return packClause(space, sizeof(ExFunctionCrc32));
}
-NA_EIDPROC Long ExFunctionIsIP::pack(void * space)
+Long ExFunctionIsIP::pack(void * space)
{
return packClause(space, sizeof(ExFunctionIsIP));
}
-NA_EIDPROC Long ExFunctionSoundex::pack(void * space)
+Long ExFunctionSoundex::pack(void * space)
{
return packClause(space, sizeof(ExFunctionSoundex));
}
-NA_EIDPROC Long ExFunctionInetAton::pack(void * space)
+Long ExFunctionInetAton::pack(void * space)
{
return packClause(space, sizeof(ExFunctionInetAton));
}
-NA_EIDPROC Long ExFunctionInetNtoa::pack(void * space)
+Long ExFunctionInetNtoa::pack(void * space)
{
return packClause(space, sizeof(ExFunctionInetNtoa));
}
-NA_EIDPROC Long ExFunctionAESEncrypt::pack(void * space)
+Long ExFunctionAESEncrypt::pack(void * space)
{
return packClause(space, sizeof(ExFunctionAESEncrypt));
}
-NA_EIDPROC Long ExFunctionAESDecrypt::pack(void * space)
+Long ExFunctionAESDecrypt::pack(void * space)
{
return packClause(space, sizeof(ExFunctionAESDecrypt));
}
@@ -650,7 +643,7 @@ NA_EIDPROC Long ExFunctionAESDecrypt::pack(void * space)
// U N P A C K
// -----------------------------------------------------------------------
-NA_EIDPROC Lng32 ex_expr::unpack(void *base, void * reallocator)
+Lng32 ex_expr::unpack(void *base, void * reallocator)
{
ExClausePtr currClausePtr;
ex_clause *nextClause;
@@ -687,7 +680,6 @@ NA_EIDPROC Lng32 ex_expr::unpack(void *base, void * reallocator)
return NAVersionedObject::unpack(base, reallocator);
}
-NA_EIDPROC
void ex_expr_lean::convOffsetToAddrInPCode(void* base) {
pCodeLean_ = (PCodeBinary*)((char *)base - (Long)(pCodeLean_));
@@ -714,7 +706,7 @@ void ex_expr_lean::convOffsetToAddrInPCode(void* base) {
}
-NA_EIDPROC Lng32 ex_expr_lean::unpack(void *base, void * reallocator)
+Lng32 ex_expr_lean::unpack(void *base, void * reallocator)
{
if (constantsArea_.unpack(base)) return -1;
if (tempsArea_.unpack(base)) return -1;
@@ -725,7 +717,7 @@ NA_EIDPROC Lng32 ex_expr_lean::unpack(void *base, void * reallocator)
return NAVersionedObject::unpack(base, reallocator);
}
-NA_EIDPROC Lng32 AggrExpr::unpack(void *base, void * reallocator)
+Lng32 AggrExpr::unpack(void *base, void * reallocator)
{
if (initExpr_.unpack(base, reallocator)) return -1;
if (perrecExpr_.unpack(base, reallocator)) return -1;
@@ -737,14 +729,14 @@ NA_EIDPROC Lng32 AggrExpr::unpack(void *base, void * reallocator)
}
-NA_EIDPROC Lng32 ex_branch_clause::unpack(void *base, void * reallocator)
+Lng32 ex_branch_clause::unpack(void *base, void * reallocator)
{
if (branch_clause.unpack(base, reallocator)) return -1;
if (saved_next_clause.unpack(base, reallocator)) return -1;
return unpackClause(base, reallocator);
}
-NA_EIDPROC Lng32 ex_inout_clause::unpack(void *base, void * reallocator)
+Lng32 ex_inout_clause::unpack(void *base, void * reallocator)
{
if (name.unpack(base)) return -1;
if (heading_.unpack(base)) return -1;
@@ -756,24 +748,19 @@ NA_EIDPROC Lng32 ex_inout_clause::unpack(void *base, void * reallocator)
}
-NA_EIDPROC Lng32 ExpRaiseErrorFunction::unpack(void *base, void * reallocator)
+Lng32 ExpRaiseErrorFunction::unpack(void *base, void * reallocator)
{
if (constraintName_.unpack(base)) return -1;
if (tableName_.unpack(base)) return -1;
return unpackClause(base, reallocator);
}
-NA_EIDPROC Lng32 ExAuditImage::unpack(void *base, void * reallocator)
-{
- if (auditImageContainerExpr_.unpack(base, reallocator)) return -1;
- return unpackClause(base, reallocator);
-}
-NA_EIDPROC Lng32 ExFunctionHbaseColumnCreate::unpack(void *base, void * reallocator)
+Lng32 ExFunctionHbaseColumnCreate::unpack(void *base, void * reallocator)
{
return unpackClause(base, reallocator);
}
-NA_EIDPROC Lng32 ExFunctionHbaseColumnsDisplay::unpack(void *base, void * reallocator)
+Lng32 ExFunctionHbaseColumnsDisplay::unpack(void *base, void * reallocator)
{
if (colNames_.unpack(base)) return -1;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/exp/ExpSequenceFunction.cpp
----------------------------------------------------------------------
diff --git a/core/sql/exp/ExpSequenceFunction.cpp b/core/sql/exp/ExpSequenceFunction.cpp
index 619243c..8c94be0 100644
--- a/core/sql/exp/ExpSequenceFunction.cpp
+++ b/core/sql/exp/ExpSequenceFunction.cpp
@@ -157,15 +157,9 @@ ex_expr::exp_return_type ExpSequenceFunction::pCodeGenerate(Space *space, UInt32
PCIT::getMemoryAddressingMode(attrs[0]->getDatatype()),
PCIT::getMemoryAddressingMode(attrs[1]->getDatatype()));
-#ifdef NA_64BIT
OL ol((Int64)isOLAP(), (Int64)0, index,
attrs[0]->getAtp(), attrs[0]->getAtpIndex(), attrs[0]->getOffset(),
attrs[1]->getAtp(), attrs[1]->getAtpIndex(), attrs[1]->getOffset());
-#else
- OL ol((PCIType::Operand)isOLAP(), (PCIType::Operand)0, index,
- attrs[0]->getAtp(), attrs[0]->getAtpIndex(), attrs[0]->getOffset(),
- attrs[1]->getAtp(), attrs[1]->getAtpIndex(), attrs[1]->getOffset());
-#endif
// Add the OFFSET instruction.
//
@@ -184,17 +178,10 @@ ex_expr::exp_return_type ExpSequenceFunction::pCodeGenerate(Space *space, UInt32
PCIT::getMemoryAddressingMode(attrs[0]->getDatatype()),
PCIT::getMemoryAddressingMode(attrs[1]->getDatatype()));
-#ifdef NA_64BIT
OL ol((Int64)(isOLAP()), (Int64)0,
attrs[2]->getAtp(), attrs[2]->getAtpIndex(), attrs[2]->getOffset(),
attrs[0]->getAtp(), attrs[0]->getAtpIndex(), attrs[0]->getOffset(),
attrs[1]->getAtp(), attrs[1]->getAtpIndex(), attrs[1]->getOffset());
-#else
- OL ol((PCIType::Operand)(isOLAP()), (PCIType::Operand)0,
- attrs[2]->getAtp(), attrs[2]->getAtpIndex(), attrs[2]->getOffset(),
- attrs[0]->getAtp(), attrs[0]->getAtpIndex(), attrs[0]->getOffset(),
- attrs[1]->getAtp(), attrs[1]->getAtpIndex(), attrs[1]->getOffset());
-#endif
// Add the OFFSET instruction.
//
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/exp/ExpSequenceFunction.h
----------------------------------------------------------------------
diff --git a/core/sql/exp/ExpSequenceFunction.h b/core/sql/exp/ExpSequenceFunction.h
index 35f8800..bb728cd 100644
--- a/core/sql/exp/ExpSequenceFunction.h
+++ b/core/sql/exp/ExpSequenceFunction.h
@@ -55,13 +55,13 @@ class ExpSequenceExpression;
// ExpSequenceFunction declaration
//
-class SQLEXP_LIB_FUNC ExpSequenceFunction : public ex_function_clause {
+class ExpSequenceFunction : public ex_function_clause {
public:
enum { SF_NONE, SF_OFFSET };
// Construction - this is the "real" constructor
//
- NA_EIDPROC ExpSequenceFunction(OperatorTypeEnum oper_type,
+ ExpSequenceFunction(OperatorTypeEnum oper_type,
Int32 arity,
Int32 index,
Attributes ** attr,
@@ -69,85 +69,85 @@ public:
// This constructor is used only to get at the virtual function table.
//
- NA_EIDPROC ExpSequenceFunction();
+ ExpSequenceFunction();
// isNullInNullOut - Must redefine this virtual function to return 0
// since a NULL input does not simply produce a NULL output.
//
- NA_EIDPROC Int32 isNullInNullOut() const { return 0; };
+ Int32 isNullInNullOut() const { return 0; };
// isNullRelevant - Must redefine this virtual function to return 0
// since all the work is done in eval and none in processNulls.
//
- NA_EIDPROC Int32 isNullRelevant() const { return 0; };
+ Int32 isNullRelevant() const { return 0; };
- NA_EIDPROC ex_expr::exp_return_type pCodeGenerate(Space *space, UInt32 f);
+ ex_expr::exp_return_type pCodeGenerate(Space *space, UInt32 f);
// eval - Must redefine eval to do the effective NOP sequence function.
//
- NA_EIDPROC ex_expr::exp_return_type eval(char *op_data[], CollHeap*,
+ ex_expr::exp_return_type eval(char *op_data[], CollHeap*,
ComDiagsArea** =0);
- NA_EIDPROC inline NABoolean nullRowIsZero(void)
+ inline NABoolean nullRowIsZero(void)
{
return ((flags_ & SF_NULL_ROW_IS_ZERO) != 0);
};
- NA_EIDPROC inline void setNullRowIsZero(NABoolean v)
+ inline void setNullRowIsZero(NABoolean v)
{
(v)? flags_ |= SF_NULL_ROW_IS_ZERO: flags_ &= ~SF_NULL_ROW_IS_ZERO;
};
- NA_EIDPROC inline NABoolean isOLAP(void)
+ inline NABoolean isOLAP(void)
{
return ((flags_ & SF_IS_OLAP) != 0);
};
- NA_EIDPROC inline void setIsOLAP(NABoolean v)
+ inline void setIsOLAP(NABoolean v)
{
(v)? flags_ |= SF_IS_OLAP: flags_ &= ~SF_IS_OLAP;
};
- NA_EIDPROC inline NABoolean isLeading(void)
+ inline NABoolean isLeading(void)
{
return ((flags_ & SF_IS_LEADING) != 0);
};
- NA_EIDPROC inline void setIsLeading(NABoolean v)
+ inline void setIsLeading(NABoolean v)
{
(v)? flags_ |= SF_IS_LEADING: flags_ &= ~SF_IS_LEADING;
};
- NA_EIDPROC inline Int32 winSize(void)
+ inline Int32 winSize(void)
{
return winSize_;
};
- NA_EIDPROC inline void setWinSize(Int32 winSize)
+ inline void setWinSize(Int32 winSize)
{
winSize_ = winSize;
};
// pack - Must redefine pack.
- 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); }
// ---------------------------------------------------------------------
enum
@@ -171,9 +171,9 @@ public:
// ExpSequenceExpression
//
-class SQLEXP_LIB_FUNC ExpSequenceExpression : public ex_expr {
+class ExpSequenceExpression : public ex_expr {
public:
- NA_EIDPROC inline void seqFixup(void *data,
+ inline void seqFixup(void *data,
char *(*getRow)(void*,Int32,NABoolean,Lng32,Int32&),
char *(*getRowOLAP)(void*,Int32,NABoolean,Lng32,Int32&))
{
@@ -218,18 +218,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(1,getClassVersionID());
ex_expr::populateImageVersionIDArray();
}
- NA_EIDPROC virtual short getClassSize() { return (short)sizeof(*this); }
+ virtual short getClassSize() { return (short)sizeof(*this); }
// ---------------------------------------------------------------------
};
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/exp/ExpSqlTupp.h
----------------------------------------------------------------------
diff --git a/core/sql/exp/ExpSqlTupp.h b/core/sql/exp/ExpSqlTupp.h
index 85f66d3..ae749de 100644
--- a/core/sql/exp/ExpSqlTupp.h
+++ b/core/sql/exp/ExpSqlTupp.h
@@ -57,53 +57,44 @@ class ex_queue;
// In the executor and expression code no variables of class tuppDescriptor *
// should be used. Only tupp should be used.
//
-class SQLEXP_LIB_FUNC tupp
+class tupp
{
tupp_descriptor * tuppDescPointer;
public:
-NA_EIDPROC
~tupp(); // destructor
-NA_EIDPROC
tupp(); // constructor
-NA_EIDPROC
tupp(const tupp_descriptor * source); // constructor
-NA_EIDPROC
tupp(const tupp & source); // constructor
-NA_EIDPROC
+
inline void init(); // Initialize a newly allocated tupp
-NA_EIDPROC
+
inline void operator=(const tupp & source);
-NA_EIDPROC
+
inline void operator=(const tupp_descriptor * source);
-NA_EIDPROC
+
inline void release(); // Release the tuple this tupp refers to
-NA_EIDPROC
+
inline char * getDataPointer() const;
-NA_EIDPROC
+
inline void setDataPointer(char *dp);
-NA_EIDPROC
+
inline tupp_descriptor* get_tupp_descriptor();
-NA_EIDPROC
+
inline unsigned short getRefCount() const;
-NA_EIDPROC
inline ULng32 getAllocatedSize() const;
-NA_EIDPROC
Long pack(void * space);
-NA_EIDPROC
Lng32 unpack(Lng32 base);
-NA_EIDPROC
NABoolean isAllocated(){return (tuppDescPointer ? TRUE : FALSE);};
-NA_EIDPROC
void display();
};
#pragma nowarn(1506) // warning elimination
-class SQLEXP_LIB_FUNC tupp_descriptor
+class tupp_descriptor
{
#ifdef COMING_FROM_NATIVE_EXPR_SOURCE_FILE
@@ -165,21 +156,19 @@ friend class tupp;
};
protected:
-NA_EIDPROC
unsigned short& nextTDIOffset() { return tdiOffset_.nextTDIOffset_; }
-NA_EIDPROC
unsigned short& prevTDIOffset() { return tdiOffset_.prevTDIOffset_; }
public:
-NA_EIDPROC
+
tupp_descriptor(); // construct and initiliaze a descriptor
-NA_EIDPROC
+
inline void init(); // initialize a newly allocated descriptor
-NA_EIDPROC
+
inline void init(ULng32 allocatedSize, tupp_descriptor * relocatedAddress, char *tupleAddress);
-NA_EIDPROC
+
inline unsigned short getReferenceCount() const;
-NA_EIDPROC void setReferenceCount(unsigned short ref_count)
+void setReferenceCount(unsigned short ref_count)
{
referenceCount_ = ref_count;
}
@@ -188,38 +177,37 @@ NA_EIDPROC void setReferenceCount(unsigned short ref_count)
// being in transit between PA and EID. Once they are received,
// and the flags are looked at, these must be initialized to zero
// as they are overloaded with the reference count for this tupp.
-NA_EIDPROC void resetCommFlags()
+void resetCommFlags()
{
flags_ = 0;
}
-NA_EIDPROC
+
inline char *getTupleAddress() const;
-NA_EIDPROC
+
inline Lng32 getTupleOffset() const
{
return offset_;
}
-NA_EIDPROC
+
inline void setTupleOffset(Lng32 offset)
{
offset_ = offset;
}
-NA_EIDPROC
+
inline void setTupleAddress(char * tuple_address)
{
tupleAddress_ = tuple_address;
}
-NA_EIDPROC
+
inline void setRelocatedAddress(tupp_descriptor * relocated_address)
{
relocatedAddress_ = relocated_address;
}
-NA_EIDPROC
+
inline ULng32 getAllocatedSize(){return allocatedSize_;};
-NA_EIDPROC
inline void setAllocatedSize(Lng32 size)
{
allocatedSize_ = size;
@@ -231,60 +219,50 @@ NA_EIDPROC
// and data data. The control data (see ex_io_control.h) includes
// information about queue state.
////////////////////////////////////////////////////////////////////
-NA_EIDPROC
NABoolean isControlTuple()
{
return (flags_ == CONTROL_TUPP);
};
-NA_EIDPROC
NABoolean isDataTuple()
{
return (flags_ == DATA_TUPP);
};
-NA_EIDPROC
NABoolean isDiagsTuple()
{
return (flags_ == DIAGS_TUPP);
};
-NA_EIDPROC
NABoolean isStatsTuple()
{
return (flags_ == STATS_TUPP);
};
-NA_EIDPROC
NABoolean isInvalidTuple()
{
return (flags_ == INVALID_DATA_VSBB_TUPP);
};
-NA_EIDPROC
void setControlTupleType()
{
flags_ = CONTROL_TUPP;
};
-NA_EIDPROC
void setDataTupleType()
{
flags_ = DATA_TUPP;
};
-NA_EIDPROC
void setDiagsTupleType()
{
flags_ = DIAGS_TUPP;
};
-NA_EIDPROC
void setStatsTupleType()
{
flags_ = STATS_TUPP;
};
-NA_EIDPROC
void setInvalidTupleType()
{
flags_ = INVALID_DATA_VSBB_TUPP;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/exp/exp_arith.cpp
----------------------------------------------------------------------
diff --git a/core/sql/exp/exp_arith.cpp b/core/sql/exp/exp_arith.cpp
index e9155db..c5d5ce5 100644
--- a/core/sql/exp/exp_arith.cpp
+++ b/core/sql/exp/exp_arith.cpp
@@ -39,11 +39,6 @@
#include "Platform.h"
-
-#if (!defined (__TANDEM) && !defined(__EID))
-#include <iostream>
-#endif
-
#include "exp_stdh.h"
#include "exp_clause_derived.h"
#include "exp_datetime.h"
@@ -325,8 +320,6 @@ Int64 EXP_FIXED_OV_DIV(Int64 op1, Int64 op2, short * ov)
//Int64 EXP_FIXED_OV_DIV(Int64 op1, Int64 op2, short * ov);
-NA_EIDPROC
-SQLEXP_LIB_FUNC
short EXP_FIXED_BIGN_OV_MUL(Attributes * op1,
Attributes * op2,
char * op_data[])
@@ -379,8 +372,6 @@ short EXP_FIXED_BIGN_OV_MUL(Attributes * op1,
return 0;
}
-NA_EIDPROC
-SQLEXP_LIB_FUNC
short EXP_FIXED_BIGN_OV_DIV(Attributes * op1,
Attributes * op2,
char * op_data[])
@@ -437,8 +428,6 @@ short EXP_FIXED_BIGN_OV_DIV(Attributes * op1,
return 0;
}
-NA_EIDPROC
-SQLEXP_LIB_FUNC
Int64 EXP_FIXED_BIGN_OV_MOD(Attributes * op1,
Attributes * op2,
char * op_data[],
@@ -563,7 +552,6 @@ Int64 EXP_FIXED_BIGN_OV_MOD(Attributes * op1,
return result;
}
-NA_EIDPROC
static void CopyAttributes(char *dst, char *dstNull, char *dstVC,
Attributes *dstAttr,
char *src, char *srcNotNull,char *srcVC,
[27/30] incubator-trafodion git commit: TRAFODION-2731 CodeCleanup:
Remove obsolete, legacy and unused code
Posted by an...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/cli/CliExtern.cpp
----------------------------------------------------------------------
diff --git a/core/sql/cli/CliExtern.cpp b/core/sql/cli/CliExtern.cpp
index 3624983..4d3ed51 100644
--- a/core/sql/cli/CliExtern.cpp
+++ b/core/sql/cli/CliExtern.cpp
@@ -93,21 +93,14 @@ CLISemaphore globalSemaphore ;
#include <unistd.h>
#include "QRLogger.h"
-#ifndef CLI_PRIV_SRL
-#pragma warning (disable : 4273) //warning elimination
extern char ** environ;
-#pragma warning (default : 4273) //warning elimination
-#endif
-#ifndef CLI_PRIV_SRL
// this is set to true after the first CLI call.
// On the first cli call, method CliNonPrivPrologue is called.
// Only used for the top level CLI calls and not if cli is called
// from within priv srl.
NABoolean __CLI_NONPRIV_INIT__ = FALSE;
-#endif
-#ifndef CLI_PRIV_SRL
#define CLI_NONPRIV_PROLOGUE(rc) \
if (NOT __CLI_NONPRIV_INIT__) \
{ \
@@ -126,39 +119,6 @@ NABoolean __CLI_NONPRIV_INIT__ = FALSE;
__CLI_NONPRIV_INIT__ = TRUE; \
}
-#endif
-
-#ifndef CLI_PRIV_SRL
-
-#if 0
-// GetConditionCount
-//
-// Find the count of conditions (SQLDIAG_NUMBER) related to
-// the current statement
-
-Int32 GetConditionCount(void)
-{
- Int32 cond_count;
-
- SQLMODULE_ID module;
- Lng32 stmt_items[1];
- module.module_name = 0;
- module.module_name_len = 0;
-
- SQLDESC_ID cond_desc = { 1, desc_name, &module, "dummy_input_name", 0, 0, 10 };
-
- SQL_EXEC_AllocDesc(&cond_desc,1);
- SQL_EXEC_SetDescItem(&cond_desc, 1, SQLDESC_TYPE_FS, REC_BIN32_SIGNED, 0);
- SQL_EXEC_SetDescItem(&cond_desc, 1, SQLDESC_VAR_PTR, (Long) &cond_count, 0);
- stmt_items[0] = SQLDIAG_NUMBER;
-
- SQL_EXEC_GetDiagnosticsStmtInfo(stmt_items, &cond_desc);
- SQL_EXEC_DeallocDesc(&cond_desc);
-
- return (cond_count);
-}
-#endif
-
// Check if the current system default experience level and the error experience levels are
// compatible. Compatible here means that the error experience level is higher or equal to
// the system default experience level. For instance, the ADVANCED experience level is higher
@@ -808,7 +768,6 @@ void logAnMXEventForError( ComCondition & condition, SQLMXLoggingArea::Experienc
*/
}
}
-#endif // CLI_PRIV_SRL
// RecordError
@@ -822,8 +781,6 @@ Lng32 RecordError(SQLSTMT_ID * currentSqlStmt,
if (inRetcode == 0)
return inRetcode;
-#ifndef CLI_PRIV_SRL
-
// Get the SQL ID (aka SQL_ATTR_UNIQUE_STMT_ID) from the statement (SQLSTMT_ID)
if (currentSqlStmt != NULL) {
@@ -838,7 +795,6 @@ Lng32 RecordError(SQLSTMT_ID * currentSqlStmt,
}
}
-#endif // CLI_PRIV_SRL
return(inRetcode);
}
@@ -924,7 +880,6 @@ short sqInit()
return 0;
}
-#ifndef CLI_PRIV_SRL
static Lng32 CliNonPrivPrologue()
{
@@ -945,7 +900,6 @@ static Lng32 CliNonPrivPrologue()
}
return 0;
}
-#endif
CLISemaphore *getCliSemaphore(ContextCli *&context)
{
@@ -955,7 +909,6 @@ CLISemaphore *getCliSemaphore(ContextCli *&context)
else
return cli_globals->getSemaphore();
}
-//SQ_LINUX #ifdef NA_WINNT
#if 0
Lng32 cliWillThrow()
{
@@ -981,65 +934,6 @@ Lng32 cliWillThrow()
}
#endif
-SQLCLI_LIB_FUNC
-Lng32 SQL_EXEC_AddModule(/*IN*/ SQLMODULE_ID * module_name)
-{
- Lng32 retcode;
- CLISemaphore *tmpSemaphore;
- ContextCli *threadContext;
-
- CLI_NONPRIV_PROLOGUE(retcode);
-
- try
- {
- tmpSemaphore = getCliSemaphore(threadContext);
- tmpSemaphore->get();
- threadContext->incrNumOfCliCalls();
- retcode =
- SQLCLI_AddModule(GetCliGlobals(),
- module_name);
- }
- catch(...)
- {
- retcode = -CLI_INTERNAL_ERROR;
-#if defined(_THROW_EXCEPTIONS)
- if (cliWillThrow())
- {
- threadContext->decrNumOfCliCalls();
- tmpSemaphore->release();
- throw;
- }
-#endif
- }
-
- threadContext->decrNumOfCliCalls();
- tmpSemaphore->release();
- retcode = RecordError(NULL, retcode);
- return retcode;
-}
-//ss_cc_change // ignore all COBOL functions
-// COBOL change : For all the wrapper functions that we provide for the COBOL
-// preprocessor, we assume that if there is a struct that is passed in with
-// name_mode == -1 , then this means that that struct is a just a "dummy".
-// This is because COBOL applications do not have the ability to pass in a
-// NULL pointer into the function as a parameter.
-
-//LCOV_EXCL_START
-SQLCLI_LIB_FUNC
-Lng32 SQL_EXEC_ADDMODULE (
- /*IN*/ SQLMODULE_ID * module_name)
-{
- // See comment above : "COBOL change"
- if (module_name)
- {
- if (module_name->version == -1)
- return SQL_EXEC_AddModule(0);
- }
- return SQL_EXEC_AddModule(module_name);
-};
-//LCOV_EXCL_STOP
-
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_AllocDesc(/*INOUT*/ SQLDESC_ID * desc_id,
/*IN OPTIONAL*/ SQLDESC_ID * input_descriptor)
{
@@ -1076,7 +970,6 @@ Lng32 SQL_EXEC_AllocDesc(/*INOUT*/ SQLDESC_ID * desc_id,
return retcode;
}
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_ALLOCDESC (
/*INOUT*/ SQLDESC_ID * desc_id,
/*IN OPTIONAL*/ SQLDESC_ID * input_descriptor)
@@ -1090,7 +983,6 @@ Lng32 SQL_EXEC_ALLOCDESC (
//LCOV_EXCL_STOP
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_AllocDescBasic(/*INOUT*/ SQLDESC_ID * desc_id,
/*IN OPTIONAL*/ Lng32 max_entries)
{
@@ -1128,7 +1020,6 @@ Lng32 SQL_EXEC_AllocDescBasic(/*INOUT*/ SQLDESC_ID * desc_id,
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_AllocStmt(/*INOUT*/ SQLSTMT_ID * new_statement_id,
/*IN OPTIONAL*/ SQLSTMT_ID * cloned_statement)
{
@@ -1168,88 +1059,7 @@ Lng32 SQL_EXEC_AllocStmt(/*INOUT*/ SQLSTMT_ID * new_statement_id,
}
-
-SQLCLI_LIB_FUNC
-Int32 SQL_EXEC_GetDiskMaxSize (
- /*IN*/ char *volname,
- /*OUT*/ Int64 *totalCapacity,
- /*OUT*/ Int64 *totalFreespace)
-{
- Lng32 retcode;
- CLISemaphore *tmpSemaphore;
-
- CLI_NONPRIV_PROLOGUE(retcode);
-
- try
- {
- tmpSemaphore = GetCliGlobals()->getSemaphore();
- tmpSemaphore->get();
- retcode =
- SQLCLI_GetDiskMaxSize(GetCliGlobals(),
- volname,
- totalCapacity,
- totalFreespace
- );
- }
- catch(...)
- {
- retcode = -CLI_INTERNAL_ERROR;
-#if defined(_THROW_EXCEPTIONS)
- if (cliWillThrow())
- {
- tmpSemaphore->release();
- throw;
- }
-#endif
- }
-
- tmpSemaphore->release();
-
- retcode = RecordError(NULL, retcode);
- return retcode;
-}
-SQLCLI_LIB_FUNC
-Int32 SQL_EXEC_GetListOfDisks (
- /*IN/OUT*/ char *diskBuffer,
- /* OUT */ Int32 *numTSEs,
- /* OUT */ Int32 *maxTSELength,
- /* IN/OUT */ Int32 *diskBufferLength
- )
-{
- Lng32 retcode;
- CLISemaphore *tmpSemaphore;
-
- CLI_NONPRIV_PROLOGUE(retcode);
-
- try
- {
- tmpSemaphore = GetCliGlobals()->getSemaphore();
- tmpSemaphore->get();
- retcode =
- SQLCLI_GetListOfDisks(GetCliGlobals(),
- diskBuffer,numTSEs,maxTSELength, diskBufferLength
-
- );
- }
- catch(...)
- {
- retcode = -CLI_INTERNAL_ERROR;
-#if defined(_THROW_EXCEPTIONS)
- if (cliWillThrow())
- {
- tmpSemaphore->release();
- throw;
- }
-#endif
- }
-
- tmpSemaphore->release();
-
- retcode = RecordError(NULL, retcode);
- return retcode;
-}
//LCOV_EXCL_START
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_ALLOCSTMT (
/*INOUT*/ SQLSTMT_ID * new_statement_id,
/*IN OPTIONAL*/ SQLSTMT_ID * cloned_statement)
@@ -1262,7 +1072,6 @@ Lng32 SQL_EXEC_ALLOCSTMT (
};
//LCOV_EXCL_STOP
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_AllocStmtForRS(/*IN*/ SQLSTMT_ID *callStmtId,
/*IN*/ Lng32 resultSetIndex,
/*INOUT*/ SQLSTMT_ID *resultSetStmtId)
@@ -1302,7 +1111,6 @@ Lng32 SQL_EXEC_AllocStmtForRS(/*IN*/ SQLSTMT_ID *callStmtId,
return retcode;
}
//LCOV_EXCL_START
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_ALLOCSTMTFORRS (
/*IN*/ SQLSTMT_ID *callStmtId,
/*IN*/ Lng32 resultSetIndex,
@@ -1315,7 +1123,6 @@ Lng32 SQL_EXEC_ALLOCSTMTFORRS (
//nowait CLI
//LCOV_EXCL_START
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_AssocFileNumber(/*IN*/ SQLSTMT_ID * statement_id,
/*IN*/ short file_number)
{
@@ -1352,7 +1159,6 @@ Lng32 SQL_EXEC_AssocFileNumber(/*IN*/ SQLSTMT_ID * statement_id,
return retcode;
}
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_ASSOCFILENUMBER (/*IN*/ SQLSTMT_ID * statement_id,
/*IN*/ short file_number)
{
@@ -1360,7 +1166,6 @@ Lng32 SQL_EXEC_ASSOCFILENUMBER (/*IN*/ SQLSTMT_ID * statement_id,
};
//LCOV_EXCL_STOP
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_ClearDiagnostics(/*IN*/ SQLSTMT_ID *statement_id)
{
Lng32 retcode;
@@ -1397,7 +1202,6 @@ Lng32 SQL_EXEC_ClearDiagnostics(/*IN*/ SQLSTMT_ID *statement_id)
return retcode;
}
//LCOV_EXCL_START
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_CLEARDIAGNOSTICS (/*IN*/ SQLSTMT_ID *statement_id){
return SQL_EXEC_ClearDiagnostics(statement_id);
};
@@ -1405,7 +1209,6 @@ Lng32 SQL_EXEC_CLEARDIAGNOSTICS (/*IN*/ SQLSTMT_ID *statement_id){
#if defined (CLI_LIB)
#pragma srlexports
#endif
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_CLI_VERSION()
{
return CLI_VERSION;
@@ -1413,7 +1216,6 @@ Lng32 SQL_EXEC_CLI_VERSION()
//LCOV_EXCL_STOP
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_CloseStmt(/*IN*/ SQLSTMT_ID * statement_id)
{
Lng32 retcode;
@@ -1451,14 +1253,13 @@ Lng32 SQL_EXEC_CloseStmt(/*IN*/ SQLSTMT_ID * statement_id)
}
//LCOV_EXCL_START
-SQLCLI_LIB_FUNC Lng32 SQL_EXEC_CLOSESTMT (
+Lng32 SQL_EXEC_CLOSESTMT (
/*IN*/ SQLSTMT_ID * statement_id){
return SQL_EXEC_CloseStmt(statement_id);
};
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_CreateContext(/*OUT*/ SQLCTX_HANDLE * context_handle,
/*IN*/ char* sqlAuthId,
/*IN*/ Lng32 forFutureUse)
@@ -1490,7 +1291,6 @@ Lng32 SQL_EXEC_CreateContext(/*OUT*/ SQLCTX_HANDLE * context_handle,
return retcode;
}
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_CREATECONTEXT(/*OUT*/ SQLCTX_HANDLE * context_handle,
/*IN*/ char* sqlAuthId,
/*IN*/ Lng32 forFutureUse)
@@ -1500,7 +1300,6 @@ Lng32 SQL_EXEC_CREATECONTEXT(/*OUT*/ SQLCTX_HANDLE * context_handle,
}
//LCOV_EXCL_STOP
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_CurrentContext(/*OUT*/ SQLCTX_HANDLE * contextHandle)
{
Lng32 retcode;
@@ -1527,14 +1326,12 @@ Lng32 SQL_EXEC_CurrentContext(/*OUT*/ SQLCTX_HANDLE * contextHandle)
return retcode;
}
//LCOV_EXCL_START
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_CURRENTCONTEXT(/*OUT*/ SQLCTX_HANDLE * contextHandle){
return SQL_EXEC_CurrentContext(contextHandle);
};
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_DeleteContext(/*IN*/ SQLCTX_HANDLE contextHandle)
{
Lng32 retcode;
@@ -1561,14 +1358,12 @@ Lng32 SQL_EXEC_DeleteContext(/*IN*/ SQLCTX_HANDLE contextHandle)
return retcode;
}
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_DELETECONTEXT(/*IN*/ SQLCTX_HANDLE contextHandle){
return SQL_EXEC_DeleteContext(contextHandle);
};
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_DropModule(/*IN*/ SQLMODULE_ID * module_name)
{
Lng32 retcode;
@@ -1605,7 +1400,6 @@ Lng32 SQL_EXEC_DropModule(/*IN*/ SQLMODULE_ID * module_name)
return retcode;
}
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_ResetContext(/*IN*/ SQLCTX_HANDLE contextHandle, /*IN*/ void *contextMsg)
{
Lng32 retcode;
@@ -1631,7 +1425,6 @@ Lng32 SQL_EXEC_ResetContext(/*IN*/ SQLCTX_HANDLE contextHandle, /*IN*/ void *con
return retcode;
}
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_RESETCONTEXT(/*IN*/ SQLCTX_HANDLE contextHandle, /*IN*/ void *contextMsg){
return SQL_EXEC_ResetContext(contextHandle, contextMsg);
@@ -1639,7 +1432,6 @@ Lng32 SQL_EXEC_RESETCONTEXT(/*IN*/ SQLCTX_HANDLE contextHandle, /*IN*/ void *con
// new UDR interface, internal use
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_GetUdrErrorFlags_Internal(/*OUT*/ Lng32 *udrErrorFlags)
{
Lng32 retcode;
@@ -1675,7 +1467,6 @@ Lng32 SQL_EXEC_GetUdrErrorFlags_Internal(/*OUT*/ Lng32 *udrErrorFlags)
return retcode;
}
//LCOV_EXCL_STOP
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_SetUdrAttributes_Internal(/*IN*/ Lng32 sqlAccessMode,
/*IN*/ Lng32 forFutureUse)
{
@@ -1714,7 +1505,6 @@ Lng32 SQL_EXEC_SetUdrAttributes_Internal(/*IN*/ Lng32 sqlAccessMode,
return retcode;
}
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_ResetUdrErrorFlags_Internal()
{
Lng32 retcode;
@@ -1750,7 +1540,6 @@ Lng32 SQL_EXEC_ResetUdrErrorFlags_Internal()
return retcode;
}
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_SetUdrRuntimeOptions_Internal(/*IN*/ const char *options,
/*IN*/ ULng32 optionsLen,
/*IN*/ const char *delimiters,
@@ -1791,7 +1580,6 @@ Lng32 SQL_EXEC_SetUdrRuntimeOptions_Internal(/*IN*/ const char *options,
return retcode;
}
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_DeallocDesc(/*IN*/ SQLDESC_ID * desc_id)
{
Lng32 retcode;
@@ -1823,12 +1611,11 @@ Lng32 SQL_EXEC_DeallocDesc(/*IN*/ SQLDESC_ID * desc_id)
return retcode;
}
//LCOV_EXCL_START
-SQLCLI_LIB_FUNC Lng32 SQL_EXEC_DEALLOCDESC (
+Lng32 SQL_EXEC_DEALLOCDESC (
/*IN*/ SQLDESC_ID * desc_id ){
return SQL_EXEC_DeallocDesc(desc_id);
};
//LCOV_EXCL_STOP
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_DeallocStmt(/*IN*/ SQLSTMT_ID * statement_id)
{
Lng32 retcode;
@@ -1875,14 +1662,12 @@ Lng32 SQL_EXEC_DeallocStmt(/*IN*/ SQLSTMT_ID * statement_id)
return retcode;
}
//LCOV_EXCL_START
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_DEALLOCSTMT (
/*IN*/ SQLSTMT_ID * statement_id){
return SQL_EXEC_DeallocStmt(statement_id);
};
//LCOV_EXCL_STOP
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_DefineDesc(/*IN*/ SQLSTMT_ID * statement_id,
/* (SQLWHAT_DESC) *IN*/ Lng32 what_descriptor,
/*IN*/ SQLDESC_ID * sql_descriptor)
@@ -1921,7 +1706,6 @@ Lng32 SQL_EXEC_DefineDesc(/*IN*/ SQLSTMT_ID * statement_id,
return retcode;
}
//LCOV_EXCL_START
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_DEFINEDESC (
/*IN*/ SQLSTMT_ID * statement_id,
/*IN* (SQLWHAT_DESC) */ Lng32 what_descriptor,
@@ -1929,7 +1713,6 @@ Lng32 SQL_EXEC_DEFINEDESC (
return SQL_EXEC_DefineDesc(statement_id, what_descriptor, sql_descriptor);
};
//LCOV_EXCL_STOP
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_DescribeStmt(/*IN*/ SQLSTMT_ID * statement_id,
/*IN OPTIONAL*/ SQLDESC_ID * input_descriptor,
/*IN OPTIONAL*/ SQLDESC_ID * output_descriptor)
@@ -1970,7 +1753,6 @@ Lng32 SQL_EXEC_DescribeStmt(/*IN*/ SQLSTMT_ID * statement_id,
return retcode;
}
//LCOV_EXCL_START
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_DESCRIBESTMT (
/*IN*/ SQLSTMT_ID * statement_id,
/*IN OPTIONAL*/ SQLDESC_ID * input_descriptor,
@@ -1986,7 +1768,6 @@ Lng32 SQL_EXEC_DESCRIBESTMT (
return SQL_EXEC_DescribeStmt(statement_id, input_descriptor, output_descriptor);
};
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_DisassocFileNumber(/*IN*/ SQLSTMT_ID * statement_id)
{
Lng32 retcode;
@@ -2021,13 +1802,11 @@ Lng32 SQL_EXEC_DisassocFileNumber(/*IN*/ SQLSTMT_ID * statement_id)
return retcode;
}
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_DISASSOCFILENUMBER (/*IN*/ SQLSTMT_ID * statement_id){
return SQL_EXEC_DisassocFileNumber(statement_id);
};
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_DropContext(/*IN*/ SQLCTX_HANDLE context_handle)
{
Lng32 retcode;
@@ -2055,7 +1834,6 @@ Lng32 SQL_EXEC_DropContext(/*IN*/ SQLCTX_HANDLE context_handle)
return retcode;
}
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_DROPCONTEXT (
/*IN*/ SQLCTX_HANDLE context_handle ){
return SQL_EXEC_DropContext(context_handle);
@@ -2063,7 +1841,6 @@ Lng32 SQL_EXEC_DROPCONTEXT (
//LCOV_EXCL_STOP
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_Exec(/*IN*/ SQLSTMT_ID * statement_id,
/*IN OPTIONAL*/ SQLDESC_ID * input_descriptor,
/*IN*/ Lng32 num_ptr_pairs,
@@ -2121,7 +1898,6 @@ Lng32 SQL_EXEC_Exec(/*IN*/ SQLSTMT_ID * statement_id,
}
//LCOV_EXCL_START
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_EXEC (
/*IN*/ SQLSTMT_ID * statement_id,
/*IN OPTIONAL*/ SQLDESC_ID * input_descriptor,
@@ -2166,7 +1942,6 @@ Lng32 SQL_EXEC_EXEC (
};
//LCOV_EXCL_STOP
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_ExecClose(/*IN*/ SQLSTMT_ID * statement_id,
/*IN OPTIONAL*/ SQLDESC_ID * input_descriptor,
/*IN*/ Lng32 num_ptr_pairs,
@@ -2217,7 +1992,6 @@ Lng32 SQL_EXEC_ExecClose(/*IN*/ SQLSTMT_ID * statement_id,
//LCOV_EXCL_START
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_EXECCLOSE (
/*IN*/ SQLSTMT_ID * statement_id,
/*IN OPTIONAL*/ SQLDESC_ID * input_descriptor,
@@ -2263,7 +2037,6 @@ Lng32 SQL_EXEC_EXECCLOSE (
};
//LCOV_EXCL_STOP
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_ExecDirect(/*IN*/ SQLSTMT_ID * statement_id,
/*IN*/ SQLDESC_ID * sql_source,
/*IN OPTIONAL*/ SQLDESC_ID * input_descriptor,
@@ -2313,7 +2086,6 @@ Lng32 SQL_EXEC_ExecDirect(/*IN*/ SQLSTMT_ID * statement_id,
return retcode;
}
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_ExecDirect2(/*IN*/ SQLSTMT_ID * statement_id,
/*IN*/ SQLDESC_ID * sql_source,
/*IN */ Int32 prep_flags,
@@ -2366,7 +2138,6 @@ Lng32 SQL_EXEC_ExecDirect2(/*IN*/ SQLSTMT_ID * statement_id,
return retcode;
}
//LCOV_EXCL_START
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_EXECDIRECT (
/*IN*/ SQLSTMT_ID * statement_id,
/*IN*/ SQLDESC_ID * sql_source,
@@ -2412,7 +2183,6 @@ Lng32 SQL_EXEC_EXECDIRECT (
return retcode;
};
//LCOV_EXCL_STOP
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_ExecDirectDealloc(/*IN*/ SQLSTMT_ID * statement_id,
/*IN*/ SQLDESC_ID * sql_source,
/*IN OPTIONAL*/ SQLDESC_ID * input_descriptor,
@@ -2463,7 +2233,6 @@ Lng32 SQL_EXEC_ExecDirectDealloc(/*IN*/ SQLSTMT_ID * statement_id,
return retcode;
}
//LCOV_EXCL_START
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_EXECDIRECTDEALLOC(/*IN*/ SQLSTMT_ID * statement_id,
/*IN*/ SQLDESC_ID * sql_source,
/*IN OPTIONAL*/ SQLDESC_ID * input_descriptor,
@@ -2511,7 +2280,6 @@ Lng32 SQL_EXEC_EXECDIRECTDEALLOC(/*IN*/ SQLSTMT_ID * statement_id,
}
//LCOV_EXCL_STOP
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_ExecFetch(/*IN*/ SQLSTMT_ID * statement_id,
/*IN OPTIONAL*/ SQLDESC_ID * input_descriptor,
/*IN*/ Lng32 num_ptr_pairs,
@@ -2568,7 +2336,6 @@ Lng32 SQL_EXEC_ExecFetch(/*IN*/ SQLSTMT_ID * statement_id,
return retcode;
}
//LCOV_EXCL_START
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_EXECFETCH(/*IN*/ SQLSTMT_ID * statement_id,
/*IN OPTIONAL*/ SQLDESC_ID * input_descriptor,
/*IN*/ Lng32 num_ptr_pairs,
@@ -2612,7 +2379,6 @@ Lng32 SQL_EXEC_EXECFETCH(/*IN*/ SQLSTMT_ID * statement_id,
return retcode;
}
//LCOV_EXCL_STOP
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_ClearExecFetchClose(/*IN*/ SQLSTMT_ID * statement_id,
/*IN OPTIONAL*/ SQLDESC_ID * input_descriptor,
/*IN OPTIONAL*/ SQLDESC_ID * output_descriptor,
@@ -2676,7 +2442,6 @@ Lng32 SQL_EXEC_ClearExecFetchClose(/*IN*/ SQLSTMT_ID * statement_id,
return retcode;
}
//LCOV_EXCL_START
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_CLEAREXECFETCHCLOSE(/*IN*/ SQLSTMT_ID * statement_id,
/*IN OPTIONAL*/ SQLDESC_ID * input_descriptor,
/*IN OPTIONAL*/ SQLDESC_ID * output_descriptor,
@@ -2729,7 +2494,6 @@ Lng32 SQL_EXEC_CLEAREXECFETCHCLOSE(/*IN*/ SQLSTMT_ID * statement_id,
}
//LCOV_EXCL_STOP
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_Fetch(/*IN*/ SQLSTMT_ID * statement_id,
/*IN OPTIONAL*/ SQLDESC_ID * output_descriptor,
/*IN*/ Lng32 num_ptr_pairs,
@@ -2785,7 +2549,6 @@ Lng32 SQL_EXEC_Fetch(/*IN*/ SQLSTMT_ID * statement_id,
return retcode;
}
//LCOV_EXCL_START
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_FETCH(/*IN*/ SQLSTMT_ID * statement_id,
/*IN OPTIONAL*/ SQLDESC_ID * output_descriptor,
/*IN*/ Lng32 num_ptr_pairs,
@@ -2832,7 +2595,6 @@ Lng32 SQL_EXEC_FETCH(/*IN*/ SQLSTMT_ID * statement_id,
}
//LCOV_EXCL_STOP
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_FetchClose(/*IN*/ SQLSTMT_ID * statement_id,
/*IN OPTIONAL*/ SQLDESC_ID * output_descriptor,
/*IN*/ Lng32 num_ptr_pairs,
@@ -2880,7 +2642,6 @@ Lng32 SQL_EXEC_FetchClose(/*IN*/ SQLSTMT_ID * statement_id,
return retcode;
}
//LCOV_EXCL_START
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_FETCHCLOSE(/*IN*/ SQLSTMT_ID * statement_id,
/*IN OPTIONAL*/ SQLDESC_ID * output_descriptor,
/*IN*/ Lng32 num_ptr_pairs,
@@ -2925,7 +2686,6 @@ Lng32 SQL_EXEC_FETCHCLOSE(/*IN*/ SQLSTMT_ID * statement_id,
}
//LCOV_EXCL_STOP
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_FetchMultiple(/*IN*/ SQLSTMT_ID * statement_id,
/*IN OPTIONAL*/ SQLDESC_ID * output_descriptor,
/*IN*/ Lng32 rowset_size,
@@ -2979,7 +2739,6 @@ Lng32 SQL_EXEC_FetchMultiple(/*IN*/ SQLSTMT_ID * statement_id,
return retcode;
}
//LCOV_EXCL_START
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_FETCHMULTIPLE(/*IN*/ SQLSTMT_ID * statement_id,
/*IN OPTIONAL*/ SQLDESC_ID * output_descriptor,
/*IN*/ Lng32 rowset_size,
@@ -3034,7 +2793,6 @@ Lng32 SQL_EXEC_FETCHMULTIPLE(/*IN*/ SQLSTMT_ID * statement_id,
// Don't use getCliSemaphore(currContext)->to acquire a critical section.
// Don't use cliSemaphore->to acquire a critical section.
// cancelSemaphore is used inside SQLCLI_Cancel.
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_Cancel(/*IN OPTIONAL*/ SQLSTMT_ID * statement_id)
{
Lng32 retcode;
@@ -3062,7 +2820,7 @@ Lng32 SQL_EXEC_Cancel(/*IN OPTIONAL*/ SQLSTMT_ID * statement_id)
return retcode;
}
-SQLCLI_LIB_FUNC Lng32 SQL_EXEC_CANCEL (
+Lng32 SQL_EXEC_CANCEL (
/*IN OPTIONAL*/ SQLSTMT_ID * statement_id){
// See comment above : "COBOL change"
if (statement_id && (statement_id->name_mode == -1))
@@ -3071,7 +2829,6 @@ SQLCLI_LIB_FUNC Lng32 SQL_EXEC_CANCEL (
return SQL_EXEC_Cancel(statement_id);
};
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_GetDescEntryCount(/*IN*/ SQLDESC_ID * sql_descriptor,
/*IN*/ SQLDESC_ID * output_descriptor)
{
@@ -3110,7 +2867,6 @@ Lng32 SQL_EXEC_GetDescEntryCount(/*IN*/ SQLDESC_ID * sql_descriptor,
return retcode;
}
//LCOV_EXCL_START
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_GETDESCENTRYCOUNT(
/*IN*/ SQLDESC_ID * sql_descriptor,
/*IN*/ SQLDESC_ID * output_descriptor){
@@ -3118,7 +2874,6 @@ Lng32 SQL_EXEC_GETDESCENTRYCOUNT(
};
//LCOV_EXCL_STOP
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_GetDescEntryCountBasic(/*IN*/ SQLDESC_ID * sql_descriptor,
/*OUT*/ Lng32 * num_entries)
{
@@ -3154,7 +2909,6 @@ Lng32 SQL_EXEC_GetDescEntryCountBasic(/*IN*/ SQLDESC_ID * sql_descriptor,
return retcode;
}
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_GetDescItem(/*IN*/ SQLDESC_ID * sql_descriptor,
/*IN*/ Lng32 entry,
/* (SQLDESC_ITEM_ID) *IN*/ Lng32 what_to_get,
@@ -3205,7 +2959,6 @@ Lng32 SQL_EXEC_GetDescItem(/*IN*/ SQLDESC_ID * sql_descriptor,
return retcode;
}
//LCOV_EXCL_START
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_GETDESCITEM(
/*IN*/ SQLDESC_ID * sql_descriptor,
/*IN*/ Lng32 entry,
@@ -3227,7 +2980,6 @@ Lng32 SQL_EXEC_GETDESCITEM(
start_from_offset);
};
//LCOV_EXCL_STOP
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_GetDescItems(/*IN*/ SQLDESC_ID * sql_descriptor,
/*IN*/ SQLDESC_ITEM desc_items[],
/*IN*/ SQLDESC_ID * value_num_descriptor,
@@ -3270,7 +3022,6 @@ Lng32 SQL_EXEC_GetDescItems(/*IN*/ SQLDESC_ID * sql_descriptor,
return retcode;
}
//LCOV_EXCL_START
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_GETDESCITEMS(
/*IN*/ SQLDESC_ID * sql_descriptor,
/*IN*/ SQLDESC_ITEM desc_items[],
@@ -3282,7 +3033,6 @@ Lng32 SQL_EXEC_GETDESCITEMS(
output_descriptor);
};
//LCOV_EXCL_STOP
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_GetDescItems2(/*IN*/ SQLDESC_ID * sql_descriptor,
/*IN*/ Lng32 no_of_desc_items,
/*IN*/ SQLDESC_ITEM desc_items[])
@@ -3321,7 +3071,6 @@ Lng32 SQL_EXEC_GetDescItems2(/*IN*/ SQLDESC_ID * sql_descriptor,
return retcode;
}
//LCOV_EXCL_START
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_GETDESCITEMS2(
/*IN*/ SQLDESC_ID * sql_descriptor,
/*IN*/ Lng32 no_of_desc_items,
@@ -3331,7 +3080,6 @@ Lng32 SQL_EXEC_GETDESCITEMS2(
desc_items);
};
//LCOV_EXCL_STOP
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_GetDiagnosticsStmtInfo(/*IN*/ Lng32 * stmt_info_items,
/*IN*/ SQLDESC_ID * output_descriptor)
{
@@ -3369,11 +3117,10 @@ Lng32 SQL_EXEC_GetDiagnosticsStmtInfo(/*IN*/ Lng32 * stmt_info_items,
return retcode;
}
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_GetDiagnosticsStmtInfo2(
/*IN OPTIONAL*/ SQLSTMT_ID * statement_id,
/*IN* (SQLDIAG_STMT_INFO_ITEM_ID) */ Lng32 what_to_get,
- /*OUT OPTIONAL*/ void * numeric_value, // NA_64BIT
+ /*OUT OPTIONAL*/ void * numeric_value,
/*OUT OPTIONAL*/ char * string_value,
/*IN OPTIONAL*/ Lng32 max_string_len,
/*OUT OPTIONAL*/ Lng32 * len_of_item)
@@ -3415,20 +3162,16 @@ Lng32 SQL_EXEC_GetDiagnosticsStmtInfo2(
return retcode;
}
//LCOV_EXCL_START
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_GETDIAGNOSTICSSTMTINFO(
/*IN*/ Lng32 *stmt_info_items,
/*IN*/ SQLDESC_ID * output_descriptor){
return SQL_EXEC_GetDiagnosticsStmtInfo(stmt_info_items, output_descriptor);
};
-
-#ifndef CLI_PRIV_SRL
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_GETDIAGNOSTICSSTMTINFO2(
/*IN OPTIONAL*/ SQLSTMT_ID * statement_id,
/*IN* (SQLDIAG_STMT_INFO_ITEM_ID) */ Lng32 what_to_get,
- /*OUT OPTIONAL*/ void * numeric_value, // NA_64BIT
+ /*OUT OPTIONAL*/ void * numeric_value,
/*OUT OPTIONAL*/ char * string_value,
/*IN OPTIONAL*/ Lng32 max_string_len,
/*OUT OPTIONAL*/ Lng32 * len_of_item) {
@@ -3569,7 +3312,6 @@ static Lng32 GetAutoSizedCondInfo(Lng32 * retcode,
return (condition_item_count_needed);
}
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_GetDiagnosticsCondInfo(
/*IN*/ SQLDIAG_COND_INFO_ITEM * cond_info_items,
/*IN*/ SQLDESC_ID * cond_num_descriptor,
@@ -3817,7 +3559,6 @@ Lng32 SQL_EXEC_GetDiagnosticsCondInfo(
return retcode;
}
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_GETDIAGNOSTICSCONDINFO(
/*IN*/ SQLDIAG_COND_INFO_ITEM *cond_info_items,
/*IN*/ SQLDESC_ID * cond_num_descriptor,
@@ -3827,11 +3568,8 @@ Lng32 SQL_EXEC_GETDIAGNOSTICSCONDINFO(
output_descriptor);
};
-#endif
#pragma nowarn(770) // warning elimination
-#ifndef CLI_PRIV_SRL
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_GetDiagnosticsCondInfo2(
/*IN* (SQLDIAG_COND_INFO_ITEM_ID) */ Lng32 what_to_get,
/*IN*/ Lng32 conditionNum,
@@ -3947,7 +3685,6 @@ Lng32 SQL_EXEC_GetDiagnosticsCondInfo2(
#pragma warn(770) // warning elimination
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_GETDIAGNOSTICSCONDINFO2(
/*IN* (SQLDIAG_COND_INFO_ITEM_ID) */ Lng32 what_to_get,
/*IN*/ Lng32 conditionNum,
@@ -3964,7 +3701,7 @@ Lng32 SQL_EXEC_GETDIAGNOSTICSCONDINFO2(
len_of_item);
}
-SQLCLI_LIB_FUNC Lng32 SQL_EXEC_GetDiagnosticsCondInfo3(
+Lng32 SQL_EXEC_GetDiagnosticsCondInfo3(
/*IN*/ Lng32 no_of_condition_items,
/*IN*/ SQLDIAG_COND_INFO_ITEM_VALUE
diag_cond_info_item_values[])
@@ -4256,7 +3993,7 @@ SQLCLI_LIB_FUNC Lng32 SQL_EXEC_GetDiagnosticsCondInfo3(
}
//LCOV_EXCL_START
-SQLCLI_LIB_FUNC Lng32 SQL_EXEC_GETDIAGNOSTICSCONDINFO3(
+Lng32 SQL_EXEC_GETDIAGNOSTICSCONDINFO3(
/*IN*/ Lng32 no_of_condition_items,
/*IN*/ SQLDIAG_COND_INFO_ITEM_VALUE
diag_cond_info_item_values[])
@@ -4265,7 +4002,7 @@ SQLCLI_LIB_FUNC Lng32 SQL_EXEC_GETDIAGNOSTICSCONDINFO3(
diag_cond_info_item_values);
}
-SQLCLI_LIB_FUNC Lng32 SQL_EXEC_GetMainSQLSTATE(
+Lng32 SQL_EXEC_GetMainSQLSTATE(
/*IN*/ SQLSTMT_ID * stmtId,
/*IN*/ Lng32 sqlcode,
/*OUT*/ char * sqlstate /* assumed to be char[6] */)
@@ -4288,18 +4025,14 @@ SQLCLI_LIB_FUNC Lng32 SQL_EXEC_GetMainSQLSTATE(
return retcode;
}
-SQLCLI_LIB_FUNC Lng32 SQL_EXEC_GETMAINSQLSTATE(
+Lng32 SQL_EXEC_GETMAINSQLSTATE(
/*IN*/ SQLSTMT_ID * statement_id,
/*IN*/ Lng32 sqlcode,
/*OUT*/ char * sqlstate /* assumed to be char[6] */)
{
return SQL_EXEC_GetMainSQLSTATE(statement_id, sqlcode, sqlstate);
}
-//LCOV_EXCL_STOP
-#endif // CLI_PRIV_SRL
-#ifndef CLI_PRIV_SRL
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_GetCSQLSTATE(/*OUT*/ char * theSQLSTATE /* assumed char[6] */,
/*IN*/ Lng32 theSQLCODE)
{
@@ -4310,45 +4043,14 @@ Lng32 SQL_EXEC_GetCSQLSTATE(/*OUT*/ char * theSQLSTATE /* assumed char[6] */,
ComSQLSTATE(theSQLCODE,theSQLSTATE);
return retcode;
}
-#else
-SQLCLI_LIB_FUNC
-Lng32 SQL_EXEC_GetCSQLSTATE(/*OUT*/ char * theSQLSTATE /* assumed char[6] */,
- /*IN*/ Lng32 theSQLCODE)
-{
- Lng32 retcode = 0;
-
- // when this method is called from a priv caller(executor), then
- // we cannot look at the msgs file(it could be looked at only thru
- // a non-priv interface since it uses c-runtime and globals).
- // Just return the string representation of the input state.
- ULng32 sqlCodeUnsigned;
- if (theSQLCODE < 0)
- sqlCodeUnsigned = -theSQLCODE;
- else
- sqlCodeUnsigned = theSQLCODE;
-
- str_itoa(sqlCodeUnsigned, theSQLSTATE);
-
- if (theSQLCODE < 0)
- {
- for (Int32 i = 5; i > 0; i--)
- theSQLSTATE[i] = theSQLSTATE[i-1];
- theSQLSTATE[0] = '-';
- }
- return retcode;
-}
-#endif
-//LCOV_EXCL_START
-SQLCLI_LIB_FUNC Lng32 SQL_EXEC_GETCSQLSTATE(
+
+Lng32 SQL_EXEC_GETCSQLSTATE(
/*OUT*/ char * sqlstate /* assumed to be char[6] */,
/*IN*/ Lng32 sqlcode){
return SQL_EXEC_GetCSQLSTATE(sqlstate, sqlcode);
};
-#ifndef CLI_PRIV_SRL
-
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_GetCobolSQLSTATE(/*OUT*/ char * theSQLSTATE /*assumed char[5]*/,
/*IN*/ Lng32 theSQLCODE)
{
@@ -4363,15 +4065,13 @@ Lng32 SQL_EXEC_GetCobolSQLSTATE(/*OUT*/ char * theSQLSTATE /*assumed char[5]*/,
return retcode;
}
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_GETCOBOLSQLSTATE(
/*OUT*/ char * sqlstate /* assumed to be char[5] */,
/*IN*/ Lng32 sqlcode){
return SQL_EXEC_GetCobolSQLSTATE(sqlstate, sqlcode);
};
-//LCOV_EXCL_STOP
-SQLCLI_LIB_FUNC
+
Lng32 SQL_EXEC_GetSQLSTATE(/*OUT*/ char * SQLSTATE /* assumed to be char[6] */)
{
Lng32 retcode;
@@ -4409,17 +4109,13 @@ Lng32 SQL_EXEC_GetSQLSTATE(/*OUT*/ char * SQLSTATE /* assumed to be char[6] */)
ComSQLSTATE(sqlcode, SQLSTATE);
return retcode;
}
-//LCOV_EXCL_START
-SQLCLI_LIB_FUNC
+
Lng32 SQL_EXEC_GETSQLSTATE(
/*OUT*/ char * sqlstate /* assumed to be char[6] */){
return SQL_EXEC_GetSQLSTATE(sqlstate);
};
-//LCOV_EXCL_STOP
-#endif
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_GetSessionAttr(
/*IN (SESSIONATTR_TYPE )*/ Lng32 attrName,
/*OUT OPTIONAL*/ Lng32 * numeric_value,
@@ -4505,7 +4201,6 @@ Lng32 retcode;
}
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_GetAuthName_Internal(
Lng32 auth_id,
char *string_value,
@@ -4550,7 +4245,6 @@ Lng32 retcode;
}
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_GetDatabaseUserName_Internal (
/*IN*/ Lng32 user_id,
/*OUT*/ char *string_value,
@@ -4593,7 +4287,6 @@ Lng32 SQL_EXEC_GetDatabaseUserName_Internal (
return retcode;
}
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_GetDatabaseUserID_Internal (/*IN*/ char *string_value,
/*OUT*/ Lng32 *numeric_value)
{
@@ -4631,7 +4324,6 @@ Lng32 SQL_EXEC_GetDatabaseUserID_Internal (/*IN*/ char *string_value,
return retcode;
}
-SQLCLI_LIB_FUNC
Int32 SQL_EXEC_GetAuthState(
/*OUT*/ bool & authenticationEnabled,
/*OUT*/ bool & authorizationEnabled,
@@ -4677,7 +4369,6 @@ Int32 SQL_EXEC_GetAuthState(
}
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_SetSessionAttr_Internal(
/*IN (SESSIONATTR_TYPE)*/ Lng32 attrName,
/*IN OPTIONAL*/ Lng32 numeric_value,
@@ -4760,7 +4451,6 @@ Lng32 SQL_EXEC_GetRoleList(
}
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_ResetRoleList_Internal()
{
Lng32 retcode;
@@ -4797,7 +4487,6 @@ Lng32 SQL_EXEC_ResetRoleList_Internal()
}
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_GetUniqueQueryIdAttrs(
/*IN*/ char * uniqueQueryId,
/*IN*/ Lng32 uniqueQueryIdLen,
@@ -4839,7 +4528,6 @@ Lng32 SQL_EXEC_GetUniqueQueryIdAttrs(
return retcode;
}
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_GetStmtAttr(/*IN*/ SQLSTMT_ID * statement_id,
/*IN (SQLATTR_TYPE )*/ Lng32 attrName,
/*OUT OPTIONAL*/ Lng32 * numeric_value,
@@ -4884,7 +4572,6 @@ Lng32 SQL_EXEC_GetStmtAttr(/*IN*/ SQLSTMT_ID * statement_id,
return retcode;
}
//LCOV_EXCL_START
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_GETSTMTATTR(/*IN*/ SQLSTMT_ID * statement_id,
/*IN* (SQLATTR_TYPE) */ Lng32 attrName,
/*OUT OPTIONAL*/ Lng32 * numeric_value,
@@ -4897,7 +4584,6 @@ Lng32 SQL_EXEC_GETSTMTATTR(/*IN*/ SQLSTMT_ID * statement_id,
max_string_len, len_of_item);
}
//LCOV_EXCL_STOP
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_GetStmtAttrs(/*IN*/ SQLSTMT_ID * statement_id,
/*IN*/ Lng32 number_of_attrs,
/*INOUT*/ SQLSTMT_ATTR attrs[],
@@ -4938,7 +4624,6 @@ Lng32 SQL_EXEC_GetStmtAttrs(/*IN*/ SQLSTMT_ID * statement_id,
return retcode;
}
//LCOV_EXCL_START
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_GETSTMTATTRS(/*IN*/ SQLSTMT_ID * statement_id,
/*IN*/ Lng32 number_of_attrs,
/*INOUT*/ SQLSTMT_ATTR attrs[],
@@ -4952,14 +4637,13 @@ Lng32 SQL_EXEC_GETSTMTATTRS(/*IN*/ SQLSTMT_ID * statement_id,
extern "C"
{
#endif
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_GetStatistics(/*IN OPTIONAL*/ SQLSTMT_ID * statement_id,
/*INOUT*/ SQL_QUERY_STATISTICS *query_statistics)
{
return -CLI_INTERNAL_ERROR;
}
//LCOV_EXCL_START
-SQLCLI_LIB_FUNC Lng32 SQL_EXEC_GETSTATISTICS(
+Lng32 SQL_EXEC_GETSTATISTICS(
/*IN OPTIONAL*/ SQLSTMT_ID * statement_id)
{
return SQL_EXEC_GetStatistics(statement_id, NULL);
@@ -4970,93 +4654,6 @@ SQLCLI_LIB_FUNC Lng32 SQL_EXEC_GETSTATISTICS(
}
#endif /*__cplusplus*/
-SQLCLI_LIB_FUNC Lng32 SQL_EXEC_GETMPCATALOG(
- /*IN*/ char * ANSIObjName,
- /*INOUT*/ char * MPObjName,
- /*IN*/ Lng32 MPObjNameMaxLen,
- /*INOUT*/ Lng32 * MPObjNameLen,
- /*OUT*/ char * MPCatalogName,
- /*IN*/ Lng32 MPCatalogNameMaxLen,
- /*OUT*/ Lng32 * MPCatalogNameLen)
-{
- Lng32 retcode = 0;
- return retcode;
-};
-//LCOV_EXCL_STOP
-
-SQLCLI_LIB_FUNC
-Lng32 SQL_EXEC_GetPfsSize(/*OUT*/Int32 *pfsSize,
- /*OUT*/Int32 *pfsCurUse,
- /*OUT*/Int32 *pfsMaxUse)
-{
- Lng32 retcode;
- CLISemaphore *tmpSemaphore;
- ContextCli *threadContext;
- CLI_NONPRIV_PROLOGUE(retcode);
-
- try
- {
- tmpSemaphore = getCliSemaphore(threadContext);
- tmpSemaphore->get();
- threadContext->incrNumOfCliCalls();
- retcode =
- SQLCLI_GetPfsSize(GetCliGlobals(),
- pfsSize, pfsCurUse, pfsMaxUse);
- }
- catch(...)
- {
- retcode = -CLI_INTERNAL_ERROR;
-#if defined(_THROW_EXCEPTIONS)
- if (cliWillThrow())
- {
- threadContext->decrNumOfCliCalls();
- tmpSemaphore->release();
- throw;
- }
-#endif
- }
-
- threadContext->decrNumOfCliCalls();
- tmpSemaphore->release();
- retcode = RecordError(NULL, retcode);
- return retcode;
-}
-
-Lng32 SQL_EXEC_CleanUpPfsResources()
-{
- Lng32 retcode;
- CLISemaphore *tmpSemaphore;
- ContextCli *threadContext;
- CLI_NONPRIV_PROLOGUE(retcode);
-
- try
- {
- tmpSemaphore = getCliSemaphore(threadContext);
- tmpSemaphore->get();
- threadContext->incrNumOfCliCalls();
- retcode =
- SQLCLI_CleanUpPfsResources(GetCliGlobals());
- }
- catch(...)
- {
- retcode = -CLI_INTERNAL_ERROR;
-#if defined(_THROW_EXCEPTIONS)
- if (cliWillThrow())
- {
- threadContext->decrNumOfCliCalls();
- tmpSemaphore->release();
- throw;
- }
-#endif
- }
-
- threadContext->decrNumOfCliCalls();
- tmpSemaphore->release();
- retcode = RecordError(NULL, retcode);
- return retcode;
-}
-
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_Prepare(/*IN*/ SQLSTMT_ID * statement_id,
/*IN*/ SQLDESC_ID * sql_source)
{
@@ -5095,7 +4692,6 @@ Lng32 SQL_EXEC_Prepare(/*IN*/ SQLSTMT_ID * statement_id,
return retcode;
}
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_Prepare2(/*IN*/ SQLSTMT_ID * statement_id,
/*IN*/ SQLDESC_ID * sql_source,
/*INOUT*/ char * gencode_ptr,
@@ -5161,13 +4757,13 @@ Lng32 SQL_EXEC_Prepare2(/*IN*/ SQLSTMT_ID * statement_id,
}
//LCOV_EXCL_START
-SQLCLI_LIB_FUNC Lng32 SQL_EXEC_PREPARE(
+Lng32 SQL_EXEC_PREPARE(
/*IN*/ SQLSTMT_ID * statement_id,
/*IN*/ SQLDESC_ID * sql_source){
return SQL_EXEC_Prepare(statement_id, sql_source);
};
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetExplainData(
+Int32 SQL_EXEC_GetExplainData(
/*IN*/ SQLSTMT_ID * statement_id,
/*INOUT*/ char * explain_ptr,
/*IN*/ Int32 explain_len,
@@ -5211,7 +4807,7 @@ SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetExplainData(
return retcode;
}
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_StoreExplainData(
+Int32 SQL_EXEC_StoreExplainData(
/*IN*/ Int64 * exec_start_utc_ts,
/*IN*/ char * query_id,
/*INOUT*/ char * explain_ptr,
@@ -5255,7 +4851,6 @@ SQLCLI_LIB_FUNC Int32 SQL_EXEC_StoreExplainData(
return retcode;
}
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_ResDescName(/*INOUT*/ SQLDESC_ID * statement_id,
/*IN OPTIONAL*/ SQLSTMT_ID * from_statement,
/* (SQLWHAT_DESC) *IN OPTIONAL*/ Lng32 what_desc)
@@ -5296,14 +4891,13 @@ Lng32 SQL_EXEC_ResDescName(/*INOUT*/ SQLDESC_ID * statement_id,
return retcode;
}
-SQLCLI_LIB_FUNC Lng32 SQL_EXEC_RESDESCNAME(
+Lng32 SQL_EXEC_RESDESCNAME(
/*INOUT*/ SQLDESC_ID * statement_id,
/*IN OPTIONAL*/ SQLSTMT_ID * from_statement,
/*IN OPTIONAL (SQLWHAT_DESC) */ Lng32 what_desc){
return SQL_EXEC_ResDescName(statement_id, from_statement, what_desc);
};
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_ResStmtName(/*INOUT*/ SQLSTMT_ID * statement_id)
{
Lng32 retcode;
@@ -5340,14 +4934,12 @@ Lng32 SQL_EXEC_ResStmtName(/*INOUT*/ SQLSTMT_ID * statement_id)
return retcode;
}
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_RESSTMTNAME(
/*INOUT*/ SQLSTMT_ID * statement_id){
return SQL_EXEC_ResStmtName(statement_id);
};
//LCOV_EXCL_STOP
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_SetCursorName(/*IN*/ SQLSTMT_ID * statement_id,
/*IN*/ SQLSTMT_ID * cursor_name)
{
@@ -5386,7 +4978,6 @@ Lng32 SQL_EXEC_SetCursorName(/*IN*/ SQLSTMT_ID * statement_id,
return retcode;
}
//LCOV_EXCL_START
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_SETCURSORNAME(
/*IN*/ SQLSTMT_ID * statement_id,
/*IN*/ SQLSTMT_ID * cursor_name){
@@ -5394,7 +4985,6 @@ Lng32 SQL_EXEC_SETCURSORNAME(
return SQL_EXEC_SetCursorName(statement_id, cursor_name);
};
//LCOV_EXCL_STOP
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_SetStmtAttr(/*IN*/ SQLSTMT_ID * statement_id,
/*IN* (SQLATTR_TYPE) */ Lng32 attrName,
/*IN OPTIONAL*/ Lng32 numeric_value,
@@ -5439,7 +5029,6 @@ Lng32 SQL_EXEC_SetStmtAttr(/*IN*/ SQLSTMT_ID * statement_id,
return retcode;
}
//LCOV_EXCL_START
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_SETSTMTATTR(/*IN*/ SQLSTMT_ID * statement_id,
/*IN* (SQLATTR_TYPE) */ Lng32 attrName,
/*IN OPTIONAL*/ Lng32 numeric_value,
@@ -5449,7 +5038,6 @@ Lng32 SQL_EXEC_SETSTMTATTR(/*IN*/ SQLSTMT_ID * statement_id,
numeric_value, string_value);
}
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_SetDescEntryCount(/*IN*/ SQLDESC_ID * sql_descriptor,
/*IN*/ SQLDESC_ID * input_descriptor)
{
@@ -5487,7 +5075,6 @@ Lng32 SQL_EXEC_SetDescEntryCount(/*IN*/ SQLDESC_ID * sql_descriptor,
return retcode;
}
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_SETDESCENTRYCOUNT(
/*IN*/ SQLDESC_ID * sql_descriptor,
/*IN*/ SQLDESC_ID * input_descriptor){
@@ -5495,7 +5082,6 @@ Lng32 SQL_EXEC_SETDESCENTRYCOUNT(
return SQL_EXEC_SetDescEntryCount(sql_descriptor, input_descriptor);
};
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_SetDescEntryCountBasic(/*IN*/ SQLDESC_ID * sql_descriptor,
/*IN*/ Lng32 num_entries)
{
@@ -5534,7 +5120,6 @@ Lng32 SQL_EXEC_SetDescEntryCountBasic(/*IN*/ SQLDESC_ID * sql_descriptor,
return retcode;
}
//LCOV_EXCL_STOP
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_SetDescItem(/*IN*/ SQLDESC_ID * sql_descriptor,
/*IN*/ Lng32 entry,
/* (SQLDESC_ITEM_ID) *IN*/ Lng32 what_to_set,
@@ -5578,7 +5163,6 @@ Lng32 SQL_EXEC_SetDescItem(/*IN*/ SQLDESC_ID * sql_descriptor,
return retcode;
}
//LCOV_EXCL_START
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_SETDESCITEM(
/*IN*/ SQLDESC_ID * sql_descriptor,
/*IN*/ Lng32 entry,
@@ -5589,7 +5173,6 @@ Lng32 SQL_EXEC_SETDESCITEM(
return SQL_EXEC_SetDescItem(sql_descriptor, entry, what_to_set, numeric_value, string_value);
};
//LCOV_EXCL_STOP
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_SetDescItems(/*IN*/ SQLDESC_ID * sql_descriptor,
/*IN*/ SQLDESC_ITEM desc_items[],
/*IN*/ SQLDESC_ID * value_num_descriptor,
@@ -5632,7 +5215,6 @@ Lng32 SQL_EXEC_SetDescItems(/*IN*/ SQLDESC_ID * sql_descriptor,
return retcode;
}
//LCOV_EXCL_START
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_SETDESCITEMS(
/*IN*/ SQLDESC_ID * sql_descriptor,
/*IN*/ SQLDESC_ITEM desc_items[],
@@ -5644,7 +5226,7 @@ Lng32 SQL_EXEC_SETDESCITEMS(
return SQL_EXEC_SetDescItems(sql_descriptor, desc_items, value_num_descriptor, input_descriptor);
};
//LCOV_EXCL_STOP
-SQLCLI_LIB_FUNC Lng32 SQL_EXEC_SetDescItems2(
+Lng32 SQL_EXEC_SetDescItems2(
/*IN*/ SQLDESC_ID * sql_descriptor,
/*IN*/ Lng32 no_of_desc_items,
/*IN*/ SQLDESC_ITEM desc_items[])
@@ -5683,7 +5265,7 @@ SQLCLI_LIB_FUNC Lng32 SQL_EXEC_SetDescItems2(
return retcode;
}
//LCOV_EXCL_START
-SQLCLI_LIB_FUNC Lng32 SQL_EXEC_SETDESCITEMS2(
+Lng32 SQL_EXEC_SETDESCITEMS2(
/*IN*/ SQLDESC_ID * sql_descriptor,
/*IN*/ Lng32 no_of_desc_items,
/*IN*/ SQLDESC_ITEM desc_items[])
@@ -5692,7 +5274,6 @@ SQLCLI_LIB_FUNC Lng32 SQL_EXEC_SETDESCITEMS2(
return SQL_EXEC_SetDescItems2(sql_descriptor, no_of_desc_items, desc_items);
};
//LCOV_EXCL_STOP
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_SetDescPointers(/*IN*/ SQLDESC_ID * sql_descriptor,
/*IN*/ Lng32 starting_entry,
/*IN*/ Lng32 num_ptr_pairs,
@@ -5740,7 +5321,6 @@ Lng32 SQL_EXEC_SetDescPointers(/*IN*/ SQLDESC_ID * sql_descriptor,
return retcode;
}
//LCOV_EXCL_START
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_SETDESCPOINTERS(/*IN*/ SQLDESC_ID * sql_descriptor,
/*IN*/ Lng32 starting_entry,
/*IN*/ Lng32 num_ptr_pairs,
@@ -5784,7 +5364,6 @@ Lng32 SQL_EXEC_SETDESCPOINTERS(/*IN*/ SQLDESC_ID * sql_descriptor,
return retcode;
}
//LCOV_EXCL_STOP
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_SetRowsetDescPointers(SQLDESC_ID * sql_descriptor,
Lng32 rowset_size,
Lng32 *rowset_status_ptr,
@@ -5835,7 +5414,6 @@ Lng32 SQL_EXEC_SetRowsetDescPointers(SQLDESC_ID * sql_descriptor,
return retcode;
}
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_SETROWSETDESCPOINTERS(SQLDESC_ID * sql_descriptor,
Lng32 rowset_size,
Lng32 *rowset_status_ptr,
@@ -5883,7 +5461,6 @@ Lng32 SQL_EXEC_SETROWSETDESCPOINTERS(SQLDESC_ID * sql_descriptor,
}
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_SwitchContext(/*IN*/ SQLCTX_HANDLE ctxt_handle,
/*OUT OPTIONAL*/ SQLCTX_HANDLE * prev_ctxt_handle)
{
@@ -5913,14 +5490,12 @@ Lng32 SQL_EXEC_SwitchContext(/*IN*/ SQLCTX_HANDLE ctxt_handle,
return retcode;
}
//LCOV_EXCL_START
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_SWITCHCONTEXT(
/*IN*/ SQLCTX_HANDLE context_handle,
/*OUT OPTIONAL*/ SQLCTX_HANDLE * prev_context_handle){
return SQL_EXEC_SwitchContext(context_handle, prev_context_handle);
};
//LCOV_EXCL_STOP
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_Xact(/*IN* (SQLTRANS_COMMAND) */ Lng32 command,
/*OUT OPTIONAL*/ SQLDESC_ID * transid_descriptor)
{
@@ -5958,7 +5533,6 @@ Lng32 SQL_EXEC_Xact(/*IN* (SQLTRANS_COMMAND) */ Lng32 command,
return retcode;
}
//LCOV_EXCL_START
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_XACT(
/*IN* (SQLTRANS_COMMAND) */ Lng32 command,
/*OUT OPTIONAL*/ SQLDESC_ID * transid_descriptor){
@@ -6018,7 +5592,6 @@ Lng32 SQL_EXEC_SetAuthID(
/* temporary functions -- for use by sqlcat simulator only */
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_AllocDesc(/*INOUT*/ SQLDESC_ID * desc_id,
/*IN OPTIONAL*/ Lng32 max_entries)
{
@@ -6056,7 +5629,6 @@ Lng32 SQL_EXEC_AllocDesc(/*INOUT*/ SQLDESC_ID * desc_id,
return retcode;
}
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_GetDescEntryCount(/*IN*/ SQLDESC_ID * sql_descriptor,
/*OUT*/ Lng32 * num_entries)
{
@@ -6094,7 +5666,6 @@ Lng32 SQL_EXEC_GetDescEntryCount(/*IN*/ SQLDESC_ID * sql_descriptor,
return retcode;
}
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_SetDescEntryCount(/*IN*/ SQLDESC_ID * sql_descriptor,
/*IN*/ Lng32 num_entries)
{
@@ -6135,7 +5706,6 @@ Lng32 SQL_EXEC_SetDescEntryCount(/*IN*/ SQLDESC_ID * sql_descriptor,
// For internal use only -- do not document!
// This method merges the CLI diags area into the caller's diags area
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_MergeDiagnostics_Internal (/*INOUT*/ ComDiagsArea & newDiags)
{
Lng32 retcode;
@@ -6170,36 +5740,9 @@ Lng32 SQL_EXEC_MergeDiagnostics_Internal (/*INOUT*/ ComDiagsArea & newDiags)
tmpSemaphore->release();
return retcode;
}
-//LCOV_EXCL_START
-// For internal use only -- do not document
-// A new CLI call to allow catman to specify the the CLI which version of compiler
-// to use to prepare a query. The caller can specify either a node name or a version but
-// not both. If both are specified an error will be returned.
-SQLCLI_LIB_FUNC Lng32 SQL_EXEC_SetCompilerVersion_Internal( short mxcmpVersionToUse, char *nodeName)
-{
- Lng32 retcode;
-
- CLI_NONPRIV_PROLOGUE(retcode);
- retcode = SQLCLI_SetCompilerVersion_Internal(GetCliGlobals(),mxcmpVersionToUse, nodeName);
- return retcode;
-}
-
-// A new CLI call to return the compiler vesion in the current context.
-// The caller can specify a node name to get the version of a remote node.
-
-
-SQLCLI_LIB_FUNC Lng32 SQL_EXEC_GetCompilerVersion_Internal( short &mxcmpVersionToUse, char *nodeName)
-{
- Lng32 retcode;
-
- CLI_NONPRIV_PROLOGUE(retcode);
- retcode = SQLCLI_GetCompilerVersion_Internal(GetCliGlobals(),mxcmpVersionToUse, nodeName);
- return retcode;
-}
// For internal use only -- do not document!
// This method returns the CLI diags area in packed format
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_GetPackedDiagnostics_Internal(
/*OUT*/ char * message_buffer_ptr,
/*IN*/ ULng32 message_obj_size,
@@ -6245,14 +5788,12 @@ Lng32 SQL_EXEC_GetPackedDiagnostics_Internal(
}
// For internal use only -- do not document!
-SQLCLI_LIB_FUNC
void SQL_EXEC_SetParserFlagsForExSqlComp_Internal(ULng32 flagbits)
{
SQL_EXEC_SetParserFlagsForExSqlComp_Internal2(flagbits);
}
// For internal use only -- do not document!
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_SetParserFlagsForExSqlComp_Internal2(ULng32 flagbits)
{
Lng32 retcode;
@@ -6357,14 +5898,12 @@ Lng32 SQL_EXEC_GetParserFlagsForExSqlComp_Internal(ULng32 &flagbits)
}
// For internal use only -- do not document!
-SQLCLI_LIB_FUNC
void SQL_EXEC_ResetParserFlagsForExSqlComp_Internal(ULng32 flagbits)
{
SQL_EXEC_ResetParserFlagsForExSqlComp_Internal2(flagbits);
}
// For internal use only -- do not document!
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_ResetParserFlagsForExSqlComp_Internal2(ULng32 flagbits)
{
Lng32 retcode;
@@ -6399,312 +5938,7 @@ Lng32 SQL_EXEC_ResetParserFlagsForExSqlComp_Internal2(ULng32 flagbits)
return retcode;
}
-//LCOV_EXCL_START
-// For internal use only -- do not document!
-SQLCLI_LIB_FUNC const char *const *const
-SQL_EXEC_GetListOfVolumes_Internal()
-{
- return SQLCLI_GetListOfVolumes_Internal();
-
-} // SQL_EXEC_GetListOfVolumes_Internal()
-
-// For internal use only -- do not document!
-SQLCLI_LIB_FUNC Lng32 SQL_EXEC_GetListOfAuditedVolumes_Internal(
- /*INOUT*/ char **volNames,
- /*INOUT*/ Lng32 *numOfVols)
-{
- Lng32 retcode=0;
- retcode = SQLCLI_GetListOfAuditedVolumes_Internal
- (GetCliGlobals(), volNames, numOfVols);
-
- return retcode;
-
-} // SQL_EXEC_GetListOfAuditedVolumes_Internal()
-
-// For internal use only -- do not document!
-SQLCLI_LIB_FUNC Lng32 SQL_EXEC_GetNumOfQualifyingVolumes_Internal
- (/*IN*/ const char *nodeName,
- /*INOUT*/ Lng32 *numOfVols)
-{
- Lng32 retcode=0;
-
- retcode = SQLCLI_GetNumOfQualifyingVolumes_Internal
- (GetCliGlobals(), nodeName, numOfVols);
-
- return retcode;
-} // SQL_EXEC_GetListOfAuditedVolumes_Internal()
-
-
-// For internal use only -- do not document!
-SQLCLI_LIB_FUNC Lng32 SQL_EXEC_GetListOfQualifyingVolumes_Internal
- (/*IN*/ const char *nodeName,
- /*IN*/ Lng32 numOfVols,
- /*OUT*/ char **volNames,
- /*OUT*/ Lng32 *cpuNums,
- /*OUT*/ Lng32 *capacities,
- /*OUT*/ Lng32 *freespaces,
- /*OUT*/ Lng32 *largestFragments)
-{
- Lng32 retcode=0;
-
- retcode = SQLCLI_GetListOfQualifyingVolumes_Internal
- (GetCliGlobals(), nodeName, numOfVols, volNames, cpuNums,
- capacities, freespaces, largestFragments);
-
- return retcode;
-} // SQL_EXEC_GetListOfAuditedVolumes_Internal()
-
-
-// For internal use only -- do not document!
-SQLCLI_LIB_FUNC short
-SQL_EXEC_GetDefaultVolume_Internal(char *const outBuf,
- const short outBufMaxLen,
- short &defaultVolLen)
-{
- short retcode;
- CLISemaphore *tmpSemaphore;
- ContextCli *threadContext;
-
- CLI_NONPRIV_PROLOGUE_SHORT(retcode);
-
- try
- {
- tmpSemaphore = getCliSemaphore(threadContext);
- tmpSemaphore->get();
- threadContext->incrNumOfCliCalls();
- retcode = SQLCLI_GetDefaultVolume_Internal(outBuf, outBufMaxLen,
- defaultVolLen);
- }
- catch(...)
- {
- retcode = -CLI_INTERNAL_ERROR;
-#if defined(_THROW_EXCEPTIONS)
- if (cliWillThrow())
- {
- threadContext->decrNumOfCliCalls();
- tmpSemaphore->release();
- throw;
- }
-#endif
- }
-
- threadContext->decrNumOfCliCalls();
- tmpSemaphore->release();
- return retcode;
-} // SQL_EXEC_GetDefaultVolume_Internal()
-
-//LCOV_EXCL_STOP
-
-SQLCLI_LIB_FUNC Lng32
-SQL_EXEC_IsVolumeUseful_Internal (const char *const volName,
- short &fsErr)
-{
- const Int32 noOfItems = 3;
- short itemList[noOfItems] = {30, 31, 33};
- short resultList[noOfItems];
-
- if (SQLCLI_IsVolume7Chars_Internal(volName))
- {
- fsErr = FEBADNAME;
- return FALSE;
- }
-
-
- MS_Mon_Process_Info_Type info;
- char dp2Name[100]; // including NULL terminator
- size_t dp2NameLen = 0;
- char * ptr = NULL;
-
- if (volName[0] == '\\')
- {
- size_t sysNameLen = 0;
- // volume qualified with node name - we don't really like that
- // except if the node name is \NSK. Go check if that is the case.
- ptr = str_chr(volName, '.');
- if (ptr == NULL || (sysNameLen = ptr - volName) != 4 /* strlen("\\NSK") */)
- {
- // name is invalid, bail out
- fsErr = XZFIL_ERR_BADNAME;
- return FALSE;
- }
- else
- {
- char sysName[10];
- str_cpy_all(sysName, volName, sysNameLen);
- sysName[sysNameLen] = '\0';
- for (Int32 i = 0; i < sysNameLen; i++) sysName[i] = TOUPPER(sysName[i]);
- if (str_cmp(sysName, "\\NSK", sysNameLen) != 0)
- {
- // system name can only be \NSK (case insensitive)
- fsErr = XZFIL_ERR_BADNAME;
- return FALSE;
- }
- }
-
- ptr++; // advance past the period (dot) separator
- dp2NameLen = str_len(ptr);
- str_cpy_all(dp2Name, ptr, dp2NameLen);
- dp2Name[dp2NameLen] = '\0';
- }
- else
- {
- // volName[0] should be '$'
- dp2NameLen = str_len(volName);
- str_cpy_all(dp2Name, volName, dp2NameLen);
- dp2Name[dp2NameLen] = '\0';
- }
-
- fsErr = msg_mon_get_process_info_detail(dp2Name, // in - vol name w/out sys name part
- &info); // out - process information
- if (fsErr == XZFIL_ERR_OK)
- {
- // massage the outcome to resemble the one from FILE_GETINFOLISTBYNAME_
- switch (info.type)
- {
- case MS_ProcessType_TSE:
- resultList[0] = 3; // a disk
- resultList[1] = 0; // not a fancy SQL/MP disk type
- resultList[2] = 1; // TSE volume - Always audited
- break;
- case MS_ProcessType_ASE:
- resultList[0] = 3; // a disk
- resultList[1] = 0; // not a fancy SQL/MP disk type
- resultList[2] = 0; // ASE Audit Trail volume - Not audited
- break;
- default: // Not a DP2 volume
- fsErr = XZFIL_ERR_NOSUCHDEV;
- break;
- } // switch
- }
- else if (fsErr == XZFIL_ERR_BOUNDSERR)
- {
- // -- process (name) not found --
- // Replace this unfriendly fs error condition
- // with the one we are familiar with
- fsErr = XZFIL_ERR_NOSUCHDEV;
- }
-
-
- // Note that FEOK (used on Windows NT and NSK platforms)
- // and XZERR_FIL_OK are the same
- if (fsErr != FEOK)
- // Some file system error, assume that the device
- // is not a useful volume
- return FALSE;
-
- if (resultList[0] != 3)
- {
- // not a disk ...
- fsErr = FEINVALOP;
- return FALSE;
- }
-
- if ((resultList[1] == 36) || (resultList[1] == 56))
- {
- // an SMF volume or an OSF
- fsErr = FEINVALOP;
- return FALSE;
- }
-
-
- if (resultList[2] == 0)
- {
- // not TMF volume
- fsErr = FEAUDITINVALOP;
- return FALSE;
- }
-
- // Volume is physical, available and audited
- return TRUE;
-} // SQL_EXEC_IsVolumeUseful_Internal()
-
-
-
-// For internal use only -- do not document!
-//
-// returns pointer pointing to the Tandem System Volume name
-// (NULL-terminated) cached in the Executor dynamic global
-// memory area. Returns NULL if cannot get the name (after
-// logging an error message in the Windows NT Even log).
-//
-// On NT make a call to this routine to get a pointer to the SMD location
-// in the CLI globals
-//
-// On NSK the CLI globals are hidden so we need the CLI to copy the SMD location
-// to a local variable. In this case allocate storage for SMDLocation and
-// make a call to SQL_EXEC_GetSystemVolume_InternalNSK(SMDLocation);
-//LCOV_EXCL_START
-SQLCLI_LIB_FUNC
-Lng32 SQL_EXEC_GetSystemVolume_Internal(
- /*INOUT*/ char * SMDlocation)
-{
- Lng32 retcode = 0;
- CLISemaphore *tmpSemaphore;
- ContextCli *threadContext;
- Lng32 fsError; // unexposed error reporting.
-
-try
- {
- tmpSemaphore = getCliSemaphore(threadContext);
- tmpSemaphore->get();
- threadContext->incrNumOfCliCalls();
- retcode = SQLCLI_GetSystemVolume_Internal(GetCliGlobals(),
- SMDlocation, &fsError);
- }
- catch(...)
- {
- retcode = -CLI_INTERNAL_ERROR;
-#if defined(_THROW_EXCEPTIONS)
- if (cliWillThrow())
- {
- threadContext->decrNumOfCliCalls();
- tmpSemaphore->release();
- throw;
- }
-#endif
- }
- threadContext->decrNumOfCliCalls();
- tmpSemaphore->release();
-
-
- return retcode;
-}
-//LCOV_EXCL_STOP
-// For internal use only -- do not document!
-//
-// returns pointer pointing to the Tandem System Volume name
-// (NULL-terminated).
-//
-SQLCLI_LIB_FUNC
-Lng32 SQL_EXEC_GetRemoteSystemVolume_Internal(
- /*INOUT*/ char * SMDlocation,
- /*IN*/ const char *nodeName,
- /*INOUT*/ Lng32 *fsError)
-{
- Lng32 retcode = 0;
-
- if ((nodeName == NULL) ||
- (strcmp("NSK", nodeName) == 0) ||
- (strcmp("\\NSK", nodeName) == 0))
- {
- retcode = SQLCLI_GetSystemVolume_Internal(GetCliGlobals(),
- SMDlocation,
- fsError);
- }
- else
- {
- // Notice that there is no need to define the function
- // SQLCLI_GetRemoteSystemVolume_Internal for NT.
- // We do want to return sensibly looking error information, though.
- SMDlocation[0] = '\0';
- retcode = -EXE_NAME_MAPPING_FS_ERROR;
- *fsError = FENOSUCHSYS;
- }
-
- return retcode;
-}
-
-SQLCLI_LIB_FUNC Lng32
+Lng32
SQL_EXEC_GetTotalTcbSpace(char *tdb, char * otherInfo)
{
Lng32 retcode = 0;
@@ -6713,49 +5947,9 @@ SQL_EXEC_GetTotalTcbSpace(char *tdb, char * otherInfo)
return retcode;
}
-//********************************************************************
-//*
-//* putenvCLI(const char * envStr)
-//*
-//* This function is being made available due to a specific
-//* request from ODBC. It should not be used by any other component
-//* since the results may be unknown.
-//*
-//* Technicalese : The component in which ODBC sets env. variables
-//* is a DLL. Due to some NT quirck, those env.
-//* variables are not visible in tdm_sqlcli.dll.
-//* This function would ensure that the environment
-//* is set in tdm_sqlcli.dll and will always be
-//* available.
-//*
-//* Futures : When the executor group implements the API for
-//* setting ContextOptions, then this function would
-//* not be required and should be removed from here.
-//*
-//* NOTE : The header for this function is NOT being made
-//* available via SQLCLIdev.h to prevent additional
-//* components from using it.
-//********************************************************************
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-//LCOV_EXCL_START
-SQLCLI_LIB_FUNC
-Int32 putenvCLI (const char * envStr)
-{
- return -1;
-}
- //LCOV_EXCL_STOP
-#ifdef __cplusplus
-}
-#endif
-
// for now include this and build it here
// #include "CliDll.cpp"
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_GetCollectStatsType_Internal (
/*OUT*/ ULng32 * collectStatsType,
/*IN*/ SQLSTMT_ID * statement_id)
@@ -6772,7 +5966,6 @@ Lng32 SQL_EXEC_GetCollectStatsType_Internal (
return retcode;
}
//LCOV_EXCL_STOP
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_BreakEnabled_Internal (
/*IN*/ UInt32 enabled)
{
@@ -6783,7 +5976,6 @@ Lng32 SQL_EXEC_BreakEnabled_Internal (
return retcode;
}
//LCOV_EXCL_START
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_SPBreakReceived_Internal (
/*OUT*/ UInt32 *breakRecvd)
{
@@ -6795,14 +5987,12 @@ Lng32 SQL_EXEC_SPBreakReceived_Internal (
//LCOV_EXCL_STOP
// For internal use only -- do not document!
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_SetEnviron_Internal(Lng32 propagate)
{
Lng32 retcode = 0;
CLISemaphore *tmpSemaphore;
ContextCli *threadContext;
-#ifndef CLI_PRIV_SRL
try
{
tmpSemaphore = getCliSemaphore(threadContext);
@@ -6824,56 +6014,9 @@ Lng32 SQL_EXEC_SetEnviron_Internal(Lng32 propagate)
}
threadContext->decrNumOfCliCalls();
tmpSemaphore->release();
-#else
- // this method should not be called from inside of the priv srl.
- retcode = -CLI_INTERNAL_ERROR;
-#endif
return retcode;
}
-//LCOV_EXCL_START
-SQLCLI_LIB_FUNC
-Lng32 SQL_EXEC_GetVersion_Internal
-(/*IN*/ Lng32 versionType,
- /*OUT*/ Lng32 * versionValue,
- /*IN OPTIONAL*/ const char * nodeName,
- /*IN OPTIONAL*/ const SQLMODULE_ID * module_name,
- /*IN OPTIONAL*/ const SQLSTMT_ID * statement_id)
-{
- Lng32 retcode = 0;
- CLISemaphore *tmpSemaphore;
- ContextCli *threadContext;
-
- CLI_NONPRIV_PROLOGUE(retcode);
-
- try
- {
- tmpSemaphore = getCliSemaphore(threadContext);
- tmpSemaphore->get();
- threadContext->incrNumOfCliCalls();
- retcode = SQLCLI_GetVersion_Internal(GetCliGlobals(),
- versionType, versionValue,
- nodeName, module_name, statement_id);
- }
- catch(...)
- {
- retcode = -CLI_INTERNAL_ERROR;
-#if defined(_THROW_EXCEPTIONS)
- if (cliWillThrow())
- {
- threadContext->decrNumOfCliCalls();
- tmpSemaphore->release();
- throw;
- }
-#endif
- }
- threadContext->decrNumOfCliCalls();
- tmpSemaphore->release();
-
- return retcode;
-}
-//LCOV_EXCL_STOP
-
#ifdef __cplusplus
extern "C"
@@ -6881,47 +6024,12 @@ extern "C"
#endif
//LCOV_EXCL_START
// For internal use only -- do not document!
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_SETENVIRON_INTERNAL(Lng32 propagate)
{
return SQL_EXEC_SetEnviron_Internal(propagate);
}
-SQLCLI_LIB_FUNC Lng32 SQL_EXEC_DecodeAndFormatKey(
- /*IN*/void * RCB_Pointer_Addr,
- /*IN*/void * KeyAddr,
- /*IN*/Int32 KeyLength,
- /*INOUT*/void * DecodedKeyBufAddr,
- /*INOUT*/void * FormattedKeyBufAddr,
- /*IN*/Int32 FormattedKeyBufLen,
- /*OUT*/Int32 * NeededKeyBufLen )
-{
- Lng32 retcode = 0;
- CLISemaphore *tmpSemaphore;
- ContextCli *threadContext;
-
-
- RecordError(NULL, retcode);
- return retcode;
-}
-
-SQLCLI_LIB_FUNC Lng32 SQL_EXEC_GetPartitionKeyFromRow(
- /*IN*/void * RCB_Pointer_Addr,
- /*IN*/void * Row_Addr,
- /*IN*/Int32 Row_Length,
- /*INOUT*/void * KeyAddr,
- /*IN*/Int32 KeyLength)
-{
- Lng32 retcode = 0;
- CLISemaphore *tmpSemaphore;
- ContextCli *threadContext;
-
-
- RecordError(NULL, retcode);
- return retcode;
-}
-//LCOV_EXCL_STOP
-SQLCLI_LIB_FUNC Lng32 SQL_EXEC_LocaleToUTF8 (
+Lng32 SQL_EXEC_LocaleToUTF8 (
/*IN*/Int32 conv_charset,
/*IN*/void * Input_Buffer_Addr,
/*IN*/Int32 Input_Buffer_Length,
@@ -6948,7 +6056,7 @@ SQLCLI_LIB_FUNC Lng32 SQL_EXEC_LocaleToUTF8 (
return retcode;
}
-SQLCLI_LIB_FUNC Lng32 SQL_EXEC_UTF8ToLocale(
+Lng32 SQL_EXEC_UTF8ToLocale(
/*IN*/Int32 conv_charset,
/*IN*/void * Input_Buffer_Addr,
/*IN*/Int32 Input_Buffer_Length,
@@ -6978,7 +6086,7 @@ SQLCLI_LIB_FUNC Lng32 SQL_EXEC_UTF8ToLocale(
return retcode;
}
-SQLCLI_LIB_FUNC Lng32 SQL_EXEC_LocaleToUTF16 (
+Lng32 SQL_EXEC_LocaleToUTF16 (
/*IN*/Int32 conv_charset,
/*IN*/void * Input_Buffer_Addr,
/*IN*/Int32 Input_Buffer_Length,
@@ -7007,7 +6115,7 @@ SQLCLI_LIB_FUNC Lng32 SQL_EXEC_LocaleToUTF16 (
return retcode;
}
-SQLCLI_LIB_FUNC Lng32 SQL_EXEC_UTF16ToLocale(
+Lng32 SQL_EXEC_UTF16ToLocale(
/*IN*/Int32 conv_charset,
/*IN*/void * Input_Buffer_Addr,
/*IN*/Int32 Input_Buffer_Length,
@@ -7039,7 +6147,7 @@ SQLCLI_LIB_FUNC Lng32 SQL_EXEC_UTF16ToLocale(
return retcode;
}
-SQLCLI_LIB_FUNC Lng32 SQL_EXEC_SetErrorCodeInRTS(
+Lng32 SQL_EXEC_SetErrorCodeInRTS(
/*IN*/ SQLSTMT_ID * statement_id,
/*IN*/ Lng32 sqlErrorCode)
{
@@ -7071,7 +6179,6 @@ try
return retcode;
}
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_SetSecInvalidKeys(
/* IN */ Int32 numSiKeys,
/* IN */ SQL_QIKEY siKeys[])
@@ -7108,7 +6215,6 @@ Lng32 SQL_EXEC_SetSecInvalidKeys(
return retcode;
}
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_GetSecInvalidKeys(
/* IN */ Int64 prevTimestamp,
/* IN/OUT */ SQL_QIKEY siKeys[],
@@ -7152,7 +6258,6 @@ Lng32 SQL_EXEC_GetSecInvalidKeys(
return retcode;
}
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_GetStatistics2(
/* IN */ short statsReqType,
/* IN */ char *statsReqStr,
@@ -7203,7 +6308,6 @@ Lng32 SQL_EXEC_GetStatistics2(
return retcode;
}
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_GetStatisticsItems(
/* IN */ short statsReqType,
/* IN */ char *queryId,
@@ -7246,7 +6350,6 @@ Lng32 SQL_EXEC_GetStatisticsItems(
return retcode;
}
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_RegisterQuery(SQLQUERY_ID *queryId,
Lng32 fragId,
Lng32 tdbId,
@@ -7289,7 +6392,6 @@ try
return retcode;
}
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_DeregisterQuery(SQLQUERY_ID *queryId,
Lng32 fragId)
{
@@ -7374,7 +6476,7 @@ Lng32 SQL_EXEC_GetStatisticsArea_Internal
return retcode;
}
-SQLCLI_LIB_FUNC Lng32 SQL_EXEC_GetChildQueryInfo(
+Lng32 SQL_EXEC_GetChildQueryInfo(
/*IN*/ SQLSTMT_ID * statement_id,
/*INOUT*/ char * uniqueQueryId,
/*IN */ Lng32 uniqueQueryIdMaxLen,
@@ -7417,7 +6519,7 @@ SQLCLI_LIB_FUNC Lng32 SQL_EXEC_GetChildQueryInfo(
return retcode;
}
-SQLCLI_LIB_FUNC Lng32 SQL_EXEC_LOBcliInterface
+Lng32 SQL_EXEC_LOBcliInterface
(
/*IN*/ char * inLobHandle,
/*IN*/ Lng32 inLobHandleLen,
@@ -7779,7 +6881,7 @@ Lng32 SQL_EXEC_SeqGenCliInterface
return retcode;
}
-SQLCLI_LIB_FUNC Lng32 SQL_EXEC_GetRoutine
+Lng32 SQL_EXEC_GetRoutine
(
/* IN */ const char *serializedInvocationInfo,
/* IN */ Int32 invocationInfoLen,
@@ -7835,7 +6937,7 @@ SQLCLI_LIB_FUNC Lng32 SQL_EXEC_GetRoutine
return retcode;
}
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_InvokeRoutine
+Int32 SQL_EXEC_InvokeRoutine
(
/* IN */ Int32 handle,
/* IN */ Int32 phaseEnumAsInt,
@@ -7895,7 +6997,7 @@ SQLCLI_LIB_FUNC Int32 SQL_EXEC_InvokeRoutine
return retcode;
}
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetRoutineInvocationInfo
+Int32 SQL_EXEC_GetRoutineInvocationInfo
(
/* IN */ Int32 handle,
/* IN/OUT */ char *serializedInvocationInfo,
@@ -7945,7 +7047,7 @@ SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetRoutineInvocationInfo
return retcode;
}
-SQLCLI_LIB_FUNC Lng32 SQL_EXEC_PutRoutine
+Lng32 SQL_EXEC_PutRoutine
(
/* IN */ Int32 handle
)
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/cli/CliStubsStaticBuild.cpp
----------------------------------------------------------------------
diff --git a/core/sql/cli/CliStubsStaticBuild.cpp b/core/sql/cli/CliStubsStaticBuild.cpp
index 5ffc3c5..c5be5ac 100644
--- a/core/sql/cli/CliStubsStaticBuild.cpp
+++ b/core/sql/cli/CliStubsStaticBuild.cpp
@@ -20,45 +20,4 @@
//
// @@@ END COPYRIGHT @@@
**********************************************************************/
-/* -*-C++-*-
- *****************************************************************************
- *
- * File: CliStubs.cpp
- * Description: CLI Stubs.
- *
- *
- * Created: 3/22/2002
- * Language: C++
- *
- *
- *
- *
- *****************************************************************************
- */
-
-// -----------------------------------------------------------------------
-
-#include "NAType.h"
-#include "CharType.h"
-//ss_cc_change : unused function
-#ifndef NA_CMPDLL
-//LCOV_EXCL_START
-NABoolean NAType::isComparable(const NAType &other,
- ItemExpr *parentOp,
- Int32 emitErr) const
-{ return FALSE; }
-//LCOV_EXCL_STOP
-
-NABoolean CharType::isComparable(const NAType &other,
- ItemExpr *parentOp,
- Int32 emitErr) const
-{ return FALSE; }
-#endif // Not NA_CMPDLL
-
-
-
-
-
-
-
[02/30] incubator-trafodion git commit: TRAFODION-2731 CodeCleanup:
Remove obsolete, legacy and unused code
Posted by an...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/regress/seabase/EXPECTED010
----------------------------------------------------------------------
diff --git a/core/sql/regress/seabase/EXPECTED010 b/core/sql/regress/seabase/EXPECTED010
index c949f10..f1bba1d 100644
--- a/core/sql/regress/seabase/EXPECTED010
+++ b/core/sql/regress/seabase/EXPECTED010
@@ -58,7 +58,7 @@
>>invoke t010t1;
-- Definition of Trafodion table TRAFODION.SCH.T010T1
--- Definition current Wed Mar 15 02:25:11 2017
+-- Definition current Sun Sep 3 07:14:29 2017
(
A INT NO DEFAULT NOT NULL NOT DROPPABLE
@@ -71,7 +71,7 @@
>>invoke hbase."_CELL_"."TRAFODION.SCH.T010T1";
-- Definition of Trafodion table HBASE."_CELL_"."TRAFODION.SCH.T010T1"
--- Definition current Wed Mar 15 02:25:11 2017
+-- Definition current Sun Sep 3 07:14:30 2017
(
ROW_ID VARCHAR(10) CHARACTER SET ISO88591 COLLATE
@@ -90,7 +90,7 @@
>>invoke hbase."_ROW_"."TRAFODION.SCH.T010T1";
-- Definition of Trafodion table HBASE."_ROW_"."TRAFODION.SCH.T010T1"
--- Definition current Wed Mar 15 02:25:11 2017
+-- Definition current Sun Sep 3 07:14:31 2017
(
ROW_ID VARCHAR(10) CHARACTER SET ISO88591 COLLATE
@@ -221,7 +221,7 @@ LC RC OP OPERATOR OPT DESCRIPTION CARD
------------------------------------------------------------------ PLAN SUMMARY
MODULE_NAME .............. DYNAMICALLY COMPILED
STATEMENT_NAME ........... XX
-PLAN_ID .................. 212356304713548391
+PLAN_ID .................. 212371182873097135
ROWS_OUT ................ 11
EST_TOTAL_COST ........... 0.01
STATEMENT ................ select * from t010t1 where a=1 or b='1';
@@ -238,7 +238,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
@@ -263,7 +262,7 @@ DESCRIPTION
TRAF_ALIGNED_ROW_FORMAT OFF
QUERY_CACHE ........ 1,024
MDAM_SCAN_METHOD ....... ON
- ObjectUIDs ............. 4453058303811968296
+ ObjectUIDs ............. 8861534267208413466
select_list ............ TRAFODION.SCH.T010T1.A, TRAFODION.SCH.T010T1.B
@@ -303,7 +302,7 @@ DESCRIPTION
------------------------------------------------------------------ PLAN SUMMARY
MODULE_NAME .............. DYNAMICALLY COMPILED
STATEMENT_NAME ........... XX
-PLAN_ID .................. 212356304713627230
+PLAN_ID .................. 212371182873185952
ROWS_OUT ................. 1
EST_TOTAL_COST ........... 0.01
STATEMENT ................ select * from t010t1 where a=1 and b='1';
@@ -321,7 +320,6 @@ DESCRIPTION
fragment_id ............ 0
parent_frag ............ (none)
fragment_type .......... master
- statement_index ........ 0
affinity_value ......... 0
max_max_cardinality .... 1
total_overflow_size .... 0.00 KB
@@ -346,7 +344,7 @@ DESCRIPTION
TRAF_ALIGNED_ROW_FORMAT OFF
QUERY_CACHE ........ 1,024
MDAM_SCAN_METHOD ....... ON
- ObjectUIDs ............. 4453058303811968296
+ ObjectUIDs ............. 8861534267208413466
select_list ............ %(1), %('1')
input_variables ........ %(1), %('1')
@@ -385,7 +383,7 @@ DESCRIPTION
------------------------------------------------------------------ PLAN SUMMARY
MODULE_NAME .............. DYNAMICALLY COMPILED
STATEMENT_NAME ........... XX
-PLAN_ID .................. 212356304713727245
+PLAN_ID .................. 212371182873280690
ROWS_OUT ................ 10
EST_TOTAL_COST ........... 0.01
STATEMENT ................ select * from t010t1 where b='1';
@@ -402,7 +400,6 @@ DESCRIPTION
fragment_id ............ 0
parent_frag ............ (none)
fragment_type .......... master
- statement_index ........ 0
affinity_value ......... 0
max_max_cardinality ... 10
total_overflow_size .... 0.00 KB
@@ -427,7 +424,7 @@ DESCRIPTION
TRAF_ALIGNED_ROW_FORMAT OFF
QUERY_CACHE ........ 1,024
MDAM_SCAN_METHOD ....... ON
- ObjectUIDs ............. 4453058303811968296
+ ObjectUIDs ............. 8861534267208413466
select_list ............ TRAFODION.SCH.T010T1.A, %('1')
input_variables ........ %('1')
@@ -467,7 +464,7 @@ DESCRIPTION
------------------------------------------------------------------ PLAN SUMMARY
MODULE_NAME .............. DYNAMICALLY COMPILED
STATEMENT_NAME ........... XX
-PLAN_ID .................. 212356304712746144
+PLAN_ID .................. 212371182872306074
ROWS_OUT ................. 1
EST_TOTAL_COST ........... 0.01
STATEMENT ................ select * from t010t1 where a = 2;
@@ -485,7 +482,6 @@ DESCRIPTION
fragment_id ............ 0
parent_frag ............ (none)
fragment_type .......... master
- statement_index ........ 0
affinity_value ......... 0
max_max_cardinality .... 1
total_overflow_size .... 0.00 KB
@@ -510,7 +506,7 @@ DESCRIPTION
TRAF_ALIGNED_ROW_FORMAT OFF
QUERY_CACHE ........ 1,024
MDAM_SCAN_METHOD ....... ON
- ObjectUIDs ............. 4453058303811968296
+ ObjectUIDs ............. 8861534267208413466
select_list ............ %(2), TRAFODION.SCH.T010T1.B
input_variables ........ %(2)
@@ -773,7 +769,7 @@ A B C D
------------------------------------------------------------------ PLAN SUMMARY
MODULE_NAME .............. DYNAMICALLY COMPILED
STATEMENT_NAME ........... X1
-PLAN_ID .................. 212356304714542757
+PLAN_ID .................. 212371182874064550
ROWS_OUT ................. 2
EST_TOTAL_COST ........... 0
STATEMENT ................ select *
@@ -792,7 +788,6 @@ DESCRIPTION
fragment_id ............ 0
parent_frag ............ (none)
fragment_type .......... master
- statement_index ........ 0
affinity_value ......... 0
max_max_cardinality .... 2
total_overflow_size .... 0.00 KB
@@ -817,7 +812,7 @@ DESCRIPTION
TRAF_ALIGNED_ROW_FORMAT OFF
QUERY_CACHE ........ 1,024
MDAM_SCAN_METHOD ....... ON
- ObjectUIDs ............. 4453058303811968703
+ ObjectUIDs ............. 8861534267208414002
select_list ............ TRAFODION.SCH.T010T2.A, %('a'), %(1),
TRAFODION.SCH.T010T2.D
input_variables ........ %('a'), %(1)
@@ -851,7 +846,7 @@ DESCRIPTION
------------------------------------------------------------------ PLAN SUMMARY
MODULE_NAME .............. DYNAMICALLY COMPILED
STATEMENT_NAME ........... X2
-PLAN_ID .................. 212356304714609170
+PLAN_ID .................. 212371182874153559
ROWS_OUT ................. 5
EST_TOTAL_COST ........... 0
STATEMENT ................ select *
@@ -871,7 +866,6 @@ DESCRIPTION
fragment_id ............ 0
parent_frag ............ (none)
fragment_type .......... master
- statement_index ........ 0
affinity_value ......... 0
max_max_cardinality .... 5
total_overflow_size .... 0.00 KB
@@ -896,7 +890,7 @@ DESCRIPTION
TRAF_ALIGNED_ROW_FORMAT OFF
QUERY_CACHE ........ 1,024
MDAM_SCAN_METHOD ....... ON
- ObjectUIDs ............. 4453058303811968703
+ ObjectUIDs ............. 8861534267208414002
select_list ............ TRAFODION.SCH.T010T2.A, %('a'),
TRAFODION.SCH.T010T2.C, TRAFODION.SCH.T010T2.D
input_variables ........ %('a')
@@ -931,7 +925,7 @@ DESCRIPTION
------------------------------------------------------------------ PLAN SUMMARY
MODULE_NAME .............. DYNAMICALLY COMPILED
STATEMENT_NAME ........... X3
-PLAN_ID .................. 212356304714682650
+PLAN_ID .................. 212371182874257819
ROWS_OUT ................. 4
EST_TOTAL_COST ........... 0
STATEMENT ................ select *
@@ -950,7 +944,6 @@ DESCRIPTION
fragment_id ............ 0
parent_frag ............ (none)
fragment_type .......... master
- statement_index ........ 0
affinity_value ......... 0
max_max_cardinality .... 4
total_overflow_size .... 0.00 KB
@@ -975,7 +968,7 @@ DESCRIPTION
TRAF_ALIGNED_ROW_FORMAT OFF
QUERY_CACHE ........ 1,024
MDAM_SCAN_METHOD ....... ON
- ObjectUIDs ............. 4453058303811968703
+ ObjectUIDs ............. 8861534267208414002
select_list ............ TRAFODION.SCH.T010T2.A, %('a'),
TRAFODION.SCH.T010T2.C, TRAFODION.SCH.T010T2.D
input_variables ........ %('a')
@@ -1010,7 +1003,7 @@ DESCRIPTION
------------------------------------------------------------------ PLAN SUMMARY
MODULE_NAME .............. DYNAMICALLY COMPILED
STATEMENT_NAME ........... X4
-PLAN_ID .................. 212356304714760334
+PLAN_ID .................. 212371182874350776
ROWS_OUT ................. 4
EST_TOTAL_COST ........... 0.01
STATEMENT ................ delete from t010t2
@@ -1028,7 +1021,6 @@ DESCRIPTION
fragment_id ............ 0
parent_frag ............ (none)
fragment_type .......... master
- statement_index ........ 0
affinity_value ......... 0
max_max_cardinality .... 4
total_overflow_size .... 0.00 KB
@@ -1054,7 +1046,7 @@ DESCRIPTION
TRAF_ALIGNED_ROW_FORMAT OFF
QUERY_CACHE ........ 1,024
MDAM_SCAN_METHOD ....... ON
- ObjectUIDs ............. 4453058303811968703
+ ObjectUIDs ............. 8861534267208414002
input_variables ........ %('a')
@@ -1118,7 +1110,7 @@ DESCRIPTION
------------------------------------------------------------------ PLAN SUMMARY
MODULE_NAME .............. DYNAMICALLY COMPILED
STATEMENT_NAME ........... X5
-PLAN_ID .................. 212356304714959599
+PLAN_ID .................. 212371182874559871
ROWS_OUT ................. 2
EST_TOTAL_COST ........... 0
STATEMENT ................ update t010t2
@@ -1138,7 +1130,6 @@ DESCRIPTION
fragment_id ............ 0
parent_frag ............ (none)
fragment_type .......... master
- statement_index ........ 0
affinity_value ......... 0
max_max_cardinality .... 2
total_overflow_size .... 0.00 KB
@@ -1164,7 +1155,7 @@ DESCRIPTION
TRAF_ALIGNED_ROW_FORMAT OFF
QUERY_CACHE ........ 1,024
MDAM_SCAN_METHOD ....... ON
- ObjectUIDs ............. 4453058303811968703
+ ObjectUIDs ............. 8861534267208414002
input_variables ........ %('upd'), %(4)
@@ -1191,7 +1182,7 @@ DESCRIPTION
------------------------------------------------------------------ PLAN SUMMARY
MODULE_NAME .............. DYNAMICALLY COMPILED
STATEMENT_NAME ........... Y1
-PLAN_ID .................. 212356304715042908
+PLAN_ID .................. 212371182874642434
ROWS_OUT ................. 2
EST_TOTAL_COST ........... 0
STATEMENT ................ select *
@@ -1210,7 +1201,6 @@ DESCRIPTION
fragment_id ............ 0
parent_frag ............ (none)
fragment_type .......... master
- statement_index ........ 0
affinity_value ......... 0
max_max_cardinality .... 2
total_overflow_size .... 0.00 KB
@@ -1236,7 +1226,7 @@ DESCRIPTION
QUERY_CACHE ........ 1,024
MDAM_SCAN_METHOD ....... ON
HBASE_MAX_NUM_SEARCH_KE 1
- ObjectUIDs ............. 4453058303811968703
+ ObjectUIDs ............. 8861534267208414002
select_list ............ TRAFODION.SCH.T010T2.A, %('a'), %(1),
TRAFODION.SCH.T010T2.D
input_variables ........ %('a'), %(1)
@@ -1270,7 +1260,7 @@ DESCRIPTION
------------------------------------------------------------------ PLAN SUMMARY
MODULE_NAME .............. DYNAMICALLY COMPILED
STATEMENT_NAME ........... Y2
-PLAN_ID .................. 212356304715100531
+PLAN_ID .................. 212371182874716809
ROWS_OUT ................. 5
EST_TOTAL_COST ........... 0
STATEMENT ................ select *
@@ -1290,7 +1280,6 @@ DESCRIPTION
fragment_id ............ 0
parent_frag ............ (none)
fragment_type .......... master
- statement_index ........ 0
affinity_value ......... 0
max_max_cardinality .... 5
total_overflow_size .... 0.00 KB
@@ -1316,7 +1305,7 @@ DESCRIPTION
QUERY_CACHE ........ 1,024
MDAM_SCAN_METHOD ....... ON
HBASE_MAX_NUM_SEARCH_KE 1
- ObjectUIDs ............. 4453058303811968703
+ ObjectUIDs ............. 8861534267208414002
select_list ............ TRAFODION.SCH.T010T2.A, %('a'),
TRAFODION.SCH.T010T2.C, TRAFODION.SCH.T010T2.D
input_variables ........ %('a')
@@ -1351,7 +1340,7 @@ DESCRIPTION
------------------------------------------------------------------ PLAN SUMMARY
MODULE_NAME .............. DYNAMICALLY COMPILED
STATEMENT_NAME ........... Y3
-PLAN_ID .................. 212356304715175937
+PLAN_ID .................. 212371182874808020
ROWS_OUT ................. 4
EST_TOTAL_COST ........... 0
STATEMENT ................ select *
@@ -1370,7 +1359,6 @@ DESCRIPTION
fragment_id ............ 0
parent_frag ............ (none)
fragment_type .......... master
- statement_index ........ 0
affinity_value ......... 0
max_max_cardinality .... 4
total_overflow_size .... 0.00 KB
@@ -1396,7 +1384,7 @@ DESCRIPTION
QUERY_CACHE ........ 1,024
MDAM_SCAN_METHOD ....... ON
HBASE_MAX_NUM_SEARCH_KE 1
- ObjectUIDs ............. 4453058303811968703
+ ObjectUIDs ............. 8861534267208414002
select_list ............ TRAFODION.SCH.T010T2.A, %('a'),
TRAFODION.SCH.T010T2.C, TRAFODION.SCH.T010T2.D
input_variables ........ %('a')
@@ -1431,7 +1419,7 @@ DESCRIPTION
------------------------------------------------------------------ PLAN SUMMARY
MODULE_NAME .............. DYNAMICALLY COMPILED
STATEMENT_NAME ........... Y4
-PLAN_ID .................. 212356304715268897
+PLAN_ID .................. 212371182874909059
ROWS_OUT ................. 4
EST_TOTAL_COST ........... 0.01
STATEMENT ................ delete from t010t2
@@ -1449,7 +1437,6 @@ DESCRIPTION
fragment_id ............ 0
parent_frag ............ (none)
fragment_type .......... master
- statement_index ........ 0
affinity_value ......... 0
max_max_cardinality .... 4
total_overflow_size .... 0.00 KB
@@ -1476,7 +1463,7 @@ DESCRIPTION
QUERY_CACHE ........ 1,024
MDAM_SCAN_METHOD ....... ON
HBASE_MAX_NUM_SEARCH_KE 1
- ObjectUIDs ............. 4453058303811968703
+ ObjectUIDs ............. 8861534267208414002
input_variables ........ %('a')
@@ -1540,7 +1527,7 @@ DESCRIPTION
------------------------------------------------------------------ PLAN SUMMARY
MODULE_NAME .............. DYNAMICALLY COMPILED
STATEMENT_NAME ........... Y5
-PLAN_ID .................. 212356304715430313
+PLAN_ID .................. 212371182875095004
ROWS_OUT ................. 2
EST_TOTAL_COST ........... 0
STATEMENT ................ update t010t2
@@ -1560,7 +1547,6 @@ DESCRIPTION
fragment_id ............ 0
parent_frag ............ (none)
fragment_type .......... master
- statement_index ........ 0
affinity_value ......... 0
max_max_cardinality .... 2
total_overflow_size .... 0.00 KB
@@ -1587,7 +1573,7 @@ DESCRIPTION
QUERY_CACHE ........ 1,024
MDAM_SCAN_METHOD ....... ON
HBASE_MAX_NUM_SEARCH_KE 1
- ObjectUIDs ............. 4453058303811968703
+ ObjectUIDs ............. 8861534267208414002
input_variables ........ %('uuu'), %(4)
@@ -1764,7 +1750,7 @@ _SALT_ A B C D
>>invoke t010t1;
-- Definition of Trafodion table TRAFODION.SCH.T010T1
--- Definition current Wed Mar 15 02:25:49 2017
+-- Definition current Sun Sep 3 07:15:05 2017
(
A INT NO DEFAULT NOT NULL NOT DROPPABLE
@@ -1777,7 +1763,7 @@ _SALT_ A B C D
>>invoke hbase."_CELL_"."TRAFODION.SCH.T010T1";
-- Definition of Trafodion table HBASE."_CELL_"."TRAFODION.SCH.T010T1"
--- Definition current Wed Mar 15 02:25:49 2017
+-- Definition current Sun Sep 3 07:15:06 2017
(
ROW_ID VARCHAR(10) CHARACTER SET ISO88591 COLLATE
@@ -1796,7 +1782,7 @@ _SALT_ A B C D
>>invoke hbase."_ROW_"."TRAFODION.SCH.T010T1";
-- Definition of Trafodion table HBASE."_ROW_"."TRAFODION.SCH.T010T1"
--- Definition current Wed Mar 15 02:25:49 2017
+-- Definition current Sun Sep 3 07:15:06 2017
(
ROW_ID VARCHAR(10) CHARACTER SET ISO88591 COLLATE
@@ -1927,7 +1913,7 @@ LC RC OP OPERATOR OPT DESCRIPTION CARD
------------------------------------------------------------------ PLAN SUMMARY
MODULE_NAME .............. DYNAMICALLY COMPILED
STATEMENT_NAME ........... XX
-PLAN_ID .................. 212356304751044503
+PLAN_ID .................. 212371182907907658
ROWS_OUT ................ 11
EST_TOTAL_COST ........... 0.01
STATEMENT ................ select * from t010t1 where a=1 or b='1';
@@ -1944,7 +1930,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
@@ -1969,7 +1954,7 @@ DESCRIPTION
TRAF_ALIGNED_ROW_FORMAT OFF
QUERY_CACHE ............ 0
MDAM_SCAN_METHOD ....... OFF
- ObjectUIDs ............. 4453058303811972377
+ ObjectUIDs ............. 8861534267208417374
select_list ............ TRAFODION.SCH.T010T1.A, TRAFODION.SCH.T010T1.B
@@ -2009,7 +1994,7 @@ DESCRIPTION
------------------------------------------------------------------ PLAN SUMMARY
MODULE_NAME .............. DYNAMICALLY COMPILED
STATEMENT_NAME ........... XX
-PLAN_ID .................. 212356304751132896
+PLAN_ID .................. 212371182907988752
ROWS_OUT ................. 1
EST_TOTAL_COST ........... 0.01
STATEMENT ................ select * from t010t1 where a=1 and b='1';
@@ -2027,7 +2012,6 @@ DESCRIPTION
fragment_id ............ 0
parent_frag ............ (none)
fragment_type .......... master
- statement_index ........ 0
affinity_value ......... 0
max_max_cardinality .... 1
total_overflow_size .... 0.00 KB
@@ -2052,7 +2036,7 @@ DESCRIPTION
TRAF_ALIGNED_ROW_FORMAT OFF
QUERY_CACHE ............ 0
MDAM_SCAN_METHOD ....... OFF
- ObjectUIDs ............. 4453058303811972377
+ ObjectUIDs ............. 8861534267208417374
select_list ............ 1, '1'
@@ -2090,7 +2074,7 @@ DESCRIPTION
------------------------------------------------------------------ PLAN SUMMARY
MODULE_NAME .............. DYNAMICALLY COMPILED
STATEMENT_NAME ........... XX
-PLAN_ID .................. 212356304751234081
+PLAN_ID .................. 212371182908067727
ROWS_OUT ................ 10
EST_TOTAL_COST ........... 0.01
STATEMENT ................ select * from t010t1 where b='1';
@@ -2107,7 +2091,6 @@ DESCRIPTION
fragment_id ............ 0
parent_frag ............ (none)
fragment_type .......... master
- statement_index ........ 0
affinity_value ......... 0
max_max_cardinality ... 10
total_overflow_size .... 0.00 KB
@@ -2132,7 +2115,7 @@ DESCRIPTION
TRAF_ALIGNED_ROW_FORMAT OFF
QUERY_CACHE ............ 0
MDAM_SCAN_METHOD ....... OFF
- ObjectUIDs ............. 4453058303811972377
+ ObjectUIDs ............. 8861534267208417374
select_list ............ TRAFODION.SCH.T010T1.A, '1'
@@ -2171,7 +2154,7 @@ DESCRIPTION
------------------------------------------------------------------ PLAN SUMMARY
MODULE_NAME .............. DYNAMICALLY COMPILED
STATEMENT_NAME ........... XX
-PLAN_ID .................. 212356304751352362
+PLAN_ID .................. 212371182908151747
ROWS_OUT ................. 1
EST_TOTAL_COST ........... 0.01
STATEMENT ................ select * from t010t1 where a=1;
@@ -2189,7 +2172,6 @@ DESCRIPTION
fragment_id ............ 0
parent_frag ............ (none)
fragment_type .......... master
- statement_index ........ 0
affinity_value ......... 0
max_max_cardinality .... 1
total_overflow_size .... 0.00 KB
@@ -2214,7 +2196,7 @@ DESCRIPTION
TRAF_ALIGNED_ROW_FORMAT OFF
QUERY_CACHE ............ 0
MDAM_SCAN_METHOD ....... OFF
- ObjectUIDs ............. 4453058303811972377
+ ObjectUIDs ............. 8861534267208417374
select_list ............ 1, TRAFODION.SCH.T010T1.B
@@ -2476,7 +2458,7 @@ A B C D
------------------------------------------------------------------ PLAN SUMMARY
MODULE_NAME .............. DYNAMICALLY COMPILED
STATEMENT_NAME ........... X1
-PLAN_ID .................. 212356304753693894
+PLAN_ID .................. 212371182910444555
ROWS_OUT ................. 2
EST_TOTAL_COST ........... 0.01
STATEMENT ................ select *
@@ -2495,7 +2477,6 @@ DESCRIPTION
fragment_id ............ 0
parent_frag ............ (none)
fragment_type .......... master
- statement_index ........ 0
affinity_value ......... 0
max_max_cardinality .... 2
total_overflow_size .... 0.00 KB
@@ -2520,7 +2501,7 @@ DESCRIPTION
TRAF_ALIGNED_ROW_FORMAT OFF
QUERY_CACHE ............ 0
MDAM_SCAN_METHOD ....... OFF
- ObjectUIDs ............. 4453058303811972619
+ ObjectUIDs ............. 8861534267208417710
select_list ............ TRAFODION.SCH.T010T2.A, 'a', 1,
TRAFODION.SCH.T010T2.D
@@ -2554,7 +2535,7 @@ DESCRIPTION
------------------------------------------------------------------ PLAN SUMMARY
MODULE_NAME .............. DYNAMICALLY COMPILED
STATEMENT_NAME ........... X2
-PLAN_ID .................. 212356304753750298
+PLAN_ID .................. 212371182910487314
ROWS_OUT ................. 5
EST_TOTAL_COST ........... 0.01
STATEMENT ................ select *
@@ -2574,7 +2555,6 @@ DESCRIPTION
fragment_id ............ 0
parent_frag ............ (none)
fragment_type .......... master
- statement_index ........ 0
affinity_value ......... 0
max_max_cardinality .... 5
total_overflow_size .... 0.00 KB
@@ -2599,7 +2579,7 @@ DESCRIPTION
TRAF_ALIGNED_ROW_FORMAT OFF
QUERY_CACHE ............ 0
MDAM_SCAN_METHOD ....... OFF
- ObjectUIDs ............. 4453058303811972619
+ ObjectUIDs ............. 8861534267208417710
select_list ............ TRAFODION.SCH.T010T2.A, 'a', TRAFODION.SCH.T010T2.C,
TRAFODION.SCH.T010T2.D
@@ -2646,7 +2626,7 @@ DESCRIPTION
------------------------------------------------------------------ PLAN SUMMARY
MODULE_NAME .............. DYNAMICALLY COMPILED
STATEMENT_NAME ........... X3
-PLAN_ID .................. 212356304753793359
+PLAN_ID .................. 212371182910529822
ROWS_OUT ................. 4
EST_TOTAL_COST ........... 0.01
STATEMENT ................ select *
@@ -2665,7 +2645,6 @@ DESCRIPTION
fragment_id ............ 0
parent_frag ............ (none)
fragment_type .......... master
- statement_index ........ 0
affinity_value ......... 0
max_max_cardinality .... 4
total_overflow_size .... 0.00 KB
@@ -2690,7 +2669,7 @@ DESCRIPTION
TRAF_ALIGNED_ROW_FORMAT OFF
QUERY_CACHE ............ 0
MDAM_SCAN_METHOD ....... OFF
- ObjectUIDs ............. 4453058303811972619
+ ObjectUIDs ............. 8861534267208417710
select_list ............ TRAFODION.SCH.T010T2.A, 'a', TRAFODION.SCH.T010T2.C,
TRAFODION.SCH.T010T2.D
@@ -2728,7 +2707,7 @@ DESCRIPTION
------------------------------------------------------------------ PLAN SUMMARY
MODULE_NAME .............. DYNAMICALLY COMPILED
STATEMENT_NAME ........... X4
-PLAN_ID .................. 212356304753832303
+PLAN_ID .................. 212371182910574355
ROWS_OUT ................. 4
EST_TOTAL_COST ........... 0.01
STATEMENT ................ delete from t010t2
@@ -2746,7 +2725,6 @@ DESCRIPTION
fragment_id ............ 0
parent_frag ............ (none)
fragment_type .......... master
- statement_index ........ 0
affinity_value ......... 0
max_max_cardinality .... 4
total_overflow_size .... 0.00 KB
@@ -2772,7 +2750,7 @@ DESCRIPTION
TRAF_ALIGNED_ROW_FORMAT OFF
QUERY_CACHE ............ 0
MDAM_SCAN_METHOD ....... OFF
- ObjectUIDs ............. 4453058303811972619
+ ObjectUIDs ............. 8861534267208417710
TUPLE_FLOW ================================ SEQ_NO 3 CHILDREN 1, 2
@@ -2839,7 +2817,7 @@ DESCRIPTION
------------------------------------------------------------------ PLAN SUMMARY
MODULE_NAME .............. DYNAMICALLY COMPILED
STATEMENT_NAME ........... X5
-PLAN_ID .................. 212356304753912740
+PLAN_ID .................. 212371182910674353
ROWS_OUT ................. 2
EST_TOTAL_COST ........... 0
STATEMENT ................ update t010t2
@@ -2859,7 +2837,6 @@ DESCRIPTION
fragment_id ............ 0
parent_frag ............ (none)
fragment_type .......... master
- statement_index ........ 0
affinity_value ......... 0
max_max_cardinality .... 2
total_overflow_size .... 0.00 KB
@@ -2885,7 +2862,7 @@ DESCRIPTION
TRAF_ALIGNED_ROW_FORMAT OFF
QUERY_CACHE ............ 0
MDAM_SCAN_METHOD ....... OFF
- ObjectUIDs ............. 4453058303811972619
+ ObjectUIDs ............. 8861534267208417710
TRAFODION_UPDATE ========================== SEQ_NO 1 NO CHILDREN
@@ -2915,7 +2892,7 @@ DESCRIPTION
------------------------------------------------------------------ PLAN SUMMARY
MODULE_NAME .............. DYNAMICALLY COMPILED
STATEMENT_NAME ........... Y1
-PLAN_ID .................. 212356304753990824
+PLAN_ID .................. 212371182910760217
ROWS_OUT ................. 2
EST_TOTAL_COST ........... 0.01
STATEMENT ................ select *
@@ -2934,7 +2911,6 @@ DESCRIPTION
fragment_id ............ 0
parent_frag ............ (none)
fragment_type .......... master
- statement_index ........ 0
affinity_value ......... 0
max_max_cardinality .... 2
total_overflow_size .... 0.00 KB
@@ -2960,7 +2936,7 @@ DESCRIPTION
QUERY_CACHE ............ 0
MDAM_SCAN_METHOD ....... OFF
HBASE_MAX_NUM_SEARCH_KE 1
- ObjectUIDs ............. 4453058303811972619
+ ObjectUIDs ............. 8861534267208417710
select_list ............ TRAFODION.SCH.T010T2.A, 'a', 1,
TRAFODION.SCH.T010T2.D
@@ -2995,7 +2971,7 @@ DESCRIPTION
------------------------------------------------------------------ PLAN SUMMARY
MODULE_NAME .............. DYNAMICALLY COMPILED
STATEMENT_NAME ........... Y2
-PLAN_ID .................. 212356304754029491
+PLAN_ID .................. 212371182910801321
ROWS_OUT ................. 5
EST_TOTAL_COST ........... 0.01
STATEMENT ................ select *
@@ -3015,7 +2991,6 @@ DESCRIPTION
fragment_id ............ 0
parent_frag ............ (none)
fragment_type .......... master
- statement_index ........ 0
affinity_value ......... 0
max_max_cardinality .... 5
total_overflow_size .... 0.00 KB
@@ -3041,7 +3016,7 @@ DESCRIPTION
QUERY_CACHE ............ 0
MDAM_SCAN_METHOD ....... OFF
HBASE_MAX_NUM_SEARCH_KE 1
- ObjectUIDs ............. 4453058303811972619
+ ObjectUIDs ............. 8861534267208417710
select_list ............ TRAFODION.SCH.T010T2.A, 'a', TRAFODION.SCH.T010T2.C,
TRAFODION.SCH.T010T2.D
@@ -3077,7 +3052,7 @@ DESCRIPTION
------------------------------------------------------------------ PLAN SUMMARY
MODULE_NAME .............. DYNAMICALLY COMPILED
STATEMENT_NAME ........... Y3
-PLAN_ID .................. 212356304754067803
+PLAN_ID .................. 212371182910844058
ROWS_OUT ................. 4
EST_TOTAL_COST ........... 0.01
STATEMENT ................ select *
@@ -3096,7 +3071,6 @@ DESCRIPTION
fragment_id ............ 0
parent_frag ............ (none)
fragment_type .......... master
- statement_index ........ 0
affinity_value ......... 0
max_max_cardinality .... 4
total_overflow_size .... 0.00 KB
@@ -3122,7 +3096,7 @@ DESCRIPTION
QUERY_CACHE ............ 0
MDAM_SCAN_METHOD ....... OFF
HBASE_MAX_NUM_SEARCH_KE 1
- ObjectUIDs ............. 4453058303811972619
+ ObjectUIDs ............. 8861534267208417710
select_list ............ TRAFODION.SCH.T010T2.A, 'a', TRAFODION.SCH.T010T2.C,
TRAFODION.SCH.T010T2.D
@@ -3158,7 +3132,7 @@ DESCRIPTION
------------------------------------------------------------------ PLAN SUMMARY
MODULE_NAME .............. DYNAMICALLY COMPILED
STATEMENT_NAME ........... Y4
-PLAN_ID .................. 212356304754107558
+PLAN_ID .................. 212371182910894572
ROWS_OUT ................. 4
EST_TOTAL_COST ........... 0.01
STATEMENT ................ delete from t010t2
@@ -3176,7 +3150,6 @@ DESCRIPTION
fragment_id ............ 0
parent_frag ............ (none)
fragment_type .......... master
- statement_index ........ 0
affinity_value ......... 0
max_max_cardinality .... 4
total_overflow_size .... 0.00 KB
@@ -3203,7 +3176,7 @@ DESCRIPTION
QUERY_CACHE ............ 0
MDAM_SCAN_METHOD ....... OFF
HBASE_MAX_NUM_SEARCH_KE 1
- ObjectUIDs ............. 4453058303811972619
+ ObjectUIDs ............. 8861534267208417710
TUPLE_FLOW ================================ SEQ_NO 3 CHILDREN 1, 2
@@ -3267,7 +3240,7 @@ DESCRIPTION
------------------------------------------------------------------ PLAN SUMMARY
MODULE_NAME .............. DYNAMICALLY COMPILED
STATEMENT_NAME ........... Y5
-PLAN_ID .................. 212356304754184445
+PLAN_ID .................. 212371182910991800
ROWS_OUT ................. 2
EST_TOTAL_COST ........... 0
STATEMENT ................ update t010t2
@@ -3287,7 +3260,6 @@ DESCRIPTION
fragment_id ............ 0
parent_frag ............ (none)
fragment_type .......... master
- statement_index ........ 0
affinity_value ......... 0
max_max_cardinality .... 2
total_overflow_size .... 0.00 KB
@@ -3314,7 +3286,7 @@ DESCRIPTION
QUERY_CACHE ............ 0
MDAM_SCAN_METHOD ....... OFF
HBASE_MAX_NUM_SEARCH_KE 1
- ObjectUIDs ............. 4453058303811972619
+ ObjectUIDs ............. 8861534267208417710
TRAFODION_UPDATE ========================== SEQ_NO 1 NO CHILDREN
@@ -3491,7 +3463,7 @@ _SALT_ A B C D
>>invoke t010t1;
-- Definition of Trafodion table TRAFODION.SCH.T010T1
--- Definition current Wed Mar 15 02:26:18 2017
+-- Definition current Sun Sep 3 07:15:35 2017
(
A INT NO DEFAULT NOT NULL NOT DROPPABLE
@@ -3504,7 +3476,7 @@ _SALT_ A B C D
>>invoke hbase."_CELL_"."TRAFODION.SCH.T010T1";
-- Definition of Trafodion table HBASE."_CELL_"."TRAFODION.SCH.T010T1"
--- Definition current Wed Mar 15 02:26:18 2017
+-- Definition current Sun Sep 3 07:15:35 2017
(
ROW_ID VARCHAR(10) CHARACTER SET ISO88591 COLLATE
@@ -3523,7 +3495,7 @@ _SALT_ A B C D
>>invoke hbase."_ROW_"."TRAFODION.SCH.T010T1";
-- Definition of Trafodion table HBASE."_ROW_"."TRAFODION.SCH.T010T1"
--- Definition current Wed Mar 15 02:26:18 2017
+-- Definition current Sun Sep 3 07:15:36 2017
(
ROW_ID VARCHAR(10) CHARACTER SET ISO88591 COLLATE
@@ -3654,7 +3626,7 @@ LC RC OP OPERATOR OPT DESCRIPTION CARD
------------------------------------------------------------------ PLAN SUMMARY
MODULE_NAME .............. DYNAMICALLY COMPILED
STATEMENT_NAME ........... XX
-PLAN_ID .................. 212356304779721578
+PLAN_ID .................. 212371182937604679
ROWS_OUT ................ 11
EST_TOTAL_COST ........... 0.01
STATEMENT ................ select * from t010t1 where a=1 or b='1';
@@ -3671,7 +3643,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
@@ -3696,7 +3667,7 @@ DESCRIPTION
TRAF_ALIGNED_ROW_FORMAT OFF
QUERY_CACHE ........ 1,024
MDAM_SCAN_METHOD ....... OFF
- ObjectUIDs ............. 4453058303811975304
+ ObjectUIDs ............. 8861534267208420341
select_list ............ TRAFODION.SCH.T010T1.A, TRAFODION.SCH.T010T1.B
@@ -3736,7 +3707,7 @@ DESCRIPTION
------------------------------------------------------------------ PLAN SUMMARY
MODULE_NAME .............. DYNAMICALLY COMPILED
STATEMENT_NAME ........... XX
-PLAN_ID .................. 212356304779821552
+PLAN_ID .................. 212371182937724275
ROWS_OUT ................. 1
EST_TOTAL_COST ........... 0.01
STATEMENT ................ select * from t010t1 where a=1 and b='1';
@@ -3754,7 +3725,6 @@ DESCRIPTION
fragment_id ............ 0
parent_frag ............ (none)
fragment_type .......... master
- statement_index ........ 0
affinity_value ......... 0
max_max_cardinality .... 1
total_overflow_size .... 0.00 KB
@@ -3779,7 +3749,7 @@ DESCRIPTION
TRAF_ALIGNED_ROW_FORMAT OFF
QUERY_CACHE ........ 1,024
MDAM_SCAN_METHOD ....... OFF
- ObjectUIDs ............. 4453058303811975304
+ ObjectUIDs ............. 8861534267208420341
select_list ............ %(1), %('1')
input_variables ........ %(1), %('1')
@@ -3818,7 +3788,7 @@ DESCRIPTION
------------------------------------------------------------------ PLAN SUMMARY
MODULE_NAME .............. DYNAMICALLY COMPILED
STATEMENT_NAME ........... XX
-PLAN_ID .................. 212356304779906972
+PLAN_ID .................. 212371182937835572
ROWS_OUT ................ 10
EST_TOTAL_COST ........... 0.01
STATEMENT ................ select * from t010t1 where b='1';
@@ -3835,7 +3805,6 @@ DESCRIPTION
fragment_id ............ 0
parent_frag ............ (none)
fragment_type .......... master
- statement_index ........ 0
affinity_value ......... 0
max_max_cardinality ... 10
total_overflow_size .... 0.00 KB
@@ -3860,7 +3829,7 @@ DESCRIPTION
TRAF_ALIGNED_ROW_FORMAT OFF
QUERY_CACHE ........ 1,024
MDAM_SCAN_METHOD ....... OFF
- ObjectUIDs ............. 4453058303811975304
+ ObjectUIDs ............. 8861534267208420341
select_list ............ TRAFODION.SCH.T010T1.A, %('1')
input_variables ........ %('1')
@@ -3900,7 +3869,7 @@ DESCRIPTION
------------------------------------------------------------------ PLAN SUMMARY
MODULE_NAME .............. DYNAMICALLY COMPILED
STATEMENT_NAME ........... XX
-PLAN_ID .................. 212356304778960764
+PLAN_ID .................. 212371182936838415
ROWS_OUT ................. 1
EST_TOTAL_COST ........... 0.01
STATEMENT ................ select * from t010t1 where a = 2;
@@ -3918,7 +3887,6 @@ DESCRIPTION
fragment_id ............ 0
parent_frag ............ (none)
fragment_type .......... master
- statement_index ........ 0
affinity_value ......... 0
max_max_cardinality .... 1
total_overflow_size .... 0.00 KB
@@ -3943,7 +3911,7 @@ DESCRIPTION
TRAF_ALIGNED_ROW_FORMAT OFF
QUERY_CACHE ........ 1,024
MDAM_SCAN_METHOD ....... OFF
- ObjectUIDs ............. 4453058303811975304
+ ObjectUIDs ............. 8861534267208420341
select_list ............ %(2), TRAFODION.SCH.T010T1.B
input_variables ........ %(2)
@@ -4206,7 +4174,7 @@ A B C D
------------------------------------------------------------------ PLAN SUMMARY
MODULE_NAME .............. DYNAMICALLY COMPILED
STATEMENT_NAME ........... X1
-PLAN_ID .................. 212356304782258948
+PLAN_ID .................. 212371182940175352
ROWS_OUT ................. 2
EST_TOTAL_COST ........... 0.01
STATEMENT ................ select *
@@ -4225,7 +4193,6 @@ DESCRIPTION
fragment_id ............ 0
parent_frag ............ (none)
fragment_type .......... master
- statement_index ........ 0
affinity_value ......... 0
max_max_cardinality .... 2
total_overflow_size .... 0.00 KB
@@ -4250,7 +4217,7 @@ DESCRIPTION
TRAF_ALIGNED_ROW_FORMAT OFF
QUERY_CACHE ........ 1,024
MDAM_SCAN_METHOD ....... OFF
- ObjectUIDs ............. 4453058303811975515
+ ObjectUIDs ............. 8861534267208420692
select_list ............ TRAFODION.SCH.T010T2.A, %('a'), %(1),
TRAFODION.SCH.T010T2.D
input_variables ........ %('a'), %(1)
@@ -4285,7 +4252,7 @@ DESCRIPTION
------------------------------------------------------------------ PLAN SUMMARY
MODULE_NAME .............. DYNAMICALLY COMPILED
STATEMENT_NAME ........... X2
-PLAN_ID .................. 212356304782305790
+PLAN_ID .................. 212371182940212922
ROWS_OUT ................. 5
EST_TOTAL_COST ........... 0.01
STATEMENT ................ select *
@@ -4305,7 +4272,6 @@ DESCRIPTION
fragment_id ............ 0
parent_frag ............ (none)
fragment_type .......... master
- statement_index ........ 0
affinity_value ......... 0
max_max_cardinality .... 5
total_overflow_size .... 0.00 KB
@@ -4330,7 +4296,7 @@ DESCRIPTION
TRAF_ALIGNED_ROW_FORMAT OFF
QUERY_CACHE ........ 1,024
MDAM_SCAN_METHOD ....... OFF
- ObjectUIDs ............. 4453058303811975515
+ ObjectUIDs ............. 8861534267208420692
select_list ............ TRAFODION.SCH.T010T2.A, %('a'),
TRAFODION.SCH.T010T2.C, TRAFODION.SCH.T010T2.D
input_variables ........ %('a')
@@ -4366,7 +4332,7 @@ DESCRIPTION
------------------------------------------------------------------ PLAN SUMMARY
MODULE_NAME .............. DYNAMICALLY COMPILED
STATEMENT_NAME ........... X3
-PLAN_ID .................. 212356304782347906
+PLAN_ID .................. 212371182940255134
ROWS_OUT ................. 4
EST_TOTAL_COST ........... 0.01
STATEMENT ................ select *
@@ -4385,7 +4351,6 @@ DESCRIPTION
fragment_id ............ 0
parent_frag ............ (none)
fragment_type .......... master
- statement_index ........ 0
affinity_value ......... 0
max_max_cardinality .... 4
total_overflow_size .... 0.00 KB
@@ -4410,7 +4375,7 @@ DESCRIPTION
TRAF_ALIGNED_ROW_FORMAT OFF
QUERY_CACHE ........ 1,024
MDAM_SCAN_METHOD ....... OFF
- ObjectUIDs ............. 4453058303811975515
+ ObjectUIDs ............. 8861534267208420692
select_list ............ TRAFODION.SCH.T010T2.A, %('a'),
TRAFODION.SCH.T010T2.C, TRAFODION.SCH.T010T2.D
input_variables ........ %('a')
@@ -4446,7 +4411,7 @@ DESCRIPTION
------------------------------------------------------------------ PLAN SUMMARY
MODULE_NAME .............. DYNAMICALLY COMPILED
STATEMENT_NAME ........... X4
-PLAN_ID .................. 212356304782399979
+PLAN_ID .................. 212371182940306145
ROWS_OUT ................. 4
EST_TOTAL_COST ........... 0.01
STATEMENT ................ delete from t010t2
@@ -4464,7 +4429,6 @@ DESCRIPTION
fragment_id ............ 0
parent_frag ............ (none)
fragment_type .......... master
- statement_index ........ 0
affinity_value ......... 0
max_max_cardinality .... 4
total_overflow_size .... 0.00 KB
@@ -4490,7 +4454,7 @@ DESCRIPTION
TRAF_ALIGNED_ROW_FORMAT OFF
QUERY_CACHE ........ 1,024
MDAM_SCAN_METHOD ....... OFF
- ObjectUIDs ............. 4453058303811975515
+ ObjectUIDs ............. 8861534267208420692
input_variables ........ %('a')
@@ -4554,7 +4518,7 @@ DESCRIPTION
------------------------------------------------------------------ PLAN SUMMARY
MODULE_NAME .............. DYNAMICALLY COMPILED
STATEMENT_NAME ........... X5
-PLAN_ID .................. 212356304782487785
+PLAN_ID .................. 212371182940487507
ROWS_OUT ................. 2
EST_TOTAL_COST ........... 0
STATEMENT ................ update t010t2
@@ -4574,7 +4538,6 @@ DESCRIPTION
fragment_id ............ 0
parent_frag ............ (none)
fragment_type .......... master
- statement_index ........ 0
affinity_value ......... 0
max_max_cardinality .... 2
total_overflow_size .... 0.00 KB
@@ -4600,7 +4563,7 @@ DESCRIPTION
TRAF_ALIGNED_ROW_FORMAT OFF
QUERY_CACHE ........ 1,024
MDAM_SCAN_METHOD ....... OFF
- ObjectUIDs ............. 4453058303811975515
+ ObjectUIDs ............. 8861534267208420692
input_variables ........ %('upd'), %(4)
@@ -4627,7 +4590,7 @@ DESCRIPTION
------------------------------------------------------------------ PLAN SUMMARY
MODULE_NAME .............. DYNAMICALLY COMPILED
STATEMENT_NAME ........... Y1
-PLAN_ID .................. 212356304782567336
+PLAN_ID .................. 212371182940578372
ROWS_OUT ................. 2
EST_TOTAL_COST ........... 0.01
STATEMENT ................ select *
@@ -4646,7 +4609,6 @@ DESCRIPTION
fragment_id ............ 0
parent_frag ............ (none)
fragment_type .......... master
- statement_index ........ 0
affinity_value ......... 0
max_max_cardinality .... 2
total_overflow_size .... 0.00 KB
@@ -4672,7 +4634,7 @@ DESCRIPTION
QUERY_CACHE ........ 1,024
MDAM_SCAN_METHOD ....... OFF
HBASE_MAX_NUM_SEARCH_KE 1
- ObjectUIDs ............. 4453058303811975515
+ ObjectUIDs ............. 8861534267208420692
select_list ............ TRAFODION.SCH.T010T2.A, %('a'), %(1),
TRAFODION.SCH.T010T2.D
input_variables ........ %('a'), %(1)
@@ -4707,7 +4669,7 @@ DESCRIPTION
------------------------------------------------------------------ PLAN SUMMARY
MODULE_NAME .............. DYNAMICALLY COMPILED
STATEMENT_NAME ........... Y2
-PLAN_ID .................. 212356304782607298
+PLAN_ID .................. 212371182940619202
ROWS_OUT ................. 5
EST_TOTAL_COST ........... 0.01
STATEMENT ................ select *
@@ -4727,7 +4689,6 @@ DESCRIPTION
fragment_id ............ 0
parent_frag ............ (none)
fragment_type .......... master
- statement_index ........ 0
affinity_value ......... 0
max_max_cardinality .... 5
total_overflow_size .... 0.00 KB
@@ -4753,7 +4714,7 @@ DESCRIPTION
QUERY_CACHE ........ 1,024
MDAM_SCAN_METHOD ....... OFF
HBASE_MAX_NUM_SEARCH_KE 1
- ObjectUIDs ............. 4453058303811975515
+ ObjectUIDs ............. 8861534267208420692
select_list ............ TRAFODION.SCH.T010T2.A, %('a'),
TRAFODION.SCH.T010T2.C, TRAFODION.SCH.T010T2.D
input_variables ........ %('a')
@@ -4789,7 +4750,7 @@ DESCRIPTION
------------------------------------------------------------------ PLAN SUMMARY
MODULE_NAME .............. DYNAMICALLY COMPILED
STATEMENT_NAME ........... Y3
-PLAN_ID .................. 212356304782645724
+PLAN_ID .................. 212371182940658230
ROWS_OUT ................. 4
EST_TOTAL_COST ........... 0.01
STATEMENT ................ select *
@@ -4808,7 +4769,6 @@ DESCRIPTION
fragment_id ............ 0
parent_frag ............ (none)
fragment_type .......... master
- statement_index ........ 0
affinity_value ......... 0
max_max_cardinality .... 4
total_overflow_size .... 0.00 KB
@@ -4834,7 +4794,7 @@ DESCRIPTION
QUERY_CACHE ........ 1,024
MDAM_SCAN_METHOD ....... OFF
HBASE_MAX_NUM_SEARCH_KE 1
- ObjectUIDs ............. 4453058303811975515
+ ObjectUIDs ............. 8861534267208420692
select_list ............ TRAFODION.SCH.T010T2.A, %('a'),
TRAFODION.SCH.T010T2.C, TRAFODION.SCH.T010T2.D
input_variables ........ %('a')
@@ -4870,7 +4830,7 @@ DESCRIPTION
------------------------------------------------------------------ PLAN SUMMARY
MODULE_NAME .............. DYNAMICALLY COMPILED
STATEMENT_NAME ........... Y4
-PLAN_ID .................. 212356304782694053
+PLAN_ID .................. 212371182940708419
ROWS_OUT ................. 4
EST_TOTAL_COST ........... 0.01
STATEMENT ................ delete from t010t2
@@ -4888,7 +4848,6 @@ DESCRIPTION
fragment_id ............ 0
parent_frag ............ (none)
fragment_type .......... master
- statement_index ........ 0
affinity_value ......... 0
max_max_cardinality .... 4
total_overflow_size .... 0.00 KB
@@ -4915,7 +4874,7 @@ DESCRIPTION
QUERY_CACHE ........ 1,024
MDAM_SCAN_METHOD ....... OFF
HBASE_MAX_NUM_SEARCH_KE 1
- ObjectUIDs ............. 4453058303811975515
+ ObjectUIDs ............. 8861534267208420692
input_variables ........ %('a')
@@ -4979,7 +4938,7 @@ DESCRIPTION
------------------------------------------------------------------ PLAN SUMMARY
MODULE_NAME .............. DYNAMICALLY COMPILED
STATEMENT_NAME ........... Y5
-PLAN_ID .................. 212356304782772302
+PLAN_ID .................. 212371182940807391
ROWS_OUT ................. 2
EST_TOTAL_COST ........... 0
STATEMENT ................ update t010t2
@@ -4999,7 +4958,6 @@ DESCRIPTION
fragment_id ............ 0
parent_frag ............ (none)
fragment_type .......... master
- statement_index ........ 0
affinity_value ......... 0
max_max_cardinality .... 2
total_overflow_size .... 0.00 KB
@@ -5026,7 +4984,7 @@ DESCRIPTION
QUERY_CACHE ........ 1,024
MDAM_SCAN_METHOD ....... OFF
HBASE_MAX_NUM_SEARCH_KE 1
- ObjectUIDs ............. 4453058303811975515
+ ObjectUIDs ............. 8861534267208420692
input_variables ........ %('uuu'), %(4)
@@ -5203,7 +5161,7 @@ _SALT_ A B C D
>>invoke t010t1;
-- Definition of Trafodion table TRAFODION.SCH.T010T1
--- Definition current Wed Mar 15 02:26:50 2017
+-- Definition current Sun Sep 3 07:16:06 2017
(
A INT NO DEFAULT NOT NULL NOT DROPPABLE
@@ -5216,7 +5174,7 @@ _SALT_ A B C D
>>invoke hbase."_CELL_"."TRAFODION.SCH.T010T1";
-- Definition of Trafodion table HBASE."_CELL_"."TRAFODION.SCH.T010T1"
--- Definition current Wed Mar 15 02:26:50 2017
+-- Definition current Sun Sep 3 07:16:06 2017
(
ROW_ID VARCHAR(10) CHARACTER SET ISO88591 COLLATE
@@ -5235,7 +5193,7 @@ _SALT_ A B C D
>>invoke hbase."_ROW_"."TRAFODION.SCH.T010T1";
-- Definition of Trafodion table HBASE."_ROW_"."TRAFODION.SCH.T010T1"
--- Definition current Wed Mar 15 02:26:50 2017
+-- Definition current Sun Sep 3 07:16:07 2017
(
ROW_ID VARCHAR(10) CHARACTER SET ISO88591 COLLATE
@@ -5366,7 +5324,7 @@ LC RC OP OPERATOR OPT DESCRIPTION CARD
------------------------------------------------------------------ PLAN SUMMARY
MODULE_NAME .............. DYNAMICALLY COMPILED
STATEMENT_NAME ........... XX
-PLAN_ID .................. 212356304812067827
+PLAN_ID .................. 212371182968766991
ROWS_OUT ................ 11
EST_TOTAL_COST ........... 0.01
STATEMENT ................ select * from t010t1 where a=1 or b='1';
@@ -5383,7 +5341,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
@@ -5408,7 +5365,7 @@ DESCRIPTION
TRAF_ALIGNED_ROW_FORMAT OFF
QUERY_CACHE ............ 0
MDAM_SCAN_METHOD ....... ON
- ObjectUIDs ............. 4453058303811978441
+ ObjectUIDs ............. 8861534267208423369
select_list ............ TRAFODION.SCH.T010T1.A, TRAFODION.SCH.T010T1.B
@@ -5448,7 +5405,7 @@ DESCRIPTION
------------------------------------------------------------------ PLAN SUMMARY
MODULE_NAME .............. DYNAMICALLY COMPILED
STATEMENT_NAME ........... XX
-PLAN_ID .................. 212356304812165826
+PLAN_ID .................. 212371182968849794
ROWS_OUT ................. 1
EST_TOTAL_COST ........... 0.01
STATEMENT ................ select * from t010t1 where a=1 and b='1';
@@ -5466,7 +5423,6 @@ DESCRIPTION
fragment_id ............ 0
parent_frag ............ (none)
fragment_type .......... master
- statement_index ........ 0
affinity_value ......... 0
max_max_cardinality .... 1
total_overflow_size .... 0.00 KB
@@ -5491,7 +5447,7 @@ DESCRIPTION
TRAF_ALIGNED_ROW_FORMAT OFF
QUERY_CACHE ............ 0
MDAM_SCAN_METHOD ....... ON
- ObjectUIDs ............. 4453058303811978441
+ ObjectUIDs ............. 8861534267208423369
select_list ............ 1, '1'
@@ -5529,7 +5485,7 @@ DESCRIPTION
------------------------------------------------------------------ PLAN SUMMARY
MODULE_NAME .............. DYNAMICALLY COMPILED
STATEMENT_NAME ........... XX
-PLAN_ID .................. 212356304812270202
+PLAN_ID .................. 212371182968944690
ROWS_OUT ................ 10
EST_TOTAL_COST ........... 0.01
STATEMENT ................ select * from t010t1 where b='1';
@@ -5546,7 +5502,6 @@ DESCRIPTION
fragment_id ............ 0
parent_frag ............ (none)
fragment_type .......... master
- statement_index ........ 0
affinity_value ......... 0
max_max_cardinality ... 10
total_overflow_size .... 0.00 KB
@@ -5571,7 +5526,7 @@ DESCRIPTION
TRAF_ALIGNED_ROW_FORMAT OFF
QUERY_CACHE ............ 0
MDAM_SCAN_METHOD ....... ON
- ObjectUIDs ............. 4453058303811978441
+ ObjectUIDs ............. 8861534267208423369
select_list ............ TRAFODION.SCH.T010T1.A, '1'
@@ -5610,7 +5565,7 @@ DESCRIPTION
------------------------------------------------------------------ PLAN SUMMARY
MODULE_NAME .............. DYNAMICALLY COMPILED
STATEMENT_NAME ........... XX
-PLAN_ID .................. 212356304812367499
+PLAN_ID .................. 212371182969035632
ROWS_OUT ................. 1
EST_TOTAL_COST ........... 0.01
STATEMENT ................ select * from t010t1 where a=1;
@@ -5628,7 +5583,6 @@ DESCRIPTION
fragment_id ............ 0
parent_frag ............ (none)
fragment_type .......... master
- statement_index ........ 0
affinity_value ......... 0
max_max_cardinality .... 1
total_overflow_size .... 0.00 KB
@@ -5653,7 +5607,7 @@ DESCRIPTION
TRAF_ALIGNED_ROW_FORMAT OFF
QUERY_CACHE ............ 0
MDAM_SCAN_METHOD ....... ON
- ObjectUIDs ............. 4453058303811978441
+ ObjectUIDs ............. 8861534267208423369
select_list ............ 1, TRAFODION.SCH.T010T1.B
@@ -5915,7 +5869,7 @@ A B C D
------------------------------------------------------------------ PLAN SUMMARY
MODULE_NAME .............. DYNAMICALLY COMPILED
STATEMENT_NAME ........... X1
-PLAN_ID .................. 212356304814574894
+PLAN_ID .................. 212371182971295321
ROWS_OUT ................. 2
EST_TOTAL_COST ........... 0
STATEMENT ................ select *
@@ -5934,7 +5888,6 @@ DESCRIPTION
fragment_id ............ 0
parent_frag ............ (none)
fragment_type .......... master
- statement_index ........ 0
affinity_value ......... 0
max_max_cardinality .... 2
total_overflow_size .... 0.00 KB
@@ -5959,7 +5912,7 @@ DESCRIPTION
TRAF_ALIGNED_ROW_FORMAT OFF
QUERY_CACHE ............ 0
MDAM_SCAN_METHOD ....... ON
- ObjectUIDs ............. 4453058303811978693
+ ObjectUIDs ............. 8861534267208423734
select_list ............ TRAFODION.SCH.T010T2.A, 'a', 1,
TRAFODION.SCH.T010T2.D
@@ -5992,7 +5945,7 @@ DESCRIPTION
------------------------------------------------------------------ PLAN SUMMARY
MODULE_NAME .............. DYNAMICALLY COMPILED
STATEMENT_NAME ........... X2
-PLAN_ID .................. 212356304814637647
+PLAN_ID .................. 212371182971376208
ROWS_OUT ................. 5
EST_TOTAL_COST ........... 0
STATEMENT ................ select *
@@ -6012,7 +5965,6 @@ DESCRIPTION
fragment_id ............ 0
parent_frag ............ (none)
fragment_type .......... master
- statement_index ........ 0
affinity_value ......... 0
max_max_cardinality .... 5
total_overflow_size .... 0.00 KB
@@ -6037,7 +5989,7 @@ DESCRIPTION
TRAF_ALIGNED_ROW_FORMAT OFF
QUERY_CACHE ............ 0
MDAM_SCAN_METHOD ....... ON
- ObjectUIDs ............. 4453058303811978693
+ ObjectUIDs ............. 8861534267208423734
select_list ............ TRAFODION.SCH.T010T2.A, 'a', TRAFODION.SCH.T010T2.C,
TRAFODION.SCH.T010T2.D
@@ -6071,7 +6023,7 @@ DESCRIPTION
------------------------------------------------------------------ PLAN SUMMARY
MODULE_NAME .............. DYNAMICALLY COMPILED
STATEMENT_NAME ........... X3
-PLAN_ID .................. 212356304814713897
+PLAN_ID .................. 212371182971470942
ROWS_OUT ................. 4
EST_TOTAL_COST ........... 0
STATEMENT ................ select *
@@ -6090,7 +6042,6 @@ DESCRIPTION
fragment_id ............ 0
parent_frag ............ (none)
fragment_type .......... master
- statement_index ........ 0
affinity_value ......... 0
max_max_cardinality .... 4
total_overflow_size .... 0.00 KB
@@ -6115,7 +6066,7 @@ DESCRIPTION
TRAF_ALIGNED_ROW_FORMAT OFF
QUERY_CACHE ............ 0
MDAM_SCAN_METHOD ....... ON
- ObjectUIDs ............. 4453058303811978693
+ ObjectUIDs ............. 8861534267208423734
select_list ............ TRAFODION.SCH.T010T2.A, 'a', TRAFODION.SCH.T010T2.C,
TRAFODION.SCH.T010T2.D
@@ -6149,7 +6100,7 @@ DESCRIPTION
------------------------------------------------------------------ PLAN SUMMARY
MODULE_NAME .............. DYNAMICALLY COMPILED
STATEMENT_NAME ........... X4
-PLAN_ID .................. 212356304814788364
+PLAN_ID .................. 212371182971557639
ROWS_OUT ................. 4
EST_TOTAL_COST ........... 0.01
STATEMENT ................ delete from t010t2
@@ -6167,7 +6118,6 @@ DESCRIPTION
fragment_id ............ 0
parent_frag ............ (none)
fragment_type .......... master
- statement_index ........ 0
affinity_value ......... 0
max_max_cardinality .... 4
total_overflow_size .... 0.00 KB
@@ -6193,7 +6143,7 @@ DESCRIPTION
TRAF_ALIGNED_ROW_FORMAT OFF
QUERY_CACHE ............ 0
MDAM_SCAN_METHOD ....... ON
- ObjectUIDs ............. 4453058303811978693
+ ObjectUIDs ............. 8861534267208423734
TUPLE_FLOW ================================ SEQ_NO 3 CHILDREN 1, 2
@@ -6256,7 +6206,7 @@ DESCRIPTION
------------------------------------------------------------------ PLAN SUMMARY
MODULE_NAME .............. DYNAMICALLY COMPILED
STATEMENT_NAME ........... X5
-PLAN_ID .................. 212356304814931991
+PLAN_ID .................. 212371182971723888
ROWS_OUT ................. 2
EST_TOTAL_COST ........... 0
STATEMENT ................ update t010t2
@@ -6276,7 +6226,6 @@ DESCRIPTION
fragment_id ............ 0
parent_frag ............ (none)
fragment_type .......... master
- statement_index ........ 0
affinity_value ......... 0
max_max_cardinality .... 2
total_overflow_size .... 0.00 KB
@@ -6302,7 +6251,7 @@ DESCRIPTION
TRAF_ALIGNED_ROW_FORMAT OFF
QUERY_CACHE ............ 0
MDAM_SCAN_METHOD ....... ON
- ObjectUIDs ............. 4453058303811978693
+ ObjectUIDs ............. 8861534267208423734
TRAFODION_UPDATE ========================== SEQ_NO 1 NO CHILDREN
@@ -6332,7 +6281,7 @@ DESCRIPTION
------------------------------------------------------------------ PLAN SUMMARY
MODULE_NAME .............. DYNAMICALLY COMPILED
STATEMENT_NAME ........... Y1
-PLAN_ID .................. 212356304814999113
+PLAN_ID .................. 212371182971801817
ROWS_OUT ................. 2
EST_TOTAL_COST ........... 0
STATEMENT ................ select *
@@ -6351,7 +6300,6 @@ DESCRIPTION
fragment_id ............ 0
parent_frag ............ (none)
fragment_type .......... master
- statement_index ........ 0
affinity_value ......... 0
max_max_cardinality .... 2
total_overflow_size .... 0.00 KB
@@ -6377,7 +6325,7 @@ DESCRIPTION
QUERY_CACHE ............ 0
MDAM_SCAN_METHOD ....... ON
HBASE_MAX_NUM_SEARCH_KE 1
- ObjectUIDs ............. 4453058303811978693
+ ObjectUIDs ............. 8861534267208423734
select_list ............ TRAFODION.SCH.T010T2.A, 'a', 1,
TRAFODION.SCH.T010T2.D
@@ -6410,7 +6358,7 @@ DESCRIPTION
------------------------------------------------------------------ PLAN SUMMARY
MODULE_NAME .............. DYNAMICALLY COMPILED
STATEMENT_NAME ........... Y2
-PLAN_ID .................. 212356304815058061
+PLAN_ID .................. 212371182971866281
ROWS_OUT ................. 5
EST_TOTAL_COST ........... 0
STATEMENT ................ select *
@@ -6430,7 +6378,6 @@ DESCRIPTION
fragment_id ............ 0
parent_frag ............ (none)
fragment_type .......... master
- statement_index ........ 0
affinity_value ......... 0
max_max_cardinality .... 5
total_overflow_size .... 0.00 KB
@@ -6456,7 +6403,7 @@ DESCRIPTION
QUERY_CACHE ............ 0
MDAM_SCAN_METHOD ....... ON
HBASE_MAX_NUM_SEARCH_KE 1
- ObjectUIDs ............. 4453058303811978693
+ ObjectUIDs ............. 8861534267208423734
select_list ............ TRAFODION.SCH.T010T2.A, 'a', TRAFODION.SCH.T010T2.C,
TRAFODION.SCH.T010T2.D
@@ -6490,7 +6437,7 @@ DESCRIPTION
------------------------------------------------------------------ PLAN SUMMARY
MODULE_NAME .............. DYNAMICALLY COMPILED
STATEMENT_NAME ........... Y3
-PLAN_ID .................. 212356304815129977
+PLAN_ID .................. 212371182971954454
ROWS_OUT ................. 4
EST_TOTAL_COST ........... 0
STATEMENT ................ select *
@@ -6509,7 +6456,6 @@ DESCRIPTION
fragment_id ............ 0
parent_frag ............ (none)
fragment_type .......... master
- statement_index ........ 0
affinity_value ......... 0
max_max_cardinality .... 4
total_overflow_size .... 0.00 KB
@@ -6535,7 +6481,7 @@ DESCRIPTION
QUERY_CACHE ............ 0
MDAM_SCAN_METHOD ....... ON
HBASE_MAX_NUM_SEARCH_KE 1
- ObjectUIDs ............. 4453058303811978693
+ ObjectUIDs ............. 8861534267208423734
select_list ............ TRAFODION.SCH.T010T2.A, 'a', TRAFODION.SCH.T010T2.C,
TRAFODION.SCH.T010T2.D
@@ -6569,7 +6515,7 @@ DESCRIPTION
------------------------------------------------------------------ PLAN SUMMARY
MODULE_NAME .............. DYNAMICALLY COMPILED
STATEMENT_NAME ........... Y4
-PLAN_ID .................. 212356304815206675
+PLAN_ID .................. 212371182972078318
ROWS_OUT ................. 4
EST_TOTAL_COST ........... 0.01
STATEMENT ................ delete from t010t2
@@ -6587,7 +6533,6 @@ DESCRIPTION
fragment_id ............ 0
parent_frag ............ (none)
fragment_type .......... master
- statement_index ........ 0
affinity_value ......... 0
max_max_cardinality .... 4
total_overflow_size .... 0.00 KB
@@ -6614,7 +6559,7 @@ DESCRIPTION
QUERY_CACHE ............ 0
MDAM_SCAN_METHOD ....... ON
HBASE_MAX_NUM_SEARCH_KE 1
- ObjectUIDs ............. 4453058303811978693
+ ObjectUIDs ............. 8861534267208423734
TUPLE_FLOW ================================ SEQ_NO 3 CHILDREN 1, 2
@@ -6677,7 +6622,7 @@ DESCRIPTION
------------------------------------------------------------------ PLAN SUMMARY
MODULE_NAME .............. DYNAMICALLY COMPILED
STATEMENT_NAME ........... Y5
-PLAN_ID .................. 212356304815341474
+PLAN_ID .................. 212371182972263598
ROWS_OUT ................. 2
EST_TOTAL_COST ........... 0
STATEMENT ................ update t010t2
@@ -6697,7 +6642,6 @@ DESCRIPTION
fragment_id ............ 0
parent_frag ............ (none)
fragment_type .......... master
- statement_index ........ 0
affinity_value ......... 0
max_max_cardinality .... 2
total_overflow_size .... 0.00 KB
@@ -6724,7 +6668,7 @@ DESCRIPTION
QUERY_CACHE ............ 0
MDAM_SCAN_METHOD ....... ON
HBASE_MAX_NUM_SEARCH_KE 1
- ObjectUIDs ............. 4453058303811978693
+ ObjectUIDs ............. 8861534267208423734
TRAFODION_UPDATE ========================== SEQ_NO 1 NO CHILDREN
@@ -6924,7 +6868,7 @@ _SALT_ A B C D
>>invoke t010t1;
-- Definition of Trafodion table TRAFODION.SCH.T010T1
--- Definition current Wed Mar 15 02:27:20 2017
+-- Definition current Sun Sep 3 07:16:38 2017
(
A INT NO DEFAULT NOT NULL NOT DROPPABLE
@@ -6937,7 +6881,7 @@ _SALT_ A B C D
>>invoke hbase."_CELL_"."TRAFODION.SCH.T010T1";
-- Definition of Trafodion table HBASE."_CELL_"."TRAFODION.SCH.T010T1"
--- Definition current Wed Mar 15 02:27:20 2017
+-- Definition current Sun Sep 3 07:16:38 2017
(
ROW_ID VARCHAR(10) CHARACTER SET ISO88591 COLLATE
@@ -6956,7 +6900,7 @@ _SALT_ A B C D
>>invoke hbase."_ROW_"."TRAFODION.SCH.T010T1";
-- Definition of Trafodion table HBASE."_ROW_"."TRAFODION.SCH.T010T1"
--- Definition current Wed Mar 15 02:27:20 2017
+-- Definition current Sun Sep 3 07:16:39 2017
(
ROW_ID VARCHAR(10) CHARACTER SET ISO88591 COLLATE
@@ -7087,7 +7031,7 @@ LC RC OP OPERATOR OPT DESCRIPTION CARD
------------------------------------------------------------------ PLAN SUMMARY
MODULE_NAME .............. DYNAMICALLY COMPILED
STATEMENT_NAME ........... XX
-PLAN_ID .................. 212356304841870306
+PLAN_ID .................. 212371183000667659
ROWS_OUT ................ 11
EST_TOTAL_COST ........... 0.01
STATEMENT ................ select * from t010t1 where a=1 or b='1';
@@ -7104,7 +7048,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
@@ -7129,7 +7072,7 @@ DESCRIPTION
TRAF_ALIGNED_ROW_FORMAT ON
QUERY_CACHE ........ 1,024
MDAM_SCAN_METHOD ....... ON
- ObjectUIDs ............. 4453058303811981438
+ ObjectUIDs ............. 8861534267208426637
select_list ............ TRAFODION.SCH.T010T1.A, TRAFODION.SCH.T010T1.B
@@ -7169,7 +7112,7 @@ DESCRIPTION
------------------------------------------------------------------ PLAN SUMMARY
MODULE_NAME .............. DYNAMICALLY COMPILED
STATEMENT_NAME ........... XX
-PLAN_ID .................. 212356304841968327
+PLAN_ID .................. 212371183000746918
ROWS_OUT ................. 1
EST_TOTAL_COST ........... 0.01
STATEMENT ................ select * from t010t1 where a=1 and b='1';
@@ -7187,7 +7130,6 @@ DESCRIPTION
fragment_id ............ 0
parent_frag ............ (none)
fragment_type .......... master
- statement_index ........ 0
affinity_value ......... 0
max_max_cardinality .... 1
total_overflow_size .... 0.00 KB
@@ -7212,7 +7154,7 @@ DESCRIPTION
TRAF_ALIGNED_ROW_FORMAT ON
QUERY_CACHE ........ 1,024
MDAM_SCAN_METHOD ....... ON
- ObjectUIDs ............. 4453058303811981438
+ ObjectUIDs ............. 8861534267208426637
select_list ............ %(1), %('1')
input_variables ........ %(1), %('1')
@@ -7251,7 +7193,7 @@ DESCRIPTION
------------------------------------------------------------------ PLAN SUMMARY
MODULE_NAME .............. DYNAMICALLY COMPILED
STATEMENT_NAME ........... XX
-PLAN_ID .................. 212356304842057826
+PLAN_ID .................. 212371183000843568
ROWS_OUT ................ 10
EST_TOTAL_COST ........... 0.01
STATEMENT ................ select * from t010t1 where b='1';
@@ -7268,7 +7210,6 @@ DESCRIPTION
fragment_id ............ 0
parent_frag ............ (none)
fragment_type .......... master
- statement_index ........ 0
affinity_value ......... 0
max_max_cardinality ... 10
total_overflow_size .... 0.00 KB
@@ -7293,7 +7234,7 @@ DESCRIPTION
TRAF_ALIGNED_ROW_FORMAT ON
QUERY_CACHE ........ 1,024
MDAM_SCAN_METHOD ....... ON
- ObjectUIDs ............. 4453058303811981438
+ ObjectUIDs ............. 8861534267208426637
select_list ............ TRAFODION.SCH.T010T1.A, %('1')
input_variables ........ %('1')
@@ -7333,7 +7274,7 @@ DESCRIPTION
------------------------------------------------------------------ PLAN SUMMARY
MODULE_NAME .............. DYNAMICALLY COMPILED
STATEMENT_NAME ........... XX
-PLAN_ID .................. 212356304841099325
+PLAN_ID .................. 212371182999882511
ROWS_OUT ................. 1
EST_TOTAL_COST ........... 0.01
STATEMENT ................ select * from t010t1 where a = 2;
@@ -7351,7 +7292,6 @@ DESCRIPTION
fragment_id ............ 0
parent_frag ............ (none)
fragment_type .......... master
- statement_index ........ 0
affinity_value ......... 0
max_max_cardinality .... 1
total_overflow_size .... 0.00 KB
@@ -7376,7 +7316,7 @@ DESCRIPTION
TRAF_ALIGNED_ROW_FORMAT ON
QUERY_CACHE ........ 1,024
MDAM_SCAN_METHOD ....... ON
- ObjectUIDs ............. 4453058303811981438
+ ObjectUIDs ............. 8861534267208426637
select_list ............ %(2), TRAFODION.SCH.T010T1.B
input_variables ........ %(2)
@@ -7639,7 +7579,7 @@ A B C D
------------------------------------------------------------------ PLAN SUMMARY
MODULE_NAME .............. DYNAMICALLY COMPILED
STATEMENT_NAME ........... X1
-PLAN_ID .................. 212356304844349013
+PLAN_ID .................. 212371183003187666
ROWS_OUT ................. 2
EST_TOTAL_COST ........... 0
STATEMENT ................ select *
@@ -7658,7 +7598,6 @@ DESCRIPTION
fragment_id ............ 0
parent_frag ............ (none)
fragment_type .......... master
- statement_index ........ 0
affinity_value ......... 0
max_max_cardinality .... 2
total_overflow_size .... 0.00 KB
@@ -7683,7 +7622,7 @@ DESCRIPTION
TRAF_ALIGNED_ROW_FORMAT ON
QUERY_CACHE ........ 1,024
MDAM_SCAN_METHOD ....... ON
- ObjectUIDs ............. 4453058303811981668
+ ObjectUIDs ............. 8861534267208427012
select_list ............ TRAFODION.SCH.T010T2.A, %('a'), %(1),
TRAFODION.SCH.T010T2.D
input_variables ........ %('a'), %(1)
@@ -7717,7 +7656,7 @@ DESCRIPTION
------------------------------------------------------------------ PLAN SUMMARY
MODULE_NAME .............. DYNAMICALLY COMPILED
STATEMENT_NAME ........... X2
-PLAN_ID .................. 212356304844409731
+PLAN_ID .................. 212371183003254442
ROWS_OUT ................. 5
EST_TOTAL_COST ........... 0
STATEMENT ................ select *
@@ -7737,7 +7676,6 @@ DESCRIPTION
fragment_id ............ 0
parent_frag ............ (none)
fragment_type .......... master
- statement_index ........ 0
affinity_value ......... 0
max_max_cardinality .... 5
total_overflow_size .... 0.00 KB
@@ -7762,7 +7700,7 @@ DESCRIPTION
TRAF_ALIGNED_ROW_FORMAT ON
QUERY_CACHE ........ 1,024
MDAM_SCAN_METHOD ....... ON
- ObjectUIDs ............. 4453058303811981668
+ ObjectUIDs ............. 8861534267208427012
select_list ............ TRAFODION.SCH.T010T2.A, %('a'),
TRAFODION.SCH.T010T2.C, TRAFODION.SCH.T010T2.D
input_variables ........ %('a')
@@ -7797,7 +7735,7 @@ DESCRIPTION
------------------------------------------------------------------ PLAN SUMMARY
MODULE_NAME .............. DYNAMICALLY COMPILED
STATEMENT_NAME ........... X3
-PLAN_ID .................. 212356304844484629
+PLAN_ID .................. 212371183003341083
ROWS_OUT ................. 4
EST_TOTAL_COST ........... 0
STATEMENT ................ select *
@@ -7816,7 +7754,6 @@ DESCRIPTION
fragment_id ............ 0
parent_frag ............ (none)
fragment_type .......... master
- statement_index ........ 0
affinity_value ......... 0
max_max_cardinality .... 4
total_overflow_size .... 0.00 KB
@@ -7841,7 +7778,7 @@ DESCRIPTION
TRAF_ALIGNED_ROW_FORMAT ON
QUERY_CACHE ........ 1,024
MDAM_SCAN_METHOD ....... ON
- ObjectUIDs ............. 4453058303811981668
+ ObjectUIDs ............. 8861534267208427012
select_list ............ TRAFODION.SCH.T010T2.A, %('a'),
TRAFODION.SCH.T010T2.C, TRAFODION.SCH.T010T2.D
input_variables ........ %('a')
@@ -7876,7 +7813,7 @@ DESCRIPTION
------------------------------------------------------------------ PLAN SUMMARY
MODULE_NAME .............. DYNAMICALLY COMPILED
STATEMENT_NAME ........... X4
-PLAN_ID .................. 212356304844560891
+PLAN_ID .................. 212371183003439919
ROWS_OUT ................. 4
EST_TOTAL_COST ........... 0.01
STATEMENT ................ delete from t010t2
@@ -7894,7 +7831,6 @@ DESCRIPTION
fragment_id ............ 0
parent_frag ............ (none)
fragment_type .......... master
- statement_index ........ 0
affinity_value ......... 0
max_max_cardinality .... 4
total_overflow_size .... 0.00 KB
@@ -7920,7 +7856,7 @@ DESCRIPTION
TRAF_ALIGNED_ROW_FORMAT ON
QUERY_CACHE ........ 1,024
MDAM_SCAN_METHOD ....... ON
- ObjectUIDs ............. 4453058303811981668
+ ObjectUIDs ............. 8861534267208427012
input_variables ........ %('a')
@@ -7984,7 +7920,7 @@ DESCRIPTION
------------------------------------------------------------------ PLAN SUMMARY
MODULE_NAME .............. DYNAMICALLY COMPILED
STATEMENT_NAME ........... X5
-PLAN_ID .................. 212356304844715624
+PLAN_ID .................. 212371183003603752
ROWS_OUT ................. 2
EST_TOTAL_COST ........... 0
STATEMENT ................ update t010t2
@@ -8004,7 +7940,6 @@ DESCRIPTION
fragment_id ............ 0
parent_frag ............ (none)
fragment_type .......... master
- statement_index ........ 0
affinity_value ......... 0
max_max_cardinality .... 2
total_overflow_size .... 0.00 KB
@@ -8030,7 +7965,7 @@ DESCRIPTION
TRAF_ALIGNED_ROW_FORMAT ON
QUERY_CACHE ........ 1,024
MDAM_SCAN_METHOD ....... ON
- ObjectUIDs ............. 4453058303811981668
+ ObjectUIDs ............. 8861534267208427012
input_variables ........ %('upd'), %(4)
@@ -8057,7 +7992,7 @@ DESCRIPTION
------------------------------------------------------------------ PLAN SUMMARY
MODULE_NAME .............. DYNAMICALLY COMPILED
STATEMENT_NAME ........... Y1
-PLAN_ID .................. 212356304844790614
+PLAN_ID .................. 212371183003680166
ROWS_OUT ................. 2
EST_TOTAL_COST ........... 0
STATEMENT ................ select *
@@ -8076,7 +8011,6 @@ DESCRIPTION
fragment_id ............ 0
parent_frag ............ (none)
fragment_type .......... master
- statement_index ........ 0
affinity_value ......... 0
max_max_cardinality .... 2
total_overflow_size .... 0.00 KB
@@ -8102,7 +8036,7 @@ DESCRIPTION
QUERY_CACHE ........ 1,024
MDAM_SCAN_METHOD ....... ON
HBASE_MAX_NUM_SEARCH_KE 1
- ObjectUIDs ............. 4453058303811981668
+ ObjectUIDs ............. 8861534267208427012
select_list ............ TRAFODION.SCH.T010T2.A, %('a'), %(1),
TRAFODION.SCH.T010T2.D
input_variables ........ %('a'), %(1)
@@ -8136,7 +8070,7 @@ DESCRIPTION
------------------------------------------------------------------ PLAN SUMMARY
MODULE_NAME .............. DYNAMICALLY COMPILED
STATEMENT_NAME ........... Y2
-PLAN_ID .................. 212356304844844169
+PLAN_ID .................. 212371183003746360
ROWS_OUT ................. 5
EST_TOTAL_COST ........... 0
STATEMENT ................ select *
@@ -8156,7 +8090,6 @@ DESCRIPTION
fragment_id ............ 0
parent_frag ............ (none)
fragment_type .......... master
- statement_index ........ 0
affinity_value ......... 0
max_max_cardinality .... 5
total_overflow_size .... 0.00 KB
@@ -8182,7 +8115,7 @@ DESCRIPTION
QUERY_CACHE ........ 1,024
MDAM_SCAN_METHOD ....... ON
HBASE_MAX_NUM_SEARCH_KE 1
- ObjectUIDs ............. 4453058303811981668
+ ObjectUIDs ............. 8861534267208427012
select_list ............ TRAFODION.SCH.T010T2.A, %('a'),
TRAFODION.SCH.T010T2.C, TRAFODION.SCH.T010T2.D
input_variables ........ %('a')
@@ -8217,7 +8150,7 @@ DESCRIPTION
------------------------------------------------------------------ PLAN SUMMARY
MODULE_NAME .............. DYNAMICALLY COMPILED
STATEMENT_NAME ........... Y3
-PLAN_ID .................. 212356304844914885
+PLAN_ID .................. 212371183003819034
ROWS_OUT ................. 4
EST_TOTAL_COST ........... 0
STATEMENT ................ select *
@@ -8236,7 +8169,6 @@ DESCRIPTION
fragment_id ............ 0
parent_frag ............ (none)
fragment_type .......... master
- statement_index ........ 0
affinity_value ......... 0
max_max_cardinality .... 4
total_overflow_size .... 0.00 KB
@@ -8262,7 +8194,7 @@ DESCRIPTION
QUERY_CACHE ........ 1,024
MDAM_SCAN_METHOD ....... ON
HBASE_MAX_NUM_SEARCH_KE 1
- ObjectUIDs ............. 4453058303811981668
+ ObjectUIDs ............. 8861534267208427012
select_list ............ TRAFODION.SCH.T010T2.A, %('a'),
TRAFODION.SCH.T010T2.C, TRAFODION.SCH.T010T2.D
input_variables ........ %('a')
@@ -8297,7 +8229,7 @@ DESCRIPTION
------------------------------------------------------------------ PLAN SUMMARY
MODULE_NAME .............. DYNAMICALLY COMPILED
STATEMENT_NAME ........... Y4
-PLAN_ID .................. 212356304844979384
+PLAN_ID .................. 212371183003896976
ROWS_OUT ................. 4
EST_TOTAL_COST ........... 0.01
STATEMENT ................ delete from t010t2
@@ -8315,7 +8247,6 @@ DESCRIPTION
fragment_id ............ 0
parent_frag ............ (none)
fragment_type .......... master
- statement_index ........ 0
affinity_value ......... 0
max_max_cardinality .... 4
total_overflow_size .... 0.00 KB
@@ -8342,7 +8273,7 @@ DESCRIPTION
QUERY_CACHE ........ 1,024
MDAM_SCAN_METHOD ....... ON
HBASE_MAX_NUM_SEARCH_KE 1
- ObjectUIDs ............. 4453058303811981668
+ ObjectUIDs ............. 8861534267208427012
input_variables ........ %('a')
@@ -8406,7 +8337,7 @@ DESCRIPTION
------------------------------------------------------------------ PLAN SUMMARY
MODULE_NAME .............. DYNAMICALLY COMPILED
STATEMENT_NAME ........... Y5
-PLAN_ID .................. 212356304845119317
+PLAN_ID .................. 212371183004084054
ROWS_OUT ................. 2
EST_TOTAL_COST ........... 0
STATEMENT ................ update t010t2
@@ -8426,7 +8357,6 @@ DESCRIPTION
fragment_id ............ 0
parent_frag ............ (none)
fragment_type .......... master
- statement_index ........ 0
affinity_value ......... 0
max_max_cardinality .... 2
total_overflow_size .... 0.00 KB
@@ -8453,7 +8383,7 @@ DESCRIPTION
QUERY_CACHE ........ 1,024
MDAM_SCAN_METHOD ....... ON
HBASE_MAX_NUM_SEARCH_KE 1
- ObjectUIDs ............. 4453058303811981668
+ ObjectUIDs ............. 8861534267208427012
input_variables ........ %('uuu'), %(4)
@@ -8630,7 +8560,7 @@ _SALT_ A B C D
>>invoke t010t1;
-- Definition of Trafodion table TRAFODION.SCH.T010T1
--- Definition current Wed Mar 15 02:27:48 2017
+-- Definition current Sun Sep 3 07:17:14 2017
(
A INT NO DEFAULT NOT NULL NOT DROPPABLE
@@ -8643,7 +8573,7 @@ _SALT_ A B C D
>>invoke hbase."_CELL_"."TRAFODION.SCH.T010T1";
-- Definition of Trafodion table HBASE."_CELL_"."TRAFODION.SCH.T010T1"
--- Definition current Wed Mar 15 02:27:48 2017
+-- Definition current Sun Sep 3 07:17:14 2017
(
ROW_ID VARCHAR(10) CHARACTER SET ISO88591 COLLATE
@@ -8662,7 +8592,7 @@ _SALT_ A B C D
>>invoke hbase."_ROW_"."TRAFODION.SCH.T010T1";
-- Definition of Trafodion table HBASE."_ROW_"."TRAFODION.SCH.T010T1"
--- Definition current Wed Mar 15 02:27:49 2017
+-- Definition current Sun Sep 3 07:17:15 2017
(
ROW_ID VARCHAR(10) CHARACTER SET ISO88591 COLLATE
@@ -8793,7 +8723,7 @@ LC RC OP OPERATOR OPT DESCRIPTION CARD
------------------------------------------------------------------ PLAN SUMMARY
MODULE_NAME .............. DYNAMICALLY COMPILED
STATEMENT_NAME ........... XX
-PLAN_ID .................. 212356304870397294
+PLAN_ID .................. 212371183036758320
ROWS_OUT ................ 11
EST_TOTAL_COST ........... 0.01
STATEMENT ................ select * from t010t1 where a=1 or b='1';
@@ -8810,7 +8740,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
@@ -8835,7 +8764,7 @@ DESCRIPTION
TRAF_ALIGNED_ROW_FORMAT ON
QUERY_CACHE ............ 0
MDAM_SCAN_METHOD ....... ON
- ObjectUIDs ............. 4453058303811984293
+ ObjectUIDs ............. 8861534267208430253
select_list ............ TRAFODION.SCH.T010T1.A, TRAFODION.SCH.T010T1.B
@@ -8875,7 +8804,7 @@ DESCRIPTION
------------------------------------------------------------------ PLAN SUMMARY
MODULE_NAME .............. DYNAMICALLY COMPILED
STATEMENT_NAME ........... XX
-PLAN_ID .................. 212356304870488453
+PLAN_ID .................. 212371183036836349
ROWS_OUT ................. 1
EST_TOTAL_COST ........... 0.01
STATEMENT ................ select * from t010t1 where a=1 and b='1';
@@ -8893,7 +8822,6 @@ DESCRIPTION
fragment_id ............ 0
parent_frag ............ (none)
fragment_type .......... master
- statement_index ........ 0
affinity_value ......... 0
max_max_cardinality .... 1
total_overflow_size .... 0.00 KB
@@ -8918,7 +8846,7 @@ DESCRIPTION
TRAF_ALIGNED_ROW_FORMAT ON
QUERY_CACHE ............ 0
MDAM_SCAN_METHOD ....... ON
- ObjectUIDs ............. 4453058303811984293
+ ObjectUIDs ............. 8861534267208430253
select_list ............ 1, '1'
@@ -8956,7 +8884,7 @@ DESCRIPTION
------------------------------------------------------------------ PLAN SUMMARY
MODULE_NAME .............. DYNAMICALLY COMPILED
STATEMENT_NAME ........... XX
-PLAN_ID .................. 212356304870577345
+PLAN_ID .................. 212371183036917671
ROWS_OUT ................ 10
EST_TOTAL_COST ........... 0.01
STATEMENT ................ select * from t010t1 where b='1';
@@ -8973,7 +8901,6 @@ DESCRIPTION
fragment_id ............ 0
parent_frag ............ (none)
fragment_type .......... master
- statement_index ........ 0
affinity_value ......... 0
max_max_cardinality ... 10
total_overflow_size .... 0.00 KB
@@ -8998,7 +8925,7 @@ DESCRIPTION
TRAF_ALIGNED_ROW_FORMAT ON
QUERY_CACHE ............ 0
MDAM_SCAN_METHOD ....... ON
- ObjectUIDs ............. 4453058303811984293
+ ObjectUIDs ............. 8861534267208430253
select_list ............ TRAFODION.SCH.T010T1.A, '1'
@@ -9037,7 +8964,7 @@ DESCRIPTION
------------------------------------------------------------------ PLAN SUMMARY
MODULE_NAME .............. DYNAMICALLY COMPILED
STATEMENT_NAME ........... XX
-PLAN_ID .................. 212356304870656226
+PLAN_ID .................. 212371183036997130
ROWS_OUT ................. 1
EST_TOTAL_COST ........... 0.01
STATEMENT ................ select * from t010t1 where a=1;
@@ -9055,7 +8982,6 @@ DESCRIPTION
fragment_id ............ 0
parent_frag ............ (none)
fragment_type .......... master
- statement_index ........ 0
affinity_value ......... 0
max_max_cardinality .... 1
total_overflow_size .... 0.00 KB
@@ -9080,7 +9006,7 @@ DESCRIPTION
TRAF_ALIGNED_ROW_FORMAT ON
QUERY_CACHE ............ 0
MDAM_SCAN_METHOD ....... ON
- ObjectUIDs ............. 4453058303811984293
+ ObjectUIDs ............. 8861534267208430253
select_list ............ 1, TRAFODION.SCH.T010T1.B
@@ -9342,7 +9268,7 @@ A B C D
------------------------------------------------------------------ PLAN SUMMARY
MODULE_NAME .............. DYNAMICALLY COMPILED
STATEMENT_NAME ........... X1
-PLAN_ID .................. 212356304872859573
+PLAN_ID .................. 212371183039142934
ROWS_OUT ................. 2
EST_TOTAL_COST ........... 0
STATEMENT ................ select *
@@ -9361,7 +9287,6 @@ DESCRIPTION
fragment_id ............ 0
parent_frag ............ (none)
fragment_type .......... master
- statement_index ........ 0
affinity_value ......... 0
max_max_cardinality .... 2
total_overflow_size .... 0.00 KB
@@ -9386,7 +9311,7 @@ DESCRIPTION
TRAF_ALIGNED_ROW_FORMAT ON
QUERY_CACHE ............ 0
MDAM_SCAN_METHOD ....... ON
- ObjectUIDs ............. 4453058303811984530
+ ObjectUIDs ............. 8861534267208430622
select_list ............ TRAFODION.SCH.T010T2.A, 'a', 1,
TRAFODION.SCH.T010T2.D
@@ -9419,7 +9344,7 @@ DESCRIPTION
------------------------------------------------------------------ PLAN SUMMARY
MODULE_NAME .............. DYNAMICALLY COMPILED
STATEMENT_NAME ........... X2
-PLAN_ID .................. 212356304872923669
+PLAN_ID .................. 212371183039200317
ROWS_OUT ................. 5
EST_TOTAL_COST ........... 0
STATEMENT ................ select *
@@ -9439,7 +9364,6 @@ DESCRIPTION
fragment_id ............ 0
parent_frag ............ (none)
fragment_type .......... master
- statement_index ........ 0
affinity_value ......... 0
max_max_cardinality .... 5
total_overflow_size .... 0.00 KB
@@ -9464,7 +9388,7 @@ DESCRIPTION
TRAF_ALIGNED_ROW_FORMAT ON
QUERY_CACHE ............ 0
MDAM_SCAN_METHOD ....... ON
- ObjectUIDs ............. 4453058303811984530
+ ObjectUIDs ............. 8861534267208430622
select_list ............ TRAFODION.SCH.T010T2.A, 'a', TRAFODION.SCH.T010T2.C,
TRAFODION.SCH.T010T2.D
@@ -9498,7 +9422,7 @@ DESCRIPTION
------------------------------------------------------------------ PLAN SUMMARY
MODULE_NAME .............. DYNAMICALLY COMPILED
STATEMENT_NAME ........... X3
-PLAN_ID .................. 212356304872999893
+PLAN_ID .................. 212371183039291236
ROWS_OUT ................. 4
EST_TOTAL_COST ........... 0
STATEMENT ................ select *
@@ -9517,7 +9441,6 @@ DESCRIPTION
fragment_id ............ 0
parent_frag ............ (none)
fragment_type .......... master
- statement_index ........ 0
affinity_value ......... 0
max_max_cardinality .... 4
total_overflow_size .... 0.00 KB
@@ -9542,7 +9465,7 @@ DESCRIPTION
TRAF_ALIGNED_ROW_FORMAT ON
QUERY_CACHE ............ 0
MDAM_SCAN_METHOD ....... ON
- ObjectUIDs ............. 4453058303811984530
+ ObjectUIDs ............. 8861534267208430622
select_list ............ TRAFODION.SCH.T010T2.A, 'a', TRAFODION.SCH.T010T2.C,
TRAFODION.SCH.T010T2.D
@@ -9576,7 +9499,7 @@ DESCRIPTION
------------------------------------------------------------------ PLAN SUMMARY
MODULE_NAME .............. DYNAMICALLY COMPILED
STATEMENT_NAME ........... X4
-PLAN_ID .................. 212356304873072049
+PLAN_ID .................. 212371183039376851
ROWS_OUT ................. 4
EST_TOTAL_COST ........... 0.01
STATEMENT ................ delete from t010t2
@@ -9594,7 +9517,6 @@ DESCRIPTION
fragment_id ............ 0
parent_frag ............ (none)
fragment_type .......... master
- statement_index ........ 0
affinity_value ......... 0
max_max_cardinality .... 4
total_overflow_size .... 0.00 KB
@@ -9620,7 +9542,7 @@ DESCRIPTION
TRAF_ALIGNED_ROW_FORMAT ON
QUERY_CACHE ............ 0
MDAM_SCAN_METHOD ....... ON
- ObjectUIDs ............. 4453058303811984530
+ ObjectUIDs ............. 8861534267208430622
TUPLE_FLOW ================================ SEQ_NO 3 CHILDREN 1, 2
@@ -9683,7 +9605,7 @@ DESCRIPTION
------------------------------------------------------------------ PLAN SUMMARY
MODULE_NAME .............. DYNAMICALLY COMPILED
STATEMENT_NAME ........... X5
-PLAN_ID .................. 212356304873229690
+PLAN_ID .................. 212371183039557017
ROWS_OUT ................. 2
EST_TOTAL_COST ........... 0
STATEMENT ................ update t010t2
@@ -9703,7 +9625,6 @@ DESCRIPTION
fragment_id ............ 0
parent_frag ............ (none)
fragment_type .......... master
- statement_index ........ 0
affinity_value ......... 0
max_max_cardinality .... 2
total_overflow_size .... 0.00 KB
@@ -9729,7 +9650,7 @@ DESCRIPTION
TRAF_ALIGNED_ROW_FORMAT ON
QUERY_CACHE ............ 0
MDAM_SCAN_METHOD ....... ON
- ObjectUIDs ............. 4453058303811984530
+ ObjectUIDs ............. 8861534267208430622
TRAFODION_UPDATE ========================== SEQ_NO 1 NO CHILDREN
@@ -9759,7 +9680,7 @@ DESCRIPTION
------------------------------------------------------------------ PLAN SUMMARY
MODULE_NAME .............. DYNAMICALLY COMPILED
STATEMENT_NAME ........... Y1
-PLAN_ID .................. 212356304873302029
+PLAN_ID .................. 212371183039638279
ROWS_OUT ................. 2
EST_TOTAL_COST ........... 0
STATEMENT ................ select *
@@ -9778,7 +9699,6 @@ DESCRIPTION
fragment_id ............ 0
parent_frag ............ (none)
fragment_type .......... master
- statement_index ........ 0
affinity_value ......... 0
max_max_cardinality .... 2
total_overflow_size .... 0.00 KB
@@ -9804,7 +9724,7 @@ DESCRIPTION
QUERY_CACHE ............ 0
MDAM_SCAN_METHOD ....... ON
HBASE_MAX_NUM_SEARCH_KE 1
- ObjectUIDs ............. 4453058303811984530
+ ObjectUIDs ............. 8861534267208430622
select_list ............ TRAFODION.SCH.T010T2.A, 'a', 1,
TRAFODION.SCH.T010T2.D
@@ -9837,7 +9757,7 @@ DESCRIPTION
------------------------------------------------------------------ PLAN SUMMARY
MODULE_NAME .............. DYNAMICALLY COMPILED
STATEMENT_NAME ........... Y2
-PLAN_ID .................. 212356304873366824
+PLAN_ID .................. 212371183039722473
ROWS_OUT ................. 5
EST_TOTAL_COST ........... 0
STATEMENT ................ select *
@@ -9857,7 +9777,6 @@ DESCRIPTION
fragment_id ............ 0
parent_frag ............ (none)
fragment_type .......... master
- statement_index ........ 0
affinity_value ......... 0
max_max_cardinality .... 5
total_overflow_size .... 0.00 KB
@@ -9883,7 +9802,7 @@ DESCRIPTION
QUERY_CACHE ............ 0
MDAM_SCAN_METHOD ....... ON
HBASE_MAX_NUM_SEARCH_KE 1
- ObjectUIDs ............. 4453058303811984530
+ ObjectUIDs ............. 8861534267208430622
select_list ............ TRAFODION.SCH.T010T2.A, 'a', TRAFODION.SCH.T010T2.C,
TRAFODION.SCH.T010T2.D
@@ -9917,7 +9836,7 @@ DESCRIPTION
------------------------------------------------------------------ PLAN SUMMARY
MODULE_NAME .............. DYNAMICALLY COMPILED
STATEMENT_NAME ........... Y3
-PLAN_ID .................. 212356304873437012
+PLAN_ID .................. 212371183039825762
ROWS_OUT ................. 4
EST_TOTAL_COST ........... 0
STATEMENT ................ select *
@@ -9936,7 +9855,6 @@ DESCRIPTION
fragment_id ............ 0
parent_frag ............ (none)
fragment_type .......... master
- statement_index ........ 0
affinity_value ......... 0
max_max_cardinality .... 4
total_overflow_size .... 0.00 KB
@@ -9962,7 +9880,7 @@ DESCRIPTION
QUERY_CACHE ............ 0
MDAM_SCAN_METHOD ....... ON
HBASE_MAX_NUM_SEARCH_KE 1
- ObjectUIDs ............. 4453058303811984530
+ ObjectUIDs ............. 8861534267208430622
select_list ............ TRAFODION.SCH.T010T2.A, 'a', TRAFODION.SCH.T010T2.C,
TRAFODION.SCH.T010T2.D
@@ -9996,7 +9914,7 @@ DESCRIPTION
------------------------------------------------------------------ PLAN SUMMARY
MODULE_NAME .............. DYNAMICALLY COMPILED
STATEMENT_NAME ........... Y4
-PLAN_ID .................. 212356304873513284
+PLAN_ID .................. 212371183039915766
ROWS_OUT ................. 4
EST_TOTAL_COST ........... 0.01
STATEMENT ................ delete from t010t2
@@ -10014,7 +9932,6 @@ DESCRIPTION
fragment_id ............ 0
parent_frag ............ (none)
fragment_type .......... master
- statement_index ........ 0
affinity_value ......... 0
max_max_cardinality .... 4
total_overflow_size .... 0.00 KB
@@ -10041,7 +9958,7 @@ DESCRIPTION
QUERY_CACHE ............ 0
MDAM_SCAN_METHOD ....... ON
HBASE_MAX_NUM_SEARCH_KE 1
- ObjectUIDs ............. 4453058303811984530
+ ObjectUIDs ............. 8861534267208430622
TUPLE_FLOW ================================ SEQ_NO 3 CHILDREN 1, 2
@@ -10104,7 +10021,7 @@ DESCRIPTION
------------------------------------------------------------------ PLAN SUMMARY
MODULE_NAME .............. DYNAMICALLY COMPILED
STATEMENT_NAME ........... Y5
-PLAN_ID .................. 212356304873668121
+PLAN_ID .................. 212371183040097697
ROWS_OUT ................. 2
EST_TOTAL_COST ........... 0
STATEMENT ................ update t010t2
@@ -10124,7 +10041,6 @@ DESCRIPTION
fragment_id ............ 0
parent_frag ............ (none)
fragment_type .......... master
- statement_index ........ 0
affinity_value ......... 0
max_max_cardinality .... 2
total_ove
<TRUNCATED>
[25/30] incubator-trafodion git commit: TRAFODION-2731 CodeCleanup:
Remove obsolete, legacy and unused code
Posted by an...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/cli/NoWaitOp.cpp
----------------------------------------------------------------------
diff --git a/core/sql/cli/NoWaitOp.cpp b/core/sql/cli/NoWaitOp.cpp
index 8430d85..f6dc8d2 100644
--- a/core/sql/cli/NoWaitOp.cpp
+++ b/core/sql/cli/NoWaitOp.cpp
@@ -203,18 +203,7 @@ RETCODE NoWaitOp::awaitIox(Lng32 * tag)
rc = SUCCESS;
}
} // end if rc != NOT_FINISHED
- // update Measure elapsed time if Measure enabled.
- if (stmt_->getRootTdb() &&
- ((ComTdb*)stmt_->getRootTdb())->getCollectStatsType() ==
- ComTdb::MEASURE_STATS &&
- stmt_->getGlobals()->getStatsArea() != NULL)
- {
- if (stmt_->getGlobals()->getStatsArea()->getStmtCntrs() != NULL)
- {
- stmt_->getGlobals()->getStatsArea()->getStmtCntrs()->
- incElapseBusyTime(NA_JulianTimestamp() - startTime);
- }
- }
+
}
if (rc != NOT_FINISHED && op_ == FETCH_CLOSE)
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/cli/SQLCLIdev.h
----------------------------------------------------------------------
diff --git a/core/sql/cli/SQLCLIdev.h b/core/sql/cli/SQLCLIdev.h
index 9ef68b8..438b052 100644
--- a/core/sql/cli/SQLCLIdev.h
+++ b/core/sql/cli/SQLCLIdev.h
@@ -49,32 +49,19 @@ class ComTdb;
class ExStatisticsArea;
// For internal use only -- do not document!
-SQLCLI_LIB_FUNC Lng32 SQL_EXEC_AttachCodeToStatement_Internal(
- /*IN*/ SQLSTMT_ID * statement_id,
- /*IN*/ ComDiagsArea & comDiagsArea,
- /*IN*/ char *generated_code,
- /*IN*/ ULng32 generated_code_length);
-
-SQLCLI_LIB_FUNC Lng32 SQL_EXEC_DropModule (
- /*IN*/ SQLMODULE_ID * module_name);
-
-// For internal use only -- do not document!
-SQLCLI_LIB_FUNC Lng32 SQL_EXEC_IsTransactionStarted_Internal();
-
-// For internal use only -- do not document!
-SQLCLI_LIB_FUNC void SQL_EXEC_SetParserFlagsForExSqlComp_Internal(
+void SQL_EXEC_SetParserFlagsForExSqlComp_Internal(
/*IN*/ ULng32 flagbits);
// For internal use only -- do not document!
-SQLCLI_LIB_FUNC Lng32 SQL_EXEC_SetParserFlagsForExSqlComp_Internal2(
+Lng32 SQL_EXEC_SetParserFlagsForExSqlComp_Internal2(
/*IN*/ ULng32 flagbits);
// For internal use only -- do not document!
-SQLCLI_LIB_FUNC void SQL_EXEC_ResetParserFlagsForExSqlComp_Internal(
+void SQL_EXEC_ResetParserFlagsForExSqlComp_Internal(
/*IN*/ ULng32 flagbits);
// For internal use only -- do not document!
-SQLCLI_LIB_FUNC Lng32 SQL_EXEC_ResetParserFlagsForExSqlComp_Internal2(
+Lng32 SQL_EXEC_ResetParserFlagsForExSqlComp_Internal2(
/*IN*/ ULng32 flagbits);
Lng32 SQL_EXEC_AssignParserFlagsForExSqlComp_Internal(
@@ -83,108 +70,8 @@ Lng32 SQL_EXEC_AssignParserFlagsForExSqlComp_Internal(
Lng32 SQL_EXEC_GetParserFlagsForExSqlComp_Internal(
/*IN*/ ULng32 &flagbits);
-// For internal use only -- do not document!
-SQLCLI_LIB_FUNC short SQL_EXEC_GetDefaultVolume_Internal(
- /*OUT*/ char outBuf[],
- /*IN */ const short outBufMaxLen, // NULL-terminated
- /*OUT*/ short &defaultVolLen);
-
-// For internal use only -- do not document!
-SQLCLI_LIB_FUNC Lng32
-SQL_EXEC_GetListOfAuditedVolumes_Internal(
- /*INOUT*/ char **volNames,
- /*INOUT*/ Lng32 *numOfVols);
-
-// For internal use only -- do not document!
-SQLCLI_LIB_FUNC const char *const *const
- SQL_EXEC_GetListOfVolumes_Internal();
-
-
-SQLCLI_LIB_FUNC Lng32
-SQL_EXEC_GetNumOfQualifyingVolumes_Internal(
- /*IN */ const char *nodeName,
- /*INOUT*/ Lng32 *numOfVols);
-
-SQLCLI_LIB_FUNC Lng32
-SQL_EXEC_GetListOfQualifyingVolumes_Internal(/*IN*/ const char *nodeName,
- /*IN*/ Lng32 numOfVols,
- /*OUT*/ char **volNames,
- /*OUT*/ Lng32 *cpuNums,
- /*OUT*/ Lng32 *capacities,
- /*OUT*/ Lng32 *freespaces,
- /*OUT*/ Lng32 *largestFragments);
-
-// For internal use only -- do not document!
-//
-// returns TRUE if the specified Guardian volume is up and
-// would be useful for creating MX objects; returns FALSE otherwise.
-//
-// FILE_GETINFOLISTBYNAME_ is used to obtain information about the
-// parameter volume, which can be local or remote. Any error from
-// FILE_GETINFOLISTBYNAME_ will cause FALSE to be returned.
-//
-// If FILE_GETINFOLISTBYNAME_ completes successfully, the following
-// checks are performed
-// - the volume must be a volume (doh!) The device type is checked,
-// and must have the value 3
-// - the volume must be a physical volume. The device subtype is
-// checked, it cannot be 36 (SMF volume) or 52 (OSF)
-// - the volume must be a TMF datavol.
-//
-// When FALSE is returned, the fileSystemError parameter will
-// have one of the following values
-//
-// fileSystemError Means ...
-// --------------- ------------------------------------------
-// 2 (FEINVALOP) The volume is not a physical volume
-// 80 (FEAUDITINVALOP) The volume is not audited
-// other FS error Examples are 14 (device does not exist) and
-// 66 (device is down)
-//
-SQLCLI_LIB_FUNC Lng32 SQL_EXEC_IsVolumeUseful_Internal(
- /* IN*/ const char *const volName, // NULL-terminated
- /*OUT*/ short &fileSystemError);
-
-// For internal use only -- do not document!
-//
-// returns pointer pointing to the Tandem System Volume name
-// (NULL-terminated) cached in the Executor dynamic global
-// memory area. Returns NULL if cannot get the name (after
-// logging an error message in the Windows NT Even log).
-//
-SQLCLI_LIB_FUNC Lng32 SQL_EXEC_GetSystemVolume_Internal(
- /*INOUT*/ char * SMDlocation);
-
-// For internal use only -- do not document!
-//
-// returns pointer pointing to the Tandem System Volume name
-// (NULL-terminated) from any accessible NSK node. Returns
-// local node's System Volume name if nodeName param is passed
-// in as null. On NT, if the nodeName param is any of null, "NSK"
-// or "\NSK", this function returns local node's System Volume name.
-// Return value is 0, -EXE_NAME_MAPPING_BAD_ANCHOR (-8303), or
-// -EXE_NAME_MAPPING_FS_ERROR. In the latter case, the feError param
-// is used to return the original FS error.
-//
-SQLCLI_LIB_FUNC Lng32 SQL_EXEC_GetRemoteSystemVolume_Internal(
- /*INOUT*/ char *SMDlocation,
- /*IN*/ const char *nodeName,
- /*INOUT*/ Lng32 *fsError);
-
-// For internal use only -- do not document
-// A new CLI call to allow catman to specify the the CLI which version of compiler
-// to use to prepare a query. The caller can specify either a node name or a version but
-// not both. If both are specified an error will be returned.
-
-
-SQLCLI_LIB_FUNC Lng32 SQL_EXEC_SetCompilerVersion_Internal( short mxcmpVersionToUse, char *nodeName);
-
-SQLCLI_LIB_FUNC Lng32 SQL_EXEC_GetCompilerVersion_Internal( short &mxcmpVersionToUse, char *nodeName);
-
-
-
-SQLCLI_LIB_FUNC Lng32 SQL_EXEC_GetTotalTcbSpace(char*tdb, char*otherInfo);
+Lng32 SQL_EXEC_GetTotalTcbSpace(char*tdb, char*otherInfo);
// For internal use only -- do not document!
// This method returns the type of stats that were collected.
@@ -200,9 +87,8 @@ enum SQLCLIDevCollectStatsType
{
SQLCLIDEV_SAME_STATS = SQLCLI_SAME_STATS,
SQLCLIDEV_NO_STATS = SQLCLI_NO_STATS,
- SQLCLIDEV_MEASURE_STATS = SQLCLI_MEASURE_STATS, // collect statistics for measure counters
- SQLCLIDEV_ACCUMULATED_STATS = SQLCLI_ACCUMULATED_STATS, // collect accumulated stats. Same as measure.
- SQLCLIDEV_PERTABLE_STATS = SQLCLI_PERTABLE_STATS, // collect same stats that were collected in sql/mp on a per table basis
+ SQLCLIDEV_ACCUMULATED_STATS = SQLCLI_ACCUMULATED_STATS, // collect accumulated stats.
+ SQLCLIDEV_PERTABLE_STATS = SQLCLI_PERTABLE_STATS, // collect stats on a per table basis
SQLCLIDEV_ALL_STATS = SQLCLI_ALL_STATS, // collect all stats about all exe operators
SQLCLIDEV_OPERATOR_STATS = SQLCLI_OPERATOR_STATS // collect all stats but merge at
// operator(tdb) granularity.
@@ -219,7 +105,7 @@ enum SQLATTRHOLDABLE_INTERNAL_TYPE
SQLCLIDEV_PUBSUB_HOLDABLE = 3
};
-SQLCLI_LIB_FUNC Lng32 SQL_EXEC_GetCollectStatsType_Internal(
+Lng32 SQL_EXEC_GetCollectStatsType_Internal(
/*OUT*/ ULng32 * collectStatsType,
/*IN*/ SQLSTMT_ID * statement_id);
@@ -229,7 +115,7 @@ SQLCLI_LIB_FUNC Lng32 SQL_EXEC_GetCollectStatsType_Internal(
// if propagate is set to 1, then propagate environment to mxcmp now.
// Otherwise, set them in internal cli globals so they could be propagated
// the next time mxcmp is started.
-SQLCLI_LIB_FUNC Lng32 SQL_EXEC_SetEnviron_Internal(/*IN*/Lng32 propagate);
+Lng32 SQL_EXEC_SetEnviron_Internal(/*IN*/Lng32 propagate);
#ifndef NO_SQLCLIDEV_INCLUDES
#include "sql_charset_strings.h"
@@ -327,18 +213,14 @@ enum UDRErrorFlag {
SQLUDR_XACT_ABORT = 0x10 /* transaction was aborted */
};
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_GetUdrErrorFlags_Internal(/*OUT*/ Lng32 *udrErrorFlags);
/* returns a bitmap vector of flags defined in enum UDRErrorFlag */
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_ResetUdrErrorFlags_Internal();
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_SetUdrAttributes_Internal(/*IN*/ Lng32 sqlAccessMode,
/*IN*/ Lng32 /* for future use */);
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_SetUdrRuntimeOptions_Internal(/*IN*/ const char *options,
/*IN*/ ULng32 optionsLen,
/*IN*/ const char *delimiters,
@@ -346,7 +228,6 @@ Lng32 SQL_EXEC_SetUdrRuntimeOptions_Internal(/*IN*/ const char *options,
// For internal use only -- do not document!
// This method sets flag in CliGlobal to enable break handling.
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_BreakEnabled_Internal(/*IN*/ UInt32 enabled );
// For internal use only -- do not document!
@@ -354,17 +235,14 @@ Lng32 SQL_EXEC_BreakEnabled_Internal(/*IN*/ UInt32 enabled );
// received while executing a stored proc. It also resets this
// flag. This flag is used by mxci to display the appropriate break error
// message for operations that require the RECOVER command to be run.
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_SPBreakReceived_Internal(/*OUT*/ UInt32 *breakRecvd);
// For internal use only -- do not document!
// This method merges the CLI diags area into the caller's diags area
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_MergeDiagnostics_Internal (/*INOUT*/ ComDiagsArea & newDiags);
// For internal use only -- do not document!
// This method returns the CLI diags area in packed format
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_GetPackedDiagnostics_Internal(
/*OUT*/ char * message_buffer_ptr,
/*IN*/ ULng32 message_obj_size,
@@ -390,7 +268,6 @@ enum SQLCLIDevVersionType
SQLCLIDEV_MODULE_VPROC_VERSION = 6
};
-SQLCLI_LIB_FUNC
Lng32 SQL_EXEC_GetVersion_Internal
(/*IN*/ Lng32 versionType,
/*OUT*/ Lng32 * versionValue,
@@ -398,515 +275,11 @@ Lng32 SQL_EXEC_GetVersion_Internal
/*IN OPTIONAL*/ const SQLMODULE_ID * module_name,
/*IN OPTIONAL*/ const SQLSTMT_ID * statement_id);
-/******************************************************************
- * Procedures to support TMFARLB2 features for SQL/MX tables *
- ******************************************************************/
-
#ifdef __cplusplus
/* use C linkage */
extern "C" {
#endif
-#define MXARLibCurrentVersion 1200
-
-/* note that the following structures will work with any alignment
- directive, they are designed not to have any implicit fillers */
-
-#define MXARLibAuditParamsFillerSize 88
-
-typedef struct MXARLibAuditParamsStruct
-{
- /*****************************************************************
-
- version_ interface version, this field should be set to
- MXARLibCurrentVersion. If the version of the
- caller does not match the version of the SQL/MX
- procedures, an error may get returned (or the
- procedures may handle the older version
- correctly in some cases). The versioning scheme
- here is a "lazy" scheme that avoids changing the
- version number until the length or non-filler
- fields of the structure change.
-
- guardianName_ Pointer to a Guardian name with fully qualified
- Volume, subvolume, and file name. The system
- name is optional and must be the local system
- if provided.
-
- guardianNameLen_ Length of the Guardian name that is passed in
- (bytes).
-
- modifiedFieldMap_ Pointer to an optional ModifiedFieldMap structure
- (declared here as a char pointer to avoid
- dependencies on other include files), set
- to NULL (0) if this parameter is not present.
-
- modifiedFieldMapLen_ Length of the optional modified field map
- structure (in bytes) or 0.
-
- encodedKey_ The encoded key of the record or a NULL (0)
- pointer. This parameter is optional and is
- not used in R2 EAP. It may at some point be
- used to return key columns that are otherwise
- not contained in the audit record.
-
- encodedKeyLen_ Length of the encoded key (in bytes) or 0 or -1.
- If set to -1, the auditImage_ buffer is
- assumed to contain the encoded key and the
- after and/or before audit image(s) in a
- contiguous block, starting at the address
- encodedKey_. The entire block has to be
- contained in the address range auditImage_
- to auditImage_ + auditImageLen_.
-
- auditImage_ Pointer to a before or after image or a NULL
- (0) pointer. The image must be for the table
- specified in guardianName, and this must be
- an SQL/MX table that exists and has the same
- column layout as at the time when the audit
- record was created. An error or invalid data
- may be returned otherwise.
-
- auditImageLen_ Length of the audit image that is passed in
- (bytes).
-
- sqlmxAuditVersion_ Version of the SQL/MX audit image format. This
- version is passed in by the caller to make
- sure that the generated audit can be
- intepreted by this version of the software.
-
- crvsn_ CRVSN from the audit record, or zero. If non-zero
- then the value is compared against the CRVSN of
- the table and an error is returned if the two do
- not match. If zero then the CRVSN check is
- bypassed.
-
- filler_ For future additions. The caller must
- initialize the filler space with zeroes.
-
- ******************************************************************
- */
-
- Lng32 version_;
- const char *guardianName_;
- Lng32 guardianNameLen_;
- const char *modifiedFieldMap_;
- Lng32 modifiedFieldMapLen_;
- const char *encodedKey_;
- Lng32 encodedKeyLen_;
- const char *auditImage_;
- Lng32 auditImageLen_;
- Lng32 sqlmxAuditVersion_;
-
- _int64 crvsn_;
-
- char filler_[MXARLibAuditParamsFillerSize];
-
-} MXARLibAuditParams;
-
-
-typedef struct MXARLibColumnInfoStruct
-{
- /*****************************************************************
-
- columnNum_ Column number (same as in SQL/MX metadata tables).
- User column numbers start with 1, the SYSKEY
- column is column #0.
-
- columnAnsiType_ ANSI type code for the data type of the column.
- See table 18 in the ANSI SQL92 standard.
-
- columnFsType_ FS data type of the column. See file
- sqlcli.h for the _SQLDT_* defines that describe
- the codes returned here.
-
- keyField_ Set to -1 if this column is not part of the
- clustering key, set to the key column position
- otherwise (first column is column #0).
-
- dataOffset_ Offset in bytes of the data portion of this
- column. Note that the data portion does not
- include the null indicator or the varchar
- length.
-
- dataLength_ Length in bytes of the data portion of this
- column. The data portion will occupy <dataLength_>
- bytes, starting at offset <dataOffset_>.
-
- nullIndOffset_ Offset of the NULL indicator of this column
- in bytes. This value is undefined if the
- column is not nullable.
-
- nullIndLength_ Length in bytes of the NULL indicator of this
- column. The length is 0 if the column is not
- nullable. Otherwise, the NULL indicator will
- occupy <nullIndLength> bytes, starting at
- offset <nullIndOffset>. Note that the NULL
- indicator may or may not be adjacent to the
- data portion of the column. This value could
- be 0, 2, 4, or 8.
-
- VarLenOffset_ Similar to the NULL indicator, this
- describes the offset of the length indicator
- for varchars (and maybe other variable-length
- columns in the future). This value is undefined
- if the column does not have a variable length
- indicator.
-
- varLenLength_ Size (length) in bytes of the variable length
- indicator. This value could be 0, 2, 4, or 8.
- A value of 0 indicates that the column does not
- have a variable length indicator.
-
- datetimeIntCode_ Detailed information on datetime or interval
- ANSI datatypes. See Tables 19 and 20 in the
- ANSI SQL92 standard or see the SQLDTCODE_ and
- SQLINTCODE_ constants defined in file sqlcli.h.
-
- datetimeFsCode_ A more detailed description if <columnFsType> has
- the value 192 (_SQLDT_DATETIME). Other interfaces
- such as GET DESCRIPTOR sometimes return this
- information as the "precision" of a datetime
- value. Here in the MXARLIB interface this value is
- NOT returned in the precision field. See the
- SQLDTCODE_* constants defined in file sqlcli.h for
- the values returned. This value is undefined if
- <columnFsType> is not _SQLDT_DATETIME.
-
- Currently this value is always equal to
- datetimeIntCode_. If we ever implement time zones
- we may have to return different codes, since
- SQL/MP uses some of the ANSI values for time zones
- for its own datatypes.
-
- leadingPrecision_ This value is only set for interval data types
- and indicates the precision of the leading part
- of the interval (years, months, etc.).
-
- precision_ The precision (number of significant decimal
- digits) for numeric values.
-
- scale_ The scale (decimal digits after the decimal point)
- for numeric values. For interval, time and
- timestamp columns, this is the "fraction
- precision", the precision of fractional
- seconds (a value between 0 for whole
- seconds and 6 for microsecond resolution).
-
- characterSet_ Character set for a character column. See
- SQLCHARSETCODE_ literals in file sqlcli.h.
-
- futureCollation_ a literal identifying the collation of a
- character column, should collations be
- supported in Release 2.
-
- filler_ for future column attributes, initialized to 0.
-
- To ensure upward-compatibility, please do not make assumptions on
- how information gets returned. For example, the following
- assumptions should NOT be made:
- - Assuming that the offsets in the columns are in ascending order
- - Assuming that the null indicator offset, varlen offset and
- data offset are within a contiguous range without intervening
- fillers or data from other columns
- - Assuming that the data in the image buffer is "dense",
- meaning that there are no unused spaces in it
- - Assuming that the first field in the record starts at a fixed
- offset
- - Assuming that the values of nullIndLength_ and varLenLength_
- are fixed at 2 and 4, respectively, if non-zero
- - Assuming that fields in the image buffer that are not described
- by an MXARLibColumnInfo structure are set to any given value
-
- ******************************************************************
- */
-
- Lng32 columnNum_;
- Lng32 columnAnsiType_;
- Lng32 columnFsType_;
- Lng32 keyField_;
- Lng32 dataOffset_;
- Lng32 dataLength_;
- Lng32 nullIndOffset_;
- Lng32 nullIndLength_;
- Lng32 varLenOffset_;
- Lng32 varLenLength_;
- Lng32 datetimeIntCode_;
- Lng32 datetimeFsCode_;
- Lng32 leadingPrecision_;
- Lng32 precision_;
- Lng32 scale_;
- Lng32 characterSet_;
- Lng32 futureCollation_;
- char filler_[20];
-} MXARLibColumnInfo;
-
-
-
-
-
-/*******************************************************************
- Container for MXARLibColumnInfo structs
-
- ColumnCount_ Number of MXARLibColumnInfo structs present
-
- EncodedKeyLength_ Length of the encoded key for this table
- (needed more for internal reasons than for
- customers), probably not returned by TMFARLB2
-
-********************************************************************
-*/
-typedef struct MXARLibImageInfoStruct
-{
- Lng32 columnCount_;
- Lng32 encodedKeyLength_;
- char filler_[120];
- MXARLibColumnInfo columnInfoArray_[1];
-} MXARLibImageInfo;
-
-
-
-
-
-/*******************************************************************
- Get before image data for a given audit record
-
- return code out: FEOK or FE error number if the call is
- not successful. NOTE: This procedure does not
- return SQLCODE values nor does it set the
- SQL diagnostics area.
- Other possible error codes:
- FENOTFOUND: underlying SQL/MX object
- not found
- more errors to be added.
-
- arlibParams in: Guardian name, audit record, and
- global parameters
-
- requestBitmap in: Requested columns bitmap. One bit is set
- to 1 for each requested column. Bits
- that don't correspond to any column
- are ignored, so that the caller can
- just pass a longer array initialized
- with all 1 bits if desired.
-
- replyBitmap out: Bitmap for returned columns, one bit
- is set for each returned column in the
- image.
-
- bitmapLength in: Length of request and reply bitmaps in
- bytes.
-
- imageBuffer out: Buffer with "presentation format" of
- the before or after image
-
- imageBufferLength in: Allocated length of imageBuffer
-
- endImageDataOffset out: Length of the area in the image buffer
- that contains valid data (in bytes).
-
- replyHint out: Highest column number for which data was
- returned, if this procedure completes
- successfully. Otherwise, if FEBUFTOOSMALL
- is returned as an error, then the
- reply hint contains the needed size
- of imageBuffer.
-
-********************************************************************
-*/
-SQLCLI_LIB_FUNC short SQL_MXARLIB_FETCHBEFOREDATA(
- MXARLibAuditParams *arlibParams,
- const Lng32 *requestBitmap,
- Lng32 *replyBitmap,
- Lng32 bitmapLength,
- Lng32 *imageBuffer, // $$$$ Int64??
- Lng32 imageBufferLength,
- Lng32 *endImageDataOffset,
- Lng32 *replyHint);
-
-
-/*******************************************************************
- Get after image for a given audit record
- Same parameters as SQL_MXARLIB_FETCHBEFOREDATA
-*/
-SQLCLI_LIB_FUNC short SQL_MXARLIB_FETCHAFTERDATA(
- MXARLibAuditParams *arlibParams,
- const Lng32 *requestBitmap,
- Lng32 *replyBitmap,
- Lng32 bitmapLength,
- Lng32 *imageBuffer, // $$$$ Int64
- Lng32 imageBufferLength,
- Lng32 *endImageDataOffset,
- Lng32 *replyHint);
-
-
-
-/*******************************************************************
- Get information on the column layout of an SQL/MX table
-
- return code out: FEOK or FE error number if the call is
- not successful. NOTE: This procedure does not
- return SQLCODE values nor does it set the
- SQL diagnostics area.
- Other possible error codes:
- FENOTFOUND: underlying SQL/MX object
- not found
- more errors to be added.
-
- guardianName in: Physical Guardian name of a
- partition of the table for which info
- is to be retrieved
-
- infoBuffer out: Buffer with record information
-
- infoBufferLength in: allocated length of infoBuffer
- in bytes
-
- imageBufferLengthNeeded out: needed length for the
- imageBuffer used in a subsequent
- call to SQL_MXARLIB_FETCHxxxDATA
- (in bytes).
-
- replyHint out: This parameter indicates the needed length
- (in bytes) for infoBuffer. If the needed
- length for infoBuffer
- is greater than infoBufferLength
- then error FEBUFTOOSMALL is returned
- and this parameter indicates the smallest
- acceptable value for infoBufferLength.
-
-********************************************************************
-*/
-SQLCLI_LIB_FUNC short SQL_MXARLIB_GETCOLUMNINFO(
- const char *guardianName,
- Lng32 guardianNameLen,
- MXARLibImageInfo *infoBuffer,
- Lng32 infoBufferLength,
- Lng32 *imageBufferLengthNeeded,
- Lng32 *replyHint);
-
-
-/*******************************************************************
- Invalidate an entry in the cache of table information that the
- CLI maintains.
-
- return code out: FEOK or FE error number if the call is
- not successful.
- guardianName in: physical Guardian name of a partition which
- should be invalidated in the cache. All
- other partitions of the same file may be
- invalidated as well.
- guardianNameLen in: length of Guardian name passed in
-********************************************************************
-*/
-SQLCLI_LIB_FUNC short SQL_MXARLIB_INVALTABLEINFOCACHE(
- const char *guardianName,
- Lng32 guardianNameLen);
-
-
-/*******************************************************************
- Set the size of the cache of table information that the CLI
- maintains. This procedure should be called before any other
- CLI calls described in this section are made, but doing so is
- optional. If this method is not called before any of the calls
- that use the cache, then some default values for the cache size
- and the expiration time are assumed.
-
- return code out: FEOK or FE error number if the call is
- not successful.
- cacheSize in: Size of an internal cache (in megabytes)
- that is used to store information about
- columns, partitions, and ANSI names of
- SQL/MX tables used in the CLI procedures.
-
- cacheInvTimeout in: Time (in centiseconds) for which we will
- consider a cache entry valid. The timeout
- may be 0. If a cache entry has not been
- verified for longer than the timeout, the
- procedures will verify it again, using a
- comparison of the redefinition timestamp.
- In case the redefinition timestamp does
- not match, the cache entry will be
- invalidated.
-********************************************************************
-*/
-SQLCLI_LIB_FUNC short SQL_MXARLIB_SETTABLEINFOCACHE(
- Lng32 cacheSize,
- Lng32 cacheInvTimeout);
-
-
-/*******************************************************************
- Return the ANSI name that corresponds to the
- Guardian name passed in
-
- return code out: FEOK or FE error number if the call is
- not successful. NOTE: This procedure does not
- return SQLCODE values nor does it set the
- SQL diagnostics area.
- Other possible error codes:
- FENOTFOUND: underlying SQL/MX object
- not found
- more errors to be added.
-
- guardianName in: Physcical (non-SMF) Guardian name
- to be resolved. The name is in external
- format, partially or fully qualified.
-
- guardianNameLen in: Length of Guardian name passed in in bytes.
-
- ansiName out: Buffer for the returned ANSI name in external
- form. ANSI names in their external form are no
- longer than776 bytes (3 times 258 bytes for
- catalog, schema, and name, plus two dots).
-
- ansiNameMaxLength in: Max. length of buffer for ANSI name.
-
- returnedAnsiNameLength out: Length of returned ANSI name. If the length
- is greater than ansiNameLength, then an error
- is also returned, the name is truncated, and
- this parameter indicates the needed length.
-
- nameSpace out: A pointer to a two-character buffer (to be
- allocated by the caller) in which the name
- space of the ANSI name will be returned.
- Current name spaces are:
- "TA" Base table
- "IX" Index
- "IL" Log table for Materialized Views
- "RL" Range log table for Materialized Views
- "TT" Trigger temp table
- " " Unknown name space (e. g. Resource fork)
-
- partitionName An identifier of the partition of the table,
- index, etc. (if applicable). A partition name
- can be used for TMF recovery operations on
- particular table partitions if the user wants
- to specify ANSI names for these partitions.
- The partition name should never be longer than
- 128 bytes. This parameter is optional, no
- partition information will be returned if it
- is set to a NULL pointer (0).
-
- partitionNameMaxLength Length of the buffer allocated for the
- partition name.
-
- returnedPartitionNameLength actual length of the returned
- partition identifier. Optional parameter, can
- be set to a NULL pointer (0).
-
-********************************************************************
-*/
-SQLCLI_LIB_FUNC short SQL_MXARLIB_GETANSINAME(
- const char *guardianName, /* in: Guardian name */
- Lng32 guardianNameLen, /* in: lenght of name */
- char *ansiName, /* out: ANSI name */
- Lng32 ansiNameMaxLength, /* in: len of buffer */
- Lng32 *returnedAnsiNameLength, /* out: len of name */
- char *nameSpace, /* out: table/index/etc. */
- char *partitionName, /* out: partition ident. */
- Lng32 partitionNameMaxLength, /* in: length of buffer */
- Lng32 *returnedPartitionNameLength); /* out: p name len */
-
Lng32 SQL_EXEC_GetAuthID(
const char * authName,
Lng32 & authID);
@@ -917,30 +290,30 @@ Lng32 SQL_EXEC_GetAuthName_Internal(
Lng32 max_string_len,
Lng32 &len_of_item);
-SQLCLI_LIB_FUNC Lng32 SQL_EXEC_GetDatabaseUserName_Internal (
+Lng32 SQL_EXEC_GetDatabaseUserName_Internal (
/*IN*/ Lng32 user_id,
/*OUT*/ char *string_value,
/*IN*/ Lng32 max_string_len,
/*OUT OPTIONAL*/ Lng32 *len_of_item);
-SQLCLI_LIB_FUNC Lng32 SQL_EXEC_GetDatabaseUserID_Internal (
+Lng32 SQL_EXEC_GetDatabaseUserID_Internal (
/*IN*/ char *string_value,
/*OUT*/ Lng32 *numeric_value);
-SQLCLI_LIB_FUNC Lng32 SQL_EXEC_SetSessionAttr_Internal (
+Lng32 SQL_EXEC_SetSessionAttr_Internal (
/*IN (SESSIONATTR_TYPE)*/ Lng32 attrName,
/*IN OPTIONAL*/ Lng32 numeric_value,
/*IN OPTIONAL*/ char *string_value);
-SQLCLI_LIB_FUNC Lng32 SQL_EXEC_SetErrorCodeInRTS(
+Lng32 SQL_EXEC_SetErrorCodeInRTS(
/*IN*/ SQLSTMT_ID * statement_id,
/*IN*/ Lng32 sqlErrorCode);
-SQLCLI_LIB_FUNC Lng32 SQL_EXEC_GetRoleList(
+Lng32 SQL_EXEC_GetRoleList(
Int32 &numRoles,
Int32 *&roleIDs);
-SQLCLI_LIB_FUNC Lng32 SQL_EXEC_ResetRoleList_Internal ();
+Lng32 SQL_EXEC_ResetRoleList_Internal ();
/*
@@ -980,7 +353,7 @@ on the tdb type.
Tdb Type Struct type
ComTdb::ex_REPLICATE SQL_REPLICATOR_OPERATOR_STATS
*/
-SQLCLI_LIB_FUNC Lng32 SQL_EXEC_RegisterQuery(SQLQUERY_ID *queryId,
+Lng32 SQL_EXEC_RegisterQuery(SQLQUERY_ID *queryId,
Lng32 fragId,
Lng32 tdbId,
Lng32 explainTdbId,
@@ -995,7 +368,7 @@ SQLCLI_LIB_FUNC Lng32 SQL_EXEC_RegisterQuery(SQLQUERY_ID *queryId,
/*
Deregisters the query in RMS shared segment
*/
-SQLCLI_LIB_FUNC Lng32 SQL_EXEC_DeregisterQuery(SQLQUERY_ID *queryId,
+Lng32 SQL_EXEC_DeregisterQuery(SQLQUERY_ID *queryId,
Lng32 fragId);
enum SECliQueryType
@@ -1053,7 +426,7 @@ enum SECliQueryType
SE_CLI_TRAFQ_GET
};
-SQLCLI_LIB_FUNC Lng32 SQL_EXEC_SEcliInterface
+Lng32 SQL_EXEC_SEcliInterface
(
SECliQueryType qType,
@@ -1098,7 +471,7 @@ Int32 SQL_EXEC_SWITCH_BACK_COMPILER
(
);
-SQLCLI_LIB_FUNC Lng32 SQL_EXEC_SeqGenCliInterface
+Lng32 SQL_EXEC_SeqGenCliInterface
(
void* *cliInterface, /* IN: if passed in and not null, use it.
OUT: if returned, save it and pass it back in */
@@ -1108,7 +481,7 @@ SQLCLI_LIB_FUNC Lng32 SQL_EXEC_SeqGenCliInterface
const Int32 NullCliRoutineHandle = -1;
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetRoutine
+Int32 SQL_EXEC_GetRoutine
(
/* IN */ const char *serializedInvocationInfo,
/* IN */ Int32 invocationInfoLen,
@@ -1124,7 +497,7 @@ SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetRoutine
);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_InvokeRoutine
+Int32 SQL_EXEC_InvokeRoutine
(
/* IN */ Int32 handle,
/* IN */ Int32 phaseEnumAsInt,
@@ -1141,7 +514,7 @@ SQLCLI_LIB_FUNC Int32 SQL_EXEC_InvokeRoutine
/* IN */ Int32 outputRowLen
);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetRoutineInvocationInfo
+Int32 SQL_EXEC_GetRoutineInvocationInfo
(
/* IN */ Int32 handle,
/* IN/OUT */ char *serializedInvocationInfo,
@@ -1153,7 +526,7 @@ SQLCLI_LIB_FUNC Int32 SQL_EXEC_GetRoutineInvocationInfo
/* OUT */ Int32 *planInfoLenOut
);
-SQLCLI_LIB_FUNC Int32 SQL_EXEC_PutRoutine
+Int32 SQL_EXEC_PutRoutine
(
/* IN */ Int32 handle
);
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/cli/SessionDefaults.cpp
----------------------------------------------------------------------
diff --git a/core/sql/cli/SessionDefaults.cpp b/core/sql/cli/SessionDefaults.cpp
index 8922244..25dd67c 100644
--- a/core/sql/cli/SessionDefaults.cpp
+++ b/core/sql/cli/SessionDefaults.cpp
@@ -776,10 +776,6 @@ static const AQRInfo::AQRErrorMap aqrErrorMap[] =
AQREntry( 4023, 0, 1, 0, 1, 1, "03", 0, 0),
AQREntry( 4039, 0, 1, 0, 1, 1, "03", 0, 0),
- // ReadTableDef mismatch transaction, transaction state needs to be cleaned up in compiler - kill compiler
- // only valid after prepare errors
- AQREntry( 4419, 0, 1, 0, 4, 0, "", 0, 0),
-
// parallel purgedata failed
AQREntry( 8022, 0, 3, 60, 0, 0, "", 0, 1),
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/cli/Statement.cpp
----------------------------------------------------------------------
diff --git a/core/sql/cli/Statement.cpp b/core/sql/cli/Statement.cpp
index a6aead5..8246d9c 100644
--- a/core/sql/cli/Statement.cpp
+++ b/core/sql/cli/Statement.cpp
@@ -65,17 +65,10 @@
#include "Int64.h"
#include "ComSqlId.h"
#include "CmpErrors.h"
-#if !defined(__EID) && !defined(ARKFS_OPEN)
-#include "ComResWords.h"
-#endif
-
-// begin includes for similarity check.
-#include "exp_tuple_desc.h"
-// end includes for similarity check
#include "TriggerEnable.h" // triggers
-# include "ComSmallDefs.h" // MV
-# include "ComMvAttributeBitmap.h" // MV
+#include "ComSmallDefs.h" // MV
+#include "ComMvAttributeBitmap.h" // MV
#include "logmxevent.h"
@@ -88,22 +81,13 @@
#include "ComAnsiNamePart.h"
#include "ExRsInfo.h"
-#include "PortProcessCalls.h"
-
-#if (defined(NA_LINUX) && defined (SQ_NEW_PHANDLE))
-#include "nsk/nskport.h"
-#include "seabed/ms.h"
-#include "seabed/fs.h"
-#endif
-#ifdef NA_CMPDLL
#include "arkcmp_proc.h"
#include "CmpContext.h"
-#endif // NA_CMPDLL
// Printf-style tracing macros for the debug build. The macros are
// no-ops in the release build.
-#ifdef NA_DEBUG_C_RUNTIME
+#ifdef _DEBUG
#include <stdarg.h>
#define StmtDebug0(s) StmtPrintf((s))
#define StmtDebug1(s,a1) StmtPrintf((s),(a1))
@@ -144,9 +128,6 @@ const char *RetcodeToString(RETCODE r)
}
}
-#ifdef _DEBUG
-#endif // _DEBUG
-
class Dealloc
{
NAHeap *heap_;
@@ -157,6 +138,7 @@ public:
NAHeap * setHeap(NAHeap *heap) { return heap_ = heap; }
void * getAddr(void *addr) { return addr_ = addr; }
};
+
////////////////////////////////////////////////////////////////////
// class StatementInfo
////////////////////////////////////////////////////////////////////
@@ -240,7 +222,7 @@ Statement::Statement(SQLSTMT_ID * statement_id_,
space_.setJmpBuf(cliGlobals_->getJmpBuf());
heap_.setJmpBuf(cliGlobals_->getJmpBuf());
-#ifdef NA_DEBUG_C_RUNTIME
+#ifdef _DEBUG
stmtDebug_ = FALSE;
stmtListDebug_ = FALSE;
Lng32 numCliCalls = context_->getNumOfCliCalls();
@@ -475,7 +457,7 @@ Statement::Statement(SQLSTMT_ID * statement_id_,
break;
}
-#ifdef NA_DEBUG_C_RUNTIME
+#ifdef _DEBUG
switch (statement_id->name_mode)
{
case stmt_handle:
@@ -546,9 +528,6 @@ Statement::Statement(SQLSTMT_ID * statement_id_,
1 /* create gui scheduler */,
&space_,
&heap_);
-
- // set Measure sqlstmt counter flag
- statementGlobals_->setMeasStmtEnabled(cliGlobals_->getMeasStmtEnabled());
// stored the type in statementGlobals
if(stmt_type_ == STATIC_STMT){
@@ -571,7 +550,6 @@ Statement::~Statement()
{
StmtDebug1("[BEGIN destructor] %p", this);
-
dealloc();
if (compileStatsArea_ != NULL)
{
@@ -1419,13 +1397,11 @@ RETCODE Statement::prepare2(char *source, ComDiagsArea &diagsArea,
char *fetched_gen_code = NULL;
short retcode = SUCCESS;
short indexIntoCompilerArray = 0;
-#ifdef NA_CMPDLL
// if there is any error using embedded cmpiler and we will switch to regular compiler
NABoolean canUseEmbeddedArkcmp = ((cliFlags & PREPARE_USE_EMBEDDED_ARKCMP) != 0) ; // This flag
// will be set only by the master. If a Prepare call is made from the
// compiler(including the embedded compiler), it will use the regular compiler.
-#endif // NA_CMPDLL
ExSqlComp::OperationStatus status;
Dealloc dealloc; // DTOR calls NAHeap::deallocateMemory for an object
@@ -1502,39 +1478,34 @@ RETCODE Statement::prepare2(char *source, ComDiagsArea &diagsArea,
Lng32 rsa = getRowsetAtomicity();
if (context_->getSessionDefaults()->getRowsetAtomicity() != -1)
rsa = context_->getSessionDefaults()->getRowsetAtomicity(); //NOT_ATOMIC_;
-#ifdef NA_CMPDLL
- // if (context_->getSessionDefaults()->callEmbeddedArkcmp() && canUseEmbeddedArkcmp && !aqRetry)
- // {
- if (canUseEmbeddedArkcmp && !context_->isEmbeddedArkcmpInitialized())
+
+ if (canUseEmbeddedArkcmp && !context_->isEmbeddedArkcmpInitialized())
+ {
+ Int32 embeddedArkcmpSetup;
+ // embeddedArkcmpSetup = arkcmp_main_entry();
+ embeddedArkcmpSetup = context_->switchToCmpContext((Int32)0);
+ if (embeddedArkcmpSetup == 0)
{
- Int32 embeddedArkcmpSetup;
- // embeddedArkcmpSetup = arkcmp_main_entry();
- embeddedArkcmpSetup = context_->switchToCmpContext((Int32)0);
- if (embeddedArkcmpSetup == 0)
- {
- context_->setEmbeddedArkcmpIsInitialized(TRUE);
- // context_->setEmbeddedArkcmpContext(CmpCommon::context());
- }
- else if (embeddedArkcmpSetup == -2)
- {
- diagsArea << DgSqlCode(-2079);
- return ERROR;
- }
- else
- {
- context_->setEmbeddedArkcmpIsInitialized(FALSE);
- context_->setEmbeddedArkcmpContext(NULL);
- }
+ context_->setEmbeddedArkcmpIsInitialized(TRUE);
}
- // Set the Global CmpContext from the one saved in the CLI context
- // for proper operation
- if (context_->isEmbeddedArkcmpInitialized() &&
- context_->getEmbeddedArkcmpContext())
- {
- cmpCurrentContext = context_->getEmbeddedArkcmpContext();
- }
- // }
-#endif // NA_CMPDLL
+ else if (embeddedArkcmpSetup == -2)
+ {
+ diagsArea << DgSqlCode(-2079);
+ return ERROR;
+ }
+ else
+ {
+ context_->setEmbeddedArkcmpIsInitialized(FALSE);
+ context_->setEmbeddedArkcmpContext(NULL);
+ }
+ }
+ // Set the Global CmpContext from the one saved in the CLI context
+ // for proper operation
+ if (context_->isEmbeddedArkcmpInitialized() &&
+ context_->getEmbeddedArkcmpContext())
+ {
+ cmpCurrentContext = context_->getEmbeddedArkcmpContext();
+ }
if (newOperation)
assert ((aqRetry && source) ||
@@ -1645,7 +1616,6 @@ RETCODE Statement::prepare2(char *source, ComDiagsArea &diagsArea,
(reComp ? sourceLenplus1() : octetLenplus1(source, charset)),
(Lng32) (reComp ? charset_ : charset),
schemaName_, schemaNameLength_+1,
- recompControlInfo_, recompControlInfoLen_,
getInputArrayMaxsize(), (short)rsa);
if (aqRetry)
@@ -1657,12 +1627,6 @@ RETCODE Statement::prepare2(char *source, ComDiagsArea &diagsArea,
if (standaloneQuery)
c.setStandaloneQuery(standaloneQuery);
- // set the nametype that was specified when this stmt was
- // statically compiled. mxcmp will resolve table names based on
- // this nametype. This field is only valid for auto recomp of
- // static stmts. It is not looked at for dynamic stmt.
- c.setNametypeNsk(nametypeNsk());
-
// if this statement was statically compiled with odbc process
// on, then set it here. This will be used at auto recomp time.
c.setOdbcProcess(odbcProcess());
@@ -1699,7 +1663,7 @@ RETCODE Statement::prepare2(char *source, ComDiagsArea &diagsArea,
else
{
CmpCompileInfo c(source, octetLenplus1(source, charset), (Lng32) charset,
- NULL, 0, NULL, 0,
+ NULL, 0,
getInputArrayMaxsize(), (short)rsa);
if (aqRetry)
@@ -1868,11 +1832,7 @@ Lng32 Statement::unpackAndInit(ComDiagsArea &diagsArea,
// CmpDescribePlan will unpack it.
ComTdbRoot *thisTdb = root_tdb;
- //#if defined (NA_WINNT)
- // if (root_tdb)
- //#else
if (root_tdb && !thisTdb->isFromShowplan())
- //#endif
{
// Here, we have just freshly (re)prepared the plan using the latest
// version of the compiler. Unpacking should be uneventful (i.e. no
@@ -2674,8 +2634,7 @@ RETCODE Statement::execute(CliGlobals * cliGlobals, Descriptor * input_desc,
// or an embedded static statement), then re-initizalize the stat
// area.
ExStatisticsArea *statsArea = getStatsArea();
- if (statsArea != NULL &&
- statsArea->getCollectStatsType() != ComTdb::MEASURE_STATS)
+ if (statsArea != NULL)
{
StatsGlobals *statsGlobals = cliGlobals->getStatsGlobals();
if (statsGlobals != NULL)
@@ -2832,22 +2791,6 @@ RETCODE Statement::execute(CliGlobals * cliGlobals, Descriptor * input_desc,
break;
}
- // update Measure stmt counters for recompilation.
- // stats area is allocated in fixup (ex_root_tdb::build).
-
- ExStatisticsArea *stats = getStatsArea();
- if ( reCompileTime > 0 &&
- /*root_tdb->getCollectStats() == ComTdb::MEASURE_STATS &&*/
- stats != NULL )
- {
- if (stats->getStmtCntrs() != NULL)
- {
- stats->getStmtCntrs()->incRecompiles(1);
- stats->getStmtCntrs()->incElapsedCompileTime(reCompileTime);
- reCompileTime = (Int64) 0;
- }
- }
-
if (doSimCheck || partitionUnavailable)
{
state_ = DO_SIM_CHECK_;
@@ -4011,8 +3954,7 @@ RETCODE Statement::doOltExecute(CliGlobals *cliGlobals,
}
ExStatisticsArea *statsArea = getStatsArea();
- if (statsArea != NULL &&
- statsArea->getCollectStatsType() != ComTdb::MEASURE_STATS)
+ if (statsArea != NULL)
{
StatsGlobals *statsGlobals = cliGlobals->getStatsGlobals();
if (statsGlobals != NULL)
@@ -4757,55 +4699,6 @@ void Statement::copyRecompControlInfo(char * basePtr,
char * recompControlInfo,
Lng32 recompControlInfoLength)
{
- if (recompControlInfo_)
- NADELETEBASIC(recompControlInfo_, (&heap_));
-
- // do some basic sanity checking
- if ((recompControlInfo == 0) || (recompControlInfoLength <= 0))
- {
- recompControlInfo_ = 0;
- recompControlInfoLen_ = 0;
- return;
- }
-
- RtduRecompControlInfo inRCI;
- str_cpy_all((char*)&inRCI, recompControlInfo, sizeof(RtduRecompControlInfo));
- recompControlInfo_ = new (&heap_) char[inRCI.packedLength()];
- RtduRecompControlInfo * stmtRCI =
- (RtduRecompControlInfo *)recompControlInfo_;
-
- inRCI.unpackIt(basePtr);
-
- char * cqdInfo = (char *)stmtRCI + sizeof(RtduRecompControlInfo);
- char * ctoInfo = (char *)cqdInfo + inRCI.cqdInfoLength();
- char * cqsInfo = (char *)ctoInfo + inRCI.ctoInfoLength();
-
- stmtRCI->initialize(inRCI.numCqdInfoEntries(),
- cqdInfo, inRCI.cqdInfoLength(),
- ctoInfo, inRCI.ctoInfoLength(),
- cqsInfo, inRCI.cqsInfoLength());
-
- if (stmtRCI->cqdInfoLength() > 0)
- {
- str_cpy_all(stmtRCI->cqdInfo(), inRCI.cqdInfo(),
- inRCI.cqdInfoLength());
- }
-
- if (stmtRCI->ctoInfoLength() > 0)
- {
- str_cpy_all(stmtRCI->ctoInfo(), inRCI.ctoInfo(),
- inRCI.ctoInfoLength());
- }
-
- if (stmtRCI->cqsInfoLength() > 0)
- {
- str_cpy_all(stmtRCI->cqsInfo(), inRCI.cqsInfo(),
- inRCI.cqsInfoLength());
- }
-
- stmtRCI->packIt((char*)stmtRCI);
-
- recompControlInfoLen_ = inRCI.packedLength();
}
@@ -5732,11 +5625,7 @@ void Statement::setUniqueStmtId(char * id)
char tmpLong[ 20 ];
if (statement_id->name_mode == stmt_handle)
-#ifdef NA_64BIT
str_ltoa((ULong)getStmtHandle(), tmpLong);
-#else
- str_itoa((ULong)getStmtHandle(), tmpLong);
-#endif
ComSqlId::createSqlQueryId(uniqueStmtId_,
ComSqlId::MAX_QUERY_ID_LEN+1,
uniqueStmtIdLen_,
@@ -5794,7 +5683,7 @@ ex_root_tdb * Statement::assignRootTdb(ex_root_tdb *new_root_tdb)
root_tdb = new_root_tdb;
StmtDebug2(" Stmt %p root TDB is now %p", this, root_tdb);
-#ifdef NA_DEBUG_C_RUNTIME
+#ifdef _DEBUG
Lng32 rs = (Lng32) (root_tdb ? root_tdb->getMaxResultSets() : 0);
if (rs > 0)
StmtDebug1(" Max result sets: %d", rs);
@@ -5879,23 +5768,6 @@ NABoolean Statement::containsUdrInteractions() const
return (root_tdb && root_tdb->containsUdrInteractions());
}
-//-----------------------------------------------------------------------------
-//
-// Read the trigger status array for a given table from its resource fork.
-// fsRTMD.fetch() is used for the reading.
-//
-
-RETCODE
-Statement::rforkReadTriggerStatus(TriggerStatusWA* triggerStatusWA,
- char* physFileName,
- const char* ansiName,
- ComDiagsArea &diagsArea)
-{
- return SUCCESS;
-
-}
-
-
//------------------------------------------------------------------------------
//
// For each stoi that is marked as subject table, get trigger status array from
@@ -5911,45 +5783,41 @@ RETCODE Statement::getTriggersStatus(SqlTableOpenInfoPtr* stoiList, ComDiagsArea
for (Int32 i=0; i< root_tcb->getTableCount(); i++)
{
- stoi=stoiList[i];
- if (stoi->subjectTable())
- {
-
- // save the current diags before entering CLI again
- ComDiagsArea* copyOfDiagsArea = diagsArea.copy();
- rc = rforkReadTriggerStatus(&triggerStatusWA,
- stoi->fileName(),
- stoi->ansiName(),
- diagsArea);
- // remove warning 100 from diags.
- diagsArea.removeFinalCondition100();
-
- // merge diags
- diagsArea.mergeAfter(*copyOfDiagsArea);
- copyOfDiagsArea->decrRefCount();
- copyOfDiagsArea = NULL;
-
- // select the status of the triggers relevant to this statement
- // and update them in the root_tcb->triggerStatusVector_
- triggerStatusWA.updateTriggerStatusPerTable();
- triggerStatusWA.deallocateStatusArray();
- }
+ stoi=stoiList[i];
+ if (stoi->subjectTable())
+ {
+
+ // save the current diags before entering CLI again
+ ComDiagsArea* copyOfDiagsArea = diagsArea.copy();
+ // remove warning 100 from diags.
+ diagsArea.removeFinalCondition100();
+
+ // merge diags
+ diagsArea.mergeAfter(*copyOfDiagsArea);
+ copyOfDiagsArea->decrRefCount();
+ copyOfDiagsArea = NULL;
+
+ // select the status of the triggers relevant to this statement
+ // and update them in the root_tcb->triggerStatusVector_
+ triggerStatusWA.updateTriggerStatusPerTable();
+ triggerStatusWA.deallocateStatusArray();
+ }
}
-
+
#ifdef _DEBUG
if (getenv("SHOW_ENABLE"))
- {
- char int64Str[128];
- cout << "Trigger Ids in TDB:" << endl;
- cout << "-------------------" << endl;
- for (Int32 i=0; i<triggerStatusWA.getTotalTriggersCount(); i++)
- {
- convertInt64ToAscii(root_tdb->getTriggersList()[i], int64Str);
- cout << i << " : " << int64Str << endl;
- }
- cout << endl;
-
- }
+ {
+ char int64Str[128];
+ cout << "Trigger Ids in TDB:" << endl;
+ cout << "-------------------" << endl;
+ for (Int32 i=0; i<triggerStatusWA.getTotalTriggersCount(); i++)
+ {
+ convertInt64ToAscii(root_tdb->getTriggersList()[i], int64Str);
+ cout << i << " : " << int64Str << endl;
+ }
+ cout << endl;
+
+ }
#endif //_DEBUG
// we cannot check that status was received for all triggers, since
@@ -6818,7 +6686,7 @@ RETCODE Statement::getExtractConsumerSyntax(char *proxy, Lng32 maxlength,
return getProxySyntax(proxy, maxlength, spaceRequired, prefix, suffix);
}
-#ifdef NA_DEBUG_C_RUNTIME
+#ifdef _DEBUG
void Statement::StmtPrintf(const char *formatString, ...) const
{
if (!stmtDebug_)
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/cli/Statement.h
----------------------------------------------------------------------
diff --git a/core/sql/cli/Statement.h b/core/sql/cli/Statement.h
index f0f816b..30b5c3f 100644
--- a/core/sql/cli/Statement.h
+++ b/core/sql/cli/Statement.h
@@ -179,10 +179,6 @@ public:
// execution if this flag is set for that statement.
AUTOCOMMIT_XN = 0x0200,
- // set, if nametype was specified as NSK at static compilation time.
- // Used to send this info to mxcmp at auto recompilation time.
- NAMETYPE_NSK = 0x0400,
-
// set, if odbc_process was on at static compilation time.
// Used to send this info to mxcmp at auto recompilation time.
ODBC_PROCESS = 0x0800,
@@ -438,12 +434,6 @@ private:
// and the Xn needs to be aborted.
short rollbackSavepoint(ComDiagsArea &diagsArea, NABoolean &rollbackXn);
- // a private helper function to get trigger status info from the rfork
- RETCODE rforkReadTriggerStatus(TriggerStatusWA* triggerStatusWA,
- char* physFileName,
- const char* ansiName,
- ComDiagsArea &diagsArea);
-
unsigned short &defineContext() { return defineContext_;};
Int64 &envvarsContext() { return envvarsContext_;};
@@ -582,7 +572,7 @@ public:
// reads trigger status from rfork and updates trigger status vector in TCB.
RETCODE getTriggersStatus(SqlTableOpenInfoPtr* stoiList,
- ComDiagsArea &diagsArea);
+ ComDiagsArea &diagsArea);
inline void * getStmtHandle();
inline Module * getModule() { return module_; }
@@ -734,10 +724,6 @@ public:
void setAutocommitXn(short v)
{ (v ? flags_ |= AUTOCOMMIT_XN : flags_ &= ~AUTOCOMMIT_XN); };
- NABoolean nametypeNsk() { return (flags_ & NAMETYPE_NSK) != 0; };
- void setNametypeNsk(short v)
- { (v ? flags_ |= NAMETYPE_NSK : flags_ &= ~NAMETYPE_NSK); };
-
NABoolean odbcProcess() { return (flags_ & ODBC_PROCESS) != 0; };
void setOdbcProcess(short v)
{ (v ? flags_ |= ODBC_PROCESS : flags_ &= ~ODBC_PROCESS); };
@@ -908,7 +894,7 @@ public:
//return TRUE if query is prefixed by display,
// e.g. display select ...
NABoolean isDISPLAY();
-#ifdef NA_DEBUG_C_RUNTIME
+#ifdef _DEBUG
public:
void StmtPrintf(const char *formatString, ...) const;
NABoolean stmtDebugEnabled() const { return stmtDebug_; }
@@ -1060,7 +1046,7 @@ class UdrSecurityInfo : public NABasicObject
public:
UdrSecurityInfo () :
previousSecurityTS_(0), previouslyChecked_(FALSE)
- ,previousResult_(ERROR), rforkLastModTS_(0)
+ ,previousResult_(ERROR)
{
}
@@ -1085,11 +1071,6 @@ public:
return previousResult_;
}
- Int64 getRforkLastModTS() const
- {
- return rforkLastModTS_;
- }
-
// Mutators
void setUdrName(char *udrName)
{
@@ -1111,16 +1092,10 @@ public:
previousResult_ = result;
}
- void setRforkLastModTS(Int64 modTime)
- {
- rforkLastModTS_ = modTime;
- }
-
private:
char *udrName_;
Int64 previousSecurityTS_;
- Int64 rforkLastModTS_;
NABoolean previouslyChecked_;
RETCODE previousResult_;
};
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/cli/StoredProcInterface.cpp
----------------------------------------------------------------------
diff --git a/core/sql/cli/StoredProcInterface.cpp b/core/sql/cli/StoredProcInterface.cpp
index 965c6a8..4e9fe14 100644
--- a/core/sql/cli/StoredProcInterface.cpp
+++ b/core/sql/cli/StoredProcInterface.cpp
@@ -49,7 +49,6 @@
// pointers. To be called after receiving the input buffer
// from Executor and before retrieving rows from it.
///////////////////////////////////////////////////////////////
-SQLCLI_LIB_FUNC
short ExSPPrepareInputBuffer(void * inputBuffer)
{
SqlBuffer * ib = (SqlBuffer *)inputBuffer;
@@ -66,7 +65,6 @@ short ExSPPrepareInputBuffer(void * inputBuffer)
// called before retrieving input rows from it.
// RETURNS: 0, if all ok. -1, in case of an error.
/////////////////////////////////////////////////////////////////
-SQLCLI_LIB_FUNC
short ExSPPosition(void * inputBuffer)
{
SqlBuffer * ib = (SqlBuffer *)inputBuffer;
@@ -93,7 +91,6 @@ short ExSPPosition(void * inputBuffer)
// RETURNS: 0, if all is Ok. 1, if all rows have been returned.
// -1, in case of error.
////////////////////////////////////////////////////////////////////////////
-SQLCLI_LIB_FUNC
short ExSPGetInputRow(void * inputBuffer, // IN: input sql buffer
void* &controlInfo, // OUT: control info
char* &rowPtr, // OUT: pointer to the row
@@ -131,7 +128,6 @@ short ExSPGetInputRow(void * inputBuffer, // IN: input sql buffer
// Once the reply buffer is sent from Arkcmp to Executor, it
// must be re-initialized by calling this proc again.
/////////////////////////////////////////////////////////////////
-SQLCLI_LIB_FUNC
short ExSPInitReplyBuffer(void * replyBuffer,
ULng32 replyBufLen)
{
@@ -162,7 +158,6 @@ short ExSPInitReplyBuffer(void * replyBuffer,
// -1, in case of error.
// 2 in case of warning.
/////////////////////////////////////////////////////////////////
-SQLCLI_LIB_FUNC
short ExSPPutReplyRow(void * replyBuffer, // IN: the reply buffer
void * controlInfo, // IN: control info
char * replyRow, // IN: pointer to reply row
@@ -255,7 +250,6 @@ short ExSPPutReplyRow(void * replyBuffer, // IN: the reply buffer
// offsets. To be called before sending the reply buffer to
// Executor.
///////////////////////////////////////////////////////////
-SQLCLI_LIB_FUNC
short ExSPPrepareReplyBuffer(void * replyBuffer)
{
SqlBuffer * rb = (SqlBuffer *)replyBuffer;
@@ -271,7 +265,6 @@ short ExSPPrepareReplyBuffer(void * replyBuffer)
return 0;
}
-SQLCLI_LIB_FUNC
short ExSPUnpackIOExpr(void * & extractInputExpr,
void * & moveOutputExpr,
CollHeap * heap)
@@ -315,7 +308,6 @@ short ExSPUnpackIOExpr(void * & extractInputExpr,
return 0;
}
-SQLCLI_LIB_FUNC
short ExSPExtractInputValue(void * extractInputExpr,
ULng32 fieldNum, char * inputRow,
char * data, ULng32 datalen, NABoolean casting,
@@ -327,7 +319,6 @@ short ExSPExtractInputValue(void * extractInputExpr,
);
}
-SQLCLI_LIB_FUNC
short ExSPMoveOutputValue(void * moveOutputExpr,
ULng32 fieldNum, char * outputRow,
char * data, ULng32 datalen, NABoolean casting,
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/cli/StoredProcInterface.h
----------------------------------------------------------------------
diff --git a/core/sql/cli/StoredProcInterface.h b/core/sql/cli/StoredProcInterface.h
index e712d1c..3824733 100644
--- a/core/sql/cli/StoredProcInterface.h
+++ b/core/sql/cli/StoredProcInterface.h
@@ -46,45 +46,36 @@ class ComDiagsArea;
// See executor/ex_stored_proc.cpp for details about these
// procs...
////////////////////////////////////////////////////////////
-SQLCLI_LIB_FUNC
short ExSPPrepareInputBuffer(void * inputBuffer);
-SQLCLI_LIB_FUNC
short ExSPPosition(void * inputBuffer);
-SQLCLI_LIB_FUNC
short ExSPGetInputRow(void * inputBuffer, // IN: input sql buffer
void* &controlInfo, // OUT: control info
char* &rowPtr, // OUT: pointer to the row
ULng32 &rowLen);// OUT: length of returned row
-SQLCLI_LIB_FUNC
short ExSPInitReplyBuffer(void * replyBuffer,
ULng32 replyBufLen);
-SQLCLI_LIB_FUNC
short ExSPPutReplyRow(void * replyBuffer, // IN: the reply buffer
void * controlInfo, // IN: control info
char * replyRow, // IN: pointer to reply row
ULng32 rowLen, // IN: length of reply row
ComDiagsArea* diagsDesc);// IN: pointer to diags
-SQLCLI_LIB_FUNC
short ExSPPrepareReplyBuffer(void * replyBuffer);
-SQLCLI_LIB_FUNC
short ExSPUnpackIOExpr(void * & extractInputExpr,
void * & moveOutputExpr,
CollHeap * heap);
-SQLCLI_LIB_FUNC
short ExSPExtractInputValue(void * extractInputExpr,
ULng32 fieldNum, char * inputRow,
char * data, ULng32 datalen,
NABoolean casting, // if TRUE,data in varchar, to be casted
ComDiagsArea * diagsArea);
-SQLCLI_LIB_FUNC
short ExSPMoveOutputValue(void * moveOutputExpr,
ULng32 fieldNum, char * outputRow,
char * data, ULng32 datalen,
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/cli/VicKeyValuePair.h
----------------------------------------------------------------------
diff --git a/core/sql/cli/VicKeyValuePair.h b/core/sql/cli/VicKeyValuePair.h
index e97f6fb..ade3632 100644
--- a/core/sql/cli/VicKeyValuePair.h
+++ b/core/sql/cli/VicKeyValuePair.h
@@ -20,17 +20,3 @@
//
// @@@ END COPYRIGHT @@@
**********************************************************************/
-// Vicz: base data structure
-
-class VicKeyValuePair : public NABasicObject
-{
-public:
-
- void * key_;
-
- void * value_;
-
- inline VicKeyValuePair(void *key, void *value)
- : key_(key), value_(value){}
-
-};
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/cli/cli_stdh.h
----------------------------------------------------------------------
diff --git a/core/sql/cli/cli_stdh.h b/core/sql/cli/cli_stdh.h
index 92c364a..db5b670 100644
--- a/core/sql/cli/cli_stdh.h
+++ b/core/sql/cli/cli_stdh.h
@@ -33,7 +33,6 @@
#include "Module.h"
#include "Context.h"
#include "Globals.h"
-#include "rtdu.h"
#include "ex_error.h"
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/cli/globalsrlversion.cpp
----------------------------------------------------------------------
diff --git a/core/sql/cli/globalsrlversion.cpp b/core/sql/cli/globalsrlversion.cpp
index 3123f4d..f519696 100644
--- a/core/sql/cli/globalsrlversion.cpp
+++ b/core/sql/cli/globalsrlversion.cpp
@@ -36,5 +36,5 @@
*
****************************************************************************
*/
-#include "platform.h"
+//#include "platform.h"
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/cli/globalstubs.cpp
----------------------------------------------------------------------
diff --git a/core/sql/cli/globalstubs.cpp b/core/sql/cli/globalstubs.cpp
index 90edbdf..e224f47 100644
--- a/core/sql/cli/globalstubs.cpp
+++ b/core/sql/cli/globalstubs.cpp
@@ -35,20 +35,3 @@
*****************************************************************************
*/
-extern "C"
-void NAAbort__FPciT1(void){};
-
-extern "C"
-void NAAssert__FPcT1i(void){};
-
-extern "C"
-void __ct__13NABasicObjectFv(void){};
-
-extern "C"
-void __dl__13NABasicObjectSFPv(void){};
-
-extern "C"
-void __dt__8NAStringFv(void){};
-
-extern "C"
-void __nw__13NABasicObjectSFUiP8CollHeap(void){};
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/cli/memorymonitor.cpp
----------------------------------------------------------------------
diff --git a/core/sql/cli/memorymonitor.cpp b/core/sql/cli/memorymonitor.cpp
index adb9d3a..d36c2da 100644
--- a/core/sql/cli/memorymonitor.cpp
+++ b/core/sql/cli/memorymonitor.cpp
@@ -164,8 +164,6 @@ MemoryMonitor::~MemoryMonitor() {
// Called by main thread only.
Lng32 MemoryMonitor::memoryPressure() {
-//SQ_LINUX #ifdef NA_WINNT
-
return pressure_;
};
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/cli/memorymonitor.h
----------------------------------------------------------------------
diff --git a/core/sql/cli/memorymonitor.h b/core/sql/cli/memorymonitor.h
index a688808..36d5973 100644
--- a/core/sql/cli/memorymonitor.h
+++ b/core/sql/cli/memorymonitor.h
@@ -38,7 +38,6 @@
*
*****************************************************************************
*/
-//SQ_LINUX #ifdef NA_WINNT
#include <fstream>
#include "NAMemory.h"
@@ -119,8 +118,6 @@ private:
NABoolean loggerEnabled_;
-//SQ_LINUX #ifdef NA_WINNT
-
// SQ_LINUX will use Win32 API for worker thread to update pressure.
static NABoolean threadIsCreated_;
static HANDLE updateThread_;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/cli/muse.cpp
----------------------------------------------------------------------
diff --git a/core/sql/cli/muse.cpp b/core/sql/cli/muse.cpp
index 3176eac..4eaff53 100644
--- a/core/sql/cli/muse.cpp
+++ b/core/sql/cli/muse.cpp
@@ -304,9 +304,6 @@ void ExHeapStats::DisplayLongMemStats(ostream &os, char *ind, size_t minSize)
case NAMemory::NO_MEMORY_TYPE:
os << "NO_MEMORY_TYPE" << endl;
break;
- case NAMemory::DP2_MEMORY:
- os << "DP2_MEMORY" << endl;
- break;
case NAMemory::EXECUTOR_MEMORY:
os << "EXECUTOR_MEMORY" << endl;
break;
@@ -390,9 +387,6 @@ void ExSpaceStats::DisplayLongMemStats(ostream &os, char *ind, size_t minSize)
switch (space->ComSpace::type_)
{
- case ComSpace::DP2_SPACE:
- os << "DP2_SPACE" << endl;
- break;
case ComSpace::EXECUTOR_SPACE:
os << "EXECUTOR_SPACE" << endl;
break;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/cli/privsrlversion.cpp
----------------------------------------------------------------------
diff --git a/core/sql/cli/privsrlversion.cpp b/core/sql/cli/privsrlversion.cpp
index 079bd5a..ac1006a 100644
--- a/core/sql/cli/privsrlversion.cpp
+++ b/core/sql/cli/privsrlversion.cpp
@@ -36,6 +36,6 @@
*
****************************************************************************
*/
-#include "platform.h"
+
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/cli/rtdu.cpp
----------------------------------------------------------------------
diff --git a/core/sql/cli/rtdu.cpp b/core/sql/cli/rtdu.cpp
index a432ff7..da1a5fa 100644
--- a/core/sql/cli/rtdu.cpp
+++ b/core/sql/cli/rtdu.cpp
@@ -35,64 +35,3 @@
*
*****************************************************************************
*/
-#include "rtdu.h"
-#include "ComVersionDefs.h"
-
-// StaticCompiler.cpp's code to create and initialize a sql module's
-// plt_header_struct, plt_entry_struct,
-// dlt_header_struct, dlt_entry_struct,
-// desc_header_struct, desc_entry_struct
-// is constructor-less: it simply allocates space for each struct
-// and later computes that struct's contents, field by field. Their
-// private members such as flags_, classID_, versionID_, and so on
-// remain uninitialized because these struct's constructors are
-// never called. So, we use these functions to initialize the
-// hidden versioning fields.
-
-
-void module_header_struct::initialize()
-{
- prep_timestamp = 0;
- compile_timestamp = 0;
-
- strncpy(eye_catcher, MODULE_EYE_CATCHER, EYE_CATCHER_LEN);
- module_length = 0;
- flags = 0;
-
- num_areas = 7; // this is quite true -- see rtdu.h
-
- plt_area_length = 0;
- plt_area_offset = NULL_RTDU_OFFSET;
- plt_hdr_length = sizeof(plt_header_struct);
- plt_entry_length = sizeof(plt_entry_struct);
-
- source_area_length = 0;
- source_area_offset = NULL_RTDU_OFFSET;
-
- recomp_control_area_length = 0;
- recomp_control_area_offset = NULL_RTDU_OFFSET;
-
- schema_names_area_length = 0;
- schema_names_area_offset = NULL_RTDU_OFFSET;
-
- dlt_area_length = 0;
- dlt_area_offset = NULL_RTDU_OFFSET;
- dlt_hdr_length = sizeof(dlt_header_struct);
- dlt_entry_length = sizeof(dlt_entry_struct);
-
- descriptor_area_length = 0;
- descriptor_area_offset = NULL_RTDU_OFFSET;
- desc_hdr_length = sizeof(desc_header_struct);
- desc_entry_length = sizeof(desc_entry_struct);
-
- object_area_length = 0;
- object_area_offset = NULL_RTDU_OFFSET;
-
- vproc_area_length = 0;
- vproc_area_offset = NULL_RTDU_OFFSET;
-
- memset(module_name, 0, sizeof(module_name));
- version_ = ComVersion_GetCurrentPlanVersion();
-
- memset(filler_, 0, sizeof(filler_));
-}
[26/30] incubator-trafodion git commit: TRAFODION-2731 CodeCleanup:
Remove obsolete, legacy and unused code
Posted by an...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/cli/Context.cpp
----------------------------------------------------------------------
diff --git a/core/sql/cli/Context.cpp b/core/sql/cli/Context.cpp
index ac3d9d9..2af4264 100644
--- a/core/sql/cli/Context.cpp
+++ b/core/sql/cli/Context.cpp
@@ -73,9 +73,6 @@
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
-#if defined( NA_SHADOWCALLS )
-#include "sqlclisp.h"
-#endif
#include "ComplexObject.h"
#include "CliMsgObj.h"
@@ -92,10 +89,8 @@
#include <sys/syscall.h>
#include <pwd.h>
-#ifdef NA_CMPDLL
#include "CmpCommon.h"
#include "arkcmp_proc.h"
-#endif
#include "ExRsInfo.h"
#include "../../dbsecurity/auth/inc/dbUserAuth.h"
@@ -105,7 +100,7 @@
// Printf-style tracing macros for the debug build. The macros are
// no-ops in the release build.
-#ifdef NA_DEBUG_C_RUNTIME
+#ifdef _DEBUG
#include <stdarg.h>
#define StmtListDebug0(s,f) StmtListPrintf((s),(f))
#define StmtListDebug1(s,f,a) StmtListPrintf((s),(f),(a))
@@ -122,20 +117,10 @@
#define StmtListDebug5(s,f,a,b,c,d,e)
#endif
+#include "dtm/tm.h"
- #include "dtm/tm.h"
-
-#ifdef NA_CMPDLL
#include "CmpContext.h"
-#endif // NA_CMPDLL
-// forward declarations
-
-static
-SQLSTMT_ID* getStatementId(plt_entry_struct * plte,
- char * start_stmt_name,
- SQLSTMT_ID * stmt_id,
- NAHeap *heap);
-
+
ContextCli::ContextCli(CliGlobals *cliGlobals)
// the context heap's parent is the basic executor memory
: cliGlobals_(cliGlobals),
@@ -496,997 +481,6 @@ static Int32 allocAndReadPos(ModuleOSFile &file,
return retcode;
}
-RETCODE ContextCli::addModule(const SQLMODULE_ID * module_id,
- NABoolean tsCheck,
- NABoolean unpackTDBs, char * moduleDir,
- NABoolean lookInGlobalModDir)
-{
- const char * module_name = module_id->module_name;
- Lng32 module_nm_len = getModNameLen(module_id);
-
- // use this Space for versioning
- Space vspc;
- //NAVersionedObject::setReallocator(&vspc);
-
- module_header_struct dm, *latestModHdr, modHdrCls;
-
- ModuleOSFile file;
- const Int32 max_modname_len = 1024;
- char m_name[max_modname_len];
- Lng32 m_name_len;
- Int32 error = 0;
- short isSystemModule = 0;
-
- // odbc spawns mxosrvr (an oss executable stored as a guardian file)
- // as an oss process. So,
- // we cannot assume moduleDir is always NULL for Guardian executables.
- // Nor can we avoid having to check the global dir if moduleDir is not
- // null. In the case of zmxosrvr, moduleDir is /G/vol/subvol and we
- // have to search /usr/tandem/sqlmx/USERMODULES before declaring 8809.
-
- // look for the module in moduleDir first.
- Lng32 retcode = ComRtGetModuleFileName
- (module_name, moduleDir, m_name, max_modname_len,
- NULL,
- NULL,
- &m_name_len, isSystemModule);
- if (retcode || m_name_len >= max_modname_len)
- {
- diagsArea_ << DgSqlCode(- CLI_NO_INSTALL_DIR)
- << DgInt0(retcode);
- return ERROR;
- }
- else if ((error = file.open(m_name)) == 4002 || error == 11) // not found
- {
- if ((!moduleDir) || // above try was for global dir
- (NOT lookInGlobalModDir)) // do not look for module in global
- // mod dir, if cannot find it in local
- {
- // there's no local module dir to try
- diagsArea_ << DgSqlCode(- CLI_MODULEFILE_OPEN_ERROR)
- << DgString0(m_name)
- << DgInt0(error);
- return ERROR;
- }
- else // above try was for a local dir
- {
- // now try the global dir
- retcode = ComRtGetModuleFileName
- (module_name, NULL, m_name, max_modname_len,
- NULL,
- NULL,
- &m_name_len, isSystemModule);
- if (retcode || m_name_len >= max_modname_len)
- {
- diagsArea_ << DgSqlCode(- CLI_NO_INSTALL_DIR)
- << DgInt0(retcode);
- return ERROR;
- }
- else if ((error = file.open(m_name)) != 0) // open failed
- {
- diagsArea_ << DgSqlCode(- CLI_MODULEFILE_OPEN_ERROR)
- << DgString0(m_name)
- << DgInt0(error);
- return ERROR;
- }
- }
- }
- else if (error != 0) // module file exists but open failed
- {
- diagsArea_ << DgSqlCode(- CLI_MODULEFILE_OPEN_ERROR)
- << DgString0(m_name)
- << DgInt0(error);
- return ERROR;
- }
-
- Module * module = new(exCollHeap())
- Module(module_name, module_nm_len, &m_name[0], m_name_len, exHeap());
-
- // read the module header
- short countRead = 0;
- if ((file.readpos((char *)&dm, 0, sizeof(module_header_struct), countRead))
- )
- {
- // an error during reading of module file or the file is shorter
- // than the module header.
- diagsArea_ << DgSqlCode(-CLI_MODULEFILE_CORRUPTED) << DgString0(m_name);
- return ERROR;
- }
-
- // give versioning a chance to massage/migrate it to this version
- latestModHdr = (module_header_struct*)dm.driveUnpack(&dm, &modHdrCls, &vspc);
- if (!latestModHdr) {
- // error: version is no longer supported
- diagsArea_ << DgSqlCode(-CLI_MODULE_HDR_VERSION_ERROR)
- << DgString0(m_name);
- return ERROR;
- }
-
- module->setVersion((COM_VERSION)latestModHdr->getModuleVersion());
-
- const char * real_module_name = NULL;
- char real_module_name_buf[max_modname_len];
- if (module_name[0] == '/')
- {
- // module name is fully qualified, it contains the path before
- // the actual name.
- // Fine the real module name.
- Lng32 len = (Int32)strlen(module_name);
-
- // find the directory name.
- Lng32 i = len-1;
- NABoolean done = FALSE;
- NABoolean dQuoteSeen = FALSE;
- while ((i > 0) && (NOT done))
- {
- if (module_name[i] == '"')
- dQuoteSeen = NOT dQuoteSeen;
-
- if (NOT dQuoteSeen)
- {
- if (module_name[i] == '/')
- {
- done = TRUE;
- continue;
- }
- }
- i--;
- }
-
- i++;
-
- Int32 j = 0;
- while (i < len)
- real_module_name_buf[j++] = module_name[i++];
- real_module_name_buf[j] = 0;
-
- real_module_name = real_module_name_buf;
- }
- else
- real_module_name = module_name;
-
- Lng32 errCode = latestModHdr->RtduStructIsCorrupt();
- if (errCode ||
- (strncmp(latestModHdr->module_name, real_module_name, module_nm_len) != 0) ||
- ((tsCheck) &&
- (latestModHdr->prep_timestamp != module_id->creation_timestamp))
- )
- {
- // the module file is corrupted or has invalid data
- if (!errCode) errCode = -CLI_MODULEFILE_CORRUPTED;
- diagsArea_ << DgSqlCode(errCode) << DgString0(m_name);
- return ERROR;
- }
-
- plt_header_struct * plt = 0, *latestPLTHdr=0, pltHdrCls;
- plt_entry_struct * plte = 0, *latestPLTE, plteCls;
-
- dlt_header_struct * dlt = 0, *latestDLTHdr=0, dltHdrCls;
- dlt_entry_struct * dlte = 0, *latestDLTE, dlteCls;
-
- SQLMODULE_ID * local_module_id;
- SQLDESC_ID * desc_id;
- SQLSTMT_ID * stmt_id;
-
- Descriptor * descriptor = NULL;
- Statement * statement;
-
- char * source_area = 0;
- char * object_area = 0;
-
- char * schema_names_area = NULL;
-
- char * recomp_control_info_area = NULL;
-
- char * vproc_area = NULL;
-
- char * start_stmt_name = 0;
- char * start_desc_name = 0;
-
- local_module_id =
- (SQLMODULE_ID *)(exHeap()->allocateMemory(sizeof(SQLMODULE_ID)));
- init_SQLMODULE_ID(local_module_id);
-
- char * mn =
- (char *)(exHeap()->allocateMemory((size_t)(module_nm_len + 1)));
- str_cpy_all(mn, module_name, module_nm_len);
- mn[module_nm_len] = 0;
-
- local_module_id->module_name = mn;
- local_module_id->module_name_len = module_nm_len;
-
- stmt_id =
- (SQLSTMT_ID *)(exHeap()->allocateMemory(sizeof(SQLSTMT_ID)));
- init_SQLCLI_OBJ_ID(stmt_id);
-
- stmt_id->module = local_module_id;
- stmt_id->identifier = 0;
- stmt_id->handle = 0;
-
- desc_id =
- (SQLDESC_ID *)(exHeap()->allocateMemory(sizeof(SQLDESC_ID)));
- init_SQLCLI_OBJ_ID(desc_id);
-
- desc_id->module = local_module_id;
- desc_id->identifier = 0;
- desc_id->handle = 0;
-
- if (latestModHdr->source_area_length > 0)
- {
- if (allocAndReadPos(file, source_area,
- latestModHdr->source_area_offset,
- (Int32)latestModHdr->source_area_length,
- exHeap(), diagsArea_, m_name))
- return ERROR;
- }
-
- if (latestModHdr->schema_names_area_length > 0)
- {
- if (allocAndReadPos(file, schema_names_area,
- latestModHdr->schema_names_area_offset,
- latestModHdr->schema_names_area_length,
- exHeap(), diagsArea_, m_name))
- return ERROR;
- }
-
- if (latestModHdr->object_area_length > 0)
- {
- if (allocAndReadPos(file, object_area,
- latestModHdr->object_area_offset,
- latestModHdr->object_area_length,
- exHeap(), diagsArea_, m_name))
- return ERROR;
- }
-
- if (latestModHdr->recomp_control_area_length > 0)
- {
- if (allocAndReadPos(file, recomp_control_info_area,
- latestModHdr->recomp_control_area_offset,
- latestModHdr->recomp_control_area_length,
- exHeap(), diagsArea_, m_name))
- return ERROR;
- }
-
- if (latestModHdr->dlt_area_offset > 0)
- {
- if (allocAndReadPos(file, (char *&)dlt,
- latestModHdr->dlt_area_offset,
- latestModHdr->dlt_area_length,
- exHeap(), diagsArea_, m_name))
- return ERROR;
-
- // give versioning a chance to massage/migrate it to this version
- latestDLTHdr = (dlt_header_struct*)dlt->driveUnpack(dlt, &dltHdrCls, &vspc);
- if (!latestDLTHdr) {
- // error: version is no longer supported
- diagsArea_ << DgSqlCode(-CLI_MOD_DLT_HDR_VERSION_ERROR)
- << DgString0(m_name);
- return ERROR;
- }
-
- errCode = latestDLTHdr->RtduStructIsCorrupt();
- if (errCode)
- {
- exHeap()->deallocateMemory(dlt);
- exHeap()->deallocateMemory(local_module_id);
- exHeap()->deallocateMemory(stmt_id);
- exHeap()->deallocateMemory(desc_id);
- if (source_area)
- exHeap()->deallocateMemory(source_area);
- if (schema_names_area)
- exHeap()->deallocateMemory(schema_names_area);
- if (recomp_control_info_area)
- exHeap()->deallocateMemory(recomp_control_info_area);
- if (object_area)
- exHeap()->deallocateMemory(object_area);
-
- // the module file is corrupted or has invalid data
- diagsArea_ << DgSqlCode(errCode) << DgString0(m_name);
- return ERROR;
- }
-
- Lng32 num_descs = latestDLTHdr->num_descriptors;
- char * desc_area = 0;
-
- if (allocAndReadPos(file, desc_area,
- latestModHdr->descriptor_area_offset,
- latestModHdr->descriptor_area_length,
- exHeap(), diagsArea_, m_name))
- return ERROR;
-
- desc_id->name_mode = desc_name;
-
- start_desc_name = (((char *)(latestDLTHdr))
- + latestModHdr->dlt_hdr_length
- + (num_descs) * latestModHdr->dlt_entry_length);
-
-#ifdef NA_64BIT
- // dg64 - should be 4 bytes
- Int32 length;
-#else
- Lng32 length;
-#endif
- desc_header_struct *desc, *latestDescHdr, descHdrCls;
-
- for (Lng32 i = 0; i < num_descs; i++)
- {
- // get ith descriptor location table entry
- dlte = latestDLTHdr->getDLTEntry(i, latestModHdr->dlt_entry_length);
-
- // give versioning a chance to massage/migrate it to this version
- latestDLTE = (dlt_entry_struct*)dlte->driveUnpack(dlte, &dlteCls, &vspc);
- if (!latestDLTE) {
- // error: version is no longer supported
- diagsArea_ << DgSqlCode(-CLI_MOD_DLT_ENT_VERSION_ERROR)
- << DgString0(m_name);
- return ERROR;
- }
-
- str_cpy_all((char *)&length,
- start_desc_name + latestDLTE->descname_offset, 4);
-
- if (desc_id->identifier) {
- exHeap()->deallocateMemory((char*)desc_id->identifier);
- desc_id->identifier = 0;
- }
- char * id =
- (char *)(exHeap()->allocateMemory((size_t)(length + 1)));
- str_cpy_all(id,
- start_desc_name + latestDLTE->descname_offset + 4,
- length);
- id[length] = '\0';
- desc_id->identifier = id;
- desc_id->identifier_len = length;
-
- desc_id->handle = 0;
-
- allocateDesc(desc_id, 500);
-
- descriptor = getDescriptor(desc_id);
-
- // get descriptor header
- desc = (desc_header_struct *)(&desc_area[latestDLTE->descriptor_offset]);
-
- // give versioning a chance to massage/migrate it to this version
- latestDescHdr = (desc_header_struct*)
- desc->driveUnpack(desc, &descHdrCls, &vspc);
- if (!latestDescHdr) {
- // error: version is no longer supported
- diagsArea_ << DgSqlCode(-CLI_MOD_DESC_HDR_VERSION_ERROR)
- << DgString0(m_name);
- return ERROR;
- }
-
- descriptor->alloc(latestDescHdr->num_entries);
-
- desc_entry_struct *de, *latestDE, deCls;
- register Lng32 num_entries = latestDescHdr->num_entries;
- Lng32 rowsetSize = 0;
-
- for (register Lng32 j = 1; j <= num_entries; j++)
- {
- // get j-1th descriptor entry
- de = latestDescHdr->getDescEntry
- (j-1, latestModHdr->desc_entry_length);
-
- // give versioning a chance to massage/migrate it to this version
- latestDE = (desc_entry_struct*)de->driveUnpack(de, &deCls, &vspc);
- if (!latestDE) {
- // error: version is no longer supported
- diagsArea_ << DgSqlCode(-CLI_MOD_DESC_ENT_VERSION_ERROR)
- << DgString0(m_name);
- return ERROR;
- }
-
- if (latestDE->rowsetSize > 0)
- {
- if (rowsetSize == 0 || latestDE->rowsetSize < rowsetSize) {
- rowsetSize = latestDE->rowsetSize;
- descriptor->setDescItem(0, SQLDESC_ROWSET_SIZE,
- rowsetSize, 0);
- }
- descriptor->setDescItem(j, SQLDESC_ROWSET_VAR_LAYOUT_SIZE,
- latestDE->length, 0);
- }
-
- // This line of code is not necessary because internally
- // we record the FStype in the datatype field.
- // Besides, SQLDESC_TYPE and the FS datatype are not
- // compatible.
- // descriptor->setDescItem(j, SQLDESC_TYPE,
- // latestDE->datatype, 0);
-
- descriptor->setDescItem(j, SQLDESC_TYPE_FS,
- latestDE->datatype, 0);
- descriptor->setDescItem(j, SQLDESC_LENGTH,
- latestDE->length, 0);
- descriptor->setDescItem(j, SQLDESC_PRECISION,
- latestDE->precision, 0);
- descriptor->setDescItem(j, SQLDESC_SCALE,
- latestDE->scale, 0);
- descriptor->setDescItem(j, SQLDESC_NULLABLE,
- latestDE->nullable, 0);
-
- if (latestDE->datatype == REC_DATETIME)
- {
- descriptor->setDescItem(j, SQLDESC_DATETIME_CODE,
- latestDE->precision, 0);
-
- // SQLDESC_PRECISION is used to set fractional precision.
- // ANSI.
- descriptor->setDescItem(j, SQLDESC_PRECISION,
- latestDE->fractional_precision, 0);
-
- }
- else if ((latestDE->datatype >= REC_MIN_INTERVAL) &&
- (latestDE->datatype <= REC_MAX_INTERVAL))
- {
- descriptor->setDescItem(j, SQLDESC_INT_LEAD_PREC,
- latestDE->precision, 0);
-
- // SQLDESC_PRECISION is used to set fractional precision.
- // ANSI.
- descriptor->setDescItem(j, SQLDESC_PRECISION,
- latestDE->fractional_precision, 0);
- }
- // The SQLDESC_CHAR_SET_NAM has to be set for
- // charsets other than ISO88591 to work properly.
- else if ((latestDE->datatype >= REC_MIN_CHARACTER) &&
- (latestDE->datatype <= REC_MAX_CHARACTER))
- {
- CharInfo::CharSet cs = (CharInfo::CharSet)(latestDE->charset_offset);
-
- // the charset_offset field is not initialized to a valid
- // value in R1.8, it contains a value of 0(unknown).
- // Treat that value as ISO88591 in R2.
- if (((COM_VERSION) latestModHdr->getModuleVersion() ==
- COM_VERS_R1_8) &&
- (cs == CharInfo::UnknownCharSet))
- cs = CharInfo::ISO88591;
-
- descriptor->setDescItem(j, SQLDESC_CHAR_SET_NAM, 0,
- (char*)CharInfo::getCharSetName(cs));
-
-
- if ( CharInfo::maxBytesPerChar(cs) == SQL_DBCHAR_SIZE )
- descriptor->setDescItem(j, SQLDESC_LENGTH,
- (latestDE->length)/SQL_DBCHAR_SIZE, 0);
- }
-
- // For JDBC use. ordinal positon is not used, so we set to 0
- descriptor->setDescItem(j, SQLDESC_PARAMETER_INDEX, j, 0);
- if (latestDLTE->desc_type == dlt_entry_struct::INPUT_DESC_TYPE){
- descriptor->setDescItem(j, SQLDESC_PARAMETER_MODE, PARAMETER_MODE_IN, 0);
- descriptor->setDescItem(j, SQLDESC_ORDINAL_POSITION, 0, 0);
- }
- else{
- descriptor->setDescItem(j, SQLDESC_PARAMETER_MODE, PARAMETER_MODE_OUT, 0);
- descriptor->setDescItem(j, SQLDESC_ORDINAL_POSITION, 0, 0);
- }
-
-
-#if 0
-// what else is really there on disk?
-fprintf(stderr, "latestDescHdr->desc_entry[%d]\n", j);
-fprintf(stderr, " Int32 datatype = %d ;\n", latestDE->datatype);
-fprintf(stderr, " Int32 length = %d ;\n", latestDE->length);
-fprintf(stderr, " short nullable = %d ;\n", latestDE->nullable);
-fprintf(stderr, " Int32 charset_offset = %d ;\n", latestDE->charset_offset);
-fprintf(stderr, " Int32 coll_seq_offset = %d ;\n", latestDE->coll_seq_offset);
-fprintf(stderr, " Int32 scale = %d ;\n", latestDE->scale);
-fprintf(stderr, " Int32 precision = %d ;\n", latestDE->precision);
-fprintf(stderr, " Int32 fractional_precision = %d ;\n", latestDE->fractional_precision);
-fprintf(stderr, " Int32 output_name_offset = %d ;\n", latestDE->output_name_offset);
-fprintf(stderr, " short generated_output_name = %d ;\n", latestDE->generated_output_name);
-fprintf(stderr, " Int32 heading_offset = %d ;\n", latestDE->heading_offset);
-fprintf(stderr, " short string_format = %d ;\n", latestDE->string_format);
-fprintf(stderr, " Int32 var_ptr = %p ;\n", latestDE->var_ptr);
-fprintf(stderr, " Int32 var_data = %p ;\n", latestDE->var_data);
-fprintf(stderr, " Int32 ind_ptr = %p ;\n", latestDE->ind_ptr);
-fprintf(stderr, " Int32 ind_data = %d ;\n", latestDE->ind_data);
-fprintf(stderr, " Int32 datatype_ind = %d ;\n", latestDE->datatype_ind);
-fflush(stderr);
-// what may be at those offsets?
-if (latestDE->charset_offset > 0) {
-fprintf(stderr, " char * charset = %s ;\n",
- (char *)((char *)latestDescHdr + latestDE->charset_offset));
-fflush(stderr); }
-if (latestDE->coll_seq_offset > 0) {
-fprintf(stderr, " char * coll_seq = %s ;\n",
- (char *)((char *)latestDescHdr + latestDE->coll_seq_offset));
-fflush(stderr); }
-if (latestDE->output_name_offset > 0) {
-fprintf(stderr, " char * output_name = %s ;\n",
- (char *)((char *)latestDescHdr + latestDE->output_name_offset));
-fflush(stderr); }
-if (latestDE->heading_offset > 0) {
-fprintf(stderr, " char * heading = %s ;\n",
- (char *)((char *)latestDescHdr + latestDE->heading_offset));
-fflush(stderr); }
-
-#endif
-
- }
-
- } // for (i< numDesc), iterate on descriptors
- exHeap()->deallocateMemory(desc_area);
- } /* dlt area present */
-
- if (latestModHdr->plt_area_offset > 0)
- {
- if (allocAndReadPos(file, (char *&) plt,
- latestModHdr->plt_area_offset,
- latestModHdr->plt_area_length,
- exHeap(), diagsArea_, m_name))
- return ERROR;
-
- // give versioning a chance to massage/migrate it to this version
- latestPLTHdr = (plt_header_struct*)plt->driveUnpack(plt, &pltHdrCls, &vspc);
- if (!latestPLTHdr) {
- // error: version is no longer supported
- diagsArea_ << DgSqlCode(-CLI_MOD_PLT_HDR_VERSION_ERROR)
- << DgString0(m_name);
- return ERROR;
- }
-
- errCode = latestPLTHdr->RtduStructIsCorrupt();
- if (errCode)
- {
- exHeap()->deallocateMemory(plt);
- exHeap()->deallocateMemory(local_module_id);
- exHeap()->deallocateMemory(stmt_id);
- exHeap()->deallocateMemory(desc_id);
- if (dlt)
- exHeap()->deallocateMemory(dlt);
- if (source_area)
- exHeap()->deallocateMemory(source_area);
- if (schema_names_area)
- exHeap()->deallocateMemory(schema_names_area);
- if (object_area)
- exHeap()->deallocateMemory(object_area);
-
- // the module file is corrupted or has invalid data
- diagsArea_ << DgSqlCode(errCode) << DgString0(m_name);
- return ERROR;
- }
-
- if (latestPLTHdr->num_procedures >= 1)
- {
- Int32 num_procs = latestPLTHdr->num_procedures;
- module->setStatementCount( num_procs );
-
- start_stmt_name = (((char *)(latestPLTHdr))
- + latestModHdr->plt_hdr_length
- + (num_procs) * latestModHdr->plt_entry_length);
-
-#ifdef NA_64BIT
- // dg64 - should be 4 bytes
- Int32 length;
-#else
- Lng32 length;
-#endif
-
- for (Lng32 i = 0; i < num_procs; i++)
- {
- // get ith procedure location table entry
- plte = latestPLTHdr->getPLTEntry(i, latestModHdr->plt_entry_length);
-
- // give versioning a chance to massage/migrate it to this version
- latestPLTE = (plt_entry_struct*)plte->driveUnpack(plte, &plteCls, &vspc);
- if (!latestPLTE) {
- // error: version is no longer supported
- diagsArea_ << DgSqlCode(-CLI_MOD_PLT_ENT_VERSION_ERROR)
- << DgString0(m_name);
- return ERROR;
- }
-
- stmt_id = getStatementId(latestPLTE, start_stmt_name, stmt_id,
- exHeap());
-
- if (latestPLTE->curname_offset >= 0)
- {
- if (stmt_id->name_mode == stmt_name)
- {
- statement = getStatement(stmt_id);
- if (!statement)
- {
- allocateStmt(stmt_id, Statement::DYNAMIC_STMT);
- }
- }
-
- str_cpy_all((char *)&length,
- (start_stmt_name + latestPLTE->curname_offset),
- sizeof(length));
-
- char * curname =
- (char *)(exHeap()->allocateMemory((size_t)(length + 1)));
- str_cpy_all(curname,
- start_stmt_name + latestPLTE->curname_offset + 4,
- length);
- curname[length] = '\0';
-
- stmt_id->name_mode = cursor_name;
- allocateStmt(stmt_id, curname, Statement::STATIC_STMT, module);
-
- // now make stmt_id suitable to look up the new statement...
- const char * stmtname = stmt_id->identifier;
- stmt_id->identifier = curname;
- stmt_id->identifier_len = length;
- exHeap()->deallocateMemory((char*)stmtname);
- }
- else
- {
- SQLSTMT_ID * cloned_stmt = NULL;
- allocateStmt(stmt_id, Statement::STATIC_STMT, cloned_stmt, module);
- }
-
- statement = getStatement(stmt_id);
- // this flag indicates whether the statement is a holdable cursor.
- // This flag will be propagated to the leave operators, partition access
- // upon opening the statement - For pubsub holdable
- statement->setPubsubHoldable(diagsArea_, latestPLTE->holdable);
-
- // copy statement index from PLTE
- assert (latestPLTE->statementIndex < module->getStatementCount());
- statement->setStatementIndex(latestPLTE->statementIndex);
-
- if (latestPLTE->source_offset >= 0)
- {
- statement->copyInSourceStr(source_area + latestPLTE->source_offset,
- latestPLTE->source_length);
- }
-
- if (latestPLTE->schema_name_offset >= 0)
- {
- statement->copySchemaName(schema_names_area + latestPLTE->schema_name_offset,
- latestPLTE->schema_name_length);
- }
-
- if (latestPLTE->gen_object_offset >= 0)
- {
- statement->copyGenCode(object_area + latestPLTE->gen_object_offset,
- latestPLTE->gen_object_length,
- unpackTDBs);
- }
- else
- {
-#pragma nowarn(1506) // warning elimination
- statement->setRecompWarn(latestPLTE->recompWarn());
-#pragma warn(1506) // warning elimination
- }
-if (latestPLTE->recomp_control_info_offset >= 0)
- {
- statement->copyRecompControlInfo(recomp_control_info_area,
- recomp_control_info_area +
- latestPLTE->recomp_control_info_offset,
- latestPLTE->recomp_control_info_length);
- }
-
-#pragma nowarn(1506) // warning elimination
- statement->setNametypeNsk(latestPLTE->nametypeNsk());
-#pragma warn(1506) // warning elimination
-
-#pragma nowarn(1506) // warning elimination
- statement->setOdbcProcess(latestPLTE->odbcProcess());
- statement->setSystemModuleStmt(isSystemModule);
-#pragma warn(1506) // warning elimination
- } /* for , iterate on statements */
-
- }
- } /* plt area present */
-
-
- if (latestModHdr->vproc_area_length > 0)
- {
- if (allocAndReadPos(file, vproc_area,
- latestModHdr->vproc_area_offset,
- (Int32)latestModHdr->vproc_area_length,
- exHeap(), diagsArea_, m_name))
- return ERROR;
-
- module->setVproc(vproc_area);
- }
-
- if (latestDLTHdr)
- {
- for (Lng32 i = 0; i < latestDLTHdr->num_descriptors; i++)
- {
- // get ith descriptor location table entry
- dlte = latestDLTHdr->getDLTEntry(i, latestModHdr->dlt_entry_length);
-
- // give versioning a chance to massage/migrate it to this version
- latestDLTE = (dlt_entry_struct*)dlte->driveUnpack(dlte, &dlteCls, &vspc);
- if (!latestDLTE) {
- // error: version is no longer supported
- diagsArea_ << DgSqlCode(-CLI_MOD_DLT_ENT_VERSION_ERROR)
- << DgString0(m_name);
- return ERROR;
- }
-
- if (latestDLTE->stmtname_offset >= 0)
- {
-#ifdef NA_64BIT
- // dg64 - should be 4 bytes
- Int32 length;
-#else
- Lng32 length;
-#endif
-
- str_cpy_all((char *)&length,
- start_desc_name + latestDLTE->stmtname_offset, 4);
-
- if (stmt_id->identifier) {
- exHeap()->deallocateMemory((char*)stmt_id->identifier);
- stmt_id->identifier = 0;
- }
- char * id =
- (char *)(exHeap()->allocateMemory((size_t)(length + 1)));
- str_cpy_all(id,
- start_desc_name + latestDLTE->stmtname_offset + 4 ,
- length);
- id[length] = '\0';
-
- stmt_id->identifier = id;
- stmt_id->identifier_len = length;
-
- stmt_id->handle = 0;
-
- statement = getStatement(stmt_id);
-
- if (statement)
- {
- enum SQLWHAT_DESC descType;
- if (latestDLTE->desc_type == dlt_entry_struct::INPUT_DESC_TYPE)
- descType = SQLWHAT_INPUT_DESC;
- else
- descType = SQLWHAT_OUTPUT_DESC;
- statement->addDefaultDesc(descriptor, descType);
- } // if(statement)
- }
- }
- }
-
- if (latestPLTHdr)
- {
- for (Lng32 i = 0; i < latestPLTHdr->num_procedures; i++)
- {
- // get ith procedure location table entry
- plte = latestPLTHdr->getPLTEntry(i, latestModHdr->plt_entry_length);
-
- // give versioning a chance to massage/migrate it to this version
- latestPLTE = (plt_entry_struct*)plte->driveUnpack(plte, &plteCls, &vspc);
- if (!latestPLTE) {
- // error: version is no longer supported
- diagsArea_ << DgSqlCode(-CLI_MOD_PLT_ENT_VERSION_ERROR)
- << DgString0(m_name);
- return ERROR;
- }
-
- stmt_id = getStatementId(latestPLTE, start_stmt_name, stmt_id,
- exHeap());
- if (stmt_id &&
- (latestPLTE->curname_offset >= 0) &&
- (stmt_id->name_mode == stmt_name))
- {
-#ifdef NA_64BIT
- // dg64 - should be 4 bytes
- Int32 length;
-#else
- Lng32 length;
-#endif
-
- str_cpy_all((char *)&length,
- (start_stmt_name + latestPLTE->curname_offset), 4);
- char * curname =
- (char *)(exHeap()->allocateMemory((size_t)(length + 1)));
- str_cpy_all(curname,
- start_stmt_name + latestPLTE->curname_offset + 4,
- length);
- curname[length] = '\0';
-#if 0
- fprintf(stderr, "Looking for special cursor '%s' for statement %s\n",
- curname,
- stmt_id->identifier);
-#endif
- if (stmt_id->identifier)
- {
- exHeap()->deallocateMemory((char *)stmt_id->identifier);
- stmt_id->identifier = 0;
- }
- stmt_id->identifier = curname;
- stmt_id->identifier_len = length;
-
- stmt_id->name_mode = cursor_name;
- }
- statement = getStatement(stmt_id);
-#if 0
- if (!statement)
- {
- fprintf(stderr, "Could not find ");
- if (stmt_id->name_mode == cursor_name)
- {
- fprintf(stderr, "CURSOR %s\n", stmt_id->identifier);
- }
- else
- {
- fprintf(stderr, "STATEMENT %s\n", stmt_id->identifier);
- }
- }
-#endif
-
- if (latestPLTE->input_desc_entry >= 0)
- {
- // get input descriptor entry
- dlte = latestDLTHdr->getDLTEntry
- (latestPLTE->input_desc_entry, latestModHdr->dlt_entry_length);
-
- // give versioning a chance to massage/migrate it to this version
- latestDLTE = (dlt_entry_struct*)dlte->driveUnpack(dlte, &dlteCls, &vspc);
- if (!latestDLTE) {
- // error: version is no longer supported
- diagsArea_ << DgSqlCode(-CLI_MOD_DLT_ENT_VERSION_ERROR)
- << DgString0(m_name);
- return ERROR;
- }
-
-#ifdef NA_64BIT
- // dg64 - should be 4 bytes
- Int32 length;
-#else
- Lng32 length;
-#endif
-
- str_cpy_all((char *)&length,
- (start_desc_name + latestDLTE->descname_offset), 4);
-
- if (desc_id->identifier) {
- exHeap()->deallocateMemory((char *)desc_id->identifier);
- desc_id->identifier = 0;
- }
- char * id =
- (char *)(exHeap()->allocateMemory((size_t)(length + 1)));
- str_cpy_all(id, start_desc_name + latestDLTE->descname_offset + 4, length);
- id[length] = '\0';
- desc_id->identifier = id;
- desc_id->identifier_len = length;
-
- descriptor = getDescriptor(desc_id);
-
- statement->addDefaultDesc(descriptor, SQLWHAT_INPUT_DESC);
-
- // select desc info and move them into desc
- if (unpackTDBs)
- {
- // the static Call desc is "wide" by default,
- // in the future, we may choose to store flags in the
- // desc_struct to represent the "wide"/"narrow" mode.
- // or have a dynamic runtime flag to control the mode.
- if (statement->getRootTdb() &&
- statement->getRootTdb()->hasCallStmtExpressions())
- descriptor->setDescTypeWide(TRUE);
-
- RETCODE retCode =
- statement->addDescInfoIntoStaticDesc(descriptor,
- SQLWHAT_INPUT_DESC,
- diags());
- ex_assert(retCode>=0, "failed to add desc info.");
- }
- }
-
- if (latestPLTE->output_desc_entry >= 0)
- {
- // get output descriptor entry
- dlte = latestDLTHdr->getDLTEntry
- (latestPLTE->output_desc_entry, latestModHdr->dlt_entry_length);
-
- // give versioning a chance to massage/migrate it to this version
- latestDLTE = (dlt_entry_struct*)dlte->driveUnpack(dlte, &dlteCls, &vspc);
- if (!latestDLTE) {
- // error: version is no longer supported
- diagsArea_ << DgSqlCode(-CLI_MOD_DLT_ENT_VERSION_ERROR)
- << DgString0(m_name);
- return ERROR;
- }
-
-#ifdef NA_64BIT
- // dg64 - should be 4 bytes
- Int32 length;
-#else
- Lng32 length;
-#endif
-
- str_cpy_all((char *)&length,
- (start_desc_name+ latestDLTE->descname_offset), 4);
-
- if (desc_id->identifier) {
- exHeap()->deallocateMemory((char *)desc_id->identifier);
- desc_id->identifier = 0;
- }
- char * id =
- (char *)(exHeap()->allocateMemory((size_t)(length + 1)));
- str_cpy_all(id,
- start_desc_name + latestDLTE->descname_offset + 4,
- length);
- id[length] = '\0';
- desc_id->identifier =id;
- desc_id->identifier_len = length;
-
- descriptor = getDescriptor(desc_id);
- statement->addDefaultDesc(descriptor, SQLWHAT_OUTPUT_DESC);
-
- if (unpackTDBs)
- {
- if (statement->getRootTdb() &&
- statement->getRootTdb()->hasCallStmtExpressions())
- descriptor->setDescTypeWide(TRUE);
-
- RETCODE retCode =
- statement->addDescInfoIntoStaticDesc(descriptor,
- SQLWHAT_OUTPUT_DESC,
- diags());
- ex_assert(retCode>=0, "failed to add desc info");
- }
-
- }
- } // for loop
- }
-
- if (dlt) {
- exHeap()->deallocateMemory(dlt);
- dlt = 0;
- }
-
- if (plt) {
- exHeap()->deallocateMemory(plt);
- plt = 0;
- }
-
- if (source_area) {
- exHeap()->deallocateMemory(source_area);
- source_area = 0;
- }
-
- if (schema_names_area) {
- exHeap()->deallocateMemory(schema_names_area);
- schema_names_area = 0;
- }
-
- if (recomp_control_info_area) {
- exHeap()->deallocateMemory(recomp_control_info_area);
- recomp_control_info_area = 0;
- }
-
- if (object_area) {
- exHeap()->deallocateMemory(object_area);
- object_area = 0;
- }
-
- if (stmt_id->identifier) {
- exHeap()->deallocateMemory((char *)stmt_id->identifier);
- stmt_id->identifier = 0;
- }
- exHeap()->deallocateMemory(stmt_id);
- stmt_id = 0;
-
- if (desc_id->identifier) {
- exHeap()->deallocateMemory((char *)desc_id->identifier);
- desc_id->identifier = 0;
- }
- exHeap()->deallocateMemory(desc_id);
- desc_id = 0;
-
- if (local_module_id->module_name) {
- exHeap()->deallocateMemory((char *)local_module_id->module_name);
- local_module_id->module_name = 0;
- }
- exHeap()->deallocateMemory(local_module_id);
- local_module_id = 0;
-
- moduleList()->insert(module_name, module_nm_len, (void *)module);
-
- return SUCCESS;
-}
-
RETCODE ContextCli::allocateDesc(SQLDESC_ID * descriptor_id, Lng32 max_entries)
{
const char * hashData;
@@ -1521,115 +515,6 @@ RETCODE ContextCli::allocateDesc(SQLDESC_ID * descriptor_id, Lng32 max_entries)
return SUCCESS;
}
-RETCODE ContextCli::dropModule(const SQLMODULE_ID * module_id)
-{
- const char * module_name = module_id->module_name;
- Lng32 module_nm_len = getModNameLen(module_id);
-
- Module * module;
- moduleList()->position(module_name, module_nm_len);
- NABoolean found = FALSE;
- while ((NOT found) &&
- (module = (Module *)moduleList()->getNext()))
- {
- if ((module_nm_len == module->getModuleNameLen()) &&
- (str_cmp(module_id->module_name,
- module->getModuleName(),
- module_nm_len) == 0) )
- found = TRUE; // found
- }
-
- if (NOT found)
- {
- // caller should have validated that module has been added.
- return ERROR;
- }
-
- NABoolean done = FALSE;
- while (NOT done)
- {
- Statement * statement;
- NABoolean found = FALSE;
- statementList_->position();
- while ((NOT found) &&
- (statement = (Statement *)statementList_->getNext()))
- {
- if ((statement->getModule()) &&
- (statement->getModule() == module) &&
- (statement->getStmtId()))
- {
- found = TRUE;
- }
- } // while
-
- if (found)
- {
- // Should we ignore errors from deallocStmt?? TBD.
- if (deallocStmt(statement->getStmtId(), TRUE))
- return ERROR;
- }
- else
- done = TRUE;
- } // while not done
-
- done = FALSE;
- while (NOT done)
- {
- Descriptor *desc;
- NABoolean found = FALSE;
- descriptorList()->position();
- while ((NOT found) &&
- (desc = (Descriptor *)descriptorList()->getNext()))
- {
- if ((desc->getModuleId()) &&
- (desc->getModuleId()->module_name) &&
- (strcmp(desc->getModuleId()->module_name, module_name) == 0))
- {
- found = TRUE;
- }
- } // while
-
- if (found)
- {
- // Should we ignore errors from deallocDesc?? TBD.
- if (deallocDesc(desc->getDescName(), TRUE))
- return ERROR;
- }
- else
- done = TRUE;
- } // while not done
-
- moduleList()->remove(module);
-
- delete module;
-
- return SUCCESS;
-}
-
-Module * ContextCli::getModule(const SQLMODULE_ID * module_id)
-{
- const char * module_name = module_id->module_name;
- Lng32 module_nm_len = getModNameLen(module_id);
-
- Module * module;
- moduleList()->position(module_name, module_nm_len);
- NABoolean found = FALSE;
- while ((NOT found) &&
- (module = (Module *)moduleList()->getNext()))
- {
- if ((module_nm_len == module->getModuleNameLen()) &&
- (str_cmp(module_id->module_name,
- module->getModuleName(),
- module_nm_len) == 0) )
- found = TRUE; // found
- }
-
- if (found)
- return module;
- else
- return NULL;
-}
-
RETCODE ContextCli::deallocDesc(SQLDESC_ID * desc_id,
NABoolean deallocStaticDesc)
{
@@ -1733,9 +618,6 @@ Descriptor *ContextCli::getDescriptor(SQLDESC_ID * descriptor_id)
{
case desc_handle:
if (descriptor_id->handle == descriptor->getDescHandle()) {
-#if defined( NA_SHADOWCALLS )
- SqlCliSp_StoreDescriptor(descriptor_id, (void *)descriptor);
-#endif
return descriptor;
}
break;
@@ -1760,9 +642,6 @@ Descriptor *ContextCli::getDescriptor(SQLDESC_ID * descriptor_id)
exHeap()->deallocateMemory(desc1);
desc1 = 0;
}
-#if defined( NA_SHADOWCALLS )
- SqlCliSp_StoreDescriptor(descriptor_id, (void *)descriptor); //shadow
-#endif
return descriptor;
}
break;
@@ -2000,62 +879,9 @@ Statement *ContextCli::getStatement(SQLSTMT_ID * statement_id, HashQueue * stmtL
return 0;
}
-static
-SQLSTMT_ID * getStatementId(plt_entry_struct * plte,
- char * start_stmt_name,
- SQLSTMT_ID * stmt_id,
- NAHeap *heap)
-{
-#ifdef NA_64BIT
- // dg64 - should be 4 bytes
- Int32 length;
-#else
- Lng32 length;
-#endif
-
- if (plte->stmtname_offset >= 0)
- {
- stmt_id->name_mode = stmt_name;
- str_cpy_all((char *)&length, (start_stmt_name + plte->stmtname_offset), 4);
-
- if (stmt_id->identifier) {
- heap->deallocateMemory((char *)stmt_id->identifier);
- stmt_id->identifier = 0;
- }
- char * id =
- (char *)(heap->allocateMemory((size_t)(length + 1)));
-
- str_cpy_all(id, start_stmt_name + plte->stmtname_offset + 4, length);
- id[length] = '\0';
- stmt_id->identifier = id;
- stmt_id -> identifier_len = length;
- }
- else if (plte->curname_offset >= 0)
- {
- stmt_id->name_mode = cursor_name;
-
- str_cpy_all((char *)&length, (start_stmt_name + plte->curname_offset), 4);
-
- if (stmt_id->identifier) {
- heap->deallocateMemory((char *)stmt_id->identifier);
- stmt_id->identifier = 0;
- }
- char * id =
- (char *)(heap->allocateMemory((size_t)(length + 1)));
- str_cpy_all(id, start_stmt_name + plte->curname_offset + 4, length);
- id[length] = '\0';
- stmt_id->identifier = id;
- stmt_id -> identifier_len = length;
- }
-
- return stmt_id;
-}
-
-
RETCODE ContextCli::allocateStmt(SQLSTMT_ID * statement_id,
Statement::StatementType stmt_type,
- SQLSTMT_ID * cloned_from_stmt_id,
- Module *module)
+ SQLSTMT_ID * cloned_from_stmt_id)
{
const char * hashData = NULL;
ULng32 hashDataLength = 0;
@@ -2101,7 +927,7 @@ RETCODE ContextCli::allocateStmt(SQLSTMT_ID * statement_id,
}
Statement * statement =
- new(exCollHeap()) Statement(statement_id, cliGlobals_, stmt_type, NULL, module);
+ new(exCollHeap()) Statement(statement_id, cliGlobals_, stmt_type, NULL, NULL);
if (cloned_from_stmt)
statement->bindTo(cloned_from_stmt);
@@ -2128,56 +954,11 @@ RETCODE ContextCli::allocateStmt(SQLSTMT_ID * statement_id,
return SUCCESS;
}
-
-// private internal method - only called from ContextCli::addModule()
-RETCODE ContextCli::allocateStmt(SQLSTMT_ID * statement_id,
- char * cn,
- Statement::StatementType stmt_type,
- Module *module)
-{
- char * hashData = NULL;
- ULng32 hashDataLength = 0;
-
- if (statement_id->name_mode != cursor_name)
- {
- diagsArea_ << DgSqlCode(-CLI_INTERNAL_ERROR);
- return ERROR;
- }
-
- // find if this cursor already exists & return error, if it does...
- const char * sn = statement_id->identifier; // save the statement name
- statement_id->identifier = cn; // do the lookup with cursor name
- if (getStatement(statement_id))
- {
- statement_id->identifier = sn; // restore the statement name
- diagsArea_ << DgSqlCode(- CLI_DUPLICATE_STMT);
- return ERROR;
- }
-
- statement_id->identifier = sn; // restore the statement name
-
- Statement * statement =
- new(exCollHeap()) Statement(statement_id, cliGlobals_, stmt_type, cn, module);
-
- hashData = cn;
- hashDataLength = strlen(hashData);
-
- StmtListDebug1(statement, "Adding %p to statementList_", statement);
-
- semaphoreLock();
- statementList()->insert(hashData, hashDataLength, (void *) statement);
- if (processStats_!= NULL)
- processStats_->incStmtCount(stmt_type);
- semaphoreRelease();
-
- return SUCCESS;
-}
-
RETCODE ContextCli::deallocStmt(SQLSTMT_ID * statement_id,
NABoolean deallocStaticStmt)
{
// for now, dump memory info before deleting the statement
-#if defined(_DEBUG) && !defined(__EID) && !defined(NA_NSK)
+#if defined(_DEBUG)
char * filename = getenv("MEMDUMP");
if (filename) {
// open output file sytream.
@@ -3028,7 +1809,7 @@ NABoolean ContextCli::reclaimStatements()
return FALSE;
-#if defined(_DEBUG) && !defined(__EID)
+#if defined(_DEBUG)
char *reclaimAfter = NULL;
Lng32 reclaimIf = (reclaimAfter == NULL)? 0: atol(reclaimAfter);
@@ -3159,7 +1940,7 @@ void ContextCli::removeFromCloseStatementList(Statement * statement,
statement);
}
-#if defined(_DEBUG) && !defined(__EID) && !defined(NA_NSK)
+#if defined(_DEBUG)
void ContextCli::dumpStatementInfo()
{
@@ -3645,7 +2426,7 @@ RETCODE ContextCli::cleanupChildStmt(Statement *child)
} // ContextCLI::cleanupChildStmt()
-#ifdef NA_DEBUG_C_RUNTIME
+#ifdef _DEBUG
void ContextCli::StmtListPrintf(const Statement *s,
const char *formatString, ...) const
{
@@ -3943,7 +2724,6 @@ void ContextCli::endMxcmpSession(NABoolean cleanupEsps,
if (clearCmpCache)
flags |= CmpMessageEndSession::CLEAR_CACHE;
-#ifdef NA_CMPDLL
Int32 cmpStatus = 2; // assume failure
if (getSessionDefaults()->callEmbeddedArkcmp() &&
isEmbeddedArkcmpInitialized() &&
@@ -3979,29 +2759,26 @@ void ContextCli::endMxcmpSession(NABoolean cleanupEsps,
(cmpStatus != 0 || (CmpCommon::context()->getRecursionLevel() > 0) ||
getArkcmp()->getServer())))
{
-#endif // NA_CMPDLL
- // send request to mxcmp so it can cleanup esps started by it
- // and reset nonResetable attributes.
- // Ignore errors.
- if (getNumArkcmps() > 0)
- {
- short indexIntoCompilerArray = getIndexToCompilerArray();
- ExSqlComp::ReturnStatus status =
- cliGlobals_->getArkcmp(indexIntoCompilerArray)->sendRequest
- (EXSQLCOMP::END_SESSION, (char*)&flags, sizeof(Lng32));
-
- if (status == ExSqlComp::SUCCESS)
+ // send request to mxcmp so it can cleanup esps started by it
+ // and reset nonResetable attributes.
+ // Ignore errors.
+ if (getNumArkcmps() > 0)
{
- status =
- cliGlobals_->getArkcmp(indexIntoCompilerArray)->getReply(
- dummyReply, dummyLength);
- cliGlobals_->getArkcmp(indexIntoCompilerArray)->
- getHeap()->deallocateMemory((void*)dummyReply);
+ short indexIntoCompilerArray = getIndexToCompilerArray();
+ ExSqlComp::ReturnStatus status =
+ cliGlobals_->getArkcmp(indexIntoCompilerArray)->sendRequest
+ (EXSQLCOMP::END_SESSION, (char*)&flags, sizeof(Lng32));
+
+ if (status == ExSqlComp::SUCCESS)
+ {
+ status =
+ cliGlobals_->getArkcmp(indexIntoCompilerArray)->getReply(
+ dummyReply, dummyLength);
+ cliGlobals_->getArkcmp(indexIntoCompilerArray)->
+ getHeap()->deallocateMemory((void*)dummyReply);
+ }
}
- }
-#ifdef NA_CMPDLL
} // end if (getSessionDefaults()->callEmbeddedArkcmp() && ...
-#endif // NA_CMPDLL
}
void ContextCli::resetAttributes()
@@ -5252,9 +4029,6 @@ RETCODE ContextCli::authQuery(
//*********************** End of ContextCli::authQuery *************************
-
-
-
// Public method to update the databaseUserID_ and databaseUserName_
// members and at the same time. It also calls dropSession() to create a
// session boundary.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/cli/Context.h
----------------------------------------------------------------------
diff --git a/core/sql/cli/Context.h b/core/sql/cli/Context.h
index ad5a0be..e0d6ccc 100644
--- a/core/sql/cli/Context.h
+++ b/core/sql/cli/Context.h
@@ -56,9 +56,7 @@
#include "NAUserId.h"
#include "SessionDefaults.h"
#include "ex_transaction.h"
-#ifdef NA_CMPDLL
#include "CmpCommon.h"
-#endif // NA_CMPDLL
#include "ExSqlComp.h"
#include "ExStats.h"
#include "ExpSeqGen.h"
@@ -285,11 +283,9 @@ private:
// keeps track of current define context.
unsigned short defineContext_;
-#ifdef NA_CMPDLL
// flag and pointer to the embedded arkcmp context
NABoolean isEmbeddedArkcmpInitialized_;
CmpContext * embeddedArkcmpContext_;
-#endif // NA_CMPDLL
// pointer to the array of server versions used to communicate with ARKCMP.
ARRAY(ExSqlComp *) arkcmpArray_;
@@ -419,10 +415,6 @@ private:
inline HashQueue * cursorList(){return cursorList_;};
inline HashQueue * openStatementList(){return openStatementList_;};
- RETCODE allocateStmt(SQLSTMT_ID * stmt_id, char * cn,
- Statement::StatementType stmt_type,
- Module *module = NULL);
-
// Used to reclaim space from a list of closed statements.
void addToCloseStatementList(Statement *statement);
@@ -644,19 +636,8 @@ public:
Lng32 initializeExeBDRConfigInfo(char *mgbltyCatName,
ComDiagsArea * diagsArea);
-SQLCLI_LIB_FUNC
short moduleAdded(const SQLMODULE_ID * module_name);
-SQLCLI_LIB_FUNC
- RETCODE addModule(const SQLMODULE_ID * module_name,
- NABoolean tsCheck = TRUE,
- NABoolean unpackTDBs = TRUE, char * moduleDir = NULL,
- NABoolean lookInGlobalModDir = TRUE);
-
-SQLCLI_LIB_FUNC
- RETCODE dropModule(const SQLMODULE_ID * module_name);
- Module * getModule(const SQLMODULE_ID * module_id);
-
RETCODE allocateDesc(SQLDESC_ID * desc_id, Lng32 max_entries);
RETCODE deallocDesc(SQLDESC_ID * desc_id,
NABoolean deallocStaticDesc);
@@ -664,8 +645,7 @@ SQLCLI_LIB_FUNC
RETCODE allocateStmt(SQLSTMT_ID * stmt_id,
Statement::StatementType stmt_type = Statement::DYNAMIC_STMT,
- SQLSTMT_ID * cloned_stmt_id = NULL,
- Module * module = NULL);
+ SQLSTMT_ID * cloned_stmt_id = NULL);
RETCODE deallocStmt(SQLSTMT_ID * stmt_id,
NABoolean deallocStaticStmt);
@@ -686,7 +666,6 @@ SQLCLI_LIB_FUNC
short commitTransaction(NABoolean waited);
short releaseAllTransactionalRequests();
-SQLCLI_LIB_FUNC
void closeAllCursors(enum CloseCursorType,
enum closeTransactionType transType, const Int64 executorXnId = 0,
NABoolean inRollback = FALSE);
@@ -729,10 +708,8 @@ SQLCLI_LIB_FUNC
// return the TimeoutData field of the context (if it is NULL --allocate it)
// (If allocate == FALSE, just return it as is, even if it is NULL)
-SQLCLI_LIB_FUNC
TimeoutData * getTimeouts( NABoolean allocate = TRUE );
-SQLCLI_LIB_FUNC
void clearTimeoutData(); // deallocate the TimeoutData
// make these functions non-inline on NT and inline on NSK.
@@ -742,14 +719,11 @@ SQLCLI_LIB_FUNC
// By making them non-inline on nt, a stub could be added.
// This problem does not show up on nsk since inline functions
// are really inline out there.
-SQLCLI_LIB_FUNC
void incrementTimeoutChangeCounter();
-SQLCLI_LIB_FUNC
UInt32 getTimeoutChangeCounter();
void* &catmanInfo() {return catmanInfo_;}
-#ifdef NA_CMPDLL
////////////////////////////////////////////////////
// Used to communicate with the embedded ARKCMP.
////////////////////////////////////////////////////
@@ -763,7 +737,6 @@ SQLCLI_LIB_FUNC
void setEmbeddedArkcmpContext(CmpContext * cntx)
{ embeddedArkcmpContext_ = cntx; }
-#endif // NA_CMPDLL
////////////////////////////////////////////////////
// Used to communicate with the ARKCMP process.
////////////////////////////////////////////////////
@@ -983,7 +956,7 @@ SQLCLI_LIB_FUNC
void killIdleMxcmp();
void killAndRecreateMxcmp();
-#ifdef NA_DEBUG_C_RUNTIME
+#ifdef _DEBUG
public:
void StmtListPrintf(const Statement *s, const char *formatString, ...) const;
#endif
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/cli/Descriptor.cpp
----------------------------------------------------------------------
diff --git a/core/sql/cli/Descriptor.cpp b/core/sql/cli/Descriptor.cpp
index f501ecc..efa5d58 100644
--- a/core/sql/cli/Descriptor.cpp
+++ b/core/sql/cli/Descriptor.cpp
@@ -56,12 +56,7 @@
#include "exp_clause_derived.h"
// WARNING: assuming varchar length indicator of sizeof(long) == 4
-#ifdef NA_64BIT
-// dg64 - should be 4 bytes - see WARNING above
#define VCPREFIX_LEN sizeof(Int32)
-#else
-#define VCPREFIX_LEN sizeof(Lng32)
-#endif
// extern declaration
extern short
@@ -483,19 +478,9 @@ void setVCLength(char * tgt, Lng32 len, size_t vcPrefixLength)
return;
}
-#ifdef NA_64BIT
- // dg64 - should be 4 bytes
if (vcPrefixLength == sizeof(Int32))
-#else
- if (vcPrefixLength == sizeof(Lng32))
-#endif
{
-#ifdef NA_64BIT
- // dg64 - should be 4 bytes
str_cpy_all(tgt, (char *)&len, sizeof(Int32));
-#else
- str_cpy_all(tgt, (char *)&len, sizeof(Lng32));
-#endif
}
else if (vcPrefixLength == sizeof(short))
{
@@ -521,19 +506,9 @@ Lng32 getVCLength(const char * source_string, size_t vcPrefixLength)
return 0L;
}
-#ifdef NA_64BIT
- // dg64 - should be 4 bytes
if (vcPrefixLength == sizeof(Int32))
-#else
- if (vcPrefixLength == sizeof(Lng32))
-#endif
{
-#ifdef NA_64BIT
- // dg64 - should be 4 bytes
str_cpy_all((char *)&returned_len, source_string, sizeof(Int32));
-#else
- str_cpy_all((char *)&returned_len, source_string, sizeof(Lng32));
-#endif
}
else if (vcPrefixLength == sizeof(short))
{
@@ -2271,12 +2246,7 @@ RETCODE Descriptor::setDescItem(Lng32 entry, Lng32 what_to_set,
case SQLDESC_LENGTH:
case SQLDESC_IND_TYPE:
targetType = REC_BIN32_SIGNED;
-#ifdef NA_64BIT
- // dg64 - should be 4 bytes
targetLen = sizeof(Int32);
-#else
- targetLen = sizeof(Lng32);
-#endif
targetPrecision = 31;
targetScale = 0;
break;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/cli/Descriptor.h
----------------------------------------------------------------------
diff --git a/core/sql/cli/Descriptor.h b/core/sql/cli/Descriptor.h
index df07a0d..b092069 100644
--- a/core/sql/cli/Descriptor.h
+++ b/core/sql/cli/Descriptor.h
@@ -60,7 +60,7 @@ class CliStatement;
// BulkMoveInfo
// -----------------------------------------------------------------------
-class SQLCLI_LIB_FUNC BulkMoveInfo
+class BulkMoveInfo
{
public:
friend class Descriptor;
@@ -130,7 +130,7 @@ private:
// Descriptor
// -----------------------------------------------------------------------
#pragma warning (disable : 4275) //warning elimination
-class SQLCLI_LIB_FUNC Descriptor : public ExGod {
+class Descriptor : public ExGod {
#pragma warning (default : 4275) //warning elimination
enum Flags
{
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/cli/ExSqlComp.cpp
----------------------------------------------------------------------
diff --git a/core/sql/cli/ExSqlComp.cpp b/core/sql/cli/ExSqlComp.cpp
index 94a110b..dd4a576 100644
--- a/core/sql/cli/ExSqlComp.cpp
+++ b/core/sql/cli/ExSqlComp.cpp
@@ -27,17 +27,6 @@
* Description: This file contains the implementation of ExSqlComp class for
* executor to create arkcmp process and send requests
* for compilation and SQLCAT related tasks.
- * There are two modes this file to be compiled :
- * -DNA_ARKCMP_PROCESS_SINGLE :
- * In this case, the routines are compiled such that the
- * user will have choice to call compiler routines either
- * through linked in routines or through IPC to arkcmp, a
- * different process (choice via an env var).
- * (NOT USED ANY MORE. SEE NOTE BELOW.)
- * default case :
- * In this case, the routines are compiled such that all
- * the compiler main routines are performed in arkcmp process
- * (a different process, not linked into the executor).
*
* Created: 06/21/96
* Language: C++
@@ -103,16 +92,6 @@ void ExSqlComp::clearDiags()
diagArea_ = diagArea_->allocate(h_);
}
-inline NABoolean ExSqlComp::oneProcess()
-{
-#ifdef NA_ARKCMP_PROCESS_SINGLE
- static NABoolean flag = !getenv("ARKCMP_PROCESS_SINGLE_OFF");
- return flag;
-#else
- return FALSE;
-#endif
-}
-
inline void ExSqlComp::initRequests(Requests& req)
{
req.message_ = 0;
@@ -150,11 +129,11 @@ ExSqlComp::ReturnStatus ExSqlComp::createServer()
compilerVersion_,nodeName_)))
{
//ss_cc_change : Rare error condition
- //LCOV_EXCL_START
+ //
*diagArea_ << DgSqlCode(- CLI_OUT_OF_MEMORY)
<< DgString0("IpcServerClass");
ret = ERROR;
- //LCOV_EXCL_STOP
+
}
else
{
@@ -174,7 +153,7 @@ ExSqlComp::ReturnStatus ExSqlComp::createServer()
(priority < 1))
//ss_cc_change - rare occurence
- priority = IPC_PRIORITY_DONT_CARE;//LCOV_EXCL_LINE
+ priority = IPC_PRIORITY_DONT_CARE;
ComDiagsArea* diags = 0;
if ( !( server_ = sc_->allocateServerProcess(&diags, h_,nodeName_,
@@ -193,14 +172,14 @@ ExSqlComp::ReturnStatus ExSqlComp::createServer()
cliGlobals_->currContext()->checkAndSetCurrentDefineContext();
}
//ss_cc_change : rare error condition
- //LCOV_EXCL_START
+ //
if (ret == ERROR)
{
error(arkcmpErrorServer);
if (getenv("DEBUG_SERVER"))
MessageBox(NULL, "ExSqlComp:createServer", "error ", MB_OK|MB_ICONINFORMATION);
}
- //LCOV_EXCL_STOP
+
return ret;
}
@@ -234,10 +213,10 @@ ExSqlComp::ReturnStatus ExSqlComp::establishConnection()
ret = ERROR;
}
//ss_cc_change : rare error path
- //LCOV_EXCL_START
+ //
if (ret == ERROR)
error(arkcmpErrorConnection);
- //LCOV_EXCL_STOP
+
return ret;
}
@@ -284,7 +263,7 @@ ExSqlComp::ReturnStatus ExSqlComp::resendRequest()
arkcmpErrorUserTxnAndArkcmpGone : 0;*/
Lng32 sqlCode=0;
//ss_cc_change : debug error path
- //LCOV_EXCL_START
+ //
if (
#ifdef _DEBUG
getenv("ARKCMP_NORESEND_DEBUG") ||
@@ -302,7 +281,7 @@ ExSqlComp::ReturnStatus ExSqlComp::resendRequest()
outstandingSendBuffers_.ioStatus_ = FINISHED;
return ERROR;
}
- //LCOV_EXCL_STOP
+
// if this transaction was
// implicitly started by the executor clean it up now. otherwise
// this executor will get stuck in a repeated 8841 cycle.
@@ -379,14 +358,14 @@ ExSqlComp::ReturnStatus ExSqlComp::sendR(CmpMessageObj* c, NABoolean w)
indexIntoCliCompilerArray = cliGlobals_->currContext()->getIndexToCompilerArray();
//ss_cc_change : rare error condition
- //LCOV_EXCL_START
+ //
if (badConnection_)
{
deleteServerStruct();
badConnection_ = FALSE;
breakReceived_ = FALSE;
}
- //LCOV_EXCL_STOP
+
if (!sqlcompMessage_)
{
ret = startSqlcomp();
@@ -394,7 +373,7 @@ ExSqlComp::ReturnStatus ExSqlComp::sendR(CmpMessageObj* c, NABoolean w)
return ret;
}
//ss_cc_change : can only happen through nowait CLI
- //LCOV_EXCL_START
+ //
if(this->isShared() && (cliGlobals_->currContext() != lastContext_))
{
@@ -405,7 +384,7 @@ ExSqlComp::ReturnStatus ExSqlComp::sendR(CmpMessageObj* c, NABoolean w)
return ret;
}
}
- //LCOV_EXCL_STOP
+
sqlcompMessage_->clearAllObjects();
(*sqlcompMessage_) << *c;
@@ -462,20 +441,16 @@ ExSqlComp::OperationStatus ExSqlComp::status(Int64 reqId)
{
OperationStatus s = FINISHED;
-#ifdef NA_ARKCMP_PROCESS_SINGLE
- if (!oneProcess())
-#endif
- {
- waitForReply();
- s = outstandingSendBuffers_.ioStatus_;
- }
+ waitForReply();
+ s = outstandingSendBuffers_.ioStatus_;
+
return s;
}
// --------------------------------------------------------------------------
// Parse the info fetched from Describe::bindNode(). Genesis 10-981211-5986.
//ss_cc_change : This is unused dead code
-//LCOV_EXCL_START
+//
static NABoolean pairLenTxt(Int32 &len, const char *&txt, const char *&cqd)
{
len = 0;
@@ -491,7 +466,7 @@ static NABoolean pairLenTxt(Int32 &len, const char *&txt, const char *&cqd)
cqd += len;
return FALSE;
}
-//LCOV_EXCL_STOP
+
void ExSqlComp::appendControls(ExControlArea *dest, ExControlArea *src){
Queue *srcList = src->getControlList();
@@ -511,7 +486,7 @@ void ExSqlComp::appendControls(ExControlArea *dest, ExControlArea *src){
}
}
//ss_cc_change : This was used only for versioning - obsolete on SQ
-//LCOV_EXCL_START
+//
static ExSqlComp::ReturnStatus saveControls(ExControlArea *ca, const char *cqd)
{
#ifdef _DEBUG
@@ -571,7 +546,7 @@ static ExSqlComp::ReturnStatus saveControls(ExControlArea *ca, const char *cqd)
return ret;
}
-//LCOV_EXCL_STOP
+
ExSqlComp::ReturnStatus ExSqlComp::resetAllDefaults(){
const char * buf[] = {"control query default * reset", "control query shape off",
@@ -581,7 +556,7 @@ ExSqlComp::ReturnStatus ExSqlComp::resetAllDefaults(){
Lng32 len = str_len(buf[i])+1;
CmpCompileInfo c((char *)buf[i], len,
(Lng32)SQLCHARSETCODE_UTF8
- , NULL, 0, NULL, 0, 0, 0);
+ , NULL, 0, 0, 0);
size_t dataLen = c.getLength();
char * data = new(h_) char[dataLen];
c.pack(data);
@@ -595,32 +570,7 @@ ExSqlComp::ReturnStatus ExSqlComp::resetAllDefaults(){
}
return SUCCESS;
}
-//ss_cc_change : this used only when talking to a downrev compiler
-//LCOV_EXCL_START
-ExSqlComp::ReturnStatus ExSqlComp::resetRemoteDefaults(){
- const char * buf[] = {"control query default MP_CATALOG reset",
- "control query default MP_SUBVOLUME reset",
- "control query default MP_SYSTEM reset",
- "control query default MP_VOLUME reset "};
- for(Int32 i=0; i<sizeof(buf)/sizeof(char *); i++){
- Lng32 len = str_len(buf[i])+1;
- CmpCompileInfo c((char *)buf[i], len,
- (Lng32)SQLCHARSETCODE_UTF8
- , NULL, 0,NULL,0, 0, 0);
- size_t dataLen = c.getLength();
- char * data = new(h_) char[dataLen];
- c.pack(data);
-
- ReturnStatus ret = sendRequest(EXSQLCOMP::SQLTEXT_STATIC_COMPILE,
- data,dataLen);
-
- h_->deallocateMemory(data);
- if(ret == ERROR) return ret;
- }
- return SUCCESS;
-}
-//LCOV_EXCL_STOP
ExSqlComp::ReturnStatus ExSqlComp::resendControls(NABoolean ctxSw) // Genesis 10-981211-5986
{
// If we are already resending the controls, then we must return.
@@ -635,18 +585,6 @@ ExSqlComp::ReturnStatus ExSqlComp::resendControls(NABoolean ctxSw) // Genesis
resendingControls_ = TRUE;
-#ifdef NA_ARKCMP_PROCESS_SINGLE
- if (oneProcess())
- {
- // sendRequest(CmpMessageObj*...) in single-process mode not tested!
- assert(FALSE);
- resendingControls_ = FALSE;
- lastContext_ = 0;
-
- return ERROR;
- }
-#endif
-
// ##DLL-linkage problem ...
// ## Perhaps we need to copy the global IdentifyMyself to exe-glob-ctxt ...
// cerr << "## resendControls: I am " << IdentifyMyself::getMyName() << endl;
@@ -664,7 +602,7 @@ ExSqlComp::ReturnStatus ExSqlComp::resendControls(NABoolean ctxSw) // Genesis
short indexIntoCliCompilerArray = ctxt->getIndexToCompilerArray();
//ss_cc_change: rare error condition
- //LCOV_EXCL_START
+ //
if (ctxt->arkcmpInitFailed(indexIntoCliCompilerArray))
{
ctxt->arkcmpInitFailed(indexIntoCliCompilerArray) =
@@ -673,7 +611,7 @@ ExSqlComp::ReturnStatus ExSqlComp::resendControls(NABoolean ctxSw) // Genesis
ret = ERROR;
}
- //LCOV_EXCL_STOP
+
if (ret != ERROR)
{
@@ -691,7 +629,7 @@ ExSqlComp::ReturnStatus ExSqlComp::resendControls(NABoolean ctxSw) // Genesis
char userMessage [MAX_AUTHID_AS_STRING_LEN + 1 + MAX_USERNAME_LEN + 1 + 2];
str_sprintf(userMessage, "%d,%d,%s", authOn, userAsInt, ctxt->getDatabaseUserName());
-#if defined(NA_DEBUG_C_RUNTIME)
+#ifdef _DEBUG
NABoolean doDebug = (getenv("DBUSER_DEBUG") ? TRUE : FALSE);
if (doDebug)
{
@@ -716,7 +654,7 @@ ExSqlComp::ReturnStatus ExSqlComp::resendControls(NABoolean ctxSw) // Genesis
{
ret=resetAllDefaults();
//ss_cc_change : rare error condition
- //LCOV_EXCL_START
+ //
if (ret == ERROR)
{
resendingControls_ = FALSE;
@@ -724,7 +662,7 @@ ExSqlComp::ReturnStatus ExSqlComp::resendControls(NABoolean ctxSw) // Genesis
return ERROR;
}
- //LCOV_EXCL_STOP
+
ExControlArea *sharedCtrl = cliGlobals_->getSharedControl();
Queue *sharedCtrlList = sharedCtrl->getControlList();
@@ -745,7 +683,7 @@ ExSqlComp::ReturnStatus ExSqlComp::resendControls(NABoolean ctxSw) // Genesis
str_len(GetControlDefaults::GetExternalizedDefaultsStmt())+1;
CmpCompileInfo c(buf, len,
(Lng32)SQLCHARSETCODE_UTF8
- , NULL, 0, NULL, 0, 0, 0);
+ , NULL, 0, 0, 0);
size_t dataLen = c.getLength();
char * data = new(h_) char[dataLen];
c.pack(data);
@@ -825,7 +763,7 @@ ExSqlComp::ReturnStatus ExSqlComp::resendControls(NABoolean ctxSw) // Genesis
Lng32 len = ctl->getSqlTextLen()+1;
CmpCompileInfo c(buf, len,
(Lng32)SQLCHARSETCODE_UTF8
- , NULL, 0, NULL, 0, 0, 0);
+ , NULL, 0, 0, 0);
size_t dataLen = c.getLength();
char * data = new(h_) char[dataLen];
c.pack(data);
@@ -860,7 +798,7 @@ ExSqlComp::ReturnStatus ExSqlComp::resendControls(NABoolean ctxSw) // Genesis
if (ret != ERROR)
{
// ss_cc_change : only applicable to downrev compiler
- //LCOV_EXCL_START
+ //
if (
((*diagArea_).contains(-2050) ||
(*diagArea_).contains(-2055)) &&
@@ -874,7 +812,7 @@ ExSqlComp::ReturnStatus ExSqlComp::resendControls(NABoolean ctxSw) // Genesis
loopDiags.mergeAfter(*diagArea_);
diagArea_->clear();
}
- //LCOV_EXCL_STOP
+
ret = SUCCESS;
}
else
@@ -896,9 +834,6 @@ ExSqlComp::ReturnStatus ExSqlComp::resendControls(NABoolean ctxSw) // Genesis
ret = ERROR;
}
- if (compilerVersion_ < COM_VERS_COMPILER_VERSION)
- resetRemoteDefaults();
-
if ((ret == ERROR) && (!breakReceived_))
{
ctxt->arkcmpInitFailed(indexIntoCliCompilerArray) =
@@ -911,7 +846,7 @@ ExSqlComp::ReturnStatus ExSqlComp::resendControls(NABoolean ctxSw) // Genesis
} // control list is NOT empty
} // if (ret != ERROR)
//ss_cc_change : rare error case
- //LCOV_EXCL_START
+ //
if (ret != SUCCESS || diagArea_->getNumber() || loopDiags.getNumber())
{
diagArea_->mergeAfter(loopDiags);
@@ -922,7 +857,7 @@ ExSqlComp::ReturnStatus ExSqlComp::resendControls(NABoolean ctxSw) // Genesis
*diagArea_ << DgSqlCode(- CLI_SEND_REQUEST_ERROR)
<< DgString0("resendControls");
}
- //LCOV_EXCL_STOP
+
doRefreshEnvironment_ = e; // restore
outstandingSendBuffers_.message_ = t; // restore
@@ -1048,7 +983,7 @@ ExSqlComp::~ExSqlComp()
diagArea_->deAllocate();
}
//ss_cc_change : this is applicable to nowait cli
-//LCOV_EXCL_START
+//
void ExSqlComp::endConnection()
{
if ( sqlcompMessage_ )
@@ -1065,7 +1000,7 @@ void ExSqlComp::endConnection()
sqlcompMessage_ = NULL;
doRefreshEnvironment_ = TRUE;
}
-//LCOV_EXCL_STOP
+
inline NABoolean ExSqlComp::getEnvironment(char*&, ULng32&)
{
// TODO : use environment in executor globals.
@@ -1108,92 +1043,16 @@ ExSqlComp::ReturnStatus
ExSqlComp::sendRequest(CmpMessageObj* request, NABoolean waited)
{
ReturnStatus ret = SUCCESS;
-
-#ifdef NA_ARKCMP_PROCESS_SINGLE
- if (oneProcess())
- {
- CmpStatement cmpStatement(cmpCurrentContext, h_);
-
- jmp_buf oldBuf;
- memcpy ( &oldBuf, &ExportJmpBuf, sizeof(jmp_buf));
+ outstandingSendBuffers_.ioStatus_ = ExSqlComp::PENDING;
+ outstandingSendBuffers_.message_ = request;
+ outstandingSendBuffers_.waited_ = waited;
+ outstandingSendBuffers_.requestId_ = request->id();
+ ret = sendR(request, waited);
+ if (ret != ERROR)
+ if (waitForReply() == ERROR)
+ if (waited)
+ ret = ERROR;
- if (setjmp(ExportJmpBuf))
- {
- diagArea_->mergeAfter(*CmpCommon::diags());
- *diagArea_ << DgSqlCode(arkcmpErrorAssert)
- << DgInt0(0) << DgString0("from longjmp(NAAssert)");
- cmpStatement.exceptionRaised();
- if (request)
- request->decrRefCount();
- memcpy ( &ExportJmpBuf, &oldBuf, sizeof(jmp_buf));
- return ERROR;
- }
-
- ExportJmpBufPtr = &ExportJmpBuf;
-
- CmpCommon::diags()->clear();
- EH_REGISTER(EH_INTERNAL_EXCEPTION);
- EH_REGISTER(EH_BREAK_EXCEPTION);
- EH_REGISTER(EH_ALL_EXCEPTIONS);
- EH_TRY
- {
- if (cmpStatement.process(*request)==CmpStatement::ERROR)
- ret = ERROR;
- else
- ret = SUCCESS;
- if (cmpStatement.reply())
- {
- replyData_ = (cmpStatement.reply())->takeData();
- replyDatalen_=(ULng32)((cmpStatement.reply())->getSize());
- //cmpStatement.reply()->decrRefCount();
- }
- else
- {
- replyData_ = 0;
- replyDatalen_ = 0;
- }
-
- }
- EH_END_TRY;
- EH_CATCH(EH_INTERNAL_EXCEPTION)
- {
- cmpStatement.exceptionRaised();
- ret = ERROR;
- }
- EH_CATCH(EH_BREAK_EXCEPTION)
- {
- NAExit(1);
- }
- EH_CATCH(EH_ALL_EXCEPTIONS)
- {
- cmpStatement.exceptionRaised();
- ret = ERROR;
- }
- diagArea_->mergeAfter(*cmpStatement.diags());
- if (diagArea_->getNumber(DgSqlCode::ERROR_))
- retval_ = ERROR;
- else if (diagArea_->getNumber(DgSqlCode::WARNING_))
- retval_ = WARNING;
- if (request)
- request->decrRefCount();
- memcpy(&ExportJmpBuf, &oldBuf, sizeof(jmp_buf));
- }
- else
-#endif
- {
- if (ret != ERROR)
- {
- outstandingSendBuffers_.ioStatus_ = ExSqlComp::PENDING;
- outstandingSendBuffers_.message_ = request;
- outstandingSendBuffers_.waited_ = waited;
- outstandingSendBuffers_.requestId_ = request->id();
- ret = sendR(request, waited);
- if (ret != ERROR)
- if (waitForReply() == ERROR)
- if (waited)
- ret = ERROR;
- }
- }
return ret;
}
@@ -1222,12 +1081,12 @@ ExSqlComp::ReturnStatus ExSqlComp::sendRequest (Operator op,
// figure out which charsets are not understood by the downrev
// compiler where this msg is being sent to.
// ss_cc_change : down rev compiler is obsolete on SQ
- //LCOV_EXCL_START
+ //
if (getVersion() < COM_VERS_2300)
{
charset = SQLCHARSETCODE_ISO88591;
}
- //LCOV_EXCL_STOP
+
if ( ( ret = preSendRequest(FALSE) ) == ERROR )
{
if ( resendFlg && badConnection_ )
@@ -1298,11 +1157,6 @@ ExSqlComp::ReturnStatus ExSqlComp::sendRequest (Operator op,
CmpMessageDatabaseUser(input_data,(CmpMsgBufLenType)size,h_);
break;
- case EXSQLCOMP::READTABLEDEF_REQUEST :
- request = new(h_)CmpMessageRequest(EXSQLCOMP::READTABLEDEF_REQUEST,
- input_data, size, h_, charset);
- break;
-
case EXSQLCOMP::END_SESSION :
request = new(h_)CmpMessageEndSession(input_data,
(CmpMsgBufLenType)size, h_);
@@ -1324,7 +1178,7 @@ ExSqlComp::ReturnStatus ExSqlComp::sendRequest (Operator op,
// If we are talking to a downrev compiler take care of the following.
//ss_cc_change
- //LCOV_EXCL_START
+ //
if ( compilerVersion_ < COM_VERS_COMPILER_VERSION)
{
// if the structure of any of the above message op types have changed from
@@ -1336,7 +1190,7 @@ ExSqlComp::ReturnStatus ExSqlComp::sendRequest (Operator op,
}
- //LCOV_EXCL_STOP
+
// send the request.
ret = sendRequest(request, waited);
if ((ret == ERROR) && badConnection_)
@@ -1360,13 +1214,13 @@ ExSqlComp::ReturnStatus ExSqlComp::sendRequest (Operator op,
else
{
//ss_cc_change : rare error condition
- //LCOV_EXCL_START
+ //
// The second retry failed. Reset outstandingSendBuffers.
outstandingSendBuffers_.ioStatus_ = ExSqlComp::FINISHED;
outstandingSendBuffers_.resendCount_ = 0;
outstandingSendBuffers_.message_ = 0;
badConnection_ = FALSE;
- //LCOV_EXCL_STOP
+
}
} // if (resendFlg)
@@ -1472,15 +1326,6 @@ ExSqlComp::ReturnStatus ExSqlComp::getReply
assert(outstandingSendBuffers_.ioStatus_ == FINISHED);
outstandingSendBuffers_.ioStatus_ = FETCHED;
-#ifdef NA_ARKCMP_PROCESS_SINGLE
- if (oneProcess())
- {
- reply = replyData_;
- size = replyDatalen_;
- return retval_;
- }
-#endif
-
Int64 request = ( reqId ) ? reqId : outstandingSendBuffers_.requestId_;
if (diagArea_->getNumber(DgSqlCode::ERROR_))
{
@@ -1542,7 +1387,7 @@ ComDiagsArea* ExSqlComp::getDiags(Int64 )
return diagArea_;
}
//ss_cc_change : dead code
-//LCOV_EXCL_START
+//
ComDiagsArea* ExSqlComp::takeDiags(Int64)
{
ComDiagsArea* d = diagArea_;
@@ -1560,7 +1405,7 @@ void ExSqlComp::deleteServerStruct()
sqlcompMessage_ = NULL;
sc_ = NULL;
}
-//LCOV_EXCL_STOP
+
// -----------------------------------------------------------------------
// Methods for CmpMessageStream
@@ -1607,15 +1452,7 @@ void CmpMessageStream::actOnSend(IpcConnection*)
Int32 guaRetcode = phandle.decompose();
if (XZFIL_ERR_OK == guaRetcode)
{
-#ifdef SQ_PHANDLE_VERIFIER
msg_mon_stop_process_name(phandle.getPhandleString());
-#else
- Int32 nid = 0;
- Int32 pid = 0;
- msg_mon_get_process_info(phandle.getPhandleString(),
- &nid, &pid);
- msg_mon_stop_process(phandle.getPhandleString(), nid, pid);
-#endif
}
delete sqlcomp_->sqlcompMessage_;
sqlcomp_->getDiags() ->setRollbackTransaction(-1);
@@ -1689,16 +1526,7 @@ void CmpMessageStream::actOnReceive(IpcConnection*)
Int32 guaRetcode = phandle.decompose();
if (XZFIL_ERR_OK == guaRetcode)
{
-#ifdef SQ_PHANDLE_VERIFIER
msg_mon_stop_process_name(phandle.getPhandleString());
-#else
- Int32 nid = 0;
- Int32 pid = 0;
- msg_mon_get_process_info(phandle.getPhandleString(),
- &nid, &pid);
- msg_mon_stop_process(phandle.getPhandleString(),
- nid, pid);
-#endif
}
delete sqlcomp_->sqlcompMessage_;
sqlcomp_->sqlcompMessage_ = NULL;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/cli/ExSqlComp.h
----------------------------------------------------------------------
diff --git a/core/sql/cli/ExSqlComp.h b/core/sql/cli/ExSqlComp.h
index 83830a9..8f88183 100644
--- a/core/sql/cli/ExSqlComp.h
+++ b/core/sql/cli/ExSqlComp.h
@@ -190,7 +190,6 @@ private:
// Some helper routines for internal usage
NABoolean getEnvironment(char* &data, ULng32 &size);
- NABoolean oneProcess();
// preSendRequest is to initialize the objects for each request.
ReturnStatus preSendRequest(NABoolean doRefreshEnvs);
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/cli/Globals.cpp
----------------------------------------------------------------------
diff --git a/core/sql/cli/Globals.cpp b/core/sql/cli/Globals.cpp
index 070ed84..cb9c836 100644
--- a/core/sql/cli/Globals.cpp
+++ b/core/sql/cli/Globals.cpp
@@ -77,14 +77,8 @@ CliGlobals * cli_globals = NULL;
// segment id.
#endif
-
-
-#ifdef NA_CMPDLL
#include "CmpContext.h"
-#endif // NA_CMPDLL
-//ss_cc_change
-//LCOV_EXCL_START
CliGlobals::CliGlobals(NABoolean espProcess)
: inConstructor_(TRUE),
executorMemory_("Global Executor Memory",0,0,
@@ -118,9 +112,7 @@ CliGlobals::CliGlobals(NABoolean espProcess)
defaultContext_(NULL),
langManC_(NULL),
langManJava_(NULL)
-#ifdef SQ_PHANDLE_VERIFIER
, myVerifier_(-1)
-#endif
{
globalsAreInitialized_ = FALSE;
executorMemory_.setThreadSafe();
@@ -171,20 +163,16 @@ void CliGlobals::init( NABoolean espProcess,
myNodeNumber_, myNodeName_, nodeNameLen,
myStartTime_, myProcessNameString_,
parentProcessNameString_
-#ifdef SQ_PHANDLE_VERIFIER
, &myVerifier_
-#endif
);
if (retcomrt)
{
- char errStr[128];//LCOV_EXCL_LINE
- sprintf (errStr, "Could not initialize CLI globals.ComRtGetProgramInfo returned an error :%d.", retcomrt);//LCOV_EXCL_LINE
- ex_assert(0,errStr);//LCOV_EXCL_LINE
+ char errStr[128];
+ sprintf (errStr, "Could not initialize CLI globals.ComRtGetProgramInfo returned an error :%d.", retcomrt);
+ ex_assert(0,errStr);
}
-
-
ComRtGetProcessPriority(myPriority_);
savedPriority_ = (short)myPriority_;
myNumCpus_ = ComRtGetCPUArray(cpuArray_, (NAHeap *)&executorMemory_);
@@ -192,35 +180,7 @@ void CliGlobals::init( NABoolean espProcess,
// create global structures for IPC environment
#if !(defined(__SSCP) || defined(__SSMP))
- // check if Measure is enabled and allocate Measure process counters.
- measProcCntrs_ = NULL;
- measProcEnabled_ = 0;
- measStmtEnabled_ = 0;
- measSubsysRunning_ = 0;
-
- measProcCntrs_ = new(&executorMemory_) ExMeasProcCntrs();
-
- // Ask Measure for status
- ExMeasGetStatus( measStmtEnabled_,
- measProcEnabled_,
- measSubsysRunning_ );
-
- if (measProcEnabled_)
- {
- //ss_cc_change This will not get hit on seaquest
- //LCOV_EXCL_START
- Int32 measError = measProcCntrs_->ExMeasProcCntrsBump();
- if (measError)
- {
- NADELETEBASIC (measProcCntrs_, &executorMemory_);
- measProcCntrs_ = NULL;
- measProcEnabled_ = 0;
- measStmtEnabled_ = 0;
- }
- //LCOV_EXCL_STOP
- }
-
- ipcHeap_ = new(&executorMemory_) NAHeap("IPC Heap",
+ ipcHeap_ = new(&executorMemory_) NAHeap("IPC Heap",
NAMemory::IPC_MEMORY, 2048 * 1024);
ipcHeap_->setThreadSafe();
if (! espProcess)
@@ -939,14 +899,12 @@ Lng32 CliGlobals::setEnvVar(const char * name, const char * value,
envvarsContext_++;
-#ifdef NA_CMPDLL
// need to set the env to the embedded compiler too
if (currContext()->isEmbeddedArkcmpInitialized())
{
currContext()->getEmbeddedArkcmpContext()
->setArkcmpEnvDirect(name, value, reset);
}
-#endif // NA_CMPDLL
return sendEnvironToMxcmp();
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/cli/Globals.h
----------------------------------------------------------------------
diff --git a/core/sql/cli/Globals.h b/core/sql/cli/Globals.h
index 2eeb746..b825fb9 100644
--- a/core/sql/cli/Globals.h
+++ b/core/sql/cli/Globals.h
@@ -149,7 +149,6 @@ public:
void setExProcessStats(ExProcessStats *processStats)
{ processStats_ = processStats; }
-SQLCLI_LIB_FUNC
ExSqlComp * getArkcmp(short index = 0);
IpcEnvironment *getEnvironment();
@@ -244,16 +243,6 @@ SQLCLI_LIB_FUNC
ULng32 length,
Lng32 &retcode);
- // Measure support
- inline NABoolean getMeasStmtEnabled() { return measStmtEnabled_; }
- inline NABoolean getMeasProcEnabled() { return measProcEnabled_; }
- inline NABoolean getMeasSubsysRunning() { return measSubsysRunning_; }
-#ifndef BUILD_MUSE
- inline ExMeasProcCntrs * getMeasProcCntrs() { return measProcCntrs_; }
-#else
- inline void * getMeasProcCntrs() { return measProcCntrs_; }
-#endif
-
inline NABoolean breakEnabled() { return breakEnabled_; }
inline void setBreakEnabled(NABoolean enabled)
{ breakEnabled_ = enabled;
@@ -305,7 +294,6 @@ SQLCLI_LIB_FUNC
const char* getJniErrorStrPtr();
void updateTransMode(TransMode *transMode);
-SQLCLI_LIB_FUNC
inline
short getGlobalSbbCount()
@@ -356,9 +344,7 @@ inline
char * myNodeName() { return myNodeName_; }
Int32 myCpu() { return myCpu_; };
Int32 myPin() { return myPin_; };
-#ifdef SQ_PHANDLE_VERIFIER
SB_Verif_Type myVerifier() const {return myVerifier_;}
-#endif
Lng32 myNodeNumber() { return myNodeNumber_; };
Int64 myStartTime() { return myStartTime_; };
@@ -503,17 +489,6 @@ private:
char sysVolName_[ 18 ]; // '$' + VOLNAME + '.' +
// SUBVOL + null-terminator
-
- NABoolean measProcEnabled_;
- NABoolean measStmtEnabled_;
- NABoolean measSubsysRunning_;
-
-#ifndef BUILD_MUSE
- ExMeasProcCntrs * measProcCntrs_;
-#else
- void * measProcCntrs_;
-#endif
-
// copy of the oss envvars
char ** envvars_;
@@ -566,9 +541,7 @@ private:
// node, cpu and pin this process is running at.
char myNodeName_[8];
Int32 myCpu_;
-#ifdef SQ_PHANDLE_VERIFIER
SB_Verif_Type myVerifier_;
-#endif
pid_t myPin_;
Lng32 myNodeNumber_;
@@ -634,7 +607,6 @@ private:
// a lot of times. It is better to cache the pointer to the globals.
// -----------------------------------------------------------------------
-SQLCLI_LIB_FUNC
CliGlobals * GetCliGlobals();
#endif /* __cplusplus */
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/cli/GlobalsDef.cpp
----------------------------------------------------------------------
diff --git a/core/sql/cli/GlobalsDef.cpp b/core/sql/cli/GlobalsDef.cpp
index d5c360f..384fce2 100644
--- a/core/sql/cli/GlobalsDef.cpp
+++ b/core/sql/cli/GlobalsDef.cpp
@@ -42,4 +42,4 @@
// to link cli.lib
__declspec(dllexport) CliGlobals * cli_globals = 0;
-THREAD_P SQLEXPORT_LIB_FUNC jmp_buf ExportJmpBuf;
+THREAD_P jmp_buf ExportJmpBuf;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/cli/Module.cpp
----------------------------------------------------------------------
diff --git a/core/sql/cli/Module.cpp b/core/sql/cli/Module.cpp
index 379120f..f4c5781 100644
--- a/core/sql/cli/Module.cpp
+++ b/core/sql/cli/Module.cpp
@@ -45,7 +45,6 @@ Module::Module(const char * module_name, Lng32 len, char * pathName,
Lng32 pathNameLen, NAHeap *heap)
: module_name_len_(len), path_name_len_(pathNameLen),
heap_(heap), statementCount_(0),
- stmtCntrsSpace_(NULL),
vproc_(NULL)
{
module_name_ = (char *)
@@ -61,8 +60,7 @@ Module::Module(const char * module_name, Lng32 len, char * pathName,
path_name_[pathNameLen] = 0;
}
-// ss-cc_change . The desctructore for module is never called.
-//LCOV_EXCL_START
+
Module::~Module()
{
if (module_name_)
@@ -70,51 +68,7 @@ Module::~Module()
heap_->deallocateMemory(module_name_);
}
module_name_ = 0;
-
- if (stmtCntrsSpace_)
- {
- heap_->deallocateMemory(stmtCntrsSpace_);
- }
- stmtCntrsSpace_ = 0;
}
-//LCOV_EXCL_STOP
-
-void Module::allocStmtCntrsSpace(NABoolean measEnabled)
-{
- if (statementCount_ == 0)
- return;
-
- // allocate a block of contiguous memery for measure statement counters
- // of all statements in one module.
- stmtCntrsSpace_ = (char *)heap_->allocateMemory((size_t) (statementCount_ * sizeof (ExMeasStmtCntrs)));
- // initialize each statement counters space.
-
- // mid = PXFS_PATHNAME_RESOLVE_(moduleName)
- //char * mid = this->getPathName();
-
- ExMeasStmtCntrs * stmtCntrs;
- for (Int32 i = 0; i < statementCount_; i++)
- {
- stmtCntrs = (ExMeasStmtCntrs *)getStmtCntrsSpace(i);
- stmtCntrs->init(i);
- };
- if (measEnabled)
- {
- // call Measure to setup statment counters.
- stmtCntrs = (ExMeasStmtCntrs *)stmtCntrsSpace_;
- stmtCntrs->ExMeasStmtCntrsBump(statementCount_, module_name_,
- (Int32)module_name_len_);
- }
-};
-
-char * Module::getStmtCntrsSpace (Int32 statementIndex)
-{
- // get individule counter space
- assert (statementIndex < statementCount_);
- if (stmtCntrsSpace_)
- return stmtCntrsSpace_ + (statementIndex * sizeof (ExMeasStmtCntrs));
- else return 0;
-};
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/cli/Module.h
----------------------------------------------------------------------
diff --git a/core/sql/cli/Module.h b/core/sql/cli/Module.h
index 5c28d29..7f1b6a0 100644
--- a/core/sql/cli/Module.h
+++ b/core/sql/cli/Module.h
@@ -51,17 +51,12 @@ class Module : public ExGod {
Int32 statementCount_;
COM_VERSION version_;
char * vproc_;
- char * stmtCntrsSpace_; // contiguous block of memory for all measure
- // statement counters in one module.
public:
Module(const char * module_name, Lng32 module_name_len,
char * pathName, Lng32 pathNameLen, NAHeap *heap);
~Module();
- void allocStmtCntrsSpace(NABoolean measEnabled);
- char * getStmtCntrsSpace (Int32 statementIndex); /* get individule counter */
-
inline char * getModuleName() { return module_name_; };
inline Lng32 getModuleNameLen() { return module_name_len_; };
inline char * getPathName() { return path_name_; };
[20/30] incubator-trafodion git commit: TRAFODION-2731 CodeCleanup:
Remove obsolete, legacy and unused code
Posted by an...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/common/Int64.h
----------------------------------------------------------------------
diff --git a/core/sql/common/Int64.h b/core/sql/common/Int64.h
index e388afe..6ab56de 100644
--- a/core/sql/common/Int64.h
+++ b/core/sql/common/Int64.h
@@ -38,24 +38,12 @@
#include <limits.h>
#include "Platform.h"
-#if defined( __linux__ ) && defined( NA_64BIT )
-
- #ifndef LLONG_MAX
- #define LLONG_MAX LONG_MAX
- #endif
-
- #ifndef LLONG_MIN
- #define LLONG_MIN LONG_MIN
- #endif
-
-
-#else
-
#ifndef LLONG_MAX
-#define LLONG_MAX _I64_MAX
+#define LLONG_MAX LONG_MAX
#endif
-
+#ifndef LLONG_MIN
+#define LLONG_MIN LONG_MIN
#endif
// ***********************************************************************
@@ -65,20 +53,17 @@
// -----------------------------------------------------------------------
// Convert an unsigned int to Int64.
// -----------------------------------------------------------------------
-NA_EIDPROC
Int64 uint32ToInt64(UInt32 value);
// -----------------------------------------------------------------------
// Convert an Int64 to long.
// -----------------------------------------------------------------------
-NA_EIDPROC
Int32 int64ToInt32(Int64 value);
// -----------------------------------------------------------------------
// Convert the integer from array of two longs, most significant first
// (Guardian-style LARGEINT datatype).
// -----------------------------------------------------------------------
-NA_EIDPROC
Int64 uint32ArrayToInt64(const UInt32 array[2]);
// -----------------------------------------------------------------------
@@ -87,43 +72,36 @@ Int64 uint32ArrayToInt64(const UInt32 array[2]);
// endian and big endian problems. Parameter tgt must point to
// an array of two (2) unsigned long elements.
// -----------------------------------------------------------------------
-NA_EIDPROC
void convertInt64ToUInt32Array(const Int64 &src, UInt32 *tgt);
// -----------------------------------------------------------------------
// Convert the integer from ascii.
// -----------------------------------------------------------------------
-NA_EIDPROC
Int32 aToInt32(const char* src);
// -----------------------------------------------------------------------
// Convert the integer from ascii.
// -----------------------------------------------------------------------
-NA_EIDPROC
Int64 atoInt64(const char* src);
// -----------------------------------------------------------------------
// Convert the integer to ascii.
// -----------------------------------------------------------------------
-NA_EIDPROC
void convertInt64ToAscii(const Int64 &src, char* tgt);
// -----------------------------------------------------------------------
// Convert the unsigned integer to ascii.
// -----------------------------------------------------------------------
-NA_EIDPROC
void convertUInt64ToAscii(const UInt64 &src, char* tgt);
// -----------------------------------------------------------------------
// Convert the integer to double.
// -----------------------------------------------------------------------
-NA_EIDPROC
double convertInt64ToDouble(const Int64 &src);
// -----------------------------------------------------------------------
// Convert the integer to double.
// -----------------------------------------------------------------------
-NA_EIDPROC
double convertUInt64ToDouble(const UInt64 &src);
#endif /* INT64_H */
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/common/IntervalType.cpp
----------------------------------------------------------------------
diff --git a/core/sql/common/IntervalType.cpp b/core/sql/common/IntervalType.cpp
index 8bce05c..bffcc49 100644
--- a/core/sql/common/IntervalType.cpp
+++ b/core/sql/common/IntervalType.cpp
@@ -1029,22 +1029,12 @@ double SQLInterval::encode(void *bufPtr) const
val = temp;
break;
}
-#ifdef NA_64BIT
- // dg64 - a bit of a guess
case sizeof(Int32): {
Int32 temp;
memcpy((char *) &temp, valPtr, sizeof(Int32));
val = temp;
break;
}
-#else
- case sizeof(Lng32): {
- Lng32 temp;
- memcpy((char *) &temp, valPtr, sizeof(Lng32));
- val = temp;
- break;
- }
-#endif
case sizeof(Int64): {
Int64 temp;
memcpy((char *) &temp, valPtr, sizeof(Int64));
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/common/IntervalType.h
----------------------------------------------------------------------
diff --git a/core/sql/common/IntervalType.h b/core/sql/common/IntervalType.h
index 158ebc1..2be60fb 100644
--- a/core/sql/common/IntervalType.h
+++ b/core/sql/common/IntervalType.h
@@ -44,7 +44,7 @@
#include "NAType.h"
#include "DTICommonType.h"
#include "Int64.h"
-#ifdef NA_DEBUG_C_RUNTIME
+#ifdef _DEBUG
#include <iostream>
#endif
@@ -128,12 +128,12 @@ public:
{
makeInvalid();
-#ifdef NA_DEBUG_C_RUNTIME
+#ifdef _DEBUG
// All callers *should be* immediately calling the checkValid() method
// and so this debugging info *should be* unnecessary. Delete it!
cerr << "Invalid interval specification " <<
getTypeSQLname(TRUE /*terse*/) << endl;
-#endif // NA_DEBUG_C_RUNTIME
+#endif // _DEBUG
}
}
@@ -152,12 +152,12 @@ public:
{
makeInvalid();
-#ifdef NA_DEBUG_C_RUNTIME
+#ifdef _DEBUG
// All callers *should be* immediately calling the checkValid() method
// and so this debugging info *should be* unnecessary. Delete it!
cerr << "Invalid interval specification " <<
getTypeSQLname(TRUE /*terse*/) << endl;
-#endif // NA_DEBUG_C_RUNTIME
+#endif // _DEBUG
}
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/common/Ipc.cpp
----------------------------------------------------------------------
diff --git a/core/sql/common/Ipc.cpp b/core/sql/common/Ipc.cpp
index 2d989ee..2645d69 100644
--- a/core/sql/common/Ipc.cpp
+++ b/core/sql/common/Ipc.cpp
@@ -160,7 +160,7 @@ SockIPAddress IpcNodeName::getIPAddress() const
NABoolean GuaProcessHandle::operator == (const GuaProcessHandle &other) const
{
-#if (defined(NA_GUARDIAN_IPC) || defined(NA_GUARDIAN_MSG))
+#if (defined(NA_GUARDIAN_IPC))
// on NSK, do the right thing and call a system procedure to compare
return compare(other);
#else
@@ -177,12 +177,7 @@ void GuaProcessHandle::dumpAndStop(bool doDump, bool doStop) const
if (doDump)
msg_mon_dump_process_name(NULL, phandle.getPhandleString(), coreFile);
if (doStop)
-#ifdef SQ_PHANDLE_VERIFIER
msg_mon_stop_process_name(phandle.getPhandleString());
-#else
- msg_mon_stop_process(phandle.getPhandleString(),
- phandle.getCpu(), phandle.getPin());
-#endif
}
// -----------------------------------------------------------------------
@@ -222,7 +217,7 @@ IpcProcessId::IpcProcessId(const char *asciiRepresentation) :
{
domain_ = IPC_DOM_INVALID;
-#if (defined(NA_GUARDIAN_IPC) || defined(NA_GUARDIAN_MSG))
+#if (defined(NA_GUARDIAN_IPC))
// On NSK, try to interpret the string as a PHANDLE first
if (phandle_.fromAscii(asciiRepresentation))
domain_ = IPC_DOM_GUA_PHANDLE;
@@ -358,7 +353,7 @@ IpcNodeName IpcProcessId::getNodeName() const
{
return IpcNodeName(SockIPAddress(pid_.ipAddress_)); // LCOV_EXCL_LINE
}
-#if (defined(NA_GUARDIAN_IPC) || defined(NA_GUARDIAN_MSG))
+#if (defined(NA_GUARDIAN_IPC))
else if (domain_ == IPC_DOM_GUA_PHANDLE)
{
return IpcNodeName(phandle_);
@@ -379,7 +374,7 @@ IpcNodeName IpcProcessId::getNodeName() const
IpcCpuNum IpcProcessId::getCpuNum() const
{
-#if (defined(NA_GUARDIAN_IPC) || defined(NA_GUARDIAN_MSG))
+#if (defined(NA_GUARDIAN_IPC))
if (domain_ == IPC_DOM_GUA_PHANDLE)
{
// ask Guardian to get the CPU number out of the phandle
@@ -400,7 +395,7 @@ Int32 IpcProcessId::toAscii(char *outBuf, Int32 outBufLen) const
char outb[300] = ""; // Initialize in case this is called
Int32 outLen = 0;
-#if (defined(NA_GUARDIAN_IPC) || defined(NA_GUARDIAN_MSG))
+#if (defined(NA_GUARDIAN_IPC))
if (domain_ == IPC_DOM_GUA_PHANDLE)
{
outLen = phandle_.toAscii(outb,300);
@@ -475,7 +470,7 @@ IpcConnection * IpcProcessId::createConnectionToServer(
return new(env->getHeap()) SockConnection(env,*this,FALSE);
// LCOV_EXCL_STOP
}
-#if (defined(NA_GUARDIAN_IPC) || defined(NA_GUARDIAN_MSG))
+#if (defined(NA_GUARDIAN_IPC))
else if (domain_ == IPC_DOM_GUA_PHANDLE)
{
return new(env->getHeap()) GuaConnectionToServer(env,
@@ -489,7 +484,7 @@ IpcConnection * IpcProcessId::createConnectionToServer(
dataConnectionToEsp
);
}
-#endif //defined(NA_GUARDIAN_IPC) || defined(NA_GUARDIAN_MSG)
+#endif //defined(NA_GUARDIAN_IPC)
else
{
return NULL;
@@ -500,9 +495,7 @@ IpcMessageObjSize IpcProcessId::packedLength()
{
// we pack the domain type and then the phandle or socket process id
IpcMessageObjSize result = baseClassPackedLength() + sizeof(domain_);
-#ifdef NA_64BIT
result += sizeof(spare_);
-#endif
if (domain_ == IPC_DOM_GUA_PHANDLE)
{
@@ -525,10 +518,8 @@ IpcMessageObjSize IpcProcessId::packObjIntoMessage(IpcMessageBufferPtr buffer)
str_cpy_all(buffer,(const char *) &domain_, sizeof(domain_));
result += sizeof(domain_);
buffer += sizeof(domain_);
-#ifdef NA_64BIT
result += sizeof(spare_);
buffer += sizeof(spare_);
-#endif
// ---------------------------------------------------------------------
// NOTE: this code assumes that the OS dependent information (phandle
@@ -566,9 +557,7 @@ void IpcProcessId::unpackObj(IpcMessageObjType objType,
str_cpy_all((char *) &domain_, buffer, sizeof(domain_));
buffer += sizeof(domain_);
-#ifdef NA_64BIT
buffer += sizeof(spare_);
-#endif
// check the supplied length
assert(objSize == packedLength());
@@ -1385,9 +1374,7 @@ Int32 IpcAllConnections::printConnTrace(Int32 lineno, char *buf)
GuaProcessHandle *otherEnd = (GuaProcessHandle *)&(c->getOtherEnd().getPhandle().phandle_);
if (otherEnd)
otherEnd->decompose(cpu, pin, node
-#ifdef SQ_PHANDLE_VERIFIER
, seqNum
-#endif
);
}
rv = sprintf(buf, "%.4d %8p %.4s %.3d,%.8d %" PRId64 " %s\n",
@@ -2126,11 +2113,7 @@ InternalMsgHdrInfoStruct::InternalMsgHdrInfoStruct(
swapTwoBytes(sockReplyTag_);
swapFourBytes(eyeCatcher_);
swapFourBytes(seqNum_);
-#ifdef NA_64BIT
assert(0); // Need swapEightBytes() to swap msgStreamId_!
-#else
- swapFourBytes(msgStreamId_);
-#endif // NA_64BIT
setEndianness(IpcMyEndianness);
}
}
@@ -4627,7 +4610,7 @@ IpcServerClass::IpcServerClass(IpcEnvironment *env,
}
if (allocationMethod_ == IPC_ALLOC_DONT_CARE)
{
-#if (defined(NA_GUARDIAN_IPC) || defined(NA_GUARDIAN_MSG))
+#if (defined(NA_GUARDIAN_IPC))
// NA_WINNT is set and NA_GUARDIAN_IPC is set
// The standard method on NT is to create a Guardian process
// in order to run in an NT only or simulated environment we can set an environment
@@ -4909,7 +4892,7 @@ IpcServer * IpcServerClass::allocateServerProcess(ComDiagsArea **diags,
switch (allocationMethod_)
{
-#if (defined(NA_GUARDIAN_IPC) || defined(NA_GUARDIAN_MSG))
+#if (defined(NA_GUARDIAN_IPC))
case IPC_LAUNCH_GUARDIAN_PROCESS:
case IPC_SPAWN_OSS_PROCESS:
case IPC_USE_PROCESS:
@@ -5357,7 +5340,7 @@ IpcProcessId IpcEnvironment::getMyOwnProcessId(IpcNetworkDomain dom)
}
else if (dom == IPC_DOM_GUA_PHANDLE)
{
-#if (defined(NA_GUARDIAN_IPC) || defined(NA_GUARDIAN_MSG))
+#if (defined(NA_GUARDIAN_IPC))
// for Guardian, just get the phandle from the operating system
return IpcProcessId(MyGuaProcessHandle());
#else
@@ -5814,9 +5797,7 @@ void IpcAllConnections::printConnTraceLine(char *buffer, int *rsp_len, IpcConnec
GuaProcessHandle *otherEnd = (GuaProcessHandle *)&(conn->getOtherEnd().getPhandle().phandle_);
if (otherEnd)
otherEnd->decompose(cpu, pin, node
-#ifdef SQ_PHANDLE_VERIFIER
, seqNum
-#endif
);
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/common/Ipc.h
----------------------------------------------------------------------
diff --git a/core/sql/common/Ipc.h b/core/sql/common/Ipc.h
index c8a1e8e..85680b4 100644
--- a/core/sql/common/Ipc.h
+++ b/core/sql/common/Ipc.h
@@ -67,13 +67,7 @@
#include "ComExeTrace.h"
#include <time.h>
-#if (defined (NA_LINUX) && defined (SQ_NEW_PHANDLE))
#include "seabed/fs.h"
-#endif // NA_LINUX
-
-#ifdef ERROR_STATE
-#undef ERROR_STATE
-#endif // ERROR_STATE
// -----------------------------------------------------------------------
// Contents of this file
@@ -185,7 +179,7 @@ public:
// IpcNodeName(const IpcProcessId &proc);
// make a node name from an Internet address or from a phandle
IpcNodeName(const SockIPAddress &iPNode);
-#if (defined(NA_GUARDIAN_IPC) || defined(NA_GUARDIAN_MSG) || defined(NA_HSC))
+#if (defined(NA_GUARDIAN_IPC))
// LCOV_EXCL_START
IpcNodeName(const GuaProcessHandle &phandle);
// Return the Guardian node name as a character string, without trailing spaces.
@@ -274,39 +268,26 @@ const Int32 NumIpcConnTraces = 8;
// -----------------------------------------------------------------------
struct GuaProcessHandle
{
-#if (defined(NA_LINUX) && defined (SQ_NEW_PHANDLE))
SB_Phandle_Type phandle_;
-#else
- // on NSK systems, this is called a PHANDLE
- short phandle_[10];
-#endif // NA_LINUX
NABoolean operator == (const GuaProcessHandle &other) const;
-#if (defined(NA_GUARDIAN_IPC) || defined(NA_GUARDIAN_MSG))
+#if (defined(NA_GUARDIAN_IPC))
NABoolean compare(const GuaProcessHandle &other) const;
NABoolean fromAscii(const char *ascii);
Int32 toAscii(char *ascii, Int32 asciiLen) const;
#endif
-#if (defined (NA_LINUX) && defined(SQ_NEW_PHANDLE))
Lng32 decompose(Int32 &cpu, Int32 &pin, Int32 &nodeNumber
-#ifdef SQ_PHANDLE_VERIFIER
, SB_Int64_Type &seqNum
-#endif
) const;
-#else
- Lng32 decompose(short &cpu, short &pin, Int32 &nodeNumber) const;
-#endif // NA_LINUX
Int32 decompose2(Int32 &cpu, Int32 &pin, Int32 &node
-#ifdef SQ_PHANDLE_VERIFIER
, SB_Int64_Type &seqNum
-#endif
) const;
void dumpAndStop(bool doDump, bool doStop) const;
};
-#if (defined(NA_GUARDIAN_IPC) || defined(NA_GUARDIAN_MSG))
+#if (defined(NA_GUARDIAN_IPC))
class MyGuaProcessHandle : public GuaProcessHandle
{
public:
@@ -477,10 +458,8 @@ private:
// the domain under which this process is addressable
IpcNetworkDomain domain_;
-#ifdef NA_64BIT
// to make phandle_ 8-byte aligned
Int32 spare_;
-#endif
union
{
@@ -490,7 +469,7 @@ private:
// private methods
-#if (defined(NA_GUARDIAN_IPC) || defined(NA_GUARDIAN_MSG))
+#if (defined(NA_GUARDIAN_IPC))
IpcCpuNum getCpuNumFromPhandle() const;
#endif
};
@@ -1081,7 +1060,7 @@ private:
SockIPAddress ipAddr_;
};
-#if (defined(NA_GUARDIAN_IPC) || defined(NA_GUARDIAN_MSG))
+#if (defined(NA_GUARDIAN_IPC))
// -----------------------------------------------------------------------
// A Guardian connection on the client side that connects to a server
// by opening its process file
@@ -1100,10 +1079,6 @@ public:
, NABoolean parallelOpen = FALSE
, Int32 *openCompletionScheduled = NULL
, NABoolean dataConnectionToEsp = FALSE
-#ifndef SQ_PHANDLE_VERIFIER
- , time_t childCreationTimeSec = 0
- , long childCreationTimenSec = 0
-#endif
);
virtual ~GuaConnectionToServer();
@@ -1194,10 +1169,6 @@ private:
void handleIOErrorForStream(IpcMessageStreamBase *msgStream);
void handleIOErrorForEntry(ActiveIOQueueEntry &entry);
void cleanUpActiveIOEntry(ActiveIOQueueEntry &entry);
-#ifndef SQ_PHANDLE_VERIFIER
- // Fix for CR 7128
- bool childProcessPidRecycled();
-#endif
// ---------------------------------------------------------------------
// The send and receive queues of a Guardian connection to a server are
@@ -1288,18 +1259,7 @@ private:
Int32 openRetries_;
struct timespec beginOpenTime_;
struct timespec completeOpenTime_;
-#ifndef SQ_PHANDLE_VERIFIER
- // Fix for CR 7128
- // this childCreationTime_ is non-zero only for
- // control connections from master to servers that
- // the master created.
- struct timespec childCreationTime_;
-#endif
NABoolean tscoOpen_;
-#if 0
- char *sentMsgHdr_;
- short sentMsgHdrInd_;
-#endif
};
// -----------------------------------------------------------------------
@@ -1541,7 +1501,7 @@ private:
SockListnerPort *listnerPort_;
};
-#if (defined(NA_GUARDIAN_IPC) || defined(NA_GUARDIAN_MSG))
+#if (defined(NA_GUARDIAN_IPC))
// -----------------------------------------------------------------------
// A control connection for a Guardian server using $RECEIVE
// -----------------------------------------------------------------------
@@ -2008,21 +1968,13 @@ public:
InternalMsgHdrInfoStruct(IpcBufferedMsgStream* msgStream);
// get header sequence number (used to preserve send order)
-#ifdef NA_64BIT
- // dg64 - 32-bit seq number
+ // 32-bit seq number
UInt32 getSeqNum() const
-#else
- ULng32 getSeqNum() const
-#endif
{ return(seqNum_); }
// set header sequence number
-#ifdef NA_64BIT
- // dg64 - 32-bit seq number
+ // 32-bit seq number
void setSeqNum(UInt32 seqNum)
-#else
- void setSeqNum(ULng32 seqNum)
-#endif
{ seqNum_ = seqNum; }
short getSockReplyTag() const
@@ -2090,18 +2042,8 @@ public:
short flags_; // enum IpcMessageObjFlags
short format_; // compressed, ...
short sockReplyTag_; // spare for Guardian, reply tag for sock.
-#ifdef NA_64BIT
- // dg64 - 32-bit eye
Int32 eyeCatcher_; // bit pattern to detect junk messages
-#else
- Lng32 eyeCatcher_; // bit pattern to detect junk messages
-#endif
-#ifdef NA_64BIT
- // dg64 - 32-bit seq num
UInt32 seqNum_; // sequence number to preserve send order
-#else
- ULng32 seqNum_; // sequence number to preserve send order
-#endif
// stream id is actually the pointer to the stream
Long msgStreamId_; // stream id for coalescing multi-buf msg
@@ -2789,7 +2731,7 @@ protected:
virtual void stop();
};
-#if (defined(NA_GUARDIAN_IPC) || defined(NA_GUARDIAN_MSG))
+#if (defined(NA_GUARDIAN_IPC))
// -----------------------------------------------------------------------
// Specialization for a Guardian server process
// -----------------------------------------------------------------------
@@ -2946,14 +2888,6 @@ private:
// when sending messages, don't delete the message until the I/O completed
char * activeMessage_;
-#ifndef SQ_PHANDLE_VERIFIER
- // When stopping an ESP by name, check the ESPs creation timestamp
- // to see if the ESP was started by this master. Helps when process
- // names are reused. See ALM CR 4528. When SQF is enhanced to
- // handle this problem (see enhancement CR 4780) we can remove this
- // work-around logic.
- struct timespec creationTime_;
-#endif
NABoolean unhooked_;
};
#endif /* NA_GUARDIAN_IPC */
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/common/IpcGuardian.cpp
----------------------------------------------------------------------
diff --git a/core/sql/common/IpcGuardian.cpp b/core/sql/common/IpcGuardian.cpp
index 928e822..89e968f 100644
--- a/core/sql/common/IpcGuardian.cpp
+++ b/core/sql/common/IpcGuardian.cpp
@@ -52,7 +52,7 @@
#include "PortProcessCalls.h"
#include "logmxevent.h"
-#if (defined(NA_GUARDIAN_IPC) || defined(NA_GUARDIAN_MSG))
+#if (defined(NA_GUARDIAN_IPC))
// all of these files are OK in the executor environment (PRIV, no globals)
#include "MXTraceDef.h"
#include "seabed/fs.h"
@@ -69,14 +69,9 @@ extern "C" {
#include "cextdecs/cextdecs.h"
#include "zsysc.h"
}
-#ifdef NA_ARKFS
-# include "fs/feerrors.h"
-#else
-# include "derror.h"
-#endif
+#include "fs/feerrors.h"
#endif
-
// Uncomment the next line to debug IPC problems (log of client's I/O)
// #define LOG_IPC
@@ -93,12 +88,6 @@ void IpcGuaLogTimestamp(IpcConnection *conn); // see bottom of file
void allocateConsole(); // see bottom of file
#endif
-#if ((!defined(NA_GUARDIAN_IPC)) && (!defined(NA_GUARDIAN_MSG)))
-// -----------------------------------------------------------------------
-// On platforms other than NSK, stub out some Guardian-related calls
-// -----------------------------------------------------------------------
-
-#else
// -----------------------------------------------------------------------
// The real thing starts here
// -----------------------------------------------------------------------
@@ -186,17 +175,10 @@ IpcStartupMsg::IpcStartupMsg()
// Methods for class GuaProcessHandle
// -----------------------------------------------------------------------
-#if (defined (NA_LINUX) && defined (SQ_NEW_PHANDLE))
Lng32 GuaProcessHandle::decompose(Int32 &cpu, Int32 &pin,
Int32 &nodeNumber
-#ifdef SQ_PHANDLE_VERIFIER
- , SB_Int64_Type &seqNum
-#endif
- ) const
-#else
-Lng32 GuaProcessHandle::decompose(short &cpu, short &pin,
- Int32 &nodeNumber) const
-#endif // NA_LINUX
+ , SB_Int64_Type &seqNum
+ ) const
{
// Phandle wrapper in porting layer
NAProcessHandle phandle((SB_Phandle_Type *)&phandle_);
@@ -207,36 +189,25 @@ Lng32 GuaProcessHandle::decompose(short &cpu, short &pin,
cpu = phandle.getCpu();
pin = phandle.getPin();
nodeNumber = phandle.getNodeNumber();
-#ifdef SQ_PHANDLE_VERIFIER
seqNum = phandle.getSeqNum();
-#endif
}
return result;
}
Int32 GuaProcessHandle::decompose2(Int32 &cpu, Int32 &pin, Int32 &node
-#ifdef SQ_PHANDLE_VERIFIER
, SB_Int64_Type &seqNum
-#endif
) const
{
return decompose(cpu, pin, node
-#ifdef SQ_PHANDLE_VERIFIER
, seqNum
-#endif
);
}
NABoolean GuaProcessHandle::compare(const GuaProcessHandle &other) const
{
-#ifdef SQ_NEW_PHANDLE
Int32 guaRetcode = XPROCESSHANDLE_COMPARE_((SB_Phandle_Type *)&phandle_,
(SB_Phandle_Type *)&(other.phandle_));
-#else
- Int32 guaRetcode = XPROCESSHANDLE_COMPARE_((short *)phandle_,
- (short *)other.phandle_);
-#endif // SQ_NEW_PHANDLE
// 0 means different, 1 means two procs of a process pair (different)
// 2 means the process handles are the same
@@ -245,22 +216,14 @@ NABoolean GuaProcessHandle::compare(const GuaProcessHandle &other) const
NABoolean GuaProcessHandle::fromAscii(const char *ascii)
{
-#ifdef SQ_NEW_PHANDLE
SB_Phandle_Type *tempPhandle;
-#else
- short *tempPhandle;
-#endif // SQ_NEW_PHANDLE
tempPhandle = get_phandle_with_retry((char *)ascii);
if (!tempPhandle)
return FALSE;
-#ifdef SQ_NEW_PHANDLE
memcpy ((void *)&phandle_, (void *)tempPhandle, sizeof(SB_Phandle_Type));
-#else
- memcpy (phandle_, tempPhandle, 20);
-#endif // SQ_NEW_PHANDLE
return TRUE;
}
@@ -368,10 +331,6 @@ GuaConnectionToServer::GuaConnectionToServer(
Int32 *openCompletionScheduled
,
NABoolean dataConnectionToEsp
-#ifndef SQ_PHANDLE_VERIFIER
- , time_t childCreationTimeSec
- , long childCreationTimenSec
-#endif
)
: IpcConnection(env,procId,eye)
{
@@ -402,10 +361,6 @@ GuaConnectionToServer::GuaConnectionToServer(
guaErrorInfo_ = GuaOK;
dataConnectionToEsp_ = dataConnectionToEsp;
self_ = FALSE; // Set at openPhandle time
-#ifndef SQ_PHANDLE_VERIFIER
- childCreationTime_.tv_sec = childCreationTimeSec;
- childCreationTime_.tv_nsec = childCreationTimenSec;
-#endif
openRetries_ = 0;
beginOpenTime_.tv_sec = 0;
beginOpenTime_.tv_nsec = 0;
@@ -911,9 +866,7 @@ WaitReturnStatus GuaConnectionToServer::wait(IpcTimeout timeout, UInt32 *eventCo
short fsError = BFILE_CLOSE_(openFile_); // Don't retain unopened ACB
otherEnd = (GuaProcessHandle *)&getOtherEnd().getPhandle().phandle_;
otherEnd->decompose(cpu, pin, nodeNumber
-#ifdef SQ_PHANDLE_VERIFIER
, seqNum
-#endif
);
getEnvironment()->closeTrace(__LINE__, openFile_, cpu, pin, seqNum);
openFile_ = -1; // Don't leave valid file number in object!
@@ -942,16 +895,6 @@ WaitReturnStatus GuaConnectionToServer::wait(IpcTimeout timeout, UInt32 *eventCo
*openCompletionScheduled_ = 1;
fileNumForIOCompletion_ = openFile_;
-#ifndef SQ_PHANDLE_VERIFIER
- // Fix for 7128
- // this method can set the state to error, if the newly opened
- // process' create timestamp differs from the create timestamp
- // which was recorded when the process was created. When ALM CR
- // 4780 is addressed, this check can be removed.
- if (childProcessPidRecycled())
- return WAIT_OK;
-#endif
-
// use setmode 74 to turn off the automatic CANCEL upon AWAITIOX timeout
stat = BSETMODE(openFile_,74,-1);
if (_status_ne(stat))
@@ -1003,16 +946,6 @@ WaitReturnStatus GuaConnectionToServer::wait(IpcTimeout timeout, UInt32 *eventCo
}
}
-#ifndef SQ_PHANDLE_VERIFIER
- // Fix for 7128
- // this method can set the state to error, if the newly opened
- // process' create timestamp differs from the create timestamp
- // which was recorded when the process was created. When ALM CR
- // 4780 is addressed, this check can be removed.
- if (childProcessPidRecycled())
- return WAIT_OK;
-#endif
-
// the connection is established now
setState(ESTABLISHED);
clock_gettime(CLOCK_REALTIME, &completeOpenTime_);
@@ -1029,9 +962,7 @@ void GuaConnectionToServer::openRetryCleanup()
{
((GuaProcessHandle *)&getOtherEnd().getPhandle().phandle_)->
decompose(cpu, pin, nodeNumber
-#ifdef SQ_PHANDLE_VERIFIER
, seqNum
-#endif
);
str_sprintf(msgBuf,
"GuaConnectionToServer: BFILE_OPEN %d,%d,%Ld "
@@ -1523,24 +1454,15 @@ void GuaConnectionToServer::openPhandle(char * processName, NABoolean parallelOp
}
-#if (defined (NA_LINUX) && defined (SQ_NEW_PHANDLE))
phandle_template* lp_phandle = (phandle_template *) &(getOtherEnd().getPhandle().phandle_);
-#else
- phandle_template* lp_phandle = (phandle_template *) getOtherEnd().getPhandle().phandle_;
-#endif // NA_LINUX
memset(procFileName, 0, IpcMaxGuardianPathNameLength);
char *srcName = (char *) lp_phandle;
// strncpy(procFileName, (char *) lp_phandle->verifierF(), 8);
-#if (defined (NA_LINUX) && defined (SQ_NEW_PHANDLE))
NAProcessHandle phandle((SB_Phandle_Type *)
&(getOtherEnd().getPhandle().phandle_));
phandle.decompose();
procFileNameLen = phandle.getPhandleStringLen();
strncpy(procFileName, phandle.getPhandleString(), procFileNameLen);
-#else
- strncpy(procFileName, &srcName[8], 8);
- procFileNameLen = strlen(procFileName);
-#endif
MXTRC_1("GCTS::openPhandle procFileName=%s\n", procFileName);
#pragma nowarn(1506) // warning elimination
NABoolean isEsp = getEnvironment()->getAllConnections()->getPendingIOs().isEsp();
@@ -1651,9 +1573,7 @@ void GuaConnectionToServer::openPhandle(char * processName, NABoolean parallelOp
SB_Int64_Type seqNum = -1;
GuaProcessHandle *otherEnd = (GuaProcessHandle *)&getOtherEnd().getPhandle().phandle_;
otherEnd->decompose(cpu, pin, nodeNumber
-#ifdef SQ_PHANDLE_VERIFIER
, seqNum
-#endif
);
env->closeTrace(__LINE__, openFile_, cpu, pin, seqNum);
openFile_ = -1; // Don't leave valid file number in object!
@@ -1805,9 +1725,7 @@ void GuaConnectionToServer::closePhandle()
SB_Int64_Type seqNum = -1;
otherEnd = (GuaProcessHandle *)&getOtherEnd().getPhandle().phandle_;
otherEnd->decompose(cpu, pin, nodeNumber
-#ifdef SQ_PHANDLE_VERIFIER
, seqNum
-#endif
);
env->closeTrace(__LINE__, openFile_, cpu, pin,
seqNum); // Persistent open simulated close
@@ -1830,9 +1748,7 @@ void GuaConnectionToServer::closePhandle()
SB_Int64_Type seqNum = -1;
GuaProcessHandle *otherEnd = (GuaProcessHandle *)&getOtherEnd().getPhandle().phandle_;
otherEnd->decompose(cpu, pin, nodeNumber
-#ifdef SQ_PHANDLE_VERIFIER
, seqNum
-#endif
);
env->closeTrace(__LINE__, openFile_, cpu, pin, nodeNumber);
}
@@ -2018,109 +1934,6 @@ void GuaConnectionToServer::cleanUpActiveIOEntry(ActiveIOQueueEntry &entry)
numOutstandingIOs_--;
}
-#ifndef SQ_PHANDLE_VERIFIER
-bool GuaConnectionToServer::childProcessPidRecycled()
-{
- // Fix for CR 7128 - Guard against this scenario:
- // An ESP is created but before the master opens it, the
- // ESP exits and another process (probably an ESP) is created
- // with the same nid, pid and pname. That leads to two masters
- // opening the same ESP. To prevent the scenario,
- // the process creation time is retrieved immediately after
- // the process is created and stored in the GuaConnectionToServer.
- // Then after it is opened, the process creation time is retrieved
- // again from Seabed and checked for a match. If no match, the
- // open is considered unsuccessful and AQR or other retry schemes
- // try to handle the error.
- // Note that there is no guard against the scenario for the
- // GuaConnectionToServer objects that are used for SSMP or SSCP
- // (since we don't care which incarnation of these processes we
- // connect to) or for Seabed data connections (since a dying ESP
- // will be detected with the control connection). Hence, these types
- // of connections have zero in the childCreationTime_.
- //
- // Note that when SQF enhancement ALM CR 4780 is addressed we
- // can remove this check.
- if (childCreationTime_.tv_sec != 0)
- {
- char procName[200];
- short procNameLen = 200;
- NAProcessHandle phandle((SB_Phandle_Type *)
- &(getOtherEnd().getPhandle().phandle_));
- Int32 retcode = phandle.decompose();
- assert (!retcode);
- short pnamelen = phandle.getPhandleStringLen();
- memcpy(procName, phandle.getPhandleString(), pnamelen);
- procName[pnamelen] = 0; // null-terminate
- MS_Mon_Process_Info_Type procInfo;
- Int32 retrys = 0;
- const Int32 NumRetries = 10;
- timespec retryintervals[NumRetries] = {
- { 0, 10*1000*1000 } // 10 ms
- , { 0, 100*1000*1000 } // 100 ms
- , { 1, 0 } // 1 second
- , { 3, 0 } // 3 seconds
- , { 6, 0 } // 6 seconds
- , { 10, 0 } // 10 seconds
- , { 15, 0 } // 15 seconds
- , { 15, 0 } // 15 seconds
- , { 15, 0 } // 15 seconds
- , { 15, 0 } // 15 seconds
- } ;
- for (;;)
- {
- retcode = msg_mon_get_process_info_detail(procName, &procInfo);
- if (retcode == XZFIL_ERR_OK)
- {
- if ((procInfo.creation_time.tv_sec ==
- childCreationTime_.tv_sec) &&
- (procInfo.creation_time.tv_nsec ==
- childCreationTime_.tv_nsec))
- {
- break ; // This server is the same incarnation of the pid
- // as the one we started.
- }
- else
- {
- // The server we started has died, and the pid has
- // been reused. We cannot use this one.
- guaErrorInfo_ = GuaIpcApplicationErr;
- setErrorInfo(-1);
- setState(ERROR_STATE);
- char logMsg[200];
- str_sprintf(logMsg, "An instance of CR 7128 was avoided "
- "by not opening recycled pname %s.",
- procName);
- SQLMXLoggingArea::logExecRtInfo(__FILE__, __LINE__,
- logMsg, 0);
- return true;
- }
- }
- else if ((retrys < NumRetries) &&
- (retcode == FEPATHDOWN ||
- retcode == FEOWNERSHIP))
- {
- nanosleep(&retryintervals[retrys++], NULL);
- }
- else
- {
- guaErrorInfo_ = retcode;
- setErrorInfo(-1);
- setState(ERROR_STATE);
- char logMsg[200];
- str_sprintf(logMsg, "Error %d returned from "
- "msg_mon_get_process_info_detail "
- "for %s.", retcode, procName);
- SQLMXLoggingArea::logExecRtInfo(__FILE__, __LINE__,
- logMsg, 0);
- return true;
- }
- }
- }
- return false;
-}
-#endif
-
void GuaConnectionToServer::dumpAndStopOtherEnd(bool dump, bool stop) const
{
getOtherEnd().getPhandle().dumpAndStop(dump, stop);
@@ -2807,19 +2620,13 @@ WaitReturnStatus GuaReceiveControlConnection::wait(IpcTimeout timeout, UInt32 *e
guaReceiveFastStart_->fileGetReceiveInfo_ = FALSE;
}
else
-#ifdef SQ_NEW_PHANDLE
guaErrorInfo_ = BFILE_GETRECEIVEINFO_((FS_Receiveinfo_Type *)&receiveInfo);
-#else
- guaErrorInfo_ = BFILE_GETRECEIVEINFO_((short *) &receiveInfo);
-#endif // SQ_NEW_PHANDLE
if (systemMessageReceived && (msgType == ZSYS_VAL_SMSG_CLOSE))
{
Int32 cpu, pin, nodeNumber;
SB_Int64_Type seqNum = -1;
receiveInfo.phandle_.decompose(cpu, pin, nodeNumber
-#ifdef SQ_PHANDLE_VERIFIER
, seqNum
-#endif
);
env_->closeTrace(__LINE__, receiveInfo.clientFileNumber_, cpu, pin, nodeNumber);
@@ -2920,9 +2727,7 @@ WaitReturnStatus GuaReceiveControlConnection::wait(IpcTimeout timeout, UInt32 *e
Int32 cpu, pin, nodeNumber;
SB_Int64_Type seqNum = -1;
receiveInfo.phandle_.decompose(cpu, pin, nodeNumber
-#ifdef SQ_PHANDLE_VERIFIER
, seqNum
-#endif
);
env_->closeTrace(__LINE__, receiveInfo.clientFileNumber_,
cpu, pin, seqNum); // Persistent open simulated close
@@ -3674,11 +3479,6 @@ IpcGuardianServer::IpcGuardianServer(
nowaitedEspStartup_.procCreateError_ = &procCreateError_;
nowaitedEspStartup_.newPhandle_ = &newPhandle_;
nowaitedEspStartup_.nowaitedStartupCompleted_ = &nowaitedStartupCompleted_;
-#ifndef SQ_PHANDLE_VERIFIER
- // ALM 4528
- creationTime_.tv_sec = 0;
- creationTime_.tv_nsec = 0;
-#endif
unhooked_ = false;
}
@@ -3716,43 +3516,7 @@ void IpcGuardianServer::stop()
if (!guaRetcode)
{
-#ifdef SQ_PHANDLE_VERIFIER
msg_mon_stop_process_name(phandle.getPhandleString());
-#else
- memcpy(procName, phandle.getPhandleString(), phandle.getPhandleStringLen() + 1);
- procName[phandle.getPhandleStringLen()] = 0; // null-terminate
- msg_mon_get_process_info (procName, &nid, &pid);
- MS_Mon_Process_Info_Type procInfo;
- Int32 rc = msg_mon_get_process_info_detail(procName, &procInfo);
- if (rc == XZFIL_ERR_OK)
- {
- // When stopping an ESP by name, check the ESPs creation timestamp
- // to see if the ESP was started by this master. Helps when process
- // names are reused. See ALM CR 4528. When SQF is enhanced to
- // handle this problem (see enhancement CR 4780) we can remove this
- // work-around logic.
- if ((procInfo.creation_time.tv_sec == creationTime_.tv_sec) &&
- (procInfo.creation_time.tv_nsec == creationTime_.tv_nsec))
- msg_mon_stop_process(procName, nid, pid);
- else
- {
- // LCOV_EXCL_START
- if (controlConnection_->getEnvironment() &&
- controlConnection_->getEnvironment()->getLogReleaseEsp())
- {
- char logMsg[200];
- str_sprintf(logMsg, "Another instance of CR 4528 avoided "
- "by not stopping process %s.", procName);
- SQLMXLoggingArea::logExecRtInfo(__FILE__, __LINE__,
- logMsg, 0);
- }
- // LCOV_EXCL_STOP
-
- }
- }
- else
- ; // Normal case would be error 14.
-#endif
}
}
}
@@ -3868,25 +3632,6 @@ void IpcGuardianServer::acceptSystemMessage(const char *sysMsg,
// process was successfully created, now create a connection to it
IpcProcessId serverProcId(
(const GuaProcessHandle &) processCreateNowaitMsg->z_phandle);
-#ifndef SQ_PHANDLE_VERIFIER
- MS_Mon_Process_Info_Type procInfo;
- char espName[32];
- Int32 espNameLen = serverProcId.getPhandle().toAscii(
- espName, sizeof(espName));
- assert(espNameLen < sizeof(espName));
- espName[espNameLen] = '\0';
- Int32 rc = msg_mon_get_process_info_detail(espName, &procInfo);
- if (rc != FEOK)
- {
- // Race condition can cause this - server process ended
- // very soon after it started. See ALM CR 5360.
- guardianError_ = 4022;
- procCreateError_ = rc;
- serverState_ = ERROR_STATE;
- return;
- }
- creationTime_ = procInfo.creation_time;
-#endif
NABoolean useGuaIpc = TRUE;
if (useGuaIpc)
{
@@ -3898,10 +3643,6 @@ void IpcGuardianServer::acceptSystemMessage(const char *sysMsg,
nowaitDepth_,
eye_GUA_CONNECTION_TO_SERVER,
parallelOpens_, NULL, FALSE
-#ifndef SQ_PHANDLE_VERIFIER
- , creationTime_.tv_sec
- , creationTime_.tv_nsec
-#endif
);
if (controlConnection_->getState() == IpcConnection::ERROR_STATE)
@@ -4295,11 +4036,7 @@ void IpcGuardianServer::launchNSKLiteProcess(ComDiagsArea **diags,
process_name, /* output process name */
largc, /* args */
largv,
-#ifdef SQ_NEW_PHANDLE
&p_phandle,
-#else
- (short *) &p_phandle, /* phandle */
-#endif // SQ_NEW_PHANDLE
0, /* open */
&server_oid, /* oid */
processType, /* process type */
@@ -4413,12 +4150,8 @@ void IpcGuardianServer::spawnProcess(ComDiagsArea **diags,
void IpcGuardianServer::useProcess(ComDiagsArea **diags,
CollHeap *diagsHeap)
{
-#ifdef SQ_NEW_PHANDLE
NSK_PORT_HANDLE *procHandle;
NSK_PORT_HANDLE procHandleCopy;
-#else
- short *procHandle;
-#endif
short usedlength;
char processName[50];
char *tmpProcessName;
@@ -4535,13 +4268,9 @@ NABoolean IpcGuardianServer::serverDied()
char pname[PhandleStringLen];
Int32 pnameLen = ph.toAscii(pname, PhandleStringLen);
pname[pnameLen] = '\0';
-#ifdef SQ_PHANDLE_VERIFIER
int nid, pid;
SB_Verif_Type verifier;
int rc = msg_mon_get_process_info2(pname, &nid, &pid, &verifier);
-#else
- int nid, pid; int rc = msg_mon_get_process_info(pname, &nid, &pid);
-#endif
return rc != 0 ;
}
@@ -4640,6 +4369,5 @@ NABoolean useGuaIpc = TRUE;
}
#endif /* LOG_IPC || LOG_RECEIVE */
-#endif /* NA_GUARDIAN_IPC || NA_GUARDIAN_MSG*/
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/common/IpcMessageType.h
----------------------------------------------------------------------
diff --git a/core/sql/common/IpcMessageType.h b/core/sql/common/IpcMessageType.h
index a41ab5c..a6e7af0 100644
--- a/core/sql/common/IpcMessageType.h
+++ b/core/sql/common/IpcMessageType.h
@@ -221,12 +221,7 @@ enum IpcMessageTypeEnum
};
-#ifdef NA_64BIT
-// dg64 - 32-bit message type
typedef Int32 IpcMessageType;
-#else
-typedef Lng32 IpcMessageType;
-#endif
// -----------------------------------------------------------------------
// Types for objects inside messages (a different space of numbers for
@@ -236,22 +231,12 @@ typedef Lng32 IpcMessageType;
// allows us to manage the enum types separately per component of the
// SQL system without forcing global recompiles on small changes.
// -----------------------------------------------------------------------
-#ifdef NA_64BIT
typedef Int32 IpcMessageObjType;
-// dg64 - 32-bit message obj type
-#else
-typedef Lng32 IpcMessageObjType;
-#endif
// -----------------------------------------------------------------------
// Version of a message header or of an object in a message
// -----------------------------------------------------------------------
-#ifdef NA_64BIT
-// dg64 - 32-bit message obj version type
typedef Int32 IpcMessageObjVersion;
-#else
-typedef Lng32 IpcMessageObjVersion;
-#endif
// -----------------------------------------------------------------------
// Reserved numbers for certain common objects in messages, to be
@@ -284,34 +269,19 @@ const IpcMessageObjVersion IpcCurrSqlDiagnosticsAreaVersion = 100;
const IpcMessageObjVersion IpcCurrSqlStatisticsVersion = 100;
const IpcMessageObjVersion IpcCurrProcessIdVersion = 100;
-#ifdef NA_64BIT
-// dg64 - 32-bit message type
typedef Int32 IpcMessageType;
-#else
-typedef Lng32 IpcMessageType;
-#endif
// -----------------------------------------------------------------------
// size of objects in bytes
// -----------------------------------------------------------------------
-#ifdef NA_64BIT
-// dg64 - 32-bit message obj size
typedef UInt32 IpcMessageObjSize;
-#else
-typedef ULng32 IpcMessageObjSize;
-#endif
// -----------------------------------------------------------------------
// Reference count of a message header or of an object in a message
// (used mainly when objects are shared across the IPC interface)
// -----------------------------------------------------------------------
-#ifdef NA_64BIT
-// dg64 - 32-bit message ref count
typedef Int32 IpcMessageRefCount;
-#else
-typedef Lng32 IpcMessageRefCount;
-#endif
// -----------------------------------------------------------------------
// A buffer pointer to a raw, byte-adressable message buffer, used for
@@ -356,23 +326,14 @@ const short IpcMyAlignment = IpcAlignment8;
// a value of 100 means 1 sec), 0 means return immediately,
// IpcInfiniteTimeout waits forever
// -----------------------------------------------------------------------
-#ifdef NA_64BIT
typedef Int32 IpcTimeout;
-#else
-typedef Lng32 IpcTimeout;
-#endif
const IpcTimeout IpcImmediately = 0;
const IpcTimeout IpcInfiniteTimeout = -1;
// -----------------------------------------------------------------------
// CPU number in a node
// -----------------------------------------------------------------------
-#ifdef NA_64BIT
-// dg64 - 32-bit cpu num
typedef Int32 IpcCpuNum;
-#else
-typedef Lng32 IpcCpuNum;
-#endif
// an invalid CPU number in a node
const IpcCpuNum IPC_CPU_DONT_CARE = -1;
@@ -380,12 +341,7 @@ const IpcCpuNum IPC_CPU_DONT_CARE = -1;
// -----------------------------------------------------------------------
// Priority of a started process
// -----------------------------------------------------------------------
-#ifdef NA_64BIT
-// dg64 - 32-bit priority
typedef Int32 IpcPriority;
-#else
-typedef Lng32 IpcPriority;
-#endif
const IpcPriority IPC_PRIORITY_DONT_CARE = -1;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/common/IpcSockets.cpp
----------------------------------------------------------------------
diff --git a/core/sql/common/IpcSockets.cpp b/core/sql/common/IpcSockets.cpp
index 70a1858..d075236 100644
--- a/core/sql/common/IpcSockets.cpp
+++ b/core/sql/common/IpcSockets.cpp
@@ -61,12 +61,6 @@ void IpcSockLogTimestamp(Int32 fdesc); // see bottom of file
const Int32 SOCKET_ERROR = -1;
typedef size_t length_t;
-
-// for system procedure calls (close,dup2,fork,execve)
-#if defined(NA_OSS) || defined(NA_HSC_LINUX) || defined(NA_HSC_HPUX) || defined(NA_HSC_LINUX)
-# include <unistd.h>
-#endif
-
#include <errno.h>
#include <sys/time.h>
@@ -416,12 +410,7 @@ SockPortNumber SockSocket::bindOrConnect(const SockIPAddress &ipAddr,
// return the port that the socket is now bound to
-#ifdef NA_64BIT
- // dg64 - use 64-bit i/f
socklen_t namelen = sizeof(targetSockAddr);
-#else
- length_t namelen = sizeof(targetSockAddr);
-#endif
retcode = ::getsockname(fdesc_,&targetSockAddr,&namelen);
if (retcode == SOCKET_ERROR)
setFromerrno("::getsockname()");
@@ -814,12 +803,7 @@ NABoolean SockSocket::accept(SockFdesc &fdesc, IpcTimeout timeout)
} // non-infinite timeout
struct sockaddr clientSockAddr;
-#ifdef NA_64BIT
- // dg64 - use 64-bit i/f
socklen_t addrlen = sizeof(clientSockAddr);
-#else
- length_t addrlen = sizeof(clientSockAddr);
-#endif
// call the accept() system call, waiting until a client wants to connect
Int32 retcode = ::accept(fdesc_,&clientSockAddr,&addrlen);
@@ -1427,8 +1411,6 @@ SockControlConnection::SockControlConnection(
cout << "Listening to port " << setw(11) << listnerPortNum_ << "\n" << flush;
}
-#ifdef NA_64BIT
-// dg64 - stub
SockControlConnection::SockControlConnection(
IpcEnvironment *env, Int32 inheritedSocket, Int32 passedPort, const char *eye)
: IpcControlConnection(IPC_DOM_INTERNET),
@@ -1436,8 +1418,6 @@ SockControlConnection::SockControlConnection(
{
assert(0);
}
-#endif
-
IpcConnection *SockControlConnection::getConnection() const
{
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/common/NAAssert.h
----------------------------------------------------------------------
diff --git a/core/sql/common/NAAssert.h b/core/sql/common/NAAssert.h
index deab336..4c37de7 100644
--- a/core/sql/common/NAAssert.h
+++ b/core/sql/common/NAAssert.h
@@ -64,8 +64,6 @@ NAAssert((errMsg), __FILE__, __LINE__); }
#include "Platform.h"
#include "NAMemory.h"
-#include "SqlExportDllDefines.h"
-
#include <setjmp.h>
#include <pthread.h>
@@ -76,15 +74,15 @@ NAAssert((errMsg), __FILE__, __LINE__); }
int NAAssertMutexCreate(); // Function to create mutex to serialize termination
int NAAssertMutexLock(); // Function to lock mutext when a process terminates of a thread asserts
-extern NA_EIDPROC void SQLEXPORT_LIB_FUNC NAAssert(const char *ex, const char *fil, Int32 lin);
+extern void NAAssert(const char *ex, const char *fil, Int32 lin);
-extern void SQLEXPORT_LIB_FUNC NABreakPoint();
+extern void NABreakPoint();
extern void NAInlineBreakpointFunc(const char *fil, Int32 lin);
-NA_EIDPROC void assert_botch_no_abend( const char *f, Int32 l, const char * m);
+void assert_botch_no_abend( const char *f, Int32 l, const char * m);
// Add condition pointer (fourth argument) for certain SeaMonster asserts
-NA_EIDPROC void assert_botch_abend( const char *f, Int32 l, const char * m, const char *c = NULL);
+void assert_botch_abend( const char *f, Int32 l, const char * m, const char *c = NULL);
#ifdef NDEBUG
#define NAInlineBreakpoint
#else
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/common/NAError.h
----------------------------------------------------------------------
diff --git a/core/sql/common/NAError.h b/core/sql/common/NAError.h
index eefa516..38f0421 100644
--- a/core/sql/common/NAError.h
+++ b/core/sql/common/NAError.h
@@ -81,12 +81,10 @@ public:
// ---------------------------------------------------------------------
// Constructor
// ---------------------------------------------------------------------
- NA_EIDPROC
NAErrorParam(Lng32 l) : errParamType_(NAERROR_PARAM_TYPE_INTEGER),
longValue_(l)
{ }
- NA_EIDPROC
NAErrorParam(char * s) : errParamType_(NAERROR_PARAM_TYPE_CHAR_STRING),
stringValue_(s)
{ }
@@ -94,7 +92,7 @@ public:
// ---------------------------------------------------------------------
// Destructor
// ---------------------------------------------------------------------
- NA_EIDPROC virtual ~NAErrorParam() {};
+ virtual ~NAErrorParam() {};
// ---------------------------------------------------------------------
// Ideally, there should be just one method for returning a string for
@@ -126,13 +124,13 @@ public:
// }
//
// ---------------------------------------------------------------------
- NA_EIDPROC NAErrorParamType getNAErrorParamType() const
+ NAErrorParamType getNAErrorParamType() const
{ return errParamType_; }
- NA_EIDPROC Lng32 getIntegerNAErrorParam() const
+ Lng32 getIntegerNAErrorParam() const
{ return longValue_; }
- NA_EIDPROC char * getStringNAErrorParam() const
+ char * getStringNAErrorParam() const
{ return stringValue_; }
protected:
@@ -157,7 +155,7 @@ public:
// The first argument, numParams, ends up deciding how many of the
// following parameters are relevant.
// ---------------------------------------------------------------------
- NA_EIDPROC NAErrorParamArray(Lng32 numParams = 0,
+ NAErrorParamArray(Lng32 numParams = 0,
NAErrorParam * errParam0 = 0,
NAErrorParam * errParam1 = 0,
NAErrorParam * errParam2 = 0,
@@ -170,17 +168,17 @@ public:
NAErrorParam * errParam9 = 0
);
- NA_EIDPROC virtual ~NAErrorParamArray();
+ virtual ~NAErrorParamArray();
// ---------------------------------------------------------------------
// How many NAErrorParams are contained in the NAErrorParamArray?
// ---------------------------------------------------------------------
- NA_EIDPROC Lng32 entries() const { return numParams_; }
+ Lng32 entries() const { return numParams_; }
// ---------------------------------------------------------------------
// Accessor function.
// ---------------------------------------------------------------------
- NA_EIDPROC NAErrorParam * getNAErrorParam(Lng32 paramNo) const
+ NAErrorParam * getNAErrorParam(Lng32 paramNo) const
{
if ( (paramNo >= 0) && (paramNo < numParams_ ) )
return array_[paramNo].errParam_;
@@ -249,7 +247,7 @@ public:
// ---------------------------------------------------------------------
// Constructor
// ---------------------------------------------------------------------
- NA_EIDPROC NAError(const NAErrorCode errCode = 0,
+ NAError(const NAErrorCode errCode = 0,
const NAErrorType errType = NAERROR_NONE,
const NASubsys subsys = NA_UNKNOWN,
NAErrorParamArray * errParams = 0,
@@ -261,19 +259,19 @@ public:
// ---------------------------------------------------------------------
// Destructor
// ---------------------------------------------------------------------
- NA_EIDPROC ~NAError();
+ ~NAError();
// ---------------------------------------------------------------------
// Accessor functions.
// ---------------------------------------------------------------------
- NA_EIDPROC NAErrorCode getErrCode() const { return errCode_; }
- NA_EIDPROC NAErrorType getErrType() const { return errType_; }
- NA_EIDPROC NASubsys getSubsys() const { return subsysId_; }
+ NAErrorCode getErrCode() const { return errCode_; }
+ NAErrorType getErrType() const { return errType_; }
+ NASubsys getSubsys() const { return subsysId_; }
// ---------------------------------------------------------------------
// Error Parameters.
// ---------------------------------------------------------------------
- NA_EIDPROC Lng32 getErrParamCount() const
+ Lng32 getErrParamCount() const
{
if (errParams_)
return errParams_->entries();
@@ -281,7 +279,7 @@ public:
return 0;
}
- NA_EIDPROC NAErrorParam * getNAErrorParam(Lng32 paramNo) const
+ NAErrorParam * getNAErrorParam(Lng32 paramNo) const
{
if (errParams_)
return errParams_->getNAErrorParam(paramNo);
@@ -292,22 +290,22 @@ public:
// ---------------------------------------------------------------------
// Procedure name and line numbers.
// ---------------------------------------------------------------------
- NA_EIDPROC char * getProcName() const { return procName_; }
+ char * getProcName() const { return procName_; }
- NA_EIDPROC Lng32 getLineNumber() const { return lineNumber_; }
+ Lng32 getLineNumber() const { return lineNumber_; }
// ---------------------------------------------------------------------
// Method for traversing error list
// ---------------------------------------------------------------------
- NA_EIDPROC void setNext(NAError * errPtr) { next_ = errPtr; }
- NA_EIDPROC NAError * getNext() const { return next_; }
+ void setNext(NAError * errPtr) { next_ = errPtr; }
+ NAError * getNext() const { return next_; }
// ---------------------------------------------------------------------
// Linearization and De-linearization functions to copy SQLDiagArea
// tree to and from contiguous storage.
// ---------------------------------------------------------------------
- NA_EIDPROC Long pack(void * space);
- NA_EIDPROC Lng32 unpack(Lng32);
+ Long pack(void * space);
+ Lng32 unpack(Lng32);
private:
@@ -347,7 +345,7 @@ public:
// ---------------------------------------------------------------------
// Constructor
// ---------------------------------------------------------------------
- NA_EIDPROC NAErrorStack(Lng32 maxSize)
+ NAErrorStack(Lng32 maxSize)
: maxEntries_(maxSize), numEntries_(0), errEntry_(0),
nextEntry_(0), iterEntries_(0)
{
@@ -356,17 +354,17 @@ public:
// ---------------------------------------------------------------------
// Destructor
// ---------------------------------------------------------------------
- NA_EIDPROC ~NAErrorStack();
+ ~NAErrorStack();
// ---------------------------------------------------------------------
// Method for initializing an error stack - once per statement
// ---------------------------------------------------------------------
- NA_EIDPROC void clear();
+ void clear();
// ---------------------------------------------------------------------
// Method for returning the error code for the latest error
// ---------------------------------------------------------------------
- NA_EIDPROC NAErrorCode getErrCode()
+ NAErrorCode getErrCode()
{
if (errEntry_ != (NAError *)0)
return errEntry_->getErrCode();
@@ -377,13 +375,13 @@ public:
// ---------------------------------------------------------------------
// Method for adding a new Error
// ---------------------------------------------------------------------
- NA_EIDPROC void addErrEntry(NAError * errPtr);
+ void addErrEntry(NAError * errPtr);
// ---------------------------------------------------------------------
// Iterator over all errors
// ---------------------------------------------------------------------
- NA_EIDPROC NAError * getFirst(); // initialize the iterator
- NA_EIDPROC NAError * getNext(); // behaviour undefined unless getFirst() was called
+ NAError * getFirst(); // initialize the iterator
+ NAError * getNext(); // behaviour undefined unless getFirst() was called
private:
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/common/NAHeap.h
----------------------------------------------------------------------
diff --git a/core/sql/common/NAHeap.h b/core/sql/common/NAHeap.h
index 0cf12b5..7c00356 100644
--- a/core/sql/common/NAHeap.h
+++ b/core/sql/common/NAHeap.h
@@ -94,16 +94,12 @@ class NASpace : public CollHeap
{
public:
-NA_EIDPROC
NASpace(Space::SpaceType t=Space::SYSTEM_SPACE);
-NA_EIDPROC
virtual ~NASpace();
-NA_EIDPROC
virtual void * allocateMemory(size_t size, NABoolean failureIsFatal = TRUE);
-NA_EIDPROC
virtual void deallocateMemory(void*)
{
#ifdef NAHEAP__DEBUG
@@ -111,18 +107,14 @@ NA_EIDPROC
#endif
}
-#if (defined(_DEBUG) || defined(NSK_MEMDEBUG)) && !defined(__EID)
-NA_EIDPROC
+#if (defined(_DEBUG) || defined(NSK_MEMDEBUG))
virtual void dump(ostream* outstream, Lng32 indent) {};
#else
-NA_EIDPROC
inline void dump(void* outstream, Lng32 indent) {}
#endif
private:
-NA_EIDPROC
NASpace(const NASpace&);
-NA_EIDPROC
NASpace& operator =(const NASpace&);
Space s_;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/common/NAIpc.cpp
----------------------------------------------------------------------
diff --git a/core/sql/common/NAIpc.cpp b/core/sql/common/NAIpc.cpp
index 231dcfa..b6a20bb 100644
--- a/core/sql/common/NAIpc.cpp
+++ b/core/sql/common/NAIpc.cpp
@@ -107,7 +107,7 @@ NAMessage::NAMessage(IpcNetworkDomain domain) :
{
switch (domain)
{
-#if (defined(NA_GUARDIAN_IPC) || defined(NA_GUARDIAN_MSG))
+#if (defined(NA_GUARDIAN_IPC))
case IPC_DOM_GUA_PHANDLE:
// open $RECEIVE
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/common/NAIpc.h
----------------------------------------------------------------------
diff --git a/core/sql/common/NAIpc.h b/core/sql/common/NAIpc.h
index 433b8cb..bb88e4c 100644
--- a/core/sql/common/NAIpc.h
+++ b/core/sql/common/NAIpc.h
@@ -97,7 +97,7 @@ public:
// stdin and stdout (both Unix and NSK).
// ---------------------------------------------------------------------
NAMessage(IpcNetworkDomain domain
-#if (defined(NA_GUARDIAN_IPC) || defined(NA_GUARDIAN_MSG))
+#if (defined(NA_GUARDIAN_IPC))
// when compiling on NSK systems the default is $RECEIVE
= IPC_DOM_GUA_PHANDLE
#else
[05/30] incubator-trafodion git commit: TRAFODION-2731 CodeCleanup:
Remove obsolete, legacy and unused code
Posted by an...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/export/NAStringDef.cpp
----------------------------------------------------------------------
diff --git a/core/sql/export/NAStringDef.cpp b/core/sql/export/NAStringDef.cpp
index b9d0960..7b11d06 100644
--- a/core/sql/export/NAStringDef.cpp
+++ b/core/sql/export/NAStringDef.cpp
@@ -624,7 +624,6 @@ NAString::clone(size_t nc)
/****************** Related global functions ***********************/
-SQLEXPORT_LIB_FUNC
NABoolean
operator==(const NAString& s1, const char* s2)
{
@@ -637,7 +636,6 @@ operator==(const NAString& s1, const char* s2)
}
// Return a lower-case version of str:
-SQLEXPORT_LIB_FUNC
NAString
toLower(const NAString& str)
{
@@ -653,7 +651,6 @@ toLower(const NAString& str)
}
// Return an upper-case version of str:
-SQLEXPORT_LIB_FUNC
NAString
toUpper(const NAString& str)
{
@@ -668,7 +665,6 @@ toUpper(const NAString& str)
return temp;
}
-SQLEXPORT_LIB_FUNC
NAString
operator+(const NAString& s, const char* cs)
{
@@ -676,7 +672,6 @@ operator+(const NAString& s, const char* cs)
return NAString(s.data(), s.length(), cs, strlen(cs), s.heap());
}
-SQLEXPORT_LIB_FUNC
NAString
operator+(const NAString& s, const char c)
{
@@ -685,7 +680,6 @@ operator+(const NAString& s, const char c)
return NAString(s.data(), s.length(), temp.data(), temp.length(), s.heap());
}
-SQLEXPORT_LIB_FUNC
NAString
operator+(const char* cs, const NAString& s)
{
@@ -693,7 +687,6 @@ operator+(const char* cs, const NAString& s)
return NAString(cs, strlen(cs), s.data(), s.length(), s.heap());
}
-SQLEXPORT_LIB_FUNC
NAString
operator+(const NAString& s1, const NAString& s2)
{
@@ -824,7 +817,6 @@ NASubString::operator=(const char* cs)
return *this;
}
-SQLEXPORT_LIB_FUNC
NABoolean
operator==(const NASubString& ss, const char* cs)
{
@@ -841,7 +833,6 @@ operator==(const NASubString& ss, const char* cs)
return (i == ss.extent_);
}
-SQLEXPORT_LIB_FUNC
NABoolean
operator==(const NASubString& ss, const NAString& s)
{
@@ -850,7 +841,6 @@ operator==(const NASubString& ss, const NAString& s)
return !memcmp(ss.str_->data() + ss.begin_, s.data(), ss.extent_);
}
-SQLEXPORT_LIB_FUNC
NABoolean
operator==(const NASubString& s1, const NASubString& s2)
{
@@ -965,7 +955,6 @@ NAString::mbLength() const
* the streambuf.
*/
-SQLEXPORT_LIB_FUNC
ostream&
operator<<(ostream& os, const NAString& s)
{
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/export/NAStringDef.h
----------------------------------------------------------------------
diff --git a/core/sql/export/NAStringDef.h b/core/sql/export/NAStringDef.h
index b0ea326..fe1f44d 100644
--- a/core/sql/export/NAStringDef.h
+++ b/core/sql/export/NAStringDef.h
@@ -66,10 +66,7 @@ using namespace std;
#include "FBString.h"
-#ifndef __EID
-// no use for this in EID
#include "ComGuardianFileNameParts.h"
-#endif
#include "Collections.h"
// -----------------------------------------------------------------------
@@ -114,18 +111,6 @@ typedef size_t StringPos;
// Number of bits per byte
const size_t BITSPERBYTE = 8;
-// Check pre- and post-conditions used in
-// /export/NAStringDef.cpp and /common/rawstring.cpp
-// ps: Copied from rw/defs.h
-#if defined(NA_C89_VERSION3)
-#include <assert.h>
-#define RWPRECONDITION(a) assert( (a) != 0 )
-#define RWPOSTCONDITION(a) assert( (a) != 0 )
-#define RWPRECONDITION2(a,b) assert((b, (a) !=0))
-#define RWPOSTCONDITION2(a,b) assert((b, (a) !=0))
-#define RWASSERT(a) assert( (a) != 0 )
-#endif
-
// classes in this file:
class NASubString ; // rewrite of RWCSubString, from cstring.h/cstring.cpp
class NAString ; // rewrite of RWCString, from cstring.h/cstring.cpp
@@ -143,7 +128,7 @@ class NAString ; // rewrite of RWCString, from cstring.h/cstring.cpp
*/
-class SQLEXPORT_LIB_FUNC NASubString
+class NASubString
{
public:
NASubString(const NASubString& sp)
@@ -199,15 +184,12 @@ private:
size_t extent_;// Length of NASubString
friend
-SQLEXPORT_LIB_FUNC
NABoolean operator==(const NASubString& s1, const NASubString& s2);
friend
-SQLEXPORT_LIB_FUNC
NABoolean operator==(const NASubString& s1, const NAString& s2);
friend
-SQLEXPORT_LIB_FUNC
NABoolean operator==(const NASubString& s1, const char* s2);
friend class NAString;
@@ -229,7 +211,7 @@ friend class NAString;
//
//////////////////////////////////////////////////////////////////////////
-class SQLEXPORT_LIB_FUNC NAString : public NABasicObject
+class NAString : public NABasicObject
{
public:
@@ -262,34 +244,25 @@ public:
NAString(signed char c, NAMemory *h=NASTRING_UNINIT_HEAP_PTR) ;
NAString(const FBString & fbs, NAMemory *h=NASTRING_UNINIT_HEAP_PTR) ;
-#ifndef __EID
-// not supposed to be in executor-in-DP2
NAString(const ComGuardianFileNamePart & e, NAMemory *h=NASTRING_UNINIT_HEAP_PTR)
:fbstring_(e.castToConstChar(), e.length(),
(h == NASTRING_UNINIT_HEAP_PTR) ? this->defaultHeapPtr() : h)
{}
-#endif
NAString(char c, size_t N, NAMemory *h=NASTRING_UNINIT_HEAP_PTR) ;
virtual ~NAString() ;
// Type conversion:
operator const char*() const {return fbstring_.data();}
-#ifndef __EID
-// not supposed to be in executor-in-DP2
operator const ComNodeName() const {return ComNodeName(fbstring_.data());}
operator const ComVolumeName() const {return ComVolumeName(fbstring_.data());}
-#endif
// Assignment:
NAString& operator=(const char*); // Replace string
NAString& operator=(const NAString&); // Replace string
-#ifndef __EID
-// not supposed to be in executor-in-DP2
NAString& operator=(const ComGuardianFileNamePart & e)
{return operator= (e.castToConstChar());};
-#endif
NAString& operator=(const char c)
{return operator= (NAString(c, heap()));};
@@ -299,12 +272,8 @@ public:
NAString& operator+=(const char c);
-#ifndef __EID
-// not supposed to be in executor-in-DP2
NAString& operator+=(const ComGuardianFileNamePart & e)
{return operator+= (e.castToConstChar());};
-#endif
-
// Indexing operators:
char& operator[](size_t); // Indexing with bounds checking
@@ -348,11 +317,8 @@ public:
NAString& append(const char c, size_t rep=1); // Append c rep times
-#ifndef __EID
-// not supposed to be in executor-in-DP2
NAString& append(const ComGuardianFileNamePart & e)
{return append (e.castToConstChar());}
-#endif
//RWspace binaryStoreSize() const {return length()+sizeof(size_t);}
// total memory allocated, including the NAStringRef object in front of
@@ -496,25 +462,20 @@ private:
FBString fbstring_;
friend
-SQLEXPORT_LIB_FUNC
NAString operator+(const NAString& s1, const NAString& s2);
friend
-SQLEXPORT_LIB_FUNC
NAString operator+(const NAString& s, const char* cs);
friend
-SQLEXPORT_LIB_FUNC
NAString operator+(const NAString& s, const char c);
friend
-SQLEXPORT_LIB_FUNC
NAString operator+(const char* cs, const NAString& s);
friend
-SQLEXPORT_LIB_FUNC
NABoolean operator==(const NAString& s1, const char* s2);
@@ -524,15 +485,13 @@ friend class NASubString;
typedef NAString* NAStringPtr;
-SQLEXPORT_LIB_FUNC NAString toLower(const NAString&); // Return lower-case version of argument.
+NAString toLower(const NAString&); // Return lower-case version of argument.
-SQLEXPORT_LIB_FUNC NAString toUpper(const NAString&); // Return upper-case version of argument.
+NAString toUpper(const NAString&); // Return upper-case version of argument.
-NA_EIDPROC
inline UInt32 rwhash(const NAString& s) { return s.hash(); }
-NA_EIDPROC
inline UInt32 rwhash(const NAString* s) { return s->hash(); }
#ifndef RW_NO_LOCALE
NAString strXForm(const NAString&); // strxfrm() interface
@@ -651,8 +610,6 @@ inline char NAString::operator()(size_t i) const
return fbstring_[i];
}
-#ifndef __EID
-// not supposed to be in executor-in-DP2
inline NAString operator+(const NAString& s, const ComGuardianFileNamePart & e)
{return operator+(s, e.castToConstChar());};
@@ -664,7 +621,6 @@ inline NAString operator+(const ComGuardianFileNamePart & e, const char * cs )
inline NAString operator+(const char * cs, const ComGuardianFileNamePart & e )
{return operator+(cs, NAString(e));};
-#endif
///////////////////////////////////////////////////////////////////////////////
//
@@ -706,106 +662,80 @@ inline char NASubString::operator()(size_t i) const
}
// String Logical operators:
-NA_EIDPROC
inline NABoolean operator==(const NAString& s1, const NAString& s2)
{ return ((s1.length() == s2.length()) &&
!memcmp(s1.data(), s2.data(), s1.length())); }
-NA_EIDPROC
inline NABoolean operator< (const NAString& s1, const NAString& s2)
{ return s1.compareTo(s2)< 0;}
-NA_EIDPROC
inline NABoolean operator!=(const NAString& s1, const NAString& s2)
{ return !(s1 == s2); }
-NA_EIDPROC
inline NABoolean operator> (const NAString& s1, const NAString& s2)
{ return s1.compareTo(s2)> 0;}
-NA_EIDPROC
inline NABoolean operator<=(const NAString& s1, const NAString& s2)
{ return s1.compareTo(s2)<=0;}
-NA_EIDPROC
inline NABoolean operator>=(const NAString& s1, const NAString& s2)
{ return s1.compareTo(s2)>=0;}
-NA_EIDPROC
inline NABoolean operator!=(const NAString& s1, const char* s2)
{ return !(s1 == s2); }
-NA_EIDPROC
inline NABoolean operator< (const NAString& s1, const char* s2)
{ return s1.compareTo(s2)< 0; }
-NA_EIDPROC
inline NABoolean operator> (const NAString& s1, const char* s2)
{ return s1.compareTo(s2)> 0; }
-NA_EIDPROC
inline NABoolean operator<=(const NAString& s1, const char* s2)
{ return s1.compareTo(s2)<=0; }
-NA_EIDPROC
inline NABoolean operator>=(const NAString& s1, const char* s2)
{ return s1.compareTo(s2)>=0; }
-NA_EIDPROC
inline NABoolean operator==(const char* s1, const NAString& s2)
{ return (s2 == s1); }
-NA_EIDPROC
inline NABoolean operator!=(const char* s1, const NAString& s2)
{ return !(s2 == s1); }
-NA_EIDPROC
inline NABoolean operator< (const char* s1, const NAString& s2)
{ return s2.compareTo(s1)> 0; }
-NA_EIDPROC
inline NABoolean operator> (const char* s1, const NAString& s2)
{ return s2.compareTo(s1)< 0; }
-NA_EIDPROC
inline NABoolean operator<=(const char* s1, const NAString& s2)
{ return s2.compareTo(s1)>=0; }
-NA_EIDPROC
inline NABoolean operator>=(const char* s1, const NAString& s2)
{ return s2.compareTo(s1)<=0; }
// SubString Logical operators:
-NA_EIDPROC
inline NABoolean operator==(const NAString& s1, const NASubString& s2)
{ return (s2 == s1); }
-NA_EIDPROC
inline NABoolean operator==(const char* s1, const NASubString& s2)
{ return (s2 == s1); }
-NA_EIDPROC
inline NABoolean operator!=(const NASubString& s1, const char* s2)
{ return !(s1 == s2); }
-NA_EIDPROC
inline NABoolean operator!=(const NASubString& s1, const NAString& s2)
{ return !(s1 == s2); }
-NA_EIDPROC
inline NABoolean operator!=(const NASubString& s1, const NASubString& s2)
{ return !(s1 == s2); }
-NA_EIDPROC
inline NABoolean operator!=(const NAString& s1, const NASubString& s2)
{ return !(s2 == s1); }
-NA_EIDPROC
inline NABoolean operator!=(const char* s1, const NASubString& s2)
{ return !(s2 == s1); }
-#ifndef __EID
-// not supposed to be in executor-in-DP2
inline NABoolean operator==(const NAString& s1, const ComGuardianFileNamePart& s2)
{return (s1 == s2.castToConstChar());}
inline NABoolean operator==(const ComGuardianFileNamePart& s1, const NAString& s2)
@@ -816,16 +746,15 @@ inline NABoolean operator==(const ComNodeName& s1, const NAString& s2)
{return (s2 == s1.castToConstChar());}
inline NABoolean operator==(const NAString& s1, const char c)
{return (s1.length() == 1 && *s1.data() == c);}
-#endif
// $$$NB: besides usage of c-string-lib functions inside the NAString code,
// if we #ifdef the following two functions then we ought to be able to
// use NAString objects inside the executor ...
// input/output
-SQLEXPORT_LIB_FUNC istream& operator>>(istream& str , NAString& cstr);
+istream& operator>>(istream& str , NAString& cstr);
-SQLEXPORT_LIB_FUNC ostream& operator<<(ostream& str , const NAString& cstr);
+ostream& operator<<(ostream& str , const NAString& cstr);
#endif /* __NASTRING_DEF_H__ */
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/export/NAVersionedObject.cpp
----------------------------------------------------------------------
diff --git a/core/sql/export/NAVersionedObject.cpp b/core/sql/export/NAVersionedObject.cpp
index 59d0ac9..7eed5ac 100644
--- a/core/sql/export/NAVersionedObject.cpp
+++ b/core/sql/export/NAVersionedObject.cpp
@@ -75,7 +75,7 @@
// This arrangement avoids the dependence on the constructors of sub-
// classes of NAVersionedObject on setting these values correctly.
// ---------------------------------------------------------------------
-NA_EIDPROC NAVersionedObject::NAVersionedObject(Int16 classID)
+NAVersionedObject::NAVersionedObject(Int16 classID)
: classID_(classID),
reallocatedAddress_(NULL),
imageSize_(0)
@@ -92,14 +92,14 @@ NA_EIDPROC NAVersionedObject::NAVersionedObject(Int16 classID)
// platform and vice versa. Typically, this only involves toggling the
// endianness of some members.
// ---------------------------------------------------------------------
-NA_EIDPROC void NAVersionedObject::convertToReferencePlatform()
+void NAVersionedObject::convertToReferencePlatform()
{
#ifndef NA_LITTLE_ENDIAN
toggleEndianness();
#endif
}
-NA_EIDPROC void NAVersionedObject::convertToLocalPlatform()
+void NAVersionedObject::convertToLocalPlatform()
{
#ifndef NA_LITTLE_ENDIAN
toggleEndianness();
@@ -114,7 +114,7 @@ NA_EIDPROC void NAVersionedObject::convertToLocalPlatform()
// The left-over space will be zero'ed. Finally, reallocatedAddress_
// field in the older object is set to the address of the new object.
// ---------------------------------------------------------------------
-NA_EIDPROC NAVersionedObject *NAVersionedObject::reallocateImage(void * reallocator)
+NAVersionedObject *NAVersionedObject::reallocateImage(void * reallocator)
{
Space *space = (Space *)reallocator;
@@ -137,7 +137,7 @@ NA_EIDPROC NAVersionedObject *NAVersionedObject::reallocateImage(void * realloca
// the image has been reallocated so that it is big enough to make this
// expansion.
// ---------------------------------------------------------------------
-NA_EIDPROC void NAVersionedObject::makeRoomForNewVersion(
+void NAVersionedObject::makeRoomForNewVersion(
short oldSubClassSize,
short newSubClassSize)
{
@@ -216,7 +216,7 @@ NA_EIDPROC void NAVersionedObject::makeRoomForNewVersion(
// which is not supported anymore. Also notice that the versionIDArray_
// should only be updated at initNewMembers().
// ---------------------------------------------------------------------
-NA_EIDPROC Lng32 NAVersionedObject::migrateToNewVersion(
+Lng32 NAVersionedObject::migrateToNewVersion(
NAVersionedObject *&newImage)
{
short tempimagesize = getClassSize();
@@ -278,7 +278,7 @@ NA_EIDPROC Lng32 NAVersionedObject::migrateToNewVersion(
// later when 64-bit platforms are really available since it doesn't
// affect object layout.
// ---------------------------------------------------------------------
-NA_EIDPROC Long NAVersionedObject::drivePack(void *space, short isSpacePtr)
+Long NAVersionedObject::drivePack(void *space, short isSpacePtr)
{
// -----------------------------------------------------------------
// If the object has already been packed, just convert the pointer
@@ -376,7 +376,7 @@ NA_EIDPROC Long NAVersionedObject::drivePack(void *space, short isSpacePtr)
// ptrToAnchorClass (second form, see below) is a pointer to an object
// that has the desired virtual function pointer
// ---------------------------------------------------------------------
-NA_EIDPROC NAVersionedObject *NAVersionedObject::driveUnpack(
+NAVersionedObject *NAVersionedObject::driveUnpack(
void *base,
char *vtblPtr,
void * reallocator)
@@ -400,12 +400,8 @@ NA_EIDPROC NAVersionedObject *NAVersionedObject::driveUnpack(
else
return reallocatedAddress_.getPointer();
}
-#ifdef NA_64BIT
- // dg64 - the 32-bit module files have junk in them, so let's try zero
- // at least in the high-order 32-bits
else
reallocatedAddress_ = (NAVersionedObjectPtr) NULL ;
-#endif
// -----------------------------------------------------------------
// Fix the Version Header to the endianness of the local platform
@@ -477,7 +473,7 @@ NA_EIDPROC NAVersionedObject *NAVersionedObject::driveUnpack(
return objPtr;
}
-NA_EIDPROC NAVersionedObject *NAVersionedObject::driveUnpack(
+NAVersionedObject *NAVersionedObject::driveUnpack(
void *base,
NAVersionedObject *ptrToAnchorClass,
void * reallocator)
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/export/NAVersionedObject.h
----------------------------------------------------------------------
diff --git a/core/sql/export/NAVersionedObject.h b/core/sql/export/NAVersionedObject.h
index b8cda73..39ef55e 100644
--- a/core/sql/export/NAVersionedObject.h
+++ b/core/sql/export/NAVersionedObject.h
@@ -62,7 +62,6 @@
#include "NAAssert.h"
#include "str.h"
#include "Int64.h"
-#include "SqlExportDllDefines.h"
// ---------------------------------------------------------------------
// No of VersionID's supported by NAVersionedObject::versionIDArray_
@@ -94,7 +93,7 @@
// ---------------------------------------------------------------------
// Utilities
// ---------------------------------------------------------------------
-NA_EIDPROC inline void swapInt64(char *c)
+inline void swapInt64(char *c)
{
char y;
y=c[0]; c[0]=c[7]; c[7]=y;
@@ -103,7 +102,7 @@ NA_EIDPROC inline void swapInt64(char *c)
y=c[3]; c[3]=c[4]; c[4]=y;
}
-NA_EIDPROC inline void swapInt32(Int32 *x)
+inline void swapInt32(Int32 *x)
{
char *c = (char *) x;
char y;
@@ -111,7 +110,7 @@ NA_EIDPROC inline void swapInt32(Int32 *x)
y=c[1]; c[1]=c[2]; c[2]=y;
}
-NA_EIDPROC inline void swapInt16(Int16 *x)
+inline void swapInt16(Int16 *x)
{
char *c = (char *) x;
char y;
@@ -165,7 +164,7 @@ public:
// -------------------------------------------------------------------
// Constructors
// -------------------------------------------------------------------
- NA_EIDPROC NABasicPtrTempl(Type *ptr = (Type *)NULL)
+ NABasicPtrTempl(Type *ptr = (Type *)NULL)
: ptr_(ptr)
{
// -----------------------------------------------------------------
@@ -179,43 +178,40 @@ public:
// -------------------------------------------------------------------
// Accessors and Mutators
// -------------------------------------------------------------------
- NA_EIDPROC inline Type *getPointer() const { return ptr_; }
- NA_EIDPROC inline Type *&pointer() { return ptr_; }
- NA_EIDPROC inline operator Type *() const { return ptr_; }
- NA_EIDPROC inline short isNull() const{ return (ptr_==(Type *)NULL); }
- NA_EIDPROC inline Type & operator *() const { return *ptr_; }
+ inline Type *getPointer() const { return ptr_; }
+ inline Type *&pointer() { return ptr_; }
+ inline operator Type *() const { return ptr_; }
+ inline short isNull() const{ return (ptr_==(Type *)NULL); }
+ inline Type & operator *() const { return *ptr_; }
// -------------------------------------------------------------------
// delete operators
// -------------------------------------------------------------------
- // NA_EIDPROC inline void remove() { deleteObjectReferenced(); }
- // NA_EIDPROC inline void deleteObjectReferenced() { delete ptr_; }
+ // inline void remove() { deleteObjectReferenced(); }
+ // inline void deleteObjectReferenced() { delete ptr_; }
// -------------------------------------------------------------------
// Assume pointer is stored as a 64-bit offset
// -------------------------------------------------------------------
- NA_EIDPROC
+
inline void toggleEndianness() { swapInt64((char *)(&ptr_)); }
// -------------------------------------------------------------------
// Assignment operators - support assignment of the "real" pointer
// -------------------------------------------------------------------
- NA_EIDPROC
+
inline NABasicPtrTempl<Type> & operator = (const void * const ptr)
{ ptr_ = (Type *)ptr; return *this; }
-#ifdef NA_64BIT
- // dg64 - need long assignment
- NA_EIDPROC
+
inline NABasicPtrTempl<Type> & operator = (const Long ptr)
{ ptr_ = (Type *)ptr; return *this; }
-#endif
- NA_EIDPROC
+
inline NABasicPtrTempl<Type> & operator = (const Int32 ptr)
{ ptr_ = (Type *)ptr; return *this; }
- NA_EIDPROC
+
inline NABasicPtrTempl<Type> & operator = (const Type * const ptr)
{ ptr_ = (Type *)ptr; return *this; }
- NA_EIDPROC
+
inline NABasicPtrTempl<Type> & operator = (
const NABasicPtrTempl<Type> & ptr)
{ ptr_ = ptr.ptr_; return *this; }
@@ -223,130 +219,113 @@ public:
// -------------------------------------------------------------------
// Comparison operators - support comparisons with the "real" pointer.
// -------------------------------------------------------------------
- NA_EIDPROC
+
inline Int32 operator == (const Int32 ptr) const
{ return (ptr_ == (Type *)ptr); }
- NA_EIDPROC
+
inline Int32 operator == (const NABasicPtrTempl<Type> & other) const
{ return (ptr_ == other.ptr_); }
- NA_EIDPROC
+
inline Int32 operator == (const Type * const ptr) const
{ return (ptr_ == ptr); }
- NA_EIDPROC
+
inline Int32 operator != (const Int32 ptr) const
{ return (ptr_ != (Type *)ptr); }
- NA_EIDPROC
+
inline Int32 operator != (const NABasicPtrTempl<Type> & other) const
{ return (ptr_ != other.ptr_); }
- NA_EIDPROC
+
inline Int32 operator != (const Type * const ptr) const
{ return (ptr_ != ptr); }
- NA_EIDPROC
+
inline Int32 operator ! () const { return (ptr_ == (Type *)NULL); }
// -------------------------------------------------------------------
// Arithmetic operators - support pointer arithmetic.
// -------------------------------------------------------------------
- NA_EIDPROC
+
inline NABasicPtrTempl<Type> operator +(const Int32 n) const
{ return NABasicPtrTempl<Type>(ptr_ + n); }
- NA_EIDPROC
+
inline NABasicPtrTempl<Type> operator +(const short n) const
{ return NABasicPtrTempl<Type>(ptr_ + n); }
-#ifdef NA_64BIT
- NA_EIDPROC
inline NABasicPtrTempl<Type> operator +(const Long n) const
{ return NABasicPtrTempl<Type>(ptr_ + n); }
-#endif
- NA_EIDPROC
+
inline NABasicPtrTempl<Type> operator +(const UInt32 n) const
{ return NABasicPtrTempl<Type>(ptr_ + n); }
- NA_EIDPROC
+
inline
NABasicPtrTempl<Type> operator +(const unsigned short n) const
{ return NABasicPtrTempl<Type>(ptr_ + n); }
-#ifdef NA_64BIT
- NA_EIDPROC
+
inline NABasicPtrTempl<Type> operator +(const ULong n) const
{ return NABasicPtrTempl<Type>(ptr_ + n); }
-#endif
- NA_EIDPROC
+
inline NABasicPtrTempl<Type> operator -(const Int32 n) const
{ return NABasicPtrTempl<Type>(ptr_ - n); }
- NA_EIDPROC
+
inline NABasicPtrTempl<Type> operator -(const short n) const
{ return NABasicPtrTempl<Type>(ptr_ - n); }
-#ifdef NA_64BIT
- NA_EIDPROC
+
inline NABasicPtrTempl<Type> operator -(const Long n) const
{ return NABasicPtrTempl<Type>(ptr_ - n); }
-#endif
- NA_EIDPROC
+
inline NABasicPtrTempl<Type> operator -(const UInt32 n) const
{ return NABasicPtrTempl<Type>(ptr_ - n); }
- NA_EIDPROC
+
inline
NABasicPtrTempl<Type> operator -(const unsigned short n) const
{ return NABasicPtrTempl<Type>(ptr_ - n); }
-#ifdef NA_64BIT
- NA_EIDPROC
+
inline NABasicPtrTempl<Type> operator -(const ULong n) const
{ return NABasicPtrTempl<Type>(ptr_ - n); }
-#endif
- NA_EIDPROC
+
inline NABasicPtrTempl<Type> & operator +=(const Int32 n)
{ ptr_ += n; return *this; }
- NA_EIDPROC
+
inline NABasicPtrTempl<Type> & operator +=(const short n)
{ ptr_ += n; return *this; }
-#ifdef NA_64BIT
- NA_EIDPROC
+
inline NABasicPtrTempl<Type> & operator +=(const Long n)
{ ptr_ += n; return *this; }
-#endif
- NA_EIDPROC
+
inline NABasicPtrTempl<Type> & operator +=(const UInt32 n)
{ ptr_ += n; return *this; }
- NA_EIDPROC
+
inline NABasicPtrTempl<Type> & operator +=(const unsigned short n)
{ ptr_ += n; return *this; }
-#ifdef NA_64BIT
- NA_EIDPROC
+
inline NABasicPtrTempl<Type> & operator +=(const ULong n)
{ ptr_ += n; return *this; }
-#endif
- NA_EIDPROC
+
inline NABasicPtrTempl<Type> & operator -=(const Int32 n)
{ ptr_ -= n; return *this; }
- NA_EIDPROC
+
inline NABasicPtrTempl<Type> & operator -=(const short n)
{ ptr_ -= n; return *this; }
-#ifdef NA_64BIT
- NA_EIDPROC
+
inline NABasicPtrTempl<Type> & operator -=(const Long n)
{ ptr_ -= n; return *this; }
-#endif
- NA_EIDPROC
+
inline NABasicPtrTempl<Type> & operator -=(const UInt32 n)
{ ptr_ -= n; return *this; }
- NA_EIDPROC
+
inline NABasicPtrTempl<Type> & operator -=(const unsigned short n)
{ ptr_ -= n; return *this; }
-#ifdef NA_64BIT
- NA_EIDPROC
+
inline NABasicPtrTempl<Type> & operator -=(const ULong n)
{ ptr_ -= n; return *this; }
-#endif
- NA_EIDPROC
+
inline NABasicPtrTempl<Type> & operator ++()
{ ++ptr_; return *this; }
- NA_EIDPROC
+
inline NABasicPtrTempl<Type> & operator ++(const Int32 n)
{ ptr_++; return *this; }
- NA_EIDPROC
+
inline NABasicPtrTempl<Type> & operator --()
{ --ptr_; return *this; }
- NA_EIDPROC
+
inline NABasicPtrTempl<Type> & operator --(const Int32 n)
{ ptr_--; return *this; }
@@ -355,27 +334,26 @@ public:
// represent an array of the base type. This operator is useful in
// such cases.
// -------------------------------------------------------------------
- NA_EIDPROC inline Type & operator [] (const Int32 i) const
+ inline Type & operator [] (const Int32 i) const
{ return ptr_[i]; }
- NA_EIDPROC inline Type & operator [] (const short i) const
+ inline Type & operator [] (const short i) const
{ return ptr_[i]; }
-#ifdef NA_64BIT
- NA_EIDPROC inline Type & operator [] (const Long i) const
+
+ inline Type & operator [] (const Long i) const
{ return ptr_[i]; }
-#endif
- NA_EIDPROC inline Type & operator [] (const UInt32 i) const
+
+ inline Type & operator [] (const UInt32 i) const
{ return ptr_[i]; }
- NA_EIDPROC inline Type & operator [] (const unsigned short i) const
+ inline Type & operator [] (const unsigned short i) const
{ return ptr_[i]; }
-#ifdef NA_64BIT
- NA_EIDPROC inline Type & operator [] (const ULong i) const
+
+ inline Type & operator [] (const ULong i) const
{ return ptr_[i]; }
-#endif
// -------------------------------------------------------------------
// Packing and Unpacking
// -------------------------------------------------------------------
- NA_EIDPROC inline Long pack(void *space, short isSpacePtr = 1)
+ inline Long pack(void *space, short isSpacePtr = 1)
{
Long offset = 0;
if(ptr_ != 0)
@@ -385,43 +363,21 @@ public:
else
offset = ((char *)space - (char *)ptr_);
offset_ = offset;
-
-#ifndef NA_LITTLE_ENDIAN
-#ifndef NA_64BIT
- // dg64 - don't swap - since NA_LITTLE_ENDIAN is true, this ifndef shouldn't be necessary
- swapInt64((char *)(&offset_));
-#endif
-#endif
}
else offset_ = 0;
return offset;
}
- NA_EIDPROC inline Lng32 unpack(void *base, short isSpacePtr = 0)
+ inline Lng32 unpack(void *base, short isSpacePtr = 0)
{
if(offset_ != 0)
{
-#ifndef NA_LITTLE_ENDIAN
-#ifndef NA_64BIT
- // dg64 - don't swap - since NA_LITTLE_ENDIAN is true, this ifndef shouldn't be necessary
- swapInt64((char *)(&offset_));
-#endif
-#endif
-#ifdef NA_64BIT
if (!isSpacePtr) {
ptr_ = (Type *)((char *)base - offset_);
}
else {
ptr_ = (Type *)(((Space*)base)->convertToPtr(offset_));
}
-#else
- if (!isSpacePtr) {
- ptr_ = (Type *)((char *)base - int64ToInt32(offset_));
- }
- else {
- ptr_ = (Type *)(((Space*)base)->convertToPtr(int64ToInt32(offset_)));
- }
-#endif
}
return 0;
}
@@ -488,7 +444,7 @@ public:
// -------------------------------------------------------------------
// Constructors
// -------------------------------------------------------------------
- NA_EIDPROC NAOpenObjectPtrTempl(Type *ptr = (Type *)NULL)
+ NAOpenObjectPtrTempl(Type *ptr = (Type *)NULL)
: ptr_(ptr)
{
// -----------------------------------------------------------------
@@ -502,40 +458,40 @@ public:
// -------------------------------------------------------------------
// Accessors and Mutators
// -------------------------------------------------------------------
- NA_EIDPROC inline Type *getPointer() const { return ptr_; }
- NA_EIDPROC inline Type *&pointer() { return ptr_; }
- NA_EIDPROC inline operator Type *() const { return ptr_; }
- NA_EIDPROC inline short isNull() const{ return (ptr_==(Type *)NULL); }
- NA_EIDPROC inline Type & operator *() const { return *ptr_; }
+ inline Type *getPointer() const { return ptr_; }
+ inline Type *&pointer() { return ptr_; }
+ inline operator Type *() const { return ptr_; }
+ inline short isNull() const{ return (ptr_==(Type *)NULL); }
+ inline Type & operator *() const { return *ptr_; }
// -------------------------------------------------------------------
// delete operators
// -------------------------------------------------------------------
- // NA_EIDPROC inline void remove() { deleteObjectReferenced(); }
- // NA_EIDPROC inline void deleteObjectReferenced() { delete ptr_; }
+ // inline void remove() { deleteObjectReferenced(); }
+ // inline void deleteObjectReferenced() { delete ptr_; }
// -------------------------------------------------------------------
// Assume pointer is stored as a 64-bit offset
// -------------------------------------------------------------------
- NA_EIDPROC inline void toggleEndianness()
+ inline void toggleEndianness()
{ swapInt64((char *)(&ptr_)); }
// -------------------------------------------------------------------
// Assignment operators - support assignment of the "real" pointer
// -------------------------------------------------------------------
- NA_EIDPROC
+
inline NAOpenObjectPtrTempl<Type> &
operator = (const void * const ptr)
{ ptr_ = (Type *)ptr; return *this; }
- NA_EIDPROC
+
inline NAOpenObjectPtrTempl<Type> &
operator = (const Int32 ptr)
{ ptr_ = (Type *)ptr; return *this; }
- NA_EIDPROC
+
inline
NAOpenObjectPtrTempl<Type> & operator = (const Type * const ptr)
{ ptr_ = (Type *)ptr; return *this; }
- NA_EIDPROC
+
inline
NAOpenObjectPtrTempl<Type> &
operator = (const NAOpenObjectPtrTempl<Type> & ptr)
@@ -544,145 +500,129 @@ public:
// -------------------------------------------------------------------
// Comparison operators - support comparisons with the "real" pointer.
// -------------------------------------------------------------------
- NA_EIDPROC
+
inline Int32 operator == (const Int32 ptr) const
{ return (ptr_ == (Type *)ptr); }
- NA_EIDPROC
+
inline
Int32 operator == (const NAOpenObjectPtrTempl<Type> & other) const
{ return (ptr_ == other.ptr_); }
- NA_EIDPROC
+
inline Int32 operator == (const Type * const ptr) const
{ return (ptr_ == ptr); }
- NA_EIDPROC
+
inline Int32 operator != (const Int32 ptr) const
{ return (ptr_ != (Type *)ptr); }
- NA_EIDPROC
+
inline
Int32 operator != (const NAOpenObjectPtrTempl<Type> & other) const
{ return (ptr_ != other.ptr_); }
- NA_EIDPROC
+
inline Int32 operator != (const Type * const ptr) const
{ return (ptr_ != ptr); }
- NA_EIDPROC
+
inline Int32 operator ! () const { return (ptr_ == (Type *)NULL); }
// -------------------------------------------------------------------
// Arithmetic operators - support pointer arithmetic.
// -------------------------------------------------------------------
- NA_EIDPROC
+
inline NAOpenObjectPtrTempl<Type> operator +(const Int32 n) const
{ return NAOpenObjectPtrTempl<Type>(ptr_ + n); }
- NA_EIDPROC
+
inline NAOpenObjectPtrTempl<Type> operator +(const short n) const
{ return NAOpenObjectPtrTempl<Type>(ptr_ + n); }
-#ifdef NA_64BIT
- NA_EIDPROC
+
inline NAOpenObjectPtrTempl<Type> operator +(const Long n) const
{ return NAOpenObjectPtrTempl<Type>(ptr_ + n); }
-#endif
- NA_EIDPROC
+
inline
NAOpenObjectPtrTempl<Type> operator +(const UInt32 n) const
{ return NAOpenObjectPtrTempl<Type>(ptr_ + n); }
- NA_EIDPROC
+
inline
NAOpenObjectPtrTempl<Type>
operator +(const unsigned short n) const
{ return NAOpenObjectPtrTempl<Type>(ptr_ + n); }
-#ifdef NA_64BIT
- NA_EIDPROC
+
inline
NAOpenObjectPtrTempl<Type> operator +(const ULong n) const
{ return NAOpenObjectPtrTempl<Type>(ptr_ + n); }
-#endif
- NA_EIDPROC
+
inline NAOpenObjectPtrTempl<Type> operator -(const Int32 n) const
{ return NAOpenObjectPtrTempl<Type>(ptr_ - n); }
- NA_EIDPROC
+
inline NAOpenObjectPtrTempl<Type> operator -(const short n) const
{ return NAOpenObjectPtrTempl<Type>(ptr_ - n); }
-#ifdef NA_64BIT
- NA_EIDPROC
+
inline NAOpenObjectPtrTempl<Type> operator -(const Long n) const
{ return NAOpenObjectPtrTempl<Type>(ptr_ - n); }
-#endif
- NA_EIDPROC
+
inline
NAOpenObjectPtrTempl<Type> operator -(const UInt32 n) const
{ return NAOpenObjectPtrTempl<Type>(ptr_ - n); }
- NA_EIDPROC
+
inline
NAOpenObjectPtrTempl<Type>
operator-(const unsigned short n) const
{ return NAOpenObjectPtrTempl<Type>(ptr_ - n); }
-#ifdef NA_64BIT
- NA_EIDPROC
+
inline
NAOpenObjectPtrTempl<Type> operator -(const ULong n) const
{ return NAOpenObjectPtrTempl<Type>(ptr_ - n); }
-#endif
- NA_EIDPROC
+
inline NAOpenObjectPtrTempl<Type> & operator +=(const Int32 n)
{ ptr_ += n; return *this; }
- NA_EIDPROC
+
inline NAOpenObjectPtrTempl<Type> & operator +=(const short n)
{ ptr_ += n; return *this; }
-#ifdef NA_64BIT
- NA_EIDPROC
+
inline NAOpenObjectPtrTempl<Type> & operator +=(const Long n)
{ ptr_ += n; return *this; }
-#endif
- NA_EIDPROC
+
inline
NAOpenObjectPtrTempl<Type> & operator +=(const UInt32 n)
{ ptr_ += n; return *this; }
- NA_EIDPROC
+
inline
NAOpenObjectPtrTempl<Type> & operator +=(const unsigned short n)
{ ptr_ += n; return *this; }
-#ifdef NA_64BIT
- NA_EIDPROC
+
inline
NAOpenObjectPtrTempl<Type> & operator +=(const ULong n)
{ ptr_ += n; return *this; }
-#endif
- NA_EIDPROC
+
inline
NAOpenObjectPtrTempl<Type> & operator -=(const Int32 n)
{ ptr_ -= n; return *this; }
- NA_EIDPROC
+
inline NAOpenObjectPtrTempl<Type> & operator -=(const short n)
{ ptr_ -= n; return *this; }
-#ifdef NA_64BIT
- NA_EIDPROC
+
inline NAOpenObjectPtrTempl<Type> & operator -=(const Long n)
{ ptr_ -= n; return *this; }
-#endif
- NA_EIDPROC
+
inline
NAOpenObjectPtrTempl<Type> & operator -=(const UInt32 n)
{ ptr_ -= n; return *this; }
- NA_EIDPROC
+
inline
NAOpenObjectPtrTempl<Type> & operator -=(const unsigned short n)
{ ptr_ -= n; return *this; }
-#ifdef NA_64BIT
- NA_EIDPROC
+
inline
NAOpenObjectPtrTempl<Type> & operator -=(const ULong n)
{ ptr_ -= n; return *this; }
-#endif
- NA_EIDPROC
+
inline NAOpenObjectPtrTempl<Type> & operator ++()
{ ++ptr_; return *this; }
- NA_EIDPROC
+
inline NAOpenObjectPtrTempl<Type> & operator ++(const Int32 n)
{ ptr_++; return *this; }
- NA_EIDPROC
+
inline NAOpenObjectPtrTempl<Type> & operator --()
{ --ptr_; return *this; }
- NA_EIDPROC
+
inline NAOpenObjectPtrTempl<Type> & operator --(const Int32 n)
{ ptr_--; return *this; }
@@ -691,27 +631,25 @@ public:
// represent an array of objects. This operator is useful in such
// cases.
// -------------------------------------------------------------------
- NA_EIDPROC inline Type & operator [] (const Int32 i) const
+ inline Type & operator [] (const Int32 i) const
{ return ptr_[i]; }
- NA_EIDPROC inline Type & operator [] (const short i) const
+ inline Type & operator [] (const short i) const
{ return ptr_[i]; }
-#ifdef NA_64BIT
- NA_EIDPROC inline Type & operator [] (const Long i) const
+ inline Type & operator [] (const Long i) const
{ return ptr_[i]; }
-#endif
- NA_EIDPROC inline Type & operator [] (const UInt32 i) const
+
+ inline Type & operator [] (const UInt32 i) const
{ return ptr_[i]; }
- NA_EIDPROC inline Type & operator [] (const unsigned short i) const
+ inline Type & operator [] (const unsigned short i) const
{ return ptr_[i]; }
-#ifdef NA_64BIT
- NA_EIDPROC inline Type & operator [] (const ULong i) const
+
+ inline Type & operator [] (const ULong i) const
{ return ptr_[i]; }
-#endif
// -------------------------------------------------------------------
// Dereferencing operator
// -------------------------------------------------------------------
- NA_EIDPROC Type *operator ->() const
+ Type *operator ->() const
{ assert(ptr_); return ptr_; }
// -------------------------------------------------------------------
@@ -719,7 +657,7 @@ public:
// template instantiator. packShallow() and unpackShallow() are just
// helper methods provided.
// -------------------------------------------------------------------
- NA_EIDPROC inline Long packShallow(void *space, short isSpacePtr = 1)
+ inline Long packShallow(void *space, short isSpacePtr = 1)
{
Long offset = 0;
if(ptr_ != 0)
@@ -729,33 +667,16 @@ public:
else
offset = ((char *)space - (char *)ptr_);
offset_ = offset;
-
-#ifndef NA_LITTLE_ENDIAN
-#ifndef NA_64BIT
- // dg64 - don't swap - since NA_LITTLE_ENDIAN is true, this ifndef shouldn't be necessary
- swapInt64((char *)(&offset_));
-#endif
-#endif
}
else offset_ = 0;
return offset;
}
- NA_EIDPROC inline Lng32 unpackShallow(void *base)
+ inline Lng32 unpackShallow(void *base)
{
if(offset_ != 0)
{
-#ifndef NA_LITTLE_ENDIAN
-#ifndef NA_64BIT
- // dg64 - don't swap - since NA_LITTLE_ENDIAN is true, this ifndef shouldn't be necessary
- swapInt64((char *)(&offset_));
-#endif
-#endif
-#ifdef NA_64BIT
ptr_ = (Type *)((char *)base - offset_);
-#else
- ptr_ = (Type *)((char *)base - int64ToInt32(offset_));
-#endif
}
return 0;
}
@@ -764,13 +685,13 @@ public:
// The template instantiator should define all or some of these four
// methods according to needs.
// -------------------------------------------------------------------
- NA_EIDPROC
+
Long pack(void *space, short isSpacePtr = 1);
- NA_EIDPROC
+
Lng32 unpack(void *base);
- NA_EIDPROC
+
Long packArray(void *space, Lng32 numEntries, short notSpacePtr = 1);
- NA_EIDPROC
+
Lng32 unpackArray(void *base, Lng32 numEntries);
protected:
@@ -820,7 +741,7 @@ public:
// -------------------------------------------------------------------
// Constructors
// -------------------------------------------------------------------
- NA_EIDPROC NAVersionedObjectPtrTempl(Type *ptr = (Type *)NULL)
+ NAVersionedObjectPtrTempl(Type *ptr = (Type *)NULL)
: ptr_(ptr)
{
// -----------------------------------------------------------------
@@ -834,213 +755,188 @@ public:
// -------------------------------------------------------------------
// Accessors and Mutators
// -------------------------------------------------------------------
- NA_EIDPROC inline Type *getPointer() const { return ptr_; }
- NA_EIDPROC inline Type *&pointer() { return ptr_; }
- NA_EIDPROC inline operator Type *() const { return ptr_; }
- NA_EIDPROC inline short isNull() const { return ((short)(ptr_ == (Type *)NULL)); }
- NA_EIDPROC inline Type & operator *() const { return *ptr_; }
- NA_EIDPROC inline Int64 getOffset() const { return offset_; }
+ inline Type *getPointer() const { return ptr_; }
+ inline Type *&pointer() { return ptr_; }
+ inline operator Type *() const { return ptr_; }
+ inline short isNull() const { return ((short)(ptr_ == (Type *)NULL)); }
+ inline Type & operator *() const { return *ptr_; }
+ inline Int64 getOffset() const { return offset_; }
// -------------------------------------------------------------------
// delete operators
// -------------------------------------------------------------------
- // NA_EIDPROC inline void remove() { deleteObjectReferenced(); }
- // NA_EIDPROC inline void deleteObjectReferenced() { delete ptr_; }
+ // inline void remove() { deleteObjectReferenced(); }
+ // inline void deleteObjectReferenced() { delete ptr_; }
// -------------------------------------------------------------------
// Assume pointer is stored as a 64-bit offset
// -------------------------------------------------------------------
- NA_EIDPROC inline void toggleEndianness()
+ inline void toggleEndianness()
{ swapInt64((char *)(&ptr_)); }
// -------------------------------------------------------------------
// Assignment operators - support assignment of the "real" pointer
// -------------------------------------------------------------------
- NA_EIDPROC
+
inline NAVersionedObjectPtrTempl<Type> &
operator = (const void * const ptr)
{ ptr_ = (Type *)ptr; return *this; }
-#ifdef NA_64BIT
- // dg64 - need long assignment
- NA_EIDPROC
+
inline NAVersionedObjectPtrTempl<Type> &
operator = (const Long ptr)
{ ptr_ = (Type *)ptr; return *this; }
-#endif
- NA_EIDPROC
+
inline NAVersionedObjectPtrTempl<Type> &
operator = (const Int32 ptr)
{ ptr_ = (Type *)ptr; return *this; }
- NA_EIDPROC
+
inline
NAVersionedObjectPtrTempl<Type> &
operator = (const Type * const ptr)
{ ptr_ = (Type *)ptr; return *this; }
- NA_EIDPROC
+
inline
NAVersionedObjectPtrTempl<Type> &
operator = (const NAVersionedObjectPtrTempl<Type> & ptr)
{ ptr_ = ptr.ptr_; return *this; }
-#ifndef NA_64BIT
- NA_EIDPROC
- inline void
- operator = (const Int64 offset)
- { offset_ = offset; }
-#endif
// -------------------------------------------------------------------
// Comparison operators - support comparisons with the "real" pointer.
// -------------------------------------------------------------------
- NA_EIDPROC
+
inline Int32 operator ==(const Int32 ptr) const
{ return (ptr_ == (Type *)ptr); }
- NA_EIDPROC
+
inline
Int32
operator ==(const NAVersionedObjectPtrTempl<Type> & other) const
{ return (ptr_ == other.ptr_); }
- NA_EIDPROC
+
inline
Int32 operator ==(const Type * const ptr) const
{ return (ptr_ == ptr); }
- NA_EIDPROC
+
inline Int32 operator !=(const Int32 ptr) const
{ return (ptr_ != (Type *)ptr); }
- NA_EIDPROC
+
inline
Int32
operator !=(const NAVersionedObjectPtrTempl<Type> & other) const
{ return (ptr_ != other.ptr_); }
- NA_EIDPROC
+
inline Int32 operator !=(const Type * const ptr) const
{ return (ptr_ != ptr); }
- NA_EIDPROC
+
inline Int32 operator !() const { return (ptr_ == (Type *)NULL); }
// -------------------------------------------------------------------
// Arithmetic operators - support pointer arithmetic.
// -------------------------------------------------------------------
- NA_EIDPROC
+
inline NAVersionedObjectPtrTempl<Type> operator +(const Int32 n) const
{ return NAVersionedObjectPtrTempl<Type>(ptr_ + n); }
- NA_EIDPROC
+
inline
NAVersionedObjectPtrTempl<Type> operator +(const short n) const
{ return NAVersionedObjectPtrTempl<Type>(ptr_ + n); }
-#ifdef NA_64BIT
- NA_EIDPROC
+
inline
NAVersionedObjectPtrTempl<Type> operator +(const Long n) const
{ return NAVersionedObjectPtrTempl<Type>(ptr_ + n); }
-#endif
- NA_EIDPROC
+
inline
NAVersionedObjectPtrTempl<Type>
operator +(const UInt32 n) const
{ return NAVersionedObjectPtrTempl<Type>(ptr_ + n); }
- NA_EIDPROC
+
inline
NAVersionedObjectPtrTempl<Type>
operator +(const unsigned short n) const
{ return NAVersionedObjectPtrTempl<Type>(ptr_ + n); }
-#ifdef NA_64BIT
- NA_EIDPROC
+
inline
NAVersionedObjectPtrTempl<Type>
operator +(const ULong n) const
{ return NAVersionedObjectPtrTempl<Type>(ptr_ + n); }
-#endif
- NA_EIDPROC
+
inline NAVersionedObjectPtrTempl<Type> operator -(const Int32 n) const
{ return NAVersionedObjectPtrTempl<Type>(ptr_ - n); }
- NA_EIDPROC
+
inline
NAVersionedObjectPtrTempl<Type> operator -(const short n) const
{ return NAVersionedObjectPtrTempl<Type>(ptr_ - n); }
-#ifdef NA_64BIT
- NA_EIDPROC
+
inline
NAVersionedObjectPtrTempl<Type> operator -(const Long n) const
{ return NAVersionedObjectPtrTempl<Type>(ptr_ - n); }
-#endif
- NA_EIDPROC
+
inline
NAVersionedObjectPtrTempl<Type>
operator -(const UInt32 n) const
{ return NAVersionedObjectPtrTempl<Type>(ptr_ - n); }
- NA_EIDPROC
+
inline
NAVersionedObjectPtrTempl<Type>
operator-(const unsigned short n) const
{ return NAVersionedObjectPtrTempl<Type>(ptr_ - n); }
-#ifdef NA_64BIT
- NA_EIDPROC
+
inline
NAVersionedObjectPtrTempl<Type>
operator -(const ULong n) const
{ return NAVersionedObjectPtrTempl<Type>(ptr_ - n); }
-#endif
- NA_EIDPROC
+
inline NAVersionedObjectPtrTempl<Type> & operator +=(const Int32 n)
{ ptr_ += n; return *this; }
- NA_EIDPROC
+
inline NAVersionedObjectPtrTempl<Type> & operator +=(const short n)
{ ptr_ += n; return *this; }
-#ifdef NA_64BIT
- NA_EIDPROC
+
inline NAVersionedObjectPtrTempl<Type> & operator +=(const Long n)
{ ptr_ += n; return *this; }
-#endif
- NA_EIDPROC
+
inline
NAVersionedObjectPtrTempl<Type> &
operator +=(const UInt32 n) { ptr_ += n; return *this; }
- NA_EIDPROC
+
inline
NAVersionedObjectPtrTempl<Type> &
operator +=(const unsigned short n) { ptr_ += n; return *this; }
-#ifdef NA_64BIT
- NA_EIDPROC
+
inline
NAVersionedObjectPtrTempl<Type> &
operator +=(const ULong n) { ptr_ += n; return *this; }
-#endif
- NA_EIDPROC
+
inline
NAVersionedObjectPtrTempl<Type> &
operator -=(const Int32 n) { ptr_ -= n; return *this; }
- NA_EIDPROC
+
inline NAVersionedObjectPtrTempl<Type> & operator -=(const short n)
{ ptr_ -= n; return *this; }
-#ifdef NA_64BIT
- NA_EIDPROC
+
inline NAVersionedObjectPtrTempl<Type> & operator -=(const Long n)
{ ptr_ -= n; return *this; }
-#endif
- NA_EIDPROC
+
inline
NAVersionedObjectPtrTempl<Type> &
operator -=(const UInt32 n) { ptr_ -= n; return *this; }
- NA_EIDPROC
+
inline
NAVersionedObjectPtrTempl<Type> &
operator -=(const unsigned short n) { ptr_ -= n; return *this; }
-#ifdef NA_64BIT
- NA_EIDPROC
+
inline
NAVersionedObjectPtrTempl<Type> &
operator -=(const ULong n) { ptr_ -= n; return *this; }
-#endif
- NA_EIDPROC
+
inline NAVersionedObjectPtrTempl<Type> & operator ++()
{ ++ptr_; return *this; }
- NA_EIDPROC
+
inline NAVersionedObjectPtrTempl<Type> & operator ++(const Int32 n)
{ ptr_++; return *this; }
- NA_EIDPROC
+
inline NAVersionedObjectPtrTempl<Type> & operator --()
{ --ptr_; return *this; }
- NA_EIDPROC
+
inline NAVersionedObjectPtrTempl<Type> & operator --(const Int32 n)
{ ptr_--; return *this; }
@@ -1049,33 +945,30 @@ public:
// to represent an array of objects. This operator is useful in such
// cases.
// -------------------------------------------------------------------
- NA_EIDPROC inline Type & operator [] (const Int32 i) const
+ inline Type & operator [] (const Int32 i) const
{ return ptr_[i]; }
- NA_EIDPROC inline Type & operator [] (const short i) const
+ inline Type & operator [] (const short i) const
{ return ptr_[i]; }
-#ifdef NA_64BIT
- NA_EIDPROC inline Type & operator [] (const Long i) const
+ inline Type & operator [] (const Long i) const
{ return ptr_[i]; }
-#endif
- NA_EIDPROC inline Type & operator [] (const UInt32 i) const
+
+ inline Type & operator [] (const UInt32 i) const
{ return ptr_[i]; }
- NA_EIDPROC inline Type & operator [] (const unsigned short i) const
+ inline Type & operator [] (const unsigned short i) const
{ return ptr_[i]; }
-#ifdef NA_64BIT
- NA_EIDPROC inline Type & operator [] (const ULong i) const
+ inline Type & operator [] (const ULong i) const
{ return ptr_[i]; }
-#endif
// -------------------------------------------------------------------
// Dereferencing operator
// -------------------------------------------------------------------
- NA_EIDPROC Type *operator ->() const
+ Type *operator ->() const
{ assert(ptr_); return ptr_; }
// -------------------------------------------------------------------
// Packing and Unpacking
// -------------------------------------------------------------------
- NA_EIDPROC inline Long packShallow(void *space, short isSpacePtr = 1)
+ inline Long packShallow(void *space, short isSpacePtr = 1)
{
Long offset = 0;
if(ptr_ != 0)
@@ -1085,48 +978,31 @@ public:
else
offset = ((char *)space - (char *)ptr_);
offset_ = offset;
-
-#ifndef NA_LITTLE_ENDIAN
-#ifndef NA_64BIT
- // dg64 - don't swap - since NA_LITTLE_ENDIAN is true, this ifndef shouldn't be necessary
- swapInt64((char *)(&offset_));
-#endif
-#endif
}
else offset_ = 0;
return offset;
}
- NA_EIDPROC inline Long pack(void *space, short isSpacePtr = 1)
+ inline Long pack(void *space, short isSpacePtr = 1)
{
if(ptr_ != 0) ptr_->drivePack(space, isSpacePtr);
return packShallow(space, isSpacePtr);
}
- NA_EIDPROC inline Lng32 unpackShallow(void *base)
+ inline Lng32 unpackShallow(void *base)
{
if(offset_ != 0)
{
-#ifndef NA_LITTLE_ENDIAN
-#ifndef NA_64BIT
- // dg64 - don't swap - since NA_LITTLE_ENDIAN is true, this ifndef shouldn't be necessary
- swapInt64((char *)(&offset_));
-#endif
-#endif
-#ifdef NA_64BIT
ptr_ = (Type *)((char *)base - offset_);
-#else
- ptr_ = (Type *)((char *)base - int64ToInt32(offset_));
-#endif
}
return 0;
}
// This one is NOT an inline function to avoid putting an object of
// type "Type" on the stack. See the definition further down in this file.
- NA_EIDPROC char * getVTblPtr(Int16 classID);
+ char * getVTblPtr(Int16 classID);
- NA_EIDPROC inline Lng32 unpack(void *base, void * reallocator)
+ inline Lng32 unpack(void *base, void * reallocator)
{
if(ptr_ != 0)
{
@@ -1144,7 +1020,7 @@ public:
// The two methods below assume that ptr_ is the beginning address of
// an array of Type objects with numEntries.
// -------------------------------------------------------------------
- NA_EIDPROC
+
inline Long packArray(void *space, Lng32 numEntries, short isSpacePtr = 1)
{
if(ptr_ != 0)
@@ -1155,7 +1031,7 @@ public:
return pack(space,isSpacePtr);
}
- NA_EIDPROC inline Lng32 unpackArray(void *base, Lng32 numEntries,
+ inline Lng32 unpackArray(void *base, Lng32 numEntries,
void * reallocator)
{
if(unpack(base, reallocator)) return -1;
@@ -1228,7 +1104,7 @@ public:
// -------------------------------------------------------------------
// Constructors
// -------------------------------------------------------------------
- NA_EIDPROC NAVersionedObjectPtrArrayTempl(PtrType *ptr = (PtrType *)NULL)
+ NAVersionedObjectPtrArrayTempl(PtrType *ptr = (PtrType *)NULL)
: ptr_(ptr)
{
// -----------------------------------------------------------------
@@ -1243,7 +1119,7 @@ public:
// This constructor allocates the 64-bit pointer array and copies the
// pointer array given (which may be a 32-bit pointer array).
// -------------------------------------------------------------------
- NA_EIDPROC NAVersionedObjectPtrArrayTempl(Space *space,
+ NAVersionedObjectPtrArrayTempl(Space *space,
void **ptrArray,
Int32 numEntries)
{ allocateAndCopyPtrArray(space,ptrArray,numEntries); }
@@ -1251,35 +1127,35 @@ public:
// -------------------------------------------------------------------
// Accessors and Mutators
// -------------------------------------------------------------------
- NA_EIDPROC inline PtrType *getPointer() const { return ptr_; }
- NA_EIDPROC inline PtrType *&pointer() { return ptr_; }
- NA_EIDPROC inline operator PtrType *() const { return ptr_; }
- NA_EIDPROC inline short isNull() const{return(ptr_==(PtrType *)NULL);}
- NA_EIDPROC inline PtrType & operator *() const { return *ptr_; }
+ inline PtrType *getPointer() const { return ptr_; }
+ inline PtrType *&pointer() { return ptr_; }
+ inline operator PtrType *() const { return ptr_; }
+ inline short isNull() const{return(ptr_==(PtrType *)NULL);}
+ inline PtrType & operator *() const { return *ptr_; }
// -------------------------------------------------------------------
// delete operators
// -------------------------------------------------------------------
- // NA_EIDPROC inline void remove() { deleteObjectReferenced(); }
- // NA_EIDPROC inline void deleteObjectReferenced() { delete ptr_; }
+ // inline void remove() { deleteObjectReferenced(); }
+ // inline void deleteObjectReferenced() { delete ptr_; }
// -------------------------------------------------------------------
// Assignment operators - support assignment of the "real" pointer
// -------------------------------------------------------------------
- NA_EIDPROC
+
inline NAVersionedObjectPtrArrayTempl<PtrType> &
operator = (const void * const ptr)
{ ptr_ = (PtrType *)ptr; return *this; }
- NA_EIDPROC
+
inline NAVersionedObjectPtrArrayTempl<PtrType> &
operator = (const Int32 ptr)
{ ptr_ = (PtrType *)ptr; return *this; }
- NA_EIDPROC
+
inline
NAVersionedObjectPtrArrayTempl<PtrType> &
operator = (const PtrType * const ptr)
{ ptr_ = (PtrType *)ptr; return *this; }
- NA_EIDPROC
+
inline
NAVersionedObjectPtrArrayTempl<PtrType> &
operator = (const NAVersionedObjectPtrArrayTempl<PtrType> & ptr)
@@ -1288,169 +1164,153 @@ public:
// -------------------------------------------------------------------
// Comparison operators - support comparisons with the "real" pointer.
// -------------------------------------------------------------------
- NA_EIDPROC
+
inline Int32 operator == (const Int32 ptr) const
{ return (ptr_ == (PtrType *)ptr); }
- NA_EIDPROC
+
inline
Int32 operator == (
const NAVersionedObjectPtrArrayTempl<PtrType> & other) const
{ return (ptr_ == other.ptr_); }
- NA_EIDPROC
+
inline Int32 operator == (const PtrType * const ptr) const
{ return (ptr_ == ptr); }
- NA_EIDPROC
+
inline Int32 operator != (const Int32 ptr) const
{ return (ptr_ != (PtrType *)ptr); }
- NA_EIDPROC
+
inline
Int32 operator != (
const NAVersionedObjectPtrArrayTempl<PtrType> & other) const
{ return (ptr_ != other.ptr_); }
- NA_EIDPROC
+
inline Int32 operator != (const PtrType * const ptr) const
{ return (ptr_ != ptr); }
- NA_EIDPROC
+
inline Int32 operator ! () const { return (ptr_ == (PtrType *)NULL); }
// -------------------------------------------------------------------
// Arithmetic operators - support pointer arithmetic.
// -------------------------------------------------------------------
- NA_EIDPROC
+
inline
NAVersionedObjectPtrArrayTempl<PtrType>
operator +(const Int32 n) const
{ return NAVersionedObjectPtrArrayTempl<PtrType>(ptr_ + n); }
- NA_EIDPROC
+
inline
NAVersionedObjectPtrArrayTempl<PtrType>
operator +(const short n) const
{ return NAVersionedObjectPtrArrayTempl<PtrType>(ptr_ + n); }
-#ifdef NA_64BIT
- NA_EIDPROC
+
inline
NAVersionedObjectPtrArrayTempl<PtrType>
operator +(const Long n) const
{ return NAVersionedObjectPtrArrayTempl<PtrType>(ptr_ + n); }
-#endif
- NA_EIDPROC
+
inline
NAVersionedObjectPtrArrayTempl<PtrType>
operator +(const UInt32 n) const
{ return NAVersionedObjectPtrArrayTempl<PtrType>(ptr_ + n); }
- NA_EIDPROC
+
inline
NAVersionedObjectPtrArrayTempl<PtrType>
operator +(const unsigned short n) const
{ return NAVersionedObjectPtrArrayTempl<PtrType>(ptr_ + n); }
-#ifdef NA_64BIT
- NA_EIDPROC
+
inline
NAVersionedObjectPtrArrayTempl<PtrType>
operator +(const ULong n) const
{ return NAVersionedObjectPtrArrayTempl<PtrType>(ptr_ + n); }
-#endif
- NA_EIDPROC
+
inline
NAVersionedObjectPtrArrayTempl<PtrType>
operator -(const Int32 n) const
{ return NAVersionedObjectPtrArrayTempl<PtrType>(ptr_ - n); }
- NA_EIDPROC
+
inline
NAVersionedObjectPtrArrayTempl<PtrType>
operator -(const short n) const
{ return NAVersionedObjectPtrArrayTempl<PtrType>(ptr_ - n); }
-#ifdef NA_64BIT
- NA_EIDPROC
+
inline
NAVersionedObjectPtrArrayTempl<PtrType>
operator -(const Long n) const
{ return NAVersionedObjectPtrArrayTempl<PtrType>(ptr_ - n); }
-#endif
- NA_EIDPROC
+
inline
NAVersionedObjectPtrArrayTempl<PtrType>
operator -(const UInt32 n) const
{ return NAVersionedObjectPtrArrayTempl<PtrType>(ptr_ - n); }
- NA_EIDPROC
+
inline
NAVersionedObjectPtrArrayTempl<PtrType>
operator-(const unsigned short n) const
{ return NAVersionedObjectPtrArrayTempl<PtrType>(ptr_ - n); }
-#ifdef NA_64BIT
- NA_EIDPROC
+
inline
NAVersionedObjectPtrArrayTempl<PtrType>
operator -(const ULong n) const
{ return NAVersionedObjectPtrArrayTempl<PtrType>(ptr_ - n); }
-#endif
- NA_EIDPROC
+
inline
NAVersionedObjectPtrArrayTempl<PtrType> & operator +=(const Int32 n)
{ ptr_ += n; return *this; }
- NA_EIDPROC
+
inline
NAVersionedObjectPtrArrayTempl<PtrType> &
operator +=(const short n) { ptr_ += n; return *this; }
-#ifdef NA_64BIT
- NA_EIDPROC
+
inline
NAVersionedObjectPtrArrayTempl<PtrType> &
operator +=(const Long n) { ptr_ += n; return *this; }
-#endif
- NA_EIDPROC
+
inline
NAVersionedObjectPtrArrayTempl<PtrType> &
operator +=(const UInt32 n) { ptr_ += n; return *this; }
- NA_EIDPROC
+
inline
NAVersionedObjectPtrArrayTempl<PtrType> &
operator +=(const unsigned short n) { ptr_ += n; return *this; }
-#ifdef NA_64BIT
- NA_EIDPROC
+
inline
NAVersionedObjectPtrArrayTempl<PtrType> &
operator +=(const ULong n) { ptr_ += n; return *this; }
-#endif
- NA_EIDPROC
+
inline
NAVersionedObjectPtrArrayTempl<PtrType> & operator -=(const Int32 n)
{ ptr_ -= n; return *this; }
- NA_EIDPROC
+
inline
NAVersionedObjectPtrArrayTempl<PtrType> &
operator -=(const short n) { ptr_ -= n; return *this; }
-#ifdef NA_64BIT
- NA_EIDPROC
+
inline
NAVersionedObjectPtrArrayTempl<PtrType> &
operator -=(const Long n) { ptr_ -= n; return *this; }
-#endif
- NA_EIDPROC
+
inline
NAVersionedObjectPtrArrayTempl<PtrType> &
operator -=(const UInt32 n) { ptr_ -= n; return *this; }
- NA_EIDPROC
+
inline
NAVersionedObjectPtrArrayTempl<PtrType> &
operator -=(const unsigned short n) { ptr_ -= n; return *this; }
-#ifdef NA_64BIT
- NA_EIDPROC
+
inline
NAVersionedObjectPtrArrayTempl<PtrType> &
operator -=(const ULong n) { ptr_ -= n; return *this; }
-#endif
- NA_EIDPROC
+
inline NAVersionedObjectPtrArrayTempl<PtrType> & operator ++()
{ ++ptr_; return *this; }
- NA_EIDPROC
+
inline
NAVersionedObjectPtrArrayTempl<PtrType> & operator ++(const Int32 n)
{ ptr_++; return *this; }
- NA_EIDPROC
+
inline NAVersionedObjectPtrArrayTempl<PtrType> & operator --()
{ --ptr_; return *this; }
- NA_EIDPROC
+
inline
NAVersionedObjectPtrArrayTempl<PtrType> & operator --(const Int32 n)
{ ptr_--; return *this; }
@@ -1458,34 +1318,33 @@ public:
// -------------------------------------------------------------------
// Subscript operator.
// -------------------------------------------------------------------
- NA_EIDPROC inline PtrType & operator [] (const Int32 i) const
+ inline PtrType & operator [] (const Int32 i) const
{ return ptr_[i]; }
- NA_EIDPROC inline PtrType & operator [] (const short i) const
+ inline PtrType & operator [] (const short i) const
{ return ptr_[i]; }
-#ifdef NA_64BIT
- NA_EIDPROC inline PtrType & operator [] (const Long i) const
+
+ inline PtrType & operator [] (const Long i) const
{ return ptr_[i]; }
-#endif
- NA_EIDPROC inline PtrType & operator [] (const UInt32 i) const
+
+ inline PtrType & operator [] (const UInt32 i) const
{ return ptr_[i]; }
- NA_EIDPROC inline PtrType & operator [] (const unsigned short i) const
+ inline PtrType & operator [] (const unsigned short i) const
{ return ptr_[i]; }
-#ifdef NA_64BIT
- NA_EIDPROC inline PtrType & operator [] (const ULong i) const
+
+ inline PtrType & operator [] (const ULong i) const
{ return ptr_[i]; }
-#endif
// -------------------------------------------------------------------
// Functions subclasses should redefine despite they are non-virtual
// because we want to keep size of this class 8 bytes.
// -------------------------------------------------------------------
- NA_EIDPROC inline PtrType *operator ->() const
+ inline PtrType *operator ->() const
{ assert(ptr_); return ptr_; }
// -------------------------------------------------------------------
// Support for allocating and copying the array of pointers.
// -------------------------------------------------------------------
- NA_EIDPROC inline void allocatePtrArray(Space *space,
+ inline void allocatePtrArray(Space *space,
UInt32 numEntries)
{
if (numEntries != 0)
@@ -1496,13 +1355,13 @@ public:
else ptr_ = (PtrType *)NULL;
}
- NA_EIDPROC inline void copyPtrArray(void **ptrArray,
+ inline void copyPtrArray(void **ptrArray,
UInt32 numEntries)
{
for(UInt32 i=0; i<numEntries; i++) ptr_[i] = (PtrType *)(ptrArray[i]);
}
- NA_EIDPROC inline void allocateAndCopyPtrArray(Space *space,
+ inline void allocateAndCopyPtrArray(Space *space,
void **ptrArray,
UInt32 numEntries)
{
@@ -1513,7 +1372,7 @@ public:
// -------------------------------------------------------------------
// Packing and Unpacking.
// -------------------------------------------------------------------
- NA_EIDPROC inline Long packShallow(void *space, short isSpacePtr = 1)
+ inline Long packShallow(void *space, short isSpacePtr = 1)
{
Long offset = 0;
if(ptr_ != 0)
@@ -1523,19 +1382,12 @@ public:
else
offset = ((char *)space - (char *)ptr_);
offset_ = offset;
-
-#ifndef NA_LITTLE_ENDIAN
-#ifndef NA_64BIT
- // dg64 - don't swap - since NA_LITTLE_ENDIAN is true, this ifndef shouldn't be necessary
- swapInt64((char *)(&offset_));
-#endif
-#endif
}
else offset_ = 0;
return offset;
}
- NA_EIDPROC
+
inline Long pack(void *space, Lng32 numEntries, short isSpacePtr = 1)
{
// Pack the pointer objects in the array.
@@ -1545,26 +1397,16 @@ public:
return packShallow(space,isSpacePtr);
}
- NA_EIDPROC inline Lng32 unpackShallow(void *base)
+ inline Lng32 unpackShallow(void *base)
{
if(offset_ != 0)
{
-#ifndef NA_LITTLE_ENDIAN
-#ifndef NA_64BIT
- // dg64 - don't swap - since NA_LITTLE_ENDIAN is true, this ifndef shouldn't be necessary
- swapInt64((char *)(&offset_));
-#endif
-#endif
-#ifdef NA_64BIT
ptr_ = (PtrType *)((char *)base - offset_);
-#else
- ptr_ = (PtrType *)((char *)base - int64ToInt32(offset_));
-#endif
}
return 0;
}
- NA_EIDPROC inline Lng32 unpack(void *base, Lng32 numEntries, void * reallocator)
+ inline Lng32 unpack(void *base, Lng32 numEntries, void * reallocator)
{
// Convert this pointer object from offset to a real pointer.
if(unpackShallow(base)) return -1;
@@ -1602,7 +1444,7 @@ typedef NAVersionedObjectPtrTempl<NAVersionedObject> NAVersionedObjectPtr;
// Class NAVersionedObject
// ---------------------------------------------------------------------
-class SQLEXPORT_LIB_FUNC NAVersionedObject
+class NAVersionedObject
{
public:
@@ -1621,10 +1463,10 @@ public:
// This arrangement avoids the dependence on the constructors of sub-
// classes of NAVersionedObject on setting these values correctly.
// -------------------------------------------------------------------
- NA_EIDPROC NAVersionedObject(Int16 classID = -1);
+ NAVersionedObject(Int16 classID = -1);
- NA_EIDPROC inline void init(Int16 classID = -1)
+ inline void init(Int16 classID = -1)
{
classID_ = classID;
populateImageVersionIDArray();
@@ -1638,7 +1480,7 @@ public:
// -------------------------------------------------------------------
// Utility to toggle the endianness of all applicable members
// -------------------------------------------------------------------
- NA_EIDPROC inline void toggleEndiannessOfVersionHeader()
+ inline void toggleEndiannessOfVersionHeader()
{
swapInt16(&classID_);
swapInt16(&imageSize_);
@@ -1661,19 +1503,19 @@ public:
// The left-over space will be zero'ed. Finally, reallocatedAddress_
// field in the older object is set to the address of the new object.
// -------------------------------------------------------------------
- NA_EIDPROC NAVersionedObject *reallocateImage(void * reallocator);
+ NAVersionedObject *reallocateImage(void * reallocator);
// -------------------------------------------------------------------
// Accessors and Mutators
// -------------------------------------------------------------------
- NA_EIDPROC inline Int16 getClassID() const { return classID_; }
- NA_EIDPROC inline void setClassID(Int16 classID)
+ inline Int16 getClassID() const { return classID_; }
+ inline void setClassID(Int16 classID)
{ classID_ = classID; }
- NA_EIDPROC inline unsigned char * getImageVersionIDArray()
+ inline unsigned char * getImageVersionIDArray()
{ return versionIDArray_; }
- NA_EIDPROC inline unsigned char getImageVersionID(unsigned short ix) const
+ inline unsigned char getImageVersionID(unsigned short ix) const
{
assert(ix < VERSION_ID_ARRAY_SIZE);
// add the following to prevent false alarm on "ix"
@@ -1682,7 +1524,7 @@ public:
return versionIDArray_[ix];
}
- NA_EIDPROC void setImageVersionID(unsigned short ix,
+ void setImageVersionID(unsigned short ix,
unsigned char versionID)
{
assert(ix < VERSION_ID_ARRAY_SIZE);
@@ -1692,40 +1534,40 @@ public:
versionIDArray_[ix] = versionID;
}
- NA_EIDPROC inline NAVersionedObjectPtr getReallocatedAddress() const
+ inline NAVersionedObjectPtr getReallocatedAddress() const
{ return reallocatedAddress_; }
- NA_EIDPROC inline void setReallocatedAddress(
+ inline void setReallocatedAddress(
NAVersionedObjectPtr address)
{ reallocatedAddress_ = address; }
- NA_EIDPROC inline void setReallocatedAddress(
+ inline void setReallocatedAddress(
NAVersionedObject *address)
{ reallocatedAddress_ = address; }
- NA_EIDPROC inline Int16 getImageSize() const { return imageSize_; }
- NA_EIDPROC inline void setImageSize(Int16 size) { imageSize_ = size; }
+ inline Int16 getImageSize() const { return imageSize_; }
+ inline void setImageSize(Int16 size) { imageSize_ = size; }
- NA_EIDPROC inline void setVTblPtr(char *ptr)
+ inline void setVTblPtr(char *ptr)
{
*((char **)this) = ptr;
}
- NA_EIDPROC inline NABoolean isPacked() const
+ inline NABoolean isPacked() const
{ return (flags_ & VOBJ_PACKED) != 0; }
- NA_EIDPROC inline void markAsPacked()
+ inline void markAsPacked()
{ flags_ |= VOBJ_PACKED; }
- NA_EIDPROC inline void markAsNotPacked()
+ inline void markAsNotPacked()
{ flags_ &= ~VOBJ_PACKED; }
- NA_EIDPROC inline NABoolean isBigEndian() const
+ inline NABoolean isBigEndian() const
{ return (flags_ & VOBJ_BIG_ENDIAN) != 0; }
- NA_EIDPROC inline void markAsBigEndian()
+ inline void markAsBigEndian()
{ flags_ |= VOBJ_BIG_ENDIAN; }
- NA_EIDPROC inline void markAsLittleEndian()
+ inline void markAsLittleEndian()
{ flags_ &= ~VOBJ_BIG_ENDIAN; }
- NA_EIDPROC
+
NABoolean isSpacePtr() { return (flags_ & IS_SPACE_PTR) != 0; }
- NA_EIDPROC
+
void setIsSpacePtr(NABoolean v)
{ (v ? flags_ |= IS_SPACE_PTR : flags_ &= ~IS_SPACE_PTR); }
@@ -1738,11 +1580,7 @@ public:
// the specific subclass. This number should be consistent with the
// number supplied to the constructor when an object is constructed.
// -------------------------------------------------------------------
-#ifndef PRIV_SRL
- NA_EIDPROC virtual unsigned char getClassVersionID() = 0;
-#else
- NA_EIDPROC unsigned char getClassVersionID();
-#endif//PRIV_SRL
+ virtual unsigned char getClassVersionID() = 0;
// -------------------------------------------------------------------
// Subclass MUST redefine this method to set its class version ID in
@@ -1753,22 +1591,14 @@ public:
// direct subclass of those subclasses should set versionIDArray_[1]
// and so on...
// -------------------------------------------------------------------
-#ifndef PRIV_SRL
- NA_EIDPROC virtual void populateImageVersionIDArray() = 0;
-#else
- NA_EIDPROC void populateImageVersionIDArray();
-#endif //PRIV_SRL
+ virtual void populateImageVersionIDArray() = 0;
// -------------------------------------------------------------------
// An immediate subclass (aka the Anchor class) MUST redefine this
// method to return the virtual table function pointer of the subclass
// under it with the class ID given.
// -------------------------------------------------------------------
-#ifndef PRIV_SRL
- NA_EIDPROC virtual char *findVTblPtr(Int16 classID)
-#else
- NA_EIDPROC char *findVTblPtr(Int16 classID)
-#endif //PRIV_SRL
+ virtual char *findVTblPtr(Int16 classID)
{
// -----------------------------------------------------------------
// If subclass doesn't redefine this method, return the virtual
@@ -1788,12 +1618,8 @@ public:
// All subclasses MUST redefine this method to return the correct
// object sizes.
// -------------------------------------------------------------------
-#ifndef PRIV_SRL
- NA_EIDPROC virtual short getClassSize()
-#else
- NA_EIDPROC short getClassSize()
-#endif //PRIV_SRL
- { return (short)sizeof(NAVersionedObject); }
+ virtual short getClassSize()
+ { return (short)sizeof(NAVersionedObject); }
// -------------------------------------------------------------------
// All subclasses MUST redefine toggleEndianness() to toggle the
@@ -1802,11 +1628,7 @@ public:
// Header (members of NAVersionedObject) is handled separately by
// NAVersionedObject::toggleEndiannessOfVersionHeader().
// -------------------------------------------------------------------
-#ifndef PRIV_SRL
- NA_EIDPROC virtual void toggleEndianness() {}
-#else
- NA_EIDPROC void toggleEndianness() {}
-#endif //PRIV_SRL
+ virtual void toggleEndianness() {}
// -------------------------------------------------------------------
// All subclasses could redefine convertToReference/LocalPlatform() to
@@ -1814,13 +1636,8 @@ public:
// platform and vice versa. Typically, this only involves toggling the
// endianness of some members.
// -------------------------------------------------------------------
-#ifndef PRIV_SRL
- NA_EIDPROC virtual void convertToReferencePlatform();
- NA_EIDPROC virtual void convertToLocalPlatform();
-#else
- NA_EIDPROC void convertToReferencePlatform();
- NA_EIDPROC void convertToLocalPlatform();
-#endif //PRIV_SRL
+ virtual void convertToReferencePlatform();
+ virtual void convertToLocalPlatform();
// -------------------------------------------------------------------
// Subclasses could redefine this method to provide a migration path
@@ -1829,11 +1646,8 @@ public:
// due to the upgrade to their appropriate values so that the object
// can be understood properly by the new executable.
// -------------------------------------------------------------------
-#ifndef PRIV_SRL
- NA_EIDPROC virtual void initNewMembers() {}
-#else
- NA_EIDPROC void initNewMembers() {}
-#endif
+ virtual void initNewMembers() {}
+
// -------------------------------------------------------------------
// Subclasses MUST redefine pack() to drive the packing of objects
// referenced by their members which are pointers and convert them to
@@ -1842,11 +1656,7 @@ public:
// platform. Note that endianness of the Version Header is handled
// separately in drivePack().
// -------------------------------------------------------------------
-#ifndef PRIV_SRL
- NA_EIDPROC virtual Long pack(void *space)
-#else
- NA_EIDPROC Long pack(void *space)
-#endif //PRIV_SRL
+ virtual Long pack(void *space)
{
if (isSpacePtr())
return ((Space *)space)->convertToOffset((char *)this);
@@ -1864,11 +1674,7 @@ public:
// platform. Note that endianness of the Version Header is handled
// separately in driveUnpack().
// -------------------------------------------------------------------
-#ifndef PRIV_SRL
- NA_EIDPROC virtual Lng32 unpack(void *base, void * reallocator) { return 0; }
-#else
- NA_EIDPROC Lng32 unpack(void *base, void * reallocator) { return 0; }
-#endif //PRIV_SRL
+ virtual Lng32 unpack(void *base, void * reallocator) { return 0; }
// -------------------------------------------------------------------
// This is a utility for use by redefined migrateToNewVersion() at the
@@ -1878,7 +1684,7 @@ public:
// assumes the image has been reallocated so that it is big enough to
// make this expansion.
// -------------------------------------------------------------------
- NA_EIDPROC void makeRoomForNewVersion(Int16 oldSubClassSize,
+ void makeRoomForNewVersion(Int16 oldSubClassSize,
Int16 newSubClassSize);
// -------------------------------------------------------------------
@@ -1936,11 +1742,8 @@ public:
// own members. The object is reallocated if needed at the "real" sub-
// class the object belongs.
// -------------------------------------------------------------------
-#ifndef PRIV_SRL
- NA_EIDPROC virtual Lng32 migrateToNewVersion(NAVersionedObject *&newImage);
-#else
- NA_EIDPROC Lng32 migrateToNewVersion(NAVersionedObject *&newImage);
-#endif //PRIV_SRL
+ virtual Lng32 migrateToNewVersion(NAVersionedObject *&newImage);
+
// -------------------------------------------------------------------
// Driver for Packing
//
@@ -1948,7 +1751,7 @@ public:
// later when 64-bit platforms are really available since it doesn't
// affect object layout.
// -------------------------------------------------------------------
- NA_EIDPROC Long drivePack(void *space, short isSpacePtr = 1);
+ Long drivePack(void *space, short isSpacePtr = 1);
// -------------------------------------------------------------------
// Driver for Unpacking
@@ -1964,9 +1767,9 @@ public:
// 6. initialize new members added in the new version
//
// -------------------------------------------------------------------
- NA_EIDPROC NAVersionedObject *driveUnpack(void *base, char *vtblPtr,
+ NAVersionedObject *driveUnpack(void *base, char *vtblPtr,
void * reallocator);
- NA_EIDPROC NAVersionedObject *driveUnpack(void *base,
+ NAVersionedObject *driveUnpack(void *base,
NAVersionedObject *ptrToAnchorClass,
void * reallocator);
@@ -1982,24 +1785,21 @@ private:
// private member functions
// -------------------------------------------------------------------
- NA_EIDPROC inline void clearFillers()
+ inline void clearFillers()
{
-#ifndef NA_64BIT
- fillers1_ = 0;
-#endif
}
- NA_EIDPROC inline void clearVersionIDArray()
+ inline void clearVersionIDArray()
{
memset(versionIDArray_, 0, VERSION_ID_ARRAY_SIZE);
}
- NA_EIDPROC inline void copyFlags(const NAVersionedObject & obj)
+ inline void copyFlags(const NAVersionedObject & obj)
{
flags_ = obj.flags_;
}
- NA_EIDPROC inline void initFlags()
+ inline void initFlags()
{
flags_ = 0;
markAsNotPacked();
@@ -2010,12 +1810,12 @@ private:
#endif
}
- NA_EIDPROC inline void copyVersionIDArray(unsigned char *versionIDArray)
+ inline void copyVersionIDArray(unsigned char *versionIDArray)
{
str_cpy_all((char *)versionIDArray_,(char *)versionIDArray,VERSION_ID_ARRAY_SIZE);
}
- NA_EIDPROC inline void copyVersionIDArray(const NAVersionedObject & obj)
+ inline void copyVersionIDArray(const NAVersionedObject & obj)
{
str_cpy_all((char*)versionIDArray_, (char*)obj.versionIDArray_,
VERSION_ID_ARRAY_SIZE);
@@ -2025,11 +1825,6 @@ private:
// private data members
// -------------------------------------------------------------------
-#ifndef NA_64BIT
-//char *HIDDEN_VTBLPTR_ON_32_BIT_NT; // 00-03
- Lng32 fillers1_; // 04-07
-#endif
-
char eyeCatcher_[2]; // 08-09
Int16 classID_; // 10-11
Int16 imageSize_; // 12-13
@@ -2038,10 +1833,6 @@ private:
NAVersionedObjectPtr reallocatedAddress_; // 24-31
-#ifdef PRIV_SRL
- void * dummyvtbl_; //solve offset problems for priv srls
-#endif //PRIV_SRL
-
}; // END of class declaration for NAVersionedObject ------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1522c8cd/core/sql/generator/GenAll.cpp
----------------------------------------------------------------------
diff --git a/core/sql/generator/GenAll.cpp b/core/sql/generator/GenAll.cpp
index ad28c48..d150176 100644
--- a/core/sql/generator/GenAll.cpp
+++ b/core/sql/generator/GenAll.cpp
@@ -48,7 +48,6 @@
#include "GenRelSet.cpp"
#include "GenRelUpdate.cpp"
#include "GenResources.cpp"
-#include "GenRfork.cpp"
#include "GenSequenceFunction.cpp"
#include "GenShape.cpp"
#include "GenStoredProc.cpp"
[30/30] incubator-trafodion git commit: PR-1226 [TRAFOFION-2731]
CodeCleanup: Remove obsolete, legacy and unused code
Posted by an...@apache.org.
PR-1226 [TRAFOFION-2731] CodeCleanup: Remove obsolete, legacy and unused code
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/b62e5770
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/b62e5770
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/b62e5770
Branch: refs/heads/master
Commit: b62e577019cba518eb7416b56814eecbb602ed16
Parents: 19119e7 1522c8c
Author: Anoop Sharma <an...@esgyn.com>
Authored: Thu Sep 7 01:54:30 2017 +0000
Committer: Anoop Sharma <an...@esgyn.com>
Committed: Thu Sep 7 01:54:30 2017 +0000
----------------------------------------------------------------------
core/conn/odbc/src/odbc/nsksrvr/SrvrConnect.cpp | 6 +
.../odbc/src/odbc/nsksrvrcore/SQLWrapper.cpp | 5 +-
core/sql/SqlCompilerDebugger/QueryData.cpp | 4 -
core/sql/arkcmp/CmpConnection.cpp | 18 +-
core/sql/arkcmp/CmpContext.cpp | 15 +-
core/sql/arkcmp/CmpContext.h | 8 -
core/sql/arkcmp/CmpSqlSession.cpp | 4 +-
core/sql/arkcmp/CmpStatement.cpp | 121 +-
core/sql/arkcmp/CmpStatement.h | 12 -
core/sql/arkcmp/CmpStoredProc.cpp | 5 -
core/sql/arkcmp/ProcessEnv.cpp | 2 -
core/sql/arkcmp/ProcessEnv.h | 5 -
core/sql/bin/SqlciErrors.txt | 1 -
core/sql/bin/SqlciMain.cpp | 14 +-
core/sql/bin/arkcmp.cpp | 9 +-
core/sql/bin/ex_esp_main.cpp | 24 +-
core/sql/bin/vproceid.cpp | 2 +-
core/sql/cli/Cli.cpp | 935 +---------
core/sql/cli/Cli.h | 20 +-
core/sql/cli/CliDefs.h | 3 -
core/sql/cli/CliDll.cpp | 44 -
core/sql/cli/CliExpExchange.cpp | 15 +-
core/sql/cli/CliExtern.cpp | 962 +---------
core/sql/cli/CliStubsStaticBuild.cpp | 41 -
core/sql/cli/Context.cpp | 1278 +-------------
core/sql/cli/Context.h | 31 +-
core/sql/cli/Descriptor.cpp | 30 -
core/sql/cli/Descriptor.h | 4 +-
core/sql/cli/ExSqlComp.cpp | 274 +--
core/sql/cli/ExSqlComp.h | 1 -
core/sql/cli/Globals.cpp | 50 +-
core/sql/cli/Globals.h | 28 -
core/sql/cli/GlobalsDef.cpp | 2 +-
core/sql/cli/Module.cpp | 48 +-
core/sql/cli/Module.h | 5 -
core/sql/cli/NoWaitOp.cpp | 13 +-
core/sql/cli/SQLCLIdev.h | 673 +------
core/sql/cli/SessionDefaults.cpp | 4 -
core/sql/cli/Statement.cpp | 270 +--
core/sql/cli/Statement.h | 31 +-
core/sql/cli/StoredProcInterface.cpp | 9 -
core/sql/cli/StoredProcInterface.h | 9 -
core/sql/cli/VicKeyValuePair.h | 14 -
core/sql/cli/cli_stdh.h | 1 -
core/sql/cli/globalsrlversion.cpp | 2 +-
core/sql/cli/globalstubs.cpp | 17 -
core/sql/cli/memorymonitor.cpp | 2 -
core/sql/cli/memorymonitor.h | 3 -
core/sql/cli/muse.cpp | 6 -
core/sql/cli/privsrlversion.cpp | 2 +-
core/sql/cli/rtdu.cpp | 61 -
core/sql/cli/rtdu.h | 897 +---------
core/sql/cli/rtdu2.cpp | 254 ---
core/sql/cli/rtdu2.h | 118 +-
core/sql/cli/sql_id.cpp | 12 -
core/sql/cli/sql_id.h | 18 -
core/sql/cli/sqlciSRLStubs.cpp | 2 +
core/sql/cli/sqlcli.h | 318 ++--
core/sql/cli/test.cpp | 99 --
core/sql/comexe/CmpMessage.cpp | 34 +-
core/sql/comexe/CmpMessage.h | 26 +-
core/sql/comexe/ComKeyMDAM.h | 116 +-
core/sql/comexe/ComKeyRange.cpp | 2 +-
core/sql/comexe/ComKeyRange.h | 38 +-
core/sql/comexe/ComKeySingleSubset.h | 30 +-
core/sql/comexe/ComQueue.cpp | 4 -
core/sql/comexe/ComQueue.h | 60 +-
core/sql/comexe/ComTdb.cpp | 51 +-
core/sql/comexe/ComTdb.h | 179 +-
core/sql/comexe/ComTdbAll.h | 8 -
core/sql/comexe/ComTdbBlockingHdfsScan.cpp | 10 -
core/sql/comexe/ComTdbBlockingHdfsScan.h | 8 -
core/sql/comexe/ComTdbCompoundStmt.h | 18 -
core/sql/comexe/ComTdbExeUtil.h | 59 +-
core/sql/comexe/ComTdbExplain.h | 2 +-
core/sql/comexe/ComTdbFastTransport.h | 35 +-
core/sql/comexe/ComTdbFirstN.h | 6 +-
core/sql/comexe/ComTdbHashGrby.h | 48 +-
core/sql/comexe/ComTdbHashj.h | 2 +-
core/sql/comexe/ComTdbHbaseAccess.h | 2 +-
core/sql/comexe/ComTdbMj.h | 2 +-
core/sql/comexe/ComTdbOnlj.h | 2 +-
core/sql/comexe/ComTdbPackRows.h | 13 -
core/sql/comexe/ComTdbRoot.h | 2 +-
core/sql/comexe/ComTdbSample.h | 18 -
core/sql/comexe/ComTdbSequence.h | 20 +-
core/sql/comexe/ComTdbSort.h | 4 +-
core/sql/comexe/ComTdbSortGrby.cpp | 2 +-
core/sql/comexe/ComTdbSortGrby.h | 18 -
core/sql/comexe/ComTdbSplitTop.h | 2 +-
core/sql/comexe/ComTdbTranspose.h | 20 +-
core/sql/comexe/ComTdbTuple.h | 32 +-
core/sql/comexe/ComTdbTupleFlow.cpp | 2 +-
core/sql/comexe/ComTdbTupleFlow.h | 2 +-
core/sql/comexe/ComTdbUdr.h | 2 +-
core/sql/comexe/ComTdbUnPackRows.h | 24 +-
core/sql/comexe/ComTdbUnion.cpp | 2 +-
core/sql/comexe/ComTdbUnion.h | 6 +-
core/sql/comexe/HashBufferHeader.h | 8 -
core/sql/comexe/HashRow.h | 14 -
core/sql/comexe/LateBindInfo.cpp | 244 +--
core/sql/comexe/LateBindInfo.h | 57 +-
core/sql/comexe/PartInputDataDesc.cpp | 3 +-
core/sql/comexe/QueueIndex.h | 5 -
core/sql/comexe/SqlTableOpenInfo.h | 15 -
core/sql/common/BaseTypes.cpp | 4 -
core/sql/common/BaseTypes.h | 8 +-
core/sql/common/BigNumHelper.h | 19 -
core/sql/common/Collections.cpp | 15 -
core/sql/common/Collections.h | 80 +-
core/sql/common/ComASSERT.h | 4 +-
core/sql/common/ComAnsiNamePart.h | 3 +-
core/sql/common/ComCextMisc.cpp | 10 -
core/sql/common/ComDistribution.h | 14 +-
core/sql/common/ComMPLoc.h | 8 +-
core/sql/common/ComObjectName.cpp | 30 -
core/sql/common/ComRtUtils.cpp | 7 +-
core/sql/common/ComRtUtils.h | 7 +-
core/sql/common/ComSafePrinter.cpp | 2 +-
core/sql/common/ComSchemaName.cpp | 23 -
core/sql/common/ComSmallDefs.cpp | 9 -
core/sql/common/ComSpace.cpp | 77 +-
core/sql/common/ComSpace.h | 52 +-
core/sql/common/ComSqlId.h | 19 +-
core/sql/common/ComSysUtils.cpp | 1 -
core/sql/common/ComSysUtils.h | 17 +-
core/sql/common/ComVersionDefs.h | 2 +-
core/sql/common/DgBaseType.h | 169 +-
core/sql/common/DllExportDefines.h | 21 -
core/sql/common/Int64.h | 28 +-
core/sql/common/IntervalType.cpp | 10 -
core/sql/common/IntervalType.h | 10 +-
core/sql/common/Ipc.cpp | 39 +-
core/sql/common/Ipc.h | 84 +-
core/sql/common/IpcGuardian.cpp | 280 +--
core/sql/common/IpcMessageType.h | 44 -
core/sql/common/IpcSockets.cpp | 20 -
core/sql/common/NAAssert.h | 10 +-
core/sql/common/NAError.h | 58 +-
core/sql/common/NAHeap.h | 10 +-
core/sql/common/NAIpc.cpp | 2 +-
core/sql/common/NAIpc.h | 2 +-
core/sql/common/NAMemory.cpp | 305 +---
core/sql/common/NAMemory.h | 399 ++---
core/sql/common/NAStdlib.h | 9 -
core/sql/common/NAString.cpp | 2 +-
core/sql/common/NAString2.cpp | 16 +-
core/sql/common/NAStringDefGlobals.h | 5 +-
core/sql/common/NAWinNT.h | 54 +-
core/sql/common/NLSConversion.h | 20 -
core/sql/common/NumericType.cpp | 17 -
core/sql/common/OperTypeEnum.h | 4 -
core/sql/common/Platform.h | 27 +-
core/sql/common/SMConnection.cpp | 13 -
core/sql/common/SqlEventsDllDefines.h | 8 +-
core/sql/common/SqlExpDllDefines.h | 27 -
core/sql/common/SqlExportDllDefines.h | 24 -
core/sql/common/SqlLmDllDefines.h | 20 +-
core/sql/common/arkcmp_proc.cpp | 2 -
core/sql/common/charinfo.cpp | 10 +-
core/sql/common/conversionLocale.cpp | 3 +-
core/sql/common/conversionSJIS.cpp | 7 +-
core/sql/common/csconvert.h | 15 -
core/sql/common/dfs2rec.h | 36 +-
core/sql/common/from_GB18030.c | 8 -
core/sql/common/from_GBK.c | 3 -
core/sql/common/from_SJIS.c | 2 -
core/sql/common/from_ksc5601.c | 2 -
core/sql/common/iconv_gen.c | 15 -
core/sql/common/ipcmsg.cpp | 2 +-
core/sql/common/mb_lconv.c | 38 +-
core/sql/common/memtest.cpp | 1 -
core/sql/common/multi-byte.h | 5 -
core/sql/common/nawstring.cpp | 4 -
core/sql/common/nawstring.h | 18 +-
core/sql/common/nchar_mp.h | 33 +-
core/sql/common/str.cpp | 18 -
core/sql/common/str.h | 46 +-
core/sql/common/stringBuf.h | 31 +-
core/sql/common/swscanf.cpp | 5 -
core/sql/common/swsprintf.cpp | 2 -
core/sql/common/unicode_char_set.cpp | 6 -
core/sql/common/unicode_char_set.h | 18 -
core/sql/common/wc_scanf_sprintf.h | 20 +-
core/sql/common/wstr.h | 5 +-
core/sql/executor/ExBitMapTable.cpp | 6 -
core/sql/executor/ExBitMapTable.h | 16 -
core/sql/executor/ExCancel.h | 6 +-
core/sql/executor/ExComTdb.cpp | 26 +-
core/sql/executor/ExCompoundStmt.h | 38 +-
core/sql/executor/ExExeUtil.h | 215 ++-
core/sql/executor/ExExeUtilCommon.cpp | 10 +-
core/sql/executor/ExExeUtilGetStats.cpp | 7 +-
core/sql/executor/ExExplain.cpp | 9 -
core/sql/executor/ExExplain.h | 6 +-
core/sql/executor/ExFastTransport.cpp | 7 -
core/sql/executor/ExFastTransport.h | 11 +-
core/sql/executor/ExFirstN.h | 34 +-
core/sql/executor/ExHbaseAccess.h | 12 +-
core/sql/executor/ExHdfsScan.h | 12 +-
core/sql/executor/ExMeas.cpp | 141 --
core/sql/executor/ExMeas.h | 267 ---
core/sql/executor/ExPack.h | 31 +-
core/sql/executor/ExPackedRows.h | 27 +-
core/sql/executor/ExProbeCache.h | 8 +-
core/sql/executor/ExRLE.h | 10 -
core/sql/executor/ExRsInfo.cpp | 24 +-
core/sql/executor/ExRsInfo.h | 2 +-
core/sql/executor/ExSample.h | 50 +-
core/sql/executor/ExScheduler.cpp | 97 +-
core/sql/executor/ExScheduler.h | 26 +-
core/sql/executor/ExSequence.cpp | 2 -
core/sql/executor/ExSimpleSample.h | 20 +-
core/sql/executor/ExSimpleSqlBuffer.h | 12 -
core/sql/executor/ExStats.cpp | 64 +-
core/sql/executor/ExStats.h | 812 +--------
core/sql/executor/ExTranspose.h | 29 +-
core/sql/executor/ExUdr.h | 6 +-
core/sql/executor/ExUdrServer.cpp | 29 +-
core/sql/executor/ExVPJoin.cpp | 16 -
core/sql/executor/ExVPJoin.h | 33 +-
core/sql/executor/Ex_esp_msg.h | 6 -
core/sql/executor/FixedSizeHeapElement.h | 18 +-
core/sql/executor/FixedSizeHeapManager.h | 30 +-
core/sql/executor/MdamEndPoint.h | 32 +-
core/sql/executor/MdamInterval.h | 44 +-
core/sql/executor/MdamIntervalIterator.h | 6 +-
core/sql/executor/MdamIntervalList.h | 30 +-
core/sql/executor/MdamIntervalListIterator.h | 8 +-
core/sql/executor/MdamIntervalListMerger.h | 10 +-
core/sql/executor/MdamPoint.h | 24 +-
core/sql/executor/MdamRefList.h | 32 +-
core/sql/executor/MdamRefListEntry.h | 18 +-
core/sql/executor/MdamRefListIterator.h | 6 +-
core/sql/executor/UdrExeIpc.h | 6 +-
core/sql/executor/cluster.cpp | 74 +-
core/sql/executor/cluster.h | 157 +-
core/sql/executor/dfs2fe.h | 1 -
core/sql/executor/dmeasql.h | 67 -
core/sql/executor/ex_control.cpp | 338 ++--
core/sql/executor/ex_control.h | 6 +-
core/sql/executor/ex_ddl.cpp | 265 ++-
core/sql/executor/ex_ddl.h | 30 +-
core/sql/executor/ex_error.h | 4 -
core/sql/executor/ex_esp_frag_dir.cpp | 2 -
core/sql/executor/ex_ex.cpp | 52 -
core/sql/executor/ex_ex.h | 18 +-
core/sql/executor/ex_exe_stmt_globals.cpp | 21 +-
core/sql/executor/ex_exe_stmt_globals.h | 38 +-
core/sql/executor/ex_frag_rt.cpp | 11 +-
core/sql/executor/ex_globals.cpp | 4 -
core/sql/executor/ex_globals.h | 70 +-
core/sql/executor/ex_god.h | 2 -
core/sql/executor/ex_hash_grby.cpp | 64 +-
core/sql/executor/ex_hash_grby.h | 37 +-
core/sql/executor/ex_hashj.cpp | 30 +-
core/sql/executor/ex_hashj.h | 10 +-
core/sql/executor/ex_io_control.h | 22 +-
core/sql/executor/ex_key_object.h | 1 -
core/sql/executor/ex_mdam.h | 70 +-
core/sql/executor/ex_mj.h | 8 +-
core/sql/executor/ex_onlj.cpp | 27 +-
core/sql/executor/ex_onlj.h | 6 +-
core/sql/executor/ex_queue.cpp | 10 -
core/sql/executor/ex_queue.h | 111 +-
core/sql/executor/ex_root.cpp | 17 +-
core/sql/executor/ex_root.h | 8 +-
core/sql/executor/ex_send_bottom.cpp | 4 +-
core/sql/executor/ex_send_bottom.h | 8 +-
core/sql/executor/ex_send_top.cpp | 2 -
core/sql/executor/ex_send_top.h | 8 +-
core/sql/executor/ex_sort.cpp | 13 +-
core/sql/executor/ex_sort.h | 10 +-
core/sql/executor/ex_sort_grby.h | 13 +-
core/sql/executor/ex_split_bottom.cpp | 7 +-
core/sql/executor/ex_split_bottom.h | 8 +-
core/sql/executor/ex_split_top.h | 8 +-
core/sql/executor/ex_stored_proc.h | 6 +-
core/sql/executor/ex_tcb.h | 95 +-
core/sql/executor/ex_tcb_private.h | 5 -
core/sql/executor/ex_timeout.h | 6 +-
core/sql/executor/ex_transaction.cpp | 8 -
core/sql/executor/ex_transaction.h | 6 +-
core/sql/executor/ex_tuple.cpp | 4 +-
core/sql/executor/ex_tuple.h | 36 +-
core/sql/executor/ex_tuple_flow.cpp | 3 -
core/sql/executor/ex_tuple_flow.h | 6 +-
core/sql/executor/ex_union.h | 59 +-
core/sql/executor/hash_table.cpp | 12 -
core/sql/executor/hash_table.h | 34 -
core/sql/executor/key_range.h | 26 +-
core/sql/executor/key_single_subset.h | 28 +-
core/sql/executor/rcb.h | 50 -
core/sql/executor/sql_buffer.cpp | 116 +-
core/sql/executor/sql_buffer.h | 17 +-
core/sql/executor/sql_buffer_size.h | 3 -
core/sql/executor/stubs.cpp | 384 ----
core/sql/executor/stubs2.cpp | 81 -
core/sql/executor/tempfile.cpp | 71 +-
core/sql/executor/tempfile.h | 67 -
core/sql/exp/ExpAtp.cpp | 6 -
core/sql/exp/ExpAtp.h | 29 +-
core/sql/exp/ExpBitMuxFunction.h | 22 +-
core/sql/exp/ExpCriDesc.cpp | 6 +-
core/sql/exp/ExpCriDesc.h | 21 +-
core/sql/exp/ExpDll.cpp | 3 +-
core/sql/exp/ExpError.cpp | 19 -
core/sql/exp/ExpError.h | 18 -
core/sql/exp/ExpErrorEnums.h | 11 -
core/sql/exp/ExpLOB.cpp | 42 -
core/sql/exp/ExpLOB.h | 70 +-
core/sql/exp/ExpPCode.cpp | 53 +-
core/sql/exp/ExpPCode.h | 27 +-
core/sql/exp/ExpPCodeClauseGen.cpp | 156 +-
core/sql/exp/ExpPCodeExpGen.cpp | 37 +-
core/sql/exp/ExpPCodeInstruction.h | 138 +-
core/sql/exp/ExpPCodeList.h | 30 +-
core/sql/exp/ExpPCodeOptimizations.cpp | 191 +-
core/sql/exp/ExpPCodeOptimizations.h | 24 +-
core/sql/exp/ExpPCodeOptsNativeExpr.cpp | 7 -
core/sql/exp/ExpPCodeOptsPeeling.cpp | 15 +-
core/sql/exp/ExpPCodeOptsRuntime.cpp | 16 +-
core/sql/exp/ExpPackDefs.cpp | 221 ++-
core/sql/exp/ExpSequenceFunction.cpp | 13 -
core/sql/exp/ExpSequenceFunction.h | 48 +-
core/sql/exp/ExpSqlTupp.h | 66 +-
core/sql/exp/exp_arith.cpp | 12 -
core/sql/exp/exp_attrs.cpp | 45 +-
core/sql/exp/exp_attrs.h | 8 +-
core/sql/exp/exp_bignum.cpp | 12 -
core/sql/exp/exp_bignum.h | 47 +-
core/sql/exp/exp_clause.cpp | 77 +-
core/sql/exp/exp_clause.h | 141 +-
core/sql/exp/exp_clause_derived.h | 660 ++++---
core/sql/exp/exp_conv.cpp | 82 +-
core/sql/exp/exp_datetime.cpp | 15 -
core/sql/exp/exp_datetime.h | 33 +-
core/sql/exp/exp_dp2_expr.cpp | 1 +
core/sql/exp/exp_dp2_expr.h | 33 +-
core/sql/exp/exp_eval.cpp | 23 +-
core/sql/exp/exp_expr.cpp | 36 +-
core/sql/exp/exp_expr.h | 361 ++--
core/sql/exp/exp_fixup.cpp | 43 -
core/sql/exp/exp_function.cpp | 158 +-
core/sql/exp/exp_function.h | 1663 ++++++++----------
core/sql/exp/exp_interval.h | 6 +-
core/sql/exp/exp_like.h | 59 +-
core/sql/exp/exp_math_func.cpp | 2 -
core/sql/exp/exp_math_func.h | 42 +-
core/sql/exp/exp_space.cpp | 49 -
core/sql/exp/exp_stdh.h | 4 +-
core/sql/exp/exp_tuple_desc.cpp | 3 +-
core/sql/exp/exp_tuple_desc.h | 4 +-
core/sql/export/ComDiags.cpp | 53 +-
core/sql/export/ComDiags.h | 343 +---
core/sql/export/ComMemoryDiags.h | 4 +-
core/sql/export/ExportDll.cpp | 3 +-
core/sql/export/HeapID.h | 18 +-
core/sql/export/HeapLog.h | 3 +-
core/sql/export/IpcMessageObj.cpp | 18 -
core/sql/export/IpcMessageObj.h | 85 +-
core/sql/export/NAAbort.cpp | 13 +-
core/sql/export/NABasicObject.cpp | 27 +-
core/sql/export/NABasicObject.h | 52 +-
core/sql/export/NAInternalError.h | 4 +-
core/sql/export/NAStringDef.cpp | 11 -
core/sql/export/NAStringDef.h | 83 +-
core/sql/export/NAVersionedObject.cpp | 22 +-
core/sql/export/NAVersionedObject.h | 815 ++++-----
core/sql/generator/GenAll.cpp | 1 -
core/sql/generator/GenExpGenerator.cpp | 150 +-
core/sql/generator/GenExpGenerator.h | 17 +-
core/sql/generator/GenExplain.cpp | 6 -
core/sql/generator/GenItemFunc.cpp | 219 ---
core/sql/generator/GenPreCode.cpp | 1 -
core/sql/generator/GenRelDCL.cpp | 6 -
core/sql/generator/GenRelMisc.cpp | 35 +-
core/sql/generator/Generator.cpp | 8 +-
core/sql/langman/LmComQueue.h | 3 -
core/sql/langman/LmCommon.h | 26 +-
core/sql/langman/LmDebug.h | 2 +-
core/sql/nskgmake/arkcmplib/Makefile | 2 -
core/sql/nskgmake/tdm_sqlcli/Makefile | 1 -
core/sql/optimizer/BindItemExpr.cpp | 37 -
core/sql/optimizer/BindRelExpr.cpp | 41 +-
core/sql/optimizer/ColStatDesc.cpp | 5 -
core/sql/optimizer/ControlDB.cpp | 7 +-
core/sql/optimizer/EncodedKeyValue.cpp | 2 +-
core/sql/optimizer/ItemConstr.h | 2 +-
core/sql/optimizer/ItemExpr.cpp | 112 --
core/sql/optimizer/ItemFunc.h | 92 +-
core/sql/optimizer/NATable.cpp | 14 +-
core/sql/optimizer/NATable.h | 4 +-
core/sql/optimizer/ObjectNames.cpp | 15 +-
core/sql/optimizer/ObjectNames.h | 19 -
core/sql/optimizer/RelCache.cpp | 10 +-
core/sql/optimizer/SchemaDB.cpp | 13 +-
core/sql/optimizer/SchemaDB.h | 13 +-
core/sql/optimizer/SynthType.cpp | 71 -
core/sql/optimizer/TableDesc.h | 5 -
core/sql/optimizer/VEGTable.h | 2 +-
core/sql/optimizer/costmethod.cpp | 2 +-
core/sql/optimizer/opt.cpp | 4 +-
core/sql/parser/HvRoles.h | 3 +-
core/sql/parser/ParKeyWords.cpp | 2 -
core/sql/parser/SqlParserAux.cpp | 5 +-
core/sql/parser/sqlparser.y | 146 --
core/sql/qms/QmmMain.cpp | 19 -
core/sql/qms/QmmQmm.cpp | 486 -----
core/sql/qms/QmmQmm.h | 38 -
core/sql/qms/QmsMain.cpp | 17 -
core/sql/qms/QmsRequest.cpp | 26 -
core/sql/qmscommon/QRDescriptor.cpp | 4 -
core/sql/qmscommon/QRQueries.cpp | 290 ++-
core/sql/regress/compGeneral/EXPECTED006.SB | 10 -
core/sql/regress/compGeneral/TEST006 | 4 -
core/sql/regress/executor/EXPECTED020 | 4 -
core/sql/regress/hive/EXPECTED009 | 24 +-
core/sql/regress/seabase/EXPECTED010 | 460 ++---
core/sql/regress/seabase/EXPECTED011 | 13 +-
core/sql/regress/seabase/EXPECTED016 | 119 +-
core/sql/runtimestats/SqlStats.cpp | 99 +-
core/sql/runtimestats/SqlStats.h | 14 -
core/sql/runtimestats/rts_msg.h | 2 -
core/sql/runtimestats/sscpipc.cpp | 2 -
core/sql/runtimestats/ssmpipc.cpp | 9 -
core/sql/runtimestats/ssmpipc.h | 7 -
core/sql/sort/CommonStructs.h | 3 -
core/sql/sort/Statistics.h | 3 -
core/sql/sqlcat/ReadTableDef.cpp | 56 -
core/sql/sqlcat/ReadTableDef.h | 54 -
core/sql/sqlcat/TrafDDLdesc.cpp | 65 +
core/sql/sqlcat/enum.h | 42 -
core/sql/sqlcat/readRealArk.cpp | 89 -
core/sql/sqlcat/readRealArk.h | 8 -
core/sql/sqlcat/vers_libsqlcat.cpp | 3 -
core/sql/sqlci/SqlCmd.cpp | 8 +-
core/sql/sqlci/SqlciDefs.h | 4 -
core/sql/sqlci/SqlciEnv.h | 2 +-
core/sql/sqlcomp/CmpDDLCatErrorCodes.h | 1 -
core/sql/sqlcomp/CmpDescribe.cpp | 3 +-
core/sql/sqlcomp/CmpMain.cpp | 35 +-
core/sql/sqlcomp/DefaultConstants.h | 27 -
core/sql/sqlcomp/QCache.cpp | 24 +-
core/sql/sqlcomp/QCache.h | 11 -
core/sql/sqlcomp/nadefaults.cpp | 26 +-
core/sql/sqlmsg/ErrorMessage.h | 1 -
core/sql/sqlmsg/GetErrorMessage.cpp | 2 -
core/sql/sqlmsg/GetErrorMessage.h | 22 +-
core/sql/udrserv/UdrStreams.cpp | 2 +-
core/sql/udrserv/spinfo.cpp | 6 +-
core/sql/udrserv/udrglobals.cpp | 7 +-
core/sql/udrserv/udrload.cpp | 4 +-
core/sql/udrserv/udrserv.cpp | 16 +-
core/sql/udrserv/udrunload.cpp | 4 +-
core/sql/udrserv/udrutil.cpp | 4 +-
core/sql/udrserv/udrutil.h | 4 +-
core/sql/ustat/hs_cli.cpp | 19 +-
core/sql/ustat/hs_globals.cpp | 2 -
core/sql/ustat/hs_read.cpp | 2 -
core/sql/ustat/hs_update.cpp | 1 -
461 files changed, 4840 insertions(+), 20729 deletions(-)
----------------------------------------------------------------------