build fails with boost linking errors

build/bootstrap

@@ -6,10 +6,9 @@
 # following a git checkout.  It copies static files and shared include
 # files to the export tree prior to building the software.
 
+set -e
+
 mkdir -p export/{include,lib,etc,share,bin,sbin,post,mysql}
-if [ ! $$ ]; then
-    exit 1
-fi
 
 #TODO: these prebuilt binaries may need to be fetched
 #and built as dependencies
@@ -32,10 +31,6 @@ cp dbcon/mysql/install_calpont_mysql.sh export/mysql/ && \
 cp dbcon/mysql/my.cnf export/mysql/ && \
 cp dbcon/mysql/mysql-Columnstore export/mysql/
 
-if [ ! $$ ]; then
-    exit 1
-fi
-
 cp -p -r utils/net-snmp export/include
 
 #FIXME: 
@@ -59,57 +54,29 @@ cp -p -r utils/net-snmp export/include
 ## 		cp -p utils/net-snmp-built-libs/fc6bin/* export/sbin
 ## 	fi
 ## fi
-
-## pushd export/lib >/dev/null
-## for lib in libnetsnmpagent.so libnetsnmphelpers.so libnetsnmpmibs.so libnetsnmp.so libnetsnmptrapd.so; do
-## 	rm -f ${lib} ${lib}.5
-## 	ln -s ${lib}.5.2.1 ${lib}.5
-## 	ln -s ${lib}.5.2.1 ${lib}
-## done
-## popd >/dev/null
+d=utils/net-snmp-built-libs/lib64
+for lib in libnetsnmpagent.so libnetsnmphelpers.so libnetsnmpmibs.so libnetsnmp.so libnetsnmptrapd.so; do
+	ln -svf $lib.5.2.1 $d/$lib
+done
 
 #FIXME:
 #This is not going to update the version in configure.ac
 echo Generating version header
 ./build/genVersion.sh
-if [ ! $$ ]; then
-  exit 1
-fi
 
 echo Running GNU autotools to generate build environment
 aclocal 
-if [ ! $$ ]; then
-  exit 1
-fi
 autoconf
-if [ ! $$ ]; then
-  exit 1
-fi
 autoheader
-if [ ! $$ ]; then
-  exit 1
-fi
 libtoolize
-if [ ! $$ ]; then
-  exit 1
-fi
 automake --add-missing
-if [ ! $$ ]; then
-  exit 1
-fi
 autoreconf
-if [ ! $$ ]; then
-  exit 1
-fi
 
 echo GNU autotools environment generation completed successfully
 
 echo Configuring MariaDB ColumnStore
 
 ./configure 
-if [ ! $$ ]; then
-  exit 1
-fi
 
 #for x in \
 #$(find . -name '[mM]akefile' \

dbcon/ddlpackageproc/ddlpackageprocessor.h

@@ -44,7 +44,7 @@
 #include "we_define.h"
 #include "writeengine.h"
 #include "columnresult.h"
-#include "we_clients.h"
+#include "../../writeengine/client/we_clients.h"
 #include "liboamcpp.h"
 
 #if defined(_MSC_VER) && defined(DDLPKGPROC_DLLEXPORT)

dbcon/dmlpackageproc/dmlpackageprocessor.h

@@ -38,7 +38,7 @@
 #include "sessionmanager.h"
 #include "distributedenginecomm.h"
 #include "brmtypes.h"
-#include "we_clients.h"
+#include "../../writeengine/client/we_clients.h"
 #include "liboamcpp.h"
 #include "oamcache.h"
 #include "querystats.h"

dbcon/execplan/calpontsystemcatalog.h

@@ -39,7 +39,7 @@
 #include <iosfwd>
 #include <limits>
 
-#include "we_typeext.h"
+#include "../../writeengine/shared/we_typeext.h"
 #include "columnresult.h"
 #include "bytestream.h"
 #include "joblisttypes.h"

dbcon/execplan/simplecolumn.cpp

@@ -49,7 +49,7 @@ using namespace joblist;
 #include "simplefilter.h"
 #include "aggregatecolumn.h"
 #include "constantfilter.h"
