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/01/06 15:11:36 UTC
incubator-trafodion git commit: Squashed commit of the following:
Repository: incubator-trafodion
Updated Branches:
refs/heads/master 548a1939c -> 94d2d7898
Squashed commit of the following:
commit f924372b8a8d1f395e227ace804bf32ea18e2437
Author: selvaganesang <se...@esgyn.com>
Date: Fri Jan 6 03:27:53 2017 +0000
[TRAFODION-2420] RMS enhancements
Fix for core/TESTRTS failure
commit 461cdc879b887de437adee253fbeb74eef3204e3
Author: selvaganesang <se...@esgyn.com>
Date: Fri Jan 6 00:02:31 2017 +0000
[TRAFODION-2420] RMS enhancements
Fixed the issue pointed by Steve
This closes #PR 904
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/94d2d789
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/94d2d789
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/94d2d789
Branch: refs/heads/master
Commit: 94d2d7898520dae87e6af65d86ae9191291c116f
Parents: 548a193
Author: selvaganesang <se...@apache.org>
Authored: Fri Jan 6 15:05:53 2017 +0000
Committer: selvaganesang <se...@apache.org>
Committed: Fri Jan 6 15:10:16 2017 +0000
----------------------------------------------------------------------
core/sql/executor/ExExeUtilGetStats.cpp | 8 ++++----
core/sql/regress/core/EXPECTEDRTS | 12 ++++++++++++
2 files changed, 16 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/94d2d789/core/sql/executor/ExExeUtilGetStats.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/ExExeUtilGetStats.cpp b/core/sql/executor/ExExeUtilGetStats.cpp
index 4b6c698..9545a7a 100644
--- a/core/sql/executor/ExExeUtilGetStats.cpp
+++ b/core/sql/executor/ExExeUtilGetStats.cpp
@@ -2348,11 +2348,11 @@ short ExExeUtilGetRTSStatisticsTcb::work()
measStatsItems_[20].statsItem_id = SQLSTATS_SCRATCH_FILE_COUNT;
measStatsItems_[21].statsItem_id = SQLSTATS_SCRATCH_BUFFER_BLOCK_SIZE;
measStatsItems_[22].statsItem_id = SQLSTATS_SCRATCH_BUFFER_BLOCKS_READ;
- measStatsItems_[22].statsItem_id = SQLSTATS_SCRATCH_BUFFER_BLOCKS_WRITTEN;
- measStatsItems_[23].statsItem_id = SQLSTATS_SCRATCH_READ_COUNT;
- measStatsItems_[24].statsItem_id = SQLSTATS_SCRATCH_WRITE_COUNT;
+ measStatsItems_[23].statsItem_id = SQLSTATS_SCRATCH_BUFFER_BLOCKS_WRITTEN;
+ measStatsItems_[24].statsItem_id = SQLSTATS_SCRATCH_READ_COUNT;
+ measStatsItems_[25].statsItem_id = SQLSTATS_SCRATCH_WRITE_COUNT;
- // maxMeasStatsItems_ is set to 25
+ // maxMeasStatsItems_ is set to 26
}
else
initSqlStatsItems(measStatsItems_, maxMeasStatsItems_, TRUE);
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/94d2d789/core/sql/regress/core/EXPECTEDRTS
----------------------------------------------------------------------
diff --git a/core/sql/regress/core/EXPECTEDRTS b/core/sql/regress/core/EXPECTEDRTS
index 88b0f6d..b0a1ac0 100755
--- a/core/sql/regress/core/EXPECTEDRTS
+++ b/core/sql/regress/core/EXPECTEDRTS
@@ -303,6 +303,7 @@ Reply Message Bytes 38,664
Scr. Overflow Mode DISK
Scr. File Count 0
Scr. Buffer Blk Size 0
+Scr. Buffer Blks Read 0
Scr. Buffer Blks Written 0
Scr. Read Count 0
Scr. Write Count 0
@@ -361,6 +362,7 @@ Reply Message Bytes 38,664
Scr. Overflow Mode DISK
Scr. File Count 0
Scr. Buffer Blk Size 0
+Scr. Buffer Blks Read 0
Scr. Buffer Blks Written 0
Scr. Read Count 0
Scr. Write Count 0
@@ -420,6 +422,7 @@ Reply Message Bytes 38,664
Scr. Overflow Mode DISK
Scr. File Count 0
Scr. Buffer Blk Size 0
+Scr. Buffer Blks Read 0
Scr. Buffer Blks Written 0
Scr. Read Count 0
Scr. Write Count 0
@@ -478,6 +481,7 @@ Reply Message Bytes 38,664
Scr. Overflow Mode DISK
Scr. File Count 0
Scr. Buffer Blk Size 0
+Scr. Buffer Blks Read 0
Scr. Buffer Blks Written 0
Scr. Read Count 0
Scr. Write Count 0
@@ -1175,6 +1179,7 @@ Reply Message Bytes 39,048
Scr. Overflow Mode UNKNOWN
Scr. File Count 0
Scr. Buffer Blk Size 0
+Scr. Buffer Blks Read 0
Scr. Buffer Blks Written 0
Scr. Read Count 0
Scr. Write Count 0
@@ -1233,6 +1238,7 @@ Reply Message Bytes 39,048
Scr. Overflow Mode UNKNOWN
Scr. File Count 0
Scr. Buffer Blk Size 0
+Scr. Buffer Blks Read 0
Scr. Buffer Blks Written 0
Scr. Read Count 0
Scr. Write Count 0
@@ -1414,6 +1420,7 @@ Reply Message Bytes 39,048
Scr. Overflow Mode UNKNOWN
Scr. File Count 0
Scr. Buffer Blk Size 0
+Scr. Buffer Blks Read 0
Scr. Buffer Blks Written 0
Scr. Read Count 0
Scr. Write Count 0
@@ -1472,6 +1479,7 @@ Reply Message Bytes 39,048
Scr. Overflow Mode UNKNOWN
Scr. File Count 0
Scr. Buffer Blk Size 0
+Scr. Buffer Blks Read 0
Scr. Buffer Blks Written 0
Scr. Read Count 0
Scr. Write Count 0
@@ -1897,6 +1905,7 @@ Reply Message Bytes 42,200
Scr. Overflow Mode DISK
Scr. File Count 0
Scr. Buffer Blk Size 0
+Scr. Buffer Blks Read 0
Scr. Buffer Blks Written 0
Scr. Read Count 0
Scr. Write Count 0
@@ -1955,6 +1964,7 @@ Reply Message Bytes 42,200
Scr. Overflow Mode DISK
Scr. File Count 0
Scr. Buffer Blk Size 0
+Scr. Buffer Blks Read 0
Scr. Buffer Blks Written 0
Scr. Read Count 0
Scr. Write Count 0
@@ -2407,6 +2417,7 @@ Reply Message Bytes 42,200
Scr. Overflow Mode DISK
Scr. File Count 0
Scr. Buffer Blk Size 0
+Scr. Buffer Blks Read 0
Scr. Buffer Blks Written 0
Scr. Read Count 0
Scr. Write Count 0
@@ -2686,6 +2697,7 @@ Reply Message Bytes 42,200
Scr. Overflow Mode DISK
Scr. File Count 0
Scr. Buffer Blk Size 0
+Scr. Buffer Blks Read 0
Scr. Buffer Blks Written 0
Scr. Read Count 0
Scr. Write Count 0