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 2018/04/27 23:49:18 UTC
[3/4] incubator-quickstep git commit: Fix and rearrange all
CMakeLists.txt so that they are ready to be processed and regenrated by an
automation tool.
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/b1785647/query_optimizer/expressions/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/query_optimizer/expressions/CMakeLists.txt b/query_optimizer/expressions/CMakeLists.txt
index 3e7f8e4..7032f05 100644
--- a/query_optimizer/expressions/CMakeLists.txt
+++ b/query_optimizer/expressions/CMakeLists.txt
@@ -28,9 +28,9 @@ add_library(quickstep_queryoptimizer_expressions_ComparisonExpression
ComparisonExpression.cpp
ComparisonExpression.hpp)
add_library(quickstep_queryoptimizer_expressions_Exists Exists.cpp Exists.hpp)
+add_library(quickstep_queryoptimizer_expressions_ExprId ../../empty_src.cpp ExprId.hpp)
add_library(quickstep_queryoptimizer_expressions_Expression ../../empty_src.cpp Expression.hpp)
add_library(quickstep_queryoptimizer_expressions_ExpressionType ../../empty_src.cpp ExpressionType.hpp)
-add_library(quickstep_queryoptimizer_expressions_ExprId ../../empty_src.cpp ExprId.hpp)
add_library(quickstep_queryoptimizer_expressions_ExpressionUtil ExpressionUtil.cpp ExpressionUtil.hpp)
add_library(quickstep_queryoptimizer_expressions_InTableQuery InTableQuery.cpp InTableQuery.hpp)
add_library(quickstep_queryoptimizer_expressions_InValueList InValueList.cpp InValueList.hpp)
@@ -142,6 +142,7 @@ target_link_libraries(quickstep_queryoptimizer_expressions_ComparisonExpression
quickstep_types_operations_comparisons_ComparisonID
quickstep_utility_Macros)
target_link_libraries(quickstep_queryoptimizer_expressions_Exists
+ glog
quickstep_queryoptimizer_OptimizerTree
quickstep_queryoptimizer_expressions_AttributeReference
quickstep_queryoptimizer_expressions_ExprId
@@ -149,9 +150,9 @@ target_link_libraries(quickstep_queryoptimizer_expressions_Exists
quickstep_queryoptimizer_expressions_ExpressionType
quickstep_queryoptimizer_expressions_Predicate
quickstep_queryoptimizer_expressions_SubqueryExpression
- quickstep_utility_Macros
- glog)
+ quickstep_utility_Macros)
target_link_libraries(quickstep_queryoptimizer_expressions_Expression
+ glog
quickstep_queryoptimizer_OptimizerTree
quickstep_queryoptimizer_expressions_ExpressionType
quickstep_types_Type
@@ -163,6 +164,7 @@ target_link_libraries(quickstep_queryoptimizer_expressions_ExpressionUtil
quickstep_queryoptimizer_expressions_NamedExpression
quickstep_queryoptimizer_expressions_PatternMatcher)
target_link_libraries(quickstep_queryoptimizer_expressions_InTableQuery
+ glog
quickstep_queryoptimizer_OptimizerTree
quickstep_queryoptimizer_expressions_AttributeReference
quickstep_queryoptimizer_expressions_ExprId
@@ -173,9 +175,10 @@ target_link_libraries(quickstep_queryoptimizer_expressions_InTableQuery
quickstep_queryoptimizer_expressions_SubqueryExpression
quickstep_utility_Macros)
target_link_libraries(quickstep_queryoptimizer_expressions_InValueList
- quickstep_queryoptimizer_OptimizerTree
+ glog
quickstep_expressions_predicate_DisjunctionPredicate
quickstep_expressions_predicate_Predicate
+ quickstep_queryoptimizer_OptimizerTree
quickstep_queryoptimizer_expressions_AttributeReference
quickstep_queryoptimizer_expressions_ComparisonExpression
quickstep_queryoptimizer_expressions_ExprId
@@ -251,7 +254,6 @@ target_link_libraries(quickstep_queryoptimizer_expressions_PredicateLiteral
quickstep_queryoptimizer_expressions_Predicate
quickstep_utility_Macros)
target_link_libraries(quickstep_queryoptimizer_expressions_Scalar
- glog
quickstep_queryoptimizer_expressions_ExprId
quickstep_queryoptimizer_expressions_Expression
quickstep_utility_HashError
@@ -271,6 +273,7 @@ target_link_libraries(quickstep_queryoptimizer_expressions_ScalarLiteral
quickstep_utility_HashPair
quickstep_utility_Macros)
target_link_libraries(quickstep_queryoptimizer_expressions_SearchedCase
+ glog
quickstep_expressions_predicate_Predicate
quickstep_expressions_scalar_Scalar
quickstep_expressions_scalar_ScalarCaseExpression
@@ -286,6 +289,7 @@ target_link_libraries(quickstep_queryoptimizer_expressions_SearchedCase
quickstep_utility_Cast
quickstep_utility_Macros)
target_link_libraries(quickstep_queryoptimizer_expressions_SimpleCase
+ glog
quickstep_expressions_predicate_Predicate
quickstep_expressions_scalar_Scalar
quickstep_expressions_scalar_ScalarCaseExpression
@@ -342,7 +346,6 @@ target_link_libraries(quickstep_queryoptimizer_expressions_WindowAggregateFuncti
quickstep_utility_Cast
quickstep_utility_Macros)
-
# Module all-in-one library:
add_library(quickstep_queryoptimizer_expressions ../../empty_src.cpp OptimizerExpressionsModule.hpp)
target_link_libraries(quickstep_queryoptimizer_expressions
@@ -354,9 +357,9 @@ target_link_libraries(quickstep_queryoptimizer_expressions
quickstep_queryoptimizer_expressions_CommonSubexpression
quickstep_queryoptimizer_expressions_ComparisonExpression
quickstep_queryoptimizer_expressions_Exists
+ quickstep_queryoptimizer_expressions_ExprId
quickstep_queryoptimizer_expressions_Expression
quickstep_queryoptimizer_expressions_ExpressionType
- quickstep_queryoptimizer_expressions_ExprId
quickstep_queryoptimizer_expressions_ExpressionUtil
quickstep_queryoptimizer_expressions_InTableQuery
quickstep_queryoptimizer_expressions_InValueList
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/b1785647/query_optimizer/logical/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/query_optimizer/logical/CMakeLists.txt b/query_optimizer/logical/CMakeLists.txt
index 37e9735..0fbbf71 100644
--- a/query_optimizer/logical/CMakeLists.txt
+++ b/query_optimizer/logical/CMakeLists.txt
@@ -41,8 +41,8 @@ add_library(quickstep_queryoptimizer_logical_SharedSubplanReference
SharedSubplanReference.cpp
SharedSubplanReference.hpp)
add_library(quickstep_queryoptimizer_logical_Sort Sort.cpp Sort.hpp)
-add_library(quickstep_queryoptimizer_logical_TableReference TableReference.cpp TableReference.hpp)
add_library(quickstep_queryoptimizer_logical_TableGenerator ../../empty_src.cpp TableGenerator.hpp)
+add_library(quickstep_queryoptimizer_logical_TableReference TableReference.cpp TableReference.hpp)
add_library(quickstep_queryoptimizer_logical_TopLevelPlan TopLevelPlan.cpp TopLevelPlan.hpp)
add_library(quickstep_queryoptimizer_logical_UpdateTable UpdateTable.cpp UpdateTable.hpp)
add_library(quickstep_queryoptimizer_logical_WindowAggregate WindowAggregate.cpp WindowAggregate.hpp)
@@ -89,8 +89,8 @@ target_link_libraries(quickstep_queryoptimizer_logical_CopyTo
quickstep_utility_StringUtil)
target_link_libraries(quickstep_queryoptimizer_logical_CreateIndex
glog
- quickstep_queryoptimizer_expressions_AttributeReference
quickstep_queryoptimizer_OptimizerTree
+ quickstep_queryoptimizer_expressions_AttributeReference
quickstep_queryoptimizer_logical_Logical
quickstep_queryoptimizer_logical_LogicalType
quickstep_storage_StorageBlockLayout_proto
@@ -166,6 +166,7 @@ target_link_libraries(quickstep_queryoptimizer_logical_Join
quickstep_queryoptimizer_logical_Logical
quickstep_utility_Macros)
target_link_libraries(quickstep_queryoptimizer_logical_Logical
+ glog
quickstep_queryoptimizer_OptimizerTree
quickstep_queryoptimizer_expressions_AttributeReference
quickstep_queryoptimizer_expressions_Expression
@@ -217,6 +218,7 @@ target_link_libraries(quickstep_queryoptimizer_logical_Sample
quickstep_utility_Cast
quickstep_utility_Macros)
target_link_libraries(quickstep_queryoptimizer_logical_SetOperation
+ glog
quickstep_queryoptimizer_OptimizerTree
quickstep_queryoptimizer_expressions_AttributeReference
quickstep_queryoptimizer_logical_Logical
@@ -232,7 +234,6 @@ target_link_libraries(quickstep_queryoptimizer_logical_SharedSubplanReference
quickstep_utility_Cast
quickstep_utility_Macros)
target_link_libraries(quickstep_queryoptimizer_logical_Sort
- glog
quickstep_queryoptimizer_OptimizerTree
quickstep_queryoptimizer_expressions_AttributeReference
quickstep_queryoptimizer_expressions_ExpressionUtil
@@ -253,9 +254,9 @@ target_link_libraries(quickstep_queryoptimizer_logical_TableGenerator
quickstep_utility_Macros)
target_link_libraries(quickstep_queryoptimizer_logical_TableReference
glog
+ quickstep_catalog_CatalogRelation
quickstep_queryoptimizer_OptimizerContext
quickstep_queryoptimizer_OptimizerTree
- quickstep_catalog_CatalogRelation
quickstep_queryoptimizer_expressions_AttributeReference
quickstep_queryoptimizer_logical_Logical
quickstep_queryoptimizer_logical_LogicalType
@@ -282,6 +283,7 @@ target_link_libraries(quickstep_queryoptimizer_logical_UpdateTable
quickstep_utility_Macros)
target_link_libraries(quickstep_queryoptimizer_logical_WindowAggregate
glog
+ quickstep_queryoptimizer_OptimizerTree
quickstep_queryoptimizer_expressions_Alias
quickstep_queryoptimizer_expressions_AttributeReference
quickstep_queryoptimizer_expressions_Expression
@@ -290,11 +292,9 @@ target_link_libraries(quickstep_queryoptimizer_logical_WindowAggregate
quickstep_queryoptimizer_expressions_PatternMatcher
quickstep_queryoptimizer_logical_Logical
quickstep_queryoptimizer_logical_LogicalType
- quickstep_queryoptimizer_OptimizerTree
quickstep_utility_Cast
quickstep_utility_Macros)
-
# Module all-in-one library:
add_library(quickstep_queryoptimizer_logical ../../empty_src.cpp OptimizerLogicalModule.hpp)
target_link_libraries(quickstep_queryoptimizer_logical
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/b1785647/query_optimizer/physical/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/query_optimizer/physical/CMakeLists.txt b/query_optimizer/physical/CMakeLists.txt
index dff8f99..9f866b8 100644
--- a/query_optimizer/physical/CMakeLists.txt
+++ b/query_optimizer/physical/CMakeLists.txt
@@ -53,6 +53,7 @@ add_library(quickstep_queryoptimizer_physical_WindowAggregate WindowAggregate.cp
# Link dependencies:
target_link_libraries(quickstep_queryoptimizer_physical_Aggregate
+ glog
quickstep_queryoptimizer_OptimizerTree
quickstep_queryoptimizer_expressions_Alias
quickstep_queryoptimizer_expressions_AttributeReference
@@ -66,7 +67,6 @@ target_link_libraries(quickstep_queryoptimizer_physical_Aggregate
quickstep_utility_Cast
quickstep_utility_Macros)
target_link_libraries(quickstep_queryoptimizer_physical_BinaryJoin
- glog
quickstep_queryoptimizer_OptimizerTree
quickstep_queryoptimizer_expressions_NamedExpression
quickstep_queryoptimizer_physical_Join
@@ -116,6 +116,7 @@ target_link_libraries(quickstep_queryoptimizer_physical_CreateTable
quickstep_utility_Cast
quickstep_utility_Macros)
target_link_libraries(quickstep_queryoptimizer_physical_CrossReferenceCoalesceAggregate
+ glog
quickstep_queryoptimizer_OptimizerTree
quickstep_queryoptimizer_expressions_Alias
quickstep_queryoptimizer_expressions_AttributeReference
@@ -304,6 +305,7 @@ target_link_libraries(quickstep_queryoptimizer_physical_TopLevelPlan
quickstep_utility_Cast
quickstep_utility_Macros)
target_link_libraries(quickstep_queryoptimizer_physical_UnionAll
+ glog
quickstep_queryoptimizer_OptimizerTree
quickstep_queryoptimizer_expressions_AttributeReference
quickstep_queryoptimizer_expressions_ExpressionUtil
@@ -324,6 +326,7 @@ target_link_libraries(quickstep_queryoptimizer_physical_UpdateTable
quickstep_utility_Cast
quickstep_utility_Macros)
target_link_libraries(quickstep_queryoptimizer_physical_WindowAggregate
+ glog
quickstep_queryoptimizer_OptimizerTree
quickstep_queryoptimizer_expressions_Alias
quickstep_queryoptimizer_expressions_AttributeReference
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/b1785647/query_optimizer/resolver/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/query_optimizer/resolver/CMakeLists.txt b/query_optimizer/resolver/CMakeLists.txt
index 0746275..adabf71 100644
--- a/query_optimizer/resolver/CMakeLists.txt
+++ b/query_optimizer/resolver/CMakeLists.txt
@@ -124,8 +124,8 @@ target_link_libraries(quickstep_queryoptimizer_resolver_Resolver
quickstep_storage_StorageConstants
quickstep_types_IntType
quickstep_types_Type
- quickstep_types_TypedValue
quickstep_types_TypeFactory
+ quickstep_types_TypedValue
quickstep_types_operations_binaryoperations_BinaryOperation
quickstep_types_operations_comparisons_Comparison
quickstep_types_operations_comparisons_ComparisonFactory
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/b1785647/query_optimizer/rules/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/query_optimizer/rules/CMakeLists.txt b/query_optimizer/rules/CMakeLists.txt
index 17ef695..014a99b 100644
--- a/query_optimizer/rules/CMakeLists.txt
+++ b/query_optimizer/rules/CMakeLists.txt
@@ -54,12 +54,12 @@ add_library(quickstep_queryoptimizer_rules_StarSchemaHashJoinOrderOptimization
StarSchemaHashJoinOrderOptimization.hpp)
add_library(quickstep_queryoptimizer_rules_SwapProbeBuild SwapProbeBuild.cpp SwapProbeBuild.hpp)
add_library(quickstep_queryoptimizer_rules_TopDownRule ../../empty_src.cpp TopDownRule.hpp)
-add_library(quickstep_queryoptimizer_rules_UpdateExpression UpdateExpression.cpp UpdateExpression.hpp)
add_library(quickstep_queryoptimizer_rules_UnnestSubqueries UnnestSubqueries.cpp UnnestSubqueries.hpp)
-
+add_library(quickstep_queryoptimizer_rules_UpdateExpression UpdateExpression.cpp UpdateExpression.hpp)
# Link dependencies:
target_link_libraries(quickstep_queryoptimizer_rules_AttachLIPFilters
+ glog
quickstep_queryoptimizer_costmodel_StarSchemaSimpleCostModel
quickstep_queryoptimizer_expressions_AttributeReference
quickstep_queryoptimizer_expressions_ExprId
@@ -103,6 +103,7 @@ target_link_libraries(quickstep_queryoptimizer_rules_CollapseSelection
quickstep_queryoptimizer_rules_RuleHelper
quickstep_utility_Macros)
target_link_libraries(quickstep_queryoptimizer_rules_EliminateEmptyNode
+ glog
quickstep_catalog_CatalogAttribute
quickstep_catalog_CatalogDatabase
quickstep_catalog_CatalogRelation
@@ -145,6 +146,7 @@ target_link_libraries(quickstep_queryoptimizer_rules_ExtractCommonSubexpression
quickstep_utility_HashError
quickstep_utility_Macros)
target_link_libraries(quickstep_queryoptimizer_rules_FuseAggregateJoin
+ glog
quickstep_queryoptimizer_costmodel_StarSchemaSimpleCostModel
quickstep_queryoptimizer_expressions_AggregateFunction
quickstep_queryoptimizer_expressions_Alias
@@ -166,6 +168,7 @@ target_link_libraries(quickstep_queryoptimizer_rules_FuseAggregateJoin
quickstep_queryoptimizer_rules_BottomUpRule
quickstep_utility_Macros)
target_link_libraries(quickstep_queryoptimizer_rules_FuseHashSelect
+ glog
quickstep_queryoptimizer_expressions_Predicate
quickstep_queryoptimizer_physical_HashJoin
quickstep_queryoptimizer_physical_PatternMatcher
@@ -195,9 +198,30 @@ target_link_libraries(quickstep_queryoptimizer_rules_GenerateJoins
quickstep_utility_Macros
quickstep_utility_SqlError
quickstep_utility_VectorUtil)
+target_link_libraries(quickstep_queryoptimizer_rules_InjectJoinFilters
+ glog
+ quickstep_queryoptimizer_costmodel_StarSchemaSimpleCostModel
+ quickstep_queryoptimizer_expressions_AttributeReference
+ quickstep_queryoptimizer_expressions_ExpressionUtil
+ quickstep_queryoptimizer_expressions_Predicate
+ quickstep_queryoptimizer_physical_Aggregate
+ quickstep_queryoptimizer_physical_FilterJoin
+ quickstep_queryoptimizer_physical_HashJoin
+ quickstep_queryoptimizer_physical_LIPFilterConfiguration
+ quickstep_queryoptimizer_physical_PatternMatcher
+ quickstep_queryoptimizer_physical_Physical
+ quickstep_queryoptimizer_physical_PhysicalType
+ quickstep_queryoptimizer_physical_Selection
+ quickstep_queryoptimizer_physical_TopLevelPlan
+ quickstep_queryoptimizer_rules_PruneColumns
+ quickstep_queryoptimizer_rules_Rule
+ quickstep_types_TypeID
+ quickstep_types_TypedValue
+ quickstep_utility_Macros
+ quickstep_utility_lipfilter_LIPFilter)
target_link_libraries(quickstep_queryoptimizer_rules_Partition
+ ${GFLAGS_LIB_NAME}
glog
- gtest
quickstep_expressions_aggregation_AggregateFunction
quickstep_expressions_aggregation_AggregateFunctionFactory
quickstep_expressions_aggregation_AggregationID
@@ -226,9 +250,9 @@ target_link_libraries(quickstep_queryoptimizer_rules_Partition
quickstep_types_operations_binaryoperations_BinaryOperationID
quickstep_utility_Cast
quickstep_utility_EqualsAnyConstant
- quickstep_utility_Macros
- ${GFLAGS_LIB_NAME})
+ quickstep_utility_Macros)
target_link_libraries(quickstep_queryoptimizer_rules_PruneColumns
+ glog
quickstep_queryoptimizer_expressions_AttributeReference
quickstep_queryoptimizer_expressions_ExpressionUtil
quickstep_queryoptimizer_expressions_NamedExpression
@@ -251,6 +275,7 @@ target_link_libraries(quickstep_queryoptimizer_rules_PushDownFilter
quickstep_utility_Macros)
target_link_libraries(quickstep_queryoptimizer_rules_PushDownLowCostDisjunctivePredicate
${GFLAGS_LIB_NAME}
+ glog
quickstep_queryoptimizer_costmodel_StarSchemaSimpleCostModel
quickstep_queryoptimizer_expressions_AttributeReference
quickstep_queryoptimizer_expressions_ExpressionUtil
@@ -279,6 +304,7 @@ target_link_libraries(quickstep_queryoptimizer_rules_PushDownSemiAntiJoin
quickstep_utility_Macros)
target_link_libraries(quickstep_queryoptimizer_rules_ReduceGroupByAttributes
${GFLAGS_LIB_NAME}
+ glog
quickstep_catalog_CatalogRelation
quickstep_queryoptimizer_OptimizerContext
quickstep_queryoptimizer_costmodel_StarSchemaSimpleCostModel
@@ -306,6 +332,7 @@ target_link_libraries(quickstep_queryoptimizer_rules_ReferencedBaseRelations
quickstep_queryoptimizer_rules_UnnestSubqueries
quickstep_utility_Macros)
target_link_libraries(quickstep_queryoptimizer_rules_ReorderColumns
+ glog
quickstep_queryoptimizer_expressions_AttributeReference
quickstep_queryoptimizer_expressions_ExprId
quickstep_queryoptimizer_expressions_NamedExpression
@@ -359,6 +386,7 @@ target_link_libraries(quickstep_queryoptimizer_rules_RuleHelper
quickstep_queryoptimizer_expressions_Predicate
quickstep_queryoptimizer_rules_UpdateExpression)
target_link_libraries(quickstep_queryoptimizer_rules_StarSchemaHashJoinOrderOptimization
+ glog
quickstep_queryoptimizer_costmodel_StarSchemaSimpleCostModel
quickstep_queryoptimizer_expressions_AttributeReference
quickstep_queryoptimizer_expressions_ExprId
@@ -385,29 +413,11 @@ target_link_libraries(quickstep_queryoptimizer_rules_SwapProbeBuild
quickstep_queryoptimizer_rules_Rule
quickstep_utility_Macros)
target_link_libraries(quickstep_queryoptimizer_rules_TopDownRule
+ glog
quickstep_queryoptimizer_rules_Rule
quickstep_utility_Macros)
-target_link_libraries(quickstep_queryoptimizer_rules_InjectJoinFilters
- quickstep_queryoptimizer_costmodel_StarSchemaSimpleCostModel
- quickstep_queryoptimizer_expressions_AttributeReference
- quickstep_queryoptimizer_expressions_ExpressionUtil
- quickstep_queryoptimizer_expressions_Predicate
- quickstep_queryoptimizer_physical_Aggregate
- quickstep_queryoptimizer_physical_FilterJoin
- quickstep_queryoptimizer_physical_HashJoin
- quickstep_queryoptimizer_physical_LIPFilterConfiguration
- quickstep_queryoptimizer_physical_PatternMatcher
- quickstep_queryoptimizer_physical_Physical
- quickstep_queryoptimizer_physical_PhysicalType
- quickstep_queryoptimizer_physical_Selection
- quickstep_queryoptimizer_physical_TopLevelPlan
- quickstep_queryoptimizer_rules_Rule
- quickstep_queryoptimizer_rules_PruneColumns
- quickstep_types_TypeID
- quickstep_types_TypedValue
- quickstep_utility_Macros
- quickstep_utility_lipfilter_LIPFilter)
target_link_libraries(quickstep_queryoptimizer_rules_UnnestSubqueries
+ glog
quickstep_queryoptimizer_OptimizerContext
quickstep_queryoptimizer_expressions_AttributeReference
quickstep_queryoptimizer_expressions_ComparisonExpression
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/b1785647/query_optimizer/rules/Partition.hpp
----------------------------------------------------------------------
diff --git a/query_optimizer/rules/Partition.hpp b/query_optimizer/rules/Partition.hpp
index 4421dc1..6919469 100644
--- a/query_optimizer/rules/Partition.hpp
+++ b/query_optimizer/rules/Partition.hpp
@@ -30,8 +30,6 @@
#include "query_optimizer/rules/BottomUpRule.hpp"
#include "utility/Macros.hpp"
-#include "gtest/gtest_prod.h"
-
namespace quickstep {
namespace optimizer {
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/b1785647/query_optimizer/rules/tests/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/query_optimizer/rules/tests/CMakeLists.txt b/query_optimizer/rules/tests/CMakeLists.txt
index 42fa9c1..13f9eac 100644
--- a/query_optimizer/rules/tests/CMakeLists.txt
+++ b/query_optimizer/rules/tests/CMakeLists.txt
@@ -46,6 +46,8 @@ add_executable(quickstep_queryoptimizer_rules_tests
"${CMAKE_CURRENT_SOURCE_DIR}/UpdateExpression_unittest.cpp")
target_link_libraries(quickstep_queryoptimizer_rules_tests
+ ${GFLAGS_LIB_NAME}
+ ${LIBS}
glog
gtest
gtest_main
@@ -93,7 +95,5 @@ target_link_libraries(quickstep_queryoptimizer_rules_tests
quickstep_types_operations_comparisons_ComparisonFactory
quickstep_types_operations_comparisons_ComparisonID
quickstep_utility_Cast
- quickstep_utility_Macros
- ${GFLAGS_LIB_NAME}
- ${LIBS})
+ quickstep_utility_Macros)
add_test(quickstep_queryoptimizer_rules_tests quickstep_queryoptimizer_rules_tests)
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/b1785647/query_optimizer/strategy/tests/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/query_optimizer/strategy/tests/CMakeLists.txt b/query_optimizer/strategy/tests/CMakeLists.txt
index 97675f0..1fa181a 100644
--- a/query_optimizer/strategy/tests/CMakeLists.txt
+++ b/query_optimizer/strategy/tests/CMakeLists.txt
@@ -32,6 +32,7 @@ add_executable(quickstep_queryoptimizer_strategy_tests
"${CMAKE_CURRENT_SOURCE_DIR}/Selection_unittest.cpp")
target_link_libraries(quickstep_queryoptimizer_strategy_tests
+ ${LIBS}
glog
gtest
gtest_main
@@ -79,7 +80,6 @@ target_link_libraries(quickstep_queryoptimizer_strategy_tests
quickstep_types_operations_comparisons_ComparisonFactory
quickstep_types_operations_comparisons_ComparisonID
quickstep_utility_Cast
- quickstep_utility_Macros
- ${LIBS})
+ quickstep_utility_Macros)
add_test(quickstep_queryoptimizer_strategy_tests quickstep_queryoptimizer_strategy_tests)
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/b1785647/query_optimizer/tests/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/query_optimizer/tests/CMakeLists.txt b/query_optimizer/tests/CMakeLists.txt
index 5ef1d0a..e806e66 100644
--- a/query_optimizer/tests/CMakeLists.txt
+++ b/query_optimizer/tests/CMakeLists.txt
@@ -27,6 +27,7 @@ add_library(quickstep_queryoptimizer_tests_TestDatabaseLoader TestDatabaseLoader
target_link_libraries(quickstep_queryoptimizer_tests_OptimizerTest
gtest
+ gtest_main
quickstep_catalog_Catalog
quickstep_catalog_CatalogAttribute
quickstep_catalog_CatalogDatabase
@@ -103,6 +104,8 @@ add_executable(quickstep_queryoptimizer_tests_OptimizerTextTest
if (ENABLE_DISTRIBUTED)
target_link_libraries(quickstep_queryoptimizer_tests_DistributedExecutionGeneratorTest
+ ${GFLAGS_LIB_NAME}
+ ${LIBS}
glog
gtest
quickstep_catalog_CatalogTypedefs
@@ -128,11 +131,11 @@ if (ENABLE_DISTRIBUTED)
quickstep_utility_MemStream
quickstep_utility_SqlError
quickstep_utility_TextBasedTestDriver
- tmb
- ${GFLAGS_LIB_NAME}
- ${LIBS})
+ tmb)
endif(ENABLE_DISTRIBUTED)
target_link_libraries(quickstep_queryoptimizer_tests_ExecutionGeneratorTest
+ ${GFLAGS_LIB_NAME}
+ ${LIBS}
glog
gtest
quickstep_catalog_CatalogDatabase
@@ -154,11 +157,10 @@ target_link_libraries(quickstep_queryoptimizer_tests_ExecutionGeneratorTest
quickstep_utility_MemStream
quickstep_utility_SqlError
quickstep_utility_TextBasedTestDriver
- tmb
- ${GFLAGS_LIB_NAME}
- ${LIBS})
+ tmb)
target_link_libraries(quickstep_queryoptimizer_tests_OptimizerTextTest
${GFLAGS_LIB_NAME}
+ ${LIBS}
glog
gtest
gtest_main
@@ -172,5 +174,4 @@ target_link_libraries(quickstep_queryoptimizer_tests_OptimizerTextTest
quickstep_queryoptimizer_tests_TestDatabaseLoader
quickstep_utility_Macros
quickstep_utility_SqlError
- quickstep_utility_TextBasedTestDriver
- ${LIBS})
+ quickstep_utility_TextBasedTestDriver)
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/b1785647/query_optimizer/tests/logical_generator/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/query_optimizer/tests/logical_generator/CMakeLists.txt b/query_optimizer/tests/logical_generator/CMakeLists.txt
index 58d3d77..32e3626 100644
--- a/query_optimizer/tests/logical_generator/CMakeLists.txt
+++ b/query_optimizer/tests/logical_generator/CMakeLists.txt
@@ -28,6 +28,6 @@ add_test(quickstep_queryoptimizer_tests_logicalgenerator_join
"${CMAKE_CURRENT_SOURCE_DIR}/Join.test"
"${CMAKE_CURRENT_BINARY_DIR}/Join.test")
add_test(quickstep_queryoptimizer_tests_logicalgenerator_select
- "../quickstep_queryoptimizer_tests_OptimizerTextTest"
- "${CMAKE_CURRENT_SOURCE_DIR}/Select.test"
- "${CMAKE_CURRENT_BINARY_DIR}/Select.test")
+ "../quickstep_queryoptimizer_tests_OptimizerTextTest"
+ "${CMAKE_CURRENT_SOURCE_DIR}/Select.test"
+ "${CMAKE_CURRENT_BINARY_DIR}/Select.test")
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/b1785647/query_optimizer/tests/physical_generator/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/query_optimizer/tests/physical_generator/CMakeLists.txt b/query_optimizer/tests/physical_generator/CMakeLists.txt
index fc3390e..7c5f08c 100644
--- a/query_optimizer/tests/physical_generator/CMakeLists.txt
+++ b/query_optimizer/tests/physical_generator/CMakeLists.txt
@@ -36,9 +36,9 @@ add_test(quickstep_queryoptimizer_tests_physicalgenerator_drop
"${CMAKE_CURRENT_SOURCE_DIR}/Drop.test"
"${CMAKE_CURRENT_BINARY_DIR}/Drop.test")
add_test(quickstep_queryoptimizer_tests_physicalgenerator_index
- "../quickstep_queryoptimizer_tests_OptimizerTextTest"
- "${CMAKE_CURRENT_SOURCE_DIR}/Index.test"
- "${CMAKE_CURRENT_BINARY_DIR}/Index.test")
+ "../quickstep_queryoptimizer_tests_OptimizerTextTest"
+ "${CMAKE_CURRENT_SOURCE_DIR}/Index.test"
+ "${CMAKE_CURRENT_BINARY_DIR}/Index.test")
add_test(quickstep_queryoptimizer_tests_physicalgenerator_insert
"../quickstep_queryoptimizer_tests_OptimizerTextTest"
"${CMAKE_CURRENT_SOURCE_DIR}/Insert.test"
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/b1785647/query_optimizer/tests/resolver/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/query_optimizer/tests/resolver/CMakeLists.txt b/query_optimizer/tests/resolver/CMakeLists.txt
index 5350543..ba7bfff 100644
--- a/query_optimizer/tests/resolver/CMakeLists.txt
+++ b/query_optimizer/tests/resolver/CMakeLists.txt
@@ -36,9 +36,9 @@ add_test(quickstep_queryoptimizer_tests_resolver_drop
"${CMAKE_CURRENT_SOURCE_DIR}/Drop.test"
"${CMAKE_CURRENT_BINARY_DIR}/Drop.test")
add_test(quickstep_queryoptimizer_tests_resolver_index
- "../quickstep_queryoptimizer_tests_OptimizerTextTest"
- "${CMAKE_CURRENT_SOURCE_DIR}/Index.test"
- "${CMAKE_CURRENT_BINARY_DIR}/Index.test")
+ "../quickstep_queryoptimizer_tests_OptimizerTextTest"
+ "${CMAKE_CURRENT_SOURCE_DIR}/Index.test"
+ "${CMAKE_CURRENT_BINARY_DIR}/Index.test")
add_test(quickstep_queryoptimizer_tests_resolver_insert
"../quickstep_queryoptimizer_tests_OptimizerTextTest"
"${CMAKE_CURRENT_SOURCE_DIR}/Insert.test"
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/b1785647/relational_operators/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/relational_operators/CMakeLists.txt b/relational_operators/CMakeLists.txt
index 7b9ed96..12fd0e7 100644
--- a/relational_operators/CMakeLists.txt
+++ b/relational_operators/CMakeLists.txt
@@ -40,10 +40,10 @@ add_library(quickstep_relationaloperators_BuildHashOperator BuildHashOperator.cp
add_library(quickstep_relationaloperators_BuildLIPFilterOperator BuildLIPFilterOperator.cpp BuildLIPFilterOperator.hpp)
add_library(quickstep_relationaloperators_CreateIndexOperator ../empty_src.cpp CreateIndexOperator.hpp)
add_library(quickstep_relationaloperators_CreateTableOperator ../empty_src.cpp CreateTableOperator.hpp)
+add_library(quickstep_relationaloperators_DeleteOperator DeleteOperator.cpp DeleteOperator.hpp)
add_library(quickstep_relationaloperators_DestroyAggregationStateOperator
DestroyAggregationStateOperator.cpp
DestroyAggregationStateOperator.hpp)
-add_library(quickstep_relationaloperators_DeleteOperator DeleteOperator.cpp DeleteOperator.hpp)
add_library(quickstep_relationaloperators_DestroyHashOperator DestroyHashOperator.cpp DestroyHashOperator.hpp)
add_library(quickstep_relationaloperators_DropTableOperator DropTableOperator.cpp DropTableOperator.hpp)
add_library(quickstep_relationaloperators_FinalizeAggregationOperator
@@ -62,21 +62,26 @@ add_library(quickstep_relationaloperators_RelationalOperator ../empty_src.cpp Re
add_library(quickstep_relationaloperators_SampleOperator SampleOperator.cpp SampleOperator.hpp)
add_library(quickstep_relationaloperators_SaveBlocksOperator SaveBlocksOperator.cpp SaveBlocksOperator.hpp)
add_library(quickstep_relationaloperators_SelectOperator SelectOperator.cpp SelectOperator.hpp)
-add_library(quickstep_relationaloperators_SortMergeRunOperator SortMergeRunOperator.cpp
+add_library(quickstep_relationaloperators_SortMergeRunOperator
+ SortMergeRunOperator.cpp
SortMergeRunOperator.hpp)
+add_library(quickstep_relationaloperators_SortMergeRunOperatorHelpers
+ SortMergeRunOperatorHelpers.cpp
+ SortMergeRunOperatorHelpers.hpp)
add_library(quickstep_relationaloperators_SortMergeRunOperator_proto
${relationaloperators_SortMergeRunOperator_proto_srcs}
${relationaloperators_SortMergeRunOperator_proto_hdrs})
-add_library(quickstep_relationaloperators_SortMergeRunOperatorHelpers SortMergeRunOperatorHelpers.cpp
- SortMergeRunOperatorHelpers.hpp)
-add_library(quickstep_relationaloperators_SortRunGenerationOperator SortRunGenerationOperator.cpp
+add_library(quickstep_relationaloperators_SortRunGenerationOperator
+ SortRunGenerationOperator.cpp
SortRunGenerationOperator.hpp)
add_library(quickstep_relationaloperators_TableExportOperator TableExportOperator.cpp TableExportOperator.hpp)
add_library(quickstep_relationaloperators_TableGeneratorOperator TableGeneratorOperator.cpp TableGeneratorOperator.hpp)
add_library(quickstep_relationaloperators_TextScanOperator TextScanOperator.cpp TextScanOperator.hpp)
add_library(quickstep_relationaloperators_UnionAllOperator UnionAllOperator.cpp UnionAllOperator.hpp)
add_library(quickstep_relationaloperators_UpdateOperator UpdateOperator.cpp UpdateOperator.hpp)
-add_library(quickstep_relationaloperators_WindowAggregationOperator WindowAggregationOperator.cpp WindowAggregationOperator.hpp)
+add_library(quickstep_relationaloperators_WindowAggregationOperator
+ WindowAggregationOperator.cpp
+ WindowAggregationOperator.hpp)
add_library(quickstep_relationaloperators_WorkOrder ../empty_src.cpp WorkOrder.hpp)
add_library(quickstep_relationaloperators_WorkOrderFactory WorkOrderFactory.cpp WorkOrderFactory.hpp)
add_library(quickstep_relationaloperators_WorkOrder_proto
@@ -412,10 +417,6 @@ target_link_libraries(quickstep_relationaloperators_SelectOperator
quickstep_utility_lipfilter_LIPFilterAdaptiveProber
quickstep_utility_lipfilter_LIPFilterUtil
tmb)
-if(QUICKSTEP_HAVE_LIBNUMA)
-target_link_libraries(quickstep_relationaloperators_SelectOperator
- quickstep_catalog_NUMAPlacementScheme)
-endif()
target_link_libraries(quickstep_relationaloperators_SortMergeRunOperator
glog
quickstep_catalog_CatalogRelation
@@ -434,8 +435,6 @@ target_link_libraries(quickstep_relationaloperators_SortMergeRunOperator
quickstep_utility_Macros
quickstep_utility_SortConfiguration
tmb)
-target_link_libraries(quickstep_relationaloperators_SortMergeRunOperator_proto
- ${PROTOBUF_LIBRARY})
target_link_libraries(quickstep_relationaloperators_SortMergeRunOperatorHelpers
glog
quickstep_catalog_CatalogTypedefs
@@ -456,6 +455,8 @@ target_link_libraries(quickstep_relationaloperators_SortMergeRunOperatorHelpers
quickstep_utility_Macros
quickstep_utility_PtrVector
quickstep_utility_SortConfiguration)
+target_link_libraries(quickstep_relationaloperators_SortMergeRunOperator_proto
+ ${PROTOBUF_LIBRARY})
target_link_libraries(quickstep_relationaloperators_SortRunGenerationOperator
glog
quickstep_catalog_CatalogRelation
@@ -493,7 +494,8 @@ target_link_libraries(quickstep_relationaloperators_TableExportOperator
quickstep_types_containers_Tuple
quickstep_utility_BulkIoConfiguration
quickstep_utility_Macros
- quickstep_utility_StringUtil)
+ quickstep_utility_StringUtil
+ tmb)
target_link_libraries(quickstep_relationaloperators_TableGeneratorOperator
glog
quickstep_catalog_CatalogRelation
@@ -533,10 +535,6 @@ target_link_libraries(quickstep_relationaloperators_TextScanOperator
quickstep_utility_Glob
quickstep_utility_Macros
tmb)
-if (QUICKSTEP_HAVE_FILE_MANAGER_HDFS)
- target_link_libraries(quickstep_relationaloperators_TextScanOperator
- ${LIBHDFS3_LIBRARIES})
-endif(QUICKSTEP_HAVE_FILE_MANAGER_HDFS)
target_link_libraries(quickstep_relationaloperators_UnionAllOperator
glog
quickstep_catalog_CatalogRelation
@@ -629,16 +627,26 @@ target_link_libraries(quickstep_relationaloperators_WorkOrderFactory
quickstep_utility_lipfilter_LIPFilterUtil
tmb)
target_link_libraries(quickstep_relationaloperators_WorkOrder_proto
- quickstep_relationaloperators_SortMergeRunOperator_proto
- ${PROTOBUF_LIBRARY})
+ ${PROTOBUF_LIBRARY}
+ quickstep_relationaloperators_SortMergeRunOperator_proto)
+
+if(QUICKSTEP_HAVE_LIBNUMA)
+ target_link_libraries(quickstep_relationaloperators_SelectOperator
+ quickstep_catalog_NUMAPlacementScheme)
+endif()
+
+if (QUICKSTEP_HAVE_FILE_MANAGER_HDFS)
+ target_link_libraries(quickstep_relationaloperators_TextScanOperator
+ ${LIBHDFS3_LIBRARIES})
+endif(QUICKSTEP_HAVE_FILE_MANAGER_HDFS)
# Module all-in-one library:
add_library(quickstep_relationaloperators ../empty_src.cpp RelationalOperatorsModule.hpp)
target_link_libraries(quickstep_relationaloperators
quickstep_relationaloperators_AggregationOperator
quickstep_relationaloperators_BuildAggregationExistenceMapOperator
- quickstep_relationaloperators_BuildLIPFilterOperator
quickstep_relationaloperators_BuildHashOperator
+ quickstep_relationaloperators_BuildLIPFilterOperator
quickstep_relationaloperators_CreateIndexOperator
quickstep_relationaloperators_CreateTableOperator
quickstep_relationaloperators_DeleteOperator
@@ -674,6 +682,7 @@ add_executable(AggregationOperator_unittest
"${CMAKE_CURRENT_SOURCE_DIR}/tests/AggregationOperator_unittest.cpp")
target_link_libraries(AggregationOperator_unittest
${GFLAGS_LIB_NAME}
+ ${LIBS}
glog
gtest
quickstep_catalog_CatalogAttribute
@@ -720,14 +729,14 @@ target_link_libraries(AggregationOperator_unittest
quickstep_types_operations_comparisons_ComparisonID
quickstep_utility_Macros
quickstep_utility_PtrList
- tmb
- ${LIBS})
+ tmb)
add_test(AggregationOperator_unittest AggregationOperator_unittest)
add_executable(HashJoinOperator_unittest
"${CMAKE_CURRENT_SOURCE_DIR}/tests/HashJoinOperator_unittest.cpp")
target_link_libraries(HashJoinOperator_unittest
${GFLAGS_LIB_NAME}
+ ${LIBS}
glog
gtest
quickstep_catalog_CatalogAttribute
@@ -750,8 +759,8 @@ target_link_libraries(HashJoinOperator_unittest
quickstep_relationaloperators_HashJoinOperator
quickstep_relationaloperators_RelationalOperator
quickstep_relationaloperators_WorkOrder
- quickstep_storage_HashTable_proto
quickstep_storage_HashTableBase
+ quickstep_storage_HashTable_proto
quickstep_storage_InsertDestination
quickstep_storage_InsertDestination_proto
quickstep_storage_StorageBlock
@@ -772,14 +781,14 @@ target_link_libraries(HashJoinOperator_unittest
quickstep_types_operations_comparisons_ComparisonFactory
quickstep_types_operations_comparisons_ComparisonID
quickstep_utility_Macros
- tmb
- ${LIBS})
+ tmb)
add_test(HashJoinOperator_unittest HashJoinOperator_unittest)
add_executable(SortMergeRunOperator_unittest
"${CMAKE_CURRENT_SOURCE_DIR}/tests/SortMergeRunOperator_unittest.cpp")
target_link_libraries(SortMergeRunOperator_unittest
${GFLAGS_LIB_NAME}
+ ${LIBS}
glog
gtest
quickstep_catalog_CatalogAttribute
@@ -822,14 +831,14 @@ target_link_libraries(SortMergeRunOperator_unittest
quickstep_utility_PtrVector
quickstep_utility_SortConfiguration
quickstep_utility_SortConfiguration_proto
- tmb
- ${LIBS})
+ tmb)
add_test(SortMergeRunOperator_unittest SortMergeRunOperator_unittest)
add_executable(SortRunGenerationOperator_unittest
"${CMAKE_CURRENT_SOURCE_DIR}/tests/SortRunGenerationOperator_unittest.cpp")
target_link_libraries(SortRunGenerationOperator_unittest
${GFLAGS_LIB_NAME}
+ ${LIBS}
glog
gtest
quickstep_catalog_CatalogAttribute
@@ -869,8 +878,7 @@ target_link_libraries(SortRunGenerationOperator_unittest
quickstep_types_containers_Tuple
quickstep_utility_SortConfiguration
quickstep_utility_SortConfiguration_proto
- tmb
- ${LIBS})
+ tmb)
add_test(SortRunGenerationOperator_unittest SortRunGenerationOperator_unittest)
add_executable(TextScanOperator_unittest