Repository: incubator-trafodion Updated Branches: refs/heads/master 9d945faf3 -> 514679fc3
[TRAFODION-2420] RMS enhancements Fixed a possible corruption issue in Type 2 JDBC driver while getting the accumulated statistics. The SE_IO_Bytes is now changed to SE_IO_KBytes. It used to return in MB and now it is changed to KB. Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/7362068e Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/7362068e Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/7362068e Branch: refs/heads/master Commit: 7362068efe598a5dc27b4a55e77f15817926cd11 Parents: 9d945fa Author: selvaganesang <[email protected]> Authored: Tue May 23 00:29:42 2017 +0000 Committer: selvaganesang <[email protected]> Committed: Tue May 23 00:29:42 2017 +0000 ---------------------------------------------------------------------- .../native/ResStatisticsStatement.cpp | 2 +- core/sql/executor/ExExeUtilGetStats.cpp | 10 +++-- core/sql/regress/core/EXPECTEDRTS | 40 ++++++++++---------- 3 files changed, 28 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7362068e/core/conn/jdbc_type2/native/ResStatisticsStatement.cpp ---------------------------------------------------------------------- diff --git a/core/conn/jdbc_type2/native/ResStatisticsStatement.cpp b/core/conn/jdbc_type2/native/ResStatisticsStatement.cpp index b3b9f54..c62181c 100644 --- a/core/conn/jdbc_type2/native/ResStatisticsStatement.cpp +++ b/core/conn/jdbc_type2/native/ResStatisticsStatement.cpp @@ -1327,7 +1327,7 @@ void ResStatisticsStatement::setStatistics(SRVR_STMT_HDL *pSrvrStmt, SQLSTATS_TY #define MAX_PERTABLE_STATS_DESC 30 #define MAX_MASTERSTATS_ENTRY 31 -#define MAX_MEASSTATS_ENTRY 27 +#define MAX_MEASSTATS_ENTRY 30 #define MAX_PERTABLE_ENTRY 10 int i; http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7362068e/core/sql/executor/ExExeUtilGetStats.cpp ---------------------------------------------------------------------- diff --git a/core/sql/executor/ExExeUtilGetStats.cpp b/core/sql/executor/ExExeUtilGetStats.cpp index 09057df..aee22dc 100644 --- a/core/sql/executor/ExExeUtilGetStats.cpp +++ b/core/sql/executor/ExExeUtilGetStats.cpp @@ -2873,7 +2873,7 @@ short ExExeUtilGetRTSStatisticsTcb::work() str_sprintf(statsBuf_, "%-5s%-10s%-15s%-20s%-15s%-20s%-20s%-20s%-20s%-20s%-10s", "Id", "DOP", "EstRowsAccess", "ActRowsAccess", "EstRowUsed", "ActRowsUsed", "SE_IOs", - "SE_IO_Bytes", "SE_IO_SumTime", "SE_IO_MaxTime", "TableName"); + "SE_IO_KBytes", "SE_IO_SumTime", "SE_IO_MaxTime", "TableName"); moveRowToUpQueue(statsBuf_); } else { @@ -2881,7 +2881,7 @@ short ExExeUtilGetRTSStatisticsTcb::work() "Id", "DOP","Table Name"); moveRowToUpQueue(statsBuf_); str_sprintf(statsBuf_, "%-15s%-20s%-15s%-20s%-20s%-20s%-20s%-20s", - "EstRowsAccess", "ActRowsAccess", "EstRowsUsed", "ActRowsUsed", "SE_IOs", "SE_IO_Bytes", "SE_IO_SumTime", "SE_IO_MaxTime"); + "EstRowsAccess", "ActRowsAccess", "EstRowsUsed", "ActRowsUsed", "SE_IOs", "SE_IO_KBytes", "SE_IO_SumTime", "SE_IO_MaxTime"); moveRowToUpQueue(statsBuf_); } isHeadingDisplayed_ = TRUE; @@ -2955,24 +2955,28 @@ short ExExeUtilGetRTSStatisticsTcb::work() str_sprintf(&statsBuf_[strlen(statsBuf_)], "%-20s", Int64Val); break; case SQLSTATS_HBASE_IOS: + case SQLSTATS_HIVE_IOS: str_sprintf(Int64Val, "%Ld", statsItems[i].int64_value); intSize = str_len(Int64Val); AddCommas(Int64Val,intSize); str_sprintf(&statsBuf_[strlen(statsBuf_)], "%-20s", Int64Val); break; case SQLSTATS_HBASE_IO_BYTES: - str_sprintf(Int64Val, "%Ld", statsItems[i].int64_value/1024/1024); + case SQLSTATS_HIVE_IO_BYTES: + str_sprintf(Int64Val, "%Ld", statsItems[i].int64_value/1024); intSize = str_len(Int64Val); AddCommas(Int64Val,intSize); str_sprintf(&statsBuf_[strlen(statsBuf_)], "%-20s", Int64Val); break; case SQLSTATS_HBASE_IO_ELAPSED_TIME: + case SQLSTATS_HIVE_IO_ELAPSED_TIME: str_sprintf(Int64Val, "%Ld", statsItems[i].int64_value); intSize = str_len(Int64Val); AddCommas(Int64Val,intSize); str_sprintf(&statsBuf_[strlen(statsBuf_)], "%-20s", Int64Val); break; case SQLSTATS_HBASE_IO_MAX_TIME: + case SQLSTATS_HIVE_IO_MAX_TIME: str_sprintf(Int64Val, "%Ld", statsItems[i].int64_value); intSize = str_len(Int64Val); AddCommas(Int64Val,intSize); http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7362068e/core/sql/regress/core/EXPECTEDRTS ---------------------------------------------------------------------- diff --git a/core/sql/regress/core/EXPECTEDRTS b/core/sql/regress/core/EXPECTEDRTS index 1ea5583..9827522 100755 --- a/core/sql/regress/core/EXPECTEDRTS +++ b/core/sql/regress/core/EXPECTEDRTS @@ -1074,7 +1074,7 @@ Scr. IO Max Time 0 Sort TopN -1 Id DOP Table Name - EstRowsAccess ActRowsAccess EstRowsUsed ActRowsUsed SE_IOs SE_IO_Bytes SE_IO_SumTime SE_IO_MaxTime + EstRowsAccess ActRowsAccess EstRowsUsed ActRowsUsed SE_IOs SE_IO_KBytes SE_IO_SumTime SE_IO_MaxTime 1 2 TRAFODION.SCH.TSTAT 0 4 100 4 4 0 20,398 10,610 @@ -1137,7 +1137,7 @@ Scr. IO Max Time 0 Sort TopN -1 Id DOP Table Name - EstRowsAccess ActRowsAccess EstRowsUsed ActRowsUsed SE_IOs SE_IO_Bytes SE_IO_SumTime SE_IO_MaxTime + EstRowsAccess ActRowsAccess EstRowsUsed ActRowsUsed SE_IOs SE_IO_KBytes SE_IO_SumTime SE_IO_MaxTime 1 2 TRAFODION.SCH.TSTAT 0 4 100 4 4 0 20,398 10,610 @@ -1331,7 +1331,7 @@ Scr. IO Max Time 0 Sort TopN -1 Id DOP Table Name - EstRowsAccess ActRowsAccess EstRowsUsed ActRowsUsed SE_IOs SE_IO_Bytes SE_IO_SumTime SE_IO_MaxTime + EstRowsAccess ActRowsAccess EstRowsUsed ActRowsUsed SE_IOs SE_IO_KBytes SE_IO_SumTime SE_IO_MaxTime 1 2 TRAFODION.SCH.TSTAT 0 4 100 4 4 0 20,398 10,610 @@ -1394,7 +1394,7 @@ Scr. IO Max Time 0 Sort TopN -1 Id DOP Table Name - EstRowsAccess ActRowsAccess EstRowsUsed ActRowsUsed SE_IOs SE_IO_Bytes SE_IO_SumTime SE_IO_MaxTime + EstRowsAccess ActRowsAccess EstRowsUsed ActRowsUsed SE_IOs SE_IO_KBytes SE_IO_SumTime SE_IO_MaxTime 1 2 TRAFODION.SCH.TSTAT 0 4 100 4 4 0 20,398 10,610 @@ -2080,7 +2080,7 @@ Scr. IO Max Time 0 Sort TopN -1 Id DOP Table Name - EstRowsAccess ActRowsAccess EstRowsUsed ActRowsUsed SE_IOs SE_IO_Bytes SE_IO_SumTime SE_IO_MaxTime + EstRowsAccess ActRowsAccess EstRowsUsed ActRowsUsed SE_IOs SE_IO_KBytes SE_IO_SumTime SE_IO_MaxTime 1 2 TRAFODION.SCH.TSTAT 0 4 100 4 4 0 22,124 12,163 @@ -2143,7 +2143,7 @@ Scr. IO Max Time 0 Sort TopN -1 Id DOP Table Name - EstRowsAccess ActRowsAccess EstRowsUsed ActRowsUsed SE_IOs SE_IO_Bytes SE_IO_SumTime SE_IO_MaxTime + EstRowsAccess ActRowsAccess EstRowsUsed ActRowsUsed SE_IOs SE_IO_KBytes SE_IO_SumTime SE_IO_MaxTime 1 2 TRAFODION.SCH.TSTAT 0 4 100 4 4 0 22,124 12,163 @@ -2199,7 +2199,7 @@ Reply Message Count 15 Reply Message Bytes 42,696 Id DOP Table Name - EstRowsAccess ActRowsAccess EstRowsUsed ActRowsUsed SE_IOs SE_IO_Bytes SE_IO_SumTime SE_IO_MaxTime + EstRowsAccess ActRowsAccess EstRowsUsed ActRowsUsed SE_IOs SE_IO_KBytes SE_IO_SumTime SE_IO_MaxTime 1 2 TRAFODION.SCH.TSTAT 0 4 100 4 4 0 22,124 12,163 @@ -2258,7 +2258,7 @@ Reply Message Count 15 Reply Message Bytes 42,696 Id DOP Table Name - EstRowsAccess ActRowsAccess EstRowsUsed ActRowsUsed SE_IOs SE_IO_Bytes SE_IO_SumTime SE_IO_MaxTime + EstRowsAccess ActRowsAccess EstRowsUsed ActRowsUsed SE_IOs SE_IO_KBytes SE_IO_SumTime SE_IO_MaxTime 1 2 TRAFODION.SCH.TSTAT 0 4 100 4 4 0 22,124 12,163 @@ -2543,7 +2543,7 @@ Scr. IO Max Time 0 Sort TopN -1 Id DOP Table Name - EstRowsAccess ActRowsAccess EstRowsUsed ActRowsUsed SE_IOs SE_IO_Bytes SE_IO_SumTime SE_IO_MaxTime + EstRowsAccess ActRowsAccess EstRowsUsed ActRowsUsed SE_IOs SE_IO_KBytes SE_IO_SumTime SE_IO_MaxTime 1 2 TRAFODION.SCH.TSTAT 0 4 100 4 4 0 22,124 12,163 @@ -2595,7 +2595,7 @@ Reply Message Count 15 Reply Message Bytes 42,696 Id DOP Table Name - EstRowsAccess ActRowsAccess EstRowsUsed ActRowsUsed SE_IOs SE_IO_Bytes SE_IO_SumTime SE_IO_MaxTime + EstRowsAccess ActRowsAccess EstRowsUsed ActRowsUsed SE_IOs SE_IO_KBytes SE_IO_SumTime SE_IO_MaxTime 1 2 TRAFODION.SCH.TSTAT 0 4 100 4 4 0 22,124 12,163 @@ -2653,7 +2653,7 @@ Request Message Bytes 40,128 Reply Message Count 15 Reply Message Bytes 42,696 - Id DOP EstRowsAccess ActRowsAccess EstRowUsed ActRowsUsed SE_IOs SE_IO_Bytes SE_IO_SumTime SE_IO_MaxTime TableName + Id DOP EstRowsAccess ActRowsAccess EstRowUsed ActRowsUsed SE_IOs SE_IO_KBytes SE_IO_SumTime SE_IO_MaxTime TableName 1 2 0 4 100 4 4 0 22,124 12,163 TRAFODION.SCH.TSTAT Id TDBName Mode DOP TopN BMOPhase InterimRowCount CPUTime BMOHeapUsed BMOHeapAllocated BMOHeapWM BMOSpaceBufSz BMOSpaceBufCnt FileCnt ScrIOSize ScrIORead ScrIOWritten ScrIOTime ScrIOMaxTime @@ -2888,7 +2888,7 @@ Scr. IO Max Time 0 Sort TopN -1 Id DOP Table Name - EstRowsAccess ActRowsAccess EstRowsUsed ActRowsUsed SE_IOs SE_IO_Bytes SE_IO_SumTime SE_IO_MaxTime + EstRowsAccess ActRowsAccess EstRowsUsed ActRowsUsed SE_IOs SE_IO_KBytes SE_IO_SumTime SE_IO_MaxTime 1 2 TRAFODION.SCH.TSTAT 0 4 100 4 4 0 22,124 12,163 @@ -2943,7 +2943,7 @@ Reply Message Count 15 Reply Message Bytes 42,696 Id DOP Table Name - EstRowsAccess ActRowsAccess EstRowsUsed ActRowsUsed SE_IOs SE_IO_Bytes SE_IO_SumTime SE_IO_MaxTime + EstRowsAccess ActRowsAccess EstRowsUsed ActRowsUsed SE_IOs SE_IO_KBytes SE_IO_SumTime SE_IO_MaxTime 1 2 TRAFODION.SCH.TSTAT 0 4 100 4 4 0 22,124 12,163 @@ -3028,7 +3028,7 @@ Scr. Write Count 0 Scr. IO Max Time 0 Sort TopN -1 - Id DOP EstRowsAccess ActRowsAccess EstRowUsed ActRowsUsed SE_IOs SE_IO_Bytes SE_IO_SumTime SE_IO_MaxTime TableName + Id DOP EstRowsAccess ActRowsAccess EstRowUsed ActRowsUsed SE_IOs SE_IO_KBytes SE_IO_SumTime SE_IO_MaxTime TableName 1 2 0 4 100 4 4 0 17,792 9,698 TRAFODION.SCH.TSTAT --- SQL operation complete. @@ -3089,7 +3089,7 @@ Request Message Bytes 5,856 Reply Message Count 6 Reply Message Bytes 45,688 - Id DOP EstRowsAccess ActRowsAccess EstRowUsed ActRowsUsed SE_IOs SE_IO_Bytes SE_IO_SumTime SE_IO_MaxTime TableName + Id DOP EstRowsAccess ActRowsAccess EstRowUsed ActRowsUsed SE_IOs SE_IO_KBytes SE_IO_SumTime SE_IO_MaxTime TableName 1 2 0 4 100 4 4 0 19,458 13,439 TRAFODION.SCH.TSTAT Id TDBName Mode DOP TopN BMOPhase InterimRowCount CPUTime BMOHeapUsed BMOHeapAllocated BMOHeapWM BMOSpaceBufSz BMOSpaceBufCnt FileCnt ScrIOSize ScrIORead ScrIOWritten ScrIOTime ScrIOMaxTime @@ -3213,7 +3213,7 @@ Request Message Bytes 5,856 Reply Message Count 6 Reply Message Bytes 45,688 - Id DOP EstRowsAccess ActRowsAccess EstRowUsed ActRowsUsed SE_IOs SE_IO_Bytes SE_IO_SumTime SE_IO_MaxTime TableName + Id DOP EstRowsAccess ActRowsAccess EstRowUsed ActRowsUsed SE_IOs SE_IO_KBytes SE_IO_SumTime SE_IO_MaxTime TableName 1 2 0 4 100 4 4 0 8,634 5,986 TRAFODION.SCH.TSTAT Id TDBName Mode DOP TopN BMOPhase InterimRowCount CPUTime BMOHeapUsed BMOHeapAllocated BMOHeapWM BMOSpaceBufSz BMOSpaceBufCnt FileCnt ScrIOSize ScrIORead ScrIOWritten ScrIOTime ScrIOMaxTime @@ -3533,7 +3533,7 @@ Scr. IO Max Time 0 Sort TopN -1 Id DOP Table Name - EstRowsAccess ActRowsAccess EstRowsUsed ActRowsUsed SE_IOs SE_IO_Bytes SE_IO_SumTime SE_IO_MaxTime + EstRowsAccess ActRowsAccess EstRowsUsed ActRowsUsed SE_IOs SE_IO_KBytes SE_IO_SumTime SE_IO_MaxTime 1 1 TRAFODION.SCH.TSTATI 0 4 100 4 2 0 35,112 35,112 @@ -3596,7 +3596,7 @@ Scr. IO Max Time 0 Sort TopN -1 Id DOP Table Name - EstRowsAccess ActRowsAccess EstRowsUsed ActRowsUsed SE_IOs SE_IO_Bytes SE_IO_SumTime SE_IO_MaxTime + EstRowsAccess ActRowsAccess EstRowsUsed ActRowsUsed SE_IOs SE_IO_KBytes SE_IO_SumTime SE_IO_MaxTime 1 1 TRAFODION.SCH.TSTATI 0 4 100 4 2 0 35,112 35,112 @@ -3673,7 +3673,7 @@ Scr. IO Max Time 0 Sort TopN -1 Id DOP Table Name - EstRowsAccess ActRowsAccess EstRowsUsed ActRowsUsed SE_IOs SE_IO_Bytes SE_IO_SumTime SE_IO_MaxTime + EstRowsAccess ActRowsAccess EstRowsUsed ActRowsUsed SE_IOs SE_IO_KBytes SE_IO_SumTime SE_IO_MaxTime 1 1 TRAFODION.SCH.TSTAT 0 4 100 4 2 0 13,212 13,212 @@ -3712,7 +3712,7 @@ Sort TopN -1 > Number of Cpus 2 34a36,46 > Id DOP Table Name -> EstRowsAccess ActRowsAccess EstRowsUsed ActRowsUsed SE_IOs SE_IO_Bytes SE_IO_SumTime SE_IO_MaxTime +> EstRowsAccess ActRowsAccess EstRowsUsed ActRowsUsed SE_IOs SE_IO_KBytes SE_IO_SumTime SE_IO_MaxTime > 1 0 TRAFODION.SCH.TSTATI > 0 0 100 0 > 0 0 0 0 > 6 0 TRAFODION.SCH.TSTATI
