You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@quickstep.apache.org by sh...@apache.org on 2016/06/28 17:43:51 UTC
[1/4] incubator-quickstep git commit: Added move semantic in
optimizer::logical::Sort
Repository: incubator-quickstep
Updated Branches:
refs/heads/move-semantic-in-window-plan [created] dd9678672
Added move semantic in optimizer::logical::Sort
Project: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/commit/87c5428a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/tree/87c5428a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/diff/87c5428a
Branch: refs/heads/move-semantic-in-window-plan
Commit: 87c5428a8b295938a89b5b066805a5ea3484c3ef
Parents: 714874c
Author: shixuan-fan <sh...@apache.org>
Authored: Mon Jun 27 15:50:56 2016 +0000
Committer: shixuan-fan <sh...@apache.org>
Committed: Mon Jun 27 15:50:56 2016 +0000
----------------------------------------------------------------------
query_optimizer/logical/Sort.hpp | 26 ++++++++++++++++++++++++++
query_optimizer/resolver/Resolver.cpp | 18 +++++++++---------
2 files changed, 35 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/87c5428a/query_optimizer/logical/Sort.hpp
----------------------------------------------------------------------
diff --git a/query_optimizer/logical/Sort.hpp b/query_optimizer/logical/Sort.hpp
index c20ce0f..25f0ada 100644
--- a/query_optimizer/logical/Sort.hpp
+++ b/query_optimizer/logical/Sort.hpp
@@ -113,6 +113,19 @@ class Sort : public Logical {
limit));
}
+ static SortPtr Create(
+ const LogicalPtr &input,
+ const std::vector<expressions::AttributeReferencePtr> &&sort_attributes,
+ const std::vector<bool> &&sort_ascending,
+ const std::vector<bool> &&nulls_first_flags,
+ const int limit) {
+ return SortPtr(new Sort(input,
+ std::move(sort_attributes),
+ std::move(sort_ascending),
+ std::move(nulls_first_flags),
+ limit));
+ }
+
protected:
void getFieldStringItems(
std::vector<std::string> *inline_field_names,
@@ -137,6 +150,19 @@ class Sort : public Logical {
addChild(input_);
}
+ Sort(const LogicalPtr &input,
+ const std::vector<expressions::AttributeReferencePtr> &&sort_attributes,
+ const std::vector<bool> &&sort_ascending,
+ const std::vector<bool> &&nulls_first_flags,
+ const int limit)
+ : input_(input),
+ sort_attributes_(std::move(sort_attributes)),
+ sort_ascending_(std::move(sort_ascending)),
+ nulls_first_flags_(std::move(nulls_first_flags)),
+ limit_(limit) {
+ addChild(input_);
+ }
+
LogicalPtr input_;
std::vector<expressions::AttributeReferencePtr> sort_attributes_;
// Has 1:1 matching with <sort_expressions_>.
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/87c5428a/query_optimizer/resolver/Resolver.cpp
----------------------------------------------------------------------
diff --git a/query_optimizer/resolver/Resolver.cpp b/query_optimizer/resolver/Resolver.cpp
index f880ce7..1eb6d86 100644
--- a/query_optimizer/resolver/Resolver.cpp
+++ b/query_optimizer/resolver/Resolver.cpp
@@ -1270,16 +1270,16 @@ L::LogicalPtr Resolver::resolveSelect(
if (select_query.limit() != nullptr) {
logical_plan =
L::Sort::Create(logical_plan,
- order_by_attributes,
- order_by_directions,
- nulls_first,
+ std::move(order_by_attributes),
+ std::move(order_by_directions),
+ std::move(nulls_first),
select_query.limit()->limit_expression()->long_value());
} else {
logical_plan =
L::Sort::Create(logical_plan,
- order_by_attributes,
- order_by_directions,
- nulls_first,
+ std::move(order_by_attributes),
+ std::move(order_by_directions),
+ std::move(nulls_first),
-1 /* limit */);
}
} else if (select_query.limit() != nullptr) {
@@ -1880,9 +1880,9 @@ L::LogicalPtr Resolver::resolveSortInWindow(
L::LogicalPtr sorted_logical_plan =
L::Sort::Create(logical_plan,
- sort_attributes,
- sort_directions,
- sort_nulls_first,
+ std::move(sort_attributes),
+ std::move(sort_directions),
+ std::move(sort_nulls_first),
-1 /* limit */);
return sorted_logical_plan;
[4/4] incubator-quickstep git commit: Added NOLINT
Posted by sh...@apache.org.
Added NOLINT
Project: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/commit/dd967867
Tree: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/tree/dd967867
Diff: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/diff/dd967867
Branch: refs/heads/move-semantic-in-window-plan
Commit: dd9678672df2084bd25e0210d4a65e57a36c80f5
Parents: cfc89d6
Author: shixuan-fan <sh...@apache.org>
Authored: Tue Jun 28 17:43:24 2016 +0000
Committer: shixuan-fan <sh...@apache.org>
Committed: Tue Jun 28 17:43:24 2016 +0000
----------------------------------------------------------------------
query_optimizer/resolver/Resolver.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/dd967867/query_optimizer/resolver/Resolver.cpp
----------------------------------------------------------------------
diff --git a/query_optimizer/resolver/Resolver.cpp b/query_optimizer/resolver/Resolver.cpp
index 95096c9..1966b69 100644
--- a/query_optimizer/resolver/Resolver.cpp
+++ b/query_optimizer/resolver/Resolver.cpp
@@ -228,7 +228,7 @@ struct Resolver::QueryAggregationInfo {
};
struct Resolver::WindowPlan {
- WindowPlan(E::WindowInfo &&window_info_in,
+ WindowPlan(E::WindowInfo &&window_info_in, // NOLINT(whitespace/operators)
const L::LogicalPtr &logical_plan_in)
: window_info(std::move(window_info_in)),
logical_plan(logical_plan_in) {}
[3/4] incubator-quickstep git commit: Added move semantic in the
constructor of window plan
Posted by sh...@apache.org.
Added move semantic in the constructor of window plan
Project: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/commit/cfc89d65
Tree: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/tree/cfc89d65
Diff: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/diff/cfc89d65
Branch: refs/heads/move-semantic-in-window-plan
Commit: cfc89d65a77e43d2b2095f8c9db62baf8922f8b8
Parents: 79b1014
Author: shixuan-fan <sh...@apache.org>
Authored: Tue Jun 28 15:42:09 2016 +0000
Committer: shixuan-fan <sh...@apache.org>
Committed: Tue Jun 28 15:42:09 2016 +0000
----------------------------------------------------------------------
query_optimizer/resolver/Resolver.cpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/cfc89d65/query_optimizer/resolver/Resolver.cpp
----------------------------------------------------------------------
diff --git a/query_optimizer/resolver/Resolver.cpp b/query_optimizer/resolver/Resolver.cpp
index 1eb6d86..95096c9 100644
--- a/query_optimizer/resolver/Resolver.cpp
+++ b/query_optimizer/resolver/Resolver.cpp
@@ -228,9 +228,9 @@ struct Resolver::QueryAggregationInfo {
};
struct Resolver::WindowPlan {
- WindowPlan(const E::WindowInfo &window_info_in,
+ WindowPlan(E::WindowInfo &&window_info_in,
const L::LogicalPtr &logical_plan_in)
- : window_info(window_info_in),
+ : window_info(std::move(window_info_in)),
logical_plan(logical_plan_in) {}
const E::WindowInfo window_info;
@@ -1032,7 +1032,7 @@ L::LogicalPtr Resolver::resolveSelect(
L::LogicalPtr sorted_logical_plan = resolveSortInWindow(logical_plan,
resolved_window);
- WindowPlan window_plan(resolved_window, sorted_logical_plan);
+ WindowPlan window_plan(std::move(resolved_window), sorted_logical_plan);
sorted_window_map.emplace(window.name()->value(), window_plan);
}
[2/4] incubator-quickstep git commit: removed const before rvalue
references
Posted by sh...@apache.org.
removed const before rvalue references
Project: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/commit/79b1014b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/tree/79b1014b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/diff/79b1014b
Branch: refs/heads/move-semantic-in-window-plan
Commit: 79b1014bc73d2ce161f351aeaab6c4b8eca02188
Parents: 87c5428
Author: shixuan-fan <sh...@apache.org>
Authored: Mon Jun 27 19:52:04 2016 +0000
Committer: shixuan-fan <sh...@apache.org>
Committed: Mon Jun 27 19:52:04 2016 +0000
----------------------------------------------------------------------
query_optimizer/logical/Sort.hpp | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/79b1014b/query_optimizer/logical/Sort.hpp
----------------------------------------------------------------------
diff --git a/query_optimizer/logical/Sort.hpp b/query_optimizer/logical/Sort.hpp
index 25f0ada..2233151 100644
--- a/query_optimizer/logical/Sort.hpp
+++ b/query_optimizer/logical/Sort.hpp
@@ -115,9 +115,9 @@ class Sort : public Logical {
static SortPtr Create(
const LogicalPtr &input,
- const std::vector<expressions::AttributeReferencePtr> &&sort_attributes,
- const std::vector<bool> &&sort_ascending,
- const std::vector<bool> &&nulls_first_flags,
+ std::vector<expressions::AttributeReferencePtr> &&sort_attributes,
+ std::vector<bool> &&sort_ascending,
+ std::vector<bool> &&nulls_first_flags,
const int limit) {
return SortPtr(new Sort(input,
std::move(sort_attributes),
@@ -151,9 +151,9 @@ class Sort : public Logical {
}
Sort(const LogicalPtr &input,
- const std::vector<expressions::AttributeReferencePtr> &&sort_attributes,
- const std::vector<bool> &&sort_ascending,
- const std::vector<bool> &&nulls_first_flags,
+ std::vector<expressions::AttributeReferencePtr> &&sort_attributes,
+ std::vector<bool> &&sort_ascending,
+ std::vector<bool> &&nulls_first_flags,
const int limit)
: input_(input),
sort_attributes_(std::move(sort_attributes)),