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 269F0200B72 for ; Thu, 11 Aug 2016 22:27:45 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 252A7160A90; Thu, 11 Aug 2016 20:27:45 +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 6DE3A160A93 for ; Thu, 11 Aug 2016 22:27:44 +0200 (CEST) Received: (qmail 25074 invoked by uid 500); 11 Aug 2016 20:27:43 -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 25026 invoked by uid 99); 11 Aug 2016 20:27:43 -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; Thu, 11 Aug 2016 20:27:43 +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 285F81A6231 for ; Thu, 11 Aug 2016 20:27:43 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -4.646 X-Spam-Level: X-Spam-Status: No, score=-4.646 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=-1.426] 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 EuVFJdjbesgM for ; Thu, 11 Aug 2016 20:27:42 +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 12C405F610 for ; Thu, 11 Aug 2016 20:27:41 +0000 (UTC) Received: (qmail 24966 invoked by uid 99); 11 Aug 2016 20:27:41 -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, 11 Aug 2016 20:27:41 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 83251E38BC; Thu, 11 Aug 2016 20:27:41 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jianqiao@apache.org To: commits@quickstep.incubator.apache.org Date: Thu, 11 Aug 2016 20:27:45 -0000 Message-Id: <44d8ba8383fe4d17b2509a744cd6c7c3@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [05/16] incubator-quickstep git commit: Fixed bugs in creating WorkOrderProtos. archived-at: Thu, 11 Aug 2016 20:27:45 -0000 Fixed bugs in creating WorkOrderProtos. Project: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/commit/2c0ce6a3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/tree/2c0ce6a3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/diff/2c0ce6a3 Branch: refs/heads/LIP-for-tpch Commit: 2c0ce6a3bcf2ec40b0c32d077552cda3e225f787 Parents: 85e02de Author: Zuyu Zhang Authored: Mon Aug 8 18:42:32 2016 -0700 Committer: Zuyu Zhang Committed: Tue Aug 9 10:42:25 2016 -0700 ---------------------------------------------------------------------- relational_operators/HashJoinOperator.cpp | 1 + relational_operators/WorkOrderFactory.cpp | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/2c0ce6a3/relational_operators/HashJoinOperator.cpp ---------------------------------------------------------------------- diff --git a/relational_operators/HashJoinOperator.cpp b/relational_operators/HashJoinOperator.cpp index 7851f41..779c0fe 100644 --- a/relational_operators/HashJoinOperator.cpp +++ b/relational_operators/HashJoinOperator.cpp @@ -393,6 +393,7 @@ bool HashJoinOperator::getAllOuterJoinWorkOrderProtos(WorkOrderProtosContainer * serialization::WorkOrder* HashJoinOperator::createOuterJoinWorkOrderProto(const block_id block) { serialization::WorkOrder *proto = new serialization::WorkOrder; proto->set_work_order_type(serialization::HASH_JOIN); + proto->set_query_id(query_id_); proto->SetExtension(serialization::HashJoinWorkOrder::hash_join_work_order_type, serialization::HashJoinWorkOrder::HASH_OUTER_JOIN); http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/2c0ce6a3/relational_operators/WorkOrderFactory.cpp ---------------------------------------------------------------------- diff --git a/relational_operators/WorkOrderFactory.cpp b/relational_operators/WorkOrderFactory.cpp index 721d735..7d7af59 100644 --- a/relational_operators/WorkOrderFactory.cpp +++ b/relational_operators/WorkOrderFactory.cpp @@ -533,13 +533,11 @@ bool WorkOrderFactory::ProtoIsValid(const serialization::WorkOrder &proto, return false; } - const CatalogRelationSchema &build_relation = catalog_database.getRelationSchemaById(build_relation_id); const CatalogRelationSchema &probe_relation = catalog_database.getRelationSchemaById(probe_relation_id); for (int i = 0; i < proto.ExtensionSize(serialization::HashJoinWorkOrder::join_key_attributes); ++i) { const attribute_id attr_id = proto.GetExtension(serialization::HashJoinWorkOrder::join_key_attributes, i); - if (!build_relation.hasAttributeWithId(attr_id) || - !probe_relation.hasAttributeWithId(attr_id)) { + if (!probe_relation.hasAttributeWithId(attr_id)) { return false; } }