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 B9DDE200B66 for ; Thu, 4 Aug 2016 03:56:34 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id B6F09160AAA; Thu, 4 Aug 2016 01:56:34 +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 09034160A86 for ; Thu, 4 Aug 2016 03:56:33 +0200 (CEST) Received: (qmail 37464 invoked by uid 500); 4 Aug 2016 01:56:33 -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 37455 invoked by uid 99); 4 Aug 2016 01:56:33 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 04 Aug 2016 01:56:33 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id D8446CB9A6 for ; Thu, 4 Aug 2016 01:56:32 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -4.465 X-Spam-Level: X-Spam-Status: No, score=-4.465 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.245] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id PjsT3-15DPmN for ; Thu, 4 Aug 2016 01:56:32 +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 85A6660E2F for ; Thu, 4 Aug 2016 01:56:31 +0000 (UTC) Received: (qmail 37418 invoked by uid 99); 4 Aug 2016 01:56: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; Thu, 04 Aug 2016 01:56:30 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 7F800E3839; Thu, 4 Aug 2016 01:56:30 +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, 04 Aug 2016 01:56:30 -0000 Message-Id: <89888031d70740e681cd5174c1aa573f@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [01/13] incubator-quickstep git commit: Refactored getProto in CatalogRelation. [Forced Update!] archived-at: Thu, 04 Aug 2016 01:56:34 -0000 Repository: incubator-quickstep Updated Branches: refs/heads/LIP-for-tpch 97d8dca85 -> 5e22b396c (forced update) Refactored getProto in CatalogRelation. Project: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/commit/e53186e5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/tree/e53186e5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/diff/e53186e5 Branch: refs/heads/LIP-for-tpch Commit: e53186e5547ac619a67aabdfacbb1abdbca78b60 Parents: aaecc76 Author: Zuyu Zhang Authored: Sat Jul 30 06:29:05 2016 -0700 Committer: Zuyu Zhang Committed: Sat Jul 30 06:29:05 2016 -0700 ---------------------------------------------------------------------- catalog/CatalogRelation.cpp | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/e53186e5/catalog/CatalogRelation.cpp ---------------------------------------------------------------------- diff --git a/catalog/CatalogRelation.cpp b/catalog/CatalogRelation.cpp index 01aebb5..682b6be 100644 --- a/catalog/CatalogRelation.cpp +++ b/catalog/CatalogRelation.cpp @@ -143,21 +143,7 @@ CatalogRelation::CatalogRelation(const serialization::CatalogRelationSchema &pro } serialization::CatalogRelationSchema CatalogRelation::getProto() const { - serialization::CatalogRelationSchema proto; - - proto.set_relation_id(id_); - proto.set_name(name_); - proto.set_temporary(temporary_); - - for (PtrVector::const_iterator it = attr_vec_.begin(); - it != attr_vec_.end(); - ++it) { - if (it.isNull()) { - proto.add_attributes(); - } else { - proto.add_attributes()->MergeFrom(it->getProto()); - } - } + serialization::CatalogRelationSchema proto = CatalogRelationSchema::getProto(); proto.MutableExtension(serialization::CatalogRelation::default_layout) ->MergeFrom(getDefaultStorageBlockLayout().getDescription());