You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by se...@apache.org on 2017/09/13 23:23:29 UTC

[11/15] incubator-trafodion git commit: [TRAFODION-2733] Provide an improved memory quota assignment for big memory operators (BMO)

[TRAFODION-2733] Provide an improved memory quota assignment for big memory operators (BMO)

Enabled memory quota per node. The CQD BMO_MEMORY_LIMIT_PER_NODE
(renamed from EXE_MEMORY_LIMIT_PER_CPU) is set to 10240 MB by default.
Old attribute	Old value	Renamed Attribute	New value
EXE_MEMORY_LIMIT_PER_CPU	0	BMO_MEMORY_LIMIT_PER_NODE	10240
EXE_MEMORY_LIMIT_LOWER_BOUND_HASHGROUPBY	10	BMO_MEMORY_LIMIT_LOWER_BOUND_HASHGROUPBY	25
EXE_MEMORY_LIMIT_LOWER_BOUND_HASHJOIN	10	BMO_MEMORY_LIMIT_LOWER_BOUND_HASHJOIN	25
EXE_MEMORY_LIMIT_LOWER_BOUND_PROBE_CACHE	10	BMO_MEMORY_LIMIT_LOWER_BOUND_PROBE_CACHE	25
EXE_MEMORY_LIMIT_LOWER_BOUND_SORT	10	BMO_MEMORY_LIMIT_LOWER_BOUND_SORT	200
Changes in EXPLAIN
Estimated memory per node for all BMOs at ROOT operator
Estimated memory per instance for every BMO operator
Memory quota per instance for every BMO operator
BMO TDB contains the memory quota per esp instance now.
Root TDB now contains the limit per node and estimated memory per node.
This can be used by WMS to change the memory allocation during
runtime without compilation. - Not yet implemented.
Added a CQD BMO_MEMORY_LIMIT_UPPER_BOUND to gap the memory
consumed by BMO by the same queries with less number of
bmos.
The unused memory quota is yielded to other fragments in the process
also.
Removed the code to limit the ESPs from being assigned to a fragement
based on the BMO memory quota.
Added a new CQD BMO_MEMORY_ESTIMATE_RATIO_CAP to gap the memory
estimate skew by any one BMO operator to 0.7.
To disable the memory quota per node, set BMO_MEMORY_LIMIT_PER_NODE to 0.
This memory quota is distributed proportionally based on the estimated memory
taking into consideration the number of bmo instances per operator and
the number of nodes available in the cluster to host these instances.
Hence, this memory quota should be valid in multi-fragments independent of the
number of fragments in an ESP.
Removed the CQD EXE_MEMORY_LIMIT_NONBMOS_PERCENT and EXE_MEMORY_RESERVED_FOR_MXOSRVR_IN_MB
Fixed BMO stats WM to be at least the allocated memory.
Changed the sort operator to account the bmo memory correctly.


Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/eece8702
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/eece8702
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/eece8702

Branch: refs/heads/master
Commit: eece8702212df8d32924717e344059c893e4fa5b
Parents: 7d2c4a8
Author: selvaganesang <se...@esgyn.com>
Authored: Sat Sep 9 01:19:24 2017 +0000
Committer: selvaganesang <se...@esgyn.com>
Committed: Sat Sep 9 01:19:24 2017 +0000

----------------------------------------------------------------------
 core/sqf/src/seatrans/.gitignore            |  1 -
 core/sql/regress/executor/EXPECTED131       | 12 ---------
 core/sql/regress/executor/EXPECTED140       | 33 ------------------------
 core/sql/regress/executor/FILTER131         |  2 ++
 core/sql/regress/executor/FILTER140         |  2 ++
 core/sql/regress/hive/EXPECTED009           | 22 +++++-----------
 core/sql/regress/seabase/EXPECTED011        |  6 -----
 core/sql/regress/tools/regress-filter-linux |  2 ++
 8 files changed, 12 insertions(+), 68 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/eece8702/core/sqf/src/seatrans/.gitignore
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/.gitignore b/core/sqf/src/seatrans/.gitignore
index ac89993..a172a66 100644
--- a/core/sqf/src/seatrans/.gitignore
+++ b/core/sqf/src/seatrans/.gitignore
@@ -15,6 +15,5 @@ hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/Trans
 hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/TrxTransactionState.java
 hbase-trx/src/main/java/org/apache/hadoop/hbase/client/ClientScanner98.java
 hbase-trx/src/main/java/org/apache/hadoop/hbase/client/TrafParallelClientScanner.java
-hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/SplitBalanceHelper.java
 hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/TransactionalRegionScannerHolder.java
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/eece8702/core/sql/regress/executor/EXPECTED131
----------------------------------------------------------------------
diff --git a/core/sql/regress/executor/EXPECTED131 b/core/sql/regress/executor/EXPECTED131
index f9937ba..f5309b9 100644
--- a/core/sql/regress/executor/EXPECTED131
+++ b/core/sql/regress/executor/EXPECTED131
@@ -70,14 +70,12 @@
 
 ------------------------------------------------------------------ PLAN SUMMARY
 STATEMENT_NAME ........... NOT NAMED
-PLAN_ID .................. 212356314945966316
 STATEMENT ................ select * from t1311k where uniq >2 and uniq <5;
 
 
 ------------------------------------------------------------------ NODE LISTING
 ROOT ======================================  SEQ_NO 2        ONLY CHILD 1
 DESCRIPTION
-  est_memory_per_node .... 10240.00(Limit), 0.00(BMOs), 0.00(nBMOs) MB
   fragment_id ............ 0
   parent_frag ............ (none)
   fragment_type .......... master
@@ -89,7 +87,6 @@ DESCRIPTION
   SCHEMA ................. T131SCH
   HBASE_SMALL_SCANNER .... SYSTEM
   GENERATE_EXPLAIN ....... ON
-  ObjectUIDs ............. 5307053393310817782
   select_list ............ TRAFODION.T131SCH.T1311K.UNIQ,
                              TRAFODION.T131SCH.T1311K.C1000,
                              TRAFODION.T131SCH.T1311K.STR1
@@ -116,14 +113,12 @@ DESCRIPTION
 
 ------------------------------------------------------------------ PLAN SUMMARY
 STATEMENT_NAME ........... NOT NAMED
-PLAN_ID .................. 212356314946168645
 STATEMENT ................ select * from t1311k where uniq >2 and uniq <99;
 
 
 ------------------------------------------------------------------ NODE LISTING
 ROOT ======================================  SEQ_NO 2        ONLY CHILD 1
 DESCRIPTION
-  est_memory_per_node .... 10240.00(Limit), 0.00(BMOs), 0.00(nBMOs) MB
   fragment_id ............ 0
   parent_frag ............ (none)
   fragment_type .......... master
@@ -135,7 +130,6 @@ DESCRIPTION
   SCHEMA ................. T131SCH
   HBASE_SMALL_SCANNER .... SYSTEM
   GENERATE_EXPLAIN ....... ON
-  ObjectUIDs ............. 5307053393310817782
   select_list ............ TRAFODION.T131SCH.T1311K.UNIQ,
                              TRAFODION.T131SCH.T1311K.C1000,
                              TRAFODION.T131SCH.T1311K.STR1
@@ -274,14 +268,12 @@ UNIQ         C1000
 
 ------------------------------------------------------------------ PLAN SUMMARY
 STATEMENT_NAME ........... NOT NAMED
-PLAN_ID .................. 212356314946403715
 STATEMENT ................ select * from t1311k where uniq >2 and uniq <30;
 
 
 ------------------------------------------------------------------ NODE LISTING
 ROOT ======================================  SEQ_NO 2        ONLY CHILD 1
 DESCRIPTION
-  est_memory_per_node .... 10240.00(Limit), 0.00(BMOs), 0.00(nBMOs) MB
   fragment_id ............ 0
   parent_frag ............ (none)
   fragment_type .......... master
