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

Builds!

Browse Source
This commit is contained in:
Sergei Golubchik
2016-06-03 19:54:24 +03:00
parent 91a0629d15
commit 23f8cb50b9
13 changed files with 76 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
.gitignore vendored
View File

@ -36,13 +36,48 @@ dbcon/ddlpackage/ddl-gram.cpp
dbcon/ddlpackage/ddl-gram.h dbcon/ddlpackage/ddl-gram.h
dbcon/dmlpackage/dml-gram.cpp dbcon/dmlpackage/dml-gram.cpp
dbcon/dmlpackage/dml-gram.h dbcon/dmlpackage/dml-gram.h
ddlproc/DDLProc
decomsvr/DecomSvr
dmlproc/DMLProc
exemgr/ExeMgr
oamapps/calpontDB/calpontDBWrite
oamapps/calpontSupport/calpontSupport
oamapps/mcsadmin/mcsadmin
oamapps/postConfigure/amazonInstaller
oamapps/postConfigure/installer
oamapps/postConfigure/mycnfUpgrade
oamapps/postConfigure/patchInstaller
oamapps/postConfigure/postConfigure
oamapps/sendtrap/sendtrap
oamapps/serverMonitor/ServerMonitor
oamapps/traphandler/trapHandler
primitives/primproc/PrimProc
procmgr/ProcMgr
procmon/ProcMon
tools/clearShm/clearShm
tools/cleartablelock/cleartablelock
tools/configMgt/autoConfigure
tools/configMgt/autoInstaller
tools/configMgt/svnQuery
tools/cplogger/cplogger
tools/dbbuilder/dbbuilder
tools/dbloadxml/colxml
tools/ddlcleanup/ddlcleanup
tools/editem/editem
tools/getConfig/getConfig
tools/idbmeminfo/idbmeminfo
tools/setConfig/setConfig
tools/viewtablelock/viewtablelock
versioning/BRM/autoinctest versioning/BRM/autoinctest
versioning/BRM/copylocktest
versioning/BRM/tablelocktest
versioning/BRM/controllernode versioning/BRM/controllernode
versioning/BRM/copylocktest
versioning/BRM/dbrmctl versioning/BRM/dbrmctl
versioning/BRM/load_brm versioning/BRM/load_brm
versioning/BRM/reset_locks versioning/BRM/reset_locks
versioning/BRM/rollback versioning/BRM/rollback
versioning/BRM/save_brm versioning/BRM/save_brm
versioning/BRM/tablelocktest
versioning/BRM/workernode versioning/BRM/workernode
writeengine/bulk/cpimport.bin
writeengine/server/WriteEngineServer
writeengine/splitter/cpimport

57
Makefile.am
View File

@ -75,37 +75,32 @@ all-local: bootstrap
# $(MAKE) -C writeengine/bulk install_bulk # $(MAKE) -C writeengine/bulk install_bulk
# $(MAKE) -C writeengine/splitter install_splitter # $(MAKE) -C writeengine/splitter install_splitter
# echo $(CXXFLAGS) $(DEBUG_FLAGS) > buildFlags # echo $(CXXFLAGS) $(DEBUG_FLAGS) > buildFlags
cd utils && $(MAKE) $(MAKE) -C utils
cd oam; \ $(MAKE) -C oam/oamcpp
$(MAKE) -C oamcpp $(MAKE) -C snmpd
cd snmpd && $(MAKE) $(MAKE) -C dbcon/execplan
cd dbcon; \ $(MAKE) -C dbcon/joblist
$(MAKE) -C execplan; \ $(MAKE) -C versioning
$(MAKE) -C joblist $(MAKE) -C oam
cd versioning && $(MAKE) $(MAKE) -C versioning dbrm tools
cd oam && $(MAKE) $(MAKE) -C writeengine/wrapper
cd versioning && $(MAKE) dbrm tools $(MAKE) -C writeengine/client
cd writeengine; \ $(MAKE) -C writeengine/xml
$(MAKE) -C wrapper; \ $(MAKE) -C writeengine/redistribute
$(MAKE) -C client; \ $(MAKE) -C dbcon/ddlpackage
$(MAKE) -C xml; \ $(MAKE) -C dbcon/ddlpackageproc
$(MAKE) -C redistribute $(MAKE) -C dbcon/dmlpackage
cd dbcon; \ $(MAKE) -C dbcon/dmlpackageproc
$(MAKE) -C ddlpackage; \ $(MAKE) -C dbcon
$(MAKE) -C ddlpackageproc; \ $(MAKE) -C exemgr
$(MAKE) -C dmlpackage; \ $(MAKE) -C ddlproc
$(MAKE) -C dmlpackageproc $(MAKE) -C dmlproc
cd dbcon && $(MAKE) $(MAKE) -C procmon
cd exemgr && $(MAKE) $(MAKE) -C procmgr
cd ddlproc && $(MAKE) $(MAKE) -C oamapps
cd dmlproc && $(MAKE) $(MAKE) -C decomsvr
cd procmon && $(MAKE) $(MAKE) -C primitives
cd procmgr && $(MAKE) $(MAKE) -C tools
cd oamapps && $(MAKE)
cd decomsvr && $(MAKE)
cd primitives && $(MAKE)
cd tools && $(MAKE)
cd versioning && $(MAKE) tools
$(MAKE) -C writeengine/server $(MAKE) -C writeengine/server
$(MAKE) -C writeengine/bulk $(MAKE) -C writeengine/bulk
$(MAKE) -C writeengine/splitter $(MAKE) -C writeengine/splitter

