quickstep-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From zu...@apache.org
Subject [2/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.
Date Fri, 27 Apr 2018 23:49:17 GMT
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/b1785647/storage/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/storage/CMakeLists.txt b/storage/CMakeLists.txt
index e67269f..832e667 100644
--- a/storage/CMakeLists.txt
+++ b/storage/CMakeLists.txt
@@ -152,19 +152,7 @@ add_library(quickstep_storage_BasicColumnStoreValueAccessor
             ../empty_src.cpp
             BasicColumnStoreValueAccessor.hpp)
 add_library(quickstep_storage_BloomFilterIndexSubBlock BloomFilterIndexSubBlock.cpp BloomFilterIndexSubBlock.hpp)
-# CMAKE_VALIDATE_IGNORE_BEGIN
-if(QUICKSTEP_HAVE_BITWEAVING)
-  add_library(quickstep_storage_BitWeavingIndexSubBlock
-              bitweaving/BitWeavingIndexSubBlock.cpp
-              bitweaving/BitWeavingIndexSubBlock.hpp)
-  add_library(quickstep_storage_BitWeavingHIndexSubBlock
-              bitweaving/BitWeavingHIndexSubBlock.cpp
-              bitweaving/BitWeavingHIndexSubBlock.hpp)
-  add_library(quickstep_storage_BitWeavingVIndexSubBlock
-              bitweaving/BitWeavingVIndexSubBlock.cpp
-              bitweaving/BitWeavingVIndexSubBlock.hpp)
-endif()
-# CMAKE_VALIDATE_IGNORE_END
+add_library(quickstep_storage_CSBTreeIndexSubBlock CSBTreeIndexSubBlock.cpp CSBTreeIndexSubBlock.hpp)
 add_library(quickstep_storage_CollisionFreeVectorTable
             CollisionFreeVectorTable.cpp
             CollisionFreeVectorTable.hpp)
@@ -187,33 +175,16 @@ add_library(quickstep_storage_CompressedTupleStorageSubBlock
             CompressedTupleStorageSubBlock.cpp
             CompressedTupleStorageSubBlock.hpp)
 add_library(quickstep_storage_CountedReference ../empty_src.cpp CountedReference.hpp)
-add_library(quickstep_storage_CSBTreeIndexSubBlock CSBTreeIndexSubBlock.cpp CSBTreeIndexSubBlock.hpp)
-
-if (ENABLE_DISTRIBUTED)
-  add_library(quickstep_storage_DataExchange_proto
-              ${storage_DataExchange_proto_srcs}
-              ${storage_DataExchange_proto_hdrs})
-  add_library(quickstep_storage_DataExchangerAsync DataExchangerAsync.cpp DataExchangerAsync.hpp)
-endif()
-
 add_library(quickstep_storage_EvictionPolicy EvictionPolicy.cpp EvictionPolicy.hpp)
 add_library(quickstep_storage_FileManager ../empty_src.cpp FileManager.hpp)
-if (QUICKSTEP_HAVE_FILE_MANAGER_HDFS)
-  add_library(quickstep_storage_FileManagerHdfs FileManagerHdfs.cpp FileManagerHdfs.hpp)
-endif()
 add_library(quickstep_storage_FileManagerLocal ../empty_src.cpp FileManagerLocal.hpp)
-if (QUICKSTEP_HAVE_FILE_MANAGER_POSIX)
-  add_library(quickstep_storage_FileManagerPosix FileManagerPosix.cpp FileManagerPosix.hpp)
-elseif (QUICKSTEP_HAVE_FILE_MANAGER_WINDOWS)
-  add_library(quickstep_storage_FileManagerWindows FileManagerWindows.cpp FileManagerWindows.hpp)
-endif()
 add_library(quickstep_storage_Flags Flags.cpp Flags.hpp)
 add_library(quickstep_storage_HashTable ../empty_src.cpp HashTable.hpp)
-add_library(quickstep_storage_HashTable_proto ${storage_HashTable_proto_srcs})
 add_library(quickstep_storage_HashTableBase ../empty_src.cpp HashTableBase.hpp)
 add_library(quickstep_storage_HashTableFactory HashTableFactory.cpp HashTableFactory.hpp)
 add_library(quickstep_storage_HashTableKeyManager ../empty_src.cpp HashTableKeyManager.hpp)
 add_library(quickstep_storage_HashTablePool ../empty_src.cpp HashTablePool.hpp)
+add_library(quickstep_storage_HashTable_proto ${storage_HashTable_proto_srcs})
 add_library(quickstep_storage_IndexSubBlock ../empty_src.cpp IndexSubBlock.hpp)
 add_library(quickstep_storage_IndexSubBlockDescriptionFactory ../empty_src.cpp IndexSubBlockDescriptionFactory.hpp)
 add_library(quickstep_storage_InsertDestination InsertDestination.cpp InsertDestination.hpp)
@@ -260,10 +231,40 @@ add_library(quickstep_storage_ValueAccessor ../empty_src.cpp ValueAccessor.hpp)
 add_library(quickstep_storage_ValueAccessorMultiplexer ../empty_src.cpp ValueAccessorMultiplexer.hpp)
 add_library(quickstep_storage_ValueAccessorUtil ../empty_src.cpp ValueAccessorUtil.hpp)
 add_library(quickstep_storage_WindowAggregationOperationState
-            WindowAggregationOperationState.hpp
-            WindowAggregationOperationState.cpp)
-add_library(quickstep_storage_WindowAggregationOperationState_proto ${storage_WindowAggregationOperationState_proto_srcs})
+            WindowAggregationOperationState.cpp
+            WindowAggregationOperationState.hpp)
+add_library(quickstep_storage_WindowAggregationOperationState_proto
+            ${storage_WindowAggregationOperationState_proto_srcs})
 