@@ -293,7 +285,6 @@ DESCRIPTION
   SCHEMA ................. T131SCH
   HBASE_SMALL_SCANNER .... SYSTEM
   GENERATE_EXPLAIN ....... ON
-  ObjectUIDs ............. 5307053393310817782
   select_list ............ TRAFODION.T131SCH.T1311K.UNIQ,
                              TRAFODION.T131SCH.T1311K.C1000,
                              TRAFODION.T131SCH.T1311K.STR1
@@ -320,14 +311,12 @@ DESCRIPTION
 
 ------------------------------------------------------------------ PLAN SUMMARY
 STATEMENT_NAME ........... NOT NAMED
-PLAN_ID .................. 212356314948478264
 STATEMENT ................ select * from t1311kbis where uniq >2 and uniq <30;
 
 
 ------------------------------------------------------------------ NODE LISTING
 ROOT ======================================  SEQ_NO 2        ONLY CHILD 1
 DESCRIPTION
-  est_memory_per_node .... 10240.00(Limit), 0.00(BMOs), 0.00(nBMOs) MB
   fragment_id ............ 0
   parent_frag ............ (none)
   fragment_type .......... master
@@ -339,7 +328,6 @@ DESCRIPTION
   SCHEMA ................. T131SCH
   HBASE_SMALL_SCANNER .... SYSTEM
   GENERATE_EXPLAIN ....... ON
-  ObjectUIDs ............. 5307053393310820283
   select_list ............ TRAFODION.T131SCH.T1311KBIS.UNIQ,
                              TRAFODION.T131SCH.T1311KBIS.C1000,
                              TRAFODION.T131SCH.T1311KBIS.STR1

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/eece8702/core/sql/regress/executor/EXPECTED140
----------------------------------------------------------------------
diff --git a/core/sql/regress/executor/EXPECTED140 b/core/sql/regress/executor/EXPECTED140
index 423692c..1f2086f 100644
--- a/core/sql/regress/executor/EXPECTED140
+++ b/core/sql/regress/executor/EXPECTED140
@@ -155,14 +155,12 @@ Task:  COMPLETION      Status: Ended      Elapsed Time:    00:00:01.117
 
 ------------------------------------------------------------------ PLAN SUMMARY
 STATEMENT_NAME ........... NOT NAMED
-PLAN_ID .................. 212356315173074373
 STATEMENT ................ select a from t140 where b>500;
 
 
 ------------------------------------------------------------------ NODE LISTING
 ROOT ======================================  SEQ_NO 2        ONLY CHILD 1
 DESCRIPTION
-  est_memory_per_node .... 10240.00(Limit), 0.00(BMOs), 0.00(nBMOs) MB
   fragment_id ............ 0
   parent_frag ............ (none)
   fragment_type .......... master
@@ -181,7 +179,6 @@ DESCRIPTION
   SCHEMA ................. TRAFODION.SCH
   TRAF_ALIGNED_ROW_FORMAT  OFF
   GENERATE_EXPLAIN ....... ON
-  ObjectUIDs ............. 6364273405987054695
   select_list ............ TRAFODION.SCH.T140.A
 
 
@@ -220,14 +217,12 @@ A
 
 ------------------------------------------------------------------ PLAN SUMMARY
 STATEMENT_NAME ........... NOT NAMED
-PLAN_ID .................. 212356315173447116
 STATEMENT ................ select an from t140b where b<=200;
 
 
 ------------------------------------------------------------------ NODE LISTING
 ROOT ======================================  SEQ_NO 2        ONLY CHILD 1
 DESCRIPTION
-  est_memory_per_node .... 10240.00(Limit), 0.00(BMOs), 0.00(nBMOs) MB
   fragment_id ............ 0
   parent_frag ............ (none)
   fragment_type .......... master
@@ -246,7 +241,6 @@ DESCRIPTION
   SCHEMA ................. TRAFODION.SCH
   TRAF_ALIGNED_ROW_FORMAT  OFF
   GENERATE_EXPLAIN ....... ON
