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

[05/15] incubator-trafodion git commit: Following changes are done in BMO memory quota

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/00e3b874/core/sql/optimizer/RelExpr.h
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/RelExpr.h b/core/sql/optimizer/RelExpr.h
index 1b9fad9..da265a4 100644
--- a/core/sql/optimizer/RelExpr.h
+++ b/core/sql/optimizer/RelExpr.h
@@ -293,22 +293,19 @@ public:
   // change literals in cacheable query's kids into ConstantParameters
   void normalizeKidsForCache(CacheWA& cachewa, BindWA& bindWA);
 
-  // How much memory do we expect this operator's executor to be able to use? 
-  // The method takes into consideration the memory needed by ODBC.
-  Lng32 getExeMemoryAvailable(NABoolean inMaster, Lng32 BMOsMemoryLimit) const;
-
   // How much memory do we expect this operator's executor to be able to use 
   // per ESP/master fragment ?
   Lng32 getExeMemoryAvailable(NABoolean inMaster) const;
 
   // compute the memory quota 
   double computeMemoryQuota(NABoolean inMaster,
-                            NABoolean perCPU,
+                            NABoolean perNode,
                             double BMOsMemoryLimit,
                             UInt16 totalNumBMOs,
                             double totalBMOsMemoryUsage,
                             UInt16 numBMOsPerFragment,
-                            double BMOsMemoryUsagePerFragment
+                            double BMOMemoryUsage,
+                            Lng32  numStreams
                            );
 
  
@@ -1296,11 +1293,12 @@ public:
   // ---------------------------------------------------------------------
   virtual NABoolean isBigMemoryOperator(const PlanWorkSpace* pws,
                                         const Lng32 planNumber);
+/*
+  virtual CostScalar getEstimatedRunTimeMemoryUsageInMB(NABoolean perNode) 
+      { return getEstimatedRunTimeMemoryUsage(perNode) / (1024*1024); }
+*/
 
-  virtual CostScalar getEstimatedRunTimeMemoryUsageInMB(NABoolean perCPU) 
-      { return getEstimatedRunTimeMemoryUsage(perCPU) / (1024*1024); }
-
-  virtual CostScalar getEstimatedRunTimeMemoryUsage(NABoolean perCPU) {return 0;}
+  virtual CostScalar getEstimatedRunTimeMemoryUsage(NABoolean perNode, Lng32 *numStreams = NULL) {return 0;}
   virtual double getEstimatedRunTimeMemoryUsage(ComTdb * tdb) {return 0;}
 
   inline NABoolean isinBlockStmt() const

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/00e3b874/core/sql/optimizer/RelGrby.h
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/RelGrby.h b/core/sql/optimizer/RelGrby.h
index 8f4c21b..f6089b9 100644
--- a/core/sql/optimizer/RelGrby.h
+++ b/core/sql/optimizer/RelGrby.h
@@ -826,7 +826,7 @@ public:
   virtual NABoolean isBigMemoryOperator(const PlanWorkSpace* pws,
                                         const Lng32 planNumber);
 
-  virtual CostScalar getEstimatedRunTimeMemoryUsage(NABoolean perCPU);
+  virtual CostScalar getEstimatedRunTimeMemoryUsage(NABoolean perNode, Lng32 *numStreams = NULL);
   virtual double getEstimatedRunTimeMemoryUsage(ComTdb * tdb);
 
   virtual double getEstimatedRunTimeOverflowSize(double memoryQuotaMB);

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/00e3b874/core/sql/optimizer/RelJoin.h
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/RelJoin.h b/core/sql/optimizer/RelJoin.h
index 38c43c4..5495960 100644
--- a/core/sql/optimizer/RelJoin.h
+++ b/core/sql/optimizer/RelJoin.h
@@ -1641,7 +1641,7 @@ public:
   virtual NABoolean isBigMemoryOperator(const PlanWorkSpace* pws,
                                         const Lng32 planNumber);
 
-  virtual CostScalar getEstimatedRunTimeMemoryUsage(NABoolean perCPU);
+  virtual CostScalar getEstimatedRunTimeMemoryUsage(NABoolean perNode, Lng32 *numStreams = NULL);
   virtual double getEstimatedRunTimeMemoryUsage(ComTdb * tdb);
 
   virtual double getEstimatedRunTimeOverflowSize(double memoryQuotaMB);

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/00e3b874/core/sql/optimizer/RelProbeCache.h
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/RelProbeCache.h b/core/sql/optimizer/RelProbeCache.h
index 38b234f..bc79a3d 100644
--- a/core/sql/optimizer/RelProbeCache.h
+++ b/core/sql/optimizer/RelProbeCache.h
@@ -74,7 +74,7 @@ public:
 
   virtual short codeGen(Generator *g);
 
