HAWQ-1122. Convert elog::ERROR to elog::WARNING in translator and throw exception to stop execution
This is cherry-picked from greenplum-db/gpdb@386861225f3a027f45de8f21d73f2d2ec40129ec Project: http://git-wip-us.apache.org/repos/asf/incubator-hawq/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-hawq/commit/315bf7f6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-hawq/tree/315bf7f6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-hawq/diff/315bf7f6 Branch: refs/heads/master Commit: 315bf7f62f999e94a17160b3a8dce9f8c9e0365d Parents: 5938997 Author: Karthikeyan Jambu Rajaraman <karthi....@gmail.com> Authored: Thu Aug 18 15:41:59 2016 -0700 Committer: rlei <r...@pivotal.io> Committed: Fri Oct 28 11:52:20 2016 +0800 ---------------------------------------------------------------------- src/backend/gpopt/utils/COptTasks.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/315bf7f6/src/backend/gpopt/utils/COptTasks.cpp ---------------------------------------------------------------------- diff --git a/src/backend/gpopt/utils/COptTasks.cpp b/src/backend/gpopt/utils/COptTasks.cpp index 247ba2a..ec6c444 100644 --- a/src/backend/gpopt/utils/COptTasks.cpp +++ b/src/backend/gpopt/utils/COptTasks.cpp @@ -390,7 +390,8 @@ COptTasks::SzAllocate } GPOS_CATCH_EX(ex) { - elog(ERROR, "no available memory to allocate string buffer"); + elog(WARNING, "no available memory to allocate string buffer"); + GPOS_RAISE(gpdxl::ExmaDXL, gpdxl::ExmiWarningAsError); } GPOS_CATCH_END; @@ -1879,8 +1880,9 @@ COptTasks::UlCmpt return rgcmpt[ul]; } } - - elog(ERROR, "Invalid comparison type code. Valid values are Eq, NEq, LT, LEq, GT, GEq"); + + elog(WARNING, "Invalid comparison type code. Valid values are Eq, NEq, LT, LEq, GT, GEq"); + GPOS_RAISE(gpdxl::ExmaDXL, gpdxl::ExmiWarningAsError); return CmptOther; }