-  ObjectUIDs ............. 6364273405987055175
   select_list ............ TRAFODION.SCH.T140B.AN
 
 
@@ -272,14 +266,12 @@ DESCRIPTION
 
 ------------------------------------------------------------------ PLAN SUMMARY
 STATEMENT_NAME ........... NOT NAMED
-PLAN_ID .................. 212356315173646450
 STATEMENT ................ select an from t140 where b<=200;
 
 
 ------------------------------------------------------------------ NODE LISTING
 ROOT ======================================  SEQ_NO 2        ONLY CHILD 1
 DESCRIPTION
-  est_memory_per_node .... 10240.00(Limit), 0.00(BMOs), 0.00(nBMOs) MB
   fragment_id ............ 0
   parent_frag ............ (none)
   fragment_type .......... master
@@ -298,7 +290,6 @@ DESCRIPTION
   SCHEMA ................. TRAFODION.SCH
   TRAF_ALIGNED_ROW_FORMAT  OFF
   GENERATE_EXPLAIN ....... ON
-  ObjectUIDs ............. 6364273405987054695
   select_list ............ TRAFODION.SCH.T140.AN
 
 
@@ -335,14 +326,12 @@ AN
 
 ------------------------------------------------------------------ PLAN SUMMARY
 STATEMENT_NAME ........... NOT NAMED
-PLAN_ID .................. 212356315173857360
 STATEMENT ................ select an from t140 where b=200 and an is not null;
 
 
 ------------------------------------------------------------------ NODE LISTING
 ROOT ======================================  SEQ_NO 2        ONLY CHILD 1
 DESCRIPTION
-  est_memory_per_node .... 10240.00(Limit), 0.00(BMOs), 0.00(nBMOs) MB
   fragment_id ............ 0
   parent_frag ............ (none)
   fragment_type .......... master
@@ -361,7 +350,6 @@ DESCRIPTION
   SCHEMA ................. TRAFODION.SCH
   TRAF_ALIGNED_ROW_FORMAT  OFF
   GENERATE_EXPLAIN ....... ON
-  ObjectUIDs ............. 6364273405987054695
   select_list ............ TRAFODION.SCH.T140.AN
   input_variables ........ %(200)
 
@@ -396,14 +384,12 @@ AN
 
 ------------------------------------------------------------------ PLAN SUMMARY
 STATEMENT_NAME ........... NOT NAMED
-PLAN_ID .................. 212356315174057982
 STATEMENT ................ select an, a from t140 where b!=500;
 
 
 ------------------------------------------------------------------ NODE LISTING
 ROOT ======================================  SEQ_NO 2        ONLY CHILD 1
 DESCRIPTION
-  est_memory_per_node .... 10240.00(Limit), 0.00(BMOs), 0.00(nBMOs) MB
   fragment_id ............ 0
   parent_frag ............ (none)
   fragment_type .......... master
@@ -422,7 +408,6 @@ DESCRIPTION
   SCHEMA ................. TRAFODION.SCH
   TRAF_ALIGNED_ROW_FORMAT  OFF
   GENERATE_EXPLAIN ....... ON
-  ObjectUIDs ............. 6364273405987054695
   select_list ............ TRAFODION.SCH.T140.AN, TRAFODION.SCH.T140.A
 
 
@@ -493,14 +478,12 @@ AN
 
 ------------------------------------------------------------------ PLAN SUMMARY
 STATEMENT_NAME ........... NOT NAMED
-PLAN_ID .................. 212356315174338478
 STATEMENT ................ select an from t140 where bn=201 and an is not null;
 
 
 ------------------------------------------------------------------ NODE LISTING
 ROOT ======================================  SEQ_NO 2        ONLY CHILD 1
 DESCRIPTION
-  est_memory_per_node .... 10240.00(Limit), 0.00(BMOs), 0.00(nBMOs) MB
   fragment_id ............ 0
   parent_frag ............ (none)
   fragment_type .......... master
