trafodion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From se...@apache.org
Subject [1/6] incubator-trafodion git commit: [TRAFODION-2420] RMS enhancements
Date Tue, 11 Apr 2017 19:48:47 GMT
Repository: incubator-trafodion
Updated Branches:
  refs/heads/master aa47bdd90 -> dc022cc3f


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0c102904/core/sql/regress/core/FILTERRTS
----------------------------------------------------------------------
diff --git a/core/sql/regress/core/FILTERRTS b/core/sql/regress/core/FILTERRTS
index 69fe492..c8c0203 100755
--- a/core/sql/regress/core/FILTERRTS
+++ b/core/sql/regress/core/FILTERRTS
@@ -6,7 +6,7 @@ if [ "$fil" = "" ]; then
   exit 1
 fi
 sed  "
-/SE IOs  SE IO Bytes/{N
+/SE_IOs  SE_IO_Bytes/{N
 s/[A-Z0-9 ,-]*\.[A-Z0-9]*\.TSTAT/#CAT.#SCH.TSTAT pertableStats/
 }
 /6       EX_HASH_GRBY/{N

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0c102904/core/sql/regress/seabase/EXPECTED016
----------------------------------------------------------------------
diff --git a/core/sql/regress/seabase/EXPECTED016 b/core/sql/regress/seabase/EXPECTED016
index 92cd378..ca81ae2 100644
--- a/core/sql/regress/seabase/EXPECTED016
+++ b/core/sql/regress/seabase/EXPECTED016
@@ -291,7 +291,7 @@ DESCRIPTION
   fragment_type .......... esp
   scan_type .............. subset scan of table TRAFODION.HBASE.MCSTATPART7
   object_type ............ Trafodion
-  cache_size ........ 10,000
+  cache_size ......... 1,024
   cache_blocks ........... OFF
   probes ................. 1
   rows_accessed .......... 1e+09
@@ -437,7 +437,7 @@ DESCRIPTION
   fragment_type .......... esp
   scan_type .............. subset scan of table TRAFODION.HBASE.MCSTATPART5
   object_type ............ Trafodion
-  cache_size ........ 10,000
+  cache_size ......... 1,024
   cache_blocks ........... OFF
   probes ................. 1
   rows_accessed .......... 1e+09
@@ -583,7 +583,7 @@ DESCRIPTION
   fragment_type .......... esp
   scan_type .............. subset scan of table TRAFODION.HBASE.MCSTATPART3
   object_type ............ Trafodion
-  cache_size ........ 10,000
+  cache_size ......... 1,024
   cache_blocks ........... OFF
   probes ................. 1
   rows_accessed .......... 1e+09
@@ -729,7 +729,7 @@ DESCRIPTION
   fragment_type .......... esp
   scan_type .............. subset scan of table TRAFODION.HBASE.MCSTATPART6
   object_type ............ Trafodion
-  cache_size ........ 10,000
+  cache_size ......... 1,024
   cache_blocks ........... OFF
   probes ................. 1
   rows_accessed .......... 1e+09
@@ -875,7 +875,7 @@ DESCRIPTION
   fragment_type .......... esp
   scan_type .............. subset scan of table TRAFODION.HBASE.MCSTATPART2
   object_type ............ Trafodion
-  cache_size ........ 10,000
+  cache_size ......... 1,024
   cache_blocks ........... OFF
   probes ................. 1
   rows_accessed .......... 1e+09
@@ -1021,7 +1021,7 @@ DESCRIPTION
   fragment_type .......... esp
   scan_type .............. subset scan of table TRAFODION.HBASE.MCSTATPART1
   object_type ............ Trafodion
-  cache_size ........ 10,000
+  cache_size ......... 1,024
   cache_blocks ........... OFF
   probes ................. 1
   rows_accessed .......... 1e+09
@@ -1167,7 +1167,7 @@ DESCRIPTION
   fragment_type .......... esp
   scan_type .............. subset scan of table TRAFODION.HBASE.MCSTATPART8
   object_type ............ Trafodion
-  cache_size ........ 10,000
+  cache_size ......... 1,024
   cache_blocks ........... OFF
   probes ................. 1
   rows_accessed .......... 1e+09

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0c102904/core/sql/sort/ScratchSpace.cpp
----------------------------------------------------------------------
diff --git a/core/sql/sort/ScratchSpace.cpp b/core/sql/sort/ScratchSpace.cpp
index 560a7b0..c3c41b0 100644
--- a/core/sql/sort/ScratchSpace.cpp
+++ b/core/sql/sort/ScratchSpace.cpp
@@ -81,10 +81,10 @@
 
 ScratchSpace::ScratchSpace(CollHeap* heap, SortError* sorterror, 
                            Lng32 blocksize,
+                           Int32 scratchIOVectorSize,
                            Int32 explainNodeId, 
 			   NABoolean logInfoEvent,
-                         Int32 scratchMgmtOption):
-			
+                           Int32 scratchMgmtOption): 
 sortError_(sorterror),
 heap_(heap),
 explainNodeId_(explainNodeId),
@@ -130,7 +130,7 @@ scratchMgmtOption_(scratchMgmtOption)
     asyncReadQueue_ = FALSE;
     scratchMaxOpens_ = 1;
     bmoStats_ = NULL;
-    scratchIOVectorSize_ = 1;
+    scratchIOVectorSize_ = scratchIOVectorSize;
     ovMode_ = SCRATCH_DISK;
 } 
 
