You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by li...@apache.org on 2018/05/09 03:42:12 UTC
[1/3] trafodion git commit: [MANTIS 7502] Make UPDATE STATISTICS
tolerate RMS failures (2024 warnings) (cherry picked from commit
41e83a86468889e8595de900d2deb850fda559f2)
Repository: trafodion
Updated Branches:
refs/heads/master 371b7e552 -> 008f4af32
[MANTIS 7502] Make UPDATE STATISTICS tolerate RMS failures (2024 warnings)
(cherry picked from commit 41e83a86468889e8595de900d2deb850fda559f2)
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/5f887e71
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/5f887e71
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/5f887e71
Branch: refs/heads/master
Commit: 5f887e71acd810371f77a71086c69536d1adb462
Parents: 2477de3
Author: Dave Birdsall <da...@esgyn.com>
Authored: Wed May 2 23:11:02 2018 +0000
Committer: Dave Birdsall <db...@apache.org>
Committed: Mon May 7 19:58:21 2018 +0000
----------------------------------------------------------------------
core/sql/ustat/hs_globals.cpp | 4 ++++
core/sql/ustat/hs_log.h | 1 +
2 files changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafodion/blob/5f887e71/core/sql/ustat/hs_globals.cpp
----------------------------------------------------------------------
diff --git a/core/sql/ustat/hs_globals.cpp b/core/sql/ustat/hs_globals.cpp
index 7267862..d81cdba 100644
--- a/core/sql/ustat/hs_globals.cpp
+++ b/core/sql/ustat/hs_globals.cpp
@@ -8530,6 +8530,7 @@ Lng32 HSGlobalsClass::groupListFromTable(HSColGroupStruct*& groupList,
(void *)&colNum, (void *)&colCount
);
// Don't read any more (break out of loop) if fetch did not succeed.
+ HSFilterWarning(retcode);
if (retcode)
break;
// If EXISTING keyword specified and REASON field is EMPTY, skip.
@@ -10457,6 +10458,7 @@ Lng32 HSGlobalsClass::DisplayHistograms(NAString& displayData, Space& space,
// Go ahead to write information for intervals of this histogram if DETAIL
// option was specified, else return now.
+ HSFilterWarning(retcode); // clean up any warnings before possible return
if (!(optFlags & DETAIL_OPT))
return 0;
@@ -10583,6 +10585,8 @@ Lng32 HSGlobalsClass::DisplayHistograms(NAString& displayData, Space& space,
intData.close();
displayData += "\n";
+ HSFilterWarning(retcode); // filter out any warnings so HSErrorCatcher doesn't act up
+
return 0;
}
http://git-wip-us.apache.org/repos/asf/trafodion/blob/5f887e71/core/sql/ustat/hs_log.h
----------------------------------------------------------------------
diff --git a/core/sql/ustat/hs_log.h b/core/sql/ustat/hs_log.h
index 4b0ce69..679bbf9 100644
--- a/core/sql/ustat/hs_log.h
+++ b/core/sql/ustat/hs_log.h
@@ -175,6 +175,7 @@ void HSFuncLogError(Lng32 error, char *filename, Lng32 lineno);
(retcode == 6007) || \
(retcode == 4030) || \
(retcode == 2053) || \
+ (retcode == 2024) || \
(retcode == HS_WARNING)) \
retcode = 0; \
}
[2/3] trafodion git commit: [TRAFODION-3056] Make UPDATE STATS
tolerate the absence of RMS
Posted by li...@apache.org.
[TRAFODION-3056] Make UPDATE STATS tolerate the absence of RMS
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/12b89700
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/12b89700
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/12b89700
Branch: refs/heads/master
Commit: 12b89700650a9170f2dac5c4d25a7f0077812ffe
Parents: 5f887e7
Author: Dave Birdsall <db...@apache.org>
Authored: Mon May 7 20:12:37 2018 +0000
Committer: Dave Birdsall <db...@apache.org>
Committed: Mon May 7 20:12:37 2018 +0000
----------------------------------------------------------------------
core/sql/ustat/hs_cli.cpp | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafodion/blob/12b89700/core/sql/ustat/hs_cli.cpp
----------------------------------------------------------------------
diff --git a/core/sql/ustat/hs_cli.cpp b/core/sql/ustat/hs_cli.cpp
index 298e9cf..dbefed0 100644
--- a/core/sql/ustat/hs_cli.cpp
+++ b/core/sql/ustat/hs_cli.cpp
@@ -5754,6 +5754,7 @@ Lng32 printPlan(SQLSTMT_ID *stmt)
SQLSTMT_ID* ppStmtId = ppCursor.getStmt();
SQLDESC_ID* ppOutputDesc = ppCursor.getOutDesc();
retcode = ppCursor.open();
+ HSFilterWarning(retcode);
HSHandleError(retcode);
printPlanHeader(LM);
[3/3] trafodion git commit: merge [TRAFODION-3056] Change UPDATE
STATISTICS to tolerate absence of RMS
Posted by li...@apache.org.
merge [TRAFODION-3056] Change UPDATE STATISTICS to tolerate absence of RMS
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/008f4af3
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/008f4af3
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/008f4af3
Branch: refs/heads/master
Commit: 008f4af3285b9bf4287771750d5e68c6e39e8151
Parents: 371b7e5 12b8970
Author: Liu Ming <ov...@sina.com>
Authored: Tue May 8 22:28:34 2018 +0000
Committer: Liu Ming <ov...@sina.com>
Committed: Tue May 8 22:28:34 2018 +0000
----------------------------------------------------------------------
core/sql/ustat/hs_cli.cpp | 1 +
core/sql/ustat/hs_globals.cpp | 4 ++++
core/sql/ustat/hs_log.h | 1 +
3 files changed, 6 insertions(+)
----------------------------------------------------------------------