-  virtual CostScalar getEstimatedRunTimeMemoryUsage(NABoolean perCPU);
+  virtual CostScalar getEstimatedRunTimeMemoryUsage(NABoolean perNode, Lng32 *numStreams = NULL);
   virtual double getEstimatedRunTimeMemoryUsage(ComTdb * tdb);
 
   virtual const NAString getText() const;

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/00e3b874/core/sql/optimizer/RelSequence.h
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/RelSequence.h b/core/sql/optimizer/RelSequence.h
index 44dd9aa..8fc09b5 100644
--- a/core/sql/optimizer/RelSequence.h
+++ b/core/sql/optimizer/RelSequence.h
@@ -434,7 +434,7 @@ public:
   virtual NABoolean isBigMemoryOperator(const Context* context,
                                         const Lng32 planNumber);
 
-  virtual CostScalar getEstimatedRunTimeMemoryUsage(NABoolean perCPU);
+  virtual CostScalar getEstimatedRunTimeMemoryUsage(NABoolean perNode, Lng32 *numStreams = NULL);
   virtual double getEstimatedRunTimeMemoryUsage(ComTdb * tdb);
 
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/00e3b874/core/sql/regress/executor/EXPECTED107
----------------------------------------------------------------------
diff --git a/core/sql/regress/executor/EXPECTED107 b/core/sql/regress/executor/EXPECTED107
index 20272d9..77c8306 100644
--- a/core/sql/regress/executor/EXPECTED107
+++ b/core/sql/regress/executor/EXPECTED107
@@ -147,6 +147,14 @@ C100K
       99994
 
 --- 1 row(s) selected.
+>>execute xx;
+
+C100K      
+-----------
+
+      99994
+
+--- 1 row(s) selected.
 >>
 >>-- Test #1A: uses TOPN sort
 >>prepare xx from SELECT [first 10] c100k from t107100k order by c100k;
@@ -169,6 +177,23 @@ C100K
          14
 
 --- 10 row(s) selected.
+>>execute xx;
+
+C100K      
+-----------
+
+          0
+          1
+          2
+          3
+          4
+         10
+         11
+         12
+         13
+         14
+
+--- 10 row(s) selected.
 >>
 >>-- Test#1B: negetive test, zero records to sort.
 >>prepare xx from SELECT c100k from t107100k where c100k < 0 order by c100k;
@@ -177,6 +202,9 @@ C100K
 >>execute xx;
 
 --- 0 row(s) selected.
+>>execute xx;
+
+--- 0 row(s) selected.
 >>
 >>-- Test#1C: negetive test, zero records to sort, TOPN
 >>prepare xx from SELECT [first 10] c100k from t107100k where c100k < 0 order by c100k;
@@ -185,6 +213,9 @@ C100K
 >>execute xx;
 
 --- 0 row(s) selected.
+>>execute xx;
+
+--- 0 row(s) selected.
 >>
 >>-- Test #2: SQL buffer overflow, overflow and merge
 >>set envvar SCRATCH_IO_PENDING 280;
@@ -204,6 +235,14 @@ C100K        STR1
       99994  xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
                          
 
 --- 1 row(s) selected.
+>>execute xx;
+
+C100K        STR1
+-----------  ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 -------------------------
+
+      99994  xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
                          
+
+--- 1 row(s) selected.
 >>
 >>-- Test #2a: sortRecLen > 512kb scratchIOBlock, overflow.
 >>cqd GEN_SORT_MAX_NUM_BUFFERS  '1';
@@ -268,6 +307,14 @@ C100K        STR1
       99994  xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
                          
 
 --- 1 row(s) selected.
+>>execute xx;
+
+C100K        STR1
+-----------  ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 -------------------------
+
+      99994  xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      
                          
+
+--- 1 row(s) selected.
 >>
 >>#ifLINUX
 >>obey TEST107(cif_dml);

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/00e3b874/core/sql/regress/executor/EXPECTED131
----------------------------------------------------------------------
diff --git a/core/sql/regress/executor/EXPECTED131 b/core/sql/regress/executor/EXPECTED131
index f5309b9..f9937ba 100644
--- a/core/sql/regress/executor/EXPECTED131
+++ b/core/sql/regress/executor/EXPECTED131
@@ -70,12 +70,14 @@
 
 ------------------------------------------------------------------ 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
