This is an automated email from the ASF dual-hosted git repository. ztao1987 pushed a commit to branch taoz in repository https://gitbox.apache.org/repos/asf/hawq.git
The following commit(s) were added to refs/heads/taoz by this push: new 92d7020 HAWQ-1808. fix access null pointer 92d7020 is described below commit 92d7020819fa3de2cb519a28e5b1d8da2678e640 Author: ztao1987 <zhenglin.ta...@gmail.com> AuthorDate: Wed Sep 22 09:08:49 2021 +0800 HAWQ-1808. fix access null pointer --- src/backend/cdb/executormgr.c | 5 +---- src/backend/cdb/executormgr_new.c | 10 ++-------- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/src/backend/cdb/executormgr.c b/src/backend/cdb/executormgr.c index c808dcf..986c458 100644 --- a/src/backend/cdb/executormgr.c +++ b/src/backend/cdb/executormgr.c @@ -355,10 +355,7 @@ executormgr_cancel(QueryExecutor *executor) success = (PQcancel(cn, errbuf, sizeof(errbuf)) != 0); if(!success){ - write_log("executormgr_cancel cancel (seg%d %s:%d) failed", - executor->desc->segment->segindex, - executor->desc->segment->hostname, - executor->desc->segment->port); + write_log("executormgr_cancel cancel failed, %s.", errbuf); } #if 0 diff --git a/src/backend/cdb/executormgr_new.c b/src/backend/cdb/executormgr_new.c index 9b35b16..910ca6f 100644 --- a/src/backend/cdb/executormgr_new.c +++ b/src/backend/cdb/executormgr_new.c @@ -468,10 +468,7 @@ bool executormgr_main_cancel(struct MyQueryExecutor *qe) { MemSet(errbuf, 0, sizeof(errbuf)); bool success = (PQcancel(cn, errbuf, sizeof(errbuf)) != 0); if(!success){ - write_log("executormgr_cancel cancel (seg%d %s:%d) failed", - qe->desc->segment->segindex, - qe->desc->segment->hostname, - qe->desc->segment->port); + write_log("executormgr_main_cancel cancel failed, %s.", errbuf); } PQfreeCancel(cn); @@ -492,10 +489,7 @@ bool executormgr_proxy_cancel(struct MyQueryExecutor *qe, bool cancelRequest) { MemSet(errbuf, 0, sizeof(errbuf)); success = (PQcancel(cn, errbuf, sizeof(errbuf)) != 0); if(!success){ - write_log("executormgr_cancel cancel (seg%d %s:%d) failed", - qe->desc->segment->segindex, - qe->desc->segment->hostname, - qe->desc->segment->port); + write_log("executormgr_proxy_cancel cancel failed, %s.", errbuf); } PQfreeCancel(cn); }