[43/46] incubator-quickstep git commit: Add a flag to allow disabling of Comparison inline expansion to enable acceleration of Quickstep build.
Add a flag to allow disabling of Comparison inline expansion to enable acceleration of Quickstep build. (for development productivity as well as solving the Travis CI timeout problem) Project: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/commit/539e1ebe Tree: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/tree/539e1ebe Diff: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/diff/539e1ebe Branch: refs/heads/fix-iwyu Commit: 539e1ebe09b5d1a2d86069ed1fdc6e9fb38c5ce7 Parents: 4a945a6 Author: Jianqiao Zhu Authored: Fri Feb 2 17:27:59 2018 -0600 Committer: Jianqiao Zhu Committed: Fri Feb 2 17:31:24 2018 -0600 -- .travis.yml | 3 ++- CMakeLists.txt | 14 ++ .../comparisons/AsciiStringComparators-inl.hpp | 2 ++ .../comparisons/AsciiStringComparators.hpp | 4 types/operations/comparisons/Comparison.cpp | 20 .../comparisons/LiteralComparators-inl.hpp | 2 ++ .../comparisons/LiteralComparators.hpp | 4 7 files changed, 28 insertions(+), 21 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/539e1ebe/.travis.yml -- diff --git a/.travis.yml b/.travis.yml index 4e7833f..6517ae8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -76,7 +76,8 @@ before_script: -D CMAKE_CXX_COMPILER=$CXX -D CMAKE_LINKER=$CLINKER -D USE_TCMALLOC=0 - -D VECTOR_COPY_ELISION_LEVEL=$VECTOR_COPY_ELISION_LEVEL ..) + -D VECTOR_COPY_ELISION_LEVEL=$VECTOR_COPY_ELISION_LEVEL + -D ENABLE_COMPARISON_INLINE_EXPANSION=OFF ..) script: - ./lint_everything.py http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/539e1ebe/CMakeLists.txt -- diff --git a/CMakeLists.txt b/CMakeLists.txt index 88835ac..c777a6a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -145,6 +145,20 @@ if (ENABLE_VECTOR_PREDICATE_SHORT_CIRCUIT) ) endif() +set(COMPARISON_INLINE_EXPANSION_MSG_LIST +"This option controls whether to enable inlined template expansion " +"of comparison predicates. WARNING: This option should only be " +"turned off for development use. Turning off this option will greatly " +"reduce Quickstep compile time but incur drastic performance degradation.") +string(REPLACE ";" "" COMPARISON_INLINE_EXPANSION_MSG ${COMPARISON_INLINE_EXPANSION_MSG_LIST}) +option(ENABLE_COMPARISON_INLINE_EXPANSION ${COMPARISON_INLINE_EXPANSION_MSG} ON) +if (ENABLE_COMPARISON_INLINE_EXPANSION) + set_property( +DIRECTORY +APPEND PROPERTY COMPILE_DEFINITIONS QUICKSTEP_ENABLE_COMPARISON_INLINE_EXPANSION + ) +endif() + option(ENABLE_NETWORK_CLI "Allows use of the network cli" OFF) option(ENABLE_DISTRIBUTED "Use the distributed version of Quickstep" OFF) http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/539e1ebe/types/operations/comparisons/AsciiStringComparators-inl.hpp -- diff --git a/types/operations/comparisons/AsciiStringComparators-inl.hpp b/types/operations/comparisons/AsciiStringComparators-inl.hpp index fd0d17d..8b2c1bf 100644 --- a/types/operations/comparisons/AsciiStringComparators-inl.hpp +++ b/types/operations/comparisons/AsciiStringComparators-inl.hpp @@ -46,6 +46,7 @@ namespace quickstep { +#ifdef QUICKSTEP_ENABLE_COMPARISON_INLINE_EXPANSION template class ComparisonFunctor, bool left_nullable, bool left_null_terminated, bool left_longer, bool right_nullable, bool right_null_terminated, bool right_longer> @@ -586,6 +587,7 @@ TypedValue AsciiStringUncheckedComparatorhttp://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/539e1ebe/types/operations/comparisons/AsciiStringComparators.hpp -- diff --git a/types/operations/comparisons/AsciiStringComparators.hpp b/types/operations/comparisons/AsciiStringComparators.hpp index 936fd1f..2aec8c4 100644 --- a/types/operations/comparisons/AsciiStringComparators.hpp +++ b/types/operations/comparisons/AsciiStringComparators.hpp @@ -122,6 +122,7 @@ class AsciiStringUncheckedComparator : public UncheckedComparator { 0); } +#ifdef QUICKSTEP_ENABLE_COMPARISON_INLINE_EXPANSION TupleIdSequence* compareColumnVectors( const ColumnVector &left, const ColumnVector &right, @@ -202,6 +203,7 @@ class AsciiStringUncheckedComparator : public UncheckedComparator { TypedValue accumulateColumnVector( const TypedValue ¤t, const ColumnVector
incubator-quickstep git commit: Add a flag to allow disabling of Comparison inline expansion to enable acceleration of Quickstep build.
Repository: incubator-quickstep Updated Branches: refs/heads/master 4a945a6b9 -> 539e1ebe0 Add a flag to allow disabling of Comparison inline expansion to enable acceleration of Quickstep build. (for development productivity as well as solving the Travis CI timeout problem) Project: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/commit/539e1ebe Tree: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/tree/539e1ebe Diff: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/diff/539e1ebe Branch: refs/heads/master Commit: 539e1ebe09b5d1a2d86069ed1fdc6e9fb38c5ce7 Parents: 4a945a6 Author: Jianqiao Zhu Authored: Fri Feb 2 17:27:59 2018 -0600 Committer: Jianqiao Zhu Committed: Fri Feb 2 17:31:24 2018 -0600 -- .travis.yml | 3 ++- CMakeLists.txt | 14 ++ .../comparisons/AsciiStringComparators-inl.hpp | 2 ++ .../comparisons/AsciiStringComparators.hpp | 4 types/operations/comparisons/Comparison.cpp | 20 .../comparisons/LiteralComparators-inl.hpp | 2 ++ .../comparisons/LiteralComparators.hpp | 4 7 files changed, 28 insertions(+), 21 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/539e1ebe/.travis.yml -- diff --git a/.travis.yml b/.travis.yml index 4e7833f..6517ae8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -76,7 +76,8 @@ before_script: -D CMAKE_CXX_COMPILER=$CXX -D CMAKE_LINKER=$CLINKER -D USE_TCMALLOC=0 - -D VECTOR_COPY_ELISION_LEVEL=$VECTOR_COPY_ELISION_LEVEL ..) + -D VECTOR_COPY_ELISION_LEVEL=$VECTOR_COPY_ELISION_LEVEL + -D ENABLE_COMPARISON_INLINE_EXPANSION=OFF ..) script: - ./lint_everything.py http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/539e1ebe/CMakeLists.txt -- diff --git a/CMakeLists.txt b/CMakeLists.txt index 88835ac..c777a6a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -145,6 +145,20 @@ if (ENABLE_VECTOR_PREDICATE_SHORT_CIRCUIT) ) endif() +set(COMPARISON_INLINE_EXPANSION_MSG_LIST +"This option controls whether to enable inlined template expansion " +"of comparison predicates. WARNING: This option should only be " +"turned off for development use. Turning off this option will greatly " +"reduce Quickstep compile time but incur drastic performance degradation.") +string(REPLACE ";" "" COMPARISON_INLINE_EXPANSION_MSG ${COMPARISON_INLINE_EXPANSION_MSG_LIST}) +option(ENABLE_COMPARISON_INLINE_EXPANSION ${COMPARISON_INLINE_EXPANSION_MSG} ON) +if (ENABLE_COMPARISON_INLINE_EXPANSION) + set_property( +DIRECTORY +APPEND PROPERTY COMPILE_DEFINITIONS QUICKSTEP_ENABLE_COMPARISON_INLINE_EXPANSION + ) +endif() + option(ENABLE_NETWORK_CLI "Allows use of the network cli" OFF) option(ENABLE_DISTRIBUTED "Use the distributed version of Quickstep" OFF) http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/539e1ebe/types/operations/comparisons/AsciiStringComparators-inl.hpp -- diff --git a/types/operations/comparisons/AsciiStringComparators-inl.hpp b/types/operations/comparisons/AsciiStringComparators-inl.hpp index fd0d17d..8b2c1bf 100644 --- a/types/operations/comparisons/AsciiStringComparators-inl.hpp +++ b/types/operations/comparisons/AsciiStringComparators-inl.hpp @@ -46,6 +46,7 @@ namespace quickstep { +#ifdef QUICKSTEP_ENABLE_COMPARISON_INLINE_EXPANSION template class ComparisonFunctor, bool left_nullable, bool left_null_terminated, bool left_longer, bool right_nullable, bool right_null_terminated, bool right_longer> @@ -586,6 +587,7 @@ TypedValue AsciiStringUncheckedComparatorhttp://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/539e1ebe/types/operations/comparisons/AsciiStringComparators.hpp -- diff --git a/types/operations/comparisons/AsciiStringComparators.hpp b/types/operations/comparisons/AsciiStringComparators.hpp index 936fd1f..2aec8c4 100644 --- a/types/operations/comparisons/AsciiStringComparators.hpp +++ b/types/operations/comparisons/AsciiStringComparators.hpp @@ -122,6 +122,7 @@ class AsciiStringUncheckedComparator : public UncheckedComparator { 0); } +#ifdef QUICKSTEP_ENABLE_COMPARISON_INLINE_EXPANSION TupleIdSequence* compareColumnVectors( const ColumnVector &left, const ColumnVector &right, @@ -202,6 +203,7 @@ class AsciiStringUncheckedComparator : public UncheckedComparator
incubator-quickstep git commit: Add a flag to allow disabling of Comparison inline expansion to enable acceleration of Quickstep build.
Repository: incubator-quickstep Updated Branches: refs/heads/fix-travis-timeout [created] 539e1ebe0 Add a flag to allow disabling of Comparison inline expansion to enable acceleration of Quickstep build. (for development productivity as well as solving the Travis CI timeout problem) Project: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/commit/539e1ebe Tree: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/tree/539e1ebe Diff: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/diff/539e1ebe Branch: refs/heads/fix-travis-timeout Commit: 539e1ebe09b5d1a2d86069ed1fdc6e9fb38c5ce7 Parents: 4a945a6 Author: Jianqiao Zhu Authored: Fri Feb 2 17:27:59 2018 -0600 Committer: Jianqiao Zhu Committed: Fri Feb 2 17:31:24 2018 -0600 -- .travis.yml | 3 ++- CMakeLists.txt | 14 ++ .../comparisons/AsciiStringComparators-inl.hpp | 2 ++ .../comparisons/AsciiStringComparators.hpp | 4 types/operations/comparisons/Comparison.cpp | 20 .../comparisons/LiteralComparators-inl.hpp | 2 ++ .../comparisons/LiteralComparators.hpp | 4 7 files changed, 28 insertions(+), 21 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/539e1ebe/.travis.yml -- diff --git a/.travis.yml b/.travis.yml index 4e7833f..6517ae8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -76,7 +76,8 @@ before_script: -D CMAKE_CXX_COMPILER=$CXX -D CMAKE_LINKER=$CLINKER -D USE_TCMALLOC=0 - -D VECTOR_COPY_ELISION_LEVEL=$VECTOR_COPY_ELISION_LEVEL ..) + -D VECTOR_COPY_ELISION_LEVEL=$VECTOR_COPY_ELISION_LEVEL + -D ENABLE_COMPARISON_INLINE_EXPANSION=OFF ..) script: - ./lint_everything.py http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/539e1ebe/CMakeLists.txt -- diff --git a/CMakeLists.txt b/CMakeLists.txt index 88835ac..c777a6a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -145,6 +145,20 @@ if (ENABLE_VECTOR_PREDICATE_SHORT_CIRCUIT) ) endif() +set(COMPARISON_INLINE_EXPANSION_MSG_LIST +"This option controls whether to enable inlined template expansion " +"of comparison predicates. WARNING: This option should only be " +"turned off for development use. Turning off this option will greatly " +"reduce Quickstep compile time but incur drastic performance degradation.") +string(REPLACE ";" "" COMPARISON_INLINE_EXPANSION_MSG ${COMPARISON_INLINE_EXPANSION_MSG_LIST}) +option(ENABLE_COMPARISON_INLINE_EXPANSION ${COMPARISON_INLINE_EXPANSION_MSG} ON) +if (ENABLE_COMPARISON_INLINE_EXPANSION) + set_property( +DIRECTORY +APPEND PROPERTY COMPILE_DEFINITIONS QUICKSTEP_ENABLE_COMPARISON_INLINE_EXPANSION + ) +endif() + option(ENABLE_NETWORK_CLI "Allows use of the network cli" OFF) option(ENABLE_DISTRIBUTED "Use the distributed version of Quickstep" OFF) http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/539e1ebe/types/operations/comparisons/AsciiStringComparators-inl.hpp -- diff --git a/types/operations/comparisons/AsciiStringComparators-inl.hpp b/types/operations/comparisons/AsciiStringComparators-inl.hpp index fd0d17d..8b2c1bf 100644 --- a/types/operations/comparisons/AsciiStringComparators-inl.hpp +++ b/types/operations/comparisons/AsciiStringComparators-inl.hpp @@ -46,6 +46,7 @@ namespace quickstep { +#ifdef QUICKSTEP_ENABLE_COMPARISON_INLINE_EXPANSION template class ComparisonFunctor, bool left_nullable, bool left_null_terminated, bool left_longer, bool right_nullable, bool right_null_terminated, bool right_longer> @@ -586,6 +587,7 @@ TypedValue AsciiStringUncheckedComparatorhttp://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/539e1ebe/types/operations/comparisons/AsciiStringComparators.hpp -- diff --git a/types/operations/comparisons/AsciiStringComparators.hpp b/types/operations/comparisons/AsciiStringComparators.hpp index 936fd1f..2aec8c4 100644 --- a/types/operations/comparisons/AsciiStringComparators.hpp +++ b/types/operations/comparisons/AsciiStringComparators.hpp @@ -122,6 +122,7 @@ class AsciiStringUncheckedComparator : public UncheckedComparator { 0); } +#ifdef QUICKSTEP_ENABLE_COMPARISON_INLINE_EXPANSION TupleIdSequence* compareColumnVectors( const ColumnVector &left, const ColumnVector &right, @@ -202,6 +203,7 @@ class AsciiStringUncheckedComparator : public