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 BD64E200C12 for ; Sun, 5 Feb 2017 23:04:29 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id BC00C160B65; Sun, 5 Feb 2017 22:04:29 +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 D677D160B67 for ; Sun, 5 Feb 2017 23:04:28 +0100 (CET) Received: (qmail 19800 invoked by uid 500); 5 Feb 2017 22:04: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 19781 invoked by uid 99); 5 Feb 2017 22:04:28 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 05 Feb 2017 22:04:28 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id A665E1800B9 for ; Sun, 5 Feb 2017 22:04:27 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-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-us.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id csd5DPKioOX3 for ; Sun, 5 Feb 2017 22:04:26 +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 F3D4361F0A for ; Sun, 5 Feb 2017 22:04:15 +0000 (UTC) Received: (qmail 15215 invoked by uid 99); 5 Feb 2017 22:03:00 -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; Sun, 05 Feb 2017 22:03:00 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id AEC5EE0210; Sun, 5 Feb 2017 22:03:00 +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: Sun, 05 Feb 2017 22:04:04 -0000 Message-Id: <0d956e31af11404680fd4ddbbe690989@git.apache.org> In-Reply-To: <7502d29a1528461f98a18745f998b7b9@git.apache.org> References: <7502d29a1528461f98a18745f998b7b9@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [66/72] incubator-quickstep git commit: Fixed the linking issue for the distributed cli. archived-at: Sun, 05 Feb 2017 22:04:29 -0000 Fixed the linking issue for the distributed cli. Project: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/commit/7727e773 Tree: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/tree/7727e773 Diff: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/diff/7727e773 Branch: refs/heads/reorder-partitioned-hash-join Commit: 7727e7735630a064c1feff9985143463b61002d6 Parents: 6ec9e9d Author: Zuyu Zhang Authored: Thu Feb 2 19:13:09 2017 -0800 Committer: Zuyu Zhang Committed: Thu Feb 2 19:13:09 2017 -0800 ---------------------------------------------------------------------- CMakeLists.txt | 23 +++++++++++++++++++---- cli/distributed/CMakeLists.txt | 20 -------------------- 2 files changed, 19 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/7727e773/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/CMakeLists.txt b/CMakeLists.txt index ccb23a3..85210ef 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -808,17 +808,32 @@ target_link_libraries(quickstep_cli_shell ${LIBS}) if (ENABLE_DISTRIBUTED) # Build the quickstep_distributed_cli_shell executable. - add_executable (quickstep_distributed_cli_shell cli/distributed/QuickstepDistributedCli.cpp) + add_executable (quickstep_distributed_cli_shell + cli/distributed/Cli.hpp + cli/distributed/Cli.cpp + cli/distributed/QuickstepDistributedCli.cpp) # Link against direct deps (will transitively pull in everything needed). - # NOTE(zuyu): Link quickstep_cli_LineReader on behalf of quickstep_cli_distributed_Cli, - # as a workaround for bypassing conditionally built target checks in validate_cmakelists.py. target_link_libraries(quickstep_distributed_cli_shell glog + quickstep_catalog_CatalogRelation + quickstep_cli_Flags quickstep_cli_LineReader - quickstep_cli_distributed_Cli + quickstep_cli_PrintToScreen quickstep_cli_distributed_Conductor quickstep_cli_distributed_Executor + quickstep_cli_distributed_Role + quickstep_parser_ParseStatement + quickstep_parser_SqlParserWrapper + quickstep_queryexecution_BlockLocatorUtil + quickstep_queryexecution_QueryExecutionMessages_proto + quickstep_queryexecution_QueryExecutionTypedefs + quickstep_queryexecution_QueryExecutionUtil + quickstep_storage_DataExchangerAsync + quickstep_storage_StorageBlockInfo + quickstep_storage_StorageManager + quickstep_utility_Macros quickstep_utility_StringUtil + tmb ${GFLAGS_LIB_NAME} ${GRPCPLUSPLUS_LIBRARIES}) endif(ENABLE_DISTRIBUTED) http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/7727e773/cli/distributed/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/cli/distributed/CMakeLists.txt b/cli/distributed/CMakeLists.txt index a00ffda..b46082f 100644 --- a/cli/distributed/CMakeLists.txt +++ b/cli/distributed/CMakeLists.txt @@ -18,30 +18,11 @@ set_gflags_lib_name () # Declare micro-libs and link dependencies: -add_library(quickstep_cli_distributed_Cli Cli.cpp Cli.hpp) add_library(quickstep_cli_distributed_Conductor Conductor.cpp Conductor.hpp) add_library(quickstep_cli_distributed_Executor Executor.cpp Executor.hpp) add_library(quickstep_cli_distributed_Role Role.cpp Role.hpp) # Link dependencies: -target_link_libraries(quickstep_cli_distributed_Cli - glog - quickstep_catalog_CatalogRelation - quickstep_cli_Flags - quickstep_cli_PrintToScreen - quickstep_cli_distributed_Role - quickstep_parser_ParseStatement - quickstep_parser_SqlParserWrapper - quickstep_queryexecution_BlockLocatorUtil - quickstep_queryexecution_QueryExecutionMessages_proto - quickstep_queryexecution_QueryExecutionTypedefs - quickstep_queryexecution_QueryExecutionUtil - quickstep_storage_DataExchangerAsync - quickstep_storage_StorageBlockInfo - quickstep_storage_StorageManager - quickstep_utility_Macros - quickstep_utility_StringUtil - tmb) target_link_libraries(quickstep_cli_distributed_Conductor glog quickstep_cli_DefaultsConfigurator @@ -83,7 +64,6 @@ target_link_libraries(quickstep_cli_distributed_Role add_library(quickstep_cli_distributed ../../empty_src.cpp CliDistributedModule.hpp) target_link_libraries(quickstep_cli_distributed - quickstep_cli_distributed_Cli quickstep_cli_distributed_Conductor quickstep_cli_distributed_Executor quickstep_cli_distributed_Role)