@@ -519,7 +502,6 @@ DESCRIPTION
   SCHEMA ................. TRAFODION.SCH
   TRAF_ALIGNED_ROW_FORMAT  OFF
   GENERATE_EXPLAIN ....... ON
-  ObjectUIDs ............. 6364273405987054695
   select_list ............ TRAFODION.SCH.T140.AN
   input_variables ........ %(201)
 
@@ -553,14 +535,12 @@ AN
 
 ------------------------------------------------------------------ PLAN SUMMARY
 STATEMENT_NAME ........... NOT NAMED
-PLAN_ID .................. 212356315174528713
 STATEMENT ................ select an, a from t140 where bn!=501;
 
 
 ------------------------------------------------------------------ NODE LISTING
 ROOT ======================================  SEQ_NO 2        ONLY CHILD 1
 DESCRIPTION
-  est_memory_per_node .... 10240.00(Limit), 0.00(BMOs), 0.00(nBMOs) MB
   fragment_id ............ 0
   parent_frag ............ (none)
   fragment_type .......... master
@@ -579,7 +559,6 @@ DESCRIPTION
   SCHEMA ................. TRAFODION.SCH
   TRAF_ALIGNED_ROW_FORMAT  OFF
   GENERATE_EXPLAIN ....... ON
-  ObjectUIDs ............. 6364273405987054695
   select_list ............ TRAFODION.SCH.T140.AN, TRAFODION.SCH.T140.A
 
 
@@ -665,14 +644,12 @@ A
 
 ------------------------------------------------------------------ PLAN SUMMARY
 STATEMENT_NAME ........... NOT NAMED
-PLAN_ID .................. 212356315174798695
 STATEMENT ................ select an from t140 where an between 20 and 40;
 
 
 ------------------------------------------------------------------ NODE LISTING
 ROOT ======================================  SEQ_NO 2        ONLY CHILD 1
 DESCRIPTION
-  est_memory_per_node .... 10240.00(Limit), 0.00(BMOs), 0.00(nBMOs) MB
   fragment_id ............ 0
   parent_frag ............ (none)
   fragment_type .......... master
@@ -691,7 +668,6 @@ DESCRIPTION
   SCHEMA ................. TRAFODION.SCH
   TRAF_ALIGNED_ROW_FORMAT  OFF
   GENERATE_EXPLAIN ....... ON
-  ObjectUIDs ............. 6364273405987054695
   select_list ............ TRAFODION.SCH.T140.AN
 
 
@@ -749,14 +725,12 @@ AN
 
 ------------------------------------------------------------------ PLAN SUMMARY
 STATEMENT_NAME ........... NOT NAMED
-PLAN_ID .................. 212356315175120583
 STATEMENT ................ select avg(a) from t140b;
 
 
 ------------------------------------------------------------------ NODE LISTING
 ROOT ======================================  SEQ_NO 3        ONLY CHILD 2
 DESCRIPTION
-  est_memory_per_node .... 10240.00(Limit), 0.00(BMOs), 0.00(nBMOs) MB
   fragment_id ............ 0
   parent_frag ............ (none)
   fragment_type .......... master
@@ -777,7 +751,6 @@ DESCRIPTION
   PARALLEL_NUM_ESPS ...... 1
   HBASE_DOP_PARALLEL_SCAN  2
   GENERATE_EXPLAIN ....... ON
-  ObjectUIDs ............. 6364273405987055175
   select_list ............ cast(cast((cast((cast((cast(sum(TRAFODION.SCH.T140B.
                              A)) * 10000 ...0)) / cast(count(1 )))) / 10000
                              ...0)))
@@ -823,14 +796,12 @@ DESCRIPTION
 
 ------------------------------------------------------------------ PLAN SUMMARY
 STATEMENT_NAME ........... NOT NAMED
-PLAN_ID .................. 212356315175459703
 STATEMENT ................ select avg(a) from t140b;
 
 
 ------------------------------------------------------------------ NODE LISTING
 ROOT ======================================  SEQ_NO 3        ONLY CHILD 2
 DESCRIPTION
