Repository: incubator-trafodion Updated Branches: refs/heads/master f918a261e -> 7b04f91e6
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/87eb0347/core/sql/regress/core/FILTERRTS ---------------------------------------------------------------------- diff --git a/core/sql/regress/core/FILTERRTS b/core/sql/regress/core/FILTERRTS index 129f204..7589b3d 100755 --- a/core/sql/regress/core/FILTERRTS +++ b/core/sql/regress/core/FILTERRTS @@ -78,6 +78,8 @@ s/SSCP Request Message Bytes[ ]*[0-9,]*/SSCP Request Message Bytes @sscpRequestM s/SSCP Reply Message Count[ ]*[0-9,]*/SSCP Reply Message Count @sscpReplytMessageCount@/ s/SSCP Reply Message Bytes[ ]*[0-9,]*/SSCP Reply Message Bytes @sscpReplyMessageBytes@/ s/No. Query Invalidation Keys[ ]*[0-9]*/No. Query Invalidation Keys/ +s/EXE Memory[ ]*[A-z]*[0-9]*/@exeMemory@/ +s/IPC Memory[ ]*[A-z]*[0-9]*/@exeMemory@/ s/RMS Stats Reset Timestamp[ ]*[0-9]*\/[0-9]*\/[0-9]* [0-9]*:[0-9]*:[0-9]*.[0-9]*/RMS Stats Reset Timestamp @rmsStatsResetTimestamp@/ /8 EX_HASH_GRBY[A-Z ]*/{N s/8 EX_HASH_GRBY[A-Z ]*\n[0-9, -]*/8 #ex_hash_grby bmoStats/ http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/87eb0347/core/sql/regress/core/TESTRTS ---------------------------------------------------------------------- diff --git a/core/sql/regress/core/TESTRTS b/core/sql/regress/core/TESTRTS index d2ac392..9a97213 100755 --- a/core/sql/regress/core/TESTRTS +++ b/core/sql/regress/core/TESTRTS @@ -26,10 +26,18 @@ -- @@@ END COPYRIGHT @@@ -- +obey TESTRTS(clean_up); +obey TESTRTS(create_insert); +obey TESTRTS(test_rts); +obey TESTRTS(esp_idle_timeout); +obey TESTRTS(clean_up); +log ; +exit; + ?section create_insert cqd hist_on_demand_stats_size '10000'; -obey TESTRTS(clean_up); +?section test_rts sh chmod 777 $scriptsdir/tools/run_rts.ksh ; log LOGRTS clear ; @@ -250,9 +258,6 @@ get statistics for pid a; -- Test to determine if invalid token is taken as stmt name select * from table (statistics(null, 'AAA=')); -obey TESTRTS(clean_up); -log; -exit; ?section compare_current_qid prepare s1 from select count(*) from @@ -276,3 +281,14 @@ log LOGRTS; ?section clean_up drop table tstat; +?section esp_idle_timeout +get process statistics for current ; +set session default esp_idle_timeout '60' ; +cqd esp_idle_timeout '60' ; +control query shape esp_exchange(hash_groupby(esp_exchange(scan))); +select distinct d from tstat ; +get process statistics for current ; +sh sleep 70; +select distinct d from tstat ; +get process statistics for current ; + http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/87eb0347/core/sql/sqlcomp/nadefaults.cpp ---------------------------------------------------------------------- diff --git a/core/sql/sqlcomp/nadefaults.cpp b/core/sql/sqlcomp/nadefaults.cpp index 5d3d08b..45880c0 100644 --- a/core/sql/sqlcomp/nadefaults.cpp +++ b/core/sql/sqlcomp/nadefaults.cpp @@ -1293,7 +1293,7 @@ SDDui___(CYCLIC_ESP_PLACEMENT, "1"), DDSint__(ESP_ASSIGN_DEPTH, "0"), DDSint__(ESP_FIXUP_PRIORITY_DELTA, "0"), - DDSint__(ESP_IDLE_TIMEOUT, "0"), + DDint__(ESP_IDLE_TIMEOUT, "1800"), // To match with set session defaults value DDkwd__(ESP_MULTI_FRAGMENTS, "ON"), DDkwd__(ESP_MULTI_FRAGMENT_QUOTAS, "ON"), DDui1500_4000(ESP_MULTI_FRAGMENT_QUOTA_VM, "4000"),
