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 1 (#3562)
* configcpp refactored * logging and datatypes refactored * more dataconvert * chore(build): massive removals, auto add files to debian install file * chore(codemanagement): nodeps headers, potentioal library * 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 * check debian/mariadb-plugin-columnstore.install automatically * chore(build): add option for multibracnh compilation * Fix warning
This commit is contained in:
@ -71,16 +71,17 @@ if(COMMAND mysql_add_plugin)
|
||||
CONFIG
|
||||
columnstore.cnf
|
||||
)
|
||||
add_to_debian_install_file(${MARIADB_MYCNFDIR}/columnstore.cnf)
|
||||
add_to_debian_install_file("${MARIADB_PLUGINDIR}/ha_columnstore.so")
|
||||
|
||||
else()
|
||||
message("Adding plugin via CMake")
|
||||
add_library(ha_columnstore SHARED ${libcalmysql_SRCS})
|
||||
columnstore_shared_library(ha_columnstore ${libcalmysql_SRCS})
|
||||
set_target_properties(ha_columnstore PROPERTIES PREFIX "")
|
||||
|
||||
add_dependencies(ha_columnstore loggingcpp)
|
||||
add_dependencies(ha_columnstore marias3)
|
||||
add_definitions(-DMYSQL_DYNAMIC_PLUGIN -DPLUGIN_COLUMNSTORE_VERSION="${PACKAGE_VERSION}")
|
||||
|
||||
target_link_libraries(
|
||||
columnstore_link(
|
||||
ha_columnstore
|
||||
${S3API_DEPS}
|
||||
${ENGINE_LDFLAGS}
|
||||
@ -88,33 +89,20 @@ else()
|
||||
${NETSNMP_LIBRARIES}
|
||||
${SERVER_BUILD_DIR}/libservices/libmysqlservices.a
|
||||
threadpool
|
||||
loggingcpp
|
||||
marias3
|
||||
)
|
||||
|
||||
install(
|
||||
TARGETS ha_columnstore
|
||||
DESTINATION ${MARIADB_PLUGINDIR}
|
||||
COMPONENT columnstore-engine
|
||||
)
|
||||
|
||||
# define this dummy target for standalone builds (ie, when mysql_add_plugin doesn't exist)
|
||||
add_custom_target(columnstore DEPENDS ha_columnstore)
|
||||
install(
|
||||
FILES columnstore.cnf
|
||||
DESTINATION ${MARIADB_MYCNFDIR}
|
||||
COMPONENT columnstore-engine
|
||||
)
|
||||
columnstore_install_file(columnstore.cnf ${MARIADB_MYCNFDIR})
|
||||
endif()
|
||||
|
||||
if(TARGET columnstore)
|
||||
install(
|
||||
FILES syscatalog_mysql.sql dumpcat_mysql.sql calsetuserpriority.sql calremoveuserpriority.sql
|
||||
calshowprocesslist.sql columnstore_info.sql
|
||||
DESTINATION ${ENGINE_SUPPORTDIR}
|
||||
COMPONENT columnstore-engine
|
||||
)
|
||||
install(
|
||||
PROGRAMS install_mcs_mysql.sh
|
||||
DESTINATION ${ENGINE_SBINDIR}
|
||||
COMPONENT columnstore-engine
|
||||
)
|
||||
columnstore_install_file(syscatalog_mysql.sql ${ENGINE_SUPPORTDIR})
|
||||
columnstore_install_file(dumpcat_mysql.sql ${ENGINE_SUPPORTDIR})
|
||||
columnstore_install_file(calsetuserpriority.sql ${ENGINE_SUPPORTDIR})
|
||||
columnstore_install_file(calremoveuserpriority.sql ${ENGINE_SUPPORTDIR})
|
||||
columnstore_install_file(calshowprocesslist.sql ${ENGINE_SUPPORTDIR})
|
||||
columnstore_install_file(columnstore_info.sql ${ENGINE_SUPPORTDIR})
|
||||
columnstore_install_program(install_mcs_mysql.sh ${ENGINE_SBINDIR})
|
||||
endif()
|
||||
|
@ -45,6 +45,7 @@ using namespace logging;
|
||||
|
||||
#include "columnstoreversion.h"
|
||||
#include "ha_mcs_sysvars.h"
|
||||
#include "basic/string_utils.h"
|
||||
|
||||
extern "C"
|
||||
{
|
||||
|
@ -26,7 +26,7 @@
|
||||
#include <boost/shared_ptr.hpp>
|
||||
#include <stack>
|
||||
#include <vector>
|
||||
|
||||
#include "basic/string_utils.h"
|
||||
#include "idb_mysql.h"
|
||||
#include "ha_mcs_sysvars.h"
|
||||
|
||||
@ -36,6 +36,8 @@ struct st_ha_create_information;
|
||||
class ha_columnstore_select_handler;
|
||||
class ha_columnstore_derived_handler;
|
||||
|
||||
#include "basic/string_utils.h"
|
||||
|
||||
#include "configcpp.h"
|
||||
#include "idberrorinfo.h"
|
||||
#include "calpontselectexecutionplan.h"
|
||||
@ -117,7 +119,8 @@ struct gp_walk_info
|
||||
std::vector<execplan::ReturnedColumn*> localCols;
|
||||
std::stack<execplan::ReturnedColumn*> rcWorkStack;
|
||||
std::stack<execplan::ParseTree*> ptWorkStack;
|
||||
boost::shared_ptr<execplan::SimpleColumn> scsp; // while defined as SSCP, it is used as SRCP, nothing specific to SimpleColumn is used in use sites.
|
||||
boost::shared_ptr<execplan::SimpleColumn> scsp; // while defined as SSCP, it is used as SRCP, nothing
|
||||
// specific to SimpleColumn is used in use sites.
|
||||
uint32_t sessionid;
|
||||
bool fatalParseError;
|
||||
std::string parseErrorText;
|
||||
@ -227,7 +230,6 @@ struct gp_walk_info
|
||||
{
|
||||
}
|
||||
~gp_walk_info();
|
||||
|
||||
};
|
||||
|
||||
struct SubQueryChainHolder;
|
||||
@ -237,7 +239,7 @@ struct ext_cond_info
|
||||
// circular dependency on header inclusion with ha_subquery.h.
|
||||
boost::shared_ptr<SubQueryChainHolder> chainHolder;
|
||||
gp_walk_info gwi;
|
||||
ext_cond_info(long timeZone); // needs knowledge on SubQueryChainHolder, will be defined elsewhere
|
||||
ext_cond_info(long timeZone); // needs knowledge on SubQueryChainHolder, will be defined elsewhere
|
||||
};
|
||||
|
||||
struct cal_table_info
|
||||
|
Reference in New Issue
Block a user