-  est_memory_per_node .... 10240.00(Limit), 0.00(BMOs), 0.00(nBMOs) MB
   fragment_id ............ 0
   parent_frag ............ (none)
   fragment_type .......... master
@@ -851,7 +822,6 @@ DESCRIPTION
   PARALLEL_NUM_ESPS ...... 1
   HBASE_DOP_PARALLEL_SCAN  1
   GENERATE_EXPLAIN ....... ON
-  ObjectUIDs ............. 6364273405987055175
   select_list ............ cast(cast((cast((cast((cast(sum(TRAFODION.SCH.T140B.
                              A)) * 10000 ...0)) / cast(count(1 )))) / 10000
                              ...0)))
@@ -893,14 +863,12 @@ DESCRIPTION
 
 ------------------------------------------------------------------ PLAN SUMMARY
 STATEMENT_NAME ........... NOT NAMED
-PLAN_ID .................. 212356315175459703
 STATEMENT ................ select avg(a) from t140b;
 
 
 ------------------------------------------------------------------ NODE LISTING
 ROOT ======================================  SEQ_NO 3        ONLY CHILD 2
 DESCRIPTION
-  est_memory_per_node .... 10240.00(Limit), 0.00(BMOs), 0.00(nBMOs) MB
   fragment_id ............ 0
   parent_frag ............ (none)
   fragment_type .......... master
@@ -920,7 +888,6 @@ DESCRIPTION
   HBASE_SMALL_SCANNER .... OFF
   PARALLEL_NUM_ESPS ...... 1
   HBASE_DOP_PARALLEL_SCAN  1
-  ObjectUIDs ............. 6364273405987055175
   select_list ............ cast(cast((cast((cast((cast(sum(TRAFODION.SCH.T140B.
                              A)) * 10000 ...0)) / cast(count(1 )))) / 10000
                              ...0)))

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/eece8702/core/sql/regress/executor/FILTER131
----------------------------------------------------------------------
diff --git a/core/sql/regress/executor/FILTER131 b/core/sql/regress/executor/FILTER131
index 8b2a15e..35e6e66 100755
--- a/core/sql/regress/executor/FILTER131
+++ b/core/sql/regress/executor/FILTER131
@@ -25,5 +25,7 @@
 
 fil=$1
 sed "
+s/^\([ ]*PLAN_ID[ ]*[\.]*\) .*/\1 removed/g
+s/^\([ ]*est_memory_per_node[ ]*[\.]*\) .*/\1 removed/g
 " $fil
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/eece8702/core/sql/regress/executor/FILTER140
----------------------------------------------------------------------
diff --git a/core/sql/regress/executor/FILTER140 b/core/sql/regress/executor/FILTER140
index f396578..9f8187f 100755
--- a/core/sql/regress/executor/FILTER140
+++ b/core/sql/regress/executor/FILTER140
@@ -39,4 +39,6 @@ s/.*PREPARATION.*/removed/
 s/.*COMPLETION.*/removed/
 s/Time:.*/Time:@time@/
 s/VOLATILE_SCHEMA_MXID[0-9]*/VOLATILE_SCHEMA_00/
+s/^\([ ]*PLAN_ID[ ]*[\.]*\) .*/\1 removed/g
+s/^\([ ]*est_memory_per_node[ ]*[\.]*\) .*/\1 removed/g
 " $fil

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/eece8702/core/sql/regress/hive/EXPECTED009
----------------------------------------------------------------------
diff --git a/core/sql/regress/hive/EXPECTED009 b/core/sql/regress/hive/EXPECTED009
index 60607af..92af6e4 100644
--- a/core/sql/regress/hive/EXPECTED009
+++ b/core/sql/regress/hive/EXPECTED009
@@ -479,8 +479,6 @@ A            B            C            D
           1            9           12         1936
 
 --- 10 row(s) selected.
