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/06/27 21:15:06 UTC
[1/2] incubator-quickstep git commit: Go back to using LLVM Apt
repositories [Forced Update!]
Repository: incubator-quickstep
Updated Branches:
refs/heads/move-semantic-in-logical-sort 79b1014bc -> f66f4bd19 (forced update)
Go back to using LLVM Apt repositories
Project: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/commit/c0c13f67
Tree: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/tree/c0c13f67
Diff: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/diff/c0c13f67
Branch: refs/heads/move-semantic-in-logical-sort
Commit: c0c13f67e330ccc4b233d9fd9033453211d9c584
Parents: 714874c
Author: Navneet Potti <na...@gmail.com>
Authored: Mon Jun 27 11:06:58 2016 -0500
Committer: Navneet Potti <na...@gmail.com>
Committed: Mon Jun 27 11:06:58 2016 -0500
----------------------------------------------------------------------
.travis.yml | 15 ++-------------
1 file changed, 2 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/c0c13f67/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index fce3ba0..54a0c8a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,19 +20,6 @@ env:
- BUILD_TYPE=Debug VECTOR_COPY_ELISION_LEVEL=selection
- BUILD_TYPE=Release VECTOR_COPY_ELISION_LEVEL=selection
-before_install:
- - LLVM_VERSION=3.7.1
- - LLVM_ARCHIVE_PATH=$HOME/clang+llvm.tar.xz
- - if [[ $CC = "clang" ]]; then
- wget http://llvm.org/releases/$LLVM_VERSION/clang+llvm-$LLVM_VERSION-x86_64-linux-gnu-ubuntu-14.04.tar.xz -O $LLVM_ARCHIVE_PATH;
- mkdir -p $HOME/clang-$LLVM_VERSION;
- tar xf $LLVM_ARCHIVE_PATH -C $HOME/clang-$LLVM_VERSION --strip-components 1;
- ln -sf $HOME/clang-$LLVM_VERSION/bin/clang++ $HOME/clang-$LLVM_VERSION/bin/clang++-3.7;
- export PATH=$HOME/clang-$LLVM_VERSION/bin:$PATH;
- export CPPFLAGS="-I $HOME/clang-$LLVM_VERSION/include/c++/v1";
- echo "Using clang at " `which $CC-3.7` " and $CXX at " `which $CXX-3.7`;
- fi
-
install:
- if [ "$CC" = "gcc" ]; then
export MAKE_JOBS=1;
@@ -91,9 +78,11 @@ addons:
apt:
sources:
- ubuntu-toolchain-r-test
+ - llvm-toolchain-precise-3.7
packages:
- gcc-5
- g++-5
+ - clang-3.7
- binutils-gold
- libprotobuf-dev
- protobuf-compiler
[2/2] incubator-quickstep git commit: Added the move semantic in
optimizer::logical::Sort
Posted by zu...@apache.org.
Added the 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/f66f4bd1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/tree/f66f4bd1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/diff/f66f4bd1
Branch: refs/heads/move-semantic-in-logical-sort
Commit: f66f4bd19cf1a34c3ee2e6acb91f75b92c037927
Parents: c0c13f6
Author: shixuan-fan <sh...@apache.org>
Authored: Mon Jun 27 15:50:56 2016 +0000
Committer: Zuyu Zhang <zu...@apache.org>
Committed: Mon Jun 27 14:14:48 2016 -0700
----------------------------------------------------------------------
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/f66f4bd1/query_optimizer/logical/Sort.hpp
----------------------------------------------------------------------
diff --git a/query_optimizer/logical/Sort.hpp b/query_optimizer/logical/Sort.hpp
index c20ce0f..2233151 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,
+ 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),
+ 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,
+ 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)),
+ 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/f66f4bd1/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;