@@ -87,6 +89,7 @@ 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
@@ -113,12 +116,14 @@ 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
@@ -130,6 +135,7 @@ 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
@@ -268,12 +274,14 @@ 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
@@ -285,6 +293,7 @@ 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
@@ -311,12 +320,14 @@ 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
@@ -328,6 +339,7 @@ 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/00e3b874/core/sql/regress/executor/EXPECTED140
----------------------------------------------------------------------
diff --git a/core/sql/regress/executor/EXPECTED140 b/core/sql/regress/executor/EXPECTED140
index e3fec24..423692c 100644
--- a/core/sql/regress/executor/EXPECTED140
+++ b/core/sql/regress/executor/EXPECTED140
@@ -124,18 +124,18 @@
 +>  , SS_NET_PROFIT     
 +>from hive.hive.store_sales where ss_sold_date_sk is not null;
 Task:  LOAD            Status: Started    Object: TRAFODION.SCH.T140C
-Task:  CLEANUP         Status: Started    Time: 2017-07-12 21:31:50.149
-Task:  CLEANUP         Status: Ended      Time: 2017-07-12 21:31:50.167
-Task:  CLEANUP         Status: Ended      Elapsed Time:    00:00:00.019
-Task:  LOADING DATA    Status: Started    Time: 2017-07-12 21:31:50.167
+Task:  CLEANUP         Status: Started    Time: 2017-03-15 05:17:16.759
+Task:  CLEANUP         Status: Ended      Time: 2017-03-15 05:17:16.781
+Task:  CLEANUP         Status: Ended      Elapsed Time:    00:00:00.022
+Task:  LOADING DATA    Status: Started    Time: 2017-03-15 05:17:16.781
        Rows Processed: 2750311 
        Error Rows:     0 
-Task:  LOADING DATA    Status: Ended      Time: 2017-07-12 21:32:23.296
-Task:  LOADING DATA    Status: Ended      Elapsed Time:    00:00:33.128
-Task:  COMPLETION      Status: Started    Time: 2017-07-12 21:32:23.296
+Task:  LOADING DATA    Status: Ended      Time: 2017-03-15 05:18:33.540
+Task:  LOADING DATA    Status: Ended      Elapsed Time:    00:01:16.759
+Task:  COMPLETION      Status: Started    Time: 2017-03-15 05:18:33.540
        Rows Loaded:    2750311 
-Task:  COMPLETION      Status: Ended      Time: 2017-07-12 21:32:24.240
-Task:  COMPLETION      Status: Ended      Elapsed Time:    00:00:00.728
+Task:  COMPLETION      Status: Ended      Time: 2017-03-15 05:18:34.657
+Task:  COMPLETION      Status: Ended      Elapsed Time:    00:00:01.117
 
 --- 2750311 row(s) loaded.
 >>update statistics for table t140c on every column sample;
@@ -155,12 +155,14 @@ Task:  COMPLETION      Status: Ended      Elapsed Time:    00:00:00.728
 
 ------------------------------------------------------------------ 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
@@ -179,6 +181,7 @@ DESCRIPTION
   SCHEMA ................. TRAFODION.SCH
   TRAF_ALIGNED_ROW_FORMAT  OFF
   GENERATE_EXPLAIN ....... ON
+  ObjectUIDs ............. 6364273405987054695
   select_list ............ TRAFODION.SCH.T140.A
 
 
@@ -217,12 +220,14 @@ 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
@@ -241,6 +246,7 @@ DESCRIPTION
   SCHEMA ................. TRAFODION.SCH
   TRAF_ALIGNED_ROW_FORMAT  OFF
   GENERATE_EXPLAIN ....... ON
+  ObjectUIDs ............. 6364273405987055175
   select_list ............ TRAFODION.SCH.T140B.AN
 
 
@@ -266,12 +272,14 @@ 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
@@ -290,6 +298,7 @@ DESCRIPTION
   SCHEMA ................. TRAFODION.SCH
   TRAF_ALIGNED_ROW_FORMAT  OFF
   GENERATE_EXPLAIN ....... ON
+  ObjectUIDs ............. 6364273405987054695
   select_list ............ TRAFODION.SCH.T140.AN
 
 