--- Definition current  Wed Mar 15 05:30:03 2017
--- Definition current  Wed Mar 15 05:30:05 2017
 >>
 >>obey TEST009(test_hbase);
 >>select count(*) from hbase."_ROW_"."baseball";
@@ -618,7 +616,7 @@ ROW_ID      COLS
 ------------------------------------------------------------------ PLAN SUMMARY
 MODULE_NAME ............ ###
 STATEMENT_NAME ........... S
-PLAN_ID .................. 212356315820604834
+PLAN_ID ................ 212356315820604834
 ROWS_OUT ............... ###
 EST_TOTAL_COST ......... ###
 STATEMENT ................ select * from store_sales where ss_item_sk = 1;
@@ -632,11 +630,13 @@ EST_OPER_COST .......... ###
 EST_TOTAL_COST ......... ###
 DESCRIPTION
   est_memory_per_node .... 10240.00(Limit), 0.00(BMOs), 0.00(nBMOs) MB
+  max_card_est ......... ###
   fragment_id ............ 0
   parent_frag ............ (none)
   fragment_type .......... master
   affinity_value ....... ###
   max_max_cardinality    ###
+  total_overflow_size    ###
   xn_access_mode ......... read_only
   xn_autoabort_interval  ###
   auto_query_retry ....... enabled
@@ -672,7 +672,6 @@ DESCRIPTION
   input_variables ........ %(1)
 
 
-  est_memory_per_node .... 29.297 KB
 HIVE_SCAN =================================  SEQ_NO 1        NO CHILDREN
 TABLE_NAME ............... HIVE.HIVE.STORE_SALES
 REQUESTS_IN ............ ###
@@ -745,8 +744,6 @@ LC   RC   OP   OPERATOR              OPT       DESCRIPTION           CARD
 
 ------------------------------------------------------------------ PLAN SUMMARY
 STATEMENT_NAME ........... S
-PLAN_ID .................. 212356315822978424
-EST_TOTAL_COST ...... 28,735.03
 STATEMENT ................ select *
                            from customer, store_sales
                            where store_sales.ss_item_sk =
@@ -756,9 +753,7 @@ MUST_MATCH ............... forced nested join(forced scan, forced scan)
 
 ------------------------------------------------------------------ NODE LISTING
 ROOT ======================================  SEQ_NO 4        ONLY CHILD 3
-EST_TOTAL_COST ...... 28,735.03
 DESCRIPTION
-  est_memory_per_node .... 10240.00(Limit), 0.00(BMOs), 0.00(nBMOs) MB
   fragment_id ............ 0
   parent_frag ............ (none)
   fragment_type .......... master
@@ -813,7 +808,6 @@ DESCRIPTION
 
 
 NESTED_JOIN ===============================  SEQ_NO 3        CHILDREN 1, 2
-EST_TOTAL_COST ...... 28,735.03
 DESCRIPTION
   fragment_id ............ 0
   parent_frag ............ (none)
@@ -824,8 +818,6 @@ DESCRIPTION
 
 HIVE_SCAN =================================  SEQ_NO 2        NO CHILDREN
 TABLE_NAME ............... HIVE.HIVE.STORE_SALES
-EST_OPER_COST ....... 28,734.5
-EST_TOTAL_COST ...... 28,734.5
 DESCRIPTION
   fragment_id ............ 0
   parent_frag ............ (none)
@@ -1069,7 +1061,7 @@ CREATE EXTERNAL TABLE DATE_DIM
 ------------------------------------------------------------------ PLAN SUMMARY
 MODULE_NAME ............ ###
 STATEMENT_NAME ........... S
-PLAN_ID .................. 212356315833683208
+PLAN_ID ................ 212356315833683208
 ROWS_OUT ............... ###
 EST_TOTAL_COST ......... ###
 STATEMENT ................ select *
@@ -1085,11 +1077,13 @@ EST_OPER_COST .......... ###
 EST_TOTAL_COST ......... ###
 DESCRIPTION
   est_memory_per_node .... 10240.00(Limit), 0.00(BMOs), 0.00(nBMOs) MB
