From commits-return-1929-apmail-quickstep-commits-archive=quickstep.apache.org@quickstep.incubator.apache.org Thu Aug 4 00:19:28 2016 Return-Path: X-Original-To: apmail-quickstep-commits-archive@minotaur.apache.org Delivered-To: apmail-quickstep-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 A3259190CC for ; Thu, 4 Aug 2016 00:19:28 +0000 (UTC) Received: (qmail 38639 invoked by uid 500); 4 Aug 2016 00:19:28 -0000 Delivered-To: apmail-quickstep-commits-archive@quickstep.apache.org Received: (qmail 38607 invoked by uid 500); 4 Aug 2016 00:19:28 -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 38598 invoked by uid 99); 4 Aug 2016 00:19:28 -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 00:19:28 +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 0274EC2895 for ; Thu, 4 Aug 2016 00:19:28 +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 Eo3LTHAVYteM for ; Thu, 4 Aug 2016 00:19:27 +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 537405F24E for ; Thu, 4 Aug 2016 00:19:26 +0000 (UTC) Received: (qmail 38590 invoked by uid 99); 4 Aug 2016 00:19:25 -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 00:19:25 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 760EDE3839; Thu, 4 Aug 2016 00:19:25 +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 Message-Id: <6d4a8fd6e5ff42d3b9a57fd11611149a@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: incubator-quickstep git commit: Constructed Generators once in the optimizer. Date: Thu, 4 Aug 2016 00:19:25 +0000 (UTC) Repository: incubator-quickstep Updated Branches: refs/heads/refactor-optimizer [created] 15d2cbd6d Constructed Generators once in the optimizer. Project: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/commit/15d2cbd6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/tree/15d2cbd6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/diff/15d2cbd6 Branch: refs/heads/refactor-optimizer Commit: 15d2cbd6d7f3814956bf92e264a34d7064d7dfc7 Parents: 1b07eaa Author: Zuyu Zhang Authored: Wed Aug 3 17:19:07 2016 -0700 Committer: Zuyu Zhang Committed: Wed Aug 3 17:19:07 2016 -0700 ---------------------------------------------------------------------- query_optimizer/Optimizer.cpp | 6 ++---- query_optimizer/Optimizer.hpp | 7 ++++++- 2 files changed, 8 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/15d2cbd6/query_optimizer/Optimizer.cpp ---------------------------------------------------------------------- diff --git a/query_optimizer/Optimizer.cpp b/query_optimizer/Optimizer.cpp index 08629fc..644b2a3 100644 --- a/query_optimizer/Optimizer.cpp +++ b/query_optimizer/Optimizer.cpp @@ -26,13 +26,11 @@ namespace optimizer { void Optimizer::generateQueryHandle(const ParseStatement &parse_statement, QueryHandle *query_handle) { - LogicalGenerator logical_generator(&optimizer_context_); - PhysicalGenerator physical_generator; ExecutionGenerator execution_generator(&optimizer_context_, query_handle); execution_generator.generatePlan( - physical_generator.generatePlan( - logical_generator.generatePlan(parse_statement))); + physical_generator_.generatePlan( + logical_generator_.generatePlan(parse_statement))); } } // namespace optimizer http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/15d2cbd6/query_optimizer/Optimizer.hpp ---------------------------------------------------------------------- diff --git a/query_optimizer/Optimizer.hpp b/query_optimizer/Optimizer.hpp index 18c927d..f90fbe4 100644 --- a/query_optimizer/Optimizer.hpp +++ b/query_optimizer/Optimizer.hpp @@ -18,7 +18,9 @@ #ifndef QUICKSTEP_QUERY_OPTIMIZER_OPTIMIZER_HPP_ #define QUICKSTEP_QUERY_OPTIMIZER_OPTIMIZER_HPP_ +#include "query_optimizer/LogicalGenerator.hpp" #include "query_optimizer/OptimizerContext.hpp" +#include "query_optimizer/PhysicalGenerator.hpp" #include "utility/Macros.hpp" namespace quickstep { @@ -48,7 +50,8 @@ class Optimizer { */ Optimizer(CatalogDatabase *database, StorageManager *storage_manager) - : optimizer_context_(database, storage_manager) {} + : optimizer_context_(database, storage_manager), + logical_generator_(&optimizer_context_) {} /** * @brief Destructor. @@ -77,6 +80,8 @@ class Optimizer { private: OptimizerContext optimizer_context_; + LogicalGenerator logical_generator_; + PhysicalGenerator physical_generator_; DISALLOW_COPY_AND_ASSIGN(Optimizer); };