@@ -326,12 +335,14 @@ 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
@@ -350,6 +361,7 @@ DESCRIPTION
   SCHEMA ................. TRAFODION.SCH
   TRAF_ALIGNED_ROW_FORMAT  OFF
   GENERATE_EXPLAIN ....... ON
+  ObjectUIDs ............. 6364273405987054695
   select_list ............ TRAFODION.SCH.T140.AN
   input_variables ........ %(200)
 
@@ -384,12 +396,14 @@ 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
@@ -408,6 +422,7 @@ DESCRIPTION
   SCHEMA ................. TRAFODION.SCH
   TRAF_ALIGNED_ROW_FORMAT  OFF
   GENERATE_EXPLAIN ....... ON
+  ObjectUIDs ............. 6364273405987054695
   select_list ............ TRAFODION.SCH.T140.AN, TRAFODION.SCH.T140.A
 
 
@@ -478,12 +493,14 @@ 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
@@ -502,6 +519,7 @@ DESCRIPTION
   SCHEMA ................. TRAFODION.SCH
   TRAF_ALIGNED_ROW_FORMAT  OFF
   GENERATE_EXPLAIN ....... ON
+  ObjectUIDs ............. 6364273405987054695
   select_list ............ TRAFODION.SCH.T140.AN
   input_variables ........ %(201)
 
@@ -535,12 +553,14 @@ 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
@@ -559,6 +579,7 @@ DESCRIPTION
   SCHEMA ................. TRAFODION.SCH
   TRAF_ALIGNED_ROW_FORMAT  OFF
   GENERATE_EXPLAIN ....... ON
+  ObjectUIDs ............. 6364273405987054695
   select_list ............ TRAFODION.SCH.T140.AN, TRAFODION.SCH.T140.A
 
 
@@ -644,12 +665,14 @@ 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
@@ -668,6 +691,7 @@ DESCRIPTION
   SCHEMA ................. TRAFODION.SCH
   TRAF_ALIGNED_ROW_FORMAT  OFF
   GENERATE_EXPLAIN ....... ON
+  ObjectUIDs ............. 6364273405987054695
   select_list ............ TRAFODION.SCH.T140.AN
 
 
