Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 469F8200C26 for ; Fri, 10 Feb 2017 15:45:27 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 45637160B5C; Fri, 10 Feb 2017 14:45:27 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 969BC160B5B for ; Fri, 10 Feb 2017 15:45:26 +0100 (CET) Received: (qmail 40388 invoked by uid 500); 10 Feb 2017 14:45:25 -0000 Mailing-List: contact commits-help@quickstep.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@quickstep.incubator.apache.org Delivered-To: mailing list commits@quickstep.incubator.apache.org Received: (qmail 40369 invoked by uid 99); 10 Feb 2017 14:45:25 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 10 Feb 2017 14:45:25 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id 4AA37C05D7 for ; Fri, 10 Feb 2017 14:45:25 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -6.219 X-Spam-Level: X-Spam-Status: No, score=-6.219 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=-2.999] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id cM_YDMYma9SZ for ; Fri, 10 Feb 2017 14:45:24 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with SMTP id A41CA5FBE4 for ; Fri, 10 Feb 2017 14:45:23 +0000 (UTC) Received: (qmail 40002 invoked by uid 99); 10 Feb 2017 14:45:22 -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; Fri, 10 Feb 2017 14:45:22 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 98204F17D4; Fri, 10 Feb 2017 14:45:22 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: zuyuz@apache.org To: commits@quickstep.incubator.apache.org Date: Fri, 10 Feb 2017 14:45:37 -0000 Message-Id: In-Reply-To: <5a7ed801f527465eaaa20f5f6e98cf1d@git.apache.org> References: <5a7ed801f527465eaaa20f5f6e98cf1d@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [16/31] incubator-quickstep git commit: Revert "A workaround to remove query result relation in the distributed version." archived-at: Fri, 10 Feb 2017 14:45:27 -0000 Revert "A workaround to remove query result relation in the distributed version." This reverts commit aef1c3586580cfa72eb031fafe08700f6d5d9a86. Project: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/commit/dd8747fd Tree: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/tree/dd8747fd Diff: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/diff/dd8747fd Branch: refs/heads/reorder-partitioned-hash-join Commit: dd8747fd7aba95ce2f0f325297e108bbac5d958d Parents: 3b65b0f Author: Zuyu Zhang Authored: Wed Feb 8 00:02:27 2017 -0800 Committer: Zuyu Zhang Committed: Wed Feb 8 00:35:53 2017 -0800 ---------------------------------------------------------------------- query_execution/ForemanDistributed.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/dd8747fd/query_execution/ForemanDistributed.cpp ---------------------------------------------------------------------- diff --git a/query_execution/ForemanDistributed.cpp b/query_execution/ForemanDistributed.cpp index e6f22ec..4d95f16 100644 --- a/query_execution/ForemanDistributed.cpp +++ b/query_execution/ForemanDistributed.cpp @@ -201,12 +201,8 @@ void ForemanDistributed::run() { // TODO(quickstep-team): Dynamically scale-up/down Shiftbosses. if (query_result_saved_shiftbosses_[query_id].size() == shiftboss_directory_.size()) { - const relation_id result_relation_id = proto.relation_id(); - processSaveQueryResultResponseMessage(proto.cli_id(), result_relation_id); + processSaveQueryResultResponseMessage(proto.cli_id(), proto.relation_id()); query_result_saved_shiftbosses_.erase(query_id); - - // TODO(zuyu): Refactor to clean-up blocks in Shiftbosses. - catalog_database_->dropRelationById(result_relation_id); } break; }