chore(codemanagement, build): build refactoring stage2

writeengine/bulk/CMakeLists.txt

@@ -38,7 +38,7 @@ remove_definitions(-D_FILE_OFFSET_BITS=64)
 set(cpimport.bin_SRCS cpimport.cpp)
 
 columnstore_executable(cpimport.bin ${cpimport.bin_SRCS})
-add_dependencies(cpimport.bin marias3)
+
 columnstore_link(
     cpimport.bin
     ${ENGINE_LDFLAGS}
@@ -47,4 +47,5 @@ columnstore_link(
     ${S3API_DEPS}
     we_bulk
     we_xml
+    marias3
 )

writeengine/client/CMakeLists.txt

@@ -5,7 +5,4 @@ include_directories(${ENGINE_COMMON_INCLUDES})
 set(writeengineclient_LIB_SRCS we_clients.cpp we_ddlcommandclient.cpp we_dmlcommandclient.cpp)
 
 columnstore_library(writeengineclient ${writeengineclient_LIB_SRCS})
-
-add_dependencies(writeengineclient loggingcpp)
-
-columnstore_link(writeengineclient ${NETSNMP_LIBRARIES})
+columnstore_link(writeengineclient ${NETSNMP_LIBRARIES} boost_thread oamcpp messageqcpp loggingcpp)

writeengine/redistribute/CMakeLists.txt

@@ -7,9 +7,6 @@ set(writeengineredistribute_LIB_SRCS we_redistribute.cpp we_redistributecontrol.
 )
 
 columnstore_library(writeengineredistribute ${writeengineredistribute_LIB_SRCS})
-
-add_dependencies(writeengineredistribute loggingcpp)
-
-columnstore_link(writeengineredistribute ${NETSNMP_LIBRARIES})
+columnstore_link(writeengineredistribute ${NETSNMP_LIBRARIES} loggingcpp oamcpp boost_thread messageqcpp)
 
 target_compile_definitions(writeengineredistribute PUBLIC BOOST_NO_CXX11_SCOPED_ENUMS)

writeengine/server/CMakeLists.txt

@@ -18,9 +18,12 @@ set(WriteEngineServer_SRCS
 )
 
 columnstore_executable(WriteEngineServer ${WriteEngineServer_SRCS})
-
-add_dependencies(WriteEngineServer loggingcpp)
-
 columnstore_link(
-    WriteEngineServer ${ENGINE_LDFLAGS} ${NETSNMP_LIBRARIES} ${ENGINE_WRITE_LIBS} threadpool writeengineredistribute
+    WriteEngineServer
+    ${ENGINE_LDFLAGS}
+    ${NETSNMP_LIBRARIES}
+    ${ENGINE_WRITE_LIBS}
+    threadpool
+    writeengineredistribute
+    loggingcpp
 )

writeengine/shared/we_type.h

@@ -40,7 +40,7 @@
 #include "IDBDataFile.h"
 #include "IDBPolicy.h"
 #include "nullstring.h"
-#include "collation.h" // For CHARSET_INFO struct
+#include "basic/collation.h"  // For CHARSET_INFO struct
 
 #undef EXPORT
 #undef DELETE
@@ -408,8 +408,8 @@ struct JobColumn /** @brief Job Column Structure */
   int compressionType;             /** @brief compression type */
   bool autoIncFlag;                /** @brief auto increment flag */
   DctnryStruct dctnry;             /** @brief dictionary structure */
-  int128_t fMinIntSat;              /** @brief For integer type, the min saturation value */
-  uint128_t fMaxIntSat;             /** @brief For integer type, the max saturation value */
+  int128_t fMinIntSat;             /** @brief For integer type, the min saturation value */
+  uint128_t fMaxIntSat;            /** @brief For integer type, the max saturation value */
   double fMinDblSat;               /** @brief for float/double, the min saturation value */
   double fMaxDblSat;               /** @brief for float/double, the max saturation value */
   bool fWithDefault;               /** @brief With default */
@@ -447,10 +447,9 @@ struct JobColumn /** @brief Job Column Structure */
    , cs(nullptr)
   {
   }
-  JobColumn(const std::string& colName_, OID mapOid_, const std::string& typeName_,
-            int width_, int definedWidth_, int compressionType_, int dctnryCompressionType_,
-            int64_t minIntSat_, uint64_t maxIntSat_, bool withDefault_,
-            unsigned long long defaultUInt_)
+  JobColumn(const std::string& colName_, OID mapOid_, const std::string& typeName_, int width_,
+            int definedWidth_, int compressionType_, int dctnryCompressionType_, int64_t minIntSat_,
+            uint64_t maxIntSat_, bool withDefault_, unsigned long long defaultUInt_)
    : colName(colName_)
    , mapOid(mapOid_)
    , dataType(execplan::CalpontSystemCatalog::INT)

writeengine/splitter/CMakeLists.txt

@@ -16,8 +16,6 @@ set(cpimport_SRCS
 
 columnstore_executable(cpimport ${cpimport_SRCS})
 
-add_dependencies(cpimport loggingcpp)
-
 columnstore_link(
     cpimport
     ${ENGINE_LDFLAGS}
@@ -27,4 +25,5 @@ columnstore_link(
     threadpool
     marias3
     boost_program_options
+    loggingcpp
 )

writeengine/wrapper/CMakeLists.txt

@@ -37,7 +37,12 @@ set(writeengine_LIB_SRCS
 add_definitions(-D_FILE_OFFSET_BITS=64)
 
 columnstore_library(writeengine ${writeengine_LIB_SRCS})
-
-add_dependencies(writeengine loggingcpp)
-
-columnstore_link(writeengine ${NETSNMP_LIBRARIES})
+columnstore_link(
+    writeengine
+    ${NETSNMP_LIBRARIES}
+    loggingcpp
+    oamcpp
+    boost_thread
+    compress
+    messageqcpp
+)

writeengine/xml/CMakeLists.txt

@@ -6,6 +6,5 @@ set(we_xml_STAT_SRCS we_xmlop.cpp we_xmljob.cpp we_xmlgendata.cpp we_xmlgenproc.
 
 add_definitions(-D_FILE_OFFSET_BITS=64)
 
-add_library(we_xml STATIC ${we_xml_STAT_SRCS})
-
-add_dependencies(we_xml loggingcpp)
+columnstore_static_library(we_xml ${we_xml_STAT_SRCS})
+columnstore_link(we_xml loggingcpp)