Return-Path: X-Original-To: apmail-hawq-commits-archive@minotaur.apache.org Delivered-To: apmail-hawq-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 145C319513 for ; Mon, 21 Mar 2016 22:01:35 +0000 (UTC) Received: (qmail 3155 invoked by uid 500); 21 Mar 2016 22:01:35 -0000 Delivered-To: apmail-hawq-commits-archive@hawq.apache.org Received: (qmail 3050 invoked by uid 500); 21 Mar 2016 22:01:35 -0000 Mailing-List: contact commits-help@hawq.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hawq.incubator.apache.org Delivered-To: mailing list commits@hawq.incubator.apache.org Received: (qmail 2965 invoked by uid 99); 21 Mar 2016 22:01:34 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 21 Mar 2016 22:01:34 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id 66DCE1A1239 for ; Mon, 21 Mar 2016 22:01:34 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -3.221 X-Spam-Level: X-Spam-Status: No, score=-3.221 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.001] autolearn=disabled Received: from mx1-lw-us.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id vW7X5B-VOq23 for ; Mon, 21 Mar 2016 22:01:32 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-us.apache.org (ASF Mail Server at mx1-lw-us.apache.org) with SMTP id 642425FAF4 for ; Mon, 21 Mar 2016 22:01:31 +0000 (UTC) Received: (qmail 1533 invoked by uid 99); 21 Mar 2016 22:01:30 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 21 Mar 2016 22:01:30 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B4C4DDFFCD; Mon, 21 Mar 2016 22:01:30 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: shivram@apache.org To: commits@hawq.incubator.apache.org Date: Mon, 21 Mar 2016 22:01:34 -0000 Message-Id: In-Reply-To: <7dd36c8d476046af952cee0ed0085296@git.apache.org> References: <7dd36c8d476046af952cee0ed0085296@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [05/50] incubator-hawq git commit: HAWQ-524. Modify processing for cdbDispatchResult->resultBuf when creation and free HAWQ-524. Modify processing for cdbDispatchResult->resultBuf when creation and free Project: http://git-wip-us.apache.org/repos/asf/incubator-hawq/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-hawq/commit/ac26f48f Tree: http://git-wip-us.apache.org/repos/asf/incubator-hawq/tree/ac26f48f Diff: http://git-wip-us.apache.org/repos/asf/incubator-hawq/diff/ac26f48f Branch: refs/heads/HAWQ-459 Commit: ac26f48fd44af17c26cee0ce48a44bf50ddeb9ca Parents: 4b53168 Author: Lili Ma Authored: Mon Mar 14 17:47:42 2016 +0800 Committer: Lili Ma Committed: Tue Mar 15 09:38:40 2016 +0800 ---------------------------------------------------------------------- src/backend/cdb/cdbdispatchresult.c | 19 +++++++++++-------- src/backend/cdb/executormgr.c | 4 +++- 2 files changed, 14 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/ac26f48f/src/backend/cdb/cdbdispatchresult.c ---------------------------------------------------------------------- diff --git a/src/backend/cdb/cdbdispatchresult.c b/src/backend/cdb/cdbdispatchresult.c index b036b26..9ba90c0 100644 --- a/src/backend/cdb/cdbdispatchresult.c +++ b/src/backend/cdb/cdbdispatchresult.c @@ -183,15 +183,18 @@ void cdbdisp_resetResult(CdbDispatchResult *dispatchResult) { PQExpBuffer buf = dispatchResult->resultbuf; - PGresult **begp = (PGresult **)buf->data; - PGresult **endp = (PGresult **)(buf->data + buf->len); - PGresult **p; - - /* Free the PGresult objects. */ - for (p = begp; p < endp; ++p) + if (buf != NULL) { - Assert(*p != NULL); - PQclear(*p); + PGresult **begp = (PGresult **)buf->data; + PGresult **endp = (PGresult **)(buf->data + buf->len); + PGresult **p; + + /* Free the PGresult objects. */ + for (p = begp; p < endp; ++p) + { + Assert(*p != NULL); + PQclear(*p); + } } /* Reset summary indicators. */ http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/ac26f48f/src/backend/cdb/executormgr.c ---------------------------------------------------------------------- diff --git a/src/backend/cdb/executormgr.c b/src/backend/cdb/executormgr.c index 88dd32f..47f5bbe 100644 --- a/src/backend/cdb/executormgr.c +++ b/src/backend/cdb/executormgr.c @@ -220,7 +220,9 @@ executormgr_bind_executor_task(struct DispatchData *data, executor->refResult = cdbdisp_makeResult(dispatch_get_results(data), executor->desc, dispatch_get_task_identity(task)->slice_id); - Assert(executor->refResult != NULL); + + if (executor->refResult == NULL) + return false; /* Transfer any connection errors from segdbDesc. */ executormgr_merge_error(executor);