From 23f8cb50b9769aff0eca007525760c28a662f046 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Fri, 3 Jun 2016 19:54:24 +0300 Subject: [PATCH] Builds! --- .gitignore | 39 +++++++++++++++++- Makefile.am | 57 ++++++++++++-------------- configure.ac | 4 +- dbcon/mysql/ha_calpont.h | 2 +- dbcon/mysql/idb_mysql.h | 4 +- decomsvr/Makefile.am | 2 +- dmlproc/Makefile.am | 2 +- primitives/primproc/primitiveserver.h | 1 - tools/ddlcleanup/Makefile.am | 2 +- writeengine/server/Makefile.am | 2 +- writeengine/server/we_readthread.cpp | 2 +- writeengine/shared/we_chunkmanager.cpp | 2 +- writeengine/splitter/Makefile.am | 2 +- 13 files changed, 76 insertions(+), 45 deletions(-) diff --git a/.gitignore b/.gitignore index 9fa5c8312..e65ea2d0d 100644 --- a/.gitignore +++ b/.gitignore @@ -36,13 +36,48 @@ dbcon/ddlpackage/ddl-gram.cpp dbcon/ddlpackage/ddl-gram.h dbcon/dmlpackage/dml-gram.cpp 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/copylocktest -versioning/BRM/tablelocktest versioning/BRM/controllernode +versioning/BRM/copylocktest versioning/BRM/dbrmctl versioning/BRM/load_brm versioning/BRM/reset_locks versioning/BRM/rollback versioning/BRM/save_brm +versioning/BRM/tablelocktest versioning/BRM/workernode +writeengine/bulk/cpimport.bin +writeengine/server/WriteEngineServer +writeengine/splitter/cpimport diff --git a/Makefile.am b/Makefile.am index e7762c5f2..6659cb5cc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -75,37 +75,32 @@ all-local: bootstrap # $(MAKE) -C writeengine/bulk install_bulk # $(MAKE) -C writeengine/splitter install_splitter # echo $(CXXFLAGS) $(DEBUG_FLAGS) > buildFlags - cd utils && $(MAKE) - cd oam; \ - $(MAKE) -C oamcpp - cd snmpd && $(MAKE) - cd dbcon; \ - $(MAKE) -C execplan; \ - $(MAKE) -C joblist - cd versioning && $(MAKE) - cd oam && $(MAKE) - cd versioning && $(MAKE) dbrm tools - cd writeengine; \ - $(MAKE) -C wrapper; \ - $(MAKE) -C client; \ - $(MAKE) -C xml; \ - $(MAKE) -C redistribute - cd dbcon; \ - $(MAKE) -C ddlpackage; \ - $(MAKE) -C ddlpackageproc; \ - $(MAKE) -C dmlpackage; \ - $(MAKE) -C dmlpackageproc - cd dbcon && $(MAKE) - cd exemgr && $(MAKE) - cd ddlproc && $(MAKE) - cd dmlproc && $(MAKE) - cd procmon && $(MAKE) - cd procmgr && $(MAKE) - cd oamapps && $(MAKE) - cd decomsvr && $(MAKE) - cd primitives && $(MAKE) - cd tools && $(MAKE) - cd versioning && $(MAKE) tools + $(MAKE) -C utils + $(MAKE) -C oam/oamcpp + $(MAKE) -C snmpd + $(MAKE) -C dbcon/execplan + $(MAKE) -C dbcon/joblist + $(MAKE) -C versioning + $(MAKE) -C oam + $(MAKE) -C versioning dbrm tools + $(MAKE) -C writeengine/wrapper + $(MAKE) -C writeengine/client + $(MAKE) -C writeengine/xml + $(MAKE) -C writeengine/redistribute + $(MAKE) -C dbcon/ddlpackage + $(MAKE) -C dbcon/ddlpackageproc + $(MAKE) -C dbcon/dmlpackage + $(MAKE) -C dbcon/dmlpackageproc + $(MAKE) -C dbcon + $(MAKE) -C exemgr + $(MAKE) -C ddlproc + $(MAKE) -C dmlproc + $(MAKE) -C procmon + $(MAKE) -C procmgr + $(MAKE) -C oamapps + $(MAKE) -C decomsvr + $(MAKE) -C primitives + $(MAKE) -C tools $(MAKE) -C writeengine/server $(MAKE) -C writeengine/bulk $(MAKE) -C writeengine/splitter diff --git a/configure.ac b/configure.ac index fa6cbae1e..623f2f9fc 100644 --- a/configure.ac +++ b/configure.ac @@ -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_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_write_libs], ['-lddlpackageproc -lddlpackage -ldmlpackageproc -ldmlpackage -lwriteengine -lwriteengineclient -lidbdatafile -lcacheutils ${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_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}/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_CONFIG_FILES([ diff --git a/dbcon/mysql/ha_calpont.h b/dbcon/mysql/ha_calpont.h index 6c53c6786..8aafcb08b 100755 --- a/dbcon/mysql/ha_calpont.h +++ b/dbcon/mysql/ha_calpont.h @@ -37,7 +37,7 @@ #ifndef HA_CALPONT_H__ #define HA_CALPONT_H__ -//#include +#include #include "idb_mysql.h" /** @brief diff --git a/dbcon/mysql/idb_mysql.h b/dbcon/mysql/idb_mysql.h index 80b1ec844..b12d51cf5 100644 --- a/dbcon/mysql/idb_mysql.h +++ b/dbcon/mysql/idb_mysql.h @@ -33,13 +33,15 @@ template bool isnan(T); #undef LOG_INFO -#ifdef _MSC_VER #ifdef _DEBUG #define SAFEMALLOC #define DBUG_ON 1 +#undef DBUG_OFF #else #define DBUG_OFF 1 +#undef DBUG_ON #endif +#ifdef _MSC_VER #define MYSQL_DYNAMIC_PLUGIN #define DONT_DEFINE_VOID #ifdef ETIMEDOUT diff --git a/decomsvr/Makefile.am b/decomsvr/Makefile.am index d54366715..8cb5e32ee 100644 --- a/decomsvr/Makefile.am +++ b/decomsvr/Makefile.am @@ -25,7 +25,7 @@ AM_LDFLAGS = $(idb_ldflags) bin_PROGRAMS = DecomSvr DecomSvr_SOURCES = quicklz.c server.cpp 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: diff --git a/dmlproc/Makefile.am b/dmlproc/Makefile.am index 1fe1c2666..b019df46b 100644 --- a/dmlproc/Makefile.am +++ b/dmlproc/Makefile.am @@ -24,7 +24,7 @@ AM_CXXFLAGS = $(idb_cxxflags) AM_LDFLAGS = $(idb_ldflags) bin_PROGRAMS = DMLProc 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: diff --git a/primitives/primproc/primitiveserver.h b/primitives/primproc/primitiveserver.h index 592dd30c3..7404e8603 100644 --- a/primitives/primproc/primitiveserver.h +++ b/primitives/primproc/primitiveserver.h @@ -41,7 +41,6 @@ #include "blockrequestprocessor.h" #include "batchprimitiveprocessor.h" -#include "winport.h" //#define PRIMPROC_STOPWATCH #ifdef PRIMPROC_STOPWATCH #include "stopwatch.h" diff --git a/tools/ddlcleanup/Makefile.am b/tools/ddlcleanup/Makefile.am index 9cf899909..ccdbf17b7 100644 --- a/tools/ddlcleanup/Makefile.am +++ b/tools/ddlcleanup/Makefile.am @@ -25,7 +25,7 @@ AM_LDFLAGS = $(idb_ldflags) bin_PROGRAMS = ddlcleanup ddlcleanup_SOURCES = ddlcleanup.cpp 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: diff --git a/writeengine/server/Makefile.am b/writeengine/server/Makefile.am index adccde1ff..cd248fb27 100644 --- a/writeengine/server/Makefile.am +++ b/writeengine/server/Makefile.am @@ -34,7 +34,7 @@ we_cleartablelockcmd.cpp \ we_cpifeederthread.cpp \ we_getfilesizes.cpp 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 diff --git a/writeengine/server/we_readthread.cpp b/writeengine/server/we_readthread.cpp index b0562883b..dd3db617a 100644 --- a/writeengine/server/we_readthread.cpp +++ b/writeengine/server/we_readthread.cpp @@ -35,7 +35,7 @@ using namespace threadpool; #include "we_message_handlers.h" #include "we_ddlcommandproc.h" #include "we_dmlcommandproc.h" -#include "we_redistribute.h" +#include "../redistribute/we_redistribute.h" #include "we_config.h" #include "stopwatch.h" using namespace logging; diff --git a/writeengine/shared/we_chunkmanager.cpp b/writeengine/shared/we_chunkmanager.cpp index bff89081c..b0d40ff3d 100644 --- a/writeengine/shared/we_chunkmanager.cpp +++ b/writeengine/shared/we_chunkmanager.cpp @@ -40,7 +40,7 @@ using namespace std; #include "we_config.h" #include "we_confirmhdfsdbfile.h" #include "we_fileop.h" -#include "we_dctnry.h" +#include "../dictionary/we_dctnry.h" #include "we_stats.h" using namespace execplan; diff --git a/writeengine/splitter/Makefile.am b/writeengine/splitter/Makefile.am index f09763385..ea3228da4 100644 --- a/writeengine/splitter/Makefile.am +++ b/writeengine/splitter/Makefile.am @@ -32,7 +32,7 @@ we_splclient.cpp \ we_brmupdater.cpp \ we_tablelockgrabber.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