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 <[email protected]> Authored: Wed May 2 23:11:02 2018 +0000 Committer: Dave Birdsall <[email protected]> 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; \ }