4
configure.ac
View File

@ -165,8 +165,8 @@ AC_SUBST([idb_common_libs], ['${abs_top_builddir}/utils/messageqcpp/libmessageqc
AC_SUBST([idb_oam_libs], ['${abs_top_builddir}/oam/oamcpp/liboamcpp.la ${abs_top_builddir}/snmpd/snmpmanager/libsnmpmanager.la ${netsnmp_libs}']) AC_SUBST([idb_oam_libs], ['${abs_top_builddir}/oam/oamcpp/liboamcpp.la ${abs_top_builddir}/snmpd/snmpmanager/libsnmpmanager.la ${netsnmp_libs}'])
AC_SUBST([idb_brm_libs], ['${abs_top_builddir}/versioning/BRM/libbrm.la ${abs_top_builddir}/utils/idbdatafile/libidbdatafile.la ${abs_top_builddir}/utils/cacheutils/libcacheutils.la ${abs_top_builddir}/utils/rwlock/librwlock.la ${idb_oam_libs} ${idb_common_libs}']) AC_SUBST([idb_brm_libs], ['${abs_top_builddir}/versioning/BRM/libbrm.la ${abs_top_builddir}/utils/idbdatafile/libidbdatafile.la ${abs_top_builddir}/utils/cacheutils/libcacheutils.la ${abs_top_builddir}/utils/rwlock/librwlock.la ${idb_oam_libs} ${idb_common_libs}'])
AC_SUBST([idb_exec_libs], ['${abs_top_builddir}/dbcon/joblist/libjoblist.la ${abs_top_builddir}/dbcon/execplan/libexecplan.la ${abs_top_builddir}/utils/windowfunction/libwindowfunction.la ${abs_top_builddir}/utils/joiner/libjoiner.la ${abs_top_builddir}/utils/rowgroup/librowgroup.la ${abs_top_builddir}/utils/funcexp/libfuncexp.la ${abs_top_builddir}/utils/udfsdk/libudfsdk.la ${abs_top_builddir}/utils/dataconvert/libdataconvert.la ${abs_top_builddir}/utils/common/libcommon.la ${abs_top_builddir}/utils/compress/libcompress.la ${abs_top_builddir}/utils/mysqlcl_idb/libmysqlcl_idb.la ${abs_top_builddir}/utils/querystats/libquerystats.la ${abs_top_builddir}/utils/querytele/libquerytele.la ${abs_top_builddir}/utils/thrift/libthrift.la ${abs_top_builddir}/utils/threadpool/libthreadpool.la ${idb_brm_libs}']) AC_SUBST([idb_exec_libs], ['${abs_top_builddir}/dbcon/joblist/libjoblist.la ${abs_top_builddir}/dbcon/execplan/libexecplan.la ${abs_top_builddir}/utils/windowfunction/libwindowfunction.la ${abs_top_builddir}/utils/joiner/libjoiner.la ${abs_top_builddir}/utils/rowgroup/librowgroup.la ${abs_top_builddir}/utils/funcexp/libfuncexp.la ${abs_top_builddir}/utils/udfsdk/libudfsdk.la ${abs_top_builddir}/utils/dataconvert/libdataconvert.la ${abs_top_builddir}/utils/common/libcommon.la ${abs_top_builddir}/utils/compress/libcompress.la ${abs_top_builddir}/utils/mysqlcl_idb/libmysqlcl_idb.la ${abs_top_builddir}/utils/querystats/libquerystats.la ${abs_top_builddir}/utils/querytele/libquerytele.la ${abs_top_builddir}/utils/thrift/libthrift.la ${abs_top_builddir}/utils/threadpool/libthreadpool.la ${idb_brm_libs}'])
AC_SUBST([idb_write_libs], ['-lddlpackageproc -lddlpackage -ldmlpackageproc -ldmlpackage -lwriteengine -lwriteengineclient -lidbdatafile -lcacheutils ${idb_exec_libs}']) AC_SUBST([idb_write_libs], ['${abs_top_builddir}/dbcon/ddlpackageproc/libddlpackageproc.la ${abs_top_builddir}/dbcon/ddlpackage/libddlpackage.la ${abs_top_builddir}/dbcon/dmlpackageproc/libdmlpackageproc.la ${abs_top_builddir}/dbcon/dmlpackage/libdmlpackage.la ${abs_top_builddir}/writeengine/wrapper/libwriteengine.la ${abs_top_builddir}/writeengine/client/libwriteengineclient.la ${abs_top_builddir}/utils/idbdatafile/libidbdatafile.la ${abs_top_builddir}/utils/cacheutils/libcacheutils.la ${idb_exec_libs}'])
AC_SUBST([idb_common_includes], ['-I${abs_top_builddir}/utils/libxml -I${abs_top_builddir}/utils/messageqcpp -I${abs_top_builddir}/writeengine/shared -I${abs_top_builddir}/utils/idbdatafile -I${abs_top_builddir}/utils/loggingcpp -I${abs_top_builddir}/utils/configcpp -I${abs_top_builddir}/utils/compress -I${abs_top_builddir}/versioning/BRM -I${abs_top_builddir}/utils/rowgroup -I${abs_top_builddir}/utils/common -I${abs_top_builddir}/utils/dataconvert -I${abs_top_builddir}/utils/rwlock -I${abs_top_builddir}/utils/funcexp -I${abs_top_builddir}/snmpd/snmpmanager -I${abs_top_builddir}/utils -I${abs_top_builddir}/oam/oamcpp -I${abs_top_builddir}/dbcon/ddlpackageproc -I${abs_top_builddir}/dbcon/ddlpackage -I${abs_top_builddir}/dbcon/execplan -I${abs_top_builddir}/utils/startup -I${abs_top_builddir}/dbcon/joblist -I${abs_top_builddir}/writeengine/wrapper -I${abs_top_builddir}/writeengine/server -I${abs_top_builddir}/dbcon/dmlpackage -I${abs_top_builddir}/writeengine/client -I${abs_top_builddir}/utils/cacheutils -I${abs_top_builddir}/utils/mysqlcl_idb -I${abs_top_builddir}/utils/querytele -I${abs_top_builddir}/utils/boost_idb -I${abs_top_builddir}/utils/thrift -I${abs_top_builddir}/utils/joiner -I${abs_top_builddir}/utils/querystats']) AC_SUBST([idb_common_includes], ['-I${abs_top_builddir}/utils/libxml -I${abs_top_builddir}/utils/messageqcpp -I${abs_top_builddir}/writeengine/shared -I${abs_top_builddir}/utils/idbdatafile -I${abs_top_builddir}/utils/loggingcpp -I${abs_top_builddir}/utils/configcpp -I${abs_top_builddir}/utils/compress -I${abs_top_builddir}/versioning/BRM -I${abs_top_builddir}/utils/rowgroup -I${abs_top_builddir}/utils/common -I${abs_top_builddir}/utils/dataconvert -I${abs_top_builddir}/utils/rwlock -I${abs_top_builddir}/utils/funcexp -I${abs_top_builddir}/snmpd/snmpmanager -I${abs_top_builddir}/utils -I${abs_top_builddir}/oam/oamcpp -I${abs_top_builddir}/dbcon/ddlpackageproc -I${abs_top_builddir}/dbcon/ddlpackage -I${abs_top_builddir}/dbcon/execplan -I${abs_top_builddir}/utils/startup -I${abs_top_builddir}/dbcon/joblist -I${abs_top_builddir}/writeengine/wrapper -I${abs_top_builddir}/writeengine/server -I${abs_top_builddir}/dbcon/dmlpackage -I${abs_top_builddir}/writeengine/client -I${abs_top_builddir}/dbcon/dmlpackageproc -I${abs_top_builddir}/utils/cacheutils -I${abs_top_builddir}/utils/mysqlcl_idb -I${abs_top_builddir}/utils/querytele -I${abs_top_builddir}/utils/boost_idb -I${abs_top_builddir}/utils/thrift -I${abs_top_builddir}/utils/joiner -I${abs_top_builddir}/utils/threadpool -I${abs_top_builddir}/utils/batchloader -I${abs_top_builddir}/utils/ddlcleanup -I${abs_top_builddir}/utils/querystats -I${abs_top_builddir}/writeengine/xml -I${abs_top_builddir}/../mariadb-columnstore-server/sql -I${abs_top_builddir}/../mariadb-columnstore-server/include -I${abs_top_builddir}/../mariadb-columnstore-server/pcre'])
AC_SUBST([idb_common_ldflags], ['']) AC_SUBST([idb_common_ldflags], [''])
AC_CONFIG_FILES([ AC_CONFIG_FILES([

2
dbcon/mysql/ha_calpont.h
View File

@ -37,7 +37,7 @@
#ifndef HA_CALPONT_H__ #ifndef HA_CALPONT_H__
#define HA_CALPONT_H__ #define HA_CALPONT_H__
//#include <my_config.h> #include <my_config.h>
#include "idb_mysql.h" #include "idb_mysql.h"
/** @brief /** @brief

4
dbcon/mysql/idb_mysql.h
View File

@ -33,13 +33,15 @@ template <class T> bool isnan(T);
#undef LOG_INFO #undef LOG_INFO
#ifdef _MSC_VER
#ifdef _DEBUG #ifdef _DEBUG
#define SAFEMALLOC #define SAFEMALLOC
#define DBUG_ON 1 #define DBUG_ON 1
#undef DBUG_OFF
#else #else
#define DBUG_OFF 1 #define DBUG_OFF 1
#undef DBUG_ON
#endif #endif
#ifdef _MSC_VER
#define MYSQL_DYNAMIC_PLUGIN #define MYSQL_DYNAMIC_PLUGIN
#define DONT_DEFINE_VOID #define DONT_DEFINE_VOID
#ifdef ETIMEDOUT #ifdef ETIMEDOUT

2
decomsvr/Makefile.am
View File

@ -25,7 +25,7 @@ AM_LDFLAGS = $(idb_ldflags)
bin_PROGRAMS = DecomSvr bin_PROGRAMS = DecomSvr
DecomSvr_SOURCES = quicklz.c server.cpp DecomSvr_SOURCES = quicklz.c server.cpp
DecomSvr_CPPFLAGS = $(idb_common_includes) $(AM_CPPFLAGS) DecomSvr_CPPFLAGS = $(idb_common_includes) $(AM_CPPFLAGS)
DecomSvr_LDFLAGS = $(idb_common_ldflags) -lboost_idb $(AM_LDFLAGS) -lpthread -lrt DecomSvr_LDFLAGS = $(idb_common_ldflags) ${abs_top_builddir}/utils/boost_idb/libboost_idb.la $(AM_LDFLAGS) -lpthread -lrt
test: test:

2
dmlproc/Makefile.am
View File

@ -24,7 +24,7 @@ AM_CXXFLAGS = $(idb_cxxflags)
AM_LDFLAGS = $(idb_ldflags) AM_LDFLAGS = $(idb_ldflags)
bin_PROGRAMS = DMLProc bin_PROGRAMS = DMLProc
DMLProc_SOURCES = dmlproc.cpp dmlprocessor.cpp dmlresultbuffer.cpp batchinsertprocessor.cpp DMLProc_SOURCES = dmlproc.cpp dmlprocessor.cpp dmlresultbuffer.cpp batchinsertprocessor.cpp
DMLProc_LDFLAGS = $(idb_common_ldflags) $(idb_write_libs) -lthreadpool -lddlcleanuputil -lbatchloader $(AM_LDFLAGS) DMLProc_LDFLAGS = $(idb_common_ldflags) $(idb_write_libs) ${abs_top_builddir}/utils/threadpool/libthreadpool.la ${abs_top_builddir}/utils/ddlcleanup/libddlcleanuputil.la ${abs_top_builddir}/utils/batchloader/libbatchloader.la $(AM_LDFLAGS)
test: test:

1
primitives/primproc/primitiveserver.h
View File

@ -41,7 +41,6 @@
#include "blockrequestprocessor.h" #include "blockrequestprocessor.h"
#include "batchprimitiveprocessor.h" #include "batchprimitiveprocessor.h"
#include "winport.h"
//#define PRIMPROC_STOPWATCH //#define PRIMPROC_STOPWATCH
#ifdef PRIMPROC_STOPWATCH #ifdef PRIMPROC_STOPWATCH
#include "stopwatch.h" #include "stopwatch.h"

2
tools/ddlcleanup/Makefile.am
View File

@ -25,7 +25,7 @@ AM_LDFLAGS = $(idb_ldflags)
bin_PROGRAMS = ddlcleanup bin_PROGRAMS = ddlcleanup
ddlcleanup_SOURCES = ddlcleanup.cpp ddlcleanup_SOURCES = ddlcleanup.cpp
ddlcleanup_CPPFLAGS = $(idb_common_includes) $(AM_CPPFLAGS) ddlcleanup_CPPFLAGS = $(idb_common_includes) $(AM_CPPFLAGS)
ddlcleanup_LDFLAGS = $(idb_common_ldflags) $(idb_write_libs) -lddlcleanuputil $(AM_LDFLAGS) ddlcleanup_LDFLAGS = $(idb_common_ldflags) $(idb_write_libs) ${abs_top_builddir}/utils/ddlcleanup/libddlcleanuputil.la $(AM_LDFLAGS)
test: test:

2
writeengine/server/Makefile.am
View File

@ -34,7 +34,7 @@ we_cleartablelockcmd.cpp \
we_cpifeederthread.cpp \ we_cpifeederthread.cpp \
we_getfilesizes.cpp we_getfilesizes.cpp
include_HEADERS = we_messages.h include_HEADERS = we_messages.h
WriteEngineServer_LDFLAGS = $(idb_common_ldflags) $(idb_exec_libs) -lthreadpool -lwriteengineredistribute $(idb_write_libs) $(AM_LDFLAGS) WriteEngineServer_LDFLAGS = $(idb_common_ldflags) $(idb_exec_libs) ${abs_top_builddir}/utils/threadpool/libthreadpool.la ${abs_top_builddir}/writeengine/redistribute/libwriteengineredistribute.la $(idb_write_libs) $(AM_LDFLAGS)
install_server: install install_server: install

2
writeengine/server/we_readthread.cpp
View File

@ -35,7 +35,7 @@ using namespace threadpool;
#include "we_message_handlers.h" #include "we_message_handlers.h"
#include "we_ddlcommandproc.h" #include "we_ddlcommandproc.h"
#include "we_dmlcommandproc.h" #include "we_dmlcommandproc.h"
#include "we_redistribute.h" #include "../redistribute/we_redistribute.h"
#include "we_config.h" #include "we_config.h"
#include "stopwatch.h" #include "stopwatch.h"
using namespace logging; using namespace logging;

2
writeengine/shared/we_chunkmanager.cpp
View File

@ -40,7 +40,7 @@ using namespace std;
#include "we_config.h" #include "we_config.h"
#include "we_confirmhdfsdbfile.h" #include "we_confirmhdfsdbfile.h"
#include "we_fileop.h" #include "we_fileop.h"
#include "we_dctnry.h" #include "../dictionary/we_dctnry.h"
#include "we_stats.h" #include "we_stats.h"
using namespace execplan; using namespace execplan;

2
writeengine/splitter/Makefile.am
View File

@ -32,7 +32,7 @@ we_splclient.cpp \
we_brmupdater.cpp \ we_brmupdater.cpp \
we_tablelockgrabber.cpp \ we_tablelockgrabber.cpp \
we_xmlgetter.cpp we_xmlgetter.cpp
cpimport_LDFLAGS = $(idb_common_ldflags) $(idb_exec_libs) $(idb_write_libs) -lbatchloader -lthreadpool $(AM_LDFLAGS) cpimport_LDFLAGS = $(idb_common_ldflags) $(idb_exec_libs) $(idb_write_libs) ${abs_top_builddir}/utils/batchloader/libbatchloader.la ${abs_top_builddir}/utils/threadpool/libthreadpool.la $(AM_LDFLAGS)
install_splitter: install install_splitter: install