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 84FD4200C54 for ; Wed, 29 Mar 2017 02:08:10 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 83C54160BA1; Wed, 29 Mar 2017 00:08:10 +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 AEA8E160B9C for ; Wed, 29 Mar 2017 02:08:09 +0200 (CEST) Received: (qmail 8539 invoked by uid 500); 29 Mar 2017 00:08:08 -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 8483 invoked by uid 99); 29 Mar 2017 00:08:08 -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; Wed, 29 Mar 2017 00:08:08 +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 6A1C8C6858 for ; Wed, 29 Mar 2017 00:08:08 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -4.222 X-Spam-Level: X-Spam-Status: No, score=-4.222 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.001, SPF_PASS=-0.001] autolearn=disabled Received: from mx1-lw-us.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id PkY5U_8H621y for ; Wed, 29 Mar 2017 00:08:07 +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 B4B8B60E2E for ; Wed, 29 Mar 2017 00:08:06 +0000 (UTC) Received: (qmail 7928 invoked by uid 99); 29 Mar 2017 00:08:06 -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; Wed, 29 Mar 2017 00:08:06 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id DFFC0EF7C4; Wed, 29 Mar 2017 00:08:05 +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: Wed, 29 Mar 2017 00:08:25 -0000 Message-Id: <2fa1930d859a46389f49c54da77c5a34@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [21/40] incubator-quickstep git commit: Minor refactored RangePartitionSchemeHeader::getProto. archived-at: Wed, 29 Mar 2017 00:08:10 -0000 Minor refactored RangePartitionSchemeHeader::getProto. Project: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/commit/4ad6cec7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/tree/4ad6cec7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/diff/4ad6cec7 Branch: refs/heads/new-op Commit: 4ad6cec7b135759db8d920470a5af13e40c502e7 Parents: 15d96da Author: Zuyu Zhang Authored: Fri Mar 17 12:29:34 2017 -0700 Committer: Zuyu Zhang Committed: Fri Mar 17 15:42:28 2017 -0700 ---------------------------------------------------------------------- catalog/PartitionSchemeHeader.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/4ad6cec7/catalog/PartitionSchemeHeader.cpp ---------------------------------------------------------------------- diff --git a/catalog/PartitionSchemeHeader.cpp b/catalog/PartitionSchemeHeader.cpp index a4a9063..0472fe6 100644 --- a/catalog/PartitionSchemeHeader.cpp +++ b/catalog/PartitionSchemeHeader.cpp @@ -113,7 +113,8 @@ serialization::PartitionSchemeHeader PartitionSchemeHeader::getProto() const { proto.set_partition_type(serialization::PartitionSchemeHeader::HASH); break; case PartitionType::kRange: - LOG(FATAL) << "RangePartitionSchemeHeader should call the overridden method."; + proto.set_partition_type(serialization::PartitionSchemeHeader::RANGE); + break; default: LOG(FATAL) << "Invalid Partition Type."; } @@ -125,11 +126,7 @@ serialization::PartitionSchemeHeader PartitionSchemeHeader::getProto() const { } serialization::PartitionSchemeHeader RangePartitionSchemeHeader::getProto() const { - serialization::PartitionSchemeHeader proto; - - proto.set_partition_type(serialization::PartitionSchemeHeader::RANGE); - proto.set_num_partitions(num_partitions_); - proto.set_partition_attribute_id(partition_attribute_id_); + serialization::PartitionSchemeHeader proto = PartitionSchemeHeader::getProto(); proto.MutableExtension(serialization::RangePartitionSchemeHeader::partition_attr_type) ->MergeFrom(partition_attr_type_->getProto());