database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-04-18 21:44:02 +03:00
Code

Add support for building from server

Browse Source
This commit is contained in:
Andrew Hutchings 2019-11-25 16:47:45 +00:00
parent 27ec629ace
commit a8cd34f86d
40 changed files with 125 additions and 227 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

105
CMakeLists.txt
View File

@ -77,35 +77,68 @@ SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/lib)
SET (ENGINE_SYSCONFDIR "/etc")
SET (ENGINE_DATADIR "/var/lib/columnstore")
# TODO: This will all be replaced by variables from server install_layout.cmake once we are a submodule
IF (RPM)
SET(MARIADB_PLUGINDIR "/usr/lib64/mysql/plugin")
SET(MARIADB_MYCNFDIR "/etc/my.cnf.d")
SET (ENGINE_LIBDIR "/usr/lib64")
SET (ENGINE_BINDIR "/usr/bin")
SET (ENGINE_INCDIR "/usr/include")
SET (ENGINE_MANDIR "/usr/share/man")
SET (ENGINE_SBINDIR "/usr/sbin")
SET (ENGINE_SUPPORTDIR "/usr/share/columnstore")
# We are building from MariaDB server submodule if this is set
if (INSTALL_LAYOUT)
SET(MARIADB_PLUGINDIR "${CMAKE_INSTALL_PREFIX}/${INSTALL_PLUGINDIR_RPM}")
SET(MARIADB_MYCNFDIR "${CMAKE_INSTALL_PREFIX}/${INSTALL_SYSCONF2DIR_RPM}")
SET(ENGINE_LIBDIR "${CMAKE_INSTALL_PREFIX}/${INSTALL_LIBDIR_RPM}")
SET(ENGINE_BINDIR "${CMAKE_INSTALL_PREFIX}/${INSTALL_BINDIR_RPM}")
SET(ENGINE_INCDIR "${CMAKE_INSTALL_PREFIX}/include")
SET(ENGINE_MANDIR "${CMAKE_INSTALL_PREFIX}/${INSTALL_MANDIR_RPM}")
SET(ENGINE_SBINDIR "${CMAKE_INSTALL_PREFIX}/${INSTALL_SBINDIR_RPM}")
SET(ENGINE_SUPPORTDIR "${CMAKE_INSTALL_PREFIX}/share/columnstore")
else ()
SET(MARIADB_PLUGINDIR "/usr/lib64/mysql/plugin")
SET(MARIADB_MYCNFDIR "/etc/my.cnf.d")
SET (ENGINE_LIBDIR "/usr/lib64")
SET (ENGINE_BINDIR "/usr/bin")
SET (ENGINE_INCDIR "/usr/include")
SET (ENGINE_MANDIR "/usr/share/man")
SET (ENGINE_SBINDIR "/usr/sbin")
SET (ENGINE_SUPPORTDIR "/usr/share/columnstore")
endif ()
ELSEIF (DEB)
SET(MARIADB_PLUGINDIR "/usr/lib/mysql/plugin")
SET(MARIADB_MYCNFDIR "/etc/mysql/conf.d")
SET (ENGINE_LIBDIR "/usr/lib")
SET (ENGINE_BINDIR "/usr/bin")
SET (ENGINE_INCDIR "/usr/include")
SET (ENGINE_MANDIR "/usr/share/man")
SET (ENGINE_SBINDIR "/usr/sbin")
SET (ENGINE_SUPPORTDIR "/usr/share/columnstore")
if (INSTALL_LAYOUT)
SET(MARIADB_PLUGINDIR "${CMAKE_INSTALL_PREFIX}/${INSTALL_PLUGINDIR_DEB}")
SET(MARIADB_MYCNFDIR "${CMAKE_INSTALL_PREFIX}/${INSTALL_SYSCONF2DIR_DEB}")
SET(ENGINE_LIBDIR "${CMAKE_INSTALL_PREFIX}/${INSTALL_LIBDIR_DEB}")
SET(ENGINE_BINDIR "${CMAKE_INSTALL_PREFIX}/${INSTALL_BINDIR_DEB}")
SET(ENGINE_INCDIR "${CMAKE_INSTALL_PREFIX}/include")
SET(ENGINE_MANDIR "${CMAKE_INSTALL_PREFIX}/${INSTALL_MANDIR_DEB}")
SET(ENGINE_SBINDIR "${CMAKE_INSTALL_PREFIX}/${INSTALL_SBINDIR_DEB}")
SET(ENGINE_SUPPORTDIR "${CMAKE_INSTALL_PREFIX}/share/columnstore")
else ()
SET(MARIADB_PLUGINDIR "/usr/lib/mysql/plugin")
SET(MARIADB_MYCNFDIR "/etc/mysql/conf.d")
SET (ENGINE_LIBDIR "/usr/lib")
SET (ENGINE_BINDIR "/usr/bin")
SET (ENGINE_INCDIR "/usr/include")
SET (ENGINE_MANDIR "/usr/share/man")
SET (ENGINE_SBINDIR "/usr/sbin")
SET (ENGINE_SUPPORTDIR "/usr/share/columnstore")
endif ()
ELSE()
# TODO: prefix should probably apply here
SET(MARIADB_PLUGINDIR "/usr/local/lib/mysql/plugin")
SET(MARIADB_MYCNFDIR "/etc/mysql")
SET (ENGINE_LIBDIR "/usr/local/lib")
SET (ENGINE_BINDIR "/usr/local/bin")
SET (ENGINE_INCDIR "/usr/local/include")
SET (ENGINE_MANDIR "/usr/local/man")
SET (ENGINE_SBINDIR "/usr/local/sbin")
SET (ENGINE_SUPPORTDIR "/usr/local/share/columnstore")
if (INSTALL_LAYOUT)
SET(MARIADB_PLUGINDIR "${CMAKE_INSTALL_PREFIX}/${INSTALL_PLUGINDIR_STANDALONE}")
SET(MARIADB_MYCNFDIR "${CMAKE_INSTALL_PREFIX}/${INSTALL_SYSCONF2DIR_STANDALONE}")
SET(ENGINE_LIBDIR "${CMAKE_INSTALL_PREFIX}/${INSTALL_LIBDIR_STANDALONE}")
SET(ENGINE_BINDIR "${CMAKE_INSTALL_PREFIX}/${INSTALL_BINDIR_STANDALONE}")
SET(ENGINE_INCDIR "${CMAKE_INSTALL_PREFIX}/include")
SET(ENGINE_MANDIR "${CMAKE_INSTALL_PREFIX}/${INSTALL_MANDIR_STANDALONE}")
SET(ENGINE_SBINDIR "${CMAKE_INSTALL_PREFIX}/${INSTALL_SBINDIR_STANDALONE}")
SET(ENGINE_SUPPORTDIR "${CMAKE_INSTALL_PREFIX}/share/columnstore")
else ()
# TODO: prefix should probably apply here
SET(MARIADB_PLUGINDIR "/usr/local/lib/mysql/plugin")
SET(MARIADB_MYCNFDIR "/etc/mysql")
SET (ENGINE_LIBDIR "/usr/local/lib")
SET (ENGINE_BINDIR "/usr/local/bin")
SET (ENGINE_INCDIR "/usr/local/include")
SET (ENGINE_MANDIR "/usr/local/man")
SET (ENGINE_SBINDIR "/usr/local/sbin")
SET (ENGINE_SUPPORTDIR "/usr/local/share/columnstore")
endif ()
ENDIF()
SET_PROPERTY(DIRECTORY PROPERTY EP_BASE ${CMAKE_CURRENT_BINARY_DIR}/external)
@ -200,6 +233,8 @@ IF (SERVER_BUILD_INCLUDE_DIR)
IF (NOT IS_ABSOLUTE ${SERVER_BUILD_INCLUDE_DIR})
SET (SERVER_BUILD_INCLUDE_DIR ${CMAKE_BINARY_DIR}/${SERVER_BUILD_INCLUDE_DIR})
ENDIF()
ELSEIF (INSTALL_LAYOUT)
SET (SERVER_BUILD_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/include)
ELSE()
SET (SERVER_BUILD_INCLUDE_DIR ${CMAKE_BINARY_DIR}/../include)
ENDIF()
@ -208,6 +243,8 @@ IF (SERVER_SOURCE_ROOT_DIR)
IF (NOT IS_ABSOLUTE ${SERVER_SOURCE_ROOT_DIR})
SET (SERVER_SOURCE_ROOT_DIR ${CMAKE_BINARY_DIR}/${SERVER_SOURCE_ROOT_DIR})
ENDIF()
ELSEIF (INSTALL_LAYOUT)
SET (SERVER_SOURCE_ROOT_DIR ${CMAKE_SOURCE_DIR})
ELSE()
SET (SERVER_SOURCE_ROOT_DIR ${CMAKE_BINARY_DIR}/..)
ENDIF()
@ -219,7 +256,11 @@ ENDIF()
MESSAGE("SERVER_BUILD_INCLUDE_DIR = ${SERVER_BUILD_INCLUDE_DIR}")
MESSAGE("SERVER_SOURCE_ROOT_DIR = ${SERVER_SOURCE_ROOT_DIR}")
SET (MARIADB_CLIENT_LIBS -L${SERVER_BUILD_INCLUDE_DIR}/../libmariadb/libmariadb/ libmariadb.so)
IF (INSTALL_LAYOUT)
SET (MARIADB_CLIENT_LIBS libmariadb)
ELSE()
SET (MARIADB_CLIENT_LIBS -L${SERVER_BUILD_INCLUDE_DIR}/../libmariadb/libmariadb/ libmariadb.so)
ENDIF()
#SET (ENGINE_UTILS_BOOSTIDB_INCLUDE "{CMAKE_CURRENT_SOURCE_DIR}/utils/boost_idb")
SET (ENGINE_UTILS_MESSAGEQCPP_INCLUDE "${CMAKE_CURRENT_SOURCE_DIR}/utils/messageqcpp")
@ -322,10 +363,18 @@ exec_program("git"
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/build/releasenum.in ${CMAKE_CURRENT_BINARY_DIR}/build/releasenum IMMEDIATE)
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/build/releasenum DESTINATION ${ENGINE_SUPPORTDIR} COMPONENT platform)
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/columnstoreversion.h.in ${CMAKE_CURRENT_SOURCE_DIR}/columnstoreversion.h)
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h)
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mcsconfig.h.in ${CMAKE_CURRENT_BINARY_DIR}/mcsconfig.h)
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/gitversionEngine.in ${CMAKE_CURRENT_BINARY_DIR}/gitversionEngine IMMEDIATE)
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/gitversionEngine DESTINATION ${ENGINE_SUPPORTDIR} COMPONENT platform)
# Do this or when MariaDB builds us we don't have GenError which is required for these
IF (INSTALL_LAYOUT)
ADD_DEPENDENCIES(udf_mysql GenError)
ADD_DEPENDENCIES(funcexp GenError)
ADD_DEPENDENCIES(oamcpp GenError)
ADD_DEPENDENCIES(regr_mysql GenError)
ENDIF ()
INCLUDE(cpackEngineRPM)
INCLUDE(cpackEngineDEB)

