HAWQ-1808. fix access null pointer

apache · Sep 22, 2021 · 750a601 · 750a601
1 parent 7a55874
commit 750a601
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 12 deletions.
diff --git 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
@@ -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);
   }