@@ -725,12 +749,14 @@ 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
@@ -751,6 +777,7 @@ 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)))
@@ -796,12 +823,14 @@ 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
@@ -822,6 +851,7 @@ 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)))
@@ -863,12 +893,14 @@ 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
@@ -888,6 +920,7 @@ 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/00e3b874/core/sql/regress/executor/TEST107
----------------------------------------------------------------------
diff --git a/core/sql/regress/executor/TEST107 b/core/sql/regress/executor/TEST107
index ffc4f75..249f351 100644
--- a/core/sql/regress/executor/TEST107
+++ b/core/sql/regress/executor/TEST107
@@ -160,24 +160,29 @@ insert into t107t3 values(1,'a','b','c','d','e','f'), (2,'a','b','c','d','e','f'
 -- Test #1: In memory sort ,double & copy
 prepare xx from SELECT [last 1] c100k from t107100k order by c100k;
 execute xx;
+execute xx;
 
 -- Test #1A: uses TOPN sort
 prepare xx from SELECT [first 10] c100k from t107100k order by c100k;
 execute xx;
+execute xx;
 
 -- Test#1B: negetive test, zero records to sort.
 prepare xx from SELECT c100k from t107100k where c100k < 0 order by c100k;
 execute xx;
+execute xx;
 
 -- Test#1C: negetive test, zero records to sort, TOPN
 prepare xx from SELECT [first 10] c100k from t107100k where c100k < 0 order by c100k;
 execute xx;
+execute xx;
 
 -- Test #2: SQL buffer overflow, overflow and merge
 set envvar SCRATCH_IO_PENDING 280;
 control query default GEN_SORT_MAX_NUM_BUFFERS  '1';
 prepare xx from SELECT [last 1] c100k, str1 from t107100k order by 1,2;
 execute xx;
+execute xx;
 
 -- Test #2a: sortRecLen > 512kb scratchIOBlock, overflow.
 cqd GEN_SORT_MAX_NUM_BUFFERS  '1';
@@ -201,6 +206,7 @@ control query default GEN_SORT_MAX_NUM_BUFFERS  '1';
 control query default SORT_MAX_HEAP_SIZE_MB    '1';
 prepare xx from SELECT [last 1] c100k, str1 from t107100k order by 1,2;
 execute xx;
+execute xx;
 
 ?section dml1
 -------------

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/00e3b874/core/sql/regress/hive/EXPECTED009
----------------------------------------------------------------------
diff --git a/core/sql/regress/hive/EXPECTED009 b/core/sql/regress/hive/EXPECTED009
index e318532..79eaf00 100644
--- a/core/sql/regress/hive/EXPECTED009
+++ b/core/sql/regress/hive/EXPECTED009
@@ -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  Wed Mar 15 05:29:50 2017
 
   (
     A                                INT
@@ -479,6 +479,8 @@ 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";
@@ -572,7 +574,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  Wed Mar 15 05:30:20 2017
 
   (
     SS_SOLD_DATE_SK                  INT
@@ -616,7 +618,7 @@ ROW_ID      COLS
 ------------------------------------------------------------------ PLAN SUMMARY
 MODULE_NAME ............ ###
 STATEMENT_NAME ........... S
-PLAN_ID ................ ###
+PLAN_ID .................. 212356315820604834
 ROWS_OUT ............... ###
 EST_TOTAL_COST ......... ###
 STATEMENT ................ select * from store_sales where ss_item_sk = 1;
@@ -629,14 +631,13 @@ ROWS_OUT ............... ###
 EST_OPER_COST .......... ###
 EST_TOTAL_COST ......... ###
 DESCRIPTION
-  max_card_est ......... ###
+  est_memory_per_node .... 10240.00(Limit), 0.00(BMOs), 0.00(nBMOs) MB
   fragment_id ............ 0
   parent_frag ............ (none)
   fragment_type .......... master
   statement_index ...... ###
   affinity_value ....... ###
   max_max_cardinality    ###
-  total_overflow_size    ###
   xn_access_mode ......... read_only
   xn_autoabort_interval  ###
   auto_query_retry ....... enabled
@@ -672,6 +673,7 @@ 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 ............ ###
@@ -744,6 +746,8 @@ 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 =
@@ -753,7 +757,9 @@ 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
@@ -808,6 +814,7 @@ DESCRIPTION
 
 
 NESTED_JOIN ===============================  SEQ_NO 3        CHILDREN 1, 2
+EST_TOTAL_COST ...... 28,735.03
 DESCRIPTION
   fragment_id ............ 0
   parent_frag ............ (none)
@@ -818,6 +825,8 @@ 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)
@@ -917,7 +926,7 @@ DESCRIPTION
 >>invoke hive.hive.date_dim;
 
 -- Definition of hive table DATE_DIM
--- Definition current  Wed Jul 12 21:39:40 2017
+-- Definition current  Wed Mar 15 05:30:28 2017
 
   (
     D_DATE_SK                        INT
@@ -1061,7 +1070,7 @@ CREATE EXTERNAL TABLE DATE_DIM
 ------------------------------------------------------------------ PLAN SUMMARY
 MODULE_NAME ............ ###
 STATEMENT_NAME ........... S
-PLAN_ID ................ ###
+PLAN_ID .................. 212356315833683208
 ROWS_OUT ............... ###
 EST_TOTAL_COST ......... ###
 STATEMENT ................ select *
@@ -1076,14 +1085,13 @@ ROWS_OUT ............... ###
 EST_OPER_COST .......... ###
 EST_TOTAL_COST ......... ###
 DESCRIPTION
-  max_card_est ......... ###
+  est_memory_per_node .... 10240.00(Limit), 0.00(BMOs), 0.00(nBMOs) MB
   fragment_id ............ 0
   parent_frag ............ (none)
   fragment_type .......... master
   statement_index ...... ###
   affinity_value ....... ###
   max_max_cardinality    ###
-  total_overflow_size    ###
   xn_access_mode ......... read_only
   xn_autoabort_interval  ###
   auto_query_retry ....... enabled
@@ -1120,6 +1128,7 @@ 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 ............ ###
@@ -1152,7 +1161,7 @@ DESCRIPTION
 >>invoke hive.hive.date_dim;
 
 -- Definition of hive table DATE_DIM
--- Definition current  Wed Jul 12 21:39:56 2017
+-- Definition current  Wed Mar 15 05:30:46 2017
 
   (
     D_DATE_SK                        INT
@@ -1295,6 +1304,7 @@ 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';
@@ -1303,6 +1313,7 @@ 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
@@ -1340,6 +1351,7 @@ 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