quickstep-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hbdeshm...@apache.org
Subject [48/48] incubator-quickstep git commit: Merge branch 'master' into query-manager-used-in-foreman
Date Thu, 09 Jun 2016 01:10:17 GMT
Merge branch 'master' into query-manager-used-in-foreman

Conflicts:
	cli/CommandExecutor.cpp
	cli/CommandExecutor.hpp
	cli/QuickstepCli.cpp
	cli/tests/CommandExecutorTestRunner.cpp
	query_execution/CMakeLists.txt
	query_execution/Foreman.cpp
	query_execution/QueryContext.proto
	query_execution/QueryExecutionTypedefs.hpp
	query_optimizer/ExecutionGenerator.hpp
	query_optimizer/tests/ExecutionHeuristics_unittest.cpp
	relational_operators/RelationalOperator.hpp
	relational_operators/SampleOperator.hpp
	relational_operators/SaveBlocksOperator.hpp
	relational_operators/tests/AggregationOperator_unittest.cpp
	relational_operators/tests/HashJoinOperator_unittest.cpp
	relational_operators/tests/SortMergeRunOperator_unittest.cpp
	relational_operators/tests/SortRunGenerationOperator_unittest.cpp
	relational_operators/tests/TextScanOperator_unittest.cpp


Project: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/commit/d70ba5d1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/tree/d70ba5d1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/diff/d70ba5d1

Branch: refs/heads/query-manager-used-in-foreman
Commit: d70ba5d1df38297a22897c1135e589a696476749
Parents: e8ead86 1be47dc
Author: Harshad Deshmukh <hbdeshmukh@apache.org>
Authored: Wed Jun 8 20:08:00 2016 -0500
Committer: Harshad Deshmukh <hbdeshmukh@apache.org>
Committed: Wed Jun 8 20:08:00 2016 -0500

----------------------------------------------------------------------
 cli/CommandExecutor.cpp                         |  5 ---
 query_execution/tests/Foreman_unittest.cpp      |  3 +-
 query_execution/tests/QueryManager_unittest.cpp |  3 +-
 .../tests/ExecutionHeuristics_unittest.cpp      |  9 +++--
 relational_operators/HashJoinOperator.hpp       |  1 +
 relational_operators/RelationalOperator.hpp     | 11 +++---
 relational_operators/SampleOperator.cpp         |  1 +
 relational_operators/SampleOperator.hpp         | 13 ++++++-
 relational_operators/SaveBlocksOperator.hpp     |  3 +-
 .../tests/AggregationOperator_unittest.cpp      |  5 +--
 .../tests/HashJoinOperator_unittest.cpp         | 37 ++++++++++----------
 .../tests/SortMergeRunOperator_unittest.cpp     |  5 +--
 .../SortRunGenerationOperator_unittest.cpp      |  3 +-
 .../tests/TextScanOperator_unittest.cpp         |  3 +-
 14 files changed, 62 insertions(+), 40 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/d70ba5d1/cli/CommandExecutor.cpp
----------------------------------------------------------------------
diff --cc cli/CommandExecutor.cpp
index cfb8c5b,ddcd38f..dc14741
--- a/cli/CommandExecutor.cpp
+++ b/cli/CommandExecutor.cpp
@@@ -217,13 -210,11 +217,8 @@@ inline TypedValue executeQueryForSingle
    DCHECK(query_handle->getQueryPlanMutable() != nullptr);
  
    // Use foreman to execute the query plan.
-   /*foreman->setQueryPlan(query_handle->getQueryPlanMutable()->getQueryPlanDAGMutable());
 -  foreman->setQueryPlan(query_handle->getQueryPlanMutable()->getQueryPlanDAGMutable());
--  foreman->reconstructQueryContextFromProto(query_handle->getQueryContextProto());
--
--  foreman->start();
-   foreman->join();*/
 -  foreman->join();
 +  QueryExecutionUtil::ConstructAndSendAdmitRequestMessage(
 +      main_thread_client_id, foreman_client_id, query_handle.get(), bus);
  
    // Retrieve the scalar result from the result relation.
    const CatalogRelation *query_result_relation = query_handle->getQueryResultRelation();

http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/d70ba5d1/query_execution/tests/QueryManager_unittest.cpp
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/d70ba5d1/relational_operators/HashJoinOperator.hpp
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/d70ba5d1/relational_operators/tests/AggregationOperator_unittest.cpp
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/d70ba5d1/relational_operators/tests/HashJoinOperator_unittest.cpp
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/d70ba5d1/relational_operators/tests/SortMergeRunOperator_unittest.cpp
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/d70ba5d1/relational_operators/tests/SortRunGenerationOperator_unittest.cpp
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/d70ba5d1/relational_operators/tests/TextScanOperator_unittest.cpp
----------------------------------------------------------------------


Mime
View raw message