+# CMAKE_VALIDATE_IGNORE_BEGIN
+if(QUICKSTEP_HAVE_BITWEAVING)
+  add_library(quickstep_storage_BitWeavingIndexSubBlock
+              bitweaving/BitWeavingIndexSubBlock.cpp
+              bitweaving/BitWeavingIndexSubBlock.hpp)
+  add_library(quickstep_storage_BitWeavingHIndexSubBlock
+              bitweaving/BitWeavingHIndexSubBlock.cpp
+              bitweaving/BitWeavingHIndexSubBlock.hpp)
+  add_library(quickstep_storage_BitWeavingVIndexSubBlock
+              bitweaving/BitWeavingVIndexSubBlock.cpp
+              bitweaving/BitWeavingVIndexSubBlock.hpp)
+endif()
+# CMAKE_VALIDATE_IGNORE_END
+
+if (ENABLE_DISTRIBUTED)
+  add_library(quickstep_storage_DataExchange_proto
+              ${storage_DataExchange_proto_srcs}
+              ${storage_DataExchange_proto_hdrs})
+  add_library(quickstep_storage_DataExchangerAsync DataExchangerAsync.cpp DataExchangerAsync.hpp)
+endif()
+
+if (QUICKSTEP_HAVE_FILE_MANAGER_HDFS)
+  add_library(quickstep_storage_FileManagerHdfs FileManagerHdfs.cpp FileManagerHdfs.hpp)
+endif()
+if (QUICKSTEP_HAVE_FILE_MANAGER_POSIX)
+  add_library(quickstep_storage_FileManagerPosix FileManagerPosix.cpp FileManagerPosix.hpp)
+elseif (QUICKSTEP_HAVE_FILE_MANAGER_WINDOWS)
+  add_library(quickstep_storage_FileManagerWindows FileManagerWindows.cpp FileManagerWindows.hpp)
+endif()
 
 # Link dependencies:
 target_link_libraries(quickstep_storage_AggregationOperationState
@@ -285,8 +286,8 @@ target_link_libraries(quickstep_storage_AggregationOperationState
                       quickstep_storage_HashTablePool
                       quickstep_storage_HashTable_proto
                       quickstep_storage_InsertDestination
-                      quickstep_storage_PartitionedHashTablePool
                       quickstep_storage_PackedPayloadHashTable
+                      quickstep_storage_PartitionedHashTablePool
                       quickstep_storage_StorageBlock
                       quickstep_storage_StorageBlockInfo
                       quickstep_storage_StorageManager
@@ -305,11 +306,12 @@ target_link_libraries(quickstep_storage_AggregationOperationState
                       quickstep_utility_Macros
                       quickstep_utility_lipfilter_LIPFilterAdaptiveProber)
 target_link_libraries(quickstep_storage_AggregationOperationState_proto
+                      ${PROTOBUF_LIBRARY}
                       quickstep_expressions_Expressions_proto
                       quickstep_expressions_aggregation_AggregateFunction_proto
-                      quickstep_storage_HashTable_proto
-                      ${PROTOBUF_LIBRARY})
+                      quickstep_storage_HashTable_proto)
 target_link_libraries(quickstep_storage_BasicColumnStoreTupleStorageSubBlock
+                      glog
                       quickstep_catalog_CatalogAttribute
                       quickstep_catalog_CatalogRelationSchema
                       quickstep_catalog_CatalogTypedefs
@@ -351,6 +353,7 @@ target_link_libraries(quickstep_storage_BasicColumnStoreValueAccessor
                       quickstep_utility_Macros
                       quickstep_utility_PtrVector)
 target_link_libraries(quickstep_storage_BloomFilterIndexSubBlock
+                      glog
                       quickstep_catalog_CatalogAttribute
                       quickstep_catalog_CatalogRelationSchema
                       quickstep_catalog_CatalogTypedefs
@@ -372,75 +375,37 @@ target_link_libraries(quickstep_storage_BloomFilterIndexSubBlock
                       quickstep_types_operations_comparisons_ComparisonID
                       quickstep_utility_BloomFilter
                       quickstep_utility_Macros)
-# CMAKE_VALIDATE_IGNORE_BEGIN
-if(QUICKSTEP_HAVE_BITWEAVING)
-  target_link_libraries(quickstep_storage_BitWeavingHIndexSubBlock
-                        glog
-                        quickstep_catalog_CatalogTypedefs
-                        quickstep_compression_CompressionDictionary
-                        quickstep_compression_CompressionDictionaryBuilder
-                        quickstep_expressions_predicate_ComparisonPredicate
-                        quickstep_expressions_predicate_PredicateCost
-                        quickstep_storage_BitWeavingIndexSubBlock
-                        quickstep_storage_CompressedTupleStorageSubBlock
-                        quickstep_storage_StorageBlockInfo
-                        quickstep_storage_StorageBlockLayout_proto
-                        quickstep_storage_SubBlockTypeRegistry
-                        quickstep_storage_SubBlockTypeRegistryMacros
-                        quickstep_storage_TupleStorageSubBlock
-                        quickstep_types_TypedValue
-                        quickstep_types_operations_comparisons_ComparisonID
-                        quickstep_utility_Macros)
-  target_link_libraries(quickstep_storage_BitWeavingIndexSubBlock
-                        glog
-                        quickstep_catalog_CatalogAttribute
-                        quickstep_catalog_CatalogRelationSchema
-                        quickstep_catalog_CatalogTypedefs
-                        quickstep_compression_CompressionDictionary
-                        quickstep_compression_CompressionDictionaryBuilder
-                        quickstep_expressions_predicate_ComparisonPredicate
-                        quickstep_expressions_predicate_Predicate
-                        quickstep_expressions_scalar_Scalar
-                        quickstep_expressions_scalar_ScalarAttribute
-                        quickstep_storage_CompressedStoreUtil
-                        quickstep_storage_CompressedTupleStorageSubBlock
-                        quickstep_storage_IndexSubBlock
-                        quickstep_storage_StorageBlockInfo
-                        quickstep_storage_StorageBlockLayout_proto
-                        quickstep_storage_StorageConstants
-                        quickstep_storage_StorageErrors
-                        quickstep_storage_TupleIdSequence
-                        quickstep_storage_TupleStorageSubBlock
-                        quickstep_storage_ValueAccessor
-                        quickstep_storage_ValueAccessorUtil
-                        quickstep_types_Type
-                        quickstep_types_TypedValue
-                        quickstep_types_operations_comparisons_ComparisonID
-                        quickstep_utility_BitManipulation
-                        quickstep_utility_Macros)
-  target_link_libraries(quickstep_storage_BitWeavingVIndexSubBlock
-                        glog
-                        quickstep_catalog_CatalogTypedefs
-                        quickstep_compression_CompressionDictionary
-                        quickstep_compression_CompressionDictionaryBuilder
-                        quickstep_expressions_predicate_ComparisonPredicate
-                        quickstep_expressions_predicate_PredicateCost
-                        quickstep_storage_BitWeavingIndexSubBlock
-                        quickstep_storage_CompressedTupleStorageSubBlock
-                        quickstep_storage_StorageBlockInfo
-                        quickstep_storage_StorageBlockLayout_proto
-                        quickstep_storage_StorageConstants
-                        quickstep_storage_SubBlockTypeRegistry
-                        quickstep_storage_SubBlockTypeRegistryMacros
-                        quickstep_storage_TupleStorageSubBlock
-                        quickstep_storage_ValueAccessor
-                        quickstep_storage_ValueAccessorUtil
-                        quickstep_types_TypedValue
-                        quickstep_types_operations_comparisons_ComparisonID
-                        quickstep_utility_Macros)
-endif()
-# CMAKE_VALIDATE_IGNORE_END
+target_link_libraries(quickstep_storage_CSBTreeIndexSubBlock
+                      quickstep_catalog_CatalogAttribute
+                      quickstep_catalog_CatalogRelationSchema
+                      quickstep_catalog_CatalogTypedefs
+                      quickstep_compression_CompressionDictionary
+                      quickstep_expressions_predicate_ComparisonPredicate
+                      quickstep_expressions_predicate_PredicateCost
+                      quickstep_expressions_scalar_Scalar
+                      quickstep_expressions_scalar_ScalarAttribute
+                      quickstep_storage_CompressedTupleStorageSubBlock
+                      quickstep_storage_IndexSubBlock
+                      quickstep_storage_StorageBlockInfo
+                      quickstep_storage_StorageBlockLayout_proto
+                      quickstep_storage_StorageConstants
+                      quickstep_storage_StorageErrors
+                      quickstep_storage_SubBlockTypeRegistry
+                      quickstep_storage_SubBlockTypeRegistryMacros
+                      quickstep_storage_TupleIdSequence
+                      quickstep_storage_TupleStorageSubBlock
+                      quickstep_types_Type
+                      quickstep_types_TypedValue
+                      quickstep_types_operations_comparisons_Comparison
+                      quickstep_types_operations_comparisons_ComparisonFactory
+                      quickstep_types_operations_comparisons_ComparisonID
+                      quickstep_types_operations_comparisons_ComparisonUtil
+                      quickstep_utility_BitVector
+                      quickstep_utility_Macros
+                      quickstep_utility_PtrVector
+                      quickstep_utility_ScopedBuffer)
 target_link_libraries(quickstep_storage_CollisionFreeVectorTable
+                      glog
                       quickstep_catalog_CatalogTypedefs
                       quickstep_expressions_aggregation_AggregationHandle
                       quickstep_expressions_aggregation_AggregationID
@@ -605,50 +570,8 @@ target_link_libraries(quickstep_storage_CountedReference
                       quickstep_storage_EvictionPolicy
                       quickstep_storage_StorageBlockBase
                       quickstep_utility_Macros)
-target_link_libraries(quickstep_storage_CSBTreeIndexSubBlock
-                      quickstep_catalog_CatalogAttribute
-                      quickstep_catalog_CatalogRelationSchema
-                      quickstep_catalog_CatalogTypedefs
-                      quickstep_compression_CompressionDictionary
-                      quickstep_expressions_predicate_ComparisonPredicate
-                      quickstep_expressions_predicate_PredicateCost
-                      quickstep_expressions_scalar_Scalar
-                      quickstep_expressions_scalar_ScalarAttribute
-                      quickstep_storage_CompressedTupleStorageSubBlock
-                      quickstep_storage_IndexSubBlock
-                      quickstep_storage_StorageBlockInfo
-                      quickstep_storage_StorageBlockLayout_proto
-                      quickstep_storage_StorageConstants
-                      quickstep_storage_StorageErrors
-                      quickstep_storage_SubBlockTypeRegistry
-                      quickstep_storage_SubBlockTypeRegistryMacros
-                      quickstep_storage_TupleIdSequence
-                      quickstep_storage_TupleStorageSubBlock
-                      quickstep_types_Type
-                      quickstep_types_TypedValue
-                      quickstep_types_operations_comparisons_Comparison
-                      quickstep_types_operations_comparisons_ComparisonFactory
-                      quickstep_types_operations_comparisons_ComparisonID
-                      quickstep_types_operations_comparisons_ComparisonUtil
-                      quickstep_utility_BitVector
-                      quickstep_utility_Macros
-                      quickstep_utility_PtrVector
-                      quickstep_utility_ScopedBuffer)
-
-if (ENABLE_DISTRIBUTED)
-  target_link_libraries(quickstep_storage_DataExchange_proto
-                        ${PROTOBUF3_LIBRARY})
-  target_link_libraries(quickstep_storage_DataExchangerAsync
-                        glog
-                        quickstep_storage_DataExchange_proto
-                        quickstep_storage_StorageManager
-                        quickstep_threading_Thread
-                        quickstep_utility_Macros
-                        quickstep_utility_NetworkUtil
-                        ${GRPCPLUSPLUS_LIBRARIES})
-endif()
-
 target_link_libraries(quickstep_storage_EvictionPolicy
+                      glog
                       quickstep_storage_StorageBlockInfo
                       quickstep_storage_StorageConstants
                       quickstep_threading_Mutex
@@ -659,41 +582,6 @@ target_link_libraries(quickstep_storage_FileManager
                       quickstep_storage_StorageBlockInfo
                       quickstep_utility_Macros
                       quickstep_utility_StringUtil)
-if (QUICKSTEP_HAVE_FILE_MANAGER_HDFS)
-  target_link_libraries(quickstep_storage_FileManagerHdfs
-                        glog
-                        quickstep_storage_FileManager
-                        quickstep_storage_Flags
-                        quickstep_storage_StorageBlockInfo
-                        quickstep_storage_StorageConstants
-                        quickstep_storage_StorageErrors
-                        quickstep_utility_Macros
-                        quickstep_utility_StringUtil
-                        ${LIBHDFS3_LIBRARIES})
-endif()
-if (QUICKSTEP_HAVE_FILE_MANAGER_POSIX)
-  target_link_libraries(quickstep_storage_FileManagerLocal
-                        quickstep_storage_FileManagerPosix)
-  target_link_libraries(quickstep_storage_FileManagerPosix
-                        glog
-                        quickstep_storage_FileManager
-                        quickstep_storage_StorageBlockInfo
-                        quickstep_storage_StorageConstants
-                        quickstep_storage_StorageErrors
-                        quickstep_utility_Macros
-                        quickstep_utility_StringUtil)
-elseif (QUICKSTEP_HAVE_FILE_MANAGER_WINDOWS)
-  target_link_libraries(quickstep_storage_FileManagerLocal
-                        quickstep_storage_FileManagerWindows)
-  target_link_libraries(quickstep_storage_FileManagerWindows
-                        glog
-                        quickstep_storage_FileManager
-                        quickstep_storage_StorageBlockInfo
-                        quickstep_storage_StorageConstants
-                        quickstep_storage_StorageErrors
-                        quickstep_utility_Macros
-                        quickstep_utility_StringUtil)
-endif()
 target_link_libraries(quickstep_storage_Flags
                       ${GFLAGS_LIB_NAME})
 target_link_libraries(quickstep_storage_HashTable
@@ -715,15 +603,12 @@ target_link_libraries(quickstep_storage_HashTable
 target_link_libraries(quickstep_storage_HashTableBase
                       quickstep_storage_ValueAccessorMultiplexer
                       quickstep_utility_Macros)
-target_link_libraries(quickstep_storage_HashTable_proto
-                      quickstep_types_Type_proto
-                      ${PROTOBUF_LIBRARY})
 target_link_libraries(quickstep_storage_HashTableFactory
                       glog
                       quickstep_storage_CollisionFreeVectorTable
                       quickstep_storage_HashTable
-                      quickstep_storage_HashTable_proto
                       quickstep_storage_HashTableBase
+                      quickstep_storage_HashTable_proto
                       quickstep_storage_LinearOpenAddressingHashTable
                       quickstep_storage_PackedPayloadHashTable
                       quickstep_storage_SeparateChainingHashTable
@@ -749,6 +634,9 @@ target_link_libraries(quickstep_storage_HashTablePool
                       quickstep_storage_HashTableFactory
                       quickstep_threading_SpinMutex
                       quickstep_utility_Macros)
+target_link_libraries(quickstep_storage_HashTable_proto
+                      ${PROTOBUF_LIBRARY}
+                      quickstep_types_Type_proto)
 target_link_libraries(quickstep_storage_IndexSubBlock
                       quickstep_catalog_CatalogTypedefs
                       quickstep_expressions_predicate_PredicateCost
@@ -789,9 +677,9 @@ target_link_libraries(quickstep_storage_InsertDestinationInterface
                       quickstep_catalog_PartitionSchemeHeader
                       quickstep_types_containers_Tuple)
 target_link_libraries(quickstep_storage_InsertDestination_proto
+                      ${PROTOBUF_LIBRARY}
                       quickstep_catalog_Catalog_proto
-                      quickstep_storage_StorageBlockLayout_proto
-                      ${PROTOBUF_LIBRARY})
+                      quickstep_storage_StorageBlockLayout_proto)
 target_link_libraries(quickstep_storage_LinearOpenAddressingHashTable
                       quickstep_storage_HashTable
                       quickstep_storage_HashTableKeyManager
@@ -806,6 +694,7 @@ target_link_libraries(quickstep_storage_LinearOpenAddressingHashTable
                       quickstep_utility_Macros
                       quickstep_utility_PrimeNumber)
 target_link_libraries(quickstep_storage_PackedPayloadHashTable
+                      glog
                       quickstep_catalog_CatalogTypedefs
                       quickstep_expressions_aggregation_AggregationHandle
                       quickstep_storage_HashTableBase
@@ -844,10 +733,6 @@ target_link_libraries(quickstep_storage_PreloaderThread
                       quickstep_threading_Thread
                       quickstep_threading_ThreadUtil
                       quickstep_utility_Macros)
-if (QUICKSTEP_HAVE_LIBNUMA)
-  target_link_libraries(quickstep_storage_PreloaderThread
-                        quickstep_catalog_NUMAPlacementScheme)
-endif()
 target_link_libraries(quickstep_storage_SMAIndexSubBlock
                       glog
                       quickstep_catalog_CatalogAttribute
@@ -908,6 +793,7 @@ target_link_libraries(quickstep_storage_SimpleScalarSeparateChainingHashTable
                       quickstep_utility_PrimeNumber)
 target_link_libraries(quickstep_storage_SplitRowStoreTupleStorageSubBlock
                       glog
+                      gtest
                       quickstep_catalog_CatalogRelationSchema
                       quickstep_expressions_predicate_PredicateCost
                       quickstep_storage_SplitRowStoreValueAccessor
@@ -972,14 +858,6 @@ target_link_libraries(quickstep_storage_StorageBlock
                       quickstep_utility_ColumnVectorCache
                       quickstep_utility_Macros
                       quickstep_utility_PtrVector)
-# CMAKE_VALIDATE_IGNORE_BEGIN
-if(QUICKSTEP_HAVE_BITWEAVING)
-  target_link_libraries(quickstep_storage_StorageBlock
-                        quickstep_storage_BitWeavingHIndexSubBlock
-                        quickstep_storage_BitWeavingIndexSubBlock
-                        quickstep_storage_BitWeavingVIndexSubBlock)
-endif()
-# CMAKE_VALIDATE_IGNORE_END
 target_link_libraries(quickstep_storage_StorageBlockBase
                       glog
                       quickstep_storage_StorageBlockInfo
@@ -995,12 +873,11 @@ target_link_libraries(quickstep_storage_StorageBlockLayout
                       quickstep_storage_StorageConstants
                       quickstep_storage_StorageErrors
                       quickstep_storage_SubBlockTypeRegistry
-                      quickstep_utility_Macros
+                      quickstep_utility_Macros)
+target_link_libraries(quickstep_storage_StorageBlockLayout_proto
                       ${PROTOBUF_LIBRARY})
 target_link_libraries(quickstep_storage_StorageErrors
                       quickstep_storage_StorageBlockInfo)
-target_link_libraries(quickstep_storage_StorageBlockLayout_proto
-                      ${PROTOBUF_LIBRARY})
 target_link_libraries(quickstep_storage_StorageManager
                       ${GFLAGS_LIB_NAME}
                       glog
@@ -1025,22 +902,6 @@ target_link_libraries(quickstep_storage_StorageManager
                       quickstep_utility_Macros
                       quickstep_utility_ShardedLockManager
                       tmb)
-if (QUICKSTEP_HAVE_FILE_MANAGER_HDFS)
-target_link_libraries(quickstep_storage_StorageManager
-                      quickstep_storage_FileManagerHdfs)
-endif()
-if (QUICKSTEP_HAVE_LIBNUMA)
-  target_link_libraries(quickstep_storage_StorageManager
-                        ${LIBNUMA_LIBRARY})
-endif()
-if (ENABLE_DISTRIBUTED)
-  target_link_libraries(quickstep_storage_StorageManager
-                        quickstep_queryexecution_QueryExecutionMessages_proto
-                        quickstep_queryexecution_QueryExecutionTypedefs
-                        quickstep_queryexecution_QueryExecutionUtil
-                        quickstep_storage_DataExchange_proto
-                        ${GRPCPLUSPLUS_LIBRARIES})
-endif(ENABLE_DISTRIBUTED)
 target_link_libraries(quickstep_storage_SubBlockTypeRegistry
                       glog
                       quickstep_storage_StorageBlockLayout_proto
@@ -1095,7 +956,6 @@ target_link_libraries(quickstep_storage_ValueAccessor
                       quickstep_types_containers_Tuple
                       quickstep_utility_Macros)
 target_link_libraries(quickstep_storage_ValueAccessorMultiplexer
-                      glog
                       quickstep_catalog_CatalogTypedefs
                       quickstep_utility_Macros)
 target_link_libraries(quickstep_storage_ValueAccessorUtil
@@ -1133,9 +993,147 @@ target_link_libraries(quickstep_storage_WindowAggregationOperationState
                       quickstep_utility_ColumnVectorCache
                       quickstep_utility_Macros)
 target_link_libraries(quickstep_storage_WindowAggregationOperationState_proto
+                      ${PROTOBUF_LIBRARY}
                       quickstep_expressions_Expressions_proto
-                      quickstep_expressions_windowaggregation_WindowAggregateFunction_proto
-                      ${PROTOBUF_LIBRARY})
+                      quickstep_expressions_windowaggregation_WindowAggregateFunction_proto)
+
+# CMAKE_VALIDATE_IGNORE_BEGIN
+if(QUICKSTEP_HAVE_BITWEAVING)
+  target_link_libraries(quickstep_storage_BitWeavingHIndexSubBlock
+                        glog
+                        quickstep_catalog_CatalogTypedefs
+                        quickstep_compression_CompressionDictionary
+                        quickstep_compression_CompressionDictionaryBuilder
+                        quickstep_expressions_predicate_ComparisonPredicate
+                        quickstep_expressions_predicate_PredicateCost
+                        quickstep_storage_BitWeavingIndexSubBlock
+                        quickstep_storage_CompressedTupleStorageSubBlock
+                        quickstep_storage_StorageBlockInfo
+                        quickstep_storage_StorageBlockLayout_proto
+                        quickstep_storage_SubBlockTypeRegistry
+                        quickstep_storage_SubBlockTypeRegistryMacros
+                        quickstep_storage_TupleStorageSubBlock
+                        quickstep_types_TypedValue
+                        quickstep_types_operations_comparisons_ComparisonID
+                        quickstep_utility_Macros)
+  target_link_libraries(quickstep_storage_BitWeavingIndexSubBlock
+                        glog
+                        quickstep_catalog_CatalogAttribute
+                        quickstep_catalog_CatalogRelationSchema
+                        quickstep_catalog_CatalogTypedefs
+                        quickstep_compression_CompressionDictionary
+                        quickstep_compression_CompressionDictionaryBuilder
+                        quickstep_expressions_predicate_ComparisonPredicate
+                        quickstep_expressions_predicate_Predicate
+                        quickstep_expressions_scalar_Scalar
+                        quickstep_expressions_scalar_ScalarAttribute
+                        quickstep_storage_CompressedStoreUtil
+                        quickstep_storage_CompressedTupleStorageSubBlock
+                        quickstep_storage_IndexSubBlock
+                        quickstep_storage_StorageBlockInfo
+                        quickstep_storage_StorageBlockLayout_proto
+                        quickstep_storage_StorageConstants
+                        quickstep_storage_StorageErrors
+                        quickstep_storage_TupleIdSequence
+                        quickstep_storage_TupleStorageSubBlock
+                        quickstep_storage_ValueAccessor
+                        quickstep_storage_ValueAccessorUtil
+                        quickstep_types_Type
+                        quickstep_types_TypedValue
+                        quickstep_types_operations_comparisons_ComparisonID
+                        quickstep_utility_BitManipulation
+                        quickstep_utility_Macros)
+  target_link_libraries(quickstep_storage_BitWeavingVIndexSubBlock
+                        glog
+                        quickstep_catalog_CatalogTypedefs
+                        quickstep_compression_CompressionDictionary
+                        quickstep_compression_CompressionDictionaryBuilder
+                        quickstep_expressions_predicate_ComparisonPredicate
+                        quickstep_expressions_predicate_PredicateCost
+                        quickstep_storage_BitWeavingIndexSubBlock
+                        quickstep_storage_CompressedTupleStorageSubBlock
+                        quickstep_storage_StorageBlockInfo
+                        quickstep_storage_StorageBlockLayout_proto
+                        quickstep_storage_StorageConstants
+                        quickstep_storage_SubBlockTypeRegistry
+                        quickstep_storage_SubBlockTypeRegistryMacros
+                        quickstep_storage_TupleStorageSubBlock
+                        quickstep_storage_ValueAccessor
+                        quickstep_storage_ValueAccessorUtil
+                        quickstep_types_TypedValue
+                        quickstep_types_operations_comparisons_ComparisonID
+                        quickstep_utility_Macros)
+  target_link_libraries(quickstep_storage_StorageBlock
+                        quickstep_storage_BitWeavingHIndexSubBlock
+                        quickstep_storage_BitWeavingIndexSubBlock
+                        quickstep_storage_BitWeavingVIndexSubBlock)
+endif()
+# CMAKE_VALIDATE_IGNORE_END
+
+if (ENABLE_DISTRIBUTED)
+  target_link_libraries(quickstep_storage_DataExchange_proto
+                        ${PROTOBUF3_LIBRARY})
+  target_link_libraries(quickstep_storage_DataExchangerAsync
+                        ${GRPCPLUSPLUS_LIBRARIES}
+                        glog
+                        quickstep_storage_DataExchange_proto
+                        quickstep_storage_StorageManager
+                        quickstep_threading_Thread
+                        quickstep_utility_Macros
+                        quickstep_utility_NetworkUtil)
+  target_link_libraries(quickstep_storage_StorageManager
+                        ${GRPCPLUSPLUS_LIBRARIES}
+                        quickstep_queryexecution_QueryExecutionMessages_proto
+                        quickstep_queryexecution_QueryExecutionTypedefs
+                        quickstep_queryexecution_QueryExecutionUtil
+                        quickstep_storage_DataExchange_proto)
+endif()
+
+if (QUICKSTEP_HAVE_FILE_MANAGER_HDFS)
+  target_link_libraries(quickstep_storage_FileManagerHdfs
+                        ${LIBHDFS3_LIBRARIES}
+                        glog
+                        quickstep_storage_FileManager
+                        quickstep_storage_Flags
+                        quickstep_storage_StorageBlockInfo
+                        quickstep_storage_StorageConstants
+                        quickstep_storage_StorageErrors
+                        quickstep_utility_Macros
+                        quickstep_utility_StringUtil)
+  target_link_libraries(quickstep_storage_StorageManager
+                        quickstep_storage_FileManagerHdfs)
+endif()
+
+if (QUICKSTEP_HAVE_FILE_MANAGER_POSIX)
+  target_link_libraries(quickstep_storage_FileManagerLocal
+                        quickstep_storage_FileManagerPosix)
+  target_link_libraries(quickstep_storage_FileManagerPosix
+                        glog
+                        quickstep_storage_FileManager
+                        quickstep_storage_StorageBlockInfo
+                        quickstep_storage_StorageConstants
+                        quickstep_storage_StorageErrors
+                        quickstep_utility_Macros
+                        quickstep_utility_StringUtil)
+elseif (QUICKSTEP_HAVE_FILE_MANAGER_WINDOWS)
+  target_link_libraries(quickstep_storage_FileManagerLocal
+                        quickstep_storage_FileManagerWindows)
+  target_link_libraries(quickstep_storage_FileManagerWindows
+                        glog
+                        quickstep_storage_FileManager
+                        quickstep_storage_StorageBlockInfo
+                        quickstep_storage_StorageConstants
+                        quickstep_storage_StorageErrors
+                        quickstep_utility_Macros
+                        quickstep_utility_StringUtil)
+endif()
+
+if (QUICKSTEP_HAVE_LIBNUMA)
+  target_link_libraries(quickstep_storage_PreloaderThread
+                        quickstep_catalog_NUMAPlacementScheme)
+  target_link_libraries(quickstep_storage_StorageManager
+                        ${LIBNUMA_LIBRARY})
+endif()
 
 # Module all-in-one library:
 add_library(quickstep_storage ../empty_src.cpp StorageModule.hpp)
@@ -1172,8 +1170,8 @@ target_link_libraries(quickstep_storage
                       quickstep_storage_InsertDestinationInterface
                       quickstep_storage_InsertDestination_proto
                       quickstep_storage_LinearOpenAddressingHashTable
-                      quickstep_storage_PartitionedHashTablePool
                       quickstep_storage_PackedPayloadHashTable
+                      quickstep_storage_PartitionedHashTablePool
                       quickstep_storage_PreloaderThread
                       quickstep_storage_SMAIndexSubBlock
                       quickstep_storage_SeparateChainingHashTable
@@ -1201,10 +1199,27 @@ target_link_libraries(quickstep_storage
                       quickstep_storage_ValueAccessorUtil
                       quickstep_storage_WindowAggregationOperationState
                       quickstep_storage_WindowAggregationOperationState_proto)
+
+# CMAKE_VALIDATE_IGNORE_BEGIN
+if(QUICKSTEP_HAVE_BITWEAVING)
+  target_link_libraries(quickstep_storage
+                        quickstep_storage_BitWeavingHIndexSubBlock
+                        quickstep_storage_BitWeavingIndexSubBlock
+                        quickstep_storage_BitWeavingVIndexSubBlock)
+endif()
+# CMAKE_VALIDATE_IGNORE_END
+
+if (ENABLE_DISTRIBUTED)
+  target_link_libraries(quickstep_storage
+                        quickstep_storage_DataExchange_proto
+                        quickstep_storage_DataExchangerAsync)
+endif()
+
 if (QUICKSTEP_HAVE_FILE_MANAGER_HDFS)
   target_link_libraries(quickstep_storage
                         quickstep_storage_FileManagerHdfs)
 endif()
+
 if (QUICKSTEP_HAVE_FILE_MANAGER_POSIX)
   target_link_libraries(quickstep_storage
                         quickstep_storage_FileManagerPosix)
@@ -1212,19 +1227,6 @@ elseif (QUICKSTEP_HAVE_FILE_MANAGER_WINDOWS)
   target_link_libraries(quickstep_storage
                         quickstep_storage_FileManagerWindows)
 endif()
-if (ENABLE_DISTRIBUTED)
-  target_link_libraries(quickstep_storage
-                        quickstep_storage_DataExchange_proto
-                        quickstep_storage_DataExchangerAsync)
-endif()
-# CMAKE_VALIDATE_IGNORE_BEGIN
-if(QUICKSTEP_HAVE_BITWEAVING)
-  target_link_libraries(quickstep_storage
-                        quickstep_storage_BitWeavingHIndexSubBlock
-                        quickstep_storage_BitWeavingIndexSubBlock
-                        quickstep_storage_BitWeavingVIndexSubBlock)
-endif()
-# CMAKE_VALIDATE_IGNORE_END
 
 # Tests:
 include(CheckTypeSize)
@@ -1268,7 +1270,7 @@ target_link_libraries(quickstep_storage_tests_HashTable_unittest_common
 
 add_library(quickstep_storage_tests_TupleStorePredicateUtil
             ../empty_src.cpp
-             "${CMAKE_CURRENT_SOURCE_DIR}/tests/TupleStorePredicateUtil.hpp")
+            "${CMAKE_CURRENT_SOURCE_DIR}/tests/TupleStorePredicateUtil.hpp")
 target_link_libraries(quickstep_storage_tests_TupleStorePredicateUtil
                       quickstep_expressions_predicate_Predicate
                       quickstep_storage_IndexSubBlock
@@ -1282,19 +1284,20 @@ target_link_libraries(quickstep_storage_tests_TupleStorePredicateUtil
 add_executable(AggregationOperationState_unittest
                "${CMAKE_CURRENT_SOURCE_DIR}/tests/AggregationOperationState_unittest.cpp")
 target_link_libraries(AggregationOperationState_unittest
+                      ${LIBS}
                       gtest
                       gtest_main
                       quickstep_catalog_CatalogDatabase
                       quickstep_catalog_CatalogRelation
                       quickstep_catalog_CatalogTypedefs
                       quickstep_storage_AggregationOperationState
-                      quickstep_storage_AggregationOperationState_proto
-                      ${LIBS})
+                      quickstep_storage_AggregationOperationState_proto)
 add_test(AggregationOperationState_unittest AggregationOperationState_unittest)
 
 add_executable(BasicColumnStoreTupleStorageSubBlock_unittest
                "${CMAKE_CURRENT_SOURCE_DIR}/tests/BasicColumnStoreTupleStorageSubBlock_unittest.cpp")
 target_link_libraries(BasicColumnStoreTupleStorageSubBlock_unittest
+                      ${LIBS}
                       gtest
                       gtest_main
                       quickstep_catalog_CatalogAttribute
@@ -1326,15 +1329,16 @@ target_link_libraries(BasicColumnStoreTupleStorageSubBlock_unittest
                       quickstep_types_operations_comparisons_ComparisonID
                       quickstep_types_operations_comparisons_ComparisonUtil
                       quickstep_utility_BitVector
-                      quickstep_utility_ScopedBuffer
-                      ${LIBS})
+                      quickstep_utility_ScopedBuffer)
 add_test(BasicColumnStoreTupleStorageSubBlock_unittest BasicColumnStoreTupleStorageSubBlock_unittest)
 
-add_executable(BloomFilterIndexSubBlock_unittest "${CMAKE_CURRENT_SOURCE_DIR}/tests/BloomFilterIndexSubBlock_unittest.cpp")
+add_executable(BloomFilterIndexSubBlock_unittest
+               "${CMAKE_CURRENT_SOURCE_DIR}/tests/BloomFilterIndexSubBlock_unittest.cpp")
 target_link_libraries(BloomFilterIndexSubBlock_unittest
+                      ${LIBS}
+                      glog
                       gtest
                       gtest_main
-                      glog
                       quickstep_catalog_CatalogAttribute
                       quickstep_catalog_CatalogRelation
                       quickstep_catalog_CatalogTypedefs
@@ -1359,14 +1363,14 @@ target_link_libraries(BloomFilterIndexSubBlock_unittest
                       quickstep_types_operations_comparisons_Comparison
                       quickstep_types_operations_comparisons_ComparisonFactory
                       quickstep_types_operations_comparisons_ComparisonID
-                      quickstep_utility_ScopedBuffer
-                      ${LIBS})
+                      quickstep_utility_ScopedBuffer)
 add_test(BloomFilterIndexSubBlock_unittest BloomFilterIndexSubBlock_unittest)
 
 if(QUICKSTEP_HAVE_BITWEAVING)
   add_executable(BitWeavingIndexSubBlock_unittest
                  "${CMAKE_CURRENT_SOURCE_DIR}/bitweaving/tests/BitWeavingIndexSubBlock_unittest.cpp")
   target_link_libraries(BitWeavingIndexSubBlock_unittest
+                        ${LIBS}
                         glog
                         gtest
                         gtest_main
@@ -1401,13 +1405,14 @@ if(QUICKSTEP_HAVE_BITWEAVING)
                         quickstep_types_operations_comparisons_ComparisonID
                         quickstep_types_operations_comparisons_ComparisonUtil
                         quickstep_utility_Macros
-                        quickstep_utility_ScopedBuffer
-                        ${LIBS})
+                        quickstep_utility_ScopedBuffer)
   add_test(BitWeavingIndexSubBlock_unittest BitWeavingIndexSubBlock_unittest)
 endif()
 
-add_executable(CompressedColumnStoreTupleStorageSubBlock_unittest "${CMAKE_CURRENT_SOURCE_DIR}/tests/CompressedColumnStoreTupleStorageSubBlock_unittest.cpp")
+add_executable(CompressedColumnStoreTupleStorageSubBlock_unittest
+               "${CMAKE_CURRENT_SOURCE_DIR}/tests/CompressedColumnStoreTupleStorageSubBlock_unittest.cpp")
 target_link_libraries(CompressedColumnStoreTupleStorageSubBlock_unittest
+                      ${LIBS}
                       gtest
                       gtest_main
                       quickstep_catalog_CatalogAttribute
@@ -1442,12 +1447,13 @@ target_link_libraries(CompressedColumnStoreTupleStorageSubBlock_unittest
                       quickstep_utility_Macros
                       quickstep_utility_PtrMap
                       quickstep_utility_PtrVector
-                      quickstep_utility_ScopedBuffer
-                      ${LIBS})
+                      quickstep_utility_ScopedBuffer)
 add_test(CompressedColumnStoreTupleStorageSubBlock_unittest CompressedColumnStoreTupleStorageSubBlock_unittest)
 
-add_executable(CompressedPackedRowStoreTupleStorageSubBlock_unittest "${CMAKE_CURRENT_SOURCE_DIR}/tests/CompressedPackedRowStoreTupleStorageSubBlock_unittest.cpp")
+add_executable(CompressedPackedRowStoreTupleStorageSubBlock_unittest
+               "${CMAKE_CURRENT_SOURCE_DIR}/tests/CompressedPackedRowStoreTupleStorageSubBlock_unittest.cpp")
 target_link_libraries(CompressedPackedRowStoreTupleStorageSubBlock_unittest
+                      ${LIBS}
                       gtest
                       gtest_main
                       quickstep_catalog_CatalogAttribute
@@ -1482,8 +1488,7 @@ target_link_libraries(CompressedPackedRowStoreTupleStorageSubBlock_unittest
                       quickstep_utility_Macros
                       quickstep_utility_PtrMap
                       quickstep_utility_PtrVector
-                      quickstep_utility_ScopedBuffer
-                      ${LIBS})
+                      quickstep_utility_ScopedBuffer)
 add_test(CompressedPackedRowStoreTupleStorageSubBlock_unittest CompressedPackedRowStoreTupleStorageSubBlock_unittest)
 
 if (ENABLE_DISTRIBUTED)
@@ -1491,6 +1496,7 @@ if (ENABLE_DISTRIBUTED)
                  "${CMAKE_CURRENT_SOURCE_DIR}/tests/DataExchange_unittest.cpp")
   target_link_libraries(DataExchange_unittest
                         ${GFLAGS_LIB_NAME}
+                        ${LIBS}
                         glog
                         gtest
                         quickstep_catalog_CatalogAttribute
@@ -1512,13 +1518,13 @@ if (ENABLE_DISTRIBUTED)
                         quickstep_types_TypeID
                         quickstep_types_TypedValue
                         quickstep_types_containers_Tuple
-                        tmb
-                        ${LIBS})
+                        tmb)
   add_test(DataExchange_unittest DataExchange_unittest)
 endif(ENABLE_DISTRIBUTED)
 
 add_executable(CSBTreeIndexSubBlock_unittest "${CMAKE_CURRENT_SOURCE_DIR}/tests/CSBTreeIndexSubBlock_unittest.cpp")
 target_link_libraries(CSBTreeIndexSubBlock_unittest
+                      ${LIBS}
                       gtest
                       gtest_main
                       quickstep_catalog_CatalogAttribute
@@ -1549,56 +1555,56 @@ target_link_libraries(CSBTreeIndexSubBlock_unittest
                       quickstep_types_operations_comparisons_ComparisonUtil
                       quickstep_utility_BitVector
                       quickstep_utility_Macros
-                      quickstep_utility_ScopedBuffer
-                      ${LIBS})
+                      quickstep_utility_ScopedBuffer)
 add_test(CSBTreeIndexSubBlock_unittest CSBTreeIndexSubBlock_unittest)
 
 add_executable(EvictionPolicy_unittest
                "${CMAKE_CURRENT_SOURCE_DIR}/tests/EvictionPolicy_unittest.cpp")
 target_link_libraries(EvictionPolicy_unittest
+                      ${LIBS}
                       gtest
                       gtest_main
                       quickstep_storage_EvictionPolicy
-                      quickstep_storage_StorageBlockInfo
-                      ${LIBS})
+                      quickstep_storage_StorageBlockInfo)
 add_test(EvictionPolicy_unittest EvictionPolicy_unittest)
 
 if (QUICKSTEP_HAVE_FILE_MANAGER_HDFS)
 add_executable(FileManagerHdfs_unittest
                "${CMAKE_CURRENT_SOURCE_DIR}/tests/FileManagerHdfs_unittest.cpp")
 target_link_libraries(FileManagerHdfs_unittest
+                      ${LIBS}
                       gtest
                       gtest_main
                       quickstep_storage_FileManagerHdfs
-                      quickstep_storage_tests_FileManager_unittest_common
-                      ${LIBS})
+                      quickstep_storage_tests_FileManager_unittest_common)
 endif()
 
 add_executable(FileManagerLocal_unittest
                "${CMAKE_CURRENT_SOURCE_DIR}/tests/FileManagerLocal_unittest.cpp")
 target_link_libraries(FileManagerLocal_unittest
+                      ${LIBS}
                       gtest
                       gtest_main
                       quickstep_storage_FileManagerLocal
-                      quickstep_storage_tests_FileManager_unittest_common
-                      ${LIBS})
+                      quickstep_storage_tests_FileManager_unittest_common)
 add_test(FileManagerLocal_unittest FileManagerLocal_unittest)
 
 add_executable(LinearOpenAddressingHashTable_unittest
                "${CMAKE_CURRENT_SOURCE_DIR}/tests/LinearOpenAddressingHashTable_unittest.cpp")
 target_link_libraries(LinearOpenAddressingHashTable_unittest
+                      ${LIBS}
                       gtest
                       gtest_main
                       quickstep_storage_LinearOpenAddressingHashTable
-                      quickstep_storage_tests_HashTable_unittest_common
-                      ${LIBS})
+                      quickstep_storage_tests_HashTable_unittest_common)
 add_test(LinearOpenAddressingHashTable_unittest LinearOpenAddressingHashTable_unittest)
 
 add_executable(SMAIndexSubBlock_unittest "${CMAKE_CURRENT_SOURCE_DIR}/tests/SMAIndexSubBlock_unittest.cpp")
 target_link_libraries(SMAIndexSubBlock_unittest
+                      ${LIBS}
+                      glog
                       gtest
                       gtest_main
-                      glog
                       quickstep_catalog_CatalogAttribute
                       quickstep_catalog_CatalogRelation
                       quickstep_catalog_CatalogTypedefs
@@ -1624,34 +1630,34 @@ target_link_libraries(SMAIndexSubBlock_unittest
                       quickstep_types_operations_comparisons_Comparison
                       quickstep_types_operations_comparisons_ComparisonFactory
                       quickstep_types_operations_comparisons_ComparisonID
-                      quickstep_utility_ScopedBuffer
-                      ${LIBS})
+                      quickstep_utility_ScopedBuffer)
 add_test(SMAIndexSubBlock_unittest SMAIndexSubBlock_unittest)
 
 add_executable(SeparateChainingHashTable_unittest
                "${CMAKE_CURRENT_SOURCE_DIR}/tests/SeparateChainingHashTable_unittest.cpp")
 target_link_libraries(SeparateChainingHashTable_unittest
+                      ${LIBS}
                       gtest
                       gtest_main
                       quickstep_storage_SeparateChainingHashTable
-                      quickstep_storage_tests_HashTable_unittest_common
-                      ${LIBS})
+                      quickstep_storage_tests_HashTable_unittest_common)
 add_test(SeparateChainingHashTable_unittest SeparateChainingHashTable_unittest)
 
 add_executable(SimpleScalarSeparateChainingHashTable_unittest
                "${CMAKE_CURRENT_SOURCE_DIR}/tests/SimpleScalarSeparateChainingHashTable_unittest.cpp")
 target_link_libraries(SimpleScalarSeparateChainingHashTable_unittest
+                      ${LIBS}
                       gtest
                       gtest_main
                       quickstep_storage_SimpleScalarSeparateChainingHashTable
-                      quickstep_storage_tests_HashTable_unittest_common
-                      ${LIBS})
+                      quickstep_storage_tests_HashTable_unittest_common)
 add_test(SimpleScalarSeparateChainingHashTable_unittest
          SimpleScalarSeparateChainingHashTable_unittest)
 
 add_executable(SplitRowStoreTupleStorageSubBlock_unittest
                "${CMAKE_CURRENT_SOURCE_DIR}/tests/SplitRowStoreTupleStorageSubBlock_unittest.cpp")
 target_link_libraries(SplitRowStoreTupleStorageSubBlock_unittest
+                      ${LIBS}
                       gtest
                       gtest_main
                       quickstep_catalog_CatalogAttribute
@@ -1675,16 +1681,16 @@ target_link_libraries(SplitRowStoreTupleStorageSubBlock_unittest
                       quickstep_types_containers_Tuple
                       quickstep_utility_BitVector
                       quickstep_utility_EqualsAnyConstant
-                      quickstep_utility_ScopedBuffer
-                      ${LIBS})
+                      quickstep_utility_ScopedBuffer)
 add_test(SplitRowStoreTupleStorageSubBlock_unittest SplitRowStoreTupleStorageSubBlock_unittest)
 
 add_executable(StorageBlockSort_unittest
                "${CMAKE_CURRENT_SOURCE_DIR}/tests/StorageBlockSort_unittest.cpp")
 target_link_libraries(StorageBlockSort_unittest
+                      ${LIBS}
+                      glog
                       gtest
                       gtest_main
-                      glog
                       quickstep_catalog_CatalogAttribute
                       quickstep_catalog_CatalogRelation
                       quickstep_expressions_scalar_Scalar
@@ -1695,8 +1701,7 @@ target_link_libraries(StorageBlockSort_unittest
                       quickstep_types_FloatType
                       quickstep_types_IntType
                       quickstep_types_LongType
-                      quickstep_types_containers_Tuple
-                      ${LIBS})
+                      quickstep_types_containers_Tuple)
 add_test(StorageBlockSort_unittest StorageBlockSort_unittest)
 
 add_executable(StorageManager_unittest
@@ -1713,14 +1718,14 @@ target_link_libraries(StorageManager_unittest
 add_executable(WindowAggregationOperationState_unittest
                "${CMAKE_CURRENT_SOURCE_DIR}/tests/WindowAggregationOperationState_unittest.cpp")
 target_link_libraries(WindowAggregationOperationState_unittest
+                      ${LIBS}
                       gtest
                       gtest_main
                       quickstep_catalog_CatalogDatabase
                       quickstep_catalog_CatalogRelation
                       quickstep_catalog_CatalogTypedefs
                       quickstep_storage_WindowAggregationOperationState
-                      quickstep_storage_WindowAggregationOperationState_proto
-                      ${LIBS})
+                      quickstep_storage_WindowAggregationOperationState_proto)
 if (QUICKSTEP_HAVE_LIBNUMA)
   target_link_libraries(StorageManager_unittest
                         ${LIBNUMA_LIBRARY})

http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/b1785647/storage/TupleStorageSubBlock.cpp
----------------------------------------------------------------------
diff --git a/storage/TupleStorageSubBlock.cpp b/storage/TupleStorageSubBlock.cpp
index f2eef49..6bc574e 100644
--- a/storage/TupleStorageSubBlock.cpp
+++ b/storage/TupleStorageSubBlock.cpp
@@ -19,21 +19,16 @@
 
 #include "storage/TupleStorageSubBlock.hpp"
 
-#ifdef QUICKSTEP_DEBUG
 #include <cassert>
-#endif
-
-#include "storage/TupleIdSequence.hpp"
-#include "storage/ValueAccessor.hpp"
-#include "utility/Macros.hpp"
 
-#ifdef QUICKSTEP_DEBUG
 #include "catalog/CatalogAttribute.hpp"
 #include "catalog/CatalogRelationSchema.hpp"
+#include "storage/TupleIdSequence.hpp"
+#include "storage/ValueAccessor.hpp"
 #include "types/Type.hpp"
 #include "types/TypedValue.hpp"
 #include "types/containers/Tuple.hpp"
-#endif
+#include "utility/Macros.hpp"
 
 namespace quickstep {
 

http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/b1785647/threading/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/threading/CMakeLists.txt b/threading/CMakeLists.txt
index 1a9f33e..fb8b4d4 100644
--- a/threading/CMakeLists.txt
+++ b/threading/CMakeLists.txt
@@ -114,7 +114,6 @@ if(NOT FOUND_THREADS)
   message(FATAL_ERROR "No viable threading library found.")
 endif()
 
-
 # Try to find some yield function we can use.
 set(FOUND_YIELD FALSE)
 
@@ -269,7 +268,12 @@ if (QUICKSTEP_HAVE_CPP11_THREADS)
               Mutex.cpp
               Mutex.hpp
               cpp11/Mutex.hpp)
-  if (QUICKSTEP_HAVE_CPP14_SHARED_MUTEX)
+  if (QUICKSTEP_HAVE_CPP17_SHARED_MUTEX)
+    add_library(quickstep_threading_SharedMutex
+                ../empty_src.cpp
+                SharedMutex.hpp
+                cpp11/cpp17/SharedMutex.hpp)
+  elseif (QUICKSTEP_HAVE_CPP14_SHARED_MUTEX)
     add_library(quickstep_threading_SharedMutex
                 ../empty_src.cpp
                 SharedMutex.hpp
@@ -324,6 +328,7 @@ add_library(quickstep_threading_SpinMutex ../empty_src.cpp SpinMutex.hpp)
 add_library(quickstep_threading_SpinSharedMutex ../empty_src.cpp SpinSharedMutex.hpp)
 add_library(quickstep_threading_ThreadIDBasedMap ../empty_src.cpp ThreadIDBasedMap.hpp)
 add_library(quickstep_threading_ThreadUtil ../empty_src.cpp ThreadUtil.hpp)
+add_library(quickstep_threading_WinThreadsAPI ../empty_src.cpp WinThreadsAPI.hpp)
 
 # Link dependencies:
 target_link_libraries(quickstep_threading_ConditionVariable
@@ -334,17 +339,6 @@ target_link_libraries(quickstep_threading_Mutex
                       quickstep_threading_ConditionVariable
                       quickstep_utility_Macros
                       quickstep_utility_PtrVector)
-if (QUICKSTEP_HAVE_CPP11_THREADS AND NOT QUICKSTEP_HAVE_CPP14_SHARED_MUTEX)
-  target_link_libraries(quickstep_threading_SharedMutex
-                        glog
-                        quickstep_threading_ConditionVariable
-                        quickstep_threading_Mutex
-                        quickstep_utility_Macros)
-else()
-  target_link_libraries(quickstep_threading_SharedMutex
-                        quickstep_threading_Mutex
-                        quickstep_utility_Macros)
-endif()
 target_link_libraries(quickstep_threading_SpinMutex
                       quickstep_threading_Mutex
                       quickstep_utility_Macros)
@@ -363,8 +357,21 @@ target_link_libraries(quickstep_threading_ThreadIDBasedMap
                       quickstep_threading_SpinSharedMutex
                       quickstep_utility_Macros)
 target_link_libraries(quickstep_threading_ThreadUtil
+                      quickstep_threading_WinThreadsAPI
                       quickstep_utility_Macros)
 
+if (QUICKSTEP_HAVE_CPP11_THREADS AND NOT QUICKSTEP_HAVE_CPP14_SHARED_MUTEX)
+  target_link_libraries(quickstep_threading_SharedMutex
+                        glog
+                        quickstep_threading_ConditionVariable
+                        quickstep_threading_Mutex
+                        quickstep_utility_Macros)
+else()
+  target_link_libraries(quickstep_threading_SharedMutex
+                        quickstep_threading_Mutex
+                        quickstep_utility_Macros)
+endif()
+
 # Module all-in-one library:
 add_library(quickstep_threading ../empty_src.cpp ThreadingModule.hpp)
 target_link_libraries(quickstep_threading
@@ -375,28 +382,29 @@ target_link_libraries(quickstep_threading
                       quickstep_threading_SpinSharedMutex
                       quickstep_threading_Thread
                       quickstep_threading_ThreadIDBasedMap
-                      quickstep_threading_ThreadUtil)
+                      quickstep_threading_ThreadUtil
+                      quickstep_threading_WinThreadsAPI)
 
 # Tests:
 add_executable(Mutex_unittest "${CMAKE_CURRENT_SOURCE_DIR}/tests/Mutex_unittest.cpp")
 target_link_libraries(Mutex_unittest
+                      ${CMAKE_THREAD_LIBS_INIT}
                       gtest
                       gtest_main
                       quickstep_threading_Mutex
                       quickstep_threading_SpinMutex
                       quickstep_threading_Thread
-                      quickstep_utility_Macros
-                      ${CMAKE_THREAD_LIBS_INIT})
+                      quickstep_utility_Macros)
 add_test(Mutex_unittest Mutex_unittest)
 
 add_executable(SharedMutex_unittest "${CMAKE_CURRENT_SOURCE_DIR}/tests/SharedMutex_unittest.cpp")
 target_link_libraries(SharedMutex_unittest
+                      ${CMAKE_THREAD_LIBS_INIT}
                       gtest
                       gtest_main
                       quickstep_threading_Mutex
                       quickstep_threading_SharedMutex
                       quickstep_threading_SpinSharedMutex
                       quickstep_threading_Thread
-                      quickstep_utility_Macros
-                      ${CMAKE_THREAD_LIBS_INIT})
+                      quickstep_utility_Macros)
 add_test(SharedMutex_unittest SharedMutex_unittest)

http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/b1785647/transaction/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/transaction/CMakeLists.txt b/transaction/CMakeLists.txt
index e86f4e8..80a741e 100644
--- a/transaction/CMakeLists.txt
+++ b/transaction/CMakeLists.txt
@@ -25,7 +25,7 @@ add_library(quickstep_transaction_CycleDetector
             CycleDetector.hpp)
 add_library(quickstep_transaction_DeadLockDetector
             DeadLockDetector.cpp
-            DeadLockDetector.cpp)
+            DeadLockDetector.hpp)
 add_library(quickstep_transaction_DirectedGraph
             ../empty_src.cpp
             DirectedGraph.hpp)
@@ -33,8 +33,8 @@ add_library(quickstep_transaction_Lock
             ../empty_src.cpp
             Lock.hpp)
 add_library(quickstep_transaction_LockManager
-            LockManager.hpp
-            LockManager.cpp)
+            LockManager.cpp
+            LockManager.hpp)
 add_library(quickstep_transaction_LockRequest
             ../empty_src.cpp
             LockRequest.hpp)
@@ -60,6 +60,7 @@ target_link_libraries(quickstep_transaction_CycleDetector
                       quickstep_utility_Macros)
 target_link_libraries(quickstep_transaction_DeadLockDetector
                       glog
+                      quickstep_threading_Thread
                       quickstep_transaction_CycleDetector
                       quickstep_transaction_DirectedGraph
                       quickstep_transaction_LockTable
@@ -74,7 +75,6 @@ target_link_libraries(quickstep_transaction_Lock
 target_link_libraries(quickstep_transaction_LockManager
                       ${GFLAGS_LIB_NAME}
                       glog
-                      quickstep_utility_ThreadSafeQueue
                       quickstep_threading_Thread
                       quickstep_transaction_AccessMode
                       quickstep_transaction_DeadLockDetector
@@ -82,7 +82,8 @@ target_link_libraries(quickstep_transaction_LockManager
                       quickstep_transaction_LockTable
                       quickstep_transaction_ResourceId
                       quickstep_transaction_Transaction
-                      quickstep_transaction_TransactionTable)
+                      quickstep_transaction_TransactionTable
+                      quickstep_utility_ThreadSafeQueue)
 target_link_libraries(quickstep_transaction_LockRequest
                       quickstep_transaction_AccessMode
                       quickstep_transaction_ResourceId
@@ -95,11 +96,15 @@ target_link_libraries(quickstep_transaction_LockTable
                       quickstep_transaction_Transaction
                       quickstep_utility_Macros)
 target_link_libraries(quickstep_transaction_ResourceId
+                      glog
                       quickstep_catalog_CatalogTypedefs
                       quickstep_storage_StorageBlockInfo
                       quickstep_utility_HashPair)
 target_link_libraries(quickstep_transaction_ResourceId
-                      glog)
+                      glog
+                      quickstep_catalog_CatalogTypedefs
+                      quickstep_storage_StorageBlockInfo
+                      quickstep_utility_HashPair)
 target_link_libraries(quickstep_transaction_StronglyConnectedComponents
                       quickstep_transaction_DirectedGraph
                       quickstep_utility_Macros)
@@ -146,7 +151,7 @@ target_link_libraries(CycleDetector_unittest
 add_test(CycleDetector_unittest CycleDetector_unittest)
 
 add_executable(DeadLockDetector_unittest
-  "${CMAKE_CURRENT_SOURCE_DIR}/tests/DeadLockDetector_unittest.cpp")
+               "${CMAKE_CURRENT_SOURCE_DIR}/tests/DeadLockDetector_unittest.cpp")
 target_link_libraries(DeadLockDetector_unittest
                       gtest
                       gtest_main

http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/b1785647/types/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/types/CMakeLists.txt b/types/CMakeLists.txt
index 769187b..328ad9e 100644
--- a/types/CMakeLists.txt
+++ b/types/CMakeLists.txt
@@ -70,6 +70,7 @@ target_link_libraries(quickstep_types_CharType
                       quickstep_utility_Macros
                       quickstep_utility_PtrMap)
 target_link_libraries(quickstep_types_DateOperatorOverloads
+                      glog
                       quickstep_types_DatetimeLit
                       quickstep_types_IntervalLit
                       quickstep_types_port_gmtime_r
@@ -107,6 +108,7 @@ target_link_libraries(quickstep_types_DatetimeType
                       quickstep_utility_CheckSnprintf
                       quickstep_utility_Macros)
 target_link_libraries(quickstep_types_DoubleType
+                      glog
                       quickstep_types_NullCoercibilityCheckMacro
                       quickstep_types_NumericSuperType
                       quickstep_types_Type
@@ -115,6 +117,7 @@ target_link_libraries(quickstep_types_DoubleType
                       quickstep_utility_EqualsAnyConstant
                       quickstep_utility_Macros)
 target_link_libraries(quickstep_types_FloatType
+                      glog
                       quickstep_types_NullCoercibilityCheckMacro
                       quickstep_types_NumericSuperType
                       quickstep_types_Type
@@ -161,8 +164,8 @@ target_link_libraries(quickstep_types_NumericSuperType
                       quickstep_utility_Macros)
 target_link_libraries(quickstep_types_Type
                       glog
-                      quickstep_types_Type_proto
                       quickstep_types_TypeID
+                      quickstep_types_Type_proto
                       quickstep_types_TypedValue
                       quickstep_utility_Macros)
 target_link_libraries(quickstep_types_TypeFactory
@@ -182,6 +185,8 @@ target_link_libraries(quickstep_types_TypeFactory
                       quickstep_types_VarCharType
                       quickstep_types_YearMonthIntervalType
                       quickstep_utility_Macros)
+target_link_libraries(quickstep_types_Type_proto
+                      ${PROTOBUF_LIBRARY})
 target_link_libraries(quickstep_types_TypedValue
                       farmhash
                       glog
@@ -194,10 +199,8 @@ target_link_libraries(quickstep_types_TypedValue
                       quickstep_utility_HashPair
                       quickstep_utility_Macros)
 target_link_libraries(quickstep_types_TypedValue_proto
-                      quickstep_types_Type_proto
-                      ${PROTOBUF_LIBRARY})
-target_link_libraries(quickstep_types_Type_proto
-                      ${PROTOBUF_LIBRARY})
+                      ${PROTOBUF_LIBRARY}
+                      quickstep_types_Type_proto)
 target_link_libraries(quickstep_types_VarCharType
                       glog
                       quickstep_types_NullCoercibilityCheckMacro
@@ -209,6 +212,7 @@ target_link_libraries(quickstep_types_VarCharType
                       quickstep_utility_Macros
                       quickstep_utility_PtrMap)
 target_link_libraries(quickstep_types_YearMonthIntervalType
+                      glog
                       quickstep_types_IntervalLit
                       quickstep_types_IntervalParser
                       quickstep_types_NullCoercibilityCheckMacro
@@ -238,10 +242,10 @@ target_link_libraries(quickstep_types
                       quickstep_types_NumericSuperType
                       quickstep_types_NumericTypeUnifier
                       quickstep_types_Type
-                      quickstep_types_Type_proto
                       quickstep_types_TypeErrors
                       quickstep_types_TypeFactory
                       quickstep_types_TypeID
+                      quickstep_types_Type_proto
                       quickstep_types_TypedValue
                       quickstep_types_TypedValue_proto
                       quickstep_types_VarCharType
@@ -256,6 +260,7 @@ add_library(quickstep_types_tests_TypeTest_common
             "${CMAKE_CURRENT_SOURCE_DIR}/tests/TypeTest_common.hpp")
 target_link_libraries(quickstep_types_tests_TypeTest_common
                       gtest
+                      gtest_main
                       quickstep_types_DoubleType
                       quickstep_types_FloatType
                       quickstep_types_IntType
@@ -282,8 +287,8 @@ add_executable(DateType_unittest "${CMAKE_CURRENT_SOURCE_DIR}/tests/DateType_uni
 target_link_libraries(DateType_unittest
                       gtest
                       gtest_main
-                      quickstep_types_DatetimeLit
                       quickstep_types_DateType
+                      quickstep_types_DatetimeLit
                       quickstep_types_NullType
                       quickstep_types_Type
                       quickstep_types_TypeFactory
@@ -384,9 +389,9 @@ target_link_libraries(Type_unittest
                       gtest_main
                       quickstep_types_CharType
                       quickstep_types_Type
-                      quickstep_types_Type_proto
                       quickstep_types_TypeFactory
                       quickstep_types_TypeID
+                      quickstep_types_Type_proto
                       quickstep_types_VarCharType
                       quickstep_utility_Macros)
 add_test(Type_unittest Type_unittest)

http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/b1785647/types/containers/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/types/containers/CMakeLists.txt b/types/containers/CMakeLists.txt
index 97841c2..60b14ea 100644
--- a/types/containers/CMakeLists.txt
+++ b/types/containers/CMakeLists.txt
@@ -51,8 +51,8 @@ target_link_libraries(quickstep_types_containers_Tuple
                       quickstep_utility_CompositeHash
                       quickstep_utility_Macros)
 target_link_libraries(quickstep_types_containers_Tuple_proto
-                      quickstep_types_TypedValue_proto
-                      ${PROTOBUF_LIBRARY})
+                      ${PROTOBUF_LIBRARY}
+                      quickstep_types_TypedValue_proto)
 
 # Module all-in-one library:
 add_library(quickstep_types_containers ../../empty_src.cpp)
@@ -66,12 +66,12 @@ target_link_libraries(quickstep_types_containers
 # Tests:
 add_executable(ColumnVector_unittest "${CMAKE_CURRENT_SOURCE_DIR}/tests/ColumnVector_unittest.cpp")
 target_link_libraries(ColumnVector_unittest
+                      ${LIBS}
                       gtest
                       gtest_main
                       quickstep_types_Type
                       quickstep_types_TypeFactory
                       quickstep_types_TypeID
                       quickstep_types_TypedValue
-                      quickstep_types_containers_ColumnVector
-                      ${LIBS})
+                      quickstep_types_containers_ColumnVector)
 add_test(ColumnVector_unittest ColumnVector_unittest)

http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/b1785647/types/operations/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/types/operations/CMakeLists.txt b/types/operations/CMakeLists.txt
index c5dad0f..88fd2f9 100644
--- a/types/operations/CMakeLists.txt
+++ b/types/operations/CMakeLists.txt
@@ -31,8 +31,8 @@ add_library(quickstep_types_operations_Operation_proto ${types_operations_Operat
 target_link_libraries(quickstep_types_operations_Operation
                       quickstep_utility_Macros)
 target_link_libraries(quickstep_types_operations_Operation_proto
-                      quickstep_types_Type_proto
-                      ${PROTOBUF_LIBRARY})
+                      ${PROTOBUF_LIBRARY}
+                      quickstep_types_Type_proto)
 
 # Module all-in-one library:
 add_library(quickstep_types_operations ../../empty_src.cpp)

http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/b1785647/types/operations/binary_operations/ArithmeticBinaryOperators.hpp
----------------------------------------------------------------------
diff --git a/types/operations/binary_operations/ArithmeticBinaryOperators.hpp b/types/operations/binary_operations/ArithmeticBinaryOperators.hpp
index 7224a0c..a9ee8a5 100644
--- a/types/operations/binary_operations/ArithmeticBinaryOperators.hpp
+++ b/types/operations/binary_operations/ArithmeticBinaryOperators.hpp
@@ -29,12 +29,8 @@
 
 #include "catalog/CatalogTypedefs.hpp"
 #include "storage/StorageBlockInfo.hpp"
-
-#ifdef QUICKSTEP_ENABLE_VECTOR_COPY_ELISION_SELECTION
 #include "storage/ValueAccessor.hpp"
 #include "storage/ValueAccessorUtil.hpp"
-#endif  // QUICKSTEP_ENABLE_VECTOR_COPY_ELISION_SELECTION
-
 #include "types/TypedValue.hpp"
 #include "types/containers/ColumnVector.hpp"
 #include "types/operations/binary_operations/BinaryOperation.hpp"

http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/b1785647/types/operations/binary_operations/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/types/operations/binary_operations/CMakeLists.txt b/types/operations/binary_operations/CMakeLists.txt
index 4d26b75..87b0b7a 100644
--- a/types/operations/binary_operations/CMakeLists.txt
+++ b/types/operations/binary_operations/CMakeLists.txt
@@ -202,6 +202,7 @@ add_library(quickstep_types_operations_binaryoperations_tests_BinaryOperationTes
             "${CMAKE_CURRENT_SOURCE_DIR}/tests/BinaryOperationTestUtil.hpp")
 target_link_libraries(quickstep_types_operations_binaryoperations_tests_BinaryOperationTestUtil
                       gtest
+                      gtest_main
                       quickstep_types_Type
                       quickstep_types_TypeFactory
                       quickstep_types_TypeID

http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/b1785647/types/operations/comparisons/AsciiStringComparators-inl.hpp
----------------------------------------------------------------------
diff --git a/types/operations/comparisons/AsciiStringComparators-inl.hpp b/types/operations/comparisons/AsciiStringComparators-inl.hpp
index 8b2c1bf..7369d47 100644
--- a/types/operations/comparisons/AsciiStringComparators-inl.hpp
+++ b/types/operations/comparisons/AsciiStringComparators-inl.hpp
@@ -31,12 +31,8 @@
 
 #include "catalog/CatalogTypedefs.hpp"
 #include "storage/TupleIdSequence.hpp"
-
-#ifdef QUICKSTEP_ENABLE_VECTOR_COPY_ELISION_SELECTION
 #include "storage/ValueAccessor.hpp"
 #include "storage/ValueAccessorUtil.hpp"
-#endif  // QUICKSTEP_ENABLE_VECTOR_COPY_ELISION_SELECTION
-
 #include "types/TypedValue.hpp"
 #include "types/containers/ColumnVector.hpp"
 #include "types/containers/ColumnVectorUtil.hpp"

http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/b1785647/types/operations/comparisons/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/types/operations/comparisons/CMakeLists.txt b/types/operations/comparisons/CMakeLists.txt
index 321c0f6..872259f 100644
--- a/types/operations/comparisons/CMakeLists.txt
+++ b/types/operations/comparisons/CMakeLists.txt
@@ -148,6 +148,7 @@ target_link_libraries(quickstep_types_operations_comparisons_LessOrEqualComparis
                       quickstep_types_operations_comparisons_LiteralComparators
                       quickstep_utility_Macros)
 target_link_libraries(quickstep_types_operations_comparisons_LiteralComparators
+                      glog
                       quickstep_catalog_CatalogTypedefs
                       quickstep_storage_TupleIdSequence
                       quickstep_storage_ValueAccessor
@@ -174,13 +175,14 @@ target_link_libraries(quickstep_types_operations_comparisons_PatternMatchingComp
                       quickstep_types_port_strnlen
                       re2)
 target_link_libraries(quickstep_types_operations_comparisons_PatternMatchingComparison
+                      glog
                       quickstep_types_Type
                       quickstep_types_TypeID
-                      quickstep_types_operations_comparisons_PatternMatchingComparators
                       quickstep_types_operations_comparisons_Comparison
                       quickstep_types_operations_comparisons_ComparisonID
-                      quickstep_utility_TemplateUtil
-                      quickstep_utility_Macros)
+                      quickstep_types_operations_comparisons_PatternMatchingComparators
+                      quickstep_utility_Macros
+                      quickstep_utility_TemplateUtil)
 
 # Module all-in-one library:
 add_library(quickstep_types_operations_comparisons ../../../empty_src.cpp)

http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/b1785647/types/operations/comparisons/Comparison-inl.hpp
----------------------------------------------------------------------
diff --git a/types/operations/comparisons/Comparison-inl.hpp b/types/operations/comparisons/Comparison-inl.hpp
index 48167ee..7c3269c 100644
--- a/types/operations/comparisons/Comparison-inl.hpp
+++ b/types/operations/comparisons/Comparison-inl.hpp
@@ -27,12 +27,8 @@
 
 #include "catalog/CatalogTypedefs.hpp"
 #include "storage/TupleIdSequence.hpp"
-
-#ifdef QUICKSTEP_ENABLE_VECTOR_COPY_ELISION_SELECTION
 #include "storage/ValueAccessor.hpp"
 #include "storage/ValueAccessorUtil.hpp"
-#endif  // QUICKSTEP_ENABLE_VECTOR_COPY_ELISION_SELECTION
-
 #include "types/TypedValue.hpp"
 #include "types/containers/ColumnVector.hpp"
 #include "types/containers/ColumnVectorUtil.hpp"

http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/b1785647/types/operations/comparisons/Comparison.cpp
----------------------------------------------------------------------
diff --git a/types/operations/comparisons/Comparison.cpp b/types/operations/comparisons/Comparison.cpp
index 023c76a..2bee6a8 100644
--- a/types/operations/comparisons/Comparison.cpp
+++ b/types/operations/comparisons/Comparison.cpp
@@ -21,9 +21,7 @@
 
 #include "types/TypedValue.hpp"
 #include "types/operations/Operation.pb.h"
-
 #include "types/operations/comparisons/Comparison-inl.hpp"
-
 #include "utility/Macros.hpp"
 
 namespace quickstep {

http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/b1785647/types/operations/comparisons/LiteralComparators-inl.hpp
----------------------------------------------------------------------
diff --git a/types/operations/comparisons/LiteralComparators-inl.hpp b/types/operations/comparisons/LiteralComparators-inl.hpp
index 8612885..47b15e1 100644
--- a/types/operations/comparisons/LiteralComparators-inl.hpp
+++ b/types/operations/comparisons/LiteralComparators-inl.hpp
@@ -32,12 +32,8 @@
 
 #include "catalog/CatalogTypedefs.hpp"
 #include "storage/TupleIdSequence.hpp"
-
-#ifdef QUICKSTEP_ENABLE_VECTOR_COPY_ELISION_SELECTION
 #include "storage/ValueAccessor.hpp"
 #include "storage/ValueAccessorUtil.hpp"
-#endif  // QUICKSTEP_ENABLE_VECTOR_COPY_ELISION_SELECTION
-
 #include "types/TypedValue.hpp"
 #include "types/containers/ColumnVector.hpp"
 #include "types/operations/comparisons/LiteralComparators.hpp"

http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/b1785647/types/operations/comparisons/PatternMatchingComparators-inl.hpp
----------------------------------------------------------------------
diff --git a/types/operations/comparisons/PatternMatchingComparators-inl.hpp b/types/operations/comparisons/PatternMatchingComparators-inl.hpp
index c8170a1..2dd359e 100644
--- a/types/operations/comparisons/PatternMatchingComparators-inl.hpp
+++ b/types/operations/comparisons/PatternMatchingComparators-inl.hpp
@@ -28,12 +28,8 @@
 
 #include "catalog/CatalogTypedefs.hpp"
 #include "storage/TupleIdSequence.hpp"
-
-#ifdef QUICKSTEP_ENABLE_VECTOR_COPY_ELISION_SELECTION
 #include "storage/ValueAccessor.hpp"
 #include "storage/ValueAccessorUtil.hpp"
-#endif  // QUICKSTEP_ENABLE_VECTOR_COPY_ELISION_SELECTION
-
 #include "types/TypedValue.hpp"
 #include "types/containers/ColumnVector.hpp"
 #include "types/containers/ColumnVectorUtil.hpp"

http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/b1785647/types/operations/unary_operations/ArithmeticUnaryOperators.hpp
----------------------------------------------------------------------
diff --git a/types/operations/unary_operations/ArithmeticUnaryOperators.hpp b/types/operations/unary_operations/ArithmeticUnaryOperators.hpp
index bf3f7b6..b873a16 100644
--- a/types/operations/unary_operations/ArithmeticUnaryOperators.hpp
+++ b/types/operations/unary_operations/ArithmeticUnaryOperators.hpp
@@ -25,13 +25,9 @@
 #include <vector>
 
 #include "catalog/CatalogTypedefs.hpp"
-
-#ifdef QUICKSTEP_ENABLE_VECTOR_COPY_ELISION_SELECTION
 #include "storage/StorageBlockInfo.hpp"
 #include "storage/ValueAccessor.hpp"
 #include "storage/ValueAccessorUtil.hpp"
-#endif  // QUICKSTEP_ENABLE_VECTOR_COPY_ELISION_SELECTION
-
 #include "types/TypedValue.hpp"
 #include "types/containers/ColumnVector.hpp"
 #include "types/operations/unary_operations/UnaryOperation.hpp"

http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/b1785647/types/operations/unary_operations/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/types/operations/unary_operations/CMakeLists.txt b/types/operations/unary_operations/CMakeLists.txt
index 6e1923a..13442b9 100644
--- a/types/operations/unary_operations/CMakeLists.txt
+++ b/types/operations/unary_operations/CMakeLists.txt
@@ -16,13 +16,23 @@
 # under the License.
 
 # Declare micro-libs:
-add_library(quickstep_types_operations_unaryoperations_ArithmeticUnaryOperations ArithmeticUnaryOperations.cpp ArithmeticUnaryOperations.hpp)
-add_library(quickstep_types_operations_unaryoperations_ArithmeticUnaryOperators ../../../empty_src.cpp ArithmeticUnaryOperators.hpp)
-add_library(quickstep_types_operations_unaryoperations_DateExtractOperation DateExtractOperation.cpp DateExtractOperation.hpp)
-add_library(quickstep_types_operations_unaryoperations_NumericCastOperation ../../../empty_src.cpp NumericCastOperation.hpp)
+add_library(quickstep_types_operations_unaryoperations_ArithmeticUnaryOperations
+            ArithmeticUnaryOperations.cpp
+            ArithmeticUnaryOperations.hpp)
+add_library(quickstep_types_operations_unaryoperations_ArithmeticUnaryOperators
+            ../../../empty_src.cpp
+            ArithmeticUnaryOperators.hpp)
+add_library(quickstep_types_operations_unaryoperations_DateExtractOperation
+            DateExtractOperation.cpp
+            DateExtractOperation.hpp)
+add_library(quickstep_types_operations_unaryoperations_NumericCastOperation
+            ../../../empty_src.cpp
+            NumericCastOperation.hpp)
 add_library(quickstep_types_operations_unaryoperations_SubstringOperation SubstringOperation.cpp SubstringOperation.hpp)
 add_library(quickstep_types_operations_unaryoperations_UnaryOperation UnaryOperation.cpp UnaryOperation.hpp)
-add_library(quickstep_types_operations_unaryoperations_UnaryOperationFactory UnaryOperationFactory.cpp UnaryOperationFactory.hpp)
+add_library(quickstep_types_operations_unaryoperations_UnaryOperationFactory
+            UnaryOperationFactory.cpp
+            UnaryOperationFactory.hpp)
 add_library(quickstep_types_operations_unaryoperations_UnaryOperationID UnaryOperationID.cpp UnaryOperationID.hpp)
 
 # Link dependencies:
@@ -90,6 +100,7 @@ target_link_libraries(quickstep_types_operations_unaryoperations_NumericCastOper
                       quickstep_utility_Macros
                       quickstep_utility_PtrMap)
 target_link_libraries(quickstep_types_operations_unaryoperations_SubstringOperation
+                      glog
                       quickstep_catalog_CatalogTypedefs
                       quickstep_storage_ValueAccessor
                       quickstep_storage_ValueAccessorUtil

http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/b1785647/types/operations/unary_operations/DateExtractOperation.cpp
----------------------------------------------------------------------
diff --git a/types/operations/unary_operations/DateExtractOperation.cpp b/types/operations/unary_operations/DateExtractOperation.cpp
index c99e403..9f23f15 100644
--- a/types/operations/unary_operations/DateExtractOperation.cpp
+++ b/types/operations/unary_operations/DateExtractOperation.cpp
@@ -24,15 +24,11 @@
 #include <memory>
 #include <string>
 #include <type_traits>
-
-#ifdef QUICKSTEP_ENABLE_VECTOR_COPY_ELISION_JOIN
 #include <utility>
 #include <vector>
 
-#include "storage/StorageBlockInfo.hpp"
-#endif  // QUICKSTEP_ENABLE_VECTOR_COPY_ELISION_JOIN
-
 #include "catalog/CatalogTypedefs.hpp"
+#include "storage/StorageBlockInfo.hpp"
 #include "storage/ValueAccessor.hpp"
 #include "storage/ValueAccessorUtil.hpp"
 #include "types/DatetimeLit.hpp"

http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/b1785647/types/operations/unary_operations/DateExtractOperation.hpp
----------------------------------------------------------------------
diff --git a/types/operations/unary_operations/DateExtractOperation.hpp b/types/operations/unary_operations/DateExtractOperation.hpp
index f8c091b..993bda8 100644
--- a/types/operations/unary_operations/DateExtractOperation.hpp
+++ b/types/operations/unary_operations/DateExtractOperation.hpp
@@ -22,15 +22,11 @@
 
 #include <cstdint>
 #include <string>
-
-#ifdef QUICKSTEP_ENABLE_VECTOR_COPY_ELISION_JOIN
 #include <utility>
 #include <vector>
 
-#include "storage/StorageBlockInfo.hpp"
-#endif  // QUICKSTEP_ENABLE_VECTOR_COPY_ELISION_JOIN
-
 #include "catalog/CatalogTypedefs.hpp"
+#include "storage/StorageBlockInfo.hpp"
 #include "types/LongType.hpp"
 #include "types/Type.hpp"
 #include "types/TypeID.hpp"

http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/b1785647/types/operations/unary_operations/UnaryOperation.hpp
----------------------------------------------------------------------
diff --git a/types/operations/unary_operations/UnaryOperation.hpp b/types/operations/unary_operations/UnaryOperation.hpp
index 30a2961..bcc56c0 100644
--- a/types/operations/unary_operations/UnaryOperation.hpp
+++ b/types/operations/unary_operations/UnaryOperation.hpp
@@ -23,15 +23,11 @@
 #include <cstddef>
 #include <string>
 #include <type_traits>
-
-#ifdef QUICKSTEP_ENABLE_VECTOR_COPY_ELISION_JOIN
 #include <utility>
 #include <vector>
 
-#include "storage/StorageBlockInfo.hpp"
-#endif  // QUICKSTEP_ENABLE_VECTOR_COPY_ELISION_JOIN
-
 #include "catalog/CatalogTypedefs.hpp"
+#include "storage/StorageBlockInfo.hpp"
 #include "types/operations/Operation.hpp"
 #include "types/operations/Operation.pb.h"
 #include "types/TypedValue.hpp"

http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/b1785647/types/port/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/types/port/CMakeLists.txt b/types/port/CMakeLists.txt
index f013b44..cb16c32 100644
--- a/types/port/CMakeLists.txt
+++ b/types/port/CMakeLists.txt
@@ -48,17 +48,18 @@ endif()
 CHECK_CXX_SYMBOL_EXISTS(setenv "stdlib.h" QUICKSTEP_HAVE_SETENV)
 CHECK_CXX_SYMBOL_EXISTS(tzset "time.h" QUICKSTEP_HAVE_TZSET)
 
-
 configure_file (
   "${CMAKE_CURRENT_SOURCE_DIR}/TypesPortConfig.h.in"
   "${CMAKE_CURRENT_BINARY_DIR}/TypesPortConfig.h"
 )
 
+# Declare micro-libs:
 add_library(quickstep_types_port_gmtime_r ../../empty_src.cpp gmtime_r.hpp)
 add_library(quickstep_types_port_localtime_r ../../empty_src.cpp localtime_r.hpp)
 add_library(quickstep_types_port_strnlen ../../empty_src.cpp strnlen.hpp)
 add_library(quickstep_types_port_timegm timegm.cpp timegm.hpp)
 
+# Link dependencies:
 target_link_libraries(quickstep_types_port_gmtime_r
                       quickstep_utility_Macros)
 target_link_libraries(quickstep_types_port_localtime_r
@@ -67,6 +68,7 @@ target_link_libraries(quickstep_types_port_timegm
                       quickstep_types_port_gmtime_r
                       quickstep_utility_Macros)
 
+# Module all-in-one library:
 add_library(quickstep_types_port ../../empty_src.cpp)
 target_link_libraries(quickstep_types_port
                       quickstep_types_port_gmtime_r
@@ -87,7 +89,7 @@ add_test(timegm_unittest timegm_unittest)
 if (UNIX)
   add_executable(timegm_benchmark "${CMAKE_CURRENT_SOURCE_DIR}/tests/timegm_benchmark.cpp")
   target_link_libraries(timegm_benchmark
+                        ${LIBS}
                         benchmark
-                        quickstep_types_port_timegm
-                        ${LIBS})
+                        quickstep_types_port_timegm)
 endif()

http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/b1785647/types/port/gmtime_r.hpp
----------------------------------------------------------------------
diff --git a/types/port/gmtime_r.hpp b/types/port/gmtime_r.hpp
index 3a632aa..9d131a3 100644
--- a/types/port/gmtime_r.hpp
+++ b/types/port/gmtime_r.hpp
@@ -23,10 +23,7 @@
 #include <ctime>
 
 #include "types/port/TypesPortConfig.h"
-
-#if defined(QUICKSTEP_HAVE_GMTIME_S)
 #include "utility/Macros.hpp"
-#endif  // QUICKSTEP_HAVE_GMTIME_S
 
 namespace quickstep {
 

http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/b1785647/types/port/localtime_r.hpp
----------------------------------------------------------------------
diff --git a/types/port/localtime_r.hpp b/types/port/localtime_r.hpp
index 2c6853c..c5ed483 100644
--- a/types/port/localtime_r.hpp
+++ b/types/port/localtime_r.hpp
@@ -23,10 +23,7 @@
 #include <ctime>
 
 #include "types/port/TypesPortConfig.h"
-
-#if defined(QUICKSTEP_HAVE_LOCALTIME_S)
 #include "utility/Macros.hpp"
-#endif  // QUICKSTEP_HAVE_LOCALTIME_S
 
 namespace quickstep {
 



Mime
View raw message