155
build/CMakeLists.txt
View File

@ -1,155 +0,0 @@
# Copyright (C) 2006 MySQL AB
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
INCLUDE("${PROJECT_SOURCE_DIR}/win/mysql_manifest.cmake")
SET(CMAKE_CXX_FLAGS_DEBUG
"${CMAKE_CXX_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX -DUSE_SYMDIR /Zi")
SET(CMAKE_C_FLAGS_DEBUG
"${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX -DUSE_SYMDIR /Zi")
SET(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} /MAP /MAPINFO:EXPORTS")
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include
${CMAKE_SOURCE_DIR}/extra/yassl/include
${CMAKE_SOURCE_DIR}/sql
${CMAKE_SOURCE_DIR}/regex
${CMAKE_SOURCE_DIR}/zlib
)
SET_SOURCE_FILES_PROPERTIES(${CMAKE_SOURCE_DIR}/sql/sql_yacc.h
${CMAKE_SOURCE_DIR}/sql/sql_yacc.cc
${CMAKE_SOURCE_DIR}/include/mysql_version.h
${CMAKE_SOURCE_DIR}/sql/sql_builtin.cc
${CMAKE_SOURCE_DIR}/sql/lex_hash.h
${PROJECT_SOURCE_DIR}/include/mysqld_error.h
${PROJECT_SOURCE_DIR}/include/mysqld_ername.h
${PROJECT_SOURCE_DIR}/include/sql_state.h
PROPERTIES GENERATED 1)
ADD_DEFINITIONS(-DMYSQL_SERVER -D_CONSOLE -DHAVE_DLOPEN -DHAVE_EVENT_SCHEDULER)
SET (SQL_SOURCE
../sql-common/client.c derror.cc des_key_file.cc
discover.cc ../libmysql/errmsg.c field.cc field_conv.cc
filesort.cc gstream.cc
ha_partition.cc
handler.cc hash_filo.cc hash_filo.h
hostname.cc init.cc item.cc item_buff.cc item_cmpfunc.cc
item_create.cc item_func.cc item_geofunc.cc item_row.cc
item_strfunc.cc item_subselect.cc item_sum.cc item_timefunc.cc
item_window_function.cc item_create_window_function.cc
key.cc log.cc lock.cc message.rc
log_event.cc rpl_record.cc rpl_reporting.cc
log_event_old.cc rpl_record_old.cc
message.h mf_iocache.cc my_decimal.cc ../sql-common/my_time.c
mysqld.cc net_serv.cc
nt_servc.cc nt_servc.h opt_range.cc opt_range.h opt_sum.cc
../sql-common/pack.c parse_file.cc password.c procedure.cc
protocol.cc records.cc repl_failsafe.cc rpl_filter.cc set_var.cc
slave.cc sp.cc sp_cache.cc sp_head.cc sp_pcontext.cc
sp_rcontext.cc spatial.cc sql_acl.cc sql_analyse.cc sql_base.cc
sql_cache.cc sql_class.cc sql_client.cc sql_crypt.cc sql_crypt.h
sql_cursor.cc sql_db.cc sql_delete.cc sql_derived.cc sql_do.cc
sql_error.cc sql_handler.cc sql_help.cc sql_insert.cc sql_lex.cc
sql_list.cc sql_load.cc sql_manager.cc sql_map.cc sql_parse.cc
sql_partition.cc sql_plugin.cc sql_prepare.cc sql_rename.cc
sql_repl.cc sql_select.cc sql_show.cc sql_state.c sql_string.cc
sql_table.cc sql_test.cc sql_trigger.cc sql_udf.cc sql_union.cc
sql_update.cc sql_view.cc strfunc.cc table.cc thr_malloc.cc
time.cc tztime.cc uniques.cc unireg.cc item_xmlfunc.cc
rpl_tblmap.cc sql_binlog.cc event_scheduler.cc event_data_objects.cc
event_queue.cc event_db_repository.cc
sql_tablespace.cc events.cc ../sql-common/my_user.c
partition_info.cc rpl_utility.cc rpl_injector.cc sql_locale.cc
rpl_rli.cc rpl_mi.cc sql_servers.cc
sql_connect.cc scheduler.cc
sql_profile.cc event_parse_data.cc
${PROJECT_SOURCE_DIR}/sql/sql_yacc.cc
${PROJECT_SOURCE_DIR}/sql/sql_yacc.h
${PROJECT_SOURCE_DIR}/include/mysqld_error.h
${PROJECT_SOURCE_DIR}/include/mysqld_ername.h
${PROJECT_SOURCE_DIR}/include/sql_state.h
${PROJECT_SOURCE_DIR}/include/mysql_version.h
${PROJECT_SOURCE_DIR}/sql/sql_builtin.cc
${PROJECT_SOURCE_DIR}/sql/lex_hash.h)
ADD_LIBRARY(sql ${SQL_SOURCE})
IF (NOT EXISTS cmake_dummy.cc)
FILE (WRITE cmake_dummy.cc "")
ENDIF (NOT EXISTS cmake_dummy.cc)
ADD_EXECUTABLE(mysqld cmake_dummy.cc)
SET_TARGET_PROPERTIES(mysqld PROPERTIES OUTPUT_NAME mysqld${MYSQLD_EXE_SUFFIX})
SET_TARGET_PROPERTIES(mysqld PROPERTIES ENABLE_EXPORTS TRUE)
SET (MYSQLD_CORE_LIBS mysys zlib dbug strings yassl taocrypt vio regex sql)
TARGET_LINK_LIBRARIES(mysqld ${MYSQLD_CORE_LIBS} ${MYSQLD_STATIC_ENGINE_LIBS})
TARGET_LINK_LIBRARIES(mysqld ws2_32.lib)
IF(MSVC AND NOT WITHOUT_DYNAMIC_PLUGINS)
# Set module definition file. Also use non-incremental linker,
# incremental appears to crash from time to time,if used with /DEF option
SET_TARGET_PROPERTIES(mysqld PROPERTIES LINK_FLAGS "/DEF:mysqld.def /INCREMENTAL:NO")
FOREACH (CORELIB ${MYSQLD_CORE_LIBS})
GET_TARGET_PROPERTY(LOC ${CORELIB} LOCATION)
FILE(TO_NATIVE_PATH ${LOC} LOC)
SET (LIB_LOCATIONS ${LIB_LOCATIONS} ${LOC})
ENDFOREACH (CORELIB ${MYSQLD_CORE_LIBS})
ADD_CUSTOM_COMMAND(TARGET mysqld PRE_LINK
COMMAND cscript ARGS //nologo ${PROJECT_SOURCE_DIR}/win/create_def_file.js
${PLATFORM} ${LIB_LOCATIONS} > mysqld.def
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/sql)
ENDIF(MSVC AND NOT WITHOUT_DYNAMIC_PLUGINS)
ADD_DEPENDENCIES(sql GenError)
# Sql Parser custom command
ADD_CUSTOM_COMMAND(
OUTPUT ${PROJECT_SOURCE_DIR}/sql/sql_yacc.h
${PROJECT_SOURCE_DIR}/sql/sql_yacc.cc
COMMAND bison ARGS -y -p MYSQL --defines=sql_yacc.h
--output=sql_yacc.cc sql_yacc.yy
DEPENDS ${PROJECT_SOURCE_DIR}/sql/sql_yacc.yy)
# Gen_lex_hash
ADD_EXECUTABLE(gen_lex_hash gen_lex_hash.cc)
TARGET_LINK_LIBRARIES(gen_lex_hash debug dbug mysqlclient wsock32)
GET_TARGET_PROPERTY(GEN_LEX_HASH_EXE gen_lex_hash LOCATION)
ADD_CUSTOM_COMMAND(
OUTPUT ${PROJECT_SOURCE_DIR}/sql/lex_hash.h
COMMAND ${GEN_LEX_HASH_EXE} ARGS > lex_hash.h
DEPENDS ${GEN_LEX_HASH_EXE})
ADD_CUSTOM_TARGET(
GenServerSource ALL
DEPENDS ${PROJECT_SOURCE_DIR}/sql/sql_yacc.h
${PROJECT_SOURCE_DIR}/sql/sql_yacc.cc
${PROJECT_SOURCE_DIR}/sql/message.h
${PROJECT_SOURCE_DIR}/sql/message.rc
${PROJECT_SOURCE_DIR}/sql/lex_hash.h)
ADD_DEPENDENCIES(mysqld GenServerSource)
# Remove the auto-generated files as part of 'Clean Solution'
SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES
"lex_hash.h;sql_yacc.h;sql_yacc.cc;mysqld.def")
ADD_LIBRARY(udf_example MODULE udf_example.c udf_example.def)
ADD_DEPENDENCIES(udf_example strings GenError)
TARGET_LINK_LIBRARIES(udf_example strings wsock32)

