Minor refactor regarding CatalogDatabase.
Project: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/commit/964a8064 Tree: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/tree/964a8064 Diff: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/diff/964a8064 Branch: refs/heads/reorder-partitioned-hash-join Commit: 964a80649f37502020c35a15401236f3f48719a2 Parents: 87bbb26 Author: Zuyu Zhang <zu...@apache.org> Authored: Thu Mar 2 16:02:20 2017 -0800 Committer: Zuyu Zhang <zu...@apache.org> Committed: Thu Mar 2 16:02:20 2017 -0800 ---------------------------------------------------------------------- catalog/CatalogDatabase.hpp | 2 +- catalog/CatalogDatabaseCache.hpp | 2 +- query_execution/ForemanSingleNode.cpp | 3 +-- query_execution/ForemanSingleNode.hpp | 1 - 4 files changed, 3 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/964a8064/catalog/CatalogDatabase.hpp ---------------------------------------------------------------------- diff --git a/catalog/CatalogDatabase.hpp b/catalog/CatalogDatabase.hpp index b071d09..86cfcba 100644 --- a/catalog/CatalogDatabase.hpp +++ b/catalog/CatalogDatabase.hpp @@ -138,7 +138,7 @@ class RelationIdNotFound : public std::exception { /** * @brief A single database in the catalog. **/ -class CatalogDatabase : public CatalogDatabaseLite { +class CatalogDatabase final : public CatalogDatabaseLite { public: typedef std::unordered_map<std::string, CatalogRelation*>::size_type size_type; typedef PtrVector<CatalogRelation, true>::const_skip_iterator const_iterator; http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/964a8064/catalog/CatalogDatabaseCache.hpp ---------------------------------------------------------------------- diff --git a/catalog/CatalogDatabaseCache.hpp b/catalog/CatalogDatabaseCache.hpp index 88ca61d..88e23ab 100644 --- a/catalog/CatalogDatabaseCache.hpp +++ b/catalog/CatalogDatabaseCache.hpp @@ -54,7 +54,7 @@ namespace serialization { class CatalogDatabase; } * @note A CatalogRelationSchema should be kept unless all associated blocks * have been deleted. **/ -class CatalogDatabaseCache : public CatalogDatabaseLite { +class CatalogDatabaseCache final : public CatalogDatabaseLite { public: /** * @brief Constructor. http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/964a8064/query_execution/ForemanSingleNode.cpp ---------------------------------------------------------------------- diff --git a/query_execution/ForemanSingleNode.cpp b/query_execution/ForemanSingleNode.cpp index 02799c7..3eac0ff 100644 --- a/query_execution/ForemanSingleNode.cpp +++ b/query_execution/ForemanSingleNode.cpp @@ -67,7 +67,6 @@ ForemanSingleNode::ForemanSingleNode( : ForemanBase(bus, cpu_id), main_thread_client_id_(main_thread_client_id), worker_directory_(DCHECK_NOTNULL(worker_directory)), - catalog_database_(DCHECK_NOTNULL(catalog_database)), storage_manager_(DCHECK_NOTNULL(storage_manager)) { const std::vector<QueryExecutionMessageType> sender_message_types{ kPoisonMessage, @@ -95,7 +94,7 @@ ForemanSingleNode::ForemanSingleNode( policy_enforcer_ = std::make_unique<PolicyEnforcerSingleNode>( foreman_client_id_, num_numa_nodes, - catalog_database_, + catalog_database, storage_manager_, worker_directory_, bus_); http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/964a8064/query_execution/ForemanSingleNode.hpp ---------------------------------------------------------------------- diff --git a/query_execution/ForemanSingleNode.hpp b/query_execution/ForemanSingleNode.hpp index d2db51b..9fa3b9a 100644 --- a/query_execution/ForemanSingleNode.hpp +++ b/query_execution/ForemanSingleNode.hpp @@ -111,7 +111,6 @@ class ForemanSingleNode final : public ForemanBase { WorkerDirectory *worker_directory_; - CatalogDatabaseLite *catalog_database_; StorageManager *storage_manager_; DISALLOW_COPY_AND_ASSIGN(ForemanSingleNode);