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 29E4A200C2A for ; Wed, 1 Mar 2017 23:33:20 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 2861A160B70; Wed, 1 Mar 2017 22:33:20 +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 EB788160B56 for ; Wed, 1 Mar 2017 23:33:18 +0100 (CET) Received: (qmail 8937 invoked by uid 500); 1 Mar 2017 22:33:18 -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 8928 invoked by uid 99); 1 Mar 2017 22:33:18 -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; Wed, 01 Mar 2017 22:33:18 +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 9F3D41A7AE2 for ; Wed, 1 Mar 2017 22:33:17 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -6.567 X-Spam-Level: X-Spam-Status: No, score=-6.567 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=-2.999, SPF_NEUTRAL=0.652] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id 1qtDpizvX_iP for ; Wed, 1 Mar 2017 22:33:14 +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 9562C5F1EE for ; Wed, 1 Mar 2017 22:33:12 +0000 (UTC) Received: (qmail 6763 invoked by uid 99); 1 Mar 2017 22:32:37 -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, 01 Mar 2017 22:32:37 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B6CD0DFFC0; Wed, 1 Mar 2017 22:32:37 +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: Wed, 01 Mar 2017 22:32:39 -0000 Message-Id: In-Reply-To: <9ed097313bb14b37a34621475d7be234@git.apache.org> References: <9ed097313bb14b37a34621475d7be234@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/3] incubator-quickstep git commit: Style fixes in the distributed version. archived-at: Wed, 01 Mar 2017 22:33:20 -0000 Style fixes in the distributed version. Project: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/commit/5e0c32ac Tree: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/tree/5e0c32ac Diff: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/diff/5e0c32ac Branch: refs/heads/dist-fix Commit: 5e0c32acdf4080f4461e178aeea1af7d6eb80420 Parents: 6a240fc Author: Zuyu Zhang Authored: Tue Feb 28 14:19:17 2017 -0800 Committer: Zuyu Zhang Committed: Wed Mar 1 14:32:11 2017 -0800 ---------------------------------------------------------------------- cli/distributed/Cli.cpp | 4 +- cli/distributed/Conductor.cpp | 4 +- .../tests/DistributedExecutionGeneratorTest.cpp | 10 +- .../DistributedExecutionGeneratorTestRunner.cpp | 49 ++++-- .../DistributedExecutionGeneratorTestRunner.hpp | 45 +----- .../tests/execution_generator/CMakeLists.txt | 154 ++++++++++--------- 6 files changed, 127 insertions(+), 139 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/5e0c32ac/cli/distributed/Cli.cpp ---------------------------------------------------------------------- diff --git a/cli/distributed/Cli.cpp b/cli/distributed/Cli.cpp index 60b9c8d..6228898 100644 --- a/cli/distributed/Cli.cpp +++ b/cli/distributed/Cli.cpp @@ -48,8 +48,8 @@ typedef quickstep::LineReaderDumb LineReaderImpl; #include "query_execution/QueryExecutionTypedefs.hpp" #include "query_execution/QueryExecutionUtil.hpp" #include "storage/DataExchangerAsync.hpp" -#include "utility/StringUtil.hpp" #include "storage/StorageBlockInfo.hpp" +#include "utility/StringUtil.hpp" #include "tmb/address.h" #include "tmb/id_typedefs.h" @@ -76,7 +76,7 @@ using tmb::client_id; namespace quickstep { -namespace S = ::quickstep::serialization; +namespace S = serialization; void Cli::init() { cli_id_ = bus_.Connect(); http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/5e0c32ac/cli/distributed/Conductor.cpp ---------------------------------------------------------------------- diff --git a/cli/distributed/Conductor.cpp b/cli/distributed/Conductor.cpp index cf2eb4b..3c68bfb 100644 --- a/cli/distributed/Conductor.cpp +++ b/cli/distributed/Conductor.cpp @@ -63,13 +63,13 @@ using tmb::client_id; namespace quickstep { -namespace S = ::quickstep::serialization; +namespace S = serialization; void Conductor::init() { try { string catalog_path = FLAGS_storage_path + kCatalogFilename; - if (quickstep::FLAGS_initialize_db) { // Initialize the database + if (FLAGS_initialize_db) { // Initialize the database DefaultsConfigurator::InitializeDefaultDatabase(FLAGS_storage_path, catalog_path); } http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/5e0c32ac/query_optimizer/tests/DistributedExecutionGeneratorTest.cpp ---------------------------------------------------------------------- diff --git a/query_optimizer/tests/DistributedExecutionGeneratorTest.cpp b/query_optimizer/tests/DistributedExecutionGeneratorTest.cpp index 1e2120e..b18b5ec 100644 --- a/query_optimizer/tests/DistributedExecutionGeneratorTest.cpp +++ b/query_optimizer/tests/DistributedExecutionGeneratorTest.cpp @@ -39,6 +39,8 @@ DECLARE_bool(use_filter_joins); using quickstep::TextBasedTest; +using std::make_unique; + QUICKSTEP_GENERATE_TEXT_TEST(DISTRIBUTED_EXECUTION_GENERATOR_TEST); int main(int argc, char** argv) { @@ -59,11 +61,9 @@ int main(int argc, char** argv) { std::ifstream input_file(argv[1]); CHECK(input_file.is_open()) << argv[1]; - std::unique_ptr - test_runner( - new quickstep::optimizer::DistributedExecutionGeneratorTestRunner(argv[3])); - test_driver.reset( - new quickstep::TextBasedTestDriver(&input_file, test_runner.get())); + + auto test_runner = make_unique(argv[3]); + test_driver = make_unique(&input_file, test_runner.get()); test_driver->registerOption( quickstep::optimizer::DistributedExecutionGeneratorTestRunner::kResetOption); http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/5e0c32ac/query_optimizer/tests/DistributedExecutionGeneratorTestRunner.cpp ---------------------------------------------------------------------- diff --git a/query_optimizer/tests/DistributedExecutionGeneratorTestRunner.cpp b/query_optimizer/tests/DistributedExecutionGeneratorTestRunner.cpp index 6bd7a1f..3b1259a 100644 --- a/query_optimizer/tests/DistributedExecutionGeneratorTestRunner.cpp +++ b/query_optimizer/tests/DistributedExecutionGeneratorTestRunner.cpp @@ -37,8 +37,10 @@ #include "query_execution/ForemanDistributed.hpp" #include "query_execution/QueryExecutionTypedefs.hpp" #include "query_execution/QueryExecutionUtil.hpp" +#include "query_optimizer/Optimizer.hpp" #include "query_optimizer/OptimizerContext.hpp" #include "query_optimizer/QueryHandle.hpp" +#include "query_optimizer/tests/TestDatabaseLoader.hpp" #include "storage/DataExchangerAsync.hpp" #include "storage/StorageManager.hpp" #include "utility/MemStream.hpp" @@ -67,6 +69,8 @@ namespace optimizer { namespace { +constexpr int kNumInstances = 3; + void nop() {} } // namespace @@ -147,6 +151,35 @@ DistributedExecutionGeneratorTestRunner::DistributedExecutionGeneratorTestRunner } } +DistributedExecutionGeneratorTestRunner::~DistributedExecutionGeneratorTestRunner() { + const tmb::MessageBus::SendStatus send_status = + QueryExecutionUtil::SendTMBMessage(&bus_, cli_id_, foreman_->getBusClientID(), TaggedMessage(kPoisonMessage)); + CHECK(send_status == tmb::MessageBus::SendStatus::kOK); + + for (int i = 0; i < kNumInstances; ++i) { + workers_[i]->join(); + shiftbosses_[i]->join(); + } + + foreman_->join(); + + test_database_loader_data_exchanger_.shutdown(); + test_database_loader_.reset(); + for (int i = 0; i < kNumInstances; ++i) { + data_exchangers_[i].shutdown(); + storage_managers_[i].reset(); + } + + CHECK(MessageBus::SendStatus::kOK == + QueryExecutionUtil::SendTMBMessage(&bus_, cli_id_, locator_client_id_, TaggedMessage(kPoisonMessage))); + + test_database_loader_data_exchanger_.join(); + for (int i = 0; i < kNumInstances; ++i) { + data_exchangers_[i].join(); + } + block_locator_->join(); +} + void DistributedExecutionGeneratorTestRunner::runTestCase( const string &input, const std::set &options, string *output) { // TODO(qzeng): Test multi-threaded query execution when we have a Sort operator. @@ -174,27 +207,23 @@ void DistributedExecutionGeneratorTestRunner::runTestCase( const ParseStatement &parse_statement = *result.parsed_statement; std::printf("%s\n", parse_statement.toString().c_str()); - const CatalogRelation *query_result_relation = nullptr; + auto query_handle = std::make_unique(query_id_++, cli_id_); try { OptimizerContext optimizer_context; - auto query_handle = std::make_unique(query_id_++, cli_id_); - optimizer_.generateQueryHandle(parse_statement, test_database_loader_->catalog_database(), &optimizer_context, query_handle.get()); - query_result_relation = query_handle->getQueryResultRelation(); - - QueryExecutionUtil::ConstructAndSendAdmitRequestMessage( - cli_id_, - foreman_->getBusClientID(), - query_handle.release(), - &bus_); } catch (const SqlError &error) { *output = error.formatMessage(input); break; } + const CatalogRelation *query_result_relation = query_handle->getQueryResultRelation(); + + QueryExecutionUtil::ConstructAndSendAdmitRequestMessage( + cli_id_, foreman_->getBusClientID(), query_handle.release(), &bus_); + const tmb::AnnotatedMessage annotated_message = bus_.Receive(cli_id_, 0, true); DCHECK_EQ(kQueryExecutionSuccessMessage, annotated_message.tagged_message.message_type()); http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/5e0c32ac/query_optimizer/tests/DistributedExecutionGeneratorTestRunner.hpp ---------------------------------------------------------------------- diff --git a/query_optimizer/tests/DistributedExecutionGeneratorTestRunner.hpp b/query_optimizer/tests/DistributedExecutionGeneratorTestRunner.hpp index 2cd2427..2c0381b 100644 --- a/query_optimizer/tests/DistributedExecutionGeneratorTestRunner.hpp +++ b/query_optimizer/tests/DistributedExecutionGeneratorTestRunner.hpp @@ -31,7 +31,6 @@ #include "query_execution/BlockLocator.hpp" #include "query_execution/ForemanDistributed.hpp" #include "query_execution/QueryExecutionTypedefs.hpp" -#include "query_execution/QueryExecutionUtil.hpp" #include "query_execution/Shiftboss.hpp" #include "query_execution/Worker.hpp" #include "query_execution/WorkerDirectory.hpp" @@ -45,16 +44,10 @@ #include "glog/logging.h" #include "tmb/id_typedefs.h" -#include "tmb/message_bus.h" -#include "tmb/tagged_message.h" namespace quickstep { namespace optimizer { -namespace { -constexpr int kNumInstances = 3; -} // namespace - /** * @brief TextBasedTestRunner for testing the ExecutionGenerator in the * distributed version. @@ -72,43 +65,7 @@ class DistributedExecutionGeneratorTestRunner : public TextBasedTestRunner { */ explicit DistributedExecutionGeneratorTestRunner(const std::string &storage_path); - ~DistributedExecutionGeneratorTestRunner() { - tmb::TaggedMessage poison_tagged_message(quickstep::kPoisonMessage); - - const tmb::MessageBus::SendStatus send_status = - QueryExecutionUtil::SendTMBMessage( - &bus_, - cli_id_, - foreman_->getBusClientID(), - std::move(poison_tagged_message)); - CHECK(send_status == tmb::MessageBus::SendStatus::kOK); - - for (int i = 0; i < kNumInstances; ++i) { - workers_[i]->join(); - shiftbosses_[i]->join(); - } - - foreman_->join(); - - test_database_loader_data_exchanger_.shutdown(); - test_database_loader_.reset(); - for (int i = 0; i < kNumInstances; ++i) { - data_exchangers_[i].shutdown(); - storage_managers_[i].reset(); - } - - CHECK(MessageBus::SendStatus::kOK == - QueryExecutionUtil::SendTMBMessage(&bus_, - cli_id_, - locator_client_id_, - tmb::TaggedMessage(quickstep::kPoisonMessage))); - - test_database_loader_data_exchanger_.join(); - for (int i = 0; i < kNumInstances; ++i) { - data_exchangers_[i].join(); - } - block_locator_->join(); - } + ~DistributedExecutionGeneratorTestRunner(); void runTestCase(const std::string &input, const std::set &options, http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/5e0c32ac/query_optimizer/tests/execution_generator/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/query_optimizer/tests/execution_generator/CMakeLists.txt b/query_optimizer/tests/execution_generator/CMakeLists.txt index d38f4aa..40629ee 100644 --- a/query_optimizer/tests/execution_generator/CMakeLists.txt +++ b/query_optimizer/tests/execution_generator/CMakeLists.txt @@ -15,68 +15,6 @@ # specific language governing permissions and limitations # under the License. -if (ENABLE_DISTRIBUTED) - add_test(quickstep_queryoptimizer_tests_distributed_executiongenerator_create - "../quickstep_queryoptimizer_tests_DistributedExecutionGeneratorTest" - "${CMAKE_CURRENT_SOURCE_DIR}/Create.test" - "${CMAKE_CURRENT_BINARY_DIR}/DistributedCreate.test" - "${CMAKE_CURRENT_BINARY_DIR}/DistributedCreate/") - add_test(quickstep_queryoptimizer_tests_distributed_executiongenerator_delete - "../quickstep_queryoptimizer_tests_DistributedExecutionGeneratorTest" - "${CMAKE_CURRENT_SOURCE_DIR}/Delete.test" - "${CMAKE_CURRENT_BINARY_DIR}/DistributedDelete.test" - "${CMAKE_CURRENT_BINARY_DIR}/DistributedDelete/") - add_test(quickstep_queryoptimizer_tests_distributed_executiongenerator_distinct - "../quickstep_queryoptimizer_tests_DistributedExecutionGeneratorTest" - "${CMAKE_CURRENT_SOURCE_DIR}/Distinct.test" - "${CMAKE_CURRENT_BINARY_DIR}/DistributedDistinct.test" - "${CMAKE_CURRENT_BINARY_DIR}/DistributedDistinct/") - add_test(quickstep_queryoptimizer_tests_distributed_executiongenerator_drop - "../quickstep_queryoptimizer_tests_DistributedExecutionGeneratorTest" - "${CMAKE_CURRENT_SOURCE_DIR}/Drop.test" - "${CMAKE_CURRENT_BINARY_DIR}/DistributedDrop.test" - "${CMAKE_CURRENT_BINARY_DIR}/DistributedDrop/") - add_test(quickstep_queryoptimizer_tests_distributed_executiongenerator_index - "../quickstep_queryoptimizer_tests_DistributedExecutionGeneratorTest" - "${CMAKE_CURRENT_SOURCE_DIR}/Index.test" - "${CMAKE_CURRENT_BINARY_DIR}/DistributedIndex.test" - "${CMAKE_CURRENT_BINARY_DIR}/DistributedIndex/") - add_test(quickstep_queryoptimizer_tests_distributed_executiongenerator_insert - "../quickstep_queryoptimizer_tests_DistributedExecutionGeneratorTest" - "${CMAKE_CURRENT_SOURCE_DIR}/Insert.test" - "${CMAKE_CURRENT_BINARY_DIR}/DistributedInsert.test" - "${CMAKE_CURRENT_BINARY_DIR}/DistributedInsert/") - add_test(quickstep_queryoptimizer_tests_distributed_executiongenerator_join - "../quickstep_queryoptimizer_tests_DistributedExecutionGeneratorTest" - "${CMAKE_CURRENT_SOURCE_DIR}/Join.test" - "${CMAKE_CURRENT_BINARY_DIR}/DistributedJoin.test" - "${CMAKE_CURRENT_BINARY_DIR}/DistributedJoin/") - add_test(quickstep_queryoptimizer_tests_distributed_executiongenerator_partition - "../quickstep_queryoptimizer_tests_ExecutionGeneratorTest" - "${CMAKE_CURRENT_SOURCE_DIR}/Partition.test" - "${CMAKE_CURRENT_BINARY_DIR}/DistributedPartition.test" - "${CMAKE_CURRENT_BINARY_DIR}/DistributedPartition/") - add_test(quickstep_queryoptimizer_tests_distributed_executiongenerator_select - "../quickstep_queryoptimizer_tests_DistributedExecutionGeneratorTest" - "${CMAKE_CURRENT_SOURCE_DIR}/Select.test" - "${CMAKE_CURRENT_BINARY_DIR}/DistributedSelect.test" - "${CMAKE_CURRENT_BINARY_DIR}/DistributedSelect/") - add_test(quickstep_queryoptimizer_tests_distributed_executiongenerator_stringpatternmatching - "../quickstep_queryoptimizer_tests_DistributedExecutionGeneratorTest" - "${CMAKE_CURRENT_SOURCE_DIR}/StringPatternMatching.test" - "${CMAKE_CURRENT_BINARY_DIR}/DistributedStringPatternMatching.test" - "${CMAKE_CURRENT_BINARY_DIR}/DistributedStringPatternMatching/") - add_test(quickstep_queryoptimizer_tests_distributed_executiongenerator_tablegenerator - "../quickstep_queryoptimizer_tests_DistributedExecutionGeneratorTest" - "${CMAKE_CURRENT_SOURCE_DIR}/TableGenerator.test" - "${CMAKE_CURRENT_BINARY_DIR}/DistributedTableGenerator.test" - "${CMAKE_CURRENT_BINARY_DIR}/DistributedTableGenerator/") - add_test(quickstep_queryoptimizer_tests_distributed_executiongenerator_update - "../quickstep_queryoptimizer_tests_DistributedExecutionGeneratorTest" - "${CMAKE_CURRENT_SOURCE_DIR}/Update.test" - "${CMAKE_CURRENT_BINARY_DIR}/DistributedUpdate.test" - "${CMAKE_CURRENT_BINARY_DIR}/DistributedUpdate/") -endif(ENABLE_DISTRIBUTED) add_test(quickstep_queryoptimizer_tests_executiongenerator_create "../quickstep_queryoptimizer_tests_ExecutionGeneratorTest" "${CMAKE_CURRENT_SOURCE_DIR}/Create.test" @@ -138,25 +76,74 @@ add_test(quickstep_queryoptimizer_tests_executiongenerator_update "${CMAKE_CURRENT_BINARY_DIR}/Update.test" "${CMAKE_CURRENT_BINARY_DIR}/Update/") +if (ENABLE_DISTRIBUTED) + add_test(quickstep_queryoptimizer_tests_executiongenerator_create_distributed + "../quickstep_queryoptimizer_tests_DistributedExecutionGeneratorTest" + "${CMAKE_CURRENT_SOURCE_DIR}/Create.test" + "${CMAKE_CURRENT_BINARY_DIR}/CreateDistributed.test" + "${CMAKE_CURRENT_BINARY_DIR}/CreateDistributed/") + add_test(quickstep_queryoptimizer_tests_executiongenerator_delete_distributed + "../quickstep_queryoptimizer_tests_DistributedExecutionGeneratorTest" + "${CMAKE_CURRENT_SOURCE_DIR}/Delete.test" + "${CMAKE_CURRENT_BINARY_DIR}/DeleteDistributed.test" + "${CMAKE_CURRENT_BINARY_DIR}/DeleteDistributed/") + add_test(quickstep_queryoptimizer_tests_executiongenerator_distinct_distributed + "../quickstep_queryoptimizer_tests_DistributedExecutionGeneratorTest" + "${CMAKE_CURRENT_SOURCE_DIR}/Distinct.test" + "${CMAKE_CURRENT_BINARY_DIR}/DistinctDistributed.test" + "${CMAKE_CURRENT_BINARY_DIR}/DistinctDistributed/") + add_test(quickstep_queryoptimizer_tests_executiongenerator_drop_distributed + "../quickstep_queryoptimizer_tests_DistributedExecutionGeneratorTest" + "${CMAKE_CURRENT_SOURCE_DIR}/Drop.test" + "${CMAKE_CURRENT_BINARY_DIR}/DropDistributed.test" + "${CMAKE_CURRENT_BINARY_DIR}/DropDistributed/") + add_test(quickstep_queryoptimizer_tests_executiongenerator_index_distributed + "../quickstep_queryoptimizer_tests_DistributedExecutionGeneratorTest" + "${CMAKE_CURRENT_SOURCE_DIR}/Index.test" + "${CMAKE_CURRENT_BINARY_DIR}/IndexDistributed.test" + "${CMAKE_CURRENT_BINARY_DIR}/IndexDistributed/") + add_test(quickstep_queryoptimizer_tests_executiongenerator_insert_distributed + "../quickstep_queryoptimizer_tests_DistributedExecutionGeneratorTest" + "${CMAKE_CURRENT_SOURCE_DIR}/Insert.test" + "${CMAKE_CURRENT_BINARY_DIR}/InsertDistributed.test" + "${CMAKE_CURRENT_BINARY_DIR}/InsertDistributed/") + add_test(quickstep_queryoptimizer_tests_executiongenerator_join_distributed + "../quickstep_queryoptimizer_tests_DistributedExecutionGeneratorTest" + "${CMAKE_CURRENT_SOURCE_DIR}/Join.test" + "${CMAKE_CURRENT_BINARY_DIR}/JoinDistributed.test" + "${CMAKE_CURRENT_BINARY_DIR}/JoinDistributed/") + add_test(quickstep_queryoptimizer_tests_executiongenerator_partition_distributed + "../quickstep_queryoptimizer_tests_ExecutionGeneratorTest" + "${CMAKE_CURRENT_SOURCE_DIR}/Partition.test" + "${CMAKE_CURRENT_BINARY_DIR}/PartitionDistributed.test" + "${CMAKE_CURRENT_BINARY_DIR}/PartitionDistributed/") + add_test(quickstep_queryoptimizer_tests_executiongenerator_select_distributed + "../quickstep_queryoptimizer_tests_DistributedExecutionGeneratorTest" + "${CMAKE_CURRENT_SOURCE_DIR}/Select.test" + "${CMAKE_CURRENT_BINARY_DIR}/SelectDistributed.test" + "${CMAKE_CURRENT_BINARY_DIR}/SelectDistributed/") + add_test(quickstep_queryoptimizer_tests_executiongenerator_stringpatternmatching_distributed + "../quickstep_queryoptimizer_tests_DistributedExecutionGeneratorTest" + "${CMAKE_CURRENT_SOURCE_DIR}/StringPatternMatching.test" + "${CMAKE_CURRENT_BINARY_DIR}/StringPatternMatchingDistributed.test" + "${CMAKE_CURRENT_BINARY_DIR}/StringPatternMatchingDistributed/") + add_test(quickstep_queryoptimizer_tests_executiongenerator_tablegenerator_distributed + "../quickstep_queryoptimizer_tests_DistributedExecutionGeneratorTest" + "${CMAKE_CURRENT_SOURCE_DIR}/TableGenerator.test" + "${CMAKE_CURRENT_BINARY_DIR}/TableGeneratorDistributed.test" + "${CMAKE_CURRENT_BINARY_DIR}/TableGeneratorDistributed/") + add_test(quickstep_queryoptimizer_tests_executiongenerator_update_distributed + "../quickstep_queryoptimizer_tests_DistributedExecutionGeneratorTest" + "${CMAKE_CURRENT_SOURCE_DIR}/Update.test" + "${CMAKE_CURRENT_BINARY_DIR}/UpdateDistributed.test" + "${CMAKE_CURRENT_BINARY_DIR}/UpdateDistributed/") +endif(ENABLE_DISTRIBUTED) + # Create the folders where the unit tests will store their data blocks for the # duration of their test. file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Create) file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Delete) file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Distinct) -if (ENABLE_DISTRIBUTED) - file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/DistributedCreate) - file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/DistributedDelete) - file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/DistributedDistinct) - file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/DistributedDrop) - file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/DistributedIndex) - file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/DistributedInsert) - file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/DistributedJoin) - file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/DistributedPartition) - file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/DistributedSelect) - file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/DistributedStringPatternMatching) - file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/DistributedTableGenerator) - file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/DistributedUpdate) -endif(ENABLE_DISTRIBUTED) file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Drop) file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Index) file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Insert) @@ -166,3 +153,18 @@ file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Select) file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/StringPatternMatching) file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/TableGenerator) file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Update) + +if (ENABLE_DISTRIBUTED) + file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/CreateDistributed) + file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/DeleteDistributed) + file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/DistinctDistributed) + file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/DropDistributed) + file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/IndexDistributed) + file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/InsertDistributed) + file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/JoinDistributed) + file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/PartitionDistributed) + file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/SelectDistributed) + file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/StringPatternMatchingDistributed) + file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/TableGeneratorDistributed) + file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/UpdateDistributed) +endif(ENABLE_DISTRIBUTED)