database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-29 08:21:15 +03:00
Code Activity

Deep build refactoring phase 2 (#3564)

Browse Source 
* 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:
Leonid Fedorov
2025-07-17 16:14:10 +04:00
committed by GitHub
parent d0ee5dae32
commit 449029a827
107 changed files with 354 additions and 3327 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
writeengine/bulk/CMakeLists.txt
View File

@ -29,7 +29,7 @@ set(we_bulk_STAT_SRCS
add_definitions(-D_FILE_OFFSET_BITS=64)
columnstore_static_library(we_bulk ${we_bulk_STAT_SRCS})
columnstore_link(we_bulk ${NETSNMP_LIBRARIES} loggingcpp boost_program_options)
columnstore_link(we_bulk loggingcpp boost_program_options)
remove_definitions(-D_FILE_OFFSET_BITS=64)
@ -38,13 +38,13 @@ 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}
${NETSNMP_LIBRARIES}
${ENGINE_WRITE_LIBS}
${S3API_DEPS}
we_bulk
we_xml
marias3
)

5
writeengine/client/CMakeLists.txt
View File

@ -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 boost_thread oamcpp messageqcpp loggingcpp)

5
writeengine/redistribute/CMakeLists.txt
View File

@ -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 loggingcpp oamcpp boost_thread messageqcpp)
target_compile_definitions(writeengineredistribute PUBLIC BOOST_NO_CXX11_SCOPED_ENUMS)

7
writeengine/server/CMakeLists.txt
View File

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

13
writeengine/shared/we_type.h
View File

@ -40,7 +40,7 @@
#include "IDBDataFile.h"
#include "IDBPolicy.h"
#include "nullstring.h"
#include "collation.h" // For CHARSET_INFO struct
#include "mariadb_charset/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)

4
writeengine/splitter/CMakeLists.txt
View File

@ -16,15 +16,13 @@ set(cpimport_SRCS
columnstore_executable(cpimport ${cpimport_SRCS})
add_dependencies(cpimport loggingcpp)
columnstore_link(
cpimport
${ENGINE_LDFLAGS}
${NETSNMP_LIBRARIES}
${ENGINE_WRITE_LIBS}
batchloader
threadpool
marias3
boost_program_options
loggingcpp
)

5
writeengine/wrapper/CMakeLists.txt
View File

@ -37,7 +37,4 @@ 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 loggingcpp oamcpp boost_thread compress messageqcpp)

5
writeengine/xml/CMakeLists.txt
View File

@ -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)