16
dbcon/mysql/CMakeLists.txt
View File

@ -33,14 +33,20 @@ add_definitions(-DMYSQL_DYNAMIC_PLUGIN)
set_source_files_properties(ha_mcs.cpp PROPERTIES COMPILE_FLAGS "-fno-implicit-templates")
add_library(ha_columnstore SHARED ${libcalmysql_SRCS})
SET_TARGET_PROPERTIES(ha_columnstore PROPERTIES PREFIX "")
if (COMMAND mysql_add_plugin)
mysql_add_plugin(columnstore ${libcalmysql_SRCS} STORAGE_ENGINE MODULE_ONLY DEFAULT
LINK_LIBRARIES ${ENGINE_LDFLAGS} ${ENGINE_WRITE_LIBS} ${NETSNMP_LIBRARIES} ${SERVER_BUILD_DIR}/libservices/libmysqlservices.a threadpool
COMPONENT columnstore-engine)
else ()
add_library(ha_columnstore SHARED ${libcalmysql_SRCS})
SET_TARGET_PROPERTIES(ha_columnstore PROPERTIES PREFIX "")
target_link_libraries(ha_columnstore ${ENGINE_LDFLAGS} ${ENGINE_WRITE_LIBS} ${NETSNMP_LIBRARIES} ${SERVER_BUILD_DIR}/libservices/libmysqlservices.a threadpool)
target_link_libraries(ha_columnstore ${ENGINE_LDFLAGS} ${ENGINE_WRITE_LIBS} ${NETSNMP_LIBRARIES} ${SERVER_BUILD_DIR}/libservices/libmysqlservices.a threadpool)
set_target_properties(ha_columnstore PROPERTIES VERSION 1.0.0 SOVERSION 1)
set_target_properties(ha_columnstore PROPERTIES VERSION 1.0.0 SOVERSION 1)
install(TARGETS ha_columnstore DESTINATION ${MARIADB_PLUGINDIR} COMPONENT storage-engine)
install(TARGETS ha_columnstore DESTINATION ${MARIADB_PLUGINDIR} COMPONENT storage-engine)
endif ()
install(FILES syscatalog_mysql.sql
dumpcat_mysql.sql
calsetuserpriority.sql

2
exemgr/main.cpp
View File

@ -73,7 +73,7 @@
#include "liboamcpp.h"
#include "crashtrace.h"
#include "utils_utf8.h"
#include "config.h"
#include "mcsconfig.h"
#if defined(SKIP_OAM_INIT)
#include "dbrm.h"

6
config.h.in → mcsconfig.h.in
View File

@ -1,6 +1,6 @@
/* config.h.cmake */
#ifndef TEST_CONFIG_H
#define TEST_CONFIG_H
/* mcsconfig.h.cmake */
#ifndef TEST_MCSCONFIG_H
#define TEST_MCSCONFIG_H
/* Define to 1 to let the system come up without using OAM */
#cmakedefine SKIP_OAM_INIT 1

1
oam/oamcpp/CMakeLists.txt
View File

@ -16,4 +16,3 @@ set_target_properties(oamcpp PROPERTIES VERSION 1.0.0 SOVERSION 1)
install(TARGETS oamcpp DESTINATION ${ENGINE_LIBDIR} COMPONENT libs)

2
oam/oamcpp/liboamcpp.cpp
View File

@ -56,7 +56,7 @@
#ifdef _MSC_VER
#include "idbregistry.h"
#endif
#include "config.h"
#include "mcsconfig.h"
#include "installdir.h"
#include "dbrm.h"
#include "sessionmanager.h"

2
oam/oamcpp/oamcache.cpp
View File

@ -34,7 +34,7 @@ using namespace boost;
#include "exceptclasses.h"
#include "configcpp.h"
#include "installdir.h"
#include "config.h"
#include "mcsconfig.h"
namespace
{

2
oamapps/columnstoreSupport/columnstoreSupport.cpp
View File

@ -29,7 +29,7 @@
#include <netdb.h>
#include <readline/readline.h>
#include "config.h"
#include "mcsconfig.h"
#include "liboamcpp.h"
#include "configcpp.h"
#include "installdir.h"

2
oamapps/mcsadmin/mcsadmin.cpp
View File

@ -33,7 +33,7 @@ extern int h_errno;
#include <boost/scoped_ptr.hpp>
#include <boost/tokenizer.hpp>
#include "config.h"
#include "mcsconfig.h"
#include "sessionmanager.h"
#include "dbrm.h"
#include "messagequeue.h"

2
oamapps/postConfigure/helpers.cpp
View File

@ -25,7 +25,7 @@
#include <readline/readline.h>
#include "config.h"
#include "mcsconfig.h"
#include "configcpp.h"
using namespace config;

2
oamapps/postConfigure/installer.cpp
View File

@ -47,7 +47,7 @@
#include <netdb.h>
#include <sys/sysinfo.h>
#include "config.h"
#include "mcsconfig.h"
#include "liboamcpp.h"
#include "configcpp.h"

2
oamapps/postConfigure/mycnfUpgrade.cpp
View File

@ -51,7 +51,7 @@
#include <boost/regex.hpp>
#include "liboamcpp.h"
#include "installdir.h"
#include "config.h"
#include "mcsconfig.h"
using namespace std;
using namespace oam;

2
oamapps/postConfigure/postConfigure.cpp
View File

@ -68,7 +68,7 @@
#include <boost/filesystem/path.hpp>
#include <boost/tokenizer.hpp>
#include "config.h"
#include "mcsconfig.h"
#include "columnstoreversion.h"
#include "liboamcpp.h"
#include "configcpp.h"

2
primitives/blockcache/iomanager.cpp
View File

@ -28,7 +28,7 @@
//
//
#include "config.h"
#include "mcsconfig.h"
#define _FILE_OFFSET_BITS 64
#define _LARGEFILE64_SOURCE

2
procmgr/processmanager.cpp
View File

@ -25,7 +25,7 @@
#include <cassert>
#include "columnstoreversion.h"
#include "config.h"
#include "mcsconfig.h"
#include "processmanager.h"
#include "installdir.h"
#include "dbrm.h"

2
procmon/processmonitor.cpp
View File

@ -28,7 +28,7 @@
#include <boost/uuid/uuid_io.hpp>
#include "columnstoreversion.h"
#include "config.h"
#include "mcsconfig.h"
#include "IDBDataFile.h"
#include "IDBPolicy.h"
#include "processmonitor.h"

2
storage-manager/CMakeLists.txt
View File

@ -95,7 +95,7 @@ add_custom_command(
# The includes and lib linkages required to link against cloudio ...
# pretty crazy. When lib dependencies are eventually config'd right,
# change this to only include and link against cloudio.
include_directories(${CMAKE_SOURCE_DIR}/utils/cloudio ${ENGINE_COMMON_INCLUDES})
include_directories(${ENGINE_SRC_DIR}/utils/cloudio ${ENGINE_COMMON_INCLUDES})
add_executable(smcat src/smcat.cpp)
target_link_libraries(smcat storagemanager cloudio
${ENGINE_LDFLAGS}

2
storage-manager/src/Config.cpp
View File

@ -19,7 +19,7 @@
#include "Config.h"
// This one is the build system config
#include "config.h"
#include "mcsconfig.h"
#include <boost/thread/mutex.hpp>
#include <boost/property_tree/ini_parser.hpp>

2
tools/clearShm/main.cpp
View File

@ -18,7 +18,7 @@
// $Id: main.cpp 2101 2013-01-21 14:12:52Z rdempsey $
#include "config.h"
#include "mcsconfig.h"
#include <iostream>
#include <sys/types.h>

2
tools/dbbuilder/dbbuilder.cpp
View File

@ -28,7 +28,7 @@ using namespace std;
#include <boost/algorithm/string.hpp>
#include "config.h"
#include "mcsconfig.h"
#include "dbbuilder.h"
#include "systemcatalog.h"
#include "liboamcpp.h"

2
tools/qfe/returnedrows.cpp
View File

@ -9,7 +9,7 @@ using namespace std;
using namespace boost;
#ifndef _MSC_VER
#include "config.h"
#include "mcsconfig.h"
#endif
#include "socktype.h"

2
tools/qfe/server.cpp
View File

@ -55,7 +55,7 @@ using namespace std;
using namespace boost;
#ifndef _MSC_VER
#include "config.h"
#include "mcsconfig.h"
#endif
#include "socktype.h"

2
tools/qfe/socketio.cpp
View File

@ -22,7 +22,7 @@ using namespace std;
using namespace boost;
#ifndef _MSC_VER
#include "config.h"
#include "mcsconfig.h"
#endif
#include "exceptclasses.h"

2
utils/cloudio/CMakeLists.txt
View File

@ -1,4 +1,4 @@
include_directories(${ENGINE_COMMON_INCLUDES} ${CMAKE_SOURCE_DIR}/storage-manager/include)
include_directories(${ENGINE_COMMON_INCLUDES} ${ENGINE_SRC_DIR}/storage-manager/include)
set(cloudio_LIB_SRCS SMComm.cpp SMDataFile.cpp SMFileFactory.cpp SMFileSystem.cpp SocketPool.cpp cloud_plugin.cpp)

2
utils/configcpp/configcpp.cpp
View File

@ -19,7 +19,7 @@
* $Id: configcpp.cpp 3899 2013-06-17 20:54:10Z rdempsey $
*
******************************************************************************************/
#include "config.h"
#include "mcsconfig.h"
#include <string>
#include <stdexcept>

2
utils/configcpp/configstream.cpp
View File

@ -19,7 +19,7 @@
* $Id$
*
******************************************************************************************/
#include "config.h"
#include "mcsconfig.h"
#include <string>
#include <libxml/xmlmemory.h>

2
utils/configcpp/xmlparser.cpp
View File

@ -19,7 +19,7 @@
* $Id$
*
******************************************************************************************/
#include "config.h"
#include "mcsconfig.h"
#include <string>
#include <boost/algorithm/string.hpp>

1
utils/funcexp/CMakeLists.txt
View File

@ -114,4 +114,3 @@ set_target_properties(funcexp PROPERTIES VERSION 1.0.0 SOVERSION 1)
install(TARGETS funcexp DESTINATION ${ENGINE_LIBDIR} COMPONENT libs)

2
utils/loggingcpp/idberrorinfo.cpp
View File

@ -34,7 +34,7 @@ using namespace std;
#include <boost/thread.hpp>
using namespace boost;
#include "config.h"
#include "mcsconfig.h"
#include "configcpp.h"
using namespace config;
#include "loggingid.h"

2
utils/loggingcpp/message.cpp
View File

@ -34,7 +34,7 @@ using namespace std;
#include <boost/thread.hpp>
using namespace boost;
#include "config.h"
#include "mcsconfig.h"
#include "configcpp.h"
using namespace config;
#include "messageobj.h"

2
utils/messageqcpp/compressed_iss.cpp
View File

@ -20,7 +20,7 @@
*
*
***********************************************************************/
#include "config.h"
#include "mcsconfig.h"
#include <stdexcept>
#include <string>

2
utils/messageqcpp/inetstreamsocket.cpp
View File

@ -44,7 +44,7 @@ of the authors and should not be interpreted as representing official policies,
either expressed or implied, of the FreeBSD Project.
*/
#include "config.h"
#include "mcsconfig.h"
#include <cstdio>
#include <cerrno>

2
utils/multicast/socklib.h
View File

@ -20,7 +20,7 @@
#ifndef UDPCAST_CONFIG_H
# define UDPCAST_CONFIG_H
# include "config.h"
# include "mcsconfig.h"
#endif
#include <sys/types.h>

2
versioning/BRM/brmtypes.cpp
View File

@ -24,7 +24,7 @@
* Definitions of the functions declared in brmtypes.h
*/
#include "config.h"
#include "mcsconfig.h"
#include <errno.h>
#include <cstring>

2
writeengine/redistribute/we_redistributecontrolthread.cpp
View File

@ -37,7 +37,7 @@ using namespace std;
#include "boost/filesystem/operations.hpp"
using namespace boost;
#include "config.h"
#include "mcsconfig.h"
#include "installdir.h"
#include "configcpp.h"

2
writeengine/server/we_dataloader.cpp
View File

@ -25,7 +25,7 @@
* Author: Boby Paul: bpaul@calpont.com
*/
#include "config.h" // Used to pickup STRERROR_R_CHAR_P definition
#include "mcsconfig.h" // Used to pickup STRERROR_R_CHAR_P definition
#include <cstdlib>
#include <csignal>

2
writeengine/shared/we_convertor.cpp
View File

@ -27,7 +27,7 @@
#ifdef _MSC_VER
#include <cstdio>
#endif
#include "config.h"
#include "mcsconfig.h"
#include "we_convertor.h"

2
writeengine/shared/we_fileop.cpp
View File

@ -17,7 +17,7 @@
// $Id: we_fileop.cpp 4737 2013-08-14 20:45:46Z bwilkinson $
#include "config.h"
#include "mcsconfig.h"
#include <unistd.h>
#include <stdio.h>
#include <string.h>

2
writeengine/splitter/we_sdhandler.cpp
View File

@ -43,7 +43,7 @@ using namespace std;
#include <boost/thread.hpp>
using namespace boost;
#include "config.h"
#include "mcsconfig.h"
#include "configcpp.h"
using namespace config;