-#include "windowfunction.h"
+#include "../../utils/windowfunction/windowfunction.h"
 
 namespace execplan
 {

dbcon/joblist/diskjoinstep.h

@@ -18,7 +18,7 @@
 #include "jobstep.h"
 #include "tuplehashjoin.h"
 #include "joinpartition.h"
-#include "prioritythreadpool.h"
+#include "../../utils/threadpool/prioritythreadpool.h"
 
 #ifndef DISKJOINSTEP_H
 #define DISKJOINSTEP_H

dbcon/joblist/groupconcat.cpp

@@ -50,7 +50,6 @@ using namespace dataconvert;
 
 #include "groupconcat.h"
 
-#include "idborderby.h"
 using namespace ordering;
 
 #include "jobstep.h"

dbcon/joblist/limitedorderby.cpp

@@ -34,12 +34,10 @@ using namespace logging;
 #include "rowgroup.h"
 using namespace rowgroup;
 
-#include "idborderby.h"
-using namespace ordering;
-
 #include "jlf_common.h"
 #include "limitedorderby.h"
 
+using namespace ordering;
 
 namespace joblist
 {

dbcon/joblist/limitedorderby.h

@@ -25,7 +25,7 @@
 
 #include <string>
 #include "rowgroup.h"
-#include "idborderby.h"
+#include "../../utils/windowfunction/idborderby.h"
 
 
 namespace joblist

dbcon/joblist/windowfunctionstep.cpp

@@ -53,18 +53,17 @@ using namespace config;
 #include "windowfunctioncolumn.h"
 using namespace execplan;
 
-#include "windowfunction.h"
-#include "windowfunctiontype.h"
-#include "framebound.h"
-#include "frameboundrange.h"
-#include "frameboundrow.h"
-#include "windowframe.h"
+#include "../../utils/windowfunction/windowfunction.h"
+#include "../../utils/windowfunction/windowfunctiontype.h"
+#include "../../utils/windowfunction/framebound.h"
+#include "../../utils/windowfunction/frameboundrange.h"
+#include "../../utils/windowfunction/frameboundrow.h"
+#include "../../utils/windowfunction/windowframe.h"
 using namespace windowfunction;
 
 #include "rowgroup.h"
 using namespace rowgroup;
 
-#include "idborderby.h"
 using namespace ordering;
 
 #include "funcexp.h"

dbcon/joblist/windowfunctionstep.h

@@ -21,7 +21,7 @@
 #ifndef JOBLIST_WINDOWFUNCTIONSTEP_H
 #define JOBLIST_WINDOWFUNCTIONSTEP_H
 
-#include "idborderby.h"
+#include "../../utils/windowfunction/idborderby.h"
 #include "jobstep.h"
 #include "rowgroup.h"
 #include "windowfunctioncolumn.h"

ddlproc/ddlproc.cpp

@@ -55,7 +55,7 @@ using namespace execplan;
 
 #include "writeengine.h"
 #include "cacheutils.h"
-#include "we_clients.h"
+#include "../writeengine/client/we_clients.h"
 #include "dbrm.h"
 #include "IDBPolicy.h"
 #include "utils_utf8.h"

dmlproc/batchinsertprocessor.h

@@ -36,7 +36,7 @@
 #include "bytestream.h"
 #include "dbrm.h"
 #include "batchloader.h"
-#include "we_clients.h"
+#include "../writeengine/client/we_clients.h"
 namespace dmlprocessor 
 {
 class BatchInsertProc

oam/oamcpp/liboamcpp.cpp

@@ -47,7 +47,7 @@
 #include <sstream>
 
 #include "ddlpkg.h"
-#include "dmlpkg.h"
+#include "../../dbcon/dmlpackage/dmlpkg.h"
 #define LIBOAM_DLLEXPORT
 #include "liboamcpp.h"
 #undef LIBOAM_DLLEXPORT

primitives/primproc/bppseeder.h

@@ -45,7 +45,6 @@
 #include "batchprimitiveprocessor.h"
 #include "primitiveserver.h"
 #include "umsocketselector.h"
-#include "prioritythreadpool.h"
 
 namespace primitiveprocessor
 {

primitives/primproc/primitiveserver.h

@@ -36,7 +36,7 @@
 #include <boost/thread.hpp>
 
 #include "threadpool.h"
-#include "prioritythreadpool.h"
+#include "../../utils/threadpool/prioritythreadpool.h"
 #include "messagequeue.h"
 #include "blockrequestprocessor.h"
 #include "batchprimitiveprocessor.h"

utils/common/nullvaluemanip.h

@@ -19,7 +19,7 @@
 #ifndef NULLVALUEMANIP_H
 #define NULLVALUEMANIP_H
 
-#include "calpontsystemcatalog.h"
+#include "../../dbcon/execplan/calpontsystemcatalog.h"
 
 namespace utils {
 

utils/funcexp/funcexp.cpp

@@ -38,7 +38,7 @@ using namespace execplan;
 using namespace joblist;
 
 #ifndef SKIP_UDF
-#include "udfsdk.h"
+#include "../udfsdk/udfsdk.h"
 #endif
 
 namespace funcexp

utils/joiner/joiner.h

@@ -27,7 +27,7 @@
 #include <tr1/unordered_map>
 #endif
 
-#include "simpleallocator.h"
+#include "../common/simpleallocator.h"
 
 #ifndef _HASHFIX_
 #define _HASHFIX_
@@ -54,7 +54,7 @@ namespace tr1
 #endif
 
 #define NO_DATALISTS
-#include <elementtype.h>
+#include "../joblist/elementtype.h"
 #undef NO_DATALISTS
 
 

utils/joiner/tuplejoiner.h

@@ -34,7 +34,7 @@
 #include "joiner.h"
 #include "fixedallocator.h"
 #include "joblisttypes.h"
-#include "funcexpwrapper.h"
+#include "../funcexp/funcexpwrapper.h"
 #include "stlpoolallocator.h"
 #include "hasher.h"
 

utils/rowgroup/rowgroup.h

@@ -59,7 +59,7 @@
 
 #include "branchpred.h"
 
-#include "winport.h"
+#include "../winport/winport.h"
 
 namespace rowgroup
 {

utils/threadpool/prioritythreadpool.h

@@ -35,7 +35,7 @@
 #include <boost/thread/condition.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/function.hpp>
-#include "winport.h"
+#include "../winport/winport.h"
 
 namespace threadpool
 {

utils/udfsdk/udfinfinidb.cpp

@@ -22,7 +22,7 @@
 *
 ***********************************************************************/
 
-#include <my_config.h>
+//#include <my_config.h>
 #include <cmath>
 #include <iostream>
 using namespace std;

writeengine/client/we_dmlcommandclient.cpp

@@ -23,7 +23,7 @@ using namespace messageqcpp;
 #include "we_messages.h"
 #include "we_clients.h"
 #include "resourcemanager.h"
-#include "dmlpkg.h"
+#include "../../dbcon/dmlpackage/dmlpkg.h"
 #include "ddlpackageprocessor.h"
 #include <boost/date_time/gregorian/gregorian.hpp>
 using namespace boost::gregorian;

writeengine/server/we_dmlcommandproc.cpp

@@ -24,7 +24,7 @@ using namespace messageqcpp;
 
 #include "we_messages.h"
 #include "we_message_handlers.h"
-#include "dmlpkg.h"
+#include "../../dbcon/dmlpackage/dmlpkg.h"
 #include "we_dmlcommandproc.h"
 using namespace dmlpackage;
 #include "dmlpackageprocessor.h"

writeengine/wrapper/we_colop.h

@@ -29,7 +29,7 @@
 #include "brmtypes.h"
 #include "we_dbrootextenttracker.h"
 #include "we_tablemetadata.h"
-#include "we_dctnry.h"
+#include "../dictionary/we_dctnry.h"
 #if defined(_MSC_VER) && defined(WRITEENGINE_DLLEXPORT)
 #define EXPORT __declspec(dllexport)
 #else

writeengine/wrapper/we_dctnrycompress.h

@@ -25,7 +25,7 @@
 
 #include <stdlib.h>
 
-#include "we_dctnry.h"
+#include "../dictionary/we_dctnry.h"
 #include "we_chunkmanager.h"
 #if defined(_MSC_VER) && defined(WRITEENGINE_DLLEXPORT)
 #define EXPORT __declspec(dllexport)

writeengine/wrapper/writeengine.cpp

@@ -41,7 +41,6 @@ using namespace std;
 #include "brm.h"
 #include "stopwatch.h"
 #include "we_colop.h"
-#include "we_dctnry.h"
 #include "we_type.h"
 
 #include "we_colopcompress.h"

writeengine/wrapper/writeengine.h

@@ -39,7 +39,6 @@
 
 #include "we_brm.h"
 #include "we_colop.h"
-#include "we_dctnry.h"
 #include "we_index.h"
 #include "we_tablemetadata.h"
 #include "we_dbrootextenttracker.h"