Revert "Quickstep gen stats" (#231) Project: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/commit/5e2bb515 Tree: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/tree/5e2bb515 Diff: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/diff/5e2bb515
Branch: refs/heads/decimal-type Commit: 5e2bb515bb6c66a1a359218c99270227f79d7864 Parents: 4b849cd Author: Rogers Jeffrey Leo John <rogers.john2...@gmail.com> Authored: Fri May 20 14:51:35 2016 -0500 Committer: Zuyu Zhang <zzh...@pivotal.io> Committed: Wed Jun 8 11:57:45 2016 -0700 ---------------------------------------------------------------------- catalog/Catalog.proto | 2 +- query_optimizer/CMakeLists.txt | 1 - query_optimizer/ExecutionGenerator.cpp | 10 --- relational_operators/CMakeLists.txt | 11 --- .../GenerateNumRowsStatsOperator.cpp | 42 ----------- .../GenerateNumRowsStatsOperator.hpp | 79 -------------------- 6 files changed, 1 insertion(+), 144 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/5e2bb515/catalog/Catalog.proto ---------------------------------------------------------------------- diff --git a/catalog/Catalog.proto b/catalog/Catalog.proto index 8e44181..ce4bc2e 100644 --- a/catalog/Catalog.proto +++ b/catalog/Catalog.proto @@ -82,7 +82,7 @@ message IndexScheme { message CatalogRelationStatistics { optional fixed64 num_tuples = 1; - + message NumDistinctValuesEntry { required int32 attr_id = 1; required fixed64 num_distinct_values = 2; http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/5e2bb515/query_optimizer/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/query_optimizer/CMakeLists.txt b/query_optimizer/CMakeLists.txt index 1cc38d1..aa2873e 100644 --- a/query_optimizer/CMakeLists.txt +++ b/query_optimizer/CMakeLists.txt @@ -111,7 +111,6 @@ target_link_libraries(quickstep_queryoptimizer_ExecutionGenerator quickstep_relationaloperators_DestroyHashOperator quickstep_relationaloperators_DropTableOperator quickstep_relationaloperators_FinalizeAggregationOperator - quickstep_relationaloperators_GenerateNumRowsStatsOperator quickstep_relationaloperators_HashJoinOperator quickstep_relationaloperators_InsertOperator quickstep_relationaloperators_NestedLoopsJoinOperator http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/5e2bb515/query_optimizer/ExecutionGenerator.cpp ---------------------------------------------------------------------- diff --git a/query_optimizer/ExecutionGenerator.cpp b/query_optimizer/ExecutionGenerator.cpp index 612efd9..c590b6e 100644 --- a/query_optimizer/ExecutionGenerator.cpp +++ b/query_optimizer/ExecutionGenerator.cpp @@ -91,7 +91,6 @@ #include "relational_operators/DestroyHashOperator.hpp" #include "relational_operators/DropTableOperator.hpp" #include "relational_operators/FinalizeAggregationOperator.hpp" -#include "relational_operators/GenerateNumRowsStatsOperator.hpp" #include "relational_operators/HashJoinOperator.hpp" #include "relational_operators/InsertOperator.hpp" #include "relational_operators/NestedLoopsJoinOperator.hpp" @@ -948,15 +947,6 @@ void ExecutionGenerator::convertCopyFrom( execution_plan_->addDirectDependency(save_blocks_operator_index, scan_operator_index, false /* is_pipeline_breaker */); - - const QueryPlan::DAGNodeIndex num_rows_operator_index = - execution_plan_->addRelationalOperator(new GenerateNumRowsStatsOperator( - optimizer_context_->catalog_database()->getRelationByIdMutable( - output_relation->getID()))); - insert_destination_proto->set_relational_op_index(num_rows_operator_index); - execution_plan_->addDirectDependency(num_rows_operator_index, - scan_operator_index, - true /* is_pipeline_breaker */); } void ExecutionGenerator::convertCreateIndex( http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/5e2bb515/relational_operators/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/relational_operators/CMakeLists.txt b/relational_operators/CMakeLists.txt index e211630..eec5300 100644 --- a/relational_operators/CMakeLists.txt +++ b/relational_operators/CMakeLists.txt @@ -34,9 +34,6 @@ add_library(quickstep_relationaloperators_DropTableOperator DropTableOperator.cp add_library(quickstep_relationaloperators_FinalizeAggregationOperator FinalizeAggregationOperator.cpp FinalizeAggregationOperator.hpp) -add_library(quickstep_relationaloperators_GenerateNumRowsStatsOperator - GenerateNumRowsStatsOperator.cpp - GenerateNumRowsStatsOperator.hpp) add_library(quickstep_relationaloperators_HashJoinOperator HashJoinOperator.cpp HashJoinOperator.hpp) add_library(quickstep_relationaloperators_InsertOperator InsertOperator.cpp InsertOperator.hpp) add_library(quickstep_relationaloperators_NestedLoopsJoinOperator @@ -162,13 +159,6 @@ target_link_libraries(quickstep_relationaloperators_FinalizeAggregationOperator quickstep_storage_AggregationOperationState quickstep_utility_Macros tmb) -target_link_libraries(quickstep_relationaloperators_GenerateNumRowsStatsOperator - glog - quickstep_catalog_CatalogRelation - quickstep_cli_PrintToScreen - quickstep_relationaloperators_RelationalOperator - quickstep_utility_Macros - tmb) target_link_libraries(quickstep_relationaloperators_HashJoinOperator gflags_nothreads-static glog @@ -456,7 +446,6 @@ target_link_libraries(quickstep_relationaloperators quickstep_relationaloperators_DestroyHashOperator quickstep_relationaloperators_DropTableOperator quickstep_relationaloperators_FinalizeAggregationOperator - quickstep_relationaloperators_GenerateNumRowsStatsOperator quickstep_relationaloperators_HashJoinOperator quickstep_relationaloperators_InsertOperator quickstep_relationaloperators_NestedLoopsJoinOperator http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/5e2bb515/relational_operators/GenerateNumRowsStatsOperator.cpp ---------------------------------------------------------------------- diff --git a/relational_operators/GenerateNumRowsStatsOperator.cpp b/relational_operators/GenerateNumRowsStatsOperator.cpp deleted file mode 100644 index 074e1ca..0000000 --- a/relational_operators/GenerateNumRowsStatsOperator.cpp +++ /dev/null @@ -1,42 +0,0 @@ -/** - * Copyright 2016, Quickstep Research Group, Computer Sciences Department, - * University of WisconsinâMadison. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - **/ - -#include "relational_operators/GenerateNumRowsStatsOperator.hpp" - -#include <memory> - -#include "catalog/CatalogRelation.hpp" -#include "cli/PrintToScreen.hpp" - -#include "tmb/id_typedefs.h" - -namespace quickstep { - -bool GenerateNumRowsStatsOperator::getAllWorkOrders( - WorkOrdersContainer *container, - QueryContext *query_context, - StorageManager *storage_manager, - const tmb::client_id scheduler_client_id, - tmb::MessageBus *bus) { - std::size_t num_tuples = - PrintToScreen::GetNumTuplesInRelation(*relation_, storage_manager); - relation_->getStatisticsMutable()->setNumTuples(num_tuples); - return true; -} - -} // namespace quickstep - http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/5e2bb515/relational_operators/GenerateNumRowsStatsOperator.hpp ---------------------------------------------------------------------- diff --git a/relational_operators/GenerateNumRowsStatsOperator.hpp b/relational_operators/GenerateNumRowsStatsOperator.hpp deleted file mode 100644 index 8622a63..0000000 --- a/relational_operators/GenerateNumRowsStatsOperator.hpp +++ /dev/null @@ -1,79 +0,0 @@ -/** - * Copyright 2016, Quickstep Research Group, Computer Sciences Department, - * University of WisconsinâMadison. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - **/ - -#ifndef QUICKSTEP_RELATIONAL_OPERATORS_GENERATE_NUM_ROWS_STATS_OPERATOR_HPP_ -#define QUICKSTEP_RELATIONAL_OPERATORS_GENERATE_NUM_ROWS_STATS_OPERATOR_HPP_ - -#include <memory> - -#include "catalog/CatalogRelation.hpp" -#include "relational_operators/RelationalOperator.hpp" -#include "utility/Macros.hpp" - -#include "glog/logging.h" - -#include "tmb/id_typedefs.h" - -namespace tmb { class MessageBus; } - -namespace quickstep { - -class CatalogRelation; -class QueryContext; -class StorageManager; -class WorkOrdersContainer; - -/** \addtogroup RelationalOperators - * @{ - */ - -/** - * @brief An operator that gets the number of rows after loading a relation. - **/ -class GenerateNumRowsStatsOperator : public RelationalOperator { - public: - /** - * @brief Constructor. - * - * @param relation The relation to get the number of rows from. - * This GenNumRowStatsOperator owns relation until - * the WorkOrder it produces is successfully executed. - **/ - explicit GenerateNumRowsStatsOperator(CatalogRelation *relation) - : relation_(relation) {} - ~GenerateNumRowsStatsOperator() override {} - - /** - * @note no WorkOrder is generated for this operator. - **/ - bool getAllWorkOrders(WorkOrdersContainer *container, - QueryContext *query_context, - StorageManager *storage_manager, - const tmb::client_id scheduler_client_id, - tmb::MessageBus *bus) override; - - private: - CatalogRelation *relation_; - - DISALLOW_COPY_AND_ASSIGN(GenerateNumRowsStatsOperator); -}; - -/** @} */ - -} // namespace quickstep - -#endif // QUICKSTEP_RELATIONAL_OPERATORS_GENERATE_NUM_ROWS_STATS_OPERATOR_HPP_