You've already forked mariadb-columnstore-engine
mirror of
https://github.com/mariadb-corporation/mariadb-columnstore-engine.git
synced 2025-07-30 19:23:07 +03:00
Deep build refactoring phase 2 (#3564)
* configcpp refactored * chore(build): massive removals, auto add files to debian install file * chore(build): configure before autobake * chore(build): use custom cmake commands for components, mariadb-plugin-columnstore.install generated * chore(build): install deps as separate step for build-packages * more deps * chore(codemanagement, build): build refactoring stage2 * chore(safety): Locked Map for MessageqCpp with a simpler way Please enter the commit message for your changes. Lines starting * chore(codemanagement, ci): better coredumps handling, deps fixed * Delete build/bootstrap_mcs.py * Update charset.cpp (add license)
This commit is contained in:
@ -42,4 +42,4 @@ columnstore_library(
|
||||
${FLEX_ddl_scan_OUTPUTS}
|
||||
)
|
||||
|
||||
columnstore_link(ddlpackage loggingcpp)
|
||||
columnstore_link(ddlpackage loggingcpp messageqcpp)
|
||||
|
@ -27,7 +27,7 @@
|
||||
*/
|
||||
|
||||
#include <stdexcept>
|
||||
#include "collation.h" // CHARSET_INFO
|
||||
#include "mariadb_charset/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
|
||||
|
@ -13,4 +13,4 @@ set(ddlpackageproc_LIB_SRCS
|
||||
)
|
||||
|
||||
columnstore_library(ddlpackageproc ${ddlpackageproc_LIB_SRCS})
|
||||
columnstore_link(ddlpackageproc ${NETSNMP_LIBRARIES} loggingcpp)
|
||||
columnstore_link(ddlpackageproc loggingcpp oamcpp messageqcpp)
|
||||
|
@ -41,4 +41,4 @@ columnstore_library(
|
||||
${FLEX_dml_scan_OUTPUTS}
|
||||
)
|
||||
|
||||
columnstore_link(dmlpackage loggingcpp)
|
||||
columnstore_link(dmlpackage loggingcpp messageqcpp)
|
||||
|
@ -13,4 +13,4 @@ set(dmlpackageproc_LIB_SRCS
|
||||
)
|
||||
|
||||
columnstore_library(dmlpackageproc ${dmlpackageproc_LIB_SRCS})
|
||||
columnstore_link(dmlpackageproc ${NETSNMP_LIBRARIES} loggingcpp)
|
||||
columnstore_link(dmlpackageproc loggingcpp oamcpp messageqcpp)
|
||||
|
@ -46,4 +46,12 @@ 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
|
||||
${ENGINE_DT_LIB}
|
||||
pron
|
||||
oamcpp
|
||||
loggingcpp
|
||||
querytele
|
||||
)
|
||||
|
@ -49,7 +49,7 @@
|
||||
#undef max
|
||||
|
||||
#include "mcs_datatype.h"
|
||||
#include "collation.h" // CHARSET_INFO, class Charset
|
||||
#include "mariadb_charset/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
|
||||
|
@ -47,8 +47,6 @@ using namespace logging;
|
||||
|
||||
#include "clientrotator.h"
|
||||
|
||||
//#include "idb_mysql.h"
|
||||
|
||||
/** Debug macro */
|
||||
#ifdef INFINIDB_DEBUG
|
||||
#define IDEBUG(x) \
|
||||
|
@ -39,7 +39,7 @@
|
||||
#include "returnedcolumn.h"
|
||||
#include "dataconvert.h"
|
||||
|
||||
#include "collation.h" // CHARSET_INFO
|
||||
#include "mariadb_charset/collation.h" // CHARSET_INFO
|
||||
|
||||
namespace messageqcpp
|
||||
{
|
||||
|
@ -28,7 +28,7 @@ using namespace std;
|
||||
#include "basic/string_utils.h"
|
||||
|
||||
#include "bytestream.h"
|
||||
#include "collation.h"
|
||||
#include "mariadb_charset/collation.h"
|
||||
|
||||
using namespace messageqcpp;
|
||||
|
||||
|
@ -68,7 +68,15 @@ 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
|
||||
statistics_manager
|
||||
)
|
||||
|
||||
if(WITH_ORDERBY_UT)
|
||||
columnstore_executable(job_orderby_tests orderby-tests.cpp)
|
||||
|
@ -71,7 +71,7 @@ using namespace dataconvert;
|
||||
#include "jlf_tuplejoblist.h"
|
||||
using namespace joblist;
|
||||
|
||||
#include "statistics.h"
|
||||
#include "statistics_manager/statistics.h"
|
||||
|
||||
#ifdef __clang__
|
||||
#pragma clang diagnostic push
|
||||
|
@ -63,7 +63,7 @@ if(COMMAND mysql_add_plugin)
|
||||
${PLUGIN_EXEC_LIBS}
|
||||
${PLUGIN_WRITE_LIBS}
|
||||
joblist_server
|
||||
${NETSNMP_LIBRARIES}
|
||||
statistics_manager
|
||||
${MARIADB_CLIENT_LIBS}
|
||||
${S3API_DEPS}
|
||||
threadpool
|
||||
@ -89,10 +89,10 @@ else()
|
||||
${S3API_DEPS}
|
||||
${ENGINE_LDFLAGS}
|
||||
${ENGINE_WRITE_LIBS}
|
||||
${NETSNMP_LIBRARIES}
|
||||
${SERVER_BUILD_DIR}/libservices/libmysqlservices.a
|
||||
threadpool
|
||||
loggingcpp
|
||||
statistics_manager
|
||||
marias3
|
||||
)
|
||||
# define this dummy target for standalone builds (ie, when mysql_add_plugin doesn't exist)
|
||||
|
@ -128,9 +128,9 @@ using namespace funcexp;
|
||||
#include "ha_mcs_sysvars.h"
|
||||
|
||||
#include "ha_mcs_datatype.h"
|
||||
#include "statistics.h"
|
||||
#include "ha_mcs_logging.h"
|
||||
#include "ha_subquery.h"
|
||||
#include "statistics_manager/statistics.h"
|
||||
|
||||
namespace cal_impl_if
|
||||
{
|
||||
|
@ -14,10 +14,17 @@
|
||||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
|
||||
MA 02110-1301, USA. */
|
||||
// One include file to deal with all the MySQL pollution of the
|
||||
// global namespace
|
||||
//
|
||||
// Don't include ANY mysql headers anywhere except here!
|
||||
|
||||
/* One include file to deal with all the MySQL pollution of the
|
||||
global namespace
|
||||
|
||||
Don't include ANY mysql headers anywhere except here!
|
||||
|
||||
WARN: if any cmake build target uses this include file,
|
||||
GenError from server must be added to the target dependencies
|
||||
to generate mysqld_error.h used below
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#ifdef TEST_MCSCONFIG_H
|
||||
|
Reference in New Issue
Block a user