database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-30 19:23:07 +03:00
Code Activity

minor fixups

Browse Source
This commit is contained in:
David Mott
2019-05-04 02:14:40 -05:00
parent e078a416ec
commit 9022fa426d
4 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
CMakeLists.txt
View File

@ -63,6 +63,7 @@ if(SERVER_BUILD_DIR)
endif() endif()
INCLUDE(ExternalProject) INCLUDE(ExternalProject)
INCLUDE(CheckCXXSourceCompiles)
SET(CMAKE_CXX_STANDARD 11) SET(CMAKE_CXX_STANDARD 11)
SET(CMAKE_CXX_STANDARD_REQUIRED TRUE) SET(CMAKE_CXX_STANDARD_REQUIRED TRUE)
@ -76,8 +77,12 @@ SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/lib)
SET_PROPERTY(DIRECTORY PROPERTY EP_BASE ${CMAKE_CURRENT_BINARY_DIR}/external) SET_PROPERTY(DIRECTORY PROPERTY EP_BASE ${CMAKE_CURRENT_BINARY_DIR}/external)
LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/cmake) LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/cmake)
find_package(Boost 1.53.0 REQUIRED COMPONENTS system filesystem thread regex date_time) FIND_PACKAGE(Boost 1.53.0 REQUIRED COMPONENTS system filesystem thread regex date_time)
find_package(BISON REQUIRED) FIND_PACKAGE(BISON REQUIRED)
check_cxx_source_compiles("#include <filesystem>\n void main(){}" HAS_STD_FILESYSTEM)
check_cxx_source_compiles("#include <experimental/filesystem>\n void main(){}" HAS_STD_EXPERIMENTAL_FILESYSTEM)
INCLUDE(columnstore_version) INCLUDE(columnstore_version)
SET (PACKAGE columnstore) SET (PACKAGE columnstore)

4
exemgr/CMakeLists.txt
View File

@ -8,9 +8,11 @@ set(ExeMgr_SRCS main.cpp activestatementcounter.cpp femsghandler.cpp ../utils/co
add_executable(ExeMgr ${ExeMgr_SRCS}) add_executable(ExeMgr ${ExeMgr_SRCS})
target_link_libraries(ExeMgr ${ENGINE_LDFLAGS} ${ENGINE_EXEC_LIBS} ${NETSNMP_LIBRARIES} ${MARIADB_CLIENT_LIBS} cacheutils threadpool stdc++fs) target_link_libraries(ExeMgr ${ENGINE_LDFLAGS} ${ENGINE_EXEC_LIBS} ${NETSNMP_LIBRARIES} ${MARIADB_CLIENT_LIBS} cacheutils threadpool)
target_include_directories(ExeMgr PRIVATE ${Boost_INCLUDE_DIRS})
target_compile_features(ExeMgr PRIVATE )
install(TARGETS ExeMgr DESTINATION ${ENGINE_BINDIR} COMPONENT platform) install(TARGETS ExeMgr DESTINATION ${ENGINE_BINDIR} COMPONENT platform)

8
exemgr/main.cpp
View File

@ -43,14 +43,14 @@
#include <mutex> #include <mutex>
#include <experimental/filesystem>
#include <iostream> #include <iostream>
#include <cstdint> #include <cstdint>
#include <csignal> #include <csignal>
#include <sys/resource.h> #include <sys/resource.h>
#include <boost/filesystem.hpp>
#include "calpontselectexecutionplan.h" #include "calpontselectexecutionplan.h"
#include "activestatementcounter.h" #include "activestatementcounter.h"
#include "distributedenginecomm.h" #include "distributedenginecomm.h"
@ -1365,8 +1365,8 @@ void cleanTempDir()
/* This is quite scary as ExeMgr usually runs as root */ /* This is quite scary as ExeMgr usually runs as root */
try try
{ {
std::experimental::filesystem::remove_all(tmpPrefix); boost::filesystem::remove_all(tmpPrefix);
std::experimental::filesystem::create_directories(tmpPrefix); boost::filesystem::create_directories(tmpPrefix);
} }
catch (const std::exception& ex) catch (const std::exception& ex)
{ {

13
utils/rowgroup/rowaggregation.cpp
View File

@ -29,6 +29,8 @@
#include <stdexcept> #include <stdexcept>
#include <limits> #include <limits>
#include <typeinfo> #include <typeinfo>
#include <cassert>
#include "joblisttypes.h" #include "joblisttypes.h"
#include "resourcemanager.h" #include "resourcemanager.h"
#include "groupconcat.h" #include "groupconcat.h"
@ -51,20 +53,13 @@
//..comment out NDEBUG to enable assertions, uncomment NDEBUG to disable //..comment out NDEBUG to enable assertions, uncomment NDEBUG to disable
//#define NDEBUG //#define NDEBUG
#include <cassert> #include "funcexp/utils_utf8.h"
using namespace std; using namespace std;
using namespace boost; using namespace boost;
using namespace dataconvert; using namespace dataconvert;
namespace funcexp
{
namespace utf8
{
int idb_strcoll(const char*, const char*);
}
}
// inlines of RowAggregation that used only in this file // inlines of RowAggregation that used only in this file
namespace namespace