+  max_card_est ......... ###
   fragment_id ............ 0
   parent_frag ............ (none)
   fragment_type .......... master
   affinity_value ....... ###
   max_max_cardinality    ###
+  total_overflow_size    ###
   xn_access_mode ......... read_only
   xn_autoabort_interval  ###
   auto_query_retry ....... enabled
@@ -1126,7 +1120,6 @@ DESCRIPTION
   input_variables ........ %(2016-01-27)
 
 
-  est_memory_per_node .... 35.400 KB
 HIVE_SCAN =================================  SEQ_NO 1        NO CHILDREN
 TABLE_NAME ............... HIVE.HIVE.DATE_DIM
 REQUESTS_IN ............ ###
@@ -1300,7 +1293,6 @@ CREATE EXTERNAL TABLE DATE_DIM
 
 ------------------------------------------------------------------ PLAN SUMMARY
 STATEMENT_NAME ........... S
-PLAN_ID .................. 212356315851245875
 STATEMENT ................ select *
                            from hive.hive.date_dim
                            where d_date = date '2016-01-27';
@@ -1309,7 +1301,6 @@ STATEMENT ................ select *
 ------------------------------------------------------------------ NODE LISTING
 ROOT ======================================  SEQ_NO 2        ONLY CHILD 1
 DESCRIPTION
-  est_memory_per_node .... 10240.00(Limit), 0.00(BMOs), 0.00(nBMOs) MB
   fragment_id ............ 0
   parent_frag ............ (none)
   fragment_type .......... master
@@ -1347,7 +1338,6 @@ DESCRIPTION
   input_variables ........ %(2016-01-27)
 
 
-  est_memory_per_node .... 35.400 KB
 HIVE_SCAN =================================  SEQ_NO 1        NO CHILDREN
 TABLE_NAME ............... HIVE.HIVE.DATE_DIM
 DESCRIPTION

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/eece8702/core/sql/regress/seabase/EXPECTED011
----------------------------------------------------------------------
diff --git a/core/sql/regress/seabase/EXPECTED011 b/core/sql/regress/seabase/EXPECTED011
index 626784b..6554d26 100644
--- a/core/sql/regress/seabase/EXPECTED011
+++ b/core/sql/regress/seabase/EXPECTED011
@@ -2078,12 +2078,6 @@ LC   RC   OP   OPERATOR              OPT       DESCRIPTION           CARD
 
 --- SQL operation complete.
 >>
-PLAN_ID .................. 212356313965892034
-  est_memory_per_node .... 10240.00(Limit), 0.00(BMOs), 0.00(nBMOs) MB
-  ObjectUIDs ............. 8107166460522328383, 8107166460522328813
-PLAN_ID .................. 212356313967422361
-  est_memory_per_node .... 10240.00(Limit), 0.00(BMOs), 0.00(nBMOs) MB
-  ObjectUIDs ............. 8107166460522329555, 8107166460522329995
 >>
 >>
 >>

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/eece8702/core/sql/regress/tools/regress-filter-linux
----------------------------------------------------------------------
diff --git a/core/sql/regress/tools/regress-filter-linux b/core/sql/regress/tools/regress-filter-linux
index 940370d..2e1ae49 100755
--- a/core/sql/regress/tools/regress-filter-linux
+++ b/core/sql/regress/tools/regress-filter-linux
@@ -434,6 +434,8 @@ s/^\([ ]*HBASE_FILTER_PREDS[ ]*\) .*/\1 removed/g
 
 # For ObjectUIDs , which are now included in EXPLAIN.
 s/^ ObjectUIDs \.\.\.\.\.\.\.\.\.\.\.\.\. [0-9,]*$/  ObjectUIDs filtered/g
+s/^\([ ]*PLAN_ID[ ]*[\.]*\) .*/\1 removed/g
+s/^\([ ]*est_memory_per_node[ ]*[\.]*\) .*/\1 removed/g
 
 # Query IDs
 s/qid MXID11.*$/qid filtered/g