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 5CAF11953B for ; Thu, 17 Mar 2016 01:20:42 +0000 (UTC) Received: (qmail 40980 invoked by uid 500); 17 Mar 2016 01:20:42 -0000 Delivered-To: apmail-hawq-commits-archive@hawq.apache.org Received: (qmail 40936 invoked by uid 500); 17 Mar 2016 01:20:42 -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 40927 invoked by uid 99); 17 Mar 2016 01:20:42 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 17 Mar 2016 01:20:42 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id B83C8180316 for ; Thu, 17 Mar 2016 01:20:41 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -3.549 X-Spam-Level: X-Spam-Status: No, score=-3.549 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.329] autolearn=disabled Received: from mx2-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id 3Xx0oM--lS37 for ; Thu, 17 Mar 2016 01:20:40 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx2-lw-eu.apache.org (ASF Mail Server at mx2-lw-eu.apache.org) with SMTP id D45DC5F3F5 for ; Thu, 17 Mar 2016 01:20:39 +0000 (UTC) Received: (qmail 40919 invoked by uid 99); 17 Mar 2016 01:20:39 -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; Thu, 17 Mar 2016 01:20:39 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id DD363DFA44; Thu, 17 Mar 2016 01:20:38 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: hubertzhang@apache.org To: commits@hawq.incubator.apache.org Date: Thu, 17 Mar 2016 01:20:38 -0000 Message-Id: <19a0fa4c0073497d9d9d47a9de8d74ec@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] incubator-hawq git commit: Revert "HAWQ-533. Cursor failed, if don't allocate resource in prepare." Repository: incubator-hawq Updated Branches: refs/heads/master d259efffb -> fd2022772 Revert "HAWQ-533. Cursor failed, if don't allocate resource in prepare." This reverts commit 96345af194bfd3ca05227037479c9835a5e495b0. Project: http://git-wip-us.apache.org/repos/asf/incubator-hawq/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-hawq/commit/bc065a51 Tree: http://git-wip-us.apache.org/repos/asf/incubator-hawq/tree/bc065a51 Diff: http://git-wip-us.apache.org/repos/asf/incubator-hawq/diff/bc065a51 Branch: refs/heads/master Commit: bc065a51fe1e04c15c398a6d15c5d01424efb52f Parents: d259eff Author: hzhang2 Authored: Thu Mar 17 09:18:50 2016 +0800 Committer: hzhang2 Committed: Thu Mar 17 09:18:50 2016 +0800 ---------------------------------------------------------------------- src/backend/executor/spi.c | 24 +++++------------------- 1 file changed, 5 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/bc065a51/src/backend/executor/spi.c ---------------------------------------------------------------------- diff --git a/src/backend/executor/spi.c b/src/backend/executor/spi.c index 9465de8..8e7645c 100644 --- a/src/backend/executor/spi.c +++ b/src/backend/executor/spi.c @@ -1146,20 +1146,6 @@ SPI_cursor_open(const char *name, SPIPlanPtr plan, qtlist = copyObject(qtlist); ptlist = copyObject(ptlist); - PlannedStmt* stmt = (PlannedStmt*)linitial(ptlist); - - if ( (Gp_role == GP_ROLE_DISPATCH) && - (stmt->resource_parameters != NULL) ) - { - /* - * Now, we want to allocate resource. - */ - stmt->resource = AllocateResource(stmt->resource_parameters->life, stmt->resource_parameters->slice_size, - stmt->resource_parameters->iobytes, stmt->resource_parameters->max_target_segment_num, - stmt->resource_parameters->min_target_segment_num, stmt->resource_parameters->vol_info, - stmt->resource_parameters->vol_info_size); - } - /* If the plan has parameters, set them up */ if (spiplan->nargs > 0) { @@ -1860,12 +1846,12 @@ _SPI_execute_plan(_SPI_plan * plan, Datum *Values, const char *Nulls, * We only allocate resource for multiple executions of queries, NOT for utility commands. * SELECT/INSERT are supported at present. */ - if((queryTree->commandType == CMD_SELECT) || - (queryTree->commandType == CMD_INSERT)) + if( (queryTree->commandType == CMD_SELECT) || + (queryTree->commandType == CMD_INSERT) ) { - if ((Gp_role == GP_ROLE_DISPATCH) && - (stmt->resource == NULL) && - (stmt->resource_parameters != NULL)) + if ( (Gp_role == GP_ROLE_DISPATCH) && + (stmt->resource == NULL) && + (stmt->resource_parameters != NULL) ) { SplitAllocResult *allocResult = NULL;