1
0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-08 14:22:09 +03:00

Revert "chore(codemanagement, ci): better coredumps handling, deps fixed"

This reverts commit c853e1f81d.
This commit is contained in:
Leonid Fedorov
2025-07-31 15:16:34 +00:00
parent db4249c727
commit 7872ebfee1
86 changed files with 3100 additions and 874 deletions

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 loggingcpp boost_program_options)
columnstore_link(we_bulk ${NETSNMP_LIBRARIES} loggingcpp boost_program_options)
remove_definitions(-D_FILE_OFFSET_BITS=64)
@@ -42,6 +42,7 @@ columnstore_executable(cpimport.bin ${cpimport.bin_SRCS})
columnstore_link(
cpimport.bin
${ENGINE_LDFLAGS}
${NETSNMP_LIBRARIES}
${ENGINE_WRITE_LIBS}
${S3API_DEPS}
we_bulk

View File

@@ -5,4 +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})
columnstore_link(writeengineclient boost_thread oamcpp messageqcpp loggingcpp)
columnstore_link(writeengineclient ${NETSNMP_LIBRARIES} boost_thread oamcpp messageqcpp loggingcpp)

View File

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

View File

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

View File

@@ -40,7 +40,7 @@
#include "IDBDataFile.h"
#include "IDBPolicy.h"
#include "nullstring.h"
#include "mariadb_charset/collation.h" // For CHARSET_INFO struct
#include "basic/collation.h" // For CHARSET_INFO struct
#undef EXPORT
#undef DELETE

View File

@@ -19,6 +19,7 @@ columnstore_executable(cpimport ${cpimport_SRCS})
columnstore_link(
cpimport
${ENGINE_LDFLAGS}
${NETSNMP_LIBRARIES}
${ENGINE_WRITE_LIBS}
batchloader
threadpool

View File

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