trafodion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From se...@apache.org
Subject [5/6] incubator-trafodion git commit: additional minor cleanup.
Date Wed, 11 Jan 2017 14:55:03 GMT
additional minor cleanup.


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

Branch: refs/heads/master
Commit: c71ebdc464a148de0ed8da7e693e92933c35d06f
Parents: e9785bb
Author: Prashant Vasudev <prashanth.vasudev@esgyn.com>
Authored: Mon Jan 9 22:43:54 2017 +0000
Committer: Prashant Vasudev <prashanth.vasudev@esgyn.com>
Committed: Mon Jan 9 22:43:54 2017 +0000

----------------------------------------------------------------------
 core/sql/executor/ExStats.cpp | 17 +++++++----------
 core/sql/executor/ExStats.h   |  5 ++---
 core/sql/sort/CommonStructs.h |  6 ------
 3 files changed, 9 insertions(+), 19 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/c71ebdc4/core/sql/executor/ExStats.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExStats.cpp b/core/sql/executor/ExStats.cpp
index 6031198..198147d 100644
--- a/core/sql/executor/ExStats.cpp
+++ b/core/sql/executor/ExStats.cpp
@@ -1951,7 +1951,7 @@ void ExFragRootOperStats::getVariableStatsInfo(char * dataBuffer,
 		"SpaceUsed: %u SpaceTotal: %u HeapUsed: %u HeapTotal: %u "
 		"Newprocess: %u NewprocessTime: %Ld reqMsgCnt: %Ld "
 		"regMsgBytes: %Ld replyMsgCnt: %Ld replyMsgBytes: %Ld "
-		"PMemUsed: %Ld scrOverFlowMode: %d sortMode: %d"
+		"PMemUsed: %Ld scrOverFlowMode: %d sortTopN: %Ld"
 		"scrFileCount: %d scrBufferBlockSize: %d scrBuffferRead: %Ld scrBufferWritten: %Ld "
 		"scrWriteCount:%Ld scrReadCount: %Ld udrCpuTime: %Ld "
 		"maxWaitTime: %Ld avgWaitTime: %Ld "
@@ -1972,6 +1972,7 @@ void ExFragRootOperStats::getVariableStatsInfo(char * dataBuffer,
 		replyMsgBytes_,
 		pagesInUse_ * 16,
 		scratchOverflowMode_,
+		topN_,
 		scratchFileCount_,
 		scratchBufferBlockSize_,
 		scratchBufferBlockRead_,
@@ -1979,7 +1980,6 @@ void ExFragRootOperStats::getVariableStatsInfo(char * dataBuffer,
 		scratchWriteCount_,
 		scratchReadCount_,
 		udrCpuTime_,
-		topN_,
 		maxWaitTime_,
 		getAvgWaitTime(),
 		(hdfsAccess() ? 1 : 0)
@@ -5123,9 +5123,9 @@ void ExMeasStats::getVariableStatsInfo(char * dataBuffer, char * datalen,
     "statsRowType: %d Newprocess: %u NewprocessTime: %Ld Timeouts: %u NumSorts: %u SortElapsedTime:
%Ld "
     "SpaceTotal: %d  SpaceUsed: %d HeapTotal: %d HeapUsed: %d CpuTime: %Ld "
     "reqMsgCnt: %Ld reqMsgBytes: %Ld replyMsgCnt: %Ld "
-    "replyMsgBytes: %Ld scrOverflowMode: %d "
+    "replyMsgBytes: %Ld scrOverflowMode: %d sortTopN: %Ld"
     "scrFileCount: %d scrBufferBlockSize: %d scrBufferRead: %Ld scrBufferWritten: %Ld "
-    "scrWriteCount: %Ld scrReadCount: %Ld udrCpuTime: %Ld topN: %Ld",
+    "scrWriteCount: %Ld scrReadCount: %Ld udrCpuTime: %Ld",
 	      statType(),
               getNewprocess(),
 	      getNewprocessTime(),
@@ -5142,14 +5142,14 @@ void ExMeasStats::getVariableStatsInfo(char * dataBuffer, char * datalen,
               replyMsgCnt_,
               replyMsgBytes_,
               scratchOverflowMode_,
+              topN_,
               scratchFileCount_,
               scratchBufferBlockSize_,
               scratchBufferBlockRead_,
               scratchBufferBlockWritten_,
               scratchWriteCount_,
               scratchReadCount_,
-              udrCpuTime_,
-              topN_
+              udrCpuTime_
               );
   }
   buf += str_len(buf);
@@ -10712,10 +10712,7 @@ void ExBMOStats::unpack(const char* &buffer)
   if (getVersion() >= _STATS_RTS_VERSION_R25)
   {
     alignBufferForNextObj(buffer); 
-    if (getVersion() == _STATS_RTS_VERSION_R25)
-      srcLen = sizeof(ExBMOStats)-sizeof(scratchOverflowMode_)-sizeof(bmoFiller_)-sizeof(ExOperStats);
-    else
-      srcLen = sizeof(ExBMOStats)-sizeof(ExOperStats);
+    srcLen = sizeof(ExBMOStats)-sizeof(ExOperStats);
     char * srcPtr = (char *)this+sizeof(ExOperStats);
     memcpy((void *)srcPtr, buffer, srcLen);
     buffer += srcLen;

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/c71ebdc4/core/sql/executor/ExStats.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExStats.h b/core/sql/executor/ExStats.h
index 00e6e5e..f461af0 100644
--- a/core/sql/executor/ExStats.h
+++ b/core/sql/executor/ExStats.h
@@ -1211,7 +1211,7 @@ public:
   {
     scratchOverflowMode_ = overflowMode;
   }
-  inline void setTopN(Int32 size) 
+  inline void setTopN(Int64 size) 
   { 
     topN_ = size;
   }
@@ -1232,8 +1232,7 @@ private:
   Int64 scratchReadCount_;
   Int64 scratchWriteCount_;
   Int16 scratchOverflowMode_;   // 0 - disk 1 - SSD
-  Int16 topN_;                 // TOPN value
-  char bmoFiller_[4];          // For versioning with old dp2
+  Int64 topN_;                 // TOPN value
 };
 
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/c71ebdc4/core/sql/sort/CommonStructs.h
----------------------------------------------------------------------
diff --git a/core/sql/sort/CommonStructs.h b/core/sql/sort/CommonStructs.h
index 51f7e6e..5d42a53 100644
--- a/core/sql/sort/CommonStructs.h
+++ b/core/sql/sort/CommonStructs.h
@@ -113,12 +113,6 @@ enum ScratchOverflowMode
   SCRATCH_MMAP
 };
 
-enum SortMode
-{
-  SORTMODE_HEAP = 0,
-  SORTMODE_TOPN = 1
-};
-
 #endif
 
 


Mime
View raw message