chore(codemanagement, build): build refactoring stage2

dbcon/ddlpackage/CMakeLists.txt

@@ -42,4 +42,4 @@ columnstore_library(
     ${FLEX_ddl_scan_OUTPUTS}
 )
 
-columnstore_link(ddlpackage loggingcpp)
+columnstore_link(ddlpackage loggingcpp messageqcpp)

dbcon/ddlpackage/sqlparser.h

@@ -27,7 +27,7 @@
  */
 
 #include <stdexcept>
-#include "collation.h"  // CHARSET_INFO
+#include "basic/collation.h"  // CHARSET_INFO
 #include "ddlpkg.h"
 #include "mariadb_my_sys.h"  // myf, MYF()
 
@@ -87,7 +87,7 @@ struct pass_to_bison
   myf utf8_flag;
 
   pass_to_bison(ParseTree* pt)
-   : fParseTree(pt), scanner(NULL), default_table_charset(NULL), utf8_flag(MYF(0)){};
+   : fParseTree(pt), scanner(NULL), default_table_charset(NULL), utf8_flag(MYF(0)) {};
 };
 
 class SqlParser

dbcon/ddlpackageproc/CMakeLists.txt

@@ -13,4 +13,4 @@ set(ddlpackageproc_LIB_SRCS
 )
 
 columnstore_library(ddlpackageproc ${ddlpackageproc_LIB_SRCS})
-columnstore_link(ddlpackageproc ${NETSNMP_LIBRARIES} loggingcpp)
+columnstore_link(ddlpackageproc ${NETSNMP_LIBRARIES} loggingcpp oamcpp messageqcpp)

dbcon/dmlpackage/CMakeLists.txt

@@ -41,4 +41,4 @@ columnstore_library(
     ${FLEX_dml_scan_OUTPUTS}
 )
 
-columnstore_link(dmlpackage loggingcpp)
+columnstore_link(dmlpackage loggingcpp messageqcpp)

dbcon/dmlpackageproc/CMakeLists.txt

@@ -13,4 +13,4 @@ set(dmlpackageproc_LIB_SRCS
 )
 
 columnstore_library(dmlpackageproc ${dmlpackageproc_LIB_SRCS})
-columnstore_link(dmlpackageproc ${NETSNMP_LIBRARIES} loggingcpp)
+columnstore_link(dmlpackageproc ${NETSNMP_LIBRARIES} loggingcpp oamcpp messageqcpp)

dbcon/execplan/CMakeLists.txt

@@ -46,4 +46,13 @@ set(execplan_LIB_SRCS
 )
 
 columnstore_library(execplan ${execplan_LIB_SRCS})
-columnstore_link(execplan messageqcpp ${NETSNMP_LIBRARIES} ${ENGINE_DT_LIB} pron loggingcpp)
+columnstore_link(
+    execplan
+    messageqcpp
+    ${NETSNMP_LIBRARIES}
+    ${ENGINE_DT_LIB}
+    pron
+    oamcpp
+    loggingcpp
+    querytele
+)

dbcon/execplan/calpontsystemcatalog.h

@@ -49,7 +49,7 @@
 #undef max
 
 #include "mcs_datatype.h"
-#include "collation.h"  // CHARSET_INFO, class Charset
+#include "basic/collation.h"  // CHARSET_INFO, class Charset
 #include "nullstring.h"
 
 class ExecPlanTest;
@@ -75,7 +75,8 @@ const int32_t IDB_VTABLE_ID = CNX_VTABLE_ID;
 /**
  * A struct to hold a list of table partitions.
  */
-struct Partitions {
+struct Partitions
+{
   std::vector<std::string> fPartNames;
   void serialize(messageqcpp::ByteStream& b) const
   {
@@ -96,12 +97,11 @@ struct Partitions {
       b >> t;
       fPartNames.push_back(t);
     }
-
   }
 };
-bool operator <(const Partitions& a, const Partitions& b);
-bool operator ==(const Partitions& a, const Partitions& b);
-bool operator !=(const Partitions& a, const Partitions& b); // for GCC9
+bool operator<(const Partitions& a, const Partitions& b);
+bool operator==(const Partitions& a, const Partitions& b);
+bool operator!=(const Partitions& a, const Partitions& b);  // for GCC9
 
 /** The CalpontSystemCatalog class
  *
@@ -259,9 +259,9 @@ class CalpontSystemCatalog : public datatypes::SystemCatalog
    public:
     ColType() = default;
     ColType(const ColType& rhs);
-    ColType(int32_t colWidth_, int32_t scale_, int32_t precision_,
-            const ConstraintType& constraintType_, const DictOID& ddn_, int32_t colPosition_,
-            int32_t compressionType_, OID columnOID_, const ColDataType& colDataType_);
+    ColType(int32_t colWidth_, int32_t scale_, int32_t precision_, const ConstraintType& constraintType_,
+            const DictOID& ddn_, int32_t colPosition_, int32_t compressionType_, OID columnOID_,
+            const ColDataType& colDataType_);
     ColType& operator=(const ColType& rhs);
 
     CHARSET_INFO* getCharset() const;
@@ -1301,8 +1301,8 @@ const int OID_SYSCOLUMN_MINVALUE = SYSCOLUMN_BASE + 19;        /** @brief min va
 const int OID_SYSCOLUMN_MAXVALUE = SYSCOLUMN_BASE + 20;        /** @brief max value col */
 const int OID_SYSCOLUMN_COMPRESSIONTYPE = SYSCOLUMN_BASE + 21; /** @brief compression type */
 const int OID_SYSCOLUMN_NEXTVALUE = SYSCOLUMN_BASE + 22;       /** @brief next value */
-const int OID_SYSCOLUMN_CHARSETNUM = SYSCOLUMN_BASE + 23;      /** @brief character set number for the column */
-const int SYSCOLUMN_MAX = SYSCOLUMN_BASE + 24;                 // be sure this is one more than the highest #
+const int OID_SYSCOLUMN_CHARSETNUM = SYSCOLUMN_BASE + 23; /** @brief character set number for the column */
+const int SYSCOLUMN_MAX = SYSCOLUMN_BASE + 24;            // be sure this is one more than the highest #
 
 /*****************************************************
  * SYSTABLE columns dictionary OID definition

dbcon/execplan/predicateoperator.h

@@ -39,7 +39,7 @@
 #include "returnedcolumn.h"
 #include "dataconvert.h"
 
-#include "collation.h"  // CHARSET_INFO
+#include "basic/collation.h"  // CHARSET_INFO
 
 namespace messageqcpp
 {

dbcon/execplan/pseudocolumn.cpp

@@ -28,7 +28,7 @@ using namespace std;
 #include "basic/string_utils.h"
 
 #include "bytestream.h"
-#include "collation.h"
+#include "basic/collation.h"
 
 using namespace messageqcpp;
 

dbcon/joblist/CMakeLists.txt

@@ -68,7 +68,7 @@ columnstore_library(joblist ${joblist_LIB_SRCS})
 target_include_directories(
     joblist BEFORE PUBLIC ${OPENSSL_INCLUDE_DIR} ${LIBMARIADB_BININC_DIR} ${LIBMARIADB_SRCINC_DIR}
 )
-columnstore_link(joblist loggingcpp)
+columnstore_link(joblist loggingcpp boost_thread oamcpp querytele messageqcpp)
 
 if(WITH_ORDERBY_UT)
     columnstore_executable(job_orderby_tests orderby-tests.cpp)