@@ -158,6 +158,8 @@ void ScratchSpace::setCallingTcb(ex_tcb *tcb)
     if (stat)
       bmoStats_ = stat->castToExBMOStats();
   }
+  if (bmoStats_ != NULL)
+     bmoStats_->setScratchIOSize((scratchIOVectorSize_ * blockSize_) >> 10);
 }
   
 //-----------------------------------------------------------------------
@@ -1234,11 +1236,13 @@ SortScratchSpace::SortScratchSpace(CollHeap* heap,
                          SortError* error,
                          Int32 explainNodeId,
                          Int32 scratchIOBlockSize,
+                         Int32 scratchIOVectorSize,
                          NABoolean logInfoEvent,
                          Int32 scratchMgmtOption)
                          :ScratchSpace(heap,
                                    error,
                                    scratchIOBlockSize,
+                                   scratchIOVectorSize,
                                    explainNodeId,
                                    logInfoEvent,
                                    scratchMgmtOption)
@@ -1809,14 +1813,16 @@ HashScratchSpace::HashScratchSpace(CollHeap* heap,
                           SortError* error,
                           Int32 explainNodeId,
                           Int32 blockSize,
+                          Int32 scratchIOVectorSize,
                           NABoolean logInfoEvent,
                           Int32 scratchMgmtOption)
                           :ScratchSpace(heap,
                                     error,
                                     blockSize,
+                                    scratchIOVectorSize,
                                     explainNodeId,
                                     logInfoEvent,
-	                             scratchMgmtOption)
+	                            scratchMgmtOption)
 {
   numClusters_ = INITIAL_MAX_CLUSTERS;
   clusterDList_ = (ClusterDirectory*) new(heap_)ClusterDirectory[numClusters_];

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0c102904/core/sql/sort/ScratchSpace.h
----------------------------------------------------------------------
diff --git a/core/sql/sort/ScratchSpace.h b/core/sql/sort/ScratchSpace.h
index f12e2e6..fa1ebb8 100644
--- a/core/sql/sort/ScratchSpace.h
+++ b/core/sql/sort/ScratchSpace.h
@@ -120,8 +120,9 @@ class ScratchSpace : public NABasicObject {
   public : 
 
    ScratchSpace(CollHeap* heap, SortError* error, Lng32 blocksize,
+               Int32 scratchIOVectorSize,
                Int32 explainNodeId,
-		NABoolean logInfoEvent=FALSE,
+               NABoolean logInfoEvent = FALSE,
                Int32 scratchMgmtOption = 0);
    ~ScratchSpace(void);
 
@@ -292,6 +293,7 @@ protected:
 class SortScratchSpace : public ScratchSpace{
   public :
     SortScratchSpace(CollHeap* heap, SortError* error,
+                Int32 scratchIOVectorSize,
                 Int32 explainNodeId,
                 Int32 scratchIOBlockSize,
 		NABoolean logInfoEvent=FALSE,
@@ -415,6 +417,7 @@ public:
 class HashScratchSpace : public ScratchSpace{
   public :
     HashScratchSpace(CollHeap* heap, SortError* error,
+                 Int32 scratchIOVectorSize,
                  Int32 explainNodeId,
                  Int32 blockSize,
                  NABoolean logInfoEvent=FALSE,

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0c102904/core/sql/sort/SortUtil.cpp
----------------------------------------------------------------------
diff --git a/core/sql/sort/SortUtil.cpp b/core/sql/sort/SortUtil.cpp
index 4cb11a8..74bb2c8 100644
--- a/core/sql/sort/SortUtil.cpp
+++ b/core/sql/sort/SortUtil.cpp
@@ -101,9 +101,9 @@ NABoolean SortUtil::scratchInitialize(void)
                                              &sortError_,
                                              explainNodeId_,
                                              config_->scratchIOBlockSize_,
+                                             config_->getScratchIOVectorSize(),
                                              config_->logInfoEvent_,
-                                             config_->scratchMgmtOption_
-                                              );  
+                                             config_->scratchMgmtOption_);  
 
     if (scratch_ == NULL)
       {

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0c102904/core/sql/sort/scratchfile_sq.cpp
----------------------------------------------------------------------
diff --git a/core/sql/sort/scratchfile_sq.cpp b/core/sql/sort/scratchfile_sq.cpp
index 9a4d6d7..6decaad 100644
--- a/core/sql/sort/scratchfile_sq.cpp
+++ b/core/sql/sort/scratchfile_sq.cpp
@@ -770,7 +770,7 @@ Int32 SQScratchFile::redriveVectorIO(Int32 index)
 		  bytesCompleted = readv(fileHandle_[index].fileNum, (struct iovec*)remainingAddr_, remainingVectorSize_);
 		  if (bmoStats) {
                      bmoStats->incScratchReadCount();
-                     bmoStats->getScratchIOTimer().stop();
+                     bmoStats->incScratchIOMaxTime(bmoStats->getScratchIOTimer().stop());
                   }
 		}
 		else
@@ -780,7 +780,7 @@ Int32 SQScratchFile::redriveVectorIO(Int32 index)
 		  bytesCompleted = writev(fileHandle_[index].fileNum, (struct iovec*)remainingAddr_, remainingVectorSize_);
 		  if (bmoStats) {
                      bmoStats->incScratchWriteCount();
-                     bmoStats->getScratchIOTimer().stop();
+                     bmoStats->incScratchIOMaxTime(bmoStats->getScratchIOTimer().stop());
                   }
 		}
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0c102904/core/sql/sqlcomp/nadefaults.cpp
----------------------------------------------------------------------
diff --git a/core/sql/sqlcomp/nadefaults.cpp b/core/sql/sqlcomp/nadefaults.cpp
index 3293e2b..2f5cac9 100644
--- a/core/sql/sqlcomp/nadefaults.cpp
+++ b/core/sql/sqlcomp/nadefaults.cpp
@@ -1569,7 +1569,7 @@ SDDkwd__(EXE_DIAGNOSTIC_EVENTS,		"OFF"),
   DDui1__(GEN_MATR_SIZE_UP,			"8"),
   DDui___(GEN_MAX_NUM_PART_DISK_ENTRIES,       "3"),
   DDui___(GEN_MAX_NUM_PART_NODE_ENTRIES,       "255"),
-  DDui1__(GEN_MEM_PRESSURE_THRESHOLD,		"100"),
+  DDui1__(GEN_MEM_PRESSURE_THRESHOLD,		"10000"),
   DDui1__(GEN_MJ_BUFFER_SIZE,			"32768"),
   DDui1__(GEN_MJ_NUM_BUFFERS,			"1"),
   DDui1__(GEN_MJ_SIZE_DOWN,			"2"),
@@ -1771,7 +1771,7 @@ SDDkwd__(EXE_DIAGNOSTIC_EVENTS,		"OFF"),
  DDui1__(HBASE_MIN_BYTES_PER_ESP_PARTITION,     "67108864"),
 
   DDkwd__(HBASE_NATIVE_IUD,		"ON"),
- DDui1__(HBASE_NUM_CACHE_ROWS_MAX,	"10000"),
+ DDui1__(HBASE_NUM_CACHE_ROWS_MAX,	"1024"),
  DDui1__(HBASE_NUM_CACHE_ROWS_MIN,	"100"),
 
   DDkwd__(HBASE_RANGE_PARTITIONING,	        "ON"),


Mime
View raw message