You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@quickstep.apache.org by zu...@apache.org on 2016/08/16 18:20:59 UTC
[3/4] incubator-quickstep git commit: Fix IWYU for
ExecutionDAGVisualizer
Fix IWYU for ExecutionDAGVisualizer
Project: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/commit/8ec99ed8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/tree/8ec99ed8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/diff/8ec99ed8
Branch: refs/heads/opt-refactor
Commit: 8ec99ed8b95a909d68de9c3f8b87d2a3b74372a6
Parents: 203d3ea
Author: Jianqiao Zhu <ji...@cs.wisc.edu>
Authored: Tue Aug 16 12:37:30 2016 -0500
Committer: Zuyu Zhang <zu...@twitter.com>
Committed: Tue Aug 16 11:17:37 2016 -0700
----------------------------------------------------------------------
query_execution/ForemanSingleNode.cpp | 2 --
query_execution/ForemanSingleNode.hpp | 2 +-
query_execution/PolicyEnforcerBase.hpp | 3 +--
query_execution/QueryExecutionTypedefs.hpp | 1 +
utility/CMakeLists.txt | 2 ++
utility/ExecutionDAGVisualizer.cpp | 3 ++-
6 files changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/8ec99ed8/query_execution/ForemanSingleNode.cpp
----------------------------------------------------------------------
diff --git a/query_execution/ForemanSingleNode.cpp b/query_execution/ForemanSingleNode.cpp
index 7596b00..4661c37 100644
--- a/query_execution/ForemanSingleNode.cpp
+++ b/query_execution/ForemanSingleNode.cpp
@@ -22,7 +22,6 @@
#include <cstddef>
#include <cstdio>
#include <memory>
-#include <tuple>
#include <utility>
#include <vector>
@@ -245,7 +244,6 @@ void ForemanSingleNode::printWorkOrderProfilingResults(const std::size_t query_i
policy_enforcer_->getProfilingResults(query_id);
fputs("Query ID,Worker ID,NUMA Socket,Operator ID,Time (microseconds)\n", out);
for (auto workorder_entry : recorded_times) {
- // Note: Index of the "worker thread index" in the tuple is 0.
const std::size_t worker_id = workorder_entry.worker_id;
fprintf(out,
"%lu,%lu,%d,%lu,%lu\n",
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/8ec99ed8/query_execution/ForemanSingleNode.hpp
----------------------------------------------------------------------
diff --git a/query_execution/ForemanSingleNode.hpp b/query_execution/ForemanSingleNode.hpp
index 71ce99d..5a368aa 100644
--- a/query_execution/ForemanSingleNode.hpp
+++ b/query_execution/ForemanSingleNode.hpp
@@ -84,7 +84,7 @@ class ForemanSingleNode final : public ForemanBase {
* query.
*
* @param query_id The ID of the query for which the results are to be printed.
- * @return A vector of tuples, each being a single profiling entry.
+ * @return A vector of records, each being a single profiling entry.
**/
const std::vector<WorkOrderTimeEntry>& getWorkOrderProfilingResults(
const std::size_t query_id) const;
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/8ec99ed8/query_execution/PolicyEnforcerBase.hpp
----------------------------------------------------------------------
diff --git a/query_execution/PolicyEnforcerBase.hpp b/query_execution/PolicyEnforcerBase.hpp
index e95799e..62906e9 100644
--- a/query_execution/PolicyEnforcerBase.hpp
+++ b/query_execution/PolicyEnforcerBase.hpp
@@ -23,7 +23,6 @@
#include <cstddef>
#include <memory>
#include <queue>
-#include <tuple>
#include <unordered_map>
#include <vector>
@@ -126,7 +125,7 @@ class PolicyEnforcerBase {
* @param query_id The ID of the query for which the profiling results are
* requested.
*
- * @return A vector of tuples, each being a single profiling entry.
+ * @return A vector of records, each being a single profiling entry.
**/
inline const std::vector<WorkOrderTimeEntry>& getProfilingResults(
const std::size_t query_id) const {
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/8ec99ed8/query_execution/QueryExecutionTypedefs.hpp
----------------------------------------------------------------------
diff --git a/query_execution/QueryExecutionTypedefs.hpp b/query_execution/QueryExecutionTypedefs.hpp
index bba67e3..22c0ae1 100644
--- a/query_execution/QueryExecutionTypedefs.hpp
+++ b/query_execution/QueryExecutionTypedefs.hpp
@@ -20,6 +20,7 @@
#ifndef QUICKSTEP_QUERY_EXECUTION_QUERY_EXECUTION_TYPEDEFS_HPP_
#define QUICKSTEP_QUERY_EXECUTION_QUERY_EXECUTION_TYPEDEFS_HPP_
+#include <cstddef>
#include <unordered_map>
#include <vector>
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/8ec99ed8/utility/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/utility/CMakeLists.txt b/utility/CMakeLists.txt
index ae1179d..ddaae45 100644
--- a/utility/CMakeLists.txt
+++ b/utility/CMakeLists.txt
@@ -238,6 +238,8 @@ target_link_libraries(quickstep_utility_ExecutionDAGVisualizer
quickstep_relationaloperators_BuildHashOperator
quickstep_relationaloperators_HashJoinOperator
quickstep_relationaloperators_SelectOperator
+ quickstep_relationaloperators_RelationalOperator
+ quickstep_utility_DAG
quickstep_utility_Macros
quickstep_utility_StringUtil)
target_link_libraries(quickstep_utility_Glob
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/8ec99ed8/utility/ExecutionDAGVisualizer.cpp
----------------------------------------------------------------------
diff --git a/utility/ExecutionDAGVisualizer.cpp b/utility/ExecutionDAGVisualizer.cpp
index 37d00cd..2938808 100644
--- a/utility/ExecutionDAGVisualizer.cpp
+++ b/utility/ExecutionDAGVisualizer.cpp
@@ -20,7 +20,6 @@
#include "utility/ExecutionDAGVisualizer.hpp"
#include <algorithm>
-#include <cmath>
#include <cstddef>
#include <iomanip>
#include <limits>
@@ -36,7 +35,9 @@
#include "relational_operators/AggregationOperator.hpp"
#include "relational_operators/BuildHashOperator.hpp"
#include "relational_operators/HashJoinOperator.hpp"
+#include "relational_operators/RelationalOperator.hpp"
#include "relational_operators/SelectOperator.hpp"
+#include "utility/DAG.hpp"
#include "utility/StringUtil.hpp"
#include "glog/logging.h"